diff -Nru filezilla-3.15.0.2/aclocal.m4 filezilla-3.33.0/aclocal.m4 --- filezilla-3.15.0.2/aclocal.m4 2016-02-10 19:38:50.000000000 +0000 +++ filezilla-3.33.0/aclocal.m4 2018-05-07 08:45:24.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +332,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -408,7 +408,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -498,8 +498,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -573,6 +573,9 @@ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -602,7 +605,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -613,7 +616,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -623,7 +626,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -644,7 +647,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -694,7 +697,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -733,7 +736,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -762,7 +765,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -809,7 +812,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -828,7 +831,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -909,7 +912,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -969,7 +972,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -997,7 +1000,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1016,7 +1019,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1147,14 +1150,16 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_append_flag.m4]) +m4_include([m4/ax_check_compile_flag.m4]) m4_include([m4/ax_check_define.m4]) m4_include([m4/ax_check_link_flag.m4]) m4_include([m4/check_atomic.m4]) +m4_include([m4/check_clock_gettime.m4]) m4_include([m4/check_libc++.m4]) m4_include([m4/check_steady_clock.m4]) m4_include([m4/check_thread_local.m4]) m4_include([m4/check_time.m4]) -m4_include([m4/cppunit.m4]) m4_include([m4/cxx_compile_stdcxx_14.m4]) m4_include([m4/d-type.m4]) m4_include([m4/fz_check_pugixml.m4]) diff -Nru filezilla-3.15.0.2/AUTHORS filezilla-3.33.0/AUTHORS --- filezilla-3.15.0.2/AUTHORS 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/AUTHORS 2017-09-19 21:36:39.000000000 +0000 @@ -151,11 +151,14 @@ Do Thavisak - Welsh Aled Powell +- Azerbaijani + Orkhan Guliyev Application icon Aleksandar Kovac Icon sets +- Default set by Martins Svarcs - Cyril set by Cyril Burnet - Blukis set by Brian Lukis - LonE set by Ricardo Cabral diff -Nru filezilla-3.15.0.2/config/compile filezilla-3.33.0/config/compile --- filezilla-3.15.0.2/config/compile 2016-02-10 19:38:48.000000000 +0000 +++ filezilla-3.33.0/config/compile 2018-05-07 08:45:22.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff -Nru filezilla-3.15.0.2/config/config.guess filezilla-3.33.0/config/config.guess --- filezilla-3.15.0.2/config/config.guess 2016-02-10 19:38:48.000000000 +0000 +++ filezilla-3.33.0/config/config.guess 2018-05-07 08:45:22.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2016-10-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,19 +168,29 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -197,6 +207,13 @@ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +224,13 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -223,6 +240,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -235,6 +256,9 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -251,42 +275,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -359,16 +383,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -393,7 +417,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -579,8 +603,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -617,13 +642,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -662,11 +687,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -679,12 +704,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -789,14 +814,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -878,7 +903,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -901,7 +926,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -932,6 +957,9 @@ crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -944,6 +972,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -969,6 +1000,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1001,6 +1035,9 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1020,7 +1057,7 @@ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1099,7 +1136,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1248,6 +1285,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1261,9 +1301,9 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in @@ -1285,7 +1325,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1316,7 +1356,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1358,7 +1398,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1369,23 +1409,25 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff -Nru filezilla-3.15.0.2/config/config.sub filezilla-3.33.0/config/config.sub --- filezilla-3.15.0.2/config/config.sub 2016-02-10 19:38:48.000000000 +0000 +++ filezilla-3.33.0/config/config.sub 2018-05-07 08:45:22.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2014-09-11' +timestamp='2016-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,8 +116,8 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -255,12 +254,13 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -301,11 +301,12 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -313,6 +314,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -327,6 +329,9 @@ c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -372,12 +377,13 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ @@ -423,13 +429,15 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -437,6 +445,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -513,6 +522,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -633,6 +645,14 @@ basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -774,6 +794,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -1009,7 +1032,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1019,7 +1042,7 @@ ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1365,18 +1388,18 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1385,7 +1408,8 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1517,6 +1541,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) diff -Nru filezilla-3.15.0.2/config/depcomp filezilla-3.33.0/config/depcomp --- filezilla-3.15.0.2/config/depcomp 2016-02-10 19:38:48.000000000 +0000 +++ filezilla-3.33.0/config/depcomp 2018-05-07 08:45:22.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru filezilla-3.15.0.2/config/install-sh filezilla-3.33.0/config/install-sh --- filezilla-3.15.0.2/config/install-sh 2016-02-10 19:38:48.000000000 +0000 +++ filezilla-3.33.0/config/install-sh 2018-05-07 08:45:22.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,81 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +377,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +456,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +474,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru filezilla-3.15.0.2/config/ltmain.sh filezilla-3.33.0/config/ltmain.sh --- filezilla-3.15.0.2/config/ltmain.sh 2016-02-10 19:38:46.000000000 +0000 +++ filezilla-3.33.0/config/ltmain.sh 2018-05-07 08:45:20.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.11" -TIMESTAMP="" -package_revision=1.3337 +VERSION="2.4.6 Debian-2.4.6-2" +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname $scriptversion Debian-2.4.6-2 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - # Validate options: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,49 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*|-fsanitize=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7330,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7355,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7363,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7387,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7395,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7411,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7430,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7442,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7453,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7492,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7500,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7532,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7540,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,32 +7552,32 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS%" test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6151,26 +7598,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6180,13 +7627,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6194,31 +7641,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6226,19 +7664,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6247,15 +7685,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6268,18 +7716,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6290,13 +7738,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6314,7 +7762,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6325,21 +7773,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6347,18 +7800,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6369,10 +7817,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6385,22 +7833,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6430,19 +7876,19 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" @@ -6450,15 +7896,15 @@ tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi func_append tmp_libs " $deplib" done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi continue fi # $pass = conv @@ -6467,26 +7913,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6500,40 +7946,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6542,11 +7988,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6590,9 +8036,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6602,14 +8048,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6621,14 +8067,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6638,15 +8084,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6675,9 +8121,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6686,19 +8132,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6708,24 +8154,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6753,43 +8199,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6797,58 +8243,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6857,10 +8303,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6868,7 +8314,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6878,15 +8324,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6895,33 +8341,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6930,10 +8376,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6941,43 +8387,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6990,11 +8436,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7008,12 +8454,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7023,7 +8469,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7032,12 +8478,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7045,12 +8491,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7058,35 +8504,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7098,23 +8544,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7124,12 +8570,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7187,62 +8633,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7251,10 +8728,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7268,8 +8745,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7278,21 +8755,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7301,20 +8778,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7322,45 +8799,45 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" + func_fatal_configuration "$modename: unknown library version type '$version_type'" ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7368,30 +8845,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7406,26 +8883,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7436,69 +8923,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7512,42 +9004,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7556,8 +9051,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7573,11 +9068,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7598,13 +9093,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7614,7 +9109,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7623,7 +9118,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7647,7 +9142,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7663,9 +9158,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7694,20 +9189,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7737,20 +9232,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7787,24 +9282,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7822,25 +9317,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7848,7 +9343,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7871,30 +9366,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7902,7 +9397,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7918,18 +9413,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7953,8 +9448,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7963,12 +9458,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7979,14 +9474,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8032,7 +9527,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8040,25 +9535,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8083,7 +9578,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8097,8 +9592,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8108,19 +9603,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8134,7 +9629,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8143,31 +9638,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8181,7 +9676,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8192,7 +9687,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8215,8 +9710,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8224,16 +9719,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8252,11 +9747,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8267,7 +9762,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8276,18 +9771,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8305,7 +9800,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8338,8 +9833,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8351,14 +9846,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8373,7 +9868,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8385,13 +9880,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8401,10 +9896,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8416,9 +9911,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8426,9 +9921,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8437,16 +9932,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8454,7 +9949,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8463,7 +9958,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8471,18 +9966,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8491,7 +9986,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8505,7 +10000,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8527,7 +10022,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8535,11 +10030,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8547,7 +10043,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8556,10 +10052,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8579,39 +10075,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8619,7 +10115,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8632,17 +10128,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8651,12 +10149,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8668,7 +10166,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8678,12 +10176,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8700,16 +10198,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8723,11 +10219,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8763,7 +10259,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8787,7 +10283,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8810,7 +10306,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8827,10 +10323,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8838,7 +10334,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8863,45 +10359,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8914,12 +10408,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8949,9 +10443,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8968,27 +10462,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9045,8 +10540,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9067,7 +10562,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9090,25 +10585,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9116,13 +10613,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9143,7 +10640,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9152,7 +10649,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9221,18 +10718,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9249,7 +10746,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9264,31 +10761,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9304,23 +10801,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9330,34 +10827,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9373,10 +10870,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9385,7 +10881,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9399,7 +10895,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9425,7 +10921,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9440,27 +10936,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9473,18 +10971,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9499,11 +10997,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9517,7 +11015,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9528,12 +11026,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9549,21 +11047,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9590,12 +11086,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9604,7 +11100,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9614,16 +11110,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9634,7 +11131,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9657,5 +11154,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru filezilla-3.15.0.2/config/missing filezilla-3.33.0/config/missing --- filezilla-3.15.0.2/config/missing 2016-02-10 19:38:48.000000000 +0000 +++ filezilla-3.33.0/config/missing 2018-05-07 08:45:22.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru filezilla-3.15.0.2/config/test-driver filezilla-3.33.0/config/test-driver --- filezilla-3.15.0.2/config/test-driver 2016-02-10 19:38:52.000000000 +0000 +++ filezilla-3.33.0/config/test-driver 2018-05-07 08:45:26.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,11 +106,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -119,6 +122,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -Nru filezilla-3.15.0.2/configure filezilla-3.33.0/configure --- filezilla-3.15.0.2/configure 2016-02-10 19:38:50.000000000 +0000 +++ filezilla-3.33.0/configure 2018-05-07 08:45:25.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for FileZilla 3.15.0.2. +# Generated by GNU Autoconf 2.69 for FileZilla 3.33.0. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='FileZilla' PACKAGE_TARNAME='filezilla' -PACKAGE_VERSION='3.15.0.2' -PACKAGE_STRING='FileZilla 3.15.0.2' +PACKAGE_VERSION='3.33.0' +PACKAGE_STRING='FileZilla 3.33.0' PACKAGE_BUGREPORT='tim.kosse@filezilla-project.org' PACKAGE_URL='https://filezilla-project.org/' @@ -636,6 +636,8 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +ENABLE_STORJ_FALSE +ENABLE_STORJ_TRUE HAVE_DBUS_FALSE HAVE_DBUS_TRUE HAVE_LIBPUGIXML_FALSE @@ -648,6 +650,8 @@ USE_BINRELOC_TRUE MAKENSISSCRIPT_FALSE MAKENSISSCRIPT_TRUE +USE_MAC_SANDBOX_FALSE +USE_MAC_SANDBOX_TRUE MACAPPBUNDLE_FALSE MACAPPBUNDLE_TRUE USE_RESOURCEFILE_FALSE @@ -670,6 +674,8 @@ msgmerge msgfmt xgettext +LIBSTORJ_LIBS +LIBSTORJ_CFLAGS LIBSQLITE3_LIBS LIBSQLITE3_CFLAGS LIBGTK_LIBS @@ -680,11 +686,18 @@ PUGIXML_LIBS LIBGNUTLS_LIBS LIBGNUTLS_CFLAGS +HOGWEED_LIBS +HOGWEED_CFLAGS +NETTLE_LIBS +NETTLE_CFLAGS CPPUNIT_LIBS CPPUNIT_CFLAGS -CPPUNIT_CONFIG IDN_LIB NSIS_64BIT +ac_ct_OBJC +OBJCFLAGS +OBJC +CFBUNDLEIDSUFFIX PACKAGE_VERSION_NANO PACKAGE_VERSION_MICRO PACKAGE_VERSION_MINOR @@ -712,8 +725,12 @@ PKG_CONFIG subdirs HAVE_CXX14 +am__fastdepOBJC_FALSE +am__fastdepOBJC_TRUE +OBJCDEPMODE CXXCPP CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -812,6 +829,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -840,6 +858,7 @@ enable_static with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -851,15 +870,15 @@ with_wx_config with_wx_prefix with_wx_exec_prefix +enable_mac_sandbox with_idn_lib enable_precomp -with_cppunit_prefix -with_cppunit_exec_prefix enable_manualupdatecheck enable_autoupdatecheck enable_gnutlssystemciphers with_pugixml with_dbus +enable_storj ' ac_precious_vars='build_alias host_alias @@ -872,6 +891,7 @@ CCC CC CFLAGS +LT_SYS_LIBRARY_PATH CPP CXXCPP PKG_CONFIG @@ -879,6 +899,14 @@ PKG_CONFIG_LIBDIR LIBFILEZILLA_CFLAGS LIBFILEZILLA_LIBS +OBJC +OBJCFLAGS +CPPUNIT_CFLAGS +CPPUNIT_LIBS +NETTLE_CFLAGS +NETTLE_LIBS +HOGWEED_CFLAGS +HOGWEED_LIBS LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS LIBDBUS_CFLAGS @@ -886,7 +914,9 @@ LIBGTK_CFLAGS LIBGTK_LIBS LIBSQLITE3_CFLAGS -LIBSQLITE3_LIBS' +LIBSQLITE3_LIBS +LIBSTORJ_CFLAGS +LIBSTORJ_LIBS' ac_subdirs_all='src/fzshellext' # Initialize some variables set by options. @@ -925,6 +955,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1177,6 +1208,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1314,7 +1354,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1427,7 +1467,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FileZilla 3.15.0.2 to adapt to many kinds of systems. +\`configure' configures FileZilla 3.33.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1467,6 +1507,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1497,7 +1538,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FileZilla 3.15.0.2:";; + short | recursive ) echo "Configuration of FileZilla 3.33.0:";; esac cat <<\_ACEOF @@ -1521,6 +1562,7 @@ --enable-buildtype=TYPE DO NOT USE. Reserved for use by official maintainer. TYPE can either be 'official' or 'nightly'. + --enable-mac-sandbox Enables use of OS X's App Sandbox. --enable-precomp Use precompiled headers --disable-manualupdatecheck Disallow the user to manually check for new @@ -1530,23 +1572,26 @@ versions automatically. --enable-gnutlssystemciphers Enables the use of gnutls system ciphers. + --enable-storj[=ARG] Enable support for the Storj decentralized cloud + storage provider. Default: no Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH --with-wx-config=CONFIG wx-config script to use (optional) --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional) --with-wx-exec-prefix=PREFIX Exec prefix where wxWidgets is installed (optional) --with-idn-lib=FILE Use the given path to the idn library. - --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional) - --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional) --with-pugixml=type Selects which version of pugixml to use. Type has to be either system or builtin --with-dbus Enable D-Bus support through libdbus. Used for GNOME @@ -1562,6 +1607,8 @@ you have headers in a nonstandard directory CC C compiler command CFLAGS C compiler flags + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility @@ -1573,6 +1620,19 @@ C compiler flags for LIBFILEZILLA, overriding pkg-config LIBFILEZILLA_LIBS linker flags for LIBFILEZILLA, overriding pkg-config + OBJC Objective C compiler command + OBJCFLAGS Objective C compiler flags + CPPUNIT_CFLAGS + C compiler flags for CPPUNIT, overriding pkg-config + CPPUNIT_LIBS + linker flags for CPPUNIT, overriding pkg-config + NETTLE_CFLAGS + C compiler flags for NETTLE, overriding pkg-config + NETTLE_LIBS linker flags for NETTLE, overriding pkg-config + HOGWEED_CFLAGS + C compiler flags for HOGWEED, overriding pkg-config + HOGWEED_LIBS + linker flags for HOGWEED, overriding pkg-config LIBGNUTLS_CFLAGS C compiler flags for LIBGNUTLS, overriding pkg-config LIBGNUTLS_LIBS @@ -1588,6 +1648,10 @@ C compiler flags for LIBSQLITE3, overriding pkg-config LIBSQLITE3_LIBS linker flags for LIBSQLITE3, overriding pkg-config + LIBSTORJ_CFLAGS + C compiler flags for LIBSTORJ, overriding pkg-config + LIBSTORJ_LIBS + linker flags for LIBSTORJ, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1656,7 +1720,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FileZilla configure 3.15.0.2 +FileZilla configure 3.33.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2098,6 +2162,44 @@ } # ac_fn_c_check_decl +# ac_fn_objc_try_compile LINENO +# ----------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_objc_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_objc_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_objc_try_compile + # ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES # --------------------------------------------------------- # Tests whether HEADER exists, giving a warning if it cannot be compiled using @@ -2283,7 +2385,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FileZilla $as_me 3.15.0.2, which was +It was created by FileZilla $as_me 3.33.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2663,7 +2765,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2855,7 +2957,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3149,7 +3251,7 @@ # Define the identity of the package. PACKAGE='filezilla' - VERSION='3.15.0.2' + VERSION='3.33.0' cat >>confdefs.h <<_ACEOF @@ -3183,8 +3285,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -4750,8 +4852,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -4765,7 +4867,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Backslashify metacharacters that are still active within # double-quoted strings. @@ -4814,7 +4916,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -5137,19 +5239,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -5163,7 +5265,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -5174,7 +5276,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -5185,32 +5287,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -5253,33 +5355,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -5290,15 +5397,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -5404,9 +5511,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -5414,8 +5521,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -5466,7 +5573,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -5506,7 +5613,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5557,22 +5664,22 @@ *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -5590,7 +5697,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -5608,30 +5715,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -5754,13 +5837,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -5888,13 +5971,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -5921,8 +6004,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -6018,8 +6100,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -6072,6 +6154,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -6229,8 +6314,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -6242,7 +6327,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -6397,7 +6482,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -6405,7 +6490,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -6418,7 +6503,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -6635,7 +6720,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -6725,7 +6810,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -6758,14 +6843,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6783,21 +6898,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -6845,11 +6963,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -6875,7 +6993,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -6895,13 +7013,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -6922,7 +7040,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -6975,6 +7093,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -6987,9 +7115,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -6999,8 +7127,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -7012,18 +7140,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7032,24 +7241,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -7078,9 +7288,50 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7103,10 +7354,10 @@ ;; esac ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7125,10 +7376,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -7146,7 +7397,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -7186,13 +7437,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7204,7 +7456,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -7213,7 +7465,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -7229,7 +7481,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -7340,7 +7592,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -7843,7 +8095,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -7861,7 +8113,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7900,7 +8152,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -7929,7 +8181,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7942,32 +8194,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7975,6 +8227,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8260,9 +8547,9 @@ func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;; esac } # func_stripname_cnf @@ -8289,14 +8576,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8320,14 +8607,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8351,14 +8638,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8366,8 +8653,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -8383,14 +8668,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8404,11 +8689,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -8457,7 +8794,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -8496,7 +8833,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -8507,14 +8844,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -8523,15 +8860,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -8546,22 +8876,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8584,13 +8914,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8612,22 +8942,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8650,13 +8980,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8677,7 +9007,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8739,7 +9069,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -8755,7 +9085,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8785,7 +9115,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -8803,17 +9133,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -8824,8 +9155,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -8841,6 +9172,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -8911,7 +9247,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -8919,10 +9255,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -8938,7 +9293,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -8949,7 +9304,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -8974,6 +9329,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -9071,7 +9432,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -9100,7 +9461,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -9132,7 +9493,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9162,7 +9523,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -9194,7 +9555,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9213,13 +9574,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -9339,8 +9700,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -9352,9 +9713,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -9397,9 +9758,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -9414,7 +9775,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -9422,7 +9783,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; linux* | k*bsd*-gnu | gnu*) @@ -9435,7 +9796,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -9457,24 +9818,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -9487,7 +9848,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -9506,7 +9867,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9522,7 +9883,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -9532,7 +9893,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -9540,61 +9901,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9605,42 +9994,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9654,8 +10048,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9673,8 +10067,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9686,7 +10080,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -9701,9 +10095,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9720,15 +10114,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -9744,7 +10138,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -9752,34 +10146,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -9798,13 +10215,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -9823,36 +10248,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi - link_all_deplibs=no + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9887,7 +10318,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9895,17 +10326,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9940,7 +10371,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9948,21 +10379,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -9971,7 +10414,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10001,16 +10444,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -10019,18 +10463,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -10039,7 +10483,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -10058,24 +10502,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -10117,33 +10561,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -10151,25 +10595,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -10181,7 +10625,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -10200,14 +10644,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -10215,8 +10659,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -10227,7 +10671,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -10238,8 +10682,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -10249,8 +10693,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -10262,24 +10706,35 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + link_all_deplibs=no else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -10294,7 +10749,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -10302,27 +10757,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -10333,33 +10780,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10370,24 +10837,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -10397,11 +10864,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -10411,10 +10878,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -10463,43 +10930,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -10514,10 +10981,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -10525,7 +10992,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10551,7 +11018,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -10766,14 +11233,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -10789,28 +11256,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -10824,7 +11298,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -10833,7 +11307,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -10850,14 +11324,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -10865,41 +11341,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -10909,18 +11435,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -10928,8 +11454,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -10941,7 +11467,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -10950,8 +11476,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -10967,17 +11493,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -10986,8 +11512,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -11014,7 +11540,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -11027,8 +11553,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -11041,7 +11567,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -11054,8 +11580,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -11068,8 +11594,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -11087,12 +11613,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -11122,10 +11649,10 @@ need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -11143,14 +11670,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -11158,8 +11686,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -11168,8 +11696,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -11182,8 +11710,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -11194,7 +11722,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -11202,8 +11730,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -11222,8 +11750,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -11232,21 +11760,41 @@ dynamic_linker=no ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor +linux*android*) + version_type=none # Android doesn't support versioned libraries. need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no + shlibpath_overrides_runpath=yes - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -11282,7 +11830,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -11314,12 +11867,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -11329,7 +11882,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -11338,58 +11891,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -11400,8 +11963,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -11411,11 +11974,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -11423,8 +11986,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -11445,24 +12008,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -11480,7 +12043,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -11488,8 +12051,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -11499,20 +12062,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -11609,15 +12187,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -11632,12 +12210,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -11647,7 +12225,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -11657,23 +12235,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -11711,10 +12289,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -11722,10 +12300,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -11764,11 +12350,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -11807,7 +12393,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -11846,7 +12432,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -11885,7 +12471,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11906,21 +12492,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -11928,7 +12514,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11975,9 +12561,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -12007,7 +12593,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12027,14 +12613,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12081,9 +12667,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -12113,7 +12699,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12134,9 +12720,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -12180,7 +12766,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -12208,7 +12794,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -12216,13 +12802,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -12230,8 +12816,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -12241,7 +12831,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12255,11 +12845,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -12438,7 +13028,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -12499,46 +13089,39 @@ CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + func_cc_basename $compiler +cc_basename=$func_cc_basename_result if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' else lt_prog_compiler_no_builtin_flag_CXX= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -12552,7 +13135,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -12563,7 +13146,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -12574,32 +13157,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -12635,22 +13218,22 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec_CXX= fi @@ -12687,18 +13270,30 @@ ld_shlibs_CXX=no ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -12708,6 +13303,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -12726,13 +13328,21 @@ hardcode_direct_absolute_CXX=yes hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' + file_list_spec_CXX='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct_CXX=no + hardcode_direct_absolute_CXX=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -12750,36 +13360,44 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec_CXX='${wl}-bexpall' + export_dynamic_flag_spec_CXX='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' + # The "-G" linker flag allows undefined symbols. + no_undefined_flag_CXX='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -12814,7 +13432,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -12822,18 +13440,18 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -12868,7 +13486,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -12876,22 +13494,34 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag_CXX=' $wl-bernotok' + allow_undefined_flag_CXX=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec_CXX='$convenience' fi archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -12901,7 +13531,7 @@ allow_undefined_flag_CXX=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs_CXX=no fi @@ -12929,57 +13559,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' enable_shared_with_static_runtimes_CXX=yes # Don't use ranlib old_postinstall_cmds_CXX='chmod 644 $oldlib' postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + export_dynamic_flag_spec_CXX='$wl--export-all-symbols' allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi @@ -12993,27 +13624,27 @@ hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec_CXX='' fi link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + allow_undefined_flag_CXX=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + if test yes != "$lt_cv_apple_cc_single_mod"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi else @@ -13022,6 +13653,34 @@ ;; + os2*) + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_minus_L_CXX=yes + allow_undefined_flag_CXX=unsupported + shrext_cmds=.dll + archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes_CXX=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -13057,14 +13716,14 @@ ;; haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes ;; hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' hardcode_direct_CXX=yes hardcode_minus_L_CXX=yes # Not in the search PATH, # but as the default @@ -13076,7 +13735,7 @@ ld_shlibs_CXX=no ;; aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -13085,11 +13744,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13099,15 +13758,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: case $host_cpu in hppa*64*|ia64*) ;; *) - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' ;; esac fi @@ -13133,13 +13792,13 @@ aCC*) case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -13150,20 +13809,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -13178,22 +13837,22 @@ interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -13202,17 +13861,17 @@ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: inherit_rpath_CXX=yes ;; @@ -13225,8 +13884,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -13235,10 +13894,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -13252,59 +13911,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -13318,18 +13977,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -13337,10 +13996,10 @@ *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on @@ -13398,22 +14057,17 @@ ld_shlibs_CXX=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct_CXX=yes hardcode_shlibpath_var_CXX=no hardcode_direct_absolute_CXX=yes archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='$wl-E' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -13429,9 +14083,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' hardcode_libdir_separator_CXX=: # Archives containing C++ object files must be created using @@ -13449,17 +14103,17 @@ cxx*) case $host in osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; esac @@ -13474,21 +14128,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: # Commands to make compiler produce verbose output that lists @@ -13534,9 +14188,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no @@ -13544,7 +14198,7 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; @@ -13561,30 +14215,30 @@ ;; gcx*) # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + no_undefined_flag_CXX=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -13592,11 +14246,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -13605,52 +14259,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' + no_undefined_flag_CXX='$wl-z,text' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' + no_undefined_flag_CXX='$wl-z,text' + allow_undefined_flag_CXX='$wl-z,nodefs' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R,$libdir' hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' + export_dynamic_flag_spec_CXX='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" + '"$old_archive_cmds_CXX" reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" + '"$reload_cmds_CXX" ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -13682,10 +14336,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no + test no = "$ld_shlibs_CXX" && can_build_shared=no - GCC_CXX="$GXX" - LD_CXX="$LD" + GCC_CXX=$GXX + LD_CXX=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -13729,13 +14383,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -13751,16 +14405,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" + compiler_lib_search_path_CXX=$prev$p else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -13768,9 +14422,9 @@ esac else if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" + postdeps_CXX=$prev$p else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" + postdeps_CXX="${postdeps_CXX} $prev$p" fi fi prev= @@ -13785,15 +14439,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" + predep_objects_CXX=$p else predep_objects_CXX="$predep_objects_CXX $p" fi else if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" + postdep_objects_CXX=$p else postdep_objects_CXX="$postdep_objects_CXX $p" fi @@ -13823,51 +14477,6 @@ postdep_objects_CXX= postdeps_CXX= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac @@ -13876,7 +14485,7 @@ esac compiler_lib_search_dirs_CXX= if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi @@ -13915,17 +14524,18 @@ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' fi + lt_prog_compiler_pic_CXX='-fPIC' ;; amigaos*) @@ -13936,8 +14546,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -13952,6 +14562,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static_CXX='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -14001,7 +14616,7 @@ case $host_os in aix[4-9]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' else @@ -14041,14 +14656,14 @@ case $cc_basename in CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then lt_prog_compiler_pic_CXX='+Z' fi ;; aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -14085,7 +14700,7 @@ lt_prog_compiler_pic_CXX='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' @@ -14230,7 +14845,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= ;; @@ -14262,7 +14877,7 @@ lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -14292,7 +14907,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -14318,7 +14933,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -14337,13 +14952,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then : else lt_prog_compiler_static_CXX= @@ -14457,8 +15072,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -14470,9 +15085,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -14489,17 +15104,21 @@ case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" + export_symbols_cmds_CXX=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -14522,7 +15141,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no +test no = "$ld_shlibs_CXX" && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -14539,7 +15158,7 @@ # Assume -lc should be added archive_cmds_need_lc_CXX=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds_CXX in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -14667,7 +15286,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -14684,14 +15303,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -14699,41 +15320,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -14743,18 +15414,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -14762,8 +15433,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -14775,7 +15446,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -14784,8 +15455,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -14801,16 +15472,16 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -14819,8 +15490,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -14847,7 +15518,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -14860,8 +15531,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -14874,7 +15545,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -14887,8 +15558,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -14900,8 +15571,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -14919,12 +15590,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -14954,10 +15626,10 @@ need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -14975,14 +15647,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -14990,8 +15663,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -15000,8 +15673,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -15014,8 +15687,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -15026,7 +15699,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -15034,8 +15707,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -15054,8 +15727,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -15064,13 +15737,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; + # This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -15114,7 +15807,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -15146,12 +15844,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -15161,7 +15859,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -15170,58 +15868,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -15232,8 +15940,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -15243,11 +15951,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -15255,8 +15963,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -15277,24 +15985,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -15312,7 +16020,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -15320,8 +16028,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -15331,20 +16039,32 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + @@ -15387,15 +16107,15 @@ hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then + test yes = "$hardcode_automatic_CXX"; then # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && + if test no != "$hardcode_direct_CXX" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" && + test no != "$hardcode_minus_L_CXX"; then # Linking always hardcodes the temporary library directory. hardcode_action_CXX=relink else @@ -15410,12 +16130,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then +if test relink = "$hardcode_action_CXX" || + test yes = "$inherit_rpath_CXX"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -15438,7 +16158,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -15470,75 +16190,204 @@ -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. +# Todo: Use sub-configure for OSX specific code -_ACEOF +depcc="$OBJC" am_compiler_list='gcc3 gcc' -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_OBJC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + 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". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" + am_cv_OBJC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_OBJC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_OBJC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; } +OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then + am__fastdepOBJC_TRUE= + am__fastdepOBJC_FALSE='#' +else + am__fastdepOBJC_TRUE='#' + am__fastdepOBJC_FALSE= +fi + + + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" else case $cache_file in #( */* | ?:*) @@ -15588,90 +16437,392 @@ if ! test "$localesonly" = "yes"; then if test "X$GCC" = Xyes; then - CFLAGS="$CFLAGS -Wall -g" - CXXFLAGS="$CXXFLAGS -Wall -g" - fi - # Check for C++14 support - cxx_compile_cxx14_required=true - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_success=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features by default" >&5 -$as_echo_n "checking whether $CXX supports C++14 features by default... " >&6; } -if ${_cv_cxx_compile_cxx14+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +if ${CFLAGS+:} false; then : - #include + case " $CFLAGS " in #( + *" -Wall "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -Wall"; } >&5 + (: CFLAGS already contains -Wall) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : - bool make_unique_test() { - auto p = std::make_unique(14); - return static_cast(p); - } + as_fn_append CFLAGS " -Wall" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac - // Also test some C++11 stuff just to be sure +else - #include - template - struct umt { - std::unordered_map map; - }; + CFLAGS=-Wall + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; +fi - struct Base { - virtual void f() {} - }; - struct Child : public Base { - virtual void f() override {} - }; - typedef check> right_angle_brackets; +if ${CFLAGS+:} false; then : - int a; - decltype(a) b; + case " $CFLAGS " in #( + *" -g "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -g"; } >&5 + (: CFLAGS already contains -g) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : - typedef check check_type; - check_type c; - check_type&& cr = static_cast(c); + as_fn_append CFLAGS " -g" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac - auto d = a; - auto l = [](){}; - // Prevent Clang error: unused variable 'l' [-Werror,-Wunused-variable] - struct use_l { use_l() { l(); } }; +else - // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae - // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function because of this - namespace test_template_alias_sfinae { - struct foo {}; + CFLAGS=-g + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } - template - using member = typename T::member_type; +fi - template - void func(...) {} - template - void func(member*) {} +if ${CXXFLAGS+:} false; then : - void test(); + case " $CXXFLAGS " in #( + *" -Wall "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -Wall"; } >&5 + (: CXXFLAGS already contains -Wall) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : - void test() { - func(0); - } - } + as_fn_append CXXFLAGS " -Wall" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac -_ACEOF +else + + CXXFLAGS=-Wall + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + + +if ${CXXFLAGS+:} false; then : + + case " $CXXFLAGS " in #( + *" -g "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -g"; } >&5 + (: CXXFLAGS already contains -g) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append CXXFLAGS " -g" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + CXXFLAGS=-g + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + + fi + + # Do this early: Compiler and linker flags to work around a nasty bug in Xcode. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=partial-availability" >&5 +$as_echo_n "checking whether C compiler accepts -Werror=partial-availability... " >&6; } +if ${ax_cv_check_cflags___Werror_partial_availability+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS -Werror=partial-availability" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ax_cv_check_cflags___Werror_partial_availability=yes +else + ax_cv_check_cflags___Werror_partial_availability=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror_partial_availability" >&5 +$as_echo "$ax_cv_check_cflags___Werror_partial_availability" >&6; } +if test "x$ax_cv_check_cflags___Werror_partial_availability" = xyes; then : + + # This warning should be on by default yet it's not even enabled by -Wall. Apple screwed up big time. + +if ${CFLAGS+:} false; then : + + case " $CFLAGS " in #( + *" -Werror=partial-availability "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -Werror=partial-availability"; } >&5 + (: CFLAGS already contains -Werror=partial-availability) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append CFLAGS " -Werror=partial-availability" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + CFLAGS=-Werror=partial-availability + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + + +if ${CXXFLAGS+:} false; then : + + case " $CXXFLAGS " in #( + *" -Werror=partial-availability "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -Werror=partial-availability"; } >&5 + (: CXXFLAGS already contains -Werror=partial-availability) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append CXXFLAGS " -Werror=partial-availability" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + CXXFLAGS=-Werror=partial-availability + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + + +else + : +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-no_weak_imports" >&5 +$as_echo_n "checking whether the linker accepts -Wl,-no_weak_imports... " >&6; } +if ${ax_cv_check_ldflags___Wl__no_weak_imports+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-no_weak_imports" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_check_ldflags___Wl__no_weak_imports=yes +else + ax_cv_check_ldflags___Wl__no_weak_imports=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl__no_weak_imports" >&5 +$as_echo "$ax_cv_check_ldflags___Wl__no_weak_imports" >&6; } +if test "x$ax_cv_check_ldflags___Wl__no_weak_imports" = xyes; then : + + # If the programmer wants weak symbols he would just used dlopen/dlsym + # But not so on Apple systems where even basic functions like clock_gettime can + # be randomly missing at runtime. + +if ${LFDLAGS+:} false; then : + + case " $LFDLAGS " in #( + *" -Wl,-no_weak_imports "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LFDLAGS already contains -Wl,-no_weak_imports"; } >&5 + (: LFDLAGS already contains -Wl,-no_weak_imports) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append LFDLAGS " -Wl,-no_weak_imports" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LFDLAGS=\"\$LFDLAGS\""; } >&5 + (: LFDLAGS="$LFDLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + LFDLAGS=-Wl,-no_weak_imports + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LFDLAGS=\"\$LFDLAGS\""; } >&5 + (: LFDLAGS="$LFDLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + + +else + : +fi + + + # Check for C++14 support + cxx_compile_cxx14_required=true + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_success=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features by default" >&5 +$as_echo_n "checking whether $CXX supports C++14 features by default... " >&6; } +if ${_cv_cxx_compile_cxx14+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + + bool make_unique_test() { + auto p = std::make_unique(14); + return static_cast(p); + } + + // Also test some C++11 stuff just to be sure + + #include + template + struct umt { + std::unordered_map map; + }; + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + struct Base { + virtual void f() {} + }; + struct Child : public Base { + virtual void f() override {} + }; + + typedef check> right_angle_brackets; + + int a; + decltype(a) b; + + typedef check check_type; + check_type c; + check_type&& cr = static_cast(c); + + auto d = a; + auto l = [](){}; + // Prevent Clang error: unused variable 'l' [-Werror,-Wunused-variable] + struct use_l { use_l() { l(); } }; + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function because of this + namespace test_template_alias_sfinae { + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { + func(0); + } + } + +_ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : _cv_cxx_compile_cxx14=yes else @@ -16116,6 +17267,7 @@ { thread_local static int foo = 0; + (void)foo; return 0; ; @@ -16130,11 +17282,9 @@ else - -$as_echo "#define HAVE_NO_THREAD_LOCAL 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + as_fn_error $? "Compiler support for the thread_local keyword is required." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -16464,19 +17614,19 @@ # ----------------- pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFILEZILLA" >&5 -$as_echo_n "checking for LIBFILEZILLA... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfilezilla >= 0.12.2" >&5 +$as_echo_n "checking for libfilezilla >= 0.12.2... " >&6; } if test -n "$LIBFILEZILLA_CFLAGS"; then pkg_cv_LIBFILEZILLA_CFLAGS="$LIBFILEZILLA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfilezilla >= 0.3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libfilezilla >= 0.3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfilezilla >= 0.12.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libfilezilla >= 0.12.2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBFILEZILLA_CFLAGS=`$PKG_CONFIG --cflags "libfilezilla >= 0.3.0" 2>/dev/null` + pkg_cv_LIBFILEZILLA_CFLAGS=`$PKG_CONFIG --cflags "libfilezilla >= 0.12.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16488,12 +17638,12 @@ pkg_cv_LIBFILEZILLA_LIBS="$LIBFILEZILLA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfilezilla >= 0.3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libfilezilla >= 0.3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfilezilla >= 0.12.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libfilezilla >= 0.12.2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBFILEZILLA_LIBS=`$PKG_CONFIG --libs "libfilezilla >= 0.3.0" 2>/dev/null` + pkg_cv_LIBFILEZILLA_LIBS=`$PKG_CONFIG --libs "libfilezilla >= 0.12.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16505,7 +17655,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -16514,21 +17664,21 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBFILEZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libfilezilla >= 0.3.0" 2>&1` + LIBFILEZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libfilezilla >= 0.12.2" 2>&1` else - LIBFILEZILLA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libfilezilla >= 0.3.0" 2>&1` + LIBFILEZILLA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libfilezilla >= 0.12.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBFILEZILLA_PKG_ERRORS" >&5 - as_fn_error $? "libfilezilla not found. You can download it from https://lib.filezilla-project.org/" "$LINENO" 5 + as_fn_error $? "libfilezilla not found: $LIBFILEZILLA_PKG_ERRORS. You can download it from https://lib.filezilla-project.org/" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "libfilezilla not found. You can download it from https://lib.filezilla-project.org/" "$LINENO" 5 + as_fn_error $? "libfilezilla not found: $LIBFILEZILLA_PKG_ERRORS. You can download it from https://lib.filezilla-project.org/" "$LINENO" 5 else LIBFILEZILLA_CFLAGS=$pkg_cv_LIBFILEZILLA_CFLAGS @@ -16540,7 +17690,6 @@ - # Detect wxWidgets # ---------------- @@ -16576,7 +17725,7 @@ - MIN_WX_VERSION="3.0.2" + MIN_WX_VERSION="3.0.4" # Do not downgrade this. wx 3.0.3 and older have too many known and fixed bugs affecting FileZilla. if test x${WX_CONFIG_NAME+set} != xset ; then @@ -16857,6 +18006,11 @@ equivalent variable and wxWidgets version is $MIN_WX_VERSION or above. " "$LINENO" 5 fi + if test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" = "3.1"; then + as_fn_error $? "You must use wxWidgets 3.0.x, development versions of wxWidgets are not supported." "$LINENO" 5 + elif test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" != "3.0"; then + as_fn_error $? "You must use wxWidgets 3.0.x, wxWidgets 3.2 or higher is not yet supported." "$LINENO" 5 + fi # --universal=no doesn't work correctly, it still accepts universal builds. Reject it manually here. if echo "$WX_CPPFLAGS" | grep __WXUNIVERSAL__ > /dev/null; then @@ -16873,6 +18027,7 @@ CXXFLAGS_OLD="$CXXFLAGS" CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking positional printf argument support in wxWidgets" >&5 $as_echo_n "checking positional printf argument support in wxWidgets... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16906,30 +18061,65 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$CPPFLAGS_OLD" - CXXFLAGS="$CXXFLAGS_OLD" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GUI support in wxWidgets" >&5 +$as_echo_n "checking GUI support in wxWidgets... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include + #if !wxUSE_GUI + #error wx compiled without wxUSE_GUI + #endif +int +main () +{ - cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "GUI support in wxWidgets is required by FileZilla. Please rebuild wxWidgets and pass --enable-gui to its configure script. +See \`config.log' for more details" "$LINENO" 5; } + + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CPPFLAGS="$CPPFLAGS_OLD" + CXXFLAGS="$CXXFLAGS_OLD" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. _ACEOF @@ -17448,7 +18638,8 @@ main () { - ICopyHookW* foo; + ICopyHookW* foo; + (void)foo; return 0; ; @@ -17559,7 +18750,38 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___dynamicbase" >&5 $as_echo "$ax_cv_check_ldflags___Wl___dynamicbase" >&6; } if test "x$ax_cv_check_ldflags___Wl___dynamicbase" = xyes; then : - LDFLAGS="$LDFLAGS -Wl,--dynamicbase" + +if ${LDFLAGS+:} false; then : + + case " $LDFLAGS " in #( + *" -Wl,--dynamicbase "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -Wl,--dynamicbase"; } >&5 + (: LDFLAGS already contains -Wl,--dynamicbase) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append LDFLAGS " -Wl,--dynamicbase" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + LDFLAGS=-Wl,--dynamicbase + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + else : fi @@ -17595,7 +18817,38 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___nxcompat" >&5 $as_echo "$ax_cv_check_ldflags___Wl___nxcompat" >&6; } if test "x$ax_cv_check_ldflags___Wl___nxcompat" = xyes; then : - LDFLAGS="$LDFLAGS -Wl,--nxcompat" + +if ${LDFLAGS+:} false; then : + + case " $LDFLAGS " in #( + *" -Wl,--nxcompat "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -Wl,--nxcompat"; } >&5 + (: LDFLAGS already contains -Wl,--nxcompat) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append LDFLAGS " -Wl,--nxcompat" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + LDFLAGS=-Wl,--nxcompat + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + else : fi @@ -17636,7 +18889,38 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___major_subsystem_version__Wl_6" >&5 $as_echo "$ax_cv_check_ldflags___Wl___major_subsystem_version__Wl_6" >&6; } if test "x$ax_cv_check_ldflags___Wl___major_subsystem_version__Wl_6" = xyes; then : - LDFLAGS="$LDFLAGS -Wl,--major-subsystem-version -Wl,6" + +if ${LDFLAGS+:} false; then : + + case " $LDFLAGS " in #( + *" -Wl,--major-subsystem-version -Wl,6 "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -Wl,--major-subsystem-version -Wl,6"; } >&5 + (: LDFLAGS already contains -Wl,--major-subsystem-version -Wl,6) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append LDFLAGS " -Wl,--major-subsystem-version -Wl,6" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + LDFLAGS=-Wl,--major-subsystem-version -Wl,6 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + else : fi @@ -17672,7 +18956,38 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___minor_subsystem_version__Wl_0" >&5 $as_echo "$ax_cv_check_ldflags___Wl___minor_subsystem_version__Wl_0" >&6; } if test "x$ax_cv_check_ldflags___Wl___minor_subsystem_version__Wl_0" = xyes; then : - LDFLAGS="$LDFLAGS -Wl,--minor-subsystem-version -Wl,0" + +if ${LDFLAGS+:} false; then : + + case " $LDFLAGS " in #( + *" -Wl,--minor-subsystem-version -Wl,0 "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -Wl,--minor-subsystem-version -Wl,0"; } >&5 + (: LDFLAGS already contains -Wl,--minor-subsystem-version -Wl,0) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append LDFLAGS " -Wl,--minor-subsystem-version -Wl,0" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + LDFLAGS=-Wl,--minor-subsystem-version -Wl,0 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + else : fi @@ -17708,7 +19023,38 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___major_os_version__Wl_6" >&5 $as_echo "$ax_cv_check_ldflags___Wl___major_os_version__Wl_6" >&6; } if test "x$ax_cv_check_ldflags___Wl___major_os_version__Wl_6" = xyes; then : - LDFLAGS="$LDFLAGS -Wl,--major-os-version -Wl,6" + +if ${LDFLAGS+:} false; then : + + case " $LDFLAGS " in #( + *" -Wl,--major-os-version -Wl,6 "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -Wl,--major-os-version -Wl,6"; } >&5 + (: LDFLAGS already contains -Wl,--major-os-version -Wl,6) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append LDFLAGS " -Wl,--major-os-version -Wl,6" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + LDFLAGS=-Wl,--major-os-version -Wl,6 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + else : fi @@ -17728,80 +19074,536 @@ main () { - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_ldflags___Wl___minor_os_version__Wl_0=yes -else - ax_cv_check_ldflags___Wl___minor_os_version__Wl_0=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$ax_check_save_flags -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___minor_os_version__Wl_0" >&5 -$as_echo "$ax_cv_check_ldflags___Wl___minor_os_version__Wl_0" >&6; } -if test "x$ax_cv_check_ldflags___Wl___minor_os_version__Wl_0" = xyes; then : - LDFLAGS="$LDFLAGS -Wl,--minor-os-version -Wl,0" + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_check_ldflags___Wl___minor_os_version__Wl_0=yes +else + ax_cv_check_ldflags___Wl___minor_os_version__Wl_0=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___minor_os_version__Wl_0" >&5 +$as_echo "$ax_cv_check_ldflags___Wl___minor_os_version__Wl_0" >&6; } +if test "x$ax_cv_check_ldflags___Wl___minor_os_version__Wl_0" = xyes; then : + +if ${LDFLAGS+:} false; then : + + case " $LDFLAGS " in #( + *" -Wl,--minor-os-version -Wl,0 "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -Wl,--minor-os-version -Wl,0"; } >&5 + (: LDFLAGS already contains -Wl,--minor-os-version -Wl,0) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append LDFLAGS " -Wl,--minor-os-version -Wl,0" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + LDFLAGS=-Wl,--minor-os-version -Wl,0 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + + + # Set the Large Address Aware flag on 32bit Windows + if ! echo $host_cpu | grep "x86_64" > /dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--large-address-aware" >&5 +$as_echo_n "checking whether the linker accepts -Wl,--large-address-aware... " >&6; } +if ${ax_cv_check_ldflags___Wl___large_address_aware+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,--large-address-aware" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_check_ldflags___Wl___large_address_aware=yes +else + ax_cv_check_ldflags___Wl___large_address_aware=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___large_address_aware" >&5 +$as_echo "$ax_cv_check_ldflags___Wl___large_address_aware" >&6; } +if test "x$ax_cv_check_ldflags___Wl___large_address_aware" = xyes; then : + +if ${LDFLAGS+:} false; then : + + case " $LDFLAGS " in #( + *" -Wl,--large-address-aware "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -Wl,--large-address-aware"; } >&5 + (: LDFLAGS already contains -Wl,--large-address-aware) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append LDFLAGS " -Wl,--large-address-aware" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + LDFLAGS=-Wl,--large-address-aware + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + + fi + fi + + # Mac OS X specific checks + # ------------------------ + + # Create application bundle on OS X + if echo $WX_CPPFLAGS | grep __WXMAC__; then + macappbundle="yes" + else + macappbundle="no" + fi + + # Check whether --enable-mac-sandbox was given. +if test "${enable_mac_sandbox+set}" = set; then : + enableval=$enable_mac_sandbox; use_mac_sandbox="$enableval" +else + use_mac_sandbox="no" +fi + + if test "$use_mac_sandbox" == "yes"; then + +$as_echo "#define USE_MAC_SANDBOX 1" >>confdefs.h + + CFBUNDLEIDSUFFIX=".sandbox" + else + CFBUNDLEIDSUFFIX="" + fi + + + if test "$macappbundle" = "yes"; then + ac_ext=m +ac_cpp='$OBJCPP $CPPFLAGS' +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objc_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in gcc objcc objc cc CC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJC"; then + ac_cv_prog_OBJC="$OBJC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJC=$ac_cv_prog_OBJC +if test -n "$OBJC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJC" >&5 +$as_echo "$OBJC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$OBJC" && break + done +fi +if test -z "$OBJC"; then + ac_ct_OBJC=$OBJC + for ac_prog in gcc objcc objc cc CC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJC"; then + ac_cv_prog_ac_ct_OBJC="$ac_ct_OBJC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJC=$ac_cv_prog_ac_ct_OBJC +if test -n "$ac_ct_OBJC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJC" >&5 +$as_echo "$ac_ct_OBJC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_OBJC" && break +done + + if test "x$ac_ct_OBJC" = x; then + OBJC="gcc" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJC=$ac_ct_OBJC + fi +fi + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 +$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } +if ${ac_cv_objc_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_objc_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_objc_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objc_compiler_gnu" >&5 +$as_echo "$ac_cv_objc_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GOBJC=yes +else + GOBJC= +fi +ac_test_OBJCFLAGS=${OBJCFLAGS+set} +ac_save_OBJCFLAGS=$OBJCFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 +$as_echo_n "checking whether $OBJC accepts -g... " >&6; } +if ${ac_cv_prog_objc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_objc_werror_flag=$ac_objc_werror_flag + ac_objc_werror_flag=yes + ac_cv_prog_objc_g=no + OBJCFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_objc_try_compile "$LINENO"; then : + ac_cv_prog_objc_g=yes +else + OBJCFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_objc_try_compile "$LINENO"; then : + +else + ac_objc_werror_flag=$ac_save_objc_werror_flag + OBJCFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_objc_try_compile "$LINENO"; then : + ac_cv_prog_objc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_objc_werror_flag=$ac_save_objc_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objc_g" >&5 +$as_echo "$ac_cv_prog_objc_g" >&6; } +if test "$ac_test_OBJCFLAGS" = set; then + OBJCFLAGS=$ac_save_OBJCFLAGS +elif test $ac_cv_prog_objc_g = yes; then + if test "$GOBJC" = yes; then + OBJCFLAGS="-g -O2" + else + OBJCFLAGS="-g" + fi +else + if test "$GOBJC" = yes; then + OBJCFLAGS="-O2" + else + OBJCFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$OBJC" am_compiler_list='gcc3 gcc' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_OBJC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + 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". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_OBJC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_OBJC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir else - : + am_cv_OBJC_dependencies_compiler_type=none fi - - # Set the Large Address Aware flag on 32bit Windows - if ! echo $host_cpu | grep "x86_64" > /dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--large-address-aware" >&5 -$as_echo_n "checking whether the linker accepts -Wl,--large-address-aware... " >&6; } -if ${ax_cv_check_ldflags___Wl___large_address_aware+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ax_check_save_flags=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,--large-address-aware" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_ldflags___Wl___large_address_aware=yes -else - ax_cv_check_ldflags___Wl___large_address_aware=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$ax_check_save_flags -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___large_address_aware" >&5 -$as_echo "$ax_cv_check_ldflags___Wl___large_address_aware" >&6; } -if test "x$ax_cv_check_ldflags___Wl___large_address_aware" = xyes; then : - LDFLAGS="$LDFLAGS -Wl,--large-address-aware" -else - : fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; } +OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type - fi - fi + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then + am__fastdepOBJC_TRUE= + am__fastdepOBJC_FALSE='#' +else + am__fastdepOBJC_TRUE='#' + am__fastdepOBJC_FALSE= fi -if test "$buildmain" = "yes"; then - - # Mac OS X specific checks - # ------------------------ - # Create application bundle on OS X - if echo $WX_CPPFLAGS | grep __WXMAC__; then - macappbundle="yes" - else - macappbundle="no" fi # Installer creation under Windows @@ -17854,6 +19656,7 @@ #ifdef AI_IDN int ok; + (void) ok; #else choke me #endif @@ -18018,186 +19821,277 @@ # ------------- +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cppunit >= 1.13.0" >&5 +$as_echo_n "checking for cppunit >= 1.13.0... " >&6; } + +if test -n "$CPPUNIT_CFLAGS"; then + pkg_cv_CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.13.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cppunit >= 1.13.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.13.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$CPPUNIT_LIBS"; then + pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.13.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cppunit >= 1.13.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.13.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cppunit >= 1.13.0" 2>&1` + else + CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cppunit >= 1.13.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$CPPUNIT_PKG_ERRORS" >&5 -# Check whether --with-cppunit-prefix was given. -if test "${with_cppunit_prefix+set}" = set; then : - withval=$with_cppunit_prefix; cppunit_config_prefix="$withval" + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : else - cppunit_config_prefix="" + CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS + CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + has_cppunit="yes" fi + # Updatecheck related flags + # ------------------------- -# Check whether --with-cppunit-exec-prefix was given. -if test "${with_cppunit_exec_prefix+set}" = set; then : - withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval" + # Check whether --enable-manualupdatecheck was given. +if test "${enable_manualupdatecheck+set}" = set; then : + enableval=$enable_manualupdatecheck; manualupdatecheck="$enableval" else - cppunit_config_exec_prefix="" + manualupdatecheck="yes" fi - if test x$cppunit_config_exec_prefix != x ; then - cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config - fi - fi - if test x$cppunit_config_prefix != x ; then - cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config - fi + if test "$manualupdatecheck" = "no"; then + manualupdatecheck="0" + else + manualupdatecheck="1" fi - # Extract the first word of "cppunit-config", so it can be a program name with args. -set dummy cppunit-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 +cat >>confdefs.h <<_ACEOF +#define FZ_MANUALUPDATECHECK $manualupdatecheck +_ACEOF + + + # Check whether --enable-autoupdatecheck was given. +if test "${enable_autoupdatecheck+set}" = set; then : + enableval=$enable_autoupdatecheck; autoupdatecheck="$enableval" else - case $CPPUNIT_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_CPPUNIT_CONFIG="$CPPUNIT_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + autoupdatecheck="yes" +fi + + + if test "$manualupdatecheck" = "1" -a "$autoupdatecheck" != "no"; then + autoupdatecheck="1" + else + autoupdatecheck="0" fi -done - done -IFS=$as_save_IFS - test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no" - ;; -esac +cat >>confdefs.h <<_ACEOF +#define FZ_AUTOUPDATECHECK $autoupdatecheck +_ACEOF + + + # Nettle + # ------ + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nettle >= 3.1" >&5 +$as_echo_n "checking for nettle >= 3.1... " >&6; } + +if test -n "$NETTLE_CFLAGS"; then + pkg_cv_NETTLE_CFLAGS="$NETTLE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nettle >= 3.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "nettle >= 3.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NETTLE_CFLAGS=`$PKG_CONFIG --cflags "nettle >= 3.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG -if test -n "$CPPUNIT_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5 -$as_echo "$CPPUNIT_CONFIG" >&6; } +if test -n "$NETTLE_LIBS"; then + pkg_cv_NETTLE_LIBS="$NETTLE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nettle >= 3.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "nettle >= 3.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NETTLE_LIBS=`$PKG_CONFIG --libs "nettle >= 3.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + NETTLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nettle >= 3.1" 2>&1` + else + NETTLE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nettle >= 3.1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NETTLE_PKG_ERRORS" >&5 - cppunit_version_min=1.10.2 + as_fn_error $? "nettle 3.1 greater was not found. You can get it from https://www.lysator.liu.se/~nisse/nettle/" "$LINENO" 5 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5 -$as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; } - no_cppunit="" - if test "$CPPUNIT_CONFIG" = "no" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - no_cppunit=yes - else - CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags` - CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs` - cppunit_version=`$CPPUNIT_CONFIG --version` - cppunit_major_version=`echo $cppunit_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - cppunit_minor_version=`echo $cppunit_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - cppunit_micro_version=`echo $cppunit_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + as_fn_error $? "nettle 3.1 greater was not found. You can get it from https://www.lysator.liu.se/~nisse/nettle/" "$LINENO" 5 - cppunit_major_min=`echo $cppunit_version_min | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - if test "x${cppunit_major_min}" = "x" ; then - cppunit_major_min=0 - fi +else + NETTLE_CFLAGS=$pkg_cv_NETTLE_CFLAGS + NETTLE_LIBS=$pkg_cv_NETTLE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hogweed >= 3.1" >&5 +$as_echo_n "checking for hogweed >= 3.1... " >&6; } + +if test -n "$HOGWEED_CFLAGS"; then + pkg_cv_HOGWEED_CFLAGS="$HOGWEED_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hogweed >= 3.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "hogweed >= 3.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_HOGWEED_CFLAGS=`$PKG_CONFIG --cflags "hogweed >= 3.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$HOGWEED_LIBS"; then + pkg_cv_HOGWEED_LIBS="$HOGWEED_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hogweed >= 3.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "hogweed >= 3.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_HOGWEED_LIBS=`$PKG_CONFIG --libs "hogweed >= 3.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi - cppunit_minor_min=`echo $cppunit_version_min | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - if test "x${cppunit_minor_min}" = "x" ; then - cppunit_minor_min=0 - fi - cppunit_micro_min=`echo $cppunit_version_min | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x${cppunit_micro_min}" = "x" ; then - cppunit_micro_min=0 - fi - cppunit_version_proper=`expr \ - $cppunit_major_version \> $cppunit_major_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \> $cppunit_minor_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \= $cppunit_minor_min \& \ - $cppunit_micro_version \>= $cppunit_micro_min ` - - if test "$cppunit_version_proper" = "1" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5 -$as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - no_cppunit=yes - fi - fi - - if test "x$no_cppunit" = x ; then - has_cppunit="yes" - else - CPPUNIT_CFLAGS="" - CPPUNIT_LIBS="" - : - fi - - - - - - # Updatecheck related flags - # ------------------------- - # Check whether --enable-manualupdatecheck was given. -if test "${enable_manualupdatecheck+set}" = set; then : - enableval=$enable_manualupdatecheck; manualupdatecheck="$enableval" +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - manualupdatecheck="yes" + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + HOGWEED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "hogweed >= 3.1" 2>&1` + else + HOGWEED_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "hogweed >= 3.1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$HOGWEED_PKG_ERRORS" >&5 - if test "$manualupdatecheck" = "no"; then - manualupdatecheck="0" - else - manualupdatecheck="1" - fi + as_fn_error $? "hogweed 3.1 greater was not found. You can get it from https://www.lysator.liu.se/~nisse/nettle/" "$LINENO" 5 -cat >>confdefs.h <<_ACEOF -#define FZ_MANUALUPDATECHECK $manualupdatecheck -_ACEOF +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "hogweed 3.1 greater was not found. You can get it from https://www.lysator.liu.se/~nisse/nettle/" "$LINENO" 5 - # Check whether --enable-autoupdatecheck was given. -if test "${enable_autoupdatecheck+set}" = set; then : - enableval=$enable_autoupdatecheck; autoupdatecheck="$enableval" else - autoupdatecheck="yes" -fi + HOGWEED_CFLAGS=$pkg_cv_HOGWEED_CFLAGS + HOGWEED_LIBS=$pkg_cv_HOGWEED_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi - if test "$manualupdatecheck" = "1" -a "$autoupdatecheck" != "no"; then - autoupdatecheck="1" - else - autoupdatecheck="0" - fi -cat >>confdefs.h <<_ACEOF -#define FZ_AUTOUPDATECHECK $autoupdatecheck -_ACEOF # GnuTLS @@ -18205,19 +20099,19 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNUTLS" >&5 -$as_echo_n "checking for LIBGNUTLS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 3.4.15" >&5 +$as_echo_n "checking for gnutls >= 3.4.15... " >&6; } if test -n "$LIBGNUTLS_CFLAGS"; then pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.1.12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnutls >= 3.1.12") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.4.15\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnutls >= 3.4.15") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 3.1.12" 2>/dev/null` + pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 3.4.15" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18229,12 +20123,12 @@ pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.1.12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnutls >= 3.1.12") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.4.15\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnutls >= 3.4.15") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 3.1.12" 2>/dev/null` + pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 3.4.15" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18246,7 +20140,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18255,21 +20149,21 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 3.1.12" 2>&1` + LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 3.4.15" 2>&1` else - LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 3.1.12" 2>&1` + LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 3.4.15" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBGNUTLS_PKG_ERRORS" >&5 - as_fn_error $? "libgnutls 3.1.12 greater was not found. You can get it from http://gnutls.org/" "$LINENO" 5 + as_fn_error $? "libgnutls 3.4.15 or greater was not found. You can get it from https://gnutls.org/" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "libgnutls 3.1.12 greater was not found. You can get it from http://gnutls.org/" "$LINENO" 5 + as_fn_error $? "libgnutls 3.4.15 or greater was not found. You can get it from https://gnutls.org/" "$LINENO" 5 else LIBGNUTLS_CFLAGS=$pkg_cv_LIBGNUTLS_CFLAGS @@ -18323,15 +20217,16 @@ fi - if test "x$with_pugixml" != "xbuiltin"; then - ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test "x$with_pugixml" != "xbuiltin"; then + ac_fn_cxx_check_header_mongrel "$LINENO" "pugixml.hpp" "ac_cv_header_pugixml_hpp" "$ac_includes_default" if test "x$ac_cv_header_pugixml_hpp" = xyes; then : @@ -18347,6 +20242,9 @@ + fi + + if test "x$with_pugixml" != "xbuiltin"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpugixml" >&5 $as_echo_n "checking for main in -lpugixml... " >&6; } if ${ac_cv_lib_pugixml_main+:} false; then : @@ -18390,7 +20288,9 @@ fi ac_cv_lib_pugixml=ac_cv_lib_pugixml_main + fi + if test "x$with_pugixml" != "xbuiltin"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pugixml >= 1.5" >&5 $as_echo_n "checking for pugixml >= 1.5... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18419,11 +20319,17 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "pugixml system library is too old, you need at least version 1.5" "$LINENO" 5 + if test "x$with_pugixml" = "xsystem"; then + as_fn_error $? "pugixml system library is too old, you need at least version 1.5" "$LINENO" 5 + else + with_pugixml=builtin + fi fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test "x$with_pugixml" != "xbuiltin"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pugixml has been compiled with long long support" >&5 $as_echo_n "checking whether pugixml has been compiled with long long support... " >&6; } old_libs="$LIBS" @@ -18458,20 +20364,26 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "pugixml system library has been compiled without long long support" "$LINENO" 5 + if test "x$with_pugixml" = "xsystem"; then + as_fn_error $? "pugixml system library has been compiled without long long support" "$LINENO" 5 + else + with_pugixml=builtin + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$old_libs" + fi - ac_ext=c + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "x$with_pugixml" != "xbuiltin"; then { $as_echo "$as_me:${as_lineno-$LINENO}: Using system pugixml" >&5 $as_echo "$as_me: Using system pugixml" >&6;} @@ -18481,7 +20393,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: Using builtin pugixml" >&5 $as_echo "$as_me: Using builtin pugixml" >&6;} - PUGIXML_LIBS="../pugixml/libpugixml.a" + PUGIXML_LIBS="\$(top_builddir)/src/pugixml/libpugixml.a" fi @@ -18523,8 +20435,8 @@ if test "$with_dbus" != "no"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDBUS" >&5 -$as_echo_n "checking for LIBDBUS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1 >= 1.2" >&5 +$as_echo_n "checking for dbus-1 >= 1.2... " >&6; } if test -n "$LIBDBUS_CFLAGS"; then pkg_cv_LIBDBUS_CFLAGS="$LIBDBUS_CFLAGS" @@ -18564,7 +20476,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18583,8 +20495,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDBUS" >&5 -$as_echo_n "checking for LIBDBUS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1" >&5 +$as_echo_n "checking for dbus-1... " >&6; } if test -n "$LIBDBUS_CFLAGS"; then pkg_cv_LIBDBUS_CFLAGS="$LIBDBUS_CFLAGS" @@ -18624,7 +20536,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18644,7 +20556,7 @@ as_fn_error $? "libdbus not found. Install libdbus or configure with --without-dbus" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "libdbus not found. Install libdbus or configure with --without-dbus" "$LINENO" 5 @@ -18658,13 +20570,13 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDBUS" >&5 -$as_echo_n "checking for LIBDBUS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1" >&5 +$as_echo_n "checking for dbus-1... " >&6; } if test -n "$LIBDBUS_CFLAGS"; then pkg_cv_LIBDBUS_CFLAGS="$LIBDBUS_CFLAGS" @@ -18704,7 +20616,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18724,7 +20636,7 @@ as_fn_error $? "libdbus not found. Install libdbus or configure with --without-dbus" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "libdbus not found. Install libdbus or configure with --without-dbus" "$LINENO" 5 @@ -18805,8 +20717,8 @@ if echo "`$WX_CONFIG_WITH_ARGS --basename`" | grep -i gtk2 > /dev/null 2>&1; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGTK" >&5 -$as_echo_n "checking for LIBGTK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5 +$as_echo_n "checking for gtk+-2.0... " >&6; } if test -n "$LIBGTK_CFLAGS"; then pkg_cv_LIBGTK_CFLAGS="$LIBGTK_CFLAGS" @@ -18846,7 +20758,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18866,7 +20778,7 @@ as_fn_error $? "gtk+-2.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "gtk+-2.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5 @@ -18882,8 +20794,8 @@ if echo "`$WX_CONFIG_WITH_ARGS --basename`" | grep -i gtk3 > /dev/null 2>&1; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGTK" >&5 -$as_echo_n "checking for LIBGTK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0" >&5 +$as_echo_n "checking for gtk+-3.0... " >&6; } if test -n "$LIBGTK_CFLAGS"; then pkg_cv_LIBGTK_CFLAGS="$LIBGTK_CFLAGS" @@ -18923,7 +20835,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18943,7 +20855,7 @@ as_fn_error $? "gtk+-3.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+3.0 development files?" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "gtk+-3.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+3.0 development files?" "$LINENO" 5 @@ -19005,7 +20917,7 @@ int main () { -struct dirent dp; dp.d_type = 0; +struct dirent dp; dp.d_type = 0;(void)dp; ; return 0; } @@ -19161,16 +21073,46 @@ - for ac_func in clock_gettime -do : - ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" -if test "x$ac_cv_func_clock_gettime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_CLOCK_GETTIME 1 + # Must be done after setting linker flags + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5 +$as_echo_n "checking for clock_gettime... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + +int +main () +{ + + (void)clock_gettime; + return 0; + + ; + return 0; +} + _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + + : + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : fi -done +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_fn_c_check_decl "$LINENO" "pthread_condattr_setclock" "ac_cv_have_decl_pthread_condattr_setclock" "#include " @@ -19190,8 +21132,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSQLITE3" >&5 -$as_echo_n "checking for LIBSQLITE3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7" >&5 +$as_echo_n "checking for sqlite3 >= 3.7... " >&6; } if test -n "$LIBSQLITE3_CFLAGS"; then pkg_cv_LIBSQLITE3_CFLAGS="$LIBSQLITE3_CFLAGS" @@ -19231,7 +21173,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -19306,7 +21248,7 @@ elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -19377,6 +21319,112 @@ + # Find libstorj + # ----------------- + + # Check whether --enable-storj was given. +if test "${enable_storj+set}" = set; then : + enableval=$enable_storj; + +else + + enable_storj="no" + +fi + + + if test "$enable_storj" != "no"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstorj >= 1.0" >&5 +$as_echo_n "checking for libstorj >= 1.0... " >&6; } + +if test -n "$LIBSTORJ_CFLAGS"; then + pkg_cv_LIBSTORJ_CFLAGS="$LIBSTORJ_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstorj >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libstorj >= 1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBSTORJ_CFLAGS=`$PKG_CONFIG --cflags "libstorj >= 1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBSTORJ_LIBS"; then + pkg_cv_LIBSTORJ_LIBS="$LIBSTORJ_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstorj >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libstorj >= 1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBSTORJ_LIBS=`$PKG_CONFIG --libs "libstorj >= 1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBSTORJ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libstorj >= 1.0" 2>&1` + else + LIBSTORJ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libstorj >= 1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBSTORJ_PKG_ERRORS" >&5 + + + if test "$enable_storj" = "yes"; then + as_fn_error $? "libstorj not found: $LIBSTORJ_PKG_ERRORS. You can download it from https://github.com/Storj/libstorj" "$LINENO" 5 + else + enable_storj="no" + fi + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + if test "$enable_storj" = "yes"; then + as_fn_error $? "libstorj not found: $LIBSTORJ_PKG_ERRORS. You can download it from https://github.com/Storj/libstorj" "$LINENO" 5 + else + enable_storj="no" + fi + +else + LIBSTORJ_CFLAGS=$pkg_cv_LIBSTORJ_CFLAGS + LIBSTORJ_LIBS=$pkg_cv_LIBSTORJ_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + +$as_echo "#define ENABLE_STORJ 1" >>confdefs.h + + enable_storj="yes" + +fi + + + fi fi # Everything translation related @@ -19704,6 +21752,14 @@ MACAPPBUNDLE_FALSE= fi + if test "$use_mac_sandbox" = "yes"; then + USE_MAC_SANDBOX_TRUE= + USE_MAC_SANDBOX_FALSE='#' +else + USE_MAC_SANDBOX_TRUE='#' + USE_MAC_SANDBOX_FALSE= +fi + if test "$makensisscript" = "yes"; then MAKENSISSCRIPT_TRUE= MAKENSISSCRIPT_FALSE='#' @@ -19752,8 +21808,16 @@ HAVE_DBUS_FALSE= fi + if test "x$enable_storj" = "xyes"; then + ENABLE_STORJ_TRUE= + ENABLE_STORJ_FALSE='#' +else + ENABLE_STORJ_TRUE='#' + ENABLE_STORJ_FALSE= +fi -ac_config_files="$ac_config_files Makefile src/Makefile src/engine/Makefile src/pugixml/Makefile src/dbus/Makefile src/interface/Makefile src/interface/resources/Makefile src/include/Makefile locales/Makefile src/interface/resources/16x16/Makefile src/interface/resources/32x32/Makefile data/Makefile src/interface/resources/cyril/Makefile src/interface/resources/cyril/16x16/Makefile src/interface/resources/blukis/Makefile src/interface/resources/flatzilla/Makefile src/interface/resources/lone/Makefile src/interface/resources/minimal/Makefile src/interface/resources/opencrystal/Makefile src/interface/resources/sun/Makefile src/interface/resources/tango/Makefile src/putty/Makefile src/putty/unix/Makefile src/putty/windows/Makefile tests/Makefile src/interface/resources/version.rc src/interface/resources/MacInfo.plist src/fzshellext/version.rc" + +ac_config_files="$ac_config_files Makefile src/Makefile src/engine/Makefile src/pugixml/Makefile src/dbus/Makefile src/interface/Makefile src/interface/resources/Makefile src/include/Makefile locales/Makefile data/Makefile src/interface/resources/classic/Makefile src/interface/resources/cyril/Makefile src/interface/resources/cyril/16x16/Makefile src/interface/resources/blukis/Makefile src/interface/resources/default/Makefile src/interface/resources/flatzilla/Makefile src/interface/resources/lone/Makefile src/interface/resources/minimal/Makefile src/interface/resources/opencrystal/Makefile src/interface/resources/sun/Makefile src/interface/resources/tango/Makefile src/putty/Makefile src/putty/unix/Makefile src/putty/windows/Makefile src/storj/Makefile tests/Makefile src/interface/resources/version.rc src/interface/resources/MacInfo.plist src/fzshellext/version.rc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19892,6 +21956,14 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${MINGW_TRUE}" && test -z "${MINGW_FALSE}"; then as_fn_error $? "conditional \"MINGW\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19920,6 +21992,10 @@ as_fn_error $? "conditional \"MACAPPBUNDLE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_MAC_SANDBOX_TRUE}" && test -z "${USE_MAC_SANDBOX_FALSE}"; then + as_fn_error $? "conditional \"USE_MAC_SANDBOX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${MAKENSISSCRIPT_TRUE}" && test -z "${MAKENSISSCRIPT_FALSE}"; then as_fn_error $? "conditional \"MAKENSISSCRIPT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19944,6 +22020,10 @@ as_fn_error $? "conditional \"HAVE_DBUS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_STORJ_TRUE}" && test -z "${ENABLE_STORJ_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_STORJ\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -20341,7 +22421,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FileZilla $as_me 3.15.0.2, which was +This file was extended by FileZilla $as_me 3.33.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20408,7 +22488,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -FileZilla config.status 3.15.0.2 +FileZilla config.status 3.33.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20543,6 +22623,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -20592,10 +22673,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -20660,7 +22744,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -20765,9 +22850,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -20833,7 +22921,7 @@ compiler_lib_search_path_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -20860,7 +22948,8 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path \ reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ @@ -20874,7 +22963,7 @@ postlink_cmds_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -20883,19 +22972,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -20926,12 +23012,12 @@ "src/interface/resources/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/Makefile" ;; "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;; "locales/Makefile") CONFIG_FILES="$CONFIG_FILES locales/Makefile" ;; - "src/interface/resources/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/16x16/Makefile" ;; - "src/interface/resources/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/32x32/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "src/interface/resources/classic/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/classic/Makefile" ;; "src/interface/resources/cyril/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/cyril/Makefile" ;; "src/interface/resources/cyril/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/cyril/16x16/Makefile" ;; "src/interface/resources/blukis/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/blukis/Makefile" ;; + "src/interface/resources/default/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/default/Makefile" ;; "src/interface/resources/flatzilla/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/flatzilla/Makefile" ;; "src/interface/resources/lone/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/lone/Makefile" ;; "src/interface/resources/minimal/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/minimal/Makefile" ;; @@ -20941,6 +23027,7 @@ "src/putty/Makefile") CONFIG_FILES="$CONFIG_FILES src/putty/Makefile" ;; "src/putty/unix/Makefile") CONFIG_FILES="$CONFIG_FILES src/putty/unix/Makefile" ;; "src/putty/windows/Makefile") CONFIG_FILES="$CONFIG_FILES src/putty/windows/Makefile" ;; + "src/storj/Makefile") CONFIG_FILES="$CONFIG_FILES src/storj/Makefile" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "src/interface/resources/version.rc") CONFIG_FILES="$CONFIG_FILES src/interface/resources/version.rc" ;; "src/interface/resources/MacInfo.plist") CONFIG_FILES="$CONFIG_FILES src/interface/resources/MacInfo.plist" ;; @@ -21635,55 +23722,52 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Generated automatically by $as_me ($PACKAGE) $VERSION # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="CXX " +available_tags='CXX ' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -21703,6 +23787,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -21820,18 +23907,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -21922,8 +24018,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -22016,13 +24115,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -22088,13 +24187,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -22103,7 +24261,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -22113,165 +24271,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -22358,13 +24357,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute_CXX diff -Nru filezilla-3.15.0.2/configure.ac filezilla-3.33.0/configure.ac --- filezilla-3.15.0.2/configure.ac 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/configure.ac 2018-05-07 08:23:08.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([FileZilla],[3.15.0.2],[tim.kosse@filezilla-project.org],[],[https://filezilla-project.org/]) +AC_INIT([FileZilla],[3.33.0],[tim.kosse@filezilla-project.org],[],[https://filezilla-project.org/]) AC_CONFIG_HEADERS([src/include/config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(config) @@ -13,6 +13,9 @@ LT_INIT LT_LANG([C++]) +# Todo: Use sub-configure for OSX specific code +_AM_DEPENDENCIES(OBJC) + AC_CACHE_SAVE AC_ARG_ENABLE(locales, AS_HELP_STRING([--enable-locales],[Build message catalogs]), \ @@ -35,10 +38,26 @@ if ! test "$localesonly" = "yes"; then if test "X$GCC" = Xyes; then - CFLAGS="$CFLAGS -Wall -g" - CXXFLAGS="$CXXFLAGS -Wall -g" + AX_APPEND_FLAG(-Wall, CFLAGS) + AX_APPEND_FLAG(-g, CFLAGS) + AX_APPEND_FLAG(-Wall, CXXFLAGS) + AX_APPEND_FLAG(-g, CXXFLAGS) fi + # Do this early: Compiler and linker flags to work around a nasty bug in Xcode. + AX_CHECK_COMPILE_FLAG([-Werror=partial-availability], [ + # This warning should be on by default yet it's not even enabled by -Wall. Apple screwed up big time. + AX_APPEND_FLAG(-Werror=partial-availability, CFLAGS) + AX_APPEND_FLAG(-Werror=partial-availability, CXXFLAGS) + ]) + + AX_CHECK_LINK_FLAG([-Wl,-no_weak_imports], [ + # If the programmer wants weak symbols he would just used dlopen/dlsym + # But not so on Apple systems where even basic functions like clock_gettime can + # be randomly missing at runtime. + AX_APPEND_FLAG([-Wl,-no_weak_imports], LFDLAGS) + ]) + # Check for C++14 support CXX_COMPILE_STDCXX_14([],[mandatory]) CHECK_LIBCXX @@ -129,22 +148,21 @@ if test -z "$PKG_CONFIG"; then AC_MSG_ERROR([pkg-config not found. pkg-config is required to check for some dependencies.]) fi - + # Find libfilezilla # ----------------- - PKG_CHECK_MODULES(LIBFILEZILLA, [libfilezilla >= 0.3.0],, [ - AC_MSG_ERROR([libfilezilla not found. You can download it from https://lib.filezilla-project.org/]) + PKG_CHECK_MODULES(LIBFILEZILLA, [libfilezilla >= 0.12.2],, [ + AC_MSG_ERROR([libfilezilla not found: $LIBFILEZILLA_PKG_ERRORS. You can download it from https://lib.filezilla-project.org/]) ]) AC_SUBST(LIBFILEZILLA_CFLAGS) AC_SUBST(LIBFILEZILLA_LIBS) - # Detect wxWidgets # ---------------- AM_OPTIONS_WXCONFIG - MIN_WX_VERSION="3.0.2" + MIN_WX_VERSION="3.0.4" # Do not downgrade this. wx 3.0.3 and older have too many known and fixed bugs affecting FileZilla. AM_PATH_WXCONFIG([$MIN_WX_VERSION], [wxWin=1], , [aui,xrc,adv,core,xml,base], [--unicode=yes --universal=no]) if test "$wxWin" != 1; then AC_MSG_ERROR([ @@ -161,6 +179,11 @@ equivalent variable and wxWidgets version is $MIN_WX_VERSION or above. ]) fi + if test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" = "3.1"; then + AC_MSG_ERROR([You must use wxWidgets 3.0.x, development versions of wxWidgets are not supported.]) + elif test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" != "3.0"; then + AC_MSG_ERROR([You must use wxWidgets 3.0.x, wxWidgets 3.2 or higher is not yet supported.]) + fi # --universal=no doesn't work correctly, it still accepts universal builds. Reject it manually here. if echo "$WX_CPPFLAGS" | grep __WXUNIVERSAL__ > /dev/null; then @@ -172,6 +195,7 @@ CXXFLAGS_OLD="$CXXFLAGS" CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" + AC_MSG_CHECKING([positional printf argument support in wxWidgets]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[ @@ -186,6 +210,22 @@ AC_MSG_FAILURE([Positional printf argument support in wxWidgets is required by FileZilla. Please rebuild wxWidgets and pass --enable-printfposparam to its configure script.]) ] ) + + AC_MSG_CHECKING([GUI support in wxWidgets]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #include + #if !wxUSE_GUI + #error wx compiled without wxUSE_GUI + #endif + ]])], + AC_MSG_RESULT([yes]), + [ + AC_MSG_RESULT([no]) + AC_MSG_FAILURE([GUI support in wxWidgets is required by FileZilla. Please rebuild wxWidgets and pass --enable-gui to its configure script.]) + ] + ) + CPPFLAGS="$CPPFLAGS_OLD" CXXFLAGS="$CXXFLAGS_OLD" AC_LANG_POP @@ -323,26 +363,23 @@ # Enable DEP and ASLR linker flags # -------------------------------- - AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [LDFLAGS="$LDFLAGS -Wl,--dynamicbase"]) - AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [LDFLAGS="$LDFLAGS -Wl,--nxcompat"]) + AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [AX_APPEND_FLAG([-Wl,--dynamicbase], LDFLAGS)]) + AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [AX_APPEND_FLAG([-Wl,--nxcompat], LDFLAGS)]) # Set Windows-specific linker flags # --------------------------------- if echo $host_os | grep "cygwin\|mingw" > /dev/null 2>&1; then # We currently require Vista minimum. - AX_CHECK_LINK_FLAG([-Wl,--major-subsystem-version -Wl,6], [LDFLAGS="$LDFLAGS -Wl,--major-subsystem-version -Wl,6"]) - AX_CHECK_LINK_FLAG([-Wl,--minor-subsystem-version -Wl,0], [LDFLAGS="$LDFLAGS -Wl,--minor-subsystem-version -Wl,0"]) - AX_CHECK_LINK_FLAG([-Wl,--major-os-version -Wl,6], [LDFLAGS="$LDFLAGS -Wl,--major-os-version -Wl,6"]) - AX_CHECK_LINK_FLAG([-Wl,--minor-os-version -Wl,0], [LDFLAGS="$LDFLAGS -Wl,--minor-os-version -Wl,0"]) + AX_CHECK_LINK_FLAG([-Wl,--major-subsystem-version -Wl,6], [AX_APPEND_FLAG([-Wl,--major-subsystem-version -Wl,6], LDFLAGS)]) + AX_CHECK_LINK_FLAG([-Wl,--minor-subsystem-version -Wl,0], [AX_APPEND_FLAG([-Wl,--minor-subsystem-version -Wl,0], LDFLAGS)]) + AX_CHECK_LINK_FLAG([-Wl,--major-os-version -Wl,6], [AX_APPEND_FLAG([-Wl,--major-os-version -Wl,6], LDFLAGS)]) + AX_CHECK_LINK_FLAG([-Wl,--minor-os-version -Wl,0], [AX_APPEND_FLAG([-Wl,--minor-os-version -Wl,0], LDFLAGS)]) # Set the Large Address Aware flag on 32bit Windows if ! echo $host_cpu | grep "x86_64" > /dev/null 2>&1; then - AX_CHECK_LINK_FLAG([-Wl,--large-address-aware], [LDFLAGS="$LDFLAGS -Wl,--large-address-aware"]) + AX_CHECK_LINK_FLAG([-Wl,--large-address-aware], [AX_APPEND_FLAG([-Wl,--large-address-aware], LDFLAGS)]) fi fi -fi - -if test "$buildmain" = "yes"; then # Mac OS X specific checks # ------------------------ @@ -354,6 +391,21 @@ macappbundle="no" fi + AC_ARG_ENABLE(mac-sandbox, AS_HELP_STRING([--enable-mac-sandbox],[Enables use of OS X's App Sandbox.]), + [use_mac_sandbox="$enableval"], [use_mac_sandbox="no"]) + if test "$use_mac_sandbox" == "yes"; then + AC_DEFINE([USE_MAC_SANDBOX], [1], + [Define to 1 if the App Sandbox on OS X should be used.]) + CFBUNDLEIDSUFFIX=".sandbox" + else + CFBUNDLEIDSUFFIX="" + fi + AC_SUBST(CFBUNDLEIDSUFFIX) + + if test "$macappbundle" = "yes"; then + AC_PROG_OBJC + fi + # Installer creation under Windows # -------------------------------- @@ -462,7 +514,7 @@ # CppUnit tests # ------------- - AM_PATH_CPPUNIT([1.10.2], [has_cppunit="yes"]) + PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.13.0], [has_cppunit="yes"], [:]) # Updatecheck related flags # ------------------------- @@ -487,11 +539,28 @@ fi AC_DEFINE_UNQUOTED(FZ_AUTOUPDATECHECK, $autoupdatecheck, [Set to 1 to add support for automated update checks]) + # Nettle + # ------ + + PKG_CHECK_MODULES([NETTLE], [nettle >= 3.1],, [ + AC_MSG_ERROR([nettle 3.1 greater was not found. You can get it from https://www.lysator.liu.se/~nisse/nettle/]) + ]) + + AC_SUBST(NETTLE_LIBS) + AC_SUBST(NETTLE_CFLAGS) + + PKG_CHECK_MODULES([HOGWEED], [hogweed >= 3.1],, [ + AC_MSG_ERROR([hogweed 3.1 greater was not found. You can get it from https://www.lysator.liu.se/~nisse/nettle/]) + ]) + + AC_SUBST(HOGWEED_LIBS) + AC_SUBST(HOGWEED_CFLAGS) + # GnuTLS # ------ - PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.1.12],, [ - AC_MSG_ERROR([libgnutls 3.1.12 greater was not found. You can get it from http://gnutls.org/]) + PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.4.15],, [ + AC_MSG_ERROR([libgnutls 3.4.15 or greater was not found. You can get it from https://gnutls.org/]) ]) AC_SUBST(LIBGNUTLS_LIBS) @@ -503,7 +572,7 @@ if test "$gnutlssystemciphers" = "yes"; then AC_DEFINE(FZ_USE_GNUTLS_SYSTEM_CIPHERS, 1, [Set to 1 to use ciphers defined in system policy.]) fi - + # pugixml # ------ @@ -587,7 +656,8 @@ CHECK_THREADSAFE_GMTIME CHECK_INVERSE_GMTIME - AC_CHECK_FUNCS([clock_gettime]) + # Must be done after setting linker flags + CHECK_CLOCK_GETTIME AC_CHECK_DECLS([pthread_condattr_setclock], [], [], [[#include ]]) # SQLite3 @@ -609,6 +679,30 @@ AC_SUBST(LIBSQLITE3_LIBS) AC_SUBST(LIBSQLITE3_CFLAGS) + # Find libstorj + # ----------------- + + AC_ARG_ENABLE(storj, AS_HELP_STRING([--enable-storj@<:@=ARG@:>@],[Enable support for the Storj decentralized cloud storage provider. Default: no]), + [ + ], + [ + enable_storj="no" + ]) + + if test "$enable_storj" != "no"; then + PKG_CHECK_MODULES(LIBSTORJ, [libstorj >= 1.0],[ + AC_DEFINE([ENABLE_STORJ], [1], [Define if building with Storj support.]) + enable_storj="yes" + ], [ + if test "$enable_storj" = "yes"; then + AC_MSG_ERROR([libstorj not found: $LIBSTORJ_PKG_ERRORS. You can download it from https://github.com/Storj/libstorj]) + else + enable_storj="no" + fi + ]) + AC_SUBST(LIBSTORJ_CFLAGS) + AC_SUBST(LIBSTORJ_LIBS) + fi fi # Everything translation related @@ -687,21 +781,25 @@ AM_CONDITIONAL(SFTP_UNIX, [test "$sftpbuild" = "unix"]) AM_CONDITIONAL(USE_RESOURCEFILE, test "$use_resourcefile" = "true") AM_CONDITIONAL(MACAPPBUNDLE, [test "$macappbundle" = "yes"]) +AM_CONDITIONAL(USE_MAC_SANDBOX, [test "$use_mac_sandbox" = "yes"]) AM_CONDITIONAL(MAKENSISSCRIPT, [test "$makensisscript" = "yes"]) AM_CONDITIONAL(USE_BINRELOC, test "$use_binreloc" = "yes") AM_CONDITIONAL(ENABLE_PRECOMP, test "x$use_precomp" = "xyes") AM_CONDITIONAL(HAS_CPPUNIT, [test "$has_cppunit" = "yes"]) AM_CONDITIONAL(HAVE_LIBPUGIXML, [test "x$with_pugixml" = "xsystem"]) AM_CONDITIONAL(HAVE_DBUS, [test "x$with_dbus" = "xyes"]) +AM_CONDITIONAL(ENABLE_STORJ, [test "x$enable_storj" = "xyes"]) AC_CONFIG_FILES(Makefile src/Makefile src/engine/Makefile src/pugixml/Makefile src/dbus/Makefile src/interface/Makefile src/interface/resources/Makefile src/include/Makefile -locales/Makefile src/interface/resources/16x16/Makefile -src/interface/resources/32x32/Makefile data/Makefile +locales/Makefile +data/Makefile +src/interface/resources/classic/Makefile src/interface/resources/cyril/Makefile src/interface/resources/cyril/16x16/Makefile src/interface/resources/blukis/Makefile +src/interface/resources/default/Makefile src/interface/resources/flatzilla/Makefile src/interface/resources/lone/Makefile src/interface/resources/minimal/Makefile @@ -711,6 +809,7 @@ src/putty/Makefile src/putty/unix/Makefile src/putty/windows/Makefile +src/storj/Makefile tests/Makefile src/interface/resources/version.rc src/interface/resources/MacInfo.plist diff -Nru filezilla-3.15.0.2/data/filezilla.appdata.xml filezilla-3.33.0/data/filezilla.appdata.xml --- filezilla-3.15.0.2/data/filezilla.appdata.xml 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/data/filezilla.appdata.xml 2017-12-29 14:30:53.000000000 +0000 @@ -2,7 +2,8 @@ - filezilla.desktop + org.filezilla-project.FileZilla + filezilla.desktop CC0-1.0

FileZilla is a graphical FTP, FTPS and SFTP client. It is platform independent and supports all major desktop operating systems.

diff -Nru filezilla-3.15.0.2/data/filezilla.desktop filezilla-3.33.0/data/filezilla.desktop --- filezilla-3.15.0.2/data/filezilla.desktop 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/data/filezilla.desktop 2017-03-03 15:37:22.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=FileZilla GenericName=FTP client +GenericName[da]=FTP-klient GenericName[de]=FTP-Client GenericName[fr]=Client FTP Comment=Download and upload files via FTP, FTPS and SFTP +Comment[da]=Download og upload filer via FTP, FTPS og SFTP Comment[de]=Dateien über FTP, FTPS und SFTP übertragen Comment[fr]=Transférer des fichiers via FTP, FTPS et SFTP Exec=filezilla diff -Nru filezilla-3.15.0.2/data/install.nsi.in filezilla-3.33.0/data/install.nsi.in --- filezilla-3.15.0.2/data/install.nsi.in 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/data/install.nsi.in 2018-03-26 14:10:52.000000000 +0000 @@ -1,12 +1,13 @@ ; FileZilla 3 installation script ; Written by Tim Kosse ; -; Requires NSIS >= 2.35 +; Requires NSIS >= 3.0b3 ;-------------------------------- ; Build environment ;-------------------------------- + Unicode true !define top_srcdir @top_srcdir@ !define srcdir @srcdir@ !define VERSION @PACKAGE_VERSION@ @@ -104,7 +105,11 @@ Var USERNAME Var PERFORM_UPDATE Var SKIPLICENSE + Var SKIPUAC Var GetInstalledSize.total + Var OldRunDir + Var CommandLine + Var Quiet ;-------------------------------- ; Interface Settings @@ -129,6 +134,11 @@ !define MUI_PAGE_CUSTOMFUNCTION_PRE PageLicensePre !insertmacro MUI_PAGE_LICENSE "${top_srcdir}\COPYING" +!ifdef ENABLE_OFFERS + !include "@srcdir@\offer.nsh" + Page custom OfferPage OfferPageLeave +!endif + Page custom PageReinstall PageLeaveReinstall Page custom PageAllUsers PageLeaveAllUsers @@ -147,7 +157,6 @@ !define MUI_PAGE_CUSTOMFUNCTION_PRE PageStartmenuPre !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER - !define MUI_PAGE_CUSTOMFUNCTION_SHOW PageInstfilesShow !define MUI_PAGE_CUSTOMFUNCTION_LEAVE PostInstPage !insertmacro MUI_PAGE_INSTFILES @@ -192,11 +201,20 @@ FunctionEnd -Function ReadAllUsersCommandline +!Macro MessageBoxImpl options text sdreturn checks + ${If} $Quiet == 1 + MessageBox ${options} `${text}` ${checks} + ${Else} + MessageBox ${options} `${text}` /SD ${sdreturn} ${checks} + ${Endif} - ${GetParameters} $R0 +!MacroEnd - ${GetOptions} $R0 "/user" $R1 +!define MessageBox `!insertmacro MessageBoxImpl` + +Function ReadAllUsersCommandline + + ${GetOptions} $CommandLine "/user" $R1 ${Unless} ${Errors} ${If} $R1 == "current" @@ -206,7 +224,7 @@ ${OrIf} $R1 == "=all" StrCpy $ALL_USERS 1 ${Else} - MessageBox MB_ICONSTOP "Invalid option for /user. Has to be either /user=all or /user=current" /SD IDOK + ${MessageBox} MB_ICONSTOP "Invalid option for /user. Has to be either /user=all or /user=current" IDOK '' Abort ${EndIf} ${EndUnless} @@ -300,9 +318,7 @@ Function ReadUpdateCommandline - ${GetParameters} $R0 - - ${GetOptions} $R0 "/update" $R1 + ${GetOptions} $CommandLine "/update" $R1 ${If} ${Errors} StrCpy $PERFORM_UPDATE 0 @@ -314,9 +330,7 @@ Function ReadSkipLicense - ${GetParameters} $R0 - - ${GetOptions} $R0 "/skiplicense" $R1 + ${GetOptions} $CommandLine "/skiplicense" $R1 ${If} ${Errors} StrCpy $SKIPLICENSE 0 @@ -326,40 +340,80 @@ FunctionEnd +Function ReadSkipUAC + + ${GetOptions} $CommandLine "/skipuac" $R1 + + ${If} ${Errors} + StrCpy $SKIPUAC 0 + ${Else} + StrCpy $SKIPUAC 1 + ${EndIf} + +FunctionEnd + +Function ReadQuiet + + ${GetOptions} $CommandLine "/quiet" $R1 + + ${If} ${Errors} + StrCpy $Quiet 0 + ${Else} + StrCpy $Quiet 1 + SetSilent silent + ${EndIf} + +FunctionEnd + Function .onInit - ${Unless} ${AtLeastWinVista} - MessageBox MB_YESNO|MB_ICONSTOP "Unsupported operating system.$\nFileZilla ${VERSION} requires at least Windows Vista and may not work correctly on your system.$\nDo you really want to continue with the installation?" /SD IDNO IDYES installonoldwindows + ; The very first thing we should do: See if there's still a running FZ, we use it to detect + ; cases were users have installed multiple copies installed in different directories. + Push "filezilla.exe" + Call IsProcessRunning + Pop $OldRunDir + + ; Store command line + ${GetParameters} $CommandLine + + Call ReadQuiet + + ${Unless} ${AtLeastWin7} + ${MessageBox} MB_YESNO|MB_ICONSTOP "Unsupported operating system.$\nFileZilla ${VERSION} requires at least Windows 7 and may not work correctly on your system.$\nDo you really want to continue with the installation?" IDNO 'IDYES installonoldwindows' Abort installonoldwindows: ${EndUnless} !if "@NSIS_64BIT@" == "1" ${Unless} ${RunningX64} - MessageBox MB_YESNO|MB_ICONSTOP "Unsupported operating system.$\nThis is the installer for the 64bit version of FileZilla ${VERSION} and does not run on your operating system which is only 32bit.$\nPlease download the 32bit FileZilla installer instead.$\nDo you really want to continue with the installation?" /SD IDNO IDYES install64on32 + ${MessageBox} MB_YESNO|MB_ICONSTOP "Unsupported operating system.$\nThis is the installer for the 64bit version of FileZilla ${VERSION} and does not run on your operating system which is only 32bit.$\nPlease download the 32bit FileZilla installer instead.$\nDo you really want to continue with the installation?" IDNO 'IDYES install64on32' Abort install64on32: ${EndUnless} !endif - !insertmacro UAC_RunElevated + Call ReadSkipUAc - ${Switch} $0 - ${Case} 0 - ${IfThen} $1 = 1 ${|} Quit ${|} ;we are the outer process, the inner process has done its work, we are done. - - ; Ignore success or failure here. Correct privileges are checked later on. - ${Break} - ${Case} 1223 - ; User aborted elevation, continue regardless - ${Break} - ${Default} - MessageBox mb_iconstop "Could not elevate process (errorcode $0), continuing with normal user privileges." /SD IDOK - ${Break} - ${EndSwitch} + ${If} $SKIPUAC != 1 + !insertmacro UAC_RunElevated - ; The UAC plugin changes the error level even in the inner process, reset it. - SetErrorLevel -1 + ${Switch} $0 + ${Case} 0 + ${IfThen} $1 = 1 ${|} Quit ${|} ;we are the outer process, the inner process has done its work, we are done. + + ; Ignore success or failure here. Correct privileges are checked later on. + ${Break} + ${Case} 1223 + ; User aborted elevation, continue regardless + ${Break} + ${Default} + ${MessageBox} mb_iconstop "Could not elevate process (errorcode $0), continuing with normal user privileges." IDOK '' + ${Break} + ${EndSwitch} + + ; The UAC plugin changes the error level even in the inner process, reset it. + SetErrorLevel -1 + ${EndIf} ; /update argument Call ReadUpdateCommandline @@ -380,6 +434,10 @@ ; This can change ALL_USERS Call ReadPreviousVersion + ${If} $PREVIOUS_VERSION != "" + StrCpy $REINSTALL_UNINSTALL 1 + ${EndIf} + ; Load _all_ previous settings. ; Need to do it now as up to now, $ALL_USERS was possibly reflecting a ; previous installation. After this call, $ALL_USERS reflects the requested @@ -392,10 +450,10 @@ ${If} $IS_ADMIN == 0 ${If} $PREVIOUS_VERSION != "" - MessageBox MB_ICONSTOP "FileZilla has been previously installed for all users.$\nPlease restart the installer with Administrator privileges." /SD IDOK + ${MessageBox} MB_ICONSTOP "FileZilla has been previously installed for all users.$\nPlease restart the installer with Administrator privileges." IDOK '' Abort ${Else} - MessageBox MB_ICONSTOP "Cannot install for all users.$\nPlease restart the installer with Administrator privileges." /SD IDOK + ${MessageBox} MB_ICONSTOP "Cannot install for all users.$\nPlease restart the installer with Administrator privileges." IDOK '' Abort ${EndIf} ${EndIf} @@ -419,6 +477,10 @@ StrCpy $ALL_USERS_DEFAULT $ALL_USERS +!ifdef ENABLE_OFFERS + Call OfferInit +!endif + FunctionEnd Function FZVersionCompare @@ -525,7 +587,6 @@ ${EndIf} ${If} $PERFORM_UPDATE == 1 - StrCpy $REINSTALL_UNINSTALL 1 Abort ${EndIf} @@ -566,17 +627,17 @@ nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "FileZilla ${VERSION} is already installed. Select the operation you want to perform and click Next to continue." Pop $R0 nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Add/Remove/Reinstall components" - Pop $R0 - nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Uninstall FileZilla" Pop $REINSTALL_UNINSTALLBUTTON + nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Uninstall FileZilla" + Pop $R0 ${If} $REINSTALL_UNINSTALL == "" - StrCpy $REINSTALL_UNINSTALL 2 + StrCpy $REINSTALL_UNINSTALL 1 ${EndIf} ${Else} - MessageBox MB_ICONSTOP "Unknown value of PREVIOUS_VERSION_STATE, aborting" /SD IDOK + ${MessageBox} MB_ICONSTOP "Unknown value of PREVIOUS_VERSION_STATE, aborting" IDOK '' Abort ${EndIf} @@ -597,6 +658,92 @@ FunctionEnd +Function CleanLeftovers + + DetailPrint "Cleaning leftover files" + SetDetailsPrint none + + Delete "$INSTDIR\libgcc_s_sjlj-1.dll" + Delete "$INSTDIR\libstdc++-6.dll" + Delete "$INSTDIR\libwinpthread-1.dll" + Delete "$INSTDIR\mingwm10.dll" + + Delete "$INSTDIR\resources\dialogs.xrc" + Delete "$INSTDIR\resources\filezilla.xpm" + Delete "$INSTDIR\resources\inputdialog.xrc" + Delete "$INSTDIR\resources\menus.xrc" + Delete "$INSTDIR\resources\netconfwizard.xrc" + Delete "$INSTDIR\resources\quickconnectbar.xrc" + Delete "$INSTDIR\resources\settings.xrc" + Delete "$INSTDIR\resources\themes.xml" + Delete "$INSTDIR\resources\toolbar.xrc" + Delete "$INSTDIR\resources\update.xrc" + Delete "$INSTDIR\resources\xxquickconnectbar.xrc" + Delete "$INSTDIR\resources\xxtoolbar.xrc" + Delete "$INSTDIR\resources\xrc\toolbar.xrc" + RMDir "$INSTDIR\resources" + + Delete "$INSTDIR\locales\ar_EG\filezilla.mo" + Delete "$INSTDIR\locales\bg\filezilla.mo" + Delete "$INSTDIR\locales\ca_ES\filezilla.mo" + Delete "$INSTDIR\locales\cs\filezilla.mo" + Delete "$INSTDIR\locales\da_DK\filezilla.mo" + Delete "$INSTDIR\locales\de_DE\filezilla.mo" + Delete "$INSTDIR\locales\el_GR\filezilla.mo" + Delete "$INSTDIR\locales\es_ES\filezilla.mo" + Delete "$INSTDIR\locales\et_EE\filezilla.mo" + Delete "$INSTDIR\locales\eu_ES\filezilla.mo" + Delete "$INSTDIR\locales\fi\filezilla.mo" + Delete "$INSTDIR\locales\fr_CA\filezilla.mo" + Delete "$INSTDIR\locales\fr_FR\filezilla.mo" + Delete "$INSTDIR\locales\gl\filezilla.mo" + Delete "$INSTDIR\locales\gr\filezilla.mo" + Delete "$INSTDIR\locales\hu\filezilla.mo" + Delete "$INSTDIR\locales\it_IT\filezilla.mo" + Delete "$INSTDIR\locales\km\filezilla.mo" + Delete "$INSTDIR\locales\lt\filezilla.mo" + Delete "$INSTDIR\locales\lv\filezilla.mo" + Delete "$INSTDIR\locales\mk\filezilla.mo" + Delete "$INSTDIR\locales\nl_NL\filezilla.mo" + Delete "$INSTDIR\locales\ru_RU\filezilla.mo" + Delete "$INSTDIR\locales\sk\filezilla.mo" + Delete "$INSTDIR\locales\sl\filezilla.mo" + Delete "$INSTDIR\locales\sv_SE\filezilla.mo" + Delete "$INSTDIR\locales\tr_TR\filezilla.mo" + + RMDir "$INSTDIR\locales\ar_EG" + RMDir "$INSTDIR\locales\bg" + RMDir "$INSTDIR\locales\ca_ES" + RMDir "$INSTDIR\locales\cs" + RMDir "$INSTDIR\locales\da_DK" + RMDir "$INSTDIR\locales\de_DE" + RMDir "$INSTDIR\locales\el_GR" + RMDir "$INSTDIR\locales\es_ES" + RMDir "$INSTDIR\locales\et_EE" + RMDir "$INSTDIR\locales\eu_ES" + RMDir "$INSTDIR\locales\fi" + RMDir "$INSTDIR\locales\fr_CA" + RMDir "$INSTDIR\locales\fr_FR" + RMDir "$INSTDIR\locales\gl" + RMDir "$INSTDIR\locales\gr" + RMDir "$INSTDIR\locales\hu" + RMDir "$INSTDIR\locales\it_IT" + RMDir "$INSTDIR\locales\km" + RMDir "$INSTDIR\locales\lt" + RMDir "$INSTDIR\locales\lv" + RMDir "$INSTDIR\locales\mk" + RMDir "$INSTDIR\locales\nl_NL" + RMDir "$INSTDIR\locales\ru_RU" + RMDir "$INSTDIR\locales\sk" + RMDir "$INSTDIR\locales\sl" + RMDir "$INSTDIR\locales\sv_SE" + RMDir "$INSTDIR\locales\tr_TR" + + RMDir "$INSTDIR\locales" + + SetDetailsPrint lastused +FunctionEnd + Function RunUninstaller ${If} $ALL_USERS_DEFAULT == 1 @@ -614,24 +761,31 @@ ClearErrors - ${If} $PREVIOUS_VERSION_STATE == "same" - ${AndIf} $REINSTALL_UNINSTALL == "1" - ${AndIf} $PERFORM_UPDATE != "1" - ExecWait '$R1 _?=$INSTDIR' + ${If} $REINSTALL_UNINSTALL == "2" + ${AndIf} $PREVIOUS_VERSION_STATE == "same" + StrCpy $R2 "" ${Else} - ExecWait '$R1 /frominstall /keepstartmenudir _?=$INSTDIR' + StrCpy $R2 "/frominstall /keepstartmenudir" + ${EndIf} + + ${If} $QUIET == 1 + StrCpy $R2 "$R2 /quiet" + ${EndIf} + + ${If} ${Silent} + StrCpy $R2 "$R2 /S" ${EndIf} + ExecWait '"$R1" $R2 _?=$INSTDIR' + IfErrors no_remove_uninstaller IfFileExists "$INSTDIR\uninstall.exe" 0 no_remove_uninstaller - Delete "$R1" + Delete "$R1" ; Remove directory only if uninstalling for good - ${If} $PREVIOUS_VERSION_STATE == "same" - ${AndIf} $REINSTALL_UNINSTALL == "1" - ${AndIf} $PERFORM_UPDATE != "1" + ${If} $REINSTALL_UNINSTALL == "2" RMDir $INSTDIR ${EndIf} @@ -651,37 +805,34 @@ ${Else} ; Custom up/downgrade or add/remove/reinstall StrCpy $REINSTALL_UNINSTALL 2 - ${EndIf} - - ${If} $REINSTALL_UNINSTALL == 1 - ${If} $PREVIOUS_VERSION_STATE == "same" - Call RunUninstaller Quit - - ${Else} - - ; Need to reload defaults. User could have - ; chosen custom, change something, went back and selected - ; the express option. - StrCpy $ALL_USERS $ALL_USERS_DEFAULT - Call UpdateShellVarContext - Call LoadPreviousSettings - ${EndIf} - ${EndIf} + ; Need to reload defaults. User could have + ; chosen custom, change something, went back and selected + ; the express option. + StrCpy $ALL_USERS $ALL_USERS_DEFAULT + Call UpdateShellVarContext + Call LoadPreviousSettings + FunctionEnd Function PageAllUsers ${If} $REINSTALL_UNINSTALL == 1 + ${AndIf} $PREVIOUS_VERSION_STATE != "same" ; Keep same settings Abort ${EndIf} + ${If} $PERFORM_UPDATE == 1 + StrCpy $REINSTALL_UNINSTALL 1 + Abort + ${EndIf} + !insertmacro MUI_HEADER_TEXT "Choose Installation Options" "Who should this application be installed for?" nsDialogs::Create /NOUNLOAD 1018 @@ -725,18 +876,11 @@ ${EndIf} ${If} $PREVIOUS_VERSION == "" - ${OrIf} $PERFORM_UPDATE == 1} ${IF} $SKIPLICENSE == 1 EnableWindow $mui.Button.Back 0 ${ENDIF} ${EndIf} - ${If} $PERFORM_UPDATE == 1 - StrCpy $REINSTALL_UNINSTALL 1 - Abort - ${EndIf} - - nsDialogs::Show FunctionEnd @@ -755,7 +899,12 @@ Function PageComponentsPre + ${If} $PERFORM_UPDATE == 1 + Abort + ${EndIf} + ${If} $REINSTALL_UNINSTALL == 1 + ${AndIf} $PREVIOUS_VERSION_STATE != "same" Abort @@ -765,7 +914,12 @@ Function PageDirectoryPre + ${If} $PERFORM_UPDATE == 1 + Abort + ${EndIf} + ${If} $REINSTALL_UNINSTALL == "1" + ${AndIf} $PREVIOUS_VERSION_STATE != "same" Abort @@ -775,7 +929,12 @@ Function PageStartmenuPre + ${If} $PERFORM_UPDATE == 1 + Abort + ${EndIf} + ${If} $REINSTALL_UNINSTALL == "1" + ${AndIf} $PREVIOUS_VERSION_STATE != "same" ${If} "$STARTMENU_FOLDER" == "" @@ -801,7 +960,7 @@ StrCpy $R0 2 ${EndIf} - ${While} $R1 == 1 + ${While} $R1 != '' ${If} $R0 == 0 @@ -823,9 +982,9 @@ Call IsProcessRunning Pop $R1 - ${While} $R1 == 1 + ${While} $R1 != '' - MessageBox MB_ABORTRETRYIGNORE|MB_DEFBUTTON2 "FileZilla appears to be running.$\nPlease close all running instances of FileZilla before continuing the installation." /SD IDIGNORE IDABORT CheckFileZillaRunning_abort IDIGNORE CheckFileZillaRunning_ignore + ${MessageBox} MB_ABORTRETRYIGNORE|MB_DEFBUTTON2 "FileZilla appears to be running.$\nPlease close all running instances of FileZilla before continuing the installation." IDIGNORE 'IDABORT CheckFileZillaRunning_abort IDIGNORE CheckFileZillaRunning_ignore' Push "filezilla.exe" Call IsProcessRunning @@ -841,18 +1000,6 @@ FunctionEnd -Function PageInstfilesShow - - Call CheckFileZillaRunning - - ${If} $REINSTALL_UNINSTALL != "" - - Call RunUninstaller - - ${EndIf} - -FunctionEnd - Function .OnInstFailed FunctionEnd @@ -860,6 +1007,20 @@ ${MementoSectionSave} + ; Detect multiple install directories + ${If} $OldRunDir != '' + ${GetFileVersion} $OldRunDir $R0 + ${GetFileVersion} "$Instdir\filezilla.exe" $R1 + + StrCpy $R2 $OldRunDir -14 + + ${If} $R0 != '' + ${AndIf} $R1 != '' + ${AndIf} $R0 != $R1 + ${MessageBox} MB_ICONEXCLAMATION 'Multiple installations of FileZilla detected.$\n$\nFileZilla ${VERSION} has been installed to "$InstDir".$\nAn old installation of FileZilla $R0 still exists in the "$R2" directory.$\n$\nPlease delete the old version in the "$R2" directory.' IDOK '' + ${EndIf} + ${EndIf} + FunctionEnd ;-------------------------------- @@ -872,15 +1033,39 @@ ; Installer Sections ;-------------------------------- +!macro INSTALLICONSET SET + DetailPrint "Installing ${SET} icon set" + SetDetailsPrint none + SetOutPath "$INSTDIR\resources\${SET}" + File "${top_srcdir}/src\interface\resources\${SET}\theme.xml" + File /r "${top_srcdir}/src\interface\resources\${SET}\*.png" + File /nonfatal /r "${top_srcdir}/src\interface\resources\${SET}\*.gif" + SetDetailsPrint lastused +!macroend + Section "FileZilla Client" SecMain SectionIn 1 RO + Call CheckFileZillaRunning + + ${If} $REINSTALL_UNINSTALL != "" + + Call RunUninstaller + + ${EndIf} + + Call CleanLeftovers + + SetOutPath "$INSTDIR" File "..\src\interface\${LT_EXEDIR}FileZilla.exe" File "..\src\putty\${LT_EXEDIR}fzsftp.exe" File "..\src\putty\${LT_EXEDIR}fzputtygen.exe" +!if /FileExists "..\src\storj\${LT_EXEDIR}fzstorj.exe" + File "..\src\storj\${LT_EXEDIR}fzstorj.exe" +!endif File "${top_srcdir}\GPL.html" File "${top_srcdir}\NEWS" @@ -893,7 +1078,6 @@ File "${top_srcdir}/src\interface\resources\*.png" File "${top_srcdir}/src\interface\resources\defaultfilters.xml" File "${top_srcdir}/src\interface\resources\finished.wav" - File "${top_srcdir}/src\interface\resources\theme.xml" SetOutPath "$INSTDIR\resources\xrc" File "${top_srcdir}/src\interface\resources\xrc\*.xrc" @@ -902,12 +1086,23 @@ File "${top_srcdir}/src\interface\resources\16x16\*.png" File "${top_srcdir}/src\interface\resources\16x16\*.gif" + SetOutPath "$INSTDIR\resources\20x20" + File "${top_srcdir}/src\interface\resources\20x20\*.png" + + SetOutPath "$INSTDIR\resources\24x24" + File "${top_srcdir}/src\interface\resources\24x24\*.png" + SetOutPath "$INSTDIR\resources\32x32" File "${top_srcdir}/src\interface\resources\32x32\*.png" SetOutPath "$INSTDIR\resources\48x48" File "${top_srcdir}/src\interface\resources\48x48\*.png" + SetOutPath "$INSTDIR\resources\480x480" + File "${top_srcdir}/src\interface\resources\480x480\*.png" + + !insertmacro INSTALLICONSET default + SetDetailsPrint lastused ; Create uninstaller @@ -916,6 +1111,24 @@ WriteRegStr SHCTX "Software\FileZilla Client" "" $INSTDIR WriteRegStr SHCTX "Software\FileZilla Client" "Version" "${VERSION}" + ${If} $PERFORM_UPDATE == 0 + ; Open question: How to deal with non-installer packages, e.g. the zip archive? +!ifdef ENABLE_OFFERS + WriteRegDWORD SHCTX "Software\FileZilla Client" "Package" 2 +!else + WriteRegDWORD SHCTX "Software\FileZilla Client" "Package" 1 +!endif + + ClearErrors + ${GetOptions} $CommandLine "/channel" $R1 + ${Unless} ${Errors} + WriteRegStr SHCTX "Software\FileZilla Client" "Channel" $R1 + ${EndUnless} + + ${EndIf} + + WriteRegDWORD SHCTX "Software\FileZilla Client" "Updated" $PERFORM_UPDATE + WriteRegExpandStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\FileZilla Client" "UninstallString" "$INSTDIR\uninstall.exe" WriteRegExpandStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\FileZilla Client" "InstallLocation" "$INSTDIR" WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\FileZilla Client" "DisplayName" "FileZilla Client ${VERSION}" @@ -969,6 +1182,9 @@ WriteRegDWORD HKLM "${DUMP_KEY}\filezilla.exe" "DumpType" "1" WriteRegDWORD HKLM "${DUMP_KEY}\fzsftp.exe" "DumpType" "1" WriteRegDWORD HKLM "${DUMP_KEY}\fzputtygen.exe" "DumpType" "1" +!if /FileExists "..\src\storj\${LT_EXEDIR}fzstorj.exe" + WriteRegDWORD HKLM "${DUMP_KEY}\fzstorj.exe" "DumpType" "1" +!endif ${If} ${RunningX64} SetRegView lastused ${EndIf} @@ -980,19 +1196,10 @@ SectionEnd -!macro INSTALLICONSET SET - DetailPrint "Installing ${SET} icon set" - SetDetailsPrint none - SetOutPath "$INSTDIR\resources\${SET}" - File "${top_srcdir}/src\interface\resources\${SET}\theme.xml" - File /r "${top_srcdir}/src\interface\resources\${SET}\*.png" - File /nonfatal /r "${top_srcdir}/src\interface\resources\${SET}\*.gif" - SetDetailsPrint lastused -!macroend - ${MementoSection} "Icon sets" SecIconSets !insertmacro INSTALLICONSET blukis + !insertmacro INSTALLICONSET classic !insertmacro INSTALLICONSET cyril !insertmacro INSTALLICONSET flatzilla !insertmacro INSTALLICONSET lone @@ -1080,8 +1287,9 @@ System::Call user32::IsWindowVisible(i$R0)i.s Pop $R0 - StrCmp $R0 0 +2 - SetAutoClose false + ${If} $R0 != 0 + SetAutoClose false + ${EndIf} FunctionEnd @@ -1210,12 +1418,22 @@ Function un.onInit + ${un.GetParameters} $CommandLine + + ${un.GetOptions} $CommandLine "/quiet" $R1 + ${If} ${Errors} + StrCpy $Quiet 0 + ${Else} + StrCpy $Quiet 1 + SetSilent silent + ${EndIf} + Call un.GetUserInfo Call un.ReadPreviousVersion ${If} $un.REMOVE_ALL_USERS == 1 ${AndIf} $IS_ADMIN == 0 - MessageBox MB_ICONSTOP "FileZilla has been installed for all users.$\nPlease restart the uninstaller with Administrator privileges to remove it." /SD IDOK + ${MessageBox} MB_ICONSTOP "FileZilla has been installed for all users.$\nPlease restart the uninstaller with Administrator privileges to remove it." IDOK '' Abort ${EndIf} @@ -1228,9 +1446,7 @@ Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" Delete "$SMPROGRAMS\$MUI_TEMP\FileZilla.lnk" - ${un.GetParameters} $R0 - - ${un.GetOptions} $R0 "/keepstartmenudir" $R1 + ${un.GetOptions} $CommandLine "/keepstartmenudir" $R1 ${If} ${Errors} ; Delete empty start menu parent diretories @@ -1251,9 +1467,7 @@ Function un.ConfirmPagePre - ${un.GetParameters} $R0 - - ${un.GetOptions} $R0 "/frominstall" $R1 + ${un.GetOptions} $CommandLine "/frominstall" $R1 ${Unless} ${Errors} Abort ${EndUnless} @@ -1262,9 +1476,7 @@ Function un.FinishPagePre - ${un.GetParameters} $R0 - - ${un.GetOptions} $R0 "/frominstall" $R1 + ${un.GetOptions} $CommandLine "/frominstall" $R1 ${Unless} ${Errors} SetRebootFlag false Abort @@ -1298,6 +1510,7 @@ Delete "$INSTDIR\resources\${SET}\24x24\*.png" Delete "$INSTDIR\resources\${SET}\32x32\*.png" Delete "$INSTDIR\resources\${SET}\48x48\*.png" + Delete "$INSTDIR\resources\${SET}\480x480\*.png" Delete "$INSTDIR\resources\${SET}\16x16\*.gif" Delete "$INSTDIR\resources\${SET}\20x20\*.gif" Delete "$INSTDIR\resources\${SET}\24x24\*.gif" @@ -1308,6 +1521,7 @@ RMDir "$INSTDIR\resources\${SET}\24x24" RMDir "$INSTDIR\resources\${SET}\32x32" RMDir "$INSTDIR\resources\${SET}\48x48" + RMDir "$INSTDIR\resources\${SET}\480x480" RMDir "$INSTDIR\resources\${SET}" SetDetailsPrint lastused @@ -1335,6 +1549,9 @@ Delete "$INSTDIR\filezilla.exe" Delete "$INSTDIR\fzsftp.exe" Delete "$INSTDIR\fzputtygen.exe" +!if /FileExists "..\src\storj\${LT_EXEDIR}fzstorj.exe" + Delete "$INSTDIR\fzstorj.exe" +!endif Delete "$INSTDIR\GPL.html" Delete "$INSTDIR\NEWS" @@ -1347,18 +1564,21 @@ Delete "$INSTDIR\resources\*.png" Delete "$INSTDIR\resources\defaultfilters.xml" Delete "$INSTDIR\resources\finished.wav" - Delete "$INSTDIR\resources\theme.xml" Delete "$INSTDIR\resources\16x16\*.png" + Delete "$INSTDIR\resources\20x20\*.png" + Delete "$INSTDIR\resources\24x24\*.png" Delete "$INSTDIR\resources\32x32\*.png" Delete "$INSTDIR\resources\48x48\*.png" + Delete "$INSTDIR\resources\480x480\*.png" Delete "$INSTDIR\resources\16x16\*.gif" Delete "$INSTDIR\resources\32x32\*.gif" - Delete "$INSTDIR\resources\48x48\*.gif" SetDetailsPrint lastused - !insertmacro UNINSTALLICONSET cyril !insertmacro UNINSTALLICONSET blukis + !insertmacro UNINSTALLICONSET classic + !insertmacro UNINSTALLICONSET cyril + !insertmacro UNINSTALLICONSET default !insertmacro UNINSTALLICONSET flatzilla !insertmacro UNINSTALLICONSET lone !insertmacro UNINSTALLICONSET minimal @@ -1386,16 +1606,23 @@ !if "@FILEZILLA_LINGUAS@" != "" RMDir "$INSTDIR\locales" !endif + RMDir "$INSTDIR\resources\480x480" RMDir "$INSTDIR\resources\48x48" RMDir "$INSTDIR\resources\32x32" + RMDir "$INSTDIR\resources\20x20" + RMDir "$INSTDIR\resources\24x24" RMDir "$INSTDIR\resources\16x16" RMDir "$INSTDIR\resources\xrc" RMDir "$INSTDIR\resources" RMDir "$INSTDIR\docs" - ${un.GetOptions} $R0 "/frominstall" $R1 + ${un.GetOptions} $CommandLine "/frominstall" $R1 ${If} ${Errors} RMDir /REBOOTOK "$INSTDIR" + + DeleteRegValue SHCTX "Software\FileZilla Client" "Package" + DeleteRegValue SHCTX "Software\FileZilla Client" "Updated" + DeleteRegValue SHCTX "Software\FileZilla Client" "Channel" ${EndIf} ${If} $un.REMOVE_ALL_USERS == 1 @@ -1414,9 +1641,15 @@ DeleteRegValue HKLM "${DUMP_KEY}\filezilla.exe" "DumpType" DeleteRegValue HKLM "${DUMP_KEY}\fzsftp.exe" "DumpType" DeleteRegValue HKLM "${DUMP_KEY}\fzputtygen.exe" "DumpType" +!if /FileExists "..\src\storj\${LT_EXEDIR}fzstorj.exe" + DeleteRegValue HKLM "${DUMP_KEY}\fzstorj.exe" "DumpType" +!endif DeleteRegKey /ifempty HKLM "${DUMP_KEY}\filezilla.exe" DeleteRegKey /ifempty HKLM "${DUMP_KEY}\fzsftp.exe" DeleteRegKey /ifempty HKLM "${DUMP_KEY}\fzputtygen.exe" +!if /FileExists "..\src\storj\${LT_EXEDIR}fzstorj.exe" + DeleteRegKey /ifempty HKLM "${DUMP_KEY}\fzstorj.exe" +!endif ${If} ${RunningX64} SetRegView lastused ${EndIf} diff -Nru filezilla-3.15.0.2/data/Makefile.in filezilla-3.33.0/data/Makefile.in --- filezilla-3.15.0.2/data/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/data/Makefile.in 2018-05-07 08:45:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,18 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/install.nsi.in $(srcdir)/makezip.sh.in \ - $(dist_appdata_DATA) $(dist_desktopentry_DATA) \ - $(dist_noinst_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -102,6 +111,9 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_appdata_DATA) \ + $(dist_desktopentry_DATA) $(dist_noinst_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = install.nsi makezip.sh @@ -157,6 +169,8 @@ DATA = $(dist_appdata_DATA) $(dist_desktopentry_DATA) \ $(dist_noinst_DATA) $(noinst_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/install.nsi.in \ + $(srcdir)/makezip.sh.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -168,11 +182,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -196,6 +210,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -216,16 +232,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -277,6 +301,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -316,6 +341,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -359,7 +385,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -588,6 +613,8 @@ ps ps-am tags-am uninstall uninstall-am \ uninstall-dist_appdataDATA uninstall-dist_desktopentryDATA +.PRECIOUS: Makefile + @MAKENSISSCRIPT_TRUE@installlangfiles.nsh: Makefile @MAKENSISSCRIPT_TRUE@ rm -f $@ diff -Nru filezilla-3.15.0.2/data/makezip.sh.in filezilla-3.33.0/data/makezip.sh.in --- filezilla-3.15.0.2/data/makezip.sh.in 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/data/makezip.sh.in 2017-09-19 21:36:39.000000000 +0000 @@ -42,8 +42,12 @@ if [ -x "$top_builddir/$1/.libs/$2" ]; then cp "$top_builddir/$1/.libs/$2" "$targetdir/$target" || exit 1 - else + elif [ -x "$top_builddir/$1/$2" ]; then cp "$top_builddir/$1/$2" "$targetdir/$target" || exit 1 + else + if [ "$4" != "1" ]; then + exit 1 + fi fi } @@ -51,6 +55,7 @@ copy_libtool "src/interface" "filezilla.exe" copy_libtool "src/putty" "fzsftp.exe" copy_libtool "src/putty" "fzputtygen.exe" +copy_libtool "src/storj" "fzstorj.exe" "" 1 copy_libtool "src/fzshellext/32" "libfzshellext-0.dll" "fzshellext.dll" copy_libtool "src/fzshellext/64" "libfzshellext-0.dll" "fzshellext_64.dll" diff -Nru filezilla-3.15.0.2/data/process_running.nsh filezilla-3.33.0/data/process_running.nsh --- filezilla-3.15.0.2/data/process_running.nsh 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/data/process_running.nsh 2016-04-05 03:30:04.000000000 +0000 @@ -74,12 +74,14 @@ Exch $R0 Push $R1 Push $R2 + Push $R3 !define PROCESS_QUERY_INFORMATION 0x0400 System::Call "kernel32::OpenProcess(i ${PROCESS_QUERY_INFORMATION}, i 0, i $R0) i .R0" ${If} $R0 == 0 + Pop $R3 Pop $R2 Pop $R1 Pop $R0 @@ -88,11 +90,18 @@ ${EndIf} - System::Call "psapi::GetProcessImageFileName(i R0, t .R1, i ${NSIS_MAX_STRLEN}) i .R2" + StrCpy $R3 ${NSIS_MAX_STRLEN} + System::Call "kernel32::QueryFullProcessImageName(i R0, i 0, t .R1, *i R3) i .R2" + + ${If} $R2 == 0 + ; Fallback + System::Call "psapi::GetProcessImageFileName(i R0, t .R1, i ${NSIS_MAX_STRLEN}) i .R2" + ${EndIf} ${If} $R2 == 0 System::Call "kernel32::CloseHandle(i R0)" + Pop $R3 Pop $R2 Pop $R1 Pop $R0 @@ -104,6 +113,7 @@ System::Call "kernel32::CloseHandle(i R0)" + Pop $R3 Pop $R2 StrCpy $R0 $R1 Pop $R1 @@ -112,8 +122,7 @@ FunctionEnd ; Expects process name on top of stack -; Gets replaced with 1 if process is running, -; 0 if it is not +; Afterwards, top of stack contains path to the process if it's running or an empty string if it is not. Function IsProcessRunning Exch $R0 ; Name @@ -123,6 +132,7 @@ Push $R3 ; Counter Push $R4 ; Strlen Push $R5 ; Current process ID and image filename + Push $R6 ; Last part of path StrCpy $R0 "\$R0" @@ -148,18 +158,19 @@ Pop $R5 ; Get last part of filename - StrCpy $R5 $R5 '' $R4 + StrCpy $R6 $R5 '' $R4 - ${If} $R5 == $R0 + ${If} $R6 == $R0 ; Program is running + StrCpy $R0 $R5 + Pop $R6 Pop $R5 Pop $R4 Pop $R3 Pop $R2 Pop $R1 - Pop $R0 - Push 1 + Exch $R0 return ${EndIf} @@ -174,7 +185,7 @@ Pop $R2 Pop $R1 Pop $R0 - Push 0 + Push '' FunctionEnd Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/data/UAC.dll and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/data/UAC.dll differ diff -Nru filezilla-3.15.0.2/data/UAC.nsh filezilla-3.33.0/data/UAC.nsh --- filezilla-3.15.0.2/data/UAC.nsh 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/data/UAC.nsh 2016-03-16 07:56:06.000000000 +0000 @@ -228,6 +228,8 @@ !undef _UAC_ParseDefineFlags_orin_this !ifdef _UAC_ParseDefineFlags_orin_f1 !undef _UAC_ParseDefineFlags_orin_f1 +!endif +!ifdef _UAC_ParseDefineFlags_orin_f2 !undef _UAC_ParseDefineFlags_orin_f2 !endif !macroend diff -Nru filezilla-3.15.0.2/debian/changelog filezilla-3.33.0/debian/changelog --- filezilla-3.15.0.2/debian/changelog 2016-02-25 10:01:11.000000000 +0000 +++ filezilla-3.33.0/debian/changelog 2018-09-07 00:44:53.000000000 +0000 @@ -1,10 +1,80 @@ -filezilla (3.15.0.2-1ubuntu1) xenial; urgency=medium +filezilla (3.33.0-1~ubuntu16.04.1~ppa1) xenial; urgency=medium - * Merge from Debian unstable. Remaining Ubuntu change: - - Added debian/patches/11_use-decimal-si-by-default.patch in order to - comply with UnitsPolicy + * No-change backport to xenial - -- Gianfranco Costamagna Wed, 24 Feb 2016 12:30:55 +0100 + -- Micah Gersten Thu, 06 Sep 2018 19:44:53 -0500 + +filezilla (3.33.0-1) unstable; urgency=medium + + * New upstream release + * Updated libfilezilla-dev versioned build-dep to 0.12.2 + * Updated Vcs-* URLs with Salsa ones + + -- Adrien Cunin Thu, 14 Jun 2018 16:36:59 +0200 + +filezilla (3.28.0-1) unstable; urgency=medium + + * Team upload + * New upstream version 3.28.0 (Closes: #880082) + * Require libfilezilla 0.11.0 + * Bump std-version to 4.1.1 + * Copyright has now https URI + * Drop old relax-wx-dependency patch, patch refresh + + -- Gianfranco Costamagna Sun, 29 Oct 2017 12:48:23 +0100 + +filezilla (3.27.0~rc1-1) unstable; urgency=medium + + * New upstream version 3.27.0~rc1, patch refresh + * Bump std-version to 4.0.0 + * Bump compat level to 10 + * Bump libfilezilla constraint + * Update copyright years + * Relax wxwidgets dependency + * Use debian.series and ubuntu.series, to make the package syncable + + -- Gianfranco Costamagna Tue, 11 Jul 2017 11:10:09 +0200 + +filezilla (3.24.0-1) unstable; urgency=medium + + * New upstream release + * Updated versioned build-deps for libfilezilla-dev and libgnutls28-dev + * Removed debian/patches/fix-build.patch + + -- Adrien Cunin Tue, 17 Jan 2017 15:52:58 +0100 + +filezilla (3.21.0-2) unstable; urgency=medium + + * Team upload. + * Cherry-pick upstream build fix with new libfilezilla. + - debian/patches/fix-build.patch + * patch refresh. + + -- Gianfranco Costamagna Tue, 27 Sep 2016 23:51:08 +0200 + +filezilla (3.21.0-1) unstable; urgency=medium + + * New upstream release + + -- Adrien Cunin Mon, 19 Sep 2016 12:00:59 +0200 + +filezilla (3.20.0-1) unstable; urgency=medium + + * New upstream release + * Rebuild against fixed libfilezilla so that the libfilezilla0 dependency is + correctly versioned (Closes: #830474) + * Set/updated versioned build-deps according to the upstream INSTALL file + for libfilezilla-dev, libgnutls28-dev, libsqlite3-dev and libwxgtk3.0-dev + + -- Adrien Cunin Thu, 28 Jul 2016 16:04:36 +0200 + +filezilla (3.19.0-1) unstable; urgency=medium + + * New upstream release + * Updated libfilezilla-dev and added nettle-dev build-deps + * Updated Standards-Version to 3.9.8, no change needed + + -- Adrien Cunin Wed, 06 Jul 2016 16:39:35 +0200 filezilla (3.15.0.2-1) unstable; urgency=medium @@ -23,14 +93,6 @@ -- Adrien Cunin Wed, 17 Feb 2016 15:57:41 +0100 -filezilla (3.14.1-1ubuntu1) xenial; urgency=low - - * Merge from Debian unstable (LP: #1527125, LP: #1509989). Remaining changes: - - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply - with UnitsPolicy. - - -- Gianfranco Costamagna Thu, 17 Dec 2015 09:25:45 +0100 - filezilla (3.14.1-1) unstable; urgency=medium * New upstream release (LP: #1485345) @@ -44,21 +106,6 @@ -- Adrien Cunin Wed, 16 Dec 2015 15:03:10 +0100 -filezilla (3.12.0.2-1ubuntu2) wily; urgency=medium - - * Link with -latomic to fix ppc FTBFS. - - -- Iain Lane Sun, 16 Aug 2015 11:40:53 +0100 - -filezilla (3.12.0.2-1ubuntu1) wily; urgency=medium - - * Merge from Debian unstable. Remaining Ubuntu change: - - Added debian/patches/11_use-decimal-si-by-default.patch in order to - comply with UnitsPolicy - * Refreshed debian/patches/11_use-decimal-si-by-default.patch - - -- Adrien Cunin Sun, 16 Aug 2015 02:02:38 +0200 - filezilla (3.12.0.2-1) unstable; urgency=medium * New upstream release (Closes: #789678) @@ -67,14 +114,6 @@ -- Adrien Cunin Thu, 13 Aug 2015 16:00:10 +0200 -filezilla (3.9.0.5-1ubuntu1) vivid; urgency=medium - - * Merge from Debian unstable (LP: #1391431). Remaining changes: - - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply - with UnitsPolicy. - - -- Gianfranco Costamagna Tue, 11 Nov 2014 09:18:47 +0100 - filezilla (3.9.0.5-1) unstable; urgency=medium * New upstream release @@ -82,15 +121,6 @@ -- Adrien Cunin Sun, 14 Sep 2014 12:11:33 +0200 -filezilla (3.9.0.1-0.1ubuntu1) utopic; urgency=low - - * Merge from Debian unstable (LP: #1348527). Remaining changes: - - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply - with UnitsPolicy. - * Refresh patch. - - -- Gianfranco Costamagna Fri, 25 Jul 2014 10:08:43 +0200 - filezilla (3.9.0.1-0.1) unstable; urgency=medium * Non-maintainer upload. @@ -116,15 +146,6 @@ -- Olly Betts Fri, 06 Jun 2014 13:28:54 +1200 -filezilla (3.8.0-1ubuntu1) utopic; urgency=medium - - * Merge from Debian unstable. Remaining changes: - - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply - with UnitsPolicy. - * Refresh patch. - - -- Logan Rosen Tue, 29 Apr 2014 23:22:36 -0400 - filezilla (3.8.0-1) unstable; urgency=medium * New upstream release @@ -134,14 +155,6 @@ -- Adrien Cunin Wed, 23 Apr 2014 13:57:10 +0200 -filezilla (3.7.3-1ubuntu1) saucy; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply - with UnitsPolicy. - - -- Logan Rosen Fri, 13 Sep 2013 21:01:50 -0400 - filezilla (3.7.3-1) unstable; urgency=low * New upstream release, fixing the following PuTTY security vulnerabilities: @@ -150,22 +163,6 @@ -- Adrien Cunin Tue, 27 Aug 2013 11:47:04 +0200 -filezilla (3.7.3-0ubuntu1) saucy; urgency=low - - * New upstream release (LP: #1209196) - - Fixes the following PuTTY security vulnerabilities: - CVE-2013-4852, CVE-2013-4206, CVE-2013-4207, CVE-2013-4208 - - -- Adrien Cunin Tue, 27 Aug 2013 15:53:40 +0200 - -filezilla (3.7.0.2-1ubuntu1) saucy; urgency=low - - * Merge from Debian unstable. Remaining Ubuntu change: - - Added debian/patches/11_use-decimal-si-by-default.patch in order to - comply with UnitsPolicy - - -- Adrien Cunin Wed, 19 Jun 2013 13:08:32 +0200 - filezilla (3.7.0.2-1) unstable; urgency=low * New upstream release (LP: #1176547) @@ -173,14 +170,6 @@ -- Adrien Cunin Mon, 03 Jun 2013 10:39:05 +0200 -filezilla (3.6.0.2-1ubuntu1) raring; urgency=low - - * Merge from Debian experimental. Remaining Ubuntu change: - - Added debian/patches/11_use-decimal-si-by-default.patch in order to - comply with UnitsPolicy - - -- Adrien Cunin Fri, 07 Dec 2012 17:17:17 +0100 - filezilla (3.6.0.2-1) experimental; urgency=low * Upload to experimental due to freeze @@ -194,15 +183,6 @@ -- Adrien Cunin Mon, 03 Dec 2012 10:45:03 +0100 -filezilla (3.5.3-2ubuntu1) quantal; urgency=low - - * Merge from Debian unstable. Remaining Ubuntu change: - - Added debian/patches/11_use-decimal-si-by-default.patch in order to - comply with UnitsPolicy (name it 11_ instead of 02_ to avoid conflicts - with Debian patches) - - -- Adrien Cunin Tue, 17 Jul 2012 10:51:12 +0200 - filezilla (3.5.3-2) unstable; urgency=low * Added debian/filezilla.svg and install it as application icon @@ -215,36 +195,12 @@ -- Adrien Cunin Sun, 24 Jun 2012 17:27:38 +0200 -filezilla (3.5.3-1ubuntu2) precise; urgency=low - - * Added debian/filezilla.svg and install it as application icon - - http://svn.filezilla-project.org/svn/artwork/FileZilla%20logo.svg - - Scales better to a larger size (LP: #937980) - - -- Adrien Cunin Wed, 28 Mar 2012 10:28:29 +0200 - -filezilla (3.5.3-1ubuntu1) precise; urgency=low - - * Merge from Debian unstable. Remaining Ubuntu change: - - Added debian/patches/02_use-decimal-si-by-default.patch in order to - comply with UnitsPolicy - - -- Adrien Cunin Sun, 29 Jan 2012 23:11:01 +0100 - filezilla (3.5.3-1) unstable; urgency=low * New upstream release -- Adrien Cunin Sun, 15 Jan 2012 23:09:11 +0100 -filezilla (3.5.2-1ubuntu1) precise; urgency=low - - * Sync from Debian unstable - * Re-added debian/patches/02_use-decimal-si-by-default.patch in order to - comply with UnitsPolicy (the patch got lost in the previous Ubuntu upload) - - -- Adrien Cunin Fri, 23 Dec 2011 22:57:59 +0100 - filezilla (3.5.2-1) unstable; urgency=low * New upstream release (Closes: #630687) diff -Nru filezilla-3.15.0.2/debian/compat filezilla-3.33.0/debian/compat --- filezilla-3.15.0.2/debian/compat 2016-02-24 10:51:55.000000000 +0000 +++ filezilla-3.33.0/debian/compat 2018-06-14 14:36:59.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru filezilla-3.15.0.2/debian/control filezilla-3.33.0/debian/control --- filezilla-3.15.0.2/debian/control 2016-02-25 10:01:11.000000000 +0000 +++ filezilla-3.33.0/debian/control 2018-06-14 14:36:59.000000000 +0000 @@ -2,24 +2,23 @@ Section: net Priority: optional Maintainer: Adrien Cunin -Build-Depends: autotools-dev, - debhelper (>= 9), - dh-autoreconf, +Build-Depends: debhelper (>= 10), gettext, imagemagick, libdbus-1-dev, - libfilezilla-dev (>= 0.3.0), - libgnutls28-dev (>= 3.1.12), + libfilezilla-dev (>= 0.12.2), + libgnutls28-dev (>= 3.4.15), libgtk2.0-dev, libpugixml-dev (>= 1.5), - libsqlite3-dev, - libwxgtk3.0-dev, + libsqlite3-dev (>= 3.7), + libwxgtk3.0-dev (>= 3.0.2), + nettle-dev (>= 3.1), pkg-config, wx-common -Standards-Version: 3.9.7 +Standards-Version: 4.1.1 Homepage: https://filezilla-project.org/ -Vcs-Git: https://anonscm.debian.org/git/collab-maint/filezilla.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/filezilla.git +Vcs-Git: https://salsa.debian.org/debian/filezilla.git +Vcs-Browser: https://salsa.debian.org/debian/filezilla Package: filezilla Architecture: any diff -Nru filezilla-3.15.0.2/debian/copyright filezilla-3.33.0/debian/copyright --- filezilla-3.15.0.2/debian/copyright 2016-02-25 09:44:13.000000000 +0000 +++ filezilla-3.33.0/debian/copyright 2018-06-14 14:36:59.000000000 +0000 @@ -1,8 +1,8 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://filezilla-project.org/ Files: * -Copyright: 2004-2016 Tim Kosse +Copyright: 2004-2017 Tim Kosse License: GPL-2+ Files: m4/cxx_compile_stdcxx_14.m4 @@ -39,7 +39,7 @@ Files: debian/* Copyright: 2006-2009 Adam Cécile (Le_Vert) 2008-2009 Adrien Cunin - 2016 Gianfranco Costamagna + 2016-2017 Gianfranco Costamagna License: GPL-2+ License: MIT diff -Nru filezilla-3.15.0.2/debian/patches/01_remove-xdg-check.patch filezilla-3.33.0/debian/patches/01_remove-xdg-check.patch --- filezilla-3.15.0.2/debian/patches/01_remove-xdg-check.patch 2016-02-24 11:31:59.000000000 +0000 +++ filezilla-3.33.0/debian/patches/01_remove-xdg-check.patch 2018-06-14 14:36:59.000000000 +0000 @@ -4,7 +4,7 @@ =================================================================== --- filezilla.orig/configure.ac +++ filezilla/configure.ac -@@ -555,7 +555,7 @@ +@@ -620,7 +620,7 @@ if echo "`$WX_CONFIG_WITH_ARGS --basename`" | grep -i gtk > /dev/null 2>&1; then AC_PATH_PROG(xdgopen, xdg-open) if test -z "$xdgopen"; then diff -Nru filezilla-3.15.0.2/debian/patches/11_use-decimal-si-by-default.patch filezilla-3.33.0/debian/patches/11_use-decimal-si-by-default.patch --- filezilla-3.15.0.2/debian/patches/11_use-decimal-si-by-default.patch 2016-02-25 10:00:44.000000000 +0000 +++ filezilla-3.33.0/debian/patches/11_use-decimal-si-by-default.patch 2018-06-14 14:36:59.000000000 +0000 @@ -1,8 +1,10 @@ Author: Adrien Cunin Description: by default, display file sizes using decimal base and SI units instead of just bytes; complies with Ubuntu UnitsPolicy. ---- a/src/interface/Options.cpp -+++ b/src/interface/Options.cpp -@@ -104,7 +104,7 @@ +Index: filezilla/src/interface/Options.cpp +=================================================================== +--- filezilla.orig/src/interface/Options.cpp ++++ filezilla/src/interface/Options.cpp +@@ -105,7 +105,7 @@ { "Logging file", string, _T(""), normal }, { "Logging filesize limit", number, _T("10"), normal }, { "Logging show detailed logs", number, _T("0"), internal }, @@ -10,4 +12,4 @@ + { "Size format", number, _T("3"), normal }, { "Size thousands separator", number, _T("1"), normal }, { "Size decimal places", number, _T("1"), normal }, - + { "TCP Keepalive Interval", number, _T("15"), normal }, diff -Nru filezilla-3.15.0.2/debian/patches/debian.series filezilla-3.33.0/debian/patches/debian.series --- filezilla-3.15.0.2/debian/patches/debian.series 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/debian/patches/debian.series 2018-06-14 14:36:59.000000000 +0000 @@ -0,0 +1 @@ +01_remove-xdg-check.patch diff -Nru filezilla-3.15.0.2/debian/patches/ubuntu.series filezilla-3.33.0/debian/patches/ubuntu.series --- filezilla-3.15.0.2/debian/patches/ubuntu.series 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/debian/patches/ubuntu.series 2018-06-14 14:36:59.000000000 +0000 @@ -0,0 +1,2 @@ +01_remove-xdg-check.patch +11_use-decimal-si-by-default.patch diff -Nru filezilla-3.15.0.2/debian/rules filezilla-3.33.0/debian/rules --- filezilla-3.15.0.2/debian/rules 2016-02-24 10:51:55.000000000 +0000 +++ filezilla-3.33.0/debian/rules 2018-06-14 14:36:59.000000000 +0000 @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 %: - dh $@ --with autoreconf + dh $@ override_dh_auto_configure: dh_auto_configure -- --disable-autoupdatecheck --with-dbus diff -Nru filezilla-3.15.0.2/docs/filezilla.man filezilla-3.33.0/docs/filezilla.man --- filezilla-3.15.0.2/docs/filezilla.man 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/docs/filezilla.man 2018-01-03 04:30:05.000000000 +0000 @@ -1,4 +1,4 @@ -.TH filezilla 1 "January 2016" "" "FileZilla Manual" +.TH filezilla 1 "January 2018" "" "FileZilla Manual" .SH NAME FileZilla \- FTP client .SH SYNOPSIS @@ -64,7 +64,7 @@ .SH SUPPORT Please visit https://filezilla\-project.org/ for further information. Report bugs only if you are using the latest version available from the FileZilla website. .SH COPYRIGHT -Copyright (C) 2004\-2016 Tim Kosse +Copyright (C) 2004\-2018 Tim Kosse .P FileZilla is distributed under the terms of the GNU General Public License version 2 or later. .SH "SEE ALSO" diff -Nru filezilla-3.15.0.2/docs/fzdefaults.xml.example filezilla-3.33.0/docs/fzdefaults.xml.example --- filezilla-3.15.0.2/docs/fzdefaults.xml.example 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/docs/fzdefaults.xml.example 2017-09-19 21:36:39.000000000 +0000 @@ -58,6 +58,12 @@ If the "Disable update check" setting is set to 1, the capability to check for new FileZilla versions will be completely disabled. + Cache directory + + Use the "Cache directory" setting to override where FileZilla places + its resource cache. Same rules for environment variables and relative + paths as for the "Config Location" setting apply. + --> @@ -65,6 +71,7 @@ $SOMEDIR/filezilla/ 0 0 + $USERPROFILE/Documents diff -Nru filezilla-3.15.0.2/docs/fzdefaults.xml.man filezilla-3.33.0/docs/fzdefaults.xml.man --- filezilla-3.15.0.2/docs/fzdefaults.xml.man 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/docs/fzdefaults.xml.man 2018-01-03 04:30:05.000000000 +0000 @@ -1,4 +1,4 @@ -.TH fzdefaults.xml 5 "January 2016" "" "FileZilla Manual" +.TH fzdefaults.xml 5 "January 2018" "" "FileZilla Manual" .SH NAME fzdefaults.xml \- Default options for FileZilla .SH SYNOPSIS @@ -22,7 +22,7 @@ .SH SUPPORT Please visit https://filezilla\-project.org/ for further information. Report bugs only if you are using the latest version available from the FileZilla website. .SH COPYRIGHT -Copyright (C) 2004\-2016 Tim Kosse +Copyright (C) 2004\-2018 Tim Kosse .P FileZilla is distributed under the terms of the GNU General Public License version 2 or later. .SH "SEE ALSO" diff -Nru filezilla-3.15.0.2/docs/fzputtygen.man filezilla-3.33.0/docs/fzputtygen.man --- filezilla-3.15.0.2/docs/fzputtygen.man 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/docs/fzputtygen.man 2018-01-03 04:30:05.000000000 +0000 @@ -1,4 +1,4 @@ -.TH fzputtygen 1 "January 2016" "" "FileZilla Manual" +.TH fzputtygen 1 "January 2018" "" "FileZilla Manual" .SH NAME fzputtygen \- SFTP private key converter of FileZilla .SH DESCRIPTION @@ -10,9 +10,9 @@ .SH SUPPORT Please visit https://filezilla\-project.org/ for further information. Report bugs only if you are using the latest version available from the FileZilla website. .SH COPYRIGHT -Copyright (C) 2004\-2016 Tim Kosse +Copyright (C) 2004\-2018 Tim Kosse .br -Copyright (C) 1997\-2015 Simon Tatham and the PuTTY team +Copyright (C) 1997\-2018 Simon Tatham and the PuTTY team .P FileZilla is distributed under the terms of the GNU General Public License version 2 or later. .SH "SEE ALSO" diff -Nru filezilla-3.15.0.2/docs/fzsftp.man filezilla-3.33.0/docs/fzsftp.man --- filezilla-3.15.0.2/docs/fzsftp.man 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/docs/fzsftp.man 2018-01-03 04:30:05.000000000 +0000 @@ -1,4 +1,4 @@ -.TH fzsftp 1 "January 2016" "" "FileZilla Manual" +.TH fzsftp 1 "January 2018" "" "FileZilla Manual" .SH NAME fzsftp \- SFTP connection handler of FileZilla .SH DESCRIPTION @@ -10,9 +10,9 @@ .SH SUPPORT Please visit https://filezilla\-project.org/ for further information. Report bugs only if you are using the latest version available from the FileZilla website. .SH COPYRIGHT -Copyright (C) 2004\-2016 Tim Kosse +Copyright (C) 2004\-2018 Tim Kosse .br -Copyright (C) 1997\-2015 Simon Tatham and the PuTTY team +Copyright (C) 1997\-2018 Simon Tatham and the PuTTY team .P FileZilla is distributed under the terms of the GNU General Public License version 2 or later. .SH "SEE ALSO" diff -Nru filezilla-3.15.0.2/docs/iconspecs.htm filezilla-3.33.0/docs/iconspecs.htm --- filezilla-3.15.0.2/docs/iconspecs.htm 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/docs/iconspecs.htm 2017-09-19 21:36:39.000000000 +0000 @@ -25,79 +25,71 @@

Requirements

+

Since FileZilla is Free Software, the same has to apply to all artwork used in FileZilla. This means that all artwork has to be published under the GPL or a GPL compatible license. - Note that the Creative Commons Attribution license is not compatible with the GPL. + Note that the Creative Commons Attribution license is + not compatible + with the GPL.

-

Icon sizes

-

- To improve accessibility of the software, the icons should be available in - different sizes. Despite a few exception (see below), there are no restrictions regarding the icon size. + Each icon set should follow a theme, the icons should match nicely. Also, + the function of the icon has to be easily recognizable.

+

- The most commonly sizes used for icons are: + You should combine use of both color and shape. The icons are usually + displayed on a light background, though as we have no control + over the background, all icons must also be recognizable on dark backgrounds + or oddly coloured backgrounds. Avoid monochromatic icons.

-
    -
  • 16x16 (the default icon size used by FileZilla)
    • -
  • 32x32
    • -
  • 48x48
    • -
+ + +

Icon sizes

- The following icons have to be available in 16x16 in addition to the other sizes supported by the theme. See further below for a description what these icons represent. + All icons must exist in scalable form to accomodate modern high-DPI + displays.

-
    -
  • ascii.png
    • -
  • auto.png
    • -
  • binary.png
    • -
  • file.png
    • -
  • folder.png
    • -
  • folderclosed.png
    • -
  • download.png
    • -
  • downloadadd.png
    • -
  • lock.png
    • -
  • upload.png
    • -
  • uploadadd.png
    • -
  • server.png
    • -
  • symlink.png
    • -

- The following icons have to be available in 32x32: + The minimum size at which an icon can be displayed is 16x16 pixels. It is + important, that the icons are good-looking at small sizes. Especially the + smallest icon size should not look blurred beyond recognition. To improve + visibily at these low sizes you can include icons in pre-rasterized form.

+ +

The most commonly used small icon sizes are:

    -
  • file.png
    • +
  • 16x16
    • +
  • 20x20
    • +
  • 24x24
    • +
  • 32x32
    • +
  • 32x32
    • +
  • 48x48
-

It is important, that the icons are good-looking in all those sizes. Especially the smallest icon size should not look blurred

-

Color depth

Regarding the used color-depth there is no limitation.

-

File format

+

File formats

- As file format for the icons, the png format has to be used. For each - provided size there has to be a subdirectory with the size as name - ("16x16" for example) containing all icons in the corresponding size. + All icons have to be submitted in the Scalable Vector Graphics (SVG) format + and placed into a subdirectory named "scalable".

- In addition to the files for the different sizes, each icon should be - available in a vector based format (e.g. SVG) as well, so that differently sized icons can - be generated quickly. -

- -

- Each icon set should follow a theme, the icons should match nicely. Also, - the function of the icon has to be easily recognizable. + As file format for optional fixed-size icons supplementing the scalable + versions, the Portable Network Graphics (PNG) format has to be used. For + each provided size there has to be a subdirectory with the size as name + ("16x16" for example) containing all icons in the corresponding size.

Required icons

@@ -109,66 +101,82 @@

General toolbar:

    -
  • sitemanager.png - Sitemanager
    • -
  • localtreeview.png, remotetreeview.png, logview.png, queueview.png - - Togglebuttons for the local folder tree, for the remote folder tree, - the message log, and the transfer queue.
    • -
  • refresh.png - a refresh button
    • +
  • sitemanager - Sitemanager
    • +
  • localtreeview, remotetreeview, logview, queueview + - Togglebuttons for the local directory tree, for the remote directory + tree, the message log, and the transfer queue.
    • +
  • refresh - a button to refresh directory listings
  • - processqueue.png - a button that starts/stops transfer queue processing + processqueue - a button that starts/stops processing of the Transfer Queue
  • - cancel.png, disconnect.png, reconnect.png - cancel, disconnect and - reconnect buttons + cancel - cancels the current operation
    • -
  • help.png - a help button
    • +
  • disconnect - Closes connection to the server
    • +
  • reconnect - Reconnects to the most recently used server
    • +
  • help - a help button

Browsing toolbar:

  • - synchronize.png - Synchronize folder views (if you change the local dir, - remote dir will be changes as well) + synchronize - Synchronized directory browsing: If user changes the local + directory, the remote directory changes as well, and vice-versa
  • - compare.png - Compare local and remote directories (file entries in the + synctransfer - Synchronize contents of two directories: Transfer files + from the source directory missing in the target directory, delete files + from the target directory not existing in the source directory +
    • +
  • + compare - Compare local and remote directories: File entries in the file lists will receive a coloured background if they exist either only on - the local or remote side, or when the file attributes differ.) + the local or remote side, or when the file attributes differ. +
    • +
  • showhidden - show hidden files
    • +
  • + filter - filter directory listings to remove unwanted files. Note about + metaphors: Funnels are not filters, don't use a funnel metaphor.
    • -
  • showhidden.png - show hidden files
    • -
  • filter.png - filter filenames. Note: Funnels are not filters.
    • -
  • find.png - search for files
    • +
  • find - search for files

Transfer settings toolbar:

    -
  • speedlimits.png - Button to enable speed limits
    • +
  • speedlimits - Button to enable speed limits

Context menus

    -
  • upload.png - Upload selected local files
    • -
  • uploadadd.png - Add selected local files to queue
    • -
  • download.png - Download selected remote files
    • -
  • downloadadd.png - Add selected remote files to queue
    • +
  • upload - Upload selected local files
    • +
  • uploadadd - Add selected local files to queue for later upload
    • +
  • download - Download selected remote files
    • +
  • downloadadd - Add selected remote files to queue for later download

Other generic icons:

  • - ascii.png, auto.png, binary.png - Transfermode icons for Ascii, binary + ascii, auto, binary - Transfermode icons for Ascii, binary and Auto mode.
    • -
  • bookmark.png - Bookmarks/Favourites
    • -
  • bookmark.png - Individual Bookmark/Favourite
    • -
  • folderup.png - "Go up one folder"
    • -
  • folderback.png - "Go back to previous folder"
    • -
  • file.png - icon for generic files
    • -
  • folder.png - icon for open folder/directory
    • -
  • folderclosed.png - icon for a closed folder/directory
    • -
  • lock.png - used in status bar to indicate encrypted connections
    • -
  • server.png - server icon for the site entries in the Site Manager
    • -
  • symlink.png - overlay icon used in file lists to indicate that the displayed item represents a symbolic link
    • +
  • bookmarks - Bookmarks/Favourites
    • +
  • bookmark - Individual Bookmark/Favourite
    • +
  • folderup - "Go up one directory"
    • +
  • folderback - "Go back to previous directory"
    • +
  • file - icon for generic files
    • +
  • folder - icon for open directory
    • +
  • + folderclosed - icon for a closed directory, e.g. a collapsed directory + tree icon +
    • +
  • lock - used in status bar to indicate encrypted connections
    • +
  • server - server icon for the site entries in the Site Manager
    • +
  • + symlink - overlay icon used in file lists to indicate that the displayed + item represents a symbolic link. Note: It should only fills the lower-left + quadrant of the icon +
diff -Nru filezilla-3.15.0.2/INSTALL filezilla-3.33.0/INSTALL --- filezilla-3.15.0.2/INSTALL 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/INSTALL 2018-03-29 08:59:00.000000000 +0000 @@ -6,10 +6,11 @@ --------------- FileZilla depends on the following libraries: -- libfilezilla 0.3.0 or greater -- wxWidgets 3.0.2 or greater +- libfilezilla 0.10.0 or greater +- wxWidgets 3.0.4 or greater of the 3.0.x branch - libidn (only if not on Windows and not having gettaddrinfo with AI_IDN support) -- GnuTLS 3.1.12 or greater +- Nettle 3.1 or greater +- GnuTLS 3.4.15 or greater - libdbus on *nix - sqlite3 3.7 or greater @@ -21,7 +22,7 @@ Optional tools: - recent automake, autoconf if you plan to change configure.in or any of the Makefile.am files -- CppUnit if you want to run the tests +- CppUnit >= 1.13.0 if you want to run the tests, which you want. - NSIS if you want to create the Windows installer If crosscompiling, a native wxrc tool, which is part of wxWidgets, has to @@ -41,3 +42,6 @@ ../configure make make install + +The configure script will inform you about missing dependencies or other +issues with your build environment. diff -Nru filezilla-3.15.0.2/locales/ar.po filezilla-3.33.0/locales/ar.po --- filezilla-3.15.0.2/locales/ar.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/ar.po 2017-09-19 21:36:39.000000000 +0000 @@ -5,10 +5,10 @@ msgid "" msgstr "" "Project-Id-Version: FileZilla3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-12 10:26+0100\n" -"PO-Revision-Date: 2015-10-30 20:05+0300\n" -"Last-Translator: Awadh Alghaamdi \n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-04-23 12:52+0200\n" +"PO-Revision-Date: 2017-04-06 15:20+0300\n" +"Last-Translator: الأستاذ عوض الغامدي \n" "Language-Team: Awadh Al-Ghaamdi \n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -16,18 +16,18 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 2.0\n" "X-Poedit-SourceCharset: UTF-8\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "المنقضي %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "المتبقي %H:%M:%S" @@ -36,11 +36,11 @@ msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" -msgstr "%a - الحساب (السطور التي تحتوي هذا سيتم حذفها إن لم تستخدم حساب) ـ" +msgstr "%a - الحساب (السطور التي تحتوي هذا سيتم حذفها إن لم تستخدم حساب)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" @@ -51,9 +51,9 @@ msgstr[4] "%d مجلد" msgstr[5] "%d مجلد" -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/search.cpp:478 -#: ../../locales/../src/interface/search.cpp:764 +#: ../../locales/../src/interface/RemoteListView.cpp:1419 +#: ../../locales/../src/interface/search.cpp:818 +#: ../../locales/../src/interface/search.cpp:1198 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -64,11 +64,11 @@ msgstr[4] "%d مجلد مع محتوياتها" msgstr[5] "%d مجلد مع محتوياتها" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1389 -#: ../../locales/../src/interface/search.cpp:477 -#: ../../locales/../src/interface/search.cpp:763 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:817 +#: ../../locales/../src/interface/search.cpp:1197 #, c-format msgid "%d file" msgid_plural "%d files" @@ -79,7 +79,7 @@ msgstr[4] "%d ملف" msgstr[5] "%d ملف" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" @@ -90,7 +90,7 @@ msgstr[4] "%d ملف. الحجم الكلي: %s" msgstr[5] "%d ملف. الحجم الكلي: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" @@ -101,12 +101,7 @@ msgstr[4] "%d ملف . الحجم الكلي : على الأقل %s" msgstr[5] "%d ملف . الحجم الكلي : على الأقل %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 -#, c-format -msgid "%d files added to queue" -msgstr "تمت إضافة %d ملف إلى قائمة الإنتظار" - -#: ../../locales/../src/engine/ControlSocket.cpp:104 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -121,7 +116,7 @@ msgid "%h - Host" msgstr "%h - المضيف" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" @@ -132,7 +127,7 @@ msgstr[4] "%llu مجلد" msgstr[5] "%llu مجلد" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -148,42 +143,42 @@ msgid "%p - Password" msgstr "%p - كلمة المرور" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/ث)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? ب/ث)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" -msgstr "%s - أنتهت صلاحية الشهادة" +msgstr "%s - أنتهت صلاحية الشهادة!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" -msgstr "%s - ليست صالحة بعد" +msgstr "%s - ليست صالحة بعد!" #: ../../locales/../src/interface/resources/xrc/settings.xrc:532 #, c-format msgid "%s - Proxy user" msgstr "%s - مستخدم الملقم" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s و %s . الحجم الكلي : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s و %s . الحجم الكلي : على الأقل %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -194,7 +189,7 @@ msgstr[4] "%s بايت" msgstr[5] "%s بايت" -#: ../../locales/../src/interface/FileZilla.cpp:595 +#: ../../locales/../src/interface/FileZilla.cpp:588 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -206,9 +201,9 @@ "لا يمكن العثور على %s . بدون هذا المكون لـ FileZilla فإن SFTP لن يعمل\n" "\n" "الرجاء تحميل FileZilla مرة ثانية . إذا أستمرت هذه المشكلة أرسل لنا تقرير عن " -"الخطأ" +"الخطأ." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:673 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -224,7 +219,7 @@ "- تأكد من أن %s في المجلد المدرج في متغير بيئة المسار\n" "- ضع المسار الكامل إلى %s في متغير البيئة لـ FZ_FZSFTP ." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s مع %d بت" @@ -238,7 +233,7 @@ msgid "%w - Proxy password" msgstr "%w - كلمة مرور الملقم الوكيل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3678 msgid "&Abort previous connection and connect in current tab" msgstr "&قطع الإتصال السابق و الإتصال في تبويب جديد" @@ -246,14 +241,14 @@ msgid "&About..." msgstr "&حول..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "&الحساب:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:473 msgid "&Active" msgstr "&نشط" @@ -270,32 +265,32 @@ msgid "&Add key file..." msgstr "&إضافة ملف مفتاح..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "&Add to queue" msgstr "إ&ضافة إلى قائمة الإنتظار" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:402 msgid "&Adjust server timezone offset:" msgstr "ضبط &فارق التوقيت للخادم:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." -msgstr "الوثوق &دائما بالشهادة في الجلسات المستقبلية" +msgstr "الوثوق &دائما بالشهادة في الجلسات المستقبلية." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:896 msgid "&Always trust this host, add this key to the cache" msgstr "دائما الوثوق بهذا ال&مضيف , إضافة هذا المفتاح إلى المخزون المؤقت" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1969 msgid "&Always use default editor" msgstr "&دائما إستخدام المحرر الإفتراضي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3015 msgid "&Always use selection for unassociated files" msgstr "دائما أ&ستخدم التحديد للملفات الغير مشروكة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "دائما إستخدام هذا الإ&جراء" @@ -304,22 +299,26 @@ msgstr "ال&طلب من نظام التشغيل العنوان الخارجي لـ IP" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&آلي" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Autodetect" msgstr "&كشف آلي" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:273 +msgid "&Background color:" +msgstr "&لون الخلفية:" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:604 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&ثنائى" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1632 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&بادئات ثنائية تستخدم رموز SI (مثال : 1 كب = 1024 بايت)" @@ -327,14 +326,14 @@ msgid "&Bookmarks" msgstr "ال&عناوين المفضلة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2311 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2720 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3002 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2156 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:362 msgid "&Browse..." msgstr "ت&صفح..." @@ -342,10 +341,10 @@ msgid "&Burst tolerance:" msgstr "إ&قحام التجاوب :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3861 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -359,11 +358,11 @@ msgid "&Close" msgstr "&إغلاق" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "إغلاق FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "&Configure speed limits..." msgstr "ت&كوين حدود السرعة..." @@ -371,7 +370,7 @@ msgid "&Configure..." msgstr "ت&كوين..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:614 msgid "&Connect" msgstr "إ&تصال" @@ -379,36 +378,36 @@ msgid "&Copy current connection to Site Manager..." msgstr "&نسخ الإتصال الحالي إلى مدير الموقع..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:794 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "نسخ &إلى الحافظة" #: ../../locales/../src/interface/resources/xrc/menus.xrc:264 #: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "&Create directory" msgstr "إنشاء مجلد" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:630 msgid "&Create new tab" msgstr "إ&نشاء تبويب جديد" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "ت&صحيح" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "&Debug information in message log:" -msgstr "&معلومات التصحيح في سجل الرسالة" +msgstr "&معلومات التصحيح في سجل الرسالة:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Default editor:" msgstr "ال&محرر الإفتراضي:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "ال&إجراء الإفتراضي للملف الموجود..." @@ -416,16 +415,16 @@ msgid "&Delay between failed login attempts:" msgstr "ال&تأخير بين المحاولات الفاشلة لتسجيل الدخول :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1249 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2887 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&حذف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3407 msgid "&Delete symlink" msgstr "&حذف الرابط الترميزي" @@ -433,17 +432,17 @@ msgid "&Directory comparison" msgstr "مقارنة الأ&دلة" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:977 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "&تعطيل التصفح المتزامن و الإستمرار في تغيير المجلد المحلي" -#: ../../locales/../src/interface/state.cpp:966 +#: ../../locales/../src/interface/state.cpp:1055 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "تعطيل التصفح المتزامن &و الإستمرار في تغيير المجلد البعيد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 msgid "&Discard local file then download and edit file anew" msgstr "الت&خلي عن الملف المحلي ثم التحميل و تحرير الملف بشكل جديد" @@ -451,48 +450,44 @@ msgid "&Disconnect" msgstr "&قطع الإتصال" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "قطع الإ&تصال من الخادم" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "عرض &سرعة النقل فورا بدلا من معدل السرعة" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "&Display size in bytes" msgstr "عرض ال&حجم بالبايت" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3844 msgid "&Do not remember passwords (recommended)" msgstr "&عدم تذكر كلمات المرور (مستحسن)" #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." -msgstr "&عدم إظهار هذه اللائحة مرة ثانية" +msgstr "&عدم إظهار هذه اللائحة مرة ثانية." #: ../../locales/../src/interface/resources/xrc/settings.xrc:389 msgid "&Don't use external IP address on local connections." -msgstr "عدم إ&ستخدام عنوان IP خارجى مع الإتصالات المحلية" +msgstr "عدم إ&ستخدام عنوان IP خارجى مع الإتصالات المحلية." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1826 msgid "&Double-click action on files:" msgstr "إجراء ال&نقرة المزدوجة على الملفات:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "&Download" msgstr "ت&حميل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 msgid "&Download to:" msgstr "التحميل &إلى:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:610 msgid "&Download..." msgstr "ت&حميل..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&عمليات التحميل:" @@ -502,14 +497,14 @@ msgid "&Edit" msgstr "ت&حرير" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 msgid "&Edit filter rules..." msgstr "تحرير &قواعد المرشح..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:646 msgid "&Enable" msgstr "ت&مكين" @@ -517,12 +512,12 @@ msgid "&Enable compression" msgstr "تمكين &الضغط" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3733 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "ت&مكين حدود السرعة" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:560 msgid "&Encoding:" msgstr "ال&ترميز:" @@ -530,24 +525,24 @@ msgid "&Encryption:" msgstr "ال&تشفير :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "إدخال &أمر مخصص..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3671 msgid "&Establish connection in a new tab" msgstr "تأسيس الإتصال في تبويب &جديد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Execute" msgstr "ت&نفيذ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1585 msgid "&Export Site Manager entries" msgstr "ت&صدير مدخلات مدير الموقع" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 msgid "&Export..." msgstr "ت&صدير..." @@ -559,42 +554,53 @@ msgid "&File" msgstr "&ملف" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "&File Attributes..." msgstr "&خصائص الملف..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "&أذونات الملف..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2299 msgid "&File:" msgstr "ال&ملف:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1296 msgid "&Filter conditions:" msgstr "&شروط المرشح:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1057 msgid "&Filter sets:" msgstr "&مجموعات المرشح:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1660 +msgid "&Filters" +msgstr "&مرشحات" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 msgid "&Filters:" msgstr "ال&مرشحات:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1773 msgid "&Finish editing and delete local file" msgstr "إ&نتهاء تحرير و حذف الملف المحلي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3332 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"تسطيح المسارات البعيدة، &رفع كافة الملفات المعنية مباشرة إلى المجلد الهدف" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3237 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" "ت&سطيح المسارات البعيدة ، تحميل كافة الملفات المحتوية مباشرة إلى المجلد الهدف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3414 msgid "&Follow symlink, delete target directory contents" msgstr "تتبع &الرابط الترميزي ، حذف محتويات المجلد الهدف" @@ -606,7 +612,7 @@ msgid "&Getting help..." msgstr "ال&حصول على تعليمات..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2651 msgid "&Global bookmark" msgstr "العنوان المفضل ال&شامل" @@ -619,11 +625,11 @@ msgstr "تعل&يمات" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:550 msgid "&Hide identical files" msgstr "إ&خفاء الملفات المتطابقة" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "ال&أعلى" @@ -631,17 +637,17 @@ msgid "&Highest available port:" msgstr "أ&على منفذ متوفر:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2446 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:51 msgid "&Host:" msgstr "ال&مضيف:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1627 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "البادئات الثنائية &IEC (مثال : 1 كي.ب = 1024 بايت)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1513 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (مثال: 2007-09-15)" @@ -649,15 +655,19 @@ msgid "&Import..." msgstr "إ&ستيراد..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2002 msgid "&Inherit system's filetype associations" msgstr "إ&شراكات متوارثة لأنواع ملفات النظام" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "تثبيت &الإصدار الجديد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3325 +msgid "&Keep local path structure relative to search root" +msgstr "&إبقاء بنية المسار المحلي متقاربة مع جذر البحث" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3230 msgid "&Keep remote path structure relative to search root" msgstr "إ&بقاء تركيبة المسار البعيد مقارب إلى جذر البحث" @@ -673,7 +683,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&حدود المنافذ المحلية المستخدمة من قبل FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "&Limit number of simultaneous connections" msgstr "حدود &عدد الإتصالات المتزامنة" @@ -681,12 +691,16 @@ msgid "&Local directory tree" msgstr "ت&فرع المجلد المحلى" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2705 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2795 msgid "&Local directory:" msgstr "ال&مجلد المحلى:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +msgid "&Local search" +msgstr "بحث &محلي" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "&Log to file" msgstr "&سجل إلى ملف" @@ -694,11 +708,11 @@ msgid "&Logon Type:" msgstr "&نوع الدخول:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2501 msgid "&Logontype:" msgstr "&نوع الدخول:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "&منخفض" @@ -710,7 +724,7 @@ msgid "&Manual transfer..." msgstr "&إرسال يدوي..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:499 msgid "&Maximum number of connections:" msgstr "أ&قصى عدد للإتصالات:" @@ -726,11 +740,11 @@ msgid "&Minimize to tray" msgstr "ت&صغير إلى جوار الساعة" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "&Name sorting mode:" msgstr "&نمط ترتيب الأسماء:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2678 msgid "&Name:" msgstr "الأ&سم:" @@ -738,7 +752,7 @@ msgid "&Network configuration wizard..." msgstr "معالج ت&كوين الشبكة..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1243 msgid "&New" msgstr "&جديد" @@ -746,35 +760,36 @@ msgid "&New Site" msgstr "&موقع جديد" -#: ../../locales/../src/interface/Mainfrm.cpp:1663 +#: ../../locales/../src/interface/Mainfrm.cpp:1702 msgid "&New version available!" -msgstr "يتوفر &نسخة جديدة" +msgstr "يتوفر &نسخة جديدة!" #: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "ال&تالي >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1786 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 msgid "&No" msgstr "&لا" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 #: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&بدون" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&عادى" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:501 msgid "&Numeric value:" msgstr "ال&قيمة العددية:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2936 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:622 msgid "&OK" msgstr "&حسنا" @@ -783,29 +798,29 @@ msgstr "&فتح" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 msgid "&Open" msgstr "&فتح" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&كتابة على الملف" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:480 msgid "&Passive" msgstr "&سلبي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&كلمة المرور:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "تشغيل &صوت" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:64 msgid "&Port:" msgstr "ال&منفذ:" @@ -813,11 +828,11 @@ msgid "&Preserve timestamps of transferred files" msgstr "الإ&حتفاظ بطوابع وقت الملفات المنقولة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 msgid "&Queue" msgstr "&قائمة الإنتظار" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:72 msgid "&Quickconnect" msgstr "إ&تصال سريع" @@ -825,11 +840,11 @@ msgid "&Quickconnect bar" msgstr "&شريط الإتصال السريع" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1518 msgid "&Quickconnect history" msgstr "محفوظات الإ&تصال السريع" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:403 msgid "&Read" msgstr "&قراءة" @@ -837,32 +852,36 @@ msgid "&Reconnect" msgstr "إ&عادة الإتصال" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1525 msgid "&Reconnect information" msgstr "معلومات &إعادة الإتصال" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:641 msgid "&Refresh" msgstr "ت&حديث" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:354 msgid "&Remember password until FileZilla is closed" msgstr "تذكر &كلمة المرور إلى أن يتم إغلاق FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3838 msgid "&Remember passwords" msgstr "تذكر &كلمات المرور" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2732 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2819 msgid "&Remote directory:" msgstr "ال&مجلد البعيد:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2335 msgid "&Remote path:" msgstr "ال&مسار البعيد:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +msgid "&Remote search" +msgstr "بحث &بعيد" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "إ&زالة" @@ -871,25 +890,25 @@ msgid "&Remove key" msgstr "إ&زالة المفتاح" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "إزالة المحددة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2881 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&تسمية" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1075 msgid "&Rename..." msgstr "&تسمية..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 msgid "&Reopen local file" msgstr "إ&عادة فتح الملف المحلي" @@ -901,7 +920,11 @@ msgid "&Report a bug..." msgstr "التبليغ عن &خطأ..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "&مطلوب الإنتباه" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 msgid "&Reset and requeue all" msgstr "إ&ستعادة و إعادة وضع الكل في قائمة الإنتظار" @@ -909,11 +932,11 @@ msgid "&Restart Wizard" msgstr "إ&عادة تشغيل المعالج" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "إ&ستئناف" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "ت&شغيل أمر..." @@ -921,7 +944,7 @@ msgid "&Run configuration wizard now..." msgstr "ت&شغيل معالج التكوين الآن..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2095 msgid "&Run update check now..." msgstr "تشغيل &وحدة التحديث الآن..." @@ -933,11 +956,11 @@ msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 msgid "&Save as..." msgstr "حفظ &باسم..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3076 msgid "&Search" msgstr "&بحث" @@ -949,20 +972,20 @@ msgid "&Select Entry:" msgstr "ت&حديد مدخلة:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1878 msgid "&Select language:" msgstr "تحديد ال&لغة:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2187 msgid "&Select the columns that should be displayed:" msgstr "تحديد الأ&عمدة المراد عرضها :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&خادم" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1648 msgid "&Settings" msgstr "إ&عدادات" @@ -970,23 +993,19 @@ msgid "&Settings..." msgstr "إ&عدادات..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Show debug menu" msgstr "إ&ظهار قائمة التصحيح" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 msgid "&Show detailed log" msgstr "إ&ظهار معلومات تفصيلية" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "إظهار ال&رسالة" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "&Show timestamps in message log" msgstr "إ&ظهار طوابع الوقت في سجل الرسائل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1531 msgid "&Site Manager entries" msgstr "&مدخلات مدير المواقع" @@ -994,11 +1013,11 @@ msgid "&Site Manager..." msgstr "&مدير المواقع..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 msgid "&Site-specific bookmark" msgstr "عنوان مفضل لموقع-&معين" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "ت&جاوز" @@ -1006,7 +1025,8 @@ msgid "&Speed limits" msgstr "&حدود السرعة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "&Start transfer immediately" msgstr "&بدء الإرسال فورا" @@ -1014,11 +1034,11 @@ msgid "&Swap local and remote panes" msgstr "الت&بديل بين اللوائح المحلية و البعيدة" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 msgid "&TLS Ciphers" msgstr "&تشفير TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&فحص" @@ -1030,11 +1050,11 @@ msgid "&Transfer" msgstr "إ&رسال" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 msgid "&Transfer mode:" -msgstr "&نمط الإرسال" +msgstr "&نمط الإرسال:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "&قائمة إنتظار الإرسال" @@ -1043,33 +1063,41 @@ msgid "&Treat dotfiles as ASCII files" msgstr "&معاملة الملفات ذات النقط بهيئة ملفات ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1949 msgid "&Unedit" -msgstr "ال&وحدة:" +msgstr "&عدم تعديل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1017 msgid "&Update cached key for this host" msgstr "ت&حديث المفتاح المخزن مؤقتا لهذا المضيف" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "&Upload" msgstr "&رفع" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "&Upload to:" +msgstr "&رفع إلى:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +msgid "&Upload..." +msgstr "&رفع..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "عمليات ال&رفع:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 msgid "&Use custom program" msgstr "إ&ستخدام برنامج مخصص" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:383 msgid "&Use synchronized browsing" msgstr "إستخدام &تصفح متزامن" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "&Use system's default editor for text files" msgstr "إ&ستخدم محرر النظام الإفتراضي للملفات النصية" @@ -1081,21 +1109,21 @@ msgid "&Use the server's external IP address instead" msgstr "إ&ستخدام عنوان IP الخارجي للخادم بدلا من ذلك" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1642 msgid "&Use thousands separator" msgstr "إ&ستخدام ألوف الفواصل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2513 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&المستخدم:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "&Username:" msgstr "&المستخدم:" -#: ../../locales/../src/interface/Mainfrm.cpp:1657 +#: ../../locales/../src/interface/Mainfrm.cpp:1696 #, c-format msgid "&Version %s" msgstr "ال&نسخة %s" @@ -1105,62 +1133,62 @@ msgstr "&عرض" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:616 msgid "&View/Edit" msgstr "&عرض/تحرير" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1979 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "&مراقبة الملفات المعدلة محليا و المطالبة برفع التعديلات" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&When checking for updates, check for:" msgstr "&عند التحقق من التحديثات, التحقق أيضا من:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Write" msgstr "&كتابة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1780 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 msgid "&Yes" msgstr "&نعم" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." -msgstr "'%s' غير موجود أو لا يمكن الوصول إليه" +msgstr "'%s' غير موجود أو لا يمكن الوصول إليه." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." -msgstr "'%s' ليس مجلدا" +msgstr "'%s' ليس مجلدا." -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:992 msgid "'Account' logontype not supported by selected protocol" msgstr "نوع الدخول 'الحساب' ليس مدعوما من قبل البروتوكول المحدد" -#: ../../locales/../src/interface/manual_transfer.cpp:440 +#: ../../locales/../src/interface/manual_transfer.cpp:446 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." msgstr "" "أنواع تسجيل الدخول ’عادي’ و ’الحساب’ ليست متوفرة، يمكنك استخدام 'طلب كلمة " -"المرور' بدلا من ذلك" +"المرور' بدلا من ذلك." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1007 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" "أنواع تسجيل الدخول ’عادي’ و ’الحساب’ ليست متوفرة، حيث تم تغيير الإدخال الخاص " -"بك إلى 'طلب كلمة المرور' ـ" +"بك إلى 'طلب كلمة المرور'." -#: ../../locales/../src/interface/Mainfrm.cpp:587 +#: ../../locales/../src/interface/Mainfrm.cpp:590 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1168,10 +1196,10 @@ msgstr "" "'quote' عادة هو أمر محلي يستخدم من قبل برامج توجيه الأوامر لإرسال عبارة " "طريقة التعامل بعد 'quote' إلى الخادم . قد تريد إدخال أمر خام بدون بدء " -"العبارة بـ 'quote'" +"العبارة بـ 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" @@ -1182,7 +1210,7 @@ msgstr[4] "(تم فرز %d كائن)" msgstr[5] "(تم فرز %d كائن)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% المحمل)" @@ -1208,22 +1236,22 @@ msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 للتعطيل)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat is set to %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1580 msgid "(example: %H:%M)" msgstr "(مثال: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 msgid "(example: %Y-%m-%d)" msgstr "(مثال: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3752 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3769 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1234,51 +1262,51 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:--المتبقي" #: ../../locales/../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." -msgstr "لا يمكن إستخدام -c مع رابط FTP" +msgstr "لا يمكن إستخدام -c مع رابط FTP." #: ../../locales/../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." -msgstr "يمكن فقط أن يستخدم -l مع رابط FTP" +msgstr "يمكن فقط أن يستخدم -l مع رابط FTP." #: ../../locales/../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." -msgstr "لا يمكن أن يتواجد -c و -s في نفس الوقت" +msgstr "لا يمكن أن يتواجد -c و -s في نفس الوقت." #: ../../locales/../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." -msgstr "لا يمكن إستخدام -s مع رابط FTP" +msgstr "لا يمكن إستخدام -s مع رابط FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2255 msgid "0 - None" msgstr "0 - بدون" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2256 msgid "1 - Warning" msgstr "1 - تحذير" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "2 - Info" msgstr "2 - معلومات" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2258 msgid "3 - Verbose" msgstr "3 - مسهب" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "نظام 32 بت" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2259 msgid "4 - Debug" msgstr "4 - تصحيح" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "نظام 64 بت" @@ -1288,22 +1316,26 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:215 msgid "?" -msgstr "؟" +msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." -msgstr "يوجد عنوان مفضل بالإسم المدخل مسبقا . الرجاء إدخال إسم غير مستعمل" +msgstr "يوجد عنوان مفضل بالإسم المدخل مسبقا . الرجاء إدخال إسم غير مستعمل." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1343 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "تم التوقيع على شهادة في السلسلة باستخدام خوارزمية غير آمنة" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." -msgstr "يجب وضع المحرر إفتراضي" +msgstr "يجب وضع المحرر إفتراضي." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/RemoteListView.cpp:166 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:802 msgid "A directory cannot be dragged into one of its subdirectories." -msgstr "لا يمكن سحب المجلد إلى أحد مجلداته الفرعية" +msgstr "لا يمكن سحب المجلد إلى أحد مجلداته الفرعية." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" @@ -1313,22 +1345,22 @@ msgstr "" "القليل من الخوادم لا تسمح بالنمط السلبي او تكون الخوادم ذات تكوين خطأ . في " "مثل هذه الحالات قد تستخدم النمط النشط . حيث أنه في النمط النشط يقوم " -"FileZilla بفتح منفذ و من ثم يطلب من الخادم الإتصال به" +"FileZilla بفتح منفذ و من ثم يطلب من الخادم الإتصال به." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1699 msgid "A file previously opened has been changed." -msgstr "تم تغيير ملف مفتوح مسبقا" +msgstr "تم تغيير ملف مفتوح مسبقا." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "A file with that name is already being transferred." -msgstr "تم إرسال ملف بهذا الإسم مسبقا" +msgstr "تم إرسال ملف بهذا الإسم مسبقا." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "" "A file with that name is still being edited. Please close it and try again." -msgstr "يتم الآن تعديل ملف بهذا الإسم . الرجاء إغلاقه ثم حاول مرة ثانية" +msgstr "يتم الآن تعديل ملف بهذا الإسم . الرجاء إغلاقه ثم حاول مرة ثانية." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1339,36 +1371,36 @@ "تعذر فك ترميز إسم ملف محلي\n" "الرجاء تأكد من أن متغير بيئة LC_CTYPE أو (LC_ALL) موضوع بشكل صحيح\n" "مالم تصلح هذه المشكلة ، فقد تفقد الملفات في نتائج الملفات\n" -"لن يتم عرض تحذير في هذه الجلسة" +"لن يتم عرض تحذير في هذه الجلسة." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "يتوفر نسخة جديدة من FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:661 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." msgstr "" "الخادم الصحيح يعرض دائما كافة الملفات ، لكن بعض الخادمات المتعطلة تخفي " -"الملفات عن المستخدمين . أستخدم هذا الخيار لإجبار الخادم على عرض كافة الملفات" +"الملفات عن المستخدمين . أستخدم هذا الخيار لإجبار الخادم على عرض كافة الملفات." #: ../../locales/../src/interface/resources/xrc/settings.xrc:245 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." -msgstr "الخادم الصحيح لا يتطلب هذا . أتصل بمدير الخادم إذا كنت تحتاج إلى هذا" +msgstr "الخادم الصحيح لا يتطلب هذا . أتصل بمدير الخادم إذا كنت تحتاج إلى هذا." -#: ../../locales/../src/interface/state.cpp:257 +#: ../../locales/../src/interface/state.cpp:266 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" "عملية بعيدة مستمرة و التصفح المتزامن في وضع التمكين\n" -"عطل التصفح المتزامن و تابع تغيير المجلد المحلي ؟" +"عطل التصفح المتزامن و تابع تغيير المجلد المحلي ?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1389,19 +1421,19 @@ msgid "A&pply only to uploads" msgstr "ت&طبيق فقط على عمليات الرفع" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:535 msgid "A&pply to all files and directories" msgstr "ت&طبيق على كافة الملفات و المجلدات" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "A&utomatically remove successful transfers" msgstr "إ&زالة عمليات الإرسال الناجحة تلقائيا" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2590 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:576 msgid "About FileZilla" msgstr "حول FileZilla" @@ -1409,31 +1441,35 @@ msgid "Above the file lists" msgstr "فوق قوائم الملفات" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:113 +msgid "Access to some local directories could not be restored:" +msgstr "تعذر استعادة الوصول إلى بعض المجلدات المحلية:" + +#: ../../locales/../src/engine/server.cpp:951 +#: ../../locales/../src/engine/server.cpp:974 #: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/manual_transfer.cpp:547 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1348 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1349 msgid "Account" msgstr "الحساب" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "الإجراء بعد إ&كتمال قائمة الإنتظار" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1942 msgid "Action on selected file:" msgstr "الإجراء مع الملف المحدد :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1822 msgid "Action to perform:" msgstr "الإجراء للتنفيذ :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "الإجراء:" @@ -1441,13 +1477,13 @@ msgid "Active mode" msgstr "النمط النشط" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "فشل فحص نمط FTP النشط . FileZilla لا يعرف عنوان IP الخارجي الصحيح" -#: ../../locales/../src/interface/netconfwizard.cpp:608 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1455,7 +1491,7 @@ "فشل فحص نمط FTP النشط . FileZilla لا يعرف عنوان IP الخارجي الصحيح . بالإضافة " "إلى ذلك ، جهاز التوجيه الخاص بك عدل عنوان الإرسال" -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1469,12 +1505,13 @@ msgid "Active mode IP" msgstr "IP النمط النشط" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3350 msgid "Add files to &queue only" msgstr "إ&ضافة الملفات فقط إلى قائمة الإنتظار" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "Add selected directory to the transfer queue" msgstr "إ&ضافة المجلد المحدد إلى قائمة إنتظار الإرسال" @@ -1483,20 +1520,20 @@ msgid "Add selected files and folders to the transfer queue" msgstr "إضافة الملفات المحددة و المجلدات الى قائمة إنتظار الإرسال" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1854 msgid "Add to queue" msgstr "إ&ضافة إلى قائمة الإنتظار" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "نوع العنوان غير معتمد" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:308 msgid "Advanced" msgstr "متقدم" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2086 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1510,15 +1547,16 @@ "متوقع، وقد تؤدي حتى إلى تلف النظام الخاص بك. وبالتالي فإن استخدام هذه " "الإصدارات يكون على مسؤوليتك الخاصة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3688 msgid "Al&ways perform this action" msgstr "دائما تنفيذ هذا الإجراء:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2067 msgid "Algorithm:" msgstr "الخوارزمية:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2597 msgid "All files have been successfully transferred" msgstr "تم إرسال كافة الملفات بنجاح" @@ -1526,7 +1564,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "كل المنافذ في المجال الذى تم إدخاله يجب ان تكون بين 1024 و 65535" -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../locales/../src/interface/QueueView.cpp:2593 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1545,11 +1583,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "السماح بالتراجع الكامل إلى نمط آخر عند الفشل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3648 msgid "Already connected" msgstr "متصل مسبقا" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "إسم بديل:" @@ -1575,13 +1613,13 @@ "ممكن تستخدم بدلا عن ذلك وكيل SSH في نظامك . و لعمل ذلك ، تأكد من أن متغير " "بيئة SSH_AUTH_SOCK موضوع" -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "بدلاً من ذلك، يمكنك أيضا تحميل الإصدار الأحدث من موقع FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1628 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1590,7 +1628,7 @@ "حدث خطأ أثناء تحميل قائمة إنتظار النقل من \"%s\"\n" "بعض العناصر الموجودة في قائمة الانتظار ربما لم يتم استعادتها" -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1526 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1599,61 +1637,65 @@ "حدث خطأ أثناء حفظ قائمة إنتظار النقل إلى \"%s\"\n" "بعض العناصر الموجودة في قائمة الانتظار ربما لم يتم حفظها" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1346 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "أحد الناشرين في سلسلة الشهادة له شهادة باطلة" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2134 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "" "يوجد مادة بنفس الإسم مسبقا موجودة عن طريق السحب و الإفلات في المكان المستهدف" -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:976 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:545 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1347 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1644 msgid "Anonymous" msgstr "مجهول" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:1031 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "عملية أخرى مستمرة عن بعد ، لا يمكن تغيير المجلد الآن" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:819 msgid "Any changes made in the Site Manager could not be saved." msgstr "أي تغييرات تتم مع مدير الموقع قد لا يمكن حفظها" -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:995 msgid "Any changes made to the filters could not be saved." msgstr "أي تغييرات تتم مع المرشحات قد لا يمكن حفظها" -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:903 msgid "Any changes made to the filters will not be saved." msgstr "سوف لن يتم حفظ أي تغييرات تمت على المرشحات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:549 msgid "App&ly to directories only" msgstr "ت&طبيق فقط على المجلدات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1202 msgid "Apply" msgstr "تطبيق" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "تطبيق فقط على &قائمة الانتظار الحالية" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:542 msgid "Apply to &files only" msgstr "تطبيق فقط على ال&ملفات" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "إ&رشيف" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1065 msgid "Argument buffer overflow" msgstr "تجاوز سعة المخزن المؤقت الوسيط" @@ -1661,17 +1703,17 @@ msgid "As tab in the transfer queue pane" msgstr "كعلامة في لائحة قائمة الإنتظار للإرسال" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1442 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "المطالبة بالإجراء" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:942 +#: ../../locales/../src/engine/server.cpp:968 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "طلب كلمة المرور" @@ -1683,7 +1725,7 @@ msgid "Ask your operating system for the external IP address" msgstr "سؤال نظام التشغيل الخاص بك عن عنوان IP خارجي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3549 msgid "Asking questions in the FileZilla forums" msgstr "طرح أسئلة في منتديات FileZilla" @@ -1691,7 +1733,7 @@ msgid "Associated program not found:" msgstr "البرنامج المشروك غير موجود :" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "هناك على الاقل شرط واحد للمرشح غير مكتمل" @@ -1699,11 +1741,11 @@ msgid "At this point, all required information has been gathered." msgstr "عند هذه النقطة ، تم تجميع كافة المعلومات المطلوبة" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "الخاصية" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:220 msgid "Authentication failed." msgstr "فشلت المصادقة" @@ -1711,7 +1753,7 @@ msgid "Author:" msgstr "المؤلف:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 msgid "Auto" msgstr "آلي" @@ -1719,24 +1761,20 @@ msgid "Automatic file type classification" msgstr "تصنيف آلي لنوع الملف" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "الأحجام المتوفرة" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "ب <رمز وحدة البايت . تترجم الحرف الأول فقط>" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:334 msgid "B&ypass proxy" msgstr "ت&جاوز الملقم الوكيل" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1029 msgid "Bad file descriptor" msgstr "واصف ملف غير صالح" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3586 msgid "Basic usage instructions" msgstr "تعليمات الإستخدام الأساسية" @@ -1744,16 +1782,16 @@ msgid "Behaviour" msgstr "السلوك" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1126 +#: ../../locales/../src/interface/edithandler.cpp:1154 msgid "Being edited" msgstr "يتم التحرير" -#: ../../locales/../src/engine/tlssocket.cpp:1111 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1337 msgid "Beware! Certificate has been revoked" msgstr "أنتبه! تم إبطال الشهادة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 msgid "Binary" msgstr "ثنائى" @@ -1761,17 +1799,21 @@ msgid "Blackboard" msgstr "لوحة سوداء" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "أزرق" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:302 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:384 msgid "Bookmark" msgstr "عنوان مفضل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2858 msgid "Bookmark:" msgstr "العنوان المفضل:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2847 msgid "Bookmarks" msgstr "عناوين مفضلة" @@ -1779,15 +1821,15 @@ msgid "Browse..." msgstr "تصفح..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:660 msgid "Build date:" msgstr "تاريخ الإصدار" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:637 msgid "Build information" msgstr "معلومات الإصدار" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Business category:" msgstr "فئة العمل :" @@ -1805,93 +1847,100 @@ msgid "C&ancel current operation" msgstr "إ&لغاء العملية الحالية" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "&مسح الكل" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "C&opy URL(s) to clipboard" msgstr "&نسخ الرابط إلى الحافظة" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:625 +msgid "C&opy URL(s) with password to clipboard" +msgstr "&نسخ ر(و)ابط إلى الحافظة تحتوي كلمة مرور" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1518 msgid "C&ustom" msgstr "&مخصص" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2007 msgid "C&ustom filetype associations:" msgstr "إ&شراكات مخصصة لأنواع الملفات :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:764 msgid "CPU features:" msgstr "مميزات CPU" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1570 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1226 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "تعداد فارق التوقيت للخادم..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "تعذرت القراءة من الملف" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "تعذرت كتابة البيانات إلى الملف" -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "تعذرت كتابة البيانات إلى الملف : %s" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1680 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1854 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2942 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3437 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3923 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:629 msgid "Cancel" msgstr "إلغاء الأمر" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "الغاء العملية الحالية" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "لإلغاء العملية الحالية" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "لا يمكن دخول '%s' ، لا يوجد وسيطة مدخلة أو محرك الأقراص غير جاهز" -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:563 msgid "Cannot add server to Site Manager" msgstr "تعذرت إضافة الخادم إلى مدير الموقع" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Cannot assign requested address" msgstr "لا يمكن تعيين العنوان المطلوب" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1899,7 +1948,7 @@ "لا يمكن إغلاق التبويب و هو مشغول\n" "إلغاء العملية الحالية و إغلاق التبويب ؟" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1911,101 +1960,96 @@ msgid "Cannot create new filter" msgstr "تعذر إنشاء مرشح جديد" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1634 +#: ../../locales/../src/interface/LocalListView.cpp:1741 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Cannot edit file" msgstr "تعذر تحرير الملف" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1622 msgid "Cannot edit file, not connected to any server." msgstr "تعذر تحرير الملف , غير متصل بأي خادم" -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Cannot edit file, remote path unknown." msgstr "لا يمكن تحرير الملف ، المسار البعيد غير معروف" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "تعذر تأسيس إتصال FTP إلى خادم SFTP . الرجاء تحديد البروتوكول الصحيح" -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "تعذر تحميل شريط الإتصال السريع من ملف الموارد" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Cannot load key file" msgstr "تعذر تحميل ملف المفتاح" -#: ../../locales/../src/interface/Mainfrm.cpp:993 +#: ../../locales/../src/interface/Mainfrm.cpp:1027 msgid "Cannot load toolbar from resource file" msgstr "تعذر تحميل شريط الأدوات من ملف الموارد" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:450 msgid "Cannot remember password" msgstr "لا يمكن تذكر كلمة المرور" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1228 msgid "Cannot rename entry" msgstr "تعذرت تسمية المدخلة" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Cannot rename file" msgstr "تعذرت تسمية الملف" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:227 +#: ../../locales/../src/interface/filter.cpp:297 msgid "Cannot save filterset" msgstr "تعذر حفظ مجموعة المرشح" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:188 msgid "Cannot select filter" msgstr "تعذر تحديد المرشح" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1484 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "Cannot set file association" msgstr "تعذر وضع إشراك الملف" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Cannot show dialog" msgstr "تعذر إظهار اللائحة" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "Cannot view/edit selected file" msgstr "تعذر عرض/تحرير الملف المحدد" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1762 msgid "Case insensitive" msgstr "غير حساس لحالة الأحرف" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1761 msgid "Case insensitive (default)" msgstr "غير حساس لحالة الأحرف (إفتراضي)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1763 msgid "Case sensitive" msgstr "حساس لحالة الأحرف" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1764 msgid "Case sensitive (default)" msgstr "حساس لحالة الأحرف (إفتراضي)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 msgid "Categories to clear" msgstr "الفئات للمسح" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Certificate and session data are not available yet." msgstr "تاريخ الشهادة و بيانات الجلسة غير متوفرة بعد" @@ -2017,28 +2061,32 @@ msgid "Certificate issuer" msgstr "ناشر الشهادة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1340 +msgid "Certificate signature verification failed" +msgstr "فشل التحقق من صحة التوقيع للشهادة" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "الإعتراض :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:384 msgid "Change file attributes" msgstr "تغيير خواص الملف" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:530 msgid "Change the file permissions." msgstr "تغيير أذونات الملف" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2206 msgid "Changing logfile settings requires restart of FileZilla." msgstr "التغيير لإعدادات ملف السجل يتطلب إعادة تشغيل FileZilla" -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "Character encoding issue" msgstr "حالة ترميز الرمز" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:522 msgid "Charset" msgstr "مجموعة الرموز" @@ -2046,7 +2094,7 @@ msgid "Check for &updates..." msgstr "التدقيق &بحثا عن تحديثات..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2053 msgid "Check for FileZilla &updates automatically:" msgstr "البحث من &تحديثات FileZilla تلقائيا:" @@ -2058,11 +2106,11 @@ msgid "Check for newer versions of FileZilla" msgstr "التدقيق بحثا عن نسخ جديدة من FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "فشل البحث عن تحديثات" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:783 +#: ../../locales/../src/engine/ftp/logon.cpp:281 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2070,7 +2118,7 @@ "التحقق من أوراق اعتماد تسجيل الدخول الخاص بك. إن كلمة المرور المدخلة تبدأ أو " "تنتهي بمسافة." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 +#: ../../locales/../src/engine/ftp/logon.cpp:277 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2078,39 +2126,39 @@ "التحقق من أوراق اعتماد تسجيل الدخول الخاص بك. إن إسم المستخدم المدخل يبدأ أو " "ينتهي بمسافة." -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "Checking for correct external IP address" msgstr "جارى التحقق من عنوان رقم الانترنت الخارجى الصحيح" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "يتم التحقق من التحديثات..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:754 #, c-format msgid "Checksum match on file %s\n" msgstr "تطابق المجموع الاختباري على ملف %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:750 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "عدم تطابق المجموع الاختباري على ملف %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1545 msgid "Choose a key file" msgstr "إختيار ملف مفتاح" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1576 msgid "Choose the default local directory" msgstr "قم باختيار الفولدر المحلى الافتراضى" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2242 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2374 msgid "Choose the local directory" msgstr "تحديد المجلد المحلي" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/http/request.cpp:419 msgid "Chunk data improperly terminated" msgstr "تم إنهاء قطعة البيانات بشكل غير صحيح" @@ -2119,7 +2167,7 @@ msgstr "الشفرة :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:634 msgid "Cl&ose tab" msgstr "إ&غلاق التبويب" @@ -2127,46 +2175,50 @@ msgid "Classic" msgstr "كلاسيكي" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "مسح المخزون المؤقت &للمخطط" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 +msgid "Clear auto&update data" +msgstr "مسح و &تحديث البيانات" + +#: ../../locales/../src/interface/quickconnectbar.cpp:200 msgid "Clear history" msgstr "مسح المحفوظات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1499 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "مسح البيانات الخصوصية" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:199 msgid "Clear quickconnect bar" msgstr "مسح شريط الاتصال السريع" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "أنقر على إنهاء لحفظ تكوينك" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2113 msgid "Client to server MAC:" msgstr "العميل إلى خادم MAC :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2103 msgid "Client to server cipher:" msgstr "التابع إلى شفرة الخادم :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:637 msgid "Close &all other tabs" msgstr "إ&غلاق كافة التبويبات الأخرى" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1134 -#: ../../locales/../src/interface/Mainfrm.cpp:1155 +#: ../../locales/../src/interface/Mainfrm.cpp:1171 +#: ../../locales/../src/interface/Mainfrm.cpp:1192 msgid "Close FileZilla" msgstr "إغلاق FileZilla" @@ -2178,66 +2230,65 @@ msgid "Closes current tab" msgstr "لإغلاق التبويب الحالي" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:289 msgid "Co&mments:" msgstr "تع&ليقات" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "خصائص العامود" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2172 msgid "Column setup" msgstr "إعداد العامود" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1951 msgid "Command and its arguments should be properly quoted." msgstr "يجب أن يتم إقتباس الأمر و عبارات التعامل الخاصة به بشكل صحيح" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Command failed" msgstr "فشل الأمر" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "الأمر غير مدعوم" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:225 msgid "Command not supported by this protocol" msgstr "الأمر غير مدعوم من قبل هذا البروتوكول" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "الأمر:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "تعليق" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Common name:" msgstr "الإسم المشترك:" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "تم تلويث الإتصال بواسطة جهاز التوجيه أو جدار الحماية" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:545 msgid "Compare &modification time" msgstr "مقارنة &وقت التعديل" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 msgid "Compare file&size" msgstr "مقارنة &حجم الملف" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1795 msgid "Comparison &threshold (in minutes):" msgstr "&عتبة المقارنة (بالدقائق) :" @@ -2245,23 +2296,23 @@ msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "عتبة المقارنة يجب أن تكون بين 0 و 1440 دقيقة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:644 msgid "Compiled for:" msgstr "مجمع من أجل:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:652 msgid "Compiled on:" msgstr "مجمع في :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Compiled with:" msgstr "مجمع بواسطة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:676 msgid "Compiler flags:" msgstr "علامات المجمع:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "مضغوط" @@ -2269,8 +2320,8 @@ msgid "Concurrent transfers" msgstr "عمليات الإرسال المتزامنة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3142 msgid "Conditions are c&ase sensitive" msgstr "حالة الشروط &حساسة" @@ -2286,31 +2337,36 @@ msgid "Configure port range" msgstr "تكوين نطاق المنفذ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3592 msgid "Configuring FileZilla and your network" msgstr "تكوين FileZilla و شبكتك" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:1202 msgid "Confirm deletion" msgstr "تأكيد الحذف" -#: ../../locales/../src/engine/local_filesys.cpp:129 -#: ../../locales/../src/interface/edithandler.cpp:1586 -#: ../../locales/../src/interface/LocalListView.cpp:1664 -#: ../../locales/../src/interface/RemoteListView.cpp:1394 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1598 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/RemoteListView.cpp:1423 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1063 +#: ../../locales/../src/interface/search.cpp:1158 msgid "Confirmation needed" msgstr "التأكيد مطلوب" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "مبروك , يبدو أن إعداداتك تعمل" -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:198 msgid "Connect bypassing proxy settings" msgstr "إعدادات تجاوز إتصال ملقم الوكيل" +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "فشل الاتصال: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "الإتصال في التبويب الحالي" @@ -2323,29 +2379,25 @@ msgid "Connect to specified Site Manager site" msgstr "إتصال بموقع مدير موقع معين" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:908 -msgid "Connected" -msgstr "متصل" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "اتصال" -#: ../../locales/../src/interface/netconfwizard.cpp:223 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "إتصال إلى %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1050 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 +#: ../../locales/../src/engine/ControlSocket.cpp:1105 +#: ../../locales/../src/engine/ftp/logon.cpp:95 #, c-format msgid "Connecting to %s through %s proxy" msgstr "الإتصال إلى %s من خلال الملقم %s" -#: ../../locales/../src/engine/ControlSocket.cpp:958 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../locales/../src/engine/ControlSocket.cpp:1030 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 #, c-format msgid "Connecting to %s..." msgstr "جاري الإتصال إلى %s..." @@ -2354,81 +2406,85 @@ msgid "Connection" msgstr "الإتصال" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Connection aborted" msgstr "تم إنهاء الإتصال" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "محاولة الاتصال فشلت" -#: ../../locales/../src/engine/ControlSocket.cpp:922 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:992 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "محاولة الإتصال فشلت مع \"%s\" ، محاولة العنوان التالي" -#: ../../locales/../src/engine/ControlSocket.cpp:927 +#: ../../locales/../src/engine/ControlSocket.cpp:998 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "محاولة الإتصال فشلت مع \"%s\" ." -#: ../../locales/../src/engine/ControlSocket.cpp:184 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:173 +#: ../../locales/../src/engine/engineprivate.cpp:677 msgid "Connection attempt interrupted by user" msgstr "تم إنهاء محاولة الإتصال من قبل المستخدم" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Connection attempt timed out" msgstr "انتهت مهلة الاتصال" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "تم إغلاق الإتصال" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/ControlSocket.cpp:1083 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 msgid "Connection closed by server" msgstr "تم إغلاق الإتصال من قبل الخادم" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:96 msgid "Connection established, initializing TLS..." msgstr "تم تأسيس الإتصال ، جاري تهيئة TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:119 msgid "Connection established, sending HTTP request" msgstr "تم تأسيس الإتصال ، جاري إرسال طلب HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "تم تأسيس الإتصال ، في انتظار رسالة الترحيب" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "تم تأسيس الإتصال ، في انتظار رسالة الترحيب..." -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "الاتصال فقد" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "الإتصال غير مسموح به من قبل مجموعة القاعدة" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "تم رفض الإتصال" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Connection refused by server" msgstr "رفض الملقم الاتصال" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Connection reset by network" msgstr "إعادة تعيين الاتصال بواسطة الشبكة" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Connection reset by peer" msgstr "إعادة تعيين الاتصال بواسطة النظير" -#: ../../locales/../src/engine/ControlSocket.cpp:559 +#: ../../locales/../src/engine/ControlSocket.cpp:508 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" @@ -2439,100 +2495,134 @@ msgstr[4] "أنتهت مهلة الاتصال بعد %d ثانية من الخمول" msgstr[5] "أنتهت مهلة الاتصال بعد %d ثانية من الخمول" -#: ../../locales/../src/interface/netconfwizard.cpp:1077 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "إنقضاء مهملة الإتصال" -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:672 msgid "Connection to server lost." msgstr "فقد الإتصال بالخادم" -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "تم تأسيس الإتصال بالملقم الوكيل , جاري تنفيذ الربط..." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "تم إغلاق الإتصال مع الخادم بطريقة غير إستباقية" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "فشل الإتصال مع خادم الفحص" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "تحويل ملف المفتاح" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1935 #, c-format msgid "Copy (%d) of %s" msgstr "نسخ (%d) من %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1829 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1914 #, c-format msgid "Copy of %s" msgstr "نسخة من %s" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "نسخ روابط المواد المحددة إلى الحافظة, ومعها كلمة مرور" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 msgid "Copy the URLs of the selected items to clipboard." msgstr "نسخ الرابط للمواد المحددة إلى الحافظة" -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "تعذر قبول الإتصال : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:101 +#, c-format +msgid "Could not access path %s" +msgstr "لا يمكن الوصول إلى المسار %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1320 +msgid "Could not add certificate to temporary trust list" +msgstr "لا يمكن إضافة الشهادة إلى قائمة الثقة المؤقتة" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "تعذر إضافة الإتصال إلى مدير الموقع" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:816 msgid "Could not complete operation" msgstr "تعذّر إكمال العملية" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:176 msgid "Could not connect to server" msgstr "تعذر الإتصال بالخادم" -#: ../../locales/../src/engine/ControlSocket.cpp:1087 +#: ../../locales/../src/engine/ControlSocket.cpp:1136 #, c-format msgid "Could not connect to server: %s" msgstr "تعذر الإتصال بالخادم : %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:803 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:331 msgid "Could not convert command to server encoding" msgstr "تعذر تحويل الأمر إلى ترميز الخادم" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "تعذر تحويل المفتاح الخاص" -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/RemoteListView.cpp:2543 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1405 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not copy URLs" msgstr "تعذر نسخ الروابط" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1302 +msgid "Could not copy certificate" +msgstr "تعذر نسخ الشهادة" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "تعذر نسخ البيانات" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:158 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "تعذر إنشاء رابط من المسار %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "تعذر إنشاء رابط لهذا النقل." + +#: ../../locales/../src/interface/updater.cpp:489 #, c-format msgid "Could not create local file %s\n" msgstr "تعذر إنشاء الملف المحلي %s\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "تعذر إنشاء كائن مزامنة السجل: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2193 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "تعذر إنشاء المفضلة المؤمن عليها من عنوان الرابط:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2209 +#: ../../locales/../src/interface/RemoteTreeView.cpp:860 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2541,11 +2631,11 @@ "تعذر تعيين الهدف من عملية السحب و الإفلات\n" "ربما لم تثبت إمتداد القشرة بطريقة صحيحة أو لم تفلت الملفات في نافذة المستكشف" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4095 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "تعذر تأسيس الإتصال مع الخادم" -#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../../locales/../src/interface/FileZilla.cpp:418 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2556,11 +2646,11 @@ "يمكنك وضع مجلد البيانات لـ FileZilla باستعمال خيار سطر الأمر '--datadir " "' أو بوضع متغير بيئة FZ_DATADIR" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 +#: ../../locales/../src/engine/ftp/logon.cpp:746 msgid "Could not generate custom login sequence." msgstr "تعذر توليد سلسلة تسجيل الدخول المخصصة" -#: ../../locales/../src/engine/tlssocket.cpp:956 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1085 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2568,39 +2658,41 @@ "لا يمكن الحصول على الإسم الفارق من ناشر الشهادة , فشل " "gnutls_x509_get_issuer_dn" -#: ../../locales/../src/engine/tlssocket.cpp:933 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1061 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "" "لا يمكن الحصول على الإسم الفارق لموضوع الشهادة , فشل gnutls_x509_get_dn" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1016 msgid "Could not get full remote path." msgstr "تعذر الحصول على كامل المسار البعيد" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:95 +msgid "Could not get native path from CFURL" +msgstr "لا يمكن الحصول على المسار الأصلي من رابط الشهادة" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:173 +msgid "Could not get path from URL" +msgstr "تعذر الحصول على المسار من الرابط" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Could not get reply from fzputtygen." msgstr "تعذر الحصول على الرد من fzputtygen" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Could not get temporary directory to download file into." msgstr "تعذر الحصول على المجلد المؤقت لتحميل معلومات الملف" -#: ../../locales/../src/engine/tlssocket.cpp:879 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "لا يمكن إستيراد شهادات النظير , فشل gnutls_x509_crt_import" - -#: ../../locales/../src/engine/tlssocket.cpp:874 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "لا يمكن تهيئة التركيبة لشهادات النظير , فشل gnutls_x509_crt_init" +#: ../../locales/../src/interface/FileZilla.cpp:92 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "تعذر تهيئة Winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2610,15 +2702,21 @@ "تعذر تحميل \"%s\" ، الرجاء تأكد من أن الملف صالح و يمكن الوصول إليه\n" "لن يتم حفظ أي تغييرات تجري في مدير الموقع" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "تعذر فتخ ملف المفتاح" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "تعذر تحميل ملف الخصوصي" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:1039 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2628,7 +2726,7 @@ "لا يمكن الحصول على المجلد المحلي المتعلق بالمجلد البعيد '%s'\n" "تعطيل التصفح المتزامن و الإستمرار في تغيير المجلد البعيد ؟" -#: ../../locales/../src/interface/state.cpp:361 +#: ../../locales/../src/interface/state.cpp:383 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2638,7 +2736,7 @@ "لا يمكن الحصول على المجلد المحلي المتعلق بالمجلد البعيد '%s'\n" "تم تعطيل التصفح المتزامن" -#: ../../locales/../src/interface/state.cpp:266 +#: ../../locales/../src/interface/state.cpp:276 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2648,81 +2746,106 @@ "لا يمكن الحصول على المجلد البعيد المتعلق بالمجلد المحلي '%s'\n" "تم تعطيل التصفح المتزامن" -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2543 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1405 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not open clipboard" msgstr "تعذرت فتح الحافظة" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:177 -#: ../../locales/../src/engine/logging.cpp:208 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "تعذر فتح ملف السجل: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "تعذر تحليل المسار البعيد" -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:118 msgid "Could not parse server address:" msgstr "تعذر تحليل عنوان الخادم:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 +#: ../../locales/../src/interface/netconfwizard.cpp:994 +msgid "Could not read from data socket." +msgstr "البيانات لا يمكن قراءتها من الملف" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 #, c-format msgid "Could not read from socket: %s" msgstr "تعذرت قراءة من المقبس : %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:553 msgid "Could not read server item." msgstr "تعذرت قراءة مادة الخادم" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2595 +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "لا يمكن تلقي البيانات من الملقم" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:116 +msgid "Could not restore directory access" +msgstr "تعذر استعادة الوصول إلى المجلد" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:173 #, c-format msgid "Could not seek to offset %s within file" msgstr "لا يمكن تقصي فارق %s ضمن الملف" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2502 +#: ../../locales/../src/engine/http/filetransfer.cpp:119 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "لا يمكن تقصي بداية الملف" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "لا يمكن تقصي النهاية للملف" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "تعذر إرسال الأمر إلى fzputtygen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2623 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1271 +msgid "Could not sort peer certificates" +msgstr "لا يمكن ترتيب شهادات النظير" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:201 msgid "Could not spawn IO thread" msgstr "لا يمكن تفقيس مؤشر ترابط إدخال/إخراج" -#: ../../locales/../src/engine/ControlSocket.cpp:1064 +#: ../../locales/../src/engine/ControlSocket.cpp:1119 #, c-format msgid "Could not start proxy handshake: %s" msgstr "تعذر بدء ربط الملقم الوكيل : %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "تعذر بدء الإرسال" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:630 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:840 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " "%s" msgstr "تعذرت كتابة \"%s\" ، لن يتم حفظ أي تغييرات إلى مدير الموقع : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "لا يمكن كتابة \"%s\" , تعذر إضافة العنوان المفضل : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "لا يمكن كتابة \"%s\" , تعذر حفظ العناوين المفضلة الشاملة : %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2731,40 +2854,41 @@ "لا يمكن كتابة \"%s\" , تعذر حفظ قائمة الإنتظار\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../../locales/../src/interface/sitemanager.cpp:750 +#: ../../locales/../src/interface/sitemanager.cpp:807 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2352 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "لا يمكن كتابة \"%s\" , تعذر تصدير المواقع المحددة : %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:149 #, c-format msgid "Could not write \"%s\":" msgstr "تعذرت الكتابة \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "تعذرت كتابة ملف المفتاح: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "تعذرت الكتابة إلى الملف المحلي" -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/engine/logging.cpp:280 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "تعذرت الكتابة إلى ملف السجل : %s" -#: ../../locales/../src/engine/ControlSocket.cpp:882 -#: ../../locales/../src/engine/ControlSocket.cpp:986 +#: ../../locales/../src/engine/ControlSocket.cpp:953 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/http/request.cpp:95 #, c-format msgid "Could not write to socket: %s" msgstr "تعذرت الكتابة إلى المقبس : %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Country:" msgstr "البلد:" @@ -2772,25 +2896,25 @@ msgid "Crea&te new file" msgstr "إ&نشاء ملف جديد" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:1054 msgid "Create &missing local directory and enter it" msgstr "&إنشاء المجلد المحلي المفقود و الدخول فيه" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:976 msgid "Create &missing remote directory and enter it" msgstr "إنشاء &المجلد البعيد المفقود و الدخول فيه" #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:573 msgid "Create a new subdirectory in the current directory" msgstr "إنشاء مجلد فرعي جديد في المجلد الحالي" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:509 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 msgid "Create a new subdirectory in the current directory and change into it" msgstr "قم بإنشاء مجلد فرعي جديد داخل المجلد الحالي ثم قم بالتغيير إليه" @@ -2800,50 +2924,50 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:268 #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Create director&y and enter it" msgstr "إنشاء مجلد و من ثم قم الدخول عليه" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1245 msgid "Create directory" msgstr "إنشاء مجلد" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2629 msgid "Create empty file" msgstr "إنشاء ملف فارغ" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "إنشاء مجلد" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1951 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:607 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:567 #, c-format msgid "Creating directory '%s'..." msgstr "جاري إنشاء المجلد '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:168 msgid "Critical error" msgstr "خطأ حرج" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:159 msgid "Critical error:" msgstr "خطأ حرج:" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "خطأ حرج في إرسال الملف" -#: ../../locales/../src/engine/ControlSocket.cpp:119 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "خطأ حرج في إرسال الملفِ بعد إرسال %s في %s ـ" -#: ../../locales/../src/interface/state.cpp:352 +#: ../../locales/../src/interface/state.cpp:374 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2852,59 +2976,63 @@ "المجلد البعيد الحالي (%s) ليس تحت جذر التزامن (%s)\n" "تم تعطيل التصفح المتزامن" -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:400 msgid "Current transfer type is set to ASCII." msgstr "نوع الإرسال الحالي موضوع على ASCII" -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:408 msgid "Current transfer type is set to automatic detection." msgstr "نوع الإرسال الحالي موضوع على الإكتشاف التلقائي" -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:404 msgid "Current transfer type is set to binary." msgstr "نوع الإرسال الحالي موضوع على ثنائي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2031 msgid "Curve:" msgstr "المنحنى:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1567 msgid "Cus&tom" msgstr "&مخصص" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:91 msgid "Custom filter set" msgstr "مجموعة مرشحات من ضبط المستخدم" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2439 msgid "Custom server" msgstr "خادم مخصص" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "سماوي" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2559 msgid "D&ata type" msgstr "&نوع البيانات" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1637 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "بادئات &عشرية تستخدم رموز SI مثال : (1 كب = 1000 بايت)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:466 msgid "D&efault" msgstr "الإ&فتراضى" #: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:619 msgid "D&elete" msgstr "&حذف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2755 msgid "D&irectory comparison" msgstr "مقارنة &المجلدات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1111 msgid "D&isable all" msgstr "ت&عطيل الكل" @@ -2912,37 +3040,37 @@ msgid "D&o not save passwords" msgstr "&لا تحفظ كلمات المرور" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "D&ouble-click action on directories:" msgstr "إجراء ال&نقرة المزدوجة على المجلدات :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1261 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2893 msgid "D&uplicate" msgstr "ت&كرار" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:43 msgid "DOS-like with virtual paths" msgstr "DOS-like مع مسارات ظاهرية" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "Dangerous filetype" msgstr "نوع ملف خطير" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "بيانات" -#: ../../locales/../src/interface/netconfwizard.cpp:994 -#: ../../locales/../src/interface/netconfwizard.cpp:1058 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." msgstr "تم إغلاق مقبس البيانات مبكرا جدا" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "تاريخ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 msgid "Date formatting" msgstr "تنسيق البيانات" @@ -2958,15 +3086,15 @@ msgid "Debug" msgstr "التصحيح" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 msgid "Debugging settings" msgstr "إعدادات التصحيح" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default &local directory:" msgstr "المجلد المحلي الإ&فتراضي" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:35 msgid "Default (Autodetect)" msgstr "إفتراضي (كشف آلي)" @@ -2974,17 +3102,17 @@ msgid "Default editor not properly quoted." msgstr "لم يتم إقتباس المحرر الإفتراضي بشكل جيد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1461 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "إجراء الملف موجود الإفتراضى" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:371 msgid "Default r&emote directory:" msgstr "المجلد الإ&فتراضى البعيد:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1112 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2992,7 +3120,7 @@ "لا يمكن تحليل المسار الإفتراضي البعيد . تأكد من أن المسار فريد و صالح لنوع " "الخادم المحدد" -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "لغة النظام الإفتراضية" @@ -3014,7 +3142,7 @@ "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "التأخير بين محاولات الإتصال الفاشلة يجب أن تكون بين 1 و 999 ثانية" -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:510 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3029,12 +3157,12 @@ msgstr[4] "تأخير الإتصال لمدة %d ثانية بسبب محاولة إتصال فاشل مسبقا ..." msgstr[5] "تأخير الإتصال لمدة %d ثانية بسبب محاولة إتصال فاشل مسبقا ..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1261 msgid "Delete Site Manager entry" msgstr "حذف مدخلة مدير الموقع" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:582 msgid "Delete selected directory" msgstr "حذف المجلد المحدد" @@ -3043,69 +3171,61 @@ msgid "Delete selected files and directories" msgstr "حذف الملفات المحددة و المجلدات" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:386 #, c-format msgid "Deleting \"%s\"" msgstr "حذف \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:389 #, c-format msgid "Deleting %u files from \"%s\"" -msgstr "حذف %u ملف من \"%s\"" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "حذف المجلدات" +msgstr "حذف %u ملف من \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "لم يتم بعد دعم الحذف للمجلدات المتعددة الغير مرتبطة" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Deleting symbolic link" msgstr "حذف الرابط الترميزي" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:968 msgid "Desktop" msgstr "سطح المكتب" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 msgid "Details" msgstr "تفاصيل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Details for new key:" msgstr "التفاصيل للمفتاح الجديد:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:769 msgid "Detected newer version of FileZilla" msgstr "النسخة الجديدة من FileZilla المكتشفة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1348 msgid "Dire&ctories" msgstr "الا&دلة" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Direction" msgstr "الإتجاه" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "المجلد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:463 -#: ../../locales/../src/interface/Mainfrm.cpp:2165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2834 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1781 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:390 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2251 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "Directory comparison" msgstr "مقارنة المجلدات" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "فشلت مقارنة المجلدات" @@ -3113,37 +3233,41 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "المجلد الذي يحتوي على ملف السجل غير موجود أو إسم الملف غير صالح" -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +msgid "Directory listing &filters..." +msgstr "&مرشحات مجلد الاستماع..." + +#: ../../locales/../src/engine/ControlSocket.cpp:181 msgid "Directory listing aborted by user" msgstr "تم إنهاء الرفع من قبل المستخدم" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2045 msgid "Directory listing failed" msgstr "فشل الرفع" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "Directory listing filters" msgstr "مرشحات الرفع" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:191 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "تم بنجاح وضع قائمة المجلد\"%s\"" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:188 msgid "Directory listing successful" msgstr "تم بنجاح الرفع" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1146 msgid "Disa&ble all" msgstr "تعط&يل الكل" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1047 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "تعطيل التصفح المتزامن و الإستمرار في تغيير المجلد البعيد ؟" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:663 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3151,32 +3275,33 @@ "قم بتعطيل هذا الخيار ثانية إذا كنت لم تعد قادرا على مشاهدة محتويات المجلد " "بشكل صحيح" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "قطع الاتصال من الخادم" -#: ../../locales/../src/engine/ControlSocket.cpp:80 -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:988 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:212 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:879 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:881 -#: ../../locales/../src/interface/queue.cpp:325 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:954 +#: ../../locales/../src/engine/ControlSocket.cpp:1053 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:161 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:164 +#: ../../locales/../src/engine/http/request.cpp:96 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" msgstr "قطع الاتصال من الخادم" -#: ../../locales/../src/engine/ControlSocket.cpp:1019 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:178 #, c-format msgid "Disconnected from server: %s" msgstr "قطع الاتصال من الخادم : %s" -#: ../../locales/../src/interface/queue.cpp:324 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "قطع الاتصال من الخادم السابق" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "لقطع الاتصال من الخادم الظاهر حاليا" @@ -3184,51 +3309,47 @@ msgid "Display about dialog" msgstr "عرض لائحة حول" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Do ¬ use default editor" msgstr "&عدم إستخدام المحرر الإفتراضي" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "بدون إ&جراء" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1896 msgid "Do the same with &all selected files already being edited" msgstr "عمل نفس الاجراء مع &كافة الملفات المحددة التي تم تحريرها مسبقا" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1174 +#: ../../locales/../src/interface/Mainfrm.cpp:1196 msgid "Do you really want to close FileZilla?" msgstr "هل تريد فعلا إغلاق FileZilla ؟" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "هل تريد فعلا حذف كافة مدخلات مدير الموقع و قائمة إنتظار الإرسال ؟" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "هل تريد فعلا حذف كافة مدخلات مدير الموقع ؟" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1263 msgid "Do you really want to delete selected entry?" msgstr "هل تريد فعلا حذف المدخلة المحددة ؟" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "هل تريد فعلا حذف قائمة إنتظار الإرسال هذه ؟" -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:591 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "هل تريد فعلا إرسال '%s' إلى الخادم ؟" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1889 msgid "Do you want to reopen this file?" msgstr "هل تريد فعلا إعادة فتح هذا الملف؟" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 msgid "Documentation" msgstr "وثائق تعليمات" @@ -3240,35 +3361,35 @@ msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "الملفات ذات النقط هي أسماء الملفات تبدأ بنقطة مثل : - .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1819 msgid "Double-click action" msgstr "إجراء النقرة المزدوجة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 msgid "Download" msgstr "تحميل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3741 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "حدود التحميل&:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:592 #, c-format msgid "Download limit: %s/s" msgstr "حدود التحميل: %s/ث" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:595 msgid "Download limit: none" msgstr "حدود التحميل : بدون" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:518 -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 +#: ../../locales/../src/interface/search.cpp:868 +#: ../../locales/../src/interface/search.cpp:873 msgid "Download search results" msgstr "تحميل نتائج البحث" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "Download selected directory" msgstr "تحميل المجلد المحدد" @@ -3276,7 +3397,7 @@ msgid "Download selected files and directories" msgstr "تحميل الملفات المحددة و المجلدات" -#: ../../locales/../src/interface/Mainfrm.cpp:965 +#: ../../locales/../src/interface/Mainfrm.cpp:999 #, c-format msgid "" "Download speed: %s/s\n" @@ -3285,42 +3406,34 @@ "سرعة التنزيل: %s/s\n" "سرعة الرفع: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1111 msgid "Downloading" msgstr "تحميل" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:131 #, c-format msgid "Downloading %s" msgstr "تحميل %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "لم يتم بعد دعم التحميل للمجلدات المتعددة الغير مرتبطة" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "تحميل نتائج البحث" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "جاري تحميل التحديث..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:109 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:114 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:109 +#: ../../locales/../src/interface/RemoteTreeView.cpp:94 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "السحب و الإفلات بين حالات وجود مختلفة من FileZilla لا ينطبق بعد" -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:115 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:118 +#: ../../locales/../src/interface/LocalTreeView.cpp:120 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:100 msgid "Drag&drop between different servers has not been implemented yet." msgstr "السحب و الإفلات بين خوادم مختلفة لا ينطبق بعد" @@ -3328,7 +3441,7 @@ msgid "Dupl&icate" msgstr "ت&كرار" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1104 msgid "E&nable all" msgstr "ت&مكين الكل" @@ -3337,7 +3450,7 @@ msgid "E&nter directory" msgstr "إ&دخال مجلد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "E&xecute" msgstr "ت&نفيذ" @@ -3345,21 +3458,21 @@ msgid "E&xit" msgstr "&خروج" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 msgid "E&xport..." msgstr "&تصدير..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "E-Mail:" msgstr "البريد:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "كل مرشح يحتاج على الأقل شرط واحد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 msgid "Edit filters" msgstr "تحرير المرشحات" @@ -3368,16 +3481,16 @@ "Edit the file with the configured editor and upload changes to the server." msgstr "تحرير الملف بواسطة محرر سبق تكوينه و من ثم رفع التغييرات إلى الخادم" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing directories is not supported" msgstr "تحرير المجلدات غير معتمد" -#: ../../locales/../src/interface/LocalListView.cpp:1582 -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Editing failed" msgstr "فشل التحرير" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing search results" msgstr "تحرير نتائج البحث" @@ -3385,7 +3498,7 @@ msgid "Email:" msgstr "البريد :" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:1844 msgid "Empty command" msgstr "أمر فارغ" @@ -3393,7 +3506,7 @@ msgid "Empty command." msgstr "أمر فارغ" -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2047 msgid "Empty directory listing" msgstr "قائمة مجلد فارغ" @@ -3405,13 +3518,13 @@ msgid "Empty file extension." msgstr "إمتداد ملف فارغ" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "أسماء المرشحات الفارغة غير مسموح بإستخدامها" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "إسم فارغ" @@ -3419,7 +3532,7 @@ msgid "Empty quoted string." msgstr "عبارة مقتبسة فارغة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1139 msgid "En&able all" msgstr "ت&مكين الكل" @@ -3427,19 +3540,19 @@ msgid "Enable invalid character &filtering" msgstr "تمكين ال&فرز للرموز الغير صالحة" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "مشفر" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 msgid "Encryption" msgstr "التشفير" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 msgid "Encryption details" msgstr "تفاصيل التشفير" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "إنهاء المقارنة و تغيير نظام الترتيب ؟" @@ -3447,37 +3560,37 @@ msgid "Enter &custom command..." msgstr "إدخال أمر &مخصص..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3782 msgid "Enter 0 for unlimited speed." msgstr "أدخل 0 للسرعة الغير المحدودة" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:1838 msgid "Enter command" msgstr "إدخال أمر" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:574 msgid "Enter custom command" msgstr "إدخال أمر مخصص" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1852 msgid "Enter directory" msgstr "إدخال مجلد" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "إدخال إسم المرشح" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:220 msgid "Enter name for filterset" msgstr "إدخال إسم لمجموعة المرشحات" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:284 msgid "Enter new name for filterset" msgstr "إدخال إسم جديد لمجموعة الملف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "إدخل كلمة المرور" @@ -3486,14 +3599,13 @@ msgid "Enter selected directory" msgstr "إدخال مجلد محدد" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:53 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3501,9 +3613,9 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"أدخل عنوان الخادم\n" -"لتعيين بروتوكول الخادم , ضع في أول كلمة المضيف معرف البروتوكول . إذا لم يتم " -"تعيين بروتوكول فإن البروتوكول الإفتراضي (ftp://) هو الذي سيستعمل\n" +"أدخل عنوان الخادم. لتعيين بروتوكول الخادم , ضع في أول كلمة المضيف معرف " +"البروتوكول . إذا لم يتم تعيين بروتوكول فإن البروتوكول الإفتراضي (ftp://) هو " +"الذي سيستعمل\n" "يمكنك أيضا إدخال كامل الرابط بالتنسيق protocol://user:pass@host:port هنا ، " "علما إن القيم في الحقول الأخرى سيتم الكتابة عليها بعد ذلك\n" "\n" @@ -3513,7 +3625,7 @@ "- ftps:// لـ FTP عبر TLS (ضمني)\n" "- ftpes:// لـ FTP عبر TLS (صريح)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3522,96 +3634,101 @@ "أدخل كلمة المرور للملف '%s'.\n" "ستتم حماية الملف المحول مع نفس كلمة المرور" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"أدخل المنفذ الذي يستمع له الخادم\n" -"الإفتراضي لـ FTP هو 21 ، الإفتراضي لـ SFTP هو 22" +"أدخل المنفذ الذي يستمع له الخادم. الإفتراضي لـ FTP هو 21 ، الإفتراضي لـ SFTP " +"هو 22" + +#: ../../locales/../src/interface/loginmanager.cpp:73 +msgid "Enter username" +msgstr "أدخل إسم المستخدم" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:80 msgid "Enter username and password" msgstr "أدخل إسم المستخدم و كلمة المرور" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "خطأ في تصدير الإعدادات" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "خطأ بالإستيراد" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1629 msgid "Error loading queue" msgstr "خطأ في تحميل قائمة الإنتظار" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:213 -#: ../../locales/../src/interface/filter.cpp:970 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1833 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:938 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:904 +#: ../../locales/../src/interface/filter.cpp:996 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:246 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:64 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:128 +#: ../../locales/../src/interface/QueueView.cpp:1538 +#: ../../locales/../src/interface/search.cpp:1262 +#: ../../locales/../src/interface/search.cpp:1281 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:522 +#: ../../locales/../src/interface/sitemanager.cpp:582 +#: ../../locales/../src/interface/sitemanager.cpp:686 +#: ../../locales/../src/interface/sitemanager.cpp:774 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:762 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:820 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "خطأ في تحميل ملف xml" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1527 msgid "Error saving queue" msgstr "خطأ في حفظ قائمة الإنتظار" #: ../../locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "Error starting program" msgstr "خطأ في تشغيل البرنامج" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1851 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2224 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1556 +#: ../../locales/../src/interface/sitemanager.cpp:631 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:841 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2353 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 msgid "Error writing xml file" msgstr "خطأ في كتابة ملف xml" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:284 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "الخطأ:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2024 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "مثال : png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1674 msgid "Examples" msgstr "أمثلة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Exe&cute" msgstr "ت&نفيذ" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "الملف التنفيذي لا يحتوي على أي معلومات عن النسخة ، لا يمكن التدقيق بحثا عن " @@ -3621,19 +3738,23 @@ msgid "Explorer" msgstr "المستكشف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1601 +msgid "Export &Filters" +msgstr "تصدير ال&مرشحات" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 msgid "Export &Queue" msgstr "تصدير &فائمة الإنتظار" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1591 msgid "Export &Settings" msgstr "تصدير الإ&عدادات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1572 msgid "Export settings" msgstr "تصدير الإعدادات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1280 msgid "F&ilter name:" msgstr "اسم الم&رشح" @@ -3641,20 +3762,19 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:507 msgid "FTP - File Transfer Protocol" msgstr "FTP - بروتوكول نقل الملفات" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - بروتوكول نقل الملفات مع تشفير إختياري" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - بروتوكول نقل الغير آمن للملفات" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FTP Engine not initialized, can't connect" msgstr "لم يتم تهيئة محرك FTP ، لا يمكن الإتصال" @@ -3679,53 +3799,56 @@ "يستخدم FTP إتصالات ثانوية لإرسال البيانات . هذه الإتصالات الإضافية يمكن " "تأسيسها بطريقتين" -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES-FTP عبر TLS صريح" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS-FTP عبر TLS ضمني" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1778 -#: ../../locales/../src/interface/LocalTreeView.cpp:846 -#: ../../locales/../src/interface/LocalTreeView.cpp:1099 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:540 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:914 +#: ../../locales/../src/interface/LocalListView.cpp:1825 +#: ../../locales/../src/interface/LocalTreeView.cpp:857 +#: ../../locales/../src/interface/LocalTreeView.cpp:1132 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "فشل في تغيير المجلد" -#: ../../locales/../src/interface/FileZilla.cpp:137 -#: ../../locales/../src/interface/FileZilla.cpp:152 -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:142 +#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:159 msgid "Failed to change language" msgstr "فشل في تغيير اللغة" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "فشل تحويل الأمر إلى مجموعة رموز 8 بت" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2134 msgid "Failed to copy or move sites" msgstr "فشل نسخ أو تقل المواقع" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:328 msgid "Failed to create backup copy of xml file" msgstr "فشل في إنشاء نسخة احتياطية من ملف xml" -#: ../../locales/../src/interface/netconfwizard.cpp:803 -msgid "Failed to create listen socket, aborting" -msgstr "فشل في إنشاء مقبس الإستماع . إنهاء" +#: ../../locales/../src/interface/netconfwizard.cpp:808 +msgid "Failed to create listen socket, aborting." +msgstr "فشل في إنشاء مقبس الإستماع. إنهاء" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4078 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "فشل في إنشاء مقبس الإستماع لنمط الإرسال النشط" -#: ../../locales/../src/interface/LocalTreeView.cpp:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:633 msgid "Failed to get 'My Documents' path" msgstr "فشل الحصول على مسار 'المستندات'" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get desktop path" msgstr "فشل الحصول على مسار سطح المكتب" @@ -3737,70 +3860,78 @@ msgid "Failed to get peer address of data connection, connection closed." msgstr "فشل الحصول على عنوان النظير لإتصال البيانات ، تم إغلاق الإتصال" -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "فشل في بدأ محرك FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:754 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:255 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:103 msgid "Failed to initialize TLS." msgstr "فشل في تهيئة TLS" +#: ../../locales/../src/interface/FileZilla.cpp:93 +msgid "Failed to initialize networking" +msgstr "فشل في تهيئة شبكة الاتصال" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "فشل في تحميل اللوائح ، ملفات موارد غير صالحة؟" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "فشل في تحميل المفتاح الخصوصي : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2492 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "فشل في فتح \"%s\" للتذييل/للكتابة" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2558 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:138 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "فشل في فتح \"%s\" للقراءة" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "فشل في فتح \"%s\" للكتابة" -#: ../../locales/../src/engine/ControlSocket.cpp:346 +#: ../../locales/../src/engine/ControlSocket.cpp:343 msgid "Failed to parse returned path." msgstr "تعذر تحليل المسار المرتد" -#: ../../locales/../src/interface/netconfwizard.cpp:1023 +#: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "فشل في إستقبال البيانات" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:184 msgid "Failed to retrieve directory listing" msgstr "فشل في إستخلاص قائمة المجلد" -#: ../../locales/../src/interface/netconfwizard.cpp:731 -msgid "Failed to retrieve external ip address, aborting" -msgstr "فشل في لإسترداد عنوان IP الخارجي ، إنهاء" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +#, fuzzy +msgid "Failed to retrieve external IP address, aborting." +msgstr "فشل في استرداد عنوان IP الخارجي, تم الإنهاء" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3785 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:678 +#, fuzzy +msgid "Failed to retrieve external IP address, using local address" msgstr "فشل في لإسترداد عنوان IP الخارجي ، إستخدام العنوان المحلي" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3806 -msgid "Failed to retrieve local ip address." -msgstr "فشل في لإسترداد عنوان IP المحلي" +#: ../../locales/../src/interface/netconfwizard.cpp:712 +#, fuzzy +msgid "Failed to retrieve local IP address, aborting." +msgstr "فشل في استرداد عنوان IP المحلي, تم الإنهاء" -#: ../../locales/../src/interface/netconfwizard.cpp:707 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "فشل في لإسترداد عنوان IP المحلي , إنهاء" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:696 +#, fuzzy +msgid "Failed to retrieve local IP address." +msgstr "فشل في لإسترداد عنوان IP المحلي" -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "فشل في لإسترداد عنوان IP الخارجي" @@ -3808,53 +3939,52 @@ msgid "Failed to send command." msgstr "فشل في إرسال الأمر" -#: ../../locales/../src/interface/FileZilla.cpp:152 +#: ../../locales/../src/interface/FileZilla.cpp:157 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "فشل في وضع اللغة على %s (%s) إستخدام لغة النظام الافتراضية" -#: ../../locales/../src/interface/FileZilla.cpp:130 +#: ../../locales/../src/interface/FileZilla.cpp:135 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" "فشل في وضع اللغة على %s (%s) ، إستعمال لغة النظام الإفتراضية (%s, %s) ." -#: ../../locales/../src/interface/FileZilla.cpp:119 +#: ../../locales/../src/interface/FileZilla.cpp:124 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "فشل في وضع اللغة على %s (%s) ، إستعمال لغة النظام الإفتراضية" -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:159 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "يتم استخدام لغة النظام الافتراضية%s فشل في ضبط اللغة الى" -#: ../../locales/../src/interface/FileZilla.cpp:126 +#: ../../locales/../src/interface/FileZilla.cpp:131 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "فشل في وضع اللغة على %s ، إستعمال لغة النظام الإفتراضية (%s, %s) ." -#: ../../locales/../src/interface/FileZilla.cpp:116 +#: ../../locales/../src/interface/FileZilla.cpp:121 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "فشل في وضع اللغة على %s ، إستعمال لغة النظام الإفتراضية" -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "فشل في التحقق من الإعدادات" -#: ../../locales/../src/engine/tlssocket.cpp:1105 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 msgid "Failed to verify peer certificate" msgstr "فشل في التحقق من شهادة النظير" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "فشل في الكتابة إلى الملف %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:341 msgid "Failed to write xml file" msgstr "فشل في الكتابة إلى الملف xml" @@ -3866,15 +3996,15 @@ msgid "Fall back to active mode" msgstr "رجوع كامل إلى النمط النشط" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2347 msgid "Fil&e:" msgstr "ال&ملف:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1343 msgid "Fil&es" msgstr "م&لفات" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "ملف" @@ -3882,11 +4012,11 @@ msgid "File Types" msgstr "انواع الملفات" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "File descriptor not a socket" msgstr "واصف الملف ليس مأخذ للتوصيل" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "الملف لا يحتوي على أي بيانات قابلة للإستيراد" @@ -3894,7 +4024,7 @@ msgid "File editing" msgstr "تحرير الملف" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1628 msgid "File exists" msgstr "الملف موجود" @@ -3902,7 +4032,7 @@ msgid "File exists action" msgstr "إجراء وجود الملف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1694 msgid "File has changed" msgstr "تم تغيير الملف" @@ -3910,63 +4040,65 @@ msgid "File lists" msgstr "قوائم الملف" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/edithandler.cpp:1562 +#: ../../locales/../src/interface/FileZilla.cpp:589 +#: ../../locales/../src/interface/FileZilla.cpp:674 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "الملف غير موجود" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3185 +#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/search.cpp:692 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "بحث عن ملف" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "تمت مقاطعة إرسال الملف من قبل المستخدم" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "تمت مقاطعة إرسال الملف من قبل المستخدم بعد إرسال %s في %s ـ" -#: ../../locales/../src/engine/ControlSocket.cpp:136 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "فشل إرسال الملف" -#: ../../locales/../src/engine/ControlSocket.cpp:121 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "فشل إرسال الملف بعد إرسال %s في %s ـ" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "تم تجاوز إرسال الملف" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "تم إرسال الملف بنجاح" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "نجاح إرسال الملف ، تم إرسال %s في %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1136 +#: ../../locales/../src/interface/Mainfrm.cpp:1173 msgid "File transfers still in progress." msgstr "عمليات إرسال الملف مستمرة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2578 msgid "File would transfer with ASCII data type." msgstr "قد يرسل الملف بنوع بيانات ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 msgid "File would transfer with binary data type." msgstr "قد يرسل الملف بنوع بيانات ثنائية" -#: ../../locales/../src/interface/FileZilla.cpp:407 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:419 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FileZilla Error" msgstr "خطأ FileZilla" @@ -3977,15 +4109,15 @@ msgstr "" "يمكن الآن لـ FileZilla أن يفحص تكوينك للتأكد من أن كل شيء تم تكوينه بشكل صحيح" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "FileZilla is already connected to a server." msgstr "متصل مسبقا إلى خادم ما FileZilla" -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1479 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "يحتاج FileZilla إلى إعادة التشغيل لتغيير اللغة لتصبح سارية المفعول" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2112 msgid "FileZilla updates" msgstr "تحديثات FileZilla" @@ -3993,57 +4125,53 @@ msgid "Filelist status &bars" msgstr "أ&شرطة حالة قائمة الملفات" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:286 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "إسم الملف" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&مرشحات إسم الملف..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2193 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "إسم الملف لا يمكن أن يتم بناؤه للمجلد %s و إسم الملف %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Filename invalid" msgstr "إسم ملف غير صالح" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "Filename unchanged" msgstr "لم يتغير إسم الملف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1711 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2144 msgid "Filename:" msgstr "إسم الملف:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "أسماء الملفات لا يمكن ان تحتوى على رمز من الرموز الاتية / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "أسماء الملفات لا يمكن ان تحتوى على رمز من الرموز الاتية / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2002 msgid "Files currently being edited" msgstr "الملفات حاليا يتم تحريرها" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:156 msgid "Filesize" msgstr "حجم الملف" @@ -4051,18 +4179,18 @@ msgid "Filesize format" msgstr "تنسيق حجم الملف" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:157 msgid "Filetype" msgstr "نوع الملف" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2036 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "إشراكات نوع الملف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1336 msgid "Filter applies to:" msgstr "المرشح يطبق على:" @@ -4071,44 +4199,48 @@ msgstr "فرز الرموز الغير صالحة في أسماء الملفات" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "أسم المرشح موجود مسبقا" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1303 msgid "Filter out items matching all of the following" msgstr "فرز المواد المطابقة لكل مما يلي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1304 msgid "Filter out items matching any of the following" msgstr "فرز المواد المطابقة لأي مما يلي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1305 msgid "Filter out items matching none of the following" msgstr "فرز المواد التي لا تطابق مما يلي" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 -msgid "Filter set already exists" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1306 +msgid "Filter out items matching not all of the following" +msgstr "فرز المواد الغير مطابقة لكل مما يلي" + +#: ../../locales/../src/interface/filter.cpp:243 +#: ../../locales/../src/interface/filter.cpp:303 +msgid "Filter set already exists" msgstr "مجموعة المرشح موجودة مسبقا" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "فرز قوائم المجلد" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "فشل التحقق من المرشح" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 msgid "Find &files" msgstr "&بحث عن ملفات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 msgid "Find d&irectories" msgstr "بحث &عن مجلدات" @@ -4120,12 +4252,13 @@ msgid "Fingerprint (SHA-256):" msgstr "بصمة الأصبع (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "بصمة الأصبع:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2077 +msgid "Fingerprints:" +msgstr "بصمة الإصبع:" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "معالج تكوين جهاز التوجيه و جدار الحماية" @@ -4141,7 +4274,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "من أجل الفعالية يجب عليك على الأقل تحديد 10 منافذ" -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:245 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4149,7 +4282,7 @@ "سيتم إستخدام الإعدادات الإفتراضية لهذه الجلسة ، لن يتم حفظ أي تغييرات على " "الإعدادات" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 msgid "Force &UTF-8" msgstr "إجبار &UTF-8" @@ -4157,7 +4290,7 @@ msgid "Force showing &hidden files" msgstr "إ&جبار إظهار الملفات المخفية" -#: ../../locales/../src/interface/Mainfrm.cpp:644 +#: ../../locales/../src/interface/Mainfrm.cpp:658 msgid "Force showing hidden files" msgstr "إجبار إظهار الملفات المخفية" @@ -4165,17 +4298,22 @@ msgid "Format specifications:" msgstr "مواصفات التنسيق :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2019 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "التنسيق : الإمتداد متبوع بالأمر المقتبس بشكل صحيح و المعاملات" #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:646 +#: ../../locales/../src/interface/updater.cpp:686 #, c-format msgid "Found new %s %s\n" msgstr "الجديد المكتشف %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:49 +#, c-format +msgid "Function %s failed" +msgstr "فشلت وظيفة %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "Further documentation" msgstr "تعليمات موسعة" @@ -4183,7 +4321,7 @@ msgid "General" msgstr "عام" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "فشل SOCKS عام للخادم" @@ -4196,125 +4334,130 @@ msgid "Get external IP address from the following URL:" msgstr "الحصول على عنوان IP خارجي من الرابط التالي :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 msgid "Getting help" msgstr "الحصول على تعليمات" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:243 +#: ../../locales/../src/interface/filter.cpp:303 msgid "Given filterset name already exists, overwrite filter set?" msgstr "إسم مجموعة المرشحات المعطى موجود مسبقا ، الكتابة على مجموعة المرشحات ؟" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "عناوين مفضلة شاملة" -#: ../../locales/../src/engine/tlssocket.cpp:210 +#: ../../locales/../src/engine/tlssocket_impl.cpp:316 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS خطأ %d" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:319 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS خطأ %d في %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:311 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS خطأ %d في %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:204 +#: ../../locales/../src/engine/tlssocket_impl.cpp:308 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS خطأ %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:707 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "أخضر" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:430 msgid "Group permissions" msgstr "أذونات المجموعة" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "ع&الى" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP over TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2041 msgid "Hash:" msgstr "التجزئة :" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "مخفي" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:905 -#: ../../locales/../src/interface/queue.cpp:992 +#: ../../locales/../src/interface/queue.cpp:888 +#: ../../locales/../src/interface/queue.cpp:944 msgid "High" msgstr "عالى" -#: ../../locales/../src/interface/queue.cpp:907 -#: ../../locales/../src/interface/queue.cpp:994 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Highest" msgstr "أعلى" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "اعلى منفذ متاح يجب ان يكون رقما بين 1024 و 65535" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1162 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "إستمر بالضغط على مفتاح shift للتبديل بين حالتي المرشح على كلا الجانبين في " "الوقت نفسه" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:612 msgid "Homepage:" msgstr "الصفحة الرئيسية" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Host is down" msgstr "المضيف منهار" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "مفتاح بصمة الإصبع للمضيف :" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:925 msgid "Host key mismatch" msgstr "مفتاح مضيف غير مطابق" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:154 msgid "Host starts with '[' but no closing bracket found." msgstr "الإستضافة تبدأ مع '[' لكن لا يوجد قوس مثله للإغلاق" -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "الإستضافة غير قابلة للوصول" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:970 msgid "Host:" msgstr "المضيف:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:980 +msgid "Hostkey algorithm:" +msgstr "خوارزمية مفتاح المضيف:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:424 msgid "Hours," msgstr "ساعات،" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1562 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (مثال: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 addresses are not supported with SOCKS4 proxy" @@ -4327,7 +4470,7 @@ "إذا تعذر إرسال أو إستقبال بيانات اثناء التشغيل لأكثر من الوقت المحدد سيتم " "إغلاق الإتصال و من ثم سيتم إعادة الإتصال" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2276 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "عند التقرير عن خطأ , الرجاء تقديم سجلات مع مستوى سجل \"Verbose\"" @@ -4350,13 +4493,13 @@ "اذا كان خيار التراجع في وضع التمكين ، سيكون في إمكانك أن تتصل بالخوادم الغير " "مكونة و التي ترفض نمط الإرسال المحدد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:958 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "إذا لم يكن تغيير مفتاح المضيف متوقعا فالرجاء الإتصال بمسؤول الخادم" -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4364,7 +4507,7 @@ "عند إستمرار المشكلة ، بعض أجهزة التوجيه و/أو برنامج جدار الحماية تواصل حجب " "FileZilla" -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4372,7 +4515,7 @@ "عند إستمرار المشكلة ، بعض أجهزة التوجيه و/أو برامج جدران الحماية تواصل " "مقاطعة الإتصال" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2199 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4381,7 +4524,7 @@ "عند وصول حجم ملف السجل إلى الحد ، يتم تسميته بإضافة \"1\" إلى نهاية إسم " "الملف (و قد يتم الكتابة على ملفات السجلات القديمة) و من ثم إنشاء ملف جديد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4389,7 +4532,7 @@ "إذا كان يشير الرابط الترميزي إلى مجلد ما ، فإن FileZilla يمكنه حذف الرابط " "الترميزي أو إزالة محتويات المجلد المرتبط" -#: ../../locales/../src/interface/netconfwizard.cpp:640 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4397,11 +4540,11 @@ "إذا أستمرت المشكلة , الرجاء الإتصال بمصنع جهاز التوجيه الخاص بك أو بمصنع " "الجدار النارى من أجل الحل" -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "إذا أستمرت هذه المشكلة ، فالرجاء أتصل بمصنع جهاز التوجيه الخاص بك" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " @@ -4412,7 +4555,7 @@ "مع توقيت الخادم . إذا أختلف الوقت (نطاق زمنى مختلف) قم بتعييد فارق التوقيت " "في مدير المواقع" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1788 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4420,7 +4563,7 @@ "عند إستخدام مقارنة تعتمد على طابع الوقت ، يكون الملفان متساويان إذا كان " "إختلاف طابع الوقت لهما لا يتجاوز هذه العتبة" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1893 msgid "If you change the language, you need to restart FileZilla." msgstr "عند تغيير اللغة ، يجب عليك إعادة تشغيل FileZilla" @@ -4432,7 +4575,7 @@ "عند النقر على فحص ، FileZilla سيتصل بـ probe.filezilla-project.org و سينفذ " "بعض الفحوصات البسيطة" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1195 msgid "If you close FileZilla, your changes will be lost." msgstr "عند إغلاق FileZilla ، ستفقد تغييراتك" @@ -4454,7 +4597,7 @@ "إذا لديك مشاكل فى إسترجاع قوائم المجلد أو في إرسال الملفات ، حاول ان تغير " "نمط الإرسال الافتراضي" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4488,7 +4631,7 @@ "اذا كنت تستخدم جهاز توجيه ، تأكد من كل هذه المنافذ محولة إلى الكمبيوتر الذى " "يوجد فيه البرنامج" -#: ../../locales/../src/interface/netconfwizard.cpp:611 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4496,16 +4639,16 @@ "إذا أستمر جهاز التوجيه بتغيير عنوان IP ، فالرجاء الإتصال بمنتج جهاز التوجيه " "الخاص بك" -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "إستيراد البيانات من نسخة قديمة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "Import settings" msgstr "إستيراد الإعدادات" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "نجاح الإستيراد" @@ -4546,17 +4689,11 @@ "فى النمط السلبي الذى ينصح به لمعظم المستخدمين . البرنامج يسأل الخادم من أجل " "منفذ و يتصل بالمنفذ المعطى له , حيث لا يوجد الكثير من الضبط يجب عمله هنا" -#: ../../locales/../src/engine/tlssocket.cpp:1117 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "السلسلة ناقصة ، الشهادة العليا ليست شهادة موقّعة ذاتيا" - -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "كلمة مرور غير صحيحة" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4564,7 +4701,7 @@ "تعذر الحصول على معلومات حول أحدث إصدار من FileZill الرجاء المحاولة مرة أخرى " "لاحقا" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:745 +#: ../../locales/../src/engine/ftp/logon.cpp:246 msgid "Initializing TLS..." msgstr "جاري تهيئة TLS..." @@ -4572,13 +4709,13 @@ msgid "Insecure algorithm!" msgstr "خوارزمية غير آمنة" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/ftp/logon.cpp:231 msgid "Insecure server, it does not support FTP over TLS." msgstr "خادم غير آمن ، لا يدعم FTP عبر TLS" -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:948 +#: ../../locales/../src/engine/server.cpp:972 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "تفاعلي" @@ -4586,29 +4723,29 @@ msgid "Interface" msgstr "الواجهة" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Interrupted by signal" msgstr "تم الإنهاء بواسطة إشارة" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/engine/ControlSocket.cpp:214 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "إنهاء من قبل المستخدم" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/http/request.cpp:29 +#: ../../locales/../src/engine/http/request.cpp:351 msgid "Invalid Content-Length" msgstr "طول محتوى غير صالح" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/http/request.cpp:252 msgid "Invalid HTTP Response" msgstr "إستجابة HTTP غير صالحة" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1020 msgid "Invalid argument passed" msgstr "تمرير معيار غير صالح" -#: ../../locales/../src/engine/ControlSocket.cpp:455 -#: ../../locales/../src/engine/ControlSocket.cpp:511 +#: ../../locales/../src/engine/ControlSocket.cpp:451 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4616,42 +4753,51 @@ "تم إستلام تسلسل رموز غير صالح , سيتم تعطيل UTF-8 . قم بتحديد خيار UTF-8 من " "مدير المواقع لإجبار UTF-8" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/http/request.cpp:447 msgid "Invalid chunk size" msgstr "حجم قطعة غير صالح" -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "تم استقبال بيانات غير صالحة" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "تاريخ غير صالح" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "اسم ملف غير صالح" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:159 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "إستضافة غير صالحة ، بعد إغلاق القوس فقط النقط و المنفذ قد تلي ذلك" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "اسم المضيف غير صالح: %s" + +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "Invalid input" msgstr "إدخال غير صالح" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:304 +msgid "Invalid line" +msgstr "سطر غير صالح" + +#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:186 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "تم أدخال منفذ غير صالح ، قيمة المنفذ يجب ان تكون بين 1 الى 65535" -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/engine/server.cpp:92 +#: ../../locales/../src/interface/quickconnectbar.cpp:164 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4665,73 +4811,69 @@ "ftps:// لـ FTP فوق TLS (ضمني)\n" "ftpes:// لـ FTP فوق TLS (صريح)" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218 +#: ../../locales/../src/engine/ftp/logon.cpp:69 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "خادم الإستضافة غير صالح، بعد إغلاق القوس فقط النقطة و المنفذ قد يلي كلاحقة" -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "تعبير اصطلاحي غير صالح" + +#: ../../locales/../src/interface/search.cpp:692 msgid "Invalid regular expression in search conditions." msgstr "تعبير إصطلاحي غير صالح في شروط البحث" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/http/request.cpp:261 msgid "Invalid response code" msgstr "رمز إستجابة غير صالح" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:687 #, c-format msgid "Invalid search conditions: %s" msgstr "شروط بحث غير صالحة : %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:786 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Invalid site path" msgstr "مسار موقع غير صالح" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "حجم غير صالح فى الشرط" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/engine/server.cpp:130 msgid "Invalid username given." msgstr "إسم المستخدم المعطى غير صالح" -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "Invalid value for ai_flags" msgstr "قيمة غير صالحة لـ ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Invalid value for hints" msgstr "قيمة غير صالحة للتلميحات" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction country:" msgstr "بلاد السلطة القضائية :" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction locality:" msgstr "مركز السلطة القضائية :" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Jurisdiction state or province:" msgstr "ولاية أو محافظة السلطة القضائية :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1745 msgid "Keep directories on top" msgstr "إبقاء المجلدات في الأعلى" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:662 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4741,7 +4883,7 @@ "الخيار في وضع التمكين . و مع ذلك فإن FileZilla يؤدي بعض الفحوصات للتأكد من " "أن الخادم يدعم هذه الميزة ، و الفحص قد يفشل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2014 msgid "Key exchange" msgstr "تبديل المفتاح" @@ -4749,29 +4891,29 @@ msgid "Key exchange:" msgstr "تبديل المفتاح:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:945 +#: ../../locales/../src/engine/server.cpp:970 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1350 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1351 msgid "Key file" msgstr "ملف مفتاح" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "الأ&قل" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1874 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "اللغة" -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1479 msgid "Language changed" msgstr "تم تغيير اللغة" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:158 msgid "Last modified" msgstr "اخر تغيير" @@ -4791,29 +4933,30 @@ msgid "Limit local ports" msgstr "حدود المنافذ المحلية" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2168 msgid "Limit size of logfile" msgstr "حد الحجم لملف السجل" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2176 msgid "Limit:" msgstr "الحدود :" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/http/request.cpp:407 msgid "Line length exceeded" msgstr "تجاوز حد السطر" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:727 msgid "Linked against" msgstr "مرتبط إلى" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "مقبس الإستماع مغلق" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "القائمة:" @@ -4821,50 +4964,59 @@ msgid "Lo&west available port:" msgstr "المنفذ المتوفر ال&أدنى :" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1144 +#: ../../locales/../src/interface/edithandler.cpp:1380 msgid "Local" msgstr "محليا" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1017 msgid "Local address in use" msgstr "العنوان المحلي قيد الاستخدام" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Local endpoint has been closed" msgstr "تم إغلاق نقطة النهاية المحلية" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2291 msgid "Local file" msgstr "الملف المحلي" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:314 msgid "Local file does not exist." msgstr "الملف المحلي غير موجود" -#: ../../locales/../src/interface/updater.cpp:370 -#: ../../locales/../src/interface/updater.cpp:462 +#: ../../locales/../src/interface/updater.cpp:400 +#: ../../locales/../src/interface/updater.cpp:493 #, c-format msgid "Local file is %s\n" msgstr "الملف المحلي هو: %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../../locales/../src/interface/manual_transfer.cpp:310 msgid "Local file is a directory instead of a regular file." msgstr "الملف المحلي هو مجلد بدلا من ملف عادي" -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Local file is not a valid filename." msgstr "إسم الملف المحلي ليس صالح" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:650 +#: ../../locales/../src/interface/search.cpp:656 +msgid "Local file search" +msgstr "بحث محلي عن ملف" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1090 msgid "Local filters:" msgstr "المرشحات المحلية" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3320 +msgid "Local path handling:" +msgstr "معالجة المسار المحلي:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "الموقع المحلى:" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Locality:" msgstr "المحلية:" @@ -4872,12 +5024,16 @@ msgid "Log file" msgstr "ملف السجل" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftp/logon.cpp:414 +msgid "Logged in" +msgstr "مسجل دخول" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "السجل" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803 +#: ../../locales/../src/engine/ftp/logon.cpp:300 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4885,7 +5041,7 @@ "بيانات تسجيل الدخول تحتوى على رموز ليست-ASCII و الخادم قد يكون لا يوافق " "UTF-8 . لا يمكن التراجع إلى مجموعة الرموز المحلية و الملقم الوكيل هو المستخدم" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810 +#: ../../locales/../src/engine/ftp/logon.cpp:307 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4893,9 +5049,10 @@ "بيانات تسجيل الدخول تحتوى على رموز ليست-ASCII و الخادم قد يكون لا يوافق " "UTF-8 . تجربة مجموعة الرموز المحلية" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "تم التنفيذ بالكامل لسلسلة تسجيل الدخول و مع ذلك لم يتم الدخول . إنهاء" +#: ../../locales/../src/engine/ftp/logon.cpp:334 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "" +"تم التنفيذ بالكامل لسلسلة تسجيل الدخول و مع ذلك لم يتم الدخول. تم الإنهاء" #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -4910,17 +5067,17 @@ "نوع الدخول ، يمكن فقط أن يستخدم مع رابط FTP . يجب أن يكون التعامل إما '%s' " "أو '%s'" -#: ../../locales/../src/interface/queue.cpp:900 -#: ../../locales/../src/interface/queue.cpp:987 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "Low" msgstr "منخفض" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 msgid "Lowest" msgstr "الأقل" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "أقل منفذ متاح يجب ان يكون رقما بين 1024 و 65535" @@ -4928,61 +5085,78 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "أرجواني" + +#: ../../locales/../src/interface/xmlfunctions.cpp:38 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "تأكد من أن الملف يمكن الوصول إليه و أنه مستند بتنسيق XML صالح" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/http/request.cpp:398 +#: ../../locales/../src/engine/http/request.cpp:407 +#: ../../locales/../src/engine/http/request.cpp:419 +#: ../../locales/../src/engine/http/request.cpp:447 #, c-format msgid "Malformed chunk data: %s" msgstr "بيانات القطعة المحرفة : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/http/request.cpp:29 #, c-format -msgid "Malformed header: %s" -msgstr "المقدمة الرأسية المحرفة : %s" +msgid "Malformed request header: %s" +msgstr "مقدمة استجابة محرفة: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 -msgid "Malformed reply, server not sending proper line endings" -msgstr "إجابة محرفة ، الخادم لا يرسل نهايات صحيحة للسطر" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/engine/http/request.cpp:476 +#, c-format +msgid "Malformed response body: %s" +msgstr "متن استجابة محرفة: %s" + +#: ../../locales/../src/engine/http/request.cpp:225 +#: ../../locales/../src/engine/http/request.cpp:304 +#: ../../locales/../src/engine/http/request.cpp:343 +#: ../../locales/../src/engine/http/request.cpp:351 +#, c-format +msgid "Malformed response header: %s" +msgstr "المقدمة استجابة محرفة: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2633 +#: ../../locales/../src/interface/manual_transfer.cpp:298 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:310 +#: ../../locales/../src/interface/manual_transfer.cpp:314 +#: ../../locales/../src/interface/manual_transfer.cpp:321 +#: ../../locales/../src/interface/manual_transfer.cpp:327 +#: ../../locales/../src/interface/manual_transfer.cpp:333 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Manual transfer" msgstr "إرسال يدوي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3108 msgid "Match all of the following" msgstr "مطابقة كل ما يأتي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 msgid "Match any of the following" msgstr "مطابقة أي مما يلي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 msgid "Match none of the following" msgstr "عدم مطابقة ما يلي" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3111 +msgid "Match not all of the following" +msgstr "عدم مطابقة كلا مما يلي" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "أقصى &عمليات متزامنة للإرسال :" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Memory allocation failure" msgstr "فشل في تخصيص الذاكرة" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1750 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1793 msgid "Message log" msgstr "سجل الرسائل" @@ -4990,95 +5164,99 @@ msgid "Message log position" msgstr "مكان سجل الرسائل" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Message too large" msgstr "الرسالة كبيرة جدا" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "MiB" msgstr "مب" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:440 msgid "Minutes" msgstr "دقائق" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2206 msgid "Move &down" msgstr "تحريك ل&تحت" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2200 msgid "Move &up" msgstr "تحريك ل&فوق" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:987 msgid "My Computer" msgstr "جهاز الكمبيوتر" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:977 msgid "My Documents" msgstr "المستندات" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:339 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:752 msgid "My Sites" msgstr "مواقعى" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "بدون" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2671 msgid "Name" msgstr "الإسم" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1228 msgid "Name already exists" msgstr "الإسم موجود مسبقا" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 msgid "Name of bookmark already exists." msgstr "الإسم للعنوان المفضل موجود مسبقا" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 msgid "Name:" msgstr "الاسم:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 msgid "Natural sort" msgstr "ترتيب طبيعي" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "يجب ادخال اسم مرشح" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:650 +msgid "Need to enter valid local path" +msgstr "مطلوب إدخال مسار محلي صالح" + +#: ../../locales/../src/interface/search.cpp:677 msgid "Need to enter valid remote path" msgstr "مطلوب إدخال مسار بعيد صالح" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1041 msgid "Need to specify a character encoding" msgstr "يجب تحديد ترميز للحروف" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Neither nodename nor servname provided, or not known" msgstr "لم يتم تقديم nodename و لا servname, أو غير معروف" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "شبكة المضيف ليس لديها أي عناوين اشبكة الاتصال في شجرة العنوان المطلوب" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "Network unreachable" msgstr "الشبكة غير قابلة للوصول" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2059 msgid "Never" msgstr "بدون" @@ -5090,37 +5268,37 @@ msgid "New &tab" msgstr "&تبويب جديد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2876 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "&عنوان مفضل جديد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2636 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2180 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2291 msgid "New bookmark" msgstr "علامة جديدة" -#: ../../locales/../src/interface/LocalTreeView.cpp:1126 -#: ../../locales/../src/interface/RemoteListView.cpp:1310 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 +#: ../../locales/../src/interface/LocalTreeView.cpp:1163 +#: ../../locales/../src/interface/RemoteListView.cpp:1334 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1258 msgid "New directory" msgstr "مجلد جديد" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:61 #, c-format msgid "New features and improvements in %s" msgstr "الميزات الجديدة و التحسينات في %s" @@ -5129,13 +5307,13 @@ msgid "New filter" msgstr "مرشح جديد" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:950 msgid "New folder" msgstr "مجلد جديد" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../../locales/../src/interface/sitemanager.cpp:602 +#: ../../locales/../src/interface/sitemanager.cpp:616 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2264 msgid "New site" msgstr "موقع جديد" @@ -5143,27 +5321,27 @@ msgid "Next to the transfer queue" msgstr "التالي إلى قائمة إنتظار الإرسال" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:850 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:388 msgid "No" msgstr "لا" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "No address associated with nodename" msgstr "لا يوجد عنوان مرتبط مع nodename" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "لم يتم تحديد فئة للتصدير" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:1844 msgid "No command given, aborting." msgstr "لم يتم وضع أمر , مقاطعة" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3757 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:651 msgid "No external IP address set, trying default." msgstr "لم يتم تحديد IP خارجى ، محاولة الافتراضى" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "No files are currently being edited." msgstr "لا يوجد ملفات حاليا يتم تحريرها" @@ -5171,95 +5349,92 @@ msgid "No filter name given" msgstr "لم يتم وضع إسم المرشح" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:79 +#: ../../locales/../src/engine/server.cpp:172 +#: ../../locales/../src/engine/server.cpp:193 msgid "No host given, please enter a host." msgstr "لم يتم ادخال مضيف ، من فضلك ادخل عنوان مضيف" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "لا توجد صور متاحة" -#: ../../locales/../src/interface/QueueView.cpp:2977 -msgid "No more files in the queue!" -msgstr "لا يوجد المزيد من الملفات في قائمة الإنتظار" - -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:227 +#: ../../locales/../src/interface/filter.cpp:297 msgid "No name for the filterset given." msgstr "لم يتم وضع إسم لمجموعة المرشح" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3043 msgid "No program associated with filetype" msgstr "لا يوجد برنامج مشروك مع نوع الملف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2960 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "لا يوجد برنامج مشروك من أجل تحرير الملفات ذات الإمتداد '%s'" -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "No route to host" msgstr "لا يوجد توجيه إلى المضيف" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:397 msgid "No search results" msgstr "لا يوجد نتائج بحث" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:349 msgid "No sites available" msgstr "لا يتوفر مواقع" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "لا يوجد طريقة مصادقة SOCKS5 مدعومة" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "No username given." msgstr "لم يتم وضع إسم المستخدم" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1836 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1855 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "بدون" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2407 msgid "None selected yet" msgstr "الغير محددة بعد" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Nonrecoverable failure in name resolution" msgstr "فشل غير قابل للإصلاح في تحليل الاسم" #: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:903 -#: ../../locales/../src/interface/queue.cpp:990 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/engine/server.cpp:939 +#: ../../locales/../src/engine/server.cpp:966 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/queue.cpp:886 +#: ../../locales/../src/interface/queue.cpp:942 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1348 msgid "Normal" msgstr "عادى" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 msgid "Not all items could be requeued for transfer." msgstr "ليست كل المواد يمكن إعادة وضعها في قائمة الإنتظار من أجل النقل" -#: ../../locales/../src/interface/state.cpp:179 -#: ../../locales/../src/interface/state.cpp:482 +#: ../../locales/../src/interface/state.cpp:193 +#: ../../locales/../src/interface/state.cpp:1258 msgid "Not connected" msgstr "غير متصل" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2043 msgid "Not connected to any server" msgstr "غير متصل بأي خادم" -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:563 msgid "Not connected to any server." msgstr "غير متصل بأي خادم" @@ -5267,11 +5442,11 @@ msgid "Not connected." msgstr "غير متصل" -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Not initialized, need to call WSAStartup" msgstr "غير مهيأ، بحاجة إلى استدعاء WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:646 +#: ../../locales/../src/interface/Mainfrm.cpp:660 msgid "Note that this feature is only supported using the FTP protocol." msgstr "لاحظ أن هذه الميزة مدعومة فقط باستخدام بروتوكول FTP" @@ -5283,7 +5458,7 @@ msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "ملاحظة : إستخدام ملقم وكيل عام يقوم بفرض النمط السلبي مع إتصالات FTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "Number of decimal places:" msgstr "الرقم للمواضع العشرية:" @@ -5291,40 +5466,37 @@ msgid "Number of retries has to be between 0 and 99." msgstr "عدد المحاولات يجب أن يكون بين 0 و 99" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "&فتح ملف" - #: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:560 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1480 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1848 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3266 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3633 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3799 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3855 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "حسنا" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:748 msgid "OS version:" msgstr "نسخة النظام:" @@ -5336,35 +5508,40 @@ "على الصفحات التالية ، سيتم تكوين نمط الإرسال المحدد ، بالإضافة إلى نمط " "التراجع إذا كان في وضع التمكين" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:860 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:398 msgid "Once" msgstr "مرة" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "Once a day" msgstr "مرة في اليوم" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2061 msgid "Once a week" msgstr "مرة كل أسبوع" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:535 msgid "Only use plain FTP (insecure)" msgstr "استخدام FTP عادي (غير آمن)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1970 +msgid "Op&en file" +msgstr "&فتح ملف" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "Open directory in system's file manager" msgstr "فتح المجلد في مدير ملفات النظام" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "فتح مدير المواقع" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "فتح إذارة المواقع" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "لفتح إذارة المواقع, أنقر باليمين لعرض قائمة بالمواقع" @@ -5376,14 +5553,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "فتح لائحة إعدادات FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 msgid "Opened as:" msgstr "فتح بهيئة:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1695 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1736 +#: ../../locales/../src/interface/LocalListView.cpp:1748 msgid "Opening failed" msgstr "فشل الفتح" @@ -5395,28 +5572,32 @@ msgid "Opens the Site Manager" msgstr "لفتح مدير المواقع" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "لفتح لائحة مرشح قائمة المجلد . النقرة اليمنى لتبديل المرشحات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "Operating System:" msgstr "نظام التشغيل:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1028 msgid "Operation already in progress" msgstr "العملية قيد التقدم" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1019 msgid "Operation in progress" msgstr "العملية قيد التقدم" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Operation not supported" msgstr "العملية غير مدعومة" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "برتقالى" + +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Organization:" msgstr "المنظمة:" @@ -5424,16 +5605,16 @@ msgid "Other SFTP options" msgstr "خيارات SFTP أخرى" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Other system error" msgstr "خطأ آخر في النظام" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:264 msgid "Other:" msgstr "أخرى :" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1023 +#: ../../locales/../src/engine/socket.cpp:1024 msgid "Out of memory" msgstr "نفاذ الذاكرة" @@ -5441,57 +5622,57 @@ msgid "Overview" msgstr "ترجمة الأستاذ عوض الغامدي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "الكتابة على ال&ملف اذا المصدر أحدث" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1443 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "كتابة على الملف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1445 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "الكتابة على الملف اذا الحجم مختلف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "الكتابة على الملف اذا المصدر أحدث أو الحجم مختلف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1444 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" msgstr "الكتابة على الملف اذا المصدر أحدث" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "الكتابة على الملف إ&ذا الحجم مختلف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "الكتابة &على الملف إذا المصدر أحدث أو الحجم مختلف" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" msgstr "نوع الإصدار المملوك: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:396 msgid "Owner permissions" msgstr "أذونات المالك" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:404 +#: ../../locales/../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "المالك/المجموعة" @@ -5507,7 +5688,7 @@ msgid "P&roxy host:" msgstr "الملقم ال&وكيل:" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "تم تحريف الأمر PORT بواسطة جهاز التوجيه أو جدار الحماية" @@ -5515,18 +5696,18 @@ msgid "Pa&ssive (recommended)" msgstr "&سلبي (مستحسن)" -#: ../../locales/../src/interface/Mainfrm.cpp:2320 +#: ../../locales/../src/interface/Mainfrm.cpp:2412 msgid "Parameter not a valid URL" msgstr "المعيار ليس رابط صالح" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:573 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "تحليل %d بايت من معلومات الإصدار\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2523 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "Pass&word:" msgstr "كلمة &المرور:" @@ -5539,61 +5720,61 @@ msgid "Passive mode" msgstr "النمط السلبي" -#: ../../locales/../src/interface/netconfwizard.cpp:604 -#: ../../locales/../src/interface/netconfwizard.cpp:617 -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "تم وضع النمط السلبي النمط الإفتراضى للإرسال" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "مطلوب كلمة مرور" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:155 msgid "Path" msgstr "مسار" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2239 +#: ../../locales/../src/engine/ftp/rmd.cpp:40 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "لا يمكن بناء المسار للمجلد %s و للمجلد الفرعي %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2278 +#: ../../locales/../src/interface/Mainfrm.cpp:2367 msgid "Path not found:" msgstr "المسار غير موجود" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2698 msgid "Paths" msgstr "مسارات" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1260 +#: ../../locales/../src/interface/edithandler.cpp:1350 +#: ../../locales/../src/interface/edithandler.cpp:1360 msgid "Pending removal" msgstr "تعليق الإزالة" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "الترخيص" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1016 +#: ../../locales/../src/engine/socket.cpp:1025 msgid "Permission denied" msgstr "تم رفض الإذن" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:159 msgid "Permissions" msgstr "الأذونات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:756 msgid "Platform:" msgstr "النظام الأساسي:" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5609,12 +5790,12 @@ "الرجاء تكوين أي جدران حماية أو أجهزة توجيه بحيث يستطيع FileZilla عمل إتصال " "خارجى مع منافذ مختلفة" -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "الرجاء تعطيل الإعدادات مثل 'نمط DMZ' أو 'نمط اللعب' على جهاز التوجيه الخاص بك" -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5628,13 +5809,13 @@ msgid "Please enter a custom time format." msgstr "الرجاء إدخال تنسيق مخصص للوقت" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "الرجاء إدخال تاريخ بالتنسيق سنة-شهر-يوم مثال 2010-07-18" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "أدخل من فضلك حدود سرعة التحميل تساوي أو أكبر من 0 %s/ث" @@ -5643,16 +5824,16 @@ msgid "Please enter a name for the new filter." msgstr "من فضلك أدخل أسم للمرشح الجديد" -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "من فضلك أدخل أسم جديد للمرشح المنسوخ" -#: ../../locales/../src/interface/filter.cpp:389 +#: ../../locales/../src/interface/filter.cpp:282 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "الرجاء إدخال إسم جديد لمجموعة المرشح \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "من فضلك أدخل إسم جديد للمرشح" @@ -5673,21 +5854,10 @@ "transfers." msgstr "من فضلك أدخل رقم بين 0 و 10 لعدد عمليات الإرسال المتزامنة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "من فضلك ادخل كلمة مرور لهذا الخادم" -#: ../../locales/../src/interface/QueueView.cpp:2112 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"الرجاء إدخال المسار و الملف التنفيذي للتشغيل\n" -"مثال : C:\\somePath\\file.exe في نظام Windows أو /somePath/file في نظام " -"Unix\n" -"يمكنك أيضا تعيين التعامل مع البرنامج إختياريا" - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5695,29 +5865,29 @@ "الرجاء إدخل وقت إنقضاء المهلة بين 10 و 9999 ثانية أو 0 لتعطيل وقت إنقضاء " "المهلة" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:220 msgid "Please enter a unique name for this filter set" msgstr "من فضلك أدخل أسم مميز لمجموعة المرشح هذه" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "الرجاء إدخال إسم المستخدم لهذا الخادم" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "من فضلك أدخل نطاق منفذ صالح" -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "من فضلك أدخل رابط للحصول على عنوانك الخارجي منه" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "أدخل من فضلك حدود سرعة الإرسال تساوي أو أكبر من 0 %s/ث" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:574 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5725,27 +5895,42 @@ "الرجاء إدخال أمر FTP خام\n" "إستخدام أوامر ftp سوف يمسح مخزون المجلد المؤقت" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/QueueView.cpp:1838 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"الرجاء إدخال المسار بالكامل للبرنامج مع أي أمر للتعامل معه. حيث سيتم التعامل " +"معه عند الانتهاء من معالجة قائمة الإنتظار\n" +"مثال c:\\somePath\\file.exe مع نظام MS Windows أو /somePath/file مع نظام " +"Unix\n" +"يجب أن تضع علامة الاقتباس مع الأوامر و مع الأوامر الفرعية بشكل صحيح إذا كانت " +"تحتوي على مسافات" + +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1245 msgid "Please enter the name of the directory which should be created:" msgstr "من فضلك أدخل اسم المجلد المراد إنشاؤه :" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2629 msgid "Please enter the name of the file which should be created:" msgstr "الرجاء ادخال إسم الملف المراد إنشاؤه:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "الرجاء إدخال إسم المستخدم و كلمة المرور لهذا الخادم" -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "الرجاء إدخال عنوان IP الخارجي" -#: ../../locales/../src/interface/netconfwizard.cpp:609 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5762,7 +5947,7 @@ "الرجاء نفذ التعليمات بعناية ، لأن التكوين الخاطئ سييمنع نجاح إتصالات FTP " "بالإنترنت" -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5770,11 +5955,11 @@ "الرجاء التأكد من أن FileZilla مسموح له بتأسيس إتصالات صادرة و من أنك كتبت " "العنوان بشكل صحيح" -#: ../../locales/../src/interface/FileZilla.cpp:136 +#: ../../locales/../src/interface/FileZilla.cpp:141 msgid "Please make sure the requested locale is installed on your system." msgstr "الرجاء تأكد من ملف اللغة المطلوب مثبت على نظامك" -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5796,7 +5981,7 @@ "لذا فان الخادم قد يختار منفذ بحيث يظن الجدار الحماية أنه منفذ مستخدم فقط من " "قبل تروجان أو برنامج ضار آخر . قد يسبب ذلك إنذار خاطىء لكن تجاهله" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:700 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5812,7 +5997,11 @@ "الرجاء ملاحظة أن بعض الخوادم قد تعمل لك حظر إذا حاولت إعادة الاتصال في فترات " "زمنية متقاربة أو بمعدل كبير" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:115 +msgid "Please re-add local data directories in the settings dialog." +msgstr "الرجاء إعادة إضافة مجلدات البيانات المحلية في خانات الإعدادات" + +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5821,11 +6010,11 @@ "من فضلك قم بتشغيل المعالج مرة ثانية فى حالة تغيير فى بيئة الشبكة أو فى حالة " "حدوث مشاكل مع الخوادم التي كانت تعمل سابقا" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 msgid "Please select an action:" msgstr "الرجاء تحديد إجراء :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1667 msgid "Please select the categories you would like to import." msgstr "الرجاء تحديد الفئات المراد إستيرادها" @@ -5856,7 +6045,7 @@ msgid "Please select the new attributes for the selected files." msgstr "الرجاء تحديد الخواص الجديدة للملفات المحددة" -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5874,8 +6063,8 @@ msgid "Positio&n of the message log:" msgstr "المكان لسجل ال&رسائل:" -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Postal code:" msgstr "الرمز البريدي :" @@ -5887,20 +6076,20 @@ msgid "Preallocation" msgstr "تخصيص مسبق" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1993 msgid "Predefined Sites" msgstr "المواقع المحددة مسبقاً" -#: ../../locales/../src/interface/Mainfrm.cpp:685 +#: ../../locales/../src/interface/Mainfrm.cpp:699 msgid "Preserving file timestamps" msgstr "إبقاء طوابع وقت الملف" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "معاينة:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1482 +msgid "Preview" +msgstr "معاينة" -#: ../../locales/../src/engine/tlssocket.cpp:1134 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1369 msgid "Primary connection and data connection certificates don't match." msgstr "شهادة الإتصال الرئيسية و شهادة إتصال البيانات غير متطابقتين" @@ -5912,15 +6101,15 @@ msgid "Print version information to stdout and exit" msgstr "طباعة معلومات النسخة إلى الناتج المعياري ثم خروج" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1744 msgid "Prioritize directories (default)" msgstr "وضع الأولوية للمجلدات (الإفتراضي)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Priority" msgstr "الأولوية" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2100 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5942,25 +6131,25 @@ msgstr "كلمة المرور لل&ملقم:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "معالجة قائمة الإنتظار" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1021 msgid "Process file table overflow" msgstr "طغيان عملية ملف الجدول" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "المعالجة %s في %s" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1026 msgid "Protocol not supported" msgstr "بروتوكول غير معتمد" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Protocol not supported on given socket type" msgstr "بروتوكول غير معتمد على نوع مأخذ التوصيل" @@ -5977,36 +6166,40 @@ msgid "Proxy &user:" msgstr "&مستخدم الملقم:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "فشلت مصادقة الملقم" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "فشلت مصافحة الملقم : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftp/logon.cpp:64 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "ملقم الإستضافة بدأ بـ '[' لكن لا يوجد قوس الإغلاق" -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "رد الملقم : %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:520 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "فشل طلب الملقم الوكيل.الرد من الملقم الوكيل: %s" + +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "فشل طلب الملقم : %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "فشل طلب الملقم الوكيل : نوع العنوان غير معروف في الرد CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4241 +#: ../../locales/../src/engine/ftp/logon.cpp:91 msgid "Proxy set but proxy host or port invalid" msgstr "تم وضع الملقم الوكيل لكن مضيف الوكيل أو المنفذ غير صالح" @@ -6018,55 +6211,56 @@ msgid "Public key algorithm:" msgstr "خوارزمية المفتاح العام:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:464 msgid "Public permissions" msgstr "أذونات عمومية" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:2717 msgid "Queue has been fully processed" msgstr "تم معالجة قائمة الإنتظار بالكامل" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:436 #, c-format msgid "Queue: %s MiB" msgstr "قائمة الإنتظار : %s مب" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:372 #, c-format msgid "Queue: %s%s" msgstr "قائمة الإنتظار : %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:368 +#: ../../locales/../src/interface/statusbar.cpp:427 msgid "Queue: empty" msgstr "قائمة الانتظار : فارغة" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "ملفات في الإنتظار" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Queueing:" msgstr "وضع بالإنتظار:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "إ&عادة تشغيل النظام" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" +msgstr "إ&عادة تشغيل الكمبيوتر" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "ت&فرع المجلد البعيد" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "R&eset and requeue selected files" msgstr "&إستعادة و إعادة وضع الملفات المحددة في قائمة الإنتظار" -#: ../../locales/../src/interface/Mainfrm.cpp:585 +#: ../../locales/../src/interface/Mainfrm.cpp:588 msgid "Raw FTP command" msgstr "أمر FTP خام" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:437 msgid "Re&ad" msgstr "قر&اءة" @@ -6075,11 +6269,11 @@ msgid "Re&fresh" msgstr "ت&حديث" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "ت&سمية" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6087,20 +6281,20 @@ "قم بإعادة تشغيل المعالج و تأكد من إعدادات بدقة ثم قم بتكوين أجهزة التوجيه و " "برامج جدران الحماية حسب ذلك" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:471 msgid "Rea&d" msgstr "قر&اءة" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "للقراءة فقط" -#: ../../locales/../src/interface/Mainfrm.cpp:1022 +#: ../../locales/../src/interface/Mainfrm.cpp:1064 msgid "Really cancel current operation?" msgstr "إلغاء العملية الحالية فعلا ؟" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:761 +#: ../../locales/../src/interface/RemoteListView.cpp:1415 +#: ../../locales/../src/interface/search.cpp:1195 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6112,8 +6306,8 @@ msgstr[4] "هل تريد فعلا حذف %d مجلد من الخادم مع محتوياتها ؟" msgstr[5] "هل تريد فعلا حذف %d مجلد من الخادم مع محتوياتها ؟" -#: ../../locales/../src/interface/RemoteListView.cpp:1384 -#: ../../locales/../src/interface/search.cpp:759 +#: ../../locales/../src/interface/RemoteListView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1193 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" @@ -6124,67 +6318,73 @@ msgstr[4] "هل تريد فعلا حذف %d ملف من الخادم؟" msgstr[5] "هل تريد فعلا حذف %d ملف من الخادم؟" -#: ../../locales/../src/interface/RemoteListView.cpp:1391 -#: ../../locales/../src/interface/search.cpp:765 +#: ../../locales/../src/interface/RemoteListView.cpp:1420 +#: ../../locales/../src/interface/search.cpp:1199 #, c-format msgid "Really delete %s and %s from the server?" msgstr "هل تريد حذف فعلا %s و %s من الخادم؟" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1063 msgid "Really delete all selected files and/or directories from the server?" msgstr "هل تريد فهلا حذف كافة الملفات و/أو المجلدات المحددة من الخادم؟" -#: ../../locales/../src/engine/local_filesys.cpp:129 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "هل تريد فهلا حذف كافة الملفات و/أو المجلدات المحددة من الكمبيوتر؟" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Reason" msgstr "السبب" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2710 msgid "Reboot now" msgstr "إعادة تشغيل الكمبيوتر الآن" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:525 msgid "Rec&urse into subdirectories" msgstr "التكرار &ضمن المجلدات الفرعية" -#: ../../locales/../src/engine/tlssocket.cpp:223 +#: ../../locales/../src/engine/tlssocket_impl.cpp:330 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "تلقي تنبيه TLS من الملقم: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3079 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" "تلقي مجلد قائمة مجلدات أرشفة المواقع الأجنبية و التي تكون مشفرة بطريقة EBCDIC" -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2062 +#: ../../locales/../src/engine/directorylistingparser.cpp:2079 msgid "Received a line exceeding 10000 characters, aborting." msgstr "تلقى خط تتجاوز 10000 حرف ، مقاطعة" -#: ../../locales/../src/interface/netconfwizard.cpp:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1016 -#: ../../locales/../src/interface/netconfwizard.cpp:1039 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1352 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "لا يمكن التحقق من سلسلة الشهادة الواردة. حالة التحقق هي %d" + +#: ../../locales/../src/interface/netconfwizard.cpp:1006 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "تلف البيانات المستقبلة" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:552 msgid "Received invalid character in version information" msgstr "استقبال حرف غير صالح في معلومات الإصدار" -#: ../../locales/../src/engine/tlssocket.cpp:226 +#: ../../locales/../src/engine/tlssocket_impl.cpp:333 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "تلقي تنبيه TLS غير معروف %d من الملقم" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:545 msgid "Received version information is too large" msgstr "معلومات الإصدار المستلمة ضخمة جدا" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6196,73 +6396,71 @@ msgid "Reconnection settings" msgstr "إعدادات إعادة الاتصال" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "لاعادة الاتصال بأخر خادم مستخدم" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "إضافة ملفات إلى قائمة الإنتظار بشكل متكرر" -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "تغيير الأذونات بشكل متكرر" -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "حذف الملفات و المجلدات بشكل متكرر" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/interface/sitemanager.cpp:17 +msgid "Red" +msgstr "أحمر" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "إعادة توجيه إلى رابط غير صالح أو غير معتمد: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:656 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "إعادة توجيه إلى عنوان غير صالح أو غير معتمد: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "تحديث قوائم الملفات و المجلدات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3875 msgid "Remember passwords?" msgstr "تذكر كلمات المرور ؟" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1107 msgid "Remote" msgstr "بعيد" -#: ../../locales/../src/engine/tlssocket.cpp:852 +#: ../../locales/../src/engine/tlssocket_impl.cpp:987 msgid "Remote certificate not trusted." msgstr "الشهادة البعيدة غير موثوق بها" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2326 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Remote file" msgstr "الملف البعيد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:383 -#: ../../locales/../src/interface/search.cpp:388 -#: ../../locales/../src/interface/search.cpp:397 -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/search.cpp:672 +#: ../../locales/../src/interface/search.cpp:677 msgid "Remote file search" msgstr "البحث عن بعد عن ملف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1125 msgid "Remote filters:" msgstr "المرشحات البعيدة:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1098 msgid "Remote path" msgstr "المسار البعيد" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6271,7 +6469,7 @@ "تعذر تحليل المسار البعيد . تأكد من أنه مسار صالح و معتمد من قبل نوع الخادم " "للموقع الحالي (%s) ـ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1144 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6280,48 +6478,48 @@ "تعذر تحليل المسار البعيد . تأكد من أنه مسار صالح و معتمد من قبل نوع الخادم " "للموقع الحالي (%s) المحدد في الموقع الأصل" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1146 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "تعذر تحليل المسار البعيد . تأكد من أنه مسار صالح" -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:333 msgid "Remote path could not be parsed." msgstr "لا يمكن تحليل المسار البعيد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3225 msgid "Remote path handling:" msgstr "معالجة المسار البعيد :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Remote path:" msgstr "المسار البعيد:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "الموقع البعيد:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 msgid "Remove &all" msgstr "&إزالة الكل" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &selected" msgstr "إ&زالة المحددة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1448 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Rename file" msgstr "تسمية الملف" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 msgid "Rename selected directory" msgstr "تسمية المجلد المحدد" @@ -6330,69 +6528,69 @@ msgid "Rename selected files and directories" msgstr "تسمية الملفات المحددة و المجلدات" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2438 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:611 #, c-format msgid "Renaming '%s' to '%s'" msgstr "تسمية '%s' إلى '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 msgid "Reporting bugs and feature requests" msgstr "التبليغ عن أخطاء و طلب إضافة وظيفة ما" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Request failed - client is not running identd (or not reachable from server)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "Request failed - client's identd could not confirm the user ID string" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Request rejected or failed" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:533 msgid "Require explicit FTP over TLS" msgstr "يتطلب FTP صريح عبر TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:534 msgid "Require implicit FTP over TLS" msgstr "يتطلب FTP ضمني عبر TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 msgid "Reset and requeue &all" msgstr "إستعادة و إ&عادة وضع الكل في قائمة الإنتظار" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Resolved protocol is unknown" msgstr "البروتوكول المحلل غير معروف" -#: ../../locales/../src/engine/ControlSocket.cpp:1081 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/ControlSocket.cpp:1128 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:148 #, c-format msgid "Resolving address of %s" msgstr "إستخلاص عنوان الـ %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1027 msgid "Resource temporarily unavailable" msgstr "المصدر غير متوفر مؤقتا" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:357 msgid "Response:" msgstr "الإستجابة:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3171 msgid "Results:" msgstr "النتائج :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" @@ -6406,19 +6604,19 @@ "إستئناف ملفات ASCII قد يسبب مشاكل إذا كان الخادم يستخدم تنسيق مختلف لنهاية " "السطر تختلف عن التي مع التابع" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:939 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:439 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "إسترجاع قائمة المجلد \"%s\" ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1269 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:936 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:436 msgid "Retrieving directory listing..." msgstr "إسترجاع قائمة المجلد..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3772 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:666 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "إسترجاع عنوان IP الخارجي من %s" @@ -6431,17 +6629,17 @@ msgid "S&how the Site Manager on startup" msgstr "إ&ظهار مدير الموقع عند تشغيل" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" msgstr "إ&غلاق الكمبيوتر" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3095 msgid "S&top" msgstr "إ&يقاف" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "إستبعاد &النظام" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" +msgstr "&سكون الكمبيوتر" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" @@ -6455,46 +6653,47 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 proxy will connect to: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "لا يدعم SOCKS5 أسم مستخدم أو كلمة مرور أطول من 255 حرفا" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:715 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "حفظ الإعدادات ؟" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:442 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1003 msgid "Saving of password has been disabled by your system administrator." msgstr "تم تعطيل حفظ كلمة مرور بواسطة مسؤول النظام لديك." -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 msgid "Saving of passwords has been disabled by you." msgstr "تم تعطيل الحفظ لكلمات المرور بواسطتك أنت." -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "البحث عن الملفات لاضافتها إلى قائمة الإنتظار" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "البحث عن ملفات لرفعها" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1462 +msgid "Scale factor:" +msgstr "عامل التدرج:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3101 msgid "Search &conditions:" msgstr "&شروط البحث:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3083 msgid "Search &directory:" msgstr "&مجلد البحث :" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "بحث عن الملفات بشكل تكراري" @@ -6502,16 +6701,20 @@ msgid "Search server for files" msgstr "البحث في الخادم عن الملفات" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3052 +msgid "Search type:" +msgstr "نوع البحث:" + +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Security information" msgstr "معلومات الأمان" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "شاهد أيضا : https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2414 msgid "Sele&ct server" msgstr "ت&حديد الخادم" @@ -6530,7 +6733,7 @@ "تحديد الإجراء الإفتراضى المراد تنفيذه إذا كان الملف المستهدف للإرسال موجود " "مسبقا" -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1543 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "تحديد المحرر الإفتراضي" @@ -6551,61 +6754,65 @@ "تحديد الإجراء الإفتراضى المراد تنفيذه إذا كان الملف موجود مسبقا فقط للملفات " "المحددة حاليا فى قائمة الإنتظار" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "تحديد الملف الذي يحتوي على المفتاح خاص" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "تحديد ملف للبيانات المصدرة" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1489 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "تحديد الملف لتصدير المرشحات" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1427 msgid "Select file for exported queue" msgstr "تحديد ملف لقائمة الإنتظار المصدرة" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "تحديد الملف لتصدير الإعدادات" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2208 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2336 msgid "Select file for exported sites" msgstr "تحديد ملف للمواقع المصدرة" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "تحديد الملف لإستيراد الإعدادات منه" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "تحديد ملف للرفع" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "تحديد الإسم لملف المفتاح المحول" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 msgid "Select how these files should be opened." msgstr "تحديد كيفية فتح هذه الملفات" -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:856 msgid "Select target download directory" msgstr "تحديد المجلد الهدف للتحميل" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "تحديد إسم الملف الهدف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1580 msgid "Select the categories to export:" msgstr "تحديد الفئات للتصدير :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1506 msgid "Select the private data you would like to delete." msgstr "تحديد البيانات الخاصة المراد حذفها" -#: ../../locales/../src/interface/search.cpp:475 +#: ../../locales/../src/interface/search.cpp:815 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6616,7 +6823,7 @@ msgstr[4] "المحدد للإرسال %d مجلدات مع محتوياتها" msgstr[5] "المحدد للإرسال %d مجلد مع محتوياتها" -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." @@ -6627,7 +6834,7 @@ msgstr[4] "المحدد %d مجلدات" msgstr[5] "المحدد %d مجلد" -#: ../../locales/../src/interface/search.cpp:473 +#: ../../locales/../src/interface/search.cpp:813 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6638,7 +6845,7 @@ msgstr[4] "المحدد %d ملف للإرسال" msgstr[5] "المحدد %d ملف للإرسال" -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" @@ -6649,7 +6856,7 @@ msgstr[4] "المحددة %d ملف . الحجم الكلي : %s" msgstr[5] "المحددة %d ملف . الحجم الكلي : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" @@ -6660,49 +6867,49 @@ msgstr[4] "المحددة %d ملف . الحجم الكلي : على الأقل %s" msgstr[5] "المحددة %d ملف . الحجم الكلي : على الأقل %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:819 #, c-format msgid "Selected %s and %s for transfer." msgstr "المحدد %s و %s للإرسال" -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "المحددة %s و %s . الحجم الكلي : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "المحددة %s و %s . الحجم الكلي : على الأقل %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1562 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "المحرر المحدد غير موجود" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1867 msgid "Selected file already being edited" msgstr "الملف المحدد يتم تحريره حاليا" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "الملف المحدد يتم التعامل معه حاليا" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "Selected file is already opened" msgstr "الملف المحدد مفتوح مسبقا" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "Selected file is still being edited" msgstr "الملف المحدد لا يزال قيد التحرير" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:188 msgid "Selected filter only works for local files." msgstr "المرشح المحدد يعمل فقط من أجل الملفات المحلية" -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:302 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6710,7 +6917,7 @@ "العناوين المفضلة الشاملة المحددة و الخادم الحالي تستخدم نوع خادم مختلف\n" "أستخدم عناوين مفضلة اموقع معين لهذا الخادم" -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "المنفذ المحدد عادة قيد الإستخدام من قبل بروتوكول مختلف" @@ -6722,34 +6929,34 @@ msgid "Send custom command to the server otherwise not available" msgstr "إرسال أمر مخصص إلى الخادم ، غير ذلك فانه غير متاح" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4317 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:788 msgid "Sending keep-alive command" msgstr "إرسال &أوامر البقاء نشطا" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Serial number:" msgstr "رقم التسلسل:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:317 msgid "Server &Type:" msgstr "نوع ال&خادم:" -#: ../../locales/../src/engine/tlssocket.cpp:741 +#: ../../locales/../src/engine/tlssocket_impl.cpp:871 msgid "Server did not properly shut down TLS connection" msgstr "الخادم ربما لم يغلق إتصال TLS بشكل صحيح" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:890 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943 +#: ../../locales/../src/engine/ftp/logon.cpp:394 +#: ../../locales/../src/engine/ftp/logon.cpp:454 msgid "Server does not support non-ASCII characters." msgstr "الخادم لا يدعم حروفا غير حروف ASCII" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4153 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:269 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "الخادم لا يدعم الإستئناف للملفات > %d غب" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4149 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:266 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6757,15 +6964,19 @@ msgstr "" "الخادم لا يدعم إستئناف الملفات > %d غب . نهاية الإرسال بما أن الحجم كبير" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2426 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:528 msgid "Server does not support resume of files > 2GB." msgstr "الخادم لا يدعم الإستئناف للملفات > 2 غب" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2422 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:524 msgid "Server does not support resume of files > 4GB." msgstr "الخادم لا يدعم الإستئناف للملفات > 4 غب" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2060 +msgid "Server host key" +msgstr "مفتاح الملقم المضيف" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:277 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6773,28 +6984,32 @@ msgstr "" "الخادم قد لا يدعم إستئناف الملفات > %d غب . نهاية الإرسال بما أن الحجم كبير" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/ftp/logon.cpp:336 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "الخادم قد يتطلب حساب . حاول تعيين حساب باستعمال مدير الموقع" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/http/request.cpp:225 +msgid "Server not sending proper line endings" +msgstr "الخادم لا يرسل نهايات صحيحة للسطر" + +#: ../../locales/../src/engine/ControlSocket.cpp:340 msgid "Server returned empty path." msgstr "الخادم أرسل رد بمسار فارغ" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:223 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "" "أرسل الخادم مطالبة بتسجيل دخول إضافي . تحتاج لإستعمال نوع تسجيل دخول تفاعلي" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3719 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "الخادم أرسل رد سلبي مع عنوان غير قابل للتوجيه . فشل النمط السلبي" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6802,36 +7017,45 @@ "الخادم ارسل رد سلبى بعنوان لا يمكن توجيهه يتم استخدام عنوان الخادم عوضا عن " "ذلك" -#: ../../locales/../src/interface/netconfwizard.cpp:419 -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:465 -#: ../../locales/../src/interface/netconfwizard.cpp:474 -#: ../../locales/../src/interface/netconfwizard.cpp:486 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/engine/http/request.cpp:476 +msgid "Server sent too much data." +msgstr "أرسل الملقم بيانات كثيرة جدا" + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "الخادم أرسل رد غير متوقع" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1264 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "أرسل الملقم سلسلة الشهادة لم يتم فرزها في انتهاك لمواصفات TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Server to client MAC:" msgstr "الخادم إلى MAC العميل :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2123 msgid "Server to client cipher:" msgstr "الخادم إلى شفرة العميل :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2477 msgid "Server&type:" msgstr "نوع &الخادم:" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Server/Local file" msgstr "الخادم/الملف المحلى" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1731 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2400 msgid "Server:" msgstr "&الخادم :" @@ -6839,29 +7063,29 @@ msgid "Session details" msgstr "تفاصيل الجلسة" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "&وضع الاولوية" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2317 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:625 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format -msgid "Set permissions of '%s' to '%s'" +msgid "Setting permissions of '%s' to '%s'" msgstr "وضع الأذونات لـ '%s' إلى '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:791 -msgid "SetSocketBufferSize called without socket" -msgstr "تم إستدعاء SetSocketBufferSize بدون مقبس" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "إعدادات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:772 msgid "Settings directory:" msgstr "مجلد الإغدادات:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "إ&ظهر فقاعة التنبيه" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2284 msgid "Show &raw directory listing" msgstr "إظهار &قائمة المجلد الخام" @@ -6869,19 +7093,20 @@ msgid "Show &welcome dialog..." msgstr "إظهار لائحة &مرحبا بك..." -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2254 msgid "Show both directory trees and continue comparing?" msgstr "إظهار تفرع المجلد و متابعة المقارنة ؟" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "إظهار التفاصيل" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1599 msgid "Show details about custom date and time formats" msgstr "إظهار تفاصيل حول عمليات التنسيق المخصصة للوقت و للتاريخ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "Shows available TLS ciphers" msgstr "لعرض تشفير TLS المتوفر" @@ -6889,7 +7114,7 @@ msgid "Shows this help dialog" msgstr "لإظهار لائحة التعليمات هذه" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2706 msgid "Shutdown now" msgstr "إغلاق الكمبيوتر الآن" @@ -6897,7 +7122,7 @@ msgid "Signature algorithm:" msgstr "خوارزمية التواقيع:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Site &Manager entries" msgstr "مدخلات مدير المواقع" @@ -6905,56 +7130,55 @@ msgid "Site Manager" msgstr "مدير المواقع" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1011 msgid "Site Manager - Cannot remember password" msgstr "مدير الموقع - لا يمكن تذكر كلمة المرور" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:979 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:992 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1024 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1041 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1069 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1079 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1112 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1121 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1147 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1156 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1163 msgid "Site Manager - Invalid data" msgstr "مدير المواقع - بيانات غير صالحة" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:295 msgid "Site Manager already open" msgstr "مدير المواقع مفتوح مسبقا" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:486 +#: ../../locales/../src/interface/sitemanager.cpp:514 +#: ../../locales/../src/interface/sitemanager.cpp:528 +#: ../../locales/../src/interface/sitemanager.cpp:540 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Site does not exist." msgstr "الموقع غير موجود" -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:497 msgid "Site path has to begin with 0 or 1." msgstr "مسار الموقع يجب أن يبدأ بـ 0 أو 1" -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:534 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:786 msgid "Site path is malformed." msgstr "تم تشويه مسار الموقع" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "عناوين موقع معين مفضلة" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6963,11 +7187,11 @@ "تتطلب عناوين المفضلة للموقع المعين خادم من أجل حفظها في مدير الموقع\n" "إضافة الإتصال الحالي إلى مدير الموقع ؟" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Size" msgstr "الحجم" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1613 msgid "Size formatting" msgstr "تنسيق الحجم" @@ -6975,50 +7199,55 @@ msgid "Size unknown" msgstr "الحجم غير معروف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1449 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "تجاوز الملف" -#: ../../locales/../src/engine/ControlSocket.cpp:1152 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1193 -#: ../../locales/../src/engine/ControlSocket.cpp:1253 +#: ../../locales/../src/engine/ControlSocket.cpp:1196 +#: ../../locales/../src/engine/ControlSocket.cpp:1213 +#: ../../locales/../src/engine/ControlSocket.cpp:1239 +#: ../../locales/../src/engine/ControlSocket.cpp:1317 #, c-format msgid "Skipping download of %s" msgstr "تجاوز التحميل لـ %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1156 -#: ../../locales/../src/engine/ControlSocket.cpp:1172 -#: ../../locales/../src/engine/ControlSocket.cpp:1197 -#: ../../locales/../src/engine/ControlSocket.cpp:1257 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "تخطي ملف المفتاح الغير موجود \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1216 +#: ../../locales/../src/engine/ControlSocket.cpp:1242 +#: ../../locales/../src/engine/ControlSocket.cpp:1320 #, c-format msgid "Skipping upload of %s" msgstr "تجاوز الرفع لـ %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Socket address outside address space" msgstr "عنوان مأخذ التوصيل خارج مساحة العنوان" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Socket already connected" msgstr "تم توصيل المقبس مسبقا" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Socket has been shut down" msgstr "تم إيقاف تشغيل مأخذ التوصيل" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Socket not connected" msgstr "لم يتم توصيل المقبس" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Socket type not supported for address family" msgstr "نوع مأخذ التوصيل غير معتمد لأسرة العنوان" -#: ../../locales/../src/interface/Mainfrm.cpp:1157 +#: ../../locales/../src/interface/Mainfrm.cpp:1194 msgid "Some files are still being edited or need to be uploaded." msgstr "بعض الملفات ما زالت قيد التحرير أو تحتاج إلى رفع" @@ -7031,31 +7260,31 @@ "بعض الخوادم البعيدة التي لم يتم تكوينها و التي تكون من وراء جهاز توجيه ، قد " "ترد بعنوان IP المحلي الخاص بها" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1746 msgid "Sort directories inline" msgstr "ترتيب المجلدات بشكل مصطف" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." msgstr "طريقة الترتيب لا يمكن تغييرها عند مقارنة المجلدات" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1730 msgid "Sorting" msgstr "الترتيب" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1737 msgid "Sorting &mode:" msgstr "&نمط الترتيب:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:107 msgid "Source and path of the drop operation are identical" msgstr "مصدر ومسار عملية الإفلات متطابقين" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "ملف المصدر و الهدف قد لا يكونا نفس الملف" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "المصدر والهدف لعملية الإفلات غير متطابقين" @@ -7063,9 +7292,9 @@ msgid "Source file:" msgstr "ملف المصدر :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3817 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "حدود السرعة" @@ -7073,27 +7302,27 @@ msgid "Speed limits" msgstr "حدود السرعة" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:586 msgid "Speed limits are disabled, click to change." msgstr "تم تعطيل حدود السرعة , أنقر للتغيير" -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:589 msgid "Speed limits are enabled, click to change." msgstr "تم تمكين حدود السرعة , أنقر للتغيير" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2078 msgid "Stable and beta versions" msgstr "الإصدارات المستقرة و إصدارات بيتا" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2077 msgid "Stable versions only" msgstr "الإصدارات المستقرة فقط" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2079 msgid "Stable, beta and nightly versions" msgstr "الإصدارات المستقرة و الإصدارات الليلية و بيتا" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "Start transfer &immediately" msgstr "بدء الإرسال &فورا" @@ -7101,19 +7330,19 @@ msgid "Start with opened Site Manager" msgstr "البدء مع مدير مواقع مفتوح" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" msgstr "بدأ التدقيق بحثا عن تحديث في %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2146 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1583 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 #, c-format msgid "Starting download of %s" msgstr "بدء التحميل لـ %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2149 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1586 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 #, c-format msgid "Starting upload of %s" msgstr "بدء الرفع لـ %s" @@ -7122,30 +7351,30 @@ msgid "Starts the local site in the given path" msgstr "لتشغيل الموقع المحلي في المسار المعطى" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "State or province:" msgstr "الولاية أو المحافظة :" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Status" msgstr "الحالة" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:298 +#: ../../locales/../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "الحالة:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "ايقاف و ازالة &الكل" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "إيقاف عملية التكرارية" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Street:" msgstr "الشارع:" @@ -7161,11 +7390,11 @@ msgid "Summary of test results:" msgstr "ملخص لنتائج الفحص" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2714 msgid "Suspend now" msgstr "الإستبعاد الآن" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3419 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7173,29 +7402,33 @@ "الروابط الترميزية إلى الملفات لا تتأثر بهذا الإختيار ، لأن الروابط الترميزية " "يتم حذفها دائما" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:238 -#: ../../locales/../src/interface/state.cpp:252 -#: ../../locales/../src/interface/state.cpp:258 -#: ../../locales/../src/interface/state.cpp:268 -#: ../../locales/../src/interface/state.cpp:355 -#: ../../locales/../src/interface/state.cpp:363 -#: ../../locales/../src/interface/state.cpp:371 -#: ../../locales/../src/interface/state.cpp:930 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3878 +#: ../../locales/../src/interface/state.cpp:245 +#: ../../locales/../src/interface/state.cpp:260 +#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:377 +#: ../../locales/../src/interface/state.cpp:385 +#: ../../locales/../src/interface/state.cpp:393 +#: ../../locales/../src/interface/state.cpp:1017 +#: ../../locales/../src/interface/state.cpp:1025 +#: ../../locales/../src/interface/state.cpp:1032 +#: ../../locales/../src/interface/state.cpp:1041 +#: ../../locales/../src/interface/state.cpp:1068 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "تصفح متزامن" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:392 msgid "Synchronized browsing has been disabled." msgstr "تم تعطيل التصفح المتزامن" -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "مزامنة المجلدات" + +#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:165 msgid "Syntax error" msgstr "خطأ فى بناء الجملة" @@ -7204,24 +7437,24 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2280 -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2369 +#: ../../locales/../src/interface/Mainfrm.cpp:2414 msgid "Syntax error in command line" msgstr "خطأ فى بناء الجملة في سطر الأمر" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "النظام" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:784 msgid "System details" msgstr "تفاصيل النظام" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1022 msgid "System limit of open files exceeded" msgstr "الملفات المفتوحة تجاوزت الحد الأقصى للنظام" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "System's network subsystem has failed" msgstr "فشل النظام الفرعي للشبكة في النظام" @@ -7229,19 +7462,19 @@ msgid "T&oolbar" msgstr "شريط &أدوات" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:114 msgid "TLS connection established, sending HTTP request" msgstr "تم تأسيس إتصال TLS/SSL ، إرسال طلب HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "تم تأسيس إتصال TLS/SSL , إنتظار رسالة الترحيب..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "تم تأسيس إتصال TLS/SSL" -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "أنتهت صلاحية TTL" @@ -7249,35 +7482,43 @@ msgid "Target file already exists" msgstr "الملف المستهدف موجود اصلا" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "الملف الهدف :" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2645 msgid "Target filename already exists!" msgstr "الملف المستهدف موجود مسبقا" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1628 msgid "Target filename already exists, really continue?" msgstr "الملف الهدف موجود مسبقا ، هل تريد الإستمرار ؟" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Temporary failure in name resolution" msgstr "فشل مؤقت في تحليل الاسم" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "تم الاختبار بنجاح" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "نتائج الفحص" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4170 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:281 msgid "Testing resume capabilities of server" msgstr "فحص قدرات الإستئناف للخادم" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1928 +msgid "The &following files are currently being edited:" +msgstr "يتم &حاليا تحرير الملفات التالية:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:761 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "لا يمكن استخدام مدير الموقع ما لم يتم إصلاح الملف" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:294 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7286,7 +7527,7 @@ "مدير الموقع مفتوح في حالة أخرى من FileZilla 3\n" "هل تريد الإستمرار ؟ أي تغييرات تقوم بها في مدير الموقع لن يتم حفظها" -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7294,29 +7535,29 @@ "مدير الموقع مفتوح في وجود آخر لـ FileZilla 3\n" "الرجاء إغلاقه و إلا لن يتم حذف البيانات" -#: ../../locales/../src/interface/netconfwizard.cpp:634 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "العنوان الذي أدخلته كان : %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "The ai_family member is not supported" msgstr "الأعضاء ai_family غير معتمد" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "The ai_socktype member is not supported" msgstr "أعضاء ai_socktype غير معتمدين" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:685 msgid "The bookmark could not be added." msgstr "تعذرت الإضافة للعلامة" -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:773 msgid "The bookmarks could not be cleared." msgstr "لا يمكن مسح العناوين المفضلة" -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/interface/statusbar.cpp:471 msgid "The connection is encrypted. Click icon for details." msgstr "الإتصال مشفر . أنقر على أيقونة للتفاصيل" @@ -7334,34 +7575,34 @@ "The custom time format is invalid or contains unsupported format specifiers." msgstr "تنسيق الوقت المخصص غير صالح أو يحتوي على محددات تنسيق غير معتمدة." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "تعذّر تأسيس إتّصال البيانات: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "The default editor for text files could not be found." msgstr "تعذر العثور على المحرر الإفتراضي للملفات النصية" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 #, c-format msgid "The default editor for text files is '%s'." msgstr "المحرر الإفتراضي للملفات النصية هو '%s'" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "إسم المرشح المدخل موجود مسبقا, الرجاء إختيار إسم مختلف" -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "الإمتداد '%s' موجود مسبقا في القائمة" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:290 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:298 #, c-format msgid "" "The file %s already exists.\n" @@ -7370,8 +7611,8 @@ "الملف %s موجود مسبقا\n" "الرجاء إدخال إسم جديد :" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../../locales/../src/interface/edithandler.cpp:1633 +#: ../../locales/../src/interface/LocalListView.cpp:1740 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7382,7 +7623,7 @@ "تعذر العثور على البرنامج المشروك (%s) ـ\n" "الرجاء التأكد من إشراكات نوع الملف" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7391,18 +7632,18 @@ "يحتوي الملف '%s' على مفتاح SSH1. بروتوكول SSH1 تم إهماله، إن FileZilla يدعم " "فقط مفاتيح SSH2" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "تعذر تفعيل الملف '%s' أو لا يحتوي على مفتاح خاص" -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:36 #, c-format msgid "The file '%s' could not be loaded." msgstr "لا يمكن تحميل الملف '%s'" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7411,8 +7652,8 @@ "تعذر فتح الملف '%s' :\n" "لا يوجد برنامج مشروك على نظامك مع نوع الملف هذا" -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1748 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7421,8 +7662,8 @@ "تعذر فتح الملف '%s' :\n" "فشل الأمر المرتبط" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:768 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7434,7 +7675,7 @@ "فقدان البيانات\n" "هل تريد الاستمرار؟" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7447,7 +7688,7 @@ msgid "The file selected as default editor does not exist." msgstr "الملف المحدد كمحرر إفتراضي غير موجود" -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7461,11 +7702,11 @@ "المستخدم و كلمة المرور\n" "الإستمرار مع الإستيراد ؟" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "عامود إسم الملف لا يمكن إخفاؤه و لا تحريكه" -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "لا يمكن إخفاء عامود إسم الملف" @@ -7479,19 +7720,15 @@ msgid "The following characters will be replaced: %s" msgstr "الرموز التالية ستستبدل : %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "يتم حاليا تحرير الملفات التالية :" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3474 msgid "The free open source FTP solution" msgstr "الحل مع FTP المصدر المجاني المفتوح" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "لا يمكن حفظ العناوين المفضلة الشاملة" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2271 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7504,17 +7741,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "يجب أن يكون الحد بين 1 و 2000 مي.ب" -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:1068 #, c-format msgid "The local directory '%s' could not be created." msgstr "تعذر إنشاء المجلد المحلي '%s'" -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:1053 #, c-format msgid "The local directory '%s' does not exist." msgstr "المجلد المحلي '%s' غير موجود" -#: ../../locales/../src/interface/state.cpp:249 +#: ../../locales/../src/interface/state.cpp:257 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7523,31 +7760,31 @@ "المجلد المحلي '%s' ليس تحت جذر التزامن (%s)\n" "تعطيل التصفح المتزامن و متابعة تغيير المجلد المحلي ؟" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." msgstr "" "أقل قيمة متاحة للمنفذ يجب ان تكون أقل من أعلى قيمة متاحة للمنفذ أو مساوية" -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "لا يمكن تحميل الإصدار الجديد، الرجاء إعادة المحاولة في وقت لاحق." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "تم حفظ النسخة الجديدة في مجلد التنزيلات الخاص بك" -#: ../../locales/../src/interface/QueueView.cpp:1832 +#: ../../locales/../src/interface/QueueView.cpp:1537 msgid "The queue will not be saved." msgstr "لن يتم حفظ قائمة الإنتظار" -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:975 #, c-format msgid "The remote directory '%s' does not exist." msgstr "المجلد البعيد '%s' غير موجود" -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:1022 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7556,26 +7793,26 @@ "المجلد البعيد '%s' ليس تحت جذر التزامن (%s)\n" "تعطيل التصفح المتزامن و متابعة تغيير المجلد البعيد ؟" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "تم إستيراد الفئات المحددة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 msgid "" "The selected file contains importable data for the following categories:" msgstr "يحتوي الملف المحدد على بيانات قابلة للإستيراد للفئات التالية :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1874 msgid "The selected file is already being edited:" msgstr "الملف المحدد يتم تحريره حاليا :" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "" "The selected file is still opened in some other program, please close it." msgstr "لا يزال الملف المحدد مفتوح في برنامج آخر ، الرجاء إغلاقه" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7585,15 +7822,15 @@ "قد يكون هذا خطرا و قد يضر بنظامك\n" "هل تريد فعلا الإستمرار؟" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:581 msgid "The server could not be added." msgstr "لا يمكن إضافة الخادم" -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "الخادم قام بإرسال رد غير متوقع أو غير مفهوم" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:530 msgid "The server uses following charset encoding for filenames:" msgstr "الخادم يستخدم مجموعة الترميز التالية لأسماء الملفات :" @@ -7605,7 +7842,7 @@ "شهادة هذا الخادم غير معروفة . الرجاء فحص الشهادة بعناية للتأكد من أن الخادم " "يمكن الوثوق به" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:951 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7615,7 +7852,7 @@ "المسؤول قد قام بتغيير مفتاح الإستضافة أو أنه في الواقع أنت تحاول الإتصال " "بكمبيوتر آخر يتظاهر بأنه هو الخادم" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7623,29 +7860,33 @@ "مفتاح المضيف للخادم غير معروف . لا تضمن أن الخادم هو الكمبيوتر الذي تظنه أنه " "هو" -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1349 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "لا يطابق اسم مضيف الملقم مع اسم المضيف للشهادة" + +#: ../../locales/../src/engine/socket.cpp:1070 msgid "The servname parameter is not supported for ai_socktype" msgstr "المعيار servname غير معتمد من أجل ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." msgstr "تم إستيراد الإعدادات . يجب إعادة تشغيل FileZilla لتفعيل جميع الإعدادات" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1018 msgid "The specified address family is not supported" msgstr "أسرة العنوان المحددة غير معتمدة" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "The specified network name is no longer available" msgstr "لم يعد اسم شبكة الاتصال المحدد متوفرا" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:2709 msgid "The system will soon reboot unless you click Cancel." msgstr "سيتم إعادة تشغيل النظام قريبا مالم تنقر على زر إلغاء الأمر" -#: ../../locales/../src/interface/QueueView.cpp:3045 +#: ../../locales/../src/interface/QueueView.cpp:2705 msgid "The system will soon shut down unless you click Cancel." msgstr "سيتم إغلاق النظام قريبا مالم تنقر على زر إلغاء الأمر" @@ -7657,11 +7898,11 @@ "الملف الهدف موجود مسبقا\n" "الرجاء إختيار أي إجراء" -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "الفحص لم ينجح ، هل تريد فعلا حفظ الإعدادات ؟" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:81 #, c-format msgid "The valid backup file %s could not be restored" msgstr "لا يمكن إسترداد ملف الإحتياطي الصالح %s" @@ -7670,15 +7911,15 @@ msgid "Themes" msgstr "السمات" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:340 msgid "This filter set cannot be removed." msgstr "لا يمكن إزالة مجموعة المرشح هذه" -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:276 msgid "This filter set cannot be renamed." msgstr "لا يمكن تسمية مجموعة المرشح هذه" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7701,11 +7942,11 @@ "هذا المعالج سيساعدك على تكوين إى جدران حماية او أجهزة توجيه لديك و من ثم " "لفحص تكوينك لها" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Time" msgstr "الوقت" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 msgid "Time formatting" msgstr "تنسيق الوقت" @@ -7714,25 +7955,19 @@ msgstr "إ&نقضاء الوقت بالثواني:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "إنقضاء الوقت" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1621 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1047 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "فارق التوقيت للخادم هو %d ثانية" - -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Title:" msgstr "العنوان:" -#: ../../locales/../src/interface/Mainfrm.cpp:2166 +#: ../../locales/../src/interface/Mainfrm.cpp:2252 msgid "To compare directories, both file lists have to be aligned." msgstr "لمقارنة المجلدات ، يجب محاذاة كلتا قائمتي الملف" -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/Mainfrm.cpp:2253 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "لعمل هذا، يجب إظهار أو إخفاء كلا التفرعين للمجلد معا" @@ -7743,7 +7978,7 @@ msgstr "" "لدعم مصادقة المفتاح العام ، يحتاج FileZilla لمعرفة المفاتيح الخاصة للإستخدام" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7759,7 +7994,7 @@ "الأخضر : الملف أحدث من الملف الغير مؤشر على الجانب الآخر\n" "الأحمر : أحجام الملف مختلفة" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7769,51 +8004,46 @@ "عند التمكين ، التنقل في المجلد المحلي بشكل هرمي سيغير أيضا المجلد على الخادم " "وفقا لذلك و العكس بالعكس" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "لتشغيل معالجة قائمة انتظار الإرسال" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "لتشغيل العرض لتفرع المجلد المحلي" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "لتبديل العرض لسجل الرسائل" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "لتشغيل العرض لتفرع المجلد البعيد" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "لتشغيل العرض لقائمة إنتظار الإرسال" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/http/request.cpp:234 msgid "Too long header line" msgstr "سطر طويل جدا للمقدمة الرأسية" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "عمليات إعادة توجيه كثيرة جدا" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "الأثر:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1853 msgid "Transfer" msgstr "الإرسال" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2264 msgid "Transfer &direction" msgstr "إ&تجاه الإرسال" @@ -7829,22 +8059,22 @@ msgid "Transfer Queue" msgstr "قائمة إنتظار الإرسال" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:450 msgid "Transfer Settings" msgstr "إعدادات الإرسال" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "تم إنهاء إتصال الإرسال : %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "تلف البيانات المنقولة" -#: ../../locales/../src/interface/queue.cpp:333 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "إرسال" @@ -7852,8 +8082,7 @@ msgid "Transfers" msgstr "عمليات الإرسال" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2589 msgid "Transfers finished" msgstr "إنتهاء عمليات الإرسال" @@ -7865,15 +8094,15 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "معاملة أنواع الملفات &التالية بهيئة ملفات ASCII :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:384 msgid "Trust changed Hostkey:" msgstr "الثقة في Hostkey المتغيرة :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:844 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:381 msgid "Trust new Hostkey:" msgstr "الثقة في Hostkey الجديدة :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1010 msgid "Trust the new key and carry on connecting?" msgstr "الوثوق بالمفتاح الجديد و متابعة الإتصال ؟" @@ -7881,17 +8110,17 @@ msgid "Trust this certificate and carry on connecting?" msgstr "الوثوق بهذه الشهادة و متابعة الإتصال؟" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:889 msgid "Trust this host and carry on connecting?" msgstr "الوثوق بهذا المضيف و متابعة الاتصال؟" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "حاول ثانية" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 +#: ../../locales/../src/interface/edithandler.cpp:1097 msgid "Type" msgstr "النوع" @@ -7903,48 +8132,53 @@ msgid "Type of generic proxy:" msgstr "توع ملقم االعمومي :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1955 msgid "U&pload" msgstr "&رفع" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3758 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "حدود الر&فع:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1963 msgid "U&se filetype associations if available" msgstr "إ&ستخدام إشراكات أنواع الملفات إذا توفرت" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "U&se system defaults for current language" -msgstr "إ&ستخدم محرر النظام الإفتراضي للملفات النصية" +msgstr "إستخدام إ&فتراضيات النظام للغة الحالية" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "رمز خطأ غير محدد %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Unit:" msgstr "وحدة:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:874 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:995 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/interface/edithandler.cpp:1129 +#: ../../locales/../src/interface/edithandler.cpp:1157 msgid "Unknown" msgstr "غير معروف" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 +#: ../../locales/../src/engine/ftp/logon.cpp:751 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "نوع ملقم وكيل FTP غير معروف ، لا يمكن توليد سلسلة تسجيل الدخول" -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "نسخة بروتوكول SOCKS غير معروفة : %d" @@ -7953,11 +8187,22 @@ msgid "Unknown certificate" msgstr "شهادة غير معروفة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "خطأ غير معروف %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "خطأ غير معروف %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:816 msgid "Unknown host key" msgstr "مفتاح مضيف غير معروف" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7966,13 +8211,17 @@ "نسخة بروتوكول غير معروفة للمفاوضات الفرعية في SOCKS من أجل مصادقة إسم " "المستخدم/كلمة المرور : %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:282 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "عنصر جذر غير معروف ، الملف لا يبدو أنه من إنتاج FileZilla" -#: ../../locales/../src/interface/netconfwizard.cpp:612 -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/engine/http/request.cpp:343 +msgid "Unknown transfer encoding" +msgstr "ترميز نقل غير معروف" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7980,7 +8229,7 @@ "مالم يتم إصلاح هذه المشاكل , لن يعمل نمط FTP النشط و بالتالي سوف يستخدم " "النمط السلبي" -#: ../../locales/../src/interface/netconfwizard.cpp:599 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7988,15 +8237,15 @@ "مالم يتم إصلاح هذه المشكلة , لن يعمل نمط FTP النشط و بالتالي سوف يستخدم " "النمط السلبي" -#: ../../locales/../src/engine/tlssocket.cpp:1096 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1288 msgid "Unsupported certificate type" msgstr "نوع شهادة غير مدعومة" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "إعادة توجيه غير مدعومة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1961 msgid "Up&load and unedit" msgstr "&رفع و عدم تحرير" @@ -8005,24 +8254,29 @@ msgid "Updates" msgstr "التحديثات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2278 msgid "Upload" msgstr "رفع" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1120 msgid "Upload failed" msgstr "فشل الرفع" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Upload limit: %s/s" msgstr "حدود الإرسال: %s/ث" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Upload limit: none" msgstr "حدود الرفع : بدون" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3290 +#: ../../locales/../src/interface/search.cpp:882 +msgid "Upload search results" +msgstr "رفع نتائج البحث" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Upload selected directory" msgstr "رفع المجلدات المحددة" @@ -8030,73 +8284,72 @@ msgid "Upload selected files and directories" msgstr "رفع الملفات و المجلدات المحددة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1766 msgid "Upload this file back to the server?" msgstr "إرجاع هذا الملف إلى الخادم ؟" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 msgid "Upload this file to the server?" msgstr "رفع هذا الملف إلى الخادم ؟" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1148 +#: ../../locales/../src/interface/edithandler.cpp:1304 msgid "Uploading" msgstr "رفع" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1306 msgid "Uploading and pending removal" msgstr "الرفع و تأجيل الإزالة" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1151 +#: ../../locales/../src/interface/edithandler.cpp:1308 msgid "Uploading and unediting" msgstr "الرفع و عدم التحرير" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Use &custom charset" msgstr "مجموعة &رموز مخصصة" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1927 msgid "Use &custom editor:" msgstr "إ&ستخدام محرر مخصص:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2970 msgid "Use &default editor for text files" msgstr "إستخدام المحرر الإ&فتراضي للملفات النصية" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2829 msgid "Use &synchronized browsing" msgstr "إستخدام ال&تصفح المتزامن" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:541 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "إستخدام UTF-8 إذا كان الخادم يدعم ذلك و إلا إستخدام مجموعة الرموز المحلية" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 msgid "Use default action" msgstr "إستخدم الإجراء الأفتراضى" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:532 msgid "Use explicit FTP over TLS if available" msgstr "استخدام FTP صريح عبر TLS حسب التوفر" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 msgid "Use server currently connected to" msgstr "إستخدام الخادم المتصل حاليا إلى" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2389 msgid "Use server from site manager" msgstr "إستخدام الخادم من مدير الموقع" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "Use system &defaults for current language" -msgstr "إ&ستخدم محرر النظام الإفتراضي للملفات النصية" +msgstr "إستخدام إفتراضيات &النظام للغة الحالية" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8126,16 +8379,16 @@ "مرة في كل جلسة حالما تستعمل النمط النشط للمرة الأولى . فقط نسخة FileZilla " "التي تستخدمها يتم تسليمها إلى الخادم" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 msgid "User:" msgstr "المستخدم:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:501 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1069 msgid "Username cannot be a series of spaces" msgstr "إسم المستخدم لا يمكن أن يكون سلسلة من المسافات" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:581 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8154,7 +8407,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "رسائل سجل مطولة من wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1146 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1381 msgid "Verifying certificate..." msgstr "جاري فحص الشهادة..." @@ -8162,39 +8415,35 @@ msgid "Very high" msgstr "مرتفعة جدا" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "عرض مجموعة الخيارات المخفية ، لكنها غير معتمدة من قبل الخادم" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1835 msgid "View/Edit" msgstr "عرض/تحرير" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2180 msgid "Visible columns" msgstr "الأعمدة المرئية" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "W&rite" msgstr "ك&تابة" -#: ../../locales/../src/interface/QueueView.cpp:1670 -msgid "Waiting" -msgstr "إنتظار" - -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "إنتظار الإتصال من أجل التصفح" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "إنتظار كلمة المرور" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "إنتظار إلغاء الإرسال" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:243 msgid "Waiting to retry..." msgstr "جاري الإنتظار لإعادة المحاولة..." @@ -8216,23 +8465,23 @@ "\n" "هل تريد فعلا التدقيق بحثا عن إصدارات المحايدة ؟" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:944 msgid "Warning: Potential security breach!" msgstr "تحذير : إختراق أمني محتمل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3645 msgid "Welcome to FileZilla" msgstr "مرحبا بك FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3506 msgid "What's new" msgstr "ما هو الجديد" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "ما هو الجديد :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3832 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8257,57 +8506,61 @@ msgid "Widescreen" msgstr "شاشة عريضة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3827 msgid "Would you like FileZilla to remember passwords?" msgstr "هل تريد أن يتذكر FileZilla كلمة المرور هذه ؟" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Wr&ite" msgstr "كت&ابة" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "عنوان IP خارجي خطأ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/http/request.cpp:398 msgid "Wrong line endings" msgstr "نهايات سطور خطأ" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:858 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "أصفر" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Yes" msgstr "نعم" -#: ../../locales/../src/interface/netconfwizard.cpp:777 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "يبدو أنك تستخدم مضيف IPv6 فقط. هذا المعالج لا يدعم هذه البيئة" -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "أنت تستخدم آخر إصدار من FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3615 msgid "You can always open this dialog again through the help menu." msgstr "يمكنك فتح هذه اللائحة مرة ثانية خلال قائمة تعليمات" -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "يمكنك تنزيل أحدث إصدار من موقع FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:67 msgid "You can leave the port field empty to use the default port." msgstr "يمكنك ترك حقل المنفذ فارغا لاستخدام المنفذ الافتراضي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:518 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "يمكنك أن تستعمل × بأي مكان لإبقاء أذونات الملفات الأصلية" -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "لا يمكنك إستيراد الإعدادات من مجلد إعدادات FileZilla الخاصة" @@ -8319,68 +8572,72 @@ "لا يمكنك إستبدال رمز غير صالح برمز غير صالح آخر . الرجاء إدخال رمز يكون " "مسموح به مع أسماء الملفات" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "أنت لم تدخل اسم جديد للملف ، هل تكتب على الملف بدلا من ذلك ؟" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "You have selected at least one symbolic link." msgstr "أنت قمت بتحديد رابط ترميزي واحد على الأقل" -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:725 +#: ../../locales/../src/interface/edithandler.cpp:1599 +#: ../../locales/../src/interface/search.cpp:1159 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "أنت قمت بتحديد أكثر من 10 ملفات للتحرير ، هل تريد فعلا الإستمرار ؟" -#: ../../locales/../src/interface/LocalListView.cpp:1665 +#: ../../locales/../src/interface/LocalListView.cpp:1705 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "" "أنت قمت بتحديد أكثر من 10 ملفات أو مجلدات للفتح ، هل تريد فعلا الإستمرار ؟" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:420 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:979 msgid "You have to enter a hostname." msgstr "يجب أن تدخل أسم مضيف" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088 msgid "You have to enter a key file path" msgstr "يجب إدخال مسار ملف مفتاح" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:868 msgid "You have to enter a local directory." msgstr "يجب إدخال مجلد محلي" -#: ../../locales/../src/interface/netconfwizard.cpp:165 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "يجب أن تدخل عنوان IP صالح" +#: ../../locales/../src/interface/search.cpp:882 +msgid "You have to enter a remote directory." +msgstr "يجب إدخال إسم المجلد البعيد" + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "يجب أن تدخل عنوان IPv4 صالح" -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:873 msgid "You have to enter a writable local directory." msgstr "يجب إدخال مجلد محلي قابل للكتابة" -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:512 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1079 msgid "You have to enter an account name" msgstr "يجب أن تدخل اسم حساب" -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:486 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 msgid "You have to specify a user name" msgstr "يجب أن تحدد أسم مستخدم" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "" "يبدو أن لديك جهاز توجيه أو جدار حماية بحيث يعدل البيانات المنقولة بالغلط" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "يجب إدخال إسم للعنوان المفضل" @@ -8388,7 +8645,7 @@ msgid "You need to enter a name for the log file." msgstr "يجب إدخال إسم لملف السجل" -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1484 msgid "You need to enter a properly quoted command." msgstr "يجب إدخال أمر مناسب بين أقواس" @@ -8401,45 +8658,45 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "يجب إدخال منفذ ملقم الوكيل في المدى من 1 إلى 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1156 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "تحتاج إلى إدخال مسار واحد على الأقل ، العلامات الفارغة غير مدعومة" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1163 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" "تحتاج إلى إدخال مسار محلي و مسار بعيد لتمكين التصفح المتزامن لهذه العلامات" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1121 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "" "تحتاج إلى إدخال مسار محلي و مسار بعيد لتمكين التصفح المتزامن لهذا الموقع" -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "You need to specify a local file." msgstr "يجب تعيين ملف محلي" -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:321 msgid "You need to specify a remote file." msgstr "يجب تعيين ملف بعيد" -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:327 msgid "You need to specify a remote path." msgstr "يجب تعيين مسار بعيد" -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:298 msgid "You need to specify a server." msgstr "يجب تعيين خادم" -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8447,66 +8704,66 @@ "من المفترض ان لا يحدث اى مشاكل فى الاتصال بخوادم أخرى ، إرسال الملفات يجب ان " "يعمل بشكل صحيح" -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:2713 msgid "Your computer will suspend unless you click Cancel." msgstr "سيتم إستبعاد النظام الخاص بك مالم تنقر على زر إلغاء الأمر" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "بعد" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "قبل" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "يبدأ بـ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "بايت" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "يحتوى" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "مخصص" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "لا يحتوي على" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "لا يساوي" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "ينتهى بـ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "يساوى" -#: ../../locales/../src/interface/filelistctrl.cpp:529 -#: ../../locales/../src/interface/filelistctrl.cpp:548 -#: ../../locales/../src/interface/filelistctrl.cpp:575 -#: ../../locales/../src/interface/filelistctrl.cpp:591 +#: ../../locales/../src/interface/filelistctrl.cpp:535 +#: ../../locales/../src/interface/filelistctrl.cpp:554 +#: ../../locales/../src/interface/filelistctrl.cpp:581 +#: ../../locales/../src/interface/filelistctrl.cpp:597 msgid "file" msgstr "ملف" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" #: ../../locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8516,94 +8773,172 @@ "الرجاء التأكد من أن هذا الملف التنفيذي موجود في نفس المجلد كملف تنفيذي رئيسي " "لـ FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:467 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp ينتمي إلى إصدار مختلف من FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1510 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:500 msgid "fzsftp could not be started" msgstr "fzsftp غير قادر على تشغيل" -#: ../../locales/../src/engine/tlssocket.cpp:1125 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1227 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers لم يرجع بشهادات" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1239 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 فشل" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "أكبر من" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "تجميع التنفيذية" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "تجميع القابلة للقراءة" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "تجميع القابلة للكتابة" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1601 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "مساوى لـ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "موضوع" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "غير موضوع" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "اقل من" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "يطابق التعبير الإصطلاحي" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +msgid "new name" +msgstr "الاسم الجديد" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "ملف المالك التنفيذي" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "ملف قابل للقراءة للمالك" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "ملف قابل للكتابة للمالك" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1189 -#: ../../locales/../src/engine/tlssocket.cpp:1200 -#: ../../locales/../src/engine/tlssocket.cpp:1215 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1433 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1449 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1465 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1481 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "غير معروف" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "ملف عام تنفيذي" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "ملف قابل للقراءة للعام" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "ملف قابل للكتابة للعام" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:699 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "Available sizes" +#~ msgstr "الأحجام المتوفرة" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "تعذر تحميل شريط الإتصال السريع من ملف الموارد" + +#~ msgid "Filename &filters..." +#~ msgstr "&مرشحات إسم الملف..." + +#~ msgid "Host key fingerprint:" +#~ msgstr "مفتاح بصمة الإصبع للمضيف :" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "تم إستدعاء SetSocketBufferSize بدون مقبس" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "فارق التوقيت للخادم هو %d ثانية" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "لا يمكن إستيراد شهادات النظير , فشل gnutls_x509_crt_import" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "لا يمكن تهيئة التركيبة لشهادات النظير , فشل gnutls_x509_crt_init" + +#~ msgid "%d files added to queue" +#~ msgstr "تمت إضافة %d ملف إلى قائمة الإنتظار" + +#~ msgid "&Disconnect from server" +#~ msgstr "قطع الإ&تصال من الخادم" + +#~ msgid "&Show message" +#~ msgstr "إظهار ال&رسالة" + +#~ msgid "Do ¬hing" +#~ msgstr "بدون إ&جراء" + +#~ msgid "No more files in the queue!" +#~ msgstr "لا يوجد المزيد من الملفات في قائمة الإنتظار" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "البحث عن الملفات لاضافتها إلى قائمة الإنتظار" + +#~ msgid "Scanning for files to upload" +#~ msgstr "البحث عن ملفات لرفعها" + +#~ msgid "Waiting" +#~ msgstr "إنتظار" + +#~ msgid "Connected" +#~ msgstr "متصل" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "لم يتم بعد دعم الحذف للمجلدات المتعددة الغير مرتبطة" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "لم يتم بعد دعم التحميل للمجلدات المتعددة الغير مرتبطة" + +#~ msgid "Downloading search results" +#~ msgstr "تحميل نتائج البحث" + #~ msgid "U&se system defaults" #~ msgstr "إستخدام إ&فتراضي النظام" @@ -8786,6 +9121,3 @@ #~ msgid "Failed to parse trusted root cert." #~ msgstr "فشل في تحليل شهادة الجذر الموثوقة" - -#~ msgid "Root certificate is not trusted" -#~ msgstr "شهادة الجذر غير موثوق بها" diff -Nru filezilla-3.15.0.2/locales/az.po filezilla-3.33.0/locales/az.po --- filezilla-3.15.0.2/locales/az.po 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/locales/az.po 2017-08-14 15:57:33.000000000 +0000 @@ -0,0 +1,9232 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Orkhan Guliyev , 2017 +msgid "" +msgstr "" +"Project-Id-Version: FileZilla\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-08-14 17:42+0200\n" +"PO-Revision-Date: 2017-08-10 13:59+0300\n" +"Last-Translator: Orkhan Guliyev \n" +"Language-Team: Azerbaijani (Azerbaijan) (http://www.transifex.com/zeron/" +"filezilla/language/az_AZ/)\n" +"Language: az_AZ\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.0.3\n" + +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 +msgid "%H:%M:%S elapsed" +msgstr "Keçib: %H:%M:%S" + +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 +msgid "%H:%M:%S left" +msgstr "Qalan: %H:%M:%S" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 +#, c-format +msgid "" +"%a - Account (Lines containing this will be omitted if not using Account " +"logontype)" +msgstr "" +"%a - Hesab (əgər hesab məlumatları vasitəsilə giriş istifadə edilmirsə bu " +"sətrlər buraxılacaq)" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 +#, c-format +msgid "%d directory" +msgid_plural "%d directories" +msgstr[0] "%ddirektoriyalar" +msgstr[1] "%ddirektoriyalar" + +#: ../../locales/../src/interface/RemoteListView.cpp:1422 +#: ../../locales/../src/interface/search.cpp:834 +#: ../../locales/../src/interface/search.cpp:1219 +#, c-format +msgid "%d directory with its contents" +msgid_plural "%d directories with their contents" +msgstr[0] "İçində %d direktoriya" +msgstr[1] "İçərisində %d direktoriya" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1421 +#: ../../locales/../src/interface/search.cpp:833 +#: ../../locales/../src/interface/search.cpp:1218 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d fayl" +msgstr[1] "%d fayl" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 +#, c-format +msgid "%d file. Total size: %s" +msgid_plural "%d files. Total size: %s" +msgstr[0] "%d fayl. Toplam ölçü: %s" +msgstr[1] "%d fayl. Toplam ölçü: %s" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#, c-format +msgid "%d file. Total size: At least %s" +msgid_plural "%d files. Total size: At least %s" +msgstr[0] "%d fayl. Toplam ölçü: ən az %s" +msgstr[1] "%d fayl. Toplam ölçü: ən az %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:77 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d saniyə" +msgstr[1] "%d saniyə" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 +msgid "%h - Host" +msgstr "%h- Server" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu qovluq" +msgstr[1] "%llu qovluq" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu fayl" +msgstr[1] "%llu fayl" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 +#, c-format +msgid "%p - Password" +msgstr "%p - Şifrə" + +#: ../../locales/../src/interface/statuslinectrl.cpp:170 +#, c-format +msgid "%s (%s/s)" +msgstr "%s (%s/s)" + +#: ../../locales/../src/interface/statuslinectrl.cpp:173 +#, c-format +msgid "%s (? B/s)" +msgstr "%s (?B/s)" + +#: ../../locales/../src/interface/verifycertdialog.cpp:39 +#, c-format +msgid "%s - Certificate expired!" +msgstr "%s - Sertifikatın müddəti bitib!" + +#: ../../locales/../src/interface/verifycertdialog.cpp:24 +#, c-format +msgid "%s - Not yet valid!" +msgstr "%s - Hələ də etibarlı deyil!" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 +#, c-format +msgid "%s - Proxy user" +msgstr "%s - Proxy istifadəçisi" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 +#, c-format +msgid "%s and %s. Total size: %s" +msgstr "%s və %s . Toplam ölçü: %s" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#, c-format +msgid "%s and %s. Total size: At least %s" +msgstr "%s və %s . Toplam ölçü: Ən azı %s" + +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 +#, c-format +msgid "%s byte" +msgid_plural "%s bytes" +msgstr[0] "%s baytlar" +msgstr[1] "%s bayt" + +#: ../../locales/../src/interface/FileZilla.cpp:616 +#, c-format +msgid "" +"%s could not be found. Without this component of FileZilla, %s will not " +"work.\n" +"\n" +"Please download FileZilla again. If this problem persists, please submit a " +"bug report." +msgstr "" +"%s tapılmadı. FileZilla-nın bu komponenti olmadan %s işləməyəcəkdir.\n" +"\n" +"Xahiş edirik FileZilla-nı yenidən yükləyin. Bu problem davam edərsə, səhv " +"hesabatı göndərin." + +#: ../../locales/../src/interface/FileZilla.cpp:706 +#, c-format +msgid "" +"%s could not be found. Without this component of FileZilla, %s will not " +"work.\n" +"\n" +"Possible solutions:\n" +"- Make sure %s is in a directory listed in your PATH environment variable.\n" +"- Set the full path to %s in the %s environment variable." +msgstr "" +"%s tapılmadı. FileZilla-nın bu komponenti olmadan %s işləməyəcək.\n" +"\n" +"Olası həllər:\n" +"-%s sizin PATH mühit dəyişəninizdə siyahıda olan bir qovluq olduğundan əmin " +"olun.\n" +"-%s ətraf mühit dəyişkənliyində %s tam yolunu təyin edin." + +#: ../../locales/../src/interface/verifycertdialog.cpp:59 +#, c-format +msgid "%s with %d bits" +msgstr "%s və %d bit" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 +#, c-format +msgid "%u - Username" +msgstr "%u - İstifadəçi adı" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 +msgid "%w - Proxy password" +msgstr "%w - Proxy şifrəsi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 +msgid "&Abort previous connection and connect in current tab" +msgstr "&Əvvəlki bağlatından imtina edib etibarlı tabda bağlan" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 +msgid "&About..." +msgstr "&Haqqında..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 +msgid "&Account:" +msgstr "&Hesab:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 +msgid "&Active" +msgstr "&Aktiv" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +msgid "&Add bookmark..." +msgstr "&Əlfəcin əlavə et..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +#, fuzzy +msgid "&Add directory..." +msgstr "%ddirektoriyalar" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 +msgid "&Add files to queue" +msgstr "&Quyruğa fayl əlavə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 +msgid "&Add key file..." +msgstr "&Açar fayl əlavə et ..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 +msgid "&Add to queue" +msgstr "&Quyruğa fayl əlavə edin" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +msgid "&Adjust server timezone offset:" +msgstr "&Server saat qurşağı fərqi:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 +msgid "&Always trust certificate in future sessions." +msgstr "&Sonrakı iclaslarda bu sertifikata güvənilsin." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 +msgid "&Always trust this host, add this key to the cache" +msgstr "&Həmişə bu serverə güvənilərək açar yaddaşa əlavə olunsun" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 +msgid "&Always use default editor" +msgstr "&Həmişə default redaktor istifadə et" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 +msgid "&Always use selection for unassociated files" +msgstr "&Bu seçim bütün əlaqələndirilməmiş sənədlər üçün istifadə edilsin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 +msgid "&Always use this action" +msgstr "&Həmişə bu əməliyyat aparılsın" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 +msgid "&Ask your operating system for the external IP address" +msgstr "&Xarici IP ünvanı əməliyyat sistemindən soruşulsun" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 +msgid "&Auto" +msgstr "&Avtomatik" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 +msgid "&Autodetect" +msgstr "&Avtomatik qəbul edilsin" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Fon rəngi:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 +msgid "&Binary" +msgstr "&İkili" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 +msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" +msgstr "" +"&SL simvollarını istiifadə edən ikili nümunələr. (nüm: 1 KB = 1024 bit)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 +msgid "&Bookmarks" +msgstr "&Əlfəcinlər" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 +msgid "&Browse..." +msgstr "&Göz atın..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 +msgid "&Burst tolerance:" +msgstr "&Burst tolerantlığı:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 +msgid "&Cancel" +msgstr "&Ləğv edin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 +msgid "&Clear private data..." +msgstr "&Şəxsi məlumatları sil..." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:28 +msgid "&Close" +msgstr "&Bağla" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 +msgid "&Close FileZilla" +msgstr "&FileZilla qapadılsın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 +msgid "&Configure speed limits..." +msgstr "&Sürət limitlərini konfiqurasiya et..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 +msgid "&Configure..." +msgstr "&Tənzimləmələr..." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 +msgid "&Connect" +msgstr "&Bağlan" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +msgid "&Copy current connection to Site Manager..." +msgstr "&Etibarlı əlaqəni Sayt İdarəçisinə kopyala..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +msgid "&Copy to clipboard" +msgstr "&Panoya kopyala" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +msgid "&Create directory" +msgstr "&Qovluq yarat" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:634 +msgid "&Create new tab" +msgstr "&Yeni tap yarat" + +#: ../../locales/../src/interface/menu_bar.cpp:70 +msgid "&Debug" +msgstr "&Debaq" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 +msgid "&Debug information in message log:" +msgstr "&Mesaj güncəsindəki məlumatları diskontlaşdır:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 +msgid "&Default editor:" +msgstr "&Default redaktor:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 +msgid "&Default file exists action..." +msgstr "&Varsayılan fayl fəaliyyət göstərir..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 +msgid "&Delay between failed login attempts:" +msgstr "&Uğursuz bağlatılar arası gözləmə müddəti:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 +msgid "&Delete" +msgstr "&Sil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 +msgid "&Delete symlink" +msgstr "&Simvolik bağlantını sil" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +#, fuzzy +msgid "&Directory access permisssions..." +msgstr "&Faylın xüsusiyyətləri..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 +msgid "&Directory comparison" +msgstr "&Qovluq müqayisə" + +#: ../../locales/../src/interface/state.cpp:1014 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"&Sinxronlaşdırılan axtarışı dayandırıb yerli qovluq dəyişdirməyə davam edin" + +#: ../../locales/../src/interface/state.cpp:1092 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "&Sinxronlaşdırılan axtarışı dayandırıb uzaq qovluğu dəyişdir" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 +msgid "&Discard local file then download and edit file anew" +msgstr "&Yerli faylları ləğv edin və sonra yeniləmə faylını redaktə edin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 +msgid "&Disconnect" +msgstr "&Bağlantını kəs" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 +msgid "&Display momentary transfer speed instead of average speed" +msgstr "&Orta sürətin əvəzinə ani ötürmə sürətini göstərilsin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 +msgid "&Display size in bytes" +msgstr "&Ölçü bayt olaraq göstərilsin" + +#: ../../locales/../src/interface/conditionaldialog.cpp:25 +msgid "&Don't show this dialog again." +msgstr "&Bu pəncərə artıq göstərilməsin." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 +msgid "&Don't use external IP address on local connections." +msgstr "&Yerli bağlantılar üçün xarici IP ünvanları istifadə olunsun." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 +msgid "&Double-click action on files:" +msgstr "&Fayllarda cüt vurun:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:497 +msgid "&Download" +msgstr "&Yüklə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 +msgid "&Download to:" +msgstr "&Yüklə:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:614 +msgid "&Download..." +msgstr "&Yüklə..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 +msgid "&Downloads:" +msgstr "&Yükləmə:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 +msgid "&Edit" +msgstr "&Redaktə et" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 +msgid "&Edit filter rules..." +msgstr "&Filtr qaydalarını redaktə et..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 +msgid "&Enable" +msgstr "&Aktivləşdir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 +msgid "&Enable compression" +msgstr "&Sıxlaşdırmanı aktivləşdir" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 +msgid "&Enable speed limits" +msgstr "&Sürət limitləri aktivləşdirirlsın" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 +msgid "&Encoding:" +msgstr "&Kodlaşdırma:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 +msgid "&Encryption:" +msgstr "&Şifrələmə:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +msgid "&Enter custom command..." +msgstr "&Xüsusi komanda daxil edin ..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 +msgid "&Establish connection in a new tab" +msgstr "&Bağlantı yeni tabda açılsın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 +msgid "&Execute" +msgstr "&İcra etmək" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 +msgid "&Export Site Manager entries" +msgstr "&Sayt məlumatları ixrac edilsin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:595 +msgid "&Export..." +msgstr "&İxrac et..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 +msgid "&Fall back to active mode" +msgstr "&Aktiv rejiminə geri qayıdın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +msgid "&File" +msgstr "&Fayl" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "&File Attributes..." +msgstr "&Faylın xüsusiyyətləri..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 +msgid "&File permissions..." +msgstr "&Faylın xüsusiyyətləri..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 +msgid "&File:" +msgstr "&Fayl:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 +msgid "&Filter conditions:" +msgstr "&Filtr ölçüləri:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 +msgid "&Filter sets:" +msgstr "&Filtr dəstləri:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtrlər" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +msgid "&Filters:" +msgstr "&Filtrlər:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 +msgid "&Finish editing and delete local file" +msgstr "&Tənzimləməni bitirib yerli faylı sil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Yerli vasitlərə fikir vermədən var olan bütün fayllar birbaşa hədəf qovluğa " +"yüklənsin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 +msgid "" +"&Flatten remote paths, download all contained files directly into target " +"directory" +msgstr "" +"&Uzaq yollara fikir vermədən var olan bütün fayllar birbaşa hədəf qovluğa " +"yüklənsin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 +msgid "&Follow symlink, delete target directory contents" +msgstr "&Simvolik bağlantı izlənilsin,hədəf qovluğun məzmunu silinsin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 +msgid "&Get external IP address from the following URL:" +msgstr "&Xarici IP adresi bu İnternetin adresindən alınsın:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 +msgid "&Getting help..." +msgstr "&Yardım balıqları..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +msgid "&Global bookmark" +msgstr "&Qlobal əlfəcin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 +msgid "&HTTP/1.1 using CONNECT method" +msgstr "&CONNECT üsulu ilə HTTP / 1.1" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 +msgid "&Help" +msgstr "&Yardım" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 +msgid "&Hide identical files" +msgstr "&Eyni faylları gizləyin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +msgid "&Highest" +msgstr "&Ən böyük" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 +msgid "&Highest available port:" +msgstr "&İstifa oluna biləcək ən böyük qapı:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 +msgid "&Host:" +msgstr "&Server:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 +msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" +msgstr "&IEC ikili prefiksləri (məsələn, 1 KiB = 1024 bayt)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 +msgid "&ISO 8601 (example: 2007-09-15)" +msgstr "&ISO 8601 (məsələn: 2007-09-15)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +msgid "&Import..." +msgstr "&İdxal ..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 +msgid "&Inherit system's filetype associations" +msgstr "&Sistem fayl tipi əlaqələrini tamamilə alır" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 +msgid "&Install new version" +msgstr "&Yeni versiyanı yüklə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Axtarış kökünə görə yerli yol strukturunu qoruyun" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 +msgid "&Keep remote path structure relative to search root" +msgstr "&Axtarış kökünə görə uzaq yolun strukturunu saxlamaq" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 +msgid "&Key file:" +msgstr "&Əsas fayl:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 +msgid "&Layout of file and directory panes:" +msgstr "&Fayl və qovluq pəncərələrinin yerləşməsi:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 +msgid "&Limit local ports used by FileZilla" +msgstr "" +"&FileZilla tərəfindən istifadə oluna biləcək yerli qapılar məhdudlaşdırılsın" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +msgid "&Limit number of simultaneous connections" +msgstr "&Eşzamanlı bağlantı sayı məhdudlaşdırılsın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +msgid "&Local directory tree" +msgstr "&Yerli qovluq ağacı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 +msgid "&Local directory:" +msgstr "&Yerli qovluq:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Yerli axtarış" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 +msgid "&Log to file" +msgstr "&Fayla daxil olun" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 +msgid "&Logon Type:" +msgstr "&Giriş növü:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 +msgid "&Logontype:" +msgstr "&Giriş növü:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 +msgid "&Low" +msgstr "&Aşağı" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 +msgid "&Manage bookmarks..." +msgstr "&Yer əlfəcinlərinin idarəsi..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 +msgid "&Manual transfer..." +msgstr "&Əl ilə transfer..." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 +msgid "&Maximum number of connections:" +msgstr "&Ən çox bağlantı sayı:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 +msgid "&Maximum number of retries:" +msgstr "&Ən çox sınaq sayı:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +msgid "&Message log" +msgstr "&Mesaj günlüğü" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 +msgid "&Minimize to tray" +msgstr "&Tepsiyə enmək" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +msgid "&Name sorting mode:" +msgstr "&Ad sıralama rejimi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 +msgid "&Name:" +msgstr "&Ad:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 +msgid "&Network configuration wizard..." +msgstr "&Şəbəkə konfiqurasiya köməkçisi..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +msgid "&New" +msgstr "&Yeni" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 +msgid "&New Site" +msgstr "&Yeni sayt" + +#: ../../locales/../src/interface/Mainfrm.cpp:1764 +msgid "&New version available!" +msgstr "&Mövcud yeni versiya!" + +#: ../../locales/../src/interface/netconfwizard.cpp:27 +msgid "&Next >" +msgstr "&Növbəti >" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 +msgid "&No" +msgstr "&Xeyr" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 +msgid "&None" +msgstr "&Yoxdur" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +msgid "&Normal" +msgstr "&Normal" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 +msgid "&Numeric value:" +msgstr "&Sayısal dəyər:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 +msgid "&OK" +msgstr "&Yaxşı" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 +msgid "&OPEN" +msgstr "&Açıq" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +msgid "&Open" +msgstr "&Aç" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 +msgid "&Overwrite" +msgstr "&Yenidən yaz" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 +msgid "&Passive" +msgstr "&Fəaliyyətsiz" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 +msgid "&Password:" +msgstr "&Şifrə:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 +msgid "&Play sound" +msgstr "&Səs açılsın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 +msgid "&Port:" +msgstr "&Qapı:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 +msgid "&Preserve timestamps of transferred files" +msgstr "&Transfer edilmiş faylların zamanları qorunsun" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 +msgid "&Queue" +msgstr "&Növbə" + +#: ../../locales/../src/interface/quickconnectbar.cpp:68 +msgid "&Quickconnect" +msgstr "&Sürətli bağlan" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +msgid "&Quickconnect bar" +msgstr "&Sürətli bağlantı çubuğu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 +msgid "&Quickconnect history" +msgstr "&Sürətli bağlantı keçmişi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 +msgid "&Read" +msgstr "&Oxuma" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +msgid "&Reconnect" +msgstr "&Yenidən bağlan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +msgid "&Reconnect information" +msgstr "&Yenidən bağlanma məlumatları" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:645 +msgid "&Refresh" +msgstr "&Yenilə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&FileZilla bağlanana qədər əsas şifrə xatırlansın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 +msgid "&Remember password until FileZilla is closed" +msgstr "&Şifrə FileZilla bağlanana qədər xatırlansın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 +msgid "&Remote directory:" +msgstr "&Uzaq qovluq:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 +msgid "&Remote path:" +msgstr "&Uzaq yol:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Uzaq axtarış" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 +msgid "&Remove" +msgstr "&Sil" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 +msgid "&Remove key" +msgstr "&Açarı sil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +msgid "&Remove selected" +msgstr "&Seçilmişləri sil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 +msgid "&Rename" +msgstr "&Yenidən adlandır" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 +msgid "&Rename..." +msgstr "&Yenidən adlandır..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 +msgid "&Reopen local file" +msgstr "&Yerli faylı yenidən aç" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 +msgid "&Replace invalid characters with:" +msgstr "&Yalnış simvolları dəyişdirin:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +msgid "&Report a bug..." +msgstr "&Xəta bildirişi..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Diqqət tələb edin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +msgid "&Reset and requeue all" +msgstr "&Sıfırlayın və hamısını doldurun" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 +msgid "&Restart Wizard" +msgstr "&Yardımçını sıfırlayın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 +msgid "&Resume" +msgstr "&Xülasə" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 +msgid "&Run command..." +msgstr "&Komandanı çalıştırın ..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 +msgid "&Run configuration wizard now..." +msgstr "&İndi konfiqurasiya yardımçısını başlat..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 +msgid "&Run update check now..." +msgstr "&Güncəlləmələri yoxla..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 +msgid "&SITE" +msgstr "&SITE" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 +msgid "&SOCKS 5" +msgstr "&SOCKS 5" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 +msgid "&Save as..." +msgstr "&Fərqli saxla..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 +msgid "&Search" +msgstr "&Axtar" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 +msgid "&Search remote files..." +msgstr "&Uzaqdan faylları axtar..." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 +msgid "&Select Entry:" +msgstr "&Seçin Giriş:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 +msgid "&Select language:" +msgstr "&Dil seçimi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 +msgid "&Select the columns that should be displayed:" +msgstr "&Görüntülənməsini istədiyiniz sətirləri seçin:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 +msgid "&Server" +msgstr "&Server" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 +msgid "&Settings" +msgstr "&Ayarlar" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 +msgid "&Settings..." +msgstr "&Ayarlar..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 +msgid "&Show debug menu" +msgstr "Debug menyusunu göstər" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 +msgid "&Show detailed log" +msgstr "&Ətraflı qeydləri göstər" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 +msgid "&Show timestamps in message log" +msgstr "&Günlük qeydlərinə zaman əlavə olunsun" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 +msgid "&Site Manager entries" +msgstr "&Sayt idarəçisi qeydləri" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 +msgid "&Site Manager..." +msgstr "&Sayt idarəçisi..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 +msgid "&Site-specific bookmark" +msgstr "&Saytın xüsusi əlfəcini" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 +msgid "&Skip" +msgstr "&Atlayın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +msgid "&Speed limits" +msgstr "&Sürət məhdudlaşdırılması" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 +msgid "&Start transfer immediately" +msgstr "&Dərhal transferə başlayın" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 +msgid "&Swap local and remote panes" +msgstr "&Yerli və uzaq panellərin yerini dəyişdir" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 +msgid "&TLS Ciphers" +msgstr "&TLS Şifrələri" + +#: ../../locales/../src/interface/netconfwizard.cpp:232 +msgid "&Test" +msgstr "&Test" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 +msgid "&Theme:" +msgstr "&Mövzu:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 +msgid "&Transfer" +msgstr "&Transfer" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 +msgid "&Transfer mode:" +msgstr "&Transfer rejimi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 +msgid "&Transfer queue" +msgstr "&Transfer növbəsi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 +msgid "&Treat dotfiles as ASCII files" +msgstr "&Dotfiles faylını ASCII faylları kimi aparın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 +msgid "&Unedit" +msgstr "&Düzəltmə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 +msgid "&Update cached key for this host" +msgstr "&Bu serverin yaddaşındakı açar yenilənsin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:560 +msgid "&Upload" +msgstr "&Yüklə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Buraya yüklə:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 +msgid "&Upload..." +msgstr "&Yüklə..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 +msgid "&Uploads:" +msgstr "&Yükləmə:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 +msgid "&Use custom program" +msgstr "&Özəl proqram istifadə olunsun" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 +msgid "&Use synchronized browsing" +msgstr "&Sinxronlaşdırılan baxışdan istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +msgid "&Use system's default editor for text files" +msgstr "&Mətn faylları üçün sistemin default redaktorunu istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 +msgid "&Use the following IP address:" +msgstr "&Bu IP ünvanı istifadə edilsin:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 +msgid "&Use the server's external IP address instead" +msgstr "&Bunun yerine serverin xarici IP ünvanını istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 +msgid "&Use thousands separator" +msgstr "&Minlərlə ayırıcıdan istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 +msgid "&User:" +msgstr "&İstifadəçi:" + +#: ../../locales/../src/interface/quickconnectbar.cpp:52 +msgid "&Username:" +msgstr "&İstifadəçi adı:" + +#: ../../locales/../src/interface/Mainfrm.cpp:1758 +#, c-format +msgid "&Version %s" +msgstr "&Versiya %s" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 +msgid "&View" +msgstr "&Görünüş" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&View/Edit" +msgstr "&Görünüş/Redaktə" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +msgid "&Watch locally edited files and prompt to upload modifications" +msgstr "" +"&Yerli redaktə edilmiş faylları izləyin və dəyişiklikləri yüklənməyi ni " +"istəyin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 +msgid "&When checking for updates, check for:" +msgstr "&Güncəlləmələri yoxlayarkən aşağıdakıları yoxlayın:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 +msgid "&Write" +msgstr "&Yaz" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 +msgid "&Yes" +msgstr "&Bəli" + +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 +#, c-format +msgid "'%s' does not exist or cannot be accessed." +msgstr "'%s' Mövcud deyil və ya əldə edilə bilməz." + +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 +#, c-format +msgid "'%s' is not a directory." +msgstr "'%s' bir qovluq deyil." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 +msgid "'Account' logontype not supported by selected protocol" +msgstr "'Hesab' giriş növü seçilmiş protokol tərəfindən dəstəklənmir" + +#: ../../locales/../src/interface/manual_transfer.cpp:435 +msgid "" +"'Normal' and 'Account' logontypes are not available, using 'Ask for " +"password' instead." +msgstr "" +"'Normal' and 'Hesab' hesab açma növləri işləmir, onun əvəzinə 'Şifrəni " +"soruş' növü işləyir." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 +msgid "" +"'Normal' and 'Account' logontypes are not available. Your entry has been " +"changed to 'Ask for password'." +msgstr "" +"'Normal' and 'Hesab' hesab açma növləri işləmir. Qeydiyyatınız 'Şifrəni " +"soruş'  növünə dəyişdirildi." + +#: ../../locales/../src/interface/Mainfrm.cpp:641 +msgid "" +"'quote' is usually a local command used by commandline clients to send the " +"arguments following 'quote' to the server. You might want to enter the raw " +"command without the leading 'quote'." +msgstr "" +"'quote' adətən skript sətri müştəriləri tərəfindən serverə parametrləri " +"göndərmək üçün istifadə olunur. Başlanğıcdakı 'quote'  olmadan yeni skript " +"yaza bilərsiniz." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 +#, c-format +msgid "(%d object filtered)" +msgid_plural "(%d objects filtered)" +msgstr[0] "(%d obyekt filter edilib)" +msgstr[1] "(%d obyekt filter edilib)" + +#: ../../locales/../src/interface/update_dialog.cpp:313 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% endirildi)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 +msgid "(0 for no limit)" +msgstr "(Heç bir limit üçün 0)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 +msgid "(0-99)" +msgstr "(0-99)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 +msgid "(0-999 seconds)" +msgstr "(0-999 saniyə)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 +msgid "(1-10)" +msgstr "(1-10)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, bağlamaq üçün 0)" + +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 +#, c-format +msgid "(app-compat is set to %d.%d)" +msgstr "(app-compat%d .%d olaraq təyin edildi)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 +msgid "(example: %H:%M)" +msgstr "(məsələn:%H:%M)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 +msgid "(example: %Y-%m-%d)" +msgstr "(məsələn: %Y-%m-%d)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 +#, c-format +msgid "(in %s/s)" +msgstr "(in%s/s)" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 +msgid "-" +msgstr "-" + +#: ../../locales/../src/interface/statuslinectrl.cpp:221 +msgid "--:--:-- left" +msgstr "--:--:-- sola çıxdı" + +#: ../../locales/../src/interface/cmdline.cpp:88 +msgid "-c cannot be used together with an FTP URL." +msgstr "-c ilə FTP İnternet ünvanı birlikdə istifadə edilə bilməz." + +#: ../../locales/../src/interface/cmdline.cpp:97 +msgid "-l can only be used together with an FTP URL." +msgstr "-I yalnız bir FTP İnternet ünvanı ilə birlikdə istifadə oluna bilər." + +#: ../../locales/../src/interface/cmdline.cpp:76 +msgid "-s and -c cannot be present at the same time." +msgstr "-s və -c eyni anda istifadə oluna bilməz." + +#: ../../locales/../src/interface/cmdline.cpp:82 +msgid "-s cannot be used together with an FTP URL." +msgstr "-s ilə FTP İnternet ünvanı eyni anda istifadə edilə biməz." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 +msgid "0 - None" +msgstr "0- Yoxdur" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 +msgid "1 - Warning" +msgstr "1 - Uyarı" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 +msgid "2 - Info" +msgstr "2 - İnfo" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 +msgid "3 - Verbose" +msgstr "3 - Ətraflı" + +#: ../../locales/../src/interface/aboutdialog.cpp:108 +msgid "32-bit system" +msgstr "32-bit sistem" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 +msgid "4 - Debug" +msgstr "4 - Debuq" + +#: ../../locales/../src/interface/aboutdialog.cpp:105 +msgid "64-bit system" +msgstr "64-bit sistem" + +#: ../../locales/../src/interface/netconfwizard.cpp:28 +msgid "< &Back" +msgstr "< &Geri" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +msgid "?" +msgstr "?" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +msgid "" +"A bookmark with the entered name already exists. Please enter an unused name." +msgstr "Eyni adlı bir əlfəcin var. Zəhmət olmasa başqa bir ad yazın." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1310 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Zəncirdə etibarlı bir alqoritm istifadə edərək sertifikat imzalanmışdır" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 +msgid "A default editor needs to be set." +msgstr "Standart redaktorun təyin edilməsi lazımdır." + +#: ../../locales/../src/interface/RemoteListView.cpp:163 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:836 +msgid "A directory cannot be dragged into one of its subdirectories." +msgstr "Bir qovluq özünün alt qovluğuna sürüklənə bilməz." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 +msgid "" +"A few servers don't allow passive mode or are misconfigured. In such cases " +"you would have to use active mode. In active mode, FileZilla opens a port " +"and asks the server to connect to it." +msgstr "" +"Bir neçə server passiv rejimə yol vermir və ya yanlış düzəldilir. Belə " +"hallarda aktiv rejimdən istifadə etməlisiniz. Aktiv rejimdə, FileZilla bir " +"poçt açır və serverə qoşulmağı xahiş edir." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 +msgid "A file previously opened has been changed." +msgstr "Daha əvvəl açılmış bir fayl dəyişdirildi." + +#: ../../locales/../src/interface/edithandler.cpp:1696 +msgid "A file with that name is already being transferred." +msgstr "Bu adla bir fayl artıq köçürülür." + +#: ../../locales/../src/interface/edithandler.cpp:1700 +msgid "" +"A file with that name is still being edited. Please close it and try again." +msgstr "" +"Bu adı olan bir fayl hələ də redaktə olunur. Xahiş edirik onu bağlayın və " +"yenidən cəhd edin." + +#: ../../locales/../src/interface/FileZilla.cpp:582 +msgid "" +"A local filename could not be decoded.\n" +"Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " +"correctly.\n" +"Unless you fix this problem, files might be missing in the file listings.\n" +"No further warning will be displayed this session." +msgstr "" +"Yerli bir faylın kodu çözülmədi.\n" +"Xahiş edirik LC_CTYPE (və ya LC_ALL) ətraf mühiti dəyişəninin düzgün " +"qurulduğundan əmin olun\n" +"Bu problemi düzəltməyincə fayllar fayl siyahılarında əksik ola bilər.\n" +"Bu iclasda heç bir xəbərdarlıq olmayacaq." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Əsas şifrə itirilərsə geri qaytarıla bilməz. Şifrənizi güvənli saxlayın." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 +msgid "A new version of FileZilla is available:" +msgstr "FileZilla-nın yeni versiyası mövcuddur:" + +#: ../../locales/../src/interface/Mainfrm.cpp:712 +msgid "" +"A proper server always shows all files, but some broken servers hide files " +"from the user. Use this option to force the server to show all files." +msgstr "" +"Müvafiq server həmişə bütün faylları göstərir, lakin bəzi problemli " +"serverlər fayllardan istifadəçidən gizlədirlər. Serverin bütün faylları " +"göstərməsinə məcbur etmək üçün bu seçimdən istifadə edin." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 +msgid "" +"A proper server does not require this. Contact the server administrator if " +"you need this." +msgstr "" +"Normal bir server üçün lazımlı deyil. Buna ehtiyac varsa server " +"adminstratorla əlaqə yaradın." + +#: ../../locales/../src/interface/state.cpp:268 +msgid "" +"A remote operation is in progress and synchronized browsing is enabled.\n" +"Disable synchronized browsing and continue changing the local directory?" +msgstr "" +"Uzaqda bir əməliyyat davam edir və sinxronlaşdırılan tarama effektivdir\n" +"Sinxronlaşdırırlan axtarışı dayandırıb yerli qovluqları dəyişdirməyə davam " +"etmək istəyirsiniz?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:604 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 +msgid "A&SCII" +msgstr "A&SCII" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 +msgid "A&dd" +msgstr "Ə&lavə et" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 +msgid "A&llow resume of ASCII files" +msgstr "ASCII &faylları davam etdirməyə icazə verin" + +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 +msgid "A&pply only to downloads" +msgstr "&Yalnız yükləmələrə müraciət edin" + +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 +msgid "A&pply only to uploads" +msgstr "&Yalnız yükləmələrə tətbiq edilsin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 +msgid "A&pply to all files and directories" +msgstr "&Bütün fayl və qovluqlara tətbiq edilsin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 +msgid "A&utomatically remove successful transfers" +msgstr "Uğurlu &köçürmələri avtomatik olaraq sil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 +msgid "ASCII" +msgstr "ASCII" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 +msgid "About FileZilla" +msgstr "FileZilla haqqında" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 +msgid "Above the file lists" +msgstr "Fayl siyahılarının üstündə" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:114 +msgid "Access to some local directories could not be restored:" +msgstr "Bəzi yerli kataloqlara giriş bərpa edilə bilmədi:" + +#: ../../locales/../src/engine/server.cpp:581 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 +msgid "Account" +msgstr "Hesab" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 +msgid "Action after queue &completion" +msgstr "&Sıralama başa çatdıqdan sonra aparılıacaq əməliyyat" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 +msgid "Action on selected file:" +msgstr "Seçilmiş faylda hərəkət:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 +msgid "Action to perform:" +msgstr "Görüləcək əməliyyat:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 +msgid "Action:" +msgstr "Əməliyyat:" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 +msgid "Active mode" +msgstr "Aktiv rejim" + +#: ../../locales/../src/interface/netconfwizard.cpp:627 +msgid "" +"Active mode FTP test failed. FileZilla does not know the correct external IP " +"address." +msgstr "" +"Aktiv rejimi FTP testi uğursuz oldu. FileZilla düzgün xarici IP ünvanı " +"bilmir." + +#: ../../locales/../src/interface/netconfwizard.cpp:614 +msgid "" +"Active mode FTP test failed. FileZilla does not know the correct external IP " +"address. In addition to that, your router has modified the sent address." +msgstr "" +"Aktiv rejimi FTP testi uğursuz oldu. FileZilla düzgün xarici IP ünvanı " +"bilmir. Bununla yanaşı, marşrutlaşdırıcınız göndərilən ünvanı dəyişdirmişdir." + +#: ../../locales/../src/interface/netconfwizard.cpp:602 +msgid "" +"Active mode FTP test failed. FileZilla knows the correct external IP " +"address, but your router or firewall has misleadingly modified the sent " +"address." +msgstr "" +"Aktiv rejimi FTP testi uğursuz oldu. FileZilla doğru xarici IP ünvanı bilir, " +"ancaq idarəçini ya da təhlükəsizlik divarınız yanlış yolla göndərilən ünvanı " +"dəyişdirdi." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 +msgid "Active mode IP" +msgstr "Active mode IP" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 +msgid "Add files to &queue only" +msgstr "Fayllar yalnız &sıraya əlavə edilsin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +msgid "Add selected directory to the transfer queue" +msgstr "Transfer sırasına seçilmiş kataloqu əlavə edin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +msgid "Add selected files and folders to the transfer queue" +msgstr "Seçilən faylları və qovluqları ötürmə növbəsinə əlavə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 +msgid "Add to queue" +msgstr "Sıraya əlavə edin" + +#: ../../locales/../src/engine/proxy.cpp:513 +msgid "Address type not supported" +msgstr "Ünvan növü dəstəklənmir" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 +msgid "Advanced" +msgstr "Ətraflı" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 +msgid "" +"Advice: Unless you want to test new features, please keep using stable " +"versions only. Beta versions and nightly builds are development versions " +"meant for testing purposes. Nightly builds of FileZilla may not work as " +"expected and might even damage your system. Use beta versions and nightly " +"builds at your own risk." +msgstr "" +"Məsləhət: Yeni xüsusiyyətləri test etmək istəmədikdə, yalnız sabit " +"versiyaları istifadə edin. Beta versiyaları və gecə quruluşları test " +"məqsədləri üçün nəzərdə tutulan inkişaf versiyalarıdır. Gecəlik quruluşlar " +"FileZilla gözlənildiyi kimi işləməyəcək və hətta sisteminizə zərər verə " +"bilər. Beta versiyalarını istifadə edin və gecəlik quruluşlardan yaranan " +"risklərin məsuliyyəti siz aiddir." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 +msgid "Al&ways perform this action" +msgstr "Hə&mişə bu hərəkəti həyata keçirin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 +msgid "Algorithm:" +msgstr "Alqoritm:" + +#: ../../locales/../src/interface/QueueView.cpp:2640 +msgid "All files have been successfully transferred" +msgstr "Bütün fayllar köçürüldü edildi" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 +msgid "All ports in the given range have to be between 1024 and 65535." +msgstr "Verilən aralıqdakı bütün limanlar 1024 ilə 65535 arasında olmalıdır." + +#: ../../locales/../src/interface/QueueView.cpp:2636 +#, c-format +msgid "All transfers have finished. %d file could not be transferred." +msgid_plural "All transfers have finished. %d files could not be transferred." +msgstr[0] "Bütün köçürülmələr bitdi. %d fayl köçürülmədi." +msgstr[1] "Bütün köçürülmələr bitdi. %d fayl köçürlmədi." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 +msgid "Allow &fall back to other transfer mode on failure" +msgstr "&Xəta baş verdikdə digər köçürmə üsulu istifadə edilsin" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 +msgid "Allow fallback to other transfer mode on failure" +msgstr "Xəta baş verdikdə digər köçürmə üsulu istifadə edilsin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 +msgid "Already connected" +msgstr "Artıq bağlıdır" + +#: ../../locales/../src/interface/verifycertdialog.cpp:80 +msgid "Alternative name:" +msgid_plural "Alternative names:" +msgstr[0] "Digər adlar:" +msgstr[1] "Digər adlar:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 +msgid "" +"Alternatively you can use the Pageant tool from PuTTY to manage your keys, " +"FileZilla does recognize Pageant." +msgstr "" +"Alternativ olaraq, düymələri idarə etmək üçün PuTTY təqdim alətini istifadə " +"edə bilərsiniz, FileZilla Pageant ilə işləyir." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 +msgid "" +"Alternatively you can use your system's SSH agent. To do so, make sure the " +"SSH_AUTH_SOCK environment variable is set." +msgstr "" +"Alternativ olaraq sisteminizin SSH agentini istifadə edə bilərsiniz. Bunu " +"etmək üçün, SSH_AUTH_SOCK mühit dəyişəninin təyin olunduğundan əmin olun." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 +msgid "" +"Alternatively, you can also download the latest version from the FileZilla " +"website:" +msgstr "" +"Alternativ olaraq, ən son versiyasını FileZilla veb saytından da yükləyə " +"bilərsiniz:" + +#: ../../locales/../src/interface/QueueView.cpp:1646 +#, c-format +msgid "" +"An error occurred loading the transfer queue from \"%s\".\n" +"Some queue items might not have been restored." +msgstr "" +"Köçürmə sırasını \"%s\" dən yükləyərkən bir səhv baş verdi .\n" +"Bəzi köçürmə sırası bərpa edilə bilməz." + +#: ../../locales/../src/interface/QueueView.cpp:1542 +#, c-format +msgid "" +"An error occurred saving the transfer queue to \"%s\".\n" +"Some queue items might not have been saved." +msgstr "" +"Köçürmə sırası \"%s\" üzərindən endirilərkən xəta baş verdi\n" +"Bəzi köçürmə sırası bərpa edilə bilməz." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1314 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Sertifikat zəncirində bir emitent sertifikat orqanı deyil" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 +msgid "" +"An item with the same name as the dragged item already exists at the target " +"location." +msgstr "" +"Sürüklənmiş maddə ilə eyni adlı bir element zatən hədəf yerində mövcuddur." + +#: ../../locales/../src/engine/server.cpp:606 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1709 +msgid "Anonymous" +msgstr "Anonim" + +#: ../../locales/../src/interface/state.cpp:1068 +msgid "" +"Another remote operation is already in progress, cannot change directory now." +msgstr "" +"Başqa bir uzaqdan əməliyyat artıq başlamışdır, indi kataloq dəyişə bilməz." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:845 +msgid "Any changes made in the Site Manager could not be saved." +msgstr "Sayt menecerində edilən dəyişikliklər yadda saxlanıla bilməz." + +#: ../../locales/../src/interface/filter.cpp:995 +msgid "Any changes made to the filters could not be saved." +msgstr "Sayt menecerində edilən dəyişikliklər yadda saxlanıla bilməz." + +#: ../../locales/../src/interface/filter.cpp:903 +msgid "Any changes made to the filters will not be saved." +msgstr "Filtlərdə edilən dəyişiklilər yadda saxlanılmayacaq." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 +msgid "App&ly to directories only" +msgstr "Yalnız &qovluqlara tətbiq olunsun" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 +msgid "Apply" +msgstr "Müraciət edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 +msgid "Apply to ¤t queue only" +msgstr "Yalnız &cari sıraya müraciət edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 +msgid "Apply to &files only" +msgstr "Yalnız &qovluqlara tətbiq olunsun" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 +msgid "Archive" +msgstr "Arxiv" + +#: ../../locales/../src/engine/socket.cpp:1107 +msgid "Argument buffer overflow" +msgstr "Arxa tampon daşması" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 +msgid "As tab in the transfer queue pane" +msgstr "Köçürmə kuyruğu bölməsində nişan kimi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 +msgid "Ask for action" +msgstr "Hərəkət tələb et" + +#: ../../locales/../src/engine/server.cpp:572 +#: ../../locales/../src/engine/server.cpp:598 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +msgid "Ask for password" +msgstr "Şifrə soruşun" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 +msgid "Ask operating system for a port." +msgstr "Bir liman üçün əməliyyat sistemindən soruşun." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 +msgid "Ask your operating system for the external IP address" +msgstr "Xarici IP ünvanınız üçün əməliyyat sistemindən soruşun" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 +msgid "Asking questions in the FileZilla forums" +msgstr "FileZilla forumlarında suallar verin" + +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 +msgid "Associated program not found:" +msgstr "Birləşdirilmiş proqram tapılmadı:" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 +msgid "At least one filter condition is incomplete" +msgstr "Ən azı bir filtre vəziyyəti natamamdır" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 +msgid "At this point, all required information has been gathered." +msgstr "Bu nöqtədə bütün lazımlı məlumatlar toplanmışdır." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +msgid "Attribute" +msgstr "Atribut" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:221 +msgid "Authentication failed." +msgstr "Kimlik doğrulaması uğursuz oldu." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 +msgid "Author:" +msgstr "Müəllif:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +msgid "Auto" +msgstr "Avtomatik" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 +msgid "Automatic file type classification" +msgstr "Avtomatik fayl tipi təsnifatı" + +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 +msgid "B " +msgstr "B" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 +msgid "B&ypass proxy" +msgstr "&Proxy'yi çevirin" + +#: ../../locales/../src/engine/socket.cpp:1071 +msgid "Bad file descriptor" +msgstr "Fayl təsvirçisi işləmir" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 +msgid "Basic usage instructions" +msgstr "Əsas istifadə təlimatları" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 +msgid "Behaviour" +msgstr "Davranış" + +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 +msgid "Being edited" +msgstr "Düzəldilmişdir" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1300 +msgid "Beware! Certificate has been revoked" +msgstr "Diqqət! Sertifikat ləğv edildi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 +msgid "Binary" +msgstr "İkili" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 +msgid "Blackboard" +msgstr "Yazı taxtası" + +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Mavi" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:390 +msgid "Bookmark" +msgstr "Əlfəcin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 +msgid "Bookmark:" +msgstr "Əlfəcin:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 +msgid "Bookmarks" +msgstr "Əlfəcin" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 +msgid "Browse..." +msgstr "Göz at..." + +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:150 +#: ../../locales/../src/engine/storj/resolve.cpp:218 +#: ../../locales/../src/engine/storj/resolve.cpp:291 +msgid "Bucket not found" +msgstr "Buket tapılmadı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +msgid "Build date:" +msgstr "Yaradılma tarixi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 +msgid "Build information" +msgstr "Yaradılma informasiyaları" + +#: ../../locales/../src/interface/verifycertdialog.cpp:243 +msgid "Business category:" +msgstr "Biznes kateqoriya:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 +msgid "" +"By default uses any available local port to establish transfers in active " +"mode. If you want to limit FileZilla to use only a small range of ports, " +"please enter the port range below." +msgstr "" +"Aktiv rejimdə köçürmələri təyin etmək üçün mövcud olan hər hansı bir yerli " +"port istifadə edir.FileZilla'yı yalnız kiçik bir liman istifadə etmək üçün " +"məhdudlaşdırmaq istəyirsinizsə, aşağıdakı limanı daxilini daxil edin." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 +msgid "C&ancel current operation" +msgstr "C&ari əməliyyatı ləğv edin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 +msgid "C&lear all" +msgstr "&Hamısını sil" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 +msgid "C&opy URL(s) to clipboard" +msgstr "İnternet ünvanını panoya k&opyalayın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 +msgid "C&opy URL(s) with password to clipboard" +msgstr "İnternet ünvanını şifrələr ilə panoya k&opyalayın" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 +msgid "C&ustom" +msgstr "Xüs&usi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 +msgid "C&ustom filetype associations:" +msgstr "Xüs&usi faly növü dərnəkləri:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 +msgid "CPU features:" +msgstr "CPU özəllikləri:" + +#: ../../locales/../src/engine/ftp/list.cpp:123 +msgid "Calculating timezone offset of server..." +msgstr "Serverin vaxt zonasının hesablanması ..." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 +msgid "Can't read from file" +msgstr "Fayl oxuna bilmir" + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 +msgid "Can't write data to file." +msgstr "Fayla məlumat yazıla bilməz." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 +#, c-format +msgid "Can't write data to file: %s" +msgstr "Fayla məlumatlar yazıla bilmir:%s" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 +msgid "Cancel" +msgstr "Ləğv et" + +#: ../../locales/../src/interface/toolbar.cpp:45 +msgid "Cancel current operation" +msgstr "Cari əməliyyatı ləğv edin" + +#: ../../locales/../src/interface/toolbar.cpp:45 +msgid "Cancels the current operation" +msgstr "Cari əməliyyatı ləğv edir" + +#: ../../locales/../src/engine/local_path.cpp:473 +#, c-format +msgid "Cannot access '%s', no media inserted or drive not ready." +msgstr "%s-ə daxil olunmur. Media icazə vermir və ya hazır deyil." + +#: ../../locales/../src/interface/Mainfrm.cpp:612 +msgid "Cannot add server to Site Manager" +msgstr "Sayt menecerinə server əlavə oluna bilmir" + +#: ../../locales/../src/engine/socket.cpp:1124 +msgid "Cannot assign requested address" +msgstr "Tələb olunan ünvan təyin edilə bilmədi" + +#: ../../locales/../src/interface/state.cpp:247 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Sinxronlaşdırılmış görüntü əməliyyatı yerinə yetirildiyi üçün kataloqu " +"dəyişmək mümkün deyil." + +#: ../../locales/../src/interface/context_control.cpp:353 +msgid "" +"Cannot close tab while busy.\n" +"Cancel current operation and close tab?" +msgstr "" +"Əlaqədar işarəni bağlaya bilmir.\n" +"Cari əməliyyatı ləğv edilib tap bağlanılsın ?" + +#: ../../locales/../src/interface/listingcomparison.cpp:74 +msgid "" +"Cannot compare directories, different filters for local and remote " +"directories are enabled" +msgstr "" +"Qvluqları müqayisə edə bilmir, yerli və uzaq qovluqlar üçün müxtəlif " +"filtreler effektivdir" + +#: ../../locales/../src/interface/filteredit.cpp:143 +msgid "Cannot create new filter" +msgstr "Yeni filtr yarada bilmir" + +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1761 +#: ../../locales/../src/interface/search.cpp:1164 +msgid "Cannot edit file" +msgstr "Faylı redaktə edə bilmir" + +#: ../../locales/../src/interface/LocalListView.cpp:1642 +msgid "Cannot edit file, not connected to any server." +msgstr "Hər hansı bir serverə bağlı olmayan faylları redaktə edə bilmir." + +#: ../../locales/../src/interface/LocalListView.cpp:1651 +msgid "Cannot edit file, remote path unknown." +msgstr "Uzaqdakı yol bilinmədiyi üçün fayl redaktə edilə bilmir." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 +msgid "" +"Cannot establish FTP connection to an SFTP server. Please select proper " +"protocol." +msgstr "" +"SFTP serverinə FTP bağlantısı qura bilmir. Xahiş edirik müvafiq protokolu " +"seçin." + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 +msgid "Cannot load key file" +msgstr "Açar fayl yüklənə bilmir" + +#: ../../locales/../src/interface/Mainfrm.cpp:1078 +msgid "Cannot load toolbar from resource file" +msgstr "Toolbarını resurs faylından yükləyə bilmir" + +#: ../../locales/../src/interface/manual_transfer.cpp:439 +msgid "Cannot remember password" +msgstr "Şifrəni xatırlanmır" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1261 +msgid "Cannot rename entry" +msgstr "Girişi dəyişə bilməz" + +#: ../../locales/../src/interface/RemoteListView.cpp:1619 +msgid "Cannot rename file" +msgstr "Fayl adını dəyişdirə bilməz" + +#: ../../locales/../src/engine/proxy.cpp:139 +msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." +msgstr "" +"SOCKS4 proxy ilə istifadə üçün hostname adını IPv4 ünvanına həll edə bilmir." + +#: ../../locales/../src/interface/filter.cpp:227 +#: ../../locales/../src/interface/filter.cpp:297 +msgid "Cannot save filterset" +msgstr "Filterset saxlaya bilmir" + +#: ../../locales/../src/interface/filter.cpp:188 +msgid "Cannot select filter" +msgstr "Filtri seçə bilmir" + +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 +msgid "Cannot set file association" +msgstr "Fayl birləşməsini təyin edə bilmir" + +#: ../../locales/../src/interface/edithandler.cpp:1125 +msgid "Cannot show dialog" +msgstr "Dialoqu göstərə bilmir" + +#: ../../locales/../src/interface/edithandler.cpp:1696 +msgid "Cannot view/edit selected file" +msgstr "Seçilmiş faylları görüntüləyə/redaktə edə bilmir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 +msgid "Case insensitive" +msgstr "Registeri nəzərə almadan" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 +msgid "Case insensitive (default)" +msgstr "Registeri nəzərə almadan (susmaya görə)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +msgid "Case sensitive" +msgstr "Register nəzərə alaraq" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +msgid "Case sensitive (default)" +msgstr "Registeri nəzərə alaraq (susmaya görə)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 +msgid "Categories to clear" +msgstr "Silinəcək kateqoriyalar" + +#: ../../locales/../src/interface/statusbar.cpp:514 +msgid "Certificate and session data are not available yet." +msgstr "Sertifikat və sessiya məlumatları hələ mövcud deyil." + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 +msgid "Certificate in chain:" +msgstr "Sertifikat bağlantısı:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 +msgid "Certificate issuer" +msgstr "Sertifikat verən" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1306 +msgid "Certificate signature verification failed" +msgstr "Sertifikat imzası təstiq edilmədi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 +msgid "Challenge:" +msgstr "Çağırış:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 +msgid "Change file attributes" +msgstr "Faylın xüsusiyyətlərini dəyişdirin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +msgid "Change the file permissions." +msgstr "Fayl icazələrini dəyişdirin." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 +msgid "Changing logfile settings requires restart of FileZilla." +msgstr "" +"Logfile ayarlarının dəyişdirilməsi FileZilla-nın yenidən başlamasını tələb " +"edir." + +#: ../../locales/../src/interface/FileZilla.cpp:582 +msgid "Character encoding issue" +msgstr "Xarakter kodlama məsələsi" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 +msgid "Charset" +msgstr "Xarakter verilənlər" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 +msgid "Check for &updates..." +msgstr "Güncəlləmələri &yoxlayın..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +msgid "Check for FileZilla &updates automatically:" +msgstr "FileZilla və a&vtomatik olaraq yeniləmələri yoxlayın:" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:4 +msgid "Check for Updates" +msgstr "Güncəlləmələri yoxlayın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +msgid "Check for newer versions of FileZilla" +msgstr "FileZilla'nın daha yeni versiyalarını yoxlayın" + +#: ../../locales/../src/interface/update_dialog.cpp:59 +msgid "Check for updates failed" +msgstr "Yeniləmələri yoxlaya bilmədi" + +#: ../../locales/../src/engine/ftp/logon.cpp:283 +msgid "" +"Check your login credentials. The entered password starts or ends with a " +"space character." +msgstr "" +"Giriş etmə məlumatlarınızı yoxlayın. Daxil edilən şifrə bir boşluq ilə " +"başlayır və ya bitir." + +#: ../../locales/../src/engine/ftp/logon.cpp:279 +msgid "" +"Check your login credentials. The entered username starts or ends with a " +"space character." +msgstr "" +"Giriş etmə məlumatlarınızı yoxlayın. Daxil edilən şifrə bir boşluq ilə " +"başlayır və ya bitir." + +#: ../../locales/../src/interface/netconfwizard.cpp:780 +msgid "Checking for correct external IP address" +msgstr "Doğru xarici IP ünvanı yoxlanılır" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 +msgid "Checking for updates..." +msgstr "Güncellemeleri yoxlayır ..." + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Checksum match on file %s\n" +msgstr "%s faylının təmin edilməsi uyğun gəlmir\n" + +#: ../../locales/../src/interface/updater.cpp:751 +#, c-format +msgid "Checksum mismatch on file %s\n" +msgstr "%s faylının təmin edilməsi uyğun gəlmir\n" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1608 +msgid "Choose a key file" +msgstr "Açar bir fayl seçin" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1639 +msgid "Choose the default local directory" +msgstr "Varsayılan yerli qovluğu seçin" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2495 +msgid "Choose the local directory" +msgstr "Yerli kataloq seçin" + +#: ../../locales/../src/engine/http/request.cpp:462 +msgid "Chunk data improperly terminated" +msgstr "Chunk məlumatları düzgün deyil" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 +msgid "Cipher:" +msgstr "Şifrə:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Cl&ose tab" +msgstr "&Nişanı bağla" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 +msgid "Classic" +msgstr "Klassik" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 +msgid "Clear &layout cache" +msgstr "Məkan boş&luğunu təmizləyin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 +msgid "Clear auto&update data" +msgstr "Avtomatik məl&umatlarını sil" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 +msgid "Clear history" +msgstr "Tarixi təmizləyin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 +msgid "Clear private data" +msgstr "Şəxsi məlumatları təmizləyin" + +#: ../../locales/../src/interface/quickconnectbar.cpp:196 +msgid "Clear quickconnect bar" +msgstr "Tez keçid barını sil" + +#: ../../locales/../src/interface/netconfwizard.cpp:593 +msgid "Click on Finish to save your configuration." +msgstr "Yapılandırmanızı saxlamaq üçün Bitdi butonuna basın." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 +msgid "Client to server MAC:" +msgstr "Müştərinin MAC serverinə:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 +msgid "Client to server cipher:" +msgstr "Müştərinin server şifrəsi:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:641 +msgid "Close &all other tabs" +msgstr "Digər bütün &tabları bağla" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 +#: ../../locales/../src/interface/Mainfrm.cpp:1231 +#: ../../locales/../src/interface/Mainfrm.cpp:1252 +msgid "Close FileZilla" +msgstr "FileZilla tətbiqini bağla" + +#: ../../locales/../src/interface/cmdline.cpp:15 +msgid "Close all running instances of FileZilla" +msgstr "FileZilla bütün çalışan nümunələrini bağlayın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 +msgid "Closes current tab" +msgstr "Mövcud seksiyanı bağlayır" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +msgid "Co&mments:" +msgstr "Şə&rhlər:" + +#: ../../locales/../src/interface/listctrlex.cpp:745 +msgid "Column properties" +msgstr "Sütun xüsusiyyətləri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +msgid "Column setup" +msgstr "Sütun quraşdırma" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 +msgid "Command and its arguments should be properly quoted." +msgstr "Komanda və onun arqumentləri düzgün qeyd edilməlidir." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 +msgid "Command failed" +msgstr "Komanda uğursuz oldu" + +#: ../../locales/../src/engine/proxy.cpp:510 +msgid "Command not supported" +msgstr "Komanda dəstəklənmir" + +#: ../../locales/../src/engine/engineprivate.cpp:224 +msgid "Command not supported by this protocol" +msgstr "Komuta bu protokol tərəfindən dəstəklənmir" + +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:350 +msgid "Command:" +msgstr "Komanda:" + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +msgid "Comment" +msgstr "Şərh" + +#: ../../locales/../src/interface/verifycertdialog.cpp:241 +msgid "Common name:" +msgstr "Ümumi ad:" + +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 +msgid "Communication tainted by router or firewall" +msgstr "Rabitə və ya güvənlik divarı tərəfindən pozulan rabitə" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +msgid "Compare &modification time" +msgstr "&Modifikasiya müddətlərini müqayisə edin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:545 +msgid "Compare file&size" +msgstr "Fayl ölçüləri müqayi&sə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 +msgid "Comparison &threshold (in minutes):" +msgstr "Mü&qayisənin həddi (dəqiqə ilə):" + +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 +msgid "Comparison threshold needs to be between 0 and 1440 minutes." +msgstr "Müqayisənin həddi 0 ilə 1440 dəqiqə arasında olmalıdır." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 +msgid "Compiled for:" +msgstr "Tərtib üçün:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 +msgid "Compiled on:" +msgstr "Tərtib olunmuşdur:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 +msgid "Compiled with:" +msgstr "Müəllif:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 +msgid "Compiler flags:" +msgstr "Kompilyator bayraqları:" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 +msgid "Compressed" +msgstr "Sıxılmış" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 +msgid "Concurrent transfers" +msgstr "Eşzamanlı köçürmələr" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 +msgid "Conditions are c&ase sensitive" +msgstr "Ş&ərtlər həssasdır" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 +msgid "Configuration test" +msgstr "Konfiqurasiya testi" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:115 +msgid "Configure passive mode" +msgstr "Pasif rejimi konfiqurasiya edin" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 +msgid "Configure port range" +msgstr "Port aralığını konfiqurasiya edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 +msgid "Configuring FileZilla and your network" +msgstr "FileZilla və şəbəkə konfiqurasiyası" + +#: ../../locales/../src/interface/search.cpp:1223 +msgid "Confirm deletion" +msgstr "Silinməni təsdiqləyin" + +#: ../../locales/../src/interface/edithandler.cpp:1638 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1724 +#: ../../locales/../src/interface/RemoteListView.cpp:1426 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1069 +#: ../../locales/../src/interface/search.cpp:1176 +msgid "Confirmation needed" +msgstr "Təsdiq lazımdır" + +#: ../../locales/../src/interface/netconfwizard.cpp:589 +msgid "Congratulations, your configuration seems to be working." +msgstr "Təbrik edirik, konfiqurasiya işə yarayır." + +#: ../../locales/../src/interface/quickconnectbar.cpp:194 +msgid "Connect bypassing proxy settings" +msgstr "Proxy parametrlərini atlayaraq qoşun" + +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Bağlanamadı: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 +msgid "Connect in current tab" +msgstr "Mövcud tabdan qoşun" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +msgid "Connect in new tab" +msgstr "Yeni tabdan qoşun" + +#: ../../locales/../src/interface/cmdline.cpp:8 +msgid "Connect to specified Site Manager site" +msgstr "Sayt menecerində müəyyən edilmiş sayta qoşulun" + +#: ../../locales/../src/interface/queue.cpp:340 +msgid "Connecting" +msgstr "Bağlanılır" + +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 +#, c-format +msgid "Connecting to %s" +msgstr "%s serverinə bağlanır" + +#: ../../locales/../src/engine/ControlSocket.cpp:1113 +#: ../../locales/../src/engine/ftp/logon.cpp:96 +#, c-format +msgid "Connecting to %s through %s proxy" +msgstr "%s bağlantısı %s Proxy vasitəsilə qurulur" + +#: ../../locales/../src/engine/ControlSocket.cpp:1038 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 +#, c-format +msgid "Connecting to %s..." +msgstr "%s bağlatısı qurulur..." + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 +msgid "Connection" +msgstr "Bağlantı" + +#: ../../locales/../src/engine/socket.cpp:1085 +msgid "Connection aborted" +msgstr "Bağlantı kəsildi" + +#: ../../locales/../src/interface/queue.cpp:341 +msgid "Connection attempt failed" +msgstr "Bağlantı girişimi uğursuz oldu" + +#: ../../locales/../src/engine/ControlSocket.cpp:1000 +#: ../../locales/../src/engine/proxy.cpp:212 +#, c-format +msgid "Connection attempt failed with \"%s\", trying next address." +msgstr "\"%s\" ilə bağlantı qurula bilmədi, sonrakı ünvan yoxlanlır." + +#: ../../locales/../src/engine/ControlSocket.cpp:1006 +#, c-format +msgid "Connection attempt failed with \"%s\"." +msgstr "\"%s\" iləbağlantı girişimi uğursuz oldu ." + +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 +msgid "Connection attempt interrupted by user" +msgstr "Bağlantı cəhdi istifadəçi tərəfindən kəsildi" + +#: ../../locales/../src/engine/socket.cpp:1078 +msgid "Connection attempt timed out" +msgstr "Bağlantı cəhdi sona çatdı" + +#: ../../locales/../src/interface/netconfwizard.cpp:562 +msgid "Connection closed" +msgstr "Bağlantı kəsildi" + +#: ../../locales/../src/engine/ControlSocket.cpp:1091 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +msgid "Connection closed by server" +msgstr "Bağlantı server tərəfindən bağlanıb" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:113 +msgid "Connection established, initializing TLS..." +msgstr "Bağlantı quruludu, TLS yüklənir..." + +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:136 +msgid "Connection established, sending HTTP request" +msgstr "Bağlantı quruldu, HTTP istəyi göndərilir" + +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Bağlantı quruldu, qarşılama mesajı gözlənilir." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 +msgid "Connection established, waiting for welcome message..." +msgstr "Bağlantı quruldu, qarşılama mesajı gözlənilir..." + +#: ../../locales/../src/interface/netconfwizard.cpp:360 +msgid "Connection lost" +msgstr "Bağlantı itdi" + +#: ../../locales/../src/engine/proxy.cpp:495 +msgid "Connection not allowed by ruleset" +msgstr "Qoşulma qaydaları ilə əlaqəyə icazə verilmədi" + +#: ../../locales/../src/engine/proxy.cpp:504 +msgid "Connection refused" +msgstr "Bağlantı rədd edildi" + +#: ../../locales/../src/engine/socket.cpp:1072 +msgid "Connection refused by server" +msgstr "Bağlantı server tərəfindən rədd edildi" + +#: ../../locales/../src/engine/socket.cpp:1081 +msgid "Connection reset by network" +msgstr "Şəbəkə ilə əlaqə yenidən qurulur" + +#: ../../locales/../src/engine/socket.cpp:1086 +msgid "Connection reset by peer" +msgstr "Bağlantı Peer tərəfindən sıfırlandı" + +#: ../../locales/../src/engine/ControlSocket.cpp:511 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "Əməliyyat %d saniyə sonra başa çat" +msgstr[1] "Əməliyyat %dsaniyə ərində aparıla bilmədiyinə görə sonra başa çatdı" + +#: ../../locales/../src/interface/netconfwizard.cpp:1079 +msgid "Connection timed out." +msgstr "Bağlantı vaxtı doldu." + +#: ../../locales/../src/interface/search.cpp:688 +msgid "Connection to server lost." +msgstr "Serverə keçid itirildi." + +#: ../../locales/../src/engine/proxy.cpp:223 +msgid "Connection with proxy established, performing handshake..." +msgstr "Proxy ilə əlaqə qurulub, əlaqəni yerinə yetirir ..." + +#: ../../locales/../src/interface/netconfwizard.cpp:582 +msgid "Connection with server got closed prematurely." +msgstr "Server ilə əlaqə əvvəlcədən bağlanıb." + +#: ../../locales/../src/interface/netconfwizard.cpp:573 +msgid "Connection with the test server failed." +msgstr "Test serveri ilə əlaqə qurula bilmədi." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 +msgid "Convert key file" +msgstr "Açar faylını dəyişin" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2055 +#, c-format +msgid "Copy (%d) of %s" +msgstr "Kopyala (%d) / %s" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2034 +#, c-format +msgid "Copy of %s" +msgstr "%s kopyası" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:530 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Seçilən maddələrin URL'lərini, parol daxil olmaqla, panoya kopyalayın." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +msgid "Copy the URLs of the selected items to clipboard." +msgstr "Seçilən elementlərin URL'lərini panoya kopyalayın." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 +#, c-format +msgid "Could not accept connection: %s" +msgstr "%s bağlantısı qəbul edilmədi" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "%s yoluna çıxıla bilmədi" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1375 +msgid "Could not add certificate to temporary trust list" +msgstr "Müvəqqəti güvən siyahısına sertifikat əlavə edilmədi" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +msgid "Could not add connection to Site Manager" +msgstr "Sayt meneceri ilə əlaqə qurula bilmədi" + +#: ../../locales/../src/interface/state.cpp:852 +msgid "Could not complete operation" +msgstr "Əməliyyat tamamlanmadı" + +#: ../../locales/../src/engine/ControlSocket.cpp:178 +msgid "Could not connect to server" +msgstr "Serverə bağlanıla bilmədi" + +#: ../../locales/../src/engine/ControlSocket.cpp:1146 +#, c-format +msgid "Could not connect to server: %s" +msgstr "%s serveri ilə bağlantı yaradıla bilmədi" + +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 +msgid "Could not convert command to server encoding" +msgstr "Komutanı server kodlamasına çevirə bilmədi" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 +msgid "Could not convert private key" +msgstr "Şəxsi açarı dəyişə bilmədi" + +#: ../../locales/../src/interface/RemoteListView.cpp:2559 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1411 +#: ../../locales/../src/interface/search.cpp:1352 +msgid "Could not copy URLs" +msgstr "İnternet adreslərini kopyalaya bilmədi" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1357 +msgid "Could not copy certificate" +msgstr "Sertifikat kopyalana bilmədi" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +msgid "Could not copy data" +msgstr "Məlumatlar kopyalana bilmədi" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:161 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "%s yolundan CFURL yaradıla bilmədi" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Bu transfer üçün URI yaradıla bilməz." + +#: ../../locales/../src/interface/updater.cpp:490 +#, c-format +msgid "Could not create local file %s\n" +msgstr "%s yerli faylı yarat\n" + +#: ../../locales/../src/engine/logging.cpp:179 +#, c-format +msgid "Could not create logging mutex: %s" +msgstr "Günlük daxilində mutex yaratmaq mümkün olmadı: %s" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:170 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "URL-dən təhlükəsizlik zolaqlı bookmark yaradıla bilmədi:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2216 +#: ../../locales/../src/interface/RemoteTreeView.cpp:865 +msgid "" +"Could not determine the target of the Drag&Drop operation.\n" +"Either the shell extension is not installed properly or you didn't drop the " +"files into an Explorer window." +msgstr "" +"Sürü-Burax əməliyyatı hədəfini təyin edə bilmədi.\n" +"Ya qabıq uzantısı düzgün yüklənməyib və ya faylları Explorer pəncərəsinə " +"salmır." + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 +msgid "Could not establish connection to server" +msgstr "Serverlə əlaqə qura bilmədi" + +#: ../../locales/../src/interface/FileZilla.cpp:428 +msgid "" +"Could not find the resource files for FileZilla, closing FileZilla.\n" +"You can set the data directory of FileZilla using the '--datadir " +"' commandline option or by setting the FZ_DATADIR environment " +"variable." +msgstr "" +"FileZilla üçün resurs faylları tapa bilmir, FileZilla-ı bağlanacaq.\n" +"FileZilla verilənlər qovluğunu '--datadir 1' komandasını seçərək və ya " +"FZ_DATADIR ətraf mühit dəyişənini təyin edə bilərsiniz." + +#: ../../locales/../src/engine/ftp/logon.cpp:748 +msgid "Could not generate custom login sequence." +msgstr "Xüsusi giriş sırası yarada bilmədi." + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:116 +msgid "Could not generate key" +msgstr "Açar yaradıla bilməz" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1097 +msgid "" +"Could not get distinguished name of certificate issuer, " +"gnutls_x509_get_issuer_dn failed" +msgstr "" +"Sertifikat verən şəxsin fərqli adını ala bilmədi, gnutls_x509_get_issuer_dn " +"uğursuz oldu" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1073 +msgid "" +"Could not get distinguished name of certificate subject, gnutls_x509_get_dn " +"failed" +msgstr "" +"Gnutls_x509_get_dn müvəqqəti olaraq sertifikat mövzusunun fərqli adını ala " +"bilmədi" + +#: ../../locales/../src/interface/state.cpp:1053 +msgid "Could not get full remote path." +msgstr "Tam uzaq yol əldə etmədi." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "CFURL-dan doğma yolu əldə etmədi" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +msgid "Could not get path from URL" +msgstr "URL'dən yol ala bilmədi" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 +msgid "Could not get reply from fzputtygen." +msgstr "Fzputtygen cavab vermədi." + +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1164 +msgid "Could not get temporary directory to download file into." +msgstr "Faylı daxil etmək üçün müvəqqəti bir qovluq almadı." + +#: ../../locales/../src/interface/FileZilla.cpp:94 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Winsock'u başladılmadı (%d): %s" + +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 +#, c-format +msgid "" +"Could not load \"%s\", please make sure the file is valid and can be " +"accessed.\n" +"Any changes made in the Site Manager will not be saved." +msgstr "" +"\"%s\" yüklənə bilmir, faylın etibarlı olmasına və əldə oluna biləcəyinə " +"əmin olun\n" +"Sayt menecerində edilən dəyişikliklər qeyd olunmayacaq." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 +msgid "Could not load key file" +msgstr "Açar fayl yüklənə bilmir" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +msgid "Could not load private key" +msgstr "Şəxsi açarı yükləməyib" + +#: ../../locales/../src/interface/state.cpp:1076 +#, c-format +msgid "" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" +"Disable synchronized browsing and continue changing the remote directory?" +msgstr "" +"Uzaqdakı '%s' qovluğuna qarşı gələn yerli qovluğa keçilmədi.\n" +"Sinxronlaşdırılan gözdən keçirilməni aradan qaldırıb və uzaq qovluğu " +"dəyişdirməyə davam etsin?" + +#: ../../locales/../src/interface/state.cpp:385 +#, c-format +msgid "" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" +"Synchronized browsing has been disabled." +msgstr "" +"Uzaqdakı '%s' qovluğuna qarşı gələn yerli qovluğa keçilmədi.\n" +"Sinxronlaşdırma gözdən keçirildi." + +#: ../../locales/../src/interface/state.cpp:278 +#, c-format +msgid "" +"Could not obtain corresponding remote directory for the local directory " +"'%s'.\n" +"Synchronized browsing has been disabled." +msgstr "" +"Yerli kataloq '%s' üçün müvafiq uzaqdan kataloq əldə etmədi.\n" +"Sinxronlaşdırma gözdən keçirildi." + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2559 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1411 +#: ../../locales/../src/interface/search.cpp:1352 +msgid "Could not open clipboard" +msgstr "Pano açılmadı" + +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 +#, c-format +msgid "Could not open log file: %s" +msgstr "Giriş faylını aça bilmədi: %s" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +msgid "Could not parse remote path." +msgstr "Uzaqdakı yola gedilmədi." + +#: ../../locales/../src/interface/quickconnectbar.cpp:114 +msgid "Could not parse server address:" +msgstr "Server ünvanını təhlil edə bilmir:" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "Data soketindən oxunmadı." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#, c-format +msgid "Could not read from socket: %s" +msgstr "Soketdən oxunmadı: %s" + +#: ../../locales/../src/interface/sitemanager.cpp:556 +msgid "Could not read server item." +msgstr "Server maddəsi oxunmadı." + +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Serverdən məlumat ala bilmədi." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:117 +msgid "Could not restore directory access" +msgstr "Kataloqa giriş bərpa edilə bilmədi" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:173 +#, c-format +msgid "Could not seek to offset %s within file" +msgstr "Fayldakı %s sətrinə bağlanıla bilmir" + +#: ../../locales/../src/engine/http/filetransfer.cpp:119 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "Faylın başlanğıcını tapılmadı" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 +msgid "Could not seek to the end of the file" +msgstr "Faylın sonuna gəlmədi" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +msgid "Could not send command to fzputtygen." +msgstr "Fzputtygen əmrini göndərə bilmədi." + +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Fzstorj əmrini göndərə bilmədi." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "Could not sort peer certificates" +msgstr "Akran sertifikatlarını sıralaya bilmədi" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:201 +msgid "Could not spawn IO thread" +msgstr "IO mövzuya toxunmadı" + +#: ../../locales/../src/engine/ControlSocket.cpp:1127 +#, c-format +msgid "Could not start proxy handshake: %s" +msgstr "Proxy ilə əlaqə yaradıla bilmədi: %s" + +#: ../../locales/../src/interface/queue.cpp:346 +msgid "Could not start transfer" +msgstr "Transferə başlanıla bilmədi" + +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:866 +#, c-format +msgid "" +"Could not write \"%s\", any changes to the Site Manager could not be saved: " +"%s" +msgstr "\"%s\" yazılamadı, Sayt menecerində dəyişikliklər saxlanıla bilmədi:%s" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 +#, c-format +msgid "Could not write \"%s\", the bookmark could not be added: %s" +msgstr "\"%s\" yazılamadı, əlfəcin əlavə edilmədi:%s" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 +#, c-format +msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" +msgstr "\"%s\" yazılamadı, qlobal yer imleri yadda saxlanıla bilmədi:%s" + +#: ../../locales/../src/interface/QueueView.cpp:1571 +#, c-format +msgid "" +"Could not write \"%s\", the queue could not be saved.\n" +"%s" +msgstr "" +"\"%s\" yazılamadı, növbə qeyd edilə bilməz.\n" +"%s" + +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2473 +#, c-format +msgid "Could not write \"%s\", the selected sites could not be exported: %s" +msgstr "\"%s\" yazılamadı, seçilmiş saytlar ixrac edilə bilməz: %s" + +#: ../../locales/../src/interface/xmlfunctions.cpp:149 +#, c-format +msgid "Could not write \"%s\":" +msgstr "\"%s\" yazılamadı:" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 +#, c-format +msgid "Could not write key file: %s" +msgstr "Açar fayl yazılmadı: %s" + +#: ../../locales/../src/interface/queue.cpp:345 +msgid "Could not write to local file" +msgstr "Yerli fayla yazıla bilmədi" + +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 +#, c-format +msgid "Could not write to log file: %s" +msgstr "Gündəlik faylı yazılmadı: %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:961 +#: ../../locales/../src/engine/ControlSocket.cpp:1059 +#: ../../locales/../src/engine/http/request.cpp:114 +#, c-format +msgid "Could not write to socket: %s" +msgstr "Soketə yazıla bilmir: %s" + +#: ../../locales/../src/interface/verifycertdialog.cpp:246 +msgid "Country:" +msgstr "Ölkə:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +msgid "Crea&te new file" +msgstr "&Fayl yarat" + +#: ../../locales/../src/interface/state.cpp:1091 +msgid "Create &missing local directory and enter it" +msgstr "&Yerli kataloqu yaradın və onu daxil edin" + +#: ../../locales/../src/interface/state.cpp:1013 +msgid "Create &missing remote directory and enter it" +msgstr "&Əksik uzaq kataloq yaradın və onu daxil edin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:509 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 +msgid "Create a new subdirectory in the current directory" +msgstr "Mövcud kataloqda yeni bir alt qovluq yaradın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +msgid "Create a new subdirectory in the current directory and change into it" +msgstr "Mövcud kataloqda yeni bir alt qovluq yaradın və onu dəyişin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 +msgid "Create a new, empty file in the current directory" +msgstr "Mövcud kataloqda yeni, boş bir fayl yaradın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 +msgid "Create director&y and enter it" +msgstr "Qovluq yaradın və daxil edin" + +#: ../../locales/../src/interface/LocalListView.cpp:932 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1324 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1251 +msgid "Create directory" +msgstr "Qovluq yaradın" + +#: ../../locales/../src/interface/RemoteListView.cpp:2648 +msgid "Create empty file" +msgstr "Boş fayl yaradın" + +#: ../../locales/../src/interface/queue.cpp:348 +msgid "Creating directory" +msgstr "Qovluğun yaradılması" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 +#, c-format +msgid "Creating directory '%s'..." +msgstr "'%s' qovluğunu yaradın ..." + +#: ../../locales/../src/engine/ControlSocket.cpp:170 +msgid "Critical error" +msgstr "Kritik səhv" + +#: ../../locales/../src/engine/ControlSocket.cpp:161 +msgid "Critical error:" +msgstr "Kritik səhv:" + +#: ../../locales/../src/engine/ControlSocket.cpp:112 +msgid "Critical file transfer error" +msgstr "Kritik fayl ötürmə səhvi" + +#: ../../locales/../src/engine/ControlSocket.cpp:92 +#, c-format +msgid "Critical file transfer error after transferring %s in %s" +msgstr "%s -də %s ötürdükdən sonra kritik fayl ötürmə xətası" + +#: ../../locales/../src/interface/state.cpp:376 +#, c-format +msgid "" +"Current remote directory (%s) is not below the synchronization root (%s).\n" +"Synchronized browsing has been disabled." +msgstr "" +"Cari uzaq qovluq (%s) sinxronizasiya kökündən aşağı deyil (%s).\n" +"Sinxronlaşdırma gözdən keçirildi." + +#: ../../locales/../src/interface/statusbar.cpp:402 +msgid "Current transfer type is set to ASCII." +msgstr "Cari transfer növü ASCII olaraq təyin olunur." + +#: ../../locales/../src/interface/statusbar.cpp:410 +msgid "Current transfer type is set to automatic detection." +msgstr "Cari transfer növü avtomatik aşkarlanmaq üçün təyin edilir." + +#: ../../locales/../src/interface/statusbar.cpp:406 +msgid "Current transfer type is set to binary." +msgstr "Cari transfer növü ikili olaraq təyin olunur." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 +msgid "Curve:" +msgstr "Əyri:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 +msgid "Cus&tom" +msgstr "Xüsusi" + +#: ../../locales/../src/interface/filter.cpp:91 +msgid "Custom filter set" +msgstr "Xüsusi filter dəsti" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 +msgid "Custom server" +msgstr "Xüsusi server" + +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Tünd göy" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 +msgid "D&ata type" +msgstr "Məlumat növü" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 +msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" +msgstr "" +"SI simvollarını istifadə edərək, ondalık prefikslər (məsələn, 1 KB = 1000 " +"bayt)" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +msgid "D&efault" +msgstr "Default" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 +msgid "D&elete" +msgstr "Sil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 +msgid "D&irectory comparison" +msgstr "Qovluq müqayisəsi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 +msgid "D&isable all" +msgstr "Hamısını bağlayın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +msgid "D&o not save passwords" +msgstr "Şifrələri saxlamayın" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 +msgid "D&ouble-click action on directories:" +msgstr "Qovluqlar üzrə cüt vurma hərəkətləri:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 +msgid "D&uplicate" +msgstr "Dublikat" + +#: ../../locales/../src/engine/server.cpp:52 +msgid "DOS-like with virtual paths" +msgstr "Virtual yollarla DOS kimi" + +#: ../../locales/../src/interface/edithandler.cpp:1678 +msgid "Dangerous filetype" +msgstr "Təhlükəli fayl tipi" + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +msgid "Data" +msgstr "Məlumat" + +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 +msgid "Data socket closed too early." +msgstr "Məlumat yuvası çox erkən bağlanıb." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 +msgid "Date" +msgstr "Tarix" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 +msgid "Date formatting" +msgstr "Tarix formatı" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 +msgid "Date/time format" +msgstr "Tarix / vaxt formatı" + +#: ../../locales/../src/interface/fileexistsdlg.cpp:49 +msgid "Date/time unknown" +msgstr "Tarix / saatı bilinmir" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +msgid "Debug" +msgstr "Debug" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 +msgid "Debugging settings" +msgstr "Debug ayarları" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 +msgid "Default &local directory:" +msgstr "Varsayılan və yerli qovluq:" + +#: ../../locales/../src/engine/server.cpp:44 +msgid "Default (Autodetect)" +msgstr "Default (Autodetect)" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 +msgid "Default editor not properly quoted." +msgstr "Default redaktor düzgün qeyd edilməyib." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 +msgid "Default file exists action" +msgstr "Default fayl fəaliyyət göstərir" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 +msgid "Default r&emote directory:" +msgstr "Default uzaq qovluq:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 +msgid "" +"Default remote path cannot be parsed. Make sure it is a valid absolute path " +"for the selected server type." +msgstr "" +"Standart uzaq yola gedilmədi. Seçilmiş server tipi üçün etibarlı bir yol " +"olduğundan əmin olun." + +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +msgid "Default system language" +msgstr "Default sistem dili" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 +msgid "Default transfer mode:" +msgstr "Default transfer rejimi:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 +msgid "Default transfer type:" +msgstr "Default transfer tipi:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 +msgid "Default: http://ip.filezilla-project.org/ip.php" +msgstr "Default: http://ip.filezilla-project.org/ip.php" + +#: ../../locales/../src/interface/settings/optionspage_connection.cpp:41 +msgid "" +"Delay between failed connection attempts has to be between 1 and 999 seconds." +msgstr "" +"Arızalı bağlantı cəhdləri arasında gecikmə 1 ilə 999 saniyə arasında " +"olmalıdır." + +#: ../../locales/../src/engine/engineprivate.cpp:516 +#, c-format +msgid "" +"Delaying connection for %d second due to previously failed connection " +"attempt..." +msgid_plural "" +"Delaying connection for %d seconds due to previously failed connection " +"attempt..." +msgstr[0] "" +"Əvvəlcədən uğursuz keçid cəhdinə görə %d saniyə üçün qoşulma gecikdirildi ..." +msgstr[1] "" +"Əvvəlcədən uğursuz keçid cəhdinə görə %d saniyə üçün qoşulma gecikdirildi ..." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1294 +msgid "Delete Site Manager entry" +msgstr "Sayt meneceri girişini sil" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 +msgid "Delete selected directory" +msgstr "Seçilmiş qovluğu sil" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +msgid "Delete selected files and directories" +msgstr "Seçilmiş fayl və qovluqları sil" + +#: ../../locales/../src/engine/engineprivate.cpp:392 +#, c-format +msgid "Deleting \"%s\"" +msgstr "Silinir \"%s\"" + +#: ../../locales/../src/engine/engineprivate.cpp:395 +#, c-format +msgid "Deleting %u files from \"%s\"" +msgstr "%u faylı burdan silinir: \"%s\"" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 +msgid "Deleting symbolic link" +msgstr "Simvolik bağlantı silinir" + +#: ../../locales/../src/interface/LocalTreeView.cpp:986 +msgid "Desktop" +msgstr "Masaüstü" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 +msgid "Details" +msgstr "Detallar" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 +msgid "Details for new key:" +msgstr "Yeni açar üçün məlumatlar:" + +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:790 +msgid "Detected newer version of FileZilla" +msgstr "FileZilla-nın yeni versiyası aşkarlandı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 +msgid "Dire&ctories" +msgstr "Qovluqlar" + +#: ../../locales/../src/interface/queue.cpp:1162 +msgid "Direction" +msgstr "Tərəf" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +#, fuzzy +msgid "Directories:" +msgstr "Qovluqlar" + +#: ../../locales/../src/interface/filelistctrl.cpp:269 +msgid "Directory" +msgstr "Qovluq" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +#, fuzzy +msgid "Directory access permissions" +msgstr "Qovluq qarşılaşdırma istifadə olunsun" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:538 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2309 +#: ../../locales/../src/interface/toolbar.cpp:51 +msgid "Directory comparison" +msgstr "Qovluq qarşılaşdırma istifadə olunsun" + +#: ../../locales/../src/interface/listingcomparison.cpp:74 +msgid "Directory comparison failed" +msgstr "Qovluqlar qarşılaşdırıla bilmədi" + +#: ../../locales/../src/interface/settings/optionspage_logging.cpp:71 +msgid "Directory containing the logfile does not exist or filename is invalid." +msgstr "" +"Günlük faylını ehtiva edən bir kataloq yoxdur və ya fayl adı yanlışdır." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "Qovluq siyahısı &filtrləri ..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 +msgid "Directory listing aborted by user" +msgstr "Qovluq siyahısı istifadəçi tərəfindən ləğv edildi" + +#: ../../locales/../src/interface/RemoteListView.cpp:2048 +msgid "Directory listing failed" +msgstr "Qovluq siyahısı uğursuz oldu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 +msgid "Directory listing filters" +msgstr "Qovluq siyahısı filtrləri" + +#: ../../locales/../src/engine/ControlSocket.cpp:193 +#, c-format +msgid "Directory listing of \"%s\" successful" +msgstr "\"%s\" siyahısının müvəffəqiyyətli olması" + +#: ../../locales/../src/engine/ControlSocket.cpp:190 +msgid "Directory listing successful" +msgstr "Qovluq uğurla siyahılandı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 +msgid "Disa&ble all" +msgstr "Hamısını bağlayın" + +#: ../../locales/../src/interface/state.cpp:1084 +msgid "" +"Disable synchronized browsing and continue changing the remote directory?" +msgstr "" +"Sinxronlaşdırıların gözdən keçirilməsi aradan qaldırılıb və uzaq qovluğu " +"dəyişdirilməsinə davam edilsin?" + +#: ../../locales/../src/interface/Mainfrm.cpp:714 +msgid "" +"Disable this option again if you will not be able to see the correct " +"directory contents anymore." +msgstr "Doğru kataloq məzmununu görə bilməyəcəksinizsə, bu seçimi yeniləyin." + +#: ../../locales/../src/interface/toolbar.cpp:46 +msgid "Disconnect from server" +msgstr "Serverdən çıxmaq" + +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:962 +#: ../../locales/../src/engine/ControlSocket.cpp:1061 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:115 +#: ../../locales/../src/interface/queue.cpp:339 +msgid "Disconnected from server" +msgstr "Serverdən ayrıldı" + +#: ../../locales/../src/engine/ControlSocket.cpp:1094 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:189 +#, c-format +msgid "Disconnected from server: %s" +msgstr "Serverdən ayrıldı: %s" + +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 +msgid "Disconnecting from previous server" +msgstr "Əvvəlki serverdən çıxmaq" + +#: ../../locales/../src/interface/toolbar.cpp:46 +msgid "Disconnects from the currently visible server" +msgstr "Hal-hazırda görünən serverdən ayrılır" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 +msgid "Display about dialog" +msgstr "Dialoq haqqında məlumat" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 +msgid "Do ¬ use default editor" +msgstr "Default redaktoru istifadə etməyin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 +msgid "Do the same with &all selected files already being edited" +msgstr "Edilən bütün seçilmiş fayllar ilə eyni olun" + +#: ../../locales/../src/interface/Mainfrm.cpp:1234 +#: ../../locales/../src/interface/Mainfrm.cpp:1256 +msgid "Do you really want to close FileZilla?" +msgstr "Həqiqətən FileZilla-ı bağlamaq istəyirsiniz?" + +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +msgid "" +"Do you really want to delete all Site Manager entries and the transfer queue?" +msgstr "" +"Həqiqətən bütün Sayt meneceri girişlərini və transfer sırasını silmək " +"istəyirsiniz?" + +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +msgid "Do you really want to delete all Site Manager entries?" +msgstr "Bütün Sayt meneceri girişlərini silmək istəyirsiniz?" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296 +msgid "Do you really want to delete selected entry?" +msgstr "Həqiqətən seçilmiş girişləri silmək istəyirsiniz?" + +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +msgid "Do you really want to delete the transfer queue?" +msgstr "Həqiqətən transfer sırasını silmək istəyirsiniz?" + +#: ../../locales/../src/interface/Mainfrm.cpp:642 +#, c-format +msgid "Do you really want to send '%s' to the server?" +msgstr "'%s' mesajını serverə göndərmək istəyirsiniz?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 +msgid "Do you want to reopen this file?" +msgstr "Bu faylı yenidən açmaq istəyirsiniz?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 +msgid "Documentation" +msgstr "Sənədlər" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:250 +msgid "Don't use external IP address on &local connections." +msgstr "Yerli bağlantılarda xarici IP ünvanı istifadə etməyin." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 +msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" +msgstr "Dotfiles bir nöqtədən başlayaraq, məsələn, fayl adlarıdır. .htaccess" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 +msgid "Double-click action" +msgstr "İki dəfə vurun" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 +msgid "Download" +msgstr "Yüklə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 +msgid "Download &limit:" +msgstr "Yükləmə limiti:" + +#: ../../locales/../src/interface/statusbar.cpp:597 +#, c-format +msgid "Download limit: %s/s" +msgstr "Yükləmə limiti:%s/s" + +#: ../../locales/../src/interface/statusbar.cpp:600 +msgid "Download limit: none" +msgstr "Yükləmə limiti: yox" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:884 +#: ../../locales/../src/interface/search.cpp:889 +msgid "Download search results" +msgstr "Axtarış nəticələrini yükləyin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 +msgid "Download selected directory" +msgstr "Seçilmiş qovluğu yükləyin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 +msgid "Download selected files and directories" +msgstr "Seçilmiş faylları və qovluqları yükləyin" + +#: ../../locales/../src/interface/Mainfrm.cpp:1050 +#, c-format +msgid "" +"Download speed: %s/s\n" +"Upload speed: %s/s" +msgstr "" +"Endirmə sürəti:%s/s\n" +"Yükləmə sürəti:%s/s" + +#: ../../locales/../src/interface/edithandler.cpp:1151 +msgid "Downloading" +msgstr "Endirilir" + +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:148 +#, c-format +msgid "Downloading %s" +msgstr "Endirilir %s" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 +msgid "Downloading update..." +msgstr "Yeniləmə yüklənir ..." + +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:111 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 +msgid "" +"Drag&drop between different instances of FileZilla has not been implemented " +"yet." +msgstr "" +"FileZilla'nın müxtəlif nümunələri arasında sürü &burax hələ həyata " +"keçirilməyib." + +#: ../../locales/../src/interface/LocalListView.cpp:118 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:116 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 +msgid "Drag&drop between different servers has not been implemented yet." +msgstr "Müxtəlif serverlər arasında Dragdrop hələ yerinə yetirilməyib." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 +msgid "Dupl&icate" +msgstr "Dublikat" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 +msgid "E&nable all" +msgstr "Hamısını aktiv et" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 +msgid "E&nter directory" +msgstr "Qovluğu aç" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 +msgid "E&xecute" +msgstr "İcra etmək" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 +msgid "E&xit" +msgstr "Çıxış" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:423 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 +msgid "E&xport..." +msgstr "Məlumatları ver..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:252 +msgid "E-Mail:" +msgstr "E-Mail:" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 +msgid "Each filter needs at least one condition." +msgstr "Hər filter ən azı bir ölçüdə olmalıdır." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 +msgid "Edit filters" +msgstr "Filterləri düzəlt" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 +msgid "" +"Edit the file with the configured editor and upload changes to the server." +msgstr "" +"Faylı konfiqurasiya edilmiş redaktoru ilə redaktə edin və dəyişiklikləri " +"serverə yükləyin." + +#: ../../locales/../src/interface/search.cpp:1152 +msgid "Editing directories is not supported" +msgstr "Qovluqları redaktə etmək dəstəklənmir" + +#: ../../locales/../src/interface/LocalListView.cpp:1642 +#: ../../locales/../src/interface/LocalListView.cpp:1651 +msgid "Editing failed" +msgstr "Düzəltmə uğursuz oldu" + +#: ../../locales/../src/interface/search.cpp:1152 +msgid "Editing search results" +msgstr "Axtarış nəticələrini redaktə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +msgid "Email:" +msgstr "Email:" + +#: ../../locales/../src/interface/QueueView.cpp:1862 +msgid "Empty command" +msgstr "Boş əmr" + +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 +msgid "Empty command." +msgstr "Boş əmr." + +#: ../../locales/../src/interface/RemoteListView.cpp:2050 +msgid "Empty directory listing" +msgstr "Boş kataloq siyahısı" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 +msgid "Empty directory." +msgstr "Boş kataloq." + +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 +msgid "Empty file extension." +msgstr "Boş fayl uzantısı." + +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 +msgid "Empty filter names are not allowed." +msgstr "Boş filtr adlarına icazə verilmir." + +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 +msgid "Empty name" +msgstr "Boş ad" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 +msgid "Empty quoted string." +msgstr "Boş ifadə." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 +msgid "En&able all" +msgstr "&Hamısını aktiv et" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 +msgid "Enable invalid character &filtering" +msgstr "Yanlış xarakterli filtrləməni aktivləşdirin" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 +msgid "Encrypted" +msgstr "Şifrəli" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 +msgid "Encryption" +msgstr "Şifrələmə" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "Şifrələmə Açarları:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "Şifrələmə açarları:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 +msgid "Encryption details" +msgstr "Şifrələmə detalları" + +#: ../../locales/../src/interface/filelistctrl.cpp:471 +msgid "End comparison and change sorting order?" +msgstr "Müqayisə və dəyişiklik sırasını dəyişdirilsin?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +msgid "Enter &custom command..." +msgstr "Xüsusi komanda daxil edin ..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 +msgid "Enter 0 for unlimited speed." +msgstr "Sınırsız sürət üçün 0 daxil edin." + +#: ../../locales/../src/interface/QueueView.cpp:1856 +msgid "Enter command" +msgstr "Komanda daxil edin" + +#: ../../locales/../src/interface/Mainfrm.cpp:624 +msgid "Enter custom command" +msgstr "Xüsusi əmr daxil edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 +msgid "Enter directory" +msgstr "Qovluq açılsın" + +#: ../../locales/../src/interface/filteredit.cpp:136 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 +msgid "Enter filter name" +msgstr "Süzgəc adı daxil edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Ana parol daxil edin" + +#: ../../locales/../src/interface/filter.cpp:220 +msgid "Enter name for filterset" +msgstr "Filterset üçün ad daxil edin" + +#: ../../locales/../src/interface/filter.cpp:284 +msgid "Enter new name for filterset" +msgstr "Filterset üçün yeni ad daxil edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 +msgid "Enter password" +msgstr "Şifrəni daxil edin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 +msgid "Enter selected directory" +msgstr "Seçilmiş qovluğu daxil edin" + +#: ../../locales/../src/interface/quickconnectbar.cpp:49 +msgid "" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" +"\n" +"Supported protocols are:\n" +"- ftp:// for normal FTP with optional encryption\n" +"- sftp:// for SSH file transfer protocol\n" +"- ftps:// for FTP over TLS (implicit)\n" +"- ftpes:// for FTP over TLS (explicit)" +msgstr "" +"Serverin ünvanını daxil edin. Server protokolunu dəqiqləşdirmək üçün server " +"protokolunu identifikatoru ilə hazırlayın. Heç bir protokol göstərilməyibsə, " +"standart protokol (ftp: //) istifadə ediləcək. Forma protokolunda tam URL-" +"ləri də daxil edə bilərsiniz: // user: pass @ host: port bura, digər " +"sahələrdəki dəyərlər bundan sonra yazılacaq.\n" +"\n" +"Dəstəklənən əlaqə qaydaları:\n" +"- ftp: // istəyə bağlı şifrələmə ilə normal FTP üçün\n" +" -sftp:// SSH şifrələməsi ilə FTP\n" +"- ftps: // TLS üzərindən FTP üçün (örtülü)\n" +"- ftpes: // TLS üzərindən FTP üçün (açıq)" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 +#, c-format +msgid "" +"Enter the password for the file '%s'.\n" +"The converted file will be protected with the same password." +msgstr "" +"'%s'. the faylının parolunu daxil edin.\n" +"Dəyişdirilmiş fayl eyni parol ilə qorunur." + +#: ../../locales/../src/interface/quickconnectbar.cpp:62 +msgid "" +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." +msgstr "" +"Server dinləyən portu daxil edin. FTP üçün standart 21, SFTP üçün standart " +"isə 22'dir." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "İstifadəçi adnını daxil edin" + +#: ../../locales/../src/interface/loginmanager.cpp:176 +msgid "Enter username and password" +msgstr "İstifadəçi adı və şifrəni daxil edin" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:116 +msgid "Error" +msgstr "Xəta" + +#: ../../locales/../src/interface/export.cpp:30 +msgid "Error exporting settings" +msgstr "Ayarları ixrac etmə xətası" + +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 +msgid "Error importing" +msgstr "Məlumatlar alınarkən xəta baş verdi" + +#: ../../locales/../src/interface/QueueView.cpp:1647 +msgid "Error loading queue" +msgstr "Əlavə yüklənərkən səhv" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:904 +#: ../../locales/../src/interface/filter.cpp:996 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:247 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:131 +#: ../../locales/../src/interface/QueueView.cpp:1554 +#: ../../locales/../src/interface/search.cpp:1284 +#: ../../locales/../src/interface/search.cpp:1303 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:783 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:846 +#: ../../locales/../src/interface/wrapengine.cpp:933 +msgid "Error loading xml file" +msgstr "XML faylını yükləmə xətası" + +#: ../../locales/../src/interface/QueueView.cpp:1543 +msgid "Error saving queue" +msgstr "Əlavə yüklənərkən xəta baş verdi" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "Error starting program" +msgstr "Proqramı başladılarkən xəta baş verdi" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1572 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:867 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2474 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 +msgid "Error writing xml file" +msgstr "XML faylı yazılarkən xəta baş verdi" + +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:284 +#: ../../locales/../src/interface/StatusView.cpp:346 +msgid "Error:" +msgstr "Xəta:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 +msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" +msgstr "Məsələn: png \"c: \\ program faylları \\ viewer \\ viewer.exe\" -open" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 +msgid "Examples" +msgstr "Nümunələr" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 +msgid "Exe&cute" +msgstr "İcra etmək" + +#: ../../locales/../src/interface/update_dialog.cpp:59 +msgid "Executable contains no version info, cannot check for updates." +msgstr "" +"İstifadə etdiyiniz heç bir versiya məlumatı ehtiva edə, yeniləmələri yoxlaya " +"bilmir." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 +msgid "Explorer" +msgstr "Tədqiqatçı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "İxrac Filtrləri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +msgid "Export &Queue" +msgstr "İxrac sırası" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +msgid "Export &Settings" +msgstr "İxrac ayarları" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 +msgid "Export settings" +msgstr "İxrac parametrləri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 +msgid "F&ilter name:" +msgstr "Filtr adı:" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 +msgid "FTP" +msgstr "FTP" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 +msgid "FTP - File Transfer Protocol" +msgstr "FTP - Fayl Transfer Protokolu" + +#: ../../locales/../src/engine/server.cpp:20 +msgid "FTP - File Transfer Protocol with optional encryption" +msgstr "FTP - İstənilən şifrələmə ilə Fayl Transferi Protokolu" + +#: ../../locales/../src/engine/server.cpp:26 +msgid "FTP - Insecure File Transfer Protocol" +msgstr "FTP - təhlükəsiz fayl ötürülməsi protokolu" + +#: ../../locales/../src/interface/quickconnectbar.cpp:99 +msgid "FTP Engine not initialized, can't connect" +msgstr "FTP mühərrik başlamadı, bağlana bilmir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 +msgid "FTP Keep-alive" +msgstr "FTP saxlaya bilərsiniz" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 +msgid "FTP Proxy" +msgstr "FTP Proxy" + +#: ../../locales/../src/interface/cmdline.cpp:21 +msgid "FTP URL" +msgstr "FTP internet ünvanı" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:44 +msgid "" +"FTP uses secondary connections for data transfers. These additional " +"connections can be established in two ways." +msgstr "" +"FTP məlumat köçürmələri üçün ikincil əlaqələrdən istifadə edir. Bu əlavə " +"əlaqələr iki şəkildə müəyyən edilə bilər." + +#: ../../locales/../src/engine/server.cpp:25 +msgid "FTPES - FTP over explicit TLS" +msgstr "FTPES - açıq TLS üzərindən FTP" + +#: ../../locales/../src/engine/server.cpp:24 +msgid "FTPS - FTP over implicit TLS" +msgstr "FTPS - örtülü TLS üzərində FTP" + +#: ../../locales/../src/interface/LocalListView.cpp:540 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:919 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 +msgid "Failed to change directory" +msgstr "Qovluğu dəyişdirə bilmədi" + +#: ../../locales/../src/interface/FileZilla.cpp:148 +#: ../../locales/../src/interface/FileZilla.cpp:163 +#: ../../locales/../src/interface/FileZilla.cpp:166 +msgid "Failed to change language" +msgstr "Dil dəyişdirilməyib" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "8 bit xarakte əmrini dəyişdirə bilmədi" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 +msgid "Failed to copy or move sites" +msgstr "Saytların surəti çıxarılmadı və ya daşına bilmədi" + +#: ../../locales/../src/interface/xmlfunctions.cpp:328 +msgid "Failed to create backup copy of xml file" +msgstr "XML faylının ehtiyat nüsxəsini yaratmaq uğursuz oldu" + +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "%dportunda soket dinlənməsini yaratmaq mümkün olmadı. Ləğv edilir." + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 +msgid "Failed to create listening socket for active mode transfer" +msgstr "Aktiv rejimi köçürmələri üçün dinləmək səsi yaradılmadı" + +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Server parolunun şifrələməsi uğursuz oldu." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 +msgid "Failed to get 'My Documents' path" +msgstr "'Sənədlərim' yolunu ala bilmədi" + +#: ../../locales/../src/interface/LocalTreeView.cpp:635 +msgid "Failed to get desktop path" +msgstr "Masaüstü yolunu ala bilmədi" + +#: ../../locales/../src/interface/netconfwizard.cpp:969 +msgid "Failed to get peer address of control connection, connection closed." +msgstr "Kontrol bağlantısının eynilik ünvanını əldə etməmiş, qoşulma bağlandı." + +#: ../../locales/../src/interface/netconfwizard.cpp:976 +msgid "Failed to get peer address of data connection, connection closed." +msgstr "" +"Məlumat bağlantısının eynilik ünvanını əldə etmədi, bağlantısı bağlandı." + +#: ../../locales/../src/interface/context_control.cpp:86 +msgid "Failed to initialize FTP engine" +msgstr "FTP mühərrikini işə salmaq uğursuz oldu" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:120 +msgid "Failed to initialize TLS." +msgstr "TLS başladıla bilmədi." + +#: ../../locales/../src/interface/FileZilla.cpp:95 +msgid "Failed to initialize networking" +msgstr "Şəbəkə işə salınmadı" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:146 +msgid "Failed to load panels, invalid resource files?" +msgstr "Panellər yüklənmədi, etibarsız resurs faylları xətalıdır ?" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#, c-format +msgid "Failed to load private key: %s" +msgstr "Şəxsi düyməni yükləməmiş: %s" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 +#, c-format +msgid "Failed to open \"%s\" for appending/writing" +msgstr "Əlavə etmək / yazmaq üçün \"%s\" açılmadı" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:138 +#, c-format +msgid "Failed to open \"%s\" for reading" +msgstr "Oxumaq üçün \"%s\" açılmadı" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 +#, c-format +msgid "Failed to open \"%s\" for writing" +msgstr "Yazı üçün \"%s\" açılmadı" + +#: ../../locales/../src/engine/ControlSocket.cpp:345 +msgid "Failed to parse returned path." +msgstr "Qaytarılmış yolu təhlil etmək mümkün olmadı." + +#: ../../locales/../src/interface/netconfwizard.cpp:1028 +msgid "Failed to receive data" +msgstr "Məlumat almaq mümkün olmadı" + +#: ../../locales/../src/engine/ControlSocket.cpp:186 +msgid "Failed to retrieve directory listing" +msgstr "Qovluq siyahısını almaq olmadı" + +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Xarici IP ünvanını ala bilmədikdə, imtina edilir." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" +msgstr "Yerli ünvandan istifadə edərək, xarici IP ünvanı alınmadı" + +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Yerli IP ünvanını ala bilmədikdə, imtina edilir." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Yerli IP ünvanını ala bilmədi." + +#: ../../locales/../src/interface/netconfwizard.cpp:638 +msgid "Failed to retrieve the external IP address." +msgstr "Xarici IP ünvanını ala bilmədi." + +#: ../../locales/../src/interface/netconfwizard.cpp:323 +msgid "Failed to send command." +msgstr "Komanda göndərmək uğursuz oldu." + +#: ../../locales/../src/interface/FileZilla.cpp:163 +#, c-format +msgid "Failed to set language to %s (%s), using default system language" +msgstr "" +"Varsayılan sistem dilini istifadə edərək, %s (%s ) dilini təyin etmək " +"uğursuz oldu" + +#: ../../locales/../src/interface/FileZilla.cpp:140 +#, c-format +msgid "" +"Failed to set language to %s (%s), using default system language (%s, %s)." +msgstr "" +"Dil %s (%s) olaraq dəyişdirilə bilmədi, sistem default dili istidafə edəcək " +"(%s,%s) ." + +#: ../../locales/../src/interface/FileZilla.cpp:127 +#, c-format +msgid "Failed to set language to %s (%s), using default system language." +msgstr "" +"Varsayılan sistem dilini istifadə edərək,%s (%s) dilini təyin etmək uğursuz " +"oldu." + +#: ../../locales/../src/interface/FileZilla.cpp:166 +#, c-format +msgid "Failed to set language to %s, using default system language" +msgstr "Dil %s olaraq dəyişdirilə bilmir, sistem default dili istifadə edəcək" + +#: ../../locales/../src/interface/FileZilla.cpp:135 +#, c-format +msgid "Failed to set language to %s, using default system language (%s, %s)." +msgstr "" +"Dil %s olaraq dəyişdirilə bilmir, sistem default dili istifadə edəcək (%s," +"%s)." + +#: ../../locales/../src/interface/FileZilla.cpp:123 +#, c-format +msgid "Failed to set language to %s, using default system language." +msgstr "Dil%s olaraq dəyişdirilə bilmir, sistem default dili istifadə edəcək." + +#: ../../locales/../src/interface/settings/optionspage.cpp:212 +msgid "Failed to validate settings" +msgstr "Ayarları doğrulamadı" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1385 +msgid "Failed to verify peer certificate" +msgstr "Eynilik sertifikatı doğrulamadı" + +#: ../../locales/../src/engine/http/filetransfer.cpp:211 +#, c-format +msgid "Failed to write to file %s" +msgstr "%s faylına yazıla bilmədi" + +#: ../../locales/../src/interface/xmlfunctions.cpp:341 +msgid "Failed to write xml file" +msgstr "XML faylına yazıla bilmədi" + +#: ../../locales/../src/interface/queueview_failed.cpp:16 +msgid "Failed transfers" +msgstr "Transferlər uğursuz oldu" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 +msgid "Fall back to active mode" +msgstr "Aktiv rejimə geri qayıdın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 +msgid "Fil&e:" +msgstr "Fa&yl:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 +msgid "Fil&es" +msgstr "Fayllar" + +#: ../../locales/../src/interface/filelistctrl.cpp:268 +msgid "File" +msgstr "Fayl" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "File Types" +msgstr "Fayl tipləri" + +#: ../../locales/../src/engine/socket.cpp:1077 +msgid "File descriptor not a socket" +msgstr "Fayl təsvirçisi bir yuva deyil" + +#: ../../locales/../src/interface/import.cpp:107 +msgid "File does not contain any importable data." +msgstr "Faylda hər hansı bir məlumat verilə bilməz." + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 +msgid "File editing" +msgstr "Faylın redaktə edilməsi" + +#: ../../locales/../src/interface/RemoteListView.cpp:1631 +msgid "File exists" +msgstr "Fayl mövcuddur" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 +msgid "File exists action" +msgstr "Faylda hərəkət var" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 +msgid "File has changed" +msgstr "Fayl dəyişdi" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 +msgid "File lists" +msgstr "Fayl siyahıları" + +#: ../../locales/../src/engine/storj/resolve.cpp:105 +#: ../../locales/../src/engine/storj/resolve.cpp:176 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:707 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 +msgid "File not found" +msgstr "Fayl tapılmadı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:703 +#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/toolbar.cpp:53 +msgid "File search" +msgstr "Fayl axtarış" + +#: ../../locales/../src/engine/ControlSocket.cpp:101 +msgid "File transfer aborted by user" +msgstr "Fayl köçürmələri istifadəçi tərəfindən ləğv olundu" + +#: ../../locales/../src/engine/ControlSocket.cpp:89 +#, c-format +msgid "File transfer aborted by user after transferring %s in %s" +msgstr "%s/%s köçürülmüşkən istifadəçi faylı köçürməkdən imtina etdi" + +#: ../../locales/../src/engine/ControlSocket.cpp:115 +msgid "File transfer failed" +msgstr "Fayl ötürməsi uğursuz oldu" + +#: ../../locales/../src/engine/ControlSocket.cpp:95 +#, c-format +msgid "File transfer failed after transferring %s in %s" +msgstr "%s ötürüldükdən sonra %s köçürülmıəsi uğursuz oldu" + +#: ../../locales/../src/engine/ControlSocket.cpp:108 +msgid "File transfer skipped" +msgstr "Fayl transferi atlandı" + +#: ../../locales/../src/engine/ControlSocket.cpp:105 +msgid "File transfer successful" +msgstr "Faylın ötürülməsi uğurla başa çatdı" + +#: ../../locales/../src/engine/ControlSocket.cpp:86 +#, c-format +msgid "File transfer successful, transferred %s in %s" +msgstr "" +"Faylın müvəffəqiyyətli transfer olması %s-də %s müddətində transfer " +"olunmuşdur" + +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +msgid "File transfers still in progress." +msgstr "Fayl ötürməsi hələ də davam edir." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 +msgid "File would transfer with ASCII data type." +msgstr "Fayl ASCII məlumat növü ilə ötürüləcək." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 +msgid "File would transfer with binary data type." +msgstr "Fayl, ikili məlumat növü ilə ötürüləcək." + +#: ../../locales/../src/interface/FileZilla.cpp:429 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 +msgid "FileZilla Error" +msgstr "FileZilla xətası" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 +msgid "" +"FileZilla can now test your configuration to ensure everything is configured " +"properly." +msgstr "" +"FileZilla artıq konfiqurasiya parametrlərini hər şeyi düzgün şəkildə " +"konfiqurasiya etmək üçün test edə bilər." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 +msgid "FileZilla is already connected to a server." +msgstr "FileZilla artıq serverə bağlıdır." + +#: ../../locales/../src/interface/Mainfrm.cpp:1540 +msgid "FileZilla needs to be restarted for the language change to take effect." +msgstr "" +"Dil dəyişikliyinə təsir göstərməsi üçün FileZilla yenidən başlamalıdır." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 +msgid "FileZilla updates" +msgstr "FileZilla yeniləmələri" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 +msgid "Filelist status &bars" +msgstr "Fayl siyahısı statusu çubuqları" + +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:286 +#: ../../locales/../src/interface/RemoteListView.cpp:393 +#: ../../locales/../src/interface/search.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 +msgid "Filename" +msgstr "Fayl adı" + +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 +#, c-format +msgid "Filename cannot be constructed for directory %s and filename %s" +msgstr "Fayl adı %s qovluğu və %s faylı adı üçün yaradıla bilməz" + +#: ../../locales/../src/interface/RemoteListView.cpp:1619 +msgid "Filename invalid" +msgstr "Fayl adı etibarsızdır" + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 +msgid "Filename unchanged" +msgstr "Fayl adı etibarsızdır" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 +msgid "Filename:" +msgstr "Fayl adı:" + +#: ../../locales/../src/interface/file_utils.cpp:315 +msgid "Filenames may not contain any of the following characters: / * ? < > |" +msgstr "Fayl adları aşağıdakı simvollardan birini ehtiva edə bilməz: / *? <> |" + +#: ../../locales/../src/interface/file_utils.cpp:290 +msgid "" +"Filenames may not contain any of the following characters: / \\ : * ? \" < > " +"|" +msgstr "" +"Fayl adları aşağıdakı simvollardan birini ehtiva edə bilməz: / \\: *? \"<>" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 +msgid "Files currently being edited" +msgstr "Hazırda fayllar redaktə olunur" + +#: ../../locales/../src/engine/storj/resolve.cpp:313 +msgid "Files not found" +msgstr "Fayllar tapılmadı" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:394 +#: ../../locales/../src/interface/search.cpp:156 +msgid "Filesize" +msgstr "Ölçü" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 +msgid "Filesize format" +msgstr "Fayl formatı" + +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:157 +msgid "Filetype" +msgstr "Fayl tipi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 +msgid "Filetype associations" +msgstr "Fayl tipi dərnəkləri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 +msgid "Filter applies to:" +msgstr "Filtr bunlara tətbiq olunsun:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 +msgid "Filter invalid characters in filenames" +msgstr "Fayl adlarında etibarsız simvolları süzün" + +#: ../../locales/../src/interface/filteredit.cpp:149 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 +msgid "Filter name already exists" +msgstr "Eyni adlı süzgəc artıq mövcuddur" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 +msgid "Filter out items matching all of the following" +msgstr "Aşağıdakıların hamısına uyğun maddələr süzün" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 +msgid "Filter out items matching any of the following" +msgstr "Aşağıdakılardan hər hansı birinə uyğun maddələr süzün" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 +msgid "Filter out items matching none of the following" +msgstr "Aşağıdakılardan heç birinə uyğun olmayan maddələr süzün" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Aşağıdakıların hamısına uyğun olmayan maddələr süzün" + +#: ../../locales/../src/interface/filter.cpp:243 +#: ../../locales/../src/interface/filter.cpp:303 +msgid "Filter set already exists" +msgstr "Eyni adlı süzgəc artıq mövcuddur" + +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Filter the directory listings" +msgstr "Qovluq siyahılarını süzün" + +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 +msgid "Filter validation failed" +msgstr "Filtr verilməsi uğursuz oldu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 +msgid "Find &files" +msgstr "Faylları tapın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 +msgid "Find d&irectories" +msgstr "Qovluqları axtarın" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 +msgid "Fingerprint (SHA-1):" +msgstr "Barmaq izi (SHA-1):" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 +msgid "Fingerprint (SHA-256):" +msgstr "Barmaq izi (SHA-256):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Barmaq izləri:" + +#: ../../locales/../src/interface/netconfwizard.cpp:54 +msgid "Firewall and router configuration wizard" +msgstr "Güvənlik divarıvə idarəedici ayar köməkçisi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 +msgid "" +"For more detailed information about what these options do, please run the " +"network configuration wizard." +msgstr "" +"Bu variantların nə işə yaradığını daha yaxşı anlamaq üçün şəbəkə " +"konfiqurasiya yardımçısını isifadə edin." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 +msgid "For reliability you should specify a range of at least 10 ports." +msgstr "Etibarlılıq üçün ən azı 10 limanlıq bir sıra göstərməlisiniz." + +#: ../../locales/../src/interface/Options.cpp:246 +msgid "" +"For this session the default settings will be used. Any changes to the " +"settings will not be saved." +msgstr "" +"Bu sessiya üçün standart parametrlər istifadə olunacaq. Ayarlardaki hər " +"hansı dəyişiklik saxlanmayacaq." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 +msgid "Force &UTF-8" +msgstr "UTF-8 gücləndirin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 +msgid "Force showing &hidden files" +msgstr "Gizli faylları göstərməyə məcbur edir" + +#: ../../locales/../src/interface/Mainfrm.cpp:709 +msgid "Force showing hidden files" +msgstr "Gizli faylları göstərməyə məcbur edir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 +msgid "Format specifications:" +msgstr "Formatın xüsusiyyətləri:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 +msgid "Format: Extension followed by properly quoted command and arguments." +msgstr "" +"Format: Düzəliş əmrləri və arqumentləri izlədikdən sonra genişləndirilməsi." + +#. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n +#: ../../locales/../src/interface/updater.cpp:687 +#, c-format +msgid "Found new %s %s\n" +msgstr "Yeni %s %s tapıldı\n" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "%s tamamlana bilmədi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 +msgid "Further documentation" +msgstr "Əlavə sənədlər" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 +msgid "General" +msgstr "Ümumi" + +#: ../../locales/../src/engine/proxy.cpp:492 +msgid "General SOCKS server failure" +msgstr "Ümumi SOCKS server çatışmazlığı" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Yarat ..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 +msgid "Generic proxy" +msgstr "Ümumi proxy" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 +msgid "Get external IP address from the following URL:" +msgstr "Aşağıdakı URL'dən xarici IP ünvanı alın:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 +msgid "Getting help" +msgstr "Kömək almaq" + +#: ../../locales/../src/interface/filter.cpp:243 +#: ../../locales/../src/interface/filter.cpp:303 +msgid "Given filterset name already exists, overwrite filter set?" +msgstr "Eyni adlı filtr dəsti artıq mövcuddur, üzərinə yazılsın ?" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 +msgid "Global bookmarks" +msgstr "Qlobal əlfəcinlər" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:316 +#, c-format +msgid "GnuTLS error %d" +msgstr "GnuTLS xətası %d" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:319 +#, c-format +msgid "GnuTLS error %d in %s" +msgstr "GnuTLS xətası %d, %s içərisində" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:311 +#, c-format +msgid "GnuTLS error %d in %s: %s" +msgstr "GnuTLS xətası %d, %s içərisində: %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:308 +#, c-format +msgid "GnuTLS error %d: %s" +msgstr "GnuTLS xətası %d: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 +msgid "GnuTLS:" +msgstr "GnusTLS:" + +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Yaşıl" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +msgid "Group permissions" +msgstr "Qrup icazələri" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +msgid "H&igh" +msgstr "&Yüksək" + +#: ../../locales/../src/engine/server.cpp:23 +msgid "HTTPS - HTTP over TLS" +msgstr "HTTPS - HTTP üzərindən TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 +msgid "Hash:" +msgstr "Karma:" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 +msgid "Hidden" +msgstr "Gizli" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:891 +#: ../../locales/../src/interface/queue.cpp:947 +msgid "High" +msgstr "Yüksək" + +#: ../../locales/../src/interface/queue.cpp:893 +#: ../../locales/../src/interface/queue.cpp:949 +msgid "Highest" +msgstr "Ən yüksək" + +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 +msgid "Highest available port has to be a number between 1024 and 65535." +msgstr "Ən yüksək liman 1024 və 65535 arasında olmalıdır." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 +msgid "" +"Hold the shift key to toggle the filter state on both sides simultaneously." +msgstr "" +"Şəffaflıq düyməsini hər iki tərəfin eyni anda filter vəziyyətini dəyişdirmək " +"üçün saxlayın." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +msgid "Homepage:" +msgstr "Əsas səhifə:" + +#: ../../locales/../src/engine/socket.cpp:1088 +msgid "Host is down" +msgstr "Server işləmir" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 +msgid "Host key mismatch" +msgstr "Serverin əsas uyğunsuzluğu" + +#: ../../locales/../src/interface/serverdata.cpp:103 +msgid "Host starts with '[' but no closing bracket found." +msgstr "Server adı '[' ilə başlayır amma bağlama mötərizəsi tapılmadı." + +#: ../../locales/../src/engine/proxy.cpp:501 +msgid "Host unreachable" +msgstr "Serverə bağlanmır" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 +msgid "Host:" +msgstr "Server:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Server açar alqoritmi:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 +msgid "Hours," +msgstr "Saat," + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "Ana şifrəmi unutdum. Bu düymə ilə saxlanan bütün parolları silin." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +msgid "I&SO 8601 (example: 15:47)" +msgstr "I&SO 8601 (məsələn: 15:47)" + +#: ../../locales/../src/engine/proxy.cpp:118 +msgid "IPv6 addresses are not supported with SOCKS4 proxy" +msgstr "IPv6 ünvanları SOCKS4 proxy ilə dəstəklənmir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 +msgid "" +"If no data is sent or received during an operation for longer than the " +"specified time, the connection will be closed and FileZilla will try to " +"reconnect." +msgstr "" +"Əməliyyat zamanı göstərilən müddətdən daha uzun müddət ərzində heç bir " +"məlumat göndərilmədikdə və ya alınmadıqda, əlaqə bağlanacaq və FileZilla " +"yenidən bağlanmağa çalışacaq." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 +msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." +msgstr "Hesabat səhvləri varsa, \"Verbose\" günlük səviyyəsini qeyd edin." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 +msgid "" +"If the automatic test at the end of this wizard succeeds, but you cannot " +"transfer files to a particular server, the server might be misconfigured and " +"you should try active mode. You can set the transfer mode on a per-server " +"basis in the Site Manager." +msgstr "" +"Bu yardımçının sonunda avtomatik test müvəffəqiyyətli olarsa, ancaq faylları " +"müəyyən bir serverə ötürə bilmirsinizsə, server səhv düzəldilmiş ola bilər " +"və aktiv rejimi sınamağınız ölazım gələ bilər. Transfer rejimini hər bir " +"server əsasında Sayt menecerində təyin edə bilərsiniz." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 +msgid "" +"If the fallback option is enabled, you will be able to connect to " +"misconfigured servers which reject the selected transfer mode." +msgstr "" +"Yeniləmə seçimi aktiv olduqda, seçilmiş ötürmə rejimini rədd edən yanlış " +"konfiqurasiya edilmiş serverlərə qoşula bilərsiniz." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +msgid "" +"If the host key change was not expected, please contact the server " +"administrator." +msgstr "" +"Ev sahibinin əsas dəyişikliyi gözlənilmirsə, server administratoruna " +"müraciət edin." + +#: ../../locales/../src/interface/netconfwizard.cpp:575 +msgid "" +"If the problem persists, some router and/or firewall keeps blocking " +"FileZilla." +msgstr "" +"Problem davam edərsə, bir idarəçi və ya güvənlik divarı FileZilla-ya maneə " +"törədir." + +#: ../../locales/../src/interface/netconfwizard.cpp:584 +msgid "" +"If the problem persists, some router and/or firewall keeps interrupting the " +"connection." +msgstr "" +"Problem davam edərsə, bir idarəçi və ya güvənlik divarı əlaqəni kəsməyi " +"davam etdirir." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 +msgid "" +"If the size of the logfile reaches the limit, it gets renamed by adding " +"\".1\" to the end of the filename (possibly overwriting older logfiles) and " +"a new file gets created." +msgstr "" +"Günlük faylının ölçüsü limitə çatdıqda, faylın sonuna (ehtimal ki, köhnə " +"günlük faylların üzərinə yazıla bilər) \".1\" əlavə edərək adını dəyişir və " +"yeni bir fayl yaradılır." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 +msgid "" +"If the symlink points to a directory, FileZilla can either delete the " +"symbolic link or remove the contents of the linked directory." +msgstr "" +"Sembolik bir qovluğu göstərirsə, FileZilla siqnal linkini silə bilər və ya " +"əlaqəli qovluğun məzmununu çıxara bilər." + +#: ../../locales/../src/interface/netconfwizard.cpp:646 +msgid "" +"If this problem persists, please contact your router or firewall " +"manufacturer for a solution." +msgstr "" +"Bu problem davam edərsə, həll üçün yönleədirici və ya güvənlik divarı " +"istehsalçısı ilə əlaqə saxlayın." + +#: ../../locales/../src/interface/netconfwizard.cpp:604 +msgid "If this problem stays, please contact your router manufacturer." +msgstr "Bu problem qalırsa, marşrutlaşdırma istehsalçınızla əlaqə saxlayın." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 +msgid "" +"If using 'overwrite if newer', your system time has to be synchronized with " +"the server. If the time differs (e.g. different timezone), specify a " +"timezone offset in the site manager." +msgstr "" +"'Yenidən yazma' istifadə edərsə, sisteminizin saatı server ilə " +"sinxronlaşdırılmalıdır. Vaxt dəyişkəndirsə (məsələn, müxtəlif vaxt zonası), " +"sayt menecerində vaxt zonasını müəyyənləşdirin." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 +msgid "" +"If using timestamp based comparison, consider two files equal if their " +"timestamp difference does not exceed this threshold." +msgstr "" +"Zaman damgası əsaslı müqayisələrdən istifadə edərkən, zaman damgası fərqinin " +"bu ərəfəni aşmadığı halda iki faylın bərabər olduğunu düşünün." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 +msgid "If you change the language, you need to restart FileZilla." +msgstr "Dil dəyişdirirsinizsə, FileZilla-nı yenidən başlatmalısınız." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 +msgid "" +"If you click on test, FileZilla will connect to probe.filezilla-project.org " +"and will perform some simple tests." +msgstr "" +"Testi basarsanız, FileZilla probe.filezilla-project.org saytına qoşulacaq və " +"bəzi sadə testlər aparacaq." + +#: ../../locales/../src/interface/Mainfrm.cpp:1255 +msgid "If you close FileZilla, your changes will be lost." +msgstr "FileZilla'yı bağlasanız, dəyişiklikləriniz silinəcəkdir." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 +msgid "" +"If you enter the wrong filetypes, those files may get corrupted when " +"transferred." +msgstr "Xətalı yazılan fayl tipləri transfer zamanı pozula bilər." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 +msgid "If you get any errors, your configuration is not correct." +msgstr "Hər hansı bir səhv varsa, konfiqurasiya düzgün deyil." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 +msgid "" +"If you have problems to retrieve directory listings or to transfer files, " +"try to change the default transfer mode." +msgstr "" +"Qovluq siyahılarını almaq və ya faylları köçürmək üçün probleminiz varsa, " +"standart transfer rejimini dəyişməyə çalışın." + +#: ../../locales/../src/interface/netconfwizard.cpp:591 +msgid "" +"If you keep having problems with a specific server, the server itself or a " +"remote router or firewall might be misconfigured. In this case try to toggle " +"passive mode and contact the server administrator for help." +msgstr "" +"Müəyyən bir server ilə problem yaşamırsınızsa, server özü və ya idarəedici " +"ya da təhlükəsizlik divarı yanlış quraşdırıla bilər. Bu halda passiv " +"rejimini dəyişdirməyə çalışın və kömək üçün server administratoruna müraciət " +"edin." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 +msgid "" +"If you successfully complete the wizard and the final test succeeds, any " +"firewalls and routers you have should be configured properly." +msgstr "" +"Yardımçını müvəffəqiyyətlə tamamladığınızda və son test müvəffəqiyyətli " +"olubsa etdiyiniz hər hansı bir təhlükəsizlik divarı və marşrutçu düzgün " +"qurulmamışdır deməkdir." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 +msgid "" +"If you use a firewall, make sure FileZilla is allowed to accept connection " +"on all given ports." +msgstr "" +"Bir təhlükəsizlik divarı istifadə etsəniz, FileZilla-nın bütün verilənlər " +"portlarında əlaqə qəbul etməyə icazə verdiyinə əmin olun." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 +msgid "" +"If you use a router, make sure all these ports are forwarded to the machine " +"you're running FileZilla on." +msgstr "" +"Bir idarəçi istifadə etsəniz, bütün bu limanların FileZilla-ı " +"çalıştırdığınız kompyuterə yönləndirdiyindən əmin olun." + +#: ../../locales/../src/interface/netconfwizard.cpp:617 +msgid "" +"If your router keeps changing the IP address, please contact your router " +"manufacturer." +msgstr "" +"Yönləndiriciniz IP ünvanını dəyişirsə, marşrutlaşdırma istehsalçınızla əlaqə " +"saxlayın." + +#: ../../locales/../src/interface/import.cpp:99 +msgid "Import data from older version" +msgstr "Köhnə versiyadan məlumatları idxal edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 +msgid "Import settings" +msgstr "İdxal parametrləri" + +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 +msgid "Import successful" +msgstr "İdxal uğurla başa çatdı" + +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 +msgid "Improperly quoted association." +msgstr "Düzgün olmayan bir dəlil." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 +msgid "" +"In active mode, FileZilla has to listen on a port for data transfers. You " +"have to specify which ports FileZilla will use." +msgstr "" +"Aktiv rejimdə, FileZilla məlumat köçürmələri üçün bir portu dinləməlidir. " +"FileZilla istifadə edəcək portları göstərməlisiniz." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 +msgid "" +"In case you have a router, you will have to forward all available ports, as " +"FileZilla has no influence on the ports your system chooses." +msgstr "" +"Bir yönləndiriciniz varsa, FileZilla sisteminizin seçdiyi limanlarında heç " +"bir təsiri olmadığından, mövcud olan hər bir limanı ötürmək məcburiyyətində " +"olacaqsınız." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 +msgid "" +"In order to use active mode, FileZilla needs to know your external IP " +"address." +msgstr "" +"Aktiv rejimi istifadə etmək üçün FileZilla xarici IP ünvanınızı bilməlidir." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:52 +msgid "" +"In passive mode, which is recommended for most users, FileZilla asks the " +"server for a port and connects to the given port. Not much configuration has " +"to be done for this." +msgstr "" +"Ən çox istifadəçilər üçün tövsiyə olunan passiv rejimdə, FileZilla bir port " +"üçün server soruşur və verilən porta bağlanır. Bunun üçün çox konfiqurasiya " +"edilməlidir." + +#: ../../locales/../src/interface/queue.cpp:336 +msgid "Incorrect password" +msgstr "Şifrə yanlışdır" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 +msgid "" +"Information about the latest version of FileZilla could not be retrieved. " +"Please try again later." +msgstr "" +"FileZilla-nın son versiyası haqqında məlumat alınmayıb. Zəhmət olmasa bir az " +"sonra yenə cəhd edin." + +#: ../../locales/../src/engine/ftp/logon.cpp:248 +msgid "Initializing TLS..." +msgstr "TLS-i başlatma ..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Təhlükəli alqoritm!" + +#: ../../locales/../src/engine/ftp/logon.cpp:233 +msgid "Insecure server, it does not support FTP over TLS." +msgstr "Təhlükəli server, TLS-də FTP-ni dəstəkləmir." + +#: ../../locales/../src/engine/server.cpp:578 +#: ../../locales/../src/engine/server.cpp:602 +#: ../../locales/../src/interface/manual_transfer.cpp:182 +msgid "Interactive" +msgstr "İnteraktiv" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 +msgid "Interface" +msgstr "İnterfeys" + +#: ../../locales/../src/engine/socket.cpp:1074 +msgid "Interrupted by signal" +msgstr "Siqnal ilə kəsildi" + +#: ../../locales/../src/engine/ControlSocket.cpp:216 +#: ../../locales/../src/interface/queue.cpp:342 +msgid "Interrupted by user" +msgstr "İstifadəçi tərəfindən kəsildi" + +#: ../../locales/../src/engine/http/request.cpp:36 +#: ../../locales/../src/engine/http/request.cpp:381 +msgid "Invalid Content-Length" +msgstr "Invalid Content-Length" + +#: ../../locales/../src/engine/http/request.cpp:276 +msgid "Invalid HTTP Response" +msgstr "Yanlış HTTP Cavabı" + +#: ../../locales/../src/engine/socket.cpp:1062 +msgid "Invalid argument passed" +msgstr "Yanlış arqument qəbul edildi" + +#: ../../locales/../src/engine/ControlSocket.cpp:454 +msgid "" +"Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " +"site manager to force UTF-8." +msgstr "" +"UTF-8-i ləğv edərək, yanlış xarakterli sıra alındı. UTF-8 məcbur etmək üçün " +"sayt menecerində UTF-8 seçimini seçin." + +#: ../../locales/../src/engine/http/request.cpp:497 +msgid "Invalid chunk size" +msgstr "Yanlış yığın ölçüsü" + +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 +msgid "Invalid data received" +msgstr "Yanlış məlumat alındı" + +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 +msgid "Invalid date" +msgstr "Yanlış tarix" + +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 +msgid "Invalid filename" +msgstr "Yanlış fayl adı" + +#: ../../locales/../src/interface/serverdata.cpp:108 +msgid "Invalid host, after closing bracket only colon and port may follow." +msgstr "" +"Yanlış server bağlama nöqtəsindən sonra yalnız kolon və liman təqib edə " +"bilər." + +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Yanlış server adı: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "Invalid input" +msgstr "Yanlış giriş" + +#: ../../locales/../src/engine/http/request.cpp:334 +msgid "Invalid line" +msgstr "Yanlış sətir" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Yanlış yol" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 +msgid "Invalid port given. The port has to be a value from 1 to 65535." +msgstr "Yanlış liman verildi. Liman 1 ilə 65535 arasında bir dəyər olmalıdır." + +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 +msgid "" +"Invalid protocol specified. Valid protocols are:\n" +"ftp:// for normal FTP with optional encryption,\n" +"sftp:// for SSH file transfer protocol,\n" +"ftps:// for FTP over TLS (implicit) and\n" +"ftpes:// for FTP over TLS (explicit)." +msgstr "" +"Yanlış protokol göstərildi. Valid protokollar:\n" +"Ftp: // isteğe bağlı şifrələmə ilə normal FTP üçün,\n" +"Sftp: // SSH fayl ötürülməsi protokolu üçün,\n" +"Ftps: // TLS (örtülü) və FTP üzərindən\n" +"Ftpes: // TLS üzərindən FTP üçün (açıq)." + +#: ../../locales/../src/engine/ftp/logon.cpp:70 +msgid "" +"Invalid proxy host, after closing bracket only colon and port may follow." +msgstr "" +"Yanlış proxy serverə bağlanandan sonra mötərizə yalnız kolon və portu izləyə " +"bilər." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Yanlış müntəzəm ifadə" + +#: ../../locales/../src/interface/search.cpp:708 +msgid "Invalid regular expression in search conditions." +msgstr "Invalid regular expression in search conditions." + +#: ../../locales/../src/engine/http/request.cpp:285 +msgid "Invalid response code" +msgstr "Yanlış cavab kodu" + +#: ../../locales/../src/interface/search.cpp:703 +#, c-format +msgid "Invalid search conditions: %s" +msgstr "Yanlış axtarış şərtləri: %s" + +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 +msgid "Invalid site path" +msgstr "Yanlış sayt yolu" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 +msgid "Invalid size in condition" +msgstr "Vəziyyətdə yararsız ölçü" + +#: ../../locales/../src/interface/serverdata.cpp:79 +msgid "Invalid username given." +msgstr "Verilən istifadəçi adı etibarsızdır." + +#: ../../locales/../src/engine/socket.cpp:1095 +msgid "Invalid value for ai_flags" +msgstr "Ai_flags üçün yararsız dəyər" + +#: ../../locales/../src/engine/socket.cpp:1097 +msgid "Invalid value for hints" +msgstr "Göstərişlər üçün yanlış dəyər" + +#: ../../locales/../src/interface/verifycertdialog.cpp:254 +msgid "Jurisdiction country:" +msgstr "Səlahiyyətli ölkə:" + +#: ../../locales/../src/interface/verifycertdialog.cpp:256 +msgid "Jurisdiction locality:" +msgstr "Səlahiyyətli yer:" + +#: ../../locales/../src/interface/verifycertdialog.cpp:255 +msgid "Jurisdiction state or province:" +msgstr "Səlahiyyətli şəhər:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 +msgid "Keep directories on top" +msgstr "Qovluqları yuxarıda tutun" + +#: ../../locales/../src/interface/Mainfrm.cpp:713 +msgid "" +"Keep in mind that not all servers support this feature and may return " +"incorrect listings if this option is enabled. Although FileZilla performs " +"some tests to check if the server supports this feature, the test may fail." +msgstr "" +"Bütün serverlər bu funksiyanı dəstəkləməyəcəyini və bu seçim effektiv " +"olduqda yanlış siyahıları qoya biləcəyini unutmayın. FileZilla serverın bu " +"funksiyanı dəstəkləməyəcəyini yoxlamaq üçün bəzi testlər keçirsə də, test " +"uğursuz ola bilər." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 +msgid "Key exchange" +msgstr "Açar mübadilə" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 +msgid "Key exchange:" +msgstr "Açar mübadiləsi:" + +#: ../../locales/../src/engine/server.cpp:575 +#: ../../locales/../src/engine/server.cpp:600 +msgid "Key file" +msgstr "Açar fayl" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Açar identifikator:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 +msgid "L&owest" +msgstr "&Ən aşağı" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 +msgid "Language" +msgstr "Dil" + +#: ../../locales/../src/interface/Mainfrm.cpp:1540 +msgid "Language changed" +msgstr "Dil dəyişdi" + +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:158 +msgid "Last modified" +msgstr "Sonuncu dəyişiklik" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 +msgid "Layout" +msgstr "Yer" + +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1803 +msgid "Leave empty to keep existing password." +msgstr "Mövcud parolu saxlamaq üçün boş buraxın." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 +msgid "Limit for concurrent &downloads:" +msgstr "Eşzamanlı yüklənmə limitləri:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 +msgid "Limit for concurrent &uploads:" +msgstr "Birlikdə yüklənmələr üçün məhdudlaşdırma:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 +msgid "Limit local ports" +msgstr "Yerli limanları məhdudlaşdırın" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 +msgid "Limit size of logfile" +msgstr "Günlük faylının ölçüsünü məhdudlaşdırın" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +msgid "Limit:" +msgstr "Limit:" + +#: ../../locales/../src/engine/http/request.cpp:450 +msgid "Line length exceeded" +msgstr "Sətir uzunluğu aşıldı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 +msgid "Linked against" +msgstr "Qarşılıqlı əlaqə" + +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 +msgid "Listen socket closed" +msgstr "Dinləmə soketi qapandı" + +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:374 +msgid "Listing:" +msgstr "Sıralama:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 +msgid "Lo&west available port:" +msgstr "Ən aşağı mövcud liman:" + +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 +msgid "Local" +msgstr "Yerli" + +#: ../../locales/../src/engine/socket.cpp:1059 +msgid "Local address in use" +msgstr "İstifadə edilən yerli ünvan" + +#: ../../locales/../src/engine/socket.cpp:1087 +msgid "Local endpoint has been closed" +msgstr "Yerli son nöqtə bağlanıb" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 +msgid "Local file" +msgstr "Yerli fayl" + +#: ../../locales/../src/interface/manual_transfer.cpp:304 +msgid "Local file does not exist." +msgstr "Yerli fayl yoxdur." + +#: ../../locales/../src/interface/updater.cpp:401 +#: ../../locales/../src/interface/updater.cpp:494 +#, c-format +msgid "Local file is %s\n" +msgstr "Yerli fayl %s\n" + +#: ../../locales/../src/interface/manual_transfer.cpp:300 +msgid "Local file is a directory instead of a regular file." +msgstr "Yerli fayl müntəzəm fayl deyil bir qovluqdur." + +#: ../../locales/../src/interface/manual_transfer.cpp:344 +msgid "Local file is not a valid filename." +msgstr "Yerli fayl düzgün bir fayl adı deyil." + +#: ../../locales/../src/interface/search.cpp:666 +#: ../../locales/../src/interface/search.cpp:672 +msgid "Local file search" +msgstr "Yerli fayl axtarışı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 +msgid "Local filters:" +msgstr "Yerli filtrlər:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Yerli yolların idarə edilməsi:" + +#: ../../locales/../src/interface/viewheader.cpp:337 +msgid "Local site:" +msgstr "Yerli sayt:" + +#: ../../locales/../src/interface/verifycertdialog.cpp:248 +msgid "Locality:" +msgstr "Yer:" + +#: ../../locales/../src/interface/settings/optionspage_logging.cpp:97 +msgid "Log file" +msgstr "Günlük fayl" + +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Daxil oldum" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 +msgid "Logging" +msgstr "İstifadəçi adı" + +#: ../../locales/../src/engine/ftp/logon.cpp:302 +msgid "" +"Login data contains non-ASCII characters and server might not be UTF-8 " +"aware. Cannot fall back to local charset since using proxy." +msgstr "" +"Giriş məlumatları ASCII olmayan simvolları ehtiva edir və server UTF-8 " +"fərqində ola bilməz. Proxy istifadə edildikdən sonra yerli xarakter istifadə " +"edilə bilməz." + +#: ../../locales/../src/engine/ftp/logon.cpp:309 +msgid "" +"Login data contains non-ASCII characters and server might not be UTF-8 " +"aware. Trying local charset." +msgstr "" +"Giriş məlumatları ASCII olmayan simvolları ehtiva edir və server UTF-8 " +"fərqində ola bilməz. Yerli xarakter yoxlanılır." + +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "" +"Giriş sırası tamamilə yerinə yetirilməmişdir, daxil olunmadı, imtina edilir." + +#: ../../locales/../src/interface/cmdline.cpp:103 +msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." +msgstr "Logon növü 'xahiş' və ya 'interaktiv' olmalıdır (tirnoqsiz)." + +#: ../../locales/../src/interface/cmdline.cpp:11 +#, c-format +msgid "" +"Logontype, can only be used together with FTP URL. Argument has to be either " +"'%s' or '%s'" +msgstr "" +"Giriş növü, yalnız FTP URL ilə birlikdə istifadə edilə bilər. Argument '%s' " +"və ya '%s' olmalıdır" + +#: ../../locales/../src/interface/queue.cpp:886 +#: ../../locales/../src/interface/queue.cpp:942 +msgid "Low" +msgstr "Aşağı" + +#: ../../locales/../src/interface/queue.cpp:884 +#: ../../locales/../src/interface/queue.cpp:940 +msgid "Lowest" +msgstr "Ən aşağı" + +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 +msgid "Lowest available port has to be a number between 1024 and 65535." +msgstr "Ən aşağı mövcud liman 1024 və 65535 arasında bir sıra olmalıdır." + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 +msgid "MAC:" +msgstr "MAC:" + +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:38 +msgid "Make sure the file can be accessed and is a well-formed XML document." +msgstr "" +"Faylın əldə oluna biləcəyinə və yaxşı formalaşmış bir XML sənəd olduğuna " +"əmin olun." + +#: ../../locales/../src/engine/http/request.cpp:441 +#: ../../locales/../src/engine/http/request.cpp:450 +#: ../../locales/../src/engine/http/request.cpp:462 +#: ../../locales/../src/engine/http/request.cpp:497 +#, c-format +msgid "Malformed chunk data: %s" +msgstr "Səhv məlumat yığımı: %s" + +#: ../../locales/../src/engine/http/request.cpp:36 +#, c-format +msgid "Malformed request header: %s" +msgstr "Səhv istənməyən başlıq: %s" + +#: ../../locales/../src/engine/http/request.cpp:526 +#, c-format +msgid "Malformed response body: %s" +msgstr "Yanlış cavab verən quruluş: %s" + +#: ../../locales/../src/engine/http/request.cpp:249 +#: ../../locales/../src/engine/http/request.cpp:334 +#: ../../locales/../src/engine/http/request.cpp:373 +#: ../../locales/../src/engine/http/request.cpp:381 +#, c-format +msgid "Malformed response header: %s" +msgstr "Yanlış cavab başlığı: %s" + +#: ../../locales/../src/engine/http/request.cpp:394 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." +msgstr "" +"Yanlış cavab: Server, cevap orqanına cavab verən və ya cəza orqanına icazə " +"verməyən cavab kodunu göndərdi." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 +msgid "Manual transfer" +msgstr "Əl ilə transfer" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Master Şifrə:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Master şifrə:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 +msgid "Match all of the following" +msgstr "Aşağıdakıların hamısına uyğunlaşan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +msgid "Match any of the following" +msgstr "Aşağıdakılardan hər hansı birinə uyğunlaşan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 +msgid "Match none of the following" +msgstr "Aşağıdakılardan heç birinə uyğun gəlmir" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Aşağıdakıların heçbirinə uyğun gəlmir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 +msgid "Maximum simultaneous &transfers:" +msgstr "Maksimum sinxron transferlər:" + +#: ../../locales/../src/engine/socket.cpp:1101 +msgid "Memory allocation failure" +msgstr "Yaddaş ayırma uğursuzluğu" + +#: ../../locales/../src/interface/Mainfrm.cpp:434 +#: ../../locales/../src/interface/Mainfrm.cpp:1855 +msgid "Message log" +msgstr "Mesaj günlüyü" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +msgid "Message log position" +msgstr "Mesajın giriş vəziyyəti" + +#: ../../locales/../src/engine/socket.cpp:1084 +msgid "Message too large" +msgstr "Mesaj çox böyükdür" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 +msgid "MiB" +msgstr "MİB" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +msgid "Minutes" +msgstr "Dəqiqə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 +msgid "Move &down" +msgstr "Aşağı hərəkət" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 +msgid "Move &up" +msgstr "Yuxarı hərəkət" + +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 +msgid "My Computer" +msgstr "Kompyuter" + +#: ../../locales/../src/interface/LocalTreeView.cpp:995 +msgid "My Documents" +msgstr "Fayllarım" + +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:769 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:772 +msgid "My Sites" +msgstr "Saytlarım" + +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 +msgid "N/a" +msgstr "Yoxdur" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 +msgid "Name" +msgstr "Ad" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1261 +msgid "Name already exists" +msgstr "Ad artıq var" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +msgid "Name of bookmark already exists." +msgstr "Sevimlilərin adı artıq mövcuddur." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 +msgid "Name:" +msgstr "Ad:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +msgid "Natural sort" +msgstr "Təbii sort" + +#: ../../locales/../src/interface/filteredit.cpp:344 +msgid "Need to enter filter name" +msgstr "Filtrenin adını daxil etməlisiniz" + +#: ../../locales/../src/interface/search.cpp:666 +msgid "Need to enter valid local path" +msgstr "Müvafiq yerli yolunuzu daxil etməlisiniz" + +#: ../../locales/../src/interface/search.cpp:693 +msgid "Need to enter valid remote path" +msgstr "Müvafiq uzaq məsafəni daxil etməlisiniz" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1046 +msgid "Need to specify a character encoding" +msgstr "Bir xarakter kodlamasını göstərmək lazımdır" + +#: ../../locales/../src/engine/socket.cpp:1105 +msgid "Neither nodename nor servname provided, or not known" +msgstr "Təqdim edilən və ya xidmət adı verilmədi ya da bilinmir" + +#: ../../locales/../src/engine/socket.cpp:1092 +msgid "" +"Network host does not have any network addresses in the requested address " +"family" +msgstr "" +"Şəbəkə sahibinin istənilən ünvan ailəsində hər hansı bir şəbəkə ünvanı yoxdur" + +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 +msgid "Network unreachable" +msgstr "Şəbəkəyə çatılmır" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 +msgid "Never" +msgstr "Heç vaxt" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 +msgid "New &Folder" +msgstr "Qovluq əlavə et" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +msgid "New &tab" +msgstr "Yeni tab" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 +msgid "New Book&mark" +msgstr "Yeni əlfəcin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2412 +msgid "New bookmark" +msgstr "Yeni əlfəcin" + +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1337 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1264 +msgid "New directory" +msgstr "Yeni qovluq yarat" + +#: ../../locales/../src/interface/welcome_dialog.cpp:65 +#, c-format +msgid "New features and improvements in %s" +msgstr "%s-də yeni funksiyalar və təkmilləşdirmələr" + +#: ../../locales/../src/interface/filteredit.cpp:131 +msgid "New filter" +msgstr "Yeni filter" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:950 +msgid "New folder" +msgstr "Yeni qovluq yarat" + +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2385 +msgid "New site" +msgstr "Yeni sayt" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 +msgid "Next to the transfer queue" +msgstr "Transfer növbəsinin yanında" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:389 +msgid "No" +msgstr "Xeyr" + +#: ../../locales/../src/engine/socket.cpp:1103 +msgid "No address associated with nodename" +msgstr "Nodename ilə əlaqəli ünvan yoxdur" + +#: ../../locales/../src/interface/export.cpp:30 +msgid "No category to export selected" +msgstr "Seçilmiş ixracat üçün kateqoriya yoxdur" + +#: ../../locales/../src/interface/QueueView.cpp:1862 +msgid "No command given, aborting." +msgstr "Heç bir əmr verilməmişdir." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 +msgid "No external IP address set, trying default." +msgstr "Standart olmayan bir xarici IP ünvanı müəyyən edilib." + +#: ../../locales/../src/interface/edithandler.cpp:1125 +msgid "No files are currently being edited." +msgstr "Hazırda heç bir fayl redaktə edilmir." + +#: ../../locales/../src/interface/filteredit.cpp:143 +msgid "No filter name given" +msgstr "Filtr adı verilməmişdir" + +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 +msgid "No host given, please enter a host." +msgstr "Verilən server yoxdur, xahiş edirik bir server daxil edin." + +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 +msgid "No images available" +msgstr "Şəkil yoxdur" + +#: ../../locales/../src/interface/filter.cpp:227 +#: ../../locales/../src/interface/filter.cpp:297 +msgid "No name for the filterset given." +msgstr "Verilən filtr üçün heç bir ad yoxdur." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 +msgid "No program associated with filetype" +msgstr "Fayl tipi ilə əlaqəli proqram yoxdur" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#, c-format +msgid "No program has been associated to edit files with the extension '%s'." +msgstr "'%s' uzantısı ilə faylları redaktə etmək üçün heç bir proqram yoxdur." + +#: ../../locales/../src/engine/socket.cpp:1079 +msgid "No route to host" +msgstr "Xatırlamaq üçün yol yoxdur" + +#: ../../locales/../src/interface/search.cpp:411 +msgid "No search results" +msgstr "Axtarış nəticəsi yoxdur" + +#: ../../locales/../src/interface/sitemanager.cpp:352 +msgid "No sites available" +msgstr "Heç bir sayt yoxdur" + +#: ../../locales/../src/engine/proxy.cpp:470 +msgid "No supported SOCKS5 auth method" +msgstr "SOCKS5 auth üsulu dəstəklənmir" + +#: ../../locales/../src/interface/loginmanager.cpp:207 +msgid "No username given." +msgstr "Heç bir istifadəçi adı verilməyib." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 +msgid "None" +msgstr "Heç nə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 +msgid "None selected yet" +msgstr "Hələ seçilmədi" + +#: ../../locales/../src/engine/socket.cpp:1099 +msgid "Nonrecoverable failure in name resolution" +msgstr "İsmarıcın həllində xəta baş verdi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:569 +#: ../../locales/../src/engine/server.cpp:596 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:889 +#: ../../locales/../src/interface/queue.cpp:945 +msgid "Normal" +msgstr "Normal" + +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 +msgid "Not all items could be requeued for transfer." +msgstr "Bütün əşyaların köçürülməsini tələb edilə bilməz." + +#: ../../locales/../src/interface/state.cpp:195 +#: ../../locales/../src/interface/state.cpp:1295 +msgid "Not connected" +msgstr "Bağlı deyil" + +#: ../../locales/../src/interface/RemoteListView.cpp:2046 +msgid "Not connected to any server" +msgstr "Hər hansı bir serverə bağlı deyil" + +#: ../../locales/../src/interface/Mainfrm.cpp:612 +msgid "Not connected to any server." +msgstr "Hər hansı bir serverə bağlı deyil." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 +msgid "Not connected." +msgstr "Bağlı deyil." + +#: ../../locales/../src/engine/socket.cpp:1120 +msgid "Not initialized, need to call WSAStartup" +msgstr "Başlanmadı, WSAStartup-a zəng etmək lazımdır" + +#: ../../locales/../src/interface/Mainfrm.cpp:711 +msgid "Note that this feature is only supported using the FTP protocol." +msgstr "Qeyd edək ki, bu xüsusiyyət yalnız FTP protokolu ilə dəstəklənir." + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Qeyd: İtirilən bir açar bərpa edilə bilməz." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 +msgid "Note: This only works with plain, unencrypted FTP connections." +msgstr "Qeyd edək ki, bu xüsusiyyət yalnız FTP protokolu ilə dəstəklənir." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 +msgid "Note: Using a generic proxy forces passive mode on FTP connections." +msgstr "" +"Qeyd: Ümumi proxy istifadə passiv rejimli FTP bağlantılarına icazə verir." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 +msgid "Number of decimal places:" +msgstr "Ondalıkqyerlərin sayı:" + +#: ../../locales/../src/interface/settings/optionspage_connection.cpp:35 +msgid "Number of retries has to be between 0 and 99." +msgstr "Təcrübə sayı 0 ilə 99 arasında olmalıdır." + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 +msgid "OK" +msgstr "Tamam" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 +msgid "OS version:" +msgstr "OS versiyası:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 +msgid "" +"On the following pages, the selected transfer mode will be configured, as " +"well as the fallback mode if enabled." +msgstr "" +"Aşağıdakı səhifələrdə seçilmiş ötürmə rejimi, həmçinin aktivləşdirildikdə " +"geri qaytarma rejimi konfiqurasiya olunacaq." + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 +msgid "Once" +msgstr "Bir dəfə" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 +msgid "Once a day" +msgstr "Gündə bir dəfə" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 +msgid "Once a week" +msgstr "Həftədə bir dəfə" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +msgid "Only use plain FTP (insecure)" +msgstr "Yalnız düz FTP (təhlükəli)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Faylı aç" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +msgid "Open directory in system's file manager" +msgstr "Sistemin fayl menecerində açıq qovluq" + +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 +msgid "Open the Site Manager" +msgstr "Sayt menecerini açın" + +#: ../../locales/../src/interface/toolbar.cpp:31 +msgid "Open the Site Manager." +msgstr "Sayt menecerini açın." + +#: ../../locales/../src/interface/toolbar.cpp:33 +msgid "Open the Site Manager. Right-click for a list of sites." +msgstr "Sayt menecerini açın. Saytların siyahısı üçün sağ düyməni basın." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +msgid "Open the file." +msgstr "Faylı açın." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 +msgid "Open the settings dialog of FileZilla" +msgstr "FileZilla'nın ayarları qutusunu açın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 +msgid "Opened as:" +msgstr "Açılan kimi:" + +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1756 +#: ../../locales/../src/interface/LocalListView.cpp:1768 +msgid "Opening failed" +msgstr "Açılmadı" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 +msgid "Opens a new tab" +msgstr "Yeni bir tab açır" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 +msgid "Opens the Site Manager" +msgstr "Sayt menecerini açır" + +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "" +"Opens the directory listing filter dialog. Right-click to toggle filters." +msgstr "" +"Qovluq siyahı filter informasiya qutusunu açır. Geçiş filtrlərini açıb " +"bağlamaq üçün sağ düyməyə basın." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 +msgid "Operating System:" +msgstr "Əməliyyat sistemi:" + +#: ../../locales/../src/engine/socket.cpp:1070 +msgid "Operation already in progress" +msgstr "Əməliyyat artıq davam edir" + +#: ../../locales/../src/engine/socket.cpp:1061 +msgid "Operation in progress" +msgstr "Əməliyyat davam edir" + +#: ../../locales/../src/engine/socket.cpp:1082 +msgid "Operation not supported" +msgstr "Əməliyyat dəstəklənmir" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Narıncı" + +#: ../../locales/../src/interface/verifycertdialog.cpp:242 +msgid "Organization:" +msgstr "Təşkilat:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 +msgid "Other SFTP options" +msgstr "Digər SFTP variantları" + +#: ../../locales/../src/engine/socket.cpp:1115 +msgid "Other system error" +msgstr "Digər sistem səhvləri" + +#: ../../locales/../src/interface/verifycertdialog.cpp:264 +msgid "Other:" +msgstr "Digər:" + +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 +msgid "Out of memory" +msgstr "Yaddaş dolub" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 +msgid "Overview" +msgstr "Baxış" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 +msgid "Overwrite &if source newer" +msgstr "Mənbə yenidirsə üzərinə yazılsın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +msgid "Overwrite file" +msgstr "Faylın üzərində yaz" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +msgid "Overwrite file if size differs" +msgstr "Ölçü fərqli olduqda faylın üzərində yaz" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +msgid "Overwrite file if size differs or source file is newer" +msgstr "Ölçü fərqlənirsə və ya mənbə yeni olarsa faylın üzərində yaz" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +msgid "Overwrite file if source file newer" +msgstr "Mənbə faylının daha yeni olması halında faylın üzərində yazılsın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +msgid "Overwrite if &different size" +msgstr "Fərqli ölçüyə dəyişdirin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 +msgid "Overwrite if different si&ze or source newer" +msgstr "Müxtəlif ölçü və ya yeni bir qayda varsa üzərində yaz" + +#: ../../locales/../src/interface/updater.cpp:245 +#, c-format +msgid "Own build type: %s\n" +msgstr "Öz quruluş növü: %s\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 +msgid "Owner permissions" +msgstr "Sahibinin icazəsi" + +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:160 +msgid "Owner/Group" +msgstr "Sahib / Qrup" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 +msgid "" +"P&revent system from entering idle sleep during transfers and other " +"operations" +msgstr "" +"Köçürmələr və digər əməliyyatlar zamanı sistemin boş yatmasına mane olmaq" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 +msgid "P&roxy host:" +msgstr "Proxy server:" + +#: ../../locales/../src/interface/netconfwizard.cpp:507 +msgid "PORT command tainted by router or firewall." +msgstr "Yönləndirici və ya təhlükəsizlik divarı tərəfindən pozulmuş PORT əmri." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 +msgid "Pa&ssive (recommended)" +msgstr "Passiv (tövsiyə olunur)" + +#: ../../locales/../src/interface/Mainfrm.cpp:2470 +msgid "Parameter not a valid URL" +msgstr "Parametr etibarlı bir URL deyil" + +#: ../../locales/../src/interface/updater.cpp:574 +#, c-format +msgid "Parsing %d bytes of version information.\n" +msgstr "Versiya məlumatının %d baytının ayrılması.\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 +msgid "Pass&word:" +msgstr "Şifrə:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 +msgid "Passive (recommended)" +msgstr "Passiv (tövsiyə olunur)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 +msgid "Passive mode" +msgstr "Passiv rejimi" + +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 +msgid "Passive mode has been set as default transfer mode." +msgstr "Passiv rejim default transfer rejimi kimi təyin edilmişdir." + +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Şifrə və ya şifrləmə açarı təyin olunmur" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 +msgid "Password required" +msgstr "Şifrə tələb olunur" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Şifrələr" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:155 +msgid "Path" +msgstr "Yol" + +#: ../../locales/../src/engine/ftp/rmd.cpp:40 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 +#, c-format +msgid "Path cannot be constructed for directory %s and subdir %s" +msgstr "%s qovluğu və%s alt qovluğu üçün yol yaradıla bilmir" + +#: ../../locales/../src/interface/Mainfrm.cpp:2425 +msgid "Path not found:" +msgstr "Yol tapılmadı:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 +msgid "Paths" +msgstr "Yollar" + +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 +msgid "Pending removal" +msgstr "Silinməsi gözlənilir" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +msgid "Permission" +msgstr "İcazə" + +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 +msgid "Permission denied" +msgstr "Razılaşma rədd edildi" + +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:159 +msgid "Permissions" +msgstr "İzinlər" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 +msgid "Platform:" +msgstr "Platforma:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +#, fuzzy +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" +"Xahiş edirik ayarları informasiya qutusuna yerli məlumatlar qovluğunu əlavə " +"edin." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 +msgid "" +"Please check on https://filezilla-project.org/probe.php that the server is " +"running and carefully check your settings again." +msgstr "" +"Xahiş edirik serverin çalışdığını və parametrlərinizi yenidən yoxlamaq üçün " +"https://filezilla-project.org/probe.php səhifəsinə keçin." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:116 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 +msgid "" +"Please configure any firewalls and routers so that FileZilla can establish " +"outgoing connection to arbitrary ports." +msgstr "" +"Xahiş edirik, hər hansı bir firewall və marşrutlaşdırıcısını konfiqurasiya " +"edin, belə ki FileZilla özbaşına limanlara gedən əlaqə qura bilər." + +#: ../../locales/../src/interface/netconfwizard.cpp:645 +msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." +msgstr "" +"Yönləndiricinizdə 'DMZ rejimi' və ya 'Oyun rejimi' kimi parametrləri aradan " +"buraxın." + +#: ../../locales/../src/interface/netconfwizard.cpp:583 +msgid "" +"Please ensure you have a stable internet connection and carefully check your " +"settings again." +msgstr "" +"Xahiş edirik sabit bir internet bağlantınız olduğundan əmin olun və " +"ayarlarınızı yenidən yoxlayın." + +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 +msgid "Please enter a custom date format." +msgstr "Xüsusi tarix formatını daxil edin." + +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 +msgid "Please enter a custom time format." +msgstr "Xüsusi bir vaxt formatı daxil edin." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 +msgid "" +"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." +msgstr "" +"Xahiş olunur 2010-07-18 kimi YYYY-MM-DD formasının bir tarixini daxil edin." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#, c-format +msgid "Please enter a download speed limit greater or equal to 0 %s/s." +msgstr "" +"Xahiş edirik, 0 %s / s-dən çox və ya bərabər yükləmə sürəti limitini daxil " +"edin." + +#: ../../locales/../src/interface/filteredit.cpp:136 +msgid "Please enter a name for the new filter." +msgstr "Yeni filtr üçün bir ad daxil edin." + +#: ../../locales/../src/interface/filteredit.cpp:242 +msgid "Please enter a new name for the copied filter." +msgstr "Kopyalanan filtr üçün yeni bir ad daxil edin." + +#: ../../locales/../src/interface/filter.cpp:282 +#, c-format +msgid "Please enter a new name for the filter set \"%s\"" +msgstr "\"%s\" filtr dəsti üçün yeni bir ad daxil edin" + +#: ../../locales/../src/interface/filteredit.cpp:195 +msgid "Please enter a new name for the filter." +msgstr "Süzgə üçün yeni bir ad daxil edin." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 +msgid "" +"Please enter a number between 0 and 10 for the number of concurrent " +"downloads." +msgstr "Birlikdə yüklənmə sayı üçün 0 və 10 arasında bir rəqəm daxil edin." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 +msgid "" +"Please enter a number between 0 and 10 for the number of concurrent uploads." +msgstr "Birlikdə yüklənmə sayı üçün 0 və 10 arasında bir nömrə daxil edin." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 +msgid "" +"Please enter a number between 1 and 10 for the number of concurrent " +"transfers." +msgstr "Birlikdə yüklənmə sayı üçün 0 və 10 arasında bir nömrə daxil edin." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 +msgid "Please enter a password for this server:" +msgstr "Xahiş edirik bu server üçün bir parol daxil edin:" + +#: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 +msgid "" +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." +msgstr "" +"Xahiş edirik zaman aşımlarını aradan qaldırmaq üçün 10 ilə 9999 saniyə " +"arasında bir zaman aşımını daxil edin." + +#: ../../locales/../src/interface/filter.cpp:220 +msgid "Please enter a unique name for this filter set" +msgstr "Bu filtr dəsti üçün unikal bir ad daxil edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 +msgid "Please enter a username for this server:" +msgstr "Xahiş edirik bu server üçün bir istifadəçi adı daxil edin:" + +#: ../../locales/../src/interface/netconfwizard.cpp:185 +msgid "Please enter a valid portrange." +msgstr "Xahiş edirik, düzgün bir portret daxil edin." + +#: ../../locales/../src/interface/netconfwizard.cpp:166 +msgid "Please enter an URL where to get your external address from" +msgstr "Xahiş edirik xarici ünvanınızı almaq üçün URL daxil edin" + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 +#, c-format +msgid "Please enter an upload speed limit greater or equal to 0 %s/s." +msgstr "Xahiş edirik yükləmə sürəti limitini 0 %s / s-yə bərabər edin." + +#: ../../locales/../src/interface/Mainfrm.cpp:624 +msgid "" +"Please enter raw FTP command.\n" +"Using raw ftp commands will clear the directory cache." +msgstr "" +"Zəhmət olmasa FTP komutunu daxil edin\n" +"Standart ftp əmrlərindən istifadə edərək kataloq gizli yer siləcəkdir." + +#: ../../locales/../src/interface/QueueView.cpp:1856 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Xahiş edirik proqramın tam yolunu və onun dəlillərini daxil edin. Bu əmr " +"əlavənin işlənsməsi başa çatdıqda yerinə yetiriləcək\n" +"Məs. Unix altında MS Windows və / somePath / file altında c: \\ somePath \\ " +"file.exe\n" +"Boşluqlar varsa düzgün əmrləri və onların arqumentlərini sitat gətirmək " +"lazımdır." + +#: ../../locales/../src/interface/LocalListView.cpp:932 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1324 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1251 +msgid "Please enter the name of the directory which should be created:" +msgstr "Yaradılacaq kataloqun adını daxil edin:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2648 +msgid "Please enter the name of the file which should be created:" +msgstr "Yaradılacaq faylın adını daxil edin:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 +msgid "Please enter username and password for this server:" +msgstr "Bu server üçün istifadəçi adı və şifrəni daxil edin:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "Bu server üçün istifadəçi adı və şifrəni daxil edin." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 +msgid "Please enter your external IP address" +msgstr "Xahiş edirik xarici IP ünvanınızı daxil edin" + +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 +msgid "" +"Please enter your external IP address on the active mode page of this " +"wizard. In case you have a dynamic address or don't know your external " +"address, use the external resolver option." +msgstr "" +"Xahiş edirik bu yardımçıdakı aktiv rejimi səhifəsində xarici IP ünvanınızı " +"daxil edin. Dinamik bir ünvanınız varsa və ya xarici ünvanınızı " +"bilmirsinizsə, xarici həll variantını istifadə edin." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "Bu server üçün şifrənin şifrəsini açmaq üçün ana şifrənizi daxil edin:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 +msgid "" +"Please follow the instructions carefully, as wrong configuration will " +"prevent successful FTP connections." +msgstr "" +"Yanlış konfiqurasiya müvəffəqiyyətli FTP əlaqələri maneə törətdiyinə görə, " +"təlimatlara diqqətlə baxın." + +#: ../../locales/../src/interface/netconfwizard.cpp:639 +msgid "" +"Please make sure FileZilla is allowed to establish outgoing connections and " +"make sure you typed the address of the address resolver correctly." +msgstr "" +"Xahiş edirik, FileZilla-nın gedən əlaqələri yaratmasına icazə verin və ünvan " +"doğrulayıcıda düzgün ünvan yazdığınızdan əmin olun." + +#: ../../locales/../src/interface/FileZilla.cpp:147 +msgid "Please make sure the requested locale is installed on your system." +msgstr "" +"Xahiş edirik tələb olunan faylların sisteminizdə quraşdırıldığından əmin " +"olun." + +#: ../../locales/../src/interface/netconfwizard.cpp:616 +msgid "" +"Please make sure your router is using the latest available firmware. " +"Furthermore, your router has to be configured properly. You will have to use " +"manual port forwarding. Don't run your router in the so called 'DMZ mode' or " +"'game mode'." +msgstr "" +"Yönləndiricinizin ən son mövcud proqram təminatından istifadə etdiyinə əmin " +"olun. Bununla yanaşı, yönləndiriciniz düzgün qurulmalıdır. Göstəriş liman " +"istifadə etmək lazımdır. Yönləndiricinizi \"DMZ rejimi\" ya da \"oyun rejimi" +"\" adında istifadə etməyin." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 +msgid "" +"Please note that FileZilla has no influence on the port the server chooses. " +"So the server might choose a port which your firewall thinks is only used by " +"trojans or other malware. This might raise a false alarm you can safely " +"discard." +msgstr "" +"Xahiş edirik FileZilla'nın server seçdiyi limana heç bir təsiri olmadığını " +"unutmayın. Beləliklə, təhlükəsizlik divarınız serverin seçdiyi bir portu " +"yalnız bir bağlantı tərəfindən idarə olunduğunu saya bilər. Bu formada " +"təhlükəsizlik xəbərdarlığı alsanız görməzdən gələ bilərsiz." + +#: ../../locales/../src/interface/Mainfrm.cpp:751 +msgid "" +"Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " +"servers only works if they support the MFMT command." +msgstr "" +"Xatırladaq ki, FTP, FTPS və FTPES serverlərində yüklənən zaman damğalarının " +"qorunması yalnız MFMT əmrini dəstəkləyərkən işləyir." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 +msgid "" +"Please note that some servers might ban you if you try to reconnect too " +"often or in too short intervals." +msgstr "" +"Çox tez-tez və ya çox qısa aralıqlarla yenidən əlaqə qurmağa çalışarsanız " +"bəzi serverlər sizi qadağan edə bilər." + +#: ../../locales/../src/interface/netconfwizard.cpp:592 +msgid "" +"Please run this wizard again should you change your network environment or " +"in case you suddenly encounter problems with servers that did work " +"previously." +msgstr "" +"Xahiş edirik şəbəkə mühitinizi dəyişdirdiyinizdə və ya birdən əvvəl işləyən " +"serverlərlə qarşılaşdığınız halda bu yardımçını yenidən istifadə edin." + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Xahiş edirik bu açarı təhlükəsiz bir yerdə saxlayın. Doğru əsas olmadan " +"yüklənən fayllara daxil oluna bilməz." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 +msgid "Please select an action:" +msgstr "Xahiş edirik bir hərəkət seçin:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 +msgid "Please select the categories you would like to import." +msgstr "Xahiş edirik idxal etmək istədiyiniz kateqoriyalar seçin." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 +msgid "Please select the default transfer mode you would like to use." +msgstr "Xahiş edirik istifadə etmək istədiyiniz köçürmə rejimi seçin." + +#: ../../locales/../src/interface/chmoddialog.cpp:41 +#, c-format +msgid "Please select the new attributes for the directory \"%s\"." +msgstr "Xahiş edirik \"%s\" qovluğunun yeni atributlarını seçin." + +#: ../../locales/../src/interface/chmoddialog.cpp:33 +#, c-format +msgid "Please select the new attributes for the file \"%s\"." +msgstr "Xahiş edirik \"%s\" faylının yeni xüsusiyyətlərini seçin." + +#: ../../locales/../src/interface/chmoddialog.cpp:44 +msgid "Please select the new attributes for the selected directories." +msgstr "Xahiş edirik seçilmiş kataloqlar üçün yeni xüsusiyyətləri seçin." + +#: ../../locales/../src/interface/chmoddialog.cpp:47 +msgid "" +"Please select the new attributes for the selected files and directories." +msgstr "" +"Xahiş edirik seçilmiş fayl və qovluqlar üçün yeni xüsusiyyətləri seçin." + +#: ../../locales/../src/interface/chmoddialog.cpp:36 +msgid "Please select the new attributes for the selected files." +msgstr "Xahiş edirik seçilmiş fayllar üçün yeni xüsusiyyətləri seçin." + +#: ../../locales/../src/interface/netconfwizard.cpp:603 +msgid "" +"Please update your firewall and make sure your router is using the latest " +"available firmware. Furthermore, your router has to be configured properly. " +"You will have to use manual port forwarding. Don't run your router in the so " +"called 'DMZ mode' or 'game mode'. Things like protocol inspection or " +"protocol specific 'fixups' have to be disabled" +msgstr "" +"Xahiş edirik təhlükəsizlik divarınızı yeniləyin və marşrutlaşdırıcınızın " +"mövcud ən yeni proqram təminatından istifadə etdiyinə əmin olun. Ayrıca, " +"yönlendiricinizin düzgün qurulması lazımdır. Yönləndiricinizi \"DMZ rejimi\" " +"ya da \"oyun rejimi\" adında istifadə etməyin. Protokol yoxlama və ya xüsusi " +"protokollar kimi şeylər aradan qaldırılmalıdır" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 +msgid "Positio&n of the message log:" +msgstr "Mesajın tarixçəsi:" + +#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 +msgid "Postal code:" +msgstr "Poçt kodu:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 +msgid "Pre&allocate space before downloading" +msgstr "Yükləməzdən əvvəl məkanı önləyin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 +msgid "Preallocation" +msgstr "Yer ayırma" + +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2113 +msgid "Predefined Sites" +msgstr "Önceden təyin edilmiş saytlar" + +#: ../../locales/../src/interface/Mainfrm.cpp:750 +msgid "Preserving file timestamps" +msgstr "Fayl zaman damğalarının qorunması" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Ön görünüş" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1407 +msgid "Primary connection and data connection certificates don't match." +msgstr "Birincil əlaqə və məlumat bağlantı sertifikatları uyğun deyil." + +#: ../../locales/../src/interface/cmdline.cpp:19 +msgid "Print diagnostic information related to startup of FileZilla" +msgstr "FileZilla-nın başlanğıcına aid diaqnostik məlumatları çap edin" + +#: ../../locales/../src/interface/cmdline.cpp:18 +msgid "Print version information to stdout and exit" +msgstr "Stdout və çıxış üçün versiya məlumatlarını çap edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 +msgid "Prioritize directories (default)" +msgstr "Rəhbərləri prioritetləşdirin (default)" + +#: ../../locales/../src/interface/queue.cpp:1162 +msgid "Priority" +msgstr "Prioritet" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 +msgid "" +"Privacy policy: Only your version of FileZilla, your used operating system " +"and your CPU architecture will be submitted to the server." +msgstr "" +"Gizlilik siyasəti: Yalnızca FileZilla versiyanız, istifadə olunan əməliyyat " +"sisteminiz və CPU arxitekturası serverə təqdim olunacaq." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 +msgid "Private &keys:" +msgstr "Şəxsi düymələr:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 +msgid "Pro&tocol:" +msgstr "Protokol:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 +msgid "Pro&xy password:" +msgstr "Proxy şifrəsi:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +msgid "Process &Queue" +msgstr "Əlavələri fayllara əlavə et" + +#: ../../locales/../src/engine/socket.cpp:1063 +msgid "Process file table overflow" +msgstr "Proses fayl masası daşması" + +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 +#, c-format +msgid "Processed %s in %s." +msgstr "%s %s içərisində işləndi." + +#: ../../locales/../src/engine/socket.cpp:1068 +msgid "Protocol not supported" +msgstr "Protokol dəstəklənmir" + +#: ../../locales/../src/engine/socket.cpp:1122 +msgid "Protocol not supported on given socket type" +msgstr "Müraciət verilən soket tipində dəstəklənmir" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 +msgid "Protocol:" +msgstr "Protokol:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 +msgid "Proxy &port:" +msgstr "Proxy portu:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 +msgid "Proxy &user:" +msgstr "Proxy istifadəçisi:" + +#: ../../locales/../src/engine/proxy.cpp:479 +msgid "Proxy authentication failed" +msgstr "Proxy identifikasiyası uğursuz oldu" + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 +#, c-format +msgid "Proxy handshake failed: %s" +msgstr "Proxy ilə bağlantı uğursuz oldu: %s" + +#: ../../locales/../src/engine/ftp/logon.cpp:65 +msgid "Proxy host starts with '[' but no closing bracket found." +msgstr "Proxy adı '[' ilə başlayır amma heç bir bağlanma möhürü tapılmadı." + +#: ../../locales/../src/engine/proxy.cpp:333 +#, c-format +msgid "Proxy reply: %s" +msgstr "Proxy cavab: %s" + +#: ../../locales/../src/engine/proxy.cpp:520 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Proxy sorğusu uğursuz oldu. Proxy'dən cavab alın: %s" + +#: ../../locales/../src/engine/proxy.cpp:390 +#, c-format +msgid "Proxy request failed: %s" +msgstr "Proxy sorğusu uğursuz: %s" + +#: ../../locales/../src/engine/proxy.cpp:544 +msgid "Proxy request failed: Unknown address type in CONNECT reply" +msgstr "Proxy sorğusu uğursuz: Əlaqədar ünvan növü CONNECT cavabında" + +#: ../../locales/../src/engine/ftp/logon.cpp:92 +msgid "Proxy set but proxy host or port invalid" +msgstr "Proxy qurulmuşdur ancaq proxy adı ya da portu etibarsızdır" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 +msgid "Public Key Authentication" +msgstr "İctimai Açar Kimlik Doğrulama" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 +msgid "Public key algorithm:" +msgstr "Açar açıq alqoritmi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 +msgid "Public permissions" +msgstr "İctimai icazələr" + +#: ../../locales/../src/interface/QueueView.cpp:2760 +msgid "Queue has been fully processed" +msgstr "Əlavə tamamilə işlənmişdir" + +#: ../../locales/../src/interface/statusbar.cpp:439 +#, c-format +msgid "Queue: %s MiB" +msgstr "Əlavə: %s MİB" + +#: ../../locales/../src/interface/statusbar.cpp:374 +#, c-format +msgid "Queue: %s%s" +msgstr "Əlavə: %s%s" + +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 +msgid "Queue: empty" +msgstr "Əlavə: boş" + +#: ../../locales/../src/interface/QueueView.cpp:203 +msgid "Queued files" +msgstr "Keçid faylları" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 +msgid "Queueing:" +msgstr "Quyruğa əlavə edilir:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "R&eboot system once" +msgstr "Sistem bir dəfə yenidən başladılsın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +msgid "R&emote directory tree" +msgstr "Uzaqdan idarə olunan ağac" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 +msgid "R&eset and requeue selected files" +msgstr "Seçilmiş faylları sıfırlayın və yenidən quyruğa əlavəedin" + +#: ../../locales/../src/interface/Mainfrm.cpp:639 +msgid "Raw FTP command" +msgstr "Raw FTP əmri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 +msgid "Re&ad" +msgstr "Oxuma" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 +msgid "Re&fresh" +msgstr "Yenilə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 +msgid "Re&name" +msgstr "Yenidən adlandır" + +#: ../../locales/../src/interface/netconfwizard.cpp:598 +msgid "" +"Re-run the wizard and carefully check your settings and configure all " +"routers and firewalls accordingly." +msgstr "" +"Yardımçınızı yenidən başladın və parametrlərinizi diqqətlə yoxlayınb bütün " +"marşrutlaşdırıcıları və təhlükəsizlik divarlarını müvafiq olaraq qurun." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 +msgid "Rea&d" +msgstr "Oxuma" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 +msgid "Read-only" +msgstr "Yalnız oxunur" + +#: ../../locales/../src/interface/Mainfrm.cpp:1115 +msgid "Really cancel current operation?" +msgstr "Həqiqi əməliyyatı ləğv edirsinizmi?" + +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:1215 +#, c-format +msgid "Really delete %d directory with its contents from the server?" +msgid_plural "" +"Really delete %d directories with their contents from the server?" +msgstr[0] "Serverdəki %d qovluğu içindəkilərlə birlikdə silmək istəyirsiniz?" +msgstr[1] "Serverdəki %d qovluğu içindəkilərlə birlikdə silmək istəyirsiniz?" + +#: ../../locales/../src/interface/RemoteListView.cpp:1415 +#: ../../locales/../src/interface/search.cpp:1212 +#, c-format +msgid "Really delete %d file from the server?" +msgid_plural "Really delete %d files from the server?" +msgstr[0] "Serverdəki %d faylı silmək istəyirsiniz?" +msgstr[1] "Serverdəki %d faylı silmək istəyirsiniz?" + +#: ../../locales/../src/interface/RemoteListView.cpp:1423 +#: ../../locales/../src/interface/search.cpp:1220 +#, c-format +msgid "Really delete %s and %s from the server?" +msgstr "Serverdə%svə %shəqiqətən silinsin?" + +#: ../../locales/../src/interface/RemoteTreeView.cpp:1069 +msgid "Really delete all selected files and/or directories from the server?" +msgstr "" +"Serverdə seçilmiş bütün faylları və ya kataloqları həqiqətən silmək " +"istəyirsiniz?" + +#: ../../locales/../src/interface/file_utils.h:45 +msgid "Really delete all selected files and/or directories from your computer?" +msgstr "" +"Kompyuterinizdən seçilmiş bütün faylları və ya kataloqları həqiqətən silmək " +"istəyirsiniz?" + +#: ../../locales/../src/interface/queue.cpp:1162 +msgid "Reason" +msgstr "Səbəb" + +#: ../../locales/../src/interface/QueueView.cpp:2753 +msgid "Reboot now" +msgstr "Yenidən başlat" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +msgid "Rec&urse into subdirectories" +msgstr "Alt qovluqlara tətbiq edilsin" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:330 +#, c-format +msgid "Received TLS alert from the server: %s (%d)" +msgstr "Serverdən alınan TLS xəbərdarlığı: %s (%d)" + +#: ../../locales/../src/engine/directorylistingparser.cpp:3079 +msgid "Received a directory listing which appears to be encoded in EBCDIC." +msgstr "Alınan qovluq siyahısı EBCDIC kimi kodlanmış görünür." + +#: ../../locales/../src/engine/directorylistingparser.cpp:2062 +#: ../../locales/../src/engine/directorylistingparser.cpp:2079 +msgid "Received a line exceeding 10000 characters, aborting." +msgstr "10000-dən simvoldan çox olan bir xətt alıb, imtina edilir." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1328 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "Alınan sertifikat zənciri təsdiq edilə bilmədi. Doğrulama statusu: %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 +msgid "Received data tainted" +msgstr "Alınan məlumatlar pozulub" + +#: ../../locales/../src/interface/updater.cpp:553 +msgid "Received invalid character in version information" +msgstr "Sürüm məlumatında yanlış xarakter almışdır" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:333 +#, c-format +msgid "Received unknown TLS alert %d from the server" +msgstr "Serverdən gələn bilinməyən TLS xəbərdarlığı %d qəbul edildi" + +#: ../../locales/../src/interface/updater.cpp:546 +msgid "Received version information is too large" +msgstr "Alınan versiya məlumatları çox böyükdür" + +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +msgid "" +"Reconnect information cannot be cleared while connected to a server.\n" +"If you continue, your connection will be disconnected." +msgstr "" +"Bir serverə qoşulduqda yenidən əlaqə məlumatı silinə bilməz.\n" +"Davam etsəniz, əlaqəniz kəsiləcək." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 +msgid "Reconnection settings" +msgstr "Yenidənqurma parametrləri" + +#: ../../locales/../src/interface/toolbar.cpp:47 +msgid "Reconnects to the last used server" +msgstr "Son istifadə edilən serverə yenidən bağlanır" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 +msgid "Recursively adding files to queue." +msgstr "Davamlı olaraq faylları sıraya əlavə edilsin." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 +msgid "Recursively changing permissions." +msgstr "Rəqəmləri dəyişdirən icazələr." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 +msgid "Recursively deleting files and directories." +msgstr "Təkrarlanan faylları və qovluqları silinsin." + +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Qırmızı" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 +#, c-format +msgid "Redirection to invalid or unsupported URI: %s" +msgstr "Yalnış və ya dəstəklənməmiş URI-ə yönləndirin: %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:153 +#, c-format +msgid "Redirection to invalid or unsupported address: %s" +msgstr "Yalnış və ya dəstəklənməmiş ünvana yönləndirin: %s" + +#: ../../locales/../src/interface/toolbar.cpp:43 +msgid "Refresh the file and folder lists" +msgstr "Fayl və qovluq siyahılarını yeniləyin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 +msgid "Remember passwords?" +msgstr "Şifrələr xatırlansın?" + +#: ../../locales/../src/interface/edithandler.cpp:1147 +msgid "Remote" +msgstr "Uzaqdan" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:999 +msgid "Remote certificate not trusted." +msgstr "Uzaqdakı sertifikata etibar edilmir." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1162 +msgid "Remote file" +msgstr "Uzaqdakı fayl" + +#: ../../locales/../src/interface/search.cpp:688 +#: ../../locales/../src/interface/search.cpp:693 +msgid "Remote file search" +msgstr "Uzaqdan fayl axtarışı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 +msgid "Remote filters:" +msgstr "Uzaq filtrlər:" + +#: ../../locales/../src/interface/edithandler.cpp:1138 +msgid "Remote path" +msgstr "Uzaqdakı yol" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 +#, c-format +msgid "" +"Remote path cannot be parsed. Make sure it is a valid absolute path and is " +"supported by the current site's servertype (%s)." +msgstr "" +"Uzaqdakı yola gedilə bilmədi. Müvafiq bir mütləq yol olduğunu və mövcud " +"saytın server növü (%s) tərəfindən dəstəkləndiyinə əmin olun." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1174 +#, c-format +msgid "" +"Remote path cannot be parsed. Make sure it is a valid absolute path and is " +"supported by the servertype (%s) selected on the parent site." +msgstr "" +"Uzaqdakı yola gedilə bilmədi. Doğru mütləq bir yol olduğundan və ana saytda " +"seçilmiş server növü (%s) tərəfindən dəstəkləndiyinə əmin olun." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1177 +msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." +msgstr "" +"Uzaqdakı yola gedilə bilmədi. Müəyyən bir mütləq yol olduğundan əmin olun." + +#: ../../locales/../src/interface/manual_transfer.cpp:323 +msgid "Remote path could not be parsed." +msgstr "Uzaqdakı yola gedilə bilmədi." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +msgid "Remote path handling:" +msgstr "Uzaqdan idarə olunan yol:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 +msgid "Remote path:" +msgstr "Uzaqdakı yol:" + +#: ../../locales/../src/interface/viewheader.cpp:529 +msgid "Remote site:" +msgstr "Uzaqdakı sayt:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +msgid "Remove &all" +msgstr "Hamısını sil" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:463 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:481 +msgid "Remove &selected" +msgstr "Seçilənləri sil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:304 +msgid "Rename file" +msgstr "Faylın adı dəyişdirilsin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 +msgid "Rename selected directory" +msgstr "Seçilmiş qovluğu yenidən adlandır" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 +msgid "Rename selected files and directories" +msgstr "Seçilmiş qovluq və faylları yenidən adlandır" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:595 +#, c-format +msgid "Renaming '%s' to '%s'" +msgstr "'%s' '%s' kimi dəyişdirilir" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Şifrənin təstiqlənməsi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 +msgid "Reporting bugs and feature requests" +msgstr "Səhvlər və xüsusiyyət sorğuları barədə məlumat" + +#: ../../locales/../src/engine/proxy.cpp:381 +msgid "" +"Request failed - client is not running identd (or not reachable from server)" +msgstr "" +"Sorğu uğursuz oldu - identd işləmir (ya da serverdən əldə edilə bilmir)" + +#: ../../locales/../src/engine/proxy.cpp:384 +msgid "Request failed - client's identd could not confirm the user ID string" +msgstr "İstək uğursuz oldu -identd istifadəçi ID təstiqlənmədi" + +#: ../../locales/../src/engine/proxy.cpp:378 +msgid "Request rejected or failed" +msgstr "Rədd edildi və ya uğursuz oldu" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +msgid "Require explicit FTP over TLS" +msgstr "TLS-dən açıq FTP tələb et" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +msgid "Require implicit FTP over TLS" +msgstr "TLS üzərindən gizli FTP tələb edir" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 +msgid "Reset and requeue &all" +msgstr "Hamısını sıfırlayın və yenidən aləvə edin" + +#: ../../locales/../src/engine/socket.cpp:1110 +msgid "Resolved protocol is unknown" +msgstr "Həll edilən protokol bilinmir" + +#: ../../locales/../src/engine/ControlSocket.cpp:1136 +#, c-format +msgid "Resolving address of %s" +msgstr "%s ünvanı həll edir" + +#: ../../locales/../src/engine/socket.cpp:1069 +msgid "Resource temporarily unavailable" +msgstr "Resurs müvəqqəti olaraq istifadə edilə bilməz" + +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:357 +msgid "Response:" +msgstr "Cavab:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 +msgid "Results:" +msgstr "Nəticələr:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 +msgid "Resume file transfer" +msgstr "Fayl ötürülməsini davam etdirin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 +msgid "" +"Resuming ASCII files can cause problems if server uses a different line " +"ending format than the client." +msgstr "" +"ASCII faylları bərpa edən server, daha fərqli bir xəttin sona çatdıqda, " +"problemlər yarada bilər." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 +#, c-format +msgid "Retrieving directory listing of \"%s\"..." +msgstr "\"%s\" kataloq siyahısını çıxarmaq ..." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 +msgid "Retrieving directory listing..." +msgstr "Qovluq siyahısını alın ..." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 +#, c-format +msgid "Retrieving external IP address from %s" +msgstr "Xarici IP ünvanını %s-dan çıxarmaq" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +msgid "S&how files currently being edited..." +msgstr "Hal-hazırda redaktə edilmiş faylları göstər ..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 +msgid "S&how the Site Manager on startup" +msgstr "Başlayarkən Sayt Menecerini göstərin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&hutdown system once" +msgstr "Sistemi bir dəfə bağla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 +msgid "S&top" +msgstr "Dayandırın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:418 +msgid "S&uspend system once" +msgstr "Bir dəfə sistemi dayandırın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 +msgid "S&ynchronized browsing" +msgstr "Sinxronlaşdırılan tarama" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 +msgid "SFTP" +msgstr "SFTP" + +#: ../../locales/../src/interface/FileZilla.cpp:593 +msgid "SFTP support" +msgstr "SFTP dəstəyi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 +msgid "SOC&KS 4" +msgstr "SOC&KS 4" + +#: ../../locales/../src/engine/proxy.cpp:144 +#, c-format +msgid "SOCKS4 proxy will connect to: %s" +msgstr "SOCKS4 proxy bağlantısı: %s" + +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "SOCKS5 255 simvoldan artıq istifadəçi adı və parolları dəstəkləmir." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 +msgid "SQLite:" +msgstr "SQLite:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Ana parol ilə qorunan parolları saxla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Şifrələri saxla" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 +msgid "Save settings?" +msgstr "Ayarlar saxlanılsın?" + +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1006 +msgid "Saving of password has been disabled by your system administrator." +msgstr "Parolun saxlanması sistem administratorunuz tərəfindən silinib." + +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 +msgid "Saving of passwords has been disabled by you." +msgstr "Şifrələrin saxlanması sizinlə bağlıdır." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Ölçək faktoru:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 +msgid "Search &conditions:" +msgstr "Axtarış şərtləri:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 +msgid "Search &directory:" +msgstr "Axtarış qovluğu:" + +#: ../../locales/../src/interface/toolbar.cpp:53 +msgid "Search for files recursively." +msgstr "Alt qovluqdakı faylları axtar." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +msgid "Search server for files" +msgstr "Serverdə fayl axtarın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Axtarış növü:" + +#: ../../locales/../src/interface/statusbar.cpp:514 +msgid "Security information" +msgstr "Təhlükəsizlik məlumatları" + +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 +msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" +msgstr "" +"Həmçinin baxın: https://wiki.filezilla-project.org/Network_Configuration" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 +msgid "Sele&ct server" +msgstr "Server seçin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 +msgid "Select &page:" +msgstr "Səhifə seçin:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 +msgid "Select Theme" +msgstr "Mövzu seçimi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 +msgid "" +"Select default action to perform if target file of a transfer already exists." +msgstr "" +"Bir transferin hədəf faylının zatən mövcud olub-olmadığını yerinə yetirmək " +"üçün default tədbir seçin." + +#: ../../locales/../src/interface/edithandler.cpp:1583 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 +msgid "Select default editor" +msgstr "Varsayılan redaktoru seçin" + +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +msgid "" +"Select default file exists action if the target file already exists. This " +"selection is valid only for the current session." +msgstr "" +"Hədəf fayl zatən varsa, varsayılan faylı seçin. Bu seçim yalnız cari seans " +"üçün etibarlıdır." + +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 +msgid "" +"Select default file exists action only for the currently selected files in " +"the queue." +msgstr "" +"Varsayılan fayl seçmək yalnız sıradakı hazırda seçilmiş fayllar üçün " +"fəaliyyət göstərir." + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 +msgid "Select file containing private key" +msgstr "Xüsusi düymə olan fayl seçin" + +#: ../../locales/../src/interface/export.cpp:48 +msgid "Select file for exported data" +msgstr "Verilən məlumatlar üçün fayl seçin" + +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Daşınan filtrlər üçün fayl seçin" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1430 +msgid "Select file for exported queue" +msgstr "Daşınan növbə faylını seçin" + +#: ../../locales/../src/interface/export.cpp:42 +msgid "Select file for exported settings" +msgstr "Verilən parametrlər üçün fayl seçin" + +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2457 +msgid "Select file for exported sites" +msgstr "Verilən saytlar üçün fayl seçin" + +#: ../../locales/../src/interface/import.cpp:17 +msgid "Select file to import settings from" +msgstr "Parametrləri idxal etmək üçün fayl seçin" + +#: ../../locales/../src/interface/manual_transfer.cpp:239 +msgid "Select file to upload" +msgstr "Yükləmək üçün fayl seçin" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 +msgid "Select filename for converted key file" +msgstr "Dəyişdirilmiş əsas fayl üçün fayl adını seçin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 +msgid "Select how these files should be opened." +msgstr "Bu faylların necə açılacağını seçin." + +#: ../../locales/../src/interface/search.cpp:872 +msgid "Select target download directory" +msgstr "Hədəf endirmə qovluğunu seçin" + +#: ../../locales/../src/interface/manual_transfer.cpp:235 +msgid "Select target filename" +msgstr "Hədəf fayl adını seçin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 +msgid "Select the categories to export:" +msgstr "İxrac ediləcək kateqoriyaları seçin:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 +msgid "Select the private data you would like to delete." +msgstr "Silmək istədiyiniz şəxsi məlumatları seçin." + +#: ../../locales/../src/interface/search.cpp:831 +#, c-format +msgid "Selected %d directory with its contents for transfer." +msgid_plural "Selected %d directories with their contents for transfer." +msgstr[0] "Transfer üçün məzmunu ilə seçilmiş %d qovluq." +msgstr[1] "Transfer üçün məzmunu ilə seçilmiş %dqovluq." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 +#, c-format +msgid "Selected %d directory." +msgid_plural "Selected %d directories." +msgstr[0] "Seçilmiş %d qovluqlar." +msgstr[1] "Seçilmiş %dqovluqlar." + +#: ../../locales/../src/interface/search.cpp:829 +#, c-format +msgid "Selected %d file for transfer." +msgid_plural "Selected %d files for transfer." +msgstr[0] "Transfer üçün seçilən %d fayl." +msgstr[1] "Transfer üçün seçilən %d fayl." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 +#, c-format +msgid "Selected %d file. Total size: %s" +msgid_plural "Selected %d files. Total size: %s" +msgstr[0] "Seçilmiş %d fayl. Ümumi ölçüsü: %s" +msgstr[1] "Seçilmiş %dfayl. Ümumi ölçüsü: %s" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#, c-format +msgid "Selected %d file. Total size: At least %s" +msgid_plural "Selected %d files. Total size: At least %s" +msgstr[0] "Seçilmiş %dfayl. Ümumi ölçüsü: Ən az %s" +msgstr[1] "Seçilmiş %d fayl. Ümumi ölçüsü: Ən az %s" + +#: ../../locales/../src/interface/search.cpp:835 +#, c-format +msgid "Selected %s and %s for transfer." +msgstr "Transfer üçün %s və %s seçildi." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 +#, c-format +msgid "Selected %s and %s. Total size: %s" +msgstr "Seçilmiş %s və %s. Ümumi ölçüsü: %s" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 +#, c-format +msgid "Selected %s and %s. Total size: At least %s" +msgstr "Seçilmiş %s və %s. Ümumi ölçüsü: Ən az %s" + +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 +msgid "Selected editor does not exist." +msgstr "Seçilmiş redaktor yoxdur." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 +msgid "Selected file already being edited" +msgstr "Seçilən fayl artıq redaktə edilib" + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 +msgid "Selected file is already loaded" +msgstr "Seçilmiş fayl artıq yüklənmişdir" + +#: ../../locales/../src/interface/edithandler.cpp:1700 +msgid "Selected file is already opened" +msgstr "Seçilmiş fayl artıq açılıb" + +#: ../../locales/../src/interface/edithandler.cpp:1772 +msgid "Selected file is still being edited" +msgstr "Seçilmiş fayl hələ də redaktə edilir" + +#: ../../locales/../src/interface/filter.cpp:188 +msgid "Selected filter only works for local files." +msgstr "Seçilmiş filtre yalnız yerli fayllar üçün işləyir." + +#: ../../locales/../src/interface/menu_bar.cpp:321 +msgid "" +"Selected global bookmark and current server use a different server type.\n" +"Use site-specific bookmarks for this server." +msgstr "" +"Seçilmiş qlobal əlfəcin və mövcud server fərqli bir server növü istifadə " +"edir.\n" +"Bu server üçün saytın xüsusi əlamətlərini istifadə edin." + +#: ../../locales/../src/engine/engineprivate.cpp:307 +msgid "Selected port usually in use by a different protocol." +msgstr "Müxtəlif bir protokolla istifadə edilən seçilmiş port." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 +msgid "Send FTP &keep-alive commands" +msgstr "FTP-ə canlı əmr göndər" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 +msgid "Send custom command to the server otherwise not available" +msgstr "Serverə xüsusi əmri göndərmək başqa cür mümkün deyil" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 +msgid "Sending keep-alive command" +msgstr "Saxta canlı əmr göndərmə" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 +msgid "Serial number:" +msgstr "Seriya nömrəsi:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 +msgid "Server &Type:" +msgstr "Server Tipi:" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:883 +msgid "Server did not properly shut down TLS connection" +msgstr "Server TLS bağlantısı düzgün şəkildə bağlamadı" + +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 +msgid "Server does not support non-ASCII characters." +msgstr "Server, ASCII olmayan simvolları bilmir." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:269 +#, c-format +msgid "Server does not support resume of files > %d GB." +msgstr "Server > %d GB ölçüsündən böyük faylları davam etdirməyi dəstəkləmir." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:266 +#, c-format +msgid "" +"Server does not support resume of files > %d GB. End transfer since file " +"sizes match." +msgstr "" +"Sever >%d GB ölçüsündən böyük falları dəstəkləmir. Fayl ölçüləri eyni " +"olduqda köçürülmə dayandırılsın." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:528 +msgid "Server does not support resume of files > 2GB." +msgstr "Server > 2GB ölçüsündən böyük faylları davam etdirməyi dəstəkləmir." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:524 +msgid "Server does not support resume of files > 4GB." +msgstr "Server 4GB ölçüsündən böyük faylları dəstəkləmir." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Server şifrəsi" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:277 +#, c-format +msgid "" +"Server may not support resume of files > %d GB. End transfer since file " +"sizes match." +msgstr "" +"Server >%d Gb ölçüsündən böyük faylları dəstəkləmir. Fayl ölçüləri bərabər " +"olduqda köçürülmə dayandırılsın." + +#: ../../locales/../src/engine/ftp/logon.cpp:338 +msgid "" +"Server might require an account. Try specifying an account using the Site " +"Manager" +msgstr "" +"Server hesabı tələb edə bilər. Site menecerindən istifadə edərək hesabı " +"göstərməyi sınayın" + +#: ../../locales/../src/engine/http/request.cpp:249 +msgid "Server not sending proper line endings" +msgstr "Server düzgün xətt sonlarını göndərməyib" + +#: ../../locales/../src/engine/ControlSocket.cpp:342 +msgid "Server returned empty path." +msgstr "Server boş yola döndü." + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:224 +msgid "" +"Server sent an additional login prompt. You need to use the interactive " +"login type." +msgstr "" +"Server əlavə giriş sorğusu göndərdi. İnteraktiv giriş növündən istifadə " +"etməlisiniz." + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 +msgid "Server sent passive reply with unroutable address. Passive mode failed." +msgstr "" +"Server qeyri-mümkün ünvanı ilə passiv cavab göndərdi. Passiv rejimi uğursuz " +"oldu." + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 +msgid "" +"Server sent passive reply with unroutable address. Using server address " +"instead." +msgstr "" +"Server qeyri-mümkün ünvanı ilə passiv cavab göndərdi. Bunun yerine server " +"ünvanı istifadə ediləcək." + +#: ../../locales/../src/engine/http/request.cpp:526 +msgid "Server sent too much data." +msgstr "Server çox məlumat göndərdi." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 +msgid "Server sent unexpected reply." +msgstr "Server gözlənilməz cavab göndərdi." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1276 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Server TLS spesifikasiyalarına zidd olaraq sıralanmamış sertifikat zənciri " +"göndərdi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 +msgid "Server to client MAC:" +msgstr "Serverdən müştərinin MAC ünvanına:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 +msgid "Server to client cipher:" +msgstr "Serverdən müştəriyə şifrə:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 +msgid "Server&type:" +msgstr "Server tipi:" + +#: ../../locales/../src/interface/queue.cpp:1162 +msgid "Server/Local file" +msgstr "Server / Yerli fayl" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 +msgid "Server:" +msgstr "Server:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 +msgid "Session details" +msgstr "Oturum detalları" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 +msgid "Set &Priority" +msgstr "Prioritet təyin edin" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:589 +#, c-format +msgid "Setting permissions of '%s' to '%s'" +msgstr "'%s' in icazəsi '%s' formasında dəyişdirilir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 +msgid "Settings" +msgstr "Ayarlar" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 +msgid "Settings directory:" +msgstr "Ayarlar qovluğu:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Bildiriş balonunu göstər" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 +msgid "Show &raw directory listing" +msgstr "Yeni kataloq siyahısını göstərin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 +msgid "Show &welcome dialog..." +msgstr "Xoş qarşılamanı göstər ..." + +#: ../../locales/../src/interface/Mainfrm.cpp:2312 +msgid "Show both directory trees and continue comparing?" +msgstr "Qovluq ağaclarını göstərilərək müqayisə etməyə davam edirsiniz?" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 +msgid "Show details" +msgstr "Ətraflı göstər" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 +msgid "Show details about custom date and time formats" +msgstr "Xüsusi tarix və vaxt formatları haqqında məlumatları göstərin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:448 +msgid "Shows available TLS ciphers" +msgstr "Mövcud TLS şifrlərini göstərir" + +#: ../../locales/../src/interface/cmdline.cpp:6 +msgid "Shows this help dialog" +msgstr "Bu kömək informasiya qutusunu göstərir" + +#: ../../locales/../src/interface/QueueView.cpp:2749 +msgid "Shutdown now" +msgstr "İndi bağlama" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 +msgid "Signature algorithm:" +msgstr "İmza alqoritmi:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Hesab yarat" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 +msgid "Site &Manager entries" +msgstr "Sayt meneceri girişləri" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 +msgid "Site Manager" +msgstr "Sayt Meneceri" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +msgid "Site Manager - Cannot remember password" +msgstr "Sayt meneceri - Şifrəni xatırlamır" + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Sayt meneceri - Yaradılan açar" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1046 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1059 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1092 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1179 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 +msgid "Site Manager - Invalid data" +msgstr "Site Meneceri - Yanlış məlumatlar" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:300 +msgid "Site Manager already open" +msgstr "Site meneceri artıq açıqdır" + +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 +msgid "Site does not exist." +msgstr "Sayt tapılmadı." + +#: ../../locales/../src/interface/sitemanager.cpp:500 +msgid "Site path has to begin with 0 or 1." +msgstr "Sayt yolu 0 və ya 1 ilə başlamalıdır." + +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 +msgid "Site path is malformed." +msgstr "Sayt yolu səhvdir." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 +msgid "Site-specific bookmarks" +msgstr "Saytın xüsusi əlamətləri" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +msgid "" +"Site-specific bookmarks require the server to be stored in the Site " +"Manager.\n" +"Add current connection to the site manager?" +msgstr "" +"Saytın xüsusi əlamətləri serverin Sayt menecerində saxlanmasını tələb edir.\n" +"Sayt menecerinə cari əlaqə əlavə edilsin?" + +#: ../../locales/../src/interface/queue.cpp:1162 +msgid "Size" +msgstr "Ölçü" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 +msgid "Size formatting" +msgstr "Ölçü formatı" + +#: ../../locales/../src/interface/fileexistsdlg.cpp:43 +msgid "Size unknown" +msgstr "Ölçü bilinmir" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 +msgid "Skip file" +msgstr "Fayl atlayın" + +#: ../../locales/../src/engine/ControlSocket.cpp:1207 +#: ../../locales/../src/engine/ControlSocket.cpp:1224 +#: ../../locales/../src/engine/ControlSocket.cpp:1250 +#: ../../locales/../src/engine/ControlSocket.cpp:1328 +#, c-format +msgid "Skipping download of %s" +msgstr "%s yüklənməsi atlanır" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Qeyri-mövcud əsas fayl \"%s\" atlama" + +#: ../../locales/../src/engine/ControlSocket.cpp:1210 +#: ../../locales/../src/engine/ControlSocket.cpp:1227 +#: ../../locales/../src/engine/ControlSocket.cpp:1253 +#: ../../locales/../src/engine/ControlSocket.cpp:1331 +#, c-format +msgid "Skipping upload of %s" +msgstr "%s yükləməsini atlayın" + +#: ../../locales/../src/engine/socket.cpp:1073 +msgid "Socket address outside address space" +msgstr "Ünvanın kənarında soket ünvanı" + +#: ../../locales/../src/engine/socket.cpp:1075 +msgid "Socket already connected" +msgstr "Soket zatən bağlıdır" + +#: ../../locales/../src/engine/socket.cpp:1083 +msgid "Socket has been shut down" +msgstr "Soket bağlandı" + +#: ../../locales/../src/engine/socket.cpp:1080 +msgid "Socket not connected" +msgstr "Soket bağlı deyil" + +#: ../../locales/../src/engine/socket.cpp:1123 +msgid "Socket type not supported for address family" +msgstr "Soket növü ünvan ailəsi üçün dəstəklənmir" + +#: ../../locales/../src/interface/Mainfrm.cpp:1254 +msgid "Some files are still being edited or need to be uploaded." +msgstr "Bəzi fayllar hələ də redaktə olunur və ya yüklənməlidir." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 +msgid "" +"Some misconfigured remote servers which are behind a router, may reply with " +"their local IP address." +msgstr "" +"Yönləndiricinin arxasında olan bəzi yanlış qurulmuş uzaq serverlər yerli IP " +"ünvanı ilə cavab verə bilərlər." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +msgid "Sort directories inline" +msgstr "Sətirdəki qovluqları sıralayın" + +#: ../../locales/../src/interface/filelistctrl.cpp:470 +msgid "Sort order cannot be changed if comparing directories." +msgstr "Qovluqları müqayisə edərkən sıralama əmri dəyişdirilə bilməz." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 +msgid "Sorting" +msgstr "Sıralama" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 +msgid "Sorting &mode:" +msgstr "Sortlaşdırma rejimi:" + +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 +msgid "Source and path of the drop operation are identical" +msgstr "Buraxılış əməliyyatının qaynağı və yolu eynidır" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +msgid "Source and target file may not be the same" +msgstr "Mənbə və hədəf faylları eyni ola bilməz" + +#: ../../locales/../src/interface/RemoteListView.cpp:149 +msgid "Source and target of the drop operation are identical" +msgstr "Buraxılış əməliyyatının mənbəyi və hədəfi eynidır" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 +msgid "Source file:" +msgstr "Mənbə fayl:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 +msgid "Speed Limits" +msgstr "Sürət limiti" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 +msgid "Speed limits" +msgstr "Sürət limitləri" + +#: ../../locales/../src/interface/statusbar.cpp:591 +msgid "Speed limits are disabled, click to change." +msgstr "Sürət limitləri aradan qaldırılır, dəyişdirmək üçün basın." + +#: ../../locales/../src/interface/statusbar.cpp:594 +msgid "Speed limits are enabled, click to change." +msgstr "Sürət limitləri aktivdir, dəyişdirmək üçün basın." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 +msgid "Stable and beta versions" +msgstr "Stabil və beta versiyaları" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 +msgid "Stable versions only" +msgstr "Yalnız sabit versiyalar" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 +msgid "Stable, beta and nightly versions" +msgstr "Stabil, beta və gecə versiyaları" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 +msgid "Start transfer &immediately" +msgstr "Dərhal transferə başlayın" + +#: ../../locales/../src/interface/cmdline.cpp:7 +msgid "Start with opened Site Manager" +msgstr "Açılan Sayt Meneceri ilə başlayın" + +#: ../../locales/../src/interface/updater.cpp:239 +#, c-format +msgid "Started update check on %s\n" +msgstr "%s üzrə yenilənmə başlanıb\n" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 +#, c-format +msgid "Starting download of %s" +msgstr "%s endirilməsinə başlanılır" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 +#, c-format +msgid "Starting upload of %s" +msgstr "%s yükləməsinə başlanılır" + +#: ../../locales/../src/interface/cmdline.cpp:9 +msgid "Starts the local site in the given path" +msgstr "Yerli sayt verilmiş yol ilə başladılır" + +#: ../../locales/../src/interface/verifycertdialog.cpp:247 +msgid "State or province:" +msgstr "Şəhər:" + +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1162 +msgid "Status" +msgstr "Status" + +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:298 +#: ../../locales/../src/interface/StatusView.cpp:381 +msgid "Status:" +msgstr "Statu:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 +msgid "Stop and remove &all" +msgstr "Dayandır və hamısını sil" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 +msgid "Stop recursive operation" +msgstr "Alt qovluq əməliyyatını dayandırın" + +#: ../../locales/../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Mərkəzsizləşdirilmiş Bulud Saxlama" + +#: ../../locales/../src/interface/FileZilla.cpp:600 +msgid "Storj support" +msgstr "Storj dəstəyi" + +#: ../../locales/../src/interface/verifycertdialog.cpp:251 +msgid "Street:" +msgstr "Küçə:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 +msgid "Subject of certificate" +msgstr "Sertifikat mövzusu" + +#: ../../locales/../src/interface/queueview_successful.cpp:12 +msgid "Successful transfers" +msgstr "Uğurlu transferlər" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 +msgid "Summary of test results:" +msgstr "Test nəticələrinin xülasəsi:" + +#: ../../locales/../src/interface/QueueView.cpp:2757 +msgid "Suspend now" +msgstr "İndi dayandırın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 +msgid "" +"Symlinks to files are not affected by this choice, such symlinks are always " +"deleted." +msgstr "" +"Fayllara keçən simvollar bu seçimdən təsirlənmir, belə siqnallar həmişə " +"silinir." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:247 +#: ../../locales/../src/interface/state.cpp:262 +#: ../../locales/../src/interface/state.cpp:269 +#: ../../locales/../src/interface/state.cpp:280 +#: ../../locales/../src/interface/state.cpp:379 +#: ../../locales/../src/interface/state.cpp:387 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:1054 +#: ../../locales/../src/interface/state.cpp:1062 +#: ../../locales/../src/interface/state.cpp:1069 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1105 +#: ../../locales/../src/interface/toolbar.cpp:52 +msgid "Synchronized browsing" +msgstr "Sinxronlaşdırılan tarama" + +#: ../../locales/../src/interface/state.cpp:394 +msgid "Synchronized browsing has been disabled." +msgstr "Sinxronlaşdırma gözdən keçirildi." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Qovluqları sinxronizasiya etmək." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 +msgid "Syntax error" +msgstr "Sintaksis səhvi" + +#: ../../locales/../src/interface/cmdline.cpp:76 +#: ../../locales/../src/interface/cmdline.cpp:82 +#: ../../locales/../src/interface/cmdline.cpp:88 +#: ../../locales/../src/interface/cmdline.cpp:97 +#: ../../locales/../src/interface/cmdline.cpp:103 +#: ../../locales/../src/interface/Mainfrm.cpp:2427 +#: ../../locales/../src/interface/Mainfrm.cpp:2472 +msgid "Syntax error in command line" +msgstr "Komanda xəttində sintaksis səhvi" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 +msgid "System" +msgstr "Sistem" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 +msgid "System details" +msgstr "Sistem məlumatları" + +#: ../../locales/../src/engine/socket.cpp:1064 +msgid "System limit of open files exceeded" +msgstr "Açıq faylların sistem həddi aşıldı" + +#: ../../locales/../src/engine/socket.cpp:1121 +msgid "System's network subsystem has failed" +msgstr "Sistemin şəbəkə sistemi uğursuz oldu" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +msgid "T&oolbar" +msgstr "Alətlər paneli" + +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:131 +msgid "TLS connection established, sending HTTP request" +msgstr "TLS bağlantısı quraşdırılıb, HTTP sorğu göndərilir" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 +msgid "TLS connection established, waiting for welcome message..." +msgstr "TLS bağlantısı quruldu, xoş xəbəri gözləyir ..." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 +msgid "TLS connection established." +msgstr "TLS bağlantısı quruldu." + +#: ../../locales/../src/engine/proxy.cpp:507 +msgid "TTL expired" +msgstr "TTL müddəti bitdi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:6 +msgid "Target file already exists" +msgstr "Hədəf faylı zatən var" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 +msgid "Target file:" +msgstr "Hədəf fayl:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2666 +msgid "Target filename already exists!" +msgstr "Hədəf fayl zatən var!" + +#: ../../locales/../src/interface/RemoteListView.cpp:1631 +msgid "Target filename already exists, really continue?" +msgstr "Hədəf fayl adı zatən var, davam edilsin?" + +#: ../../locales/../src/engine/socket.cpp:1094 +msgid "Temporary failure in name resolution" +msgstr "Ad həllində müvəqqəti müvəffəqiyyətsizlik" + +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Test uğurla başa çatdı" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 +msgid "Test results" +msgstr "Test nəticələri" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:281 +msgid "Testing resume capabilities of server" +msgstr "Serverin davam imkanlarını test et" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Aşağıdakı fayllar hazırda redaktə olunur:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:782 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "" +"Faylın təmir ediləcəyi təqdirdə Sayt menecerindən istifadə edilə bilməz." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:299 +msgid "" +"The Site Manager is opened in another instance of FileZilla 3.\n" +"Do you want to continue? Any changes made in the Site Manager won't be saved " +"then." +msgstr "" +"Sayt meneceri başqa bir FileZilla 3 instansiyasında açıqdır.\n" +"Davam etmək istəyirsinizmi? Sayt menecerində edilən hər hansı dəyişiklik " +"bundan sonra saxlanılmayacaqdır." + +#: ../../locales/../src/interface/clearprivatedata.cpp:98 +msgid "" +"The Site Manager is opened in another instance of FileZilla 3.\n" +"Please close it or the data cannot be deleted." +msgstr "" +"Sayt meneceri başqa bir FileZilla 3 instansiyasında açıqdır.\n" +"Xahiş edirik onu bağlayın yoxsa məlumatlar silinə bilməz." + +#: ../../locales/../src/interface/netconfwizard.cpp:640 +#, c-format +msgid "The address you entered was: %s" +msgstr "Yazdığını adres: %s" + +#: ../../locales/../src/engine/socket.cpp:1100 +msgid "The ai_family member is not supported" +msgstr "Ai_family üzvü dəstəklənmir" + +#: ../../locales/../src/engine/socket.cpp:1113 +msgid "The ai_socktype member is not supported" +msgstr "Ai_socktype üzvü dəstəklənmir" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 +msgid "The bookmark could not be added." +msgstr "Yerləşdirmə əlavə oluna bilmədi." + +#: ../../locales/../src/interface/sitemanager.cpp:781 +msgid "The bookmarks could not be cleared." +msgstr "Əlfəcinlər silinə bilmədi." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1323 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Sertifikat serverin cavabında OCSP statusunu daxil etməsini tələb edir, " +"lakin OCSP statusu yoxdur." + +#: ../../locales/../src/interface/statusbar.cpp:475 +msgid "The connection is encrypted. Click icon for details." +msgstr "Bağlantı şifrələnir. Ayrıntılar üçün işarəyə basın." + +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 +msgid "" +"The custom date format is invalid or contains unsupported format specifiers." +msgstr "Xüsusi tarix formatı etibarsızdır və ya dəstəklənməyən format var." + +#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 +msgid "The custom login sequence cannot be empty." +msgstr "Xüsusi giriş sırası boş ola bilməz." + +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 +msgid "" +"The custom time format is invalid or contains unsupported format specifiers." +msgstr "Xüsusi vaxt formatı etibarsızdır və ya dəstəklənməyən format var." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 +#, c-format +msgid "The data connection could not be established: %s" +msgstr "Məlumat bağlantısı qurulmadı: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 +msgid "The default editor for text files could not be found." +msgstr "Mətn faylları üçün default redaktor tapıla bilmədi." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 +#, c-format +msgid "The default editor for text files is '%s'." +msgstr "Mətn faylları üçün standart redaktor '%s' dir." + +#: ../../locales/../src/interface/filteredit.cpp:149 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +msgid "The entered filter name already exists, please choose a different name." +msgstr "Girilmiş filtr adı zatən var, başqa bir ad seçin." + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:201 +msgid "The entered passwords are not the same." +msgstr "Girilən parollar eyni deyil." + +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 +#, c-format +msgid "The extension '%s' does already exist in the list" +msgstr "Siyahıda '%s' uzantısı artıq mövcuddur" + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#, c-format +msgid "" +"The file %s already exists.\n" +"Please enter a new name:" +msgstr "" +"%s faylı artıq mövcuddur.\n" +"Xahiş edirik yeni bir ad daxil edin:" + +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1760 +#, c-format +msgid "" +"The file '%s' cannot be opened:\n" +"The associated program (%s) could not be found.\n" +"Please check your filetype associations." +msgstr "" +"'%s' faylı açıla bilməz:\n" +"Əlaqəli proqram (%s) tapıla bilmədi.\n" +"Xahiş edirik fayl tipi dərnəklərinizi yoxlayın." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"'%s' faylı bir SSH1 düyməsini ehtiva edir. SSH1 protokolu etibarsız sayıldı, " +"FileZilla yalnız SSH2 düymələrini dəstəkləyir." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 +#, c-format +msgid "The file '%s' could not be loaded or does not contain a private key." +msgstr "'%s' faylı yüklənə bilmədi və ya xüsusi bir düymə yoxdur." + +#: ../../locales/../src/interface/xmlfunctions.cpp:36 +#, c-format +msgid "The file '%s' could not be loaded." +msgstr "'%s' faylı yüklənə bilmədi." + +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1756 +#, c-format +msgid "" +"The file '%s' could not be opened:\n" +"No program has been associated on your system with this file type." +msgstr "" +"'%s' faylı açıla bilmədi:\n" +" Bu fayl növü ilə sisteminizdə proqram yoxdur." + +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1768 +#, c-format +msgid "" +"The file '%s' could not be opened:\n" +"The associated command failed" +msgstr "" +"'%s' faylı açıla bilmədi:\n" +" Əlaqəli komanda uğursuz oldu" + +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:789 +#, c-format +msgid "" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" +msgstr "" +"'%s' faylı FileZilla -nın köhnə versiyası ilə yaradılmışdır.\n" +"Daha yeni versiyaların yaratdığı faylların yüklənməsi məlumat itirilməsinə " +"səbəb ola bilər.\n" +"Davam etmək istəyirsinizmi?" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 +#, c-format +msgid "" +"The file '%s' is not in a format supported by FileZilla.\n" +"Would you like to convert it into a supported format?" +msgstr "" +"'%s' faylı FileZilla. tərəfindən dəstəklənən formatda deyil.\n" +"Bunu dəstəklənən bir formata çevirmək istəyirsinizmi?" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 +msgid "The file selected as default editor does not exist." +msgstr "Cari redaktor kimi seçilən fayl yoxdur." + +#: ../../locales/../src/interface/import.cpp:98 +msgid "" +"The file you have selected contains site manager data from a previous " +"version of FileZilla.\n" +"Due to differences in the storage format, only host, port, username and " +"password will be imported.\n" +"Continue with the import?" +msgstr "" +"Seçdiyiniz fayl FileZilla-nın əvvəlki bir versiyasından sayt meneceri " +"məlumatlarını ehtiva edir.\n" +"Saxlama formatında olan fərqlər səbəbi ilə yalnız server, port, istifadəçi " +"adı və şifrə idxal olunacaq.\n" +"İxraca davam edirsiniz?" + +#: ../../locales/../src/interface/listctrlex.cpp:745 +msgid "The filename column can neither be hidden nor moved." +msgstr "Fayl sütunu nə gizlədilə bilər nə də köçürülə bilməz." + +#: ../../locales/../src/interface/listctrlex.cpp:795 +msgid "The filename column cannot be hidden." +msgstr "Fayl adı sütünü gizlədilə bilməz." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 +#, c-format +msgid "The following character will be replaced: %s" +msgstr "Aşağıdakı xarakter dəyişəcək: %s" + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:66 +#, c-format +msgid "The following characters will be replaced: %s" +msgstr "Aşağıdakı simvollar dəyişəcək: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 +msgid "The free open source FTP solution" +msgstr "Pulsuz açıq mənbə FTP həlli" + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Yaradılan şifrələmə açarı:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 +msgid "The global bookmarks could not be saved." +msgstr "Qlobal əlfəcinlər yadda saxlanıla bilmədi." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 +msgid "" +"The higher the debug level, the more information will be displayed in the " +"message log. Displaying debug information has a negative impact on " +"performance." +msgstr "" +"Xəta müəyyənləşdirmə səviyyəsi yüksək olduqca daha çox məlumat mesaj " +"qeydində göstərilir. Debug məlumatlarının göstərilməsi performansa mənfi " +"təsir göstərir." + +#: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 +msgid "The limit needs to be between 1 and 2000 MiB" +msgstr "Limit 1 və 2000 MiB arasında olmalıdır" + +#: ../../locales/../src/interface/state.cpp:1105 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Yerli kataloq '%s' yaradıla bilmədi." + +#: ../../locales/../src/interface/state.cpp:1090 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "Yerli kataloq '%s' mövcud deyil." + +#: ../../locales/../src/interface/state.cpp:259 +#, c-format +msgid "" +"The local directory '%s' is not below the synchronization root (%s).\n" +"Disable synchronized browsing and continue changing the local directory?" +msgstr "" +"'%s' yerli katoloqu (%s) sinxronizasiya kökündən aşağı deyil.\n" +"Sinxronlaşdırılan taramayı aradan buraxıb yerli kataloqu dəyişdirməyə davam " +"edirsiniz?" + +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 +msgid "" +"The lowest available port has to be less or equal than the highest available " +"port." +msgstr "" +"Ən aşağı mövcud liman ən yüksək mövcud portdan az və ya bərabər olmalıdır." + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "The master password needs to be at least 8 characters long." +msgstr "Ana şifrənin uzunluğu ən azı 8 simvol olmalıdır." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 +msgid "The new version could not be downloaded, please retry later." +msgstr "Yeni versiya endirilməyib, daha sonra yenidən cəhd edin." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +msgid "The new version has been saved in your Downloads directory." +msgstr "Yeni versiya Yüklənənlər qovluğunda saxlanıldı." + +#: ../../locales/../src/interface/QueueView.cpp:1553 +msgid "The queue will not be saved." +msgstr "Növbə qeyd olunmayacaq." + +#: ../../locales/../src/interface/state.cpp:1012 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "'%s' adlı uzaq qovluq mövcud deyil." + +#: ../../locales/../src/interface/state.cpp:1059 +#, c-format +msgid "" +"The remote directory '%s' is not below the synchronization root (%s).\n" +"Disable synchronized browsing and continue changing the remote directory?" +msgstr "" +"Uzaq qovluq '%s' sinxronizasiya kökünün altındakı deyil (%s) .\n" +"Sinxronlaşdırılanların gözdən keçirilməsini aradan qaldırıb uzaq qovluğu " +"dəyişdirməyə davam edilsin?" + +#: ../../locales/../src/interface/import.cpp:88 +msgid "The selected categories have been imported." +msgstr "Seçilmiş kateqoriyalar idxal edilib." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 +msgid "" +"The selected file contains importable data for the following categories:" +msgstr "" +"Seçilmiş fayl aşağıdakı kateqoriyalara aid edilə bilən məlumatları ehtiva " +"edir:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 +msgid "The selected file is already being edited:" +msgstr "Seçilmiş fayl artıq zənginləşdirilmişdir:" + +#: ../../locales/../src/interface/edithandler.cpp:1772 +msgid "" +"The selected file is still opened in some other program, please close it." +msgstr "Seçilmiş fayl hələ də başqa bir proqramda açılır, onu bağlayın." + +#: ../../locales/../src/interface/edithandler.cpp:1678 +msgid "" +"The selected file would be executed directly.\n" +"This can be dangerous and might damage your system.\n" +"Do you really want to continue?" +msgstr "" +"Seçilən fayl birbaşa həyata keçiriləcəkdir.\n" +"Bu təhlükəli ola bilər və sisteminizə zərər verə bilər.\n" +"Həqiqətən davam etmək istəyirsiniz?" + +#: ../../locales/../src/interface/sitemanager.cpp:584 +msgid "The server could not be added." +msgstr "Server əlavə edilmədi." + +#: ../../locales/../src/interface/netconfwizard.cpp:596 +msgid "The server sent an unexpected or unrecognized reply." +msgstr "Server gözlənilməz və ya tanınmayan cavab göndərdi." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 +msgid "The server uses following charset encoding for filenames:" +msgstr "Server fayl adları üçün aşağıdakı xarakter kodlamasını istifadə edir:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 +msgid "" +"The server's certificate is unknown. Please carefully examine the " +"certificate to make sure the server can be trusted." +msgstr "" +"Serverin sertifikatı məlum deyil. Xahiş edirik serverin etibarlı olmasını " +"təmin etmək üçün sertifikatı diqqətlə araşdırın." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 +msgid "" +"The server's host key does not match the key that has been cached. This " +"means that either the administrator has changed the host key, or you are " +"actually trying to connect to another computer pretending to be the server." +msgstr "" +"Serverin ana dili açarı önyaddaşa alınmış açara uyğun gəlmir. Bu ya " +"administrator düyməni dəyişdirdi və ya həqiqətən server olmağı əmr edən " +"başqa bir kompüterə qoşulmağa çalışırsınız." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 +msgid "" +"The server's host key is unknown. You have no guarantee that the server is " +"the computer you think it is." +msgstr "" +"Serverin ana xətası bilinmir. Server hesab etdiyiniz kompüter olduğuna dair " +"heç bir zəmanət yoxdur." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1318 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Serverin adı sertifikatın adına uyğun gəlmir" + +#: ../../locales/../src/engine/socket.cpp:1112 +msgid "The servname parameter is not supported for ai_socktype" +msgstr "Servname parametri ai_socktype üçün dəstəklənmir" + +#: ../../locales/../src/interface/import.cpp:81 +msgid "" +"The settings have been imported. You have to restart FileZilla for all " +"settings to have effect." +msgstr "" +"Ayarlar idxal edilib. FileZilla-nın bütün parametrlərinin effektiv olması " +"üçün yenidən başladın." + +#: ../../locales/../src/engine/socket.cpp:1060 +msgid "The specified address family is not supported" +msgstr "Göstərilən ünvan ailəsi dəstəklənmir" + +#: ../../locales/../src/engine/socket.cpp:1125 +msgid "The specified network name is no longer available" +msgstr "Göstərilən şəbəkə adı artıq mövcud deyil" + +#: ../../locales/../src/interface/QueueView.cpp:2752 +msgid "The system will soon reboot unless you click Cancel." +msgstr "Ləğv et düyməsini sıxmasanız sistem yenidən başlayacaq." + +#: ../../locales/../src/interface/QueueView.cpp:2748 +msgid "The system will soon shut down unless you click Cancel." +msgstr "Ləğv et düyməsin sıxmasanız sistem bağlanacaq." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 +msgid "" +"The target file already exists.\n" +"Please choose an action." +msgstr "" +"Hədəf fayl zaten mövcuddur.\n" +"Xahiş edirik bir hərəkət seçin." + +#: ../../locales/../src/interface/netconfwizard.cpp:867 +msgid "The test did not succeed. Do you really want to save the settings?" +msgstr "Test uğursuz oldu. Həqiqətən parametrləri saxlamaq istəyirsiniz?" + +#: ../../locales/../src/interface/xmlfunctions.cpp:81 +#, c-format +msgid "The valid backup file %s could not be restored" +msgstr "%s yaddaş faylı bərpa oluna bilmədi" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 +msgid "Themes" +msgstr "Mövzular" + +#: ../../locales/../src/interface/filter.cpp:340 +msgid "This filter set cannot be removed." +msgstr "Bu filter dəsti silinə bilməz." + +#: ../../locales/../src/interface/filter.cpp:276 +msgid "This filter set cannot be renamed." +msgstr "Bu filter dəsti adını dəyişdirə bilməz." + +#: ../../locales/../src/interface/netconfwizard.cpp:597 +msgid "" +"This means that some router and/or firewall is still interfering with " +"FileZilla." +msgstr "" +"Budur, bəzi yönəldici və ya təhlükəsizlik divarı FileZilla ilə problem " +"yaradır." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:183 +msgid "" +"This only works if you are not behind a router, else your system would just " +"return your internal address." +msgstr "" +"Bu yalnız bir yönləndirici arxasında deyilsinizsə, başqa bir halda " +"sisteminiz yalnız daxili ünvanınızı qaytaracaqdır." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 +msgid "" +"This wizard will help you to properly configure any routers and firewalls " +"you have and tests your configuration." +msgstr "" +"Bu yardımçı sizə uyğun marşrutlaşdırıcıları və təhlükəsizlik divarlarınızı " +"düzgün konfiqurasiya etməyə və konfiqurasiya sınağınıza kömək edəcək." + +#: ../../locales/../src/interface/queue.cpp:1162 +msgid "Time" +msgstr "Saat" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 +msgid "Time formatting" +msgstr "Saat tipi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 +msgid "Time&out in seconds:" +msgstr "Vaxt(saniyə)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:337 +msgid "Timeout" +msgstr "Taym-aut" + +#: ../../locales/../src/interface/verifycertdialog.cpp:245 +msgid "Title:" +msgstr "Başlıq:" + +#: ../../locales/../src/interface/Mainfrm.cpp:2310 +msgid "To compare directories, both file lists have to be aligned." +msgstr "" +"Qovluqları müqayisə etmək üçün hər iki fayl siyahısının nizzalanması " +"lazımdır." + +#: ../../locales/../src/interface/Mainfrm.cpp:2311 +msgid "To do this, the directory trees need to be both shown or both hidden." +msgstr "" +"Bunu etmək üçün, qovluq ağaclarının həm ikitərəfli, həm də gizli olması " +"lazımdır." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 +msgid "" +"To support public key authentication, FileZilla needs to know the private " +"keys to use." +msgstr "" +"FileZilla açıq açar istifadə edə bilmək üçün şəxşi şifrənizi bilməlidir." + +#: ../../locales/../src/interface/toolbar.cpp:51 +msgid "" +"Toggle directory comparison. Right-click to change comparison mode.\n" +"\n" +"Colors:\n" +"Yellow: File only exists on one side\n" +"Green: File is newer than the unmarked file on other side\n" +"Red: File sizes different" +msgstr "" +"Qovluq müqayisəsini dəyişdir. Müqayisə rejimini dəyişdirmək üçün sağ basın\n" +"\n" +"Rənglər:\n" +"Sarı:Fayl ancaq bir tərəfdə var\n" +"Yaşıl:Fayl digər tərəfdəki işarələnmiş fayldan yeni\n" +"Qırmızı:Fayl ölçüləri fərqlidir" + +#: ../../locales/../src/interface/toolbar.cpp:52 +msgid "" +"Toggle synchronized browsing.\n" +"If enabled, navigating the local directory hierarchy will also change the " +"directory on the server accordingly and vice versa." +msgstr "" +"Sinxronlaşdırılan tarama keçid.\n" +"Aktiv olduqda, yerli kataloq naviqasiyası həmçinin serverdə olan kataloqu " +"müvafiq olaraq və əksinə dəyişəcəkdir." + +#: ../../locales/../src/interface/toolbar.cpp:44 +msgid "Toggles processing of the transfer queue" +msgstr "Transfer növbəsinin işlənməsini dəyişir" + +#: ../../locales/../src/interface/toolbar.cpp:38 +msgid "Toggles the display of the local directory tree" +msgstr "Yerli kataloq ağacının görünüşünü dəyişir" + +#: ../../locales/../src/interface/toolbar.cpp:37 +msgid "Toggles the display of the message log" +msgstr "Mesaj günlüğünün görünüşünü dəyişir" + +#: ../../locales/../src/interface/toolbar.cpp:39 +msgid "Toggles the display of the remote directory tree" +msgstr "Uzaq kataloq ağacının görünüşünü dəyişir" + +#: ../../locales/../src/interface/toolbar.cpp:40 +msgid "Toggles the display of the transfer queue" +msgstr "Transfer növbəsinin görünüşünü dəyişir" + +#: ../../locales/../src/engine/http/request.cpp:258 +msgid "Too long header line" +msgstr "Çox uzun başlıq xətti" + +#: ../../locales/../src/engine/http/filetransfer.cpp:132 +msgid "Too many redirects" +msgstr "Həddindən artıq yönləndirmələr" + +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:367 +msgid "Trace:" +msgstr "İz:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 +msgid "Transfer" +msgstr "Transfer" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 +msgid "Transfer &direction" +msgstr "Köçürmə istiqaməti" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 +msgid "Transfer &type" +msgstr "Transfer tipi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 +msgid "Transfer Mode" +msgstr "Transfer rejimi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 +msgid "Transfer Queue" +msgstr "Transfer növbəsi" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 +msgid "Transfer Settings" +msgstr "Transfer parametrləri" + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 +#, c-format +msgid "Transfer connection interrupted: %s" +msgstr "Transfer bağlantısı kəsildi: %s" + +#: ../../locales/../src/interface/netconfwizard.cpp:643 +msgid "Transferred data got tainted." +msgstr "Köçürülən məlumat kökündən silindi." + +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 +msgid "Transferring" +msgstr "Transfer" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 +msgid "Transfers" +msgstr "Transfers" + +#: ../../locales/../src/interface/QueueView.cpp:2632 +msgid "Transfers finished" +msgstr "Köçürmələr başa çatdı" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 +msgid "Treat files &without extension as ASCII file" +msgstr "ASCII fayl kimi genişlənmədən faylları müalicə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 +msgid "Treat the &following filetypes as ASCII files:" +msgstr "Aşağıdakı filtrləri ASCII faylları kimi nəzərdən keçirin:" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:385 +msgid "Trust changed Hostkey:" +msgstr "Dəyişdirilimiş server açarına güvənilsin:" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:382 +msgid "Trust new Hostkey:" +msgstr "Yeni server açarına güvənilsin:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 +msgid "Trust the new key and carry on connecting?" +msgstr "Yeni açara etibar edilərək bağlantı qurulsun?" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 +msgid "Trust this certificate and carry on connecting?" +msgstr "Bu sertifikata etibar edib əlaqə qurmağa davam edirsiniz?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 +msgid "Trust this host and carry on connecting?" +msgstr "Bu serverə etibar edib bağlantıya davam edirsiniz?" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 +msgid "Try again" +msgstr "Yenidən yoxla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 +msgid "Type" +msgstr "Tip" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 +msgid "Type of FTP Proxy:" +msgstr "FTP proxy tipi:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 +msgid "Type of generic proxy:" +msgstr "Ümumi proxy növü:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 +msgid "U&pload" +msgstr "Yüklə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 +msgid "U&pload limit:" +msgstr "Yükləmə limiti:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 +msgid "U&se filetype associations if available" +msgstr "Mövcud olan fayl dərnəklərindən istifadə edilsin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 +msgid "U&se system defaults for current language" +msgstr "Cari dil üçün sistemin standartlarını istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 +msgid "USER@&HOST" +msgstr "İSTİFADƏÇİ@&SERVER" + +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 +#, c-format +msgid "Unassigned error code %d" +msgstr "Təyin edilməmiş səhv kod %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:244 +msgid "Unit:" +msgstr "Vahid:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 +msgid "Unknown" +msgstr "Bilinməyən" + +#: ../../locales/../src/engine/ftp/logon.cpp:753 +msgid "Unknown FTP proxy type, cannot generate login sequence." +msgstr "Bilinməyən FTP proxy növü giriş sırasında yaradıla bilməz." + +#: ../../locales/../src/engine/proxy.cpp:438 +#, c-format +msgid "Unknown SOCKS protocol version: %d" +msgstr "Bilinməyən SOCKS protokol versiyası: %d" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:4 +msgid "Unknown certificate" +msgstr "Bilinməyən sertifikat" + +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Bilinməyən xəta %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Bilinməyən xəta %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 +msgid "Unknown host key" +msgstr "Bilinməyən server açarı" + +#: ../../locales/../src/engine/proxy.cpp:446 +#, c-format +msgid "" +"Unknown protocol version of SOCKS Username/Password Authentication " +"subnegotiation: %d" +msgstr "" +"SOCKS-in naməlum protokol versiyası İstifadəçi adı / Şifrə Doğrulama " +"bilinməyən əlaqə qanunu: %d" + +#: ../../locales/../src/interface/xmlfunctions.cpp:282 +msgid "" +"Unknown root element, the file does not appear to be generated by FileZilla." +msgstr "" +"Bilinməyən kök elementə rastlandı.Bu fayl FileZilla tərəfindən yaradılmış " +"kimi görünür." + +#: ../../locales/../src/engine/http/request.cpp:373 +msgid "Unknown transfer encoding" +msgstr "Bilinməyən transfer kodlaması" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 +msgid "" +"Unless these problems get fixed, active mode FTP will not work and passive " +"mode has to be used." +msgstr "" +"Bu problemlər sabitləşməyincə, aktiv rejim FTP işləməyəcək və passiv rejim " +"istifadə edilməlidir." + +#: ../../locales/../src/interface/netconfwizard.cpp:605 +msgid "" +"Unless this problem gets fixed, active mode FTP will not work and passive " +"mode has to be used." +msgstr "" +"Bu problem sabitləşməyincə, aktiv rejim FTP işləməyəcək və passiv rejim " +"istifadə edilməlidir." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1343 +msgid "Unsupported certificate type" +msgstr "Dəstəklənməyən sertifikat növü" + +#: ../../locales/../src/engine/http/filetransfer.cpp:137 +msgid "Unsupported redirect" +msgstr "Dəstəklənməyən yönləndirmə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 +msgid "Up&load and unedit" +msgstr "Yüklə və bağla" + +#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 +msgid "Updates" +msgstr "Yeniləmə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 +msgid "Upload" +msgstr "Yükləmə" + +#: ../../locales/../src/interface/edithandler.cpp:1160 +msgid "Upload failed" +msgstr "Yüklənmədi" + +#: ../../locales/../src/interface/statusbar.cpp:604 +#, c-format +msgid "Upload limit: %s/s" +msgstr "Yükləmə limiti: %s/s" + +#: ../../locales/../src/interface/statusbar.cpp:607 +msgid "Upload limit: none" +msgstr "Yükləmə limiti: boş" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:898 +msgid "Upload search results" +msgstr "Axtarış nəticələrini yükləyin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +msgid "Upload selected directory" +msgstr "Seçilmiş qovluğu yüklə" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 +msgid "Upload selected files and directories" +msgstr "Seçilmiş qovluğu və faylı yüklə" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 +msgid "Upload this file back to the server?" +msgstr "Bu fayllar serverə geri yüklənsin?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 +msgid "Upload this file to the server?" +msgstr "Bu faylını serverə yüklənsin?" + +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 +msgid "Uploading" +msgstr "Yüklənir" + +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 +msgid "Uploading and pending removal" +msgstr "Yüklənir və silinməsi gözlənilir" + +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 +msgid "Uploading and unediting" +msgstr "Yüklənib bağlanır" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 +msgid "Use &custom charset" +msgstr "Xüsusi xarakter istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +msgid "Use &custom editor:" +msgstr "Xüsusi redaktoru istifadə edin:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 +msgid "Use &default editor for text files" +msgstr "Mətn faylları üçün default redaktordan istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +msgid "Use &synchronized browsing" +msgstr "Sinxronlaşdırılan baxışdan istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 +msgid "Use UTF-8 if the server supports it, else use local charset." +msgstr "" +"Server dəstəkləyirsə UTF-8-dən istifadə edin, başqa yerdə yerli xarakter " +"istifadə edin." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 +msgid "Use default action" +msgstr "Cari fəaliyyətdən istifadə edin" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +msgid "Use explicit FTP over TLS if available" +msgstr "Mövcud olduqda TLS üzərindən açıq FTP istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 +msgid "Use server currently connected to" +msgstr "Hal-hazırda bağlı olan serverdən istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 +msgid "Use server from site manager" +msgstr "Server administratorundan istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 +msgid "Use system &defaults for current language" +msgstr "Cari dil üçün sistemin standartlarını istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 +msgid "Use the following IP address:" +msgstr "Aşağıdakı IP ünvanını istifadə edin:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 +msgid "Use the following port range:" +msgstr "Aşağıdakı port istifadə edin:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 +msgid "Use the server's external IP address instead" +msgstr "Bunun yerinə serverin xarici IP ünvanını istifadə edin" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 +msgid "" +"Use this if you're behind a router and have a static external IP address." +msgstr "" +"Bir yönləndirici arxasında olduğunuzda və statik xarici bir IP ünvanınız " +"varsa bunu istifadə edin." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 +msgid "" +"Use this option if you have a dynamic IP address. FileZilla will contact the " +"above server once each session as soon as you use active mode for the first " +"time. Only the version of FileZilla you're using is submitted to the server." +msgstr "" +"Dinamik bir IP ünvanı varsa bu seçimi istifadə edin. FileZilla, aktiv rejimi " +"ilk dəfə istifadə etdiyiniz zaman yuxarıda göstərilən serverlə hər seansda " +"bir dəfə müraciət edəcəkdir. Yalnız istifadə etdiyiniz FileZilla versiyası " +"serverə təqdim olunur." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 +msgid "User:" +msgstr "İstifadəçi:" + +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 +msgid "Username cannot be a series of spaces" +msgstr "İstifadəçi adı bir sıra boşluq ola bilməz" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 +msgid "" +"Using the wrong charset can result in filenames not displaying properly." +msgstr "" +"Yanlış xarakter istifadəsi fayl adlarının düzgün görüntülənməməsinə səbəb " +"ola bilər." + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 +msgid "Valid from:" +msgstr "Qüvvədə:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 +msgid "Valid to:" +msgstr "Etibarlılıq Sonu:" + +#: ../../locales/../src/interface/cmdline.cpp:17 +msgid "Verbose log messages from wxWidgets" +msgstr "WxWidgets-dən ətraflı məlumatlar" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1419 +msgid "Verifying certificate..." +msgstr "Sertifikat təsdiqlənir..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 +msgid "Very high" +msgstr "Çox yüksək" + +#: ../../locales/../src/engine/ftp/list.cpp:109 +msgid "View hidden option set, but unsupported by server" +msgstr "Gizli seçim dəstini göstər, lakin server tərəfindən dəstəklənmir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 +msgid "View/Edit" +msgstr "Bax / Düzəlt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 +msgid "Visible columns" +msgstr "Görünən sütunlar" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 +msgid "W&rite" +msgstr "Yaz" + +#: ../../locales/../src/interface/queue.cpp:343 +msgid "Waiting for browsing connection" +msgstr "Əlaqə üçün gözləyir" + +#: ../../locales/../src/interface/queue.cpp:344 +msgid "Waiting for password" +msgstr "Şifrə yazmağınızı gzöləyir" + +#: ../../locales/../src/interface/statuslinectrl.cpp:253 +msgid "Waiting for transfer to be cancelled" +msgstr "Transferin gözləməsi ləğv olunacaq" + +#: ../../locales/../src/engine/engineprivate.cpp:242 +msgid "Waiting to retry..." +msgstr "Yenidən yoxlanılır..." + +#: ../../locales/../src/interface/netconfwizard.cpp:983 +msgid "Warning, ignoring data connection from wrong IP." +msgstr "Yanlış İP-dən veri bağlantısını yox sayan xəbərdarlıq." + +#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 +msgid "" +"Warning, use nightly builds at your own risk.\n" +"No support is given for nightly builds.\n" +"Nightly builds may not work as expected and might even damage your system.\n" +"\n" +"Do you really want to check for nightly builds?" +msgstr "" +"Diqqət, gecəlik istifadə riski sizə aiddir.\n" +"Gecəlik qurmaq üçün heç bir dəstək verilmir.\n" +"Gecəlik qurulmalar gözlənildiyi kimi işləməyəcək və hətta sisteminizə zərər " +"verə bilər.\n" +"Həqiqətən gecə quruluşlarını yoxlamaq istəyirsinizmi?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +msgid "Warning: Potential security breach!" +msgstr "Diqqət: Potensial təhlükəsizlik pozulması!" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 +msgid "Welcome to FileZilla" +msgstr "FileZilla-ya xoş gəlmisiniz" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +msgid "What's new" +msgstr "Yeniliklər" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 +msgid "What's new:" +msgstr "Yeniliklər:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 +msgid "" +"When allowing FileZilla to remember passwords, you can reconnnect without " +"having to re-enter a password after restarting FileZilla." +msgstr "" +"FileZilla şifrələri yadda saxlamağa imkan verən zaman FileZilla yenidən işə " +"salındıqdan sonra şifrə yenidən daxil edilmədən qoşula bilərsiniz." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 +msgid "" +"When enabled, characters that are not supported by the local operating " +"system in filenames are replaced if downloading such a file." +msgstr "" +"Aktivləşdirildikdə fayl adlarında yerli əməliyyat sistemi tərəfindən " +"dəstəklənməyən simvollar belə bir faylın yüklənməsi halında əvəz olunur." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 +msgid "When st&arting a new connection while already connected:" +msgstr "Bağlanarkən yeni bir əlaqə başladıldıqda:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +msgid "Widescreen" +msgstr "Geniş Ekran" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 +msgid "Would you like FileZilla to remember passwords?" +msgstr "Şifrələr xatırlansın?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 +msgid "Wr&ite" +msgstr "Yaz" + +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 +msgid "Wrong external IP address" +msgstr "Xarici IP ünvanı xətalıdır" + +#: ../../locales/../src/engine/http/request.cpp:441 +msgid "Wrong line endings" +msgstr "Yanlış xətt sonluğu" + +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Yanlış ana şifrə girildi, saxlanılan parolların şifrəsini şifrələmək üçün " +"istifadə edilə bilməz." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Yanlış ana şifrə girildi, bu maddənin şifrəsini açmaq üçün istifadə edilə " +"bilməz." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Sarı" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:396 +msgid "Yes" +msgstr "Bəli" + +#: ../../locales/../src/interface/netconfwizard.cpp:786 +msgid "" +"You appear to be using an IPv6-only host. This wizard does not support this " +"environment." +msgstr "" +"İstifadə etdiyiniz kopyuter yalnız IPv6 istifadə edir. Yardımçı bu mühiti " +"dəstəkləmir." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 +msgid "You are using the latest version of FileZilla." +msgstr "FileZilla-nın ən son versiyasını istifadə edirsiniz." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 +msgid "You can always open this dialog again through the help menu." +msgstr "" +"Həmişə bu informasiya qutusunu yardım menyusu vasitəsilə yenidən aça " +"bilərsiniz." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 +msgid "You can download the latest version from the FileZilla website:" +msgstr "Son versiyanı FileZilla veb saytından yükləyə bilərsiniz:" + +#: ../../locales/../src/interface/serverdata.cpp:15 +msgid "You can leave the port field empty to use the default port." +msgstr "" +"Standart portu istifadə etmək üçün port sahəsini boş buraxa bilərsiniz." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 +msgid "" +"You can use an x at any position to keep the permission the original files " +"have." +msgstr "" +"Orijinal faylların icazəsini saxlamaq üçün hər hansı bir x mövqedən istifadə " +"edə bilərsiniz." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Master parol istifadə edərkən şifrəni və şifrələməni fərdi olaraq dəyişdirə " +"bilməzsiniz." + +#: ../../locales/../src/interface/import.cpp:29 +msgid "You cannot import settings from FileZilla's own settings directory." +msgstr "" +"Siz parametrləri FileZilla-nın öz nizamlamalar siyahısından idxal edə " +"bilməzsiniz." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 +msgid "" +"You cannot replace an invalid character with another invalid character. " +"Please enter a character that is allowed in filenames." +msgstr "" +"Yanlış xarakteri başqa bir yanlış xarakterlə əvəz edə bilməzsiniz. Xahiş " +"olunur fayllarda icazə verilən bir xarakter daxil edin." + +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Siz faylları ana qovluğa yükləyə bilmərsiniz." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 +msgid "You did not enter a new name for the file. Overwrite the file instead?" +msgstr "" +"Fayl üçün yeni bir ad daxil etmədiniz. Bunun əvəzinə faylın üzərində yazmaq " +"istəyirsiniz?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 +msgid "You have selected at least one symbolic link." +msgstr "Ən az bir simvolik link seçdiniz." + +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1177 +msgid "" +"You have selected more than 10 files for editing, do you really want to " +"continue?" +msgstr "" +"Redaktə etmək üçün 10-dan çox fayl seçdiniz, həqiqətən də davam etmək " +"istəyirsiniz?" + +#: ../../locales/../src/interface/LocalListView.cpp:1725 +msgid "" +"You have selected more than 10 files or directories to open, do you really " +"want to continue?" +msgstr "" +"Açmaq üçün 10-dan çox fayl və ya kataloq seçdiyiniz, həqiqətən də davam " +"etmək istəyirsiniz?" + +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +msgid "You have to enter a hostname." +msgstr "Bir server adı yazmalısınız." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1092 +msgid "You have to enter a key file path" +msgstr "Açar bir fayl yolu girməlisiniz" + +#: ../../locales/../src/interface/search.cpp:884 +msgid "You have to enter a local directory." +msgstr "Yerli bir qovluq daxil etməlisiniz." + +#: ../../locales/../src/interface/search.cpp:898 +msgid "You have to enter a remote directory." +msgstr "Uzaq bir qovluğa daxil olmalısan." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "Doğru bir IPv4 ünvanını daxil etməlisiniz." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "You have to enter a valid encryption key" +msgstr "Siz həqiqi şifrələmə açarı daxil etməlisiniz" + +#: ../../locales/../src/interface/search.cpp:889 +msgid "You have to enter a writable local directory." +msgstr "Yazılabilən bir yerli qovluq daxil etməlisiniz." + +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +msgid "You have to enter an account name" +msgstr "Bir hesab adını daxil etməlisiniz" + +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1059 +msgid "You have to specify a user name" +msgstr "Bir istifadəçi adı təyin etməlisiniz" + +#: ../../locales/../src/interface/netconfwizard.cpp:644 +msgid "" +"You likely have a router or firewall which erroneously modified the " +"transferred data." +msgstr "" +"Güman ki, ötürülən məlumatları səhv şəkildə dəyişdirən bir yönləndirciniz və " +"ya təhlükəsizlik divarınız var." + +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:206 +msgid "You need to enter a master password." +msgstr "Bir ana şifrə yazmalısınız." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +msgid "You need to enter a name for the bookmark." +msgstr "Əlfəcin üçün bir ad yazmalısınız." + +#: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 +msgid "You need to enter a name for the log file." +msgstr "Günlük faylına bir ad daxil etməlisiniz." + +#: ../../locales/../src/interface/edithandler.cpp:1524 +msgid "You need to enter a properly quoted command." +msgstr "Uyğun şəkildə yazılmış bir əmri daxil etməlisiniz." + +#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 +msgid "You need to enter a proxy host." +msgstr "Proxy server adı daxil etməlisiniz." + +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 +msgid "You need to enter a proxy port in the range from 1 to 65535" +msgstr "1 ilə 65535 arasında bir proxy portu girməlisiniz" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +msgid "You need to enter at least one path, empty bookmarks are not supported." +msgstr "Ən azı bir yolu girməlisiniz, boş əlfəcinlər dəstəklənmir." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 +msgid "" +"You need to enter both a local and a remote path to enable synchronized " +"browsing for this bookmark." +msgstr "" +"Bu əlfəcin üçün sinxronlaşdırılmış taramanı təmin etmək üçün həm yerli, həm " +"də uzaq bir yolu girməlisiniz." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +msgid "" +"You need to enter both a local and a remote path to enable synchronized " +"browsing for this site." +msgstr "" +"Bu sayt üçün sinxronlaşdırılmış taramanı təmin etmək üçün həm yerli, həm də " +"uzaq bir yolu daxil etməlisiniz." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" + +#: ../../locales/../src/interface/manual_transfer.cpp:294 +msgid "You need to specify a local file." +msgstr "Yerli bir fayl göstərməlisiniz." + +#: ../../locales/../src/interface/manual_transfer.cpp:311 +msgid "You need to specify a remote file." +msgstr "Uzaq bir fayl göstərməlisiniz." + +#: ../../locales/../src/interface/manual_transfer.cpp:317 +msgid "You need to specify a remote path." +msgstr "Uzaq bir yol göstərməlisiniz." + +#: ../../locales/../src/interface/manual_transfer.cpp:288 +msgid "You need to specify a server." +msgstr "Bir server göstərməlisiniz." + +#: ../../locales/../src/interface/netconfwizard.cpp:590 +msgid "" +"You should have no problems connecting to other servers, file transfers " +"should work properly." +msgstr "" +"Digər serverlərə qoşulma ilə bağlı heç bir problem olmadı, fayl ötürülməsi " +"düzgün işləməlidir." + +#: ../../locales/../src/interface/QueueView.cpp:2756 +msgid "Your computer will suspend unless you click Cancel." +msgstr "Ləğv etmirsinizsə, kompyuteriniz dayandırılacaq." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +msgid "after" +msgstr "sonra" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +msgid "before" +msgstr "Əvvəl" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 +msgid "begins with" +msgstr "başlayır" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 +msgid "bytes" +msgstr "bayt" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 +msgid "contains" +msgstr "ehtiva edir" + +#: ../../locales/../src/interface/updater.cpp:243 +msgid "custom" +msgstr "özəl" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 +msgid "does not contain" +msgstr "ehtiva etməz" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 +msgid "does not equal" +msgstr "bərabər deyil" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 +msgid "ends with" +msgstr "bununla bitən" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +msgid "equals" +msgstr "bərabər olan" + +#: ../../locales/../src/interface/filelistctrl.cpp:545 +#: ../../locales/../src/interface/filelistctrl.cpp:563 +#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:608 +msgid "file" +msgstr "fayl" + +#: ../../locales/../src/interface/edithandler.cpp:101 +msgid "fz3temp-lockfile" +msgstr "fz3temp-lockfile" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +msgid "" +"fzputtygen could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzputtygen başlanıla bilməz.\n" +"Xahiş edirik, bu davam edən faylın əsas FileZilla işlədilə bilən olduğu eyni " +"qovluqda olduğundan əmin olun." + +#: ../../locales/../src/engine/sftp/connect.cpp:101 +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "fzsftp, FileZilla-nın fərqli bir versiyasına aiddir" + +#: ../../locales/../src/engine/sftp/connect.cpp:143 +msgid "fzsftp could not be started" +msgstr "fzsftp başladıla bilməz" + +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj FileZilla-nın digər versiyasına aiddir" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj buraxıla bilmir" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj buraxıla bilmir.\n" +"Əmin olun ki, hazırki icraedici fayl FileZilla-nın icraedici faylı ilə eyni " +"kataloqda yerləşir." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1239 +msgid "gnutls_certificate_get_peers returned no certificates" +msgstr "gnutls_certificate_get_peers heç bir sertifikat vermədi" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1251 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 uğursuz oldu" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 +msgid "greater than" +msgstr "daha çox" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 +msgid "group executable" +msgstr "qrup davam edə bilər" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 +msgid "group readable" +msgstr "qrup oxunandır" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 +msgid "group writeable" +msgstr "qrup yazıla bilir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 +msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" +msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 +msgid "is equal to" +msgstr "bərabər olan" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 +msgid "is set" +msgstr "işarələnmiş" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 +msgid "is unset" +msgstr "işarələnmiş" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 +msgid "less than" +msgstr "daha az" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 +msgid "matches regex" +msgstr "regex oyunları" + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +msgid "new name" +msgstr "yeni ad" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 +msgid "owner executable" +msgstr "sahibi idarə edilə bilən" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 +msgid "owner readable" +msgstr "sahibi oxuna bilir" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 +msgid "owner writeable" +msgstr "sahibi yaza bilir" + +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1471 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1487 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1503 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1519 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 +msgid "unknown" +msgstr "bilinməyən" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +msgid "world executable" +msgstr "hamı istifadə edə bilər" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +msgid "world readable" +msgstr "hamı oxuya bilər" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +msgid "world writeable" +msgstr "hamı yaza bilər" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 +msgid "wxWidgets:" +msgstr "wxWidgets:" diff -Nru filezilla-3.15.0.2/locales/bg_BG.po filezilla-3.33.0/locales/bg_BG.po --- filezilla-3.15.0.2/locales/bg_BG.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/bg_BG.po 2017-12-29 14:30:54.000000000 +0000 @@ -1,1154 +1,1330 @@ # This file is distributed under the same license as the FileZilla3 package. # Milen A. Radev , 2005 # Асен Генов, 07.2008 -# Стоян Димитров 2008, 2009, 2010, 2011, 2012, 2013, 2014. -# ^#:(.+)\n - for removing source lines -# ^[a-zA-Z0-9'\.\\ \(\)\?%:\/,\<\>@\-_!"\+;=\s&\[\*\|]+\n - for spellcheck +# Стоян Димитров, 2008 - 2017 +# +# Remove source code references (before deployment) +# (^#:(.+)\n)+ -> '' +# +# Cleanup for spellcheck +# ^[a-zA-Z0-9'\.\\ \(\)\?%:\/,\<\>@\-_!"\+;=\s&\[\*\|#]+\n -> '' - remove headers, source strings, translator comments etc. +# ^msgstr(?:\[\d\])?\s"(.+?)"$ -> $1 - remove poedit translation metadata +# ["\&]|\\n -> '' - remove mnemonics, straight double quotes and literal \n +# sort and uique msgid "" msgstr "" "Project-Id-Version: FileZilla3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-16 14:56+0200\n" -"PO-Revision-Date: 2014-07-15 21:36+0200\n" -"Last-Translator: Стоян Димитров \n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-12-29 12:19+0100\n" +"PO-Revision-Date: \n" +"Last-Translator: Стоян \n" "Language-Team: Bulgarian \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.6\n" +"X-Generator: Poedit 2.0.5\n" -#: ../../locales/../src/interface/statuslinectrl.cpp:65 -#: ../../locales/../src/interface/statuslinectrl.cpp:224 +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../src/interface/statuslinectrl.cpp:59 +#: ../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S изминали" -#: ../../locales/../src/interface/statuslinectrl.cpp:69 -#: ../../locales/../src/interface/statuslinectrl.cpp:232 +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../src/interface/statuslinectrl.cpp:64 +#: ../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S оставащи" -#: resources.h:740 -#, no-c-format +#: ../src/interface/resources/xrc/settings.xrc:525 +#, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" msgstr "" -"%a - Сметка (редовете съдържащи това ще бъдат прескачани ако не се използва " -"удостоверяване тип Сметка)" +"%a - Сметка (редовете съдържащи това ще бъдат прескачани освен ако не е " +"използвано удостоверяване вид Сметка)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 -#: ../../locales/../src/interface/filelist_statusbar.cpp:74 -#: ../../locales/../src/interface/filelist_statusbar.cpp:86 +#: ../src/interface/filelist_statusbar.cpp:51 +#: ../src/interface/filelist_statusbar.cpp:63 +#: ../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d папка" msgstr[1] "%d папки" -#: ../../locales/../src/interface/RemoteListView.cpp:1456 -#: ../../locales/../src/interface/search.cpp:469 -#: ../../locales/../src/interface/search.cpp:722 +#: ../src/interface/RemoteListView.cpp:1425 ../src/interface/search.cpp:854 +#: ../src/interface/search.cpp:1239 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d папка и нейното съдържание" msgstr[1] "%d папки и тяхното съдържание" -#: ../../locales/../src/interface/filelist_statusbar.cpp:62 -#: ../../locales/../src/interface/filelist_statusbar.cpp:85 -#: ../../locales/../src/interface/RemoteListView.cpp:1455 -#: ../../locales/../src/interface/search.cpp:468 -#: ../../locales/../src/interface/search.cpp:721 +#: ../src/interface/filelist_statusbar.cpp:50 +#: ../src/interface/filelist_statusbar.cpp:75 +#: ../src/interface/RemoteListView.cpp:1424 ../src/interface/search.cpp:853 +#: ../src/interface/search.cpp:1238 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d файл" msgstr[1] "%d файла" -#: ../../locales/../src/interface/filelist_statusbar.cpp:81 +#: ../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d файл. Обща дължина: %s" msgstr[1] "%d файла. Обща дължина: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#: ../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d файл. Обща дължина: най-малко %s" msgstr[1] "%d файла. Обща дължина: най-малко %s" -#: ../../locales/../src/interface/QueueView.cpp:2929 -#, c-format -msgid "%d files added to queue" -msgstr "%d файла добавени в опашката" - -#: ../../locales/../src/engine/ControlSocket.cpp:106 +#: ../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d секунда" msgstr[1] "%d секунди" -#: resources.h:737 +#: ../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Хост" -#: resources.h:739 -#, no-c-format +#: ../src/interface/recursive_operation_status.cpp:120 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu папка" +msgstr[1] "%llu папки" + +#: ../src/interface/recursive_operation_status.cpp:119 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu файл" +msgstr[1] "%llu файла" + +#: ../src/interface/resources/xrc/settings.xrc:518 +#, c-format msgid "%p - Password" msgstr "%p - Парола" -#: ../../locales/../src/interface/statuslinectrl.cpp:180 +#: ../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:183 +#: ../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Сертификат с изтекъл срок!" -#: ../../locales/../src/interface/verifycertdialog.cpp:28 +#: ../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Още не е валиден!" -#: resources.h:741 -#, no-c-format +#: ../src/interface/resources/xrc/settings.xrc:533 +#, c-format msgid "%s - Proxy user" -msgstr "%s - Прокси потребител" +msgstr "%s - Потребител за прокси" -#: ../../locales/../src/interface/filelist_statusbar.cpp:91 +#: ../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" -msgstr "%s и %s. Обща дължина: %s" +msgstr "%s и %s. Общ размер: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:89 +#: ../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" -msgstr "%s и %s. Обща дължина: най-малко %s" +msgstr "%s и %s. Общ размер: най-малко %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:34 +#: ../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s байт" msgstr[1] "%s байта" -#: ../../locales/../src/interface/FileZilla.cpp:683 +#: ../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s не можа да бъде намерен. Без този компонент на FileZilla, SFTP няма да " -"работи.\n" +"%s не e намерен. Без този компонент на FileZilla, %s няма да работи.\n" "\n" -"Моля, изтеглете FileZilla отново. Ако проблемът остане, моля, напишете " +"Моля, изтеглете FileZilla отново. Ако това не реши проблема, моля, напишете " "доклад за дефект." -#: ../../locales/../src/interface/FileZilla.cpp:777 +#: ../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s не можа да бъде намерен. Без този компонент на FileZilla, SFTP няма да " -"работи.\n" +"%s не е намерен. Без този компонент на FileZilla, %s няма да работи.\n" "\n" -"Възможни решения на проблема:\n" -"- Уверете се, че %s е в папка от променливата на средата PATH.\n" -"- Укажете пълният път до %s в променливата на средата FZ_FZSFTP." +"Възможни решения:\n" +"- уверете се, че %s е в папка от променливата на средата PATH.\n" +"- укажете пълния път до %s в променливата на средата %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:58 +#: ../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s с %d бита" -#: resources.h:738 -#, no-c-format +#: ../src/interface/verifycertdialog.cpp:164 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Името на хоста не отговаря на сертификата" + +#: ../src/interface/resources/xrc/settings.xrc:510 +#, c-format msgid "%u - Username" msgstr "%u - Потребител" -#: resources.h:742 -#, no-c-format +#: ../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" -msgstr "%w - Прокси парола" +msgstr "%w - Парола за прокси" -#: resources.h:417 +#: ../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" -msgstr "&текущия подпрозорец" +msgstr "&текущия раздел" -#: resources.h:504 +#: ../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." -msgstr "&Относно..." +msgstr "&Относно…" -#: resources.h:322 resources.h:969 +#: ../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Сметка:" -#: resources.h:642 resources.h:706 resources.h:984 +#: ../src/interface/resources/xrc/netconfwizard.xrc:80 +#: ../src/interface/resources/xrc/settings.xrc:209 +#: ../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Активен" -#: resources.h:495 +#: ../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." -msgstr "&Добавяне на отметка..." +msgstr "&Добавяне на отметка…" + +#: ../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "Добавяне на &папка…" -#: resources.h:508 resources.h:527 +#: ../src/interface/resources/xrc/menus.xrc:249 +#: ../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Добавяне в опашката" -#: resources.h:750 -msgid "&Add keyfile..." -msgstr "&Добавяне файл-ключ..." +#: ../src/interface/resources/xrc/settings.xrc:646 +msgid "&Add key file..." +msgstr "&Добавяне на файл-ключ…" -#: resources.h:588 resources.h:609 +#: ../src/interface/resources/xrc/menus.xrc:505 +#: ../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Добавяне в опашката" -#: resources.h:978 +#: ../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Часова разлика със сървъра:" -#: resources.h:28 +#: ../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "Доверяване на сертификата при &бъдещи сесии." -#: resources.h:144 +#: ../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "Доверяване на този хост, &добавяне ключа към кеша" -#: resources.h:913 +#: ../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" -msgstr "Използване на &редактора по подразбиране" +msgstr "Използване на стандартния &редактор" -#: resources.h:365 +#: ../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Винаги използвайте този избор за неасоциираните файлове" -#: resources.h:75 +#: ../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Винаги това действие" -#: resources.h:718 +#: ../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Запитване към операционната система" -#: resources.h:477 resources.h:622 resources.h:788 +#: ../src/interface/resources/xrc/menus.xrc:144 +#: ../src/interface/resources/xrc/menus.xrc:603 +#: ../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Автоматичен" -#: resources.h:990 +#: ../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Автоматично" -#: resources.h:479 resources.h:624 resources.h:790 +#: ../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Цвят на фона:" + +#: ../src/interface/resources/xrc/menus.xrc:152 +#: ../src/interface/resources/xrc/menus.xrc:611 +#: ../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Двоичен" -#: resources.h:867 +#: ../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Двоичен суфикс по SI (пример 1 KB = 1024 bytes)" -#: resources.h:494 +#: ../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "&Отметки" -#: resources.h:304 resources.h:341 resources.h:347 resources.h:364 -#: resources.h:382 resources.h:910 resources.h:936 resources.h:975 +#: ../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../src/interface/resources/xrc/settings.xrc:2010 +#: ../src/interface/resources/xrc/settings.xrc:2225 +#: ../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." -msgstr "&Избор..." +msgstr "&Избиране…" -#: resources.h:778 -#, no-c-format +#: ../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Търпимост към резки промени:" -#: resources.h:92 resources.h:159 resources.h:427 resources.h:434 -#: resources.h:438 resources.h:690 +#: ../src/interface/resources/xrc/dialogs.xrc:386 +#: ../src/interface/resources/xrc/dialogs.xrc:494 +#: ../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../src/interface/resources/xrc/dialogs.xrc:4098 +#: ../src/interface/resources/xrc/inputdialog.xrc:40 +#: ../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "От&каз" -#: resources.h:454 +#: ../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." -msgstr "&Заличаване лични данни..." +msgstr "&Заличаване лични данни…" -#: resources.h:1030 +#: ../src/interface/resources/xrc/update.xrc:28 msgid "&Close" msgstr "&Изход" -#: resources.h:558 +#: ../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "За&тваряне FileZilla" -#: resources.h:632 +#: ../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Затваряне FileZilla веднъж" + +#: ../src/interface/resources/xrc/menus.xrc:657 msgid "&Configure speed limits..." -msgstr "О&граничение на скоростта..." +msgstr "О&граничаване на скоростта…" -#: resources.h:482 +#: ../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." -msgstr "&Настройки..." +msgstr "&Настройки…" -#: resources.h:996 +#: ../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Свързване" -#: resources.h:442 +#: ../src/interface/resources/xrc/menus.xrc:12 msgid "&Copy current connection to Site Manager..." -msgstr "&Запис текуща връзка..." +msgstr "&Запис текуща връзка…" -#: resources.h:134 resources.h:568 +#: ../src/interface/resources/xrc/dialogs.xrc:985 +#: ../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "&Копиране в системния буфер" -#: resources.h:573 -msgid "&Crash" -msgstr "&Срив" - -#: resources.h:516 resources.h:532 resources.h:590 resources.h:613 +#: ../src/interface/resources/xrc/menus.xrc:268 +#: ../src/interface/resources/xrc/menus.xrc:308 +#: ../src/interface/resources/xrc/menus.xrc:511 +#: ../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Нова папка" -#: resources.h:627 +#: ../src/interface/resources/xrc/menus.xrc:637 msgid "&Create new tab" -msgstr "&Нов подпрозорец" +msgstr "&Нов раздел" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Трасиране" -#: resources.h:944 +#: ../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "Т&расираща информация в дневника:" -#: resources.h:906 +#: ../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" -msgstr "&Редактор по подразбиране:" +msgstr "Стандартен &редактор:" -#: resources.h:475 resources.h:550 +#: ../src/interface/resources/xrc/menus.xrc:139 +#: ../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." -msgstr "&Подразбиращо се действие с файлове..." +msgstr "&Стандартно действие с файлове…" -#: resources.h:700 +#: ../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Изчакване след неуспешно удостоверяване:" -#: resources.h:164 resources.h:178 resources.h:354 resources.h:521 -#: resources.h:617 resources.h:959 +#: ../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../src/interface/resources/xrc/menus.xrc:280 +#: ../src/interface/resources/xrc/menus.xrc:588 +#: ../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "Изтрива&не" -#: resources.h:395 +#: ../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "Изтрива&не на символна връзка" -#: resources.h:460 +#: ../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "Права върху &папката…" + +#: ../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" -msgstr "&Сравняване папки" +msgstr "&Сравняване на папки" -#: resources.h:263 +#: ../src/interface/state.cpp:1030 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"&Изключване на синхронизираното разлистване и смяна само на местната папка" + +#: ../src/interface/state.cpp:1108 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" +"&Изключване на синхронизираното разлистване и смяна само на отдалечената " +"папка" + +#: ../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" -msgstr "&Отхвърляне на местния файл и редакция наново" +msgstr "&Отхвърляне на местния файл и редактиране наново" -#: resources.h:488 +#: ../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "Прекъсване на &връзката" -#: resources.h:559 -msgid "&Disconnect from server" -msgstr "Прекъсване на &връзката" - -#: resources.h:843 +#: ../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Показване моментна скорост на пренос, вместо средната" -#: resources.h:865 +#: ../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Показване дължината в байтове" -#: resources.h:432 -msgid "&Do not remember passwords" -msgstr "Да &не бъдат запазвани пароли" - -#: ../../locales/../src/interface/conditionaldialog.cpp:25 +#: ../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." -msgstr "&Да не се показва повече този диалог" +msgstr "&Да не се показва повече този диалог." -#: resources.h:723 +#: ../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "&Без използване на външен IP адрес при местни връзки." -#: resources.h:893 +#: ../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "При двойно натискане върху &файлове:" -#: resources.h:525 resources.h:586 +#: ../src/interface/resources/xrc/menus.xrc:290 +#: ../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Изтегляне" -#: resources.h:381 +#: ../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Изтегляне в:" -#: resources.h:625 +#: ../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." -msgstr "&Изтегляне..." +msgstr "&Изтегляне…" -#: resources.h:195 resources.h:800 +#: ../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Изтегляния:" -#: resources.h:452 resources.h:514 +#: ../src/interface/resources/xrc/menus.xrc:45 +#: ../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" -msgstr "&Редакция" +msgstr "&Редактиране" -#: resources.h:172 +#: ../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." -msgstr "&Редактиране на филтрите..." +msgstr "&Редактиране на филтрите…" -#: resources.h:461 resources.h:481 resources.h:603 resources.h:631 +#: ../src/interface/resources/xrc/menus.xrc:76 +#: ../src/interface/resources/xrc/menus.xrc:163 +#: ../src/interface/resources/xrc/menus.xrc:543 +#: ../src/interface/resources/xrc/menus.xrc:653 msgid "&Enable" -msgstr "&Активно" +msgstr "&Включено" -#: resources.h:420 resources.h:773 +#: ../src/interface/resources/xrc/settings.xrc:688 +msgid "&Enable compression" +msgstr "&Използване на компресия" + +#: ../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "О&граничаване на скоростта" -#: resources.h:994 +#: ../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Знаков набор:" -#: resources.h:965 +#: ../src/interface/resources/xrc/sitemanager.xrc:141 msgid "&Encryption:" -msgstr "&Криптиране:" +msgstr "&Шифроване:" -#: resources.h:567 +#: ../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." -msgstr "Въвеждане &ръчна команда..." +msgstr "Въвеждане &ръчна команда…" -#: resources.h:416 +#: ../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" -msgstr "&нов подпрозорец" +msgstr "&нов раздел" -#: resources.h:98 +#: ../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Изпълнение" -#: resources.h:230 +#: ../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" -msgstr "&Манипулатор връзки" +msgstr "Упр&авление на връзки" -#: resources.h:447 resources.h:621 +#: ../src/interface/resources/xrc/menus.xrc:27 +#: ../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." -msgstr "&Експорт..." +msgstr "&Експорт…" -#: resources.h:728 +#: ../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Отстъпване до активен режим" -#: resources.h:439 +#: ../src/interface/resources/xrc/menus.xrc:5 msgid "&File" msgstr "&Файл" -#: resources.h:600 +#: ../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." -msgstr "&Атрибути..." +msgstr "&Атрибути…" -#: resources.h:545 +#: ../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." -msgstr "Права на &файл..." +msgstr "Права върху &файл…" -#: resources.h:303 +#: ../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Файл:" -#: resources.h:182 +#: ../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "Набори &филтри:" -#: resources.h:161 +#: ../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "Набори &филтри:" -#: resources.h:176 +#: ../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Филтри" + +#: ../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Филтри:" -#: resources.h:255 +#: ../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Завършване на редакцията и изтриване на местния файл" -#: resources.h:385 +#: ../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "&Качване на съдържащите се файлове директно в целевата папка" + +#: ../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" -msgstr "" -"&Събиране на отдалечените пътища - изтегляне на всички, съдържащи се файлове " -"директно в целевата папка." +msgstr "&Изтегляне на съдържащите се файлове директно в целевата папка" -#: resources.h:396 +#: ../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "" "&Следване на символната връзка, изтриване на целевата папка и съдържанието и" -#: resources.h:721 +#: ../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Получаване на външния IP адрес от URL:" -#: resources.h:502 +#: ../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." -msgstr "&Получаване помощ..." +msgstr "&Получаване помощ…" -#: resources.h:335 +#: ../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" -msgstr "&Глобална отметка" +msgstr "&Обща отметка" -#: resources.h:757 +#: ../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 използвайки методът CONNECT" -#: resources.h:498 +#: ../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&Помощ" -#: resources.h:464 resources.h:606 +#: ../src/interface/resources/xrc/menus.xrc:91 +#: ../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Скриване на идентичните файлове" -#: resources.h:552 +#: ../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "Н&ай-висок" -#: resources.h:716 +#: ../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "Най-&висок наличен порт:" -#: resources.h:316 resources.h:680 resources.h:962 +#: ../src/interface/resources/xrc/dialogs.xrc:2637 +#: ../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Хост:" -#: resources.h:866 +#: ../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "IEC десетичен &суфикс (пример 1 KiB = 1024 bytes)" -#: resources.h:854 +#: ../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (пример: 2007-09-15)" -#: resources.h:448 +#: ../src/interface/resources/xrc/menus.xrc:30 msgid "&Import..." -msgstr "И&мпорт..." +msgstr "И&мпорт…" -#: resources.h:915 +#: ../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "&Наследяване от системните файлови асоциации" -#: resources.h:1037 +#: ../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" -msgstr "&Актуализиране" +msgstr "&Обновяване" + +#: ../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Запазване на структурата на местното дърво" -#: resources.h:384 +#: ../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" -msgstr "&Поддържане на отдалеченото дърво релативно спрямо корана на търсене" +msgstr "&Запазване на структурата на отдалеченото дърво" + +#: ../src/interface/resources/xrc/sitemanager.xrc:239 +msgid "&Key file:" +msgstr "&Файл-ключ:" -#: resources.h:823 +#: ../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Панели с файлове и папки:" -#: resources.h:713 +#: ../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" -msgstr "&Ограничаване портовете, използвани от FileZilla" +msgstr "&Ограничаване на използваните от FileZilla портове" -#: resources.h:986 +#: ../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "Ограничаване броя на &едновременните връзки" -#: resources.h:470 +#: ../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "&Местни папки" -#: resources.h:340 resources.h:346 +#: ../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Местна папка:" -#: resources.h:934 +#: ../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&местните папки" + +#: ../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "Записване във &файл-дневник" -#: resources.h:966 +#: ../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" -msgstr "Тип &удостоверяване:" +msgstr "Вид &удостоверяване:" -#: resources.h:319 +#: ../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "&Удостоверяване:" -#: resources.h:555 +#: ../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Нисък" -#: resources.h:496 +#: ../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." -msgstr "М&анипулатор отметки..." +msgstr "Упр&авление на отметки…" -#: resources.h:484 +#: ../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." -msgstr "&Ръчно прехвърляне..." +msgstr "&Ръчно прехвърляне…" -#: resources.h:987 +#: ../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "Максимален брой &връзки:" -#: resources.h:698 +#: ../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Максимален брой опити:" -#: resources.h:469 +#: ../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "&Дневник" -#: resources.h:836 +#: ../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Минимизиране в системната лента" -#: resources.h:883 +#: ../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "&Сортиране по име:" -#: resources.h:338 +#: ../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Наименование:" -#: resources.h:453 +#: ../src/interface/resources/xrc/menus.xrc:47 msgid "&Network configuration wizard..." -msgstr "&Съветник настройки мрежа..." +msgstr "&Съветник настройки мрежа…" -#: resources.h:177 +#: ../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "Но&в" -#: resources.h:955 +#: ../src/interface/resources/xrc/sitemanager.xrc:35 msgid "&New Site" msgstr "Нова &връзка" -#: ../../locales/../src/interface/Mainfrm.cpp:1794 +#: ../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" -msgstr "&Налична е нова версия!" +msgstr "&Налично е ново издание!" + +#: ../src/interface/netconfwizard.cpp:27 +msgid "&Next >" +msgstr "&Напред >" -#: resources.h:257 +#: ../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Не" -#: resources.h:731 resources.h:756 +#: ../src/interface/resources/xrc/menus.xrc:385 +#: ../src/interface/resources/xrc/settings.xrc:459 +#: ../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Никакъв" -#: resources.h:554 +#: ../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "Н&ормален" -#: resources.h:107 +#: ../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Цифрова стойност:" -#: resources.h:91 resources.h:356 resources.h:997 +#: ../src/interface/resources/xrc/dialogs.xrc:378 +#: ../src/interface/resources/xrc/dialogs.xrc:486 +#: ../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&ОК" -#: resources.h:734 +#: ../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&Отваряне" -#: resources.h:512 resources.h:611 +#: ../src/interface/resources/xrc/menus.xrc:259 +#: ../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Отваряне" -#: resources.h:68 +#: ../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "П&резапис" -#: resources.h:985 +#: ../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Пасивен" -#: resources.h:89 +#: ../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Парола:" -#: resources.h:562 +#: ../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "Из&даване на звук" -#: resources.h:317 resources.h:684 resources.h:963 +#: ../src/interface/resources/xrc/dialogs.xrc:2650 +#: ../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "П&орт:" -#: resources.h:480 +#: ../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" -msgstr "&Запазване времената при прехвърляне" +msgstr "&Запазване на времеви маркери" -#: resources.h:239 +#: ../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "Опа&шка" -#: resources.h:686 +#: ../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Бързо свързване" -#: resources.h:468 +#: ../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "&Лента за бързо свързване" -#: resources.h:96 +#: ../src/interface/resources/xrc/dialogs.xrc:1709 +msgid "&Quickconnect history" +msgstr "хронология &бързо свързване" + +#: ../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Четене" -#: resources.h:487 +#: ../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "Повторно &свързване" -#: resources.h:458 resources.h:630 +#: ../src/interface/resources/xrc/dialogs.xrc:1716 +msgid "&Reconnect information" +msgstr "информация &повторно свързване" + +#: ../src/interface/resources/xrc/menus.xrc:65 +#: ../src/interface/resources/xrc/menus.xrc:648 msgid "&Refresh" msgstr "&Опресняване" -#: resources.h:90 +#: ../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Запомняне на паролата до затваряне на FileZilla" + +#: ../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "&Запомняне на паролата докато FileZilla не бъде затворена" -#: resources.h:431 -msgid "&Remember passwords" -msgstr "&Запомняне на пароли" - -#: resources.h:342 resources.h:348 +#: ../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Отдалечена папка:" -#: resources.h:306 +#: ../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "О&тдалечен път:" -#: resources.h:794 +#: ../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&отдалечените папки" + +#: ../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Премахване" -#: resources.h:751 +#: ../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Заличаване ключ" -#: resources.h:549 +#: ../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "П&ремахване на избраните" -#: resources.h:179 resources.h:353 resources.h:523 resources.h:541 -#: resources.h:596 resources.h:619 resources.h:958 +#: ../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../src/interface/resources/xrc/menus.xrc:284 +#: ../src/interface/resources/xrc/menus.xrc:328 +#: ../src/interface/resources/xrc/menus.xrc:524 +#: ../src/interface/resources/xrc/menus.xrc:592 +#: ../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Преимен&уване" -#: resources.h:163 +#: ../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." -msgstr "Преимен&уване..." +msgstr "Преимен&уване…" -#: resources.h:262 +#: ../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Отваряне отново на местния файл" -#: resources.h:785 +#: ../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "Замяна на &невалидните знаци с:" -#: resources.h:503 +#: ../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." -msgstr "&Доклад за дефект..." +msgstr "&Доклад за дефект…" -#: resources.h:578 +#: ../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Привличане на внимание" + +#: ../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "Анулиране и &връщане в опашката на всички" -#: resources.h:679 +#: ../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" msgstr "&Отначало" -#: resources.h:72 +#: ../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "Поднов&яване" -#: resources.h:560 +#: ../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." -msgstr "Изпълнение на &команда..." +msgstr "Изпълнение на &команда…" -#: resources.h:693 +#: ../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." -msgstr "&Съветник настройки мрежа..." +msgstr "&Съветник настройки мрежа…" -#: resources.h:929 +#: ../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." -msgstr "&Проверка за актуализация..." +msgstr "&Проверка за обновяване…" -#: resources.h:733 +#: ../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&Страница" -#: resources.h:759 +#: ../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: resources.h:162 +#: ../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." -msgstr "Запис &като..." +msgstr "Запис &като…" -#: resources.h:370 +#: ../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Търсене" -#: resources.h:489 +#: ../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." -msgstr "&Търсене на отдалечени файлове..." +msgstr "&Търсене на отдалечени файлове…" -#: resources.h:954 +#: ../src/interface/resources/xrc/sitemanager.xrc:18 msgid "&Select Entry:" msgstr "&Избор:" -#: resources.h:904 +#: ../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Избор:" -#: resources.h:294 +#: ../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Изберете колоните, които да бъдат видими:" -#: resources.h:308 resources.h:485 +#: ../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Сървър" -#: resources.h:238 +#: ../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Настройки" -#: resources.h:455 +#: ../src/interface/resources/xrc/menus.xrc:54 msgid "&Settings..." -msgstr "&Настройки..." +msgstr "&Настройки…" -#: resources.h:943 +#: ../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Меню за трасиране" -#: resources.h:561 -msgid "&Show message" -msgstr "Показване на &съобщение" +#: ../src/interface/resources/xrc/menus.xrc:435 +msgid "&Show detailed log" +msgstr "&Показване на подробен дневник" -#: resources.h:933 +#: ../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Вписване на времевия маркер" -#: resources.h:440 +#: ../src/interface/resources/xrc/dialogs.xrc:1722 +msgid "&Site Manager entries" +msgstr "Записи в Упр&авление на връзки" + +#: ../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." -msgstr "М&анипулатор връзки..." +msgstr "Упр&авление на връзки…" -#: resources.h:336 +#: ../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "Отметка към &връзка" -#: resources.h:74 +#: ../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Прескачане" -#: resources.h:483 +#: ../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" -msgstr "О&граничение на скоростта" +msgstr "О&граничаване на скоростта" -#: resources.h:387 +#: ../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Започване на &прехвърлянето веднага" -#: resources.h:828 +#: ../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Размяна на местните и отдалечените панели" -#: resources.h:575 +#: ../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "TLS &шифри" -#: ../../locales/../src/interface/netconfwizard.cpp:228 +#: ../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Проверка" -#: resources.h:846 +#: ../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Тема:" -#: resources.h:473 +#: ../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "Пре&хвърляне" -#: resources.h:982 +#: ../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "&Режим:" -#: resources.h:472 +#: ../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "Оп&ашка" -#: resources.h:797 +#: ../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" -msgstr "&Файлови имена, започващи с точка са ASCII" +msgstr "&Файлове, започващи с точка са ASCII" -#: resources.h:268 +#: ../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "Отказ от &редакция" -#: resources.h:157 +#: ../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" -msgstr "&Актуализация на кеширания ключ за този хост" +msgstr "&Обновяване на кеширания ключ за този хост" -#: resources.h:506 resources.h:607 +#: ../src/interface/resources/xrc/menus.xrc:244 +#: ../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Качване" -#: resources.h:205 resources.h:809 +#: ../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Качване в:" + +#: ../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Качване…" + +#: ../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Качвания:" -#: resources.h:363 +#: ../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "Потре&бителска програма" -#: resources.h:977 +#: ../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Синхронизирано разлистване" -#: resources.h:908 +#: ../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" -msgstr "Използване на &системния редактор за текстови файлове" +msgstr "Използване на &системния текстов редактор" -#: resources.h:719 +#: ../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Използване на следния IP адрес:" -#: resources.h:727 +#: ../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Използване на външния IP адрес на сървъра вместо това" -#: resources.h:869 +#: ../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Използване разделител за хилядите" -#: resources.h:88 resources.h:320 resources.h:967 +#: ../src/interface/resources/xrc/dialogs.xrc:323 +#: ../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Потребител:" -#: resources.h:682 +#: ../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Потребител:" -#: ../../locales/../src/interface/Mainfrm.cpp:1788 +#: ../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Версия %s" -#: resources.h:457 +#: ../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "Из&глед" -#: resources.h:531 +#: ../src/interface/resources/xrc/menus.xrc:304 +#: ../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" -msgstr "&Преглед/Редакция" +msgstr "&Преглед/Редактиране" -#: resources.h:914 +#: ../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "&Следене за локално редактирани файлове и питане за качване" -#: resources.h:924 +#: ../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" -msgstr "При проверка за &актуализация, да се проверява за" +msgstr "При проверка за &обновяване, се проверява за:" -#: resources.h:97 +#: ../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Запис" -#: resources.h:256 +#: ../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Да" -#: ../../locales/../src/engine/local_path.cpp:440 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../src/engine/local_path.cpp:461 ../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." -msgstr "\"%s\" не съществува или няма достъп." +msgstr "„%s“ не съществува или няма достъп." -#: ../../locales/../src/engine/local_path.cpp:456 -#: ../../locales/../src/engine/local_path.cpp:477 -#: ../../locales/../src/engine/local_path.cpp:484 +#: ../src/engine/local_path.cpp:479 ../src/engine/local_path.cpp:500 +#: ../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." -msgstr "\"%s\" не е папка." +msgstr "„%s“ не е папка." + +#: ../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "„%s“ не е поддържан протокол." -#: ../../locales/../src/interface/manual_transfer.cpp:445 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:952 +#: ../src/interface/manual_transfer.cpp:419 +#: ../src/interface/sitemanager_dialog.cpp:998 msgid "'Account' logontype not supported by selected protocol" -msgstr "Типът удостоверяване \"Сметка\" не се поддържа от избрания протокол" +msgstr "Видът удостоверяване „Сметка“ не се поддържа от избрания протокол" -#: ../../locales/../src/interface/manual_transfer.cpp:459 +#: ../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." msgstr "" -"Удостоверяване тип \"Нормално\" и \"Сметка\" не са достъпни. Използване на " -"\"Питане за парола\"." +"Удостоверяване вид „Нормално“ и „Сметка“ са недостъпни. Използване на " +"„Питане за парола“." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../src/interface/sitemanager_dialog.cpp:1015 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" -"Удостоверяване тип \"Нормално\" и \"Сметка\" не са достъпни. Добавената " -"връзка беше променена на \"Питане за парола\"." +"Удостоверяване вид „Нормално“ и „Сметка“ са недостъпни. Добавената връзка " +"беше променена на „Питане за парола“." -#: ../../locales/../src/interface/Mainfrm.cpp:568 +#: ../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " "command without the leading 'quote'." msgstr "" -"\"quote\" обикновено е местна команда, използвана от клиенти с команден ред, " -"за изпращане на аргументите, следващи \"quote\", на сървъра. Можете да " -"въведете оригиналната команда без началното \"quote\"." +"„quote“ обикновено е местна команда, използвана от клиенти с команден ред, " +"за изпращане на аргументите, следващи „quote“, на сървъра. Можете да " +"въведете оригиналната команда без началното „quote“." -#: ../../locales/../src/interface/filelist_statusbar.cpp:96 -#: ../../locales/../src/interface/filelist_statusbar.cpp:105 +#: ../src/interface/filelist_statusbar.cpp:87 +#: ../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" -msgstr[0] "(%d обект филтриран)" -msgstr[1] "(%d обекта филтрирани)" +msgstr[0] "(%d филтриран обект)" +msgstr[1] "(%d филтрирани обекта)" -#: resources.h:769 resources.h:771 +#: ../src/interface/update_dialog.cpp:313 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% изтеглени)" + +#: ../src/interface/resources/xrc/settings.xrc:859 +#: ../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 за неограничено)" -#: resources.h:699 +#: ../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: resources.h:701 +#: ../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 секунди)" -#: resources.h:767 +#: ../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: resources.h:695 -msgid "(5-9999, 0 to disable)" -msgstr "(5-9999, 0 за изключване)" +#: ../src/interface/resources/xrc/settings.xrc:110 +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, 0 за изключване)" -#: ../../locales/../src/interface/aboutdialog.cpp:136 -#: ../../locales/../src/interface/aboutdialog.cpp:224 +#: ../src/interface/aboutdialog.cpp:94 ../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(на app-compat е зададено %d.%d)" -#: resources.h:861 +#: ../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(пример: %H:%M)" -#: resources.h:856 +#: ../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(пример: %Y-%m-%d)" -#: resources.h:422 resources.h:424 resources.h:775 resources.h:777 +#: ../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../src/interface/resources/xrc/settings.xrc:920 +#: ../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(в %s/с)" -#: resources.h:667 +#: ../src/interface/resources/xrc/netconfwizard.xrc:295 msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:235 +#: ../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- остават" -#: ../../locales/../src/interface/cmdline.cpp:88 +#: ../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." msgstr "-c не може да се използва заедно с FTP URL." -#: ../../locales/../src/interface/cmdline.cpp:97 +#: ../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." msgstr "-l може да се бъде използвано само заедно с FTP URL." -#: ../../locales/../src/interface/cmdline.cpp:76 +#: ../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." msgstr "-s и -c не могат да бъдат използвани заедно." -#: ../../locales/../src/interface/cmdline.cpp:82 +#: ../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." msgstr "-s не може да се използва заедно с FTP URL." -#: resources.h:945 +#: ../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Няма" -#: resources.h:946 +#: ../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Предупреждения" -#: resources.h:947 +#: ../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Информация" -#: resources.h:948 +#: ../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Подробна" -#: ../../locales/../src/interface/aboutdialog.cpp:158 -msgid "32 bit system" -msgstr "32 битова система" +#: ../src/interface/aboutdialog.cpp:108 +msgid "32-bit system" +msgstr "32-битова система" -#: resources.h:949 +#: ../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Трасираща" -#: ../../locales/../src/interface/aboutdialog.cpp:156 -msgid "64 bit system" -msgstr "64 битова система" +#: ../src/interface/aboutdialog.cpp:105 +msgid "64-bit system" +msgstr "64-битова система" + +#: ../src/interface/netconfwizard.cpp:28 +msgid "< &Back" +msgstr "< &Назад" -#: resources.h:497 +#: ../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "Отметка с въведеното име вече съществува. Моля, въведете ново име." -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 +#: ../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Сертификат във веригата от сертификати е подписан с незащитен алгоритъм" + +#: ../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." -msgstr "Необходим е редактор по подразбиране." +msgstr "Необходим е стандартен редактор." -#: ../../locales/../src/interface/RemoteListView.cpp:158 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:816 +#: ../src/interface/RemoteListView.cpp:164 ../src/interface/state.cpp:852 +#: ../src/interface/RemoteTreeView.cpp:123 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Папка не може да бъде влачена в нейна подпапка." -#: resources.h:639 +#: ../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" "A few servers don't allow passive mode or are misconfigured. In such cases " "you would have to use active mode. In active mode, FileZilla opens a port " @@ -1158,30 +1334,22 @@ "настроени. В такива случаи се налага използването на активен режим. В " "активен режим FileZilla отваря порт и моли сървъра да се свърже към него." -#: resources.h:244 +#: ../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Вече отварян файл е бил променен." -#: ../../locales/../src/interface/LocalListView.cpp:1749 -#, c-format -msgid "" -"A file with that name is already being edited. Do you want to reopen '%s'?" -msgstr "" -"Файл с това име се редактира в момента. Искате ли да отворите отново \"%s\"?" - -#: ../../locales/../src/interface/LocalListView.cpp:1745 -#: ../../locales/../src/interface/RemoteListView.cpp:2440 +#: ../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Файл със същото име вече е бил прехвърлен." -#: ../../locales/../src/interface/RemoteListView.cpp:2445 +#: ../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Файл със същото име се редактира в момента. Моля, затворете го и пробвайте " "отново." -#: ../../locales/../src/interface/FileZilla.cpp:662 +#: ../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1196,11 +1364,20 @@ "файлове.\n" "В тази сесия няма да бъдат показвани повече такива предупреждения." -#: resources.h:1031 +#: ../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Изгубената главна парола не може да бъде възстановена! Моля, запомнете " +"вашата парола." + +#: ../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" -msgstr "Налична е нова версия на FileZilla:" +msgstr "Налично е ново издание на FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1208,7 +1385,7 @@ "Добре конфигурираният сървър показва всички файлове, но някои не показват " "скритите. Използвайте тази опция да накарате сървъра да показва всички." -#: resources.h:711 +#: ../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1216,7 +1393,7 @@ "Добре конфигурираният сървър не изисква това. Свържете се с администратора " "на сървъра, ако имате нужда от това." -#: ../../locales/../src/interface/state.cpp:284 +#: ../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1224,79 +1401,82 @@ "Отдалечена операция е в ход и синхронизирано разлистване е включено.\n" "Изключване на синхронизираното разлистване и смяна само на местната папка?" -#: resources.h:478 resources.h:623 resources.h:789 +#: ../src/interface/resources/xrc/menus.xrc:148 +#: ../src/interface/resources/xrc/menus.xrc:607 +#: ../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: resources.h:793 +#: ../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "До&бавяне" -#: resources.h:820 +#: ../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "Подно&вяване и за ASCII файлове" -#: ../../locales/../src/interface/fileexistsdlg.cpp:109 +#: ../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" msgstr "Само при &изтегляне" -#: ../../locales/../src/interface/fileexistsdlg.cpp:145 +#: ../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" msgstr "Само при &качване" -#: resources.h:110 +#: ../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "прилагане върху &всички файлове и папки" -#: resources.h:585 +#: ../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "&Автоматично премахване на успешните" -#: resources.h:327 +#: ../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "A&SCII" -#: resources.h:115 +#: ../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Относно FileZilla" -#: resources.h:830 +#: ../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Над панела с файлове и папки" -#: ../../locales/../src/engine/server.cpp:837 -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:161 -#: ../../locales/../src/interface/manual_transfer.cpp:194 -#: ../../locales/../src/interface/manual_transfer.cpp:568 -#: ../../locales/../src/interface/manual_transfer.cpp:569 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1293 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1294 +#: ../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Достъпът до някои местни папки не може да бъде възстановен:" + +#: ../src/engine/server.cpp:582 ../src/engine/server.cpp:605 +#: ../src/interface/manual_transfer.cpp:148 +#: ../src/interface/manual_transfer.cpp:149 +#: ../src/interface/manual_transfer.cpp:185 +#: ../src/interface/manual_transfer.cpp:535 +#: ../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Сметка" -#: resources.h:557 +#: ../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" -msgstr "Действие &след обработка на опашката" +msgstr "Действие &след обработване на опашката" -#: resources.h:267 +#: ../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Действие с избраните:" -#: resources.h:261 +#: ../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Действие:" -#: resources.h:67 +#: ../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Действие:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 +#: ../src/interface/settings/settingsdialog.cpp:94 msgid "Active mode" msgstr "Активен режим" -#: ../../locales/../src/interface/netconfwizard.cpp:605 +#: ../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1304,7 +1484,7 @@ "Проверката на активния FTP режим се провали. FileZilla не знае вашия външен " "IP адрес." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1313,7 +1493,7 @@ "външен IP адрес. В допълнение маршрутизаторът ви е променил адреса на " "изпращача." -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1323,35 +1503,39 @@ "IP адрес, но вашият маршрутизатор или защитна стена подвеждащо е променил " "изпратения адрес." -#: resources.h:724 +#: ../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP адрес за активен режим" -#: resources.h:388 +#: ../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "&Добавяне в опашката" -#: resources.h:589 resources.h:610 +#: ../src/interface/resources/xrc/menus.xrc:507 +#: ../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Добавяне избраната папка в опашката" -#: resources.h:509 resources.h:528 +#: ../src/interface/resources/xrc/menus.xrc:251 +#: ../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Добавяне избраните файлове и папки в опашката" -#: resources.h:895 resources.h:901 +#: ../src/interface/resources/xrc/settings.xrc:1903 +#: ../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Добавяне в опашката" -#: ../../locales/../src/engine/proxy.cpp:545 +#: ../src/engine/proxy.cpp:513 msgid "Address type not supported" -msgstr "Неподдържан тип на адрес" +msgstr "Неподдържан вид на адрес" -#: resources.h:971 +#: ../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Разширени" -#: resources.h:928 +#: ../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1359,48 +1543,56 @@ "expected and might even damage your system. Use beta versions and nightly " "builds at your own risk." msgstr "" -"Съвет: Освен ако не искате да изпробвате някои нови функционалности, моля " -"продължете да използвате стабилните версии. Бета версиите и нощните " -"компилации са развойни версии, предназначени за тестване. Нощните компилации " -"може да не работят по очаквания начин и дори могат да повредят системата ви. " -"Използвайте бета версиите и нощните компилации на ваша отговорност." +"Съвет: Освен ако не искате да изпробвате някои нови възможности, моля " +"продължете да използвате стабилните издания. Бета изданията и нощните " +"компилации са развойни издания, предназначени за изпитване. Нощните " +"компилации може да не работят по очаквания начин, а дори могат да повредят " +"системата ви. Използвайте бета изданията и нощните компилации на ваша " +"отговорност." -#: resources.h:418 +#: ../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "&Винаги това действие" -#: resources.h:276 +#: ../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Алгоритъм:" -#: ../../locales/../src/interface/QueueView.cpp:3118 +#: ../src/interface/QueueView.cpp:2652 msgid "All files have been successfully transferred" msgstr "Всички файлове са успешно прехвърлени" -#: resources.h:668 +#: ../src/interface/resources/xrc/netconfwizard.xrc:308 msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Всички портове в обхвата трябва да са между 1024 и 65535." -#: ../../locales/../src/interface/QueueView.cpp:3114 +#: ../src/interface/QueueView.cpp:2648 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "Всички прехвърляния приключени. %d файл не беше прехвърлен." msgstr[1] "Всички прехвърляния приключени. %d файла не бяха прехвърлени." -#: resources.h:707 +#: ../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "&Отстъпване до другия режим на прехвърляне при неуспех" -#: resources.h:643 +#: ../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" msgstr "&Отстъпване до другия режим на прехвърляне при неуспех" -#: resources.h:414 +#: ../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Активна връзка" -#: resources.h:752 +#: ../src/interface/verifycertdialog.cpp:80 +msgid "Alternative name:" +msgid_plural "Alternative names:" +msgstr[0] "Алтернативно име:" +msgstr[1] "Алтернативни имена:" + +#: ../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1408,332 +1600,366 @@ "Освен това можете да използвате инструмента Pageant от PuTTY да управлявате " "своите ключове, FileZilla разпознава Pageant." -#: resources.h:753 +#: ../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." msgstr "" -"Освен това можете да използвате SSH-клиента на вашата система. За да " -"направите това, уверете се, че променливата на средата SSH_AUTH_SOCK е " -"зададена." +"Освен това можете да използвате агента на SSH от вашата система. За да " +"направите това се уверете, че променливата на средата SSH_AUTH_SOCK е " +"правилно зададена." -#: resources.h:1040 +#: ../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "" -"Освен това може да изтеглите най-новата версия от страницата на FileZilla:" +"Освен това може да изтеглите най-новото издание от страницата на FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:2047 +#: ../src/interface/QueueView.cpp:1656 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" "Some queue items might not have been restored." msgstr "" -"Възникна грешка при зареждане на опашката от \"%s\".\n" +"Възникна грешка при зареждане на опашката от „%s“.\n" "Възможно е някои елементи да не са възстановени." -#: ../../locales/../src/interface/QueueView.cpp:1952 +#: ../src/interface/QueueView.cpp:1549 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" "Some queue items might not have been saved." msgstr "" -"Възникна грешка при запазване на опашката от \"%s\".\n" +"Възникна грешка при запазване на опашката от „%s“.\n" "Възможно е някои елементи да не са запазени." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960 +#: ../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Един от издателите във веригата от сертификати не е сертифициращ орган" + +#: ../src/interface/sitemanager_dialog.cpp:2261 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Елемент със същото име като влачения вече съществува в целевата папка." -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/interface/manual_transfer.cpp:159 -#: ../../locales/../src/interface/manual_transfer.cpp:197 -#: ../../locales/../src/interface/manual_transfer.cpp:213 -#: ../../locales/../src/interface/manual_transfer.cpp:567 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1292 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1536 +#: ../src/engine/server.cpp:607 ../src/interface/manual_transfer.cpp:147 +#: ../src/interface/manual_transfer.cpp:188 +#: ../src/interface/manual_transfer.cpp:203 +#: ../src/interface/manual_transfer.cpp:534 +#: ../src/interface/sitemanager_dialog.cpp:1716 msgid "Anonymous" msgstr "Анонимно" -#: ../../locales/../src/interface/state.cpp:1000 +#: ../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Друга отдалечена операция е в ход и папката не може да бъде разлистена." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:784 +#: ../src/interface/sitemanager_dialog.cpp:848 msgid "Any changes made in the Site Manager could not be saved." msgstr "" -"Никакви промени, направени в Манипулатор връзки няма да могат да бъдат " +"Никакви промени, направени в Управление на връзки няма да могат да бъдат " "запазени." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:731 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"Никакви промени, направени в Манипулатор връзки няма да бъдат запазени, " -"освен ако не поправите файла." - -#: ../../locales/../src/interface/filter.cpp:209 +#: ../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "" -"Никакви промени, направени в Манипулатор връзки няма да могат да бъдат " +"Никакви промени, направени в Управление на връзки няма да могат да бъдат " "запазени." -#: ../../locales/../src/interface/filter.cpp:1018 +#: ../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Никакви промени, направени във филтрите няма да бъдат запазени." -#: resources.h:112 +#: ../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "прилагане само върху &папки" -#: resources.h:175 +#: ../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "&Прилагане" -#: resources.h:76 +#: ../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Само за &текущата опашка" -#: resources.h:111 +#: ../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "прилагане само върху &файлове" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Архив" -#: ../../locales/../src/engine/socket.cpp:1245 -#, fuzzy +#: ../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" -msgstr "Подаден е невалиден аргумент" +msgstr "Препълване на буфера за аргументи" -#: resources.h:832 +#: ../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Като раздел в панела на опашката" -#: resources.h:197 resources.h:207 resources.h:801 resources.h:810 -#: resources.h:840 +#: ../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../src/interface/resources/xrc/settings.xrc:1187 +#: ../src/interface/resources/xrc/settings.xrc:1208 +#: ../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" -msgstr "Питане за действие" +msgstr "питане за действие" -#: ../../locales/../src/engine/server.cpp:833 -#: ../../locales/../src/engine/server.cpp:852 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../src/engine/server.cpp:573 ../src/engine/server.cpp:599 +#: ../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Питане за парола" -#: resources.h:664 +#: ../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." msgstr "&Запитване към операционната система" -#: resources.h:654 +#: ../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" msgstr "&Запитване към операционната система" -#: resources.h:409 +#: ../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Задаване на въпроси във форумите на FileZilla" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 +#: ../src/interface/settings/optionspage_edit_associations.cpp:63 msgid "Associated program not found:" -msgstr "Асоциираната програма не е намерена" +msgstr "Асоциираната програма не е намерена:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:711 +#: ../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Поне едно условие във филтъра е непълно" -#: resources.h:673 +#: ../src/interface/resources/xrc/netconfwizard.xrc:346 msgid "At this point, all required information has been gathered." msgstr "Всичката необходима информация е събрана." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Атрибут" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:681 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:221 msgid "Authentication failed." msgstr "Неуспешно удостоверяване." -#: resources.h:847 +#: ../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Автор:" -#: resources.h:324 +#: ../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "&Автоматичен" -#: resources.h:791 +#: ../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" -msgstr "Автоматично класифициране типовете файлове" +msgstr "Автоматична класификация на файловете по вид" -#: resources.h:851 -msgid "Available sizes" -msgstr "Налични размери" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:124 -#: ../../locales/../src/engine/sizeformatting_base.cpp:183 +#: ../src/engine/sizeformatting_base.cpp:166 +#: ../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: resources.h:973 +#: ../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "&Заобикаляне прокси" -#: ../../locales/../src/engine/socket.cpp:1210 -#, fuzzy +#: ../src/engine/socket.cpp:1071 msgid "Bad file descriptor" -msgstr "Сгрешени" +msgstr "Грешен файлов дескриптор" -#: resources.h:405 +#: ../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Основни инструкции за ползване" -#: resources.h:834 +#: ../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Поведение" -#: ../../locales/../src/interface/edithandler.cpp:1148 -#: ../../locales/../src/interface/edithandler.cpp:1176 +#: ../src/interface/edithandler.cpp:1166 ../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Редактиран" -#: resources.h:572 -msgid "Benchmark string coalescer" -msgstr "Еталониране на механизма за слепване на низове" - -#: ../../locales/../src/engine/tlssocket.cpp:1076 +#: ../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Пазете се! Сертификатът е анулиран" -#: resources.h:328 +#: ../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "&Двоичен" -#: resources.h:827 +#: ../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Черна дъска" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:270 -#: ../../locales/../src/interface/menu_bar.cpp:315 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:396 +#: ../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "син" + +#: ../src/interface/bookmarks_dialog.cpp:271 ../src/interface/menu_bar.cpp:321 +#: ../src/interface/sitemanager_dialog.cpp:393 msgid "Bookmark" msgstr "Отметка" -#: resources.h:351 +#: ../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Отметка:" -#: resources.h:350 +#: ../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Отметки" -#: resources.h:123 +#: ../src/interface/resources/xrc/sitemanager.xrc:258 +msgid "Browse..." +msgstr "Избиране…" + +#: ../src/engine/storj/resolve.cpp:70 ../src/engine/storj/resolve.cpp:158 +#: ../src/engine/storj/resolve.cpp:226 ../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Кофата не е намерена" + +#: ../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Дата на компилация:" -#: resources.h:120 +#: ../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Информация за компилацията" -#: ../../locales/../src/interface/verifycertdialog.cpp:183 +#: ../src/interface/verifycertdialog.cpp:249 msgid "Business category:" msgstr "Категория заетост:" -#: resources.h:714 +#: ../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " "please enter the port range below." msgstr "" -"По подразбиране се използва някой свободен местен порт за прехвърлянията в " +"Стандартно се използва някой свободен местен порт за прехвърлянията в " "активен режим. Ако желаете да ограничите FileZilla, в използвания обхват " "портове можете да въведете желаните портове по-долу." -#: resources.h:486 +#: ../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "&Прекъсване текущата операция" -#: resources.h:569 +#: ../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "&Изчистване" -#: resources.h:543 resources.h:598 +#: ../src/interface/resources/xrc/menus.xrc:332 +#: ../src/interface/resources/xrc/menus.xrc:528 +#: ../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "&Копиране на URL в системния буфер" -#: resources.h:855 +#: ../src/interface/resources/xrc/menus.xrc:336 +#: ../src/interface/resources/xrc/menus.xrc:532 +#: ../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "&Копиране на адрес с паролата в системния буфер" + +#: ../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "По&требителски" -#: resources.h:916 +#: ../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "&Потребителски файлови асоциации:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1272 +#: ../src/interface/resources/xrc/dialogs.xrc:955 +msgid "CPU features:" +msgstr "Възможности на процесора:" + +#: ../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." -msgstr "Изчисляване часовата разлика със сървъра..." +msgstr "Изчисляване часовата разлика със сървъра…" -#: ../../locales/../src/engine/transfersocket.cpp:699 +#: ../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Грешка при четене от файл" -#: ../../locales/../src/engine/transfersocket.cpp:677 -#: ../../locales/../src/engine/transfersocket.cpp:750 +#: ../src/engine/ftp/transfersocket.cpp:667 +#: ../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Неуспешен запис на данни във файл." -#: ../../locales/../src/engine/transfersocket.cpp:679 -#: ../../locales/../src/engine/transfersocket.cpp:752 +#: ../src/engine/ftp/transfersocket.cpp:670 +#: ../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Неуспешен запис във файл: %s" -#: resources.h:30 resources.h:79 resources.h:114 resources.h:146 -#: resources.h:174 resources.h:191 resources.h:218 resources.h:227 -#: resources.h:234 resources.h:242 resources.h:265 resources.h:298 -#: resources.h:331 resources.h:345 resources.h:357 resources.h:367 -#: resources.h:390 resources.h:399 resources.h:419 resources.h:998 +#: ../src/interface/resources/xrc/certificate.xrc:269 +#: ../src/interface/resources/xrc/dialogs.xrc:239 +#: ../src/interface/resources/xrc/dialogs.xrc:565 +#: ../src/interface/resources/xrc/dialogs.xrc:757 +#: ../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "От&каз" -#: resources.h:1014 +#: ../src/interface/toolbar.cpp:45 msgid "Cancel current operation" -msgstr "Прекъсване текущата операция" +msgstr "Прекъсва текущата операция" -#: resources.h:1015 +#: ../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Прекъсва операцията извършвана в момента" -#: ../../locales/../src/engine/local_path.cpp:450 +#: ../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" -"Грешка при достъп до \"%s\" - няма сложен диск или устройството не е готово." +"Грешка при достъп до „%s“ - няма сложен диск или устройството не е готово." -#: ../../locales/../src/interface/Mainfrm.cpp:538 +#: ../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" -msgstr "Неуспех при добавяне към Манипулатор връзки" +msgstr "Грешка при добавяне на връзка към Управление на връзки" -#: ../../locales/../src/engine/socket.cpp:1262 +#: ../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" +msgstr "Не може да се възложи искания адрес" + +#: ../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." msgstr "" +"Папката не може да бъде сменена в момента тече действие по синхронизирано " +"разлистване." -#: ../../locales/../src/interface/context_control.cpp:354 +#: ../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" msgstr "" -"Не може да бъде затворен подпрозорец докато извършва дейност.\n" -"Отказ от текущата операция и затваряне на подпрозореца?" +"Раздел не може да бъде затварян докато в него се извършва някаква дейност.\n" +"Желаете ли текущата операция да бъде прекратена и разделът да бъде затворен?" -#: ../../locales/../src/interface/listingcomparison.cpp:74 +#: ../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1741,30 +1967,24 @@ "Невъзможност за сравняване, на месните и отдалечените папки са наложени " "различни филтри" -#: ../../locales/../src/interface/RemoteListView.cpp:2536 -msgid "Cannot compare directories, not connected to a server." -msgstr "Неуспешно сравняване на папки, няма осъществена връзка със сървър." - -#: ../../locales/../src/interface/filteredit.cpp:143 +#: ../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Неуспешно създаване филтър" -#: ../../locales/../src/interface/LocalListView.cpp:1727 -#: ../../locales/../src/interface/LocalListView.cpp:1856 -#: ../../locales/../src/interface/RemoteListView.cpp:2374 -#: ../../locales/../src/interface/RemoteListView.cpp:2420 +#: ../src/interface/edithandler.cpp:1626 ../src/interface/edithandler.cpp:1674 +#: ../src/interface/LocalListView.cpp:1835 ../src/interface/search.cpp:1184 msgid "Cannot edit file" -msgstr "Невъзможна редакция на файл" +msgstr "Файлът не може да бъде редактиран" -#: ../../locales/../src/interface/LocalListView.cpp:1643 +#: ../src/interface/LocalListView.cpp:1711 msgid "Cannot edit file, not connected to any server." -msgstr "Невъзможна редакция на файл, няма активна връзка със сървър." +msgstr "Файлът не може да бъде редактиран, няма отворена връзка със сървър." -#: ../../locales/../src/interface/LocalListView.cpp:1654 +#: ../src/interface/LocalListView.cpp:1720 msgid "Cannot edit file, remote path unknown." -msgstr "Невъзможна редакция на файл. Отдалеченият път е неизвестен." +msgstr "Файлът не може да бъде редактиран. Отдалеченият път е неизвестен." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1772,637 +1992,687 @@ "Не може да бъде установена FTP връзка със SFTP сървър. Моля изберете " "правилният протокол." -#: ../../locales/../src/interface/quickconnectbar.cpp:37 -#: ../../locales/../src/interface/quickconnectbar.cpp:55 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Грешка при зареждане на лентата \"Бързо свързване\" от ресурсен файл" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 -msgid "Cannot load keyfile" +#: ../src/interface/settings/optionspage_connection_sftp.cpp:126 +msgid "Cannot load key file" msgstr "Неуспешно зареждане на файл-ключ" -#: ../../locales/../src/interface/Mainfrm.cpp:1058 +#: ../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Грешка при зареждане на лента с инструменти от ресурсен файл" -#: ../../locales/../src/interface/manual_transfer.cpp:463 +#: ../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Без запазване на пароли" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:707 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 +#: ../src/interface/bookmarks_dialog.cpp:732 +#: ../src/interface/sitemanager_dialog.cpp:1264 msgid "Cannot rename entry" msgstr "Грешка при преименуване на запис" -#: ../../locales/../src/interface/RemoteListView.cpp:1656 +#: ../src/interface/RemoteListView.cpp:1627 msgid "Cannot rename file" msgstr "Грешка при преименуване на файл" -#: ../../locales/../src/engine/proxy.cpp:138 +#: ../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "IPv4 адреси не могат да бъдат разпознавани през SOCKS4 прокси." -#: ../../locales/../src/interface/filter.cpp:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../src/interface/filter.cpp:245 ../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Неуспешен запис на набора филтри" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Неуспешен избор на филтър" -#: ../../locales/../src/interface/edithandler.cpp:1526 -#: ../../locales/../src/interface/edithandler.cpp:1531 -#: ../../locales/../src/interface/edithandler.cpp:1570 +#: ../src/interface/edithandler.cpp:1524 ../src/interface/edithandler.cpp:1528 +#: ../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Асоциацията не може да бъде избрана" -#: ../../locales/../src/interface/edithandler.cpp:1107 +#: ../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Невъзможно показване на диалог" -#: ../../locales/../src/interface/LocalListView.cpp:1745 -#: ../../locales/../src/interface/RemoteListView.cpp:2440 +#: ../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Не може да прегледате/редактирате избрания файл" -#: resources.h:885 +#: ../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Нечувствителност към регистъра" + +#: ../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Нечувствителност към регистъра" -#: resources.h:884 +#: ../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" -msgstr "Нечувствителност към регистъра (по подразбиране)" +msgstr "Нечувствителност към регистъра (стандартно)" -#: resources.h:886 +#: ../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" -msgstr "&Чувствителност към регистъра" +msgstr "Чувствителност към регистъра" -#: resources.h:887 +#: ../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" -msgstr "&Чувствителност към регистъра (по подразбиране)" +msgstr "Чувствителност към регистъра (стандартно)" -#: resources.h:221 -msgid "Categories" -msgstr "Категории" +#: ../src/interface/resources/xrc/dialogs.xrc:1702 +msgid "Categories to clear" +msgstr "Категории за изтриване" -#: ../../locales/../src/interface/statusbar.cpp:495 +#: ../src/interface/statusbar.cpp:514 msgid "Certificate and session data are not available yet." msgstr "Сертификат и данни на сесия не са налични все още." -#: resources.h:31 -msgid "Certificate details" -msgstr "Детайли на сертификата" - -#: resources.h:3 resources.h:32 +#: ../src/interface/resources/xrc/certificate.xrc:29 msgid "Certificate in chain:" -msgstr "Сертификат във верига:" +msgstr "Сертификат във веригата:" -#: resources.h:14 resources.h:43 +#: ../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "Издател на сертификата" -#: resources.h:87 +#: ../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Грешка при проверка на подписа на сертификата" + +#: ../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Запитване:" -#: resources.h:93 +#: ../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Промяна на атрибутите" -#: resources.h:546 resources.h:601 +#: ../src/interface/resources/xrc/menus.xrc:341 +#: ../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Промяна на правата за файл." -#: resources.h:941 +#: ../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Промяната на настройките за файл-дневник изискват рестартиране на FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:662 +#: ../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" -msgstr "Проблем с знаковата кодировка" +msgstr "Проблем със знаковия набор" -#: resources.h:988 +#: ../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Знаков набор" -#: resources.h:499 +#: ../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." -msgstr "&Актуализация..." +msgstr "&Проверка за обновяване…" -#: resources.h:920 +#: ../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" -msgstr "Автоматична &проверка за актуализация:" +msgstr "Автоматична &проверка за обновяване:" -#: resources.h:1028 +#: ../src/interface/resources/xrc/update.xrc:4 msgid "Check for Updates" -msgstr "Проверка за актуализация" +msgstr "Проверка за обновяване" -#: resources.h:500 +#: ../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" -msgstr "Проверка за по-нова версия на FileZilla" +msgstr "Проверка за по-ново издание на FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" -msgstr "Проверката за актуализация беше неуспешна" +msgstr "Грешка при проверка за обновяване" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:816 +#: ../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "Въведената парола започва или завършва с интервал." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:812 +#: ../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." msgstr "Въведеното потребителско име започва или завършва с интервал." -#: ../../locales/../src/interface/netconfwizard.cpp:765 +#: ../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Проверяване за правилен външен IP адрес" -#: resources.h:1042 +#: ../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." -msgstr "Проверяване за актуализация..." +msgstr "Проверяване за обновяване…" -#: ../../locales/../src/interface/updater.cpp:703 +#: ../src/interface/updater.cpp:770 #, c-format msgid "Checksum match on file %s\n" -msgstr "Съвпадение на хеш сума на файл \"%s\"\n" +msgstr "Съвпадение на хеш-сума на файл „%s“\n" -#: ../../locales/../src/interface/updater.cpp:699 +#: ../src/interface/updater.cpp:766 #, c-format msgid "Checksum mismatch on file %s\n" -msgstr "Различна хеш сума на файл \"%s\"\n" +msgstr "Различна хеш-сума на файл „%s“\n" + +#: ../src/interface/sitemanager_dialog.cpp:1611 +msgid "Choose a key file" +msgstr "Избиране на файл-ключ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1466 +#: ../src/interface/sitemanager_dialog.cpp:1646 msgid "Choose the default local directory" -msgstr "Избор на местна папка по подразбиране" +msgstr "Избиране на стандартна местна папка" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:131 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:372 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187 +#: ../src/interface/bookmarks_dialog.cpp:134 +#: ../src/interface/bookmarks_dialog.cpp:386 +#: ../src/interface/sitemanager_dialog.cpp:2502 msgid "Choose the local directory" msgstr "Избор на местна папка" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../src/engine/http/request.cpp:462 msgid "Chunk data improperly terminated" msgstr "Неправилно завършени данни в пакета" -#: resources.h:23 resources.h:52 +#: ../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "Шифър:" -#: resources.h:445 resources.h:628 +#: ../src/interface/resources/xrc/menus.xrc:21 +#: ../src/interface/resources/xrc/menus.xrc:641 msgid "Cl&ose tab" -msgstr "З&атваряне на подпрозорец" +msgstr "З&атваряне на раздел" -#: resources.h:824 +#: ../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Класически" -#: resources.h:224 -msgid "Clear &Site Manager entries" -msgstr "&Манипулатор връзки" - -#: resources.h:570 +#: ../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "&Заличаване кеш-паметта на изгледа" -#: resources.h:222 -msgid "Clear &quickconnect history" -msgstr "хронология &бързо свързване" - -#: resources.h:223 -msgid "Clear &reconnect information" -msgstr "информация &повторно свързване" - -#: resources.h:225 -msgid "Clear &transfer queue" -msgstr "о&пашка" +#: ../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "&Заличаване файла с акутализацията" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Заличаване хронологията" -#: resources.h:219 ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../src/interface/clearprivatedata.cpp:35 +#: ../src/interface/clearprivatedata.cpp:41 +#: ../src/interface/clearprivatedata.cpp:47 +#: ../src/interface/clearprivatedata.cpp:74 +#: ../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Заличаване лични данни" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" -msgstr "Изчистване лентата \"Бързо свързване\"" - -#: resources.h:571 -msgid "Clear string coalescer" -msgstr "Изчистване на механизма за слепване на низове" +msgstr "Изчистване лентата Бързо свързване" -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." -msgstr "Натиснете \"Край\", за да запишете настройките." +msgstr "За да бъдат запазени настройките изберете бутона Край." -#: resources.h:285 +#: ../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "MAC от клиента към сървъра:" -#: resources.h:283 +#: ../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Шифър от клиента към сървъра:" -#: resources.h:629 +#: ../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Затваряне" + +#: ../src/interface/resources/xrc/menus.xrc:644 msgid "Close &all other tabs" -msgstr "Затваряне на &другите подпрозорци" +msgstr "Затваряне на &другите раздели" -#: resources.h:451 ../../locales/../src/interface/Mainfrm.cpp:1203 -#: ../../locales/../src/interface/Mainfrm.cpp:1226 +#: ../src/interface/resources/xrc/menus.xrc:40 +#: ../src/interface/Mainfrm.cpp:1230 ../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "Затваряне на FileZilla" -#: ../../locales/../src/interface/cmdline.cpp:15 +#: ../src/interface/cmdline.cpp:15 msgid "Close all running instances of FileZilla" msgstr "Затваряне на всички активни прозорци на FileZilla" -#: resources.h:446 +#: ../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Затваряне на бързото търсене и продължаване на сравняването?" + +#: ../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" -msgstr "Затваря текущия подпрозорец" +msgstr "Затваря текущия раздел" -#: resources.h:970 +#: ../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "&Коментар:" -#: ../../locales/../src/interface/listctrlex.cpp:749 +#: ../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Настройка колони" -#: resources.h:292 +#: ../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Настройка колони" -#: resources.h:911 +#: ../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Командата и аргументите трябва да бъдат поставени в кавички." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../src/interface/fzputtygen_interface.cpp:210 +#: ../src/interface/fzputtygen_interface.cpp:232 +#: ../src/interface/storj_key_interface.cpp:95 +#: ../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Командата неуспешна" -#: ../../locales/../src/engine/proxy.cpp:542 +#: ../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Неподдържана команда" -#: ../../locales/../src/engine/engineprivate.cpp:174 +#: ../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Неподдържана от протокола команда" -#: ../../locales/../src/engine/logging.cpp:124 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:342 +#: ../src/engine/logging.cpp:114 ../src/interface/StatusView.cpp:286 +#: ../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "Команда:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Коментар" -#: ../../locales/../src/interface/verifycertdialog.cpp:181 +#: ../src/interface/verifycertdialog.cpp:247 msgid "Common name:" msgstr "Общо име:" -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:441 +#: ../src/interface/netconfwizard.cpp:449 +#: ../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" -msgstr "Комуникацията се влошава от защитна стена или маршрутизатор." +msgstr "Комуникацията се влошава от защитна стена или маршрутизатор" -#: resources.h:463 resources.h:605 +#: ../src/interface/resources/xrc/menus.xrc:86 +#: ../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Сравняване &времената" -#: resources.h:462 resources.h:604 +#: ../src/interface/resources/xrc/menus.xrc:82 +#: ../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Сравняване &дължината" -#: resources.h:891 +#: ../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Пр&аг за сравнение (в минути):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Прагът за сравнение трябва да бъде между 0 и 1440 минути." -#: resources.h:121 +#: ../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Компилирано за:" -#: resources.h:122 +#: ../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Компилирано на:" -#: resources.h:124 +#: ../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Компилирано с:" -#: resources.h:125 +#: ../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Флагове за компилатора:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Компресиран" -#: resources.h:765 +#: ../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Паралелни прехвърляния" -#: resources.h:186 resources.h:376 +#: ../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" -msgstr "Правилата са &чувствителни към регистъра на знаците" +msgstr "&Чувствителност към регистъра" -#: resources.h:672 +#: ../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" msgstr "Проверка на настройките" -#: resources.h:646 +#: ../src/interface/resources/xrc/netconfwizard.xrc:115 msgid "Configure passive mode" msgstr "Настройване на пасивния режим" -#: resources.h:662 +#: ../src/interface/resources/xrc/netconfwizard.xrc:261 msgid "Configure port range" msgstr "Настройка на обхвата на портовете" -#: resources.h:406 +#: ../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Конфигуриране на FileZilla и мрежата" -#: ../../locales/../src/interface/search.cpp:726 +#: ../src/interface/search.cpp:1243 msgid "Confirm deletion" msgstr "Нужно е потвърждение" -#: ../../locales/../src/engine/local_filesys.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:1698 -#: ../../locales/../src/interface/LocalListView.cpp:1817 -#: ../../locales/../src/interface/RemoteListView.cpp:1460 -#: ../../locales/../src/interface/RemoteListView.cpp:2391 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1138 +#: ../src/interface/edithandler.cpp:1638 ../src/interface/file_utils.h:45 +#: ../src/interface/RemoteListView.cpp:1429 +#: ../src/interface/LocalListView.cpp:1797 ../src/interface/search.cpp:1196 +#: ../src/interface/RemoteTreeView.cpp:1085 msgid "Confirmation needed" msgstr "Нужно е потвърждение" -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Поздравления, изглежда настройките ви са правилни." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Свързване прескачайки прокси настройките" -#: resources.h:842 +#: ../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Неуспешно установена връзка: %s" + +#: ../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" -msgstr "&текущия подпрозорец" +msgstr "&текущият раздел" -#: resources.h:841 +#: ../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" -msgstr "нов &подпрозорец" +msgstr "нов &раздел" -#: ../../locales/../src/interface/cmdline.cpp:8 +#: ../src/interface/cmdline.cpp:8 msgid "Connect to specified Site Manager site" -msgstr "Свързване към определена връзка от Манипулатор връзки" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:956 -msgid "Connected" -msgstr "Връзката осъществена" +msgstr "Свързване към определена връзка от Управление на връзки" -#: ../../locales/../src/interface/QueueView.cpp:1451 +#: ../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Свързване" -#: ../../locales/../src/interface/netconfwizard.cpp:207 -#: ../../locales/../src/interface/statuslinectrl.cpp:272 +#: ../src/interface/statuslinectrl.cpp:256 +#: ../src/interface/netconfwizard.cpp:214 #, c-format msgid "Connecting to %s" msgstr "Свързване към %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1139 +#: ../src/engine/ftp/logon.cpp:96 ../src/engine/ControlSocket.cpp:1058 #, c-format -msgid "Connecting to %s through proxy" -msgstr "Свързване с %s през прокси" +msgid "Connecting to %s through %s proxy" +msgstr "Свързване с %s през прокси %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1008 -#: ../../locales/../src/engine/proxy.cpp:205 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:398 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../src/engine/storj/storjcontrolsocket.cpp:42 ../src/engine/proxy.cpp:240 +#: ../src/engine/ControlSocket.cpp:990 #, c-format msgid "Connecting to %s..." -msgstr "Свързване към %s..." +msgstr "Свързване към %s…" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 +#: ../src/interface/settings/settingsdialog.cpp:92 msgid "Connection" -msgstr "Връзка" +msgstr "Свързване" -#: ../../locales/../src/engine/socket.cpp:1224 +#: ../src/engine/socket.cpp:1085 msgid "Connection aborted" -msgstr "Връзката прекъсната" +msgstr "Връзката е прекъсната" -#: ../../locales/../src/interface/QueueView.cpp:1063 +#: ../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Опитът за връзка неуспешен" -#: ../../locales/../src/engine/ControlSocket.cpp:1013 -#: ../../locales/../src/engine/proxy.cpp:210 +#: ../src/engine/proxy.cpp:212 ../src/engine/ControlSocket.cpp:952 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." -msgstr "Неуспешен опит за връзка с \"%s\", пробване на следващ адрес." +msgstr "Неуспешен опит за връзка с „%s“, пробване на следващ адрес." -#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\"." -msgstr "Неуспешен опит за връзка с \"%s\"." +msgstr "Неуспешен опит за връзка с „%s“." -#: ../../locales/../src/engine/ControlSocket.cpp:192 -#: ../../locales/../src/engine/engineprivate.cpp:311 +#: ../src/engine/ControlSocket.cpp:175 ../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Опитът за свързване бе прекратен от потребителя" -#: ../../locales/../src/engine/socket.cpp:1217 +#: ../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Времето за изчакване при свързване изтече" -#: ../../locales/../src/interface/netconfwizard.cpp:543 +#: ../src/interface/netconfwizard.cpp:562 msgid "Connection closed" -msgstr "Връзката прекъсната" +msgstr "Връзката е прекъсната" -#: ../../locales/../src/engine/ControlSocket.cpp:1106 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241 +#: ../src/engine/http/request.cpp:184 ../src/engine/http/request.cpp:195 +#: ../src/engine/http/request.cpp:208 ../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../src/engine/ControlSocket.cpp:1036 msgid "Connection closed by server" -msgstr "Връзката прекъсната от сървъра" +msgstr "Връзката е прекъсната от сървъра" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:298 +#: ../src/engine/http/httpcontrolsocket.cpp:113 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:185 msgid "Connection established, initializing TLS..." -msgstr "Установена е връзка, инициализира се TLS..." +msgstr "Установена е връзка, инициализира се TLS…" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:333 +#: ../src/engine/http/httpcontrolsocket.cpp:136 msgid "Connection established, sending HTTP request" -msgstr "Установена е връзка, изпраща се заявка тип HTTP" +msgstr "Установена е връзка, изпраща се заявка от вид HTTP" + +#: ../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Връзката е установена, в очакване на приветствие." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:420 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." -msgstr "Връзка установена, очаква се приветствие..." +msgstr "Връзката е установена, в очакване на приветствие…" -#: ../../locales/../src/interface/netconfwizard.cpp:338 +#: ../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Връзката е загубена" -#: ../../locales/../src/engine/proxy.cpp:527 +#: ../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Непозволена от правилата връзка" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../src/engine/proxy.cpp:504 msgid "Connection refused" -msgstr "Връзката отказана" +msgstr "Връзката е отказана" -#: ../../locales/../src/engine/socket.cpp:1211 +#: ../src/engine/socket.cpp:1072 msgid "Connection refused by server" -msgstr "Връзката отказана от сървъра" +msgstr "Връзката е отказана от сървъра" -#: ../../locales/../src/engine/socket.cpp:1220 -#, fuzzy +#: ../src/engine/socket.cpp:1081 msgid "Connection reset by network" -msgstr "Възстанови" +msgstr "Връзката е прекъсната от мрежата" -#: ../../locales/../src/engine/socket.cpp:1225 -#, fuzzy +#: ../src/engine/socket.cpp:1086 msgid "Connection reset by peer" -msgstr "Възстанови" +msgstr "Връзката е прекъсната от отсрещната страна" -#: ../../locales/../src/engine/ControlSocket.cpp:655 -msgid "Connection timed out" -msgstr "Времето за изчакване при свързване изтече" +#: ../src/engine/ControlSocket.cpp:511 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "Времето за свързване изтече след %d секунда бездействие" +msgstr[1] "Времето за свързване изтече след %d секунди бездействие" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Времето за свързване изтече." -#: ../../locales/../src/interface/search.cpp:369 +#: ../src/interface/search.cpp:708 msgid "Connection to server lost." -msgstr "Връзката със сървъра загубена." +msgstr "Връзката със сървъра е загубена." -#: ../../locales/../src/engine/proxy.cpp:222 +#: ../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." -msgstr "Връзка с прокси установена, очаква се приветствие..." +msgstr "Връзката с прокси е установена, в очакване на приветствие…" -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." -msgstr "Връзката със сървъра беше приключена преждевременно." +msgstr "Връзката със сървъра е затворена преждевременно." -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." -msgstr "Връзката с тестовия сървър неуспешна." +msgstr "Неуспешно свързване с тестовия сървър." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" +#: ../src/interface/fzputtygen_interface.cpp:88 +msgid "Convert key file" msgstr "Превръщане на файл-ключ" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:645 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1769 +#: ../src/interface/bookmarks_dialog.cpp:676 +#: ../src/interface/sitemanager_dialog.cpp:2062 #, c-format msgid "Copy (%d) of %s" msgstr "Копиране (%d) на %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:622 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1746 +#: ../src/interface/bookmarks_dialog.cpp:655 +#: ../src/interface/sitemanager_dialog.cpp:2041 #, c-format msgid "Copy of %s" msgstr "Копиране на %s" -#: resources.h:544 resources.h:599 +#: ../src/interface/resources/xrc/menus.xrc:337 +#: ../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Копиране на адреси с паролите на избраните елементи в системния буфер." + +#: ../src/interface/resources/xrc/menus.xrc:333 +#: ../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Копиране в системния буфер на URL на избраните елементи." -#: ../../locales/../src/engine/transfersocket.cpp:211 +#: ../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Невъзможно приемане на връзка: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Няма достъп до пътя „%s“" + +#: ../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "" +"Добавяне на сертификат във временния списък с доверени сертификати е " +"невъзможно" + +#: ../src/interface/bookmarks_dialog.cpp:103 +#: ../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" -msgstr "Невъзможно добавянето на връзката към Манипулатор връзки" +msgstr "Невъзможно добавянето на връзката към Управление на връзки" -#: ../../locales/../src/interface/state.cpp:831 +#: ../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Невъзможно завършването на действието" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Невъзможно свързване със сървър" -#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../src/engine/ControlSocket.cpp:1091 #, c-format msgid "Could not connect to server: %s" msgstr "Невъзможно свързване със сървър: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../src/engine/sftp/filetransfer.cpp:76 +#: ../src/engine/sftp/filetransfer.cpp:97 +#: ../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Невъзможно преобразуване на командата към кодировката на сървъра" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../src/interface/fzputtygen_interface.cpp:127 +#: ../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Невъзможно преобразуване на частния ключ" -#: ../../locales/../src/interface/RemoteListView.cpp:2801 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1489 +#: ../src/interface/RemoteListView.cpp:2579 ../src/interface/search.cpp:1372 +#: ../src/interface/RemoteTreeView.cpp:1427 msgid "Could not copy URLs" msgstr "Невъзможно копирането на URL" -#: ../../locales/../src/interface/aboutdialog.cpp:242 +#: ../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Копиране на сертификата е невъзможно" + +#: ../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Невъзможно копирането на данните" -#: ../../locales/../src/interface/updater.cpp:445 +#: ../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Не може да бъде създаден CFURL от пътя „%s“" + +#: ../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Не може да бъде създаден URI за този пренос." + +#: ../src/interface/updater.cpp:505 #, c-format msgid "Could not create local file %s\n" -msgstr "Невъзможно създаване на местен файл \"%s\"\n" +msgstr "Невъзможно създаване на местен файл „%s“\n" -#: ../../locales/../src/interface/RemoteListView.cpp:2313 -#: ../../locales/../src/interface/RemoteTreeView.cpp:912 +#: ../src/engine/logging.cpp:179 +#, c-format +msgid "Could not create logging mutex: %s" +msgstr "Невъзможно създаване на мутекс за журнал: %s" + +#: ../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Не може да бъде създадена защитена отметка за адрес:" + +#: ../src/interface/RemoteListView.cpp:2224 +#: ../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " "files into an Explorer window." msgstr "" -"Невъзможно определяне на целта на операция \"Плъзгане и пускане\".\n" +"Невъзможно определяне на целта на операция плъзгане и пускане.\n" "Или разширението на обвивката не е инсталирано правилно, или не сте пуснали " "файловете в прозорец на Explorer." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4300 +#: ../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Невъзможно свързване със сървър" -#: ../../locales/../src/interface/FileZilla.cpp:499 +#: ../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " "' commandline option or by setting the FZ_DATADIR environment " "variable." msgstr "" -"Невъзможно откриване на ресурсните файлове за FileZilla - следва затваряне " -"на FileZilla.\n" -"Може да укажете папката за данни на FileZilla, използвайки опцията на " -"командния ред \"--datadir <път>\" или чрез установяване на променливата от " -"средата FZ_DATADIR." +"Ресурсните файлове за FileZilla не могат да бъдат намерени - следва " +"затваряне на програмата.\n" +"Може да укажете папката за данни на FileZilla, използвайки параметъра на " +"командния ред „--datadir <път>“ или чрез установяване на променливата на " +"обкръжението FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:706 +#: ../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Невъзможно съставянето на специална входна последователност." -#: ../../locales/../src/engine/tlssocket.cpp:1011 +#: ../src/interface/settings/optionspage_interface.cpp:121 +#: ../src/interface/asksavepassworddialog.cpp:53 +msgid "Could not generate key" +msgstr "Не може да бъде генериран ключ" + +#: ../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2410,7 +2680,7 @@ "Не може да бъде взето името на издателя на сертификата, " "gnutls_x509_get_issuer_dn се провали" -#: ../../locales/../src/engine/tlssocket.cpp:988 +#: ../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2418,440 +2688,496 @@ "Не може да бъде взето името на обекта на сертификата, gnutls_x509_get_dn се " "провали" -#: ../../locales/../src/interface/state.cpp:984 +#: ../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Не може да бъде получен пълен отдалечен път." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Не може да бъде получен изходния път от CFURL" + +#: ../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Не може да бъде получен път от адреса" + +#: ../src/interface/fzputtygen_interface.cpp:232 +#: ../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Невъзможно получаване на отговор от fzputtygen." -#: ../../locales/../src/interface/RemoteListView.cpp:2374 +#: ../src/interface/edithandler.cpp:1626 ../src/interface/search.cpp:1184 msgid "Could not get temporary directory to download file into." msgstr "" "Невъзможно получаването на временна папка, в която да бъдат изтеглени " "файловете." -#: ../../locales/../src/engine/tlssocket.cpp:931 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Не могат да бъдат импортирани партньорски сертификати, " -"gnutls_x509_crt_import се провали" - -#: ../../locales/../src/engine/tlssocket.cpp:925 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Не може да бъде инициализирана структурата на партньорски сертификати, " -"gnutls_x509_crt_init се провали" +#: ../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Невъзможно инициализирането на Winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:95 -#: ../../locales/../src/interface/import.cpp:281 +#: ../src/interface/import.cpp:117 ../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " "accessed.\n" "Any changes made in the Site Manager will not be saved." msgstr "" -"Невъзможно зареждане на \"%s\" - проверете дали файла е валиден и има достъп " +"Отваряне на „%s“ е невъзможно - проверете дали файлът е валиден и има достъп " "до него.\n" -"Каквито и да са промени в Манипулатор връзки няма да бъдат запазени." +"Никакви промени в Управление на връзки няма да бъдат запазени." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223 -msgid "Could not load keyfile" +#: ../src/interface/fzputtygen_interface.cpp:38 +#: ../src/interface/fzputtygen_interface.cpp:65 +#: ../src/interface/fzputtygen_interface.cpp:71 +#: ../src/interface/fzputtygen_interface.cpp:78 +#: ../src/interface/fzputtygen_interface.cpp:144 +#: ../src/interface/fzputtygen_interface.cpp:149 +#: ../src/interface/fzputtygen_interface.cpp:157 +msgid "Could not load key file" msgstr "Невъзможно зареждане на файл-ключ" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Невъзможно зареждане на частен ключ" -#: ../../locales/../src/interface/state.cpp:1010 +#: ../src/interface/state.cpp:1092 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -"Не може да бъде получена съответната местна папка на отдалечената папка '%" -"s'.\n" +"Не може да бъде получена съответната местна папка на отдалечената папка " +"'%s'.\n" "Изключване на синхронизираното разлистване и смяна само на отдалечената " "папка?" -#: ../../locales/../src/interface/state.cpp:394 +#: ../src/interface/state.cpp:401 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" -"Не може да бъде получена съответната местна папка на отдалечената папка '%" -"s'.\n" +"Не може да бъде получена съответната местна папка на отдалечената папка " +"'%s'.\n" "Синхронизираното разлистване е изключено." -#: ../../locales/../src/interface/state.cpp:295 +#: ../src/interface/state.cpp:294 #, c-format msgid "" -"Could not obtain corresponding remote directory for the local directory '%" -"s'.\n" +"Could not obtain corresponding remote directory for the local directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" -"Не може да бъде получена съответната отдалечена папка на местната папка '%" -"s'.\n" +"Не може да бъде получена съответната отдалечена папка на местната папка " +"'%s'.\n" "Синхронизираното разлистване е изключено." -#: ../../locales/../src/interface/aboutdialog.cpp:242 -#: ../../locales/../src/interface/RemoteListView.cpp:2801 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1489 +#: ../src/interface/aboutdialog.cpp:220 +#: ../src/interface/RemoteListView.cpp:2579 ../src/interface/search.cpp:1372 +#: ../src/interface/RemoteTreeView.cpp:1427 msgid "Could not open clipboard" msgstr "Системният буфер не може да бъде отворен" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/engine/logging.cpp:187 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../src/engine/logging.cpp:108 ../src/engine/logging.cpp:192 +#: ../src/engine/logging.cpp:236 ../src/engine/logging.cpp:274 +#: ../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Невъзможно отварянето на файл-дневник: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 +#: ../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Неуспешно разпознат отдалечен път." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 +#: ../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Неуспешно разпознат адрес на сървър:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231 +#: ../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "Невъзможно прочитане на данни от сокет." + +#: ../src/engine/http/request.cpp:173 ../src/engine/ftp/ftpcontrolsocket.cpp:64 #, c-format msgid "Could not read from socket: %s" msgstr "Невъзможно прочитане на сокет: %s" -#: ../../locales/../src/interface/sitemanager.cpp:488 +#: ../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Невъзможно прочитане на елемент от отговора на сървъра." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2747 +#: ../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Невъзможно получаване на данни от сървъра." + +#: ../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Достъпът до папката не може да бъде възстановен" + +#: ../src/engine/ftp/filetransfer.cpp:173 #, c-format msgid "Could not seek to offset %s within file" msgstr "Невъзможно придвижване до отместване %s във файл" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658 +#: ../src/engine/http/filetransfer.cpp:119 +#: ../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "Невъзможно придвижване към началото на файла" + +#: ../src/engine/http/filetransfer.cpp:98 ../src/engine/ftp/filetransfer.cpp:90 msgid "Could not seek to the end of the file" msgstr "Невъзможно придвижване в края на файла" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 +#: ../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Невъзможно изпращане на команда към fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2778 +#: ../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Не може да бъде изпратена команда към fzstorj." + +#: ../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Сортирането на партньорските сертификати е невъзможно" + +#: ../src/engine/ftp/filetransfer.cpp:201 msgid "Could not spawn IO thread" msgstr "Невъзможно стартирането на входно-изходна нишка" -#: ../../locales/../src/engine/ControlSocket.cpp:1153 +#: ../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Невъзможно започване на прокси приветствие: %s" -#: ../../locales/../src/interface/QueueView.cpp:1114 -#: ../../locales/../src/interface/QueueView.cpp:1119 +#: ../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Невъзможно започване на прехвърляне" -#: ../../locales/../src/interface/sitemanager.cpp:660 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:805 +#: ../src/interface/sitemanager.cpp:633 +#: ../src/interface/sitemanager_dialog.cpp:869 #, c-format msgid "" -"Could not write \"%s\", any changes to the Site Manager could not be saved: %" -"s" +"Could not write \"%s\", any changes to the Site Manager could not be saved: " +"%s" msgstr "" -"Невъзможен запис в \"%s\" - никакви промени, направени в Манипулатор връзки " -"няма да могат да бъдат запазени: %s" +"Невъзможен запис в „%s“ - никакви промени в Управление на връзки няма да " +"бъдат запазени: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:842 +#: ../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" -msgstr "" -"Невъзможен запис в \"%s\", отметките няма да могат да бъдат запазени: %s" +msgstr "Невъзможен запис в „%s“, отметките няма да могат да бъдат запазени: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:324 +#: ../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" -msgstr "" -"Невъзможен запис в \"%s\", глобалните отметки няма да бъдат запазени: %s" +msgstr "Невъзможен запис в „%s“, общите отметки няма да бъдат запазени: %s" -#: ../../locales/../src/interface/QueueView.cpp:1981 +#: ../src/interface/QueueView.cpp:1580 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" "%s" msgstr "" -"Невъзможен запис в \"%s\", опашката няма да може да бъде запазена.\n" +"Невъзможен запис в „%s“, опашката няма да може да бъде запазена.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:778 -#: ../../locales/../src/interface/sitemanager.cpp:832 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168 +#: ../src/interface/sitemanager.cpp:758 ../src/interface/sitemanager.cpp:815 +#: ../src/interface/sitemanager_dialog.cpp:2480 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" -"Невъзможен запис в \"%s\", избраните връзки няма да могат да бъдат " +"Невъзможен запис в „%s“, избраните връзки няма да могат да бъдат " "експортирани: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:87 +#: ../src/interface/xmlfunctions.cpp:150 #, c-format msgid "Could not write \"%s\":" -msgstr "Неуспешен запис в \"%s\":" +msgstr "Невъзможен запис в „%s“:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../src/interface/fzputtygen_interface.cpp:137 #, c-format -msgid "Could not write keyfile: %s" +msgid "Could not write key file: %s" msgstr "Невъзможен запис на файл-ключ: %s" -#: ../../locales/../src/interface/QueueView.cpp:1108 +#: ../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Невъзможен запис в местен файл" -#: ../../locales/../src/engine/logging.cpp:226 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../src/engine/logging.cpp:249 ../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Невъзможно писането във файл-дневник: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:973 -#: ../../locales/../src/engine/ControlSocket.cpp:1071 +#: ../src/engine/http/request.cpp:120 ../src/engine/ControlSocket.cpp:913 +#: ../src/engine/ControlSocket.cpp:1008 #, c-format msgid "Could not write to socket: %s" msgstr "Невъзможен запис в сокет: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../src/interface/verifycertdialog.cpp:252 msgid "Country:" msgstr "Страна:" -#: resources.h:574 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "" -"Моментално забива FileZilla. Използва се само за откриване на грешки в " -"обработката на изключения" - -#: resources.h:536 +#: ../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "Нов &файл" -#: resources.h:517 resources.h:533 resources.h:591 resources.h:614 +#: ../src/interface/state.cpp:1107 +msgid "Create &missing local directory and enter it" +msgstr "Създаване на липсваща местна п&апка и разлистване" + +#: ../src/interface/state.cpp:1029 +msgid "Create &missing remote directory and enter it" +msgstr "Създаване на липсваща отдалечена п&апка и разлистване" + +#: ../src/interface/resources/xrc/menus.xrc:269 +#: ../src/interface/resources/xrc/menus.xrc:309 +#: ../src/interface/resources/xrc/menus.xrc:512 +#: ../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Създаване нова подпапка в текущата папка" -#: resources.h:519 resources.h:535 resources.h:593 resources.h:616 +#: ../src/interface/resources/xrc/menus.xrc:273 +#: ../src/interface/resources/xrc/menus.xrc:313 +#: ../src/interface/resources/xrc/menus.xrc:516 +#: ../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Създава нова подпапка в текущата и сменя текущата с нея" -#: resources.h:537 +#: ../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Създаване на празен файл в текущата папка" -#: resources.h:518 resources.h:534 resources.h:592 resources.h:615 +#: ../src/interface/resources/xrc/menus.xrc:272 +#: ../src/interface/resources/xrc/menus.xrc:312 +#: ../src/interface/resources/xrc/menus.xrc:515 +#: ../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" -msgstr "Нова п&апка и влизане вътре" +msgstr "Нова п&апка и разлистване" -#: ../../locales/../src/interface/LocalListView.cpp:928 -#: ../../locales/../src/interface/LocalTreeView.cpp:1190 -#: ../../locales/../src/interface/RemoteListView.cpp:1359 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1322 +#: ../src/interface/LocalTreeView.cpp:1181 +#: ../src/interface/RemoteListView.cpp:1327 +#: ../src/interface/LocalListView.cpp:954 +#: ../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Нова &папка" -#: ../../locales/../src/interface/RemoteListView.cpp:2892 +#: ../src/interface/RemoteListView.cpp:2668 msgid "Create empty file" msgstr "Създаване на файл" -#: ../../locales/../src/interface/QueueView.cpp:1524 +#: ../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Създаване на нова папка" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3344 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2052 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." -msgstr "Създаване на нова папка \"%s\"..." +msgstr "Създаване на папка „%s“…" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Критична грешка" -#: ../../locales/../src/engine/ControlSocket.cpp:177 +#: ../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Критична грешка:" -#: ../../locales/../src/engine/ControlSocket.cpp:139 +#: ../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Критична грешка при прехвърляне" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Критична грешка при прехвърляне след прехвърляне на %s за %s" -#: ../../locales/../src/interface/state.cpp:385 +#: ../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" "Synchronized browsing has been disabled." msgstr "" -"Текущата отдалечена папка '%s' не е под корена за синхронизиране (%s).\n" +"Текущата отдалечена папка (%s) не е под корена за синхронизиране (%s).\n" "Синхронизираното разлистване е изключено." -#: ../../locales/../src/interface/statusbar.cpp:387 +#: ../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Текущият режим на прехвърляне е ASCII." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Текущият режим на прехвърляне е автоматичен." -#: ../../locales/../src/interface/statusbar.cpp:392 +#: ../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Текущият режим на прехвърляне е двоичен." -#: resources.h:735 resources.h:860 +#: ../src/interface/resources/xrc/dialogs.xrc:2222 +msgid "Curve:" +msgstr "Крива:" + +#: ../src/interface/resources/xrc/settings.xrc:479 +#: ../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "&Потребителски" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Потребителски набор" -#: resources.h:314 resources.h:315 +#: ../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Потребителски сървър" -#: resources.h:323 +#: ../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "синьо-зелен" + +#: ../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" -msgstr "Тип на &данните" +msgstr "Вид на &данните" -#: resources.h:868 +#: ../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Д&есетичен суфикс по SI (пример 1 KB = 1000 bytes)" -#: resources.h:983 +#: ../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" -msgstr "По по&дразбиране" +msgstr "Стан&дартен" -#: resources.h:539 resources.h:594 resources.h:626 +#: ../src/interface/resources/xrc/menus.xrc:324 +#: ../src/interface/resources/xrc/menus.xrc:520 +#: ../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "Изтрива&не" -#: resources.h:167 +#: ../src/interface/resources/xrc/dialogs.xrc:2946 +msgid "D&irectory comparison" +msgstr "Сравняване на &папки" + +#: ../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Изк&лючване всички" -#: resources.h:835 +#: ../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "Да &не бъдат запазвани пароли" -#: resources.h:898 +#: ../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "При двойно натискане върху &папки:" -#: resources.h:180 resources.h:355 +#: ../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "&Дублиране" -#: ../../locales/../src/engine/server.cpp:34 +#: ../src/engine/server.cpp:53 msgid "DOS-like with virtual paths" msgstr "DOS-подобни виртуални пътища" -#: ../../locales/../src/interface/LocalListView.cpp:1732 -#: ../../locales/../src/interface/RemoteListView.cpp:2425 +#: ../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" -msgstr "Опасен тип файл" +msgstr "Опасен вид файл" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Информация" -#: ../../locales/../src/interface/netconfwizard.cpp:991 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../src/interface/netconfwizard.cpp:996 +#: ../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Сокетът за данни затворен твърде рано." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Дата" -#: resources.h:852 +#: ../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Форматиране на датата" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 +#: ../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" msgstr "Формат дата / час" -#: ../../locales/../src/interface/fileexistsdlg.cpp:67 -#: ../../locales/../src/interface/fileexistsdlg.cpp:71 +#: ../src/interface/fileexistsdlg.cpp:49 msgid "Date/time unknown" msgstr "Неизвестна дата/време" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:117 +#: ../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" msgstr "Трасиране" -#: resources.h:942 +#: ../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Настройки на трасирането" -#: resources.h:974 +#: ../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "&Местна папка:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../src/engine/server.cpp:45 msgid "Default (Autodetect)" -msgstr "По подразбиране (автоматично)" +msgstr "Стандартно (автоматично)" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 +#: ../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." -msgstr "Редакторът по подразбиране неправилно поставен в кавички." +msgstr "Стандартният редактор е неправилно поставен в кавички." -#: resources.h:193 resources.h:215 resources.h:818 +#: ../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" -msgstr "Подразбиращо се действие с файлове" +msgstr "Стандартно действие с файлове" -#: resources.h:976 +#: ../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "О&тдалечена папка:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 +#: ../src/interface/sitemanager_dialog.cpp:1145 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." msgstr "" "Отдалеченият път не може да бъде разпознат. Уверете се, че е валиден " -"абсолютен път и е поддържан от избрания тип сървър." +"абсолютен път и е поддържан от избрания вид сървър." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" -msgstr "Системен език по подразбиране" +msgstr "Стандартен системен език" -#: resources.h:640 +#: ../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" -msgstr "Режим на прехвърляне по подразбиране:" +msgstr "Стандартен режим на прехвърляне:" -#: resources.h:787 +#: ../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" -msgstr "Режим на прехвърляне по подразбиране:" +msgstr "Стандартен режим на прехвърляне:" -#: resources.h:659 resources.h:722 +#: ../src/interface/resources/xrc/netconfwizard.xrc:233 +#: ../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" -msgstr "По подразбиране: http://ip.filezilla-project.org/ip.php" +msgstr "Стандартно: http://ip.filezilla-project.org/ip.php" -#: ../../locales/../src/interface/settings/optionspage_connection.cpp:41 +#: ../src/interface/settings/optionspage_connection.cpp:41 msgid "" "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "" "Изчакването между неуспешните опити за връзка трябва да е между 1 и 999 " "секунди." -#: ../../locales/../src/engine/engineprivate.cpp:615 +#: ../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2861,225 +3187,252 @@ "attempt..." msgstr[0] "" "Забавяне на свързването с %d секунда поради предишни провалени опити за " -"връзка..." +"връзка…" msgstr[1] "" "Забавяне на свързването с %d секунди поради предишни провалени опити за " -"връзка..." +"връзка…" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1219 +#: ../src/interface/sitemanager_dialog.cpp:1297 msgid "Delete Site Manager entry" msgstr "Изтриване" -#: resources.h:595 resources.h:618 +#: ../src/interface/resources/xrc/menus.xrc:521 +#: ../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" -msgstr "Изтриване избраната папка" +msgstr "Изтриване на избраната папка" -#: resources.h:522 resources.h:540 +#: ../src/interface/resources/xrc/menus.xrc:281 +#: ../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" -msgstr "Изтриване избраните папки и файлове" +msgstr "Изтриване на избраните папки и файлове" -#: ../../locales/../src/interface/search.cpp:710 -msgid "Deleting directories" -msgstr "Изтриване на папки" +#: ../src/engine/engineprivate.cpp:392 +#, c-format +msgid "Deleting \"%s\"" +msgstr "Изтриване на „%s“" -#: ../../locales/../src/interface/search.cpp:710 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Изтриване на множество несвързани папки не се поддържа все още." +#: ../src/engine/engineprivate.cpp:395 +#, c-format +msgid "Deleting %u files from \"%s\"" +msgstr "Изтриване на %u файлове от „%s“" -#: resources.h:391 +#: ../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Изтриване на символична връзка" -#: ../../locales/../src/interface/LocalTreeView.cpp:1025 +#: ../src/interface/LocalTreeView.cpp:986 msgid "Desktop" -msgstr "Работен плот" +msgstr "Плот" -#: resources.h:4 resources.h:33 resources.h:138 +#: ../src/interface/resources/xrc/certificate.xrc:42 +#: ../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Подробности" -#: resources.h:151 +#: ../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Подробности за нов ключ:" -#: resources.h:189 +#: ../src/interface/import.cpp:66 ../src/interface/sitemanager_dialog.cpp:793 +msgid "Detected newer version of FileZilla" +msgstr "Налично е ново издание на FileZilla" + +#: ../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "&папки" -#: ../../locales/../src/interface/queue.cpp:1198 +#: ../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Посока" -#: ../../locales/../src/interface/filelistctrl.cpp:283 +#: ../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Папки:" + +#: ../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Папка" -#: resources.h:602 resources.h:889 resources.h:1023 -#: ../../locales/../src/interface/filelistctrl.cpp:471 -#: ../../locales/../src/interface/Mainfrm.cpp:2356 +#: ../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Права за достъп до папки" + +#: ../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../src/interface/resources/xrc/menus.xrc:541 +#: ../src/interface/resources/xrc/settings.xrc:1850 +#: ../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../src/interface/toolbar.cpp:51 ../src/interface/view.cpp:109 +#: ../src/interface/filelistctrl.cpp:477 ../src/interface/Mainfrm.cpp:2306 +#: ../src/interface/Mainfrm.cpp:2323 msgid "Directory comparison" -msgstr "Сравняване папки" +msgstr "Сравняване на папки" -#: ../../locales/../src/interface/listingcomparison.cpp:74 -#: ../../locales/../src/interface/listingcomparison.cpp:82 -#: ../../locales/../src/interface/listingcomparison.cpp:88 +#: ../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Неуспешно сравняване на папки" -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:71 +#: ../src/interface/settings/optionspage_logging.cpp:71 msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "" "Папка съдържаща файл-дневник не съществува или името на файла е невалидно." -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "&Филтри за съдържание на папките…" + +#: ../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Разлистването на папката прекъснато от потребителя" -#: ../../locales/../src/interface/RemoteListView.cpp:2115 +#: ../src/interface/RemoteListView.cpp:2056 msgid "Directory listing failed" msgstr "Неуспешно разлистване папка" -#: resources.h:160 +#: ../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Филтри" -#: ../../locales/../src/engine/ControlSocket.cpp:202 +#: ../src/engine/ControlSocket.cpp:193 +#, c-format +msgid "Directory listing of \"%s\" successful" +msgstr "Успешно разлистване на „%s“" + +#: ../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" -msgstr "Успешно разлистване папка" +msgstr "Успешно разлистване на папка" -#: resources.h:170 +#: ../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Изключ&ване всички" -#: ../../locales/../src/interface/state.cpp:1018 +#: ../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Изключване на синхронизираното разлистване и смяна само на отдалечената " "папка?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." -msgstr "Изключете тази опция, ако не виждате съдържанието на папките си." +msgstr "Махнете отметката ако не виждате съдържанието на папките си." -#: resources.h:1016 +#: ../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Прекъсване връзката със сървър" -#: ../../locales/../src/engine/ControlSocket.cpp:84 -#: ../../locales/../src/engine/ControlSocket.cpp:974 -#: ../../locales/../src/engine/ControlSocket.cpp:1073 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:911 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:913 -#: ../../locales/../src/interface/QueueView.cpp:1061 -#: ../../locales/../src/interface/QueueView.cpp:1105 +#: ../src/engine/http/request.cpp:121 ../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../src/engine/ControlSocket.cpp:52 ../src/engine/ControlSocket.cpp:914 +#: ../src/engine/ControlSocket.cpp:1010 ../src/interface/queue.cpp:352 msgid "Disconnected from server" -msgstr "Връзката със сървъра прекъсната" +msgstr "Връзката със сървъра е прекъсната" -#: ../../locales/../src/engine/ControlSocket.cpp:1108 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:928 +#: ../src/engine/http/httpcontrolsocket.cpp:189 +#: ../src/engine/ControlSocket.cpp:1039 #, c-format msgid "Disconnected from server: %s" msgstr "Прекъсната връзка със сървър: %s" -#: ../../locales/../src/interface/QueueView.cpp:1422 -#: ../../locales/../src/interface/statuslinectrl.cpp:266 +#: ../src/interface/statuslinectrl.cpp:250 ../src/interface/queue.cpp:351 msgid "Disconnecting from previous server" msgstr "Прекъсване връзка с предишен сървър" -#: resources.h:1017 +#: ../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Прекъсва връзката с текущо видимия сървър" -#: resources.h:505 +#: ../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" -msgstr "Показване на \"Относно\"" +msgstr "Показване на Относно" -#: resources.h:907 +#: ../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" -msgstr "&Да не се използва редакторът по подразбиране" +msgstr "&Да не бъде използван стандартният редактор" -#: resources.h:566 -msgid "Do ¬hing" -msgstr "&Нищо" +#: ../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../src/interface/resources/xrc/dialogs.xrc:2087 +msgid "Do the same with &all selected files already being edited" +msgstr "Същото действие за &всички отворени за редактиране файлове" -#: ../../locales/../src/interface/Mainfrm.cpp:1206 -#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../src/interface/Mainfrm.cpp:1233 ../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Наистина ли желаете да затворите FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" -msgstr "Наистина ли желаете да заличите Манипулатор връзки и опашката?" +msgstr "Наистина ли желаете да заличите Управление на връзки и опашката?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" -msgstr "Наистина ли желаете да заличите Манипулатор връзки?" +msgstr "Наистина ли желаете да заличите Управление на връзки?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1221 +#: ../src/interface/sitemanager_dialog.cpp:1299 msgid "Do you really want to delete selected entry?" msgstr "Наистина ли желаете да изтриете този запис?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Наистина ли желаете да заличите опашката?" -#: ../../locales/../src/interface/Mainfrm.cpp:569 +#: ../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" -msgstr "Наистина ли желаете да изпратите \"%s\" към сървъра?" +msgstr "Наистина ли желаете „%s“ да бъде изпратен към сървъра?" + +#: ../src/interface/resources/xrc/dialogs.xrc:2080 +msgid "Do you want to reopen this file?" +msgstr "Наистина ли желаете отново да отворите този файл?" -#: resources.h:404 +#: ../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Документация" -#: resources.h:661 +#: ../src/interface/resources/xrc/netconfwizard.xrc:250 msgid "Don't use external IP address on &local connections." msgstr "&Без използване на външен IP адрес при местни връзки." -#: resources.h:798 +#: ../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" -msgstr "Файлови имена, започващи с точка са ASCII, пример .htaccess" +msgstr "Файлове, започващи с точка са ASCII, пример .htaccess" -#: resources.h:892 +#: ../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Действие при двойно натискане" -#: resources.h:300 +#: ../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "&Изтегляне" -#: resources.h:421 resources.h:774 +#: ../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "при и&зтегляне:" -#: ../../locales/../src/interface/statusbar.cpp:568 +#: ../src/interface/statusbar.cpp:597 #, c-format msgid "Download limit: %s/s" msgstr "Ограничение при изтегляне: %s/с" -#: ../../locales/../src/interface/statusbar.cpp:570 +#: ../src/interface/statusbar.cpp:600 msgid "Download limit: none" msgstr "Ограничение при изтегляне: няма" -#: resources.h:379 ../../locales/../src/interface/search.cpp:510 -#: ../../locales/../src/interface/search.cpp:516 +#: ../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../src/interface/search.cpp:904 ../src/interface/search.cpp:909 msgid "Download search results" msgstr "Изтегляне на резултатите" -#: resources.h:587 +#: ../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Изтегляне избраната папка" -#: resources.h:526 +#: ../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Изтегляне избраните файлове и папки" -#: ../../locales/../src/interface/Mainfrm.cpp:1030 +#: ../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3088,32 +3441,23 @@ "Скорост на теглене: %s/s\n" "Скорост на качване: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1133 +#: ../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Изтегляне" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:351 +#: ../src/engine/http/httpcontrolsocket.cpp:148 #, c-format msgid "Downloading %s" msgstr "Изтегляне на %s" -#: ../../locales/../src/interface/search.cpp:619 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Изтегляне на множество несвързани папки не се поддържа все още." - -#: ../../locales/../src/interface/search.cpp:619 -msgid "Downloading search results" -msgstr "Изтегляне на резултатите" - -#: resources.h:1034 +#: ../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." -msgstr "Изтегляне на актуализацията..." +msgstr "Изтегляне на обновяването…" -#: ../../locales/../src/interface/LocalListView.cpp:108 -#: ../../locales/../src/interface/LocalTreeView.cpp:109 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:103 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../src/interface/LocalTreeView.cpp:121 ../src/interface/QueueView.cpp:88 +#: ../src/interface/RemoteListView.cpp:112 +#: ../src/interface/LocalListView.cpp:114 +#: ../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3121,351 +3465,380 @@ "Плъзгане и пускане между различни инстанции на FileZilla не е реализирано " "все още." -#: ../../locales/../src/interface/LocalListView.cpp:114 -#: ../../locales/../src/interface/LocalTreeView.cpp:115 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:109 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../src/interface/LocalTreeView.cpp:126 ../src/interface/QueueView.cpp:102 +#: ../src/interface/RemoteListView.cpp:117 +#: ../src/interface/LocalListView.cpp:119 +#: ../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Плъзгане и пускане между различни сървъри не е реализирано все още." -#: resources.h:960 +#: ../src/interface/resources/xrc/sitemanager.xrc:65 msgid "Dupl&icate" msgstr "&Дублиране" -#: resources.h:166 +#: ../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "&Включване всички" -#: resources.h:510 resources.h:529 +#: ../src/interface/resources/xrc/menus.xrc:254 +#: ../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "&Разлистване на папка" -#: resources.h:102 +#: ../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Изпъ&лнение" -#: resources.h:450 +#: ../src/interface/resources/xrc/menus.xrc:39 msgid "E&xit" msgstr "&Изход" -#: ../../locales/../src/interface/verifycertdialog.cpp:192 +#: ../src/interface/resources/xrc/menus.xrc:426 +#: ../src/interface/resources/xrc/menus.xrc:472 +#: ../src/interface/resources/xrc/menus.xrc:495 +msgid "E&xport..." +msgstr "&Експорт…" + +#: ../src/interface/verifycertdialog.cpp:258 msgid "E-Mail:" msgstr "Ел. поща:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:693 +#: ../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Всеки филтър изисква поне едно условие." -#: resources.h:192 +#: ../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" -msgstr "Редакция на филтри" +msgstr "Редактиране на филтри" -#: resources.h:515 +#: ../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Редактиране на файла с конфигурирания редактор и качване промените на " "сървъра." -#: ../../locales/../src/interface/LocalListView.cpp:1643 -#: ../../locales/../src/interface/LocalListView.cpp:1654 +#: ../src/interface/search.cpp:1172 +msgid "Editing directories is not supported" +msgstr "Редактирането на папки не се поддържа" + +#: ../src/interface/LocalListView.cpp:1711 +#: ../src/interface/LocalListView.cpp:1720 msgid "Editing failed" -msgstr "Неуспешна редакция" +msgstr "Неуспешно редактиране" + +#: ../src/interface/search.cpp:1172 +msgid "Editing search results" +msgstr "Редактиране на резултати от търсене" -#: resources.h:849 +#: ../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2266 +#: ../src/interface/QueueView.cpp:1873 msgid "Empty command" msgstr "Празна команда" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 +#: ../src/interface/settings/optionspage_edit_associations.cpp:59 msgid "Empty command." msgstr "Празна команда." -#: ../../locales/../src/interface/RemoteListView.cpp:2117 +#: ../src/interface/RemoteListView.cpp:2058 msgid "Empty directory listing" msgstr "Празна папка" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "Празна папка." -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 +#: ../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Празно файлово разширение" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../src/interface/filteredit.cpp:207 ../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Не са разрешени празни имена на филтри." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../src/interface/filteredit.cpp:207 ../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Празно име" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 +#: ../src/interface/settings/optionspage_edit.cpp:84 msgid "Empty quoted string." msgstr "Празен низ в кавичките." -#: resources.h:169 +#: ../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Включв&ане всички" -#: resources.h:783 +#: ../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "&Филтриране на невалидни знаци" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" -msgstr "Криптиран" +msgstr "Шифрован" -#: resources.h:282 +#: ../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" -msgstr "Криптиране" +msgstr "Шифроване" + +#: ../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Ключ за шифроване:" -#: resources.h:274 +#: ../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Ключ за шифроване:" + +#: ../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" -msgstr "Информация за криптирането" +msgstr "Информация за шифроването" -#: ../../locales/../src/interface/filelistctrl.cpp:473 +#: ../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Прекратяване на сравняването и промяна на подредбата?" -#: resources.h:491 +#: ../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Прекратяване на сравняването и отваряне на бързото търсене?" + +#: ../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." -msgstr "&Ръчна команда..." +msgstr "&Ръчна команда…" -#: resources.h:425 -#, no-c-format +#: ../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "0 - без ограничение" -#: ../../locales/../src/interface/QueueView.cpp:2255 +#: ../src/interface/QueueView.cpp:1867 msgid "Enter command" msgstr "Въвеждане команда" -#: ../../locales/../src/interface/Mainfrm.cpp:550 +#: ../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Въвеждане команда" -#: resources.h:899 +#: ../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Разлистване на папка" -#: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../src/interface/filteredit.cpp:136 ../src/interface/filteredit.cpp:195 +#: ../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Име на филтър" -#: ../../locales/../src/interface/filter.cpp:343 +#: ../src/interface/resources/xrc/dialogs.xrc:397 +#: ../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Въвеждане на главна парола" + +#: ../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Име набор филтри" -#: ../../locales/../src/interface/filter.cpp:405 +#: ../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Въвеждане на ново име за набор филтри" -#: resources.h:80 +#: ../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" -msgstr "Въведете парола" +msgstr "Въвеждане на парола" -#: resources.h:511 resources.h:530 +#: ../src/interface/resources/xrc/menus.xrc:255 +#: ../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Разлистване на избраната папка" -#: resources.h:681 +#: ../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" -"- ftp:// for normal FTP\n" +"- ftp:// for normal FTP with optional encryption\n" "- sftp:// for SSH file transfer protocol\n" "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Въведете адреса на сървъра.\n" -"За да укажете протокола, сложете пред името на хоста идентификатор на " -"протокола. Ако не е указан протокол, ще бъде използван протокол по " -"подразбиране (ftp://).\n" -"Тук можете да въведете и пълен URL във формата протокол://потребител:" -"парола@хост:порт и стойностите, въведени в останалите полета, ще бъдат " -"презаписани.\n" +"Въведете адреса на сървъра. За да укажете протокола, сложете идентификатора " +"на протокола пред името на хоста. Ако няма указан протокол, ще бъде " +"използван стандартният протокол (ftp://). Тук можете да въведете и пълен URL " +"във формата протокол://потребител:парола@хост:порт и стойностите, въведени в " +"останалите полета, ще бъдат презаписани.\n" "\n" -"Поддържани протоколи:\n" -"- ftp:// за обикновен FTP\n" +"Поддържаните протоколи са:\n" +"- ftp:// за обикновен FTP с шифроване по избор\n" "- sftp:// за пренос на файлове по SSH\n" "- ftps:// FTP през скрит TLS\n" "- ftpes:// FTP през явен TLS" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279 +#: ../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" -"Въведете паролата за файл \"%s\".\n" -"Моля, забележете, че конвертирания файл няма да бъде защитен с парола." +"Въведете паролата за файла „%s“.\n" +"Преобразуваният файл ще бъде защитен със същата парола." -#: resources.h:685 +#: ../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Въведете порта, на който слуша сървърът.\n" -"По подразбиране за FTP това е 21, а за SFTP - 22." +"Въведете порта, на който слуша сървърът. Стандартен за FTP е 21, а за SFTP - " +"22." -#: ../../locales/../src/interface/loginmanager.cpp:63 +#: ../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Въведете потребителско име" + +#: ../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Въведете потребителско име и парола" -#: ../../locales/../src/interface/export.cpp:26 +#: ../src/interface/settings/optionspage_interface.cpp:121 +#: ../src/interface/asksavepassworddialog.cpp:53 +msgid "Error" +msgstr "Грешка" + +#: ../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Неуспешен експорт" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:85 +#: ../src/interface/import.cpp:29 ../src/interface/import.cpp:107 msgid "Error importing" msgstr "Неуспешен импорт" -#: ../../locales/../src/interface/QueueView.cpp:2048 +#: ../src/interface/QueueView.cpp:1657 msgid "Error loading queue" msgstr "Грешка при зареждане на опашката" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:171 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:723 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:762 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:809 -#: ../../locales/../src/interface/filter.cpp:210 -#: ../../locales/../src/interface/filter.cpp:1019 -#: ../../locales/../src/interface/import.cpp:96 -#: ../../locales/../src/interface/import.cpp:282 -#: ../../locales/../src/interface/Options.cpp:220 -#: ../../locales/../src/interface/QueueView.cpp:1964 -#: ../../locales/../src/interface/search.cpp:785 -#: ../../locales/../src/interface/search.cpp:804 -#: ../../locales/../src/interface/sitemanager.cpp:241 -#: ../../locales/../src/interface/sitemanager.cpp:450 -#: ../../locales/../src/interface/sitemanager.cpp:549 -#: ../../locales/../src/interface/sitemanager.cpp:608 -#: ../../locales/../src/interface/sitemanager.cpp:719 -#: ../../locales/../src/interface/sitemanager.cpp:801 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:732 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:785 -#: ../../locales/../src/interface/wrapengine.cpp:967 +#: ../src/interface/import.cpp:118 ../src/interface/import.cpp:309 +#: ../src/interface/sitemanager.cpp:91 ../src/interface/sitemanager.cpp:525 +#: ../src/interface/sitemanager.cpp:585 ../src/interface/sitemanager.cpp:694 +#: ../src/interface/sitemanager.cpp:782 ../src/interface/sitemanager.cpp:884 +#: ../src/interface/bookmarks_dialog.cpp:174 +#: ../src/interface/bookmarks_dialog.cpp:296 +#: ../src/interface/bookmarks_dialog.cpp:748 +#: ../src/interface/bookmarks_dialog.cpp:788 +#: ../src/interface/bookmarks_dialog.cpp:841 +#: ../src/interface/QueueView.cpp:1561 ../src/interface/wrapengine.cpp:935 +#: ../src/interface/filter.cpp:913 ../src/interface/filter.cpp:1005 +#: ../src/interface/search.cpp:1304 ../src/interface/search.cpp:1323 +#: ../src/interface/Options.cpp:246 ../src/interface/sitemanager_dialog.cpp:786 +#: ../src/interface/sitemanager_dialog.cpp:849 +#: ../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../src/interface/osx_sandbox_userdirs.cpp:136 msgid "Error loading xml file" msgstr "Грешка при зареждане на XML файл" -#: ../../locales/../src/interface/QueueView.cpp:1953 +#: ../src/interface/QueueView.cpp:1550 msgid "Error saving queue" msgstr "Грешка при запазване на опашката" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../src/interface/fzputtygen_interface.cpp:177 +#: ../src/interface/fzputtygen_interface.cpp:192 +#: ../src/interface/storj_key_interface.cpp:62 +#: ../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Неуспешно стартиране на програмата" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:325 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:843 -#: ../../locales/../src/interface/QueueView.cpp:1982 -#: ../../locales/../src/interface/sitemanager.cpp:661 -#: ../../locales/../src/interface/sitemanager.cpp:779 -#: ../../locales/../src/interface/sitemanager.cpp:833 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:806 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169 -#: ../../locales/../src/interface/xmlfunctions.cpp:88 +#: ../src/interface/sitemanager.cpp:634 ../src/interface/sitemanager.cpp:759 +#: ../src/interface/sitemanager.cpp:816 +#: ../src/interface/bookmarks_dialog.cpp:332 +#: ../src/interface/bookmarks_dialog.cpp:883 +#: ../src/interface/QueueView.cpp:1581 ../src/interface/xmlfunctions.cpp:151 +#: ../src/interface/sitemanager_dialog.cpp:870 +#: ../src/interface/sitemanager_dialog.cpp:2481 msgid "Error writing xml file" msgstr "Грешка при запис на XML файл" -#: ../../locales/../src/engine/logging.cpp:123 -#: ../../locales/../src/interface/StatusView.cpp:284 -#: ../../locales/../src/interface/StatusView.cpp:338 +#: ../src/engine/logging.cpp:113 ../src/interface/StatusView.cpp:284 +#: ../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "Грешка:" -#: resources.h:918 +#: ../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" -msgstr "Пример: png \"c:\\program files\\viewer\\viewer.exe\" -open" +msgstr "Пример: png „c:\\program files\\viewer\\viewer.exe“ -open" -#: resources.h:871 +#: ../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Примери" -#: resources.h:106 +#: ../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Изпъл&нение" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" -"Изпълнимият файл няма информация за версия, проверката за актуализация е " +"Изпълнимият файл няма информация за изданието, проверката за обновяване е " "невъзможна." -#: resources.h:825 +#: ../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Explorer" -#: resources.h:232 +#: ../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "&Филтри" + +#: ../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Оп&ашка" -#: resources.h:231 +#: ../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "&Настройки" -#: resources.h:228 +#: ../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Експорт" -#: resources.h:181 +#: ../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "&Име на филтър:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 +#: ../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:498 +#: ../src/interface/sitemanager_dialog.cpp:516 msgid "FTP - File Transfer Protocol" msgstr "FTP - Протокол за пренос на файлове" -#: ../../locales/../src/engine/server.cpp:15 +#: ../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" -msgstr "FTP - Протокол за пренос на файлове с криптиране по желание" +msgstr "FTP - Протокол за пренос на файлове с шифроване по желание" -#: ../../locales/../src/engine/server.cpp:21 +#: ../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" -msgstr "FTP - Несигурен протокол за пренос на файлове" +msgstr "FTP - Незащитен протокол за пренос на файлове" -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Механизмът за FTP не е инициализиран, свързването е невъзможно" -#: resources.h:709 +#: ../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "FTP Keep-alive" -#: resources.h:729 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 +#: ../src/interface/resources/xrc/settings.xrc:446 +#: ../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP Прокси" -#: ../../locales/../src/interface/cmdline.cpp:21 +#: ../src/interface/cmdline.cpp:21 msgid "FTP URL" msgstr "FTP URL" -#: resources.h:637 +#: ../src/interface/resources/xrc/netconfwizard.xrc:44 msgid "" "FTP uses secondary connections for data transfers. These additional " "connections can be established in two ways." @@ -3473,471 +3846,472 @@ "Протоколът FTP използва вторични връзки за прехвърляне на данни. Тези " "допълнителни връзки могат да се установят по два начина." -#: ../../locales/../src/engine/server.cpp:20 -msgid "FTPES - FTP over explicit TLS/SSL" -msgstr "FTPES - FTP през явен TLS/SSL" - -#: ../../locales/../src/engine/server.cpp:19 -msgid "FTPS - FTP over implicit TLS/SSL" -msgstr "FTPS - FTP през скрит TLS/SSL" - -#: ../../locales/../src/interface/LocalListView.cpp:549 -#: ../../locales/../src/interface/LocalListView.cpp:629 -#: ../../locales/../src/interface/LocalListView.cpp:917 -#: ../../locales/../src/interface/LocalListView.cpp:1937 -#: ../../locales/../src/interface/LocalTreeView.cpp:875 -#: ../../locales/../src/interface/LocalTreeView.cpp:1166 -#: ../../locales/../src/interface/viewheader.cpp:538 +#: ../src/engine/server.cpp:25 +msgid "FTPES - FTP over explicit TLS" +msgstr "FTPES - FTP през явен TLS" + +#: ../src/engine/server.cpp:24 +msgid "FTPS - FTP over implicit TLS" +msgstr "FTPS - FTP през скрит TLS" + +#: ../src/interface/viewheader.cpp:499 ../src/interface/LocalTreeView.cpp:871 +#: ../src/interface/LocalTreeView.cpp:1154 +#: ../src/interface/LocalListView.cpp:545 +#: ../src/interface/LocalListView.cpp:618 +#: ../src/interface/LocalListView.cpp:941 +#: ../src/interface/LocalListView.cpp:1919 msgid "Failed to change directory" msgstr "Неуспешна смяна папка" -#: ../../locales/../src/interface/FileZilla.cpp:216 -#: ../../locales/../src/interface/FileZilla.cpp:229 -#: ../../locales/../src/interface/FileZilla.cpp:231 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../src/interface/FileZilla.cpp:150 ../src/interface/FileZilla.cpp:165 +#: ../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Неуспешна смяна език" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Невъзможно преобразуване на командата към 8-битов знаков набор" + +#: ../src/interface/sitemanager_dialog.cpp:2261 msgid "Failed to copy or move sites" msgstr "Неуспешно копиране или местене" -#: ../../locales/../src/interface/xmlfunctions.cpp:423 +#: ../src/interface/xmlfunctions.cpp:330 msgid "Failed to create backup copy of xml file" msgstr "Неуспешно създаване на резервно копие на XML файл" -#: ../../locales/../src/interface/netconfwizard.cpp:797 -msgid "Failed to create listen socket, aborting" -msgstr "Неуспешно създаване на сокет за слушане, прекратяване" +#: ../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Неуспешно отваряне на сокет за слушане на порт %d, прекратяване." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4275 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4279 +#: ../src/engine/ftp/rawtransfer.cpp:217 ../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Неуспешно създаване сокет за слушане в активен режим" -#: ../../locales/../src/interface/LocalTreeView.cpp:630 +#: ../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Грешка при разшифроване на паролата на сървъра." + +#: ../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" -msgstr "Неуспешно търсене пътя до \"Моите документи\"" +msgstr "Неуспешно търсене на пътя до „Моите документи“" -#: ../../locales/../src/interface/LocalTreeView.cpp:616 +#: ../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" -msgstr "Неуспешно търсене пътя до роботния плот" +msgstr "Неуспешно търсене на пътя до работния плот" -#: ../../locales/../src/interface/netconfwizard.cpp:956 +#: ../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Неуспешно получаване на адреса за контролна връзка, връзката прекратена." -#: ../../locales/../src/interface/netconfwizard.cpp:964 +#: ../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Неуспешно получаване на адреса за връзката за данни, връзката прекратена." -#: ../../locales/../src/interface/context_control.cpp:85 +#: ../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Неуспешна инициализация на FTP машината" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:400 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:785 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:306 +#: ../src/engine/http/httpcontrolsocket.cpp:120 ../src/engine/ftp/logon.cpp:257 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:193 msgid "Failed to initialize TLS." msgstr "Неуспешна инициализация на TLS." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:147 +#: ../src/interface/FileZilla.cpp:97 +msgid "Failed to initialize networking" +msgstr "Неуспешна инициализация на мрежовата свързаност" + +#: ../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Неуспешно заредени панели. Невалидни ресурсни файлове?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299 +#: ../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Неуспешно зареждане частен ключ: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2647 +#: ../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" -msgstr "Неуспешно отваряне \"%s\" за добавяне/запис" +msgstr "Неуспешно отваряне „%s“ за добавяне/запис" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2709 +#: ../src/engine/ftp/filetransfer.cpp:138 #, c-format msgid "Failed to open \"%s\" for reading" -msgstr "Неуспешно отваряне \"%s\" за четене" +msgstr "Неуспешно отваряне „%s“ за четене" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2688 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1046 +#: ../src/engine/http/filetransfer.cpp:91 +#: ../src/engine/ftp/filetransfer.cpp:107 #, c-format msgid "Failed to open \"%s\" for writing" -msgstr "Неуспешно отваряне \"%s\" за запис" +msgstr "Неуспешно отваряне „%s“ за запис" -#: ../../locales/../src/engine/ControlSocket.cpp:439 +#: ../src/engine/ControlSocket.cpp:345 msgid "Failed to parse returned path." msgstr "Неуспешно разпознат върнат път." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:314 -msgid "Failed to parse trusted root cert." -msgstr "Неуспешно разпознат доверен коренов сертификат." - -#: ../../locales/../src/interface/netconfwizard.cpp:1020 +#: ../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Неуспешно получаване данни" -#: ../../locales/../src/engine/ControlSocket.cpp:200 +#: ../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" -msgstr "Неуспешно разлистване папка" +msgstr "Неуспешно разлистване на папка" -#: ../../locales/../src/interface/netconfwizard.cpp:719 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Неуспешно получаване външния IP адрес, прекратяване" +#: ../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Неуспешно получаване външния IP адрес, прекратяване." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3975 -msgid "Failed to retrieve external ip address, using local address" +#: ../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "Неуспешно получаване външния IP адрес, използва се вътрешния адрес" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3997 -msgid "Failed to retrieve local ip address." -msgstr "Неуспешно получаване вътрешния IP адрес." +#: ../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Неуспешно получаване вътрешния IP адрес, прекратяване." -#: ../../locales/../src/interface/netconfwizard.cpp:688 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Неуспешно получаване вътрешния IP адрес. Прекратяване" +#: ../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Неуспешно получаване вътрешния IP адрес." -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Неуспешно получаване външния IP адрес." -#: ../../locales/../src/interface/netconfwizard.cpp:307 +#: ../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Неуспешно изпращане команда." -#: ../../locales/../src/interface/FileZilla.cpp:229 +#: ../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" -"Неуспешно установяване езика на %s (%s), използване системния език по " -"подразбиране" +"Неуспешно задаване езика на %s (%s), използване на стандартния системен език" -#: ../../locales/../src/interface/FileZilla.cpp:209 +#: ../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" -"Неуспешно установяване езика на %s (%s), използване системния език по " -"подразбиране%s (%s)." +"Неуспешно задаване езика на %s (%s), използване на стандартния системен език " +"(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:197 +#: ../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" -"Неуспешно установяване езика на %s (%s), използване системния език по " -"подразбиране." +"Неуспешно задаване езика на %s (%s), използване стандартния системен език." -#: ../../locales/../src/interface/FileZilla.cpp:231 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" -"Неуспешно установяване езика на %s, използване системния език по подразбиране" +"Неуспешно установяване езика на %s, използване стандартния системен език" -#: ../../locales/../src/interface/FileZilla.cpp:205 +#: ../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" -"Неуспешно установяване езика на %s, използване системния език по " -"подразбиране (%s, %s)." +"Неуспешно задаване езика на %s, използване стандартния системен език (%s, " +"%s)." -#: ../../locales/../src/interface/FileZilla.cpp:194 +#: ../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" -"Неуспешно установяване езика на %s, използване системния език по " -"подразбиране." +"Неуспешно установяване езика на %s, използване стандартния системен език." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Неуспешна проверка настройки" -#: ../../locales/../src/engine/tlssocket.cpp:1069 +#: ../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Неуспешна проверка на партньорски сертификат" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:551 +#: ../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Неуспешен запис във файл %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:435 +#: ../src/interface/xmlfunctions.cpp:373 msgid "Failed to write xml file" msgstr "Неуспешен запис на XML файл" -#: ../../locales/../src/interface/queueview_failed.cpp:16 +#: ../src/interface/queueview_failed.cpp:16 msgid "Failed transfers" msgstr "Неуспешни прехвърляния" -#: resources.h:652 +#: ../src/interface/resources/xrc/netconfwizard.xrc:159 msgid "Fall back to active mode" msgstr "&Отстъпване до активен режим" -#: resources.h:307 +#: ../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Фа&йл:" -#: resources.h:188 +#: ../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "&файлове" -#: ../../locales/../src/interface/filelistctrl.cpp:282 +#: ../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Файл" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 +#: ../src/interface/settings/settingsdialog.cpp:100 msgid "File Types" -msgstr "Файлови типове" +msgstr "Видове файлове" -#: ../../locales/../src/engine/socket.cpp:1216 -#, fuzzy +#: ../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" -msgstr "Неуспешен запис в сокет: %s" +msgstr "Файловият дескриптор не е сокет" -#: ../../locales/../src/interface/import.cpp:85 +#: ../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Файлът не съдържа данни, които да могат да се импортират." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 +#: ../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" -msgstr "Редакция файлове" +msgstr "Редактиране файлове" -#: ../../locales/../src/interface/RemoteListView.cpp:1670 +#: ../src/interface/RemoteListView.cpp:1639 msgid "File exists" msgstr "Файлът съществува" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 +#: ../src/interface/settings/settingsdialog.cpp:101 msgid "File exists action" msgstr "Действия с файлове" -#: resources.h:243 +#: ../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Файлът е променян" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 +#: ../src/interface/settings/settingsdialog.cpp:106 msgid "File lists" msgstr "Списъци" -#: ../../locales/../src/interface/edithandler.cpp:1610 -#: ../../locales/../src/interface/FileZilla.cpp:684 -#: ../../locales/../src/interface/FileZilla.cpp:778 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 +#: ../src/engine/storj/resolve.cpp:113 ../src/engine/storj/resolve.cpp:184 +#: ../src/interface/settings/optionspage_edit.cpp:124 +#: ../src/interface/edithandler.cpp:1602 ../src/interface/FileZilla.cpp:640 +#: ../src/interface/FileZilla.cpp:730 msgid "File not found" msgstr "Файлът не е намерен" -#: resources.h:1027 +#: ../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../src/interface/toolbar.cpp:53 ../src/interface/search.cpp:723 +#: ../src/interface/search.cpp:728 msgid "File search" msgstr "Търсене на файл" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Прехвърлянето прекратено от потребителя" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Прехвърлянето прекратено от потребителя след прехвърляне на %s за %s" -#: ../../locales/../src/engine/ControlSocket.cpp:141 +#: ../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Прехвърлянето на файл неуспешно" -#: ../../locales/../src/engine/ControlSocket.cpp:124 +#: ../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Прехвърлянето неуспешно след прехвърляне на %s за %s" -#: ../../locales/../src/engine/ControlSocket.cpp:136 +#: ../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Прехвърлянето на файл прескочено" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Успешно прехвърляне на файл" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Успешно прехвърляне на файл, прехвърлени %s за %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1205 +#: ../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Все още се прехвърлят файлове." -#: resources.h:325 +#: ../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." -msgstr "Файлът ще бъде прехвърлен като ASCII тип." +msgstr "Файлът ще бъде прехвърлен като вид ASCII." -#: resources.h:326 +#: ../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." -msgstr "Файлът ще бъде прехвърлен като двоичен тип." +msgstr "Файлът ще бъде прехвърлен като двоичен." -#: ../../locales/../src/interface/FileZilla.cpp:500 -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../src/interface/quickconnectbar.cpp:99 ../src/interface/FileZilla.cpp:452 msgid "FileZilla Error" msgstr "Грешка на FileZilla" -#: resources.h:674 +#: ../src/interface/resources/xrc/netconfwizard.xrc:353 msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." msgstr "Сега FileZilla ще провери настройките за грешки." -#: resources.h:415 +#: ../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." -msgstr "FileZilla е вече свързана към сървър. Установяване на новата връзка в:" +msgstr "FileZilla е вече свързана към сървър." -#: ../../locales/../src/interface/Mainfrm.cpp:1536 +#: ../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "За да влезе в сила промяната на езика е нужен е рестарт на FileZilla." -#: resources.h:931 +#: ../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" -msgstr "FileZilla актуализация" +msgstr "Обновяване на FileZilla" -#: resources.h:466 +#: ../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" -msgstr "С&писъчен статус" +msgstr "Лен&та на състоянието" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:282 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:79 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../src/interface/filter_conditions_dialog.cpp:101 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../src/interface/edithandler.cpp:1136 +#: ../src/interface/RemoteListView.cpp:395 +#: ../src/interface/LocalListView.cpp:287 ../src/interface/search.cpp:154 msgid "Filename" msgstr "Име" -#: resources.h:459 -msgid "Filename &filters..." -msgstr "&Филтри..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3141 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2315 +#: ../src/engine/ftp/delete.cpp:31 ../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Файлово име не може да бъде съставено от папката %s и файловото име %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1656 +#: ../src/interface/RemoteListView.cpp:1627 msgid "Filename invalid" msgstr "Невалидно име на файл" -#: ../../locales/../src/interface/RemoteListView.cpp:2917 -msgid "" -"Filename may not contain any of the following characters: / \\ : * ? \" < > |" -msgstr "" -"Файловите имена не могат да съдържат следните знаци: / \\ : * ? \" < > |" - -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../src/interface/asyncrequestqueue.cpp:313 msgid "Filename unchanged" msgstr "Непроменено име на файл" -#: resources.h:245 resources.h:935 +#: ../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Файлово име:" -#: ../../locales/../src/interface/file_utils.cpp:315 +#: ../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" -msgstr "Файловите имена не могат да съдържат следните знаци: / * ? < > |" +msgstr "Файловите имена не могат да съдържат знаците: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" -msgstr "" -"Файловите имена не могат да съдържат следните знаци: / \\ : * ? \" < > |" +msgstr "Файловите имена не могат да съдържат знаците: / \\ : * ? \" < > |" -#: resources.h:273 +#: ../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Отворени за редакция файлове" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:283 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:81 +#: ../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Файловете удовлетворяващи филтрите са премахнати от списъка." + +#: ../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Файловете не са намерени" + +#: ../src/interface/filter_conditions_dialog.cpp:105 +#: ../src/interface/RemoteListView.cpp:396 +#: ../src/interface/LocalListView.cpp:288 ../src/interface/search.cpp:156 msgid "Filesize" msgstr "Дължина" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 +#: ../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "Формат дължина" -#: ../../locales/../src/interface/LocalListView.cpp:284 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:82 +#: ../src/interface/RemoteListView.cpp:397 +#: ../src/interface/LocalListView.cpp:289 ../src/interface/search.cpp:157 msgid "Filetype" -msgstr "Тип" +msgstr "Вид" -#: resources.h:919 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:110 +#: ../src/interface/resources/xrc/settings.xrc:2105 +#: ../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Файлови асоциации" -#: resources.h:187 +#: ../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Горните правила се прилагат към:" -#: resources.h:782 +#: ../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Невалидни знаци в имена на файлове" -#: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:358 +#: ../src/interface/filteredit.cpp:149 ../src/interface/filteredit.cpp:216 +#: ../src/interface/filteredit.cpp:255 ../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Вече съществува филтър с това име" -#: resources.h:183 +#: ../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" -msgstr "Филтриране елементи, съответстващи на всички критерии" +msgstr "Филтрира елементите, отговарящи на всички критерии" -#: resources.h:184 +#: ../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" -msgstr "" -"Филтриране елементи, съответстващи на който и да е от следните критерии" +msgstr "Филтрира елементите, отговарящи на който и да е от критериите" -#: resources.h:185 +#: ../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" -msgstr "" -"Филтриране елементи, не съответстващи на нито един от следните критерии" +msgstr "Филтрира елементите, отговарящи на нито един от критериите" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Филтрира елементите, отговарящи на не всички критерии" + +#: ../src/interface/filter.cpp:261 ../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Съществуващ набор филтри" -#: resources.h:1020 +#: ../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Филтриране съдържанието на папка" -#: ../../locales/../src/interface/filteredit.cpp:340 -#: ../../locales/../src/interface/filteredit.cpp:349 -#: ../../locales/../src/interface/filteredit.cpp:358 +#: ../src/interface/filteredit.cpp:336 ../src/interface/filteredit.cpp:344 +#: ../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Неуспешна проверка валидност на филтър" -#: resources.h:10 resources.h:39 -msgid "Fingerprint (MD5):" -msgstr "Отпечатък (MD5):" +#: ../src/interface/resources/xrc/dialogs.xrc:3338 +msgid "Find &files" +msgstr "Търсене на &файлове" + +#: ../src/interface/resources/xrc/dialogs.xrc:3343 +msgid "Find d&irectories" +msgstr "Търсене на &папки" -#: resources.h:11 resources.h:40 +#: ../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" msgstr "Отпечатък (SHA-1):" -#: resources.h:141 resources.h:154 -msgid "Fingerprint:" -msgstr "Отпечатък:" +#: ../src/interface/resources/xrc/certificate.xrc:89 +msgid "Fingerprint (SHA-256):" +msgstr "Отпечатък (SHA-256):" + +#: ../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Отпечатъци:" -#: ../../locales/../src/interface/netconfwizard.cpp:42 +#: ../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Съветник настройки мрежа" -#: resources.h:692 +#: ../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -3945,162 +4319,209 @@ "За подробна информация относно тези настройки, моля, стартирайте Съветник " "настройки мрежа." -#: resources.h:669 +#: ../src/interface/resources/xrc/netconfwizard.xrc:313 msgid "For reliability you should specify a range of at least 10 ports." msgstr "" "За по-голяма надеждност трябва да укажете обхват от най-малко 10 порта." -#: ../../locales/../src/interface/Options.cpp:219 +#: ../src/interface/Options.cpp:245 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." msgstr "" -"За тази сесия ще бъдат използвани настройките по подразбиране. Промени в " +"За тази сесия ще бъдат използвани стандартните настройки. Промени в " "настройките няма да бъдат запазвани." -#: resources.h:992 +#: ../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "&Налагане UTF-8" -#: resources.h:493 +#: ../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "П&оказване скрити файлове" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Показване скрити файлове" -#: resources.h:736 +#: ../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Легенда:" -#: resources.h:917 +#: ../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Формат: разширението последвано от поставена в кавички команда и аргументи." -#: ../../locales/../src/interface/updater.cpp:634 -#, fuzzy, c-format +#. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n +#: ../src/interface/updater.cpp:702 +#, c-format msgid "Found new %s %s\n" -msgstr "Не е намерена VSS база данни!" +msgstr "Намерени нови %s %s\n" -#: resources.h:407 +#: ../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Неуспешно изпълняване на функцията „%s“" + +#: ../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Още документация" -#: resources.h:961 +#: ../src/interface/resources/xrc/sitemanager.xrc:86 msgid "General" msgstr "Общи" -#: ../../locales/../src/engine/proxy.cpp:524 +#: ../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Грешка от общ тип на SOCKS сървъра" -#: resources.h:754 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 +#: ../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Генериране…" + +#: ../src/interface/resources/xrc/settings.xrc:707 +#: ../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Нормално прокси" -#: resources.h:658 +#: ../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" msgstr "&Получаване на външния IP адрес от URL:" -#: resources.h:408 +#: ../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Получаване помощ" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../src/interface/filter.cpp:261 ../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Вече съществува набор филтри с това име. Искате ли да бъде презаписан?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:256 +#: ../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" -msgstr "Глобални отметки" +msgstr "Общи отметки" + +#: ../src/engine/tlssocket_impl.cpp:315 +#, c-format +msgid "GnuTLS error %d" +msgstr "Грешка в GnuTLS %d" + +#: ../src/engine/tlssocket_impl.cpp:318 +#, c-format +msgid "GnuTLS error %d in %s" +msgstr "GnuTLS грешка %d в %s" + +#: ../src/engine/tlssocket_impl.cpp:310 +#, c-format +msgid "GnuTLS error %d in %s: %s" +msgstr "GnuTLS грешка %d в %s: %s" -#: resources.h:127 +#: ../src/engine/tlssocket_impl.cpp:307 +#, c-format +msgid "GnuTLS error %d: %s" +msgstr "GnuTLS грешка %d: %s" + +#: ../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: resources.h:99 +#: ../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "зелен" + +#: ../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Права за групата" -#: resources.h:553 +#: ../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "&Висок" -#: ../../locales/../src/engine/server.cpp:18 +#: ../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP върху TLS" -#: resources.h:278 +#: ../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Скрит" -#: resources.h:780 ../../locales/../src/interface/queue.cpp:897 -#: ../../locales/../src/interface/queue.cpp:984 +#: ../src/interface/resources/xrc/settings.xrc:964 +#: ../src/interface/queue.cpp:936 ../src/interface/queue.cpp:998 msgid "High" msgstr "Висока" -#: ../../locales/../src/interface/queue.cpp:899 -#: ../../locales/../src/interface/queue.cpp:986 +#: ../src/interface/queue.cpp:938 ../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Най-висок" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Най-високият наличен порт трябва да е число от 1024 до 65535." -#: resources.h:171 +#: ../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" -"Задържане на \"Shift\" за превключване на състоянието на филтъра от двете " -"страни едновременно." +"За да превключите филтър и от двете страни едновременно задръжте натиснат " +"клавиша „Shift“." -#: resources.h:118 +#: ../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Официална страница:" -#: resources.h:280 -msgid "Host key fingerprint:" -msgstr "Ключов отпечатък на хоста:" +#: ../src/engine/socket.cpp:1088 +msgid "Host is down" +msgstr "Хостът е изключен" -#: resources.h:147 +#: ../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Несъответствие на хост-ключа" -#: ../../locales/../src/engine/server.cpp:157 +#: ../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." -msgstr "Хостът започва с \"[\", но липсва затварящата скоба." +msgstr "Хостът започва с „[“, но липсва затварящата скоба." -#: ../../locales/../src/engine/proxy.cpp:533 +#: ../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Хостът недостъпен" -#: resources.h:17 resources.h:46 resources.h:85 resources.h:139 -#: resources.h:152 +#: ../src/interface/resources/xrc/certificate.xrc:180 +#: ../src/interface/resources/xrc/dialogs.xrc:284 +#: ../src/interface/resources/xrc/dialogs.xrc:420 +#: ../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Хост:" -#: resources.h:979 +#: ../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Алгоритъм на ключа на хоста:" + +#: ../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "часове," -#: resources.h:859 +#: ../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Забравих главната си парола. Разрешавам изтриване на всички пароли, запазени " +"с нея." + +#: ../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (пример: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:131 +#: ../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 адреси не се поддържат от SOCKS4 прокси" -#: resources.h:696 +#: ../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4109,13 +4530,13 @@ "Ако през този интервал няма изпратени или получени данни, връзката ще бъде " "затворена и FileZilla ще направи нов опит за свързване." -#: resources.h:951 +#: ../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Ако подавате доклад за дефект, моля, осигурете дневник, създаден при ниво " -"\"Подробна\"." +"„Подробна“." -#: resources.h:649 +#: ../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" "If the automatic test at the end of this wizard succeeds, but you cannot " "transfer files to a particular server, the server might be misconfigured and " @@ -4125,10 +4546,10 @@ "Ако автоматичната проверка в края на съветника мине успешно, но не можете да " "прехвърляте файлове до определен сървър, този сървър вероятно е грешно " "настроен и за връзка с него трябва да използвате активен режим. Може да " -"избирате режим на прехвърляне за всеки сървър поотделно в \"Манипулатор " -"връзки\"." +"избирате режим на прехвърляне за всеки сървър поотделно в Управление на " +"връзки." -#: resources.h:644 +#: ../src/interface/resources/xrc/netconfwizard.xrc:95 msgid "" "If the fallback option is enabled, you will be able to connect to " "misconfigured servers which reject the selected transfer mode." @@ -4136,7 +4557,7 @@ "Ако режимът на отстъпване е включен, ще можете да се свързвате с грешно " "настроени сървъри, които отказват връзка чрез избрания режим." -#: resources.h:150 +#: ../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4144,7 +4565,7 @@ "Ако промяна в хост-ключа е неочаквана, моля свържете се с администратора на " "сървъра." -#: ../../locales/../src/interface/netconfwizard.cpp:554 +#: ../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4152,7 +4573,7 @@ "Ако проблемът не изчезне, значи някой маршрутизатор и/или защитна стена " "продължават да блокират FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4160,17 +4581,17 @@ "Ако проблемът не изчезне, значи някой маршрутизатор и/или защитна стена " "продължават да прекъсват връзката." -#: resources.h:940 +#: ../src/interface/resources/xrc/settings.xrc:2268 msgid "" -"If the size of the logfile reaches the limit, it gets renamed by adding \".1" -"\" to the end of the filename (possibly overwriting older logfiles) and a " -"new file gets created." +"If the size of the logfile reaches the limit, it gets renamed by adding " +"\".1\" to the end of the filename (possibly overwriting older logfiles) and " +"a new file gets created." msgstr "" "Ако размерът на файла-дневник достигне ограничението, то той ще бъде " -"преименуван като бъде добавено \".1\" в края на името, вероятно " -"презаписвайки стар файл, и нов файл бива създаден." +"преименуван като бъде добавено „.1“ в края на името, вероятно презаписвайки " +"стар файл и създавайки нов." -#: resources.h:393 +#: ../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4178,7 +4599,7 @@ "Ако символна връзка сочи папка, FileZilla може или да изтрие връзката, или " "да изпразни целевата папка." -#: ../../locales/../src/interface/netconfwizard.cpp:624 +#: ../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4186,23 +4607,24 @@ "Ако проблемът се остане, моля, обърнете се към производителя на " "маршрутизатора или защитната ви стена." -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Ако проблемът не изчезне, моля, обърнете се към производителя на вашия " "маршрутизатор." -#: resources.h:216 resources.h:819 +#: ../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " "timezone offset in the site manager." msgstr "" -"Ако използвате \"Презапис при по-нов\", вашето системно време трябва да е " -"синхронизирано с това на сървъра. Ако времената се различават (например " -"заради часова разлика), укажете часовата разлика в Манипулатор връзки." +"Ако използвате „Презапис при по-нов източник“, вашето системно време трябва " +"да е синхронизирано с това на сървъра. Ако времената се различават (например " +"различен часови пояс), укажете часовата разлика в Управление на връзки." -#: resources.h:890 +#: ../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4210,44 +4632,43 @@ "При сравняване на файлове по времеви маркери, за еднакви се считат такива, " "чийто маркери имат разлика не по-голяма от този праг." -#: resources.h:905 -#, fuzzy +#: ../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." -msgstr "При промяна на езика, трябва да рестартирате FileZilla." +msgstr "При промяна на езика трябва да рестартирате FileZilla." -#: resources.h:675 +#: ../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" "If you click on test, FileZilla will connect to probe.filezilla-project.org " "and will perform some simple tests." msgstr "" -"Като натиснете \"Проверка\", FileZilla ще се свърже с probe.filezilla-" -"project.org и ще направи няколко теста." +"Като натиснете „Проверка“, FileZilla ще се свърже с probe.filezilla-project." +"org и ще направи няколко теста." -#: ../../locales/../src/interface/Mainfrm.cpp:1229 +#: ../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "При затваряне на FileZilla промените ще бъдат загубени." -#: resources.h:795 +#: ../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "" -"Ако сгрешите при въвеждането на файловите типове, тези файлове могат да " -"бъдат повредени при прехвърлянето." +"Ако сгрешите при въвеждането на видовете файлове, при прехвърлянето те могат " +"да бъдат повредени." -#: resources.h:676 +#: ../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." msgstr "Ако получите някакви грешки, то настройките ви не са правилни." -#: resources.h:708 +#: ../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." msgstr "" "Ако имате проблеми с разлистването на папки или прехвърлянето на файлове, " -"пробвайте да смените режима на прехвърляне по подразбиране." +"пробвайте да промените стандартния режим на прехвърляне." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4257,7 +4678,7 @@ "отдалечен маршрутизатор да са погрешно настроени. В такъв случай превключете " "на пасивен режим и се обърнете за помощ към администратора на сървъра." -#: resources.h:635 +#: ../src/interface/resources/xrc/netconfwizard.xrc:24 msgid "" "If you successfully complete the wizard and the final test succeeds, any " "firewalls and routers you have should be configured properly." @@ -4265,7 +4686,7 @@ "Ако съветникът завърши успешно и последният тест, всички налични защитни " "стени и маршрутизатори ще бъдат правилно настроени." -#: resources.h:671 +#: ../src/interface/resources/xrc/netconfwizard.xrc:323 msgid "" "If you use a firewall, make sure FileZilla is allowed to accept connection " "on all given ports." @@ -4273,7 +4694,7 @@ "Ако използвате защитна стена настройте я така, че FileZilla може да приема " "връзки на всички посочени портове." -#: resources.h:670 +#: ../src/interface/resources/xrc/netconfwizard.xrc:318 msgid "" "If you use a router, make sure all these ports are forwarded to the machine " "you're running FileZilla on." @@ -4281,7 +4702,7 @@ "Ако използвате маршрутизатор, проверете дали всички тези портове са " "пренасочени към машината, на която FileZilla работи." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4289,25 +4710,24 @@ "Ако маршрутизаторът ви продължава да сменя IP адреса, моля, обърнете се към " "производителя му." -#: ../../locales/../src/interface/import.cpp:77 +#: ../src/interface/import.cpp:99 msgid "Import data from older version" -msgstr "Импорт на данни от по-стара версия" +msgstr "Внасяне на данни от по-старо издание" -#: resources.h:235 +#: ../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Импорт настройки" -#: ../../locales/../src/interface/import.cpp:63 -#: ../../locales/../src/interface/import.cpp:66 +#: ../src/interface/import.cpp:81 ../src/interface/import.cpp:88 msgid "Import successful" msgstr "Импортът успешен" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 +#: ../src/interface/settings/optionspage_edit_associations.cpp:49 +#: ../src/interface/settings/optionspage_edit_associations.cpp:56 msgid "Improperly quoted association." msgstr "Асоциацията неправилно поставена в кавички." -#: resources.h:663 +#: ../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" "In active mode, FileZilla has to listen on a port for data transfers. You " "have to specify which ports FileZilla will use." @@ -4315,7 +4735,7 @@ "В активен режим FileZilla трябва да слуша на порт за прехвърляне на данни. " "Вие трябва да укажете кои портове да се използват от FileZilla." -#: resources.h:665 +#: ../src/interface/resources/xrc/netconfwizard.xrc:276 msgid "" "In case you have a router, you will have to forward all available ports, as " "FileZilla has no influence on the ports your system chooses." @@ -4324,7 +4744,8 @@ "като FileZilla не може да окаже влияние върху избора на портовете от " "операционната система." -#: resources.h:653 resources.h:717 +#: ../src/interface/resources/xrc/netconfwizard.xrc:168 +#: ../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4332,7 +4753,7 @@ "За използване на активен режим, FileZilla трябва да знае вашия външен IP " "адрес." -#: resources.h:638 +#: ../src/interface/resources/xrc/netconfwizard.xrc:52 msgid "" "In passive mode, which is recommended for most users, FileZilla asks the " "server for a port and connects to the given port. Not much configuration has " @@ -4342,197 +4763,199 @@ "изисква от сървъра порт и се свързва към него. В този случай няма много за " "настройване." -#: ../../locales/../src/engine/tlssocket.cpp:1083 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Не пълна верига, главният сертификат не е самоподписан сертификат от издател " -"на сертификати." - -#: ../../locales/../src/interface/QueueView.cpp:1057 +#: ../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Грешна парола" -#: resources.h:1043 +#: ../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." msgstr "" -"Информация за последната версия на FileZilla не може да бъде взета. Опитайте " -"отново по-късно." +"Информацията за последното издание на FileZilla не може да бъде изтеглена. " +"Опитайте отново по-късно." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775 +#: ../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." -msgstr "Инициализация на TLS..." +msgstr "Инициализация на TLS…" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:761 +#: ../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Незащитен алгоритъм!" + +#: ../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." -msgstr "Несигурен сървър, неподдържащ FTP през TLS." +msgstr "Незащитен сървър, който не поддържа FTP през TLS." -#: ../../locales/../src/engine/server.cpp:835 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../src/engine/server.cpp:579 ../src/engine/server.cpp:603 +#: ../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Интерактивно" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 +#: ../src/interface/settings/settingsdialog.cpp:102 msgid "Interface" msgstr "Интерфейс" -#: ../../locales/../src/engine/socket.cpp:1213 +#: ../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Прекъснато със сигнал" -#: ../../locales/../src/engine/ControlSocket.cpp:225 -#: ../../locales/../src/interface/QueueView.cpp:1014 -#: ../../locales/../src/interface/QueueView.cpp:1593 +#: ../src/engine/ControlSocket.cpp:216 ../src/interface/queue.cpp:355 msgid "Interrupted by user" -msgstr "Прекъснато от потребителя." +msgstr "Прекъснато от потребителя" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:758 +#: ../src/engine/http/request.cpp:38 ../src/engine/http/request.cpp:387 msgid "Invalid Content-Length" -msgstr "Невалиден \"Content-Length\"" +msgstr "Невалидна заглавка „Content-Length“" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:608 +#: ../src/engine/http/request.cpp:271 msgid "Invalid HTTP Response" msgstr "Невалиден отговор за HTTP" -#: ../../locales/../src/engine/socket.cpp:1201 +#: ../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Подаден е невалиден аргумент" -#: ../../locales/../src/engine/ControlSocket.cpp:554 -#: ../../locales/../src/engine/ControlSocket.cpp:600 +#: ../src/engine/ControlSocket.cpp:454 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." msgstr "" "Получена е невалидна последователност от знаци, изключване на UTF-8. " -"Изберете опцията за UTF-8 в Манипулатор връзки, за да наложите използването " -"на UTF-8." +"Изберете опцията за UTF-8 в Управление на връзки, за да наложите " +"използването на UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:872 +#: ../src/engine/http/request.cpp:495 msgid "Invalid chunk size" msgstr "Невалидна дължина на парче" -#: ../../locales/../src/interface/netconfwizard.cpp:353 -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../src/interface/netconfwizard.cpp:373 +#: ../src/interface/netconfwizard.cpp:382 +#: ../src/interface/netconfwizard.cpp:390 +#: ../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Получени са невалидни данни" -#: ../../locales/../src/interface/verifycertdialog.cpp:36 -#: ../../locales/../src/interface/verifycertdialog.cpp:50 +#: ../src/interface/verifycertdialog.cpp:34 +#: ../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Невалидна дата" -#: ../../locales/../src/interface/file_utils.cpp:290 -#: ../../locales/../src/interface/file_utils.cpp:315 -#: ../../locales/../src/interface/RemoteListView.cpp:2917 +#: ../src/interface/file_utils.cpp:290 ../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Невалидно име на файл" -#: ../../locales/../src/engine/server.cpp:162 +#: ../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Невалидно име на хост - затварящата скоба може да бъде последвана само от " "двоеточие и номер на порт." -#: ../../locales/../src/interface/loginmanager.cpp:104 +#: ../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Невалидно име на хост: %s" + +#: ../src/interface/asksavepassworddialog.cpp:41 +#: ../src/interface/asksavepassworddialog.cpp:46 +#: ../src/interface/loginmanager.cpp:108 ../src/interface/loginmanager.cpp:113 +#: ../src/interface/loginmanager.cpp:207 ../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Невалидни данни" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../src/engine/http/request.cpp:328 +msgid "Invalid line" +msgstr "Невалиден ред" + +#: ../src/engine/storj/rmd.cpp:24 ../src/engine/storj/mkd.cpp:22 +#: ../src/engine/storj/list.cpp:21 +msgid "Invalid path" +msgstr "Невалиден път" + +#: ../src/interface/serverdata.cpp:13 ../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Невалиден порт. Портът е число между 1 и 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:125 +#: ../src/interface/serverdata.cpp:40 ../src/interface/quickconnectbar.cpp:160 msgid "" "Invalid protocol specified. Valid protocols are:\n" -"ftp:// for normal FTP,\n" +"ftp:// for normal FTP with optional encryption,\n" "sftp:// for SSH file transfer protocol,\n" "ftps:// for FTP over TLS (implicit) and\n" "ftpes:// for FTP over TLS (explicit)." msgstr "" -"Указан е невалиден протокол. Валидни протоколи са:\n" -"ftp:// за обикновен FTP\n" +"Посочен е невалиден протокол. Валидни протоколи са:\n" +"ftp:// за обикновен FTP с шифроване по избор\n" "sftp:// за пренос на файлове по SSH\n" "ftps:// FTP през скрит TLS и\n" -"ftpes:// FTP през явен TLS" +"ftpes:// FTP през явен TLS." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4427 +#: ../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Невалидно име на хост на прокси - затварящата скоба може да бъде последвана " "само от двоеточие и номер на порт." -#: ../../locales/../src/interface/search.cpp:391 +#: ../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Невалиден регулярен израз" + +#: ../src/interface/search.cpp:728 msgid "Invalid regular expression in search conditions." msgstr "Невалиден регулярен израз в условието на търсенето." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../src/engine/http/request.cpp:280 msgid "Invalid response code" msgstr "Невалиден код на отговор" -#: ../../locales/../src/interface/search.cpp:385 +#: ../src/interface/search.cpp:723 #, c-format msgid "Invalid search conditions: %s" msgstr "Невалидни условия за търсене: %s" -#: ../../locales/../src/interface/sitemanager.cpp:425 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:456 -#: ../../locales/../src/interface/sitemanager.cpp:463 -#: ../../locales/../src/interface/sitemanager.cpp:470 -#: ../../locales/../src/interface/sitemanager.cpp:488 -#: ../../locales/../src/interface/sitemanager.cpp:541 -#: ../../locales/../src/interface/sitemanager.cpp:559 -#: ../../locales/../src/interface/sitemanager.cpp:731 -#: ../../locales/../src/interface/sitemanager.cpp:738 -#: ../../locales/../src/interface/sitemanager.cpp:812 -#: ../../locales/../src/interface/sitemanager.cpp:818 +#: ../src/interface/sitemanager.cpp:706 ../src/interface/sitemanager.cpp:712 +#: ../src/interface/sitemanager.cpp:794 ../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Грешен път до връзка" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:726 +#: ../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Невалиден размер в условие" -#: ../../locales/../src/engine/server.cpp:132 +#: ../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Невалидно потребителско име." -#: ../../locales/../src/engine/socket.cpp:1233 +#: ../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" -msgstr "" +msgstr "Невалидна стойност за ai_flags" -#: ../../locales/../src/engine/socket.cpp:1235 -#, fuzzy +#: ../src/engine/socket.cpp:1097 msgid "Invalid value for hints" -msgstr "Невалидни данни" +msgstr "Невалидни данни за подсказки" + +#: ../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Обръщане на филтър" -#: ../../locales/../src/interface/verifycertdialog.cpp:194 +#: ../src/interface/verifycertdialog.cpp:260 msgid "Jurisdiction country:" msgstr "Държава по юрисдикция:" -#: ../../locales/../src/interface/verifycertdialog.cpp:196 +#: ../src/interface/verifycertdialog.cpp:262 msgid "Jurisdiction locality:" msgstr "Местност по юрисдикция:" -#: ../../locales/../src/interface/verifycertdialog.cpp:195 +#: ../src/interface/verifycertdialog.cpp:261 msgid "Jurisdiction state or province:" msgstr "Щат или провинция по юрисдикция:" -#: resources.h:881 +#: ../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Папките - отгоре" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4543,137 +4966,160 @@ "FileZilla прави тестове дали сървъра поддържа тази функционалност тези " "проверки може да са неуспешни." -#: resources.h:275 +#: ../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Разменени ключове" -#: resources.h:21 resources.h:50 +#: ../src/interface/resources/xrc/certificate.xrc:200 msgid "Key exchange:" msgstr "Обмяна на ключове:" -#: resources.h:556 +#: ../src/engine/server.cpp:576 ../src/engine/server.cpp:601 +msgid "Key file" +msgstr "Файл-ключ" + +#: ../src/interface/resources/xrc/dialogs.xrc:444 +#: ../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Ключов идентификатор:" + +#: ../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Най-н&исък" -#: resources.h:903 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 +#: ../src/interface/resources/xrc/settings.xrc:1943 +#: ../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Език" -#: ../../locales/../src/interface/Mainfrm.cpp:1536 +#: ../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Езикът променен" -#: ../../locales/../src/interface/LocalListView.cpp:285 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:83 +#: ../src/interface/RemoteListView.cpp:398 +#: ../src/interface/LocalListView.cpp:290 ../src/interface/search.cpp:158 msgid "Last modified" msgstr "Последна промяна" -#: resources.h:822 +#: ../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Изглед" -#: resources.h:768 +#. @translator: Keep this string as short as possible +#: ../src/interface/settings/optionspage_interface.cpp:67 +#: ../src/interface/sitemanager_dialog.cpp:1810 +msgid "Leave empty to keep existing password." +msgstr "Оставете празно, за да запазите текущата парола." + +#: ../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Максимален брой паралелни &изтегляния:" -#: resources.h:770 +#: ../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Максимален брой паралелни ка&чвания:" -#: resources.h:712 +#: ../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Портове" -#: resources.h:937 +#: ../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" -msgstr "Ограничаване размера на файлът-дневник" +msgstr "Ограничаване размера на файла-дневник" -#: resources.h:938 +#: ../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Лимит:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:825 +#: ../src/engine/http/request.cpp:451 msgid "Line length exceeded" msgstr "Надвишена дължина на ред" -#: resources.h:129 +#: ../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Зависимости" -#: ../../locales/../src/interface/netconfwizard.cpp:267 +#: ../src/interface/netconfwizard.cpp:274 +#: ../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Слушащият сокет е затворен" -#: ../../locales/../src/engine/logging.cpp:130 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:366 +#: ../src/engine/logging.cpp:120 ../src/interface/StatusView.cpp:295 +#: ../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "Списък:" -#: resources.h:715 +#: ../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Най-&нисък наличен порт:" -#: ../../locales/../src/interface/edithandler.cpp:1166 -#: ../../locales/../src/interface/edithandler.cpp:1420 +#: ../src/interface/edithandler.cpp:1184 ../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Местни" -#: ../../locales/../src/engine/socket.cpp:1198 -#, fuzzy +#: ../src/engine/socket.cpp:1059 msgid "Local address in use" -msgstr "Запитване за адреса на %s" +msgstr "Местният адрес е зает" -#: ../../locales/../src/engine/socket.cpp:1226 +#: ../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" -msgstr "" +msgstr "Местната крайна точка е била затворена" -#: resources.h:302 +#: ../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Местен файл" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Местният файл не съществува." -#: ../../locales/../src/interface/updater.cpp:372 -#: ../../locales/../src/interface/updater.cpp:449 +#: ../src/interface/updater.cpp:416 ../src/interface/updater.cpp:509 #, c-format msgid "Local file is %s\n" -msgstr "Местният файл е \"%s\"\n" +msgstr "Местният файл е „%s“\n" -#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Вместо местен файл е посочена папка." -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Местният файл не е валидно файлово име." -#: resources.h:165 +#: ../src/interface/search.cpp:686 ../src/interface/search.cpp:692 +msgid "Local file search" +msgstr "Търсене на местни файлове" + +#: ../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Местни филтри:" -#: ../../locales/../src/interface/viewheader.cpp:363 +#: ../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Промяна на местния път:" + +#: ../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Местни:" -#: ../../locales/../src/interface/verifycertdialog.cpp:188 +#: ../src/interface/verifycertdialog.cpp:254 msgid "Locality:" msgstr "Населено място:" -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:97 +#: ../src/interface/settings/optionspage_logging.cpp:97 msgid "Log file" msgstr "Файл-дневник" -#: resources.h:932 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +#: ../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Вписан" + +#: ../src/interface/resources/xrc/settings.xrc:2191 +#: ../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Дневник" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 +#: ../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4682,7 +5128,7 @@ "разбира UTF-8. Невъзможност за отстъпване до местния знаков набор, поради " "използването на прокси." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:845 +#: ../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4690,425 +5136,479 @@ "Данните за удостоверяване съдържат не-ASCII знаци, а сървъра може да не " "разбира UTF-8. Проба с местния знаков набор." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:874 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" -"Входната последователност е изцяло изпълнена, но пак няма удостоверение. " -"Отмяна." +"Входната последователност е изцяло изпълнена, но въпреки това липсва " +"удостоверяване, прекратяване." -#: ../../locales/../src/interface/cmdline.cpp:103 +#: ../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." msgstr "" -"Удостоверяването трябва да бъде или \"ask\" или \"interactive\" (без " -"кавичките)" +"Удостоверяването трябва да бъде или „ask“ или „interactive“ (без кавичките)" -#: ../../locales/../src/interface/cmdline.cpp:11 +#: ../src/interface/cmdline.cpp:11 #, c-format msgid "" "Logontype, can only be used together with FTP URL. Argument has to be either " "'%s' or '%s'" msgstr "" "Удостоверяването може да бъде използвано само с FTP URL. Аргументът трябва " -"да бъде или \"%s\" или \"%s\"" +"да бъде или „%s“ или „%s“" -#: ../../locales/../src/interface/queue.cpp:892 -#: ../../locales/../src/interface/queue.cpp:979 +#: ../src/interface/queue.cpp:931 ../src/interface/queue.cpp:993 msgid "Low" msgstr "Нисък" -#: ../../locales/../src/interface/queue.cpp:890 -#: ../../locales/../src/interface/queue.cpp:977 +#: ../src/interface/queue.cpp:929 ../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Най-нисък" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "Най-ниският наличен порт трябва да е число от 1024 до 65535." -#: resources.h:25 resources.h:54 +#: ../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:40 +#: ../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "пурпурен" + +#: ../src/interface/xmlfunctions.cpp:39 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Уверете се, че файлът може да бъде достъпен и е добре форматиран XML " "документ." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:813 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:825 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:872 +#: ../src/engine/http/request.cpp:438 ../src/engine/http/request.cpp:451 +#: ../src/engine/http/request.cpp:462 ../src/engine/http/request.cpp:495 #, c-format msgid "Malformed chunk data: %s" msgstr "Деформирани пакетни данни: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:758 +#: ../src/engine/http/request.cpp:38 +#, c-format +msgid "Malformed request header: %s" +msgstr "Деформирана заглавка на заявката: %s" + +#: ../src/engine/http/request.cpp:514 #, c-format -msgid "Malformed header: %s" -msgstr "Деформирана заглавна част: %s" +msgid "Malformed response body: %s" +msgstr "Деформирано съдържание на отговора: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:578 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Деформиран отговор, сървъра не изпраща правилни знаци за край на ред" - -#: resources.h:332 ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:316 -#: ../../locales/../src/interface/manual_transfer.cpp:323 -#: ../../locales/../src/interface/manual_transfer.cpp:328 -#: ../../locales/../src/interface/manual_transfer.cpp:336 -#: ../../locales/../src/interface/manual_transfer.cpp:343 -#: ../../locales/../src/interface/manual_transfer.cpp:350 -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../src/engine/http/request.cpp:241 ../src/engine/http/request.cpp:247 +#: ../src/engine/http/request.cpp:328 ../src/engine/http/request.cpp:379 +#: ../src/engine/http/request.cpp:387 ../src/engine/http/request.cpp:444 +#, c-format +msgid "Malformed response header: %s" +msgstr "Деформирана заглавка на отговора: %s" + +#: ../src/engine/http/request.cpp:400 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." +msgstr "" +"Деформиран отговор: Сървърът изпрати отговор с искане или код за отговор, " +"който забранява отговаряне." + +#: ../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../src/interface/manual_transfer.cpp:288 +#: ../src/interface/manual_transfer.cpp:294 +#: ../src/interface/manual_transfer.cpp:300 +#: ../src/interface/manual_transfer.cpp:304 +#: ../src/interface/manual_transfer.cpp:311 +#: ../src/interface/manual_transfer.cpp:317 +#: ../src/interface/manual_transfer.cpp:323 +#: ../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Ръчно прехвърляне" -#: resources.h:372 +#: ../src/interface/resources/xrc/dialogs.xrc:455 +#: ../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "&Главна парола:" + +#: ../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Главна парола:" + +#: ../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "всички правила" -#: resources.h:373 +#: ../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "някое от правилата" -#: resources.h:374 +#: ../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "никое правило" -#: resources.h:766 +#: ../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "не всички правила" + +#: ../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "&Максимален брой:" -#: ../../locales/../src/engine/socket.cpp:1239 +#: ../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Невъзможност за заделяне на памет" -#: ../../locales/../src/interface/Mainfrm.cpp:358 -#: ../../locales/../src/interface/Mainfrm.cpp:1890 +#: ../src/interface/Mainfrm.cpp:435 ../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Дневник" -#: resources.h:833 +#: ../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Дневник" -#: ../../locales/../src/engine/socket.cpp:1223 +#: ../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Съобщението е твърде голямо" -#: resources.h:939 +#: ../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: resources.h:980 +#: ../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "минути" -#: resources.h:296 +#: ../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Надо&лу" -#: resources.h:295 +#: ../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Наг&оре" -#: ../../locales/../src/interface/LocalTreeView.cpp:1044 +#: ../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Моят компютър" -#: ../../locales/../src/interface/LocalTreeView.cpp:1034 +#: ../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Моите документи" -#: ../../locales/../src/interface/sitemanager.cpp:281 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:719 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:721 +#: ../src/interface/sitemanager.cpp:342 +#: ../src/interface/sitemanager_dialog.cpp:772 +#: ../src/interface/sitemanager_dialog.cpp:775 msgid "My Sites" msgstr "Моите връзки" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../src/interface/settings/optionspage_themes.cpp:197 +#: ../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "Няма" -#: resources.h:337 +#: ../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Наименование" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:707 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 +#: ../src/interface/bookmarks_dialog.cpp:732 +#: ../src/interface/sitemanager_dialog.cpp:1264 msgid "Name already exists" msgstr "Името вече съществува" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:822 -#: ../../locales/../src/interface/sitemanager.cpp:755 +#: ../src/interface/sitemanager.cpp:725 +#: ../src/interface/bookmarks_dialog.cpp:853 msgid "Name of bookmark already exists." msgstr "Името вече съществува." -#: resources.h:84 resources.h:130 +#: ../src/interface/resources/xrc/dialogs.xrc:276 +#: ../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Име:" -#: resources.h:888 +#: ../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" -msgstr "&естествено сортиране" +msgstr "Естествено сортиране" -#: ../../locales/../src/interface/filteredit.cpp:349 +#: ../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Трябва да въведете име на филтър" -#: ../../locales/../src/interface/search.cpp:375 +#: ../src/interface/search.cpp:686 +msgid "Need to enter valid local path" +msgstr "Трябва да въведете валиден местен път" + +#: ../src/interface/search.cpp:713 msgid "Need to enter valid remote path" msgstr "Трябва да въведете валиден отдалечен път" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1001 +#: ../src/interface/sitemanager_dialog.cpp:1049 msgid "Need to specify a character encoding" msgstr "Трябва да бъде указан знаков набор" -#: ../../locales/../src/engine/socket.cpp:1243 +#: ../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" -msgstr "" +msgstr "Името на възела или сървъра не е указано или е неизвестно" -#: ../../locales/../src/engine/socket.cpp:1230 +#: ../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "" +"Хостът няма адрес в мрежовото пространство в необходимото адресно семейство" -#: ../../locales/../src/engine/proxy.cpp:530 -#: ../../locales/../src/engine/socket.cpp:1215 +#: ../src/engine/proxy.cpp:498 ../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Мрежата недостъпна" -#: resources.h:921 +#: ../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "никога" -#: resources.h:956 +#: ../src/interface/resources/xrc/sitemanager.xrc:41 msgid "New &Folder" msgstr "Нова &папка" -#: resources.h:443 +#: ../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" -msgstr "Нов &подпрозорец" +msgstr "Нов &раздел" -#: resources.h:352 resources.h:957 +#: ../src/interface/resources/xrc/dialogs.xrc:3067 +#: ../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Нова о&тметка" -#: resources.h:333 ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:574 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:822 -#: ../../locales/../src/interface/sitemanager.cpp:755 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125 +#: ../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../src/interface/sitemanager.cpp:725 +#: ../src/interface/bookmarks_dialog.cpp:60 +#: ../src/interface/bookmarks_dialog.cpp:73 +#: ../src/interface/bookmarks_dialog.cpp:79 +#: ../src/interface/bookmarks_dialog.cpp:85 +#: ../src/interface/bookmarks_dialog.cpp:97 +#: ../src/interface/bookmarks_dialog.cpp:103 +#: ../src/interface/bookmarks_dialog.cpp:111 +#: ../src/interface/bookmarks_dialog.cpp:466 +#: ../src/interface/bookmarks_dialog.cpp:567 +#: ../src/interface/bookmarks_dialog.cpp:573 +#: ../src/interface/bookmarks_dialog.cpp:579 +#: ../src/interface/bookmarks_dialog.cpp:600 +#: ../src/interface/bookmarks_dialog.cpp:853 +#: ../src/interface/sitemanager_dialog.cpp:2419 msgid "New bookmark" msgstr "Нова отметка" -#: ../../locales/../src/interface/LocalTreeView.cpp:1193 -#: ../../locales/../src/interface/RemoteListView.cpp:1373 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1336 +#: ../src/interface/LocalTreeView.cpp:1185 +#: ../src/interface/RemoteListView.cpp:1340 +#: ../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Нова папка" -#: ../../locales/../src/interface/welcome_dialog.cpp:56 +#: ../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Новата функционалност и подобрения в %s" -#: ../../locales/../src/interface/filteredit.cpp:131 +#: ../src/interface/filteredit.cpp:131 msgid "New filter" msgstr "Нов филтър" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:910 +#: ../src/interface/sitemanager_dialog.cpp:953 msgid "New folder" msgstr "Нова папка" -#: ../../locales/../src/interface/sitemanager.cpp:627 -#: ../../locales/../src/interface/sitemanager.cpp:641 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101 +#: ../src/interface/sitemanager.cpp:605 ../src/interface/sitemanager.cpp:619 +#: ../src/interface/sitemanager_dialog.cpp:2392 msgid "New site" msgstr "Нова връзка" -#: resources.h:831 +#: ../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "До опашката" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:883 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:389 msgid "No" msgstr "Не" -#: ../../locales/../src/engine/socket.cpp:1241 -#, fuzzy +#: ../src/engine/socket.cpp:1103 msgid "No address associated with nodename" -msgstr "Асоциираната програма не е намерена" +msgstr "Няма асоцииран адрес към този възел" -#: ../../locales/../src/interface/export.cpp:26 +#: ../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Не е избрана категория за експорт" -#: ../../locales/../src/interface/QueueView.cpp:2266 +#: ../src/interface/QueueView.cpp:1873 msgid "No command given, aborting." msgstr "Няма указана команда, прекратяване." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3942 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." -msgstr "Няма въведен външен IP адрес, проба с адрес по подразбиране." +msgstr "Няма въведен външен IP адрес, проба със стандартен адрес." -#: ../../locales/../src/interface/edithandler.cpp:1107 +#: ../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "В момента няма отворени за редакция файлове." -#: ../../locales/../src/interface/filteredit.cpp:143 +#: ../src/interface/filteredit.cpp:143 msgid "No filter name given" msgstr "Филтърът няма име" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../src/interface/serverdata.cpp:27 ../src/interface/serverdata.cpp:122 +#: ../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Не е указан хост. Моля, укажете хост." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Няма налични изображения" -#: ../../locales/../src/interface/QueueView.cpp:3147 -msgid "No more files in the queue!" -msgstr "Няма файлове в опашката" - -#: ../../locales/../src/interface/filter.cpp:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../src/interface/filter.cpp:245 ../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Въведете име за набора филтри." -#: resources.h:368 +#: ../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" -msgstr "Няма асоциирана програма към този файлов тип" +msgstr "Няма асоциирана програма към този файлов вид" -#: resources.h:358 +#: ../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "Няма свързана програма за редактиране на файлове с разширение '%s'." -#: ../../locales/../src/engine/socket.cpp:1218 +#: ../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Няма път към хоста" -#: ../../locales/../src/interface/search.cpp:234 +#: ../src/interface/search.cpp:433 msgid "No search results" msgstr "Няма намерени резултати" -#: ../../locales/../src/interface/sitemanager.cpp:247 -#: ../../locales/../src/interface/sitemanager.cpp:259 -#: ../../locales/../src/interface/sitemanager.cpp:290 +#: ../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Няма налични връзки" -#: ../../locales/../src/engine/proxy.cpp:498 +#: ../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Не поддържан SOCKS5 метод за удостоверяване" -#: ../../locales/../src/interface/loginmanager.cpp:104 +#: ../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Не е въведено потребителско име." -#: resources.h:897 resources.h:902 -#: ../../locales/../src/interface/verifycertdialog.cpp:56 +#: ../src/interface/resources/xrc/settings.xrc:1905 +#: ../src/interface/resources/xrc/settings.xrc:1924 +#: ../src/interface/sitemanager.cpp:17 ../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Никакъв" -#: resources.h:312 +#: ../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Няма избрани" -#: ../../locales/../src/engine/socket.cpp:1237 +#: ../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" -msgstr "" +msgstr "Необратим срив в преобразуването на имена" -#: resources.h:779 ../../locales/../src/engine/server.cpp:831 -#: ../../locales/../src/engine/server.cpp:850 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:185 -#: ../../locales/../src/interface/manual_transfer.cpp:568 -#: ../../locales/../src/interface/queue.cpp:895 -#: ../../locales/../src/interface/queue.cpp:982 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1293 +#: ../src/interface/resources/xrc/settings.xrc:963 ../src/engine/server.cpp:570 +#: ../src/engine/server.cpp:597 ../src/interface/manual_transfer.cpp:148 +#: ../src/interface/manual_transfer.cpp:176 +#: ../src/interface/manual_transfer.cpp:535 ../src/interface/queue.cpp:934 +#: ../src/interface/queue.cpp:996 msgid "Normal" msgstr "Нормално" -#: ../../locales/../src/interface/queueview_failed.cpp:326 -#: ../../locales/../src/interface/queueview_failed.cpp:351 -msgid "Not all items could be requeued for viewing/editing." -msgstr "Не всичко може да бъде върнато в опашката за преглед/редакция." +#: ../src/interface/queueview_failed.cpp:310 +#: ../src/interface/queueview_failed.cpp:335 +msgid "Not all items could be requeued for transfer." +msgstr "Не всичко може да бъде върнато в опашката за прехвърляне." -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:516 +#: ../src/interface/state.cpp:211 ../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Без осъществена връзка" -#: ../../locales/../src/interface/RemoteListView.cpp:2113 +#: ../src/interface/RemoteListView.cpp:2054 msgid "Not connected to any server" msgstr "Няма осъществена връзка" -#: ../../locales/../src/interface/Mainfrm.cpp:538 +#: ../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Няма осъществена връзка." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Без осъществена връзка" -#: ../../locales/../src/engine/socket.cpp:1258 +#: ../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" -msgstr "" +msgstr "Неинициализирано, WSAStartup трябва да бъде извикан" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Тази особеност се поддържа само при използване на протокола FTP." -#: resources.h:746 +#: ../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Изгубен ключ не може да бъде възстановен!" + +#: ../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." -msgstr "Заб.: Работи само при некриптирана FTP връзка." +msgstr "Заб.: Работи само при нешифрована връзка на FTP." -#: resources.h:764 +#: ../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Забележка: Използването на нормално прокси налага пасивен режим на FTP " "връзките." -#: resources.h:870 +#: ../src/engine/http/request.cpp:247 ../src/engine/http/request.cpp:444 +msgid "Null character in line" +msgstr "Знак null на реда" + +#: ../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Брой цифри след десетичния знак:" -#: ../../locales/../src/interface/settings/optionspage_connection.cpp:35 +#: ../src/interface/settings/optionspage_connection.cpp:35 msgid "Number of retries has to be between 0 and 99." msgstr "Броят на опитите трябва да е между 0 и 99." -#: resources.h:271 -msgid "O&pen file" -msgstr "Отваряне за &преглед" - -#: resources.h:29 resources.h:56 resources.h:78 resources.h:113 -#: resources.h:135 resources.h:145 resources.h:158 resources.h:173 -#: resources.h:190 resources.h:217 resources.h:226 resources.h:233 -#: resources.h:241 resources.h:264 resources.h:272 resources.h:291 -#: resources.h:297 resources.h:330 resources.h:344 resources.h:366 -#: resources.h:389 resources.h:398 resources.h:412 resources.h:426 -#: resources.h:433 resources.h:437 resources.h:689 +#: ../src/interface/resources/xrc/certificate.xrc:263 +#: ../src/interface/resources/xrc/dialogs.xrc:233 +#: ../src/interface/resources/xrc/dialogs.xrc:559 +#: ../src/interface/resources/xrc/dialogs.xrc:751 +#: ../src/interface/resources/xrc/dialogs.xrc:994 +#: ../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../src/interface/resources/xrc/dialogs.xrc:3552 +#: ../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../src/interface/resources/xrc/dialogs.xrc:4226 +#: ../src/interface/resources/xrc/inputdialog.xrc:34 +#: ../src/interface/resources/xrc/settings.xrc:28 +#: ../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "&ОК" -#: resources.h:645 +#: ../src/interface/resources/xrc/dialogs.xrc:939 +msgid "OS version:" +msgstr "Версия на ОС:" + +#: ../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " "well as the fallback mode if enabled." @@ -5116,253 +5616,294 @@ "На следващите страници ще бъдат настройвани избраните режими на прехвърляне, " "както и режима за отстъпване, ако е включен." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:893 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "Once" msgstr "Веднъж" -#: resources.h:922 +#: ../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "ежедневно" -#: resources.h:923 +#: ../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "ежеседмично" -#: resources.h:612 +#: ../src/interface/sitemanager_dialog.cpp:544 +msgid "Only use plain FTP (insecure)" +msgstr "Използване на обикновен FTP (незащитен)" + +#: ../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "&Файл" + +#: ../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Отваряне на папката във файловия мениджър на системата" -#: resources.h:999 +#: ../src/interface/toolbar.cpp:31 ../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" -msgstr "Отваряне Манипулатор връзки" +msgstr "Отваря Управление на връзки" -#: resources.h:1000 +#: ../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." -msgstr "Отваряне Манипулатор връзки." +msgstr "Отваря Управление на връзки." -#: resources.h:1001 +#: ../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" -"Отваряне на Манипулатор връзки. Щракнете с десен бутон за списък с връзки." +"Отваря на Управление на връзки. Щракнете с десен бутон за списък с връзки." + +#: ../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Отворете диалоговия прозорец за правата за достъп до папките, за да " +"настроите местните папки, до които FileZilla има достъп." -#: resources.h:513 +#: ../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." -msgstr "Отваряне файл" +msgstr "Отваряне файл." -#: resources.h:456 +#: ../src/interface/resources/xrc/menus.xrc:55 msgid "Open the settings dialog of FileZilla" -msgstr "Отваряне на диалога с настройките на FileZilla" +msgstr "Отваря диалога с настройките на FileZilla" -#: resources.h:247 +#: ../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Отворен като:" -#: ../../locales/../src/interface/LocalListView.cpp:1720 -#: ../../locales/../src/interface/LocalListView.cpp:1765 -#: ../../locales/../src/interface/LocalListView.cpp:1850 -#: ../../locales/../src/interface/LocalListView.cpp:1863 -#: ../../locales/../src/interface/RemoteListView.cpp:2413 +#: ../src/interface/edithandler.cpp:1668 ../src/interface/edithandler.cpp:1785 +#: ../src/interface/LocalListView.cpp:1830 +#: ../src/interface/LocalListView.cpp:1843 msgid "Opening failed" msgstr "Неуспешно отваряне" -#: resources.h:444 +#: ../src/interface/resources/xrc/menus.xrc:18 msgid "Opens a new tab" -msgstr "Отваряне на нов подпрозорец" +msgstr "Отваряне на нов раздел" -#: resources.h:441 +#: ../src/interface/resources/xrc/menus.xrc:9 msgid "Opens the Site Manager" -msgstr "Отваря Манипулатор връзки" +msgstr "Отваря Управление на връзки" -#: resources.h:1021 +#: ../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Отваря диалога за филтри на списъка с папки. Щракнете с десния бутон за " "превключване на филтрите." -#: resources.h:133 -msgid "Operating system" -msgstr "Операционна система" - -#: ../../locales/../src/interface/FileZilla.cpp:320 -msgid "Operating system problem detected" -msgstr "Открит е проблем с операционната система" +#: ../src/interface/resources/xrc/dialogs.xrc:931 +msgid "Operating System:" +msgstr "Операционна система:" -#: ../../locales/../src/engine/socket.cpp:1209 +#: ../src/engine/socket.cpp:1070 msgid "Operation already in progress" -msgstr "" +msgstr "Операцията вече е в ход" -#: ../../locales/../src/engine/socket.cpp:1200 -#, fuzzy +#: ../src/engine/socket.cpp:1061 msgid "Operation in progress" -msgstr "Все още се прехвърлят файлове." +msgstr "Операция в ход" -#: ../../locales/../src/engine/socket.cpp:1221 +#: ../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Неподдържана команда" -#: ../../locales/../src/interface/verifycertdialog.cpp:182 +#: ../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Настройки" + +#: ../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "оранжев" + +#: ../src/interface/verifycertdialog.cpp:248 msgid "Organization:" msgstr "Организация:" -#: ../../locales/../src/engine/socket.cpp:1253 +#: ../src/interface/resources/xrc/settings.xrc:681 +msgid "Other SFTP options" +msgstr "Други SFTP настройки" + +#: ../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Друга системна грешка" -#: ../../locales/../src/interface/verifycertdialog.cpp:204 +#: ../src/interface/verifycertdialog.cpp:270 msgid "Other:" msgstr "Друго:" -#: ../../locales/../src/engine/socket.cpp:1204 -#: ../../locales/../src/engine/socket.cpp:1205 +#: ../src/engine/socket.cpp:1065 ../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Недостатъчна памет" -#: resources.h:691 +#: ../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Преглед" -#: resources.h:69 +#: ../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Презапис при по-&нов" -#: resources.h:198 resources.h:208 resources.h:802 resources.h:811 +#: ../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../src/interface/resources/xrc/settings.xrc:1188 +#: ../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Презапис" -#: resources.h:200 resources.h:210 resources.h:804 resources.h:813 +#: ../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../src/interface/resources/xrc/settings.xrc:1190 +#: ../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" -msgstr "Презапис при по-нов източник" +msgstr "Презапис при разлика в размерите" -#: resources.h:201 resources.h:211 resources.h:805 resources.h:814 +#: ../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../src/interface/resources/xrc/settings.xrc:1191 +#: ../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" -msgstr "Презапис при по-нов източник" +msgstr "Презапис при разлика в размерите или по-нов източник" -#: resources.h:199 resources.h:209 resources.h:803 resources.h:812 +#: ../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../src/interface/resources/xrc/settings.xrc:1189 +#: ../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Презапис при по-нов източник" -#: resources.h:70 +#: ../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" -msgstr "Презапис при &различна дължина" +msgstr "Презапис при &различни размери" -#: resources.h:71 +#: ../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Презапис при различна &дължина или по-нов източник" -#: ../../locales/../src/interface/updater.cpp:249 +#: ../src/interface/updater.cpp:253 #, c-format msgid "Own build type: %s\n" -msgstr "" +msgstr "Собствен вид компилация: %s\n" -#: resources.h:95 +#: ../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Права на собственика" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:85 +#: ../src/interface/RemoteListView.cpp:400 ../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "Собственик/Група" -#: resources.h:837 +#: ../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "" -"&Предпазване на системата от влизане в режим на сън по време на трансфери и " +"&Предпазване на системата от влизане в режим на сън по време на пренос и " "други операции" -#: resources.h:743 resources.h:760 -#, no-c-format +#: ../src/interface/resources/xrc/settings.xrc:556 +#: ../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "&Хост:" -#: ../../locales/../src/interface/netconfwizard.cpp:488 +#: ../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." -msgstr "Командата \"PORT\" е променена от маршрутизатор или защитна стена." +msgstr "Командата „PORT“ е променена от маршрутизатор или защитна стена." -#: resources.h:705 +#: ../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" -msgstr "&Пасивен (препоръчителен)" +msgstr "&Пасивен (препоръчително)" -#: ../../locales/../src/interface/Mainfrm.cpp:2516 +#: ../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Параметърът е невалиден URL" -#: ../../locales/../src/interface/updater.cpp:531 +#: ../src/interface/updater.cpp:589 #, c-format msgid "Parsing %d bytes of version information.\n" -msgstr "" +msgstr "Разбор на %d байта от информацията за изданието.\n" -#: resources.h:321 resources.h:683 resources.h:968 +#: ../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "П&арола:" -#: resources.h:641 +#: ../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" msgstr "&Пасивен (препоръчително)" -#: resources.h:725 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 +#: ../src/interface/resources/xrc/settings.xrc:410 +#: ../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Пасивен режим" -#: ../../locales/../src/interface/netconfwizard.cpp:588 -#: ../../locales/../src/interface/netconfwizard.cpp:601 -#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../src/interface/netconfwizard.cpp:610 +#: ../src/interface/netconfwizard.cpp:623 +#: ../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." -msgstr "" -"Пасивния режим беше установен като режим на прехвърляне по подразбиране." +msgstr "Пасивният режим беше установен като стандартен режим на прехвърляне." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../src/engine/storj/connect.cpp:82 ../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Няма избрана парола или ключ за шифроване" + +#: ../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Необходима парола" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:80 +#: ../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Пароли" + +#: ../src/interface/filter_conditions_dialog.cpp:117 +#: ../src/interface/search.cpp:155 msgid "Path" msgstr "Пътека" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3229 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2360 +#: ../src/engine/ftp/rmd.cpp:40 ../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Път име не може да бъде съставено от папката %s и подпапката %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2469 +#: ../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Пътят не е намерен:" -#: resources.h:339 +#: ../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Пътища" -#: ../../locales/../src/interface/edithandler.cpp:1145 -#: ../../locales/../src/interface/edithandler.cpp:1288 -#: ../../locales/../src/interface/edithandler.cpp:1387 -#: ../../locales/../src/interface/edithandler.cpp:1400 +#: ../src/interface/edithandler.cpp:1163 ../src/interface/edithandler.cpp:1300 +#: ../src/interface/edithandler.cpp:1390 ../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Чака премахване" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Права" -#: ../../locales/../src/engine/socket.cpp:1197 -#: ../../locales/../src/engine/socket.cpp:1206 +#: ../src/engine/socket.cpp:1058 ../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Недостатъчни права" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:84 +#: ../src/interface/RemoteListView.cpp:399 ../src/interface/search.cpp:159 msgid "Permissions" msgstr "Права" -#: resources.h:132 +#: ../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Платформа:" -#: ../../locales/../src/interface/netconfwizard.cpp:553 +#: ../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" +"Моля, отново добавете местните папки, с които желаете да използвате " +"FileZilla." + +#: ../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5370,7 +5911,15 @@ "Моля, проверете на https://filezilla-project.org/probe.php дали сървърът " "работи и внимателно огледайте отново настройките си." -#: resources.h:647 +#: ../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Моля, проверете правата и добавете липсващите местни папки, с които работите " +"в следващия диалогов прозорец." + +#: ../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." @@ -5378,13 +5927,13 @@ "Моля, настройте всички маршрутизатори и защитни стени по такъв начин, че " "FileZilla да може да установява изходящи връзки към произволни портове." -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" -"Моля, изключете настройки на маршрутизатора си от рода на \"режим DMZ\" или " -"\"режим за игри\"." +"Моля, изключете настройки на маршрутизатора си от рода на „режим DMZ“ или " +"„режим за игри“." -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5392,110 +5941,100 @@ "Моля, потвърдете че има стабилна връзка с Интернет и внимателно проверете " "настройките си." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 +#: ../src/interface/settings/optionspage_dateformatting.cpp:72 msgid "Please enter a custom date format." msgstr "Моля, въведете формат за датата." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 +#: ../src/interface/settings/optionspage_dateformatting.cpp:82 msgid "Please enter a custom time format." msgstr "Моля, въведете формат за времето." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:742 +#: ../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." -msgstr "Моля въведете дата във формат ГГГГ-ММ-ДД, например 2010-07-18." +msgstr "Моля, въведете дата във формат ГГГГ-ММ-ДД, например 2010-07-18." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:119 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../src/interface/speedlimits_dialog.cpp:64 +#: ../src/interface/settings/optionspage_transfer.cpp:123 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" "Моля, въведете ограничение на скоростта за изтегляне по-голямо или равно на " "0 %s/с." -#: ../../locales/../src/interface/filteredit.cpp:136 +#: ../src/interface/filteredit.cpp:136 msgid "Please enter a name for the new filter." -msgstr "Моля, въведете името на новия филтър:" +msgstr "Моля, въведете името на новия филтър." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Моля, въведете ново име на копирания филтър." -#: ../../locales/../src/interface/filter.cpp:403 +#: ../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" -msgstr "Моля, въведете ново име за набора филтри \"%s\"" +msgstr "Моля, въведете ново име за набора от филтри „%s“" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Моля, въведете ново име за филтъра." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:108 +#: ../src/interface/settings/optionspage_transfer.cpp:112 msgid "" "Please enter a number between 0 and 10 for the number of concurrent " "downloads." msgstr "" "Моля, въведете число между 0 и 10 за максимален брой паралелни изтегляния." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:113 +#: ../src/interface/settings/optionspage_transfer.cpp:117 msgid "" "Please enter a number between 0 and 10 for the number of concurrent uploads." msgstr "" "Моля, въведете число между 0 и 10 за максимален брой паралелни качвания." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:103 +#: ../src/interface/settings/optionspage_transfer.cpp:107 msgid "" "Please enter a number between 1 and 10 for the number of concurrent " "transfers." msgstr "" "Моля, въведете число между 1 и 10 за максимален брой паралелни прехвърляния." -#: resources.h:81 +#: ../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Моля, въведете парола за този сървър:" -#: ../../locales/../src/interface/QueueView.cpp:2255 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Моля, въведете път и изпълним файл за стартиране.\n" -"Пример: \\somePath\\file.exe под MS Windows или /somePath/file под Unix.\n" -"Възможно е и да укажете и аргументи за програмата." - -#: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 +#: ../src/interface/settings/optionspage_connection.cpp:46 msgid "" -"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts." +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -"Моля, въведете продължителност на изчакване между 5 и 9999 секунди или 0 за " +"Моля, въведете продължителност на изчакване между 10 и 9999 секунди или 0 за " "неограничено изчакване." -#: ../../locales/../src/interface/filter.cpp:343 +#: ../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Моля, въведете уникално име за този набор от филтри" -#: resources.h:82 +#: ../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Моля, въведете потребителско име за този сървър:" -#: ../../locales/../src/interface/netconfwizard.cpp:182 +#: ../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Моля, въведете валиден обхват от портове." -#: ../../locales/../src/interface/netconfwizard.cpp:161 +#: ../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Моля, въведете URL, от който може да се извлече вашия външен адрес" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:126 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../src/interface/speedlimits_dialog.cpp:72 +#: ../src/interface/settings/optionspage_transfer.cpp:130 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" -"Моля, въведете ограничение на скоростта за качване по-голямо или равно на 0 %" -"s/с." +"Моля, въведете ограничение на скоростта за качване по-голямо или равно на 0 " +"%s/с." -#: ../../locales/../src/interface/Mainfrm.cpp:550 +#: ../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5503,27 +6042,48 @@ "Моля, въведете директна FTP команда.\n" "Използването на директни FTP команди ще изчисти кеш-паметта за папки." -#: ../../locales/../src/interface/LocalListView.cpp:928 -#: ../../locales/../src/interface/LocalTreeView.cpp:1190 -#: ../../locales/../src/interface/RemoteListView.cpp:1359 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1322 +#: ../src/interface/QueueView.cpp:1867 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Моля, въведете пълен път към програма и нейните аргументи. Тази команда ще " +"бъде изпълнена след приключване на обработката на опашката.\n" +"Пример: \\somePath\\file.exe под MS Windows или /somePath/file под Unix.\n" +"Трябва надлежно да поставите в кавички пътя и аргументите ако съдържат " +"интервали." + +#: ../src/interface/LocalTreeView.cpp:1181 +#: ../src/interface/RemoteListView.cpp:1327 +#: ../src/interface/LocalListView.cpp:954 +#: ../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Въведете име на папката:" -#: ../../locales/../src/interface/RemoteListView.cpp:2892 +#: ../src/interface/RemoteListView.cpp:2668 msgid "Please enter the name of the file which should be created:" msgstr "Въведете име на файла, който да бъде създаден:" -#: resources.h:83 +#: ../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Моля, въведете потребителско име и парола за този сървър:" -#: ../../locales/../src/interface/netconfwizard.cpp:142 +#: ../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Моля, въведете главната парола, за да бъде разшифрована паролата за този " +"сървър:" + +#: ../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Моля, въведете вашия външен адрес" -#: ../../locales/../src/interface/netconfwizard.cpp:593 -#: ../../locales/../src/interface/netconfwizard.cpp:606 +#: ../src/interface/netconfwizard.cpp:615 +#: ../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5533,7 +6093,14 @@ "съветник. Ако имате динамичен адрес или не знаете външния си адрес, " "използвайте опцията за външна услуга за имена." -#: resources.h:634 +#: ../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Моля, въведете главната парола, за да бъде разшифрована паролата за този " +"сървър:" + +#: ../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." @@ -5541,7 +6108,7 @@ "Моля, следвайте внимателно инструкциите, тъй като грешни настройки биха " "попречили на FTP връзките." -#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5549,23 +6116,24 @@ "Моля, проверете дали на FileZilla е разрешено да установява изходящи връзки " "и се уверете, че адреса на сървъра за имена е въведен правилно." -#: ../../locales/../src/interface/FileZilla.cpp:215 +#: ../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "Уверете се, че исканият локал е инсталиран на вашата система." -#: ../../locales/../src/interface/netconfwizard.cpp:594 +#: ../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " "manual port forwarding. Don't run your router in the so called 'DMZ mode' or " "'game mode'." msgstr "" -"Моля, проверете дали вашият маршрутизатор използва най-новият наличен " -"фърмуер. Освен това той трябва да е настроен правилно. Трябва да настроите " -"ръчно пренасочванията на портовете. Не настройвайте маршрутизатора си да " -"работи в така наречените \"режим DMZ\" или \"режим за игри\"." +"Моля, проверете дали вашият маршрутизатор използва най-новото налична " +"издание на вътрешната памет. Освен това той трябва да е настроен правилно. " +"Трябва да настроите ръчно пренасочванията на портовете. Не настройвайте " +"маршрутизатора си да работи в така наречените „режим DMZ“ или „режим за " +"игри“." -#: resources.h:648 +#: ../src/interface/resources/xrc/netconfwizard.xrc:131 msgid "" "Please note that FileZilla has no influence on the port the server chooses. " "So the server might choose a port which your firewall thinks is only used by " @@ -5577,15 +6145,16 @@ "смята, че се използва само от вредни програми. Това може да предизвика " "фалшива тревога, която вие може спокойно да пренебрегнете." -#: ../../locales/../src/interface/Mainfrm.cpp:697 +#: ../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." msgstr "" -"Моля отбележете, че запазване на времената при качване на FTP, FTPS и FTPES " -"сървъри работи само ако те поддържат командата MFMT." +"Моля, отбележете, че запазване на времевите маркери при качване на файлове " +"на сървъри от вида FTP, FTPS и FTPES ще работи само ако те поддържат " +"командата MFMT." -#: resources.h:702 +#: ../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5593,7 +6162,7 @@ "Моля, забележете, че някои сървъри може да спрат да ви допускат, ако се " "опитвате да свържете с тях твърде често или през твърде кратък интервал." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5602,42 +6171,50 @@ "Моля, стартирайте отново този съветник в случай, че смените мрежовите си " "настройки или имате проблеми със сървъри, които преди са работели." -#: resources.h:394 +#: ../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Моля, запазете този ключ на сигурно място. Без верния ключ няма да имате " +"достъп до вашите качени файлове." + +#: ../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Изберете действие:" -#: resources.h:240 +#: ../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Моля, изберете категориите, които да бъдат импортирани." -#: resources.h:636 +#: ../src/interface/resources/xrc/netconfwizard.xrc:34 msgid "Please select the default transfer mode you would like to use." -msgstr "Моля, изберете желаният режим на прехвърляне по подразбиране." +msgstr "Моля, изберете желания стандартен режим на прехвърляне." -#: ../../locales/../src/interface/chmoddialog.cpp:51 +#: ../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." -msgstr "Моля, изберете новите атрибути на папката \"%s\"." +msgstr "Моля, изберете новите атрибути на папката „%s“." -#: ../../locales/../src/interface/chmoddialog.cpp:40 +#: ../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." -msgstr "Моля, изберете новите атрибути на файла \"%s\"." +msgstr "Моля, изберете новите атрибути на файла „%s“." -#: ../../locales/../src/interface/chmoddialog.cpp:54 +#: ../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Моля, изберете новите атрибути на избраните папки." -#: ../../locales/../src/interface/chmoddialog.cpp:57 +#: ../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "Моля, изберете новите атрибути на избраните файлове и папки." -#: ../../locales/../src/interface/chmoddialog.cpp:43 +#: ../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Моля, изберете новите атрибути на избраните файлове." -#: ../../locales/../src/interface/netconfwizard.cpp:581 +#: ../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5645,206 +6222,237 @@ "called 'DMZ mode' or 'game mode'. Things like protocol inspection or " "protocol specific 'fixups' have to be disabled" msgstr "" -"Моля, обновете вашата защитна стена и се уверете, че вашия маршрутизатор " -"използва най-новият фърмуер. Освен това, вашият маршрутизатор трябва да е " -"конфигуриран правилно. Ще трябва да настроите ръчно пренасочванията на " -"портовете. Не оставяйте своя маршрутизатор в т. нар. \"режим DMZ\" или " -"\"режим за игри\". Неща като \"инспекция на протокола\" или специфични " -"\"поправки\" трябва да бъдат изключени" +"Моля, обновете вашата защитна стена и се уверете, че вашият маршрутизатор " +"използва най-новото налично издание на вътрешната памет. Освен това, вашият " +"маршрутизатор трябва да е настроен правилно. Ще трябва да настроите ръчно " +"пренасочванията на портовете. Не оставяйте своя маршрутизатор в т. нар. " +"„режим DMZ“ или „режим за игри“. Неща като „проверяване на протокола“ или " +"специфични „поправки“ трябва да бъдат изключени" -#: resources.h:829 +#: ../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" -msgstr "&Разположение" +msgstr "&Разположение:" -#: ../../locales/../src/interface/verifycertdialog.cpp:189 -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../src/interface/verifycertdialog.cpp:255 +#: ../src/interface/verifycertdialog.cpp:256 msgid "Postal code:" msgstr "Пощенски код:" -#: ../../locales/../src/interface/sitemanager.cpp:280 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1823 +#: ../src/interface/resources/xrc/settings.xrc:1032 +msgid "Pre&allocate space before downloading" +msgstr "&Заделяне на дисково пространство преди изтегляне" + +#: ../src/interface/resources/xrc/settings.xrc:1028 +msgid "Preallocation" +msgstr "Заделяне" + +#: ../src/interface/sitemanager.cpp:341 +#: ../src/interface/sitemanager_dialog.cpp:2120 msgid "Predefined Sites" msgstr "Предварително определени връзки" -#: ../../locales/../src/interface/Mainfrm.cpp:696 +#: ../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" -msgstr "Запазване времената на файловете" +msgstr "Запазване на времевите маркери на файлове" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Преглед:" +#: ../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Преглед" -#: ../../locales/../src/engine/tlssocket.cpp:1109 +#: ../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Сертификатите на основната връзка и на връзката за данни не съвпадат." -#: ../../locales/../src/interface/cmdline.cpp:19 +#: ../src/interface/cmdline.cpp:19 msgid "Print diagnostic information related to startup of FileZilla" msgstr "" "Показване на диагностична информация, свързана със стартирането на FileZilla" -#: ../../locales/../src/interface/cmdline.cpp:18 +#: ../src/interface/cmdline.cpp:18 msgid "Print version information to stdout and exit" -msgstr "Изпращане на информация за версията към stdout и изход" +msgstr "Изпращане на информация за изданието към stdout и излизане" -#: resources.h:880 +#: ../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" -msgstr "Папките - с приоритет (по подразбиране)" +msgstr "Папките - с приоритет (стандартно)" -#: ../../locales/../src/interface/queue.cpp:1198 +#: ../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Приоритет" -#: resources.h:930 +#: ../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." msgstr "" -"Защита на личните данни: Единствено версиите на FileZilla, операционната " +"Защита на личните данни: Единствено изданието на FileZilla, операционната " "система и архитектурата на процесора ще бъдат изпратени към сървъра." -#: resources.h:749 +#: ../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "&Частни ключове:" -#: resources.h:964 +#: ../src/interface/resources/xrc/sitemanager.xrc:127 msgid "Pro&tocol:" -msgstr "&Протокол:" +msgstr "П&ротокол:" -#: resources.h:745 resources.h:763 +#: ../src/interface/resources/xrc/settings.xrc:579 +#: ../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "П&арола:" -#: resources.h:474 resources.h:547 +#: ../src/interface/resources/xrc/menus.xrc:133 +#: ../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" -msgstr "&Обработка на опашката" +msgstr "&Обработване на опашката" -#: ../../locales/../src/engine/socket.cpp:1202 +#: ../src/engine/socket.cpp:1063 msgid "Process file table overflow" -msgstr "" +msgstr "Препълване на таблицата на файла на процеса" + +#. @translator: Example: Processed 5 files in 1 directory +#: ../src/interface/recursive_operation_status.cpp:122 +#, c-format +msgid "Processed %s in %s." +msgstr "Обработени %s от %s." -#: ../../locales/../src/engine/socket.cpp:1207 +#: ../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Неподдържан протокол" -#: ../../locales/../src/engine/socket.cpp:1260 +#: ../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" -msgstr "Протокол, неподдържан от този тип сокет" +msgstr "Протокол, неподдържан от този вид сокет" -#: resources.h:19 resources.h:48 +#: ../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Протокол:" -#: resources.h:761 +#: ../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "&Прокси порт:" -#: resources.h:744 resources.h:762 +#: ../src/interface/resources/xrc/settings.xrc:569 +#: ../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "По&требител:" -#: ../../locales/../src/engine/proxy.cpp:509 +#: ../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" -msgstr "Неуспешно удостоверяване пред прокси." +msgstr "Неуспешно удостоверяване пред прокси" -#: ../../locales/../src/engine/transfersocket.cpp:132 -#: ../../locales/../src/engine/transfersocket.cpp:145 +#: ../src/engine/ftp/transfersocket.cpp:103 +#: ../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Неуспешно приветствие от прокси: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419 +#: ../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." -msgstr "Хостът на проксито започва с \"[\", но липсва затварящата скоба." +msgstr "Хостът на проксито започва с „[“, но липсва затварящата скоба." -#: ../../locales/../src/engine/proxy.cpp:343 +#: ../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Прокси отговор: %s" -#: ../../locales/../src/engine/proxy.cpp:407 -#: ../../locales/../src/engine/proxy.cpp:552 +#: ../src/engine/proxy.cpp:520 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Неуспешно запитване към прокси. Отговорът е: %s" + +#: ../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Неуспешно запитване към прокси: %s" -#: ../../locales/../src/engine/proxy.cpp:574 +#: ../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Запитване на прокси неуспешно: Неизвестен вид на адрес в CONNECT отговор" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4452 +#: ../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Има определено прокси, но хоста или порта са невалидни" -#: resources.h:747 +#: ../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Удостоверяване с публичен ключ" -#: resources.h:8 resources.h:37 +#: ../src/interface/resources/xrc/certificate.xrc:73 msgid "Public key algorithm:" msgstr "Алгоритъм на публичния ключ:" -#: resources.h:103 +#: ../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Публични права" -#: ../../locales/../src/interface/QueueView.cpp:3227 +#: ../src/interface/QueueView.cpp:2773 msgid "Queue has been fully processed" msgstr "Опашката обработена" -#: ../../locales/../src/interface/statusbar.cpp:426 +#: ../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Опашка: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:356 +#: ../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Опашка: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:352 -#: ../../locales/../src/interface/statusbar.cpp:417 +#: ../src/interface/statusbar.cpp:370 ../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Опашка: празна" -#: ../../locales/../src/interface/QueueView.cpp:460 +#: ../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Опашка" -#: resources.h:386 +#: ../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Опашка:" -#: resources.h:563 -msgid "R&eboot system" -msgstr "&Презареждане на системата" +#: ../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Бързо търсене:" + +#: ../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Не може да отворите бързото търсене докато се сравняват папките." + +#: ../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "&Рестартиране на системата веднъж" -#: resources.h:471 +#: ../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "О&тдалечени папки" -#: resources.h:580 resources.h:584 +#: ../src/interface/resources/xrc/menus.xrc:469 +#: ../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "Ану&лиране и връщане в опашката избраните" -#: ../../locales/../src/interface/Mainfrm.cpp:566 +#: ../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Оригинална команда на FTP" -#: resources.h:100 +#: ../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Ч&етене" -#: resources.h:520 resources.h:538 +#: ../src/interface/resources/xrc/menus.xrc:276 +#: ../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "&Опресняване" -#: resources.h:73 +#: ../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Преи&менуване" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -5852,20 +6460,19 @@ "Пуснете още веднъж съветника, внимателно проверете настройките, " "конфигурирайте всички маршрутизатори и защитни стени спрямо тях." -#: resources.h:104 +#: ../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Че&тене" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Само четим" -#: ../../locales/../src/interface/Mainfrm.cpp:1087 +#: ../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Наистина ли желаете да прекъснете текущата операция?" -#: ../../locales/../src/interface/RemoteListView.cpp:1452 -#: ../../locales/../src/interface/search.cpp:718 +#: ../src/interface/RemoteListView.cpp:1421 ../src/interface/search.cpp:1235 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -5875,264 +6482,303 @@ msgstr[1] "" "Наистина ли да бъдат изтрити %d папки и тяхното съдържание от сървъра?" -#: ../../locales/../src/interface/RemoteListView.cpp:1450 -#: ../../locales/../src/interface/search.cpp:716 +#: ../src/interface/RemoteListView.cpp:1418 ../src/interface/search.cpp:1232 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Наистина ли да бъде изтрит %d файл от сървъра?" msgstr[1] "Наистина ли да бъдат изтрити %d файла от сървъра?" -#: ../../locales/../src/interface/RemoteListView.cpp:1457 -#: ../../locales/../src/interface/search.cpp:723 +#: ../src/interface/RemoteListView.cpp:1426 ../src/interface/search.cpp:1240 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Наистина ли да бъдат изтрити %s и %s от сървъра?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1138 +#: ../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Наистина ли желаете да изтриете всички избрани файлове и/или папки от " "сървъра?" -#: ../../locales/../src/engine/local_filesys.cpp:135 +#: ../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "Наистина ли желаете да изтриете всички избрани файлове и/или папки от вашия " "компютър?" -#: ../../locales/../src/interface/queue.cpp:1198 +#: ../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Причина" -#: ../../locales/../src/interface/QueueView.cpp:3220 +#: ../src/interface/QueueView.cpp:2766 msgid "Reboot now" msgstr "Рестартиране" -#: resources.h:109 +#: ../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "О&бхождане на подпапките" -#: ../../locales/../src/engine/directorylistingparser.cpp:3054 +#: ../src/engine/tlssocket_impl.cpp:329 +#, c-format +msgid "Received TLS alert from the server: %s (%d)" +msgstr "Получено предупреждение за TLS от сървър: %s (%d)" + +#: ../src/engine/directorylistingparser.cpp:3078 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Получен е опис на папката, който изглежда е кодиран като EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:2061 -#: ../../locales/../src/engine/directorylistingparser.cpp:2076 +#: ../src/engine/directorylistingparser.cpp:2060 +#: ../src/engine/directorylistingparser.cpp:2077 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Получен ред превишаващ 10000 знака, прекратяване." -#: ../../locales/../src/interface/netconfwizard.cpp:1004 -#: ../../locales/../src/interface/netconfwizard.cpp:1013 -#: ../../locales/../src/interface/netconfwizard.cpp:1037 +#: ../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Получената верига от сертификати не може да бъде проверена. Състоянието на " +"проверката е %d." + +#: ../src/interface/netconfwizard.cpp:1014 +#: ../src/interface/netconfwizard.cpp:1022 +#: ../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Получените данни са замърсени" -#: ../../locales/../src/interface/updater.cpp:510 -#, fuzzy +#: ../src/interface/updater.cpp:568 msgid "Received invalid character in version information" -msgstr "Замяна на &невалидните знаци с:" +msgstr "Получен е невалиден символ в информацията за изданието" -#: ../../locales/../src/interface/updater.cpp:503 +#: ../src/engine/tlssocket_impl.cpp:332 +#, c-format +msgid "Received unknown TLS alert %d from the server" +msgstr "Получен е неизвестен TLS сигнал %d от сървъра" + +#: ../src/interface/updater.cpp:561 msgid "Received version information is too large" -msgstr "Получената информация за версията е твърде много" +msgstr "Получената информация за изданието е твърде много" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." msgstr "" -"Информацията за повторно свързване не може да бъде изчистена, докато сте " -"свързани кум сървър.\n" +"Информацията за повторно свързване не може да бъде изчистена, докато има " +"активна връзка.\n" "Ако продължите, връзката ще бъде прекъсната." -#: resources.h:703 +#: ../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Настройки на повторното свързване" -#: resources.h:1018 resources.h:1019 +#: ../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Повторно свързване с последно използвания сървър" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:674 +#: ../src/interface/recursive_operation_status.cpp:100 +msgid "Recursively adding files to queue." +msgstr "Рекурсивно добавяне на файлове в опашката." + +#: ../src/interface/recursive_operation_status.cpp:106 +msgid "Recursively changing permissions." +msgstr "Рекурсивна смяна на права." + +#: ../src/interface/recursive_operation_status.cpp:103 +msgid "Recursively deleting files and directories." +msgstr "Рекурсивно изтриване на файлове и папки." + +#: ../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "червен" + +#: ../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Препращане към невалиден или неподдържан URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:681 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:688 +#: ../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Препращане към невалиден или неподдържан адрес: %s" -#: resources.h:1010 resources.h:1011 +#: ../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Опресняване списък с файлове и папки" -#: resources.h:435 +#: ../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Запомняне на пароли?" -#: ../../locales/../src/interface/edithandler.cpp:1129 +#: ../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Отдалечен" -#: ../../locales/../src/engine/tlssocket.cpp:900 +#: ../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Отдалечения сертификат не е доверен." -#: resources.h:305 ../../locales/../src/interface/queue.cpp:1198 +#: ../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Отдалечен файл" -#: resources.h:378 ../../locales/../src/interface/search.cpp:369 -#: ../../locales/../src/interface/search.cpp:375 -#: ../../locales/../src/interface/search.cpp:385 -#: ../../locales/../src/interface/search.cpp:391 +#: ../src/interface/search.cpp:708 ../src/interface/search.cpp:713 msgid "Remote file search" -msgstr "Търсене на отдалечен файл" +msgstr "Търсене на отдалечени файлове" -#: resources.h:168 +#: ../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Отдалечени филтри:" -#: ../../locales/../src/interface/edithandler.cpp:1120 +#: ../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Отдалечен път" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:424 +#: ../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the current site's servertype (%s)." msgstr "" "Отдалеченият път не може да бъде разпознат. Уверете се, че е валиден " -"абсолютен път и поддържан от избрания тип сървър (%s)." +"абсолютен път и поддържан от избрания вид сървър (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1090 +#: ../src/interface/sitemanager_dialog.cpp:1177 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the servertype (%s) selected on the parent site." msgstr "" "Отдалеченият път не може да бъде разпознат. Уверете се, че е валиден " -"абсолютен път и поддържан от избрания тип сървър (%s) избран от майчината " +"абсолютен път и поддържан от избрания вид сървър (%s) избран от майчината " "връзка." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:426 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:430 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1092 +#: ../src/interface/bookmarks_dialog.cpp:445 +#: ../src/interface/bookmarks_dialog.cpp:450 +#: ../src/interface/sitemanager_dialog.cpp:1180 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Отдалеченият път не може да бъде разпознат. Уверете се, че е валиден " "абсолютен път." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Отдалеченият път не може да бъде разпознат." -#: resources.h:383 +#: ../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" -msgstr "Манипулиране на отдалечения път:" +msgstr "Промяна на отдалечения път:" -#: resources.h:251 +#: ../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Отдалечен път:" -#: ../../locales/../src/interface/viewheader.cpp:564 +#: ../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Отдалечени:" -#: resources.h:577 resources.h:581 +#: ../src/interface/resources/xrc/menus.xrc:459 +#: ../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "&Изчистване" -#: resources.h:579 resources.h:583 +#: ../src/interface/resources/xrc/menus.xrc:466 +#: ../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Изтрива&не" -#: resources.h:203 resources.h:213 resources.h:807 resources.h:816 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:256 +#: ../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../src/interface/resources/xrc/settings.xrc:1193 +#: ../src/interface/resources/xrc/settings.xrc:1214 +#: ../src/interface/asyncrequestqueue.cpp:304 msgid "Rename file" msgstr "Преименуване" -#: resources.h:597 resources.h:620 +#: ../src/interface/resources/xrc/menus.xrc:525 +#: ../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Преименуване избраната папка" -#: resources.h:524 resources.h:542 +#: ../src/interface/resources/xrc/menus.xrc:285 +#: ../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Преименуване избраните файлове и папки" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3575 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2562 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:595 #, c-format msgid "Renaming '%s' to '%s'" -msgstr "Преименуване от \"%s\" на \"%s\"" +msgstr "Преименуване от „%s“ на „%s“" + +#: ../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Повтаряне на паролата:" -#: resources.h:410 +#: ../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Докладване на дефект или искане за функционалност" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Заявката е отхвърлена - клиента няма работещ identd (или е недостъпен от " "сървъра)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Заявката е отхвърлена - identd на клиента не може да потвърди идентификацията" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Заявката е отхвърлена или провалена" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:515 +#: ../src/interface/sitemanager_dialog.cpp:542 msgid "Require explicit FTP over TLS" msgstr "Изискване на FTP през явен TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 +#: ../src/interface/sitemanager_dialog.cpp:543 msgid "Require implicit FTP over TLS" msgstr "Изискване на FTP през скрит TLS" -#: resources.h:582 +#: ../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Анулиране и &връщане в опашката на всички" -#: ../../locales/../src/engine/socket.cpp:1248 -#, fuzzy +#: ../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" -msgstr "Неизвестна версия на SOCKS протокола: %d" +msgstr "Полученият протокол е неизвестен" -#: ../../locales/../src/engine/ControlSocket.cpp:1170 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:482 +#: ../src/engine/ControlSocket.cpp:1081 #, c-format msgid "Resolving address of %s" msgstr "Запитване за адреса на %s" -#: ../../locales/../src/engine/socket.cpp:1208 +#: ../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Временно недостъпен ресурс" -#: ../../locales/../src/engine/logging.cpp:125 -#: ../../locales/../src/interface/netconfwizard.cpp:395 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:349 +#: ../src/engine/logging.cpp:115 ../src/interface/StatusView.cpp:289 +#: ../src/interface/StatusView.cpp:357 ../src/interface/netconfwizard.cpp:421 msgid "Response:" msgstr "Отговор:" -#: resources.h:377 +#: ../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Резултати:" -#: resources.h:202 resources.h:212 resources.h:806 resources.h:815 +#: ../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../src/interface/resources/xrc/settings.xrc:1192 +#: ../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" -msgstr "Подновяване на трансфер" +msgstr "Подновяване на пренос" -#: resources.h:821 +#: ../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6140,331 +6786,353 @@ "Подновяването на ASCII файлове може да предизвика проблеми ако сървъра и " "клиента използват различни знаци за край на ред." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1327 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:961 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../src/engine/storj/storjcontrolsocket.cpp:67 +#, c-format +msgid "Retrieving directory listing of \"%s\"..." +msgstr "Извличане на съдържанието от „%s“…" + +#: ../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." -msgstr "Разлистване папка..." +msgstr "Разлистване папка…" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3960 -#: ../../locales/../src/interface/netconfwizard.cpp:707 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Получаване на външен IP адрес от %s" -#: ../../locales/../src/engine/tlssocket.cpp:1090 -msgid "Root certificate is not trusted" -msgstr "Кореновият сертификат е недоверен" - -#: resources.h:449 +#: ../src/interface/resources/xrc/menus.xrc:34 msgid "S&how files currently being edited..." -msgstr "&Отворени за редакция файлове..." +msgstr "&Отворени за редакция файлове…" -#: resources.h:838 +#: ../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" -msgstr "Показване на &Манипулатор връзки при зареждане" +msgstr "Показване на Упр&авление на връзки при зареждане" -#: resources.h:564 -msgid "S&hutdown system" +#: ../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" msgstr "&Изключване на системата" -#: resources.h:375 +#: ../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "&Стоп" -#: resources.h:565 -msgid "S&uspend system" -msgstr "&Изключване на системата" +#: ../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "&Изключване на системата веднъж" -#: resources.h:465 +#: ../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "С&инхронизирано разлистване" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 +#: ../src/interface/settings/settingsdialog.cpp:97 msgid "SFTP" msgstr "SFTP" -#: resources.h:758 +#: ../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Поддръжка на SFTP" + +#: ../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:144 +#: ../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 проксито ще се свързва към: %s" -#: resources.h:128 +#: ../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "SOCKS5 не поддържа потребителски имена и пароли по-дълги от 255 знака." + +#: ../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:852 +#: ../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Запазване на паролите защитени чрез &главна парола" + +#: ../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "&Запазване на пароли" + +#: ../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Запис на настройките?" -#: ../../locales/../src/interface/manual_transfer.cpp:455 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:963 +#: ../src/interface/manual_transfer.cpp:429 +#: ../src/interface/sitemanager_dialog.cpp:1009 msgid "Saving of password has been disabled by your system administrator." msgstr "Запазването на пароли е изключено от системният администратор." -#: ../../locales/../src/interface/manual_transfer.cpp:457 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:965 +#: ../src/interface/manual_transfer.cpp:432 +#: ../src/interface/sitemanager_dialog.cpp:1012 msgid "Saving of passwords has been disabled by you." msgstr "Запазването на пароли е изключено от вас." -#: ../../locales/../src/interface/QueueView.cpp:1836 -msgid "Scanning for files to add to queue" -msgstr "Търсене файлове за добавяне в опашката" - -#: ../../locales/../src/interface/QueueView.cpp:1838 -msgid "Scanning for files to upload" -msgstr "Преглеждане за файлове за качване" +#: ../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Мащабиране:" -#: resources.h:371 +#: ../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "&Условия за търсене:" -#: resources.h:369 +#: ../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Търсене в &папка:" -#: resources.h:1026 +#: ../src/interface/toolbar.cpp:53 msgid "Search for files recursively." -msgstr "Рекурсивно търсене на файлове" +msgstr "Рекурсивно търсене на файлове." -#: resources.h:490 +#: ../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" -msgstr "Претърсване на сървър за файлове, които удовлетворяват:" +msgstr "Претърсване на сървър за файлове, които удовлетворяват" -#: ../../locales/../src/interface/statusbar.cpp:495 +#: ../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Търсене в:" + +#: ../src/interface/statusbar.cpp:514 msgid "Security information" msgstr "Информация за защитата" -#: ../../locales/../src/interface/netconfwizard.cpp:564 -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../src/interface/netconfwizard.cpp:585 +#: ../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "Прочетете повече на: https://wiki.filezilla-project.org/Network_Configuration" -#: resources.h:313 +#: ../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Избор на &сървър" -#: resources.h:688 +#: ../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Избор на &страница:" -#: resources.h:845 +#: ../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Избор на тема" -#: resources.h:799 +#: ../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" -"Изберете действие по подразбиране в случай, че целевият файл при прехвърляне " -"вече съществува." +"Изберете стандартно действие в случай, че при прехвърляне целевият файл вече " +"съществува." -#: ../../locales/../src/interface/edithandler.cpp:1590 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 +#: ../src/interface/settings/optionspage_edit.cpp:104 +#: ../src/interface/edithandler.cpp:1583 msgid "Select default editor" -msgstr "Избор на редактор по подразбиране" +msgstr "Избиране на стандартен редактор" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." msgstr "" -"Изберете действие по подразбиране в случай, че целевият файл при прехвърляне " -"вече съществува. Изборът е валиден само за текущата сесия." +"Изберете стандартно действие в случай, че целевият файл при прехвърляне вече " +"съществува. Изборът е валиден само за текущата сесия." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." msgstr "" -"Изберете действие по подразбиране в случай, че файлът вече съществува, " -"валидно само за избраните файлове на опашката." +"Изберете стандартно действие в случай, че файлът вече съществува, валидно " +"само за избраните файлове на опашката." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Изберете файл с частен ключ" -#: ../../locales/../src/interface/export.cpp:38 +#: ../src/interface/export.cpp:48 msgid "Select file for exported data" -msgstr "Изберете файл за експортиране на данни" +msgstr "Изберете файл, в който да бъдат изнесени данните" + +#: ../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Изберете файл, в който да бъдат изнесени филтрите" -#: ../../locales/../src/interface/export.cpp:34 +#: ../src/interface/export.cpp:39 ../src/interface/queue.cpp:1500 msgid "Select file for exported queue" -msgstr "Изберете файл за експортиране на опашката" +msgstr "Изберете файл, в който да бъде изнесена опашката" -#: ../../locales/../src/interface/export.cpp:36 +#: ../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Изберете файл за експортираните настройки" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2153 +#: ../src/interface/export.cpp:36 ../src/interface/sitemanager_dialog.cpp:2464 msgid "Select file for exported sites" -msgstr "Изберете файл за експортиране на връзките" +msgstr "Изберете файл, в който да бъдат изнесени връзките" -#: ../../locales/../src/interface/import.cpp:16 +#: ../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Изберете файл, от който да бъдат импортирани настройки" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Изберете файлове за качване" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" -msgstr "Изберете име за конвертирания файл-ключ" +#: ../src/interface/fzputtygen_interface.cpp:115 +msgid "Select filename for converted key file" +msgstr "Изберете име за преобразувания файл-ключ" -#: resources.h:359 -#, no-c-format +#: ../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Изберете как тези файлове трябва да бъдат отворени." -#: ../../locales/../src/interface/search.cpp:498 +#: ../src/interface/search.cpp:892 msgid "Select target download directory" msgstr "Избор на целева папка" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Избор на целеви файл" -#: resources.h:229 +#: ../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Изберете категориите, които да бъдат експортирани:" -#: resources.h:220 +#: ../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." -msgstr "Изберете данните, които искате да заличите" +msgstr "Изберете данните, които искате да бъдат изчистени." -#: ../../locales/../src/interface/search.cpp:465 +#: ../src/interface/search.cpp:851 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Избрана %d папка и нейното съдържание за прехвърляне." msgstr[1] "Избрани %d папки и тяхното съдържание за прехвърляне." -#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Избрана %d папка." msgstr[1] "Избрани %d папки." -#: ../../locales/../src/interface/search.cpp:463 +#: ../src/interface/search.cpp:849 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." -msgstr[0] "Избран %d файл за прехвърляне." -msgstr[1] "Избрани %d файла за прехвърляне." +msgstr[0] "%d файл е избран за прехвърляне." +msgstr[1] "%d файла са избрани за прехвърляне." -#: ../../locales/../src/interface/filelist_statusbar.cpp:58 +#: ../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Избран %d файл. Обща дължина: %s" msgstr[1] "Избрани %d файла. Обща дължина: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:56 +#: ../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Избран %d файл. Обща дължина: най-малко %s" msgstr[1] "Избрани %d файла. Обща дължина: най-малко %s" -#: ../../locales/../src/interface/search.cpp:470 +#: ../src/interface/search.cpp:855 #, c-format msgid "Selected %s and %s for transfer." msgstr "Избрани %s и %s за прехвърляне." -#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#: ../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Избрани %s и %s. Обща дължина: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Избрани %s и %s. Обща дължина: най-малко %s" -#: ../../locales/../src/interface/edithandler.cpp:1531 -#: ../../locales/../src/interface/edithandler.cpp:1610 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 +#: ../src/interface/settings/optionspage_edit.cpp:124 +#: ../src/interface/edithandler.cpp:1528 ../src/interface/edithandler.cpp:1602 msgid "Selected editor does not exist." -msgstr "Избраният редактор не съществува" +msgstr "Избраният редактор не съществува." -#: resources.h:258 ../../locales/../src/interface/LocalListView.cpp:1749 +#: ../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Избраният файл се редактира" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Избраният файл е зареден" -#: ../../locales/../src/interface/RemoteListView.cpp:2445 +#: ../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Избраният файл е вече отворен" -#: ../../locales/../src/interface/RemoteListView.cpp:2473 +#: ../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Избраният файл се редактира все още" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Избраният филтър работи само върху местните файлове." -#: ../../locales/../src/interface/menu_bar.cpp:315 +#: ../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" -"Избраната глобална отметка и текущо свързаната връзка използват различни " -"типове сървър.\n" +"Избраната обща отметка и текущо свързаната връзка използват различни видове " +"сървър.\n" "Използвайте отметка към връзка за този сървър." -#: ../../locales/../src/engine/engineprivate.cpp:272 +#: ../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Избраният порт обикновено се използва от друг протокол." -#: resources.h:710 +#: ../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "&Изпращане на keep-alive команди" -#: resources.h:492 +#: ../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" -msgstr "" -"Изпращане на специална команда към сървъра, която не е достъпна по друг " -"начин." +msgstr "Изпращане на специална команда към сървъра, недостъпна по друг начин" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4534 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Изпраща на keep-alive команда" -#: resources.h:7 resources.h:36 -#: ../../locales/../src/interface/verifycertdialog.cpp:193 +#: ../src/interface/resources/xrc/certificate.xrc:65 +#: ../src/interface/verifycertdialog.cpp:259 msgid "Serial number:" msgstr "Пореден номер:" -#: resources.h:972 +#: ../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" -msgstr "Тип &сървър:" +msgstr "&Вид на сървъра:" -#: ../../locales/../src/engine/tlssocket.cpp:778 +#: ../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Сървърът неправилно прекъсна TLS връзка" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:934 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:997 +#: ../src/engine/ftp/logon.cpp:396 ../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Сървърът не поддържа не-ASCII символи." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4358 +#: ../src/engine/ftp/filetransfer.cpp:269 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Сървърът не поддържа подновяване на файлове по-дълги от %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4354 +#: ../src/engine/ftp/filetransfer.cpp:266 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6473,15 +7141,19 @@ "Сървърът не поддържа подновяване на файлове по-дълги от %d GB. Край на " "прехвърлянето - дължината на файловете съвпада." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2576 +#: ../src/engine/ftp/filetransfer.cpp:528 msgid "Server does not support resume of files > 2GB." msgstr "Сървърът не поддържа подновяване на файлове по-дълги от 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2571 +#: ../src/engine/ftp/filetransfer.cpp:524 msgid "Server does not support resume of files > 4GB." msgstr "Сървърът не поддържа подновяване на файлове по-дълги от 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4369 +#: ../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Хост-ключ на сървъра" + +#: ../src/engine/ftp/filetransfer.cpp:277 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6490,32 +7162,36 @@ "Сървърът вероятно не поддържа подновяване на файлове по-дълги от %d GB. Край " "на прехвърлянето - дължината на файловете съвпада." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:876 +#: ../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" -"Сървърът изисква регистрация. Моля, укажете своята в Манипулатор връзки" +"Сървърът изисква регистрация. Моля, укажете своята в Управление на връзки" + +#: ../src/engine/http/request.cpp:241 +msgid "Server not sending proper line endings" +msgstr "Сървърът не изпраща правилни знаци за край на ред" -#: ../../locales/../src/engine/ControlSocket.cpp:437 +#: ../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "Сървърът изпрати празен път." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:683 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:224 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "" "Сървърът изпрати допълнително запитване за вход. Трябва да използвате " -"интерактивен тип вход." +"интерактивен вход." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3902 +#: ../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Сървърът изпрати пасивен отговор с немаршрутируем адрес. Пасивният режим се " "провали." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3896 +#: ../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6523,225 +7199,248 @@ "Сървърът изпрати пасивен отговор с немаршрутируем адрес. Използване адреса " "на сървъра." -#: ../../locales/../src/interface/netconfwizard.cpp:403 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:458 -#: ../../locales/../src/interface/netconfwizard.cpp:470 -#: ../../locales/../src/interface/netconfwizard.cpp:494 -#: ../../locales/../src/interface/netconfwizard.cpp:501 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:521 +#: ../src/engine/http/request.cpp:514 +msgid "Server sent too much data." +msgstr "Сървърът изпрати твърде много данни." + +#: ../src/interface/netconfwizard.cpp:428 +#: ../src/interface/netconfwizard.cpp:434 +#: ../src/interface/netconfwizard.cpp:469 +#: ../src/interface/netconfwizard.cpp:478 +#: ../src/interface/netconfwizard.cpp:490 +#: ../src/interface/netconfwizard.cpp:513 +#: ../src/interface/netconfwizard.cpp:520 +#: ../src/interface/netconfwizard.cpp:529 +#: ../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Сървърът изпрати неочакван отговор." -#: resources.h:289 +#: ../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Сървърът изпрати неподредена верига от сертификати в разрез със " +"спецификацията на TLS" + +#: ../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "MAC от сървъра към клиента:" -#: resources.h:287 +#: ../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Шифър от сървъра към клиента:" -#: resources.h:318 +#: ../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" -msgstr "Тип &сървър:" +msgstr "Вид &сървър:" -#: ../../locales/../src/interface/queue.cpp:1198 +#: ../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Отдалечен/Местен файл" -#: resources.h:249 resources.h:311 +#: ../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "&Сървър:" -#: resources.h:16 resources.h:45 +#: ../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "Сесийна информация" -#: resources.h:551 +#: ../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "&Установяване на приоритет" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3727 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2440 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:589 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Установяване на правата от \"%s\" на \"%s\"" - -#: ../../locales/../src/engine/transfersocket.cpp:825 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize извикан без сокет" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Установяване на правата на „%s“ на „%s“" -#: resources.h:687 +#: ../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Настройки" -#: resources.h:952 +#: ../src/interface/resources/xrc/dialogs.xrc:963 +msgid "Settings directory:" +msgstr "Папка за настройките:" + +#: ../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "По&казване на системно известие" + +#: ../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" -msgstr "&Показване необработено съдържание на папки" +msgstr "&Включително необработеното съдържание на папките" -#: resources.h:501 +#: ../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." -msgstr "Показване &начален диалог..." +msgstr "Показване &начален диалог…" -#: ../../locales/../src/interface/Mainfrm.cpp:2359 +#: ../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "" -"Показване на местните и отдалечени папки и продължаване на сравнението?" +"Показване на местните и отдалечени папки и продължаване на сравняването?" -#: resources.h:1045 +#: ../src/interface/resources/xrc/update.xrc:147 +#: ../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Подробности" -#: resources.h:862 -#, no-c-format +#: ../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" -msgstr "" +msgstr "Научете още за потребителските формати" -#: resources.h:576 +#: ../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Показване на наличните TLS шифри" -#: ../../locales/../src/interface/cmdline.cpp:6 +#: ../src/interface/cmdline.cpp:6 msgid "Shows this help dialog" msgstr "Показване този помощен диалог" -#: ../../locales/../src/interface/QueueView.cpp:3216 +#: ../src/interface/QueueView.cpp:2762 msgid "Shutdown now" msgstr "Изключване" -#: resources.h:9 resources.h:38 +#: ../src/interface/resources/xrc/certificate.xrc:81 msgid "Signature algorithm:" msgstr "Алгоритъм на подписа:" -#: resources.h:237 +#: ../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Регистрация" + +#: ../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" -msgstr "Записи в &Манипулатор връзки" +msgstr "Записи в Упр&авление на връзки" -#: resources.h:953 +#: ../src/interface/resources/xrc/sitemanager.xrc:7 msgid "Site Manager" -msgstr "Манипулатор връзки" +msgstr "Управление на връзки" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:971 +#: ../src/interface/sitemanager_dialog.cpp:1019 msgid "Site Manager - Cannot remember password" -msgstr "Манипулатор връзки - Без запазване на пароли" +msgstr "Управление на връзки - Без запазване на пароли" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:941 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:952 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:987 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1001 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1014 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1112 +#: ../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Управление на връзки - генерирани ключове" + +#: ../src/interface/sitemanager_dialog.cpp:985 +#: ../src/interface/sitemanager_dialog.cpp:998 +#: ../src/interface/sitemanager_dialog.cpp:1032 +#: ../src/interface/sitemanager_dialog.cpp:1049 +#: ../src/interface/sitemanager_dialog.cpp:1062 +#: ../src/interface/sitemanager_dialog.cpp:1077 +#: ../src/interface/sitemanager_dialog.cpp:1087 +#: ../src/interface/sitemanager_dialog.cpp:1095 +#: ../src/interface/sitemanager_dialog.cpp:1120 +#: ../src/interface/sitemanager_dialog.cpp:1129 +#: ../src/interface/sitemanager_dialog.cpp:1145 +#: ../src/interface/sitemanager_dialog.cpp:1154 +#: ../src/interface/sitemanager_dialog.cpp:1182 +#: ../src/interface/sitemanager_dialog.cpp:1191 +#: ../src/interface/sitemanager_dialog.cpp:1198 msgid "Site Manager - Invalid data" -msgstr "Манипулатор връзки - Невалидна информация" +msgstr "Управление на връзки - Невалидна информация" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:317 +#: ../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" -msgstr "Манипулатор връзки е вече отворен" +msgstr "Управление на връзки е вече отворен" -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:456 -#: ../../locales/../src/interface/sitemanager.cpp:470 -#: ../../locales/../src/interface/sitemanager.cpp:541 -#: ../../locales/../src/interface/sitemanager.cpp:738 -#: ../../locales/../src/interface/sitemanager.cpp:818 +#: ../src/interface/sitemanager.cpp:489 ../src/interface/sitemanager.cpp:517 +#: ../src/interface/sitemanager.cpp:531 ../src/interface/sitemanager.cpp:543 +#: ../src/interface/sitemanager.cpp:712 ../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Страницата не съществува." -#: ../../locales/../src/interface/sitemanager.cpp:425 +#: ../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Пътят до връзка трябва да започва с 0 или 1." -#: ../../locales/../src/interface/sitemanager.cpp:463 -#: ../../locales/../src/interface/sitemanager.cpp:559 -#: ../../locales/../src/interface/sitemanager.cpp:731 -#: ../../locales/../src/interface/sitemanager.cpp:812 +#: ../src/interface/sitemanager.cpp:537 ../src/interface/sitemanager.cpp:706 +#: ../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." -msgstr "Пътят на връзката е повреден." +msgstr "Пътят на връзката е деформиран." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 +#: ../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Отметки към връзка" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../src/interface/bookmarks_dialog.cpp:97 +#: ../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" "Add current connection to the site manager?" msgstr "" -"Отметките към връзка изискват връзката да бъде записана в Манипулатор " +"Отметките към връзка изискват връзката да бъде записана в Управление на " "връзки.\n" "Искате ли текущата връзка да бъде запазена?" -#: ../../locales/../src/interface/queue.cpp:1198 +#: ../src/interface/queue.cpp:1214 msgid "Size" msgstr "Дължина" -#: resources.h:864 +#: ../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Форматиране дължина" -#: ../../locales/../src/interface/fileexistsdlg.cpp:59 -#: ../../locales/../src/interface/fileexistsdlg.cpp:63 +#: ../src/interface/fileexistsdlg.cpp:43 msgid "Size unknown" msgstr "Неизвестна дължина" -#: resources.h:204 resources.h:214 resources.h:808 resources.h:817 +#: ../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../src/interface/resources/xrc/settings.xrc:1194 +#: ../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Пропускане" -#: ../../locales/../src/engine/ControlSocket.cpp:1241 -#: ../../locales/../src/engine/ControlSocket.cpp:1258 -#: ../../locales/../src/engine/ControlSocket.cpp:1282 -#: ../../locales/../src/engine/ControlSocket.cpp:1348 +#: ../src/engine/ControlSocket.cpp:1151 ../src/engine/ControlSocket.cpp:1168 +#: ../src/engine/ControlSocket.cpp:1194 ../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping download of %s" msgstr "Прескачане на изтеглянето на %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1245 -#: ../../locales/../src/engine/ControlSocket.cpp:1261 -#: ../../locales/../src/engine/ControlSocket.cpp:1286 -#: ../../locales/../src/engine/ControlSocket.cpp:1352 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Прескачане на несъществуващият файл-ключ „%s“" + +#: ../src/engine/ControlSocket.cpp:1154 ../src/engine/ControlSocket.cpp:1171 +#: ../src/engine/ControlSocket.cpp:1197 ../src/engine/ControlSocket.cpp:1275 #, c-format msgid "Skipping upload of %s" msgstr "Прескачане на качването на %s" -#: ../../locales/../src/engine/socket.cpp:1212 +#: ../src/engine/socket.cpp:1073 msgid "Socket address outside address space" -msgstr "" +msgstr "Адресът на сокета е извън адресното пространство" -#: ../../locales/../src/engine/socket.cpp:1214 -#, fuzzy +#: ../src/engine/socket.cpp:1075 msgid "Socket already connected" -msgstr "Активна връзка" +msgstr "Сокет вече с активна връзка" -#: ../../locales/../src/engine/socket.cpp:1222 +#: ../src/engine/socket.cpp:1083 msgid "Socket has been shut down" -msgstr "" +msgstr "Сокетът е бил затворен" -#: ../../locales/../src/engine/socket.cpp:1219 -#, fuzzy +#: ../src/engine/socket.cpp:1080 msgid "Socket not connected" -msgstr "Връзката осъществена" +msgstr "Сокет без осъществена връзка" -#: ../../locales/../src/engine/socket.cpp:1261 -#, fuzzy +#: ../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" -msgstr "Протокол, неподдържан от този тип сокет" +msgstr "Адресното семейство не поддържа този вид сокети" -#: ../../locales/../src/interface/Mainfrm.cpp:1228 +#: ../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "Има файлове, които биват редактирани или чакат качване." -#: resources.h:650 resources.h:726 +#: ../src/interface/resources/xrc/netconfwizard.xrc:147 +#: ../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -6749,136 +7448,147 @@ "Някои неправилно настроени сървъри зад маршрутизатор, може да отговарят с " "локалния си IP адрес." -#: resources.h:882 +#: ../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Папките - наравно с всички" -#: ../../locales/../src/interface/filelistctrl.cpp:472 +#: ../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." -msgstr "Сортирането не може да се променя при сравняване на папки." +msgstr "Не може да променяте сортирането докато се сравняват папките." -#: resources.h:878 +#: ../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Сортиране" -#: resources.h:879 +#: ../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "&Сортиране:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Източникът и пътя на операцията пускане са идентични" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Изходният и целевия файл не може да са един и същ" -#: ../../locales/../src/interface/RemoteListView.cpp:142 +#: ../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Източникът и целта на операцията пускане са идентични" -#: resources.h:59 +#: ../src/interface/resources/xrc/dialogs.xrc:24 msgid "Source file:" msgstr "Изходен файл:" -#: resources.h:428 ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../src/interface/speedlimits_dialog.cpp:64 +#: ../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Ограничение на скоростта" -#: resources.h:772 +#: ../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Ограничение на скоростта" -#: ../../locales/../src/interface/statusbar.cpp:561 +#: ../src/interface/statusbar.cpp:591 msgid "Speed limits are disabled, click to change." msgstr "Ограничение на скоростта изключено, натиснете за промяна." -#: ../../locales/../src/interface/statusbar.cpp:565 +#: ../src/interface/statusbar.cpp:594 msgid "Speed limits are enabled, click to change." msgstr "Ограничение на скоростта включено, натиснете за промяна." -#: resources.h:926 +#: ../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" -msgstr "стабилна и бета версии" +msgstr "стабилно и бета издание" -#: resources.h:925 +#: ../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" -msgstr "само стабилна версия" +msgstr "само стабилно издание" -#: resources.h:927 +#: ../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" -msgstr "стабилна, бета или нощна версия" +msgstr "стабилно, бета или нощно издание" -#: resources.h:329 +#: ../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Започване на &прехвърлянето веднага" -#: ../../locales/../src/interface/cmdline.cpp:7 +#: ../src/interface/cmdline.cpp:7 msgid "Start with opened Site Manager" -msgstr "Старт с отворен Манипулатор връзки" +msgstr "Старт с отворен Управление на връзки" -#: ../../locales/../src/interface/updater.cpp:243 +#: ../src/interface/updater.cpp:247 #, c-format msgid "Started update check on %s\n" -msgstr "Проверка за актуализация започната на \"%s\"\n" +msgstr "Проверка за обновяване започната на „%s“\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2263 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1635 +#: ../src/engine/ftp/filetransfer.cpp:36 ../src/engine/sftp/filetransfer.cpp:35 +#: ../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Начало изтегляне %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1639 +#: ../src/engine/ftp/filetransfer.cpp:39 ../src/engine/sftp/filetransfer.cpp:38 +#: ../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Начало на качване на %s" -#: ../../locales/../src/interface/cmdline.cpp:9 +#: ../src/interface/cmdline.cpp:9 msgid "Starts the local site in the given path" msgstr "Зарежда указаният път в локалния панел" -#: ../../locales/../src/interface/verifycertdialog.cpp:187 +#: ../src/interface/verifycertdialog.cpp:253 msgid "State or province:" msgstr "Щат или провинция:" -#: ../../locales/../src/interface/edithandler.cpp:1121 -#: ../../locales/../src/interface/queue.cpp:1198 +#: ../src/interface/edithandler.cpp:1139 ../src/interface/queue.cpp:1214 msgid "Status" msgstr "Статус" -#: ../../locales/../src/engine/logging.cpp:122 -#: ../../locales/../src/interface/StatusView.cpp:298 -#: ../../locales/../src/interface/StatusView.cpp:373 +#: ../src/engine/logging.cpp:112 ../src/interface/StatusView.cpp:298 +#: ../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "Състояние:" -#: resources.h:548 +#: ../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Прекратяване и &изчистване" -#: ../../locales/../src/interface/verifycertdialog.cpp:191 +#: ../src/interface/recursive_operation_status.cpp:43 +msgid "Stop recursive operation" +msgstr "Спиране на рекурсивната операция" + +#: ../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - децентрализирано облачно хранилище" + +#: ../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Поддръжка на Storj" + +#: ../src/interface/verifycertdialog.cpp:257 msgid "Street:" msgstr "Улица:" -#: resources.h:12 resources.h:41 +#: ../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" msgstr "Предмет на сертификата" -#: ../../locales/../src/interface/queueview_successful.cpp:12 +#: ../src/interface/queueview_successful.cpp:12 msgid "Successful transfers" msgstr "Успешни прехвърляния" -#: resources.h:678 +#: ../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" msgstr "Резюме на резултатите от проверката:" -#: ../../locales/../src/interface/QueueView.cpp:3224 +#: ../src/interface/QueueView.cpp:2770 msgid "Suspend now" msgstr "Изключване" -#: resources.h:397 +#: ../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -6886,193 +7596,213 @@ "Този избор не влияе на символните връзки към файлове, те винаги биват " "изтривани." -#: resources.h:1025 ../../locales/../src/interface/state.cpp:249 -#: ../../locales/../src/interface/state.cpp:278 -#: ../../locales/../src/interface/state.cpp:285 -#: ../../locales/../src/interface/state.cpp:297 -#: ../../locales/../src/interface/state.cpp:388 -#: ../../locales/../src/interface/state.cpp:396 -#: ../../locales/../src/interface/state.cpp:404 -#: ../../locales/../src/interface/state.cpp:985 -#: ../../locales/../src/interface/state.cpp:994 -#: ../../locales/../src/interface/state.cpp:1001 -#: ../../locales/../src/interface/state.cpp:1012 -#: ../../locales/../src/interface/state.cpp:1019 +#: ../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../src/interface/toolbar.cpp:52 ../src/interface/state.cpp:263 +#: ../src/interface/state.cpp:278 ../src/interface/state.cpp:285 +#: ../src/interface/state.cpp:296 ../src/interface/state.cpp:395 +#: ../src/interface/state.cpp:403 ../src/interface/state.cpp:411 +#: ../src/interface/state.cpp:1070 ../src/interface/state.cpp:1078 +#: ../src/interface/state.cpp:1085 ../src/interface/state.cpp:1094 +#: ../src/interface/state.cpp:1121 msgid "Synchronized browsing" msgstr "Синхронизирано разлистване" -#: ../../locales/../src/interface/state.cpp:403 +#: ../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Синхронизираното разлистване е било изключено." -#: ../../locales/../src/interface/quickconnectbar.cpp:88 -#: ../../locales/../src/interface/quickconnectbar.cpp:126 +#: ../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Синхронизиране на папки." + +#: ../src/interface/quickconnectbar.cpp:117 +#: ../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Синтактична грешка" -#: ../../locales/../src/interface/cmdline.cpp:76 -#: ../../locales/../src/interface/cmdline.cpp:82 -#: ../../locales/../src/interface/cmdline.cpp:88 -#: ../../locales/../src/interface/cmdline.cpp:97 -#: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2471 -#: ../../locales/../src/interface/Mainfrm.cpp:2518 +#: ../src/interface/cmdline.cpp:76 ../src/interface/cmdline.cpp:82 +#: ../src/interface/cmdline.cpp:88 ../src/interface/cmdline.cpp:97 +#: ../src/interface/cmdline.cpp:103 ../src/interface/Mainfrm.cpp:2441 +#: ../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Синтактична грешка в командната линия" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Системен" -#: ../../locales/../src/engine/socket.cpp:1203 +#: ../src/interface/resources/xrc/dialogs.xrc:975 +msgid "System details" +msgstr "Данни за системата" + +#: ../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" -msgstr "" +msgstr "Достигнат предел на брой отворени файлове" -#: ../../locales/../src/engine/socket.cpp:1259 +#: ../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" -msgstr "" +msgstr "Мрежовата подсистема пропадна" -#: resources.h:467 +#: ../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "Лента за инструм&енти" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:325 -msgid "TLS/SSL connection established, sending HTTP request" -msgstr "Установена е TLS/SSL връзка, изпраща се HTTP заявка" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 -msgid "TLS/SSL connection established, waiting for welcome message..." -msgstr "Връзка от тип TLS/SSL е установена, очаква се приветствие..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:416 -msgid "TLS/SSL connection established." -msgstr "Връзка от тип TLS/SSL е установена." +#: ../src/engine/http/httpcontrolsocket.cpp:131 +msgid "TLS connection established, sending HTTP request" +msgstr "Установена е TLS връзка, изпраща се HTTP заявка" + +#: ../src/engine/ftp/ftpcontrolsocket.cpp:206 +msgid "TLS connection established, waiting for welcome message..." +msgstr "Установена е връзка от вид TLS, очаква се приветствие…" + +#: ../src/engine/ftp/ftpcontrolsocket.cpp:210 +msgid "TLS connection established." +msgstr "Установена е връзка от вид TLS." -#: ../../locales/../src/engine/proxy.cpp:539 +#: ../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL изтече" -#: resources.h:57 +#: ../src/interface/resources/xrc/dialogs.xrc:6 msgid "Target file already exists" msgstr "Целевият файл вече съществува" -#: resources.h:63 +#: ../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" -msgstr "Целеви файл" +msgstr "Целеви файл:" -#: ../../locales/../src/interface/RemoteListView.cpp:2926 +#: ../src/interface/RemoteListView.cpp:2686 msgid "Target filename already exists!" msgstr "Целевият файл съществува!" -#: ../../locales/../src/interface/RemoteListView.cpp:1670 +#: ../src/interface/RemoteListView.cpp:1639 msgid "Target filename already exists, really continue?" msgstr "Целевият файл съществува, желаете ли да продължите?" -#: ../../locales/../src/engine/socket.cpp:1232 +#: ../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" -msgstr "" +msgstr "Временен срив в преобразуването на имена" + +#: ../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Тестовете са завършени успешно" -#: resources.h:677 +#: ../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Резултат" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4375 +#: ../src/engine/ftp/filetransfer.cpp:281 msgid "Testing resume capabilities of server" -msgstr "Проверка на способността на сървъра за подновяване на прехвърляния." +msgstr "Проверка на способността на сървъра за подновяване на прехвърляния" + +#: ../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "&Списък на редактираните файлове:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:316 +#: ../src/interface/sitemanager_dialog.cpp:785 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "" +"Управлението на връзки не може да бъде използвано докато файлът не бъде " +"поправен." + +#: ../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " "then." msgstr "" -"\"Манипулатор връзки\" е отворен в друг екземпляр на FileZilla 3.\n" -"Желаете ли да продължите? В този случай промените в \"Манипулатор връзки\" " +"Управление на връзки е отворен в друг екземпляр на FileZilla 3.\n" +"Желаете ли да продължите? В този случай промените в Управление на връзки " "няма да бъдат запазени." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." msgstr "" -"Манипулатор връзки е отворен в друг екземпляр на FileZilla 3.\n" +"Управление на връзки е отворен в друг екземпляр на FileZilla 3.\n" "Моля, затворете го, иначе данните не могат да бъдат изтрити." -#: ../../locales/../src/interface/xmlfunctions.cpp:367 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "XML документът е недобре форматиран: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Въведеният адрес е: %s" -#: ../../locales/../src/engine/socket.cpp:1238 +#: ../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" -msgstr "" +msgstr "Членът ai_family не се поддържа" -#: ../../locales/../src/engine/socket.cpp:1251 -#, fuzzy +#: ../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" -msgstr "Неподдържан тип на адрес" +msgstr "Членът ai_socktype не се поддържа" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:808 -#: ../../locales/../src/interface/sitemanager.cpp:718 +#: ../src/interface/sitemanager.cpp:693 +#: ../src/interface/bookmarks_dialog.cpp:840 msgid "The bookmark could not be added." msgstr "Отметката не може да бъде добавена." -#: ../../locales/../src/interface/sitemanager.cpp:800 +#: ../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Отметките не могат да бъдат изчистени." -#: ../../locales/../src/interface/statusbar.cpp:454 +#: ../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Сертификатът изисква от сървъра да включва състоянието на OCSP в отговора " +"си, но такова липсва." + +#: ../src/interface/statusbar.cpp:475 msgid "The connection is encrypted. Click icon for details." -msgstr "Връзката е криптирана. Натиснете пиктограмата за информация." +msgstr "Връзката е шифрована. Натиснете пиктограмата за повече информация." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 +#: ../src/interface/settings/optionspage_dateformatting.cpp:75 msgid "" "The custom date format is invalid or contains unsupported format specifiers." -msgstr "" +msgstr "Потребителският формат за дата е невалиден." -#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 +#: ../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." msgstr "Специалната входна последователност не може да бъде празна." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 +#: ../src/interface/settings/optionspage_dateformatting.cpp:85 msgid "" "The custom time format is invalid or contains unsupported format specifiers." -msgstr "" +msgstr "Потребителският формат за час е невалиден." -#: ../../locales/../src/engine/transfersocket.cpp:169 +#: ../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Връзката за данни не може да бъде установена: %s" -#: resources.h:362 ../../locales/../src/interface/edithandler.cpp:1570 -#, no-c-format +#: ../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." -msgstr "" -"Подразбиращият се редактор за текстови файлове не можа да бъде намерен." +msgstr "Стандартният текстов редактор не можа да бъде намерен." -#: resources.h:361 +#: ../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." -msgstr "По подразбиране редакторът за текстови файлове е '%s'." +msgstr "Стандартният текстов редактор е „%s“." -#: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../src/interface/filteredit.cpp:149 ../src/interface/filteredit.cpp:216 +#: ../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Въведеното име за филтър вече съществува, моля, изберете друго." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../src/interface/settings/optionspage_interface.cpp:205 +#: ../src/interface/asksavepassworddialog.cpp:41 +msgid "The entered passwords are not the same." +msgstr "Двете пароли са различни." + +#: ../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" -msgstr "Разширението \"%s\" вече съществува в списъка." +msgstr "Разширението „%s“ вече съществува в списъка" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:246 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:253 +#: ../src/interface/asyncrequestqueue.cpp:293 +#: ../src/interface/asyncrequestqueue.cpp:301 #, c-format msgid "" "The file %s already exists.\n" @@ -7081,9 +7811,8 @@ "Файл с име %s вече съществува.\n" "Моля, въведете ново име:" -#: ../../locales/../src/interface/LocalListView.cpp:1726 -#: ../../locales/../src/interface/LocalListView.cpp:1855 -#: ../../locales/../src/interface/RemoteListView.cpp:2419 +#: ../src/interface/edithandler.cpp:1673 +#: ../src/interface/LocalListView.cpp:1834 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7094,75 +7823,71 @@ "Асоциираната програма (%s) не можа да бъде намерена.\n" "Проверете файловите асоциации." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222 +#: ../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"Файлът „%s“ съдържа ключ от вид SSH1. Протоколът SSH1 е излязъл от употреба, " +"FileZilla поддържа само ключове от вид SSH2." + +#: ../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." -msgstr "Файлът \"%s\" не може да бъде зареден или не съдържа частен ключ." +msgstr "Файлът „%s“ не може да бъде зареден или не съдържа частен ключ." -#: ../../locales/../src/interface/xmlfunctions.cpp:38 +#: ../src/interface/xmlfunctions.cpp:37 #, c-format msgid "The file '%s' could not be loaded." -msgstr "Файлът \"%s\" не може да бъде зареден." +msgstr "Файлът „%s“ не може да бъде зареден." -#: ../../locales/../src/interface/LocalListView.cpp:1720 -#: ../../locales/../src/interface/LocalListView.cpp:1850 -#: ../../locales/../src/interface/RemoteListView.cpp:2413 +#: ../src/interface/edithandler.cpp:1668 +#: ../src/interface/LocalListView.cpp:1830 #, c-format msgid "" "The file '%s' could not be opened:\n" "No program has been associated on your system with this file type." msgstr "" -"Файлът \"%s\" не може да бъде отворен:\n" -"С този файлов тип няма свързана програма." +"Файлът „%s“ не може да бъде отворен:\n" +"С този файлов вид няма свързана програма." -#: ../../locales/../src/interface/LocalListView.cpp:1765 -#: ../../locales/../src/interface/LocalListView.cpp:1863 +#: ../src/interface/edithandler.cpp:1785 +#: ../src/interface/LocalListView.cpp:1843 #, c-format msgid "" "The file '%s' could not be opened:\n" "The associated command failed" msgstr "" -"Файлът \"%s\" не може да бъде отворен:\n" -"Командата свързана с този файлов тип пропадна" +"Файлът „%s“ не може да бъде отворен:\n" +"Командата свързана с този файлов вид пропадна" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../src/interface/import.cpp:65 ../src/interface/sitemanager_dialog.cpp:792 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"Файлът \"%s\" не е от поддържаните от FileZilla формати.\n" -"Файлът е защитен с парола. Защитените с парола файлове-ключ не се поддържат " -"все още от FileZilla.\n" -"Искате ли да бъде конвертиран в поддържан, но незащитен формат?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" +msgstr "" +"Файлът „%s“ е създаден от по-ново издание на FileZilla.\n" +"Използването на файлове, създадени от по-нови издания може да доведе до " +"загуба на данни.\n" +"Искате ли да продължите?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266 +#: ../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" "Would you like to convert it into a supported format?" msgstr "" -"Файлът \"%s\" не е от поддържаните от FileZilla формати.\n" +"Файлът „%s“ не е от форматите, поддържани от FileZilla.\n" "Искате ли да бъде конвертиран в поддържан формат?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"Файлът \"%s\" е защитен с парола. Защитените с парола файлове-ключ не се " -"поддържат все още от FileZilla.\n" -"Искате ли да бъде конвертиран в поддържан, но незащитен формат?" - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 +#: ../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." -msgstr "Избраният като редактор по подразбиране не съществува." +msgstr "Избраният стандартен редактор не съществува." -#: ../../locales/../src/interface/import.cpp:76 +#: ../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7170,57 +7895,67 @@ "password will be imported.\n" "Continue with the import?" msgstr "" -"Файлът, който сте избрали, съдържа данни на Манипулатор връзки от предишна " -"версия на FileZilla.\n" -"Поради разлики във формата на запис ще бъдат импортирани само хостове, " -"портове, потребителски имена и пароли.\n" -"Продължаване на импорта?" +"Файлът, който сте избрали, съдържа данни на Управление на връзки от предишно " +"издание на FileZilla.\n" +"Поради разлики във формата на запис ще бъдат внесени само хостове, портове, " +"потребителски имена и пароли.\n" +"Продължаване на внасянето?" -#: ../../locales/../src/interface/listctrlex.cpp:749 +#: ../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." -msgstr "Колоната \"Име\" не може нито да бъде скривана, нито местена." +msgstr "Колоната за име не може нито да бъде скривана, нито местена." -#: ../../locales/../src/interface/listctrlex.cpp:799 +#: ../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Колоната с име на файл не може да бъде скрита." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 +#: ../src/interface/settings/optionspage_transfer.cpp:69 #, c-format msgid "The following character will be replaced: %s" msgstr "Следният знак ще бъде заменен: %s" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:66 +#: ../src/interface/settings/optionspage_transfer.cpp:66 #, c-format msgid "The following characters will be replaced: %s" msgstr "Следните знаци ще бъде заменени: %s" -#: resources.h:266 -msgid "The following files are currently being edited:" -msgstr "Списък на отворените за редакция файлове:" - -#: resources.h:401 +#: ../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Свободното FTP решение с отворен код" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:294 +#: ../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Генерираният ключ за шифроване е:" + +#: ../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." -msgstr "Глобалните отметки не могат да бъдат запазени." +msgstr "Общите отметки не могат да бъдат запазени." -#: resources.h:950 +#: ../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " "performance." msgstr "" -"Колкото е по-високо нивото за трасиране, толкова повече информация ще се " -"извежда в дневника. Показването информация за трасиране влияе отрицателно на " -"бързодействието." +"Колкото по-високо е нивото на трасиране, толкова повече информация ще се " +"извежда в дневника. Показване на информация от трасирането влияе отрицателно " +"на бързодействието." -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 +#: ../src/interface/settings/optionspage_logging.cpp:78 msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Ограничението трябва да бъде между 1 и 2000 MiB" -#: ../../locales/../src/interface/state.cpp:275 +#: ../src/interface/state.cpp:1121 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Местната папка „%s“ не може да бъде създадена." + +#: ../src/interface/state.cpp:1106 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "Местната папка „%s“ не съществува." + +#: ../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7229,7 +7964,7 @@ "Местната папка '%s' не е под корена за синхронизиране (%s).\n" "Изключване на синхронизираното разлистване и смяна само на местната папка?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7237,19 +7972,29 @@ "Най-ниският наличен порт трябва да е по-малък или равен на най-високия " "наличен порт." -#: resources.h:1038 +#: ../src/interface/settings/optionspage_interface.cpp:214 +#: ../src/interface/asksavepassworddialog.cpp:46 +msgid "The master password needs to be at least 8 characters long." +msgstr "Главната парола трябва да е с дължина най-малко 8 знака." + +#: ../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." -msgstr "Новата версия не може да бъде изтеглена, опитайте отново по-късно." +msgstr "Новото издание не може да бъде изтеглено, опитайте отново по-късно." -#: resources.h:1036 +#: ../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." -msgstr "Новата версия е запазена в папката с изтеглянията ви." +msgstr "Новото издание е запазено в папката с изтеглянията ви." -#: ../../locales/../src/interface/QueueView.cpp:1963 +#: ../src/interface/QueueView.cpp:1560 msgid "The queue will not be saved." msgstr "Опашката няма да бъде запазена." -#: ../../locales/../src/interface/state.cpp:991 +#: ../src/interface/state.cpp:1028 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Отдалечената папка „%s“ не съществува." + +#: ../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7259,57 +8004,56 @@ "Изключване на синхронизираното разлистване и смяна само на отдалечената " "папка?" -#: ../../locales/../src/interface/import.cpp:66 +#: ../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Избраните категории бяха импортирани." -#: resources.h:236 +#: ../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" -msgstr "" -"От избрания файл е възможно да бъдат импортирани данни от следните категории:" +msgstr "От избрания файл е възможно да бъдат импортирани данни от категориите:" -#: resources.h:259 +#: ../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Избраният файл се редактира:" -#: ../../locales/../src/interface/RemoteListView.cpp:2473 +#: ../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "Избраният файл е отворен от друга програма, моля, затворете я." -#: ../../locales/../src/interface/LocalListView.cpp:1732 -#: ../../locales/../src/interface/RemoteListView.cpp:2425 +#: ../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" -"This can be dangerous and damage your system.\n" +"This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" -"Избраният файл може да бъде изпълнен.\n" +"Посоченият файл може да бъде директно изпълнен.\n" "Това може да навреди на вашата система.\n" "Наистина ли искате ли да продължите?" -#: ../../locales/../src/interface/sitemanager.cpp:607 +#: ../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Сървърът не може да бъде добавен." -#: ../../locales/../src/interface/netconfwizard.cpp:574 +#: ../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Сървърът изпрати неочакван или непознат отговор." -#: resources.h:989 +#: ../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Имена на файловете на сървъра са на:" -#: resources.h:2 +#: ../src/interface/resources/xrc/certificate.xrc:21 msgid "" "The server's certificate is unknown. Please carefully examine the " "certificate to make sure the server can be trusted." msgstr "" -"Сертификата на сървъра е неизвестен. Моля, внимателно прегледайте " +"Сертификатът на сървъра е неизвестен. Моля, внимателно прегледайте " "сертификата и преценете дали да се доверите на сървъра." -#: resources.h:149 +#: ../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7319,7 +8063,7 @@ "че или администраторът му е сменил хост-ключа или правите опит да се " "свържете със сървър, който се представя за оригиналния." -#: resources.h:137 +#: ../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7327,11 +8071,15 @@ "Хост-ключът на този сървър е непознат. Няма гаранция, че този сървър е " "компютъра, който мислите че е." -#: ../../locales/../src/engine/socket.cpp:1250 +#: ../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Името на хоста на сървъра не отговаря на името на хоста от сертификата" + +#: ../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" -msgstr "" +msgstr "Параметърът servname не се поддържа от ai_socktype" -#: ../../locales/../src/interface/import.cpp:63 +#: ../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7339,24 +8087,23 @@ "Настройките са импортирани. Трябва да рестартирате FileZilla,за да имат " "ефект всички настройки." -#: ../../locales/../src/engine/socket.cpp:1199 -#, fuzzy +#: ../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" -msgstr "Неподдържан тип на адрес" +msgstr "Посоченото адресно семейство не се поддържа" -#: ../../locales/../src/engine/socket.cpp:1263 +#: ../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" -msgstr "" +msgstr "Указаното име на мрежа е вече недостъпно" -#: ../../locales/../src/interface/QueueView.cpp:3219 +#: ../src/interface/QueueView.cpp:2765 msgid "The system will soon reboot unless you click Cancel." msgstr "Системата ще бъде рестартирана освен ако не натиснете Отказ." -#: ../../locales/../src/interface/QueueView.cpp:3215 +#: ../src/interface/QueueView.cpp:2761 msgid "The system will soon shut down unless you click Cancel." msgstr "Системата ще се изключи, освен ако не изберете Отказ." -#: resources.h:58 +#: ../src/interface/resources/xrc/dialogs.xrc:19 msgid "" "The target file already exists.\n" "Please choose an action." @@ -7364,23 +8111,28 @@ "Целеви файл с това име вече съществува.\n" "Моля, изберете действие." -#: ../../locales/../src/interface/netconfwizard.cpp:852 +#: ../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Проверката се провали. Наистина ли желаете да запазите настройките?" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 +#: ../src/interface/xmlfunctions.cpp:82 +#, c-format +msgid "The valid backup file %s could not be restored" +msgstr "Валидният архив %s не може да бъде възстановен" + +#: ../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Теми" -#: ../../locales/../src/interface/filter.cpp:462 +#: ../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Този набор филтри не може да бъде изтрит." -#: ../../locales/../src/interface/filter.cpp:397 +#: ../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Този набор филтри не може да бъде преименуван." -#: ../../locales/../src/interface/netconfwizard.cpp:575 +#: ../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7388,7 +8140,7 @@ "Това означава, че някой маршрутизатор и/или защитна стена пречи все още на " "FileZilla." -#: resources.h:655 +#: ../src/interface/resources/xrc/netconfwizard.xrc:183 msgid "" "This only works if you are not behind a router, else your system would just " "return your internal address." @@ -7396,7 +8148,7 @@ "Това работи само ако сте зад маршрутизатор. В противен случай операционната " "система ще върне вашия вътрешен адрес." -#: resources.h:633 +#: ../src/interface/resources/xrc/netconfwizard.xrc:8 msgid "" "This wizard will help you to properly configure any routers and firewalls " "you have and tests your configuration." @@ -7404,48 +8156,42 @@ "Този помощник ще ви помогне правилно да конфигурирате наличните " "маршрутизатори и защитни стени и тества вашата конфигурация." -#: ../../locales/../src/interface/queue.cpp:1198 +#: ../src/interface/queue.cpp:1214 msgid "Time" msgstr "Време" -#: resources.h:857 -#, no-c-format +#: ../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Форматиране на времето" -#: resources.h:694 +#: ../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Изчакване в &секунди:" -#: resources.h:697 ../../locales/../src/interface/QueueView.cpp:1059 -#: ../../locales/../src/interface/QueueView.cpp:1103 +#: ../src/interface/resources/xrc/settings.xrc:126 +#: ../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Време за изчакване" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1729 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1085 -#, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Часова разлика: сървър: %d секунди. местна: %d секунди. Разлика: %d секунди." - -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../src/interface/verifycertdialog.cpp:251 msgid "Title:" msgstr "Заглавие:" -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "За да сравнявате папки бързото търсене трябва да е затворено." + +#: ../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "За да сравнявате папки двата списъка трябва да са подравнени." -#: ../../locales/../src/interface/Mainfrm.cpp:2358 +#: ../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "За да направите това, местните и отдалечени папки трябва да бъдат и двете " "показани или и двете скрити." -#: resources.h:748 +#: ../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7453,7 +8199,7 @@ "За удостоверяване чрез публичен ключ, FileZilla трябва да знае частния ключ, " "който да използва." -#: resources.h:1022 +#: ../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7470,222 +8216,231 @@ "Зелен: Файлът е по-нов от немаркирания файл от другата страна\n" "Червен: Разлика в дължината на файловете" -#: resources.h:1024 +#: ../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " "directory on the server accordingly and vice versa." msgstr "" "Превключване на синхронизираното разлистване.\n" -"Когато е активна тази опция, разлистването на папка от местното дърво ще " -"разлисти съответстващата и папка на сървъра и обратно." +"Когато е избрано, разлистването на папка от местното дърво ще разлисти " +"съответстващата ѝ папка на сървъра и обратно." -#: resources.h:1012 resources.h:1013 +#: ../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Превключва обработката на опашката" -#: resources.h:1004 resources.h:1005 +#: ../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Превключва показването на местното дърво" -#: resources.h:1002 resources.h:1003 +#: ../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Превключва показването на дневника" -#: resources.h:1006 resources.h:1007 +#: ../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Превключва показването на отдалеченото дърво" -#: resources.h:1008 resources.h:1009 +#: ../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Превключва показването на опашката" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:590 +#: ../src/engine/http/request.cpp:254 msgid "Too long header line" msgstr "Твърде дълъг заглавен ред" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:665 +#: ../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Твърде много препращания" -#: ../../locales/../src/engine/logging.cpp:126 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:359 +#: ../src/engine/logging.cpp:116 ../src/interface/StatusView.cpp:292 +#: ../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "Трасиране:" -#: resources.h:894 resources.h:900 +#: ../src/interface/resources/xrc/settings.xrc:1902 +#: ../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Прехвърляне" -#: resources.h:299 +#: ../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "&Посока на прехвърляне" -#: resources.h:476 +#: ../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "&Метод на прехвърляне" -#: resources.h:704 +#: ../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Режим на прехвърляне" -#: resources.h:844 +#: ../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Опашка" -#: resources.h:981 +#: ../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Прехвърляне" -#: ../../locales/../src/engine/transfersocket.cpp:495 -#: ../../locales/../src/engine/transfersocket.cpp:517 +#: ../src/engine/ftp/transfersocket.cpp:453 +#: ../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" -msgstr "Връзката за прехвърляне прекъсната: %s" +msgstr "Връзката за прехвърляне е прекъсната: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Прехвърляните данни бяха замърсени." -#: ../../locales/../src/interface/QueueView.cpp:1488 -#: ../../locales/../src/interface/statuslinectrl.cpp:275 +#: ../src/interface/statuslinectrl.cpp:259 ../src/interface/queue.cpp:360 msgid "Transferring" msgstr "Прехвърляне" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +#: ../src/interface/settings/settingsdialog.cpp:99 msgid "Transfers" msgstr "Прехвърляния" -#: ../../locales/../src/interface/QueueView.cpp:3115 -#: ../../locales/../src/interface/QueueView.cpp:3118 +#: ../src/interface/QueueView.cpp:2644 msgid "Transfers finished" msgstr "Прехвърлянията приключени" -#: resources.h:796 +#: ../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Файлове &без разширения са ASCII" -#: resources.h:792 +#: ../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Файлове &със следните разширения са ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:879 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:385 msgid "Trust changed Hostkey:" msgstr "Доверяване на променения ключ на хоста:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:382 msgid "Trust new Hostkey:" msgstr "Доверяване на новия ключ на хоста:" -#: resources.h:156 +#: ../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Доверяване на новия ключ и продължаване със свързването?" -#: resources.h:27 +#: ../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" -msgstr "Доверяване на сертификата и продължаване със свързването" +msgstr "Доверяване на сертификата и продължаване осъществяването на връзка?" -#: resources.h:143 +#: ../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Доверяване на хоста и продължаване със свързването?" -#: resources.h:1039 resources.h:1044 +#: ../src/interface/resources/xrc/update.xrc:139 +#: ../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Повторен опит" -#: resources.h:334 ../../locales/../src/interface/edithandler.cpp:1119 +#: ../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../src/interface/edithandler.cpp:1137 msgid "Type" -msgstr "Тип" +msgstr "Вид" -#: resources.h:730 +#: ../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" -msgstr "Тип FTP прокси:" +msgstr "Вид FTP прокси:" -#: resources.h:755 +#: ../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" -msgstr "Тип нормално прокси:" +msgstr "Вид нормално прокси:" -#: resources.h:269 +#: ../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "&Качване" -#: resources.h:423 resources.h:776 -#, no-c-format +#: ../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "при к&ачване:" -#: resources.h:912 +#: ../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" -msgstr "Използване на \"&Файлови асоциации\" ако има" +msgstr "Използване на „&Файлови асоциации“ ако има" -#: resources.h:858 -msgid "U&se system defaults" -msgstr "И&зползване на системните стойности" +#: ../src/interface/resources/xrc/settings.xrc:1625 +msgid "U&se system defaults for current language" +msgstr "Използване на &системните настройки за текущия език" -#: resources.h:732 +#: ../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "&ИМЕ@ХОСТ" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:548 +#: ../src/engine/proxy.cpp:387 ../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Неизползван код за грешка %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:184 +#: ../src/interface/verifycertdialog.cpp:250 msgid "Unit:" msgstr "Поделение:" -#: ../../locales/../src/interface/edithandler.cpp:1151 -#: ../../locales/../src/interface/edithandler.cpp:1179 +#: ../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../src/interface/edithandler.cpp:1169 ../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "неизвестен" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:712 +#: ../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" -"Непознат тип FTP прокси, невъзможно създаване на входна последователност." +"Непознат вид FTP прокси, невъзможно създаване на входна последователност." -#: ../../locales/../src/engine/proxy.cpp:462 +#: ../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" -msgstr "Неизвестна версия на SOCKS протокола: %d" +msgstr "Неизвестно издание на протокола SOCKS: %d" -#: resources.h:1 +#: ../src/interface/resources/xrc/certificate.xrc:4 msgid "Unknown certificate" msgstr "Неизвестен сертификат" -#: ../../locales/../src/interface/xmlfunctions.cpp:358 -#: ../../locales/../src/interface/xmlfunctions.cpp:370 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" -"Неизвестна грешка при отваряне на файла. Уверете се, че файлът може да бъде " -"достъпен и е добре формирани XML документ." +#: ../src/engine/misc.cpp:71 ../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Неизвестна грешка %d" -#: resources.h:136 +#: ../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Неизвестна грешка %u" + +#: ../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Неизвестен хост-ключ" -#: ../../locales/../src/engine/proxy.cpp:472 +#: ../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "" -"Неизвестна версия на протокол на диалог при SOCKS удостоверяване, чрез " +"Неизвестно издание на протокол за диалог при удостоверяване на SOCKS, чрез " "потребителско име и парола: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:392 +#: ../src/interface/xmlfunctions.cpp:283 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Непознат коренов елемент. Файлът не изглежда да е генериран от FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:596 -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../src/engine/http/request.cpp:379 +msgid "Unknown transfer encoding" +msgstr "Неизвестен" + +#: ../src/interface/netconfwizard.cpp:618 +#: ../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7693,7 +8448,7 @@ "Докато не се отстранят тези проблеми активният режим няма да работи и ще " "трябва да се използва пасивен режим." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7701,257 +8456,224 @@ "Докато не бъде отстранен този проблем, активният режим няма да работи и ще " "трябва да се използва пасивен режим." -#: ../../locales/../src/engine/tlssocket.cpp:1061 +#: ../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" -msgstr "Неподдържан тип сертификат" +msgstr "Неподдържан вид сертификат" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:650 +#: ../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Неподдържано препращане" -#: resources.h:270 +#: ../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "К&ачване и отказ от редакция" -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:113 +#: ../src/interface/settings/optionspage_updatecheck.cpp:45 +#: ../src/interface/settings/settingsdialog.cpp:112 msgid "Updates" -msgstr "Актуализация" +msgstr "Обновяване" -#: resources.h:301 +#: ../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "&Качване" -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Неуспешно качване" -#: ../../locales/../src/interface/statusbar.cpp:573 +#: ../src/interface/statusbar.cpp:604 #, c-format msgid "Upload limit: %s/s" msgstr "Ограничение при качване: %s/c" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../src/interface/statusbar.cpp:607 msgid "Upload limit: none" msgstr "Ограничение при качване: няма" -#: resources.h:608 +#: ../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../src/interface/search.cpp:918 +msgid "Upload search results" +msgstr "Качване на резултатите" + +#: ../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Качване избраната папка" -#: resources.h:507 +#: ../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Качване избраните файлове и папки" -#: resources.h:254 +#: ../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Качване файла обратно на сървъра?" -#: resources.h:253 +#: ../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Качване файла на сървъра?" -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1170 -#: ../../locales/../src/interface/edithandler.cpp:1335 +#: ../src/interface/edithandler.cpp:1154 ../src/interface/edithandler.cpp:1188 +#: ../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Качване" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1337 +#: ../src/interface/edithandler.cpp:1157 ../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Чака качване и премахване" -#: ../../locales/../src/interface/edithandler.cpp:1173 -#: ../../locales/../src/interface/edithandler.cpp:1339 +#: ../src/interface/edithandler.cpp:1191 ../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Качване и отказ от редакция" -#: resources.h:993 +#: ../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Потре&бителски" -#: resources.h:909 +#: ../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Потре&бителски редактор:" -#: resources.h:360 +#: ../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" -msgstr "Използване на &редакторът по подразбиране за текстови файлове." +msgstr "Използване стандартният текстов &редактор" -#: resources.h:343 resources.h:349 +#: ../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "&Синхронизирано разлистване" -#: resources.h:991 +#: ../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Използване на регулярени изрази" + +#: ../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "Използване на UTF-8 ако сървърът поддържа, иначе местния знаков набор." -#: resources.h:196 resources.h:206 +#: ../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" -msgstr "Използване подразбиращото се" +msgstr "Използване на стандартното действие" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:514 -msgid "Use plain FTP" -msgstr "Използване на чист FTP" +#: ../src/interface/sitemanager_dialog.cpp:541 +msgid "Use explicit FTP over TLS if available" +msgstr "Използване на FTP през TLS при възможност" -#: resources.h:309 +#: ../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Използване на текущия сървър" -#: resources.h:310 +#: ../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" -msgstr "Използване на сървър от Манипулатор връзки" +msgstr "Използване на сървър от Управление на връзки" -#: resources.h:853 -msgid "Use system &defaults" -msgstr "&Използване на системните стойности" +#: ../src/interface/resources/xrc/settings.xrc:1576 +msgid "Use system &defaults for current language" +msgstr "Използване на &системните настройки за текущия език" -#: resources.h:656 +#: ../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" msgstr "&Използване на следния IP адрес:" -#: resources.h:666 +#: ../src/interface/resources/xrc/netconfwizard.xrc:283 msgid "Use the following port range:" msgstr "&Използване на следния обхват портове:" -#: resources.h:651 +#: ../src/interface/resources/xrc/netconfwizard.xrc:152 msgid "Use the server's external IP address instead" msgstr "&Използване външния IP адрес на сървъра" -#: resources.h:657 resources.h:720 +#: ../src/interface/resources/xrc/netconfwizard.xrc:207 +#: ../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" "Използвайте тази опция, ако сте зад маршрутизатор и имате статичен външен IP " "адрес." -#: resources.h:660 +#: ../src/interface/resources/xrc/netconfwizard.xrc:240 msgid "" "Use this option if you have a dynamic IP address. FileZilla will contact the " "above server once each session as soon as you use active mode for the first " "time. Only the version of FileZilla you're using is submitted to the server." msgstr "" -"Използвайте тази опция, ако имате динамичен IP адрес. FileZilla ще се обръща " -"към горния сървър веднъж всяка сесия, стига да ползвате активният режим за " -"пръв път. Към сървъра се предава само версията на FileZilla." +"Използвайте тази настройка, ако имате динамичен IP адрес. FileZilla ще се " +"обръща към горния сървър веднъж всяка сесия, стига да ползвате активният " +"режим за пръв път. Към сървъра се изпраща само изданието на FileZilla." -#: resources.h:86 +#: ../src/interface/resources/xrc/dialogs.xrc:292 +#: ../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Потребител:" -#: ../../locales/../src/interface/manual_transfer.cpp:518 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 +#: ../src/interface/manual_transfer.cpp:491 +#: ../src/interface/sitemanager_dialog.cpp:1077 msgid "Username cannot be a series of spaces" msgstr "Потребителското име не трябва да е последователност от шпации" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4457 -#, c-format -msgid "Using proxy %s" -msgstr "Използване прокси %s" - -#: resources.h:995 +#: ../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" "Използването на грешен знаков набор ще доведе до неправилно показване " "имената на папки и файлове." -#: resources.h:5 resources.h:34 +#: ../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" msgstr "Валиден от:" -#: resources.h:6 resources.h:35 +#: ../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" msgstr "Валиден до:" -#: ../../locales/../src/interface/cmdline.cpp:17 +#: ../src/interface/cmdline.cpp:17 msgid "Verbose log messages from wxWidgets" msgstr "Подробен дневник от wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1147 +#: ../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." -msgstr "Проверяване на сертификат..." +msgstr "Проверяване на сертификат…" -#: resources.h:131 -msgid "Version:" -msgstr "Версия:" - -#: resources.h:781 +#: ../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Много висока" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1462 +#: ../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "Показването на скрити файлове е включено, но не се поддържа от сървъра" -#: resources.h:896 +#: ../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" -msgstr "Преглед/Редакция" +msgstr "Преглед/Редактиране" -#: resources.h:293 +#: ../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Видими колони" -#: resources.h:101 +#: ../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "З&апис" -#: ../../locales/../src/interface/QueueView.cpp:1795 -msgid "Waiting" -msgstr "Изчакване" - -#: ../../locales/../src/interface/QueueView.cpp:1391 +#: ../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Изчакване на връзка за разлистване" -#: ../../locales/../src/interface/QueueView.cpp:1438 +#: ../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Изчакване на парола" -#: ../../locales/../src/interface/statuslinectrl.cpp:269 +#: ../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Изчакване за отменяна на прехвърлянето" -#: ../../locales/../src/engine/engineprivate.cpp:194 +#: ../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." -msgstr "Изчакване за нов опит..." +msgstr "Изчакване за нов опит…" -#: ../../locales/../src/interface/FileZilla.cpp:311 -msgid "" -"Warning!\n" -"\n" -"A bug in Windows causes problems with FileZilla\n" -"\n" -"The bug occurs if you have\n" -"- Windows Server 2003 or XP 64\n" -"- Windows Firewall enabled\n" -"- Application Layer Gateway service enabled\n" -"See http://support.microsoft.com/kb/931130 for background information.\n" -"\n" -"Unless you either disable Windows Firewall or the Application Layer Gateway " -"service,\n" -"FileZilla will timeout on big transfers." -msgstr "" -"Внимание!\n" -"\n" -"Дефект в Windows води до проблем с FileZilla\n" -"\n" -"Дефектът се показва, ако имате:\n" -"- Windows Server 2003 или XP 64\n" -"- защитната стена на Windows е включена\n" -"- услугата \"Application Layer Gateway\" е включена\n" -"За повече информация вижте http://support.microsoft.com/kb/931130.\n" -"\n" -"Докато не изключите или защитната стена на Windows, или услугата " -"\"Application Layer Gateway\",\n" -"FileZilla ще надхвърля времето за изчакване при големи прехвърляния." - -#: ../../locales/../src/interface/netconfwizard.cpp:972 +#: ../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Внимание: игнориране на връзка за данни от грешен IP адрес." -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 +#: ../src/interface/settings/optionspage_updatecheck.cpp:45 msgid "" "Warning, use nightly builds at your own risk.\n" "No support is given for nightly builds.\n" @@ -7959,30 +8681,30 @@ "\n" "Do you really want to check for nightly builds?" msgstr "" -"Внимание: използването на нощни компилации е на ваша отговорност.\n" +"Внимание: използването на нощни компилации е на собствена отговорност.\n" "Нощните компилации не се поддържат.\n" "Нощните компилации може да не работят по очаквания начин и дори могат да " "повредят системата ви.\n" "\n" "Наистина ли искате да проверите за нощни компилации?" -#: resources.h:148 +#: ../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Внимание: Възможен пробив в сигурността!" -#: resources.h:413 +#: ../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Добре дошли във FileZilla" -#: resources.h:402 +#: ../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" -msgstr "Новото в тази версия" +msgstr "Новото в това издание" -#: resources.h:1033 +#: ../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" -msgstr "Новото в тази версия:" +msgstr "Новото в това издание:" -#: resources.h:430 +#: ../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -7991,82 +8713,109 @@ "повторно, без да се налага да въвеждате паролата си отново след рестартиране " "на FileZilla." -#: resources.h:784 +#: ../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." msgstr "" -"Когато е активна тази опция, при изтегляне на файл, съдържащ в името си " -"неподдържани знаци от локалната операционна система те ще бъдат заменяни." +"Когато е отметнато, при изтегляне на файл, съдържащ в името си неподдържани " +"знаци от локалната операционна система те ще бъдат заменяни." -#: resources.h:839 +#: ../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" -msgstr "" +msgstr "При о&съществяване на нова връзка, когато има осъществена друга:" -#: resources.h:826 +#: ../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Широк екран" -#: resources.h:429 +#: ../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Бихте ли искали FileZilla да запомня пароли?" -#: resources.h:105 +#: ../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Запи&с" -#: ../../locales/../src/interface/netconfwizard.cpp:433 -#: ../../locales/../src/interface/netconfwizard.cpp:440 +#: ../src/interface/netconfwizard.cpp:455 +#: ../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Грешен външен IP адрес" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:813 +#: ../src/engine/http/request.cpp:438 msgid "Wrong line endings" msgstr "Грешни символи за край на ред" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:891 +#: ../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Въведена е невярна главна парола, с която не може да бъде разшифрована " +"запазените пароли." + +#: ../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Въведена е невярна главна парола, с която не може да бъде разшифрован този " +"елемент." + +#: ../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "жълто" + +#: ../src/engine/sftp/sftpcontrolsocket.cpp:396 msgid "Yes" msgstr "Да" -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "" "Изглежда използвате хост само с IPv6. Този съветник не поддържа такава мрежа." -#: resources.h:1047 +#: ../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." -msgstr "Използвате най-новата версия на FileZilla." +msgstr "Използвате най-новото издание на FileZilla." -#: resources.h:411 +#: ../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Можете да отворите този прозорец от менюто за помощ." -#: resources.h:1041 resources.h:1046 +#: ../src/interface/resources/xrc/update.xrc:166 +#: ../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" -msgstr "Може да изтеглите най-новата версия от страницата на FileZilla:" +msgstr "Може да изтеглите най-новото издание от страницата на FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" -"Може да оставите полето за порт празно, за да бъде използван този по " -"подразбиране." +"Може да оставите полето за порт празно, за да бъде използван стандартният " +"порт." -#: resources.h:108 +#: ../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "" -"Можете да поставите \"x\" на всяка позиция, на която искате да запазите " +"Можете да поставите „x“ на всяка позиция, на която искате да запазите " "правата, които са имали оригиналните файлове." -#: ../../locales/../src/interface/import.cpp:28 +#: ../src/interface/sitemanager_dialog.cpp:1120 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Тъй като използвате главна парола не може да променяте паролата и шифроващия " +"ключ поотделно." + +#: ../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Не може да бъдат импортирани настройки от папката с настройки на FileZilla." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:145 +#: ../src/interface/settings/optionspage_transfer.cpp:149 msgid "" "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." @@ -8074,16 +8823,19 @@ "Не може да бъде заменян невалиден знак с друг невалиден знак. Моля, въведете " "знак разрешен в име на файл." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Файлове в кореновата папка не могат да бъдат качвани." + +#: ../src/interface/asyncrequestqueue.cpp:313 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Не сте въвели ново име за файла. Желаете ли да бъде презаписан?" -#: resources.h:392 +#: ../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Избрали сте поне една символична връзка." -#: ../../locales/../src/interface/LocalListView.cpp:1699 -#: ../../locales/../src/interface/RemoteListView.cpp:2392 +#: ../src/interface/edithandler.cpp:1639 ../src/interface/search.cpp:1197 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8091,7 +8843,7 @@ "Избрани са повече от 10 файла за редактиране, сигурни ли сте, че искате да " "продължите?" -#: ../../locales/../src/interface/LocalListView.cpp:1818 +#: ../src/interface/LocalListView.cpp:1798 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8099,35 +8851,47 @@ "Избрани са повече от 10 файла или папки за отваряне, сигурни ли сте, че " "искате да продължите?" -#: ../../locales/../src/interface/manual_transfer.cpp:433 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:941 +#: ../src/interface/manual_transfer.cpp:407 +#: ../src/interface/sitemanager_dialog.cpp:985 msgid "You have to enter a hostname." msgstr "Трябва да въведете име на хост." -#: ../../locales/../src/interface/search.cpp:510 +#: ../src/interface/sitemanager_dialog.cpp:1095 +msgid "You have to enter a key file path" +msgstr "Трябва да въведете път до файл-ключ" + +#: ../src/interface/search.cpp:904 msgid "You have to enter a local directory." msgstr "Трябва да въведете местна папка." -#: ../../locales/../src/interface/netconfwizard.cpp:149 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Трябва да въведете валиден IP адрес." +#: ../src/interface/search.cpp:918 +msgid "You have to enter a remote directory." +msgstr "Трябва да въведете отдалечена папка." + +#: ../src/interface/settings/optionspage_connection_active.cpp:91 +#: ../src/interface/netconfwizard.cpp:156 +msgid "You have to enter a valid IPv4 address." +msgstr "Трябва да въведете валиден IPv4 адрес." + +#: ../src/interface/sitemanager_dialog.cpp:1129 +msgid "You have to enter a valid encryption key" +msgstr "Трябва да въведете валиден ключ за шифроване" -#: ../../locales/../src/interface/search.cpp:516 +#: ../src/interface/search.cpp:909 msgid "You have to enter a writable local directory." msgstr "Трябва да въведете местна папка с разрешение за писане." -#: ../../locales/../src/interface/manual_transfer.cpp:529 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../src/interface/manual_transfer.cpp:502 +#: ../src/interface/sitemanager_dialog.cpp:1087 msgid "You have to enter an account name" msgstr "Трябва да въведете име на регистрация" -#: ../../locales/../src/interface/manual_transfer.cpp:499 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1014 +#: ../src/interface/manual_transfer.cpp:476 +#: ../src/interface/sitemanager_dialog.cpp:1062 msgid "You have to specify a user name" msgstr "Трябва да въведете потребителско име" -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8135,68 +8899,80 @@ "Най-вероятно имате маршрутизатор или защитна стена, които погрешно променят " "прехвърляните данни." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Трябва да въведете главна парола." + +#: ../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Моля, въведете име на отметката." -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 +#: ../src/interface/settings/optionspage_logging.cpp:67 msgid "You need to enter a name for the log file." msgstr "Моля, въведете име на файла-дневник." -#: ../../locales/../src/interface/edithandler.cpp:1526 +#: ../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Трябва да въведете команда, правилно поставена в кавички." -#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 +#: ../src/interface/settings/optionspage_ftpproxy.cpp:82 +#: ../src/interface/settings/optionspage_proxy.cpp:79 msgid "You need to enter a proxy host." msgstr "Трябва да въведете прокси." -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 +#: ../src/interface/settings/optionspage_proxy.cpp:88 msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Трябва да въведете прокси порт в обхвата от 1 до 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:440 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../src/interface/bookmarks_dialog.cpp:79 +#: ../src/interface/bookmarks_dialog.cpp:460 +#: ../src/interface/sitemanager_dialog.cpp:1191 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Трябва да въведете поне една пътека, празни отметки не се поддържат." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1112 +#: ../src/interface/bookmarks_dialog.cpp:85 +#: ../src/interface/bookmarks_dialog.cpp:466 +#: ../src/interface/sitemanager_dialog.cpp:1198 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" -"Трябва да въведете и местен и отдалечен път, за да активирате синхронизирано " +"Трябва да въведете и местен и отдалечен път, за да включите синхронизираното " "разлистване за тази отметка." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../src/interface/sitemanager_dialog.cpp:1154 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "" -"Трябва да въведете и местен, и отдалечен път, за да активирате " -"синхронизираното разлистване за тази връзка." +"Трябва да въведете и местен и отдалечен път, за да включите синхронизираното " +"разлистване за тази връзка." -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Трябва да дадете на FileZilla права за достъп до папките, от които желаете " +"да изтегляте или да качвате файлове." + +#: ../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Трябва да укажете местен файл." -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Трябва да укажете отдалечен файл." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Трябва да укажете отдалечен път." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Трябва да укажете сървър." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8204,66 +8980,64 @@ "Не би трябвало да имате проблеми при свързване с други сървъри, " "прехвърлянията би трябвало да работят." -#: ../../locales/../src/interface/QueueView.cpp:3223 +#: ../src/interface/QueueView.cpp:2769 msgid "Your computer will suspend unless you click Cancel." msgstr "Системата ще се изключи освен ако не натиснете Отказ." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "след" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "преди" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "започва с" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446 +#: ../src/interface/filter_conditions_dialog.cpp:138 +#: ../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "байта" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "съдържа" -#: ../../locales/../src/interface/updater.cpp:247 +#: ../src/interface/updater.cpp:251 msgid "custom" msgstr "потребителски" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "не съдържа" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../src/interface/filter_conditions_dialog.cpp:71 +#: ../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "не равно" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "окончава на" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../src/interface/filter_conditions_dialog.cpp:70 +#: ../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "равно" -#: ../../locales/../src/interface/filelistctrl.cpp:537 -#: ../../locales/../src/interface/filelistctrl.cpp:556 -#: ../../locales/../src/interface/filelistctrl.cpp:583 -#: ../../locales/../src/interface/filelistctrl.cpp:599 +#: ../src/interface/filelistctrl.cpp:557 ../src/interface/filelistctrl.cpp:575 +#: ../src/interface/filelistctrl.cpp:605 ../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "файл" -#: ../../locales/../src/interface/edithandler.cpp:85 +#: ../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../src/interface/fzputtygen_interface.cpp:177 +#: ../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8272,88 +9046,115 @@ "fzputtygen не можа да бъде стартиран.\n" "Уверете се, че той е в същата папка, където е и изпълнимия файл на FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1560 +#: ../src/engine/sftp/connect.cpp:101 +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "fzsftp е от друго издание на FileZilla" + +#: ../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "fzsftp не можа да бъде стартиран" -#: ../../locales/../src/engine/tlssocket.cpp:1099 +#: ../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj е от друго издание на FileZilla" + +#: ../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj не може да бъде стартиран" + +#: ../src/interface/storj_key_interface.cpp:62 +#: ../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj не може да бъде стартиран.\n" +"Уверете се, че той е в същата папка, където е и изпълнимия файл на FileZilla." + +#: ../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers не върна сертификати" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "Грешка в gnutls_pem_base64_encode2" + +#: ../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "по-голямо от" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "изпълнение от групата" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "четене от групата" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "писане от групата" -#: resources.h:863 +#: ../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" -msgstr "http://wiki.filezilla-project.org/Date_and_Time_formatting" +msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "е равно на" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "е" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "не е" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "по-малко от" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "удовлетворява регулярния израз" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../src/interface/asyncrequestqueue.cpp:296 +msgid "new name" +msgstr "ново име" + +#: ../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "изпълнение от собственика" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "четене от собственика" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "писане от собственика" -#: ../../locales/../src/engine/tlssocket.cpp:1158 -#: ../../locales/../src/engine/tlssocket.cpp:1169 -#: ../../locales/../src/engine/tlssocket.cpp:1184 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29 +#: ../src/engine/proxy.cpp:64 ../src/engine/tlssocket_impl.cpp:1454 +#: ../src/engine/tlssocket_impl.cpp:1470 ../src/engine/tlssocket_impl.cpp:1486 +#: ../src/engine/tlssocket_impl.cpp:1502 +#: ../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "неизвестен" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "изпълнение от всички" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "четене от всички" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "писане от всички" -#: resources.h:126 +#: ../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" - -#~ msgid "Cannot load file, not a valid XML file." -#~ msgstr "Неуспешно зареждане на файл - невалиден XML файл." diff -Nru filezilla-3.15.0.2/locales/ca.po filezilla-3.33.0/locales/ca.po --- filezilla-3.15.0.2/locales/ca.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/ca.po 2018-02-16 16:26:26.000000000 +0000 @@ -5,12 +5,13 @@ # # Toni Hermoso Pulido , 2008, 2009 # Oscar Martinez Llobet , 2005, 2006, 2007, 2008. +# Joan Monguillot Serra , 2015-2018. msgid "" msgstr "" "Project-Id-Version: FileZilla\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-12 15:30+0200\n" -"PO-Revision-Date: 2015-05-31 14:20+0100\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-02-16 14:59+0100\n" +"PO-Revision-Date: 2018-02-14 21:12+0100\n" "Last-Translator: Toni Hermoso Pulido \n" "Language-Team: Català\n" "Language: ca\n" @@ -19,21 +20,21 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.7.6\n" +"X-Generator: Poedit 2.0.5\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "transcorregut %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "queda %H:%M:%S" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -42,101 +43,110 @@ "%a - Compte (Les línies que continguin això seran omeses si no s'utilitza un " "tipus d'entrada 'Compte')" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d directori" msgstr[1] "%d directoris" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:453 -#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/RemoteListView.cpp:1425 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d directori amb els seus continguts" msgstr[1] "%d directoris amb llurs continguts" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:452 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fitxer" msgstr[1] "%d fitxers" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d fitxer. Mida total: %s" msgstr[1] "%d fitxers. Mida total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d fitxer. Mida total: Com a mínim %s" msgstr[1] "%d fitxers. Mida total: Com a mínim %s" -#: ../../locales/../src/interface/QueueView.cpp:2796 -#, c-format -msgid "%d files added to queue" -msgstr "%d fitxers afegits a la cua" - -#: ../../locales/../src/engine/ControlSocket.cpp:101 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segon" msgstr[1] "%d segons" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Amfitrió" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu directori" +msgstr[1] "%llu directoris" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu fitxer" +msgstr[1] "%llu fitxers" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Contrasenya" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - El certificat ha vençut!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Encara no és vàlid!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Usuari per al servidor intermediari" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s i %s. Mida total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s i %s. Mida total: Com a mínim %s" @@ -148,164 +158,178 @@ msgstr[0] "%s byte" msgstr[1] "%s bytes" -#: ../../locales/../src/interface/FileZilla.cpp:595 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"no s'ha pogut trobar el %s. Sense aquest component del FileZilla, SFTP no " +"No s'ha pogut trobar el %s. Sense aquest component del FileZilla, el %s no " "funcionarà.\n" "\n" -"Si us plau, baixeu-vos el FileZilla una altra vegada. Si el problema " -"persisteix, envieu un informe d'error." +"Si us plau, baixeu-vos el FileZilla de nou. Si el problema persisteix, " +"envieu un informe d'error." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s no s'ha pogut trobar. Sense aquest component del FileZilla, el SFTP no " +"No s'ha pogut trobar el %s. Sense aquest component del FileZilla, el %s no " "funcionarà.\n" "\n" "Solucions possibles:\n" "- Assegureu-vos que %s està a un directori que aparegui a la vostra variable " "d'entorn PATH.\n" -"- Afegiu el camí sencer a %s en la variable d'entorn FZ_FZSFTP." +"- Afegiu el camí sencer a %s en la variable d'entorn %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s amb %d bits" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - El nom de l'amfitrió no coincideix amb el certificat" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Nom d'usuari" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Contrasenya del servidor intermediari" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "&Avorta la connexió anterior i connecta en la pestanya actual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "&Quant a..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "C&ompte:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Actiu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "&Afegeix una adreça d'interès..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Afegeix directori..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Afegeix fitxers a la cua" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 +msgid "&Add key file..." msgstr "&Afegeix un fitxer de claus..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Afegeix a la cua" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Ajusta la compensació del fus horari del servidor:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." -msgstr "Sempre confi&ar en el certificat en sessions futures." +msgstr "Confi&ar sempre en el certificat en sessions futures." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:879 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "" "Sempre confi&a en aquest amfitrió, afegeix aquesta clau a la memòria cau" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "Utilitza &sempre l'editor per defecte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Usa sempre la selecció per als arxius sense associar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "Sempre utilitz&a aquesta acció" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Demana l'adreça IP externa al sistema operatiu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Auto" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Autodetecta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "Color de &fons:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Binari" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "Prefixos &binaris utilitzant símbols SI (p. ex. 1 KB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "A&dreces d'interès" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2235 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2724 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3099 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:295 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Navega..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Tolerància de la velocitat de bits:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1009 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Cancel·la" @@ -317,19 +341,23 @@ msgid "&Close" msgstr "Tan&ca" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "Tan&ca el FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "Tan&ca el FileZilla una vegada" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "&Configura els límits de velocitat..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "&Configura..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Connecta" @@ -337,142 +365,152 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Copia la connexió actual al gestor de llocs..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:787 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "&Copia al porta-retalls" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Crea un directori" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" msgstr "&Crea una nova pestanya" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Depuració" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "Informació de &depuració al registre de missatges:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "E&ditor per defecte:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "&Acció de fitxer existent per defecte..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Retard entre intents d'entrada fallits:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1053 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1223 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "Suprimei&x" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Suprimeix l'enllaç simbòlic" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "Permisos d'accés al &directori..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "&Comparació de directoris" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/state.cpp:1030 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"&Inhabilitar la navegació sincronitzada i continuar canviant el directori " +"local" + +#: ../../locales/../src/interface/state.cpp:1108 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" +"&Inhabilitar la navegació sincronitzada i continuar canviant el directori " +"remot" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "&Descarta el fitxer local, baixa i edita el fitxer nou" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "&Desconnecta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Desconnecta del servidor" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "" "Mostra la &velocitat de transferència momentània enlloc de la velocitat " "mitjana" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Mostra la mida en bytes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3629 -msgid "&Do not remember passwords (recommended)" -msgstr "&No recordar contrasenyes (recomanat)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "No tornis a mostrar aquest &diàleg." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "&No utilitzis l'adreça IP externa a les connexions locals." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "Acció de doble clic en els &fitxers:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Baixada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Baixa a:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Baixa…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1382 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Baixades:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Edita" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "Edita les ®les de filtratge..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "&Habilita" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Permet la compressió" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Activa els límits de velocitat" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "C&odificació:" @@ -480,28 +518,28 @@ msgid "&Encryption:" msgstr "&Xifratge:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "Introdueix una ordre &específica..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3453 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "&Estableix la connexió en una nova pestanya" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Executa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Exporta les entrades del gestor de llocs" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Exporta..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Retorna a mode actiu" @@ -509,35 +547,47 @@ msgid "&File" msgstr "&Fitxer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "Atributs del &fitxer..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "Permisos de &fitxer..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Fitxer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Condicions de filtres:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "Configuració de &filtres:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 -msgid "&Filters:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" msgstr "&Filtres" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +msgid "&Filters:" +msgstr "&Filtres:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Finalitza l'edició i esborra el fitxer local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"A&plana els camins locals, puja tots els fitxers continguts directament al " +"directori de destinació" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -545,55 +595,55 @@ "A&plana els camins remots, baixa tots els fitxers continguts directament al " "directori de destinació" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "" "&Segueix l'enllaç simbòlic, suprimeix el contingut del directori destinació" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" -msgstr "&Obté l'adreça IP externa d'aquesta adreça URL:" +msgstr "&Obtén l'adreça IP externa d'aquesta adreça URL:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Obtenció d'ajuda..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "Adreça d'interès &global" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 usant el mètode CONNECT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "A&juda" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Amaga els fitxers idèntics" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "Mé&s alta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Port més alt disponible:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2370 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Amfitrió:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "Prefixos binaris &IEC (p. ex. 1 KiB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (exemple: 2007-09-15)" @@ -601,84 +651,96 @@ msgid "&Import..." msgstr "&Importa..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "&Hereda les associacions de tipus de fitxers del sistema" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Instal·la la nova versió" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "Conser&va l'estructura de camins locals relativa a l'arrel de cerca" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "Conser&va l'estructura de camins remots relativa a l'arrel de cerca" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 +msgid "&Key file:" +msgstr "Fitxer de &claus:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Disposició de les subfinestres de fitxers i directoris:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Limita els port locals utilitzats pel FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Limita el nombre de connexions simultànies" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "&Arbre de directoris locals" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2629 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2712 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "Directori &local:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "Cerca &local" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Enregistra a un fitxer" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "Tipus d'&entrada:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "Tipus d'&entrada:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Baixa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "&Gestiona les adreces d'interès..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "Transferència &manual..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "Nombre &màxim de connexions:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "Nombre &màxim d'intents:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "&Missatge del registre" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Minimitza a la safata" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" -msgstr "Mode d'ordenació per &nom" +msgstr "Mode d'ordenació per &nom:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Nom:" @@ -686,7 +748,7 @@ msgid "&Network configuration wizard..." msgstr "&Auxiliar de configuració de la xarxa..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Nou" @@ -694,164 +756,173 @@ msgid "&New Site" msgstr "Afegeix un &lloc" -#: ../../locales/../src/interface/Mainfrm.cpp:1723 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Nova versió disponible!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Següent >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1746 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&No" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Cap" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Normal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "Valor &numèric:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2848 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&D'acord" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&OBRE" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Obre" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "S&obreescriu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Passiu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Contrasenya:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "A&vís sonor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Port:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Conserva les marques horàries dels fitxers transferits" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Cua" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Connexió ràpida" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "Barra de conne&xió ràpida" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1489 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" -msgstr "Neteja l'historial de &connexió ràpida" +msgstr "Historial de &connexió ràpida" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Lectura" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "&Reconnecta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" -msgstr "Neteja la informació de &reconnexió" +msgstr "Informació de &reconnexió" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "&Refresca" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Recorda la contrasenya mestra fins que es tanqui el Filezilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "&Recorda aquesta contrasenya fins que es tanqui el Filezilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3623 -msgid "&Remember passwords" -msgstr "&Recorda contrasenyes" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2656 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "Directori &remot:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2259 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "Camí &remot:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "Cerca &remota" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "Sup&rimeix" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "Sup&rimeix la clau" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "Esbo&rra seleccionats" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1229 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2793 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Canvia el nom" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1048 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Canvia el nom..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Reobre el fitxer local" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Substitueix caràcters no vàlids amb:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "&Informa d'un error..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Requereix atenció" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "&Reinicia i torna a encuar-ho tot" @@ -859,39 +930,39 @@ msgid "&Restart Wizard" msgstr "&Reinicia l'auxiliar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Reprèn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "E&xecuta una ordre..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Executa l'auxiliar de configuració ara..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Executa la comprovació d'actualitzacions ara..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" -msgstr "&LLOC:" +msgstr "&LLOC" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "Anomena i de&sa..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "Ce&rca" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Cerca fitxers remots..." @@ -899,20 +970,20 @@ msgid "&Select Entry:" msgstr "&Selecciona una entrada:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Selecciona l'idioma:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Seleccioneu les columnes que s'haurien de mostrar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2298 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Servidor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Configuració" @@ -920,24 +991,19 @@ msgid "&Settings..." msgstr "&Configuració..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Mostra el menú de depuració" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "Mo&stra el registre detallat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "Mo&stra el missatge" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Mostra la marca horària al registre de missatges" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1502 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Entrades del &gestor de llocs" @@ -945,159 +1011,179 @@ msgid "&Site Manager..." msgstr "&Gestor de llocs..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "Adreça d'interès &específica de lloc" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Omet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "&Límits de velocitat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "&Comença la transferència immediatament" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Intercanvia les subfinestres locals i remotes" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "Claus &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Prova" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Tema:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Transferència" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:382 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "Mode de &transferència:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "Cua de &transferències" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "Tracta els fitxers amb &punt (dotfiles) com fitxers ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "" +"Confiar en aquest certificat sobre els noms d'amfitrió alternatius de la " +"llista." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Desfa l'edició" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "Act&ualitza la clau de la memòria cau per a aquest amfitrió" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" -msgstr "&Penja" +msgstr "&Puja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Puja a:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Puja..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Pujades:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Usa programa personalitzat" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Usa navegació sincronitzada" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "Usa l'&editor per defecte del sistema per als arxius de text" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Utilitza aquesta adreça IP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&En lloc d'això, utilitza l'adreça IP externa del servidor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Utilitza el separador de milers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2437 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Usuari:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "Nom d'&usuari:" -#: ../../locales/../src/interface/Mainfrm.cpp:1717 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Versió %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Visualitza" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Visualitza/Edita" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Analitza els fitxers editats en local i demana per pujar les modificacions" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Quan comprova si hi ha actualitzacions, comprova:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Escriptura" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1740 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Sí" -#: ../../locales/../src/engine/local_path.cpp:449 -#: ../../locales/../src/engine/local_path.cpp:495 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." -msgstr "El fitxer '%s' no existeix o no s'hi ha pogut accedir." +msgstr "'%s' no existeix o no s'hi pot accedir." -#: ../../locales/../src/engine/local_path.cpp:464 -#: ../../locales/../src/engine/local_path.cpp:484 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' no és un directori." -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' no és un protocol admès." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 msgid "'Account' logontype not supported by selected protocol" msgstr "" "El tipus d'entrada 'Compte' no és compatible amb el protocol seleccionat" -#: ../../locales/../src/interface/manual_transfer.cpp:440 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1105,7 +1191,7 @@ "Els tipus d'entrada 'Normal' i 'Compte' no estan disponibles. Sí que ho està " "el tipus 'Demana una contrasenya'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1113,7 +1199,7 @@ "Els tipus d'entrada 'Normal' i 'Compte' no estan disponibles. S'ha canviat " "l'entrada al tipus 'Demana una contrasenya'." -#: ../../locales/../src/interface/Mainfrm.cpp:598 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1123,58 +1209,58 @@ "d'ordres per enviar els paràmetres que segueixen la 'cometa' al servidor. " "Potser voleu enviar les ordres FTP concretes sense 'cometa'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" -msgstr[0] "(objecte %d filtrat)" -msgstr[1] "(objectes %d filtrats)" +msgstr[0] "(%d objecte filtrat)" +msgstr[1] "(%d objectes filtrats)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% baixat)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 per il·limitat)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 segons)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 per inhabilitar)" -#: ../../locales/../src/interface/aboutdialog.cpp:84 -#: ../../locales/../src/interface/aboutdialog.cpp:161 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(s'ha establert app-compat a %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(exemple: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(exemple: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(en %s/s)" @@ -1183,9 +1269,9 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" -msgstr "queden --:--:--" +msgstr "--:--:-- queden" #: ../../locales/../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." @@ -1203,56 +1289,60 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s no es pot usar conjuntament amb una URL de FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Cap" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Avís" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Info" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Detallat" -#: ../../locales/../src/interface/aboutdialog.cpp:97 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "sistema de 32-bits" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Depuració" -#: ../../locales/../src/interface/aboutdialog.cpp:95 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "sistema de 64-bits" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Enrere" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Ja existeix una adreça d'interès amb el nom introduït. Introduïu un nom que " "no s'hagi fet servir." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Un certificat de la cadena s'ha signat amb un algoritme insegur" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "S'ha d'establir un editor per defecte." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:783 +#: ../../locales/../src/interface/RemoteListView.cpp:164 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "No es pot arrossegar un directori cap a un dels seus subdirectoris." @@ -1266,22 +1356,22 @@ "aquests casos haureu d'utilitzar el mode actiu. En mode actiu, el FileZilla " "obre un port i li demana al servidor que s'hi connecti." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Un fitxer obert anteriorment ha estat canviat." -#: ../../locales/../src/interface/edithandler.cpp:1676 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Un fitxer amb aquest nom ja s'està transferint." -#: ../../locales/../src/interface/edithandler.cpp:1680 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Encara s'està editant un fitxer amb aquest nom. Tanqueu-lo sisplau i torneu " "a intentar-ho." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1296,11 +1386,20 @@ "fitxers.\n" "No es mostrarà cap més avís durant aquesta sessió." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Una contrasenya mestra perduda és irrecuperable. Memoritzeu bé la vostra " +"contrasenya." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Hi ha disponible una nova versió del FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:658 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1309,7 +1408,7 @@ "espatllats amaguen fitxers a l'usuari. Utilitzeu aquesta opció per forçar " "que el servidor mostri tots els fitxers." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1317,7 +1416,7 @@ "Un servidor correcte no requereix això. Poseu-vos en contacte amb " "l'administrador del servidor si ho necessiteu." -#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1326,17 +1425,17 @@ "activada.\n" "Voleu deshabilitar-la i continuar canviant el directori local?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "&Afegir" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "Permet &reprendre els fitxers ASCII" @@ -1348,51 +1447,53 @@ msgid "A&pply only to uploads" msgstr "A&plica només a les pujades" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "A&plica a tots els fitxers i directoris" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "Esborra a&utomàticament les transferències reeixides" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2514 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Quant al FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Sobre les llistes de fitxer" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1276 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1277 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "No s'ha pogut restablir l'accés a alguns directoris locals:" + +#: ../../locales/../src/engine/server.cpp:582 +#: ../../locales/../src/engine/server.cpp:605 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Compte" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "A&cció després de completar la cua" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Acció sobre el fitxer seleccionat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Acció a realitzar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Acció:" @@ -1400,7 +1501,7 @@ msgid "Active mode" msgstr "Mode actiu" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1408,7 +1509,7 @@ "La prova del mode actiu d'FTP ha fallat. El FileZilla no coneix la vostra " "adreça IP externa correcta." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1417,7 +1518,7 @@ "externa correcta. A més a més, l'encaminador (router) ha modificat l'adreça " "enviada." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1427,39 +1528,40 @@ "adreça IP externa correcta, però el vostre encaminador (router) o tallafocs " "ha modificat enganyosament l'adreça enviada." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP per al mode actiu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Afegeix els fitxers només a la &cua" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Afegeix el directori seleccionat a la cua de transferències" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "" "Afegeix els fitxers i les carpetes seleccionats a la cua de transferències" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Afegeix a la cua" -#: ../../locales/../src/engine/proxy.cpp:488 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Tipus d'adreça no compatible" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Avançat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1474,15 +1576,16 @@ "fins i tot fer malbé el vostre sistema. Utilitzeu les versions beta i les " "versions nocturnes sota la vostra responsabilitat." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "Fer &sempre aquesta acció" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algorisme:" -#: ../../locales/../src/interface/QueueView.cpp:2978 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "Tots els fitxers s'han transferit satisfactòriament" @@ -1490,7 +1593,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Tots els ports del rang donat han d'estar entre 1024 i 65535." -#: ../../locales/../src/interface/QueueView.cpp:2974 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1501,7 +1604,7 @@ "Totes les transferències han finalitzat. Els fitxers %d no s'han pogut " "transferir." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "" "Permet &utilitzar el mode de transferència alternatiu en cas de fallada" @@ -1510,17 +1613,17 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Permet utilitzar el mode de transferència alternatiu en cas de fallada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Ja està connectat" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nom alternatiu:" msgstr[1] "Noms alternatius:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1528,7 +1631,7 @@ "Alternativament, podeu usar l'eina Pageant del PuTTY per administrar les " "vostres claus, el FileZilla pot utilitzar el Pageant." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1536,7 +1639,7 @@ "Alternativament, podeu utilitzar l'agent SSH del vostre sistema. Per a fer-" "ho, assegureu-vos que la variable d'entorn SSH_AUTH_SOCK està configurada." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1544,7 +1647,7 @@ "D'altra banda, també pots baixar la darrera versió des del lloc web del " "FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1924 +#: ../../locales/../src/interface/QueueView.cpp:1662 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1553,7 +1656,7 @@ "S'ha produït un error carregant la cua de transferències des de \"%s\".\n" "Alguns elements de la cua potser no s'han recuperat." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1562,7 +1665,12 @@ "S'ha produït un error desant la cua de transferències a \"%s\".\n" "Alguns elements de la cua potser no s'han desat." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1926 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" +"Un emissor del certificat en cadena no és una autoritat de certificació" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2276 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1570,81 +1678,72 @@ "Un element amb el mateix nom que l'element arrossegat ja existeix a la " "ubicació de destinació." -#: ../../locales/../src/engine/server.cpp:857 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1275 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1516 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1731 msgid "Anonymous" msgstr "Anònim, -a" -#: ../../locales/../src/interface/state.cpp:967 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Una altra operació remota és en curs, no es pot canviar el directori ara." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:848 msgid "Any changes made in the Site Manager could not be saved." msgstr "No s'ha pogut desar cap canvi fet al gestor de llocs ." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:740 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"No es podrà desar cap canvi fet al gestor de llocs, a no ser que repareu el " -"fitxer." - -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Qualsevol canvi fet als filtres potser no es desarà." -#: ../../locales/../src/interface/filter.cpp:971 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Qualsevol canvi fet als filtres no es desarà." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Aplica només als &directoris" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Aplica" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Aplica només a la cua actual" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Aplica només als &fitxers" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Arxiva" -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Desbordament de la memòria intermèdia de paràmetres" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Com a pestanya en la subfinestra de la cua de transferències" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1390 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Demana una acció" -#: ../../locales/../src/engine/server.cpp:832 -#: ../../locales/../src/engine/server.cpp:851 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:573 +#: ../../locales/../src/engine/server.cpp:599 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Demana una contrasenya" @@ -1656,7 +1755,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Demana l'adreça IP externa al sistema operatiu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Fer preguntes als fòrums del FileZilla" @@ -1664,7 +1763,7 @@ msgid "Associated program not found:" msgstr "No s'ha trobat el programa associat:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:704 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Com a mínim una condició del filtre és incompleta" @@ -1672,95 +1771,106 @@ msgid "At this point, all required information has been gathered." msgstr "En aquest punt, s'ha recollit tota la informació requerida." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:221 msgid "Authentication failed." msgstr "Ha fallat l'autenticació." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Autor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Auto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Classificació de tipus de fitxers automàtica" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Mides disponibles" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:160 -#: ../../locales/../src/engine/sizeformatting_base.cpp:219 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:267 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "I&gnora el servidor intermediari" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Descriptor de fitxer erroni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Instruccions bàsiques d'ús" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Comportament" -#: ../../locales/../src/interface/edithandler.cpp:1127 -#: ../../locales/../src/interface/edithandler.cpp:1155 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "S'està editant" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Compte! S'ha revocat el certificat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2519 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binari" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Pissarra" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:269 -#: ../../locales/../src/interface/menu_bar.cpp:307 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Blau" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:393 msgid "Bookmark" msgstr "Adreça d'interès" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Adreça d'interès:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Adreces d'interès" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 +msgid "Browse..." +msgstr "Navega..." + +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "No s'ha trobat el contenidor" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Data de la versió:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Informació de la versió" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Categoria Business:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1770,92 +1880,113 @@ "en mode actiu. Si voleu limitar el FileZilla a només utilitzar un petit rang " "de ports, especifiqueu el rang de ports aquí sota." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "C&ancel·la l'operació actual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "&Neteja-ho tot" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "C&opia la(les) URL(s) al porta-retalls" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "C&opia la(les) URL(s) amb contrasenya al porta-retalls" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "&Personalitza" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "&Associacions de tipus de fitxers personalitzades:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1591 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 +msgid "CPU features:" +msgstr "Característiques de la CPU:" + +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Calculant la diferència de zona horària del servidor..." -#: ../../locales/../src/engine/transfersocket.cpp:646 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "No es pot llegir el fitxer" -#: ../../locales/../src/engine/transfersocket.cpp:626 -#: ../../locales/../src/engine/transfersocket.cpp:692 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "No es poden escriure les dades al fitxer." -#: ../../locales/../src/engine/transfersocket.cpp:628 -#: ../../locales/../src/engine/transfersocket.cpp:694 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "No es poden escriure les dades al fitxer: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1169 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1350 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1457 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1528 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1581 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1814 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2163 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2545 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2854 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3488 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:555 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Cancel·la" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Cancel·la l'operació actual" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Cancel·la l'operació actual" -#: ../../locales/../src/engine/local_path.cpp:459 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "No es pot accedir a '%s', cap suport inserit o unitat no disponible." -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "No es pot afegir el servidor al gestor de llocs" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "No es pot assignar l'adreça demanada" -#: ../../locales/../src/interface/context_control.cpp:342 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"No es pot canviar el directori, ja hi ha una operació de navegació " +"sincronitzada en curs." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1863,38 +1994,35 @@ "No es pot tancar la pestanya mentre està ocupada.\n" "Cancel·la l'operació actual i tanca pestanya?" -#: ../../locales/../src/interface/listingcomparison.cpp:73 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" msgstr "" "No es poden comparar directoris, hi ha filtres diferents activats pels " -"directoris local i remot." - -#: ../../locales/../src/interface/RemoteListView.cpp:2282 -msgid "Cannot compare directories, not connected to a server." -msgstr "No es poden comparar els directoris, no està connectat al servidor." +"directoris local i remot" #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "No es pot crear un nou filtre" -#: ../../locales/../src/interface/edithandler.cpp:1606 -#: ../../locales/../src/interface/edithandler.cpp:1654 -#: ../../locales/../src/interface/LocalListView.cpp:1699 -#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "No es pot editar el fitxer" -#: ../../locales/../src/interface/LocalListView.cpp:1581 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "No es pot editar el fitxer, no està connectat a cap servidor." -#: ../../locales/../src/interface/LocalListView.cpp:1590 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "No es pot editar el fitxer, no es coneix el camí remot." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:311 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1902,84 +2030,81 @@ "No es pot establir una connexió FTP a un servidor SFTP. Sisplau, seleccioneu " "el protocol adequat." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "" -"No es pot carregar la barra de connexió ràpida des del fitxer de recursos" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:388 -msgid "Cannot load keyfile" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 +msgid "Cannot load key file" msgstr "No es pot carregar el fitxer de claus" -#: ../../locales/../src/interface/Mainfrm.cpp:1019 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "No es pot carregat la barra d'eines des del fitxer de recursos" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "No es pot recordar la contrasenya" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1264 msgid "Cannot rename entry" msgstr "No es pot canviar el nom de l'entrada" -#: ../../locales/../src/interface/RemoteListView.cpp:1585 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Cannot rename file" msgstr "No es pot canviar el nom del fitxer" -#: ../../locales/../src/engine/proxy.cpp:131 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "No es pot traduir el nom d'amfitrió a adreça IPv4 per ús amb servidor " "intermediari SOCKS4." -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "No es pot desar el conjunt de filtres" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "No es pot seleccionar el filtre" -#: ../../locales/../src/interface/edithandler.cpp:1503 -#: ../../locales/../src/interface/edithandler.cpp:1507 -#: ../../locales/../src/interface/edithandler.cpp:1542 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "No es pot fer l'associació d'arxius" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "No es pot mostrar el diàleg" -#: ../../locales/../src/interface/edithandler.cpp:1676 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "No es pot visualitzar/editar l'arxiu seleccionat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "No distingeix entre majúscules i minúscules" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "No distingeix entre majúscules i minúscules" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "No distingeix entre majúscules i minúscules (defecte)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Distingeix entre majúscules i minúscules" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Distingeix entre majúscules i minúscules (defecte)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1482 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" -msgstr "Categories" +msgstr "Categories a netejar" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:515 msgid "Certificate and session data are not available yet." msgstr "El certificat i les dades de sessió encara no estan disponibles." @@ -1991,38 +2116,42 @@ msgid "Certificate issuer" msgstr "Emissor del certificat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Ha fallat la verificació de la signatura del certificat" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Desafiament:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Canvia els atributs del fitxer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Canvia els permisos del fitxer." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Per a canviar els paràmetres del fitxer de registre, cal reiniciar el " "FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Problema de codificació de caràcters" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Joc de caràcters" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "&Comprova si hi ha actualitzacions..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "&Comprova les actualitzacions del Filezilla automàticament:" @@ -2030,15 +2159,15 @@ msgid "Check for Updates" msgstr "Comprova si hi ha actualitzacions" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Comprova si hi ha noves versions del FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "La comprovació d'actualitzacions ha fallat" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:771 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2046,7 +2175,7 @@ "Comprova les dades credencials d'inici de sessió. Has informat una " "contrasenya que comença o acaba amb un caràcter d'espai." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:767 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2054,35 +2183,39 @@ "Comprova les dades credencials d'inici de sessió. Has informat un nom " "d'usuari que comença o acaba amb un caràcter d'espai." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Comprovant la correctesa de l'adreça externa IP" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Comprovant si hi ha actualitzacions..." -#: ../../locales/../src/interface/updater.cpp:779 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "La suma de verificació coincideix amb el fitxer %s\n" -#: ../../locales/../src/interface/updater.cpp:775 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "La suma de verificació no coincideix amb el fitxer %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1447 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1617 +msgid "Choose a key file" +msgstr "Trieu un fitxer de claus" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1655 msgid "Choose the default local directory" msgstr "Trieu el directori local per defecte" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:131 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:372 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2138 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2517 msgid "Choose the local directory" msgstr "Trieu el directori local" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 +#: ../../locales/../src/engine/http/request.cpp:464 msgid "Chunk data improperly terminated" msgstr "Dades del fragment finalitzades de forma inadequada" @@ -2091,54 +2224,62 @@ msgstr "Clau:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "&Tanca pestanya" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Clàssic" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Esborra &memòria cau de la disposició" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Neteja les dades d'act&ualització automàtica" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Neteja l'historial" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Neteja les dades personals" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Neteja la barra de connexió ràpida" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Cliqueu a Finalitzar per desar la vostra configuració." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "MAC de client a servidor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Clau de client a servidor:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:609 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Tanca" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "Tanca &totes les altres pestanyes" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 -#: ../../locales/../src/interface/Mainfrm.cpp:1181 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "Tanca el FileZilla" @@ -2146,11 +2287,15 @@ msgid "Close all running instances of FileZilla" msgstr "Tanca totes les instàncies en execució del FileZilla" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Voleu tancar la cerca ràpida i continuar comparant?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Tanca la pestanya actual" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Co&mentaris:" @@ -2158,92 +2303,93 @@ msgid "Column properties" msgstr "Propietats de columnes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Configuració de columnes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "L'ordre i els seus paràmetres han de tenir ben posades les cometes." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:140 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:171 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "L'ordre ha fallat" -#: ../../locales/../src/engine/proxy.cpp:485 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "L'ordre no és compatible" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "L'ordre no és compatible amb aquest protocol" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:280 -#: ../../locales/../src/interface/StatusView.cpp:336 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "Ordre:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Comentari" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Nom comú:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "" "La comunicació ha estat interferida per l'encaminador (router) o el tallafocs" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Compara l'&hora de modificació" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Compara la m&ida del fitxer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "&Llindar de comparació (en minuts):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "El llindar de comparació ha de ser entre 0 i 1440 minuts." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Compilat per a:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Compilat a:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Compilat amb:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Paràmetres del compilador:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Comprimit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Transferències simultànies" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1300 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Les condicions distingeixen entre &majúscules i minúscules" @@ -2259,36 +2405,42 @@ msgid "Configure port range" msgstr "Configura el rang de ports" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3342 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Configurant el Filezilla i la teva xarxa" -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Confirma la supressió" -#: ../../locales/../src/engine/local_filesys.cpp:129 -#: ../../locales/../src/interface/edithandler.cpp:1618 -#: ../../locales/../src/interface/LocalListView.cpp:1663 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 -#: ../../locales/../src/interface/search.cpp:699 +#: ../../locales/../src/interface/edithandler.cpp:1638 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1429 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Es necessita confirmació" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Felicitats, la vostra configuració sembla funcionar correctament." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Connecta ignorant la configuració del servidor intermediari" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "La connexió ha fallat: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Connecta en la pestanya actual" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Connecta en la nova pestanya" @@ -2296,28 +2448,26 @@ msgid "Connect to specified Site Manager site" msgstr "Connectar al lloc especificat al gestor de llocs" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:896 -msgid "Connected" -msgstr "Connectat" - -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "S'està connectant" -#: ../../locales/../src/interface/netconfwizard.cpp:222 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "S'està connectant a %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1045 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format -msgid "Connecting to %s through proxy" -msgstr "Connectant a %s a través del servidor intermediari" +msgid "Connecting to %s through %s proxy" +msgstr "Connectant a %s a través del servidor intermediari %s" -#: ../../locales/../src/engine/ControlSocket.cpp:953 -#: ../../locales/../src/engine/proxy.cpp:226 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../locales/../src/engine/ControlSocket.cpp:990 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "S'està connectant a %s..." @@ -2326,82 +2476,89 @@ msgid "Connection" msgstr "Connexió" -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Connexió avortada" -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Ha fallat l'intent de connexió" -#: ../../locales/../src/engine/ControlSocket.cpp:918 -#: ../../locales/../src/engine/proxy.cpp:200 +#: ../../locales/../src/engine/ControlSocket.cpp:952 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Ha fallat l'intent de connexió a \"%s\", intentant amb la següent adreça." -#: ../../locales/../src/engine/ControlSocket.cpp:922 +#: ../../locales/../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "L'intent de connexió a \"%s\" ha fallat." -#: ../../locales/../src/engine/ControlSocket.cpp:181 -#: ../../locales/../src/engine/engineprivate.cpp:674 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Intent de connexió cancel·lat per l'usuari/ària" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "L'intent de connexió ha excedit el temps d'espera" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Connexió tancada" -#: ../../locales/../src/engine/ControlSocket.cpp:1012 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:218 +#: ../../locales/../src/engine/ControlSocket.cpp:1036 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:183 +#: ../../locales/../src/engine/http/request.cpp:194 +#: ../../locales/../src/engine/http/request.cpp:207 msgid "Connection closed by server" msgstr "Connexió tancada pel servidor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:355 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:294 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:121 msgid "Connection established, initializing TLS..." msgstr "Connexió establerta, inicialitzant TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:319 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:144 msgid "Connection established, sending HTTP request" msgstr "Connexió establerta, enviant petició HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:383 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Connexió establerta, esperant missatge de benvinguda." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Connexió establerta, esperant missatge de benvinguda..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Connexió perduda" -#: ../../locales/../src/engine/proxy.cpp:470 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Connexió no permesa per conjunt de regles" -#: ../../locales/../src/engine/proxy.cpp:479 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "S'ha refusat la connexió" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Connexió refusada pel servidor" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Connexió reiniciada per la xarxa" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Connexió reiniciada pel parell" -#: ../../locales/../src/engine/ControlSocket.cpp:555 +#: ../../locales/../src/engine/ControlSocket.cpp:511 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" @@ -2410,97 +2567,141 @@ msgstr[1] "" "La connexió ha excedit el temps d'espera després de %d segons d'inactivitat" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." -msgstr "La connexió ha excedit el temps d'espera" +msgstr "La connexió ha excedit el temps d'espera." -#: ../../locales/../src/interface/search.cpp:358 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "S'ha perdut la connexió al servidor." -#: ../../locales/../src/engine/proxy.cpp:209 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "" "S'ha establert la connexió amb el servidor intermediari, s'està iniciant " "l'autenticació..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "La connexió amb el servidor s'ha tancat prematurament." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "La connexió amb el servidor de prova ha fallat." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:276 -msgid "Convert keyfile" -msgstr "Converteix el fitxer de clau" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 +msgid "Convert key file" +msgstr "Converteix el fitxer de claus" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:642 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1745 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2077 #, c-format msgid "Copy (%d) of %s" msgstr "Còpia (%d) de %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:622 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1725 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2056 #, c-format msgid "Copy of %s" msgstr "Còpia de %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Copia les URL dels elements seleccionats al porta-retalls, incloent la " +"contrasenya." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Copia les URL dels elements seleccionats al porta-retalls." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "No s'ha pogut acceptar la connexió: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "No s'ha pogut accedir al cami %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "No s'ha pogut afegir el certificat a la llista temporal de confiança" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "No s'ha pogut afegir la connexió al gestor de llocs" -#: ../../locales/../src/interface/state.cpp:798 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "No s'ha pogut completar l'operació" -#: ../../locales/../src/engine/ControlSocket.cpp:183 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "No s'ha pogut connectar al servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 +#: ../../locales/../src/engine/ControlSocket.cpp:1091 #, c-format msgid "Could not connect to server: %s" msgstr "No s'ha pogut connectar al servidor: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "No s'ha pogut convertir l'ordre a la codificació del servidor" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:324 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "No s'ha pogut convertir la clau privada" -#: ../../locales/../src/interface/RemoteListView.cpp:2542 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1405 +#: ../../locales/../src/interface/RemoteListView.cpp:2584 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "No s'han pogut copiar les URL" -#: ../../locales/../src/interface/aboutdialog.cpp:175 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "No s'ha pogut copiar el certificat" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "No s'han pogut copiar les dades" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "No s'ha pogut crear CFURL del camí %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "No s'ha pogut crear URI per aquesta transferència." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "No s'ha pogut crear el fitxer local %s\n" -#: ../../locales/../src/interface/RemoteListView.cpp:2196 -#: ../../locales/../src/interface/RemoteTreeView.cpp:855 +#: ../../locales/../src/engine/logging.cpp:179 +#, c-format +msgid "Could not create logging mutex: %s" +msgstr "No s'ha pogut crear l'enregistrament de mutex: %s" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "No s'ha pogut crear amb seguretat l'adreça d'interès de l'URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2229 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2511,11 +2712,11 @@ "O l'extensió de l'intèrpret d'ordres no està instal·lada adequadament o no " "heu deixat anar els fitxers en una finestra de l'Explorador." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4126 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "No s'ha pogut establir la connexió al servidor" -#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2528,11 +2729,16 @@ "' a la línia de comandes, o bé configurant la variable " "d'entorn FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:667 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "No s'ha pogut generar la seqüència d'entrada personalitzada." -#: ../../locales/../src/engine/tlssocket.cpp:937 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "No s'ha pogut generar la clau" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2540,7 +2746,7 @@ "No s'ha pogut obtenir nom distingit de l'emissor del certificat, ha fallat " "gnutls_x509_get_issuer_dn" -#: ../../locales/../src/engine/tlssocket.cpp:914 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2548,36 +2754,36 @@ "No s'ha pogut obtenir nom distingit del subjecte del certificat, ha fallat " "gnutls_x509_get_dn" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "No s'ha pogut obtenir el camí complet remot." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:171 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "No s'ha pogut obtenir el camí nadiu de CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "No s'ha pogut obtenir el camí de l'URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "No s'ha pogut obtenir una resposta de fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1606 -#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "No s'ha pogut aconseguir un directori temporal on baixar el fitxer." -#: ../../locales/../src/engine/tlssocket.cpp:860 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"No s'han pogut importar els certificats del parell, ha fallat " -"gnutls_x509_crt_import" - -#: ../../locales/../src/engine/tlssocket.cpp:855 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"No s'ha pogut inicialitzar l'estructura pels certificats del parell, ha " -"fallat gnutls_x509_crt_init" +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "No s'ha pogut inicialitzar el Winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:98 -#: ../../locales/../src/interface/import.cpp:284 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2588,15 +2794,21 @@ "s'hi pot accedir.\n" "Qualsevol canvi fet al gestor de llocs no serà desat." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:227 -msgid "Could not load keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 +msgid "Could not load key file" msgstr "No s'ha pogut carregar el fitxer de claus" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:301 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "No s'ha pogut carregar la clau privada" -#: ../../locales/../src/interface/state.cpp:977 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2608,7 +2820,7 @@ "Voleu deshabilitar la navegació sincronitzada i continuar canviant el " "directori remot?" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2619,7 +2831,7 @@ "'%s'.\n" "S'ha deshabilitat la navegació sincronitzada." -#: ../../locales/../src/interface/state.cpp:272 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2630,64 +2842,110 @@ "'%s'.\n" "S'ha desactivat la navegació sincronitzada." -#: ../../locales/../src/interface/aboutdialog.cpp:175 -#: ../../locales/../src/interface/RemoteListView.cpp:2542 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1405 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "No s'ha pogut obrir la mida de '%s'" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "No s'ha pogut obrir '%s'" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2584 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "No s'ha pogut obrir el porta-retalls" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:172 -#: ../../locales/../src/engine/logging.cpp:204 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "No s'ha pogut obrir el fitxer de registre: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "No s'ha pogut analitzar el camí remot." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "No s'ha pogut analitzar l'adreça del servidor:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:209 +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "No s'ha pogut llegir de '%s'" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "No s'ha pogut llegir del sòcol." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:172 #, c-format msgid "Could not read from socket: %s" msgstr "No s'ha pogut llegir del sòcol: %s" -#: ../../locales/../src/interface/sitemanager.cpp:488 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "No s'ha pogut llegir l'element del servidor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2621 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "No s'ha pogut cercar a la compensació %s dins el fitxer" +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "No s'han pogut rebre dades del servidor." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "No s'ha pogut restablir l'accés al directori" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "No s'ha pogut cercar a la compensació %d dins el fitxer" + +#: ../../locales/../src/engine/http/filetransfer.cpp:119 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "No s'ha pogut cercar fins a l'inici del fitxer" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2533 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "No s'ha pogut cercar fins al final del fitxer" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:140 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "No s'ha pogut enviar l'ordre a fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2649 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "No s'ha pogut enviar l'ordre a fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "No s'han pogut ordenar els certificats dels parells" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "No s'ha pogut engendrar el fil d'E/S" -#: ../../locales/../src/engine/ControlSocket.cpp:1059 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" -msgstr "No s'ha pogut iniciar l'autenticació del servidor intermediari: %s." +msgstr "No s'ha pogut iniciar l'autenticació del servidor intermediari: %s" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "No s'ha pogut iniciar la transferència" -#: ../../locales/../src/interface/sitemanager.cpp:656 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:869 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2696,20 +2954,20 @@ "No s'ha pogut escriure \"%s\", no es podran desar els canvis fets al gestor " "de llocs: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "" "No s'ha pogut escriure \"%s\", l'adreça d'interès no s'ha pogut desar: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:324 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "No s'ha pogut escriure \"%s\", les adreces d'interès globals no s'han pogut " "desar: %s" -#: ../../locales/../src/interface/QueueView.cpp:1858 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2718,113 +2976,123 @@ "No s'ha pogut escriure \"%s\", la cua no s'ha pogut desar.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager.cpp:828 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2119 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2495 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "No s'ha pogut escriure \"%s\", els llocs seleccionats no s'han pogut " "exportar: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:125 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "No s'ha pogut escriure \"%s\":" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:324 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format -msgid "Could not write keyfile: %s" -msgstr "No s'ha pogut escriure el fitxer de clau: %s" +msgid "Could not write key file: %s" +msgstr "No s'ha pogut escriure el fitxer de claus: %s" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" -msgstr "No s'ha pogut escriure al fitxer local." +msgstr "No s'ha pogut escriure al fitxer local" -#: ../../locales/../src/engine/logging.cpp:212 -#: ../../locales/../src/engine/logging.cpp:277 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "No s'ha pogut escriure al fitxer de registre: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:878 -#: ../../locales/../src/engine/ControlSocket.cpp:981 +#: ../../locales/../src/engine/ControlSocket.cpp:913 +#: ../../locales/../src/engine/ControlSocket.cpp:1008 +#: ../../locales/../src/engine/http/request.cpp:119 #, c-format msgid "Could not write to socket: %s" msgstr "No s'ha pogut escriure al sòcol: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "País:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "&Crea un nou fitxer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 -msgid "Create a new subdirectory in the current directory" -msgstr "Crea un nou subdirectori en el directori actual" +#: ../../locales/../src/interface/state.cpp:1107 +msgid "Create &missing local directory and enter it" +msgstr "Crea el &directori local que falta i vés-hi" + +#: ../../locales/../src/interface/state.cpp:1029 +msgid "Create &missing remote directory and enter it" +msgstr "Crea el &directori remot que falta i vés-hi" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 +msgid "Create a new subdirectory in the current directory" +msgstr "Crea un nou subdirectori en el directori actual" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Crea un nou subdirectori en el directori actual i vés-hi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Crea un nou fitxer buit en el directori actual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "Crea un &directori i vés-hi" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1241 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Crea un directori" -#: ../../locales/../src/interface/RemoteListView.cpp:2629 +#: ../../locales/../src/interface/RemoteListView.cpp:2673 msgid "Create empty file" msgstr "Crea un fitxer buit" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "S'està creant el directori" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3196 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1934 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "S'està creant el directori '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:176 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Error greu" -#: ../../locales/../src/engine/ControlSocket.cpp:167 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Error greu:" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Error greu de transferència de fitxer" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Error greu de transferència de fitxer després de transferir %s en %s" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2833,89 +3101,102 @@ "El directori remot actual (%s) no està sota arrel sincronitzada (%s).\n" "La navegació sincronitzada ha estat desactivada." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "El tipus de transferència actual és ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "El tipus de transferència actual és detecció automàtica." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "El tipus de transferència actual és binari." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 +msgid "Curve:" +msgstr "Corba:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Perso&nalitza" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Filtres personalitzats" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Servidor personalitzat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2483 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Cian" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "&Tipus de dades" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Prefixos &decimals utilitzant símbols SI (p. ex. 1 KB = 1000 bytes)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:392 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "P&er defecte" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:597 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "&Suprimeix" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1084 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 +msgid "D&irectory comparison" +msgstr "Comparació de d&irectoris" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "&Desactiva'ls tots" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "&No desar contrasenyes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Acció de doble clic en els &directoris:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1235 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "D&uplica" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:53 msgid "DOS-like with virtual paths" -msgstr "com-DOS amb camins virtuals" +msgstr "Com-DOS amb camins virtuals" -#: ../../locales/../src/interface/edithandler.cpp:1658 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Tipus de fitxer perillós" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Dades" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "El sòcol de dades s'ha tancat massa aviat." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Data" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Format de data" @@ -2931,15 +3212,15 @@ msgid "Debug" msgstr "Depuració" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Paràmetres de depuració" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Directori &local per defecte:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:45 msgid "Default (Autodetect)" msgstr "Predeterminat (Autodetecta)" @@ -2947,17 +3228,17 @@ msgid "Default editor not properly quoted." msgstr "L'editor per defecte no té ben posades les cometes." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1362 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Acció de fitxer existent per defecte" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Directori r&emot per defecte:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2965,7 +3246,7 @@ "El camí remot per defecte no pot ser analitzat. Assegura't que és un camí " "absolut compatible amb el tipus de servidor seleccionat." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Idioma per defecte del sistema" @@ -2973,12 +3254,12 @@ msgid "Default transfer mode:" msgstr "Mode de transferència per defecte:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Tipus de transferència per defecte:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Per defecte: http://ip.filezilla-project.org/ip.php" @@ -2988,7 +3269,7 @@ msgstr "" "El retard entre intents de connexió fallits ha d'estar entre 1 i 999 segons." -#: ../../locales/../src/engine/engineprivate.cpp:518 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3003,80 +3284,85 @@ "Es retarda la connexió %d segons perquè ha fallat l'intent de connexió " "anterior…" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1200 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1299 msgid "Delete Site Manager entry" msgstr "Suprimeix l'entrada del gestor de llocs" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Suprimeix el directori seleccionat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Suprimeix els fitxers i directoris seleccionats" -#: ../../locales/../src/engine/engineprivate.cpp:367 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "S'estan suprimint \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:370 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "S'estan suprimint %u fitxers de \"%s\"" -#: ../../locales/../src/interface/search.cpp:728 -msgid "Deleting directories" -msgstr "S'estan suprimint els directoris" - -#: ../../locales/../src/interface/search.cpp:728 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" -"Encara no s'ha implementat la supressió alhora de diferents directoris no " -"relacionats" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Esborrant enllaç simbòlic" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Escriptori" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Detalls" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:946 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Detalls per la nova clau:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1319 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:793 +msgid "Detected newer version of FileZilla" +msgstr "Existeix una nova versió del FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "&Directoris" -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Direcció" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Directoris:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Directori" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:464 -#: ../../locales/../src/interface/Mainfrm.cpp:2232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Permisos d'accés al directori" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Comparació de directoris" -#: ../../locales/../src/interface/listingcomparison.cpp:73 -#: ../../locales/../src/interface/listingcomparison.cpp:80 -#: ../../locales/../src/interface/listingcomparison.cpp:85 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "La comparació de directoris ha fallat" @@ -3086,39 +3372,43 @@ "El directori que conté el fitxer de registre no existeix o el nom del fitxer " "és incorrecte." -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "&Filtres de llistat de directoris..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Llistat del directori avortat per l'usuari/ària" -#: ../../locales/../src/interface/RemoteListView.cpp:2024 +#: ../../locales/../src/interface/RemoteListView.cpp:2061 msgid "Directory listing failed" msgstr "El llistat del directori ha fallat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Filtres de llistat de directoris" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Llistat del directori \"%s\" reeixit" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Llistat del directori reeixit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "D&esactiva'ls tots" -#: ../../locales/../src/interface/state.cpp:985 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Voleu inhabilitar la navegació sincronitzada i continuar canviant el " "directori remot?" -#: ../../locales/../src/interface/Mainfrm.cpp:660 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3126,87 +3416,82 @@ "Inhabiliteu aquesta opció novament si ja no podeu veure més el contingut " "correcte del directori." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Desconnecta del servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:77 -#: ../../locales/../src/engine/ControlSocket.cpp:879 -#: ../../locales/../src/engine/ControlSocket.cpp:983 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:890 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:892 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:914 +#: ../../locales/../src/engine/ControlSocket.cpp:1010 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:120 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "S'ha desconnectat del servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1014 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:906 +#: ../../locales/../src/engine/ControlSocket.cpp:1039 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:197 #, c-format msgid "Disconnected from server: %s" msgstr "S'ha desconnectat del servidor: %s" -#: ../../locales/../src/interface/queue.cpp:380 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "S'està desconnectant del servidor anterior" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Desconnecta del servidor visible actual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Mostra el diàleg Quant a" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "N&o facis servir l'editor per defecte" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "&No facis res" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1801 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1856 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "" "Feu el mateix amb &tots els fitxers seleccionats que ja s'estan editant" -#: ../../locales/../src/interface/Mainfrm.cpp:1163 -#: ../../locales/../src/interface/Mainfrm.cpp:1185 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Esteu segur que voleu tancar el FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Esteu segur que voleu esborrar totes les entrades del gestor de llocs i de " "la cua de transferències?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Esteu segur que voleu esborrar totes les entrades del gestor de llocs?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1202 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1301 msgid "Do you really want to delete selected entry?" msgstr "Esteu segur que voleu esborrar l'entrada seleccionada?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Esteu segur que voleu esborrar la cua de transferències?" -#: ../../locales/../src/interface/Mainfrm.cpp:599 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Esteu segur que voleu enviar '%s' al servidor?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Voleu obrir de nou aquest fitxer?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Documentació" @@ -3214,49 +3499,49 @@ msgid "Don't use external IP address on &local connections." msgstr "No utilitzis l'adreça IP externa a les connexions &locals." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Els fitxers amb punt (dotfiles) són noms de fitxers que comencen amb punt, " "p. ex. .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Acció de doble clic" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Baixada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3526 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "&Límit de baixada:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:598 #, c-format msgid "Download limit: %s/s" msgstr "Límit de baixada: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:601 msgid "Download limit: none" msgstr "Límit de baixada: cap" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 -#: ../../locales/../src/interface/search.cpp:493 -#: ../../locales/../src/interface/search.cpp:498 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Baixa els resultats de la cerca" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Baixa el directori seleccionat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Baixa els fitxers i directoris seleccionats" -#: ../../locales/../src/interface/Mainfrm.cpp:991 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3265,33 +3550,24 @@ "Velocitat de baixada: %s/s\n" "Velocitat de pujada: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "S'està baixant" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:337 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:156 #, c-format msgid "Downloading %s" msgstr "S'està baixant %s" -#: ../../locales/../src/interface/search.cpp:590 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" -"Baixar alhora diferents directoris no relacionats no està encara implementat." - -#: ../../locales/../src/interface/search.cpp:590 -msgid "Downloading search results" -msgstr "S'estan baixant els resultats de la cerca" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "S'està baixant l'actualització..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:107 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:87 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:112 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3299,11 +3575,11 @@ "Encara no s'ha implementat 'arrossegar i deixar anar' entre diferents " "instàncies del FileZilla." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:93 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:117 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Encara no s'ha implementat 'arrossegar i deixar anar' entre diferents " @@ -3313,16 +3589,16 @@ msgid "Dupl&icate" msgstr "Dupl&ica" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1077 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "&Activa'ls tots" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "Vés al directori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "E&xecuta" @@ -3330,42 +3606,47 @@ msgid "E&xit" msgstr "&Surt" -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 +msgid "E&xport..." +msgstr "&Exporta..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "Adreça electrònica:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:688 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Cada filtre necessita com a mínim una condició." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Edita els filtres" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." -msgstr "" -"Edita el fitxer amb l'editor configurat i penja els canvis al servidor." +msgstr "Edita el fitxer amb l'editor configurat i puja els canvis al servidor." -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "No es poden editar directoris" -#: ../../locales/../src/interface/LocalListView.cpp:1581 -#: ../../locales/../src/interface/LocalListView.cpp:1590 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "L'edició ha fallat" -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Editant els resultats de la cerca" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Adreça electrònica:" -#: ../../locales/../src/interface/QueueView.cpp:2143 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "Ordre buida" @@ -3373,7 +3654,7 @@ msgid "Empty command." msgstr "Ordre buida." -#: ../../locales/../src/interface/RemoteListView.cpp:2026 +#: ../../locales/../src/interface/RemoteListView.cpp:2063 msgid "Empty directory listing" msgstr "Llistat del directori buit" @@ -3385,13 +3666,13 @@ msgid "Empty file extension." msgstr "Extensió del fitxer buida." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "No es permeten noms de filtres buits." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Nom buit" @@ -3399,81 +3680,97 @@ msgid "Empty quoted string." msgstr "Cadena entre cometes buida." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1112 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Acti&va'ls tots" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Habilita el &filtre de caràcters no vàlids" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Xifrat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Xifratge" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1966 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Clau de xifratge:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Clau de xifratge:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Detalls del xifratge" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Voleu finalitzar la comparació i canviar el tipus d'ordenació?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Voleu finalitzar la comparació i obrir la cerca ràpida?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "Introduïu una &ordre personalitzada..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Introduïu 0 per velocitat il·limitada." -#: ../../locales/../src/interface/QueueView.cpp:2132 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "Introduïu l'ordre" -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Introduïu l'ordre personalitzada" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Vés al directori" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Introduïu un nom de filtre" -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Introduïu la contrasenya mestra" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Introduïu un nom per al conjunt de filtres" -#: ../../locales/../src/interface/filter.cpp:393 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Introduïu un nom nou per al conjunt de filtres" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Introduïu la contrasenya" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Introduïu el directori seleccionat" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3481,12 +3778,11 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Introduïu l'adreça del servidor.\n" -"Per especificar el protocol del servidor, afegiu com a prefix " -"l'identificador del protocol a l'amfitrió. Si no s'especifica cap protocol, " -"s'usarà el protocol per defecte (ftp://).\n" -"També podeu informar aquí la URL completa amb la forma protocol://usuari:" -"contrasenya@servidor:port. Els valors del camps es sobreescriuran.\n" +"Introduïu l'adreça del servidor. Per especificar el protocol del servidor, " +"afegiu com a prefix l'identificador del protocol a l'amfitrió. Si no " +"s'especifica cap protocol, s'usarà el protocol per defecte (ftp://). També " +"podeu informar aquí URLs complets amb la forma protocol://usuari:" +"contrasenya@servidor:port, els valors del altres camps es sobreescriuran.\n" "\n" "Els protocols vàlids són:\n" "- ftp:// per FTP normal amb encriptació opcional\n" @@ -3494,127 +3790,144 @@ "- ftps:// per FTP sobre TLS (implícit)\n" "- ftpes:// per FTP sobre TLS (explícit)." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" "Introduïu la contrasenya per al fitxer '%s'.\n" -"Tingueu en compte que el fitxer convertit no estarà protegit amb contrasenya." +"El fitxer convertit quedarà protegit amb la mateixa contrasenya." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Introduïu el port d'escolta del servidor.\n" -"El port per defecte per FTP és el 21 i per SFTP el 22." +"Introduïu el port d'escolta del servidor. El port per defecte per FTP és el " +"21 i per SFTP el 22." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Introduïu el nom d'usuari" -#: ../../locales/../src/interface/loginmanager.cpp:66 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Introduïu el nom d'usuari i contrasenya" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Error" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "S'ha produït un error mentre s'exportava la configuració" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "S'ha produït un error en importar" -#: ../../locales/../src/interface/QueueView.cpp:1925 +#: ../../locales/../src/interface/QueueView.cpp:1663 msgid "Error loading queue" msgstr "S'ha produït un error en carregar la cua" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:171 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:294 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:717 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:756 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:803 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:972 -#: ../../locales/../src/interface/import.cpp:99 -#: ../../locales/../src/interface/import.cpp:285 -#: ../../locales/../src/interface/Options.cpp:244 -#: ../../locales/../src/interface/QueueView.cpp:1841 -#: ../../locales/../src/interface/search.cpp:797 -#: ../../locales/../src/interface/search.cpp:816 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:451 -#: ../../locales/../src/interface/sitemanager.cpp:547 -#: ../../locales/../src/interface/sitemanager.cpp:606 -#: ../../locales/../src/interface/sitemanager.cpp:715 -#: ../../locales/../src/interface/sitemanager.cpp:797 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:793 -#: ../../locales/../src/interface/wrapengine.cpp:944 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:786 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:849 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "S'ha produït un error en carregar el fitxer xml" -#: ../../locales/../src/interface/QueueView.cpp:1830 +#: ../../locales/../src/interface/QueueView.cpp:1556 msgid "Error saving queue" msgstr "S'ha produït un error en desar la cua" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:98 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Error en iniciar el programa" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:325 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:837 -#: ../../locales/../src/interface/QueueView.cpp:1859 -#: ../../locales/../src/interface/sitemanager.cpp:657 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager.cpp:829 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:814 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2120 -#: ../../locales/../src/interface/xmlfunctions.cpp:126 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:870 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2496 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "S'ha produït un error en escriure el fitxer xml" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:278 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:284 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "Error:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Exemple: png \"c:\\arxius de programa\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Exemples" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Exe&cuta" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "L'executable no té la informació de la versió, no es pot comprovar si hi ha " "actualitzacions." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Explorador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Exporta &Filtres" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Exporta la &cua" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Exporta con&figuració" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Exporta configuració" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Nom del f&iltre:" @@ -3622,28 +3935,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 msgid "FTP - File Transfer Protocol" msgstr "FTP - Protocol de Transferència de Fitxers" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Protocol de Transferència de Fitxers amb encriptació opcional" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Protocol de Transferència de Fitxers Insegur" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "El motor FTP no s'ha iniciat, no s'hi pot connectar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Mantenir la connexió FTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "Servidor intermediari FTP" @@ -3660,148 +3972,160 @@ "FTP utilitza connexions secundàries per transferir dades. Aquestes " "connexions addicionals es poden establir de dues maneres." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP sobre TLS explícit" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:24 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP sobre TLS implícit" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1777 -#: ../../locales/../src/interface/LocalTreeView.cpp:846 -#: ../../locales/../src/interface/LocalTreeView.cpp:1099 -#: ../../locales/../src/interface/viewheader.cpp:507 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "No s'ha pogut canviar de directori" -#: ../../locales/../src/interface/FileZilla.cpp:137 -#: ../../locales/../src/interface/FileZilla.cpp:152 -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "No s'ha pogut canviar l'idioma" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1926 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "No s'ha pogut convertir l'ordre al joc de caràcters de 8 bits" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2276 msgid "Failed to copy or move sites" msgstr "No s'han pogut copiar o desplaçar els llocs" -#: ../../locales/../src/interface/xmlfunctions.cpp:466 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "No s'ha pogut crear la còpia del fitxer xml" -#: ../../locales/../src/interface/netconfwizard.cpp:802 -msgid "Failed to create listen socket, aborting" -msgstr "No s'ha pogut crear un sòcol d'escolta, cancel·lant" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "No s'ha pogut crear un sòcol d'escolta al port %d, cancel·lant." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4105 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4109 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "" "No s'ha pogut crear un sòcol d'escolta per al mode de transferència actiu" -#: ../../locales/../src/interface/LocalTreeView.cpp:626 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "No s'ha pogut desxifrar la contrasenya del servidor." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" -msgstr "No s'ha pogut obtenir el camí de 'Els meus Documents'" +msgstr "No s'ha pogut obtenir el camí de Els meus Documents" -#: ../../locales/../src/interface/LocalTreeView.cpp:614 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "No s'ha pogut obtenir el camí de l'Escriptori" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "No s'ha obtingut l'adreça d'igual per la connexió de control, connexió " "tancada." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "No s'ha obtingut l'adreça d'igual per la connexió de dades, connexió tancada." -#: ../../locales/../src/interface/context_control.cpp:79 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "No s'ha pogut iniciar el motor FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:363 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:742 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:301 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:128 msgid "Failed to initialize TLS." msgstr "No s'ha pogut iniciar el TLS." +#: ../../locales/../src/interface/FileZilla.cpp:97 +msgid "Failed to initialize networking" +msgstr "No s'ha pogut inicialitzar el treball en xarxa" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "" "No es poden carregar el taulers, teniu uns fitxers de recursos incorrectes?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "No s'ha pogut carregar la clau privada: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "No s'ha pogut obrir el fitxer \"%s\" per escriure o afegir" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2589 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "No s'ha pogut obrir \"%s\" per llegir" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2555 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1018 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "No s'ha pogut obrir \"%s\" per escriure" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Failed to parse returned path." msgstr "No s'ha pogut analitzar el camí retornat." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "No s'ha pogut rebre cap dada" -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "No s'ha pogut recuperar el llistat del directori" -#: ../../locales/../src/interface/netconfwizard.cpp:730 -msgid "Failed to retrieve external ip address, aborting" -msgstr "No s'ha pogut recuperar l'adreça IP externa, cancel·lant" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "No s'ha pogut recuperar l'adreça IP externa, cancel·lant." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3816 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "No s'ha pogut recuperar l'adreça IP externa, s'usa l'adreça local" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3837 -msgid "Failed to retrieve local ip address." -msgstr "No s'ha pogut recuperar l'adreça IP local." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "No s'ha pogut recuperar l'adreça IP local, cancel·lant." -#: ../../locales/../src/interface/netconfwizard.cpp:706 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "No s'ha pogut recuperar l'adreça IP local. Es cancel·la." +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "No s'ha pogut recuperar l'adreça IP local." -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "No s'ha pogut recuperar l'adreça IP externa." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "No s'ha pogut enviar l'ordre." -#: ../../locales/../src/interface/FileZilla.cpp:152 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "No s'ha pogut establir l'idioma a %s (%s), s'usarà l'idioma del sistema per " "defecte" -#: ../../locales/../src/interface/FileZilla.cpp:130 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3809,49 +4133,48 @@ "No s'ha pogut establir l'idioma a %s (%s), s'usarà l'idioma del sistema per " "defecte (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:119 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "No s'ha pogut establir l'idioma a %s (%s), s'usarà l'idioma del sistema per " "defecte." -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "No s'ha pogut establir l'idioma a %s, s'usarà l'idioma del sistema per " "defecte" -#: ../../locales/../src/interface/FileZilla.cpp:126 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "No s'ha pogut establir l'idioma a %s, s'usarà l'idioma del sistema per " "defecte (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:116 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "No s'ha pogut establir l'idioma a %s, s'usarà l'idioma del sistema per " "defecte." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "No s'ha pogut validar la configuració" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "No s'ha pogut verificar el certificat del parell" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "No s'ha pogut escriure al fitxer %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:483 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "No s'ha pogut escriure el fitxer xml" @@ -3863,15 +4186,15 @@ msgid "Fall back to active mode" msgstr "Retorna a mode actiu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Fit&xer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Fitx&ers" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Fitxer" @@ -3879,11 +4202,11 @@ msgid "File Types" msgstr "Tipus de fitxer" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "El descriptor de fitxer no és sòcol" -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "El fitxer no conté dades importables." @@ -3891,7 +4214,7 @@ msgid "File editing" msgstr "Edició de fitxers" -#: ../../locales/../src/interface/RemoteListView.cpp:1599 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "File exists" msgstr "El fitxer ja existeix" @@ -3899,7 +4222,7 @@ msgid "File exists action" msgstr "Acció per fitxer ja existent" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "El fitxer ha canviat" @@ -3907,64 +4230,68 @@ msgid "File lists" msgstr "Llistes de fitxers" -#: ../../locales/../src/interface/edithandler.cpp:1582 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Fitxer no trobat" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Cerca de fitxers" -#: ../../locales/../src/engine/ControlSocket.cpp:123 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Transferència de fitxer avortada per l'usuari" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "Transferència de fitxer avortada per l'usuari després de transferir %s en %s" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "La transferència del fitxer ha fallat" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "La transferència del fitxer ha fallat després de transferir %s en %s" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Transferència de fitxer omesa" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Transferència del fitxer reeixida" -#: ../../locales/../src/engine/ControlSocket.cpp:111 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Transferència del fitxer reeixida, transferits %s en %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1162 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Encara hi ha transferències de fitxers en curs." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "El fitxer es transferiria amb el tipus de dades ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "El fitxer es transferiria amb el tipus de dades binari." -#: ../../locales/../src/interface/FileZilla.cpp:407 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Error del FileZilla" @@ -3976,61 +4303,57 @@ "El FileZilla pot provar ara la vostra configuració per assegurar-se que tot " "està ben configurat." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "El Filezilla ja està connectat a un servidor." -#: ../../locales/../src/interface/Mainfrm.cpp:1492 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "El FileZilla s'ha de reiniciar perquè el canvi d'idioma sigui efectiu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Actualitzacions del FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "&Barres d'estat de les llistes de fitxers" -#: ../../locales/../src/interface/edithandler.cpp:1097 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:80 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Nom de fitxer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Filtres de nom de fitxer..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3000 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2176 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "El nom de fitxer no es pot construir amb el directori %s i el nom de fitxer " "%s" -#: ../../locales/../src/interface/RemoteListView.cpp:1585 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Filename invalid" -msgstr "Nom del fitxer incorrecte." +msgstr "Nom del fitxer incorrecte" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "No s'ha canviat el nom del fitxer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Nom del fitxer:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Els noms dels fitxers no poden contenir aquests caràcters: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" @@ -4038,14 +4361,24 @@ "Els noms dels fitxers no poden contenir aquests caràcters: / \\ : * ? \" < > " "|" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Fitxers amb edició en curs" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:82 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" +"Es suprimeixen dels llistats de directoris els fitxers coincidents amb una " +"regla de filtre." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "No s'han trobat els fitxers" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Mida del fitxer" @@ -4053,64 +4386,68 @@ msgid "Filesize format" msgstr "Format de la mida del fitxer" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Tipus de fitxer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Associacions de tipus de fitxers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "El filtre s'aplica a:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Filtra caràcters no vàlids en els noms de fitxers" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:355 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "El nom del filtre ja existeix" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1277 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Ignora els elements coincidents amb tot el següent" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Ignora els elements coincidents amb algun dels següents" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1279 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Ignora els elements que no coincideixin amb cap dels següents" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Ignora els elements que no coincideixin amb tots els següents" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "El nom del filtre ja existeix" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtra els llistats de directoris" -#: ../../locales/../src/interface/filteredit.cpp:339 -#: ../../locales/../src/interface/filteredit.cpp:347 -#: ../../locales/../src/interface/filteredit.cpp:355 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "La validació del filtre ha fallat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3031 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Cerca &fitxers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Cerca d&irectoris" @@ -4122,16 +4459,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Empremta digital (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:852 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 -msgid "Fingerprint:" -msgstr "Empremta digital:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Empremtes digitals:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Auxiliar de configuració del tallafocs i l'encaminador" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4143,7 +4481,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Per fiabilitat hauríeu d'especificar un rang de com a mínim 10 ports." -#: ../../locales/../src/interface/Options.cpp:243 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4151,35 +4489,40 @@ "Per aquesta sessió s'utilitzarà la configuració per defecte. No es desarà " "cap canvi fet a la configuració." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Força &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "&Força que es mostrin els fitxers amagats" -#: ../../locales/../src/interface/Mainfrm.cpp:655 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Força que es mostrin els fitxers amagats" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Especificacions de format:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Format: Extensió seguida d'una ordre i els seus paràmetres amb les cometes " "ben posades." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:710 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "S'ha trobat un nou %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Ha fallat la funció %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Més documentació" @@ -4187,142 +4530,159 @@ msgid "General" msgstr "General" -#: ../../locales/../src/engine/proxy.cpp:467 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "S'ha produït una fallada general en el servidor de SOCKS" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Genera..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Servidor intermediari genèric" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" -msgstr "Obté l'adreça IP externa de la següent URL:" +msgstr "Obtén l'adreça IP externa de la següent URL:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Obtenir ajuda" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "El nom del filtre ja existeix, voleu sobreescriure'l?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:255 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Adreces d'interès globals" -#: ../../locales/../src/engine/tlssocket.cpp:185 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Error %d a GnuTLS" -#: ../../locales/../src/engine/tlssocket.cpp:187 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Error %d en %s a GnuTLS" -#: ../../locales/../src/engine/tlssocket.cpp:181 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Error %d en %s a GnuTLS: %s" -#: ../../locales/../src/engine/tlssocket.cpp:179 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Error %d a GnuTLS: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Verd" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Permisos del grup" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "A<a" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP sobre TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Funció resum:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Ocult" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:883 -#: ../../locales/../src/interface/queue.cpp:970 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Alta" -#: ../../locales/../src/interface/queue.cpp:885 -#: ../../locales/../src/interface/queue.cpp:972 +#: ../../locales/../src/interface/queue.cpp:938 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Més alta" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "El port més alt disponible ha de ser un número entre 1024 i 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Mantingueu premuda la tecla majúscula per commutar l'estat del filtre en " "ambdós llocs simultàniament." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Pàgina d'inici:" -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "L'amfitrió ha caigut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 -msgid "Host key fingerprint:" -msgstr "Empremta digital de la clau de l'amfitrió:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "La clau de l'amfitrió no coincideix" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "L'amfitrió comença amb '[' però no s'ha trobat el claudàtor que tanca." -#: ../../locales/../src/engine/proxy.cpp:476 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Ordinador no accessible" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:953 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Amfitrió:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:350 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algorisme de la clau d'amfitrió:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Hores," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"&He oblidat la meva contrasenya mestra. Suprimeix totes les contrasenyes " +"desades amb aquesta clau." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (exemple: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:124 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Les adreces IPv6 no s'admeten en el servidor intermediari SOCKS4" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4331,7 +4691,7 @@ "Si no s'envia o rep cap dada durant una operació en més temps de " "l'establert, la connexió es tancarà i el FileZilla provarà de reconnectar-se." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Si informeu d'errors, proporcioneu sisplau els registres amb nivell " @@ -4357,7 +4717,7 @@ "Si l'opció de mode alternatiu està habilitada, podreu connectar-vos a " "servidors mal configurats que rebutgen el mode de transferència seleccionat." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:941 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4365,7 +4725,7 @@ "Si no esperàveu un canvi de clau a l'amfitrió, sisplau poseu-vos en contacte " "amb l'administrador del servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4373,7 +4733,7 @@ "Si el problema persisteix, algun encaminador (router) i/o tallafocs continua " "bloquejant el FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4381,7 +4741,7 @@ "Si el problema persisteix, algun encaminador (router) i/o tallafocs continua " "interrompent la connexió." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4391,7 +4751,7 @@ "hi \".1\" al final del nom de fitxer (possiblement sobreescrivint els " "fitxers de registre antics) i es crea un nou fitxer." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4399,7 +4759,7 @@ "Si l'enllaç simbòlic apunta a un directori, el Filezilla pot o bé eliminar " "l'enllaç simbòlic o bé suprimir el contingut del directori enllaçat." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4408,14 +4768,14 @@ "fabricant del vostre encaminador (router) o tallafocs (firewall) per trobar " "una solució." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Si el problema persisteix, sisplau poseu-vos en contacte amb el fabricant " "del vostre encaminador (router)." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4426,7 +4786,7 @@ "concorda (p. ex. zones horàries diferents), especifiqueu una diferència per " "zona horària al gestor de llocs." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4434,7 +4794,7 @@ "Si s'utilitza la comparació basada en marques horàries, considera dos " "fitxers iguals si la diferència de marques no excedeix aquest llindar." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Si canvieu l'idioma, caldrà reiniciar el FileZilla." @@ -4446,11 +4806,11 @@ "Si cliqueu a prova, el FileZilla es connectarà a probe.filezilla-project.org " "i realitzarà algunes proves senzilles." -#: ../../locales/../src/interface/Mainfrm.cpp:1184 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Si tanqueu el FileZilla, es perdran els canvis." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4462,7 +4822,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "Si obteniu errors, la configuració és incorrecta." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4470,7 +4830,7 @@ "Si teniu problemes per recuperar els llistats de directoris o per transferir " "fitxers, intenteu canviar el mode de transferència per defecte." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4505,7 +4865,7 @@ "Si utilitzeu un encaminador (router), assegureu-vos que tots aquest ports " "són redirigits a l'ordinador on s'està executant el FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4513,16 +4873,16 @@ "Si el vostre encaminador (router) persisteix en canviar l'adreça IP, sisplau " "poseu-vos en contacte amb el fabricant del vostre encaminador." -#: ../../locales/../src/interface/import.cpp:80 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importa dades d'un versió més antiga" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Importa configuració" -#: ../../locales/../src/interface/import.cpp:66 -#: ../../locales/../src/interface/import.cpp:69 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Importació reeixida" @@ -4550,7 +4910,7 @@ "sistema tria." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4568,19 +4928,11 @@ "servidor un port i s'hi connecta. Per aquest mode no cal fer gaires " "configuracions." -#: ../../locales/../src/engine/tlssocket.cpp:1036 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Cadena incompleta, el certificat principal no està auto-signat per una " -"autoritat" - -#: ../../locales/../src/interface/queue.cpp:378 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" -msgstr "Contrasenya incorrecta." +msgstr "Contrasenya incorrecta" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4588,17 +4940,21 @@ "No s'ha pogut obtenir informació sobre la darrera versió del FileZilla. " "Sisplau, torneu a provar-ho més tard." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:733 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "S'està inicialitzant el TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:717 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 +msgid "Insecure algorithm!" +msgstr "Algorisme insegur!" + +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Servidor insegur, no admet FTP sobre TLS." -#: ../../locales/../src/engine/server.cpp:834 -#: ../../locales/../src/engine/server.cpp:853 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:579 +#: ../../locales/../src/engine/server.cpp:603 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interactiu" @@ -4606,29 +4962,29 @@ msgid "Interface" msgstr "Interfície" -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Interrupció de senyal" #: ../../locales/../src/engine/ControlSocket.cpp:216 -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Interrupció per l'usuari" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/http/request.cpp:40 +#: ../../locales/../src/engine/http/request.cpp:388 msgid "Invalid Content-Length" msgstr "Contingut-mida no vàlid" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:587 +#: ../../locales/../src/engine/http/request.cpp:271 msgid "Invalid HTTP Response" msgstr "Resposta HTTP no vàlida" -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "S'ha enviat un paràmetre no vàlid" -#: ../../locales/../src/engine/ControlSocket.cpp:451 -#: ../../locales/../src/engine/ControlSocket.cpp:507 +#: ../../locales/../src/engine/ControlSocket.cpp:454 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4636,44 +4992,69 @@ "S'ha rebut una sequència no vàlida de caracters, UTF-8 deshabilitat. " "Selecciona l'opció UTF-8 al gestor de llocs per forçar l'ús d'UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../locales/../src/engine/http/request.cpp:498 msgid "Invalid chunk size" msgstr "Mida de fragment no vàlida" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "S'han rebut dades no vàlides" -#: ../../locales/../src/interface/verifycertdialog.cpp:40 -#: ../../locales/../src/interface/verifycertdialog.cpp:53 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Data no vàlida" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Nom del fitxer no vàlid" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Hash no vàlid: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Amfitrió no vàlid, després del claudàtor que tanca només poden seguir dos " "punts i el port." -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Nom de l'amfitrió no vàlid: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Entrada no vàlida" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:330 +msgid "Invalid line" +msgstr "Línia no vàlida" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Camí no vàlid" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Port especificat no vàlid. El port ha de ser un valor entre 1 i 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4687,74 +5068,74 @@ "ftps:// per FTP sobre TLS (implícit) i\n" "ftpes:// per FTP sobre TLS (explícit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4249 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Amfitrió del servidor intermediari no vàlid, després del claudàtor que tanca " "només poden seguir dos punts i el port." -#: ../../locales/../src/interface/search.cpp:377 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "L'expressió regular no és vàlida" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "L'expressió regular de les condicions de cerca no és vàlida." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:597 +#: ../../locales/../src/engine/http/request.cpp:280 msgid "Invalid response code" msgstr "Codi de resposta no vàlid" -#: ../../locales/../src/interface/search.cpp:372 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Les condicions de cerca no són vàlides: %s" -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:443 -#: ../../locales/../src/interface/sitemanager.cpp:457 -#: ../../locales/../src/interface/sitemanager.cpp:464 -#: ../../locales/../src/interface/sitemanager.cpp:471 -#: ../../locales/../src/interface/sitemanager.cpp:488 -#: ../../locales/../src/interface/sitemanager.cpp:539 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:734 -#: ../../locales/../src/interface/sitemanager.cpp:808 -#: ../../locales/../src/interface/sitemanager.cpp:814 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Camí a lloc no vàlid" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:718 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Mida no vàlida a la condició" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "El nom d'usuari no és vàlid." -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Valor incorrecte per ai_flags" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Valor no vàlid pels consells" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Inverteix el filtre" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "País de jurisdicció:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Localitat de jurisdicció:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Estat o província de jurisdicció:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Reté els directoris dalt de tot" -#: ../../locales/../src/interface/Mainfrm.cpp:659 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4765,7 +5146,7 @@ "el FileZilla realitza algunes proves per verificar si el servidor és " "compatible amb aquesta funció, la prova pot fallar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1974 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Intercanvi de claus" @@ -4773,115 +5154,146 @@ msgid "Key exchange:" msgstr "Intercanvi de claus:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/engine/server.cpp:576 +#: ../../locales/../src/engine/server.cpp:601 +msgid "Key file" +msgstr "Fitxer de claus" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Identificador de clau:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Més &baixa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Idioma" -#: ../../locales/../src/interface/Mainfrm.cpp:1492 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "S'ha canviat l'idioma" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Darrera modificació" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Disposició" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1825 +msgid "Leave empty to keep existing password." +msgstr "Deixa-ho buit per mantenir la contrasenya existent." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Límit de &baixades simultànies:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Límit de &pujades simultànies:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Limitar ports locals" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Mida límit del fitxer de registre" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Límit:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/http/request.cpp:453 msgid "Line length exceeded" msgstr "Longitud de línia superada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Enllaçat amb" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Sòcol d'escolta tancat" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:360 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "Llistant:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Port més &baix disponible:" -#: ../../locales/../src/interface/edithandler.cpp:1145 -#: ../../locales/../src/interface/edithandler.cpp:1399 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Local" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "L'adreça local s'està utilitzant" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "S'ha tancat el punt final local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Fitxer local" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "El fitxer local no existeix." -#: ../../locales/../src/interface/updater.cpp:434 -#: ../../locales/../src/interface/updater.cpp:526 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "El fitxer local és %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "El fitxer local és un directori i no un fitxer normal." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "El nom del fitxer local no és vàlid." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1063 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Cerca de fitxers locals" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Filtres locals:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Gestió del camí local:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Lloc local:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "La mida local de '%s' no equival a la mida esperada: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Localitat:" @@ -4889,12 +5301,16 @@ msgid "Log file" msgstr "Fitxer de registre" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Enregistrat a" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Enregistrament" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:791 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4903,7 +5319,7 @@ "no ser compatible amb UTF-8. No es pot intentar canviar al joc de caràcters " "local per estar utilitzant un servidor intermediari (proxy)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:798 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4911,11 +5327,11 @@ "Les dades d'inici de sessió contenen caràcters no ASCII i el servidor podria " "no ser compatible amb UTF-8. Intentant joc de caràcters local." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" -"La seqüència d'entrada ha estat del tot executada però no s'ha pogut entrar. " -"Avortant." +"La seqüència d'entrada ha estat del tot executada però no s'ha pogut entrar, " +"avortant." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -4930,17 +5346,17 @@ "El tipus d'entrada només es pot utilitzar conjuntament amb la URL de FTP. El " "paràmetre ha de ser '%s' o bé '%s'" -#: ../../locales/../src/interface/queue.cpp:878 -#: ../../locales/../src/interface/queue.cpp:965 +#: ../../locales/../src/interface/queue.cpp:931 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Baixa" -#: ../../locales/../src/interface/queue.cpp:876 -#: ../../locales/../src/interface/queue.cpp:963 +#: ../../locales/../src/interface/queue.cpp:929 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Més baixa" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "El port més baix disponible ha de ser un número entre 1024 i 65535." @@ -4948,152 +5364,192 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:43 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Assegureu-vos que es pot accedir al fitxer i que és un document XML ben " "format." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../locales/../src/engine/http/request.cpp:440 +#: ../../locales/../src/engine/http/request.cpp:453 +#: ../../locales/../src/engine/http/request.cpp:464 +#: ../../locales/../src/engine/http/request.cpp:498 #, c-format msgid "Malformed chunk data: %s" msgstr "Dades de fragment malmeses: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/http/request.cpp:40 #, c-format -msgid "Malformed header: %s" -msgstr "Capçalera incorrecta: %s" +msgid "Malformed request header: %s" +msgstr "Capçalera de petició incorrecta: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:557 -msgid "Malformed reply, server not sending proper line endings" -msgstr "" -"Resposta incorrecta, el servidor no està enviant els finals de línia adequats" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/engine/http/request.cpp:517 +#, c-format +msgid "Malformed response body: %s" +msgstr "Cos de resposta incorrecte: %s" + +#: ../../locales/../src/engine/http/request.cpp:241 +#: ../../locales/../src/engine/http/request.cpp:247 +#: ../../locales/../src/engine/http/request.cpp:330 +#: ../../locales/../src/engine/http/request.cpp:380 +#: ../../locales/../src/engine/http/request.cpp:388 +#: ../../locales/../src/engine/http/request.cpp:446 +#, c-format +msgid "Malformed response header: %s" +msgstr "Capçalera de resposta incorrecta: %s" + +#: ../../locales/../src/engine/http/request.cpp:401 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." +msgstr "" +"Resposta incorrecta: El servidor ha enviat un cos de resposta amb un verb de " +"petició o codi de resposta que no permet un cos de resposta." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Transferència manual" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "&Contrasenya mestra:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Contrasenya mestra:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Coincideix amb tots els següents" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Coincideix amb algun dels següents" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "No coincideix amb cap dels següents" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "No coincideix amb tots els següents" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Nombre &màxim de transferències simultànies:" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Ha fallat l'assignació de memòria" -#: ../../locales/../src/interface/Mainfrm.cpp:394 -#: ../../locales/../src/interface/Mainfrm.cpp:1819 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Registre de missatges" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Posició del registre de missatges" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Missatge massa llarg" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:366 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Minuts" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Desplaça a&vall" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2124 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Desplaça am&unt" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "El meu ordinador" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Els meus documents" -#: ../../locales/../src/interface/sitemanager.cpp:286 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:728 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:730 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:772 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:775 msgid "My Sites" msgstr "Els meus llocs web" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/D" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Nom" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1264 msgid "Name already exists" msgstr "Aquest nom ja existeix" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:816 -#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "El nom de l'adreça d'interès ja existeix." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Nom:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Ordenació natural" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Cal especificar el nom del filtre" -#: ../../locales/../src/interface/search.cpp:363 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Cal introduir un camí local vàlid" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Cal introduir un camí remot vàlid" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1049 msgid "Need to specify a character encoding" msgstr "Cal especificar una codificació de caràcters" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "" "No s'ha proporcionat ni el nom de node ni el nom de servidor, o no es " "coneixen" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5101,12 +5557,12 @@ "L'amfitrió de la xarxa no disposa de cap adreça de xarxa dins la família " "d'adreces sol·licitada" -#: ../../locales/../src/engine/proxy.cpp:473 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "La xarxa no és accessible" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Mai" @@ -5118,37 +5574,37 @@ msgid "New &tab" msgstr "&Nova pestanya" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2788 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nova &adreça d'interès" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2560 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:574 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:816 -#: ../../locales/../src/interface/sitemanager.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2076 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2434 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../../locales/../src/interface/LocalTreeView.cpp:1126 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1255 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1340 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Nou directori" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Noves característiques i millores a %s" @@ -5157,41 +5613,41 @@ msgid "New filter" msgstr "Nou filtre" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:953 msgid "New folder" msgstr "Nova carpeta" -#: ../../locales/../src/interface/sitemanager.cpp:625 -#: ../../locales/../src/interface/sitemanager.cpp:639 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2052 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2407 msgid "New site" msgstr "Nou lloc" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Següent a la cua de transferències" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:389 msgid "No" msgstr "No" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "No hi ha cap adreça associada amb aquest nom de node" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "No s'ha seleccionat cap categoria per exportar" -#: ../../locales/../src/interface/QueueView.cpp:2143 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." msgstr "No s'ha donat cap ordre, cancel·lant." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3788 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "No s'ha fixat cap adreça IP externa, intentant per defecte." -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "No s'està editant cap fitxer." @@ -5199,96 +5655,92 @@ msgid "No filter name given" msgstr "No s'ha especificat cap nom de filtre" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "No s'ha donat cap amfitrió, introduïu-ne un sisplau." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Cap imatge disponible" -#: ../../locales/../src/interface/QueueView.cpp:3005 -msgid "No more files in the queue!" -msgstr "No hi ha més fitxers a la cua!" - -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "No s'ha donat cap nom al conjunt de filtres." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2955 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "No hi ha cap programa associat amb aquest tipus d'arxius" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2872 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "No hi ha cap programa associat per tal d'editar arxius amb l'extensió '%s'." -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Sense ruta a l'amfitrió" -#: ../../locales/../src/interface/search.cpp:227 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Sense resultats de la cerca" -#: ../../locales/../src/interface/sitemanager.cpp:295 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Cap lloc disponible" -#: ../../locales/../src/engine/proxy.cpp:444 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "No hi ha cap mètode d'autenticació SOCKS5 compatible" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "No s'ha donat cap nom d'usuari." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:59 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Cap" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2331 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Cap seleccionat encara" -#: ../../locales/../src/engine/socket.cpp:1078 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Fallada irrecuperable en la traducció de noms de domini" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:830 -#: ../../locales/../src/engine/server.cpp:849 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:881 -#: ../../locales/../src/interface/queue.cpp:968 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1276 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:570 +#: ../../locales/../src/engine/server.cpp:597 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 +#: ../../locales/../src/interface/queue.cpp:996 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "No tots els elements s'han pogut posar a la cua per ser transferits." -#: ../../locales/../src/interface/state.cpp:185 -#: ../../locales/../src/interface/state.cpp:492 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "No connectat" -#: ../../locales/../src/interface/RemoteListView.cpp:2022 +#: ../../locales/../src/interface/RemoteListView.cpp:2059 msgid "Not connected to any server" msgstr "No està connectat a cap servidor" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "No està connectat a cap servidor." @@ -5296,27 +5748,36 @@ msgid "Not connected." msgstr "No connectat." -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "No s'ha inicialitzat, cal cridar WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:657 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Teniu en compte que aquesta característica només funciona utilitzant el " "protocol FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Nota: No es pot recuperar una clau perduda." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Atenció: Això només funciona amb connexions FTP sense xifrar." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Nota: Usar un servidor intermediari genèric força l'ús del mode passiu en " "les connexions FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:247 +#: ../../locales/../src/engine/http/request.cpp:446 +msgid "Null character in line" +msgstr "Caràcter nul a la línia" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Nombre de posicions decimals:" @@ -5324,39 +5785,47 @@ msgid "Number of retries has to be between 0 and 99." msgstr "El nombre d'intents ha d'estar entre 0 i 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 -msgid "O&pen file" -msgstr "&Obre fitxer" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:796 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:892 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1003 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1162 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1344 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1451 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1522 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1575 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1808 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2081 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2156 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2685 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2938 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3150 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3219 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3584 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3640 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "Obre" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "D'acord" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 +msgid "OS version:" +msgstr "Versió del SO:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " @@ -5365,40 +5834,53 @@ "A les pàgines següents es configurarà el mode de transferència, així com el " "mode alternatiu si està habilitat." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:834 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "Once" msgstr "Una vegada" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Un cop al dia" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Un cop per setmana" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:530 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:544 msgid "Only use plain FTP (insecure)" msgstr "Utilitza només FTP pla (insegur)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "&Obre fitxer" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Obre directori en el gestor de fitxers del sistema" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Obre el gestor de llocs" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Obre el gestor de llocs." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Obre el gestor de llocs. Feu clic amb botó dret per veure la llista de llocs." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Obre el diàleg de permisos d'accés a directoris per a configurar a quins " +"directoris locals te accés el FileZilla." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Obre el fitxer." @@ -5406,14 +5888,16 @@ msgid "Open the settings dialog of FileZilla" msgstr "Obre el diàleg de configuració del FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Obert com:" -#: ../../locales/../src/interface/edithandler.cpp:1648 -#: ../../locales/../src/interface/edithandler.cpp:1765 -#: ../../locales/../src/interface/LocalListView.cpp:1694 -#: ../../locales/../src/interface/LocalListView.cpp:1706 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "No s'ha pogut obrir" @@ -5425,110 +5909,118 @@ msgid "Opens the Site Manager" msgstr "Obre el gestor de llocs" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Obre el diàleg de filtres del llistat de directoris. Feu clic amb botó dret " "per commutar filtres." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:777 -msgid "Operating system" -msgstr "Sistema operatiu" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 +msgid "Operating System:" +msgstr "Sistema operatiu:" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "L'operació ja és en curs" -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Operació en curs" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Operació no admesa" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Opcions" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Taronja" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Organització:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Altres opcions de SFTP" -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Altre error de sistema" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Altre:" -#: ../../locales/../src/engine/socket.cpp:1044 -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Sense memòria" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Descripció" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Sobreescriu s&i el fitxer origen és més recent" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Sobreescriu el fitxer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1416 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Sobreescriu el fitxer si tenen mida diferent" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1394 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1417 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "" "Sobreescriu el fitxer si la mida és diferent o el fitxer origen és més recent" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1392 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1415 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Sobreescriu el fitxer si el fitxer origen és més recent" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Sobreescriu si tenen mida &diferent" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Sobreescriu si la mida és diferent o el fitxer origen és més recent" -#: ../../locales/../src/interface/updater.cpp:282 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Tipus de versió pròpia: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Permisos del propietari" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:86 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Propietari/Grup" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5536,31 +6028,31 @@ "&Evita que el sistema romangui en estat inactiu durant transferències i " "altres operacions" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "&Amfitrió del servidor intermediari:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Ordre PORT interferida per l'encaminador (router) o el tallafocs." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "&Passiu (recomanat)" -#: ../../locales/../src/interface/Mainfrm.cpp:2388 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "El paràmetre no és una URL vàlida" -#: ../../locales/../src/interface/updater.cpp:606 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Analitzant %d bytes de la informació de versió.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2447 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Contrasen&ya:" @@ -5568,67 +6060,81 @@ msgid "Passive (recommended)" msgstr "Passiu (recomanat)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Mode passiu" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "" "S'ha seleccionat el mode passiu com a mode de transferència per defecte." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:283 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "No s'ha definit la contrasenya o la clau de xifratge" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Cal la contrasenya" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:81 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Contrasenyes" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Camí" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3083 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2222 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "El camí no es pot construir amb el directori %s i el subdirectori %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2345 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Camí no trobat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2622 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Camins" -#: ../../locales/../src/interface/edithandler.cpp:1124 -#: ../../locales/../src/interface/edithandler.cpp:1267 -#: ../../locales/../src/interface/edithandler.cpp:1366 -#: ../../locales/../src/interface/edithandler.cpp:1379 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Pendent d'eliminació" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Permís" -#: ../../locales/../src/engine/socket.cpp:1037 -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Permís denegat" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Permisos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Plataforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Sisplau afegiu els directoris locals que voleu usar amb el FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5636,6 +6142,14 @@ "Comproveu sisplau a https://filezilla-project.org/probe.php que el servidor " "s'està executant i comproveu curosament de nou la vostra configuració." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Comproveu els permisos concedits i afegiu els directoris locals que falten " +"en el següent diàleg." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5644,13 +6158,13 @@ "Configureu sisplau els tallafocs i encaminadors (routers) perquè el " "FileZilla pugui establir connexions sortints en ports arbitraris." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Sisplau inhabiliteu característiques com 'mode DMZ' o 'Mode de Joc' en el " "vostre encaminador." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5666,14 +6180,14 @@ msgid "Please enter a custom time format." msgstr "Sisplau introduïu un format d'hora personalitzat." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:732 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" "Sisplau introduïu una data en format YYYY-MM-DD com per exemple 2015-05-23." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5683,16 +6197,16 @@ msgid "Please enter a name for the new filter." msgstr "Sisplau introduïu un nom per al nou filtre." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Sisplau introduïu un nom nou per al filtre copiat." -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Sisplau introduïu un nom nou per al conjunt de filtres \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Sisplau introduïu un nom nou per al filtre." @@ -5719,20 +6233,10 @@ "Sisplau introduïu un número entre 1 i 10 per al nombre de transferències " "simultànies." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Sisplau introduïu una contrasenya per aquest servidor:" -#: ../../locales/../src/interface/QueueView.cpp:2132 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Sisplau introduïu el camí i l'executable a executar.\n" -"P. ex. c:\\cami\\fitxer.exe sota MS Windows o /cami/fitxer sota Unix.\n" -"També podeu especificar opcionalment paràmetres del programa." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5740,30 +6244,30 @@ "Sisplau informeu un temps d'espera entre 10 i 9999 segons o 0 per desactivar " "els temps d'espera." -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Sisplau introduïu un nom únic per aquest conjunt de filtres" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Sisplau introduïu un nom d'usuari per aquest servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Sisplau introduïu un rang de ports vàlid." -#: ../../locales/../src/interface/netconfwizard.cpp:176 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Sisplau introduïu una URL d'on aconseguir la vostra adreça externa" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Sisplau informeu un límit de velocitat de pujada més gran o igual a 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5771,28 +6275,48 @@ "Sisplau introduïu una ordre FTP concreta.\n" "A l'utilitzar ordres FTP concretes s'esborra la memòria cau del directori." -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1241 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Sisplau introduïu el camí complet del programa i els seus paràmetres. " +"Aquesta ordre s'executarà quan acabi el processament de la cua.\n" +"P. ex. c:\\cami\\fitxer.exe sota MS Windows o /cami/fitxer sota Unix.\n" +"Heu de posar bé les cometes si les ordres i els paràmetres contenen espais." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Sisplau introduïu el nom del directori a crear:" -#: ../../locales/../src/interface/RemoteListView.cpp:2629 +#: ../../locales/../src/interface/RemoteListView.cpp:2673 msgid "Please enter the name of the file which should be created:" msgstr "Sisplau informeu el nom del fitxer que s'hauria de crear:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "" "Sisplau introduïu el nom d'usuari i la contrasenya per aquest servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Introduïu la contrasenya mestra actual per a canviar la configuració de la " +"contrasenya." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Sisplau introduïu la vostra adreça IP externa" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5802,6 +6326,13 @@ "d'aquest auxiliar. En cas de que tingueu una adreça IP dinàmica o que no " "conegueu la vostra adreça externa, useu l'opció de resolució externa." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Sisplau introduïu la contrasenya mestra per a desxifrar la contrasenya " +"d'aquest servidor:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5810,7 +6341,7 @@ "Sisplau seguiu les instruccions curosament, ja que una configuració errònia " "no permetrà establir satisfactòriament les connexions FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5818,13 +6349,13 @@ "Sisplau assegureu-vos que el FileZilla té permís per establir connexions " "sortints i que heu escrit l'adreça del sistema de resolució correctament." -#: ../../locales/../src/interface/FileZilla.cpp:136 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Sisplau assegureu-vos que l'idioma sol·licitat està instal·lat en el vostre " "sistema." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5849,7 +6380,7 @@ "maliciós. Això podria provocar una falsa alarma que podeu descartar amb " "seguretat." -#: ../../locales/../src/interface/Mainfrm.cpp:697 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5858,7 +6389,7 @@ "només funciona a servidors FTP, FTPS i FTPES que siguin compatibles amb " "l'ordre MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5866,7 +6397,7 @@ "Sisplau tingueu en compte que alguns servidors us podrien bloquejar si " "intenteu connectar-vos massa sovint o en intervals massa curts." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5876,11 +6407,19 @@ "en cas que us trobeu problemes amb servidors que, anteriorment, funcionaven " "correctament." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3191 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Deseu aquesta clau en un lloc segur. Sense la clau correcta no podreu " +"accedir als fitxers pujats." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Sisplau seleccioneu una acció:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Sisplau seleccioneu les categories que voleu importar." @@ -5915,7 +6454,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Sisplau seleccioneu els nous atributs per al fitxer seleccionat." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5928,39 +6467,39 @@ "més a més, l'encaminador ha d'estar configurat correctament. Haureu de " "redirigir els ports manualment. No executeu l'encaminador en el 'mode DMZ' o " "'mode joc'. Cal desactivar opcions com inspecció de protocols o " -"'reparacions' específiques de protocols." +"'reparacions' específiques de protocols" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "&Posició del registre de missatges:" -#: ../../locales/../src/interface/verifycertdialog.cpp:223 -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Codi postal:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "Preassigna &espai abans de la baixada" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Preassignació" -#: ../../locales/../src/interface/sitemanager.cpp:285 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1797 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2135 msgid "Predefined Sites" msgstr "Llocs web predefinits" -#: ../../locales/../src/interface/Mainfrm.cpp:696 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Es preserven les marques horàries del fitxer" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Visualització prèvia:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Visualització prèvia" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "" "Els certificats de la connexió primària i la connexió de dades no " @@ -5975,15 +6514,15 @@ msgid "Print version information to stdout and exit" msgstr "Imprimeix la informació de versió a stdout i surt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Prioritza els directoris (per defecte)" -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Prioritat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5991,7 +6530,7 @@ "Política de privacitat: Només s'enviarà al servidor la teva versió del " "FileZilla, el sistema operatiu que tens i l'arquitectura de CPU." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "&Claus privades:" @@ -5999,25 +6538,31 @@ msgid "Pro&tocol:" msgstr "Pro&tocol:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Contrasen&ya del servidor intermediari:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "&Processa la cua" -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Processa desbordament de taula de fitxers" -#: ../../locales/../src/engine/socket.cpp:1047 +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 +#, c-format +msgid "Processed %s in %s." +msgstr "%s processat(s) en %s." + +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Protocol no admès" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Protocol no admès en el tipus de sòcol donat" @@ -6025,55 +6570,60 @@ msgid "Protocol:" msgstr "Protocol:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "&Port del servidor intermediari:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Nom d'&usuari per al servidor intermediari:" -#: ../../locales/../src/engine/proxy.cpp:454 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Ha fallat l'autenticació amb el servidor intermediari" -#: ../../locales/../src/engine/transfersocket.cpp:103 -#: ../../locales/../src/engine/transfersocket.cpp:115 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Ha fallat l'autenticació amb el servidor intermediari: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "L'amfitrió del servidor intermediari comença amb '[' però no s'ha trobat el " "claudàtor que tanca." -#: ../../locales/../src/engine/proxy.cpp:312 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Resposta del servidor intermediari: %s" -#: ../../locales/../src/engine/proxy.cpp:367 -#: ../../locales/../src/engine/proxy.cpp:495 +#: ../../locales/../src/engine/proxy.cpp:520 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "" +"La petició al servidor intermediari ha fallat. Resposta del servidor: %s" + +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "La petició al servidor intermediari ha fallat: %s" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "La petició al servidor intermediari ha fallat: Tipus d'adreça desconegut a " "la resposta CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4272 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "" "S'ha establert un servidor intermediari però l'amfitrió o el port no són " "vàlids" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Autenticació de clau pública" @@ -6081,68 +6631,77 @@ msgid "Public key algorithm:" msgstr "Algorisme de la clau pública:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Permisos públics" -#: ../../locales/../src/interface/QueueView.cpp:3085 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "La cua ha estat totalment processada" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Cua: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Cua: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Cua: buida" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Fitxers a la cua" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "En &cua:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "R&einicia el sistema" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Cerca ràpida:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "La cerca ràpida no es pot obrir si s'estan comparant directoris." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "R&einicia el sistema un cop" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "Arbre de &directoris remots" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "Reinicia i posa en cua els fitxers &seleccionats" -#: ../../locales/../src/interface/Mainfrm.cpp:596 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Ordre FTP concreta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Lect&ura" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "Re&fresca" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Ca&nvia de nom" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6150,102 +6709,110 @@ "Torneu a executar l'auxiliar i comproveu la vostra configuració per tal de " "tenir els encaminadors (routers) i tallafocs de forma correcta." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Lectur&a" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Només de lectura" -#: ../../locales/../src/interface/Mainfrm.cpp:1048 +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "De debò voleu cancel·lar l'operació actual?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:1421 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" "Really delete %d directories with their contents from the server?" msgstr[0] "" -"De debò voleu suprimir el directori %d i el seu contingut del servidor?" +"De debò voleu suprimir %d directori i el seu contingut del servidor?" msgstr[1] "" -"De debò voleu suprimir els directoris %d i els seus continguts del servidor?" +"De debò voleu suprimir %d directoris i els seus continguts del servidor?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:734 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" -msgstr[0] "De debò voleu suprimir el fitxer %d del servidor?" -msgstr[1] "De debò voleu suprimir els fitxers %d del servidor?" +msgstr[0] "De debò voleu suprimir %d fitxer del servidor?" +msgstr[1] "De debò voleu suprimir %d fitxers del servidor?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1426 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "De debò voleu suprimir %s i %s del servidor?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "De debò voleu suprimir tots els fitxers i/o directoris seleccionats del " "servidor?" -#: ../../locales/../src/engine/local_filesys.cpp:129 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "De debò voleu suprimir tots els fitxers i/o directoris seleccionats del " "vostre ordinador?" -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Motiu" -#: ../../locales/../src/interface/QueueView.cpp:3078 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "Reinicia ara" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Recursivament als subdirectoris" -#: ../../locales/../src/engine/tlssocket.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "S'ha rebut una alerta TLS del servidor: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2988 +#: ../../locales/../src/engine/directorylistingparser.cpp:3078 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" "S'ha rebut un llistat de directori que sembla està codificat en EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:2015 -#: ../../locales/../src/engine/directorylistingparser.cpp:2029 +#: ../../locales/../src/engine/directorylistingparser.cpp:2060 +#: ../../locales/../src/engine/directorylistingparser.cpp:2077 msgid "Received a line exceeding 10000 characters, aborting." msgstr "S'ha rebut una línia amb més de 10000 caràcters, cancel·lant." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"No s'ha pogut verificar el certificat en cadena rebut. L'estat de la " +"verificació és %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Dades rebudes interferides" -#: ../../locales/../src/interface/updater.cpp:585 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "S'ha rebut un caràcter no vàlid en la informació de la versió" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "S'ha rebut una alerta TLS desconeguda %d del servidor" -#: ../../locales/../src/interface/updater.cpp:578 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "La informació de versió rebuda és massa extensa" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6254,65 +6821,75 @@ "servidor.\n" "Si continueu, la connexió serà tancada." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Paràmetres de reconnexió" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Reconnecta al darrer servidor utilitzat" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:653 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 +msgid "Recursively adding files to queue." +msgstr "Afegint fitxers recursivament a la cua." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 +msgid "Recursively changing permissions." +msgstr "Canviant permisos recursivament." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 +msgid "Recursively deleting files and directories." +msgstr "Suprimint fitxers i directoris recursivament." + +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Vermell" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Redirecció a una URI no vàlida o no admesa: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:660 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:667 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Redirecció a una adreça no vàlida o no admesa: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Refresca les llistes de fitxers i directoris" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Recorda contrasenyes?" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Remot" -#: ../../locales/../src/engine/tlssocket.cpp:833 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "No s'ha validat el certificat remot." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2250 -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Fitxer remot" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3069 -#: ../../locales/../src/interface/search.cpp:358 -#: ../../locales/../src/interface/search.cpp:363 -#: ../../locales/../src/interface/search.cpp:372 -#: ../../locales/../src/interface/search.cpp:377 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Cerca de fitxers remots" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Filtres remots:" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Camí remot" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:424 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6321,7 +6898,7 @@ "El camí remot no es pot analitzar. Assegureu-vos que és un camí absolut " "vàlid i l'accepta el tipus de servidor del lloc actual (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1177 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6330,130 +6907,134 @@ "El camí remot no es pot analitzar. Assegureu-vos que és un camí absolut " "vàlid i l'accepta el tipus de servidor (%s) seleccionat al lloc pare." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:426 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:430 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "El camí remot no es pot analitzar. Assegureu-vos que és un camí absolut " "vàlid." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "El camí remot no s'ha pogut analitzar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Gestió del camí remot:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1701 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Camí remot:" -#: ../../locales/../src/interface/viewheader.cpp:533 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Lloc remot:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Esborr&a-ho tot" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Esborra els &seleccionats" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1396 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:287 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Canvia el nom del fitxer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Canvia el nom del directori seleccionat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Canvia el nom dels fitxers i directoris seleccionats" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3422 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2421 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:595 #, c-format msgid "Renaming '%s' to '%s'" -msgstr "Canviant de nom '%s' a '%s'." +msgstr "Canviant de nom '%s' a '%s'" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Repetir la contrasenya:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Informar els errors i fer peticions de funcionalitats" -#: ../../locales/../src/engine/proxy.cpp:358 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Ha fallat la petició - el client no està executant identd (o no és a l'abast " "del servidor)" -#: ../../locales/../src/engine/proxy.cpp:361 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Ha fallat la petició - l'identd del client no ha pogut confirmar la cadena " "ID de l'usuari" -#: ../../locales/../src/engine/proxy.cpp:355 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "La petició s'ha rebutjat o ha fallat" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:528 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:542 msgid "Require explicit FTP over TLS" msgstr "Requereix FTP explícit sobre TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:543 msgid "Require implicit FTP over TLS" msgstr "Requereix FTP implícit sobre TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:461 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Reinicia i torna a posar-ho &tot en cua" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "El protocol resolt és desconegut" -#: ../../locales/../src/engine/ControlSocket.cpp:1076 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/ControlSocket.cpp:1081 #, c-format msgid "Resolving address of %s" msgstr "S'està resolent l'adreça de %s" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Recurs indisponible temporalment" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:343 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:357 msgid "Response:" msgstr "Resposta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Resultats:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1395 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Reprèn la transferència de fitxers" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6461,19 +7042,21 @@ "Reprendre fitxers ASCII pot causar problemes si el servidor utilitza un " "format de fi de línia diferent al del client." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1263 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:914 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "S'està recuperant el llistat del directori de \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1260 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "S'està recuperant el llistat del directori..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3803 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "S'està recuperant l'adreça IP externa de %s" @@ -6482,23 +7065,23 @@ msgid "S&how files currently being edited..." msgstr "&Mostra els fitxers que s'estan editant..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "Mostra el &gestor de llocs a l'iniciar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "A&paga el sistema" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "A&paga el sistema un cop" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3000 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "A&tura" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "At&ura temporalment el sistema" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "At&ura temporalment el sistema un cop" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "&Navegació sincronitzada" @@ -6506,93 +7089,113 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Permet SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:137 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "El servidor intermediari de SOCKS4 es connectarà a: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 no permet els noms d'usuari o contrasenya amb més de 255 caràcters." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "&Desa les contrasenyes protegides per una contrasenya mestra" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "D&esa contrasenyes" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Voleu desar la configuració?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 msgid "Saving of password has been disabled by your system administrator." msgstr "" "L'administrador del teu sistema ha inhabilitat l'opció de desar la " "contrasenya." -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 msgid "Saving of passwords has been disabled by you." msgstr "Has inhabilitat l'opció de desar les contrasenyes." -#: ../../locales/../src/interface/QueueView.cpp:1718 -msgid "Scanning for files to add to queue" -msgstr "Escanejant per trobar fitxers per afegir a la cua" - -#: ../../locales/../src/interface/QueueView.cpp:1720 -msgid "Scanning for files to upload" -msgstr "Escanejant per trobar fitxers per pujar" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Factor d'escala:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "&Condicions de cerca:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "&Directori de cerca:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Cerca fitxers recursivament." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Cerca fitxers al servidor" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Tipus de cerca:" + +#: ../../locales/../src/interface/statusbar.cpp:515 msgid "Security information" msgstr "Informació sobre seguretat" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Veure també: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Sele&cciona el servidor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Selecciona una &pàgina:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" -msgstr "Selecciona un tema:" +msgstr "Selecciona un tema" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Selecciona una acció per defecte per dur a terme si el fitxer destinació " "d'una transferència ja existeix." -#: ../../locales/../src/interface/edithandler.cpp:1562 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Selecciona un editor per defecte" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6600,7 +7203,7 @@ "Selecciona una acció de fitxer existent per defecte si el fitxer destinació " "ja existeix. Aquesta selecció només serà vàlida per la sessió actual." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6608,60 +7211,65 @@ "Selecciona una acció de fitxer existent per defecte només pels fitxers " "seleccionats a la cua." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:359 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Selecciona el fitxer que conté la clau privada" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Selecciona el fitxer per a les dades exportades" -#: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Selecciona el fitxer per als filtres exportats" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Selecciona el fitxer per a la cua d'exportació" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Selecciona el fitxer per a la configuració exportada" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2104 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2479 msgid "Select file for exported sites" msgstr "Selecciona el fitxer per als llocs exportats" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Selecciona el fitxer des d'on s'ha d'importar la configuració" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Selecciona el fitxer per pujar" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:305 -msgid "Select filename for converted keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 +msgid "Select filename for converted key file" msgstr "Selecciona el nom de fitxer per al fitxer de claus convertit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2877 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Selecciona com s'haurien d'obrir aquests arxius." -#: ../../locales/../src/interface/search.cpp:482 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Selecciona el directori de baixada de destinació" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Selecciona el nom del fitxer destinació" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Selecciona les categories a exportar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Selecciona les dades privades que us agradaria esborrar." -#: ../../locales/../src/interface/search.cpp:450 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6669,77 +7277,77 @@ msgstr[1] "" "S'han seleccionat %d directoris amb els seus continguts per transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d directori seleccionat." msgstr[1] "%d directoris seleccionats." -#: ../../locales/../src/interface/search.cpp:448 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "%d fitxer seleccionat per transferir." msgstr[1] "%d fitxers seleccionats per transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "%d fitxer seleccionat. Mida total: %s" msgstr[1] "%d fitxers seleccionats. Mida total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "%d fitxer seleccionat. Mida total: Com a mínim %s" msgstr[1] "%d fitxers seleccionats. Mida total: Com a mínim %s" -#: ../../locales/../src/interface/search.cpp:454 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s i %s seleccionats per transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "%s i %s seleccionats. Mida total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s i %s seleccionats. Mida total: Com a mínim %s" -#: ../../locales/../src/interface/edithandler.cpp:1507 -#: ../../locales/../src/interface/edithandler.cpp:1582 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "L'editor seleccionat no existeix." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "El fitxer seleccionat ja s'està editant" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:388 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "El fitxer seleccionat ja està carregat" -#: ../../locales/../src/interface/edithandler.cpp:1680 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "El fitxer seleccionat ja està obert" -#: ../../locales/../src/interface/edithandler.cpp:1752 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "El fitxer seleccionat encara s'està editant" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "El filtre seleccionat només funciona per als fitxers locals." -#: ../../locales/../src/interface/menu_bar.cpp:307 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6748,48 +7356,48 @@ "tipus de servidor diferent.\n" "Utilitzeu adreces d'interès específiques del lloc per a aquest servidor." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "El port seleccionat normalment és utilitzat per un protocol diferent." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Envia ordres FTP per &mantenir la connexió" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "" "Envia una ordre personalitzada al servidor que d'una altra manera no estaria " "disponible" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4350 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Enviant ordre de manteniment de la connexió" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Número de sèrie:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" -msgstr "&Tipus de servidor" +msgstr "&Tipus de servidor:" -#: ../../locales/../src/engine/tlssocket.cpp:722 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "El servidor no ha tancat correctament la connexió TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:878 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:931 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "El servidor només admet caràcters ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4184 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "El servidor no permet reprendre fitxers > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4180 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6798,15 +7406,19 @@ "El servidor no permet reprendre fitxers > %d GB. Finalitza la transferència " "fins que les mides dels fitxers coincideixin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2457 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "El servidor no permet reprendre fitxers > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2453 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "El servidor no permet reprendre fitxers > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4195 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Clau d'amfitrió del servidor" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6815,7 +7427,7 @@ "El servidor podria no permetre reprendre els fitxers > %d GB. Finalitza la " "transferència fins que les mides dels fitxers coincideixin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:827 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6823,11 +7435,15 @@ "El servidor podria requerir un compte. Prova d'especificar-ne un utilitzant " "el gestor de llocs" -#: ../../locales/../src/engine/ControlSocket.cpp:340 +#: ../../locales/../src/engine/http/request.cpp:241 +msgid "Server not sending proper line endings" +msgstr "El servidor no està enviant els finals de línia adequats" + +#: ../../locales/../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "El servidor ha retornat un camí buit." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:654 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:224 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6835,13 +7451,13 @@ "El servidor ha enviat una petició d'entrada addicional. Heu d'utilitzar el " "tipus d'entrada interactiu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3748 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "El servidor ha enviat una resposta passiva amb una adreça no enrutable. Ha " "fallat el mode passiu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3742 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6849,36 +7465,47 @@ "El servidor ha enviat una resposta passiva amb una adreça no enrutable. " "S'utilitzarà l'adreça del servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:425 -#: ../../locales/../src/interface/netconfwizard.cpp:464 -#: ../../locales/../src/interface/netconfwizard.cpp:473 -#: ../../locales/../src/interface/netconfwizard.cpp:485 -#: ../../locales/../src/interface/netconfwizard.cpp:509 -#: ../../locales/../src/interface/netconfwizard.cpp:516 -#: ../../locales/../src/interface/netconfwizard.cpp:525 -#: ../../locales/../src/interface/netconfwizard.cpp:536 +#: ../../locales/../src/engine/http/request.cpp:517 +msgid "Server sent too much data." +msgstr "El servidor ha enviat massa dades." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Resposta estranya del servidor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"El servidor ha enviat una cadena de certificat desordenada per violació de " +"les especificacions TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "MAC servidor a client:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2047 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Clau servidor a client:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "Tipus de ser&vidor:" -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Servidor/Fitxer local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Servidor:" @@ -6886,45 +7513,54 @@ msgid "Session details" msgstr "Detalls de la sessió" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Estableix la &prioritat" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3570 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2300 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:589 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Estableix els permisos de '%s' a '%s'" - -#: ../../locales/../src/engine/transfersocket.cpp:767 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize cridat sense sòcol" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Establint els permisos de '%s' a '%s'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Configuració" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 +msgid "Settings directory:" +msgstr "Directori de la configuració:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "M&ostra anunci emergent" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Mostra el &llistat del directori sense retocs" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "&Mostra diàleg de benvinguda..." -#: ../../locales/../src/interface/Mainfrm.cpp:2235 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Voleu mostrar ambdós arbres de directoris i continuar comparant?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Mostra detalls" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Mostra detalls sobre els formats personalitzats de data i hora" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:438 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "&Mostra al gestor de fitxers" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Mostra claus TLS disponibles" @@ -6932,7 +7568,7 @@ msgid "Shows this help dialog" msgstr "Mostra aquest diàleg d'ajuda" -#: ../../locales/../src/interface/QueueView.cpp:3074 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "Atura ara" @@ -6940,7 +7576,11 @@ msgid "Signature algorithm:" msgstr "Algorisme de la clau pública:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Inscripció al servei" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Entrades del &gestor de llocs" @@ -6948,55 +7588,61 @@ msgid "Site Manager" msgstr "Gestor de llocs" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1019 msgid "Site Manager - Cannot remember password" msgstr "Gestor de llocs - No pot recordar la contrasenya" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:988 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Gestor de llocs - Clau generada" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1032 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1049 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1077 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1154 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1182 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Site Manager - Invalid data" msgstr "Gestor de llocs - Dades no vàlides" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "El gestor de llocs ja està obert" -#: ../../locales/../src/interface/sitemanager.cpp:443 -#: ../../locales/../src/interface/sitemanager.cpp:457 -#: ../../locales/../src/interface/sitemanager.cpp:471 -#: ../../locales/../src/interface/sitemanager.cpp:539 -#: ../../locales/../src/interface/sitemanager.cpp:734 -#: ../../locales/../src/interface/sitemanager.cpp:814 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "El lloc no existeix." -#: ../../locales/../src/interface/sitemanager.cpp:426 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "El camí del lloc ha de començar amb un 0 o 1." -#: ../../locales/../src/interface/sitemanager.cpp:464 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "El camí del lloc sembla mal escrit." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:260 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Adreces d'interès específiques de lloc" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7006,11 +7652,11 @@ "estigui emmagatzemat al gestor de llocs.\n" "Voleu afegir la connexió actual al gestor de llocs?" -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "Mida" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Format de mida" @@ -7018,55 +7664,60 @@ msgid "Size unknown" msgstr "Mida desconeguda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Omet fitxer" -#: ../../locales/../src/engine/ControlSocket.cpp:1147 -#: ../../locales/../src/engine/ControlSocket.cpp:1164 -#: ../../locales/../src/engine/ControlSocket.cpp:1188 -#: ../../locales/../src/engine/ControlSocket.cpp:1249 +#: ../../locales/../src/engine/ControlSocket.cpp:1151 +#: ../../locales/../src/engine/ControlSocket.cpp:1168 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping download of %s" msgstr "S'està ometent la baixada de %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1151 -#: ../../locales/../src/engine/ControlSocket.cpp:1167 -#: ../../locales/../src/engine/ControlSocket.cpp:1192 -#: ../../locales/../src/engine/ControlSocket.cpp:1253 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "S'està ometent el fitxer inexistent de clau \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1154 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 +#: ../../locales/../src/engine/ControlSocket.cpp:1197 +#: ../../locales/../src/engine/ControlSocket.cpp:1275 #, c-format msgid "Skipping upload of %s" msgstr "S'està ometent la pujada de %s" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "L'adreça del sòcol és fora de l'espai d'adreces" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "El sòcol ja està connectat" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "El sòcol s'ha aturat" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "El sòcol no està connectat" -#: ../../locales/../src/engine/socket.cpp:1102 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "No s'admet el tipus de sòcol per la família d'adreces" -#: ../../locales/../src/interface/Mainfrm.cpp:1183 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "Alguns fitxers encara s'estan editant o s'han de pujar." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7074,32 +7725,32 @@ "Alguns servidors remots mal configurats que són darrera d'un encaminador, " "poden respondre amb la seva adreça IP local." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Ordena els directoris amb els fitxers" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "" "El tipus d'ordenació no es pot canviar si s'estan comparant directoris." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Ordenació" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "&Mode d'ordenació:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "L'origen i el camí de l'operació de deixar anar són idèntics" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "El fitxer origen i destinació poden no ser els mateixos" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "L'origen i la destinació de l'operació de deixar anar són idèntics" @@ -7107,37 +7758,37 @@ msgid "Source file:" msgstr "Fitxer origen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3602 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Límits de velocitat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Límits de velocitat" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:592 msgid "Speed limits are disabled, click to change." msgstr "Els límits de velocitat estan desactivats, feu clic per canviar-ho." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:595 msgid "Speed limits are enabled, click to change." msgstr "Els límits de velocitat estan activats, feu clic per canviar-ho." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Versions estables i beta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Només versions estables" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Versions estables, beta i nocturnes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Comença la transferència &immediatament" @@ -7145,19 +7796,21 @@ msgid "Start with opened Site Manager" msgstr "Comença amb el gestor de llocs obert" -#: ../../locales/../src/interface/updater.cpp:276 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "La comprovació d'actualitzacions ha començat a %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2167 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1548 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "S'està iniciant la baixada de %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2170 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1551 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "S'està iniciant la pujada de %s" @@ -7166,26 +7819,38 @@ msgid "Starts the local site in the given path" msgstr "Inicia el lloc local en el camí donat" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Estat o província:" -#: ../../locales/../src/interface/edithandler.cpp:1100 -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "Estat" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:367 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:298 +#: ../../locales/../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "Estat:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "&Atura i suprimeix tots" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 +msgid "Stop recursive operation" +msgstr "Atura l'operació recursiva" + +#: ../../locales/../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Emmagatzematge al núvol descentralitzat" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Permet Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Carrer:" @@ -7199,13 +7864,13 @@ #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" -msgstr "Resum dels resultats del test" +msgstr "Resum dels resultats de la prova:" -#: ../../locales/../src/interface/QueueView.cpp:3082 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "Suspend now" msgstr "Atura temporalment ara" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7213,28 +7878,33 @@ "Aquesta opció no afecta els enllaços simbòlics a fitxers, aquests enllaços " "simbòlics sempre s'esborren." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:244 -#: ../../locales/../src/interface/state.cpp:258 -#: ../../locales/../src/interface/state.cpp:264 -#: ../../locales/../src/interface/state.cpp:274 -#: ../../locales/../src/interface/state.cpp:365 -#: ../../locales/../src/interface/state.cpp:373 -#: ../../locales/../src/interface/state.cpp:381 -#: ../../locales/../src/interface/state.cpp:952 -#: ../../locales/../src/interface/state.cpp:961 -#: ../../locales/../src/interface/state.cpp:968 -#: ../../locales/../src/interface/state.cpp:979 -#: ../../locales/../src/interface/state.cpp:986 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Navegació sincronitzada" -#: ../../locales/../src/interface/state.cpp:380 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "S'ha inhabilitat la navegació sincronitzada." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Sincronitzant els directoris." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Error de sintaxi" @@ -7243,40 +7913,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2347 -#: ../../locales/../src/interface/Mainfrm.cpp:2390 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Error de sintaxi a la línia de comandes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Sistema" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 +msgid "System details" +msgstr "Detalls del sistema" + +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "S'ha superat el límit de sistema pels fitxer oberts" -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Ha fallat el subsistema de xarxa del sistema" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "Barra d'&eines" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:311 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:139 msgid "TLS connection established, sending HTTP request" msgstr "S'ha establert la connexió TLS, enviant petició HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:375 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "S'ha establert la connexió TLS, esperant missatge de benvinguda..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:378 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "S'ha establert la connexió TLS." -#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL vençut" @@ -7284,31 +7958,43 @@ msgid "Target file already exists" msgstr "El fitxer destinació ja existeix" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Fitxer destinació:" -#: ../../locales/../src/interface/RemoteListView.cpp:2645 +#: ../../locales/../src/interface/RemoteListView.cpp:2691 msgid "Target filename already exists!" msgstr "El nom de fitxer destinació ja existeix!" -#: ../../locales/../src/interface/RemoteListView.cpp:1599 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "Target filename already exists, really continue?" msgstr "El nom de fitxer destinació ja existeix, de debò voleu continuar?" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Fallada temporal en la traducció de noms de domini" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Prova finalitzada satisfactòriament" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Resultats de la prova" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4201 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Provant les capacitats de reprendre fitxers del servidor" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "S'estan editant els següents &fitxers actualment:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:785 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "Cal reparar el fitxer per a poder utilitzar el gestor de llocs." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7317,7 +8003,7 @@ "El gestor de llocs està obert per una altra instància del FileZilla 3.\n" "Voleu continuar? En aquest cas, no es desarà cap canvi al gestor de llocs." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7325,34 +8011,37 @@ "El gestor de llocs està obert per una altra instància del FileZilla 3.\n" "Si us plau, tanqueu-la o no es podran esborrar les dades." -#: ../../locales/../src/interface/xmlfunctions.cpp:389 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "El document XML està mal format: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "L'adreça que heu introduït és: %s" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "No s'admet el membre ai_family" -#: ../../locales/../src/engine/socket.cpp:1092 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "No s'admet el membre ai_socktype" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:802 -#: ../../locales/../src/interface/sitemanager.cpp:714 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "No s'ha pogut afegir l'adreça d'interès." -#: ../../locales/../src/interface/sitemanager.cpp:796 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "No s'han pogut netejar les adreces d'interès." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"El certificat requereix que el servidor inclogui un estat OCSP a la seva " +"resposta, però l'estat OCSP no hi és." + +#: ../../locales/../src/interface/statusbar.cpp:475 msgid "The connection is encrypted. Click icon for details." msgstr "La connexió està xifrada. Cliqueu a la icona per més detalls." @@ -7374,35 +8063,40 @@ "El format de temps personalitzat és incorrecte o conté especificadors de " "format no admesos." -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "No s'ha pogut establir la connexió de dades: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2895 -#: ../../locales/../src/interface/edithandler.cpp:1542 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "No s'ha trobat l'editor per defecte dels arxius de text." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "L'editor per defecte dels arxius de text és '%s' ." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "" "El nom del filtre introduït ja existeix, sisplau trieu un nom diferent." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Les contrasenyes introduïdes són diferents." + +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "L'extensió '%s' ja existeix a la llista" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:278 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:284 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7411,8 +8105,9 @@ "El fitxer %s ja existeix.\n" "Sisplau introduïu un nom nou:" -#: ../../locales/../src/interface/edithandler.cpp:1653 -#: ../../locales/../src/interface/LocalListView.cpp:1698 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7423,18 +8118,28 @@ "No s'ha trobat el programa associat (%s).\n" "Sisplau comproveu les vostres associacions de tipus de fitxers." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:226 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"El fitxer '%s' conté una clau SSH1. El protocol SSH1 és obsolet, el " +"FileZilla només admet claus SSH2." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "No s'ha pogut carregar el fitxer '%s' o no conté una clau privada." -#: ../../locales/../src/interface/xmlfunctions.cpp:41 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "No s'ha pogut carregar el fitxer '%s'." -#: ../../locales/../src/interface/edithandler.cpp:1648 -#: ../../locales/../src/interface/LocalListView.cpp:1694 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7444,8 +8149,9 @@ "No hi ha cap programa associat amb aquest tipus de fitxer en el el vostre " "sistema." -#: ../../locales/../src/interface/edithandler.cpp:1765 -#: ../../locales/../src/interface/LocalListView.cpp:1706 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7454,20 +8160,19 @@ "No s'ha pogut obrir el fitxer '%s':\n" "Ha fallat l'ordre associada" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"El fitxer '%s' no té un format compatible amb el FileZilla.\n" -"A més, el fitxer està protegit amb contrasenya. Els fitxers de claus " -"protegits amb contrasenyes encara no són compatibles amb el FileZilla.\n" -"Voleu convertir-lo a un format compatible desprotegit?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" +msgstr "" +"El fitxer '%s' s'ha creat amb una versió més recent del FileZilla.\n" +"Es poden perdre dades si carregueu fitxers creats amb versions més recents.\n" +"Voleu continuar de totes maneres?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:269 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7476,22 +8181,11 @@ "El fitxer '%s' no té un format compatible amb el FileZilla.\n" "Voleu convertir-lo a un format compatible?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:274 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"El fitxer '%s' està protegit amb contrasenya. Els fitxers de claus protegits " -"amb contrasenya encara no són compatibles amb el FileZilla.\n" -"Voleu convertir-lo a un fitxer desprotegit?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "El fitxer seleccionat com a editor per defecte no existeix." -#: ../../locales/../src/interface/import.cpp:79 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7509,7 +8203,7 @@ msgid "The filename column can neither be hidden nor moved." msgstr "La columna del nom de fitxer no es pot amagar ni desplaçar." -#: ../../locales/../src/interface/listctrlex.cpp:798 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "La columna del nom de fitxer no es pot amagar." @@ -7523,19 +8217,19 @@ msgid "The following characters will be replaced: %s" msgstr "Es substituiran els següents caràcters: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1888 -msgid "The following files are currently being edited:" -msgstr "Els següents fitxers s'estan editant actualment:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "La solució FTP de codi obert lliure" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:293 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "La clau de xifratge generada és:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "No s'han pogut desar les adreces d'interès globals." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7549,7 +8243,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "El límit cal que sigui entre 1 i 2000 MiB" -#: ../../locales/../src/interface/state.cpp:255 +#: ../../locales/../src/interface/state.cpp:1121 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "No s'ha pogut crear el directori local '%s'." + +#: ../../locales/../src/interface/state.cpp:1106 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "El directori local '%s' no existeix." + +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7558,7 +8262,7 @@ "El directori local '%s' no està sota l'arrel sincronitzada (%s).\n" "Desactivo la navegació sincronitzada i continuo canviant el directori local?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7566,20 +8270,30 @@ "El port més baix disponible ha de ser menor o igual al port més alt " "disponible." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Cal que la contrasenya mestra tingui almenys 8 caràcters de longitud." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "" "No s'ha pogut baixar la nova versió, torneu a intentar-ho més tard sisplau." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "La nova versió s'ha desat al teu directori de Baixades." -#: ../../locales/../src/interface/QueueView.cpp:1840 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." msgstr "No es desarà la cua." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1028 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "El directori remot '%s' no existeix." + +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7588,29 +8302,29 @@ "El directori remot '%s' no està sota l'arrel sincronitzada (%s).\n" "Desactivo la navegació sincronitzada i continuo canviant el directori remot?" -#: ../../locales/../src/interface/import.cpp:69 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "S'han importat les categories seleccionades." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1603 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "El fitxer seleccionat conté dades importables de les següents categories:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1767 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "El fitxer seleccionat ja s'està editant:" -#: ../../locales/../src/interface/edithandler.cpp:1752 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "El fitxer seleccionat ja està obert en algun altre programa, sisplau tanqueu-" "lo." -#: ../../locales/../src/interface/edithandler.cpp:1658 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7620,15 +8334,15 @@ "Això pot ser perillós i malmetre el vostre sistema.\n" "De debò voleu continuar?" -#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "No s'ha pogut afegir el servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "El servidor ha enviat una resposta inesperada o no reconeguda." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "El servidor utilitza la següent codificació pels noms de fitxers:" @@ -7640,7 +8354,7 @@ "El certificat del servidor és desconegut. Sisplau examineu curosament el " "certificat per assegurar-vos que podeu confiar en el servidor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:934 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7650,7 +8364,7 @@ "significa que l'administrador ha canviat la clau del servidor o bé que " "s'està connectant a un altre ordinador que s'intenta fer passar pel servidor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7658,11 +8372,16 @@ "La clau de l'amfitrió és desconeguda. No hi ha cap garantia que el servidor " "sigui l'ordinador que penseu que és." -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "" +"El nom d'amfitrió del servidor difereix del nom d'amfitrió del certificat" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "No s'admet el paràmetre de nom de servidor per ai_socktype" -#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7670,19 +8389,19 @@ "S'ha importat la configuració. Heu de reiniciar el FileZilla perquè la nova " "configuració tingui efecte." -#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "No s'admet la família d'adreces proporcionada" -#: ../../locales/../src/engine/socket.cpp:1104 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "El nom de xarxa proporcionat ja no està disponible" -#: ../../locales/../src/interface/QueueView.cpp:3077 +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." msgstr "El sistema es reiniciarà aviat a menys que feu clic a Cancel·la." -#: ../../locales/../src/interface/QueueView.cpp:3073 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "El sistema s'apagarà aviat a menys que feu clic a Cancel·la." @@ -7694,11 +8413,11 @@ "El fitxer destinació ja existeix.\n" "Sisplau, escolliu una acció." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "La prova no ha reeixit. Esteu segur que voleu desar la configuració?" -#: ../../locales/../src/interface/xmlfunctions.cpp:77 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "No s'ha pogut restaurar la còpia de seguretat '%s' vàlida" @@ -7707,15 +8426,15 @@ msgid "Themes" msgstr "Temes" -#: ../../locales/../src/interface/filter.cpp:445 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Aquest conjunt de filtres no es pot suprimir." -#: ../../locales/../src/interface/filter.cpp:385 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Aquest conjunt de filtres no es pot canviar de nom." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7739,45 +8458,43 @@ "Aquest auxiliar us ajudarà a configurar correctament qualsevol encaminador " "(router) o tallafocs que tingueu i provar la vostra configuració." -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "Temps" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Format de l'hora" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "&Temps d'espera en segons:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:379 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Temps d'espera" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1642 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1022 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "La diferència de zona horària del servidor és %d segons." - -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Títol:" -#: ../../locales/../src/interface/Mainfrm.cpp:2233 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Per a comparar directoris cal tancar la cerca ràpida." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Per a comparar directoris, ambdues llistes de fitxers han d'estar alineades." -#: ../../locales/../src/interface/Mainfrm.cpp:2234 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Per fer això, cal que ambdós arbres de directoris o bé s'amaguin o bé es " "mostrin." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7785,7 +8502,7 @@ "Per ser compatible amb l'autenticació de clau pública, el FileZilla " "necessita saber quines claus privades utilitzar." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7802,7 +8519,7 @@ "Verd: El fitxer es més nou que el fitxer no marcat a l'altra banda\n" "Vermell: Mides de fitxers diferents" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7812,82 +8529,77 @@ "Si està activat, en navegar pel directori local veurem com també canvia el " "directori del servidor, d'acord amb l'estructura local i a l'inrevés." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Commuta el processament de la cua de transferències" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Commuta la visualització de l'arbre de directoris locals" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Commuta la visualització del registre de missatges" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Commuta la visualització de l'arbre de directoris remots" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Commuta la visualització de la cua de transferències" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:569 +#: ../../locales/../src/engine/http/request.cpp:254 msgid "Too long header line" msgstr "Línia de capçalera massa llarga" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:644 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Massa redireccions" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:353 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "Traça:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Transferència" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "&Direcció de transferència" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "&Tipus de transferència" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Mode de transferència" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Cua de transferències" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Paràmetres de transferència" -#: ../../locales/../src/engine/transfersocket.cpp:446 -#: ../../locales/../src/engine/transfersocket.cpp:468 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "S'ha interromput la connexió de transferència: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "S'han interferit les dades transferides." -#: ../../locales/../src/interface/queue.cpp:389 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "S'està transferint" @@ -7895,28 +8607,27 @@ msgid "Transfers" msgstr "Transferències" -#: ../../locales/../src/interface/QueueView.cpp:2975 -#: ../../locales/../src/interface/QueueView.cpp:2978 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "Transferències finalitzades" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "&Tracta els fitxers sense extensió com fitxers ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Tracta els següents tipus de &fitxers com fitxers ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:385 msgid "Trust changed Hostkey:" msgstr "Confia en la clau canviada de l'amfitrió:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:382 msgid "Trust new Hostkey:" msgstr "Confia en la nova clau de l'amfitrió:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Confieu en la nova clau i voleu continuar amb la connexió?" @@ -7924,71 +8635,77 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Confieu en aquest certificat i voleu continuar la connexió?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:872 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Confieu en aquest amfitrió i voleu continuar amb la connexió?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Intenta-ho altre cop" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 -#: ../../locales/../src/interface/edithandler.cpp:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Tipus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Tipus de servidor intermediari FTP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Tipus de servidor intermediari genèric:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "&Pujada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3543 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Límit de p&ujada:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "&Utilitza les associacions dels tipus de fitxers si estan disponibles" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Utilitza els &valors per defecte del sistema" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 +msgid "U&se system defaults for current language" +msgstr "U&tilitza configuració per defecte del sistema per a l'idioma actual" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "&USUARI@AMFITRIÓ" -#: ../../locales/../src/engine/proxy.cpp:364 -#: ../../locales/../src/engine/proxy.cpp:491 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Codi d'error no assignat: %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Unitat:" -#: ../../locales/../src/interface/edithandler.cpp:1130 -#: ../../locales/../src/interface/edithandler.cpp:1158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Desconegut" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:673 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Tipus de servidor intermediari FTP desconegut, no es pot generar la " "seqüència d'entrada." -#: ../../locales/../src/engine/proxy.cpp:412 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versió del protocol SOCKS desconeguda: %d" @@ -7997,20 +8714,22 @@ msgid "Unknown certificate" msgstr "Certificat desconegut" -#: ../../locales/../src/interface/xmlfunctions.cpp:380 -#: ../../locales/../src/interface/xmlfunctions.cpp:392 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" -"Error desconegut obrint l'arxiu. Assegureu-vos que l'arxiu és accessible i " -"que és un document XML ben format." +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Error desconegut %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Error desconegut %u" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Clau de l'amfitrió desconeguda" -#: ../../locales/../src/engine/proxy.cpp:420 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8019,13 +8738,17 @@ "Versió del protocol SOCKS de subnegociació d'Autenticació Usuari/Contrasenya " "desconeguda: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:420 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "Element arrel desconegut, l'arxiu no sembla generat pel Filezilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/engine/http/request.cpp:380 +msgid "Unknown transfer encoding" +msgstr "Codificació desconeguda de la transferència" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8033,7 +8756,7 @@ "A no ser que aquests problemes es solucionin, el mode actiu FTP no " "funcionarà i s'haurà d'utilitzar el mode passiu." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8041,15 +8764,15 @@ "A no ser que aquest problema es solucioni, el mode FTP actiu no funcionarà i " "s'haurà d'utilitzar el mode passiu." -#: ../../locales/../src/engine/tlssocket.cpp:1017 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Tipus de certificat no compatible" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:629 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Redirecció no compatible" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Pu&ja i desfa l'edició" @@ -8058,98 +8781,107 @@ msgid "Updates" msgstr "Actualitzacions" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Pujada" -#: ../../locales/../src/interface/edithandler.cpp:1121 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "La pujada ha fallat" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:605 #, c-format msgid "Upload limit: %s/s" msgstr "Límit de pujada: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:608 msgid "Upload limit: none" msgstr "Límit de pujada: cap" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Puja els resultats de la cerca" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Puja el directori seleccionat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Puja els fitxers i directoris seleccionats" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Voleu tornar a pujar aquest fitxer al servidor?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Voleu pujar aquest fitxer al servidor?" -#: ../../locales/../src/interface/edithandler.cpp:1115 -#: ../../locales/../src/interface/edithandler.cpp:1149 -#: ../../locales/../src/interface/edithandler.cpp:1314 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "S'està pujant" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1316 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Pujant i esborrat pendent" -#: ../../locales/../src/interface/edithandler.cpp:1152 -#: ../../locales/../src/interface/edithandler.cpp:1318 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Pujant i desfent l'edició" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Utilitza un joc de &caràcters personalitzat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Usa editor &personalitzat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2882 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Usa l'editor per &defecte per als arxius de text" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2672 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2746 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Usa navegació &sincronitzada" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:467 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Usa expressions regulars" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Utilitza UTF-8 si el servidor n'és compatible, altrament utilitza el joc de " "caràcters local." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1389 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Utilitza l'acció per defecte" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:527 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 msgid "Use explicit FTP over TLS if available" msgstr "Si està disponible, utilitza l'FTP explícit sobre TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Utilitza el servidor al qual s'està connectat actualment" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Utilitza el servidor des del gestor de llocs" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "&Utilitza els valors per defecte del sistema" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 +msgid "Use system &defaults for current language" +msgstr "Utilitza configuració per &defecte del sistema per a l'idioma actual" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8164,7 +8896,7 @@ msgstr "Utilitza l'adreça IP externa del servidor en lloc de" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8182,21 +8914,17 @@ "per primera vegada. Al servidor només s'hi envia la versió del FileZilla que " "esteu fent servir." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Usuari:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1077 msgid "Username cannot be a series of spaces" msgstr "El nom d'usuari no pot ser una sèrie d'espais" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4277 -#, c-format -msgid "Using proxy %s" -msgstr "S'està usant el servidor intermediari %s" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:507 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8215,57 +8943,49 @@ msgid "Verbose log messages from wxWidgets" msgstr "Missatges de registre detallats del wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "S'està verificant el certificat..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -msgid "Version:" -msgstr "Versió:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Molt alta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" "L'opció per mostrar els fitxers ocults està activada, però és incompatible " "amb el servidor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Visualitza/Edita" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Columnes visibles" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "Esc&riptura" -#: ../../locales/../src/interface/QueueView.cpp:1678 -msgid "Waiting" -msgstr "S'està esperant" - -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "S'està esperant la connexió del navegador" -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "S'està esperant la contrasenya" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "S'està esperant la cancel·lació de la transferència" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Esperant per reintentar-ho..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Avís, s'ignora la connexió de dades des d'una IP equivocada." @@ -8284,23 +9004,23 @@ "\n" "Esteu segur que voleu comprovar les versions nocturnes?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Avís: pot haver-hi un forat de seguretat!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Benvinguts al FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Novetats" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Novetats:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8309,7 +9029,7 @@ "reiniciar el FileZilla us podeu reconnectar sense haver de tornar a " "introduir la contrasenya." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8317,36 +9037,54 @@ "Quan està activat, els caràcters de nom de fitxer no admesos pel sistema " "operatiu local es substitueixen quan es baixa el fitxer." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "Quan s'inicia una nova &connexió tot i estant ja connectat:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Pantalla ampla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Voleu que el FileZilla recordi les contrasenyes?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Escr&iptura" -#: ../../locales/../src/interface/netconfwizard.cpp:448 #: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Adreça IP externa errònia" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/http/request.cpp:440 msgid "Wrong line endings" msgstr "Finals de línia erronis" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"La contrasenya mestra introduïda és errònia, no es pot utilitzar per " +"desxifrar les contrasenyes desades." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"La contrasenya mestra introduïda és errònia, no es pot utilitzar per " +"desxifrar aquest element." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Groc" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:396 msgid "Yes" msgstr "Sí" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8354,24 +9092,24 @@ "Sembla que utilitzeu un amfitrió amb només IPv6. Aquest auxiliar no és " "compatible amb aquest entorn." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Esteu utilitzant la darrera versió del FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Sempre podreu obrir de nou aquest diàleg a través del menú d'ajuda." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Podeu baixar la darrera versió des del lloc web del FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "Podeu deixar el camp del port buit, s'utilitzarà el port per defecte." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8379,7 +9117,15 @@ "Podeu utilitzar una x a qualsevol posició per a mantenir el permís original " "del fitxer." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Si utilitzeu una contrasenya mestra no podeu modificar la contrasenya i la " +"clau de xifratge individualment." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "No es pot importar la configuració des del propi directori de configuració " @@ -8393,23 +9139,28 @@ "No podeu bescanviar un caràcter incorrecte per un altre caràcter incorrecte. " "Sisplau introduïu un caràcter permès en els noms de fitxer." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "No podeu pujar fitxers al directori arrel." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "No heu especificat un nom nou per al fitxer. Voleu sobreescriure el fitxer?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Heu seleccionat almenys un enllaç simbòlic." -#: ../../locales/../src/interface/edithandler.cpp:1619 -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "Heu seleccionat més de 10 fitxers per editar, de debò voleu continuar?" -#: ../../locales/../src/interface/LocalListView.cpp:1664 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8417,35 +9168,47 @@ "Heu seleccionat més de 10 fitxers o directoris per obrir, de debò voleu " "continuar?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 msgid "You have to enter a hostname." msgstr "Heu d'especificar un nom d'amfitrió." -#: ../../locales/../src/interface/search.cpp:493 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 +msgid "You have to enter a key file path" +msgstr "Heu d'introduir un camí per al fitxer de claus" + +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Heu d'introduir un directori local." -#: ../../locales/../src/interface/netconfwizard.cpp:164 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Heu d'introduir una adreça IP vàlida." +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Heu d'introduir un directori remot." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "Heu d'introduir una adreça IPv4 vàlida." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +msgid "You have to enter a valid encryption key" +msgstr "Cal introduir una clau de xifratge vàlida" -#: ../../locales/../src/interface/search.cpp:498 +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Heu d'introduir un directori local amb permisos d'escriptura." -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 msgid "You have to enter an account name" msgstr "Heu d'introduir un nom de compte" -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 msgid "You have to specify a user name" msgstr "Heu d'especificar un nom d'usuari" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8453,7 +9216,11 @@ "Probablement teniu un encaminador o tallafocs que ha modificat erròniament " "les dades transferides." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Cal que introduïu una contrasenya mestra." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Cal que introduïu un nom per a l'adreça d'interès." @@ -8461,7 +9228,7 @@ msgid "You need to enter a name for the log file." msgstr "Cal que especifiqueu un nom per al fitxer de registre." -#: ../../locales/../src/interface/edithandler.cpp:1503 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Cal que escriviu correctament l'ordre entre cometes." @@ -8476,17 +9243,17 @@ "Cal que introduïu un número de port del servidor intermediari dins del rang " "1 a 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:440 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Cal que introduïu com a mínim un camí, no es permeten les adreces d'interès " "buides." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8494,7 +9261,7 @@ "Cal que introduïu un camí local i un camí remot per poder habilitar la " "navegació sincronitzada per a aquesta adreça d'interès." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1154 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8502,23 +9269,31 @@ "Cal que introduïu un camí local i un camí remot per poder habilitar la " "navegació sincronitzada per a aquest lloc." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Cal concedir accés al FileZilla als directoris on voleu descarregar fitxers " +"o d'on els voleu pujar." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Heu d'especificar un fitxer local." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Heu d'especificar un fitxer remot." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Heu d'especificar un camí remot." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Heu d'especificar un servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8526,163 +9301,332 @@ "No hauríeu de tenir problemes connectant-vos amb altres servidors, les " "transferències de fitxers haurien de funcionar correctament." -#: ../../locales/../src/interface/QueueView.cpp:3081 +#: ../../locales/../src/interface/QueueView.cpp:2775 msgid "Your computer will suspend unless you click Cancel." msgstr "" "El vostre ordinador s'apagarà temporalment a menys que feu clic a Cancel·la." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "després" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "abans" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "comença amb" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "bytes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "conté" -#: ../../locales/../src/interface/updater.cpp:280 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "personalitza" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "no conté" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "no equival a" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "acaba amb" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "equival" -#: ../../locales/../src/interface/filelistctrl.cpp:530 -#: ../../locales/../src/interface/filelistctrl.cpp:549 -#: ../../locales/../src/interface/filelistctrl.cpp:576 -#: ../../locales/../src/interface/filelistctrl.cpp:592 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "fitxer" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:98 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " "FileZilla executable." msgstr "" -"No s'ha pogut iniciar el fzputtygen.\n" +"no s'ha pogut iniciar el fzputtygen.\n" "Sisplau, assegureu-vos que aquest executable existeix en el mateix directori " "que l'executable del FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:462 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp pertany a una versió diferent del FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1475 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "no s'ha pogut iniciar el fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1044 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj pertany a una versió diferent del FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "no s'ha pogut iniciar el fzstorj" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"no s'ha pogut iniciar el fzstorj.\n" +"Sisplau, assegureu-vos que aquest executable existeix en el mateix directori " +"que l'executable del FileZilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers no ha retornat cap certificat" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "ha fallat gnutls_pem_base64_encode2 failed" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "més gran que" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "executable pel grup" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "llegible pel grup" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "es pot escriure pel grup" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "equival a" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "està definit" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "no està definit" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "menor que" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "coincideix amb l'expressió regular" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "nom nou" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "executable pel propietari" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "llegible pel propietari" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "es pot escriure pel propietari" -#: ../../locales/../src/engine/tlssocket.cpp:1100 -#: ../../locales/../src/engine/tlssocket.cpp:1111 -#: ../../locales/../src/engine/tlssocket.cpp:1126 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:30 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "desconegut" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "executable per tothom" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "llegible per tothom" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "es pot escriure per tothom" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "&No recordar contrasenyes (recomanat)" + +#~ msgid "Set permissions of '%s' to '%s'" +#~ msgstr "Estableix els permisos de '%s' a '%s'" + +#~ msgid "Available sizes" +#~ msgstr "Mides disponibles" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "" +#~ "No es pot carregar la barra de connexió ràpida des del fitxer de recursos" + +#~ msgid "Host key fingerprint:" +#~ msgstr "Empremta digital de la clau de l'amfitrió:" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize cridat sense sòcol" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "La diferència de zona horària del servidor és %d segons." + +#~ msgid "Filename &filters..." +#~ msgstr "&Filtres de nom de fitxer..." + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "No s'han pogut importar els certificats del parell, ha fallat " +#~ "gnutls_x509_crt_import" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "No s'ha pogut inicialitzar l'estructura pels certificats del parell, ha " +#~ "fallat gnutls_x509_crt_init" + +#~ msgid "Package" +#~ msgstr "Paquet" + +#, fuzzy +#~ msgid "Updated" +#~ msgstr "Actualitzacions" + +#~ msgid "%d files added to queue" +#~ msgstr "%d fitxers afegits a la cua" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Desconnecta del servidor" + +#~ msgid "&Show message" +#~ msgstr "Mo&stra el missatge" + +#~ msgid "" +#~ "Any changes made in the Site Manager will not be saved unless you repair " +#~ "the file." +#~ msgstr "" +#~ "No es podrà desar cap canvi fet al gestor de llocs, a no ser que repareu " +#~ "el fitxer." + +#~ msgid "Cannot compare directories, not connected to a server." +#~ msgstr "No es poden comparar els directoris, no està connectat al servidor." + +#~ msgid "Connected" +#~ msgstr "Connectat" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "Encara no s'ha implementat la supressió alhora de diferents directoris no " +#~ "relacionats" + +#~ msgid "Do ¬hing" +#~ msgstr "&No facis res" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "Baixar alhora diferents directoris no relacionats no està encara " +#~ "implementat." + +#~ msgid "Downloading search results" +#~ msgstr "S'estan baixant els resultats de la cerca" + +#~ msgid "No more files in the queue!" +#~ msgstr "No hi ha més fitxers a la cua!" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Escanejant per trobar fitxers per afegir a la cua" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Escanejant per trobar fitxers per pujar" + +#~ msgid "The XML document is not well-formed: %s" +#~ msgstr "El document XML està mal format: %s" + +#~ msgid "" +#~ "The file '%s' is not in a format supported by FileZilla.\n" +#~ "The file is also password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into a supported, unprotected format?" +#~ msgstr "" +#~ "El fitxer '%s' no té un format compatible amb el FileZilla.\n" +#~ "A més, el fitxer està protegit amb contrasenya. Els fitxers de claus " +#~ "protegits amb contrasenyes encara no són compatibles amb el FileZilla.\n" +#~ "Voleu convertir-lo a un format compatible desprotegit?" + +#~ msgid "" +#~ "The file '%s' is password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into an unprotected file?" +#~ msgstr "" +#~ "El fitxer '%s' està protegit amb contrasenya. Els fitxers de claus " +#~ "protegits amb contrasenya encara no són compatibles amb el FileZilla.\n" +#~ "Voleu convertir-lo a un fitxer desprotegit?" + +#~ msgid "U&se system defaults" +#~ msgstr "Utilitza els &valors per defecte del sistema" + +#~ msgid "" +#~ "Unknown error opening the file. Make sure the file can be accessed and is " +#~ "a well-formed XML document." +#~ msgstr "" +#~ "Error desconegut obrint l'arxiu. Assegureu-vos que l'arxiu és accessible " +#~ "i que és un document XML ben format." + +#~ msgid "Use system &defaults" +#~ msgstr "&Utilitza els valors per defecte del sistema" + +#~ msgid "Using proxy %s" +#~ msgstr "S'està usant el servidor intermediari %s" + +#~ msgid "Waiting" +#~ msgstr "S'està esperant" + #~ msgid "Clear &Site Manager entries" #~ msgstr "Neteja les entrades del &gestor de llocs" @@ -8811,9 +9755,6 @@ #~ msgid "Operating system problem detected" #~ msgstr "S'ha trobat un problema del sistema operatiu" -#~ msgid "Package" -#~ msgstr "Paquet" - #~ msgid "" #~ "Please check https://filezilla-project.org/ for the most recent version " #~ "of FileZilla." @@ -8851,10 +9792,6 @@ #~ msgid "Resolving hostname" #~ msgstr "S'està resolent el nom de l'amfitrió" -#, fuzzy -#~ msgid "Root certificate is not trusted" -#~ msgstr "No s'ha validat el certificat remot." - #~ msgid "Select download location for package" #~ msgstr "Seleccioneu la ubicació de baixada pel paquet" diff -Nru filezilla-3.15.0.2/locales/co.po filezilla-3.33.0/locales/co.po --- filezilla-3.15.0.2/locales/co.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/co.po 2016-09-28 08:57:50.000000000 +0000 @@ -6,29 +6,29 @@ msgid "" msgstr "" "Project-Id-Version: FileZilla in Corsican\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-13 13:13+0100\n" -"PO-Revision-Date: 2016-01-02 18:26+0100\n" -"Last-Translator: Patriccollu di Santa Maria Sichè \n" -"Language-Team: Patriccollu di Santa Maria è Sichè \n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2016-09-24 16:04+0200\n" +"PO-Revision-Date: 2016-08-28 18:39+0200\n" +"Last-Translator: Patriccollu di Santa Maria è Sichè \n" +"Language-Team: Patriccollu di Santa Maria è Sichè \n" "Language: co\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 1.8.8\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:199 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S trascorsu" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:205 msgid "%H:%M:%S left" msgstr "%H:%M:%S à a fine" @@ -41,55 +41,50 @@ "%a - Contu (E linee chì cuntenenu quessu seranu omesse s'è u tipu d'accessu " "ùn hè micca Contu)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d cartulare" msgstr[1] "%d cartulari" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1399 +#: ../../locales/../src/interface/search.cpp:809 +#: ../../locales/../src/interface/search.cpp:1188 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d cartulare cù u so cuntenutu" msgstr[1] "%d cartulari cù i so cuntenuti" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1398 +#: ../../locales/../src/interface/search.cpp:808 +#: ../../locales/../src/interface/search.cpp:1187 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d schedariu" msgstr[1] "%d schedarii" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d schedariu. Dimensione tutale : %s" msgstr[1] "%d schedarii. Dimensione tutale : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" -msgstr[0] "%d schedariu. Dimensione tutale : almenu %s" -msgstr[1] "%d schedarii. Dimensione tutale : almenu %s" - -#: ../../locales/../src/interface/QueueView.cpp:2778 -#, c-format -msgid "%d files added to queue" -msgstr "%d schedarii aghjunti à a lista d'attesa" +msgstr[0] "%d schedariu. Dimensione tutale : Almenu %s" +msgstr[1] "%d schedarii. Dimensione tutale : Almenu %s" -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:102 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -100,14 +95,14 @@ msgid "%h - Host" msgstr "%h - Ospite" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu cartulare" msgstr[1] "%llu cartulari" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:118 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -119,12 +114,12 @@ msgid "%p - Password" msgstr "%p - Parolla d'intrata" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:160 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:163 #, c-format msgid "%s (? B/s)" msgstr "%s (? O/s)" @@ -144,24 +139,24 @@ msgid "%s - Proxy user" msgstr "%s - Utilizatore di u proxy" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s è %s. Dimensione tutale : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" -msgstr "%s è %s. Dimensione tutale : almenu %s" +msgstr "%s è %s. Dimensione tutale : Almenu %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:67 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s ottettu" msgstr[1] "%s ottetti" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:581 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -170,13 +165,13 @@ "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s ùn si trova micca. Senza stu cumpunentu di FileZilla, SFTP ùn pò micca " -"funziunà.\n" +"%s ùn pò micca esse trovu. Senza stu cumpunentu di FileZilla, SFTP ùn " +"funziunerà micca.\n" "\n" -"Ci vole à telecaricà torna FileZilla. S'è u prublemu rivene, mandate puru un " -"'bug report'." +"Ci vole à telecaricà FileZilla torna. S'è stu penseru ùn smarisce micca, ci " +"vole à mandà un raportu di penseru." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:666 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -186,13 +181,13 @@ "- Make sure %s is in a directory listed in your PATH environment variable.\n" "- Set the full path to %s in the FZ_FZSFTP environment variable." msgstr "" -"%s ùn si trova micca. Senza stu cumpunentu di FileZilla, SFTP ùn pò micca " -"funziunà.\n" +"%s ùn pò micca esse trovu. Senza stu cumpunentu di FileZilla, SFTP ùn " +"funziunerà micca.\n" "\n" -"Suluzioni :\n" -"- Assicuravi chì %s sia in un cartulare indicatu in a vostra variabile " -"d'ambiente PATH (passeghju).\n" -"- Scrivite u passeghju sanu di %s in a variabile d'ambiente FZ_FZSFTP." +"Soluzioni pussibule :\n" +"- Assicuratevvi chì %s sia in un cartulare di a lista di a vostra variabile " +"d'ambiente PATH.\n" +"- Definisce u passeghju cumpletu di %s in a variabile d'ambiente FZ_FZSFTP." #: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format @@ -208,7 +203,7 @@ msgid "%w - Proxy password" msgstr "%w - Parolla d'intrata di u proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3640 msgid "&Abort previous connection and connect in current tab" msgstr "" "&Abandunnà a cunnessione precedente è cunnettassi in l'unghjetta currente" @@ -217,20 +212,20 @@ msgid "&About..." msgstr "&Apprupositu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2499 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "&Contu :" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:478 msgid "&Active" msgstr "&Attivu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:206 msgid "&Add bookmark..." -msgstr "&Aghjunghje indetta..." +msgstr "&Aghjunghje l'indetta..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:245 #: ../../locales/../src/interface/resources/xrc/menus.xrc:291 @@ -241,28 +236,28 @@ msgid "&Add key file..." msgstr "&Aghjunghje un schedariu di chjave..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:496 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:559 msgid "&Add to queue" msgstr "&Aghjunghje à a lista d'attesa" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:407 msgid "&Adjust server timezone offset:" msgstr "&Regulà u fusu orariu di u servu :" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." -msgstr "Sempre fà fid&anza à stu certificatu in l'altre sessioni." +msgstr "Sempre fà cunfidenz&a à stu certificatu in l'altre sessioni." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 msgid "&Always trust this host, add this key to the cache" -msgstr "Sempre fà fid&anza à st'ospite, aghjunghje sta chjave à u cache" +msgstr "Sempre fà cunfidenz&a à st'ospite, aghjunghje sta chjave à u cache" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 msgid "&Always use default editor" msgstr "&Aduprate sempre l'editore predefinitu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 msgid "&Always use selection for unassociated files" msgstr "&Aduprate sempre una selezzione per i schedarii micca assuciati" @@ -272,20 +267,24 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:341 msgid "&Ask your operating system for the external IP address" -msgstr "Dum&anda l'indirizzu IP esternu à u vostru sistemu" +msgstr "Dum&anda l'indirizzu IP esternu à u vostru sistema" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" -msgstr "&Automaticu" +msgstr "&Autumaticu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 msgid "&Autodetect" -msgstr "Rilevazione &Automatica" +msgstr "Rilevazione &Autumatica" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:275 +msgid "&Background color:" +msgstr "Culore di l'arci pianu :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Binariu" @@ -293,21 +292,21 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "" -"Prefissi &binarii cù i simbuli di u Sistemu Internaziunale (SI). (p.i. 1 Ko " -"= 1024 ottetti)" +"Prefissi &binarii impieghendu i simbuli di u Sistema Internaziunale (SI). (p." +"i. 1 Ko = 1024 ottetti)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:204 msgid "&Bookmarks" msgstr "&Indette" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2963 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 #: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:367 msgid "&Browse..." msgstr "&Sfuglià..." @@ -317,8 +316,8 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3826 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -332,11 +331,11 @@ msgid "&Close" msgstr "&Chjode" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "&Chjode FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:642 msgid "&Configure speed limits..." msgstr "&Cunfigurà i limiti di velocità per i trasferimenti..." @@ -344,7 +343,7 @@ msgid "&Configure..." msgstr "&Cunfigurà..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:619 msgid "&Connect" msgstr "&Cunnettà" @@ -353,22 +352,22 @@ msgstr "&Cupià a cunnessione attuale ver di u Ghjestiunariu di Siti..." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" -msgstr "&Cupià ver di u clipboard" +msgstr "&Cupià ver di u preme'papei" #: ../../locales/../src/interface/resources/xrc/menus.xrc:264 #: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "&Create directory" msgstr "&Creà unu cartulare" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Create new tab" msgstr "&Creà una nova unghjetta" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "&Spannà" @@ -381,9 +380,9 @@ msgstr "&Editore predefinitu :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." -msgstr "&Azzione predefinita à fà nantu à i schedarii chì esistenu..." +msgstr "&Azzione predefinita à fà nant'à i schedarii chì esistenu..." #: ../../locales/../src/interface/resources/xrc/settings.xrc:155 msgid "&Delay between failed login attempts:" @@ -391,14 +390,14 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2848 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Squassà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 msgid "&Delete symlink" msgstr "&Squassà a leia simbolica (symlink)" @@ -406,20 +405,20 @@ msgid "&Directory comparison" msgstr "&Paragone di cartulare" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:913 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Disattivà u sfugliendu sincrunizatu è cuntinuà à cambià u cartulare lucale" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:985 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Disattivà u sfugliendu sincrunizatu è cuntinuà à cambià u cartulare " "alluntanatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1821 msgid "&Discard local file then download and edit file anew" msgstr "Scaccià u schedariu lucale è &dopu telecaricallu è mudificallu" @@ -427,10 +426,6 @@ msgid "&Disconnect" msgstr "&Disghjunghje" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Disghjunghje da u servu" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "" @@ -441,7 +436,7 @@ msgid "&Display size in bytes" msgstr "&Affissà a dimensione in ottetti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3809 msgid "&Do not remember passwords (recommended)" msgstr "&Ùn micca arricurdassi di e parolle d'intrata (ricumandatu)" @@ -455,22 +450,22 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "&Double-click action on files:" -msgstr "Azzione di u &dopiu-cliccu nantu à i schedarii :" +msgstr "Azzione di u &dopiu-cliccu nant'à i schedarii :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "&Download" msgstr "&Telecaricà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3160 msgid "&Download to:" msgstr "&Telecaricà ver di :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:608 msgid "&Download..." msgstr "&Telecaricà..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1398 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Telecaricamenti :" @@ -486,8 +481,8 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 msgid "&Enable" msgstr "P&ermette" @@ -495,12 +490,12 @@ msgid "&Enable compression" msgstr "&Attivà a cumpressione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3698 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "P&ermette i limiti di velocità per i trasferimenti" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:565 msgid "&Encoding:" msgstr "&Cudificazione :" @@ -508,11 +503,11 @@ msgid "&Encryption:" msgstr "&Cifratura :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "Scrivite una cummanda p&ersunalizata..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3633 msgid "&Establish connection in a new tab" msgstr "Stabilisc&e a cunnessione in una nova unghjetta" @@ -520,12 +515,12 @@ msgid "&Execute" msgstr "&Eseguisce" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1572 msgid "&Export Site Manager entries" msgstr "&Espurtà l'elementi di u Ghjestiunariu di Siti" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "&Export..." msgstr "&Espurtà..." @@ -537,15 +532,15 @@ msgid "&File" msgstr "&Schedariu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:527 msgid "&File Attributes..." msgstr "&Pruprietà di u schedariu..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "&Diritti d'impiegu di u schedariu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 msgid "&File:" msgstr "&Schedariu :" @@ -557,15 +552,28 @@ msgid "&Filter sets:" msgstr "Gruppi di &filtri :" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1647 +#, fuzzy +msgid "&Filters" +msgstr "&Filtri :" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Filtri :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 msgid "&Finish editing and delete local file" msgstr "&Finisce a mudificazione è scaccià u schedariu lucale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3291 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"Passeghji lucali micca strutturati, incaricà tutti i schedarii cuntenuti " +"dentru, ver di u cartulare di destinazione" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -573,7 +581,7 @@ "Passeghji alluntanati micca strutturati, telecarica tutti i schedarii " "cuntenuti dentru, ver di u cartulare di destinazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "&Follow symlink, delete target directory contents" msgstr "" "&Seguitate a leia simbolica (symlink), squassà i cuntenuti di i cartulari di " @@ -587,7 +595,7 @@ msgid "&Getting help..." msgstr "&Ottene un aiutu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2612 msgid "&Global bookmark" msgstr "Indetta &glubale" @@ -600,19 +608,19 @@ msgstr "Aiut&u" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "&Hide identical files" msgstr "&Piattà i schedarii uguali" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" -msgstr "&U più maiò" +msgstr "&U più altu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:305 msgid "&Highest available port:" -msgstr "&Portu u più maiò dispunibule :" +msgstr "&Portu u più altu dispunibule :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2407 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 msgid "&Host:" @@ -632,16 +640,20 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Inherit system's filetype associations" -msgstr "&Impiegà l'associ da tipu di schedariu di u sistemu" +msgstr "&Impiegà l'associ da tipu di schedariu di u sistema" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Installà a nova versione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3284 +msgid "&Keep local path structure relative to search root" +msgstr "&Mentene a struttura di u passeghju lucale di l'urigine di a ricerca" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 msgid "&Keep remote path structure relative to search root" msgstr "" -"Mentene a struttura di u passeghju alluntanatu di l'urigine di a ricerca" +"&Mentene a struttura di u passeghju alluntanatu di l'urigine di a ricerca" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 msgid "&Key file:" @@ -655,7 +667,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Limità i porti lucali aduprati da FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:494 msgid "&Limit number of simultaneous connections" msgstr "&Limità u numeru di cunnessioni simultanei" @@ -663,11 +675,15 @@ msgid "&Local directory tree" msgstr "Arburiscenza di u cartulare &lucale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 msgid "&Local directory:" msgstr "Cartulare &lucale :" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +msgid "&Local search" +msgstr "Ricerca &lucale" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "&Log to file" msgstr "Arregistrà u ghjurnale &Log in un schedariu" @@ -676,11 +692,11 @@ msgid "&Logon Type:" msgstr "Tipu d'accessu (&Logon) :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 msgid "&Logontype:" msgstr "Tipu d'accessu (&Logon) :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "&Bassu" @@ -692,7 +708,7 @@ msgid "&Manual transfer..." msgstr "Trasferimentu &manuale..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:504 msgid "&Maximum number of connections:" msgstr "&Numeru massimu di cunnessioni :" @@ -706,13 +722,13 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 msgid "&Minimize to tray" -msgstr "Impuculì in lu spaziu di nutificazione di u sistemu" +msgstr "Impuculì in lu spaziu di nutificazione di u sistema" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 msgid "&Name sorting mode:" msgstr "Nome di u modu di classificazione :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2639 msgid "&Name:" msgstr "&Nome :" @@ -728,7 +744,7 @@ msgid "&New Site" msgstr "&Novu Situ" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1657 msgid "&New version available!" msgstr "&Nova versione dispunibule !" @@ -736,17 +752,18 @@ msgid "&Next >" msgstr "&Seguente >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1896 msgid "&No" -msgstr "&No" +msgstr "I&nnò" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 #: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&Alcunu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&Nurmale" @@ -755,17 +772,17 @@ msgstr "&Valore numericu :" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2897 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:627 msgid "&OK" -msgstr "&OK" +msgstr "&Vai" #: ../../locales/../src/interface/resources/xrc/settings.xrc:473 msgid "&OPEN" msgstr "&APRE" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "&Open" msgstr "&Apre" @@ -773,7 +790,7 @@ msgid "&Overwrite" msgstr "&Rimpiazzà" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:485 msgid "&Passive" msgstr "&Passivu" @@ -781,11 +798,11 @@ msgid "&Password:" msgstr "&Parolla d'intrata :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "&Sunà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2420 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 msgid "&Port:" @@ -795,7 +812,7 @@ msgid "&Preserve timestamps of transferred files" msgstr "&Preservà a data è l'ora di i schedarii trasferiti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1641 msgid "&Queue" msgstr "&Lista d'attesa" @@ -807,7 +824,7 @@ msgid "&Quickconnect bar" msgstr "Barra di &Cunnessione Pronta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1505 msgid "&Quickconnect history" msgstr "&Storia di Cunnessione Pronta" @@ -819,12 +836,12 @@ msgid "&Reconnect" msgstr "&Ricunnessione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1512 msgid "&Reconnect information" msgstr "&Infurmazione per &ricunnettassi" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:633 msgid "&Refresh" msgstr "&Attualizà" @@ -832,19 +849,23 @@ msgid "&Remember password until FileZilla is closed" msgstr "A&rricurdassi di a parolla d'intrata fin'à FileZilla sia chjosu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3803 msgid "&Remember passwords" msgstr "&Arricurdassi di e parolle d'intrata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2693 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2780 msgid "&Remote directory:" msgstr "&Cartulare di reta in là :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "&Remote path:" msgstr "&Passeghju di reta in là :" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +msgid "&Remote search" +msgstr "Ricerca &alluntanata" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Caccià" @@ -853,16 +874,16 @@ msgid "&Remove key" msgstr "&Caccià a chjave" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "&Caccià selezziunati" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Rinumà" @@ -871,7 +892,7 @@ msgid "&Rename..." msgstr "&Rinumà..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1814 msgid "&Reopen local file" msgstr "&Apre u schedariu lucale torna" @@ -881,21 +902,25 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:229 msgid "&Report a bug..." -msgstr "&Riferisce un prublemu..." +msgstr "&Riferisce un penseru..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "&Richiede primura" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 msgid "&Reset and requeue all" msgstr "&Riavvià è rimette tutti i schedarii in a lista d'attesa" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" -msgstr "&Rilancià l'assistente Stregone" +msgstr "&Riavvià l'assistente Stregone" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 msgid "&Resume" msgstr "&Cuntinuà" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "&Eseguisce a cummanda..." @@ -917,9 +942,9 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 msgid "&Save as..." -msgstr "&Salvà cu u nome..." +msgstr "&Arregistrà cù u nome..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "&Search" msgstr "&Ricerca" @@ -935,16 +960,16 @@ msgid "&Select language:" msgstr "&Sceglie a lingua :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2148 msgid "&Select the columns that should be displayed:" msgstr "&Selezziunà e culonne chì ci vole à affissà :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2335 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "Ser&vu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Settings" msgstr "&Preferenze" @@ -956,19 +981,15 @@ msgid "&Show debug menu" msgstr "&Affissà u 'Menu' per spannà" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 msgid "&Show detailed log" -msgstr "&Affissà u ghjurnale cù ditaglii" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Affissà u messaghju" +msgstr "&Affissà u ghjurnale cù detaglii" #: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 msgid "&Show timestamps in message log" msgstr "&Affissà date è ore in u ghjurnale di i messaghji" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1518 msgid "&Site Manager entries" msgstr "&Entrate di u Ghjestiunariu di Siti" @@ -976,7 +997,7 @@ msgid "&Site Manager..." msgstr "&Ghjestiunariu di Siti..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "&Site-specific bookmark" msgstr "&Indetta particulare per stu situ" @@ -988,7 +1009,8 @@ msgid "&Speed limits" msgstr "Limiti di &velocità" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 msgid "&Start transfer immediately" msgstr "Principià u trasferimentu avà" @@ -996,11 +1018,11 @@ msgid "&Swap local and remote panes" msgstr "&Permutà i finestrini lucale è alluntanatu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "&TLS Ciphers" msgstr "Cudificazione &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Prova" @@ -1012,11 +1034,11 @@ msgid "&Transfer" msgstr "&Trasferimentu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 msgid "&Transfer mode:" msgstr "&Modu di trasferimentu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1524 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "Lista d'attesa di &trasferimentu" @@ -1027,7 +1049,7 @@ "&Trattà i schedarii chì anu un nome chì principia cù unu puntu cum'è " "schedarii ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "&Unedit" msgstr "&Cancellà i cambiamenti" @@ -1036,26 +1058,34 @@ msgstr "&Mudificà a chjave piattata per st'ospite" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 msgid "&Upload" msgstr "&Incaricà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3261 +msgid "&Upload to:" +msgstr "&Incaricà ver di :" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +msgid "&Upload..." +msgstr "&Incaricà..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1421 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Incaricamenti :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 msgid "&Use custom program" msgstr "&Impiegà un prugrammu persunalizatu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:388 msgid "&Use synchronized browsing" msgstr "Impiegà &u sfugliendu sincrunizatu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Use system's default editor for text files" -msgstr "&Impiegà l'editore predefinitu di u sistemu per i schedarii di testu" +msgstr "&Impiegà l'editore predefinitu di u sistema per i schedarii di testu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:347 msgid "&Use the following IP address:" @@ -1070,16 +1100,16 @@ msgstr "&Impiegà u separadore di mille" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2474 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Utilizatore :" #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 msgid "&Username:" -msgstr "&Nome d'utilizatore :" +msgstr "Nome d'&utilizatore :" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1651 #, c-format msgid "&Version %s" msgstr "&Versione %s" @@ -1089,7 +1119,7 @@ msgstr "&Affissu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:614 msgid "&View/Edit" msgstr "&Affissu / Mudificà" @@ -1106,8 +1136,8 @@ msgid "&Write" msgstr "&Scrive" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1767 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "&Yes" msgstr "&Iè" @@ -1125,10 +1155,10 @@ msgstr "'%s' ùn hè micca un cartulare." #: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:974 msgid "'Account' logontype not supported by selected protocol" msgstr "" -"U tipu d'accessu 'Contu' ùn hè micca suppurtatu da u protocollu selezziunatu" +"U tipu d'accessu 'Contu' ùn hè micca accettatu da u protocollu selezziunatu" #: ../../locales/../src/interface/manual_transfer.cpp:441 msgid "" @@ -1138,33 +1168,33 @@ "I tipi d'accessu 'Contu' è 'Nurmale' ùn sò micca dispunibule, dunque " "s'impiega piuttostu 'Dumanda a parolla d'intrata'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:989 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" -"I tipi d'accessu 'Contu' è 'Nurmale' ùn sò micca dispunibule. L'elementu hè " -"statu cambiatu cù 'Dumanda a parolla d'intrata'." +"I tipi d'accessu 'Nurmale' è 'Contu' ùn sò micca dispunibule. A vostra " +"entrata hè stata cambiata da 'Dumandà a parolla d'intrata'." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:587 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " "command without the leading 'quote'." msgstr "" "Pare chì 'quote' hè una cummanda lucale aduprata da i clienti/cunsole per " -"trasmette à u servu i parametri chì seguitanu 'quote'. Pudete pruvà di mandà " -"sta cummanda senza falla precedere da 'quote'." +"trasmette à u servu i parametri chì seguitanu 'quote'. Pudete pruvà di " +"scrive sta cummanda senza falla precede da 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d oghjettu filtratu)" msgstr[1] "(%d oghjetti filtrati)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:308 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% telacaricatu)" @@ -1204,8 +1234,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(esempiu : %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3717 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3734 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1216,7 +1246,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:208 msgid "--:--:-- left" msgstr "--:--:-- à a fine" @@ -1272,21 +1302,29 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:107 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." -msgstr "Un indetta cù stu nome esiste dighjà. Ci vole à sceglie un altru nome." +msgstr "" +"Un'indetta cù u litessu nome esiste dighjà. Ci vole à scrive un nome mancu " +"impiegatu." + +#: ../../locales/../src/engine/tlssocket.cpp:1318 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Un certificatu in a catena hè statu firmatu aduprendu una cudificazione " +"micca sicura" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Ci vole à sceglie un editore predefinitu." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:160 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:758 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "" -"Un cartulare ùn pò micca esse tracinatu in unu di i so sottu-cartulari." +"Un cartulare ùn pò micca esse tracinatu ver di unu di i so sottu-cartulari." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" @@ -1294,26 +1332,26 @@ "you would have to use active mode. In active mode, FileZilla opens a port " "and asks the server to connect to it." msgstr "" -"Qualchì servu ùn permette micca u modu passivu, o hè mal cunfiguratu. In stu " -"casu, ci vole à impiegà u modu attivu. In u modu attivu, FileZilla apre un " -"portu è dumanda à u servu di ci cunnettassi." +"Qualchì servu ùn permette micca u modu passivu, osinnò hè mal cunfiguratu. " +"In tale casu, ci vole à impiegà u modu attivu. In u modu attivu, FileZilla " +"apre un portu è dumanda à u servu di ci cunnettassi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 msgid "A file previously opened has been changed." msgstr "Un schedariu dighjà apertu hè statu cambiatu." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1650 msgid "A file with that name is already being transferred." msgstr "Un schedariu cù stu nome hè statu dighjà trasferitu." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" -"Un schedariu cù stu nome hè statu dighjà mudificatu. Ci vole à chjodellu è " -"pruvà torna." +"Un schedariu cù stu nome hè dighjà in corsu di mudificazione. Ci vole à " +"chjodellu è pruvà torna." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:560 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1321,17 +1359,17 @@ "Unless you fix this problem, files might be missing in the file listings.\n" "No further warning will be displayed this session." msgstr "" -"Ùn hè micca pussibule di decudificà un nome di schedariu lucale.\n" -"Assicuratevvi chì a variabile d'ambiente LC_CTYPE (o LC_ALL) sia ben " -"cunfigurata.\n" -"Osinnò qualchì schedariu puderia mancà nantu à a lista di i schedarii.\n" -"Ghjè u solu messaghju d'avertimentu chì serà mandatu mentre sta sessione." +"Un schedariu lucale ùn pò micca esse decudificatu.\n" +"Assicuratevvi chì a variabile d'ambiente LC_CTYPE (o LC_ALL) sia cunfigurata " +"bè.\n" +"Osinnò qualchì schedariu puderia mancà nant'à a lista di i schedarii.\n" +"Ghjè u solu messaghju d'avertimentu chì serà mandatu durante sta sessione." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Una nova versione di FileZilla hè dispunibule :" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:649 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1346,20 +1384,20 @@ "you need this." msgstr "" "Un servu ben cunfiguratu ùn hà bisognu di quessu. Ci vole à chjamà " -"l'amministratore di u servu per verificà quessu." +"l'amministratore di u servu per impiegà quessu." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:251 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" -"Un operazione alluntanata hè in corsu è u sfugliendu sincrunizatu hè " +"Un'operazione alluntanata hè in corsu è u sfugliendu sincrunizatu hè " "attivu.\n" "Vulete disattivà u sfugliendu sincrunizatu è cuntinuà u cambiamentu di u " "cartulare lucale ?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1384,11 +1422,11 @@ msgid "A&pply to all files and directories" msgstr "Affetta tutti i schedarii è i cartulari" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 msgid "A&utomatically remove successful transfers" -msgstr "Cavà a&utomaticamente i trasferimenti riesciuti" +msgstr "Cavà a&utumaticamente i trasferimenti riesciuti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2551 msgid "ASCII" msgstr "ASCII" @@ -1400,27 +1438,27 @@ msgid "Above the file lists" msgstr "Sopra e liste di schedarii" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 +#: ../../locales/../src/engine/server.cpp:886 +#: ../../locales/../src/engine/server.cpp:907 #: ../../locales/../src/interface/manual_transfer.cpp:154 #: ../../locales/../src/interface/manual_transfer.cpp:155 #: ../../locales/../src/interface/manual_transfer.cpp:188 #: ../../locales/../src/interface/manual_transfer.cpp:540 #: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1322 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1323 msgid "Account" msgstr "Contu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "Azzione à fà quandu a lista d'attesa hè viota" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1929 msgid "Action on selected file:" -msgstr "Azzione à fà nantu à u schedariu selezziunatu :" +msgstr "Azzione à fà nant'à u schedariu selezziunatu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 msgid "Action to perform:" msgstr "Azzione à eseguisce :" @@ -1432,7 +1470,7 @@ msgid "Active mode" msgstr "Modu attivu" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1440,7 +1478,7 @@ "A prova di u modu attivu FTP hè fiasca. FileZilla ùn cunnosce micca " "l'indirizzu IP esternu currettu." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1449,26 +1487,27 @@ "l'indirizzu IP esternu currettu. Di più, u vostru 'router' hà mudificatu " "l'indirizzu mandatu." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " "address." msgstr "" "A prova di u modu attivu FTP hè fiasca. FileZilla cunnosce l'indirizzu IP " -"esternu ma u vostru 'router' o parafocu hà mudificatu l'indirizzu mandatu di " -"una manera gattiva." +"esternu, ma u vostru 'router' o parafocu hà mudificatu l'indirizzu mandatu " +"di una manera gattiva." #: ../../locales/../src/interface/resources/xrc/settings.xrc:398 msgid "Active mode IP" msgstr "IP in modu attivu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3309 msgid "Add files to &queue only" msgstr "Aghjunghje i schedarii solu à a lista d'attesa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "Add selected directory to the transfer queue" msgstr "" "Aghjunghje u cartulare selezziunatu à a lista d'attesa di trasferimentu" @@ -1485,11 +1524,11 @@ msgid "Add to queue" msgstr "Aghjunghje à a lista d'attesa" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:496 msgid "Address type not supported" -msgstr "Tipu d'indirizzu micca suppurtatu" +msgstr "Tipu d'indirizzu micca accettatu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:313 msgid "Advanced" msgstr "Espertu" @@ -1502,20 +1541,20 @@ "builds at your own risk." msgstr "" "Avertimentu : Fora s'è voi vulete pruvà e nove funzioni, ghjè più sicuru " -"d'installà solu e versioni stabule. E versioni beta è quelle create di notte " -"sò versioni di sviluppu fatte solu per pruvà. Ste versioni ponu ùn micca " -"funziunà cum'è previstu, è dannighjà u vostru sistemu dinù. L'impiegu di ste " -"versioni di FileZilla si face à u vostru risicu." +"d'impiegà solu e versioni stabule. E versioni beta è quelle create di notte " +"sò versioni di sviluppu fatte solu per pruvà. E versioni create di notte " +"ponu ùn micca funziunà cum'è previstu, è dannighjà u vostru sistema dinù. " +"L'impiegu di ste versioni si face à u vostru risicu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3650 msgid "Al&ways perform this action" msgstr "Eseguisce sempre st'azzione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2008 msgid "Algorithm:" msgstr "Cudificazione :" -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2485 msgid "All files have been successfully transferred" msgstr "Tutti i schedarii anu statu trasferiti bè" @@ -1524,7 +1563,7 @@ msgstr "" "Tutti i porti di a stesa specificata devenu esse scelti trà 1024 è 65535." -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2481 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1541,7 +1580,7 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Permette u ritornu à un altru modu di trasferimentu in casu di fiascu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "Already connected" msgstr "Dighjà cunnettu" @@ -1564,38 +1603,44 @@ "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." msgstr "" -"Si pò dinù impiegà l'agente SSH di u vostru sistemu. Per quessu, ci vole à " +"Si pò dinù impiegà l'agente SSH di u vostru sistema. Per quessu, ci vole à " "definisce a variabile d'ambiente SSH_AUTH_SOCK." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:134 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "" -"Un altra manera hè di telecaricà l'ultima versione di FileZilla da u situ " -"Web :" +"Un altra pussibilità hè di telecaricà l'ultima versione di FileZilla da u " +"situ Web :" -#: ../../locales/../src/interface/QueueView.cpp:1908 +#: ../../locales/../src/interface/QueueView.cpp:1542 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" "Some queue items might not have been restored." msgstr "" -"Un errore s'hè affacatu mentre u caricamentu di a lista d'attesa di " +"Un sbagliu s'hè affacatu durante u caricamentu di a lista d'attesa di " "trasferimentu à partesi di \"%s\".\n" "Qualchì elementu di sta lista pò ùn esse micca risturatu." -#: ../../locales/../src/interface/QueueView.cpp:1818 +#: ../../locales/../src/interface/QueueView.cpp:1440 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" "Some queue items might not have been saved." msgstr "" -"Un errore s'hè affacatu mentre l'arregistramentu di a lista d'attesa di " -"trasferimentu à partesi di \"%s\".\n" -"Qualchì elementu di sta lista pò ùn esse micca salvatu." +"Un sbagliu s'hè affacatu durante l'arregistramentu di a lista d'attesa di " +"trasferimentu ver di \"%s\".\n" +"Qualchì elementu di sta lista pò ùn esse micca arregistratu." + +#: ../../locales/../src/engine/tlssocket.cpp:1321 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" +"Un emettidore in a catena di certificatu ùn hè micca un auturità di " +"certificatu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2066 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1603,34 +1648,34 @@ "Un elementu cù u listessu nome chì quellu di l'elementu trascinatu esiste " "dighjà in u cartulare di destinazione." -#: ../../locales/../src/engine/server.cpp:885 +#: ../../locales/../src/engine/server.cpp:909 #: ../../locales/../src/interface/manual_transfer.cpp:153 #: ../../locales/../src/interface/manual_transfer.cpp:191 #: ../../locales/../src/interface/manual_transfer.cpp:207 #: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1609 msgid "Anonymous" msgstr "Anonimu" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:962 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Un altra operazione alluntanata hè in corsu, impussibule di cambià u " "cartulare avà." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:803 msgid "Any changes made in the Site Manager could not be saved." msgstr "" "I cambiamenti fatti in u Ghjestiunariu di Siti puderianu ùn micca esse " "arregistrati." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:955 msgid "Any changes made to the filters could not be saved." msgstr "I cambiamenti fatti à i filtri puderianu ùn micca esse arregistrati." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:863 msgid "Any changes made to the filters will not be saved." msgstr "I cambiamenti fatti à i filtri ùn seranu micca arregistrati." @@ -1654,7 +1699,7 @@ msgid "Archive" msgstr "Archiviu" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Argument buffer overflow" msgstr "Trapienu di memoria di l'argumentu" @@ -1662,37 +1707,37 @@ msgid "As tab in the transfer queue pane" msgstr "Cum'è un unghjetta in a finestra di a lista d'attesa di trasferimentu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Dumandà l'azzione" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/engine/server.cpp:880 +#: ../../locales/../src/engine/server.cpp:901 #: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Dumandà a parolla d'intrata" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." -msgstr "Dumandà un portu à u sistemu." +msgstr "Dumandà un portu à u sistema." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" -msgstr "Dumandà l'indirizzu IP esternu à u vostru sistemu" +msgstr "Dumandà l'indirizzu IP esternu à u vostru sistema" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 msgid "Asking questions in the FileZilla forums" -msgstr "Fate e vostre dumande nantu à i forum FileZilla" +msgstr "Fate e vostre dumande nant'à i forum FileZilla" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 msgid "Associated program not found:" msgstr "Prugrammu assuciatu micca trovu :" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:698 msgid "At least one filter condition is incomplete" msgstr "Almenu, una cundizione di filtru ùn hè micca cumpleta" @@ -1704,7 +1749,7 @@ msgid "Attribute" msgstr "Attributu" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:596 msgid "Authentication failed." msgstr "Autenticazione fiasca." @@ -1712,32 +1757,32 @@ msgid "Author:" msgstr "Autore :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2529 msgid "Auto" -msgstr "Automaticu" +msgstr "Autumaticu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 msgid "Automatic file type classification" -msgstr "Classificazione automatica da tipu di schedariu" +msgstr "Classificazione autumatica da tipu di schedariu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 msgid "Available sizes" msgstr "Dimensione dispunibule" -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:155 +#: ../../locales/../src/engine/sizeformatting_base.cpp:214 msgid "B " msgstr "O " -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:339 msgid "B&ypass proxy" msgstr "Sfrancassi da u prox&y" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Bad file descriptor" msgstr "Discrittore gattive di u schedariu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 msgid "Basic usage instructions" msgstr "Instruzzioni d'utilizazione di basa" @@ -1745,16 +1790,16 @@ msgid "Behaviour" msgstr "Andamentu" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1120 +#: ../../locales/../src/interface/edithandler.cpp:1148 msgid "Being edited" msgstr "In corsu di mudificazione" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket.cpp:1312 msgid "Beware! Certificate has been revoked" msgstr "Fate casu ! U certificatu hè statu revocatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2556 msgid "Binary" msgstr "Binariu" @@ -1762,17 +1807,21 @@ msgid "Blackboard" msgstr "Tavula nera" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "Turchinu" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:259 +#: ../../locales/../src/interface/menu_bar.cpp:291 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:381 msgid "Bookmark" msgstr "Indetta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2819 msgid "Bookmark:" msgstr "Indetta :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2808 msgid "Bookmarks" msgstr "Indette" @@ -1788,7 +1837,7 @@ msgid "Build information" msgstr "Infurmazione di custruzzione" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Categuria di faccenda :" @@ -1800,20 +1849,25 @@ msgstr "" "Di una manera generale, tuttu portu dispunibule hè impiegatu per stabilisce " "trasferimenti in modu attivu. S'è voi vulete forzà FileZilla à impiegà solu " -"qualchì portu, indicate a stesa di sti porti sottu." +"qualchì portu, indicate a stesa di sti porti quì sottu." #: ../../locales/../src/interface/resources/xrc/menus.xrc:176 msgid "C&ancel current operation" msgstr "&Abbandunà l'operazione currente" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "Squassà tuttu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "C&opy URL(s) to clipboard" -msgstr "Cupià URL(s) nantu à u clipb&oard" +msgstr "Cupià l'URL(s) ver di u &preme'papei" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:523 +msgid "C&opy URL(s) with password to clipboard" +msgstr "Cupià l'URL(s) cù a parolla d'intrata ver di u &preme'papei" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "C&ustom" @@ -1827,47 +1881,48 @@ msgid "CPU features:" msgstr "Funzioni CPU :" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1575 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1128 msgid "Calculating timezone offset of server..." msgstr "Calculu di a sfarenza di u fusu orariu di u servu..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/transfersocket.cpp:666 msgid "Can't read from file" msgstr "Ùn pò leghje u schedariu" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:646 +#: ../../locales/../src/engine/transfersocket.cpp:714 msgid "Can't write data to file." -msgstr "Ùn pò scrive nantu à u schedariu." +msgstr "Ùn pò scrive nant'à u schedariu." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/transfersocket.cpp:648 +#: ../../locales/../src/engine/transfersocket.cpp:716 #, c-format msgid "Can't write data to file: %s" -msgstr "Ùn pò scrive nantu à u schedariu : %s" +msgstr "Ùn pò scrive nant'à u schedariu : %s" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1473 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1667 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2735 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2993 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3231 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3326 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3396 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3668 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3888 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:634 msgid "Cancel" msgstr "Abbandunà" @@ -1886,20 +1941,20 @@ "Ùn hè micca pussibule d'accede à '%s', alcunu media framettu o lettore micca " "prontu." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Cannot add server to Site Manager" msgstr "Ùn hè micca pussibule d'aghjughje u servu à u Ghjestiunariu di Siti" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1093 msgid "Cannot assign requested address" -msgstr "Ùn pò micca impiegà l'indirizzu riquiestu" +msgstr "Ùn pò micca impiegà l'indirizzu richiestu" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" msgstr "" -"Ùn hè micca pussibule di chjode l'unghjetta quandu ella hè impiegata.\n" +"Ùn hè micca pussibule di chjode l'unghjetta quand'ella hè impiegata.\n" "Vulete abbandunà l'azzione in corsu è chjode l'unghjetta quantunque ?" #: ../../locales/../src/interface/listingcomparison.cpp:71 @@ -1914,28 +1969,28 @@ msgid "Cannot create new filter" msgstr "Ùn pò micca creà un novu filtru" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1580 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/LocalListView.cpp:1737 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Cannot edit file" msgstr "Ùn pò micca mudificà u schedariu" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1618 msgid "Cannot edit file, not connected to any server." msgstr "Ùn pò micca mudificà u schedariu, chì ùn hè micca cunnettu à un servu." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1627 msgid "Cannot edit file, remote path unknown." msgstr "Ùn pò micca mudificà u schedariu, passeghju alluntanatu scunnisciutu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "" -"Ùn hè micca pussibule di stabilisce una cunnessione FTP à un servu SFTP. " -"Selezziunate u protocollu appostu." +"Ùn hè micca pussibule di stabilisce una cunnessione FTP à un servu SFTP. Ci " +"vole à selezziunà u protocollu appostu." #: ../../locales/../src/interface/quickconnectbar.cpp:36 #: ../../locales/../src/interface/quickconnectbar.cpp:54 @@ -1948,7 +2003,7 @@ msgid "Cannot load key file" msgstr "Ùn pò micca caricà u schedariu di chjave" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:996 msgid "Cannot load toolbar from resource file" msgstr "" "Ùn hè micca pussibule di caricà a barra d'attrezzi da u schedariu di risorse" @@ -1957,41 +2012,41 @@ msgid "Cannot remember password" msgstr "Ùn hè micca pussibule d'arricurdassi di a parolla d'intrata" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:683 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1210 msgid "Cannot rename entry" msgstr "Ùn pò micca rinumà l'elementu" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1599 msgid "Cannot rename file" msgstr "Ùn pò micca rinumà u schedariu" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:136 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Impussibule di risolve u nome di l'ospite in un indirizzu IPv4 per impiegà " "cù un proxy SOCKS4." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "Cannot save filterset" msgstr "Ùn pò micca arregistrà u gruppu di filtri" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Cannot select filter" msgstr "Ùn pò micca selezziunà u filtru" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1478 +#: ../../locales/../src/interface/edithandler.cpp:1482 +#: ../../locales/../src/interface/edithandler.cpp:1517 msgid "Cannot set file association" msgstr "Ùn hè micca pussibule di definisce l'associu di schedariu" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1079 msgid "Cannot show dialog" msgstr "Ùn pò micca fà vede u dialogu" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1650 msgid "Cannot view/edit selected file" msgstr "Ùn pò micca leghje o mudificà u schedariu selezziunatu" @@ -2011,7 +2066,7 @@ msgid "Case sensitive (default)" msgstr "Sfarenzià maiuscule è minuscule (predefinitu)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1498 msgid "Categories to clear" msgstr "Categurie à viutà" @@ -2027,6 +2082,10 @@ msgid "Certificate issuer" msgstr "Emettore di u certificatu" +#: ../../locales/../src/engine/tlssocket.cpp:1315 +msgid "Certificate signature verification failed" +msgstr "Fiascu di a verificazione di a firma di u certificatu" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 msgid "Challenge:" msgstr "Cumpetizione :" @@ -2035,22 +2094,22 @@ msgid "Change file attributes" msgstr "Cambià l'attributi di u schedariu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 msgid "Change the file permissions." msgstr "Cambià i diritti d'accessu à u schedariu." #: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" -"Cambià e preferenze di u ghjurnale di i messaghji richiede u rilanciu di " +"Cambià e preferenze di u ghjurnale di i messaghji richiede u riavviu di " "FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:560 msgid "Character encoding issue" msgstr "Prublema di cudificazione di caratteru" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:527 msgid "Charset" msgstr "Gruppu di caratteri" @@ -2060,7 +2119,7 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 msgid "Check for FileZilla &updates automatically:" -msgstr "Cuntrollà automaticamente e nove &versioni di FileZilla :" +msgstr "Cuntrollà autumaticamente e nove &versioni di FileZilla :" #: ../../locales/../src/interface/resources/xrc/update.xrc:4 msgid "Check for Updates" @@ -2070,59 +2129,59 @@ msgid "Check for newer versions of FileZilla" msgstr "Cuntrollà s'ella ci hè una versione più nova di FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" -msgstr "Fiascu mentre u cuntrollu di e nove versioni di FileZilla" +msgstr "Fiascu durante u cuntrollu di e nove versioni di FileZilla" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:788 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "" -"Verificate l'infurmazione d'identificazione. A parolla d'intrata principia o " +"Verificate l'infurmazioni d'identificazione. A parolla d'intrata principia o " "si compie da unu spaziu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." msgstr "" -"Verificate l'infurmazione d'identificazione. U nome d'utilizatore principia " +"Verificate l'infurmazioni d'identificazione. U nome d'utilizatore principia " "o si compie da unu spaziu." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "Checking for correct external IP address" msgstr "Cuntrollu di l'indirizzu IP esternu chì hè currettu" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:169 msgid "Checking for updates..." msgstr "Circhendu e messe à ghjornu..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:756 #, c-format msgid "Checksum match on file %s\n" msgstr "A somma di cuntrollu currisponde per u schedariu %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:752 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Sfarenza di somma di cuntrollu per u schedariu %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1510 msgid "Choose a key file" msgstr "Sceglie un schedariu di chjave" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1541 msgid "Choose the default local directory" msgstr "Sciglite u cartulare lucale predefinitu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:129 #: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2302 msgid "Choose the local directory" msgstr "Sciglite u cartulare lucale" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:797 msgid "Chunk data improperly terminated" msgstr "Ingutuppu di dati interrottu scurrettamente" @@ -2131,7 +2190,7 @@ msgstr "Cudificazione :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "Cl&ose tab" msgstr "Chjode l'&unghjetta" @@ -2139,46 +2198,46 @@ msgid "Classic" msgstr "Classicu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "Squassà &l'infurmazione d'accunciamentu" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/quickconnectbar.cpp:154 msgid "Clear history" msgstr "Squassà u storicu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1486 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Squassà i dati persunali" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:153 msgid "Clear quickconnect bar" msgstr "Squassà a barra Cunnessione Pronta" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Sciglite Piantà per arregistrà a vostra cunfigurazione." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2074 msgid "Client to server MAC:" msgstr "MAC per a cunnessione cliente à servu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2064 msgid "Client to server cipher:" msgstr "Cudificazione per a cunnessione cliente à servu :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "Close &all other tabs" msgstr "Chjode tutte l'&altre unghjette" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1132 +#: ../../locales/../src/interface/Mainfrm.cpp:1153 msgid "Close FileZilla" msgstr "Chjode FileZilla" @@ -2190,15 +2249,15 @@ msgid "Closes current tab" msgstr "Chjode l'unghjetta currente" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:293 msgid "Co&mments:" msgstr "Cu&mmentarii :" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Pruprietà di a culonna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Column setup" msgstr "Ozzione di a culonna" @@ -2212,40 +2271,40 @@ msgid "Command failed" msgstr "Cummanda fiasca" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:493 msgid "Command not supported" -msgstr "Cummanda micca suppurtata" +msgstr "Cummanda micca accettata" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:223 msgid "Command not supported by this protocol" -msgstr "A cummanda ùn hè micca suppurtata da stu protocollu" +msgstr "A cummanda ùn hè micca accettata da stu protocollu" #: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:338 msgid "Command:" msgstr "Cummanda :" #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" -msgstr "Cummentariu" +msgstr "Cummentu" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Nome cumunu :" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "A cummunicazione hè alterata da un 'router' o un parafocu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 msgid "Compare &modification time" msgstr "Paragunà a data è l'ora di &mudificazione" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 msgid "Compare file&size" msgstr "Paragunà a dimensione di u &schedariu" @@ -2263,7 +2322,7 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 msgid "Compiled on:" -msgstr "Compilatu nantu à :" +msgstr "Compilatu nant'à :" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 msgid "Compiled with:" @@ -2281,8 +2340,8 @@ msgid "Concurrent transfers" msgstr "Trasferimenti simultanei" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3101 msgid "Conditions are c&ase sensitive" msgstr "I &cundizioni facenu a distinzione trà maiuscule è minuscule" @@ -2298,35 +2357,35 @@ msgid "Configure port range" msgstr "Cunfigurà a stesa di i porti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3517 msgid "Configuring FileZilla and your network" msgstr "Cunfigurazione di FileZilla è di a vostra reta" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1192 msgid "Confirm deletion" msgstr "Cunfirmà a squassatura" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1592 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/RemoteListView.cpp:1403 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 +#: ../../locales/../src/interface/search.cpp:1148 msgid "Confirmation needed" msgstr "Cunfirmazione necessaria" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Bravu, a vostra cunfigurazione pare funziunà." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:152 msgid "Connect bypassing proxy settings" msgstr "Cunnettà senza fà casu à e preferenze di u proxy" -#: ../../locales/../src/interface/netconfwizard.cpp:216 -#, fuzzy, c-format +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format msgid "Connect failed: %s" -msgstr "A richiesta à u proxy hè fiasca : %s" +msgstr "Cunnessione fiasca : %s" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" @@ -2340,29 +2399,25 @@ msgid "Connect to specified Site Manager site" msgstr "Cunnettà à u situ specificatu in u Ghjestiunariu di Siti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 -msgid "Connected" -msgstr "Cunnettu" - #: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Cunnessione in corsu" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:242 #, c-format msgid "Connecting to %s" msgstr "Cunnessione in corsu à %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1048 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4196 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Cunnessione in corsu à %s via u proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:955 +#: ../../locales/../src/engine/proxy.cpp:235 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:261 #, c-format msgid "Connecting to %s..." msgstr "Cunnessione in corsu à %s..." @@ -2371,7 +2426,7 @@ msgid "Connection" msgstr "Cunnessione" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Connection aborted" msgstr "Cunnessione interrotta" @@ -2379,102 +2434,101 @@ msgid "Connection attempt failed" msgstr "A prova di cunnessione hè fiasca" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/proxy.cpp:209 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "A prova di cunnessione hè fiasca cù \"%s\", provendu un altru indirizzu." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:924 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "A prova di cunnessione hè fiasca cù \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:182 +#: ../../locales/../src/engine/engineprivate.cpp:692 msgid "Connection attempt interrupted by user" -msgstr "A prova di cunnessione hè statu interrotta da l'utilizatore" +msgstr "A prova di cunnessione hè stata interrotta da l'utilizatore" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Connection attempt timed out" msgstr "A prova di cunnessione hà messu un tempu troppu longu" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Cunnessione chjosa" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 msgid "Connection closed by server" msgstr "Cunnessione chjosa da u servu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:270 msgid "Connection established, initializing TLS..." msgstr "Cunnessione stabilita, lanciu di TLS in corsu..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:295 msgid "Connection established, sending HTTP request" msgstr "Cunnessione stabilita, mandà d'una dumanda HTTP" -#: ../../locales/../src/interface/netconfwizard.cpp:333 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." -msgstr "Cunnessione stabilita, in attesa di u messaghju di benvenuta..." +msgstr "Cunnessione stabilita, in attesa di u messaghju di benvenuta." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 msgid "Connection established, waiting for welcome message..." msgstr "Cunnessione stabilita, in attesa di u messaghju di benvenuta..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Cunnessione persa" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:478 msgid "Connection not allowed by ruleset" msgstr "Cunnessione ricusata per via da e regule" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:487 msgid "Connection refused" msgstr "Cunnessione ricusata" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Connection refused by server" msgstr "Cunnessione ricusata da u servu" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Connection reset by network" msgstr "Cunnessione iniziata torna da a reta" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by peer" -msgstr "Cunnessione iniziata torna da unu paru" +msgstr "Cunnessione iniziata torna da un paru" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:556 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Cunnessione abandunnata dopu à %d seconda d'inattività" msgstr[1] "Cunnessione abandunnata dopu à %d seconde d'inattività" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "A cunnessione hè fiasca, tempu troppu longu." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:666 msgid "Connection to server lost." msgstr "A cunnessione cù u servu hè persa." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:218 msgid "Connection with proxy established, performing handshake..." msgstr "Cunnessione stabilita cù u proxy, in attesa di u toccamanu..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." -msgstr "A cunnessione cù u servu hè statu chjosa anticipatamente." +msgstr "A cunnessione cù u servu hè stata chjosa anticipatamente." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "A cunnessione cù u servu di prova hè fiasca." @@ -2482,47 +2536,59 @@ msgid "Convert key file" msgstr "Convertisce un schedariu di chjave" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:629 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1880 #, c-format msgid "Copy (%d) of %s" msgstr "Cupià (%d) di %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:609 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1860 #, c-format msgid "Copy of %s" msgstr "Cupià di %s" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Cupià l'URLs di l'elementi selezziunati ver di u preme'papei, cù a parolla " +"d'intrata." + #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Copy the URLs of the selected items to clipboard." -msgstr "Cupià l'URLs di l'elementi selezziunati nantu à u clipboard." +msgstr "Cupià l'URLs di l'elementi selezziunati ver di u preme'papei." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Ùn pò micca accettà a cunnessione : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/engine/tlssocket.cpp:1295 +msgid "Could not add certificate to temporary trust list" +msgstr "" +"Ùn pò micca aghjunghje u certificatu à a lista timpuraria di cunfidenza" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:533 msgid "Could not add connection to Site Manager" msgstr "Ùn pò micca aghjunghje a cunnessione à u Ghjestiunariu di Siti" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:772 msgid "Could not complete operation" msgstr "Ùn hè micca pussibule di compie l'operazione" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:184 msgid "Could not connect to server" msgstr "Ùn pò micca cunnettà à u servu" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Could not connect to server: %s" msgstr "Ùn pò micca cunnettà à u servu : %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:693 msgid "Could not convert command to server encoding" msgstr "" "Ùn hè micca pussibule di convertì a cummanda secondu a cudificazione di u " @@ -2533,41 +2599,45 @@ msgid "Could not convert private key" msgstr "Ùn hè micca pussibule di convertì a chjave privata" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2528 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not copy URLs" msgstr "Ùn pò micca cupià l'indirizzi URL" +#: ../../locales/../src/engine/tlssocket.cpp:1277 +msgid "Could not copy certificate" +msgstr "Ùn pò micca cupià u certificatu" + #: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "Ùn pò micca cupià i dati" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/updater.cpp:491 #, c-format msgid "Could not create local file %s\n" msgstr "Ùn pò micca creà u schedariu lucale %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:177 #, c-format msgid "Could not create logging mutex: %s" msgstr "Ùn pò micca creà \"logging mutex\" : %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/RemoteListView.cpp:2194 +#: ../../locales/../src/interface/RemoteTreeView.cpp:865 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " "files into an Explorer window." msgstr "" -"Impussibule di sapè a destinazione di l'operazione di Sguillà & Depone.\n" +"Impussibule di determinà a destinazione di l'operazione Sguillà è Depone.\n" "L'estensione di u shell ùn hè micca installata currettamente o ùn avete " "micca depostu i schedarii in una finestra di l'Espluratore." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4052 msgid "Could not establish connection to server" msgstr "Ùn pò micca stabilisce a cunnessione cù u servu" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:404 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2576,17 +2646,17 @@ msgstr "" "Ùn hè micca pussibule di truvà i schedarii di risorse di FileZilla, dunque " "FileZilla si chjode.\n" -"Pudete affettà u cartulare di dati di FileZilla impiegendu l'ozzione di a " +"Pudete definisce u cartulare di dati di FileZilla impieghendu l'ozzione di " "linea di cummanda '--datadir ' o affetendu a variabile " "d'ambiente FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 msgid "Could not generate custom login sequence." msgstr "" "Ùn hè micca pussibule d'ingenereghjà una sequenza d'identificazione " "persunalizata." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/engine/tlssocket.cpp:1062 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2594,7 +2664,7 @@ "Ùn hè micca pussibule di sapè u nome di l'emettore di u certificatu, " "gnutls_x509_get_issuer_dn hè fiascu" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket.cpp:1038 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2602,7 +2672,7 @@ "Ùn hè micca pussibule di sapè u nome di sughjettu di u certificatu, " "gnutls_x509_get_dn hè fiascu" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:948 msgid "Could not get full remote path." msgstr "Ùn hè micca pussibule di sapè u nome sanu di u passeghju alluntanatu." @@ -2611,41 +2681,27 @@ msgid "Could not get reply from fzputtygen." msgstr "Ùn hè micca pussibule di riceve una risposta di fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1580 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Could not get temporary directory to download file into." msgstr "" "Ùn pò micca creà unu cartulare timpurariu per telecaricà u schedariu dentru." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Ùn hè micca pussibule d'impurtà i certificati 'peer', gnutls_x509_crt_import " -"hè fiascu" - -#: ../../locales/../src/interface/FileZilla.cpp:108 -#, fuzzy, c-format +#: ../../locales/../src/interface/FileZilla.cpp:84 +#, c-format msgid "Could not initialize Winsock (%d): %s" -msgstr "Ùn pò micca scrive in socket : %s" - -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Ùn hè micca pussibule di creà a struttura di i certificati 'peer', " -"gnutls_x509_crt_init hè fiascu" +msgstr "Ùn pò micca avvià Winsock (%d) : %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:304 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " "accessed.\n" "Any changes made in the Site Manager will not be saved." msgstr "" -"Ùn hè micca pussibule di caricà \"%s\", assicuratevvi chì u schedariu hè " -"accettevule è pò esse accessu.\n" +"Ùn hè micca pussibule di caricà \"%s\", assicuratevvi chì u schedariu sia " +"accettevule è possi esse accessu.\n" "I cambiamenti fatti in u Ghjestiunariu di Siti ùn seranu micca arregistrati." #: ../../locales/../src/interface/fzputtygen_interface.cpp:59 @@ -2656,7 +2712,7 @@ msgid "Could not load private key" msgstr "Ùn hè micca pussibule di caricà a chjave privata" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:970 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2668,7 +2724,7 @@ "Vulete disattivà u sfugliendu sincrunizatu è cuntinuà u cambiamentu di u " "cartulare alluntanatu ?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:355 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2679,7 +2735,7 @@ "cartulare alluntanatu '%s'.\n" "Avà, u sfugliendu sincrunizatu ùn hè più attivu." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:260 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2688,17 +2744,18 @@ msgstr "" "Ùn hè micca pussibule d'ottene u cartulare alluntanatu currispondente à u " "cartulare lucale '%s'.\n" -"U sfugliendu sincrunizatu ùn hè più attivu." +"Avà, u sfugliendu sincrunizatu ùn hè più attivu." #: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2528 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not open clipboard" -msgstr "Ùn pò micca apre a fermacarta" +msgstr "Ùn pò micca apre u preme'papei" #: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:190 +#: ../../locales/../src/engine/logging.cpp:222 +#: ../../locales/../src/engine/logging.cpp:286 #, c-format msgid "Could not open log file: %s" msgstr "Ùn pò micca apre u ghjurnale di i messaghji : %s" @@ -2707,35 +2764,33 @@ msgid "Could not parse remote path." msgstr "Ùn hè micca pussibule di determinà u nome di u passeghju alluntanatu." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:81 msgid "Could not parse server address:" msgstr "Ùn hè micca pussibule di determinà l'indirizzu di u servu :" -#: ../../locales/../src/interface/netconfwizard.cpp:977 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:994 msgid "Could not read from data socket." -msgstr "Ùn pò micca leghje da socket : %s" +msgstr "Ùn pò micca leghje da u socket di dati." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:209 #, c-format msgid "Could not read from socket: %s" msgstr "Ùn pò micca leghje da socket : %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:548 msgid "Could not read server item." msgstr "Ùn pò micca leghje l'elementu di u servu." -#: ../../locales/../src/interface/netconfwizard.cpp:344 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." -msgstr "Ùn pò micca cunnettà à u servu" +msgstr "Ùn pò micca riceve i dati da u servu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2602 #, c-format msgid "Could not seek to offset %s within file" msgstr "Ùn hè micca pussibule d'andà à u locu di %s dentru u schedariu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2509 msgid "Could not seek to the end of the file" msgstr "Ùn hè micca pussibule d'andà à a fine di u schedariu" @@ -2743,11 +2798,15 @@ msgid "Could not send command to fzputtygen." msgstr "Ùn pò micca mandà a cummanda à fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/engine/tlssocket.cpp:1246 +msgid "Could not sort peer certificates" +msgstr "Ùn hè micca pussibule di classificà i certificati pari" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2630 msgid "Could not spawn IO thread" msgstr "Ùn hè micca pussibule di creà un operazione d'Intrata/Esciuta" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1062 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Ùn hè micca pussibule di stabilisce u toccamanu cù u proxy : %s" @@ -2756,8 +2815,8 @@ msgid "Could not start transfer" msgstr "Ùn hè micca pussibule di principià u trasferimentu" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:620 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:824 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2766,19 +2825,19 @@ "Ùn pò micca scrive \"%s\", i cambiamenti fatti cù u Ghjestiunariu di Siti ùn " "ponu micca esse arregistrati : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:816 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Ùn pò micca scrive \"%s\", l'indetta ùn pò micca esse aghjunta : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:315 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Ùn pò micca scrive \"%s\", l'indette glubale ùn ponu micca esse " "arregistrate : %s" -#: ../../locales/../src/interface/QueueView.cpp:1847 +#: ../../locales/../src/interface/QueueView.cpp:1469 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2787,16 +2846,16 @@ "Ùn pò micca scrive \"%s\", a lista d'attesa ùn pò micca esse arregistrata.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:728 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2280 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Ùn pò micca scrive \"%s\", i siti selezziunati ùn ponu micca esse " "arregistrati : %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:145 #, c-format msgid "Could not write \"%s\":" msgstr "Ùn pò micca scrive \"%s\" :" @@ -2810,19 +2869,19 @@ msgid "Could not write to local file" msgstr "Ùn pò micca scrive in u schedariu lucale" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:234 +#: ../../locales/../src/engine/logging.cpp:302 #, c-format msgid "Could not write to log file: %s" msgstr "Ùn pò micca scrive in u ghjurnale di i messaghji : %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:879 +#: ../../locales/../src/engine/ControlSocket.cpp:983 #, c-format msgid "Could not write to socket: %s" msgstr "Ùn pò micca scrive in socket : %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Paese :" @@ -2830,25 +2889,25 @@ msgid "Crea&te new file" msgstr "Creà unu schedariu novu" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:984 msgid "Create &missing local directory and enter it" msgstr "Creà u cartulare lucale chì &manca è andaci" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:912 msgid "Create &missing remote directory and enter it" msgstr "Creà u cartulare alluntanatu chì &manca è andaci" #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 msgid "Create a new subdirectory in the current directory" msgstr "Creà unu sottu-cartulare novu in u cartulare currente" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Creà unu sottu-cartulare novu in u cartulare currente è impiegallu" @@ -2858,19 +2917,19 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:268 #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "Create director&y and enter it" msgstr "Creà unu cartulare è impiegallu" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:924 +#: ../../locales/../src/interface/LocalTreeView.cpp:1153 +#: ../../locales/../src/interface/RemoteListView.cpp:1301 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Create directory" msgstr "Creà unu cartulare" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2614 msgid "Create empty file" msgstr "Creà unu schedariu viotu" @@ -2878,32 +2937,32 @@ msgid "Creating directory" msgstr "Creendu unu cartulare" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3118 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1862 #, c-format msgid "Creating directory '%s'..." msgstr "Creendu u cartulare '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:177 msgid "Critical error" msgstr "Errore impurtantissimu" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:168 msgid "Critical error:" msgstr "Errore impurtantissimu :" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "Critical file transfer error" msgstr "Errore impurtantissimu di trasferimentu di schedariu" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:117 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "" "Errore impurtantissimu di trasferimentu di schedariu dopu à avè trasferitu " "%s in %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:346 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2919,13 +2978,13 @@ #: ../../locales/../src/interface/statusbar.cpp:401 msgid "Current transfer type is set to automatic detection." -msgstr "Avà, u tipu di trasferimentu currente hè automaticu." +msgstr "Avà, u tipu di trasferimentu currente hè autumaticu." #: ../../locales/../src/interface/statusbar.cpp:397 msgid "Current transfer type is set to binary." msgstr "Avà, u tipu di trasferimentu currente hè binariu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "Curve:" msgstr "Curva :" @@ -2934,36 +2993,40 @@ msgid "Cus&tom" msgstr "Persunaliza&tu" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:92 msgid "Custom filter set" msgstr "Gruppu di filtri persunalizati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2400 msgid "Custom server" msgstr "Servu persunalizatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "Cianu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2520 msgid "D&ata type" msgstr "Tipu di d&atu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "" -"Prefissi d&ecimale cù simbuli di u Sistemu Internaziunale (SI) (p.i. 1 Ko = " +"Prefissi d&ecimale cù simbuli di u Sistema Internaziunale (SI) (p.i. 1 Ko = " "1000 ottetti)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:471 msgid "D&efault" msgstr "Pr&edefinitu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "D&elete" msgstr "Squassà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2716 msgid "D&irectory comparison" msgstr "&Paragone di cartulare" @@ -2977,10 +3040,10 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "D&ouble-click action on directories:" -msgstr "Azzione di u d&opiu-cliccu nantu à i cartulari :" +msgstr "Azzione di u d&opiu-cliccu nant'à i cartulari :" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2854 msgid "D&uplicate" msgstr "D&uplicà" @@ -2988,7 +3051,7 @@ msgid "DOS-like with virtual paths" msgstr "Accede à i passeghji virtuali à a manera di DOS" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1632 msgid "Dangerous filetype" msgstr "Tipu di schedariu periculosu" @@ -2996,10 +3059,10 @@ msgid "Data" msgstr "Dati" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." -msgstr "Socket di dati chjosu troppu tostu." +msgstr "Socket di dati chjosu troppu prestu." #: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 msgid "Date" @@ -3025,40 +3088,40 @@ msgid "Debugging settings" msgstr "Preferenze per Spannà" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:351 msgid "Default &local directory:" msgstr "Cartulare &lucale predefinitu :" #: ../../locales/../src/engine/server.cpp:26 msgid "Default (Autodetect)" -msgstr "Predefinitu (Detezione automatica)" +msgstr "Predefinitu (Detezione autumatica)" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." msgstr "Editore predefinitu micca specificatu currettamente." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1448 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" -msgstr "Azzione predefinita à fà nantu à i schedarii chì esistenu" +msgstr "Azzione predefinita à fà nant'à i schedarii chì esistenu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 msgid "Default r&emote directory:" msgstr "Cartulare da &reta in là predefinitu :" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." msgstr "" "U passeghju alluntanatu predefinitu ùn pò micca esse determinatu. " -"Assicuratevvi ch'ellu hè un passeghju esplicitu accettevule è cunnisciutu da " -"u tipu di servu selezziunatu." +"Assicuratevvi ch'ellu hè un passeghju esplicitu accettevule per u tipu di " +"servu selezziunatu." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" -msgstr "Lingua predefinita di u sistemu" +msgstr "Lingua predefinita di u sistema" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" @@ -3080,7 +3143,7 @@ "U tempu trà e prove fiasche di cunnessione deve esse sceltu trà 1 è 999 " "seconde." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:533 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3095,12 +3158,12 @@ "Tempu d'attesa di %d seconde per via d'una precedente prova di cunnessione " "fiasca..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1243 msgid "Delete Site Manager entry" msgstr "Squassà l'elementu di u Ghjestiunariu di Siti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Delete selected directory" msgstr "Squassà u cartulare selezziunatu" @@ -3109,57 +3172,57 @@ msgid "Delete selected files and directories" msgstr "Squassà i schedarii è i cartulari selezziunati" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:376 #, c-format msgid "Deleting \"%s\"" msgstr "Squassatura di \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:379 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Squassatura di %u schedarii in \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3344 msgid "Deleting symbolic link" msgstr "Squassatura di a leia simbulica" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:971 msgid "Desktop" msgstr "Scagnu" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Details" -msgstr "Ditaglii" +msgstr "Detaglii" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 msgid "Details for new key:" -msgstr "Ditaglii per una nova chjave :" +msgstr "Detaglii per una nova chjave :" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:753 msgid "Detected newer version of FileZilla" msgstr "Versione più nova di FileZilla identificata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1335 msgid "Dire&ctories" msgstr "&Cartulari" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Direction" msgstr "Direzzione" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "Directory" msgstr "Cartulare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2795 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:395 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/filelistctrl.cpp:468 +#: ../../locales/../src/interface/Mainfrm.cpp:2204 msgid "Directory comparison" msgstr "Paragone di cartulare" @@ -3173,11 +3236,16 @@ "U cartulare cuntenendu u ghjurnale di i messaghji ùn esiste micca, o u nome " "di schedariu ùn hè micca accettevule." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +#, fuzzy +msgid "Directory listing &filters..." +msgstr "Filtri per a lista di u cartulare" + +#: ../../locales/../src/engine/ControlSocket.cpp:188 msgid "Directory listing aborted by user" msgstr "A lista di u cuntenutu di u cartulare hè abbandunata da l'utilizatore" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2030 msgid "Directory listing failed" msgstr "Fiascu per mostrà a lista di u cartulare" @@ -3185,12 +3253,12 @@ msgid "Directory listing filters" msgstr "Filtri per a lista di u cartulare" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:196 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Lista di u cartulare \"%s\" riesciuta" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Directory listing successful" msgstr "Lista di u cartulare riesciuta" @@ -3198,14 +3266,14 @@ msgid "Disa&ble all" msgstr "Disattivà tuttu" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:977 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Vulete disattivà u sfugliendu sincrunizatu è cuntinuà u cambiamentu di u " "cartulare alluntanatu ?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:651 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3217,24 +3285,24 @@ msgid "Disconnect from server" msgstr "Disghjunghje da u servu" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/engine/ControlSocket.cpp:78 +#: ../../locales/../src/engine/ControlSocket.cpp:880 +#: ../../locales/../src/engine/ControlSocket.cpp:985 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:864 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:867 #: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Disghjuntu da u servu" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1017 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 #, c-format msgid "Disconnected from server: %s" msgstr "Disghjuntu da u servu : %s" #: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/statuslinectrl.cpp:236 msgid "Disconnecting from previous server" msgstr "Disghjunzione in corsu da u servu precedente" @@ -3250,51 +3318,47 @@ msgid "Do ¬ use default editor" msgstr "Ù&n impiega micca l'editore predefinitu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Ùn fà &nunda" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1883 msgid "Do the same with &all selected files already being edited" msgstr "" "Fate listessa cù &tutti i schedarii selezziunati chì sò dighjà in corsu di " "mudificazione" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1157 msgid "Do you really want to close FileZilla?" msgstr "Site sicuru di chjode FileZilla ?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Site sicuru di squassà tutti l'elementi di u Ghjestiunariu di Siti è a lista " "d'attesa di trasferimenti ?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Site sicuru di squassà tutti l'elementi di u Ghjestiunariu di Siti ?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1245 msgid "Do you really want to delete selected entry?" msgstr "Site sicuru di squassà l'elementu selezziunatu ?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Site sicuru di squassà a lista d'attesa di trasferimenti ?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:588 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Site sicuru di mandà '%s' à u servu ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1876 msgid "Do you want to reopen this file?" msgstr "Vulete apre stu schedariu torna ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3499 msgid "Documentation" msgstr "Documentazione" @@ -3310,11 +3374,11 @@ msgid "Double-click action" msgstr "Azzione di u dopiu-cliccu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2229 msgid "Download" msgstr "Telecaricà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3706 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Limitazione di telecaricamentu :" @@ -3328,13 +3392,13 @@ msgid "Download limit: none" msgstr "Limitazione di telecaricamentu : alcuna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3148 +#: ../../locales/../src/interface/search.cpp:859 +#: ../../locales/../src/interface/search.cpp:864 msgid "Download search results" msgstr "Telecaricà i risultati di a ricerca" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "Download selected directory" msgstr "Telecaricà u cartulare selezziunatu" @@ -3342,7 +3406,7 @@ msgid "Download selected files and directories" msgstr "Telecaricà i schedarii è i cartulari selezziunati" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:968 #, c-format msgid "" "Download speed: %s/s\n" @@ -3351,35 +3415,35 @@ "Velocità di telecaricamentu : %s/s\n" "Velocità d'incaricamentu : %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1105 msgid "Downloading" msgstr "Telecarichendu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:313 #, c-format msgid "Downloading %s" msgstr "Telecarichendu %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Telecarichendu a messa à ghjornu..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:88 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:107 +#: ../../locales/../src/interface/LocalTreeView.cpp:111 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:105 +#: ../../locales/../src/interface/RemoteTreeView.cpp:91 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" "Sguillà & Depone trà parechje finestre FileZilla ùn hè micca pussibule avà." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:101 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:117 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:111 +#: ../../locales/../src/interface/RemoteTreeView.cpp:97 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Sguillà & Depone trà parechji servi ùn hè micca pussibule avà." @@ -3404,21 +3468,21 @@ msgid "E&xit" msgstr "E&sce" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:463 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:486 msgid "E&xport..." msgstr "Es&purtà..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "Indirizzu Elettronicu :" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:676 msgid "Each filter needs at least one condition." msgstr "Ogni filtru hà bisognu d'almenu una cundizione." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1374 msgid "Edit filters" msgstr "Mudificà i filtri" @@ -3426,18 +3490,18 @@ msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" -"Mudificà u schedariu cù l'editore è incaricà i cambiamenti nantu à u servu." +"Mudificà u schedariu cù l'editore è incaricà i cambiamenti nant'à u servu." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1124 msgid "Editing directories is not supported" -msgstr "A mudificazione di i cartulari ùn hè micca suppurtata" +msgstr "A mudificazione di i cartulari ùn hè micca accettata" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1618 +#: ../../locales/../src/interface/LocalListView.cpp:1627 msgid "Editing failed" msgstr "Mudificazione fiasca" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1124 msgid "Editing search results" msgstr "Mudificazione di i risultati di a ricerca" @@ -3445,7 +3509,7 @@ msgid "Email:" msgstr "Messaghju elettronicu :" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1747 msgid "Empty command" msgstr "Cummanda viota" @@ -3453,7 +3517,7 @@ msgid "Empty command." msgstr "Cummanda viota." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2032 msgid "Empty directory listing" msgstr "Lista di cartulari viota" @@ -3461,11 +3525,6 @@ msgid "Empty directory." msgstr "Cartulare viotu." -#: ../../locales/../src/interface/recursive_operation.cpp:377 -#: ../../locales/../src/interface/recursive_operation.cpp:412 -msgid "Empty dirs to visit" -msgstr "Cartulari vioti à visità" - #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "L'estensione di u schedariu hè viota." @@ -3496,31 +3555,31 @@ msgid "Encrypted" msgstr "Cifratu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 msgid "Encryption" msgstr "Cifratura" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1993 msgid "Encryption details" -msgstr "Ditaglii di a cifratura" +msgstr "Detaglii di a cifratura" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "End comparison and change sorting order?" -msgstr "Compie u paragone è cambià l'urdine di a scelta ?" +msgstr "Compie u paragone è cambià l'ordine di a scelta ?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Enter &custom command..." msgstr "Scrivite una &cummanda persunalizata..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3747 msgid "Enter 0 for unlimited speed." msgstr "Scrivite 0 per una velocità senza limitu." -#: ../../locales/../src/interface/QueueView.cpp:2109 +#: ../../locales/../src/interface/QueueView.cpp:1741 msgid "Enter command" msgstr "Scrivite una cummanda" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Scrivite una cummanda persunalizata" @@ -3534,11 +3593,11 @@ msgid "Enter filter name" msgstr "Scrivite u nome di u filtru" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Enter name for filterset" msgstr "Scrivite u nome di u gruppu di filtri" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:274 msgid "Enter new name for filterset" msgstr "Scrivite u novu nome di u gruppu di filtri" @@ -3573,11 +3632,11 @@ "Pudete scrive dinù l'URL sanu in u protocollu di a forma ://utilizatore:" "pass@ospite:portu quì, i valori in l'altri campi seranu soprascritti tandu.\n" "\n" -"I protocolli suppurtati sò :\n" +"I protocolli accettati sò :\n" "- ftp:// per FTP nurmale cù a cifratura in ozzione\n" "- sftp:// per u protocollu di traferimentu SSH\n" -"- ftps:// per FTP nantu à TLS (sottintesu)\n" -"- ftpes:// per FTP nantu à TLS (esplicitu)" +"- ftps:// per FTP nant'à TLS (sottintesu)\n" +"- ftpes:// per FTP nant'à TLS (esplicitu)" #: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format @@ -3596,72 +3655,75 @@ "Scrivite u numeru di portu d'ascolta di u servu.\n" "U numeru predefinitu per FTP hè 21, è quellu per SFTP hè 22." -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:72 +msgid "Enter username" +msgstr "Scrivite u nome d'utilizatore" + +#: ../../locales/../src/interface/loginmanager.cpp:79 msgid "Enter username and password" msgstr "Scrivite u nome d'utilizatore è a parolla d'intrata" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" -msgstr "Errore mentre l'espurtazione di e preferenze" +msgstr "Errore durante l'espurtazione di e preferenze" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" -msgstr "Errore mentre l'impurtazione" +msgstr "Errore durante l'impurtazione" -#: ../../locales/../src/interface/QueueView.cpp:1909 +#: ../../locales/../src/interface/QueueView.cpp:1543 msgid "Error loading queue" -msgstr "Errore mentre u caricamentu di a lista d'attesa" +msgstr "Errore durante u caricamentu di a lista d'attesa" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1830 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:169 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:284 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:699 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:736 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:782 +#: ../../locales/../src/interface/filter.cpp:864 +#: ../../locales/../src/interface/filter.cpp:956 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:305 +#: ../../locales/../src/interface/Options.cpp:244 +#: ../../locales/../src/interface/QueueView.cpp:1452 +#: ../../locales/../src/interface/search.cpp:1252 +#: ../../locales/../src/interface/search.cpp:1271 +#: ../../locales/../src/interface/sitemanager.cpp:90 #: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/sitemanager.cpp:577 +#: ../../locales/../src/interface/sitemanager.cpp:674 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:746 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:804 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" -msgstr "Errore mentre u caricamentu di u schedariu xml" +msgstr "Errore durante u caricamentu di u schedariu xml" -#: ../../locales/../src/interface/QueueView.cpp:1819 +#: ../../locales/../src/interface/QueueView.cpp:1441 msgid "Error saving queue" -msgstr "Errore mentre l'arregistramentu di a lista d'attesa" +msgstr "Errore durante l'arregistramentu di a lista d'attesa" #: ../../locales/../src/interface/fzputtygen_interface.cpp:176 #: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "Error starting program" -msgstr "Errore mentre l'iniziu di u prugrammu" +msgstr "Errore durante l'iniziu di u prugrammu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1848 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:316 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:817 +#: ../../locales/../src/interface/QueueView.cpp:1470 +#: ../../locales/../src/interface/sitemanager.cpp:621 +#: ../../locales/../src/interface/sitemanager.cpp:729 +#: ../../locales/../src/interface/sitemanager.cpp:783 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:825 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2281 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 msgid "Error writing xml file" -msgstr "Errore mentre a scrittura di u schedariu xml" +msgstr "Errore durante a scrittura di u schedariu xml" #: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:334 msgid "Error:" msgstr "Errore :" @@ -3677,7 +3739,7 @@ msgid "Exe&cute" msgstr "Eseguisce" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "U schedariu da esecutà ùn hà micca d'infurmazione di versione, impussibule " @@ -3687,15 +3749,20 @@ msgid "Explorer" msgstr "Espluratore" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1588 +#, fuzzy +msgid "Export &Filters" +msgstr "&Filtri :" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1583 msgid "Export &Queue" msgstr "Espurtà a lista d'attesa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Export &Settings" msgstr "E&spurtà e preferenze" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1559 msgid "Export settings" msgstr "Espurtazione di e preferenze" @@ -3707,7 +3774,7 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:500 msgid "FTP - File Transfer Protocol" msgstr "FTP - Protocollu di Trasferimentu di Schedariu" @@ -3720,7 +3787,6 @@ msgstr "FTP - Protocollu di Trasferimentu di Schedariu senzà sicurità" #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FTP Engine not initialized, can't connect" msgstr "Mutore FTP micca dimaratu, ùn si pò micca cunnettà" @@ -3753,76 +3819,74 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP cù cunnessione TLS sottintesa" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:537 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:913 +#: ../../locales/../src/interface/LocalListView.cpp:1824 +#: ../../locales/../src/interface/LocalTreeView.cpp:851 +#: ../../locales/../src/interface/LocalTreeView.cpp:1129 +#: ../../locales/../src/interface/viewheader.cpp:495 msgid "Failed to change directory" msgstr "U cambiamentu di cartulare hè fiascu" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:134 +#: ../../locales/../src/interface/FileZilla.cpp:149 +#: ../../locales/../src/interface/FileZilla.cpp:151 msgid "Failed to change language" msgstr "U cambiamentu di lingua hè fiascu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2066 msgid "Failed to copy or move sites" msgstr "Fiascu di a copiatura o a mossa di i siti" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:340 msgid "Failed to create backup copy of xml file" msgstr "Fiascu di a creazione di a copia di u schedariu xml" -#: ../../locales/../src/interface/netconfwizard.cpp:792 +#: ../../locales/../src/interface/netconfwizard.cpp:808 msgid "Failed to create listen socket, aborting" msgstr "Fiascu di a creazione di socket d'ascoltu, abbandonu in corsu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4031 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4035 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Ùn hè micca pussibule di creà u socket d'ascoltu per u modu di trasferimentu " "attivu" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/LocalTreeView.cpp:628 msgid "Failed to get 'My Documents' path" msgstr "Fiascu per truvà u passeghju di 'My Documents'" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:616 msgid "Failed to get desktop path" msgstr "Fiascu per truvà u passeghju di u scagnu 'desktop'" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Ùn hè micca pussibule d'ottene l'indirizzu di u cliente per a cunnessione di " "cuntrollu, cunnessione chjosa." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Ùn hè micca pussibule d'ottene l'indirizzu di u cliente per a cunnessione di " "dati, cunnessione chjosa." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" -msgstr "Fiascu per dimarrà u mutore FTP" +msgstr "Fiascu à l'iniziu di u mutore FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:759 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:277 msgid "Failed to initialize TLS." -msgstr "Fiascu per dimarrà TLS." +msgstr "Fiascu à l'iniziu di TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 -#, fuzzy +#: ../../locales/../src/interface/FileZilla.cpp:85 msgid "Failed to initialize networking" -msgstr "Fiascu per dimarrà u mutore FTP" +msgstr "Fiascu à l'iniziu di a messa in reta" #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" @@ -3835,119 +3899,118 @@ msgid "Failed to load private key: %s" msgstr "Impussibule di caricà a chjave privata : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2499 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Impussibule di apre \"%s\" per aghjuntu o scrittura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2565 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Fiascu per apre \"%s\" per leghjelu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2531 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1005 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Fiascu per apre \"%s\" per scrivelu" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:344 msgid "Failed to parse returned path." msgstr "Fiascu per determinà u passeghju riturnatu." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "Fiascu per riceve i dati" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Failed to retrieve directory listing" msgstr "Fiascu per ritruvà a lista di u cartulare" -#: ../../locales/../src/interface/netconfwizard.cpp:721 +#: ../../locales/../src/interface/netconfwizard.cpp:737 msgid "Failed to retrieve external ip address, aborting" msgstr "Fiascu per ritruvà l'indirizzu IP esternu, abbandonu in corsu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3733 msgid "Failed to retrieve external ip address, using local address" msgstr "" "Fiascu per ritruvà l'indirizzu IP esternu, impiegu di l'indirizzu lucale" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3752 msgid "Failed to retrieve local ip address." msgstr "Fiascu per ritruvà l'indirizzu IP lucale." -#: ../../locales/../src/interface/netconfwizard.cpp:697 +#: ../../locales/../src/interface/netconfwizard.cpp:712 msgid "Failed to retrieve local ip address. Aborting" -msgstr "Fiascu per ritruvà l'indirizzu IP lucale, abbandonu in corsu" +msgstr "Fiascu per ritruvà l'indirizzu IP lucale. Abbandonu in corsu" -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Fiascu per ritruvà l'indirizzu IP esternu." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Fiascu per mandà a cummanda." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:149 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Fiascu per sceglie %s (%s), cum'è lingua, impiegu di a lingua predefinita di " -"u sistemu" +"u sistema" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:127 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" "Fiascu per sceglie %s (%s) cum'è lingua, impiegu di a lingua predefinita di " -"u sistemu (%s, %s)." +"u sistema (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:116 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Fiascu per sceglie %s (%s), cum'è lingua, impiegu di a lingua predefinita di " -"u sistemu." +"u sistema." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:151 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Fiascu per sceglie %s, cum'è lingua, impiegu di a lingua predefinita di u " -"sistemu" +"sistema" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:123 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Fiascu per sceglie %s, cum'è lingua, impiegu di a lingua predefinita di u " -"sistemu (%s, %s)." +"sistema (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:113 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Fiascu per sceglie %s, cum'è lingua, impiegu di a lingua predefinita di u " -"sistemu." +"sistema." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:206 msgid "Failed to validate settings" msgstr "Ùn hè micca pussibule di validà e preferenze" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket.cpp:1305 msgid "Failed to verify peer certificate" msgstr "Ùn hè micca pussibule di verificà u certificatu paru" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:509 #, c-format msgid "Failed to write to file %s" -msgstr "Fiascu per scrive nantu à u schedariu %s" +msgstr "Fiascu per scrive nant'à u schedariu %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:353 msgid "Failed to write xml file" -msgstr "Fiascu per scrive nantu à u schedariu xml" +msgstr "Fiascu per scrive nant'à u schedariu xml" #: ../../locales/../src/interface/queueview_failed.cpp:16 msgid "Failed transfers" @@ -3957,15 +4020,15 @@ msgid "Fall back to active mode" msgstr "Ritornu à u modu attivu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2308 msgid "Fil&e:" msgstr "Sch&edariu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "Fil&es" msgstr "Sch&edarii" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:267 msgid "File" msgstr "Schedariu" @@ -3973,11 +4036,11 @@ msgid "File Types" msgstr "Tipi di schedariu" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "File descriptor not a socket" msgstr "Descrittore di schedariu ùn hè micca socket" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "U schedariu ùn cuntene micca di datu à impurtà." @@ -3985,7 +4048,7 @@ msgid "File editing" msgstr "Mudificazione di u schedariu" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1613 msgid "File exists" msgstr "U schedariu esiste" @@ -3993,7 +4056,7 @@ msgid "File exists action" msgstr "Azzione à fà quandu u schedariu esiste" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 msgid "File has changed" msgstr "U schedariu hà cambiatu" @@ -4001,65 +4064,67 @@ msgid "File lists" msgstr "Liste di schedarii" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/interface/edithandler.cpp:1556 +#: ../../locales/../src/interface/FileZilla.cpp:582 +#: ../../locales/../src/interface/FileZilla.cpp:667 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "U schedariu ùn esiste micca" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3144 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/search.cpp:681 +#: ../../locales/../src/interface/search.cpp:686 msgid "File search" msgstr "Ricerca di schedariu" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:124 msgid "File transfer aborted by user" msgstr "U trasferimentu di u schedariu hè abbandunatu da l'utilizatore" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "U trasferimentu di u schedariu hè abbandunatu da l'utilizatore dopu à avè " "trasferatu %s in %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:134 msgid "File transfer failed" msgstr "U trasferimentu di schedariu hè fiascu" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:119 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "U trasferimentu di schedariu hè fiascu dopu à avè trasferatu %s in %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:129 msgid "File transfer skipped" -msgstr "U trasferimentu di schedariu hè saltatu" +msgstr "U trasferimentu di schedariu hè ignuratu" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer successful" msgstr "U trasferimentu di schedariu hè compiu bè" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:112 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "U trasferimentu di schedariu hè compiu bè, transferatu %s in %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1134 msgid "File transfers still in progress." msgstr "I trasferimenti di schedariu sò sempre in corsu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "File would transfer with ASCII data type." msgstr "U schedariu duveria esse trasferatu cù u tipu di dati ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "File would transfer with binary data type." msgstr "U schedariu duveria esse trasferatu cù u tipu di dati binariu." -#: ../../locales/../src/interface/FileZilla.cpp:429 +#: ../../locales/../src/interface/FileZilla.cpp:405 #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" msgstr "Errore di FileZilla" @@ -4071,11 +4136,11 @@ "Avà, FileZilla pò verificà a vostra cunfigurazione per assicurassi chì tuttu " "và bè." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 msgid "FileZilla is already connected to a server." msgstr "FileZilla hè dighjà cunnettu à un servu." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1434 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "Ci vole à chjode FileZilla è aprellu torna per piglià in contu u cambiamentu " @@ -4089,28 +4154,24 @@ msgid "Filelist status &bars" msgstr "Barre di &statu di l'arburiscenze" -#: ../../locales/../src/interface/edithandler.cpp:1084 +#: ../../locales/../src/interface/edithandler.cpp:1090 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 +#: ../../locales/../src/interface/LocalListView.cpp:279 +#: ../../locales/../src/interface/RemoteListView.cpp:393 +#: ../../locales/../src/interface/search.cpp:150 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Filename" msgstr "Nome di schedariu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Filtri di u nome di schedariu..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2922 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2106 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "U nome di u schedariu ùn pò micca esse custruitu per u cartulare %s è u " "schedariu %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1599 msgid "Filename invalid" msgstr "Nome di schedariu micca accettevule" @@ -4118,30 +4179,30 @@ msgid "Filename unchanged" msgstr "U nome di schedariu ùn hà micca cambiatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1698 #: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "Nome di schedariu :" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "I nomi di schedariu ùn ponu micca cuntene sti caratteri : / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "I nomi di schedariu ùn ponu micca cuntene sti caratteri : / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Files currently being edited" msgstr "I schedarii sò in corsu di mudificazione" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/LocalListView.cpp:280 +#: ../../locales/../src/interface/RemoteListView.cpp:394 +#: ../../locales/../src/interface/search.cpp:152 msgid "Filesize" msgstr "Dimensione di schedariu" @@ -4149,9 +4210,9 @@ msgid "Filesize format" msgstr "Forma di a dimensione di schedariu" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:281 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:153 msgid "Filetype" msgstr "Tipu di schedariu" @@ -4160,7 +4221,7 @@ msgid "Filetype associations" msgstr "Associ da tipu di schedariu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1323 msgid "Filter applies to:" msgstr "U filtru hè applicatu à :" @@ -4187,8 +4248,13 @@ msgid "Filter out items matching none of the following" msgstr "Filtrà l'elementi chì ùn currispondenu à alcuna di ste cundizione" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 +#, fuzzy +msgid "Filter out items matching not all of the following" +msgstr "Filtrà l'elementi chì currispondenu à tutte ste cundizione" + +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Filter set already exists" msgstr "U gruppu di filtru esiste dighjà" @@ -4202,11 +4268,11 @@ msgid "Filter validation failed" msgstr "A validazione di u filtru hè fiasca" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 msgid "Find &files" msgstr "Circà i &schedarii" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3111 msgid "Find d&irectories" msgstr "Circà i &cartulari" @@ -4223,7 +4289,7 @@ msgid "Fingerprint:" msgstr "Impronta :" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Assistente di cunfigurazione di parafocu è 'router'" @@ -4239,7 +4305,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Per più d'assicuranza, ci vole à indicà una stesa d'almenu 10 porti." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:243 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4247,7 +4313,7 @@ "E preferenze predefinite seranu impiegate per sta sessione. Tuttu " "cambiamentu di ste preferenze ùn serà micca arregistratu." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Force &UTF-8" msgstr "Forzà a cudificazione &UTF-8" @@ -4255,7 +4321,7 @@ msgid "Force showing &hidden files" msgstr "Forzà l'affissu di i schedarii &piattati" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:646 msgid "Force showing hidden files" msgstr "Forzà l'affissu di i schedarii piattati" @@ -4270,12 +4336,12 @@ "currettamente." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:688 #, c-format msgid "Found new %s %s\n" msgstr "Rinnovu trovu %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 msgid "Further documentation" msgstr "Più di documentazione" @@ -4283,7 +4349,7 @@ msgid "General" msgstr "Generale" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:475 msgid "General SOCKS server failure" msgstr "Fiascu generale di u servu SOCKS" @@ -4296,35 +4362,35 @@ msgid "Get external IP address from the following URL:" msgstr "&Ottene l'indirizzu IP esternu chì si trova à st'URL :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3542 msgid "Getting help" msgstr "Aiutu in linea (inglese)" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Given filterset name already exists, overwrite filter set?" msgstr "U nome di u gruppu di filtri esiste dighjà, vulete rimpiazzallu ?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:246 msgid "Global bookmarks" msgstr "Indette glubale" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket.cpp:313 #, c-format msgid "GnuTLS error %d" msgstr "Errore GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket.cpp:315 #, c-format msgid "GnuTLS error %d in %s" msgstr "Errore GnuTLS %d in %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket.cpp:309 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Errore GnuTLS %d in %s : %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Errore GnuTLS %d : %s" @@ -4333,19 +4399,23 @@ msgid "GnuTLS:" msgstr "GnuTLS :" +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "Verde" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 msgid "Group permissions" msgstr "Permessi di gruppu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "Altu" #: ../../locales/../src/engine/server.cpp:18 msgid "HTTPS - HTTP over TLS" -msgstr "HTTPS - HTTP nantu à TLS" +msgstr "HTTPS - HTTP nant'à TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2028 msgid "Hash:" msgstr "Hash :" @@ -4354,20 +4424,20 @@ msgstr "Piattatu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "High" msgstr "Altu" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:885 +#: ../../locales/../src/interface/queue.cpp:941 msgid "Highest" msgstr "U più altu" #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "" -"U numeru u più maiò di u portu dispunibule deve esse sceltu trà 1024 è 65535." +"U numeru u più altu di u portu dispunibule deve esse sceltu trà 1024 è 65535." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 msgid "" @@ -4380,11 +4450,11 @@ msgid "Homepage:" msgstr "Prima pagina di u situ FileZilla :" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Host is down" msgstr "L'ospite ùn funziona più" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2038 msgid "Host key fingerprint:" msgstr "Impronta di a chjave di l'ospite :" @@ -4392,11 +4462,11 @@ msgid "Host key mismatch" msgstr "A chjave di l'ospite ùn currisponde micca" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:158 msgid "Host starts with '[' but no closing bracket found." msgstr "L'ospite principia cù '[' ma manca quella di diritta." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "Host unreachable" msgstr "Ospite inaccessibile" @@ -4407,7 +4477,7 @@ msgid "Host:" msgstr "Ospite :" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 msgid "Hours," msgstr "Ore," @@ -4415,9 +4485,9 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (esempiu : 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:115 msgid "IPv6 addresses are not supported with SOCKS4 proxy" -msgstr "L'indirizzi IPv6 ùn sò micca suppurtati cù un proxy SOCKS4" +msgstr "L'indirizzi IPv6 ùn sò micca accettati cù un proxy SOCKS4" #: ../../locales/../src/interface/resources/xrc/settings.xrc:117 msgid "" @@ -4425,15 +4495,15 @@ "specified time, the connection will be closed and FileZilla will try to " "reconnect." msgstr "" -"S'è alcunu datu hè mandatu o ricevutu per un operazione mentre una durata " +"S'è alcunu datu hè mandatu o ricevutu per un operazione durante una durata " "più longa chì stu valore, a cunnessione serà interrotta è FileZilla pruverà " "di ricunnettassi." #: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" -"S'è voi mandate un raportu d'errore, ci vole à mandà dinù u ghjurnale cù i " -"ditaglii di livellu \"Verbose\"." +"S'è voi mandate un raportu di sbagliu, ci vole à mandà dinù u ghjurnale cù i " +"detaglii di livellu \"Verbose\"." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" @@ -4442,7 +4512,7 @@ "you should try active mode. You can set the transfer mode on a per-server " "basis in the Site Manager." msgstr "" -"S'è a prova automatica à a fine di l'Assistente si passa bè, ma chì ùn " +"S'è a prova autumatica à a fine di l'Assistente si passa bè, ma chì ùn " "pudete micca trasferà un schedariu ver di un servu particulare, quessu hè " "podasse mal cunfiguratu, è duveriate pruvà u modu attivu. Pudete definisce " "un modu di trasferimentu per ogni servu cù u Ghjestiunariu di Siti." @@ -4463,20 +4533,20 @@ "S'è u cambiamentu di a chjave di l'ospite ùn era micca previstu, ci vole à " "chjamà l'amministratore di u servu." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" -"S'è u prublemu ùn smarisce micca, vole si dì chì u 'router' è/o u parafocu " +"S'è u penseru ùn smarisce micca, vole si dì chì u 'router' è/o u parafocu " "blocca sempre FieZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" -"S'è u prublemu ùn smarisce micca, vole si dì chì u 'router' è/o u parafocu " +"S'è u penseru ùn smarisce micca, vole si dì chì u 'router' è/o u parafocu " "interrompe sempre a cunnessione." #: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 @@ -4489,7 +4559,7 @@ "serà rinumatu aghjunghjendu \".1\" à a fine di u so nome (podasse vechji " "ghjurnali seranu rimpiazziati) è un novu schedariu serà creatu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3356 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4497,21 +4567,21 @@ "S'è a leia simbolica (symlink) assuciassi à unu cartulare, FileZilla pò sia " "squassà sta leia, sia scaccià u cuntenutu di u cartulare ligatu." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" -"S'è stu prublemu ùn smarisce micca, ci vole à chere una soluzione à u " +"S'è stu penseru ùn smarisce micca, ci vole à chere una soluzione à u " "custruttore di u 'router' è/o u parafocu." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" -"S'è stu prublemu ùn smarisce micca, ci vole à chjamà u custruttore di u " +"S'è stu penseru ùn smarisce micca, ci vole à chjamà u custruttore di u " "'router'." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1457 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " @@ -4519,7 +4589,7 @@ "timezone offset in the site manager." msgstr "" "S'è voi impiegate 'Rimpiazzà s'è l'urigine hè più recente', u rilogiu di u " -"sistemu deve esse sincrunizatu cù u servu. S'è u rilogiu hè sfarente (p.i. " +"sistema deve esse sincrunizatu cù u servu. S'è u rilogiu hè sfarente (p.i. " "fusu orariu sfarente), ci vole à indicà a sfarenza di u fusu orariu cù u " "Ghjestiunariu di Siti." @@ -4528,22 +4598,22 @@ "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." msgstr "" -"S'è u paragone impiegatu hè fundatu nantu à l'ora, dui schedarii sò " +"S'è u paragone impiegatu hè fundatu nant'à l'ora, dui schedarii sò " "cunsiderati uguale s'è a so sfarenza d'ora ùn eccede micca stu sogliu." #: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 msgid "If you change the language, you need to restart FileZilla." -msgstr "S'è voi cambiate a lingua, ci vole à rilancià FileZilla." +msgstr "S'è voi cambiate a lingua, ci vole à riavvià FileZilla." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" "If you click on test, FileZilla will connect to probe.filezilla-project.org " "and will perform some simple tests." msgstr "" -"S'è voi cliccate nantu à test, FileZilla pruverà di andà nantu à probe." +"S'è voi cliccate nant'à test, FileZilla pruverà di andà nant'à probe." "filezilla-project.org è ferà qualchì prova simplice." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "If you close FileZilla, your changes will be lost." msgstr "S'è voi chjudate FileZilla, i vostri cambiamenti seranu persi." @@ -4558,26 +4628,27 @@ #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." msgstr "" -"S'ella s'affaca un errore, vole si dì chì a vostra cunfigurazione hè gattiva." +"S'ella s'affaca un sbagliu, vole si dì chì a vostra cunfigurazione ùn hè " +"micca curretta." #: ../../locales/../src/interface/resources/xrc/settings.xrc:218 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." msgstr "" -"S'elli ci sò prublemi per raccoglie liste di cuntenutu di cartulari o per " +"S'elli ci sò penseri per raccoglie e liste di cuntenutu di cartulari o per " "trasferà schedarii, pruvate di cambià u modu di trasferimentu predefinitu." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " "passive mode and contact the server administrator for help." msgstr "" -"S'elli ci sò sempre prublemi cù un servu particulare, vole si dì chì u " -"servu, un 'router' alluntanatu, o un parafocu hè mal cunfiguratu. In stu " -"casu, pruvate di sbilancià in modu passivu è chjamate l'amministratore per " -"ottene aiutu." +"S'elli ci sò sempre penseri cù un servu particulare, vole si dì chì u servu, " +"un 'router' alluntanatu, o un parafocu hè mal cunfiguratu. In stu casu, " +"pruvate di sbilancià in modu passivu è chjamate l'amministratore per " +"aiutavvi." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 msgid "" @@ -4593,7 +4664,7 @@ "on all given ports." msgstr "" "S'è voi impiegate un parafocu, assicuratevvi chì FileZilla sia auturizatu à " -"accettà cunnessioni nantu à tutti i porti indicati." +"accettà cunnessioni nant'à tutti i porti indicati." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 msgid "" @@ -4603,7 +4674,7 @@ "S'è voi impiegate un 'router', assicuratevvi chì tutti sti porti sianu " "rigirati versi l'urdinatore induve s'eseguisce FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4611,16 +4682,16 @@ "S'è u vostru 'router' cuntinua à cambià l'indirizzu IP, ci vole à chjamà u " "custruttore di u 'router'." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Impurtà i dati da una vechja versione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 msgid "Import settings" msgstr "Impurtà e preferenze" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Impurtazione riesciuta" @@ -4643,8 +4714,8 @@ "FileZilla has no influence on the ports your system chooses." msgstr "" "S'è voi avete un 'router', ci vole à rigirà tutti i porti dispunibule, " -"perchè FileZilla ùn hà micca d'azzione nantu à u vostru sistemu per sceglie " -"i porti." +"perchè FileZilla ùn hà micca d'azzione nant'à u vostru sistema per sceglie i " +"porti." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 #: ../../locales/../src/interface/resources/xrc/settings.xrc:336 @@ -4664,19 +4735,11 @@ "In modu passivu, ricumandatu per a parte maiò di l'utilizatori, FileZilla " "dumanda un portu à u servu è si ci cunnetta. Ùn ci hè nunda à fà di più." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Catena micca cumpleta, u certificatu principale ùn hè micca un certificatu " -"auto-firmatu da un auturità qualificata" - #: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "A parolla d'intrata hè falsa" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:199 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4684,20 +4747,20 @@ "L'infurmazione apprupositu di l'ultima versione di FileZilla ùn pò micca " "esse trova. Provate torna un altra volta." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750 msgid "Initializing TLS..." msgstr "Lanciu di TLS in corsu..." -#: ../../locales/../src/interface/verifycertdialog.cpp:107 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 msgid "Insecure algorithm!" msgstr "Cudificazione micca sicura !" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:734 msgid "Insecure server, it does not support FTP over TLS." -msgstr "Servu senza sicurità chì ùn supporta micca FTP cù TLS." +msgstr "Servu senza sicurità chì ùn accetta micca FTP cù TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/engine/server.cpp:884 +#: ../../locales/../src/engine/server.cpp:905 #: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interrattivu" @@ -4706,29 +4769,29 @@ msgid "Interface" msgstr "Interfaccia" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Interrupted by signal" msgstr "Interrottu da u signale" -#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:217 #: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Interrottu da l'utilizatore" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:715 msgid "Invalid Content-Length" msgstr "Lunghezza di u cuntenutu ùn hè micca accettevule" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:565 msgid "Invalid HTTP Response" msgstr "Risposta HTTP micca accettevule" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Invalid argument passed" msgstr "Parametru passatu micca accettevule" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:451 +#: ../../locales/../src/engine/ControlSocket.cpp:508 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4737,14 +4800,14 @@ "disattivatu. Selezziunate UTF-8 in u Ghjestiunariu di Siti per forzà " "l'impiegu d'UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:829 msgid "Invalid chunk size" msgstr "Dimensione di l'ingutuppu micca accettevule" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Dati ricevuti micca accettevule" @@ -4753,30 +4816,30 @@ msgid "Invalid date" msgstr "Data micca accettevule" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Nome di schedariu micca accettevule" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:163 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Ospite micca accettevule, dopu à a parentesi quadra di fine, solu i dui " "punti è u portu ponu esse indicati." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:105 msgid "Invalid input" msgstr "Intrata micca accettevule" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:64 +#: ../../locales/../src/engine/server.cpp:181 +#: ../../locales/../src/engine/server.cpp:191 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "U numeru di portu ùn hè micca accettevule. Deve esse sceltu trà 1 è 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/engine/server.cpp:92 +#: ../../locales/../src/interface/quickconnectbar.cpp:120 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4784,72 +4847,68 @@ "ftps:// for FTP over TLS (implicit) and\n" "ftpes:// for FTP over TLS (explicit)." msgstr "" -"U protocollu indicatu ùn hè micca accettevule. I protocolli suppurtati sò :\n" -"ftp:// per FTP nurmale cù a cifratura in ozzione\n" -"sftp:// per u protocollu di traferimentu SSH\n" -"ftps:// per FTP nantu à TLS (sottintesu)\n" -"ftpes:// per FTP nantu à TLS (esplicitu)" +"U protocollu indicatu ùn hè micca accettevule. I protocolli accettati sò :\n" +"ftp:// per FTP nurmale cù a cifratura in ozzione,\n" +"sftp:// per u protocollu di traferimentu SSH,\n" +"ftps:// per FTP nant'à TLS (sottintesu) è\n" +"ftpes:// per FTP nant'à TLS (esplicitu)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Ospite di proxy micca accettevule, dopu à a parentesi quadra di fine, solu i " "dui punti è u portu ponu esse indicati." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:710 +msgid "Invalid regular expression" +msgstr "Espressione regulare micca accettevule" + +#: ../../locales/../src/interface/search.cpp:686 msgid "Invalid regular expression in search conditions." msgstr "Espressione regulare micca accettevule in i cundizioni di ricerca." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:575 msgid "Invalid response code" msgstr "Codice di risposta micca accettevule" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:681 #, c-format msgid "Invalid search conditions: %s" msgstr "Cundizioni di ricerca micca accettevule : %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:685 +#: ../../locales/../src/interface/sitemanager.cpp:691 +#: ../../locales/../src/interface/sitemanager.cpp:762 +#: ../../locales/../src/interface/sitemanager.cpp:768 msgid "Invalid site path" msgstr "Passeghju di situ micca accettevule" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:726 msgid "Invalid size in condition" msgstr "Dimensione micca accettevule in a cundizione" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/engine/server.cpp:133 msgid "Invalid username given." msgstr "Nome d'utilizatore indicatu micca accettevule." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "Invalid value for ai_flags" msgstr "Valore micca accettevule per ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Invalid value for hints" msgstr "Valore micca accettevule per i cunsiglii" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Paese di ghjuridizzione :" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Cità di ghjuridizzione :" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Pruvincia di ghjuridizzione :" @@ -4857,18 +4916,18 @@ msgid "Keep directories on top" msgstr "Mentene i cartulari in capu" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " "some tests to check if the server supports this feature, the test may fail." msgstr "" -"Tinite à mente chì tutti i servi ùn suppurtanu micca sta funzione è ponu " +"Tinite à mente chì tutti i servi ùn accettanu micca sta funzione è ponu " "restituì un cuntenutu gattivu di cartulare s'è st'ozzione hè attiva. " -"FileZilla fà qualchì prova per verificà s'è u servu supporta sta funzione, " -"ma a prova pò fiascà." +"FileZilla fà qualchì prova per verificà s'è u servu accetta sta funzione, ma " +"a prova pò fiascà." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 msgid "Key exchange" msgstr "Scambiu di chjave" @@ -4876,29 +4935,29 @@ msgid "Key exchange:" msgstr "Scambiu di chjave :" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:882 +#: ../../locales/../src/engine/server.cpp:903 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1324 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1325 msgid "Key file" msgstr "Schedariu di chjave" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" -msgstr "A più bassa" +msgstr "U più &bassu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Lingua" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1434 msgid "Language changed" msgstr "Lingua mudificata" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:282 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:154 msgid "Last modified" msgstr "Mudificatu u" @@ -4926,7 +4985,7 @@ msgid "Limit:" msgstr "Limitazione :" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:782 msgid "Line length exceeded" msgstr "Lunghezza di a linea trapassata" @@ -4934,14 +4993,14 @@ msgid "Linked against" msgstr "Cumpunenti ligati" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Socket d'ascoltu chjosu" #: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:362 msgid "Listing:" msgstr "Cuntenutu :" @@ -4949,20 +5008,20 @@ msgid "Lo&west available port:" msgstr "P&ortu u più bassu dispunibule :" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1138 +#: ../../locales/../src/interface/edithandler.cpp:1374 msgid "Local" msgstr "Lucale" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1028 msgid "Local address in use" msgstr "Indirizzu lucale impiegatu" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Local endpoint has been closed" msgstr "U puntu lucale di cumpiitura hè statu chjosu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2252 msgid "Local file" msgstr "Schedariu lucale" @@ -4970,8 +5029,8 @@ msgid "Local file does not exist." msgstr "U schedariu lucale ùn esiste micca." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:402 +#: ../../locales/../src/interface/updater.cpp:495 #, c-format msgid "Local file is %s\n" msgstr "U schedariu lucale hè %s\n" @@ -4984,15 +5043,24 @@ msgid "Local file is not a valid filename." msgstr "U schedariu lucale ùn hà micca un nome sanu." +#: ../../locales/../src/interface/search.cpp:644 +#: ../../locales/../src/interface/search.cpp:650 +msgid "Local file search" +msgstr "Ricerca di schedariu lucale" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Filtri lucale :" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3279 +msgid "Local path handling:" +msgstr "Trattamentu di u passeghju lucale :" + +#: ../../locales/../src/interface/viewheader.cpp:335 msgid "Local site:" msgstr "Situ lucale :" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Cummuna :" @@ -5000,12 +5068,16 @@ msgid "Log file" msgstr "Ghjurnale di i messaghji" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:913 +msgid "Logged in" +msgstr "Ben cunnettu" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Arregistramentu di i messaghji" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -5014,7 +5086,7 @@ "micca sapè manipulà l'UTF-8. Impussibule d'impiegà torna u gruppu lucale di " "caratteri per via di l'impiegu di un proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:815 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -5022,7 +5094,7 @@ "L'infurmazioni di login cuntenenu caratteri micca ASCII è u servu pò ùn " "micca sapè manipulà l'UTF-8. Prova d'impiegu di u gruppu lucale di caratteri." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:842 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" "A sequenza d'identificazione hè compia ma ùn site micca cunnettu. Abbandonu " @@ -5042,13 +5114,13 @@ "U tipu d'accessu pò solu esse adupratu cù un URL di tipu FTP. U parametru " "deve esse, o '%s' o '%s'" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:878 +#: ../../locales/../src/interface/queue.cpp:934 msgid "Low" msgstr "Bassu" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:876 +#: ../../locales/../src/interface/queue.cpp:932 msgid "Lowest" msgstr "U più bassu" @@ -5062,30 +5134,34 @@ msgid "MAC:" msgstr "MAC :" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:43 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Assicuratevvi chì u schedariu sia accessibule è sia un ducumentu XML " "leghjittimu." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:770 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:782 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:797 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:829 #, c-format msgid "Malformed chunk data: %s" msgstr "Ingutuppu malcunciliu di dati : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:715 #, c-format msgid "Malformed header: %s" msgstr "In-capu malcunciliu : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:535 msgid "Malformed reply, server not sending proper line endings" msgstr "Risposta malcuncilia, u servu ùn manda micca fine di linea currette" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2594 #: ../../locales/../src/interface/manual_transfer.cpp:297 #: ../../locales/../src/interface/manual_transfer.cpp:303 #: ../../locales/../src/interface/manual_transfer.cpp:309 @@ -5097,28 +5173,33 @@ msgid "Manual transfer" msgstr "Trasferimentu manuale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3069 msgid "Match all of the following" msgstr "Currisponde à tutte ste cundizioni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3070 msgid "Match any of the following" msgstr "Currisponde à almenu una di ste cundizioni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3071 msgid "Match none of the following" msgstr "Ùn currisponde à alcuna di ste cundizioni" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#, fuzzy +msgid "Match not all of the following" +msgstr "Currisponde à tutte ste cundizioni" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "Numeru di trasferimenti simultanei :" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Memory allocation failure" msgstr "Fiascu per riservà memoria" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:385 +#: ../../locales/../src/interface/Mainfrm.cpp:1748 msgid "Message log" msgstr "Ghjurnale di i messaghji" @@ -5126,7 +5207,7 @@ msgid "Message log position" msgstr "Pusizione di u ghjurnale di i messaghji" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "Message too large" msgstr "Messaghju troppu longu" @@ -5134,29 +5215,29 @@ msgid "MiB" msgstr "MiO" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:445 msgid "Minutes" msgstr "Minuti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2167 msgid "Move &down" msgstr "Move in&ghjò" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 msgid "Move &up" msgstr "Move in&sù" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:990 msgid "My Computer" msgstr "U mo Urdinatore" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:980 msgid "My Documents" msgstr "I mo Ducumenti" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:734 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:736 msgid "My Sites" msgstr "I mo Siti" @@ -5165,17 +5246,17 @@ msgid "N/a" msgstr "M/d" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2632 msgid "Name" msgstr "Nome" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:683 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1210 msgid "Name already exists" msgstr "Stu nome esiste dighjà" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:703 msgid "Name of bookmark already exists." msgstr "U nome di l'indetta esiste dighjà." @@ -5191,19 +5272,23 @@ msgid "Need to enter filter name" msgstr "Ci vole à indicà un nome per u filtru" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:644 +msgid "Need to enter valid local path" +msgstr "Ci vole à scrive un passeghju lucale accettevule" + +#: ../../locales/../src/interface/search.cpp:671 msgid "Need to enter valid remote path" msgstr "Ci vole à indicà un passeghju alluntanatu accettevule" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1023 msgid "Need to specify a character encoding" msgstr "Ci vole à indicà una cudificazione di caratteru" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Neither nodename nor servname provided, or not known" msgstr "Nome di nodu o di servu micca specificatu, o scunnisciuti" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5211,8 +5296,8 @@ "L'ospite di a reta ùn hà mancunu indirizzu di reta in a famiglia d'indirizzi " "richiesta" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:481 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Network unreachable" msgstr "Reta inaccessibile" @@ -5228,37 +5313,37 @@ msgid "New &tab" msgstr "&Nova unghjetta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2837 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nova Indetta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2597 #: ../../locales/../src/interface/bookmarks_dialog.cpp:56 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69 #: ../../locales/../src/interface/bookmarks_dialog.cpp:75 #: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:107 #: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:528 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:533 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:559 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:703 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2221 msgid "New bookmark" msgstr "Nova indetta" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1156 +#: ../../locales/../src/interface/RemoteListView.cpp:1314 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1248 msgid "New directory" msgstr "Novu cartulare" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:56 #, c-format msgid "New features and improvements in %s" msgstr "Innuvazioni è megliuranze di a versione %s" @@ -5267,13 +5352,13 @@ msgid "New filter" msgstr "Novu filtru" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:932 msgid "New folder" msgstr "Novu cartulare" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:595 +#: ../../locales/../src/interface/sitemanager.cpp:607 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "New site" msgstr "Novu situ" @@ -5281,28 +5366,28 @@ msgid "Next to the transfer queue" msgstr "Seguente in a lista d'attesa di trasferimentu" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:737 msgid "No" -msgstr "No" +msgstr "Innò" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "No address associated with nodename" msgstr "Alcunu indirizzu assuciatu cù u nome di nodu" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Alcuna categuria selezziunata per l'espurtazione" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1747 msgid "No command given, aborting." msgstr "Alcuna cummanda indicata, abbandonu in corsu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3705 msgid "No external IP address set, trying default." msgstr "" "Alcunu indirizzu IP esternu indicatu, prova d'impiegu di u predefinitu." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1079 msgid "No files are currently being edited." msgstr "Alcunu schedariu in corsu di mudificazione." @@ -5310,9 +5395,9 @@ msgid "No filter name given" msgstr "Alcunu nome di filtru specificatu" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:78 +#: ../../locales/../src/engine/server.cpp:175 +#: ../../locales/../src/engine/server.cpp:200 msgid "No host given, please enter a host." msgstr "Alcunu ospite indicatu, ci vole à indicà un ospite." @@ -5320,88 +5405,85 @@ msgid "No images available" msgstr "Alcuna imaghjina dispunibule" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Ùn ci hè più di schedariu in a lista d'attesa !" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "No name for the filterset given." msgstr "U gruppu di filtri ùn hà micca di nome." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3004 msgid "No program associated with filetype" msgstr "Ùn ci hè alcunu prugrammu assuciatu cù stu tipu di schedariu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2921 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Ùn ci hè alcunu prugrammu per mudificà i schedarii cù l'estensione '%s'." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "No route to host" msgstr "Alcunu trasferimentu ver di l'ospite" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:391 msgid "No search results" msgstr "Alcunu risultatu di ricerca" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:347 msgid "No sites available" msgstr "Alcunu situ dispunibule" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:453 msgid "No supported SOCKS5 auth method" -msgstr "Metodu d'autenticazione SOCKS5 micca suppurtatu" +msgstr "Metodu d'autenticazione SOCKS5 micca accettatu" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:105 msgid "No username given." msgstr "Alcunu nome d'utilizatore indicatu." #: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 +#: ../../locales/../src/interface/sitemanager.cpp:16 #: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "Alcunu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2368 msgid "None selected yet" msgstr "Mancunu selezziunatu" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Nonrecoverable failure in name resolution" msgstr "Fiascu definitivu in a risuluzione di u nome" #: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 +#: ../../locales/../src/engine/server.cpp:878 +#: ../../locales/../src/engine/server.cpp:899 #: ../../locales/../src/interface/manual_transfer.cpp:154 #: ../../locales/../src/interface/manual_transfer.cpp:179 #: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1322 msgid "Normal" msgstr "Nurmale" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 msgid "Not all items could be requeued for transfer." msgstr "" "Micca tutti l'elementi ùn ponu esse rimessi in a lista d'attesa per u " "trasferimentu." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:178 +#: ../../locales/../src/interface/state.cpp:1177 msgid "Not connected" msgstr "Micca cunnettu" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2028 msgid "Not connected to any server" msgstr "Micca cunnettu à alcunu servu" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Micca cunnettu à alcunu servu." @@ -5409,13 +5491,13 @@ msgid "Not connected." msgstr "Micca cunnettu." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Not initialized, need to call WSAStartup" msgstr "Micca dimaratu, ci vole à chjamà WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:648 msgid "Note that this feature is only supported using the FTP protocol." -msgstr "Fate casu chì sta funzione hè solu suppurtata cù u protocollu FTP." +msgstr "Fate casu chì sta funzione hè solu accettata cù u protocollu FTP." #: ../../locales/../src/interface/resources/xrc/settings.xrc:595 msgid "Note: This only works with plain, unencrypted FTP connections." @@ -5434,7 +5516,7 @@ msgid "Number of retries has to be between 0 and 99." msgstr "U numeru di prove deve esse sceltu trà 0 è 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "O&pen file" msgstr "A&pre u schedariu" @@ -5445,27 +5527,28 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1538 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1972 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2118 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2576 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2987 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3225 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3320 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3389 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3764 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3820 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" -msgstr "OK" +msgstr "Vai" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 msgid "OS version:" @@ -5479,7 +5562,7 @@ "In e pagine chì seguitanu, u modu di trasferimentu selezziunatu serà " "cunfiguratu, è u modu alternativu di ritornu dinù, s'è voi l'avete attivatu." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:746 msgid "Once" msgstr "Solu una volta" @@ -5491,13 +5574,13 @@ msgid "Once a week" msgstr "Una volta per settimana" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:519 msgid "Only use plain FTP (insecure)" msgstr "Impiegà solu FTP nurmale (senzà sicurità)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Open directory in system's file manager" -msgstr "Apre u cartulare in u ghjestiunariu di schedarii di u sistemu" +msgstr "Apre u cartulare in u ghjestiunariu di schedarii di u sistema" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 msgid "Open the Site Manager" @@ -5520,14 +5603,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Apre u dialogu di e preferenze di FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1708 msgid "Opened as:" msgstr "Apertu cum'è :" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/edithandler.cpp:1739 +#: ../../locales/../src/interface/LocalListView.cpp:1732 +#: ../../locales/../src/interface/LocalListView.cpp:1744 msgid "Opening failed" msgstr "Apertura fiasca" @@ -5550,19 +5633,23 @@ msgid "Operating System:" msgstr "Sistema d'Operazione :" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Operation already in progress" msgstr "Operazione dighjà in corsu" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Operation in progress" msgstr "Operazione in corsu" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Operation not supported" -msgstr "Operazione micca suppurtata" +msgstr "Operazione micca accettata" + +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "Aranciu" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Urganismu :" @@ -5570,51 +5657,51 @@ msgid "Other SFTP options" msgstr "Altre ozzioni SFTP" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Other system error" -msgstr "Altru sbagliu di u sistemu" +msgstr "Altru sbagliu di u sistema" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Altru :" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Out of memory" msgstr "Mancanza di memoria" #: ../../locales/../src/interface/resources/xrc/settings.xrc:63 msgid "Overview" -msgstr "Descrizzione generale" +msgstr "Discrizzione generale" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite &if source newer" msgstr "R&impiazzà s'è l'urigine hè più recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Rimpiazzà u schedariu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "Rimpiazzà u schedariu s'è a dimensione hè sfarente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "" "Rimpiazzà u schedariu s'è a dimensione hè sfarente o l'urigine hè più recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" @@ -5628,7 +5715,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Rimpia&zzà s'è a dimensione hè sfarente o l'urigine hè più recente" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" msgstr "Vostru tipu di custruzzione : %s\n" @@ -5637,8 +5724,8 @@ msgid "Owner permissions" msgstr "Permessi di u pruprietariu" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:156 msgid "Owner/Group" msgstr "Pruprietariu / Gruppu" @@ -5647,7 +5734,7 @@ "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "" -"&Impedisce a messa in veghja di l'urdinatore mentre i trasferimenti è " +"&Impedisce a messa in veghja di l'urdinatore durante i trasferimenti è " "l'altre operazioni" #: ../../locales/../src/interface/resources/xrc/settings.xrc:555 @@ -5655,28 +5742,28 @@ msgid "P&roxy host:" msgstr "Ospite p&roxy :" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." -msgstr "A cummanda PORT hè statu alterata da u 'router' o u parafocu." +msgstr "A cummanda PORT hè stata alterata da u 'router' o u parafocu." #: ../../locales/../src/interface/resources/xrc/settings.xrc:202 msgid "Pa&ssive (recommended)" msgstr "Pa&ssivu (ricumandatu)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2359 msgid "Parameter not a valid URL" msgstr "U parametru ùn hè micca un URL accettevule" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:575 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Analisa di %d ottetti d'infurmazione di versione.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2484 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 msgid "Pass&word:" -msgstr "&Parolla d'intrata :" +msgstr "Parolla d'&intrata :" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" @@ -5687,9 +5774,9 @@ msgid "Passive mode" msgstr "Modu passivu" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "" "U modu passivu hè statu sceltu cum'è modu predefinitu di trasferimentu." @@ -5699,30 +5786,30 @@ msgstr "A parolla d'intrata hè richiesta" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/search.cpp:151 msgid "Path" msgstr "Passeghju" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3005 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2153 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "" "U passeghju ùn pò micca esse custruttu per u cartulare %s è sottu-cartulare " "%s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2316 msgid "Path not found:" msgstr "U passeghju ùn esiste micca :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 msgid "Paths" msgstr "Passeghji" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1254 +#: ../../locales/../src/interface/edithandler.cpp:1344 +#: ../../locales/../src/interface/edithandler.cpp:1354 msgid "Pending removal" msgstr "In attesa di ritiru" @@ -5730,13 +5817,13 @@ msgid "Permission" msgstr "Permessu" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1027 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Permission denied" msgstr "Permessu ricusatu" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:155 msgid "Permissions" msgstr "Permessi" @@ -5744,12 +5831,12 @@ msgid "Platform:" msgstr "Piattaforma :" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." msgstr "" -"Verificate nantu à https://filezilla-project.org/probe.php chì u servu sia " +"Verificate nant'à https://filezilla-project.org/probe.php chì u servu sia " "lanciatu è cuntrollate precisamente e vostre preferenze torna." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 @@ -5758,15 +5845,15 @@ "outgoing connection to arbitrary ports." msgstr "" "Cunfigurate i vostri 'router' è parafochi di manera chì FileZilla possa " -"stabilisce cunnessioni surtente nantu à porti scelti arbitrariamente." +"stabilisce cunnessioni surtente nant'à porti scelti arbitrariamente." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Disattivate e preferenze cum'è 'Modu DMZ' o 'Modu Ghjocu' di u vostru " "'router'." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5782,7 +5869,7 @@ msgid "Please enter a custom time format." msgstr "Scrivite una forma persunalizata d'ora." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:741 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Scrivite una data in a forma AAAA-MM-GG cum'è per indettu 2010-07-18." @@ -5803,7 +5890,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Scrivite un novu nome per u filtru cupiatu." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:272 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Scrivite un novu nome per u gruppu di filtri \"%s\"" @@ -5838,17 +5925,6 @@ msgid "Please enter a password for this server:" msgstr "Scrivite una parolla d'intrata per stu servu :" -#: ../../locales/../src/interface/QueueView.cpp:2109 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Scrivite u passeghju è u prugrammu à eseguisce.\n" -"P.i. : c:\\passeghju\\prugrammu.exe cù MS Windows o /passeghju/prugrammu cù " -"Unix.\n" -"Ghjè pussibule d'indicà i parametri di u prugrammu dinù." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5856,7 +5932,7 @@ "Scrivite un numeru sceltu trà 10 è 9999 seconde per u cumportu d'attesa o 0 " "per disattivà i cumporti d'attesa." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Please enter a unique name for this filter set" msgstr "Scrivite un nome unicu per stu gruppu di filtri" @@ -5864,11 +5940,11 @@ msgid "Please enter a username for this server:" msgstr "Scrivite un nome d'utilizatore per stu servu :" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Scrivite una stesa di porti accettevule." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Scrivite un URL induve si trova u vostru indirizzu esternu" @@ -5879,7 +5955,7 @@ msgstr "" "Scrivite un limitu di velocità di l'incaricamenti più maiò o uguale à 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5887,14 +5963,28 @@ "Scrivite una cummanda FTP cruda.\n" "L'impiegu d'una tale cummanda spurgulerà u 'cache' di u cartulare." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1741 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Scrivite u passeghju sanu di un prugramma è i so parametri. Sta cumanda serà " +"eseguita quandu a fila d'attesa serà trattata.\n" +"P.i. : c:\\passeghju\\prugramma.exe cù MS Windows o /passeghju/prugramma cù " +"Unix.\n" +"Fate casu di scrive bè e cumande è i so parametri s'elli cuntenenu spazii." + +#: ../../locales/../src/interface/LocalListView.cpp:924 +#: ../../locales/../src/interface/LocalTreeView.cpp:1153 +#: ../../locales/../src/interface/RemoteListView.cpp:1301 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Please enter the name of the directory which should be created:" msgstr "Scrivite u nome di u cartulare chì hà da esse creatu :" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2614 msgid "Please enter the name of the file which should be created:" msgstr "Scrivite u nome di u schedariu chì hà da esse creatu :" @@ -5902,12 +5992,12 @@ msgid "Please enter username and password for this server:" msgstr "Scrivite u nome d'utilizatore è a parolla d'intrata per stu servu :" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Scrivite u vostru indirizzu IP esternu" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5926,7 +6016,7 @@ "Ci vole à fà casu à seguità precisamente l'instruzzione perchè una gattiva " "cunfigurazione impediscerà u successu di e cunnessioni FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5935,12 +6025,12 @@ "è chì l'indirizzu di u risolutore d'indirizzi sia statu scrittu " "currettamente." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:133 msgid "Please make sure the requested locale is installed on your system." msgstr "" -"Assicuratevvi chì a lingua richiesta sia installata nantu à u vostru sistemu." +"Assicuratevvi chì a lingua richiesta sia installata nant'à u vostru sistema." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5959,19 +6049,19 @@ "trojans or other malware. This might raise a false alarm you can safely " "discard." msgstr "" -"Nota : FileZilla ùn hà micca d'azzione nantu à u servu per a scelta di i " +"Nota : FileZilla ùn hà micca d'azzione nant'à u servu per a scelta di i " "porti. Dunque, ghjè pussibule ch'un servu scegli un portu cunsideratu da u " "vostru parafocu cum'è adupratu da Cavalli di Troia è altri prugrammi " "periculosi. Quessu pò generà un alarmu falsu chì pò esse ignuratu senza " "penseri." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:688 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." msgstr "" -"Fate casu chì a cunservazione di a data è ora di l'incaricamenti nantu à i " -"servi FTP, FTPS è FTPES funziuneghja solu s'elli suppurtanu a cummanda MFMT." +"Fate casu chì a cunservazione di a data è ora di l'incaricamenti nant'à i " +"servi FTP, FTPS è FTPES funziuneghja solu s'elli accettanu a cummanda MFMT." #: ../../locales/../src/interface/resources/xrc/settings.xrc:179 msgid "" @@ -5981,20 +6071,20 @@ "Fate casu chì qualchì servu risicheghja di sbannivvi s'è voi pruvate di " "ricunnettavvi troppu aspessu o cù cumparti troppu corti." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " "previously." msgstr "" "Impiegate torna st'assistente s'è u vostru ambiente cambia o s'elli ci sò " -"prublemi avà cù servi chì funzionavanu bè prima." +"penseri avà cù servi chì prima funzionavanu bè." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Please select an action:" msgstr "Selezziunate un azzione :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 msgid "Please select the categories you would like to import." msgstr "Selezziunate e categurie chì ci vole à impurtà." @@ -6027,7 +6117,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Selezziunate i novi attributi per i schedarii selezziunati." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -6046,8 +6136,8 @@ msgid "Positio&n of the message log:" msgstr "Pusizio&ne di u ghjurnale di i messaghji :" -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Postal code:" msgstr "Codice pustale :" @@ -6059,12 +6149,12 @@ msgid "Preallocation" msgstr "Preallucazione" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:337 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 msgid "Predefined Sites" msgstr "Siti Predefiniti" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:687 msgid "Preserving file timestamps" msgstr "Cunservà data è ora di i schedarii" @@ -6072,7 +6162,7 @@ msgid "Preview:" msgstr "Avvistu :" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket.cpp:1344 msgid "Primary connection and data connection certificates don't match." msgstr "" "I certificati di a cunnessione primaria è di a cunnessione di dati ùn " @@ -6084,13 +6174,13 @@ #: ../../locales/../src/interface/cmdline.cpp:18 msgid "Print version information to stdout and exit" -msgstr "Stampà l'infurmazioni di versione nantu à 'stdout' è esce" +msgstr "Stampà l'infurmazioni di versione nant'à 'stdout' è esce" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 msgid "Prioritize directories (default)" msgstr "Dà a priurità à i cartulari (predefinitu)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Priority" msgstr "Priurità" @@ -6100,7 +6190,7 @@ "and your CPU architecture will be submitted to the server." msgstr "" "Pulitica di Cunfidenzialità : Solu l'infurmazioni cum'è a versione di " -"FileZilla, u nome di u vostru sistemu, è l'architettura di u vostru " +"FileZilla, u nome di u vostru sistema, è l'architettura di u vostru " "prucessore, seranu mandate à u servu." #: ../../locales/../src/interface/resources/xrc/settings.xrc:629 @@ -6117,27 +6207,27 @@ msgstr "Parolla d'intrata di u Pro&xy :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "Trattà è mette in a &lista d'attesa" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Process file table overflow" msgstr "Trapienu di a tavula di schedariu di prucedutu" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:121 #, c-format msgid "Processed %s in %s." msgstr "Trattatu %s di %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Protocol not supported" -msgstr "Protocollu micca suppurtatu" +msgstr "Protocollu micca accettatu" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1091 msgid "Protocol not supported on given socket type" -msgstr "Protocollu micca suppurtatu per u tipu di socket specificatu" +msgstr "Protocollu micca accettatu per u tipu di socket specificatu" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" @@ -6152,42 +6242,42 @@ msgid "Proxy &user:" msgstr "&Utilizatore di u proxy :" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:462 msgid "Proxy authentication failed" msgstr "Fiascu di l'autenticazione di u Proxy" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/transfersocket.cpp:106 +#: ../../locales/../src/engine/transfersocket.cpp:118 #, c-format msgid "Proxy handshake failed: %s" msgstr "Fiascu di u toccamanu di u proxy : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4162 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "L'ospite di u proxy principiu cù '[' ma u segnu ']' ùn esiste micca." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:321 #, c-format msgid "Proxy reply: %s" msgstr "Risposta di u Proxy : %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:503 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "A richiesta à u proxy hè fiasca. Risposta da u proxy : %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:376 #, c-format msgid "Proxy request failed: %s" msgstr "A richiesta à u proxy hè fiasca : %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:527 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "A richiesta à u proxy hè fiasca : u tipu d'indirizzu in a risposta CONNECT " "hè scunnisciutu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4191 msgid "Proxy set but proxy host or port invalid" msgstr "" "Proxy specificatu ma l'ospite di u proxy, o u portu, ùn hè micca accettevule" @@ -6204,7 +6294,7 @@ msgid "Public permissions" msgstr "Permessi publichi" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2596 msgid "Queue has been fully processed" msgstr "A lista d'attesa hè stata cumpletamente trattata" @@ -6223,28 +6313,29 @@ msgid "Queue: empty" msgstr "Lista d'attesa : viota" -#: ../../locales/../src/interface/QueueView.cpp:438 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Schedarii in a lista d'attesa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3297 msgid "Queueing:" msgstr "Lista d'attesa :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "Riavvià l'urdinator&e" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" +msgstr "&Riavvià l'urdinatore" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "Arburiscenza di u cartulare all&untanatu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:460 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "R&eset and requeue selected files" msgstr "Riavvià è rim&ette tutti i schedarii selezziunati in a lista d'attesa" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "Cummanda FTP cruda" @@ -6261,7 +6352,7 @@ msgid "Re&name" msgstr "Ri&numà" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6277,12 +6368,12 @@ msgid "Read-only" msgstr "Lettura sola" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/interface/Mainfrm.cpp:1025 msgid "Really cancel current operation?" msgstr "Site sicuru di vulè abbandunà l'operazione in corsu ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1395 +#: ../../locales/../src/interface/search.cpp:1185 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6292,21 +6383,21 @@ msgstr[1] "" "Site sicuru di vulè caccià %d cartulari cù i so cuntenuti di u servu ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1392 +#: ../../locales/../src/interface/search.cpp:1183 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Site sicuru di vulè caccià %d schedariu di u servu ?" msgstr[1] "Site sicuru di vulè caccià %d schedarii di u servu ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1400 +#: ../../locales/../src/interface/search.cpp:1189 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Site sicuru di vulè caccià %s è %s di u servu ?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Site sicuru di vulè caccià tutti i schedarii è/o i cartulari selezziunati di " @@ -6318,52 +6409,60 @@ "Site sicuru di vulè caccià tutti i schedarii è/o i cartulari selezziunati di " "u vostru urdinatore ?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Reason" msgstr "Raghjone" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2589 msgid "Reboot now" -msgstr "Riavvià l'urdinatore avà" +msgstr "Rilancià avà" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 msgid "Rec&urse into subdirectories" msgstr "Inc&urpurà i sottu-cartulari" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket.cpp:326 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Alerta TLS ricevuta da u servu : %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:2928 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Ricezzione d'una lista di cartulare chì pare esse in forma EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:1969 +#: ../../locales/../src/engine/directorylistingparser.cpp:1985 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Ricezzione d'una linea di più di 10000 caratteri, abbandonu in corsu." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket.cpp:1327 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"A catena di certificatu ricevuta ùn pò micca esse verificata. U statu di " +"verificazione hè %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1006 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "I dati ricevuti sò alterati" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:554 msgid "Received invalid character in version information" msgstr "Caratteri micca accettevule ricevuti in l'infurmazione di versione" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket.cpp:329 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Alerta TLS scunnisciuta %d ricevuta da u servu" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:547 msgid "Received version information is too large" msgstr "L'infurmazione di versione ricevuta hè troppu maiò" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6381,57 +6480,58 @@ msgid "Reconnects to the last used server" msgstr "Si cunnetta torna à l'ultimu servu adupratu" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:99 msgid "Recursively adding files to queue." msgstr "Aghjunghje schedarii à a lista d'attesa da una manera recursiva." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:105 msgid "Recursively changing permissions." msgstr "Cambià i permessi da una manera recursiva." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:102 msgid "Recursively deleting files and directories." msgstr "Squassà cartulari è schedarii da una manera recursiva." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:17 +msgid "Red" +msgstr "Rossu" + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:631 #, c-format msgid "Redirection to invalid or unsupported URI: %s" -msgstr "Ridirezzione ver di un URL micca accettevule o micca suppurtatu : %s" +msgstr "Ridirezzione ver di un URL micca accettevule o micca accettatu : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:638 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "" -"Ridirezzione ver di un indirizzu micca accettevule o micca suppurtatu : %s" +"Ridirezzione ver di un indirizzu micca accettevule o micca accettatu : %s" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 msgid "Refresh the file and folder lists" msgstr "Attualizà e liste di i schedarii è di i cartulari" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3840 msgid "Remember passwords?" msgstr "Arricurdassi di e parolle d'intrata ?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1101 msgid "Remote" msgstr "Alluntanatu" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket.cpp:966 msgid "Remote certificate not trusted." -msgstr "Certificatu alluntanatu micca degnu di cridenza." +msgstr "Certificatu alluntanatu micca degnu di cunfidenza." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Remote file" msgstr "Schedariu alluntanatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:666 +#: ../../locales/../src/interface/search.cpp:671 msgid "Remote file search" msgstr "Ricerca di schedarii alluntanati" @@ -6439,7 +6539,7 @@ msgid "Remote filters:" msgstr "Filtri alluntanati :" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1092 msgid "Remote path" msgstr "Passeghju alluntanatu" @@ -6450,22 +6550,22 @@ "supported by the current site's servertype (%s)." msgstr "" "U passeghju alluntanatu ùn pò micca esse determinatu. Assicuratevvi ch'ellu " -"hè un passeghju esplicitu accettevule è suppurtatu da u tipu di servu (%s) " -"di u situ currente." +"hè un passeghju esplicitu accettevule è accettatu da u tipu di servu (%s) di " +"u situ currente." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the servertype (%s) selected on the parent site." msgstr "" "U passeghju alluntanatu ùn pò micca esse determinatu. Assicuratevvi ch'ellu " -"hè un passeghju esplicitu accettevule è suppurtatu da u tipu di servu (%s) " -"selezziunatu nantu à u situ parente." +"hè un passeghju esplicitu accettevule è accettatu da u tipu di servu (%s) " +"selezziunatu nant'à u situ parente." #: ../../locales/../src/interface/bookmarks_dialog.cpp:416 #: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1128 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "U passeghju alluntanatu ùn pò micca esse determinatu. Assicuratevvi ch'ellu " @@ -6475,38 +6575,38 @@ msgid "Remote path could not be parsed." msgstr "U passeghju alluntanatu ùn hà micca pussutu esse determinatu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3184 msgid "Remote path handling:" msgstr "Trattamentu di u passeghju alluntanatu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 msgid "Remote path:" msgstr "Passeghju alluntanatu :" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:523 msgid "Remote site:" msgstr "Situ alluntanatu :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 msgid "Remove &all" msgstr "Caccià &tuttu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:457 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:475 msgid "Remove &selected" msgstr "&Caccià l'elementi selezziunati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 #: ../../locales/../src/interface/asyncrequestqueue.cpp:292 msgid "Rename file" msgstr "Rinumà u schedariu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Rename selected directory" msgstr "Rinumà u cartulare selezziunatu" @@ -6515,72 +6615,72 @@ msgid "Rename selected files and directories" msgstr "Rinumà i schedarii è i cartulari selezziunati" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3344 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2349 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Rinumà '%s' ver di '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3560 msgid "Reporting bugs and feature requests" -msgstr "Riferisce un prublemu o dumandà un migliuramentu" +msgstr "Riferisce un penseru o dumandà un migliuramentu" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:367 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Richiesta fiasca : u cliente ùn impiega micca 'identd' (o hè inaccessibile " "da u servu)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:370 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Richiesta fiasca : L'\"identd\" di u cliente ùn pò micca cunfirmà a catena " "ID di l'utilizatore" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:364 msgid "Request rejected or failed" msgstr "Richiesta ricusata o fiasca" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:517 msgid "Require explicit FTP over TLS" msgstr "Richiede FTP esplicitu cù TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:518 msgid "Require implicit FTP over TLS" msgstr "Richiede FTP sottintesu cù TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Reset and requeue &all" msgstr "Riavvià è rimette tutti i schedarii in a lista d'&attesa" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Resolved protocol is unknown" msgstr "U protoccollu risoltu hè scunnisciutu" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1079 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:444 #, c-format msgid "Resolving address of %s" msgstr "Risuluzione di l'indirizzu di %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Resource temporarily unavailable" msgstr "Risorse timpurariamente indispunibule" #: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:345 msgid "Response:" msgstr "Risposta :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3130 msgid "Results:" msgstr "Risultati :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" @@ -6591,22 +6691,22 @@ "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." msgstr "" -"U ripigliu di u trasferimentu di i schedarii ASCII pò causà prublemi s'ell'u " +"U ripigliu di u trasferimentu di i schedarii ASCII pò causà penseri s'ell'u " "servu impiega una forma sfarenta di fine di linea chì quella di u cliente." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1277 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:828 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Ricuperazione di a lista di u cartulare \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1274 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825 msgid "Retrieving directory listing..." msgstr "Ricuperazione di a lista di u cartulare..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Ricuperazione di l'indirizzu IP esternu dapoi %s" @@ -6619,17 +6719,17 @@ msgid "S&how the Site Manager on startup" msgstr "Apre u Ghjestiunariu di Siti à u principiu di FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Piantà l'urdinatore" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" +msgstr "&Fermà l'urdinatore" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 msgid "S&top" msgstr "Pian&tà" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "Mette l'&urdinatore in veghja" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" +msgstr "&Attimpà l'urdinatore" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" @@ -6643,44 +6743,41 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:141 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "U proxy SOCKS4 hà da cunnettassi à : %s" +#: ../../locales/../src/engine/proxy.cpp:169 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 msgid "SQLite:" msgstr "SQLite :" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "Arregistrà e preferenze ?" #: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 msgid "Saving of password has been disabled by your system administrator." msgstr "" "L'arregistramentu di e parolle d'intrata hè statu disattivatu da u vostru " "amministratore." #: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:987 msgid "Saving of passwords has been disabled by you." msgstr "Avete disattivatu l'arregistramentu di e parolle d'intrata." -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "Esame di i schedarii à aghjunghje à a lista d'attesa" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "Esame di i schedarii à incaricà" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3062 msgid "Search &conditions:" msgstr "&Cundizioni di ricerca :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3044 msgid "Search &directory:" msgstr "Passeghju &di ricerca :" @@ -6692,16 +6789,20 @@ msgid "Search server for files" msgstr "Ricerca di schedarii in u servu" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +msgid "Search type:" +msgstr "Tipu di ricerca :" + #: ../../locales/../src/interface/statusbar.cpp:502 msgid "Security information" msgstr "Infurmazione di sicurità" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Vede dinù : https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2375 msgid "Sele&ct server" msgstr "Selezziunà u servu" @@ -6720,7 +6821,7 @@ "Selezziunà un azzione predefinita à fà s'è u schedariu di destinazione d'un " "trasferimentu esiste dighjà." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1537 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Selezziunà l'editore predefinitu" @@ -6746,25 +6847,30 @@ msgid "Select file containing private key" msgstr "Selezziunà u schedariu cuntenendu a chjave privata" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Selezziunà u schedariu per l'espurtazione di i dati" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +#, fuzzy +msgid "Select file for exported filters" +msgstr "Selezziunà u schedariu per l'espurtazione di i siti" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1415 msgid "Select file for exported queue" msgstr "Selezziunà u schedariu per l'espurtazione di a lista d'attesa" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Selezziunà u schedariu per l'espurtazione di e preferenze" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2265 msgid "Select file for exported sites" msgstr "Selezziunà u schedariu per l'espurtazione di i siti" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Selezziunà u schedariu per l'impurtazione di e preferenze" @@ -6776,11 +6882,11 @@ msgid "Select filename for converted key file" msgstr "Selezziunà u nome per u schedariu di chjave convertitta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2926 msgid "Select how these files should be opened." msgstr "Selezziunà chì manera à impiegà per apre sti schedarii." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:847 msgid "Select target download directory" msgstr "Selezziunà u cartulare di destinazione per i telecaricamenti" @@ -6788,72 +6894,72 @@ msgid "Select target filename" msgstr "Selezziunà u nome di schedariu di destinazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 msgid "Select the categories to export:" msgstr "Selezziunà e categurie à espurtà :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1493 msgid "Select the private data you would like to delete." msgstr "Selezziunà i dati persunali ch'ellu ci vole à squassà." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:806 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "%d cartulare selezziunatu cù u so cuntenutu per u trasferimentu." msgstr[1] "%d cartulari selezziunati cù i so cuntenuti per u trasferimentu." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d cartulare selezziunatu." msgstr[1] "%d cartulari selezziunati." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:804 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "%d schedariu selezziunatu per u trasferimentu." msgstr[1] "%d schedarii selezziunati per u trasferimentu." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "%d schedariu selezziunatu. Dimensione tutale : %s" msgstr[1] "%d schedarii selezziunati. Dimensione tutale : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "%d schedariu selezziunatu. Dimensione tutale : Almenu %s" msgstr[1] "%d schedarii selezziunati. Dimensione tutale : Almenu %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:810 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s è %s selezziunati per u trasferimentu." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "%s è %s selezziunati. Dimensione tutale : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s è %s selezziunati. Dimensione tutale : Almenu %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1482 +#: ../../locales/../src/interface/edithandler.cpp:1556 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "L'editore selezziunatu ùn esiste micca." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1854 msgid "Selected file already being edited" msgstr "U schedariu selezziunatu hè dighjà in corsu di mudificazione" @@ -6861,19 +6967,19 @@ msgid "Selected file is already loaded" msgstr "U schedariu selezziunatu hè dighjà caricatu" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "Selected file is already opened" msgstr "U schedariu selezziunatu hè dighjà apertu" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1726 msgid "Selected file is still being edited" msgstr "U schedariu selezziunatu hè torna in corsu di mudificazione" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Selected filter only works for local files." msgstr "U filtru selezziunatu funziuneghja solu per i schedarii lucali." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:291 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6882,7 +6988,7 @@ "sfarente.\n" "Impiegate un indetta particulare à u situ per stu servu." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:302 msgid "Selected port usually in use by a different protocol." msgstr "" "D'abbitudine, u portu selezziunatu hè impiegatu da un altru protoccollu." @@ -6896,68 +7002,68 @@ msgstr "" "Mandà una cummanda persunalizata à u servu s'ellu ùn hè micca dispunibule" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267 msgid "Sending keep-alive command" msgstr "Mandà in corsu d'una cummanda sempre-vivu" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Numeru di seria :" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:322 msgid "Server &Type:" msgstr "&Tipu di servu :" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket.cpp:855 msgid "Server did not properly shut down TLS connection" msgstr "U servu ùn hà micca chjosu currettamente a cunnessione TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:895 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:948 msgid "Server does not support non-ASCII characters." -msgstr "U servu ùn supporta micca i caratteri micca ASCII." +msgstr "U servu ùn accetta micca i caratteri micca ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4107 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "" -"U servu ùn supporta micca u ripigliu di trasferimentu per i schedarii cù una " +"U servu ùn accetta micca u ripigliu di trasferimentu per i schedarii cù una " "dimensione > %d Go." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4103 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -"U servu ùn supporta micca u ripigliu di trasferimentu per i schedarii cù una " +"U servu ùn accetta micca u ripigliu di trasferimentu per i schedarii cù una " "dimensione > %d Go. A fine di u trasferimentu si ferà quandu a dimensione di " "i schedarii lucale & servu currisponderà." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2433 msgid "Server does not support resume of files > 2GB." msgstr "" -"U servu ùn supporta micca u ripigliu di trasferimentu per i schedarii cù una " +"U servu ùn accetta micca u ripigliu di trasferimentu per i schedarii cù una " "dimensione > 2 Go." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2429 msgid "Server does not support resume of files > 4GB." msgstr "" -"U servu ùn supporta micca u ripigliu di trasferimentu per i schedarii cù una " +"U servu ùn accetta micca u ripigliu di trasferimentu per i schedarii cù una " "dimensione > 4 Go." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4116 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -"U servu pò ùn micca supportà u ripigliu di trasferimentu per i schedarii cù " +"U servu pò ùn micca accettà u ripigliu di trasferimentu per i schedarii cù " "una dimensione > %d Go. A fine di u trasferimentu si ferà quandu a " "dimensione di i schedarii lucale & servu currisponderà." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:844 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6965,11 +7071,11 @@ "U servu pò richiede un contu. Pruvate d'indicà un contu impieghendu u " "Ghjestiunariu di Siti" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "U servu hà riturnatu un passeghju viotu." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:599 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6977,13 +7083,13 @@ "U servu hà mandatu una richiesta cumplementare d'identificazione. Ci vole à " "impiegà un tipu interattivu d'identificazione." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3671 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "U servu hà mandatu una risposta passiva cù un indirizzu micca trasferevule. " "Fiascu di u modu passivu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3666 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6991,65 +7097,76 @@ "U servu hà mandatu una risposta passiva cù un indirizzu micca trasferevule. " "Indirizzu rimpiazzatu da quellu di u servu." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "U servu hà mandatu una risposta micca prevista." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket.cpp:1239 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"U servu hà mandatu una catena di certificatu micca ordinata in viulazione cù " +"e specificazioni TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "Server to client MAC:" msgstr "MAC per a cunnessione servu à cliente :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2084 msgid "Server to client cipher:" msgstr "Cudificazione per a cunnessione servu à cliente :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2438 msgid "Server&type:" msgstr "&Tipu di servu :" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Server/Local file" msgstr "Schedariu Servu / Lucale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1718 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2361 msgid "Server:" msgstr "Servu :" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" -msgstr "Ditaglii di a sessione" +msgstr "Detaglii di a sessione" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "Definisce a priurità" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3492 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2230 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Definisce i permessi da '%s' à '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:791 +#: ../../locales/../src/engine/transfersocket.cpp:794 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize chjamatu senza socket" #: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" -msgstr "Preferenze di FileZilla" +msgstr "Preferenze" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 msgid "Settings directory:" msgstr "Cartulare di preferenze :" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "Affissà a &bolle di nutificazione" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" msgstr "Presentà a lista c&ruda di u cartulare" @@ -7058,20 +7175,20 @@ msgid "Show &welcome dialog..." msgstr "Presentà u dialogu di &benvenuta..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2207 msgid "Show both directory trees and continue comparing?" msgstr "Presentà l'arburiscenze per i dui lati è cuntinuà u paragone ?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:217 msgid "Show details" -msgstr "Presentà i ditaglii" +msgstr "Presentà i detaglii" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 msgid "Show details about custom date and time formats" msgstr "" -"Presentà i ditaglii apprupositu di e forme persunalizate di data è d'ora" +"Presentà i detaglii apprupositu di e forme persunalizate di data è d'ora" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:445 msgid "Shows available TLS ciphers" msgstr "Presentà e cudificazioni TLS dispunibule" @@ -7079,15 +7196,15 @@ msgid "Shows this help dialog" msgstr "Presentà stu dialogu d'aiutu" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2585 msgid "Shutdown now" -msgstr "Piantà u sistemu" +msgstr "Piantà u sistema" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 msgid "Signature algorithm:" msgstr "Cudificazione di a firma :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "Site &Manager entries" msgstr "Elementi di u Ghjestiunariu di Siti" @@ -7095,56 +7212,55 @@ msgid "Site Manager" msgstr "Ghjestiunariu di Siti" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:993 msgid "Site Manager - Cannot remember password" msgstr "Ghjestiunariu di Siti - Ùn si pò arricurdassi di a parolla d'intrata" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:961 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:974 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1006 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1023 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1036 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1070 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1138 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "Site Manager - Invalid data" msgstr "Ghjestiunariu di Siti - Dati micca accettevule" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "U Ghjestiunariu di Siti hè dighjà apertu" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 +#: ../../locales/../src/interface/sitemanager.cpp:481 #: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:523 +#: ../../locales/../src/interface/sitemanager.cpp:535 +#: ../../locales/../src/interface/sitemanager.cpp:691 +#: ../../locales/../src/interface/sitemanager.cpp:768 msgid "Site does not exist." msgstr "U situ ùn esiste micca." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:492 msgid "Site path has to begin with 0 or 1." msgstr "Un passeghju di situ hà da principia cù 0 o 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:529 +#: ../../locales/../src/interface/sitemanager.cpp:685 +#: ../../locales/../src/interface/sitemanager.cpp:762 msgid "Site path is malformed." msgstr "U passeghju di situ hè malfuttutu." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:250 msgid "Site-specific bookmarks" msgstr "Indette particulare per stu situ" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:528 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7154,7 +7270,7 @@ "in u Ghjestiunariu di Siti.\n" "Vulete aghjunghje l'ozzioni di sta cunnessione à u Ghjestiunariu di Siti ?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Size" msgstr "Dimensione" @@ -7166,50 +7282,50 @@ msgid "Size unknown" msgstr "Dimensione scunnisciuta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1436 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" -msgstr "Saltà u schedariu" +msgstr "Ignurà u schedariu" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1149 +#: ../../locales/../src/engine/ControlSocket.cpp:1166 +#: ../../locales/../src/engine/ControlSocket.cpp:1190 +#: ../../locales/../src/engine/ControlSocket.cpp:1268 #, c-format msgid "Skipping download of %s" -msgstr "Saltà u telecaricamentu di %s" +msgstr "Ignurà u telecaricamentu di %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/ControlSocket.cpp:1153 +#: ../../locales/../src/engine/ControlSocket.cpp:1169 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping upload of %s" -msgstr "Saltà l'incaricamentu di %s" +msgstr "Ignurà l'incaricamentu di %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Socket address outside address space" msgstr "L'indirizzu di socket hè fora di u spaziu d'indirizzi" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Socket already connected" msgstr "Socket dighjà cunnettu" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Socket has been shut down" msgstr "Socket hè statu piantatu" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket not connected" msgstr "Socket micca cunnettu" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "Socket type not supported for address family" -msgstr "Tipu di socket micca suppurtatu per a famiglia d'indirizzi" +msgstr "Tipu di socket micca accettatu per a famiglia d'indirizzi" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1155 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Certi schedarii sò sempre in corsu di mudificazione o anu bisognu d'esse " @@ -7228,11 +7344,11 @@ msgid "Sort directories inline" msgstr "Classificà i cartulari in-linea" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:469 msgid "Sort order cannot be changed if comparing directories." msgstr "" -"L'ordine di classificazione ùn pò micca esse mudificatu mentre u paragone di " -"i cartulari." +"L'ordine di classificazione ùn pò micca esse mudificatu durante u paragone " +"di i cartulari." #: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 msgid "Sorting" @@ -7242,7 +7358,7 @@ msgid "Sorting &mode:" msgstr "Modu di classificazione :" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:104 msgid "Source and path of the drop operation are identical" msgstr "" "L'urigine è u passeghju di l'operazione di Sguillà & Depone sò listessi" @@ -7251,7 +7367,7 @@ msgid "Source and target file may not be the same" msgstr "U schedariu d'urigine è di destinazione ùn ponu micca esse listessi" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:144 msgid "Source and target of the drop operation are identical" msgstr "" "L'urigine è a destinazione di l'operazione di Sguillà & Depone sò listessi" @@ -7260,7 +7376,7 @@ msgid "Source file:" msgstr "Schedariu d'urigine :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3782 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 msgid "Speed Limits" @@ -7293,7 +7409,7 @@ msgid "Stable, beta and nightly versions" msgstr "Versioni stabule, beta è create di notte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2569 msgid "Start transfer &immediately" msgstr "Principià u trasferimentu &avà" @@ -7301,19 +7417,19 @@ msgid "Start with opened Site Manager" msgstr "Principià cù l'apertura di u Ghjestiunariu di Siti" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" -msgstr "Iniziu di u cuntrolu automaticu di e nove versioni in %s\n" +msgstr "Iniziu di u cuntrolu autumaticu di e nove versioni in %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2152 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1485 #, c-format msgid "Starting download of %s" msgstr "Lanciu di u telecaricamentu di %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2155 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1488 #, c-format msgid "Starting upload of %s" msgstr "Lanciu di l'incaricamentu di %s" @@ -7322,30 +7438,30 @@ msgid "Starts the local site in the given path" msgstr "Lancia u situ lucale in u passeghju indicatu" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "Statu o pruvincia :" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1093 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Status" msgstr "Statu" #: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:369 msgid "Status:" msgstr "Statu :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "Pi&antà è caccià tuttu" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:42 msgid "Stop recursive operation" msgstr "Piantà l'operazione recursiva" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Carrughju :" @@ -7361,11 +7477,11 @@ msgid "Summary of test results:" msgstr "Riassuntu di i resultati di a prova :" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2593 msgid "Suspend now" msgstr "Mette in veghja subitu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7373,29 +7489,33 @@ "E leie simboliche (symlink) ver di i schedarii ùn sò micca affette da sta " "scelta, chì tale leie sò sempre squassate." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3843 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:232 +#: ../../locales/../src/interface/state.cpp:246 +#: ../../locales/../src/interface/state.cpp:252 +#: ../../locales/../src/interface/state.cpp:262 +#: ../../locales/../src/interface/state.cpp:349 +#: ../../locales/../src/interface/state.cpp:357 +#: ../../locales/../src/interface/state.cpp:365 +#: ../../locales/../src/interface/state.cpp:949 +#: ../../locales/../src/interface/state.cpp:957 +#: ../../locales/../src/interface/state.cpp:963 +#: ../../locales/../src/interface/state.cpp:972 +#: ../../locales/../src/interface/state.cpp:998 msgid "Synchronized browsing" msgstr "Sfugliendu sincrunizatu" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:364 msgid "Synchronized browsing has been disabled." msgstr "Avà, u sfugliendu sincrunizatu ùn hè più attivu." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:109 +msgid "Synchronizing directories." +msgstr "Sincrunizazione di cartulari." + +#: ../../locales/../src/interface/quickconnectbar.cpp:84 +#: ../../locales/../src/interface/quickconnectbar.cpp:121 msgid "Syntax error" msgstr "Sbagliu di sintassa" @@ -7404,44 +7524,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2318 +#: ../../locales/../src/interface/Mainfrm.cpp:2361 msgid "Syntax error in command line" msgstr "Sbagliu di sintassa in a linea di cummanda" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 msgid "System" -msgstr "Sistemu" +msgstr "Sistema" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 msgid "System details" msgstr "Detaglii di u sistema" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "System limit of open files exceeded" msgstr "U limitu di u numeru di schedarii aperti hè ghjuntu" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1090 msgid "System's network subsystem has failed" -msgstr "U sottu-sistemu reta di u sistemu hè fiascu" +msgstr "U sottu-sistema di reta di u sistema hè fiascu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:102 msgid "T&oolbar" msgstr "&Barra d'attrezzi" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:287 msgid "TLS connection established, sending HTTP request" msgstr "Cunnessione TLS stabilita, mandà d'una dumanda HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 msgid "TLS connection established, waiting for welcome message..." msgstr "Cunnessione TLS stabilita, in attesa di u messaghju di benvenuta..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 msgid "TLS connection established." msgstr "Cunnessione TLS stabilita." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:490 msgid "TTL expired" msgstr "TTL scadutu" @@ -7453,44 +7573,48 @@ msgid "Target file:" msgstr "Schedariu di destinazione :" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2630 msgid "Target filename already exists!" msgstr "U nome di u schedariu di destinazione esiste dighjà !" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1613 msgid "Target filename already exists, really continue?" msgstr "" "U nome di u schedariu di destinazione esiste dighjà ! Vulete cuntinuà ?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Temporary failure in name resolution" msgstr "Fiascu timpurariu in a risuluzione di u nome" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Prova compia bè" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Risultati di a prova" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4121 msgid "Testing resume capabilities of server" msgstr "Prova di a capacità di u servu à ripiglià i trasferimenti" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:745 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "" "U Ghjestiunariu di Siti ùn pò micca esse impiegatu senza avè riparatu i " "schedarii." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " "then." msgstr "" "U Ghjestiunariu di Siti hè apertu in un altra copia di FileZilla 3.\n" -"Site sicuru di vulè continuà ? Tutti i cambiamenti fatti in u Ghjestiunariu " -"di Siti seranu persi." +"Vulete cuntinuà ? Tutti i cambiamenti fatti in u Ghjestiunariu di Siti ùn " +"seranu micca arregistrati." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7498,39 +7622,39 @@ "U Ghjestiunariu di Siti hè apertu in un altra copia di FileZilla 3.\n" "Ci vole à chjodellu osinnò i dati ùn ponu micca esse cacciati." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "L'indirizzu entritu era : %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "The ai_family member is not supported" -msgstr "U membru ai_family ùn hè micca suppurtatu" +msgstr "U membru ai_family ùn hè micca accettatu" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "The ai_socktype member is not supported" -msgstr "U membru ai_socktype ùn hè micca suppurtatu" +msgstr "U membru ai_socktype ùn hè micca accettatu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:781 +#: ../../locales/../src/interface/sitemanager.cpp:673 msgid "The bookmark could not be added." msgstr "L'indetta ùn pò micca esse aghjunta." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:750 msgid "The bookmarks could not be cleared." msgstr "L'indette ùn ponu micca esse squassate." #: ../../locales/../src/interface/statusbar.cpp:464 msgid "The connection is encrypted. Click icon for details." msgstr "" -"A cunessionne hè cifrata. Cliccu nantu à l'icona per avè più di ditaglii." +"A cunessionne hè cifrata. Cliccu nant'à l'icona per avè più di detaglii." #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 msgid "" "The custom date format is invalid or contains unsupported format specifiers." msgstr "" "A forma persunalizata di data ùn hè micca accettevule o cuntene " -"specificazioni di forma micca suppurtate." +"specificazioni di forma micca accettate." #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." @@ -7541,19 +7665,19 @@ "The custom time format is invalid or contains unsupported format specifiers." msgstr "" "A forma persunalizata d'ora ùn hè micca accettevule o cuntene specificazioni " -"di forma micca suppurtate." +"di forma micca accettate." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/transfersocket.cpp:142 #, c-format msgid "The data connection could not be established: %s" msgstr "A cunnessione di dati ùn pò micca esse stabila : %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 +#: ../../locales/../src/interface/edithandler.cpp:1517 msgid "The default editor for text files could not be found." msgstr "L'editore predefinitu per i schedarii di testu ùn si trova micca." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2937 #, c-format msgid "The default editor for text files is '%s'." msgstr "L'editore predefinitu per i schedarii di testu hè '%s'." @@ -7579,8 +7703,8 @@ "U schedariu %s esiste dighjà.\n" "Scrivite un altru nome :" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7598,7 +7722,7 @@ "FileZilla only supports SSH2 keys." msgstr "" "U schedariu '%s' cuntene una chjave SSH1. U protocollu SSH1 hè statu " -"disprezzatu, FileZilla suppurteghja solu e chjavi SSH2." +"disprezzatu, FileZilla accetta solu e chjavi SSH2." #: ../../locales/../src/interface/fzputtygen_interface.cpp:57 #, c-format @@ -7607,13 +7731,13 @@ "U schedariu '%s' ùn pò micca esse caricatu o ùn cuntene micca una chjave " "privata." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:41 #, c-format msgid "The file '%s' could not be loaded." msgstr "U schedariu '%s' ùn pò micca esse caricatu." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1732 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7621,10 +7745,10 @@ msgstr "" "U schedariu '%s' ùn pò micca esse apertu :\n" "Ùn ci hè micca di prugrammu assuciatu cù stu tipu di schedariu nantu u " -"vostru sistemu." +"vostru sistema." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1739 +#: ../../locales/../src/interface/LocalListView.cpp:1744 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7633,8 +7757,8 @@ "U schedariu '%s' ùn pò micca esse apertu :\n" "A cummanda assuciata hè fiasca" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:752 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7644,7 +7768,7 @@ "U schedariu '%s' hè statu creatu da una versione più recente di FileZilla.\n" "Carichendu schedarii creati da versioni più nove pò causà una perdita di " "dati.\n" -"Site sicuru di vulè continuà ?" +"Vulete cuntinuà ?" #: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format @@ -7652,14 +7776,14 @@ "The file '%s' is not in a format supported by FileZilla.\n" "Would you like to convert it into a supported format?" msgstr "" -"U schedariu '%s' ùn si trova micca in una forma suppurtata da FileZilla.\n" -"Vulete trasfurmallu in una forma suppurtata ?" +"U schedariu '%s' ùn si trova micca in una forma accettata da FileZilla.\n" +"Vulete trasfurmallu in una forma accettata ?" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "U schedariu selezziunatu cum'è editore predefinitu ùn esiste micca." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7673,12 +7797,12 @@ "d'utilizatore è a parolla d'intrata seranu impurtati.\n" "Vulete cuntinuà l'impurtazione ?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "" "A culonna di u nome di schedariu ùn pò micca esse, ne piattata, ne mossa." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "A culonna di u nome di schedariu ùn pò micca esse piattata." @@ -7692,15 +7816,15 @@ msgid "The following characters will be replaced: %s" msgstr "I caratteri seguente seranu rimpiazzati : %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 msgid "The following files are currently being edited:" msgstr "I schedarii chì seguitanu sò in corsu di mudificazione :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3433 msgid "The free open source FTP solution" msgstr "A soluzione FTP libera in 'Open Source'" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:283 msgid "The global bookmarks could not be saved." msgstr "L'indette glubale ùn ponu micca esse arregistrate." @@ -7712,23 +7836,23 @@ msgstr "" "Più u livellu di spannà hè altu, più ci seranu infurmazioni in u ghjurnale " "di i messaghji. A mostra di st'infurmazioni per spannà hà un effettu gattivu " -"nantu à e prestazioni." +"nant'à e prestazioni." #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 msgid "The limit needs to be between 1 and 2000 MiB" msgstr "U limitu deve esse sceltu trà 1 è 2000 Mo" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:998 #, c-format msgid "The local directory '%s' could not be created." msgstr "U cartulare lucale '%s' ùn pò micca esse creatu." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:983 #, c-format msgid "The local directory '%s' does not exist." msgstr "U cartulare lucale '%s' ùn esiste micca." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:243 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7744,28 +7868,28 @@ "port." msgstr "" "U portu dispunibule u più bassu deve esse inferiore o uguale à u portu u più " -"maiò." +"altu." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "A nova versione ùn pò micca esse telecaricata, provate più tardi." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "" -"A nova versione hè statu arregistrata in u vostru cartulare di " +"A nova versione hè stata arregistrata in u vostru cartulare di " "telecaricamenti." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1451 msgid "The queue will not be saved." msgstr "A lista d'attesa ùn serà micca arregistrata." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:911 #, c-format msgid "The remote directory '%s' does not exist." msgstr "U cartulare alluntanatu '%s' ùn esiste micca." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:954 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7776,48 +7900,48 @@ "Vulete disattivà u sfugliendu sincrunizatu è cuntinuà u cambiamentu di u " "cartulare alluntanatu ?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." -msgstr "E categurie selezziunate sò statu impurtate." +msgstr "E categurie selezziunate sò state impurtate." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1624 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "U schedariu selezziunatu cuntene dati d'impurtazione per e categurie chì " "seguitanu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1861 msgid "The selected file is already being edited:" msgstr "U schedariu selezziunatu hè dighjà in corsu di mudificazione :" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1726 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "U schedariu selezziunatu hè ancu apertu in qualchì altru prugrammu, ci vole " "à chjodellu." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1632 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" "U schedariu selezziunatu serà eseguittu senza aspettà.\n" -"Quessu pò esse periculosu è dannighjà u vostru sistemu.\n" +"Quessu pò esse periculosu è dannighjà u vostru sistema.\n" "Site sicuru di vulè cuntinuà ?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:576 msgid "The server could not be added." msgstr "U servu ùn pò micca esse aghjuntu." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "U servu hà mandatu una risposta inaspettata o scunnisciuta." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "The server uses following charset encoding for filenames:" msgstr "" "U servu impiega a cudificazione di caratteri seguente per i nomi di " @@ -7829,7 +7953,7 @@ "certificate to make sure the server can be trusted." msgstr "" "U certificatu di u servu hè scunnisciutu. Verificate precisamente u " -"certificatu per assicurassi chì u servu pò esse degnu di cridenza." +"certificatu per assicurassi chì u servu pò esse degnu di cunfidenza." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 msgid "" @@ -7849,36 +7973,42 @@ "A chjave di l'ospite di u servu hè scunnisciuta. Ùn avete micca " "l'assicuranza chì stu servu hè quellu chè voi aspittate." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket.cpp:1324 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "" +"U nome di l'ospite di u servu ùn currisponde micca à u nome di l'ospite di u " +"certificatu" + +#: ../../locales/../src/engine/socket.cpp:1081 msgid "The servname parameter is not supported for ai_socktype" -msgstr "U parametru nome di servu ùn hè micca suppurtatu per ai_socktype" +msgstr "U parametru nome di servu ùn hè micca accettatu per ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." msgstr "" -"E preferenze sò statu impurtate. Ci vole à rilancià FileZilla per piglialle " +"E preferenze sò state impurtate. Ci vole à riavvià FileZilla per piglialle " "in contu." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1029 msgid "The specified address family is not supported" -msgstr "A famiglia d'indirizzi specificata ùn hè micca suppurtata" +msgstr "A famiglia d'indirizzi specificata ùn hè micca accettata" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "The specified network name is no longer available" msgstr "U nome di reta specificatu ùn hè più dispunibule" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2588 msgid "The system will soon reboot unless you click Cancel." msgstr "" -"L'urdinatore hè prontu hà ridimarrà, osinnò ci vole à cliccà nantu à " +"L'urdinatore hè prontu hà ridimarrà, osinnò ci vole à cliccà nant'à " "Abbandunà." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2584 msgid "The system will soon shut down unless you click Cancel." msgstr "" -"L'urdinatore hè prontu hà piantassi, osinnò ci vole à cliccà nantu à " +"L'urdinatore hè prontu hà piantassi, osinnò ci vole à cliccà nant'à " "Abbandunà." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 @@ -7889,13 +8019,13 @@ "U schedariu di destinazione esiste dighjà.\n" "Sciglite un azzione." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "" "A prova ùn s'hè micca passata bè. Site sicuru di vulè arregistrà e " "preferenze ?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:77 #, c-format msgid "The valid backup file %s could not be restored" msgstr "U schedariu accettevule di copia %s ùn pò micca esse risturatu" @@ -7904,15 +8034,15 @@ msgid "Themes" msgstr "Temi" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:326 msgid "This filter set cannot be removed." msgstr "Stu gruppu di filtru ùn pò micca esse cacciatu." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:266 msgid "This filter set cannot be renamed." msgstr "Stu gruppu di filtru ùn pò micca esse rinumatu." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7926,7 +8056,7 @@ "return your internal address." msgstr "" "Quessu funziuneghja solu s'è ùn site micca daretu un 'router', altrimente u " -"vostru sistemu riturnerà u vostru indirizzu internu." +"vostru sistema riturnerà u vostru indirizzu internu." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 msgid "" @@ -7936,7 +8066,7 @@ "St'assistente hà da aiutavvi à cunfigurà currettamente tutti 'router' è " "parafochi è permette di pruvà a vostra cunfigurazione dopu." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Time" msgstr "Ora" @@ -7953,22 +8083,22 @@ msgid "Timeout" msgstr "Cumportu d'attesa" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1626 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:933 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "A sfarenza di fusu orariu di u servu hè di %d seconde." -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Titulu :" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2205 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Per paragunà i cartulari, e duie liste di schedarii devenu esse infilate." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2206 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Per fà quessu, l'arburiscenze devenu esse treminduie palisate o piattate." @@ -7978,7 +8108,7 @@ "To support public key authentication, FileZilla needs to know the private " "keys to use." msgstr "" -"Per supportà l'autenticazione da chjave privata, FileZilla deve cunnosce e " +"Per permette l'autenticazione da chjave privata, FileZilla deve cunnosce e " "chjave private à impiegà." #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 @@ -8006,7 +8136,7 @@ msgstr "" "Attivà / Disattivà u sfugliendu sincrunizatu.\n" "S'ellu hè attivu, navigà in l'arburiscenza lucale cambierà dinù u cartulare " -"nantu à u servu è viciversa." +"nant'à u servu è viciversa." #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 @@ -8034,17 +8164,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Affissa o piatta a finestra di a lista d'attesa di trasferimentu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:547 msgid "Too long header line" msgstr "Linea d'in-capu troppu longa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:622 msgid "Too many redirects" msgstr "Troppu di ridirezzioni" #: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:355 msgid "Trace:" msgstr "Traccia :" @@ -8053,7 +8183,7 @@ msgid "Transfer" msgstr "Trasferisce" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2225 msgid "Transfer &direction" msgstr "&Direzzione di u trasferimentu" @@ -8069,22 +8199,22 @@ msgid "Transfer Queue" msgstr "Lista d'attesa di trasferimentu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "Transfer Settings" msgstr "Preferenze di trasferimentu" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/transfersocket.cpp:444 +#: ../../locales/../src/engine/transfersocket.cpp:466 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Cunnessione di trasferimentu interrotta : %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." -msgstr "I dati trasferiti sò statu alterati." +msgstr "I dati trasferiti sò stati alterati." #: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/statuslinectrl.cpp:245 msgid "Transferring" msgstr "Trasferimentu in corsu" @@ -8092,8 +8222,7 @@ msgid "Transfers" msgstr "Trasferimenti" -#: ../../locales/../src/interface/QueueView.cpp:2944 -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2477 msgid "Transfers finished" msgstr "Trasferimenti cumpletti" @@ -8105,13 +8234,13 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Trattà sti tipi di schedarii cum'è schedarii ASCII :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:734 msgid "Trust changed Hostkey:" -msgstr "Apprubazione di u cambiamentu di a chjave di l'ospite :" +msgstr "Apprubazione di cambiamentu di Chjave d'ospite :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:732 msgid "Trust new Hostkey:" -msgstr "Apprubazione di a nova chjave di l'ospite :" +msgstr "Apprubazione di a nova Chjave d'ospite :" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 msgid "Trust the new key and carry on connecting?" @@ -8125,13 +8254,13 @@ msgid "Trust this host and carry on connecting?" msgstr "Appruvà stu servu è assuciallu à a cunnessione ?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:127 +#: ../../locales/../src/interface/resources/xrc/update.xrc:204 msgid "Try again" msgstr "Pruvà torna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 +#: ../../locales/../src/interface/edithandler.cpp:1091 msgid "Type" msgstr "Tipu" @@ -8143,11 +8272,11 @@ msgid "Type of generic proxy:" msgstr "Tipu di proxy predefinitu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1942 msgid "U&pload" msgstr "&Incaricà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3723 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Limitazione d'incaricamentu :" @@ -8164,28 +8293,28 @@ msgid "USER@&HOST" msgstr "UTILIZATORE@OSPITE" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:373 +#: ../../locales/../src/engine/proxy.cpp:499 #, c-format msgid "Unassigned error code %d" -msgstr "Codice d'errore micca affettatu %d" +msgstr "Codice di sbagliu micca affettatu %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Unità :" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Unknown" msgstr "Scunnisciutu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:690 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Tipu di proxy FTP scunnisciutu, impussibule d'ingenereghjà una sequenza " "d'identificazione." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:421 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versione di protoccollu SOCKS scunnisciuta : %d" @@ -8198,7 +8327,7 @@ msgid "Unknown host key" msgstr "Chjave di l'ospite scunnisciuta" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:429 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8207,52 +8336,52 @@ "Versione di protoccollu SOCKS di neguziazione d'autenticazione Utilizatore / " "Parolla d'intrata scunnisciuta : %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:294 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Elementu scunnisciutu à a radica, u schedariu ùn pare micca ingeneratu da " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" -"Tantu chì sti prublemi ùn sò micca curretti, u modu FTP attivu ùn " +"Tantu chì sti penseri ùn sò micca curretti, u modu FTP attivu ùn " "funziuneghja micca è u modu passivu deve esse impiegatu." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" -"Tantu chì stu prublemu ùn hè micca currettu, u modu FTP attivu ùn " +"Tantu chì stu penseru ùn hè micca currettu, u modu FTP attivu ùn " "funziuneghja micca è u modu passivu deve esse impiegatu." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket.cpp:1263 msgid "Unsupported certificate type" -msgstr "Tipu di certificatu micca suppurtatu" +msgstr "Tipu di certificatu micca accettatu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:607 msgid "Unsupported redirect" -msgstr "Ridirezzione micca suppurtata" +msgstr "Ridirezzione micca accettata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1948 msgid "Up&load and unedit" msgstr "Incaricà è compie a mudificazione" #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 #: ../../locales/../src/interface/settings/settingsdialog.cpp:112 msgid "Updates" -msgstr "Installà a nova versione di FileZilla" +msgstr "Rinnovi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2239 msgid "Upload" msgstr "Incaricà" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1114 msgid "Upload failed" msgstr "Incaricamentu fiascu" @@ -8265,7 +8394,12 @@ msgid "Upload limit: none" msgstr "Limitazione d'incaricamentu : alcuna" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3249 +#: ../../locales/../src/interface/search.cpp:873 +msgid "Upload search results" +msgstr "Incaricà i risultati di a ricerca" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "Upload selected directory" msgstr "Incaricà u cartulare selezziunatu" @@ -8273,31 +8407,31 @@ msgid "Upload selected files and directories" msgstr "Incaricà i schedarii è i cartulari selezziunati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1753 msgid "Upload this file back to the server?" msgstr "Incaricà stu schedariu mudificatu ver di u servu ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 msgid "Upload this file to the server?" msgstr "Incaricà stu schedariu ver di u servu ?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1298 msgid "Uploading" msgstr "Incaricamentu in corsu" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1111 +#: ../../locales/../src/interface/edithandler.cpp:1300 msgid "Uploading and pending removal" msgstr "Incaricamentu in corsu è in attesa di ritiru" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/edithandler.cpp:1302 msgid "Uploading and unediting" msgstr "Incaricamentu è abbandonu di a mudificazione" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:558 msgid "Use &custom charset" msgstr "Impiegà un gruppu persunalizatu di &caratteri" @@ -8305,35 +8439,34 @@ msgid "Use &custom editor:" msgstr "Impiegà l'editore persunalizatu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2931 msgid "Use &default editor for text files" msgstr "Impiegà l'editore pre&definitu per i schedarii di testu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2709 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2790 msgid "Use &synchronized browsing" msgstr "Impiegà u sfugliendu &sincrunizatu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:546 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" -"Impiegà UTF-8 s'è u servu u supporta, altrimente u gruppu lucale di " -"caratteri." +"Impiegà UTF-8 s'è u servu l'accetta, osinnò u gruppu lucale di caratteri." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 msgid "Use default action" msgstr "Impiegà l'azzione predefinita" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 msgid "Use explicit FTP over TLS if available" msgstr "Impiegà FTP esplicitu cù cunnessione TLS s'ella hè dispunibule" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2344 msgid "Use server currently connected to" msgstr "Impiegà u servu chì hè dighjà cunnettu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2350 msgid "Use server from site manager" msgstr "Impiegà u servu da u Ghjestiunariu di Siti" @@ -8377,11 +8510,11 @@ msgstr "Utilizatore :" #: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 msgid "Username cannot be a series of spaces" msgstr "U nome d'utilizatore ùn pò esse una seria di sbalarghi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:586 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8400,7 +8533,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Messaghji ditagliati di u ghjurnale di wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket.cpp:1356 msgid "Verifying certificate..." msgstr "Verificazione di u certificatu in corsu..." @@ -8408,17 +8541,17 @@ msgid "Very high" msgstr "Assai altu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1396 msgid "View hidden option set, but unsupported by server" msgstr "" -"L'ozzione d'affissà i schedarii piattati hè attiva, ma ùn hè micca " -"suppurtata da u servu" +"L'ozzione d'affissà i schedarii piattati hè attiva, ma ùn hè micca accettata " +"da u servu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 msgid "View/Edit" msgstr "Affissu / Mudificà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2141 msgid "Visible columns" msgstr "Culonne videvule" @@ -8426,10 +8559,6 @@ msgid "W&rite" msgstr "Sc&rive" -#: ../../locales/../src/interface/QueueView.cpp:1671 -msgid "Waiting" -msgstr "In attesa" - #: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "In attesa d'una cunnessione per u sfugliendu" @@ -8438,18 +8567,18 @@ msgid "Waiting for password" msgstr "In attesa di a parolla d'intrata" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:239 msgid "Waiting for transfer to be cancelled" msgstr "In attesa d'abbandunà u trasferimentu" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:240 msgid "Waiting to retry..." msgstr "In attesa nanzu à un altra prova…" -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." msgstr "" -"Avertimentu, i dati di cunnessione d'un indirizzu IP incurrettu sò ignurati." +"Avertimentu, i dati di cunnessione da un indirizzu IP incurrettu sò ignurati." #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 msgid "" @@ -8463,7 +8592,7 @@ "u vostru risicu.\n" "Alcunu sustenu hè dispunibule per ste versioni.\n" "Ste versioni ponu ùn micca funziunà cum'è previstu, è dannighjà u vostru " -"sistemu dinù.\n" +"sistema dinù.\n" "\n" "Site sicuru di vulè include ste versioni quantunque ?" @@ -8471,26 +8600,26 @@ msgid "Warning: Potential security breach!" msgstr "Avertimentu : Callaghja di sicurità pussibule !" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3607 msgid "Welcome to FileZilla" -msgstr "Benvenutu in FileZilla" +msgstr "Benvenuta in FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3468 msgid "What's new" -msgstr "Cosa hè di novu ?" +msgstr "Ciò chì hè novu" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" -msgstr "Cio chì hè novu :" +msgstr "Ciò chì hè novu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3797 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." msgstr "" "Auturisà FileZilla à arricurdassi di e parolle d'intrata vi permette di " -"cunnettavvi torna à i servi senza avè à scrivelle mentre e prussime sessioni " -"di FileZilla." +"cunnettavvi torna à i servi senza avè à scrivelle durante e prussime " +"sessioni di FileZilla." #: ../../locales/../src/interface/resources/xrc/settings.xrc:991 msgid "" @@ -8498,7 +8627,7 @@ "system in filenames are replaced if downloading such a file." msgstr "" "Quandu st'ozzione hè attiva, i caratterri di i nomi di schedariu chì ùn sò " -"micca suppurtati da u sistemu lucale, seranu rimpiazzati s'è un tale " +"micca accettati da u sistema lucale, seranu rimpiazzati s'è un tale " "schedariu hè telecaricatu." #: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 @@ -8510,7 +8639,7 @@ msgid "Widescreen" msgstr "Screnu largu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3792 msgid "Would you like FileZilla to remember passwords?" msgstr "Vulete chì FileZilla s'arricordi di e parolle d'intrata ?" @@ -8518,41 +8647,45 @@ msgid "Wr&ite" msgstr "Scr&ive" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Indirizzu IP esternu incurrettu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:770 msgid "Wrong line endings" msgstr "Fine di linea gattive" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "Ghjallu" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:744 msgid "Yes" msgstr "Iè" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "" -"Pare chì voi impiegavate solu un indirizzu IPv6. St'assistente ùn supporta " +"Pare chì voi impiegavate solu un indirizzu IPv6. St'assistente ùn accetta " "micca sta configurazione." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:248 msgid "You are using the latest version of FileZilla." msgstr "Impiegate l'ultima versione di FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3577 msgid "You can always open this dialog again through the help menu." msgstr "Ghjè sempre pussibule d'apre stu dialogu per via à l'Aiutu." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:144 +#: ../../locales/../src/interface/resources/xrc/update.xrc:224 msgid "You can download the latest version from the FileZilla website:" msgstr "Pudete telecaricà l'ultima versione di FileZilla da u site Web :" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:66 msgid "You can leave the port field empty to use the default port." msgstr "Pudete lascià viotu u locu di u portu per impiegà u portu predefinitu." @@ -8564,7 +8697,7 @@ "Pudete piazzà un 'x' sottu à qualsiasi pusizione per cunservà i permessi " "uriginali di i schedarii." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Ùn hè micca pussibule d'impurtà e preferenze da u propiu cartulare di " @@ -8583,12 +8716,12 @@ msgstr "" "Ùn avete micca scrittu un novu nome per u schedariu. Vulete rimpiazzallu ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3351 msgid "You have selected at least one symbolic link." -msgstr "Avete selezziunatu al menu una leia simbulica." +msgstr "Avete selezziunatu almenu una leia simbulica." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1593 +#: ../../locales/../src/interface/search.cpp:1149 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8596,7 +8729,7 @@ "Avete selezziunatu più di 10 schedarii per mudificalli, site sicuru di vulè " "continuà ?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1701 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8605,38 +8738,42 @@ "di vulè continuà ?" #: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:961 msgid "You have to enter a hostname." msgstr "Ci vole à entre un nome d'ospite." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1070 msgid "You have to enter a key file path" msgstr "Ci vole à entre un passeghju di schedariu di chjave" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:859 msgid "You have to enter a local directory." msgstr "Ci vole à entre un cartulare lucale." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:873 +msgid "You have to enter a remote directory." +msgstr "Ci vole à entre un cartulare alluntanatu." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Ci vole à scrive un indirizzu IPv4 accettevule." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/search.cpp:864 msgid "You have to enter a writable local directory." msgstr "Ci vole à entre un cartulare lucale induve si pò scrive." #: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 msgid "You have to enter an account name" msgstr "Ci vole à entre un nome di contu" #: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1036 msgid "You have to specify a user name" msgstr "Ci vole à entre un nome d'utilizatore" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8652,7 +8789,7 @@ msgid "You need to enter a name for the log file." msgstr "Ci vole à entre un nome per u ghjurnale di i messaghji." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1478 msgid "You need to enter a properly quoted command." msgstr "Ci vole à entre una cummanda leghjittima trà virgulette." @@ -8667,15 +8804,15 @@ #: ../../locales/../src/interface/bookmarks_dialog.cpp:75 #: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1138 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Ci vole à entre almenu un passeghju, chì l'indette viote ùn sò micca " -"suppurtate." +"accettate." #: ../../locales/../src/interface/bookmarks_dialog.cpp:81 #: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8683,7 +8820,7 @@ "Ci vole à entre dui passeghji, lucale è alluntanatu, per permette u " "sfugliendu sincrunizatu per st'indetta." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8707,18 +8844,18 @@ msgid "You need to specify a server." msgstr "Ci vole à indicà un servu." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "" -"Ùn duveriate micca avè prublemi per cunnettavvi à d'altri servi, i " +"Ùn duveriate micca avè penseri per cunnettavvi à d'altri servi, i " "trasferimenti di schedariu duverianu funziunà bè." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2592 msgid "Your computer will suspend unless you click Cancel." msgstr "" -"L'urdinatore hà da mettessi in veghja à menu di cliccà nantu à Abbandunà." +"L'urdinatore hà da mettessi in veghja à menu di cliccà nant'à Abbandunà." #: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 msgid "after" @@ -8741,7 +8878,7 @@ msgid "contains" msgstr "chì cuntene" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "personalizatu" @@ -8763,10 +8900,10 @@ msgid "equals" msgstr "chì hè uguale à" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:534 +#: ../../locales/../src/interface/filelistctrl.cpp:553 +#: ../../locales/../src/interface/filelistctrl.cpp:580 +#: ../../locales/../src/interface/filelistctrl.cpp:596 msgid "file" msgstr "schedariu" @@ -8785,18 +8922,22 @@ "Assicuratevvi chì fzputtyget.exe sia presente in u cartulare d'installazione " "di FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:354 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp appartene à una versione sfarente di FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1412 msgid "fzsftp could not be started" msgstr "fzsftp ùn hè micca statu lanciatu" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/tlssocket.cpp:1202 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers ùn hà riturnatu alcunu certificatu" +#: ../../locales/../src/engine/tlssocket.cpp:1214 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "Fiascu di gnutls_pem_base64_encode2" + #: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "greater than" msgstr "più maiò chì" @@ -8849,10 +8990,10 @@ msgid "owner writeable" msgstr "scrittura da u pruprietariu" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 +#: ../../locales/../src/engine/proxy.cpp:62 +#: ../../locales/../src/engine/tlssocket.cpp:1400 +#: ../../locales/../src/engine/tlssocket.cpp:1411 +#: ../../locales/../src/engine/tlssocket.cpp:1426 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 msgid "unknown" msgstr "scunnisciutu" @@ -8873,6 +9014,51 @@ msgid "wxWidgets:" msgstr "wxWidgets :" +#~ msgid "Filename &filters..." +#~ msgstr "&Filtri di u nome di schedariu..." + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Ùn hè micca pussibule d'impurtà i certificati 'peer', " +#~ "gnutls_x509_crt_import hè fiascu" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Ùn hè micca pussibule di creà a struttura di i certificati 'peer', " +#~ "gnutls_x509_crt_init hè fiascu" + +#~ msgid "%d files added to queue" +#~ msgstr "%d schedarii aghjunti à a lista d'attesa" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Disghjunghje da u servu" + +#~ msgid "&Show message" +#~ msgstr "&Affissà u messaghju" + +#~ msgid "Connected" +#~ msgstr "Cunnettu" + +#~ msgid "Do ¬hing" +#~ msgstr "Ùn fà &nunda" + +#~ msgid "Empty dirs to visit" +#~ msgstr "Cartulari vioti à visità" + +#~ msgid "No more files in the queue!" +#~ msgstr "Ùn ci hè più di schedariu in a lista d'attesa !" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Esame di i schedarii à aghjunghje à a lista d'attesa" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Esame di i schedarii à incaricà" + +#~ msgid "Waiting" +#~ msgstr "In attesa" + #~ msgid "" #~ "Any changes made in the Site Manager will not be saved unless you repair " #~ "the file." @@ -8891,9 +9077,6 @@ #~ msgid "Clear &transfer queue" #~ msgstr "Sguassà a lista d'aspettanza di trasferimentu" -#~ msgid "Deleting directories" -#~ msgstr "Sguassatura di i cartulari" - #~ msgid "Deleting multiple unrelated directories is not yet supported" #~ msgstr "" #~ "A sguassatura di pareghji cartulari senza relazione trà elli ùn hè micca " @@ -9025,9 +9208,6 @@ #~ "U nome di schedariu ùn pò micca cuntene sti caratteri : / \\ : * ? \" < > " #~ "|" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Certificatu di radica micca degnu di cridenza" - #~ msgid "Use plain FTP" #~ msgstr "Impiegà una cunnessione FTP simplice (senza sicurità)" diff -Nru filezilla-3.15.0.2/locales/cs_CZ.po filezilla-3.33.0/locales/cs_CZ.po --- filezilla-3.15.0.2/locales/cs_CZ.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/cs_CZ.po 2018-01-08 11:07:33.000000000 +0000 @@ -1,40 +1,41 @@ # Czech translations of FileZilla 3 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the FileZilla 3 package. -# Michal Molhanec , 2007, 2008, 2011, 2013, 2015. +# Michal Molhanec , 2007-2018. # Martin Ruzicka , 2011. # Ivan Masár , 2008. # Acci , 2008. +# Tobiczech # msgid "" msgstr "" "Project-Id-Version: FileZilla 3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-12 10:26+0100\n" -"PO-Revision-Date: 2015-10-17 14:54+0200\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-01-08 11:56+0100\n" +"PO-Revision-Date: 2018-01-02 11:22+0100\n" "Last-Translator: Michal Molhanec \n" -"Language-Team: \n" +"Language-Team: Michal Molhanec \n" "Language: cs_CZ\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,924,-1,541,986,-1\n" -"X-Generator: Poedit 1.8.5\n" +"X-Generator: Poedit 2.0.4\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" -msgstr "%H.%M:%S uplynulo" +msgstr "%H:%M:%S uplynulo" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" -msgstr "%H.%M:%S zbývá" +msgstr "%H:%M:%S zbývá" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -43,9 +44,9 @@ "%a - účet (pokud nepoužíváte tento typ přihlášení, budou řádky obsahující " "toto vynechány)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" @@ -53,9 +54,9 @@ msgstr[1] "%d složky" msgstr[2] "%d složek" -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/search.cpp:478 -#: ../../locales/../src/interface/search.cpp:764 +#: ../../locales/../src/interface/RemoteListView.cpp:1425 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -63,11 +64,11 @@ msgstr[1] "%d složky se svým obsahem" msgstr[2] "%d složek se svým obsahem" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1389 -#: ../../locales/../src/interface/search.cpp:477 -#: ../../locales/../src/interface/search.cpp:763 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" @@ -75,7 +76,7 @@ msgstr[1] "%d soubory" msgstr[2] "%d souborů" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" @@ -83,7 +84,7 @@ msgstr[1] "%d soubory. Celková velikost: %s" msgstr[2] "%d souborů. Celková velikost: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" @@ -91,12 +92,7 @@ msgstr[1] "%d soubory. Celková velikost: Nejméně %s" msgstr[2] "%d souborů. Celková velikost: Nejméně %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 -#, c-format -msgid "%d files added to queue" -msgstr "%d souborů přidáno do fronty" - -#: ../../locales/../src/engine/ControlSocket.cpp:104 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -104,11 +100,11 @@ msgstr[1] "%d sekundy" msgstr[2] "%d sekund" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - hostitel" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" @@ -116,7 +112,7 @@ msgstr[1] "%llu složky" msgstr[2] "%llu složek" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -124,47 +120,47 @@ msgstr[1] "%llu soubory" msgstr[2] "%llu souborů" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - heslo" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Platnost certifikátu vypršela!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ještě neplatná!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" -msgstr "%s - uživatelské jméno pro proxy" +msgstr "%s - Proxy uživatel" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s a %s. Celková velikost: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s a %s. Celková velikost: Nejméně %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -172,90 +168,100 @@ msgstr[1] "%s bajty" msgstr[2] "%s bajtů" -#: ../../locales/../src/interface/FileZilla.cpp:595 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s nebyl nalezen. Bez této komponenty aplikace FileZilla nebude SFTP " +"%s nebyl nalezen. Bez této komponenty aplikace FileZilla nebude %s " "fungovat.\n" "\n" "Prosím, stáhněte aplikaci FileZilla znova. Jestli tento problém přetrvá, " "zašlete hlášení o chybě." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s nebyl nalezen. Bez tohoto souboru nemůže fungovat SFTP.\n" +"%s nebyl nalezen. Bez této komponenty aplikace FileZilla nebude %s " +"fungovat.\n" "\n" "Možná řešení:\n" "- Zajistěte, aby se soubor %s nacházel ve složce, která je uvedena v " "proměnné prostředí PATH.\n" -"- Nastavte proměnnou prostředí FZ_FZSFTP na plnou cestu k souboru %s." +"- Plnou cestu k souboru %s nastavte do proměnné prostředí %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s s %d bity" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:164 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Název hostitele se neshoduje s certifikátem" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - uživatelské jméno" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" -msgstr "%w - heslo pro proxy" +msgstr "%w - Proxy heslo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "&Přerušit předchozí připojení a připojit se na aktuální záložce" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "&O aplikaci FileZilla..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "Ú&čet:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Aktivní" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." -msgstr "&Přidat k oblíbeným položkám..." +msgstr "&Přidat do záložek..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Přidat složku..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "Přidat soubory do &fronty" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Přidat soubor s klíčem..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "Přidat do &fronty" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "N&astavit posun časové zóny serveru:" @@ -263,71 +269,76 @@ msgid "&Always trust certificate in future sessions." msgstr "&Vždy důvěřovat tomuto certifikátu v budoucích relacích." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "&Vždy důvěřovat tomuto hostiteli, přidat tento klíč do mezipaměti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "Vž&dy použít výchozí editor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "Vždy použít výběr pro &nepřidružené typy souborů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "Vž&dy provést tuto akci" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Zeptat se operačního systému na externí IP adresu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Automatická detekce" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Automatická detekce" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Barva pozadí:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Binární" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Binární předpony s použitím značek SI. (např. 1 kB = 1024 bajtů)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" -msgstr "&Oblíbené položky" +msgstr "&Záložky" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "Pro&cházet..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "Tolerance k vý&kyvům:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Storno" @@ -339,19 +350,23 @@ msgid "&Close" msgstr "&Zavřít" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&Ukončit aplikaci FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Jednou ukončit aplikaci FileZilla" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "&Nastavit omezení rychlostí..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." -msgstr "&Nastavit..." +msgstr "&Nastavení..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "Připo&jit" @@ -359,153 +374,149 @@ msgid "&Copy current connection to Site Manager..." msgstr "Přidat &aktuální připojení do Správce míst..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "Kopírovat do &schránky" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "Vytvořit slož&ku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" -msgstr "&Nová záložka" +msgstr "&Vytvořit novou kartu" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "L&adění" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "&Ladicí informace v protokolu zpráv:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "Výchozí &editor:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "Nastavit &výchozí chování, pokud soubor již existuje..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "Interval mezi &neúspěšnými pokusy o přihlášení:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "O&dstranit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "O&dstranit symbolický odkaz" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "&Přístupová práva ke složce..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "&Porovnání složek" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Zakázat synchronizované procházení a pokračovat ve změně místní složky?" -#: ../../locales/../src/interface/state.cpp:966 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" -"&Zakázat synchronizované procházení a pokračovat ve změně vzdálené složky?" +"&Zakázat synchronizované procházení a pokračovat ve změně vzdálené složky" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "Z&rušit místní soubor a upravit znovu vzdálený" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "&Odpojit" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Odpojit od serveru" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Zobrazit okamžitou přenosovou rychlost místo průměrné" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Zobrazovat velikost v bajtech" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "&Zapomínat hesla (doporučeno)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "Tento dialog již &příště nezobrazovat." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "Nepoužívat externí IP adresu pro &místní připojení." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "A&kce po dvojitém kliknutí na soubor:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Stáhnout" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Stáhnout do:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Stáhnout..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "S&tahování:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Upravit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "Up&ravit pravidla filtrů..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "&Povolit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "P&ovolit kompresi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "P&ovolit omezení rychlostí" # Žádné znaky pro zkratku volné... -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "Kódov&ání:" @@ -513,28 +524,28 @@ msgid "&Encryption:" msgstr "Š&ifrování:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "&Zadat vlastní příkaz..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "&Navázat připojení na nové záložce" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Spouštění" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Exportovat položky ze správce míst" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Exportovat..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "V&rátit se k aktivnímu režimu" @@ -542,35 +553,47 @@ msgid "&File" msgstr "&Soubor" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "Změnit &atributy souboru..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "Op&rávnění souborů..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Soubor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "P&odmínky filtru:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Sady filtrů:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtry" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Filtry:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Dokončit úpravy a odstranit místní soubor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"Sloučit &místní cesty, odeslat všechny obsažené soubory přímo do cílové " +"složky" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -578,54 +601,54 @@ "Sloučit &vzdálené cesty, stáhnout všechny obsažené soubory přímo do cílové " "složky" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "&Následovat symbolický odkaz, odstranit obsah cílové složky" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "Získat externí IP &adresu z následujícího URL:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Získat pomoc..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" -msgstr "&Globální" +msgstr "&Globální záložky" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 používající metodu CONNECT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "Nápo&věda" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Skrýt stejné soubory" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&Nejvyšší" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "N&ejvyšší využitelný port:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Hostitel:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "Binární předpony &IEC (např. 1 KiB = 1024 bajtů)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (příklad: 2007-09-15)" @@ -633,88 +656,96 @@ msgid "&Import..." msgstr "&Importovat..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "Používat nastavení s&ystému" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Instalovat novou verzi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "Po&nechat strukturu místní cesty relativní ke kořenu hledání" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "Po&nechat strukturu vzdálené cesty relativní ke kořenu hledání" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" -msgstr "Soubor s k&líčem" +msgstr "Soubor s k&líčem:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Rozložení panelů souborů a složek:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Omezit místní porty, které může FileZilla používat" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "Ome&zit počet současných připojení" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "&Místní strom složek" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Místní složka:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Místní hledání" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Protokolovat do souboru" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "Způso&b přihlašování:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "Z&působ přihlašování:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "Ní&zká" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." -msgstr "&Spravovat oblíbené položky..." +msgstr "&Spravovat záložky..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "&Ruční přenos..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "Ma&ximální počet připojení:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Maximální počet opakování:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "Protoko&l zpráv" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Minimalizovat do oznamovací oblasti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "Způsob řazení &jmen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Název:" @@ -722,7 +753,7 @@ msgid "&Network configuration wizard..." msgstr "&Průvodce nastavením sítě..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Nový" @@ -730,7 +761,7 @@ msgid "&New Site" msgstr "Nové &místo" -#: ../../locales/../src/interface/Mainfrm.cpp:1663 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Nová verze je k dispozici!" @@ -738,154 +769,165 @@ msgid "&Next >" msgstr "&Další >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Ne" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "Žá&dná" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "No&rmální" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "Číselná &hodnota:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "O&PEN" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "O&tevřít" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Přepsat" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "Pas&ivní" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Heslo:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "&Přehrát zvuk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "Po&rt:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Zachovávat časy u přenášených souborů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Fronta" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "R&ychlé připojení" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" -msgstr "Panel &Rychlé připojení" +msgstr "Panel &Rychlého připojení" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "Historie &rychlých připojení" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "Č&tení" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "Znovu &připojit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "Informace pro o&pětovné připojení" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "&Aktualizovat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Zapamatovat si centrální heslo do ukončení aplikace FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "&Zapamatovat si heslo do ukončení aplikace FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "&Pamatovat si hesla" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Vzdálená složka:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" -msgstr "V&zdálená složka:" +msgstr "V&zdálená cesta:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Vzdálené hledání" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Odebrat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Odebrat klíč" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "&Odebrat vybrané" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Přejmenovat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Přejmenovat..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Znovu otevřít místní soubor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Neplatné znaky nahradit znakem:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "Oznámit &chybu..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "V&yžádat si pozornost" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "Vše obnovit a &zařadit znovu do fronty" @@ -893,40 +935,40 @@ msgid "&Restart Wizard" msgstr "&Restartovat průvodce" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "Navá&zat" # možná by mělo být "Navázat" nemohu to najít... -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "&Spustit příkaz..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "Sp&ustit průvodce nastavením sítě..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "Spustit &kontrolu aktualizací..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "S&ITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "S&OCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Uložit jako..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Hledat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Hledat vzdálené soubory..." @@ -934,20 +976,20 @@ msgid "&Select Entry:" msgstr "&Vybrat položku:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "Výběr &jazyka:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Vyberte sloupce, které chcete zobrazovat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "S&erver" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Nastavení" @@ -955,23 +997,19 @@ msgid "&Settings..." msgstr "&Nastavení..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Zobrazovat položku Ladění v hlavní nabídce" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "Zobrazit &podrobný protokol" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Zobrazit zprávu" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Zobrazovat časové údaje v protokolu zpráv" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Položky &správce míst" @@ -979,157 +1017,171 @@ msgid "&Site Manager..." msgstr "&Správce míst..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "Pl&atná jen pro určité místo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "Přes&kočit" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "&Omezení rychlostí" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Spustit přenos &okamžitě" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "Z&aměnit místní a vzdálené panely" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "&TLS šifry" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Test" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Téma:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Přenos" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "&Režim přenosu:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "&Frontu přenosů" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "Rozpoznávat &tečkové soubory jako ASCII soubory" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Vrátit úpravy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Aktualizovat klíč uložený v mezipaměti pro tohoto hostitele" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Odeslat na server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "O&deslat do:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Odeslat na server..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Odesílání:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "P&oužít vlastní program" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "Po&užít synchronizované procházení" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "Po&užít výchozí systémový editor textových souborů" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Použít tuto IP adresu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "Po&užít místo toho externí IP adresu serveru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Použít oddělovač tisíců" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Uživatelské jméno:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "Uživatelské &jméno:" -#: ../../locales/../src/interface/Mainfrm.cpp:1657 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Verze %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Zobrazit" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Zobrazit/Upravit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "Sledovat &místně upravované soubory a vyzvat k odeslání změn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "Vy&hledávat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Zápis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Ano" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "„%s“ neexistuje nebo je nepřístupné." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "„%s“ není složka." -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "„%s“ není podporovaný protokol." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 msgid "'Account' logontype not supported by selected protocol" msgstr "Vybraný protokol nepodporuje způsob přihlašování „Účet“" -#: ../../locales/../src/interface/manual_transfer.cpp:440 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1137,7 +1189,7 @@ "Způsoby přihlašování 'Normální' a 'Účet' nejsou k dispozici, místo toho se " "použije 'Zeptat se na heslo'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1145,7 +1197,7 @@ "Způsoby přihlašování 'Normální' a 'Účet' nejsou k dispozici. Zadaný způsob " "byl změněn na 'Zeptat se na heslo'." -#: ../../locales/../src/interface/Mainfrm.cpp:587 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1155,8 +1207,8 @@ "který umožňuje poslat příkaz následující za „quote“ přímo serveru. Možná " "nechcete poslat „quote“ serveru, ale zadat přímo příkaz bez úvodního „quote“." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" @@ -1164,50 +1216,50 @@ msgstr[1] "(%d objekty filtrovány)" msgstr[2] "(%d objektů filtrováno)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(staženo %u%%)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 ... bez omezení)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 sekund)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 pro vypnutí)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(kompatibilita aplikace je nastavena na %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(příklad: %H.%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(příklad: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(v %s/s)" @@ -1216,7 +1268,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--.--:-- zbývá" @@ -1236,31 +1288,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "Přepínač -s nelze použít zároveň s FTP URL." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Žádné" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Upozornění" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Informativní" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Podrobné" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32bitový systém" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Ladicí" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64bitový systém" @@ -1268,22 +1320,26 @@ msgid "< &Back" msgstr "< &Zpět" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." -msgstr "Oblíbená položka se zadaným názvem již existuje. Zadejte nový název." +msgstr "Záložka se zadaným názvem již existuje. Zadejte nový název." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Certifikát v řetězci byl podepsán pomocí nejistého algoritmu" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Je nutné nastavit výchozí editor." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/RemoteListView.cpp:164 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Složku nelze přetáhnout do složky, která je v ní vnořena." @@ -1297,21 +1353,21 @@ "takových případech je nutné použít aktivní režim. V aktivním režimu aplikace " "FileZilla otevře port a požádá server, aby se na něj připojil." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Dříve otevřený soubor byl změněn." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Soubor s tímto názvem je již přenášen." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Soubor s tímto názvem je stále ještě upravován. Zavřete ho a zkuste to znovu." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1325,11 +1381,18 @@ "Dokud tento problém nevyřešíte, mohou ve výpisu souborů chybět soubory.\n" "Žádná další varování nebudou již během této relace zobrazena." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "Centrální heslo nelze obnovit! Je potřeba si ho dobře zapamatovat." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Nová verze aplikace FileZilla je k dispozici:" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1338,7 +1401,7 @@ "skrývají soubory před uživatelem. Použijte toto nastavení pro vynucení " "zobrazení všech souborů serveru." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1346,7 +1409,7 @@ "Správně nastavený server toto nevyžaduje. Pokud toto potřebujete pro správné " "fungování, kontaktujte správce serveru." -#: ../../locales/../src/interface/state.cpp:257 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1354,17 +1417,17 @@ "Probíhá vzdálená operace a synchronizované procházení je povoleno.\n" "Zakázat synchronizované procházení a pokračovat ve změně místní složky?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "AS&CII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "&Přidat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "Povo&lit navazování ASCII souborů" @@ -1376,51 +1439,53 @@ msgid "A&pply only to uploads" msgstr "Platí jen při odesílání na &server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "Použít pro &všechny soubory a složky" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "A&utomaticky odebírat úspěšné přenosy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "O aplikaci FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Nad seznamem souborů" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Přístup k některým místním adresářům nelze obnovit:" + +#: ../../locales/../src/engine/server.cpp:582 +#: ../../locales/../src/engine/server.cpp:605 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Účet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "Či&nnost po zpracování fronty" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Akce s vybraným souborem:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Provést:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Akce:" @@ -1428,7 +1493,7 @@ msgid "Active mode" msgstr "Aktivní režim" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1436,7 +1501,7 @@ "Test aktivního režimu FTP se nezdařil. Aplikace FileZilla nezná správnou " "externí IP adresu." -#: ../../locales/../src/interface/netconfwizard.cpp:608 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1444,7 +1509,7 @@ "Test aktivního režimu FTP se nezdařil. Aplikace FileZilla nezná správnou " "externí IP adresu. Navíc váš router změnil zaslanou adresu." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1453,38 +1518,39 @@ "Test aktivního režimu FTP selhal. FileZilla zná správnou externí IP adresu, " "ale váš router nebo firewall nesprávně změnil zaslanou adresu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP adresa pro aktivní režim" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Pouze přidat soubory do &fronty" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Přidat vybranou složku do fronty přenosů" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Přidat vybrané soubory a složky do fronty přenosů" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Přidat do fronty" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Tento typ adresy není podporován" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Pokročilé" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1498,15 +1564,16 @@ "mohou dokonce i poškodit váš systém. Použití betaverzí a nočních sestavení " "je na vaše vlastní riziko." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "Vž&dy provést tuto akci" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritmus:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2652 msgid "All files have been successfully transferred" msgstr "Všechny soubory byly úspěšně přeneseny" @@ -1514,7 +1581,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Všechny zadané porty musí být mezi 1024 a 65535." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../locales/../src/interface/QueueView.cpp:2648 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1522,7 +1589,7 @@ msgstr[1] "Všechny přenosy dokončeny. %d soubory nelze přenést." msgstr[2] "Všechny přenosy dokončeny. %d souborů nelze přenést." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Povolit &návrat k druhému režimu přenosu při chybě" @@ -1530,18 +1597,18 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Povolit návrat k druhému režimu přenosu při chybě" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Připojení je již vytvořeno" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternativní název:" msgstr[1] "Alternativní názvy:" msgstr[2] "Alternativních názvů:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1549,7 +1616,7 @@ "Jinak můžete použít nástroj Pageant z Putty pro správu svých klíčů, aplikace " "FileZilla dokáže Pageant rozpoznat." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1557,13 +1624,13 @@ "Jinak můžete použít svého systémového agenta SSH. Toto nastavíte pomocí " "proměnné prostředí SSH_AUTH_SOCK." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "Můžete také stáhnout nejnovější verzi aplikace FileZilla ze stránky:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1656 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1572,7 +1639,7 @@ "Došlo k chybě při načítání fronty přenosů do „%s“.\n" "Některé položky fronty nemusí být obnoveny." -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1549 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1581,7 +1648,11 @@ "Došlo k chybě při ukládání fronty přenosů do „%s“.\n" "Některé položky fronty nemusí být uloženy." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Emitent v řetězci certifikátů není certifikační autoritou" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2261 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1589,72 +1660,71 @@ "V cíli přetažení již existuje položka se stejným názvem jako má přetahovaná " "položka." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1716 msgid "Anonymous" msgstr "Anonymní" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "Již probíhají jiné vzdálené operace, nyní nelze složku změnit." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:848 msgid "Any changes made in the Site Manager could not be saved." msgstr "Změny provedené ve správci míst nelze uložit." -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Žádné změny filtrů nelze uložit." -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Žádné změny filtrů nelze uložit." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Použít &jen pro složky" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Použít" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Platí jen na &aktuální frontu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Použít jen pro sou&bory" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Archivovat" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Přetečení vyrovnávací paměti argumentu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Jako záložka v panelu fronty přenosů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Zeptat se" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:573 +#: ../../locales/../src/engine/server.cpp:599 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Zeptat se na heslo" @@ -1666,7 +1736,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Zeptat se operačního systému na externí IP adresu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Položit otázku v diskuzním fóru aplikace FileZilla" @@ -1674,7 +1744,7 @@ msgid "Associated program not found:" msgstr "Přidružený program nebyl nalezen:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Nejméně jedna podmínka filtru není kompletní" @@ -1682,99 +1752,106 @@ msgid "At this point, all required information has been gathered." msgstr "Všechny informace jsou již získány." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:221 msgid "Authentication failed." msgstr "Ověření selhalo." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Autor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Automatická detekce" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Automatické rozpoznávání typů souborů" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Dostupné velikosti" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B " -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "Obcházet pro&xy" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Neplatný popisovač souboru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Základní pokyny k použití" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Chování" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Upravován" -#: ../../locales/../src/engine/tlssocket.cpp:1111 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Pozor! Certifikát byl odvolán" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binární" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Tabule" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Modrá" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:393 msgid "Bookmark" -msgstr "Položka" +msgstr "Záložka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" -msgstr "Položka:" +msgstr "Záložka:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" -msgstr "Oblíbené položky" +msgstr "Záložky" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Procházet..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Přihrádka nalezena" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Datum sestavení:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Informace o sestavení" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Business category:" msgstr "Druh činnosti:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1785,98 +1862,114 @@ "používala pouze omezený rozsah portů, zadejte rozsah portů, který se má " "používat." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "&Zrušit aktuální operaci" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "&Vymazat vše" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "Kopírovat &URL do schránky" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "Kopírovat &URL s heslem do schránky" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "Vl&astní" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Vlas&tní typy souborů:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "Funkce procesoru:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1570 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1226 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Počítá se posun časové zóny serveru..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Nelze číst ze souboru" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Nelze zapsat data do souboru." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Nelze zapsat data do souboru: %s" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Storno" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Zruší aktuální operaci" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Zruší aktuální operaci" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Nelze přistoupit k „%s“, není vloženo médium nebo není připravena jednotka." -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Nelze přidat server do Správce míst" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Nemohu přiřadit požadovanou adresu" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Protože již probíhá jiná operace synchronizovaného procházení, nelze nyní " +"změnit složku." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1884,7 +1977,7 @@ "Nelze zavřít záložku při zaneprázdnění.\n" "Zrušit aktuální operaci a zavřít záložku?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1896,103 +1989,103 @@ msgid "Cannot create new filter" msgstr "Nelze vytvořit nový filtr" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1835 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Nelze upravit soubor" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1711 msgid "Cannot edit file, not connected to any server." msgstr "Nelze upravit soubor, nejste připojeni k žádnému serveru." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1720 msgid "Cannot edit file, remote path unknown." msgstr "Nelze upravit soubor, neznámá vzdálená cesta." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "Nelze navázat FTP připojení s SFTP serverem. Vyberte správný protokol." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Nelze načíst panel rychlého připojení ze zdrojového souboru" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Nelze načíst soubor s klíčem" -#: ../../locales/../src/interface/Mainfrm.cpp:993 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Nelze načíst panel nástrojů ze zdrojového souboru" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Heslo si nelze zapamatovat" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1264 msgid "Cannot rename entry" msgstr "Nelze přejmenovat položku" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Cannot rename file" msgstr "Nelze přejmenovat soubor" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Nemohu přeložit název hostitele na adresu IPv4, což je potřeba pro použití " "SOCKS4 proxy." -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Nelze uložit sadu filtrů" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Nelze vybrat filtr" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Nelze nastavit přidružení" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Dialog nelze zobrazit" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Nelze zobrazit nebo upravit vybraný soubor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Nerozlišovat velikost písmen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Nerozlišovat velikost písmen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Nerozlišovat velikost písmen (výchozí)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Rozlišovat velikost písmen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Rozlišovat velikost písmen (výchozí)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Kategorie k vymazání" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:514 msgid "Certificate and session data are not available yet." msgstr "Certifikát a údaje o relaci nejsou zatím dostupné." @@ -2004,36 +2097,40 @@ msgid "Certificate issuer" msgstr "Vydavatel certifikátu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Ověření podpisu certifikátu se nezdařilo" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Výzva:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Změnit atributy souboru" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Změnit oprávnění souboru." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Změna nastavení protokolování vyžaduje restart aplikace FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Problém s kódováním znaku" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Znaková sada" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Z&kontrolovat aktualizace..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Kontrolovat aktualizace automatick&y:" @@ -2041,15 +2138,15 @@ msgid "Check for Updates" msgstr "Zkontrolovat aktualizace" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Kontrolovat novější verze aplikace FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Kontrola aktualizací se nezdařila" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:783 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2057,7 +2154,7 @@ "Zkontrolujte si své přihlašovací údaje. Zadané heslo začíná nebo končí " "mezerou." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2065,39 +2162,39 @@ "Zkontrolujte si své přihlašovací údaje. Zadané uživatelské jméno začíná nebo " "končí mezerou." -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Kontrola správné externí IP adresy" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Probíhá kontrola aktualizací…" -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "Kontrolní součet souboru %s souhlasí\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Kontrolní součet souboru %s neodpovídá\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1611 msgid "Choose a key file" msgstr "Vyberte soubor s klíčem" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1646 msgid "Choose the default local directory" msgstr "Vyberte výchozí místní složku" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2242 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2502 msgid "Choose the local directory" msgstr "Vyberte místní složku" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/http/request.cpp:462 msgid "Chunk data improperly terminated" msgstr "Části dat chybně ukončeny" @@ -2106,54 +2203,62 @@ msgstr "Šifra:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" -msgstr "&Zavřít záložku" +msgstr "&Zavřít kartu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Klasické" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "&Vymazat mezipaměť rozvržení dialogů" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Vymazat &auto aktualizační data" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Vymazat historii" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Vymazat důvěrné údaje" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Vymazat panel rychlého připojení" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Klikněte na tlačítko Dokončit pro uložení nastavení." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Klient na server MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Šifra uživatele na server:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Zavřít" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "Zavřít &všechny ostatní záložky" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1134 -#: ../../locales/../src/interface/Mainfrm.cpp:1155 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "Ukončí aplikaci FileZilla" @@ -2161,103 +2266,108 @@ msgid "Close all running instances of FileZilla" msgstr "Zavře všechny běžící instance aplikace FileZilla" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Zavřít rychlé vyhledávání a pokračovat v porovnávání?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Zavře aktuální záložku" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Po&známky:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Vlastnosti sloupců" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Nastavení sloupců" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Příkaz a jeho parametry musí být správně uzavřeny v uvozovkách." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Provedení příkazu se nezdařilo" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Příkaz není podporován" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Tento protokol nepodporuje daný příkaz" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "Příkaz:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Poznámka" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Common name:" msgstr "Společný název:" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Komunikace poškozena routerem nebo firewallem" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Porovnat čas poslední &změny" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Porovnat &velikost souboru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "&Práh porovnávání (v minutách):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Práh pro porovnávání musí být mezi 0 a 1440 minutami." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Cílová platforma:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Překládáno na:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Překladač:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Parametry překladače:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Komprimovaný" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Souběžné přenosy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "&Rozlišovat v podmínkách velikost písmen" @@ -2273,66 +2383,69 @@ msgid "Configure port range" msgstr "Nastavení rozsahu portů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Nastavení aplikace FileZilla a sítě" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" -msgstr "Vyžadováno potvrzení" +msgstr "Potvrďte smazání" -#: ../../locales/../src/engine/local_filesys.cpp:129 -#: ../../locales/../src/interface/edithandler.cpp:1586 -#: ../../locales/../src/interface/LocalListView.cpp:1664 -#: ../../locales/../src/interface/RemoteListView.cpp:1394 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1638 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1797 +#: ../../locales/../src/interface/RemoteListView.cpp:1429 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Vyžadováno potvrzení" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Gratulujeme, zdá se, že vaše nastavení funguje." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Nastavení obcházení proxy" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Připojení selhalo: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" -msgstr "Navázat připojení v aktuální záložce" +msgstr "Připojit v aktuální záložce" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" -msgstr "Navázat připojení na nové záložce" +msgstr "Připojit v nové záložce" #: ../../locales/../src/interface/cmdline.cpp:8 msgid "Connect to specified Site Manager site" msgstr "Připojí se ke zvolenému místu ve Správci míst" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:908 -msgid "Connected" -msgstr "Připojen" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Připojování" -#: ../../locales/../src/interface/netconfwizard.cpp:223 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Připojování k %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1050 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Připojování k %s přes proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:958 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../locales/../src/engine/ControlSocket.cpp:990 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Připojování k %s..." @@ -2341,183 +2454,227 @@ msgid "Connection" msgstr "Připojení" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Připojení bylo přerušeno" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Pokus o připojení se nezdařil" -#: ../../locales/../src/engine/ControlSocket.cpp:922 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:952 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Pokus o připojení se nezdařil s „%s“, zkouší se další adresa." -#: ../../locales/../src/engine/ControlSocket.cpp:927 +#: ../../locales/../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Pokus o připojení se nezdařil. Došlo k chybě „%s“." -#: ../../locales/../src/engine/ControlSocket.cpp:184 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Pokus o připojení přerušen uživatelem" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Pokus o připojení překročil časový limit" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Připojení bylo ukončeno" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/ControlSocket.cpp:1036 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:184 +#: ../../locales/../src/engine/http/request.cpp:195 +#: ../../locales/../src/engine/http/request.cpp:208 msgid "Connection closed by server" msgstr "Připojení uzavřeno serverem" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:113 msgid "Connection established, initializing TLS..." msgstr "Připojení navázáno, inicializace TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:136 msgid "Connection established, sending HTTP request" msgstr "Připojení navázáno, posílání HTTP požadavku" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Připojení navázáno, čekání na uvítací zprávu." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Připojení navázáno, čekání na uvítací zprávu..." -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Připojení ztraceno" # Bez kontextu těžko přeložitelné -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Připojení není povoleno souborem pravidel" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Připojení odmítnuto" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Připojení odmítnuto serverem" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Připojení resetováno sítí" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Připojení resetováno druhou stranou" -#: ../../locales/../src/engine/ControlSocket.cpp:559 +#: ../../locales/../src/engine/ControlSocket.cpp:511 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" -msgstr[0] "Po %d sekundě nečinnosti vypršel časový limit" -msgstr[1] "Po %d sekundách nečinnosti vypršel časový limit" -msgstr[2] "Po %d sekundách nečinnosti vypršel časový limit" +msgstr[0] "Připojení vypršelo po %d sekundě nečinnosti" +msgstr[1] "Připojení vypršelo po %d sekundách nečinnosti" +msgstr[2] "Připojení vypršelo po %d sekundách nečinnosti" -#: ../../locales/../src/interface/netconfwizard.cpp:1077 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Připojení překročilo časový limit." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Připojení se serverem ztraceno." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "Připojení s proxy navázáno, vykonává se handshake..." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Připojení se serverem bylo předčasně ukončeno." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Připojení s testovacím serverem se nezdařilo." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Převést soubor s klíčem" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2062 #, c-format msgid "Copy (%d) of %s" msgstr "Kopie (%d) %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1829 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2041 #, c-format msgid "Copy of %s" msgstr "Kopie %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Kopírovat URL vybraných položek do schránky včetně hesla." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopírovat URL vybraných položek do schránky." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" -msgstr "Nelze navázat připojení %s" +msgstr "Nelze navázat připojení k %s" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Nelze získat přístup k %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Nepodařilo se přidat certifikát do dočasného seznamu důvěryhodných" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Nelze přidat připojení do Správce míst" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Nelze dokončit operaci" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Nelze se připojit k serveru" -#: ../../locales/../src/engine/ControlSocket.cpp:1087 +#: ../../locales/../src/engine/ControlSocket.cpp:1091 #, c-format msgid "Could not connect to server: %s" msgstr "Nelze se připojit k serveru: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:803 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Nelze převést příkaz do kódování používaného serverem" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Nelze převést soukromý klíč" -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/RemoteListView.cpp:2579 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Nelze kopírovat URL" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Nelze kopírovat certifikát" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Nelze kopírovat data" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Nelze vytvořit CFURL z cesty %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Nelze vytvořit URI tohoto přenosu." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Nelze vytvořit místní soubor %s\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Nelze vytvořit mutex protokolu: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2193 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Nelze vytvořit chráněnou záložku z adresy URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2224 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2527,11 +2684,11 @@ "Buď není správně nainstalováno rozšíření shellu nebo jste soubory nepřetáhli " "do okna aplikace Průzkumník." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4095 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" -msgstr "Nelze se připojit k serveru" +msgstr "Nelze navázat spojení se serverem" -#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2543,11 +2700,16 @@ "“ z příkazového řádku nebo nastavením proměnné prostředí " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Nelze vytvořit vlastní přihlašovací sekvenci." -#: ../../locales/../src/engine/tlssocket.cpp:956 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Nelze vygenerovat klíč" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2555,7 +2717,7 @@ "Nelze získat rozlišující název vydavatele certifikátu, vykonání funkce " "gnutls_x509_get_issuer_dn se nezdařilo" -#: ../../locales/../src/engine/tlssocket.cpp:933 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2563,37 +2725,37 @@ "Nelze získat rozlišující název předmětu certifikátu, vykonání funkce " "gnutls_x509_get_dn se nezdařilo" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Nelze získat plnou vzdálenou cestu." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Nepodařilo se získat nativní cestu z CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Nelze získat cestu z adresy URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Nelze získat odpověď od fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "" "Nelze získat složku pro dočasné soubory, do které měl být soubor stažen." -#: ../../locales/../src/engine/tlssocket.cpp:879 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Nelze importovat certifikáty druhé strany, vykonání funkce " -"gnutls_x509_crt_import se nezdařilo" - -#: ../../locales/../src/engine/tlssocket.cpp:874 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Nelze inicializovat strukturu certifikátů druhé strany, vykonání funkce " -"gnutls_x509_crt_init se nezdařilo" +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Nelze inicializovat Winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2604,15 +2766,21 @@ "přístup.\n" "Změny provedené ve správci míst nebudou uloženy." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Nelze načíst soubor s klíčem" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Nelze načíst soukromý klíč" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2622,7 +2790,7 @@ "Nelze získat místní složku odpovídající vzdálené složce „%s“.\n" "Zakázat synchronizované procházení a pokračovat ve změně vzdálené složky?" -#: ../../locales/../src/interface/state.cpp:361 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2632,7 +2800,7 @@ "Nelze získat místní složku odpovídající vzdálené složce „%s“.\n" "Synchronizované procházení bylo zakázáno." -#: ../../locales/../src/interface/state.cpp:266 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2642,81 +2810,127 @@ "Nelze získat vzdálenou složku odpovídající místní složce „%s“.\n" "Synchronizované procházení bylo zakázáno." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/updater.cpp:741 +#, fuzzy, c-format +msgid "Could not obtain size of '%s'" +msgstr "Nelze otevřít soubor protokolu: %s" + +#: ../../locales/../src/interface/updater.cpp:755 +#, fuzzy, c-format +msgid "Could not open '%s'" +msgstr "Nelze otevřít soubor protokolu: %s" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2579 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Nelze otevřít schránku" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:177 -#: ../../locales/../src/engine/logging.cpp:208 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Nelze otevřít soubor protokolu: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Nelze analyzovat vzdálenou cestu." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Nelze analyzovat adresu serveru:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 +#: ../../locales/../src/interface/updater.cpp:764 +#, fuzzy, c-format +msgid "Could not read from '%s'" +msgstr "Nelze číst ze soketu: %s" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "Nelze číst z datového soketu." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:173 #, c-format msgid "Could not read from socket: %s" msgstr "Nelze číst ze soketu: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Nelze přečíst položku serveru." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2595 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Nelze se přesunou na ofset %s uvnitř souboru" +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Nelze přijmout data ze serveru." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Nelze obnovit přístup k adresářům" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Nelze se přesunou na ofset %d uvnitř souboru" + +#: ../../locales/../src/engine/http/filetransfer.cpp:119 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "Nelze se přesunout na začátek souboru" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2502 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Nelze se přesunout na konec souboru" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Nelze poslat příkaz pro fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2623 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Nelze poslat příkaz pro fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Certifikáty peer nelze řadit" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "Nelze spustit vlákno pro vstup a výstup" -#: ../../locales/../src/engine/ControlSocket.cpp:1064 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Nelze začít handshake s proxy: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Nelze spustit přenos" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:869 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " "%s" msgstr "Nelze zapsat „%s“, změny ve správci míst nelze uložit: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" -msgstr "Nelze zapsat „%s“, nelze přidat oblíbenou položku: %s" +msgstr "Nelze zapsat „%s“, nelze přidat záložku: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" -msgstr "Nelze zapsat „%s“, nelze uložit globální oblíbenou položku: %s" +msgstr "Nelze zapsat „%s“, nelze uložit globální záložku: %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1580 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2725,119 +2939,121 @@ "Nelze zapsat „%s“, frontu nelze uložit.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2480 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Nelze zapsat „%s“, vybraná místa nelze exportovat: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Nelze zapsat „%s“:" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Nelze zapsat soubor s klíčem: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Nelze zapsat místní soubor" -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/engine/logging.cpp:280 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Nelze zapsat do souboru protokolu: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:882 -#: ../../locales/../src/engine/ControlSocket.cpp:986 +#: ../../locales/../src/engine/ControlSocket.cpp:913 +#: ../../locales/../src/engine/ControlSocket.cpp:1008 +#: ../../locales/../src/engine/http/request.cpp:120 #, c-format msgid "Could not write to socket: %s" msgstr "Nelze zapsat do soketu: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Country:" msgstr "Země:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "&Vytvořit nový soubor" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "&Vytvořit chybějící místní složku a vstoupit do ní" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "&Vytvořit chybějící vzdálenou složku a vstoupit do ní" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Vytvořit novou podsložku v aktuální složce" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Vytvořit novou podsložku v aktuální složce a vstoupit do ní" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Vytvoří nový prázdný soubor v aktuální složce" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "&Vytvořit složku a vstoupit do ní" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Nová složka" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2668 msgid "Create empty file" msgstr "Vytvořit prázdný soubor" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Vytváření složky" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1951 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Vytváření složky „%s“..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Kritická chyba" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Kritická chyba:" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Kritická chyba při přenosu souboru" -#: ../../locales/../src/engine/ControlSocket.cpp:119 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kritická chyba při přenosu souboru po přenesení %s v %s" -#: ../../locales/../src/interface/state.cpp:352 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2846,98 +3062,102 @@ "Aktuální vzdálená složka (%s) není pod kořenem synchronizace (%s).\n" "Synchronizované procházení je zakázáno." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Aktuální způsob přenosu je nastaven na ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Aktuální způsob přenosu je nastaven na automatickou detekci." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Aktuální způsob přenosu je nastaven na binární." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Křivka:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "V&lastní" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Vlastní sada filtrů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Vlastní server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Azurová" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Typ &dat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "&Desítkové předpony s použitím značek SI (např. 1 kB = 1000 bajtů)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "Vý&chozí" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "&Odstranit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" -msgstr "Porovnání složek" +msgstr "&Porovnání složek" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "&Zakázat všechny" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "&Neukládat hesla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Akce p&o dvojitém kliknutí na složku:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "D&uplikovat" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:53 msgid "DOS-like with virtual paths" msgstr "Jako DOS, ale s virtuálními cestami" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Nebezpečný typ souboru" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Data" -#: ../../locales/../src/interface/netconfwizard.cpp:994 -#: ../../locales/../src/interface/netconfwizard.cpp:1058 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Datový soket se uzavřel příliš brzy." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Datum" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Formátování data" @@ -2953,15 +3173,15 @@ msgid "Debug" msgstr "Ladění" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Nastavení ladění" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Výchozí mís&tní složka:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:45 msgid "Default (Autodetect)" msgstr "Výchozí (automatická detekce)" @@ -2969,17 +3189,17 @@ msgid "Default editor not properly quoted." msgstr "Výchozí editor nemá správně zadány uvozovky." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Výchozí chování, pokud soubor již existuje" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Výchozí v&zdálená složka:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2987,7 +3207,7 @@ "Výchozí vzdálenou cestu nelze zpracovat. Ujistěte se, zda je platnou " "absolutní cestou pro vybraný typ serveru." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Výchozí jazyk systému" @@ -2996,12 +3216,12 @@ msgstr "Výchozí režim přenosu:" # asi by nemměla být dvojtečka -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Výchozí typ přenosu:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Výchozí: http://ip.filezilla-project.org/ip.php" @@ -3011,7 +3231,7 @@ msgstr "" "Interval mezi neúspěšnými pokusy o připojení musí být mezi 1 a 999 sekundami." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3029,83 +3249,85 @@ "Připojení odloženo o %d sekund vzhledem k předchozímu neúspěšnému pokusu o " "připojení..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297 msgid "Delete Site Manager entry" msgstr "Odstranit položku ve správci míst" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Odstranit vybranou složku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Odstranit vybrané soubory a složky" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Odstraňování „%s“" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Odstraňování %u souborů z „%s“" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Odstraňování složek" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Odstraňování více nezávislých složek není zatím podporováno" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Odstraňování symbolického odkazu" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Plocha" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Podrobnosti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Podrobnosti nového klíče:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:793 msgid "Detected newer version of FileZilla" msgstr "Zjištěna novější verze aplikace FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "&Složky" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Směr" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Složky:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Složka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:463 -#: ../../locales/../src/interface/Mainfrm.cpp:2165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Přístupová práva složky" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Porovnání složek" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Porovnání složek se nezdařilo" @@ -3113,124 +3335,123 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "Složka se souborem protokolu neexistuje, nebo má neplatný název." -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "Výpis složky a &filtrů ..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Výpis složky přerušen uživatelem" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2056 msgid "Directory listing failed" msgstr "Výpis složky se nezdařil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" -msgstr "Filtry výpisu složky" +msgstr "Výpis složky filtry" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Výpis složky „%s“ proběhl úspěšně" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Výpis složky proběhl úspěšně" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Z&akázat všechny" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Zakázat synchronizované procházení a pokračovat ve změně vzdálené složky?" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" "Pokud se přestane správně zobrazovat obsah složek, zakažte toto nastavení." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Odpojení od serveru" -#: ../../locales/../src/engine/ControlSocket.cpp:80 -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:988 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:212 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:879 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:881 -#: ../../locales/../src/interface/queue.cpp:325 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:914 +#: ../../locales/../src/engine/ControlSocket.cpp:1010 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:121 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Odpojen od serveru" -#: ../../locales/../src/engine/ControlSocket.cpp:1019 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 +#: ../../locales/../src/engine/ControlSocket.cpp:1039 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:189 #, c-format msgid "Disconnected from server: %s" msgstr "Odpojen od serveru: %s" -#: ../../locales/../src/interface/queue.cpp:324 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Odpojování od předchozího serveru" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Odpojení od aktuálně zobrazeného serveru" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Zobrazí dialog s informacemi o programu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "&Nepoužívat výchozí editor" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "&Nedělat nic" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Provést to samé se &všemi soubory, které jsou upravovány" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Opravdu chcete ukončit aplikaci FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Opravdu chcete odstranit všechny položky ve správci míst a vymazat frontu " "přenosů?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Opravdu chcete odstranit všechny položky ve správci míst?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1299 msgid "Do you really want to delete selected entry?" msgstr "Opravdu chcete odstranit vybranou položku?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Opravdu chcete odstranit frontu přenosů?" -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Opravdu chcete poslat „%s“ serveru?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Chcete znovu otevřít tento soubor?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Dokumentace" @@ -3238,47 +3459,47 @@ msgid "Don't use external IP address on &local connections." msgstr "Nepoužívat externí IP adresu pro &místní připojení." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "Tečkové soubory jsou soubory začínající tečkou, například .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Akce po dvojitém kliknutí" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Stáhnout" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Limit s&tahování:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:597 #, c-format msgid "Download limit: %s/s" msgstr "Limit pro stahování: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:600 msgid "Download limit: none" msgstr "Limit pro stahování: žádný" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:518 -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Stáhnout výsledky hledání" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Stáhnout vybranou složku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Stáhnout vybrané soubory a složky" -#: ../../locales/../src/interface/Mainfrm.cpp:965 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3287,32 +3508,24 @@ "Rychlost stahování: %s/s\n" "Rychlost odesílání: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Stahování" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:148 #, c-format msgid "Downloading %s" msgstr "Stahování %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Stahování více nesouvisejících složek není dosud podporováno" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Stahování výsledků hledání" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Stahování aktualizace..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:109 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:112 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3320,11 +3533,11 @@ "Přetažení mezi různými instancemi aplikace FileZilla zatím nebylo " "implementováno." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:115 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:117 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Přetažení mezi různými servery zatím nebylo implementováno." @@ -3332,16 +3545,16 @@ msgid "Dupl&icate" msgstr "Dupli&kovat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "Povolit &všechny" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "Ot&evřít složku" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Sp&ouštění" @@ -3349,47 +3562,47 @@ msgid "E&xit" msgstr "&Konec" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." msgstr "&Exportovat..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "E-Mail:" msgstr "E-mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Každý filtr musí mít alespoň jednu podmínku." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Upravit filtry" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "Upravovat soubor nastaveným editorem a odeslat změny na server." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "Úprava složek není podporována" -#: ../../locales/../src/interface/LocalListView.cpp:1582 -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1711 +#: ../../locales/../src/interface/LocalListView.cpp:1720 msgid "Editing failed" msgstr "Úpravy se nezdařily" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Úprava výsledků hledání" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "E-mail:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Empty command" msgstr "Prázdný příkaz" @@ -3397,7 +3610,7 @@ msgid "Empty command." msgstr "Prázdný příkaz." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2058 msgid "Empty directory listing" msgstr "Prázdný výpis složky" @@ -3409,13 +3622,13 @@ msgid "Empty file extension." msgstr "Prázdná přípona." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Filtr musí mít název." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Chybí název" @@ -3423,81 +3636,97 @@ msgid "Empty quoted string." msgstr "Prázdný řetězec v uvozovkách." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "P&ovolit všechny" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Povolit &filtrování neplatných znaků" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Šifrovaný" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Šifrování" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Klíč pro šifrování:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Klíč pro šifrování:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Podrobnosti šifrování" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Ukončit porovnání a změnit řazení?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Ukončit porovnání a otevřít rychlé vyhledávání?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "Zadat &vlastní příkaz..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Zadejte 0 pro neomezenou rychlost." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:1867 msgid "Enter command" msgstr "Zadejte příkaz" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Zadat vlastní příkaz" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Otevřít složku" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Zadejte název filtru" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Zadejte centrální heslo" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Zadejte název sady filtrů" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Zadejte nový název sady filtrů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Zadejte heslo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Otevřít vybranou složku" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3505,11 +3734,11 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Zadejte adresu serveru.\n" -"Pokud chcete zadat protokol, připojte jeho označení před název hostitele. " -"Pokud žádný nezadáte použije se výchozí hodnota (ftp://).\n" -"Do tohoto pole můžete též zadat kompletní URL ve formátu protokol://uživatel:" -"heslo@hostitel:port, hodnoty v ostatních polích pak budou přepsány.\n" +"Zadejte adresu serveru. Pokud chcete zadat protokol, připojte jeho označení " +"před název hostitele. Pokud žádný nezadáte použije se výchozí hodnota " +"(ftp://). Do tohoto pole můžete též zadat kompletní URL ve formátu " +"protokol://uživatel:heslo@hostitel:port, hodnoty v ostatních polích pak " +"budou přepsány.\n" "\n" "Podporované protokoly:\n" "- ftp:// pro běžné FTP s možností šifrování\n" @@ -3517,7 +3746,7 @@ "- ftps:// pro FTP přes TLS (implicitní)\n" "- ftpes:// pro FTP přes TLS (explicitní)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3526,118 +3755,135 @@ "Zadejte heslo pro soubor „%s“.\n" "Převedený soubor bude chráněn stejným heslem." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Zadejte port, na kterém server naslouchá.\n" -"Výchozí port pro FTP je 21, pro SFTP 22." +"Zadejte port, na kterém server naslouchá. Výchozí port pro FTP je 21, pro " +"SFTP je 22." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Zadejte jméno uživatele" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Zadejte uživatelské jméno a heslo" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Chyba" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Při exportu nastavení došlo k chybě" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Při importu došlo k chybě" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1657 msgid "Error loading queue" msgstr "Chyba při načítání fronty" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:213 -#: ../../locales/../src/interface/filter.cpp:970 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1833 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:938 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1561 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:786 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:849 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Chyba při načítání XML souboru" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1550 msgid "Error saving queue" msgstr "Chyba při ukládání fronty" #: ../../locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Chyba spouštění programu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1851 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2224 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1581 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:870 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2481 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Chyba při zápisu XML souboru" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:284 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "Chyba:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Příklad: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Příklady" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Spo&uštění" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Spustitelný soubor neobsahuje informaci o verzi, nelze zkontrolovat " "aktualizace." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Průzkumník" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Exportovat f&iltry" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Exportovat &frontu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Exportovat &nastavení" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Nastavení exportu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Ná&zev filtru:" @@ -3645,28 +3891,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 msgid "FTP - File Transfer Protocol" msgstr "FTP - File Transfer Protocol" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - File Transfer Protocol s možností šifrování" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Nezabezpečený File Transfer Protocol" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "FTP jádro není inicializováno, nelze se připojit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Udržovat připojení FTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP proxy" @@ -3683,132 +3928,145 @@ "FTP používá sekundární připojení pro přenos dat. Tato další připojení mohou " "být navázána dvěma způsoby." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP přes explicitní TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:24 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP přes implicitní TLS" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1778 -#: ../../locales/../src/interface/LocalTreeView.cpp:846 -#: ../../locales/../src/interface/LocalTreeView.cpp:1099 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1919 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Nezdařilo se změnit složku" -#: ../../locales/../src/interface/FileZilla.cpp:137 -#: ../../locales/../src/interface/FileZilla.cpp:152 -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Nezdařilo se změnit jazyk" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Nepodařilo se převést příkaz na 8bitovou znakovou sadu" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2261 msgid "Failed to copy or move sites" msgstr "Nezdařilo se zkopírovat nebo přesunout místa" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Nezdařilo se vytvořit záložní kopii XML souboru" -#: ../../locales/../src/interface/netconfwizard.cpp:803 -msgid "Failed to create listen socket, aborting" -msgstr "Nezdařilo se vytvořit naslouchající soket, probíhá přerušení" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "" +"Nezdařilo se vytvořit naslouchající soket na portu %d, probíhá přerušení." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4078 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Nezdařilo se vytvořit naslouchající soket pro aktivní režim přenosu" -#: ../../locales/../src/interface/LocalTreeView.cpp:625 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Nepodařilo se dešifrovat heslo serveru." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Nezdařilo se získat cestu ke složce „Dokumenty“" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" -msgstr "Nezdařilo se získat cestu k ploše" +msgstr "Nezdařilo se získat cestu k Ploše" -#: ../../locales/../src/interface/netconfwizard.cpp:961 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Nezdařilo se získat adresu kontrolního připojení druhé strany, připojení " "ukončeno." -#: ../../locales/../src/interface/netconfwizard.cpp:968 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Nezdařilo se získat adresu datového připojení druhé strany, připojení " "ukončeno." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Nezdařilo se inicializovat FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:754 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:120 msgid "Failed to initialize TLS." msgstr "Nezdařilo se inicializovat TLS." +#: ../../locales/../src/interface/FileZilla.cpp:97 +msgid "Failed to initialize networking" +msgstr "Nezdařilo se inicializovat práci se sítí" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Nezdařilo se načíst panely, poškozené soubory prostředků?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Chyba při načítání soukromého klíče: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2492 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Nezdařilo se otevřít „%s“ pro přidávání nebo zapisování" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2558 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Nezdařilo se otevřít „%s“ pro čtení" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Nezdařilo se otevřít „%s“ pro zapisování" -#: ../../locales/../src/engine/ControlSocket.cpp:346 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Failed to parse returned path." msgstr "Nelze analyzovat vrácenou cestu." -#: ../../locales/../src/interface/netconfwizard.cpp:1023 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Nezdařilo se přijmout data" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Nezdařilo se získat výpis složky" -#: ../../locales/../src/interface/netconfwizard.cpp:731 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Nezdařilo se získat externí IP adresu, probíhá přerušení" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Nezdařilo se získat externí IP adresu, probíhá přerušení." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3785 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "Nezdařilo se získat externí IP adresu, použije se místní" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3806 -msgid "Failed to retrieve local ip address." -msgstr "Nezdařilo se získat místní IP adresu." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Nezdařilo se získat místní IP adresu. Probíhá přerušení." -#: ../../locales/../src/interface/netconfwizard.cpp:707 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Nezdařilo se získat místní IP adresu. Probíhá přerušení" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Nezdařilo se získat místní IP adresu." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Nezdařilo se získat externí IP adresu." @@ -3816,13 +4074,13 @@ msgid "Failed to send command." msgstr "Nezdařilo se poslat příkaz." -#: ../../locales/../src/interface/FileZilla.cpp:152 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Nezdařilo se nastavit jazyk na %s (%s), používá se výchozí jazyk systému" -#: ../../locales/../src/interface/FileZilla.cpp:130 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3830,43 +4088,42 @@ "Nezdařilo se nastavit jazyk na %s (%s), používá se výchozí jazyk systému " "(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:119 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Nezdařilo se nastavit jazyk na %s (%s), používá se výchozí jazyk systému." -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Nezdařilo se nastavit jazyk na %s, používá se výchozí jazyk systému" -#: ../../locales/../src/interface/FileZilla.cpp:126 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Nezdařilo se nastavit jazyk na %s, používá se výchozí jazyk systému (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:116 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Nezdařilo se nastavit jazyk na %s, používá se výchozí jazyk systému." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Chyba v nastavení" -#: ../../locales/../src/engine/tlssocket.cpp:1105 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Nezdařilo se ověřit certifikát druhé strany" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Došlo k chybě při zápisu do souboru %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Došlo k chybě při zápisu XML souboru" @@ -3878,15 +4135,15 @@ msgid "Fall back to active mode" msgstr "Vrátit se k aktivnímu režimu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Sou&bor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Sou&bory" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Soubor" @@ -3894,11 +4151,11 @@ msgid "File Types" msgstr "Typy souborů" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Popisovač souboru není soketem" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Soubor neobsahuje žádné údaje, které lze importovat." @@ -3906,7 +4163,7 @@ msgid "File editing" msgstr "Úprava souborů" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "File exists" msgstr "Soubor existuje" @@ -3914,7 +4171,7 @@ msgid "File exists action" msgstr "Soubor již existuje" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Soubor byl změněn" @@ -3922,63 +4179,67 @@ msgid "File lists" msgstr "Výpis souborů a složek" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Soubor nebyl nalezen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Hledání souboru" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Přenos souborů přerušen uživatelem" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Přenos souborů přerušen uživatelem po přenesení %s v %s" -#: ../../locales/../src/engine/ControlSocket.cpp:136 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Přenos souboru se nezdařil" -#: ../../locales/../src/engine/ControlSocket.cpp:121 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Přenos souborů se nezdařil po přenesení %s v %s" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Přenos souboru přeskočen" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Přenos souboru úspěšný" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Přenos souboru úspěšný, přeneseno %s za %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1136 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Přenosy souborů stále probíhají." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Soubor by měl být přenášen jako ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Soubor by měl být přenášen jako binární." -#: ../../locales/../src/interface/FileZilla.cpp:407 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "FileZilla hlásí chybu" @@ -3990,74 +4251,79 @@ "FileZilla nyní může otestovat vaše nastavení, aby se ujistila, že je vše " "nastaveno správně." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "Aplikace FileZilla je již k serveru připojena." -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "Aby se změna jazyka uplatnila, je nutné aplikaci FileZilla restartovat." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Aktualizace aplikace FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "S&tavový řádek seznamu souborů" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Název souboru" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Filtry &názvů souborů..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2193 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Nelze sestavit název souboru pro složku %s a název souboru %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Filename invalid" msgstr "Neplatný název souboru" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 msgid "Filename unchanged" msgstr "Název souboru nezměněn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Název souboru:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Názvy souborů nesmí obsahovat žádný z těchto znaků: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "Názvy souborů nesmí obsahovat žádný z těchto znaků: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Právě upravované soubory" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" +"Soubory, které splňují pravidlo filtru nejsou ve výpisu složky zobrazeny." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Soubory nebyly nalezeny" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Velikost souboru" @@ -4065,64 +4331,69 @@ msgid "Filesize format" msgstr "Formát velikosti" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Typ souboru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Přidružení podle typu souboru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Filtr platí pro:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Filtrovat neplatné znaky v názvech souborů" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Filtr s tímto názvem již existuje" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" -msgstr "Odfiltrovat položky splňující všechny následující podmínky" +msgstr "Filtrovat položky, které odpovídají všem následujícím parametrům" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" -msgstr "Odfiltrovat položky splňující některé následující podmínky" +msgstr "" +"Fiiltrovat položky, které odpovídají některému z následujících parametrů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" -msgstr "Odfiltrovat položky nesplňující žádné následující podmínky" +msgstr "Filtrovat položky, které neodpovídají žádné následujícím parametrům" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Filtrovat položky, které neodpovídají všem následujícím parametrům" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Sada filtrů s tímto názvem již existuje" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtrovat výpisy složek" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Ověření filtru se nezdařilo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Hledat s&oubory" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Hledat s&ložky" @@ -4134,16 +4405,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Otisk (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" msgstr "Otisk:" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Průvodce nastavením firewallu a routeru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4155,7 +4427,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Pro zajištění spolehlivosti byste měli zadat rozsah alespoň 10 portů." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4163,46 +4435,55 @@ "Pro tuto relaci bude použito výchozí nastavení, změny nastavení nebudou " "uloženy." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Vynutit &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Vynutit zobrazování &skrytých souborů" -#: ../../locales/../src/interface/Mainfrm.cpp:644 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Vynutit zobrazování skrytých souborů" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Specifikace formátu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Formát: Přípona, následovaná správně uvozeným příkazem a jeho parametry." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:646 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Nalezena nová %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Funkce %s selhala" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Další dokumentace" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 msgid "General" -msgstr "Základní" +msgstr "Všeobecné" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Nastala chyba všeobecného SOCKS serveru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Vygenerovat..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Všeobecná proxy" @@ -4211,129 +4492,141 @@ msgid "Get external IP address from the following URL:" msgstr "Získat externí IP adresu z následujícího URL:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Získat pomoc" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Zadaný název sady filtrů již existuje, přepsat?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" -msgstr "Globální oblíbené položky" +msgstr "Globální záložky" -#: ../../locales/../src/engine/tlssocket.cpp:210 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Chyba GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Chyba GnuTLS %d v %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Chyba GnuTLS %d v %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:204 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Chyba GnuTLS %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Zelená" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Oprávnění skupiny" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "&Vysoká" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP přes TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Skrytý" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:905 -#: ../../locales/../src/interface/queue.cpp:992 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Vysoká" -#: ../../locales/../src/interface/queue.cpp:907 -#: ../../locales/../src/interface/queue.cpp:994 +#: ../../locales/../src/interface/queue.cpp:938 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Nejvyšší" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Nejvyšší využitelný port musí být číslo mezi 1024 a 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Podržením klávesy SHIFT se stav filtrů bude na obou stranách přepínat " "současně." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Hostitel není spuštěn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Otisk hostitelského klíče:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Nesouhlasí hostitelský klíč" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Hostitel začíná „[“, ale ukončující část závorky nebyla nalezena." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Hostitel je nedostupný" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Hostitel:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algoritmus hostitelského klíče:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "hodin," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"&Neznám centrální heslo. Odstranit všechna hesla uložená pod tímto klíčem." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "IS&O 8601 (příklad: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "SOCKS4 proxy nepodporuje adresy IPv6" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4342,7 +4635,7 @@ "Pokud během této doby nebudou žádná data přijata nebo odeslána, připojení " "bude ukončeno a aplikace FileZilla se pokusí navázat nové." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "Při hlášení chyb uveďte protokoly s nastavenou úrovní „Podrobné“." @@ -4366,7 +4659,7 @@ "Pokud je povolen návrat k druhému režimu, budete schopni se připojit k " "nesprávně nastaveným serverům, které odmítnou vybraný režim přenosu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4374,7 +4667,7 @@ "Pokud změna hostitelského klíče nebyla očekávána, obraťte se na správce " "serveru." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4382,14 +4675,14 @@ "Pokud problém potrvá, některý router nebo firewall blokuje aplikaci " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" "Pokud problém potrvá, některý router nebo firewall stále přerušuje připojení." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4399,7 +4692,7 @@ "přidáním „.1“ za konec názvu souboru (což případně přepíše starší soubory " "protokolu) a vytvoří se nový soubor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4407,18 +4700,18 @@ "Pokud symbolický odkaz ukazuje na složku, může aplikace FileZilla buď " "odstranit symbolický odkaz nebo odstranit obsah odkazované složky." -#: ../../locales/../src/interface/netconfwizard.cpp:640 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "Pokud problém potrvá, obraťte se na výrobce routeru nebo firewallu." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "Pokud problém potrvá, kontaktujte výrobce routeru." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4428,7 +4721,7 @@ "synchronizován se serverem. Pokud se čas liší (například jiná časová zóna), " "nastavte posun časové zóny ve správci míst." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4436,7 +4729,7 @@ "Pokud používáte porovnání podle času souboru, jsou za stejné považovány " "takové soubory, jejichž rozdíl času nepřekročí tento práh." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Po změně jazyka je třeba aplikaci FileZilla restartovat." @@ -4448,11 +4741,11 @@ "Po kliknutí na tlačítko Test se aplikace FileZilla připojí k probe.filezilla-" "project.org a provede několik jednoduchých testů." -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Pokud ukončíte aplikaci FileZilla, vaše změny budou ztraceny." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4462,7 +4755,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "Pokud budou výsledkem nějaké chyby, není vaše nastavení v pořádku." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4470,7 +4763,7 @@ "Máte-li problém získat výpis složky nebo přenést soubory, zkuste změnit " "výchozí režim přenosu." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4504,22 +4797,22 @@ "Pokud používáte router, ubezpečte se, že všechny tyto porty jsou " "přesměrovány na počítač, na kterém je aplikace FileZilla spuštěna." -#: ../../locales/../src/interface/netconfwizard.cpp:611 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "Pokud router pořád mění IP adresu, obraťte se na výrobce routeru." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importovat data ze starší verze" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Nastavení importu" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Úspěšný import" @@ -4545,7 +4838,7 @@ "aplikace FileZilla nemá vliv na to, jaký port operační systém vybere." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4563,19 +4856,11 @@ "FileZilla zeptá serveru na port a pak se na něj připojí. K tomuto není " "potřeba mnoho nastavovat." -#: ../../locales/../src/engine/tlssocket.cpp:1117 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Neúplný řetězec, vrchní certifikát není certifikát certifikační autority " -"podepsaný sám sebou" - -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Nesprávné heslo" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4583,7 +4868,7 @@ "Nelze získat informaci o poslední verzi aplikace FileZilla. Opakujte akci " "později." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:745 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Inicializace TLS..." @@ -4591,13 +4876,13 @@ msgid "Insecure algorithm!" msgstr "Málo bezpečný algoritmus!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Nezabezpečený server, nepodporuje FTP přes TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:579 +#: ../../locales/../src/engine/server.cpp:603 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interaktivní" @@ -4605,29 +4890,29 @@ msgid "Interface" msgstr "Uživatelské rozhraní" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Přerušeno signálem" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/engine/ControlSocket.cpp:216 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Přerušeno uživatelem" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/http/request.cpp:38 +#: ../../locales/../src/engine/http/request.cpp:387 msgid "Invalid Content-Length" msgstr "Neplatný Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/http/request.cpp:271 msgid "Invalid HTTP Response" msgstr "Neplatná HTTP odpověď" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Předán neplatný argument" -#: ../../locales/../src/engine/ControlSocket.cpp:455 -#: ../../locales/../src/engine/ControlSocket.cpp:511 +#: ../../locales/../src/engine/ControlSocket.cpp:454 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4635,44 +4920,69 @@ "Přijata neplatná posloupnost znaků, vypíná se UTF-8. Pokud chcete vynutit " "používání UTF-8, nastavte UTF-8 ve správci míst." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/http/request.cpp:495 msgid "Invalid chunk size" msgstr "Neplatná velikost části" -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Přijata neplatná data" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Neplatné datum" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Neplatný název souboru" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, fuzzy, c-format +msgid "Invalid hash: %s\n" +msgstr "Neplatné jméno hostitele: %s" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Neplatný hostitel, po uzavírací závorce může následovat pouze dvojtečka a " "číslo portu." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Neplatné jméno hostitele: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Neplatný vstup" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:328 +msgid "Invalid line" +msgstr "Neplatný řádek" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Neplatná cesta" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Zadán neplatný port. Port musí mít hodnotu mezi 1 a 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4686,75 +4996,75 @@ "ftps:// pro FTP přes TLS (implicitní) a\n" "ftpes:// pro FTP přes TLS (explicitní)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Neplatný hostitel proxy, po uzavírací závorce může následovat pouze " "dvojtečka a číslo portu." -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Neplatný regulární výraz" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Neplatný regulární výraz v podmínkách hledání." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/http/request.cpp:280 msgid "Invalid response code" msgstr "Neplatný kód odpovědi" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Neplatné podmínky vyhledávání: %s" # Nepřesné -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Neplatná cesta místa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Neplatná velikost v podmínce" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Neplatné uživatelské jméno." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Neplatná hodnota ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Neplatný hodnota pro hinty" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Obrátit filtr" + +#: ../../locales/../src/interface/verifycertdialog.cpp:260 msgid "Jurisdiction country:" msgstr "Země soudní pravomoci:" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Jurisdiction locality:" msgstr "Místo soudní pravomoci:" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:261 msgid "Jurisdiction state or province:" msgstr "Stát nebo oblast soudní pravomoci:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Složky vždy na začátku výpisu" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4765,7 +5075,7 @@ "snaží server otestovat, zda tuto vlastnost podporuje, ale tyto testy mohou " "selhat." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Výměna klíče" @@ -4773,122 +5083,146 @@ msgid "Key exchange:" msgstr "Výměna klíče:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:576 +#: ../../locales/../src/engine/server.cpp:601 msgid "Key file" msgstr "Soubor s klíčem" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Identifikátor klíče:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Ne&jnižší" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Jazyk" -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Jazyk změněn" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Poslední změna" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Rozložení" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1810 +msgid "Leave empty to keep existing password." +msgstr "Pro zachování stávajícího hesla nechte prázdné." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Maximální &počet souběžných stahování:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Ma&ximální počet souběžných odesílání:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Omezit místní porty" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Omezit velikost souboru protokolu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Omezení:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/http/request.cpp:451 msgid "Line length exceeded" msgstr "Překročena délka řádku" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Sestaveno s" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Naslouchající soket uzavřen" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "Výpis:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "&Nejnižší využitelný port:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Místní" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Místní adresa se již používá" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Byl uzavřen koncový bod" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Místní soubor" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Místní soubor neexistuje." -#: ../../locales/../src/interface/updater.cpp:370 -#: ../../locales/../src/interface/updater.cpp:462 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Místní soubor je %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Jako \"místní soubor\" je vybrána složka místo běžného souboru." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Místní soubor není platný název souboru." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Hledání místních souborů" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Místní filtry:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Zpracování místní cesty:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Místní složka:" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "" + +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Locality:" msgstr "Lokalita:" @@ -4896,12 +5230,16 @@ msgid "Log file" msgstr "Soubor protokolu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Přihlášen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Protokol činností" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4910,7 +5248,7 @@ "podporovat UTF-8. Nelze se vrátit k místní znakové sadě, protože je použito " "proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4918,8 +5256,8 @@ "Údaje pro přihlášení obsahují i jiné než ASCII znaky a server by nemusel " "podporovat UTF-8. Probíhá pokus o použití místní znakové sady." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" "Přihlašovací sekvence byla dokončena, ale přesto nejste přihlášen. Pobíhá " "přerušení." @@ -4938,17 +5276,17 @@ "Způsob přihlašování je možné použít pouze spolu s FTP URL. Parametr musí být " "buď „%s“ nebo „%s“" -#: ../../locales/../src/interface/queue.cpp:900 -#: ../../locales/../src/interface/queue.cpp:987 +#: ../../locales/../src/interface/queue.cpp:931 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Nízká" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../locales/../src/interface/queue.cpp:929 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Nejnižší" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "Nejnižší využitelný port musí být číslo mezi 1024 a 65535." @@ -4956,159 +5294,201 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Purpurová" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Ujistěte se, že je soubor přístupný a je správně strukturovaným XML " "dokumentem." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:451 +#: ../../locales/../src/engine/http/request.cpp:462 +#: ../../locales/../src/engine/http/request.cpp:495 #, c-format msgid "Malformed chunk data: %s" msgstr "Chybně vytvořený blok dat: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/http/request.cpp:38 #, c-format -msgid "Malformed header: %s" -msgstr "Chybně vytvořená hlavička: %s" +msgid "Malformed request header: %s" +msgstr "Chybná hlavička požadavku: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Chybně vytvořená odpověď, server neposílá správné konce řádků" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/engine/http/request.cpp:514 +#, c-format +msgid "Malformed response body: %s" +msgstr "Chybná odpověď těla: %s" + +#: ../../locales/../src/engine/http/request.cpp:241 +#: ../../locales/../src/engine/http/request.cpp:247 +#: ../../locales/../src/engine/http/request.cpp:328 +#: ../../locales/../src/engine/http/request.cpp:379 +#: ../../locales/../src/engine/http/request.cpp:387 +#: ../../locales/../src/engine/http/request.cpp:444 +#, c-format +msgid "Malformed response header: %s" +msgstr "Chybná odpověď hlavičky: %s" + +#: ../../locales/../src/engine/http/request.cpp:400 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." +msgstr "" +"Neplatná odpověď: server poslal odpověď včetně těla, přestože sloveso " +"požadavku, nebo kód odpovědi toto nedovolují." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Ruční přenos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Centrální &heslo:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Centrální heslo:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Splňují všechny následující podmínky" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Splňují některé následující podmínky" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Nesplňují žádné následující podmínky" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Nesplňující všechny následující podmínky" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "&Maximální počet souběžných přenosů:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Selhala alokace paměti" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1750 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Protokol zpráv" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Pozice protokolu zpráv" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Příliš velká zpráva" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" -msgstr "minut" +msgstr "Minut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Posunout &dolů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Posunout &nahoru" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Počítač" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Dokumenty" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:772 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:775 msgid "My Sites" msgstr "Místa" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "Neznámý" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Název" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1264 msgid "Name already exists" msgstr "Název již existuje" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." -msgstr "Název oblíbené položky již existuje." +msgstr "Název záložky již existuje." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Název:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Přirozené řazení" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Musíte zadat název filtru" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Musíte zadat platnou místní cestu" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Musíte zadat platnou vzdálenou cestu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1049 msgid "Need to specify a character encoding" msgstr "Musíte určit znakovou sadu" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Ani nodename, ani servname nebylo poskytnuto, nebo není známé" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "V požadované rodině adres nemá síťový hostitel žádnou síťovou adresu" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Síť je nedostupná" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Nikdy" @@ -5118,39 +5498,39 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" -msgstr "&Nová záložka" +msgstr "&Nová karta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "&Nová položka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2180 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2419 msgid "New bookmark" -msgstr "Nová oblíbená položka" +msgstr "Nová záložka" -#: ../../locales/../src/interface/LocalTreeView.cpp:1126 -#: ../../locales/../src/interface/RemoteListView.cpp:1310 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1340 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Nová složka" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Nové funkce a zlepšení v %s" @@ -5159,41 +5539,41 @@ msgid "New filter" msgstr "Nový filtr" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:953 msgid "New folder" msgstr "Nová složka" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2392 msgid "New site" msgstr "Nové místo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Vedle fronty přenosů" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:850 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:389 msgid "No" -msgstr "ne" +msgstr "Ne" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "S nodename není přidružena žádná adresa" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Nebyla vybrána žádná skupina pro export" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "No command given, aborting." msgstr "Nebyl zadán žádný příkaz, probíhá přerušení." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3757 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Nezadána žádná externí IP adresa, zkouší se výchozí." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Aktuálně nejsou upravovány žádné soubory." @@ -5201,95 +5581,91 @@ msgid "No filter name given" msgstr "Nezadán název filtru" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Nezadán hostitel, zadejte ho prosím." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Žádné ikony nejsou dostupné" -#: ../../locales/../src/interface/QueueView.cpp:2977 -msgid "No more files in the queue!" -msgstr "Ve frontě již nejsou další soubory!" - -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Nezadán název sady filtrů." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "K tomuto typu souboru není přidružen žádný program" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "Žádný program není přidružen k úpravě souborů s příponou „%s“." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "K hostiteli nevede žádná cesta" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Žádné výsledky hledání" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Žádná místa nejsou dostupná" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Nepodporovaná metoda ověřování SOCK5" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Nezadáno uživatelské jméno." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Nic" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Žádný nevybrán" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Nezotavitelná chyba při překladu názvů" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:903 -#: ../../locales/../src/interface/queue.cpp:990 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:570 +#: ../../locales/../src/engine/server.cpp:597 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 +#: ../../locales/../src/interface/queue.cpp:996 msgid "Normal" msgstr "Normální" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "Některé položky nelze znovu zařadit do fronty pro přenos." -#: ../../locales/../src/interface/state.cpp:179 -#: ../../locales/../src/interface/state.cpp:482 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Nepřipojen" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2054 msgid "Not connected to any server" msgstr "Nepřipojen k žádnému serveru" -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Nepřipojen k žádnému serveru." @@ -5297,23 +5673,32 @@ msgid "Not connected." msgstr "Nepřipojen." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Neinicializováno, je potřeba zavolat WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:646 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Poznámka: Tato funkce je podporována pouze při použití protokolu FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Upozornění: Ztracený klíč nelze obnovit." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Poznámka: Toto funguje jen s nešifrovaným FTP připojením." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "Poznámka: Použití všeobecné proxy přepne na pasivní typ připojení." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:247 +#: ../../locales/../src/engine/http/request.cpp:444 +msgid "Null character in line" +msgstr "Znak s nulovou hodnotou v řádku" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Počet desetinných míst:" @@ -5321,40 +5706,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Počet pokusů musí být mezi 0 a 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "O&tevřít soubor" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "O&tevřít" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "Verze OS:" @@ -5366,39 +5755,52 @@ "Na následujících stránkách bude nastaven vybraný režim přenosu a pokud jste " "povolili návrat k druhému režimu přenosu, pak i ten." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:860 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "Once" msgstr "Jedenkrát" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Jednou denně" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Jednou týdně" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:544 msgid "Only use plain FTP (insecure)" msgstr "Použít pouze obyčejné FTP (nezabezpečené)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "O&tevřít soubor" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Otevřít složku v systémovém správci souborů" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Otevřít správce míst" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Otevřít správce míst." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Otevřít správce míst. Pravé kliknutí zobrazí seznam míst." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Pro nastavení složek, do kterých má aplikace FileZilla povolený přístup, " +"otevřete okno s nastavením přístupových práv ke složce." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Otevřít soubor." @@ -5406,14 +5808,16 @@ msgid "Open the settings dialog of FileZilla" msgstr "Otevře dialog s nastavením aplikace FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Otevřeno jako:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1695 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1830 +#: ../../locales/../src/interface/LocalListView.cpp:1843 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Otevření se nezdařilo" @@ -5425,140 +5829,148 @@ msgid "Opens the Site Manager" msgstr "Otevře správce míst" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Otevře nastavení filtrů výpisu složky. Pravým kliknutím zapnete nebo vypnete " "filtrování." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Operační systém:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Operace již probíhá" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Operace probíhá" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Nepodporovaná operace" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Možnosti" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Oranžová" + +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Organization:" msgstr "Organizace:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Další možnosti SFTP" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Jiná systémová chyba" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Other:" msgstr "Jiné:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Nedostatek paměti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Přehled" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Přepsat, pokud je zdroj &novější" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Přepsat soubor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Přepsat, pokud se liší velikost" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Přepsat, pokud se liší velikost nebo je zdrojový soubor novější" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Přepsat, pokud je zdrojový soubor novější" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Přepsat, pokud se liší &velikost" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Přepsat, pokud se liší v&elikost nebo je zdroj novější" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Vlastní typ sestavení: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Oprávnění vlastníka" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Vlastník / Skupina" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "" "Za&bránit systému přejít do režimu spánku během přenosů a dalších operací" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "P&roxy hostitel:" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Příkaz PORT poškozen routerem nebo firewallem." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "&Pasivní (doporučeno)" -#: ../../locales/../src/interface/Mainfrm.cpp:2320 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Parametr není platná URL" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Parsuji %d bajtů informace o verzi.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Hes&lo:" @@ -5566,66 +5978,79 @@ msgid "Passive (recommended)" msgstr "Pasivní (doporučeno)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Pasivní režim" -#: ../../locales/../src/interface/netconfwizard.cpp:604 -#: ../../locales/../src/interface/netconfwizard.cpp:617 -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Pasivní režim byl nastaven jako výchozí režim přenosu." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Heslo nebo šifrovací klíč není nastaven" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Heslo je vyžadováno" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Hesla" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Cesta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2239 +#: ../../locales/../src/engine/ftp/rmd.cpp:40 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Cestu nelze vytvořit pro složku %s a podsložku %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2278 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Cesta nenalezena:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Cesty" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Čeká na odstranění" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Oprávnění" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" -msgstr "Přístup byl odepřen." +msgstr "Přístup byl odepřen" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Oprávnění" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Typ systému:" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Zadejte místní složky, které chcete používat s aplikací FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5633,6 +6058,14 @@ "Ověřte na stránce https://filezilla-project.org/probe.php, že server běží a " "znovu pečlivě zkontrolujte svá nastavení." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Zkontrolujte oprávnění a případně v následujícím dialogu doplňte chybějící " +"složky se kterými pracujete." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5641,11 +6074,11 @@ "Nastavte své firewally a routery tak, aby aplikace FileZilla mohla navázat " "odcházející spojení na libovolný port." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Zakažte na routeru nastavení jako je „režim DMZ“ nebo „herní režim“." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5661,13 +6094,13 @@ msgid "Please enter a custom time format." msgstr "Zadejte vlastní formát času." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Zadejte datum ve formátu RRRR-MM-DD, například 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "Limit pro stahování zadejte větší nebo roven 0 %s/s." @@ -5676,16 +6109,16 @@ msgid "Please enter a name for the new filter." msgstr "Zadejte název nového filtru." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Zadejte nový název pro kopii filtru." -#: ../../locales/../src/interface/filter.cpp:389 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Zadejte nový název pro sadu filtrů „%s“" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Zadejte nový název pro filtr." @@ -5706,21 +6139,10 @@ "transfers." msgstr "Jako počet souběžných přenosů zadejte číslo mezi 1 a 10." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Zadejte heslo pro tento server:" -#: ../../locales/../src/interface/QueueView.cpp:2112 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Zadejte cestu a název spustitelného souboru, který se má spustit.\n" -"Např. c:\\nějakáCesta\\soubor.exe v MS Windows nebo /nějakáCesta/soubor v " -"Unixu.\n" -"Můžete také zadat parametry programu." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5728,29 +6150,29 @@ "Zadejte časový limit mezi 10 a 9999 sekundami, nebo 0 pokud nechcete časový " "limit používat." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Zadejte jedinečný název pro tuto sadu filtrů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Zadejte uživatelské jméno pro tento server:" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Zadejte platný rozsah portů." -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Zadejte URL, kde lze získat vaši externí adresu" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Limit pro odesílání na server zadejte větší nebo roven 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5758,27 +6180,48 @@ "Zadejte přímý FTP příkaz.\n" "Použití přímého FTP příkazu vymaže mezipaměť složek." -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/QueueView.cpp:1867 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Zadejte celou cestu k programu a jeho argumenty. Tento příkaz bude spuštěn " +"po zpracování fronty.\n" +"Např. c:\\nějakáCesta\\soubor.exe v MS Windows nebo /nějakáCesta/soubor v " +"Unixu.\n" +"Pokud cesta k programu či jeho parametry obsahují mezery, pak musí být " +"správně uzavřeny v uvozovkách." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Zadejte název složky, která má být vytvořena:" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2668 msgid "Please enter the name of the file which should be created:" msgstr "Zadejte název souboru, který má být vytvořen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Zadejte uživatelské jméno a heslo pro tento server:" -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Zadejte své současné centrální heslo, aby bylo možné změnit nastavení hesel." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Zadejte svou externí IP adresu" -#: ../../locales/../src/interface/netconfwizard.cpp:609 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5788,6 +6231,12 @@ "aktivního režimu. Pokud máte adresu dynamickou nebo svou externí adresu " "neznáte, využijte možnost externího rozpoznání." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Zadejte centrální heslo, aby bylo možné dekódovat heslo pro tento server:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5796,7 +6245,7 @@ "Dodržujte pečlivě pokyny, neboť chybné nastavení znemožní úspěšně navazovat " "FTP připojení." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5805,12 +6254,12 @@ "ujistěte se, že jste správně zadali adresu stránky, která zjistí vaši " "externí IP adresu." -#: ../../locales/../src/interface/FileZilla.cpp:136 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Ujistěte se, že požadované národní prostředí je v systému nainstalované." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5834,7 +6283,7 @@ "domnívá, že ho používají pouze trojské koně nebo jiný nebezpečný software. " "To může vyvolat falešný poplach, který můžete bezpečně ignorovat." -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5842,7 +6291,7 @@ "Upozornění: Zachování času souborů při odesílání na server je podporováno " "pouze FTP, FTPS a FTPES servery, které podporují příkaz MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5850,7 +6299,7 @@ "Upozornění: Některé servery vám mohou zakázat přístup, pokud se budete " "snažit o znovuspojení příliš často nebo v příliš krátkých intervalech." -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5860,11 +6309,19 @@ "případě, že náhle zaznamenáte problémy se servery, které před tím fungovaly " "správně." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Uložte tento klíč na bezpečné místo. Bez správného klíče se nelze dostat k " +"nahraným souborům." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Vyberte akci:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Vyberte kategorie, které chcete importovat." @@ -5895,7 +6352,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Vyberte nové atributy pro vybrané soubory." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5907,39 +6364,39 @@ "dostupnou verzi firmware. Kromě toho musí být váš server správně nastaven. " "Musí být povoleno manuální přesměrování portů. Nespouštějte router v tzv. " "„DMZ režimu“ nebo „herním režimu“. Možnosti typu inspekce protokolu nebo pro " -"protokol specifické „záplaty“ musí být vypnuty." +"protokol specifické „záplaty“ musí být vypnuty" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "&Pozice protokolu zpráv:" -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Postal code:" msgstr "PSČ:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "Př&edběžně přidělit místo před stažením souboru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Předběžné přidělení" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2120 msgid "Predefined Sites" msgstr "Předdefinovaná místa" -#: ../../locales/../src/interface/Mainfrm.cpp:685 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Zachovávání času souborů" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Náhled:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Náhled" -#: ../../locales/../src/engine/tlssocket.cpp:1134 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Certifikáty primárního a datového připojení si neodpovídají." @@ -5951,15 +6408,15 @@ msgid "Print version information to stdout and exit" msgstr "Vypsat informace o verzi na standardní výstup a ukončit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Složky na začátku nebo na konci výpisu dle řazení (výchozí)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Priorita" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5967,7 +6424,7 @@ "Zásady ochrany osobních údajů: na server jsou odeslány pouze údaje o verzi " "aplikace FileZilla, použitém operačním systému a architektuře procesoru." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Soukromé &klíče:" @@ -5975,82 +6432,86 @@ msgid "Pro&tocol:" msgstr "Pro&tokol:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Proxy h&eslo:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Zpracuj &frontu" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Přetečení tabulky souborů procesu" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Zpracováno %s v %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Protokol není podporován" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" -msgstr "Protokol není podporovám daným typem soketu." +msgstr "Protokol není podporovám daným typem soketu" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Protokol:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Proxy &port:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Proxy &uživatel:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Ověření s proxy se nezdařilo" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Uvítání s proxy serverem se nezdařilo: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "Hostitel proxy začíná „[“, ale ukončující část závorky nebyla nalezena." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Odpověď proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:520 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Požadavek proxy se nezdařil. Proxy odpověděla: %s" + +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Požadavek proxy se nezdařil: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Požadavek proxy se nezdařil. Neznámý typ adresy v odpovědi CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4241 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy je nastavena, avšak proxy hostitel nebo port není platný" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Autorizace veřejných klíčů" @@ -6058,68 +6519,77 @@ msgid "Public key algorithm:" msgstr "Algoritmus veřejného klíče:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Oprávnění ostatních" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:2773 msgid "Queue has been fully processed" msgstr "Fronta byla zpracována" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Fronta: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Fronta: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Fronta: prázdná" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Soubory ve frontě" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Řazení do fronty:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Rychlé vyhledávání:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Rychlé vyhledávání nelze otevřít během porovnávání složek." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" msgstr "&Restartovat systém" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "&Vzdálený strom složek" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "V&ybrané soubory obnovit a znovu zařadit do fronty" -#: ../../locales/../src/interface/Mainfrm.cpp:585 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Přímý FTP příkaz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Čt&ení" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "&Aktualizovat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Pře&jmenovat" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6127,20 +6597,20 @@ "Spusťte znovu průvodce a pozorně zkontrolujte nastavení a nastavte podle " "toho všechny routery a brány firewall." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Čte&ní" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Jen pro čtení" -#: ../../locales/../src/interface/Mainfrm.cpp:1022 +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Opravdu si přejete přerušit aktuální operaci?" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:761 +#: ../../locales/../src/interface/RemoteListView.cpp:1421 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6149,8 +6619,8 @@ msgstr[1] "Opravdu chcete ze serveru odstranit %d složky i s obsahem?" msgstr[2] "Opravdu chcete ze serveru odstranit %d složek i s obsahem?" -#: ../../locales/../src/interface/RemoteListView.cpp:1384 -#: ../../locales/../src/interface/search.cpp:759 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" @@ -6158,67 +6628,73 @@ msgstr[1] "Opravdu chcete ze serveru odstranit %d soubory?" msgstr[2] "Opravdu chcete ze serveru odstranit %d souborů?" -#: ../../locales/../src/interface/RemoteListView.cpp:1391 -#: ../../locales/../src/interface/search.cpp:765 +#: ../../locales/../src/interface/RemoteListView.cpp:1426 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Opravdu chcete ze serveru odstranit %s a %s?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "Opravdu chcete ze serveru odstranit všechny vybrané soubory a složky?" -#: ../../locales/../src/engine/local_filesys.cpp:129 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "Opravdu chcete ze svého počítače odstranit všechny vybrané soubory a složky?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Důvod" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2766 msgid "Reboot now" msgstr "Restartovat nyní" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "&Rekurzivně použít pro vnořené složky" -#: ../../locales/../src/engine/tlssocket.cpp:223 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Ze serveru byla přijata výstraha TLS: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3078 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Přijatý výpis složky se zdá být v kódování EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2060 +#: ../../locales/../src/engine/directorylistingparser.cpp:2077 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Přijat řádek překračující 10000 znaků, probíhá přerušení." -#: ../../locales/../src/interface/netconfwizard.cpp:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1016 -#: ../../locales/../src/interface/netconfwizard.cpp:1039 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "Přijatý řetězec certifikátu nelze ověřit. Stav ověření je %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Přijatá data poškozena" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "V informaci o verzi byly přijaty neplatné znaky" -#: ../../locales/../src/engine/tlssocket.cpp:226 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Ze serveru bylo přijato neznámé TLS upozornění %d" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "Přijatá informace o verzi je příliš velká" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6226,77 +6702,75 @@ "Informaci pro znovuspojení nelze vymazat dokud jste připojeni na server.\n" "Pokud budete pokračovat, spojení se serverem bude odpojeno." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Nastavení znovuspojení" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Znovu se připojí k naposledy použitému serveru" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Přidávám rekurzivně soubory do fronty." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Rekurzivní změna oprávnění." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Mažu rekurzivně soubory a složky." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Červená" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Přesměrování na neplatné nebo nepodporované URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:656 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Přesměrování na neplatnou nebo nepodporovanou adresu: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Aktualizuje seznam souborů a složek" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Pamatovat si hesla?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Vzdálený" -#: ../../locales/../src/engine/tlssocket.cpp:852 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Nedůvěryhodný vzdálený certifikát." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Vzdálený soubor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:383 -#: ../../locales/../src/interface/search.cpp:388 -#: ../../locales/../src/interface/search.cpp:397 -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Hledání vzdálených souborů" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Vzdálené filtry:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Vzdálená složka" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6305,7 +6779,7 @@ "Vzdálenou cestu nelze analyzovat. Ujistěte se, zda jde o platnou absolutní " "cestu a zda ji podporuje aktuální typ serveru místa (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1177 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6314,130 +6788,134 @@ "Vzdálenou cestu nelze analyzovat. Ujistěte se, zda jde o platnou absolutní " "cestu a zda ji podporuje typ serveru (%s) vybraného rodičovského místa." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Vzdálenou cestu nelze analyzovat. Ujistěte se, zda jde o platnou absolutní " "cestu." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Vzdálenou cestu nelze analyzovat." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Zpracování vzdálené cesty:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Vzdálená složka:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Vzdálená složka:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Odebrat &všechny" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "&Odebrat vybrané" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:304 msgid "Rename file" msgstr "Přejmenovat soubor" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Přejmenovat vybranou složku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Přejmenovat vybrané soubory a složky" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2438 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:595 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Přejmenování „%s“ na „%s“" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Heslo pro kontrolu:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Hlášení chyb a požadavků na funkce" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Požadavek se nezdařil - na klientu není spuštěno identd (nebo není dostupné " "ze serveru)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Požadavek se nezdařil - klientovo identd nemůže potvrdit uživatelův " "identifikační řetězec" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Požadavek odmítnut nebo se nezdařil" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:542 msgid "Require explicit FTP over TLS" msgstr "Vyžadovat explicitní FTP přes TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:543 msgid "Require implicit FTP over TLS" msgstr "Vyžadovat implicitní FTP přes TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Obnovit a &zařadit vše znovu do fronty" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Překlad protokolu není znám" #: ../../locales/../src/engine/ControlSocket.cpp:1081 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:457 #, c-format msgid "Resolving address of %s" msgstr "Zjišťování adresy %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Zdroj není dočasně k dispozici" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:357 msgid "Response:" msgstr "Odpověď:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Výsledky:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Navázat soubor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6445,19 +6923,21 @@ "Navazování ASCII souborů může způsobit problémy, pokud server používá jiný " "formát konce řádků než klient." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:939 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Načítání výpisu složky „%s“..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1269 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:936 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Načítání výpisu složky..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3772 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Načítání externí IP adresy z %s" @@ -6466,23 +6946,23 @@ msgid "S&how files currently being edited..." msgstr "Z&obrazit aktuálně upravované soubory..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "P&o spuštění zobrazit správce míst" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" msgstr "&Vypnout počítač" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "&Zastavit" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" msgstr "Převést počítač do režimu spán&ku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "&Synchronizované procházení" @@ -6490,91 +6970,110 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Podpora SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 proxy se připojí k: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "SOCKS5 nepodporuje uživatelská jména ani hesla delší než 255 znaků." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Ukládat hesla a &chránit je centrálním heslem" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "&Ukládat hesla" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Uložit nastavení?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 msgid "Saving of password has been disabled by your system administrator." msgstr "Správce systému zakázal ukládání hesel." -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 msgid "Saving of passwords has been disabled by you." msgstr "Zakázali jste ukládání hesel." -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "Vyhledávání souborů pro přidání do fronty" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "Vyhledávání souborů pro odeslání na server" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Měřítko:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "&Podmínky hledání:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Prohledávaná &složka:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Rekurzivně hledat soubory." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Hledat soubory na serveru" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Typ hledání:" + +#: ../../locales/../src/interface/statusbar.cpp:514 msgid "Security information" msgstr "Bezpečnostní informace" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Podívejte se: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "&Vybrat server" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "&Vybrat stránku:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Vybrat téma" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Vyberte výchozí akci, která se vykoná pokud již cílový soubor nebo přenos " "existuje." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Vybrat výchozí editor" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6582,7 +7081,7 @@ "Vyberte výchozí akci pokud cílový soubor již existuje. Tento výběr je platný " "pouze pro aktuální relaci." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6590,61 +7089,65 @@ "Vyberte výchozí akci pokud cílový soubor již existuje, pouze pro aktuálně " "vybrané soubory ve frontě." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Vyberete soubor obsahující soukromý klíč" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Vyberte soubor pro exportovaná data" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1489 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Vyberte soubor pro exportované filtry" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Vyberte soubor pro exportovanou frontu" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Vyberte soubor pro exportovaná nastavení" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2208 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2464 msgid "Select file for exported sites" msgstr "Vyberte soubor pro exportované místa" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Vyber soubor pro import nastavení" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Vyberte soubor k odeslání" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Vyberte název pro převedený soubor klíče" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Vyberte, jak by se tyto soubory měly otevírat." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Vyberte cílovou složku stahování" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Vyberte název cílového souboru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Vyberte kategorie pro export:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Vyberte soukromé údaje, které chcete odstranit." -#: ../../locales/../src/interface/search.cpp:475 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6652,7 +7155,7 @@ msgstr[1] "Vybrány %d složky i s obsahem pro přenos." msgstr[2] "Vybráno %d složek i s obsahem pro přenos." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." @@ -6660,7 +7163,7 @@ msgstr[1] "Vybrány %d složky." msgstr[2] "Vybráno %d složek." -#: ../../locales/../src/interface/search.cpp:473 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6669,7 +7172,7 @@ msgstr[2] "Vybráno %d souborů pro přenos." # To je kravina - raději bych se na plurál vybod a zvolil... Vybrané soubory: %d Celková velikost: %s -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" @@ -6677,7 +7180,7 @@ msgstr[1] "Vybrány %d soubory. Celková velikost: %s" msgstr[2] "Vybráno %d souborů. Celková velikost: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" @@ -6685,99 +7188,98 @@ msgstr[1] "Vybrány %d soubory. Celková velikost: Nejméně %s" msgstr[2] "Vybráno %d souborů. Celková velikost: Nejméně %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Vybráno %s a %s pro přenos." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Vybráno %s a %s. Celková velikost: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Vybráno %s a %s. Celková velikost: Nejméně %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Vybraný editor neexistuje." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Vybraný soubor je již upravován" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Vybraný soubor je již načten" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Vybraný soubor je již otevřen" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Vybraný soubor je stále upravován" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Vybraný filtr funguje pouze pro místní soubory." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" -"Vybraná globální oblíbená položka a aktuální server používají odlišný typ " -"serveru.\n" -"Pro tento server použijte oblíbenou položku platnou jen pro určité místo." +"Vybraná globální záložka aktuálního serveru používá odlišný typ serveru.\n" +"Pro tento server použijte záložku platnou jen pro určité místo." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Vybraný port obvykle používá jiný protokol." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "" "Posílat příkazy &udržující FTP připojení, aby se server při nečinnosti " "neodpojil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "Pošle uživatelem zadaný, jinými způsoby nedostupný, příkaz serveru" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4317 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Posílání příkazu pro udržení připojení" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:259 msgid "Serial number:" msgstr "Sériové číslo:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "T&yp serveru:" -#: ../../locales/../src/engine/tlssocket.cpp:741 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Server správně neukončil připojení TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:890 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Server nepodporuje znaky, které nepatří do ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4153 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Server nepodporuje navazování souborů větších než %d GiB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4149 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6786,15 +7288,19 @@ "Server nepodporuje navazování souborů větších než %d GiB. Ukončení přenosu, " "protože velikosti souborů si odpovídají." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2426 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Server nepodporuje navazování souborů větších než 2 GiB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2422 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Server nepodporuje navazování souborů větších než 4 GiB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Hostitelský klíč serveru" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6803,17 +7309,21 @@ "Server možná nepodporuje navazování souborů větších než %d GiB. Ukončení " "přenosu, protože velikosti souborů si odpovídají." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" -msgstr "Server možná vyžaduje účet. Zkuste ho určit pomocí správce míst." +msgstr "Server možná vyžaduje účet. Zkuste ho určit pomocí správce míst" + +#: ../../locales/../src/engine/http/request.cpp:241 +msgid "Server not sending proper line endings" +msgstr "Server neposílá správné konce řádků" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "Server vrátil prázdnou cestu." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:224 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6821,13 +7331,13 @@ "Server poslal další výzvu na ověření. Budete muset použít interaktivní typ " "přihlášení." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3719 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Server poslal pasivní odpověď s nedostupnou adresou. Pasivní režim se " "nezdařil." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6835,36 +7345,46 @@ "Server poslal pasivní odpověď s nedostupnou adresou. Použije se raději " "adresa serveru." -#: ../../locales/../src/interface/netconfwizard.cpp:419 -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:465 -#: ../../locales/../src/interface/netconfwizard.cpp:474 -#: ../../locales/../src/interface/netconfwizard.cpp:486 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/engine/http/request.cpp:514 +msgid "Server sent too much data." +msgstr "Server odeslal příliš mnoho údajů." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Server poslal neočekávanou odpověď." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Server odeslal řetěz neseřazené certifikátů v rozporu se specifikací TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Server na klient MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Šifra serveru na klienta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "T&yp serveru:" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Server nebo místní soubor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Server:" @@ -6872,49 +7392,54 @@ msgid "Session details" msgstr "Podrobnosti relace" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Nastavit priorit&u" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2317 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:589 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Nastavit oprávnění „%s“ na „%s“" - -#: ../../locales/../src/engine/transfersocket.cpp:791 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize voláno bez uvedení soketu" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Nastavit oprávnění '%s' na '%s'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Nastavení" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Složka s nastavením:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Zobrazit &oznámení" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Zob&razovat nezpracované výpisy složek" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Zobrazit &uvítací dialog..." -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Zobrazit oba stromy složek a pokračovat v porovnávání?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Zobrazit podrobnosti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Zobrazit podrobnosti o vlastních formátech data a času" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "Otevřít v Průzkumníku &Windows" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Zobrazit dostupné TLS šifry" @@ -6922,7 +7447,7 @@ msgid "Shows this help dialog" msgstr "Zobrazí tuto nápovědu" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2762 msgid "Shutdown now" msgstr "Vypnout nyní" @@ -6930,7 +7455,11 @@ msgid "Signature algorithm:" msgstr "Algoritmus podpisu:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Přihlášení" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Položky &správce míst" @@ -6938,71 +7467,76 @@ msgid "Site Manager" msgstr "Správce míst" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1019 msgid "Site Manager - Cannot remember password" msgstr "Správce míst - nelze si zapamatovat heslo" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Správce míst - vygenerovaný klíč" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1032 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1049 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1077 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1154 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1182 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Site Manager - Invalid data" msgstr "Správce míst - neplatná data" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Správce míst je již otevřen" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Místo neexistuje." # WTF? -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Cesta má začínat nulou nebo jedničkou." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Cesta místa je poškozena." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" -msgstr "Oblíbené položky platné jen pro určité místo" +msgstr "Záložky platné jen pro určité místo" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" "Add current connection to the site manager?" msgstr "" -"Oblíbené položky platné jen pro určité místo vyžadují, aby byl server uložen " -"ve Správci míst.\n" +"Záložky platné jen pro určité místo vyžadují, aby byl server uložen ve " +"Správci míst.\n" "Přidat aktuální připojení do Správce míst?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "Velikost" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Formátování velikostí" @@ -7010,56 +7544,61 @@ msgid "Size unknown" msgstr "Neznámá velikost" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Přeskočit soubor" -#: ../../locales/../src/engine/ControlSocket.cpp:1152 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1193 -#: ../../locales/../src/engine/ControlSocket.cpp:1253 +#: ../../locales/../src/engine/ControlSocket.cpp:1151 +#: ../../locales/../src/engine/ControlSocket.cpp:1168 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping download of %s" msgstr "Přeskočení stahování %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1156 -#: ../../locales/../src/engine/ControlSocket.cpp:1172 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Přeskočit neexistující klíčové soubory \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1154 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 #: ../../locales/../src/engine/ControlSocket.cpp:1197 -#: ../../locales/../src/engine/ControlSocket.cpp:1257 +#: ../../locales/../src/engine/ControlSocket.cpp:1275 #, c-format msgid "Skipping upload of %s" msgstr "Přeskočení odesílání %s na server" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Adresa soketu je mimo adresní prostor" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Soket je již připojen" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Soket je vypnutý" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Soket není připojen" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Rodina adres nepodporuje daný typ soketu" -#: ../../locales/../src/interface/Mainfrm.cpp:1157 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Některé soubory jsou stále upravovány nebo musí být odeslány na server." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7067,31 +7606,31 @@ "Některé nesprávně nastavené vzdálené servery, které jsou za routerem, mohou " "odpovědět svou místní IP adresou." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Řadit složky mezi soubory" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "Řazení nelze změnit, pokud se porovnávají složky." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Řazení" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Způsob ř&azení:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Zdroj a cíl přetažení se shodují" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Zdrojový a cílový soubor nemusí být stejný" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Zdroj a cíl přetažení se shodují" @@ -7099,37 +7638,37 @@ msgid "Source file:" msgstr "Zdrojový soubor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Omezení rychlostí" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Omezení rychlostí" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:591 msgid "Speed limits are disabled, click to change." msgstr "Omezení rychlostí je zakázáno, kliknutím provedete změnu." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:594 msgid "Speed limits are enabled, click to change." msgstr "Omezení rychlostí je povoleno, kliknutím provedete změnu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Stabilní i verze beta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Pouze stabilní verze" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Stabilní, beta i noční verze" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Spustit přenos &okamžitě" @@ -7137,19 +7676,21 @@ msgid "Start with opened Site Manager" msgstr "Spustí s otevřeným Správcem míst" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Spuštěna kontrola aktualizací v %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2146 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1583 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Spouští se stahování %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2149 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1586 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Spouští se odesílání %s na server" @@ -7158,30 +7699,38 @@ msgid "Starts the local site in the given path" msgstr "Počáteční místní složka" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "State or province:" msgstr "Stát nebo kraj:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "Stav" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:298 +#: ../../locales/../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "Stav:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Vše &zastavit a odebrat" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Zastavit rekurzivní operaci" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Decentralizované cloudové úložiště" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Podpora Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Street:" msgstr "Ulice:" @@ -7197,11 +7746,11 @@ msgid "Summary of test results:" msgstr "Souhrn výsledků testu:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2770 msgid "Suspend now" msgstr "Převést počítač do režimu spánku nyní" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7209,29 +7758,33 @@ "Tato volba nemá vliv na symbolické odkazy na soubory, takové symbolické " "odkazy jsou vždy odstraněny." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:238 -#: ../../locales/../src/interface/state.cpp:252 -#: ../../locales/../src/interface/state.cpp:258 -#: ../../locales/../src/interface/state.cpp:268 -#: ../../locales/../src/interface/state.cpp:355 -#: ../../locales/../src/interface/state.cpp:363 -#: ../../locales/../src/interface/state.cpp:371 -#: ../../locales/../src/interface/state.cpp:930 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Synchronizované procházení" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Synchronizované procházení bylo zakázáno." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Odstraňování složek." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Syntaktická chyba" @@ -7240,44 +7793,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2280 -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Syntaktická chyba v příkazovém řádku" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Systémový" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Podrobnosti o systému" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Byl překročen systémový limit otevřených souborů" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Selhal síťový subsystém operačního systému" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "Pan&el nástrojů" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:131 msgid "TLS connection established, sending HTTP request" msgstr "TLS připojení navázáno, posílání HTTP požadavku" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS připojení navázáno, čekání na uvítací zprávu..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "TLS připojení navázáno." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL vypršelo" @@ -7285,35 +7838,43 @@ msgid "Target file already exists" msgstr "Cílový soubor již existuje" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Cílový soubor:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2686 msgid "Target filename already exists!" msgstr "Cílový název souboru již existuje!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "Target filename already exists, really continue?" msgstr "Cílový název souboru již existuje, opravdu chcete pokračovat?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Dočasný nezdar při překladu názvů" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Test skončil úspěšně" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Výsledky testu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4170 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Testování schopnosti serveru navazovat soubory" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "V &současné době se upravují tyto soubory:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:785 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Nelze používat správce míst dokud nebude soubor opraven." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7322,7 +7883,7 @@ "Správce míst je otevřen v jiné instanci aplikace FileZilla 3.\n" "Chcete pokračovat? Změny, které provedete ve správci míst nebudou uloženy." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7330,29 +7891,37 @@ "Správce míst je otevřen v jiné instanci aplikace FileZilla 3.\n" "Pokud ho nezavřete, data nelze odstranit." -#: ../../locales/../src/interface/netconfwizard.cpp:634 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Zadal jste adresu: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Nepodporovaný člen ai_family" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Nepodporovaný člen ai_socktype" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." -msgstr "Oblíbenou položku nelze přidat." +msgstr "Záložku nelze přidat." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." -msgstr "Oblíbenou položku nelze vymazat." +msgstr "Záložku nelze vymazat." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Certifikát vyžaduje, aby server v odpovědi zahrnul OCSP status, ale OCSP " +"status chybí." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/interface/statusbar.cpp:475 msgid "The connection is encrypted. Click icon for details." msgstr "Toto připojení je šifrováno. Klikněte na ikonu pro podrobnosti." @@ -7374,34 +7943,39 @@ "Vlastní formát času není platný nebo obsahuje nepodporované specifikátory " "formátu." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Nelze navázat datové připojení: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Výchozí editor textových souborů nebyl nalezen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Výchozí editor textových souborů je „%s“." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Filtr se zadaným názvem již existuje, zvolte jiný název." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Zadaná hesla nejsou stejná." + +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" -msgstr "Přípona „%s“ již v seznamu existuje" +msgstr "Přípona \"%s\" již v seznamu existuje" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 #, c-format msgid "" "The file %s already exists.\n" @@ -7410,19 +7984,20 @@ "Soubor %s již existuje.\n" "Zadejte nový název:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1834 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" "The associated program (%s) could not be found.\n" "Please check your filetype associations." msgstr "" -"Soubor „%s“ nelze otevřít:\n" +"Soubor \"%s\" nelze otevřít:\n" "Přidružený program (%s) nebyl nalezen.\n" "Zkontrolujte přidružení souborů." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7431,18 +8006,19 @@ "Soubor „%s“ obsahuje klíč SSH1. Protokol SSH1 je zastaralý, aplikace " "FileZilla podporuje pouze klíče SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Soubor „%s“ nelze načíst nebo se nejedná o soukromý klíč." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Soubor „%s“ nelze načíst." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1830 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7451,8 +8027,9 @@ "Soubor „%s“ nelze otevřít:\n" "Ve vašem systému není k tomuto typu souboru přidružen žádný program." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1843 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7461,8 +8038,8 @@ "Soubor „%s“ nelze otevřít:\n" "Přidružený příkaz se nezdařil" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7473,7 +8050,7 @@ "Načítání souborů vytvořených novější verzí může vést ke ztrátě dat.\n" "Chcete pokračovat?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7486,7 +8063,7 @@ msgid "The file selected as default editor does not exist." msgstr "Vybraný výchozí editor neexistuje." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7500,11 +8077,11 @@ "uživatelské jméno a heslo.\n" "Pokračovat v importu?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Sloupec s názvem souboru nelze skrýt nebo přesunout." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Sloupec s názvem souboru nelze skrýt." @@ -7518,19 +8095,19 @@ msgid "The following characters will be replaced: %s" msgstr "Následující znaky budou nahrazeny: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Následující soubory se aktuálně upravují:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Svobodný FTP klient s otevřeným zdrojovým kódem" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Vygenerovaný šifrovací klíč:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." -msgstr "Globální oblíbené položky nelze uložit." +msgstr "Globální záložku nelze uložit." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7543,26 +8120,26 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Omezení musí být mezi 1 a 2000 MiB" -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." -msgstr "Nelze vytvořit místní složku „%s“." +msgstr "Místní složku „%s“ nelze vytvořit." -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." -msgstr "Neexistuje místní složka „%s“." +msgstr "Místní složku „%s“ neexistuje." -#: ../../locales/../src/interface/state.cpp:249 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" "Místní složka „%s“ není pod kořenem synchronizace (%s).\n" -" Zakázat synchronizované procházení, a pokračovat ve změně místní složky?" +"Zakázat synchronizované procházení, a pokračovat ve změně místní složky?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7570,24 +8147,29 @@ "Nejnižší využitelný port musí být nižší nebo roven nejvyššímu využitelnému " "portu." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Centrální heslo musí mít alespoň 8 písmen." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Nelze stáhnout novou verzi, zkuste to znovu později." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Nová verze byla uložena do složky Stažené soubory." -#: ../../locales/../src/interface/QueueView.cpp:1832 +#: ../../locales/../src/interface/QueueView.cpp:1560 msgid "The queue will not be saved." msgstr "Fronta nebude uložena." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." -msgstr "Neexistuje vzdálená složka „%s“." +msgstr "Vzdálená složka \"%s\" neexistuje." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7596,27 +8178,27 @@ "Vzdálená složka „%s“ není pod kořenem synchronizace (%s).\n" "Zakázat synchronizované procházení a pokračovat ve změně vzdálené složky?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Vybrané kategorie byly importovány." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "Z vybraného souboru lze importovat tyto údaje:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Vybraný soubor je již upravován:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Vybraný soubor je stále ještě otevřen v nějakém jiném programu, zavřete ho." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7626,15 +8208,15 @@ "To může být nebezpečné a může to poškodit váš systém.\n" "Opravdu chcete pokračovat?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Server nelze přidat." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Server poslal neočekávanou nebo nerozpoznanou odpověď." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Server používá následující kódování znakové sady pro názvy souborů:" @@ -7646,7 +8228,7 @@ "Certifikát serveru je neznámý. Podrobně ho prozkoumejte, abyste se ujistili, " "že je server důvěryhodný." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7657,7 +8239,7 @@ "skutečnosti pokoušíte připojit k jinému počítači, který předstírá, že je " "daným serverem." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7665,11 +8247,15 @@ "Hostitelský klíč serveru není znám. Nemáte žádnou záruku, že daný server je " "tím počítačem, kterým si myslíte, že je." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Název hostitele serveru se neshoduje s název hostitele certifikátu" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "Parametr servname není podporován pro ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7677,19 +8263,19 @@ "Nastavení bylo importováno. Aby se všechna nastavení uplatnila, musíte " "restartovat aplikaci FileZilla." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Tato rodina adres není podporována" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Uvedený síťový název již není dostupný" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:2765 msgid "The system will soon reboot unless you click Cancel." msgstr "Pokud nestisknete Storno, systém bude brzy restartován." -#: ../../locales/../src/interface/QueueView.cpp:3045 +#: ../../locales/../src/interface/QueueView.cpp:2761 msgid "The system will soon shut down unless you click Cancel." msgstr "Pokud nestisknete Storno, systém bude brzy vypnut." @@ -7701,11 +8287,11 @@ "Cílový soubor již existuje.\n" "Prosím vyberte akci." -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Test nebyl úspěšný. Opravdu chcete nastavení uložit?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Platný záložní soubor „%s“ nelze obnovit" @@ -7714,15 +8300,15 @@ msgid "Themes" msgstr "Témata" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Tuto sadu filtrů nelze odebrat." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Tuto sadu filtrů nelze přejmenovat." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7746,42 +8332,40 @@ "Tento průvodce vám pomůže správně nastavit vaše routery, firewally a " "otestovat vaše nastavení." -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "Čas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Formátování času" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Časový &limit v sekundách:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Časový limit" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1621 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1047 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Posun časové zóny serveru je%d sekund." - -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Title:" msgstr "Titul:" -#: ../../locales/../src/interface/Mainfrm.cpp:2166 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Pro porovnání složek musí být zavřeno rychlé vyhledávání." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "Pro porovnání složek musí být výpisy souborů zarovnány." -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "Proto musí být oba stromy složek zároveň buď zobrazeny nebo skryty." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7789,7 +8373,7 @@ "Pro podporu autentizace pomocí veřejných klíčů potřebuje aplikace FileZilla " "znát soukromé klíče, které má použít." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7805,7 +8389,7 @@ "Zelená: Soubor je novější než neoznačený soubor na druhé straně\n" "Červená: Rozdílná velikost" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7815,82 +8399,77 @@ "Pokud je povoleno, bude se procházením místní hierarchie složek " "odpovídajícím způsobem měnit aktuální složka na serveru a naopak." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Přepíná zpracování fronty přenosů" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Přepíná zobrazení stromu místních složek" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Přepíná zobrazení protokolu zpráv" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Přepíná zobrazení stromu vzdálených složek" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Přepíná zobrazení fronty přenosů" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/http/request.cpp:254 msgid "Too long header line" msgstr "Řádek hlavičky je příliš dlouhý" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Příliš mnoho přesměrování" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "Trasování:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Přenos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "S&měr přenosu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "&Typ přenosu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Režim přenosu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Fronta přenosů" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Nastavení přenosu" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Pokus o připojení přerušen: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Přenesená data se poškodila." -#: ../../locales/../src/interface/queue.cpp:333 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Přenášení" @@ -7898,28 +8477,27 @@ msgid "Transfers" msgstr "Přenosy" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2644 msgid "Transfers finished" msgstr "Přenosy dokončeny" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Považovat soubory b&ez přípony za ASCII soubory" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Považovat &následující typy souborů za ASCII soubory:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:385 msgid "Trust changed Hostkey:" msgstr "Důvěřovat změněnému hostitelskému klíči:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:844 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:382 msgid "Trust new Hostkey:" msgstr "Důvěřovat novému hostitelskému klíči:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Důvěřovat novému klíči a pokračovat v připojování?" @@ -7927,70 +8505,75 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Důvěřovat tomuto certifikátu a pokračovat v připojování?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Důvěřovat tomuto hostiteli a pokračovat v připojování?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Opakujte akci" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Typ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Typ FTP proxy:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Typ všeobecné proxy:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "&Odeslat na server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Limit o&desílání na server:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Používat &aplikace přidružené k typu souboru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" -msgstr "Po&užít výchozí systémový editor textových souborů" +msgstr "Po&užít nastavení systému pro aktuální jazyk" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "UŽIVATEL@&HOSTITEL" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Nepřiřazený chybový kód %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Unit:" msgstr "Jednotka:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Neznámý" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Neznámý typ FTP proxy, nelze vytvořit přihlašovací sekvenci." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Neznámá verze protokolu SOCKS: %d" @@ -7999,26 +8582,41 @@ msgid "Unknown certificate" msgstr "Neznámý certifikát" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Neznámá chyba %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Neznámá chyba %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Neznámý hostitelský klíč" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "Neznámá verze protokolu SOCKS ověřování uživatelského jména/hesla: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Neznámý kořenový element. Zdá se, že soubor nebyl vytvořen aplikací " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:612 -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/engine/http/request.cpp:379 +msgid "Unknown transfer encoding" +msgstr "Neznámé kódování přenosu" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8026,7 +8624,7 @@ "Dokud se tyto problémy nevyřeší, nebude aktivní FTP režim pracovat a musí se " "použít pasivní." -#: ../../locales/../src/interface/netconfwizard.cpp:599 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8034,15 +8632,15 @@ "Dokud se tento problém nevyřeší, nebude aktivní FTP režim pracovat a musí se " "použít pasivní." -#: ../../locales/../src/engine/tlssocket.cpp:1096 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Nepodporovaný typ certifikátu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Nepodporované přesměrování" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Odes&lat na server a vrátit úpravy" @@ -8051,97 +8649,105 @@ msgid "Updates" msgstr "Aktualizace" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Odeslat" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Odeslání se nezdařilo" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:604 #, c-format msgid "Upload limit: %s/s" msgstr "Omezení odesílání: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:607 msgid "Upload limit: none" msgstr "Omezení odesílání: žádné" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Odeslat výsledky hledání" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Odeslat na server vybranou složku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Odeslat na server vybrané soubory a složky" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Odeslat tento soubor zpátky na server?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Odeslat tento soubor na server?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Odesílání na server" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Odesílání na server a čekání na odstranění" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Odesílání a vrací se úpravy" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Použít vlas&tní znakovou sadu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "&Použít vlastní editor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Použít &výchozí editor pro textové soubory" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Použít &synchronizované procházení" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Používat regulární výrazy" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "Použít UTF-8 pokud ho server podporuje, jinak místní znakovou sadu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Použít výchozí akci" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 msgid "Use explicit FTP over TLS if available" msgstr "Použít explicitní FTP přes TLS pokud je k dispozici" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Použít server, ke kterému jste aktuálně připojeni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Použít server ze Správce míst" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" -msgstr "Po&užít výchozí systémový editor textových souborů" +msgstr "Použít nas&tavení systému pro aktuální jazyk" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8156,7 +8762,7 @@ msgstr "Použít místo toho externí IP adresu serveru" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8173,16 +8779,17 @@ "režim. Verze aplikace FileZilla je jediná informace, která se přenáší na " "server." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Uživatelské jméno:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1077 msgid "Username cannot be a series of spaces" msgstr "Uživatelské jméno nemůže být několik mezer" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8201,52 +8808,48 @@ msgid "Verbose log messages from wxWidgets" msgstr "Podrobné protokolování zpráv z wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1146 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Ověřování certifikátu..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Velmi vysoká" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" "Zobrazování skrytých souborů je sice povoleno, ale server ho nepodporuje" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Zobrazit/Upravit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Zobrazit sloupce" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "Zá&pis" -#: ../../locales/../src/interface/QueueView.cpp:1670 -msgid "Waiting" -msgstr "Čekání" - -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Čekání na připojení pro procházení" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Čekání na heslo" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Čekání na zrušení přenosu" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Čekání na opakování..." -#: ../../locales/../src/interface/netconfwizard.cpp:975 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Upozornění: ignorování datového připojení z chybné IP." @@ -8264,23 +8867,23 @@ "\n" "Opravdu chcete zjišťovat tyto vývojové verze?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Upozornění: Možné narušení bezpečnosti!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Vítejte v aplikaci FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Co je nového" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Co je nového:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8289,7 +8892,7 @@ "novém spuštění aplikace znovu připojit, aniž byste museli opětovně zadávat " "heslo." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8297,36 +8900,52 @@ "Pokud je povoleno, pak se při stahování nahradí v názvech souborů ty znaky, " "které místní operační systém v názvech souborů nepodporuje." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" -msgstr "&Pokud se během stávajícího spojení otevírá nové" +msgstr "&Pokud se během stávajícího spojení otevírá nové:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Široká obrazovka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Chcete, aby si aplikace FileZilla pamatovala hesla?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Záp&is" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Neplatná externí IP adresa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/http/request.cpp:438 msgid "Wrong line endings" msgstr "Nesprávné konce řádků" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:858 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Zadané centrální heslo není platné, nelze ho použít pro dekódování uložených " +"hesel." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "Zadané centrální heslo není platné, nelze ho použít pro dekódování." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Žlutá" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:396 msgid "Yes" msgstr "Ano" -#: ../../locales/../src/interface/netconfwizard.cpp:777 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8334,30 +8953,38 @@ "Zdá se, že používáte hostitele, který umí pouze IPv6. Takovou situaci " "bohužel tento průvodce nepodporuje." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Používáte nejnovější verzi aplikace FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Tento dialog lze kdykoliv později otevřít pomocí nabídky Nápověda." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Můžete si stáhnout nejnovější verzi ze stránek FileZilly:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "Pro použití výchozího portu ponechte pole port prázdné." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "Na libovolné pozici můžete použít x pro zachování původního oprávnění." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Při používání centrálního hesla nelze měnit jednotlivě heslo a šifrovací " +"klíč." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Nelze importovat nastavení ze složky s nastavením, které se právě používá." @@ -8370,23 +8997,28 @@ "Nelze nahradit neplatný znak jiným neplatným znakem. Zadejte znak, který je " "v názvech souborů povolen." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Soubory nelze nahrávat do kořenové složky." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "Nezadal jste nový název pro soubor. Chcete raději soubor místo toho přepsat?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Vybrali jste alespoň jeden symbolický odkaz." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:725 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "Vybrali jste k úpravě více než 10 souborů. Opravdu chcete pokračovat?" -#: ../../locales/../src/interface/LocalListView.cpp:1665 +#: ../../locales/../src/interface/LocalListView.cpp:1798 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8394,46 +9026,58 @@ "Vybrali jste k otevření více než 10 souborů nebo složek. Opravdu chcete " "pokračovat?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 msgid "You have to enter a hostname." msgstr "Musíte zadat název hostitele." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 msgid "You have to enter a key file path" msgstr "Musíte zadat cestu k souboru s klíčem" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Musíte zadat místní složku." -#: ../../locales/../src/interface/netconfwizard.cpp:165 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Musíte zadat platnou IP adresu." +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Musíte zadat vzdálenou složku." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "Musíte zadat platnou IPv4 adresu." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +msgid "You have to enter a valid encryption key" +msgstr "Musíte zadat platný klíč pro šiforvání" -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Musíte zadat zapisovatelnou místní složku." -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 msgid "You have to enter an account name" msgstr "Musíte zadat název účtu" -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 msgid "You have to specify a user name" msgstr "Musíte zadat uživatelské jméno" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "" "Pravděpodobně máte router nebo firewall, který poškodil přenášená data." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Musíte zadat centrální heslo." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Musíte zadat název záložky." @@ -8441,7 +9085,7 @@ msgid "You need to enter a name for the log file." msgstr "Musíte zadat název souboru s protokolem." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Musí být uveden správně uvozený příkaz." @@ -8454,23 +9098,23 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Musíte zadat port proxy v rozsahu od 1 do 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Musíte zadat alespoň jednu cestu, prázdné záložky nejsou podporovány." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" "Musíte zadat místní i vzdálenou cestu, pokud chcete povolit synchronizované " -"procházení pro tuto oblíbenou položku." +"procházení pro tuto záložku." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1154 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8478,23 +9122,31 @@ "Musíte zadat místní i vzdálenou cestu, pokud chcete povolit synchronizované " "procházení tohoto místa." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Aplikaci FileZilla musíte povolit přístup do složek, kam chcete soubory " +"ukládat nebo odkud je chcete nahrát." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Musíte zadat místní soubor." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Musíte zadat vzdálený soubor." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Musíte zadat vzdálenou složku." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Musíte zadat název serveru." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8502,163 +9154,263 @@ "Neměli byste mít žádné problémy s připojením na ostatní servery, přenos " "souborů by měl pracovat správně." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:2769 msgid "Your computer will suspend unless you click Cancel." msgstr "Pokud nestisknete Storno, systém přejde do režimu spánku." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "po" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "před" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "začíná na" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "bajtů" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "obsahuje" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "vlastní" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "neobsahuje" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "se nerovná" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "končí na" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "se rovná" -#: ../../locales/../src/interface/filelistctrl.cpp:529 -#: ../../locales/../src/interface/filelistctrl.cpp:548 +#: ../../locales/../src/interface/filelistctrl.cpp:557 #: ../../locales/../src/interface/filelistctrl.cpp:575 -#: ../../locales/../src/interface/filelistctrl.cpp:591 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "soubor" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" #: ../../locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " "FileZilla executable." msgstr "" -"Nelze spustit fzputtygen.\n" +"fzputtygen nelze spustit.\n" "Ujistěte se, zda existuje tento spustitelný soubor ve stejné složce jako " "spouštěcí soubor aplikace FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:467 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp patří k jiné verzi aplikace FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1510 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" -msgstr "Nelze spustit fzsftp" +msgstr "fzputtygen nelze spustit" + +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj patří k jiné verzi aplikace FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj nelze spustit" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj nelze spustit.\n" +"Ujistěte se, zda existuje tento spustitelný soubor ve stejné složce jako " +"spouštěcí soubor aplikace FileZilla." -#: ../../locales/../src/engine/tlssocket.cpp:1125 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers nevrátil žádné certifikáty" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 selhal" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "je větší než" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "spustitelný skupinou" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "čitelný skupinou" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "zapisovatelný skupinou" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" -msgstr "je" +msgstr "je rovný" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "je nastaven" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "není nastaven" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "je menší než" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "vyhovuje regulárnímu výrazu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +msgid "new name" +msgstr "nový název" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "spustitelný vlastníkem" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "čitelný vlastníkem" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "zapisovatelný vlastníkem" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1189 -#: ../../locales/../src/engine/tlssocket.cpp:1200 -#: ../../locales/../src/engine/tlssocket.cpp:1215 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "neznámý" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "spustitelný pro všechny" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "čitelný pro všechny" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "zapisovatelný pro všechny" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "&Zapomínat hesla (doporučeno)" + +#~ msgid "&Remember passwords" +#~ msgstr "&Pamatovat si hesla" + +#~ msgid "Available sizes" +#~ msgstr "Dostupné velikosti" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Nelze načíst panel rychlého připojení ze zdrojového souboru" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Nelze importovat certifikáty druhé strany, vykonání funkce " +#~ "gnutls_x509_crt_import se nezdařilo" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Nelze inicializovat strukturu certifikátů druhé strany, vykonání funkce " +#~ "gnutls_x509_crt_init se nezdařilo" + +#~ msgid "Filename &filters..." +#~ msgstr "Filtry &názvů souborů..." + +#~ msgid "Host key fingerprint:" +#~ msgstr "Otisk hostitelského klíče:" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize voláno bez uvedení soketu" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "Posun časové zóny serveru je%d sekund." + +#~ msgid "%d files added to queue" +#~ msgstr "%d souborů přidáno do fronty" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Odpojit od serveru" + +#~ msgid "&Show message" +#~ msgstr "&Zobrazit zprávu" + +#~ msgid "Connected" +#~ msgstr "Připojen" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "Odstraňování více nezávislých složek není zatím podporováno" + +#~ msgid "Do ¬hing" +#~ msgstr "&Nedělat nic" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Stahování více nesouvisejících složek není dosud podporováno" + +#~ msgid "Downloading search results" +#~ msgstr "Stahování výsledků hledání" + +#~ msgid "No more files in the queue!" +#~ msgstr "Ve frontě již nejsou další soubory!" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Vyhledávání souborů pro přidání do fronty" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Vyhledávání souborů pro odeslání na server" + +#~ msgid "Waiting" +#~ msgstr "Čekání" + #~ msgid "U&se system defaults" #~ msgstr "Použít nastavení sys&tému" @@ -8842,9 +9594,6 @@ #~ msgid "Resolving hostname" #~ msgstr "Zjišťování názvu hostitele" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Kořenový certifikát není důvěryhodný" - #~ msgid "Select download location for package" #~ msgstr "Vyberte místo, kam se má balíček stáhnout" diff -Nru filezilla-3.15.0.2/locales/da_DK.po filezilla-3.33.0/locales/da_DK.po --- filezilla-3.15.0.2/locales/da_DK.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/da_DK.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,9005 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: FileZilla 3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-30 15:29+0100\n" -"PO-Revision-Date: 2016-01-28 17:37+0100\n" -"Last-Translator: Niels Fanøe \n" -"Language-Team: Team Fanøe \n" -"Language: da_DK\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.6\n" - -#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 -msgid "%H:%M:%S elapsed" -msgstr "%H:%M:%S forløbet" - -#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 -msgid "%H:%M:%S left" -msgstr "%H:%M:%S tilbage" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 -#, c-format -msgid "" -"%a - Account (Lines containing this will be omitted if not using Account " -"logontype)" -msgstr "" -"%a - Konto (linier med denne angivelse vil blive udeladt, hvis login-typen " -"Konto ikke anvendes)" - -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 -#, c-format -msgid "%d directory" -msgid_plural "%d directories" -msgstr[0] "%d mappe" -msgstr[1] "%d mapper" - -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 -#, c-format -msgid "%d directory with its contents" -msgid_plural "%d directories with their contents" -msgstr[0] "%d mappe med indhold" -msgstr[1] "%d mapper med indhold" - -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 -#, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d fil" -msgstr[1] "%d filer" - -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 -#, c-format -msgid "%d file. Total size: %s" -msgid_plural "%d files. Total size: %s" -msgstr[0] "%d fil. Samlet størrelse: %s" -msgstr[1] "%d filer. Samlet størrelse: %s" - -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 -#, c-format -msgid "%d file. Total size: At least %s" -msgid_plural "%d files. Total size: At least %s" -msgstr[0] "%d fil. Samlet størrelse: Mindst %s" -msgstr[1] "%d filer. Samlet størrelse: Mindst %s" - -#: ../../locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "%d filer tilføjet i køen" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d sekund" -msgstr[1] "%d sekunder" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 -msgid "%h - Host" -msgstr "%h - Vært" - -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 -#, c-format -msgid "%llu directory" -msgid_plural "%llu directories" -msgstr[0] "%llu mappe" -msgstr[1] "%llu mapper" - -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 -#, c-format -msgid "%llu file" -msgid_plural "%llu files" -msgstr[0] "%llu fil" -msgstr[1] "%llu filer" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 -#, c-format -msgid "%p - Password" -msgstr "%p - Adgangskode" - -#: ../../locales/../src/interface/statuslinectrl.cpp:161 -#, c-format -msgid "%s (%s/s)" -msgstr "%s (%s/s)" - -#: ../../locales/../src/interface/statuslinectrl.cpp:164 -#, c-format -msgid "%s (? B/s)" -msgstr "%s (? B/s)" - -#: ../../locales/../src/interface/verifycertdialog.cpp:46 -#, c-format -msgid "%s - Certificate expired!" -msgstr "%s - Certificat udløbet" - -#: ../../locales/../src/interface/verifycertdialog.cpp:32 -#, c-format -msgid "%s - Not yet valid!" -msgstr "%s - Endnu ikke gyldig!" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 -#, c-format -msgid "%s - Proxy user" -msgstr "%s - Proxy-bruger" - -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 -#, c-format -msgid "%s and %s. Total size: %s" -msgstr "%s og %s. Samlet størrelse: %s" - -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 -#, c-format -msgid "%s and %s. Total size: At least %s" -msgstr "%s og %s. Samlet størrelse: Mindst %s" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 -#, c-format -msgid "%s byte" -msgid_plural "%s bytes" -msgstr[0] "%s byte" -msgstr[1] "%s byte" - -#: ../../locales/../src/interface/FileZilla.cpp:617 -#, c-format -msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " -"work.\n" -"\n" -"Please download FileZilla again. If this problem persists, please submit a " -"bug report." -msgstr "" -"%s kunne ikke findes. Uden denne FileZilla-komponent vil SFTP ikke fungere.\n" -"\n" -"Download FileZilla igen. Hvis dette problem fortsætter, så rapporter det som " -"en fejl." - -#: ../../locales/../src/interface/FileZilla.cpp:702 -#, c-format -msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " -"work.\n" -"\n" -"Possible solutions:\n" -"- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." -msgstr "" -"Kunne ikke finde %s. Uden denne komponent i FileZilla vil SFTP ikke " -"fungere.\n" -"\n" -"Mulige løsninger:\n" -"- Sørg for at %s findes i en mappe, der er angivet i din PATH-" -"miljøvariabel.\n" -"- Angiv den fulde sti til %s i miljøvariablen FZ_FZSFTP." - -#: ../../locales/../src/interface/verifycertdialog.cpp:63 -#, c-format -msgid "%s with %d bits" -msgstr "%s med %d bits" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 -#, c-format -msgid "%u - Username" -msgstr "%u - Brugernavn" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 -msgid "%w - Proxy password" -msgstr "%w - Proxy-adgangskode" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 -msgid "&Abort previous connection and connect in current tab" -msgstr "&Afslut forrige forbindelse, og forbind i aktuelle fane" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 -msgid "&About..." -msgstr "&Om..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 -msgid "&Account:" -msgstr "&Konto:" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 -msgid "&Active" -msgstr "Akti&v" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 -msgid "&Add bookmark..." -msgstr "&Tilføj bogmærke..." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 -msgid "&Add files to queue" -msgstr "&Tilføj filer i køen" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add key file..." -msgstr "&Tilføj nøglefil..." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 -msgid "&Add to queue" -msgstr "&Tilføj i køen" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 -msgid "&Adjust server timezone offset:" -msgstr "&Juster serverens tidszoneforskydning:" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 -msgid "&Always trust certificate in future sessions." -msgstr "Stol &altid på certifikater i fremtidige sessioner." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 -msgid "&Always trust this host, add this key to the cache" -msgstr "Hav &altid tillid til denne vært, tilføj denne nøgle i cache" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 -msgid "&Always use default editor" -msgstr "Brug &altid standard-editor" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 -msgid "&Always use selection for unassociated files" -msgstr "Brug &altid det valgte til uassocierede filer" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 -msgid "&Always use this action" -msgstr "Brug &altid denne handling" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 -msgid "&Ask your operating system for the external IP address" -msgstr "&Bed operativsystemet om den eksterne IP-adresse" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 -msgid "&Auto" -msgstr "&Auto" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 -msgid "&Autodetect" -msgstr "&Autodetektér" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 -msgid "&Binary" -msgstr "&Binær" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 -msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" -msgstr "&Binært præfiks med SI-symboler (f.eks. 1 KB = 1024 byte)" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 -msgid "&Bookmarks" -msgstr "&Bogmærker" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 -msgid "&Browse..." -msgstr "&Gennemse..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 -msgid "&Burst tolerance:" -msgstr "&Burst-tolerance:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 -#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 -msgid "&Cancel" -msgstr "&Annullér" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 -msgid "&Clear private data..." -msgstr "&Slet private data..." - -#: ../../locales/../src/interface/resources/xrc/update.xrc:28 -msgid "&Close" -msgstr "&Luk" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 -msgid "&Close FileZilla" -msgstr "Af&slut FileZilla" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 -msgid "&Configure speed limits..." -msgstr "&Konfigurér hastighedsgrænser..." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 -msgid "&Configure..." -msgstr "&Konfigurér..." - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 -msgid "&Connect" -msgstr "&Tilslut" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 -msgid "&Copy current connection to Site Manager..." -msgstr "&Kopier aktuel forbindelse til Websted Manager..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 -msgid "&Copy to clipboard" -msgstr "&Kopier til Udklipsholder" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 -msgid "&Create directory" -msgstr "&Opret mappe" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 -msgid "&Create new tab" -msgstr "Åbn &ny fane" - -#: ../../locales/../src/interface/menu_bar.cpp:72 -msgid "&Debug" -msgstr "&Debug" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 -msgid "&Debug information in message log:" -msgstr "&Debug-informationer i beskedlog:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 -msgid "&Default editor:" -msgstr "&Standard-editor:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 -msgid "&Default file exists action..." -msgstr "&Standard fil findes-handling..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 -msgid "&Delay between failed login attempts:" -msgstr "&Pause mellem mislykkede login-forsøg" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 -msgid "&Delete" -msgstr "Sl&et" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 -msgid "&Delete symlink" -msgstr "Sl&et symlink" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 -msgid "&Directory comparison" -msgstr "&Mappesammenligning" - -#: ../../locales/../src/interface/state.cpp:887 -msgid "" -"&Disable synchronized browsing and continue changing the local directory" -msgstr "Slå synkroniseret bladring &fra, og fortsæt med at skifte lokal mappe" - -#: ../../locales/../src/interface/state.cpp:960 -msgid "" -"&Disable synchronized browsing and continue changing the remote directory" -msgstr "Slå synkroniseret bladring &fra, og fortsæt med at skifte fjernmappe" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 -msgid "&Discard local file then download and edit file anew" -msgstr "&Ryd lokal fil, og hent og rediger filen igen" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 -msgid "&Disconnect" -msgstr "&Afbryd forbindelse" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Afbryd forbindelse til server" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 -msgid "&Display momentary transfer speed instead of average speed" -msgstr "&Vis aktuel overførselshastighed i stedet for gennemsnitlig hastighed" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 -msgid "&Display size in bytes" -msgstr "&Vis størrelse i byte" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "&Husk ikke adgangskoder (anbefalet)" - -#: ../../locales/../src/interface/conditionaldialog.cpp:25 -msgid "&Don't show this dialog again." -msgstr "&Vis ikke denne meddelelse igen." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 -msgid "&Don't use external IP address on local connections." -msgstr "Brug ikke eksterne IP-adresser til &lokale forbindelser." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 -msgid "&Double-click action on files:" -msgstr "Handling ved &dobbeltklik på filer:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 -msgid "&Download" -msgstr "Do&wnload" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 -msgid "&Download to:" -msgstr "Do&wnload til:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 -msgid "&Download..." -msgstr "Do&wnload..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 -msgid "&Downloads:" -msgstr "&Downloadet:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 -msgid "&Edit" -msgstr "&Rediger" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 -msgid "&Edit filter rules..." -msgstr "&Rediger filterregler..." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 -msgid "&Enable" -msgstr "Slå &til" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 -msgid "&Enable compression" -msgstr "Slå &komprimering til" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 -msgid "&Enable speed limits" -msgstr "Slå hastighedsgrænser &til" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 -msgid "&Encoding:" -msgstr "Ind&kodning:" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 -msgid "&Encryption:" -msgstr "Kr&yptering:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 -msgid "&Enter custom command..." -msgstr "&Indtast brugerdefineret kommando..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 -msgid "&Establish connection in a new tab" -msgstr "&Etabler forbindelse i en ny fane" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 -msgid "&Execute" -msgstr "&Udfør" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 -msgid "&Export Site Manager entries" -msgstr "Eksportér &websteder" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 -msgid "&Export..." -msgstr "&Eksportér..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 -msgid "&Fall back to active mode" -msgstr "&Fald tilbage til aktiv tilstand" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 -msgid "&File" -msgstr "&Fil" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 -msgid "&File Attributes..." -msgstr "&Fil-attributter..." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 -msgid "&File permissions..." -msgstr "&Filtilladelser..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 -msgid "&File:" -msgstr "&Fil:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 -msgid "&Filter conditions:" -msgstr "Filter&betingelser:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 -msgid "&Filter sets:" -msgstr "&Filtersæt:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 -msgid "&Filters:" -msgstr "&Filtre:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 -msgid "&Finish editing and delete local file" -msgstr "&Afslut redigering, og slet lokal fil" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 -msgid "" -"&Flatten remote paths, download all contained files directly into target " -"directory" -msgstr "Ud&jævn fjernstier, hent alle indeholdte filer direkte ned i målmappen" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 -msgid "&Follow symlink, delete target directory contents" -msgstr "&Følg symlink, slet indholdet af målmapper" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 -msgid "&Get external IP address from the following URL:" -msgstr "Hent &ekstern IP-adresse fra denne URL:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 -msgid "&Getting help..." -msgstr "&Få hjælp..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 -msgid "&Global bookmark" -msgstr "Globalt &bogmærke" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 -msgid "&HTTP/1.1 using CONNECT method" -msgstr "&HTTP/1.1 ved brug af CONNECT-metoden" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 -msgid "&Help" -msgstr "&Hjælp" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 -msgid "&Hide identical files" -msgstr "&Gem identiske filer" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 -msgid "&Highest" -msgstr "&Højeste" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 -msgid "&Highest available port:" -msgstr "&Højeste nr. port til rådighed:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 -msgid "&Host:" -msgstr "&Vært:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 -msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" -msgstr "&IEC binært præfiks (f.eks. 1 KiB = 1024 byte)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 -msgid "&ISO 8601 (example: 2007-09-15)" -msgstr "&ISO 8601 (eksempel: 2007-09-15)" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 -msgid "&Import..." -msgstr "&Importér..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 -msgid "&Inherit system's filetype associations" -msgstr "&Hent filtypeassociationer fra systemet" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 -msgid "&Install new version" -msgstr "&Installér ny version" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 -msgid "&Keep remote path structure relative to search root" -msgstr "&Bevar struktur i fjernsti relativ til søgeroden" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 -msgid "&Key file:" -msgstr "&Nøglefil:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 -msgid "&Layout of file and directory panes:" -msgstr "Udseende for fil- og mappe-ruder:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 -msgid "&Limit local ports used by FileZilla" -msgstr "Be&græns antal lokale porte, der bruges af FileZilla" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 -msgid "&Limit number of simultaneous connections" -msgstr "&Begræns antal samtidige forbindelser" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 -msgid "&Local directory tree" -msgstr "Lo&kalt mappetræ" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 -msgid "&Local directory:" -msgstr "&Lokal mappe:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 -msgid "&Log to file" -msgstr "&Log til fil" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 -msgid "&Logon Type:" -msgstr "&Logontype:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 -msgid "&Logontype:" -msgstr "&Logontype:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 -msgid "&Low" -msgstr "&Lav" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 -msgid "&Manage bookmarks..." -msgstr "&Administrer bogmærker..." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 -msgid "&Manual transfer..." -msgstr "&Manuel overførsel..." - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 -msgid "&Maximum number of connections:" -msgstr "Ma&ks. antal forbindelser:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 -msgid "&Maximum number of retries:" -msgstr "&Maks. antal forsøg:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 -msgid "&Message log" -msgstr "&Beskedlog" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 -msgid "&Minimize to tray" -msgstr "Mi&nimer til systembakke" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 -msgid "&Name sorting mode:" -msgstr "&Navnesorteringsmetode:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 -msgid "&Name:" -msgstr "&Navn:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 -msgid "&Network configuration wizard..." -msgstr "&Konfigurationsassistent..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 -msgid "&New" -msgstr "&Ny" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 -msgid "&New Site" -msgstr "&Nyt websted" - -#: ../../locales/../src/interface/Mainfrm.cpp:1665 -msgid "&New version available!" -msgstr "&Ny version findes!" - -#: ../../locales/../src/interface/netconfwizard.cpp:27 -msgid "&Next >" -msgstr "&Næste >" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 -msgid "&No" -msgstr "&Nej" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 -msgid "&None" -msgstr "&Ingen" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 -msgid "&Normal" -msgstr "&Normal" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 -msgid "&Numeric value:" -msgstr "&Numerisk værdi:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 -msgid "&OK" -msgstr "&OK" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 -msgid "&OPEN" -msgstr "&ÅBEN" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 -msgid "&Open" -msgstr "&Åbn" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 -msgid "&Overwrite" -msgstr "&Overskriv" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 -msgid "&Passive" -msgstr "&Passiv" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 -msgid "&Password:" -msgstr "&Adgangskode:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 -msgid "&Play sound" -msgstr "Afspil &lyd" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 -msgid "&Port:" -msgstr "&Port:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 -msgid "&Preserve timestamps of transferred files" -msgstr "&Bevar tidsstempel på overførte filer" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 -msgid "&Queue" -msgstr "&Sæt i kø" - -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 -msgid "&Quickconnect" -msgstr "&Lyntilslut" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 -msgid "&Quickconnect bar" -msgstr "&Lyntilslutningsbjælke" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 -msgid "&Quickconnect history" -msgstr "&Lyntilslut-historik" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 -msgid "&Read" -msgstr "&Læs" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 -msgid "&Reconnect" -msgstr "&Tilslut igen" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 -msgid "&Reconnect information" -msgstr "&Gentilslut-information" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 -msgid "&Refresh" -msgstr "&Genopfrisk" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 -msgid "&Remember password until FileZilla is closed" -msgstr "&Husk adgangskode indtil FileZilla lukkes" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "&Husk adgangskoder" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 -msgid "&Remote directory:" -msgstr "&Fjern-mappe:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 -msgid "&Remote path:" -msgstr "Sti på f&jernsted:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 -msgid "&Remove" -msgstr "&Fjern" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 -msgid "&Remove key" -msgstr "&Fjern nøgle" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 -msgid "&Remove selected" -msgstr "Fjern &valgte" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 -msgid "&Rename" -msgstr "Om&døb" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 -msgid "&Rename..." -msgstr "Om&døb..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 -msgid "&Reopen local file" -msgstr "&Genåbn lokal fil" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 -msgid "&Replace invalid characters with:" -msgstr "&Erstat ugyldige tegn med:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 -msgid "&Report a bug..." -msgstr "&Rapportér en fejl..." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 -msgid "&Reset and requeue all" -msgstr "&Nulstil og sæt alle i kø igen" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 -msgid "&Restart Wizard" -msgstr "&Genstart assistent" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 -msgid "&Resume" -msgstr "&Genoptag" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 -msgid "&Run command..." -msgstr "&Kør kommando..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 -msgid "&Run configuration wizard now..." -msgstr "&Kør konfigurationsassistent nu..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 -msgid "&Run update check now..." -msgstr "S&øg efter opdateringer nu..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 -msgid "&SITE" -msgstr "&SITE" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 -msgid "&SOCKS 5" -msgstr "&SOCKS 5" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 -msgid "&Save as..." -msgstr "Gem &som..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 -msgid "&Search" -msgstr "&Søg" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 -msgid "&Search remote files..." -msgstr "S&øg efter filer på fjernsted..." - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 -msgid "&Select Entry:" -msgstr "&Vælg indgang:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 -msgid "&Select language:" -msgstr "&Vælg sprog" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 -msgid "&Select the columns that should be displayed:" -msgstr "Vælg, hvilke &kolonner der skal vises:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 -msgid "&Server" -msgstr "&Server" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 -msgid "&Settings" -msgstr "&Indstillinger" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 -msgid "&Settings..." -msgstr "&Indstillinger..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 -msgid "&Show debug menu" -msgstr "&Vis debug-menu" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 -msgid "&Show detailed log" -msgstr "&Vis detaljer i log" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Vis besked" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 -msgid "&Show timestamps in message log" -msgstr "Vis &tidsstempler i beskedlog" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 -msgid "&Site Manager entries" -msgstr "&Websted Manager-liste" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 -msgid "&Site Manager..." -msgstr "&Websted Manager..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 -msgid "&Site-specific bookmark" -msgstr "&Sted-specifikt bogmærke" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 -msgid "&Skip" -msgstr "&Spring over" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 -msgid "&Speed limits" -msgstr "&Hastighedsgrænser" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 -msgid "&Start transfer immediately" -msgstr "Start overførsel &straks" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 -msgid "&Swap local and remote panes" -msgstr "&Ombyt lokalt sted og fjernsted" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 -msgid "&TLS Ciphers" -msgstr "&TLS-koder" - -#: ../../locales/../src/interface/netconfwizard.cpp:227 -msgid "&Test" -msgstr "&Test" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 -msgid "&Theme:" -msgstr "&Tema:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 -msgid "&Transfer" -msgstr "&Overfør" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 -msgid "&Transfer mode:" -msgstr "Over&førselstilstand:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 -msgid "&Transfer queue" -msgstr "&Overførselskø" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 -msgid "&Treat dotfiles as ASCII files" -msgstr "Behandl &dot-filer som ASCII-filer" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 -msgid "&Unedit" -msgstr "&Fortryd redigering" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 -msgid "&Update cached key for this host" -msgstr "&Opdater cachet nøgle for denne vært" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 -msgid "&Upload" -msgstr "&Upload" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 -msgid "&Uploads:" -msgstr "&Uploadet:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 -msgid "&Use custom program" -msgstr "&Anvend brugerdef. program" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 -msgid "&Use synchronized browsing" -msgstr "Anvend &synkroniseret bladring" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 -msgid "&Use system's default editor for text files" -msgstr "&Brug systemets standard-editor til tekstfiler" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 -msgid "&Use the following IP address:" -msgstr "&Anvend denne IP-adresse:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 -msgid "&Use the server's external IP address instead" -msgstr "Anvend &serverens eksterne IP-adresse i stedet for" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 -msgid "&Use thousands separator" -msgstr "Brug &tusindadskiller" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 -msgid "&User:" -msgstr "&Bruger:" - -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 -msgid "&Username:" -msgstr "&Brugernavn:" - -#: ../../locales/../src/interface/Mainfrm.cpp:1659 -#, c-format -msgid "&Version %s" -msgstr "&Version %s" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 -msgid "&View" -msgstr "&Vis" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 -msgid "&View/Edit" -msgstr "&Vis/Rediger" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 -msgid "&Watch locally edited files and prompt to upload modifications" -msgstr "&Overvåg lokalt redigerede filer, og spørg om upload af ændringer" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 -msgid "&When checking for updates, check for:" -msgstr "&Ved søgning efter opdateringer skal følgende kontrolleres:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 -msgid "&Write" -msgstr "S&kriv" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 -msgid "&Yes" -msgstr "&Ja" - -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 -#, c-format -msgid "'%s' does not exist or cannot be accessed." -msgstr "'%s' findes ikke eller kan ikke tilgås." - -#: ../../locales/../src/engine/local_path.cpp:459 -#: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 -#, c-format -msgid "'%s' is not a directory." -msgstr "'%s' er ikke en mappe." - -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -msgid "'Account' logontype not supported by selected protocol" -msgstr "Logontypen 'Konto' understøttes ikke af den valgte protokol" - -#: ../../locales/../src/interface/manual_transfer.cpp:441 -msgid "" -"'Normal' and 'Account' logontypes are not available, using 'Ask for " -"password' instead." -msgstr "" -"Login-typerne 'Normal' og 'Konto' er ikke tilgængelige. Bruger 'Bed om " -"adgangskode' i stedet." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 -msgid "" -"'Normal' and 'Account' logontypes are not available. Your entry has been " -"changed to 'Ask for password'." -msgstr "" -"Login-typerne 'Normal' og 'Konto' er ikke tilgængelige. Din indtastning er " -"ændret til 'Bed om adgangskode'." - -#: ../../locales/../src/interface/Mainfrm.cpp:588 -msgid "" -"'quote' is usually a local command used by commandline clients to send the " -"arguments following 'quote' to the server. You might want to enter the raw " -"command without the leading 'quote'." -msgstr "" -"'quote' er normalt en kommando brugt i kommando-linje klienter til at sende " -"argumenter for 'quote' til serveren. Du bør skrive kommandoen uden 'quote'." - -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 -#, c-format -msgid "(%d object filtered)" -msgid_plural "(%d objects filtered)" -msgstr[0] "(%d objekt filtreret)" -msgstr[1] "(%d objekter filtreret)" - -#: ../../locales/../src/interface/update_dialog.cpp:254 -#, c-format -msgid "(%u%% downloaded)" -msgstr "(%u%% hentet)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 -msgid "(0 for no limit)" -msgstr "(0 for ingen begrænsning)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 -msgid "(0-99)" -msgstr "(0-99)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 -msgid "(0-999 seconds)" -msgstr "(0-999 sekunder)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 -msgid "(1-10)" -msgstr "(1-10)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 -msgid "(10-9999, 0 to disable)" -msgstr "(10-9999, 0 for at slå fra)" - -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 -#, c-format -msgid "(app-compat is set to %d.%d)" -msgstr "(app-compat er sat til %d.%d)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 -msgid "(example: %H:%M)" -msgstr "(eksempel: %H:%M)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 -msgid "(example: %Y-%m-%d)" -msgstr "(eksempel: %Y-%m-%d)" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 -#, c-format -msgid "(in %s/s)" -msgstr "(i %s/s)" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 -msgid "-" -msgstr "-" - -#: ../../locales/../src/interface/statuslinectrl.cpp:209 -msgid "--:--:-- left" -msgstr "--:--:-- tilbage" - -#: ../../locales/../src/interface/cmdline.cpp:88 -msgid "-c cannot be used together with an FTP URL." -msgstr "-c kan ikke anvendes sammen med en FTP-URL." - -#: ../../locales/../src/interface/cmdline.cpp:97 -msgid "-l can only be used together with an FTP URL." -msgstr "-l kan kun anvendes sammen med en FTP-URL." - -#: ../../locales/../src/interface/cmdline.cpp:76 -msgid "-s and -c cannot be present at the same time." -msgstr "-s og -c kan ikke anvendes samtidig." - -#: ../../locales/../src/interface/cmdline.cpp:82 -msgid "-s cannot be used together with an FTP URL." -msgstr "-s kan ikke anvendes sammen med en FTP-URL." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 -msgid "0 - None" -msgstr "0 - Ingen" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 -msgid "1 - Warning" -msgstr "1 - Advarsel" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 -msgid "2 - Info" -msgstr "2 - Info" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 -msgid "3 - Verbose" -msgstr "3 - Mange ord" - -#: ../../locales/../src/interface/aboutdialog.cpp:98 -msgid "32-bit system" -msgstr "32-bit system" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 -msgid "4 - Debug" -msgstr "4 - Debug" - -#: ../../locales/../src/interface/aboutdialog.cpp:96 -msgid "64-bit system" -msgstr "64-bit system" - -#: ../../locales/../src/interface/netconfwizard.cpp:28 -msgid "< &Back" -msgstr "< &Tilbage" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 -msgid "?" -msgstr "?" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -msgid "" -"A bookmark with the entered name already exists. Please enter an unused name." -msgstr "" -"Et bogmærke med det angivne navn findes allerede. Angiv et navn, der ikke er " -"i brug." - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 -msgid "A default editor needs to be set." -msgstr "Du skal angive en standard-editor." - -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 -msgid "A directory cannot be dragged into one of its subdirectories." -msgstr "En mappe kan ikke trækkes ind i en af dens undermapper." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 -msgid "" -"A few servers don't allow passive mode or are misconfigured. In such cases " -"you would have to use active mode. In active mode, FileZilla opens a port " -"and asks the server to connect to it." -msgstr "" -"Nogle få servere tillader ikke passiv tilstand eller er fejlkonfigureret. I " -"sådanne tilfælde skal du anvende aktiv tilstand. I aktiv tilstand åbner " -"FileZilla en port og beder serveren oprette forbindelse til denne." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 -msgid "A file previously opened has been changed." -msgstr "En tidligere åbnet fil er ændret." - -#: ../../locales/../src/interface/edithandler.cpp:1644 -msgid "A file with that name is already being transferred." -msgstr "En fil med det navn er allerede ved at blive overført." - -#: ../../locales/../src/interface/edithandler.cpp:1648 -msgid "" -"A file with that name is still being edited. Please close it and try again." -msgstr "" -"En fil med det navn er stadig under redigering. Luk den, og forsøg igen." - -#: ../../locales/../src/interface/FileZilla.cpp:596 -msgid "" -"A local filename could not be decoded.\n" -"Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " -"correctly.\n" -"Unless you fix this problem, files might be missing in the file listings.\n" -"No further warning will be displayed this session." -msgstr "" -"Et lokal filnavn kunne ikke afkodes.\n" -"Sørg for, at miljøvariablen LC_CTYPE (eller LC_ALL) er sat korrekt.\n" -"Hvis du ikke løser dette problem, kan der mangle filer i visningen af " -"mapper.\n" -"Der vises ikke flere advarsler om dette i denne session." - -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 -msgid "A new version of FileZilla is available:" -msgstr "Der findes en ny version af FileZilla:" - -#: ../../locales/../src/interface/Mainfrm.cpp:648 -msgid "" -"A proper server always shows all files, but some broken servers hide files " -"from the user. Use this option to force the server to show all files." -msgstr "" -"En ordentlig server viser altid alle filer, men nogle dårligt konfigurerede " -"servere skjuler filer fra brugeren. Brug denne parameter til at tvinge " -"serveren til at vise alle filer." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 -msgid "" -"A proper server does not require this. Contact the server administrator if " -"you need this." -msgstr "" -"En ordentlig server kræver ikke dette. Kontakt serverens administrator, hvis " -"du må slå dette til." - -#: ../../locales/../src/interface/state.cpp:258 -msgid "" -"A remote operation is in progress and synchronized browsing is enabled.\n" -"Disable synchronized browsing and continue changing the local directory?" -msgstr "" -"En handling er i gang på fjernstedet, og synkroniseret bladring er slået " -"til.\n" -"Vil du slå synkroniseret bladring fra, og fortsætte med at ændre den lokale " -"mappe?" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 -msgid "A&SCII" -msgstr "A&SCII" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 -msgid "A&dd" -msgstr "&Tilføj" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 -msgid "A&llow resume of ASCII files" -msgstr "&Tillad genoptagelse af ASCII-filer" - -#: ../../locales/../src/interface/fileexistsdlg.cpp:72 -msgid "A&pply only to downloads" -msgstr "S&kal kun gælde download" - -#: ../../locales/../src/interface/fileexistsdlg.cpp:72 -msgid "A&pply only to uploads" -msgstr "S&kal kun gælde upload" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 -msgid "A&pply to all files and directories" -msgstr "S&kal gælde alle filer og mapper" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 -msgid "A&utomatically remove successful transfers" -msgstr "Fjern &automatisk fuldførte overførsler" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 -msgid "ASCII" -msgstr "ASCII" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 -msgid "About FileZilla" -msgstr "Om FileZilla" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 -msgid "Above the file lists" -msgstr "Oven over fil-listerne" - -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 -msgid "Account" -msgstr "Konto" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 -msgid "Action after queue &completion" -msgstr "&Handling efter afvikling af kø" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 -msgid "Action on selected file:" -msgstr "Handling for den valgte fil:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 -msgid "Action to perform:" -msgstr "Handling, der skal udføres:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 -msgid "Action:" -msgstr "Handling:" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 -msgid "Active mode" -msgstr "Aktiv tilstand" - -#: ../../locales/../src/interface/netconfwizard.cpp:614 -msgid "" -"Active mode FTP test failed. FileZilla does not know the correct external IP " -"address." -msgstr "" -"FTP-test i aktiv tilstand fejlede. FileZilla kender ikke den korrekte " -"eksterne IP-adresse." - -#: ../../locales/../src/interface/netconfwizard.cpp:601 -msgid "" -"Active mode FTP test failed. FileZilla does not know the correct external IP " -"address. In addition to that, your router has modified the sent address." -msgstr "" -"FTP-test i aktiv tilstand fejlede. FileZilla kender ikke den korrekte IP-" -"adresse. Desuden har din router ændret den sendte adresse." - -#: ../../locales/../src/interface/netconfwizard.cpp:589 -msgid "" -"Active mode FTP test failed. FileZilla knows the correct external IP " -"address, but your router or firewall has misleadingly modified the sent " -"address." -msgstr "" -"FTP-test i aktiv tilstand fejlede. FileZilla kender den korrekte eksterne IP-" -"adresse, men din router eller firewall har lavet en fejl og ændret den " -"sendte adresse." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 -msgid "Active mode IP" -msgstr "Aktiv tilstand IP" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 -msgid "Add files to &queue only" -msgstr "&Tilføj blot filer i køen" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 -msgid "Add selected directory to the transfer queue" -msgstr "Tilføj den valgte mappe i overførselskøen" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 -msgid "Add selected files and folders to the transfer queue" -msgstr "Tilføj valgte filer og mapper i overførselskøen" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 -msgid "Add to queue" -msgstr "Tilføj i kø" - -#: ../../locales/../src/engine/proxy.cpp:528 -msgid "Address type not supported" -msgstr "Adressetype ikke understøttet" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 -msgid "Advanced" -msgstr "Avanceret" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 -msgid "" -"Advice: Unless you want to test new features, please keep using stable " -"versions only. Beta versions and nightly builds are development versions " -"meant for testing purposes. Nightly builds of FileZilla may not work as " -"expected and might even damage your system. Use beta versions and nightly " -"builds at your own risk." -msgstr "" -"Et godt råd: Medmindre du ønsker at teste nye funktioner, bør du kun bruge " -"stabile versioner. Betaversioner og daglige byg er udviklingsversioner, der " -"er beregnet til testformål. De daglige byg af FileZilla fungerer måske ikke " -"som forventet, og kunne endda forvolde skade på dit system. Brugen af " -"betaversioner og daglige byg er på egen risiko." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 -msgid "Al&ways perform this action" -msgstr "&Brug altid denne handling" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 -msgid "Algorithm:" -msgstr "Algoritme:" - -#: ../../locales/../src/interface/QueueView.cpp:2937 -msgid "All files have been successfully transferred" -msgstr "Overførsel af alle filer lykkedes" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 -msgid "All ports in the given range have to be between 1024 and 65535." -msgstr "Alle porte i det angivne interval skal være mellem 1024 og 65535." - -#: ../../locales/../src/interface/QueueView.cpp:2933 -#, c-format -msgid "All transfers have finished. %d file could not be transferred." -msgid_plural "All transfers have finished. %d files could not be transferred." -msgstr[0] "Alle overførsler afsluttet. %d fil kunne ikke overføres." -msgstr[1] "Alle overførsler afsluttet. %d filer kunne ikke overføres." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 -msgid "Allow &fall back to other transfer mode on failure" -msgstr "&Tillad at falde tilbage til anden overførselsmåde ved fejl" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 -msgid "Allow fallback to other transfer mode on failure" -msgstr "Tillad tilbagegang til anden overførsels-måde ved fejl" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 -msgid "Already connected" -msgstr "Allerede tilsluttet" - -#: ../../locales/../src/interface/verifycertdialog.cpp:84 -msgid "Alternative name:" -msgid_plural "Alternative names:" -msgstr[0] "Alternativt navn:" -msgstr[1] "Alternative navne:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 -msgid "" -"Alternatively you can use the Pageant tool from PuTTY to manage your keys, " -"FileZilla does recognize Pageant." -msgstr "" -"Du kan som alternativ anvende Pageant-værktøjet fra PuTTY til at håndtere " -"dine nøgler - FileZilla kan se Pageant." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 -msgid "" -"Alternatively you can use your system's SSH agent. To do so, make sure the " -"SSH_AUTH_SOCK environment variable is set." -msgstr "" -"Du kan som alternativ bruge SSH-agenten på dit system. For at gøre dette " -"skal du sikre dig, at miljøvariablen SSH_AUTH_SOCK er sat." - -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 -msgid "" -"Alternatively, you can also download the latest version from the FileZilla " -"website:" -msgstr "Du kan også hente den seneste version fra FileZillas websted:" - -#: ../../locales/../src/interface/QueueView.cpp:1902 -#, c-format -msgid "" -"An error occurred loading the transfer queue from \"%s\".\n" -"Some queue items might not have been restored." -msgstr "" -"Der opstod en fejl ved indlæsning af overførselskøen fra \"%s\".\n" -"Det lykkedes måske ikke at gendanne alle elementer i køen." - -#: ../../locales/../src/interface/QueueView.cpp:1812 -#, c-format -msgid "" -"An error occurred saving the transfer queue to \"%s\".\n" -"Some queue items might not have been saved." -msgstr "" -"Der opstod en fejl ved indlæsning af overførselskøen fra \"%s\".\n" -"Det lykkedes måske ikke at gemme alle elementer i køen." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 -msgid "" -"An item with the same name as the dragged item already exists at the target " -"location." -msgstr "" -"Et objekt med samme navn som det trukne objekt findes allerede på " -"destinationsstedet." - -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 -msgid "Anonymous" -msgstr "Anonym" - -#: ../../locales/../src/interface/state.cpp:937 -msgid "" -"Another remote operation is already in progress, cannot change directory now." -msgstr "En anden handling er i gang på fjernstedet - kan ikke skifte mappe nu." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 -msgid "Any changes made in the Site Manager could not be saved." -msgstr "Eventuelle ændringer i Websted Manager kunne ikke gemmes." - -#: ../../locales/../src/interface/filter.cpp:213 -msgid "Any changes made to the filters could not be saved." -msgstr "Eventuelle ændringer i filtre kunne ikke gemmes." - -#: ../../locales/../src/interface/filter.cpp:970 -msgid "Any changes made to the filters will not be saved." -msgstr "Eventuelle ændringer i filtrene vil ikke blive gemt." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 -msgid "App&ly to directories only" -msgstr "Skal kun gælde &mapper" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 -msgid "Apply" -msgstr "Anvend" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 -msgid "Apply to ¤t queue only" -msgstr "Skal kun gælde &aktuelle kø" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 -msgid "Apply to &files only" -msgstr "Skal kun gælde &filer" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 -msgid "Archive" -msgstr "Arkiv" - -#: ../../locales/../src/engine/socket.cpp:1081 -msgid "Argument buffer overflow" -msgstr "Overløb i parameter-buffer" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 -msgid "As tab in the transfer queue pane" -msgstr "Som faneblad i overførselskø-ruden" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 -msgid "Ask for action" -msgstr "Spørg efter handling" - -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 -msgid "Ask for password" -msgstr "Spørg efter adgangskode" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 -msgid "Ask operating system for a port." -msgstr "Bed operativsystemet om en port." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 -msgid "Ask your operating system for the external IP address" -msgstr "Bed operativsystemet om den eksterne IP-adresse" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 -msgid "Asking questions in the FileZilla forums" -msgstr "Stil spørgsmål i FileZillas fora" - -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 -msgid "Associated program not found:" -msgstr "Det associerede program kunne ikke findes:" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 -msgid "At least one filter condition is incomplete" -msgstr "Mindst en filterbetingelse er ufuldstændig" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 -msgid "At this point, all required information has been gathered." -msgstr "På dette tidspunkt er al nødvendig information indsamlet." - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 -msgid "Attribute" -msgstr "Attribut" - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 -msgid "Authentication failed." -msgstr "Validering fejlede." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 -msgid "Author:" -msgstr "Forfatter:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 -msgid "Auto" -msgstr "Auto" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 -msgid "Automatic file type classification" -msgstr "Automatisk filtypeklassificering" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Mulige størrelser" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 -msgid "B " -msgstr "B " - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 -msgid "B&ypass proxy" -msgstr "F&orbigå proxy" - -#: ../../locales/../src/engine/socket.cpp:1045 -msgid "Bad file descriptor" -msgstr "Forkert filbeskrivelse" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 -msgid "Basic usage instructions" -msgstr "Grundlæggende anvendelse" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 -msgid "Behaviour" -msgstr "Adfærd" - -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 -msgid "Being edited" -msgstr "Under redigering" - -#: ../../locales/../src/engine/tlssocket.cpp:1113 -msgid "Beware! Certificate has been revoked" -msgstr "Pas på! Certifikat er tilbagekaldt" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 -msgid "Binary" -msgstr "Binær" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 -msgid "Blackboard" -msgstr "Tavle" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 -msgid "Bookmark" -msgstr "Bogmærke" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 -msgid "Bookmark:" -msgstr "Bogmærke:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 -msgid "Bookmarks" -msgstr "Bogmærker" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 -msgid "Browse..." -msgstr "Gennemse..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 -msgid "Build date:" -msgstr "Build-dato:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 -msgid "Build information" -msgstr "Build-information" - -#: ../../locales/../src/interface/verifycertdialog.cpp:245 -msgid "Business category:" -msgstr "Forretningskategori:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 -msgid "" -"By default uses any available local port to establish transfers in active " -"mode. If you want to limit FileZilla to use only a small range of ports, " -"please enter the port range below." -msgstr "" -"Som standard anvendes alle ledige lokale porte til at overførsler i aktiv " -"tilstand. Hvis du ønsker at begrænse FileZilla til kun at bruge et lille " -"interval af porte, kan du angive det pågældende interval nedenfor." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 -msgid "C&ancel current operation" -msgstr "A&nnuller aktuel handling" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 -msgid "C&lear all" -msgstr "F&jern alle" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 -msgid "C&opy URL(s) to clipboard" -msgstr "Kopiér &URL til Udklipsholder" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 -msgid "C&ustom" -msgstr "&Brugerdefineret" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 -msgid "C&ustom filetype associations:" -msgstr "Br&ugerdefinerede filtypeassociationer:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 -msgid "CPU features:" -msgstr "CPU-funktioner:" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 -msgid "Calculating timezone offset of server..." -msgstr "Beregner serverens tidszoneforskydning..." - -#: ../../locales/../src/engine/transfersocket.cpp:670 -msgid "Can't read from file" -msgstr "Kan ikke læse fra fil" - -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 -msgid "Can't write data to file." -msgstr "Kan ikke skrive data til fil." - -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 -#, c-format -msgid "Can't write data to file: %s" -msgstr "Kan ikke skrive data til filen: %s" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 -msgid "Cancel" -msgstr "Annullér" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 -msgid "Cancel current operation" -msgstr "Annuller aktuel handling" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 -msgid "Cancels the current operation" -msgstr "Annuller aktuel handling" - -#: ../../locales/../src/engine/local_path.cpp:454 -#, c-format -msgid "Cannot access '%s', no media inserted or drive not ready." -msgstr "Kan ikke tilgå '%s', intet medie eller drevet er ikke klar." - -#: ../../locales/../src/interface/Mainfrm.cpp:561 -msgid "Cannot add server to Site Manager" -msgstr "Kan ikke tilføje server i Websted Manager" - -#: ../../locales/../src/engine/socket.cpp:1098 -msgid "Cannot assign requested address" -msgstr "Kan ikke tildele den angivne adresse" - -#: ../../locales/../src/interface/context_control.cpp:352 -msgid "" -"Cannot close tab while busy.\n" -"Cancel current operation and close tab?" -msgstr "" -"Kan ikke lukke fane når optaget.\n" -"Annullér aktuel handling, og luk fane?" - -#: ../../locales/../src/interface/listingcomparison.cpp:71 -msgid "" -"Cannot compare directories, different filters for local and remote " -"directories are enabled" -msgstr "" -"Kan ikke sammenligne mapper - forskellige filtre for lokale og fjerne mapper " -"er slået til" - -#: ../../locales/../src/interface/filteredit.cpp:143 -msgid "Cannot create new filter" -msgstr "Kan ikke oprette nyt filter" - -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 -msgid "Cannot edit file" -msgstr "Kan ikke redigere fil" - -#: ../../locales/../src/interface/LocalListView.cpp:1587 -msgid "Cannot edit file, not connected to any server." -msgstr "Kan ikke redigere mapper, ikke forbundet til en server." - -#: ../../locales/../src/interface/LocalListView.cpp:1596 -msgid "Cannot edit file, remote path unknown." -msgstr "Kan ikke redigere fil - sti på fjernsted ukendt." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 -msgid "" -"Cannot establish FTP connection to an SFTP server. Please select proper " -"protocol." -msgstr "" -"Kan ikke etablere FTP-forbindelse til en SFTP server. Vælg venligst den " -"korrekte protokol." - -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Kan ikke indlæse Lyntilslut-bjælken fra ressourcefilen" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 -msgid "Cannot load key file" -msgstr "Kan ikke indlæse nøglefil" - -#: ../../locales/../src/interface/Mainfrm.cpp:994 -msgid "Cannot load toolbar from resource file" -msgstr "Kan ikke indlæse værktøjsbjælke fra ressourcefilen" - -#: ../../locales/../src/interface/manual_transfer.cpp:445 -msgid "Cannot remember password" -msgstr "Har glemt adgangskode" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 -msgid "Cannot rename entry" -msgstr "Kan ikke omdøbe enhed" - -#: ../../locales/../src/interface/RemoteListView.cpp:1582 -msgid "Cannot rename file" -msgstr "Kan ikke omdøbe fil" - -#: ../../locales/../src/engine/proxy.cpp:172 -msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." -msgstr "" -"Kan ikke omdanne værtsnavn til IPv4-adresse, så den kan bruges med SOCKS4-" -"proxy." - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 -msgid "Cannot save filterset" -msgstr "Kan ikke gemme filtersæt" - -#: ../../locales/../src/interface/filter.cpp:304 -msgid "Cannot select filter" -msgstr "Kan ikke vælge filter" - -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 -msgid "Cannot set file association" -msgstr "Kan ikke sætte filtypeassociation" - -#: ../../locales/../src/interface/edithandler.cpp:1073 -msgid "Cannot show dialog" -msgstr "Kan ikke vise dialog" - -#: ../../locales/../src/interface/edithandler.cpp:1644 -msgid "Cannot view/edit selected file" -msgstr "Kan ikke vise/redigere den valgte fil" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 -msgid "Case insensitive" -msgstr "Skeln ikke mellem store og små bogstaver" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 -msgid "Case insensitive (default)" -msgstr "Skeln ikke mellem store og små bogstaver (standard)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 -msgid "Case sensitive" -msgstr "Skeln mellem store og små bogstaver" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 -msgid "Case sensitive (default)" -msgstr "Skeln mellem store og små bogstaver (standard)" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 -msgid "Categories to clear" -msgstr "Kategorier der skal fjernes" - -#: ../../locales/../src/interface/statusbar.cpp:502 -msgid "Certificate and session data are not available yet." -msgstr "Certifikat og sessionsdata er ikke til rådighed endnu." - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 -msgid "Certificate in chain:" -msgstr "Certifikat i kæde:" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 -msgid "Certificate issuer" -msgstr "Certifikat-udsteder" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 -msgid "Challenge:" -msgstr "Udfordr:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 -msgid "Change file attributes" -msgstr "Rediger fil-attributter" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 -msgid "Change the file permissions." -msgstr "Rediger filtilladelser." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 -msgid "Changing logfile settings requires restart of FileZilla." -msgstr "Ændringer i logfil-indstillinger kræver genstart af FileZilla." - -#: ../../locales/../src/interface/FileZilla.cpp:596 -msgid "Character encoding issue" -msgstr "Problem med tegnindkodning" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 -msgid "Charset" -msgstr "Tegnsæt" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 -msgid "Check for &updates..." -msgstr "&Søg efter opdateringer..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 -msgid "Check for FileZilla &updates automatically:" -msgstr "Søg automatisk efter &opdateringer til FileZilla:" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:4 -msgid "Check for Updates" -msgstr "Søg efter opdateringer" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 -msgid "Check for newer versions of FileZilla" -msgstr "Søg efter nyere versioner af FileZilla" - -#: ../../locales/../src/interface/update_dialog.cpp:57 -msgid "Check for updates failed" -msgstr "Søgning efter opdateringer fejlede" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 -msgid "" -"Check your login credentials. The entered password starts or ends with a " -"space character." -msgstr "" -"Kontroller dine login-oplysninger. Den angivne adgangskode begynder eller " -"slutter med et mellemrum." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 -msgid "" -"Check your login credentials. The entered username starts or ends with a " -"space character." -msgstr "" -"Kontroller dine login-oplysninger. Det angivne brugernavn begynder eller " -"slutter med et mellemrum." - -#: ../../locales/../src/interface/netconfwizard.cpp:761 -msgid "Checking for correct external IP address" -msgstr "Kontrollerer korrekt ekstern IP-adresse" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 -msgid "Checking for updates..." -msgstr "Søger efter opdateringer..." - -#: ../../locales/../src/interface/updater.cpp:716 -#, c-format -msgid "Checksum match on file %s\n" -msgstr "Checksum passer for filen %s\n" - -#: ../../locales/../src/interface/updater.cpp:712 -#, c-format -msgid "Checksum mismatch on file %s\n" -msgstr "Checksum passer ikke for filen %s\n" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 -msgid "Choose a key file" -msgstr "Vælg nøglefil" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 -msgid "Choose the default local directory" -msgstr "Vælg lokal standardmappe" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 -msgid "Choose the local directory" -msgstr "Vælg den lokale mappe" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -msgid "Chunk data improperly terminated" -msgstr "Data-chunk ikke afsluttet korrekt" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 -msgid "Cipher:" -msgstr "Kode:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 -msgid "Cl&ose tab" -msgstr "&Luk fane" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 -msgid "Classic" -msgstr "Klassisk" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 -msgid "Clear &layout cache" -msgstr "Ryd &layout-cache" - -#: ../../locales/../src/interface/quickconnectbar.cpp:150 -msgid "Clear history" -msgstr "Tøm historik" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 -msgid "Clear private data" -msgstr "Tøm private data" - -#: ../../locales/../src/interface/quickconnectbar.cpp:149 -msgid "Clear quickconnect bar" -msgstr "Fjern Lyntilslut-bjælken" - -#: ../../locales/../src/interface/netconfwizard.cpp:580 -msgid "Click on Finish to save your configuration." -msgstr "Klik på Udfør for at gemme konfigurationen." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 -msgid "Client to server MAC:" -msgstr "Klient til server-MAC:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 -msgid "Client to server cipher:" -msgstr "Klient-til-server-kode:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 -msgid "Close &all other tabs" -msgstr "Luk alle &andre faner" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 -msgid "Close FileZilla" -msgstr "Afslut FileZilla" - -#: ../../locales/../src/interface/cmdline.cpp:15 -msgid "Close all running instances of FileZilla" -msgstr "Luk alle åbne instanser af FileZilla" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 -msgid "Closes current tab" -msgstr "Lukker den aktuelle fane" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 -msgid "Co&mments:" -msgstr "Kommenta&rer:" - -#: ../../locales/../src/interface/listctrlex.cpp:756 -msgid "Column properties" -msgstr "Kolonneegenskaber" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 -msgid "Column setup" -msgstr "Kolonneopsætning" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 -msgid "Command and its arguments should be properly quoted." -msgstr "Kommandoen og dens parametre skal sættes korrekt i anførselstegn." - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 -msgid "Command failed" -msgstr "Kommando fejlede" - -#: ../../locales/../src/engine/proxy.cpp:525 -msgid "Command not supported" -msgstr "Kommando ikke understøttet" - -#: ../../locales/../src/engine/engineprivate.cpp:212 -msgid "Command not supported by this protocol" -msgstr "Kommandoen understøttes ikke af denne protokol" - -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 -msgid "Command:" -msgstr "Kommando:" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 -msgid "Comment" -msgstr "Kommentar" - -#: ../../locales/../src/interface/verifycertdialog.cpp:243 -msgid "Common name:" -msgstr "Kommando navn:" - -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 -msgid "Communication tainted by router or firewall" -msgstr "Kommunikationen forstyrret af router eller firewall" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 -msgid "Compare &modification time" -msgstr "Sammenlign &ændringstidspunkt" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 -msgid "Compare file&size" -msgstr "Sammenlign &filstørrelse" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 -msgid "Comparison &threshold (in minutes):" -msgstr "Sammenlignings&grænse (minutter)" - -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 -msgid "Comparison threshold needs to be between 0 and 1440 minutes." -msgstr "Sammenligningsgrænsen skal være mellem 0 og 1440 minutter." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 -msgid "Compiled for:" -msgstr "Kompileret til:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 -msgid "Compiled on:" -msgstr "Kompileret på:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 -msgid "Compiled with:" -msgstr "Kompileret med:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 -msgid "Compiler flags:" -msgstr "Compiler-flag:" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 -msgid "Compressed" -msgstr "Komprimeret" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 -msgid "Concurrent transfers" -msgstr "Samtidige overførsler" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 -msgid "Conditions are c&ase sensitive" -msgstr "Betingelser skelner mellem s&tore og små bogstaver" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 -msgid "Configuration test" -msgstr "Konfigurationstest" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:115 -msgid "Configure passive mode" -msgstr "Konfigurer passiv tilstand" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 -msgid "Configure port range" -msgstr "Konfigurer portinterval" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 -msgid "Configuring FileZilla and your network" -msgstr "Konfigurering af FileZilla og dit netværk" - -#: ../../locales/../src/interface/search.cpp:747 -msgid "Confirm deletion" -msgstr "Bekræft sletning" - -#: ../../locales/../src/interface/edithandler.cpp:1586 -#: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 -msgid "Confirmation needed" -msgstr "Foretag et valg" - -#: ../../locales/../src/interface/netconfwizard.cpp:576 -msgid "Congratulations, your configuration seems to be working." -msgstr "Tillykke - din konfiguration ser ud til at fungere." - -#: ../../locales/../src/interface/quickconnectbar.cpp:148 -msgid "Connect bypassing proxy settings" -msgstr "Opret forbindelse ved at forbigå proxy-indstillinger" - -#: ../../locales/../src/interface/netconfwizard.cpp:216 -#, c-format -msgid "Connect failed: %s" -msgstr "Forbindelsesforsøg fejlede: %s" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 -msgid "Connect in current tab" -msgstr "Forbind i aktuel fane" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 -msgid "Connect in new tab" -msgstr "Forbind i ny fane" - -#: ../../locales/../src/interface/cmdline.cpp:8 -msgid "Connect to specified Site Manager site" -msgstr "Forbind til angivne Websted Manager-sted" - -#: ../../locales/../src/interface/queue.cpp:332 -msgid "Connecting" -msgstr "Tilslutter" - -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 -#, c-format -msgid "Connecting to %s" -msgstr "Tilslutter til %s" - -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 -#, c-format -msgid "Connecting to %s through %s proxy" -msgstr "Tilslutter til %s gennem %s proxy" - -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 -#, c-format -msgid "Connecting to %s..." -msgstr "Tilslutter til %s..." - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 -msgid "Connection" -msgstr "Forbindelse" - -#: ../../locales/../src/engine/socket.cpp:1059 -msgid "Connection aborted" -msgstr "Forbindelse lukket ned" - -#: ../../locales/../src/interface/queue.cpp:333 -msgid "Connection attempt failed" -msgstr "Forbindelsesforsøg mislykkedes" - -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 -#, c-format -msgid "Connection attempt failed with \"%s\", trying next address." -msgstr "Forbindelsesforsøg mislykkedes med \"%s\", forsøger næste adresse." - -#: ../../locales/../src/engine/ControlSocket.cpp:928 -#, c-format -msgid "Connection attempt failed with \"%s\"." -msgstr "Forbindelsesforsøg mislykkedes med \"%s\"." - -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 -msgid "Connection attempt interrupted by user" -msgstr "Forbindelsesforsøg afbrudt af bruger" - -#: ../../locales/../src/engine/socket.cpp:1052 -msgid "Connection attempt timed out" -msgstr "Forsøg på forbindelse afsluttet ved timeout" - -#: ../../locales/../src/interface/netconfwizard.cpp:552 -msgid "Connection closed" -msgstr "Forbindelse lukket" - -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 -msgid "Connection closed by server" -msgstr "Forbindelse lukket af server" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 -msgid "Connection established, initializing TLS..." -msgstr "Forbindelse etableret, initialiserer TLS..." - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 -msgid "Connection established, sending HTTP request" -msgstr "Forbindelse etableret, sender HTTP-anmodning" - -#: ../../locales/../src/interface/netconfwizard.cpp:333 -msgid "Connection established, waiting for welcome message." -msgstr "Forbindelse etableret, venter på velkomstbesked." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 -msgid "Connection established, waiting for welcome message..." -msgstr "Forbindelse etableret, venter på velkomstbesked..." - -#: ../../locales/../src/interface/netconfwizard.cpp:350 -msgid "Connection lost" -msgstr "Forbindelse mistet" - -#: ../../locales/../src/engine/proxy.cpp:510 -msgid "Connection not allowed by ruleset" -msgstr "Forbindelse ikke tilladt af regelsæt" - -#: ../../locales/../src/engine/proxy.cpp:519 -msgid "Connection refused" -msgstr "Forbindelse nægtet" - -#: ../../locales/../src/engine/socket.cpp:1046 -msgid "Connection refused by server" -msgstr "Forbindelse nægtet af server" - -#: ../../locales/../src/engine/socket.cpp:1055 -msgid "Connection reset by network" -msgstr "Forbindelse nulstillet af netværk" - -#: ../../locales/../src/engine/socket.cpp:1060 -msgid "Connection reset by peer" -msgstr "Forbindelse nulstillet af peer" - -#: ../../locales/../src/engine/ControlSocket.cpp:560 -#, c-format -msgid "Connection timed out after %d second of inactivity" -msgid_plural "Connection timed out after %d seconds of inactivity" -msgstr[0] "Forbindelse timet ud efter %d sekunds mangel på aktivitet" -msgstr[1] "Forbindelse timet ud efter %d sekunders mangel på aktivitet" - -#: ../../locales/../src/interface/netconfwizard.cpp:1054 -msgid "Connection timed out." -msgstr "Forbindelse mistet ved timeout." - -#: ../../locales/../src/interface/search.cpp:386 -msgid "Connection to server lost." -msgstr "Forbindelse til server tabt." - -#: ../../locales/../src/engine/proxy.cpp:249 -msgid "Connection with proxy established, performing handshake..." -msgstr "Forbindelse med proxy etableret, udfører handshake..." - -#: ../../locales/../src/interface/netconfwizard.cpp:570 -msgid "Connection with server got closed prematurely." -msgstr "Forbindelsen med serveren blev lukket for tidligt." - -#: ../../locales/../src/interface/netconfwizard.cpp:561 -msgid "Connection with the test server failed." -msgstr "Forbindelse til testserveren fejlede." - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 -msgid "Convert key file" -msgstr "Konvertér nøglefil" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 -#, c-format -msgid "Copy (%d) of %s" -msgstr "Kopiér (%d) af %s" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 -#, c-format -msgid "Copy of %s" -msgstr "Kopi af %s" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 -msgid "Copy the URLs of the selected items to clipboard." -msgstr "Kopiér URL til de valgte emner til Udklipsholder." - -#: ../../locales/../src/engine/transfersocket.cpp:180 -#, c-format -msgid "Could not accept connection: %s" -msgstr "Kunne ikke acceptere forbindelse: %s" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -msgid "Could not add connection to Site Manager" -msgstr "Kunne ikke tilføje forbindelsen i Websted Manager" - -#: ../../locales/../src/interface/state.cpp:750 -msgid "Could not complete operation" -msgstr "Kunne ikke færdiggøre handling" - -#: ../../locales/../src/engine/ControlSocket.cpp:187 -msgid "Could not connect to server" -msgstr "Kunne ikke forbinde til server" - -#: ../../locales/../src/engine/ControlSocket.cpp:1089 -#, c-format -msgid "Could not connect to server: %s" -msgstr "Kunne ikke forbinde til server: %s" - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 -msgid "Could not convert command to server encoding" -msgstr "Kunne ikke konvertere kommando til serveres indkodning" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 -msgid "Could not convert private key" -msgstr "Kunne ikke konvertere privatnøgle" - -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 -msgid "Could not copy URLs" -msgstr "Kunne ikke kopiere URL" - -#: ../../locales/../src/interface/aboutdialog.cpp:198 -msgid "Could not copy data" -msgstr "Kunne ikke kopiere data" - -#: ../../locales/../src/interface/updater.cpp:459 -#, c-format -msgid "Could not create local file %s\n" -msgstr "Kunne ikke oprette lokal fil %s\n" - -#: ../../locales/../src/engine/logging.cpp:173 -#, c-format -msgid "Could not create logging mutex: %s" -msgstr "Kunne ikke oprette log-mutex %s" - -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 -msgid "" -"Could not determine the target of the Drag&Drop operation.\n" -"Either the shell extension is not installed properly or you didn't drop the " -"files into an Explorer window." -msgstr "" -"Kunne ikke bestemme destinationen for Træk&Slip kommandoen.\n" -"Enten er shell-udvidelsen ikke installeret korrekt, eller slap du ikke " -"filerne i et Stifinder-vindue." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 -msgid "Could not establish connection to server" -msgstr "Kunne ikke etablere forbindelse til server" - -#: ../../locales/../src/interface/FileZilla.cpp:428 -msgid "" -"Could not find the resource files for FileZilla, closing FileZilla.\n" -"You can set the data directory of FileZilla using the '--datadir " -"' commandline option or by setting the FZ_DATADIR environment " -"variable." -msgstr "" -"Kunne ikke finde ressourcefilerne til FileZilla - afslutter FileZilla.\n" -"Du kan angive datamappe for FileZilla ved at bruge kommandolinieparameteren " -"'--datadir ' eller ved at sætte miljøvariablen FZ_DATADIR." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 -msgid "Could not generate custom login sequence." -msgstr "Kunne ikke generere en brugerdefineret login-sekvens." - -#: ../../locales/../src/engine/tlssocket.cpp:958 -msgid "" -"Could not get distinguished name of certificate issuer, " -"gnutls_x509_get_issuer_dn failed" -msgstr "" -"Kunne ikke få DN (Distinguished Name) på certifikat-udstederen - " -"gnutls_x509_get_issuer_dn fejlede" - -#: ../../locales/../src/engine/tlssocket.cpp:935 -msgid "" -"Could not get distinguished name of certificate subject, gnutls_x509_get_dn " -"failed" -msgstr "" -"Kunne ikke få DN (Distinguished Name) på certifikat-emnet - " -"gnutls_x509_get_dn fejlede" - -#: ../../locales/../src/interface/state.cpp:923 -msgid "Could not get full remote path." -msgstr "Kunne ikke hente den fulde fjernsti." - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 -msgid "Could not get reply from fzputtygen." -msgstr "Kunne ikke få svar fra fzputtygen." - -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 -msgid "Could not get temporary directory to download file into." -msgstr "Kunne ikke etablere midlertidig mappe at downloade filen til." - -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Kunne ikke importere peer-certifikater - gnutls_x509_crt_import fejlede" - -#: ../../locales/../src/interface/FileZilla.cpp:108 -#, c-format -msgid "Could not initialize Winsock (%d): %s" -msgstr "Kunne ikke initialisere Winsock (%d): %s" - -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Kunne ikke initialisere struktur for peer-certifikater - " -"gnutls_x509_crt_init fejlede" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 -#, c-format -msgid "" -"Could not load \"%s\", please make sure the file is valid and can be " -"accessed.\n" -"Any changes made in the Site Manager will not be saved." -msgstr "" -"Kunne ikke indlæse \"%s\" - sørg for at filen er gyldig og at der er adgang " -"til den.\n" -"Eventuelle ændringer i Websted Manager vil ikke blive bevaret." - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 -msgid "Could not load key file" -msgstr "Kunne ikke indlæse nøglefil" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 -msgid "Could not load private key" -msgstr "Kunne ikke indlæse privatnøgle" - -#: ../../locales/../src/interface/state.cpp:945 -#, c-format -msgid "" -"Could not obtain corresponding local directory for the remote directory " -"'%s'.\n" -"Disable synchronized browsing and continue changing the remote directory?" -msgstr "" -"Kunne ikke finde den lokale mappe, der svarer til mappen på fjernstedet " -"'%s'.\n" -"Vil du slå synkroniseret bladring fra, og fortsætte med at ændre mappe på " -"fjernstedet?" - -#: ../../locales/../src/interface/state.cpp:362 -#, c-format -msgid "" -"Could not obtain corresponding local directory for the remote directory " -"'%s'.\n" -"Synchronized browsing has been disabled." -msgstr "" -"Kunne ikke finde en tilsvarende lokal mappe for fjernmappen '%s'.\n" -"Synkroniseret bladring er slået fra." - -#: ../../locales/../src/interface/state.cpp:267 -#, c-format -msgid "" -"Could not obtain corresponding remote directory for the local directory " -"'%s'.\n" -"Synchronized browsing has been disabled." -msgstr "" -"Kunne ikke finde tilsvarende fjernmappe for den lokale mappe '%s'.\n" -"Synkroniseret bladring er slået fra." - -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 -msgid "Could not open clipboard" -msgstr "Kunne ikke åbne Udklipsholder" - -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 -#, c-format -msgid "Could not open log file: %s" -msgstr "Kunne ikke åbne logfil: %s" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -msgid "Could not parse remote path." -msgstr "Kunne ikke fortolke fjernstien." - -#: ../../locales/../src/interface/quickconnectbar.cpp:82 -msgid "Could not parse server address:" -msgstr "Kunne ikke fortolke serveradressen:" - -#: ../../locales/../src/interface/netconfwizard.cpp:977 -msgid "Could not read from data socket." -msgstr "Kunne ikke læse fra data-socket." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 -#, c-format -msgid "Could not read from socket: %s" -msgstr "Kunne ikke læse fra socket: %s" - -#: ../../locales/../src/interface/sitemanager.cpp:468 -msgid "Could not read server item." -msgstr "Kunne ikke læse fra server." - -#: ../../locales/../src/interface/netconfwizard.cpp:344 -msgid "Could not receive data from server." -msgstr "Kunne ikke hente data fra server." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Kunne ikke søge til forskydning %s i filen" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 -msgid "Could not seek to the end of the file" -msgstr "Kunne ikke søge til slutningen af filen (end of file)" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -msgid "Could not send command to fzputtygen." -msgstr "Kunne ikke sende kommando til fzputtygen." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 -msgid "Could not spawn IO thread" -msgstr "Kunne ikke danne IO-tråd" - -#: ../../locales/../src/engine/ControlSocket.cpp:1065 -#, c-format -msgid "Could not start proxy handshake: %s" -msgstr "Kunne ikke starte proxy-handshake: %s" - -#: ../../locales/../src/interface/queue.cpp:338 -msgid "Could not start transfer" -msgstr "Kunne ikke starte overførsel" - -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 -#, c-format -msgid "" -"Could not write \"%s\", any changes to the Site Manager could not be saved: " -"%s" -msgstr "" -"Kunne ikke skrive \"%s\" - eventuelle ændringer i Websted Manager kunne ikke " -"bevares: %s" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 -#, c-format -msgid "Could not write \"%s\", the bookmark could not be added: %s" -msgstr "Kunne ikke skrive \"%s\" - bogmærket kunne ikke tilføjes: %s" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 -#, c-format -msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" -msgstr "Kunne ikke skrive \"%s\" - de globale bogmærker kunne ikke gemmes: %s" - -#: ../../locales/../src/interface/QueueView.cpp:1841 -#, c-format -msgid "" -"Could not write \"%s\", the queue could not be saved.\n" -"%s" -msgstr "" -"Kunne ikke skrive \"%s\" - køen kunne ikke gemmes.\n" -"%s" - -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 -#, c-format -msgid "Could not write \"%s\", the selected sites could not be exported: %s" -msgstr "Kunne ikke skrive \"%s\" - de valgte steder kunne ikke eksporteres: %s" - -#: ../../locales/../src/interface/xmlfunctions.cpp:146 -#, c-format -msgid "Could not write \"%s\":" -msgstr "Kunne ikke skrive \"%s\":" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 -#, c-format -msgid "Could not write key file: %s" -msgstr "Kunne ikke skrive nøglefil: %s" - -#: ../../locales/../src/interface/queue.cpp:337 -msgid "Could not write to local file" -msgstr "Kunne ikke skrive til lokal fil" - -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 -#, c-format -msgid "Could not write to log file: %s" -msgstr "Kunne ikke skrive til logfil: %s" - -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 -#, c-format -msgid "Could not write to socket: %s" -msgstr "Kunne ikke skrive til socket: %s" - -#: ../../locales/../src/interface/verifycertdialog.cpp:248 -msgid "Country:" -msgstr "Land:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 -msgid "Crea&te new file" -msgstr "Opret &ny fil" - -#: ../../locales/../src/interface/state.cpp:959 -msgid "Create &missing local directory and enter it" -msgstr "&Opret manglende lokal mappe, og skift til den" - -#: ../../locales/../src/interface/state.cpp:886 -msgid "Create &missing remote directory and enter it" -msgstr "&Opret manglende fjernmappe, og skift til den" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 -msgid "Create a new subdirectory in the current directory" -msgstr "Opret ny undermappe i den aktuelle mappe" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 -msgid "Create a new subdirectory in the current directory and change into it" -msgstr "Opret ny undermappe i den aktuelle mappe, og skift ned i den" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 -msgid "Create a new, empty file in the current directory" -msgstr "Opret ny, tom fil i den aktuelle mappe" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 -msgid "Create director&y and enter it" -msgstr "Opret &mappe og skift til den" - -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 -msgid "Create directory" -msgstr "Opret mappe" - -#: ../../locales/../src/interface/RemoteListView.cpp:2609 -msgid "Create empty file" -msgstr "Opret tom fil" - -#: ../../locales/../src/interface/queue.cpp:340 -msgid "Creating directory" -msgstr "Opretter mappe" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 -#, c-format -msgid "Creating directory '%s'..." -msgstr "Opretter mappe '%s'..." - -#: ../../locales/../src/engine/ControlSocket.cpp:180 -msgid "Critical error" -msgstr "Kritisk fejl" - -#: ../../locales/../src/engine/ControlSocket.cpp:171 -msgid "Critical error:" -msgstr "Kritisk fejl:" - -#: ../../locales/../src/engine/ControlSocket.cpp:135 -msgid "Critical file transfer error" -msgstr "Kritisk fejl i filoverførsel" - -#: ../../locales/../src/engine/ControlSocket.cpp:120 -#, c-format -msgid "Critical file transfer error after transferring %s in %s" -msgstr "Kritisk fejl i filoverførsel efter overførsel af %s på %s" - -#: ../../locales/../src/interface/state.cpp:353 -#, c-format -msgid "" -"Current remote directory (%s) is not below the synchronization root (%s).\n" -"Synchronized browsing has been disabled." -msgstr "" -"Den aktuelle fjernmappe (%s) er ikke under sykroniseringsroden (%s).\n" -"Synkroniseret bladring er slået fra." - -#: ../../locales/../src/interface/statusbar.cpp:393 -msgid "Current transfer type is set to ASCII." -msgstr "Aktuel overførselstype er sat til ASCII." - -#: ../../locales/../src/interface/statusbar.cpp:401 -msgid "Current transfer type is set to automatic detection." -msgstr "Aktuel overførselstype er sat til automatisk." - -#: ../../locales/../src/interface/statusbar.cpp:397 -msgid "Current transfer type is set to binary." -msgstr "Den aktuelle overførselstype er sat til binær." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 -msgid "Curve:" -msgstr "Kurve:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 -msgid "Cus&tom" -msgstr "Bruger&defineret" - -#: ../../locales/../src/interface/filter.cpp:101 -msgid "Custom filter set" -msgstr "Brugerdefineret filtersæt" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 -msgid "Custom server" -msgstr "Brugerdefineret server" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 -msgid "D&ata type" -msgstr "D&atatype" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 -msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" -msgstr "De&cimalt præfiks med SI-symboler (f.eks. 1 KB = 1000 byte)" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 -msgid "D&efault" -msgstr "Standa&rd" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 -msgid "D&elete" -msgstr "S&let" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 -msgid "D&irectory comparison" -msgstr "M&appesammenligning" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 -msgid "D&isable all" -msgstr "Slå &alle fra" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 -msgid "D&o not save passwords" -msgstr "Gem ikke &adgangskode" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 -msgid "D&ouble-click action on directories:" -msgstr "Handling ved d&obbeltklik på mapper:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 -msgid "D&uplicate" -msgstr "Lav &kopi" - -#: ../../locales/../src/engine/server.cpp:34 -msgid "DOS-like with virtual paths" -msgstr "DOS-agtig med virtuelle stier" - -#: ../../locales/../src/interface/edithandler.cpp:1626 -msgid "Dangerous filetype" -msgstr "Farlig filtype" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 -msgid "Data" -msgstr "Data" - -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 -msgid "Data socket closed too early." -msgstr "Data-socket lukket for tidligt." - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 -msgid "Date" -msgstr "Dato" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 -msgid "Date formatting" -msgstr "Datoformatering" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 -msgid "Date/time format" -msgstr "Dato-/klokkeslæt-format" - -#: ../../locales/../src/interface/fileexistsdlg.cpp:49 -msgid "Date/time unknown" -msgstr "Dato/klokkeslæt ukendt" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 -msgid "Debug" -msgstr "Debug" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 -msgid "Debugging settings" -msgstr "Indstillinger for debug" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 -msgid "Default &local directory:" -msgstr "Standard-&lokalmappe:" - -#: ../../locales/../src/engine/server.cpp:26 -msgid "Default (Autodetect)" -msgstr "Standard (Autodetekter)" - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 -msgid "Default editor not properly quoted." -msgstr "Standard-editor ikke korrekt sat i anførselstegn." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 -msgid "Default file exists action" -msgstr "Standardhandling for fil findes" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 -msgid "Default r&emote directory:" -msgstr "Standard-&fjernmappe:" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -msgid "" -"Default remote path cannot be parsed. Make sure it is a valid absolute path " -"for the selected server type." -msgstr "" -"Standard-fjernstien kunne ikke fortolkes. Sørg for, at det er en gyldig, " -"absolut sti for den valgte servertype." - -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 -msgid "Default system language" -msgstr "Standard-systemsprog" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 -msgid "Default transfer mode:" -msgstr "Standard-overførselstype:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 -msgid "Default transfer type:" -msgstr "Standard-overførselstype:" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 -msgid "Default: http://ip.filezilla-project.org/ip.php" -msgstr "Standard: http://ip.filezilla-project.org/ip.php" - -#: ../../locales/../src/interface/settings/optionspage_connection.cpp:41 -msgid "" -"Delay between failed connection attempts has to be between 1 and 999 seconds." -msgstr "" -"Pause mellem mislykkedes forbindelses-forsøg skal være mellem 1 og 999 " -"sekunder." - -#: ../../locales/../src/engine/engineprivate.cpp:522 -#, c-format -msgid "" -"Delaying connection for %d second due to previously failed connection " -"attempt..." -msgid_plural "" -"Delaying connection for %d seconds due to previously failed connection " -"attempt..." -msgstr[0] "" -"Udsætter forbindelse i %d sekund på grund af tidligere mislykkedes " -"forbindelses-forsøg..." -msgstr[1] "" -"Udsætter forbindelse i %d sekunder på grund af tidligere mislykkedes " -"forbindelses-forsøg..." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 -msgid "Delete Site Manager entry" -msgstr "Slet indgang i Websted Manager" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 -msgid "Delete selected directory" -msgstr "Slet valgte mappe" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 -msgid "Delete selected files and directories" -msgstr "Slet valgte filer og mapper" - -#: ../../locales/../src/engine/engineprivate.cpp:365 -#, c-format -msgid "Deleting \"%s\"" -msgstr "Sletter \"%s\"" - -#: ../../locales/../src/engine/engineprivate.cpp:368 -#, c-format -msgid "Deleting %u files from \"%s\"" -msgstr "Sletter %u filer fra \"%s\"" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 -msgid "Deleting symbolic link" -msgstr "Sletter symbolsk link" - -#: ../../locales/../src/interface/LocalTreeView.cpp:955 -msgid "Desktop" -msgstr "Skrivebord" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 -msgid "Details" -msgstr "Detaljer" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 -msgid "Details for new key:" -msgstr "Detaljer for ny nøgle:" - -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 -msgid "Detected newer version of FileZilla" -msgstr "Nyere version af FileZilla fundet" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 -msgid "Dire&ctories" -msgstr "Ma&pper" - -#: ../../locales/../src/interface/queue.cpp:1210 -msgid "Direction" -msgstr "Retning" - -#: ../../locales/../src/interface/filelistctrl.cpp:271 -msgid "Directory" -msgstr "Mappe" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 -msgid "Directory comparison" -msgstr "Mappesammenligning" - -#: ../../locales/../src/interface/listingcomparison.cpp:71 -msgid "Directory comparison failed" -msgstr "Mappesammenligning fejlede" - -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:71 -msgid "Directory containing the logfile does not exist or filename is invalid." -msgstr "Mappe til logfilen findes ikke, eller filnavnet er ugyldigt." - -#: ../../locales/../src/engine/ControlSocket.cpp:191 -msgid "Directory listing aborted by user" -msgstr "Mappevisning afbrudt af bruger" - -#: ../../locales/../src/interface/RemoteListView.cpp:2013 -msgid "Directory listing failed" -msgstr "Visning af mappeindhold fejlede" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 -msgid "Directory listing filters" -msgstr "Mappefiltre" - -#: ../../locales/../src/engine/ControlSocket.cpp:199 -#, c-format -msgid "Directory listing of \"%s\" successful" -msgstr "Visning af mappeindhold af \"%s\" lykkedes" - -#: ../../locales/../src/engine/ControlSocket.cpp:196 -msgid "Directory listing successful" -msgstr "Mappeindhold vist" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 -msgid "Disa&ble all" -msgstr "S&lå alle fra" - -#: ../../locales/../src/interface/state.cpp:952 -msgid "" -"Disable synchronized browsing and continue changing the remote directory?" -msgstr "Slå synkroniseret bladring fra, og fortsæt med at skifte fjernmappe?" - -#: ../../locales/../src/interface/Mainfrm.cpp:650 -msgid "" -"Disable this option again if you will not be able to see the correct " -"directory contents anymore." -msgstr "" -"Slå denne funktion fra igen, hvis du ikke længere vil se det korrekte " -"mappeindhold." - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 -msgid "Disconnect from server" -msgstr "Afbryd forbindelse til server" - -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 -msgid "Disconnected from server" -msgstr "Forbindelse til server afbrudt" - -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 -#, c-format -msgid "Disconnected from server: %s" -msgstr "Forbindelse til server afbrudt: %s" - -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 -msgid "Disconnecting from previous server" -msgstr "Afbryder forbindelsen til forrige server" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 -msgid "Disconnects from the currently visible server" -msgstr "Afbryder forbindelsen til aktuelt synlige server" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 -msgid "Display about dialog" -msgstr "Vis Om-dialogen" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 -msgid "Do ¬ use default editor" -msgstr "Brug &ikke standard-editor" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Gør &intet" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 -msgid "Do the same with &all selected files already being edited" -msgstr "" -"Gør det samme med &alle de markerede filer, der allerede er under redigering" - -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 -msgid "Do you really want to close FileZilla?" -msgstr "Vil du virkelig lukke FileZilla?" - -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -msgid "" -"Do you really want to delete all Site Manager entries and the transfer queue?" -msgstr "" -"Vil du virkelig slette hele listen i Websted Manager og overførselskøen?" - -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -msgid "Do you really want to delete all Site Manager entries?" -msgstr "Vil du virkelig slette hele listen i Websted Manager?" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 -msgid "Do you really want to delete selected entry?" -msgstr "Vil du virkelig slette det valgte objekt?" - -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -msgid "Do you really want to delete the transfer queue?" -msgstr "Vil du virkelig slette overførselskøen" - -#: ../../locales/../src/interface/Mainfrm.cpp:589 -#, c-format -msgid "Do you really want to send '%s' to the server?" -msgstr "Vil du virkelig sende '%s' til serveren?" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 -msgid "Do you want to reopen this file?" -msgstr "Ønsker du at genåbne denne fil?" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 -msgid "Documentation" -msgstr "Dokumentation" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:250 -msgid "Don't use external IP address on &local connections." -msgstr "Brug ikke eksterne IP-adresser til &lokale forbindelser." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 -msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" -msgstr "" -"Dot-filer er filer med navne, der begynder med punktum, f.eks. .htaccess" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 -msgid "Double-click action" -msgstr "Handling ved dobbeltklik" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 -msgid "Download" -msgstr "Download" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 -msgid "Download &limit:" -msgstr "&Download-grænse" - -#: ../../locales/../src/interface/statusbar.cpp:581 -#, c-format -msgid "Download limit: %s/s" -msgstr "Download-grænse: %s/s" - -#: ../../locales/../src/interface/statusbar.cpp:583 -msgid "Download limit: none" -msgstr "Download-grænse: ingen" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 -msgid "Download search results" -msgstr "Hent søgeresultater" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 -msgid "Download selected directory" -msgstr "Download valgte mappe" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 -msgid "Download selected files and directories" -msgstr "Download valgte filer og mapper" - -#: ../../locales/../src/interface/Mainfrm.cpp:966 -#, c-format -msgid "" -"Download speed: %s/s\n" -"Upload speed: %s/s" -msgstr "" -"Download-hastighed: %s/s\n" -"Upload-hastighed: %s/s" - -#: ../../locales/../src/interface/edithandler.cpp:1099 -msgid "Downloading" -msgstr "Downloader" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 -#, c-format -msgid "Downloading %s" -msgstr "Henter %s" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 -msgid "Downloading update..." -msgstr "Henter opdatering..." - -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:90 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 -msgid "" -"Drag&drop between different instances of FileZilla has not been implemented " -"yet." -msgstr "" -"Træk&Slip mellem andre instancer af FileZilla er endnu ikke implementeret." - -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:103 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 -msgid "Drag&drop between different servers has not been implemented yet." -msgstr "Træk&Slip mellem forskellige servere er endnu ikke implementeret." - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 -msgid "Dupl&icate" -msgstr "Lav &kopi" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 -msgid "E&nable all" -msgstr "Sl&å alle til" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 -msgid "E&nter directory" -msgstr "&Gå ned i mappe" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 -msgid "E&xecute" -msgstr "U&dfør" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 -msgid "E&xit" -msgstr "&Afslut" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 -msgid "E&xport..." -msgstr "&Eksportér..." - -#: ../../locales/../src/interface/verifycertdialog.cpp:254 -msgid "E-Mail:" -msgstr "E-Mail:" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 -msgid "Each filter needs at least one condition." -msgstr "Hvert filter skal bruge mindst en betingelse." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 -msgid "Edit filters" -msgstr "Rediger filtre" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 -msgid "" -"Edit the file with the configured editor and upload changes to the server." -msgstr "" -"Rediger filen med den valgte editor, og overfør ændringerne til serveren." - -#: ../../locales/../src/interface/search.cpp:684 -msgid "Editing directories is not supported" -msgstr "Redigering af mapper er ikke understøttet" - -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 -msgid "Editing failed" -msgstr "Kunne ikke redigere" - -#: ../../locales/../src/interface/search.cpp:684 -msgid "Editing search results" -msgstr "Redigerer søgeresultater" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 -msgid "Email:" -msgstr "E-post:" - -#: ../../locales/../src/interface/QueueView.cpp:2114 -msgid "Empty command" -msgstr "Tom kommando" - -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 -msgid "Empty command." -msgstr "Tom kommando." - -#: ../../locales/../src/interface/RemoteListView.cpp:2015 -msgid "Empty directory listing" -msgstr "Tom mappeliste" - -#: ../../locales/../src/interface/filelist_statusbar.cpp:14 -msgid "Empty directory." -msgstr "Tom mappe." - -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 -msgid "Empty file extension." -msgstr "Tomt filtypenavn." - -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 -msgid "Empty filter names are not allowed." -msgstr "Tomme filternavne ikke tilladt." - -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 -msgid "Empty name" -msgstr "Tomt navn" - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 -msgid "Empty quoted string." -msgstr "Tom streng i anførselstegn." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 -msgid "En&able all" -msgstr "Slå alle &til" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 -msgid "Enable invalid character &filtering" -msgstr "Slå &filtrering af ugyldige tegn til" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 -msgid "Encrypted" -msgstr "Krypteret" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 -msgid "Encryption" -msgstr "Kryptering" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 -msgid "Encryption details" -msgstr "Krypteringsdetaljer" - -#: ../../locales/../src/interface/filelistctrl.cpp:467 -msgid "End comparison and change sorting order?" -msgstr "Afslut sammenligning og skift sorteringsrækkefølge?" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 -msgid "Enter &custom command..." -msgstr "Indtast &brugerdefineret kommando..." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 -msgid "Enter 0 for unlimited speed." -msgstr "Skriv 0 for ubegrænset hastighed." - -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "Enter command" -msgstr "Indtast kommando" - -#: ../../locales/../src/interface/Mainfrm.cpp:572 -msgid "Enter custom command" -msgstr "Indtast brugerdefineret kommando" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 -msgid "Enter directory" -msgstr "Gå ned i mappe" - -#: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 -msgid "Enter filter name" -msgstr "Angiv et filternavn" - -#: ../../locales/../src/interface/filter.cpp:334 -msgid "Enter name for filterset" -msgstr "Angiv navn på filtersæt" - -#: ../../locales/../src/interface/filter.cpp:392 -msgid "Enter new name for filterset" -msgstr "Angiv nyt navn på filtersæt" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 -msgid "Enter password" -msgstr "Indtast adgangskode" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 -msgid "Enter selected directory" -msgstr "Gå ned i valgte mappe" - -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 -msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" -"\n" -"Supported protocols are:\n" -"- ftp:// for normal FTP with optional encryption\n" -"- sftp:// for SSH file transfer protocol\n" -"- ftps:// for FTP over TLS (implicit)\n" -"- ftpes:// for FTP over TLS (explicit)" -msgstr "" -"Indtast serveradressen.\n" -"Angiv serverens protokol ved at angive protokollen før servernavnet. Hvis du " -"ikke angiver en protokol, anvendes standardprotokollen (ftp://).\n" -"Du kan også indtaste en hel URL på formen protokol://bruger:adgangskode@vært:" -"port her, hvorved værdierne i de øvrige felter overskrives.\n" -"\n" -"Følgende protokoller er understøttet:\n" -"- ftp:// til normal FTP med valgfri kryptering\n" -"- sftp:// til filoverførsel med SSH\n" -"- ftps:// til FTP via TLS (implicit)\n" -"- ftpes:// til FTP via TLS (eksplicit)" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 -#, c-format -msgid "" -"Enter the password for the file '%s'.\n" -"The converted file will be protected with the same password." -msgstr "" -"Angiv adgangskoden til filen '%s'.\n" -"Den konverterede fil ikke være beskyttet med samme adgangskode." - -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 -msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." -msgstr "" -"Angiv den port, serveren lytter på.\n" -"Standarden for FTP er 21, standarden for SFTP er 22." - -#: ../../locales/../src/interface/loginmanager.cpp:65 -msgid "Enter username and password" -msgstr "Indtast brugernavn og adgangskode" - -#: ../../locales/../src/interface/export.cpp:26 -msgid "Error exporting settings" -msgstr "Fejl-eksport indstillinger" - -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 -msgid "Error importing" -msgstr "Fejl-importering" - -#: ../../locales/../src/interface/QueueView.cpp:1903 -msgid "Error loading queue" -msgstr "Fejl ved indlæsning af kø" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1824 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 -msgid "Error loading xml file" -msgstr "Fejl ved indlæsning af xml-fil" - -#: ../../locales/../src/interface/QueueView.cpp:1813 -msgid "Error saving queue" -msgstr "Fejl ved gem af kø" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 -msgid "Error starting program" -msgstr "Fejl ved start af program" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 -msgid "Error writing xml file" -msgstr "Fejl ved skrivning af xml-fil" - -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 -msgid "Error:" -msgstr "Fejl:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 -msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" -msgstr "Eksempel: png \"c:\\programmer\\viewer\\viewer.exe\" -open" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 -msgid "Examples" -msgstr "Eksempler" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 -msgid "Exe&cute" -msgstr "Ud&før" - -#: ../../locales/../src/interface/update_dialog.cpp:57 -msgid "Executable contains no version info, cannot check for updates." -msgstr "" -"Den eksekverbare fil indeholder ingen oplysninger om version - kan ikke søge " -"efter opdateringer." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 -msgid "Explorer" -msgstr "Stifinder" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 -msgid "Export &Queue" -msgstr "Eksportér &kø" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 -msgid "Export &Settings" -msgstr "Eksportér &indstillinger" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 -msgid "Export settings" -msgstr "Eksportér indstillinger" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 -msgid "F&ilter name:" -msgstr "F&ilternavn:" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 -msgid "FTP" -msgstr "FTP" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 -msgid "FTP - File Transfer Protocol" -msgstr "FTP - File Transfer Protocol" - -#: ../../locales/../src/engine/server.cpp:15 -msgid "FTP - File Transfer Protocol with optional encryption" -msgstr "FTP - File Transfer Protocol med valgfri kryptering" - -#: ../../locales/../src/engine/server.cpp:21 -msgid "FTP - Insecure File Transfer Protocol" -msgstr "FTP - Usikker File Transfer Protocol" - -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 -msgid "FTP Engine not initialized, can't connect" -msgstr "FTP-systemet ikke initialiseret - kan ikke oprette forbindelse" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 -msgid "FTP Keep-alive" -msgstr "FTP keep alive-signal" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 -msgid "FTP Proxy" -msgstr "FTP-proxy" - -#: ../../locales/../src/interface/cmdline.cpp:21 -msgid "FTP URL" -msgstr "FTP-URL" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:44 -msgid "" -"FTP uses secondary connections for data transfers. These additional " -"connections can be established in two ways." -msgstr "" -"FTP anvender sekundære forbindelser til dataoverførsler. Disse yderligere " -"forbindelser kan oprettes på to måder." - -#: ../../locales/../src/engine/server.cpp:20 -msgid "FTPES - FTP over explicit TLS" -msgstr "FTPES - FTP via eksplicit TLS" - -#: ../../locales/../src/engine/server.cpp:19 -msgid "FTPS - FTP over implicit TLS" -msgstr "FTPS - FTP via implicit TLS" - -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 -msgid "Failed to change directory" -msgstr "Kunne ikke skifte mappe" - -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 -msgid "Failed to change language" -msgstr "Kunne ikke skifte sprog" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 -msgid "Failed to copy or move sites" -msgstr "Kunne ikke kopiere eller flytte steder" - -#: ../../locales/../src/interface/xmlfunctions.cpp:350 -msgid "Failed to create backup copy of xml file" -msgstr "Kunne ikke oprette sikkerhedskopi af xml-fil" - -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Kunne ikke oprette lytte-socket - afslutter" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 -msgid "Failed to create listening socket for active mode transfer" -msgstr "Kunne ikke oprette lytte-socket til overførsel i aktiv tilstand" - -#: ../../locales/../src/interface/LocalTreeView.cpp:621 -msgid "Failed to get 'My Documents' path" -msgstr "Kunne ikke åbne 'Dokumenter'" - -#: ../../locales/../src/interface/LocalTreeView.cpp:609 -msgid "Failed to get desktop path" -msgstr "Kunne ikke skifte til Skrivebord" - -#: ../../locales/../src/interface/netconfwizard.cpp:944 -msgid "Failed to get peer address of control connection, connection closed." -msgstr "" -"Kunne ikke hente peer-adressen på kontrolforbindelsen - forbindelsen lukket." - -#: ../../locales/../src/interface/netconfwizard.cpp:951 -msgid "Failed to get peer address of data connection, connection closed." -msgstr "" -"Kunne ikke hente peer-adressen på dataforbindelsen - forbindelsen lukket." - -#: ../../locales/../src/interface/context_control.cpp:82 -msgid "Failed to initialize FTP engine" -msgstr "Kunne ikke initialisere FTP-systemet" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 -msgid "Failed to initialize TLS." -msgstr "Kunne ikke initialisere TLS." - -#: ../../locales/../src/interface/FileZilla.cpp:109 -msgid "Failed to initialize networking" -msgstr "Kunne ikke initialisere netværk" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:146 -msgid "Failed to load panels, invalid resource files?" -msgstr "Kan ikke indlæse paneler - er ressourcefilerne ugyldige?" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 -#, c-format -msgid "Failed to load private key: %s" -msgstr "Kunne ikke indlæse privatnøgle: %s" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 -#, c-format -msgid "Failed to open \"%s\" for appending/writing" -msgstr "Kunne ikke åbne \"%s\" for tilføjelse/skrivning" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 -#, c-format -msgid "Failed to open \"%s\" for reading" -msgstr "Kunne ikke åbne \"%s\" for læsning" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 -#, c-format -msgid "Failed to open \"%s\" for writing" -msgstr "Kunne ikke åbne \"%s\" for skrivning" - -#: ../../locales/../src/engine/ControlSocket.cpp:347 -msgid "Failed to parse returned path." -msgstr "Kunne ikke fortolke den returnerede sti." - -#: ../../locales/../src/interface/netconfwizard.cpp:1003 -msgid "Failed to receive data" -msgstr "Kunne ikke modtage data" - -#: ../../locales/../src/engine/ControlSocket.cpp:193 -msgid "Failed to retrieve directory listing" -msgstr "Kunne ikke hente mappeindholdsliste" - -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Kunne ikke hente ekstern IP-adresse - afslutter" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" -msgstr "Kunne ikke modtage ekstern IP-adresse - anvender lokal adresse" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Kunne ikke hente lokal IP-adresse." - -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Kunne ikke hente lokal IP-adresse - afslutter" - -#: ../../locales/../src/interface/netconfwizard.cpp:625 -msgid "Failed to retrieve the external IP address." -msgstr "Kunne ikke hente den eksterne IP-adresse." - -#: ../../locales/../src/interface/netconfwizard.cpp:313 -msgid "Failed to send command." -msgstr "Kunne ikke sende kommando." - -#: ../../locales/../src/interface/FileZilla.cpp:173 -#, c-format -msgid "Failed to set language to %s (%s), using default system language" -msgstr "Kunne ikke sætte sproget til %s (%s) - anvender standardsystemsproget" - -#: ../../locales/../src/interface/FileZilla.cpp:151 -#, c-format -msgid "" -"Failed to set language to %s (%s), using default system language (%s, %s)." -msgstr "" -"Kunne ikke sætte sproget til %s (%s) - anvender standardsystemsproget (%s, " -"%s)." - -#: ../../locales/../src/interface/FileZilla.cpp:140 -#, c-format -msgid "Failed to set language to %s (%s), using default system language." -msgstr "Kunne ikke sætte sproget til %s (%s) - anvender standardsystemsproget." - -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 -#, c-format -msgid "Failed to set language to %s, using default system language" -msgstr "Kunne ikke sætte sproget til %s, anvender standardsystemsproget" - -#: ../../locales/../src/interface/FileZilla.cpp:147 -#, c-format -msgid "Failed to set language to %s, using default system language (%s, %s)." -msgstr "" -"Kunne ikke sætte sproget til %s - anvender standardsystemsproget (%s, %s)." - -#: ../../locales/../src/interface/FileZilla.cpp:137 -#, c-format -msgid "Failed to set language to %s, using default system language." -msgstr "Kunne ikke sætte sproget til %s - anvender standardsystemsproget." - -#: ../../locales/../src/interface/settings/optionspage.cpp:215 -msgid "Failed to validate settings" -msgstr "Kunne ikke validere indstillinger" - -#: ../../locales/../src/engine/tlssocket.cpp:1107 -msgid "Failed to verify peer certificate" -msgstr "Kunne ikke verificere peer-certifikat" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 -#, c-format -msgid "Failed to write to file %s" -msgstr "Kunne ikke skrive til filen %s" - -#: ../../locales/../src/interface/xmlfunctions.cpp:363 -msgid "Failed to write xml file" -msgstr "Kunne ikke skrive xml-fil" - -#: ../../locales/../src/interface/queueview_failed.cpp:16 -msgid "Failed transfers" -msgstr "Mislykkede overførsler" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 -msgid "Fall back to active mode" -msgstr "Fald tilbage til aktiv tilstand" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 -msgid "Fil&e:" -msgstr "F&il:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 -msgid "Fil&es" -msgstr "Fil&er" - -#: ../../locales/../src/interface/filelistctrl.cpp:270 -msgid "File" -msgstr "Filer" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Filtyper" - -#: ../../locales/../src/engine/socket.cpp:1051 -msgid "File descriptor not a socket" -msgstr "Filbeskrivelsen er ikke en socket" - -#: ../../locales/../src/interface/import.cpp:95 -msgid "File does not contain any importable data." -msgstr "Filen indeholder ingen data der kan importeres." - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 -msgid "File editing" -msgstr "Filredigering" - -#: ../../locales/../src/interface/RemoteListView.cpp:1596 -msgid "File exists" -msgstr "Filen findes" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 -msgid "File exists action" -msgstr "Fil findes-handling" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 -msgid "File has changed" -msgstr "Filen er ændret" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 -msgid "File lists" -msgstr "Fil-lister" - -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 -msgid "File not found" -msgstr "Fil ikke fundet" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 -msgid "File search" -msgstr "Filsøgning" - -#: ../../locales/../src/engine/ControlSocket.cpp:127 -msgid "File transfer aborted by user" -msgstr "Filoverførsel afbrudt af bruger" - -#: ../../locales/../src/engine/ControlSocket.cpp:118 -#, c-format -msgid "File transfer aborted by user after transferring %s in %s" -msgstr "Filoverførsel afbrudt af bruger efter overførsel af %s på %s" - -#: ../../locales/../src/engine/ControlSocket.cpp:137 -msgid "File transfer failed" -msgstr "Filoverførsel slog fejl" - -#: ../../locales/../src/engine/ControlSocket.cpp:122 -#, c-format -msgid "File transfer failed after transferring %s in %s" -msgstr "Filoverførsel afbrudt efter overførsel af %s på %s" - -#: ../../locales/../src/engine/ControlSocket.cpp:132 -msgid "File transfer skipped" -msgstr "Filoverførsel sprunget over" - -#: ../../locales/../src/engine/ControlSocket.cpp:130 -msgid "File transfer successful" -msgstr "Filoverførsel lykkedes" - -#: ../../locales/../src/engine/ControlSocket.cpp:115 -#, c-format -msgid "File transfer successful, transferred %s in %s" -msgstr "Filoverførsel lykkedes, overført %s på %s" - -#: ../../locales/../src/interface/Mainfrm.cpp:1137 -msgid "File transfers still in progress." -msgstr "Filoverførsler stadig i gang." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 -msgid "File would transfer with ASCII data type." -msgstr "Filen kunne overføres med ASCII-datatypen." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 -msgid "File would transfer with binary data type." -msgstr "Filen kunne overføres med den binære datatype." - -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 -msgid "FileZilla Error" -msgstr "Fejl i FileZilla" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 -msgid "" -"FileZilla can now test your configuration to ensure everything is configured " -"properly." -msgstr "" -"FileZilla kan nu teste din konfiguration nu for at sikre, at alt er " -"konfigureret korrekt." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 -msgid "FileZilla is already connected to a server." -msgstr "FileZilla er allerede forbundet til en server." - -#: ../../locales/../src/interface/Mainfrm.cpp:1442 -msgid "FileZilla needs to be restarted for the language change to take effect." -msgstr "FileZilla skal genstartes, inden ændringen i sprog kan træde i kraft." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 -msgid "FileZilla updates" -msgstr "FileZilla-opdateringer" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 -msgid "Filelist status &bars" -msgstr "Filliste-&statuslinier" - -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 -msgid "Filename" -msgstr "Filnavn" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Filnavnefiltre..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 -#, c-format -msgid "Filename cannot be constructed for directory %s and filename %s" -msgstr "Filnavnet kan ikke dannes for mappen %s og filnavnet %s" - -#: ../../locales/../src/interface/RemoteListView.cpp:1582 -msgid "Filename invalid" -msgstr "Ugyldigt filnavn" - -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 -msgid "Filename unchanged" -msgstr "Filnavn ikke ændret" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 -msgid "Filename:" -msgstr "Filnavn:" - -#: ../../locales/../src/interface/file_utils.cpp:318 -msgid "Filenames may not contain any of the following characters: / * ? < > |" -msgstr "Filnavne må ikke indeholde nogen af følgende tegn: / * ? < > |" - -#: ../../locales/../src/interface/file_utils.cpp:293 -msgid "" -"Filenames may not contain any of the following characters: / \\ : * ? \" < > " -"|" -msgstr "Filnavne må ikke indeholde nogen af følgende tegn: / \\ : * ? \" < > |" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 -msgid "Files currently being edited" -msgstr "Filer, der aktuelt redigeres" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 -msgid "Filesize" -msgstr "Filstørrelse" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 -msgid "Filesize format" -msgstr "Filstørrelsesformat" - -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 -msgid "Filetype" -msgstr "Filtype" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 -msgid "Filetype associations" -msgstr "Filetypeassociationer" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 -msgid "Filter applies to:" -msgstr "Filtret vedrører:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 -msgid "Filter invalid characters in filenames" -msgstr "Filtrér ugyldige tegn i filnavne" - -#: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 -msgid "Filter name already exists" -msgstr "Filternavn findes allerede" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 -msgid "Filter out items matching all of the following" -msgstr "Bortfiltrér emner, der matcher alt det følgende" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 -msgid "Filter out items matching any of the following" -msgstr "Bortfiltrér emner, der matcher noget af det følgende" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 -msgid "Filter out items matching none of the following" -msgstr "Bortfiltrér emner, der matcher intet af det følgende" - -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 -msgid "Filter set already exists" -msgstr "Filtersæt findes allerede" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 -msgid "Filter the directory listings" -msgstr "Filtrer mappelisterne" - -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 -msgid "Filter validation failed" -msgstr "Validering af filter fejlede" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 -msgid "Find &files" -msgstr "Find &filer" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 -msgid "Find d&irectories" -msgstr "Find m&apper" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 -msgid "Fingerprint (SHA-1):" -msgstr "Fingeraftryk (SHA-1):" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 -msgid "Fingerprint (SHA-256):" -msgstr "Fingeraftryk (SHA-256):" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Fingeraftryk:" - -#: ../../locales/../src/interface/netconfwizard.cpp:55 -msgid "Firewall and router configuration wizard" -msgstr "Assistent til firewall- og router-konfiguration" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 -msgid "" -"For more detailed information about what these options do, please run the " -"network configuration wizard." -msgstr "" -"For at få flere oplysninger om disse funktioner skal du køre " -"konfigurationsassistenten." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 -msgid "For reliability you should specify a range of at least 10 ports." -msgstr "" -"For størst mulig driftsikkerhed skal du angive et interval på mindst 10 " -"porte." - -#: ../../locales/../src/interface/Options.cpp:242 -msgid "" -"For this session the default settings will be used. Any changes to the " -"settings will not be saved." -msgstr "" -"Standardindstillingerne vil blive brugt i denne session. Eventuelle " -"ændringer i indstillingerne vil ikke blive gemt." - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 -msgid "Force &UTF-8" -msgstr "Gennemtving &UTF-8" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 -msgid "Force showing &hidden files" -msgstr "&Se skjulte filer" - -#: ../../locales/../src/interface/Mainfrm.cpp:645 -msgid "Force showing hidden files" -msgstr "Se skjulte filer" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 -msgid "Format specifications:" -msgstr "Formatspecifikationer:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 -msgid "Format: Extension followed by properly quoted command and arguments." -msgstr "" -"Format: Filtypen, efterfulgt af kommandoer og parametre med korrekt " -"angivelse af anførselstegn." - -#. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 -#, c-format -msgid "Found new %s %s\n" -msgstr "Fundet ny %s %s\n" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 -msgid "Further documentation" -msgstr "Yderligere dokumentation" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 -msgid "General" -msgstr "Generelt" - -#: ../../locales/../src/engine/proxy.cpp:507 -msgid "General SOCKS server failure" -msgstr "Generel SOCKS-serverfejl" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 -msgid "Generic proxy" -msgstr "Generisk proxy" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 -msgid "Get external IP address from the following URL:" -msgstr "Hent ekstern IP-adresse fra følgende URL:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 -msgid "Getting help" -msgstr "Få hjælp" - -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 -msgid "Given filterset name already exists, overwrite filter set?" -msgstr "" -"Det angivne filtersæt findes allerede, ønsker du at overskrive filtersættet?" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 -msgid "Global bookmarks" -msgstr "Globale bogmærker" - -#: ../../locales/../src/engine/tlssocket.cpp:212 -#, c-format -msgid "GnuTLS error %d" -msgstr "GnuTLS-fejl %d" - -#: ../../locales/../src/engine/tlssocket.cpp:214 -#, c-format -msgid "GnuTLS error %d in %s" -msgstr "GnuTLS-fejl %d i %s" - -#: ../../locales/../src/engine/tlssocket.cpp:208 -#, c-format -msgid "GnuTLS error %d in %s: %s" -msgstr "GnuTLS-fejl %d i %s: %s" - -#: ../../locales/../src/engine/tlssocket.cpp:206 -#, c-format -msgid "GnuTLS error %d: %s" -msgstr "GnuTLS-fejl %d: %s" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 -msgid "GnuTLS:" -msgstr "GnuTLS:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 -msgid "Group permissions" -msgstr "Gruppetilladelser" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 -msgid "H&igh" -msgstr "Hø&jt" - -#: ../../locales/../src/engine/server.cpp:18 -msgid "HTTPS - HTTP over TLS" -msgstr "HTTPS - HTTP via TLS" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 -msgid "Hash:" -msgstr "Hash-værdi:" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 -msgid "Hidden" -msgstr "Skjult" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 -msgid "High" -msgstr "Høj" - -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 -msgid "Highest" -msgstr "Højest" - -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 -msgid "Highest available port has to be a number between 1024 and 65535." -msgstr "Højeste portnummer til rådighed skal være et tal mellem 1024 og 65535." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 -msgid "" -"Hold the shift key to toggle the filter state on both sides simultaneously." -msgstr "" -"Hold Shift-tasten nede for at skifte filterstatus på begge sider samtidig." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 -msgid "Homepage:" -msgstr "Hjemmeside:" - -#: ../../locales/../src/engine/socket.cpp:1062 -msgid "Host is down" -msgstr "Vært er nede" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Fingeraftryk for værtsnøgle:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 -msgid "Host key mismatch" -msgstr "Værtsnøgle stemmer ikke" - -#: ../../locales/../src/engine/server.cpp:157 -msgid "Host starts with '[' but no closing bracket found." -msgstr "Vært starter med '[', men en slutparentes kunne ikke findes." - -#: ../../locales/../src/engine/proxy.cpp:516 -msgid "Host unreachable" -msgstr "Vært kan ikke nås" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 -msgid "Host:" -msgstr "Vært:" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 -msgid "Hours," -msgstr "timer," - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 -msgid "I&SO 8601 (example: 15:47)" -msgstr "IS&O 8601 (eksempel: 15:47)" - -#: ../../locales/../src/engine/proxy.cpp:153 -msgid "IPv6 addresses are not supported with SOCKS4 proxy" -msgstr "IPv6-adresser understøttes ikke med SOCKS4-proxy" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 -msgid "" -"If no data is sent or received during an operation for longer than the " -"specified time, the connection will be closed and FileZilla will try to " -"reconnect." -msgstr "" -"Hvis der ikke sendes eller modtages data i et tidsrum, der er længere end " -"det angivne, vil forbindelsen blive lukket, og FileZilla vil forsøge at " -"genoprette forbindelsen." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 -msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." -msgstr "" -"Hvis du indrapporterer fejl, så medsend log, hvor log-niveauet er \"Mange ord" -"\"." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 -msgid "" -"If the automatic test at the end of this wizard succeeds, but you cannot " -"transfer files to a particular server, the server might be misconfigured and " -"you should try active mode. You can set the transfer mode on a per-server " -"basis in the Site Manager." -msgstr "" -"Hvis den automatiske test efter denne assistent ikke giver fejl, men du ikke " -"kan overføre filer til en bestemt server, kan den pågældende server være " -"fejlkonfigureret, og du skal prøve i aktiv tilstand. Du kan sætte " -"overførselstilstand pr. server i Websted Manager." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 -msgid "" -"If the fallback option is enabled, you will be able to connect to " -"misconfigured servers which reject the selected transfer mode." -msgstr "" -"hvis tilbagefalds-funktionen er slået til, vil du kunne forbinde til " -"fejlkonfigurerede servere som afviser den valgte overførsels-metode." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 -msgid "" -"If the host key change was not expected, please contact the server " -"administrator." -msgstr "" -"Hvis ændringen i værtsnøglen ikke var forventet, skal du kontakte serverens " -"administrator." - -#: ../../locales/../src/interface/netconfwizard.cpp:563 -msgid "" -"If the problem persists, some router and/or firewall keeps blocking " -"FileZilla." -msgstr "" -"Hvis problemet vedbliver, er der en router og/eller firewall, der bliver ved " -"at blokere for FileZilla." - -#: ../../locales/../src/interface/netconfwizard.cpp:572 -msgid "" -"If the problem persists, some router and/or firewall keeps interrupting the " -"connection." -msgstr "" -"Hvis problemet vedbliver, er der en router og/eller firewall, der bliver ved " -"at afbryde forbindelsen." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 -msgid "" -"If the size of the logfile reaches the limit, it gets renamed by adding " -"\".1\" to the end of the filename (possibly overwriting older logfiles) and " -"a new file gets created." -msgstr "" -"Hvis størrelsen af logfilen når til grænsen, vil den blive omdøbt ved at " -"tilføje \".1\" efter filnavnet (og derved evt. overskrive ældre logfiler), " -"og en ny fil oprettes." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 -msgid "" -"If the symlink points to a directory, FileZilla can either delete the " -"symbolic link or remove the contents of the linked directory." -msgstr "" -"Hvis symlinket peget på en mappe, kan FileZilla enten slette det symbolske " -"link eller slette indholdet af den mappe, der linkes til." - -#: ../../locales/../src/interface/netconfwizard.cpp:633 -msgid "" -"If this problem persists, please contact your router or firewall " -"manufacturer for a solution." -msgstr "" -"Hvis problemet vedbliver, skal du kontakte fabrikanten af din router for at " -"finde en løsning." - -#: ../../locales/../src/interface/netconfwizard.cpp:591 -msgid "If this problem stays, please contact your router manufacturer." -msgstr "Hvis problemet vedbliver, skal du kontakte fabrikanten af din router." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 -msgid "" -"If using 'overwrite if newer', your system time has to be synchronized with " -"the server. If the time differs (e.g. different timezone), specify a " -"timezone offset in the site manager." -msgstr "" -"Hvis du vælger 'Overskriv hvis kilden er nyere', skal dit systems ur " -"synkroniseres med serveren. Hvis der er forskel i tid (f.eks. forskellige " -"tidszoner), skal du angive en tidszoneforskydning i Websted Manager." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 -msgid "" -"If using timestamp based comparison, consider two files equal if their " -"timestamp difference does not exceed this threshold." -msgstr "" -"Hvis du baserer sammenligning på klokkeslæt, vil to filer bedømmes som ens " -"hvis forskellen på tid ikke overskrider denne grænse." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 -msgid "If you change the language, you need to restart FileZilla." -msgstr "Hvis du skifter sprog, skal du genstarte FileZilla." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 -msgid "" -"If you click on test, FileZilla will connect to probe.filezilla-project.org " -"and will perform some simple tests." -msgstr "" -"Når du klikker på Test, vil FileZilla oprette forbindelse til probe." -"filezilla-project.org og udføre nogle enkle test." - -#: ../../locales/../src/interface/Mainfrm.cpp:1159 -msgid "If you close FileZilla, your changes will be lost." -msgstr "Hvis du lukker FileZilla, vil du miste dine ændringer." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 -msgid "" -"If you enter the wrong filetypes, those files may get corrupted when " -"transferred." -msgstr "" -"Hvis du angiver forkerte filtyper, kan de pågældende filer blive ødelagt " -"under overførslen." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 -msgid "If you get any errors, your configuration is not correct." -msgstr "Hvis du får fejl, er din konfiguration ikke korrekt." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 -msgid "" -"If you have problems to retrieve directory listings or to transfer files, " -"try to change the default transfer mode." -msgstr "" -"Hvis du har problemer med at modtage mappelister eller overføre filer, kan " -"du forsøge at ændre standard-overførselsmetode." - -#: ../../locales/../src/interface/netconfwizard.cpp:578 -msgid "" -"If you keep having problems with a specific server, the server itself or a " -"remote router or firewall might be misconfigured. In this case try to toggle " -"passive mode and contact the server administrator for help." -msgstr "" -"Hvis du vedholdende har problemer med en bestemt server, kan selve serveren " -"eller en fjernrouter eller firewall være fejlkonfigureret. I sådanne " -"tilfælde kan du forsøge at slå passiv tilstand til eller fra og kontakte " -"serverens administrator." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 -msgid "" -"If you successfully complete the wizard and the final test succeeds, any " -"firewalls and routers you have should be configured properly." -msgstr "" -"Hvis det lykkes at gennemføre denne assistent, og den afsluttende test ikke " -"giver fejl, skulle alle firewalls og routere være konfigureret korrekt." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 -msgid "" -"If you use a firewall, make sure FileZilla is allowed to accept connection " -"on all given ports." -msgstr "" -"Hvis du bruger en firewall, skal du sikre dig, at FileZilla har tilladelse " -"til at modtage forbindelser på alle de angivne porte." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 -msgid "" -"If you use a router, make sure all these ports are forwarded to the machine " -"you're running FileZilla on." -msgstr "" -"Hvis du bruger en router, skal du sikre dig, at alle disse porte er " -"viderestillet til den maskine, du bruger til at køre FileZilla." - -#: ../../locales/../src/interface/netconfwizard.cpp:604 -msgid "" -"If your router keeps changing the IP address, please contact your router " -"manufacturer." -msgstr "" -"Hvis din router bliver ved at ændre IP-adresse, kan du kontakte fabrikanten " -"af din router." - -#: ../../locales/../src/interface/import.cpp:87 -msgid "Import data from older version" -msgstr "Importér data fra ældre version" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 -msgid "Import settings" -msgstr "Import-indstillinger" - -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 -msgid "Import successful" -msgstr "Import fuldført" - -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 -msgid "Improperly quoted association." -msgstr "Anførselstegn ikke sat korrekt for filtypeassociation." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 -msgid "" -"In active mode, FileZilla has to listen on a port for data transfers. You " -"have to specify which ports FileZilla will use." -msgstr "" -"I aktiv tilstand skal FileZilla lytte til en port for at finde " -"dataoverførsel. Du skal angive, hvilken port FileZilla skal lytte til." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 -msgid "" -"In case you have a router, you will have to forward all available ports, as " -"FileZilla has no influence on the ports your system chooses." -msgstr "" -"Hvis du har en router, skal du viderestille alle de porte, der er til " -"rådighed, da FileZilla ikke har nogen indflydelse på, hvilken port dit " -"operativsystem vælger." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 -msgid "" -"In order to use active mode, FileZilla needs to know your external IP " -"address." -msgstr "" -"For at anvende aktiv tilstand skal FileZilla kende din eksterne IP-adresse." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:52 -msgid "" -"In passive mode, which is recommended for most users, FileZilla asks the " -"server for a port and connects to the given port. Not much configuration has " -"to be done for this." -msgstr "" -"I passiv tilstand, hvilket anbefales for de fleste brugere, beder FileZilla " -"serveren om en port, og opretter forbindelse til den givne port. Dette " -"kræver ikke meget konfiguration." - -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Kæde ikke komplet - øverste certifikat er ikke selv-signeret certifikat fra " -"autoriseret certifikat-udsteder" - -#: ../../locales/../src/interface/queue.cpp:328 -msgid "Incorrect password" -msgstr "Forkert adgangskode" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 -msgid "" -"Information about the latest version of FileZilla could not be retrieved. " -"Please try again later." -msgstr "" -"Oplysninger om den seneste version af FileZilla kunne ikke hentes. Prøv igen " -"senere." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 -msgid "Initializing TLS..." -msgstr "Initialiserer TLS..." - -#: ../../locales/../src/interface/verifycertdialog.cpp:111 -msgid "Insecure algorithm!" -msgstr "Usikker algoritme!" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 -msgid "Insecure server, it does not support FTP over TLS." -msgstr "Usikker server, understøtter ikke FTP over TLS." - -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 -msgid "Interactive" -msgstr "Interaktiv" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 -msgid "Interface" -msgstr "Interface" - -#: ../../locales/../src/engine/socket.cpp:1048 -msgid "Interrupted by signal" -msgstr "Afbrudt af signal" - -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 -msgid "Interrupted by user" -msgstr "Afbrudt af bruger" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 -msgid "Invalid Content-Length" -msgstr "Ugyldig Content-Length" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 -msgid "Invalid HTTP Response" -msgstr "Ugyldig HTTP Response" - -#: ../../locales/../src/engine/socket.cpp:1036 -msgid "Invalid argument passed" -msgstr "Ugyldig parameter overført" - -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 -msgid "" -"Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " -"site manager to force UTF-8." -msgstr "" -"Ugyldig række af tegn modtaget, slår UTF-8 fra. Vælg UTF-8 i Websted Manager " -"for at gennemtvinge UTF-8." - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 -msgid "Invalid chunk size" -msgstr "Ugyldig chunk-størrelse" - -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 -msgid "Invalid data received" -msgstr "Ugyldige data modtaget" - -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 -msgid "Invalid date" -msgstr "Ugyldig dato" - -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 -msgid "Invalid filename" -msgstr "Ugyldigt filnavn" - -#: ../../locales/../src/engine/server.cpp:162 -msgid "Invalid host, after closing bracket only colon and port may follow." -msgstr "Ugyldig vært, efter slutparentes må der kun stå kolon og port." - -#: ../../locales/../src/interface/loginmanager.cpp:101 -msgid "Invalid input" -msgstr "Ugyldig indtastning" - -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 -msgid "Invalid port given. The port has to be a value from 1 to 65535." -msgstr "Ugyldig port angivet. Porten skal have en værdi mellem 1 og 65535." - -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 -msgid "" -"Invalid protocol specified. Valid protocols are:\n" -"ftp:// for normal FTP with optional encryption,\n" -"sftp:// for SSH file transfer protocol,\n" -"ftps:// for FTP over TLS (implicit) and\n" -"ftpes:// for FTP over TLS (explicit)." -msgstr "" -"Ugyldig protokol angivet. Gyldige protokoller er:\n" -"ftp:// til normal FTP med valgfri kryptering,\n" -"sftp:// til filoverførsel med SSH,\n" -"ftps:// til FTP via TLS (implicit) og\n" -"ftpes:// til FTP via TLS (eksplicit)." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 -msgid "" -"Invalid proxy host, after closing bracket only colon and port may follow." -msgstr "Ugyldig proxy-vært, efter slutparentes må der kun stå kolon og port." - -#: ../../locales/../src/interface/search.cpp:405 -msgid "Invalid regular expression in search conditions." -msgstr "Ugyldigt regulært udtryk i søgebetingelser." - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 -msgid "Invalid response code" -msgstr "Ugyldig svarkode" - -#: ../../locales/../src/interface/search.cpp:400 -#, c-format -msgid "Invalid search conditions: %s" -msgstr "Ugyldige søgebetingelser: %s" - -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 -msgid "Invalid site path" -msgstr "Ugyldig sti til sted" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 -msgid "Invalid size in condition" -msgstr "Ugyldig størrelse i betingelse" - -#: ../../locales/../src/engine/server.cpp:132 -msgid "Invalid username given." -msgstr "Ugyldigt brugernavn angivet." - -#: ../../locales/../src/engine/socket.cpp:1069 -msgid "Invalid value for ai_flags" -msgstr "Ugyldig værdi for ai_flags" - -#: ../../locales/../src/engine/socket.cpp:1071 -msgid "Invalid value for hints" -msgstr "Ugyldig værdi til tips" - -#: ../../locales/../src/interface/verifycertdialog.cpp:256 -msgid "Jurisdiction country:" -msgstr "Jurisdiktion (land):" - -#: ../../locales/../src/interface/verifycertdialog.cpp:258 -msgid "Jurisdiction locality:" -msgstr "Jurisdiktion (by):" - -#: ../../locales/../src/interface/verifycertdialog.cpp:257 -msgid "Jurisdiction state or province:" -msgstr "Jurisdiktion (stat eller provins):" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 -msgid "Keep directories on top" -msgstr "Hold mapper øverst" - -#: ../../locales/../src/interface/Mainfrm.cpp:649 -msgid "" -"Keep in mind that not all servers support this feature and may return " -"incorrect listings if this option is enabled. Although FileZilla performs " -"some tests to check if the server supports this feature, the test may fail." -msgstr "" -"Husk, at ikke alle servere understøtter denne funktion, og kan returnere " -"forkerte lister, hvis denne funktion er slået til. Selvom FileZilla udfører " -"nogle tests for at se om serveren understøtter denne funktion, kan testen " -"godt fejle." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 -msgid "Key exchange" -msgstr "Nøgleudveksling" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 -msgid "Key exchange:" -msgstr "Nøgleudveksling:" - -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 -msgid "Key file" -msgstr "Nøglefil" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 -msgid "L&owest" -msgstr "L&aveste" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 -msgid "Language" -msgstr "Sprog" - -#: ../../locales/../src/interface/Mainfrm.cpp:1442 -msgid "Language changed" -msgstr "Sprog ændret" - -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 -msgid "Last modified" -msgstr "Sidst ændret" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 -msgid "Layout" -msgstr "Udseende" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 -msgid "Limit for concurrent &downloads:" -msgstr "&Grænse for samtidige download:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 -msgid "Limit for concurrent &uploads:" -msgstr "Grænse for samtidige &upload:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 -msgid "Limit local ports" -msgstr "Begræns lokale porte" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 -msgid "Limit size of logfile" -msgstr "Begræns størrelsen på logfil" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 -msgid "Limit:" -msgstr "Grænse:" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -msgid "Line length exceeded" -msgstr "Linielængde oversteget" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 -msgid "Linked against" -msgstr "Linket mod" - -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 -msgid "Listen socket closed" -msgstr "Lytte-socket lukket" - -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 -msgid "Listing:" -msgstr "Liste:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 -msgid "Lo&west available port:" -msgstr "La&veste nr. port til rådighed:" - -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 -msgid "Local" -msgstr "Lokal" - -#: ../../locales/../src/engine/socket.cpp:1033 -msgid "Local address in use" -msgstr "Lokal adresse i brug" - -#: ../../locales/../src/engine/socket.cpp:1061 -msgid "Local endpoint has been closed" -msgstr "Det lokale slutpunkt er lukket" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 -msgid "Local file" -msgstr "Lokal fil" - -#: ../../locales/../src/interface/manual_transfer.cpp:313 -msgid "Local file does not exist." -msgstr "Den lokale fil findes ikke." - -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 -#, c-format -msgid "Local file is %s\n" -msgstr "Lokal fil er %s\n" - -#: ../../locales/../src/interface/manual_transfer.cpp:309 -msgid "Local file is a directory instead of a regular file." -msgstr "Lokal fil er en mappe og ikke en almindelig fil." - -#: ../../locales/../src/interface/manual_transfer.cpp:350 -msgid "Local file is not a valid filename." -msgstr "Den lokale fil har ikke et gyldigt filnavn." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 -msgid "Local filters:" -msgstr "Lokale filtre:" - -#: ../../locales/../src/interface/viewheader.cpp:334 -msgid "Local site:" -msgstr "Lokalt sted:" - -#: ../../locales/../src/interface/verifycertdialog.cpp:250 -msgid "Locality:" -msgstr "Lokalitet:" - -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:97 -msgid "Log file" -msgstr "Logfil" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 -msgid "Logged in" -msgstr "Logget ind" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 -msgid "Logging" -msgstr "Logning" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 -msgid "" -"Login data contains non-ASCII characters and server might not be UTF-8 " -"aware. Cannot fall back to local charset since using proxy." -msgstr "" -"Login-data indeholder tegn uden for ASCII-tegnsættet, og serveren kender " -"muligvis ikke UTF-8. Kan ikke falde tilbage på lokalt tegnsæt, da proxy " -"anvendes." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 -msgid "" -"Login data contains non-ASCII characters and server might not be UTF-8 " -"aware. Trying local charset." -msgstr "" -"Login-data indeholder tegn uden for ASCII-tegnsættet, og serveren kender " -"muligvis ikke UTF-8. Forsøger lokalt tegnsæt." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "" -"Login-proceduren er helt gennemført, men du er ikke logget ind. Afslutter." - -#: ../../locales/../src/interface/cmdline.cpp:103 -msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." -msgstr "" -"Login-typen skal være enten 'spørg' eller 'interaktiv' (uden anførselstegn)." - -#: ../../locales/../src/interface/cmdline.cpp:11 -#, c-format -msgid "" -"Logontype, can only be used together with FTP URL. Argument has to be either " -"'%s' or '%s'" -msgstr "" -"Login-typen kan kun anvendes sammen med FTP-URL. Argumentet skal være enten " -"'%s' eller '%s'" - -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 -msgid "Low" -msgstr "Lav" - -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 -msgid "Lowest" -msgstr "Lavest" - -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 -msgid "Lowest available port has to be a number between 1024 and 65535." -msgstr "Laveste port til rådighed skal være et tal mellem 1024 og 65535." - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 -msgid "MAC:" -msgstr "MAC:" - -#: ../../locales/../src/interface/xmlfunctions.cpp:44 -msgid "Make sure the file can be accessed and is a well-formed XML document." -msgstr "Sørg for, at filen kan tilgås, og at den er et velformet XML-dokument." - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 -#, c-format -msgid "Malformed chunk data: %s" -msgstr "Forkert formet datachunck: %s" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 -#, c-format -msgid "Malformed header: %s" -msgstr "Forkert formet header: %s" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "" -"Forkert formet svar: serveren sender ikke korrekte linieafslutningstegn" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 -msgid "Manual transfer" -msgstr "Manuel overførsel" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 -msgid "Match all of the following" -msgstr "Matcher alt det følgende" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 -msgid "Match any of the following" -msgstr "Match noget af det følgende" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 -msgid "Match none of the following" -msgstr "Match intet af det følgende" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 -msgid "Maximum simultaneous &transfers:" -msgstr "Maksimalt antal samtidige &overførsler:" - -#: ../../locales/../src/engine/socket.cpp:1075 -msgid "Memory allocation failure" -msgstr "Fejl ved tildeling af hukommelse" - -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 -msgid "Message log" -msgstr "Beskedlog" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 -msgid "Message log position" -msgstr "Placering af beskedlog" - -#: ../../locales/../src/engine/socket.cpp:1058 -msgid "Message too large" -msgstr "Besked er for stor" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 -msgid "MiB" -msgstr "MiB" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 -msgid "Minutes" -msgstr "minutter" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 -msgid "Move &down" -msgstr "Flyt &ned" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 -msgid "Move &up" -msgstr "Flyt &op" - -#: ../../locales/../src/interface/LocalTreeView.cpp:974 -msgid "My Computer" -msgstr "Denne Computer" - -#: ../../locales/../src/interface/LocalTreeView.cpp:964 -msgid "My Documents" -msgstr "Dokumenter" - -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 -msgid "My Sites" -msgstr "Mine steder" - -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 -msgid "N/a" -msgstr "I/A" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 -msgid "Name" -msgstr "Navn" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 -msgid "Name already exists" -msgstr "Navn findes allerede" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -msgid "Name of bookmark already exists." -msgstr "Navnet på bogmærket findes allerede." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 -msgid "Name:" -msgstr "Navn:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 -msgid "Natural sort" -msgstr "Naturlig sortering" - -#: ../../locales/../src/interface/filteredit.cpp:345 -msgid "Need to enter filter name" -msgstr "Du skal angive et navn på filteret" - -#: ../../locales/../src/interface/search.cpp:391 -msgid "Need to enter valid remote path" -msgstr "Du skal angive en gyldig fjernsti" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -msgid "Need to specify a character encoding" -msgstr "Du skal angive tegnsæt-indkodning" - -#: ../../locales/../src/engine/socket.cpp:1079 -msgid "Neither nodename nor servname provided, or not known" -msgstr "Hverken nodenavn eller servernavn er angivet, eller er ikke kendt" - -#: ../../locales/../src/engine/socket.cpp:1066 -msgid "" -"Network host does not have any network addresses in the requested address " -"family" -msgstr "" -"Netværksværten har ingen netværksadresse inden for den angivne adressefamilie" - -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 -msgid "Network unreachable" -msgstr "Netværk kan ikke tilgås" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 -msgid "Never" -msgstr "Aldrig" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 -msgid "New &Folder" -msgstr "Ny &mappe" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 -msgid "New &tab" -msgstr "Ny &fane" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 -msgid "New Book&mark" -msgstr "Nyt bo&gmærke" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 -msgid "New bookmark" -msgstr "Nyt bogmærke" - -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 -msgid "New directory" -msgstr "Ny mappe" - -#: ../../locales/../src/interface/welcome_dialog.cpp:51 -#, c-format -msgid "New features and improvements in %s" -msgstr "Nye funktioner og forbedringer i %s" - -#: ../../locales/../src/interface/filteredit.cpp:131 -msgid "New filter" -msgstr "Nyt filter" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 -msgid "New folder" -msgstr "Ny mappe" - -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 -msgid "New site" -msgstr "Nyt sted" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 -msgid "Next to the transfer queue" -msgstr "Ved siden af overførselskøen" - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 -msgid "No" -msgstr "Nej" - -#: ../../locales/../src/engine/socket.cpp:1077 -msgid "No address associated with nodename" -msgstr "Ingen adresse associeret med nodenavn" - -#: ../../locales/../src/interface/export.cpp:26 -msgid "No category to export selected" -msgstr "Ingen kategori til eksport valgt" - -#: ../../locales/../src/interface/QueueView.cpp:2114 -msgid "No command given, aborting." -msgstr "Ingen kommando afgivet, afslutter." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 -msgid "No external IP address set, trying default." -msgstr "Ingen ekstern IP-adresse angivet - forsøger standard." - -#: ../../locales/../src/interface/edithandler.cpp:1073 -msgid "No files are currently being edited." -msgstr "Der redigeres aktuelt ingen filer." - -#: ../../locales/../src/interface/filteredit.cpp:143 -msgid "No filter name given" -msgstr "Intet filternavn angivet" - -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 -msgid "No host given, please enter a host." -msgstr "Ingen vært angivet, angiv en vært." - -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 -msgid "No images available" -msgstr "Ingen billeder til rådighed" - -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Ikke flere filer i køen!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 -msgid "No name for the filterset given." -msgstr "Intet navn på filtersæt angivet." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 -msgid "No program associated with filetype" -msgstr "Intet program associeret med filtypen" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 -#, c-format -msgid "No program has been associated to edit files with the extension '%s'." -msgstr "Intet program er associeret som editor af filer med filtypen '%s'." - -#: ../../locales/../src/engine/socket.cpp:1053 -msgid "No route to host" -msgstr "Ingen rute til vært" - -#: ../../locales/../src/interface/search.cpp:255 -msgid "No search results" -msgstr "Ingen søgeresultater" - -#: ../../locales/../src/interface/sitemanager.cpp:280 -msgid "No sites available" -msgstr "Ingen sider til rådighed" - -#: ../../locales/../src/engine/proxy.cpp:484 -msgid "No supported SOCKS5 auth method" -msgstr "Ingen understøttet SOCKS5 aut-metode" - -#: ../../locales/../src/interface/loginmanager.cpp:101 -msgid "No username given." -msgstr "Intet brugernavn angivet." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 -msgid "None" -msgstr "Ingen" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 -msgid "None selected yet" -msgstr "Ingen er valgt endnu" - -#: ../../locales/../src/engine/socket.cpp:1073 -msgid "Nonrecoverable failure in name resolution" -msgstr "Uoprettelig fejl i opløsning af navn" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -msgid "Normal" -msgstr "Normal" - -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 -msgid "Not all items could be requeued for transfer." -msgstr "Ikke alle poster kunne genindsættes i køen til overførsel." - -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 -msgid "Not connected" -msgstr "Ikke tilsluttet" - -#: ../../locales/../src/interface/RemoteListView.cpp:2011 -msgid "Not connected to any server" -msgstr "Ikke forbundet til nogen server" - -#: ../../locales/../src/interface/Mainfrm.cpp:561 -msgid "Not connected to any server." -msgstr "Ikke forbundet til nogen server." - -#: ../../locales/../src/interface/filelist_statusbar.cpp:15 -msgid "Not connected." -msgstr "Ikke tilsluttet." - -#: ../../locales/../src/engine/socket.cpp:1094 -msgid "Not initialized, need to call WSAStartup" -msgstr "Ikke initialiseret. Behov for kald af WSAStartup" - -#: ../../locales/../src/interface/Mainfrm.cpp:647 -msgid "Note that this feature is only supported using the FTP protocol." -msgstr "Bemærk at denne funktion kun virker ved brug af FTP-protokollen." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 -msgid "Note: This only works with plain, unencrypted FTP connections." -msgstr "Bemærk: Dette fungerer kun med enkle, ukrypterede FTP-forbindelser." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 -msgid "Note: Using a generic proxy forces passive mode on FTP connections." -msgstr "" -"Bemærk: Brugen af generisk proxy gennemtvinger passiv tilstand på FTP-" -"forbindelser." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 -msgid "Number of decimal places:" -msgstr "Antal decimalpladser:" - -#: ../../locales/../src/interface/settings/optionspage_connection.cpp:35 -msgid "Number of retries has to be between 0 and 99." -msgstr "Antallet af forsøg skal være mellem 0 og 99." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "Å&bn fil" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 -#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 -msgid "OK" -msgstr "OK" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -msgid "OS version:" -msgstr "OS-version:" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 -msgid "" -"On the following pages, the selected transfer mode will be configured, as " -"well as the fallback mode if enabled." -msgstr "" -"På de efterfølgende sider vil den valgte overførselsmetode blive " -"konfigureret samtidig med tilbagefaldsmetode, hvis den er slået til." - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 -msgid "Once" -msgstr "Én gang" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 -msgid "Once a day" -msgstr "En gang om dagen" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 -msgid "Once a week" -msgstr "En gang om ugen" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 -msgid "Only use plain FTP (insecure)" -msgstr "Brug kun almindelig FTP (usikker)" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 -msgid "Open directory in system's file manager" -msgstr "Åbn mappe i systemets filhåndtering" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 -msgid "Open the Site Manager" -msgstr "Åbn Websted Manager" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 -msgid "Open the Site Manager." -msgstr "Åbn Websted Manager." - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 -msgid "Open the Site Manager. Right-click for a list of sites." -msgstr "Åbn Websted Manager. Højreklik for at se en liste over websteder." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 -msgid "Open the file." -msgstr "Åbn filen." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 -msgid "Open the settings dialog of FileZilla" -msgstr "Åbn FileZillas indstillingsvindue" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 -msgid "Opened as:" -msgstr "Åbnet som:" - -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 -msgid "Opening failed" -msgstr "Kunne ikke åbne" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 -msgid "Opens a new tab" -msgstr "Åbner en ny fane" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 -msgid "Opens the Site Manager" -msgstr "Åbner Websted Manager" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 -msgid "" -"Opens the directory listing filter dialog. Right-click to toggle filters." -msgstr "Åbner dialogen mappelistefilter. Højreklik for at skifte filtre." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 -msgid "Operating System:" -msgstr "Operativsystem:" - -#: ../../locales/../src/engine/socket.cpp:1044 -msgid "Operation already in progress" -msgstr "Handling er allerede i gang" - -#: ../../locales/../src/engine/socket.cpp:1035 -msgid "Operation in progress" -msgstr "Handling i gang" - -#: ../../locales/../src/engine/socket.cpp:1056 -msgid "Operation not supported" -msgstr "Handling ikke understøttet" - -#: ../../locales/../src/interface/verifycertdialog.cpp:244 -msgid "Organization:" -msgstr "Organisation:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 -msgid "Other SFTP options" -msgstr "Flere SFTP-indstillinger" - -#: ../../locales/../src/engine/socket.cpp:1089 -msgid "Other system error" -msgstr "Anden systemfejl" - -#: ../../locales/../src/interface/verifycertdialog.cpp:266 -msgid "Other:" -msgstr "Andet:" - -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 -msgid "Out of memory" -msgstr "Ikke mere hukommelse" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 -msgid "Overview" -msgstr "Overblik" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 -msgid "Overwrite &if source newer" -msgstr "Overskriv &hvis kilden er nyere" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 -msgid "Overwrite file" -msgstr "Overskriv fil" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 -msgid "Overwrite file if size differs" -msgstr "Overskriv fil, hvis størrelsen er forskellig" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 -msgid "Overwrite file if size differs or source file is newer" -msgstr "" -"Overskriv fil, hvis størrelsen er forskellig, eller kildefilen er nyere" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 -msgid "Overwrite file if source file newer" -msgstr "Overskriv fil, hvis kildefilen er nyere" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 -msgid "Overwrite if &different size" -msgstr "Overskriv hvis &forskellig størrelse" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 -msgid "Overwrite if different si&ze or source newer" -msgstr "Overskriv hvis forskellig str. eller kilden &er nyere" - -#: ../../locales/../src/interface/updater.cpp:219 -#, c-format -msgid "Own build type: %s\n" -msgstr "Egen byg-type: %s\n" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 -msgid "Owner permissions" -msgstr "Ejertilladelser" - -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 -msgid "Owner/Group" -msgstr "Ejer/Gruppe" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 -msgid "" -"P&revent system from entering idle sleep during transfers and other " -"operations" -msgstr "Und&lad at systemet går i dvale under overførsler og andre handlinger" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 -msgid "P&roxy host:" -msgstr "P&roxy-vært:" - -#: ../../locales/../src/interface/netconfwizard.cpp:497 -msgid "PORT command tainted by router or firewall." -msgstr "PORT-kommando forstyrret af router eller firewall." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 -msgid "Pa&ssive (recommended)" -msgstr "&Passiv (anbefalet)" - -#: ../../locales/../src/interface/Mainfrm.cpp:2322 -msgid "Parameter not a valid URL" -msgstr "Parameter er ikke en gyldig URL" - -#: ../../locales/../src/interface/updater.cpp:543 -#, c-format -msgid "Parsing %d bytes of version information.\n" -msgstr "Behandler %d bytes versionsinformation.\n" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 -msgid "Pass&word:" -msgstr "&Adgangskode:" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 -msgid "Passive (recommended)" -msgstr "Passiv (anbefalet)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 -msgid "Passive mode" -msgstr "Passiv tilstand" - -#: ../../locales/../src/interface/netconfwizard.cpp:597 -#: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 -msgid "Passive mode has been set as default transfer mode." -msgstr "Passiv tilstand er blevet sat som standard-overførselstilstand." - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 -msgid "Password required" -msgstr "Adgangskode påkrævet" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 -msgid "Path" -msgstr "Sti" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 -#, c-format -msgid "Path cannot be constructed for directory %s and subdir %s" -msgstr "Sti kan ikke opbygges for mappen %s og undermappen %s" - -#: ../../locales/../src/interface/Mainfrm.cpp:2280 -msgid "Path not found:" -msgstr "Sti ikke fundet:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 -msgid "Paths" -msgstr "Stier" - -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 -msgid "Pending removal" -msgstr "Afventer fjernelse" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 -msgid "Permission" -msgstr "Tilladelse" - -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 -msgid "Permission denied" -msgstr "Tilladelse nægtet" - -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 -msgid "Permissions" -msgstr "Tilladelser" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 -msgid "Platform:" -msgstr "Platform:" - -#: ../../locales/../src/interface/netconfwizard.cpp:562 -msgid "" -"Please check on https://filezilla-project.org/probe.php that the server is " -"running and carefully check your settings again." -msgstr "" -"Kontroller på https://filezilla-project.org/probe.php, at serverem kører, og " -"kontroller omhyggeligt dine indstillinger en gang til." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 -msgid "" -"Please configure any firewalls and routers so that FileZilla can establish " -"outgoing connection to arbitrary ports." -msgstr "" -"Konfigurer evt. firewalls og routere, så FileZilla kan etablere en udgående " -"forbindelse til en hvilken som helst port." - -#: ../../locales/../src/interface/netconfwizard.cpp:632 -msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." -msgstr "Slå indstillinger som 'DMZ Mode' eller 'Game Mode' fra på din router." - -#: ../../locales/../src/interface/netconfwizard.cpp:571 -msgid "" -"Please ensure you have a stable internet connection and carefully check your " -"settings again." -msgstr "" -"Kontroller, at din Internet-forbindelse er stabil, og kontroller omhyggeligt " -"dine indstillinger igen." - -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 -msgid "Please enter a custom date format." -msgstr "Angiv et brugerdefineret datoformat." - -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 -msgid "Please enter a custom time format." -msgstr "Angiv et brugerdefineret klokkeslætformat." - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 -msgid "" -"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." -msgstr "Angiv en dato efter formen ÅÅÅÅ-MM-DD, f.eks. 2010-07-18." - -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#, c-format -msgid "Please enter a download speed limit greater or equal to 0 %s/s." -msgstr "Angiv en hastighedsgrænse for download højere end eller lig 0 %s/s." - -#: ../../locales/../src/interface/filteredit.cpp:136 -msgid "Please enter a name for the new filter." -msgstr "Angiv et navn for det nye filter." - -#: ../../locales/../src/interface/filteredit.cpp:243 -msgid "Please enter a new name for the copied filter." -msgstr "Angiv et nyt navn for det kopierede filter." - -#: ../../locales/../src/interface/filter.cpp:390 -#, c-format -msgid "Please enter a new name for the filter set \"%s\"" -msgstr "Angiv et nyt navn for filtersættet \"%s\"" - -#: ../../locales/../src/interface/filteredit.cpp:196 -msgid "Please enter a new name for the filter." -msgstr "Angiv et nyt navn for dette filter." - -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 -msgid "" -"Please enter a number between 0 and 10 for the number of concurrent " -"downloads." -msgstr "Vælg et tal mellem 1 og 10 for antallet af samtidige download." - -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 -msgid "" -"Please enter a number between 0 and 10 for the number of concurrent uploads." -msgstr "Vælg et tal mellem 1 og 10 for antallet af samtidige upload." - -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 -msgid "" -"Please enter a number between 1 and 10 for the number of concurrent " -"transfers." -msgstr "Vælg et tal mellem 1 og 10 for antallet af samtidige overførsler." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 -msgid "Please enter a password for this server:" -msgstr "Angiv en adgangskode til denne server:" - -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Angiv en sti og en eksekverbar fil, der skal afvikles.\n" -"F.eks. c:\\EnSti\\fil.exe under MS Windows eller /EnSti/fil under Unix.\n" -"Du kan evt. også angive program-parametre." - -#: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 -msgid "" -"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." -msgstr "" -"Vælg en timeout mellem 10 og 9999 sekunder eller 0 for at slå timeout fra." - -#: ../../locales/../src/interface/filter.cpp:334 -msgid "Please enter a unique name for this filter set" -msgstr "Angiv et unikt navn for dette filtersæt" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 -msgid "Please enter a username for this server:" -msgstr "Angiv et brugernavn til denne server:" - -#: ../../locales/../src/interface/netconfwizard.cpp:187 -msgid "Please enter a valid portrange." -msgstr "Angiv et gyldigt interval af portnumre." - -#: ../../locales/../src/interface/netconfwizard.cpp:168 -msgid "Please enter an URL where to get your external address from" -msgstr "Angiv den URL, hvorfra din eksterne adresse skal hentes" - -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 -#, c-format -msgid "Please enter an upload speed limit greater or equal to 0 %s/s." -msgstr "Angiv en upload-hastighedsgrænse højere end eller lig 0 %s/s." - -#: ../../locales/../src/interface/Mainfrm.cpp:572 -msgid "" -"Please enter raw FTP command.\n" -"Using raw ftp commands will clear the directory cache." -msgstr "" -"Angiv en rå FTP-kommando.\n" -"Ved anvendelse af rå FTP-kommandoer slettes mappe-cache." - -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 -msgid "Please enter the name of the directory which should be created:" -msgstr "Angiv navnet på den mappe, der skal oprettes:" - -#: ../../locales/../src/interface/RemoteListView.cpp:2609 -msgid "Please enter the name of the file which should be created:" -msgstr "Angiv navnet på den fil, der skal oprettes:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 -msgid "Please enter username and password for this server:" -msgstr "Angiv et brugernavn og en adgangskode til denne server:" - -#: ../../locales/../src/interface/netconfwizard.cpp:152 -msgid "Please enter your external IP address" -msgstr "Angiv din eksterne IP-adresse" - -#: ../../locales/../src/interface/netconfwizard.cpp:602 -#: ../../locales/../src/interface/netconfwizard.cpp:615 -msgid "" -"Please enter your external IP address on the active mode page of this " -"wizard. In case you have a dynamic address or don't know your external " -"address, use the external resolver option." -msgstr "" -"Angiv din eksterne IP-adresse på aktiv tilstand-siden i denne assistent. " -"Hvis du har en dynamisk adresse eller ikke kender din eksterne adresse kan " -"du bruge den eksterne adresse-verifikationsenhedsfunktion." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 -msgid "" -"Please follow the instructions carefully, as wrong configuration will " -"prevent successful FTP connections." -msgstr "" -"Følg instruktionerne omhyggeligt, eftersom en forkert konfiguration vil " -"forhindre korrekte FTP-forbindelser." - -#: ../../locales/../src/interface/netconfwizard.cpp:626 -msgid "" -"Please make sure FileZilla is allowed to establish outgoing connections and " -"make sure you typed the address of the address resolver correctly." -msgstr "" -"Sørg for at tillade, at FileZilla kan oprette udgående forbindelser, og sørg " -"for at skrive adressen på adresse-verifikationsenheden korrekt." - -#: ../../locales/../src/interface/FileZilla.cpp:157 -msgid "Please make sure the requested locale is installed on your system." -msgstr "Sørg for, at det påkrævede locale er installeret på dit system." - -#: ../../locales/../src/interface/netconfwizard.cpp:603 -msgid "" -"Please make sure your router is using the latest available firmware. " -"Furthermore, your router has to be configured properly. You will have to use " -"manual port forwarding. Don't run your router in the so called 'DMZ mode' or " -"'game mode'." -msgstr "" -"Kontroller, at din router anvender den nyeste firmware. Desuden skal din " -"router være konfigureret korrekt. Du skal bruge manuel port forwarding. Du " -"bliver nødt til at anvende manuel port-viderestilling. Du skal ikke køre din " -"router i den såkaldte 'DMZ'-tilstand eller 'game mode'." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 -msgid "" -"Please note that FileZilla has no influence on the port the server chooses. " -"So the server might choose a port which your firewall thinks is only used by " -"trojans or other malware. This might raise a false alarm you can safely " -"discard." -msgstr "" -"Bemærk, at FileZilla ikke har indflydelse på valget af serverport. Serveren " -"vil muligvis vælge en port, som din firewall tror kun anvendes af trojanske " -"heste eller andet malware. Dette kan give anledning til en falsk alarm, som " -"du kan afvise med sindsro." - -#: ../../locales/../src/interface/Mainfrm.cpp:687 -msgid "" -"Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " -"servers only works if they support the MFMT command." -msgstr "" -"Bemærk, at bevarelse af tidsstempler ved upload på FTP-, FTPS- og FTPES-" -"servere kun fungerer, hvis de understøtter MFMT-kommandoen." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 -msgid "" -"Please note that some servers might ban you if you try to reconnect too " -"often or in too short intervals." -msgstr "" -"Bemærk, at nogle servere måske banner dig, hvis du prøver at retablere " -"forbindelsen for ofte inden for alt for kort tid." - -#: ../../locales/../src/interface/netconfwizard.cpp:579 -msgid "" -"Please run this wizard again should you change your network environment or " -"in case you suddenly encounter problems with servers that did work " -"previously." -msgstr "" -"Hvis du skal foretage ændringer i netværket eller hvis du pludselig får " -"problemer med servere, der tidligere virkede, så kør denne assistent igen." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 -msgid "Please select an action:" -msgstr "Vælg en handling:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 -msgid "Please select the categories you would like to import." -msgstr "Vælg den kategori, du ønsker at importere." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 -msgid "Please select the default transfer mode you would like to use." -msgstr "Vælg den overførselstilstand, du ønsker at bruge som standard." - -#: ../../locales/../src/interface/chmoddialog.cpp:41 -#, c-format -msgid "Please select the new attributes for the directory \"%s\"." -msgstr "Vælg de nye attributter for mappen \"%s\"." - -#: ../../locales/../src/interface/chmoddialog.cpp:33 -#, c-format -msgid "Please select the new attributes for the file \"%s\"." -msgstr "Vælg de nye attributter for filen \"%s\"." - -#: ../../locales/../src/interface/chmoddialog.cpp:44 -msgid "Please select the new attributes for the selected directories." -msgstr "Vælg de nye attributter til de valgte mapper." - -#: ../../locales/../src/interface/chmoddialog.cpp:47 -msgid "" -"Please select the new attributes for the selected files and directories." -msgstr "Vælg de nye attributter for de valgte filer og mapper." - -#: ../../locales/../src/interface/chmoddialog.cpp:36 -msgid "Please select the new attributes for the selected files." -msgstr "Vælg de nye attributter til de valgte filer." - -#: ../../locales/../src/interface/netconfwizard.cpp:590 -msgid "" -"Please update your firewall and make sure your router is using the latest " -"available firmware. Furthermore, your router has to be configured properly. " -"You will have to use manual port forwarding. Don't run your router in the so " -"called 'DMZ mode' or 'game mode'. Things like protocol inspection or " -"protocol specific 'fixups' have to be disabled" -msgstr "" -"Opgrader din firewall, og kontroller, at din router anvender den nyeste " -"firmware. Desuden skal din router være konfigureret korrekt. Du skal bruge " -"manuel port forwarding. Du skal ikke køre din router i såkaldt 'DMZ-" -"tilstand' eller 'game mode'. Desuden skal ting som protokol-kontrol eller " -"protokol-specifikke 'rettelser' været slået fra" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 -msgid "Positio&n of the message log:" -msgstr "&Placering af beskedloggen:" - -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 -msgid "Postal code:" -msgstr "Postnummer:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 -msgid "Pre&allocate space before downloading" -msgstr "Af&sæt plads inden du henter" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 -msgid "Preallocation" -msgstr "Afsat plads" - -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 -msgid "Predefined Sites" -msgstr "Prædefineret Sider" - -#: ../../locales/../src/interface/Mainfrm.cpp:686 -msgid "Preserving file timestamps" -msgstr "Bevarer fil-tidsstempler" - -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Visning:" - -#: ../../locales/../src/engine/tlssocket.cpp:1136 -msgid "Primary connection and data connection certificates don't match." -msgstr "Primær forbindelse og data-forbindelse certifikater er ikke ens." - -#: ../../locales/../src/interface/cmdline.cpp:19 -msgid "Print diagnostic information related to startup of FileZilla" -msgstr "" -"Udskriv diagnostiske informationer i forbindelse med start af FileZilla" - -#: ../../locales/../src/interface/cmdline.cpp:18 -msgid "Print version information to stdout and exit" -msgstr "Udskriv versionsinformation til stdout, og afslut" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 -msgid "Prioritize directories (default)" -msgstr "Prioriter mapper (standard)" - -#: ../../locales/../src/interface/queue.cpp:1210 -msgid "Priority" -msgstr "Prioritet" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 -msgid "" -"Privacy policy: Only your version of FileZilla, your used operating system " -"and your CPU architecture will be submitted to the server." -msgstr "" -"Anonymitet: Kun oplysninger om din version af FileZilla, dit operativsystem " -"og din CPU-arkitektur vil blive sendt til serveren." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 -msgid "Private &keys:" -msgstr "Private &nøgler:" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 -msgid "Pro&tocol:" -msgstr "Pro&tokol:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 -msgid "Pro&xy password:" -msgstr "Proxy-kode&ord:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 -msgid "Process &Queue" -msgstr "Udfør &kø" - -#: ../../locales/../src/engine/socket.cpp:1037 -msgid "Process file table overflow" -msgstr "Overløb i proces-filtabel" - -#. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 -#, c-format -msgid "Processed %s in %s." -msgstr "Behandlet %s på %s." - -#: ../../locales/../src/engine/socket.cpp:1042 -msgid "Protocol not supported" -msgstr "Protokol ikke understøttet" - -#: ../../locales/../src/engine/socket.cpp:1096 -msgid "Protocol not supported on given socket type" -msgstr "Protokollen er ikke understøttet for den angivne socket-type" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 -msgid "Protocol:" -msgstr "Protokol:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 -msgid "Proxy &port:" -msgstr "&Proxy-port:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 -msgid "Proxy &user:" -msgstr "Pro&xy-bruger:" - -#: ../../locales/../src/engine/proxy.cpp:494 -msgid "Proxy authentication failed" -msgstr "Validering af proxy fejlede" - -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 -#, c-format -msgid "Proxy handshake failed: %s" -msgstr "Proxy-handshake fejlede: %s" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 -msgid "Proxy host starts with '[' but no closing bracket found." -msgstr "Proxy-vært starter med '[', men en slutparentes kunne ikke findes." - -#: ../../locales/../src/engine/proxy.cpp:352 -#, c-format -msgid "Proxy reply: %s" -msgstr "Proxy-svar: %s" - -#: ../../locales/../src/engine/proxy.cpp:535 -#, c-format -msgid "Proxy request failed. Reply from proxy: %s" -msgstr "Proxy-forespørgsel fejlede. Svar fra proxy: %s" - -#: ../../locales/../src/engine/proxy.cpp:407 -#, c-format -msgid "Proxy request failed: %s" -msgstr "Proxy-forespørgsel fejlede: %s" - -#: ../../locales/../src/engine/proxy.cpp:559 -msgid "Proxy request failed: Unknown address type in CONNECT reply" -msgstr "Proxy-forespørgsel fejlede: Ukendt adressetype i svar på CONNECT" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 -msgid "Proxy set but proxy host or port invalid" -msgstr "Proxy er defineret, men proxy-vært eller -port er ugyldig" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 -msgid "Public Key Authentication" -msgstr "Validering med offentlig nøgle" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 -msgid "Public key algorithm:" -msgstr "Offentlig nøgle algoritme:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 -msgid "Public permissions" -msgstr "Offentlige tilladelser" - -#: ../../locales/../src/interface/QueueView.cpp:3054 -msgid "Queue has been fully processed" -msgstr "Køen er fuldt behandlet" - -#: ../../locales/../src/interface/statusbar.cpp:429 -#, c-format -msgid "Queue: %s MiB" -msgstr "Kø: %s MiB" - -#: ../../locales/../src/interface/statusbar.cpp:366 -#, c-format -msgid "Queue: %s%s" -msgstr "Kø: %s%s" - -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 -msgid "Queue: empty" -msgstr "Kø: tom" - -#: ../../locales/../src/interface/QueueView.cpp:440 -msgid "Queued files" -msgstr "Filer i kø" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 -msgid "Queueing:" -msgstr "Sætter i kø:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "&Genstart system" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 -msgid "R&emote directory tree" -msgstr "Fjernmappe&træ" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 -msgid "R&eset and requeue selected files" -msgstr "N&ulstil og sæt valgte filer i kø igen" - -#: ../../locales/../src/interface/Mainfrm.cpp:586 -msgid "Raw FTP command" -msgstr "Rå FTP-kommando" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 -msgid "Re&ad" -msgstr "L&æs" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 -msgid "Re&fresh" -msgstr "&Genopfrisk" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 -msgid "Re&name" -msgstr "Om&døb" - -#: ../../locales/../src/interface/netconfwizard.cpp:585 -msgid "" -"Re-run the wizard and carefully check your settings and configure all " -"routers and firewalls accordingly." -msgstr "" -"Kør assistenten igen, undersøg omhyggeligt dine indstillinger, og konfigurer " -"alle routere og firewalls tilsvarende." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 -msgid "Rea&d" -msgstr "Læ&s" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 -msgid "Read-only" -msgstr "Læsbar" - -#: ../../locales/../src/interface/Mainfrm.cpp:1023 -msgid "Really cancel current operation?" -msgstr "Ønsker du virkelig at annullere den aktuelle handling?" - -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 -#, c-format -msgid "Really delete %d directory with its contents from the server?" -msgid_plural "" -"Really delete %d directories with their contents from the server?" -msgstr[0] "" -"Ønsker du virkelig at slette mappen %d med dens indhold fra serveren?" -msgstr[1] "Ønsker du at slette %d mapper med deres indhold?" - -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 -#, c-format -msgid "Really delete %d file from the server?" -msgid_plural "Really delete %d files from the server?" -msgstr[0] "Ønsker du virkelig at slette filen %d fra serveren?" -msgstr[1] "Ønsker du at slette %d filer?" - -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 -#, c-format -msgid "Really delete %s and %s from the server?" -msgstr "Ønsker du virkelig at slette %s og %s fra serveren?" - -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -msgid "Really delete all selected files and/or directories from the server?" -msgstr "" -"Ønsker du virkelig at slette alle valgte filer og/eller mapper fra serveren?" - -#: ../../locales/../src/interface/file_utils.h:45 -msgid "Really delete all selected files and/or directories from your computer?" -msgstr "" -"Ønsker du virkelig at slette alle valgte filer og/eller mapper fra din " -"computer?" - -#: ../../locales/../src/interface/queue.cpp:1210 -msgid "Reason" -msgstr "Årsag" - -#: ../../locales/../src/interface/QueueView.cpp:3047 -msgid "Reboot now" -msgstr "Genstart nu" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 -msgid "Rec&urse into subdirectories" -msgstr "Rek&ursivt i undermapper" - -#: ../../locales/../src/engine/tlssocket.cpp:225 -#, c-format -msgid "Received TLS alert from the server: %s (%d)" -msgstr "TLS-advarsel modtaget fra serveren: %s (%d)" - -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 -msgid "Received a directory listing which appears to be encoded in EBCDIC." -msgstr "Modtog mappeliste, som ser ud til at være indkodet med EBCDIC." - -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 -msgid "Received a line exceeding 10000 characters, aborting." -msgstr "Modtaget linie med flere end 10000 tegn - afslutter." - -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 -msgid "Received data tainted" -msgstr "De hentede data er forstyrret" - -#: ../../locales/../src/interface/updater.cpp:522 -msgid "Received invalid character in version information" -msgstr "Modtaget ugyldige tegn i versionsoplysninger" - -#: ../../locales/../src/engine/tlssocket.cpp:228 -#, c-format -msgid "Received unknown TLS alert %d from the server" -msgstr "Ukendt TLS-advarsel %d modtaget fra serveren" - -#: ../../locales/../src/interface/updater.cpp:515 -msgid "Received version information is too large" -msgstr "Modtog versionsoplysninger, der er for store" - -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -msgid "" -"Reconnect information cannot be cleared while connected to a server.\n" -"If you continue, your connection will be disconnected." -msgstr "" -"Gen-forbind-information kan ikke blive slettet, når der er forbundet til en " -"server.\n" -"Hvis du fortsætter, vil forbindelsen blive afbrudt." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 -msgid "Reconnection settings" -msgstr "Indstillinger for genetablering af forbindelse" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 -msgid "Reconnects to the last used server" -msgstr "Genopret forbindelse til sidst anvendte server" - -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 -msgid "Recursively adding files to queue." -msgstr "Tilføj filer i køen rekursivt." - -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 -msgid "Recursively changing permissions." -msgstr "Ændrer tilladelser rekursivt." - -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 -msgid "Recursively deleting files and directories." -msgstr "Sletter filer og mapper rekursivt." - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 -#, c-format -msgid "Redirection to invalid or unsupported URI: %s" -msgstr "Omdirigering til ugyldig eller ikke-understøttet URI: %s" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 -#, c-format -msgid "Redirection to invalid or unsupported address: %s" -msgstr "Omdirigering til ugyldig eller ikke-understøttet adresse: %s" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 -msgid "Refresh the file and folder lists" -msgstr "Genopfrisk fil- og mappelisterne" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 -msgid "Remember passwords?" -msgstr "Husk adgangskoder?" - -#: ../../locales/../src/interface/edithandler.cpp:1095 -msgid "Remote" -msgstr "Fjern" - -#: ../../locales/../src/engine/tlssocket.cpp:854 -msgid "Remote certificate not trusted." -msgstr "Fjern-certifikat ikke sikkert." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 -msgid "Remote file" -msgstr "Fil på fjernsted" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 -msgid "Remote file search" -msgstr "Filsøgning på fjernsted" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 -msgid "Remote filters:" -msgstr "Fjerne filtre:" - -#: ../../locales/../src/interface/edithandler.cpp:1086 -msgid "Remote path" -msgstr "Sti på fjernsted" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 -#, c-format -msgid "" -"Remote path cannot be parsed. Make sure it is a valid absolute path and is " -"supported by the current site's servertype (%s)." -msgstr "" -"Fjernstien kan ikke fortolkes. Sørg for, at det er en gyldig, absolut sti, " -"og at den er understøttet af det aktuelle steds servertype (%s)." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 -#, c-format -msgid "" -"Remote path cannot be parsed. Make sure it is a valid absolute path and is " -"supported by the servertype (%s) selected on the parent site." -msgstr "" -"Fjernstien kan ikke fortolkes. Sørg for, at det er en gyldig, absolut sti, " -"og at den er understøttet af den servertype (%s), der er valgt på det " -"overordnede sted." - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 -msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." -msgstr "" -"Fjernstien kan ikke fortolkes. Sørg for, at det er en gyldig, absolut sti." - -#: ../../locales/../src/interface/manual_transfer.cpp:332 -msgid "Remote path could not be parsed." -msgstr "Sti på fjernsted kunne ikke parses." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 -msgid "Remote path handling:" -msgstr "Håndtering af sti på fjernsted:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 -msgid "Remote path:" -msgstr "Sti på fjernsted:" - -#: ../../locales/../src/interface/viewheader.cpp:530 -msgid "Remote site:" -msgstr "Fjernsted:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 -msgid "Remove &all" -msgstr "Fjern &alle" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 -msgid "Remove &selected" -msgstr "Fjern &valgte" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 -msgid "Rename file" -msgstr "Omdøb fil" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 -msgid "Rename selected directory" -msgstr "Omdøb den valgte mappe" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 -msgid "Rename selected files and directories" -msgstr "Omdøb valgte filer og mapper" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 -#, c-format -msgid "Renaming '%s' to '%s'" -msgstr "Omdøber '%s' til '%s'" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 -msgid "Reporting bugs and feature requests" -msgstr "Indberet fejl og ønsker om nye funktioner" - -#: ../../locales/../src/engine/proxy.cpp:398 -msgid "" -"Request failed - client is not running identd (or not reachable from server)" -msgstr "" -"Forespørgsel fejlede - klienten kører ikke identd (eller kan ikke nås fra " -"serveren)" - -#: ../../locales/../src/engine/proxy.cpp:401 -msgid "Request failed - client's identd could not confirm the user ID string" -msgstr "" -"Forespørgsel fejlede - klientens identd kunne ikke bekræfte bruger-ID-" -"strengen" - -#: ../../locales/../src/engine/proxy.cpp:395 -msgid "Request rejected or failed" -msgstr "Forespørgsel afvist eller fejlet" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 -msgid "Require explicit FTP over TLS" -msgstr "Forlang eksplicit FTP over TLS" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 -msgid "Require implicit FTP over TLS" -msgstr "Forlang implicit FTP over TLS" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 -msgid "Reset and requeue &all" -msgstr "Nulstil og sæt &alle i kø igen" - -#: ../../locales/../src/engine/socket.cpp:1084 -msgid "Resolved protocol is unknown" -msgstr "Ukendt protokol" - -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 -#, c-format -msgid "Resolving address of %s" -msgstr "Kontrollerer adressen på %s" - -#: ../../locales/../src/engine/socket.cpp:1043 -msgid "Resource temporarily unavailable" -msgstr "Ressourcen er ikke til rådighed for øjeblikket" - -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 -msgid "Response:" -msgstr "Respons:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 -msgid "Results:" -msgstr "Resultater:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 -msgid "Resume file transfer" -msgstr "Genoptag filoverførsel" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 -msgid "" -"Resuming ASCII files can cause problems if server uses a different line " -"ending format than the client." -msgstr "" -"Genoptagelse af hentning af ASCII-filer kan give problemer, hvis serveren " -"anvender et andet linieafslutningsformat end klienten." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 -#, c-format -msgid "Retrieving directory listing of \"%s\"..." -msgstr "Henter mappeliste for \"%s\"..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 -msgid "Retrieving directory listing..." -msgstr "Henter mappeliste..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 -#, c-format -msgid "Retrieving external IP address from %s" -msgstr "Henter ekstern IP-adresse fra %s" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 -msgid "S&how files currently being edited..." -msgstr "&Vis de filer der aktuelt redigeres..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 -msgid "S&how the Site Manager on startup" -msgstr "Vis &Websted Manger ved start" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "L&uk systemet ned" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 -msgid "S&top" -msgstr "S&top" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "S&top systemet midlertidigt" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 -msgid "S&ynchronized browsing" -msgstr "S&ynkroniseret bladring" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 -msgid "SFTP" -msgstr "SFTP" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 -msgid "SOC&KS 4" -msgstr "SOC&KS 4" - -#: ../../locales/../src/engine/proxy.cpp:177 -#, c-format -msgid "SOCKS4 proxy will connect to: %s" -msgstr "SOCKS4-proxy forbinder til: %s" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 -msgid "SQLite:" -msgstr "SQLite:" - -#: ../../locales/../src/interface/netconfwizard.cpp:846 -msgid "Save settings?" -msgstr "Gem indstillinger?" - -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 -msgid "Saving of password has been disabled by your system administrator." -msgstr "" -"Din systemadministrator har slået muligheden for at gemme adgangskoder fra." - -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 -msgid "Saving of passwords has been disabled by you." -msgstr "Du har slået muligheden for at gemme adgangskoder fra." - -#: ../../locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "Skanner efter filer, der skal tilføjes i køen" - -#: ../../locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" -msgstr "Skanner efter filer til upload" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 -msgid "Search &conditions:" -msgstr "Søge&betingelser:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 -msgid "Search &directory:" -msgstr "Søg i &mappe:" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 -msgid "Search for files recursively." -msgstr "Søg rekursivt efter filer." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 -msgid "Search server for files" -msgstr "Søg efter filer på serveren" - -#: ../../locales/../src/interface/statusbar.cpp:502 -msgid "Security information" -msgstr "Sikkerhedsinformation" - -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 -msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" -msgstr "Se også: https://wiki.filezilla-project.org/Network_Configuration" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 -msgid "Sele&ct server" -msgstr "V&ælg server" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 -msgid "Select &page:" -msgstr "Vælg s&ide:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 -msgid "Select Theme" -msgstr "Vælg tema" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 -msgid "" -"Select default action to perform if target file of a transfer already exists." -msgstr "" -"Vælg standardhandling, der skal udføres, hvis filen i en overførsel allerede " -"findes på destinationen." - -#: ../../locales/../src/interface/edithandler.cpp:1531 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 -msgid "Select default editor" -msgstr "Vælg standard-editor" - -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 -msgid "" -"Select default file exists action if the target file already exists. This " -"selection is valid only for the current session." -msgstr "" -"Vælg standardhandling for fil findes, hvis destinationsfilen allerede " -"findes. Dit valg gælder kun den aktuelle session." - -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 -msgid "" -"Select default file exists action only for the currently selected files in " -"the queue." -msgstr "" -"Vælg standardhandling for fil findes for de aktuelt valgte filer i køen." - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 -msgid "Select file containing private key" -msgstr "Vælg filen med den private nøgle" - -#: ../../locales/../src/interface/export.cpp:38 -msgid "Select file for exported data" -msgstr "Vælg fil til eksporterede data" - -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 -msgid "Select file for exported queue" -msgstr "Vælg fil til eksporteret kø" - -#: ../../locales/../src/interface/export.cpp:36 -msgid "Select file for exported settings" -msgstr "Vælg fil til eksporterede indstillinger" - -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 -msgid "Select file for exported sites" -msgstr "Vælg fil til eksporterede steder" - -#: ../../locales/../src/interface/import.cpp:16 -msgid "Select file to import settings from" -msgstr "Vælg fil at importere indstillinger fra" - -#: ../../locales/../src/interface/manual_transfer.cpp:242 -msgid "Select file to upload" -msgstr "Vælg fil til upload" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 -msgid "Select filename for converted key file" -msgstr "Vælg filnavn til konverteret nøglefil" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 -msgid "Select how these files should be opened." -msgstr "Vælg, hvordan disse filer skal åbnes." - -#: ../../locales/../src/interface/search.cpp:513 -msgid "Select target download directory" -msgstr "Vælg målmappe til download" - -#: ../../locales/../src/interface/manual_transfer.cpp:238 -msgid "Select target filename" -msgstr "Vælg navn på destinationsfil" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 -msgid "Select the categories to export:" -msgstr "Vælg kategorier der skal eksporteres:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 -msgid "Select the private data you would like to delete." -msgstr "Vælg de private data, du ønsker at slette." - -#: ../../locales/../src/interface/search.cpp:481 -#, c-format -msgid "Selected %d directory with its contents for transfer." -msgid_plural "Selected %d directories with their contents for transfer." -msgstr[0] "%d mappe med indhold valgt til overførsel." -msgstr[1] "%d mapper med indhold valgt til overførsel." - -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 -#, c-format -msgid "Selected %d directory." -msgid_plural "Selected %d directories." -msgstr[0] "Valgt %d mappe." -msgstr[1] "Valgt %d mapper." - -#: ../../locales/../src/interface/search.cpp:479 -#, c-format -msgid "Selected %d file for transfer." -msgid_plural "Selected %d files for transfer." -msgstr[0] "Valgt %d fil til overførsel." -msgstr[1] "Valgt %d filer til overførsel." - -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 -#, c-format -msgid "Selected %d file. Total size: %s" -msgid_plural "Selected %d files. Total size: %s" -msgstr[0] "Valgt %d fil. Samlet størrelse: %s" -msgstr[1] "Valgt %d filer. Samlet størrelse: %s" - -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 -#, c-format -msgid "Selected %d file. Total size: At least %s" -msgid_plural "Selected %d files. Total size: At least %s" -msgstr[0] "Valgt %d fil. Samlet størrelse: Mindst %s" -msgstr[1] "Valgt %d filer. Samlet størrelse: Mindst %s" - -#: ../../locales/../src/interface/search.cpp:485 -#, c-format -msgid "Selected %s and %s for transfer." -msgstr "Valgt %s og %s til overførsel." - -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 -#, c-format -msgid "Selected %s and %s. Total size: %s" -msgstr "Valgt %s og %s. Samlet størrelse: %s" - -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 -#, c-format -msgid "Selected %s and %s. Total size: At least %s" -msgstr "Valgt %s og %s. Samlet størrelse: Mindst %s" - -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 -msgid "Selected editor does not exist." -msgstr "Den valgte editor findes ikke." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 -msgid "Selected file already being edited" -msgstr "Den valgte fil redigeres allerede" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 -msgid "Selected file is already loaded" -msgstr "Den valgte fil er allerede indlæst" - -#: ../../locales/../src/interface/edithandler.cpp:1648 -msgid "Selected file is already opened" -msgstr "Den valgte fil er allerede åbnet" - -#: ../../locales/../src/interface/edithandler.cpp:1720 -msgid "Selected file is still being edited" -msgstr "Den valgte fil redigeres stadig" - -#: ../../locales/../src/interface/filter.cpp:304 -msgid "Selected filter only works for local files." -msgstr "Det valgte filter fungerer kun for lokale filer." - -#: ../../locales/../src/interface/menu_bar.cpp:304 -msgid "" -"Selected global bookmark and current server use a different server type.\n" -"Use site-specific bookmarks for this server." -msgstr "" -"Det valgte globale bogmærke og den aktuelle server anvender forskellige " -"servertyper.\n" -"Anvend sted-specifikke bogmærker for denne server." - -#: ../../locales/../src/engine/engineprivate.cpp:291 -msgid "Selected port usually in use by a different protocol." -msgstr "Den valgte port er som regel brugt af anden protokol." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 -msgid "Send FTP &keep-alive commands" -msgstr "Send FTP &keep alive-kommandoer" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 -msgid "Send custom command to the server otherwise not available" -msgstr "Send kommandoer til serveren, der ellers ikke er til rådighed" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 -msgid "Sending keep-alive command" -msgstr "Sender keep-alive-kommando" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 -msgid "Serial number:" -msgstr "Serienummer:" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 -msgid "Server &Type:" -msgstr "Servert&ype:" - -#: ../../locales/../src/engine/tlssocket.cpp:743 -msgid "Server did not properly shut down TLS connection" -msgstr "Serveren lukkede ikke TLS-forbindelsen korrekt ned" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 -msgid "Server does not support non-ASCII characters." -msgstr "Serveren understøtter ikke tegn uden for ASCII-tegnsættet." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 -#, c-format -msgid "Server does not support resume of files > %d GB." -msgstr "Serveren understøtter ikke genoptagelse af hentning af filer > %d GB." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 -#, c-format -msgid "" -"Server does not support resume of files > %d GB. End transfer since file " -"sizes match." -msgstr "" -"Serveren understøtter ikke genoptagelse af hentning af filer > %d GB. Afslut " -"overførslen, da filstørrelserne svarer til hinanden." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 -msgid "Server does not support resume of files > 2GB." -msgstr "Serveren understøtter ikke genoptagelse af hentning af filer > 2 GB." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 -msgid "Server does not support resume of files > 4GB." -msgstr "Serveren understøtter ikke genoptagelse af hentning af filer > 4 GB." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 -#, c-format -msgid "" -"Server may not support resume of files > %d GB. End transfer since file " -"sizes match." -msgstr "" -"Serveren understøtter måske ikke genoptagelse af hentning af filer > %d GB. " -"Afslut overførslen, da filstørrelserne svarer til hinanden." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 -msgid "" -"Server might require an account. Try specifying an account using the Site " -"Manager" -msgstr "" -"Serveren kræver muligvis en konto. Prøv at angive en konto vha. Websted " -"Manager" - -#: ../../locales/../src/engine/ControlSocket.cpp:345 -msgid "Server returned empty path." -msgstr "Serveren sendte en tom sti." - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 -msgid "" -"Server sent an additional login prompt. You need to use the interactive " -"login type." -msgstr "" -"Serveren bad om endnu et login. Du skal anvende den interaktive login-type." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 -msgid "Server sent passive reply with unroutable address. Passive mode failed." -msgstr "" -"Serveren sendte passivt svar med en adresse, der ikke kan routes. Passiv " -"tilstand fejlede." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 -msgid "" -"Server sent passive reply with unroutable address. Using server address " -"instead." -msgstr "" -"Serveren sendte passivt svar med en adresse, der ikke kan routes. Anvender " -"serveradressen istedet." - -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 -msgid "Server sent unexpected reply." -msgstr "Serveren sendte et uventet svar." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 -msgid "Server to client MAC:" -msgstr "Server til klient-MAC:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 -msgid "Server to client cipher:" -msgstr "Server-til-klient-kode:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 -msgid "Server&type:" -msgstr "Servert&ype:" - -#: ../../locales/../src/interface/queue.cpp:1210 -msgid "Server/Local file" -msgstr "Server/Lokal fil" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 -msgid "Server:" -msgstr "Server:" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 -msgid "Session details" -msgstr "Sessionsdetaljer" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 -msgid "Set &Priority" -msgstr "Sæt &prioritet" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 -#, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Sæt tilladelser for '%s' til '%s'" - -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize blev kaldt uden socket" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 -msgid "Settings" -msgstr "Indstillinger" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 -msgid "Settings directory:" -msgstr "Mappe til indstillinger:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 -msgid "Show &raw directory listing" -msgstr "Vis &rå mappeliste" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 -msgid "Show &welcome dialog..." -msgstr "Vis &velkomstdialog..." - -#: ../../locales/../src/interface/Mainfrm.cpp:2170 -msgid "Show both directory trees and continue comparing?" -msgstr "Vis begge mappetræer, og fortsæt med at sammenligne?" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 -msgid "Show details" -msgstr "Vis detaljer" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 -msgid "Show details about custom date and time formats" -msgstr "Vis detaljer om brugerdefineret format for dato og klokkeslæt" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 -msgid "Shows available TLS ciphers" -msgstr "Viser tilgængelige TLS-koder" - -#: ../../locales/../src/interface/cmdline.cpp:6 -msgid "Shows this help dialog" -msgstr "Viser denne hjælpedialog" - -#: ../../locales/../src/interface/QueueView.cpp:3043 -msgid "Shutdown now" -msgstr "Luk ned nu" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 -msgid "Signature algorithm:" -msgstr "Signaturalgoritme:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 -msgid "Site &Manager entries" -msgstr "Websted Manager liste" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 -msgid "Site Manager" -msgstr "Websted Manager" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 -msgid "Site Manager - Cannot remember password" -msgstr "Websted Manager - har glemt adgangskode" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 -msgid "Site Manager - Invalid data" -msgstr "Websted Manager - ugyldige data" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 -msgid "Site Manager already open" -msgstr "Websted Manager allerede åben" - -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 -msgid "Site does not exist." -msgstr "Stedet findes ikke." - -#: ../../locales/../src/interface/sitemanager.cpp:411 -msgid "Site path has to begin with 0 or 1." -msgstr "Websted-stien skal begynde med 0 eller 1." - -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 -msgid "Site path is malformed." -msgstr "Stedstien er ikke skrevet korrekt." - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 -msgid "Site-specific bookmarks" -msgstr "Sted-specifikke bogmærker" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -msgid "" -"Site-specific bookmarks require the server to be stored in the Site " -"Manager.\n" -"Add current connection to the site manager?" -msgstr "" -"Sted-specifikke bogmærker kræver, at serveren er gemt i Websted Manager.\n" -"Tilføj aktuelle forbindelse i Websted Manager?" - -#: ../../locales/../src/interface/queue.cpp:1210 -msgid "Size" -msgstr "Størrelse" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 -msgid "Size formatting" -msgstr "Størrelsesformatering" - -#: ../../locales/../src/interface/fileexistsdlg.cpp:43 -msgid "Size unknown" -msgstr "Størrelse ukendt" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 -msgid "Skip file" -msgstr "Overspring fil" - -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 -#, c-format -msgid "Skipping download of %s" -msgstr "Springer download af %s over" - -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 -#, c-format -msgid "Skipping upload of %s" -msgstr "Springer upload af %s over" - -#: ../../locales/../src/engine/socket.cpp:1047 -msgid "Socket address outside address space" -msgstr "Socket-adressen er uden for adresseområdet" - -#: ../../locales/../src/engine/socket.cpp:1049 -msgid "Socket already connected" -msgstr "Socket allerede tilsluttet" - -#: ../../locales/../src/engine/socket.cpp:1057 -msgid "Socket has been shut down" -msgstr "Socket er lukket ned" - -#: ../../locales/../src/engine/socket.cpp:1054 -msgid "Socket not connected" -msgstr "Socket ikke tilsluttet" - -#: ../../locales/../src/engine/socket.cpp:1097 -msgid "Socket type not supported for address family" -msgstr "Socket-typen er ikke understøttet for denne adressefamilie" - -#: ../../locales/../src/interface/Mainfrm.cpp:1158 -msgid "Some files are still being edited or need to be uploaded." -msgstr "Nogle filer er stadig under redigering, eller skal uploades." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 -msgid "" -"Some misconfigured remote servers which are behind a router, may reply with " -"their local IP address." -msgstr "" -"Servere, som står bag en router, kan være fejlkonfigurerede til at svare med " -"deres lokale IP-adresser." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 -msgid "Sort directories inline" -msgstr "Sorter alfabetisk" - -#: ../../locales/../src/interface/filelistctrl.cpp:466 -msgid "Sort order cannot be changed if comparing directories." -msgstr "Sorteringsorden kan ikke ændres når du sammenligner mapper." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 -msgid "Sorting" -msgstr "Sortering" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 -msgid "Sorting &mode:" -msgstr "Sorterings&metode:" - -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 -msgid "Source and path of the drop operation are identical" -msgstr "Kilde og sti er ens" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -msgid "Source and target file may not be the same" -msgstr "Kilde- og destinationsfil må ikke være ens" - -#: ../../locales/../src/interface/RemoteListView.cpp:141 -msgid "Source and target of the drop operation are identical" -msgstr "Kilde og destination" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 -msgid "Source file:" -msgstr "Kildefil:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 -msgid "Speed Limits" -msgstr "Hastighedsgrænser" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 -msgid "Speed limits" -msgstr "Hastighedsgrænser" - -#: ../../locales/../src/interface/statusbar.cpp:575 -msgid "Speed limits are disabled, click to change." -msgstr "Hastighedsgrænser er slået fra - klik for at ændre." - -#: ../../locales/../src/interface/statusbar.cpp:578 -msgid "Speed limits are enabled, click to change." -msgstr "Hastighedsgrænser er slået til - klik for at ændre." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 -msgid "Stable and beta versions" -msgstr "Stabile og betaversioner" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 -msgid "Stable versions only" -msgstr "Kun stabile versioner" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 -msgid "Stable, beta and nightly versions" -msgstr "Stabile, betaversioner og daglige byg" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 -msgid "Start transfer &immediately" -msgstr "Start overførsel &straks" - -#: ../../locales/../src/interface/cmdline.cpp:7 -msgid "Start with opened Site Manager" -msgstr "Start med åben Websted Manager" - -#: ../../locales/../src/interface/updater.cpp:213 -#, c-format -msgid "Started update check on %s\n" -msgstr "Begyndte søgning efter opdateringer den %s\n" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 -#, c-format -msgid "Starting download of %s" -msgstr "Påbegynder download af %s" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 -#, c-format -msgid "Starting upload of %s" -msgstr "Påbegynder upload af %s" - -#: ../../locales/../src/interface/cmdline.cpp:9 -msgid "Starts the local site in the given path" -msgstr "Starter det lokale websted på den givne sti" - -#: ../../locales/../src/interface/verifycertdialog.cpp:249 -msgid "State or province:" -msgstr "Stat eller provins:" - -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 -msgid "Status" -msgstr "Status" - -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 -msgid "Status:" -msgstr "Status:" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 -msgid "Stop and remove &all" -msgstr "Stop og fjern &alle" - -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 -msgid "Stop recursive operation" -msgstr "Stands rekursiv handling" - -#: ../../locales/../src/interface/verifycertdialog.cpp:253 -msgid "Street:" -msgstr "Gade:" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 -msgid "Subject of certificate" -msgstr "Certifikat-type" - -#: ../../locales/../src/interface/queueview_successful.cpp:12 -msgid "Successful transfers" -msgstr "Gennemførte overførsler" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 -msgid "Summary of test results:" -msgstr "Opsummering af testresultater:" - -#: ../../locales/../src/interface/QueueView.cpp:3051 -msgid "Suspend now" -msgstr "Stop midlertidigt nu" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 -msgid "" -"Symlinks to files are not affected by this choice, such symlinks are always " -"deleted." -msgstr "" -"Symlink til filer påvirkes ikke af dette valg; sådanne symlinks slettes " -"altid." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 -msgid "Synchronized browsing" -msgstr "Synkroniseret bladring" - -#: ../../locales/../src/interface/state.cpp:371 -msgid "Synchronized browsing has been disabled." -msgstr "Synkroniseret bladring er slået fra." - -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 -msgid "Syntax error" -msgstr "Syntaksfejl" - -#: ../../locales/../src/interface/cmdline.cpp:76 -#: ../../locales/../src/interface/cmdline.cpp:82 -#: ../../locales/../src/interface/cmdline.cpp:88 -#: ../../locales/../src/interface/cmdline.cpp:97 -#: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 -msgid "Syntax error in command line" -msgstr "Syntaksfejl i kommandolinie" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 -msgid "System" -msgstr "System" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 -msgid "System details" -msgstr "Systemdetaljer" - -#: ../../locales/../src/engine/socket.cpp:1038 -msgid "System limit of open files exceeded" -msgstr "Systembegrænsning på antal åbne filer overskredet" - -#: ../../locales/../src/engine/socket.cpp:1095 -msgid "System's network subsystem has failed" -msgstr "Systemets netværksundersystem har fejlet" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 -msgid "T&oolbar" -msgstr "&Værktøjslinje" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 -msgid "TLS connection established, sending HTTP request" -msgstr "TLS-forbindelse etableret, sender HTTP-anmodning" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 -msgid "TLS connection established, waiting for welcome message..." -msgstr "TLS-forbindelse oprettet, venter på velkomstbesked..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 -msgid "TLS connection established." -msgstr "TLS-forbindelse etableret." - -#: ../../locales/../src/engine/proxy.cpp:522 -msgid "TTL expired" -msgstr "TTL udløbet" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:6 -msgid "Target file already exists" -msgstr "Destinationsfil findes allerede" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 -msgid "Target file:" -msgstr "Destinationsfil:" - -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -msgid "Target filename already exists!" -msgstr "Destinationsfilnavnet findes allerede!" - -#: ../../locales/../src/interface/RemoteListView.cpp:1596 -msgid "Target filename already exists, really continue?" -msgstr "Destinationsfil findes allerede, ønsker du virkelig at fortsætte?" - -#: ../../locales/../src/engine/socket.cpp:1068 -msgid "Temporary failure in name resolution" -msgstr "Midlertidig fejl i navneopløsning" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 -msgid "Test results" -msgstr "Testresultater" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 -msgid "Testing resume capabilities of server" -msgstr "Tester serverens funktioner til genoptagelse af hentning" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 -msgid "The Site Manager cannot be used unless the file gets repaired." -msgstr "Websted Manager kan ikke anvendes, medmindre filen bliver repareret." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 -msgid "" -"The Site Manager is opened in another instance of FileZilla 3.\n" -"Do you want to continue? Any changes made in the Site Manager won't be saved " -"then." -msgstr "" -"Websted Manager er åben i en anden instans af FileZilla 3.\n" -"Ønsker du at fortsætte? Evt. ændringer i Websted Manager vil i så tilfælde " -"ikke blive gemt." - -#: ../../locales/../src/interface/clearprivatedata.cpp:103 -msgid "" -"The Site Manager is opened in another instance of FileZilla 3.\n" -"Please close it or the data cannot be deleted." -msgstr "" -"Websted Manager er åben i en anden instans af FileZilla 3.\n" -"Luk den venligst eller det valgte kan ikke slettes." - -#: ../../locales/../src/interface/netconfwizard.cpp:627 -#, c-format -msgid "The address you entered was: %s" -msgstr "Den indtastede adresse var: %s" - -#: ../../locales/../src/engine/socket.cpp:1074 -msgid "The ai_family member is not supported" -msgstr "Dette medlem i ai_family er ikke understøttet" - -#: ../../locales/../src/engine/socket.cpp:1087 -msgid "The ai_socktype member is not supported" -msgstr "Ai-socktype-medlemmet ikke understøttet" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 -msgid "The bookmark could not be added." -msgstr "Bogmærket kunne ikke tilføjes." - -#: ../../locales/../src/interface/sitemanager.cpp:742 -msgid "The bookmarks could not be cleared." -msgstr "Bogmærkerne kunne ikke ryddes." - -#: ../../locales/../src/interface/statusbar.cpp:464 -msgid "The connection is encrypted. Click icon for details." -msgstr "Forbindelsen er krypteret. Klik på ikonet for flere oplysninger." - -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 -msgid "" -"The custom date format is invalid or contains unsupported format specifiers." -msgstr "" -"Det brugerdefinerede datoformat er ugyldigt eller indeholder " -"formatangivelser, der ikke er understøttede." - -#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 -msgid "The custom login sequence cannot be empty." -msgstr "Den brugerdefinerede login-sekvens må ikke være tom." - -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 -msgid "" -"The custom time format is invalid or contains unsupported format specifiers." -msgstr "" -"Det brugerdefinerede klokkeslætformat er ugyldigt eller indeholder " -"formatangivelser, der ikke er understøttede." - -#: ../../locales/../src/engine/transfersocket.cpp:141 -#, c-format -msgid "The data connection could not be established: %s" -msgstr "Dataforbindelsen kunne ikke etableres: %s" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 -msgid "The default editor for text files could not be found." -msgstr "Kunne ikke finde standard-editoren for tekstfiler." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 -#, c-format -msgid "The default editor for text files is '%s'." -msgstr "Standard-editoren for tekstfiler er '%s'." - -#: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -msgid "The entered filter name already exists, please choose a different name." -msgstr "Det angivne filternavn findes allerede. Vælg et andet navn." - -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 -#, c-format -msgid "The extension '%s' does already exist in the list" -msgstr "Filtypenavnet '%s' findes allerede i listen" - -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 -#, c-format -msgid "" -"The file %s already exists.\n" -"Please enter a new name:" -msgstr "" -"Filen %s findes allerede.\n" -"Angiv et nyt navn:" - -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 -#, c-format -msgid "" -"The file '%s' cannot be opened:\n" -"The associated program (%s) could not be found.\n" -"Please check your filetype associations." -msgstr "" -"Filen '%s' kan ikke åbnes:\n" -"Kunne ikke finde det tilknyttede program (%s).\n" -"Kontroller dine filtypetilknytninger." - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 -#, c-format -msgid "" -"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " -"FileZilla only supports SSH2 keys." -msgstr "" -"Filen '%s' indeholder en SSH1-nøgle. Anvendelse af SSH1-protokollen " -"frarådes, og FileZilla understøtter kun SSH2-nøgler." - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 -#, c-format -msgid "The file '%s' could not be loaded or does not contain a private key." -msgstr "Filen '%s' kunne ikke indlæses eller indeholder ikke en privat nøgle." - -#: ../../locales/../src/interface/xmlfunctions.cpp:42 -#, c-format -msgid "The file '%s' could not be loaded." -msgstr "Filen '%s' kunne ikke indlæses." - -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#, c-format -msgid "" -"The file '%s' could not be opened:\n" -"No program has been associated on your system with this file type." -msgstr "" -"Filen '%s' kunne ikke åbnes:\n" -"Intet program i dit system er associeret med denne filtype." - -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 -#, c-format -msgid "" -"The file '%s' could not be opened:\n" -"The associated command failed" -msgstr "" -"Filen '%s' kunne ikke åbnes:\n" -"Den associerede kommando fejlede" - -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 -#, c-format -msgid "" -"The file '%s' has been created by a more recent version of FileZilla.\n" -"Loading files created by newer versions can result in loss of data.\n" -"Do you want to continue?" -msgstr "" -"Filen '%s' blev oprettet af en nyere version af FileZilla.\n" -"Indlæsning af filer, der er oprettet af nyere versioner, kan forårsage " -"datatab.\n" -"Ønsker du at fortsætte?" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 -#, c-format -msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"Would you like to convert it into a supported format?" -msgstr "" -"Filen '%s' er ikke i et format, der er understøttet af FileZilla.\n" -"Ønsker du at konvertere den til et understøttet format?" - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 -msgid "The file selected as default editor does not exist." -msgstr "Den fil, der er valgt som standard-editor, findes ikke." - -#: ../../locales/../src/interface/import.cpp:86 -msgid "" -"The file you have selected contains site manager data from a previous " -"version of FileZilla.\n" -"Due to differences in the storage format, only host, port, username and " -"password will be imported.\n" -"Continue with the import?" -msgstr "" -"Filen du har valgt indeholder Websted Manager data fra en tidligere version " -"af FileZilla.\n" -"På grund af forskelle i formatet, vil kun vært, port, brugernavn og kode " -"blive importeret.\n" -"Fortsæt med at importere?" - -#: ../../locales/../src/interface/listctrlex.cpp:756 -msgid "The filename column can neither be hidden nor moved." -msgstr "Filnavn-kolonnen kan hverken skjules eller flyttes." - -#: ../../locales/../src/interface/listctrlex.cpp:809 -msgid "The filename column cannot be hidden." -msgstr "Filnavn-kolonnen kan ikke skjules." - -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 -#, c-format -msgid "The following character will be replaced: %s" -msgstr "Følgende tegn vil blive erstattet: %s" - -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:66 -#, c-format -msgid "The following characters will be replaced: %s" -msgstr "Følgende tegn vil blive erstattet: %s" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Følgende filer redigeres aktuelt:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 -msgid "The free open source FTP solution" -msgstr "Den gratis open source FTP-løsning" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 -msgid "The global bookmarks could not be saved." -msgstr "De globale bogmærker kunne ikke gemmes." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 -msgid "" -"The higher the debug level, the more information will be displayed in the " -"message log. Displaying debug information has a negative impact on " -"performance." -msgstr "" -"Jo højere debug-niveau, jo flere oplysninger vises i beskedloggen. Det har " -"en negativ effekt på ydelsen at vise debug-information." - -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 -msgid "The limit needs to be between 1 and 2000 MiB" -msgstr "Grænsen skal ligge mellem 1 og 2000 MB" - -#: ../../locales/../src/interface/state.cpp:973 -#, c-format -msgid "The local directory '%s' could not be created." -msgstr "Den lokale mappe '%s' kunne ikke oprettes." - -#: ../../locales/../src/interface/state.cpp:958 -#, c-format -msgid "The local directory '%s' does not exist." -msgstr "Den lokale mappe '%s' findes ikke." - -#: ../../locales/../src/interface/state.cpp:250 -#, c-format -msgid "" -"The local directory '%s' is not below the synchronization root (%s).\n" -"Disable synchronized browsing and continue changing the local directory?" -msgstr "" -"Den aktuelle lokale mappe (%s) er ikke under sykroniseringsroden (%s).\n" -"Slå synkroniseret bladring fra, og fortsæt med at skifte lokal mappe?" - -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 -msgid "" -"The lowest available port has to be less or equal than the highest available " -"port." -msgstr "" -"Den lavest tilgængelige port skal være mindre end eller lig med den højest " -"tilgængelige port." - -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 -msgid "The new version could not be downloaded, please retry later." -msgstr "Den nye version kunne ikke hentes, prøv igen senere." - -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 -msgid "The new version has been saved in your Downloads directory." -msgstr "Den nye version er gemt i din Overførsler-mappe." - -#: ../../locales/../src/interface/QueueView.cpp:1823 -msgid "The queue will not be saved." -msgstr "Køen vil ikke blive gemt." - -#: ../../locales/../src/interface/state.cpp:885 -#, c-format -msgid "The remote directory '%s' does not exist." -msgstr "Fjernmappen '%s' findes ikke." - -#: ../../locales/../src/interface/state.cpp:929 -#, c-format -msgid "" -"The remote directory '%s' is not below the synchronization root (%s).\n" -"Disable synchronized browsing and continue changing the remote directory?" -msgstr "" -"Fjernmappen (%s) er ikke under sykroniseringsroden (%s).\n" -"Slå synkroniseret bladring fra, og fortsæt med at skifte fjernmappe?" - -#: ../../locales/../src/interface/import.cpp:76 -msgid "The selected categories have been imported." -msgstr "De valgte kategorier blev importeret." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 -msgid "" -"The selected file contains importable data for the following categories:" -msgstr "Den valgte fil indeholder importerbar data for følgende kategorier:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 -msgid "The selected file is already being edited:" -msgstr "Den valgte fil er allerede under redigering:" - -#: ../../locales/../src/interface/edithandler.cpp:1720 -msgid "" -"The selected file is still opened in some other program, please close it." -msgstr "Den valgte fil er stadig åben i et andet program - luk den." - -#: ../../locales/../src/interface/edithandler.cpp:1626 -msgid "" -"The selected file would be executed directly.\n" -"This can be dangerous and might damage your system.\n" -"Do you really want to continue?" -msgstr "" -"Den valgte fil vil blive eksekveret direkte.\n" -"Dette kan være farligt, og kan skade dit system.\n" -"Ønsker du virkelig at fortsætte?" - -#: ../../locales/../src/interface/sitemanager.cpp:566 -msgid "The server could not be added." -msgstr "Serveren kunne ikke tilføjes." - -#: ../../locales/../src/interface/netconfwizard.cpp:583 -msgid "The server sent an unexpected or unrecognized reply." -msgstr "Serveren sendte et uventet svar eller et, der ikke kan genkendes." - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 -msgid "The server uses following charset encoding for filenames:" -msgstr "Serveren anvender følgende tegnsæt-indkodning til filnavne:" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 -msgid "" -"The server's certificate is unknown. Please carefully examine the " -"certificate to make sure the server can be trusted." -msgstr "" -"Serverens certifikat er ukendt. Undersøg venligst certifikatet grundigt, så " -"du er sikker på at serveren er sikker." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 -msgid "" -"The server's host key does not match the key that has been cached. This " -"means that either the administrator has changed the host key, or you are " -"actually trying to connect to another computer pretending to be the server." -msgstr "" -"Serverens værtsnøgle svarer ikke til den nøgle, der er blevet cachet. Dette " -"betyder enten, at administratoren har ændret servernøglen, eller at du " -"faktisk forsøger at tilslutte dig til en anden compter, der lader som om den " -"er serveren." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 -msgid "" -"The server's host key is unknown. You have no guarantee that the server is " -"the computer you think it is." -msgstr "" -"Serverens værtsnøgle er ukendt. Der er ingen garanti for, at serveren er den " -"computer, som du tror den er." - -#: ../../locales/../src/engine/socket.cpp:1086 -msgid "The servname parameter is not supported for ai_socktype" -msgstr "Servname-parameteren er ikke understøttet for ai_socktype" - -#: ../../locales/../src/interface/import.cpp:73 -msgid "" -"The settings have been imported. You have to restart FileZilla for all " -"settings to have effect." -msgstr "" -"Indstillingerne er blevet importeret. Du skal genstarte FileZilla før " -"indstillingerne træder i kraft." - -#: ../../locales/../src/engine/socket.cpp:1034 -msgid "The specified address family is not supported" -msgstr "Den angivne adressefamilie ikke understøttet" - -#: ../../locales/../src/engine/socket.cpp:1099 -msgid "The specified network name is no longer available" -msgstr "Det angivne netværksnavn er ikke længere til rådighed" - -#: ../../locales/../src/interface/QueueView.cpp:3046 -msgid "The system will soon reboot unless you click Cancel." -msgstr "Systemet genstartes snart, medmindre du klikker på Annuller." - -#: ../../locales/../src/interface/QueueView.cpp:3042 -msgid "The system will soon shut down unless you click Cancel." -msgstr "Systemet lukkes snart ned, medmindre du klikker på Annuller." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 -msgid "" -"The target file already exists.\n" -"Please choose an action." -msgstr "" -"Destinationsfilen findes allerede.\n" -"Vælg en handling." - -#: ../../locales/../src/interface/netconfwizard.cpp:846 -msgid "The test did not succeed. Do you really want to save the settings?" -msgstr "Testen mislykkedes. Ønsker du virkelig at gemme indstillingerne?" - -#: ../../locales/../src/interface/xmlfunctions.cpp:78 -#, c-format -msgid "The valid backup file %s could not be restored" -msgstr "Den gyldige backup-fil '%s' kunne ikke genoprettes" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 -msgid "Themes" -msgstr "Temaer" - -#: ../../locales/../src/interface/filter.cpp:444 -msgid "This filter set cannot be removed." -msgstr "Dette filtersæt kan ikke fjernes." - -#: ../../locales/../src/interface/filter.cpp:384 -msgid "This filter set cannot be renamed." -msgstr "Dette filtersæt kan ikke omdøbes." - -#: ../../locales/../src/interface/netconfwizard.cpp:584 -msgid "" -"This means that some router and/or firewall is still interfering with " -"FileZilla." -msgstr "" -"Dette betyder, at en router og/eller firewall stadig forstyrrer FileZilla." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:183 -msgid "" -"This only works if you are not behind a router, else your system would just " -"return your internal address." -msgstr "" -"Dette virker kun, hvis du ikke er bag en router. Ellers vil dit system blot " -"returnere din interne adresse." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 -msgid "" -"This wizard will help you to properly configure any routers and firewalls " -"you have and tests your configuration." -msgstr "" -"Denne assistent hjælper til at konfigurere evt. routere og firewalls, du " -"måtte have, og tester din konfiguration." - -#: ../../locales/../src/interface/queue.cpp:1210 -msgid "Time" -msgstr "Tidspunkt" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 -msgid "Time formatting" -msgstr "Klokkeslætformatering" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 -msgid "Time&out in seconds:" -msgstr "&Timeout i sekunder:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 -msgid "Timeout" -msgstr "Timeout" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Serverens tidszoneforskydning er %d sekunder." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -msgid "Title:" -msgstr "Titel:" - -#: ../../locales/../src/interface/Mainfrm.cpp:2168 -msgid "To compare directories, both file lists have to be aligned." -msgstr "For at sammenligne mapper skal begge fil-lister samstemmes." - -#: ../../locales/../src/interface/Mainfrm.cpp:2169 -msgid "To do this, the directory trees need to be both shown or both hidden." -msgstr "" -"For at gøre dette skal begge mappetræer være vist eller begge være skjult." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 -msgid "" -"To support public key authentication, FileZilla needs to know the private " -"keys to use." -msgstr "" -"For at understøtte validering med offentlig nøgle skal FileZilla vide, " -"hvilke private nøgler der skal bruges." - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 -msgid "" -"Toggle directory comparison. Right-click to change comparison mode.\n" -"\n" -"Colors:\n" -"Yellow: File only exists on one side\n" -"Green: File is newer than the unmarked file on other side\n" -"Red: File sizes different" -msgstr "" -"Skift mappesammenligning. Højreklik for at ændre sammenligningsmetode.\n" -"\n" -"Farver:\n" -"Gul: Filen findes kun på den ene side\n" -"Grøn: Filen er nyere end den umarkerede fil på den anden side\n" -"Rød: Filstørrelser er forskellige" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 -msgid "" -"Toggle synchronized browsing.\n" -"If enabled, navigating the local directory hierarchy will also change the " -"directory on the server accordingly and vice versa." -msgstr "" -"Slå synkroniseret bladring til/fra.\n" -"Når slået til, vil navigering i det lokale mappetræ skifte til de " -"tilsvarende mapper på serveren, og omvendt." - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 -msgid "Toggles processing of the transfer queue" -msgstr "Slå behandling af overførselskøen til eller fra" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 -msgid "Toggles the display of the local directory tree" -msgstr "Slå visning af det lokale mappetræ til eller fra" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 -msgid "Toggles the display of the message log" -msgstr "Slå visning af beskedloggen til eller fra" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 -msgid "Toggles the display of the remote directory tree" -msgstr "Slå visning af fjernstedets mappetræ til eller fra" - -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 -msgid "Toggles the display of the transfer queue" -msgstr "Slå visning af overførselskøen til eller fra" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 -msgid "Too long header line" -msgstr "Header-linie for lang" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 -msgid "Too many redirects" -msgstr "For mange omdirigeringer" - -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 -msgid "Trace:" -msgstr "Spor:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 -msgid "Transfer" -msgstr "Overfør" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 -msgid "Transfer &direction" -msgstr "Overførsels&retning" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 -msgid "Transfer &type" -msgstr "Overførsels&type" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 -msgid "Transfer Mode" -msgstr "Overførselstilstand" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 -msgid "Transfer Queue" -msgstr "Overførselskø" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 -msgid "Transfer Settings" -msgstr "Overførselsindstillinger" - -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 -#, c-format -msgid "Transfer connection interrupted: %s" -msgstr "Overførselsforbindelsen afbrudt: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:630 -msgid "Transferred data got tainted." -msgstr "Overførte data er forstyrret." - -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 -msgid "Transferring" -msgstr "Overfører" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 -msgid "Transfers" -msgstr "Overførsler" - -#: ../../locales/../src/interface/QueueView.cpp:2929 -msgid "Transfers finished" -msgstr "Overførsler afsluttet" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 -msgid "Treat files &without extension as ASCII file" -msgstr "Behandl filer uden fil&typenavn som ASCII-filer" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 -msgid "Treat the &following filetypes as ASCII files:" -msgstr "Behandl &følgende filtyper som ASCII-filer:" - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 -msgid "Trust changed Hostkey:" -msgstr "Stol på ændret værtsnøgle:" - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 -msgid "Trust new Hostkey:" -msgstr "Stol på ny værtsnøgle:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 -msgid "Trust the new key and carry on connecting?" -msgstr "Hav tillid til den nye nøgle, og fortsæt tilslutning?" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 -msgid "Trust this certificate and carry on connecting?" -msgstr "Hav tillid til dette certifikat, og fortsæt tilslutning?" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 -msgid "Trust this host and carry on connecting?" -msgstr "Hav tillid til denne vært, og fortsæt tilslutning?" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 -msgid "Try again" -msgstr "Prøv igen" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 -msgid "Type" -msgstr "Type" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 -msgid "Type of FTP Proxy:" -msgstr "Type af FTP-proxy:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 -msgid "Type of generic proxy:" -msgstr "Type af generisk proxy:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 -msgid "U&pload" -msgstr "U&pload" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 -msgid "U&pload limit:" -msgstr "U&pload-grænse:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 -msgid "U&se filetype associations if available" -msgstr "B&rug filtypeassociationer hvor muligt" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults for current language" -msgstr "&Brug systemets standarder for det aktuelle sprog" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 -msgid "USER@&HOST" -msgstr "BRUGER@&VÆRT" - -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 -#, c-format -msgid "Unassigned error code %d" -msgstr "Ukendt fejlkode %d" - -#: ../../locales/../src/interface/verifycertdialog.cpp:246 -msgid "Unit:" -msgstr "Enhed:" - -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 -msgid "Unknown" -msgstr "Ukendt" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 -msgid "Unknown FTP proxy type, cannot generate login sequence." -msgstr "Ukendt FTP-proxy-type, kan ikke generere login-sekvens." - -#: ../../locales/../src/engine/proxy.cpp:452 -#, c-format -msgid "Unknown SOCKS protocol version: %d" -msgstr "Ukendt version af SOCKS-protokol: %d" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:4 -msgid "Unknown certificate" -msgstr "Ukendt certifikat" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 -msgid "Unknown host key" -msgstr "Ukendt værtsnøgle" - -#: ../../locales/../src/engine/proxy.cpp:460 -#, c-format -msgid "" -"Unknown protocol version of SOCKS Username/Password Authentication " -"subnegotiation: %d" -msgstr "" -"Ukendt protokolversion ved subnegotiering af SOCKS brugernavn/adgangskode-" -"validering: %d" - -#: ../../locales/../src/interface/xmlfunctions.cpp:304 -msgid "" -"Unknown root element, the file does not appear to be generated by FileZilla." -msgstr "" -"Ukendt rodelement - filen ser ikke ud til at være genereret af FileZilla." - -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -msgid "" -"Unless these problems get fixed, active mode FTP will not work and passive " -"mode has to be used." -msgstr "" -"Medmindre disse problemer løses, vil FTP i aktiv tilstand ikke fungere, og " -"du skal anvende passiv tilstand." - -#: ../../locales/../src/interface/netconfwizard.cpp:592 -msgid "" -"Unless this problem gets fixed, active mode FTP will not work and passive " -"mode has to be used." -msgstr "" -"Medmindre dette problem løses, vil FTP i aktiv tilstand ikke fungere, og du " -"skal anvende passiv tilstand." - -#: ../../locales/../src/engine/tlssocket.cpp:1098 -msgid "Unsupported certificate type" -msgstr "Certifikat-type ikke understøttet" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 -msgid "Unsupported redirect" -msgstr "Omdirigering ikke understøttet" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 -msgid "Up&load and unedit" -msgstr "Up&load og ophæv redigering" - -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 -msgid "Updates" -msgstr "Opdateringer" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 -msgid "Upload" -msgstr "Upload" - -#: ../../locales/../src/interface/edithandler.cpp:1108 -msgid "Upload failed" -msgstr "Upload fejlede" - -#: ../../locales/../src/interface/statusbar.cpp:586 -#, c-format -msgid "Upload limit: %s/s" -msgstr "Upload-grænse: %s/s" - -#: ../../locales/../src/interface/statusbar.cpp:588 -msgid "Upload limit: none" -msgstr "Upload-grænse: ingen" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 -msgid "Upload selected directory" -msgstr "Upload valgte mappe" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 -msgid "Upload selected files and directories" -msgstr "Upload valgte filer og mapper" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 -msgid "Upload this file back to the server?" -msgstr "Upload denne fil tilbage til serveren?" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 -msgid "Upload this file to the server?" -msgstr "Upload denne fil til serveren?" - -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 -msgid "Uploading" -msgstr "Uploader" - -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 -msgid "Uploading and pending removal" -msgstr "Uploader og afventer fjernelse" - -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 -msgid "Uploading and unediting" -msgstr "Uploader og ophæver redigering" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 -msgid "Use &custom charset" -msgstr "Anvend &brugerdef. tegnsæt" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 -msgid "Use &custom editor:" -msgstr "An&vend brugerdef. editor:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 -msgid "Use &default editor for text files" -msgstr "Brug &standard-editor til tekstfiler" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 -msgid "Use &synchronized browsing" -msgstr "Anvend &synkroniseret bladring" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 -msgid "Use UTF-8 if the server supports it, else use local charset." -msgstr "" -"Brug UTF-8, hvis serveren understøtter dette, ellers anvend lokalt tegnsæt." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 -msgid "Use default action" -msgstr "Brug standardhandling" - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 -msgid "Use explicit FTP over TLS if available" -msgstr "Anvend eksplicit FTP over TLS hvis det findes" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 -msgid "Use server currently connected to" -msgstr "Anvend server, der aktuelt er forbundet med" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 -msgid "Use server from site manager" -msgstr "Anvend server fra Websted Manager" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults for current language" -msgstr "Brug &systemets standarder for det aktuelle sprog" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 -msgid "Use the following IP address:" -msgstr "Brug følgende IP-adresse:" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 -msgid "Use the following port range:" -msgstr "Brug følgende interval af porte:" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 -msgid "Use the server's external IP address instead" -msgstr "Anvend serverens eksterne IP-adresse istedet" - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 -msgid "" -"Use this if you're behind a router and have a static external IP address." -msgstr "" -"Brug denne, hvis du er bag en router og har en statisk ekstern IP-adresse." - -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 -msgid "" -"Use this option if you have a dynamic IP address. FileZilla will contact the " -"above server once each session as soon as you use active mode for the first " -"time. Only the version of FileZilla you're using is submitted to the server." -msgstr "" -"Brug denne valgmulighed, hvis du har en dynamisk IP-adresse. FileZilla " -"kontakter ovennævnte server for hver session, første gang du anvender aktiv " -"tilstand. Kun oplysninger om din version af FileZilla sendes til serveren." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 -msgid "User:" -msgstr "Bruger:" - -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -msgid "Username cannot be a series of spaces" -msgstr "Brugernavn kan ikke bestå af en række mellemrum" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 -msgid "" -"Using the wrong charset can result in filenames not displaying properly." -msgstr "" -"Anvendelse af forkert tegnsæt kan bevirke, at filnavne ikke vises korrekt." - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 -msgid "Valid from:" -msgstr "Gyldig fra:" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 -msgid "Valid to:" -msgstr "Gyldig til:" - -#: ../../locales/../src/interface/cmdline.cpp:17 -msgid "Verbose log messages from wxWidgets" -msgstr "Log-meddelelser med mange ord fra wxWidgets" - -#: ../../locales/../src/engine/tlssocket.cpp:1148 -msgid "Verifying certificate..." -msgstr "Godkender certifikat..." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 -msgid "Very high" -msgstr "Meget høj" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 -msgid "View hidden option set, but unsupported by server" -msgstr "Se skjulte funktioner, som ikke understøttes af serveren" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 -msgid "View/Edit" -msgstr "Vis/Rediger" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 -msgid "Visible columns" -msgstr "Synlige kolonner" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 -msgid "W&rite" -msgstr "Sk&riv" - -#: ../../locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "Venter" - -#: ../../locales/../src/interface/queue.cpp:335 -msgid "Waiting for browsing connection" -msgstr "Venter på browser-forbindelse" - -#: ../../locales/../src/interface/queue.cpp:336 -msgid "Waiting for password" -msgstr "Venter på adgangskode" - -#: ../../locales/../src/interface/statuslinectrl.cpp:240 -msgid "Waiting for transfer to be cancelled" -msgstr "Venter på at annullere overførsel" - -#: ../../locales/../src/engine/engineprivate.cpp:229 -msgid "Waiting to retry..." -msgstr "Venter på at prøve igen..." - -#: ../../locales/../src/interface/netconfwizard.cpp:958 -msgid "Warning, ignoring data connection from wrong IP." -msgstr "Advarsel: Ignorerer dataforbindelse fra forkert IP." - -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 -msgid "" -"Warning, use nightly builds at your own risk.\n" -"No support is given for nightly builds.\n" -"Nightly builds may not work as expected and might even damage your system.\n" -"\n" -"Do you really want to check for nightly builds?" -msgstr "" -"Advarsel: Anvendelsen af daglige byg er for egen risiko.\n" -"Der ydes ingen support på daglige byg.\n" -"Daglige byg fungerer måske ikke som forventet, og kan måske endda skade dit " -"system.\n" -"\n" -"Ønsker du virkelig at søge efter daglige byg?" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 -msgid "Warning: Potential security breach!" -msgstr "Advarsel: Mulig sikkerhedsrisiko!" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 -msgid "Welcome to FileZilla" -msgstr "Velkommen til FileZilla" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 -msgid "What's new" -msgstr "Sidste nye" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 -msgid "What's new:" -msgstr "Sidste nye:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 -msgid "" -"When allowing FileZilla to remember passwords, you can reconnnect without " -"having to re-enter a password after restarting FileZilla." -msgstr "" -"Hvis du tillader FileZilla at huske adgangskoder, kan du oprette forbindelse " -"igen senere, efter at FileZilla har været lukket ned, uden at skulle " -"indtaste adgangskoden." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 -msgid "" -"When enabled, characters that are not supported by the local operating " -"system in filenames are replaced if downloading such a file." -msgstr "" -"Når denne funktion er slået til, vil tegn, der ikke understøttes af det " -"lokale operativsystem, blive erstattet i navnene på filer med sådanne tegn i " -"sig, når du henter dem." - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 -msgid "When st&arting a new connection while already connected:" -msgstr "Når du starter en ny &forbindelse, mens du allerede er forbundet:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 -msgid "Widescreen" -msgstr "Widescreen" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 -msgid "Would you like FileZilla to remember passwords?" -msgstr "Skal FileZilla huske adgangskoder?" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 -msgid "Wr&ite" -msgstr "Skr&iv" - -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 -msgid "Wrong external IP address" -msgstr "Forkert ekstern IP-adresse" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -msgid "Wrong line endings" -msgstr "Forkerte linieslut-tegn" - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 -msgid "Yes" -msgstr "Ja" - -#: ../../locales/../src/interface/netconfwizard.cpp:766 -msgid "" -"You appear to be using an IPv6-only host. This wizard does not support this " -"environment." -msgstr "" -"Det ser ud til, at du bruger en vært der kun anvender IPv6. Denne assistent " -"understøtter ikke dette miljø." - -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 -msgid "You are using the latest version of FileZilla." -msgstr "Du benytter den seneste version af FileZilla." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 -msgid "You can always open this dialog again through the help menu." -msgstr "Du kan altid åbne denne dialog igen via Hjælp-menuen." - -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 -msgid "You can download the latest version from the FileZilla website:" -msgstr "Du kan hente den seneste version fra FileZillas websted:" - -#: ../../locales/../src/engine/server.cpp:65 -msgid "You can leave the port field empty to use the default port." -msgstr "Du kan lade portfeltet stå tomt for at bruge standardporten." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 -msgid "" -"You can use an x at any position to keep the permission the original files " -"have." -msgstr "" -"Du kan bruge et x på en hvilken som helst position for at beholde de " -"oprindelige filers attributter." - -#: ../../locales/../src/interface/import.cpp:28 -msgid "You cannot import settings from FileZilla's own settings directory." -msgstr "" -"Du kan ikke importere indstillinger fra FileZillas egen mappe med " -"indstillinger." - -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 -msgid "" -"You cannot replace an invalid character with another invalid character. " -"Please enter a character that is allowed in filenames." -msgstr "" -"Du kan ikke erstatte et ugyldigt tegn med et andet ugyldigt tegn. Angive et " -"tegn, der er tilladt i filnavne." - -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 -msgid "You did not enter a new name for the file. Overwrite the file instead?" -msgstr "" -"Du angav ikke et nyt navn på filen. Vil du overskrive filen i stedet for?" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 -msgid "You have selected at least one symbolic link." -msgstr "Du har valgt mindst ét symbolsk link." - -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 -msgid "" -"You have selected more than 10 files for editing, do you really want to " -"continue?" -msgstr "" -"Du har valgt at ville redigere mere end 10 filer - ønsker du virkelig at " -"fortsætte?" - -#: ../../locales/../src/interface/LocalListView.cpp:1670 -msgid "" -"You have selected more than 10 files or directories to open, do you really " -"want to continue?" -msgstr "" -"Du har valgt at ville åbne mere end 10 filer eller mapper - ønsker du " -"virkelig at fortsætte?" - -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -msgid "You have to enter a hostname." -msgstr "Du skal angive et værtsnavn." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -msgid "You have to enter a key file path" -msgstr "Du skal angive en sti til nøglefilen" - -#: ../../locales/../src/interface/search.cpp:524 -msgid "You have to enter a local directory." -msgstr "Du skal angive en lokal mappe." - -#: ../../locales/../src/interface/netconfwizard.cpp:158 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 -msgid "You have to enter a valid IPv4 address." -msgstr "Du skal angive en gyldig IPv4-adresse." - -#: ../../locales/../src/interface/search.cpp:529 -msgid "You have to enter a writable local directory." -msgstr "Du skal angive en skrivbar lokal mappe." - -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -msgid "You have to enter an account name" -msgstr "Du skal angive et kontonavn" - -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -msgid "You have to specify a user name" -msgstr "Du skal angive et brugernavn" - -#: ../../locales/../src/interface/netconfwizard.cpp:631 -msgid "" -"You likely have a router or firewall which erroneously modified the " -"transferred data." -msgstr "" -"Din router eller firewall har sikkert ved en fejl ændret de overførte data." - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -msgid "You need to enter a name for the bookmark." -msgstr "Angiv et navn for bogmærket." - -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 -msgid "You need to enter a name for the log file." -msgstr "Angiv et navn for logfilen." - -#: ../../locales/../src/interface/edithandler.cpp:1472 -msgid "You need to enter a properly quoted command." -msgstr "Du skal angive en kommando med anførselstegn sat korrekt." - -#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 -msgid "You need to enter a proxy host." -msgstr "Du skal angive en proxy-vært." - -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 -msgid "You need to enter a proxy port in the range from 1 to 65535" -msgstr "Du skal angive en proxy-port mellem 1 og 65535" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -msgid "You need to enter at least one path, empty bookmarks are not supported." -msgstr "Du skal angive mindst én sti - tomme bogmærker er ikke tilladt." - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 -msgid "" -"You need to enter both a local and a remote path to enable synchronized " -"browsing for this bookmark." -msgstr "" -"Du skal angive både en lokal sti og en fjernsti for at slå synkroniseret " -"bladring til for dette bogmærke." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -msgid "" -"You need to enter both a local and a remote path to enable synchronized " -"browsing for this site." -msgstr "" -"Du skal angive både en lokal sti og en fjernsti for at slå synkroniseret " -"bladring til for dette websted." - -#: ../../locales/../src/interface/manual_transfer.cpp:303 -msgid "You need to specify a local file." -msgstr "Du skal angive en lokal fil." - -#: ../../locales/../src/interface/manual_transfer.cpp:320 -msgid "You need to specify a remote file." -msgstr "Du skal angive en fil på fjernstedet." - -#: ../../locales/../src/interface/manual_transfer.cpp:326 -msgid "You need to specify a remote path." -msgstr "Du skal angive en sti på fjernstedet." - -#: ../../locales/../src/interface/manual_transfer.cpp:297 -msgid "You need to specify a server." -msgstr "Du skal angive en server." - -#: ../../locales/../src/interface/netconfwizard.cpp:577 -msgid "" -"You should have no problems connecting to other servers, file transfers " -"should work properly." -msgstr "" -"Du burde ikke have problemer med at oprette forbindelse til andre servere, " -"filoverførseler burde fungere korrekt." - -#: ../../locales/../src/interface/QueueView.cpp:3050 -msgid "Your computer will suspend unless you click Cancel." -msgstr "" -"Din computer vil blive stoppet midlertidigt, medmindre du klikker på " -"Annuller." - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 -msgid "after" -msgstr "efter" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 -msgid "before" -msgstr "inden" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 -msgid "begins with" -msgstr "begynder med" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 -msgid "bytes" -msgstr "bytes" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 -msgid "contains" -msgstr "indeholder" - -#: ../../locales/../src/interface/updater.cpp:217 -msgid "custom" -msgstr "brugerdefineret" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 -msgid "does not contain" -msgstr "indeholder ikke" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 -msgid "does not equal" -msgstr "er ikke lig med" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 -msgid "ends with" -msgstr "slutter med" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 -msgid "equals" -msgstr "svarer til" - -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 -msgid "file" -msgstr "fil" - -#: ../../locales/../src/interface/edithandler.cpp:98 -msgid "fz3temp-lockfile" -msgstr "fz3temp-lockfile" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 -msgid "" -"fzputtygen could not be started.\n" -"Please make sure this executable exists in the same directory as the main " -"FileZilla executable." -msgstr "" -"Kunne ikke starte fzputtygen.\n" -"Sørg for, at denne eksekverbare fil findes i samme mappe som FileZillas " -"eksekverbare fil." - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 -msgid "fzsftp belongs to a different version of FileZilla" -msgstr "fzsftp tilhører en anden version af FileZilla" - -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 -msgid "fzsftp could not be started" -msgstr "fzsftp kunne ikke startes" - -#: ../../locales/../src/engine/tlssocket.cpp:1127 -msgid "gnutls_certificate_get_peers returned no certificates" -msgstr "gnutls_certificate_get_peers returnerede ingen certifikater" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 -msgid "greater than" -msgstr "større end" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 -msgid "group executable" -msgstr "eksekvérbar af gruppe" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 -msgid "group readable" -msgstr "læsbar af gruppe" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 -msgid "group writeable" -msgstr "skrivbar af gruppe" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 -msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" -msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 -msgid "is equal to" -msgstr "er lig med" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 -msgid "is set" -msgstr "er sat" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 -msgid "is unset" -msgstr "er ikke sat" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 -msgid "less than" -msgstr "mindre end" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 -msgid "matches regex" -msgstr "svarer til regex" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 -msgid "owner executable" -msgstr "eksekvérbar af ejer" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 -msgid "owner readable" -msgstr "læsbar af ejer" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 -msgid "owner writeable" -msgstr "skrivbar af ejer" - -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 -msgid "unknown" -msgstr "ukendt" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 -msgid "world executable" -msgstr "eksekvérbar globalt" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 -msgid "world readable" -msgstr "globalt læsbar" - -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 -msgid "world writeable" -msgstr "globalt skrivbar" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 -msgid "wxWidgets:" -msgstr "wxWidgets:" - -#~ msgid "Empty dirs to visit" -#~ msgstr "Tomme mapper der skal gennemses" - -#~ msgid "" -#~ "Any changes made in the Site Manager will not be saved unless you repair " -#~ "the file." -#~ msgstr "" -#~ "Eventuelle ændringer i Websted-manager vil ikke blive gemt, medmindre du " -#~ "reparerer filen." - -#~ msgid "Cannot compare directories, not connected to a server." -#~ msgstr "Kan ikke sammenligne mapper, ikke forbundet til en server." - -#~ msgid "Connected" -#~ msgstr "Tilsluttet" - -#~ msgid "Deleting directories" -#~ msgstr "Sletter mapper" - -#~ msgid "Deleting multiple unrelated directories is not yet supported" -#~ msgstr "Sletning af flere urelaterede mapper er endnu ikke understøttet" - -#~ msgid "Downloading multiple unrelated directories is not yet supported" -#~ msgstr "Hentning af flere urelaterede mapper er endnu ikke understøttet" - -#~ msgid "Downloading search results" -#~ msgstr "Henter søgeresultater" - -#~ msgid "The XML document is not well-formed: %s" -#~ msgstr "XML-dokumentet er ikke velformet: %s" - -#~ msgid "" -#~ "The file '%s' is not in a format supported by FileZilla.\n" -#~ "The file is also password protected. Password protected keyfiles are not " -#~ "supported by FileZilla yet.\n" -#~ "Would you like to convert it into a supported, unprotected format?" -#~ msgstr "" -#~ "Filen '%s' er ikke i et format, der er understøttet af FileZilla.\n" -#~ "Filen er desuden beskyttet med adgangskode. Beskyttede nøglefiler er " -#~ "endnu ikke understøttet af FileZilla.\n" -#~ "Ønsker du at konvertere den til et understøttet, ubeskyttet format?" - -#~ msgid "" -#~ "The file '%s' is password protected. Password protected keyfiles are not " -#~ "supported by FileZilla yet.\n" -#~ "Would you like to convert it into an unprotected file?" -#~ msgstr "" -#~ "Filen '%s' er beskyttet med adgangskode. Beskyttede nøglefiler er endnu " -#~ "ikke understøttet af FileZilla.\n" -#~ "Ønsker du at konvertere den til en ubeskyttet fil?" - -#~ msgid "U&se system defaults" -#~ msgstr "Brug systemst&andard" - -#~ msgid "" -#~ "Unknown error opening the file. Make sure the file can be accessed and is " -#~ "a well-formed XML document." -#~ msgstr "" -#~ "Ukendt fejl ved åbning af filen. Sørg for, at der er adgang til filen, og " -#~ "at den er et velformet XML-dokument." - -#~ msgid "Use system &defaults" -#~ msgstr "Brug systemstanda&rd" - -#~ msgid "Using proxy %s" -#~ msgstr "Bruger proxy %s" - -#~ msgid "&Crash" -#~ msgstr "&Afbryd med fejl" - -#~ msgid "Certificate details" -#~ msgstr "Detaljer om certifikat" - -#~ msgid "Clear &Site Manager entries" -#~ msgstr "&Tøm listen i Websted Manager" - -#~ msgid "Clear &transfer queue" -#~ msgstr "Tøm overførselskø" - -#~ msgid "Connection timed out" -#~ msgstr "Forbindelse mistet ved timeout" - -#~ msgid "" -#~ "Crashes FileZilla instantly. Only used to debug the exception handler" -#~ msgstr "" -#~ "Standser (crasher) FileZilla øjeblikkeligt. Skal kun bruges til debug af " -#~ "fejlhåndteringen" - -#~ msgid "Operating system problem detected" -#~ msgstr "Operativsystem-problem opdaget" - -#~ msgid "" -#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -#~ "seconds." -#~ msgstr "" -#~ "Tidszoneforskydninger: Server: %d sekunder. Lokal: %d sekunder. Forskel: " -#~ "%d sekunder." - -#~ msgid "" -#~ "Warning!\n" -#~ "\n" -#~ "A bug in Windows causes problems with FileZilla\n" -#~ "\n" -#~ "The bug occurs if you have\n" -#~ "- Windows Server 2003 or XP 64\n" -#~ "- Windows Firewall enabled\n" -#~ "- Application Layer Gateway service enabled\n" -#~ "See http://support.microsoft.com/kb/931130 for background information.\n" -#~ "\n" -#~ "Unless you either disable Windows Firewall or the Application Layer " -#~ "Gateway service,\n" -#~ "FileZilla will timeout on big transfers." -#~ msgstr "" -#~ "Advarsel!\n" -#~ "\n" -#~ "En fejl i Windows forårsager problemer med FileZilla\n" -#~ "\n" -#~ "Fejlen opstår hvis du har\n" -#~ "- Windows Server 2003 eller XP 64\n" -#~ "- Windows Firewall slået til\n" -#~ "- Application Layer Gateway service slået til\n" -#~ "Se http://support.microsoft.com/kb/931130 for bagrundsinformation.\n" -#~ "\n" -#~ "Medmindre du enten slår Windows Firewall eller Application Layer Gateway- " -#~ "servicen fra,\n" -#~ "vil FileZilla få timeouts ved store overførsler." - -#~ msgid "" -#~ "A file with that name is already being edited. Do you want to reopen '%s'?" -#~ msgstr "En fil med det navn redigeres allerede. Ønsker du at genåbne '%s'?" - -#~ msgid "Benchmark string coalescer" -#~ msgstr "Udmålingsstreng-samler" - -#~ msgid "Clear string coalescer" -#~ msgstr "Klar tekststreng-samler" - -#~ msgid "Failed to parse trusted root cert." -#~ msgstr "Kunne ikke fortolke trusted rodcert." - -#~ msgid "" -#~ "Filename may not contain any of the following characters: / \\ : * ? \" < " -#~ "> |" -#~ msgstr "" -#~ "Filnavnet må ikke indeholde nogen af følgende tegn: / \\ : * ? \" < > |" - -#~ msgid "Fingerprint (MD5):" -#~ msgstr "Fingeraftryk (MD5):" - -#~ msgid "Root certificate is not trusted" -#~ msgstr "Rodcertifikat er ikke sikkert" - -#~ msgid "Use plain FTP" -#~ msgstr "Brug enkel FTP" - -#~ msgid "Cannot load file, not a valid XML file." -#~ msgstr "Kan ikke åbne fil, ikke en gyldig XML-fil." - -#~ msgid "%s bytes" -#~ msgstr "%s byte" - -#~ msgid "%s bytes (%s/s)" -#~ msgstr "%s bytes (%s/s)" - -#~ msgid "&Check for beta versions of FileZilla" -#~ msgstr "&Søg efter betaversioner af FileZilla" - -#~ msgid "&Finish" -#~ msgstr "&Afslut" - -#~ msgid ", %H:%M:%S left" -#~ msgstr ", %H:%M:%S tilbage" - -#~ msgid ", --:--:-- left" -#~ msgstr ", --:--:-- tilbage" - -#~ msgid "- Broken router and/or firewall" -#~ msgstr "- Router og/eller firewall nede" - -#~ msgid "- File corrupted on mirror" -#~ msgstr "- Fil ødelagt på mirrorsite" - -#~ msgid "- Malware on your system" -#~ msgstr "- Malware (spyware/virus) på dit system" - -#~ msgid "Advanced options:" -#~ msgstr "Avancerede indstillinger:" - -#~ msgid "" -#~ "Alternatively, visit https://filezilla-project.org/ to download the most " -#~ "recent version." -#~ msgstr "" -#~ "Besøg https://filezilla-project.org/ for at hente den nyeste version." - -#~ msgid "C&heck for nightly builds of FileZilla" -#~ msgstr "Sø&g efter daglige byg af FileZilla" - -#~ msgid "Click on next to download the new version." -#~ msgstr "Klik på Næste for at hente den nye version." - -#~ msgid "Connecting to server" -#~ msgstr "Tilslutter til server" - -#~ msgid "" -#~ "Do you really want to check for beta versions?\n" -#~ "Unless you want to test new features, keep using stable versions." -#~ msgstr "" -#~ "Ønsker du virkelig at søge efter betaversioner?\n" -#~ "Medmindre du ønsker at afprøve nye funktioner bør du bruge de stabile " -#~ "versioner." - -#~ msgid "Error, file name cannot be parsed." -#~ msgstr "Fejl - filnavnet kan ikke fortolkes." - -#~ msgid "Error, local file exists but cannot be removed" -#~ msgstr "Fejl - den lokale fil findes, men kan ikke fjernes" - -#~ msgid "Every month" -#~ msgstr "Hver måned" - -#~ msgid "Every two weeks" -#~ msgstr "Hveranden uge" - -#~ msgid "Executable" -#~ msgstr "Eksekvérbar fil" - -#~ msgid "Failed to check for newer version of FileZilla." -#~ msgstr "Kunne ikke søge efter nyere version af FileZilla." - -#~ msgid "" -#~ "In case you prefer automatic updates, you can enable automatic update " -#~ "checks in the settings dialog." -#~ msgstr "" -#~ "Hvis du foretrækker automatiske opdateringer, kan du slå automatisk " -#~ "søgning efter opdateringer til i dialogen Indstillinger." - -#~ msgid "Log of update check:" -#~ msgstr "Log over automatisk søgning efter opdateringer:" - -#~ msgid "Package" -#~ msgstr "Pakke" - -#~ msgid "" -#~ "Please check https://filezilla-project.org/ for the most recent version " -#~ "of FileZilla." -#~ msgstr "" -#~ "Kontroller på https://filezilla-project.org/, om du har den nyeste " -#~ "version af FileZilla." - -#~ msgid "" -#~ "Please check the package manager of your system for an updated package or " -#~ "visit https://filezilla-project.org/ to download the source code of " -#~ "FileZilla." -#~ msgstr "" -#~ "Kontroller pakke-manageren på dit system for en opdateret pakke, eller " -#~ "besøg https://filezilla-project.org/ for at hente kildekoden til " -#~ "FileZilla." - -#~ msgid "" -#~ "Please retry downloading the update. Possible reasons if the problem " -#~ "persists (listed in order of decreasing probability):" -#~ msgstr "" -#~ "Forsøg venligst at hente opdateringen igen. Hvis problemet vedbliver, er " -#~ "følgende årsager mulige (sorteret faldende efter sandsynlighed):" - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ for more information about " -#~ "FileZilla." -#~ msgstr "" -#~ "Besøg https://filezilla-project.org/ for flere oplysninger om FileZilla." - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ to download the most recent " -#~ "version." -#~ msgstr "" -#~ "Besøg https://filezilla-project.org/ for at hente den nyeste version." - -#~ msgid "Resolving hostname" -#~ msgstr "Kontrollerer værtsnavn" - -#~ msgid "Select download location for package" -#~ msgstr "Vælg download-sted for pakken" - -#~ msgid "" -#~ "The most recent version has been downloaded. Click on Finish to close " -#~ "FileZilla and to start the installation." -#~ msgstr "" -#~ "Den nyeste version er hentet. Klik på Afslut for at lukke FileZilla og " -#~ "starte installationen." - -#~ msgid "" -#~ "The most recent version has been downloaded. Please install it the same " -#~ "way you installed this version." -#~ msgstr "" -#~ "Den nyeste version er hentet. Installer den, som du installerede denne " -#~ "version." - -#~ msgid "Update wizard" -#~ msgstr "Opdateringsassistent" - -#~ msgid "Using this wizard you can check for available updates to FileZilla." -#~ msgstr "" -#~ "Ved hjælp af denne assistent kan du se om der findes opdateringer til " -#~ "FileZilla." - -#~ msgid "" -#~ "You are already using the most recent version of FileZilla. Please check " -#~ "again in future." -#~ msgstr "" -#~ "Du bruger allerede den nyeste version af FileZilla. Prøv igen om et " -#~ "stykke tid." - -#~ msgid "&Copy" -#~ msgstr "Kop&ier" - -#~ msgid "&Enable automatic update check" -#~ msgstr "&Slå automatisk søgning efter opdateringer til" - -#~ msgid "&Number of days between update checks:" -#~ msgstr "&Antal dage mellem opdateringskontroller:" - -#~ msgid "(At least 7 days)" -#~ msgstr "(mindst 7 dage)" - -#~ msgid "Check for &beta versions and release candidates" -#~ msgstr "Søg efter &betaversioner og release-kandidater" - -#~ msgid "Cop&y" -#~ msgstr "&Kopier" - -#~ msgid "Please enter an update interval of at least 7 days" -#~ msgstr "Angiv et opdateringsinterval på mindst 7 dage" - -#~ msgid "Privacy policy:" -#~ msgstr "Politik om personlige oplysninger:" - -#~ msgid "%s (%d.%d KB/s)" -#~ msgstr "%s (%d.%d KB/s)" - -#~ msgid "%s (%d.%d MB/s)" -#~ msgstr "%s (%d.%d MB/s)" - -#~ msgid "%s bytes (%d.%d KB/s)" -#~ msgstr "%s byte (%d.%d KB/s)" - -#~ msgid "%s bytes (%d.%d MB/s)" -#~ msgstr "%s byte (%d.%d MB/s)" - -#~ msgid "&Remember this and all future passwords" -#~ msgstr "&Husk denne og alle fremtidigie adgangskoder" - -#~ msgid "Wrong opState: %d" -#~ msgstr "Forkert opState: %d" - -#~ msgid "Duplicate filter name" -#~ msgstr "Filternavn findes allerede" - -#, fuzzy -#~ msgid "Serial Number:" -#~ msgstr "Serienummer:" diff -Nru filezilla-3.15.0.2/locales/da.po filezilla-3.33.0/locales/da.po --- filezilla-3.15.0.2/locales/da.po 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/locales/da.po 2018-04-02 18:37:17.000000000 +0000 @@ -0,0 +1,9444 @@ +# Danish translation for FileZilla +# Copyright (C) 2012-2016 Tim Kosse +# This file is distributed under the same license as the FileZilla package. +# Niels von Wowern Fanøe , 2012-2018. +# scootergrisen, 2015-2017. +# +msgid "" +msgstr "" +"Project-Id-Version: FileZilla 3\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-02 20:30+0200\n" +"PO-Revision-Date: 2018-03-28 14:18+0200\n" +"Last-Translator: Niels von Wowern Fanøe \n" +"Language-Team: Danish\n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.0.6\n" + +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 +msgid "%H:%M:%S elapsed" +msgstr "%H:%M:%S forløbet" + +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 +msgid "%H:%M:%S left" +msgstr "%H:%M:%S tilbage" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 +#, c-format +msgid "" +"%a - Account (Lines containing this will be omitted if not using Account " +"logontype)" +msgstr "" +"%a - konto (linjer med dette udelades, hvis ikke logintypen Konto anvendes)" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 +#, c-format +msgid "%d directory" +msgid_plural "%d directories" +msgstr[0] "%d mappe" +msgstr[1] "%d mapper" + +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 +#, c-format +msgid "%d directory with its contents" +msgid_plural "%d directories with their contents" +msgstr[0] "%d mappe med dens indhold" +msgstr[1] "%d mapper med deres indhold" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d fil" +msgstr[1] "%d filer" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 +#, c-format +msgid "%d file. Total size: %s" +msgid_plural "%d files. Total size: %s" +msgstr[0] "%d fil. Samlet størrelse: %s" +msgstr[1] "%d filer. Samlet størrelse: %s" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#, c-format +msgid "%d file. Total size: At least %s" +msgid_plural "%d files. Total size: At least %s" +msgstr[0] "%d fil. Samlet størrelse: mindst %s" +msgstr[1] "%d filer. Samlet størrelse: mindst %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:77 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekund" +msgstr[1] "%d sekunder" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 +msgid "%h - Host" +msgstr "%h - vært" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu mappe" +msgstr[1] "%llu mapper" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu fil" +msgstr[1] "%llu filer" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 +#, c-format +msgid "%p - Password" +msgstr "%p - adgangskode" + +#: ../../locales/../src/interface/statuslinectrl.cpp:170 +#, c-format +msgid "%s (%s/s)" +msgstr "%s (%s/s)" + +#: ../../locales/../src/interface/statuslinectrl.cpp:173 +#, c-format +msgid "%s (? B/s)" +msgstr "%s (? B/s)" + +#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#, c-format +msgid "%s - Certificate expired!" +msgstr "%s - certifikat udløbet!" + +#: ../../locales/../src/interface/verifycertdialog.cpp:214 +#, c-format +msgid "%s - Not yet valid!" +msgstr "%s - endnu ikke gyldig!" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 +#, c-format +msgid "%s - Proxy user" +msgstr "%s - proxy-bruger" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 +#, c-format +msgid "%s and %s. Total size: %s" +msgstr "%s og %s. Samlet størrelse: %s" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#, c-format +msgid "%s and %s. Total size: At least %s" +msgstr "%s og %s. Samlet størrelse: mindst %s" + +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 +#, c-format +msgid "%s byte" +msgid_plural "%s bytes" +msgstr[0] "%s byte" +msgstr[1] "%s byte" + +#: ../../locales/../src/interface/FileZilla.cpp:639 +#, c-format +msgid "" +"%s could not be found. Without this component of FileZilla, %s will not " +"work.\n" +"\n" +"Please download FileZilla again. If this problem persists, please submit a " +"bug report." +msgstr "" +"Kunne ikke finde %s. Uden denne FileZilla-komponent virker %s ikke.\n" +"\n" +"Download FileZilla igen. Hvis problemet fortsætter, så indsend en " +"fejlrapport." + +#: ../../locales/../src/interface/FileZilla.cpp:729 +#, c-format +msgid "" +"%s could not be found. Without this component of FileZilla, %s will not " +"work.\n" +"\n" +"Possible solutions:\n" +"- Make sure %s is in a directory listed in your PATH environment variable.\n" +"- Set the full path to %s in the %s environment variable." +msgstr "" +"Kunne ikke finde %s. Uden denne FileZilla-komponent virker %s ikke.\n" +"\n" +"Mulige løsninger:\n" +"- Sørg for at %s findes i en mappe, der er angivet i din PATH-" +"miljøvariabel.\n" +"- Angiv den fulde sti til %s i %s-miljøvariablen." + +#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#, c-format +msgid "%s with %d bits" +msgstr "%s med %d bit" + +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - værtsnavn er ikke magen til certifikatets værtsnavn" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 +#, c-format +msgid "%u - Username" +msgstr "%u - brugernavn" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 +msgid "%w - Proxy password" +msgstr "%w - proxy-adgangskode" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 +msgid "&Abort previous connection and connect in current tab" +msgstr "&Afbryd forrige forbindelse, og opret forbindelse i aktuelt faneblad" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 +msgid "&About..." +msgstr "&Om..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 +msgid "&Account:" +msgstr "&Konto:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 +msgid "&Active" +msgstr "Akti&v" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +msgid "&Add bookmark..." +msgstr "&Tilføj bogmærke..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Tilføj mappe..." + +# scootergrisen: tjek også andre strenge med "queue" og sørg for de er oversat i samme stil +# scootergrisen: måske "Føj til"/"Sæt i" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 +msgid "&Add files to queue" +msgstr "&Tilføj filer i kø" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 +msgid "&Add key file..." +msgstr "&Tilføj nøglefil..." + +# scootergrisen: tjek også andre strenge med "queue" og sørg for de er oversat i samme stil +# scootergrisen: måske "Føj til"/"Sæt i" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 +msgid "&Add to queue" +msgstr "&Tilføj i kø" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +msgid "&Adjust server timezone offset:" +msgstr "&Juster serverens tidszoneforskydning:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 +msgid "&Always trust certificate in future sessions." +msgstr "Hav &altid tillid til certifikatet i fremtidige sessioner." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 +msgid "&Always trust this host, add this key to the cache" +msgstr "" +"Hav &altid tillid til denne vært, og tilføj denne nøgle i mellemlageret" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 +msgid "&Always use default editor" +msgstr "Brug &altid standardredigeringsprogram" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 +msgid "&Always use selection for unassociated files" +msgstr "Brug &altid valg til filer som ikke er tilknyttet" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 +msgid "&Always use this action" +msgstr "Brug &altid denne handling" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 +msgid "&Ask your operating system for the external IP address" +msgstr "&Spørg dit styresystem om den eksterne IP-adresse" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 +msgid "&Auto" +msgstr "&Auto" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 +msgid "&Autodetect" +msgstr "&Automatisk registrering" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "Baggr&undsfarve:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 +msgid "&Binary" +msgstr "&Binær" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 +msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" +msgstr "&Binære præfikser med SI-symboler (f.eks. 1 KB = 1024 byte)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 +msgid "&Bookmarks" +msgstr "&Bogmærker" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 +msgid "&Browse..." +msgstr "&Gennemse..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 +msgid "&Burst tolerance:" +msgstr "&Burst-tolerance:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 +msgid "&Cancel" +msgstr "&Annuller" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 +msgid "&Clear private data..." +msgstr "&Ryd personlige data..." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:28 +msgid "&Close" +msgstr "&Luk" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 +msgid "&Close FileZilla" +msgstr "&Luk FileZilla" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Luk FileZilla én gang" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 +msgid "&Configure speed limits..." +msgstr "&Indstil hastighedsgrænser..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 +msgid "&Configure..." +msgstr "&Indstil..." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 +msgid "&Connect" +msgstr "&Tilslut" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +msgid "&Copy current connection to Site Manager..." +msgstr "&Kopiér aktuel forbindelse til stedhåndtering..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 +msgid "&Copy to clipboard" +msgstr "&Kopiér til udklipsholder" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 +msgid "&Create directory" +msgstr "&Opret mappe" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 +msgid "&Create new tab" +msgstr "Åbn &nyt faneblad" + +#: ../../locales/../src/interface/menu_bar.cpp:70 +msgid "&Debug" +msgstr "F&ejlfinding" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 +msgid "&Debug information in message log:" +msgstr "&Fejlfindingsinformation i meddelelseslog:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 +msgid "&Default editor:" +msgstr "&Standardredigeringsprogram:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 +msgid "&Default file exists action..." +msgstr "&Standardhandling når filen findes..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 +msgid "&Delay between failed login attempts:" +msgstr "&Forsinkelse mellem mislykkede login-forsøg:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 +msgid "&Delete" +msgstr "Sl&et" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 +msgid "&Delete symlink" +msgstr "Sl&et symlink" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "Adgangstilladelser for &mappe..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 +msgid "&Directory comparison" +msgstr "&Mappesammenligning" + +#: ../../locales/../src/interface/state.cpp:1030 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"&Deaktivér synkroniseret gennemgang, og fortsæt med at skifte den lokale " +"mappe" + +#: ../../locales/../src/interface/state.cpp:1108 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" +"&Deaktivér synkroniseret gennemgang, og fortsæt med at skifte fjernmappen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 +msgid "&Discard local file then download and edit file anew" +msgstr "&Forkast lokal fil, download og rediger filen på ny" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 +msgid "&Disconnect" +msgstr "&Afbryd forbindelsen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 +msgid "&Display momentary transfer speed instead of average speed" +msgstr "&Vis aktuel overførselshastighed i stedet for gennemsnitlig hastighed" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 +msgid "&Display size in bytes" +msgstr "&Vis størrelse i byte" + +#: ../../locales/../src/interface/conditionaldialog.cpp:25 +msgid "&Don't show this dialog again." +msgstr "&Vis ikke denne dialog igen." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 +msgid "&Don't use external IP address on local connections." +msgstr "Brug ikke eksterne IP-adresser til &lokale forbindelser." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 +msgid "&Double-click action on files:" +msgstr "Handling ved &dobbeltklik på filer:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 +msgid "&Download" +msgstr "Do&wnload" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 +msgid "&Download to:" +msgstr "Do&wnload til:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 +msgid "&Download..." +msgstr "Do&wnload..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 +msgid "&Downloads:" +msgstr "&Downloads:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 +msgid "&Edit" +msgstr "&Rediger" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 +msgid "&Edit filter rules..." +msgstr "&Rediger filterregler..." + +# scootergrisen: kilde: foreslå "Limit speed" eller noget i den stil. Det giver ikke mening at kalde noget man kan slå til og fra for "Enable". +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 +msgid "&Enable" +msgstr "&Aktivér" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 +msgid "&Enable compression" +msgstr "Aktivér &komprimering" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 +msgid "&Enable speed limits" +msgstr "&Aktivér hastighedsgrænser" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 +msgid "&Encoding:" +msgstr "&Kodning:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 +msgid "&Encryption:" +msgstr "Kr&yptering:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +msgid "&Enter custom command..." +msgstr "&Indtast brugerdefineret kommando..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 +msgid "&Establish connection in a new tab" +msgstr "&Etabler forbindelsen i en ny faneblad" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 +msgid "&Execute" +msgstr "&Udfør" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 +msgid "&Export Site Manager entries" +msgstr "&Eksportér poster fra stedhåndtering" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 +msgid "&Export..." +msgstr "&Eksportér..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 +msgid "&Fall back to active mode" +msgstr "&Fald tilbage til aktiv tilstand" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +msgid "&File" +msgstr "&Fil" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +msgid "&File Attributes..." +msgstr "&Filattributter..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 +msgid "&File permissions..." +msgstr "&Filtilladelser..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 +msgid "&File:" +msgstr "&Fil:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 +msgid "&Filter conditions:" +msgstr "Filter&betingelser:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 +msgid "&Filter sets:" +msgstr "&Filtersæt:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtre" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +msgid "&Filters:" +msgstr "&Filtre:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 +msgid "&Finish editing and delete local file" +msgstr "&Afslut redigering, og slet lokal fil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Fladgør lokale stier, upload alle indeholdte filer direkte ind i " +"destinationsmappen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 +msgid "" +"&Flatten remote paths, download all contained files directly into target " +"directory" +msgstr "" +"&Fladgør fjernstier, download alle indeholdte filer direkte ind i " +"destinationsmappen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 +msgid "&Follow symlink, delete target directory contents" +msgstr "&Følg symlink, slet destinationens mappeindhold" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 +msgid "&Get external IP address from the following URL:" +msgstr "Hent &ekstern IP-adresse fra følgende URL:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 +msgid "&Getting help..." +msgstr "&Få hjælp..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +msgid "&Global bookmark" +msgstr "Globalt &bogmærke" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 +msgid "&HTTP/1.1 using CONNECT method" +msgstr "&HTTP/1.1 med CONNECT-metoden" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 +msgid "&Help" +msgstr "&Hjælp" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +msgid "&Hide identical files" +msgstr "&Skjul identiske filer" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +msgid "&Highest" +msgstr "&Højeste" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 +msgid "&Highest available port:" +msgstr "&Højeste tilgængelige port:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 +msgid "&Host:" +msgstr "Vær&t:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 +msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" +msgstr "&IEC binære præfikser (f.eks. 1 KiB = 1024 byte)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 +msgid "&ISO 8601 (example: 2007-09-15)" +msgstr "&ISO 8601 (eksempel: 2007-09-15)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +msgid "&Import..." +msgstr "&Importér..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 +msgid "&Inherit system's filetype associations" +msgstr "&Nedarv systemets filtypetilknytninger" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 +msgid "&Install new version" +msgstr "&Installér ny version" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Bevar struktur i lokal sti relativ til søgeroden" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 +msgid "&Keep remote path structure relative to search root" +msgstr "&Bevar struktur i fjernsti relativ til søgeroden" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 +msgid "&Key file:" +msgstr "&Nøglefil:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 +msgid "&Layout of file and directory panes:" +msgstr "&Layout for fil- og mapperuder:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 +msgid "&Limit local ports used by FileZilla" +msgstr "Be&græns antal lokale porte, der bruges af FileZilla" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +msgid "&Limit number of simultaneous connections" +msgstr "&Begræns antal samtidige forbindelser" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +msgid "&Local directory tree" +msgstr "Lo&kalt mappetræ" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 +msgid "&Local directory:" +msgstr "&Lokalmappe:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Søgning på lokalt sted" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 +msgid "&Log to file" +msgstr "&Log til fil" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 +msgid "&Logon Type:" +msgstr "&Logintype:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 +msgid "&Logontype:" +msgstr "&Logintype:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 +msgid "&Low" +msgstr "&Lav" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 +msgid "&Manage bookmarks..." +msgstr "&Håndtér bogmærker..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 +msgid "&Manual transfer..." +msgstr "&Manuel overførsel..." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 +msgid "&Maximum number of connections:" +msgstr "Ma&ks. antal forbindelser:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 +msgid "&Maximum number of retries:" +msgstr "&Maks. antal forsøg:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +msgid "&Message log" +msgstr "M&eddelelseslog" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 +msgid "&Minimize to tray" +msgstr "Mi&nimér til systembakke" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +msgid "&Name sorting mode:" +msgstr "&Navnesorteringstilstand:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 +msgid "&Name:" +msgstr "&Navn:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 +msgid "&Network configuration wizard..." +msgstr "&Netværkskonfigurationsguide..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +msgid "&New" +msgstr "&Ny" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 +msgid "&New Site" +msgstr "&Nyt sted" + +#: ../../locales/../src/interface/Mainfrm.cpp:1763 +msgid "&New version available!" +msgstr "&Der findes en ny version!" + +#: ../../locales/../src/interface/netconfwizard.cpp:27 +msgid "&Next >" +msgstr "&Næste >" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 +msgid "&No" +msgstr "&Nej" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 +msgid "&None" +msgstr "&Ingen" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +msgid "&Normal" +msgstr "&Normal" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 +msgid "&Numeric value:" +msgstr "&Numerisk værdi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 +msgid "&OK" +msgstr "&OK" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 +msgid "&OPEN" +msgstr "&OPEN" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 +msgid "&Open" +msgstr "&Åbn" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 +msgid "&Overwrite" +msgstr "&Overskriv" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 +msgid "&Passive" +msgstr "&Passiv" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 +msgid "&Password:" +msgstr "&Adgangskode:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 +msgid "&Play sound" +msgstr "Afspil &lyd" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 +msgid "&Port:" +msgstr "&Port:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 +msgid "&Preserve timestamps of transferred files" +msgstr "&Bevar tidsstempler på overførte filer" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 +msgid "&Queue" +msgstr "&Sæt i kø" + +#: ../../locales/../src/interface/quickconnectbar.cpp:68 +msgid "&Quickconnect" +msgstr "&Lyntilslut" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +msgid "&Quickconnect bar" +msgstr "&Lyntilslutningslinje" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 +msgid "&Quickconnect history" +msgstr "Historik for &lyntilslut" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 +msgid "&Read" +msgstr "&Læs" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +msgid "&Reconnect" +msgstr "&Genopret forbindelsen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +msgid "&Reconnect information" +msgstr "Information om &genoprettelse af forbindelse" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 +msgid "&Refresh" +msgstr "&Opdatér" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Husk hovedadgangskode indtil FileZilla lukkes" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 +msgid "&Remember password until FileZilla is closed" +msgstr "&Husk adgangskode indtil FileZilla lukkes" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 +msgid "&Remote directory:" +msgstr "&Fjernmappe:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 +msgid "&Remote path:" +msgstr "Sti på f&jernsted:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Søgning på fjernsted" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 +msgid "&Remove" +msgstr "&Fjern" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 +msgid "&Remove key" +msgstr "&Fjern nøgle" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +msgid "&Remove selected" +msgstr "Fjern &valgte" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 +msgid "&Rename" +msgstr "Om&døb" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 +msgid "&Rename..." +msgstr "Om&døb..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 +msgid "&Reopen local file" +msgstr "&Genåbn lokal fil" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 +msgid "&Replace invalid characters with:" +msgstr "&Erstat ugyldige tegn med:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +msgid "&Report a bug..." +msgstr "&Rapportér en fejl..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Anmod om opmærksomhed" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 +msgid "&Reset and requeue all" +msgstr "&Nulstil og sæt alle i kø igen" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 +msgid "&Restart Wizard" +msgstr "&Genstart guide" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 +msgid "&Resume" +msgstr "&Genoptag" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 +msgid "&Run command..." +msgstr "&Kør kommando..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 +msgid "&Run configuration wizard now..." +msgstr "&Kør konfigurationsguide nu..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 +msgid "&Run update check now..." +msgstr "S&øg efter opdateringer nu..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 +msgid "&SITE" +msgstr "&SITE" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 +msgid "&SOCKS 5" +msgstr "&SOCKS 5" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 +msgid "&Save as..." +msgstr "Gem &som..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 +msgid "&Search" +msgstr "&Søg" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 +msgid "&Search remote files..." +msgstr "S&øg efter filer på fjernsted..." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 +msgid "&Select Entry:" +msgstr "&Vælg post:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 +msgid "&Select language:" +msgstr "&Vælg sprog:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 +msgid "&Select the columns that should be displayed:" +msgstr "Vælg hvilke &kolonner der skal vises:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 +msgid "&Server" +msgstr "&Server" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 +msgid "&Settings" +msgstr "&Indstillinger" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 +msgid "&Settings..." +msgstr "&Indstillinger..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 +msgid "&Show debug menu" +msgstr "&Vis menuen Fejlfinding" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 +msgid "&Show detailed log" +msgstr "&Vis detaljeret log" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 +msgid "&Show timestamps in message log" +msgstr "Vis &tidsstempler i meddelelseslog" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 +msgid "&Site Manager entries" +msgstr "Poster i &stedhåndtering" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 +msgid "&Site Manager..." +msgstr "&Stedhåndtering..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 +msgid "&Site-specific bookmark" +msgstr "&Sted-specifikt bogmærke" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 +msgid "&Skip" +msgstr "&Spring over" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +msgid "&Speed limits" +msgstr "&Hastighedsgrænser" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 +msgid "&Start transfer immediately" +msgstr "Start overførsel &med det samme" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 +msgid "&Swap local and remote panes" +msgstr "&Byt om på lokal- og fjernrude" + +# scootergrisen: mit bud er "&TLS-chiffre" +# scootergrisen: sv bruger "&TLS-chiffer" +# scootergrisen: nb_NO bruger "&TLS-krypteringsmetoder" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 +msgid "&TLS Ciphers" +msgstr "&TLS-krypteringsalgoritmer" + +#: ../../locales/../src/interface/netconfwizard.cpp:232 +msgid "&Test" +msgstr "&Test" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 +msgid "&Theme:" +msgstr "&Tema:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 +msgid "&Transfer" +msgstr "&Overfør" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 +msgid "&Transfer mode:" +msgstr "Over&førselstilstand:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 +msgid "&Transfer queue" +msgstr "Ov&erførselskø" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 +msgid "&Treat dotfiles as ASCII files" +msgstr "Behandl &punktumfiler som ASCII-filer" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "Hav &tillid til dette certifikat for de viste alternative værtsnavne." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 +msgid "&Unedit" +msgstr "&Fortryd redigering" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 +msgid "&Update cached key for this host" +msgstr "&Opdatér nøgle i mellemlager for denne vært" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +msgid "&Upload" +msgstr "&Upload" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Upload til:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Upload..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 +msgid "&Uploads:" +msgstr "&Uploads:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 +msgid "&Use custom program" +msgstr "&Brug brugerdefineret program" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 +msgid "&Use synchronized browsing" +msgstr "Brug &synkroniseret gennemgang" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +msgid "&Use system's default editor for text files" +msgstr "&Brug systemets standardredigeringsprogram til tekstfiler" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 +msgid "&Use the following IP address:" +msgstr "&Brug følgende IP-adresse:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 +msgid "&Use the server's external IP address instead" +msgstr "Brug i stedet &serverens eksterne IP-adresse" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 +msgid "&Use thousands separator" +msgstr "Brug &tusindtalsseparator" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 +msgid "&User:" +msgstr "&Bruger:" + +#: ../../locales/../src/interface/quickconnectbar.cpp:52 +msgid "&Username:" +msgstr "Br&ugernavn:" + +#: ../../locales/../src/interface/Mainfrm.cpp:1757 +#, c-format +msgid "&Version %s" +msgstr "&Version %s" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 +msgid "&View" +msgstr "&Vis" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 +msgid "&View/Edit" +msgstr "&Vis/rediger" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +msgid "&Watch locally edited files and prompt to upload modifications" +msgstr "" +"&Overvåg filer som er redigeret lokalt, og spørg om at uploade ændringer" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 +msgid "&When checking for updates, check for:" +msgstr "&Ved søgning efter opdateringer skal følgende kontrolleres:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 +msgid "&Write" +msgstr "S&kriv" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 +msgid "&Yes" +msgstr "&Ja" + +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 +#, c-format +msgid "'%s' does not exist or cannot be accessed." +msgstr "'%s' findes ikke eller kan ikke tilgås." + +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 +#, c-format +msgid "'%s' is not a directory." +msgstr "'%s' er ikke en mappe." + +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' er ikke en understøttet protokol." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +msgid "'Account' logontype not supported by selected protocol" +msgstr "Logintypen 'Konto' understøttes ikke af den valgte protokol" + +#: ../../locales/../src/interface/manual_transfer.cpp:435 +msgid "" +"'Normal' and 'Account' logontypes are not available, using 'Ask for " +"password' instead." +msgstr "" +"Logintyperne 'Normal' og 'Konto' er ikke tilgængelige. Anvender i stedet " +"'Spørg efter adgangskode'." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 +msgid "" +"'Normal' and 'Account' logontypes are not available. Your entry has been " +"changed to 'Ask for password'." +msgstr "" +"Logintyperne 'Normal' og 'Konto' er ikke tilgængelige. Din indtastning er " +"ændret til 'Spørg efter adgangskode'." + +#: ../../locales/../src/interface/Mainfrm.cpp:640 +msgid "" +"'quote' is usually a local command used by commandline clients to send the " +"arguments following 'quote' to the server. You might want to enter the raw " +"command without the leading 'quote'." +msgstr "" +"'quote' bruges normalt i kommandolinjeklienter til at sende argumenterne " +"efter 'quote' til serveren. Du bør skrive kommandoen uden 'quote' foran." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 +#, c-format +msgid "(%d object filtered)" +msgid_plural "(%d objects filtered)" +msgstr[0] "(%d objekt filtreret)" +msgstr[1] "(%d objekter filtreret)" + +#: ../../locales/../src/interface/update_dialog.cpp:313 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% downloadet)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 +msgid "(0 for no limit)" +msgstr "(0 for ubegrænset)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 +msgid "(0-99)" +msgstr "(0-99)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 +msgid "(0-999 seconds)" +msgstr "(0-999 sekunder)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 +msgid "(1-10)" +msgstr "(1-10)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, 0 for at deaktivere)" + +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 +#, c-format +msgid "(app-compat is set to %d.%d)" +msgstr "(app-compat er sat til %d.%d)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 +msgid "(example: %H:%M)" +msgstr "(eksempel: %H:%M)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 +msgid "(example: %Y-%m-%d)" +msgstr "(eksempel: %d-%m-%Y)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 +#, c-format +msgid "(in %s/s)" +msgstr "(i %s/s)" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 +msgid "-" +msgstr "-" + +#: ../../locales/../src/interface/statuslinectrl.cpp:221 +msgid "--:--:-- left" +msgstr "--:--:-- tilbage" + +#: ../../locales/../src/interface/cmdline.cpp:88 +msgid "-c cannot be used together with an FTP URL." +msgstr "-c kan ikke anvendes sammen med en FTP-URL." + +#: ../../locales/../src/interface/cmdline.cpp:97 +msgid "-l can only be used together with an FTP URL." +msgstr "-l kan kun anvendes sammen med en FTP-URL." + +#: ../../locales/../src/interface/cmdline.cpp:76 +msgid "-s and -c cannot be present at the same time." +msgstr "-s og -c kan ikke anvendes samtidig." + +#: ../../locales/../src/interface/cmdline.cpp:82 +msgid "-s cannot be used together with an FTP URL." +msgstr "-s kan ikke anvendes sammen med en FTP-URL." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 +msgid "0 - None" +msgstr "0 - ingen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 +msgid "1 - Warning" +msgstr "1 - advarsel" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 +msgid "2 - Info" +msgstr "2 - info" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 +msgid "3 - Verbose" +msgstr "3 - detaljeret" + +# scootergrisen: skal være være "bit-system" på dansk eller hvad? Men i anden streng har vi "8 bit" uden bindestreg, måske opret bug +#: ../../locales/../src/interface/aboutdialog.cpp:108 +msgid "32-bit system" +msgstr "32-bit system" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 +msgid "4 - Debug" +msgstr "4 - fejlfinding" + +# scootergrisen: skal være være "bit-system" på dansk eller hvad? Men i anden streng har vi "8 bit" uden bindestreg, måske opret bug +#: ../../locales/../src/interface/aboutdialog.cpp:105 +msgid "64-bit system" +msgstr "64-bit system" + +#: ../../locales/../src/interface/netconfwizard.cpp:28 +msgid "< &Back" +msgstr "< &Tilbage" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +msgid "?" +msgstr "?" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +msgid "" +"A bookmark with the entered name already exists. Please enter an unused name." +msgstr "" +"Et bogmærke med det indtastede navn findes allerede. Indtast et navn, der " +"ikke er i brug." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Et certifikat i kæden er underskrevet med en usikker algoritme" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 +msgid "A default editor needs to be set." +msgstr "Du skal angive et standardredigeringsprogram." + +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 +msgid "A directory cannot be dragged into one of its subdirectories." +msgstr "En mappe kan ikke trækkes ind i en af sine undermapper." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 +msgid "" +"A few servers don't allow passive mode or are misconfigured. In such cases " +"you would have to use active mode. In active mode, FileZilla opens a port " +"and asks the server to connect to it." +msgstr "" +"Et mindre antal servere tillader ikke passiv tilstand eller er " +"fejlkonfigureret. I sådanne tilfælde skal du anvende aktiv tilstand. I aktiv " +"tilstand åbner FileZilla en port og anmoder serveren om at oprette " +"forbindelse til den." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 +msgid "A file previously opened has been changed." +msgstr "En tidligere åbnet fil er ændret." + +#: ../../locales/../src/interface/edithandler.cpp:1696 +msgid "A file with that name is already being transferred." +msgstr "En fil med det navn er allerede ved at blive overført." + +#: ../../locales/../src/interface/edithandler.cpp:1700 +msgid "" +"A file with that name is still being edited. Please close it and try again." +msgstr "" +"En fil med det navn er stadig ved at blive redigeret. Luk den, og prøv igen." + +#: ../../locales/../src/interface/FileZilla.cpp:605 +msgid "" +"A local filename could not be decoded.\n" +"Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " +"correctly.\n" +"Unless you fix this problem, files might be missing in the file listings.\n" +"No further warning will be displayed this session." +msgstr "" +"Et lokal filnavn kunne ikke afkodes.\n" +"Sørg for, at miljøvariablen LC_CTYPE (eller LC_ALL) er sat korrekt.\n" +"Hvis du ikke løser dette problem, kan der mangle filer i visningen af " +"mapper.\n" +"Der vises ikke flere advarsler om dette i denne session." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"En mistet hovedadgangskode kan ikke gendannes! Vær omhyggelig med at huske " +"din adgangskode." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 +msgid "A new version of FileZilla is available:" +msgstr "Der findes en ny version af FileZilla:" + +#: ../../locales/../src/interface/Mainfrm.cpp:711 +msgid "" +"A proper server always shows all files, but some broken servers hide files " +"from the user. Use this option to force the server to show all files." +msgstr "" +"En ordentlig server viser altid alle filer, men nogle dårligt konfigurerede " +"servere skjuler filer fra brugeren. Brug denne valgmulighed til at tvinge " +"serveren til at vise alle filer." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 +msgid "" +"A proper server does not require this. Contact the server administrator if " +"you need this." +msgstr "" +"En ordentlig server kræver ikke dette. Kontakt serverens administrator, hvis " +"du har brug for det." + +#: ../../locales/../src/interface/state.cpp:284 +msgid "" +"A remote operation is in progress and synchronized browsing is enabled.\n" +"Disable synchronized browsing and continue changing the local directory?" +msgstr "" +"En handling er i gang på fjernstedet, og synkroniseret gennemgang er slået " +"til.\n" +"Deaktivér synkroniseret gennemgang, og fortsæt med at skifte den lokale " +"mappe?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 +msgid "A&SCII" +msgstr "A&SCII" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 +msgid "A&dd" +msgstr "&Tilføj" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 +msgid "A&llow resume of ASCII files" +msgstr "T&illad genoptagelse af ASCII-filer" + +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 +msgid "A&pply only to downloads" +msgstr "S&kal kun gælde download" + +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 +msgid "A&pply only to uploads" +msgstr "S&kal kun gælde upload" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 +msgid "A&pply to all files and directories" +msgstr "S&kal gælde alle filer og mapper" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 +msgid "A&utomatically remove successful transfers" +msgstr "Fjern &automatisk fuldførte overførsler" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 +msgid "ASCII" +msgstr "ASCII" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 +msgid "About FileZilla" +msgstr "Om FileZilla" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 +msgid "Above the file lists" +msgstr "Over fillisterne" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Adgang til nogle lokale mapper kunne ikke genoprettes:" + +#: ../../locales/../src/engine/server.cpp:616 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 +msgid "Account" +msgstr "Konto" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 +msgid "Action after queue &completion" +msgstr "&Handling efter afvikling af kø" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 +msgid "Action on selected file:" +msgstr "Handling for den valgte fil:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 +msgid "Action to perform:" +msgstr "Handling der skal udføres:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 +msgid "Action:" +msgstr "Handling:" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 +msgid "Active mode" +msgstr "Aktiv tilstand" + +#: ../../locales/../src/interface/netconfwizard.cpp:627 +msgid "" +"Active mode FTP test failed. FileZilla does not know the correct external IP " +"address." +msgstr "" +"FTP-test i aktiv tilstand mislykkedes. FileZilla kender ikke den korrekte " +"eksterne IP-adresse." + +#: ../../locales/../src/interface/netconfwizard.cpp:614 +msgid "" +"Active mode FTP test failed. FileZilla does not know the correct external IP " +"address. In addition to that, your router has modified the sent address." +msgstr "" +"FTP-test i aktiv tilstand mislykkedes. FileZilla kender ikke den korrekte " +"eksterne IP-adresse. Desuden har din router ændret den sendte adresse." + +#: ../../locales/../src/interface/netconfwizard.cpp:602 +msgid "" +"Active mode FTP test failed. FileZilla knows the correct external IP " +"address, but your router or firewall has misleadingly modified the sent " +"address." +msgstr "" +"FTP-test i aktiv tilstand mislykkedes. FileZilla kender den korrekte " +"eksterne IP-adresse, men din router eller firewall har fejlagtigt ændret den " +"sendte adresse." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 +msgid "Active mode IP" +msgstr "Aktiv tilstand IP" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 +msgid "Add files to &queue only" +msgstr "&Tilføj kun filer i kø" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 +msgid "Add selected directory to the transfer queue" +msgstr "Tilføj den valgte mappe i overførselskøen" + +# scootergrisen: kilde: foreslå at ændre folder til directory som i andre strenge +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +msgid "Add selected files and folders to the transfer queue" +msgstr "Tilføj de valgte filer og mapper i overførselskøen" + +# scootergrisen: måske "Føj til"/"Sæt i" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 +msgid "Add to queue" +msgstr "Tilføj i kø" + +#: ../../locales/../src/engine/proxy.cpp:513 +msgid "Address type not supported" +msgstr "Adressetype ikke understøttet" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 +msgid "Advanced" +msgstr "Avanceret" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 +msgid "" +"Advice: Unless you want to test new features, please keep using stable " +"versions only. Beta versions and nightly builds are development versions " +"meant for testing purposes. Nightly builds of FileZilla may not work as " +"expected and might even damage your system. Use beta versions and nightly " +"builds at your own risk." +msgstr "" +"Et godt råd: medmindre du vil teste nye funktioner, bør du kun bruge stabile " +"versioner. Betaversioner og daglige byg er udviklingsversioner, der er " +"beregnet til testformål. De daglige byg af FileZilla virker måske ikke som " +"forventet, og kan endda forvolde skade på dit system. Brug af betaversioner " +"og daglige byg sker på egen risiko." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 +msgid "Al&ways perform this action" +msgstr "&Udfør altid denne handling" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 +msgid "Algorithm:" +msgstr "Algoritme:" + +#: ../../locales/../src/interface/QueueView.cpp:2658 +msgid "All files have been successfully transferred" +msgstr "Overførsel af alle filer lykkedes" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 +msgid "All ports in the given range have to be between 1024 and 65535." +msgstr "Alle porte i det angivne interval skal være mellem 1024 og 65535." + +#: ../../locales/../src/interface/QueueView.cpp:2654 +#, c-format +msgid "All transfers have finished. %d file could not be transferred." +msgid_plural "All transfers have finished. %d files could not be transferred." +msgstr[0] "Alle overførsler afsluttet. %d fil kunne ikke overføres." +msgstr[1] "Alle overførsler afsluttet. %d filer kunne ikke overføres." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 +msgid "Allow &fall back to other transfer mode on failure" +msgstr "&Tillad at falde tilbage til anden overførselstilstand ved fejl" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 +msgid "Allow fallback to other transfer mode on failure" +msgstr "Tillad tilbagefald til anden overførselstilstand ved fejl" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 +msgid "Already connected" +msgstr "Allerede tilsluttet" + +#: ../../locales/../src/interface/verifycertdialog.cpp:270 +msgid "Alternative name:" +msgid_plural "Alternative names:" +msgstr[0] "Alternativt navn:" +msgstr[1] "Alternative navne:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 +msgid "" +"Alternatively you can use the Pageant tool from PuTTY to manage your keys, " +"FileZilla does recognize Pageant." +msgstr "" +"Du kan som alternativ bruge værktøjet Pageant fra PuTTY til at håndtere dine " +"nøgler - FileZilla kan se Pageant." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 +msgid "" +"Alternatively you can use your system's SSH agent. To do so, make sure the " +"SSH_AUTH_SOCK environment variable is set." +msgstr "" +"Du kan som alternativ bruge SSH-agenten på dit system. For at gøre dette " +"skal du sikre dig, at miljøvariablen SSH_AUTH_SOCK er sat." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 +msgid "" +"Alternatively, you can also download the latest version from the FileZilla " +"website:" +msgstr "Du kan også downloade den seneste version fra FileZillas websted:" + +#: ../../locales/../src/interface/QueueView.cpp:1662 +#, c-format +msgid "" +"An error occurred loading the transfer queue from \"%s\".\n" +"Some queue items might not have been restored." +msgstr "" +"Der opstod en fejl ved indlæsning af overførselskøen fra \"%s\".\n" +"Det lykkedes måske ikke at gendanne alle emner i køen." + +#: ../../locales/../src/interface/QueueView.cpp:1555 +#, c-format +msgid "" +"An error occurred saving the transfer queue to \"%s\".\n" +"Some queue items might not have been saved." +msgstr "" +"Der opstod en fejl ved indlæsning af overførselskøen fra \"%s\".\n" +"Det lykkedes måske ikke at gemme alle emner i køen." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "En udsteder i certifikatkæden er ikke en certifikatmyndighed" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 +msgid "" +"An item with the same name as the dragged item already exists at the target " +"location." +msgstr "" +"Et emne med samme navn som det trukne emne findes allerede på " +"destinationsstedet." + +#: ../../locales/../src/engine/server.cpp:641 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 +msgid "Anonymous" +msgstr "Anonym" + +#: ../../locales/../src/interface/state.cpp:1084 +msgid "" +"Another remote operation is already in progress, cannot change directory now." +msgstr "En anden handling er i gang på fjernstedet - kan ikke skifte mappe nu." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 +msgid "Any changes made in the Site Manager could not be saved." +msgstr "Eventuelle ændringer i stedhåndteringen kunne ikke gemmes." + +#: ../../locales/../src/interface/filter.cpp:1004 +msgid "Any changes made to the filters could not be saved." +msgstr "Eventuelle ændringer i filtrene kunne ikke gemmes." + +#: ../../locales/../src/interface/filter.cpp:912 +msgid "Any changes made to the filters will not be saved." +msgstr "Eventuelle ændringer i filtrene vil ikke blive gemt." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 +msgid "App&ly to directories only" +msgstr "Skal kun gælde &mapper" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 +msgid "Apply" +msgstr "Anvend" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 +msgid "Apply to ¤t queue only" +msgstr "Skal kun gælde &aktuelle kø" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 +msgid "Apply to &files only" +msgstr "Skal kun gælde &filer" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 +msgid "Archive" +msgstr "Arkiv" + +#: ../../locales/../src/engine/socket.cpp:1107 +msgid "Argument buffer overflow" +msgstr "Overløb i parameter-buffer" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 +msgid "As tab in the transfer queue pane" +msgstr "Som faneblad i ruden Overførselskø" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 +msgid "Ask for action" +msgstr "Spørg efter handling" + +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/engine/server.cpp:633 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +msgid "Ask for password" +msgstr "Spørg efter adgangskode" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 +msgid "Ask operating system for a port." +msgstr "Spørg styresystemet om en port." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 +msgid "Ask your operating system for the external IP address" +msgstr "Spørg dit styresystem om den eksterne IP-adresse" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 +msgid "Asking questions in the FileZilla forums" +msgstr "Stil spørgsmål i FileZilla-foraene" + +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 +msgid "Associated program not found:" +msgstr "Det tilknyttede program blev ikke fundet:" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 +msgid "At least one filter condition is incomplete" +msgstr "Mindst en filterbetingelse er ufuldstændig" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 +msgid "At this point, all required information has been gathered." +msgstr "På dette tidspunkt er al nødvendig information indsamlet." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +msgid "Attribute" +msgstr "Attribut" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 +msgid "Authentication failed." +msgstr "Godkendelse mislykkedes." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 +msgid "Author:" +msgstr "Forfatter:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +msgid "Auto" +msgstr "Auto" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 +msgid "Automatic file type classification" +msgstr "Automatisk filtypeklassificering" + +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 +msgid "B " +msgstr "B " + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 +msgid "B&ypass proxy" +msgstr "F&orbigå proxy" + +#: ../../locales/../src/engine/socket.cpp:1071 +msgid "Bad file descriptor" +msgstr "Ugyldig fildeskriptor" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 +msgid "Basic usage instructions" +msgstr "Grundlæggende anvendelse" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 +msgid "Behaviour" +msgstr "Adfærd" + +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 +msgid "Being edited" +msgstr "Ved at blive redigeret" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 +msgid "Beware! Certificate has been revoked" +msgstr "Pas på! Certifikat er tilbagekaldt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 +msgid "Binary" +msgstr "Binær" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 +msgid "Blackboard" +msgstr "Tavle" + +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Blå" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 +msgid "Bookmark" +msgstr "Bogmærke" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 +msgid "Bookmark:" +msgstr "Bogmærke:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 +msgid "Bookmarks" +msgstr "Bogmærker" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 +msgid "Browse..." +msgstr "Gennemse..." + +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Bucket ikke fundet" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +msgid "Build date:" +msgstr "Bygdato:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 +msgid "Build information" +msgstr "Byginformation" + +#: ../../locales/../src/interface/verifycertdialog.cpp:433 +msgid "Business category:" +msgstr "Forretningskategori:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 +msgid "" +"By default uses any available local port to establish transfers in active " +"mode. If you want to limit FileZilla to use only a small range of ports, " +"please enter the port range below." +msgstr "" +"Som standard kan enhver tilgængelig port bruges til overførsler i aktiv " +"tilstand. Hvis du vil begrænse FileZilla til kun at bruge et lille interval " +"af porte, kan du indtaste det pågældende interval nedenfor." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 +msgid "C&ancel current operation" +msgstr "A&nnuller igangværende handling" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 +msgid "C&lear all" +msgstr "Ryd a<" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 +msgid "C&opy URL(s) to clipboard" +msgstr "Kopiér &URL(er) til udklipsholder" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "Kopiér &URL(er) med adgangskode til udklipsholder" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 +msgid "C&ustom" +msgstr "&Brugerdefineret" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 +msgid "C&ustom filetype associations:" +msgstr "Br&ugerdefinerede filtypetilknytninger:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 +msgid "CPU features:" +msgstr "CPU-funktioner:" + +#: ../../locales/../src/engine/ftp/list.cpp:123 +msgid "Calculating timezone offset of server..." +msgstr "Beregner serverens tidszoneforskydning..." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 +msgid "Can't read from file" +msgstr "Kan ikke læse fra fil" + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 +msgid "Can't write data to file." +msgstr "Kan ikke skrive data til fil." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 +#, c-format +msgid "Can't write data to file: %s" +msgstr "Kan ikke skrive data til filen: %s" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 +msgid "Cancel" +msgstr "Annuller" + +#: ../../locales/../src/interface/toolbar.cpp:45 +msgid "Cancel current operation" +msgstr "Annuller igangværende handling" + +#: ../../locales/../src/interface/toolbar.cpp:45 +msgid "Cancels the current operation" +msgstr "Annullerer den igangværende handling" + +#: ../../locales/../src/engine/local_path.cpp:473 +#, c-format +msgid "Cannot access '%s', no media inserted or drive not ready." +msgstr "Kan ikke tilgå '%s', intet medie eller drevet er ikke klar." + +#: ../../locales/../src/interface/Mainfrm.cpp:611 +msgid "Cannot add server to Site Manager" +msgstr "Kan ikke tilføje serveren i stedhåndtering" + +#: ../../locales/../src/engine/socket.cpp:1124 +msgid "Cannot assign requested address" +msgstr "Kan ikke tildele den angivne adresse" + +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Kan ikke skifte mappe - der er allerede en igangværende handling for " +"synkroniseret gennemgang." + +#: ../../locales/../src/interface/context_control.cpp:360 +msgid "" +"Cannot close tab while busy.\n" +"Cancel current operation and close tab?" +msgstr "" +"Kan ikke lukke faneblad mens det er i brug.\n" +"Annuller igangværende handling, og luk faneblad?" + +#: ../../locales/../src/interface/listingcomparison.cpp:74 +msgid "" +"Cannot compare directories, different filters for local and remote " +"directories are enabled" +msgstr "" +"Kan ikke sammenligne mapper - forskellige filtre for lokale og fjernmapper " +"er aktiveret" + +#: ../../locales/../src/interface/filteredit.cpp:143 +msgid "Cannot create new filter" +msgstr "Kan ikke oprette nyt filter" + +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 +msgid "Cannot edit file" +msgstr "Kan ikke redigere fil" + +#: ../../locales/../src/interface/LocalListView.cpp:1713 +msgid "Cannot edit file, not connected to any server." +msgstr "Kan ikke redigere mapper, ikke forbundet til en server." + +#: ../../locales/../src/interface/LocalListView.cpp:1722 +msgid "Cannot edit file, remote path unknown." +msgstr "Kan ikke redigere fil - sti på fjernsted ukendt." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 +msgid "" +"Cannot establish FTP connection to an SFTP server. Please select proper " +"protocol." +msgstr "" +"Kan ikke etablere FTP-forbindelse til en SFTP-server. Vælg den korrekte " +"protokol." + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 +msgid "Cannot load key file" +msgstr "Kan ikke indlæse nøglefil" + +#: ../../locales/../src/interface/Mainfrm.cpp:1077 +msgid "Cannot load toolbar from resource file" +msgstr "Kan ikke indlæse værktøjslinje fra ressourcefilen" + +#: ../../locales/../src/interface/manual_transfer.cpp:439 +msgid "Cannot remember password" +msgstr "Kan ikke huske adgangskode" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 +msgid "Cannot rename entry" +msgstr "Kan ikke omdøbe post" + +#: ../../locales/../src/interface/RemoteListView.cpp:1633 +msgid "Cannot rename file" +msgstr "Kan ikke omdøbe fil" + +#: ../../locales/../src/engine/proxy.cpp:139 +msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." +msgstr "" +"Kan ikke fortolke værtsnavn til IPv4-adresse, så den kan bruges med SOCKS4-" +"proxy." + +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 +msgid "Cannot save filterset" +msgstr "Kan ikke gemme filtersæt" + +#: ../../locales/../src/interface/filter.cpp:206 +msgid "Cannot select filter" +msgstr "Kan ikke vælge filter" + +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 +msgid "Cannot set file association" +msgstr "Kan ikke sætte filtypetilknytning" + +#: ../../locales/../src/interface/edithandler.cpp:1125 +msgid "Cannot show dialog" +msgstr "Kan ikke vise dialog" + +#: ../../locales/../src/interface/edithandler.cpp:1696 +msgid "Cannot view/edit selected file" +msgstr "Kan ikke vise/redigere den valgte fil" + +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Ingen forskel på store og små bogstaver" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 +msgid "Case insensitive" +msgstr "Ingen forskel på store og små bogstaver" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 +msgid "Case insensitive (default)" +msgstr "Ingen forskel på store og små bogstaver (standard)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +msgid "Case sensitive" +msgstr "Forskel på store og små bogstaver" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +msgid "Case sensitive (default)" +msgstr "Forskel på store og små bogstaver (standard)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 +msgid "Categories to clear" +msgstr "Kategorier der skal ryddes" + +#: ../../locales/../src/interface/statusbar.cpp:516 +msgid "Certificate and session data are not available yet." +msgstr "Certifikat og sessionsdata er endnu ikke tilgængelig." + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 +msgid "Certificate in chain:" +msgstr "Certifikat i kæde:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 +msgid "Certificate issuer" +msgstr "Certifikatudsteder" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Kontrol af certifikatunderskrift mislykkedes" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 +msgid "Challenge:" +msgstr "Udfordring:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 +msgid "Change file attributes" +msgstr "Rediger filattributter" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 +msgid "Change the file permissions." +msgstr "Rediger filtilladelser." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 +msgid "Changing logfile settings requires restart of FileZilla." +msgstr "Ændringer i logfil-indstillinger kræver genstart af FileZilla." + +#: ../../locales/../src/interface/FileZilla.cpp:605 +msgid "Character encoding issue" +msgstr "Problem med tegnkodning" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 +msgid "Charset" +msgstr "Tegnsæt" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 +msgid "Check for &updates..." +msgstr "&Søg efter opdateringer..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +msgid "Check for FileZilla &updates automatically:" +msgstr "Søg automatisk efter &opdateringer til FileZilla:" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:4 +msgid "Check for Updates" +msgstr "Søg efter opdateringer" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +msgid "Check for newer versions of FileZilla" +msgstr "Søg efter nyere versioner af FileZilla" + +#: ../../locales/../src/interface/update_dialog.cpp:59 +msgid "Check for updates failed" +msgstr "Søgning efter opdateringer mislykkedes" + +#: ../../locales/../src/engine/ftp/logon.cpp:283 +msgid "" +"Check your login credentials. The entered password starts or ends with a " +"space character." +msgstr "" +"Tjek dine loginoplysninger. Den indtastede adgangskode begynder eller " +"slutter med et mellemrum." + +#: ../../locales/../src/engine/ftp/logon.cpp:279 +msgid "" +"Check your login credentials. The entered username starts or ends with a " +"space character." +msgstr "" +"Tjek dine loginoplysninger. Det indtastede brugernavn begynder eller slutter " +"med et mellemrum." + +#: ../../locales/../src/interface/netconfwizard.cpp:780 +msgid "Checking for correct external IP address" +msgstr "Kontrollerer korrekt ekstern IP-adresse" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 +msgid "Checking for updates..." +msgstr "Søger efter opdateringer..." + +#: ../../locales/../src/interface/updater.cpp:780 +#, c-format +msgid "Checksum match on file %s\n" +msgstr "Tjeksum passer for filen %s\n" + +#: ../../locales/../src/interface/updater.cpp:776 +#, c-format +msgid "Checksum mismatch on file %s\n" +msgstr "Tjeksum passer ikke for filen %s\n" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 +msgid "Choose a key file" +msgstr "Vælg en nøglefil" + +# scootergrisen: Niels skrev "HVAD ER STANDARD-LOKAL? MIN OMSKRIVNING ER BEDRE." +# scootergrisen: jeg ved ikke hvad "STANDARD-LOKAL" er men der stod "standard-lokal mappe" +# scootergrisen: mit bud er "Vælg lokal mappens standardplacering" eller "Vælg lokal mappens standardsti" eller "Vælg lokal mappens standardmappe" +# scootergrisen: nb_NO bruger "Velg lokal standardmappe" så vi kunne bruge "Vælg lokal standardmappe" +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 +msgid "Choose the default local directory" +msgstr "Vælg standardplacering af lokalmappe" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 +msgid "Choose the local directory" +msgstr "Vælg den lokale mappe" + +#: ../../locales/../src/engine/http/request.cpp:668 +msgid "Chunk data improperly terminated" +msgstr "Chunk-data ikke afsluttet korrekt" + +# scootergrisen: mit bud er "Chiffer:" +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 +msgid "Cipher:" +msgstr "Krypteringsalgoritme:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 +msgid "Cl&ose tab" +msgstr "&Luk faneblad" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 +msgid "Classic" +msgstr "Klassisk" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 +msgid "Clear &layout cache" +msgstr "Ryd &layout-mellemlager" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Ryd data for automatisk &opdatering" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 +msgid "Clear history" +msgstr "Ryd historik" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 +msgid "Clear private data" +msgstr "Ryd personlige data" + +#: ../../locales/../src/interface/quickconnectbar.cpp:196 +msgid "Clear quickconnect bar" +msgstr "Ryd lyntilslutningslinje" + +#: ../../locales/../src/interface/netconfwizard.cpp:593 +msgid "Click on Finish to save your configuration." +msgstr "Klik på Udfør for at gemme konfigurationen." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 +msgid "Client to server MAC:" +msgstr "Klient-til-server-MAC:" + +# scootergrisen: mit bud er "Klient-til-server-chiffer:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 +msgid "Client to server cipher:" +msgstr "Klient-til-server-krypteringsalgoritme:" + +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Luk" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 +msgid "Close &all other tabs" +msgstr "Luk alle &andre faneblade" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 +msgid "Close FileZilla" +msgstr "Luk FileZilla" + +#: ../../locales/../src/interface/cmdline.cpp:15 +msgid "Close all running instances of FileZilla" +msgstr "Luk alle åbne instanser af FileZilla" + +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Luk lynsøgning, og fortsæt med at sammenligne?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 +msgid "Closes current tab" +msgstr "Lukker aktuelt faneblad" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +msgid "Co&mments:" +msgstr "Kommenta&rer:" + +#: ../../locales/../src/interface/listctrlex.cpp:745 +msgid "Column properties" +msgstr "Kolonneegenskaber" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +msgid "Column setup" +msgstr "Kolonneopsætning" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 +msgid "Command and its arguments should be properly quoted." +msgstr "Kommandoen og dens parametre skal sættes korrekt i anførselstegn." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 +msgid "Command failed" +msgstr "Kommando mislykkedes" + +#: ../../locales/../src/engine/proxy.cpp:510 +msgid "Command not supported" +msgstr "Kommando ikke understøttet" + +#: ../../locales/../src/engine/engineprivate.cpp:224 +msgid "Command not supported by this protocol" +msgstr "Kommando understøttes ikke af denne protokol" + +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 +msgid "Command:" +msgstr "Kommando:" + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 +msgid "Comment" +msgstr "Kommentar" + +#: ../../locales/../src/interface/verifycertdialog.cpp:431 +msgid "Common name:" +msgstr "Alment navn:" + +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 +msgid "Communication tainted by router or firewall" +msgstr "Kommunikationen forstyrret af router eller firewall" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 +msgid "Compare &modification time" +msgstr "Sammenlign &ændringstid" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +msgid "Compare file&size" +msgstr "Sammenlign &filstørrelse" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 +msgid "Comparison &threshold (in minutes):" +msgstr "Sammenlignings&grænse (i minutter):" + +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 +msgid "Comparison threshold needs to be between 0 and 1440 minutes." +msgstr "Sammenligningsgrænsen skal være mellem 0 og 1440 minutter." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 +msgid "Compiled for:" +msgstr "Kompileret til:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 +msgid "Compiled on:" +msgstr "Kompileret på:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 +msgid "Compiled with:" +msgstr "Kompileret med:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 +msgid "Compiler flags:" +msgstr "Kompiler-flag:" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 +msgid "Compressed" +msgstr "Komprimeret" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 +msgid "Concurrent transfers" +msgstr "Samtidige overførsler" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 +msgid "Conditions are c&ase sensitive" +msgstr "Betingelser skelner mellem s&tore og små bogstaver" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 +msgid "Configuration test" +msgstr "Konfigurationstest" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:115 +msgid "Configure passive mode" +msgstr "Konfigurer passiv tilstand" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 +msgid "Configure port range" +msgstr "Konfigurer portinterval" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 +msgid "Configuring FileZilla and your network" +msgstr "Konfiguration af FileZilla og dit netværk" + +#: ../../locales/../src/interface/search.cpp:1267 +msgid "Confirm deletion" +msgstr "Bekræft sletning" + +#: ../../locales/../src/interface/edithandler.cpp:1638 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 +msgid "Confirmation needed" +msgstr "Skal bekræftes" + +#: ../../locales/../src/interface/netconfwizard.cpp:589 +msgid "Congratulations, your configuration seems to be working." +msgstr "Tillykke - din konfiguration ser ud til at fungere." + +#: ../../locales/../src/interface/quickconnectbar.cpp:194 +msgid "Connect bypassing proxy settings" +msgstr "Opret forbindelse ved at forbigå proxy-indstillinger" + +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Forbindelsen mislykkedes: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 +msgid "Connect in current tab" +msgstr "Opret forbindelsen i aktuelt faneblad" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +msgid "Connect in new tab" +msgstr "Opret forbindelsen i nyt faneblad" + +#: ../../locales/../src/interface/cmdline.cpp:8 +msgid "Connect to specified Site Manager site" +msgstr "Opret forbindelsen til det angivne sted i stedhåndtering" + +#: ../../locales/../src/interface/queue.cpp:353 +msgid "Connecting" +msgstr "Opretter forbindelse" + +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 +#, c-format +msgid "Connecting to %s" +msgstr "Opretter forbindelse til %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 +#, c-format +msgid "Connecting to %s through %s proxy" +msgstr "Opretter forbindelse til %s gennem proxyen %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 +#, c-format +msgid "Connecting to %s..." +msgstr "Opretter forbindelse til %s..." + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 +msgid "Connection" +msgstr "Forbindelse" + +#: ../../locales/../src/engine/socket.cpp:1085 +msgid "Connection aborted" +msgstr "Forbindelsen blev afbrudt" + +#: ../../locales/../src/interface/queue.cpp:354 +msgid "Connection attempt failed" +msgstr "Forbindelsesforsøg mislykkedes" + +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:212 +#, c-format +msgid "Connection attempt failed with \"%s\", trying next address." +msgstr "Forbindelsesforsøg mislykkedes med \"%s\". Prøver næste adresse." + +#: ../../locales/../src/engine/ControlSocket.cpp:963 +#, c-format +msgid "Connection attempt failed with \"%s\"." +msgstr "Forbindelsesforsøg mislykkedes med \"%s\"." + +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 +msgid "Connection attempt interrupted by user" +msgstr "Forbindelsesforsøg blev afbrudt af brugeren" + +#: ../../locales/../src/engine/socket.cpp:1078 +msgid "Connection attempt timed out" +msgstr "Forbindelsesforsøg blev afsluttet ved timeout" + +#: ../../locales/../src/interface/netconfwizard.cpp:562 +msgid "Connection closed" +msgstr "Forbindelsen blev lukket" + +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:303 +#: ../../locales/../src/engine/http/request.cpp:316 +#: ../../locales/../src/engine/http/request.cpp:327 +#: ../../locales/../src/engine/http/request.cpp:338 +msgid "Connection closed by server" +msgstr "Forbindelsen blev lukket af serveren" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 +msgid "Connection established, initializing TLS..." +msgstr "Forbindelsen blev etableret, initialiserer TLS..." + +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 +msgid "Connection established, sending HTTP request" +msgstr "Forbindelsen blev etableret, sender HTTP-anmodning" + +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Forbindelsen blev etableret, venter på velkomstbesked." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 +msgid "Connection established, waiting for welcome message..." +msgstr "Forbindelsen blev etableret, venter på velkomstbesked..." + +#: ../../locales/../src/interface/netconfwizard.cpp:360 +msgid "Connection lost" +msgstr "Forbindelsen er mistet" + +#: ../../locales/../src/engine/proxy.cpp:495 +msgid "Connection not allowed by ruleset" +msgstr "Forbindelsen tillades ikke af regelsættet" + +#: ../../locales/../src/engine/proxy.cpp:504 +msgid "Connection refused" +msgstr "Forbindelsen blev nægtet" + +#: ../../locales/../src/engine/socket.cpp:1072 +msgid "Connection refused by server" +msgstr "Forbindelsen blev nægtet af serveren" + +#: ../../locales/../src/engine/socket.cpp:1081 +msgid "Connection reset by network" +msgstr "Forbindelsen blev nulstillet af netværket" + +#: ../../locales/../src/engine/socket.cpp:1086 +msgid "Connection reset by peer" +msgstr "Forbindelsen blev nulstillet af peer" + +#: ../../locales/../src/engine/ControlSocket.cpp:516 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "Forbindelsen fik timeout efter %d sekunds inaktivitet" +msgstr[1] "Forbindelsen fik timeout efter %d sekunders inaktivitet" + +#: ../../locales/../src/interface/netconfwizard.cpp:1079 +msgid "Connection timed out." +msgstr "Forbindelsen fik timeout." + +#: ../../locales/../src/interface/search.cpp:724 +msgid "Connection to server lost." +msgstr "Forbindelsen til serveren er mistet." + +#: ../../locales/../src/engine/proxy.cpp:223 +msgid "Connection with proxy established, performing handshake..." +msgstr "Forbindelsen til proxyen blev etableret, udfører håndtryk..." + +#: ../../locales/../src/interface/netconfwizard.cpp:582 +msgid "Connection with server got closed prematurely." +msgstr "Forbindelsen til serveren blev lukket for tidligt." + +#: ../../locales/../src/interface/netconfwizard.cpp:573 +msgid "Connection with the test server failed." +msgstr "Forbindelsen til testserveren mislykkedes." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 +msgid "Convert key file" +msgstr "Konvertér nøglefil" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 +#, c-format +msgid "Copy (%d) of %s" +msgstr "Kopiér (%d) af %s" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 +#, c-format +msgid "Copy of %s" +msgstr "Kopi af %s" + +# scootergrisen: jeg synes det er forkert at skrive "til de valgte emner", eftersom de ikke kopieres til de valgte emne men fra +# scootergrisen: alternativt "Kopiér URL'erne fra de valgte emner til udklipsholder, inklusive adgangskode." +# scootergrisen: sv bruger "Kopiera URL:erna för de markerade objekten till urklipp." så vi kunne også bruge "Kopiér URL'erne for de valgte emner til udklipsholder." +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Kopiér de valgte emners URL'er til udklipsholder, inklusive adgangskode." + +# scootergrisen: jeg synes det er forkert at skrive "til de valgte emner", eftersom de ikke kopieres til de valgte emne men fra +# scootergrisen: alternativt "Kopiér URL'erne fra de valgte emner til udklipsholder." +# scootergrisen: sv bruger "Kopiera URL:erna för de markerade objekten till urklipp." så vi kunne også bruge "Kopiér URL'erne for de valgte emner til udklipsholder." +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 +msgid "Copy the URLs of the selected items to clipboard." +msgstr "Kopiér de valgte emners URL'er til udklipsholder." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 +#, c-format +msgid "Could not accept connection: %s" +msgstr "Kunne ikke acceptere forbindelse: %s" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Kunne ikke tilgå stien %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Kunne ikke tilføje certifikat i midlertidig tillidsliste" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +msgid "Could not add connection to Site Manager" +msgstr "Kunne ikke tilføje forbindelsen i stedhåndtering" + +#: ../../locales/../src/interface/state.cpp:868 +msgid "Could not complete operation" +msgstr "Kunne ikke fuldføre handling" + +#: ../../locales/../src/engine/ControlSocket.cpp:178 +msgid "Could not connect to server" +msgstr "Kunne ikke forbinde til server" + +#: ../../locales/../src/engine/ControlSocket.cpp:1096 +#, c-format +msgid "Could not connect to server: %s" +msgstr "Kunne ikke forbinde til server: %s" + +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 +msgid "Could not convert command to server encoding" +msgstr "Kunne ikke konvertere kommando til serveres kodning" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 +msgid "Could not convert private key" +msgstr "Kunne ikke konvertere privat nøgle" + +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 +msgid "Could not copy URLs" +msgstr "Kunne ikke kopiere URL'er" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Kunne ikke kopiere certifikat" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +msgid "Could not copy data" +msgstr "Kunne ikke kopiere data" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Kunne ikke oprette CFURL fra stien %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Kunne ikke oprette URI til denne overførsel." + +#: ../../locales/../src/interface/updater.cpp:511 +#, c-format +msgid "Could not create local file %s\n" +msgstr "Kunne ikke oprette lokal fil %s\n" + +#: ../../locales/../src/engine/logging.cpp:179 +#, c-format +msgid "Could not create logging mutex: %s" +msgstr "Kunne ikke oprette log-mutex: %s" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Kunne ikke oprette \"security-scoped\" bogmærke fra URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 +msgid "" +"Could not determine the target of the Drag&Drop operation.\n" +"Either the shell extension is not installed properly or you didn't drop the " +"files into an Explorer window." +msgstr "" +"Kunne ikke bestemme destinationen for træk og slip-handlingen.\n" +"Enten er skal-udvidelsen ikke installeret korrekt, eller du slap ikke " +"filerne i et Stifinder-vindue." + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 +msgid "Could not establish connection to server" +msgstr "Kunne ikke etablere forbindelse til server" + +#: ../../locales/../src/interface/FileZilla.cpp:451 +msgid "" +"Could not find the resource files for FileZilla, closing FileZilla.\n" +"You can set the data directory of FileZilla using the '--datadir " +"' commandline option or by setting the FZ_DATADIR environment " +"variable." +msgstr "" +"Kunne ikke finde ressourcefilerne til FileZilla - afslutter FileZilla.\n" +"Du kan angive datamappe for FileZilla ved at bruge kommandolinjeparameteren " +"'--datadir ' eller ved at sætte miljøvariablen FZ_DATADIR." + +#: ../../locales/../src/engine/ftp/logon.cpp:748 +msgid "Could not generate custom login sequence." +msgstr "Kunne ikke generere en brugerdefineret login-sekvens." + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Kunne ikke generere nøgle" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 +msgid "" +"Could not get distinguished name of certificate issuer, " +"gnutls_x509_get_issuer_dn failed" +msgstr "" +"Kunne ikke få entydigt navn på certifikatudstederen - " +"gnutls_x509_get_issuer_dn mislykkedes" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 +msgid "" +"Could not get distinguished name of certificate subject, gnutls_x509_get_dn " +"failed" +msgstr "" +"Kunne ikke få entydigt navn på certifikatets emne - gnutls_x509_get_dn " +"mislykkedes" + +#: ../../locales/../src/interface/state.cpp:1069 +msgid "Could not get full remote path." +msgstr "Kunne ikke hente den fulde fjernsti." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Kunne ikke få \"native\" sti fra CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Kunne ikke få sti fra URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 +msgid "Could not get reply from fzputtygen." +msgstr "Kunne ikke få svar fra fzputtygen." + +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 +msgid "Could not get temporary directory to download file into." +msgstr "Kunne ikke få midlertidig mappe at downloade filen til." + +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Kunne ikke initialisere Winsock (%d): %s" + +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 +#, c-format +msgid "" +"Could not load \"%s\", please make sure the file is valid and can be " +"accessed.\n" +"Any changes made in the Site Manager will not be saved." +msgstr "" +"Kunne ikke indlæse \"%s\" - sørg for at filen er gyldig og at der er adgang " +"til den.\n" +"Eventuelle ændringer i stedhåndteringen vil ikke blive gemt." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 +msgid "Could not load key file" +msgstr "Kunne ikke indlæse nøglefil" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +msgid "Could not load private key" +msgstr "Kunne ikke indlæse privat nøgle" + +#: ../../locales/../src/interface/state.cpp:1092 +#, c-format +msgid "" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" +"Disable synchronized browsing and continue changing the remote directory?" +msgstr "" +"Kunne ikke finde den tilsvarende lokale mappe for fjernmappen '%s'.\n" +"Deaktivér synkroniseret gennemgang, og fortsæt med at skifte fjernmappen?" + +#: ../../locales/../src/interface/state.cpp:401 +#, c-format +msgid "" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" +"Synchronized browsing has been disabled." +msgstr "" +"Kunne ikke finde den tilsvarende lokale mappe for fjernmappen '%s'.\n" +"Synkroniseret gennemgang er blevet deaktiveret." + +#: ../../locales/../src/interface/state.cpp:294 +#, c-format +msgid "" +"Could not obtain corresponding remote directory for the local directory " +"'%s'.\n" +"Synchronized browsing has been disabled." +msgstr "" +"Kunne ikke finde den tilsvarende fjernmappe for den lokale mappe '%s'.\n" +"Synkroniseret gennemgang er blevet deaktiveret." + +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Kunne ikke hente størrelsen af: %s" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Kunne ikke åbne '%s'" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 +msgid "Could not open clipboard" +msgstr "Kunne ikke åbne udklipsholder" + +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 +#, c-format +msgid "Could not open log file: %s" +msgstr "Kunne ikke åbne logfil: %s" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +msgid "Could not parse remote path." +msgstr "Kunne ikke fortolke fjernstien." + +#: ../../locales/../src/interface/quickconnectbar.cpp:114 +msgid "Could not parse server address:" +msgstr "Kunne ikke fortolke serveradressen:" + +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Kunne ikke læse fra '%s'" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "Kunne ikke læse fra datasokkel." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:380 +#, c-format +msgid "Could not read from socket: %s" +msgstr "Kunne ikke læse fra sokkel: %s" + +#: ../../locales/../src/interface/sitemanager.cpp:556 +msgid "Could not read server item." +msgstr "Kunne ikke læse serveremne." + +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Kunne ikke modtage data fra server." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Kunne ikke genoprette adgang til mappe" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Kunne ikke søge til forskydning %d i filen" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Kunne ikke søge til begyndelsen af filen" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 +msgid "Could not seek to the end of the file" +msgstr "Kunne ikke søge til slutningen af filen" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +msgid "Could not send command to fzputtygen." +msgstr "Kunne ikke sende kommando til fzputtygen." + +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Kunne ikke sende kommando til fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Kunne ikke sortere peer-certifikater" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 +msgid "Could not spawn IO thread" +msgstr "Kunne ikke danne IO-tråd" + +#: ../../locales/../src/engine/ControlSocket.cpp:1077 +#, c-format +msgid "Could not start proxy handshake: %s" +msgstr "Kunne ikke starte proxy-håndtryk: %s" + +#: ../../locales/../src/interface/queue.cpp:359 +msgid "Could not start transfer" +msgstr "Kunne ikke starte overførsel" + +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 +#, c-format +msgid "" +"Could not write \"%s\", any changes to the Site Manager could not be saved: " +"%s" +msgstr "" +"Kunne ikke skrive \"%s\" - eventuelle ændringer i stedhåndteringen kunne " +"ikke gemmes: %s" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 +#, c-format +msgid "Could not write \"%s\", the bookmark could not be added: %s" +msgstr "Kunne ikke skrive \"%s\" - bogmærket kunne ikke tilføjes: %s" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 +#, c-format +msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" +msgstr "Kunne ikke skrive \"%s\" - de globale bogmærker kunne ikke gemmes: %s" + +#: ../../locales/../src/interface/QueueView.cpp:1586 +#, c-format +msgid "" +"Could not write \"%s\", the queue could not be saved.\n" +"%s" +msgstr "" +"Kunne ikke skrive \"%s\" - køen kunne ikke gemmes.\n" +"%s" + +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 +#, c-format +msgid "Could not write \"%s\", the selected sites could not be exported: %s" +msgstr "Kunne ikke skrive \"%s\" - de valgte steder kunne ikke eksporteres: %s" + +#: ../../locales/../src/interface/xmlfunctions.cpp:151 +#, c-format +msgid "Could not write \"%s\":" +msgstr "Kunne ikke skrive \"%s\":" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 +#, c-format +msgid "Could not write key file: %s" +msgstr "Kunne ikke skrive nøglefil: %s" + +#: ../../locales/../src/interface/queue.cpp:358 +msgid "Could not write to local file" +msgstr "Kunne ikke skrive til lokal fil" + +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 +#, c-format +msgid "Could not write to log file: %s" +msgstr "Kunne ikke skrive til logfil: %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:235 +#, c-format +msgid "Could not write to socket: %s" +msgstr "Kunne ikke skrive til sokkel: %s" + +#: ../../locales/../src/interface/verifycertdialog.cpp:436 +msgid "Country:" +msgstr "Land:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +msgid "Crea&te new file" +msgstr "Opret &ny fil" + +#: ../../locales/../src/interface/state.cpp:1107 +msgid "Create &missing local directory and enter it" +msgstr "Opret &manglende lokalmappe, og skift til den" + +#: ../../locales/../src/interface/state.cpp:1029 +msgid "Create &missing remote directory and enter it" +msgstr "Opret &manglende fjernmappe, og skift til den" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 +msgid "Create a new subdirectory in the current directory" +msgstr "Opret en ny undermappe i den aktuelle mappe" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 +msgid "Create a new subdirectory in the current directory and change into it" +msgstr "Opret en ny undermappe i den aktuelle mappe, og skift til den" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 +msgid "Create a new, empty file in the current directory" +msgstr "Opret en ny, tom fil i den aktuelle mappe" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 +msgid "Create director&y and enter it" +msgstr "Opret &mappe, og skift til den" + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 +msgid "Create directory" +msgstr "Opret mappe" + +#: ../../locales/../src/interface/RemoteListView.cpp:2702 +msgid "Create empty file" +msgstr "Opret tom fil" + +#: ../../locales/../src/interface/queue.cpp:361 +msgid "Creating directory" +msgstr "Opretter mappe" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 +#, c-format +msgid "Creating directory '%s'..." +msgstr "Opretter mappe '%s'..." + +#: ../../locales/../src/engine/ControlSocket.cpp:170 +msgid "Critical error" +msgstr "Kritisk fejl" + +#: ../../locales/../src/engine/ControlSocket.cpp:161 +msgid "Critical error:" +msgstr "Kritisk fejl:" + +#: ../../locales/../src/engine/ControlSocket.cpp:112 +msgid "Critical file transfer error" +msgstr "Kritisk fejl i filoverførsel" + +#: ../../locales/../src/engine/ControlSocket.cpp:92 +#, c-format +msgid "Critical file transfer error after transferring %s in %s" +msgstr "Kritisk fejl i filoverførsel efter overførsel af %s på %s" + +#: ../../locales/../src/interface/state.cpp:392 +#, c-format +msgid "" +"Current remote directory (%s) is not below the synchronization root (%s).\n" +"Synchronized browsing has been disabled." +msgstr "" +"Den aktuelle fjernmappe (%s) er ikke under synkroniseringsroden (%s).\n" +"Synkroniseret gennemgang er blevet deaktiveret." + +#: ../../locales/../src/interface/statusbar.cpp:402 +msgid "Current transfer type is set to ASCII." +msgstr "Aktuel overførselstype er sat til ASCII." + +#: ../../locales/../src/interface/statusbar.cpp:410 +msgid "Current transfer type is set to automatic detection." +msgstr "Aktuel overførselstype er sat til automatisk." + +#: ../../locales/../src/interface/statusbar.cpp:406 +msgid "Current transfer type is set to binary." +msgstr "Den aktuelle overførselstype er sat til binær." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 +msgid "Curve:" +msgstr "Kurve:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 +msgid "Cus&tom" +msgstr "Bruger&defineret" + +#: ../../locales/../src/interface/filter.cpp:109 +msgid "Custom filter set" +msgstr "Brugerdefineret filtersæt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 +msgid "Custom server" +msgstr "Brugerdefineret server" + +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Cyan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 +msgid "D&ata type" +msgstr "D&atatype" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 +msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" +msgstr "De&cimalt præfiks med SI-symboler (f.eks. 1 KB = 1000 byte)" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +msgid "D&efault" +msgstr "Standa&rd" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 +msgid "D&elete" +msgstr "S&let" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 +msgid "D&irectory comparison" +msgstr "&Mappesammenligning" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 +msgid "D&isable all" +msgstr "&Deaktivér alle" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +msgid "D&o not save passwords" +msgstr "Gem ikke &adgangskoder" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 +msgid "D&ouble-click action on directories:" +msgstr "Handling ved &dobbeltklik på mapper:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 +msgid "D&uplicate" +msgstr "D&uplikér" + +#: ../../locales/../src/engine/server.cpp:56 +msgid "DOS-like with virtual paths" +msgstr "DOS-agtig med virtuelle stier" + +#: ../../locales/../src/interface/edithandler.cpp:1678 +msgid "Dangerous filetype" +msgstr "Farlig filtype" + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 +msgid "Data" +msgstr "Data" + +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 +msgid "Data socket closed too early." +msgstr "Datasokkel lukket for tidligt." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 +msgid "Date" +msgstr "Dato" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 +msgid "Date formatting" +msgstr "Datoformatering" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 +msgid "Date/time format" +msgstr "Dato-/klokkeslætformat" + +#: ../../locales/../src/interface/fileexistsdlg.cpp:49 +msgid "Date/time unknown" +msgstr "Dato/klokkeslæt ukendt" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +msgid "Debug" +msgstr "Fejlfinding" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 +msgid "Debugging settings" +msgstr "Fejlfindingsindstillinger" + +# scootergrisen: mit bud er "&Lokal mappens standardplacering" eller "&Lokal mappens standardsti" eller "&Lokal mappens standardmappe" +# scootergrisen: sv bruger "Standardkatalog (&lokal):" så vi kunne også bruge "Standardmappe (&lokal):" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 +msgid "Default &local directory:" +msgstr "Standardplacering af &lokalmappe:" + +#: ../../locales/../src/engine/server.cpp:48 +msgid "Default (Autodetect)" +msgstr "Standard (Automatisk registrering)" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 +msgid "Default editor not properly quoted." +msgstr "Standardredigeringsprogram ikke sat korrekt i anførselstegn." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 +msgid "Default file exists action" +msgstr "Standardhandling når filen findes" + +# scootergrisen: mit bud er "&Fjernmappens standardplacering:" eller "&Fjernmappens standardsti:" eller "&Fjernmappens standardmappe:" +# scootergrisen: sv bruger "Standardkatalog (&fjärr):" så vi kunne også bruge "Standardmappe (&fjern):" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 +msgid "Default r&emote directory:" +msgstr "Standardplacering af &fjernmappe:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +msgid "" +"Default remote path cannot be parsed. Make sure it is a valid absolute path " +"for the selected server type." +msgstr "" +"Standard-fjernstien kunne ikke fortolkes. Sørg for, at det er en gyldig, " +"absolut sti for den valgte servertype." + +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +msgid "Default system language" +msgstr "Systemets standardsprog" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 +msgid "Default transfer mode:" +msgstr "Standard-overførselstilstand:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 +msgid "Default transfer type:" +msgstr "Standard-overførselstype:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 +msgid "Default: http://ip.filezilla-project.org/ip.php" +msgstr "Standard: http://ip.filezilla-project.org/ip.php" + +#: ../../locales/../src/interface/settings/optionspage_connection.cpp:41 +msgid "" +"Delay between failed connection attempts has to be between 1 and 999 seconds." +msgstr "" +"Forsinkelse mellem mislykkede forbindelsesforsøg skal være mellem 1 og 999 " +"sekunder." + +#: ../../locales/../src/engine/engineprivate.cpp:516 +#, c-format +msgid "" +"Delaying connection for %d second due to previously failed connection " +"attempt..." +msgid_plural "" +"Delaying connection for %d seconds due to previously failed connection " +"attempt..." +msgstr[0] "" +"Udsætter forbindelse i %d sekund på grund af tidligere mislykkedet " +"forbindelsesforsøg..." +msgstr[1] "" +"Udsætter forbindelse i %d sekunder på grund af tidligere mislykkedet " +"forbindelsesforsøg..." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 +msgid "Delete Site Manager entry" +msgstr "Slet post i stedhåndtering" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 +msgid "Delete selected directory" +msgstr "Slet den valgte mappe" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +msgid "Delete selected files and directories" +msgstr "Slet de valgte filer og mapper" + +#: ../../locales/../src/engine/engineprivate.cpp:392 +#, c-format +msgid "Deleting \"%s\"" +msgstr "Sletter \"%s\"" + +#: ../../locales/../src/engine/engineprivate.cpp:395 +#, c-format +msgid "Deleting %u files from \"%s\"" +msgstr "Sletter %u filer fra \"%s\"" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 +msgid "Deleting symbolic link" +msgstr "Sletter symbolsk link" + +#: ../../locales/../src/interface/LocalTreeView.cpp:986 +msgid "Desktop" +msgstr "Skrivebord" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 +msgid "Details" +msgstr "Detaljer" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 +msgid "Details for new key:" +msgstr "Detaljer for ny nøgle:" + +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 +msgid "Detected newer version of FileZilla" +msgstr "Der findes en nyere version af FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 +msgid "Dire&ctories" +msgstr "Ma&pper" + +#: ../../locales/../src/interface/queue.cpp:1214 +msgid "Direction" +msgstr "Retning" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Mapper:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 +msgid "Directory" +msgstr "Mappe" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Adgangstilladelser for mappe" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 +msgid "Directory comparison" +msgstr "Mappesammenligning" + +#: ../../locales/../src/interface/listingcomparison.cpp:74 +msgid "Directory comparison failed" +msgstr "Mappesammenligning mislykkedes" + +#: ../../locales/../src/interface/settings/optionspage_logging.cpp:71 +msgid "Directory containing the logfile does not exist or filename is invalid." +msgstr "Mappe med logfilen findes ikke, eller filnavnet er ugyldigt." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "Mappevisnings&filtre..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 +msgid "Directory listing aborted by user" +msgstr "Mappevisning blev afbrudt af brugeren" + +#: ../../locales/../src/interface/RemoteListView.cpp:2090 +msgid "Directory listing failed" +msgstr "Mappevisning mislykkedes" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 +msgid "Directory listing filters" +msgstr "Mappevisningsfiltre" + +#: ../../locales/../src/engine/ControlSocket.cpp:193 +#, c-format +msgid "Directory listing of \"%s\" successful" +msgstr "Mappevisning af \"%s\" blev vist" + +#: ../../locales/../src/engine/ControlSocket.cpp:190 +msgid "Directory listing successful" +msgstr "Mappevisning blev vist" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 +msgid "Disa&ble all" +msgstr "&Deaktivér alle" + +#: ../../locales/../src/interface/state.cpp:1100 +msgid "" +"Disable synchronized browsing and continue changing the remote directory?" +msgstr "" +"Deaktivér synkroniseret gennemgang, og fortsæt med at skifte fjernmappen?" + +#: ../../locales/../src/interface/Mainfrm.cpp:713 +msgid "" +"Disable this option again if you will not be able to see the correct " +"directory contents anymore." +msgstr "" +"Deaktivér denne valgmulighed igen, hvis du ikke længere kan se det korrekte " +"mappeindhold." + +#: ../../locales/../src/interface/toolbar.cpp:46 +msgid "Disconnect from server" +msgstr "Afbryd forbindelsen til serveren" + +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/interface/queue.cpp:352 +msgid "Disconnected from server" +msgstr "Forbindelsen til serveren blev afbrudt" + +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 +#, c-format +msgid "Disconnected from server: %s" +msgstr "Forbindelsen til serveren blev afbrudt: %s" + +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 +msgid "Disconnecting from previous server" +msgstr "Afbryder forbindelsen til forrige server" + +#: ../../locales/../src/interface/toolbar.cpp:46 +msgid "Disconnects from the currently visible server" +msgstr "Afbryder forbindelsen til aktuelt synlige server" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 +msgid "Display about dialog" +msgstr "Vis dialogen Om" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 +msgid "Do ¬ use default editor" +msgstr "Brug &ikke standardredigeringsprogram" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 +msgid "Do the same with &all selected files already being edited" +msgstr "" +"Gør det samme med &alle de valgte filer, der allerede er ved at blive " +"redigeret" + +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 +msgid "Do you really want to close FileZilla?" +msgstr "Vil du virkelig lukke FileZilla?" + +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +msgid "" +"Do you really want to delete all Site Manager entries and the transfer queue?" +msgstr "" +"Vil du virkelig slette alle poster i stedhåndtering og overførselskøen?" + +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +msgid "Do you really want to delete all Site Manager entries?" +msgstr "Vil du virkelig slette alle poster i stedhåndtering?" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 +msgid "Do you really want to delete selected entry?" +msgstr "Vil du virkelig slette den valgte post?" + +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +msgid "Do you really want to delete the transfer queue?" +msgstr "Vil du virkelig slette overførselskøen?" + +#: ../../locales/../src/interface/Mainfrm.cpp:641 +#, c-format +msgid "Do you really want to send '%s' to the server?" +msgstr "Vil du virkelig sende '%s' til serveren?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 +msgid "Do you want to reopen this file?" +msgstr "Vil du at genåbne denne fil?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 +msgid "Documentation" +msgstr "Dokumentation" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:250 +msgid "Don't use external IP address on &local connections." +msgstr "Brug ikke eksterne IP-adresser til &lokale forbindelser." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 +msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" +msgstr "Punktumfiler er filnavne der begynder med punktum, f.eks. .htaccess" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 +msgid "Double-click action" +msgstr "Handling ved dobbeltklik" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 +msgid "Download" +msgstr "Download" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 +msgid "Download &limit:" +msgstr "&Download-grænse:" + +#: ../../locales/../src/interface/statusbar.cpp:599 +#, c-format +msgid "Download limit: %s/s" +msgstr "Download-grænse: %s/s" + +#: ../../locales/../src/interface/statusbar.cpp:602 +msgid "Download limit: none" +msgstr "Download-grænse: ingen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 +msgid "Download search results" +msgstr "Download søgeresultater" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 +msgid "Download selected directory" +msgstr "Download den valgte mappe" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 +msgid "Download selected files and directories" +msgstr "Download valgte filer og mapper" + +#: ../../locales/../src/interface/Mainfrm.cpp:1049 +#, c-format +msgid "" +"Download speed: %s/s\n" +"Upload speed: %s/s" +msgstr "" +"Downloadhastighed: %s/s\n" +"Uploadhastighed: %s/s" + +#: ../../locales/../src/interface/edithandler.cpp:1151 +msgid "Downloading" +msgstr "Downloader" + +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 +#, c-format +msgid "Downloading %s" +msgstr "Downloader %s" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 +msgid "Downloading update..." +msgstr "Downloader opdatering..." + +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 +msgid "" +"Drag&drop between different instances of FileZilla has not been implemented " +"yet." +msgstr "" +"Træk og slip mellem forskellige instanser af FileZilla er endnu ikke " +"implementeret." + +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 +msgid "Drag&drop between different servers has not been implemented yet." +msgstr "Træk og slip mellem forskellige servere er endnu ikke implementeret." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 +msgid "Dupl&icate" +msgstr "Dupl&ikér" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 +msgid "E&nable all" +msgstr "&Aktivér alle" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 +msgid "E&nter directory" +msgstr "&Gå ind i mappe" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 +msgid "E&xecute" +msgstr "U&dfør" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 +msgid "E&xit" +msgstr "&Afslut" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 +msgid "E&xport..." +msgstr "E&ksportér..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:442 +msgid "E-Mail:" +msgstr "E-mail:" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 +msgid "Each filter needs at least one condition." +msgstr "Hvert filter skal bruge mindst en betingelse." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 +msgid "Edit filters" +msgstr "Rediger filtre" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 +msgid "" +"Edit the file with the configured editor and upload changes to the server." +msgstr "" +"Rediger filen med det valgte redigeringsprogram, og overfør ændringerne til " +"serveren." + +#: ../../locales/../src/interface/search.cpp:1198 +msgid "Editing directories is not supported" +msgstr "Redigering af mapper understøttes ikke" + +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 +msgid "Editing failed" +msgstr "Kunne ikke redigere" + +#: ../../locales/../src/interface/search.cpp:1198 +msgid "Editing search results" +msgstr "Redigerer søgeresultater" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +msgid "Email:" +msgstr "E-mail:" + +#: ../../locales/../src/interface/QueueView.cpp:1879 +msgid "Empty command" +msgstr "Tom kommando" + +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 +msgid "Empty command." +msgstr "Tom kommando." + +#: ../../locales/../src/interface/RemoteListView.cpp:2092 +msgid "Empty directory listing" +msgstr "Tom mappevisning" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 +msgid "Empty directory." +msgstr "Tom mappe." + +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 +msgid "Empty file extension." +msgstr "Tom filendelse." + +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 +msgid "Empty filter names are not allowed." +msgstr "Tomme filternavne er ikke tilladt." + +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 +msgid "Empty name" +msgstr "Tomt navn" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 +msgid "Empty quoted string." +msgstr "Tom streng i anførselstegn." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 +msgid "En&able all" +msgstr "&Aktivér alle" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 +msgid "Enable invalid character &filtering" +msgstr "Aktivér &filtrering af ugyldige tegn" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 +msgid "Encrypted" +msgstr "Krypteret" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 +msgid "Encryption" +msgstr "Kryptering" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "Krypterings&nøgle:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "Krypterings&nøgle:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 +msgid "Encryption details" +msgstr "Krypteringsdetaljer" + +#: ../../locales/../src/interface/filelistctrl.cpp:479 +msgid "End comparison and change sorting order?" +msgstr "Afslut sammenligning og skift sorteringsrækkefølge?" + +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Afslut sammenligning og åbn lynsøgning?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +msgid "Enter &custom command..." +msgstr "&Indtast brugerdefineret kommando..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 +msgid "Enter 0 for unlimited speed." +msgstr "Skriv 0 for ubegrænset hastighed." + +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "Enter command" +msgstr "Indtast kommando" + +#: ../../locales/../src/interface/Mainfrm.cpp:623 +msgid "Enter custom command" +msgstr "Indtast brugerdefineret kommando" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 +msgid "Enter directory" +msgstr "Gå ind i mappe" + +#: ../../locales/../src/interface/filteredit.cpp:136 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 +msgid "Enter filter name" +msgstr "Indtast filternavn" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Indtast hovedadgangskode" + +#: ../../locales/../src/interface/filter.cpp:238 +msgid "Enter name for filterset" +msgstr "Indtast navn til filtersæt" + +#: ../../locales/../src/interface/filter.cpp:302 +msgid "Enter new name for filterset" +msgstr "Indtast nyt navn til filtersæt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 +msgid "Enter password" +msgstr "Indtast adgangskode" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 +msgid "Enter selected directory" +msgstr "Gå ind i den valgte mappe" + +#: ../../locales/../src/interface/quickconnectbar.cpp:49 +msgid "" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" +"\n" +"Supported protocols are:\n" +"- ftp:// for normal FTP with optional encryption\n" +"- sftp:// for SSH file transfer protocol\n" +"- ftps:// for FTP over TLS (implicit)\n" +"- ftpes:// for FTP over TLS (explicit)" +msgstr "" +"Indtast serveradressen. Angiv serverens protokol ved at angive protokollen " +"før servernavnet. Hvis du ikke angiver en protokol, anvendes " +"standardprotokollen (ftp://). Du kan også indtaste komplette URL'er her i " +"formatet protokol://bruger:adgangskode@vært:port, hvorved værdierne i de " +"øvrige felter overskrives.\n" +"\n" +"Følgende protokoller er understøttet:\n" +"- ftp:// til normal FTP med valgfri kryptering\n" +"- sftp:// til filoverførsel med SSH\n" +"- ftps:// til FTP over TLS (implicit)\n" +"- ftpes:// til FTP over TLS (eksplicit)" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 +#, c-format +msgid "" +"Enter the password for the file '%s'.\n" +"The converted file will be protected with the same password." +msgstr "" +"Indtast adgangskoden til filen '%s'.\n" +"Bemærk, at den konverterede fil ikke vil være beskyttet med adgangskode." + +#: ../../locales/../src/interface/quickconnectbar.cpp:62 +msgid "" +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." +msgstr "" +"Indtast porten, som serveren lytter på. Standarden for FTP er 21, standarden " +"for SFTP er 22." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Indtast brugernavn" + +#: ../../locales/../src/interface/loginmanager.cpp:176 +msgid "Enter username and password" +msgstr "Indtast brugernavn og adgangskode" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Fejl" + +#: ../../locales/../src/interface/export.cpp:30 +msgid "Error exporting settings" +msgstr "Fejl ved eksport af indstillinger" + +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 +msgid "Error importing" +msgstr "Fejl ved import" + +#: ../../locales/../src/interface/QueueView.cpp:1663 +msgid "Error loading queue" +msgstr "Fejl ved indlæsning af kø" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 +msgid "Error loading xml file" +msgstr "Fejl ved indlæsning af XML-fil" + +#: ../../locales/../src/interface/QueueView.cpp:1556 +msgid "Error saving queue" +msgstr "Fejl ved gemning af kø" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "Error starting program" +msgstr "Fejl ved start af program" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 +msgid "Error writing xml file" +msgstr "Fejl ved skrivning af XML-fil" + +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 +msgid "Error:" +msgstr "Fejl:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 +msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" +msgstr "Eksempel: png \"c:\\program files\\viewer\\viewer.exe\" -open" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 +msgid "Examples" +msgstr "Eksempler" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 +msgid "Exe&cute" +msgstr "Ud&før" + +#: ../../locales/../src/interface/update_dialog.cpp:59 +msgid "Executable contains no version info, cannot check for updates." +msgstr "" +"Den eksekverbare fil indeholder ingen oplysninger om version - kan ikke søge " +"efter opdateringer." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 +msgid "Explorer" +msgstr "Stifinder" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Eksportér &filtre" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +msgid "Export &Queue" +msgstr "Eksportér &kø" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +msgid "Export &Settings" +msgstr "Eksportér &indstillinger" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 +msgid "Export settings" +msgstr "Eksportér indstillinger" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 +msgid "F&ilter name:" +msgstr "F&ilternavn:" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 +msgid "FTP" +msgstr "FTP" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 +msgid "FTP - File Transfer Protocol" +msgstr "FTP - File Transfer Protocol" + +#: ../../locales/../src/engine/server.cpp:21 +msgid "FTP - File Transfer Protocol with optional encryption" +msgstr "FTP - File Transfer Protocol med valgfri kryptering" + +#: ../../locales/../src/engine/server.cpp:27 +msgid "FTP - Insecure File Transfer Protocol" +msgstr "FTP - usikker File Transfer Protocol" + +#: ../../locales/../src/interface/quickconnectbar.cpp:99 +msgid "FTP Engine not initialized, can't connect" +msgstr "FTP-systemet ikke initialiseret - kan ikke oprette forbindelse" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 +msgid "FTP Keep-alive" +msgstr "FTP keep alive-signal" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 +msgid "FTP Proxy" +msgstr "FTP-proxy" + +#: ../../locales/../src/interface/cmdline.cpp:21 +msgid "FTP URL" +msgstr "FTP-URL" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:44 +msgid "" +"FTP uses secondary connections for data transfers. These additional " +"connections can be established in two ways." +msgstr "" +"FTP anvender sekundære forbindelser til dataoverførsler. Disse yderligere " +"forbindelser kan oprettes på to måder." + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +#, fuzzy +msgid "FTP: File Types" +msgstr "Filtyper" + +#: ../../locales/../src/engine/server.cpp:26 +msgid "FTPES - FTP over explicit TLS" +msgstr "FTPES - FTP over eksplicit TLS" + +#: ../../locales/../src/engine/server.cpp:25 +msgid "FTPS - FTP over implicit TLS" +msgstr "FTPS - FTP over implicit TLS" + +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 +msgid "Failed to change directory" +msgstr "Kunne ikke skifte mappe" + +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 +msgid "Failed to change language" +msgstr "Kunne ikke skifte sprog" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Kunne ikke konvertere kommando til 8 bit-tegnsæt" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 +msgid "Failed to copy or move sites" +msgstr "Kunne ikke kopiere eller flytte steder" + +#: ../../locales/../src/interface/xmlfunctions.cpp:238 +msgid "Failed to create backup copy of xml file" +msgstr "Kunne ikke oprette backup af XML-fil" + +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Kunne ikke oprette lyttesokkel på port %d. Afbryder." + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 +msgid "Failed to create listening socket for active mode transfer" +msgstr "Kunne ikke oprette lyttesokkel til overførsel i aktiv tilstand" + +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Kunne ikke dekryptere adgangskoden til serveren." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 +msgid "Failed to get 'My Documents' path" +msgstr "Kunne ikke hente stien 'Dokumenter'" + +#: ../../locales/../src/interface/LocalTreeView.cpp:635 +msgid "Failed to get desktop path" +msgstr "Kunne ikke hente stien 'Skrivebord'" + +#: ../../locales/../src/interface/netconfwizard.cpp:969 +msgid "Failed to get peer address of control connection, connection closed." +msgstr "" +"Kunne ikke hente peer-adressen på kontrolforbindelsen - forbindelsen lukket." + +#: ../../locales/../src/interface/netconfwizard.cpp:976 +msgid "Failed to get peer address of data connection, connection closed." +msgstr "" +"Kunne ikke hente peer-adressen på dataforbindelsen - forbindelsen lukket." + +#: ../../locales/../src/interface/context_control.cpp:87 +msgid "Failed to initialize FTP engine" +msgstr "Kunne ikke initialisere FTP-systemet" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 +msgid "Failed to initialize TLS." +msgstr "Kunne ikke initialisere TLS." + +#: ../../locales/../src/interface/FileZilla.cpp:97 +msgid "Failed to initialize networking" +msgstr "Kunne ikke initialisere netværk" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:146 +msgid "Failed to load panels, invalid resource files?" +msgstr "Kunne ikke indlæse paneler - ugyldige ressourcefiler?" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#, c-format +msgid "Failed to load private key: %s" +msgstr "Kunne ikke indlæse privat nøgle: %s" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 +#, c-format +msgid "Failed to open \"%s\" for appending/writing" +msgstr "Kunne ikke åbne \"%s\" til tilføjelse/skrivning" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 +#, c-format +msgid "Failed to open \"%s\" for reading" +msgstr "Kunne ikke åbne \"%s\" til læsning" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 +#, c-format +msgid "Failed to open \"%s\" for writing" +msgstr "Kunne ikke åbne \"%s\" til skrivning" + +#: ../../locales/../src/engine/ControlSocket.cpp:350 +msgid "Failed to parse returned path." +msgstr "Kunne ikke fortolke den returnerede sti." + +#: ../../locales/../src/interface/netconfwizard.cpp:1028 +msgid "Failed to receive data" +msgstr "Kunne ikke modtage data" + +#: ../../locales/../src/engine/ControlSocket.cpp:186 +msgid "Failed to retrieve directory listing" +msgstr "Kunne ikke hente mappeindholdsliste" + +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Kunne ikke hente ekstern IP-adresse. Afbryder." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" +msgstr "Kunne ikke hente ekstern IP-adresse - anvender lokal adresse" + +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Kunne ikke hente lokal IP-adresse. Afbryder." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Kunne ikke hente lokal IP-adresse." + +#: ../../locales/../src/interface/netconfwizard.cpp:638 +msgid "Failed to retrieve the external IP address." +msgstr "Kunne ikke hente den eksterne IP-adresse." + +#: ../../locales/../src/interface/netconfwizard.cpp:323 +msgid "Failed to send command." +msgstr "Kunne ikke sende kommando." + +#: ../../locales/../src/interface/FileZilla.cpp:165 +#, c-format +msgid "Failed to set language to %s (%s), using default system language" +msgstr "Kunne ikke sætte sproget til %s (%s). Anvender systemets standardsprog" + +#: ../../locales/../src/interface/FileZilla.cpp:142 +#, c-format +msgid "" +"Failed to set language to %s (%s), using default system language (%s, %s)." +msgstr "" +"Kunne ikke sætte sproget til %s (%s). Anvender systemets standardsprog (%s, " +"%s)." + +#: ../../locales/../src/interface/FileZilla.cpp:129 +#, c-format +msgid "Failed to set language to %s (%s), using default system language." +msgstr "" +"Kunne ikke sætte sproget til %s (%s). Anvender systemets standardsprog." + +#: ../../locales/../src/interface/FileZilla.cpp:168 +#, c-format +msgid "Failed to set language to %s, using default system language" +msgstr "Kunne ikke sætte sproget til %s. Anvender systemets standardsprog" + +#: ../../locales/../src/interface/FileZilla.cpp:137 +#, c-format +msgid "Failed to set language to %s, using default system language (%s, %s)." +msgstr "" +"Kunne ikke sætte sproget til %s. Anvender systemets standardsprog (%s, %s)." + +#: ../../locales/../src/interface/FileZilla.cpp:125 +#, c-format +msgid "Failed to set language to %s, using default system language." +msgstr "Kunne ikke sætte sproget til %s. Anvender systemets standardsprog." + +#: ../../locales/../src/interface/settings/optionspage.cpp:212 +msgid "Failed to validate settings" +msgstr "Kunne ikke validere indstillinger" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 +msgid "Failed to verify peer certificate" +msgstr "Kunne ikke kontrollere peer-certifikat" + +#: ../../locales/../src/engine/http/filetransfer.cpp:211 +#, c-format +msgid "Failed to write to file %s" +msgstr "Kunne ikke skrive til filen %s" + +#: ../../locales/../src/interface/xmlfunctions.cpp:281 +msgid "Failed to write xml file" +msgstr "Kunne ikke skrive XML-fil" + +#: ../../locales/../src/interface/queueview_failed.cpp:16 +msgid "Failed transfers" +msgstr "Mislykkede overførsler" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 +msgid "Fall back to active mode" +msgstr "Fald tilbage til aktiv tilstand" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 +msgid "Fil&e:" +msgstr "F&il:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 +msgid "Fil&es" +msgstr "Fil&er" + +#: ../../locales/../src/interface/filelistctrl.cpp:272 +msgid "File" +msgstr "Fil" + +#: ../../locales/../src/engine/socket.cpp:1077 +msgid "File descriptor not a socket" +msgstr "Fildeskriptor er ikke en sokkel" + +#: ../../locales/../src/interface/import.cpp:107 +msgid "File does not contain any importable data." +msgstr "Filen indeholder ingen data der kan importeres." + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 +msgid "File editing" +msgstr "Filredigering" + +#: ../../locales/../src/interface/RemoteListView.cpp:1645 +msgid "File exists" +msgstr "Filen findes" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 +msgid "File exists action" +msgstr "Handling når filen findes" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 +msgid "File has changed" +msgstr "Filen er ændret" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 +msgid "File lists" +msgstr "Fillister" + +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 +msgid "File not found" +msgstr "Fil ikke fundet" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 +msgid "File search" +msgstr "Filsøgning" + +#: ../../locales/../src/engine/ControlSocket.cpp:101 +msgid "File transfer aborted by user" +msgstr "Filoverførslen blev afbrudt af brugeren" + +#: ../../locales/../src/engine/ControlSocket.cpp:89 +#, c-format +msgid "File transfer aborted by user after transferring %s in %s" +msgstr "Filoverførslen blev afbrudt af brugeren efter overførsel af %s på %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:115 +msgid "File transfer failed" +msgstr "Filoverførsel mislykkedes" + +#: ../../locales/../src/engine/ControlSocket.cpp:95 +#, c-format +msgid "File transfer failed after transferring %s in %s" +msgstr "Filoverførsel afbrudt efter overførsel af %s på %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:108 +msgid "File transfer skipped" +msgstr "Filoverførsel sprunget over" + +#: ../../locales/../src/engine/ControlSocket.cpp:105 +msgid "File transfer successful" +msgstr "Filoverførsel lykkedes" + +#: ../../locales/../src/engine/ControlSocket.cpp:86 +#, c-format +msgid "File transfer successful, transferred %s in %s" +msgstr "Filoverførsel lykkedes, overført %s på %s" + +#: ../../locales/../src/interface/Mainfrm.cpp:1232 +msgid "File transfers still in progress." +msgstr "Filoverførsler stadig i gang." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 +msgid "File would transfer with ASCII data type." +msgstr "Filen kunne overføres med ASCII-datatypen." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 +msgid "File would transfer with binary data type." +msgstr "Filen kunne overføres med den binære datatype." + +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 +msgid "FileZilla Error" +msgstr "Fejl i FileZilla" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 +msgid "" +"FileZilla can now test your configuration to ensure everything is configured " +"properly." +msgstr "" +"FileZilla kan nu teste din konfiguration nu for at sikre, at alt er " +"konfigureret korrekt." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 +msgid "FileZilla is already connected to a server." +msgstr "FileZilla er allerede forbundet til en server." + +#: ../../locales/../src/interface/Mainfrm.cpp:1539 +msgid "FileZilla needs to be restarted for the language change to take effect." +msgstr "FileZilla skal genstartes, før ændring af sproget træder i kraft." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 +msgid "FileZilla updates" +msgstr "FileZilla opdateringer" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 +msgid "Filelist status &bars" +msgstr "Filliste-&statuslinjer" + +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +msgid "Filename" +msgstr "Filnavn" + +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 +#, c-format +msgid "Filename cannot be constructed for directory %s and filename %s" +msgstr "Filnavnet kan ikke dannes for mappen %s og filnavnet %s" + +#: ../../locales/../src/interface/RemoteListView.cpp:1633 +msgid "Filename invalid" +msgstr "Ugyldigt filnavn" + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 +msgid "Filename unchanged" +msgstr "Filnavn ikke ændret" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 +msgid "Filename:" +msgstr "Filnavn:" + +#: ../../locales/../src/interface/file_utils.cpp:315 +msgid "Filenames may not contain any of the following characters: / * ? < > |" +msgstr "Filnavne må ikke indeholde disse tegn: / * ? < > |" + +#: ../../locales/../src/interface/file_utils.cpp:290 +msgid "" +"Filenames may not contain any of the following characters: / \\ : * ? \" < > " +"|" +msgstr "Filnavne må ikke indeholde disse tegn: / \\ : * ? \" < > |" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 +msgid "Files currently being edited" +msgstr "Filer der redigeres i øjeblikket" + +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Filer, der matcher en filterregel, fjernes fra mappevisningerne." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Filer ikke fundet" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 +msgid "Filesize" +msgstr "Filstørrelse" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 +msgid "Filesize format" +msgstr "Filstørrelsesformat" + +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 +msgid "Filetype" +msgstr "Filtype" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 +msgid "Filetype associations" +msgstr "Filtypetilknytninger" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 +msgid "Filter applies to:" +msgstr "Filteret gælder for:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 +msgid "Filter invalid characters in filenames" +msgstr "Filtrér ugyldige tegn i filnavne" + +#: ../../locales/../src/interface/filteredit.cpp:149 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:353 +msgid "Filter name already exists" +msgstr "Filternavn findes allerede" + +# scootergrisen: mit bud er "Bortfiltrér emner, der matcher alle de følgende" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 +msgid "Filter out items matching all of the following" +msgstr "Bortfiltrér emner, der matcher alt det følgende" + +# scootergrisen: mit bud er "Bortfiltrér emner, der matcher en af de følgende" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 +msgid "Filter out items matching any of the following" +msgstr "Bortfiltrér emner, der matcher en af de følgende" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 +msgid "Filter out items matching none of the following" +msgstr "Bortfiltrér emner, der ikke matcher noget af det følgende" + +# scootergrisen: mit bud er "Bortfiltrér emner, der ikke matcher alle de følgende" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Bortfiltrér emner, der ikke matcher alt det følgende" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 +msgid "Filter set already exists" +msgstr "Filtersæt findes allerede" + +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Filter the directory listings" +msgstr "Filtrér mappevisningerne" + +#: ../../locales/../src/interface/filteredit.cpp:337 +#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:353 +msgid "Filter validation failed" +msgstr "Validering af filter mislykkedes" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 +msgid "Find &files" +msgstr "Find &filer" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 +msgid "Find d&irectories" +msgstr "Find &mapper" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 +msgid "Fingerprint (SHA-1):" +msgstr "Fingeraftryk (SHA-1):" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 +msgid "Fingerprint (SHA-256):" +msgstr "Fingeraftryk (SHA-256):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Fingeraftryk:" + +#: ../../locales/../src/interface/netconfwizard.cpp:54 +msgid "Firewall and router configuration wizard" +msgstr "Firewall- og router-konfigurationsguide" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 +msgid "" +"For more detailed information about what these options do, please run the " +"network configuration wizard." +msgstr "" +"Kør netværkskonfigurationsguiden for at få flere oplysninger om, hvad disse " +"valgmuligheder gør." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 +msgid "For reliability you should specify a range of at least 10 ports." +msgstr "" +"For størst mulig driftsikkerhed skal du angive et interval på mindst 10 " +"porte." + +#: ../../locales/../src/interface/Options.cpp:254 +msgid "" +"For this session the default settings will be used. Any changes to the " +"settings will not be saved." +msgstr "" +"Standardindstillingerne vil blive brugt i denne session. Eventuelle " +"ændringer i indstillingerne vil ikke blive gemt." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 +msgid "Force &UTF-8" +msgstr "Gennemtving &UTF-8" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 +msgid "Force showing &hidden files" +msgstr "&Vis skjulte filer" + +#: ../../locales/../src/interface/Mainfrm.cpp:708 +msgid "Force showing hidden files" +msgstr "Vis skjulte filer" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 +msgid "Format specifications:" +msgstr "Formatspecifikationer:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 +msgid "Format: Extension followed by properly quoted command and arguments." +msgstr "" +"Format: filtypen, efterfulgt af kommandoer og parametre med korrekt " +"angivelse af anførselstegn." + +#. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n +#: ../../locales/../src/interface/updater.cpp:709 +#, c-format +msgid "Found new %s %s\n" +msgstr "Fandt ny %s %s\n" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Funktionen %s mislykkedes" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 +msgid "Further documentation" +msgstr "Yderligere dokumentation" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 +msgid "General" +msgstr "Generelt" + +#: ../../locales/../src/engine/proxy.cpp:492 +msgid "General SOCKS server failure" +msgstr "Generel SOCKS-serverfejl" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Generér..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 +msgid "Generic proxy" +msgstr "Generisk proxy" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 +msgid "Get external IP address from the following URL:" +msgstr "Hent ekstern IP-adresse fra følgende URL:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 +msgid "Getting help" +msgstr "Få hjælp" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 +msgid "Given filterset name already exists, overwrite filter set?" +msgstr "" +"Det angivne filtersæt findes allerede. Vil du at overskrive filtersættet?" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 +msgid "Global bookmarks" +msgstr "Globale bogmærker" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 +#, c-format +msgid "GnuTLS error %d" +msgstr "GnuTLS-fejl %d" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 +#, c-format +msgid "GnuTLS error %d in %s" +msgstr "GnuTLS-fejl %d i %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 +#, c-format +msgid "GnuTLS error %d in %s: %s" +msgstr "GnuTLS-fejl %d i %s: %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 +#, c-format +msgid "GnuTLS error %d: %s" +msgstr "GnuTLS-fejl %d: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 +msgid "GnuTLS:" +msgstr "GnuTLS:" + +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Grøn" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +msgid "Group permissions" +msgstr "Gruppetilladelser" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +msgid "H&igh" +msgstr "Hø&j" + +#: ../../locales/../src/engine/server.cpp:24 +msgid "HTTPS - HTTP over TLS" +msgstr "HTTPS - HTTP over TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 +msgid "Hash:" +msgstr "Hash:" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 +msgid "Hidden" +msgstr "Skjult" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 +#: ../../locales/../src/interface/queue.cpp:998 +msgid "High" +msgstr "Høj" + +#: ../../locales/../src/interface/queue.cpp:938 +#: ../../locales/../src/interface/queue.cpp:1000 +msgid "Highest" +msgstr "Højeste" + +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 +msgid "Highest available port has to be a number between 1024 and 65535." +msgstr "Højeste tilgængelige port, skal være et tal mellem 1024 og 65535." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 +msgid "" +"Hold the shift key to toggle the filter state on both sides simultaneously." +msgstr "" +"Hold Skift-tasten nede for at skifte filterstatus på begge sider samtidig." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +msgid "Homepage:" +msgstr "Hjemmeside:" + +#: ../../locales/../src/engine/socket.cpp:1088 +msgid "Host is down" +msgstr "Vært er nede" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 +msgid "Host key mismatch" +msgstr "Værtsnøgle passer ikke" + +#: ../../locales/../src/interface/serverdata.cpp:103 +msgid "Host starts with '[' but no closing bracket found." +msgstr "Vært starter med '[', men en slutparentes kunne ikke findes." + +#: ../../locales/../src/engine/proxy.cpp:501 +msgid "Host unreachable" +msgstr "Vært kan ikke tilgås" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 +msgid "Host:" +msgstr "Vært:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algoritme for værtsnøgle:" + +# scootergrisen: kan ses i Stedhåndtering > fanebladet Avanceret > "0 timer, 0 minutter" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 +msgid "Hours," +msgstr "timer," + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Jeg har &glemt min hovedadgangskode. Slet alle adgangskoder som er gemt med " +"denne nøgle." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +msgid "I&SO 8601 (example: 15:47)" +msgstr "I&SO 8601 (eksempel: 15:47)" + +#: ../../locales/../src/engine/proxy.cpp:118 +msgid "IPv6 addresses are not supported with SOCKS4 proxy" +msgstr "IPv6-adresser understøttes ikke med SOCKS4-proxy" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 +msgid "" +"If no data is sent or received during an operation for longer than the " +"specified time, the connection will be closed and FileZilla will try to " +"reconnect." +msgstr "" +"Hvis der ikke sendes eller modtages data i et tidsrum, der er længere end " +"det angivne, vil forbindelsen blive lukket, og FileZilla vil forsøge at " +"genoprette forbindelsen." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 +msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." +msgstr "" +"Hvis du rapporterer fejl, så medsend logge, hvor logningsniveauet er sat til " +"\"detaljeret\"." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 +msgid "" +"If the automatic test at the end of this wizard succeeds, but you cannot " +"transfer files to a particular server, the server might be misconfigured and " +"you should try active mode. You can set the transfer mode on a per-server " +"basis in the Site Manager." +msgstr "" +"Hvis den automatiske test i slutningen af denne guide ikke giver fejl, men " +"du ikke kan overføre filer til en bestemt server, kan den pågældende server " +"være fejlkonfigureret, og du skal prøve i aktiv tilstand. Du kan sætte " +"overførselstilstand pr. server i stedhåndteringen." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 +msgid "" +"If the fallback option is enabled, you will be able to connect to " +"misconfigured servers which reject the selected transfer mode." +msgstr "" +"Hvis tilbagefaldsvalgmuligheden er aktiveret, vil du kunne oprette " +"forbindelse til fejlkonfigurerede servere, som afviser den valgte " +"overførselstilstand." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +msgid "" +"If the host key change was not expected, please contact the server " +"administrator." +msgstr "" +"Hvis ændringen i værtsnøglen ikke var forventet, skal du kontakte serverens " +"administrator." + +#: ../../locales/../src/interface/netconfwizard.cpp:575 +msgid "" +"If the problem persists, some router and/or firewall keeps blocking " +"FileZilla." +msgstr "" +"Hvis problemet fortsætter, er der en router og/eller firewall, der bliver " +"ved at blokere for FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:584 +msgid "" +"If the problem persists, some router and/or firewall keeps interrupting the " +"connection." +msgstr "" +"Hvis problemet fortsætter, er der en router og/eller firewall, der bliver " +"ved at afbryde forbindelsen." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 +msgid "" +"If the size of the logfile reaches the limit, it gets renamed by adding " +"\".1\" to the end of the filename (possibly overwriting older logfiles) and " +"a new file gets created." +msgstr "" +"Hvis størrelsen af logfilen når til grænsen, vil den blive omdøbt ved at " +"tilføje \".1\" efter filnavnet (og muligvis overskrive ældre logfiler), og " +"en ny fil oprettes." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 +msgid "" +"If the symlink points to a directory, FileZilla can either delete the " +"symbolic link or remove the contents of the linked directory." +msgstr "" +"Hvis symlinket peger på en mappe, kan FileZilla enten slette det symbolske " +"link eller slette indholdet af den mappe, der linkes til." + +#: ../../locales/../src/interface/netconfwizard.cpp:646 +msgid "" +"If this problem persists, please contact your router or firewall " +"manufacturer for a solution." +msgstr "" +"Hvis problemet fortsætter, skal du kontakte fabrikanten af din router for at " +"finde en løsning." + +#: ../../locales/../src/interface/netconfwizard.cpp:604 +msgid "If this problem stays, please contact your router manufacturer." +msgstr "Hvis problemet fortsætter, skal du kontakte fabrikanten af din router." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 +msgid "" +"If using 'overwrite if newer', your system time has to be synchronized with " +"the server. If the time differs (e.g. different timezone), specify a " +"timezone offset in the site manager." +msgstr "" +"Hvis 'Overskriv hvis nyere' anvendes, skal dit systems ur synkroniseres med " +"serveren. Hvis der er forskel i tiden (f.eks. forskellige tidszoner), skal " +"du angive en tidszoneforskydning i stedhåndteringen." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 +msgid "" +"If using timestamp based comparison, consider two files equal if their " +"timestamp difference does not exceed this threshold." +msgstr "" +"Hvis du baserer sammenligning på klokkeslæt, vil to filer bedømmes som ens " +"hvis forskellen på tid ikke overskrider denne grænse." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 +msgid "If you change the language, you need to restart FileZilla." +msgstr "Hvis du skifter sprog, skal FileZilla genstartes." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 +msgid "" +"If you click on test, FileZilla will connect to probe.filezilla-project.org " +"and will perform some simple tests." +msgstr "" +"Hvis du klikker på Test, vil FileZilla oprette forbindelse til probe." +"filezilla-project.org og udføre nogle enkle tests." + +#: ../../locales/../src/interface/Mainfrm.cpp:1254 +msgid "If you close FileZilla, your changes will be lost." +msgstr "Hvis du lukker FileZilla, vil du miste dine ændringer." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 +msgid "" +"If you enter the wrong filetypes, those files may get corrupted when " +"transferred." +msgstr "" +"Hvis du angiver forkerte filtyper, kan de pågældende filer blive ødelagt " +"under overførslen." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 +msgid "If you get any errors, your configuration is not correct." +msgstr "Hvis du får fejl, er din konfiguration ikke korrekt." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 +msgid "" +"If you have problems to retrieve directory listings or to transfer files, " +"try to change the default transfer mode." +msgstr "" +"Hvis du har problemer med at hente mappevisninger eller overføre filer, kan " +"du prøve at ændre standard-overførselstilstanden." + +#: ../../locales/../src/interface/netconfwizard.cpp:591 +msgid "" +"If you keep having problems with a specific server, the server itself or a " +"remote router or firewall might be misconfigured. In this case try to toggle " +"passive mode and contact the server administrator for help." +msgstr "" +"Hvis du vedholdende har problemer med en bestemt server, kan selve serveren " +"eller en fjern-router eller firewall være fejlkonfigureret. I sådanne " +"tilfælde kan du prøve at slå passiv tilstand til/fra og kontakte serverens " +"administrator." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 +msgid "" +"If you successfully complete the wizard and the final test succeeds, any " +"firewalls and routers you have should be configured properly." +msgstr "" +"Hvis du fuldførte guiden, og den afsluttende test ikke gav fejl, skulle alle " +"firewalls og routere være konfigureret korrekt." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 +msgid "" +"If you use a firewall, make sure FileZilla is allowed to accept connection " +"on all given ports." +msgstr "" +"Hvis du bruger en firewall, skal du sikre dig, at FileZilla har tilladelse " +"til at modtage forbindelser på alle de angivne porte." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 +msgid "" +"If you use a router, make sure all these ports are forwarded to the machine " +"you're running FileZilla on." +msgstr "" +"Hvis du bruger en router, skal du sikre dig, at alle disse porte er " +"viderestillet til den maskine, du bruger til at køre FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:617 +msgid "" +"If your router keeps changing the IP address, please contact your router " +"manufacturer." +msgstr "" +"Hvis din router bliver ved at ændre IP-adresse, kan du kontakte fabrikanten " +"af din router." + +#: ../../locales/../src/interface/import.cpp:99 +msgid "Import data from older version" +msgstr "Importér data fra ældre version" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 +msgid "Import settings" +msgstr "Import-indstillinger" + +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 +msgid "Import successful" +msgstr "Import fuldført" + +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 +msgid "Improperly quoted association." +msgstr "Anførselstegn ikke sat korrekt for filtypetilknytning." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 +msgid "" +"In active mode, FileZilla has to listen on a port for data transfers. You " +"have to specify which ports FileZilla will use." +msgstr "" +"I aktiv tilstand skal FileZilla lytte til en port for at finde " +"dataoverførsel. Du skal angive, hvilken port FileZilla skal lytte til." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 +msgid "" +"In case you have a router, you will have to forward all available ports, as " +"FileZilla has no influence on the ports your system chooses." +msgstr "" +"Hvis du har en router, skal du viderestille alle tilgængelige porte, da " +"FileZilla ikke har nogen indflydelse på, hvilken port dit styresystem vælger." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 +msgid "" +"In order to use active mode, FileZilla needs to know your external IP " +"address." +msgstr "" +"For at anvende aktiv tilstand skal FileZilla kende din eksterne IP-adresse." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:52 +msgid "" +"In passive mode, which is recommended for most users, FileZilla asks the " +"server for a port and connects to the given port. Not much configuration has " +"to be done for this." +msgstr "" +"I passiv tilstand, hvilket anbefales for de fleste brugere, beder FileZilla " +"serveren om en port, og opretter forbindelse til den givne port. Dette " +"kræver ikke meget konfiguration." + +#: ../../locales/../src/interface/queue.cpp:349 +msgid "Incorrect password" +msgstr "Forkert adgangskode" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 +msgid "" +"Information about the latest version of FileZilla could not be retrieved. " +"Please try again later." +msgstr "" +"Kunne ikke hente oplysninger om den seneste version af FileZilla. Prøv igen " +"senere." + +#: ../../locales/../src/engine/ftp/logon.cpp:248 +msgid "Initializing TLS..." +msgstr "Initialiserer TLS..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:297 +msgid "Insecure algorithm!" +msgstr "Usikker algoritme!" + +#: ../../locales/../src/engine/ftp/logon.cpp:233 +msgid "Insecure server, it does not support FTP over TLS." +msgstr "Usikker server, understøtter ikke FTP over TLS." + +#: ../../locales/../src/engine/server.cpp:613 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:182 +msgid "Interactive" +msgstr "Interaktiv" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 +msgid "Interface" +msgstr "Brugerflade" + +#: ../../locales/../src/engine/socket.cpp:1074 +msgid "Interrupted by signal" +msgstr "Afbrudt af signal" + +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 +msgid "Interrupted by user" +msgstr "Afbrudt af brugeren" + +#: ../../locales/../src/engine/http/request.cpp:159 +#: ../../locales/../src/engine/http/request.cpp:582 +msgid "Invalid Content-Length" +msgstr "Ugyldig Content-Length" + +#: ../../locales/../src/engine/http/request.cpp:488 +msgid "Invalid HTTP Response" +msgstr "Ugyldigt HTTP-svar" + +#: ../../locales/../src/engine/socket.cpp:1062 +msgid "Invalid argument passed" +msgstr "Ugyldig parameter overført" + +#: ../../locales/../src/engine/ControlSocket.cpp:459 +msgid "" +"Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " +"site manager to force UTF-8." +msgstr "" +"Ugyldig række af tegn modtaget; deaktiverer UTF-8. Vælg valgmuligheden UTF-8 " +"i stedhåndtering for at gennemtvinge UTF-8." + +#: ../../locales/../src/engine/http/request.cpp:703 +msgid "Invalid chunk size" +msgstr "Ugyldig chunk-størrelse" + +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 +msgid "Invalid data received" +msgstr "Ugyldige data modtaget" + +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 +msgid "Invalid date" +msgstr "Ugyldig dato" + +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 +msgid "Invalid filename" +msgstr "Ugyldigt filnavn" + +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Ugyldig hash-værdi: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 +msgid "Invalid host, after closing bracket only colon and port may follow." +msgstr "Ugyldig vært, efter slutparentes må der kun stå kolon og port." + +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Ugyldigt værtsnavn: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "Invalid input" +msgstr "Ugyldig indtastning" + +#: ../../locales/../src/engine/http/request.cpp:516 +msgid "Invalid line" +msgstr "Ugyldig linje" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Ugyldig sti" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 +msgid "Invalid port given. The port has to be a value from 1 to 65535." +msgstr "Ugyldig port angivet. Porten skal have en værdi mellem 1 og 65535." + +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 +msgid "" +"Invalid protocol specified. Valid protocols are:\n" +"ftp:// for normal FTP with optional encryption,\n" +"sftp:// for SSH file transfer protocol,\n" +"ftps:// for FTP over TLS (implicit) and\n" +"ftpes:// for FTP over TLS (explicit)." +msgstr "" +"Ugyldig protokol angivet. Gyldige protokoller er:\n" +"ftp:// til normal FTP med valgfri kryptering,\n" +"sftp:// til filoverførsel med SSH,\n" +"ftps:// til FTP over TLS (implicit) og\n" +"ftpes:// til FTP over TLS (eksplicit)." + +#: ../../locales/../src/engine/ftp/logon.cpp:70 +msgid "" +"Invalid proxy host, after closing bracket only colon and port may follow." +msgstr "Ugyldig proxy-vært, efter slutparentes må der kun stå kolon og port." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Ugyldigt regulært udtryk" + +#: ../../locales/../src/interface/search.cpp:744 +msgid "Invalid regular expression in search conditions." +msgstr "Ugyldigt regulært udtryk i søgebetingelser." + +#: ../../locales/../src/engine/http/request.cpp:497 +msgid "Invalid response code" +msgstr "Ugyldig svarkode" + +#: ../../locales/../src/interface/search.cpp:739 +#, c-format +msgid "Invalid search conditions: %s" +msgstr "Ugyldige søgebetingelser: %s" + +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 +msgid "Invalid site path" +msgstr "Ugyldig sti til sted" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 +msgid "Invalid size in condition" +msgstr "Ugyldig størrelse i betingelse" + +#: ../../locales/../src/interface/serverdata.cpp:79 +msgid "Invalid username given." +msgstr "Ugyldigt brugernavn angivet." + +#: ../../locales/../src/engine/socket.cpp:1095 +msgid "Invalid value for ai_flags" +msgstr "Ugyldig værdi til ai_flags" + +#: ../../locales/../src/engine/socket.cpp:1097 +msgid "Invalid value for hints" +msgstr "Ugyldig værdi til tips" + +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Omvendt filter" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 +msgid "Jurisdiction country:" +msgstr "Jurisdiktion (land):" + +#: ../../locales/../src/interface/verifycertdialog.cpp:446 +msgid "Jurisdiction locality:" +msgstr "Jurisdiktion (by):" + +#: ../../locales/../src/interface/verifycertdialog.cpp:445 +msgid "Jurisdiction state or province:" +msgstr "Jurisdiktion (stat eller provins):" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 +msgid "Keep directories on top" +msgstr "Hold mapper øverst" + +#: ../../locales/../src/interface/Mainfrm.cpp:712 +msgid "" +"Keep in mind that not all servers support this feature and may return " +"incorrect listings if this option is enabled. Although FileZilla performs " +"some tests to check if the server supports this feature, the test may fail." +msgstr "" +"Husk på, at ikke alle servere understøtter denne funktion, og kan returnere " +"forkerte lister, hvis denne valgmulighed er aktiveret. Selvom FileZilla " +"tester om serveren understøtter funktionen, så kan testen godt fejle." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 +msgid "Key exchange" +msgstr "Nøgleudveksling" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 +msgid "Key exchange:" +msgstr "Nøgleudveksling:" + +#: ../../locales/../src/engine/server.cpp:610 +#: ../../locales/../src/engine/server.cpp:635 +msgid "Key file" +msgstr "Nøglefil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Nøgleidentifikator:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 +msgid "L&owest" +msgstr "L&aveste" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 +msgid "Language" +msgstr "Sprog" + +#: ../../locales/../src/interface/Mainfrm.cpp:1539 +msgid "Language changed" +msgstr "Sprog ændret" + +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 +msgid "Last modified" +msgstr "Sidst ændret" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 +msgid "Layout" +msgstr "Layout" + +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Lad være tom, for at beholde eksisterende adgangskode." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 +msgid "Limit for concurrent &downloads:" +msgstr "&Grænse for samtidige downloads:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 +msgid "Limit for concurrent &uploads:" +msgstr "Grænse for samtidige &uploads:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 +msgid "Limit local ports" +msgstr "Begræns lokale porte" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 +msgid "Limit size of logfile" +msgstr "Begræns størrelsen på logfil" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +msgid "Limit:" +msgstr "Grænse:" + +#: ../../locales/../src/engine/http/request.cpp:657 +msgid "Line length exceeded" +msgstr "Linjelængde oversteget" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 +msgid "Linked against" +msgstr "Linket mod" + +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 +msgid "Listen socket closed" +msgstr "Lyttesokkel lukket" + +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 +msgid "Listing:" +msgstr "Liste:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 +msgid "Lo&west available port:" +msgstr "La&veste tilgængelige port:" + +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 +msgid "Local" +msgstr "Lokal" + +#: ../../locales/../src/engine/socket.cpp:1059 +msgid "Local address in use" +msgstr "Lokal adresse i brug" + +#: ../../locales/../src/engine/socket.cpp:1087 +msgid "Local endpoint has been closed" +msgstr "Det lokale slutpunkt er lukket" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 +msgid "Local file" +msgstr "Lokal fil" + +#: ../../locales/../src/interface/manual_transfer.cpp:304 +msgid "Local file does not exist." +msgstr "Lokal fil findes ikke." + +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 +#, c-format +msgid "Local file is %s\n" +msgstr "Lokal fil er %s\n" + +#: ../../locales/../src/interface/manual_transfer.cpp:300 +msgid "Local file is a directory instead of a regular file." +msgstr "Lokal fil er en mappe og ikke en almindelig fil." + +#: ../../locales/../src/interface/manual_transfer.cpp:344 +msgid "Local file is not a valid filename." +msgstr "Lokal fil har ikke et gyldigt filnavn." + +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Filsøgning på lokalt sted" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 +msgid "Local filters:" +msgstr "Lokale filtre:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Håndtering af lokal sti:" + +#: ../../locales/../src/interface/viewheader.cpp:337 +msgid "Local site:" +msgstr "Lokalt sted:" + +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "" +"Den lokale størrelse på '%s' svarer ikke til den forventede størrelse: %d != " +"%d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 +msgid "Locality:" +msgstr "Lokalitet:" + +#: ../../locales/../src/interface/settings/optionspage_logging.cpp:97 +msgid "Log file" +msgstr "Logfil" + +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Logget ind" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 +msgid "Logging" +msgstr "Logning" + +#: ../../locales/../src/engine/ftp/logon.cpp:302 +msgid "" +"Login data contains non-ASCII characters and server might not be UTF-8 " +"aware. Cannot fall back to local charset since using proxy." +msgstr "" +"Login-data indeholder tegn uden for ASCII-tegnsættet, og serveren kender " +"muligvis ikke UTF-8. Kan ikke falde tilbage på lokalt tegnsæt, da proxy " +"anvendes." + +#: ../../locales/../src/engine/ftp/logon.cpp:309 +msgid "" +"Login data contains non-ASCII characters and server might not be UTF-8 " +"aware. Trying local charset." +msgstr "" +"Login-data indeholder tegn uden for ASCII-tegnsættet, og serveren kender " +"muligvis ikke UTF-8. Forsøger lokalt tegnsæt." + +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "" +"Login-sekvensen er helt gennemført, men du er endnu ikke logget ind. " +"Afbryder." + +#: ../../locales/../src/interface/cmdline.cpp:103 +msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." +msgstr "" +"Logintypen skal være enten 'spørg' eller 'interaktiv' (uden anførselstegn)." + +#: ../../locales/../src/interface/cmdline.cpp:11 +#, c-format +msgid "" +"Logontype, can only be used together with FTP URL. Argument has to be either " +"'%s' or '%s'" +msgstr "" +"Logintypen kan kun anvendes sammen med FTP-URL. Argumentet skal være enten " +"'%s' eller '%s'" + +#: ../../locales/../src/interface/queue.cpp:931 +#: ../../locales/../src/interface/queue.cpp:993 +msgid "Low" +msgstr "Lav" + +#: ../../locales/../src/interface/queue.cpp:929 +#: ../../locales/../src/interface/queue.cpp:991 +msgid "Lowest" +msgstr "Laveste" + +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 +msgid "Lowest available port has to be a number between 1024 and 65535." +msgstr "Laveste tilgængelige port, skal være et tal mellem 1024 og 65535." + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 +msgid "MAC:" +msgstr "MAC:" + +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 +msgid "Make sure the file can be accessed and is a well-formed XML document." +msgstr "" +"Sørg for, at der er adgang til filen, og at det er et korrekt udformet XML-" +"dokument." + +#: ../../locales/../src/engine/http/request.cpp:644 +#: ../../locales/../src/engine/http/request.cpp:650 +#: ../../locales/../src/engine/http/request.cpp:657 +#: ../../locales/../src/engine/http/request.cpp:668 +#: ../../locales/../src/engine/http/request.cpp:703 +#, c-format +msgid "Malformed chunk data: %s" +msgstr "Forkert udformet chunk-data: %s" + +#: ../../locales/../src/engine/http/request.cpp:159 +#, c-format +msgid "Malformed request header: %s" +msgstr "Forkert udformet forespørgsel-header: %s" + +#: ../../locales/../src/engine/http/request.cpp:457 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:516 +#: ../../locales/../src/engine/http/request.cpp:572 +#: ../../locales/../src/engine/http/request.cpp:582 +#, c-format +msgid "Malformed response header: %s" +msgstr "Forkert udformet svar-header: %s" + +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +#, fuzzy, c-format +msgid "Malformed response: %s" +msgstr "Forkert udformet svar-krop: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 +msgid "Manual transfer" +msgstr "Manuel overførsel" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Hoved&adgangskode:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Hovedadgangskode:" + +# scootergrisen: mit bud er "Match alle de følgende" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 +msgid "Match all of the following" +msgstr "Match alt det følgende" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +msgid "Match any of the following" +msgstr "Match en af de følgende" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 +msgid "Match none of the following" +msgstr "Match ikke nogen af de følgende" + +# scootergrisen: mit bud er "Match ikke alle de følgende" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Match ikke alt det følgende" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 +msgid "Maximum simultaneous &transfers:" +msgstr "Maks. antal samtidige &overførsler:" + +#: ../../locales/../src/engine/socket.cpp:1101 +msgid "Memory allocation failure" +msgstr "Fejl ved tildeling af hukommelse" + +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 +msgid "Message log" +msgstr "Meddelelseslog" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +msgid "Message log position" +msgstr "Placering af meddelelseslog" + +#: ../../locales/../src/engine/socket.cpp:1084 +msgid "Message too large" +msgstr "Meddelelse er for stor" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 +msgid "MiB" +msgstr "MiB" + +# scootergrisen: kan ses i Stedhåndtering > fanebladet Avanceret > "0 timer, 0 minutter" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +msgid "Minutes" +msgstr "minutter" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 +msgid "Move &down" +msgstr "Flyt &ned" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 +msgid "Move &up" +msgstr "Flyt &op" + +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 +msgid "My Computer" +msgstr "Denne computer" + +#: ../../locales/../src/interface/LocalTreeView.cpp:995 +msgid "My Documents" +msgstr "Dokumenter" + +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 +msgid "My Sites" +msgstr "Mine steder" + +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 +msgid "N/a" +msgstr "Utilgængelig" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 +msgid "Name" +msgstr "Navn" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 +msgid "Name already exists" +msgstr "Navn findes allerede" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +msgid "Name of bookmark already exists." +msgstr "Bogmærkenavn findes allerede." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 +msgid "Name:" +msgstr "Navn:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +msgid "Natural sort" +msgstr "Naturlig sortering" + +#: ../../locales/../src/interface/filteredit.cpp:345 +msgid "Need to enter filter name" +msgstr "Du skal indtaste et navn til filteret" + +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Du skal indtaste en gyldig lokal sti" + +#: ../../locales/../src/interface/search.cpp:729 +msgid "Need to enter valid remote path" +msgstr "Du skal indtaste en gyldig fjernsti" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +msgid "Need to specify a character encoding" +msgstr "Du skal angive en tegnkodning" + +# scootergrisen: nodename og servname er måske parametre og skal formodentligt ikke oversættes men jeg har ikke undersøgt det nærmere +#: ../../locales/../src/engine/socket.cpp:1105 +msgid "Neither nodename nor servname provided, or not known" +msgstr "Hverken nodename eller servname er angivet, eller er ikke kendt" + +#: ../../locales/../src/engine/socket.cpp:1092 +msgid "" +"Network host does not have any network addresses in the requested address " +"family" +msgstr "" +"Netværksværten har ingen netværksadresse inden for den angivne adressefamilie" + +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 +msgid "Network unreachable" +msgstr "Netværk kan ikke tilgås" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 +msgid "Never" +msgstr "Aldrig" + +# scootergrisen: kilde: foreslå at ændre folder til directory som i andre strenge +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 +msgid "New &Folder" +msgstr "Ny &mappe" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +msgid "New &tab" +msgstr "Nyt &faneblad" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 +msgid "New Book&mark" +msgstr "Nyt bo&gmærke" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 +msgid "New bookmark" +msgstr "Nyt bogmærke" + +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 +msgid "New directory" +msgstr "Ny mappe" + +#: ../../locales/../src/interface/welcome_dialog.cpp:65 +#, c-format +msgid "New features and improvements in %s" +msgstr "Nye funktioner og forbedringer i %s" + +#: ../../locales/../src/interface/filteredit.cpp:131 +msgid "New filter" +msgstr "Nyt filter" + +# scootergrisen: kilde: foreslå at ændre folder til directory som i andre strenge +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 +msgid "New folder" +msgstr "Ny mappe" + +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 +msgid "New site" +msgstr "Nyt sted" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 +msgid "Next to the transfer queue" +msgstr "Ved siden af overførselskøen" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 +msgid "No" +msgstr "Nej" + +# scootergrisen: nodename og servname er måske parametre og skal formodentligt ikke oversættes men jeg har ikke undersøgt det nærmere +#: ../../locales/../src/engine/socket.cpp:1103 +msgid "No address associated with nodename" +msgstr "Ingen adresse tilknyttet med nodename" + +#: ../../locales/../src/interface/export.cpp:30 +msgid "No category to export selected" +msgstr "Ingen kategori til eksport valgt" + +#: ../../locales/../src/interface/QueueView.cpp:1879 +msgid "No command given, aborting." +msgstr "Ingen kommando angivet. Afbryder." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 +msgid "No external IP address set, trying default." +msgstr "Ingen ekstern IP-adresse angivet - forsøger standard." + +# scootergrisen: skal vel passe med de andre strenge som har "currently being edited" +# scootergrisen: mit bud er "Ingen filer som redigeres." eller "Ingen filer som redigeres i øjeblikket." +#: ../../locales/../src/interface/edithandler.cpp:1125 +msgid "No files are currently being edited." +msgstr "Ingen filer redigeres i øjeblikket." + +#: ../../locales/../src/interface/filteredit.cpp:143 +msgid "No filter name given" +msgstr "Intet filternavn angivet" + +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 +msgid "No host given, please enter a host." +msgstr "Ingen vært angivet - indtast en vært." + +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 +msgid "No images available" +msgstr "Ingen tilgængelige billeder" + +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 +msgid "No name for the filterset given." +msgstr "Intet navn til filtersæt angivet." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 +msgid "No program associated with filetype" +msgstr "Filtypen er ikke tilknyttet noget program" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#, c-format +msgid "No program has been associated to edit files with the extension '%s'." +msgstr "" +"Filtypen er ikke blevet tilknyttet til redigering af filer af filtypen '%s'." + +#: ../../locales/../src/engine/socket.cpp:1079 +msgid "No route to host" +msgstr "Ingen rute til vært" + +#: ../../locales/../src/interface/search.cpp:444 +msgid "No search results" +msgstr "Ingen søgeresultater" + +#: ../../locales/../src/interface/sitemanager.cpp:352 +msgid "No sites available" +msgstr "Ingen tilgængelige steder" + +#: ../../locales/../src/engine/proxy.cpp:470 +msgid "No supported SOCKS5 auth method" +msgstr "Ingen understøttet SOCKS5-godkendelsesmetode" + +#: ../../locales/../src/interface/loginmanager.cpp:207 +msgid "No username given." +msgstr "Intet brugernavn angivet." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 +msgid "None" +msgstr "Ingen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 +msgid "None selected yet" +msgstr "Ingen er valgt endnu" + +#: ../../locales/../src/engine/socket.cpp:1099 +msgid "Nonrecoverable failure in name resolution" +msgstr "Uoprettelig fejl i navneopløsning" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 +#: ../../locales/../src/interface/queue.cpp:996 +msgid "Normal" +msgstr "Normal" + +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 +msgid "Not all items could be requeued for transfer." +msgstr "Kunne ikke sætte alle emner i kø igen." + +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 +msgid "Not connected" +msgstr "Ikke tilsluttet" + +#: ../../locales/../src/interface/RemoteListView.cpp:2088 +msgid "Not connected to any server" +msgstr "Ikke forbundet til nogen server" + +#: ../../locales/../src/interface/Mainfrm.cpp:611 +msgid "Not connected to any server." +msgstr "Ikke forbundet til nogen server." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 +msgid "Not connected." +msgstr "Ikke tilsluttet." + +#: ../../locales/../src/engine/socket.cpp:1120 +msgid "Not initialized, need to call WSAStartup" +msgstr "Ikke initialiseret. Behov for kald af WSAStartup" + +#: ../../locales/../src/interface/Mainfrm.cpp:710 +msgid "Note that this feature is only supported using the FTP protocol." +msgstr "Bemærk, at denne funktion kun understøttes af FTP-protokollen." + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Bemærk: En mistet nøgle kan ikke gendannes." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 +msgid "Note: This only works with plain, unencrypted FTP connections." +msgstr "Bemærk: dette fungerer kun med enkle, ukrypterede FTP-forbindelser." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 +msgid "Note: Using a generic proxy forces passive mode on FTP connections." +msgstr "" +"Bemærk: brugen af generisk proxy gennemtvinger passiv tilstand på FTP-" +"forbindelser." + +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:650 +msgid "Null character in line" +msgstr "Nul-tegn på linje" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 +msgid "Number of decimal places:" +msgstr "Antal decimalpladser:" + +#: ../../locales/../src/interface/settings/optionspage_connection.cpp:35 +msgid "Number of retries has to be between 0 and 99." +msgstr "Antallet af forsøg skal være mellem 0 og 99." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "&Åbn" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 +msgid "OK" +msgstr "OK" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 +msgid "OS version:" +msgstr "OS version:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 +msgid "" +"On the following pages, the selected transfer mode will be configured, as " +"well as the fallback mode if enabled." +msgstr "" +"På de efterfølgende sider vil den valgte overførselstilstand blive " +"konfigureret samtidig med tilbagefaldstilstanden, hvis den er aktiveret." + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 +msgid "Once" +msgstr "Én gang" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 +msgid "Once a day" +msgstr "En gang om dagen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 +msgid "Once a week" +msgstr "En gang om ugen" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 +msgid "Only use plain FTP (insecure)" +msgstr "Brug kun almindelig FTP (usikker)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Å&bn fil" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +msgid "Open directory in system's file manager" +msgstr "Åbn mappe i systemets filhåndtering" + +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 +msgid "Open the Site Manager" +msgstr "Åbn stedhåndteringen" + +#: ../../locales/../src/interface/toolbar.cpp:31 +msgid "Open the Site Manager." +msgstr "Åbn stedhåndteringen." + +#: ../../locales/../src/interface/toolbar.cpp:33 +msgid "Open the Site Manager. Right-click for a list of sites." +msgstr "Åbn stedhåndteringen. Højreklik for at se en liste over steder." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Åbn dialogen adgangstilladelser for mappe for at konfigurerer de lokale " +"mapper, som FileZilla har adgang til." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +msgid "Open the file." +msgstr "Åbn filen." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 +msgid "Open the settings dialog of FileZilla" +msgstr "Åbn dialogen Indstillinger i FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 +msgid "Opened as:" +msgstr "Åbnet som:" + +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 +msgid "Opening failed" +msgstr "Kunne ikke åbne" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 +msgid "Opens a new tab" +msgstr "Åbner et nyt faneblad" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 +msgid "Opens the Site Manager" +msgstr "Åbner stedhåndteringen" + +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "" +"Opens the directory listing filter dialog. Right-click to toggle filters." +msgstr "Åbner dialogen Mappevisningsfiltre. Højreklik for at skifte filtre." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 +msgid "Operating System:" +msgstr "Styresystem:" + +#: ../../locales/../src/engine/socket.cpp:1070 +msgid "Operation already in progress" +msgstr "Handling er allerede i gang" + +#: ../../locales/../src/engine/socket.cpp:1061 +msgid "Operation in progress" +msgstr "Handling i gang" + +#: ../../locales/../src/engine/socket.cpp:1082 +msgid "Operation not supported" +msgstr "Handling ikke understøttet" + +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Valgmuligheder" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Orange" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 +msgid "Organization:" +msgstr "Organisation:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 +msgid "Other SFTP options" +msgstr "Andre SFTP-valgmuligheder" + +#: ../../locales/../src/engine/socket.cpp:1115 +msgid "Other system error" +msgstr "Anden systemfejl" + +#: ../../locales/../src/interface/verifycertdialog.cpp:454 +msgid "Other:" +msgstr "Andet:" + +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 +msgid "Out of memory" +msgstr "Ikke mere ledig hukommelse" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 +msgid "Overview" +msgstr "Overblik" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 +msgid "Overwrite &if source newer" +msgstr "Overskriv &hvis kilden er nyere" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +msgid "Overwrite file" +msgstr "Overskriv fil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +msgid "Overwrite file if size differs" +msgstr "Overskriv fil, hvis størrelsen er forskellig" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +msgid "Overwrite file if size differs or source file is newer" +msgstr "" +"Overskriv fil, hvis størrelsen er forskellig, eller kildefilen er nyere" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +msgid "Overwrite file if source file newer" +msgstr "Overskriv fil, hvis kildefilen er nyere" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +msgid "Overwrite if &different size" +msgstr "Overskriv hvis &forskellig størrelse" + +# scootergrisen: måske "Overskriv hvis forskellig &størrelse eller kilden er nyere" +# scootergrisen: måske "Overskriv hvis &forskellig størrelse eller kilden er nyere" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 +msgid "Overwrite if different si&ze or source newer" +msgstr "Overskriv hvis forskellig størrelse eller kilden &er nyere" + +#: ../../locales/../src/interface/updater.cpp:259 +#, c-format +msgid "Own build type: %s\n" +msgstr "Egen bygtype: %s\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 +msgid "Owner permissions" +msgstr "Ejertilladelser" + +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 +msgid "Owner/Group" +msgstr "Ejer/gruppe" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 +msgid "" +"P&revent system from entering idle sleep during transfers and other " +"operations" +msgstr "" +"Forhind&r at systemet går i dvale under overførsler og andre handlinger" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 +msgid "P&roxy host:" +msgstr "P&roxy-vært:" + +#: ../../locales/../src/interface/netconfwizard.cpp:507 +msgid "PORT command tainted by router or firewall." +msgstr "PORT-kommando forstyrret af router eller firewall." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 +msgid "Pa&ssive (recommended)" +msgstr "&Passiv (anbefalet)" + +#: ../../locales/../src/interface/Mainfrm.cpp:2484 +msgid "Parameter not a valid URL" +msgstr "Parameteren er ikke en gyldig URL" + +#: ../../locales/../src/interface/updater.cpp:595 +#, c-format +msgid "Parsing %d bytes of version information.\n" +msgstr "Behandler %d byte versionsinformation.\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 +msgid "Pass&word:" +msgstr "&Adgangskode:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 +msgid "Passive (recommended)" +msgstr "Passiv (anbefalet)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 +msgid "Passive mode" +msgstr "Passiv tilstand" + +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 +msgid "Passive mode has been set as default transfer mode." +msgstr "Passiv tilstand er blevet sat som standard-overførselstilstand." + +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Adgangskode eller krypteringsnøgle er ikke sat" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 +msgid "Password required" +msgstr "Adgangskode kræves" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Adgangskoder" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 +msgid "Path" +msgstr "Sti" + +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 +#, c-format +msgid "Path cannot be constructed for directory %s and subdir %s" +msgstr "Sti kan ikke dannes for mappen %s og undermappen %s" + +#: ../../locales/../src/interface/Mainfrm.cpp:2439 +msgid "Path not found:" +msgstr "Sti ikke fundet:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 +msgid "Paths" +msgstr "Stier" + +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 +msgid "Pending removal" +msgstr "Afventer fjernelse" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +msgid "Permission" +msgstr "Tilladelse" + +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 +msgid "Permission denied" +msgstr "Tilladelse nægtet" + +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 +msgid "Permissions" +msgstr "Tilladelser" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 +msgid "Platform:" +msgstr "Platform:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Tilføj de lokale mapper, som FileZilla skal bruges med." + +# scootergrisen: jeg foreslår at "again" oversættes til "igen" ligesom i andre strenge i stedet for "en gang til" +#: ../../locales/../src/interface/netconfwizard.cpp:574 +msgid "" +"Please check on https://filezilla-project.org/probe.php that the server is " +"running and carefully check your settings again." +msgstr "" +"Tjek på https://filezilla-project.org/probe.php at serveren kører, og tjek " +"omhyggeligt dine indstillinger igen." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Tjek de givne tilladelser og tilføj manglende lokale mapper igen, som du " +"arbejder med i den følgende dialog." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 +msgid "" +"Please configure any firewalls and routers so that FileZilla can establish " +"outgoing connection to arbitrary ports." +msgstr "" +"Konfigurer eventuelle firewalls og routere, så FileZilla kan etablere en " +"udgående forbindelse til vilkårlige porte." + +#: ../../locales/../src/interface/netconfwizard.cpp:645 +msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." +msgstr "" +"Deaktivér indstillinger som 'DMZ mode' eller 'Game mode' på din router." + +#: ../../locales/../src/interface/netconfwizard.cpp:583 +msgid "" +"Please ensure you have a stable internet connection and carefully check your " +"settings again." +msgstr "" +"Sørg for at din internetforbindelse er stabil, og tjek omhyggeligt dine " +"indstillinger igen." + +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 +msgid "Please enter a custom date format." +msgstr "Indtast et brugerdefineret datoformat." + +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 +msgid "Please enter a custom time format." +msgstr "Indtast et brugerdefineret klokkeslætformat." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 +msgid "" +"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." +msgstr "Indtast en dato i formatet ÅÅÅÅ-MM-DD, f.eks. 2010-07-18." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#, c-format +msgid "Please enter a download speed limit greater or equal to 0 %s/s." +msgstr "Indtast en hastighedsgrænse for download, højere end eller lig 0 %s/s." + +#: ../../locales/../src/interface/filteredit.cpp:136 +msgid "Please enter a name for the new filter." +msgstr "Indtast et navn til det nye filter." + +#: ../../locales/../src/interface/filteredit.cpp:242 +msgid "Please enter a new name for the copied filter." +msgstr "Indtast et nyt navn til det kopierede filter." + +#: ../../locales/../src/interface/filter.cpp:300 +#, c-format +msgid "Please enter a new name for the filter set \"%s\"" +msgstr "Indtast et nyt navn til filtersættet \"%s\"" + +#: ../../locales/../src/interface/filteredit.cpp:195 +msgid "Please enter a new name for the filter." +msgstr "Indtast et nyt navn til filteret." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 +msgid "" +"Please enter a number between 0 and 10 for the number of concurrent " +"downloads." +msgstr "Indtast et tal mellem 0 og 10 for antallet af samtidige downloads." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 +msgid "" +"Please enter a number between 0 and 10 for the number of concurrent uploads." +msgstr "Indtast et tal mellem 0 og 10 for antallet af samtidige uploads." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 +msgid "" +"Please enter a number between 1 and 10 for the number of concurrent " +"transfers." +msgstr "Indtast et tal mellem 1 og 10 for antallet af samtidige overførsler." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 +msgid "Please enter a password for this server:" +msgstr "Indtast en adgangskode til denne server:" + +#: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 +msgid "" +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." +msgstr "" +"Indtast en timeout mellem 10 og 9999 sekunder eller 0 for at deaktivere " +"timeout." + +#: ../../locales/../src/interface/filter.cpp:238 +msgid "Please enter a unique name for this filter set" +msgstr "Indtast et unikt navn til dette filtersæt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 +msgid "Please enter a username for this server:" +msgstr "Indtast et brugernavn til denne server:" + +#: ../../locales/../src/interface/netconfwizard.cpp:185 +msgid "Please enter a valid portrange." +msgstr "Indtast et gyldigt interval af portnumre." + +#: ../../locales/../src/interface/netconfwizard.cpp:166 +msgid "Please enter an URL where to get your external address from" +msgstr "Indtast en URL, hvorfra dine eksterne adresser skal hentes" + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 +#, c-format +msgid "Please enter an upload speed limit greater or equal to 0 %s/s." +msgstr "Indtast en hastighedsgrænse for upload, højere end eller lig 0 %s/s." + +#: ../../locales/../src/interface/Mainfrm.cpp:623 +msgid "" +"Please enter raw FTP command.\n" +"Using raw ftp commands will clear the directory cache." +msgstr "" +"Indtast en rå FTP-kommando.\n" +"Brug af rå FTP-kommandoer rydder mappe-mellemlageret." + +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Indtast den fulde sti til et program og dets parametre. Kommandoen udføres " +"når køen er færdigbehandlet.\n" +"F.eks. c:\\enSti\\fil.exe under MS Windows eller /enSti/fil under Unix.\n" +"Hvis kommandoer indeholder mellemrum skal de sættes korrekt i anførselstegn." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 +msgid "Please enter the name of the directory which should be created:" +msgstr "Indtast navnet på den mappe, der skal oprettes:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2702 +msgid "Please enter the name of the file which should be created:" +msgstr "Indtast navnet på den fil, der skal oprettes:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 +msgid "Please enter username and password for this server:" +msgstr "Indtast et brugernavn og en adgangskode til denne server:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Indtast din aktuelle hovedadgangskode for at ændre " +"adgangskodeindstillingerne." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 +msgid "Please enter your external IP address" +msgstr "Indtast din eksterne IP-adresse" + +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 +msgid "" +"Please enter your external IP address on the active mode page of this " +"wizard. In case you have a dynamic address or don't know your external " +"address, use the external resolver option." +msgstr "" +"Indtast din eksterne IP-adresse på aktiv tilstand-siden i denne guide. Hvis " +"du har en dynamisk adresse eller ikke kender din eksterne adresse, kan du " +"bruge den eksterne adresse-fortolkervalgmulighed." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Indtast din hovedadgangskode for at dekryptere adgangskoden til denne server:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 +msgid "" +"Please follow the instructions carefully, as wrong configuration will " +"prevent successful FTP connections." +msgstr "" +"Følg instruktionerne omhyggeligt, eftersom en forkert konfiguration vil " +"forhindre korrekte FTP-forbindelser." + +#: ../../locales/../src/interface/netconfwizard.cpp:639 +msgid "" +"Please make sure FileZilla is allowed to establish outgoing connections and " +"make sure you typed the address of the address resolver correctly." +msgstr "" +"Sørg for at tillade, at FileZilla kan oprette udgående forbindelser, og sørg " +"for at skrive adressen på adresse-fortolker korrekt." + +#: ../../locales/../src/interface/FileZilla.cpp:149 +msgid "Please make sure the requested locale is installed on your system." +msgstr "Sørg for, at det anmodede sprog er installeret på dit system." + +# scootergrisen: microsoft har både oversat til videresendelse og omdirigering +# scootergrisen: TDC ser ud til at have oversat til "port omdirigering" +# scootergrisen: hvis du har en router kunne du eventuel logge på den og tjekke hvad det er oversat til eller kan vi undersøge diverse router-hjemmesider/manualer +# scootergrisen: hvis nu de fleste routere har software som ikke er oversat til dansk så gavner det måske ikke brugeren at oversætte det, samme med DMZ mode og game mode. +# scootergrisen: vi kunne også skrive "'port forwarding'" ligesom med DMZ mode og game mode hvis det er bedst at beholde det på engelsk. +# scootergrisen: jeg synes "Du skal ikke køre" lyder så kommanderne. Mit bud er "Kør ikke din router i" +# scootergrisen: sv bruger "\"port forwarding\"" +# scootergrisen: nn_NO bruger "port forwarding" +# scootergrisen: nb_NO bruger "videresending av porter" +#: ../../locales/../src/interface/netconfwizard.cpp:616 +msgid "" +"Please make sure your router is using the latest available firmware. " +"Furthermore, your router has to be configured properly. You will have to use " +"manual port forwarding. Don't run your router in the so called 'DMZ mode' or " +"'game mode'." +msgstr "" +"Tjek, at din router anvender den seneste firmware. Desuden skal din router " +"være konfigureret korrekt. Du bliver nødt til at anvende manuel 'port " +"forwarding'. Du skal ikke køre din router i den såkaldte 'DMZ mode' eller " +"'game mode'." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 +msgid "" +"Please note that FileZilla has no influence on the port the server chooses. " +"So the server might choose a port which your firewall thinks is only used by " +"trojans or other malware. This might raise a false alarm you can safely " +"discard." +msgstr "" +"Bemærk, at FileZilla ikke har indflydelse på valget af serverport. Serveren " +"vil muligvis vælge en port, som din firewall tror kun anvendes af trojanske " +"heste eller andet malware. Dette kan give anledning til en falsk alarm, som " +"du kan afvise med sindsro." + +#: ../../locales/../src/interface/Mainfrm.cpp:750 +msgid "" +"Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " +"servers only works if they support the MFMT command." +msgstr "" +"Bemærk, at bevarelse af tidsstempler ved upload på FTP-, FTPS- og FTPES-" +"servere kun virker, hvis de understøtter MFMT-kommandoen." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 +msgid "" +"Please note that some servers might ban you if you try to reconnect too " +"often or in too short intervals." +msgstr "" +"Bemærk, at nogle servere måske blokerer dig, hvis du prøver at genoprette " +"forbindelsen for ofte eller hvis intervallerne er for korte." + +#: ../../locales/../src/interface/netconfwizard.cpp:592 +msgid "" +"Please run this wizard again should you change your network environment or " +"in case you suddenly encounter problems with servers that did work " +"previously." +msgstr "" +"Hvis du skal foretage ændringer i netværket eller hvis du pludselig får " +"problemer med servere, der tidligere virkede, så kør denne guide igen." + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Gem denne nøgle et sikkert sted. Uden den korrekte nøgle kan dine uploadede " +"filer ikke tilgås." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 +msgid "Please select an action:" +msgstr "Vælg en handling:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 +msgid "Please select the categories you would like to import." +msgstr "Vælg den kategori, du vil importere." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 +msgid "Please select the default transfer mode you would like to use." +msgstr "Vælg den overførselstilstand, du vil bruge som standard." + +#: ../../locales/../src/interface/chmoddialog.cpp:41 +#, c-format +msgid "Please select the new attributes for the directory \"%s\"." +msgstr "Vælg de nye attributter for mappen \"%s\"." + +#: ../../locales/../src/interface/chmoddialog.cpp:33 +#, c-format +msgid "Please select the new attributes for the file \"%s\"." +msgstr "Vælg de nye attributter for filen \"%s\"." + +#: ../../locales/../src/interface/chmoddialog.cpp:44 +msgid "Please select the new attributes for the selected directories." +msgstr "Vælg de nye attributter til de valgte mapper." + +#: ../../locales/../src/interface/chmoddialog.cpp:47 +msgid "" +"Please select the new attributes for the selected files and directories." +msgstr "Vælg de nye attributter for de valgte filer og mapper." + +#: ../../locales/../src/interface/chmoddialog.cpp:36 +msgid "Please select the new attributes for the selected files." +msgstr "Vælg de nye attributter til de valgte filer." + +#: ../../locales/../src/interface/netconfwizard.cpp:603 +msgid "" +"Please update your firewall and make sure your router is using the latest " +"available firmware. Furthermore, your router has to be configured properly. " +"You will have to use manual port forwarding. Don't run your router in the so " +"called 'DMZ mode' or 'game mode'. Things like protocol inspection or " +"protocol specific 'fixups' have to be disabled" +msgstr "" +"Opdatér din firewall, og tjek, at din router anvender den seneste firmware. " +"Desuden skal din router være konfigureret korrekt. Du skal bruge manuel " +"'port forwarding'. Du skal ikke køre din router i såkaldt 'DMZ mode' eller " +"'game mode'. Desuden skal ting som protokol-kontrol eller protokol-" +"specifikke 'rettelser' deaktiveres" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 +msgid "Positio&n of the message log:" +msgstr "&Placering af meddelelsesloggen:" + +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 +msgid "Postal code:" +msgstr "Postnummer:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 +msgid "Pre&allocate space before downloading" +msgstr "Af&sæt plads inden download" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 +msgid "Preallocation" +msgstr "Afsat plads" + +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 +msgid "Predefined Sites" +msgstr "Foruddefinerede steder" + +#: ../../locales/../src/interface/Mainfrm.cpp:749 +msgid "Preserving file timestamps" +msgstr "Bevaring af filers tidsstempler" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Forhåndsvisning" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 +msgid "Primary connection and data connection certificates don't match." +msgstr "Primær forbindelse og data-forbindelse certifikater er ikke ens." + +#: ../../locales/../src/interface/cmdline.cpp:19 +msgid "Print diagnostic information related to startup of FileZilla" +msgstr "" +"Udskriv diagnostiske informationer i forbindelse med start af FileZilla" + +#: ../../locales/../src/interface/cmdline.cpp:18 +msgid "Print version information to stdout and exit" +msgstr "Udskriv versionsinformation til stdout, og afslut" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 +msgid "Prioritize directories (default)" +msgstr "Prioritér mapper (standard)" + +#: ../../locales/../src/interface/queue.cpp:1214 +msgid "Priority" +msgstr "Prioritet" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 +msgid "" +"Privacy policy: Only your version of FileZilla, your used operating system " +"and your CPU architecture will be submitted to the server." +msgstr "" +"Privatlivspolitik: kun oplysninger om din version af FileZilla, dit " +"styresystem og din CPU-arkitektur vil blive sendt til serveren." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 +msgid "Private &keys:" +msgstr "Private &nøgler:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 +msgid "Pro&tocol:" +msgstr "Pro&tokol:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 +msgid "Pro&xy password:" +msgstr "Proxy-adgangsk&ode:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +msgid "Process &Queue" +msgstr "Udfør &kø" + +#: ../../locales/../src/engine/socket.cpp:1063 +msgid "Process file table overflow" +msgstr "Overløb i proces-filtabel" + +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 +#, c-format +msgid "Processed %s in %s." +msgstr "Behandlede %s i %s." + +#: ../../locales/../src/engine/socket.cpp:1068 +msgid "Protocol not supported" +msgstr "Protokollen understøttes ikke" + +#: ../../locales/../src/engine/socket.cpp:1122 +msgid "Protocol not supported on given socket type" +msgstr "Protokollen understøttes ikke for den angivne sokkeltype" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 +msgid "Protocol:" +msgstr "Protokol:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 +msgid "Proxy &port:" +msgstr "&Proxy-port:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 +msgid "Proxy &user:" +msgstr "Pro&xy-bruger:" + +#: ../../locales/../src/engine/proxy.cpp:479 +msgid "Proxy authentication failed" +msgstr "Godkendelse af proxy mislykkedes" + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 +#, c-format +msgid "Proxy handshake failed: %s" +msgstr "Proxy-håndtryk mislykkedes: %s" + +#: ../../locales/../src/engine/ftp/logon.cpp:65 +msgid "Proxy host starts with '[' but no closing bracket found." +msgstr "Proxy-vært starter med '[', men en slutparentes kunne ikke findes." + +#: ../../locales/../src/engine/proxy.cpp:333 +#, c-format +msgid "Proxy reply: %s" +msgstr "Proxy-svar: %s" + +#: ../../locales/../src/engine/proxy.cpp:520 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Proxy-forespørgsel mislykkedes. Svaret fra proxy: %s" + +#: ../../locales/../src/engine/proxy.cpp:390 +#, c-format +msgid "Proxy request failed: %s" +msgstr "Proxy-forespørgsel mislykkedes: %s" + +#: ../../locales/../src/engine/proxy.cpp:544 +msgid "Proxy request failed: Unknown address type in CONNECT reply" +msgstr "Proxy-forespørgsel mislykkedes: ukendt adressetype i svar på CONNECT" + +#: ../../locales/../src/engine/ftp/logon.cpp:92 +msgid "Proxy set but proxy host or port invalid" +msgstr "Proxy er defineret, men proxy-vært eller -port er ugyldig" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 +msgid "Public Key Authentication" +msgstr "Godkendelse med offentlig nøgle" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 +msgid "Public key algorithm:" +msgstr "Algoritme for offentlig nøgle:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 +msgid "Public permissions" +msgstr "Offentlige tilladelser" + +#: ../../locales/../src/interface/QueueView.cpp:2779 +msgid "Queue has been fully processed" +msgstr "Køen er færdigbehandlet" + +#: ../../locales/../src/interface/statusbar.cpp:439 +#, c-format +msgid "Queue: %s MiB" +msgstr "Kø: %s MiB" + +#: ../../locales/../src/interface/statusbar.cpp:374 +#, c-format +msgid "Queue: %s%s" +msgstr "Kø: %s%s" + +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 +msgid "Queue: empty" +msgstr "Kø: tom" + +#: ../../locales/../src/interface/QueueView.cpp:204 +msgid "Queued files" +msgstr "Filer i kø" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 +msgid "Queueing:" +msgstr "Sætter i kø:" + +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Lynsøgning:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Lynsøgning kan ikke åbnes ved sammenligning af mapper." + +# scootergrisen: i mellemtiden synes jeg det er bedre at "once" oversættes til "(en gang)" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "&Genstart systemet én gang" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +msgid "R&emote directory tree" +msgstr "Fjernmappe&træ" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +msgid "R&eset and requeue selected files" +msgstr "N&ulstil og sæt de valgte filer i kø igen" + +#: ../../locales/../src/interface/Mainfrm.cpp:638 +msgid "Raw FTP command" +msgstr "Rå FTP-kommando" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 +msgid "Re&ad" +msgstr "L&æs" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 +msgid "Re&fresh" +msgstr "&Opdatér" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 +msgid "Re&name" +msgstr "Om&døb" + +# scootergrisen: prøv og find noget bedre til "accordingly" end "i overensstemmelse hermed" +#: ../../locales/../src/interface/netconfwizard.cpp:598 +msgid "" +"Re-run the wizard and carefully check your settings and configure all " +"routers and firewalls accordingly." +msgstr "" +"Kør guiden igen, undersøg omhyggeligt dine indstillinger, og konfigurer alle " +"routere og firewalls i overensstemmelse hermed." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 +msgid "Rea&d" +msgstr "Læ&s" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 +msgid "Read-only" +msgstr "Skrivebeskyttet" + +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 +msgid "Really cancel current operation?" +msgstr "Vil du virkelig annullere den igangværende handling?" + +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 +#, c-format +msgid "Really delete %d directory with its contents from the server?" +msgid_plural "" +"Really delete %d directories with their contents from the server?" +msgstr[0] "Vil du virkelig slette %d mappe med dens indhold fra serveren?" +msgstr[1] "Vil du virkelig slette %d mapper med deres indhold fra serveren?" + +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 +#, c-format +msgid "Really delete %d file from the server?" +msgid_plural "Really delete %d files from the server?" +msgstr[0] "Vil du virkelig slette %d fil fra serveren?" +msgstr[1] "Vil du virkelig slette %d filer fra serveren?" + +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 +#, c-format +msgid "Really delete %s and %s from the server?" +msgstr "Vil du virkelig slette %s og %s fra serveren?" + +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +msgid "Really delete all selected files and/or directories from the server?" +msgstr "Vil du virkelig slette alle valgte filer og/eller mapper fra serveren?" + +#: ../../locales/../src/interface/file_utils.h:45 +msgid "Really delete all selected files and/or directories from your computer?" +msgstr "" +"Vil du virkelig slette alle valgte filer og/eller mapper fra din computer?" + +#: ../../locales/../src/interface/queue.cpp:1214 +msgid "Reason" +msgstr "Årsag" + +#: ../../locales/../src/interface/QueueView.cpp:2772 +msgid "Reboot now" +msgstr "Genstart nu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +msgid "Rec&urse into subdirectories" +msgstr "Rek&ursivt i undermapper" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 +#, c-format +msgid "Received TLS alert from the server: %s (%d)" +msgstr "Modtog TLS-advarsel fra serveren: %s (%d)" + +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 +msgid "Received a directory listing which appears to be encoded in EBCDIC." +msgstr "Modtog en mappevisning, som ser ud til at være kodet med EBCDIC." + +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 +msgid "Received a line exceeding 10000 characters, aborting." +msgstr "Modtog en linje med over 10000 tegn. Afbryder." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "Modtagne certifikatkæde kunne ikke kontrolleres. Kontrolstatus er %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 +msgid "Received data tainted" +msgstr "Modtog data der er forstyrret" + +#: ../../locales/../src/interface/updater.cpp:574 +msgid "Received invalid character in version information" +msgstr "Modtog ugyldigt tegn i versionsinformation" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 +#, c-format +msgid "Received unknown TLS alert %d from the server" +msgstr "Modtog ukendt TLS-advarsel %d fra serveren" + +#: ../../locales/../src/interface/updater.cpp:567 +msgid "Received version information is too large" +msgstr "Modtog versionsinformation, der er for store" + +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +msgid "" +"Reconnect information cannot be cleared while connected to a server.\n" +"If you continue, your connection will be disconnected." +msgstr "" +"Information om genoprettelse af forbindelse kan ikke ryddes, når der er " +"forbundet til en server.\n" +"Hvis du fortsætter, vil forbindelsen blive afbrudt." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 +msgid "Reconnection settings" +msgstr "Indstillinger for genoprettelse af forbindelsen" + +#: ../../locales/../src/interface/toolbar.cpp:47 +msgid "Reconnects to the last used server" +msgstr "Genopretter forbindelsen til den sidst anvendte server" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 +msgid "Recursively adding files to queue." +msgstr "Tilføjer rekursivt filer i kø." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 +msgid "Recursively changing permissions." +msgstr "Skifter rekursivt tilladelser." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 +msgid "Recursively deleting files and directories." +msgstr "Sletter rekursivt filer og mapper." + +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Rød" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 +#, c-format +msgid "Redirection to invalid or unsupported URI: %s" +msgstr "Omdirigering til ugyldig eller ikke-understøttet URI: %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:153 +#, c-format +msgid "Redirection to invalid or unsupported address: %s" +msgstr "Omdirigering til ugyldig eller ikke-understøttet adresse: %s" + +# scootergrisen: kilde: foreslå at ændre folder til directory som i andre strenge +#: ../../locales/../src/interface/toolbar.cpp:43 +msgid "Refresh the file and folder lists" +msgstr "Opdatér fil- og mappelisterne" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 +msgid "Remember passwords?" +msgstr "Husk adgangskoder?" + +#: ../../locales/../src/interface/edithandler.cpp:1147 +msgid "Remote" +msgstr "Fjern" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 +msgid "Remote certificate not trusted." +msgstr "Ingen tillid til fjern-certifikat." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 +msgid "Remote file" +msgstr "Fil på fjernsted" + +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 +msgid "Remote file search" +msgstr "Filsøgning på fjernsted" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 +msgid "Remote filters:" +msgstr "Fjernfiltre:" + +#: ../../locales/../src/interface/edithandler.cpp:1138 +msgid "Remote path" +msgstr "Sti på fjernsted" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 +#, c-format +msgid "" +"Remote path cannot be parsed. Make sure it is a valid absolute path and is " +"supported by the current site's servertype (%s)." +msgstr "" +"Fjernstien kan ikke fortolkes. Sørg for, at det er en gyldig, absolut sti, " +"og at den er understøttet af det aktuelle steds servertype (%s)." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 +#, c-format +msgid "" +"Remote path cannot be parsed. Make sure it is a valid absolute path and is " +"supported by the servertype (%s) selected on the parent site." +msgstr "" +"Fjernstien kan ikke fortolkes. Sørg for, at det er en gyldig, absolut sti, " +"og at den er understøttet af den servertype (%s), der er valgt på det " +"overordnede sted." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 +msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." +msgstr "" +"Fjernstien kan ikke fortolkes. Sørg for, at det er en gyldig, absolut sti." + +#: ../../locales/../src/interface/manual_transfer.cpp:323 +msgid "Remote path could not be parsed." +msgstr "Sti på fjernsted kunne ikke fortolkes." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +msgid "Remote path handling:" +msgstr "Håndtering af fjernsti:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 +msgid "Remote path:" +msgstr "Sti på fjernsted:" + +#: ../../locales/../src/interface/viewheader.cpp:529 +msgid "Remote site:" +msgstr "Fjernsted:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 +msgid "Remove &all" +msgstr "Fjern &alt" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 +msgid "Remove &selected" +msgstr "Fjern &valgte" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 +msgid "Rename file" +msgstr "Omdøb fil" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 +msgid "Rename selected directory" +msgstr "Omdøb den valgte mappe" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 +msgid "Rename selected files and directories" +msgstr "Omdøb de valgte filer og mapper" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 +#, c-format +msgid "Renaming '%s' to '%s'" +msgstr "Omdøber '%s' til '%s'" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Gentag adgangskode:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 +msgid "Reporting bugs and feature requests" +msgstr "Rapportér fejl og ønsker om nye funktioner" + +# scootergrisen: Ask forslår "–" +#: ../../locales/../src/engine/proxy.cpp:381 +msgid "" +"Request failed - client is not running identd (or not reachable from server)" +msgstr "" +"Forespørgsel mislykkedes - klienten kører ikke identd (eller kan ikke tilgås " +"fra serveren)" + +#: ../../locales/../src/engine/proxy.cpp:384 +msgid "Request failed - client's identd could not confirm the user ID string" +msgstr "" +"Forespørgsel mislykkedes - klientens identd kunne ikke bekræfte bruger-ID-" +"strengen" + +#: ../../locales/../src/engine/proxy.cpp:378 +msgid "Request rejected or failed" +msgstr "Forespørgsel afvist eller fejlet" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 +msgid "Require explicit FTP over TLS" +msgstr "Forlang eksplicit FTP over TLS" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 +msgid "Require implicit FTP over TLS" +msgstr "Forlang implicit FTP over TLS" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 +msgid "Reset and requeue &all" +msgstr "Nulstil og sæt &alle i kø igen" + +#: ../../locales/../src/engine/socket.cpp:1110 +msgid "Resolved protocol is unknown" +msgstr "Fortolket protokol er ukendt" + +#: ../../locales/../src/engine/ControlSocket.cpp:1086 +#, c-format +msgid "Resolving address of %s" +msgstr "Fortolker adressen %s" + +#: ../../locales/../src/engine/socket.cpp:1069 +msgid "Resource temporarily unavailable" +msgstr "Ressourcen er midlertidigt utilgængelig" + +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 +msgid "Response:" +msgstr "Svar:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 +msgid "Results:" +msgstr "Resultater:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 +msgid "Resume file transfer" +msgstr "Genoptag filoverførsel" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 +msgid "" +"Resuming ASCII files can cause problems if server uses a different line " +"ending format than the client." +msgstr "" +"Genoptagelse af ASCII-filer kan give problemer, hvis serveren bruger et " +"andet linjeskiftformat end klienten." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 +#, c-format +msgid "Retrieving directory listing of \"%s\"..." +msgstr "Henter mappevisning for \"%s\"..." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 +msgid "Retrieving directory listing..." +msgstr "Henter mappevisning..." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 +#, c-format +msgid "Retrieving external IP address from %s" +msgstr "Henter ekstern IP-adresse fra %s" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +msgid "S&how files currently being edited..." +msgstr "&Vis filer som redigeres i øjeblikket..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 +msgid "S&how the Site Manager on startup" +msgstr "Vis &stedhåndtering ved start" + +# scootergrisen: i mellemtiden synes jeg det er bedre at "once" oversættes til "(en gang)" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "L&uk systemet én gang" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 +msgid "S&top" +msgstr "S&top" + +# scootergrisen: i mellemtiden synes jeg det er bedre at "once" oversættes til "(en gang)" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "S&top systemet midlertidigt én gang" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 +msgid "S&ynchronized browsing" +msgstr "S&ynkroniseret gennemgang" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 +msgid "SFTP" +msgstr "SFTP" + +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "SFTP-understøttelse" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 +msgid "SOC&KS 4" +msgstr "SOC&KS 4" + +#: ../../locales/../src/engine/proxy.cpp:144 +#, c-format +msgid "SOCKS4 proxy will connect to: %s" +msgstr "SOCKS4-proxy forbinder til: %s" + +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 understøtter ikke brugernavne og adgangskoder som er længere end 255 " +"tegn." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 +msgid "SQLite:" +msgstr "SQLite:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "&Gem adgangskoder som beskyttes med en hovedadgangskode" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "&Gem adgangskoder" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 +msgid "Save settings?" +msgstr "Gem indstillinger?" + +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 +msgid "Saving of password has been disabled by your system administrator." +msgstr "Din systemadministrator har deaktiveret gemning af adgangskoder." + +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +msgid "Saving of passwords has been disabled by you." +msgstr "Du har deaktiveret gemning af adgangskoder." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Skaleringsfaktor:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 +msgid "Search &conditions:" +msgstr "Søge&betingelser:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 +msgid "Search &directory:" +msgstr "Søg i &mappe:" + +#: ../../locales/../src/interface/toolbar.cpp:53 +msgid "Search for files recursively." +msgstr "Søg rekursivt efter filer." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +msgid "Search server for files" +msgstr "Søg efter filer på serveren" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Søgningstype:" + +#: ../../locales/../src/interface/statusbar.cpp:516 +msgid "Security information" +msgstr "Sikkerhedsinformation" + +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 +msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" +msgstr "Se også: https://wiki.filezilla-project.org/Network_Configuration" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 +msgid "Sele&ct server" +msgstr "V&ælg server" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 +msgid "Select &page:" +msgstr "Vælg s&ide:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 +msgid "Select Theme" +msgstr "Vælg tema" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 +msgid "" +"Select default action to perform if target file of a transfer already exists." +msgstr "" +"Vælg standardhandling, der skal udføres, hvis destinationsfilen i en " +"overførsel allerede findes." + +#: ../../locales/../src/interface/edithandler.cpp:1583 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 +msgid "Select default editor" +msgstr "Vælg standardredigeringsprogram" + +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +msgid "" +"Select default file exists action if the target file already exists. This " +"selection is valid only for the current session." +msgstr "" +"Vælg standardhandling når destinationsfilen allerede findes. Dette valg " +"gælder kun den aktuelle session." + +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 +msgid "" +"Select default file exists action only for the currently selected files in " +"the queue." +msgstr "" +"Vælg standardhandling når filen findes for de aktuelt valgte filer i køen." + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 +msgid "Select file containing private key" +msgstr "Vælg fil med privat nøgle" + +#: ../../locales/../src/interface/export.cpp:48 +msgid "Select file for exported data" +msgstr "Vælg fil til eksporterede data" + +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Vælg fil til eksporterede filtre" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 +msgid "Select file for exported queue" +msgstr "Vælg fil til eksporteret kø" + +#: ../../locales/../src/interface/export.cpp:42 +msgid "Select file for exported settings" +msgstr "Vælg fil til eksporterede indstillinger" + +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 +msgid "Select file for exported sites" +msgstr "Vælg fil til eksporterede steder" + +#: ../../locales/../src/interface/import.cpp:17 +msgid "Select file to import settings from" +msgstr "Vælg fil at importere indstillinger fra" + +#: ../../locales/../src/interface/manual_transfer.cpp:239 +msgid "Select file to upload" +msgstr "Vælg fil til upload" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 +msgid "Select filename for converted key file" +msgstr "Vælg filnavn til konverteret nøglefil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 +msgid "Select how these files should be opened." +msgstr "Vælg hvordan filerne skal åbnes." + +#: ../../locales/../src/interface/search.cpp:915 +msgid "Select target download directory" +msgstr "Vælg destinationsmappe til download" + +#: ../../locales/../src/interface/manual_transfer.cpp:235 +msgid "Select target filename" +msgstr "Vælg navn på destinationsfil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 +msgid "Select the categories to export:" +msgstr "Vælg kategorier der skal eksporteres:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 +msgid "Select the private data you would like to delete." +msgstr "Vælg de personlige data, du vil slette." + +#: ../../locales/../src/interface/search.cpp:872 +#, c-format +msgid "Selected %d directory with its contents for transfer." +msgid_plural "Selected %d directories with their contents for transfer." +msgstr[0] "Valgte %d mappe med dens indhold til overførsel." +msgstr[1] "Valgte %d mapper med deres indhold til overførsel." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 +#, c-format +msgid "Selected %d directory." +msgid_plural "Selected %d directories." +msgstr[0] "Valgte %d mappe." +msgstr[1] "Valgte %d mapper." + +#: ../../locales/../src/interface/search.cpp:869 +#, c-format +msgid "Selected %d file for transfer." +msgid_plural "Selected %d files for transfer." +msgstr[0] "Valgte %d fil til overførsel." +msgstr[1] "Valgte %d filer til overførsel." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 +#, c-format +msgid "Selected %d file. Total size: %s" +msgid_plural "Selected %d files. Total size: %s" +msgstr[0] "Valgte %d fil. Samlet størrelse: %s" +msgstr[1] "Valgte %d filer. Samlet størrelse: %s" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#, c-format +msgid "Selected %d file. Total size: At least %s" +msgid_plural "Selected %d files. Total size: At least %s" +msgstr[0] "Valgte %d fil. Samlet størrelse: mindst %s" +msgstr[1] "Valgte %d filer. Samlet størrelse: mindst %s" + +#: ../../locales/../src/interface/search.cpp:877 +#, c-format +msgid "Selected %s and %s for transfer." +msgstr "Valgte %s og %s til overførsel." + +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 +#, c-format +msgid "Selected %s and %s. Total size: %s" +msgstr "Valgte %s og %s. Samlet størrelse: %s" + +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 +#, c-format +msgid "Selected %s and %s. Total size: At least %s" +msgstr "Valgte %s og %s. Samlet størrelse: mindst %s" + +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 +msgid "Selected editor does not exist." +msgstr "Det valgte redigeringsprogram findes ikke." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 +msgid "Selected file already being edited" +msgstr "Den valgte fil redigeres allerede" + +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 +msgid "Selected file is already loaded" +msgstr "Den valgte fil er allerede indlæst" + +#: ../../locales/../src/interface/edithandler.cpp:1700 +msgid "Selected file is already opened" +msgstr "Den valgte fil er allerede åbnet" + +#: ../../locales/../src/interface/edithandler.cpp:1772 +msgid "Selected file is still being edited" +msgstr "Den valgte fil redigeres stadig" + +#: ../../locales/../src/interface/filter.cpp:206 +msgid "Selected filter only works for local files." +msgstr "Det valgte filter fungerer kun for lokale filer." + +#: ../../locales/../src/interface/menu_bar.cpp:321 +msgid "" +"Selected global bookmark and current server use a different server type.\n" +"Use site-specific bookmarks for this server." +msgstr "" +"Det valgte globale bogmærke og den aktuelle server anvender forskellige " +"servertyper.\n" +"Anvend sted-specifikke bogmærker for denne server." + +#: ../../locales/../src/engine/engineprivate.cpp:307 +msgid "Selected port usually in use by a different protocol." +msgstr "Den valgte port er som regel brugt af anden protokol." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 +msgid "Send FTP &keep-alive commands" +msgstr "Send FTP &keep alive-kommandoer" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 +msgid "Send custom command to the server otherwise not available" +msgstr "" +"Send brugerdefineret kommando til serveren, der ellers ikke er tilgængelige" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 +msgid "Sending keep-alive command" +msgstr "Sender keep-alive-kommando" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 +msgid "Serial number:" +msgstr "Serienummer:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 +msgid "Server &Type:" +msgstr "Servert&ype:" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 +msgid "Server did not properly shut down TLS connection" +msgstr "Serveren lukkede ikke TLS-forbindelsen korrekt" + +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 +msgid "Server does not support non-ASCII characters." +msgstr "Serveren understøtter ikke tegn uden for ASCII-tegnsættet." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 +#, c-format +msgid "Server does not support resume of files > %d GB." +msgstr "" +"Serveren understøtter ikke genoptagelse af filer som er større end %d GB." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 +#, c-format +msgid "" +"Server does not support resume of files > %d GB. End transfer since file " +"sizes match." +msgstr "" +"Serveren understøtter ikke genoptagelse af filer som er større end %d GB. " +"Afslut overførslen, da filstørrelserne er ens." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 +msgid "Server does not support resume of files > 2GB." +msgstr "" +"Serveren understøtter ikke genoptagelse af filer som er større end 2 GB." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 +msgid "Server does not support resume of files > 4GB." +msgstr "" +"Serveren understøtter ikke genoptagelse af filer som er større end 4 GB." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Serverens værtsnøgle" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 +#, c-format +msgid "" +"Server may not support resume of files > %d GB. End transfer since file " +"sizes match." +msgstr "" +"Serveren understøtter måske ikke genoptagelse af filer som er større end %d " +"GB. Afslut overførslen, da filstørrelserne er ens." + +#: ../../locales/../src/engine/ftp/logon.cpp:338 +msgid "" +"Server might require an account. Try specifying an account using the Site " +"Manager" +msgstr "" +"Serveren kræver muligvis en konto. Prøv at angiv en konto med " +"stedhåndteringen" + +#: ../../locales/../src/engine/http/request.cpp:457 +msgid "Server not sending proper line endings" +msgstr "Serveren sender ikke korrekte linjeskift" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 +msgid "Server returned empty path." +msgstr "Serveren returnerede en tom sti." + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 +msgid "" +"Server sent an additional login prompt. You need to use the interactive " +"login type." +msgstr "" +"Serveren bad om endnu et login. Du skal anvende den interaktive logintype." + +#: ../../locales/../src/engine/http/request.cpp:307 +msgid "Server sent data even before request headers were sent" +msgstr "" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 +msgid "Server sent passive reply with unroutable address. Passive mode failed." +msgstr "" +"Serveren sendte passivt svar med en adresse, der ikke kan omdirigeres. " +"Passiv tilstand mislykkedes." + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 +msgid "" +"Server sent passive reply with unroutable address. Using server address " +"instead." +msgstr "" +"Serveren sendte passivt svar med en adresse, der ikke kan omdirigeres. " +"Anvender i stedet serveradressen." + +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +msgid "Server sent too much data." +msgstr "Serveren sendte for meget data." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 +msgid "Server sent unexpected reply." +msgstr "Serveren sendte et uventet svar." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Serveren sendte usorteret certifikatkæde som overtræder TLS-specifikationerne" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 +msgid "Server to client MAC:" +msgstr "Server-til-klient-MAC:" + +# scootergrisen: mit bud er "Server-til-klient-chiffer:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 +msgid "Server to client cipher:" +msgstr "Server-til-klient-krypteringsalgoritme:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 +msgid "Server&type:" +msgstr "Servert&ype:" + +#: ../../locales/../src/interface/queue.cpp:1214 +msgid "Server/Local file" +msgstr "Server/lokal fil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 +msgid "Server:" +msgstr "Server:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 +msgid "Session details" +msgstr "Sessionsdetaljer" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 +msgid "Set &Priority" +msgstr "Sæt &prioritet" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 +#, c-format +msgid "Setting permissions of '%s' to '%s'" +msgstr "Sætter tilladelser for '%s' til '%s'" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 +msgid "Settings" +msgstr "Indstillinger" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 +msgid "Settings directory:" +msgstr "Mappe med indstillinger:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "&Vis notifikationsboble" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 +msgid "Show &raw directory listing" +msgstr "Vis &rå mappevisning" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 +msgid "Show &welcome dialog..." +msgstr "&Vis velkomstdialog..." + +#: ../../locales/../src/interface/Mainfrm.cpp:2326 +msgid "Show both directory trees and continue comparing?" +msgstr "Vis begge mappetræer, og fortsæt med at sammenligne?" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 +msgid "Show details" +msgstr "Vis detaljer" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 +msgid "Show details about custom date and time formats" +msgstr "Vis detaljer om brugerdefineret format for dato og klokkeslæt" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "Vis i &filhåndtering" + +# scootergrisen: mit bud er "Viser tilgængelige TLS-chiffre" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 +msgid "Shows available TLS ciphers" +msgstr "Viser tilgængelige TLS-krypteringsalgoritmer" + +#: ../../locales/../src/interface/cmdline.cpp:6 +msgid "Shows this help dialog" +msgstr "Viser dialogen Hjælp" + +#: ../../locales/../src/interface/QueueView.cpp:2768 +msgid "Shutdown now" +msgstr "Sluk nu" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 +msgid "Signature algorithm:" +msgstr "Underskriftalgoritme:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Tilmeld" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 +msgid "Site &Manager entries" +msgstr "&Poster i stedhåndtering" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 +msgid "Site Manager" +msgstr "Stedhåndtering" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 +msgid "Site Manager - Cannot remember password" +msgstr "Stedhåndtering - kan ikke huske adgangskode" + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Stedhåndtering - Genereret nøgle" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 +msgid "Site Manager - Invalid data" +msgstr "Stedhåndtering - ugyldige data" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 +msgid "Site Manager already open" +msgstr "Stedhåndtering er allerede åben" + +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 +msgid "Site does not exist." +msgstr "Stedet findes ikke." + +#: ../../locales/../src/interface/sitemanager.cpp:500 +msgid "Site path has to begin with 0 or 1." +msgstr "Stedstien skal begynde med 0 eller 1." + +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 +msgid "Site path is malformed." +msgstr "Stedstien er udformet forkert." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 +msgid "Site-specific bookmarks" +msgstr "Sted-specifikke bogmærker" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +msgid "" +"Site-specific bookmarks require the server to be stored in the Site " +"Manager.\n" +"Add current connection to the site manager?" +msgstr "" +"Sted-specifikke bogmærker kræver, at serveren er gemt i stedhåndteringen.\n" +"Tilføj aktuel forbindelse i stedhåndteringen?" + +#: ../../locales/../src/interface/queue.cpp:1214 +msgid "Size" +msgstr "Størrelse" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 +msgid "Size formatting" +msgstr "Størrelsesformatering" + +#: ../../locales/../src/interface/fileexistsdlg.cpp:43 +msgid "Size unknown" +msgstr "Størrelse ukendt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 +msgid "Skip file" +msgstr "Spring fil over" + +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 +#, c-format +msgid "Skipping download of %s" +msgstr "Springer download af %s over" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Springer ikke-eksisterende nøglefil \"%s\" over" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 +#, c-format +msgid "Skipping upload of %s" +msgstr "Springer upload af %s over" + +#: ../../locales/../src/engine/socket.cpp:1073 +msgid "Socket address outside address space" +msgstr "Sokkeladressen er uden for adresseområdet" + +#: ../../locales/../src/engine/socket.cpp:1075 +msgid "Socket already connected" +msgstr "Sokkel allerede tilsluttet" + +#: ../../locales/../src/engine/socket.cpp:1083 +msgid "Socket has been shut down" +msgstr "Sokkel er lukket" + +#: ../../locales/../src/engine/socket.cpp:1080 +msgid "Socket not connected" +msgstr "Sokkel ikke tilsluttet" + +#: ../../locales/../src/engine/socket.cpp:1123 +msgid "Socket type not supported for address family" +msgstr "Sokkeltypen understøttes ikke for denne adressefamilie" + +#: ../../locales/../src/interface/Mainfrm.cpp:1253 +msgid "Some files are still being edited or need to be uploaded." +msgstr "Nogle filer redigeres stadig, eller skal uploades." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 +msgid "" +"Some misconfigured remote servers which are behind a router, may reply with " +"their local IP address." +msgstr "" +"Servere, som står bag en router, kan være fejlkonfigurerede til at svare med " +"deres lokale IP-adresser." + +# scootergrisen: kan ses i Indstillinger > Fillister +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +msgid "Sort directories inline" +msgstr "Sortér alfabetisk" + +#: ../../locales/../src/interface/filelistctrl.cpp:478 +msgid "Sort order cannot be changed if comparing directories." +msgstr "Sorteringsrækkefølgen kan ikke ændres ved sammenligning af mapper." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 +msgid "Sorting" +msgstr "Sortering" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 +msgid "Sorting &mode:" +msgstr "Sorterings&tilstand:" + +# scootergrisen: jeg synes det er bedre at oversætte "identical" til "identiske" også "the same" til "ens" i næste streng men ikke vigtigt +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 +msgid "Source and path of the drop operation are identical" +msgstr "Kilde og sti er ens ved slip-handlingen" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +msgid "Source and target file may not be the same" +msgstr "Kilde- og destinationsfil må ikke være ens" + +# scootergrisen: jeg synes det er bedre at oversætte "identical" til "identiske" også "the same" til "ens" i forrige streng men ikke vigtigt +#: ../../locales/../src/interface/RemoteListView.cpp:153 +msgid "Source and target of the drop operation are identical" +msgstr "Kilde og destination er ens ved slip-handlingen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 +msgid "Source file:" +msgstr "Kildefil:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 +msgid "Speed Limits" +msgstr "Hastighedsgrænser" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 +msgid "Speed limits" +msgstr "Hastighedsgrænser" + +#: ../../locales/../src/interface/statusbar.cpp:593 +msgid "Speed limits are disabled, click to change." +msgstr "Hastighedsgrænser er deaktiveret - klik for at redigere." + +#: ../../locales/../src/interface/statusbar.cpp:596 +msgid "Speed limits are enabled, click to change." +msgstr "Hastighedsgrænser er aktiveret - klik for at redigere." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 +msgid "Stable and beta versions" +msgstr "Stabile og betaversioner" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 +msgid "Stable versions only" +msgstr "Kun stabile versioner" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 +msgid "Stable, beta and nightly versions" +msgstr "Stabile, beta- og daglige versioner" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 +msgid "Start transfer &immediately" +msgstr "Start overførsel &med det samme" + +#: ../../locales/../src/interface/cmdline.cpp:7 +msgid "Start with opened Site Manager" +msgstr "Start med åbnet stedhåndtering" + +#: ../../locales/../src/interface/updater.cpp:253 +#, c-format +msgid "Started update check on %s\n" +msgstr "Begyndte søgning efter opdateringer den %s\n" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 +#, c-format +msgid "Starting download of %s" +msgstr "Påbegynder download af %s" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 +#, c-format +msgid "Starting upload of %s" +msgstr "Påbegynder upload af %s" + +#: ../../locales/../src/interface/cmdline.cpp:9 +msgid "Starts the local site in the given path" +msgstr "Starter det lokale sted på den givne sti" + +#: ../../locales/../src/interface/verifycertdialog.cpp:437 +msgid "State or province:" +msgstr "Stat eller provins:" + +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 +msgid "Status" +msgstr "Status" + +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 +msgid "Status:" +msgstr "Status:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 +msgid "Stop and remove &all" +msgstr "Stop og fjern &alt" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 +msgid "Stop recursive operation" +msgstr "Stop rekursiv handling" + +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Decentraliseret lager i skyen" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Storj-understøttelse" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 +msgid "Street:" +msgstr "Gade:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 +msgid "Subject of certificate" +msgstr "Certifikatets emne" + +#: ../../locales/../src/interface/queueview_successful.cpp:12 +msgid "Successful transfers" +msgstr "Gennemførte overførsler" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 +msgid "Summary of test results:" +msgstr "Opsummering af testresultater:" + +# scootergrisen: se om "gå i hviletilstand" er bedre +#: ../../locales/../src/interface/QueueView.cpp:2776 +msgid "Suspend now" +msgstr "Hviletilstand nu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 +msgid "" +"Symlinks to files are not affected by this choice, such symlinks are always " +"deleted." +msgstr "" +"Symlink til filer påvirkes ikke af dette valg; sådanne symlinks slettes " +"altid." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 +msgid "Synchronized browsing" +msgstr "Synkroniseret gennemgang" + +#: ../../locales/../src/interface/state.cpp:410 +msgid "Synchronized browsing has been disabled." +msgstr "Synkroniseret gennemgang er blevet deaktiveret." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Synkroniserer mapper." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 +msgid "Syntax error" +msgstr "Syntaksfejl" + +#: ../../locales/../src/interface/cmdline.cpp:76 +#: ../../locales/../src/interface/cmdline.cpp:82 +#: ../../locales/../src/interface/cmdline.cpp:88 +#: ../../locales/../src/interface/cmdline.cpp:97 +#: ../../locales/../src/interface/cmdline.cpp:103 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 +msgid "Syntax error in command line" +msgstr "Syntaksfejl på kommandolinje" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 +msgid "System" +msgstr "System" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 +msgid "System details" +msgstr "Systemdetaljer" + +#: ../../locales/../src/engine/socket.cpp:1064 +msgid "System limit of open files exceeded" +msgstr "Systembegrænsning på antal åbne filer overskredet" + +#: ../../locales/../src/engine/socket.cpp:1121 +msgid "System's network subsystem has failed" +msgstr "Systemets netværksundersystem har fejlet" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +msgid "T&oolbar" +msgstr "&Værktøjslinje" + +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 +msgid "TLS connection established, sending HTTP request" +msgstr "TLS-forbindelse etableret, sender HTTP-anmodning" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 +msgid "TLS connection established, waiting for welcome message..." +msgstr "TLS-forbindelse oprettet, venter på velkomstbesked..." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 +msgid "TLS connection established." +msgstr "TLS-forbindelse etableret." + +#: ../../locales/../src/engine/proxy.cpp:507 +msgid "TTL expired" +msgstr "TTL udløbet" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:6 +msgid "Target file already exists" +msgstr "Destinationsfil findes allerede" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 +msgid "Target file:" +msgstr "Destinationsfil:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2720 +msgid "Target filename already exists!" +msgstr "Destinationsfilnavnet findes allerede!" + +#: ../../locales/../src/interface/RemoteListView.cpp:1645 +msgid "Target filename already exists, really continue?" +msgstr "Destinationsfilnavnet findes allerede, vil du virkelig fortsætte?" + +#: ../../locales/../src/engine/socket.cpp:1094 +msgid "Temporary failure in name resolution" +msgstr "Midlertidig fejl i navneopløsning" + +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Test afsluttet med succes" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 +msgid "Test results" +msgstr "Testresultater" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 +msgid "Testing resume capabilities of server" +msgstr "Tester serverens formåenheder for genoptagelse" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "&Følgende filer redigeres i øjeblikket:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "Stedhåndteringen kan ikke anvendes, med mindre filen repareres." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 +msgid "" +"The Site Manager is opened in another instance of FileZilla 3.\n" +"Do you want to continue? Any changes made in the Site Manager won't be saved " +"then." +msgstr "" +"Stedhåndteringen er åben i en anden instans af FileZilla 3.\n" +"Vil du fortsætte? Eventuelle ændringer i stedhåndteringen vil ikke blive " +"gemt." + +#: ../../locales/../src/interface/clearprivatedata.cpp:98 +msgid "" +"The Site Manager is opened in another instance of FileZilla 3.\n" +"Please close it or the data cannot be deleted." +msgstr "" +"Stedhåndtering er åben i en anden instans af FileZilla 3.\n" +"Luk den, for ellers kan det valgte ikke slettes." + +#: ../../locales/../src/interface/netconfwizard.cpp:640 +#, c-format +msgid "The address you entered was: %s" +msgstr "Den indtastede adresse var: %s" + +#: ../../locales/../src/engine/socket.cpp:1100 +msgid "The ai_family member is not supported" +msgstr "Medlemmet ai_family understøttes ikke" + +#: ../../locales/../src/engine/socket.cpp:1113 +msgid "The ai_socktype member is not supported" +msgstr "Medlemmet ai_socktype understøttes ikke" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 +msgid "The bookmark could not be added." +msgstr "Bogmærket kunne ikke tilføjes." + +#: ../../locales/../src/interface/sitemanager.cpp:781 +msgid "The bookmarks could not be cleared." +msgstr "Bogmærkerne kunne ikke ryddes." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Certifikatet kræver, at serveren inkluderer en OCSP-status i sit svar, men " +"OCSP-statussen mangler." + +#: ../../locales/../src/interface/statusbar.cpp:476 +msgid "The connection is encrypted. Click icon for details." +msgstr "Forbindelsen er krypteret. Klik på ikonet for flere oplysninger." + +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 +msgid "" +"The custom date format is invalid or contains unsupported format specifiers." +msgstr "" +"Det brugerdefinerede datoformat er ugyldigt eller indeholder " +"formatangivelser, der ikke er understøttede." + +#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 +msgid "The custom login sequence cannot be empty." +msgstr "Den brugerdefinerede login-sekvens må ikke være tom." + +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 +msgid "" +"The custom time format is invalid or contains unsupported format specifiers." +msgstr "" +"Det brugerdefinerede klokkeslætformat er ugyldigt eller indeholder " +"formatangivelser, der ikke er understøttede." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 +#, c-format +msgid "The data connection could not be established: %s" +msgstr "Dataforbindelsen kunne ikke etableres: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 +msgid "The default editor for text files could not be found." +msgstr "Kunne ikke finde standardredigeringsprogrammet for tekstfiler." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 +#, c-format +msgid "The default editor for text files is '%s'." +msgstr "Standardredigeringsprogrammet for tekstfiler er '%s'." + +#: ../../locales/../src/interface/filteredit.cpp:149 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +msgid "The entered filter name already exists, please choose a different name." +msgstr "Det indtastede filternavn findes allerede. Vælg et andet navn." + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "De indtastede adgangskoder er ikke ens." + +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 +#, c-format +msgid "The extension '%s' does already exist in the list" +msgstr "Filtypenavnet '%s' findes allerede i listen" + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 +#, c-format +msgid "" +"The file %s already exists.\n" +"Please enter a new name:" +msgstr "" +"Filen %s findes allerede.\n" +"Indtast et nyt navn:" + +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 +#, c-format +msgid "" +"The file '%s' cannot be opened:\n" +"The associated program (%s) could not be found.\n" +"Please check your filetype associations." +msgstr "" +"Filen '%s' kan ikke åbnes:\n" +"Kunne ikke finde det tilknyttede program (%s).\n" +"Tjek dine filtypetilknytninger." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"Filen '%s' indeholder en SSH1-nøgle. SSH1-protokollen er forældet. FileZilla " +"understøtter kun SSH2-nøgler." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 +#, c-format +msgid "The file '%s' could not be loaded or does not contain a private key." +msgstr "Filen '%s' kunne ikke indlæses eller indeholder ikke en privat nøgle." + +#: ../../locales/../src/interface/xmlfunctions.cpp:38 +#, c-format +msgid "The file '%s' could not be loaded." +msgstr "Filen '%s' kunne ikke indlæses." + +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 +#, c-format +msgid "" +"The file '%s' could not be opened:\n" +"No program has been associated on your system with this file type." +msgstr "" +"Filen '%s' kunne ikke åbnes:\n" +"Filtypen er ikke tilknyttet noget program på dit system." + +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 +#, c-format +msgid "" +"The file '%s' could not be opened:\n" +"The associated command failed" +msgstr "" +"Filen '%s' kunne ikke åbnes:\n" +"Den tilknyttede kommando mislykkedes" + +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 +#, c-format +msgid "" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" +msgstr "" +"Filen '%s' er blevet oprettet i en nyere version af FileZilla.\n" +"Indlæsning af filer, som er oprettet i nyere versioner, kan resultere i tab " +"af data.\n" +"Vil du fortsætte?" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 +#, c-format +msgid "" +"The file '%s' is not in a format supported by FileZilla.\n" +"Would you like to convert it into a supported format?" +msgstr "" +"Filen '%s' er ikke i et format, der understøttes af FileZilla.\n" +"Vil du at konvertere den til et understøttet format?" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 +msgid "The file selected as default editor does not exist." +msgstr "Filen, der er valgt som standardredigeringsprogram, findes ikke." + +#: ../../locales/../src/interface/import.cpp:98 +msgid "" +"The file you have selected contains site manager data from a previous " +"version of FileZilla.\n" +"Due to differences in the storage format, only host, port, username and " +"password will be imported.\n" +"Continue with the import?" +msgstr "" +"Den valgte fil indeholder stedhåndteringsdata fra en tidligere version af " +"FileZilla.\n" +"På grund af forskelle i formatet vil kun vært, port, brugernavn og " +"adgangskode blive importeret.\n" +"Fortsæt med at importere?" + +#: ../../locales/../src/interface/listctrlex.cpp:745 +msgid "The filename column can neither be hidden nor moved." +msgstr "Filnavn-kolonnen kan hverken skjules eller flyttes." + +#: ../../locales/../src/interface/listctrlex.cpp:795 +msgid "The filename column cannot be hidden." +msgstr "Filnavn-kolonnen kan ikke skjules." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 +#, c-format +msgid "The following character will be replaced: %s" +msgstr "Følgende tegn vil blive erstattet: %s" + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:66 +#, c-format +msgid "The following characters will be replaced: %s" +msgstr "Følgende tegn vil blive erstattet: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 +msgid "The free open source FTP solution" +msgstr "Den frie open source FTP-løsning" + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Den genererede krypteringsnøgle er:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 +msgid "The global bookmarks could not be saved." +msgstr "De globale bogmærker kunne ikke gemmes." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 +msgid "" +"The higher the debug level, the more information will be displayed in the " +"message log. Displaying debug information has a negative impact on " +"performance." +msgstr "" +"Jo højere fejlfindingsniveau, desto flere oplysninger vises i " +"meddelelsesloggen. Det påvirker ydelsen negativt, når " +"fejlfindingsinformation vises." + +#: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 +msgid "The limit needs to be between 1 and 2000 MiB" +msgstr "Grænsen skal ligge mellem 1 og 2000 MB" + +#: ../../locales/../src/interface/state.cpp:1121 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Den lokale mappe '%s' kunne ikke oprettes." + +#: ../../locales/../src/interface/state.cpp:1106 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "Den lokale mappe '%s' findes ikke." + +#: ../../locales/../src/interface/state.cpp:275 +#, c-format +msgid "" +"The local directory '%s' is not below the synchronization root (%s).\n" +"Disable synchronized browsing and continue changing the local directory?" +msgstr "" +"Den lokale mappe '%s' er ikke under synkroniseringsroden (%s).\n" +"Deaktivér synkroniseret gennemgang, og fortsæt med at skifte den lokale " +"mappe?" + +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 +msgid "" +"The lowest available port has to be less or equal than the highest available " +"port." +msgstr "" +"Den laveste tilgængelige port skal være mindre end eller lig med den højeste " +"tilgængelige port." + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Hovedadgangskoden skal være mindst 8 tegn lang." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 +msgid "The new version could not be downloaded, please retry later." +msgstr "Kunne ikke downloade den nye version - prøv igen senere." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +msgid "The new version has been saved in your Downloads directory." +msgstr "Den nye version er gemt i din Overførsler-mappe." + +#: ../../locales/../src/interface/QueueView.cpp:1566 +msgid "The queue will not be saved." +msgstr "Køen vil ikke blive gemt." + +#: ../../locales/../src/interface/state.cpp:1028 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Fjernmappen '%s' findes ikke." + +#: ../../locales/../src/interface/state.cpp:1075 +#, c-format +msgid "" +"The remote directory '%s' is not below the synchronization root (%s).\n" +"Disable synchronized browsing and continue changing the remote directory?" +msgstr "" +"Fjernmappen '%s' er ikke under synkroniseringsroden (%s).\n" +"Deaktivér synkroniseret gennemgang, og fortsæt med at skifte fjernmappen?" + +#: ../../locales/../src/interface/import.cpp:88 +msgid "The selected categories have been imported." +msgstr "De valgte kategorier blev importeret." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 +msgid "" +"The selected file contains importable data for the following categories:" +msgstr "" +"Den valgte fil indeholder data som kan importeres for følgende kategorier:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 +msgid "The selected file is already being edited:" +msgstr "Den valgte fil er allerede ved at blive redigeret:" + +#: ../../locales/../src/interface/edithandler.cpp:1772 +msgid "" +"The selected file is still opened in some other program, please close it." +msgstr "Den valgte fil er stadig åben i et andet program - luk den." + +#: ../../locales/../src/interface/edithandler.cpp:1678 +msgid "" +"The selected file would be executed directly.\n" +"This can be dangerous and might damage your system.\n" +"Do you really want to continue?" +msgstr "" +"Den valgte fil vil blive eksekveret direkte.\n" +"Dette kan være farligt, og kan skade dit system.\n" +"Vil du virkelig fortsætte?" + +#: ../../locales/../src/interface/sitemanager.cpp:584 +msgid "The server could not be added." +msgstr "Serveren kunne ikke tilføjes." + +#: ../../locales/../src/interface/netconfwizard.cpp:596 +msgid "The server sent an unexpected or unrecognized reply." +msgstr "Serveren sendte et uventet svar eller et, der ikke kan genkendes." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 +msgid "The server uses following charset encoding for filenames:" +msgstr "Serveren anvender følgende tegnsætkodning til filnavne:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 +msgid "" +"The server's certificate is unknown. Please carefully examine the " +"certificate to make sure the server can be trusted." +msgstr "" +"Serverens certifikat er ukendt. Undersøg certifikatet grundigt for at sikre " +"dig, at der er tillid til serveren." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 +msgid "" +"The server's host key does not match the key that has been cached. This " +"means that either the administrator has changed the host key, or you are " +"actually trying to connect to another computer pretending to be the server." +msgstr "" +"Serverens værtsnøgle er ikke magen til den nøgle, der findes i " +"mellemlageret. Det betyder enten, at administratoren har ændret " +"servernøglen, eller at du faktisk prøver at oprette forbindelse til en anden " +"computer, der udgiver sig for at være serveren." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 +msgid "" +"The server's host key is unknown. You have no guarantee that the server is " +"the computer you think it is." +msgstr "" +"Serverens værtsnøgle er ukendt. Der er ingen garanti for, at serveren er den " +"computer, som du tror den er." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Serverens værtsnavn er ikke magen til certifikatets værtsnavn" + +# scootergrisen: nodename og servname er måske parametre og skal formodentligt ikke oversættes men jeg har ikke undersøgt det nærmere +#: ../../locales/../src/engine/socket.cpp:1112 +msgid "The servname parameter is not supported for ai_socktype" +msgstr "Parameteren servname understøttes ikke for ai_socktype" + +#: ../../locales/../src/interface/import.cpp:81 +msgid "" +"The settings have been imported. You have to restart FileZilla for all " +"settings to have effect." +msgstr "" +"Indstillingerne er blevet importeret. Du skal genstarte FileZilla, før " +"indstillingerne træder i kraft." + +#: ../../locales/../src/engine/socket.cpp:1060 +msgid "The specified address family is not supported" +msgstr "Den angivne adressefamilie understøttes ikke" + +#: ../../locales/../src/engine/socket.cpp:1125 +msgid "The specified network name is no longer available" +msgstr "Det angivne netværksnavn er ikke længere tilgængelig" + +#: ../../locales/../src/interface/QueueView.cpp:2771 +msgid "The system will soon reboot unless you click Cancel." +msgstr "Systemet genstartes snart, medmindre du klikker på Annuller." + +#: ../../locales/../src/interface/QueueView.cpp:2767 +msgid "The system will soon shut down unless you click Cancel." +msgstr "Systemet slukkes snart, medmindre du klikker på Annuller." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 +msgid "" +"The target file already exists.\n" +"Please choose an action." +msgstr "" +"Destinationsfilen findes allerede.\n" +"Vælg en handling." + +#: ../../locales/../src/interface/netconfwizard.cpp:867 +msgid "The test did not succeed. Do you really want to save the settings?" +msgstr "Testen mislykkedes. Vil du virkelig gemme indstillingerne?" + +#: ../../locales/../src/interface/xmlfunctions.cpp:83 +#, c-format +msgid "The valid backup file %s could not be restored" +msgstr "Den gyldige backup-fil %s kunne ikke genoprettes" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 +msgid "Themes" +msgstr "Temaer" + +#: ../../locales/../src/interface/filter.cpp:358 +msgid "This filter set cannot be removed." +msgstr "Dette filtersæt kan ikke fjernes." + +#: ../../locales/../src/interface/filter.cpp:294 +msgid "This filter set cannot be renamed." +msgstr "Dette filtersæt kan ikke omdøbes." + +#: ../../locales/../src/interface/netconfwizard.cpp:597 +msgid "" +"This means that some router and/or firewall is still interfering with " +"FileZilla." +msgstr "" +"Det betyder, at en router og/eller firewall stadig forstyrrer FileZilla." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:183 +msgid "" +"This only works if you are not behind a router, else your system would just " +"return your internal address." +msgstr "" +"Dette virker kun, hvis du ikke er bag en router. Ellers vil dit system blot " +"returnere din interne adresse." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 +msgid "" +"This wizard will help you to properly configure any routers and firewalls " +"you have and tests your configuration." +msgstr "" +"Denne guide hjælper dig med at konfigurere eventuelle routere og firewalls, " +"du måtte have, og tester din konfiguration." + +#: ../../locales/../src/interface/queue.cpp:1214 +msgid "Time" +msgstr "Tidspunkt" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 +msgid "Time formatting" +msgstr "Klokkeslætformatering" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 +msgid "Time&out in seconds:" +msgstr "&Timeout i sekunder:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 +msgid "Timeout" +msgstr "Timeout" + +#: ../../locales/../src/interface/verifycertdialog.cpp:435 +msgid "Title:" +msgstr "Titel:" + +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "For at sammenligne mapper skal lynsøgning være lukket." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 +msgid "To compare directories, both file lists have to be aligned." +msgstr "For at sammenligne mapper skal begge fillister stemme overens." + +#: ../../locales/../src/interface/Mainfrm.cpp:2325 +msgid "To do this, the directory trees need to be both shown or both hidden." +msgstr "" +"For at gøre dette skal begge mappetræer være vist eller begge være skjult." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 +msgid "" +"To support public key authentication, FileZilla needs to know the private " +"keys to use." +msgstr "" +"For at understøtte godkendelse med offentlig nøgle skal FileZilla vide, " +"hvilke private nøgler der skal bruges." + +#: ../../locales/../src/interface/toolbar.cpp:51 +msgid "" +"Toggle directory comparison. Right-click to change comparison mode.\n" +"\n" +"Colors:\n" +"Yellow: File only exists on one side\n" +"Green: File is newer than the unmarked file on other side\n" +"Red: File sizes different" +msgstr "" +"Slå mappesammenligning til/fra. Højreklik for at ændre " +"sammenligningstilstand.\n" +"\n" +"Farver:\n" +"Gul: filen findes kun på den ene side\n" +"Grøn: filen er nyere end den uvalgte fil på den anden side\n" +"Rød: filstørrelser er forskellige" + +#: ../../locales/../src/interface/toolbar.cpp:52 +msgid "" +"Toggle synchronized browsing.\n" +"If enabled, navigating the local directory hierarchy will also change the " +"directory on the server accordingly and vice versa." +msgstr "" +"Slå synkroniseret gennemgang til/fra.\n" +"Hvis den er slået til, vil navigering i det lokale mappetræ skifte til de " +"tilsvarende mapper på serveren, og omvendt." + +#: ../../locales/../src/interface/toolbar.cpp:44 +msgid "Toggles processing of the transfer queue" +msgstr "Slår behandling af overførselskøen til/fra" + +#: ../../locales/../src/interface/toolbar.cpp:38 +msgid "Toggles the display of the local directory tree" +msgstr "Slår visning af det lokale mappetræ til/fra" + +#: ../../locales/../src/interface/toolbar.cpp:37 +msgid "Toggles the display of the message log" +msgstr "Slår visning af meddelelsesloggen til/fra" + +#: ../../locales/../src/interface/toolbar.cpp:39 +msgid "Toggles the display of the remote directory tree" +msgstr "Slår visning af fjernstedets mappetræ til/fra" + +#: ../../locales/../src/interface/toolbar.cpp:40 +msgid "Toggles the display of the transfer queue" +msgstr "Slår visning af overførselskøen til/fra" + +#: ../../locales/../src/engine/http/request.cpp:470 +msgid "Too long header line" +msgstr "Header-linjen er for lang" + +#: ../../locales/../src/engine/http/filetransfer.cpp:132 +msgid "Too many redirects" +msgstr "For mange omdirigeringer" + +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 +msgid "Trace:" +msgstr "Spor:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 +msgid "Transfer" +msgstr "Overfør" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 +msgid "Transfer &direction" +msgstr "Overførsels&retning" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 +msgid "Transfer &type" +msgstr "Overførsels&type" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 +msgid "Transfer Mode" +msgstr "Overførselstilstand" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 +msgid "Transfer Queue" +msgstr "Overførselskø" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 +msgid "Transfer Settings" +msgstr "Overførselsindstillinger" + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 +#, c-format +msgid "Transfer connection interrupted: %s" +msgstr "Overførselsforbindelsen afbrudt: %s" + +#: ../../locales/../src/interface/netconfwizard.cpp:643 +msgid "Transferred data got tainted." +msgstr "Overførte data blev forstyrret." + +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 +msgid "Transferring" +msgstr "Overfører" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 +msgid "Transfers" +msgstr "Overførsler" + +#: ../../locales/../src/interface/QueueView.cpp:2650 +msgid "Transfers finished" +msgstr "Overførsler afsluttet" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 +msgid "Treat files &without extension as ASCII file" +msgstr "&Behandl filer uden filendelse som ASCII-filer" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 +msgid "Treat the &following filetypes as ASCII files:" +msgstr "Behandl &følgende filtyper som ASCII-filer:" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 +msgid "Trust changed Hostkey:" +msgstr "Hav tillid til ændret værtsnøgle:" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 +msgid "Trust new Hostkey:" +msgstr "Hav tillid til ny værtsnøgle:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 +msgid "Trust the new key and carry on connecting?" +msgstr "Hav tillid til den nye nøgle, og fortsæt med at oprette forbindelse?" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 +msgid "Trust this certificate and carry on connecting?" +msgstr "" +"Hav tillid til dette certifikat, og fortsæt med at oprette forbindelse?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 +msgid "Trust this host and carry on connecting?" +msgstr "Hav tillid til denne vært, og fortsæt med at oprette forbindelse?" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 +msgid "Try again" +msgstr "Prøv igen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 +msgid "Type" +msgstr "Type" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 +msgid "Type of FTP Proxy:" +msgstr "Type af FTP-proxy:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 +msgid "Type of generic proxy:" +msgstr "Type af generisk proxy:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 +msgid "U&pload" +msgstr "U&pload" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 +msgid "U&pload limit:" +msgstr "U&pload-grænse:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 +msgid "U&se filetype associations if available" +msgstr "B&rug filtypetilknytninger hvor muligt" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 +msgid "U&se system defaults for current language" +msgstr "&Brug systemets standard for aktuelle sprog" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 +msgid "USER@&HOST" +msgstr "USER@&VÆRT" + +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 +#, c-format +msgid "Unassigned error code %d" +msgstr "Ukendt fejlkode %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:434 +msgid "Unit:" +msgstr "Enhed:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 +msgid "Unknown" +msgstr "Ukendt" + +#: ../../locales/../src/engine/ftp/logon.cpp:753 +msgid "Unknown FTP proxy type, cannot generate login sequence." +msgstr "Ukendt FTP-proxy-type, kan ikke generere login-sekvens." + +#: ../../locales/../src/engine/proxy.cpp:438 +#, c-format +msgid "Unknown SOCKS protocol version: %d" +msgstr "Ukendt version af SOCKS-protokol: %d" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:4 +msgid "Unknown certificate" +msgstr "Ukendt certifikat" + +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Ukendt fejl %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Ukendt fejl %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 +msgid "Unknown host key" +msgstr "Ukendt værtsnøgle" + +#: ../../locales/../src/engine/proxy.cpp:446 +#, c-format +msgid "" +"Unknown protocol version of SOCKS Username/Password Authentication " +"subnegotiation: %d" +msgstr "" +"Ukendt protokolversion ved underforhandling af godkendelse med SOCKS-" +"brugernavn/adgangskode: %d" + +#: ../../locales/../src/interface/xmlfunctions.cpp:191 +msgid "" +"Unknown root element, the file does not appear to be generated by FileZilla." +msgstr "" +"Ukendt rodelement - filen ser ikke ud til at være genereret af FileZilla." + +#: ../../locales/../src/engine/http/request.cpp:572 +msgid "Unknown transfer encoding" +msgstr "Ukendt overførselskodning" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 +msgid "" +"Unless these problems get fixed, active mode FTP will not work and passive " +"mode has to be used." +msgstr "" +"Medmindre disse problemer løses, vil FTP i aktiv tilstand ikke fungere, og " +"du skal anvende passiv tilstand." + +#: ../../locales/../src/interface/netconfwizard.cpp:605 +msgid "" +"Unless this problem gets fixed, active mode FTP will not work and passive " +"mode has to be used." +msgstr "" +"Medmindre dette problem løses, vil FTP i aktiv tilstand ikke fungere, og du " +"skal anvende passiv tilstand." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 +msgid "Unsupported certificate type" +msgstr "Certifikattype ikke understøttet" + +#: ../../locales/../src/engine/http/filetransfer.cpp:137 +msgid "Unsupported redirect" +msgstr "Ikke-understøttet omdirigering" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 +msgid "Up&load and unedit" +msgstr "Up&load og fortryd redigering" + +#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 +msgid "Updates" +msgstr "Opdateringer" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 +msgid "Upload" +msgstr "Upload" + +#: ../../locales/../src/interface/edithandler.cpp:1160 +msgid "Upload failed" +msgstr "Upload mislykkedes" + +#: ../../locales/../src/interface/statusbar.cpp:606 +#, c-format +msgid "Upload limit: %s/s" +msgstr "Upload-grænse: %s/s" + +#: ../../locales/../src/interface/statusbar.cpp:609 +msgid "Upload limit: none" +msgstr "Upload-grænse: ingen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Upload søgeresultater" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 +msgid "Upload selected directory" +msgstr "Upload den valgte mappe" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 +msgid "Upload selected files and directories" +msgstr "Upload valgte filer og mapper" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 +msgid "Upload this file back to the server?" +msgstr "Upload denne fil tilbage til serveren?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 +msgid "Upload this file to the server?" +msgstr "Upload denne fil til serveren?" + +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 +msgid "Uploading" +msgstr "Uploader" + +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 +msgid "Uploading and pending removal" +msgstr "Uploader og afventer fjernelse" + +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 +msgid "Uploading and unediting" +msgstr "Uploader og fortryder redigering" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 +msgid "Use &custom charset" +msgstr "Brug &brugerdefineret tegnsæt" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +msgid "Use &custom editor:" +msgstr "Brug &brugerdefineret redigeringsprogram:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 +msgid "Use &default editor for text files" +msgstr "Brug &standardredigeringsprogram til tekstfiler" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +msgid "Use &synchronized browsing" +msgstr "Brug &synkroniseret gennemgang" + +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Brug regulære udtryk" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 +msgid "Use UTF-8 if the server supports it, else use local charset." +msgstr "" +"Brug UTF-8, hvis serveren understøtter dette, ellers brug lokalt tegnsæt." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 +msgid "Use default action" +msgstr "Brug standardhandling" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 +msgid "Use explicit FTP over TLS if available" +msgstr "Brug eksplicit FTP over TLS hvor muligt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 +msgid "Use server currently connected to" +msgstr "Brug aktuelt forbundet server" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 +msgid "Use server from site manager" +msgstr "Brug server fra stedhåndtering" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 +msgid "Use system &defaults for current language" +msgstr "&Brug systemets standard for aktuelle sprog" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 +msgid "Use the following IP address:" +msgstr "Brug følgende IP-adresse:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 +msgid "Use the following port range:" +msgstr "Brug følgende interval af porte:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 +msgid "Use the server's external IP address instead" +msgstr "Brug i stedet serverens eksterne IP-adresse" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 +msgid "" +"Use this if you're behind a router and have a static external IP address." +msgstr "" +"Brug denne, hvis du er bag en router og har en statisk ekstern IP-adresse." + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 +msgid "" +"Use this option if you have a dynamic IP address. FileZilla will contact the " +"above server once each session as soon as you use active mode for the first " +"time. Only the version of FileZilla you're using is submitted to the server." +msgstr "" +"Brug denne valgmulighed, hvis du har en dynamisk IP-adresse. FileZilla " +"kontakter ovennævnte server for hver session, første gang du anvender aktiv " +"tilstand. Kun oplysninger om din version af FileZilla sendes til serveren." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 +msgid "User:" +msgstr "Bruger:" + +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +msgid "Username cannot be a series of spaces" +msgstr "Brugernavn kan ikke bestå af en række mellemrum" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 +msgid "" +"Using the wrong charset can result in filenames not displaying properly." +msgstr "Brug af forkert tegnsæt kan bevirke, at filnavne vises forkert." + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 +msgid "Valid from:" +msgstr "Gyldig fra:" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 +msgid "Valid to:" +msgstr "Gyldig til:" + +#: ../../locales/../src/interface/cmdline.cpp:17 +msgid "Verbose log messages from wxWidgets" +msgstr "Detaljerede logmeddelelser fra wxWidgets" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 +msgid "Verifying certificate..." +msgstr "Kontrollere certifikat..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 +msgid "Very high" +msgstr "Meget høj" + +#: ../../locales/../src/engine/ftp/list.cpp:109 +msgid "View hidden option set, but unsupported by server" +msgstr "" +"Vis skjult valgmulighed som er sat, men som ikke understøttes af serveren" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 +msgid "View/Edit" +msgstr "Vis/rediger" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 +msgid "Visible columns" +msgstr "Synlige kolonner" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 +msgid "W&rite" +msgstr "Sk&riv" + +#: ../../locales/../src/interface/queue.cpp:356 +msgid "Waiting for browsing connection" +msgstr "Venter på gennemgangsforbindelse" + +#: ../../locales/../src/interface/queue.cpp:357 +msgid "Waiting for password" +msgstr "Venter på adgangskode" + +#: ../../locales/../src/interface/statuslinectrl.cpp:253 +msgid "Waiting for transfer to be cancelled" +msgstr "Venter på at annullere overførsel" + +#: ../../locales/../src/engine/engineprivate.cpp:242 +msgid "Waiting to retry..." +msgstr "Venter på at prøve igen..." + +#: ../../locales/../src/interface/netconfwizard.cpp:983 +msgid "Warning, ignoring data connection from wrong IP." +msgstr "Advarsel: ignorerer dataforbindelse fra forkert IP." + +#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 +msgid "" +"Warning, use nightly builds at your own risk.\n" +"No support is given for nightly builds.\n" +"Nightly builds may not work as expected and might even damage your system.\n" +"\n" +"Do you really want to check for nightly builds?" +msgstr "" +"Advarsel: brug af daglige byg sker på egen risiko.\n" +"Der ydes ingen support på daglige byg.\n" +"Daglige byg fungerer måske ikke som forventet, og kan måske endda skade dit " +"system.\n" +"\n" +"Vil du virkelig søge efter daglige byg?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +msgid "Warning: Potential security breach!" +msgstr "Advarsel: potentielt sikkerhedsbrud!" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 +msgid "Welcome to FileZilla" +msgstr "Velkommen til FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +msgid "What's new" +msgstr "Sidste nyt" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 +msgid "What's new:" +msgstr "Sidste nyt:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 +msgid "" +"When allowing FileZilla to remember passwords, you can reconnnect without " +"having to re-enter a password after restarting FileZilla." +msgstr "" +"Hvis du tillader FileZilla at huske adgangskoder, kan du oprette forbindelse " +"igen senere, efter FileZilla er blevet genstartet, uden at skulle indtaste " +"adgangskoden." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 +msgid "" +"When enabled, characters that are not supported by the local operating " +"system in filenames are replaced if downloading such a file." +msgstr "" +"Når den er slået til, vil tegn i filnavne, der ikke er understøttet af det " +"lokale styresystem, blive erstattet, hvis sådan en fil downloades." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 +msgid "When st&arting a new connection while already connected:" +msgstr "" +"Ved st&art af en ny forbindelse, når forbindelsen allerede er oprettet:" + +# scootergrisen: kan ses i Indstillinger > Brugerflade +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +msgid "Widescreen" +msgstr "Widescreen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 +msgid "Would you like FileZilla to remember passwords?" +msgstr "Skal FileZilla huske adgangskoder?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 +msgid "Wr&ite" +msgstr "Skr&iv" + +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 +msgid "Wrong external IP address" +msgstr "Forkert ekstern IP-adresse" + +#: ../../locales/../src/engine/http/request.cpp:644 +msgid "Wrong line endings" +msgstr "Forkerte linjeskift" + +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Forkert hovedadgangskode indtastet - den kan ikke bruges til at dekryptere " +"de gemte adgangskoder." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Forkert hovedadgangskode indtastet - den kan ikke bruges til at dekryptere " +"dette emne." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Gul" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 +msgid "Yes" +msgstr "Ja" + +#: ../../locales/../src/interface/netconfwizard.cpp:786 +msgid "" +"You appear to be using an IPv6-only host. This wizard does not support this " +"environment." +msgstr "" +"Det ser ud til, at du bruger en vært, der kun anvender IPv6. Denne guide " +"understøtter ikke dette miljø." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 +msgid "You are using the latest version of FileZilla." +msgstr "Du bruger den seneste version af FileZilla." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 +msgid "You can always open this dialog again through the help menu." +msgstr "Du kan altid åbne denne dialog igen via menuen Hjælp." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 +msgid "You can download the latest version from the FileZilla website:" +msgstr "Du kan downloade den seneste version fra FileZillas websted:" + +#: ../../locales/../src/interface/serverdata.cpp:15 +msgid "You can leave the port field empty to use the default port." +msgstr "Du kan lade portfeltet stå tomt for at bruge standardporten." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 +msgid "" +"You can use an x at any position to keep the permission the original files " +"have." +msgstr "" +"Du kan bruge et x på alle positioner for at beholde filernes oprindelige " +"tilladelser." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Du kan ikke skifte adgangskode og krypteringsnøgle hver for sig, hvis der " +"bruges en hovedadgangskode." + +#: ../../locales/../src/interface/import.cpp:29 +msgid "You cannot import settings from FileZilla's own settings directory." +msgstr "" +"Du kan ikke importere indstillinger fra FileZillas egen mappe med " +"indstillinger." + +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 +msgid "" +"You cannot replace an invalid character with another invalid character. " +"Please enter a character that is allowed in filenames." +msgstr "" +"Du kan ikke erstatte et ugyldigt tegn med et andet ugyldigt tegn. Indtast et " +"tegn, der er tilladt i filnavne." + +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Du kan ikke uploade filer i rodmappen." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 +msgid "You did not enter a new name for the file. Overwrite the file instead?" +msgstr "" +"Du indtastede ikke et nyt navn til filen. Vil du overskrive filen i stedet " +"for?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 +msgid "You have selected at least one symbolic link." +msgstr "Du har valgt mindst ét symbolsk link." + +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 +msgid "" +"You have selected more than 10 files for editing, do you really want to " +"continue?" +msgstr "Du har valgt over 10 filer til redigering - vil du virkelig fortsætte?" + +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 +msgid "" +"You have selected more than 10 files or directories to open, do you really " +"want to continue?" +msgstr "" +"Du har valgt over 10 filer eller mapper til åbning - vil du virkelig " +"fortsætte?" + +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +msgid "You have to enter a hostname." +msgstr "Du skal indtaste et værtsnavn." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +msgid "You have to enter a key file path" +msgstr "Du skal indtaste en nøglefilsti" + +#: ../../locales/../src/interface/search.cpp:927 +msgid "You have to enter a local directory." +msgstr "Du skal indtaste en lokalmappe." + +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Du skal indtaste en fjernmappe." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "Du skal indtaste en gyldig IPv4-adresse." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Du skal indtaste en gyldig krypteringsnøgle" + +#: ../../locales/../src/interface/search.cpp:932 +msgid "You have to enter a writable local directory." +msgstr "Du skal indtaste en skrivbar lokalmappe." + +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +msgid "You have to enter an account name" +msgstr "Du skal indtaste et kontonavn" + +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +msgid "You have to specify a user name" +msgstr "Du skal angive et brugernavn" + +#: ../../locales/../src/interface/netconfwizard.cpp:644 +msgid "" +"You likely have a router or firewall which erroneously modified the " +"transferred data." +msgstr "" +"Din router eller firewall har sikkert ved en fejl ændret de overførte data." + +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Du skal indtaste en hovedadgangskode." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +msgid "You need to enter a name for the bookmark." +msgstr "Du skal indtaste et navn til bogmærket." + +#: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 +msgid "You need to enter a name for the log file." +msgstr "Du skal indtaste et navn til logfilen." + +#: ../../locales/../src/interface/edithandler.cpp:1524 +msgid "You need to enter a properly quoted command." +msgstr "Du skal indtaste en kommando med anførselstegn sat korrekt." + +#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 +msgid "You need to enter a proxy host." +msgstr "Du skal indtaste en proxy-vært." + +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 +msgid "You need to enter a proxy port in the range from 1 to 65535" +msgstr "Du skal indtaste en proxy-port mellem 1 og 65535" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +msgid "You need to enter at least one path, empty bookmarks are not supported." +msgstr "Du skal indtaste mindst én sti - tomme bogmærker understøttes ikke." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 +msgid "" +"You need to enter both a local and a remote path to enable synchronized " +"browsing for this bookmark." +msgstr "" +"Du skal både indtaste en lokal sti og en fjernsti for at aktivere " +"synkroniseret gennemgang for dette bogmærke." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +msgid "" +"You need to enter both a local and a remote path to enable synchronized " +"browsing for this site." +msgstr "" +"Du skal både indtaste en lokal sti og en fjernsti for at aktivere " +"synkroniseret gennemgang for dette sted." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Du skal give FileZilla adgang til de mapper, som du vil downloade filer i " +"eller uploade filer fra." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 +msgid "You need to specify a local file." +msgstr "Du skal angive en lokal fil." + +#: ../../locales/../src/interface/manual_transfer.cpp:311 +msgid "You need to specify a remote file." +msgstr "Du skal angive en fil på fjernstedet." + +#: ../../locales/../src/interface/manual_transfer.cpp:317 +msgid "You need to specify a remote path." +msgstr "Du skal angive en sti på fjernstedet." + +#: ../../locales/../src/interface/manual_transfer.cpp:288 +msgid "You need to specify a server." +msgstr "Du skal angive en server." + +#: ../../locales/../src/interface/netconfwizard.cpp:590 +msgid "" +"You should have no problems connecting to other servers, file transfers " +"should work properly." +msgstr "" +"Du burde ikke have problemer med at oprette forbindelse til andre servere, " +"filoverførseler burde fungere korrekt." + +#: ../../locales/../src/interface/QueueView.cpp:2775 +msgid "Your computer will suspend unless you click Cancel." +msgstr "Din computer vil gå i hviletilstand, medmindre du klikker på Annuller." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +msgid "after" +msgstr "senere end" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +msgid "before" +msgstr "tidligere end" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 +msgid "begins with" +msgstr "begynder med" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 +msgid "bytes" +msgstr "byte" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 +msgid "contains" +msgstr "indeholder" + +#: ../../locales/../src/interface/updater.cpp:257 +msgid "custom" +msgstr "brugerdefineret" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 +msgid "does not contain" +msgstr "indeholder ikke" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 +msgid "does not equal" +msgstr "er ikke" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 +msgid "ends with" +msgstr "slutter med" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +msgid "equals" +msgstr "er" + +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 +msgid "file" +msgstr "fil" + +#: ../../locales/../src/interface/edithandler.cpp:101 +msgid "fz3temp-lockfile" +msgstr "fz3temp-låsfil" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +msgid "" +"fzputtygen could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzputtygen kunne ikke startes.\n" +"Sørg for, at denne eksekverbare fil findes i samme mappe som FileZillas " +"eksekverbare fil." + +#: ../../locales/../src/engine/sftp/connect.cpp:101 +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "fzsftp tilhører en anden version af FileZilla" + +#: ../../locales/../src/engine/sftp/connect.cpp:143 +msgid "fzsftp could not be started" +msgstr "fzsftp kunne ikke startes" + +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj tilhører en anden version af FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj kunne ikke startes" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj kunne ikke startes.\n" +"Sørg for, at denne eksekverbare fil findes i samme mappe som FileZillas " +"eksekverbare fil." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 +msgid "gnutls_certificate_get_peers returned no certificates" +msgstr "gnutls_certificate_get_peers returnerede ingen certifikater" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 mislykkedes" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 +msgid "greater than" +msgstr "større end" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 +msgid "group executable" +msgstr "eksekverbar af gruppe" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 +msgid "group readable" +msgstr "læsbar af gruppe" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 +msgid "group writeable" +msgstr "skrivbar af gruppe" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 +msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" +msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" + +# scootergrisen: måske bare "er" ligesom equals +# scootergrisen: bruges muligvis ved: +# scootergrisen: Sti ... er ... /home/ +# scootergrisen: Sti ... er lig med ... /home/ +# scootergrisen: kilde: der er både en streng som hedder "is equal to" og "equals", måske de begge kunne hedde det samme +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 +msgid "is equal to" +msgstr "er lig med" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 +msgid "is set" +msgstr "er sat" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 +msgid "is unset" +msgstr "er ikke sat" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 +msgid "less than" +msgstr "mindre end" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 +msgid "matches regex" +msgstr "matcher regulært udtryk" + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "nyt navn" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 +msgid "owner executable" +msgstr "eksekverbar af ejer" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 +msgid "owner readable" +msgstr "læsbar af ejer" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 +msgid "owner writeable" +msgstr "skrivbar af ejer" + +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 +msgid "unknown" +msgstr "ukendt" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +msgid "world executable" +msgstr "globalt eksekverbar" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +msgid "world readable" +msgstr "globalt læsbar" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +msgid "world writeable" +msgstr "globalt skrivbar" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 +msgid "wxWidgets:" +msgstr "wxWidgets:" + +#~ msgid "" +#~ "Malformed response: Server sent response body with a request verb or " +#~ "response code that disallows a response body." +#~ msgstr "" +#~ "Forkert udformet svar: Serveren sendte svar-krop med et anmodningsverb " +#~ "eller svarkode som ikke tillod en svar-krop." diff -Nru filezilla-3.15.0.2/locales/de.po filezilla-3.33.0/locales/de.po --- filezilla-3.15.0.2/locales/de.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/de.po 2018-04-02 18:37:17.000000000 +0000 @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: FileZilla\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-30 15:29+0100\n" -"PO-Revision-Date: 2016-01-30 01:23+0100\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-02 20:30+0200\n" +"PO-Revision-Date: 2018-03-30 16:03+0200\n" "Last-Translator: Peter Körner <18427@gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -17,18 +17,18 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S vergangen" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S verbleibend" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -37,212 +37,214 @@ "%a - Konto (Zeilen, die dies beinhalten, werden ausgelassen, falls kein " "Kontozugangstyp benutzt wird)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d Verzeichnis" msgstr[1] "%d Verzeichnisse" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d Verzeichnis und dessen Inhalt" msgstr[1] "%d Verzeichnisse und deren Inhalt" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d Datei" msgstr[1] "%d Dateien" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d Datei. Gesamtgröße: %s" msgstr[1] "%d Dateien. Gesamtgröße: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d Datei. Gesamtgröße: mindestens %s" msgstr[1] "%d Dateien. Gesamtgröße: mindestens %s" -#: ../../locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "%d Dateien zur Warteschlange hinzugefügt" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Server" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu Verzeichnis" msgstr[1] "%llu Verzeichnisse" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu Datei" msgstr[1] "%llu Dateien" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Passwort" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Zertifikat abgelaufen!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Noch nicht gültig!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Proxy-Benutzer" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s und %s. Gesamtgröße: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s und %s. Gesamtgröße: mindestens %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s Byte" msgstr[1] "%s Bytes" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s konnte nicht gefunden werden. Ohne diese FileZilla-Komponente wird SFTP " +"%s konnte nicht gefunden werden. Ohne diese FileZilla-Komponente wird %s " "nicht funktionieren.\n" "\n" "Bitte laden Sie FileZilla erneut herunter. Falls dieses Problem weiterhin " "auftritt, senden Sie bitte einen Fehlerbericht." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s wurde nicht gefunden. Ohne diese Komponente wird SFTP nicht " -"funktionieren.\n" +"%s wurde nicht gefunden. Ohne diese Komponente wird %s nicht funktionieren.\n" "\n" "Mögliche Lösungen:\n" "- Stellen Sie sicher, dass %s sich in einem Verzeichnis befindet, das in der " "PATH-Umgebungsvariable enthalten ist.\n" -"- Geben Sie den vollständigen Pfad zu %s in der FZ_FZSFTP-Umgebungsvariable " -"an." +"- Geben Sie den vollständigen Pfad zu %s in der %s-Umgebungsvariable an." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s mit %d Bits" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Hostname passt nicht zum Zertifikat" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Benutzername" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Proxy-Passwort" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "&Bestehende Verbindung unterbrechen und in aktuellem Tab verbinden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "Ü&ber..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Konto:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Aktiv" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "Lesezeichen &hinzufügen..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Verzeichnis hinzufügen..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "Dateien zur W&arteschlange hinzufügen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "Schlüsseldatei &hinzufügen..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "Zur W&arteschlange hinzufügen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Zeitzonenabweichung des Servers anpassen:" @@ -250,71 +252,76 @@ msgid "&Always trust certificate in future sessions." msgstr "&Zertifikat zukünftig immer vertrauen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "Diesem Server immer vertr&auen, diesen Schlüssel speichern" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Immer Standardeditor verwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Auswahl immer für Dateien ohne Zuordnung verwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "Immer &diese Aktion ausführen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Betriebssystem nach der externen IP-Adresse fragen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Automatisch" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "Auto&matische Erkennung" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Hintergrundfarbe:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Binär" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "Bi&näre Präfixe mit SI-Einheit (Beispiel: 1 KB = 1024 Bytes)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "&Lesezeichen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Durchsuchen..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "Burst-&Toleranz:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "Abbre&chen" @@ -326,19 +333,23 @@ msgid "&Close" msgstr "&Schließen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&FileZilla beenden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "FileZilla einmal &beenden" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "&Geschwindigkeitsbegrenzungen einstellen..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "&Einstellen..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Verbinden" @@ -346,156 +357,152 @@ msgid "&Copy current connection to Site Manager..." msgstr "Aktuelle &Verbindung in Servermanager aufnehmen..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "In die Zwis&chenablage kopieren" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Verzeichnis erstellen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" msgstr "&Neuen Tab erzeugen" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Debug" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "Debug-Informationen im &Nachrichtenprotokoll:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "St&andardeditor:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "&Umgang mit bereits existierenden Dateien..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Verzögerung nach ungültigen Login-Versuchen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Löschen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Symbolische Verknüpfung löschen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "&Verzeichniszugriffsberechtigungen..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "&Verzeichnisvergleich" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Synchronisierten Verzeichniswechsel deaktivieren und das lokale Verzeichnis " "wechseln" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Synchronisierten Verzeichniswechsel deaktivieren und das Serververzeichnis " "wechseln" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "Lokale &Datei verwerfen, dann Datei neu herunterladen und bearbeiten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "&Trennen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Verbindung zum Server trennen" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "" "A&ktuelle Übertragungsgeschwindigkeit anstelle der " "Durchschnittsgeschwindigkeit anzeigen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Größe in Bytes anzeigen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "Passwörter &nicht speichern (empfohlen)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Diesen Dialog nicht nochmals anzeigen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "E&xterne IP-Adresse nicht für lokale Verbindungen benutzen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "&Doppelklick-Aktion für Dateien:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "Herunterla&den" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Herunterladen nach:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Herunterladen..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Downloads:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Bearbeiten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "Filterregeln &bearbeiten..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "&Aktivieren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Kompression aktivieren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Geschwindigkeitsbegrenzungen aktivieren" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Zeichensatz:" @@ -503,28 +510,28 @@ msgid "&Encryption:" msgstr "Vers&chlüsselung:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "B&enutzerdefinierten Befehl eingeben..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "&Verbindung in einem neuen Tab aufbauen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "Ausführ&en" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Servermanager-Einträge" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Export..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Auf aktiven Modus zurückgreifen" @@ -532,91 +539,103 @@ msgid "&File" msgstr "&Datei" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "&Dateiattribute..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "&Dateiberechtigungen..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "D&atei:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Filterbedingungen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Filtersätze:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filter" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Filter:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "Bearbeiten &beenden und lokale Datei löschen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"Lokale Dateipfade nicht berücksichtigen; Dateien direkt in das " +"&Zielverzeichnis hochladen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" -"Dateipfad auf Server nicht berücksichtigen; Dateien direkt in das " +"Dateipfade auf Server nicht berücksichtigen; Dateien direkt in das " "&Zielverzeichnis herunterladen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "" "Symbolischer &Verknüpfung folgen, Inhalt des Zielverzeichnisses löschen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Externe IP-Adresse von folgender URL beziehen:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Onlinesupport..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Globales Lesezeichen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 unter Verwendung der 'CONNECT'-Methode" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&Hilfe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "Identische &Dateien verstecken" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&Höchste" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Höchster verfügbarer Port:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "Se&rver:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&Binäre Präfixe mit IEC-Einheit (Beispiel: 1 KiB = 1024 Bytes)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "ISO &8601 (Beispiel: 2007-09-15)" @@ -624,98 +643,107 @@ msgid "&Import..." msgstr "&Import..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "Ü&bernehme Dateizuordnungen des Systems" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "Neue Version &installieren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "" +"Lokale &Pfadstruktur verwenden (relativ zum Wurzelverzeichnis der Suche)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "" -"Dateipfad wie auf &Server beibehalten (relativ zum Wurzelverzeichnis der " +"&Pfadstruktur wie auf Server verwenden (relativ zum Wurzelverzeichnis der " "Suche)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "Sc&hlüsseldatei:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Datei- und Verzeichnisansicht:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Lokale Ports, die von FileZilla benutzt werden, begrenzen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "Anzahl &gleichzeitiger Verbindungen begrenzen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "&Lokaler Verzeichnisbaum" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Lokales Verzeichnis:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Lokale Suche" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Log in Datei speichern" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "Verbindun&gsart:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "Verbindun&gsart:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "Ni&edrig" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "Lesezeichen &verwalten..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "&Manuelle Übertragung..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Maximale Anzahl der Verbindungen:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Maximale Anzahl der Versuche:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "&Nachrichtenprotokoll" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "In den System-&Tray minimieren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "&Namenssortiermodus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Name:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:47 msgid "&Network configuration wizard..." -msgstr "&Netzwerkkonfigurations-Assistent..." +msgstr "&Netzwerkkonfigurationsassistent..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Neu" @@ -723,7 +751,7 @@ msgid "&New Site" msgstr "&Neuer Server" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Neue Version verfügbar!" @@ -731,154 +759,165 @@ msgid "&Next >" msgstr "&Weiter >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Nein" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Keiner" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Normal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Numerischer Wert:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "OP&EN" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "Ö&ffnen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "Ü&berschreiben" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Passiv" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Passwort:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "&Klang abspielen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Port:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "Ä&nderungszeitpunkt der übertragenen Dateien beibehalten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Warteschlange" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Verbinden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "&Quickconnect-Leiste" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "&Quickconnect-Verlauf" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Lesen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "&Wiederverbinden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "&Wiederverbindungsinformationen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "&Aktualisieren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "Master-Passwo&rt merken, bis FileZilla geschlossen wird" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "Passwo&rt merken, bis FileZilla geschlossen wird" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "Passwörter &speichern" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "S&erver-Verzeichnis:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "Se&rver-Pfad:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "D&ateisuche auf Server" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Entfernen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "Schlüssel entfe&rnen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "Auswahl &entfernen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Umbenennen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Umbenennen..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Lokale Datei neu öffnen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Ungültige Zeichen ersetzen durch:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "&Einen Fehler melden..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "Um Auf&merksamkeit bitten" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "Alle &Dateien zurücksetzen und wieder zur Warteschlange hinzufügen" @@ -886,39 +925,39 @@ msgid "&Restart Wizard" msgstr "Assistent neusta&rten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "Wiedera&ufnehmen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." -msgstr "&Befehl eingeben..." +msgstr "&Befehl ausführen..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Konfigurationsassistenten jetzt ausführen..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Jetzt nach Updates suchen..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "S&OCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Speichern unter..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Suchen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Dateisuche auf Server..." @@ -926,20 +965,20 @@ msgid "&Select Entry:" msgstr "Eintrag aus&wählen:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "Sprache &auswählen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Wählen Sie die Spalten aus, die angezeigt werden sollen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "Ein&stellungen" @@ -947,23 +986,19 @@ msgid "&Settings..." msgstr "&Einstellungen..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Debugmenü anzeigen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "&Detailliertes Log anzeigen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Nachricht anzeigen" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Zeitstempel im Nachrichtenprotokoll anzeigen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Server&managereinträge" @@ -971,159 +1006,178 @@ msgid "&Site Manager..." msgstr "&Servermanager..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "&Serverspezifisches Lesezeichen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "Übers&pringen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "&Geschwindigkeitsbegrenzungen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Übertragung sofort &starten" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Lokal- und Serveransicht vertauschen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "&TLS-Chiffren" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Test" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Design:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "Über&tragung" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "Über&tragungsmodus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "Über&tragungs-Warteschlange" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "'dotfiles' als ASCII-Dateie&n behandeln" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "" +"&Diesem Zertifikat für die angegebenen alternativen Hostnamen vertrauen." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Bearbeiten beenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "Für diesen Server gespeicherten Schlüssel akt&ualisieren" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Hochladen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Hochladen nach:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Hochladen..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Uploads:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Benutzerdefiniertes Programm verwenden" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "S&ynchronisierten Verzeichniswechsel verwenden" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "System-Standardeditor für &Textdateien verwenden" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Folgende IP-Adresse benutzen:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "Stattdessen &externe IP-Adresse des Servers benutzen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Tausender-Trennzeichen benutzen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Benutzer:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "Ben&utzername:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Version %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Ansicht" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Ansehen/Bearbeiten" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Lokal bearbeitete Dateien beobachten und bei Änderungen das Hochladen " "vorschlagen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Bei der Suche nach Updates, suche nach:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Schreiben" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Ja" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' konnte nicht gefunden werden oder es war kein Zugriff möglich." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' ist kein Verzeichnis." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' ist kein unterstütztes Protokoll." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "Anmeldung via 'Konto' wird vom gewählten Protokoll nicht unterstützt." -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1131,7 +1185,7 @@ "Anmeldung via 'Normal' oder 'Konto' ist nicht verfügbar; stattdessen wird " "'Nach Passwort fragen' verwendet." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1139,7 +1193,7 @@ "Anmeldung via 'Normal' oder 'Konto' ist nicht verfügbar. Ihr Eintrag wurde " "auf 'Nach Passwort fragen' geändert." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1149,58 +1203,58 @@ "verwenden, um die Argumente, die auf 'quote' folgen, unverarbeitet an den " "Server zu senden. Wollen Sie nicht vielmehr den Befehl ohne 'quote' senden?" -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d Objekt ausgefiltert)" msgstr[1] "(%d Objekte ausgefiltert)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% heruntergeladen)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 für unbegrenzt)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 Sekunden)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 zum Deaktivieren)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat ist auf %d.%d gesetzt)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(Beispiel: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(Beispiel: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(in %s/s)" @@ -1209,7 +1263,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- verbleibend" @@ -1229,31 +1283,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s kann nicht zusammen mit einer FTP-URL verwendet werden." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Keine" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Warnungen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Infos" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Ausführlich" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32-Bit-System" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Debug" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64-Bit-System" @@ -1261,24 +1315,29 @@ msgid "< &Back" msgstr "< &Zurück" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Ein Lesezeichen mit dem angegebenen Namen existiert bereits. Bitte geben Sie " "einen noch nicht verwendeten Namen an." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Ein Zertifikat der Kette wurde mit einem unsicheren Algorithmus signiert" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Es muss ein Standardeditor eingestellt sein." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "" "Ein Verzeichnis kann nicht in eines seiner Unterverzeichnisse verschoben " @@ -1295,22 +1354,22 @@ "öffnet FileZilla selbst einen Port und fordert den Server auf, sich zu " "diesem zu verbinden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Eine zuvor geöffnete Datei wurde geändert." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Eine Datei mit diesem Namen wird bereits übertragen." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Eine Datei mit diesem Namen wird noch bearbeitet. Bitte schließen Sie diese " "und versuchen Sie es erneut." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1325,11 +1384,20 @@ "Dateiauflistungen fehlen.\n" "In dieser Sitzung werden keine weiteren Warnungen angezeigt." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Ein verlorenes Master-Passwort kann nicht wiederhergestellt werden! Bitte " +"prägen Sie sich Ihr Passwort gut ein." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Eine neue FileZilla-Version ist verfügbar:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1338,7 +1406,7 @@ "Server verstecken allerdings Dateien vor dem Benutzer. Benutzen Sie diese " "Option, um den Server zu zwingen, alle Dateien anzuzeigen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1347,7 +1415,7 @@ "mit dem Serveradministrator in Verbindung, wenn Sie diese Einstellung " "dennoch benötigen." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1357,17 +1425,17 @@ "Synchronisierten Verzeichniswechsel deaktivieren und das lokale Verzeichnis " "wechseln?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "ASC&II" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "&Hinzufügen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "&Fortsetzen des Downloads von ASCII-Dateien erlauben" @@ -1379,51 +1447,55 @@ msgid "A&pply only to uploads" msgstr "&Nur auf Uploads anwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "&Auf alle Dateien und Verzeichnisse anwenden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "Erf&olgreiche Übertragungen automatisch entfernen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Über FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Über den Dateilisten" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "" +"Zugriff auf einige lokale Verzeichnisse konnte nicht wiederhergestellt " +"werden:" + +#: ../../locales/../src/engine/server.cpp:616 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Konto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "A&ktion nach dem Abarbeiten der Warteschlange" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Aktion für ausgewählte Datei:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Durchzuführende Aktion:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Aktion:" @@ -1431,7 +1503,7 @@ msgid "Active mode" msgstr "Aktiver Modus" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1439,7 +1511,7 @@ "Test für den aktiven FTP-Modus fehlgeschlagen. FileZilla kennt die korrekte " "externe IP-Adresse nicht." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1448,7 +1520,7 @@ "externe IP-Adresse nicht. Zusätzlich hat Ihr Router die gesendete Adresse " "verändert." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1458,39 +1530,40 @@ "externe IP-Adresse, aber Ihr Router oder die Firewall hat fälschlicherweise " "die Sendeadresse verändert." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP für aktiven Modus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Dateien nur zur &Warteschlange hinzufügen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Ausgewähltes Verzeichnis zur Warteschlange hinzufügen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "" "Ausgewählte Dateien und Ordner zur Übertragungs-Warteschlange hinzufügen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Zur Warteschlange hinzufügen" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Adresstyp nicht unterstützt" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Erweitert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1505,15 +1578,16 @@ "System beschädigen. Sie verwenden Beta-Versionen und Nightly Builds auf " "eigene Gefahr." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "I&mmer diese Aktion ausführen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algorithmus:" -#: ../../locales/../src/interface/QueueView.cpp:2937 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "Alle Dateien wurden erfolgreich übertragen" @@ -1522,7 +1596,7 @@ msgstr "" "Alle Ports im angegebenen Bereich müssen zwischen 1024 und 65535 liegen." -#: ../../locales/../src/interface/QueueView.cpp:2933 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1532,7 +1606,7 @@ "Alle Übertragungen wurden beendet. %d Dateien konnten nicht übertragen " "werden." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Zurückgr&eifen auf anderen Übertragungsmodus bei Fehlschlag erlauben" @@ -1540,17 +1614,17 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Zurückgreifen auf anderen Übertragungsmodus bei Fehlschlag erlauben" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Bereits verbunden" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternativer Name:" msgstr[1] "Alternative Namen:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1558,7 +1632,7 @@ "Alternativ können Sie PuTTYs 'Pageant' verwenden, um Ihre Schlüssel zu " "verwalten (Pageant wird von FileZilla erkannt)." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1567,7 +1641,7 @@ "in diesem Fall sicher, dass die 'SSH_AUTH_SOCK'-Umgebungsvariable gesetzt " "ist." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1575,7 +1649,7 @@ "Alternativ können Sie die aktuelle Version auch von der FileZilla-Website " "herunterladen:" -#: ../../locales/../src/interface/QueueView.cpp:1902 +#: ../../locales/../src/interface/QueueView.cpp:1662 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1585,7 +1659,7 @@ "aufgetreten.\n" "Möglicherweise wurden einige Warteschlangeneinträge nicht wiederhergestellt." -#: ../../locales/../src/interface/QueueView.cpp:1812 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1595,82 +1669,86 @@ "aufgetreten.\n" "Möglicherweise wurden einige Warteschlangeneinträge nicht gespeichert." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" +"Einer der Aussteller in der Zertifikatskette ist keine Zertifizierungsstelle" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Am Zielort ist bereits ein Eintrag mit diesem Namen vorhanden." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:641 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Anonym" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Es wird schon eine andere Serveroperation ausgeführt; kann Verzeichnis im " "Moment nicht wechseln" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "" "Keine der im Servermanager durchgeführten Änderungen konnte gespeichert " "werden." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Keine der Änderungen an den Filtern konnte gespeichert werden." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Änderungen an den Filtern werden nicht gespeichert." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "&Nur auf Verzeichnisse anwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Anwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Nur auf aktuelle &Warteschlange anwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Nur au&f Dateien anwenden" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Archiv" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Argumentpuffer-Überlauf" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Als Tab in der Übertragungs-Warteschlangenansicht" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Aktion erfragen" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/engine/server.cpp:633 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Nach Passwort fragen" @@ -1682,7 +1760,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Betriebssystem nach der externen IP-Adresse fragen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "In den FileZilla-Foren Fragen stellen" @@ -1690,7 +1768,7 @@ msgid "Associated program not found:" msgstr "Verknüpftes Programm nicht gefunden:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Wenigstens eine Filterbedingung ist unvollständig" @@ -1699,100 +1777,107 @@ msgstr "Nun sind alle notwendigen Informationen zusammengestellt." # TODO:? Eigenschaft -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Attribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Authentifizierung fehlgeschlagen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Autor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Automatisch" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Automatische Bestimmung des Dateityps" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Vorhandene Größen" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "&Proxy umgehen" # TODO -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Ungültiger file descriptor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Grundlegende Verwendungshinweise" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Verhalten" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Wird bearbeitet" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Vorsicht! Zertifikat wurde widerrufen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binär" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Schwarzes Brett" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Blau" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Lesezeichen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Lesezeichen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Durchsuchen..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Bucket nicht gefunden" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Erstellungsdatum:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Versionsinformationen" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Geschäftskategorie:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1802,99 +1887,115 @@ "einen beliebigen lokalen Port. Wenn Sie FileZilla auf einen kleineren " "Portbereich beschränken wollen, geben Sie ihn bitte nachfolgend an." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "&Aktuelle Operation abbrechen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "Alles &löschen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "U&RL(s) in die Zwischenablage kopieren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "U&RL(s) mit Passwort in die Zwischenablage kopieren" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "B&enutzerdefiniert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Ben&utzerdefinierte Dateizuordnungen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "CPU-Features:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Berechne Zeitzonenabweichung des Servers..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Kann nicht aus Datei lesen" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "In die Datei kann nicht geschrieben werden." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "In die Datei kann nicht geschrieben werden: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Abbrechen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Aktuelle Operation abbrechen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Bricht die aktuelle Operation ab" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Kein Zugriff auf '%s' möglich, kein Datenträger im Laufwerk oder Laufwerk " "nicht bereit." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Kann Server nicht zum Servermanager hinzufügen" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Kann geforderte Adresse nicht zuweisen" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Kann Verzeichnis nicht wechseln; es wird bereits eine Operation des " +"synchronisierten Verzeichniswechsels ausgeführt." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1902,7 +2003,7 @@ "Kann Tab nicht schließen während eine Operation ausgeführt wird.\n" "Aktuelle Operation abbrechen und Tab schließen?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1914,22 +2015,23 @@ msgid "Cannot create new filter" msgstr "Kann neuen Filter nicht erstellen" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Kann die Datei nicht bearbeiten" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Kann Datei nicht bearbeiten, nicht mit einem Server verbunden." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Kann Datei nicht bearbeiten, Pfad auf Server unbekannt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1937,82 +2039,81 @@ "Kann keine FTP-Verbindung zu einem SFTP-Server aufbauen. Bitte wählen Sie " "ein geeignetes Protokoll." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Quickconnect-Leiste kann nicht aus Ressourcendatei geladen werden" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Kann Schlüsseldatei nicht laden" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Werkzeugleiste kann nicht aus Ressourcendatei geladen werden" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Kann Passwort nicht speichern" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "Kann Eintrag nicht umbenennen" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Kann Datei nicht umbenennen" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Kann Hostnamen nicht zu IPv4-Adresse für die Verwendung mit SOCKS4-Proxy " "auflösen." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Kann Filtersatz nicht speichern" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Kann Filter nicht auswählen" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Kann Dateizuordnung nicht setzen" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Kann Dialog nicht anzeigen" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Kann die gewählte Datei nicht ansehen/bearbeiten" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Groß-/Kleinschreibung nicht berücksichtigen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Groß-/Kleinschreibung nicht berücksichtigen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Groß-/Kleinschreibung nicht berücksichtigen (Standard)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Groß-/Kleinschreibung berücksichtigen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Groß-/Kleinschreibung berücksichtigen (Standard)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Zu bereinigende Kategorien" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "Zertifikats- und Sitzungsdaten sind noch nicht verfügbar." @@ -2024,37 +2125,41 @@ msgid "Certificate issuer" msgstr "Herausgeber des Zertifikats" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Zertifikat-Signaturverifikation fehlgeschlagen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Aufforderung:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Dateiattribute ändern" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Dateiberechtigungen ändern." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Das Ändern der Logdatei-Einstellungen erfordert einen FileZilla-Neustart." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Probleme mit Zeichensatz" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Zeichensatz" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Nach &Updates suchen..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Auto&matisch nach FileZilla-Updates suchen:" @@ -2062,15 +2167,15 @@ msgid "Check for Updates" msgstr "Suche nach Updates" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Nach neueren FileZilla-Versionen suchen" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Suche nach Updates fehlgeschlagen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2078,7 +2183,7 @@ "Überprüfen Sie Ihre Logindaten. Das eingegebene Passwort beginnt oder endet " "mit einem Leerzeichen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2086,39 +2191,39 @@ "Überprüfen Sie Ihre Logindaten. Der eingegebene Benutzername beginnt oder " "endet mit einem Leerzeichen." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Überprüfe Korrektheit der externen IP-Adresse" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Suche nach Updates..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "Übereinstimmung der Prüfsumme auf Datei %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Nicht-Übereinstimmung der Prüfsumme auf Datei %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "Schlüsseldatei auswählen" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Lokales Standard-Verzeichnis auswählen" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Lokales Verzeichnis auswählen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:668 msgid "Chunk data improperly terminated" msgstr "HTTP-Datenblock nicht ordnungsgemäß terminiert" @@ -2127,54 +2232,62 @@ msgstr "Chiffre:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "Tab s&chließen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Klassisch" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "&Layout-Cache leeren" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Auto&update-Daten löschen" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Verlauf leeren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Persönliche Daten löschen" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Quickconnect-Leiste leeren" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Klicken Sie auf Beenden, um Ihre Konfiguration zu speichern." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Client-zu-Server-MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Client-zu-Server-Chiffre:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Schließen" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "Andere Tabs &schließen" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "FileZilla beenden" @@ -2182,105 +2295,110 @@ msgid "Close all running instances of FileZilla" msgstr "Alle offenen Instanzen von FileZilla schließen" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Schnellsuche schließen und Vergleich fortsetzen?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Schließt den aktuellen Tab" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Ko&mmentare:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Spalteneigenschaften" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Spaltenauswahl" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "" "Der Befehl und seine Argumente sollten korrekt mit Anführungszeichen " "versehen sein." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Befehl fehlgeschlagen" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Befehl nicht unterstützt" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Der Befehl wird von diesem Protokoll nicht unterstützt" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Befehl:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Kommentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Allgemeiner Name:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Kommunikation vom Router oder der Firewall beeinträchtigt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Vergleiche Ä&nderungszeitpunkt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Vergleiche Datei&größe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Sc&hwellwert für Vergleiche (in Minuten):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Der Vergleichsschwellwert muss zwischen 0 und 1440 Minuten liegen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Kompiliert für:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Kompiliert auf:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Kompiliert mit:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Compilerflags:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Komprimiert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Gleichzeitige Übertragungen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "&Groß-/Kleinschreibung berücksichtigen" @@ -2296,41 +2414,42 @@ msgid "Configure port range" msgstr "Portbereich einrichten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "FileZilla und Ihr Netzwerk konfigurieren" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Löschen bestätigen" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Bestätigung erforderlich" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Herzlichen Glückwunsch, Ihre Konfiguration scheint zu funktionieren." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Verbinden (Proxy-Einstellungen umgehen)" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Connect fehlgeschlagen: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "In aktuellem Tab verbinden" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "In neuem Tab verbinden" @@ -2338,25 +2457,26 @@ msgid "Connect to specified Site Manager site" msgstr "Mit angegebenem Server aus dem Servermanager verbinden" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Verbindung wird hergestellt" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Verbinde mit %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Verbinde mit %s über %s-Proxy" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Verbinde mit %s..." @@ -2365,186 +2485,230 @@ msgid "Connection" msgstr "Verbindung" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Verbindung abgebrochen" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Verbindungsversuch fehlgeschlagen" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Verbindungsversuch fehlgeschlagen mit \"%s\", versuche nächste Adresse." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Verbindungsversuch fehlgeschlagen mit \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Verbindungsversuch durch Benutzer unterbrochen" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Zeitüberschreitung bei Verbindungsversuch" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Verbindung getrennt" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:303 +#: ../../locales/../src/engine/http/request.cpp:316 +#: ../../locales/../src/engine/http/request.cpp:327 +#: ../../locales/../src/engine/http/request.cpp:338 msgid "Connection closed by server" msgstr "Verbindung vom Server geschlossen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "Verbindung hergestellt, initialisiere TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "Verbindung hergestellt, schicke HTTP-Anfrage" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "Verbindung hergestellt, warte auf Willkommensnachricht." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Verbindung hergestellt, warte auf Willkommensnachricht..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Verbindung verloren" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Verbindung durch den Regelsatz nicht erlaubt" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Verbindung verweigert" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Verbindung durch Server verweigert" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Verbindung durch Netzwerk zurückgesetzt" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Verbindung durch Peer zurückgesetzt" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Zeitüberschreitung der Verbindung nach %d Sekunde Inaktivität" msgstr[1] "Zeitüberschreitung der Verbindung nach %d Sekunden Inaktivität" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Zeitüberschreitung der Verbindung." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Verbindung zu Server verloren." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "Verbindung mit Proxy hergestellt, führe Handshake durch..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Verbindung zum Server wurde vorzeitig getrennt." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Verbindung zum Testserver fehlgeschlagen." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Schlüsseldatei konvertieren" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Kopie (%d) von %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "Kopie von %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Die URLs der ausgewählten Objekte einschließlich Passwort in die " +"Zwischenablage kopieren." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Die URLs der ausgewählten Objekte in die Zwischenablage kopieren." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Konnte Verbindung nicht akzeptieren: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Konnte nicht auf Pfad %s zugreifen" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Konnte Zertifikat nicht zu temporärer Vertrauensliste hinzufügen" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Konnte Verbindung nicht in Servermanager aufnehmen" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Konnte Operation nicht abschließen" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Herstellen der Verbindung zum Server fehlgeschlagen" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Herstellen der Verbindung zum Server fehlgeschlagen: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Befehl konnte nicht im Serverzeichensatz kodiert werden" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Konnte privaten Schlüssel nicht konvertieren" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Konnte URLs nicht kopieren" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Konnte Zertifikat nicht kopieren" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Konnte Daten nicht kopieren" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Konnte aus Pfad %s keine CFURL erstellen" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Konnte für diese Übertragung keinen URI erstellen." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Konnte lokale Datei %s nicht erzeugen\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Konnte Logging-Mutex nicht erzeugen: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +# TODO: security-scoped bookmark? +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Konnte kein gesichertes Lesezeichen aus URL erzeugen:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2554,11 +2718,11 @@ "Entweder ist die Shell-Erweiterung nicht ordnungsgemäß eingerichtet oder Sie " "haben die Dateien nicht in ein Explorer-Fenster gezogen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Konnte keine Verbindung zum Server aufbauen" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2571,11 +2735,16 @@ "Kommandozeilenoption '--datadir ' oder setzen Sie die " "Umgebungsvariable 'FZ_DATADIR'." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Es konnte keine benutzerdefinierte Anmeldesequenz erstellt werden." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Konnte Schlüssel nicht erzeugen" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2583,7 +2752,7 @@ "Konnte 'Distinguished Name' des Zertifikatsausstellers nicht ermitteln; " "gnutls_x509_get_issuer_dn fehlgeschlagen" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2591,41 +2760,36 @@ "Konnte 'Distinguished Name' des Zertifikat-Betreffs nicht ermitteln; " "gnutls_x509_get_dn fehlgeschlagen" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Konnte kompletten Pfad auf Server nicht bestimmen." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Konnte nativen Pfad nicht aus CFURL erhalten" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Konnte Pfad nicht aus URL erhalten" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Keine Antwort von fzputtygen erhalten." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "Kann temporäres Download-Verzeichnis nicht finden." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Konnte Zertifikat der Gegenstelle nicht importieren; gnutls_x509_crt_import " -"fehlgeschlagen" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:96 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Konnte Winsock nicht initialisieren (%d): %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Konnte Struktur für Zertifikate der Gegenstelle nicht initialisieren; " -"gnutls_x509_crt_init fehlgeschlagen" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2636,15 +2800,21 @@ "und auf diese zugegriffen werden kann.\n" "Änderungen im Servermanager können nicht gespeichert werden." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Konnte Schlüsseldatei nicht laden" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Konnte privaten Schlüssel nicht laden" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2656,7 +2826,7 @@ "Synchronisierten Verzeichniswechsel deaktivieren und das Verzeichnis auf dem " "Server wechseln?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2667,7 +2837,7 @@ "nicht bestimmen.\n" "Synchronisierter Verzeichniswechsel wurde deaktiviert." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2678,72 +2848,112 @@ "nicht bestimmen.\n" "Synchronisierter Verzeichniswechsel wurde deaktiviert." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Konnte Größe von '%s' nicht bestimmen" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Konnte '%s' nicht öffnen" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Konnte Zwischenablage nicht öffnen" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Konnte Logdatei nicht öffnen: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Konnte Server-Pfad nicht verarbeiten." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Konnte Serveradresse nicht verarbeiten:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Konnte nicht aus '%s' lesen" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." msgstr "Konnte vom Datensocket nicht lesen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:380 #, c-format msgid "Could not read from socket: %s" msgstr "Konnte vom Socket nicht lesen: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Konnte Servereintrag nicht lesen." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Konnte vom Server keine Daten empfangen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Es konnte nicht zu Position %s innerhalb der Datei gesprungen werden" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Konnte Verzeichniszugriff nicht wiederherstellen" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Es konnte nicht zu Position %d innerhalb der Datei gesprungen werden" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Es konnte nicht zum Dateianfang gesprungen werden" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Es konnte nicht zum Dateiende gesprungen werden" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Konnte Befehl nicht an fzputtygen senden." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Konnte Befehl nicht an fzstorj senden." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Konnte Peer-Zertifikate nicht sortieren" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "IO-Thread konnte nicht gestartet werden" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Proxy-Handshake konnte nicht gestartet werden: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Übertragung konnte nicht gestartet werden" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2752,21 +2962,21 @@ "Konnte \"%s\" nicht schreiben. Die Änderungen im Servermanager konnten nicht " "gespeichert werden: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "" "Konnte \"%s\" nicht schreiben; das Lesezeichen konnte nicht hinzugefügt " "werden: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Konnte \"%s\" nicht schreiben; die globalen Lesezeichen konnten nicht " "gespeichert werden: %s" -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2776,123 +2986,125 @@ "werden.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Konnte \"%s\" nicht schreiben; die ausgewählten Server konnten nicht " "exportiert werden: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Konnte \"%s\" nicht schreiben:" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Konnte Schlüsseldatei nicht schreiben: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Konnte nicht in lokale Datei schreiben" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Konnte nicht in Logdatei schreiben: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:235 #, c-format msgid "Could not write to socket: %s" msgstr "Konnte nicht in Socket schreiben: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Staat:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "&Neue Datei erstellen" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "&Fehlendes lokales Verzeichnis erstellen und betreten" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "&Fehlendes Serververzeichnis erstellen und betreten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Neues Unterverzeichnis im aktuellen Verzeichnis erstellen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "" "Neues Unterverzeichnis im aktuellen Verzeichnis erstellen und in das neue " "Verzeichnis wechseln" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Eine neue, leere Datei im aktuellen Verzeichnis erstellen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "Verzeichnis erstellen und &betreten" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Verzeichnis erstellen" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "Leere Datei erstellen" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Erstelle Verzeichnis" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Erstelle Verzeichnis '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Kritischer Fehler" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Kritischer Fehler:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Kritischer Dateiübertragungsfehler" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kritischer Dateiübertragungsfehler nach Übertragung von %s in %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2902,97 +3114,102 @@ "Wurzelverzeichnis (%s).\n" "Synchronisierter Verzeichniswechsel wurde deaktiviert." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Als Übertragungstyp ist momentan 'ASCII' eingestellt." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Als Übertragungstyp ist momentan 'Automatisch' eingestellt." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Als Übertragungstyp ist momentan 'Binär' eingestellt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Kurve:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "&Benutzerdefiniert" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Eigener Filtersatz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Benutzerdefinierter Server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Cyan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Datent&yp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "&Dezimale Präfixe mit SI-Einheit (Beispiel: 1 KB = 1000 Bytes)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "&Standard" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "Lösch&en" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "&Verzeichnisvergleich" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Alle &deaktivieren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "&Passwörter nicht speichern" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "D&oppelklick-Aktion für Verzeichnisse:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "&Kopieren" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:56 msgid "DOS-like with virtual paths" msgstr "DOS-ähnlich mit virtuellen Pfaden" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Gefährlicher Dateityp" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Daten" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Datensocket wurde zu früh geschlossen." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Datum" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Datumsformat" @@ -3008,15 +3225,15 @@ msgid "Debug" msgstr "Debug" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Debug-Einstellungen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Lokales Standard-Verzeic&hnis:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:48 msgid "Default (Autodetect)" msgstr "Standard (Automatische Erkennung)" @@ -3024,17 +3241,17 @@ msgid "Default editor not properly quoted." msgstr "Standardeditor nicht korrekt mit Anführungszeichen versehen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Standardaktion bei bereits existierender Datei" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "&Standard-Verzeichnis auf Server:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -3043,7 +3260,7 @@ "sicher, dass er ein für den ausgewählten Servertyp gültiger, absoluter Pfad " "ist." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "System-Standardsprache" @@ -3051,12 +3268,12 @@ msgid "Default transfer mode:" msgstr "Standard-Übertragungsmodus:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Standard-Übertragungstyp:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Standard: http://ip.filezilla-project.org/ip.php" @@ -3067,7 +3284,7 @@ "Die Verzögerung nach fehlerhaften Verbindungsversuchen muss zwischen 1 und " "999 Sekunden liegen." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3082,75 +3299,85 @@ "Verzögere Verbindungsversuch für %d Sekunden, da der vorherige " "fehlgeschlagen ist..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "Servermanagereintrag löschen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Markiertes Verzeichnis löschen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Ausgewählte Dateien und Verzeichnisse löschen" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Lösche \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Lösche %u Dateien aus \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Symbolische Verknüpfung löschen" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Desktop" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Details" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Details für neuen Schlüssel:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "Neuere FileZilla-Version erkannt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "Verzei&chnisse" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Richtung" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Verzeichnisse:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Verzeichnis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Verzeichniszugriffsberechtigungen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Verzeichnisvergleich" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Verzeichnisvergleich fehlgeschlagen" @@ -3160,39 +3387,43 @@ "Das Verzeichnis, das die Logdatei enthält, existiert nicht oder der " "Dateiname ist ungültig." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "&Datei-/Verzeichnisfilter..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Anzeigen des Verzeichnisinhalts durch Benutzer abgebrochen" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "Anzeigen des Verzeichnisinhalts fehlgeschlagen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Datei-/Verzeichnisfilter" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Anzeigen des Verzeichnisinhalts für \"%s\" abgeschlossen" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Anzeigen des Verzeichnisinhalts abgeschlossen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Alle d&eaktivieren" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Synchronisierten Verzeichniswechsel deaktivieren und das Serververzeichnis " "wechseln?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3200,86 +3431,81 @@ "Deaktivieren Sie diese Option wieder, wenn Verzeichnisinhalte nicht mehr " "richtig angezeigt werden." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Verbindung zum Server trennen" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Verbindung zum Server getrennt" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Verbindung zum Server getrennt: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Trenne Verbindung zu vorherigem Server" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Trennt Verbindung zu aktuellem Server" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Informationsdialog anzeigen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "&Keinen Standardeditor verwenden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Nichts &machen" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Für alle ausgewählten &momentan bearbeiteten Dateien anwenden" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Wollen Sie FileZilla wirklich beenden?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Wollen Sie wirklich alle Servermanagereinträge und die Übertragungs-" "Warteschlange löschen?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Wollen Sie wirklich alle Servermanagereinträge löschen?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Wollen Sie wirklich den gewählten Eintrag löschen?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Wollen Sie wirklich die Übertragungs-Warteschlange löschen?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Wollen Sie wirklich '%s' zum Server senden?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Wollen Sie diese Datei erneut öffnen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Dokumentation" @@ -3287,49 +3513,49 @@ msgid "Don't use external IP address on &local connections." msgstr "Externe IP-Adresse nicht für &lokale Verbindungen benutzen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "'dotfiles' sind Dateien, deren Name mit einem Punkt beginnt (bspw. '." "htaccess')." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Doppelklick-Aktion" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Herunterladen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Begrenzung der Do&wnloadgeschwindigkeit:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "Download-Begrenzung: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Download-Begrenzung: keine" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Suchergebnisse herunterladen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Ausgewähltes Verzeichnis herunterladen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Ausgewählte Dateien und Verzeichnisse herunterladen" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3338,24 +3564,24 @@ "Downloadgeschwindigkeit: %s/s\n" "Uploadgeschwindigkeit: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Wird heruntergeladen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Lade %s herunter" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Lade Update herunter..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:90 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3363,11 +3589,11 @@ "Drag&Drop zwischen verschiedenen Instanzen von FileZilla ist derzeit noch " "nicht möglich." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:103 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Drag&Drop zwischen verschiedenen Servern ist derzeit noch nicht möglich." @@ -3376,16 +3602,16 @@ msgid "Dupl&icate" msgstr "Kop&ieren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "&Alle aktivieren" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "V&erzeichnis betreten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "A&usführen" @@ -3393,48 +3619,48 @@ msgid "E&xit" msgstr "&Beenden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." msgstr "&Export..." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "E-Mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Jeder Filter muss wenigstens eine Bedingung enthalten." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Filter bearbeiten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Datei mit dem eingestellten Editor bearbeiten und auf den Server hochladen." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "Bearbeiten von Verzeichnissen wird nicht unterstützt" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Bearbeiten fehlgeschlagen" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Bearbeiten von Suchergebnissen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "E-Mail:" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "Leerer Befehl" @@ -3442,7 +3668,7 @@ msgid "Empty command." msgstr "Leerer Befehl." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "Leeres Verzeichnis" @@ -3454,13 +3680,13 @@ msgid "Empty file extension." msgstr "Leere Dateierweiterung." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Geben Sie einen nicht-leeren Namen für den Filter an." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Leerer Name" @@ -3468,81 +3694,97 @@ msgid "Empty quoted string." msgstr "Leere Zeichenkette innerhalb der Anführungszeichen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Alle a&ktivieren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "&Filtern ungültiger Zeichen aktivieren" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Verschlüsselt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Verschlüsselung" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "S&chlüssel:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "S&chlüssel:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Verschlüsselungsdetails" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Vergleichen beenden und Sortierreihenfolge ändern?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Vergleichen beenden und Schnellsuche öffnen?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "&Benutzerdefinierten Befehl eingeben..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Geben Sie 0 für unbegrenzte Geschwindigkeit ein." -#: ../../locales/../src/interface/QueueView.cpp:2103 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "Befehl eingeben" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Benutzerdefinierten Befehl eingeben" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Verzeichnis betreten" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Bitte einen Filternamen angeben" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Master-Passwort eingeben" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Bitte einen Namen für den Filtersatz eingeben" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Neuen Namen für den Filtersatz eingeben" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Passwort eingeben" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Ausgewähltes Verzeichnis betreten" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3550,11 +3792,10 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Geben Sie die Adresse des Servers ein.\n" -"Um das Server-Protokoll festzulegen, können Sie einen Protokollnamen vor dem " -"Servernamen einfügen. Wenn kein Protokoll angegeben wird, wird das " -"Standardprotokoll (ftp://) verwendet.\n" -"Sie können auch eine komplette URL in der Form protokoll://benutzer:" +"Geben Sie die Adresse des Servers ein. Um das Server-Protokoll festzulegen, " +"können Sie einen Protokollnamen vor dem Servernamen einfügen. Wenn kein " +"Protokoll angegeben wird, wird das Standardprotokoll (ftp://) verwendet. Sie " +"können auch eine komplette URL in der Form protokoll://benutzer:" "passwort@server:port angeben. Die Werte in den anderen Feldern werden dann " "überschrieben.\n" "\n" @@ -3564,7 +3805,7 @@ "- ftps:// für FTP über TLS (implizit)\n" "- ftpes:// für FTP über TLS (explizit)." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3573,118 +3814,135 @@ "Geben Sie das Passwort für die Datei '%s' ein.\n" "Die konvertierte Datei wird mit demselben Passwort geschützt sein." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Geben Sie die Portnummer des Servers an.\n" -"Der Standardport für FTP ist 21, der Standardport für SFTP ist 22." +"Geben Sie die Portnummer des Servers an. Der Standardport für FTP ist 21, " +"der Standardport für SFTP ist 22." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Benutzername eingeben" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Benutzername und Passwort eingeben" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Fehler" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Fehler beim Exportieren der Einstellungen" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Fehler beim Importieren" -#: ../../locales/../src/interface/QueueView.cpp:1903 +#: ../../locales/../src/interface/QueueView.cpp:1663 msgid "Error loading queue" msgstr "Fehler beim Laden der Warteschlange" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1824 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "xml-Datei kann nicht geladen werden" -#: ../../locales/../src/interface/QueueView.cpp:1813 +#: ../../locales/../src/interface/QueueView.cpp:1556 msgid "Error saving queue" msgstr "Fehler beim Speichern der Warteschlange" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Fehler beim Starten des Programms" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "xml-Datei kann nicht geschrieben werden" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Fehler:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Beispiel: png \"c:\\Programme\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Beispiele" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Aus&führen" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Programm enthält keine Versionsinformationen, Suche nach Updates nicht " "möglich." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Explorer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "&Filter" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "&Warteschlange" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "&Einstellungen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Exporteinstellungen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Filte&rname:" @@ -3692,28 +3950,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - File Transfer Protocol" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - File Transfer Protocol mit optionaler Verschlüsselung" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Unsicheres File Transfer Protocol" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "FTP-Engine nicht initialisiert, keine Verbindung möglich." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "FTP-Verbindungserhaltung" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP-Proxy" @@ -3730,82 +3987,92 @@ "Das FTP-Protokoll verwendet sekundäre Verbindungen für Datenübertragungen. " "Diese zusätzlichen Verbindungen können auf zwei Arten aufgebaut werden." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP: Dateitypen" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP über explizites TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP über implizites TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Verzeichnis konnte nicht gewechselt werden" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Wechseln der Sprache fehlgeschlagen" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Befehl konnte nicht mit 8-Bit-Zeichensatz kodiert werden" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "Kopieren oder Verschieben der Servereinträge fehlgeschlagen" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Sicherheitskopie der xml-Datei konnte nicht erstellt werden" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "" -"Fehler beim Erstellen eines Sockets für die Datenübertragungen, Aktion " -"abgebrochen" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Fehler beim Erstellen eines Sockets auf Port %d; breche ab." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Fehler beim Erstellen eines Sockets für Datenübertragungen im Aktiven Modus." -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Server-Passwort konnte nicht entschlüsselt werden." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Pfad für 'Eigene Dateien' konnte nicht gefunden werden" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Desktop-Pfad konnte nicht gefunden werden" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Server-IP-Adresse für die Kontrollverbindung konnte nicht ermittelt werden, " "Verbindung getrennt." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Server-IP-Adresse für die Datenverbindung konnte nicht ermittelt werden, " "Verbindung getrennt." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "FTP-Engine konnte nicht initialisiert werden." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "TLS konnte nicht initialisiert werden." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" msgstr "Netzwerkfunktionalität konnte nicht initialisiert werden" @@ -3815,73 +4082,73 @@ "Panels konnten nicht aus den Ressourcendateien geladen werden. Kann es sein, " "dass die Ressourcendateien ungültig sind?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Laden des privaten Schlüssels fehlgeschlagen: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "\"%s\" konnte nicht zum Anhängen/Schreiben geöffnet werden" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "%s konnte nicht zum Lesen geöffnet werden" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "%s konnte nicht zum Schreiben geöffnet werden" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "Zurückgegebener Pfad konnte nicht geparst werden." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Daten konnten nicht empfangen werden" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Verzeichnisinhalt konnte nicht empfangen werden" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Externe IP-Adresse konnte nicht ermittelt werden, breche ab" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Externe IP-Adresse konnte nicht ermittelt werden; breche ab." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "" -"Externe IP-Adresse konnte nicht ermittelt werden. Verwende statt dessen " +"Externe IP-Adresse konnte nicht ermittelt werden. Verwende stattdessen " "lokale IP-Adresse." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Lokale IP-Adresse konnte nicht ermittelt werden." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Lokale IP-Adresse konnte nicht ermittelt werden; breche ab." -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Lokale IP-Adresse konnte nicht ermittelt werden, breche ab" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Lokale IP-Adresse konnte nicht ermittelt werden." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Externe IP-Adresse konnte nicht ermittelt werden." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Fehler beim Senden des Befehls." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Die Sprache konnte nicht in %s (%s) geändert werden. Die Standard-" "Systemsprache wird benutzt." -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3889,49 +4156,48 @@ "Die Sprache konnte nicht in %s (%s) geändert werden, die Standard-" "Systemsprache (%s, %s) wird benutzt." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Die Sprache konnte nicht in %s (%s) geändert werden. Die Standard-" "Systemsprache wird benutzt." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Die Sprache konnte nicht in %s geändert werden. Die Standard-Systemsprache " "wird benutzt." -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Die Sprache konnte nicht in %s geändert werden. Die Standard-Systemsprache " "(%s, %s) wird benutzt." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Die Sprache konnte nicht in %s geändert werden. Die Standard-Systemsprache " "wird benutzt." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Überprüfung der Einstellungen fehlgeschlagen" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Verifizierung des Zertifikats der Gegenstelle fehlgeschlagen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Fehler beim Schreiben in die Datei %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Fehler beim Schreiben der xml-Datei" @@ -3943,27 +4209,23 @@ msgid "Fall back to active mode" msgstr "Auf aktiven Modus zurückgreifen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Dat&ei:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "D&ateien" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Datei" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Dateitypen" - -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "File descriptor kein Socket" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Die Datei enthält keine importfähigen Daten." @@ -3971,7 +4233,7 @@ msgid "File editing" msgstr "Bearbeiten von Dateien" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "Datei existiert" @@ -3979,7 +4241,7 @@ msgid "File exists action" msgstr "Aktion bei existierender Datei" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Datei wurde geändert" @@ -3987,64 +4249,68 @@ msgid "File lists" msgstr "Dateilisten" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Datei nicht gefunden" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Dateisuche" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Dateiübertragung durch Benutzer abgebrochen" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "Dateiübertragung durch Benutzer abgebrochen nach Übertragung von %s in %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Dateiübertragung fehlgeschlagen" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Dateiübertragung fehlgeschlagen nach Übertragung von %s in %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Dateiübertragung übersprungen" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Dateiübertragung erfolgreich" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Dateiübertragung erfolgreich, %s in %s übertragen" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Dateiübertragungen dauern noch an." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Datei würde mit Datentyp 'ASCII' übertragen werden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Datei würde mit Datentyp 'Binär' übertragen werden." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "FileZilla-Fehler" @@ -4056,76 +4322,82 @@ "FileZilla kann nun Ihre Konfiguration testen, um sicherzustellen, dass alles " "ordnungsgemäß eingestellt ist." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla ist schon mit einem Server verbunden." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "FileZilla muss neu gestartet werden, damit das Ändern der Sprache wirksam " "wird." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "FileZilla-Updates" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "Stat&usleisten für Verzeichnisanzeige" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Dateiname" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Datei-/Verzeichnisfilter..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "Dateiname kann für Verzeichnis %s und Dateiname %s nicht erstellt werden" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "Dateiname ungültig" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Dateiname nicht geändert" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Dateiname:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Dateinamen dürfen keines der folgenden Zeichen enthalten: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "Dateinamen dürfen keines der folgenden Zeichen enthalten: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Momentan bearbeitete Dateien" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" +"Dateien, auf die eine Filterregel zutrifft, werden aus Auflistungen von " +"Verzeichnisinhalten entfernt." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Dateien nicht gefunden" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Dateigröße" @@ -4133,50 +4405,54 @@ msgid "Filesize format" msgstr "Dateigrößenformat" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Dateityp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Dateitypzuordnungen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Filter anwenden auf:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Ungültige Zeichen in Dateinamen filtern" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Filtername existiert bereits" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Objekte ausfiltern, die alle Folgenden erfüllen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Objekte ausfiltern, die beliebige der Folgenden erfüllen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Objekte ausfiltern, die keine der Folgenden erfüllen" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Objekte ausfiltern, die nicht alle der Folgenden erfüllen" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Filtersatz existiert bereits" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Verzeichnisinhalte filtern" @@ -4186,11 +4462,11 @@ msgid "Filter validation failed" msgstr "Filter-Gültigkeitsprüfung fehlgeschlagen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "&Dateien suchen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "&Verzeichnisse suchen" @@ -4202,16 +4478,17 @@ msgid "Fingerprint (SHA-256):" msgstr "SHA256-Fingerprint:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Fingerabdruck:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Fingerabdrücke:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Assistent zur Firewall- und Routerkonfiguration" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4225,7 +4502,7 @@ "Um eine zuverlässige Verbindung bzw. Datenübertragung zu garantieren, " "sollten Sie einen Bereich von mindestens 10 Ports angeben." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4233,35 +4510,40 @@ "In dieser Sitzung werden die Standard-Einstellungen verwendet. Änderungen an " "den Einstellungen werden nicht gespeichert." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "&UTF-8 erzwingen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "A&uflistung versteckter Dateien erzwingen" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Auflistung versteckter Dateien erzwingen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Formatspezifikationen:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Format: Erweiterung gefolgt von korrektem Befehl und Argumenten in " "Anführungszeichen." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Neues %s %s gefunden\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Funktion %s fehlgeschlagen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Weitere Dokumentation" @@ -4269,11 +4551,15 @@ msgid "General" msgstr "Allgemein" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Allgemeines Versagen des SOCKS-Servers" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Erzeugen..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Generischer Proxy" @@ -4282,71 +4568,75 @@ msgid "Get external IP address from the following URL:" msgstr "Externe IP-Adresse von folgender URL beziehen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Hilfe erhalten" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" "Ein Filtersatz mit diesem Namen existiert bereits, Filtersatz überschreiben?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Globale Lesezeichen" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS-Fehler %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS-Fehler %d in %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS-Fehler %d in %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS-Fehler %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Grün" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Gruppen-Berechtigungen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "H&och" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP über TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Versteckt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 #: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Hoch" -#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:938 #: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Höchste" @@ -4356,58 +4646,67 @@ msgstr "" "Der größte verfügbare Port muss eine Zahl zwischen 1024 und 65535 sein." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Halten Sie die Umschalttaste gedrückt, um den Filterstatus auf beiden Seiten " "gleichzeitig zu ändern." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Homepage:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Server ist offline" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Fingerabdruck des Server-Schlüssels:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Server-Schlüssel stimmen nicht überein" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "" "Host fängt mit '[' an, es wurde aber keine schließende Klammer gefunden." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Host nicht erreichbar" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Server:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algorithmus des Server-Schlüssels:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Stunden," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Ich &habe mein Master-Passwort vergessen. Alle Passwörter löschen, die mit " +"diesem Schlüssel gespeichert wurden." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "ISO 8&601 (Beispiel: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6-Adressen werden mit SOCKS4-Proxy nicht unterstützt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4417,7 +4716,7 @@ "übertragen oder empfangen werden, wird die Verbindung geschlossen und " "FileZilla wird versuchen, sich erneut zu verbinden." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Wenn Sie Fehler melden, dann schicken Sie bitte Protokolle, die mit dem " @@ -4445,7 +4744,7 @@ "können Sie auch auf falsch konfigurierte Server zugreifen, die den " "ausgewählten Modus ablehnen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4453,7 +4752,7 @@ "Falls Sie nichts von einem Wechsel des Server-Schlüssels wissen, " "kontaktieren Sie bitte den Server-Administrator." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4461,7 +4760,7 @@ "Wenn das Problem weiterhin besteht, wird FileZilla durch einen Router oder " "eine Firewall blockiert." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4469,7 +4768,7 @@ "Wenn das Problem weiterhin besteht, wird die Verbindung durch einen Router " "oder eine Firewall unterbrochen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4479,7 +4778,7 @@ "\".1\" an den Dateinamen angehängt wird (hierbei werden gegebenenfalls " "ältere Logdateien überschrieben), und eine neue Datei wird erzeugt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4487,7 +4786,7 @@ "Wenn die symbolische Verknüpfung auf ein Verzeichnis zeigt, kann FileZilla " "entweder die Verknüpfung oder aber den Inhalt des Zielverzeichnisses löschen." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4495,14 +4794,14 @@ "Wenn das Problem weiterhin besteht, wenden Sie sich bitte an den Hersteller " "Ihres Routers oder Ihrer Firewall, um eine Lösung zu erfragen." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Wenn das Problem weiterhin besteht, wenden Sie sich bitte an den Hersteller " "Ihres Routers." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4513,7 +4812,7 @@ "unterschiedliche Zeitzonen) die Zeiten unterscheiden, stellen Sie die " "Abweichung im Servermanager ein." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4523,7 +4822,7 @@ "Änderungszeitpunkte nicht weiter als der eingestellten Schwellwert " "auseinander liegen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Wenn Sie die Sprache wechseln, müssen Sie FileZilla neu starten." @@ -4535,11 +4834,11 @@ "Wenn Sie auf \"Test\" klicken, wird sich FileZilla mit probe.filezilla-" "project.org verbinden und einige einfache Tests ausführen." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Wenn Sie FileZilla schließen, werden Ihre Änderungen verloren gehen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4551,7 +4850,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "Sollten Fehler auftreten, so ist Ihre Konfiguration nicht korrekt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4559,7 +4858,7 @@ "Wenn Sie Probleme haben Verzeichnisinhalte anzeigen zu lassen oder Dateien " "zu übertragen, versuchen Sie den Standard-Übertragungsmodus zu ändern." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4595,7 +4894,7 @@ "Wenn Sie einen Router benutzen, stellen Sie sicher, dass alle angegebenen " "Ports zu dem Rechner, auf dem Sie FileZilla verwenden, weitergeleitet werden." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4603,16 +4902,16 @@ "Wenn Ihr Router ständig die IP-Adresse ändert, wenden Sie sich bitte an den " "Hersteller." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importiere Daten von einer älteren Version" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Importeinstellungen" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Import erfolgreich" @@ -4640,7 +4939,7 @@ "vom System zugewiesen werden." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4658,19 +4957,11 @@ "FileZilla den Server nach einem Port und verbindet sich zu diesem Port; " "hierfür muss nicht viel eingerichtet werden." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Unvollständige Kette; oberstes Zertifikat ist kein selbst-unterzeichnetes " -"Zertifikat einer Zertifizierungsstelle" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Falsches Passwort" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4678,21 +4969,21 @@ "Informationen zur aktuellen FileZilla-Version konnten nicht abgefragt " "werden. Bitte versuchen Sie es später noch einmal." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Initialisiere TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "Unsicherer Algorithmus!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Unsicherer Server; er unterstützt kein FTP über TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:613 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interaktiv" @@ -4700,29 +4991,29 @@ msgid "Interface" msgstr "Oberfläche" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Unterbrochen durch Signal" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Unterbrochen durch Benutzer" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 +#: ../../locales/../src/engine/http/request.cpp:582 msgid "Invalid Content-Length" msgstr "Content-Length ungültig" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:488 msgid "Invalid HTTP Response" msgstr "Ungültige HTTP-Rückmeldung" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Ungültiges Argument übergeben" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4730,45 +5021,69 @@ "Ungültige Zeichenfolge empfangen, UTF-8 wird deaktiviert. Wählen Sie UTF-8 " "im Servermanager, um UTF-8 zu erzwingen." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:703 msgid "Invalid chunk size" msgstr "Ungültige Datenpaketgröße." -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Ungültige Daten empfangen" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Ungültiges Datum" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Ungültiger Hash: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Ungültiger Host; nach der schließenden Klammer dürfen nur Doppelpunkt und " "Port folgen." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Ungültiger Hostname: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Ungültige Eingabe" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:516 +msgid "Invalid line" +msgstr "Ungültige Zeile" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Ungültiger Pfad" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Ungültiger Port angegeben. Der Port muss zwischen 1 und 65535 liegen." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4782,74 +5097,74 @@ "ftps:// für FTP über TLS (implizit) und\n" "ftpes:// für FTP über TLS (explizit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Ungültiger Proxyserver; nach der schließenden Klammer dürfen nur Doppelpunkt " "und Port folgen." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Ungültiger regulärer Ausdruck" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Ungültiger regulärer Ausdruck in Suchbedingungen." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:497 msgid "Invalid response code" msgstr "Ungültiger Antwortcode" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Ungültige Suchbedingungen: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Ungültiger Pfad für Servereintrag" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Ungültige Größe in Bedingung" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Ungültiger Benutzername angegeben." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Ungültiger Wert für 'ai_flags'" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Ungültiger Wert für 'hints'" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Filter invertieren" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Staat des Gerichtsstands:" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Ort des Gerichtsstands:" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Land oder Provinz des Gerichtsstands:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Verzeichnisse immer oben" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4860,7 +5175,7 @@ "ist. Obwohl FileZilla einige Tests durchführt, um herauszufinden, ob der " "Server das Feature unterstützt, könnten diese fehlschlagen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Schlüsselaustausch" @@ -4868,123 +5183,147 @@ msgid "Key exchange:" msgstr "Schlüsselaustausch:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:610 +#: ../../locales/../src/engine/server.cpp:635 msgid "Key file" msgstr "Schlüsseldatei" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Schlüssel-ID:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Niedri&gste" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Sprache" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Sprache gewechselt" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Zuletzt geändert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Ansicht" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Leer lassen, um das aktuelle Passwort zu behalten." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Maximale gleichzeitige &Downloads:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Maximale gleichzeitige &Uploads:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Lokale Ports beschränken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Größe der Logdatei beschränken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Limit:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:657 msgid "Line length exceeded" msgstr "Maximale Zeilenlänge überschritten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Gelinkt gegen" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Socket für eingehende Verbindungen geschlossen" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Auflistung:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "&Niedrigster verfügbarer Port:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Lokal" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Lokale Adresse in Benutzung" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Lokaler Endpunkt wurde geschlossen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Lokale Datei" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Lokale Datei existiert nicht." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Lokale Datei ist %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Lokale Datei ist ein Verzeichnis anstatt einer regulären Datei." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Lokale Datei ist kein gültiger Dateiname." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Lokale Dateisuche" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Lokale Filter:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Verarbeiten der lokalen Pfade:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Lokal:" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "" +"Lokale Größe von '%s' stimmt nicht mit erwarteter Größe überein: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Ort:" @@ -4992,16 +5331,16 @@ msgid "Log file" msgstr "Logdatei" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "Angemeldet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Logging" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -5010,7 +5349,7 @@ "unterstützt möglicherweise kein UTF-8. Kann nicht auf lokalen Zeichensatz " "zurückgreifen, da ein Proxy verwendet wird." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -5018,10 +5357,10 @@ "Anmeldedaten enthalten nicht-ASCII-konforme Zeichen und der Server " "unterstützt möglicherweise kein UTF-8. Versuche lokalen Zeichensatz." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" -"Anmeldevorgang vollständig ausgeführt, jedoch nicht angemeldet. Abbruch." +"Anmeldevorgang vollständig ausgeführt, jedoch nicht angemeldet; breche ab." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -5038,12 +5377,12 @@ "Kontozugangstyp; kann nur in Verbindung mit einer FTP-URL verwendet werden. " "Argument muss entweder '%s' oder '%s' sein." -#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:931 #: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Niedrig" -#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:929 #: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Niedrigste" @@ -5056,128 +5395,161 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Stellen Sie sicher, dass auf die Datei zugegriffen werden kann und dass sie " "ein wohlgeformtes XML-Dokument ist." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:644 +#: ../../locales/../src/engine/http/request.cpp:650 +#: ../../locales/../src/engine/http/request.cpp:657 +#: ../../locales/../src/engine/http/request.cpp:668 +#: ../../locales/../src/engine/http/request.cpp:703 #, c-format msgid "Malformed chunk data: %s" -msgstr "Falsches Datenpaketformat: %s" +msgstr "Fehlerhaftes Datenpaketformat: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 #, c-format -msgid "Malformed header: %s" -msgstr "Falscher Header: %s" +msgid "Malformed request header: %s" +msgstr "Anfrage enthält fehlerhafte Kopfdaten: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Falsche Rückmeldung, der Server schickt keine gültigen Zeilenenden" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:457 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:516 +#: ../../locales/../src/engine/http/request.cpp:572 +#: ../../locales/../src/engine/http/request.cpp:582 +#, c-format +msgid "Malformed response header: %s" +msgstr "Antwort enthält fehlerhafte Kopfdaten: %s" + +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +#, c-format +msgid "Malformed response: %s" +msgstr "Fehlerhafte Antwort: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Manuelle Übertragung" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Master-&Passwort:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Master-Passwort:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Jede der folgenden Bedingungen muss zutreffen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Mindestens eine der folgenden Bedingungen muss zutreffen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Keine der folgenden Bedingungen darf zutreffen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Nicht alle der folgenden Bedingungen dürfen zutreffen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Maximale Anzahl gleichzeitiger Über&tragungen:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Speicherzuweisungsfehlschlag" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Nachrichtenprotokoll" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Position des Nachrichtenprotokolls" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Nachricht zu groß" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Minuten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Nach &unten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Nach &oben" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Arbeitsplatz" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Eigene Dateien" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "Eigene Server" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "Nicht verfügbar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Name" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "Name existiert bereits" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Lesezeichenname existiert bereits." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Name:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Natürliche Sortierung" @@ -5185,19 +5557,23 @@ msgid "Need to enter filter name" msgstr "Filtername muss angegeben werden" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Es muss ein gültiger lokaler Pfad eingegeben werden" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Es muss ein gültiger Server-Pfad eingegeben werden" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "Sie müssen einen Zeichensatz angeben" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Weder 'nodename' noch 'servname' angegeben, oder nicht bekannt" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5205,12 +5581,12 @@ "Netzwerkhost besitzt in der angeforderten Adressfamilie keine " "Netzwerkadressen" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Netzwerk nicht erreichbar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Nie" @@ -5222,37 +5598,37 @@ msgid "New &tab" msgstr "Neuer &Tab" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Neue&s Lesezeichen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Neues Verzeichnis" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Neue Features und Verbesserungen in %s" @@ -5261,41 +5637,41 @@ msgid "New filter" msgstr "Neuer Filter" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Neues Verzeichnis" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Neuer Server" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Neben der Übertragungs-Warteschlange" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "Nein" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Keine Adresse mit Knotenname verknüpft" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Keine Kategorie zum Exportieren ausgewählt" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." -msgstr "Kein Befehl angegeben, Abbruch." +msgstr "Kein Befehl angegeben; breche ab." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Keine externe IP-Adresse angegeben, versuche Standard-Adresse." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Es werden derzeit keine Dateien bearbeitet." @@ -5303,99 +5679,95 @@ msgid "No filter name given" msgstr "Bitte einen Filternamen angeben" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Kein Server angegeben, bitte Server eingeben." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Keine Bilder verfügbar" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Keine weiteren Dateien in der Warteschlange!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Bitte einen Namen für den Filtersatz angeben." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Keine Programmzuordnung für Dateityp" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Für das Bearbeiten von Dateien mit der Erweiterung '%s' wurde kein Programm " "festgelegt." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Keine Route zum Host" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Keine Suchergebnisse" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Keine Server verfügbar" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Keine unterstützte SOCKS5-Authentifizierungsmethode" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Kein Benutzername angegeben." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Keine" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Noch keiner ausgewählt" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Nichtbehebbarer Fehlschlag bei Namensauflösung" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 #: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "" "Nicht alle Objekte konnten für die Übertragung wieder zur Warteschlange " "hinzugefügt werden." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Nicht verbunden" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Derzeit mit keinem Server verbunden" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Derzeit mit keinem Server verbunden." @@ -5403,28 +5775,37 @@ msgid "Not connected." msgstr "Nicht verbunden." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Nicht initialisiert; WSAStartup muss aufgerufen werden" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Beachten Sie, dass dieses Feature nur bei Verwendung des FTP-Protokolls " "unterstützt wird." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Hinweis: Ein verlorener Schlüssel kann nicht wiederhergestellt werden." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" "Anmerkung: Dies funktioniert nur mit unverschlüsselten FTP-Verbindungen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Hinweis: Das Verwenden eines generischen Proxys erzwingt den passiven Modus " "für FTP-Verbindungen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:650 +msgid "Null character in line" +msgstr "Null-Zeichen in Zeile" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Anzahl der Dezimalstellen:" @@ -5432,40 +5813,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Anzahl der Versuche muss zwischen 0 und 99 liegen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "&Datei öffnen" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "Ö&ffnen" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "Betriebssystemversion:" @@ -5478,39 +5863,52 @@ "Übertragungsmodus und (falls aktiviert) den alternativen Übertragungsmodus " "im Fehlerfall festgelegt." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Einmal" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Jeden Tag" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Jede Woche" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "Nur unverschlüsseltes FTP verwenden (unsicher)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "&Datei öffnen" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Verzeichnis im System-Dateimanager öffnen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Den Servermanager öffnen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Den Servermanager öffnen." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Den Servermanager öffnen. Rechtsklick zeigt eine Server-Liste an." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Öffnen Sie den Dialog für Verzeichniszugriffsberechtigungen, um " +"einzustellen, auf welche lokalen Verzeichnisse FileZilla Zugriff hat." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Datei öffnen." @@ -5518,14 +5916,16 @@ msgid "Open the settings dialog of FileZilla" msgstr "Einstellungsdialog von FileZilla öffnen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Geöffnet als:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Öffnen fehlgeschlagen" @@ -5537,110 +5937,118 @@ msgid "Opens the Site Manager" msgstr "Öffnet den Servermanager" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Öffnet den Datei-/Verzeichnisfilter-Dialog. Rechtsklick (de)aktiviert die " "Filterung." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Betriebssystem:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Operation wird bereits ausgeführt" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Operation wird ausgeführt" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Operation nicht unterstützt" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Optionen" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Orange" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Organisation:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Sonstige SFTP-Optionen" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Anderer Systemfehler" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Andere:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Speichermangel" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Übersicht" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Überschreiben falls &Quelldatei aktueller" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Datei überschreiben" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Datei überschreiben falls Größe unterschiedlich" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "" "Datei überschreiben falls Größe unterschiedlich oder Quelldatei aktueller" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Datei überschreiben falls Quelldatei aktueller" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Überschreiben falls &Größe unterschiedlich" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Überschr&eiben falls Größe unterschiedlich oder Quelldatei aktueller" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Eigener Build-Typ: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Besitzer-Berechtigungen" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Besitzer/Gruppe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5648,31 +6056,31 @@ "&Verhindern, dass System während Übertragungen usw. in einen automatischen " "Schlafmodus geht" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "P&roxy-Server:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "PORT-Befehl wurde vom Router oder der Firewall beeinträchtigt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "&Passiv (empfohlen)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Parameter keine gültige URL" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Parse %d Bytes der Versionsinformationen.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Pass&wort:" @@ -5680,68 +6088,84 @@ msgid "Passive (recommended)" msgstr "Passiv (empfohlen)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Passiver Modus" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Der passive Modus ist nun der Standard-Übertragungsmodus." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Passwort oder Schlüssel ist nicht festgelegt" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Passwort benötigt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Passwörter" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Pfad" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "" "Pfad kann für Verzeichnis %s und Unterverzeichnis %s nicht erstellt werden" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Pfad nicht gefunden:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Pfade" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Ausstehende Entfernung" # TODO -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Berechtigung" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Zugriff verweigert" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Berechtigungen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Plattform:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" +"Bitte fügen Sie die lokalen Verzeichnisse hinzu, für die Sie FileZilla " +"nutzen möchten." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5749,6 +6173,14 @@ "Bitte prüfen Sie auf https://filezilla-project.org/probe.php, ob der Server " "läuft und prüfen Sie nochmals sorgfältig Ihre Einstellungen." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Bitte prüfen Sie die erteilten Berechtigungen und fügen Sie fehlende lokale " +"Verzeichnisse mit denen Sie arbeiten im folgenden Dialog hinzu." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5757,13 +6189,13 @@ "Bitte konfigurieren Sie Ihre Router und Firewalls so, dass FileZilla " "ausgehende Verbindungen zu beliebigen Ports aufbauen kann." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Bitte deaktivieren Sie Einstellungen wie 'DMZ mode' oder 'Game mode' Ihres " "Routers." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5779,7 +6211,7 @@ msgid "Please enter a custom time format." msgstr "Bitte geben Sie ein benutzerdefiniertes Zeitformat ein." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" @@ -5787,7 +6219,7 @@ "ein." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5798,16 +6230,16 @@ msgid "Please enter a name for the new filter." msgstr "Bitte geben Sie einen Namen für den neuen Filter an." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Bitte geben Sie einen neuen Namen für den kopierten Filter an." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Bitte geben Sie einen neuen Namen für den Filtersatz \"%s\" an" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Bitte geben Sie einen neuen Namen für den Filter an." @@ -5834,21 +6266,10 @@ "Bitte geben Sie eine Zahl zwischen 1 und 10 für die Anzahl gleichzeitiger " "Übertragungen ein." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Bitte geben Sie ein Passwort für diesen Server ein:" -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Bitte tragen Sie einen Pfad und eine Exe-Datei ein, welche aufgerufen werden " -"soll.\n" -"Beispiel: c:\\Pfad\\Datei.exe unter MS Windows oder /Pfad/Datei unter Unix.\n" -"Sie können auch zusätzliche Argumente für den Programmaufruf angeben." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5856,32 +6277,32 @@ "Bitte geben Sie ein Timeout zwischen 10 und 9999 Sekunden an, oder 0, um " "Timeouts zu deaktivieren." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Bitte geben Sie einen eindeutigen Namen für diesen Filtersatz an." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Bitte geben Sie einen Benutzernamen für diesen Server ein:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Bitte geben Sie einen gültigen Port-Bereich an." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "" "Bitte geben Sie die URL an, von der Ihre externe Adresse bezogen werden soll" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Bitte tragen Sie für die Begrenzung der Uploadgeschwindigkeit einen Wert " "größer oder gleich 0 %s/s ein." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5889,28 +6310,50 @@ "Bitte geben Sie einen FTP-Befehl ein.\n" "Die Benutzung eigener FTP-Befehle leert den Verzeichniscache." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Bitte tragen Sie den vollständigen Pfad eines Programms und dessen Argumente " +"ein. Dieser Befehl wird ausgeführt, wenn die Warteschlange " +"abgearbeitetwurde.\n" +"Beispiel: c:\\Pfad\\Datei.exe unter MS Windows oder /Pfad/Datei unter Unix.\n" +"Sie müssen Befehle und ihre Argumente korrekt in Anführungszeichen " +"einschließen falls sie Leerzeichen enthalten." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Bitte geben Sie den Namen des zu erstellenden Verzeichnisses ein:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "Bitte geben Sie den Namen der zu erstellenden Datei ein:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "" "Bitte geben Sie einen Benutzernamen und ein Passwort für diesen Server ein:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Bitte geben Sie Ihr aktuelles Master-Passwort ein, um die " +"Passworteinstellungen zu ändern." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Bitte geben Sie Ihre externe IP-Adresse ein" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5921,6 +6364,13 @@ "Sie die externe Adresse nicht wissen, benutzen Sie bitte die Option 'Externe " "Auflösung'." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Bitte geben Sie Ihr Master-Passwort ein, um das Passwort für diesen Server " +"zu entschlüsseln:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5929,7 +6379,7 @@ "Bitte folgen Sie den Anweisungen sorgfältig, da eine falsche Konfiguration " "erfolgreiche FTP-Verbindungen verhindert." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5938,13 +6388,13 @@ "Verbindungen aufzubauen und die Adresse des Adressauflösers korrekt " "eingegeben ist." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Bitte vergewissern Sie sich, dass die gewünschte Sprache auf dem System " "installiert ist." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5969,7 +6419,7 @@ "Software benutzt wird. Sollte dies einen Fehlalarm auslösen, können Sie " "diesen ohne weiteres ignorieren." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5978,7 +6428,7 @@ "Hochladen auf FTP-, FTPS- und FTPES-Server nur funktioniert, wenn diese den " "MFMT-Befehl unterstützen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5986,7 +6436,7 @@ "Bitte beachten Sie, dass manche Server Sie möglicherweise ablehnen, wenn Sie " "sich zu oft oder nach zu kurzer Zeit erneut verbinden möchten." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5996,11 +6446,19 @@ "funktionierenden Servern auf Probleme stoßen, führen Sie bitte diesen " "Assistenten erneut aus." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Bitte speichern Sie diesen Schlüssel an einem sicheren Ort; ohne den " +"richtigen Schlüssel können Sie nicht mehr auf Ihre Dateien zugreifen." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Bitte wählen Sie eine Aktion aus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Bitte wählen Sie die Kategorien aus, welche Sie importieren möchten." @@ -6036,7 +6494,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Bitte wählen Sie die neuen Attribute für die ausgewählten Dateien." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -6051,37 +6509,37 @@ "sogenannten 'DMZ mode' oder 'Game mode'. Dinge wie Protokollprüfungen oder " "protokollspezifische 'Korrekturen' müssen deaktiviert sein." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "&Position des Nachrichtenprotokolls:" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Postleitzahl:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "&Vor dem Herunterladen Speicherplatz vorbelegen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Speicherplatzvorbelegung" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Vordefinierte Server" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Änderungszeitpunkt der Dateien beibehalten" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Vorschau:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Vorschau" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "" "Das Zertifikat der Datenverbindung stimmt nicht mit dem der Hauptverbindung " @@ -6095,15 +6553,15 @@ msgid "Print version information to stdout and exit" msgstr "Versionsinformationen auf stdout ausgeben und verlassen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Bevorzuge Verzeichnisse (Standard)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Priorität" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6111,7 +6569,7 @@ "Datenschutzerklärung: Nur die FileZilla-Version, das verwendete " "Betriebssystem und die CPU-Architektur werden an den Server übermittelt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "&Private Schlüssel:" @@ -6119,31 +6577,31 @@ msgid "Pro&tocol:" msgstr "Pro&tokoll:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Proxy-Pass&wort:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "&Warteschlange abarbeiten" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Überlauf der Prozess-Dateitabelle" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "%s in %s verarbeitet." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Protokoll nicht unterstützt" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Protokoll auf angegebenem Socket-Typ nicht unterstützt" @@ -6151,56 +6609,56 @@ msgid "Protocol:" msgstr "Protokoll:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Proxy-&Port:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Proxy-Ben&utzer:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Proxy-Authentifizierung fehlgeschlagen." -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Proxy-Handshake fehlgeschlagen: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "Proxy-Host fängt mit '[' an, es wurde aber keine schließende Klammer " "gefunden." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Proxy-Antwort: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:520 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Proxy-Anfrage fehlgeschlagen. Antwort des Proxys: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Proxy-Anfrage fehlgeschlagen: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Proxy-Anfrage fehlgeschlagen: Unbekannter Adresstyp in 'CONNECT'-Antwort" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy wurde eingestellt, aber der Proxyserver oder -port ist ungültig" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Public-Key-Authentifizierung" @@ -6208,69 +6666,80 @@ msgid "Public key algorithm:" msgstr "Algorithmus des öffentlichen Schlüssels:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Öffentliche Berechtigungen" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "Warteschlange wurde komplett abgearbeitet" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Warteschlange: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Warteschlange: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Warteschlange: leer" -#: ../../locales/../src/interface/QueueView.cpp:440 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Zu übertragende Dateien" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Warteschlange:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "&System neu starten" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Schnellsuche:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "" +"Die Schnellsuche kann nicht geöffnet werden, wenn Verzeichnisse verglichen " +"werden." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "&System einmal neu starten" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "&Server-Verzeichnisbaum" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "" "A&usgewählte Dateien zurücksetzen und wieder zur Warteschlange hinzufügen" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Raw-FTP-Befehl" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "&Lesen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "A&ktualisieren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "U&mbenennen" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6278,20 +6747,24 @@ "Führen Sie den Assistenten erneut aus, prüfen Sie dabei sorgfältig die " "Einstellungen und stellen Sie alle Router und Firewalls entsprechend ein." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Lese&n" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Schreibgeschützt" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "Lesen aus lokaler Datei fehlgeschlagen" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Aktuelle Operation wirklich abbrechen?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6299,21 +6772,21 @@ msgstr[0] "Wirklich %d Verzeichnis und dessen Inhalt vom Server löschen?" msgstr[1] "Wirklich %d Verzeichnisse und deren Inhalt vom Server löschen?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Wirklich %d Datei vom Server löschen?" msgstr[1] "Wirklich %d Dateien vom Server löschen?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Wirklich %s und %s vom Server löschen?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Möchten Sie wirklich alle ausgewählten Dateien und/oder Verzeichnisse vom " @@ -6325,52 +6798,60 @@ "Möchten Sie wirklich alle ausgewählten Dateien und/oder Verzeichnisse von " "Ihrem Rechner löschen?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Grund" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "Jetzt neustarten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "&Unterverzeichnisse einbeziehen" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "TLS-Warnung vom Server erhalten: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Verzeichnisinhalt empfangen, der EBCDIC-codiert zu sein scheint." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." -msgstr "Zeile mit einer Länge größer als 10000 Zeichen empfangen, Abbruch." +msgstr "Zeile mit einer Länge größer als 10000 Zeichen empfangen; breche ab." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Empfangene Zertifikatskette konnte nicht verifiziert werden. " +"Verifizierungsstatus ist %d." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Empfangene Daten fehlerhaft" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "Ungültiges Zeichen in Versionsinformationen empfangen" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Unbekannte TLS-Warnung %d vom Server erhalten" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "Empfangene Versionsinformationen sind zu groß" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6379,77 +6860,75 @@ "eine Verbindung zu einem Server besteht.\n" "Falls Sie fortsetzen, wird Ihre Verbindung unterbrochen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Wiederverbindungseinstellungen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Stellt Verbindung mit dem zuletzt benutzten Server wieder her" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Füge Dateien rekursiv zur Warteschlange hinzu." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Ändere rekursiv Berechtigungen." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Lösche rekursiv Dateien und Verzeichnisse." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Rot" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Umleitung zu ungültiger oder nicht unterstützter URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Umleitung zu ungültiger oder nicht unterstützter Adresse: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Datei- und Verzeichnislisten aktualisieren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Passwörter speichern?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Server" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Zertifikat des Servers nicht vertrauenswürdig." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Datei auf Server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Dateisuche auf Server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Server-Filter:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Server-Pfad" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6460,7 +6939,7 @@ "unterstützt wird." # TODO -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6470,130 +6949,134 @@ "gültiger absoluter Pfad ist und vom Servertyp (%s) unterstützt wird, der für " "den entsprechenden Server eingestellt ist." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Server-Pfad kann nicht verarbeitet werden. Stellen Sie sicher, dass er ein " "gültiger absoluter Pfad ist." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Server-Pfad konnte nicht geparst werden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" -msgstr "Verarbeiten des Server-Pfads:" +msgstr "Verarbeiten der Server-Pfade:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Server-Pfad:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Server:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "&Alle entfernen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Auswahl &entfernen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Datei umbenennen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Ausgewähltes Verzeichnis umbenennen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Ausgewählte Dateien und Verzeichnisse umbenennen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "'%s' wird in '%s' umbenannt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Passwort wiederholen:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Fehler und Verbesserungswünsche mitteilen" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Anfrage fehlgeschlagen - auf Client läuft kein identd (oder er ist vom " "Server aus nicht erreichbar)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Anfrage fehlgeschlagen - identd des Client konnte die Nutzer-ID-Zeichenkette " "nicht bestätigen" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Anfrage zurückgewiesen oder fehlgeschlagen" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "Explizites FTP über TLS erfordern" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "Implizites FTP über TLS erfordern" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Alle &Dateien zurücksetzen und wieder zur Warteschlange hinzufügen" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Aufgelöstes Protokoll ist unbekannt" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Auflösen der IP-Adresse für %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Ressource vorübergehend nicht verfügbar" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Antwort:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Ergebnisse:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Dateiübertragung fortsetzen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6601,19 +7084,21 @@ "Das Fortsetzen des Downloads von ASCII-Dateien kann Probleme verursachen, " "wenn der Server ein anderes Zeilenumbruchformat verwendet als der Client." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Empfange Verzeichnisinhalt für \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Empfange Verzeichnisinhalt..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Beziehe externe IP-Adresse von %s" @@ -6622,23 +7107,23 @@ msgid "S&how files currently being edited..." msgstr "&Anzeigen der gerade bearbeiteten Dateien..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "&Servermanager bei Programmstart anzeigen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "S&ystem herunterfahren" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "S&ystem einmal herunterfahren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "S&top" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "S&ystem in Standby-Modus versetzen" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "Sys&tem einmal in Standby-Modus versetzen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "S&ynchronisierter Verzeichniswechsel" @@ -6646,93 +7131,114 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "SFTP-Unterstützung" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SO&CKS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4-Proxy wird Verbindung herstellen mit: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 unterstützt keine Nutzernamen oder Passwörter mit mehr als 255 " +"Zeichen." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Passwörter &mit einem Master-Passwort geschützt speichern" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Passwörter &speichern" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Einstellungen speichern?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "" "Das Speichern von Passwörtern wurde von Ihrem Systemadministrator " "deaktiviert." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "Das Speichern von Passwörtern wurde von Ihnen deaktiviert." -#: ../../locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "Suche nach Dateien, die zur Warteschlange hinzugefügt werden sollen" - -#: ../../locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" -msgstr "Suche nach Dateien, die hochgeladen werden sollen" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Skalierungsfaktor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Such&bedingungen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "&Zu durchsuchendes Verzeichnis:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Rekursiv nach Dateien suchen." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Auf Server nach Dateien suchen" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Suchtyp:" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Sicherheitsinformationen" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Siehe auch: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "&Server auswählen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "&Seite auswählen:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Design auswählen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Wählen Sie eine Standardaktion im Umgang mit bereits existierenden Dateien " "aus." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Standardeditor auswählen" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6740,7 +7246,7 @@ "Wählen Sie eine Standardaktion im Umgang mit bereits existierenden Dateien " "aus. Die Auswahl ist nur für diese Sitzung gültig." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6748,139 +7254,143 @@ "Wählen Sie eine Standardaktion im Umgang mit bereits existierenden Dateien " "für die markierten Dateien in der Warteschlange aus." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Datei auswählen, die den privaten Schlüssel enthält" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Wählen Sie die Datei für die exportierten Daten" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Wählen Sie die Datei für die exportierten Filter" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Wählen Sie die Datei für die exportierte Warteschlange" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Wählen Sie die Datei für die exportierten Einstellungen" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "Wählen Sie die Datei für die exportierten Server" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "" "Wählen Sie die Datei, von der die Einstellungen importiert werden sollen." -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Hochzuladende Datei auswählen" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Dateinamen für die konvertierte Schlüsseldatei auswählen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Geben Sie an, wie diese Dateien geöffnet werden sollen." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Zielverzeichnis für Download auswählen" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Zieldateiname auswählen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Wählen Sie die zu exportierenden Kategorien:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Wählen Sie die Einträge, die gelöscht werden sollen:" -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "%d Verzeichnis und dessen Inhalt für Übertragung ausgewählt." msgstr[1] "%d Verzeichnisse und deren Inhalt für Übertragung ausgewählt." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d Verzeichnis ausgewählt." msgstr[1] "%d Verzeichnisse ausgewählt." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "%d Datei für Übertragung ausgewählt." msgstr[1] "%d Dateien für Übertragung ausgewählt." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "%d Datei ausgewählt. Gesamtgröße: %s" msgstr[1] "%d Dateien ausgewählt. Gesamtgröße: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "%d Datei ausgewählt. Gesamtgröße: mindestens %s" msgstr[1] "%d Dateien ausgewählt. Gesamtgröße: mindestens %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s und %s für Übertragung ausgewählt." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "%s und %s ausgewählt. Gesamtgröße: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s und %s ausgewählt. Gesamtgröße: mindestens %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Der gewählte Editor existiert nicht." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Gewählte Datei wird bereits bearbeitet" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Die gewählte Datei ist bereits geladen" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Gewählte Datei ist bereits geöffnet" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Gewählte Datei wird immer noch bearbeitet" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Der ausgewählte Filter funktioniert nur bei lokalen Dateien." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6889,52 +7399,52 @@ "unterschiedlichen Servertyp.\n" "Verwenden Sie serverspezifische Lesezeichen für diesen Server." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "" "Warnung: Der gewählte Port wird üblicherweise von einem anderen Protokoll " "verwendet." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "&FTP-Verbindungserhaltungs-Befehle senden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "" "Benutzerdefinierten Befehl, der sonst nicht verfügbar wäre, an den Server " "schicken." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Sende Verbindungserhaltungs-Befehl" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Seriennummer:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "Server&typ:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Server hat die TLS-Verbindung nicht ordnungsgemäß geschlossen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Der Server unterstützt keine Nicht-ASCII-Zeichen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "" "Der Server unterstützt das Fortsetzen von Downloads nur für Dateigrößen bis " "%d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6943,19 +7453,23 @@ "Der Server unterstützt das Fortsetzen von Downloads nur für Dateigrößen bis " "%d GB. Die Übertragung wird beendet, da die Dateigrößen übereinstimmen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "" "Der Server unterstützt das Fortsetzen von Downloads nur für Dateigrößen bis " "2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "" "Der Server unterstützt das Fortsetzen von Downloads nur für Dateigrößen bis " "4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Server-Schlüssel" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6965,7 +7479,7 @@ "Dateigrößen bis %d GB. Die Übertragung wird beendet, da die Dateigrößen " "übereinstimmen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6973,11 +7487,27 @@ "Der Server benötigt möglicherweise ein Konto. Bitte geben Sie ein Konto im " "Servermanager an." -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:457 +msgid "Server not sending proper line endings" +msgstr "Server schickt keine gültigen Zeilenenden" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" +"Server forderte einen nicht unterstützten Digest-" +"Authentifizierungsalgorithmus: %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "Server forderte nicht unterstützte 'quality-of-protection': %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "Server gab leeren Pfad zurück." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6985,13 +7515,17 @@ "Server sendete eine zusätzliche Login-Aufforderung. Sie müssen den Login-Typ " "'interaktiv' verwenden." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/http/request.cpp:307 +msgid "Server sent data even before request headers were sent" +msgstr "Server sendete Daten bevor Anfrage-Header gesendet wurden" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Vom Server gesendete Adresse für den Passiv-Modus ist nicht routingfähig. " "Passiv-Modus fehlgeschlagen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6999,36 +7533,50 @@ "Vom Server gesendete Adresse für den Passiv-Modus ist nicht routingfähig. " "Benutze stattdessen die Serveradresse." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +msgid "Server sent too much data." +msgstr "Server sendete zu viele Daten." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Server sendete unerwartete Antwort." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Server sendete unter Verletzung der TLS-Spezifikationen eine unsortierte " +"Zertifikatskette" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Server-zu-Client-MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Server-zu-Client-Chiffre:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "Server&typ:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Server/Lokale Datei" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Server:" @@ -7036,49 +7584,54 @@ msgid "Session details" msgstr "Sitzungsdetails" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "&Priorität setzen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" +msgid "Setting permissions of '%s' to '%s'" msgstr "Berechtigungen für '%s' werden auf '%s' gesetzt" -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize ohne Socket aufgerufen" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Einstellungen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Einstellungsverzeichnis:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Bena&chrichtigungsblase anzeigen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "&Unverarbeiteten Verzeichnisinhalt anzeigen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "&Begrüßungsdialog anzeigen..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Beide Verzeichnisbäume anzeigen und Vergleich fortsetzen?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Details anzeigen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Details zu benutzerdefinierten Datums- und Zeitformaten anzeigen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "In &Dateimanager anzeigen" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Zeigt verfügbare TLS-Chiffren an" @@ -7086,7 +7639,7 @@ msgid "Shows this help dialog" msgstr "Zeigt diesen Hilfe-Dialog an" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "Jetzt herunterfahren" @@ -7094,7 +7647,12 @@ msgid "Signature algorithm:" msgstr "Signaturalgorithmus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +# TODO +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Anmeldung" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Server&managereinträge" @@ -7102,56 +7660,61 @@ msgid "Site Manager" msgstr "Servermanager" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "Servermanager - Kann Passwort nicht speichern" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Servermanager - Erzeugter Schlüssel" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "Servermanager - Ungültige Daten" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Servermanager bereits geöffnet" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Servereintrag existiert nicht." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Pfad für Servereintrag muss mit 0 oder 1 beginnen." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Serverpfad ist ungültig." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Serverspezifische Lesezeichen" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7161,11 +7724,11 @@ "gespeichert ist.\n" "Die aktuelle Verbindung in den Servermanager aufnehmen?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "Größe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Größenformatierung" @@ -7173,56 +7736,61 @@ msgid "Size unknown" msgstr "Dateigröße unbekannt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Datei überspringen" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Überspringe Download von %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Überspringe nicht existierende Schlüsseldatei \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Überspringe Upload von %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Socketadresse außerhalb des Adressraums" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Socket bereits verbunden" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Socket wurde geschlossen" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Socket nicht verbunden" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Sockettyp für Adressfamilie nicht unterstützt" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Einige Dateien werden immer noch bearbeitet oder müssen hochgeladen werden." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7230,33 +7798,33 @@ "Falsch konfigurierte Server, die sich hinter einem Router befinden, könnten " "mit ihrer lokalen IP-Adresse antworten." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Verzeichnisse einsortieren" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "" -"Die Sortierreihenfolge kann nicht geändert werden, wenn die Verzeichnisse " +"Die Sortierreihenfolge kann nicht geändert werden, wenn Verzeichnisse " "verglichen werden." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Sortierung" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Sortier&modus:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Quelle und Pfad der Einfügeoperation sind identisch" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Quell- und Zieldateiname dürfen nicht identisch sein" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "Quelle und Ziel der Einfügeoperation sind identisch" @@ -7264,40 +7832,40 @@ msgid "Source file:" msgstr "Quelldatei:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Geschwindigkeitsbegrenzungen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Geschwindigkeitsbegrenzungen" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "" "Geschwindigkeitsbegrenzungen sind deaktiviert; klicken Sie, um dies zu " "ändern." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "" "Geschwindigkeitsbegrenzungen sind aktiviert; klicken Sie, um dies zu ändern." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Stabilen und Beta-Versionen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Stabilen Versionen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Stabile, Beta- und Nightly-Versionen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Übertragung s&ofort starten" @@ -7305,19 +7873,21 @@ msgid "Start with opened Site Manager" msgstr "Mit geöffnetem Servermanager starten" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Update-Prüfung gestartet um %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Starte Download von %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Starte Upload von %s" @@ -7326,30 +7896,38 @@ msgid "Starts the local site in the given path" msgstr "Legt den Startpfad für die lokale Ansicht fest" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Land oder Provinz:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "Status" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Status:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "&Anhalten und alle entfernen" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Rekursive Operation anhalten" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Dezentralisierter Cloudspeicher" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Storj-Unterstützung" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Straße:" @@ -7365,11 +7943,11 @@ msgid "Summary of test results:" msgstr "Zusammenfassung der Testergebnisse:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "Suspend now" msgstr "Jetzt in Standby-Modus gehen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7377,29 +7955,33 @@ "Symbolische Verknüpfungen auf Dateien sind von dieser Wahl nicht betroffen - " "solche Verknüpfungen werden immer gelöscht." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Synchronisierter Verzeichniswechsel" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Synchronisierter Verzeichniswechsel wurde deaktiviert." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Synchronisiere Verzeichnisse." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Syntaxfehler" @@ -7408,44 +7990,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Syntaxfehler in der Kommandozeile" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "System" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Systemdetails" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Systembegrenzung offener Dateien überschritten" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Netzwerk-Subsystem des Systems hat versagt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "&Werkzeugleiste" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "TLS-Verbindung hergestellt, schicke HTTP-Anfrage" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS-Verbindung hergestellt, warte auf Willkommensnachricht..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "TLS-Verbindung hergestellt." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL abgelaufen" @@ -7453,36 +8035,44 @@ msgid "Target file already exists" msgstr "Zieldatei existiert bereits" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Zieldatei:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "Zieldateiname existiert bereits!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "Zieldateiname existiert bereits - trotzdem fortfahren?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Vorübergehender Fehlschlag bei Namensauflösung" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Test erfolgreich abgeschlossen" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Testergebnisse" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Überprüfe, ob der Server das Fortsetzen von Downloads unterstützt." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "&Folgende Dateien werden im Moment bearbeitet:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "" "Der Servermanager kann nicht verwendet werden, bis die Datei repariert wurde." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7493,7 +8083,7 @@ "Wollen Sie fortfahren? Änderungen im Servermanager werden dann nicht " "gespeichert." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7502,29 +8092,37 @@ "geöffnet.\n" "Bitte schließen Sie ihn oder die Daten können nicht gelöscht werden." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Die eingegebene Adresse lautet: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Der 'ai_family'-Member wird nicht unterstützt" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Der 'ai_socktype'-Member wird nicht unterstützt" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Das Lesezeichen konnte nicht hinzugefügt werden." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Die Lesezeichen konnten nicht gelöscht werden." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Das Zertifikat verlangt vom Server, dessen Antwort einen OCSP-Status " +"hinzuzufügen; dieser fehlt jedoch." + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "" "Die Verbindung ist verschlüsselt. Klicken Sie auf das Symbol, um Details " @@ -7548,36 +8146,41 @@ "Das benutzerdefinierte Zeitformat ist ungültig oder enthält nicht " "unterstützte Formatierungszeichen." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Die Datenverbindung konnte nicht hergestellt werden: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Der Standardeditor für Textdateien konnte nicht gefunden werden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Der Standardeditor für Textdateien ist '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "" "Der angegebene Filtername existiert bereits; wählen Sie bitte einen anderen " "Namen." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Die eingegebenen Passwörter unterscheiden sich." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Die Dateiendung '%s' ist bereits in der Liste vorhanden" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7586,8 +8189,9 @@ "Die Datei %s existiert bereits.\n" "Bitte geben Sie einen neuen Namen ein:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7598,7 +8202,7 @@ "Das zugeordnete Programm (%s) konnte nicht gefunden werden.\n" "Bitte überprüfen Sie die Dateitypzuordnungen." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7607,20 +8211,21 @@ "Die Datei '%s' enthält einen SSH1-Schlüssel. Das SSH1-Protokoll ist " "überholt; FileZilla unterstützt nur SSH2-Schlüssel." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" "Die Datei '%s' konnte nicht geladen werden oder enthält keinen privaten " "Schlüssel." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Die Datei '%s' konnte nicht geladen werden." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7629,8 +8234,9 @@ "Die Datei '%s' konnte nicht geöffnet werden:\n" "Auf Ihrem System ist diesem Dateityp kein Programm zugeordnet." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7639,8 +8245,8 @@ "Die Datei '%s' konnte nicht geöffnet werden:\n" "Der damit verbundene Befehl ist fehlgeschlagen" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7652,7 +8258,7 @@ "Datenverlust führen.\n" "Möchten Sie fortfahren?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7665,7 +8271,7 @@ msgid "The file selected as default editor does not exist." msgstr "Die als Standardeditor gewählte Datei existiert nicht." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7679,11 +8285,11 @@ "Benutzername und Passwort importiert werden.\n" "Mit dem Importieren fortfahren?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Die Spalte 'Dateiname' kann weder versteckt noch verschoben werden." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Die Spalte 'Dateiname' kann nicht versteckt werden." @@ -7697,19 +8303,19 @@ msgid "The following characters will be replaced: %s" msgstr "Die folgenden Zeichen werden ersetzt: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Folgende Dateien werden im Moment bearbeitet:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Die freie, quelloffene FTP-Lösung" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Der erzeugte Schlüssel ist:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Die globalen Lesezeichen konnten nicht gespeichert werden." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7723,17 +8329,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Das Limit muss zwischen 1 und 2000 MiB liegen" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Das lokale Verzeichnis '%s' konnte nicht erstellt werden." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Das lokale Verzeichnis '%s' existiert nicht." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7752,26 +8358,31 @@ "Der niedrigste verfügbare Port darf nicht größer sein als der größte " "verfügbare Port." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Das Master-Passwort muss eine Mindestlänge von 8 Zeichen besitzen." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "" "Die neue Version konnte nicht heruntergeladen werden; bitte versuchen Sie es " "später noch einmal." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Die neue Version wurde in Ihr Download-Verzeichnis gespeichert." -#: ../../locales/../src/interface/QueueView.cpp:1823 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." msgstr "Die Warteschlange wird nicht gespeichert werden." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Das Serververzeichnis '%s' existiert nicht." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7782,29 +8393,29 @@ "Synchronisierten Verzeichniswechsel deaktivieren und das Serververzeichnis " "wechseln?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Die ausgewählten Kategorien wurden importiert." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Die ausgewählte Datei enthält importierbare Daten folgender Kategorien:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Die gewählte Datei wird bereits bearbeitet:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Die gewählte Datei ist bereits in einem anderen Programm geöffnet. Bitte " "schließen Sie diese dort." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7814,15 +8425,15 @@ "Dies könnte gefährlich sein und Ihr System beschädigen.\n" "Möchten Sie wirklich fortsetzen?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Der Server konnte nicht hinzugefügt werden." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Der Server sendete eine unerwartete oder nicht erkannte Antwort." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Der Server verwendet folgenden Zeichensatz für Dateinamen:" @@ -7834,7 +8445,7 @@ "Das Zertifikat des Servers ist unbekannt. Bitte überprüfen Sie es " "sorgfältig, um sicherzustellen, dass Sie dem Server vertrauen können." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7845,7 +8456,7 @@ "versuchen eine Verbindung zu einem anderen Computer herzustellen, der " "vorgibt, der gewünschte Server zu sein." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7853,11 +8464,17 @@ "Der Server-Schlüssel ist unbekannt. Daher kann nicht garantiert werden, dass " "der Server wirklich derjenige ist, mit dem Sie sich verbinden wollen." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "" +"Der Hostname des Servers stimmt nicht mit dem Hostnamen des Zertifikats " +"überein" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "Der 'servname'-Parameter wird bei ai_socktype nicht unterstützt" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7865,21 +8482,21 @@ "Die Einstellungen wurden importiert. Sie müssen FileZilla neu starten, damit " "alle Einstellungen wirksam werden." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Die angegebene Adressfamilie wird nicht unterstützt" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Der angegebene Netzwerkname ist nicht länger verfügbar" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." msgstr "" "Das System wird in Kürze neu gestartet, sofern Sie nicht auf Abbrechen " "klicken." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "" "Das System wird in Kürze heruntergefahren, sofern Sie nicht auf Abbrechen " @@ -7893,14 +8510,14 @@ "Die Zieldatei existiert bereits.\n" "Bitte wählen Sie eine Aktion aus." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "" "Der Test war nicht erfolgreich. Wollen Sie diese Einstellungen trotzdem " "speichern?" # TODO: Datensicherungsdatei? -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Die gültige Backup-Datei %s konnte nicht wiederhergestellt werden" @@ -7909,15 +8526,15 @@ msgid "Themes" msgstr "Designs" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Dieser Filtersatz kann nicht entfernt werden." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Dieser Filtersatz kann nicht umbenannt werden." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7941,45 +8558,45 @@ "Dieser Assistent wird Ihnen dabei helfen, eventuell vorhandende Router und " "Firewalls zu konfigurieren und Ihre Konfiguration zu testen." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "Zeitpunkt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Zeitformat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "&Zeitüberschreitung nach" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Zeitüberschreitung" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Zeitzonenabweichung des Servers beträgt %d Sekunden." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Titel:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "" +"Um Verzeichnisse vergleichen zu können, ist es notwendig, die Schnellsuche " +"zu schließen." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" -"Um die Verzeichnisse vergleichen zu können, ist es notwendig, dass die " +"Um Verzeichnisse vergleichen zu können, ist es notwendig, dass die " "Dateilisten entsprechend angeordnet sind." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Zu diesem Zweck müssen beide Verzeichnisbäume angezeigt oder versteckt sein." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7987,7 +8604,7 @@ "Um die Public-Key-Authentifizierung zu unterstützen, muss FileZilla die zu " "verwendenden privaten Schlüssel kennen." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -8004,7 +8621,7 @@ "Grün: Datei ist neuer als die unmarkierte Datei auf der anderen Seite\n" "Rot: Dateigrößen unterschiedlich" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -8014,82 +8631,77 @@ "Falls aktiviert, wird beim Navigieren der lokalen Verzeichnishierarchie auch " "das Verzeichnis auf dem Server entsprechend gewechselt und umgekehrt." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Abarbeiten der Übertragungs-Warteschlange starten/stoppen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Anzeige des lokalen Verzeichnisbaums an-/ausschalten" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Anzeige des Nachrichtenprotokolls an-/ausschalten" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Anzeige des Server-Verzeichnisbaums an-/ausschalten" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Anzeige der Übertragungs-Warteschlange an-/ausschalten" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Too long header line" msgstr "Header zu lang" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Zu viele Adressumleitungen" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Trace:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Übertragen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Übertragungs&richtung" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "Übertragungs&typ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Übertragungsmodus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Übertragungs-Warteschlange" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Übertragungs-Einstellungen" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Übertragungsverbindung unterbrochen: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Übertragene Daten waren fehlerhaft." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Wird übertragen" @@ -8097,27 +8709,27 @@ msgid "Transfers" msgstr "Übertragungen" -#: ../../locales/../src/interface/QueueView.cpp:2929 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "Übertragungen abgeschlossen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "&Dateien ohne Endung als ASCII-Dateien behandeln" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "&Folgende Dateitypen als ASCII-Dateien behandeln:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "Verändertem Serverschlüssel vertrauen:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "Neuem Serverschlüssel vertrauen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Neuem Schlüssel vertrauen und Verbindung herstellen?" @@ -8125,70 +8737,76 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Diesem Zertifikat vertrauen und Verbindung herstellen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Diesem Server vertrauen und Verbindung herstellen?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Nochmals versuchen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Typ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Typ des FTP-Proxys:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Typ des generischen Proxys:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "&Hochladen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Begrenzung der U&ploadgeschwindigkeit:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "&Verwende Dateitypzuordnungen falls verfügbar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "Standa&rdeinstellung des Systems für aktuelle Sprache verwenden" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "&BENUTZER@SERVER" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Nicht zugewiesener Fehlercode %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Element:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Unbekannt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Unbekannter FTP-Proxy-Typ. Es kann keine Anmeldesequenz erstellt werden." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Unbekannte Version des SOCKS-Protokolls: %d" @@ -8197,11 +8815,22 @@ msgid "Unknown certificate" msgstr "Unbekanntes Zertifikat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Unbekannter Fehler %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Unbekannter Fehler %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Unbekannter Server-Schlüssel" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8210,15 +8839,19 @@ "Unbekannte Version des Protokolls für die SOCKS-Benutzernamen/Passwort-" "Authentifizierungs-Unterverhandlung: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Unbekanntes Wurzelelement; die Datei scheint nicht von FileZilla erzeugt " "worden zu sein." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:572 +msgid "Unknown transfer encoding" +msgstr "Unbekannte Übertragungscodierung" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8226,7 +8859,7 @@ "Solange diese Probleme nicht gelöst sind, funktioniert der aktive Modus " "nicht. Stattdessen muss der passive Modus verwendet werden." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8234,15 +8867,15 @@ "Solange dieses Problem nicht gelöst ist, funktioniert der Aktive Modus " "nicht. Stattdessen muss der Passive Modus verwendet werden." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Nicht unterstützter Zertifikatstyp" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Diese Art der Adressumleitung wird nicht unterstützt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "H&ochladen und Bearbeiten beenden" @@ -8251,96 +8884,105 @@ msgid "Updates" msgstr "Updates" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Hochladen" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Upload fehlgeschlagen" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "Upload-Begrenzung: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Upload-Begrenzung: keine" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Suchergebnisse hochladen" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Ausgewähltes Verzeichnis hochladen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Ausgewählte Dateien und Verzeichnisse hochladen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Soll diese Datei zurück zum Server hochgeladen werden?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Soll diese Datei zum Server hochgeladen werden?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Hochladen" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Hochladen und anstehendes Entfernen" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Hochladen und Bearbeiten beenden" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "&Benutzerdefinierten Zeichensatz verwenden" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "B&enutzerdefinierten Editor verwenden:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "&Standardeditor für Textdateien verwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "S&ynchronisierten Verzeichniswechsel verwenden" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Reguläre Ausdrücke verwenden" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Benutze UTF-8, wenn der Server dies unterstützt. Ansonsten benutze lokalen " "Zeichensatz." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Standardaktion verwenden" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "Wenn verfügbar, explizites FTP über TLS verwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Server der aktuellen Verbindung verwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Server aus Servermanager verwenden" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "Stan&dardeinstellung des Systems für aktuelle Sprache verwenden" @@ -8357,7 +8999,7 @@ msgstr "Benutze stattdessen die externe IP-Adresse des Servers" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8375,16 +9017,17 @@ "erstmals den aktiven Modus benutzen. Dabei wird die Versionsnummer von " "FileZilla an den Server übermittelt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Benutzer:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "Benutzername kann nicht nur aus Leerzeichen bestehen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8403,52 +9046,48 @@ msgid "Verbose log messages from wxWidgets" msgstr "Ausführliche wxWidgets-Logmeldungen" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Überprüfe Zertifikat..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Sehr hoch" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" "Anzeige versteckter Dateien aktiviert, aber vom Server nicht unterstützt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Ansehen/Bearbeiten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Sichtbare Spalten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "S&chreiben" -#: ../../locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "Warte" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Warten auf Browsing-Verbindung" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Warten auf Passworteingabe" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Warte auf Abbruch der Übertragung" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Nächsten Versuch abwarten..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Warnung, eine Datenverbindung von einer falschen IP wird ignoriert." @@ -8467,23 +9106,23 @@ "\n" "Wollen Sie wirklich nach Nightly Builds suchen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Warnung: Mögliche Sicherheitslücke!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Willkommen bei FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Neuerungen" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Neuerungen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8492,7 +9131,7 @@ "Verbindungen auch nach dem Neustarten von FileZilla ohne erneute " "Passworteingabe wiederherstellen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8500,36 +9139,54 @@ "Wenn aktiviert, werden Zeichen, die vom lokalen Betriebssystem in Dateinamen " "nicht unterstützt werden, beim Download ersetzt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "&Beim Herstellen einer neuen Verbindung bei bestehender Verbindung:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Breitbild" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Soll FileZilla Passwörter speichern?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Sc&hreiben" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Falsche externe IP-Adresse" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:644 msgid "Wrong line endings" msgstr "Falsche Zeilenenden" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Falsches Master-Passwort eingegeben; es kann nicht verwendet werden, um die " +"gespeicherten Passwörter zu entschlüsseln." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Falsches Master-Passwort eingegeben; es kann nicht verwendet werden, um " +"diesen Eintrag zu entschlüsseln." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Gelb" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Ja" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8537,33 +9194,41 @@ "Sie verwenden anscheinend einen Nur-IPv6-Host. Diese Umgebung wird von " "diesem Assistenten nicht unterstützt." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Sie verwenden die aktuelle FileZilla-Version." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Sie können diesen Dialog auch über das Hilfe-Menü öffnen." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "" "Sie können die aktuelle Version von der FileZilla-Website herunterladen:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" "Sie können das Port-Feld leer lassen, um den Standard-Port zu verwenden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "" "Verwenden Sie ein 'x', um die ursprünglichen Berechtigungen beizubehalten." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Sie können Passwort und Schlüssel nicht unabhängig voneinander ändern, wenn " +"Sie ein Master-Passwort verwenden." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Sie können keine Einstellungen aus dem Verzeichnis importieren, in dem " @@ -8577,18 +9242,22 @@ "Ein ungültiges Zeichen kann nicht durch ein anderes ungültiges Zeichen " "ersetzt werden. Bitte geben Sie ein in Dateinamen erlaubtes Zeichen ein." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Sie können in das Wurzelverzeichnis keine Dateien hochladen." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "Sie haben keinen neuen Namen für die Datei angegeben. Die Datei stattdessen " "überschreiben?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Sie haben mindestens eine symbolische Verknüpfung ausgewählt." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8596,7 +9265,8 @@ "Sie haben mehr als 10 Dateien zum Bearbeiten ausgewählt; möchten Sie " "wirklich fortfahren?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8604,39 +9274,47 @@ "Sie haben mehr als 10 Dateien oder Verzeichnisse zum Öffnen ausgewählt; " "möchten Sie wirklich fortfahren?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." msgstr "Sie müssen einen Servernamen angeben." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" msgstr "Sie müssen einen Schlüsseldatei-Pfad angeben" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Sie müssen ein lokales Verzeichnis angeben." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Sie müssen ein Server-Verzeichnis angeben." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Sie müssen eine gültige IPv4-Adresse eingeben." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Sie müssen einen gültigen Schlüssel angeben." + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Sie müssen ein beschreibbares lokales Verzeichnis angeben." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "Sie müssen einen Kontonamen angeben." -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "Sie müssen einen Benutzernamen angeben" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8644,7 +9322,11 @@ "Es ist wahrscheinlich, dass Sie einen Router oder eine Firewall verwenden, " "die irrtümlicherweise die übertragenen Daten verändert hat." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Sie müssen ein Master-Passwort angeben." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Sie müssen einen Namen für das Lesezeichen angeben." @@ -8652,7 +9334,7 @@ msgid "You need to enter a name for the log file." msgstr "Sie müssen einen Namen für die Logdatei angeben." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "" "Sie müssen einen korrekt mit Anführungszeichen versehenen Befehl eingeben." @@ -8666,17 +9348,17 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Sie müssen einen Proxy-Port im Bereich von 1 bis 65535 angeben" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Sie müssen mindestens einen Pfad angeben; leere Lesezeichen werden nicht " "unterstützt." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8684,7 +9366,7 @@ "Sie müssen sowohl einen lokalen Pfad als auch einen Serverpfad angeben, um " "den synchronisierten Verzeichniswechsel für dieses Lesezeichen zu aktivieren." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8692,23 +9374,31 @@ "Sie müssen sowohl einen lokalen Pfad als auch einen Serverpfad angeben, um " "den synchronisierten Verzeichniswechsel für diesen Server zu aktivieren." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Sie müssen FileZilla Zugriff auf die Verzeichnisse gewähren, in die Sie " +"Dateien herunterladen bzw. aus denen Sie Dateien hochladen möchten." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Sie müssen eine lokale Datei angeben." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Sie müssen eine Datei auf dem Server angeben." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Sie müssen einen Server-Pfad angeben." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Sie müssen einen Server angeben." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8716,68 +9406,68 @@ "Sie sollten keine Probleme haben, eine Verbindung zu anderen Servern " "herzustellen, Dateiübertragungen sollten richtig funktionieren." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2775 msgid "Your computer will suspend unless you click Cancel." msgstr "" "Das System wird in den Standby-Modus versetzt, sofern Sie nicht auf " "Abbrechen klicken." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "nach" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "vor" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "beginnt mit" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "Bytes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "enthält" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "benutzerdefiniert" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "enthält nicht" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "ist nicht gleich" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "hört auf mit" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "ist gleich" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "Datei" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-Sperrdatei" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8787,93 +9477,118 @@ "Bitte stellen Sie sicher, dass sich diese ausführbare Datei im gleichen " "Verzeichnis wie das FileZilla-Hauptprogramm befindet." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp gehört zu einer anderen FileZilla-Version" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "fzsftp konnte nicht gestartet werden" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj gehört zu einer anderen FileZilla-Version" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj konnte nicht gestartet werden" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj konnte nicht gestartet werden.\n" +"Bitte stellen Sie sicher, dass sich diese ausführbare Datei im gleichen " +"Verzeichnis wie das FileZilla-Hauptprogramm befindet." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers gab keine Zertifikate zurück" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 fehlgeschlagen" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "größer als" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "'Gruppe: ausführbar'" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "'Gruppe: lesbar'" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "'Gruppe: beschreibbar'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "ist gleich" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "ist gesetzt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "ist nicht gesetzt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "kleiner als" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "entspricht regulärem Ausdruck" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "Neuer Name" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "'Besitzer: ausführbar'" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "'Besitzer: lesbar'" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "'Besitzer: beschreibbar'" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "unbekannt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "'Andere: ausführbar'" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "'Andere: lesbar'" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "'Andere: beschreibbar'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" - -#~ msgid "Empty dirs to visit" -#~ msgstr "Leere Verzeichnisse zu besuchen" diff -Nru filezilla-3.15.0.2/locales/el.po filezilla-3.33.0/locales/el.po --- filezilla-3.15.0.2/locales/el.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/el.po 2017-10-30 17:26:35.000000000 +0000 @@ -5,244 +5,249 @@ # msgid "" msgstr "" -"Project-Id-Version: FileZilla Client 3.15.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-23 18:33+0100\n" -"PO-Revision-Date: 2016-01-21 15:21+0200\n" +"Project-Id-Version: FileZilla Client 3.28.0\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-10-30 18:09+0100\n" +"PO-Revision-Date: 2017-10-18 09:53+0300\n" "Last-Translator: Ydatografida \n" -"Language-Team: Stamatis H. Stamatellos \n" +"Language-Team: Stamatis I. Stamatellos \n" "Language: el_GR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.4\n" +"X-Generator: Poedit 2.0.4\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S πέρασαν" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S απομένουν" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" msgstr "" -"%a - Λογαριασμός (οι γραμμές που περιέχονται σ' αυτόν θα παραλειφθούν εάν δε " -"χρησιμοποιούνται ως τύπος εισόδου στον λογαριασμό)" +"%a - Λογαριασμός (οι γραμμές που περιέχονται σ' αυτόν θα παραλειφθούν εάν " +"δεν χρησιμοποιούνται ως τύπος εισόδου στον λογαριασμό)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d φάκελος" msgstr[1] "%d φάκελοι" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1425 +#: ../../locales/../src/interface/search.cpp:854 +#: ../../locales/../src/interface/search.cpp:1239 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "ο φάκελος %d καθώς και τα περιεχόμενα του" msgstr[1] "οι φάκελοι %d καθώς και τα περιεχόμενα τους" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:853 +#: ../../locales/../src/interface/search.cpp:1238 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d αρχείο" msgstr[1] "%d αρχεία" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d αρχείο. Συνολικό μέγεθος: %s" msgstr[1] "%d αρχεία. Συνολικό μέγεθος: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d αρχείο. Συνολικό μέγεθος: Τουλάχιστον %s" msgstr[1] "%d αρχεία. Συνολικό μέγεθος: Τουλάχιστον %s" -#: ../../locales/../src/interface/QueueView.cpp:2778 -#, c-format -msgid "%d files added to queue" -msgstr "%d αρχεία προστέθηκαν στη λίστα αναμονής" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d δευτερόλεπτο" msgstr[1] "%d δευτερόλεπτα" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Κόμβος" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu κατάλογος" msgstr[1] "%llu κατάλογοι" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu αρχείο" msgstr[1] "%llu αρχεία" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Κωδικός πρόσβασης" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Το πιστοποιητικό έλυξε!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Δεν είναι ακόμα έγκυρο!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Διαμεσολαβητής χρήστη" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s και %s. Συνολικό μέγεθος: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s και %s. Συνολικό μέγεθος: Τουλάχιστον %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s bytes" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:629 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s δε βρέθηκε. Χωρίς αυτό το συστατικό του FileZilla, το SFTP δε θα " +"%s δε βρέθηκε. Χωρίς αυτό το συστατικό του FileZilla, το %s δε θα " "λειτουργήσει.\n" "\n" "Παρακαλώ, κάντε ξανά λήψη του FileZilla. Εάν το πρόβλημα παραμένει να " "αποστείλετε αναφορά σφάλματος." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:719 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s δε βρέθηκε. Χωρίς αυτό το στοιχείο του FileZilla, τo SFTP δε λειτουργεί.\n" +"%s δεν βρέθηκε. Χωρίς αυτό το στοιχείο του FileZilla, το %s δεν λειτουργεί.\n" "\n" "Πιθανές λύσεις:\n" "- Σιγουρευτείτε ότι το %s είναι στη λίστα φακέλου της μεταβλητής PATH.\n" -"- Ορίστε τη πλήρη διαδρομή για το %s στη μεταβλητή FZ_FZSFTP." +"- Ορίστε τη πλήρη διαδρομή για το %s στη μεταβλητή %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s με %d bits" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:164 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "" +"%s:%d - Το όνομα του διακομιστή δεν ταιριάζει με το πιστοποιημένο όνομα" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Όνομα χρήστη" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Κωδικός πρόσβασης διαμεσολαβητή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "&Διακοπή της προηγούμενης σύνδεσης και συνδέση στην τρέχουσα καρτέλα" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "&Μνεία..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Λογαριασμός:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Ενεργητική" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "&Προσθήκη σελιδοδείκτη..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Προσθήκη φακέλου..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Προσθήκη αρχείων στη λίστα αναμονής" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Προσθήκη Αρχείου Κλειδιού..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Προσθήκη στη λίστα αναμονής" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Ρύθμιση της απόκλισης χρονικής ζώνης του εξυπηρετητή:" @@ -250,72 +255,77 @@ msgid "&Always trust certificate in future sessions." msgstr "&Πάντα να εμπιστέυεσαι τα πιστοποιητικά στις μελλοντικές συνεδρίες." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "" "&Πάντα να εμπιστεύεσαι αυτό τον κόμβο, πρόσθεσε αυτό το κλειδί στην μνήμη" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Χρήση πάντα του προκαθορισμένου επεξεργαστή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Πάντα κατόπιν επιλογής για όλα τα μη συσχετιζόμενα αρχεία" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Να γίνεται πάντα χρήση αυτής της ενέργειας" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Ερώτηση στο λειτουργικό σας σύστημα για την εξωτερική διεύθυνση IP" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Αυτόματος" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Αυτόματος εντοπισμός" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Χρώμα Παρασκηνίου:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Δυαδικός" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Σύμβολα SI στα δυαδικά προθέματα. (π.χ. 1 KB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "&Σελιδοδείκτες" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Περιήγηση..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "Ανοχή &φορτίου:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Άκυρο" @@ -327,19 +337,23 @@ msgid "&Close" msgstr "&Τερματισμός" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&Κλείσιμο του FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Κλείσιμο του FileZilla μία φορά" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:657 msgid "&Configure speed limits..." msgstr "&Ρύθμιση ορίων ταχυτήτας..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "&Ρύθμιση..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Σύνδεση" @@ -347,156 +361,152 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Αντιγραφή τρέχουσας σύνδεσης στο διαχειριστή τοποθεσιών..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "&Αντιγραφή στο πρόχειρο" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Δημιουργία φακέλου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:637 msgid "&Create new tab" msgstr "&Δημιουργία νέας καρτέλας" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Αποσφαλμάτωση" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "&Πληροφορίες αποσφαλμάτωσης στο αρχείο συμβάντων:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "&Προκαθορισμένος επεξεργαστής:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "&Προεπιλογή ενέργειας υπάρχοντος αρχείου..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Καθυστέρηση μεταξύ αποτυχημένων προσπαθειών σύνδεσης:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Διαγραφή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Διαγραφή συμβολικής σύνδεσης" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "Αδειοδοτήσεις πρόσβασης καταλόγου..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "&Σύγκριση φακέλων" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "απομακρυσμένου φακέλου" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "απομακρυσμένου φακέλου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "" "&Απόρριψη τοπικού αρχείου κατόπιν της εκ νέου λήψης και επεξεργασίας του." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "&Αποσύνδεση" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Αποσύνδεση από τον εξυπηρετητή" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "" "&Προβολή της στιγμιαίας ταχύτητας μεταφοράς αντί για της μέσης ταχύτητας" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Εμφάνιση του μεγέθους σε bytes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "&Να μην απομνημονεύει κωδικούς (συνιστάται)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Να μην εμφανιστεί ξανά αυτό το παράθυρο." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "&Να μη γίνεται χρήση εξωτερικής διεύθυνσης IP στις τοπικές συνδέσεις." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "&Διπλό-κλικ ως ενέργεια στα αρχεία:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Λήψη" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Λήψη στο:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Λήψη..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Ληφθέντα:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Επεξεργασία" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "&Επεξεργασία κανόνων φίλτρου..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:653 msgid "&Enable" msgstr "&Ενεργοποίηση" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Ενεργοποίηση συμπίεσης" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Ενεργοποίηση ορίων ταχύτητας" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Κωδικοποίηση:" @@ -504,28 +514,28 @@ msgid "&Encryption:" msgstr "&Κρυπτογράφηση:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "&Εισαγωγή προσαρμοσμένης εντολής..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "Ε&δραίωση σύνδεσης σε νέα καρτέλα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Εκτέλεση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Εξαγωγή των εγγραφών από το διαχειριστή τοποθεσιών" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Εξαγωγή..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Επιστροφή σε ενεργητική κατάσταση" @@ -533,91 +543,103 @@ msgid "&File" msgstr "&Αρχείο" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "&Ιδιότητες αρχείου..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "&Δικαιώματα αρχείου..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Αρχείο:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Όροι φίλτρου:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Oρίσματα φίλτρου:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Φίλτρα" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Φίλτρα:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Ολοκλήρωση επεξεργασίας και διαγραφή τοπικού αρχείου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Ισοπέδωση τοπικών διαδρομών, αποστολή όλων των αρχείων απευθείας στον " +"κατάλογο προορισμού" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" "&Ισοπέδωση των απομακρυσμένων διαδρομών, λήψη απευθείας στο φάκελο προορισμού" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "" "&Η ακόλουθη συμβολική σύνδεση, διαγράφει τα περιεχόμενα του φακέλου " "προορισμού" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Λήψη εξωτερικής διεύθυνσης IP από την ακόλουθη URL:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Λήψη βοήθειας..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Καθολικός σελιδοδείκτης" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 μέθοδος σύνδεσης" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&Βοήθεια" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Απόκρυψη ομοιότυπων αρχείων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&Μέγιστη" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Μέγιστη διαθέσιμη θύρα:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Κόμβος:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC δυαδικά προθέματα (π.χ. 1 KiB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (παράδειγμα: 2007-09-15)" @@ -625,88 +647,96 @@ msgid "&Import..." msgstr "&Εισαγωγή..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "&Οικειοποίηση των συσχετίσεων από το σύστημα" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Εγκαταστήστε νέα έκδοση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Διατήρηση δομής της τοπικής διαδρομής σε σχέση με τη ρίζα αναζήτησης" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "&Διατήρηση δομής της απομακρυσμένης διαδρομής" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "Αρχείο &Κλειδί:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Διάταξη αρχείων και πλαίσια φακέλων:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Όριο στις τοπικές θύρες που χρησιμοποιούνται από το FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Όριο στον αριθμό των συνεχόμενων συνδέσεων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "&Δομή τοπικών φακέλων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Τοπικός φάκελος:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "Αναζήτηση &τοπικά" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Συμβάντα στο αρχείο" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "&Τύπος σύνδεσης:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "&Τύπος σύνδεσης:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Χαμηλή" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "&Διαχειριστής σελιδοδεικτών..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "&Χειροκίνητη μεταφορά..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Μέγιστος αριθμός συνδέσεων:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Μέγιστος αριθμός προσπαθειών:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "&Αρχείο συμβάντων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Ελαχιστοποίηση στην περιοχή ειδοποιήσεων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "&Όνομα λειτουργίας ταξινόμησης:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Όνομα:" @@ -714,7 +744,7 @@ msgid "&Network configuration wizard..." msgstr "&Οδηγός ρύθμισης δικτύου..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Νέο" @@ -722,7 +752,7 @@ msgid "&New Site" msgstr "&Νέα τοποθεσία" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1765 msgid "&New version available!" msgstr "&Διαθέσιμη νέα έκδοση!" @@ -730,155 +760,166 @@ msgid "&Next >" msgstr "&Επόμενο >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Όχι" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Τίποτα" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Τυπικός" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Αριθμητική τιμή:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&ΑΝΟΙΓΜΑ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Άνοιγμα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Αντικατάσταση" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Παθητική" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Κωδικός πρόσβασης:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "&Αναπαραγωγή ήχου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Θύρα:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Διατήρηση των χρονικών σφραγίδων στα αρχεία που μεταφέρθηκαν" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Λίστα αναμονής" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Γρήγορη σύνδεση" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "&Γραμμή γρήγορης σύνδεσης" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "&Ιστορικό Γρήγορης Σύνδεσης" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Ανάγνωση" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "&Επανασύνδεση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "Πληροφορίες &Επανασύνδεσης" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:648 msgid "&Refresh" msgstr "&Ανανέωση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Διατήρηση κωδικού μέχρι το FileZilla να τερματίσει την λειτουργία του" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "" "&Απομνημόνευση κωδικού μέχρι το FileZilla να τερματίσει την λειτουργία του" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "&Απομνημόνευση κωδικών πρόσβασης" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Απομακρυσμένος φάκελος:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Απομακρυσμένη διαδρομή:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Απομακρυσμένη αναζήτηση" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Αφαίρεση" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Αφαίρεση κλειδιού" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "&Διαγραφή επιλεγμένου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Μετονομασία" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Μετονομασία..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Επανάληψη ανοίγματος τοπικού αρχείου" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Αντικατάσταση των μη έγκυρων χαρακτήρων με:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "&Αναφορά σφάλματος..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Αίτηση προσοχής" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "&Επαναφορά και επανατοποθέτηση όλων" @@ -886,39 +927,39 @@ msgid "&Restart Wizard" msgstr "&Επανεκκίνηση οδηγού" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Συνέχιση" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "&Εκτέλεση εντολής..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Εκτέλεση οδηγού ρύθμισης τώρα..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Εκτέλεση ελέγχου αναβαθμίσεων τώρα..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&ΤΟΠΟΘΕΣΙΑ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Αποθήκευση ως..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Αναζήτηση" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Αναζήτηση απομακρυσμένων αρχείων..." @@ -926,20 +967,20 @@ msgid "&Select Entry:" msgstr "&Επιλογή εγγραφής:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Επιλογή γλώσσας:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Επιλέξτε τις στήλες που θα εμφανίζονται:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Εξυπηρετητής" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Ρυθμίσεις" @@ -947,23 +988,19 @@ msgid "&Settings..." msgstr "&Ρυθμίσεις..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Εμφάνιση του μενού αποσφαλμάτωσης" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "Εμφάνιση αναλυτικού αρχείου καταγραφής" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Εμφάνιση μηνύματος" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Ενεργοποίηση καταγραφής ώρας στο αρχείο συμβάντων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Εγγραφές &Διαχειριστή Τοποθεσιών" @@ -971,162 +1008,176 @@ msgid "&Site Manager..." msgstr "&Διαχειριστής τοποθεσιών..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "&Ειδικός σελιδοδείκτης" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Παράκαμψη" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "&Όρια ταχυτήτων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Επείγουσα &έναρξη μεταφοράς" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Εναλλαγή τοπικών και απομακρυσμένων πλαισίων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "&TLS Αλγόριθμοι Κρυπτογράφησης" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Δοκιμή" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Θέμα:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Μεταφορά" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "&Κατάσταση μεταφοράς:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "&Λίστα αναμονής" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "&Χειρισμός των παρακάτω τύπων αρχείων ως ASCII αρχεία" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Αναίρεση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Ανανέωση του αποθηκευμένου κλειδιού γι' αυτόν το κόμβο" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Αποστολή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Αποστολή:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Αποστολή..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Απεσταλμένα:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Χρήση προσαρμοσμένης εφαρμογής" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Χρήση συγχρονισμένης περιήγησης" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Χρήση του προκαθορισμένου από το σύστημα επεξεργαστή αρχείων κειμένων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Χρησή της ακόλουθης διεύθυνσης IP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "" "&Να γίνεται χρήση της εξωτερικής διεύθυνσης IP του εξυπηρετητή αντ' αυτής" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Χρήση διαχωριστικού χιλιάδων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Χρήστης:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Όνομα χρήστη:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1759 #, c-format msgid "&Version %s" msgstr "&Έκδοση %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Προβολή" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Προβολή/Επεξεργασία" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Προβολή των τροποποιημένων τοπικών αρχείων και υπόμνηση για την αποστολή " "των τροποποιήσεων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "Κατά τον έλεγχο ενημερώσεων, ελέγξτε:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Εγγραφή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Ναι" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' δεν υπάρχει ή δεν είναι προσβάσιμο." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' δεν είναι φάκελος." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' δεν είναι ένα υποστηριζόμενο πρωτόκολλο." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 msgid "'Account' logontype not supported by selected protocol" msgstr "" "Ο τύπος σύνδεσης 'Λογαριασμός ' δεν υποστηρίζεται από το επιλεγμένο " "πρωτόκολλο" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1134,7 +1185,7 @@ "Οι τύποι σύνδεσης 'Τυπικός' και 'Λογαριασμός' δεν είναι διαθέσιμοι, αντ " "'αυτών χρησιμοποιήστε ερώτημα 'Να ζητηθεί κωδικός πρόσβασης'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1142,7 +1193,7 @@ "Οι τύποι σύνδεσης 'Τυπικός' και 'Λογαριασμός' δεν είναι διαθέσιμοι. Η " "καταχώρησή σας έχει αλλάξει σε 'Να ζητηθεί κωδικός πρόσβασης'." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:642 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1152,58 +1203,58 @@ "να στείλουν τις ακόλουθες παραμέτρους 'quote' στον εξυπηρετητή. Μπορεί να " "θέλετε να καταχωρίσετε μία ακατέργαστη εντολή χωρίς τα 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d αντικείμενο που φιλτραρίστηκε)" msgstr[1] "(%d αντικείμενα που φιλτραρίστηκαν)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% λήφθηκαν)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(χωρίς όριο το 0)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 δευτερόλεπτα)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 για απενεργοποίηση)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat έχει οριστεί σε %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(παράδειγμα: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(παράδειγμα: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(σε %s/s)" @@ -1212,7 +1263,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- απομένουν" @@ -1226,37 +1277,37 @@ #: ../../locales/../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." -msgstr "το -s και το -c δε μπορούν να είναι συγχρόνως παρών." +msgstr "το -s και το -c δεν μπορούν να είναι συγχρόνως παρών." #: ../../locales/../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." msgstr "το -s δεν μπορεί να χρησιμοποιηθεί συγχρόνως με μία διεύθυνση FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Καμία" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Προειδοποιήσεις" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Πληροφορίες" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Αναλυτικές" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "Σύστημα 32 bit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Αποσφαλματώσεις" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "Σύστημα 64 bit" @@ -1264,25 +1315,31 @@ msgid "< &Back" msgstr "< &Προηγούμενο" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr ";" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Το όνομα σελιδοδείκτη υπάρχει ήδη. Παρακαλώ, καταχωρίστε ένα νέο όνομα." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Για την υπογραφή ενός πιστοποιητικού χρησιμοποιήθηκε ένας ανασφαλής " +"αλγόριθμος" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Πρέπει να οριστεί ένας προκαθοριμένος επεξεργαστής." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:164 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." -msgstr "Ο φάκελος δε μπορεί να συρθεί μέσα σε έναν από τους υποφακέλους του." +msgstr "Ο φάκελος δεν μπορεί να συρθεί μέσα σε έναν από τους υποφακέλους του." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" @@ -1295,22 +1352,22 @@ "ενεργητική κατάσταση, το FileZilla ανοίγει μια θύρα και ζητά από τον " "εξυπηρετητή να συνδεθεί σε αυτή." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Το αρχείο που ανοίχτηκε νωρίτερα έχει αλλάξει." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Ένα αρχείο με αυτό το όνομα έχει ήδη μεταφερθεί." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Ένα αρχείο με αυτό το όνομα ακόμα επεξεργάζεται. Παρακαλώ, κλείστε το και " "προσπαθήστε ξανά." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:595 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1318,17 +1375,26 @@ "Unless you fix this problem, files might be missing in the file listings.\n" "No further warning will be displayed this session." msgstr "" -"Ένα τοπικό όνομα δε μπόρεσε να αποκωδικοποιηθεί.\n" +"Ένα τοπικό όνομα δεν μπόρεσε να αποκωδικοποιηθεί.\n" "Παρακαλώ, ελέγξτε αν η μεταβλητή περιβάλλοντος LC_CTYPE (ή LC_ALL) έχει " "οριστεί σωστά.\n" -"Αν δε διορθωθεί το πρόβλημα, πιθανόν να λείπουν αρχεία από τις λίστες.\n" -"Καμία άλλη προειδοποίηση δε θα εμφανιστεί σε αυτή τη σύνοδο." +"Αν δεν διορθωθεί το πρόβλημα, πιθανόν να λείπουν αρχεία από τις λίστες.\n" +"Καμία άλλη προειδοποίηση δεν θα εμφανιστεί σε αυτή τη σύνοδο." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Ένας χαμένος κύριος κωδικός πρόσβασης δεν μπορεί να ανακτηθεί! Σας " +"παρακαλούμε να απομνημονεύσετε τον κωδικό σας." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Μία νέα έκδοση του FileZilla είναι διαθέσιμη:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1338,7 +1404,7 @@ "Χρησιμοποιήστε αυτή την επιλογή για να εξαναγκαστεί ο εξυπηρετητής να " "εμφανίσει όλα τα αρχεία." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1346,7 +1412,7 @@ "Δεν απαιτείτε από έναν εξυπηρετητή σε κανονική λειτουργία. Επικοινωνήστε με " "το διαχειριστή του εξυπηρετητή." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1356,17 +1422,17 @@ "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "τοπικού φακέλου;" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "Π&ροσθήκη" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "Να είναι επιτρεπτή η συνέχιση της μεταφοράς των αρχείων ASCII" @@ -1378,51 +1444,54 @@ msgid "A&pply only to uploads" msgstr "Ε&φαρμογή μόνο στα αρχεία που είναι προς αποστολή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "Ε&φαρμογή σε όλα τα αρχεία και τους φακέλους" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "Α&υτόματη απομάκρυνση των επιτυχημένων μεταφορών" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Μνεία για το FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Πιο πάνω από τις λίστες αρχείων" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:114 +msgid "Access to some local directories could not be restored:" +msgstr "" +"Η πρόσβαση σε ορισμένους τοπικούς καταλόγους δεν μπορεί να αποκατασταθεί:" + +#: ../../locales/../src/engine/server.cpp:581 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Λογαριασμός" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "Ενέργεια έπειτα από τη &συμπλήρωση της λίστας αναμονής" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Ενέργεια στο επιλεγμένο αρχείο:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Ενέργεια προς εκτέλεση:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Ενέργεια:" @@ -1430,24 +1499,24 @@ msgid "Active mode" msgstr "Ενεργητική κατάσταση" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "" -"Η δοκιμή της ενεργητικής κατάστασης FTP απέτυχε. Το FileZilla δε γνωρίζει τη " -"σωστή εξωτερική διεύθυνση IP." +"Η δοκιμή της ενεργητικής κατάστασης FTP απέτυχε. Το FileZilla δεν γνωρίζει " +"τη σωστή εξωτερική διεύθυνση IP." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." msgstr "" -"Η δοκιμή της ενεργητικής κατάστασης FTP απέτυχε. Το FileZilla δε γνωρίζει τη " -"σωστή εξωτερική διεύθυνση IP. Επίσης, ο δρομολογητής (router) σας άλλαξε την " -"διεύθυνση του παραλήπτη." +"Η δοκιμή της ενεργητικής κατάστασης FTP απέτυχε. Το FileZilla δεν γνωρίζει " +"τη σωστή εξωτερική διεύθυνση IP. Επίσης, ο δρομολογητής (router) σας άλλαξε " +"την διεύθυνση του παραλήπτη." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1457,39 +1526,40 @@ "σωστή εξωτερική διεύθυνση IP, αλλά ο δρομολογητής (router) ή το τοίχος " "προστασίας (firewall), άλλαξε την διεύθυνση του παραλήπτη." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP ενεργητικής κατάστασης" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Προσθήκη αρχείων στη &λίστα αναμονής" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Προσθήκη του επιλεγμένου φακέλου στη λίστα αναμονής για μεταφορά" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "" "Προσθήκη των επιλεγμένων αρχείων και φακέλων στη λίστα αναμονής για μεταφορά" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Προσθήκη στη λίστα αναμονής" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Μη υποστηριζόμενος τύπος διεύθυνσης" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Για προχωρημένους" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1503,15 +1573,16 @@ "αναμένεται και μπορεί να βλάψουν το σύστημά σας. Χρησιμοποιείτε τις " "δοκιμαστικές εκδόσεις με δική σας ευθύνη." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "Να &εκτελείται πάντα αυτή η ενέργεια" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Αλγόριθμος:" -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2652 msgid "All files have been successfully transferred" msgstr "Οι μεταφορά όλων των αρχείων ολοκληρώθηκε επιτυχώς" @@ -1519,14 +1590,14 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Όλες οι θύρες που θα δωθούν πρέπει να είναι μεταξύ 1024 και 65535." -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2648 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "Όλες οι μεταφορές ολοκληρώθηκαν. %d αρχείο δεν μεταφέρθηκε." msgstr[1] "Όλες οι μεταφορές ολοκληρώθηκαν. %d αρχεία δεν μεταφέρθηκαν." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Επιτρέπεται η &επιστροφή σε άλλη μέθοδο μεταφοράς κατά την αποτυχία" @@ -1534,17 +1605,17 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Επιτρεπτή η επιστροφή σε άλλες καταστάσεις μεταφοράς κατά την αποτυχία" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Συνδέθηκε ήδη" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Εναλλακτικό όνομα:" msgstr[1] "Εναλλακτικά ονόματα:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1552,7 +1623,7 @@ "Εναλλακτικά, μπορείτε να χρησιμοποιήσετε το εργαλείο Pageant από το PuTTY " "για να διαχειριστείτε τα κλειδιά σας, το FileZilla αναγνωρίζει το Pageant." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1560,7 +1631,7 @@ "Εναλλακτικά, μπορείτε να χρησιμοποιήσετε το αναγνωριστικό SSH του συστήματος " "σας. Βεβαιωθείτε ότι οι μεταβλητές περιβάλλοντος SSH_AUTH_SOCK έχουν οριστεί." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1568,7 +1639,7 @@ "Εναλλακτικά, μπορείτε επίσης να κατεβάσετε την τελευταία έκδοση από την " "ιστοσελίδα:" -#: ../../locales/../src/interface/QueueView.cpp:1908 +#: ../../locales/../src/interface/QueueView.cpp:1656 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1577,7 +1648,7 @@ "Προέκυψε σφάλμα κατά τη φόρτωση της Λίστας μεταφοράς από το \"%s\".\n" "Ορισμένα αντικείμενα ίσως δεν έχουν ανακτηθεί." -#: ../../locales/../src/interface/QueueView.cpp:1818 +#: ../../locales/../src/interface/QueueView.cpp:1549 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1586,82 +1657,85 @@ "Προέκυψε σφάλμα κατά την αποθήκευση της Λίστας μεταφοράς από το \"%s\".\n" "Ορισμένα αντικείμενα ίσως δεν έχουν αποθηκευθεί." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Ένας εκδότης στην αλυσίδα πιστοποιητικών δεν είναι αρχή πιστοποίησης" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Ένα αντικείμενο με το ίδιο όνομα υπάρχει ήδη στη τοποθεσία προορισμού." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:606 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1709 msgid "Anonymous" msgstr "Anonymous" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Μία άλλη απομακρυσμένη λειτουργία βρίσκεται ήδη σε εξέλιξη, αδυναμία " "τροποποίησης του φακέλου." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:845 msgid "Any changes made in the Site Manager could not be saved." msgstr "" -"Οι οποιεσδήποτε αλλαγές στο διαχειριστή τοποθεσιών δε μπορούν να " +"Οι οποιεσδήποτε αλλαγές στο διαχειριστή τοποθεσιών δεν μπορούν να " "αποθηκευτούν." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." -msgstr "Οι οποιεσδήποτε αλλαγές στα φίλτρα δε μπορούν να αποθηκευτούν." +msgstr "Οι οποιεσδήποτε αλλαγές στα φίλτρα δεν μπορούν να αποθηκευτούν." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." -msgstr "Οποιαδήποτε αλλαγή γίνει στα φίλτρα δε θα αποθηκευτεί." +msgstr "Οποιαδήποτε αλλαγή γίνει στα φίλτρα δεν θα αποθηκευτεί." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Εφα&ρμογή μόνο στους φακέλους" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Εφαρμογή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Εφαρμογή μόνο στην &τρέχουσα λίστα αναμονής" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Εφαρμογή στα &αρχεία μόνο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Αρχείο" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Υπερχείλιση μνήμης" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Ως ετικέττα στο πλακίδιο της λίστας αναμονής μεταφορών" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Ερώτηση για ενέργεια" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:572 +#: ../../locales/../src/engine/server.cpp:598 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Αίτημα για κωδικό πρόσβασης" @@ -1673,7 +1747,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Ερώτηση στο λειτουργικό σας σύστημα για την εξωτερική διεύθυνση IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Απαντήσεις ερωτημάτων στα FileZilla forums" @@ -1681,7 +1755,7 @@ msgid "Associated program not found:" msgstr "Το συετιζόμενο πρόγραμμα δεν βρέθηκε:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Τουλάχιστον μία συνθήκη φίλτρου είναι ημιτελής" @@ -1689,99 +1763,106 @@ msgid "At this point, all required information has been gathered." msgstr "Σε αυτό το σημείο, όλες οι απαραίτητες πληροφορίες έχουν συγκεντρωθεί." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Ιδιότητα" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:221 msgid "Authentication failed." msgstr "Αποτυχία πιστοποίησης." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Συγγραφέας:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Αυτόματος" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Αυτόματη ταξινόμηση τύπων αρχείων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Διαθέσιμα μεγέθη" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "&Παράκαμψη διαμεσολαβητή" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Κακός περιγραφέας αρχείου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Βασικές οδηγίες χρήσης" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Συμπεριφορά" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Επεξεργάστηκε" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Προσοχή! Το πιστοποιητικό έχει ανακληθεί" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Δυαδικός" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Μαυροπίνακα" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Μπλε" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:390 msgid "Bookmark" msgstr "Σελιδοδείκτης" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Σελιδοδείκτης:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Περιήγηση..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:150 +#: ../../locales/../src/engine/storj/resolve.cpp:218 +#: ../../locales/../src/engine/storj/resolve.cpp:291 +msgid "Bucket not found" +msgstr "Ο Κάδος δεν βρέθηκε" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Ημερομηνία κατασκευής:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Πληροφορίες κατασκευής" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Business category:" msgstr "Κατηγορία επιχείρισης:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1792,98 +1873,114 @@ "FileZilla σε ένα μικρότερο εύρος θυρών, παρακαλώ καταχωρίστε το εύρος θυρών " "παρακάτω." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "&Ακύρωση τρέχουσας λειτουργίας" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "Κ&αθαρισμός όλων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "&Αντιγραφή των URLs στο πρόχειρο" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "&Αντιγραφή των URL(s) και του κωδικού πρόσβασης στο πρόχειρο" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "Π&ροσαρμογή" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Π&ροσαρμοσμένες συσχετίσεις:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "Χαρακτηριστικά ΚΜΕ:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Υπολογισμός απόκλισης χρονικής ζώνης από τον εξυπηρετητή..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Αδύνατη η ανάγνωση από το αρχείο" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Αδύνατη η εγγραφή δεδομένων στο αρχείο." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Αδύνατη η εγγραφή δεδομένων στο αρχείο: %s" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Άκυρο" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Ακύρωση τρέχουσας λειτουργίας" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Ακυρώνει την τρέχουσα λειτουργία" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Αδύνατη η πρόσβαση στο '%s', δεν υπάρχει μέσο ή ο οδηγός δεν είναι έτοιμος." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:613 msgid "Cannot add server to Site Manager" msgstr "Αδυναμία προσθήκης του εξυπηρετητή στο διαχειριστή τοποθεσιών" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Αδυναμία αντιστοίχισης αιτούμενης διεύθυνσης" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Δεν είναι δυνατή η αλλαγή φακέλου, ήδη μια λειτουργία συγχρονισμένης " +"περιήγησης βρίσκεται σε εξέλιξη." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1891,7 +1988,7 @@ "Αδυναμία κλεισίματός καρτέλας, είναι απασχολημένη.\n" "Να ακυρωθεί η τρέχουσα λειτουργία και να κλείσει η καρτέλα;" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1903,23 +2000,23 @@ msgid "Cannot create new filter" msgstr "Αδυναμία δημιουργίας νέου φίλτρου" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1780 +#: ../../locales/../src/interface/search.cpp:1184 msgid "Cannot edit file" msgstr "Αδύνατη η επεξεργασία του αρχείου" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1661 msgid "Cannot edit file, not connected to any server." msgstr "" "Αδύνατη η επεξεργασία του αρχείου, δεν υπάρχει σύνδεση με τον εξυπηρετητή." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "Cannot edit file, remote path unknown." msgstr "Αδύνατη η επεξεργασία του αρχείου, άγνωστη απομακρυσμένη διαδρομή." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1927,82 +2024,81 @@ "Δεν είναι δυνατή η εδραιώση σύνδεσης FTP σε έναν εξυπηρετητή SFTP. Παρακαλώ, " "επιλέξτε το κατάλληλο πρωτόκολλο." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Αδυναμία φόρτωσης γραμμής γρήγορης σύνδεσης από το αρχείο resource" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Cannot load key file" msgstr "Αδυναμία φόρτωσης του Αρχείου Κλειδιού" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1079 msgid "Cannot load toolbar from resource file" msgstr "Αδυναμία φόρτωσης γραμμής εργαλείων από το αρχείο resource" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Να μην αποθηκεύονται οι κωδικοί πρόσβασης" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1261 msgid "Cannot rename entry" msgstr "Δεν είναι δυνατή η μετονομασία της καταχώρησης" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Cannot rename file" -msgstr "Το αρχείο δε μπορεί να μετονομαστεί" +msgstr "Το αρχείο δεν μπορεί να μετονομαστεί" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Αδυναμία εύρεσης ονόματος κεντρικού υπολογιστή στην διεύθυνση IPv4 για χρήση " "με SOCKS4 διαμεσολαβητή." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Αδυναμία αποθήκευσης των ορισμάτων φίλτρου" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Αδυναμία επιλογής φίλτρου" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Δεν έχει ορισθεί συσχετιζόμενο αρχείο" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" -msgstr "Ο διάλογος δε μπορεί να εμφανιστεί" +msgstr "Ο διάλογος δεν μπορεί να εμφανιστεί" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" -msgstr "Το επιλεγμένο αρχείο δε μπορεί να προβληθεί/επεξεργαστεί" +msgstr "Το επιλεγμένο αρχείο δεν μπορεί να προβληθεί/επεξεργαστεί" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Διάκριση πεζών κεφαλαίων" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Χωρίς διάκριση πεζών κεφαλαίων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Χωρίς διάκριση πεζών κεφαλαίων (προεπιλογή)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Διάκριση πεζών κεφαλαίων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Διάκριση πεζών κεφαλαίων (προεπιλογή)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Κατηγορίες για να καταργήσετε" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:514 msgid "Certificate and session data are not available yet." msgstr "Το πιστοποιητικό και τα δεδομένα συνεδρίας δεν είναι διαθέσιμα." @@ -2012,40 +2108,44 @@ #: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" -msgstr "Εκδότης Πιστοποιητικών:" +msgstr "Εκδότης Πιστοποιητικών" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Αποτυχία επαλήθευσης της υπογραφής του πιστοποιητικού" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Πρόκληση:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Αλλαγή ιδιοτήτων αρχείου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." -msgstr "Αλλαγή δικαιωμάτων αρχείου" +msgstr "Αλλαγή δικαιωμάτων αρχείου." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Για την εφαρμογή των αλλαγών στο αρχείο συμβάντων απαιτείται η επανεκκίνηση " "του FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:595 msgid "Character encoding issue" msgstr "Θέμα κωδικοποίησης χαρακτήρων" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Κωδικοποίηση χαρακτήρων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Έλεγχος για &αναβαθμίσεις..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Έλεγχος για &ενημερώσεις FileZilla αυτόματα:" @@ -2053,15 +2153,15 @@ msgid "Check for Updates" msgstr "Έλεγχος για ενημερώσεις" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Έλεγχος για νεώτερες εκδόσεις του FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Επέτυχε ο έλεγχος για αναβαθμίσεις" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2069,7 +2169,7 @@ "Ελέγξτε τις πιστοποιήσεις εισόδου. Το καταχωρημένο όνομα αρχίζει ή τελειώνει " "με κενό διάστημα." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2077,39 +2177,39 @@ "Ελέγξτε τις πιστοποιήσεις εισόδου. Το καταχωρημένο όνομα αρχίζει ή τελειώνει " "με κενό διάστημα." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Έλεγχος για τη σωστή εξωτερική διεύθυνση IP" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Έλεγχος για ενημερώσεις ..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:755 #, c-format msgid "Checksum match on file %s\n" msgstr "Αναντιστοιχία αθροίσματος ελέγχου (checksum) στο αρχείο %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:751 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Αναντιστοιχία αθροίσματος ελέγχου (checksum) στο αρχείο %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1608 msgid "Choose a key file" msgstr "Επιλέξτε το Αρχείο Κλειδί" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1639 msgid "Choose the default local directory" msgstr "Επιλέξτε τον προκαθορισμένο τοπικό φάκελο" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2495 msgid "Choose the local directory" msgstr "Επιλέξτε τον τοπικό φάκελο" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:437 msgid "Chunk data improperly terminated" msgstr "Ακατάλληλος τερματισμός τμήματος δεδομένων" @@ -2118,54 +2218,62 @@ msgstr "Αποτύπωμα:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:641 msgid "Cl&ose tab" msgstr "Κ&λείσιμο καρτέλας" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Κλασσική" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Καθαρισμός της &διάταξης μνήμης" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Διαγραφή δεδομένων &αυτόματης ενημέρωσης" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Καθαρισμός ιστορικού" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Καθαρισμός της γραμμής γρήγορης σύνδεσης" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Κάντε κλικ στο τέλος για να αποθηκεύσετε τις ρυθμίσεις σας." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Πελάτης πρός Φυσική Διεύθυνση (MAC) εξυπηρετητή:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Πελάτης προς αποτύπωμα εξυπηρετητή:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Τερματισμός" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:644 msgid "Close &all other tabs" msgstr "Κλείσιμο &όλων των άλλων καρτελών" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Close FileZilla" msgstr "Κλείσιμο του FileZilla" @@ -2173,105 +2281,110 @@ msgid "Close all running instances of FileZilla" msgstr "Κλείσιμο όλων των ενεργών διεργασιών του FileZilla" +#: ../../locales/../src/interface/Mainfrm.cpp:2310 +msgid "Close quick search and continue comparing?" +msgstr "Να τερματιστεί η γρήγορη αναζήτηση και να συνεχιστεί η σύγκριση;" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Κλείσιμο τρέχουσας καρτέλας" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Σχ&όλια:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Ιδιότητες στήλης" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Ρύθμιση στήλης" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Η εντολή και τα ορίσματα αυτής, πρέπει να παραθέτονται σωστά." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Η Εντολή απέτυχε" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Η εντολή δεν υποστηρίζεται" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Η εντολή δεν υποστηρίζεται από αυτό το πρωτόκολλο" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "Εντολή:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "Σχόλιο" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Common name:" msgstr "Σύνηθες όνομα:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "" "Προβληματική επικοινωνία από το δρομολογητή (router) ή από το τοίχος " "προστασίας (firewall)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Σύγκριση αριθμού &τροποποιήσεων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Σύγκριση &μεγέθους αρχείου" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Κατώτατο όριο σύγκρισης (σε λεπτά):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Το κατώτατο όριο σύγκρισης πρέπει να είναι μεταξύ 0 και 1440 λεπτά." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Μεταγλωττισμένο για:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Μεταγλώττιση βασισμένη στο:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Μεταγλωττισμένο με:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Σημαίες μεταγλωττιστή:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Συμπιεσμένο" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Σύγχρονες μεταφορές" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Διάκριση πεζών και κεφαλαίων χαρακτήρων" @@ -2287,41 +2400,41 @@ msgid "Configure port range" msgstr "Ρύθμιση εύρους θύρας" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Ρύθμιση του FileZilla και του δικτύου σας" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1243 msgid "Confirm deletion" msgstr "Επιβεβαίωση διαγραφής" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1743 +#: ../../locales/../src/interface/RemoteListView.cpp:1429 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1070 +#: ../../locales/../src/interface/search.cpp:1196 msgid "Confirmation needed" msgstr "Χρειάζεται επιβεβαίωση" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Συγχαρητήρια, οι ρυθμίσεις σας φαίνεται πως δουλεύουν." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Η σύνδεση προσπέρασε τις ρυθμίσεις του διαμεσολαβητή" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Απέτυχε η σύνδεση με: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Σύνδεση στην τρέχουσα καρτέλα" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Σύνδεση σε νέα καρτέλα" @@ -2329,25 +2442,26 @@ msgid "Connect to specified Site Manager site" msgstr "Σύνδεση σε καθορισμένη τοποθεσία του διαχειριστή δικτυακού τόπου" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "Σύνδεση" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Σύνδεση στο %s μέσω διακομιστή μεσολάβησης %s" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:990 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Σύνδεση στο %s..." @@ -2356,186 +2470,224 @@ msgid "Connection" msgstr "Σύνδεση" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Η σύνδεση ματαιώθηκε" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "Προσπάθεια σύνδεσης απέτυχε" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:952 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Απέτυχε η προσπάθεια σύνδεσης με \"%s\", προσπάθεια με την επόμενη διεύθυνση." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Απέτυχε η προσπάθεια σύνδεσης με \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Προσπάθεια σύνδεσης διακόπηκε από το χρήστη" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Εξαντλήθηκε το χρονικό όριο σύνδεσης" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Σύνδεση τερματίστηκε" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1036 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 msgid "Connection closed by server" msgstr "Σύνδεση τερματίστηκε από τον εξυπηρετητή" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:113 msgid "Connection established, initializing TLS..." msgstr "Σύνδεση εδραιώθηκε, αρχικοποίηση του TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:136 msgid "Connection established, sending HTTP request" msgstr "Σύνδεση εδραιώθηκε, αποστολή HTTP αιτήματος" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "Σύνδεση εδραιώθηκε, αναμονή για μήνυμα υποδοχής." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Σύνδεση εδραιώθηκε, αναμονή για μήνυμα υποδοχής..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Σύνδεση χάθηκε" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Μη επιτρεπτή σύνδεση σύμφωνα με τα καθορισμένα ορίσματα" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Η σύνδεση απορρίφθηκε" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Η σύνδεση απορρίφθηκε από το διακομιστή" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Επαναφορά σύνδεσης από το δίκτυο" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Σύνδεση τερματίστηκε από ομότιμο εξυπηρετητή" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:511 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Το χρονικό όριο της σύνδεσης έληξε %d δευτερόλεπτο αδράνειας" msgstr[1] "Το χρονικό όριο της σύνδεσης έληξε %d δευτερόλεπτα αδράνειας" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Τέλος χρονικού ορίου σύνδεσης." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:708 msgid "Connection to server lost." msgstr "Διακόπηκε η σύνδεση με τον εξυπηρετητή." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "Η σύνδεση με το διαμεσολαβητή εδραιώθηκε, αναμονή για χειραψία..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Η σύνδεση με τον εξυπερετητή έκλεισε πρόωρα." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Η σύνδεση με το δοκιμαστικό εξυπηρετητή απέτυχε." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Μετατροπή του Αρχείου Κλειδιού" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2055 #, c-format msgid "Copy (%d) of %s" msgstr "Αντιγραφή (%d) από %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2034 #, c-format msgid "Copy of %s" msgstr "Αντιγραφή του %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Αντιγραφή URLs των επιλεγμένων στοιχείων στο πρόχειρο, συμπεριλαμβανομένου " +"και του κωδικού πρόσβασης." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Αντιγραφή στο πρόχειρο των URLs (από τα επιλεγμέναν αντικείμενα)." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Αδυνατη η αποδοχή της σύνδεσης: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Δεν ήταν δυνατή η πρόσβαση στη διαδρομή %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "" +"Δεν μπορεί να προστεθεί το πιστοποιητικό στην προσωρινή λίστα με τα έμπιστα" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Αδυναμία εισαγωγής της σύνδεσης στο διαχειριστή τοποθεσιών" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Αδυναμία ολοκλήρωσης της λειτουργίας" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Αδύνατη η σύνδεση στον εξυπηρετητή" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1091 #, c-format msgid "Could not connect to server: %s" msgstr "Αδύνατη η σύνδεση στον εξυπηρετητή: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Αδυναμία μετατροπής εντολής στην κωδικοποίηση του εξυπηρετητή" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Αδυναμία μετατροπής ιδιωτικού κλειδιού" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2579 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1372 msgid "Could not copy URLs" msgstr "Αδυναμία αντιγραφής των URLs" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Δεν ήταν δυνατή η αντιγραφή του πιστοποιητικού" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Αδυναμία αντιγραφής δεδομένων" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:161 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Δεν ήταν δυνατή η δημιουργία CFURL από τη διαδρομή %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Δεν ήταν δυνατή η δημιουργία URL για αυτή τη μεταφορά." + +#: ../../locales/../src/interface/updater.cpp:490 #, c-format msgid "Could not create local file %s\n" msgstr "Δεν ήταν δυνατή η δημιουργία τοπικού αρχείου %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Δεν είναι δυνατή η δημιουργία mutex: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:170 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Δεν ήταν δυνατή η δημιουργία σελιδοδείκτη security-scoped από URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2224 +#: ../../locales/../src/interface/RemoteTreeView.cpp:866 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2545,11 +2697,11 @@ "Ίσως η επέκταση του κελύφους δεν έχει εγκατασταθεί σωστά ή δεν τοποθετήσατε " "τα αρχεία στο παράθυρο του περιηγητή." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Αδύνατη η εδραίωση σύνδεσης με τον εξυπηρετητή" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:441 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2562,11 +2714,16 @@ "παραμέτρου γραμμής εντολών '--datadir ' ή ορίζοντας την " "μεταβλητή περιβάλλοντος FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Αδυναμία δημιουργίας προσαρμοσμένης ακολουθίας εισόδου." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Αδυναμία δημιουργίας κλειδιού" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2574,7 +2731,7 @@ "Αδυναμία λήψης διακεκριμένου ονόματος για τον εκδότη πιστοποίησης, απέτυχε " "gnutls_x509_get_issuer_dn" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2582,41 +2739,36 @@ "Αδυναμία λήψης διακεκριμένου ονόματος για το αντικείμενο πιστοποίησης, " "απέτυχε gnutls_x509_get_dn" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Αδυναμία εύρεσης της πλήρους απομακρυσμένης διαδρομής." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Δεν ήταν δυνατή η λήψη η μητρικής διαδρομής από CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +msgid "Could not get path from URL" +msgstr "Δεν ήταν δυνατή η λήψη διαδρομής από URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Αδυναμία λήψης του κατάλληλου τύπου από το fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1184 msgid "Could not get temporary directory to download file into." msgstr "" "Αδυναμία εύρεσης του προσωρινού φακέλου για να αποθηκευτεί εκεί το αρχείο." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Αδυναμία εισαγωγής ομότιμων πιστοποιητικών, απέτυχε gnutls_x509_crt_import" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:96 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Δεν ήταν δυνατή η προετοιμασία του Winsock (%d): %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Αδυναμία ρύθμισης δομής για τα ομότιμα πιστοποιητικά, απέτυχε " -"gnutls_x509_crt_init" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2625,17 +2777,23 @@ msgstr "" "Αδυναμία φόρτωσης του \"%s\". Παρακαλώ, ελέγξτε αν το αρχείο είναι έγκυρο " "και προσβάσιμο.\n" -"Οποιεσδήποτε αλλαγές στο διαχειριστή τοποθεσιών δε θα αποθηκευτούν." +"Οποιεσδήποτε αλλαγές στο διαχειριστή τοποθεσιών δεν θα αποθηκευτούν." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Αδυναμία φόρτωσης του Αρχείου Κλειδιού" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Αδυναμία φόρτωσης του ιδιωτικού κλειδιού" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2647,7 +2805,7 @@ "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "απομακρυσμένου φακέλου;" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2658,7 +2816,7 @@ "'%s'.\n" "Ο συγχρονισμός περιήγησης έχει απενεργοποιηθεί." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2669,219 +2827,242 @@ "'%s'.\n" "Ο συγχρονισμός περιήγησης έχει απενεργοποιηθεί." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2579 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1372 msgid "Could not open clipboard" msgstr "Αδυναμία ανοίγματος του προχείρου" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Αδυναμία ανοίγματος του αρχείου συμβάντων: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Αδυναμία ανάλυσης της απομακρυσμένης διαδρομής." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Αδυναμία ανάλυσης της διεύθυνσης του εξυπηρετητή:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." msgstr "Αδυναμία ανάγνωσης δεδομένων υποδοχής." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 #, c-format msgid "Could not read from socket: %s" msgstr "Αδυναμία ανάγνωσης από την υποδοχή: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Αδυναμία ανάγνωσης αντικειμένου εξυπηρετητή." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Δεν ήταν δυνατή η λήψη δεδομένων από το διακομιστή." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:117 +msgid "Could not restore directory access" +msgstr "Δεν ήταν δυνατή η αποκατάσταση της πρόσβασης καταλόγου" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:173 #, c-format msgid "Could not seek to offset %s within file" msgstr "Αδυναμία έναρξης αιτήματος %s εντός του αρχείου" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/http/filetransfer.cpp:119 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "Αδυναμία αναζήτησης έναρξης αρχείου" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Αδυναμία λήξης αιτήματος κατά το τελείωμα του αρχείου" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Αδυναμία αποστολής εντολής στο fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Αδυναμία αποστολής εντολής στο fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Αδυναμία ταξινόμησης ομότιμων πιστοποιητικών" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:201 msgid "Could not spawn IO thread" msgstr "Αδύνατη η δημιουργία ΙΟ thread" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Αδύνατη η εκκίνηση χειραψίας με το διαμεσολαβητή: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "Αδύνατη η εκκίνηση της μεταφοράς" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:866 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " "%s" msgstr "" "Αδύνατη η εγγραφή στο \"%s\", οποιεσδήποτε αλλαγές στο διαχειριστή " -"τοποθεσιών δε μπορούν να αποθηκευτούν: %s" +"τοποθεσιών δεν μπορούν να αποθηκευτούν: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Αδυναμία εγγραφής \"%s\", ο σελιδοδείκτης ήταν αδύνατο να προστεθεί:%s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Αδυναμία εγγραφής \"%s\", οι καθολικοί σελιδοδείκτες ήταν αδύνατο να " "αποθηκευτούν: %s" -#: ../../locales/../src/interface/QueueView.cpp:1847 +#: ../../locales/../src/interface/QueueView.cpp:1580 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" "%s" msgstr "" -"Αδυναμία εγγραφής \"%s\", η λίστα αναμονής δε μπόρεσε να αποθηκευτεί.\n" +"Αδυναμία εγγραφής \"%s\", η λίστα αναμονής δεν μπόρεσε να αποθηκευτεί.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2473 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" -"Αδυναμία εγγραφής \"%s\", οι επιλεγμένες τοποθεσίες δε μπόρεσαν να εξαχθούν: " -"%s" +"Αδυναμία εγγραφής \"%s\", οι επιλεγμένες τοποθεσίες δεν μπόρεσαν να " +"εξαχθούν: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 #, c-format msgid "Could not write \"%s\":" msgstr "Δεν ήταν δυνατή η εγγραφή \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Αδυναμία εγγραφής του Αρχείου Κλειδιού: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "Αδυναμία εγγραφής στο τοπικό αρχείο" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Αδυναμία εγγραφής στο αρχείο συμβάντων: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:913 +#: ../../locales/../src/engine/ControlSocket.cpp:1008 +#: ../../locales/../src/engine/http/request.cpp:113 #, c-format msgid "Could not write to socket: %s" msgstr "Αδυναμία εγγραφής στην υποδοχή: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Country:" msgstr "Χώρα:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "&Δημιουργία νέου αρχείου" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "Δημιουργήστε τον τοπικό κατάλογο που λείπει και εισέλθετε σε αυτόν" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "" "Δημιουργήστε τον απομακρυσμένο κατάλογο που λείπει και εισέλθετε σε αυτόν" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Δημιουργία υποφακέλου στον τρέχον φάκελο" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "" "Δημιουργήστε ένα νέο υποκατάλογο στον τρέχοντα κατάλογο και κάντε αλλαγή σε " "αυτόν" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Δημιουργία ενός νέου κενού αρχείου στον τρέχον φάκελο" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "Δημιουργήστε κατά&λογο και εισέλθετε σε αυτόν" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:944 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1252 msgid "Create directory" msgstr "Δημιουργία φακέλου" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2668 msgid "Create empty file" msgstr "Δημιουργία κενού αρχείου" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "Δημιουργία φακέλου" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Δημιουργία φακέλου '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Επικίνδυνο σφάλμα" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Επικίνδυνο σφάλμα:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Κρίσιμο σφάλμα μεταφοράς αρχείου" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Κρίσιμο σφάλμα μετά τη μεταφορά του %s στη %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2889,100 +3070,104 @@ msgstr "" "Ο τρέχων απομακρυσμένος φάκελος (%s) δεν περιέχεται στη βάση συγχρονισμού " "(%s).\n" -"Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " -"απομακρυσμένου φακέλου;" +"Απενεργοποίηση του συγχρονισμού περιήγησης." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Ο τρέχον τύπος μεταφοράς έχει ορισθεί ως ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Ο τρέχον τύπος μεταφοράς έχει ορισθεί ως αυτόματη ανίχνευση." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Ο τρέχον τύπος μεταφοράς έχει ορισθεί ως δυαδικός." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Καμπύλη:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Προσ&αρμογή" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Προσαρμοσμένα ορίσματα φίλτρου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Προσαρμοσμένος εξυπηρετητής" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Κυανό" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Τύπος δ&εδομένων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Σύμβολα SI στα δ&εκαδικά προθέματα (π.χ. 1 KB = 1000 bytes)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "Π&ροκαθορισμένη" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "Δ&ιαγραφή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "&Σύγκριση φακέλου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Α&πενεργοποίηση όλων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "Ν&α μην αποθηκεύονται οι κωδικοί πρόσβασης" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Ενέργεια δι&πλό-κλικ στους φακέλους:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "Δι&πλότυπο" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:52 msgid "DOS-like with virtual paths" msgstr "Σαν DOS με εικονικές διαδρομές" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Επικίνδυνος τύπος αρχείου" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "Δεδομένα" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Το socket δεδομένων έκλεισε πολύ σύντομα." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Ημερομηνία" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Μορφή ημερομηνίας" @@ -2998,15 +3183,15 @@ msgid "Debug" msgstr "Αποσφαλμάτωση" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Ρυμίσεις αποσφαλμάτωσης" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Προκαθορισμένος &τοπικός φάκελος:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:44 msgid "Default (Autodetect)" msgstr "Προεπιλογή (Αυτόματος εντοπισμός)" @@ -3014,17 +3199,17 @@ msgid "Default editor not properly quoted." msgstr "Ο προκαθορισμένος επεξεργαστής δεν έχει σωστά εισαγωγικά." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Προεπιλογή ενέργειας υπάρχοντος αρχείου" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Προκαθορισμένος α&πομακρυσμένος φάκελος:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -3032,7 +3217,7 @@ "Αδυναμία προσπέλασης στη προκαθορισμένη απομακρυσμένη διαδρομή. Βεβαιωθείτε " "ότι είναι έγκυρη για τον επιλεγμένο τύπο εξυπηρετητή." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Προκαθορισμένη γλώσσα συστήματος" @@ -3040,12 +3225,12 @@ msgid "Default transfer mode:" msgstr "Προκαθορισμένη κατάσταση μεταφοράς:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Προκαθορισμένος τύπος μεταφοράς:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Προκαθορισμένη: http://ip.filezilla-project.org/ip.php" @@ -3056,7 +3241,7 @@ "Η καθυστέρηση μεταξύ των προσπαθειών σύνδεσης πρέπει να είναι ανάμεσα σε 1 " "και 999 δευτερόλεπτα." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3071,75 +3256,85 @@ "Καθύστερηση σύνδεσης για %d δευτερόλεπτα, λόγω της προηγούμενης αποτυχημένης " "προσπάθειας..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1294 msgid "Delete Site Manager entry" msgstr "Διαγραφή εγγραφής του διαχειριστή τοποθεσιών" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Διαγραφή επιλεγμένου φακέλου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Διαγραφή επιλεγμένων αρχείων και φακέλων" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Διαγραφή \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Διαγραφή %u αρχεία από \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Διαγραφή συμβολικής σύνδεσης" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Επιφάνεια Εργασίας" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Λεπτομέρειες" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Λεπτομέρειες για νέο κλειδί:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:790 msgid "Detected newer version of FileZilla" msgstr "Εντοπίστηκε νεότερη έκδοση του FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "Φάκε&λοι" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Direction" msgstr "Κατεύθυνση" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Φάκελοι:" + +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "Φάκελος" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Δικαιώματα πρόσβασης φακέλου" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Σύγκριση φακέλου" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Η σύγκριση φακέλων απέτυχε" @@ -3149,39 +3344,43 @@ "Ο φάκελος που περιέχει το αρχείο συμβάντων δεν υπάρχει ή το όνομα του " "αρχείου δεν είναι έγκυρο." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "Λίστα φακέλου &φίλτρα..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Λίστα φακέλου ακυρώθηκε από τον χρήστη" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2056 msgid "Directory listing failed" msgstr "Λίστα φακέλου απέτυχε" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Φίλτρα λίστας φακέλου" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Περιεχόμενα καταλόγου \"%s\" επιτυχές" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Λίστα φακέλου επιτυχής" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Απεν&εργοποίηση όλων" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "απομακρυσμένου φακέλου;" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:715 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3189,87 +3388,82 @@ "Απενεργοποιείστε ξανά αυτή την επιλογή εάν δεν εμφανίζονται σωστά τα " "περιεχόμενα του φακέλλου." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Αποσύνδεση από τον εξυπηρετητή" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:914 +#: ../../locales/../src/engine/ControlSocket.cpp:1010 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:114 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" msgstr "Αποσύνδεση από τον εξυπηρετητή" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1039 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:189 #, c-format msgid "Disconnected from server: %s" msgstr "Αποσύνδεση από τον εξυπηρετητή: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Αποσύνδεση από τον προηγούμενο εξυπηρετητή" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Αποσύνδεση από τον παρόντα ορατό εξυπηρετητή" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Εμφάνιση του διαλόγου Μνεία" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "Να μη γίνει χρήση του προκαθορισμένου επεξεργαστή" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "&Καμία ενέργεια" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "" "Κάντε το ίδιο με όλα τα επιλεγμένα αρχεία που είναι ήδη υπό επεξεργασία" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1235 +#: ../../locales/../src/interface/Mainfrm.cpp:1257 msgid "Do you really want to close FileZilla?" msgstr "Θέλετε πραγματικά να κλείσετε το FileZilla;" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Θέλετε να διαγράψετε όλες τις εγγραφές από το διαχειριστή τοποθεσιών και από " "τη λίστα αναμονής μεταφορών;" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Θέλετε να διαγράψετε όλες τις εγγραφές του διαχειριστή τοποθεσιών;" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296 msgid "Do you really want to delete selected entry?" msgstr "Θέλετε πραγματικά να διαγράψετε την επιλεγμένη εγγραφή;" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Θέλετε πραγματικά να διαγράψετε τη λίστα αναμονής;" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:643 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Θέλετε πραγματικά να στείλετε το '%s' στον εξυπηρετητή;" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Θέλετε να ανοίξει εκ νέου αυτό το αρχείο;" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Τεκμηρίωση" @@ -3278,47 +3472,47 @@ msgstr "" "Να μη γίνεται χρήση της εξωτερικής διεύθυνσης IP στις &τοπικές συνδέσεις." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "Τα αρχεία που ξεκινούν με τελεία, π.χ. .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Ενέργεια διπλό-κλικ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Λήψη" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "&Όριο λήψης:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:597 #, c-format msgid "Download limit: %s/s" msgstr "Όριο λήψης: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:600 msgid "Download limit: none" msgstr "Όριο λήψης: όχι" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:904 +#: ../../locales/../src/interface/search.cpp:909 msgid "Download search results" msgstr "Λήψη αποτελεσμάτων αναζήτησης" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Λήψη επιλεγμένου φακέλου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Λήψη των επιλεγμένων αρχείων και φακέλων" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1051 #, c-format msgid "" "Download speed: %s/s\n" @@ -3327,24 +3521,24 @@ "Tαχύτητα λήψης: %s/s\n" "Tαχύτητα αποστολής: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Λήψη" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:148 #, c-format msgid "Downloading %s" msgstr "Λήψη %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Λήψη ενημέρωσης..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 #: ../../locales/../src/interface/QueueView.cpp:88 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/RemoteListView.cpp:112 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3352,11 +3546,11 @@ "Το Drag&Drop ανάμεσα στα διαφορετικά στιγμιότυπα του FileZilla δεν έχει " "υλοποιηθεί." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:101 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:117 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Το Drag&Drop ανάμεσα σε διαφορετικούς εξυπηρετητές δεν έχει υλοποιηθεί." @@ -3365,16 +3559,16 @@ msgid "Dupl&icate" msgstr "&Διπλότυπο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "Ε&νεργοποίηση όλων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "Ε&ισαγωγή φακέλου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Ε&κτέλεση" @@ -3382,49 +3576,49 @@ msgid "E&xit" msgstr "Έ&ξοδος" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." msgstr "E&ξαγωγή..." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "E-Mail:" msgstr "E-Mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Κάθε φίλτρο χρειάζεται τουλάχιστον μία συνθήκη." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Επεξεργασία φίλτρων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Τροποποιήστε το αρχείο με έναν επεξεργαστή και στείλτε τις αλλαγές στον " "εξυπηρετητή." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1172 msgid "Editing directories is not supported" -msgstr "Η επεξεργασία καταλόγων δεν υποστηρίζεται" +msgstr "Η επεξεργασία φακέλων δεν υποστηρίζεται" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1661 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "Editing failed" msgstr "Αποτυχία Επεξεργασίας" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1172 msgid "Editing search results" msgstr "Επεξεργασία αποτελεσμάτων αναζήτησης" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "E-Mail:" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Empty command" msgstr "Κενή εντολή" @@ -3432,7 +3626,7 @@ msgid "Empty command." msgstr "Κενή εντολή." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2058 msgid "Empty directory listing" msgstr "Άδειασμα λίστας φακέλου" @@ -3440,22 +3634,17 @@ msgid "Empty directory." msgstr "Ο φάκελος είναι άδειος." -#: ../../locales/../src/interface/recursive_operation.cpp:377 -#: ../../locales/../src/interface/recursive_operation.cpp:412 -msgid "Empty dirs to visit" -msgstr "Αδειάστε φακέλους για να επισκεφθείτε" - #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Κενή επέκταση αρχείου." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Απαγορεύονται τα κενά ονόματα φίλτρων." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Κενό όνομα" @@ -3463,81 +3652,97 @@ msgid "Empty quoted string." msgstr "Κενή αλφαριθμητική σε παράθεση." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Ε&νεργοποίηση όλων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Ενεργοποίηση &φιλτραρίσματος μη έγκυρων χαρακτήρων" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Κρυπτογραφημένο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Κρυπτογράφηση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Κλειδί κρυπτογράφησης:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Κλειδί κρυπτογράφησης:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Λεπτομέρειες κρυπτογράφησης" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "Να ολοκληρωθεί σύγκριση και η αλλαγή των ορισμάτων ταξινόμησης;" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Να τερματιστεί σύγκριση και συνεχιστεί η γρήγορη αναζήτηση;" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "Εισαγωγή &προσαρμοσμένης εντολής..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Επιλέξτε 0 για απεριόριστη ταχύτητα." -#: ../../locales/../src/interface/QueueView.cpp:2109 +#: ../../locales/../src/interface/QueueView.cpp:1867 msgid "Enter command" msgstr "Εισαγωγή εντολής" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:625 msgid "Enter custom command" msgstr "Εισαγωγή προσαρμοσμένης εντολής" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Εισαγωγή φακέλου" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Εισαγωγή ονόματος φίλτρου" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Εισαγωγή κύριου κωδικού πρόσβασης" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Εισαγωγή ονόματος για τα ορίσματα φίλτρου" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Εισαγωγή νέου ονόματος για τα ορίσματα φίλτρου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Εισαγωγή κωδικού πρόσβασης" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Εισαγωγή επιλεγμένου φακέλου" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3545,12 +3750,12 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Πληκτρολογήστε τη διεύθυνση του διακομιστή.\n" -"Για να καθορίσετε το πρωτόκολλο μεταφοράς δεδομένων, προτάξετε την παράμετρο " -"υποδοχής και το αναγνωριστικό πρωτοκόλλου. Εάν δεν έχει καθοριστεί " -"πρωτόκολλο, το προεπιλεγμένο πρωτόκολλο που θα χρησιμοποιηθεί είναι: ftp//.\n" -".Μπορείτε επίσης να εισάγετε πλήρη διευθύνση με τη μορφή: //user: pass@host:" -"port, οι τιμές στους άλλους τομείς θα αντικατασταθούν στη συνέχεια.\n" +"Πληκτρολογήστε τη διεύθυνση του διακομιστή. Για να καθορίσετε το πρωτόκολλο " +"μεταφοράς δεδομένων, προτάξετε την παράμετρο υποδοχής και το αναγνωριστικό " +"πρωτοκόλλου. Εάν δεν έχει καθοριστεί πρωτόκολλο, το προεπιλεγμένο πρωτόκολλο " +"που θα χρησιμοποιηθεί είναι: ftp//. Μπορείτε επίσης να εισάγετε πλήρη " +"διευθύνση με τη μορφή://user:pass@host:port, οι τιμές στους άλλους τομείς θα " +"αντικατασταθούν στη συνέχεια.\n" ".\n" "Υποστηριζόμενα πρωτόκολλα είναι:\n" "- ftp: // για την κανονική FTP με προαιρετική κρυπτογράφηση\n" @@ -3558,7 +3763,7 @@ "- ftps: // για FTP μέσω TLS (σιωπηρά)\n" "- ftpes: // για FTP μέσω TLS (σαφή)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3567,118 +3772,135 @@ "Εισάγετε τον κωδικό πρόσβασης για το αρχείο '%s'.\n" "Το αρχείο θα πρέπει να προστατεύονται με τον ίδιο κωδικό πρόσβασης." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Καταχωρίστε τη θύρα που ακούει ο εξυπηρετητής.\n" -"Η προκαθορισμένη θύρα είναι η 21 για FTP, και η 22 για SFTP." +"Καταχωρίστε τη θύρα που ακούει ο εξυπηρετητής. Η προκαθορισμένη θύρα είναι η " +"21 για FTP, και η 22 για SFTP." -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Καταχωρίστε όνομα χρήστη" + +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Εισαγωγή ονόματος χρήστη και κωδικού πρόσβασης" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Σφάλμα" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Σφάλμα κατά την εξαγωγή των ρυθμίσεων" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Σφάλμα εισαγωγής" -#: ../../locales/../src/interface/QueueView.cpp:1909 +#: ../../locales/../src/interface/QueueView.cpp:1657 msgid "Error loading queue" msgstr "Σφάλμα κατά τη φόρτωση της Λίστας αναμονής" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1830 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:247 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:131 +#: ../../locales/../src/interface/QueueView.cpp:1561 +#: ../../locales/../src/interface/search.cpp:1304 +#: ../../locales/../src/interface/search.cpp:1323 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:783 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:846 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Σφάλμα φόρτωσης xml αρχείου" -#: ../../locales/../src/interface/QueueView.cpp:1819 +#: ../../locales/../src/interface/QueueView.cpp:1550 msgid "Error saving queue" msgstr "Σφάλμα κατά την αποθήκευση της Λίστας αναμονής" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Σφάλμα κατά την εκκίνηση του προγράμματος" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1848 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1581 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:867 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2474 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 msgid "Error writing xml file" msgstr "Σφάλμα εγγραφής αρχείου xml" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:284 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "Σφάλμα:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Παράδειγμα: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Παραδείγματα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Εκτ&έλεση" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Το εκτελέσιμο δεν περιέχει πληροφορίες έκδοσης, δεν είναι εφικτός ο έλεγχος " "αναβαθμίσεων." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Εξερευνητή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Εξαγωγή &Φίλτρων" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Εξαγωγή της &λίστας αναμονής" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Εξαγωγή των &ρυθμίσεων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Εξαγωγή ρυθμίσεων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Όνομα φ&ίλτρου:" @@ -3686,28 +3908,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 msgid "FTP - File Transfer Protocol" msgstr "FTP - Πρωτόκολλο Μεταφοράς Αρχείων" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Πρωτόκολλο Μεταφοράς Αρχείων με προαιρετική κρυπτογράφηση" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Επισφαλές Πρωτόκολλο Μεταφοράς Αρχείων" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Η μηχανή FTP δεν έχει αρχικοποιηθεί, αδύνατη η σύνδεση" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Διατήρηση ενεργού FTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "Διαμεσολαβητής FTP" @@ -3725,78 +3946,86 @@ "δεδομένων. Αυτές οι επιπρόσθετες συνδέσεις μπορούν να εδραιωθούν με δύο " "τρόπους." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP πάνω από ρητή TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:24 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP μέσω σιωπηρής TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:542 +#: ../../locales/../src/interface/LocalListView.cpp:615 +#: ../../locales/../src/interface/LocalListView.cpp:931 +#: ../../locales/../src/interface/LocalListView.cpp:1864 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Απέτυχε η αλλαγή φακέλου" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Απέτυχε η αλλαγή γλώσσας" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Αδυναμία μετατροπής εντολής σε 8bit σύνολο χαρακτήρων" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 msgid "Failed to copy or move sites" msgstr "Αποτυχία αντιγραφής ή μετακίνησης τοποθεσιών" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:330 msgid "Failed to create backup copy of xml file" msgstr "Απέτυχε η δημιουργία αντιγράφου ασφαλείας για το αρχείου xml" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Αποτυχία δημιουργίας listen socket, ακύρωση" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Αποτυχία δημιουργίας listen socket για τη θύρα %d, ακύρωση." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Αποτυχία δημιουργίας listen socket για μεταφορά σε ενεργητική κατάσταση" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Αποτυχία αποκρυπτογράφησης του κωδικού πρόσβασης διακομιστή." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" -msgstr "Αποτυχία πρόσβασης στην διαδρομή 'Τα Εγγραφά Μου'" +msgstr "Αποτυχία πρόσβασης στη διαδρομή 'Τα Έγγραφά Μου'" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Αποτυχία πρόσβασης στην διαδρομή της επιφάνειας εργασίας" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "Αποτυχία λήψης ομότιμης διεύθυνσης, η σύνδεση έκλεισε." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Αποτυχία λήψης ομότιμης διεύθυνσης από τα δεδομένα σύνδεσης, η σύνδεση " "έκλεισε." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Αποτυχία αρχικοποίησης της μηχανής FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:120 msgid "Failed to initialize TLS." msgstr "Αποτυχία αρχικοποίησης του TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" msgstr "Απέτυχε η προετοιμασία δικτύωσης" @@ -3804,71 +4033,71 @@ msgid "Failed to load panels, invalid resource files?" msgstr "Αδυναμία φόρτωσης πινάκων οργάνων, λάθος resource αρχείο;" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Αποτυχία φόρτωσης του ιδιωτικού κλειδιού: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Αποτυχία ανοίγματος του \"%s\" για επισύναψη/εγγραφή" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:138 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Αποτυχία ανοίγματος του \"%s\" για ανάγνωση" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Αποτυχία ανοίγματος του \"%s\" για εγγραφή" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Failed to parse returned path." msgstr "Αποτυχία ανάλυσης τις επιστρεφόμενης διαδρομής." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Αποτυχία λήψης δεδομένων" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Άνοιγμα φακέλου απέτυχε" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP, ακύρωση" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP, ματαίωση." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP, χρήση τοπικής διεύθυνσης" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Αποτυχία ανάκτησης τοπικής διεύθυνσης IP." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Αποτυχία ανάκτησης τοπικής διεύθυνσης IP, ματαίωση." -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Αποτυχία ανάκτησης τοπικής διεύθυνσης IP. Ακύρωση" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Αποτυχία ανάκτησης τοπικής διεύθυνσης IP." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Αποτυχία αποστολής εντολής." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Αποτυχία ορισμού γλώσσας σε %s (%s), χρήση της προκαθορισμένης γλώσσας από " "το σύστημα" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3876,49 +4105,48 @@ "Αποτυχία ορισμού γλώσσας σε %s (%s), χρήση της προκαθορισμένης γλώσσας από " "το σύστημα (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Αποτυχία ορισμού γλώσσας σε %s (%s), χρήση προκαθορισμένης γλώσσας από το " "σύστημα." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Αποτυχία ορισμού γλώσσας σε %s, χρήση της προκαθορισμένης από το σύστημα " "γλώσσας" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Αποτυχία ορισμού γλώσσας σε %s, χρήση της προκαθορισμένης γλώσσας από το " "σύστημα (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Αποτυχία ορισμού γλώσσας στο %s, χρήση της προκαθορισμένης γλώσσας από το " "σύστημα." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Αποτυχία πιστοποίησης ρυθμίσεων" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Αποτυχία επαλήθευσης ομότιμου πιστοποιητικού" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Αποτυχία εγγραφής στο αρχείο %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:373 msgid "Failed to write xml file" msgstr "Αποτυχία εγγραφής xml αρχείου" @@ -3930,15 +4158,15 @@ msgid "Fall back to active mode" msgstr "Επιστροφή σε ενεργητική κατάσταση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Αρχ&είο:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Αρχ&εία" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "Αρχείο" @@ -3946,11 +4174,11 @@ msgid "File Types" msgstr "Τύποι αρχείων" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "O περιγραφέας αρχείου δεν είναι υποδοχέας" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Το αρχείο δεν περιέχει δεδομένα για εισαγωγή." @@ -3958,7 +4186,7 @@ msgid "File editing" msgstr "Επεξεργασία αρχείου" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "File exists" msgstr "Το αρχείο υπάρχει" @@ -3966,7 +4194,7 @@ msgid "File exists action" msgstr "Ενέργεια για ήδη υπάρχον αρχείο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Το αρχείο άλλαξε" @@ -3974,63 +4202,67 @@ msgid "File lists" msgstr "Λίστες αρχείων" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:105 +#: ../../locales/../src/engine/storj/resolve.cpp:176 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:630 +#: ../../locales/../src/interface/FileZilla.cpp:720 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" -msgstr "Το αρχείο δε βρέθηκε" +msgstr "Το αρχείο δεν βρέθηκε" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:723 +#: ../../locales/../src/interface/search.cpp:728 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Aναζήτηση αρχείου" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Η μεταφορά αρχείου ακυρώθηκε από τον χρήστη" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Η μεταφορά ακυρώθηκε από το χρήστη μετά τη μεταφορά του %s στη %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Αποτυχημένη μεταφορά αρχείου" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Αποτυχημένη μεταφορά αρχείου μετά τη μεταφορά του %s στη %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Παραλείφθηκε η μεταφορά αρχείου" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Επιτυχής μεταφορά αρχείου" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Επιτυχής μεταφορά αρχείου, μεταφέρθηκε %s στο %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1234 msgid "File transfers still in progress." msgstr "Μεταφορά αρχείων σε πρόοδο." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Το αρχείο θα μεταφερθεί ως ASCII τύπος δεδομένων." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Το αρχείο θα μεταφερθεί ως δυαδικός τύπος δεδομένων." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:442 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Σφάλμα FileZilla" @@ -4042,78 +4274,84 @@ "Το FileZilla θα δοκιμάσει τώρα τις ρυθμίσεις σας για να εξασφαλίσει ότι " "είναι όλα σωστά ρυθμισμένα." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "Το FileZilla συνδέθηκε ήδη με τον εξυπηρετητή." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1541 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "Το FileZilla πρέπει να επανεκκινηθεί για να εφαρμοστεί η γλωσσική αλλαγή." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Ενημερώσεις FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "&Γραμμές κατάστασης" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "Όνομα αρχείου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Όνομα αρχείου &φίλτρων..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "Δεν μπορεί να κατασκευαστεί όνομα αρχείου για τον φάκελο %s και το αρχείο %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Filename invalid" msgstr "Λανθασμένο όνομα αρχείου" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 msgid "Filename unchanged" msgstr "Το όνομα αρχείου δεν αλλάχθηκε" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Όνομα αρχείου:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "" -"Τα ονόματα των αρχείων δε μπορούν να περιέχουν κανένα από τους ακόλουθους " +"Τα ονόματα των αρχείων δεν μπορούν να περιέχουν κανένα από τους ακόλουθους " "χαρακτήρες: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" -"Τα ονόματα των αρχείων δε μπορούν να περιέχουν κανένα από τους ακόλουθους " +"Τα ονόματα των αρχείων δεν μπορούν να περιέχουν κανένα από τους ακόλουθους " "χαρακτήρες: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Αρχεία που επεξεργάζονται" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" +"Τα αρχεία που ταιριάζουν σε έναν κανόνα φίλτρου έχουν αφαιρεθεί από τις " +"λίστες καταλόγων." + +#: ../../locales/../src/engine/storj/resolve.cpp:313 +msgid "Files not found" +msgstr "Τα αρχεία δεν βρέθηκαν" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:156 msgid "Filesize" msgstr "Μέγεθος αρχείου" @@ -4121,64 +4359,68 @@ msgid "Filesize format" msgstr "Μορφή μεγέθους αρχείου" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:157 msgid "Filetype" msgstr "Τύπος αρχείου" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Συσχετίσεις τύπων αρχείων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Εφαρμογή φίλτρου σε:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Φιλτράρισμα μη έγκυρων χαρακτήρων στα ονόματα αρχείων" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Το όνομα φίλτρου υπάρχει ήδη" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Ταίριασμα με όλα τα ακόλουθα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Ταίριασμα με οτιδήποτε από τα ακόλουθα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Ταίριασμα με κανένα από τα ακόλουθα" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Τα φιλτραρισμένα στοιχεία δεν ταιριάζουν όλα με τα ακόλουθα" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Τα ορίσματα φίλτρου υπάρχουν ήδη" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Φιλτράρισμα λιστών φακέλων" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Αποτυχία πιστοποίησης φίλτρου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Αναζήτηση &αρχείων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Αναζήτηση &φακέλων" @@ -4190,16 +4432,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Αποτύπωμα (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Αποτύπωμα:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Δακτυλικά αποτυπώματα:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Οδηγός ρύθμισης δρομολογητή (router) και τοίχους προστασίας (firewall)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4211,43 +4454,48 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Για αξιοπιστία πρέπει να ορίσετε ένα εύρος από το λιγότερο 10 θύρες." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:246 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." msgstr "" "Για αυτή τη σύνοδο θα χρησιμοποιηθούν οι προκαθορισμένες ρυθμίσεις. Η " -"οποιαδήποτε αλλαγή στις ρυθμίσεις δε θα αποθηκευθεί." +"οποιαδήποτε αλλαγή στις ρυθμίσεις δεν θα αποθηκευθεί." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Επιβολή &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Εμφάνιση των &κρυφών αρχείων" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Force showing hidden files" msgstr "Εξαναγκασμένη εμφάνιση των κρυφών αρχείων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Προδιαγραφές μορφοποίησης:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Μορφή: Μετά την επέκταση παραθέτεται (μέσα σε εισαγωγικά) η πλήρης διαδρομή " "της συσχετιζόμενης εφαρμογής και ακολουθούν τα ορίσματα, με σωστή σύνταξη." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:687 #, c-format msgid "Found new %s %s\n" msgstr "Βρέθηκε νέα %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "H Λειτουργία %s απέτυχε" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Περαιτέρω τεκμηρίωση" @@ -4255,11 +4503,15 @@ msgid "General" msgstr "Γενικά" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Γενική αποτυχία εξυπηρετητή SOCKS" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Δημιουργία..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Γενικός διαμεσολαβητής" @@ -4268,71 +4520,75 @@ msgid "Get external IP address from the following URL:" msgstr "Λήψη εξωτερικής διεύθυνσης IP από την ακόλουθη URL:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Λήψη βοήθειας" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Το εν λόγω όνομα των ορισμάτων φίλτρου υπάρχει ήδη, να αντικατασταθεί;" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Καθολικοί σελιδοδείκτες" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Σφάλμα GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Σφάλμα GnuTLS %d στο %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Σφάλμα GnuTLS %d στο %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Σφάλμα GnuTLS %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Πράσινο" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Δικαιώματα ομάδας" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "Υ&ψηλή" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP over TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Δίεση:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Κρυφό" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:892 +#: ../../locales/../src/interface/queue.cpp:948 msgid "High" msgstr "Υψηλή" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:894 +#: ../../locales/../src/interface/queue.cpp:950 msgid "Highest" msgstr "Υψηλότερη" @@ -4340,67 +4596,76 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "O υψηλότερος αριθμός θύρας πρέπει να είναι ανάμεσα στο 1024 και 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Κρατήστε το πλήκτρο shift για την εναλλαγή της κατάστασης του φίλτρου και " "στις δύο πλευρές ταυτόχρονα." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Προσωπική Σελίδα:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Ο κόμβος είναι εκτός λειτουργίας" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Αποτύπωμα κλειδιών κόμβου:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Το κλειδί του κόμβου δεν ταιριάζει" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." -msgstr "Ο κόμβος ξεκινάει με '[' αλλά η αγκύλη κλεισίματος δε βρέθηκε." +msgstr "Ο κόμβος ξεκινάει με '[' αλλά η αγκύλη κλεισίματος δεν βρέθηκε." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Μη προσπελάσιμος κόμβος" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Κόμβος:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Αλγόριθμος:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Ώρες," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"&Ξέχασα τον κύριο κωδικό μου. Διαγράψτε όλους τους κωδικούς πρόσβασης που " +"είναι αποθηκευμένοι με αυτό το κλειδί." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (παράδειγμα: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Οι διευθύνσεις IPv6 δεν υποστηρίζονται με SOCKS4 διαμεσολαβητή" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " "reconnect." msgstr "" -"Εάν τα δεδομένα δε μπορούν να σταλθούν ή να ληφθούν για χρονικό διάστημα " +"Εάν τα δεδομένα δεν μπορούν να σταλθούν ή να ληφθούν για χρονικό διάστημα " "μεγαλύτερο από το προκαθορισμένο, η σύνδεση θα τερματιστεί και το FileZilla " "θα επιχειρήσει να επανασυνδεθεί." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Για την αποστολή αναφορών σφαλμάτων, απαιτούνται \"Αναλυτικές\" πληροφορίες " @@ -4413,7 +4678,7 @@ "you should try active mode. You can set the transfer mode on a per-server " "basis in the Site Manager." msgstr "" -"Εάν η αυτόματη δοκιμή του οδηγού ολοκληρωθεί επιτυχώς, αλλά δε μπορείτε να " +"Εάν η αυτόματη δοκιμή του οδηγού ολοκληρωθεί επιτυχώς, αλλά δεν μπορείτε να " "μεταφέρετε αρχεία σε ένα συγκεκριμένο εξυπηρετητή, ίσως να οφείλεται στο ότι " "ο εξυπηρετητής είναι λάθος ρυθμισμένος και θα πρέπει να δοκιμάσετε την " "ενεργητική κατάσταση. Μπορείτε να ορίσετε την κατάσταση μεταφοράς σε μία ανά-" @@ -4428,7 +4693,7 @@ "με λάθος ρυθμισμένους εξυπηρετητές που απορρίπτουν την επιλεγμένη κατάσταση " "μεταφοράς." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4436,7 +4701,7 @@ "Αν η αλλαγή του κλειδιού δεν ήταν αναμενόμενη, παρακαλώ επικοινωνήστε με το " "διαχειριστή του συστήματος." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4444,7 +4709,7 @@ "Εάν το πρόβλημα συνέχισει να υπάρχει, πιθανόν κάποιος δρομολογητής ή " "firewall συνεχίζει να εμποδίζει το FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4452,7 +4717,7 @@ "Εάν το πρόβλημα συνέχισει να υπάρχει, πιθανόν κάποιος δρομολογητής (router) " "ή/και τοίχος προστασίας (firewall) συνεχίζει να διακόπτει τη σύνδεση." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4463,7 +4728,7 @@ "επικαλύπτοντας παλαιότερα αρχεία συμβάντων), με αποτέλεσμα την δημιουργία " "νέου αρχείου." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4472,7 +4737,7 @@ "διαγράψει τη συμβολική σύνδεση είτε να αφαιρέσει τα περιεχόμενα του " "συνδεμένου φακέλου." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4480,14 +4745,14 @@ "Εάν το πρόβλημα συνέχισει να υπάρχει, επικοινωνήστε με τον κατασκευαστή του " "δρομολογητή ή firewall σας για κάποια λύση." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον κατασκευαστή του δρομολογητή " "σας." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4498,7 +4763,7 @@ "διαφέρει (δλδ. διαφορετική ζώνη), όριστε την διαφορά ζώνης στο διαχειριστή " "τοποθεσιών." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4507,7 +4772,7 @@ "χρονικής σφραγίδας, θα πρέπει η διαφορά της χρονικής σφραγίδας να μην " "υπερβαίνει το κατώτατο όριο που έχει οριστεί." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Για να αλλάξετε τη γλώσσα, θα πρέπει να επανεκκινήσετε το FileZilla." @@ -4519,11 +4784,11 @@ "Εάν κάνετε κλικ στο δοκιμή, το FileZilla θα συνδεθεί στο probe.filezilla-" "project.org και θα εκτελέσει κάποιες απλές δοκιμές." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1256 msgid "If you close FileZilla, your changes will be lost." -msgstr "Εάν κλείσετε το FileZilla, οι αλλαγές θα χαθούν" +msgstr "Εάν κλείσετε το FileZilla, οι αλλαγές θα χαθούν." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4535,7 +4800,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "Εάν λάβετε κάποιο σφάλμα, τότε οι ρυθμίσεις σας δεν είναι οι σωστές." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4543,7 +4808,7 @@ "Εάν έχετε προβλήματα στην ανάκτηση των λιστών φακέλων ή στην μεταφορά " "αρχείων, δοκιμάστε να αλλάξετε την προκαθορισμένη κατάσταση μεταφοράς." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4579,7 +4844,7 @@ "Εάν χρησιμοποιείτε κάποιο δρομολογητή (router), ελέγξτε αν όλες αυτές οι " "θύρες μπορούν να προωθήσουν δεδομένα στον υπολογιστή που τρέχει το FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4587,16 +4852,16 @@ "Εάν ο δρομολογητής (router) σας συνεχίζει να αλλάζει την διεύθυνση IP σας, " "επικοινωνήστε με τον κατασκευαστή του." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Εισαγωγή δεδομένων από παλαιότερη έκδοση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Εισαγωγή ρυθμίσεων" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Επιτυχής εισαγωγή" @@ -4623,7 +4888,7 @@ "σύστημα σας." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4639,21 +4904,13 @@ msgstr "" "Στην παθητική κατάσταση, που είναι η προτεινόμενη για τους περισσότερους " "χρήστες, το FileZilla ζητά από τον εξυπηρετητή μία θύρα και συνδέεται σε " -"αυτή. Δε χρειάζονται ιδιαίτερες ρυθμίσεις γι' αυτό." - -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Ελλιπής αλυσίδα, το κορυφαίο πιστοποιητικό δεν είναι υπογεγραμμένο " -"πιστοποιητικό από την αρμόδια αρχή έκδοσης πιστοποιητικών" +"αυτή. Δεν χρειάζονται ιδιαίτερες ρυθμίσεις γι' αυτό." -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "Λανθασμένος κωδικός πρόσβασης" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4661,21 +4918,21 @@ "Δεν μπόρεσαν να ανακτηθούν πληροφορίες σχετικά με την πιο πρόσφατη έκδοση " "του FileZilla. Παρακαλώ δοκιμάστε ξανά αργότερα." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Αρχικοποίηση TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 msgid "Insecure algorithm!" msgstr "Επισφαλής αλγόριθμος!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Επισφαλής εξυπηρετητής, δεν υποστηρίζει FTP με TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:578 +#: ../../locales/../src/engine/server.cpp:602 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Διαδραστικός" @@ -4683,29 +4940,29 @@ msgid "Interface" msgstr "Διεπαφή" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Διακόπηκε με σύνθημα" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:216 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "Διακόπηκε από τον χρήστη" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:36 +#: ../../locales/../src/engine/http/request.cpp:363 msgid "Invalid Content-Length" msgstr "Μη έγκυρο μέγεθος περιεχομένων" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:260 msgid "Invalid HTTP Response" msgstr "Μη έγκυρη απάντηση HTTP" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Μη έγκυρο όρισμα" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:454 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4713,46 +4970,65 @@ "Ελήφθη λάθος ακολουθία χαρακτήρων, απενεργοποίηση του UTF-8. Επιλέξτε την " "επιλογή UTF-8 στο διαχειριστή τοποθεσιών για να χρησιμοποιήσετε UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Invalid chunk size" msgstr "Μη έγκυρο μέγεθος τμήματος" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Λήψη λανθασμένων δεδομένων" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Λανθασμένη ημερομηνία" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Λανθασμένο όνομα αρχείου" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Μη έγκυρος κόμβος. Μετά τον εγκιβωτισμό (κλείνει η αγκύλη) πρέπει να " "ακολουθεί η άνω κάτω τελεία και η θύρα." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Λάθος όνομα κόμβου: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Μη έγκυρη εισαγωγή" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:317 +msgid "Invalid line" +msgstr "Μη έγκυρη γραμμή" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Μη έγκυρη διαδρομή" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Δόθηκε λανθασμένος αριθμός θύρας. Η θύρα πρέπει να έχει τιμή από 1 εως 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4766,74 +5042,74 @@ "ftps:// για FTP μέσω TLS (σιωπηρά) και\n" "ftpes:// για FTP μέσω TLS (σαφή)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Μη έγκυρος κόμβος. Μετά την αγκύλη κλεισίματος πρέπει να ακολουθούν η άνω " "κάτω τελεία και η θύρα." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Μη έγκυρη τυπική έκφραση" + +#: ../../locales/../src/interface/search.cpp:728 msgid "Invalid regular expression in search conditions." msgstr "Μη έγκυρη έκφραση στις συνθήκες αναζήτησης." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:269 msgid "Invalid response code" msgstr "Μη έγκυρος κωδικός απάντησης" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:723 #, c-format msgid "Invalid search conditions: %s" msgstr "Μη έγκυρες συνθήκες αναζήτησης: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Μη έγκυρη διαδρομή" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Μη έγκυρο μέγεθος στην συνθήκη" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Δόθηκε μη έγκυρο όνομα χρήστη." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Μη έγκυρη τιμή για ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Μη έγκυρη τιμή για περιηγήσεις" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Αντιστροφή Φίλτρου" + +#: ../../locales/../src/interface/verifycertdialog.cpp:260 msgid "Jurisdiction country:" msgstr "Κράτος δραστηριοποίησης:" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Jurisdiction locality:" msgstr "Περιοχή δραστηριοποίησης:" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:261 msgid "Jurisdiction state or province:" msgstr "Περιφέρεια ή νομαρχία δραστηριοποίησης:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Κράτησε τους φακέλους στο επάνω μέρος" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:714 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4844,7 +5120,7 @@ "ενεργοποιημένη. Παρότι το FileZilla εκτελεί κάποιες δοκιμές για να ελέγξει " "αν ο εξυπηρετητής υποστηρίζει αυτή τη δυνατότητα, μπορεί να αποτύχει." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Ανταλλαγή κλειδιού" @@ -4852,123 +5128,141 @@ msgid "Key exchange:" msgstr "Ανταλλαγή κλειδιού:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:575 +#: ../../locales/../src/engine/server.cpp:600 msgid "Key file" msgstr "Αρχείο &Κλειδί" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Αναγνωριστικό κλειδιού:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Χ&αμηλότερη" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Γλώσσα" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1541 msgid "Language changed" msgstr "Εφαρμογή τροποποίησης γλώσσας" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:291 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:158 msgid "Last modified" msgstr "Τελευταία τροποποίηση" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Εμφάνιση" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1803 +msgid "Leave empty to keep existing password." +msgstr "Αφήστε κενό το πεδίο, για να διατηρήσετε τον υφιστάμενο κωδικό." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Όριο ταυτόχρονων &λήψεων:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Όριο ταυτόχρονων &αποστολών:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Όριο τοπικών θυρών" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Όριο μεγέθους του αρχείου συμβάντων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Όριο:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:427 msgid "Line length exceeded" msgstr "Το μήκος γραμμής ξεπεράστηκε" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Πρόσθετα στοιχεία" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Το listen socket έκλεισε" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "Λίστα:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Χα&μηλότερη διαθέσιμη θύρα:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Τοπικά" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Τοπική διεύθυνση σε χρήση" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Το τοπικό καταληκτικό σημείο έχει κλείσει" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Τοπικό αρχείο" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Το τοπικό αρχείο δεν υπάρχει." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:401 +#: ../../locales/../src/interface/updater.cpp:494 #, c-format msgid "Local file is %s\n" msgstr "Τοπικό αρχείο %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Το τοπικό αρχείο είναι ένας φάκελος αντί ενός κανονικού αρχείου." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Το τοπικό αρχείο δεν έχει έγκυρο όνομα αρχείου." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:686 +#: ../../locales/../src/interface/search.cpp:692 +msgid "Local file search" +msgstr "Aναζήτηση τοπικού αρχείου" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Τοπικά φίλτρα:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Διαχείριση τοπικής διαδρομής:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Τοπική τοποθεσία:" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Locality:" msgstr "Τοποθεσία:" @@ -4976,16 +5270,16 @@ msgid "Log file" msgstr "Αρχείο Συμβάντων" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "Σε σύνδεση" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Καταγραφή" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4994,7 +5288,7 @@ "να μην υποστηρίζει UTF-8. Δεν είναι δυνατή η επαναφορά στην τοπική " "κωδικοποίηση χαρακτήρων που χρησιμοποιεί ο διαμεσολαβητής." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -5002,11 +5296,9 @@ "Τα στοιχεία σύνδεσης περιέχουν μη-ASCII χαρακτήρες και ο εξυπηρετητής μπορεί " "να μην υποστηρίζει UTF-8. Δοκιμάστε μια τοπική κωδικοποίηση χαρακτήρων." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "" -"Η ακολουθία σύνδεσης που εκτελείται δε διεκπεραιώθηκε ακόμα, δε συνδέθηκε. " -"Απόρριψη." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "Η ακολουθία σύνδεσης που εκτελείται δεν συνδέθηκε, ματαίωση." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -5023,13 +5315,13 @@ "Ο τύπος σύνδεσης, μπορεί να χρησιμοποιείτε συγχρόνως με μόνο μία διεύθυνση " "FTP. Τα ορίσματα πρέπει να είναι είτε'%s' είτε '%s'" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:887 +#: ../../locales/../src/interface/queue.cpp:943 msgid "Low" msgstr "Χαμηλή" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:885 +#: ../../locales/../src/interface/queue.cpp:941 msgid "Lowest" msgstr "Χαμηλότερη" @@ -5043,150 +5335,190 @@ msgid "MAC:" msgstr "Φυσική διεύθυνση (MAC):" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Ματζέντα" + +#: ../../locales/../src/interface/xmlfunctions.cpp:39 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Σιγουρευτείτε, ότι το αρχείο μπορεί να προσπελαστεί και είναι ένα " "καλοσχηματισμένο έγγραφο XML." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:414 +#: ../../locales/../src/engine/http/request.cpp:427 +#: ../../locales/../src/engine/http/request.cpp:437 +#: ../../locales/../src/engine/http/request.cpp:470 #, c-format msgid "Malformed chunk data: %s" msgstr "Κατεστραμένο τμήμα δεδομένων: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:36 #, c-format -msgid "Malformed header: %s" -msgstr "Κατεστραμένη κεφαλίδα: %s" +msgid "Malformed request header: %s" +msgstr "Κακοδιατυπωμένο αίτημα κεφαλίδας: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "" -"Κατεστραμένη απάντηση, ο εξυπηρετητής δε στέλνει τις κατάλληλες γραμμές " -"τερματισμού" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:489 +#, c-format +msgid "Malformed response body: %s" +msgstr "Κακοδιατυπωμένη απάντηση: %s" + +#: ../../locales/../src/engine/http/request.cpp:230 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/engine/http/request.cpp:317 +#: ../../locales/../src/engine/http/request.cpp:355 +#: ../../locales/../src/engine/http/request.cpp:363 +#: ../../locales/../src/engine/http/request.cpp:420 +#, c-format +msgid "Malformed response header: %s" +msgstr "Κακοδιατυπωμένη κεφαλίδα: %s" + +#: ../../locales/../src/engine/http/request.cpp:376 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." +msgstr "" +"Εσφαλμένη απόκριση: Ο διακομιστής έστειλε αίτηση για ενέργεια ή έναν κωδικό " +"απόκρισης που δεν επιτρέπει την ενσωμάτωση." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Χειροκίνητη μεταφορά" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Κύριος &Κωδικός:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Κύριος κωδικός πρόσβασης:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Με όλα τα ακόλουθα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Να ταιριάζει με οτιδήποτε από τα ακόλουθα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Να μην ταιριάζει με οτιδήποτε από τα ακόλουθα" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Δεν ταιριάζουν όλα με τα ακόλουθα" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Μέγιστος αριθμός ταυτόχρονων &μεταφορών:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Αποτυχία εκχώρησης μνήμης" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1856 msgid "Message log" msgstr "Αρχείο συμβάντων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Θέση αρχείου συμβάντων" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Πολύ μεγάλο μήνυμα" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Λεπτά" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Μετακίνηση &κάτω" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Μετακίνηση &πάνω" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Ο Υπολογιστής Μου" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Τα Εγγραφά Μου" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:769 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:772 msgid "My Sites" msgstr "Οι Τοποθεσίες μου" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/a" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Όνομα" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1261 msgid "Name already exists" msgstr "To όνομα ήδη υπάρχει" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "To εν λόγω όνομα σελιδοδείκτη υπάρχει ήδη." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Όνομα:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Φυσική ταξινόμηση" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Πρέπει να καταχωρίσετε όνομα φίλτρου" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:686 +msgid "Need to enter valid local path" +msgstr "Πρέπει να καταχωρίσετε έγκυρη τοπική διαδρομή" + +#: ../../locales/../src/interface/search.cpp:713 msgid "Need to enter valid remote path" msgstr "Πρέπει να καταχωρίσετε έγκυρη απομακρυσμένη διαδρομή" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1046 msgid "Need to specify a character encoding" msgstr "Πρέπει να ορίσετε μία κωδικοποίηση χαρακτήρων" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Δεν είναι γνωστό το όνομα του κόμβου ούτε το όνομα του εξυπηρετητή" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5194,12 +5526,12 @@ "Ο υποδοχέας δικτύου δεν διαθέτει διευθύνσεις που ανήκουν στην αιτούμενη " "οικογένεια διευθύνσεων" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Μη προσπελάσιμο δίκτυο" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Ποτέ" @@ -5211,37 +5543,37 @@ msgid "New &tab" msgstr "Νέα &καρτέλα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Νέος σελιδο&δείκτης" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2412 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1340 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1265 msgid "New directory" msgstr "Νέος φάκελος" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Νέες δυνατότητες και άλλες βελτιώσεις στην έκδοση %s" @@ -5250,42 +5582,42 @@ msgid "New filter" msgstr "Νέο Φίλτρο" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:950 msgid "New folder" msgstr "Νέος φάκελος" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2385 msgid "New site" msgstr "Νέα τοποθεσία" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Επόμενο στη λίστα αναμονής μεταφορών" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:389 msgid "No" msgstr "Όχι" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Καμία διεύθυνση που να σχετίζεται με το όνομα του κόμβου" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Δεν έχει επιλεχθεί καμία κατηγορία για εξαγωγή" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "No command given, aborting." msgstr "Δεν δόθηκε εντολή, ματαίωση." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "" "Καμία εξωτερική διεύθυνση IP δεν έχει οριστεί, δοκιμή της προκαθορισμένης." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Δεν υπάρχουν αρχεία που να βρίσκονται υπό επεξεργασία." @@ -5293,97 +5625,93 @@ msgid "No filter name given" msgstr "Δεν έχει οριστεί όνομα φίλτρου" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Δεν έχει οριστεί κόμβος, παρακαλώ καταχωρίστε ένα κόμβο." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Καμία διαθέσιμη εικόνα" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Δεν υπάρχουν άλλα αρχεία στη λίστα αναμονής!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Δεν έχει δοθεί όνομα για τα ορίσματα φίλτρου." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" -msgstr "Καμία εφαρμογή δε συσχετίζεται μ' αυτόν το τύπο αρχείου" +msgstr "Καμία εφαρμογή δεν συσχετίζεται μ' αυτόν το τύπο αρχείου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Καμία εφαρμογή δεν έχει συσχετιστεί για να επεξεργαστεί αρχεία με επέκταση " "'%s'." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Δεν υπάρχει δρομολογητής να φιλοξενηθεί" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:433 msgid "No search results" msgstr "Κανένα αποτέλεσμα αναζήτησης" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Καμία διαθέσιμη τοποθεσία" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Μη υποστηριζόμενη μέθοδος έγκρισης SOCKS5" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Δεν έχει οριστεί όνομα χρήστη." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Κανένα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Τίποτε δεν έχει επιλεχθεί ακόμα" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Μη ανακτήσιμο σφάλμα κατά την ανάλυση ονόματος" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:569 +#: ../../locales/../src/engine/server.cpp:596 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Normal" msgstr "Τυπικός" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "Δεν τοποθετήθηκαν όλα τα στοιχεία στη λίστα αναμονής για μεταφορά." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Δεν έχει συνδεθεί" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2054 msgid "Not connected to any server" msgstr "Δεν έχει συνδεθεί με κανέναν εξυπηρετητή" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:613 msgid "Not connected to any server." msgstr "Δεν έχει συνδεθεί με κανέναν εξυπηρετητή." @@ -5391,26 +5719,36 @@ msgid "Not connected." msgstr "Δεν έχει συνδεθεί." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Δεν έγινε προετοιμασία, πρέπει να επικαλεστείτε WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Σημείωση: Αυτό το χαρακτηριστικό υποστηρίζεται μόνο από το πρωτόκολλο FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Σημείωση: Δεν είναι δυνατή η ανάκτηση ενός χαμένου κλειδιού." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Σημείωση: Λειτουργεί μόνο με απλές, μη κρυπτογραφημένες συνδέσεις FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Σημείωση: Η χρήση ενός γενικού διαμεσολαβητή αναγκάζει τις συνδέσεις FTP να " "λειτουργούν σε παθητική κατάσταση." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/engine/http/request.cpp:420 +#, fuzzy +msgid "Null character in line" +msgstr "Φιλτράρισμα μη έγκυρων χαρακτήρων στα ονόματα αρχείων" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Αριθμός δεκαδικών θέσεων:" @@ -5418,42 +5756,42 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Ο Αριθμός των προσπαθειών πρέπει να είναι ανάμεσα σε 0 και 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "Ά&νοιγμα αρχείου" - #: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "ΟΚ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" -msgstr "Έκδοση Λειτουργικού Συστήματος::" +msgstr "Έκδοση Λειτουργικού Συστήματος:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" @@ -5463,15 +5801,15 @@ "Στις επόμενες σελίδες, θα ρυθμιστεί η κατάσταση μεταφοράς, καθώς και η " "κατάσταση επιστροφής αν είναι ενεργοποιημένη." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "Once" msgstr "Μία" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Μία φορά την ημέρα" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Κάθε εβδομάδα" @@ -5479,25 +5817,38 @@ msgid "Only use plain FTP (insecure)" msgstr "Χρήση μόνο απλού FTP (επισφαλές)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "&Άνοιγμα αρχείου" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Ανοικτός κατάλογος στο διαχειριστή αρχείων του συστήματος" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Άνοιγμα του διαχειριστή τοποθεσιών" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Άνοιγμα του Διαχειριστή τοποθεσιών." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Άνοιγμα του Διαχειριστή τοποθεσιών. Δεξί-πλήκτρο για τη λίστα αρχείων της " "τοποθεσίας." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Ανοίξτε το παράθυρο διαλόγου δικαιωμάτων πρόσβασης φακέλων για να " +"διαμορφώσετε τους τοπικούς φακέλους που θα έχει πρόσβαση το FileZilla." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Άνοιγμα αρχείου." @@ -5505,14 +5856,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Ανοίγμα διαλόγου ρυθμίσεων του FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Ανοιγμένα ως:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1775 +#: ../../locales/../src/interface/LocalListView.cpp:1787 msgid "Opening failed" msgstr "Αποτυχία ανοίγματος" @@ -5524,110 +5875,118 @@ msgid "Opens the Site Manager" msgstr "Άνοιγμα του διαχειριστή τοποθεσιών" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Άνοιγμα διαλόγου της λίστας φακέλων. Δεξί-πλήκτρο για την εναλλαγή των " "φίλτρων." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Λειτουργικό Σύστημα:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Η λειτουργία είναι ήδη σε εξέλιξη" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Λειτουργία σε εξέλιξη" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Η λειτουργία δεν υποστηρίζεται" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Πορτοκαλί" + +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Organization:" msgstr "Οργανισμός:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Άλλες SFTP επιλογές" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Άλλο σφάλμα συστήματος" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Other:" msgstr "Άλλα:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Εξαντλήθηκε η μνήμη" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Περιγραφή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Αντικατάσταση &αν είναι νεώτερο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Αντικατάσταση αρχείου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Αντικατάσταση αρχείου αν είναι διαφορετικού μεγέθους" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "" "Αντικατάσταση αρχείου αν είναι διαφορετικού μεγέθους ή αν είναι νεώτερο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Αντικατάσταση αρχείου αν είναι νεώτερο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Αντικατάσταση αν είναι &διαφορετικού μεγέθους" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Αντικατάσταση αν είναι διαφορετικού &μεγέθους ή αν είναι νεώτερο" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" msgstr "Τύπος ίδιας κατασκευής: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Δικαιώματα ιδιοκτήτη" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "Ιδιοκτήτης/Ομάδα" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5635,33 +5994,33 @@ "Αποτροπή του συστήματος να εισέλθει το σε κατάσταση ύπνωσης κατά τη διάρκεια " "των ενεργών μεταφορών και των άλλων διαδικασιών" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Κόμβος διαμεσολαβητή:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "" "Η εντολή PORT μολύνθηκε από το δρομολογητή (router) ή από το τοίχος " "προστασίας (firewall)." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Πα&θητική (συνιστάται)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Parameter not a valid URL" msgstr "Η παράμετρος δεν είναι έγκυρη URL" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:574 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Αναλύθηκαν τα %d bytes των πληροφοριών της έκδοσης.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Κωδ&ικός πρόσβασης:" @@ -5669,66 +6028,81 @@ msgid "Passive (recommended)" msgstr "Παθητική (συνιστάται)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Παθητική κατάσταση" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Η παθητική κατάσταση επιλέχθηκε ως προκαθορισμένη κατάσταση μεταφοράς." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Ο κωδικός πρόσβασης ή το κλειδί κρυπτογράφησης δεν έχει οριστεί" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Απαιτείται κωδικός πρόσβασης" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Κωδικοί πρόσβασης" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:155 msgid "Path" msgstr "Διαδρομή" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:40 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Αδυναμία δημιουργίας διαδρομής για τον φάκελο %s και τον υποφάκελο %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 msgid "Path not found:" msgstr "Η διαδρομή δεν βρέθηκε:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Διαδρομές" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Αναμονή διαγραφής" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Άδεια" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Άρνηση πρόσβασης" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:159 msgid "Permissions" msgstr "Δικαιώματα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Πλατφόρμα:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" +"Προσθέστε ξανά τοπικούς καταλόγους για τους οποίους θέλετε να " +"χρησιμοποιήσετε το FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5736,6 +6110,14 @@ "Παρακαλώ, ελέγξτε την τοποθεσία https://filezilla-project.org/probe.php και " "στη συνέχεια ελέγξτε προσεκτικά τις ρυθμίσεις σας." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:116 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Ελέγξτε τα δικαιώματα που έχετε χορηγήσει και προσθέστε τους τοπικούς " +"φακέλους που λείπουν, στο παράθυρο διαλόγου που ακολουθεί." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5745,13 +6127,13 @@ "(routers) έτσι ώστε το FileZilla να μπορεί να εδραιώσει εξωτερικές συνδέσεις " "σε αυθαίρετες θύρες." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Παρακαλώ, απενεργοποιείστε στο δρομολογητή σας ρυθμίσεις όπως 'DMZ mode' ή " "'Game mode'." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5767,7 +6149,7 @@ msgid "Please enter a custom time format." msgstr "Παρακαλώ, καταχωρίστε μία προσαρμοσμένη μορφή ώρας." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" @@ -5775,7 +6157,7 @@ "παράδειγμα 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5785,16 +6167,16 @@ msgid "Please enter a name for the new filter." msgstr "Παρακαλώ, καταχωρίστε ένα όνομα για το νέο φίλτρο." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Παρακαλώ, καταχωρίστε ένα νέο όνομα για το αντιγραμμένο φίλτρο." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Παρακαλώ, καταχωρίστε ένα νέο όνομα για τα ορίσματα φίλτρου \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Παρακαλώ, καταχωρίστε ένα νέο όνομα για το φίλτρο." @@ -5821,20 +6203,10 @@ "Παρακαλώ, καταχωρίστε έναν αριθμό μεταξύ 0 και 10 για τον αριθμό ταυτόχρονων " "μεταφορών." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Παρακαλώ, καταχωρίστε τον κωδικό γι' αυτό τον εξυπηρετητή:" -#: ../../locales/../src/interface/QueueView.cpp:2109 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Παρακαλώ, καταχωρίστε την διαδρομή και το προς εκτέλεση αρχείο.\n" -"π.χ. c:\\somePath\\file.exe σε MS Windows ή /somePath/file σε Unix.\n" -"Μπορείτε επίσης, προαιρετικά να ορίσετε τις παραμέτρους του προγράμματος." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5842,33 +6214,33 @@ "Παρακαλούμε εισάγετε ένα χρονικό όριο μεταξύ 10 και 9999 δευτερόλεπτα ή 0 " "για να απενεργοποιήσετε τα χρονικά όρια." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Παρακαλώ, καταχωρίστε ένα μοναδικό όνομα για αυτό το όρισμα φίλτρου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Παρακαλώ, καταχωρίστε το όνομα χρήστη γι' αυτόν τον εξυπηρετητή:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Παρακαλώ, καταχωρίστε ένα έγκυρο εύρος θυρών." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "" "Παρακαλώ καταχωρίστε ένα URL από το οποίο παίρνετε την εξωτερική σας " "διεύθυνση" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Παρακαλώ, καταχωρίστε ένα όριο ταχύτητας αποστολής μεγαλύτερο ή ίσο με 0 %s/" "s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:625 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5876,29 +6248,50 @@ "Παρακαλώ, καταχωρίστε μία ακατέργαστη εντολή FTP.\n" "Η χρήση ακατέργαστων εντολών FTP θα καθαρίσουν την προσωρινή μνήμη φακέλων." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1867 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Παρακαλώ, εισάγετε την πλήρη διαδρομή του προγράμματος και τα ορίσματα του. " +"Αυτή η εντολή θα εκτελεστεί όταν η ουρά αναμονής θα έχει ολοκληρωθεί.\n" +"π.χ. c:\\somePath\\file.exe σε MS Windows ή /somePath/file σε Unix.\n" +"Πρέπει να παραθέσετε σωστά τις εντολές και τα ορίσματα τους εάν περιέχουν " +"κενά." + +#: ../../locales/../src/interface/LocalListView.cpp:944 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1252 msgid "Please enter the name of the directory which should be created:" msgstr "Παρακαλώ, καταχωρίστε το όνομα του φακέλου που πρέπει να δημιουργηθεί:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2668 msgid "Please enter the name of the file which should be created:" msgstr "Παρακαλώ, καταχωρίστε το όνομα του αρχείου που πρέπει να δημιουργηθεί:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "" "Παρακαλώ, καταχωρίστε όνομα χρήστη και κωδικό πρόσβασης γι' αυτό τον " "εξυπηρετητή:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Εισαγάγετε τον τρέχοντα κύριο κωδικό πρόσβασης για να αλλάξετε τις ρυθμίσεις " +"κωδικού πρόσβασης." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Παρακαλώ, καταχωρίστε την εξωτερική διεύθυνση IP σας" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5909,6 +6302,13 @@ "γνωρίζετε την εξωτερική σας διεύθυνση, χρησιμοποιείστε την επιλογή " "εξωτερικού αναλυτή." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Πληκτρολογήστε τον κύριο κωδικό για να αποκρυπτογραφήσετε τον κωδικό " +"πρόσβασης για αυτόν τον διακομιστή:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5917,7 +6317,7 @@ "Παρακαλώ, ακολουθήστε τις οδηγίες προσεκτικά, καθώς η εσφαλμένη ρύθμιση θα " "αποτρέψει τις επιτυχημένες συνδέσεις FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5926,13 +6326,13 @@ "και ελέγξτε αν έχετε πληκτρολογήσει σωστά την διεύθυνση του αναλυτή " "διευθύνσεων." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Σιγουρευτείτε ότι η αιτούμενη τοπική προσαρμογή θα εγκατασταθεί στο σύστημα " "σας." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5957,7 +6357,7 @@ "trojan ή άλλο κακόβουλο πρόγραμμα. Αυτό μπορεί να προκαλέσει λάθος συναγερμό " "που εσείς πρέπει να αγνοήσετε." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:752 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5966,7 +6366,7 @@ "εξυπηρετητές FTP, FTPS και FTPES λειτουργεί μόνο εάν αυτοί υποστηρίζουν την " "εντολή MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5975,7 +6375,7 @@ "απαγορέψουν την πρόσβαση, αν προσπαθείτε να επανασυνδεθείτε σε τακτά και " "πολύ μικρά χρονικά διαστήματα." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5985,11 +6385,19 @@ "περίπτωση που ξαφνικά υπάρχουν προβλήματα με εξυπηρετητές που λειτουργούσαν " "παλαιότερα." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Αποθηκεύστε αυτό το κλειδί σε ασφαλή τοποθεσία. Χωρίς το σωστό κλειδί, τα " +"απεσταλμένα σας αρχεία δεν είναι προσβάσιμα." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Παρακαλώ, επιλέξτε ενέργεια:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Παρακαλώ, επιλέξτε τις κατηγορίες που θέλετε να εισάγετε." @@ -6021,7 +6429,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Παρακαλώ, επιλέξτε τις νέες ιδιότητες για τα επιλεγμένα αρχεία." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -6035,37 +6443,37 @@ "χρησιμοποιήσετε τη χειροκίνητη προώθηση δεδομένων στις θύρες. Ο δρομολογητή " "δεν πρέπει να λειτουργεί σε καταστάσεις 'DMZ' ή 'game mode'." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Θέ&ση του αρχείου συμβάντων:" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Postal code:" msgstr "Ταχυδρομικός κωδικός:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "Προ&δέσμευση χώρου πριν από τη λήψη" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Προδέσμευση" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2113 msgid "Predefined Sites" msgstr "Προκαθορισμένες τοποθεσίες" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:751 msgid "Preserving file timestamps" msgstr "Διατήρηση των χρονικών σφραγίδων στα αρχεία" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Προεπισκόπηση:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Προεπισκόπηση" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "" "Η κύρια σύνδεση και τα πιστοποιητικά σύνδεσης δεδομένων δεν ταιριάζουν." @@ -6080,15 +6488,15 @@ msgid "Print version information to stdout and exit" msgstr "Εκτύπωση πληροφοριών έκδοσης και έξοδος" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Προταιρεότητα στους φακέλους (προκαθορισμένο)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Priority" msgstr "Προτεραιότητα" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6096,7 +6504,7 @@ "Πολιτική απορρήτου: Μόνο η αρχιτεκτονική της CPU, η εκδοσή του FileZilla και " "το λειτουργικό σύστημα που χρησιμοποιείτε θα υποβληθούν στον εξυπηρετητή." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Ιδιωτικά κλειδιά:" @@ -6104,31 +6512,31 @@ msgid "Pro&tocol:" msgstr "Πρω&τόκολλο:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Κωδικός πρόσβασης διαμεσολαβητή:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Επεξεργασία &λίστας αναμονής" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Διαδικασία υπερχείλισης πίνακα αρχείων" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Επεξεργασμένα %s από %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Το πρωτόκολλο δεν υποστηρίζεται" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Το πρωτόκολλο δεν υποστηρίζεται από το συγκεκριμένο τύπο υποδοχέα" @@ -6136,55 +6544,56 @@ msgid "Protocol:" msgstr "Πρωτόκολλο:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "&Θύρα διαμεσολαβητή:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Διαμεσολαβητής &χρήστη:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Αποτυχία πιστοποίησης διαμεσολαβητή" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Απέτυχε η χειραψία με το διαμεσολαβητή: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." -msgstr "Ο διαμεσολαβητής ξεκινάει με '[' αλλά η αγκύλη κλεισίματος δε βρέθηκε." +msgstr "" +"Ο διαμεσολαβητής ξεκινάει με '[' αλλά η αγκύλη κλεισίματος δεν βρέθηκε." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Απάντηση διαμεσολαβητή: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:520 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Το αίτημα απορρίφτηκε από το διακομιστή. Η απάντηση του διακομιστή: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Απέτυχε το αίτημα του διαμεσολαβητή: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Το αίτημα του διαμεσολαβητή απορρίφθηκε: Άγνωστος τύπος διεύθυνσης ως " "απάντηση κατά την σύνδεση" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Μη έγκυρη θύρα διαμεσολαβητή" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Πιστοποίηση Δημόσιου Κλειδιού" @@ -6192,68 +6601,78 @@ msgid "Public key algorithm:" msgstr "Αλγόριθμος δημοσίου κλειδιού:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Δημόσια δικαιώματα" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2773 msgid "Queue has been fully processed" msgstr "Η λίστα αναμονής έχει υποβληθεί σε πλήρης επεξεργασία" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Λίστα αναμονής: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Λίστα αναμονής: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Λίστα αναμονής: κενή" -#: ../../locales/../src/interface/QueueView.cpp:438 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Αρχεία σε λίστα αναμονής" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Λίστα αναμονής:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Γρήγορη Αναζήτηση:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "" +"Η γρήγορη αναζήτηση δεν μπορεί να αρχίσει κατά την σύγκριση των φακέλων." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" msgstr "Ε&πανεκκίνηση συστήματος" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "&Δομή απομακρυσμένων φακέλων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "Ε&παναφορά και επανατοποθέτηση των επιλεγμένων αρχείων" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "Raw FTP command" msgstr "Aκατέργαστη εντολή FTP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Αν&άγνωση" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "Ανα&νέωση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Με&τονομασία" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6262,20 +6681,20 @@ "τις επιλογές όλων των δρομολογητών (routers) και των τοίχων προστασίας " "(firewalls)." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Ανά&γνωση" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Μόνο-Ανάγνωση" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/interface/Mainfrm.cpp:1116 msgid "Really cancel current operation?" msgstr "Ακύρωση τρέχουσας λειτουργίας;" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1421 +#: ../../locales/../src/interface/search.cpp:1235 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6284,21 +6703,21 @@ msgstr[1] "" "Να διαγραφούν οι φάκελοι %d, καθώς και τα περιεχόμενα τους από το διακομιστή;" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:1232 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Να διαγραφεί το αρχείο %d από το διακομιστή;" msgstr[1] "Να διαγραφούν τα αρχεία %d από το διακομιστή;" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1426 +#: ../../locales/../src/interface/search.cpp:1240 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Να διαγραφεί το %s και το %s από το διακομιστή;" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1070 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Να διαγραφούν όλα τα επιλεγμένα αρχεία και/ή οι φάκελοι από το διακομιστή;" @@ -6309,133 +6728,139 @@ "Να διαγραφούν όλα τα επιλεγμένα αρχεία και/ή οι φάκελοι από τον υπολογιστή " "σας;" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Reason" msgstr "Αιτία" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2766 msgid "Reboot now" msgstr "Επανεκκίνηση τώρα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Επα&ναληπτικά στους υποφακέλους" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Ελήφθη προειδοποίηση TLS από το διακομιστή: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3075 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" "Ελήφθησαν περιεχόμενα καταλόγου τα οποία πυθανόν να έχουν κωδικοποιηθεί σε " "EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2057 +#: ../../locales/../src/engine/directorylistingparser.cpp:2074 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Λήφθηκε μια γραμμή με πάνω από 10000 χαρακτήρες, ματαίωση." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Η ληφθείσα αλυσίδα πιστοποιητικών δεν ήταν δυνατό να επαληθευτεί. Η " +"κατάσταση επαλήθευσης είναι %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Λαμβάνονται ανεπιθύμητα δεδομένα" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:553 msgid "Received invalid character in version information" msgstr "Λήφθηκαν μη έγκυροι χαρακτήρες στις πληροφορίες έκδοσης" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Ελήφθη άγνωστη προειδοποίηση TLS %d από το διακομιστή" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:546 msgid "Received version information is too large" msgstr "Λήφθηκαν πληροφοριών έκδοσης υπερβολικά μεγάλες" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." msgstr "" -"Τα στοιχεία επανασύνδεσης δε μπορούν να καθαριστούν κατά την διάρκεια " +"Τα στοιχεία επανασύνδεσης δεν μπορούν να καθαριστούν κατά την διάρκεια " "σύνδεσης σε έναν εξυπηρετητή.\n" "Αν συνεχίσετε, η σύνδεση σας θα τερματιστεί." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Ρυθμίσεις επανασύνδεσης" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Επανασύνδεση στον εξυπηρετητή που χρησιμοποιήθηκε την τελευταία φορά" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." -msgstr "Προσθήκη Αρχείων στη Λίστα Αναμονής Αναδρομικά" +msgstr "Αναδρομικά, προσθήκη Αρχείων στη Λίστα Αναμονής." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." -msgstr "Αλλαγή Δικαιωμάτων Αναδρομικά" +msgstr "Αναδρομικά, αλλαγή δικαιωμάτων." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." -msgstr "Αναδρομική Διαγραφή Αρχείων και Φακέλων" +msgstr "Αναδρομική διαγραφή αρχείων και φακέλων." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Κόκκινο" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Σφάλμα κατά την αναδρομολόγηση ή δεν υποστηρίζεται URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Σφάλμα κατά την αναδρομολόγηση ή λάθος διεύθυνση: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Ανανέωση των λιστών αρχείων και φακέλων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Απομνημόνευση κωδικών πρόσβασης;" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Αφαίρεση" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Απομακρυσμένο πιστοποιητικό μη εμπιστεύσιμο." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Remote file" msgstr "Απομακρυσμένο αρχείο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/search.cpp:713 msgid "Remote file search" msgstr "Αναζήτηση απομακρυσμένου αρχείου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Απομακρυσμένα φίλτρα:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Απομακρυσμένη διαδρομή" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6445,7 +6870,7 @@ "έγκυρη, καθώς επίσης και ότι την υποστηρίζει ο τρέχων τύπος εξυπηρετητή (%s) " "της τοποθεσίας αυτής." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1174 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6455,82 +6880,87 @@ "έγκυρη, καθώς επίσης και ότι υποστηρίζεται από τον επιλεγμένο τύπο " "εξυπηρετητή (%s)." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1177 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Αδυναμία προσπέλασης της απομακρυσμένης διαδρομής. Βεβαιωθείτε ότι είναι " "έγκυρη διαδρομή." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Η απομακρυσμένη διαδρομή ήταν αδύνατο να αναλυθεί." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Διαχείριση απομακρυσμένης διαδρομής:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Απομακρυσμένη διαδρομή:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Απομακρυσμένη τοποθεσία:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Αφαίρεση &όλων" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Αφαίρεση &επιλεγμένων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:304 msgid "Rename file" msgstr "Μετονομασία αρχείου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Μετονομασία επιλεγμένου φακέλου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Μετονομασία επιλεγμένων αρχείων και φακέλων" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:595 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Μετονομασία του '%s' σε '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Επαναλάβετε τον κωδικό:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Αναφορά δυσλειτουργιών και αιτήματα για νέες δυνατότητες" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Το αίτημα απορρίφθηκε - ο πελάτης στόχος δεν εκτελείται (ή δεν ελιναι " "προσβάσιμος από το διακομιστή)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Το αίτημα απορρίφθηκε - ο πελάτης στόχος δεν μπόρεσε να επιβεβαιώσει την ID " "συμβολοσειρά χρήστη" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Τό αίτημα απορρίφθηκε ή απέτυχε" @@ -6542,43 +6972,42 @@ msgid "Require implicit FTP over TLS" msgstr "Σιωπηρή απαίτηση FTP με TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Επαναφορά και επανατοποθέτηση &όλων" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Το πρωτόκολλο είναι αγνωστό" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1081 #, c-format msgid "Resolving address of %s" msgstr "Ανάλυση διεύθυνσης για %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Ο πόρος είναι προσωρινά μη διαθέσιμος" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:357 msgid "Response:" msgstr "Απάντηση:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Αποτελέσματα:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Συνέχιση μεταφοράς αρχείου" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6587,19 +7016,21 @@ "εξυπηρετητής χρησιμοποιεί διαφορετική μορφή τερματισμού γραμμής από τον " "πελάτη." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Ανάκτηση περιεχόμενων καταλόγου \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Ανάκτηση λίστας φακέλου..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Ανάκτηση εξωτερικής διεύθυνσης IP από %s" @@ -6608,23 +7039,23 @@ msgid "S&how files currently being edited..." msgstr "Ε&μφάνιση των αρχείων που επεξεργάζονται τώρα..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "Ε&μφάνιση του Διαχειριστή τοποθεσιών κατά την εκκίνηση" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" msgstr "Τ&ερματισμός συστήματος" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "&Διακοπή" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" msgstr "Α&ναστολή λειτουργίας συστήματος" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "Σ&υγχρονισμός περιήγησης" @@ -6632,93 +7063,114 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:606 +msgid "SFTP support" +msgstr "Υποστήριξη SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Ο διαμεσολαβητής SOCKS4 θα συνδεθεί με: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"Το SOCKS5 δεν υποστηρίζει ονόματα χρηστών και κωδικούς πρόσβασης " +"μεγαλύτερους από 255 χαρακτήρες." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "&Αποθήκευση κωδικών που προστατεύονται από κύριο κωδικό πρόσβασης" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "&Αποθήκευση κωδικών πρόσβασης" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Αποθήκευση ρυθμίσεων;" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1006 msgid "Saving of password has been disabled by your system administrator." msgstr "" "Η αποθήκευση του κωδικού πρόσβασης έχει απενεργοποιηθεί από το διαχειριστή " "του συστήματος σας .." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 msgid "Saving of passwords has been disabled by you." msgstr "Η αποθήκευση των κωδικών πρόσβασης έχει απενεργοποιηθεί από εσάς." -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "Ανίχνευση αρχείων για πρόσθεση στην ουρά αναμονής" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "Ανίχνευση αρχείων προς αποστολή" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Συντελεστή κλίμακας:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Όροι &αναζήτησης:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Aναζήτηση &φακέλου:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." -msgstr "Αναζήτηση αρχείων" +msgstr "Αναζήτηση αρχείων, αναδρομικά." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Αναζήτηση αρχείων στον εξυπηρετητή" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Τύπος αναζήτησης:" + +#: ../../locales/../src/interface/statusbar.cpp:514 msgid "Security information" msgstr "Πληροφορίες ασφαλείας" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Δείτε επίσης: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Επιλο&γή εξυπηρετητή" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Επιλογή &σελίδας:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Επιλογή θέματος" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Επιλογή προκαθορισμένης ενέργειας στην περίπτωση που ένα αρχείο σε μία " "μεταφορά υπάρχει ήδη." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Επιλογή προκαθορισμένου επεξεργαστή" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6726,7 +7178,7 @@ "Επιλογή ενέργειας υπάρχοντος αρχείου αν το αρχείο στόχος ήδη υπάρχει. Η " "επιλογή είναι έγκυρη μόνο για την τρέχουσα σύνοδο." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6734,61 +7186,65 @@ "Επιλογή προεπιλογής ενέργειας υπάρχοντος αρχείου μόνο για τα επιλεγμένα " "αρχεία στη λίστα αναμονής." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "Επιλέξτε το αρχείο που περιέχει το ιδιωτικό κλειδί" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Επιλογή αρχείου για τα εξαγόμενα δεδομένα" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Επιλέξτε αρχείο για την εξαγωγή φίλτρων" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1431 msgid "Select file for exported queue" msgstr "Επιλογή αρχείου για την εξαγόμενη λίστα αναμονής" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Επιλογή αρχείου για τις εξαγόμενες ρυθμίσεις" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2457 msgid "Select file for exported sites" msgstr "Επιλογή αρχείου για τις εξαγόμενες τοποθεσίες" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Επιλογή αρχείου για εισαγωγή ρυθμίσεων" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Επιλογή αρχείου για αποστολή" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Επιλογή ονόματος για το Αρχείο Κλειδί" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Επιλέξτε τον τρόπο με τον οποίο αυτά τα αρχεία θα ανοιχτούν." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:892 msgid "Select target download directory" msgstr "Επιλογή προορισμού του φακέλου λήψης" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Επιλογή ονόματος αρχείου προορισμού" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Επιλογή κατηγοριών για εξαγωγή:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Επιλέξτε τα προσωπικά δεδομένα που θέλετε να διαγράψετε." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:851 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6796,77 +7252,77 @@ msgstr[1] "" "Επιλέχθηκαν οι φάκελοι %d καθώς και τα περιεχόμενα τους για μεταφορά." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Επιλεγμένος %d φάκελος." msgstr[1] "Επιλεγμένοι %d φάκελοι." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:849 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Επιλέχθηκε το αρχείο %d για μεταφορά." msgstr[1] "Επιλέχθηκαν τα αρχεία %d για μεταφορά." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Επιλεγμένο %d αρχείο. Συνολικό μέγεθος: %s" msgstr[1] "Επιλεγμένα %d αρχεία. Συνολικό μέγεθος: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Επιλεγμένο %d αρχείο. Συνολικό μέγεθος: Τουλάχιστον %s" msgstr[1] "Επιλεγμένα %d αρχεία. Συνολικό μέγεθος: Τουλάχιστον %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:855 #, c-format msgid "Selected %s and %s for transfer." msgstr "Επιλέχθηκε το %s και το %s για μεταφορά." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Επιλεγμένα %s και %s. Συνολικό μέγεθος: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Επιλεγμένα %s και %s. Συνολικό μέγεθος: Τουλάχιστον %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Ο επιλεγμένος επεξεργαστής δεν υπάρχει." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Το επιλεγμένο αρχείο ήδη επεξεργάζεται" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "Το επιλεγμένο αρχείο έχει ήδη φορτωθεί" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Το επιλεγμένο αρχείο είναι ήδη ανοιχτό" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Το επιλεγμένο αρχείο είναι ακόμα προς επεξεργασία" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Το επιλεγμένο φίλτρο λειτουργεί μόνο για τα τοπικά αρχεία." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6875,48 +7331,48 @@ "διαφορετικό τύπο εξυπηρετητή.\n" "Χρησιμοποιήστε ειδικούς σελιδοδείκτες γι΄αυτόν τον εξυπηρετητή." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Η επιλεγμένη θύρα συνήθως χρησιμοποιείτε από ένα άλλο πρωτόκολλο." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Αποστολή εντολών διατήρησης ενεργού FTP" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "" "Αποστολή προσαρμοσμένης εντολής στον εξυπηρετητή, σε διαφορετική περίπτωση " "δεν είναι διαθέσιμος" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Αποστολή εντολής διατήρησης ενεργού" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:259 msgid "Serial number:" msgstr "Σειριακός Αριθμός:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "Τύπος &εξυπηρετητή:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" -msgstr "Ο εξυπηρετητής δε διέκοψε κανονικά τη σύνδεση TLS" +msgstr "Ο εξυπηρετητής δεν διέκοψε κανονικά τη σύνδεση TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Ο εξυπηρετητής δεν υποστηρίζει χαρακτήρες που δεν είναι ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:269 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:266 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6925,15 +7381,19 @@ "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > %d GB. Τερματισμός " "μεταφοράς εφόσον το μέγεθος ταιριάζει." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:528 msgid "Server does not support resume of files > 2GB." msgstr "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:524 msgid "Server does not support resume of files > 4GB." msgstr "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Κλειδί υποδοχής εξυπηρετητή" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:277 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6942,7 +7402,7 @@ "Ο εξυπηρετητής ίσως να μην υποστηρίζει την επαναφορά αρχείων > %d GB. " "Τερματισμός μεταφοράς εφόσον το μέγεθος ταιριάζει." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6950,11 +7410,15 @@ "Ο εξυπηρετητής απαιτεί έναν λογαριασμό. Ορίστε έναν λογαριασμό " "χρησιμοποιώντας το διαχειριστή τοποθεσιών" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:230 +msgid "Server not sending proper line endings" +msgstr "Ο εξυπηρετητής δεν στέλνει τις κατάλληλες γραμμές τερματισμού" + +#: ../../locales/../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "Ο εξυπηρετητής επέστρεψε κενή διαδρομή." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:224 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6962,13 +7426,13 @@ "Ο εξυπηρετητής υπαγορεύει τη σύνδεση. Πρέπει να χρησιμοποιήσετε το " "διαδραστικό τύπο σύνδεσης." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Ο εξυπηρετητής απέστειλε παθητική απάντηση σε μη-δρομολογήσιμη διεύθυνση. " "Απέτυχε η παθητική μέθοδος λειτουργίας." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6976,36 +7440,47 @@ "Ο εξυπηρετητής απέστειλε παθητική απάντηση σε μη-δρομολογήσιμη διεύθυνση. " "Χρήση της διεύθυνσης του εξυπηρετητή." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:489 +msgid "Server sent too much data." +msgstr "Ο Διακομιστής αποστέλλει πάρα πολλά δεδομένα." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Ο εξυπηρετητής έστειλε μία αναπάντεχη απάντηση." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Ο Διακομιστής έστειλε μη ταξινομημένη αλυσίδα πιστοποιητικών κατά παράβαση " +"των προδιαγραφών TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Εξυπηρετητής προς Φυσική διεύθυνση (MAC) πελάτη:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Εξυπηρετητής προς αποτύπωμα πελάτη:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "&Τύπος εξυπηρετητή:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Server/Local file" msgstr "Εξυπηρετητής/Τοπικό αρχείο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Εξυπηρετητής:" @@ -7013,52 +7488,53 @@ msgid "Session details" msgstr "Λεπτομέρειες συνεδρίας" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Ορισμός &Προτεραιότητας" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:589 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Ορισμός δικαιωμάτων του '%s' στο '%s'" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Ρύθμιση δικαιωμάτων του '%s' σε '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize κλήθηκε χωρίς όνομα υποδοχής" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Ρυθμίσεις" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Ρυθμίσεις ευρετηρίου:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Πρ&οβολή ειδοποίησης φυσαλίδας" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Εμφάνιση της &ακατέργαστης λίστας φακέλου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Εμφάνιση του διαλόγου &καλωσορίσματος..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2328 msgid "Show both directory trees and continue comparing?" msgstr "" "Να εμφανιστούν οι δομές των φακέλων και να συνεχιστεί η σύγκριση μεταξύ τους;" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Εμφάνιση λεπτομερειών" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "" "Προβολή λεπτομερειών σχετικά με τις προσαρμοσμένες μορφές ημερομηνίας και " "ώρας" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Εμφανίζει τους διαθέσιμους αλγόριθμους κρυπτογράφησης TLS" @@ -7066,7 +7542,7 @@ msgid "Shows this help dialog" msgstr "Εμφάνιση του διαλόγου βοήθειας" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2762 msgid "Shutdown now" msgstr "Τερματισμός συστήματος" @@ -7074,7 +7550,11 @@ msgid "Signature algorithm:" msgstr "Αλγόριθμος υπογραφής:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Εγγραφή" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Εγγραφές &Διαχειριστή Τοποθεσιών" @@ -7082,70 +7562,75 @@ msgid "Site Manager" msgstr "Διαχειριστής τοποθεσιών" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 msgid "Site Manager - Cannot remember password" msgstr "Διαχειριστής Τοποθεσιών - Να μην αποθηκεύονται οι κωδικοί πρόσβασης" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Διαχειριστής τοποθεσίας - Δημιουργία κλειδιού" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1046 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1059 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1092 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1179 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 msgid "Site Manager - Invalid data" msgstr "Διαχειριστής τοποθεσιών - Μη έγκυρα δεδομένα" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:300 msgid "Site Manager already open" msgstr "Ο Διαχειριστής τοποθεσιών είναι ήδη ανοικτός" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Η επιλεγμένη τοποθεσία δεν υπάρχει." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Η διαδρομή τοποθεσίας πρέπει να αρχίζει με 0 ή 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Η διαδρομή τοποθεσίας είναι κακοσχηματισμένη." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Ειδικοί σελιδοδείκτες" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" "Add current connection to the site manager?" msgstr "" "Οι συγκεκριμένοι σελιδοδείκτες τοποθεσιών απαιτούν από τον εξυπηρετητή να " -"αποθηκευτούν στο Διαχειριστή Τοποθεσιών\n" +"αποθηκευτούν στο Διαχειριστή Τοποθεσιών.\n" "Να προσθέτει η τρέχουσα σύνδεση στον διαχειριστή τοποθεσιών;" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Size" msgstr "Μέγεθος" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Μορφή μεγέθους" @@ -7153,55 +7638,60 @@ msgid "Size unknown" msgstr "Άγνωστο μέγεθος" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Παράβλεψη αρχείου" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1151 +#: ../../locales/../src/engine/ControlSocket.cpp:1168 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping download of %s" msgstr "Παράκαμψη λήψης του %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Παρακάμπτοντας το μη υφιστάμενο αρχείο κλειδιού \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1154 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 +#: ../../locales/../src/engine/ControlSocket.cpp:1197 +#: ../../locales/../src/engine/ControlSocket.cpp:1275 #, c-format msgid "Skipping upload of %s" msgstr "Παράκαμψη αποστολής του %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Υπερχείλιση διεύθυνσης υποδοχέα (Socket)" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Ο υποδοχέας (Socket) είναι ήδη συνδεδεμένος" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Τερματίστηκε η λειτουργία υποδοχέα" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Ο υποδοχέας (Socket) δεν είναι συνδεδεμένος" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Ο τύπος υποδοχέα δεν υποστηρίζεται την οικογένεια διευθύνσεων" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Some files are still being edited or need to be uploaded." msgstr "Κάποια αρχεία ακόμα επεξεργάζονται ή πρέπει να αποσταλούν." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7210,32 +7700,32 @@ "από έναν δρομολογητή (router), μπορούν να απαντήσουν με την τοπική διεύθυνση " "IP τους." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Ταξινόμηση φακέλων σε σειρά" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." msgstr "" -"Η εντολή ταξινόμησης δε μπορεί να αλλάξει κατά την σύγκριση των φακέλων." +"Η εντολή ταξινόμησης δεν μπορεί να αλλάξει κατά την σύγκριση των φακέλων." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Ταξινόμηση" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "&Κατάσταση ταξινόμησης:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Η προέλευση και η διαδρομή της ενέργειας Drop είναι ταυτόσημη" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Το πηγαίο αρχείο και αρχείο προορισμού δεν πρέπει να είναι ίδια" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Ο προορισμός και ο στόχος της λειτουργίας καταστροφής είναι όμοιοι" @@ -7243,37 +7733,37 @@ msgid "Source file:" msgstr "Πηγαίο αρχείο:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Όρια ταχυτήτας" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Όρια ταχυτήτων" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:591 msgid "Speed limits are disabled, click to change." msgstr "Τα όρια ταχύτητας είναι ανενεργά, πιέστε για να αλλάξουν." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:594 msgid "Speed limits are enabled, click to change." msgstr "Τα όρια ταχύτητας είναι ενεργά, πιέστε για να αλλάξουν." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Σταθερές και δοκιμαστικές εκδόσεις" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Σταθερές εκδόσεις μόνο" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Σταθερές και δοκιμαστικές εκδόσεις" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "&Επείγουσα έναρξη μεταφοράς" @@ -7281,19 +7771,21 @@ msgid "Start with opened Site Manager" msgstr "Εκκίνηση με άνοιγμα του διαχειριστή τοποθεσιών" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" msgstr "Εκκίνηση έλεγχου ενημέρωσης %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Εκκίνηση λήψης του %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Εκκίνηση αποστολής του %s" @@ -7302,30 +7794,38 @@ msgid "Starts the local site in the given path" msgstr "Εκκίνηση τοπικής τοποθεσίας στη δεδομένη διαδρομή" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "State or province:" msgstr "Περιφέρεια ή νομαρχία:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Status" msgstr "Κατάσταση" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:298 +#: ../../locales/../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "Κατάσταση:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Διακοπή και απομάκρυνση &όλων" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Διακοπή Αναδρομικής Λειτουργίας" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Αποκεντρωμένο Νέφος Αποθήκευσης" + +#: ../../locales/../src/interface/FileZilla.cpp:613 +msgid "Storj support" +msgstr "Υποστήριξη Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Street:" msgstr "Οδός:" @@ -7341,11 +7841,11 @@ msgid "Summary of test results:" msgstr "Σύνοψη αποτελεσμάτων δοκιμής:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2770 msgid "Suspend now" msgstr "Αναστέλλεται η λειτουργία" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7353,29 +7853,33 @@ "Οι Συμβολικές συνδέσεις στα αρχεία δεν επηρεάζονται από αυτή την επιλογή, " "τέτοιες συμβολικές συνδέσεις διαγράφονται πάντα." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Συγχρονισμός περιήγησης" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Ο Συγχρονισμός περιήγησης έχει απενεργοποιηθεί." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Συγχρονισμός φακέλων." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Συντακτικό λάθος" @@ -7384,44 +7888,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2443 +#: ../../locales/../src/interface/Mainfrm.cpp:2488 msgid "Syntax error in command line" msgstr "Συντακτικό σφάλμα στην γραμμή εντολών" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Σύστημα" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Λεπτομέρειες Συστήματος" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Υπέρβαση ορίου ανοιχτών αρχείων συστήματος" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Αποτυχία λειτουργίας υποσυστήματος δικτύου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "&Γραμμή εργαλείων" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:131 msgid "TLS connection established, sending HTTP request" msgstr "Η TLS σύνδεση πραγματοποιήθηκε, αποστολή αίτησης HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "Η TLS σύνδεση πραγματοποιήθηκε, αναμονή για μήνυμα υποδοχής..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "Η TLS σύνδεση πραγματοποιήθηκε." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "Έληξε TTL" @@ -7429,77 +7933,93 @@ msgid "Target file already exists" msgstr "Το αρχείο υπάρχει ήδη" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Απομακρυσμένο αρχείο:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2686 msgid "Target filename already exists!" msgstr "Το αρχείο προορισμού υπάρχει ήδη!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "Target filename already exists, really continue?" msgstr "Το όνομα του αρχείου υπάρχει ήδη, θέλετε να συνεχίσετε;" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Προσωρινή αποτυχία κατά την ανάλυση ονόματος" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Η δοκιμή ολοκληρώθηκε με επιτυχία" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Αποτελέσματα δοκιμής" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:281 msgid "Testing resume capabilities of server" msgstr "Δοκιμή δυνατότητας επαναφοράς του εξυπηρετητή" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Τα ακόλουθα αρχεία είναι σε διαδικασία επεξεργασίας:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:782 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "" "Ο Διαχειριστής Δικτυακού Τόπου δεν είναι δυνατόν να χρησιμοποιηθεί, εκτός " "εάν το αρχείο επισκευαστεί." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:299 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " "then." msgstr "" "Ο Διαχειριστής τοποθεσιών είναι ήδη ανοιχτός σε ένα άλλο FileZilla 3.\n" -"Θέλετε να συνεχίσετε; Οποιαδήποτε αλλαγή γίνει στο Διαχειριστή τοποθεσιών δε " -"θα αποθηκευτεί." +"Θέλετε να συνεχίσετε; Οποιαδήποτε αλλαγή γίνει στο Διαχειριστή τοποθεσιών " +"δεν θα αποθηκευτεί." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." msgstr "" "Ο Διαχειριστής τοποθεσιών είναι ήδη ανοιχτός σε ένα άλλο FileZilla 3.\n" -"Παρακαλώ, κλείστε το διότι τα δεδομένα δε θα διαγραφούν." +"Παρακαλώ, κλείστε το διότι τα δεδομένα δεν θα διαγραφούν." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Η διεύθυνση που εισάγατε ήταν: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Το μέλος ai_family δεν υποστηρίζεται" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Το στοιχείο ai_socktype δεν υποστηρίζεται" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Ο σελιδοδείκτης ήταν αδύνατο να προστεθεί." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Οι σελιδοδείκτες ήταν αδύνατο να απομακρυνθούν." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Το πιστοποιητικό απαιτεί από τον διακομιστή να συμπεριλάβει μια κατάσταση " +"OCSP στην απάντησή του, αλλά η κατάσταση OCSP λείπει." + +#: ../../locales/../src/interface/statusbar.cpp:475 msgid "The connection is encrypted. Click icon for details." msgstr "Η σύνδεση με κρυπτογράφηση. Κάντε κλικ στο εικονίδιο για λεπτομέρειες." @@ -7521,35 +8041,40 @@ "Η προσαρμοσμένη μορφή ώρας δεν είναι έγκυρη ή δεν υποστηρίζονται τα " "προσδιοριστικά." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Η σύνδεση δεδομένων δεν εδραιώθηκε: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Ο προκαθορισμένος επεξεργαστής αρχείων κειμένου δεν εντοπίσθηκε." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Ο προκαθορισμένος επεξεργαστής αρχείων κειμένου είναι '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "" "Αυτό το όνομα φίλτρου υπάρχει ήδη. Παρακαλώ, επιλέξτε ένα διαφορετικό όνομα." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Οι κωδικοί πρόσβασης που έχουν εισαχθεί δεν είναι οι ίδιοι." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Η επέκταση '%s' υπάρχει ήδη στην λίστα" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 #, c-format msgid "" "The file %s already exists.\n" @@ -7558,19 +8083,19 @@ "Το αρχείο %s υπάρχει ήδη.\n" "Παρακαλώ, καταχωρίστε νέο όνομα:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1779 #, c-format msgid "" "The file '%s' cannot be opened:\n" "The associated program (%s) could not be found.\n" "Please check your filetype associations." msgstr "" -"Το αρχείο '%s' δε μπορεί να ανοιχθεί:\n" -"Το συσχετιζόμενο πρόγραμμα (%s) δε μπορεί να εντοπισθεί.\n" +"Το αρχείο '%s' δεν μπορεί να ανοιχθεί:\n" +"Το συσχετιζόμενο πρόγραμμα (%s) δεν μπορεί να εντοπισθεί.\n" "Παρακαλώ, ελέγξτε τους συσχετισμούς εφαρμογών και τύπων αρχείων." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7579,38 +8104,38 @@ "Το αρχείο '%s' περιέχει ένα κλειδί SSH1. Το πρωτόκολλο SSH1 έχει καταργηθεί, " "το FileZilla υποστηρίζει μόνο τα κλειδιά SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." -msgstr "Το αρχείο '%s' δε μπορεί να φορτωθεί ή δεν περιέχει ιδιωτικό κλειδί." +msgstr "Το αρχείο '%s' δεν μπορεί να φορτωθεί ή δεν περιέχει ιδιωτικό κλειδί." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:37 #, c-format msgid "The file '%s' could not be loaded." -msgstr "Το αρχείο '%s' δε μπορεί να φορτωθεί." +msgstr "Το αρχείο '%s' δεν μπορεί να φορτωθεί." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1775 #, c-format msgid "" "The file '%s' could not be opened:\n" "No program has been associated on your system with this file type." msgstr "" -"Το αρχείο '%s' δε μπορεί να ανοιχθεί:\n" +"Το αρχείο '%s' δεν μπορεί να ανοιχθεί:\n" "Κανένα πρόγραμμα δεν έχει συσχετιστεί με αυτόν τον τύπο αρχείου." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1787 #, c-format msgid "" "The file '%s' could not be opened:\n" "The associated command failed" msgstr "" -"Το αρχείο '%s' δε μπορεί να ανοιχθεί:\n" +"Το αρχείο '%s' δεν μπορεί να ανοιχθεί:\n" "Απέτυχε η εντολή συσχέτισης" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:789 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7622,7 +8147,7 @@ "οδηγήσει σε απώλεια δεδομένων.\n" "Θέλετε να συνεχίσετε;" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7635,7 +8160,7 @@ msgid "The file selected as default editor does not exist." msgstr "Για το αρχείο που επιλέχθηκε δεν υπάρχει προεπιλεγμένος επεξεργαστής." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7649,13 +8174,13 @@ "κωδικός θα εισαχθούν.\n" "Να συνεχιστεί η εισαγωγή;" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." -msgstr "Η στήλη όνομα αρχείου δε μπορεί να αποκρυφτεί και να μετακινηθεί." +msgstr "Η στήλη όνομα αρχείου δεν μπορεί να αποκρυφτεί και να μετακινηθεί." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." -msgstr "Η στήλη όνομα αρχείου δε μπορεί να είναι σε απόκρυψη." +msgstr "Η στήλη όνομα αρχείου δεν μπορεί να είναι σε απόκρυψη." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 #, c-format @@ -7667,20 +8192,20 @@ msgid "The following characters will be replaced: %s" msgstr "Οι ακόλουθοι χαρακτήρες θα αντικατασταθούν: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Τα ακόλουθα αρχεία επεξεργάζονται τώρα:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "" "Το ελεύθερο λογισμικό ανοιχτού κώδικα (Πρωτόκολλο Μεταφοράς Αρχείων FTP)" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Το παραγόμενο κλειδί κρυπτογράφησης είναι:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Οι καθολικοί σελιδοδείκτες ήταν αδύνατο να αποθηκευτούν." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7694,17 +8219,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Το εύρος ορίου θα πρέπει να κυμαίνεται μεταξύ του 1 και των 2000 MiB" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Δεν ήταν δυνατή η δημιουργία του τοπικού καταλόγου '%s'." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Ο τοπικός κατάλογος '%s' δεν υπάρχει." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7722,24 +8247,30 @@ "Η χαμηλότερη θύρα πρέπει να είναι λιγότερο ή ίσο με την υψηλότερη διαθέσιμη " "θύρα." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "" +"Ο κύριος κωδικός πρόσβασης πρέπει να έχει μήκος τουλάχιστον 8 χαρακτήρων." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Η νέα έκδοση δεν εντοπίστηκε, παρακαλώ δοκιμάστε ξανά αργότερα." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Η νέα έκδοση έχει αποθηκευτεί στον κατάλογο λήψεων σας." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1560 msgid "The queue will not be saved." -msgstr "Η λίστα αναμονής δε μπόρεσε να αποθηκευτεί." +msgstr "Η λίστα αναμονής δεν μπόρεσε να αποθηκευτεί." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Το απομακρυσμένο κατάλογο '%s' δεν υπάρχει." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7749,30 +8280,30 @@ "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "απομακρυσμένου φακέλου;" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Εισήχθησαν οι επιλεγμένες κατηγορίες." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Το επιλεγμένο αρχείο περιέχει δεδομένα για εισαγωγή στις ακόλουθες " "κατηγορίες:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Το επιλεγμένο αρχείο ήδη επεξεργάζεται:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Το επιλεγμένο αρχείο είναι ήδη ανοιγμένο σε κάποιο άλλο πρόγραμμα, παρακαλώ " "κλείστε το." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7782,15 +8313,15 @@ "Αυτό μπορεί να είναι επικίνδυνο και μπορεί να βλάψει το σύστημά σας.\n" "Θέλετε πραγματικά να συνεχίσετε;" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Ο εξυπηρετητής ήταν αδύνατο να προστεθεί." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Ο εξυπηρετητής απέστειλε μία αναπάντεχη ή μη αναγνωρισμένη απάντηση." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "" "Ο εξυπηρετητής χρησιμοποιεί την ακόλουθη κωδικοποίηση χαρακτήρων για τα " @@ -7805,7 +8336,7 @@ "το πιστοποιητικό και βεβαιωθείτε ότι μπορείτε να εμπιστευτείτε αυτόν τον " "εξυπηρετητή." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7815,7 +8346,7 @@ "σημαίνει ότι ο διαχειριστής άλλαξε το κλειδί ή προσπαθείτε να συνδεθείτε σε " "έναν άλλον υπολογιστή, προσποιούμενοι τον εξυπηρετητή." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7823,11 +8354,15 @@ "Το κλειδί του κόμβου εξυπηρετητή είναι άγνωστο. Δεν υπάρχει εγγύηση ότι " "αυτός ο εξυπηρετητής είναι ο υπολογιστής που πιστεύετε ότι είναι." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Το όνομα του διακομιστή δεν ταιριάζει με το πιστοποιημένο όνομα" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "Η παράμετρος servname δεν υποστηρίζεται από ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7835,20 +8370,20 @@ "Οι ρυθμίσεις έχουν εισαχθεί. Επανεκκινήστε το FileZilla για να εκτελεστούν " "οι ρυθμίσεις." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Η συγκεκριμένη οικογένεια διευθύνσεων δεν υποστηρίζεται" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Το καθορισμένο όνομα δικτύου δεν είναι πλέον διαθέσιμο" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2765 msgid "The system will soon reboot unless you click Cancel." msgstr "" "Το σύστημα θα επανεκκίνηθεί, εκτός αν επιλέξετε να ακυρωθεί η ενέργεια αυτή." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2761 msgid "The system will soon shut down unless you click Cancel." msgstr "" "Το σύστημα θα τερματίσει την λειτουργία του, εκτός αν επιλέξετε Ακύρωση." @@ -7861,12 +8396,12 @@ "Το αρχείο προορισμού υπάρχει ήδη.\n" "Παρακαλώ, επιλέξτε μία ενέργεια." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "" "Η δοκιμή απέτυχε. Είστε σίγουροι ότι θέλετε να αποθηκεύσετε τις ρυθμίσεις;" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:82 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Το αντίγραφο ασφαλείας %s δεν μπορεί να αποκατασταθεί" @@ -7875,15 +8410,15 @@ msgid "Themes" msgstr "Θέματα" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." -msgstr "Τα ορίσματα του φίλτρου δε μπορούν να απομακρυνθούν." +msgstr "Τα ορίσματα του φίλτρου δεν μπορούν να απομακρυνθούν." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." -msgstr "Αυτά τα ορίσματα φίλτρου δε μπορούν να μετονομασθούν." +msgstr "Αυτά τα ορίσματα φίλτρου δεν μπορούν να μετονομασθούν." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7908,46 +8443,45 @@ "τα τοίχοι προστασίας (firewalls) που μπορεί να έχετε και θα δοκιμάσει τις " "ρυθμίσεις σας." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Time" msgstr "Ώρα" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Μορφοποίηση ώρας" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Διακ&οπή σε δευτερόλεπτα:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "Διακοπή" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Η απόκλιση της ζώνης ώρας του διακομιστή είναι %d δευτερόλεπτα." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Title:" msgstr "Τίτλος:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2309 +msgid "To compare directories quick search must be closed." +msgstr "" +"Για να συγκρίνουν οι φάκελοι η γρήγορη αναζήτηση πρέπει να τερματιστεί." + +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Για να συγκρίνουν οι φάκελοι, οι δύο λίστες αρχείων πρέπει να " "ευθυγραμμιστούν." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2327 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Για να γίνει αυτό, θα πρέπει και οι δύο δομές των φακέλων να είναι " "ταυτόχρονα σε κατάσταση εμφάνισης ή απόκρυψης." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7955,7 +8489,7 @@ "Για να υποστηρίξει το FileZilla την πιστοποίηση του δημόσιου κλειδιού, " "πρέπει να γνωρίζει το ιδιωτικό κλειδί του χρήστη." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7972,7 +8506,7 @@ "πλευρά\n" "Κόκκινο: Διαφορετικό μέγεθος αρχείου" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7983,83 +8517,78 @@ "ανάλογες αλλαγές στη δομή των απομακρυσμένων φακέλων στον εξυπηρετητή ή και " "αντίστροφα." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Εναλλαγές σχετικές με την επεξεργασία της λίστας αναμονής μεταφορών" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Εναλλαγές σχετικές με την εμφάνιση της δομής των τοπικών φακέλων" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Εναλλαγές σχετικές με την εμφάνιση του αρχείου συμβάντων" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "" "Εναλλαγές σχετικές με την εμφάνιση της δομής των απομακρυσμένων φακέλων" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Εναλλαγές σχετικές με την εμφάνιση της λίστας αναμονής μεταφορών" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:243 msgid "Too long header line" msgstr "Πολύ μεγάλη γραμμή κεφαλίδας" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Πάρα πολλές αναδρομολογήσεις" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "Εντοπισμός:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Μεταφορά" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "&Κατεύθυνση μεταφοράς" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "&Τύπος μεταφοράς" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Κατάσταση μεταφοράς" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Λίστα αναμονής" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Ρυθμίσεις μεταφοράς" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Διακόπηκε η μεταφορά: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Τα δεδομένα που μεταφέρθηκαν μολύνθηκαν." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Μεταφορά" @@ -8067,28 +8596,27 @@ msgid "Transfers" msgstr "Μεταφορές" -#: ../../locales/../src/interface/QueueView.cpp:2944 -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2644 msgid "Transfers finished" msgstr "Οι μεταφορές ολοκληρώθηκαν" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Χειρισμός των αρχείων &χωρίς επέκταση ως ASCII αρχεία" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Χειρισμός των &ακόλουθων τύπων αρχείων ως ASCII αρχεία:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:385 msgid "Trust changed Hostkey:" msgstr "Έμπιστο αλλαγμένο κλειδί κόμβου:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:382 msgid "Trust new Hostkey:" msgstr "Νέο έμπιστο κλειδί κόμβου:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Να θεωρηθεί έμπιστο το νέο κλειδί και να συνεχίσει η σύνδεση;" @@ -8096,70 +8624,76 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Να θεωρηθεί έμπιστο αυτό το πιστοποιητικό και να συνεχίσει η σύνδεση;" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Να θεωρηθεί έμπιστος αυτός ο κόμβος και να συνεχίσει η σύνδεση;" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Δοκιμάστε ξανά" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Τύπος" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Τύπος του διαμεσολαβητή FTP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Τύπος του γενικού διαμεσολαβητή:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "Α&ποστολή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Όριο α&ποστολής:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Χ&ρήση διαθέσιμων συσχετίσεων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "&Χρήση προεπιλογών συστήματος για την τρέχουσα γλώσσα" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "ΧΡΗΣΤΗΣ@&ΚΟΜΒΟΣ" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Απροσδιόριστος ο κωδικός σφάλματος %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Unit:" msgstr "Μονάδα:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Άγνωστο" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" -"Άγνωστος τύπος διαμεσολαβητή FTP, δε μπορεί δημιουργηθεί ακολουθία σύνδεσης." +"Άγνωστος τύπος διαμεσολαβητή FTP, δεν μπορεί δημιουργηθεί ακολουθία σύνδεσης." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Άγνωστη έκδοση SOCKS πρωτοκόλλου: %d" @@ -8168,11 +8702,22 @@ msgid "Unknown certificate" msgstr "Άγνωστο πιστοποιητικό" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Άγνωστο σφάλμα %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Άγνωστο σφάλμα %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Άγνωστο κλειδί κόμβου" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8181,39 +8726,43 @@ "Άγνωστης έκδοσης πρωτόκολλο SOCKS, το Όνομα Χρήστη και ο κωδικός πρόσβασης " "υπό διαπραγμάτευση πιστοποίησης: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:283 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" -"Άγνωστο στοιχείο βάσης, το αρχείο αυτό δε φαίνεται να δημιουργήθηκε από το " +"Άγνωστο στοιχείο βάσης, το αρχείο αυτό δεν φαίνεται να δημιουργήθηκε από το " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:355 +msgid "Unknown transfer encoding" +msgstr "Άγνωστη κωδικοποίηση μεταφοράς" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" -"Αν δεν επιδιορθωθούν αυτά τα προβλήματα, η ενεργητική κατάσταση FTP δε " +"Αν δεν επιδιορθωθούν αυτά τα προβλήματα, η ενεργητική κατάσταση FTP δεν " "μπορεί να χρησιμοποιηθεί και θα χρησιμοποιηθεί η παθητική." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" -"Αν δεν επιδιορθωθεί αυτό το πρόβλημα, η ενεργητική κατάσταση FTP δε μπορεί " +"Αν δεν επιδιορθωθεί αυτό το πρόβλημα, η ενεργητική κατάσταση FTP δεν μπορεί " "να χρησιμοποιηθεί και θα χρησιμοποιηθεί η παθητική." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Μη υποστηριζόμενος τύπος πιστοποίησης" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Μη υποστηριζόμενη αναδρομολογήση" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Απ&οστολή και αναίρεση επεξεργασίας" @@ -8222,80 +8771,89 @@ msgid "Updates" msgstr "Ενημερώσεις" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Αποστολή" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Αποτυχία αποστολής" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:604 #, c-format msgid "Upload limit: %s/s" msgstr "Όριο αποστολής: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:607 msgid "Upload limit: none" msgstr "Όριο αποστολής: όχι" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:918 +msgid "Upload search results" +msgstr "Αποτελέσματα αναζήτησης απεσταλμένων" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Αποστολή επιλεγμένου φακέλου" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Αποστολή επιλεγμένων αρχείων και φακέλων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Ααποστολή αυτού του αρχείου πίσω στον εξυπηρετητή;" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Αποστολή αυτού του αρχείου στον εξυπηρετητή;" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Αποστολή" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Αποστολή και αναμονή αφαίρεσης" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Αποστολή και αναίρεση επεξεργασίας" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Χρήση &προσαρμοσμένης κωδικοποίησης χαρακτήρων" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Χρήση &προκαθορισμένου επεξεργαστή:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Χρήση &προκαθορισμένου επεξεργαστή για τα αρχεία κειμένου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Χρήση &συγχρονισμού περιήγησης" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Χρήση Τυπικών Εκφράσεων" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Χρήση της κωδικοποίησης χαρακτήρων UTF-8 εάν υποστηρίζεται από τον " "εξυπηρετητή, αλλιώς κάντε χρήση της τοπικής κωδικοποίησης χαρακτήρων." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "&Χρήση προκαθορισμένης ενέργειας" @@ -8303,15 +8861,15 @@ msgid "Use explicit FTP over TLS if available" msgstr "Χρήση ρητής απαίτησης FTP με TLS, εάν είναι διαθέσιμη" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Ο τρέχον εξυπηρετητής είναι συνδεμένος στο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Χρήση εξυπηρετητή από το διαχειριστή τοποθεσιών" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "Χρήση &προεπιλογών συστήματος για την τρέχουσα γλώσσα" @@ -8330,7 +8888,7 @@ "εξυπηρετητή" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8348,16 +8906,17 @@ "χρησιμοποιήσετε για πρώτη φορά την ενεργητική κατάσταση μεταφοράς. Μόνο η " "έκδοση του FileZilla που χρησιμοποιείτε θα δωθεί στον εξυπηρετητή." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Χρήστης:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 msgid "Username cannot be a series of spaces" -msgstr "Το όνομα χρήστη δε μπορεί να είναι μια σειρά κενών διαστημάτων" +msgstr "Το όνομα χρήστη δεν μπορεί να είναι μια σειρά κενών διαστημάτων" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8378,52 +8937,48 @@ "Περιφραστικά μηνύματα καταγραφής από τα wxWidgets (γραφικά συστατικά μορφής " "wx)" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Επικύρωση πιστοποιητικού..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Πολύ υψηλό" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" "Προβολή κρυφών ενεργοποιήθηκε, αλλά δεν υποστηρίζεται από τον εξυπηρετητή" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Προβολή/Επεξεργασία" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Ορατές στήλες" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "Ε&γγραφή" -#: ../../locales/../src/interface/QueueView.cpp:1671 -msgid "Waiting" -msgstr "Αναμονή" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "Αναμονή για σύνδεση αναζήτησης" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "Αναμονή για κωδικό πρόσβασης" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Αναμονή για ματαίωση της μεταφοράς" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Αναμονή για νέα προσπάθεια..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "" "Προειδοποίηση, αγνόηση δεδομένων σύνδεσης λόγω εσφαλμένης διεύθυνσης IP." @@ -8443,23 +8998,23 @@ "\n" "Θέλετε να ελέγξετε τις nightly builds;" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Προειδοποίηση: Πιθανή παραβίαση της ασφαλείας!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Καλωσορίσατε στο FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Τι νέο υπάρχει" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Ενημερώσεις:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8468,7 +9023,7 @@ "μπορείτε να συνδεθείτε ξανά χωρίς να χρειάζεται να εισαγάγετε ξανά τον " "κωδικό πρόσβασής σας μετά την επανεκκίνηση του προγράμματος." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8477,36 +9032,54 @@ "υποστηρίζονται από το τοπικό λειτουργικό σύστημα θα αντικαθίστανται κατά την " "λήψη τέτοιων αρχείων." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "Κατά την ε&κκίνηση μια νέα σύνδεση, ενώ ήδη έχει συνδεθεί:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Ευρεία οθόνη" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Επιθυμείτε το FileZilla να απομνημονεύσει τον κωδικό πρόσβασης;" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Εγ&γραφή" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Εσφαλμένη εξωτερική διεύθυνση IP" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:414 msgid "Wrong line endings" msgstr "Εσφαλμένοι τερματισμοί γραμμών" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Έχει εισαχθεί λάθος κύριος κωδικός πρόσβασης, δεν μπορεί να χρησιμοποιηθεί " +"για την αποκρυπτογράφηση των αποθηκευμένων κωδικών." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Έχει εισαχθεί λάθος κύριος κωδικός πρόσβασης, δεν μπορεί να χρησιμοποιηθεί " +"για την αποκρυπτογράφηση αυτού του στοιχείου." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Κίτρινο" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:396 msgid "Yes" msgstr "Ναι" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8514,27 +9087,27 @@ "Φαίνεται να χρησιμοποιείτε μόνο IPv6 κόμβο. Αυτός ο οδηγός δεν υποστηρίζει " "αυτό το περιβάλλον." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Χρησιμοποιείτε την τελευταία έκδοση του FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "" "Μπορείτε να ανοίξετε τον εν λόγω διάλογο επιλογών και μέσα από τη βοήθεια." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Μπορείτε να κατεβάσετε την τελευταία έκδοση από την ιστοσελίδα:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" "Μπορείτε να αφήσετε το πεδίο θύρας κενό για να χρησιμοποιηθεί η " "προεπιλεγμένη θύρα." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8542,7 +9115,15 @@ "Μπορείτε να χρησιμοποιήσετε ένα x σε οποιαδήποτε θέση για να κρατήσετε τα " "αρχικά δικαιώματα των αρχείων." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Δεν μπορείτε να αλλάξετε ξεχωριστά τον κωδικό και το κλειδί κρυπτογράφησης " +"εάν χρησιμοποιείτε έναν κύριο κωδικό πρόσβασης." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Αδυναμία εισαγωγής ρυθμίσεων από το FileZilla στον φάκελο Ρυθμίσεις." @@ -8555,16 +9136,20 @@ "έγκυρο. Παρακαλώ, εισάγετε έναν χαρακτήρα που να είναι επιτρεπτός στα " "ονόματα αρχείων." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Δεν μπορείτε να αποστείλετε αρχεία στον ριζικό κατάλογο." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Δεν έχετε εισάγει νέο όνομα για το αρχείο. Αντικατάσταση του αρχείου;" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Έχετε επιλέξει μία τουλάχιστον συμβολική σύνδεση." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1197 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8572,7 +9157,7 @@ "Έχετε επιλέξει περισσότερα από 10 αρχεία για επεξεργασία, θέλετε πραγματικά " "να συνεχιστείτε;" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1744 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8580,39 +9165,47 @@ "Έχετε επιλέξει περισσότερα από 10 αρχεία ή φακέλους για άνοιγμα, θέλετε " "πραγματικά να συνεχιστείτε;" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 msgid "You have to enter a hostname." msgstr "Πρέπει να καταχωρίσετε ένα όνομα κόμβου." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1092 msgid "You have to enter a key file path" msgstr "Θα πρέπει να εισαγάγετε τη διαδρομή για το Αρχείο Κλειδί" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:904 msgid "You have to enter a local directory." msgstr "Πρέπει να καταχωρίσετε ένα τοπικό φάκελο." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:918 +msgid "You have to enter a remote directory." +msgstr "Θα πρέπει να εισάγετε έναν απομακρυσμένο κατάλογο." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Θα πρέπει να εισάγετε μία έγκυρη διεύθυνση IPv4." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "You have to enter a valid encryption key" +msgstr "Πρέπει να καταχωρίσετε ένα έγκυρο κλειδί κρυπτογράφησης" + +#: ../../locales/../src/interface/search.cpp:909 msgid "You have to enter a writable local directory." msgstr "Πρέπει να καταχωρίσετε έναν εγγράψιμο τοπικό φάκελο." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 msgid "You have to enter an account name" msgstr "Πρέπει να καταχωρίσετε ένα όνομα λογαριασμού" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1059 msgid "You have to specify a user name" msgstr "Πρέπει να ορίσετε ένα όνομα χρήστη" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8620,7 +9213,11 @@ "Πιθανόν να έχετε δρομολογητή (router ) ή τοίχος προστασίας (firewall) που " "λανθασμένα τροποποίησε τα μεταφερόμενα δεδομένα." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Πρέπει να εισαγάγετε έναν κύριο κωδικό πρόσβασης." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Απαιτείται η εισαγωγή ονόματος για τον σελιδοδείκτη." @@ -8628,7 +9225,7 @@ msgid "You need to enter a name for the log file." msgstr "Απαιτείται η εισαγωγή ονόματος για το αρχείο συμβάντων." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Πρέπει να καταχωρίσετε μία κατάλληλη αναφορά εντολής." @@ -8641,17 +9238,17 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Απαιτείται η εισαγωγή θήρας διαμεσολαβητή, με εύρος από 1 έως 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Απαιτείται η εισαγωγή τουλάχιστον μίας διαδρομής, δεν υποστηρίζονται κενοί " "σελιδοδείκτες." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8660,7 +9257,7 @@ "προκειμένου να ενεργοποιηθεί ο συγχρονισμός περιήγησης για αυτόν το " "σελιδοδείκτη." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8668,23 +9265,31 @@ "Πρέπει να εισαγάγετε μία τοπική και μία απομακρυσμένη διαδρομή, προκειμένου " "να ενεργοποιηθεί ο συγχρονισμός περιήγησης για αυτήν την τοποθεσία." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Πρέπει να επιτρέψετε την πρόσβαση του FileZilla στους καταλόγους που " +"περιέχουν τα προς λήψη ή αποστολή αρχεία." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Πρέπει να ορίσετε ένα τοπικό αρχείο." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Πρέπει να ορίσετε ένα απομακρυσμένο αρχείο." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Πρέπει να ορίσετε μία απομακρυσμένη διαδρομή." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Πρέπει να ορίσετε ένα όνομα εξυπηρετητή." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8692,66 +9297,66 @@ "Δεν πρέπει να έχετε προβλήματα σύνδεσης σε άλλους εξυπηρετητές, οι μεταφορές " "αρχείων πρέπει να λειτουργούν σωστά." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2769 msgid "Your computer will suspend unless you click Cancel." msgstr "Το σύστημα θα αναστείλει τη λειτουργία του, εκτός αν επιλέξετε Άκυρο." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "μετά από" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "πριν από" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "ξεκινάει με" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "bytes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "περιέχει" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "προσαρμοσμένη" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "δεν περιέχει" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "δεν ισούται" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "τελειώνει με" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "ισούται" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:545 +#: ../../locales/../src/interface/filelistctrl.cpp:563 #: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:608 msgid "file" msgstr "αρχείο" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8761,94 +9366,253 @@ "Σιγουρευτείτε ότι το εκτελέσιμο αρχείο συνυπάρχει στον ίδιο φάκελο με το " "κύριο εκτελέσιμο αρχείο του FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp ανήκει σε μια διαφορετική έκδοση του FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" -msgstr "το fzsftp δε μπόρεσε να εκκινήθει" +msgstr "το fzsftp δεν μπόρεσε να εκκινήθει" + +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzsftp ανήκει σε μια διαφορετική έκδοση του FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "το fzsftp δεν μπόρεσε να εκκινήθει" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"Αδυναμία εκκίνησης του fzstorj.\n" +"Σιγουρευτείτε ότι το εκτελέσιμο αρχείο συνυπάρχει στον ίδιο φάκελο με το " +"κύριο εκτελέσιμο αρχείο του FileZilla." -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "επέστρεψε το gnutls_certificate_get_peers, δεν υπάρχουν πιστοποιητικά" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 απέτυχε" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "μεγαλύτερο από" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "ομαδικά εκτελέσιμο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "ομαδικά αναγνώσιμο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "ομαδικά εγγράψιμο" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "είναι ίσο με το" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "είναι ορισμένο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "δεν είναι ορισμένο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "μικρότερο από" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "κανονικό ταίριασμα" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +msgid "new name" +msgstr "νέο όνομα" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "ιδιωτικά εκτελέσιμο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "ιδιωτικά αναγνώσιμο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "ιδιωτικά εγγράψιμο" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "άγνωστο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "δημόσια εκτελέσιμο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "δημόσια αναγνώσιμο" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "δημόσια εγγράψιμο" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "" +#~ "%s could not be found. Without this component of FileZilla, SFTP will not " +#~ "work.\n" +#~ "\n" +#~ "Please download FileZilla again. If this problem persists, please submit " +#~ "a bug report." +#~ msgstr "" +#~ "%s δεν βρέθηκε. Χωρίς αυτό το συστατικό του FileZilla, το SFTP δεν θα " +#~ "λειτουργήσει.\n" +#~ "\n" +#~ "Παρακαλώ, κάντε ξανά λήψη του FileZilla. Εάν το πρόβλημα παραμένει να " +#~ "αποστείλετε αναφορά σφάλματος." + +#~ msgid "" +#~ "%s could not be found. Without this component of FileZilla, SFTP will not " +#~ "work.\n" +#~ "\n" +#~ "Possible solutions:\n" +#~ "- Make sure %s is in a directory listed in your PATH environment " +#~ "variable.\n" +#~ "- Set the full path to %s in the FZ_FZSFTP environment variable." +#~ msgstr "" +#~ "%s δεν βρέθηκε. Χωρίς αυτό το στοιχείο του FileZilla, τo SFTP δεν " +#~ "λειτουργεί.\n" +#~ "\n" +#~ "Πιθανές λύσεις:\n" +#~ "- Σιγουρευτείτε ότι το %s είναι στη λίστα φακέλου της μεταβλητής PATH.\n" +#~ "- Ορίστε τη πλήρη διαδρομή για το %s στη μεταβλητή FZ_FZSFTP." + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "&Να μην απομνημονεύει κωδικούς (συνιστάται)" + +#~ msgid "Bucket ID not found" +#~ msgstr "Δεν βρέθηκε η ID του Κάδου" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "Η απόκλιση της ζώνης ώρας του διακομιστή είναι %d δευτερόλεπτα." + +#~ msgid "Failed to create listen socket, aborting" +#~ msgstr "Αποτυχία δημιουργίας listen socket, ακύρωση" + +#~ msgid "Failed to retrieve external ip address, aborting" +#~ msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP, ακύρωση" + +#~ msgid "Failed to retrieve local ip address. Aborting" +#~ msgstr "Αποτυχία ανάκτησης τοπικής διεύθυνσης IP. Ακύρωση" + +#~ msgid "Fingerprint:" +#~ msgstr "Αποτύπωμα:" + +#~ msgid "Host key fingerprint:" +#~ msgstr "Αποτύπωμα κλειδιών κόμβου:" + +#~ msgid "Login sequence fully executed yet not logged in. Aborting." +#~ msgstr "" +#~ "Η ακολουθία σύνδεσης που εκτελείται δεν διεκπεραιώθηκε ακόμα, δεν " +#~ "συνδέθηκε. Απόρριψη." + +#~ msgid "Available sizes" +#~ msgstr "Διαθέσιμα μεγέθη" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Αδυναμία φόρτωσης γραμμής γρήγορης σύνδεσης από το αρχείο resource" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize κλήθηκε χωρίς όνομα υποδοχής" + +#~ msgid "Filename &filters..." +#~ msgstr "Όνομα αρχείου &φίλτρων..." + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Αδυναμία εισαγωγής ομότιμων πιστοποιητικών, απέτυχε gnutls_x509_crt_import" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Αδυναμία ρύθμισης δομής για τα ομότιμα πιστοποιητικά, απέτυχε " +#~ "gnutls_x509_crt_init" + +#~ msgid "" +#~ "Incomplete chain, top certificate is not self-signed certificate " +#~ "authority certificate" +#~ msgstr "" +#~ "Ελλιπής αλυσίδα, το κορυφαίο πιστοποιητικό δεν είναι υπογεγραμμένο " +#~ "πιστοποιητικό από την αρμόδια αρχή έκδοσης πιστοποιητικών" + +#~ msgid "%d files added to queue" +#~ msgstr "%d αρχεία προστέθηκαν στη λίστα αναμονής" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Ανίχνευση αρχείων για πρόσθεση στην ουρά αναμονής" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Ανίχνευση αρχείων προς αποστολή" + +#~ msgid "Waiting" +#~ msgstr "Αναμονή" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Αποσύνδεση από τον εξυπηρετητή" + +#~ msgid "&Show message" +#~ msgstr "&Εμφάνιση μηνύματος" + +#~ msgid "Do ¬hing" +#~ msgstr "&Καμία ενέργεια" + +#~ msgid "Empty dirs to visit" +#~ msgstr "Αδειάστε φακέλους για να επισκεφθείτε" + +#~ msgid "No more files in the queue!" +#~ msgstr "Δεν υπάρχουν άλλα αρχεία στη λίστα αναμονής!" + +#~ msgid "R&eboot system" +#~ msgstr "Ε&πανεκκίνηση συστήματος" + +#~ msgid "S&hutdown system" +#~ msgstr "Τ&ερματισμός συστήματος" + +#~ msgid "S&uspend system" +#~ msgstr "Α&ναστολή λειτουργίας συστήματος" + #~ msgid "Connected" #~ msgstr "Συνδεδεμένος" @@ -8901,9 +9665,6 @@ #~ msgid "Could not load keyfile" #~ msgstr "Αδυναμία φόρτωσης του αρχείου-κλειδιού" -#~ msgid "Error" -#~ msgstr "Σφάλμα" - #~ msgid "The specified key file does not exist" #~ msgstr "Το καθορισμένο Αρχείο Κλειδί δεν υπάρχει" @@ -9538,9 +10299,6 @@ #~ msgid "Error %d writing to socket" #~ msgstr "Σφάλμα %d εγγραφής στο socket" -#~ msgid "Invalid hostname or host not found" -#~ msgstr "Λάθος όνομα κόμβου ή ο κόμβος δεν βρέθηκε" - #~ msgid "A&scii" #~ msgstr "A&scii" diff -Nru filezilla-3.15.0.2/locales/et.po filezilla-3.33.0/locales/et.po --- filezilla-3.15.0.2/locales/et.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/et.po 2017-09-19 21:36:39.000000000 +0000 @@ -1,9 +1,9 @@ msgid "" msgstr "" "Project-Id-Version: filezilla\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-31 14:43+0100\n" -"PO-Revision-Date: 2015-01-27 22:13+0200\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2016-12-05 17:45+0100\n" +"PO-Revision-Date: 2016-12-05 22:22+0200\n" "Last-Translator: Janek Hortla \n" "Language-Team: \n" "Language: et_EE\n" @@ -12,17 +12,17 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.11\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:203 msgid "%H:%M:%S elapsed" msgstr "Aega kulunud: %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:209 msgid "%H:%M:%S left" msgstr "Aega lõpuni: %H:%M:%S" @@ -35,86 +35,95 @@ "%a - Konto (Seda sisaldavad read jäetakse välja, kui ei kasutata 'konto' " "tüüpi sisselogimist)" +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 #: ../../locales/../src/interface/filelist_statusbar.cpp:63 -#: ../../locales/../src/interface/filelist_statusbar.cpp:74 -#: ../../locales/../src/interface/filelist_statusbar.cpp:86 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d kataloog" msgstr[1] "%d kataloogi" -#: ../../locales/../src/interface/RemoteListView.cpp:1417 -#: ../../locales/../src/interface/search.cpp:469 -#: ../../locales/../src/interface/search.cpp:780 +#: ../../locales/../src/interface/RemoteListView.cpp:1409 +#: ../../locales/../src/interface/search.cpp:809 +#: ../../locales/../src/interface/search.cpp:1188 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "" msgstr[1] "" -#: ../../locales/../src/interface/filelist_statusbar.cpp:62 -#: ../../locales/../src/interface/filelist_statusbar.cpp:85 -#: ../../locales/../src/interface/RemoteListView.cpp:1416 -#: ../../locales/../src/interface/search.cpp:468 -#: ../../locales/../src/interface/search.cpp:779 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1408 +#: ../../locales/../src/interface/search.cpp:808 +#: ../../locales/../src/interface/search.cpp:1187 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fail" msgstr[1] "%d faili" -#: ../../locales/../src/interface/filelist_statusbar.cpp:81 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d fail. Kogusuurus: %s" msgstr[1] "%d faili. Kogusuurus: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d fail. Kogusuurus: Vähemalt %s" msgstr[1] "%d faili. Kogusuurus: Vähemalt %s" -#: ../../locales/../src/interface/QueueView.cpp:2841 -#, c-format -msgid "%d files added to queue" -msgstr "%d faili lisatud järjekorda" - -#: ../../locales/../src/engine/ControlSocket.cpp:103 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d sekund" +msgstr[1] "%d sekundit" #: ../../locales/../src/interface/resources/xrc/settings.xrc:501 msgid "%h - Host" msgstr "%h - Server" +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu kataloog" +msgstr[1] "%llu kataloogi" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu fail" +msgstr[1] "%llu faili" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:517 #, c-format msgid "%p - Password" msgstr "%p - Parool" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:164 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:167 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Sertifikaat on aegunud!" -#: ../../locales/../src/interface/verifycertdialog.cpp:28 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ei ole veel kehtiv!" @@ -124,24 +133,24 @@ msgid "%s - Proxy user" msgstr "%s - Proksi kasutaja" -#: ../../locales/../src/interface/filelist_statusbar.cpp:91 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s ja %s. Kogusuurus: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:89 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s ja %s. Kogusuurus: Vähemalt %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:34 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s bait" msgstr[1] "%s baiti" -#: ../../locales/../src/interface/FileZilla.cpp:674 +#: ../../locales/../src/interface/FileZilla.cpp:579 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -154,7 +163,7 @@ "\n" "Palun tõmmake FileZilla uuesti. Kui probleem ei kao, postitage veateade." -#: ../../locales/../src/interface/FileZilla.cpp:759 +#: ../../locales/../src/interface/FileZilla.cpp:664 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -170,7 +179,7 @@ "- Kontrolli et %s oleks muutujas PATH kirjeldatud kataloogis.\n" "- Määra muutujas FZ_FZSFTP täielik tee %s -ni." -#: ../../locales/../src/interface/verifycertdialog.cpp:57 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s %d bitiga" @@ -184,23 +193,22 @@ msgid "%w - Proxy password" msgstr "%w - Proksi parool" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3632 msgid "&Abort previous connection and connect in current tab" -msgstr "Katkesta eelmine ühendus ja ava uus ühendus samas sakis" +msgstr "&Katkesta eelmine ühendus ja ava uus ühendus samas sakis" #: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&About..." msgstr "&Programmist..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "Ko&nto:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:473 msgid "&Active" msgstr "&Aktiivne" @@ -214,35 +222,35 @@ msgstr "&Failide lisamine järjekorda" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." -msgstr "&Lisa võtmefail..." +msgid "&Add key file..." +msgstr "Lisa võtme&fail..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:547 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "&Add to queue" msgstr "&Lisa järjekorda" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:402 msgid "&Adjust server timezone offset:" msgstr "Muu&da serveri ajatsooni nihet:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "&Usalda sertifikaati ka tulevastel sessioonidel." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:879 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:886 msgid "&Always trust this host, add this key to the cache" msgstr "&Usalda seda serverit alati ja lisa tema võti mällu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1939 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1969 msgid "&Always use default editor" msgstr "&Kasuta alati vaikimisi editori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2969 msgid "&Always use selection for unassociated files" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "K&asuta alati seda toimingut" @@ -251,22 +259,26 @@ msgstr "&Küsi operatsioonisüsteemilt välist IP aadressi" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:582 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Auto" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Autodetect" msgstr "&Automaatne tuvastus" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:273 +msgid "&Background color:" +msgstr "Taustav&ärv:" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:604 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Binaarne" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1632 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Binaarne - kasutatakse SI sümboleid. (näit. 1 KB = 1024 baiti)" @@ -274,25 +286,25 @@ msgid "&Bookmarks" msgstr "&Järjehoidjad" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2235 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2724 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3099 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2126 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:295 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2956 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2156 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:362 msgid "&Browse..." msgstr "&Sirvi..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:936 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 msgid "&Burst tolerance:" msgstr "&Kiiruse kõikumise tolerants:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1009 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3759 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3815 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -304,13 +316,13 @@ #: ../../locales/../src/interface/resources/xrc/update.xrc:28 msgid "&Close" -msgstr "" +msgstr "&Sulge" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "&Sulge FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:644 msgid "&Configure speed limits..." msgstr "&Seadista kiiruspiirangud..." @@ -318,7 +330,7 @@ msgid "&Configure..." msgstr "&Seadista..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:614 msgid "&Connect" msgstr "&Ühenda" @@ -326,40 +338,36 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Kopeeri aktiivne ühendus saidihaldurisse..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:787 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:794 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "&Kopeeri lõikemällu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 -msgid "&Crash" -msgstr "&Avarii" - #: ../../locales/../src/interface/resources/xrc/menus.xrc:264 #: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "&Create directory" msgstr "&Loo kataloog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:624 msgid "&Create new tab" msgstr "&Ava uus sakk" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "&Silumine" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "&Debug information in message log:" msgstr "&Siluri info teadete logis:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1881 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Default editor:" msgstr "&Vaikimisi editor:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "&Vaikimisi toiming faili olemasolul..." @@ -367,16 +375,16 @@ msgid "&Delay between failed login attempts:" msgstr "Sisselogimiskatsete vaheline aeg:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1053 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1223 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1229 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2841 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "Ku&stuta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "&Delete symlink" msgstr "&Kustuta symlink" @@ -384,7 +392,17 @@ msgid "&Directory comparison" msgstr "V&õrdle katalooge" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/state.cpp:960 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" + +#: ../../locales/../src/interface/state.cpp:1035 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1814 msgid "&Discard local file then download and edit file anew" msgstr "&Tühista kohalik fail ning tõmba ja muuda uuesti" @@ -392,19 +410,15 @@ msgid "&Disconnect" msgstr "&Katkesta ühendus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Katkesta ühendus serveriga" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Näita ülekande hetkekiirust, mitte keskmist kiirust" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1589 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "&Display size in bytes" msgstr "&Näita failisuurusi baitides" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3798 #, fuzzy msgid "&Do not remember passwords (recommended)" msgstr "Sisesta parool" @@ -417,25 +431,25 @@ msgid "&Don't use external IP address on local connections." msgstr "Ärge kasutage välist IP aadressi &kohalikel ühendustel." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1796 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1826 msgid "&Double-click action on files:" msgstr "Topelt-klõps &failidel:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "&Download" msgstr "&Allalaadimine" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3155 msgid "&Download to:" msgstr "&Lae kausta:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:610 msgid "&Download..." msgstr "&Lae alla..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1382 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Allalaadimised:" @@ -444,23 +458,27 @@ msgid "&Edit" msgstr "&Muutmine" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1156 msgid "&Edit filter rules..." msgstr "&Filtrite muutmine..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:640 msgid "&Enable" msgstr "&Luba" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:877 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +msgid "&Enable compression" +msgstr "Luba &tihendamine" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "&Luba kiiruste piirangud" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:560 msgid "&Encoding:" msgstr "&Kodeering:" @@ -468,25 +486,24 @@ msgid "&Encryption:" msgstr "K&rüpteering:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "&Sisesta oma käsk..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3453 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3625 msgid "&Establish connection in a new tab" -msgstr "Loo ühendus uues sakis" +msgstr "&Loo ühendus uues sakis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Execute" msgstr "&Käivita" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1565 msgid "&Export Site Manager entries" msgstr "&Saidihalduri kirjete eksport" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 msgid "&Export..." msgstr "&Eksport..." @@ -498,42 +515,55 @@ msgid "&File" msgstr "&Fail" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "&File Attributes..." msgstr "&Faili atribuudid..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "Faili &õigused..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2253 msgid "&File:" msgstr "&Fail:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1276 msgid "&Filter conditions:" msgstr "&Filtri tingimused:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1037 msgid "&Filter sets:" msgstr "&Filtrikogumik:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#, fuzzy +msgid "&Filters" +msgstr "&Filtrid:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1207 msgid "&Filters:" msgstr "&Filtrid:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1753 msgid "&Finish editing and delete local file" msgstr "&Lõpeta muutmine ja kustuta kohalik fail" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 +#, fuzzy +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Tõmba kõik failid otse sihtkausta olenemata nende paiknemisest serveris" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3191 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" "&Tõmba kõik failid otse sihtkausta olenemata nende paiknemisest serveris" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3368 msgid "&Follow symlink, delete target directory contents" msgstr "" @@ -545,11 +575,11 @@ msgid "&Getting help..." msgstr "&Abilehed..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "&Global bookmark" msgstr "&Globaalne järjehoidja" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:705 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 kasutab CONNECT-meetodit" @@ -558,11 +588,11 @@ msgstr "&Abi" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:550 msgid "&Hide identical files" msgstr "&Peida identsed failid" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "&Tähtsaim" @@ -570,17 +600,17 @@ msgid "&Highest available port:" msgstr "&Kõrgeim vaba port:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2370 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2400 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:51 msgid "&Host:" msgstr "&Server:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1597 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1627 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC binaarne kuju (näit. 1 KiB = 1024 baiti)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1483 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1513 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (näiteks: 2007-09-15)" @@ -588,19 +618,29 @@ msgid "&Import..." msgstr "&Import..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1972 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2002 msgid "&Inherit system's filetype associations" msgstr "&Kasuta süsteemi failitüüpide seoseid" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" -msgstr "" +msgstr "&Paigalda uus versioon" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3279 +#, fuzzy +msgid "&Keep local path structure relative to search root" +msgstr "Säilita &kaustade liigendatus otsingu juurkausta suhtes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3184 msgid "&Keep remote path structure relative to search root" msgstr "Säilita &kaustade liigendatus otsingu juurkausta suhtes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1259 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#, fuzzy +msgid "&Key file:" +msgstr "&Ava fail" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "&Faili- ja kataloogipaneelide paigutus:" @@ -608,7 +648,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Filezilla poolt kasutatud kohalike portide arv" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "&Limit number of simultaneous connections" msgstr "&Erinevate ühenduste limiitarv" @@ -616,24 +656,29 @@ msgid "&Local directory tree" msgstr "K&ohalik kataloogipuu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2629 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2712 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2749 msgid "&Local directory:" msgstr "&Kohalik kataloog:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3015 +#, fuzzy +msgid "&Local search" +msgstr "Faili otsing" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "&Log to file" msgstr "&Logi faili" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "&Autentimine:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "&Logontype:" msgstr "&Sisselogimise tüüp:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "&Madal" @@ -645,7 +690,7 @@ msgid "&Manual transfer..." msgstr "K&äsitsi ülekanne..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:499 msgid "&Maximum number of connections:" msgstr "&Maksimaalne ühenduste arv:" @@ -657,15 +702,15 @@ msgid "&Message log" msgstr "&Teadete logi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 msgid "&Minimize to tray" msgstr "&Minimeeri süsteemisalve (kella kõrvale)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "&Name sorting mode:" msgstr "&Nimede sorteerimise viis:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2632 msgid "&Name:" msgstr "&Nimi:" @@ -673,7 +718,7 @@ msgid "&Network configuration wizard..." msgstr "&Võrgu seadistamise nõustaja..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1223 msgid "&New" msgstr "&Uus" @@ -681,35 +726,36 @@ msgid "&New Site" msgstr "&Uus koht" -#: ../../locales/../src/interface/Mainfrm.cpp:1733 +#: ../../locales/../src/interface/Mainfrm.cpp:1671 msgid "&New version available!" msgstr "&Uus versioon saadaval!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1746 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1766 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1889 msgid "&No" msgstr "&Ei" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:700 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&Puudub" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&Normaalne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:501 msgid "&Numeric value:" msgstr "&Numbriline väärtus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2848 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2890 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:622 msgid "&OK" msgstr "&OK" @@ -718,29 +764,29 @@ msgstr "&AVA" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 msgid "&Open" msgstr "&Ava" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Kirjuta üle" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:480 msgid "&Passive" msgstr "&Passiivne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Parool:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "&Mängi heli" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2413 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:64 msgid "&Port:" msgstr "&Port:" @@ -748,11 +794,11 @@ msgid "&Preserve timestamps of transferred files" msgstr "&Säilita ülekantud failide ajaväärtused" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 msgid "&Queue" msgstr "&Järjekord" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:72 msgid "&Quickconnect" msgstr "&Kiirühendus" @@ -760,7 +806,12 @@ msgid "&Quickconnect bar" msgstr "&Kiirühenduse riba" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1498 +#, fuzzy +msgid "&Quickconnect history" +msgstr "Puhasta &kiirühenduste ajalugu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:403 msgid "&Read" msgstr "&Loe" @@ -768,31 +819,41 @@ msgid "&Reconnect" msgstr "&Taasühenda" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1505 +#, fuzzy +msgid "&Reconnect information" +msgstr "Kustuta &taasühendamise info" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 msgid "&Refresh" msgstr "&Värskenda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:354 #, fuzzy msgid "&Remember password until FileZilla is closed" msgstr "&Jäta selleks seansiks parool meelde" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3792 #, fuzzy msgid "&Remember passwords" msgstr "Sisesta parool" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2656 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2686 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2773 msgid "&Remote directory:" msgstr "S&erveri kataloog:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2259 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2289 msgid "&Remote path:" msgstr "&Serveri kaustatee:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#, fuzzy +msgid "&Remote search" +msgstr "Kauge faili otsing" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Eemalda" @@ -800,29 +861,29 @@ msgid "&Remove key" msgstr "&Eemalda võti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "&Eemalda valitud" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1229 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1235 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Nimeta ümber" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1048 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 msgid "&Rename..." msgstr "&Nimeta ümber..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1807 msgid "&Reopen local file" msgstr "&Taasava kohalik fail" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 msgid "&Replace invalid characters with:" msgstr "Asenda vigased sümbolid &märgendiga:" @@ -830,7 +891,11 @@ msgid "&Report a bug..." msgstr "&Teavita veast..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 msgid "&Reset and requeue all" msgstr "Tühista ja &aseta kõik failid uuesti järjekorda" @@ -838,11 +903,11 @@ msgid "&Restart Wizard" msgstr "&Käivita nõustaja uuesti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Jätka" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "K&äivita käsk..." @@ -850,7 +915,7 @@ msgid "&Run configuration wizard now..." msgstr "&Käivita võrgu seadistamise nõustaja..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2065 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2095 msgid "&Run update check now..." msgstr "K&äivita uuenduste kontroll ..." @@ -858,15 +923,15 @@ msgid "&SITE" msgstr "&SAIT" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1049 msgid "&Save as..." msgstr "&Salvesta uue nimega..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 msgid "&Search" msgstr "&Otsi" @@ -878,20 +943,20 @@ msgid "&Select Entry:" msgstr "&Vali kirje:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1848 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1878 msgid "&Select language:" msgstr "&Vali keel:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2141 msgid "&Select the columns that should be displayed:" msgstr "&Vali kuvatavad veerud:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2328 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1628 msgid "&Settings" msgstr "&Seaded" @@ -899,32 +964,33 @@ msgid "&Settings..." msgstr "&Seaded..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2204 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Show debug menu" msgstr "&Näita siluri menüüd" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 #, fuzzy msgid "&Show detailed log" msgstr "&Näita ajaväärtusi teadete logis" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Näita teadet" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2098 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "&Show timestamps in message log" msgstr "&Näita ajaväärtusi teadete logis" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#, fuzzy +msgid "&Site Manager entries" +msgstr "&Saidihalduri kirjed" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Saidihaldur..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2613 msgid "&Site-specific bookmark" msgstr "S&aidikeskne järjehoidja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "J&äta vahele" @@ -932,24 +998,25 @@ msgid "&Speed limits" msgstr "&Kiiruspiirangud" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3297 msgid "&Start transfer immediately" msgstr "&Alusta koheselt ülekannet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1280 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 msgid "&Swap local and remote panes" msgstr "&Vaheta kohalik ja serveri aken" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 #, fuzzy msgid "&TLS Ciphers" msgstr "Šiffer:" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Test" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 msgid "&Theme:" msgstr "&Teema:" @@ -957,45 +1024,56 @@ msgid "&Transfer" msgstr "&Ülekanne" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:382 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 msgid "&Transfer mode:" msgstr "&Ülekande laad:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "&Ülekande järjekord" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1122 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 msgid "&Treat dotfiles as ASCII files" msgstr "&Loe punkt-failid ASCII failideks" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1929 msgid "&Unedit" msgstr "&Tühista muutused" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:997 msgid "&Update cached key for this host" msgstr "&Uuenda selle serveri salvestatud võtit" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "&Upload" msgstr "&Üleslaadimine" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 +#, fuzzy +msgid "&Upload to:" +msgstr "&Üleslaadimised:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +#, fuzzy +msgid "&Upload..." +msgstr "&Üleslaadimine" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Üleslaadimised:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 msgid "&Use custom program" msgstr "&Vali programm" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:383 msgid "&Use synchronized browsing" msgstr "Kasuta &sünkroniseeritud brausimist" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "&Use system's default editor for text files" msgstr "&Kasuta vaikimisi tekstitoimetusprogrammi" @@ -1007,21 +1085,21 @@ msgid "&Use the server's external IP address instead" msgstr "&Kasuta selle asemel serveri välist IP aadressi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1642 msgid "&Use thousands separator" msgstr "&Kasuta tuhandete eraldajat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2437 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2467 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "Kasuta&ja:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "&Username:" msgstr "&Kasutajanimi:" -#: ../../locales/../src/interface/Mainfrm.cpp:1727 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 #, c-format msgid "&Version %s" msgstr "&Versioon %s" @@ -1031,46 +1109,46 @@ msgstr "&Vaade" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:599 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:616 msgid "&View/Edit" msgstr "&Vaata/Muuda" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1979 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "&Jälgi kohalikult muudetud faile ja paku muudatuste üleslaadimist" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2041 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&When checking for updates, check for:" msgstr "&Uuendusi kontrollides vaata:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Write" msgstr "&Kirjuta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1740 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1883 msgid "&Yes" msgstr "&Jah" -#: ../../locales/../src/engine/local_path.cpp:449 -#: ../../locales/../src/engine/local_path.cpp:495 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' ei eksisteeri või ei ole kättesaadav." -#: ../../locales/../src/engine/local_path.cpp:464 -#: ../../locales/../src/engine/local_path.cpp:484 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' ei ole kataloog." -#: ../../locales/../src/interface/manual_transfer.cpp:445 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 msgid "'Account' logontype not supported by selected protocol" msgstr "'Konto' tüüpi sisselogimine ei ole valitud protokolli poolt toetatud" -#: ../../locales/../src/interface/manual_transfer.cpp:459 +#: ../../locales/../src/interface/manual_transfer.cpp:446 #, fuzzy msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " @@ -1079,13 +1157,13 @@ "FileZilla töötab kiosk-laadis.\n" "'Normaalne' ja 'Konto' tüüpi sisselogimised pole selles laadis kättesaadavad." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:993 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:611 +#: ../../locales/../src/interface/Mainfrm.cpp:587 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1095,16 +1173,21 @@ "saatmaks 'quote' -le järgnevaid argumente serverile. Proovige puhast käsku " "ilma eelneva 'quote' -ta." -#: ../../locales/../src/interface/filelist_statusbar.cpp:96 -#: ../../locales/../src/interface/filelist_statusbar.cpp:105 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objekt filtreeritud)" msgstr[1] "(%d objekti filtreeritud)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:839 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:860 +#: ../../locales/../src/interface/update_dialog.cpp:313 +#, c-format +msgid "(%u%% downloaded)" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 msgid "(0 for no limit)" msgstr "(0 limiidivaba)" @@ -1116,32 +1199,33 @@ msgid "(0-999 seconds)" msgstr "(0-999 sekundit)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:818 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 msgid "(1-10)" msgstr "(1-10)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:109 -msgid "(5-9999, 0 to disable)" +#, fuzzy +msgid "(10-9999, 0 to disable)" msgstr "(5-9999, 0 keelamiseks)" -#: ../../locales/../src/interface/aboutdialog.cpp:84 -#: ../../locales/../src/interface/aboutdialog.cpp:161 +#: ../../locales/../src/interface/aboutdialog.cpp:90 +#: ../../locales/../src/interface/aboutdialog.cpp:179 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1580 msgid "(example: %H:%M)" msgstr "(näiteks: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 msgid "(example: %Y-%m-%d)" msgstr "(näiteks: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:900 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format msgid "(in %s/s)" msgstr "(%s/s)" @@ -1150,7 +1234,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "--:--:-- left" msgstr "Aega lõpuni: --:--:--" @@ -1170,37 +1254,37 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s'i ei saa kasutada koos FTP URL'ga." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2255 msgid "0 - None" msgstr "0 - Puudub" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2226 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2256 msgid "1 - Warning" msgstr "1 - Hoiatus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "2 - Info" msgstr "2 - Info" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2228 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2258 msgid "3 - Verbose" msgstr "3 - Paljusõnaline" -#: ../../locales/../src/interface/aboutdialog.cpp:97 +#: ../../locales/../src/interface/aboutdialog.cpp:103 #, fuzzy msgid "32-bit system" msgstr "32-bitine süsteem" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2229 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2259 msgid "4 - Debug" msgstr "4 - Silur" -#: ../../locales/../src/interface/aboutdialog.cpp:95 +#: ../../locales/../src/interface/aboutdialog.cpp:101 #, fuzzy msgid "64-bit system" msgstr "64-bitine süsteem" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "" @@ -1208,18 +1292,22 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "Selle nimega järjehoidaja on juba olemas. Sisesta uus nimi." +#: ../../locales/../src/engine/tlssocket.cpp:1333 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Vaikimisi kasutatav tekstitoimetusprogramm vajab seadistamist." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:808 +#: ../../locales/../src/interface/RemoteListView.cpp:166 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:785 #, fuzzy msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Kataloogi ei saa lohistada oma enda alamkatoogi." @@ -1234,21 +1322,21 @@ "Sellistel juhtudel peab kasutama aktiivset laadi. Aktiivse laadi puhul " "FileZilla avab pordi ja palub serveril sinna ühenduda." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1679 msgid "A file previously opened has been changed." msgstr "Eelnevalt avatud faili on muudetud." -#: ../../locales/../src/interface/edithandler.cpp:1687 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "A file with that name is already being transferred." msgstr "Selle nimega fail on juba üle kantud." -#: ../../locales/../src/interface/edithandler.cpp:1691 +#: ../../locales/../src/interface/edithandler.cpp:1658 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Selle nimega fail on veel muutmisel. Palun sulgege see ja proovige uuesti." -#: ../../locales/../src/interface/FileZilla.cpp:653 +#: ../../locales/../src/interface/FileZilla.cpp:558 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1261,12 +1349,11 @@ "Kuni probleem pole lahendatud, võivad failid nimekirjast puududa.\n" "Selle sessiooni jooksul hoiatust rohkem ei kuvata." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" -msgstr "Uuem versioon FileZillast on kättesaadav:" +msgstr "FileZillast on uus versioon:" -#: ../../locales/../src/interface/Mainfrm.cpp:674 +#: ../../locales/../src/interface/Mainfrm.cpp:658 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1283,23 +1370,23 @@ "Korralikult seadistatud server ei vaja seda. Võta ühendust " "administraatoriga, kui see valik on vajalik." -#: ../../locales/../src/interface/state.cpp:283 +#: ../../locales/../src/interface/state.cpp:253 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1043 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1091 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 msgid "A&dd" msgstr "L&isa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1228 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 msgid "A&llow resume of ASCII files" msgstr "L&uba ASCII failide ülekande jätkamist" @@ -1311,51 +1398,51 @@ msgid "A&pply only to uploads" msgstr "Rake&nda ainult üleslaadimistele" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:535 msgid "A&pply to all files and directories" msgstr "R&akenda kõikidele failidele ja kataloogidele" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "A&utomatically remove successful transfers" msgstr "&Eemalda automaatselt õnnestunud ülekanded" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2514 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:576 msgid "About FileZilla" msgstr "FileZillast" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 msgid "Above the file lists" msgstr "Failide nimekirja kohal" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:161 -#: ../../locales/../src/interface/manual_transfer.cpp:194 -#: ../../locales/../src/interface/manual_transfer.cpp:563 -#: ../../locales/../src/interface/manual_transfer.cpp:564 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1276 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1277 +#: ../../locales/../src/engine/server.cpp:912 +#: ../../locales/../src/engine/server.cpp:933 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/manual_transfer.cpp:547 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1326 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1327 msgid "Account" msgstr "Konto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "&Tegevus järjekorra lõppemisel" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 msgid "Action on selected file:" msgstr "Tegevus valitud failile:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 msgid "Action to perform:" msgstr "Sooritatavad tegevused" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Tegevus:" @@ -1363,7 +1450,7 @@ msgid "Active mode" msgstr "Aktiivne laad" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1371,7 +1458,7 @@ "Aktiivse laadi FTP test ebaõnnestus. FileZilla ei tea korrektset välist IP " "aadressi." -#: ../../locales/../src/interface/netconfwizard.cpp:608 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1379,7 +1466,7 @@ "Aktiivse laadi FTP test ebaõnnestus. FileZilla ei tea korrektset välist IP " "aadressi. Lisaks sellele muudab teie ruuter saadetavat aadressi." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1392,12 +1479,13 @@ msgid "Active mode IP" msgstr "Aktiivse laadi IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3304 msgid "Add files to &queue only" msgstr "Lisa &failid järjekorda" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "Add selected directory to the transfer queue" msgstr "Lisa valitud kataloog ülekande järjekorda" @@ -1406,20 +1494,20 @@ msgid "Add selected files and folders to the transfer queue" msgstr "Lisa valitud failid ja kataloogid ülekande järjekorda" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1804 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1854 msgid "Add to queue" msgstr "Lisa järjekorda" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Address type not supported" msgstr "Aadressitüüp pole toetatud" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:308 msgid "Advanced" msgstr "Lisad" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2056 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2086 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1432,16 +1520,15 @@ "testimiseks mõeldud arendusversioonid, mis ei pruugi ootuspäraselt töötada " "ja võivad isegi kahjustada sinu süsteemi. Kasuta neid omal riisikol." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3470 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3642 msgid "Al&ways perform this action" -msgstr "K&asuta alati seda toimingut" +msgstr "K&asuta alati seda valikut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 msgid "Algorithm:" msgstr "Algoritm" -#: ../../locales/../src/interface/QueueView.cpp:3023 +#: ../../locales/../src/interface/QueueView.cpp:2577 #, fuzzy msgid "All files have been successfully transferred" msgstr "&Eemalda automaatselt õnnestunud ülekanded" @@ -1450,7 +1537,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Kõik pordid antud piires peavad jääma vahemikku 1024 - 65535." -#: ../../locales/../src/interface/QueueView.cpp:3019 +#: ../../locales/../src/interface/QueueView.cpp:2573 #, fuzzy, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1465,11 +1552,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Lubada ülekande laadi ennistamine vea puhul" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3602 msgid "Already connected" -msgstr "Esisteerib aktiivne ühendus" +msgstr "Eksisteerib aktiivne ühendus" -#: ../../locales/../src/interface/verifycertdialog.cpp:76 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternatiivne nimi:" @@ -1492,105 +1579,103 @@ "Võid kasutada ka oma süsteemi SSH vahendit. Selleks veendu, et on " "seadistatud keskkonnamuutuja: SSH&AUTH&SOCK" -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 #, fuzzy msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "FileZilla viimase versiooni allalaadimine ebaõnnestus." -#: ../../locales/../src/interface/QueueView.cpp:1962 +#: ../../locales/../src/interface/QueueView.cpp:1615 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" "Some queue items might not have been restored." msgstr "" -#: ../../locales/../src/interface/QueueView.cpp:1867 +#: ../../locales/../src/interface/QueueView.cpp:1513 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" "Some queue items might not have been saved." msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/engine/tlssocket.cpp:1336 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2079 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Sama nimega fail on juba sihtkohas olemas." -#: ../../locales/../src/engine/server.cpp:857 -#: ../../locales/../src/interface/manual_transfer.cpp:159 -#: ../../locales/../src/interface/manual_transfer.cpp:197 -#: ../../locales/../src/interface/manual_transfer.cpp:213 -#: ../../locales/../src/interface/manual_transfer.cpp:562 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1275 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1516 +#: ../../locales/../src/engine/server.cpp:935 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:545 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1325 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1622 msgid "Anonymous" msgstr "Anonüümne" -#: ../../locales/../src/interface/state.cpp:992 +#: ../../locales/../src/interface/state.cpp:1011 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:805 msgid "Any changes made in the Site Manager could not be saved." msgstr "Kõik muudatused saidihalduris jäävad salvestamata." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:740 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" - -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:955 msgid "Any changes made to the filters could not be saved." msgstr "Kõik muudatused filtrites jäävad salvestamata." -#: ../../locales/../src/interface/filter.cpp:971 +#: ../../locales/../src/interface/filter.cpp:863 msgid "Any changes made to the filters will not be saved." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:549 msgid "App&ly to directories only" msgstr "Ra&kenda ainult kataloogidele" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1182 msgid "Apply" msgstr "Rakenda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "&Rakenda ainult käesolevale järjekorrale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:542 msgid "Apply to &files only" msgstr "Rakenda ainult &failidele" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Arhiiv" -#: ../../locales/../src/engine/socket.cpp:1184 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Argument buffer overflow" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 msgid "As tab in the transfer queue pane" msgstr "Sakina ülekande järjekorra paanis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1390 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1422 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Küsi mida teha" -#: ../../locales/../src/engine/server.cpp:832 -#: ../../locales/../src/engine/server.cpp:851 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/engine/server.cpp:906 +#: ../../locales/../src/engine/server.cpp:927 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Küsi parooli" @@ -1602,7 +1687,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Küsi opsüsteemilt välist IP aadressi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3503 msgid "Asking questions in the FileZilla forums" msgstr "" @@ -1610,7 +1695,7 @@ msgid "Associated program not found:" msgstr "Seostatud programmi ei leitud:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:709 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:509 msgid "At least one filter condition is incomplete" msgstr "Vähemalt üks filtreerimistingimus on mittetäielik" @@ -1618,91 +1703,96 @@ msgid "At this point, all required information has been gathered." msgstr "Nüüdseks on kogu vajalik informatsioon kätte saadud." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atribuut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:639 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:617 msgid "Authentication failed." msgstr "Autentimine ebaõnnestus." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 msgid "Author:" msgstr "Autor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2522 msgid "Auto" msgstr "Auto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1061 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 msgid "Automatic file type classification" msgstr "Automaatne failitüübi määramine" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 -msgid "Available sizes" -msgstr "Saadaval olevad suurused" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:124 -#: ../../locales/../src/engine/sizeformatting_base.cpp:183 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:267 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:334 msgid "B&ypass proxy" msgstr "&Möödu proksist" -#: ../../locales/../src/engine/socket.cpp:1149 +#: ../../locales/../src/engine/socket.cpp:1016 msgid "Bad file descriptor" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3540 msgid "Basic usage instructions" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 msgid "Behaviour" msgstr "Käitumine" -#: ../../locales/../src/interface/edithandler.cpp:1131 -#: ../../locales/../src/interface/edithandler.cpp:1159 +#: ../../locales/../src/interface/edithandler.cpp:1124 +#: ../../locales/../src/interface/edithandler.cpp:1152 msgid "Being edited" msgstr "Hetkel muutmisel" -#: ../../locales/../src/engine/tlssocket.cpp:1037 +#: ../../locales/../src/engine/tlssocket.cpp:1327 msgid "Beware! Certificate has been revoked" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2519 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2549 msgid "Binary" msgstr "Binaarne" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 msgid "Blackboard" msgstr "Tahvel" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:269 -#: ../../locales/../src/interface/menu_bar.cpp:307 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:299 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:383 msgid "Bookmark" msgstr "Järjehoidja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 msgid "Bookmark:" msgstr "Järjehoidjad:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2801 msgid "Bookmarks" msgstr "Järjehoidjad" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#, fuzzy +msgid "Browse..." +msgstr "&Sirvi..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:660 msgid "Build date:" msgstr "Versiooni kuupäev:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:637 msgid "Build information" msgstr "Versiooni info" -#: ../../locales/../src/interface/verifycertdialog.cpp:187 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Business category:" msgstr "" @@ -1719,89 +1809,100 @@ msgid "C&ancel current operation" msgstr "T&ühista käesolev operatsioon" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "P&uhasta kõik" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 msgid "C&opy URL(s) to clipboard" msgstr "&Kopeeri URL(id) lõikemällu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1488 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#, fuzzy +msgid "C&opy URL(s) with password to clipboard" +msgstr "&Kopeeri URL(id) lõikemällu" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1518 msgid "C&ustom" msgstr "V&alitav" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2007 msgid "C&ustom filetype associations:" msgstr "Va&litud failitüüpide seosed:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1606 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1197 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:764 +msgid "CPU features:" +msgstr "" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1657 msgid "Calculating timezone offset of server..." msgstr "Arvutan serveri ajatsooni nihet..." -#: ../../locales/../src/engine/transfersocket.cpp:691 +#: ../../locales/../src/engine/transfersocket.cpp:688 msgid "Can't read from file" msgstr "Ei saa faili lugeda" -#: ../../locales/../src/engine/transfersocket.cpp:669 -#: ../../locales/../src/engine/transfersocket.cpp:742 +#: ../../locales/../src/engine/transfersocket.cpp:666 +#: ../../locales/../src/engine/transfersocket.cpp:741 msgid "Can't write data to file." msgstr "Ei saa kirjutada andmeid faili." -#: ../../locales/../src/engine/transfersocket.cpp:671 +#: ../../locales/../src/engine/transfersocket.cpp:669 #: ../../locales/../src/engine/transfersocket.cpp:744 #, c-format msgid "Can't write data to file: %s" msgstr "Ei saa kirjutada andmeid faili: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:264 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1169 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1350 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1457 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1528 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1581 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1814 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2163 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2545 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2854 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2728 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3488 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3321 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3877 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:629 msgid "Cancel" msgstr "Loobu" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Tühista käesolev tegevus" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Tühista käesolev tegevus" -#: ../../locales/../src/engine/local_path.cpp:459 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "'%s' -i ei saa lugeda, puudub loetav meedia või kettaseade ei ole korras." -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Cannot add server to Site Manager" msgstr "Ei saa lisada serverit saidihaldurisse" -#: ../../locales/../src/engine/socket.cpp:1201 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Cannot assign requested address" msgstr "" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1815,150 +1916,142 @@ "Katalooge ei õnnestu võrrelda, kasutatakse erinevaid filtreid kohaliku ja " "serveri kataloogi jaoks." -#: ../../locales/../src/interface/RemoteListView.cpp:2365 -msgid "Cannot compare directories, not connected to a server." -msgstr "Ei saa võrrelda katalooge, pole serveriga ühendatud." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Ei saa luua uut filtrit" -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/edithandler.cpp:1665 -#: ../../locales/../src/interface/LocalListView.cpp:1720 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1584 +#: ../../locales/../src/interface/edithandler.cpp:1632 +#: ../../locales/../src/interface/LocalListView.cpp:1741 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Cannot edit file" msgstr "Ei saa faili muuta" -#: ../../locales/../src/interface/LocalListView.cpp:1602 +#: ../../locales/../src/interface/LocalListView.cpp:1622 msgid "Cannot edit file, not connected to any server." msgstr "Ei saa faili muuta, pole serveriga ühendatud." -#: ../../locales/../src/interface/LocalListView.cpp:1611 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Cannot edit file, remote path unknown." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:325 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:370 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "Ei saa luua FTP ühendust SFTP serveriga. Palun valige õige protokoll." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Ei saa laadida kiirühenduse riba ressursifailist" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 -msgid "Cannot load keyfile" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 +#, fuzzy +msgid "Cannot load key file" msgstr "Ei õnnestu võtmefaili laadida" -#: ../../locales/../src/interface/Mainfrm.cpp:1035 +#: ../../locales/../src/interface/Mainfrm.cpp:1008 msgid "Cannot load toolbar from resource file" msgstr "Ei saa laadida tööriistariba ressursifailist" -#: ../../locales/../src/interface/manual_transfer.cpp:463 +#: ../../locales/../src/interface/manual_transfer.cpp:450 #, fuzzy msgid "Cannot remember password" msgstr "Sisesta parool" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:706 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214 msgid "Cannot rename entry" msgstr "Ei saa ümber nimetada" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1606 msgid "Cannot rename file" msgstr "Ei saa faili ümber nimetada" -#: ../../locales/../src/engine/proxy.cpp:135 +#: ../../locales/../src/engine/proxy.cpp:137 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "Cannot save filterset" msgstr "Ei saa salvestada filtreid" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Cannot select filter" msgstr "Ei saa selekteerida filtreid" -#: ../../locales/../src/interface/edithandler.cpp:1509 -#: ../../locales/../src/interface/edithandler.cpp:1514 -#: ../../locales/../src/interface/edithandler.cpp:1553 +#: ../../locales/../src/interface/edithandler.cpp:1482 +#: ../../locales/../src/interface/edithandler.cpp:1486 +#: ../../locales/../src/interface/edithandler.cpp:1521 msgid "Cannot set file association" msgstr "Ei saa lisada failitüübi seoseid" -#: ../../locales/../src/interface/edithandler.cpp:1090 +#: ../../locales/../src/interface/edithandler.cpp:1083 msgid "Cannot show dialog" msgstr "Ei saa näidata dialoogi" -#: ../../locales/../src/interface/edithandler.cpp:1687 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "Cannot view/edit selected file" msgstr "Valitud faili ei saa vaadata ega muuta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1732 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1762 #, fuzzy msgid "Case insensitive" msgstr "&Tingimused on tõstutundlikud" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1731 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1761 msgid "Case insensitive (default)" msgstr "Tõstutundetu (vaikimisi)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1763 msgid "Case sensitive" msgstr "Tõstutundlik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1764 msgid "Case sensitive (default)" msgstr "Tõstutundlik (vaikimisi)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1482 -msgid "Categories" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1491 +#, fuzzy +msgid "Categories to clear" msgstr "Kategooriad" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Certificate and session data are not available yet." msgstr "Sertifikaat ja sessiooni andmed pole veel saadaval." -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 -msgid "Certificate details" -msgstr "Sertifikaadi detailid" - #: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:294 msgid "Certificate in chain:" msgstr "Sertifikaat ahelas:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:139 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:404 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "Sertifikaadi väljastaja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket.cpp:1330 +#, fuzzy +msgid "Certificate signature verification failed" +msgstr "Sertifikaat ahelas:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Väljakutse:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:384 msgid "Change file attributes" msgstr "Muuda faili atribuute" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:530 msgid "Change the file permissions." msgstr "Muuda faili õigusi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2206 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Logifaili seadete muutmine vajab FileZilla restarti" -#: ../../locales/../src/interface/FileZilla.cpp:653 +#: ../../locales/../src/interface/FileZilla.cpp:558 msgid "Character encoding issue" msgstr "Sümbolite kodeering" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:522 msgid "Charset" msgstr "Kooditabel" @@ -1966,7 +2059,7 @@ msgid "Check for &updates..." msgstr "&Kontrolli uuendusi..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2023 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2053 msgid "Check for FileZilla &updates automatically:" msgstr "&Kontrolli FileZilla uuendusi automaatselt:" @@ -1978,17 +2071,17 @@ msgid "Check for newer versions of FileZilla" msgstr "Kontrolli FileZilla uuemate versioonide olemasolu" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Check for updates failed" msgstr "Uuenduste kontroll ebaõnnestus" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:785 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:828 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:824 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -1998,104 +2091,97 @@ msgid "Checking for correct external IP address" msgstr "Välise IP aadressi kontrollimine" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Kontrollin uuendusi..." -#: ../../locales/../src/interface/updater.cpp:710 +#: ../../locales/../src/interface/updater.cpp:754 #, c-format msgid "Checksum match on file %s\n" msgstr "" -#: ../../locales/../src/interface/updater.cpp:706 +#: ../../locales/../src/interface/updater.cpp:750 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1447 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1523 +#, fuzzy +msgid "Choose a key file" +msgstr "Konverdi võtmefail" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1554 msgid "Choose the default local directory" msgstr "Vali vaikimisi kohalik kataloog" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:131 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:371 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2160 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2317 msgid "Choose the local directory" msgstr "Vali kohalik kataloog" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 msgid "Chunk data improperly terminated" msgstr "Pinu andmed katkestati ebaõigelt" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:205 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:470 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "Šiffer:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:628 msgid "Cl&ose tab" msgstr "&Sulge sakk" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1266 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 msgid "Classic" msgstr "Klassikaline" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1502 -msgid "Clear &Site Manager entries" -msgstr "Kustuta &Saidihalduri sissekanded" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "Puhasta &paigutuse vahemälu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1489 -msgid "Clear &quickconnect history" -msgstr "Puhasta &kiirühenduste ajalugu" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 -msgid "Clear &reconnect information" -msgstr "Kustuta &taasühendamise info" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1508 -msgid "Clear &transfer queue" -msgstr "Kustuta &ülekannete järjekord" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 +#, fuzzy +msgid "Clear auto&update data" +msgstr "Privaatsete andmete kustutamine" -#: ../../locales/../src/interface/quickconnectbar.cpp:147 +#: ../../locales/../src/interface/quickconnectbar.cpp:200 msgid "Clear history" msgstr "Ajaloo kustutamine" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1479 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Privaatsete andmete kustutamine" -#: ../../locales/../src/interface/quickconnectbar.cpp:146 +#: ../../locales/../src/interface/quickconnectbar.cpp:199 msgid "Clear quickconnect bar" msgstr "Puhasta kiirühenduse riba" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Konfiguratsiooni salvestamiseks vajuta LÕPETA." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2067 msgid "Client to server MAC:" msgstr "Klient-server MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 msgid "Client to server cipher:" msgstr "Klient-server šiffer:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:614 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 msgid "Close &all other tabs" msgstr "Sulge &kõik teised sakid" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1176 -#: ../../locales/../src/interface/Mainfrm.cpp:1197 +#: ../../locales/../src/interface/Mainfrm.cpp:1144 +#: ../../locales/../src/interface/Mainfrm.cpp:1165 msgid "Close FileZilla" msgstr "Sulge FileZilla" @@ -2107,66 +2193,65 @@ msgid "Closes current tab" msgstr "Sulgeb eesoleva saki" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:289 msgid "Co&mments:" msgstr "Ko&mmentaarid:" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Veeru seaded" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2126 msgid "Column setup" msgstr "Veeru seadistus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1951 msgid "Command and its arguments should be properly quoted." msgstr "Käsklus ja tema argumendid peavad olema õigesti märgistatud." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Command failed" msgstr "Käsk ebaõnnestus" -#: ../../locales/../src/engine/proxy.cpp:504 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Command not supported" msgstr "Käsklus pole toetatud" -#: ../../locales/../src/engine/engineprivate.cpp:199 +#: ../../locales/../src/engine/engineprivate.cpp:223 msgid "Command not supported by this protocol" msgstr "Antud protokoll ei toeta seda korraldust" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:276 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Command:" msgstr "Käsk:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "Kommentaar" -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Common name:" msgstr "Avalik nimetus:" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Ruuter või tulemüür peab ühendust vigaseks" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:545 msgid "Compare &modification time" msgstr "Võrdle &muutmisaega" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:527 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 msgid "Compare file&size" msgstr "Võrdle &suurust" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1795 msgid "Comparison &threshold (in minutes):" msgstr "&Võrdluse piirmäär (minutites):" @@ -2174,32 +2259,32 @@ msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Võrdluse vahemik peab jääma vahemikku 0 ja 1440 minutit." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:644 msgid "Compiled for:" msgstr "Kompileeritud (millele):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:652 msgid "Compiled on:" msgstr "Kompileeritud (kus):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Compiled with:" msgstr "Kompileeritud (millega):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:676 msgid "Compiler flags:" msgstr "Kompileerimise lipud:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Tihendatud" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 msgid "Concurrent transfers" msgstr "Konkureerivad ülekanded" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1300 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1309 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3096 msgid "Conditions are c&ase sensitive" msgstr "&Tingimused on tõstutundlikud" @@ -2215,36 +2300,41 @@ msgid "Configure port range" msgstr "Seadista portide vahemik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3342 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3546 msgid "Configuring FileZilla and your network" msgstr "" -#: ../../locales/../src/interface/search.cpp:784 +#: ../../locales/../src/interface/search.cpp:1192 msgid "Confirm deletion" msgstr "Kinnita kustutamine" -#: ../../locales/../src/engine/local_filesys.cpp:134 -#: ../../locales/../src/interface/edithandler.cpp:1629 -#: ../../locales/../src/interface/LocalListView.cpp:1684 -#: ../../locales/../src/interface/RemoteListView.cpp:1421 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1120 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/edithandler.cpp:1596 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/RemoteListView.cpp:1413 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1042 +#: ../../locales/../src/interface/search.cpp:1148 msgid "Confirmation needed" msgstr "Vajalik kinnitus" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Õnnitlused, teie programmi seadistus tundub töötavat." -#: ../../locales/../src/interface/quickconnectbar.cpp:145 +#: ../../locales/../src/interface/quickconnectbar.cpp:198 msgid "Connect bypassing proxy settings" msgstr "Ühenda ignoreerides proksi-seadeid" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1364 +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, fuzzy, c-format +msgid "Connect failed: %s" +msgstr "Proksi päring ebaõnnestus: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Ühenda eesolevasse sakki" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1363 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 msgid "Connect in new tab" msgstr "Ühenda uude sakki" @@ -2252,28 +2342,25 @@ msgid "Connect to specified Site Manager site" msgstr "Ühendu määratud saidihalduri saidiga" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:911 -msgid "Connected" -msgstr "Ühendatud" - -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "Ühendumine" -#: ../../locales/../src/interface/netconfwizard.cpp:223 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:246 #, c-format msgid "Connecting to %s" msgstr "Ühendumine %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1030 -#, c-format -msgid "Connecting to %s through proxy" +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4333 +#, fuzzy, c-format +msgid "Connecting to %s through %s proxy" msgstr "Ühenda %s 'ga läbi proksi" -#: ../../locales/../src/engine/ControlSocket.cpp:906 -#: ../../locales/../src/engine/proxy.cpp:198 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:366 +#: ../../locales/../src/engine/ControlSocket.cpp:966 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:274 #, c-format msgid "Connecting to %s..." msgstr "Ühendume %s..." @@ -2282,182 +2369,211 @@ msgid "Connection" msgstr "Ühendus" -#: ../../locales/../src/engine/socket.cpp:1163 +#: ../../locales/../src/engine/socket.cpp:1030 #, fuzzy msgid "Connection aborted" msgstr "Ühendus suletud" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "Ühenduskatse ebaõnnestus" -#: ../../locales/../src/engine/ControlSocket.cpp:911 -#: ../../locales/../src/engine/proxy.cpp:203 +#: ../../locales/../src/engine/ControlSocket.cpp:930 +#: ../../locales/../src/engine/proxy.cpp:210 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Ühenduskatse \"%s\"'ga ebaõnnestus, proovin järgmist aadressi." -#: ../../locales/../src/engine/ControlSocket.cpp:915 +#: ../../locales/../src/engine/ControlSocket.cpp:935 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Ühenduskatse \"%s\"'ga ebaõnnestus." -#: ../../locales/../src/engine/ControlSocket.cpp:184 -#: ../../locales/../src/engine/engineprivate.cpp:678 +#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/engineprivate.cpp:696 msgid "Connection attempt interrupted by user" msgstr "Ühenduskatse katkestati kasutaja poolt" -#: ../../locales/../src/engine/socket.cpp:1156 +#: ../../locales/../src/engine/socket.cpp:1023 #, fuzzy msgid "Connection attempt timed out" msgstr "Ühendus aegus" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Ühendus suletud" -#: ../../locales/../src/engine/ControlSocket.cpp:997 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:232 +#: ../../locales/../src/engine/ControlSocket.cpp:1026 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:228 msgid "Connection closed by server" msgstr "Ühendus suletud serveri poolt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:369 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:296 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:272 msgid "Connection established, initializing TLS..." msgstr "Ühendus loodud, initsialiseerin TLS -i ..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:321 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:297 msgid "Connection established, sending HTTP request" msgstr "Ühendus loodud, saadan HTTP päringut" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +#, fuzzy +msgid "Connection established, waiting for welcome message." +msgstr "Ühendus loodud, ootan tervitusteadet..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:444 msgid "Connection established, waiting for welcome message..." msgstr "Ühendus loodud, ootan tervitusteadet..." -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Ühendus kadus" -#: ../../locales/../src/engine/proxy.cpp:489 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Connection not allowed by ruleset" msgstr "Ühendus pole reeglistikus lubatud." -#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "Connection refused" msgstr "Ühendus tagasi lükatud." -#: ../../locales/../src/engine/socket.cpp:1150 +#: ../../locales/../src/engine/socket.cpp:1017 #, fuzzy msgid "Connection refused by server" msgstr "Ühendus suletud serveri poolt" -#: ../../locales/../src/engine/socket.cpp:1159 +#: ../../locales/../src/engine/socket.cpp:1026 #, fuzzy msgid "Connection reset by network" msgstr "Ühendus suletud serveri poolt" -#: ../../locales/../src/engine/socket.cpp:1164 +#: ../../locales/../src/engine/socket.cpp:1031 #, fuzzy msgid "Connection reset by peer" msgstr "Ühendus suletud serveri poolt" -#: ../../locales/../src/engine/ControlSocket.cpp:564 -msgid "Connection timed out" -msgstr "Ühendus aegus" +#: ../../locales/../src/engine/ControlSocket.cpp:567 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "" +msgstr[1] "" -#: ../../locales/../src/interface/netconfwizard.cpp:1083 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "Ühendus aegus." -#: ../../locales/../src/interface/search.cpp:370 +#: ../../locales/../src/interface/search.cpp:666 #, fuzzy msgid "Connection to server lost." msgstr "Ühendumine serveriga" -#: ../../locales/../src/engine/proxy.cpp:213 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "Ühendus proksiga loodud, ootan kätlust..." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Ühendus serveriga katkestati enneaegselt." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Ühendus testserveriga ebaõnnestus." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 +#, fuzzy +msgid "Convert key file" msgstr "Konverdi võtmefail" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:644 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1745 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1893 #, c-format msgid "Copy (%d) of %s" msgstr "Koopia (%d) %s -ist" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:621 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1725 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1873 #, c-format msgid "Copy of %s" msgstr "%s koopia" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 msgid "Copy the URLs of the selected items to clipboard." msgstr "" -#: ../../locales/../src/engine/transfersocket.cpp:206 +#: ../../locales/../src/engine/transfersocket.cpp:182 #, c-format msgid "Could not accept connection: %s" msgstr "Ei luba ühendust: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:544 +#: ../../locales/../src/engine/tlssocket.cpp:1310 +#, fuzzy +msgid "Could not add certificate to temporary trust list" +msgstr "Kaugsertifikaat ei ole usaldusväärne." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Ei õnnestu lisada ühendust saidihaldurisse" -#: ../../locales/../src/interface/state.cpp:823 +#: ../../locales/../src/interface/state.cpp:799 #, fuzzy msgid "Could not complete operation" msgstr "Ei suuda lahendada IO lõimi" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:181 msgid "Could not connect to server" msgstr "Ei suuda ühenduda serveriga" -#: ../../locales/../src/engine/ControlSocket.cpp:1067 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Ei suuda ühenduda serveriga: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:765 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:718 msgid "Could not convert command to server encoding" msgstr "Ei saa teisendada käsklust serveri kodeeringusse" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Ei suuda konvertida privaatvõtit" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1464 +#: ../../locales/../src/interface/RemoteListView.cpp:2535 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1384 #, fuzzy msgid "Could not copy URLs" msgstr "Ei suuda ühenduda serveriga" -#: ../../locales/../src/interface/aboutdialog.cpp:175 +#: ../../locales/../src/engine/tlssocket.cpp:1292 +#, fuzzy +msgid "Could not copy certificate" +msgstr "Ei suuda lahendada IO lõimi" + +#: ../../locales/../src/interface/aboutdialog.cpp:203 #, fuzzy msgid "Could not copy data" msgstr "Ei suuda lahendada IO lõimi" -#: ../../locales/../src/interface/updater.cpp:453 +#: ../../locales/../src/interface/updater.cpp:489 #, fuzzy, c-format msgid "Could not create local file %s\n" msgstr "Ei saa kirjutada kohalikku faili" -#: ../../locales/../src/interface/RemoteListView.cpp:2273 -#: ../../locales/../src/interface/RemoteTreeView.cpp:912 +#: ../../locales/../src/engine/logging.cpp:179 +#, fuzzy, c-format +msgid "Could not create logging mutex: %s" +msgstr "Ei saa kirjutada kohalikku faili" + +#: ../../locales/../src/interface/RemoteListView.cpp:2201 +#: ../../locales/../src/interface/RemoteTreeView.cpp:839 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2467,11 +2583,11 @@ "Kas keskkond ei ole korralikult installeeritud või te ei pukseerinud faile " "Exploreri aknasse." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4181 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4187 msgid "Could not establish connection to server" msgstr "Ei suuda luua ühendust serveriga" -#: ../../locales/../src/interface/FileZilla.cpp:485 +#: ../../locales/../src/interface/FileZilla.cpp:409 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2482,48 +2598,42 @@ "Sa võid määrata andmete kataloogi kasutades käsurea võtit '--datadir " "' või seadistada keskkonnamuutuja FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:722 msgid "Could not generate custom login sequence." msgstr "Ei suuda genereerida kohandatud login-jada." -#: ../../locales/../src/engine/tlssocket.cpp:944 +#: ../../locales/../src/engine/tlssocket.cpp:1075 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:921 +#: ../../locales/../src/engine/tlssocket.cpp:1051 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "" -#: ../../locales/../src/interface/state.cpp:976 +#: ../../locales/../src/interface/state.cpp:996 msgid "Could not get full remote path." msgstr "Ei suuda leida serveri kaustateed." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Could not get reply from fzputtygen." msgstr "Ei saa fzputtygen'lt vastust." -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1584 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Could not get temporary directory to download file into." msgstr "Ei leia ajutist kataloogi faili allalaadimiseks." -#: ../../locales/../src/engine/tlssocket.cpp:867 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" - -#: ../../locales/../src/engine/tlssocket.cpp:862 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" +#: ../../locales/../src/interface/FileZilla.cpp:88 +#, fuzzy, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Ei saa kirjutada soketisse: %s" -#: ../../locales/../src/interface/import.cpp:95 -#: ../../locales/../src/interface/import.cpp:281 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2534,15 +2644,22 @@ "juurdepääsetavust.\n" "Kõik muudatused, mis tehakse saidihalduris, jäävad salvestamata." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223 -msgid "Could not load keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 +#, fuzzy +msgid "Could not load key file" msgstr "Ei suuda laadida võtmefaili" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Ei suuda laadida privaatvõtit" -#: ../../locales/../src/interface/state.cpp:1002 +#: ../../locales/../src/interface/state.cpp:1019 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2550,7 +2667,7 @@ "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../locales/../src/interface/state.cpp:391 +#: ../../locales/../src/interface/state.cpp:368 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2558,7 +2675,7 @@ "Synchronized browsing has been disabled." msgstr "" -#: ../../locales/../src/interface/state.cpp:292 +#: ../../locales/../src/interface/state.cpp:262 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2566,65 +2683,82 @@ "Synchronized browsing has been disabled." msgstr "" -#: ../../locales/../src/interface/aboutdialog.cpp:175 -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1464 +#: ../../locales/../src/interface/aboutdialog.cpp:203 +#: ../../locales/../src/interface/RemoteListView.cpp:2535 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1384 #, fuzzy msgid "Could not open clipboard" msgstr "&Kopeeri lõikemällu" -#: ../../locales/../src/engine/logging.cpp:104 -#: ../../locales/../src/engine/logging.cpp:171 -#: ../../locales/../src/engine/logging.cpp:203 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:237 +#: ../../locales/../src/engine/logging.cpp:277 +#: ../../locales/../src/engine/logging.cpp:303 #, c-format msgid "Could not open log file: %s" msgstr "Ei õnnestu avada logifaili: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Ei suuda parsida serveri kaustateed." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:118 msgid "Could not parse server address:" msgstr "Ei suuda parsida serveri aadressi:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223 +#: ../../locales/../src/interface/netconfwizard.cpp:994 +#, fuzzy +msgid "Could not read from data socket." +msgstr "Ei saa lugeda soketist: %s" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 #, c-format msgid "Could not read from socket: %s" msgstr "Ei saa lugeda soketist: %s" -#: ../../locales/../src/interface/sitemanager.cpp:488 +#: ../../locales/../src/interface/sitemanager.cpp:553 msgid "Could not read server item." msgstr "Ei suuda lugeda serveri üksust." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659 +#: ../../locales/../src/interface/netconfwizard.cpp:354 +#, fuzzy +msgid "Could not receive data from server." +msgstr "Ei suuda ühenduda serveriga" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2694 #, c-format msgid "Could not seek to offset %s within file" msgstr "Ei leia failist nihet %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2571 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2603 msgid "Could not seek to the end of the file" msgstr "Ei leia faili lõppu" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Ei suuda saata käsklust fzputtygen'le." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2687 +#: ../../locales/../src/engine/tlssocket.cpp:1261 +#, fuzzy +msgid "Could not sort peer certificates" +msgstr "Andmete vastuvõtt ebaõnnestus" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2724 msgid "Could not spawn IO thread" msgstr "Ei suuda lahendada IO lõimi" -#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Proksi-kätlus ebaõnnestus: %s" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "Ei saanud alustada ülekannet" -#: ../../locales/../src/interface/sitemanager.cpp:656 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../locales/../src/interface/sitemanager.cpp:630 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:826 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2633,21 +2767,21 @@ "Ei saa kirjutada \"%s\", kõik muudatused saidihalduris jäävad salvestamata: " "%s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, fuzzy, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "" "Ei saa kirjutada \"%s\", järjekorda ei salvestata.\n" "%s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:323 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, fuzzy, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Ei saa kirjutada \"%s\", järjekorda ei salvestata.\n" "%s" -#: ../../locales/../src/interface/QueueView.cpp:1896 +#: ../../locales/../src/interface/QueueView.cpp:1542 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2656,64 +2790,68 @@ "Ei saa kirjutada \"%s\", järjekorda ei salvestata.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager.cpp:828 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2141 +#: ../../locales/../src/interface/sitemanager.cpp:750 +#: ../../locales/../src/interface/sitemanager.cpp:807 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2295 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Ei saa kirjutada \"%s\", valitud saite ei õnnestunud eksportida: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:124 +#: ../../locales/../src/interface/xmlfunctions.cpp:149 #, fuzzy, c-format msgid "Could not write \"%s\":" msgstr "Ei saa kirjutada \"%s\": %s" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 -#, c-format -msgid "Could not write keyfile: %s" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 +#, fuzzy, c-format +msgid "Could not write key file: %s" msgstr "Ei õnnestu kirjutada võtmefaili: %s" -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "Ei saa kirjutada kohalikku faili" -#: ../../locales/../src/engine/logging.cpp:211 -#: ../../locales/../src/engine/logging.cpp:276 +#: ../../locales/../src/engine/logging.cpp:250 +#: ../../locales/../src/engine/logging.cpp:320 #, c-format msgid "Could not write to log file: %s" msgstr "Ei saa kirjutada logifaili: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:875 -#: ../../locales/../src/engine/ControlSocket.cpp:966 +#: ../../locales/../src/engine/ControlSocket.cpp:890 +#: ../../locales/../src/engine/ControlSocket.cpp:994 #, c-format msgid "Could not write to socket: %s" msgstr "Ei saa kirjutada soketisse: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Country:" msgstr "Riik:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:438 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "" -"FileZilla kaotab koheselt töövõime. Kasutatakse ainult erandite halduri " -"silumiseks." - #: ../../locales/../src/interface/resources/xrc/menus.xrc:312 msgid "Crea&te new file" msgstr "Loo &uus fail" +#: ../../locales/../src/interface/state.cpp:1034 +#, fuzzy +msgid "Create &missing local directory and enter it" +msgstr "L&oo kataloog ja ava see" + +#: ../../locales/../src/interface/state.cpp:959 +#, fuzzy +msgid "Create &missing remote directory and enter it" +msgstr "L&oo kataloog ja ava see" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:559 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:573 msgid "Create a new subdirectory in the current directory" msgstr "Loo jooksvasse kataloogi uus alamkataloog" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:509 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 #, fuzzy msgid "Create a new subdirectory in the current directory and change into it" msgstr "Loo jooksvasse kataloogi uus alamkataloog" @@ -2725,142 +2863,155 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:268 #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Create director&y and enter it" msgstr "L&oo kataloog ja ava see" -#: ../../locales/../src/interface/LocalListView.cpp:901 -#: ../../locales/../src/interface/LocalTreeView.cpp:1174 -#: ../../locales/../src/interface/RemoteListView.cpp:1324 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1304 +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1311 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1224 msgid "Create directory" msgstr "Loo kataloog" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2621 #, fuzzy msgid "Create empty file" msgstr "Ei saa faili muuta" -#: ../../locales/../src/interface/queue.cpp:392 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "Kataloogi loomine" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3240 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1943 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3217 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1828 #, c-format msgid "Creating directory '%s'..." msgstr "Kataloogi '%s' loomine..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:173 msgid "Critical error" msgstr "Kriitiline viga" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:164 #, fuzzy msgid "Critical error:" msgstr "Kriitiline viga" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:124 #, fuzzy msgid "Critical file transfer error" msgstr "Kriitiline viga" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:104 #, fuzzy, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kriitiline viga" -#: ../../locales/../src/interface/state.cpp:382 +#: ../../locales/../src/interface/state.cpp:359 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" "Synchronized browsing has been disabled." msgstr "" -#: ../../locales/../src/interface/statusbar.cpp:388 +#: ../../locales/../src/interface/statusbar.cpp:400 msgid "Current transfer type is set to ASCII." msgstr "Ülekandetüüp hetkel: ASCII." -#: ../../locales/../src/interface/statusbar.cpp:398 +#: ../../locales/../src/interface/statusbar.cpp:408 msgid "Current transfer type is set to automatic detection." msgstr "Ülekandetüüp hetkel: automaatne tuvastus." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:404 msgid "Current transfer type is set to binary." msgstr "Ülekandetüüp hetkel: binaarne." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2011 +msgid "Curve:" +msgstr "" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1537 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1567 msgid "Cus&tom" msgstr "Val&itav" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:92 msgid "Custom filter set" msgstr "Kohandatud filtrikogumik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2393 msgid "Custom server" msgstr "Kohandatud server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2483 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2513 msgid "D&ata type" msgstr "Andmetüüp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1637 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "&Detsimaalne - kasutatakse SI sümboleid. (näit. 1 KB = 1000 baiti.)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:392 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:466 msgid "D&efault" msgstr "V&aikeväärtused" #: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:619 msgid "D&elete" msgstr "Kus&tuta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1084 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2709 +#, fuzzy +msgid "D&irectory comparison" +msgstr "Võrdle katalooge" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1091 msgid "D&isable all" msgstr "K&eela kõik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1332 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 msgid "D&o not save passwords" msgstr "&Ära salvesta parooli" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "D&ouble-click action on directories:" msgstr "Topelt-klõps &kaustadel:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1235 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1241 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2847 msgid "D&uplicate" -msgstr "" +msgstr "&Tee koopia" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:40 msgid "DOS-like with virtual paths" msgstr "DOS'i-sarnane virtuaalteedega" -#: ../../locales/../src/interface/edithandler.cpp:1669 +#: ../../locales/../src/interface/edithandler.cpp:1636 msgid "Dangerous filetype" msgstr "Ohtlik failitüüp" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "Andmed" -#: ../../locales/../src/interface/netconfwizard.cpp:1000 -#: ../../locales/../src/interface/netconfwizard.cpp:1064 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." msgstr "Andmeühendus suleti liiga vara." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Kuupäev" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 msgid "Date formatting" msgstr "Kuupäeva vorming" @@ -2876,15 +3027,15 @@ msgid "Debug" msgstr "Silur" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 msgid "Debugging settings" msgstr "Silumise seaded" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default &local directory:" msgstr "Vaikimisi k&ohalik kataloog:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:32 msgid "Default (Autodetect)" msgstr "Vaikimisi (Automaatne tuvastus)" @@ -2892,17 +3043,17 @@ msgid "Default editor not properly quoted." msgstr "Vaikimisi editor ei ole korralikult määratud." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1362 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1371 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "Vaikimisi toiming faili olemasolul" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:371 msgid "Default r&emote directory:" msgstr "Vaikimisi k&auge kataloog:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 #, fuzzy msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " @@ -2911,7 +3062,7 @@ "Vaikimisi serveri kaustatee parsimine ei õnnestunud. Veenu, et see on " "korrektne ja et valitud serveritüüp toetab seda." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Vaikimisi süsteemikeel" @@ -2919,7 +3070,7 @@ msgid "Default transfer mode:" msgstr "Ülekande vaikelaad:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 msgid "Default transfer type:" msgstr "Ülekande vaiketüüp:" @@ -2935,7 +3086,7 @@ "Ajavahemik ebaõnnestunud ühenduskatsete vahel peab jääma vahemikku 1 kuni " "999 sekundit." -#: ../../locales/../src/engine/engineprivate.cpp:519 +#: ../../locales/../src/engine/engineprivate.cpp:537 #, fuzzy, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2946,12 +3097,12 @@ msgstr[0] "Ühendumine viibib eelnevalt ebõnnestunud ühenduskatse tõttu..." msgstr[1] "Ühendumine viibib eelnevalt ebõnnestunud ühenduskatse tõttu..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1200 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1247 msgid "Delete Site Manager entry" msgstr "Kustuta Saidihalduri sissekanne" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:582 msgid "Delete selected directory" msgstr "Kustuta valitud kataloog" @@ -2960,66 +3111,62 @@ msgid "Delete selected files and directories" msgstr "Kustuta valitud failid ja kataloogid" -#: ../../locales/../src/engine/engineprivate.cpp:361 +#: ../../locales/../src/engine/engineprivate.cpp:376 #, fuzzy, c-format msgid "Deleting \"%s\"" msgstr "Kataloogi loomine" -#: ../../locales/../src/engine/engineprivate.cpp:364 +#: ../../locales/../src/engine/engineprivate.cpp:379 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "" -#: ../../locales/../src/interface/search.cpp:768 -#, fuzzy -msgid "Deleting directories" -msgstr "Kataloogi loomine" - -#: ../../locales/../src/interface/search.cpp:768 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3339 msgid "Deleting symbolic link" msgstr "" -#: ../../locales/../src/interface/LocalTreeView.cpp:1009 +#: ../../locales/../src/interface/LocalTreeView.cpp:968 msgid "Desktop" msgstr "Töölaud" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:307 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 msgid "Details" msgstr "Detailid" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:946 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:953 msgid "Details for new key:" msgstr "Uue võtme detailid:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1319 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:755 +#, fuzzy +msgid "Detected newer version of FileZilla" +msgstr "Kontrolli FileZilla uuemate versioonide olemasolu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1328 msgid "Dire&ctories" msgstr "Kata&loogid" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Direction" msgstr "Suund" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "Kataloog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:459 -#: ../../locales/../src/interface/Mainfrm.cpp:2242 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2788 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1781 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:390 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2220 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "Directory comparison" msgstr "Võrdle katalooge" #: ../../locales/../src/interface/listingcomparison.cpp:74 -#: ../../locales/../src/interface/listingcomparison.cpp:82 -#: ../../locales/../src/interface/listingcomparison.cpp:88 msgid "Directory comparison failed" msgstr "Kataloogide võrdlus ebaõnnestus" @@ -3027,68 +3174,72 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "Logifaili sisaldavat kausta ei eksisteeri või on failinimi vale." -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +msgid "Directory listing &filters..." +msgstr "Kataloogi kuvamise &filtrid..." + +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Directory listing aborted by user" msgstr "Kataloogi lehitsemine katkestati kasutaja poolt" -#: ../../locales/../src/interface/RemoteListView.cpp:2075 +#: ../../locales/../src/interface/RemoteListView.cpp:2037 msgid "Directory listing failed" msgstr "Kataloogi kuvamine ebaõnnestus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "Directory listing filters" msgstr "Kataloogi kuvamise filtrid" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:196 #, fuzzy, c-format msgid "Directory listing of \"%s\" successful" msgstr "Kataloogi lehitsemine õnnestus" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Directory listing successful" msgstr "Kataloogi lehitsemine õnnestus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1126 msgid "Disa&ble all" msgstr "Keel&a kõik" -#: ../../locales/../src/interface/state.cpp:1010 +#: ../../locales/../src/interface/state.cpp:1027 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:660 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "Keelake see valik, kui te ei näe enam kataloogi sisu korrektselt." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Katkesta ühendus serveriga" -#: ../../locales/../src/engine/ControlSocket.cpp:79 -#: ../../locales/../src/engine/ControlSocket.cpp:876 -#: ../../locales/../src/engine/ControlSocket.cpp:968 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:897 -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../locales/../src/engine/ControlSocket.cpp:64 +#: ../../locales/../src/engine/ControlSocket.cpp:891 +#: ../../locales/../src/engine/ControlSocket.cpp:996 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:859 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" msgstr "Ühendus serveriga katkestatud" -#: ../../locales/../src/engine/ControlSocket.cpp:999 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/ControlSocket.cpp:1028 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:874 #, c-format msgid "Disconnected from server: %s" msgstr "Ühendus serveriga %s katkestatud" -#: ../../locales/../src/interface/queue.cpp:382 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:240 msgid "Disconnecting from previous server" msgstr "Lahtiühendumine eelmisest serverist" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Katkesta ühendus praegu nähtava serveriga" @@ -3096,55 +3247,51 @@ msgid "Display about dialog" msgstr "Näita info dialoogi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1886 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Do ¬ use default editor" msgstr "&Ära kasuta vaikimisi editori" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "&Ära tee midagi" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1801 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1856 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1821 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1876 #, fuzzy msgid "Do the same with &all selected files already being edited" msgstr "Valitud fail on juba muutmisel:" -#: ../../locales/../src/interface/Mainfrm.cpp:1179 -#: ../../locales/../src/interface/Mainfrm.cpp:1201 +#: ../../locales/../src/interface/Mainfrm.cpp:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1169 msgid "Do you really want to close FileZilla?" msgstr "Kas te tõesti tahate sulgeda FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Kas tõesti tahate kustutada kõik Saidihalduri sissekanded ja ülekannete " "järjekorra?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Kas tõesti tahate kustutada kõik Saidihalduri sissekanded?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1202 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1249 msgid "Do you really want to delete selected entry?" msgstr "Kas te tõesti tahate kustutada valitud sissekannet?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Kas tõesti tahate kustutada ülekannete järjekorra?" -#: ../../locales/../src/interface/Mainfrm.cpp:612 +#: ../../locales/../src/interface/Mainfrm.cpp:588 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Kas tõesti tahate saata '%s' serverisse?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1869 #, fuzzy msgid "Do you want to reopen this file?" msgstr "Kas te tõesti tahate sulgeda FileZilla?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3528 msgid "Documentation" msgstr "Dokumentatsioon" @@ -3152,42 +3299,42 @@ msgid "Don't use external IP address on &local connections." msgstr "Ärge kasutage välist IP aadressi &kohalikel ühendustel." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Punkt-failid on failid, millede nimi algab punktiga - näiteks .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1789 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1819 msgid "Double-click action" msgstr "Topelt-klõpsu toime" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Download" msgstr "Allalaadimine" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3526 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:886 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3695 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Allalaadimise &piirkiirus:" -#: ../../locales/../src/interface/statusbar.cpp:579 +#: ../../locales/../src/interface/statusbar.cpp:592 #, fuzzy, c-format msgid "Download limit: %s/s" msgstr "Allalaadimise &piirkiirus:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:595 #, fuzzy msgid "Download limit: none" msgstr "Allalaadimise &piirkiirus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 -#: ../../locales/../src/interface/search.cpp:510 -#: ../../locales/../src/interface/search.cpp:516 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3143 +#: ../../locales/../src/interface/search.cpp:859 +#: ../../locales/../src/interface/search.cpp:864 #, fuzzy msgid "Download search results" msgstr "Lae valitud kataloog alla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "Download selected directory" msgstr "Lae valitud kataloog alla" @@ -3195,52 +3342,43 @@ msgid "Download selected files and directories" msgstr "Lae valitud failid ja kataloogid alla" -#: ../../locales/../src/interface/Mainfrm.cpp:1007 +#: ../../locales/../src/interface/Mainfrm.cpp:980 #, c-format msgid "" "Download speed: %s/s\n" "Upload speed: %s/s" msgstr "" -#: ../../locales/../src/interface/edithandler.cpp:1116 +#: ../../locales/../src/interface/edithandler.cpp:1109 msgid "Downloading" msgstr "Allalaadimine" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:339 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:315 #, c-format msgid "Downloading %s" msgstr "%s -i allatõmbamine" -#: ../../locales/../src/interface/search.cpp:619 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" - -#: ../../locales/../src/interface/search.cpp:619 -#, fuzzy -msgid "Downloading search results" -msgstr "%s -i allatõmbamine" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 #, fuzzy msgid "Downloading update..." msgstr "Allalaadimine" -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:107 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:87 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:114 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:109 +#: ../../locales/../src/interface/RemoteTreeView.cpp:94 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" "Pukseerimine FileZilla erinevate instantside vahel ei ole veel realiseeritud." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:93 +#: ../../locales/../src/interface/LocalListView.cpp:118 +#: ../../locales/../src/interface/LocalTreeView.cpp:120 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:100 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Pukseerimine kahe erineva serveri vahel ei ole veel realiseeritud." @@ -3248,7 +3386,7 @@ msgid "Dupl&icate" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1077 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1084 msgid "E&nable all" msgstr "L&uba kõik" @@ -3257,7 +3395,7 @@ msgid "E&nter directory" msgstr "Ava &kataloog" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "E&xecute" msgstr "K&äivita" @@ -3265,15 +3403,21 @@ msgid "E&xit" msgstr "&Välju" -#: ../../locales/../src/interface/verifycertdialog.cpp:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 +msgid "E&xport..." +msgstr "E&ksport..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "E-Mail:" msgstr "E-post:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:693 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:487 msgid "Each filter needs at least one condition." msgstr "Igas filtris peab olema vähemalt üks tingimus." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "Edit filters" msgstr "Filtrite muutmine" @@ -3282,26 +3426,26 @@ "Edit the file with the configured editor and upload changes to the server." msgstr "Muuda faili seadistatud editoriga ja lae muudatused serverisse." -#: ../../locales/../src/interface/search.cpp:710 +#: ../../locales/../src/interface/search.cpp:1124 #, fuzzy msgid "Editing directories is not supported" msgstr "Aadressitüüp pole toetatud" -#: ../../locales/../src/interface/LocalListView.cpp:1602 -#: ../../locales/../src/interface/LocalListView.cpp:1611 +#: ../../locales/../src/interface/LocalListView.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Editing failed" msgstr "Muutmine ebaõnnestus" -#: ../../locales/../src/interface/search.cpp:710 +#: ../../locales/../src/interface/search.cpp:1124 #, fuzzy msgid "Editing search results" msgstr "%s -i allatõmbamine" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Email:" msgstr "E-kiri:" -#: ../../locales/../src/interface/QueueView.cpp:2181 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "Empty command" msgstr "Tühi kasklus" @@ -3309,11 +3453,11 @@ msgid "Empty command." msgstr "Tühi käsklus." -#: ../../locales/../src/interface/RemoteListView.cpp:2077 +#: ../../locales/../src/interface/RemoteListView.cpp:2039 msgid "Empty directory listing" msgstr "Tühi kataloogi nimekiri" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "Tühi kataloog." @@ -3321,13 +3465,13 @@ msgid "Empty file extension." msgstr "Puudub faili laiend." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Ilma nimeta filtrid ei ole lubatud." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Nime koht tühi" @@ -3335,27 +3479,27 @@ msgid "Empty quoted string." msgstr "Tühi string." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1112 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1119 msgid "En&able all" msgstr "Lu&ba kõik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:967 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 msgid "Enable invalid character &filtering" msgstr "Luba vigaste sümbolite &filtreerimine" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Krüpteeritud" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2050 msgid "Encryption" msgstr "Krüpteering" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1966 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1986 msgid "Encryption details" msgstr "Krüpteeringu detailid" -#: ../../locales/../src/interface/filelistctrl.cpp:461 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "Lõpeta võrdlus ja muuda sorteerimisjärjekorda?" @@ -3363,37 +3507,37 @@ msgid "Enter &custom command..." msgstr "&Sisesta oma käsk..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3736 msgid "Enter 0 for unlimited speed." msgstr "Kiiruse mittepiiramiseks sisesta 0." -#: ../../locales/../src/interface/QueueView.cpp:2170 +#: ../../locales/../src/interface/QueueView.cpp:1825 msgid "Enter command" msgstr "Sisesta käsk" -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Sisesta oma käsk" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1852 msgid "Enter directory" msgstr "Ava kataloog" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Sisestage filtri nimi" -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Enter name for filterset" msgstr "Sisesta nimi filtrikogumikule" -#: ../../locales/../src/interface/filter.cpp:393 +#: ../../locales/../src/interface/filter.cpp:274 msgid "Enter new name for filterset" msgstr "Sisesta filtrikogumikule uus nimi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Sisesta parool" @@ -3402,15 +3546,13 @@ msgid "Enter selected directory" msgstr "Ava valitud kataloog" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 -#, fuzzy +#: ../../locales/../src/interface/quickconnectbar.cpp:53 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3418,136 +3560,149 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Sisesta serveri aadress.\n" -"Serveri protokolli määramiseks kirjuta aadressi algusesse protokolli " -"identifikaator. Kui protokolli ei määrata kasutatakse vaikeväärtust " -"(ftp://).\n" -"Võid ka sisestada täieliku URLi kujul protokoll://kasutaja:parool@server:" -"port, millisel juhul muudes väljades olevaid andmeid ignoreeritakse." +"Sisesta serveri aadress. Serveri protokolli määramiseks kirjuta aadressi " +"algusesse protokolli identifikaator. Kui protokoll ei ole määratud, " +"kasutatakse vaikeväärtust (ftp://). Võid ka sisestada täieliku URLi kujul " +"protokoll://kasutaja:parool@server:port, millisel juhul muudes väljades " +"olevaid andmeid ignoreeritakse.\n" +"\n" +"Võimalikud protokolli variandid on:\n" +"- ftp:// tavaline krüpteeringuta FTP\n" +"- sftp:// protokoll faili ülekandeks üle SSH\n" +"- ftps:// FTP üle TLS-i (varjatud - implicit)\n" +"- ftpes:// FTP üle TLS-i (ilmutatud - explicit)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279 -#, c-format +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 +#, fuzzy, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" "Sisesta parool failile '%s'.\n" "Konverditud fail ei saa olema parooliga kaitstud." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Sisesta serveri port.\n" -"FTP pordi vaikeväärtus on 21, SFTP vaikeväärtus on 22." +"Sisesta serveri port. FTP port on vaikimisi 21, SFTP port on vaikimisi 22." + +#: ../../locales/../src/interface/loginmanager.cpp:73 +#, fuzzy +msgid "Enter username" +msgstr "Sisestage filtri nimi" -#: ../../locales/../src/interface/loginmanager.cpp:61 +#: ../../locales/../src/interface/loginmanager.cpp:80 msgid "Enter username and password" msgstr "Sisesta kasutajanimi ja parool" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Viga seadete ekspordil" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:85 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Viga importimisel" -#: ../../locales/../src/interface/QueueView.cpp:1963 +#: ../../locales/../src/interface/QueueView.cpp:1616 #, fuzzy msgid "Error loading queue" msgstr "XML faili laadimise viga" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:171 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:294 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:722 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:761 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:808 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:972 -#: ../../locales/../src/interface/import.cpp:96 -#: ../../locales/../src/interface/import.cpp:282 -#: ../../locales/../src/interface/Options.cpp:236 -#: ../../locales/../src/interface/QueueView.cpp:1879 -#: ../../locales/../src/interface/search.cpp:843 -#: ../../locales/../src/interface/search.cpp:862 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:451 -#: ../../locales/../src/interface/sitemanager.cpp:547 -#: ../../locales/../src/interface/sitemanager.cpp:606 -#: ../../locales/../src/interface/sitemanager.cpp:715 -#: ../../locales/../src/interface/sitemanager.cpp:797 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:793 -#: ../../locales/../src/interface/wrapengine.cpp:949 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:864 +#: ../../locales/../src/interface/filter.cpp:956 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:246 +#: ../../locales/../src/interface/QueueView.cpp:1525 +#: ../../locales/../src/interface/search.cpp:1252 +#: ../../locales/../src/interface/search.cpp:1271 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:522 +#: ../../locales/../src/interface/sitemanager.cpp:582 +#: ../../locales/../src/interface/sitemanager.cpp:686 +#: ../../locales/../src/interface/sitemanager.cpp:774 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:748 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:806 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "XML faili laadimise viga" -#: ../../locales/../src/interface/QueueView.cpp:1868 +#: ../../locales/../src/interface/QueueView.cpp:1514 #, fuzzy msgid "Error saving queue" msgstr "XML faili laadimise viga" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "Error starting program" msgstr "Viga programmi käivitamisel." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:324 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:842 -#: ../../locales/../src/interface/QueueView.cpp:1897 -#: ../../locales/../src/interface/sitemanager.cpp:657 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager.cpp:829 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:814 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2142 -#: ../../locales/../src/interface/xmlfunctions.cpp:125 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1543 +#: ../../locales/../src/interface/sitemanager.cpp:631 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:827 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2296 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 msgid "Error writing xml file" msgstr "XML faili kirjutamise viga" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:274 -#: ../../locales/../src/interface/StatusView.cpp:328 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:342 msgid "Error:" msgstr "Viga:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1994 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2024 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Näide: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1644 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1674 msgid "Examples" msgstr "Näited" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Exe&cute" msgstr "Käi&vita" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Ei ole võimalik kontrollida uuenduste olemasolu, sest käivitusfail ei " "sisalda versiooniinfot." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1267 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "Explorer" msgstr "Sirvija" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1581 +#, fuzzy +msgid "Export &Filters" +msgstr "&Filtrid:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1576 msgid "Export &Queue" msgstr "Ekspordi &järjekord" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 msgid "Export &Settings" msgstr "Ekspordi &seaded" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1552 msgid "Export settings" msgstr "Ekspordi seaded" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "F&ilter name:" msgstr "Filtri &nimi:" @@ -3555,20 +3710,19 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:502 msgid "FTP - File Transfer Protocol" msgstr "" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FTP Engine not initialized, can't connect" msgstr "FTP mootor ei ole algväärtustatud - ei saa ühenduda" @@ -3593,133 +3747,140 @@ "Andmete transpordiks kasutab FTP kahekordseid ühendusi. Need lisaühendused " "võivad olla aktiveeritud kahel viisil." -#: ../../locales/../src/engine/server.cpp:20 -#, fuzzy +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" -msgstr "FTPES - FTP üle otsese (explicit) TLS/SSL-i" +msgstr "FTPES - FTP üle ilmutatud (explicit) TLS-i" -#: ../../locales/../src/engine/server.cpp:19 -#, fuzzy +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" -msgstr "FTPS - FTP üle varjatud (implicit) TLS/SSL-i" +msgstr "FTPS - FTP üle varjatud (implicit) TLS-i" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:605 -#: ../../locales/../src/interface/LocalListView.cpp:890 -#: ../../locales/../src/interface/LocalListView.cpp:1800 -#: ../../locales/../src/interface/LocalTreeView.cpp:877 -#: ../../locales/../src/interface/LocalTreeView.cpp:1150 -#: ../../locales/../src/interface/viewheader.cpp:498 +#: ../../locales/../src/interface/LocalListView.cpp:540 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:914 +#: ../../locales/../src/interface/LocalListView.cpp:1825 +#: ../../locales/../src/interface/LocalTreeView.cpp:857 +#: ../../locales/../src/interface/LocalTreeView.cpp:1132 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Kataloogi vahetamine ebaõnnestus" -#: ../../locales/../src/interface/FileZilla.cpp:199 -#: ../../locales/../src/interface/FileZilla.cpp:212 -#: ../../locales/../src/interface/FileZilla.cpp:214 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:138 +#: ../../locales/../src/interface/FileZilla.cpp:153 +#: ../../locales/../src/interface/FileZilla.cpp:155 msgid "Failed to change language" msgstr "Keele vahetamine ebaõnnestus" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 +#, fuzzy +msgid "Failed to convert command to 8 bit charset" +msgstr "Ei saa teisendada käsklust serveri kodeeringusse" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2079 msgid "Failed to copy or move sites" msgstr "Saitide kopeerimine või liigutamine ebaõnnestus" -#: ../../locales/../src/interface/xmlfunctions.cpp:463 +#: ../../locales/../src/interface/xmlfunctions.cpp:328 msgid "Failed to create backup copy of xml file" msgstr "XML faili tagavarakoopia loomine ebaõnnestus" -#: ../../locales/../src/interface/netconfwizard.cpp:809 +#: ../../locales/../src/interface/netconfwizard.cpp:808 msgid "Failed to create listen socket, aborting" msgstr "Kuulava liidese (socket) loomine ebaõnnestus, katkestamine" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4160 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4167 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4171 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Kuulava liidese (socket) loomine aktiivset laadi ülekandele ebaõnnestus." -#: ../../locales/../src/interface/LocalTreeView.cpp:632 +#: ../../locales/../src/interface/LocalTreeView.cpp:633 msgid "Failed to get 'My Documents' path" msgstr "Ei õnnestunud leida teed 'Minu dokumentideni'" -#: ../../locales/../src/interface/LocalTreeView.cpp:618 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get desktop path" msgstr "Ei õnnestunud leida teekonda töölauani" -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Partneri 'control connection' aadressi vastuvõtt ebaõnnestus, ühendus suleti." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "Partneri andmeside aadressi vastuvõtt ebaõnnestus, ühendus katkestati." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "FTP mootori algväärtustamine ebaõnnestus" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:377 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:756 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:303 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:798 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:279 msgid "Failed to initialize TLS." msgstr "TLS -i initsialiseerimine ebaõnnestus." +#: ../../locales/../src/interface/FileZilla.cpp:89 +#, fuzzy +msgid "Failed to initialize networking" +msgstr "FTP mootori algväärtustamine ebaõnnestus" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Paneelide sisselugemine ebaõnnestus, vigased ressursifailid?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Privaatvõtme laadimine ebaõnnestus: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2561 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "\"%s\" avamine lisamiseks/kirjutamiseks ebaõnnestus" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2657 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "\"%s\" avamine lugemiseks ebaõnnestus" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1023 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2625 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:997 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "\"%s\" avamine kirjutamiseks ebaõnnestus" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/ControlSocket.cpp:352 #, fuzzy msgid "Failed to parse returned path." msgstr "Ei suuda parsida serveri kaustateed." -#: ../../locales/../src/interface/netconfwizard.cpp:1029 +#: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "Andmete vastuvõtt ebaõnnestus" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:189 msgid "Failed to retrieve directory listing" msgstr "Kataloogi nimekirja vastuvõtt ebaõnnestus" -#: ../../locales/../src/interface/netconfwizard.cpp:731 +#: ../../locales/../src/interface/netconfwizard.cpp:737 msgid "Failed to retrieve external ip address, aborting" msgstr "Välise IP aadressi leidmine ebaõnnestus, katkestan" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3871 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3849 msgid "Failed to retrieve external ip address, using local address" msgstr "Välise IP aadressi leidmine ebaõnnestus, kasutame kohalikku aadressi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3892 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868 msgid "Failed to retrieve local ip address." msgstr "Kohaliku IP aadressi leidmine ebaõnnestus." -#: ../../locales/../src/interface/netconfwizard.cpp:704 +#: ../../locales/../src/interface/netconfwizard.cpp:712 msgid "Failed to retrieve local ip address. Aborting" msgstr "Kohaliku IP leidmine ebaõnnestus. Katkestan" -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Välise IP aadressi leidmine ebaõnnestus." @@ -3727,13 +3888,13 @@ msgid "Failed to send command." msgstr "Käsu saatmine ebaõnnestus." -#: ../../locales/../src/interface/FileZilla.cpp:212 +#: ../../locales/../src/interface/FileZilla.cpp:153 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Keele %s (%s) kasutuselevõtt ebaõnnestus, kasutatakse süsteemi vaikekeelt" -#: ../../locales/../src/interface/FileZilla.cpp:192 +#: ../../locales/../src/interface/FileZilla.cpp:131 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3741,45 +3902,44 @@ "Keele %s (%s) kasutuselevõtt ebaõnnestus, kasutatakse süsteemi vaikekeelt " "(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:181 +#: ../../locales/../src/interface/FileZilla.cpp:120 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Keele %s (%s) kasutuselevõtt ebaõnnestus, kasutatakse süsteemi vaikekeelt." -#: ../../locales/../src/interface/FileZilla.cpp:214 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:155 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Keele %s kasutuselevõtt ebaõnnestus, kasutatakse süsteemi vaikekeelt" -#: ../../locales/../src/interface/FileZilla.cpp:188 +#: ../../locales/../src/interface/FileZilla.cpp:127 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Keele %s kasutuselevõtt ebaõnnestus, kasutatakse süsteemi vaikekeelt (%s, " "%s)." -#: ../../locales/../src/interface/FileZilla.cpp:178 +#: ../../locales/../src/interface/FileZilla.cpp:117 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Keele %s kasutuselevõtt ebaõnnestus, kasutatakse süsteemi vaikekeelt" -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:214 msgid "Failed to validate settings" msgstr "Seadete kontroll ebaõnnestus" -#: ../../locales/../src/engine/tlssocket.cpp:1031 +#: ../../locales/../src/engine/tlssocket.cpp:1320 #, fuzzy msgid "Failed to verify peer certificate" msgstr "Andmete vastuvõtt ebaõnnestus" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:536 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:508 #, c-format msgid "Failed to write to file %s" msgstr "Faili %s kirjutamine ebaõnnestus" -#: ../../locales/../src/interface/xmlfunctions.cpp:480 +#: ../../locales/../src/interface/xmlfunctions.cpp:341 msgid "Failed to write xml file" msgstr "XML faili kirjutamine ebaõnnestus" @@ -3791,15 +3951,15 @@ msgid "Fall back to active mode" msgstr "Tagasi aktiivse laadi juurde" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2301 msgid "Fil&e:" msgstr "Fai&l:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1323 msgid "Fil&es" msgstr "Fai&lid" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "Fail" @@ -3807,11 +3967,11 @@ msgid "File Types" msgstr "Failide tüübid" -#: ../../locales/../src/engine/socket.cpp:1155 +#: ../../locales/../src/engine/socket.cpp:1022 msgid "File descriptor not a socket" msgstr "" -#: ../../locales/../src/interface/import.cpp:85 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Fail ei sisalda imporditavaid andmeid." @@ -3819,7 +3979,7 @@ msgid "File editing" msgstr "Serveris asuvate failide muutmine" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1620 msgid "File exists" msgstr "Fail on olemas" @@ -3827,7 +3987,7 @@ msgid "File exists action" msgstr "Toiming faili olemasolul" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 msgid "File has changed" msgstr "Fail on muudetud" @@ -3835,66 +3995,68 @@ msgid "File lists" msgstr "Faililoetelud" -#: ../../locales/../src/interface/edithandler.cpp:1593 -#: ../../locales/../src/interface/FileZilla.cpp:675 -#: ../../locales/../src/interface/FileZilla.cpp:760 +#: ../../locales/../src/interface/edithandler.cpp:1560 +#: ../../locales/../src/interface/FileZilla.cpp:580 +#: ../../locales/../src/interface/FileZilla.cpp:665 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Faili ei leitud" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/search.cpp:681 +#: ../../locales/../src/interface/search.cpp:686 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Faili otsing" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:113 #, fuzzy msgid "File transfer aborted by user" msgstr "Ülekanne katkestatud kasutaja poolt" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:101 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:136 +#: ../../locales/../src/engine/ControlSocket.cpp:127 #, fuzzy msgid "File transfer failed" msgstr "Faili ülekanne õnnestus" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:107 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:120 #, fuzzy msgid "File transfer skipped" msgstr "Ebaõnnestunud ülekanded" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:117 msgid "File transfer successful" msgstr "Faili ülekanne õnnestus" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:98 #, fuzzy, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Faili ülekanne õnnestus" -#: ../../locales/../src/interface/Mainfrm.cpp:1178 +#: ../../locales/../src/interface/Mainfrm.cpp:1146 msgid "File transfers still in progress." msgstr "Faili ülekanne on veel pooleli." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 msgid "File would transfer with ASCII data type." msgstr "Fail edastataks ASCII-andmetüübina." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2537 msgid "File would transfer with binary data type." msgstr "Fail edastataks binaarse andmetüübina." -#: ../../locales/../src/interface/FileZilla.cpp:486 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/FileZilla.cpp:410 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FileZilla Error" msgstr "FileZilla viga" @@ -3904,15 +4066,15 @@ "properly." msgstr "FileZilla võib nüüd kontrollida programmi seadete korrektsust." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3620 msgid "FileZilla is already connected to a server." msgstr "FileZilla on juba serveriga ühendatud." -#: ../../locales/../src/interface/Mainfrm.cpp:1508 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "FileZilla vajab keeleseadete muudatuste aktiveerimiseks taaskäivitust." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2082 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2112 msgid "FileZilla updates" msgstr "FileZilla uuendused" @@ -3920,35 +4082,31 @@ msgid "Filelist status &bars" msgstr "Failinimekirja &inforibad" -#: ../../locales/../src/interface/edithandler.cpp:1101 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:80 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/edithandler.cpp:1094 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:286 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:150 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "Failinimi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Failinimede filtrid..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3044 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2204 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3017 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2072 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Failinime loomine kataloogile %s ja failile %s ebaõnnestus" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1606 msgid "Filename invalid" msgstr "Vigane failinimi" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "Filename unchanged" msgstr "Failinime ei muudetud" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1691 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2144 msgid "Filename:" msgstr "Failinimi:" @@ -3962,14 +4120,14 @@ "|" msgstr "Failinimes ei tohi kasutada järgnevaid sümboleid: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1982 msgid "Files currently being edited" msgstr "Failid, mis on praegu muutmisel" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:82 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:152 msgid "Filesize" msgstr "Faili suurus" @@ -3977,85 +4135,88 @@ msgid "Filesize format" msgstr "Failisuuruse vorming" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:153 msgid "Filetype" msgstr "Faili tüüp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2036 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Failitüüpide seosed" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Filter applies to:" msgstr "Filter rakendub:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:961 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 msgid "Filter invalid characters in filenames" msgstr "Filtreeri vigased sümbolid failinimedest" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:355 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Sellise nimega filter juba olemas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1277 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1283 msgid "Filter out items matching all of the following" msgstr "Filtreeri välja, kui sobib kõigi järgnevate tingimustega" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1284 msgid "Filter out items matching any of the following" msgstr "Filtreeri välja, kui sobib vähemalt ühe järgneva tingimusega" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1279 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "Filter out items matching none of the following" msgstr "Filtreeri välja, kui ei sobi ühegi järgneva tingimusega" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1286 +#, fuzzy +msgid "Filter out items matching not all of the following" +msgstr "Filtreeri välja, kui sobib kõigi järgnevate tingimustega" + +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Filter set already exists" msgstr "Selline filtrikogumik on juba olemas" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtreeri kataloogi sisu" -#: ../../locales/../src/interface/filteredit.cpp:339 -#: ../../locales/../src/interface/filteredit.cpp:347 -#: ../../locales/../src/interface/filteredit.cpp:355 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Filtri õigsuse kontroll ebaõnnestus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3031 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3101 #, fuzzy msgid "Find &files" msgstr "%d fail" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 #, fuzzy msgid "Find d&irectories" msgstr "Kataloogi loomine" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:362 msgid "Fingerprint (SHA-1):" msgstr "Sõrmejälg (SHA-1):" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:354 msgid "Fingerprint (SHA-256):" msgstr "Sõrmejälg (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:852 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:970 msgid "Fingerprint:" msgstr "Sõrmejälg:" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Tulemüüri ja ruuteri seadistamise nõustaja" @@ -4071,7 +4232,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Töökindluse huvides määrake vähemalt 10 -ne pordine vahemik." -#: ../../locales/../src/interface/Options.cpp:235 +#: ../../locales/../src/interface/Options.cpp:245 #, fuzzy msgid "" "For this session the default settings will be used. Any changes to the " @@ -4081,7 +4242,7 @@ "Selle seansi jaoks kasutatakse vaikeväärtusi. Kõik tehtud muudatused " "seadetes jäävad salvestamata." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 msgid "Force &UTF-8" msgstr "Eelista &UTF-8" @@ -4089,7 +4250,7 @@ msgid "Force showing &hidden files" msgstr "&Näita peidetud faile" -#: ../../locales/../src/interface/Mainfrm.cpp:671 +#: ../../locales/../src/interface/Mainfrm.cpp:655 msgid "Force showing hidden files" msgstr "Näita peidetud faile" @@ -4097,18 +4258,18 @@ msgid "Format specifications:" msgstr "Vormingu kirjeldus:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2019 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Vorming: Laiendile järgneb korrektselt määratud käsklus ja tema argumendid." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:641 +#: ../../locales/../src/interface/updater.cpp:686 #, c-format msgid "Found new %s %s\n" -msgstr "" +msgstr "Leitud uus %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 msgid "Further documentation" msgstr "" @@ -4116,11 +4277,11 @@ msgid "General" msgstr "Põhiandmed" -#: ../../locales/../src/engine/proxy.cpp:486 +#: ../../locales/../src/engine/proxy.cpp:476 msgid "General SOCKS server failure" msgstr "SOCKS serveri tõrge" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Üldine proksi" @@ -4129,122 +4290,128 @@ msgid "Get external IP address from the following URL:" msgstr "Võta väline IP aadress järgnevalt URL'ilt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3491 msgid "Getting help" msgstr "Abilehed" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Given filterset name already exists, overwrite filter set?" msgstr "See nimi on juba kasutuses, kas kirjutame üle?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:255 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Globaalsed järjehoidjad" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:319 #, c-format msgid "GnuTLS error %d" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:188 +#: ../../locales/../src/engine/tlssocket.cpp:322 #, c-format msgid "GnuTLS error %d in %s" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:182 +#: ../../locales/../src/engine/tlssocket.cpp:314 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:311 #, c-format msgid "GnuTLS error %d: %s" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:707 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:430 msgid "Group permissions" msgstr "Grupi õigused" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "K&õrge" -#: ../../locales/../src/engine/server.cpp:18 -#, fuzzy +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" -msgstr "FTPS - FTP üle varjatud (implicit) TLS/SSL-i " +msgstr "HTTPS - HTTP üle TLS-i" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2021 msgid "Hash:" msgstr "Räsi:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Peidetud" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 -#: ../../locales/../src/interface/queue.cpp:890 -#: ../../locales/../src/interface/queue.cpp:977 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/interface/queue.cpp:888 +#: ../../locales/../src/interface/queue.cpp:944 msgid "High" msgstr "Suur" -#: ../../locales/../src/interface/queue.cpp:892 -#: ../../locales/../src/interface/queue.cpp:979 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Highest" msgstr "Kõrgeim" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Kõrgeima vaba pordi number peab olema vahemikus 1024 kuni 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Filtri seisu muutmiseks üheaegselt mõlemal pool, hoia all SHIFT klahvi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:612 msgid "Homepage:" msgstr "Koduleht:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 +#: ../../locales/../src/engine/socket.cpp:1033 +msgid "Host is down" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2031 msgid "Host key fingerprint:" msgstr "Serveri võtme sõrmejälg:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:915 msgid "Host key mismatch" msgstr "Serveri võti ei sobi" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:156 msgid "Host starts with '[' but no closing bracket found." msgstr "Host algab '[' suluga, kuid lõpetavat sulgu ei leitud." -#: ../../locales/../src/engine/proxy.cpp:495 +#: ../../locales/../src/engine/proxy.cpp:485 msgid "Host unreachable" msgstr "Server pole ligipääsetav" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:175 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:440 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:953 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:960 msgid "Host:" msgstr "Server:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:350 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:424 msgid "Hours," msgstr "Tunnid," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1562 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (näiteks: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:128 +#: ../../locales/../src/engine/proxy.cpp:116 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "" @@ -4257,7 +4424,7 @@ "Kui ülalmääratud aja jooksul andmeid ei edastata ega võeta vastu, ühendus " "suletakse ja FileZilla püüab luua uut ühendust." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2276 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Kui teatate vigadest, palun andke logi, kus on kasutatud \"Paljusõnalist\" " @@ -4282,13 +4449,13 @@ "Kui seadete ennistamine on lubatud, on võimalik ühenduda halvasti " "seadistatud serveritega, mis keelduvad valitud ülekande laadist." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:941 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:948 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:575 #, fuzzy msgid "" "If the problem persists, some router and/or firewall keeps blocking " @@ -4296,7 +4463,7 @@ msgstr "" "Kui see probleem ei lahendu, võtke ühendust ruuteri või tulemüüri tootjaga." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:584 #, fuzzy msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " @@ -4304,7 +4471,7 @@ msgstr "" "Kui see probleem ei lahendu, võtke ühendust ruuteri või tulemüüri tootjaga." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2199 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4314,25 +4481,25 @@ "failinime lõppu \".1\") ja luuakse uus fail. Selle käigus kustutatakse varem " "eksisteerinud .1-lõpuga logifail." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3351 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:640 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" "Kui see probleem ei lahendu, võtke ühendust ruuteri või tulemüüri tootjaga." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "Kui see probleem ei lahendu, võtke ühendust ruuteri tootjaga." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1220 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1450 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4342,7 +4509,7 @@ "ajaga. Kui ajad erinevad (näiteks erinevad ajavööndid), kirjelda ajavööndi " "nihe saidihalduris." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1758 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1788 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4350,7 +4517,7 @@ "Kui kasutad ajaväärtustel põhinevat võrdlust, loe kaks faili võrdseks, kui " "nende ajaväärtuste erinevus ei ületa seda piirmäära." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1893 msgid "If you change the language, you need to restart FileZilla." msgstr "Kui muudate keele, tuleb programm taaskäivitada." @@ -4362,11 +4529,11 @@ "Kui te vajutate nuppu TEST, ühendub FileZilla probe.filezilla-project.org -" "iga ja teeb mõned lihtsad testid." -#: ../../locales/../src/interface/Mainfrm.cpp:1200 +#: ../../locales/../src/interface/Mainfrm.cpp:1168 msgid "If you close FileZilla, your changes will be lost." msgstr "Kui te sulgete FileZilla, muudatusi ei salvestata." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1108 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4384,7 +4551,7 @@ "Kui teil on probleeme kataloogi nimekirja vastuvõtul või failide ülekandel, " "proovige muuta vaikelaadi seadeid." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4419,22 +4586,22 @@ "Kui kasutate ruuterit veenduge, et kõik need pordid oleks edasi suunatud " "(forwarded) masinani, kus töötab FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "Kui ruuter ikka muudab IP aadressi võtke ühendust tema tootjaga." -#: ../../locales/../src/interface/import.cpp:77 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Andmete import vanemast versioonist" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 msgid "Import settings" msgstr "Impordi seaded" -#: ../../locales/../src/interface/import.cpp:63 -#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Import õnnestus" @@ -4476,33 +4643,32 @@ "küsib serverilt porti ja ühendub sinna. Muid seadistusi selle jaoks pole " "vaja teha." -#: ../../locales/../src/engine/tlssocket.cpp:1043 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" - -#: ../../locales/../src/interface/queue.cpp:380 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "Vale parool" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:747 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:789 msgid "Initializing TLS..." msgstr "TLS ühenduse initsialiseerimine ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:731 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +#, fuzzy +msgid "Insecure algorithm!" +msgstr "Allkirja algoritm:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:773 msgid "Insecure server, it does not support FTP over TLS." msgstr "" -#: ../../locales/../src/engine/server.cpp:834 -#: ../../locales/../src/engine/server.cpp:853 -#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/engine/server.cpp:910 +#: ../../locales/../src/engine/server.cpp:931 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktiivne" @@ -4510,31 +4676,31 @@ msgid "Interface" msgstr "Liides" -#: ../../locales/../src/engine/socket.cpp:1152 +#: ../../locales/../src/engine/socket.cpp:1019 #, fuzzy msgid "Interrupted by signal" msgstr "Katkestatud kasutaja poolt" #: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "Katkestatud kasutaja poolt" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:742 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 msgid "Invalid Content-Length" msgstr "Vigane sisu pikkus" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:592 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 msgid "Invalid HTTP Response" msgstr "Vigane HTTP vastus" -#: ../../locales/../src/engine/socket.cpp:1140 +#: ../../locales/../src/engine/socket.cpp:1007 #, fuzzy msgid "Invalid argument passed" msgstr "Vigane vastuse kood" -#: ../../locales/../src/engine/ControlSocket.cpp:457 -#: ../../locales/../src/engine/ControlSocket.cpp:513 +#: ../../locales/../src/engine/ControlSocket.cpp:461 +#: ../../locales/../src/engine/ControlSocket.cpp:518 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4542,17 +4708,18 @@ "Kuna võeti vastu vigane märgijada, keelatakse UTF-8. UTF-8 jõuga määramiseks " "tee vastav valik saidihalduris." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 msgid "Invalid chunk size" msgstr "Vigane pinu suurus" -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Vigased andmed" -#: ../../locales/../src/interface/verifycertdialog.cpp:36 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 #: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Vigane kuupäev" @@ -4562,24 +4729,27 @@ msgid "Invalid filename" msgstr "Vigane failinimi" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:161 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "Vigane host: peale lõpetavat sulgu on lubatud ainult koolon ja port." -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:641 +#, fuzzy, c-format +msgid "Invalid hostname: %s" +msgstr "Vigane failinimi" + +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "Invalid input" msgstr "Vigane sisend" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:67 +#: ../../locales/../src/engine/server.cpp:188 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Vale pordi number. Pordi numbriks võib olla väärtus vahemikust 1 kuni 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 -#, fuzzy +#: ../../locales/../src/engine/server.cpp:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:164 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4587,48 +4757,45 @@ "ftps:// for FTP over TLS (implicit) and\n" "ftpes:// for FTP over TLS (explicit)." msgstr "" -"Määrati vigane protokoll. Võimalikud protokolli variandid oleks:\n" -"ftp:// normaalne FTP,\n" +"Vigane protokoll. Võimalikud protokolli variandid on:\n" +"ftp:// tavaline krüpteeringuta FTP,\n" "sftp:// protokoll faili ülekandeks üle SSH,\n" -"ftps:// FTP üle SSL-i (varjatud - implicit) ja\n" -"ftpes:// FTP üle SSL-i (otsene - explicit)." +"ftps:// FTP üle TLS-i (varjatud - implicit) ja\n" +"ftpes:// FTP üle TLS-i (ilmutatud - explicit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4304 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4305 #, fuzzy msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "Vigane host: peale lõpetavat sulgu on lubatud ainult koolon ja port." -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:520 +#, fuzzy +msgid "Invalid regular expression" +msgstr "Tingimuse vigane suurus" + +#: ../../locales/../src/interface/search.cpp:686 #, fuzzy msgid "Invalid regular expression in search conditions." msgstr "Tingimuse vigane suurus" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:602 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:568 msgid "Invalid response code" msgstr "Vigane vastuse kood" -#: ../../locales/../src/interface/search.cpp:385 +#: ../../locales/../src/interface/search.cpp:681 #, fuzzy, c-format msgid "Invalid search conditions: %s" msgstr "Tingimuse vigane suurus" -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:443 -#: ../../locales/../src/interface/sitemanager.cpp:457 -#: ../../locales/../src/interface/sitemanager.cpp:464 -#: ../../locales/../src/interface/sitemanager.cpp:471 -#: ../../locales/../src/interface/sitemanager.cpp:488 -#: ../../locales/../src/interface/sitemanager.cpp:539 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:734 -#: ../../locales/../src/interface/sitemanager.cpp:808 -#: ../../locales/../src/interface/sitemanager.cpp:814 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:786 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Invalid site path" msgstr "Vigane aadress" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:723 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:535 msgid "Invalid size in condition" msgstr "Tingimuse vigane suurus" @@ -4636,32 +4803,32 @@ msgid "Invalid username given." msgstr "Vigane kasutajanimi" -#: ../../locales/../src/engine/socket.cpp:1172 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Invalid value for ai_flags" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1174 +#: ../../locales/../src/engine/socket.cpp:1042 #, fuzzy msgid "Invalid value for hints" msgstr "Vigane sisend" -#: ../../locales/../src/interface/verifycertdialog.cpp:198 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction country:" msgstr "" -#: ../../locales/../src/interface/verifycertdialog.cpp:200 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction locality:" msgstr "" -#: ../../locales/../src/interface/verifycertdialog.cpp:199 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Jurisdiction state or province:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1715 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1745 msgid "Keep directories on top" msgstr "Hoia kataloogid nimekirja alguses" -#: ../../locales/../src/interface/Mainfrm.cpp:675 +#: ../../locales/../src/interface/Mainfrm.cpp:659 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4671,43 +4838,50 @@ "nimekirja, kui see valik on lubatud. Kuigi FileZilla püüab tuvastada serveri " "sellekohast võimekust, võib kontroll ebaõnnestuda." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1974 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1994 msgid "Key exchange" msgstr "Võtmevahetus" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:195 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:460 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 msgid "Key exchange:" msgstr "Võtmekehtestus:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/engine/server.cpp:908 +#: ../../locales/../src/engine/server.cpp:929 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1329 +#, fuzzy +msgid "Key file" +msgstr "%d fail" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "M&adalaim" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1874 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Keel" -#: ../../locales/../src/interface/Mainfrm.cpp:1508 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "Language changed" msgstr "Keel muudetud" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:154 msgid "Last modified" msgstr "Viimati muudetud" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1251 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 msgid "Layout" msgstr "Paigutus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 msgid "Limit for concurrent &downloads:" msgstr "Samaaegsete &allalaadimiste limiit:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:845 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 msgid "Limit for concurrent &uploads:" msgstr "Samaaegsete &üleslaadimiste limiit:" @@ -4715,29 +4889,30 @@ msgid "Limit local ports" msgstr "Kohalike portide piirangud" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2138 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2168 msgid "Limit size of logfile" msgstr "Määra logifaili maksimaalne suurus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2176 msgid "Limit:" msgstr "Maksimaalselt:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:809 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 msgid "Line length exceeded" msgstr "Rea lubatud pikkus ületatud" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:727 msgid "Linked against" msgstr "Lingitud" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Jälgitav ühendus suleti" -#: ../../locales/../src/engine/logging.cpp:116 -#: ../../locales/../src/interface/StatusView.cpp:285 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Listing:" msgstr "Loetelu:" @@ -4745,52 +4920,63 @@ msgid "Lo&west available port:" msgstr "&Madalaim vaba port:" -#: ../../locales/../src/interface/edithandler.cpp:1149 -#: ../../locales/../src/interface/edithandler.cpp:1403 +#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1378 msgid "Local" msgstr "Kohalik:" -#: ../../locales/../src/engine/socket.cpp:1137 +#: ../../locales/../src/engine/socket.cpp:1004 #, fuzzy msgid "Local address in use" msgstr "%s 'i aadressi lahendamine" -#: ../../locales/../src/engine/socket.cpp:1165 +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Local endpoint has been closed" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2245 msgid "Local file" msgstr "Kohalik fail" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../../locales/../src/interface/manual_transfer.cpp:314 msgid "Local file does not exist." msgstr "Valitud faili ei leitud." -#: ../../locales/../src/interface/updater.cpp:365 -#: ../../locales/../src/interface/updater.cpp:457 +#: ../../locales/../src/interface/updater.cpp:400 +#: ../../locales/../src/interface/updater.cpp:493 #, fuzzy, c-format msgid "Local file is %s\n" msgstr "Kohalik fail" -#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:310 msgid "Local file is a directory instead of a regular file." msgstr "Kohalik fail pole fail vaid kataloog." -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/manual_transfer.cpp:354 #, fuzzy msgid "Local file is not a valid filename." msgstr "Ei saa avada faili, see pole korrektne XML fail." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1063 +#: ../../locales/../src/interface/search.cpp:644 +#: ../../locales/../src/interface/search.cpp:650 +#, fuzzy +msgid "Local file search" +msgstr "Kauge faili otsing" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1070 msgid "Local filters:" msgstr "Kohalikud filtrid:" -#: ../../locales/../src/interface/viewheader.cpp:325 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 +#, fuzzy +msgid "Local path handling:" +msgstr "Serveri kaustatee arvestamine:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Kohalik:" -#: ../../locales/../src/interface/verifycertdialog.cpp:192 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Locality:" msgstr "Asukoht:" @@ -4798,12 +4984,17 @@ msgid "Log file" msgstr "Logi fail" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2092 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:965 +#, fuzzy +msgid "Logged in" +msgstr "Logimine" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Logimine" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:805 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:847 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4812,7 +5003,7 @@ "mõista UTF-8't. Proxy kasutamise tõttu ei saa kasutada lokaalset " "kooditabelit." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:812 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:855 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4820,7 +5011,7 @@ "Sisselogimise andmed sisaldavad mitte-ascii sümboleid ja server ei pruugi " "olla UTF-8-võimeline. Proovin lokaalset kooditabelit." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:884 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "Login-jada täidetud, aga sisselogimine ebaõnnestus. Katkestan." @@ -4835,179 +5026,191 @@ "'%s' or '%s'" msgstr "" -#: ../../locales/../src/interface/queue.cpp:885 -#: ../../locales/../src/interface/queue.cpp:972 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "Low" msgstr "Madal" -#: ../../locales/../src/interface/queue.cpp:883 -#: ../../locales/../src/interface/queue.cpp:970 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 msgid "Lowest" msgstr "Madalaim" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "Väikseima vaba pordi number peab olema vahemikus 1024 kuni 65535." -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:215 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:480 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "" + +#: ../../locales/../src/interface/xmlfunctions.cpp:38 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:797 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:809 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:824 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 #, c-format msgid "Malformed chunk data: %s" msgstr "Sobimatud pinuandmed: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:742 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 #, c-format msgid "Malformed header: %s" msgstr "Sobimatu päis: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:562 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 msgid "Malformed reply, server not sending proper line endings" msgstr "Vigane vastus, server ei saada korrektseid realõppe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:316 -#: ../../locales/../src/interface/manual_transfer.cpp:323 -#: ../../locales/../src/interface/manual_transfer.cpp:328 -#: ../../locales/../src/interface/manual_transfer.cpp:336 -#: ../../locales/../src/interface/manual_transfer.cpp:343 -#: ../../locales/../src/interface/manual_transfer.cpp:350 -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2587 +#: ../../locales/../src/interface/manual_transfer.cpp:298 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:310 +#: ../../locales/../src/interface/manual_transfer.cpp:314 +#: ../../locales/../src/interface/manual_transfer.cpp:321 +#: ../../locales/../src/interface/manual_transfer.cpp:327 +#: ../../locales/../src/interface/manual_transfer.cpp:333 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Manual transfer" msgstr "Käsitsi ülekanne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3062 msgid "Match all of the following" msgstr "Sobivad kõigi järgnevate filtritega" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 msgid "Match any of the following" msgstr "Sobib vähemalt ühe järgneva filtriga" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3064 msgid "Match none of the following" msgstr "Ei sobi ühegi järgneva filtriga" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:803 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3065 +#, fuzzy +msgid "Match not all of the following" +msgstr "Sobivad kõigi järgnevate filtritega" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "&Samaaegsete ülekannete limiit:" -#: ../../locales/../src/engine/socket.cpp:1178 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Memory allocation failure" msgstr "Mälu eraldamine ebaõnnestus" -#: ../../locales/../src/interface/Mainfrm.cpp:403 -#: ../../locales/../src/interface/Mainfrm.cpp:1829 +#: ../../locales/../src/interface/Mainfrm.cpp:385 +#: ../../locales/../src/interface/Mainfrm.cpp:1762 msgid "Message log" msgstr "Teadete logi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 msgid "Message log position" msgstr "Teadete logi asukoht" -#: ../../locales/../src/engine/socket.cpp:1162 +#: ../../locales/../src/engine/socket.cpp:1029 #, fuzzy msgid "Message too large" msgstr "Teadete logi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2158 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:366 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:440 msgid "Minutes" msgstr "Minutid" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2160 msgid "Move &down" msgstr "Liiguta &alla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2124 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2154 msgid "Move &up" msgstr "Liiguta &üles" -#: ../../locales/../src/interface/LocalTreeView.cpp:1028 +#: ../../locales/../src/interface/LocalTreeView.cpp:987 msgid "My Computer" msgstr "Minu arvuti" -#: ../../locales/../src/interface/LocalTreeView.cpp:1018 +#: ../../locales/../src/interface/LocalTreeView.cpp:977 msgid "My Documents" msgstr "Minu dokumendid" -#: ../../locales/../src/interface/sitemanager.cpp:286 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:728 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:730 +#: ../../locales/../src/interface/sitemanager.cpp:339 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:736 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:738 msgid "My Sites" msgstr "Minu saidid" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:201 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:204 msgid "N/a" -msgstr "Kasutamatu" +msgstr "Teadmata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2625 msgid "Name" msgstr "Nimi" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:706 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214 msgid "Name already exists" msgstr "Selline nimi on juba olemas" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 msgid "Name of bookmark already exists." msgstr "Järjehoidja nimi on juba olemas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 msgid "Name:" msgstr "Nimi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 msgid "Natural sort" msgstr "Loomulik sorteerimine" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Vaja sisestada filtri nimi" -#: ../../locales/../src/interface/search.cpp:376 +#: ../../locales/../src/interface/search.cpp:644 +#, fuzzy +msgid "Need to enter valid local path" +msgstr "Vaja sisestada filtri nimi" + +#: ../../locales/../src/interface/search.cpp:671 #, fuzzy msgid "Need to enter valid remote path" msgstr "Vaja sisestada filtri nimi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027 msgid "Need to specify a character encoding" msgstr "On vaja määrata sümbolite kodeering" -#: ../../locales/../src/engine/socket.cpp:1182 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Neither nodename nor servname provided, or not known" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1169 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:492 -#: ../../locales/../src/engine/socket.cpp:1154 +#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/socket.cpp:1021 msgid "Network unreachable" msgstr "Võrk pole ligipääsetav" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2029 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2059 msgid "Never" msgstr "Mitte kunagi" @@ -5019,37 +5222,37 @@ msgid "New &tab" msgstr "&Uus ühenduse sakk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2788 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "&Uus järjehoidja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2560 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:446 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:538 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:544 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:550 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2590 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 #: ../../locales/../src/interface/bookmarks_dialog.cpp:573 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2098 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2234 msgid "New bookmark" msgstr "Uus järjehoidja" -#: ../../locales/../src/interface/LocalTreeView.cpp:1177 -#: ../../locales/../src/interface/RemoteListView.cpp:1337 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1318 +#: ../../locales/../src/interface/LocalTreeView.cpp:1163 +#: ../../locales/../src/interface/RemoteListView.cpp:1324 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1237 msgid "New directory" msgstr "Uus kataloog" -#: ../../locales/../src/interface/welcome_dialog.cpp:53 +#: ../../locales/../src/interface/welcome_dialog.cpp:61 #, c-format msgid "New features and improvements in %s" msgstr "" @@ -5058,42 +5261,42 @@ msgid "New filter" msgstr "Uus filter" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:936 msgid "New folder" msgstr "Uus kaust" -#: ../../locales/../src/interface/sitemanager.cpp:625 -#: ../../locales/../src/interface/sitemanager.cpp:639 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2074 +#: ../../locales/../src/interface/sitemanager.cpp:602 +#: ../../locales/../src/interface/sitemanager.cpp:616 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2207 msgid "New site" msgstr "Uus sait" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1308 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 msgid "Next to the transfer queue" msgstr "Ülekande järjekorra kõrval" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:812 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:764 msgid "No" msgstr "Ei" -#: ../../locales/../src/engine/socket.cpp:1180 +#: ../../locales/../src/engine/socket.cpp:1048 #, fuzzy msgid "No address associated with nodename" msgstr "Failitüübiga pole seostatud ühtegi programmi" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Puudub kategooriate valik ekspordiks" -#: ../../locales/../src/interface/QueueView.cpp:2181 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "No command given, aborting." msgstr "Käsklust pole antud, katkestan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3843 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3821 msgid "No external IP address set, trying default." msgstr "Välist IP aadressi pole seatud, proovime vaikeaadressi." -#: ../../locales/../src/interface/edithandler.cpp:1090 +#: ../../locales/../src/interface/edithandler.cpp:1083 msgid "No files are currently being edited." msgstr "Ükski fail pole hetkel muutmisel" @@ -5101,108 +5304,105 @@ msgid "No filter name given" msgstr "Puudub filtri nimi" -#: ../../locales/../src/engine/server.cpp:77 +#: ../../locales/../src/engine/server.cpp:81 #: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:195 msgid "No host given, please enter a host." msgstr "Palun sisestage puuduv serveri nimi." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Siin pilte pole." -#: ../../locales/../src/interface/QueueView.cpp:3052 -msgid "No more files in the queue!" -msgstr "Failide järjekord tühi!" - -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "No name for the filterset given." msgstr "Filtrikogumikul puudub nimi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2955 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2997 msgid "No program associated with filetype" msgstr "Failitüübiga pole seostatud ühtegi programmi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2872 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" -#: ../../locales/../src/engine/socket.cpp:1157 +#: ../../locales/../src/engine/socket.cpp:1024 msgid "No route to host" msgstr "" -#: ../../locales/../src/interface/search.cpp:236 +#: ../../locales/../src/interface/search.cpp:391 msgid "No search results" msgstr "Otsing ei leidnud midagi" -#: ../../locales/../src/interface/sitemanager.cpp:295 +#: ../../locales/../src/interface/sitemanager.cpp:349 msgid "No sites available" msgstr "Pole kättesaadavaid saite" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:454 msgid "No supported SOCKS5 auth method" msgstr "Puudub toetatud SOCKS5 autentimismeetod." -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "No username given." msgstr "Kasutajanimi puudub." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1836 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1855 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Puudub" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2331 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2361 msgid "None selected yet" msgstr "Pole veel valitud" -#: ../../locales/../src/engine/socket.cpp:1176 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Nonrecoverable failure in name resolution" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:943 -#: ../../locales/../src/engine/server.cpp:830 -#: ../../locales/../src/engine/server.cpp:849 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:185 -#: ../../locales/../src/interface/manual_transfer.cpp:563 -#: ../../locales/../src/interface/queue.cpp:888 -#: ../../locales/../src/interface/queue.cpp:975 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1276 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 +#: ../../locales/../src/engine/server.cpp:904 +#: ../../locales/../src/engine/server.cpp:925 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/queue.cpp:886 +#: ../../locales/../src/interface/queue.cpp:942 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1326 msgid "Normal" msgstr "Normaalne" -#: ../../locales/../src/interface/queueview_failed.cpp:325 -#: ../../locales/../src/interface/queueview_failed.cpp:350 +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 #, fuzzy msgid "Not all items could be requeued for transfer." msgstr "Kõiki faile ei saa panna järjekorda vaatamiseks või muutmiseks." -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:508 +#: ../../locales/../src/interface/state.cpp:181 +#: ../../locales/../src/interface/state.cpp:1238 msgid "Not connected" msgstr "Ühenduseta" -#: ../../locales/../src/interface/RemoteListView.cpp:2073 +#: ../../locales/../src/interface/RemoteListView.cpp:2035 msgid "Not connected to any server" msgstr "Ei ole ühendatud ühegi serveriga" -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Ei ole ühendatud ühegi serveriga." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Ei ole ühendatud." -#: ../../locales/../src/engine/socket.cpp:1197 +#: ../../locales/../src/engine/socket.cpp:1065 msgid "Not initialized, need to call WSAStartup" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:673 +#: ../../locales/../src/interface/Mainfrm.cpp:657 msgid "Note that this feature is only supported using the FTP protocol." msgstr "See omadus on kasutatav ainult FTP protokolli puhul." @@ -5210,12 +5410,12 @@ msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Märkus: Töötab vaid krüpteerimata FTP ühendusega." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Märkus: Kasutades üldist proksit surutakse FTP-ühendustele peale passiivlaad." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "Number of decimal places:" msgstr "Kümnendikkohtade arv:" @@ -5223,40 +5423,45 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Kordusühenduste arv peab jääma vahemikku 0 ja 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1950 msgid "O&pen file" msgstr "&Ava fail" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:258 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:513 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:796 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:892 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1003 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1162 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1344 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1451 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1522 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1575 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1808 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2081 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2156 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2685 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2938 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3150 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3219 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3584 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3640 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:560 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:899 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1010 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1589 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2569 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2722 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2980 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3220 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3384 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3587 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3753 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3809 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "OK" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:748 +#, fuzzy +msgid "OS version:" +msgstr "Versioon:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " @@ -5265,36 +5470,36 @@ "Järgmistel lehtedel toimub valitud ülekande laadi seadistamine, kui seadete " "ennistamine on lubatud." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:822 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:774 msgid "Once" msgstr "Ükskord" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "Once a day" msgstr "Kord päevas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2061 msgid "Once a week" msgstr "Kord nädalas" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:530 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:521 msgid "Only use plain FTP (insecure)" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "Open directory in system's file manager" msgstr "" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Ava saidihaldur" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 -#, fuzzy +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." -msgstr "Ava saidihaldur" +msgstr "Ava saidihaldur." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 #, fuzzy msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Avab kataloogi kuvamise filtrid. Paremklikk aktiveerib filtrid." @@ -5307,14 +5512,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Avatakse FileZille seadistuste dialoog." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1701 msgid "Opened as:" msgstr "Avatud kui:" -#: ../../locales/../src/interface/edithandler.cpp:1659 -#: ../../locales/../src/interface/edithandler.cpp:1753 -#: ../../locales/../src/interface/LocalListView.cpp:1715 -#: ../../locales/../src/interface/LocalListView.cpp:1727 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1743 +#: ../../locales/../src/interface/LocalListView.cpp:1736 +#: ../../locales/../src/interface/LocalListView.cpp:1748 msgid "Opening failed" msgstr "Avamine ebaõnnestus" @@ -5326,47 +5531,52 @@ msgid "Opens the Site Manager" msgstr "Avatakse saidihaldur" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "Avab kataloogi kuvamise filtrid. Paremklikk aktiveerib filtrid." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:777 -msgid "Operating system" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 +#, fuzzy +msgid "Operating System:" msgstr "Operatsioonisüsteem" -#: ../../locales/../src/interface/FileZilla.cpp:310 -msgid "Operating system problem detected" -msgstr "Leiti opsüsteemi viga" - -#: ../../locales/../src/engine/socket.cpp:1148 +#: ../../locales/../src/engine/socket.cpp:1015 msgid "Operation already in progress" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1139 +#: ../../locales/../src/engine/socket.cpp:1006 #, fuzzy msgid "Operation in progress" msgstr "Faili ülekanne on veel pooleli." -#: ../../locales/../src/engine/socket.cpp:1160 +#: ../../locales/../src/engine/socket.cpp:1027 #, fuzzy msgid "Operation not supported" msgstr "Käsklus pole toetatud" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "" + +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Organization:" msgstr "Organisatsioon:" -#: ../../locales/../src/engine/socket.cpp:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +msgid "Other SFTP options" +msgstr "Teised SFTP valikud" + +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Other system error" msgstr "" -#: ../../locales/../src/interface/verifycertdialog.cpp:208 +#: ../../locales/../src/interface/verifycertdialog.cpp:264 msgid "Other:" msgstr "Muu:" -#: ../../locales/../src/engine/socket.cpp:1143 -#: ../../locales/../src/engine/socket.cpp:1144 +#: ../../locales/../src/engine/socket.cpp:1010 +#: ../../locales/../src/engine/socket.cpp:1011 msgid "Out of memory" msgstr "" @@ -5374,61 +5584,61 @@ msgid "Overview" msgstr "Ülevaade" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Kirjuta üle kui &uuem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1400 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1423 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Kirjuta üle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1416 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1170 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1425 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "Kirjuta üle kui erinev suurus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1394 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1417 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1171 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1403 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "Kirjuta üle kui erinev suurus või allikas uuem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1392 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1415 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1169 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" msgstr "Kirjuta üle kui allikas uuem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Kirjuta üle kui &erinev suurus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Kirjuta üle kui e&rinev suurus või allikas uuem" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:396 msgid "Owner permissions" msgstr "Omaniku õigused" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:86 +#: ../../locales/../src/interface/RemoteListView.cpp:404 +#: ../../locales/../src/interface/search.cpp:156 msgid "Owner/Group" msgstr "Omanik/grupp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1342 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5437,11 +5647,11 @@ "operatsioonide korral" #: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 msgid "P&roxy host:" msgstr "Proksi s&erver:" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Käsklust PORT peab ruuter või tulemüür vigaseks." @@ -5449,18 +5659,18 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssiivne (soovituslik)" -#: ../../locales/../src/interface/Mainfrm.cpp:2398 +#: ../../locales/../src/interface/Mainfrm.cpp:2381 msgid "Parameter not a valid URL" msgstr "Parameeter pole valiidne URL" -#: ../../locales/../src/interface/updater.cpp:537 +#: ../../locales/../src/interface/updater.cpp:573 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2447 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2477 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "Pass&word:" msgstr "Pa&rool:" @@ -5473,63 +5683,63 @@ msgid "Passive mode" msgstr "Passiivne laad" -#: ../../locales/../src/interface/netconfwizard.cpp:604 -#: ../../locales/../src/interface/netconfwizard.cpp:617 -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Passiivne laad on seatud vaikimisi ülekande laadiks." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Parool nõutud" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:81 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:151 msgid "Path" msgstr "Kaustatee" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3127 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2248 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3104 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2121 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Kaustatee loomine kataloogile %s ja alamkaustale %s ebaõnnestus" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2336 #, fuzzy msgid "Path not found:" msgstr "Faili ei leitud" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2622 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2652 msgid "Paths" msgstr "Kaustateed" -#: ../../locales/../src/interface/edithandler.cpp:1128 -#: ../../locales/../src/interface/edithandler.cpp:1271 -#: ../../locales/../src/interface/edithandler.cpp:1370 -#: ../../locales/../src/interface/edithandler.cpp:1383 +#: ../../locales/../src/interface/edithandler.cpp:1121 +#: ../../locales/../src/interface/edithandler.cpp:1258 +#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1358 msgid "Pending removal" msgstr "Eemaldamine ootel" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Õigus" -#: ../../locales/../src/engine/socket.cpp:1136 -#: ../../locales/../src/engine/socket.cpp:1145 +#: ../../locales/../src/engine/socket.cpp:1003 +#: ../../locales/../src/engine/socket.cpp:1012 #, fuzzy msgid "Permission denied" msgstr "Õigus" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:155 msgid "Permissions" msgstr "Õigused" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:756 msgid "Platform:" msgstr "Platvorm:" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5545,12 +5755,12 @@ "Palun seadistage kõik tulemüürid ja ruuterid, et FileZilla saaks luua " "väljuva ühenduse suvalisse porti." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Palun keelake oma ruuteril sellised seaded nagu 'DMZ mode' või 'Game mode'." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:583 #, fuzzy msgid "" "Please ensure you have a stable internet connection and carefully check your " @@ -5567,13 +5777,13 @@ msgid "Please enter a custom time format." msgstr "Palun sisestage kohandatud kellaaja vorming." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:737 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:549 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, fuzzy, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5583,16 +5793,16 @@ msgid "Please enter a name for the new filter." msgstr "Palun sisestage nimi uuele filtrile." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Palun sisestage kopeeritud filtrile uus nimi." -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:272 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Palun sisestage filtrikogumikule uus nimi: \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Palun sisestage filtrile uus nimi." @@ -5613,51 +5823,42 @@ "transfers." msgstr "Palun sisestage konkureerivate ülekannete arv vahemikus 0 ja 10." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Sisestage selle serveri parool:" -#: ../../locales/../src/interface/QueueView.cpp:2170 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Palun sisestage käivitatav fail ja tee temani.\n" -"Näiteks c:\\teekond\\fail.exe MS Windowsis või /teekond/fail Unixis.\n" -"Lisaks võite anda programmile argumente." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 +#, fuzzy msgid "" -"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts." +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" "Palun sisestage aegumise määr vahemikus 5 ja 9999 sekundit või 0 selle " "keelamiseks." -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Please enter a unique name for this filter set" msgstr "Sisestage sellele filtrikogumikule unikaalne nimi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Sisestage serveri kasutajanimi:" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Sisestage sobiv pordivahemik." -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Sisestage URL, millelt saaks teie välise aadressi" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, fuzzy, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Sisestage üleslaadimise kiiruse piirväärtuseks suurem või võrdne 0 KB/s -ga." -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5665,28 +5866,41 @@ "Sisestage FTP otsekäsklus.\n" "FTP otsekäskluste kasutamine tühjendab kataloogi vahemälu" -#: ../../locales/../src/interface/LocalListView.cpp:901 -#: ../../locales/../src/interface/LocalTreeView.cpp:1174 -#: ../../locales/../src/interface/RemoteListView.cpp:1324 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1304 +#: ../../locales/../src/interface/QueueView.cpp:1825 +#, fuzzy +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Palun sisestage käivitatav fail ja tee temani.\n" +"Näiteks c:\\teekond\\fail.exe MS Windowsis või /teekond/fail Unixis.\n" +"Lisaks võite anda programmile argumente." + +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1311 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1224 msgid "Please enter the name of the directory which should be created:" msgstr "Sisestage loodava kataloogi nimi:" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2621 #, fuzzy msgid "Please enter the name of the file which should be created:" msgstr "Sisestage loodava kataloogi nimi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Sisestage serveri kasutajanimi ja parool:" -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Sisestage oma väline IP aadress" -#: ../../locales/../src/interface/netconfwizard.cpp:609 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5704,7 +5918,7 @@ "Palun jälgige tähelepanelikult instruktsioone, sest vale konfiguratsioon ei " "võimalda edukaid FTP ühendusi." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5712,11 +5926,11 @@ "Veenduge, et FileZillal on lubatud luua väljuvaid ühendusi ja et te " "kirjutasite aadressi lahendaja aadressi korrektselt." -#: ../../locales/../src/interface/FileZilla.cpp:198 +#: ../../locales/../src/interface/FileZilla.cpp:137 msgid "Please make sure the requested locale is installed on your system." msgstr "Palun veendu, et soovitud lokaal on su masinasse paigaldatud." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5738,7 +5952,7 @@ "server võib valida pordi, mida teie tulemüür peab troojakate ja muu saasta " "läbikäigu kohaks. See võib tekitada lisaprobleeme." -#: ../../locales/../src/interface/Mainfrm.cpp:713 +#: ../../locales/../src/interface/Mainfrm.cpp:697 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5754,7 +5968,7 @@ "Pange tähele, et mõned serverid võivad keelduda ühendumast teiega kui " "proovite korduvühendusi liiga tihti või liiga lühikese intervalliga." -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5763,11 +5977,11 @@ "Käivitage nõustaja uuesti, et muuta oma võrgu keskkonna seadistust või " "juhul, kui teil tekivad probleemid serveriga, mis varemalt töötas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3356 msgid "Please select an action:" msgstr "Valige tegevus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1647 msgid "Please select the categories you would like to import." msgstr "Valige kategooriad, mida soovite importida." @@ -5775,30 +5989,30 @@ msgid "Please select the default transfer mode you would like to use." msgstr "Valige ülekande vaikelaad." -#: ../../locales/../src/interface/chmoddialog.cpp:46 +#: ../../locales/../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." msgstr "Valige kataloogile \"%s\" uued atribuudid." -#: ../../locales/../src/interface/chmoddialog.cpp:38 +#: ../../locales/../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." msgstr "Valige failile \"%s\" uued atribuudid." -#: ../../locales/../src/interface/chmoddialog.cpp:49 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Seadke valitud kataloogidele uued atribuudid." -#: ../../locales/../src/interface/chmoddialog.cpp:52 +#: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "Seadke valitud kataloogidele ja failidele uued atribuudid." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Seadke valitud failidele uued atribuudid." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5812,37 +6026,38 @@ "t. Sellised asjad nagu protokolli kontroll või protokollipõhised \"parandused" "\" peaksid olema keelatud." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 msgid "Positio&n of the message log:" msgstr "&Teadete logi asukoht:" -#: ../../locales/../src/interface/verifycertdialog.cpp:193 -#: ../../locales/../src/interface/verifycertdialog.cpp:194 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Postal code:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1012 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 msgid "Pre&allocate space before downloading" msgstr "E&ralda ruum enne tõmbama asumist" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 msgid "Preallocation" msgstr "Ressursi eraldamine" -#: ../../locales/../src/interface/sitemanager.cpp:285 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1797 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1946 msgid "Predefined Sites" msgstr "Eeldefineeritud saidid" -#: ../../locales/../src/interface/Mainfrm.cpp:712 +#: ../../locales/../src/interface/Mainfrm.cpp:696 msgid "Preserving file timestamps" msgstr "Faili ajaväärtuste säilitamine" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1482 +#, fuzzy +msgid "Preview" msgstr "Eelvaade:" -#: ../../locales/../src/engine/tlssocket.cpp:1060 +#: ../../locales/../src/engine/tlssocket.cpp:1359 msgid "Primary connection and data connection certificates don't match." msgstr "Primaarse ühenduse ja andmete sertifikaadid ei ühti." @@ -5854,15 +6069,15 @@ msgid "Print version information to stdout and exit" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1744 msgid "Prioritize directories (default)" msgstr "Eelistused kataloogidel (vaikimisi)" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Priority" msgstr "Prioriteet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2070 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2100 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5879,73 +6094,82 @@ msgstr "Protoko&ll:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:756 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 msgid "Pro&xy password:" msgstr "Proksi p&arool:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "&Järjekorra täitmine" -#: ../../locales/../src/engine/socket.cpp:1141 +#: ../../locales/../src/engine/socket.cpp:1008 msgid "Process file table overflow" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1146 +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 +#, c-format +msgid "Processed %s in %s." +msgstr "" + +#: ../../locales/../src/engine/socket.cpp:1013 #, fuzzy msgid "Protocol not supported" msgstr "Käsklus pole toetatud" -#: ../../locales/../src/engine/socket.cpp:1199 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Protocol not supported on given socket type" msgstr "" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:185 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:450 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Protokoll:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 msgid "Proxy &port:" msgstr "Proksi p&ort:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:746 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 msgid "Proxy &user:" msgstr "Proksi &kasutaja:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:463 msgid "Proxy authentication failed" msgstr "Proksi autentimine ebaõnnestus" -#: ../../locales/../src/engine/transfersocket.cpp:127 -#: ../../locales/../src/engine/transfersocket.cpp:140 +#: ../../locales/../src/engine/transfersocket.cpp:106 +#: ../../locales/../src/engine/transfersocket.cpp:118 #, c-format msgid "Proxy handshake failed: %s" msgstr "Proxy kätlus ebaõnnestus: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4298 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4299 #, fuzzy msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Host algab '[' suluga, kuid lõpetavat sulgu ei leitud." -#: ../../locales/../src/engine/proxy.cpp:320 +#: ../../locales/../src/engine/proxy.cpp:322 #, c-format msgid "Proxy reply: %s" msgstr "Proksi vastus: %s" -#: ../../locales/../src/engine/proxy.cpp:379 -#: ../../locales/../src/engine/proxy.cpp:514 +#: ../../locales/../src/engine/proxy.cpp:504 +#, fuzzy, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Proksi päring ebaõnnestus: %s" + +#: ../../locales/../src/engine/proxy.cpp:377 #, c-format msgid "Proxy request failed: %s" msgstr "Proksi päring ebaõnnestus: %s" -#: ../../locales/../src/engine/proxy.cpp:539 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Proksi päring ebaõnnestus: Tundmatu aadressitüüp CONNECT vastuses" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4327 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4328 msgid "Proxy set but proxy host or port invalid" msgstr "Proksi on määratud, kuid server või port on vigane" @@ -5954,59 +6178,60 @@ msgstr "Avaliku võtmega autentimine" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:338 msgid "Public key algorithm:" msgstr "Avaliku võtme algoritm:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:464 msgid "Public permissions" msgstr "Avalikud õigused" -#: ../../locales/../src/interface/QueueView.cpp:3132 +#: ../../locales/../src/interface/QueueView.cpp:2688 msgid "Queue has been fully processed" msgstr "Järjekord on täielikult töödeldud." -#: ../../locales/../src/interface/statusbar.cpp:427 +#: ../../locales/../src/interface/statusbar.cpp:436 #, c-format msgid "Queue: %s MiB" msgstr "Järjekord: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:357 +#: ../../locales/../src/interface/statusbar.cpp:372 #, c-format msgid "Queue: %s%s" msgstr "Järjekord: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:353 -#: ../../locales/../src/interface/statusbar.cpp:418 +#: ../../locales/../src/interface/statusbar.cpp:368 +#: ../../locales/../src/interface/statusbar.cpp:427 msgid "Queue: empty" msgstr "Järjekord: tühi" -#: ../../locales/../src/interface/QueueView.cpp:439 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Järjekorras olevad failid" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3197 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Queueing:" msgstr "Järjekord:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +#, fuzzy +msgid "R&eboot system once" msgstr "&Taaskäivita süsteem" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "K&auge kataloogipuu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "R&eset and requeue selected files" msgstr "Tühista ja aseta valitud &failid uuesti järjekorda" -#: ../../locales/../src/interface/Mainfrm.cpp:609 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "Puhas FTP käsk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:437 msgid "Re&ad" msgstr "Lo&e" @@ -6015,11 +6240,11 @@ msgid "Re&fresh" msgstr "&Värskenda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "&Nimeta ümber" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6027,20 +6252,20 @@ "Käivita uuesti võrgu seadistamise nõustaja, vaata üle oma seaded ja seadista " "ruuterid/tulemüürid vastavalt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:471 msgid "Rea&d" msgstr "Lo&e" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Ainult lugemisõigus" -#: ../../locales/../src/interface/Mainfrm.cpp:1064 +#: ../../locales/../src/interface/Mainfrm.cpp:1037 msgid "Really cancel current operation?" msgstr "Kas tõesti katkestame käesoleva operatsiooni?" -#: ../../locales/../src/interface/RemoteListView.cpp:1413 -#: ../../locales/../src/interface/search.cpp:776 +#: ../../locales/../src/interface/RemoteListView.cpp:1405 +#: ../../locales/../src/interface/search.cpp:1185 #, fuzzy, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6048,77 +6273,83 @@ msgstr[0] "Valitud %d kataloog koos oma sisuga ülekandeks." msgstr[1] "Valitud %d kataloogi koos oma sisuga ülekandeks." -#: ../../locales/../src/interface/RemoteListView.cpp:1411 -#: ../../locales/../src/interface/search.cpp:774 +#: ../../locales/../src/interface/RemoteListView.cpp:1402 +#: ../../locales/../src/interface/search.cpp:1183 #, fuzzy, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Kustuta %d fail?" msgstr[1] "Kustuta %d faili?" -#: ../../locales/../src/interface/RemoteListView.cpp:1418 -#: ../../locales/../src/interface/search.cpp:781 +#: ../../locales/../src/interface/RemoteListView.cpp:1410 +#: ../../locales/../src/interface/search.cpp:1189 #, fuzzy, c-format msgid "Really delete %s and %s from the server?" msgstr "Kas tõesti tahate saata '%s' serverisse?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1042 #, fuzzy msgid "Really delete all selected files and/or directories from the server?" msgstr "Kas tõesti kustutame kõik valitud failid ja/või kataloogid?" -#: ../../locales/../src/engine/local_filesys.cpp:134 +#: ../../locales/../src/interface/file_utils.h:45 #, fuzzy msgid "Really delete all selected files and/or directories from your computer?" msgstr "Kas tõesti kustutame kõik valitud failid ja/või kataloogid?" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Reason" msgstr "Põhjus" -#: ../../locales/../src/interface/QueueView.cpp:3125 +#: ../../locales/../src/interface/QueueView.cpp:2681 msgid "Reboot now" msgstr "Restardi nüüd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:525 msgid "Rec&urse into subdirectories" msgstr "Kaasa alamkataloogid" -#: ../../locales/../src/engine/tlssocket.cpp:199 +#: ../../locales/../src/engine/tlssocket.cpp:333 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "" -#: ../../locales/../src/engine/directorylistingparser.cpp:3070 +#: ../../locales/../src/engine/directorylistingparser.cpp:2995 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" -#: ../../locales/../src/engine/directorylistingparser.cpp:2068 -#: ../../locales/../src/engine/directorylistingparser.cpp:2083 +#: ../../locales/../src/engine/directorylistingparser.cpp:1984 +#: ../../locales/../src/engine/directorylistingparser.cpp:2000 msgid "Received a line exceeding 10000 characters, aborting." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:1013 -#: ../../locales/../src/interface/netconfwizard.cpp:1022 -#: ../../locales/../src/interface/netconfwizard.cpp:1045 +#: ../../locales/../src/engine/tlssocket.cpp:1342 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" + +#: ../../locales/../src/interface/netconfwizard.cpp:1006 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "Vastuvõetud andmed vigased" -#: ../../locales/../src/interface/updater.cpp:516 +#: ../../locales/../src/interface/updater.cpp:552 #, fuzzy msgid "Received invalid character in version information" msgstr "Asenda vigased sümbolid &märgendiga:" -#: ../../locales/../src/engine/tlssocket.cpp:202 +#: ../../locales/../src/engine/tlssocket.cpp:336 #, fuzzy, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Kustuta %d fail?" -#: ../../locales/../src/interface/updater.cpp:509 +#: ../../locales/../src/interface/updater.cpp:545 msgid "Received version information is too large" msgstr "" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6130,62 +6361,75 @@ msgid "Reconnection settings" msgstr "Korduvühenduse seaded" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Ühenda uuesti viimati kasutatud serveriga" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:658 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 +#, fuzzy +msgid "Recursively adding files to queue." +msgstr "&Failide lisamine järjekorda" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 +msgid "Recursively changing permissions." +msgstr "" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 +#, fuzzy +msgid "Recursively deleting files and directories." +msgstr "Nimeta valitud failid ja kataloogid ümber" + +#: ../../locales/../src/interface/sitemanager.cpp:17 +#, fuzzy +msgid "Red" +msgstr "&Loe" + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:619 #, fuzzy, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Ümbersuunamine vigasele aadressile" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:665 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:626 #, fuzzy, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Ümbersuunamine vigasele aadressile" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Värskenda failide ja kaustade nimekirja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3829 #, fuzzy msgid "Remember passwords?" msgstr "Sisesta parool" -#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1105 msgid "Remote" msgstr "Server" -#: ../../locales/../src/engine/tlssocket.cpp:840 +#: ../../locales/../src/engine/tlssocket.cpp:977 msgid "Remote certificate not trusted." msgstr "Kaugsertifikaat ei ole usaldusväärne." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2250 -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2280 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Remote file" msgstr "Kauge fail" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3069 -#: ../../locales/../src/interface/search.cpp:370 -#: ../../locales/../src/interface/search.cpp:376 -#: ../../locales/../src/interface/search.cpp:385 -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:666 +#: ../../locales/../src/interface/search.cpp:671 msgid "Remote file search" msgstr "Kauge faili otsing" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1105 msgid "Remote filters:" msgstr "Kaugkataloogi filtrid:" -#: ../../locales/../src/interface/edithandler.cpp:1103 +#: ../../locales/../src/interface/edithandler.cpp:1096 msgid "Remote path" msgstr "Serveri kaustatee" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:423 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6194,7 +6438,7 @@ "Serveri kaustatee parsimine ei õnnestunud. Veenu, et see on korrektne ja et " "valitud serveritüüp (%s) toetab seda." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1130 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6203,48 +6447,48 @@ "Serveri kaustatee parsimine ei õnnestunud. Veenu, et see on korrektne ja et " "valitud vanema serveritüüp (%s) toetab seda." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:425 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1132 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "Serveri kaustatee parsimine ei õnnestunud. Veenu, et see on korrektne." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:333 msgid "Remote path could not be parsed." msgstr "Serveri kaustatee parsimine ebaõnnestus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3179 msgid "Remote path handling:" msgstr "Serveri kaustatee arvestamine:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1701 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 msgid "Remote path:" msgstr "Serveri kaustatee:" -#: ../../locales/../src/interface/viewheader.cpp:524 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Server:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:448 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:463 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 msgid "Remove &all" msgstr "Eemalda &kõik" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &selected" msgstr "Eemalda &valitud" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1396 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1173 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:287 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Rename file" msgstr "Faili ümbernimetamine" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 msgid "Rename selected directory" msgstr "Nimeta valitud kataloog ümber" @@ -6253,74 +6497,74 @@ msgid "Rename selected files and directories" msgstr "Nimeta valitud failid ja kataloogid ümber" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3477 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2447 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3455 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2316 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Ümbernimetamine '%s' -> '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3509 msgid "Reporting bugs and feature requests" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:370 +#: ../../locales/../src/engine/proxy.cpp:368 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:373 +#: ../../locales/../src/engine/proxy.cpp:371 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:367 +#: ../../locales/../src/engine/proxy.cpp:365 msgid "Request rejected or failed" msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:528 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:519 msgid "Require explicit FTP over TLS" -msgstr "" +msgstr "Nõua ilmutatud (explicit) FTP-d üle TLS-i" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:520 msgid "Require implicit FTP over TLS" -msgstr "" +msgstr "Nõua varjatud (implicit) FTP-d üle TLS-i" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 msgid "Reset and requeue &all" msgstr "Tühista ja aseta kõik failid uuesti järjekorda" -#: ../../locales/../src/engine/socket.cpp:1187 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Resolved protocol is unknown" msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:470 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:443 #, c-format msgid "Resolving address of %s" msgstr "%s 'i aadressi lahendamine" -#: ../../locales/../src/engine/socket.cpp:1147 +#: ../../locales/../src/engine/socket.cpp:1014 msgid "Resource temporarily unavailable" msgstr "" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:279 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:353 msgid "Response:" msgstr "Vastus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3125 msgid "Results:" msgstr "Tulemused:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1395 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1172 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" msgstr "Jätka ülekannet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1233 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6328,19 +6572,19 @@ "ASCII failide jätkamine võib tekitada probleeme, kui server kasutab " "kliendist erinevat realõpu vormingut." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1278 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:902 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1346 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:852 #, fuzzy, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Laetakse kataloogi nimekirja..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1275 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:899 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1343 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:849 msgid "Retrieving directory listing..." msgstr "Laetakse kataloogi nimekirja..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3836 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Välise IP aadressi vastuvõtt %s -lt" @@ -6349,20 +6593,22 @@ msgid "S&how files currently being edited..." msgstr "&Näita muutmisel olevaid faile..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 msgid "S&how the Site Manager on startup" msgstr "&Ava käivitumisel saidihalduri" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +#, fuzzy +msgid "S&hutdown system once" msgstr "&Lülita süsteem välja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3000 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "S&top" msgstr "&Stop" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +#, fuzzy +msgid "S&uspend system once" msgstr "S&eiska süsteem" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 @@ -6373,50 +6619,51 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:710 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 msgid "SOC&KS 4" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:142 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:170 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:715 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:864 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "Salvestame seaded?" -#: ../../locales/../src/interface/manual_transfer.cpp:455 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:442 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:989 msgid "Saving of password has been disabled by your system administrator." msgstr "" -#: ../../locales/../src/interface/manual_transfer.cpp:457 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "Saving of passwords has been disabled by you." msgstr "" -#: ../../locales/../src/interface/QueueView.cpp:1754 -msgid "Scanning for files to add to queue" -msgstr "Skaneerin järjekorda seatavaid faile" - -#: ../../locales/../src/interface/QueueView.cpp:1756 -msgid "Scanning for files to upload" -msgstr "Skaneerin üleslaetavaid faile" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1462 +msgid "Scale factor:" +msgstr "Mõõtkava:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3055 msgid "Search &conditions:" msgstr "Otsingu &tingimused:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "Search &directory:" msgstr "Otsi &kataloogist:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Otsi faile rekursiivselt" @@ -6425,16 +6672,21 @@ msgid "Search server for files" msgstr "Serveri/kohalik fail" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#, fuzzy +msgid "Search type:" +msgstr "Otsi &kataloogist:" + +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Security information" msgstr "Turvalisusinfo" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Vaata ka: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2368 msgid "Sele&ct server" msgstr "&Vali server" @@ -6442,16 +6694,16 @@ msgid "Select &page:" msgstr "&Vali lehekülg:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 msgid "Select Theme" msgstr "Vali teema" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "Vali vaikimisi tegevus juhuks, kui ülekande sihtfail on juba olemas." -#: ../../locales/../src/interface/edithandler.cpp:1573 +#: ../../locales/../src/interface/edithandler.cpp:1541 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Vali vaikimisi editor" @@ -6472,139 +6724,146 @@ "Vali vaikimisi tegevus juhuks, kui sihtfail on juba olemas, ainult " "järjekorras olevatele hetkel valitud failidele." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "Vali privaatvõtit sisaldav fail" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Vali fail eksporditud andmetele" -#: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/export.cpp:45 +#, fuzzy +msgid "Select file for exported filters" +msgstr "Vali fail eksporditud saitidele" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1427 msgid "Select file for exported queue" msgstr "Vali fail eksporditud järjekorrale" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Vali fail eksporditud seadetele" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2126 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2279 msgid "Select file for exported sites" msgstr "Vali fail eksporditud saitidele" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Vali fail seadete importimiseks" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Vali üleslaetav fail" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 +#, fuzzy +msgid "Select filename for converted key file" msgstr "Vali konverditud võtmefailile nimi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2877 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Select how these files should be opened." msgstr "Vali kuidas neid faile avada." -#: ../../locales/../src/interface/search.cpp:498 +#: ../../locales/../src/interface/search.cpp:847 msgid "Select target download directory" msgstr "Vali sihtkaust" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Vali failinimi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1560 msgid "Select the categories to export:" msgstr "Vali kategooriad ekspordiks:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1486 msgid "Select the private data you would like to delete." msgstr "Valige kustutamisele minevad privaatsed andmed." -#: ../../locales/../src/interface/search.cpp:465 +#: ../../locales/../src/interface/search.cpp:806 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Valitud %d kataloog koos oma sisuga ülekandeks." msgstr[1] "Valitud %d kataloogi koos oma sisuga ülekandeks." -#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Valitud %d kataloog." msgstr[1] "Valitud %d kataloogi." -#: ../../locales/../src/interface/search.cpp:463 +#: ../../locales/../src/interface/search.cpp:804 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Valitud %d fail ülekandeks." msgstr[1] "Valitud %d faili ülekandeks." -#: ../../locales/../src/interface/filelist_statusbar.cpp:58 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Valitud %d fail. Kogusuurus: %s" msgstr[1] "Valitud %d faili. Kogusuurus: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:56 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Valitud %d fail. Kogusuurus: Vähemalt %s" msgstr[1] "Valitud %d faili. Kogusuurus: Vähemalt %s" -#: ../../locales/../src/interface/search.cpp:470 +#: ../../locales/../src/interface/search.cpp:810 #, c-format msgid "Selected %s and %s for transfer." msgstr "Ülekandeks valitud %s ja %s." -#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Valitud %s ja %s. Kogusuurus: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Valitud %s ja %s. Kogusuurus: Vähemalt %s" -#: ../../locales/../src/interface/edithandler.cpp:1514 -#: ../../locales/../src/interface/edithandler.cpp:1593 +#: ../../locales/../src/interface/edithandler.cpp:1486 +#: ../../locales/../src/interface/edithandler.cpp:1560 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Valitud editori ei leitud." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1780 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1847 msgid "Selected file already being edited" msgstr "Valitud fail on juba muutmisel" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "Valitud fail on juba laetud" -#: ../../locales/../src/interface/edithandler.cpp:1691 +#: ../../locales/../src/interface/edithandler.cpp:1658 #, fuzzy msgid "Selected file is already opened" msgstr "Valitud fail on juba avatud." -#: ../../locales/../src/interface/edithandler.cpp:1740 +#: ../../locales/../src/interface/edithandler.cpp:1730 #, fuzzy msgid "Selected file is still being edited" msgstr "Valitud fail on veel muutmisel" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Selected filter only works for local files." msgstr "Valitud filter toimib vaid kohalike failide puhul." -#: ../../locales/../src/interface/menu_bar.cpp:307 +#: ../../locales/../src/interface/menu_bar.cpp:299 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6612,7 +6871,7 @@ "Valitud globaalne järjehoidja ja hetkel valitud server on erinevat tüüpi.\n" "Kasuta selle serveri puhul saidikeskseid järjehoidjaid." -#: ../../locales/../src/engine/engineprivate.cpp:285 +#: ../../locales/../src/engine/engineprivate.cpp:302 msgid "Selected port usually in use by a different protocol." msgstr "Valitud port on tavaliselt kasutuses teise protokolli poolt." @@ -6624,36 +6883,35 @@ msgid "Send custom command to the server otherwise not available" msgstr "Kirjuta käsitsi serverile käsk, kui teisiti ei ole võimalik" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4406 msgid "Sending keep-alive command" msgstr "Saadetakse FTP elushoiuks vajalikku käsklust" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:330 -#: ../../locales/../src/interface/verifycertdialog.cpp:197 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Serial number:" msgstr "Seerianumber:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:317 msgid "Server &Type:" msgstr "&Serveri tüüp:" -#: ../../locales/../src/engine/tlssocket.cpp:726 +#: ../../locales/../src/engine/tlssocket.cpp:866 msgid "Server did not properly shut down TLS connection" msgstr "Server ei sulgend korrektselt TLS ühendust" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:893 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:946 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:945 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1006 #, fuzzy msgid "Server does not support non-ASCII characters." msgstr "Server ei toeta suuremate kui 2GB failide ülekande jätkatavust." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4239 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4244 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Server ei toeta suuremate kui %d GB failide ülekande jätkatavust." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6662,15 +6920,15 @@ "Server ei toeta suuremate kui %d GB failide ülekande jätkamist. Lõpeta " "ülekanne, kui faili suurus kattub." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2494 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528 msgid "Server does not support resume of files > 2GB." msgstr "Server ei toeta suuremate kui 2GB failide ülekande jätkatavust." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 msgid "Server does not support resume of files > 4GB." msgstr "Server ei toeta suuremate kui 4GB failide ülekande jätkatavust." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4250 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4253 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6679,18 +6937,18 @@ "Server võib mitte toetada suuremate kui %d GB failide ülekande jätkamist. " "Lõpeta ülekanne, kui faili suurus kattub." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:886 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "Server nõuab kontot. Palun täpsustage Saidihalduris konto" -#: ../../locales/../src/engine/ControlSocket.cpp:343 +#: ../../locales/../src/engine/ControlSocket.cpp:349 #, fuzzy msgid "Server returned empty path." msgstr "Server saatis vigase vastuse." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:641 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:620 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6698,13 +6956,13 @@ "Server saatis täiendavaks identifitseerimiseks login-viiba. Kasuta " "interaktiivset sisselogimise tüüpi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3803 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3787 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Server saatis passiivse vastuse mittesuunatava aadressiga. Passiivne laad " "ebaõnnestus." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3797 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3782 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6712,63 +6970,72 @@ "Server saatis passiivse vastuse mittesuunatava aadressiga. Kasutame selle " "asemel serveri aadressi." -#: ../../locales/../src/interface/netconfwizard.cpp:419 -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:465 -#: ../../locales/../src/interface/netconfwizard.cpp:474 -#: ../../locales/../src/interface/netconfwizard.cpp:486 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Server saatis vigase vastuse." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 +#: ../../locales/../src/engine/tlssocket.cpp:1254 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Server to client MAC:" msgstr "Server-klient MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2047 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2077 msgid "Server to client cipher:" msgstr "Server-klient šiffer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2431 msgid "Server&type:" msgstr "Serveri &tüüp:" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Server/Local file" msgstr "Serveri/kohalik fail" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1711 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2354 msgid "Server:" msgstr "Server:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:166 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:431 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "Sessiooni detailid:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" -msgstr "Sea &prioriteet" +msgstr "&Sea prioriteet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3625 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2326 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3599 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2198 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Sea õigused '%s' -> '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:817 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize käivitati ilma ühenduseta (socket)" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "Seaded" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:772 +#, fuzzy +msgid "Settings directory:" +msgstr "Kataloogi loomine" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2284 msgid "Show &raw directory listing" msgstr "Näita &kataloogi algnimekirja" @@ -6776,20 +7043,21 @@ msgid "Show &welcome dialog..." msgstr "&Näita tervitusakent..." -#: ../../locales/../src/interface/Mainfrm.cpp:2245 +#: ../../locales/../src/interface/Mainfrm.cpp:2223 msgid "Show both directory trees and continue comparing?" msgstr "Näita mõlemat kataloogipuud ja jätka võrdlemist?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 #, fuzzy msgid "Show details" msgstr "Sessiooni detailid:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1599 msgid "Show details about custom date and time formats" msgstr "Näita kohandatud kuupäeva ja kellaaja vormingute detaile." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 #, fuzzy msgid "Shows available TLS ciphers" msgstr "&Madalaim vaba port:" @@ -6798,16 +7066,15 @@ msgid "Shows this help dialog" msgstr "Kuvab selle abiakna." -#: ../../locales/../src/interface/QueueView.cpp:3121 +#: ../../locales/../src/interface/QueueView.cpp:2677 msgid "Shutdown now" msgstr "Lülita süsteem välja" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:346 msgid "Signature algorithm:" msgstr "Allkirja algoritm:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1622 msgid "Site &Manager entries" msgstr "&Saidihalduri kirjed" @@ -6815,56 +7082,56 @@ msgid "Site Manager" msgstr "Saidihaldur" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:997 #, fuzzy msgid "Site Manager - Cannot remember password" msgstr "Sisesta parool" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:988 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:965 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1010 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1040 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1133 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1149 msgid "Site Manager - Invalid data" msgstr "Saidihaldur - vigased andmed" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "Saidihaldur on juba avatud" -#: ../../locales/../src/interface/sitemanager.cpp:443 -#: ../../locales/../src/interface/sitemanager.cpp:457 -#: ../../locales/../src/interface/sitemanager.cpp:471 -#: ../../locales/../src/interface/sitemanager.cpp:539 -#: ../../locales/../src/interface/sitemanager.cpp:734 -#: ../../locales/../src/interface/sitemanager.cpp:814 +#: ../../locales/../src/interface/sitemanager.cpp:486 +#: ../../locales/../src/interface/sitemanager.cpp:514 +#: ../../locales/../src/interface/sitemanager.cpp:528 +#: ../../locales/../src/interface/sitemanager.cpp:540 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Site does not exist." msgstr "Saiti ei leitud." -#: ../../locales/../src/interface/sitemanager.cpp:426 +#: ../../locales/../src/interface/sitemanager.cpp:497 msgid "Site path has to begin with 0 or 1." msgstr "Aadress peab algama 0 või 1'ga." -#: ../../locales/../src/interface/sitemanager.cpp:464 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager.cpp:534 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:786 msgid "Site path is malformed." msgstr "Kaustatee on vigane." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:260 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Saidikesksed järjehoidjad" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:538 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6873,11 +7140,11 @@ "Saidikesksed järjehoidjad vajavad kirjet saidihalduris.\n" "Lisa praegune ühendus saidihaldurisse?" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Size" msgstr "Suurus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1583 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1613 msgid "Size formatting" msgstr "Failisuuruse vormindamine" @@ -6885,52 +7152,57 @@ msgid "Size unknown" msgstr "Suurus pole teada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1174 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1195 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "Jäta fail vahele" -#: ../../locales/../src/engine/ControlSocket.cpp:1132 -#: ../../locales/../src/engine/ControlSocket.cpp:1149 -#: ../../locales/../src/engine/ControlSocket.cpp:1173 -#: ../../locales/../src/engine/ControlSocket.cpp:1234 +#: ../../locales/../src/engine/ControlSocket.cpp:1160 +#: ../../locales/../src/engine/ControlSocket.cpp:1177 +#: ../../locales/../src/engine/ControlSocket.cpp:1203 +#: ../../locales/../src/engine/ControlSocket.cpp:1281 #, c-format msgid "Skipping download of %s" msgstr "%s allalaadimise vahelejätmine" -#: ../../locales/../src/engine/ControlSocket.cpp:1136 -#: ../../locales/../src/engine/ControlSocket.cpp:1152 -#: ../../locales/../src/engine/ControlSocket.cpp:1177 -#: ../../locales/../src/engine/ControlSocket.cpp:1238 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:309 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "" + +#: ../../locales/../src/engine/ControlSocket.cpp:1163 +#: ../../locales/../src/engine/ControlSocket.cpp:1180 +#: ../../locales/../src/engine/ControlSocket.cpp:1206 +#: ../../locales/../src/engine/ControlSocket.cpp:1284 #, c-format msgid "Skipping upload of %s" msgstr "%s üleslaadimise vahelejätmine" -#: ../../locales/../src/engine/socket.cpp:1151 +#: ../../locales/../src/engine/socket.cpp:1018 msgid "Socket address outside address space" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1153 +#: ../../locales/../src/engine/socket.cpp:1020 #, fuzzy msgid "Socket already connected" msgstr "Esisteerib aktiivne ühendus" -#: ../../locales/../src/engine/socket.cpp:1161 +#: ../../locales/../src/engine/socket.cpp:1028 msgid "Socket has been shut down" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1158 +#: ../../locales/../src/engine/socket.cpp:1025 #, fuzzy msgid "Socket not connected" msgstr "Ühenduseta" -#: ../../locales/../src/engine/socket.cpp:1200 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Socket type not supported for address family" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:1199 +#: ../../locales/../src/interface/Mainfrm.cpp:1167 msgid "Some files are still being edited or need to be uploaded." msgstr "Mõned failid on ikka veel muutmisel või vajavad üleslaadimist." @@ -6943,31 +7215,31 @@ "Mõned ruuterite taga asuvad halvasti seadistatud serverid võivad vastata oma " "lokaalse IP aadressiga." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1746 msgid "Sort directories inline" msgstr "Sorteeri kataloogid" -#: ../../locales/../src/interface/filelistctrl.cpp:460 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." msgstr "Sorteerimisvalikut ei saa muuta kataloogide võrdlemisel." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1700 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1730 msgid "Sorting" msgstr "Sorteerimine" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1707 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1737 msgid "Sorting &mode:" msgstr "&Sorteerimise viis:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:107 msgid "Source and path of the drop operation are identical" msgstr "Pukseerimisoperatsiooni algus ja teekond on identsed" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Lähte- ja sihtfail ei saa olla samad" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Pukseerimisoperatsiooni algus- ja sihtkoht on identsed" @@ -6975,37 +7247,37 @@ msgid "Source file:" msgstr "Lähtefail:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3602 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3771 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Kiiruspiirangud" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:873 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 msgid "Speed limits" msgstr "Kiiruspiirangud" -#: ../../locales/../src/interface/statusbar.cpp:573 +#: ../../locales/../src/interface/statusbar.cpp:586 msgid "Speed limits are disabled, click to change." msgstr "Kiiruspiiranguid ei ole seadistatud. Klõpsa, et muuta." -#: ../../locales/../src/interface/statusbar.cpp:576 +#: ../../locales/../src/interface/statusbar.cpp:589 msgid "Speed limits are enabled, click to change." msgstr "Kiiruspiirangud on seadistatud. Klõpsa, et muuta." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2078 msgid "Stable and beta versions" msgstr "Stabiilseid ja beetaversioone" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2047 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2077 msgid "Stable versions only" msgstr "Stabiilseid versioone" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2079 msgid "Stable, beta and nightly versions" msgstr "Stabiilseid, beeta ja öiseid versioone" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2562 msgid "Start transfer &immediately" msgstr "&Alusta kohe ülekannet" @@ -7013,19 +7285,19 @@ msgid "Start with opened Site Manager" msgstr "Alusta avatud saidihalduriga" -#: ../../locales/../src/interface/updater.cpp:207 +#: ../../locales/../src/interface/updater.cpp:239 #, fuzzy, c-format msgid "Started update check on %s\n" msgstr "Automaatne uuenduste kontroll" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2196 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1544 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2232 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1452 #, c-format msgid "Starting download of %s" msgstr "%s allalaadimise alustamine" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2199 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1547 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1455 #, c-format msgid "Starting upload of %s" msgstr "%s üleslaadimise alustamine" @@ -7034,31 +7306,35 @@ msgid "Starts the local site in the given path" msgstr "" -#: ../../locales/../src/interface/verifycertdialog.cpp:191 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "State or province:" msgstr "Osariik või maakond:" -#: ../../locales/../src/interface/edithandler.cpp:1104 -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1097 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Status" msgstr "Staatus" -#: ../../locales/../src/engine/logging.cpp:108 -#: ../../locales/../src/interface/StatusView.cpp:288 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:377 msgid "Status:" msgstr "Staatus:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "&Peatu ja eemalda kõik" -#: ../../locales/../src/interface/verifycertdialog.cpp:195 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 +#, fuzzy +msgid "Stop recursive operation" +msgstr "Turvalisusinfo" + +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Street:" msgstr "Tänav:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:381 msgid "Subject of certificate" msgstr "Sertifikaadi subjekt" @@ -7070,38 +7346,44 @@ msgid "Summary of test results:" msgstr "Testi tulemuste kokkuvõte:" -#: ../../locales/../src/interface/QueueView.cpp:3129 +#: ../../locales/../src/interface/QueueView.cpp:2685 msgid "Suspend now" msgstr "Seiska" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." msgstr "" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3832 +#: ../../locales/../src/interface/state.cpp:233 +#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:254 #: ../../locales/../src/interface/state.cpp:264 -#: ../../locales/../src/interface/state.cpp:278 -#: ../../locales/../src/interface/state.cpp:284 -#: ../../locales/../src/interface/state.cpp:294 -#: ../../locales/../src/interface/state.cpp:385 -#: ../../locales/../src/interface/state.cpp:393 -#: ../../locales/../src/interface/state.cpp:401 -#: ../../locales/../src/interface/state.cpp:977 -#: ../../locales/../src/interface/state.cpp:986 -#: ../../locales/../src/interface/state.cpp:993 -#: ../../locales/../src/interface/state.cpp:1004 -#: ../../locales/../src/interface/state.cpp:1011 +#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:378 +#: ../../locales/../src/interface/state.cpp:997 +#: ../../locales/../src/interface/state.cpp:1005 +#: ../../locales/../src/interface/state.cpp:1012 +#: ../../locales/../src/interface/state.cpp:1021 +#: ../../locales/../src/interface/state.cpp:1048 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Sünkroniseeritud brausimine" -#: ../../locales/../src/interface/state.cpp:400 +#: ../../locales/../src/interface/state.cpp:377 msgid "Synchronized browsing has been disabled." msgstr "Sünkroniseeritud brausimine on välja lülitatud." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:123 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#, fuzzy +msgid "Synchronizing directories." +msgstr "Kataloogi loomine" + +#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:165 msgid "Syntax error" msgstr "Süntaksi viga" @@ -7110,20 +7392,25 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 -#: ../../locales/../src/interface/Mainfrm.cpp:2400 +#: ../../locales/../src/interface/Mainfrm.cpp:2338 +#: ../../locales/../src/interface/Mainfrm.cpp:2383 msgid "Syntax error in command line" msgstr "Käsureas süntaksi viga" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Süsteem" -#: ../../locales/../src/engine/socket.cpp:1142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:784 +#, fuzzy +msgid "System details" +msgstr "Sessiooni detailid:" + +#: ../../locales/../src/engine/socket.cpp:1009 msgid "System limit of open files exceeded" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1198 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "System's network subsystem has failed" msgstr "" @@ -7131,22 +7418,22 @@ msgid "T&oolbar" msgstr "&Tööriistariba" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:313 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:289 #, fuzzy msgid "TLS connection established, sending HTTP request" msgstr "Ühendus loodud, saadan HTTP päringut" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:436 #, fuzzy msgid "TLS connection established, waiting for welcome message..." msgstr "TLS/SSL ühendus loodud, ootan tervitusteadet ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:439 #, fuzzy msgid "TLS connection established." msgstr "TLS/SSL ühendus loodud." -#: ../../locales/../src/engine/proxy.cpp:501 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "TTL expired" msgstr "TTL aegunud" @@ -7154,32 +7441,41 @@ msgid "Target file already exists" msgstr "Sihtfail on juba olemas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Sihtfail:" -#: ../../locales/../src/interface/RemoteListView.cpp:2728 +#: ../../locales/../src/interface/RemoteListView.cpp:2637 #, fuzzy msgid "Target filename already exists!" msgstr "Sihtfail on juba olemas" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1620 msgid "Target filename already exists, really continue?" msgstr "Sihtfaili nimi on juba kasutuses, kas tõesti jätkame?" -#: ../../locales/../src/engine/socket.cpp:1171 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Temporary failure in name resolution" msgstr "" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +#, fuzzy +msgid "Test finished successfully" +msgstr "Faili ülekanne õnnestus" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Testi tulemused" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4258 msgid "Testing resume capabilities of server" msgstr "Testitakse serveri võimalusi failide jätkatavuseks" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:747 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7188,7 +7484,7 @@ "Saidihaldur on avatud Filezilla 3 teise instantsi poolt.\n" "Kas jätkame? Ühtki muudatust saidihalduris ei salvestata." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7196,35 +7492,30 @@ "Saidihaldur on avatud Filezilla 3 teise instantsi poolt.\n" "Palun sulgege see või andmeid ei saa kustutada." -#: ../../locales/../src/interface/xmlfunctions.cpp:386 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "" - -#: ../../locales/../src/interface/netconfwizard.cpp:634 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Aadress, mille sisestasite oli: %s" -#: ../../locales/../src/engine/socket.cpp:1177 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "The ai_family member is not supported" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1190 +#: ../../locales/../src/engine/socket.cpp:1058 #, fuzzy msgid "The ai_socktype member is not supported" msgstr "Aadressitüüp pole toetatud" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:807 -#: ../../locales/../src/interface/sitemanager.cpp:714 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:685 msgid "The bookmark could not be added." msgstr "Järjehoidjat ei saanud lisada." -#: ../../locales/../src/interface/sitemanager.cpp:796 +#: ../../locales/../src/interface/sitemanager.cpp:773 msgid "The bookmarks could not be cleared." msgstr "Järjehoidjate puhastamine ebaõnnestus" -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../locales/../src/interface/statusbar.cpp:471 msgid "The connection is encrypted. Click icon for details." msgstr "Ühendus on krüpteeritud. Detailide nägemiseks klõpsa ikoonil." @@ -7246,35 +7537,35 @@ "Kohandatud kellaaja vorming on kas vigane või sisaldab mittetoetatud " "vorminduskirjeldusi." -#: ../../locales/../src/engine/transfersocket.cpp:164 +#: ../../locales/../src/engine/transfersocket.cpp:144 #, fuzzy, c-format msgid "The data connection could not be established: %s" msgstr "TLS/SSL ühendus loodud." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2895 -#: ../../locales/../src/interface/edithandler.cpp:1553 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2937 +#: ../../locales/../src/interface/edithandler.cpp:1521 msgid "The default editor for text files could not be found." msgstr "Ei leitud vaikimisi kasutatavat tekstitoimetusprogrammi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2930 #, c-format msgid "The default editor for text files is '%s'." msgstr "Vaikimisi kasutatav tekstitoimetusprogramm on '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #, fuzzy msgid "The entered filter name already exists, please choose a different name." msgstr "Sellise nimega filter on juba olemas." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Laiend '%s' on juba nimekirjas" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:278 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:284 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:290 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:298 #, c-format msgid "" "The file %s already exists.\n" @@ -7283,8 +7574,8 @@ "Fail %s on juba olemas.\n" "Sisesta uus nimi:" -#: ../../locales/../src/interface/edithandler.cpp:1664 -#: ../../locales/../src/interface/LocalListView.cpp:1719 +#: ../../locales/../src/interface/edithandler.cpp:1631 +#: ../../locales/../src/interface/LocalListView.cpp:1740 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7292,18 +7583,25 @@ "Please check your filetype associations." msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Faili '%s' ei õnnestunud laadida või ei sisalda see privaatvõtit." -#: ../../locales/../src/interface/xmlfunctions.cpp:40 +#: ../../locales/../src/interface/xmlfunctions.cpp:36 #, c-format msgid "The file '%s' could not be loaded." msgstr "Faili '%s' ei õnnestunud laadida." -#: ../../locales/../src/interface/edithandler.cpp:1659 -#: ../../locales/../src/interface/LocalListView.cpp:1715 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7312,8 +7610,8 @@ "Ei saa '%s' avada:\n" "Selle failitüübiga pole sinu süsteemis ühtegi programmi seostatud." -#: ../../locales/../src/interface/edithandler.cpp:1753 -#: ../../locales/../src/interface/LocalListView.cpp:1727 +#: ../../locales/../src/interface/edithandler.cpp:1743 +#: ../../locales/../src/interface/LocalListView.cpp:1748 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7322,20 +7620,16 @@ "Ei saa '%s' avada:\n" "Seostatud käsk ebaõnnestus" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:754 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"%s ei ole FileZilla poolt toetatud failivormingus.\n" -"Samuti on see parooliga kaitstud. Parooliga kaitstud võtmefailid ei ole " -"FileZilla poolt veel toetatud.\n" -"Kas soovite seda konvertida toetatud, kaitsmata vormingusse?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" +msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7344,22 +7638,11 @@ "'%s' ei ole FileZilla toetatud vormingus.\n" "Kas sa soovid seda teisendada toetatud vormingusse?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"%s on parooliga kaitstud. Parooliga kaitstud võtmefailid ei ole FileZilla " -"poolt veel toetatud.\n" -"Kas soovite seda konvertida kaitsmata formaati?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Editoriks määratud faili ei leitud." -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7372,11 +7655,11 @@ "port, kasutajanimi ja parool.\n" "Kas jätkame impordiga?" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Failinime veergu ei saa peita ega liigutada." -#: ../../locales/../src/interface/listctrlex.cpp:805 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "Failinime veergu ei saa peita." @@ -7390,19 +7673,19 @@ msgid "The following characters will be replaced: %s" msgstr "Järgnevad sümbolid asendatakse: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1908 msgid "The following files are currently being edited:" msgstr "Järgnevad failid on hetkel muutmisel:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "The free open source FTP solution" msgstr "Vaba, avatud lähtekoodiga FTP-lahendus" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:293 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Globaalseid järjehoidjaid ei saanud salvestada." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2241 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2271 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7415,14 +7698,24 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Suurus peab jääma vahemikku 1 kuni 2000 MiB" -#: ../../locales/../src/interface/state.cpp:275 +#: ../../locales/../src/interface/state.cpp:1048 +#, fuzzy, c-format +msgid "The local directory '%s' could not be created." +msgstr "Faili '%s' ei õnnestunud laadida." + +#: ../../locales/../src/interface/state.cpp:1033 +#, fuzzy, c-format +msgid "The local directory '%s' does not exist." +msgstr "Valitud editori ei leitud." + +#: ../../locales/../src/interface/state.cpp:245 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7430,46 +7723,50 @@ "Väikseima vaba pordi number peaks olema väiksem või võrdne suurima vaba " "pordi numbriga." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." -msgstr "Serverit ei saa lisada." +msgstr "Uue versiooni tõmbamine ebaõnnestus. Palun proovi hiljem uuesti." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." -msgstr "" +msgstr "Uus versioon on salvestatud sinu Downloads kataloogi." -#: ../../locales/../src/interface/QueueView.cpp:1878 +#: ../../locales/../src/interface/QueueView.cpp:1524 msgid "The queue will not be saved." msgstr "Järjekorda ei salvestata." -#: ../../locales/../src/interface/state.cpp:983 +#: ../../locales/../src/interface/state.cpp:958 +#, fuzzy, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Valitud editori ei leitud." + +#: ../../locales/../src/interface/state.cpp:1002 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Valitud kategooriad on imporditud." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1603 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 msgid "" "The selected file contains importable data for the following categories:" msgstr "Valitud fail sisaldab imporditavat infot järgmiste kategooriate jaoks:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1767 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1854 msgid "The selected file is already being edited:" msgstr "Valitud fail on juba muutmisel:" -#: ../../locales/../src/interface/edithandler.cpp:1740 +#: ../../locales/../src/interface/edithandler.cpp:1730 msgid "" "The selected file is still opened in some other program, please close it." msgstr "Valitud fail on juba avatud teise programmi poolt, palun sulgege see." -#: ../../locales/../src/interface/edithandler.cpp:1669 +#: ../../locales/../src/interface/edithandler.cpp:1636 #, fuzzy msgid "" "The selected file would be executed directly.\n" @@ -7480,15 +7777,15 @@ "See võib olla süsteemile ohtlik.\n" "Oled kindel, et soovid jätkata?" -#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:581 msgid "The server could not be added." msgstr "Serverit ei saa lisada." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Server saatis vigase või tuvastamatu vastuse." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:530 msgid "The server uses following charset encoding for filenames:" msgstr "Server kasutab failinimede kodeerimiseks järgmist kooditabelit:" @@ -7500,7 +7797,7 @@ "Serveri sertifikaat on tundmatu. Enne serveri usaldamist kontrolli hoolega " "sertifikaati." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:934 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:941 #, fuzzy msgid "" "The server's host key does not match the key that has been cached. This " @@ -7513,7 +7810,7 @@ "Kui võtme muutumine ei ole ootuspärane, võtke ühendust serveri " "administraatoriga." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7521,31 +7818,35 @@ "Serveri hosti võti on tundmatu. Ei ole mingit garantiid, et server on just " "see arvuti, mis see teie arvates on." -#: ../../locales/../src/engine/socket.cpp:1189 +#: ../../locales/../src/engine/tlssocket.cpp:1339 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "" + +#: ../../locales/../src/engine/socket.cpp:1057 msgid "The servname parameter is not supported for ai_socktype" msgstr "" -#: ../../locales/../src/interface/import.cpp:63 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." msgstr "" "Seaded on imporditud. Et need toimiksid, peaksite FileZilla uuesti käivitama." -#: ../../locales/../src/engine/socket.cpp:1138 +#: ../../locales/../src/engine/socket.cpp:1005 #, fuzzy msgid "The specified address family is not supported" msgstr "Aadressitüüp pole toetatud" -#: ../../locales/../src/engine/socket.cpp:1202 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "The specified network name is no longer available" msgstr "" -#: ../../locales/../src/interface/QueueView.cpp:3124 +#: ../../locales/../src/interface/QueueView.cpp:2680 msgid "The system will soon reboot unless you click Cancel." msgstr "Süsteem läheb peagi restardile, kui sa ei klõpsa Loobu." -#: ../../locales/../src/interface/QueueView.cpp:3120 +#: ../../locales/../src/interface/QueueView.cpp:2676 msgid "The system will soon shut down unless you click Cancel." msgstr "Arvuti lülitab end peagi välja, kui sa ei klõpsa Loobu." @@ -7557,11 +7858,11 @@ "Sihtfail on juba olemas.\n" "Palun vali tegevus." -#: ../../locales/../src/interface/netconfwizard.cpp:864 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Test ei õnnestunud. Kas tõesti tahate seaded salvestada ?" -#: ../../locales/../src/interface/xmlfunctions.cpp:76 +#: ../../locales/../src/interface/xmlfunctions.cpp:81 #, fuzzy, c-format msgid "The valid backup file %s could not be restored" msgstr "Faili '%s' ei õnnestunud laadida." @@ -7570,15 +7871,15 @@ msgid "Themes" msgstr "Teemad" -#: ../../locales/../src/interface/filter.cpp:445 +#: ../../locales/../src/interface/filter.cpp:326 msgid "This filter set cannot be removed." msgstr "Seda filtrikogumit ei saa kustutada" -#: ../../locales/../src/interface/filter.cpp:385 +#: ../../locales/../src/interface/filter.cpp:266 msgid "This filter set cannot be renamed." msgstr "Seda filtrikogumit ei saa ümber nimetada" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7600,11 +7901,11 @@ "See nõustaja aitab teil seadistada kõik ruuterid ja tulemüürid ning " "kontrollib teie kasutatavat seadistust." -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Time" msgstr "Aeg" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 msgid "Time formatting" msgstr "Kellaaja vorming" @@ -7613,30 +7914,25 @@ msgstr "Aegu&mine sekundites:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "Aegumine" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1667 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1018 -#, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Ajatsooni nihked: Server: %d sekundit. Kohalik: %d sekundit. Vahe: %d " -"sekundit." +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1710 +#, fuzzy, c-format +msgid "Timezone offset of server is %d seconds." +msgstr "Arvutan serveri ajatsooni nihet..." -#: ../../locales/../src/interface/verifycertdialog.cpp:189 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Title:" msgstr "Tiitel:" # On ikka joondatud? -#: ../../locales/../src/interface/Mainfrm.cpp:2243 +#: ../../locales/../src/interface/Mainfrm.cpp:2221 msgid "To compare directories, both file lists have to be aligned." msgstr "Kataloogide võrdlemiseks peavad olema mõlemad joondatud." -#: ../../locales/../src/interface/Mainfrm.cpp:2244 +#: ../../locales/../src/interface/Mainfrm.cpp:2222 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Selleks tegevuseks peavad olema mõlemad kataloogipuud kas nähtaval või " @@ -7648,7 +7944,7 @@ "keys to use." msgstr "Et toetada avaliku võtmega autentimist vajab FileZilla privaatvõtit." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7664,7 +7960,7 @@ "Roheline: Fail on uuem kui võrreldav värvimata fail teises kataloogis\n" "Punane: Failisuurused erinevad" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7675,51 +7971,46 @@ "navigeerimine avab samaaegselt ka serveris olevaid samu kaustu ning " "vastupidi." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Näita/ära näita ülekande järjekorra toiminguid" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Näita/ära näita kohalikku kataloogipuud" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Näita/ära näita teadete logi" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Näita/ära näita serveri kataloogipuud" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Näita/ära näita ülekande järjekorda" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:574 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:541 msgid "Too long header line" msgstr "Liiga pikk päise rida" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:610 msgid "Too many redirects" msgstr "Liiga palju ümbersuunamisi" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:282 -#: ../../locales/../src/interface/StatusView.cpp:349 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Trace:" msgstr "Täitmine:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1803 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1853 msgid "Transfer" msgstr "Ülekanne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2218 msgid "Transfer &direction" msgstr "Ülekande suund" @@ -7731,26 +8022,26 @@ msgid "Transfer Mode" msgstr "Ülekande laad" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Transfer Queue" msgstr "Ülekande järjekord" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:450 msgid "Transfer Settings" msgstr "Ülekande seaded" -#: ../../locales/../src/engine/transfersocket.cpp:489 -#: ../../locales/../src/engine/transfersocket.cpp:511 +#: ../../locales/../src/engine/transfersocket.cpp:452 +#: ../../locales/../src/engine/transfersocket.cpp:474 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Ühendus katkestati: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Ülekantud andmed on vigased" -#: ../../locales/../src/interface/queue.cpp:391 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:249 msgid "Transferring" msgstr "Ülekanne" @@ -7758,48 +8049,47 @@ msgid "Transfers" msgstr "Ülekanded" -#: ../../locales/../src/interface/QueueView.cpp:3020 -#: ../../locales/../src/interface/QueueView.cpp:3023 +#: ../../locales/../src/interface/QueueView.cpp:2569 msgid "Transfers finished" msgstr "Ülekanded lõpetatud" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1116 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 msgid "Treat files &without extension as ASCII file" msgstr "&Loe laiendita failid ASCII failideks" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 msgid "Treat the &following filetypes as ASCII files:" msgstr "Kohtle &järgnevaid failitüüpe ASCII-failidena:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:760 #, fuzzy msgid "Trust changed Hostkey:" msgstr "Usalda muudetud serverivõtit:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:806 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:757 #, fuzzy msgid "Trust new Hostkey:" msgstr "Usalda uut serverivõtit:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 msgid "Trust the new key and carry on connecting?" msgstr "Kas usaldad uut võtit ja jätkad ühendust?" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:232 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" msgstr "Usalda seda sertifikaati ja jätka ühendust" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:872 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:879 msgid "Trust this host and carry on connecting?" msgstr "Kas usaldad seda serverit ja jätkad ühendust?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" -msgstr "" +msgstr "Proovi uuesti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 -#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 +#: ../../locales/../src/interface/edithandler.cpp:1095 msgid "Type" msgstr "Tüüp" @@ -7807,51 +8097,51 @@ msgid "Type of FTP Proxy:" msgstr "FTP proksi tüüp:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:695 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 msgid "Type of generic proxy:" msgstr "Üldise proksi tüüp:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1935 msgid "U&pload" msgstr "Ü&leslaadimine" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3543 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3712 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Ül&eslaadimise piirkiirus:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1933 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1963 msgid "U&se filetype associations if available" msgstr "K&asuta failitüüpide seoseid kui võimalik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1526 -msgid "U&se system defaults" -msgstr "K&asuta süsteemi vaikeväärtusi" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +msgid "U&se system defaults for current language" +msgstr "&Kasuta süsteemi vaikeseadistusi antud keele jaoks" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:376 -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:374 +#: ../../locales/../src/engine/proxy.cpp:500 #, c-format msgid "Unassigned error code %d" msgstr "Vastavuseta veakood %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:188 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Unit:" msgstr "Üksus:" -#: ../../locales/../src/interface/edithandler.cpp:1134 -#: ../../locales/../src/interface/edithandler.cpp:1162 +#: ../../locales/../src/interface/edithandler.cpp:1127 +#: ../../locales/../src/interface/edithandler.cpp:1155 msgid "Unknown" msgstr "Tundmatu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:687 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Tundmatu FTP proksi tüüp, ei õnnestu luua login-jada." -#: ../../locales/../src/engine/proxy.cpp:426 +#: ../../locales/../src/engine/proxy.cpp:422 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Tundmatu SOCKS protokolli versioon: %d" @@ -7860,32 +8150,36 @@ msgid "Unknown certificate" msgstr "Tundmatu sertifikaat" -#: ../../locales/../src/interface/xmlfunctions.cpp:377 -#: ../../locales/../src/interface/xmlfunctions.cpp:389 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" +#: ../../locales/../src/engine/misc.cpp:125 +#: ../../locales/../src/engine/misc.cpp:138 +#, fuzzy, c-format +msgid "Unknown error %d" +msgstr "Tundmatu serveri võti" + +#: ../../locales/../src/engine/misc.cpp:102 +#, fuzzy, c-format +msgid "Unknown error %u" +msgstr "Tundmatu serveri võti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:816 msgid "Unknown host key" msgstr "Tundmatu serveri võti" # Tõenäoliselt meetod nimega X'02' USERNAME/PASSWORD http://www.rfc-editor.org/rfc/rfc1929.txt -#: ../../locales/../src/engine/proxy.cpp:435 +#: ../../locales/../src/engine/proxy.cpp:430 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "Tundmatu SOCKS kasutajanimi/parool autoriseerimise versioon: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:417 +#: ../../locales/../src/interface/xmlfunctions.cpp:282 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:612 -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7893,7 +8187,7 @@ "Kuni nende probleemide lahendamiseni aktiivne FTP laad ei tööta ning " "kasutuses on passiivne laad." -#: ../../locales/../src/interface/netconfwizard.cpp:599 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7901,15 +8195,15 @@ "Kuni selle probleemi lahendamiseni aktiivne FTP laad ei tööta ning kasutuses " "on passiivne laad." -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1278 msgid "Unsupported certificate type" msgstr "Mittetoetatud sertifikaaditüüp" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:634 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:598 msgid "Unsupported redirect" msgstr "Mittetoetatud ümbersuunamine" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1941 msgid "Up&load and unedit" msgstr "&Lae üles ja tühista muudatused" @@ -7918,24 +8212,30 @@ msgid "Updates" msgstr "Uuendused" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Upload" msgstr "Üleslaadimine" -#: ../../locales/../src/interface/edithandler.cpp:1125 +#: ../../locales/../src/interface/edithandler.cpp:1118 msgid "Upload failed" msgstr "Üleslaadimine ebaõnnestus" -#: ../../locales/../src/interface/statusbar.cpp:584 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Upload limit: %s/s" msgstr "Üleslaadimise piirkiirus: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Upload limit: none" msgstr "Üleslaadimise piirkiirus: puudub" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3244 +#: ../../locales/../src/interface/search.cpp:873 +#, fuzzy +msgid "Upload search results" +msgstr "Lae valitud kataloog alla" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Upload selected directory" msgstr "Lae valitud kataloog üles" @@ -7943,73 +8243,74 @@ msgid "Upload selected files and directories" msgstr "Lae valitud failid ja kataloogid üles" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1746 msgid "Upload this file back to the server?" msgstr "Laeme selle faili tagasi serverisse?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Upload this file to the server?" msgstr "Laeme faili serverisse?" -#: ../../locales/../src/interface/edithandler.cpp:1119 -#: ../../locales/../src/interface/edithandler.cpp:1153 -#: ../../locales/../src/interface/edithandler.cpp:1318 +#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1146 +#: ../../locales/../src/interface/edithandler.cpp:1302 msgid "Uploading" msgstr "Üleslaadimine" -#: ../../locales/../src/interface/edithandler.cpp:1122 -#: ../../locales/../src/interface/edithandler.cpp:1320 +#: ../../locales/../src/interface/edithandler.cpp:1115 +#: ../../locales/../src/interface/edithandler.cpp:1304 msgid "Uploading and pending removal" msgstr "Laeb üles, eemaldamine ootel" -#: ../../locales/../src/interface/edithandler.cpp:1156 -#: ../../locales/../src/interface/edithandler.cpp:1322 +#: ../../locales/../src/interface/edithandler.cpp:1149 +#: ../../locales/../src/interface/edithandler.cpp:1306 msgid "Uploading and unediting" msgstr "Lae üles ja tühista muudatused" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Use &custom charset" msgstr "Kasuta &kohandatud kooditabelit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1897 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1927 msgid "Use &custom editor:" msgstr "&Vali editor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2882 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2924 msgid "Use &default editor for text files" msgstr "Kasutatav tekstifailide jaoks vaikimisi tekstitoimetusprogrammi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2672 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2746 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2702 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 msgid "Use &synchronized browsing" msgstr "Kasuta &sünkroniseeritud brausimist" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:467 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:541 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Kui server toetab, kasuta UTF-8't. Vastasel juhul kasuta kohalikku " "kooditabelit." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1389 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1398 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1421 msgid "Use default action" msgstr "Kasuta vaiketegevust" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:527 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:518 msgid "Use explicit FTP over TLS if available" -msgstr "" +msgstr "Kasuta ilmutatud kujul (explicit) FTP üle TLS-i kus võimalik." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2337 msgid "Use server currently connected to" msgstr "Kasuta hetkel ühendatud serverit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2343 msgid "Use server from site manager" msgstr "Vali server saidihaldurist" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1477 -msgid "Use system &defaults" -msgstr "Kasuta süsteemi &vaikeväärtusi" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#, fuzzy +msgid "Use system &defaults for current language" +msgstr "&Kasuta vaikimisi tekstitoimetusprogrammi" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8042,32 +8343,25 @@ "aktiivset laadi esmakordselt. Ainult see FileZilla versioon, mida kasutate, " "on lubatud ühenduma serveriga." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 msgid "User:" msgstr "Kasutaja:" -#: ../../locales/../src/interface/manual_transfer.cpp:518 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 +#: ../../locales/../src/interface/manual_transfer.cpp:501 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Username cannot be a series of spaces" msgstr "Kasutajanimi ei saa koosneda tühikutest" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 -#, c-format -msgid "Using proxy %s" -msgstr "Kasutusel proksi %s" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:507 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:581 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "Vale kooditabeli puhul ei näidata failinimesid korrektselt." #: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:314 msgid "Valid from:" msgstr "Kehtiv alates:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:322 msgid "Valid to:" msgstr "Kehtiv kuni:" @@ -8075,85 +8369,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "Ohtrasõnaline logiteade wxWidgetsilt" -#: ../../locales/../src/engine/tlssocket.cpp:1096 +#: ../../locales/../src/engine/tlssocket.cpp:1371 msgid "Verifying certificate..." msgstr "Sertifikaadi kontrollimine..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -msgid "Version:" -msgstr "Versioon:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "Väga suur" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1406 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1471 msgid "View hidden option set, but unsupported by server" msgstr "Peidetud failide näitamine lubatud, kuid server ei toeta seda" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1805 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1835 msgid "View/Edit" msgstr "Vaata/Muuda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2134 msgid "Visible columns" msgstr "Nähtavad veerud" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "W&rite" msgstr "K&irjuta" -#: ../../locales/../src/interface/QueueView.cpp:1713 -msgid "Waiting" -msgstr "Ootamine" - -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "Ootan ühenduste ülevaadet" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "Ootan parooli" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:243 msgid "Waiting for transfer to be cancelled" msgstr "Ootan ülekande katkestamist" -#: ../../locales/../src/engine/engineprivate.cpp:216 +#: ../../locales/../src/engine/engineprivate.cpp:240 msgid "Waiting to retry..." msgstr "Ootan kordusühendust ..." -#: ../../locales/../src/interface/FileZilla.cpp:301 -msgid "" -"Warning!\n" -"\n" -"A bug in Windows causes problems with FileZilla\n" -"\n" -"The bug occurs if you have\n" -"- Windows Server 2003 or XP 64\n" -"- Windows Firewall enabled\n" -"- Application Layer Gateway service enabled\n" -"See http://support.microsoft.com/kb/931130 for background information.\n" -"\n" -"Unless you either disable Windows Firewall or the Application Layer Gateway " -"service,\n" -"FileZilla will timeout on big transfers." -msgstr "" -"Hoiatus!\n" -"\n" -"Viga Windowsis põhjustab probleeme FileZillaga\n" -"\n" -"Viga võib tekkida siis kui\n" -"- kasutate Windows Server 2003 või XP 64\n" -"- on lubatud Windowsi tulemüür\n" -"- töötab Application Layer Gateway teenus\n" -"Taustainfoks vaata http://support.microsoft.com/kb/931130.\n" -"\n" -"Kui te ei lülita välja Windowsi tulemüüri või Application Layer Gateway " -"teenust,\n" -"annab FileZilla mahukatel ülekannetel vea." - -#: ../../locales/../src/interface/netconfwizard.cpp:981 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." msgstr "Hoiatus, ignoreerin andmeühendust valelt IP-lt." @@ -8172,29 +8428,29 @@ "\n" "Kas te tõesti tahate kontrollida ööversioone?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:934 msgid "Warning: Potential security breach!" msgstr "Hoiatus: Võimalik turvaprobleem!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3599 msgid "Welcome to FileZilla" msgstr "Tere tulemast FileZilla'sse" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 msgid "What's new" msgstr "Mis on uut" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Mis on uut:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3786 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:972 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8202,61 +8458,65 @@ "Kohaliku operatsioonisüsteemi poolt mittetoetatud märgid asendatakse " "tõmmatavates failides" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 msgid "When st&arting a new connection while already connected:" msgstr "&Eelnevalt ühendatud olles ja alustades uut ühendust:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 msgid "Widescreen" msgstr "Laiekraan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3781 #, fuzzy msgid "Would you like FileZilla to remember passwords?" msgstr "Sisesta parool" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Wr&ite" msgstr "Ki&rjuta" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Vale väline IP aadress" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:797 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 msgid "Wrong line endings" msgstr "Valed realõpud" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:771 msgid "Yes" msgstr "Jah" -#: ../../locales/../src/interface/netconfwizard.cpp:783 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "" -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Sul on kasutusel viimane FileZilla versioon." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3569 msgid "You can always open this dialog again through the help menu." msgstr "Sa saad käesoleva akna alati läbi Abi-menüü uuesti avada." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 #, fuzzy msgid "You can download the latest version from the FileZilla website:" msgstr "FileZilla viimase versiooni allalaadimine ebaõnnestus." -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:69 msgid "You can leave the port field empty to use the default port." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:518 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8264,7 +8524,7 @@ "Te võite kasutada x -i suvalisel positsioonil, et hoida originaalfaili " "õigusi." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Te ei saa importida seadeid FileZilla enda seadete kataloogist." @@ -8274,57 +8534,68 @@ "Please enter a character that is allowed in filenames." msgstr "" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "Te ei ole failile uut nime andnud. Kas kirjutame faili sellegipoolest üle?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3346 msgid "You have selected at least one symbolic link." msgstr "" -#: ../../locales/../src/interface/edithandler.cpp:1630 -#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/edithandler.cpp:1597 +#: ../../locales/../src/interface/search.cpp:1149 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" -#: ../../locales/../src/interface/LocalListView.cpp:1685 +#: ../../locales/../src/interface/LocalListView.cpp:1705 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "" -#: ../../locales/../src/interface/manual_transfer.cpp:433 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 +#: ../../locales/../src/interface/manual_transfer.cpp:420 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:965 msgid "You have to enter a hostname." msgstr "Te peate sisestama serverinime." -#: ../../locales/../src/interface/search.cpp:510 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 +#, fuzzy +msgid "You have to enter a key file path" +msgstr "Te peate sisestama kohaliku kataloogi." + +#: ../../locales/../src/interface/search.cpp:859 msgid "You have to enter a local directory." msgstr "Te peate sisestama kohaliku kataloogi." -#: ../../locales/../src/interface/netconfwizard.cpp:165 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." +#: ../../locales/../src/interface/search.cpp:873 +#, fuzzy +msgid "You have to enter a remote directory." +msgstr "Te peate sisestama kohaliku kataloogi." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +#, fuzzy +msgid "You have to enter a valid IPv4 address." msgstr "Te peate sisestama korrektse IP aadressi." -#: ../../locales/../src/interface/search.cpp:516 +#: ../../locales/../src/interface/search.cpp:864 msgid "You have to enter a writable local directory." msgstr "Te peate sisestama kirjutatava kohaliku kataloogi." -#: ../../locales/../src/interface/manual_transfer.cpp:529 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../../locales/../src/interface/manual_transfer.cpp:512 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 msgid "You have to enter an account name" msgstr "Te peate sisestama konto nime" -#: ../../locales/../src/interface/manual_transfer.cpp:499 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +#: ../../locales/../src/interface/manual_transfer.cpp:486 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1040 msgid "You have to specify a user name" msgstr "Te peate sisestama kasutajanime" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8332,7 +8603,7 @@ "Teil on arvatavasti ruuter või tulemüür, mis vigaselt muutis ülekantud " "andmeid." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Te peate sisestama järjehoidja nime." @@ -8340,7 +8611,7 @@ msgid "You need to enter a name for the log file." msgstr "Te peate sisestama logifaili nime." -#: ../../locales/../src/interface/edithandler.cpp:1509 +#: ../../locales/../src/interface/edithandler.cpp:1482 msgid "You need to enter a properly quoted command." msgstr "Te peate sisestama korralikult jutumärkidega eraldatud käsu." @@ -8353,43 +8624,43 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Te peate sisestama proksi pordi vahemikus 1-65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Sisesta vähemalt üks kaustatee, tühjad järjehoidjad pole lubatud." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:446 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1149 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "" -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "You need to specify a local file." msgstr "Te peate sisestama kohaliku faili" -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../../locales/../src/interface/manual_transfer.cpp:321 msgid "You need to specify a remote file." msgstr "Te peate sisestama kauge faili." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:327 msgid "You need to specify a remote path." msgstr "Te peate sisestama serveri kaustatee." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:298 msgid "You need to specify a server." msgstr "Te peate sisestama serveri." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8397,68 +8668,68 @@ "Teil ei tohiks olla probleeme ühendumisel teiste serveritega ja failide " "ülekanne peaks töötama korralikult." -#: ../../locales/../src/interface/QueueView.cpp:3128 +#: ../../locales/../src/interface/QueueView.cpp:2684 msgid "Your computer will suspend unless you click Cancel." msgstr "Süsteem seisatakse, kui sa ei klõpsa Loobu." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "hilisem kui" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "varasem kui" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "alguses on" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:282 #, fuzzy msgid "bytes" msgstr "%s baiti" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "sisaldab" -#: ../../locales/../src/interface/updater.cpp:211 +#: ../../locales/../src/interface/updater.cpp:243 #, fuzzy msgid "custom" msgstr "V&alitav" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "ei sisalda" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "ei võrdu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "lõpus on" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "võrdub" -#: ../../locales/../src/interface/filelistctrl.cpp:525 -#: ../../locales/../src/interface/filelistctrl.cpp:544 -#: ../../locales/../src/interface/filelistctrl.cpp:571 -#: ../../locales/../src/interface/filelistctrl.cpp:587 +#: ../../locales/../src/interface/filelistctrl.cpp:535 +#: ../../locales/../src/interface/filelistctrl.cpp:554 +#: ../../locales/../src/interface/filelistctrl.cpp:581 +#: ../../locales/../src/interface/filelistctrl.cpp:597 msgid "file" msgstr "fail" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8467,89 +8738,240 @@ "fzputtygen'i käivitamine ebaõnnestus.\n" "Palun veendu, et selle käivitusfail asub FileZillaga samas kaustas." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1471 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:374 +#, fuzzy +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "Sul on kasutusel viimane FileZilla versioon." + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1375 msgid "fzsftp could not be started" msgstr "fzsftp startimine ebaõnnestus" -#: ../../locales/../src/engine/tlssocket.cpp:1051 +#: ../../locales/../src/engine/tlssocket.cpp:1217 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket.cpp:1229 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "suurem kui" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "grupi käivitatav" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "grupi loetav" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "grupi kirjutatav" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1601 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "võrdub" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "on seatud" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "on seadmata" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "väiksem kui" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "vastab regulaaravaldisele" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +#, fuzzy +msgid "new name" +msgstr "&Nimeta ümber" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "omaniku käivitatav" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "omaniku loetav" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "omaniku kirjutatav" -#: ../../locales/../src/engine/tlssocket.cpp:1107 -#: ../../locales/../src/engine/tlssocket.cpp:1118 -#: ../../locales/../src/engine/tlssocket.cpp:1133 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket.cpp:1423 +#: ../../locales/../src/engine/tlssocket.cpp:1439 +#: ../../locales/../src/engine/tlssocket.cpp:1455 +#: ../../locales/../src/engine/tlssocket.cpp:1471 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 msgid "unknown" msgstr "tundmatu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "kõigi käivitatav" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "kõigi loetav" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "kõigi kirjutatav" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:699 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "%d files added to queue" +#~ msgstr "%d faili lisatud järjekorda" + +#~ msgid "&Crash" +#~ msgstr "&Avarii" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Katkesta ühendus serveriga" + +#~ msgid "&Show message" +#~ msgstr "&Näita teadet" + +#~ msgid "Available sizes" +#~ msgstr "Saadaval olevad suurused" + +#~ msgid "Cannot compare directories, not connected to a server." +#~ msgstr "Ei saa võrrelda katalooge, pole serveriga ühendatud." + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Ei saa laadida kiirühenduse riba ressursifailist" + +#~ msgid "Certificate details" +#~ msgstr "Sertifikaadi detailid" + +#~ msgid "Clear &Site Manager entries" +#~ msgstr "Kustuta &Saidihalduri sissekanded" + +#~ msgid "Clear &transfer queue" +#~ msgstr "Kustuta &ülekannete järjekord" + +#~ msgid "Connected" +#~ msgstr "Ühendatud" + +#~ msgid "Connection timed out" +#~ msgstr "Ühendus aegus" + +#~ msgid "" +#~ "Crashes FileZilla instantly. Only used to debug the exception handler" +#~ msgstr "" +#~ "FileZilla kaotab koheselt töövõime. Kasutatakse ainult erandite halduri " +#~ "silumiseks." + +#~ msgid "Do ¬hing" +#~ msgstr "&Ära tee midagi" + +#, fuzzy +#~ msgid "Downloading search results" +#~ msgstr "%s -i allatõmbamine" + +#~ msgid "Filename &filters..." +#~ msgstr "&Failinimede filtrid..." + +#~ msgid "No more files in the queue!" +#~ msgstr "Failide järjekord tühi!" + +#~ msgid "Operating system problem detected" +#~ msgstr "Leiti opsüsteemi viga" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Skaneerin järjekorda seatavaid faile" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Skaneerin üleslaetavaid faile" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize käivitati ilma ühenduseta (socket)" + +#~ msgid "" +#~ "The file '%s' is not in a format supported by FileZilla.\n" +#~ "The file is also password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into a supported, unprotected format?" +#~ msgstr "" +#~ "%s ei ole FileZilla poolt toetatud failivormingus.\n" +#~ "Samuti on see parooliga kaitstud. Parooliga kaitstud võtmefailid ei ole " +#~ "FileZilla poolt veel toetatud.\n" +#~ "Kas soovite seda konvertida toetatud, kaitsmata vormingusse?" + +#~ msgid "" +#~ "The file '%s' is password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into an unprotected file?" +#~ msgstr "" +#~ "%s on parooliga kaitstud. Parooliga kaitstud võtmefailid ei ole FileZilla " +#~ "poolt veel toetatud.\n" +#~ "Kas soovite seda konvertida kaitsmata formaati?" + +#~ msgid "" +#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " +#~ "seconds." +#~ msgstr "" +#~ "Ajatsooni nihked: Server: %d sekundit. Kohalik: %d sekundit. Vahe: %d " +#~ "sekundit." + +#~ msgid "U&se system defaults" +#~ msgstr "K&asuta süsteemi vaikeväärtusi" + +#~ msgid "Use system &defaults" +#~ msgstr "Kasuta süsteemi &vaikeväärtusi" + +#~ msgid "Using proxy %s" +#~ msgstr "Kasutusel proksi %s" + +#~ msgid "Waiting" +#~ msgstr "Ootamine" + +#~ msgid "" +#~ "Warning!\n" +#~ "\n" +#~ "A bug in Windows causes problems with FileZilla\n" +#~ "\n" +#~ "The bug occurs if you have\n" +#~ "- Windows Server 2003 or XP 64\n" +#~ "- Windows Firewall enabled\n" +#~ "- Application Layer Gateway service enabled\n" +#~ "See http://support.microsoft.com/kb/931130 for background information.\n" +#~ "\n" +#~ "Unless you either disable Windows Firewall or the Application Layer " +#~ "Gateway service,\n" +#~ "FileZilla will timeout on big transfers." +#~ msgstr "" +#~ "Hoiatus!\n" +#~ "\n" +#~ "Viga Windowsis põhjustab probleeme FileZillaga\n" +#~ "\n" +#~ "Viga võib tekkida siis kui\n" +#~ "- kasutate Windows Server 2003 või XP 64\n" +#~ "- on lubatud Windowsi tulemüür\n" +#~ "- töötab Application Layer Gateway teenus\n" +#~ "Taustainfoks vaata http://support.microsoft.com/kb/931130.\n" +#~ "\n" +#~ "Kui te ei lülita välja Windowsi tulemüüri või Application Layer Gateway " +#~ "teenust,\n" +#~ "annab FileZilla mahukatel ülekannetel vea." + #~ msgid "%s (%d.%d KB/s)" #~ msgstr "%s (%d.%d KB/s)" @@ -8705,10 +9127,6 @@ #~ msgid "Resolving hostname" #~ msgstr "Serverinime lahendamine" -#, fuzzy -#~ msgid "Root certificate is not trusted" -#~ msgstr "Kaugsertifikaat ei ole usaldusväärne." - #~ msgid "Select download location for package" #~ msgstr "Valige koht paki allalaadimiseks" diff -Nru filezilla-3.15.0.2/locales/eu.po filezilla-3.33.0/locales/eu.po --- filezilla-3.15.0.2/locales/eu.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/eu.po 2017-09-19 21:36:39.000000000 +0000 @@ -2,14 +2,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Olatz Erdozia , 2014. -# Asier Iturralde Sarasola , 2014, 2015. +# Asier Iturralde Sarasola , 2014, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: filezilla\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-15 14:21+0200\n" -"PO-Revision-Date: 2015-08-12 16:09+0200\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2016-11-28 17:26+0100\n" +"PO-Revision-Date: 2016-11-06 18:25+0100\n" "Last-Translator: Asier Iturralde Sarasola \n" "Language-Team: Euskara \n" "Language: eu\n" @@ -20,14 +20,14 @@ "X-Generator: Gtranslator 2.91.6\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:203 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S igaro dira" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:209 msgid "%H:%M:%S left" msgstr "%H:%M:%S geratzen dira" @@ -40,100 +40,74 @@ "%a - Kontua (Hau duten lerroak ez dira agertuko Kontua saio-hasiera erabili " "ezean)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d direktorio" msgstr[1] "%d direktorio" -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/search.cpp:478 -#: ../../locales/../src/interface/search.cpp:764 +#: ../../locales/../src/interface/RemoteListView.cpp:1409 +#: ../../locales/../src/interface/search.cpp:809 +#: ../../locales/../src/interface/search.cpp:1188 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d direktorio eta bere edukia" msgstr[1] "%d direktorio eta haien edukiak" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1389 -#: ../../locales/../src/interface/search.cpp:477 -#: ../../locales/../src/interface/search.cpp:763 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1408 +#: ../../locales/../src/interface/search.cpp:808 +#: ../../locales/../src/interface/search.cpp:1187 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fitxategi" msgstr[1] "%d fitxategi" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d fitxategi. Tamaina guztira: %s" msgstr[1] "%d fitxategi. Tamaina guztira: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d fitxategi. Tamaina guztira: gutxienez %s" msgstr[1] "%d fitxategi. Tamaina guztira: gutxienez %s" -#: ../../locales/../src/interface/QueueView.cpp:2784 -#, c-format -msgid "%d files added to queue" -msgstr "%d fitxategi ilaran gehituta" - -#: ../../locales/../src/engine/ControlSocket.cpp:103 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d segundo" -msgstr[1] "%d segundo" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:501 msgid "%h - Host" msgstr "%h - Ostalaria" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 -#, c-format -msgid "%llu directory" -msgid_plural "%llu directories" -msgstr[0] "%llu direktorio" -msgstr[1] "%llu direktorio" - -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 -#, c-format -msgid "%llu file" -msgid_plural "%llu files" -msgstr[0] "%llu fitxategi" -msgstr[1] "%llu fitxategi" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:517 #, c-format msgid "%p - Password" msgstr "%p - Pasahitza" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:164 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:167 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Ziurtagiria iraungita" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Oraindik ez da baliozkoa" @@ -143,24 +117,17 @@ msgid "%s - Proxy user" msgstr "%s - Proxy-erabiltzailea" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s eta %s. Tamaina guztira: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s eta %s. Tamaina guztira: gutxienez %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 -#, c-format -msgid "%s byte" -msgid_plural "%s bytes" -msgstr[0] "byte %s" -msgstr[1] "%s byte" - -#: ../../locales/../src/interface/FileZilla.cpp:595 +#: ../../locales/../src/interface/FileZilla.cpp:607 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -174,7 +141,7 @@ "Berriro deskargatu FileZilla. Arazoa konpontzen ez bada, bidali errore-" "txostena." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:692 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -191,7 +158,7 @@ "batean dagoela.\n" "- %s(e)rako bide-izen osoa adierazi FZ_FZSFTP ingurunearen aldagaian." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%2$d bit dituen %1$s" @@ -205,7 +172,7 @@ msgid "%w - Proxy password" msgstr "%w - Proxy-pasahitza" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3644 msgid "&Abort previous connection and connect in current tab" msgstr "&Abortatu aurreko konexioa eta uneko fitxan konektatu" @@ -213,14 +180,14 @@ msgid "&About..." msgstr "&Honi buruz..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2501 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "&Kontua:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:478 msgid "&Active" msgstr "&Aktiboa" @@ -237,12 +204,12 @@ msgid "&Add key file..." msgstr "&Gehitu gako-fitxategia..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "&Add to queue" msgstr "&Gehitu ilaran" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:407 msgid "&Adjust server timezone offset:" msgstr "&Doitu zerbitzariaren ordu-zonaren tartea:" @@ -254,11 +221,11 @@ msgid "&Always trust this host, add this key to the cache" msgstr "&Fidatu beti ostalari honetaz, gehitu gako hau cacheari" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1969 msgid "&Always use default editor" msgstr "&Erabili beti editore lehenetsia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2978 msgid "&Always use selection for unassociated files" msgstr "&Erabili beti hautapena asoziatu gabeko fitxategiekin" @@ -271,22 +238,26 @@ msgstr "&Eskatu sistema eragileari kanpoko IP helbidea" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Automatikoa" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 msgid "&Autodetect" msgstr "&Automatikoki detektatu" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:275 +msgid "&Background color:" +msgstr "&Atzeko planoko kolorea:" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:604 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Bitarra" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1632 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Aurrizki bitarrak, SI sinboloak erabiliz (adib. 1 KB = 1024 byte)" @@ -294,14 +265,14 @@ msgid "&Bookmarks" msgstr "La&ster-markak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2749 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3129 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3178 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2156 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:367 msgid "&Browse..." msgstr "&Arakatu..." @@ -311,8 +282,8 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3620 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3676 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3774 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3830 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -326,11 +297,11 @@ msgid "&Close" msgstr "&Itxi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "&Itxi FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:644 msgid "&Configure speed limits..." msgstr "&Konfiguratu abiadura-mugak..." @@ -338,7 +309,7 @@ msgid "&Configure..." msgstr "&Konfiguratu..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:619 msgid "&Connect" msgstr "Ko&nektatu" @@ -347,35 +318,35 @@ msgstr "&Kopiatu uneko konexioa gune-kudeatzailean..." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "&Kopiatu arbelean" #: ../../locales/../src/interface/resources/xrc/menus.xrc:264 #: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "&Create directory" msgstr "&Sortu direktorioa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:624 msgid "&Create new tab" msgstr "&Sortu fitxa berria" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "&Araztu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "&Debug information in message log:" msgstr "&Araztu mezu-erregistroko informazioa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Default editor:" msgstr "&Editore lehenetsia:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "&Ekintza lehenetsia fitxategia badagoenean..." @@ -385,14 +356,14 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2829 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "Ezaba&tu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3370 msgid "&Delete symlink" msgstr "Ezaba&tu esteka sinbolikoa" @@ -400,7 +371,19 @@ msgid "&Directory comparison" msgstr "&Direktorioen konparazioa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/state.cpp:960 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"&Desgaitu arakatze sinkronizatua eta direktorio lokala aldatzen jarraitu" + +#: ../../locales/../src/interface/state.cpp:1035 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" +"&Desgaitu arakatze sinkronizatua eta urruneko direktorioa aldatzen jarraitu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 msgid "&Discard local file then download and edit file anew" msgstr "&Baztertu fitxategi eta berriro deskargatu eta editatu fitxategia" @@ -408,19 +391,15 @@ msgid "&Disconnect" msgstr "&Deskonektatu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Deskonektatu zerbitzaritik" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Bistaratu une bateko transferentzia-abiadura batez bestekoaren ordez" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "&Display size in bytes" msgstr "&Bistaratu tamaina bytetan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3813 msgid "&Do not remember passwords (recommended)" msgstr "&Ez gogoratu pasahitzak (gomendatua)" @@ -432,24 +411,24 @@ msgid "&Don't use external IP address on local connections." msgstr "&Ez erabili kanpoko IP helbidea konexio lokaletan." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1826 msgid "&Double-click action on files:" msgstr "&Fitxategian klik bikoitza eginez gero:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "&Download" msgstr "&Deskargatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "&Download to:" msgstr "&Deskargatu hona:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:610 msgid "&Download..." msgstr "&Deskargatu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1400 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Deskargak:" @@ -465,8 +444,8 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:640 msgid "&Enable" msgstr "&Gaitu" @@ -474,12 +453,12 @@ msgid "&Enable compression" msgstr "&Gaitu konpresioa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3702 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "&Gaitu abiadura-mugak" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:565 msgid "&Encoding:" msgstr "&Kodeketa:" @@ -487,11 +466,11 @@ msgid "&Encryption:" msgstr "&Enkriptatzea:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "&Sartu komando pertsonalizatua..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3637 msgid "&Establish connection in a new tab" msgstr "&Ezarri konexioa fitxa berri batean" @@ -499,12 +478,12 @@ msgid "&Execute" msgstr "&Exekutatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1574 msgid "&Export Site Manager entries" msgstr "&Esportatu gune-kudeatzailearen sarrerak" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 msgid "&Export..." msgstr "&Esportatu..." @@ -516,15 +495,15 @@ msgid "&File" msgstr "&Fitxategia" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "&File Attributes..." msgstr "&Fitxategi-atributuak..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "&Fitxategi-baimenak..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2262 msgid "&File:" msgstr "&Fitxategia:" @@ -536,15 +515,27 @@ msgid "&Filter sets:" msgstr "&Iragazki multzoak:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 +msgid "&Filters" +msgstr "&Iragazkiak" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Iragazkiak:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1762 msgid "&Finish editing and delete local file" msgstr "&Amaitu edizioa eta ezabatu fitxategi lokala" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3295 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Berdindu bide-izen lokalak; kargatu han dauden fitxategi guztiak zuzenean " +"helburuko direktoriora" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3200 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -552,7 +543,7 @@ "&Berdindu urruneko bide-izenak; deskargatu han dauden fitxategi guztiak " "zuzenean helburuko direktoriora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3377 msgid "&Follow symlink, delete target directory contents" msgstr "" "&Jarraitu esteka sinbolikoari, ezabatu helburuko direktorioaren edukiak" @@ -565,7 +556,7 @@ msgid "&Getting help..." msgstr "&Laguntza lortzen..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2614 msgid "&Global bookmark" msgstr "&Laster-marka orokorra" @@ -578,11 +569,11 @@ msgstr "&Laguntza" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:550 msgid "&Hide identical files" msgstr "&Ezkutatu berdin-berdinak diren fitxategiak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "&Handiena" @@ -590,17 +581,17 @@ msgid "&Highest available port:" msgstr "&Ataka-zenbaki erabilgarri handiena:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2409 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 msgid "&Host:" msgstr "&Ostalaria:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1627 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC aurrizki bitarrak (adib. 1KiB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1513 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (adibidea: 2007-09-15)" @@ -608,15 +599,19 @@ msgid "&Import..." msgstr "&Inportatu..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2002 msgid "&Inherit system's filetype associations" msgstr "&Heredatu sistemaren asoziazioak fitxategi motetarako" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Instalatu bertsio berria" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3144 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3288 +msgid "&Keep local path structure relative to search root" +msgstr "&Mantendu bide-izenen egitura lokala bilaketa-erroarekiko" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 msgid "&Keep remote path structure relative to search root" msgstr "&Mantendu urruneko bide-izenen egitura bilaketa-erroarekiko" @@ -632,7 +627,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Mugatu FileZilla-k erabilitako ataka lokalak" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:494 msgid "&Limit number of simultaneous connections" msgstr "&Mugatu aldibereko konexio kopurua" @@ -640,12 +635,16 @@ msgid "&Local directory tree" msgstr "Direktorio &lokalen zuhaitza" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2737 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2758 msgid "&Local directory:" msgstr "Direktorio &lokala:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3024 +msgid "&Local search" +msgstr "Bilaketa &lokala" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "&Log to file" msgstr "&Gorde egunkaria fitxategi batean" @@ -653,11 +652,11 @@ msgid "&Logon Type:" msgstr "&Saio-hasiera mota:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2464 msgid "&Logontype:" msgstr "&Saio-hasiera mota:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "&Txikia" @@ -669,7 +668,7 @@ msgid "&Manual transfer..." msgstr "&Eskuzko transferentzia..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:504 msgid "&Maximum number of connections:" msgstr "&Gehieneko konexio kopurua:" @@ -685,11 +684,11 @@ msgid "&Minimize to tray" msgstr "&Ikonotu erretiluan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "&Name sorting mode:" msgstr "&Izena ordenatzeko modua:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2641 msgid "&Name:" msgstr "&Izena:" @@ -705,25 +704,22 @@ msgid "&New Site" msgstr "&Gune berria" -#: ../../locales/../src/interface/Mainfrm.cpp:1708 +#: ../../locales/../src/interface/Mainfrm.cpp:1671 msgid "&New version available!" msgstr "&Bertsio berria erabilgarri" -#: ../../locales/../src/interface/netconfwizard.cpp:26 -msgid "&Next >" -msgstr "&Hurrengoa >" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1898 msgid "&No" msgstr "&Ez" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 #: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&Bat ere ez" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&Normala" @@ -732,8 +728,8 @@ msgstr "&Zenbakizko balioa:" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2878 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2899 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:627 msgid "&OK" msgstr "A&dos" @@ -742,7 +738,7 @@ msgstr "&IREKI" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 msgid "&Open" msgstr "&Ireki" @@ -750,7 +746,7 @@ msgid "&Overwrite" msgstr "&Gainidatzi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:485 msgid "&Passive" msgstr "&Pasiboa" @@ -758,11 +754,11 @@ msgid "&Password:" msgstr "&Pasahitza:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "&Jo soinua" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2422 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 msgid "&Port:" @@ -772,7 +768,7 @@ msgid "&Preserve timestamps of transferred files" msgstr "&Gorde transferitutako fitxategien denbora-zigiluak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1643 msgid "&Queue" msgstr "&Ilara" @@ -784,7 +780,7 @@ msgid "&Quickconnect bar" msgstr "&Konexio azkarraren barra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1507 msgid "&Quickconnect history" msgstr "&Konexio azkarraren historia" @@ -796,12 +792,12 @@ msgid "&Reconnect" msgstr "&Konektatu berriro" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1514 msgid "&Reconnect information" msgstr "Bi&rkonektatzeko informazioa" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 msgid "&Refresh" msgstr "F&reskatu" @@ -809,19 +805,23 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Gogoratu pasahitza FileZilla itxi arte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3807 msgid "&Remember passwords" msgstr "&Gogoratu pasahitzak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2695 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2782 msgid "&Remote directory:" msgstr "&Urruneko direktorioa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2298 msgid "&Remote path:" msgstr "&Urruneko bide-izena:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3031 +msgid "&Remote search" +msgstr "&Urruneko bilaketa" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Kendu" @@ -830,16 +830,16 @@ msgid "&Remove key" msgstr "&Kendu gakoa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "&Kendu hautatutakoa" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2823 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2844 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Aldat&u izena" @@ -848,7 +848,7 @@ msgid "&Rename..." msgstr "Aldat&u izena..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 msgid "&Reopen local file" msgstr "&Ireki berriro fitxategi lokala" @@ -860,7 +860,11 @@ msgid "&Report a bug..." msgstr "&Errore baten berri eman..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "&Eskatu arreta" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 msgid "&Reset and requeue all" msgstr "&Berrezarri eta berriro jarri ilaran guztiak" @@ -872,7 +876,7 @@ msgid "&Resume" msgstr "&Berrekin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "&Exekutatu komandoa..." @@ -880,7 +884,7 @@ msgid "&Run configuration wizard now..." msgstr "&Exekutatu konfigurazio-morroia orain..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2095 msgid "&Run update check now..." msgstr "&Eguneraketak bilatu..." @@ -896,7 +900,7 @@ msgid "&Save as..." msgstr "&Gorde honela..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3039 msgid "&Search" msgstr "&Bilatu" @@ -908,20 +912,20 @@ msgid "&Select Entry:" msgstr "&Hautatu sarrera:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1878 msgid "&Select language:" msgstr "&Hautatu hizkuntza:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2150 msgid "&Select the columns that should be displayed:" msgstr "&Hautatu bistaratuko diren zutabeak:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2337 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Zerbitzaria" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 msgid "&Settings" msgstr "&Ezarpenak" @@ -929,23 +933,19 @@ msgid "&Settings..." msgstr "&Ezarpenak..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Show debug menu" msgstr "&Erakutsi arazteko menua" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 msgid "&Show detailed log" msgstr "Erakutsi log xehatua" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Erakutsi mezua" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "&Show timestamps in message log" msgstr "&Erakutsi denbora-zigiluak mezu-erregistroan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 msgid "&Site Manager entries" msgstr "&Gune-kudeatzailearen sarrerak" @@ -953,7 +953,7 @@ msgid "&Site Manager..." msgstr "&Gune-kudeatzailea..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2622 msgid "&Site-specific bookmark" msgstr "&Gunearen araberako laster-marka" @@ -965,7 +965,8 @@ msgid "&Speed limits" msgstr "&Abiadura-mugak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3306 msgid "&Start transfer immediately" msgstr "&Hasi transferentzia berehala" @@ -973,11 +974,11 @@ msgid "&Swap local and remote panes" msgstr "&Trukatu panel lokalak eta urrunekoak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 msgid "&TLS Ciphers" msgstr "&TLS zifraketak" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Proba" @@ -989,11 +990,11 @@ msgid "&Transfer" msgstr "&Transferentzia" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 msgid "&Transfer mode:" msgstr "&Transferentzia modua:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1526 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "&Transferentzia ilara" @@ -1002,7 +1003,7 @@ msgid "&Treat dotfiles as ASCII files" msgstr "&Dotfile-fitxategiak ASCII fitxategi gisa tratatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1938 msgid "&Unedit" msgstr "&Edizioa desegin" @@ -1011,24 +1012,32 @@ msgstr "&Eguneratu ostalari honen cacheko gakoa" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "&Upload" msgstr "&Kargatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3265 +msgid "&Upload to:" +msgstr "&Kargatu hona:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +msgid "&Upload..." +msgstr "&Kargatu..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1423 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Kargatzeak:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2953 msgid "&Use custom program" msgstr "&Erabili programa pertsonalizatua" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:388 msgid "&Use synchronized browsing" msgstr "&Erabili arakatze sinkronizatua" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "&Use system's default editor for text files" msgstr "&Erabili sistemaren editore lehenetsia testu-fitxategiekin" @@ -1040,12 +1049,12 @@ msgid "&Use the server's external IP address instead" msgstr "&Erabili zerbitzariaren kanpoko IP helbidea" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1642 msgid "&Use thousands separator" msgstr "&Erabili milakoen bereizlea" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2476 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Erabiltzailea:" @@ -1054,7 +1063,7 @@ msgid "&Username:" msgstr "Era&biltzaile-izena:" -#: ../../locales/../src/interface/Mainfrm.cpp:1702 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 #, c-format msgid "&Version %s" msgstr "&%s bertsioa" @@ -1064,17 +1073,17 @@ msgstr "&Ikusi" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:616 msgid "&View/Edit" msgstr "&Ikusi/Editatu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1979 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Ikuskatu lokalki editatutako fitxategiak eta aldaketak kargatzeko " "gonbitaegin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&When checking for updates, check for:" msgstr "&Eguneraketak bilatzean, begiratu gauza hauek:" @@ -1082,30 +1091,30 @@ msgid "&Write" msgstr "Idat&zi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1769 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1892 msgid "&Yes" msgstr "&Bai" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' ez dago edo ezin da atzitu." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' ez da direktorio bat." -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:965 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 msgid "'Account' logontype not supported by selected protocol" msgstr "Hautatutako protokoloak ez du onartzen 'Kontua' saio-hasiera mota" -#: ../../locales/../src/interface/manual_transfer.cpp:440 +#: ../../locales/../src/interface/manual_transfer.cpp:446 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1113,7 +1122,7 @@ "'Normala' eta 'Kontua' saio-hasiera motak ez daude erabilgarri; 'Pasahitza " "eskatu' erabiliko da horien ordez." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:993 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1121,7 +1130,7 @@ "'Normala' eta 'Kontua' saio-hasiera motak ez daude erabilgarri. Hautatu " "duzun saio-hasieraren ordez \"Pasahitza eskatu\" erabiliko da." -#: ../../locales/../src/interface/Mainfrm.cpp:598 +#: ../../locales/../src/interface/Mainfrm.cpp:587 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1131,15 +1140,15 @@ "erabiltzen dute 'quote' osteko argumentuak zerbitzarira bidaltzeko. Ziur " "aski hobe duzu komandoa aurretik 'quote' jarri gabe bidaltzea." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objektu iragazita)" msgstr[1] "(%d objektu iragazita)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% deskargatuta)" @@ -1171,16 +1180,16 @@ msgid "(app-compat is set to %d.%d)" msgstr "(app-compat %d.%d da)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1580 msgid "(example: %H:%M)" msgstr "(adibidez: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 msgid "(example: %Y-%m-%d)" msgstr "(adibidez: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3584 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3721 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3738 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1191,7 +1200,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "--:--:-- left" msgstr "--:--:-- geratzen dira" @@ -1211,19 +1220,19 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s ezin da erabili FTP URL batekin batera.." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2255 msgid "0 - None" msgstr "0 - Bat ere ez" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2256 msgid "1 - Warning" msgstr "1 - Abisua" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "2 - Info" msgstr "2 - Informazioa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2258 msgid "3 - Verbose" msgstr "3 - Xehatua" @@ -1231,7 +1240,7 @@ msgid "32-bit system" msgstr "32 biteko sistema" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2259 msgid "4 - Debug" msgstr "4 - Araztu" @@ -1239,26 +1248,26 @@ msgid "64-bit system" msgstr "64 biteko sistema" -#: ../../locales/../src/interface/netconfwizard.cpp:27 -msgid "< &Back" -msgstr "< &Atzera" - #: ../../locales/../src/interface/resources/xrc/menus.xrc:215 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "Izen bera duen laster-marka bat badago. Sartu erabili gabeko izen bat." +#: ../../locales/../src/engine/tlssocket.cpp:1333 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Kateko ziurtagiri bat algoritmo ez seguru bat erabiliz sinatu zen" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Editore lehenetsi bat ezarri behar da." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:166 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:785 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Ezin da direktorio bat bere azpidirektorio batera arrastatu." @@ -1272,22 +1281,22 @@ "daude. Halakoetan modu aktiboa erabili behar da. Modu aktiboan, FileZilla-k " "ataka bat zabaldu eta horra konektatzeko eskatzen dio zerbitzariari." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1688 msgid "A file previously opened has been changed." msgstr "Aurretik irekitako fitxategi bat aldatu egin da." -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "A file with that name is already being transferred." msgstr "Izen hori duen fitxategi bat lehendik transferitzen ari da." -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1658 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Izen hori duen fitxategi bat editatzen ari da oraindik. Itxi eta saiatu " "berriro." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:586 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1301,7 +1310,7 @@ "zerrendetan.\n" "Saio honetan ez da beste abisurik erakutsiko." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "FileZilla-ren bertsio berri bat erabilgarri dago:" @@ -1322,7 +1331,7 @@ "Zerbitzari egokiek ez dute honen beharrik. Jarri harremanetan zerbitzari-" "administratzailearekin behar izanez gero." -#: ../../locales/../src/interface/state.cpp:256 +#: ../../locales/../src/interface/state.cpp:253 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1332,7 +1341,7 @@ "Arakatze sinkronizatua desgaitu eta direktorio lokala aldatzen jarraitu?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1357,11 +1366,11 @@ msgid "A&pply to all files and directories" msgstr "Fitxategi eta direktorio &guztietan aplikatu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "A&utomatically remove successful transfers" msgstr "&Automatikoki kendu ondo egindako transferentziak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2553 msgid "ASCII" msgstr "ASCII" @@ -1373,27 +1382,27 @@ msgid "Above the file lists" msgstr "Fitxategi-zerrenden gainean" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/engine/server.cpp:912 +#: ../../locales/../src/engine/server.cpp:933 #: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/manual_transfer.cpp:547 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1326 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1327 msgid "Account" msgstr "Kontua" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "&Ilara osatu osteko ekintza" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1931 msgid "Action on selected file:" msgstr "Hautatutako fitxategiaren gaineko ekintza:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1811 msgid "Action to perform:" msgstr "Egin beharreko ekintza:" @@ -1405,7 +1414,7 @@ msgid "Active mode" msgstr "Modu aktiboa" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1413,7 +1422,7 @@ "FTP modu aktiboaren probak huts egin du. FileZilla-k ez daki kanpoko IP " "helbide zuzena." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1421,7 +1430,7 @@ "FTP modu aktiboaren probak huts egin du. FileZilla-k ez daki kanpoko IP " "helbide zuzena. Gainera, bideratzaileak aldatu egin du bidalitako helbidea." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1435,12 +1444,13 @@ msgid "Active mode IP" msgstr "Modu aktiboko IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3313 msgid "Add files to &queue only" msgstr "Gehitu fitxategiak &ilaran soilik" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "Add selected directory to the transfer queue" msgstr "Hautatutako direktorioa transferentzia ilaran gehitu" @@ -1449,20 +1459,20 @@ msgid "Add selected files and folders to the transfer queue" msgstr "Hautatutako fitxategi eta karpetak transferentzia ilaran gehitu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1854 msgid "Add to queue" msgstr "Gehitu ilaran" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Address type not supported" msgstr "Helbide mota ez onartua" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:313 msgid "Advanced" msgstr "Aurreratua" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2086 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1477,15 +1487,15 @@ "hondatzea ere. Beta eta nightly build bertsioak erabiltzen dituenak, " "norberaren gain hartzen du arriskua." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 msgid "Al&ways perform this action" msgstr "&Beti egin ekintza hau" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2010 msgid "Algorithm:" msgstr "Algoritmoa:" -#: ../../locales/../src/interface/QueueView.cpp:2953 +#: ../../locales/../src/interface/QueueView.cpp:2577 msgid "All files have been successfully transferred" msgstr "Fitxategi guztiak ondo transferitu dira" @@ -1495,7 +1505,7 @@ "Adierazitako tartean ataka-zenbaki guztiek 1024 eta 65535 bitartean egon " "behar dute." -#: ../../locales/../src/interface/QueueView.cpp:2949 +#: ../../locales/../src/interface/QueueView.cpp:2573 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1512,11 +1522,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Onartu ordezko transferentzia moduaz baliatzea huts eginez gero" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3614 msgid "Already connected" msgstr "Konektatuta dago lehendik" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Izen alternatiboa:" @@ -1538,13 +1548,13 @@ "Bestela, sistemaren SSH agentea erabil daiteke. Horretarako, ziurtatu " "SSH_AUTH_SOCK ingurunearen aldagaia ezarri dela." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:157 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "Bestela, FileZilla-ren webgunetik deskarga daiteke azken bertsioa:" -#: ../../locales/../src/interface/QueueView.cpp:1919 +#: ../../locales/../src/interface/QueueView.cpp:1615 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1553,7 +1563,7 @@ "Errorea izan da \"%s\"(e)tik transferentzia ilara kargatzean.\n" "Beharbada ilarako elementu batzuk ez ziren leheneratuko." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1513 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1562,7 +1572,11 @@ "Errorea izan da transferentzia ilara \"%s\"(e)n gordetzean.\n" "Beharbada ilarako elementu batzuk ez ziren gordeko." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2028 +#: ../../locales/../src/engine/tlssocket.cpp:1336 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Ziurtagiri kateko emaile bat ez da ziurtagiri-autoritatea" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2079 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1570,31 +1584,31 @@ "Arrastatu den elementuaren izen bera duen elementu bat badago lehendik " "helburuko kokalekuan." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1306 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1580 +#: ../../locales/../src/engine/server.cpp:935 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:545 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1325 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1622 msgid "Anonymous" msgstr "Anonimoa" -#: ../../locales/../src/interface/state.cpp:914 +#: ../../locales/../src/interface/state.cpp:1011 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Urruneko beste eragiketa bat egiten ari da, orain ezin da direktorioa aldatu." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:806 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:805 msgid "Any changes made in the Site Manager could not be saved." msgstr "Gune-kudeatzailean egindako aldaketak ezin izan dira gorde." -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:955 msgid "Any changes made to the filters could not be saved." msgstr "Iragazkietan egindako aldaketak ezin izan dira gorde." -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:863 msgid "Any changes made to the filters will not be saved." msgstr "Iragazkietan egindako aldaketak ez dira gordeko." @@ -1614,29 +1628,25 @@ msgid "Apply to &files only" msgstr "&Fitxategietan soilik aplikatu." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Artxiboa" -#: ../../locales/../src/engine/socket.cpp:1095 -msgid "Argument buffer overflow" -msgstr "Argumentu-buffer gainezkatzea" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 msgid "As tab in the transfer queue pane" msgstr "Fitxa gisa transferentzia ilararen panelean" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Akzioa eskatu" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:906 +#: ../../locales/../src/engine/server.cpp:927 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Pasahitza eskatu" @@ -1648,7 +1658,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Sistema eragileari kanpoko IP helbidea eskatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3515 msgid "Asking questions in the FileZilla forums" msgstr "FileZilla-ren foroetan galderak egin" @@ -1656,7 +1666,7 @@ msgid "Associated program not found:" msgstr "Asoziatutako programa ez da aurkitu:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:509 msgid "At least one filter condition is incomplete" msgstr "Iragazkiaren baldintza bat gutxienez osatu gabe dago" @@ -1664,11 +1674,11 @@ msgid "At this point, all required information has been gathered." msgstr "Une honetan, behar den informazio guztia eskuratu da." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atributua" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:658 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:617 msgid "Authentication failed." msgstr "Autentifikazioak huts egin du." @@ -1676,7 +1686,7 @@ msgid "Author:" msgstr "Egilea:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2531 msgid "Auto" msgstr "Automatikoa" @@ -1684,24 +1694,16 @@ msgid "Automatic file type classification" msgstr "Fitxategi motaren sailkapen automatikoa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Tamaina erabilgarriak" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B Only translate first letter>" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:339 msgid "B&ypass proxy" msgstr "&Saihestu proxya" -#: ../../locales/../src/engine/socket.cpp:1059 -msgid "Bad file descriptor" -msgstr "Fitxategi-deskribatzaile okerra" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 msgid "Basic usage instructions" msgstr "Oinarrizko erabilera-jarraibideak" @@ -1709,16 +1711,16 @@ msgid "Behaviour" msgstr "Jokabidea" -#: ../../locales/../src/interface/edithandler.cpp:1115 -#: ../../locales/../src/interface/edithandler.cpp:1143 +#: ../../locales/../src/interface/edithandler.cpp:1124 +#: ../../locales/../src/interface/edithandler.cpp:1152 msgid "Being edited" msgstr "Editatzen ari da" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1327 msgid "Beware! Certificate has been revoked" msgstr "Kontuz! Ziurtagiria ezeztatu egin da" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2558 msgid "Binary" msgstr "Binarioa" @@ -1726,17 +1728,17 @@ msgid "Blackboard" msgstr "Arbela" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:416 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:299 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:383 msgid "Bookmark" msgstr "Laster-marka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2821 msgid "Bookmark:" msgstr "Laster-marka:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2810 msgid "Bookmarks" msgstr "Laster-markak" @@ -1752,7 +1754,7 @@ msgid "Build information" msgstr "Konpilazioaren informazioa" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Business category:" msgstr "Negozio kategoria:" @@ -1770,20 +1772,25 @@ msgid "C&ancel current operation" msgstr "&Utzi uneko operazioa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "G&arbitu dena" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 msgid "C&opy URL(s) to clipboard" msgstr "K&opiatu URLa(k) arbelean" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +msgid "C&opy URL(s) with password to clipboard" +msgstr "K&opiatu URLa(k) pasahitzarekin arbelean" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1518 msgid "C&ustom" msgstr "&Pertsonalizatu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2007 msgid "C&ustom filetype associations:" msgstr "&Pertsonalizatu fitxategi moten asoziazioak:" @@ -1791,22 +1798,21 @@ msgid "CPU features:" msgstr "PUZaren ezaugarriak:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1210 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1657 msgid "Calculating timezone offset of server..." msgstr "Zerbitzariaren ordu-zonaren tartea kalkulatzen..." -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../../locales/../src/engine/transfersocket.cpp:688 msgid "Can't read from file" msgstr "Ezin da fitxategia irakurri" -#: ../../locales/../src/engine/transfersocket.cpp:648 -#: ../../locales/../src/engine/transfersocket.cpp:714 +#: ../../locales/../src/engine/transfersocket.cpp:666 +#: ../../locales/../src/engine/transfersocket.cpp:741 msgid "Can't write data to file." msgstr "Ezin dira datuak idatzi fitxategian" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:669 +#: ../../locales/../src/engine/transfersocket.cpp:744 #, c-format msgid "Can't write data to file: %s" msgstr "Ezin dira datuak idatzi fitxategian: %s" @@ -1816,47 +1822,45 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2716 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2884 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2974 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1368 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1475 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1546 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2584 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2737 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2995 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3235 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3400 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3672 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3892 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:634 msgid "Cancel" msgstr "Utzi" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 msgid "Cancel current operation" msgstr "Utzi uneko eragiketa" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:54 msgid "Cancels the current operation" msgstr "Uneko eragiketa uzten du" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Ezin da '%s' atzitu, ez da euskarririk sartu edo unitatea ez dago prest." -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Cannot add server to Site Manager" msgstr "Ezin zaio zerbitzaria gehitu gune-kudeatzaileari" -#: ../../locales/../src/engine/socket.cpp:1112 -msgid "Cannot assign requested address" -msgstr "Ezin da eskatutako helbidea esleitu" - -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1864,7 +1868,7 @@ "Lanpetuta dagoen bitartean ezin da fitxa itxi\n" "Utzi uneko eragiketa eta fitxa itxi?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1876,22 +1880,22 @@ msgid "Cannot create new filter" msgstr "Ezin da iragazki berria sortu" -#: ../../locales/../src/interface/edithandler.cpp:1575 -#: ../../locales/../src/interface/edithandler.cpp:1623 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1584 +#: ../../locales/../src/interface/edithandler.cpp:1632 +#: ../../locales/../src/interface/LocalListView.cpp:1741 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Cannot edit file" msgstr "Ezin da fitxategia editatu" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1622 msgid "Cannot edit file, not connected to any server." msgstr "Ezin da fitxategia editatu, ez dago zerbitzari batera ere konektatuta." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Cannot edit file, remote path unknown." msgstr "Ezin da fitxategia editatu, urruneko bide-izena ez du ezagutzen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:370 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1903,77 +1907,77 @@ msgid "Cannot load Quickconnect bar from resource file" msgstr "Ezin da konexio azkarreko barra kargatu baliabideen fitxategitik" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Cannot load key file" msgstr "Ezin da gako-fitxategia kargatu" -#: ../../locales/../src/interface/Mainfrm.cpp:1004 +#: ../../locales/../src/interface/Mainfrm.cpp:1008 msgid "Cannot load toolbar from resource file" msgstr "Ezin da tresna-barra kargatu baliabideen fitxategitik." -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:450 msgid "Cannot remember password" msgstr "Ezin da pasahitza gogoratu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1196 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214 msgid "Cannot rename entry" msgstr "Ezin da sarreraren izena aldatu" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1606 msgid "Cannot rename file" msgstr "Ezin da fitxategiaren izena aldatu" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:137 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Ezin da ebatzi IPv4 helbidearentzako ostalaria SOCKS4 proxyarekin " "erabiltzeko." -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "Cannot save filterset" msgstr "Ezin da iragazki multzoa gorde" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Cannot select filter" msgstr "Ezin da iragazkia hautatu" -#: ../../locales/../src/interface/edithandler.cpp:1473 -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../../locales/../src/interface/edithandler.cpp:1482 +#: ../../locales/../src/interface/edithandler.cpp:1486 +#: ../../locales/../src/interface/edithandler.cpp:1521 msgid "Cannot set file association" msgstr "Ezin da fitxategiaren asoziazioa ezarri" -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1083 msgid "Cannot show dialog" msgstr "Ezin da elkarrizketa-koadroa erakutsi" -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "Cannot view/edit selected file" msgstr "Ezin da hautatutako fitxategia ikusi/editatu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1762 msgid "Case insensitive" msgstr "Ez bereizi maiuskulak eta minuskulak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1761 msgid "Case insensitive (default)" msgstr "Ez bereizi maiuskula eta minuskulak (lehenetsia)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1763 msgid "Case sensitive" msgstr "Bereizi maiuskulak eta minuskulak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1764 msgid "Case sensitive (default)" msgstr "Bereizi maiuskulak eta minuskulak (lehenetsia)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1500 msgid "Categories to clear" msgstr "Kategoriak garbitzeko" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Certificate and session data are not available yet." msgstr "Ziurtagiriaren eta saioaren datuak oraindik ez daude erabilgarri." @@ -1985,6 +1989,10 @@ msgid "Certificate issuer" msgstr "Ziurtagiri-emailea" +#: ../../locales/../src/engine/tlssocket.cpp:1330 +msgid "Certificate signature verification failed" +msgstr "Ziurtagiriaren sinaduraren egiaztapenak huts egin du" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 msgid "Challenge:" msgstr "Erronka:" @@ -1993,21 +2001,21 @@ msgid "Change file attributes" msgstr "Aldatu fitxategiaren atributuak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:530 msgid "Change the file permissions." msgstr "Aldatu fitxategiaren baimenak." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2206 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Egunkari-fitxategiaren ezarpenak aldatzeko FileZilla berrabiarazi behar da." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:586 msgid "Character encoding issue" msgstr "Arazoa karaktere-kodetzean" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:527 msgid "Charset" msgstr "Karaktere-jokoa" @@ -2015,7 +2023,7 @@ msgid "Check for &updates..." msgstr "Bilatu eg&uneraketak..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2053 msgid "Check for FileZilla &updates automatically:" msgstr "Automatikoki bilatu Filezilla-ren eg&uneraketak:" @@ -2027,11 +2035,11 @@ msgid "Check for newer versions of FileZilla" msgstr "Bilatu FileZilla-ren bertsio berriak" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Check for updates failed" msgstr "Eguneraketen bilaketak huts egin du" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:828 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2039,7 +2047,7 @@ "Egiaztatu zure saio-hasierako kredentzialak. Sartutako pasahitza zuriune " "batez hasi edo bukatzen da." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:824 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2047,39 +2055,39 @@ "Egiaztatu zure saio-hasierako kredentzialak. Sartutako erabiltzaile-izena " "zuriune batez hasi edo bukatzen da." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "Checking for correct external IP address" msgstr "Kanpoko IP helbidea zuzena den egiaztatzea" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:192 msgid "Checking for updates..." msgstr "Eguneraketak bilatzen..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:754 #, c-format msgid "Checksum match on file %s\n" msgstr "Kontroleko batura zuzena %s fitxategiarentzat\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:750 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Kontroleko batura ez da zuzena %s fitxategiarentzat\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1481 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1523 msgid "Choose a key file" msgstr "Aukeratu gako-fitxategia" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1512 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1554 msgid "Choose the default local directory" msgstr "Aukeratu direktorio lokal lehenetsia" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2240 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2317 msgid "Choose the local directory" msgstr "Aukeratu direktorio lokala" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 msgid "Chunk data improperly terminated" msgstr "Blokeko datuak gaizki eten dira" @@ -2088,7 +2096,7 @@ msgstr "Zifraketa:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:628 msgid "Cl&ose tab" msgstr "I&txi fitxa" @@ -2096,46 +2104,50 @@ msgid "Classic" msgstr "Klasikoa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "Garbitu a&ntolaketaren cachea" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 +msgid "Clear auto&update data" +msgstr "Garbitu &automatikoki eguneratutako datuak" + +#: ../../locales/../src/interface/quickconnectbar.cpp:154 msgid "Clear history" msgstr "Garbitu historia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1488 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Garbitu datu pribatuak" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:153 msgid "Clear quickconnect bar" msgstr "Garbitu konexio azkarraren barra" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Egin klik Amaitu botoian konfigurazioa gordetzeko." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2076 msgid "Client to server MAC:" msgstr "Bezerotik zerbitzarirako MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2066 msgid "Client to server cipher:" msgstr "Bezerotik zerbitzarirako zifraketa:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 msgid "Close &all other tabs" msgstr "Itxi &beste fitxa guztiak" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1145 -#: ../../locales/../src/interface/Mainfrm.cpp:1166 +#: ../../locales/../src/interface/Mainfrm.cpp:1144 +#: ../../locales/../src/interface/Mainfrm.cpp:1165 msgid "Close FileZilla" msgstr "Itxi FileZilla" @@ -2147,66 +2159,65 @@ msgid "Closes current tab" msgstr "Itxi uneko fitxa" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:293 msgid "Co&mments:" msgstr "&Iruzkinak:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Zutabeen propietateak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2135 msgid "Column setup" msgstr "Zutabeen konfigurazioa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1951 msgid "Command and its arguments should be properly quoted." msgstr "Komandoa eta bere argumentuak zuzen idatzi behar dira komatxo artean." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:244 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:257 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:271 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Command failed" msgstr "Komanduak huts egin du" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Command not supported" msgstr "Komando ez onartua" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:223 msgid "Command not supported by this protocol" msgstr "Komandoa ez du onartzen protokolo honek" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:280 -#: ../../locales/../src/interface/StatusView.cpp:336 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Command:" msgstr "Komandoa:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "Iruzkina" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Common name:" msgstr "Izen arrunta:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Komunikazioa kaltetu egin du bideratzaileak edo suebakiak" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:545 msgid "Compare &modification time" msgstr "Konparatu &aldatzeko denbora" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 msgid "Compare file&size" msgstr "Konparatu &fitxategi-tamaina" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1795 msgid "Comparison &threshold (in minutes):" msgstr "Konparazio-a&talasea (minututan):" @@ -2230,7 +2241,7 @@ msgid "Compiler flags:" msgstr "Konpilazio-parametroak:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Konprimatua" @@ -2238,8 +2249,8 @@ msgid "Concurrent transfers" msgstr "Aldi bereko transferentziak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3105 msgid "Conditions are c&ase sensitive" msgstr "Baldintzek &maiuskulak eta minuskulak bereizten dituzte" @@ -2255,31 +2266,36 @@ msgid "Configure port range" msgstr "Konfiguratu ataka-zenbakien tartea" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 msgid "Configuring FileZilla and your network" msgstr "FileZilla eta zure sarea konfiguratzen" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:1192 msgid "Confirm deletion" msgstr "Konfiguratu ezabatzea" -#: ../../locales/../src/engine/local_filesys.cpp:129 -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1664 -#: ../../locales/../src/interface/RemoteListView.cpp:1394 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1596 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/RemoteListView.cpp:1413 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1042 +#: ../../locales/../src/interface/search.cpp:1148 msgid "Confirmation needed" msgstr "Berrespena behar da" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Zorionak, zure konfigurazioa badabilela dirudi." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:152 msgid "Connect bypassing proxy settings" msgstr "Konektatu proxy-ezarpenak saltatuz" +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Konexioak huts egin du: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Konektatu uneko fitxan" @@ -2292,29 +2308,25 @@ msgid "Connect to specified Site Manager site" msgstr "Konektatu zehaztutako gune-kudeatzailearen gunera" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "Konektatuta" - -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "Konektatzen" -#: ../../locales/../src/interface/netconfwizard.cpp:222 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:246 #, c-format msgid "Connecting to %s" msgstr "%s(e)ra konektatzen" -#: ../../locales/../src/engine/ControlSocket.cpp:1047 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4333 #, c-format msgid "Connecting to %s through %s proxy" msgstr "%s(e)ra %s proxy-aren bidez konektatzen" -#: ../../locales/../src/engine/ControlSocket.cpp:955 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:371 +#: ../../locales/../src/engine/ControlSocket.cpp:966 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:274 #, c-format msgid "Connecting to %s..." msgstr "%s(e)ra konektatzen..." @@ -2323,186 +2335,173 @@ msgid "Connection" msgstr "Konexioa" -#: ../../locales/../src/engine/socket.cpp:1073 -msgid "Connection aborted" -msgstr "Konexioa utzita" - -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "Konexio-saiakerak huts egin du" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:930 +#: ../../locales/../src/engine/proxy.cpp:210 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Konexio-saiakerak huts egin du \"%s\"(r)ekin, hurrengo helbidearekin " "saiatuko da." -#: ../../locales/../src/engine/ControlSocket.cpp:924 +#: ../../locales/../src/engine/ControlSocket.cpp:935 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Konexio-saiakerak huts egin du \"%s\"(r)ekin." -#: ../../locales/../src/engine/ControlSocket.cpp:183 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/engineprivate.cpp:696 msgid "Connection attempt interrupted by user" msgstr "Erabiltzaileak konexio-saiakera eten du" -#: ../../locales/../src/engine/socket.cpp:1066 -msgid "Connection attempt timed out" -msgstr "Konexio-saiakeraren denbora-muga gainditu da" - -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Konexioa itxita" -#: ../../locales/../src/engine/ControlSocket.cpp:1014 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1026 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:228 msgid "Connection closed by server" msgstr "Zerbitzariak konexioa itxi du" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:272 msgid "Connection established, initializing TLS..." msgstr "Konexioa ezarri da, TLS hasieratzen..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:297 msgid "Connection established, sending HTTP request" msgstr "Konexioa ezarri da, HTTP eskaera bidaltzen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Konexioa ezarri da, ongietorri-mezuaren zain." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:444 msgid "Connection established, waiting for welcome message..." msgstr "Konexioa ezarri da, ongietorri-mezuaren zain..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Konexioa galdu da" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Connection not allowed by ruleset" msgstr "Arau multzoak ez du konexioa onartzen" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "Connection refused" msgstr "Konexioa ukatu egin da" -#: ../../locales/../src/engine/socket.cpp:1060 -msgid "Connection refused by server" -msgstr "Zerbitzariak konexioa ukatu du" - -#: ../../locales/../src/engine/socket.cpp:1069 -msgid "Connection reset by network" -msgstr "Sareak konexioa berrezarri du" - -#: ../../locales/../src/engine/socket.cpp:1074 -msgid "Connection reset by peer" -msgstr "Pareak konexioa berrezarri du" - -#: ../../locales/../src/engine/ControlSocket.cpp:557 -#, c-format -msgid "Connection timed out after %d second of inactivity" -msgid_plural "Connection timed out after %d seconds of inactivity" -msgstr[0] "" -"Konexioaren denbora-muga agortu da aktibitaterik gabeko segundo %d(e)n " -"ondoren" -msgstr[1] "" -"Konexioaren denbora-muga agortu da aktibitaterik gabeko %d segundoren ondoren" - -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "Konexioaren denbora-muga agortu da." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:666 msgid "Connection to server lost." msgstr "Zerbitzariarekiko konexioa galdu da." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "Konexioa ezarri da proxyarekin, hasierako agurra egiten..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Zerbitzariarekiko konexioa azkarregi itxi da." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Probako zerbitzariarekiko konexioak huts egin du." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Bihurtu gako-fitxategia" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1847 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1893 #, c-format msgid "Copy (%d) of %s" msgstr "%2$s(r)en (%1$d) kopia" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1873 #, c-format msgid "Copy of %s" msgstr "%s(r)en kopia" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Kopiatu hautatutako elementuen URLak arbelean, pasahitza barne." + #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopiatu hautatutako elementuen URLak arbelean." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:182 #, c-format msgid "Could not accept connection: %s" msgstr "Ezin izan da konexioa onartu: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/engine/tlssocket.cpp:1310 +msgid "Could not add certificate to temporary trust list" +msgstr "Ezin izan da ziurtagiria gehitu aldi baterako konfiantzazko zerrendan" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Ezin izan da gune-kudeatzailearekiko konexioa gehitu" -#: ../../locales/../src/interface/state.cpp:755 +#: ../../locales/../src/interface/state.cpp:799 msgid "Could not complete operation" msgstr "Ezin izan da eragiketa burutu" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:181 msgid "Could not connect to server" msgstr "Ezin izan da zerbitzariarekin konektatu" -#: ../../locales/../src/engine/ControlSocket.cpp:1084 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Ezin izan da zerbitzariarekin konektatu: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:786 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:718 msgid "Could not convert command to server encoding" msgstr "Ezin izan da komandoa zerbitzariaren kodeketara aldatu" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:153 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:162 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Ezin izan da gako pribatua bihurtu" -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/RemoteListView.cpp:2535 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1384 msgid "Could not copy URLs" msgstr "Ezin izan dira URLak kopiatu" +#: ../../locales/../src/engine/tlssocket.cpp:1292 +msgid "Could not copy certificate" +msgstr "Ezin izan da ziurtagiria kopiatu" + #: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "Ezin izan dira datuak kopiatu" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:489 #, c-format msgid "Could not create local file %s\n" msgstr "Ezin izan da %s fitxategi lokala sortu\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Ezin izan da saio hasierako elkar-bazterketa sortu: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2193 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/RemoteListView.cpp:2201 +#: ../../locales/../src/interface/RemoteTreeView.cpp:839 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2512,11 +2511,11 @@ "Edo shell luzapena ez da ondo instalatu edo fitxategiak ez dira " "exploratzailearen leiho batean jaregin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4092 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4187 msgid "Could not establish connection to server" msgstr "Ezin izan da ezarri zerbitzariarekiko konexioa" -#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../../locales/../src/interface/FileZilla.cpp:430 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2528,11 +2527,11 @@ "FileZilla-ren datuen direktoria ezartzeko, '--datadir ' komando-" "lerro aukera erabili edo FZ_DATADIR ingurunearen aldagaia ezarri." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:722 msgid "Could not generate custom login sequence." msgstr "Ezin izan da sortu saio-hasierako sekuentzia pertsonalizatua." -#: ../../locales/../src/engine/tlssocket.cpp:930 +#: ../../locales/../src/engine/tlssocket.cpp:1075 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2540,7 +2539,7 @@ "Ezin izan da ziurtagiri-emailearen izen osatua eskuratu; " "gnutls_x509_get_issuer_dn-k huts egin du" -#: ../../locales/../src/engine/tlssocket.cpp:907 +#: ../../locales/../src/engine/tlssocket.cpp:1051 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2548,38 +2547,28 @@ "Ezin izan da ziurtagiri-gaiaren izen bereizia eskuratu; gnutls_x509_get_dn -" "k huts egin du" -#: ../../locales/../src/interface/state.cpp:900 +#: ../../locales/../src/interface/state.cpp:996 msgid "Could not get full remote path." msgstr "Ezin izan da urruneko bide-izen osoa eskuratu." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:257 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:271 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Could not get reply from fzputtygen." msgstr "Ezin izan da fzputtygen-en erantzunik eskuratu." -#: ../../locales/../src/interface/edithandler.cpp:1575 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1584 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Could not get temporary directory to download file into." msgstr "" "Ezin izan da aldi baterako direktoriorik eskuratu, fitxategia han " "deskargatzeko" -#: ../../locales/../src/engine/tlssocket.cpp:853 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Ezin izan dira parekoaren ziurtagiriak inportatu; gnutls_x509_crt_import-ek " -"huts egin du" - -#: ../../locales/../src/engine/tlssocket.cpp:848 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Ezin izan da parekoaren ziurtagirientzako egitura hasieratu; " -"gnutls_x509_crt_init-ek huts egin du" +#: ../../locales/../src/interface/FileZilla.cpp:88 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Ezin izan da Winsock hasieratu (%d): %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2590,15 +2579,21 @@ "eskuragarri dagoela.\n" "Gune-kudeatzailean egindako aldaketak ez dira gordeko." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:53 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Ezin izan da gako-fitxategia kargatu" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Ezin izan da gako pribatua kargatu" -#: ../../locales/../src/interface/state.cpp:922 +#: ../../locales/../src/interface/state.cpp:1019 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2609,7 +2604,7 @@ "lokala.\n" "Arakatze sinkronizatua desgaitu eta urruneko direktorioa aldatzen jarraitu?" -#: ../../locales/../src/interface/state.cpp:359 +#: ../../locales/../src/interface/state.cpp:368 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2620,7 +2615,7 @@ "lokala.\n" "Arakatze sinkronizatua desgaitu egin da." -#: ../../locales/../src/interface/state.cpp:265 +#: ../../locales/../src/interface/state.cpp:262 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2632,63 +2627,77 @@ "Arakatze sinkronizatua desgaitu egin da." #: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/RemoteListView.cpp:2535 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1384 msgid "Could not open clipboard" msgstr "Ezin izan da arbela ireki" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:177 -#: ../../locales/../src/engine/logging.cpp:208 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:237 +#: ../../locales/../src/engine/logging.cpp:277 +#: ../../locales/../src/engine/logging.cpp:303 #, c-format msgid "Could not open log file: %s" msgstr "Ezin izan da egunkari-fitxategia ireki: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Ezin izan da urruneko bide-izena analizatu." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:81 msgid "Could not parse server address:" msgstr "Ezin izan da zerbitzariaren helbidea analizatu:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:994 +msgid "Could not read from data socket." +msgstr "Ezin izan da datuen socket-ean irakurri." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 #, c-format msgid "Could not read from socket: %s" msgstr "Ezin izan da socket-ean irakurri: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:553 msgid "Could not read server item." msgstr "Ezin izan da zerbitzariko elementua irakurri." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2592 +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Ezin izan dira datuak jaso zerbitzaritik" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2694 #, c-format msgid "Could not seek to offset %s within file" msgstr "Ezin izan da %s(r)en posizioa bilatu fitxategian" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2603 msgid "Could not seek to the end of the file" msgstr "Ezin izan da bilatu fitxategiaren amaiera arte" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:244 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Ezin izan da komandoa bidali fzputtygen-era." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2620 +#: ../../locales/../src/engine/tlssocket.cpp:1261 +msgid "Could not sort peer certificates" +msgstr "Ezin izan dira parekoaren ziurtagiriak ordenatu" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2724 msgid "Could not spawn IO thread" msgstr "Ezin izan da sarrera/irteera haria sortu" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Ezin izan da hasierako agurra egin proxyarekin: %s" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "Ezin izan da transferentzia hasi" -#: ../../locales/../src/interface/sitemanager.cpp:608 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:827 +#: ../../locales/../src/interface/sitemanager.cpp:630 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:826 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2697,18 +2706,18 @@ "Ezin izan da \"%s\" idatzi; gune-kudeatzailean egindako aldaketak ezin izan " "dira gorde: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Ezin izan da \"%s\" idatzi; ezin izan da laster-marka gehitu: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Ezin izan da \"%s\" idatzi; ezin izan dira laster-marka orokorrak gorde: %s" -#: ../../locales/../src/interface/QueueView.cpp:1858 +#: ../../locales/../src/interface/QueueView.cpp:1542 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2717,41 +2726,41 @@ "Ezin izan da \"%s\" idatzi; ezin izan da ilara gorde.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:718 -#: ../../locales/../src/interface/sitemanager.cpp:772 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2221 +#: ../../locales/../src/interface/sitemanager.cpp:750 +#: ../../locales/../src/interface/sitemanager.cpp:807 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2295 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Ezin izan da \"%s\" idatzi; hautatutako guneak ezin izan dira esportatu: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:140 #, c-format msgid "Could not write \"%s\":" msgstr "Ezin izan da idatzi \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:162 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Ezin izan da gako-fitxategia idatzi: %s" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "Ezin izan da idatzi fitxategi lokalean" -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/engine/logging.cpp:280 +#: ../../locales/../src/engine/logging.cpp:250 +#: ../../locales/../src/engine/logging.cpp:320 #, c-format msgid "Could not write to log file: %s" msgstr "Ezin izan da idatzi egunkari-fitxategian: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:880 -#: ../../locales/../src/engine/ControlSocket.cpp:983 +#: ../../locales/../src/engine/ControlSocket.cpp:890 +#: ../../locales/../src/engine/ControlSocket.cpp:994 #, c-format msgid "Could not write to socket: %s" msgstr "Ezin izan da socket-ean idatzi: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Country:" msgstr "Herrialdea:" @@ -2759,17 +2768,25 @@ msgid "Crea&te new file" msgstr "Sor&tu fitxategi berria" +#: ../../locales/../src/interface/state.cpp:1034 +msgid "Create &missing local directory and enter it" +msgstr "Sortu &falta den direktorio lokala eta hara joan" + +#: ../../locales/../src/interface/state.cpp:959 +msgid "Create &missing remote directory and enter it" +msgstr "Sortu &falta den urruneko direktorioa eta hara joan" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:573 msgid "Create a new subdirectory in the current directory" msgstr "Sortu azpidirektorio berria uneko direktorioan" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:509 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Sortu azpidirektorio berria uneko direktorioan eta hara joan" @@ -2779,50 +2796,50 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:268 #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Create director&y and enter it" msgstr "Sortu direktor&io berria eta hara joan" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1311 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1224 msgid "Create directory" msgstr "Sortu direktorioa" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2621 msgid "Create empty file" msgstr "Sortu fitxategi hutsa" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "Direktorioa sortzen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3167 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1926 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3217 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1828 #, c-format msgid "Creating directory '%s'..." msgstr "'%s' direktorioa sortzen..." -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:173 msgid "Critical error" msgstr "Errore larria" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:164 msgid "Critical error:" msgstr "Errore larria:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:124 msgid "Critical file transfer error" msgstr "Fitxategia transferitzean errore larria" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:104 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Fitxategia transferitzean errore larria %s %s(e)ra transferitu ondoren" -#: ../../locales/../src/interface/state.cpp:350 +#: ../../locales/../src/interface/state.cpp:359 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2831,54 +2848,58 @@ "Uneko urruneko direktorioa (%s) ez dago sinkronizazio-erroaren azpian (%s)\n" "Arakatze sinkronizatua desgaitu egin da." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:400 msgid "Current transfer type is set to ASCII." msgstr "Uneko transferentzia mota ASCII da." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:408 msgid "Current transfer type is set to automatic detection." msgstr "Uneko transferentzia mota detekzio automatikoa da." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:404 msgid "Current transfer type is set to binary." msgstr "Uneko transferentzia mota bitarra da." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2020 msgid "Curve:" msgstr "Kurba:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1567 msgid "Cus&tom" msgstr "Per&tsonalizatu" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:92 msgid "Custom filter set" msgstr "Pertsonalizatu iragazki multzoa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2402 msgid "Custom server" msgstr "Pertsonalizatu zerbitzaria" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2522 msgid "D&ata type" msgstr "D&atu mota" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1637 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "&Aurrizki hamartarrak, SI sinboloak erabiliz (adib. 1KB = 1000 byte)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:471 msgid "D&efault" msgstr "&Lehenetsia" #: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:619 msgid "D&elete" msgstr "&Ezabatu" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2718 +msgid "D&irectory comparison" +msgstr "D&irektorioen konparazioa" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "De&sgaitu dena" @@ -2887,37 +2908,33 @@ msgid "D&o not save passwords" msgstr "E&z gorde pasahitzak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "D&ouble-click action on directories:" msgstr "Direktori&oetan klik bikoitza eginez gero:" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2856 msgid "D&uplicate" msgstr "&Bikoiztu" -#: ../../locales/../src/engine/server.cpp:34 -msgid "DOS-like with virtual paths" -msgstr "Bide-izen birtualekin DOS sistemaren eran" - -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/edithandler.cpp:1636 msgid "Dangerous filetype" msgstr "Fitxategi mota arriskutsua" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "Datuak" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." msgstr "Datuen socket-a behar baino lehenago itxi da." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Data" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 msgid "Date formatting" msgstr "Data-formatua" @@ -2933,33 +2950,29 @@ msgid "Debug" msgstr "Araztu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 msgid "Debugging settings" msgstr "Ezarpenak arazten" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:351 msgid "Default &local directory:" msgstr "Direktorio &lokal lehenetsia:" -#: ../../locales/../src/engine/server.cpp:26 -msgid "Default (Autodetect)" -msgstr "Lehenetsia (Automatikoki detektatu)" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." msgstr "Editore lehenetsia ez da zuzen jarri komatxo artean." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1450 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "Ekintza lehenetsia fitxategia badagoenean" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 msgid "Default r&emote directory:" msgstr "Urrun&eko direktorio lehenetsia:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2967,7 +2980,7 @@ "Urruneko bide-izen lehenetsia ezin da analizatu. Ziurtatu bide-izen " "absolutua baliozkoa dela hautatutako zerbitzari motarentzat." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Sistemaren hizkuntza lehenetsia" @@ -2991,25 +3004,12 @@ "Huts egindako konexio-saiakeren arteko denbora-tarteak 1 eta 999 segundo " "bitartean egon behar du." -#: ../../locales/../src/engine/engineprivate.cpp:522 -#, c-format -msgid "" -"Delaying connection for %d second due to previously failed connection " -"attempt..." -msgid_plural "" -"Delaying connection for %d seconds due to previously failed connection " -"attempt..." -msgstr[0] "" -"Konexioa %d segundo atzeratzen aurreko konexio-saiakerak huts egin duelako..." -msgstr[1] "" -"Konexioa %d segundo atzeratzen aurreko konexio-saiakerak huts egin duelako..." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1229 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1247 msgid "Delete Site Manager entry" msgstr "Ezabatu gune-kudeatzailearen sarrera" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:582 msgid "Delete selected directory" msgstr "Ezabatu hautatutako direktorioa" @@ -3018,31 +3018,21 @@ msgid "Delete selected files and directories" msgstr "Ezabatu hautatutako fitxategi eta direktorioak" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:376 #, c-format msgid "Deleting \"%s\"" msgstr "\"%s\" ezabatzen" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:379 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "%u fitxategi ezabatzen \"%s\"(e)tik" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Direktorioak ezabatzen" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" -"Oraindik ez da onartzen erlaziorik gabeko direktorio bat baino gehiago " -"ezabatzea" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 msgid "Deleting symbolic link" msgstr "Esteka sinbolikoa ezabatzen" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:968 msgid "Desktop" msgstr "Mahaigaina" @@ -3055,34 +3045,34 @@ msgid "Details for new key:" msgstr "Gako berrirako xehetasunak:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:756 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:755 msgid "Detected newer version of FileZilla" msgstr "FileZilla-ren bertsio berriagoa detektatu da" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Dire&ctories" msgstr "Dire&ktorioak" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Direction" msgstr "Norabidea" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "Direktorioa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2776 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:463 -#: ../../locales/../src/interface/Mainfrm.cpp:2221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2797 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1781 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:395 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:77 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2220 msgid "Directory comparison" msgstr "Direktorioen konparazioa" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Direktorioen konparazioak huts egin du" @@ -3092,11 +3082,15 @@ "Egunkari-fitxategia daukan direktorioa ez dago edo fitxategi-izena " "baliogabea da." -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +msgid "Directory listing &filters..." +msgstr "Direktorio-zerrenden iragazkiak..." + +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Directory listing aborted by user" msgstr "Erabiltzaileak direktorio-zerrenda abortatu du" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2037 msgid "Directory listing failed" msgstr "Direktorio-zerrendak huts egin du" @@ -3104,12 +3098,12 @@ msgid "Directory listing filters" msgstr "Direktorio-zerrenden iragazkiak" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:196 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "\"%s\"(r)en direktorio-zerrenda ondo egin da" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Directory listing successful" msgstr "Direktorio-zerrenda ondo egin da" @@ -3117,7 +3111,7 @@ msgid "Disa&ble all" msgstr "Des&gaitu dena" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1027 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" @@ -3130,32 +3124,32 @@ msgstr "" "Desgaitu berriro aukera hau ezin badituzu direktorioaren edukiak zuzen ikusi." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 msgid "Disconnect from server" msgstr "Deskonektatu zerbitzaritik" -#: ../../locales/../src/engine/ControlSocket.cpp:79 -#: ../../locales/../src/engine/ControlSocket.cpp:881 -#: ../../locales/../src/engine/ControlSocket.cpp:985 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:879 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:881 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/engine/ControlSocket.cpp:64 +#: ../../locales/../src/engine/ControlSocket.cpp:891 +#: ../../locales/../src/engine/ControlSocket.cpp:996 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:859 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" msgstr "Zerbitzaritik deskonektatuta" -#: ../../locales/../src/engine/ControlSocket.cpp:1016 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 +#: ../../locales/../src/engine/ControlSocket.cpp:1028 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:874 #, c-format msgid "Disconnected from server: %s" msgstr "Zerbitzaritik deskonektatuta: %s" -#: ../../locales/../src/interface/queue.cpp:380 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:240 msgid "Disconnecting from previous server" msgstr "Aurreko zerbitzaritik deskonektatzen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:59 msgid "Disconnects from the currently visible server" msgstr "Unean ikusgai dagoen zerbitzaritik deskonektatzen da" @@ -3163,54 +3157,50 @@ msgid "Display about dialog" msgstr "'Honi buruz' elkarrizketa-koadroa erakutsi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Do ¬ use default editor" msgstr "E&z erabili editore lehenetsia" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Ez e&gin ezer" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1830 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "Do the same with &all selected files already being edited" msgstr "" "Egin berdina editatuak izaten ari diren hautatutako fitxategi &guztiekin" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 -#: ../../locales/../src/interface/Mainfrm.cpp:1170 +#: ../../locales/../src/interface/Mainfrm.cpp:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1169 msgid "Do you really want to close FileZilla?" msgstr "Benetan itxi nahi duzu FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Benetan ezabatu nahi dituzu gune-kudeatzailearen sarrera guztiak eta " "transferentzia ilara?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Benetan ezabatu nahi dituzu gune-kudeatzailearen sarrera guztiak?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1249 msgid "Do you really want to delete selected entry?" msgstr "Benetan ezabatu nahi duzu hautatutako sarrera?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Benetan ezabatu nahi duzu transferentzia ilara?" -#: ../../locales/../src/interface/Mainfrm.cpp:599 +#: ../../locales/../src/interface/Mainfrm.cpp:588 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Benetan bidali nahi duzu '%s' zerbitzarira?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 msgid "Do you want to reopen this file?" msgstr "Fitxategi hau berriz ireki nahi duzu?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3540 msgid "Documentation" msgstr "Dokumentazioa" @@ -3224,35 +3214,35 @@ "Dotfile-ak puntu batez hasten den izena duten fitxategiak dira, adibidez ." "htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1819 msgid "Double-click action" msgstr "Klik bikoitza egitea" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2231 msgid "Download" msgstr "Deskargatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3710 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "De&skargaren muga:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:588 #, c-format msgid "Download limit: %s/s" msgstr "Deskargaren muga: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:591 msgid "Download limit: none" msgstr "Deskargaren muga: bat ere ez" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3103 -#: ../../locales/../src/interface/search.cpp:518 -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 +#: ../../locales/../src/interface/search.cpp:859 +#: ../../locales/../src/interface/search.cpp:864 msgid "Download search results" msgstr "Deskargatu bilaketaren emaitzak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "Download selected directory" msgstr "Deskargatu hautatutako direktorioa" @@ -3260,7 +3250,7 @@ msgid "Download selected files and directories" msgstr "Deskargatu hautatutako fitxategi eta direktorioak" -#: ../../locales/../src/interface/Mainfrm.cpp:976 +#: ../../locales/../src/interface/Mainfrm.cpp:980 #, c-format msgid "" "Download speed: %s/s\n" @@ -3269,34 +3259,24 @@ "Deskargatzeko abiadura: %s/s\n" "Kargatzeko abiadura: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1100 +#: ../../locales/../src/interface/edithandler.cpp:1109 msgid "Downloading" msgstr "Deskargatzen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:315 #, c-format msgid "Downloading %s" msgstr "%s deskargatzen" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" -"Oraindik ez da onartzen erlaziorik gabeko direktorio bat baino gehiago " -"deskargatzea" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Bilaketaren emaitzak deskargatzen" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Eguneraketa deskargatzen..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:109 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:114 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:109 +#: ../../locales/../src/interface/RemoteTreeView.cpp:94 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3304,11 +3284,11 @@ "FileZilla-ren zenbait instantzien arteko 'Arrastatu eta jaregin' ekintza " "oraindik ez da ezarri." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:115 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:118 +#: ../../locales/../src/interface/LocalTreeView.cpp:120 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:100 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Zenbait zerbitzariren arteko 'Arrastatu eta jaregin' ekintza oraindik ez da " @@ -3335,21 +3315,21 @@ msgid "E&xit" msgstr "&Irten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 msgid "E&xport..." msgstr "&Esportatu..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "E-Mail:" msgstr "Posta elektronikoa:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:487 msgid "Each filter needs at least one condition." msgstr "Iragazki bakoitzak baldintza bat behar du gutxienez." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1376 msgid "Edit filters" msgstr "Editatu iragazkiak" @@ -3360,16 +3340,16 @@ "Editatu fitxategia konfiguratutako editorearekin eta kargatu aldaketak " "zerbitzarira." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1124 msgid "Editing directories is not supported" msgstr "Ez dago direktorioak editatzeko euskarririk" -#: ../../locales/../src/interface/LocalListView.cpp:1582 -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Editing failed" msgstr "Edizioak huts egin du" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1124 msgid "Editing search results" msgstr "Bilaketaren emaitzak editatzen" @@ -3377,7 +3357,7 @@ msgid "Email:" msgstr "Posta elektronikoa:" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "Empty command" msgstr "Komandoa hutsik dago" @@ -3385,7 +3365,7 @@ msgid "Empty command." msgstr "Komandoa hutsik dago." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2039 msgid "Empty directory listing" msgstr "Direktorio-zerrenda hutsik dago" @@ -3397,13 +3377,13 @@ msgid "Empty file extension." msgstr "Fitxategiaren luzapena hutsik dago." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Iragazki-izen hutsak ez dira onartzen." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Izena hutsik dago" @@ -3419,19 +3399,19 @@ msgid "Enable invalid character &filtering" msgstr "Gaitu karaktere baliogabeak &iragaztea" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Enkriptatua" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2059 msgid "Encryption" msgstr "Enkriptatzea" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1995 msgid "Encryption details" msgstr "Enkriptatzearen xehetasunak" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "Konparazioa amaitu eta ordenatzeko hurrenkera aldatu?" @@ -3439,33 +3419,33 @@ msgid "Enter &custom command..." msgstr "Sartu komando &pertsonalizatua..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3751 msgid "Enter 0 for unlimited speed." msgstr "Sartu 0 abiadura mugagabea adierazteko." -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1825 msgid "Enter command" msgstr "Sartu komandoa" -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Sartu komando pertsonalizatua" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1852 msgid "Enter directory" msgstr "Sartu direktorioa" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Sartu iragazki-izena" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Enter name for filterset" msgstr "Sartu iragazki multzoaren izena" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:274 msgid "Enter new name for filterset" msgstr "Sartu iragazki multzoaren izen berria" @@ -3507,14 +3487,14 @@ "- ftps:// TLS bidezko FTPetarako (inplizitua)\n" "- ftpes:// TLS bidezko FTPetarako (esplizitua)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:114 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" "Sartu '%s' fitxategiarentzako pasahitza.\n" -"Kontuan izan bihurtutako fitxategiak ez duela pasahitzaren babesa izango." +"Bihurtutako fitxategia pasahitza berarekin babestuko da." #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" @@ -3524,80 +3504,83 @@ "Adierazi zer ataka entzuten duen zerbitzariak.\n" "FTPrako lehenetsia 21 da eta SFTPrako 22 da." -#: ../../locales/../src/interface/loginmanager.cpp:66 +#: ../../locales/../src/interface/loginmanager.cpp:73 +msgid "Enter username" +msgstr "Sartu erabiltzaile-izena" + +#: ../../locales/../src/interface/loginmanager.cpp:80 msgid "Enter username and password" msgstr "Sartu erabiltzaile-izena eta pasahitza" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Errorea ezarpenak esportatzean" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Errorea inportatzean" -#: ../../locales/../src/interface/QueueView.cpp:1920 +#: ../../locales/../src/interface/QueueView.cpp:1616 msgid "Error loading queue" msgstr "Errorea ilara kargatzean" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:213 -#: ../../locales/../src/interface/filter.cpp:970 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1841 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:434 -#: ../../locales/../src/interface/sitemanager.cpp:515 -#: ../../locales/../src/interface/sitemanager.cpp:565 -#: ../../locales/../src/interface/sitemanager.cpp:664 -#: ../../locales/../src/interface/sitemanager.cpp:741 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:749 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:807 -#: ../../locales/../src/interface/wrapengine.cpp:938 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:864 +#: ../../locales/../src/interface/filter.cpp:956 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:245 +#: ../../locales/../src/interface/QueueView.cpp:1525 +#: ../../locales/../src/interface/search.cpp:1252 +#: ../../locales/../src/interface/search.cpp:1271 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:522 +#: ../../locales/../src/interface/sitemanager.cpp:582 +#: ../../locales/../src/interface/sitemanager.cpp:686 +#: ../../locales/../src/interface/sitemanager.cpp:774 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:748 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:806 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "Errorea xml fitxategia kargatzean" -#: ../../locales/../src/interface/QueueView.cpp:1830 +#: ../../locales/../src/interface/QueueView.cpp:1514 msgid "Error saving queue" msgstr "Errorea ilara gordetzean" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:197 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "Error starting program" msgstr "Errorea programa hastean" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1859 -#: ../../locales/../src/interface/sitemanager.cpp:609 -#: ../../locales/../src/interface/sitemanager.cpp:719 -#: ../../locales/../src/interface/sitemanager.cpp:773 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:828 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2222 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1543 +#: ../../locales/../src/interface/sitemanager.cpp:631 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:827 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2296 +#: ../../locales/../src/interface/xmlfunctions.cpp:141 msgid "Error writing xml file" msgstr "Errorea xml fitxategia idaztean" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:278 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:342 msgid "Error:" msgstr "Errorea:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2024 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Adibidez: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1674 msgid "Examples" msgstr "Adibideak" @@ -3605,7 +3588,7 @@ msgid "Exe&cute" msgstr "Exe&kutatu" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Exekutagarriak ez dauka bertsioaren informaziorik, ezin ditu eguneraketak " @@ -3615,15 +3598,19 @@ msgid "Explorer" msgstr "Esploratzailea" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 +msgid "Export &Filters" +msgstr "Esportatu &iragazkiak" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1585 msgid "Export &Queue" msgstr "Esportatu &ilara" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1580 msgid "Export &Settings" msgstr "Esportatu &ezarpenak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1561 msgid "Export settings" msgstr "Esportatu ezarpenak" @@ -3635,20 +3622,11 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:502 msgid "FTP - File Transfer Protocol" msgstr "FTP - Fitxategiak Transferitzeko Protokoloa" -#: ../../locales/../src/engine/server.cpp:15 -msgid "FTP - File Transfer Protocol with optional encryption" -msgstr "FTP - Fitxategiak Transferitzeko Protokoloa, enkriptatzeko aukerarekin" - -#: ../../locales/../src/engine/server.cpp:21 -msgid "FTP - Insecure File Transfer Protocol" -msgstr "FTP - Fitxategiak Transferitzeko Protokolo ez-segurua" - #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 msgid "FTP Engine not initialized, can't connect" msgstr "FTP motorra ez da hasieratu, ezin da konektatu" @@ -3673,148 +3651,147 @@ "FTPk bigarren mailako konexioak erabiltzen ditu datuak transferitzeko. " "Konexio gehigarriok bi eratara ezar daitezke." -#: ../../locales/../src/engine/server.cpp:20 -msgid "FTPES - FTP over explicit TLS" -msgstr "FTPES - FTP TLS esplizituaren gainean" - -#: ../../locales/../src/engine/server.cpp:19 -msgid "FTPS - FTP over implicit TLS" -msgstr "FTPS - FTP TLS inplizituaren gainean" - -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1778 -#: ../../locales/../src/interface/LocalTreeView.cpp:846 -#: ../../locales/../src/interface/LocalTreeView.cpp:1099 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:540 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:914 +#: ../../locales/../src/interface/LocalListView.cpp:1825 +#: ../../locales/../src/interface/LocalTreeView.cpp:857 +#: ../../locales/../src/interface/LocalTreeView.cpp:1132 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Ezin izan da direktorioa aldatu" -#: ../../locales/../src/interface/FileZilla.cpp:137 -#: ../../locales/../src/interface/FileZilla.cpp:152 -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:138 +#: ../../locales/../src/interface/FileZilla.cpp:153 +#: ../../locales/../src/interface/FileZilla.cpp:155 msgid "Failed to change language" msgstr "Ezin izan da hizkuntza aldatu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2028 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 +msgid "Failed to convert command to 8 bit charset" +msgstr "Ezin izan da komandoa 8 biteko karaktere-jokora aldatu" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2079 msgid "Failed to copy or move sites" msgstr "Ezin izan dira guneak kopiatu edo mugitu" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:319 msgid "Failed to create backup copy of xml file" msgstr "Ezin izan da xml fitxategiaren babeskopia sortu" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../locales/../src/interface/netconfwizard.cpp:808 msgid "Failed to create listen socket, aborting" msgstr "Ezin izan da entzuteko socket-a sortu; abortatzen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4071 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4075 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4167 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4171 msgid "Failed to create listening socket for active mode transfer" msgstr "Ezin izan da enzuteko socket-a sortu modu aktiboko transferentziarako" -#: ../../locales/../src/interface/LocalTreeView.cpp:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:633 msgid "Failed to get 'My Documents' path" msgstr "Ezin izan da 'Nire dokumentuak\" bide-izena eskuratu" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get desktop path" msgstr "Ezin izan da mahaigainaren bide-izena eskuratu" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Ezin izan da kontrol-konexiorako parekoaren helbidea eskuratu; konexioa itxi " "da." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Ezin izan da datu-konexiorako parekoaren helbidea eskuratu; konexioa itxi da." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "Ezin izan da FTP motorra hasieratu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:798 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:279 msgid "Failed to initialize TLS." msgstr "Ezin izan da TLS hasieratu." +#: ../../locales/../src/interface/FileZilla.cpp:89 +msgid "Failed to initialize networking" +msgstr "Ezin izan da sarea hasieratu" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "" "Ezin izan dira panelak kargatu; baliabide-fitxategiak baliogabeak dira?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Ezin izan da gako pribatua kargatu:%s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Ezin izan da \"%s\" ireki eransteko/idazteko" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2657 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Ezin izan da \"%s\" ireki irakurtzeko" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2625 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:997 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Ezin izan da \"%s\" ireki idazteko" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:352 msgid "Failed to parse returned path." msgstr "Ezin izan da itzulitako bide-izena analizatu." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "Ezin izan dira datuak jaso" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:189 msgid "Failed to retrieve directory listing" msgstr "Ezin izan da direktorio-zerrenda berreskuratu" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../locales/../src/interface/netconfwizard.cpp:737 msgid "Failed to retrieve external ip address, aborting" msgstr "Ezin izan da kanpoko IP helbidea berreskuratu; abortatzen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3782 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3849 msgid "Failed to retrieve external ip address, using local address" msgstr "" "Ezin izan da kanpoko IP helbidea berreskuratu; helbide lokala erabiltzen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3803 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868 msgid "Failed to retrieve local ip address." msgstr "Ezin izan da IP helbide lokala berreskuratu." -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../locales/../src/interface/netconfwizard.cpp:712 msgid "Failed to retrieve local ip address. Aborting" msgstr "Ezin izan da IP helbide lokala berreskuratu. Abortatzen" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Ezin izan da kanpoko IP helbidea berreskuratu." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Ezin izan da komandoa bidali." -#: ../../locales/../src/interface/FileZilla.cpp:152 +#: ../../locales/../src/interface/FileZilla.cpp:153 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Ezin izan da aldatu hizkuntza %s(e)ra (%s); sistemaren hizkuntza lehenetsia " "erabiltzen" -#: ../../locales/../src/interface/FileZilla.cpp:130 +#: ../../locales/../src/interface/FileZilla.cpp:131 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3822,49 +3799,48 @@ "Ezin izan da aldatu hizkuntza %s(e)ra (%s); sistemaren hizkuntza lehenetsia " "erabiltzen (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:119 +#: ../../locales/../src/interface/FileZilla.cpp:120 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Ezin izan da aldatu hizkuntza %s(e)ra (%s); sistemaren hizkuntza lehenetsia " "erabiltzen." -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:155 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Ezin izan da aldatu hizkuntza %s(e)ra; sistemaren hizkuntza lehenetsia " "erabiltze" -#: ../../locales/../src/interface/FileZilla.cpp:126 +#: ../../locales/../src/interface/FileZilla.cpp:127 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Ezin izan da aldatu hizkuntza %s(e)ra; sistemaren hizkuntza lehenetsia " "erabiltzen (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:116 +#: ../../locales/../src/interface/FileZilla.cpp:117 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Ezin izan da aldatu hizkuntza %s(e)ra; sistemaren hizkuntza lehenetsia " "erabiltzen." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:214 msgid "Failed to validate settings" msgstr "Ezin izan dira ezarpenak balidatu" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1320 msgid "Failed to verify peer certificate" msgstr "Ezin izan da parekoaren ziurtagiria egiaztatu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:508 #, c-format msgid "Failed to write to file %s" msgstr "Ezin izan da idatzi %s fitxategian" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:332 msgid "Failed to write xml file" msgstr "Ezin izan da idatzi xml fitxategian" @@ -3876,15 +3852,15 @@ msgid "Fall back to active mode" msgstr "Itzuli modu aktibora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2310 msgid "Fil&e:" msgstr "Fit&xategia:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1332 msgid "Fil&es" msgstr "Fit&xategiak:" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "Fitxategia" @@ -3892,11 +3868,7 @@ msgid "File Types" msgstr "Fixategi motak" -#: ../../locales/../src/engine/socket.cpp:1065 -msgid "File descriptor not a socket" -msgstr "Fitxategi-deskribatzailea ez da socket bat" - -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Fitxategiak ez dauka inportatu daitekeen daturik." @@ -3904,7 +3876,7 @@ msgid "File editing" msgstr "Fitxategien edizioa" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1620 msgid "File exists" msgstr "Fitxategia badago" @@ -3912,7 +3884,7 @@ msgid "File exists action" msgstr "Ekintza fitxategia badagoenean" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1683 msgid "File has changed" msgstr "Fitxategia aldatu egin da" @@ -3920,65 +3892,67 @@ msgid "File lists" msgstr "Fitxategi-zerrendak" -#: ../../locales/../src/interface/edithandler.cpp:1551 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/edithandler.cpp:1560 +#: ../../locales/../src/interface/FileZilla.cpp:608 +#: ../../locales/../src/interface/FileZilla.cpp:693 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Fitxategia ez da aurkitu" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3148 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:88 +#: ../../locales/../src/interface/search.cpp:681 +#: ../../locales/../src/interface/search.cpp:686 msgid "File search" msgstr "Fitxategi-bilaketa" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:113 msgid "File transfer aborted by user" msgstr "Erabiltzaileak fitxategi-transferentzia abortatu du" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:101 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "Erabiltzaileak fitxategi-transferentzia abortatu du %s %s(e)ra transferitu " "ondoren" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer failed" msgstr "Fitxategi-transferentziak huts egin du" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:107 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Fitxategi-transferentziak huts egin du %s %s(e)ra transferitu ondoren" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:120 msgid "File transfer skipped" msgstr "Fitxategi-transferentzia saltatu egin da" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:117 msgid "File transfer successful" msgstr "Fitxategi-transferentzia ondo egin da" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:98 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Fitxategi-transferentzia ondo egin da; %s %s(e)ra transferitu da" -#: ../../locales/../src/interface/Mainfrm.cpp:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1146 msgid "File transfers still in progress." msgstr "Fitxategi-transferentziak egiten ari dira oraindik." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2541 msgid "File would transfer with ASCII data type." msgstr "ASCII datu gisa transferituko da fitxategia." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2546 msgid "File would transfer with binary data type." msgstr "Datu bitar gisa transferituko da fitxategia." -#: ../../locales/../src/interface/FileZilla.cpp:407 +#: ../../locales/../src/interface/FileZilla.cpp:431 #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 msgid "FileZilla Error" msgstr "FileZilla-ren errorea" @@ -3990,16 +3964,16 @@ "Orain FileZIlla-k zure konfigurazioa probatu dezake, behar bezala " "konfiguratuta dagoela ziurtatzeko." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3478 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3632 msgid "FileZilla is already connected to a server." msgstr "FileZilla zerbitzarira konektatuta dago lehendik." -#: ../../locales/../src/interface/Mainfrm.cpp:1477 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "Hizkuntza aldaketa indarrean sartzeko, FileZilla berrabiarazi behar da." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2112 msgid "FileZilla updates" msgstr "FileZilla-ren eguneraketak" @@ -4007,58 +3981,54 @@ msgid "Filelist status &bars" msgstr "Fitxategi-zerrenden egoera-&barrak" -#: ../../locales/../src/interface/edithandler.cpp:1085 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1094 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:286 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:150 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "Fitxategi-izena" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Fitxategi-izenen &iragazkiak..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2971 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2168 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3017 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2072 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "Ezin da fitxategi-izenik osatu %s direktorio eta %s fitxategi-izenerako" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1606 msgid "Filename invalid" msgstr "Fitxategi-izen baliogabea" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "Filename unchanged" msgstr "Fitxategi-izena ez da aldatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1700 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2144 msgid "Filename:" msgstr "Fitxategi-izena:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Fitxategi-izenek ezin dituzte honako karaktereak eduki: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "Fitxategi-izenek ezin dituzte honako karaktereak eduki: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 msgid "Files currently being edited" msgstr "Unean editatzen ari diren fitxategiak" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:152 msgid "Filesize" msgstr "Fitxategi-tamaina" @@ -4066,18 +4036,18 @@ msgid "Filesize format" msgstr "Fitxategi-tamainaren formatua" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:153 msgid "Filetype" msgstr "Fitxategi mota" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2036 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Fitxategi moten asoziazioak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1325 msgid "Filter applies to:" msgstr "Iragazkia honi aplikatu:" @@ -4086,9 +4056,9 @@ msgstr "Iragazi fitxategi-izenen karaktere baliogabeak" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Iragazki-izena lehendik badago" @@ -4104,26 +4074,30 @@ msgid "Filter out items matching none of the following" msgstr "Iragazi baldintza hauetako bakar bat ere betetzen ez duten elementuak" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 +msgid "Filter out items matching not all of the following" +msgstr "Iragazi baldintza hauek guztiak betetzen ez dituzten elementuak" + +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Filter set already exists" msgstr "Iragazki-multzoa lehendik badago" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:69 msgid "Filter the directory listings" msgstr "Iragazi direktorio-zerrendak" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Iragazkiaren balidazioak huts egin du" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 msgid "Find &files" msgstr "Bilatu &fitxategiak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 msgid "Find d&irectories" msgstr "Bilatu d&irektorioak" @@ -4140,7 +4114,7 @@ msgid "Fingerprint:" msgstr "Hatz-marka:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Suebakia eta bideratzailea konfiguratzeko morroia" @@ -4157,7 +4131,7 @@ msgstr "" "Fidagarritasuna handitzeko, gutxienez 10 ataka-zenbakiko tartea zehaztu." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:244 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4165,7 +4139,7 @@ "Saio honetan ezarpen lehenetsiak erabiliko dira. Ezarpenei egindako " "aldaketak ez dira gordeko." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Force &UTF-8" msgstr "Behartu &UTF-8" @@ -4181,19 +4155,19 @@ msgid "Format specifications:" msgstr "Formatu-zehaztapenak:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2019 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Formatua: luzapenaren ondoren komandoa eta bere argumentuak, komatxo artean " "ondo idatzita." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:646 +#: ../../locales/../src/interface/updater.cpp:686 #, c-format msgid "Found new %s %s\n" msgstr "%s %s berria aurkitu da\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3564 msgid "Further documentation" msgstr "Dokumentazio gehiago" @@ -4201,7 +4175,7 @@ msgid "General" msgstr "Orokorra" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:476 msgid "General SOCKS server failure" msgstr "SOCKS zerbitzariaren hutsegite orokorra" @@ -4214,35 +4188,35 @@ msgid "Get external IP address from the following URL:" msgstr "Eskuratu kanpoko IP helbidea URL honetan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3503 msgid "Getting help" msgstr "Laguntza lortzen" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Iragazki multzoaren izena lehendik badago; gainidatzi?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Laster-marka orokorrak" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:319 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS errorea %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:322 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS errorea %d %s(e)n" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:314 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS errorea %d %s(e)n: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:311 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS errorea %d: %s" @@ -4255,34 +4229,30 @@ msgid "Group permissions" msgstr "Taldeko baimenak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "Hand&ia" -#: ../../locales/../src/engine/server.cpp:18 -msgid "HTTPS - HTTP over TLS" -msgstr "HTTPS - HTTP TLS bidez" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2030 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Ezkutukoa" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:870 -#: ../../locales/../src/interface/queue.cpp:957 +#: ../../locales/../src/interface/queue.cpp:888 +#: ../../locales/../src/interface/queue.cpp:944 msgid "High" msgstr "Handia" -#: ../../locales/../src/interface/queue.cpp:872 -#: ../../locales/../src/interface/queue.cpp:959 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Highest" msgstr "Handiena" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "" "Ataka-zenbaki erabilgarri handienak 1024 eta 65535 bitartean egon behar du." @@ -4298,11 +4268,7 @@ msgid "Homepage:" msgstr "Hasierako orria:" -#: ../../locales/../src/engine/socket.cpp:1076 -msgid "Host is down" -msgstr "Ostalaria erorita dago" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2040 msgid "Host key fingerprint:" msgstr "Ostalari-gakoaren hatz-marka:" @@ -4310,11 +4276,11 @@ msgid "Host key mismatch" msgstr "Ostalari-gakoa ez dator bat" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:156 msgid "Host starts with '[' but no closing bracket found." msgstr "Ostalariak '[' dauka hasieran, baina ez da ixte-kortxeterik aurkitu." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:485 msgid "Host unreachable" msgstr "Ezin da ostalaria atzitu" @@ -4325,15 +4291,15 @@ msgid "Host:" msgstr "Ostalaria:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 msgid "Hours," msgstr "Orduak," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1562 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (adibidez: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:116 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 helbideak ez dira onartzen SOCKS4 proxyarekin" @@ -4346,7 +4312,7 @@ "Zehaztutako denboran daturik bidali edo jasotzen ez bada, konexioa eten " "egingo da eta FileZilla berriz konektatzen saiatuko da" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2276 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "Errore-txostenak bidaltzean, egunkari \"Xehatua\" bidali." @@ -4379,7 +4345,7 @@ "Ostalari-gakoaren aldaketa espero gabekoa bada, jarri harremanetan " "zerbitzari-administratzailearekin." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4387,7 +4353,7 @@ "Arazoa konpontzen ez bada, bideratzaile edota suebakiren bat FileZilla " "blokeatzen ari da." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4395,7 +4361,7 @@ "Arazoa konpontzen ez bada, bideratzaile edota suebakiren bat konexioa eteten " "ari da." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2199 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4405,7 +4371,7 @@ "fitxategi-izenaren amaieran \".1\" erantsiz (baliteke egunkari-fitxategi " "zaharrak gainidaztea), eta fitxategi berri bat sortzen da." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3360 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4413,7 +4379,7 @@ "Esteka sinbolikoak direktorio bat seinalatzen badu, FileZilla-k ezabatu egin " "dezake esteka sinbolikoa, edo estekatutako direktorioaren edukia kendu." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4421,13 +4387,13 @@ "Arazoa konpontzen ez bada, jarri harremanetan zure bideratzailearen edo " "suebakiaren fabrikatzailearekin konponbide bat eskatzeko." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Arazoa konpontzen ez bada, jarri harremanetan zure bideratzailearen " "fabrikatzailearekin." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1459 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " @@ -4438,7 +4404,7 @@ "zerbitzariarekin sinkronizatu behar da. Ordua desberdina bada (adib. beste " "ordu-zona bat), zehaztu ordu-zonaren tartea gune-kudeatzailean." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1788 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4447,7 +4413,7 @@ "berdinak izango dira denbora-zigiluen arteko tarteak ez badu atalase hau " "gainditzen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1893 msgid "If you change the language, you need to restart FileZilla." msgstr "Hizkuntza aldatuz gero, FileZilla berrabiarazi behar da." @@ -4459,7 +4425,7 @@ "Proban klik eginez gero, FileZilla probe.filezilla-project.org-era " "konektatuko da eta proba arrunt batzuk egingo ditu." -#: ../../locales/../src/interface/Mainfrm.cpp:1169 +#: ../../locales/../src/interface/Mainfrm.cpp:1168 msgid "If you close FileZilla, your changes will be lost." msgstr "FileZilla itxiz gero, aldaketak galduko dira." @@ -4483,7 +4449,7 @@ "Arazoak badituzu direktorio-zerrendak berreskuratzeko edo fitxategiak " "transferitzeko, saiatu transferentzia-modu lehenetsia aldatzen." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4518,7 +4484,7 @@ "Bideratzailea erabiliz gero, ziurtatu ataka hauek guztiak FileZilla " "exekutatzen ari den ordenagailura birbidaltzen direla." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4526,16 +4492,16 @@ "Bideratzaileak IP helbidea aldatzen jarraitzen badu, jarri harremanetan zure " "bideratzailearen fabrikatzailearekin." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Inportatu datuak aurreko bertsio batetik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 msgid "Import settings" msgstr "Inportatu ezarpenak" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Inportazioa ondo egin da" @@ -4579,19 +4545,11 @@ "zerbitzariari ataka bat eskatu eta hara konektatzen da. Honek ez du " "konfigurazio handirik eskatzen." -#: ../../locales/../src/engine/tlssocket.cpp:1036 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Kate osatu gabea; erroko ziurtagiria ez du autoritate ziurtagiri-emaile " -"batek sinatu" - -#: ../../locales/../src/interface/queue.cpp:378 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "Pasahitz okerra" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:222 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4599,17 +4557,21 @@ "FileZilla-ren azken bertsioari buruzko informazioa ezin izan da " "berreskuratu. Saiatu berriro aurrerago." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:789 msgid "Initializing TLS..." msgstr "TLS hasieratzen..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Algoritmo ez segurua!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:773 msgid "Insecure server, it does not support FTP over TLS." msgstr "Zerbitzari ez-segurua; ez du onartzen TLS bidezko FTP." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:910 +#: ../../locales/../src/engine/server.cpp:931 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktiboa" @@ -4617,29 +4579,21 @@ msgid "Interface" msgstr "Interfazea" -#: ../../locales/../src/engine/socket.cpp:1062 -msgid "Interrupted by signal" -msgstr "Seinaleak etenda" - -#: ../../locales/../src/engine/ControlSocket.cpp:218 -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/engine/ControlSocket.cpp:219 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "Erabiltzaileak etenda" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 msgid "Invalid Content-Length" msgstr "Eduki-luzera baliogabea" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 msgid "Invalid HTTP Response" msgstr "HTTP erantzun baliogabea" -#: ../../locales/../src/engine/socket.cpp:1050 -msgid "Invalid argument passed" -msgstr "Argumentu baliogabea pasa da" - -#: ../../locales/../src/engine/ControlSocket.cpp:453 -#: ../../locales/../src/engine/ControlSocket.cpp:509 +#: ../../locales/../src/engine/ControlSocket.cpp:461 +#: ../../locales/../src/engine/ControlSocket.cpp:518 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4647,46 +4601,51 @@ "Karaktere-sekuentzia baliogabea jaso da, UTF-8 desgaitzen. UTF-8 behartzeko, " "hautatu UTF-8 aukera gune-kudeatzailean." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 msgid "Invalid chunk size" msgstr "Bloke-tamaina baliogabea" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Datu baliogabeak jaso dira" -#: ../../locales/../src/interface/verifycertdialog.cpp:40 -#: ../../locales/../src/interface/verifycertdialog.cpp:53 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Data baliogabea" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Fitxategi-izen baliogabea" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:161 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Ostalari baliogabea; ixte-kortxetearen ondoren bi puntuak eta ataka soilik " "ager daitezke." -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:641 +#, fuzzy, c-format +msgid "Invalid hostname: %s" +msgstr "Fitxategi-izen baliogabea" + +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "Invalid input" msgstr "Sarrera baliogabea" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:67 +#: ../../locales/../src/engine/server.cpp:188 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Ataka baliogabea eman da. Ataka-zenbakiak 1 eta 65535 bitartean egon behar " "du." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/engine/server.cpp:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:120 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4700,42 +4659,38 @@ "- ftps:// TLS bidezko FTPetarako (inplizitua)\n" "- ftpes:// TLS bidezko FTPetarako (esplizitua)" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4305 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Proxy-ostalari baliogabea; ixte-kortxetearen ondoren bi puntuak eta ataka " "soilik ager daitezke." -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:520 +msgid "Invalid regular expression" +msgstr "Adierazpen erregular baliogabea" + +#: ../../locales/../src/interface/search.cpp:686 msgid "Invalid regular expression in search conditions." msgstr "Adierazpen erregular baliogaberen bat dago bilaketarako baldintzetan." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:568 msgid "Invalid response code" msgstr "Erantzun-kode baliogabea" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:681 #, c-format msgid "Invalid search conditions: %s" msgstr "Bilaketa-baldintza baliogabeak: %s" -#: ../../locales/../src/interface/sitemanager.cpp:409 -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:466 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:752 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:786 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Invalid site path" msgstr "Gunearen bide-izen baliogabea" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:535 msgid "Invalid size in condition" msgstr "Baldintzetan tamaina baliogaberen bat dago" @@ -4743,27 +4698,19 @@ msgid "Invalid username given." msgstr "Erabiltzaile-izen baliogabea." -#: ../../locales/../src/engine/socket.cpp:1083 -msgid "Invalid value for ai_flags" -msgstr "ai_flags-en balio baliogabea" - -#: ../../locales/../src/engine/socket.cpp:1085 -msgid "Invalid value for hints" -msgstr "Aztarnen balio baliogabea" - -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction country:" msgstr "Jurisdikzio-herrialdea:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction locality:" msgstr "Jurisdikzio-herria:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Jurisdiction state or province:" msgstr "Jurisdikzio-estatua edo probintzia:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1745 msgid "Keep directories on top" msgstr "Direktorioak goialdean jarri" @@ -4778,7 +4725,7 @@ "ditu zerbitzariak eginbide hau onartzen duela egiaztatzeko, baina probak " "huts egin dezake." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2003 msgid "Key exchange" msgstr "Gako-trukaketa" @@ -4786,29 +4733,29 @@ msgid "Key exchange:" msgstr "Gako-trukaketa:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/engine/server.cpp:908 +#: ../../locales/../src/engine/server.cpp:929 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1329 msgid "Key file" msgstr "Gako-fitxategia" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "T&xikiena" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1874 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Hizkuntza" -#: ../../locales/../src/interface/Mainfrm.cpp:1477 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "Language changed" msgstr "Hizkuntza aldatu da" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:154 msgid "Last modified" msgstr "Azken aldaketa" @@ -4828,15 +4775,15 @@ msgid "Limit local ports" msgstr "Mugatu ataka lokalak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2168 msgid "Limit size of logfile" msgstr "Mugatu egunkari-fitxategiaren tamaina" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2176 msgid "Limit:" msgstr "Muga:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 msgid "Line length exceeded" msgstr "Lerroen luzera gainditu da" @@ -4844,13 +4791,14 @@ msgid "Linked against" msgstr "Honi estekatuta" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Entzuteko socket-a itxita" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:360 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Listing:" msgstr "Zerrenda:" @@ -4858,51 +4806,52 @@ msgid "Lo&west available port:" msgstr "Esteka-zenbaki erabilgarri t&xikiena:" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1369 +#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1378 msgid "Local" msgstr "Lokala" -#: ../../locales/../src/engine/socket.cpp:1047 -msgid "Local address in use" -msgstr "Helbide lokala erabiltzen" - -#: ../../locales/../src/engine/socket.cpp:1075 -msgid "Local endpoint has been closed" -msgstr "Amaiera-puntu lokala itxi da" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2254 msgid "Local file" msgstr "Fitxategi lokala" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:314 msgid "Local file does not exist." msgstr "Fitxategi lokala ez dago." -#: ../../locales/../src/interface/updater.cpp:370 -#: ../../locales/../src/interface/updater.cpp:462 +#: ../../locales/../src/interface/updater.cpp:400 +#: ../../locales/../src/interface/updater.cpp:493 #, c-format msgid "Local file is %s\n" msgstr "Fitxategi lokala %s da\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../../locales/../src/interface/manual_transfer.cpp:310 msgid "Local file is a directory instead of a regular file." msgstr "" "Fitxategi lokala direktorio bat da, fitxategi arrunt bat izan beharrean." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Local file is not a valid filename." msgstr "Fitxategi lokalak ez du baliozko fitxategi-izenik." +#: ../../locales/../src/interface/search.cpp:644 +#: ../../locales/../src/interface/search.cpp:650 +msgid "Local file search" +msgstr "Fitxategi lokalen bilaketa" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Iragazki lokalak:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3283 +msgid "Local path handling:" +msgstr "Bide-izen lokalen tratamendua:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Gune lokala:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Locality:" msgstr "Herria:" @@ -4910,12 +4859,16 @@ msgid "Log file" msgstr "Egunkari-fitxategia" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:965 +msgid "Logged in" +msgstr "Erregistratuta" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Erregistratzen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:847 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4924,7 +4877,7 @@ "izatea bateragarriak UTF-8rekin. Ezin da karaktere-joko lokalaz baliatu " "horren ordez, proxya erabiltzen ari delako." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:855 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4932,7 +4885,7 @@ "Saio-hasierako datuek ASCII ez diren karaktereak dituzte eta baliteke ez " "izatea bateragarriak UTF-8rekin. Karaktere-joko lokalarekin saiatzen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:884 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" "Saio-hasierako sekuentzia burutu da, baina saioa ez da hasi. Abortatzen." @@ -4952,17 +4905,17 @@ "Saio hasiera mota hau FTP URL batekin batera soilik erabil daiteke. " "Argumentuak '%s' edo '%s' izan behar du" -#: ../../locales/../src/interface/queue.cpp:865 -#: ../../locales/../src/interface/queue.cpp:952 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "Low" msgstr "Txikia" -#: ../../locales/../src/interface/queue.cpp:863 -#: ../../locales/../src/interface/queue.cpp:950 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 msgid "Lowest" msgstr "Txikiena" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "" "Ataka-zenbaki erabilgarri txikienak 1024 eta 65535 bitartean egon behar du." @@ -4971,65 +4924,65 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Ziurtatu fitxategia eskuragarri dagoela eta ongi osatutako XML dokumentua " "dela." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 #, c-format msgid "Malformed chunk data: %s" msgstr "Gaizki osatutako blokeko datuak: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 #, c-format msgid "Malformed header: %s" msgstr "Gaizki osatutako goiburua: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 msgid "Malformed reply, server not sending proper line endings" msgstr "" "Gaizki osatutako erantzuna, zerbitzaria ez da lerro-amaiera zuzenak " "bidaltzen ari" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2596 +#: ../../locales/../src/interface/manual_transfer.cpp:298 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:310 +#: ../../locales/../src/interface/manual_transfer.cpp:314 +#: ../../locales/../src/interface/manual_transfer.cpp:321 +#: ../../locales/../src/interface/manual_transfer.cpp:327 +#: ../../locales/../src/interface/manual_transfer.cpp:333 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Manual transfer" msgstr "Eskuzko transferentzia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3071 msgid "Match all of the following" msgstr "Bete hauek guztiak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 msgid "Match any of the following" msgstr "Bete hauetakoren bat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Match none of the following" msgstr "Ez bete hauetako bakar bat ere" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3074 +msgid "Match not all of the following" +msgstr "Ez bete hauek guztiak" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "Gehienezko aldi bereko &transferentziak:" -#: ../../locales/../src/engine/socket.cpp:1089 -msgid "Memory allocation failure" -msgstr "Memoria-esleipenak huts egin du" - -#: ../../locales/../src/interface/Mainfrm.cpp:394 -#: ../../locales/../src/interface/Mainfrm.cpp:1804 +#: ../../locales/../src/interface/Mainfrm.cpp:385 +#: ../../locales/../src/interface/Mainfrm.cpp:1762 msgid "Message log" msgstr "Mezu-erregistroa" @@ -5037,56 +4990,52 @@ msgid "Message log position" msgstr "Mezu-erregistroaren posizioa" -#: ../../locales/../src/engine/socket.cpp:1072 -msgid "Message too large" -msgstr "Mezu luzeegia" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:445 msgid "Minutes" msgstr "Minutuak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2169 msgid "Move &down" msgstr "Eraman &behera" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2163 msgid "Move &up" msgstr "Eraman &gora" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:987 msgid "My Computer" msgstr "Ordenagailua" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:977 msgid "My Documents" msgstr "Dokumentuak" -#: ../../locales/../src/interface/sitemanager.cpp:269 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:737 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 +#: ../../locales/../src/interface/sitemanager.cpp:339 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:736 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:738 msgid "My Sites" msgstr "Nire guneak" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:203 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 msgid "N/a" msgstr "E/e" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2634 msgid "Name" msgstr "Izena" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1196 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214 msgid "Name already exists" msgstr "Izena lehendik badago" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 msgid "Name of bookmark already exists." msgstr "Laster-markaren izena lehendik badago." @@ -5094,39 +5043,31 @@ msgid "Name:" msgstr "Izena:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 msgid "Natural sort" msgstr "Mota naturala" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Iragazki-izena sartu behar da" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:644 +msgid "Need to enter valid local path" +msgstr "Baliozko bide-izen lokala sartu behar da" + +#: ../../locales/../src/interface/search.cpp:671 msgid "Need to enter valid remote path" msgstr "Baliozko urruneko bide-izena sartu behar da" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1014 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027 msgid "Need to specify a character encoding" msgstr "Karaktere-kodeketa zehaztu behar da" -#: ../../locales/../src/engine/socket.cpp:1093 -msgid "Neither nodename nor servname provided, or not known" -msgstr "Ez da nodo-izen edo servname-rik eman, edo ezezaguna" - -#: ../../locales/../src/engine/socket.cpp:1080 -msgid "" -"Network host does not have any network addresses in the requested address " -"family" -msgstr "" -"Sareko ostalariak ez dauka sareko helbiderik eskatutako helbide-familian" - -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:482 msgid "Network unreachable" msgstr "Ezin da sarea atzitu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2059 msgid "Never" msgstr "Sekula ez" @@ -5138,37 +5079,37 @@ msgid "New &tab" msgstr "&Fitxa berria" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2818 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2839 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "&Laster-marka berria" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2599 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2234 msgid "New bookmark" msgstr "Laster-marka berria" -#: ../../locales/../src/interface/LocalTreeView.cpp:1126 -#: ../../locales/../src/interface/RemoteListView.cpp:1310 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 +#: ../../locales/../src/interface/LocalTreeView.cpp:1163 +#: ../../locales/../src/interface/RemoteListView.cpp:1324 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1237 msgid "New directory" msgstr "Direktorio berria" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:56 #, c-format msgid "New features and improvements in %s" msgstr "Eginbide eta hobekuntza berriak %s(e)n" @@ -5177,13 +5118,13 @@ msgid "New filter" msgstr "Iragazki berria" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:923 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:936 msgid "New folder" msgstr "Karpeta berria" -#: ../../locales/../src/interface/sitemanager.cpp:583 -#: ../../locales/../src/interface/sitemanager.cpp:595 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2154 +#: ../../locales/../src/interface/sitemanager.cpp:602 +#: ../../locales/../src/interface/sitemanager.cpp:616 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2207 msgid "New site" msgstr "Gune berria" @@ -5191,27 +5132,23 @@ msgid "Next to the transfer queue" msgstr "Transferentzia ilararen hurrengoa" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:764 msgid "No" msgstr "Ez" -#: ../../locales/../src/engine/socket.cpp:1091 -msgid "No address associated with nodename" -msgstr "Ez dago nodo-izenarekin erlazionaturiko helbiderik" - -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Ez da hautatu esportatzeko kategoriarik" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "No command given, aborting." msgstr "Ez da komandorik eman, abortatzen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3754 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3821 msgid "No external IP address set, trying default." msgstr "Ez da kanpoko IP helbiderik zehaztu, lehenetsiarekin saiatzen." -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1083 msgid "No files are currently being edited." msgstr "Unean ez da fitxategirik editatzen ari." @@ -5219,95 +5156,83 @@ msgid "No filter name given" msgstr "Ez da iragazki-izenik eman" -#: ../../locales/../src/engine/server.cpp:77 +#: ../../locales/../src/engine/server.cpp:81 #: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:195 msgid "No host given, please enter a host." msgstr "Ez da ostalaririk eman, sartu ostalari bat." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:96 msgid "No images available" msgstr "Ez dago irudi erabilgarririk" -#: ../../locales/../src/interface/QueueView.cpp:2980 -msgid "No more files in the queue!" -msgstr "Ez dago beste fitxategirik ilaran" - -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "No name for the filterset given." msgstr "Ez da iragazki multzoaren izenik eman." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 msgid "No program associated with filetype" msgstr "Ez dago fitxategi mota honekin asoziatutako programarik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "Ez da programarik asoziatu '%s' luzapena duten fitxategiak editatzeko." -#: ../../locales/../src/engine/socket.cpp:1067 -msgid "No route to host" -msgstr "Ostalarira biderik ez" - -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:391 msgid "No search results" msgstr "Bilaketa-emaitzarik ez" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:349 msgid "No sites available" msgstr "Ez dago gune erabilgarririk" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:454 msgid "No supported SOCKS5 auth method" msgstr "SOCKS 5 autentifikazio-metodoa ez da onartzen" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "No username given." msgstr "Ez da erabiltzaile-izenik eman." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:59 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1836 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1855 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Bat ere ez" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2370 msgid "None selected yet" msgstr "Ez da ezer ere hautatu" -#: ../../locales/../src/engine/socket.cpp:1087 -msgid "Nonrecoverable failure in name resolution" -msgstr "Errore konponezina izen-ebazpenean" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:868 -#: ../../locales/../src/interface/queue.cpp:955 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 +#: ../../locales/../src/engine/server.cpp:904 +#: ../../locales/../src/engine/server.cpp:925 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/queue.cpp:886 +#: ../../locales/../src/interface/queue.cpp:942 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1326 msgid "Normal" msgstr "Normala" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 msgid "Not all items could be requeued for transfer." msgstr "Ezin izan dira elementu guztiak ilaran jarri berriro transferitzeko." -#: ../../locales/../src/interface/state.cpp:178 -#: ../../locales/../src/interface/state.cpp:480 +#: ../../locales/../src/interface/state.cpp:181 +#: ../../locales/../src/interface/state.cpp:1238 msgid "Not connected" msgstr "Ez dago konektatuta" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2035 msgid "Not connected to any server" msgstr "Ez dago zerbitzari batera ere konektatuta" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Ez dago zerbitzari batera ere konektatuta." @@ -5315,10 +5240,6 @@ msgid "Not connected." msgstr "Ez dago konektatuta." -#: ../../locales/../src/engine/socket.cpp:1108 -msgid "Not initialized, need to call WSAStartup" -msgstr "Hasieratu gabe, WSAStartup deitu behar da" - #: ../../locales/../src/interface/Mainfrm.cpp:657 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" @@ -5336,7 +5257,7 @@ "Oharra: proxy orokor bat erabiltzeak modu pasiboa behartzen du FTP konexio " "guztietan." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "Number of decimal places:" msgstr "Hamartarren kopurua:" @@ -5344,7 +5265,7 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Saiakera kopuruak 0 eta 99 bitartean egon behar du." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1959 msgid "O&pen file" msgstr "I&reki fitxategia" @@ -5355,23 +5276,24 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2710 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2968 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3249 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3445 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3614 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3670 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1362 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1469 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1540 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1598 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1837 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1974 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2120 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2578 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2731 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3229 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3393 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3599 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" @@ -5389,35 +5311,35 @@ "Hurrengo orrietan, hautatutako transferentzia modua konfiguratuko da, eta " "ordezko modua ere bai, gaituta badago." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:774 msgid "Once" msgstr "Behin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "Once a day" msgstr "Egunean behin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2061 msgid "Once a week" msgstr "Astean behin" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:521 msgid "Only use plain FTP (insecure)" msgstr "Erabili FTP arrunta soilik (ez segurua)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "Open directory in system's file manager" msgstr "Ireki direktorioa sistemaren gune-kudeatzailean" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 msgid "Open the Site Manager" msgstr "Ireki gune-kudeatzailea" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 msgid "Open the Site Manager." msgstr "Ireki gune-kudeatzailea." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:11 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Ireki gune-kudeatzailea. Eskuineko botoiarekin klik egin guneen zerrenda bat " @@ -5431,14 +5353,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Ireki FileZilla-ren ezarpenen dialogo-koadroa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1710 msgid "Opened as:" msgstr "Honela irekita:" -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1695 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1743 +#: ../../locales/../src/interface/LocalListView.cpp:1736 +#: ../../locales/../src/interface/LocalListView.cpp:1748 msgid "Opening failed" msgstr "Irekitzeak huts egin du" @@ -5450,7 +5372,7 @@ msgid "Opens the Site Manager" msgstr "Gune-kudeatzailea irekitzen du" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:71 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" @@ -5461,19 +5383,7 @@ msgid "Operating System:" msgstr "Sistema eragilea:" -#: ../../locales/../src/engine/socket.cpp:1058 -msgid "Operation already in progress" -msgstr "Eragiketa dagoeneko lanean" - -#: ../../locales/../src/engine/socket.cpp:1049 -msgid "Operation in progress" -msgstr "Eragiketa lanean" - -#: ../../locales/../src/engine/socket.cpp:1070 -msgid "Operation not supported" -msgstr "Eragiketa ez onartua" - -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Organization:" msgstr "Erakundea:" @@ -5481,19 +5391,10 @@ msgid "Other SFTP options" msgstr "Beste SFTP aukerak" -#: ../../locales/../src/engine/socket.cpp:1103 -msgid "Other system error" -msgstr "Bestelako sistema-errorea" - -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:264 msgid "Other:" msgstr "Besteak:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 -msgid "Out of memory" -msgstr "Memoria nahikorik ez" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:63 msgid "Overview" msgstr "Informazio orokorra" @@ -5502,30 +5403,30 @@ msgid "Overwrite &if source newer" msgstr "Gainidatzi &iturburua berriago bada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Gainidatzi fitxategia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "Gainidatzi fitxategia tamaina desberdina bada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "" "Gainidatzi fitxategia tamaina desberdina bada edo iturburua berriagoa bada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" @@ -5539,7 +5440,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Gainidatzi tamaina &desberdina bada edo iturburua berriagoa bada" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" msgstr "Norberaren konpilazio mota: %s\n" @@ -5548,8 +5449,8 @@ msgid "Owner permissions" msgstr "Jabearen baimenak" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:404 +#: ../../locales/../src/interface/search.cpp:156 msgid "Owner/Group" msgstr "Jabea/Taldea" @@ -5566,7 +5467,7 @@ msgid "P&roxy host:" msgstr "P&roxy-ostalaria:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "ATAKA komandoa kaltetu du bideratzaileak edo suebakiak" @@ -5574,16 +5475,16 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&siboa (gomendatua)" -#: ../../locales/../src/interface/Mainfrm.cpp:2376 +#: ../../locales/../src/interface/Mainfrm.cpp:2381 msgid "Parameter not a valid URL" msgstr "Parametroa ez da baliozko URL bat" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:573 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Bertsioaren informazioaren %d byte analizatzen.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2486 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 msgid "Pass&word:" @@ -5598,53 +5499,48 @@ msgid "Passive mode" msgstr "Modu pasiboa" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Modu pasiboa ezarri da transferentzia modu lehenetsi gisa." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:117 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Pasahitza behar da" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:151 msgid "Path" msgstr "Bide-izena" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3054 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2214 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3104 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2121 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Ezin da bide-izenik osatu %s direktorio eta %s azpidirektoriorako" -#: ../../locales/../src/interface/Mainfrm.cpp:2334 +#: ../../locales/../src/interface/Mainfrm.cpp:2336 msgid "Path not found:" msgstr "Bide-izena ez da aurkitu:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2661 msgid "Paths" msgstr "Bide-izenak" -#: ../../locales/../src/interface/edithandler.cpp:1112 -#: ../../locales/../src/interface/edithandler.cpp:1249 -#: ../../locales/../src/interface/edithandler.cpp:1339 -#: ../../locales/../src/interface/edithandler.cpp:1349 +#: ../../locales/../src/interface/edithandler.cpp:1121 +#: ../../locales/../src/interface/edithandler.cpp:1258 +#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1358 msgid "Pending removal" msgstr "Kendu zain" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Baimena" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 -msgid "Permission denied" -msgstr "Baimena ukatuta" - -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:155 msgid "Permissions" msgstr "Baimenak" @@ -5652,7 +5548,7 @@ msgid "Platform:" msgstr "Plataforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5668,13 +5564,13 @@ "Konfiguratu suebakiak eta bideratzaileak FileZilla-k irteerako konexioa " "ausazko ataketara ezartzeko moduan." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Desgaitu bideratzailean 'DMZ modua' eta 'Joko modua' gisako ezarpenak zure " "bideratzailean." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5690,7 +5586,7 @@ msgid "Please enter a custom time format." msgstr "Sartu ordu-formatu pertsonalizatua." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:549 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Sartu YYYY-MM-DD itxurako data bat, adibidez 2010-07-18." @@ -5706,16 +5602,16 @@ msgid "Please enter a name for the new filter." msgstr "Sartu iragazki berriarentzako izen bat." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Sartu izen berri bat kopiatutako iragazkiarentzat." -#: ../../locales/../src/interface/filter.cpp:389 +#: ../../locales/../src/interface/filter.cpp:272 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Sartu izen berri bat \"%s\" iragazki multzoarentzat." -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Sartu izen berri bat iragazkiarentzat." @@ -5746,17 +5642,6 @@ msgid "Please enter a password for this server:" msgstr "Sartu pasahitz bat zerbitzari honentzat:" -#: ../../locales/../src/interface/QueueView.cpp:2120 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Sartu bide-izen bat eta exekutagarri bat.\n" -"Adib. c:\\bide-izena\\fitxategia.exe MS Windows-en edo /bide-izena/" -"fitxategia Unix-en\n" -"Bestela, programaren argumentuak ere adieraz daitezke." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5764,7 +5649,7 @@ "Sartu 10 eta 9999 segundo arteko denbora-muga bat edo 0, denbora-mugak " "desgaitzeko." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Please enter a unique name for this filter set" msgstr "Sartu izen esklusibo bat iragazki multzo honentzat" @@ -5772,11 +5657,11 @@ msgid "Please enter a username for this server:" msgstr "Sartu erabiltzaile-izen bat zerbitzari honentzat:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Sartu ataka-zenbakien tarte baliozko bat." -#: ../../locales/../src/interface/netconfwizard.cpp:176 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Sartu URL bat zure kanpoko helbidea handik hartzeko" @@ -5786,7 +5671,7 @@ msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Sartu kargatzeko abiaduraren muga, 0 %s/s baino handiagoa edo berdina." -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5794,14 +5679,29 @@ "Sartu FTP komando gordina.\n" "FTP komando gordinak erabiliz gero, direktorioaren cachea garbituko da." -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/QueueView.cpp:1825 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Sartu programaren bide-izen osoa eta bere argumentuak. Komando hau ilara " +"prozesatzen amaitzean exekutatuko da.\n" +"Adib. c:\\bide-izena\\fitxategia.exe MS Windows-en edo /bide-izena/" +"fitxategia Unix-en\n" +"Komandoak edo bere argumentuek zuriuneak badituzte komatxo artean zuzen " +"idatzi behar dira." + +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1311 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1224 msgid "Please enter the name of the directory which should be created:" msgstr "Sartu sortu beharreko direktorioaren izena:" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2621 msgid "Please enter the name of the file which should be created:" msgstr "Sartu sortu beharreko fitxategiaren izena:" @@ -5809,12 +5709,12 @@ msgid "Please enter username and password for this server:" msgstr "Sartu erabiltzaile-izena eta pasahitza zerbitzari honentzat:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Sartu zure kanpoko IP helbidea" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5832,7 +5732,7 @@ "Jarraibideak arretaz bete, gaizki konfiguratzeak FTP konexioak eragotziko " "baititu." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5840,12 +5740,12 @@ "Ziurtatu FileZilla baimenduta dagoela irteerako konexioak ezartzeko eta ondo " "idatzi duzula helbide-konpontzailearen helbidea." -#: ../../locales/../src/interface/FileZilla.cpp:136 +#: ../../locales/../src/interface/FileZilla.cpp:137 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Ziurtatu eskatutako eskualde-ezarpenak zure sisteman instalatuta daudela." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5885,7 +5785,7 @@ "Kontuan hartu zenbait zerbitzarik zu debekatzeko arriskua dagoela, maizegi " "edo denbora-tarte laburregietan birkonektatzen saiatuz gero." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5894,11 +5794,11 @@ "Erabili berriro morroi hau sarearen ingurunea aldatuz gero, edo bat-batean " "arazoak ematen baditu ondo zebilen zerbitzariren batek." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3365 msgid "Please select an action:" msgstr "Hautatu ekintza bat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1656 msgid "Please select the categories you would like to import." msgstr "Hautatu inportatu nahi dituzun kategoriak." @@ -5929,7 +5829,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Hautatu atributu berriak hautatutako fitxategientzat." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5948,8 +5848,8 @@ msgid "Positio&n of the message log:" msgstr "Mezu-erregistroaren &posizioa:" -#: ../../locales/../src/interface/verifycertdialog.cpp:223 -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Postal code:" msgstr "Posta-kodea:" @@ -5961,8 +5861,8 @@ msgid "Preallocation" msgstr "Aurrez esleitzea" -#: ../../locales/../src/interface/sitemanager.cpp:268 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1899 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1946 msgid "Predefined Sites" msgstr "Aurrez definitutako guneak" @@ -5970,11 +5870,12 @@ msgid "Preserving file timestamps" msgstr "Fitxategien denbora-zigiluak gordetzen" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1482 +#, fuzzy +msgid "Preview" msgstr "Aurrebista:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1359 msgid "Primary connection and data connection certificates don't match." msgstr "Konexio nagusiaren eta datu-konexioaren ziurtagiriak ez datoz bat." @@ -5986,15 +5887,15 @@ msgid "Print version information to stdout and exit" msgstr "Inprimatu bertsioaren informazioa irteera lehenetsian eta irten" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1744 msgid "Prioritize directories (default)" msgstr "Lehentasuna eman direktorioei (lehenetsia)" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Priority" msgstr "Lehentasuna" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2100 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6016,28 +5917,16 @@ msgstr "Pro&xy pasahitza:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "Prozesatu &ilara" -#: ../../locales/../src/engine/socket.cpp:1051 -msgid "Process file table overflow" -msgstr "Prozesu-fitxategi taularen gainezkatzea" - #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "%s %s(e)n prozesatu da." -#: ../../locales/../src/engine/socket.cpp:1056 -msgid "Protocol not supported" -msgstr "Protokolo ez onartua" - -#: ../../locales/../src/engine/socket.cpp:1110 -msgid "Protocol not supported on given socket type" -msgstr "Protokoloa ez da onartzen emandako socket motan" - #: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Protokoloa:" @@ -6051,38 +5940,42 @@ msgid "Proxy &user:" msgstr "Proxy-&erabiltzailea:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:463 msgid "Proxy authentication failed" msgstr "Proxy-autentifikazioak huts egin du" -#: ../../locales/../src/engine/transfersocket.cpp:103 -#: ../../locales/../src/engine/transfersocket.cpp:115 +#: ../../locales/../src/engine/transfersocket.cpp:106 +#: ../../locales/../src/engine/transfersocket.cpp:118 #, c-format msgid "Proxy handshake failed: %s" msgstr "Proxyarekiko hasierako agurrak huts egin du: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4209 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4299 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "Proxy-ostalariak '[' dauka hasieran, baina ez da ixte-kortxeterik aurkitu." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:322 #, c-format msgid "Proxy reply: %s" msgstr "Proxy-erantzuna: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:504 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Proxy-eskakizunak huts egin du. Proxy-erantzuna: %s" + +#: ../../locales/../src/engine/proxy.cpp:377 #, c-format msgid "Proxy request failed: %s" msgstr "Proxy-eskakizunak huts egin du: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Proxy-eskakizunak huts egin du: helbide mota ezezaguna CONNECT erantzunean" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4328 msgid "Proxy set but proxy host or port invalid" msgstr "Proxya ezarri da, baina proxy-ostalaria edo proxy-ataka baliogabea da" @@ -6098,47 +5991,48 @@ msgid "Public permissions" msgstr "Baimen publikoak" -#: ../../locales/../src/interface/QueueView.cpp:3060 +#: ../../locales/../src/interface/QueueView.cpp:2688 msgid "Queue has been fully processed" msgstr "Ilara erabat prozesatu da" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:436 #, c-format msgid "Queue: %s MiB" msgstr "Ilara: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:372 #, c-format msgid "Queue: %s%s" msgstr "Ilara: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:368 +#: ../../locales/../src/interface/statusbar.cpp:427 msgid "Queue: empty" msgstr "Ilara: hutsik" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Fitxategiak ilaran" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Queueing:" msgstr "Ilaran jartzen:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "B&errabiarazi sistema" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" +msgstr "B&errabiarazi sistema behin" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "Urrun&eko direktorioen zuhaitza" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "R&eset and requeue selected files" msgstr "B&errezarri eta berriro jarri ilaran hautatutako fitxategiak" -#: ../../locales/../src/interface/Mainfrm.cpp:596 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "FTP komando gordina" @@ -6155,7 +6049,7 @@ msgid "Re&name" msgstr "Aldatu ize&na" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6167,16 +6061,16 @@ msgid "Rea&d" msgstr "Ira&kurri" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Irakurtzeko soilik" -#: ../../locales/../src/interface/Mainfrm.cpp:1033 +#: ../../locales/../src/interface/Mainfrm.cpp:1037 msgid "Really cancel current operation?" msgstr "Benetan utzi uneko eragiketa?" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:761 +#: ../../locales/../src/interface/RemoteListView.cpp:1405 +#: ../../locales/../src/interface/search.cpp:1185 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6184,36 +6078,36 @@ msgstr[0] "Benetan ezabatu %d direktorio eta bere edukia zerbitzaritik?" msgstr[1] "Benetan ezabatu %d direktorio eta haien edukiak zerbitzaritik?" -#: ../../locales/../src/interface/RemoteListView.cpp:1384 -#: ../../locales/../src/interface/search.cpp:759 +#: ../../locales/../src/interface/RemoteListView.cpp:1402 +#: ../../locales/../src/interface/search.cpp:1183 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Benetan ezabatu %d fitxategi zerbitzaritik?" msgstr[1] "Benetan ezabatu %d fitxategi zerbitzaritik?" -#: ../../locales/../src/interface/RemoteListView.cpp:1391 -#: ../../locales/../src/interface/search.cpp:765 +#: ../../locales/../src/interface/RemoteListView.cpp:1410 +#: ../../locales/../src/interface/search.cpp:1189 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Benetan ezabatu %s eta %s zerbitzaritik?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1042 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Benetan ezabatu hautatutako fitxategi edota direktorio guztiak zerbitzaritik?" -#: ../../locales/../src/engine/local_filesys.cpp:129 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "Benetan ezabatu hautatutako fitxategi edota direktorio guztiak zure " "ordenagailutik?" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Reason" msgstr "Arrazoia" -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:2681 msgid "Reboot now" msgstr "Berrabiarazi orain" @@ -6221,40 +6115,47 @@ msgid "Rec&urse into subdirectories" msgstr "Ara&katu azpidirektorioak ere" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:333 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "TLS alerta jaso da zerbitzaritik: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2965 +#: ../../locales/../src/engine/directorylistingparser.cpp:2995 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Badirudi jasotako direktorio-zerrenda EBCDICen kodetuta dagoela." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2006 +#: ../../locales/../src/engine/directorylistingparser.cpp:1984 +#: ../../locales/../src/engine/directorylistingparser.cpp:2000 msgid "Received a line exceeding 10000 characters, aborting." msgstr "10.000 karakteretik gorako lerro bat jaso da; abortatzen." +#: ../../locales/../src/engine/tlssocket.cpp:1342 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Ezin izan da egiaztatu jasotako ziurtagiri katea. Egiaztapen egoera %d da." + #: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "Jasotako datuak kaltetuta daude" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:552 msgid "Received invalid character in version information" msgstr "Bertsioaren informazioan karaktere baliogaberen bat jaso da" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:336 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "%d TLS alerta ezezaguna jaso da zerbitzaritik" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:545 msgid "Received version information is too large" msgstr "Jasotako bertsio-informazioa handiegia da" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6267,61 +6168,57 @@ msgid "Reconnection settings" msgstr "Birkonektatzeko ezarpenak" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:64 msgid "Reconnects to the last used server" msgstr "Erabilitako azken zerbitzarira birkonektatzen da" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Fitxategiak ilaran modu errekurtsiboan gehitzen." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Baimenak modu errekurtsiboan aldatzen." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Fitxategi eta direktorioak modu errekurtsiboan ezabatzen." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:619 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Birbideratzeko erabili den URIa baliogabea da edo ez da onartzen: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:656 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:626 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Birbideratzeko helbidea baliogabea da edo ez da onartzen: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:43 msgid "Refresh the file and folder lists" msgstr "Freskatu fitxategi- eta karpeta-zerrendak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3844 msgid "Remember passwords?" msgstr "Pasahitzak gogoratu?" -#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/edithandler.cpp:1105 msgid "Remote" msgstr "Urrunekoa" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:977 msgid "Remote certificate not trusted." msgstr "Urruneko ziurtagiria ez da fidagarria" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2289 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Remote file" msgstr "Urruneko fitxategia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3099 -#: ../../locales/../src/interface/search.cpp:383 -#: ../../locales/../src/interface/search.cpp:388 -#: ../../locales/../src/interface/search.cpp:397 -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/search.cpp:666 +#: ../../locales/../src/interface/search.cpp:671 msgid "Remote file search" msgstr "Urruneko fitxategiaren bilaketa" @@ -6329,11 +6226,11 @@ msgid "Remote filters:" msgstr "Urruneko iragazkiak:" -#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/edithandler.cpp:1096 msgid "Remote path" msgstr "Urruneko bide-izena" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6342,7 +6239,7 @@ "Urruneko bide-izena ezin da analizatu. Ziurtatu bide-izen absolutua " "baliozkoa dela eta uneko gunearen zerbitzari motak onartzen duela (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1113 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1130 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6352,50 +6249,50 @@ "baliozkoa dela eta gune gurasoan hautatutako zerbitzari motak (%s) onartzen " "duela." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1132 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Urruneko bide-izena ezin da analizatu. Ziurtatu bide-izen absolutua " "baliozkoa dela." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:333 msgid "Remote path could not be parsed." msgstr "Urruneko bide-izena ezin izan da analizatu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3188 msgid "Remote path handling:" msgstr "Urruneko bide-izenaren tratamendua:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1730 msgid "Remote path:" msgstr "Urruneko bide-izena:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Urruneko gunea:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 msgid "Remove &all" msgstr "Kendu &denak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &selected" msgstr "Kendu &hautatuak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1437 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:287 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Rename file" msgstr "Aldatu fitxategiaren izena" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 msgid "Rename selected directory" msgstr "Aldatu hautatutako direktorioaren izena" @@ -6404,72 +6301,64 @@ msgid "Rename selected files and directories" msgstr "Aldatu hautatutako fitxategi eta direktorioen izena" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3393 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2413 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3455 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2316 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Aldatu '%s'-ren izena, eta jarri %s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3521 msgid "Reporting bugs and feature requests" msgstr "Bidali errore-txostenak eta eginbide-eskaerak" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:368 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Eskaerak huts egin du - bezeroak ez du identd exekutatu (edo zerbitzaritik " "ezin da atzitu)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:371 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Eskaerak huts egin du - bezeroaren identd-k ezin izan du erabiltzailearen ID " "katea berretsi" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:365 msgid "Request rejected or failed" msgstr "Eskaera baztertu egin da edo huts egin du" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:537 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:519 msgid "Require explicit FTP over TLS" msgstr "TLS bidezko FTP esplizitua behar du" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:520 msgid "Require implicit FTP over TLS" msgstr "TLS bidezko FTP inplizitua behar du" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 msgid "Reset and requeue &all" msgstr "Berrezarri eta berriro jarri ilaran &denak" -#: ../../locales/../src/engine/socket.cpp:1098 -msgid "Resolved protocol is unknown" -msgstr "Ebatzitako protokoloa ezezaguna da" - -#: ../../locales/../src/engine/ControlSocket.cpp:1078 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:443 #, c-format msgid "Resolving address of %s" msgstr "%s(r)en helbidea ebazten" -#: ../../locales/../src/engine/socket.cpp:1057 -msgid "Resource temporarily unavailable" -msgstr "Baliabidea ez dago eskuragarri aldi baterako" - -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:343 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:353 msgid "Response:" msgstr "Erantzuna:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3134 msgid "Results:" msgstr "Emaitzak:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1436 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" @@ -6483,19 +6372,19 @@ "ASCII fitxategiei berrekiteak arazoak sor ditzake zerbitzariak eta bezeroak " "lerro-amaieretan formatu desberdinak erabiliz gero" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:923 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1346 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:852 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "\"%s\"(r)en direktorio-zerrenda berreskuratzen..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:920 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1343 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:849 msgid "Retrieving directory listing..." msgstr "Direktorio-zerrenda berreskuratzen..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3769 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3836 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Kanpoko IP helbidea berreskuratzen %s(e)tik" @@ -6508,17 +6397,17 @@ msgid "S&how the Site Manager on startup" msgstr "Era&kutsi gune-kudeatzailea abioan" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "It&zali sistema" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" +msgstr "It&zali sistema behin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3058 msgid "S&top" msgstr "Geldi&tu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "E&seki sistema" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" +msgstr "E&seki sistema behin" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" @@ -6532,47 +6421,51 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:142 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 proxya hona konektatuko da: %s" +#: ../../locales/../src/engine/proxy.cpp:170 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5ek ez ditu 255 karaktere baino gehiagoko erabiltzaile-izen eta " +"pasahitzak onartzen." + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "Ezarpenak gorde?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:976 +#: ../../locales/../src/interface/manual_transfer.cpp:442 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:989 msgid "Saving of password has been disabled by your system administrator." msgstr "" "Pasahitza gordetzea desgaitu egin du zure sistemaren administratzaileak." -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "Saving of passwords has been disabled by you." msgstr "Pasahitza gordetzea desgaitu egin duzu." -#: ../../locales/../src/interface/QueueView.cpp:1718 -msgid "Scanning for files to add to queue" -msgstr "Ilaran gehitzeko fitxategiak bilatzen" - -#: ../../locales/../src/interface/QueueView.cpp:1720 -msgid "Scanning for files to upload" -msgstr "Kargatzeko fitxategiak bilatzen" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1462 +#, fuzzy +msgid "Scale factor:" +msgstr "Direktorio &lokala:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3064 msgid "Search &conditions:" msgstr "Bi&laketa-baldintzak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3046 msgid "Search &directory:" msgstr "Bilatu &direktorioa:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 msgid "Search for files recursively." msgstr "Bilatu fitxategiak errekurtsiboki." @@ -6580,16 +6473,20 @@ msgid "Search server for files" msgstr "Bilatu fitxategiak zerbitzarian" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3015 +msgid "Search type:" +msgstr "Bilatu mota:" + +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Security information" msgstr "Segurtasun-informazioa" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Ikusi: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2377 msgid "Sele&ct server" msgstr "Ha&utatu zerbitzaria" @@ -6608,7 +6505,7 @@ "Hautatu ekintza lehenetsia transferentzia batean helburu-fitxategia lehendik " "badagoenean." -#: ../../locales/../src/interface/edithandler.cpp:1532 +#: ../../locales/../src/interface/edithandler.cpp:1541 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Hautatu editore lehenetsia" @@ -6629,138 +6526,142 @@ "Hautatu ekintza lehenetsia fitxategia badagoenean, soilik ilaran hautatu " "diren fitxategientzat." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "Hautatu gako pribatua duen fitxategia" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Hautatu esportatutako datuetarako fitxategia" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1454 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Hautatu esportatutako iragazkientzako fitxategia" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1427 msgid "Select file for exported queue" msgstr "Hautatu esportatutako ilararentzako fitxategia" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Hautatu esportatutako ezarpenetarako fitxategia" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2279 msgid "Select file for exported sites" msgstr "Hautatu esportatutako guneetarako fitxategia" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Hautatu fitxategia haren ezarpenak inportatzeko" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Hautatu kargatzeko fitxategia" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:143 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Hautatu bihurtutako gako-fitxategiaren fitxategi-izena" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2907 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2928 msgid "Select how these files should be opened." msgstr "Hautatu fitxategi hauek irekitzeko modua." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:847 msgid "Select target download directory" msgstr "Hautatu helburuko direktorioa deskargarako" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Hautatu helburuko fitxategi-izena" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1569 msgid "Select the categories to export:" msgstr "Hautatu esportatuko diren kategoriak:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Select the private data you would like to delete." msgstr "Hautatu ezabatu nahi dituzun datu pribatuak." -#: ../../locales/../src/interface/search.cpp:475 +#: ../../locales/../src/interface/search.cpp:806 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "%d direktorio eta bere edukiak transferentziarako hautatuta." msgstr[1] "%d direktorio eta haien edukiak transferentziarako hautatuta." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d direktorio hautatuta." msgstr[1] "%d direktorio hautatuta." -#: ../../locales/../src/interface/search.cpp:473 +#: ../../locales/../src/interface/search.cpp:804 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "%d fitxategi transferentziarako hautatuta." msgstr[1] "%d fitxategi transferentziarako hautatuta." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "%d fitxategi hautatuta. Tamaina guztira: %s" msgstr[1] "%d fitxategi hautatuta. Tamaina guztira: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "%d fitxategi hautatuta. Tamaina guztira: gutxienez %s" msgstr[1] "%d fitxategi hautatuta. Tamaina guztira: gutxienez %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:810 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s eta %s transferentziarako hautatuta." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "%s eta %s hautatuta. Tamaina guztira: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s eta %s hautatuta. Tamaina guztira: gutxienez %s" -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1551 +#: ../../locales/../src/interface/edithandler.cpp:1486 +#: ../../locales/../src/interface/edithandler.cpp:1560 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Hautatutako editorea ez dago." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1856 msgid "Selected file already being edited" msgstr "Hautatutako fitxategia lehendik editatzen ari da" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "Hautatutako fitxategia lehendik kargatuta dago." -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1658 msgid "Selected file is already opened" msgstr "Hautatutako fitxategia lehendik irekita dago" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1730 msgid "Selected file is still being edited" msgstr "Hautatutako fitxategia editatzen ari da oraindik" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Selected filter only works for local files." msgstr "Hautatutako iragazkiak fitxategi lokaletarako soilik balio du." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:299 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6769,7 +6670,7 @@ "desberdinak erabiltzen dituzte.\n" "Zerbitzari honekin erabili gunearen araberako laster-markak." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:302 msgid "Selected port usually in use by a different protocol." msgstr "Hautatutako ataka beste protokolo batek erabili ohi du." @@ -6783,36 +6684,36 @@ "Bidali komando pertsonalizatua zerbitzariari, bestela ez bada erabilgarri " "egongo" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4316 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4406 msgid "Sending keep-alive command" msgstr "Aktibo mantentzeko komandoa bidaltzen" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Serial number:" msgstr "Serie-zenbakia:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:322 msgid "Server &Type:" msgstr "Zerbitzari &mota:" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket.cpp:866 msgid "Server did not properly shut down TLS connection" msgstr "Zerbitzariak ez du ondo itxi TLS konexioa" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:945 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1006 msgid "Server does not support non-ASCII characters." msgstr "Zerbitzariak ez ditu onartzen ASCII ez diren karaktereak." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4150 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4244 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "" "Zerbitzariak ez du onartzen %d GB baino handiago diren fitxategiei " "berrekitea." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4146 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6821,17 +6722,17 @@ "Zerbitzariak ez du onartzen %d GB baino handiago diren fitxategiei " "berrekitea. Amaitu transferentzia, fitxategien tamainak bat datoz." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528 msgid "Server does not support resume of files > 2GB." msgstr "" "Zerbitzariak ez du onartzen 2GB baino handiago diren fitxategiei berrekitea." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 msgid "Server does not support resume of files > 4GB." msgstr "" "Zerbitzariak ez du onartzen 4GB baino handiago diren fitxategiei berrekitea." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4161 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4253 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6840,7 +6741,7 @@ "Baliteke zerbitzariak ez onartzea %d GB baino handiago diren fitxategiei " "berrekitea. Amaitu transferentzia, fitxategien tamainak bat datoz." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:886 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6848,11 +6749,11 @@ "Baliteke zerbitzariak kontu bat behar izatea. Saiatu kontu bat adierazten " "gune-kudeatzailea erabiliz" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:349 msgid "Server returned empty path." msgstr "Zerbitzariak bide-izen hutsa itzuli du." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:620 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6860,13 +6761,13 @@ "Zerbitzariak beste gonbit bat bidali du saio-hasiera egiteko. Saio-hasiera " "mota interaktiboa erabili behar duzu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3716 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3787 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Zerbitzariak erantzun pasiboa bidali du helbide bideraezinarekin. Modu " "pasiboak huts egin du." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3711 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3782 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6874,36 +6775,43 @@ "Zerbitzariak erantzun pasiboa bidali du helbide bideraezinarekin. Horren " "ordez zerbitzariaren helbidea erabiliko da." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:425 -#: ../../locales/../src/interface/netconfwizard.cpp:464 -#: ../../locales/../src/interface/netconfwizard.cpp:473 -#: ../../locales/../src/interface/netconfwizard.cpp:485 -#: ../../locales/../src/interface/netconfwizard.cpp:509 -#: ../../locales/../src/interface/netconfwizard.cpp:516 -#: ../../locales/../src/interface/netconfwizard.cpp:525 -#: ../../locales/../src/interface/netconfwizard.cpp:536 +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Zerbitzariak ustekabeko erantzuna bidali du." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket.cpp:1254 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Zerbitzariak ordenatu gabeko ziurtagiri kateak bidali ditu, TLS " +"espezifikazioak urratuz." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 msgid "Server to client MAC:" msgstr "Zerbitzaritik bezerorako MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2086 msgid "Server to client cipher:" msgstr "Zerbitzaritik bezerorako zifraketa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2440 msgid "Server&type:" msgstr "Zerbitzari mo&ta:" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Server/Local file" msgstr "Zerbitzaria/Fitxategi lokala" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1720 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Server:" msgstr "Zerbitzaria:" @@ -6911,20 +6819,16 @@ msgid "Session details" msgstr "Saioaren xehetasunak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "&Lehentasuna ezarri" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2292 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3599 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2198 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Ezarri baimenak '%s'(e)tik '%s'(e)ra" -#: ../../locales/../src/engine/transfersocket.cpp:789 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize-i deitu zaio socket-ik gabe" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "Ezarpenak" @@ -6933,7 +6837,11 @@ msgid "Settings directory:" msgstr "Ezarpenen direktorioa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "&Erakutsi jakinarazpen burbuila" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2284 msgid "Show &raw directory listing" msgstr "Erakutsi di&rektorio-zerrenda gordina" @@ -6941,19 +6849,20 @@ msgid "Show &welcome dialog..." msgstr "Erakutsi &ongietorri-elkarrizketa..." -#: ../../locales/../src/interface/Mainfrm.cpp:2224 +#: ../../locales/../src/interface/Mainfrm.cpp:2223 msgid "Show both directory trees and continue comparing?" msgstr "Erakutsi bi direktorio-zuhaitzak eta konparatzen jarraitu?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:240 msgid "Show details" msgstr "Erakutsi xehetasunak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1599 msgid "Show details about custom date and time formats" msgstr "Erakutsi data eta denbora-formatu pertsonalizatuei buruzko xehetasunak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "Shows available TLS ciphers" msgstr "TLS zifraketa erabilgarriak erakusten ditu" @@ -6961,7 +6870,7 @@ msgid "Shows this help dialog" msgstr "Laguntza-elkarrizketa hau erakusten du" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:2677 msgid "Shutdown now" msgstr "Itzali orain" @@ -6969,7 +6878,7 @@ msgid "Signature algorithm:" msgstr "Sinadura-algoritmoa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1631 msgid "Site &Manager entries" msgstr "G&une-kudeatzailearen sarrerak" @@ -6977,56 +6886,55 @@ msgid "Site Manager" msgstr "Gune-kudeatzailea" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:984 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:997 msgid "Site Manager - Cannot remember password" msgstr "Gune-kudeatzailea - Ezin da pasahitza gogoratu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:952 #: ../../locales/../src/interface/sitemanager_dialog.cpp:965 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:997 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1014 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1010 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1027 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1125 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1132 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1040 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1133 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1149 msgid "Site Manager - Invalid data" msgstr "Gune-kudeatzailea - Datu baliogabeak" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:327 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "Gune-kudeatzailea lehendik irekita" -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:486 +#: ../../locales/../src/interface/sitemanager.cpp:514 +#: ../../locales/../src/interface/sitemanager.cpp:528 +#: ../../locales/../src/interface/sitemanager.cpp:540 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Site does not exist." msgstr "Gunea ez dago." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:497 msgid "Site path has to begin with 0 or 1." msgstr "Gunearen bide-izenak 0 edo 1 behar du hasieran." -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:752 +#: ../../locales/../src/interface/sitemanager.cpp:534 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:786 msgid "Site path is malformed." msgstr "Bide-izena gaizki osatuta dago." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Gunearen araberako laster-markak" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7036,11 +6944,11 @@ "kudeatzailean gordeta egotea.\n" "Uneko konexioa gune-kudeatzailean gehitu?" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Size" msgstr "Tamaina" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1613 msgid "Size formatting" msgstr "Tamaina-formatua" @@ -7048,50 +6956,35 @@ msgid "Size unknown" msgstr "Tamaina ezezaguna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1438 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "Saltatu fitxategia" -#: ../../locales/../src/engine/ControlSocket.cpp:1149 -#: ../../locales/../src/engine/ControlSocket.cpp:1166 -#: ../../locales/../src/engine/ControlSocket.cpp:1190 -#: ../../locales/../src/engine/ControlSocket.cpp:1250 +#: ../../locales/../src/engine/ControlSocket.cpp:1160 +#: ../../locales/../src/engine/ControlSocket.cpp:1177 +#: ../../locales/../src/engine/ControlSocket.cpp:1203 +#: ../../locales/../src/engine/ControlSocket.cpp:1281 #, c-format msgid "Skipping download of %s" msgstr "%s deskargatzea saltatzen" -#: ../../locales/../src/engine/ControlSocket.cpp:1153 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1194 -#: ../../locales/../src/engine/ControlSocket.cpp:1254 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:309 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Existitzen ez den \"%s\" gako-fitxategia saltatzen" + +#: ../../locales/../src/engine/ControlSocket.cpp:1163 +#: ../../locales/../src/engine/ControlSocket.cpp:1180 +#: ../../locales/../src/engine/ControlSocket.cpp:1206 +#: ../../locales/../src/engine/ControlSocket.cpp:1284 #, c-format msgid "Skipping upload of %s" msgstr "%s kargatzea saltatzen" -#: ../../locales/../src/engine/socket.cpp:1061 -msgid "Socket address outside address space" -msgstr "Socket-helbidea helbideen espaziotik kanpo" - -#: ../../locales/../src/engine/socket.cpp:1063 -msgid "Socket already connected" -msgstr "Socket-a dagoeneko konektatuta" - -#: ../../locales/../src/engine/socket.cpp:1071 -msgid "Socket has been shut down" -msgstr "Socket-a itzali da" - -#: ../../locales/../src/engine/socket.cpp:1068 -msgid "Socket not connected" -msgstr "Socket-a ez dago konektatuta" - -#: ../../locales/../src/engine/socket.cpp:1111 -msgid "Socket type not supported for address family" -msgstr "Socket-mota ez da onartzen helbide-familian" - -#: ../../locales/../src/interface/Mainfrm.cpp:1168 +#: ../../locales/../src/interface/Mainfrm.cpp:1167 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Fitxategi batzuk oraindik editatzen ari dira edo kargatu egin behar dira." @@ -7105,31 +6998,31 @@ "Baliteke gaizki konfiguratutako urruneko zerbitzari batzuek, bideratzaile " "baten atzean daudenak, haien IP helbide lokalarekin erantzutea." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1746 msgid "Sort directories inline" msgstr "Ordenatu direktorioak lerroan" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." msgstr "Ordenatzeko hurrenkera ezin da aldatu direktorioak konparatzean." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1730 msgid "Sorting" msgstr "Ordenatzen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1737 msgid "Sorting &mode:" msgstr "Ordenatzeko &modua:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:107 msgid "Source and path of the drop operation are identical" msgstr "Arrastatzeko ekintzaren iturburua eta bide-izena berberak dira" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:153 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Iturburu- eta helburu-fitxategiak ezin dira berdinak izan" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Arrastatzeko ekintzaren iturburua eta helburua berberak dira" @@ -7137,7 +7030,7 @@ msgid "Source file:" msgstr "Iturburu-fitxategia:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3632 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3786 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 msgid "Speed Limits" @@ -7147,27 +7040,27 @@ msgid "Speed limits" msgstr "Abiadura-mugak" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:582 msgid "Speed limits are disabled, click to change." msgstr "Abiadura-mugak desgaituta daude; egin klik aldatzeko." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:585 msgid "Speed limits are enabled, click to change." msgstr "Abiadura-mugak gaituta daude; egin klik aldatzeko." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2078 msgid "Stable and beta versions" msgstr "Bertsio egonkorrak eta beta bertsioak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2077 msgid "Stable versions only" msgstr "Bertsio egonkorrak soilik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2079 msgid "Stable, beta and nightly versions" msgstr "Bertsio egonkorrak, beta bertsioak eta nightly build bertsioak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2571 msgid "Start transfer &immediately" msgstr "Hasi transferentzia &berehala" @@ -7175,19 +7068,19 @@ msgid "Start with opened Site Manager" msgstr "Gune-kudeatzailea irekita dagoela hasi" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" msgstr "Eguneraketak bilatzen hasi da %s(e)n\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1557 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2232 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1452 #, c-format msgid "Starting download of %s" msgstr "%s deskargatzen hastea" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1560 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1455 #, c-format msgid "Starting upload of %s" msgstr "%s kargatzen hastea" @@ -7196,30 +7089,30 @@ msgid "Starts the local site in the given path" msgstr "Gune lokala hasten du emandako bide-izenean" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "State or province:" msgstr "Estatua edo probintzia:" -#: ../../locales/../src/interface/edithandler.cpp:1088 -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1097 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Status" msgstr "Egoera" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:367 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:377 msgid "Status:" msgstr "Egoera:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "Gelditu eta kendu &denak" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Gelditu eragiketa errekurtsiboa" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Street:" msgstr "Kalea:" @@ -7235,11 +7128,11 @@ msgid "Summary of test results:" msgstr "Probaren emaitzen laburpena:" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:2685 msgid "Suspend now" msgstr "Eseki orain" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3382 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7247,28 +7140,33 @@ "Aukera honek ez du eraginik fitxategietarako esteka sinbolikoetan, halako " "estekak ezabatu egiten dira beti." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:237 -#: ../../locales/../src/interface/state.cpp:251 -#: ../../locales/../src/interface/state.cpp:257 -#: ../../locales/../src/interface/state.cpp:267 -#: ../../locales/../src/interface/state.cpp:353 -#: ../../locales/../src/interface/state.cpp:361 -#: ../../locales/../src/interface/state.cpp:369 -#: ../../locales/../src/interface/state.cpp:901 -#: ../../locales/../src/interface/state.cpp:909 -#: ../../locales/../src/interface/state.cpp:915 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3847 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:83 +#: ../../locales/../src/interface/state.cpp:233 +#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:254 +#: ../../locales/../src/interface/state.cpp:264 +#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:378 +#: ../../locales/../src/interface/state.cpp:997 +#: ../../locales/../src/interface/state.cpp:1005 +#: ../../locales/../src/interface/state.cpp:1012 +#: ../../locales/../src/interface/state.cpp:1021 +#: ../../locales/../src/interface/state.cpp:1048 msgid "Synchronized browsing" msgstr "Arakatze sinkronizatua" -#: ../../locales/../src/interface/state.cpp:368 +#: ../../locales/../src/interface/state.cpp:377 msgid "Synchronized browsing has been disabled." msgstr "Arakatze sinkronizatua desgaitu egin da." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Direktorioak sinkronizatzen." + +#: ../../locales/../src/interface/quickconnectbar.cpp:84 +#: ../../locales/../src/interface/quickconnectbar.cpp:121 msgid "Syntax error" msgstr "Sintaxi-errorea" @@ -7277,12 +7175,12 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2336 -#: ../../locales/../src/interface/Mainfrm.cpp:2378 +#: ../../locales/../src/interface/Mainfrm.cpp:2338 +#: ../../locales/../src/interface/Mainfrm.cpp:2383 msgid "Syntax error in command line" msgstr "Sintaxi-errorea komando-lerroan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Sistema" @@ -7290,31 +7188,23 @@ msgid "System details" msgstr "Sistemaren xehetasunak" -#: ../../locales/../src/engine/socket.cpp:1052 -msgid "System limit of open files exceeded" -msgstr "Sistemaren irekitako fitxategien muga gainditu da" - -#: ../../locales/../src/engine/socket.cpp:1109 -msgid "System's network subsystem has failed" -msgstr "Sistemaren sarearen azpi-sistemak huts egin du" - #: ../../locales/../src/interface/resources/xrc/menus.xrc:102 msgid "T&oolbar" msgstr "&Tresna-barra" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:289 msgid "TLS connection established, sending HTTP request" msgstr "TLS konexioa ezarri da, HTTP eskaera bidaltzen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:436 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS konexioa ezarri da, ongietorri-mezuaren zain..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:439 msgid "TLS connection established." msgstr "TLS konexioa ezarri da." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "TTL expired" msgstr "TTL iraungita" @@ -7326,32 +7216,32 @@ msgid "Target file:" msgstr "Helburu-fitxategia:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2637 msgid "Target filename already exists!" msgstr "Helburu-fitxategiaren izena lehendik badago" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1620 msgid "Target filename already exists, really continue?" msgstr "" "Helburu-fitxategiaren izena lehendik badago, benetan jarraitu nahi duzu?" -#: ../../locales/../src/engine/socket.cpp:1082 -msgid "Temporary failure in name resolution" -msgstr "Aldi baterako errorea izen-ebazpenean" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Proba ondo egin da" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Probaren emaitzak" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4167 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4258 msgid "Testing resume capabilities of server" msgstr "Zerbitzariaren berrekiteko ahalmena probatzen" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:748 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:747 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Fitxategia konpondu ezean ezin da Gune-kudeatzailea erabili." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:326 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7361,7 +7251,7 @@ "Jarraitu nahi duzu? Orduan gune-kudeatzailean egindako aldaketak ez dira " "gordeko." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7369,29 +7259,21 @@ "Gune-kudeatzailea irekita dago FileZilla 3-ren beste instantzia batean.\n" "Itxi edo datuak ezingo dira ezabatu." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Sartu duzun helbidea. %s" -#: ../../locales/../src/engine/socket.cpp:1088 -msgid "The ai_family member is not supported" -msgstr "ai_family-ko kidea ez da onartzen" - -#: ../../locales/../src/engine/socket.cpp:1101 -msgid "The ai_socktype member is not supported" -msgstr "ai_socktype kidea ez da onartzen" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:663 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:685 msgid "The bookmark could not be added." msgstr "Laster-marka ezin izan da erantsi." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:773 msgid "The bookmarks could not be cleared." msgstr "Laster-markak ezin izan dira garbitu." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/interface/statusbar.cpp:471 msgid "The connection is encrypted. Click icon for details." msgstr "Konexioa zifratuta dago. Klik egin ikonoan xehetasunak jakiteko." @@ -7413,34 +7295,34 @@ "Denbora-formatu pertsonalizatua baliogabea da edo onartzen ez diren formatu-" "espezifikatzaileak ditu." -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../locales/../src/engine/transfersocket.cpp:144 #, c-format msgid "The data connection could not be established: %s" msgstr "Ezin izan da datuen konexioa ezarri: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 +#: ../../locales/../src/interface/edithandler.cpp:1521 msgid "The default editor for text files could not be found." msgstr "Ezin izan da aurkitu testu-fitxategietarako editore lehenetsia." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2918 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 #, c-format msgid "The default editor for text files is '%s'." msgstr "Testu-fitxategietarako editore lehenetsia '%s' da." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Sartutako iragazki-izena lehendik badago, aukeratu beste izen bat." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "'%s' luzapena lehendik badago zerrendan" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:278 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:284 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:290 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:298 #, c-format msgid "" "The file %s already exists.\n" @@ -7449,8 +7331,8 @@ "%s fitxategia lehendik badago\n" "Sartu izen berri bat:" -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../../locales/../src/interface/edithandler.cpp:1631 +#: ../../locales/../src/interface/LocalListView.cpp:1740 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7461,18 +7343,27 @@ "Ezin izan da programa asoziatua (%s) aurkitu.\n" "Egiaztatu fitxategi moten asoziaziok." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:52 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"'%s' fitxategiak SSH1 gako bat dauka. SSH1 protokoloa zaharkituta dago, " +"FileZillak SSH2 gakoak soilik onartzen ditu." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "'%s' fitxategia ezin izan da kargatu edo ez dauka gako pribaturik." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:36 #, c-format msgid "The file '%s' could not be loaded." msgstr "'%s' fitxategia ezin izan da kargatu." -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7481,8 +7372,8 @@ "'%s' fitxategia ezin izan da ireki:\n" "Ez da programarik asoziatu fitxategi mota honekin zure sisteman." -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1743 +#: ../../locales/../src/interface/LocalListView.cpp:1748 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7491,8 +7382,8 @@ "'%s' fitxategia ezin izan da ireki:\n" "Komando asoziatuak huts egin du" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:755 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:754 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7504,20 +7395,7 @@ "dezake.\n" "Jarraitu nahi duzu?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 -#, c-format -msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected key files are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"FileZilla-k ez du onartzen '%s' fitxategiaren formatua.\n" -"Gainera fitxategiak pasahitzaren babesa dauka. FileZilla-k oraindik ez ditu " -"onartzen pasahitzaren babesa daukaten gako-fitxategiak.\n" -"Pasa nahi duzu babesik gabeko formatu onartu batera?" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:102 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7526,22 +7404,11 @@ "FileZilla-k ez du onartzen '%s' fitxategiaren formatua.\n" "Pasa nahi duzu formatu onartu batera?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:107 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected key files are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"%s fitxategiak pasahitzaren babesa dauka. FileZilla-k oraindik ez ditu " -"onartzen pasahitzaren babesa daukaten gako-fitxategiak.\n" -"Babesik gabeko fitxategi bihurtu nahi duzu?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Editore lehenetsi moduan hautatutako fitxategia ez dago." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7555,11 +7422,11 @@ "eta pasahitza soilik inportatuko dira.\n" "Inportatzen jarraitu nahi duzu?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Fitxategi-izenaren zutabea ezin da ezkutatu edo mugitu." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "Fitxategi-izenaren zutabea ezin da ezkutatu." @@ -7573,19 +7440,19 @@ msgid "The following characters will be replaced: %s" msgstr "Karaktere hauek ordeztu egingo dira: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 msgid "The following files are currently being edited:" msgstr "Fitxategi hauek unean editatzen ari dira:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3437 msgid "The free open source FTP solution" msgstr "Kode irekiko doako FTP tresna" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Laster-marka orokorrak ezin izan dira gorde." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2271 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7599,7 +7466,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Mugak 1 eta 2000 MiB bitartean egon behar du" -#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:1048 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "'%s' direktorio lokala ezin izan da sortu." + +#: ../../locales/../src/interface/state.cpp:1033 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "'%s' direktorio lokala ez da existitzen." + +#: ../../locales/../src/interface/state.cpp:245 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7608,7 +7485,7 @@ "'%s' direktorio lokala ez dago (%s) sinkronizazio-erroaren azpian.\n" "Arakatze sinkronizatua desgaitu eta direktorio lokala aldatzen jarraitu?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7616,19 +7493,24 @@ "Ataka-zenbaki erabilgarri txikienak handienaren berdina edo handiagoa izan " "behar du." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Ezin izan da bertsio berria deskargatu, saiatu berriro geroago." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Bertsio berria zure Deskargak direktorioan gorde da." -#: ../../locales/../src/interface/QueueView.cpp:1840 +#: ../../locales/../src/interface/QueueView.cpp:1524 msgid "The queue will not be saved." msgstr "Ilara ez da gordeko." -#: ../../locales/../src/interface/state.cpp:906 +#: ../../locales/../src/interface/state.cpp:958 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Urruneko '%s' direktorioa ez da existitzen." + +#: ../../locales/../src/interface/state.cpp:1002 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7637,28 +7519,28 @@ "'%s' urruneko direktorioa ez dago (%s) sinkronizazio-erroaren azpian.\n" "Arakatze sinkronizatua desgaitu eta urruneko direktorioa aldatzen jarraitu?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Hautatutako kategoriak inportatu dira." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1626 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Hautatutako fitxategiak inporta daitezkeen datuak ditu kategoria hauetan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1863 msgid "The selected file is already being edited:" msgstr "Hautatutako fitxategia lehendik editatzen ari da:" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1730 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Hautatutako fitxategia oraindik irekita dago beste programa batean, itxi." -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/edithandler.cpp:1636 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7668,15 +7550,15 @@ "Arriskutsua izan daiteke eta zure sistema hondatu.\n" "Benetan jarraitu nahi duzu?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../../locales/../src/interface/sitemanager.cpp:581 msgid "The server could not be added." msgstr "Ezin izan da zerbitzaria erantsi." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Zerbitzariak erantzun ezezaguna edo ustekabekoa bidali du." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "The server uses following charset encoding for filenames:" msgstr "" "Zerbitzariak karaktere-jokoen honako kodeketa erabiltzen du fitxategi-" @@ -7708,11 +7590,12 @@ "Zerbitzariaren ostalari-gakoa ezezaguna da. Ezin da bermatu zerbitzaria uste " "duzun ordenagailua denik." -#: ../../locales/../src/engine/socket.cpp:1100 -msgid "The servname parameter is not supported for ai_socktype" -msgstr "ai_socktype-ek ez du onartzen servname parametroa" +#: ../../locales/../src/engine/tlssocket.cpp:1339 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "" +"Zerbitzariaren ostalari-izena ez dator bat ziurtagiriko ostalari-izenarekin" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7720,19 +7603,11 @@ "Ezarpenak inportatu dira. FileZilla berrabiarazi behar da ezarpen guztiek " "eragina izateko." -#: ../../locales/../src/engine/socket.cpp:1048 -msgid "The specified address family is not supported" -msgstr "Zehazturiko helbide-familia ez da onartzen" - -#: ../../locales/../src/engine/socket.cpp:1113 -msgid "The specified network name is no longer available" -msgstr "Zehazturiko sare-izena ez dago eskuragarri" - -#: ../../locales/../src/interface/QueueView.cpp:3052 +#: ../../locales/../src/interface/QueueView.cpp:2680 msgid "The system will soon reboot unless you click Cancel." msgstr "Sistema laster berrabiaraziko da, Utzi botoian klik egin ezean." -#: ../../locales/../src/interface/QueueView.cpp:3048 +#: ../../locales/../src/interface/QueueView.cpp:2676 msgid "The system will soon shut down unless you click Cancel." msgstr "Sistema laster itxiko da, Utzi botoian klik egin ezean." @@ -7744,11 +7619,11 @@ "Helburu-fitxategia lehendik badago.\n" "Aukeratu ekintza bat." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Proba ez da gainditu. Benetan gorde nahi dituzu ezarpenak?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:72 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Baliozko '%s' babeskopia-fitxategia ezin izan da berrezarri." @@ -7757,15 +7632,15 @@ msgid "Themes" msgstr "Diseinuak" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:326 msgid "This filter set cannot be removed." msgstr "Iragazki hau ezin da kendu." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:266 msgid "This filter set cannot be renamed." msgstr "Iragazki-multzo honen izena ezin da aldatu." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7789,11 +7664,11 @@ "Morroi honek lagunduko dizu bideratzaile eta suebakiak ondo konfiguratzen " "eta konfigurazioa probatuko du." -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Time" msgstr "Ordua" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 msgid "Time formatting" msgstr "Ordu-formatua" @@ -7802,27 +7677,26 @@ msgstr "Denbora-&muga segundotan:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:379 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "Denbora-muga" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1031 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1710 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "Zerbitzariaren ordu-zonaren tartea %d segundo da." -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Title:" msgstr "Izenburua:" -#: ../../locales/../src/interface/Mainfrm.cpp:2222 +#: ../../locales/../src/interface/Mainfrm.cpp:2221 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Direktorioak konparatzeko, bi fitxategi-zerrendek lerrokatuta egon behar " "dute." -#: ../../locales/../src/interface/Mainfrm.cpp:2223 +#: ../../locales/../src/interface/Mainfrm.cpp:2222 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Horretarako, bi direktorio-zuhaitzek bistan egon behar dute, edo biek " @@ -7836,7 +7710,7 @@ "Gako publikoaren autentifikazioa onartzeko, FileZilla-k zein gako pribatu " "erabili jakin behar du." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7853,7 +7727,7 @@ "Berdea: fitxategia berriagoa da beste aldeko fitxategi markatu gabea baino\n" "Gorria: tamaina desberdineko fitxategiak" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7863,51 +7737,51 @@ "Gaituta badago, direktorio lokalaren hierarkia arakatzean zerbitzariko " "direktorioa ere aldatuko da, eta alderantziz." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:48 msgid "Toggles processing of the transfer queue" msgstr "Transferentzia ilararen prozesaketa txandakatzen du." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:23 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:25 msgid "Toggles the display of the local directory tree" msgstr "Direktorio lokalen zuhaitzaren bistaratzea txandakatzen du" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:17 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:19 msgid "Toggles the display of the message log" msgstr "Mezu-erregistroaren bistaratzea txandakatzen du" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:29 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:31 msgid "Toggles the display of the remote directory tree" msgstr "Urruneko direktorioen zuhaitzaren bistaratzea txandakatzen du" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:35 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:37 msgid "Toggles the display of the transfer queue" msgstr "Transferentzia ilararen bistaratzea txandakatzen du." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:541 msgid "Too long header line" msgstr "Goiburu-lerro luzeegia" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:610 msgid "Too many redirects" msgstr "Birbideratze gehiegi" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:353 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Trace:" msgstr "Jarraitu aztarnari:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1853 msgid "Transfer" msgstr "Transferentzia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Transfer &direction" msgstr "Transferentziaren &norabidea" @@ -7923,22 +7797,22 @@ msgid "Transfer Queue" msgstr "Transferentzia ilara" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "Transfer Settings" msgstr "Transferentzia-ezarpenak" -#: ../../locales/../src/engine/transfersocket.cpp:446 -#: ../../locales/../src/engine/transfersocket.cpp:468 +#: ../../locales/../src/engine/transfersocket.cpp:452 +#: ../../locales/../src/engine/transfersocket.cpp:474 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Transferentzia-konexioa etenda: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Transferitutako datuak kaltetu egin dira." -#: ../../locales/../src/interface/queue.cpp:389 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:249 msgid "Transferring" msgstr "Transferitzen" @@ -7946,8 +7820,7 @@ msgid "Transfers" msgstr "Transferentziak" -#: ../../locales/../src/interface/QueueView.cpp:2950 -#: ../../locales/../src/interface/QueueView.cpp:2953 +#: ../../locales/../src/interface/QueueView.cpp:2569 msgid "Transfers finished" msgstr "Transferentziak amaitu dira" @@ -7959,11 +7832,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "&Fitxategi hauek ASCII fitxategi gisa tratatu:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:760 msgid "Trust changed Hostkey:" msgstr "Fidatu aldatutako ostalari-gakoaz:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:827 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:757 msgid "Trust new Hostkey:" msgstr "Fidatu ostalari-gako berriaz:" @@ -7979,13 +7852,13 @@ msgid "Trust this host and carry on connecting?" msgstr "Ostalari honetaz fidatu eta konektatzen jarraitu?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:227 msgid "Try again" msgstr "Saiatu berriro" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2607 +#: ../../locales/../src/interface/edithandler.cpp:1095 msgid "Type" msgstr "Mota" @@ -7997,47 +7870,47 @@ msgid "Type of generic proxy:" msgstr "Proxy orokor mota:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1944 msgid "U&pload" msgstr "K&argatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3573 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3727 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "K&argaren muga:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1963 msgid "U&se filetype associations if available" msgstr "Era&bili fitxategi moten asoziazioak erabilgarri badaude" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Era&bili sistemaren lehenespenak" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +msgid "U&se system defaults for current language" +msgstr "&Erabili sistemaren lehenespenak uneko hizkuntzarentza" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "ERABILTZAILEA@&OSTALARIA" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:374 +#: ../../locales/../src/engine/proxy.cpp:500 #, c-format msgid "Unassigned error code %d" msgstr "Esleitu gabeko %d errore-kodea" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Unit:" msgstr "Unitatea:" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1146 +#: ../../locales/../src/interface/edithandler.cpp:1127 +#: ../../locales/../src/interface/edithandler.cpp:1155 msgid "Unknown" msgstr "Ezezaguna" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "FTP proxy mota ezezaguna, ezin da sortu saio-hasierako sekuentzia." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:422 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "SOCKS protokoloaren bertsio ezezaguna: %d" @@ -8046,11 +7919,22 @@ msgid "Unknown certificate" msgstr "Ziurtagiri ezezaguna" +#: ../../locales/../src/engine/misc.cpp:125 +#: ../../locales/../src/engine/misc.cpp:138 +#, c-format +msgid "Unknown error %d" +msgstr "Errore ezezaguna %d" + +#: ../../locales/../src/engine/misc.cpp:102 +#, c-format +msgid "Unknown error %u" +msgstr "Errore ezezaguna %u" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "Ostalari-gako ezezaguna" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:430 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8059,14 +7943,14 @@ "Erabiltzaile-izen/Pasahitz autentifikazioaren azpinegoziaziorako SOCKS " "protokoloaren bertsio ezezaguna: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:273 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Erroko elementu ezezaguna, badirudi fitxategia ez duela FileZilla-k sortu." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8074,7 +7958,7 @@ "Arazo hauek konpondu ezean, FTP modu aktiboak ez du funtzionatuko eta modu " "pasiboa erabili beharko da." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8082,15 +7966,15 @@ "Arazo hau konpondu ezean, FTP modu aktiboak ez du funtzionatuko eta modu " "pasiboa erabili beharko da." -#: ../../locales/../src/engine/tlssocket.cpp:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1278 msgid "Unsupported certificate type" msgstr "Ziurtagiri mota hau ez da onartzen." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:598 msgid "Unsupported redirect" msgstr "Birbideraketa hau ez da onartzen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1950 msgid "Up&load and unedit" msgstr "Kar&gatu eta edizioa desegin" @@ -8099,24 +7983,29 @@ msgid "Updates" msgstr "Eguneraketak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2241 msgid "Upload" msgstr "Kargatu" -#: ../../locales/../src/interface/edithandler.cpp:1109 +#: ../../locales/../src/interface/edithandler.cpp:1118 msgid "Upload failed" msgstr "Kargatzeak huts egin du" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:595 #, c-format msgid "Upload limit: %s/s" msgstr "Kargaren muga: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:598 msgid "Upload limit: none" msgstr "Kargaren muga: bat ere ez" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3253 +#: ../../locales/../src/interface/search.cpp:873 +msgid "Upload search results" +msgstr "Kargatu bilaketaren emaitzak" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Upload selected directory" msgstr "Kargatu hautatutako direktorioa" @@ -8124,73 +8013,73 @@ msgid "Upload selected files and directories" msgstr "Kargatu hautatutako fitxategi eta direktorioak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 msgid "Upload this file back to the server?" msgstr "Fitxategi hau zerbitzarira kargatu berriro?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1750 msgid "Upload this file to the server?" msgstr "Fitxategi hau zerbitzarira kargatu?" -#: ../../locales/../src/interface/edithandler.cpp:1103 -#: ../../locales/../src/interface/edithandler.cpp:1137 -#: ../../locales/../src/interface/edithandler.cpp:1293 +#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1146 +#: ../../locales/../src/interface/edithandler.cpp:1302 msgid "Uploading" msgstr "Kargatzen" -#: ../../locales/../src/interface/edithandler.cpp:1106 -#: ../../locales/../src/interface/edithandler.cpp:1295 +#: ../../locales/../src/interface/edithandler.cpp:1115 +#: ../../locales/../src/interface/edithandler.cpp:1304 msgid "Uploading and pending removal" msgstr "Kargatzen eta kendu zain" -#: ../../locales/../src/interface/edithandler.cpp:1140 -#: ../../locales/../src/interface/edithandler.cpp:1297 +#: ../../locales/../src/interface/edithandler.cpp:1149 +#: ../../locales/../src/interface/edithandler.cpp:1306 msgid "Uploading and unediting" msgstr "Kargatzen eta edizioa desegiten" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:558 msgid "Use &custom charset" msgstr "Erabili karaktere-joko &pertsonalizatua" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1927 msgid "Use &custom editor:" msgstr "Erabili editore &pertsonalizatua:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2933 msgid "Use &default editor for text files" msgstr "Erabili editore &lehenetsia testu-fitxategietarako" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2711 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2792 msgid "Use &synchronized browsing" msgstr "Erabili &arakatze sinkronizatua" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:546 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Erabili UTF-8 zerbitzariak onartzen badu; bestela karaktere-joko lokala " "erabili." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 msgid "Use default action" msgstr "Erabili ekintza lehenetsia" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:536 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:518 msgid "Use explicit FTP over TLS if available" msgstr "Erabili TLS bidezko FTP esplizitua erabilgarri badago" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2346 msgid "Use server currently connected to" msgstr "Erabili unean konektatuta dagoen zerbitzaria" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2352 msgid "Use server from site manager" msgstr "Erabili gune-kudeatzaileko zerbitzaria" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Erabili sistemaren &lehenespenak" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +msgid "Use system &defaults for current language" +msgstr "Erabili sistemaren &lehenespenak uneko hizkuntzarentzat" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8227,12 +8116,12 @@ msgid "User:" msgstr "Erabiltzailea:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 +#: ../../locales/../src/interface/manual_transfer.cpp:501 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Username cannot be a series of spaces" msgstr "Erabiltzaile-izenak ezin du hutsune-segida bat izan" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:586 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8251,7 +8140,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "wxWidgets-en erregistro-mezu xehatuak" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1371 msgid "Verifying certificate..." msgstr "Ziurtagiria egiaztatzen..." @@ -8259,15 +8148,15 @@ msgid "Very high" msgstr "Oso handia" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1471 msgid "View hidden option set, but unsupported by server" msgstr "Ezkutuak ikusteko aukera ezarri da, baina zerbitzariak ez du onartzen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1835 msgid "View/Edit" msgstr "Ikusi/Editatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2143 msgid "Visible columns" msgstr "Ikusgai dauden zutabeak" @@ -8275,27 +8164,23 @@ msgid "W&rite" msgstr "I&datzi" -#: ../../locales/../src/interface/QueueView.cpp:1678 -msgid "Waiting" -msgstr "Zain" - -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "Arakatzeko konexioaren zain" -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "Pasahitzaren zain" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:243 msgid "Waiting for transfer to be cancelled" msgstr "Transferentzia uzteko zain" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:240 msgid "Waiting to retry..." msgstr "Berriro saiatzeko zain..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." msgstr "Abisua, IP okerreko datu konexioari ez ikusi egiten." @@ -8319,19 +8204,19 @@ msgid "Warning: Potential security breach!" msgstr "Abisua: segurtasun arazo potentziala." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3611 msgid "Welcome to FileZilla" msgstr "Ongi etorri FileZilla-ra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3472 msgid "What's new" msgstr "Zer berri" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Zer berri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3801 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8356,7 +8241,7 @@ msgid "Widescreen" msgstr "Panoramikoa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3796 msgid "Would you like FileZilla to remember passwords?" msgstr "FileZilla-k pasahitzak gogoratzea nahi duzu?" @@ -8364,20 +8249,20 @@ msgid "Wr&ite" msgstr "&Idatzi" -#: ../../locales/../src/interface/netconfwizard.cpp:448 #: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Kanpoko IP helbide okerra" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 msgid "Wrong line endings" msgstr "Lerro-amaiera okerrak" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:841 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:771 msgid "Yes" msgstr "Bai" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8385,22 +8270,22 @@ "Badirudi zure ostalariak IPv6 baino ez duela erabiltzen. Morroi honek ez du " "ingurune hau onartzen" -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:271 msgid "You are using the latest version of FileZilla." msgstr "FileZilla-ren azken bertsioa erabiltzen ari zara." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3581 msgid "You can always open this dialog again through the help menu." msgstr "" "Elkarrizketa-koadro hau edonoiz ireki dezakezu berriro laguntza-menuaren " "bidez." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:167 +#: ../../locales/../src/interface/resources/xrc/update.xrc:247 msgid "You can download the latest version from the FileZilla website:" msgstr "Azken bertsioa jaitsi dezakezu FileZilla-ren webgunetik:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:69 msgid "You can leave the port field empty to use the default port." msgstr "" "Atakaren eremua hutsik utz dezakezu ataka-zenbaki lehenetsia erabiltzeko." @@ -8413,7 +8298,7 @@ "X bat jar dezakezu edozein posiziotan, jatorrizko fitxategien baimena " "gordetzeko." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Ezin dituzu ezarpenak inportatu FileZilla-ren ezarpenen direktoriotik." @@ -8425,17 +8310,17 @@ "Ezin duzu karaktere baliogabe baten ordez beste karaktere baliogabe bat " "jarri. Sartu fitxategi-izenetan onartzen den karaktere bat." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "Ez duzu sartu fitxategi-izen berririk. Fitxategia gainidatzi nahi duzu?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3355 msgid "You have selected at least one symbolic link." msgstr "Gutxienez esteka sinboliko bat hautatu duzu." -#: ../../locales/../src/interface/edithandler.cpp:1588 -#: ../../locales/../src/interface/search.cpp:725 +#: ../../locales/../src/interface/edithandler.cpp:1597 +#: ../../locales/../src/interface/search.cpp:1149 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8443,7 +8328,7 @@ "Editatzeko 10 fitxategi baino gehiago hautatu dituzu. Benetan jarraitu nahi " "duzu?" -#: ../../locales/../src/interface/LocalListView.cpp:1665 +#: ../../locales/../src/interface/LocalListView.cpp:1705 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8451,39 +8336,43 @@ "Irekitzeko 10 fitxategi edo direktorio baino gehiago hautatu dituzu. Benetan " "jarraitu nahi duzu?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:952 +#: ../../locales/../src/interface/manual_transfer.cpp:420 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:965 msgid "You have to enter a hostname." msgstr "Ostalari-izen bat sartu behar duzu." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 msgid "You have to enter a key file path" msgstr "Gako-fitxategiaren bide bat sartu behar duzu." -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:859 msgid "You have to enter a local directory." msgstr "Direktorio lokal bat sartu behar duzu." -#: ../../locales/../src/interface/netconfwizard.cpp:164 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "IP helbide baliozko bat sartu behar duzu." +#: ../../locales/../src/interface/search.cpp:873 +msgid "You have to enter a remote directory." +msgstr "Urruneko direktorio bat sartu behar duzu." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "IPv4 helbide baliozko bat sartu behar duzu." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:864 msgid "You have to enter a writable local directory." msgstr "Idatz daitekeen direktorio lokal bat sartu behar duzu." -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052 +#: ../../locales/../src/interface/manual_transfer.cpp:512 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 msgid "You have to enter an account name" msgstr "Kontu-izen bat sartu behar duzu." -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027 +#: ../../locales/../src/interface/manual_transfer.cpp:486 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1040 msgid "You have to specify a user name" msgstr "Erabiltzaile-izen bat zehaztu behar duzu." -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8491,7 +8380,7 @@ "Ziur aski zure bideratzaileak edo suebakiak transferitutako datuak oker " "aldatu ditu." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Izen bat sartu behar duzu laster-markarentzat." @@ -8499,7 +8388,7 @@ msgid "You need to enter a name for the log file." msgstr "Izen bat sartu behar duzu egunkari-fitxategiarentzat." -#: ../../locales/../src/interface/edithandler.cpp:1473 +#: ../../locales/../src/interface/edithandler.cpp:1482 msgid "You need to enter a properly quoted command." msgstr "Komatxo artean ondo idatzitako komando bat sartu behar duzu." @@ -8512,17 +8401,17 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Proxyaren ataka-zenbaki bat sartu behar duzu, 1 eta 65535 bitartekoa." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1125 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Gutxienez bide-izen bat sartu behar duzu, laster-marka hutsak ez dira " "onartzen." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1132 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1149 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8530,7 +8419,7 @@ "Bide-izen lokal nahiz urrunekoa sartu behar dituzu laster-marka honekin " "arakatze sinkronizatua gaitzeko." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8538,23 +8427,23 @@ "Bide-izen lokal nahiz urrunekoa sartu behar dituzu gune honekin arakatze " "sinkronizatua gaitzeko." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "You need to specify a local file." msgstr "Fitxategi lokal bat zehaztu behar duzu." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:321 msgid "You need to specify a remote file." msgstr "Urruneko fitxategi bat zehaztu behar duzu." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:327 msgid "You need to specify a remote path." msgstr "Urruneko bide-izen bat zehaztu behar duzu." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:298 msgid "You need to specify a server." msgstr "Zerbitzari bat zehaztu behar duzu." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8562,66 +8451,66 @@ "Ez zenuke arazorik izan behar beste zerbitzarietara konektatzen, fitxategi-" "transferentziek ondo funtzionatu beharko lukete." -#: ../../locales/../src/interface/QueueView.cpp:3056 +#: ../../locales/../src/interface/QueueView.cpp:2684 msgid "Your computer will suspend unless you click Cancel." msgstr "Zure ordenagailua eseki egingo da ez baduzu Utzi botoian klik egiten." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "ondoren" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "aurretik" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "honekin hasten da" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:282 msgid "bytes" msgstr "byte" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "hau dauka" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "pertsonalizatua" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "hau ez dauka" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "ez da honen berdina" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "honela amaitzen da" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "honen berdina da" -#: ../../locales/../src/interface/filelistctrl.cpp:529 -#: ../../locales/../src/interface/filelistctrl.cpp:548 -#: ../../locales/../src/interface/filelistctrl.cpp:575 -#: ../../locales/../src/interface/filelistctrl.cpp:591 +#: ../../locales/../src/interface/filelistctrl.cpp:535 +#: ../../locales/../src/interface/filelistctrl.cpp:554 +#: ../../locales/../src/interface/filelistctrl.cpp:581 +#: ../../locales/../src/interface/filelistctrl.cpp:597 msgid "file" msgstr "fitxategia" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:197 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8631,89 +8520,98 @@ "Ziurtatu exekutagarri hau badagoela FileZilla-ren exekutagarri nagusia " "dagoen direktorio berean." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:374 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp Filezillaren bertsio desberdin bati dagokio." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1484 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1375 msgid "fzsftp could not be started" msgstr "Ezin izan da fzsftp hasi" -#: ../../locales/../src/engine/tlssocket.cpp:1044 +#: ../../locales/../src/engine/tlssocket.cpp:1217 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers-ek ez du ziurtagiririk itzuli" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket.cpp:1229 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2-k huts egin du" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "hau baino handiagoa da" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "taldeak exekuta dezake" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "taldeak irakur dezake" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "taldeak idatz dezake" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1601 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "" "Irakurri http://wiki.filezilla-project.org/Date_and_Time_formatting gehiago " "jakiteko" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "honen berdina da" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "ezarri da" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "ez da ezarri" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "hau baino txikiagoa da" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "regex-ekin bat dator" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +msgid "new name" +msgstr "izen berria" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "jabeak exekuta dezake" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "jabeak irakur dezake" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "jabeak idatz dezake" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1105 -#: ../../locales/../src/engine/tlssocket.cpp:1116 -#: ../../locales/../src/engine/tlssocket.cpp:1131 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket.cpp:1423 +#: ../../locales/../src/engine/tlssocket.cpp:1439 +#: ../../locales/../src/engine/tlssocket.cpp:1455 +#: ../../locales/../src/engine/tlssocket.cpp:1471 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 msgid "unknown" msgstr "ezezaguna" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "denek exekuta dezakete" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "denek irakur dezakete" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "denek idatz dezakete" @@ -8721,6 +8619,331 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "%d second" +#~ msgid_plural "%d seconds" +#~ msgstr[0] "%d segundo" +#~ msgstr[1] "%d segundo" + +#~ msgid "%llu directory" +#~ msgid_plural "%llu directories" +#~ msgstr[0] "%llu direktorio" +#~ msgstr[1] "%llu direktorio" + +#~ msgid "%llu file" +#~ msgid_plural "%llu files" +#~ msgstr[0] "%llu fitxategi" +#~ msgstr[1] "%llu fitxategi" + +#~ msgid "%s byte" +#~ msgid_plural "%s bytes" +#~ msgstr[0] "byte %s" +#~ msgstr[1] "%s byte" + +#~ msgid "&Next >" +#~ msgstr "&Hurrengoa >" + +#~ msgid "< &Back" +#~ msgstr "< &Atzera" + +#~ msgid "Argument buffer overflow" +#~ msgstr "Argumentu-buffer gainezkatzea" + +#~ msgid "Available sizes" +#~ msgstr "Tamaina erabilgarriak" + +#~ msgid "Bad file descriptor" +#~ msgstr "Fitxategi-deskribatzaile okerra" + +#~ msgid "Blue" +#~ msgstr "Urdina" + +#~ msgid "Cannot assign requested address" +#~ msgstr "Ezin da eskatutako helbidea esleitu" + +#~ msgid "Connection aborted" +#~ msgstr "Konexioa utzita" + +#~ msgid "Connection attempt timed out" +#~ msgstr "Konexio-saiakeraren denbora-muga gainditu da" + +#~ msgid "Connection refused by server" +#~ msgstr "Zerbitzariak konexioa ukatu du" + +#~ msgid "Connection reset by network" +#~ msgstr "Sareak konexioa berrezarri du" + +#~ msgid "Connection reset by peer" +#~ msgstr "Pareak konexioa berrezarri du" + +#~ msgid "Connection timed out after %d second of inactivity" +#~ msgid_plural "Connection timed out after %d seconds of inactivity" +#~ msgstr[0] "" +#~ "Konexioaren denbora-muga agortu da aktibitaterik gabeko segundo %d(e)n " +#~ "ondoren" +#~ msgstr[1] "" +#~ "Konexioaren denbora-muga agortu da aktibitaterik gabeko %d segundoren " +#~ "ondoren" + +#~ msgid "Cyan" +#~ msgstr "Ziana" + +#~ msgid "DOS-like with virtual paths" +#~ msgstr "Bide-izen birtualekin DOS sistemaren eran" + +#~ msgid "Default (Autodetect)" +#~ msgstr "Lehenetsia (Automatikoki detektatu)" + +#~ msgid "" +#~ "Delaying connection for %d second due to previously failed connection " +#~ "attempt..." +#~ msgid_plural "" +#~ "Delaying connection for %d seconds due to previously failed connection " +#~ "attempt..." +#~ msgstr[0] "" +#~ "Konexioa %d segundo atzeratzen aurreko konexio-saiakerak huts egin " +#~ "duelako..." +#~ msgstr[1] "" +#~ "Konexioa %d segundo atzeratzen aurreko konexio-saiakerak huts egin " +#~ "duelako..." + +#~ msgid "FTP - File Transfer Protocol with optional encryption" +#~ msgstr "" +#~ "FTP - Fitxategiak Transferitzeko Protokoloa, enkriptatzeko aukerarekin" + +#~ msgid "FTP - Insecure File Transfer Protocol" +#~ msgstr "FTP - Fitxategiak Transferitzeko Protokolo ez-segurua" + +#~ msgid "FTPES - FTP over explicit TLS" +#~ msgstr "FTPES - FTP TLS esplizituaren gainean" + +#~ msgid "FTPS - FTP over implicit TLS" +#~ msgstr "FTPS - FTP TLS inplizituaren gainean" + +#~ msgid "File descriptor not a socket" +#~ msgstr "Fitxategi-deskribatzailea ez da socket bat" + +#~ msgid "Green" +#~ msgstr "Berdea" + +#~ msgid "HTTPS - HTTP over TLS" +#~ msgstr "HTTPS - HTTP TLS bidez" + +#~ msgid "Host is down" +#~ msgstr "Ostalaria erorita dago" + +#~ msgid "Interrupted by signal" +#~ msgstr "Seinaleak etenda" + +#~ msgid "Invalid argument passed" +#~ msgstr "Argumentu baliogabea pasa da" + +#~ msgid "Invalid value for ai_flags" +#~ msgstr "ai_flags-en balio baliogabea" + +#~ msgid "Invalid value for hints" +#~ msgstr "Aztarnen balio baliogabea" + +#~ msgid "Local address in use" +#~ msgstr "Helbide lokala erabiltzen" + +#~ msgid "Local endpoint has been closed" +#~ msgstr "Amaiera-puntu lokala itxi da" + +#~ msgid "Magenta" +#~ msgstr "Magenta" + +#~ msgid "Memory allocation failure" +#~ msgstr "Memoria-esleipenak huts egin du" + +#~ msgid "Message too large" +#~ msgstr "Mezu luzeegia" + +#~ msgid "Neither nodename nor servname provided, or not known" +#~ msgstr "Ez da nodo-izen edo servname-rik eman, edo ezezaguna" + +#~ msgid "" +#~ "Network host does not have any network addresses in the requested address " +#~ "family" +#~ msgstr "" +#~ "Sareko ostalariak ez dauka sareko helbiderik eskatutako helbide-familian" + +#~ msgid "No address associated with nodename" +#~ msgstr "Ez dago nodo-izenarekin erlazionaturiko helbiderik" + +#~ msgid "No route to host" +#~ msgstr "Ostalarira biderik ez" + +#~ msgid "Nonrecoverable failure in name resolution" +#~ msgstr "Errore konponezina izen-ebazpenean" + +#~ msgid "Not initialized, need to call WSAStartup" +#~ msgstr "Hasieratu gabe, WSAStartup deitu behar da" + +#~ msgid "Operation already in progress" +#~ msgstr "Eragiketa dagoeneko lanean" + +#~ msgid "Operation in progress" +#~ msgstr "Eragiketa lanean" + +#~ msgid "Operation not supported" +#~ msgstr "Eragiketa ez onartua" + +#~ msgid "Orange" +#~ msgstr "Laranja" + +#~ msgid "Other system error" +#~ msgstr "Bestelako sistema-errorea" + +#~ msgid "Out of memory" +#~ msgstr "Memoria nahikorik ez" + +#~ msgid "Permission denied" +#~ msgstr "Baimena ukatuta" + +#~ msgid "Process file table overflow" +#~ msgstr "Prozesu-fitxategi taularen gainezkatzea" + +#~ msgid "Protocol not supported" +#~ msgstr "Protokolo ez onartua" + +#~ msgid "Protocol not supported on given socket type" +#~ msgstr "Protokoloa ez da onartzen emandako socket motan" + +#~ msgid "Red" +#~ msgstr "Gorria" + +#~ msgid "Resolved protocol is unknown" +#~ msgstr "Ebatzitako protokoloa ezezaguna da" + +#~ msgid "Resource temporarily unavailable" +#~ msgstr "Baliabidea ez dago eskuragarri aldi baterako" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize-i deitu zaio socket-ik gabe" + +#~ msgid "Socket address outside address space" +#~ msgstr "Socket-helbidea helbideen espaziotik kanpo" + +#~ msgid "Socket already connected" +#~ msgstr "Socket-a dagoeneko konektatuta" + +#~ msgid "Socket has been shut down" +#~ msgstr "Socket-a itzali da" + +#~ msgid "Socket not connected" +#~ msgstr "Socket-a ez dago konektatuta" + +#~ msgid "Socket type not supported for address family" +#~ msgstr "Socket-mota ez da onartzen helbide-familian" + +#~ msgid "System limit of open files exceeded" +#~ msgstr "Sistemaren irekitako fitxategien muga gainditu da" + +#~ msgid "System's network subsystem has failed" +#~ msgstr "Sistemaren sarearen azpi-sistemak huts egin du" + +#~ msgid "Temporary failure in name resolution" +#~ msgstr "Aldi baterako errorea izen-ebazpenean" + +#~ msgid "The ai_family member is not supported" +#~ msgstr "ai_family-ko kidea ez da onartzen" + +#~ msgid "The ai_socktype member is not supported" +#~ msgstr "ai_socktype kidea ez da onartzen" + +#~ msgid "The servname parameter is not supported for ai_socktype" +#~ msgstr "ai_socktype-ek ez du onartzen servname parametroa" + +#~ msgid "The specified address family is not supported" +#~ msgstr "Zehazturiko helbide-familia ez da onartzen" + +#~ msgid "The specified network name is no longer available" +#~ msgstr "Zehazturiko sare-izena ez dago eskuragarri" + +#~ msgid "Yellow" +#~ msgstr "Horia" + +#~ msgid "%d files added to queue" +#~ msgstr "%d fitxategi ilaran gehituta" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Deskonektatu zerbitzaritik" + +#~ msgid "&Show message" +#~ msgstr "&Erakutsi mezua" + +#~ msgid "Connected" +#~ msgstr "Konektatuta" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Ezin izan dira parekoaren ziurtagiriak inportatu; gnutls_x509_crt_import-" +#~ "ek huts egin du" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Ezin izan da parekoaren ziurtagirientzako egitura hasieratu; " +#~ "gnutls_x509_crt_init-ek huts egin du" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "Oraindik ez da onartzen erlaziorik gabeko direktorio bat baino gehiago " +#~ "ezabatzea" + +#~ msgid "Do ¬hing" +#~ msgstr "Ez e&gin ezer" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "Oraindik ez da onartzen erlaziorik gabeko direktorio bat baino gehiago " +#~ "deskargatzea" + +#~ msgid "Downloading search results" +#~ msgstr "Bilaketaren emaitzak deskargatzen" + +#~ msgid "Filename &filters..." +#~ msgstr "Fitxategi-izenen &iragazkiak..." + +#~ msgid "No more files in the queue!" +#~ msgstr "Ez dago beste fitxategirik ilaran" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Ilaran gehitzeko fitxategiak bilatzen" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Kargatzeko fitxategiak bilatzen" + +#~ msgid "" +#~ "The file '%s' is not in a format supported by FileZilla.\n" +#~ "The file is also password protected. Password protected key files are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into a supported, unprotected format?" +#~ msgstr "" +#~ "FileZilla-k ez du onartzen '%s' fitxategiaren formatua.\n" +#~ "Gainera fitxategiak pasahitzaren babesa dauka. FileZilla-k oraindik ez " +#~ "ditu onartzen pasahitzaren babesa daukaten gako-fitxategiak.\n" +#~ "Pasa nahi duzu babesik gabeko formatu onartu batera?" + +#~ msgid "" +#~ "The file '%s' is password protected. Password protected key files are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into an unprotected file?" +#~ msgstr "" +#~ "%s fitxategiak pasahitzaren babesa dauka. FileZilla-k oraindik ez ditu " +#~ "onartzen pasahitzaren babesa daukaten gako-fitxategiak.\n" +#~ "Babesik gabeko fitxategi bihurtu nahi duzu?" + +#~ msgid "U&se system defaults" +#~ msgstr "Era&bili sistemaren lehenespenak" + +#~ msgid "Use system &defaults" +#~ msgstr "Erabili sistemaren &lehenespenak" + +#~ msgid "Waiting" +#~ msgstr "Zain" + #~ msgid "" #~ "Any changes made in the Site Manager will not be saved unless you repair " #~ "the file." @@ -8830,8 +9053,5 @@ #~ msgstr "" #~ "Fitxategi-izenak ezin ditu honako karaktereak eduki: / \\ : * ? \" < > |" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Erroko ziurtagiria ez da fidagarria" - #~ msgid "Use plain FTP" #~ msgstr "Erabili FTP arrunta" diff -Nru filezilla-3.15.0.2/locales/fi_FI.po filezilla-3.33.0/locales/fi_FI.po --- filezilla-3.15.0.2/locales/fi_FI.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/fi_FI.po 2018-04-27 13:04:09.000000000 +0000 @@ -2,9 +2,9 @@ msgid "" msgstr "" "Project-Id-Version: FileZilla Client 3.x.x\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-13 13:13+0100\n" -"PO-Revision-Date: 2015-11-12 20:00+0200\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-27 14:20+0200\n" +"PO-Revision-Date: 2018-04-14 07:02+0200\n" "Last-Translator: Kari Saariniemi \n" "Language-Team: Kari Saariniemi \n" "Language: fi_FI\n" @@ -16,18 +16,18 @@ "X-Generator: Poedit 1.7.7\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S kulunut" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S jäljellä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -36,208 +36,212 @@ "%a -Tili (Rivit, jotka sisältävät tämän, jätetään huomiotta, jos ei käytetä " "Tili-kirjautumistyyppiä)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d hakemisto" msgstr[1] "%d hakemistoa" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d hakemisto sisältöineen" msgstr[1] "%d hakemistot sisältöineen" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d tiedosto" msgstr[1] "%d tiedostoa" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d tiedosto. Koko yhteensä: %s" msgstr[1] "%d tiedostoa. Koko yhteensä: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d tiedosto. Koko yhteensä: vähintään %s" msgstr[1] "%d tiedostoa. Koko yhteensä: vähintään %s" -#: ../../locales/../src/interface/QueueView.cpp:2778 -#, c-format -msgid "%d files added to queue" -msgstr "%d tiedostoa lisätty jonoon" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekunti" msgstr[1] "%d sekuntia" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Isäntä" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu hakemisto" msgstr[1] "%llu hakemistoa" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu tiedosto" msgstr[1] "%llu tiedostoa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Salasana" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Sertifikaatti erääntynyt!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ei vielä kelvollinen!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Välityspalvelimen käyttäjä" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s ja %s. Koko yhteensä: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s ja %s. Koko yhteensä: vähintään %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s tavu" msgstr[1] "%s tavua" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s ei löytynyt. Ilman tätä FileZillan komponenttia, SFTP ei toimi.\n" +"%s ei löytynyt. Ilman tätä FileZillan komponenttia, %s ei toimi.\n" "\n" -"Lataa FileZilla uudestaan. Jos tämä ongelma toistuu, lähetä virheraportti." +"Lataa FileZilla uudestaan. Jos ongelma jatkuu, lähetä virheraportti." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s ei löytynyt. Ilman tätä FileZillan komponenttia SFTP ei toimi.\n" +"%s ei löytynyt. Ilman tätä FileZillan komponenttia, %s ei toimi.\n" "\n" "Mahdolliset ratkaisut:\n" -"- Varmista, että %s on hakemistossa, joka on listattuna PATH -" +"- Varmista, että %s on hakemistossa, joka esiintyy PATH " "ympäristömuuttujassa.\n" -"- Anna koko polku kohteeelle %s FZ_FZSFTP -ympäristömuuttujassa." +"- Aseta koko polku %s:ään %s-ympäristömuuttujassa." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s, jossa %d bittiä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Isäntänimi ei täsmää sertifikaatin kanssa" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Käyttäjänimi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Välityspalvelimen salasana" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "&Keskeytä edellinen yhteys ja yhdistä nykyisessä välilehdessä" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "&About..." msgstr "&Tietoja..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "Ti&li:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Aktiivinen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/menu_bar.cpp:154 msgid "&Add bookmark..." msgstr "&Lisää kirjanmerkki..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Lisää hakemisto..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:10 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:56 msgid "&Add files to queue" msgstr "Lisää tiedostot j&onoon" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "Lisää &avaintiedosto..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:266 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "&Add to queue" msgstr "&Lisää jonoon" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Säädä palvelimen aikavyöhykkeen siirtymää:" @@ -245,76 +249,81 @@ msgid "&Always trust certificate in future sessions." msgstr "&Luota aina sertifikaattiin tulevissa istunnoissa." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "&Luota aina tähän isäntään, lisää tämä avain välimuistiin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "Käytä &aina oletusmuokkainta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Käytä aina valintaa tiedostoille, joilla ei ole sidosta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "Käytä &aina tätä toimintoa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Kysy ulkoista IP-osoitetta käyttöjärjestelmältäsi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:364 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 +#: ../../locales/../src/interface/menu_bar.cpp:118 msgid "&Auto" msgstr "&Auto" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Havaitse automaattisesti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Taustaväri:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:372 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 +#: ../../locales/../src/interface/menu_bar.cpp:120 msgid "&Binary" msgstr "&Binääri" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "" "&Binääriset etuliitteet käytettäessä SI-symboleja. (esim. 1 kt = 1024 tavua)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/menu_bar.cpp:151 msgid "&Bookmarks" msgstr "&Kirjanmerkit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "Se&laa..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "P&urskesieto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Peruuta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Clear private data..." msgstr "&Tyhjennä yksityisyystiedot..." @@ -322,172 +331,172 @@ msgid "&Close" msgstr "&Sulje" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:158 msgid "&Close FileZilla" msgstr "&Sulje FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:170 +msgid "&Close FileZilla once" +msgstr "&Sulje FileZilla kerran" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Configure speed limits..." msgstr "&Määritä nopeusrajoitukset..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/menu_bar.cpp:129 msgid "&Configure..." msgstr "&Määritä..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Yhdistä" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../locales/../src/interface/menu_bar.cpp:50 msgid "&Copy current connection to Site Manager..." msgstr "&Kopioi nykyinen yhteys Sivustonhallintaan..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "&Copy to clipboard" msgstr "&Kopioi leikepöydälle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:29 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:69 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&Create directory" msgstr "L&uo hakemisto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:404 msgid "&Create new tab" msgstr "L&uo uusi välilehti" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:182 msgid "&Debug" msgstr "&Debuggaus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "Debuggaa tieto &sanomalokiin:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "Oletusm&uokkain:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/menu_bar.cpp:113 msgid "&Default file exists action..." msgstr "&Tiedosto on jo olemassa -oletustoiminto..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Viive epäonnistuneiden kirjautumisyritysten välillä:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:41 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "Po&ista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "Po&ista 'symlink'" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "&Directory access permissions..." +msgstr "&Hakemiston pääsyluvat..." + +#: ../../locales/../src/interface/menu_bar.cpp:86 msgid "&Directory comparison" msgstr "&Hakemistojen vertailu" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "Poista synkronoitu selaus käytöstä ja jatka palvelinhakemiston vaihtamista" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "Poista synkronoitu selaus käytöstä ja jatka palvelinhakemiston vaihtamista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "&Hylkää paikallinen tiedosto ja lataa ja muokkaa uutena" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/menu_bar.cpp:143 msgid "&Disconnect" msgstr "&Katkaise yhteys" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Katkaise yhteys palvelimelta" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Näytä tämänhetkinen siirtonopeus keskimääräisen siirtonopeuden sijaan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Näytä koko tavuina" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "Ä&lä muista salasanoja (suositeltu)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Älä näytä tätä sanomaa jatkossa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "&Älä käytä ulkoisia IP-osoitteita paikallisissa yhteyksissä." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "&Tiedostojen kaksoisklikkauksen toiminta:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:51 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:261 msgid "&Download" msgstr "&Lataa palvelimelta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Lataa kohteeseen:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "&Download..." msgstr "&Lataa..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Lataukset:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:24 +#: ../../locales/../src/interface/menu_bar.cpp:68 msgid "&Edit" msgstr "&Muokkaa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "&Muokkaa suodatinsääntöjä..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/menu_bar.cpp:89 +#: ../../locales/../src/interface/menu_bar.cpp:128 msgid "&Enable" msgstr "&Ota käyttöön" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Ota pakkaus käyttöön" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Ota nopeusrajoitukset käyttöön" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "Kood&aus:" @@ -495,64 +504,76 @@ msgid "&Encryption:" msgstr "&Salaus:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:192 msgid "&Enter custom command..." msgstr "&Anna oma komento..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "M&uodosta yhteys uuteen välilehteen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Suorita" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "Vie &sivustonhallinnan kohteet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:359 +#: ../../locales/../src/interface/menu_bar.cpp:57 msgid "&Export..." msgstr "&Vie..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Vaihda takaisin aktiivitilaan" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../locales/../src/interface/menu_bar.cpp:44 msgid "&File" msgstr "&Tiedosto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "&File Attributes..." msgstr "&Tiedostomääritteet..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "&File permissions..." msgstr "&Tiedosto-oikeudet..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Tiedosto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Suodatintilat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Suodatinjoukot:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Suodattimet" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Suodattimet:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Lopeta muokkaus ja poista paikallinen tiedosto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Hylkää paikalliset polut, lataa kaikki mukana olevat tiedostot suoraan " +"kohdehakemistoon" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -560,151 +581,159 @@ "&Tiivistä palvelimen polut, lataa kaikki niihin sisältyvät tiedostot samaan " "kohdehakemistoon" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "&Seuraa 'symlinkkiä', poista kohdehakemiston sisältö" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Hae ulkoinen IP-osoite seuraavasta URL:stä:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/menu_bar.cpp:172 msgid "&Getting help..." msgstr "&Ohjeet..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Globaalinen kirjanmerkki" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 käyttäen CONNECT-metodia" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/menu_bar.cpp:162 msgid "&Help" msgstr "&Ohje" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:318 +#: ../../locales/../src/interface/menu_bar.cpp:94 msgid "&Hide identical files" msgstr "&Piilota samannimiset tiedostot" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:123 msgid "&Highest" msgstr "&Suurin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Suurin käytettävissä oleva portti:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Isäntä:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC -binääriset etuliitteet (esim. 1 KiB = 1024 tavua)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (esimerkki: 2007-09-15)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../locales/../src/interface/menu_bar.cpp:58 msgid "&Import..." msgstr "&Tuo..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "Pe&ri järjestelmän tiedostosidokset" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Asenna uusi versio" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Pidä paikallinen polkurakenne suhteessa hakujuureen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "&Säilytä etäpolun rakenne suhteessa hakujuureen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "&Avaintiedosto:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Tiedoston ja hakemistopaneelien ulkoasu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Rajoita FileZillan käyttämät paikallisportit" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Rajoita samanaikaisten yhteyksien määrää" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/menu_bar.cpp:103 msgid "&Local directory tree" msgstr "Paikallinen hak&emistopuu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Paikallinen hakemisto:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Paikallinen haku" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Kirjoita loki tiedostoon" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "Kir&jautumistyyppi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "Kir&jautumistyyppi:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 msgid "&Low" msgstr "&Pieni" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/menu_bar.cpp:156 msgid "&Manage bookmarks..." msgstr "&Hallitse kirjanmerkkejä..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/menu_bar.cpp:133 msgid "&Manual transfer..." msgstr "&Manuaalinen siirto..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "Y&hteyksien enimmäismäärä:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Uudelleenyritysten enimmäismäärä:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/menu_bar.cpp:102 msgid "&Message log" msgstr "Sanoma&loki" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Pienennä tehtäväpalkkiin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "&Nimilajittelun tila:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Nimi:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 +#: ../../locales/../src/interface/menu_bar.cpp:69 msgid "&Network configuration wizard..." msgstr "&Verkon määritysvelho..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Uusi" @@ -712,7 +741,7 @@ msgid "&New Site" msgstr "&Uusi sivusto" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Lataa uusin versio!" @@ -720,154 +749,165 @@ msgid "&Next >" msgstr "&Seuraava >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Ei" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:146 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Ei mitään" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Normal" msgstr "&Normaali" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Numeerinen arvo:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&AVAA" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:20 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:335 msgid "&Open" msgstr "&Avaa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "Ko&rvaa" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Passiivinen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Salasana:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:166 msgid "&Play sound" msgstr "So&ita ääni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Portti:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/menu_bar.cpp:123 msgid "&Preserve timestamps of transferred files" msgstr "Sisällytä &aikaleima siirrettyihin tiedostoihin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Jono" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "Pikay&hdistä" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/menu_bar.cpp:101 msgid "&Quickconnect bar" msgstr "P&ikayhdistämisen paneeli" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "&Pikayhdistämisen historia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Lue" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/menu_bar.cpp:141 msgid "&Reconnect" msgstr "&Yhdistä uudestaan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "&Uudelleenyhdistämistiedot" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 +#: ../../locales/../src/interface/menu_bar.cpp:80 msgid "&Refresh" msgstr "&Päivitä" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Muista pääsalasana, kunnes FileZilla suljetaan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "&Muista salasana kunnes FileZilla suljetaan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "&Muista salasanat" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "P&alvelimen hakemisto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Palvelimen polku:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Etähaku" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Poista" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Poista avain" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:115 msgid "&Remove selected" msgstr "Poista &valitut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:89 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Nimeä uu&delleen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "Nimeä &uudelleen..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Avaa paikallinen tiedosto uudestaan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Korvaa epäkelvot merkit seuraavilla:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/menu_bar.cpp:173 msgid "&Report a bug..." msgstr "&Ilmoita virheestä..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:154 +msgid "&Request attention" +msgstr "&Vaatii huomiota" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "&Reset and requeue all" msgstr "&Resetoi ja laita valitut tiedostot jonoon uudestaan" @@ -875,39 +915,39 @@ msgid "&Restart Wizard" msgstr "&Käynnistä velho uudestaan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Jatka" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:162 msgid "&Run command..." msgstr "S&uorita komento..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "Suorita määritys&velho nyt..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Suorita päivitystarkistus nyt..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SIVUSTO" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "Tallenna &nimellä..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Etsi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "&Search remote files..." msgstr "&Etsi palvelimen tiedostoja..." @@ -915,204 +955,220 @@ msgid "&Select Entry:" msgstr "&Valitse kohde:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Valitse kieli:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Valitse näytettävät sarakkeet:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/menu_bar.cpp:136 msgid "&Server" msgstr "&Palvelin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Asetukset" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "&Settings..." msgstr "&Asetukset..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "Näytä &debuggausvalikko" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 msgid "&Show detailed log" msgstr "Näytä &täsmällinen loki" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Näytä sanoma" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Näytä aikaleimat sanomalokissa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "&Sivustonhallinnan kohteet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "&Site Manager..." msgstr "&Sivustonhallinta..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "&Sivustokohtainen kirjanmerkki" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Ohita" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/menu_bar.cpp:126 msgid "&Speed limits" msgstr "&Nopeusrajoitukset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Aloita siirto &heti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Vaihda paikallisen ja palvelimen paneelien paikkaa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:211 msgid "&TLS Ciphers" msgstr "&TLS -salaukset" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Testaa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Teema:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/menu_bar.cpp:108 msgid "&Transfer" msgstr "&Siirto" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "S&iirtotapa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/menu_bar.cpp:105 msgid "&Transfer queue" msgstr "Siirt&ojono" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "&Käsittele pistetiedostoja ASCII-tiedostoina" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "" +"&Luota tähän sertifikaattiin, jotka on listattu vaihtoehtoisissa " +"isäntänimissä." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Peru muokkaus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Päivitä välimuistissa oleva avain tälle isännälle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 msgid "&Upload" msgstr "&Lataa palvelimelle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "Lataa &kohteeseen:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 +msgid "&Upload..." +msgstr "&Lataa..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Lataukset palvelimelle:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Käytä erillistä ohjelmaa" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "Käytä &synkronoitua selausta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Käytä järjestelmän oletusmuokkainta tekstitiedostoille" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Käytä seuraavaa IP-osoitetta:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "Käytä palvelimen &ulkoista IP-osoitetta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "Käytä &tuhaterotinta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "K&äyttäjänimi:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Käyttäjänimi:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Versio %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/menu_bar.cpp:78 msgid "&View" msgstr "&Näytä" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:384 msgid "&View/Edit" msgstr "&Näytä/Muokkaa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Seuraa paikallisesti muokattuja tiedostoja ja kehoita lataamaan muutokset " "palvelimelle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Kun tarkistetaan päivityksiä, tarkista:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Kirjoita" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Kyllä" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' ei löydy tai siihen ei saada yhteyttä." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' ei ole hakemisto." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' ei ole tuettu protokolla." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "'Tili' -kirjautumistyyppiä ei tueta valitussa protokollassa" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1120,7 +1176,7 @@ "'Normaali' ja 'Tili' -kirjautumistyypit eivät ole saatavilla. Käytetään " "'Kysy salasanaa' sen sijaan." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1128,7 +1184,7 @@ "'Normaali' ja 'Tili' -kirjautumistyypit eivät ole enää saatavilla. Syöte on " "muutettu muotoon 'Kysy salasanaa'." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1138,58 +1194,58 @@ "asiakkaat kun lähetetään argumentteja palvelimelle, jota seuraa 'quote'. " "Haluaisit ehkä antaa pelkän komennon ilman 'quote' -komentoa." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objekti suodatettu)" msgstr[1] "(%d objektit suodatettu)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% ladattu)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 - ei rajoitusta)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 sekuntia)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 - pois käytöstä)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat on asetettu %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(esimerkki: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(esimerkki: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(%s/s)" @@ -1198,7 +1254,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- jäljellä" @@ -1218,31 +1274,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s ei kelpaa käytettäessä FTP URL:ää" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Ei mitään" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Varoitus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Tiedot" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Laajasanainen" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32-bittinen järjestelmä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Debuggaus" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64-bittinen järjestelmä" @@ -1250,22 +1306,26 @@ msgid "< &Back" msgstr "< &Edellinen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/menu_bar.cpp:160 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "Annettu kirjanmerkki on jo käytössä. Anna toinen nimi." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Ketjun sertifikaatti allekirjoitettiin käyttäen turvatonta algoritmia" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Oletusmuokkain pitää valita." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Hakemistoa ei voi vetää sen alikansioihin." @@ -1279,22 +1339,22 @@ "Sellaisissa tilanteissa pitää käyttää aktiivitilaa. Aktiivitilassa FileZilla " "avaa portin ja kysyy palvelimelta yhteyden muodostamista." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Aikaisemmin avattu tiedosto on muuttunut." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Tällä nimellä oleva tiedosto on jo siirretty." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Tällä nimellä oleva tiedosto on vielä muokattavana. Sulje se ja yritä " "uudestaan." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1307,11 +1367,18 @@ "Ellet korjaa tätä ongelmaa, tiedostoja voi puuttua tiedostolistauksesta.\n" "Muita varoituksia ei näytetä tässä istunnossa." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "Hukattua salasanaa ei voi palauttaa! Pane salasanasi muistiin." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "FileZillasta on saatavilla uusi versio:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1320,7 +1387,7 @@ "olevat palvelimet piilottavat tiedostot käyttäjältä. Käytä tätä valintaa " "pakottaaksesi palvelimen näyttämään kaikki tiedostot." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1328,7 +1395,7 @@ "Kelvollinen palvelin ei tarvitse tätä. Jos tarvitset tätä, ota yhteyttä " "palvelimen ylläpitäjään." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1337,17 +1404,17 @@ "Poistetaanko synkronoitu toiminta käytöstä ja jatketaan paikallisen " "hakemiston vaihtamista?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:368 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 +#: ../../locales/../src/interface/menu_bar.cpp:119 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "L&isää" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "&Salli ASCII-tiedostojen uudelleenkäynnistys" @@ -1359,51 +1426,53 @@ msgid "A&pply only to uploads" msgstr "Käytä &vain ladattaessa palvelimelle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "Käytä kaikkiin tiedostoihin ja hakemistoihin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:252 msgid "A&utomatically remove successful transfers" msgstr "Poista onnistuneet siirrot a&utomaattisesti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Tietoja FileZillasta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Tiedostolistauksien yläpuolella" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Pääsy muutamiin paikallisiin hakemistoihin ei voitu palauttaa:" + +#: ../../locales/../src/engine/server.cpp:614 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Tili" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 msgid "Action after queue &completion" msgstr "Toiminto jonon kä&sittelyn jälkeen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Toiminto valitulle tiedostolle:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Suoritettava toiminto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Toiminto:" @@ -1411,7 +1480,7 @@ msgid "Active mode" msgstr "Aktiivitila" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1419,7 +1488,7 @@ "Aktiivitilan FTP-testi epäonnistui. FileZilla ei tiedä oikeaa ulkoista IP-" "osoitetta." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1427,7 +1496,7 @@ "Aktiivitilan FTP-testi epäonnistui. FileZilla ei tiedä oikeaa ulkoista IP-" "osoitetta. Tämän lisäksi reititin on muokannut lähetettyä osoitetta." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1437,38 +1506,39 @@ "osoiteen, mutta reititin tai palvelin on muokannut erehdyksessä lähetetyn " "osoitteen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "Aktiivitilan IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Lisää tiedostot vain j&onoon" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:331 msgid "Add selected directory to the transfer queue" msgstr "Lisää valittu hakemisto siirtojonoon" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 msgid "Add selected files and folders to the transfer queue" msgstr "Lisää valitut tiedostot ja kansiot siirtojonoon" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Lisää jonoon" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:509 msgid "Address type not supported" msgstr "Osoitetyyppiä ei tueta" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Edistyneet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1482,15 +1552,16 @@ "odotetulla tavalla ja voivat jopa vahingoittaa järjestelmäsi. Käytä beta- ja " "yöllisiä versioita omalla vastuullasi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "&Suorita aina tämä toiminto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritmi:" -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2663 msgid "All files have been successfully transferred" msgstr "Kaikki tiedostot siirretty onnistuneesti" @@ -1499,14 +1570,14 @@ msgstr "" "Kaikki annetulla alueella olevien porttien tulee olla välillä 1024 ja 65535." -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2659 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "Kaikki siirrot tehty. %d tiedostoa ei voitu siirtää." msgstr[1] "Kaikki siirrot tehty. %d tiedostoa ei voitu siirtää." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Salli &vaihto toiseen siirtotapaan virheen sattuessa" @@ -1514,17 +1585,17 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Salli vaihto toiseen siirtotapaan virheen sattuessa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Jo yhdistetty" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Vaihtoehtoinen nimi:" msgstr[1] "Vaihtoehtoiset nimet:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1532,7 +1603,7 @@ "Voit käyttää vaihtoehtoisesti Pageant-työkalua PuTTY:ltä avainten " "hallintaan, FileZilla tunnistaa Pageantin." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1540,14 +1611,14 @@ "Voit käyttää vaihtoehtoisesti järjestelmän SSH-agenttia. Varmista, että " "SSH_AUTO_SOCK-ympäristömuuttuja on asetettu." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "" "Voit myös vaihtoehtoisesti ladata uusimman version FileZillan sivustolta:" -#: ../../locales/../src/interface/QueueView.cpp:1908 +#: ../../locales/../src/interface/QueueView.cpp:1667 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1556,7 +1627,7 @@ "Tapahtui virhe ladattaessa siirtojonoa kohteesta \"%s\".\n" "Joitakin jonon kohteita ei ehkä ole palautettu." -#: ../../locales/../src/interface/QueueView.cpp:1818 +#: ../../locales/../src/interface/QueueView.cpp:1559 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1565,79 +1636,82 @@ "Tapahtui virhe tallennettaessa siirtojonoa kohteesta \"%s\".\n" "Joitakin jonon kohteita ei ehkä ole tallennettu." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Sertifikaattiketjun julkaisija ei ole sertifikaatin valtuuttaja" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Kohteessa on jo samalla nimellä oleva tiedosto." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Anonyymi" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Toinen palvelintoiminto on jo käynnissä, hakemistoa ei voi vaihtaa nyt." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "Sivustonhallintaan tehtyjä muutoksia ei voitu tallentaa." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Suodattimiin tehtyjä muutoksia ei voitu tallentaa." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Mitään suodattimien muutoksia ei tallenneta." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Käy&tä vain hakemistoissa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Käytä" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Käytä vain &tässä jonossa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Käytä vain &tiedostoissa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Arkisto" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Argumenttipuskurin ylivuoto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Välilehtenä siirtojonon paneelissa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Kysy toimintoa" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:605 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Kysy salasanaa" @@ -1649,7 +1723,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Kysy ulkoista IP-osoitetta käyttöjärjestelmältäsi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Kysymysten teko FileZillan foorumeissa" @@ -1657,7 +1731,7 @@ msgid "Associated program not found:" msgstr "Sidottua ohjelmaa ei löytynyt:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Ainakin yhden suodattimen tila on puutteellinen" @@ -1665,99 +1739,106 @@ msgid "At this point, all required information has been gathered." msgstr "Kaikki tarvittava tieto on kerätty." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Määrite" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Todennus epäonnistui." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Tekijä:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Auto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Automaattinen tiedostotyypin luokitus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Käytettävät koot" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B " -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "Ohita välityspalvelin" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Virheellinen tiedoston deskriptori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Peruskäytön ohjeet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Käyttäytyminen" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Muokattavana" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Varoitus! Sertifikaatti mitätöity" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binääri" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Blackboard" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Sininen" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:434 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Kirjanmerkki" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Kirjanmerkki:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Kirjanmerkit" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Selaa..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "'Bucket' ei löytynyt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Valmistuspäivä:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Valmistustiedot" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Liikealan luokka:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1767,98 +1848,113 @@ "aktiivitilassa. Jos haluat, että FileZilla käyttää vain muutamaa porttia, " "anna porttialue alle." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/menu_bar.cpp:138 msgid "C&ancel current operation" msgstr "Keskeytä &nykyinen toiminto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "C&lear all" msgstr "Ty&hjennä kaikki" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:93 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:289 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:390 msgid "C&opy URL(s) to clipboard" msgstr "&Kopioi URL:t leikepöydälle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "C&opy URL(s) with password to clipboard" +msgstr "K&opioi URL(t) salasanan kanssa leikepöydälle" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "M&uokattu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "&Muokatut tiedostosidokset:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" -msgstr "CPU:n ominaisuudet" +msgstr "CPU:n ominaisuudet:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Lasketaan palvelimen aikavyöhykkeen siirtymää..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Tiedostosta ei voi lukea" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Dataa ei voi kirjoittaa tiedostoon." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Ei voi kirjoittaa tiedostoon: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Peruuta" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Peruuta toiminto" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Peruuta toiminto" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Ei saada yhteyttä kohteeseen '%s', mediaa ei annettu tai asema ei valmis." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Palvelinta ei voi lisätä Sivustonhallintaan" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Pyydettyä osoitetta ei voi asettaa" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Hakemistoa ei voi vaihtaa, koska synkronoitu selaustoiminto on jo käynnissä." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1866,7 +1962,7 @@ "Välilehteä ei voi sulkea toiminnon aikana.\n" "Perutaanko nykyinen toiminto ja suljetaan välilehti?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1878,22 +1974,23 @@ msgid "Cannot create new filter" msgstr "Uuden suodattimen luonti ei onnistu" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Tiedostoa ei voi muokata" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Tiedostoa ei voi muokata, ei yhdistetty mihinkään palvelimeen." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Tiedostoa ei voi muokata, palvelimen polku tuntematon." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1901,82 +1998,81 @@ "FTP-yhteyttä ei voi muodostaa SFTP-palvelimelle. Valitse kelvollinen " "protokolla." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Pikayhdistämis-palkkia ei voitu ladata resurssitiedostosta." - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Avaintiedostoa ei voi avata" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Ei voitu ladata työkaluriviä resurssitiedostosta" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Salasanaa ei muisteta" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "Kohdetta ei voitu nimetä uudelleen." -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Tiedostoa ei voitu nimetä uudelleen" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:136 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Isäntänimen selvitys SOCKS4 -välityspalvelimen IPv4-osoitteelle ei " "onnistunut." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Suodatinjoukkoa ei voi tallentaa" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Suodattimen valinta ei onnistu" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "&Ei voi asettaa tiedostosidosta" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Ikkunaa ei voi näyttää" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Ei voi näyttää/muokata valittua tiedostoa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Kirjainkoolla ei merkitystä" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Ei merkkiherkkä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Ei merkkiherkkä (oletus)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Merkkiherkkä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Merkkiherkkä (oletus)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Tyhjennettävät luokat" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "Sertifikaatin ja istunnon data eivät ole tällä hetkellä saatavissa." @@ -1988,37 +2084,41 @@ msgid "Certificate issuer" msgstr "Sertifikaatin selvittäjä" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Sertifikaatin allekirjoituksen todennus epäonnistui" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Haaste:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Muuta tiedostomääritteet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:298 msgid "Change the file permissions." msgstr "Muuta tiedosto-oikeudet." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "FileZilla pitää käynnistää uudelleen, kun muutetaan lokitiedoston asetuksia." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Merkin koodausselvitys" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Merkistö" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for &updates..." msgstr "Tarkista &päivitykset..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Tarkista FileZillan &päivitykset automaattisesti:" @@ -2026,15 +2126,15 @@ msgid "Check for Updates" msgstr "Tarkista päivitykset" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for newer versions of FileZilla" msgstr "Tarkista, onko FileZillasta uudempia versioita" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Päivitystarkistus epäonnistui" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2042,7 +2142,7 @@ "Tarkista sisäänkirjautumisesi valtuudet. Annettu salasana alkaa tai loppuu " "tyhjään merkkiin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2050,39 +2150,39 @@ "Tarkista sisäänkirjautumisesi valtuudet. Annettu käyttäjänimi alkaa tai " "loppuu tyhjään merkkiin." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Etsitään kelvollista ulkoista IP-osoitetta" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Etsitään päivityksiä..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "Tiedoston %s tarkistussumma\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Tiedoston %s tarkistussumma ei täsmää\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "Valitse avaintiedosto" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Valitse paikallinen oletushakemisto" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Valitse paikallinen hakemisto" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:670 msgid "Chunk data improperly terminated" msgstr "Datalohko lopetettu virheellisesti" @@ -2090,55 +2190,63 @@ msgid "Cipher:" msgstr "Salaus:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:408 +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Cl&ose tab" msgstr "Sulj&e välilehti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Klassinen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "Clear &layout cache" msgstr "Tyhjennä &ulkoasun välimuisti" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +msgid "Clear auto&update data" +msgstr "Tyhjennä auto&päivityksen tiedot" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Tyhjennä historia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Tyhjennä yksityisyystiedot" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Tyhjennä pikayhdistämispalkki" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Klikkaa Lopeta tallentaaksesi määrityksen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "MAC-palvelimen asiakas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Asiakas-palvelimelle salaus:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Sulje" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:411 msgid "Close &all other tabs" msgstr "Sulje &kaikki muut välilehdet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "Close FileZilla" msgstr "Sulje FileZilla" @@ -2146,103 +2254,108 @@ msgid "Close all running instances of FileZilla" msgstr "Sulje kaikki käynnissäolevat FileZilla-ohjelmat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Suljetaanko pikahaku ja jatketaan vertailua?" + +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Closes current tab" msgstr "Sulkee nykyisen välilehden" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Ko&mmentit:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Sarakkeen ominaisuudet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Sarakkeen asetus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Komento ja sen argumentit pitää antaa oikeaoppisesti." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Komento epäonnistui" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:506 msgid "Command not supported" msgstr "Komento ei ole tuettu" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Tämä protokolla ei tue komentoa" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Komento:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Kommentti" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Yhteinen nimi:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Reititin tai palomuuri hylkäsi yhteyden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/menu_bar.cpp:92 msgid "Compare &modification time" msgstr "Vertailun &muokkausaika" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/menu_bar.cpp:91 msgid "Compare file&size" msgstr "Vertailun &tiedostokoko" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "&Vertailuraja (minuuteissa):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Vertailurajan pitää olla väliltä 0 ja 1440 minuuttia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Käännetty kohteelle:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Kääntämiskone:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Kääntäjä:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Kääntäjän liput:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Pakattu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Samanaikaiset siirrot" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "&Merkkiherkät ehdot" @@ -2258,41 +2371,42 @@ msgid "Configure port range" msgstr "Määritä porttialue" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "FileZillan ja verkon määritys" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Vahvista poisto" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Tarvitaan vahvistus" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Onnittelut, määritys näyttää toimivan." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Yhdistä ohittaen palvelimen asetukset" -#: ../../locales/../src/interface/netconfwizard.cpp:216 -#, fuzzy, c-format +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format msgid "Connect failed: %s" -msgstr "Välityspalvelimen pyyntö epäonnistui: %s" +msgstr "Yhteys epäonnistui: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Yhdistä nykyiseen välilehteen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Yhdistä uuteen välilehteen" @@ -2300,29 +2414,26 @@ msgid "Connect to specified Site Manager site" msgstr "Yhdistä määritettyyn Sivustonhallinnan sivustoon" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 -msgid "Connected" -msgstr "Yhdistetty" - -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Yhdistetään" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Yhdistetään kohteeseen %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Yhdistetään kohteeseen %s välityspalvelimen %s kautta" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Yhdistetään kohteeseen %s..." @@ -2331,187 +2442,227 @@ msgid "Connection" msgstr "Yhteys" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Yhteys keskeytetty" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Yhteysyritys epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:208 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Yhteysyritys epäonnistui osoitteeseen \"%s\", kokeillaan seuraavaa osoitetta." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Yhteysyritys epäonnistui osoitteeseen \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Käyttäjä keskeytti yhteysyrityksen" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Yhteysyrityksen aikakatkaisu" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Yhteys suljettu" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:305 +#: ../../locales/../src/engine/http/request.cpp:318 +#: ../../locales/../src/engine/http/request.cpp:329 +#: ../../locales/../src/engine/http/request.cpp:340 msgid "Connection closed by server" msgstr "Palvelin sulki yhteyden" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "Yhteys muodostettu, alustetaan TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "Yhteys muodostettu, lähetetään HTTP-pyyntö" -#: ../../locales/../src/interface/netconfwizard.cpp:333 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." -msgstr "Yhteys muodostettu, odotetaan tervetulosanomaa..." +msgstr "Yhteys muodostettu, odotetaan tervetulosanomaa." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Yhteys muodostettu, odotetaan tervetulosanomaa..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Yhteys menetetty" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "Connection not allowed by ruleset" msgstr "Sääntöasetukset eivät salli yhteyttä" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:500 msgid "Connection refused" msgstr "Yhteys evättiin" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Palvelin eväsi yhteyden" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Verkko resetoi yhteyden" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "'peer' resetoi yhteyden" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Yhteyden aikakatkaistu, koska yhteys oli toimimattomana %d sekuntia" msgstr[1] "Yhteyden aikakatkaistu, koska yhteys oli toimimattomana %d sekuntia" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Yhteys aikakatkaistu." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Yhteys palvelimelle katkesi." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "Yhteys välityspalvelimeen muodostettu, suoritetaan kättely..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Yhteys palvelimeen suljettiin ennenaikaisesti." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Yhteys testipalvelimeen epäonnistui." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Muunna avaintiedosto" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Kopio (%d) kohteesta %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "Kopio kohteesta %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:98 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:294 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Kopioi valittujen kohteiden URL:t leikepöydälle salasanan kanssa." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:94 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopioi valittujen kohteiden URL:t leikepöydälle." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Yhteyttä ei voitu hyväksyä: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Polkua %s ei voitu avata" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Sertifikaattia ei voitu lisätä väliaikaiseen luotettuun listaan" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Ei voitu lisätä yhteyttä Sivustonhallintaan" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Toiminnon suorittaminen epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Yhteys palvelimeen epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Yhteyttä ei voitu muodostaa palvelimeen: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Ei voitu muuntaa komentoa palvelimen koodaukselle" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Salattua avainta ei voitu muuntaa" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "URL:ien kopiointi epäonnistui" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Sertifikaattia ei voitu kopioida" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Datan kopiointi epäonnistui" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Ei voitu luoda CFURL:ää polusta %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Ei voitu luoda URI:tä siirtoa varten." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Paikallisen tiedoston %s luonti epäonnistui\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Kirjautumis-mutexia ei voitu luoda: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Ei voitu luoda turvallisuusalan kirjanmerkkiä URL:stä:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2521,11 +2672,11 @@ "Joko valikon laajennusta ei ole asennettu oikein tai et pudottanut " "tiedostoja Resurssienhallinnan ikkunaan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Palvelimeen ei saatu yhteyttä" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2536,11 +2687,16 @@ "Voit asettaa FileZillan datahakemiston käyttäen '--datadir ' " "komentorivin valintaa tai asettamalla FZ_DATADIR -ympäristömuuttujan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Muokattua kirjautumisaluetta ei voitu luoda." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Ei voitu luoda avainta" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2548,7 +2704,7 @@ "Ei saatu kuvaavaa nimeä sertifikaatin julkaisijalta, " "gnutls_x509_get_issuer_dn epäonnistui" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2556,40 +2712,36 @@ "Ei saatu kuvaavaa nimeä sertifikaatin aiheesta, gnutls_x509_get_dn " "epäonnistui" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Ei saatu palvelimen koko polkua." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Ei voitu luoda alkuperäistä polkua CFURL:stä" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Polkua ei saatu URL:stä" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "fzputtygen:iltä ei saatu vastausta." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "Latauksien väliaikaishakemistoa ei löytynyt." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Ei voitu tuoda 'peer'-sertifikaattia, gnutls_x509_crt_import epäonnistui" - -#: ../../locales/../src/interface/FileZilla.cpp:108 -#, fuzzy, c-format +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format msgid "Could not initialize Winsock (%d): %s" -msgstr "Ei voitu kirjoittaa socket-rajapintaan: %s" - -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"'Peer'-sertifikaatin rakennetta ei voitu tunnistaa, gnutls_x509_crt_init " -"epäonnistui" +msgstr "Winsock (%d) ei voitu alustaa: %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2600,116 +2752,160 @@ "siihen saa yhteyden.\n" "Sivustonhallinnassa tehtyjä muutoksia ei tallenneta." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Avaintiedostoa ei voitu avata" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Salattua avainta ei voitu avata" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " "'%s'.\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -"Ei löydetty yhteydessä olevaa paikallista hakemistoa palvelinhakemistolle " +"Ei löytynyt yhteydessä olevaa paikallista hakemistoa palvelinhakemistolle " "'%s'.\n" "Poistetaanko synkronoitu selaus käytöstä ja jatketaan palvelinhakemiston " "vaihtamista?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " "'%s'.\n" "Synchronized browsing has been disabled." msgstr "" -"Ei löydetty yhteydessä olevaa paikallista hakemistoa palvelinhakemistolle " +"Ei löytynyt yhteydessä olevaa paikallista hakemistoa palvelinhakemistolle " "'%s'.\n" "Synkronoitu selaus poistettu käytöstä." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " "'%s'.\n" "Synchronized browsing has been disabled." msgstr "" -"Ei löydetty yhteydessä olevaa palvelinhakemistoa paikalliselle hakemistolle " +"Ei löytynyt yhteydessä olevaa palvelinhakemistoa paikalliselle hakemistolle " "'%s'.\n" "Synkronoitu selaus poistettu käytöstä." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Ei löytynyt kokoa kohteelle '%s'" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Ei voinut avata kohdetta '%s'" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Leikepöydän avaaminen epäonnistui" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Ei voitu avata lokitiedostoa: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Palvelimen polkua ei voitu jäsentää." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Ei voitu jäsentää palvelimen osoitetta:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 -#, fuzzy +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Ei voinut lukea kohteesta '%s'" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." -msgstr "Ei voitu lukea socket-rajapinnasta: %s" +msgstr "Dataliitännän lukeminen ei onnistunut." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:382 #, c-format msgid "Could not read from socket: %s" msgstr "Ei voitu lukea socket-rajapinnasta: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Palvelinosiota ei voitu lukea." -#: ../../locales/../src/interface/netconfwizard.cpp:344 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." -msgstr "Yhteys palvelimeen epäonnistui" +msgstr "Datan vastaanotto palvelimelta ei onnistunut." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Ei voitu etsiä tämän tiedoston siirtymäkohtaan %s" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Ei voitu palauttaa hakemistoon pääsyä" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Ei voinut etsiä siirtymään %d tiedostosta" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Ei voitu etsiä tiedoston alkuun" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Ei voitu etsiä tiedoston loppuun" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Komennon lähettäminen fzputtygen:ille epäonnistui." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Ei voitu lähettää komentoa fzstorj:hin." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "'peer'-sertifikaatteja ei voitu lajitella" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "IO-solmua ei voitu muodostaa" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Ei voitu aloittaa välityspalvelimen kättelyä: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Siirtoa ei voitu aloittaa" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2718,18 +2914,18 @@ "Ei voitu kirjoittaa \"%s\", Sivustonhallintaan tehtyjä muutoksia ei voitu " "tallentaa: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Ei voitu kirjoittaa \"%s\", kirjanmerkkiä ei voitu lisätä: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Ei voitu kirjoittaa \"%s\", globaaleja kirjanmerkkejä ei voitu tallentaa: %s" -#: ../../locales/../src/interface/QueueView.cpp:1847 +#: ../../locales/../src/interface/QueueView.cpp:1590 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2738,119 +2934,121 @@ "Ei voitu kirjoittaa \"%s\", jonoa ei voitu tallentaa.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Ei voitu kirjoittaa \"%s\", valittuja sivustoja ei voitu viedä: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Ei voitu kirjoittaa \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Ei voitu kirjoittaa avaintiedostoa: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Ei voitu kirjoittaa paikalliseen tiedostoon" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Ei voitu kirjoittaa lokitiedostoon: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:237 #, c-format msgid "Could not write to socket: %s" msgstr "Ei voitu kirjoittaa socket-rajapintaan: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Maa:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:77 msgid "Crea&te new file" msgstr "&Luo uusi tiedosto" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "Luo puuttuva paikallinen &hakemisto ja siirry siihen" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "Luo puuttuva &etähakemisto ja siirry siihen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 msgid "Create a new subdirectory in the current directory" msgstr "Luo uusi alihakemisto tähän hakemistoon" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:345 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Luo uusi alihakemisto tähän hakemistoon ja siirry siihen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 msgid "Create a new, empty file in the current directory" msgstr "Luo uusi, tyhjä tiedosto nykyiseen hakemistoon" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:33 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:73 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:344 msgid "Create director&y and enter it" msgstr "Luo &hakemisto ja siirry siihen" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Luo hakemisto" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "Luo tyhjä tiedosto" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Luodaan hakemisto" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Luodaan hakemisto '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Kriittinen virhe" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Kriittinen virhe:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Kriittinen tiedostonsiirron virhe" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kriittinen tiedostosiirron virhe siirrettäessä %s %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2859,98 +3057,103 @@ "Nykyistä palvelinhakemistoa (%s) ei löydy synkronointijuuren alta (%s).\n" "Synkronoitu selaus poistettu käytöstä." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Nykyinen siirtotapa asetettu ASCII:lle." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Nykyinen siirtotapa asetettu automaattiseksi." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Nykyinen siirtotapa asetettu binääriseksi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Käyrä:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "&Muokattu" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Muokattu suodatinjoukko" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Muu palvelin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Syaani" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "D&atatyyppi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "" "&Desimaaliset etuliitteet käytettäessä SI-symboleja (esim. 1 kt = 1000 tavua)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "O&letus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:85 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:387 msgid "D&elete" msgstr "Po&ista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "H&akemistojen vertailu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Poista k&aikki käytöstä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "Ä&lä tallenna salasanoja" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Hakemistojen &kaksoisklikkauksen toiminta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "M&onista" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:58 msgid "DOS-like with virtual paths" msgstr "DOSin kaltaiset virtuaalipolut" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Vaarallinen tiedostotyyppi" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Tiedot" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Datan socket-rajapinta suljettu liian aikaisin." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Päivämäärä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Päivämäärän muoto" @@ -2966,15 +3169,15 @@ msgid "Debug" msgstr "Debuggaus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Debuggauksen asetukset" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Paikallinen oletus&hakemisto:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:50 msgid "Default (Autodetect)" msgstr "Oletus (Havaitse automaattisesti)" @@ -2982,17 +3185,17 @@ msgid "Default editor not properly quoted." msgstr "Oletusmuokkainta ei määritelty oikein." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Tiedosto on jo olemassa -oletustoiminto" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Palveli&men oletushakemisto:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -3000,7 +3203,7 @@ "Palvelimen oletuspolkua ei voi jäsentää. Varmista, että se on kelvollinen " "absoluuttinen polku valitulle palvelintyypille." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Järjestelmän oletuskieli" @@ -3008,12 +3211,12 @@ msgid "Default transfer mode:" msgstr "Siirron &oletustapa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Siirron ol&etustyyppi" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Oletus: http://ip.filezilla-project.org/ip.php" @@ -3024,7 +3227,7 @@ "Epäonnistuneiden yhteysyritysten viiveen pitää olla välillä 1 ja 999 " "sekuntia." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3039,75 +3242,85 @@ "Yhteysyritys yhteyden viiivellä %d sekuntia edelliseen verrattuna " "epäonnistui..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "Poista kohde" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:282 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Delete selected directory" msgstr "Poista valittu hakemisto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:42 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 msgid "Delete selected files and directories" msgstr "Poista valitut tiedostot ja hakemistot" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Poistetaan \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Poistetaan %u -tiedostoa kohteesta \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Poistetaan symbolinen linkki" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Työpöytä" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Yksityiskohdat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Uuden avaimen yksityiskohdat:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "Havaittiin uudempi FileZillan versio" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "&Hakemistot" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Direction" msgstr "Suunta" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Hakemistot:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Hakemisto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Hakemiston pääsyoikeudet" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:302 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Hakemistojen vertailu" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Hakemistojen vertailu epäonnistui" @@ -3115,123 +3328,122 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "Lokitiedoston sisältävää hakemistoa ei ole tai tiedostonimi ei kelpaa." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/menu_bar.cpp:83 +msgid "Directory listing &filters..." +msgstr "Hakemiston listaus ja &suodattimet..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Hakemistolistaus käyttäjän keskeyttämä" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "Hakemistolistaus epäonnistui" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Tiedostonimen suodattimet" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Kohteen \"%s\" hakemistolistaus onnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Hakemistolistaus onnistui" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "P&oista kaikki käytöstä" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Poistetaanko synkronoitu selaus käytöstä ja jatketaan palvelinhakemiston " "vaihtamista?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "Poista tämä valinta, jos oikeat tiedostojen sisällöt eivät näy enää." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Katkaise yhteys palvelimeen" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:238 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Yhteys palvelimeen katkaistu" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Yhteys katkaistu palvelimeen: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Katkaistaan yhteys edelliseltä palvelimelta" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Katkaise yhteys palvelimeen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "Display about dialog" msgstr "Näytä Tietoja-ikkuna" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "&Älä käytä oletusmuokkainta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Älä tee mitään" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "" "Tee sama &kaikille valittuina oleville tiedostoille, jotka on jo muokattu" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Suljetaanko FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "Poistetaanko kaikki Sivustonhallinnan kohteet ja siirtojono?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Poistetaanko kaikki Sivustonhallinnan kohteet?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Poistetaanko valittu kohde?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Poistetaanko siirtojono?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Lähetetäänkö '%s' palvelimelle?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Avataanko tämä tiedosto uudestaan?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Dokumentaatio" @@ -3239,48 +3451,48 @@ msgid "Don't use external IP address on &local connections." msgstr "Älä käytä ulkoisia IP-osoitteita p&aikallisissa yhteyksissä." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Pistetiedostot ovat tiedostonimiä, jotka alkavat pisteellä, esim. .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Kaksoisklikkauksen toiminta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Lataa palvelimelta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Lataus&rajoitus palvelimelta:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "Latausrajoitus: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Latausrajoitus: Ei mitään" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Lataa hakutulokset" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "Download selected directory" msgstr "Lataa valittu hakemisto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:53 msgid "Download selected files and directories" msgstr "Lataa valitut tiedostot ja hakemistot" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3289,24 +3501,24 @@ "Latausnopeus: %s/s\n" "Siirtonopeus: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Ladataan" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Ladataan %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Ladataan päivitystä..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 #: ../../locales/../src/interface/QueueView.cpp:88 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3314,11 +3526,11 @@ "Vedä&Pudota -toimintoa ei ole vielä otettu käyttöön FileZillan eri " "instanssien välillä." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:101 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Vedä&Pudota -toimintoa ei ole vielä otettu käyttöön eri palvelimien välillä." @@ -3327,65 +3539,65 @@ msgid "Dupl&icate" msgstr "&Monista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "O&ta kaikki käyttöön" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:15 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 msgid "E&nter directory" msgstr "&Anna hakemisto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Su&orita" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "E&xit" msgstr "&Lopeta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:187 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 msgid "E&xport..." msgstr "&Vie..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "Sähköposti:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Jokaisella suodattimella pitää olla ainakin yksi tila." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Muokkaa suodattimia" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:25 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Muokkaa tiedostoa määritetyllä muokkaimella ja lataa muutokset palvelimelle." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "Hakemistojen muokkausta ei vielä tueta" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Muokkaus epäonnistui" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Muokataan hakutuloksia" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Sähköposti:" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "Empty command" msgstr "Tyhjä komento." @@ -3393,7 +3605,7 @@ msgid "Empty command." msgstr "Tyhjä komento." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "Tyhjä hakemistolistaus" @@ -3401,23 +3613,17 @@ msgid "Empty directory." msgstr "Tyhjä hakemisto." -#: ../../locales/../src/interface/recursive_operation.cpp:377 -#: ../../locales/../src/interface/recursive_operation.cpp:412 -#, fuzzy -msgid "Empty dirs to visit" -msgstr "Tyhjä hakemistolistaus" - #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Tyhjä tiedostotarkennin." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Tyhjiä suodatinnimiä ei sallita." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Tyhjä nimi" @@ -3425,81 +3631,97 @@ msgid "Empty quoted string." msgstr "Tyhjä lainausmerkeissä oleva merkkijono." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Ota &kaikki käyttöön" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Ota epäkelvon merkin &suodatus käyttöön" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Salattu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Salaus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "Salaus&avain:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "Salaus&avain:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Salauksen tiedot" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Lopetetaanko vertailu ja muutetaan lajittelujärjestystä?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Lopetetaanko vertailu ja avataan pikahaku?" + +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Enter &custom command..." msgstr "&Anna oma komento..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Anna 0 rajattomalle nopeudelle." -#: ../../locales/../src/interface/QueueView.cpp:2109 +#: ../../locales/../src/interface/QueueView.cpp:1878 msgid "Enter command" msgstr "Anna komento" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Anna oma komento" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Anna hakemisto" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Anna suodattimen nimi" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Anna pääsalasana" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Suodatinjoukon nimi" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Anna uusi nimi suodatinjoukolle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Anna salasana" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:62 msgid "Enter selected directory" msgstr "Siirry valittuun hakemistoon" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3507,20 +3729,19 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Anna palvelimen osoite.\n" -"Määrittääksesi palvelimen protokollan, kokeile isäntää protokollan " -"tunnuksella. Jos mitään protokollaa ei ole määritetty, käytetään oletuksena " -"(ftp://).\n" -"Voit myös antaa täydelliset URL:t muodossa lomakeprotokollassa://user:" -"pass@host:port tässä, tällöin korvataan muiden kenttien asetukset näillä.\n" +"Anna palvelimen osoite. Palvelimen protokollan määrittämiseksi, lisää " +"isännän alkuun protokollan tunniste. Jos protokollaa ei määritetä, käytetään " +"oletusprotokollaa (ftp://). Voit myös antaa URL:n kokonaan " +"lomakeprotokollassa://user.pass@host:port, jolloin muiden kenttien arvot " +"ylikirjoitetaan.\n" "\n" "Tuetut protokollat:\n" -"-ftp:// normaalille FTP:lle valinnaisella salauksella\n" -"-sftp:// SSH tiedostonsiirto -protokollalle\n" -"-ftps:// FTP-TLS (implisiittinen)\n" -"-ftpes:// FTP-TLS (eksplisiittinen)" +"- ftp:// normaalille FTP:lle valinnisella salauksella\n" +"- sftp:// SSH-tiedoston siirtoprotokolla\n" +"- ftps:// FTP yli TLS (implicit)\n" +"- ftpes:// FTP yli TLS (explicit)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3529,116 +3750,133 @@ "Anna salasana tiedostolle '%s'.\n" "Muunnettu tiedosto suojataan samalla salasanalla." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Anna portti, jota palvelin kuuntelee.\n" -"FTP:n oletus on 21, SFTP:n oletus on 22." +"Anna poertti, jota palvelin kuuntelee. FTP:n oletus on 21, SFTP:n oletus on " +"22." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Anna käyttäjänimi" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Anna käyttäjänimi ja salasana" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Virhe" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Asetuksien vienti epäonnistui" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Tuonti epäonnistui" -#: ../../locales/../src/interface/QueueView.cpp:1909 +#: ../../locales/../src/interface/QueueView.cpp:1668 msgid "Error loading queue" msgstr "Virhe ladattaessa jonoa" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1830 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1571 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "XML-tiedoston lataus epäonnistui" -#: ../../locales/../src/interface/QueueView.cpp:1819 +#: ../../locales/../src/interface/QueueView.cpp:1560 msgid "Error saving queue" msgstr "Virhe tallennettaessa jonoa" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Virhe ohjelman käynnistyksessä" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1848 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1591 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "XML-tiedoston kirjoitus epäonnistui" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Virhe:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Esimerkki: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Esimerkit:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Suori&ta" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "Sovelluksesta puuttuu versiotiedot, päivityksiä ei voi tarkistaa." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Resurssienhallinta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "&Vientisuodattimet" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Vie j&ono" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Vie &asetukset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Vie asetukset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Suodatin&nimi:" @@ -3646,28 +3884,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - Tiedostonsiirtoprotokolla" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Tiedostonsiirtoprotokolla valinnaisella salauksella" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Turvaton tiedostonsiirtoprotokolla" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "FTP-moottoria ei alustettu, ei voi yhdistää" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "FTP Keep-Alive" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP-välityspalvelin" @@ -3684,149 +3921,160 @@ "FTP käyttää toissijaisia yhteyksiä datan siirtoon. Nämä lisäyhteydet voidaan " "muodostaa kahdella tavalla." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP: Tiedostyypit" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP:n eksplisiittinen TLS-suojaus" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP:n implisiittinen TLS-suojaus" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Hakemiston vaihtaminen ei onnistunut" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Kielen vaihtaminen ei onnistunut" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Komennon muuntaminen 8-bittiseksi merkistöksi epäonnistui" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "Sivustojen kopiointi tai siirto epäonnistui" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "XML-tiedoston varmuuskopion luonti epäonnistui" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Kuuntelun socket-rajapinnan luonti epäonnistui, keskeytetään" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Kuuntelurajapinnan luonti portissa %d epäonnistui, keskeytetään." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Kuuntelun socket-rajapinnan luonti epäonnistui aktiivitilan siirrolle" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Palvelimen salasanan purku epäonnistui." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "'Omat tiedostot' -polkua ei löytynyt" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Työpöydän polkua ei löytynyt" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "Kontrolliyhteyden 'peer'-osoitteen haku epäonnistui, yhteys suljettu." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "Datayhteyden 'peer'-osoitteen haku epäonnistui, yhteys suljettu." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "FTP-koneiston alustus epäonnistui" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "TLS:n alustus epäonnistui." -#: ../../locales/../src/interface/FileZilla.cpp:109 -#, fuzzy +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" -msgstr "FTP-koneiston alustus epäonnistui" +msgstr "Verkkotyöskentelyn alustus ei onnistunut" #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Paneelien lataminen epäonnistui, epäkelvot resurssitiedostot?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Salatun avaimen lataaminen epäonnistui: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Ei voitu avata tiedostoa \"%s\" lisäämistä/kirjoittamista varten" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Ei voitu avata kohdetta \"%s\" lukemista varten" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Ei voitu avata kohdetta \"%s\" kirjoittamista varten" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "Palautettua polkua ei voitu jäsentää." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Datan vastaanotto epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Hakemistolistauksen haku epäonnistui" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Ulkoisen IP-osoitteen haku epäonnistui, keskeytetään" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Ulkoisen IP-osoitteen noutaminen epäonnistui, keskeytetään." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "" -"Ulkoisen IP-osoitteen haku epäonnistui, käytetään paikallista osoitetta" +"Ulkoisen IP-osoitteen noutaminen epäonnistui, käytetään paikallista osoitetta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Paikallisen IP-osoitteen haku epäonnistui." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Paikallisen IP-osoitteen noutaminen epäonnistui, keskeytetään." -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Paikallisen IP-osoitteen haku epäonnistui. Keskeytetään" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Paikallisen IP-osoitteen noutaminen epäonnistui." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Ulkoisen IP-osoitteen haku epäonnistui." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Komennon lähetys epäonnistui." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Kielen asetus kielelle %s (%s) epäonnistui, käytetään järjestelmän " "oletuskieltä" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3834,47 +4082,46 @@ "Kielen asetus kielelle %s (%s) epäonnistui, käytetään järjestelmän " "oletuskieltä (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Kielen asetus kielelle %s (%s) epäonnistui, käytetään järjestelmän " "oletuskieltä." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Kielen asetus kielelle %s epäonnistui, käytetään järjestelmän oletuskieltä" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Kielen asetus kielelle %s epäonnistui, käytetään järjestelmän oletuskieltä " "(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Kielen asetus kielelle %s epäonnistui, käytetään järjestelmän oletuskieltä." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Asetuksien varmennus epäonnistui" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" -msgstr "'Peer'-sertifikaatin todennus epäonnistui" +msgstr "'peer'-sertifikaatin todennus epäonnistui" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Tiedostoon %s kirjoittaminen epäonnistui" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "XML-tiedoston kirjoitus epäonnistui" @@ -3886,27 +4133,23 @@ msgid "Fall back to active mode" msgstr "Palaa aktiivitilaan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Tie&dosto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "&Tiedostot" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Tiedosto" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Tiedostotyypit" - -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Tiedoston deskriptori ei ole socket-rajapinta" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Tiedosto ei sisällä tuotavaa dataa." @@ -3914,7 +4157,7 @@ msgid "File editing" msgstr "Tiedoston muokkaus" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "Tiedosto on jo olemassa" @@ -3922,7 +4165,7 @@ msgid "File exists action" msgstr "Tiedosto on jo olemassa -toiminto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Tiedosto on muuttunut" @@ -3930,63 +4173,67 @@ msgid "File lists" msgstr "Tiedostolistaukset" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Tiedostoa ei löydy" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Tiedoston haku" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Tiedostonsiirto käyttäjän keskeyttämä" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Tiedostonsiirto käyttäjän keskeyttämä siirrettässä %s %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Tiedostonsiirto epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Tiedostonsiirto epäonnistui siirrettäessä %s %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Tiedostonsiirto ohitettu" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Tiedostonsiirto onnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Tiedostonsiirto onnistui, siirretty %s/%s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Tiedostosiirrot vielä käynnissä." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Tiedosto siirrettäisiin ASCII-tietotyyppinä." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Tiedosto siirrettäisiin binääritietotyyppinä." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "FileZilla-virhe" @@ -3998,61 +4245,57 @@ "FileZilla voi nyt testata määrityksen varmistaakseen, että kaikki on " "määritetty oikein." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla on jo yhdistetty palvelimeen." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "FileZilla pitää käynnistää uudelleen, jotta kieliasetukset tulevat voimaan." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "FileZillan päivitykset" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/menu_bar.cpp:98 msgid "Filelist status &bars" msgstr "Tiedostolistauksen &tilapaneelit" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Nimi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Tiedostonimen &suodattimet..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Tiedostonimeä ei voi muodostaa hakemistoon %s ja tiedostonimelle %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "Epäkelpo tiedostonimi" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Tiedostonimeä ei muutettu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Nimi:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "" "Tiedostonimissä ei saa esiintyä mitään seuraavista merkeistä: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" @@ -4060,65 +4303,77 @@ "Tiedostonimissä ei saa esiintyä mitään seuraavista merkeistä: / \\ : * ? < > " "|" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" -msgstr "Tiedostot, joita parhaillaan muokataan" +msgstr "Parhaillaan muokattavana olevat tiedostot" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Suodatinsääntöön täsmäävät tiedostot poistetaan hakemistolistauksista." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Tiedostoja ei löytynyt" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" -msgstr "Koko" +msgstr "Tiedostokoko" #: ../../locales/../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "Tiedostokoon muoto" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" -msgstr "Tyyppi" +msgstr "Tiedostotyyppi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Tiedostotyypin sidokset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Suodattimen kohde:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Suodata epäkelvot merkit tiedostonimissä" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Suodatinnimi on jo olemassa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Suodata pois kohteet, jotka täsmäävät kaikkien seuraavien kanssa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Suodata pois kohteet, jotka täsmäävät kaikkien seuraavien kanssa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Suodata pois kohteet, jotka eivät täsmää seuraavien kanssa" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Kohteiden suodatus ei täsmännyt kaikkien seuraavien kanssa" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Suodatinjoukko on jo olemassa" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Suodata hakemistolistaukset" @@ -4128,32 +4383,33 @@ msgid "Filter validation failed" msgstr "Suodattimen varmennus epäonnistui" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Etsi &tiedostoja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Etsi &hakemistoja" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" -msgstr "Sormenjälki (SHA-1):" +msgstr "Tunniste (SHA-1):" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 msgid "Fingerprint (SHA-256):" -msgstr "Sormenjälki (SHA-256):" +msgstr "Tunniste (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Sormenjälki:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Tunnisteet:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Palomuurin ja reitittimen määritysvelho" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4165,7 +4421,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Luotettavuuden kannalta pitäisi määrittää ainakin 10 portin alue." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4173,35 +4429,40 @@ "Tässä istunnossa käytetään oletusasetuksia. Asetuksiin tehtyjä muutoksia ei " "tallenneta." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Pakota UT&F-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/menu_bar.cpp:148 msgid "Force showing &hidden files" msgstr "&Pakota piilotettujen tiedostojen näyttäminen" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Pakota piilotettujen tiedostojen näyttäminen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Muodon määrittelyt:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Muoto: Tarkenne, jota seuraa oikeinmääritelty lainausmerkeissä oleva komento " "ja argumentit." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Löytyi uusi %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Toiminto %s epäonnistui" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Lisädokumentit" @@ -4209,11 +4470,15 @@ msgid "General" msgstr "Yleiset" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "General SOCKS server failure" msgstr "Yleinen SOCKS-palvelimen vika" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Luo..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Yleinen välityspalvelin" @@ -4222,72 +4487,76 @@ msgid "Get external IP address from the following URL:" msgstr "Hae ulkoinen IP-osoite seuraavasta URL:stä:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Ohjeet" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" "Annetun suodatinjoukon nimi on jo olemassa, korvataanko suodatinjoukko?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Globaalit kirjanmerkit" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS -virhe %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS -virhe %d kohteessa %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS -virhe %d kohteessa %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS -virhe %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Vihreä" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Ryhmän oikeudet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 msgid "H&igh" msgstr "S&uuri" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP yli TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Hajautus:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Piilotettu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:1002 +#: ../../locales/../src/interface/queue.cpp:1064 msgid "High" msgstr "Suuri" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:1004 +#: ../../locales/../src/interface/queue.cpp:1066 msgid "Highest" msgstr "Suurin" @@ -4296,57 +4565,65 @@ msgstr "" "Suurin käytettävissä olevan portin numero pitää olla väliltä 1024 ja 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Pidä Vaihto-näppäin alhaalla vaihtaaksesi suodattimen tilaa samanaikaisesti " "molemmilla puolilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Kotisivu:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Isäntäkone ei vastaa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Isännän avaimen sormenjälki:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Isäntäavain ei täsmää" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Isäntä alkaa [-merkillä, mutta lopettavaa sulkua ei löydy." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Host unreachable" msgstr "Isäntään ei saatu yhteyttä" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Isäntä:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Isäntäavaimen algoritmi:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "tuntia," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"&Unohdin pääsalasanani. Poista kaikki tällä avaimella tallennetut salasanat." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (esimerkki: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:115 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "SOCKS4 -välityspalvelimen IPv6 -osoitteita ei tueta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4356,7 +4633,7 @@ "kauemmin kuin valitun ajan kuluessa, yhteys suljetaan ja FileZilla yrittää " "yhdistää uudestaan." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "Jos raportoit virheistä, käytä lokeja \"Laajasanainen\" -lokitasolla." @@ -4380,14 +4657,14 @@ "Jos palautusvalinta on käytössä, voit yhdistää väärin määritettyyn " "palvelimeen, joka hylkää valitun siirtotavan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "" "Jos isäntäavaimen vaihtoa ei odotettu, ota yhteyttä palvelimen ylläpitääjään." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4395,7 +4672,7 @@ "Jos tämä ongelma jatkuu, jokin reititin ja/tai palomuuri jatkaa FileZillan " "estämistä." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4403,7 +4680,7 @@ "Jos tämä ongelma jatkuu, jokin reititin ja/tai palomuuri jatkaa yhteyden " "häiritsemistä." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4413,7 +4690,7 @@ "\".1\" tiedostonimen loppuun (korvaten mahdollisesti vanhemmat " "lokitiedostot) ja uusi tiedosto luodaan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4421,7 +4698,7 @@ "Jos 'symlink' viittaa hakemistoon, FileZilla voi joko poistaa symbolisen " "linkin tai tyhjentää linkitetyn hakemiston sisällön." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4429,12 +4706,12 @@ "Jos tämä ongelma ei poistu, ota yhteyttä reitittimesi tai palomuurin " "valmistajaan ja kysy neuvoa." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "Jos tämä ongelma ei poistu, ota yhteyttä reitittimesi valmistajaan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4444,7 +4721,7 @@ "palvelimen kanssa. Jos aika eroaa (esim. eri aikavyöhyke), määritä " "aikavyöhykkeen siirtymä Sivustonhallinnassa." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4452,7 +4729,7 @@ "Jos käytetään vertailuun perustuvaa aikaleimaa, kaksi tiedostoa ovat " "samanarvoisia, jos niiden aikaleiman poikkeama ei ylitä tätä rajaa." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Jos vaihdat kielen, FileZilla täytyy käynnistää uudestaan." @@ -4464,11 +4741,11 @@ "Jos klikkaat Testaa, FileZilla yhdistää osoitteeseen: probe.filezilla-" "project.org ja suorittaa muutaman yksinkertaisen testin." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Jos suljet FileZillan, muutoksesi menetetään." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4480,7 +4757,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "Jos näyttöön tulee virheilmoituksia, määritys on tehty väärin." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4488,7 +4765,7 @@ "Jos hakemistolistauksen hakemisessa tai siirrettäessä tiedostoja tulee " "ongelmia, yritä vaihtaa oletuksena olevaa siirtotapaa." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4523,7 +4800,7 @@ "Jos käytät reititintä varmista, että kaikki nämä portit on viety eteenpäin " "koneelle, jolla käytät FileZillaa." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4531,16 +4808,16 @@ "Jos reititin vaihtaa jatkuvasti IP-osoitetta, ota yhteyttä reitittimen " "valmistajaan." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Tuo data vanhemmasta versiosta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Tuontiasetukset" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Tuonti onnistui" @@ -4567,7 +4844,7 @@ "portteihin." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4583,19 +4860,11 @@ "palvelimelta porttia ja yhdistää annettuun porttiin. Tätä ei tarvitse " "paljonkaan määrittää." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Puutteellinen ketju, pääsertifikaatti ei ole itse allekirjoitettu " -"valtuutetun sertifikaatti" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Salasana ei kelpaa" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4603,21 +4872,21 @@ "FileZillan uusimman version tietojen lataus epäonnistui. Yritä uudestaan " "myöhemmin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Alustetaan TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:107 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "Turvaton algoritmi!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Turvaton palvelin, ei tue FTP yli TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:611 +#: ../../locales/../src/engine/server.cpp:635 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interaktiivinen" @@ -4625,29 +4894,29 @@ msgid "Interface" msgstr "Käyttöliittymä" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Signaalin keskeytys" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Käyttäjän keskeytys" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:161 +#: ../../locales/../src/engine/http/request.cpp:584 msgid "Invalid Content-Length" msgstr "Content-Length ei kelpaa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:490 msgid "Invalid HTTP Response" msgstr "HTTP-vastaus ei kelpaa" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Annettiin virheellinen argumentti" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4655,45 +4924,69 @@ "Vastaanotettiin epäkelpo merkistösekvenssi, poistetaan UTF-8. Valitse UTF-8 " "Sivustonhallinnassa pakottaaksesi UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:705 msgid "Invalid chunk size" msgstr "Alilohkon koko ei kelpaa" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Vastaanotettu data ei kelpaa" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Päivämäärä ei kelpaa" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Epäkelpo tiedostonimi" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Epäkelpo hajautus: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Kelvoton isäntä, lopettavan sulkumerkin jälkeen voi olla vain kaksoispiste " "ja portti" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Epäkelpo isäntänimi: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Virheellinen syöte" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:518 +msgid "Invalid line" +msgstr "Epäkelpo rivi" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Epäkelpo polku" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Portti ei kelpaa. Portin arvo täytyy olla väliltä 1 - 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4707,74 +5000,74 @@ "ftps:// FTP-TLS (implisiittinen) ja\n" "ftpes:// FTP-TLS (eksplisiittinen)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Isäntä ei kelpaa, lopettavan sulkumerkin jälkeen voi olla vain kaksoispiste " "ja portti." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Epäkelpo säännöllinen lauseke" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Epäkelpo säännöllinen lauseke hakuehdoissa." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:499 msgid "Invalid response code" msgstr "Vastauskoodi ei kelpaa" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Epäkelvot hakuehdot: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Sivuston polku ei kelpaa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Ehdon koko ei kelpaa" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Käyttäjänimi ei kelpaa." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Epäkelpo arvo ai_flags'ille" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Virheellinen arvo vihjeille" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Käännä suodatin" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Oikeusvaltio:" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Oikeuden paikkakunta:" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Oikeuden maa tai lääni:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Pidä hakemistot päällimmäisinä" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4785,7 +5078,7 @@ "testin kokeillakseen tukeeko palvelin tätä toimintoa, testi saattaa " "epäonnistua." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Avaimen vaihto" @@ -4793,123 +5086,146 @@ msgid "Key exchange:" msgstr "Avaimen vaihto:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:608 +#: ../../locales/../src/engine/server.cpp:633 msgid "Key file" msgstr "Avaintiedosto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Avaimen tunnistin:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 msgid "L&owest" msgstr "P&ienin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Kieli" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Kieli vaihdettu" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Muokattu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Ulkoasu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Jätä tyhjäksi säilyttääksesi olemassa oleva salasana." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Samanaikaisten &latauksien raja palvelimelta:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Samanaikaisten la&tauksien raja palvelimelle:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Rajoita paikallisportit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Rajaa lokitiedoston koko" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Raja:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:659 msgid "Line length exceeded" msgstr "Rivin pituus ylitetty" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Linkitetty vastaan" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Kuuntelun socket-rajapinta suljettu" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Listaus:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "&Pienin käytettävissä oleva portti:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Paikallinen kansio" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Paikallinen osoite käytössä" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Paikallinen päätepiste suljettu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Paikallinen tiedosto" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Paikallinen tiedosto ei ole olemassa." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Paikallinen tiedosto on %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Paikallinen tiedosto on hakemisto eikä tavallinen tiedosto." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Paikallinen tiedosto ei ole kelvollinen tiedostonimi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Paikallinen tiedostohaku" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Paikalliset suodattimet:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Paikallinen polun käsittely:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Paikallinen sivusto:" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "Kohteen '%s' paikallinen koko ei täsmää oletetun koon kanssa: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Sijainti:" @@ -4917,12 +5233,16 @@ msgid "Log file" msgstr "Lokitiedosto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Kirjautunut" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Kirjautuminen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4931,7 +5251,7 @@ "UTF-8:aa. Ei voi palata paikalliseen merkistöön, koska käytetään " "välityspalvelinta." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4939,9 +5259,11 @@ "Kirjautumistiedot eivät sisällä ASCII-merkkejä, palvelin ei ehkä ymmärrä " "UTF-8:aa. Kokeillaan paikallista merkistöä." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "Kirjautuminen suoritettiin, mutta ei vielä kirjauduttu. Keskeytetään." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "" +"Sisäänkirjauksen jono suoritettu kokonaan, muttei kirjauduttu sisään, " +"keskeytetään." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -4958,13 +5280,13 @@ "Kirjautumistyyppiä voidaan käyttää ainoastaan FTP URL:n kanssa. Argumentin " "on oltava joko '%s' tai '%s'" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:997 +#: ../../locales/../src/interface/queue.cpp:1059 msgid "Low" msgstr "Pieni" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:995 +#: ../../locales/../src/interface/queue.cpp:1057 msgid "Lowest" msgstr "Pienin" @@ -4976,130 +5298,161 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Varmista, että tiedoston voi avata ja että se on oikein muotoiltu XML-" "asiakirja." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:646 +#: ../../locales/../src/engine/http/request.cpp:652 +#: ../../locales/../src/engine/http/request.cpp:659 +#: ../../locales/../src/engine/http/request.cpp:670 +#: ../../locales/../src/engine/http/request.cpp:705 #, c-format msgid "Malformed chunk data: %s" -msgstr "Virheellisesti muotoiltu paladata: %s" +msgstr "Virheellisesti muotoiltu lohkodata: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:161 #, c-format -msgid "Malformed header: %s" -msgstr "Virheellisesti muotoiltu tunniste: %s" +msgid "Malformed request header: %s" +msgstr "Väärin muodostettu pyynnön ylätunnus: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "" -"Virheellisesti muotoiltu vastaus, palvelin ei lähetä kelvollisia " -"rivinlopetuksia" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:459 +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:518 +#: ../../locales/../src/engine/http/request.cpp:574 +#: ../../locales/../src/engine/http/request.cpp:584 +#, c-format +msgid "Malformed response header: %s" +msgstr "Väärin muodostettu vastauksen ylätunnus: %s" + +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +#, c-format +msgid "Malformed response: %s" +msgstr "Väärin muodostettu vastaus: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Manuaalinen siirto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "&Pääsalasana:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Pääsalasana:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Täsmää kaikkiin seuraaviin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Täsmää kaikkiin seuraaviin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Älä täsmää seuraaviin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Ei täsmää kaikkien seuraavien kanssa" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Samanaikaisten s&iirtojen enimmäismäärä:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Muistin varaaminen epäonnistui" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Sanomaloki" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Sanomalokin sijainti" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Sanoma liian suuri" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "minuuttia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Siirrä &alaspäin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Siirrä &ylöspäin" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Oma tietokone" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Omat tiedostot" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "Omat sivustot" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/A" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Nimi" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "Nimi on jo olemassa." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Kirjanmerkki on jo käytössä." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Nimi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Luonnollinen lajittelu" @@ -5107,30 +5460,34 @@ msgid "Need to enter filter name" msgstr "Suodatinnimi tarvitaan" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Kelvollinen paikallinen polku tarvitaan" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Kelvollinen polku tarvitaan" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "Merkistökoodaus tarvitaan" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Sekä 'nodename', että 'servname' ei annettu tai ei tunneta" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "Verkon isännällä ei ole verkko-osoitetta pyydetyssä osoiteperheessä" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Verkkoon ei saatu yhteyttä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Ei koskaan" @@ -5138,41 +5495,41 @@ msgid "New &Folder" msgstr "Uusi ka&nsio" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "New &tab" msgstr "&Uusi välilehti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" -msgstr "Uusi kirjan&merkki" +msgstr "Uusi kirjanm&erkki" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Uusi kirjanmerkki" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Uusi hakemisto" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "%s:n uudet ominaisuudet ja parannukset" @@ -5181,139 +5538,135 @@ msgid "New filter" msgstr "Uusi suodatin" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Uusi kansio" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Uusi sivusto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Seuraavana siirtojonossa" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "Ei" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Mitään osoitetta ei ole sidottu kohteelle 'nodename'" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Luokkaa ei ole valittu vientiin." -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "No command given, aborting." msgstr "Komentoa ei annettu, keskeytetään." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Ulkoista IP-osoitetta ei asetettu, kokeillaan oletusta." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." -msgstr "Mitään tiedostoa ei ole tällä hetkellä muokkauksessa." +msgstr "Mitään tiedostoa ei ole tällä hetkellä muokattavana." #: ../../locales/../src/interface/filteredit.cpp:143 msgid "No filter name given" msgstr "Suodatinnimeä ei annettu" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Isäntää ei annettu, anna isäntä." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Kuvia ei ole saatavilla." -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Jonossa ei ole enempää tiedostoja!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Suodatinjoukolle ei ole annettu nimeä." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Mitään ohjelmaa ei ole sidottu tietostotyyppiin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Mitään ohjelmaa ei ole sidottu muokkaamista varten tiedostoihin, joiden " "pääte on '%s'." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Ei reittiä isännälle" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Ei hakutuloksia" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Sivustoja ei ole saatavilla" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:466 msgid "No supported SOCKS5 auth method" msgstr "Ei tukea SOCKS5 todentamismenetelmälle" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Käyttäjänimeä ei annettu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Ei mitään" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Mitään ei ole vielä valittu" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Ei-palautettava virhe nimen selvityksessä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:602 +#: ../../locales/../src/engine/server.cpp:629 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:1062 msgid "Normal" msgstr "Normaali" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:309 +#: ../../locales/../src/interface/queueview_failed.cpp:334 msgid "Not all items could be requeued for transfer." msgstr "Kaikkia tiedostoja ei voitu lisätä jonoon siirtämistä varten." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Ei yhdistetty" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Ei yhdistetty mihinkään palvelimeen" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Ei yhdistetty mihinkään palvelimeen." @@ -5321,27 +5674,36 @@ msgid "Not connected." msgstr "Ei yhdistetty." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Ei alustettu, WSAStartup'in kutsua tarvitaan" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Huomaa, että tämä toiminto on tuettu ainoastaan käytettäessä FTP-protokollaa." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Huomautus: Hukattua avainta ei voi palauttaa." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" "Huomautus: Tämä toimii vain tavallisilla, salaamattomilla FTP-yhteyksillä." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Huom: FTP-yhteydet pakotetaan passiivitilaan käytettäessä yleistä " "välityspalvelinta." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:652 +msgid "Null character in line" +msgstr "Tyhjä merkki rivillä" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Desimaalipaikkojen määrä:" @@ -5349,40 +5711,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Uudelleenyritysten määrän pitää olla välillä 0 ja 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "Avaa &tiedosto" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:396 +msgid "O&pen" +msgstr "A&vaa" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "Käyttöjärjestelmän versio:" @@ -5394,170 +5760,193 @@ "Seuraavilla sivuilla määritetään valittu siirtotapa, kuten palautustila, jos " "käytössä." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Kerran" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Kerran päivässä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Kerran viikossa" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "Käytä vain pelkkää FTP:tä (turvaton)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "&Avaa tiedosto" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "Open directory in system's file manager" msgstr "Avaa hakemisto järjestelmän tiedostohallinnassa" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Avaa Sivustonhallinta" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Avaa Sivustonhallinta." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Avaa Sivustonhallinta. Klikkaa hiiren oikealla saadaksesi luettelon " "sivustoista." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Avaa hakemiston pääsyoikeuksien dialogi määrittääksesi paikalliset " +"hakemistot, johon FileZilla:lla on pääsy." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 msgid "Open the file." msgstr "Avaa tiedosto." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "Open the settings dialog of FileZilla" msgstr "Avaa FileZillan asetusikkuna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Avattu nimellä:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Avaus epäonnistui" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "Opens a new tab" msgstr "Avaa uuden välilehden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "Opens the Site Manager" msgstr "Avaa Sivustonhallinnan" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Avaa hakemistolistauksen suodatinikkunan. Klikkaa hiiren oikealla " "vaihtaaksesi suodattimia." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Käyttöjärjestelmä:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Toiminto on jo käynnissä" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Toiminto käynnissä" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Toiminto ei ole tuettu" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Valinnat" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Oranssi" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Järjestö:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Muut SFTP-valinnat" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Muu järjestelmävirhe" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Muu:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Muisti loppui" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Yleiset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Korvaa, jos &lähde uudempi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Korvaa tiedosto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Korvaa tiedosto, jos erikokoisia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Korvaa tiedosto, jos erikokoisia tai lähdetiedosto on uudempi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Korvaa tiedosto, jos lähdetiedosto on uudempi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Korvaa, jos &erikokoisia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Korvaa, jos eri&kokoisia tai lähde on uudempi" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Itserakennettu tyyppi: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Omistajan oikeudet" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Omistaja/Ryhmä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5565,98 +5954,112 @@ "E&stä järjestelmää menemästä lepotilaan siirtojen ja muiden toimintojen " "aikana" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Välityspalvelimen &isäntä:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "PORT-komento reitittimen tai palomuurin hylkäämä." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Pa&ssiivinen (suositus)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Parametri ei ole kelvollinen URL" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Jäsennetään %d tavua versiotiedoista.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" -msgstr "&Salasana:" +msgstr "S&alasana:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" msgstr "Passiivinen (suositus)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Passiivitila" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Passiivitila asetettu siirtotavan oletukseksi." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Salasanaa tai salausavainta ei ole asetettu" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Tarvitaan salasana" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Salasanat" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Polku" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Polkua ei voi muodostaa hakemistoon %s ja alihakemistoon %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Polkua ei löydy:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Polut" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Odottaa poistoa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Lupa" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Lupa evätty" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Oikeudet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" -msgstr "Käyttötaso:" +msgstr "Sovellusalusta:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Lisää paikalliset hakemistot, joita haluat käyttää FileZilla:n kanssa." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5664,6 +6067,14 @@ "Tarkista osoitteessa: https://filezilla-project.org/probe.php, että palvelin " "on käynnissä ja tarkista asetuksesi huolella uudestaan." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Tarkista myönnetyt oikeudet ja lisää uudestaan kaikki puuttuvat paikalliset " +"hakemistot, joiden kanssa työskentelet, seuraavaan dialogiin." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5672,11 +6083,11 @@ "Määritä kaikki palomuurit ja reitittimet niin, että FileZilla voi muodostaa " "ulosmenevän yhteyden mihin tahansa porttiin." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Poista asetukset, kuten 'DMZ-tila' tai 'Pelitila' reitittimestä." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5692,13 +6103,13 @@ msgid "Please enter a custom time format." msgstr "Anna oma aikamuoto." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Anna lomakkeen päivämäärä muodossa VVVV-KK-PP, esimerkiksi 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5708,16 +6119,16 @@ msgid "Please enter a name for the new filter." msgstr "Anna nimi uudelle suodattimelle." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Anna uusi nimi kopioidulle suodattimelle." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Anna uusi nimi suodatinjoukolle \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Anna uusi nimi suodattimelle." @@ -5738,21 +6149,10 @@ "transfers." msgstr "Anna numero samanaikaisten siirtojen määrälle väliltä 1-10." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Anna salasana tälle palvelimelle:" -#: ../../locales/../src/interface/QueueView.cpp:2109 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Anna polku ja suoritettava ohjelma.\n" -"Esim. c:\\jokuPolku\\tiedosto.exe MS Windowsissa tai /jokuPolku/tiedosto " -"Unixissa.\n" -"Voit vaihtoehtoisesti määrittää myös ohjelman argumentit." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5760,30 +6160,30 @@ "Anna aikakatkaisu väliltä 10-9999 sekuntia tai 0 ottaaksesi aikakatkaisun " "pois käytöstä." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Anna nimi tälle suodatinjoukolle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Anna käyttäjänimi tälle palvelimelle:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Anna kelvollinen porttialue." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Anna URL, josta ulkoinen osoite haetaan." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Anna latausnopeus palvelimelle, joka on suurempi tai yhtäsuuri kuin 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5791,27 +6191,47 @@ "Anna FTP-komento.\n" "Käytettäessä FTP-komentoja, välimuistin hakemisto tyhjennetään." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1878 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Anna ohjelman koko polku ja sen argumentit. Tämä komento suoritetaan, kun " +"jono on käsitelty.\n" +"Esim. c:\\jokupolku\\tiedosto.exe MS Windowsissa tai /jokupolku/tiedosto " +"Unixissa.\n" +"Komennot ja argumentit pitää sijoittaa lainausmerkkien väliin, jos ne " +"sisältävät välilyöntejä." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Anna hakemiston nimi:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "Anna luotavan tiedoston nimi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Anna käyttäjänimi ja salasana tälle palvelimelle:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "Anna nykyinen pääsalasanasi vaihtaaksesi salasana-asetukset." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Anna ulkoinen IP-osoitteesi." -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5821,6 +6241,11 @@ "on dynaaminen osoite tai et tiedä ulkoista osoitettasi, käytä ulkoisen " "ratkaisimen valintaa." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "Anna pääsalasanasi purkaaksesi tämän palvelimen salasanan:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5828,7 +6253,7 @@ msgstr "" "Seuraa ohjeita huolella, koska väärä määritys estää onnistuneet FTP-yhteydet." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5836,11 +6261,11 @@ "Varmista, että FileZillalla on oikeus muodostaa ulosmeneviä yhteyksiä ja " "että annoit osoitteen oikeassa muodossa." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "Varmista, että pyydetty lokaali on asennettu järjestelmääsi." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5863,7 +6288,7 @@ "käytettävän troijalaisille tai muille haittaohjelmille. Tämä voi aiheuttaa " "väärän hälytyksen, jonka voit hylätä turvallisesti." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5871,7 +6296,7 @@ "Huomioi, että aikaleimojen sisällytys palvelimelle siirrettäessä FTP-, FTPS- " "ja FTPES-palvelimilla toimivat ainoastaan, jos ne tukevat MFMT-komentoa." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5879,7 +6304,7 @@ "Huomioi, että jotkut palvelimet saattavat torjua sinut, jos yrität yhdistää " "uudelleen liian useasti tai yhdistät liian lyhyillä aikaväleillä." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5888,11 +6313,19 @@ "Jos muutat verkon asetuksia, aja tämä velho uudestaan tai jos kohtaat " "ongelmia palvelimien kanssa, jotka toimivat aikaisemmin." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Tallenna tämä avain turvalliseen paikkaan. Lähetettyjä tiedostojasi ei voi " +"avata ilman oikeaa avainta." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Valitse toiminto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Valitse tuotavat luokat." @@ -5923,7 +6356,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Valitse uudet määritteet valituille tiedostoille." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5937,37 +6370,37 @@ "Protokollan tarkistukset tai erikoiset 'korjaukset' pitää ottaa pois " "käytöstä." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Sanomalokin &sijainti:" -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Postinumero:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "Varaa tilaa ennen latausta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Varaaminen" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Esimääritetyt sivustot" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Sisällytetään aikaleimoja" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Esikatselu:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Esikatselu" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Ensisijaisen yhteyden ja datayhteyden sertifikaatit eivät täsmää." @@ -5979,15 +6412,15 @@ msgid "Print version information to stdout and exit" msgstr "Tulosta versiotiedot stdout:iin ja lopeta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Aseta hakemistot tärkeysjärjestykseen (oletus)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Priority" msgstr "Prioriteetti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5995,7 +6428,7 @@ "Yksityiskäytäntö. Vain sinun FileZilla-versio, sinun käyttämäsi " "käyttöjärjestelmä ja CPU-arkkitehtuuri lähetetään palvelimelle." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Salaiset &avaimet:" @@ -6003,31 +6436,31 @@ msgid "Pro&tocol:" msgstr "Pro&tokolla:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Välityspalvelimen s&alasana:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:107 +#: ../../locales/../src/interface/menu_bar.cpp:111 msgid "Process &Queue" msgstr "Käsittele jo&no" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Prosessin tiedostotaulukon ylivuoto" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Käsitelty %s kohteessa %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Protokolla ei ole tuettu" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Protokollaa ei tueta annetulle socket-rajapinnan tyypille" @@ -6035,55 +6468,55 @@ msgid "Protocol:" msgstr "Protokolla:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Välityspalvelimen &portti:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Välityspalvelimen &käyttäjä:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:475 msgid "Proxy authentication failed" msgstr "Välityspalvelimen todennus epäonnistui" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Välityspalvelimen kättely epäonnistui: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Isäntä alkaa '['-merkillä, mutta lopettavaa sulkumerkkiä ei löydy." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:329 #, c-format msgid "Proxy reply: %s" msgstr "Välityspalvelimen vastaus: %s" -#: ../../locales/../src/engine/proxy.cpp:535 -#, fuzzy, c-format +#: ../../locales/../src/engine/proxy.cpp:516 +#, c-format msgid "Proxy request failed. Reply from proxy: %s" -msgstr "Välityspalvelimen pyyntö epäonnistui: %s" +msgstr "Välityspalvelimen pyyntö epäonnistui. Välityspalvelimen vastaus: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:386 #, c-format msgid "Proxy request failed: %s" msgstr "Välityspalvelimen pyyntö epäonnistui: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:540 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Välityspalvelimen pyyntö epäonnistui: Tuntematon osoitteen tyyppi CONNECT-" "vastauksessa" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Välityspalvelin asetettu, mutta isäntä tai portti epäkelpo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Julkisen avaimen todennus" @@ -6091,68 +6524,77 @@ msgid "Public key algorithm:" msgstr "Julkisen avaimen algoritmi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Julkiset oikeudet" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2784 msgid "Queue has been fully processed" msgstr "Jono käsitelty onnistuneesti" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Jono: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Jono: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Jono: tyhjä" -#: ../../locales/../src/interface/QueueView.cpp:438 +#: ../../locales/../src/interface/QueueView.cpp:207 msgid "Queued files" msgstr "Jonossa olevat tiedostot" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Jono:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "K&äynnistä tietokone uudestaan" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Pikahaku:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Pikahakua ei voi avata, jos hakemistoja verrataan." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +msgid "R&eboot system once" +msgstr "Käynnistä &uudelleen järjestelmä kerran" + +#: ../../locales/../src/interface/menu_bar.cpp:104 msgid "R&emote directory tree" msgstr "Palvelimen hake&mistopuu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:248 msgid "R&eset and requeue selected files" msgstr "R&esetoi ja laita valitut tiedostot jonoon uudestaan" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "FTP-komento" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "L&ue" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:37 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:81 msgid "Re&fresh" msgstr "&Virkistä" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Nimeä &uudelleen" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6160,20 +6602,24 @@ "Suorita velho uudestaan, tarkista huolellisesti asetuksesi ja määritä kaikki " "reitittimet ja palomuurit." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Lu&e" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Vain luku" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "Paikallisen tiedoston luku epäonnistui" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Perutetaanko toiminto?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6181,21 +6627,21 @@ msgstr[0] "Poistetaanko %d hakemisto sisältöineen palvelimelta?" msgstr[1] "Poistetaanko %d hakemistot sisältöineen palvelimelta?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Poistetaanko %d tiedosto palvelimelta?" msgstr[1] "Poistetaanko %d tiedostoa palvelimelta?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Poistetaanko %s ja %s palvelimelta?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "Poistetaanko kaikki valitut tiedostot ja/tai hakemistot palvelimelta?" @@ -6204,52 +6650,59 @@ msgstr "" "Poistetaanko kaikki valitut tiedostot ja/tai hakemistot tietokoneeltasi?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Reason" msgstr "Syy" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2777 msgid "Reboot now" msgstr "Käynnistä tietokone uudellen nyt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Rek&ursoi alihakemistoihin" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Vastaanotettu TLS -hälytys palvelimelta: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Vastaanotettiin EBCDIC-koodattu hakemistolistaus." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Vastaanotettiin yli 10000 merkin rivi, keskeytetään." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Vastaanotettua sertifikaattiketjua ei voitu todentaa. Todennustila on %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Vastaanotettu data hylättiin" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "Vastaanotettiin virheellinen merkki versiotiedoissa" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Vastaanotettiin tuntematon TLS -hälytys %d palvelimelta" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "Vastaanotettu versiotietojen tiedosto on liian suuri" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6257,77 +6710,75 @@ "Uudelleenyhdistämisen tietoja ei voi tyhjentää, kun palvelimeen on yhteys.\n" "Jos jatkat, yhteydesi katkaistaan." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Uudelleenyhdistämisen asetukset" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Yhdistä uudelleen viimeisimpään käytettyyn palvelimeen" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Lisätään tiedostoja jonoon rekursiivisesti." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Vaihdetaan oikeudet rekursiivisesti." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Poistetaan tiedostoja ja hakemistoja rekursiivisesti." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Punainen" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Uudelleenohjaus epäkelpoon tai ei-tuettuun URI:hin: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Uudelleenohjaus epäkelpoon tai ei-tuettuun osoitteeseen: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Päivitä tiedosto- ja kansiolistaukset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "&Muistetaanko salasanat?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Palvelin" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Palvelimen sertifikaatti ei ole luotettava." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Remote file" msgstr "Palvelimen tiedosto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Palvelimen tiedostohaku" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Palvelimen suodattimet:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Palvelimen polku" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6336,7 +6787,7 @@ "Palvelimen oletuspolkua ei voi jäsentää. Varmista, että se on kelvollinen, " "absoluuttinen polku ja nykyisen sivuston palvelintyypin (%s) tukema." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6346,129 +6797,133 @@ "absoluuttinen polku ja valitun palvelintyypin (%s) tukema palvelimen " "sivustolla." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Palvelimen oletuspolkua ei voi jäsentää. Varmista, että se on kelvollinen, " "absoluuttinen polku." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Palvelimen polkua ei voitu jäsentää." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Palvelimen polkumääritys:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Palvelimen polku:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Palvelimen sivusto:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Remove &all" msgstr "Poista &kaikki" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 msgid "Remove &selected" msgstr "Poista &valittu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Nimeä tiedosto uudelleen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "Rename selected directory" msgstr "Nimeä valittu hakemisto uudelleen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:46 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:90 msgid "Rename selected files and directories" msgstr "Nimeä uudelleen tiedostot ja hakemistot" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Nimetään uudelleen '%s' '%s':ksi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Anna salasana uudestaan:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Bugien ja ominaisuuspyyntöjen raportointi" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:377 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Pyyntö epäonnistui - asiakas ei käytä identd:tä (tai ei ole palvelimen " "tavoiteltavissa)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:380 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Pyyntö epäonnistui - asiakkaan identd ei voinut vahvistaa käyttäjän ID:tä" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:374 msgid "Request rejected or failed" msgstr "Pyyntö hylättiin tai epäonnistui" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "Vaadi eksplisiittinen FTP:n TLS-suojaus" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "Vaadi implisiittinen FTP:n TLS-suojaus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:241 msgid "Reset and requeue &all" msgstr "Resetoi ja laita &kaikki tiedostot jonoon uudestaan" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Selvitetty protokolla tuntematon" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Selvitetään osoitetta kohteelle %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Resurssi ei ole tällä hetkellä saatavilla" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Vastaus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Tulokset:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Jatka tiedostonsiirtoa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6476,44 +6931,46 @@ "Palautettaessa ASCII-tiedostoja ne voivat aiheuttaa ongelmia, jos palvelin " "käyttää erilaista rivinlopetuksen muotoa kuin asiakas." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Haetaan kohteen \"%s\" hakemistolistausta..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Haetaan hakemistolistausta..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Haetaan ulkoista IP-osoitetta kohteesta %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../locales/../src/interface/menu_bar.cpp:61 msgid "S&how files currently being edited..." -msgstr "&Näytä muokkauksessa olevat tiedostot..." +msgstr "&Näytä muokattavana olevat tiedostot..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "&Näytä Sivustonhallinta käynnistyksen yhteydessä" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Sa&mmuta tietokone" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 +msgid "S&hutdown system once" +msgstr "&Sammuta järjestelmä kerran" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "&Pysäytä" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "Aseta järjestelmä &lepotilaan" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:182 +msgid "S&uspend system once" +msgstr "Aseta järjestelmä &lepotilaan kerran" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/menu_bar.cpp:97 msgid "S&ynchronized browsing" msgstr "S&ynkronoitu selaus" @@ -6521,90 +6978,111 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "SFTP-tuki" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:141 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 -välityspalvelin yhdistää kohteeseen: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:168 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 ei tue käyttäjänimiä tai salasanoja, jotka ovat pitempiä kuin 255 " +"merkkiä." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "&Tallenna pääsalasanalla suojatut salasanat" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "T&allenna salasanat" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Tallennetaanko asetukset?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "" "Salasanan tallentaminen on poistettu käytöstä järjestelmänvalvojan toimesta." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "Salasanan tallentaminen on poistettu käytöstä sinun toimesta." -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "Skannataan tiedostoja jonoon lisättäväksi" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "Skannataan tiedostoja ladattavaksi palvelimelle" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Skaalauskerroin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Haku&ehdot:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Etsi &hakemistosta:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Etsi tiedostoja rekursiivisesti." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "Search server for files" msgstr "Etsi tiedostoja palvelimelta" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Hakutyyppi:" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Turvallisuustiedot" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Katso myös: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "&Valitse palvelin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Valitse &sivu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Valitse teema" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "Valitse oletustoiminto, jos siirron kohdetiedosto on jo olemassa." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Valitse oletusmuokkain" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6612,7 +7090,7 @@ "Valitse tiedosto on jo olemassa -oletustoiminto, jos kohdetiedosto on jo " "olemassa. Tämä valinta on voimassa vain tässä istunnossa." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6620,138 +7098,142 @@ "Valitse oletustiedosto on jo olemassa -oletustoiminto vain jonossa " "valituille tiedostoille." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Valitse tiedosto, joka sisältää salatun avaimen" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Valitse tiedosto viedylle datalle" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Valitse vientisuodattimien tiedosto" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1566 msgid "Select file for exported queue" msgstr "Valitse tiedosto viedylle jonolle" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Valitse vientiasetusten tiedosto" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "Valitse tiedosto viedyille sivustoille" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Valitse tiedosto, josta asetukset tuodaan" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Valitse palvelimelle ladattava tiedosto" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Valitse tiedostonimi muunnetulle avaintiedostolle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Valitse, miten nämä tiedostot tulisi avata." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Valitse latauksen kohdehakemisto" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Valitse kohteen tiedostonimi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Valitse vietävät luokat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Valitse tyhjennettävät yksityisyystiedot." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Valittu %d hakemisto sisältöineen siirtoa varten." msgstr[1] "Valittu %d hakemistot sisältöineen siirtoa varten." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Valittu %d hakemisto." msgstr[1] "Valittu %d hakemistoa." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Valittu %d tiedosto siirtoa varten." msgstr[1] "Valittu %d tiedostoa siirtoa varten." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Valittu %d tiedosto. Koko yhteensä: %s" msgstr[1] "Valittu %d tiedostoa. Koko yhteensä: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Valittu %d tiedosto. Koko yhteensä: vähintään %s" msgstr[1] "Valittu %d tiedostoa. Koko yhteensä: vähintään %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Valittu %s ja %s siirtoa varten." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Valittu %s ja %s. Koko yhteensä: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Valittu %s ja %s. Koko yhteensä: vähintään %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Valittua muokkainta ei löydy." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Valittu tiedosto on jo muokattavana" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Valittu tiedosto on jo avattu" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Valittu tiedosto on jo avoinna" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Valittu tiedosto on vielä muokattavana" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Valittu suodatin toimii ainoastaan paikallisisten tiedostojen kanssa." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:434 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6760,46 +7242,46 @@ "palvelintyyppiä.\n" "Käytä sivustokohtaisia kirjanmerkkejä tälle palvelimelle." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Valittu portti on yleensä toisen protokollan käytössä." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Lähetä FTP:n &Keep-Alive komentoja" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Send custom command to the server otherwise not available" msgstr "Lähetä oma komento palvelimelle, joka ei ole muuten saatavissa" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Lähetetään Keep-Alive komento" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Sarjanumero:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "Palvelime&n tyyppi:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Palvelin ei lopettanut kunnolla TLS-yhteyttä" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Palvelin ei tue merkkejä, jotka eivät ole ASCII-muodossa." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Palvelin ei tue tiedostoja, jotka ovat > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6808,15 +7290,19 @@ "Palvelin ei tue tiedostojen palautusta, jotka ovat > %d Gt. Lopeta siirto " "siihen asti, kunnes tiedostokoot täsmäävät." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Palvelin ei tue tiedostoja, jotka ovat > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Palvelin ei tue tiedostoja, jotka ovat > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Palvelimen isäntäavain" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6825,17 +7311,32 @@ "Palvelin ei ehkä tue tiedostojen palautusta, jotka ovat > %d Gt. Lopeta " "siirto siihen asti, kunnes tiedostokoot täsmäävät." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "Palvelin voi vaatia tiliä. Määritä tili Sivustonhallinnassa" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:459 +msgid "Server not sending proper line endings" +msgstr "Palvelin ei lähetä kelvollisia riviloppuja" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" +"Palvelin palautti tiivistetodennuksen algoritmi -pyynnön , jota ei tueta: %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "Palvelin palautti 'quality-of-protection' -pyynnön, jota ei tueta: %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "Palvelin lähetti tyhjän polun." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6843,13 +7344,17 @@ "Palvelin lähetti kirjautumisen lisäkyselyn. Sinun pitää käyttää " "interaktiivista kirjautumistapaa." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/http/request.cpp:309 +msgid "Server sent data even before request headers were sent" +msgstr "Palvelin lähetti dataa, vaikka pyyntöotsikkoja ei lähetetty" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Palvelin lähetti passiivisen vastauksen osoitteesta, jota ei voi reitittää. " "Passiivitila epäonnistui." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6857,36 +7362,50 @@ "Palvelin lähetti passiivisen vastauksen osoitteesta, jota ei voi reitittää. " "Käytetään palvelimen osoitetta." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +msgid "Server sent too much data." +msgstr "Palvelin lähetti liikaa dataa." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Palvelin lähetti odottamattoman vastauksen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Palvelin lähetti lajittelemattoman sertifikaattiketjun rikkomuksen TLS-" +"määrityksissä" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Palvelin -> Asiakas-MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Palvelin -> Asiakkaan salaus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "Palveli&ntyyppi:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Server/Local file" msgstr "Palvelin/Paikallinen tiedosto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Palvelin:" @@ -6894,49 +7413,54 @@ msgid "Session details" msgstr "Yhteyskerran tiedot" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:121 msgid "Set &Priority" msgstr "Aseta &prioriteetti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Aseta oikeudet '%s':sta '%s':een" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Asetetaan '%s':n oikeudet '%s':ksi" -#: ../../locales/../src/engine/transfersocket.cpp:791 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize-kutsu ilman socket-rajapintaa" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Asetukset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Asennushakemisto:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:150 +msgid "Sh&ow notification bubble" +msgstr "&Näytä ilmaisinalueen ilmoitus" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "&Näytä pelkistetty hakemistolistaus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/menu_bar.cpp:171 msgid "Show &welcome dialog..." msgstr "&Näytä tervetuloikkuna..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Näytetäänkö molemmat hakemistopuut ja jatketaan vertailua?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Näytä yksityiskohdat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Näytä yksityiskohdat muokatuista päivämäärä- ja aikamuodoista" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:399 +msgid "Show in file &manager" +msgstr "Näytä tiedoston&hallinnassa" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:212 msgid "Shows available TLS ciphers" msgstr "Näyttää olemassa olevat TLS -salaukset" @@ -6944,7 +7468,7 @@ msgid "Shows this help dialog" msgstr "Näyttää tämän apuikkunan" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2773 msgid "Shutdown now" msgstr "Sammutetaan nyt" @@ -6952,7 +7476,11 @@ msgid "Signature algorithm:" msgstr "Allekirjoituksen algoritmi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Kirjautuminen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Sivustonhallinnan kohteet" @@ -6960,56 +7488,61 @@ msgid "Site Manager" msgstr "Sivustonhallinta" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "Sivustonhallinta - Ei muista salasanaa" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Sivustonhallinta - Luotu avain" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "Sivustonhallinta - Virheellinen data" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Sivustonhallinta on jo avoinna" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Sivustoa ei ole olemassa." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Sivuston polku pitää alkaa numeroilla 0 tai 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Sivuston polku väärin muodostettu." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Sivustokohtaiset kirjanmerkit" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7019,11 +7552,11 @@ "Sivustonhallintaan.\n" "Lisätäänkö nykyinen yhteys Sivustonhallintaan?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Size" msgstr "Koko" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Tiedostokoon muoto" @@ -7031,57 +7564,62 @@ msgid "Size unknown" msgstr "Koko tuntematon" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Hylkää tiedosto" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Ohitetaan %s:n lataus palvelimelta" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Ohitetaan puuttuva avaintiedosto \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Ohitetaan %s:n lataus palvelimelle" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Socket-rajapinta osoiteavaruuden ulkopuolella" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Socket-rajapinta on jo yhdistetty" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Socket-rajapinta sammutettu" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Socket-rajapintaa ei yhdistetty" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Socket-rajapinnan tyyppi ei ole tuettu osoiteperheelle" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Jotkut tiedostot ovat vielä muokattavana tai tarvitsevat latausta " "palvelimelle." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7089,31 +7627,31 @@ "Jotkut väärin määritety palvelimet, jotka ovat reitittimen takana, voivat " "vastata niiden paikallisella IP-osoitteella." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Lajittele linjalla olevat hakemistot" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "Lajittelujärjestystä ei voi muuttaa, jos vertaillaan hakemistoja." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Lajittelu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Lajittelu&peruste:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Pudotus-toiminnon lähde ja polku ovat samanlaiset" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Lähde- ja kohdetiedosto eivät ehkä ole samat" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "Pudotus-toiminnon lähde ja kohde ovat samanlaiset" @@ -7121,37 +7659,37 @@ msgid "Source file:" msgstr "Lähdetiedosto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Nopeusrajoitukset" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Nopeusrajoitukset" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "Nopeusrajoitukset pois käytöstä, klikkaa vaihtaaksesi." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "Nopeusrajoitukset käytössä, klikkaa vaihtaaksesi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Vakaat ja betaversiot" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Ainoastaan vakaat versiot" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Vakaat, beta- ja yölliset versiot" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Aloita siirto &heti" @@ -7159,19 +7697,21 @@ msgid "Start with opened Site Manager" msgstr "Avaa Sivustonhallinta avattuna" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Aloitettu %sn päivitystarkistus\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Aloitetaan %s:n lataus palvelimelta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Aloitetaan %s:n lataus palvelimelle" @@ -7180,30 +7720,38 @@ msgid "Starts the local site in the given path" msgstr "Avaa paikallisen sivuston annetussa polussa" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Maa tai lääni:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Status" msgstr "Tila" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Tila:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:111 msgid "Stop and remove &all" msgstr "Pysäytä ja poista &kaikki" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" -msgstr "Lopetetaan rekursiivinen toiminto" +msgstr "Lopeta rekursiivinen toiminto" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Hajautettu pilvitallennus" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Storj-tuki" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Katu:" @@ -7219,11 +7767,11 @@ msgid "Summary of test results:" msgstr "Testituloksien yhteenveto:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2781 msgid "Suspend now" msgstr "Aseta lepotilaan nyt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7231,29 +7779,33 @@ "Tämä valinta ei vaikuta tiedostojen 'symlinkkeihin', sellaiset 'symlinkit' " "poistetaan aina." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Synkronoitu selaus" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Synkronoitu selaus poistettu käytöstä." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Synkronoidaan hakemistot." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Syntaksivirhe" @@ -7262,44 +7814,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Syntaksivirhe komentorivillä" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Järjestelmä" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Järjestelmän yksityiskohdat" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Järjestelmän avattuen tiedostojen raja ylittynyt" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Järjestelmän verkon alijärjestelmä epäonnistui" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/menu_bar.cpp:100 msgid "T&oolbar" msgstr "T&yökalurivi" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "TLS -yhteys muodostettu, lähetetään HTTP -pyyntö" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS -yhteys muodostettu, odotetaan tervetulosanomaa..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "TLS -yhteys muodostettu." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:503 msgid "TTL expired" msgstr "TTL umpeutunut" @@ -7307,35 +7859,43 @@ msgid "Target file already exists" msgstr "Kohdetiedosto on jo olemassa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Kohdetiedosto:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "Kohdetiedosto on jo olemassa!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "Kohdetiedosto on jo olemassa, jatketaanko?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Väliaikainen virhe nimen selvityksessä" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Testi onnistui" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Testitulokset" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Testataan palvelimen kykyjä jatkaa" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "&Seuraavat tiedostot ovat tällä hetkellä muokattavana:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Sivustonhallintaa ei voi käyttää ennen kuin tiedosto on korjattu." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7344,7 +7904,7 @@ "Sivustonhallinta on avoinna toisessa FileZilla 3:n instanssissa.\n" "Haluatko jatkaa? Mitään muutoksia Sivustonhallinnassa ei tallenneta." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7352,29 +7912,37 @@ "Sivustonhallinta on avoinna toisessa FileZilla 3:n instanssissa.\n" "Sulje se tai dataa ei voi poistaa." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Antamasi osoite oli: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "ai_family'n jäsen ei tuettu" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "ai_socktype'n jäsen ei ole tuettu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Kirjanmerkkiä ei voitu lisätä." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Kirjanmerkkejä ei voitu tyhjentää." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Sertifikaatti tarvitsee palvelimen sisällyttämään OCSP-tilan vastaukseensa, " +"mutta OCSP-tila puuttuu." + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "Yhteys on salattu. Lisätietoja saa pikakuvaketta painamalla." @@ -7395,34 +7963,39 @@ msgstr "" "Muokatun ajan muoto ei kelpaa tai sisältää ei-tuettuja muototarkenteita." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Datayhteyttä ei voitu muodostaa: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Tekstitiedostojen oletusmuokkainta ei löytynyt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Tekstitiedostojen oletusmuokkain on '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Annettu suodatinnimi on jo olemassa, valitse toinen nimi." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Annetut salasanat eivät täsmää." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Tarkenne '%s' on jo olemassa listauksessa" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7431,8 +8004,9 @@ "Tiedosto %s on jo olemassa.\n" "Anna uusi nimi:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7443,7 +8017,7 @@ "Sidottua ohjelmaa (%s) ei löytynyt.\n" "Tarkista tiedostotyypin sidokset." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7452,18 +8026,19 @@ "Tiedosto '%s' sisältää SSH1-avaimen. SSH1-protokolla on poistettu käytöstä, " "FileZilla tukee ainoastaan SSH2-avaimia." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Tiedostoa '%s' ei voitu avata tai se ei sisällä salattua avainta." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Tiedostoa '%s' ei voitu ladata." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7472,8 +8047,9 @@ "Tiedostoa '%s' ei voitu avata:\n" "Mitään järjestelmän ohjelmaa ei ole sidottu tähän tiedostotyyppiin." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7482,8 +8058,8 @@ "Tiedostoa '%s' ei voitu avata:\n" "Sidottu komento epäonnistui" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7494,7 +8070,7 @@ "Uudemmilla versioilla ladatuista tiedostoista saattaa puuttua dataa.\n" "Jatketaanko?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7507,7 +8083,7 @@ msgid "The file selected as default editor does not exist." msgstr "Valittua oletusmuokkaintiedostoa ei ole olemassa." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7521,11 +8097,11 @@ "käyttäjänimi ja salasana tuodaan.\n" "Jatketaanko tuontia?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Tiedostonimisaraketta ei voi piilottaa eikä siirtää." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Tiedostonimisaraketta ei voi piilottaa." @@ -7539,19 +8115,19 @@ msgid "The following characters will be replaced: %s" msgstr "Seuraavat merkit korvataan merkeillä: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Seuraavat tiedostot ovat tällä hetkellä muokattavana:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Ilmainen avoimen lähdekoodin FTP-ratkaisu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Luotu salasana-avain on:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Globaaleja kirjanmerkkejä ei voitu tallentaa." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7564,17 +8140,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Rajan pitää olla väliltä 1 ja 2000 MiB" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Paikallista hakemistoa '%s' ei voitu luoda." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Paikallinen hakemisto '%s' ei ole olemassa." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7592,24 +8168,29 @@ "Pienin käytettävissä olevan portin pitää olla pienempi tai yhtäsuuri kuin " "korkein käytettävissä oleva portti." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Pääsalasana pitää olla vähintään 8:n merkin pituinen." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Uuden version lataus epäonnistui, yritä uudestaan myöhemmin." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Uusin versio on tallennettu määrittämääsi lataushakemistoon." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1570 msgid "The queue will not be saved." msgstr "Jonoa ei tallenneta." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Etähakemisto '%s' ei ole olemassa." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7619,27 +8200,27 @@ "Poistetaanko synkronoitu selaus käytöstä ja jatketaan palvelinhakemiston " "vaihtamista?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Valitut luokat on tuotu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "Valittu tiedosto sisältää tuotavaa dataa seuraaville luokille:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Valittu tiedosto on jo muokattavana:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Valittu tiedosto on yhä avoinna jossakin toisessa ohjelmassa, sulje se." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7649,15 +8230,15 @@ "Tämä voi olla vaarallista ja voi vahingoittaa järjestelmääsi.\n" "Haluatko varmasti jatkaa?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Palvelinta ei voitu lisätä." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Palvelin lähetti odottamattoman tai tuntemattoman vastauksen." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Palvelin käyttää seuraavaa merkistökoodausta tiedostonimille:" @@ -7669,7 +8250,7 @@ "Tuntematon palvelimen sertifikaatti. Tutki sertifikaattia huolella " "varmistaaksesi, että palvelimeen voi luottaa." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7679,7 +8260,7 @@ "tarkoittaa, että ylläpitäjä on vaihtanut isäntäavaimen tai yrität yhdistää " "toiseen tietokoneeseen olettaen, että se on palvelin." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7687,11 +8268,15 @@ "Tuntematon palvelimen isäntäavain. Mitään takeita ei ole, että palvelin " "olisi tietokone, jonka luulet sen olevan." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Palvelimen isäntänimi ei täsmää sertifikaatin isäntänimen kanssa" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "'servname'-parametria ei tueta ai_socktype'lle" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7699,19 +8284,19 @@ "Asetukset on tuotu. FileZilla pitää käynnistää uudelleen, jotta kaikki " "asetukset tulevat voimaan." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Määritetty osoiteperhe ei ole tuettu" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Määritetty verkkonimi ei ole enää saatavilla" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "The system will soon reboot unless you click Cancel." msgstr "Järjestelmä käynnistetään kohta uudestaan, jollet paina Peruuta." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "The system will soon shut down unless you click Cancel." msgstr "Järjestelmä sammutetaan kohta, jollet paina Peruuta." @@ -7723,11 +8308,11 @@ "Kohdetiedosto on jo olemassa.\n" "Valitse toiminto." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Testi epäonnistui. Tallennetaanko asetukset?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Kelvollista varmuuskopiota %s ei voitu palauttaa" @@ -7736,15 +8321,15 @@ msgid "Themes" msgstr "Teemat" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Ei voi poistaa tätä suodatinjoukkoa." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Tätä suodatinjoukkoa ei voi nimetä uudelleen." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7768,46 +8353,44 @@ "Tämä velho auttaa sinua määrittämään minkä tahansa reitittimen ja palomuurin " "asianmukaisesti ja testaa määrityksen." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Time" msgstr "Aika" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Ajan muoto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "&Aikakatkaisu sekunneissa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Aikakatkaisu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Palvelimen aikavyöhykkeen siirtymä %d sekuntia." - -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Otsikko:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Hakemistojen vertauksessa, pikahaku pitää sulkea." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Jotta hakemistoja voi vertailla, molemmat tiedostolistaukset pitää olla " "näkyvissä." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Jotta tämän voi tehdä, molemmat hakemistopuut pitää olla näkyvissä tai " "piilotettuna." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7815,7 +8398,7 @@ "FileZillan pitää tietää mitä salattuja avaimia käytetään julkisen avaimen " "todentamiseksi." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7831,7 +8414,7 @@ "Vihreä: Tiedosto on uudempi kuin merkitsemätön tiedosto toisella puolella\n" "Punainen: Tiedostokoot eivät täsmää" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7841,82 +8424,77 @@ "Jos käytössä, paikallisen hakemistorakenteen selaus vaihtaa samalla myös " "palvelinhakemistoa ja päinvastoin." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Käsittele siirtojono" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Paikallinen hakemistopuu" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Sanomaloki" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Palvelimen hakemistopuu" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Siirtojono" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:472 msgid "Too long header line" msgstr "Liian pitkä tunnisterivi" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Liian monta uudelleenohjausta" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Jäljitä:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Siirto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Siirron &suunta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/menu_bar.cpp:116 msgid "Transfer &type" msgstr "&Siirtotyyppi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Siirtotapa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Siirtojono" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Siirtoasetukset" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Siirtoyhteys keskeytetty: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Siirretty data vahingoittui." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Siirretään" @@ -7924,28 +8502,27 @@ msgid "Transfers" msgstr "Siirrot" -#: ../../locales/../src/interface/QueueView.cpp:2944 -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2655 msgid "Transfers finished" msgstr "Siirto valmis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Käsittele tiedostoja il&man tarkenninta ASCII-tiedostona" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Käsittele se&uraavia tiedostotyyppejä ASCII-tiedostoina:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "Luota vaihdettuun isäntäavaimeen:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "Luota uuteen isäntäavaimeen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Luotetaanko uuteen avaimeen ja jatketaan yhdistämistä?" @@ -7953,70 +8530,76 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Luotetaanko tähän sertifikaattiin ja jatketaan yhdistämistä?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Luotetaanko tähän isäntään ja jatketaan yhdistämistä?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Yritä uudestaan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Tyyppi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "FTP-välityspalvelimen tyyppi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Yleisen välityspalvelimen tyyppi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "L&ataa palvelimelle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Latausrajoitus pal&velimelle:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Kä&ytä tiedostotyypin sidoksia, jos saatavilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "K&äytä järjestelmän oletuksia nykyiselle kielelle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:383 +#: ../../locales/../src/engine/proxy.cpp:512 #, c-format msgid "Unassigned error code %d" msgstr "Määrittelemätön virhekoodi %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Yksikkö:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Tuntematon" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Tuntematon FTP-välityspalvelimen tyyppi, ei voi luoda kirjautumisaluetta." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:434 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Tuntematon SOCKS-protokollaversio: %d" @@ -8025,11 +8608,22 @@ msgid "Unknown certificate" msgstr "Tuntematon sertifikaatti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Tuntematon virhe %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Tuntematon virhe %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Tuntematon isäntäavain" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:442 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8038,14 +8632,18 @@ "Tuntematon protokollan versio SOCKS käyttäjänimi/salasana todentamis-" "alineuvottelusta: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Tuntematon juurielementti, tiedosto ei näytä olevan FileZilla-tiedosto." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:574 +msgid "Unknown transfer encoding" +msgstr "Tuntematon siirtokoodaus" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8053,7 +8651,7 @@ "Siihen asti kunnes nämä ongelmat korjataan, aktiivitilan FTP ei toimi ja " "passiivitilaa täytyy käyttää." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8061,15 +8659,15 @@ "Siihen asti kunnes tämä ongelma korjataan, aktiivitilan FTP ei toimi ja " "passiivitilaa täytyy käyttää." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Sertifikaatin tyyppi ei tuettu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Uudellenohjaus ei tuettu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "&Lataa palvelimelle ja poistu muokkauksesta" @@ -8078,95 +8676,104 @@ msgid "Updates" msgstr "Päivitykset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Lataa palvelimelle" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Lataus palvelimelle epäonnistui" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "Latauksen rajoitus palvelimelle: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Latauksen rajoitus palvelimelle: Ei mitään" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Lataa hakutulokset" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:326 msgid "Upload selected directory" msgstr "Lataa valittu hakemisto palvelimelle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "Upload selected files and directories" msgstr "Lataa valitut tiedostot ja hakemistot palvelimelle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Ladataanko tämä tiedosto takaisin palvelimelle?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Ladataanko tämä tiedosto palvelimelle?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Ladataan palvelimelle" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Ladataan palvelimelle ja odotetaan poistoa" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Ladataan palvelimelle ja perutaan muokkaus" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Käytä o&maa merkistöä" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Käytä &erillistä muokkainta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Käytä &oletusmuokkainta tekstitiedostoille" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Käytä &synkronoitua selausta" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Käytä säännöllisiä lausekkeita" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Käytä UTF-8:aa, jos palvelin tukee sitä, käytä muutoin paikallista merkistöä." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Käytä oletustoimintoa" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "Ota käyttöön eksplisiittinen FTP:n TLS-suojaus, jos saatavilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Käytä palvelinta, joka on yhteydessä kohteeseen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Käytä Sivustonhallinnan palvelinta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "Käytä järjestelmän &oletuksia nykyiselle kielelle" @@ -8183,7 +8790,7 @@ msgstr "Käytä palvelimen ulkoista IP-osoitetta" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8201,77 +8808,74 @@ "käytät aktiivitilaa ensimmäisen kerran. Vain käyttämäsi FileZillan versio " "lähetetään palvelimelle." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Käyttäjä:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "Käyttäjänimi ei voi olla sarja välilyöntejä" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "Jos käytetään väärää merkistöä, tiedostonimet eivät ehkä näy oikein." #: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" -msgstr "Voimassa alkaen:" +msgstr "Voimassaolo alkaa:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" -msgstr "Voimassa loppuen:" +msgstr "Voimassaolo loppuu:" #: ../../locales/../src/interface/cmdline.cpp:17 msgid "Verbose log messages from wxWidgets" msgstr "Monisanaisia lokisanomia vxWidgets'istä" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Varmennetaan sertifikaattia..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Erittäin suuri" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "Näyttää piilotetut valinnat, joita palvelin ei tue" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Näytä/Muokkaa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Näkyvät sarakkeet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "K&irjoita" -#: ../../locales/../src/interface/QueueView.cpp:1671 -msgid "Waiting" -msgstr "Odotetaan" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Odotetaan selauksen yhdistämistä" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Odotetaan salasanaa" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Odotetaan, siirron peruuttamista" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Odotetaan uudelleenyritystä..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Varoitus, ohitetaan datayhteys väärästä IP:stä." @@ -8290,23 +8894,23 @@ "\n" "Haluatko varmasti tarkistaa yölliset sovellukset?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Varoitus: Mahdollinen turva-aukko!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Tervetuloa FileZillaan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Mitä uutta" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Muutokset:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8314,7 +8918,7 @@ "Kun sallitaan FileZillan muistavan salasanat, salasanaa ei tarvitse " "kirjoittaa uudelleen yhdistettäessä FileZillan käynnistyksen jälkeen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8322,59 +8926,76 @@ "Kun käytössä, merkit, joita paikallinen järjestelmä ei tunnista " "tiedostonimissä, korvataan, jos sellainen tiedosto ladataan." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "Kun &muodostetaan uusi yhteys, yhteyden ollessa jo olemassa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Kokoruutu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Annetaanko FileZillan muistaa salasanat?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Ki&rjoita" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Väärä ulkoinen IP-osoite" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:646 msgid "Wrong line endings" msgstr "Väärät rivin lopetukset" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Väärä pääsalasana annettu, sitä ei voi käyttää varastoitujen salasanojen " +"purkaukseen." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Väärä pääsalasana annettu, sitä ei voi käyttää tämän kohteen purkaukseen." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Keltainen" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Kyllä" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "Käytät IPv6-only -isäntää. Tämä velho ei tue tätä ympäristöä." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Käytät FileZillan uusinta versiota." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Voit aina avata tämän ikkunan uudestaan ohjevalikosta." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Voit ladata uusimman version FileZillan sivustolta:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "Voit jättää porttikentän tyhjäksi, jolloin käytetään oletusporttia." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8382,7 +9003,15 @@ "Voit käyttää x:ää missä tahansa kohdassa pitääksesi samat oikeudet kuin " "alkuperäisillä tiedostoilla." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Et voi vaihtaa salasanaa ja purkuavainta yksittäisesti, jos käytetään " +"pääsalasanaa." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Et voi tuoda asetuksia FileZillan omasta asetushakemistosta." @@ -8394,62 +9023,74 @@ "Et voi korvata epäkelpoa merkkiä toisella epäkelvolla merkillä. Anna merkki, " "joka sallitaan tiedostonimissä." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Et voi lähettää tiedostoja juurihakemistoon." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Et antanut uutta nimeä tiedostolle. Korvataanko tiedosto?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Olet valinnut vähintään yhden symbolisen linkin." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" "Olet valinnut enemmän kuin 10 tiedostoa muokkausta varten, jatketaanko?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "Olet valinnut enemmän kuin 10 tiedostoa avattavaksi, jatketaanko?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." msgstr "Anna isäntänimi." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" msgstr "Anna avaintiedoston polku" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Anna paikallinen hakemisto." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Etähakemisto pitää määrittää." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 -#, fuzzy msgid "You have to enter a valid IPv4 address." -msgstr "Anna kelvollinen IP-osoite." +msgstr "Anna kelvollinen IPv4-osoite." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Sinun on annettava kelvollinen purkuavain" -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Anna paikallinen hakemisto, johon voi kirjoittaa." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "Anna tilinimi." -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "Anna käyttäjänimi." -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8457,7 +9098,11 @@ "Sinulla on ilmeisesti reititin tai palomuuri, joka on virheellisesti " "muokannut siirrettävän datan." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Sinun on annettava pääsalasana." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Anna nimi kirjanmerkille." @@ -8465,7 +9110,7 @@ msgid "You need to enter a name for the log file." msgstr "Anna nimi lokitiedostolle." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Anna lainausmerkeissä oleva komento." @@ -8478,15 +9123,15 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Välityspalvelimen portti pitää antaa väliltä 1 ja 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Ainakin yksi polku pitää antaa, tyhjiä kirjanmerkkejä ei tueta." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8494,7 +9139,7 @@ "Sinun täytyy antaa paikallisen ja palvelimen polut ottaaksesi tämän " "kirjanmerkin synkronoidun selauksen käyttöön." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8502,23 +9147,31 @@ "Sinun täytyy antaa paikallisen ja palvelimen polut ottaaksesi tämän sivuston " "synkronoidun selauksen käyttöön." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Sinun on myönnettävä FileZillalle pääsy hakemistoihin, joista haluat ladata " +"tai lähettää tiedostoja." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Paikallinen tiedosto pitää määrittää." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Palvelimen tiedosto pitää määrittää." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Palvelimen polku pitää määrittää." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Palvelin pitää määrittää." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8526,66 +9179,66 @@ "Sinulla ei pitäisi olla ongelmia yhdistettäessä toisille palvelimille, " "tiedostonsiirtojen pitäisi toimia oikein." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2780 msgid "Your computer will suspend unless you click Cancel." msgstr "Tietokoneesi asetetaan lepotilaan, jollet klikkaa Peruuta." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "jälkeen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "ennen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "alkaa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "tavua" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "sisältää" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "muokattu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "ei sisällä" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "ei ole yhtä kuin" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "loppuu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "yhtäsuuri kuin" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "tiedosto" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lukitustiedosto" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8595,94 +9248,337 @@ "Varmista, että tämä käynnistystiedosto sijaitsee samassa hakemistossa kuin " "FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp kuuluu toiseen FileZillan versioon" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "fzsftp ei käynnistynyt" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj kuuluu FileZilla:n eri versiolle" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "Ei voitu käynnistää fzstorj:ia" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"Ei voitu käynnistä fzstorj:ia.\n" +"Varmista, että tämä tiedosto sijaitsee samassa hakemistossa kuin FileZilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers ei palauttanut sertifikaatteja" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 epäonnistui" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "suurempi kuin" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "ryhmän käynnistettävä" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "ryhmän luettava" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "ryhmän kirjoittava" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "yhtäsuuri kuin" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "on asetettu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "asetus poistettu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "pienempi kuin" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "täsmää regex:iin" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "uusi nimi" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "omistajan käynnistettävä" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "omistajan luettava" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "omistajan kirjoittava" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "tuntematon" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "maailman käynnistettävä" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "maailma luettavissa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "maailma kirjoitettavissa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "File Types" +#~ msgstr "Tiedostotyypit" + +#~ msgid "Malformed response body: %s" +#~ msgstr "Väärin muodotettu vastausrunko: %s" + +#~ msgid "" +#~ "Malformed response: Server sent response body with a request verb or " +#~ "response code that disallows a response body." +#~ msgstr "" +#~ "Väärin muodostettu vastaus: Palvelin lähetti vastausrungon, jossa " +#~ "pyyntöverbi tai vastauskoodi, joka ei salli vastausrunkoa." + +#~ msgid "Could not seek to offset %s within file" +#~ msgstr "Ei voitu etsiä tämän tiedoston siirtymäkohtaan %s" + +#~ msgid "" +#~ "%s could not be found. Without this component of FileZilla, SFTP will not " +#~ "work.\n" +#~ "\n" +#~ "Please download FileZilla again. If this problem persists, please submit " +#~ "a bug report." +#~ msgstr "" +#~ "%s ei löytynyt. Ilman tätä FileZillan komponenttia, SFTP ei toimi.\n" +#~ "\n" +#~ "Lataa FileZilla uudestaan. Jos tämä ongelma toistuu, lähetä virheraportti." + +#~ msgid "" +#~ "%s could not be found. Without this component of FileZilla, SFTP will not " +#~ "work.\n" +#~ "\n" +#~ "Possible solutions:\n" +#~ "- Make sure %s is in a directory listed in your PATH environment " +#~ "variable.\n" +#~ "- Set the full path to %s in the FZ_FZSFTP environment variable." +#~ msgstr "" +#~ "%s ei löytynyt. Ilman tätä FileZillan komponenttia SFTP ei toimi.\n" +#~ "\n" +#~ "Mahdolliset ratkaisut:\n" +#~ "- Varmista, että %s on hakemistossa, joka on listattuna PATH -" +#~ "ympäristömuuttujassa.\n" +#~ "- Anna koko polku kohteeelle %s FZ_FZSFTP -ympäristömuuttujassa." + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "Ä&lä muista salasanoja (suositeltu)" + +#~ msgid "&Remember passwords" +#~ msgstr "&Muista salasanat" + +#~ msgid "Failed to create listen socket, aborting" +#~ msgstr "Kuuntelun socket-rajapinnan luonti epäonnistui, keskeytetään" + +#~ msgid "Failed to retrieve external ip address, aborting" +#~ msgstr "Ulkoisen IP-osoitteen haku epäonnistui, keskeytetään" + +#~ msgid "Failed to retrieve external ip address, using local address" +#~ msgstr "" +#~ "Ulkoisen IP-osoitteen haku epäonnistui, käytetään paikallista osoitetta" + +#~ msgid "Failed to retrieve local ip address." +#~ msgstr "Paikallisen IP-osoitteen haku epäonnistui." + +#~ msgid "Failed to retrieve local ip address. Aborting" +#~ msgstr "Paikallisen IP-osoitteen haku epäonnistui. Keskeytetään" + +#~ msgid "Fingerprint:" +#~ msgstr "Sormenjälki:" + +#~ msgid "Host key fingerprint:" +#~ msgstr "Isännän avaimen sormenjälki:" + +#~ msgid "Login sequence fully executed yet not logged in. Aborting." +#~ msgstr "" +#~ "Kirjautuminen suoritettiin, mutta ei vielä kirjauduttu. Keskeytetään." + +#~ msgid "Malformed header: %s" +#~ msgstr "Virheellisesti muotoiltu tunniste: %s" + +#~ msgid "Malformed reply, server not sending proper line endings" +#~ msgstr "" +#~ "Virheellisesti muotoiltu vastaus, palvelin ei lähetä kelvollisia " +#~ "rivinlopetuksia" + +#~ msgid "O&pen file" +#~ msgstr "Avaa &tiedosto" + +#~ msgid "Set permissions of '%s' to '%s'" +#~ msgstr "Aseta oikeudet '%s':sta '%s':een" + +#~ msgid "The following files are currently being edited:" +#~ msgstr "Seuraavat tiedostot ovat tällä hetkellä muokattavana:" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "Palvelimen aikavyöhykkeen siirtymä %d sekuntia." + +#~ msgid "Available sizes" +#~ msgstr "Käytettävät koot" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Pikayhdistämis-palkkia ei voitu ladata resurssitiedostosta." + +#~ msgid "" +#~ "Enter the address of the server.\n" +#~ "To specify the server protocol, prepend the host with the protocol " +#~ "identifier. If no protocol is specified, the default protocol (ftp://) " +#~ "will be used.\n" +#~ "You can also enter complete URLs in the form protocol://user:pass@host:" +#~ "port here, the values in the other fields will be overwritten then.\n" +#~ "\n" +#~ "Supported protocols are:\n" +#~ "- ftp:// for normal FTP with optional encryption\n" +#~ "- sftp:// for SSH file transfer protocol\n" +#~ "- ftps:// for FTP over TLS (implicit)\n" +#~ "- ftpes:// for FTP over TLS (explicit)" +#~ msgstr "" +#~ "Anna palvelimen osoite.\n" +#~ "Määrittääksesi palvelimen protokollan, kokeile isäntää protokollan " +#~ "tunnuksella. Jos mitään protokollaa ei ole määritetty, käytetään " +#~ "oletuksena (ftp://).\n" +#~ "Voit myös antaa täydelliset URL:t muodossa lomakeprotokollassa://user:" +#~ "pass@host:port tässä, tällöin korvataan muiden kenttien asetukset " +#~ "näillä.\n" +#~ "\n" +#~ "Tuetut protokollat:\n" +#~ "-ftp:// normaalille FTP:lle valinnaisella salauksella\n" +#~ "-sftp:// SSH tiedostonsiirto -protokollalle\n" +#~ "-ftps:// FTP-TLS (implisiittinen)\n" +#~ "-ftpes:// FTP-TLS (eksplisiittinen)" + +#~ msgid "" +#~ "Enter the port on which the server listens.\n" +#~ "The default for FTP is 21, the default for SFTP is 22." +#~ msgstr "" +#~ "Anna portti, jota palvelin kuuntelee.\n" +#~ "FTP:n oletus on 21, SFTP:n oletus on 22." + +#~ msgid "Preview:" +#~ msgstr "Esikatselu:" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize-kutsu ilman socket-rajapintaa" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Ei voitu tuoda 'peer'-sertifikaattia, gnutls_x509_crt_import epäonnistui" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "'Peer'-sertifikaatin rakennetta ei voitu tunnistaa, gnutls_x509_crt_init " +#~ "epäonnistui" + +#~ msgid "Filename &filters..." +#~ msgstr "Tiedostonimen &suodattimet..." + +#~ msgid "" +#~ "Incomplete chain, top certificate is not self-signed certificate " +#~ "authority certificate" +#~ msgstr "" +#~ "Puutteellinen ketju, pääsertifikaatti ei ole itse allekirjoitettu " +#~ "valtuutetun sertifikaatti" + +#~ msgid "Package" +#~ msgstr "Pakkaus" + +#~ msgid "Updated" +#~ msgstr "Päivitetty" + +#~ msgid "%d files added to queue" +#~ msgstr "%d tiedostoa lisätty jonoon" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Skannataan tiedostoja jonoon lisättäväksi" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Skannataan tiedostoja ladattavaksi palvelimelle" + +#~ msgid "Waiting" +#~ msgstr "Odotetaan" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Katkaise yhteys palvelimelta" + +#~ msgid "&Show message" +#~ msgstr "&Näytä sanoma" + +#~ msgid "Do ¬hing" +#~ msgstr "Älä tee mitään" + +#~ msgid "No more files in the queue!" +#~ msgstr "Jonossa ei ole enempää tiedostoja!" + +#~ msgid "" +#~ "Please enter a path and executable to run.\n" +#~ "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under " +#~ "Unix.\n" +#~ "You can also optionally specify program arguments." +#~ msgstr "" +#~ "Anna polku ja suoritettava ohjelma.\n" +#~ "Esim. c:\\jokuPolku\\tiedosto.exe MS Windowsissa tai /jokuPolku/tiedosto " +#~ "Unixissa.\n" +#~ "Voit vaihtoehtoisesti määrittää myös ohjelman argumentit." + +#~ msgid "R&eboot system" +#~ msgstr "K&äynnistä tietokone uudestaan" + +#~ msgid "S&hutdown system" +#~ msgstr "Sa&mmuta tietokone" + +#~ msgid "S&uspend system" +#~ msgstr "Aseta järjestelmä &lepotilaan" + +#~ msgid "Connected" +#~ msgstr "Yhdistetty" + #~ msgid "Deleting directories" #~ msgstr "Poistetaan hakemistoja" @@ -8695,6 +9591,9 @@ #~ msgid "Downloading search results" #~ msgstr "Ladataan hakutulokset" +#~ msgid "You have to enter a valid IP address." +#~ msgstr "Anna kelvollinen IP-osoite." + #~ msgid "U&se system defaults" #~ msgstr "Kä&ytä järjestelmän oletuksia" @@ -8918,9 +9817,6 @@ #~ msgid "Log of update check:" #~ msgstr "Päivitystarkistuksen loki:" -#~ msgid "Package" -#~ msgstr "Pakkaus" - #~ msgid "" #~ "Please check http://filezilla-project.org for the most recent version of " #~ "FileZilla." diff -Nru filezilla-3.15.0.2/locales/filezilla.pot filezilla-3.33.0/locales/filezilla.pot --- filezilla-3.15.0.2/locales/filezilla.pot 2016-02-10 19:38:57.000000000 +0000 +++ filezilla-3.33.0/locales/filezilla.pot 2018-05-07 08:45:33.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 20:38+0100\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-05-07 10:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,217 +19,221 @@ "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:56 -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:200 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:59 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:61 -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:206 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:64 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1386 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:484 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:743 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1432 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:876 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1385 -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:483 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:742 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1431 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:875 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:105 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:161 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:164 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:46 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:32 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../source/FileZilla3/locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:617 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:702 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:63 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:176 msgid "&About..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:154 msgid "&Add bookmark..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:10 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:56 msgid "&Add files to queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:266 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:329 msgid "&Add to queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "" @@ -237,75 +241,80 @@ msgid "&Always trust certificate in future sessions." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:364 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1055 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:118 msgid "&Auto" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:372 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1070 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:120 msgid "&Binary" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:151 msgid "&Bookmarks" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:50 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:70 msgid "&Clear private data..." msgstr "" @@ -313,170 +322,170 @@ msgid "&Close" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:158 msgid "&Close FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:170 +msgid "&Close FileZilla once" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Configure speed limits..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:129 msgid "&Configure..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:50 msgid "&Copy current connection to Site Manager..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:200 msgid "&Copy to clipboard" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:29 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:69 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&Create directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:404 msgid "&Create new tab" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:72 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:182 msgid "&Debug" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:113 msgid "&Default file exists action..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:41 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:349 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:74 +msgid "&Directory access permissions..." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:86 msgid "&Directory comparison" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:895 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:968 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:143 msgid "&Disconnect" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "" - #: ../../source/FileZilla3/locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:51 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:261 msgid "&Download" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:378 msgid "&Download..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:24 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:68 msgid "&Edit" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:89 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:128 msgid "&Enable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "" @@ -484,214 +493,232 @@ msgid "&Encryption:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:192 msgid "&Enter custom command..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:359 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:57 msgid "&Export..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:44 msgid "&File" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:297 msgid "&File Attributes..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:101 msgid "&File permissions..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:172 msgid "&Getting help..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:162 msgid "&Help" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:318 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:94 msgid "&Hide identical files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:123 msgid "&Highest" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:58 msgid "&Import..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:103 msgid "&Local directory tree" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:135 msgid "&Low" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:156 msgid "&Manage bookmarks..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:133 msgid "&Manual transfer..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:102 msgid "&Message log" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:47 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:69 msgid "&Network configuration wizard..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "" @@ -699,7 +726,7 @@ msgid "&New Site" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1665 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "" @@ -707,154 +734,165 @@ msgid "&Next >" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:146 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Normal" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:20 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:335 msgid "&Open" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:166 msgid "&Play sound" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:123 msgid "&Preserve timestamps of transferred files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:101 msgid "&Quickconnect bar" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:141 msgid "&Reconnect" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:415 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:80 msgid "&Refresh" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:360 -msgid "&Remember password until FileZilla is closed" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:367 +msgid "&Remember password until FileZilla is closed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:115 msgid "&Remove selected" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:89 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:353 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:173 msgid "&Report a bug..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:154 +msgid "&Request attention" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:223 msgid "&Reset and requeue all" msgstr "" @@ -862,39 +900,39 @@ msgid "&Restart Wizard" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:162 msgid "&Run command..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:146 msgid "&Search remote files..." msgstr "" @@ -902,272 +940,286 @@ msgid "&Select Entry:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:136 msgid "&Server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:54 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:72 msgid "&Settings..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:196 msgid "&Show detailed log" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:7 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:49 msgid "&Site Manager..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:126 msgid "&Speed limits" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:211 msgid "&TLS Ciphers" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:227 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:108 msgid "&Transfer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:105 msgid "&Transfer queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:324 msgid "&Upload" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:381 +msgid "&Upload..." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1659 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:78 msgid "&View" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:384 msgid "&View/Edit" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:444 -#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:490 +#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:461 +#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:459 #: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:479 -#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:485 +#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:500 +#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:427 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:419 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:441 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:588 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " "command without the leading 'quote'." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/update_dialog.cpp:254 +#: ../../source/FileZilla3/locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:85 -#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:174 +#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:94 +#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "" @@ -1176,7 +1228,7 @@ msgid "-" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:209 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "" @@ -1196,31 +1248,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:98 +#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:96 +#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "" @@ -1228,22 +1280,26 @@ msgid "< &Back" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:160 msgid "?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:157 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:744 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:166 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "" @@ -1254,20 +1310,20 @@ "and asks the server to connect to it." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1644 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1648 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:596 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1276,39 +1332,46 @@ "No further warning will be displayed this session." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:648 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:258 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:368 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1063 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:119 msgid "A&SCII" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "" @@ -1320,51 +1383,53 @@ msgid "A&pply only to uploads" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:252 msgid "A&utomatically remove successful transfers" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:862 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:883 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:154 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:155 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:188 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:540 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:541 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:613 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:636 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:148 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:149 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:185 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:535 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:144 msgid "Action after queue &completion" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "" @@ -1372,57 +1437,58 @@ msgid "Active mode" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:614 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:601 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:589 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " "address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:331 msgid "Add selected directory to the transfer queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:58 msgid "Add selected files and folders to the transfer queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:530 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:509 msgid "Address type not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1431,15 +1497,16 @@ "builds at your own risk." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2937 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2663 msgid "All files have been successfully transferred" msgstr "" @@ -1447,14 +1514,14 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2933 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2659 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "" @@ -1462,120 +1529,123 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:84 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1902 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1667 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" "Some queue items might not have been restored." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1812 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1559 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" "Some queue items might not have been saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:885 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:153 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:191 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:207 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:539 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:638 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:147 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:188 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:203 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:534 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:945 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:213 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:970 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1081 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:856 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:877 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:182 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:604 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:630 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "" @@ -1587,7 +1657,7 @@ msgid "Ask your operating system for the external IP address" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "" @@ -1595,7 +1665,7 @@ msgid "Associated program not found:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "" @@ -1603,202 +1673,223 @@ msgid "At this point, all required information has been gathered." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../source/FileZilla3/locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../source/FileZilla3/locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../source/FileZilla3/locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1045 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1114 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1142 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1166 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1113 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:304 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:436 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../source/FileZilla3/locales/../src/engine/storj/resolve.cpp:70 +#: ../../source/FileZilla3/locales/../src/engine/storj/resolve.cpp:158 +#: ../../source/FileZilla3/locales/../src/engine/storj/resolve.cpp:226 +#: ../../source/FileZilla3/locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:245 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " "please enter the port range below." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:138 msgid "C&ancel current operation" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:203 msgid "C&lear all" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:93 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:289 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:390 msgid "C&opy URL(s) to clipboard" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "C&opy URL(s) with password to clipboard" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1211 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../source/FileZilla3/locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:670 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:650 -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:718 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:652 -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:720 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:454 +#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:561 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1098 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:352 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/listingcomparison.cpp:71 +#: ../../source/FileZilla3/locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1808,101 +1899,101 @@ msgid "Cannot create new filter" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1705 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1574 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1622 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:696 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1836 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1626 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1674 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1210 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1587 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1712 msgid "Cannot edit file, not connected to any server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1596 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1721 msgid "Cannot edit file, remote path unknown." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:36 -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:994 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:445 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1582 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1634 msgid "Cannot rename file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:174 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:136 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:340 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:404 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:245 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:304 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1472 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1476 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1511 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1524 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1528 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1073 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1644 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../source/FileZilla3/locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:502 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "" @@ -1914,36 +2005,40 @@ msgid "Certificate issuer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:298 msgid "Change the file permissions." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:596 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:167 msgid "Check for &updates..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "" @@ -1951,59 +2046,59 @@ msgid "Check for Updates" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:167 msgid "Check for newer versions of FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/update_dialog.cpp:57 +#: ../../source/FileZilla3/locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:761 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:716 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:712 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:670 msgid "Chunk data improperly terminated" msgstr "" @@ -2011,55 +2106,63 @@ msgid "Cipher:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:408 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:55 msgid "Cl&ose tab" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:208 msgid "Clear &layout cache" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:150 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:215 +msgid "Clear auto&update data" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:34 -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:40 -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:46 -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:77 -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:103 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:35 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:41 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:47 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:74 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:149 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:580 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../source/FileZilla3/locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:411 msgid "Close &all other tabs" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1135 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1156 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1230 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1251 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:64 msgid "Close FileZilla" msgstr "" @@ -2067,103 +2170,108 @@ msgid "Close all running instances of FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:23 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:55 msgid "Closes current tab" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:747 +#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../source/FileZilla3/locales/../src/interface/storj_key_interface.cpp:95 +#: ../../source/FileZilla3/locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:527 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:506 msgid "Command not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:212 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:112 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:283 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:339 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:114 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:287 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:243 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:439 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:452 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:449 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:92 msgid "Compare &modification time" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:91 msgid "Compare file&size" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "" @@ -2179,41 +2287,42 @@ msgid "Configure port range" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:747 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1669 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1390 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1586 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1798 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1436 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1638 #: ../../source/FileZilla3/locales/../src/interface/file_utils.h:45 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:708 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1222 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:576 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:148 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:216 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "" @@ -2221,25 +2330,26 @@ msgid "Connect to specified Site Manager site" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:332 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:243 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:210 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:214 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1051 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:96 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1064 #, c-format msgid "Connecting to %s through %s proxy" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:355 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:959 -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:268 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../source/FileZilla3/locales/../src/engine/storj/storjcontrolsocket.cpp:42 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:236 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:996 #, c-format msgid "Connecting to %s..." msgstr "" @@ -2248,196 +2358,237 @@ msgid "Connection" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1059 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:333 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:923 -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:242 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:208 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:928 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:964 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:681 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:185 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:688 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:175 msgid "Connection attempt interrupted by user" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1052 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:552 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1018 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:305 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:318 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:329 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:340 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1042 msgid "Connection closed by server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../source/FileZilla3/locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../source/FileZilla3/locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:333 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:350 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:512 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:491 msgid "Connection not allowed by ruleset" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:521 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:500 msgid "Connection refused" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1046 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1055 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1060 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:560 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1054 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:386 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:251 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:570 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:561 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:98 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:294 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:94 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:290 msgid "Copy the URLs of the selected items to clipboard." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:180 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:758 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:187 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1089 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1097 #, c-format msgid "Could not connect to server: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../source/FileZilla3/locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../source/FileZilla3/locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../source/FileZilla3/locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2522 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2615 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:198 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:459 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:173 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2183 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2260 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " "files into an Explorer window." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../source/FileZilla3/locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:428 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2445,53 +2596,57 @@ "variable." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:958 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_interface.cpp:121 +#: ../../source/FileZilla3/locales/../src/interface/asksavepassworddialog.cpp:53 +msgid "Could not generate key" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:935 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:931 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:250 -msgid "Could not get reply from fzputtygen." +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1574 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:696 -msgid "Could not get temporary directory to download file into." +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../source/FileZilla3/locales/../src/interface/storj_key_interface.cpp:117 +msgid "Could not get reply from fzputtygen." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:108 -#, c-format -msgid "Could not initialize Winsock (%d): %s" +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1626 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1210 +msgid "Could not get temporary directory to download file into." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:105 -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:292 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:117 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2499,15 +2654,21 @@ "Any changes made in the Site Manager will not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:953 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2515,7 +2676,7 @@ "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:362 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2523,7 +2684,7 @@ "Synchronized browsing has been disabled." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:267 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2531,305 +2692,352 @@ "Synchronized browsing has been disabled." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2522 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1381 -#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:198 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2615 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:220 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:106 -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:186 -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:218 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:108 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:192 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:236 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:274 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:82 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:977 -msgid "Could not read from data socket." +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:382 #, c-format msgid "Could not read from socket: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:468 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:344 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2596 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../source/FileZilla3/locales/../src/engine/http/httpcontrolsocket.cpp:74 #, c-format -msgid "Could not seek to offset %s within file" +msgid "Could not seek to offset %d within file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:115 +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:174 +#: ../../source/FileZilla3/locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../source/FileZilla3/locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1065 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1078 #, c-format msgid "Could not start proxy handshake: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:338 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:610 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:633 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " "%s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1841 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1590 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" "%s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:720 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:774 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:758 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:815 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:146 +#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:337 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:230 -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:297 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:249 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:883 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:987 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:237 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:919 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1014 #, c-format msgid "Could not write to socket: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:248 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:77 msgid "Crea&te new file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:967 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:894 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:341 msgid "Create a new subdirectory in the current directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:74 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:345 msgid "Create a new subdirectory in the current directory and change into it" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:78 msgid "Create a new, empty file in the current directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:33 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:73 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:344 msgid "Create director&y and enter it" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:902 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1293 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:954 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1334 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2609 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2704 msgid "Create empty file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:340 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1932 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../source/FileZilla3/locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:180 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:171 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:135 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:120 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:353 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" "Synchronized browsing has been disabled." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:393 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:401 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:397 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:101 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:85 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:387 msgid "D&elete" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:34 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:57 msgid "DOS-like with virtual paths" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1626 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:971 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1036 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:996 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "" @@ -2845,15 +3053,15 @@ msgid "Debug" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:26 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:49 msgid "Default (Autodetect)" msgstr "" @@ -2861,23 +3069,23 @@ msgid "Default editor not properly quoted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "" @@ -2885,12 +3093,12 @@ msgid "Default transfer mode:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "" @@ -2899,7 +3107,7 @@ "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:522 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2910,75 +3118,85 @@ msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:282 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Delete selected directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:42 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:86 msgid "Delete selected files and directories" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:365 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:368 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:955 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:58 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:66 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1280 msgid "Direction" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:271 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2167 -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:464 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:302 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2306 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2323 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:477 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:51 +#: ../../source/FileZilla3/locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/listingcomparison.cpp:71 +#: ../../source/FileZilla3/locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "" @@ -2986,120 +3204,119 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:191 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:83 +msgid "Directory listing &filters..." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2013 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2091 msgid "Directory listing failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:199 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:196 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:960 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:650 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:81 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:884 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:989 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:331 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:238 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:52 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:920 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1016 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1020 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../source/FileZilla3/locales/../src/engine/http/httpcontrolsocket.cpp:299 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1045 #, c-format msgid "Disconnected from server: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:330 -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:237 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:351 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:176 msgid "Display about dialog" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1138 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1160 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1233 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:34 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:46 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:40 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:589 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "" @@ -3107,81 +3324,81 @@ msgid "Don't use external IP address on &local connections." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:581 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:583 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:524 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:529 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:927 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:263 msgid "Download selected directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:53 msgid "Download selected files and directories" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:966 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" "Upload speed: %s/s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1099 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../source/FileZilla3/locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:105 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:110 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:102 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:89 -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:90 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:114 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:121 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:88 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:115 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:111 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:116 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:108 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:95 -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:103 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:119 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:126 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:102 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:120 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" @@ -3189,64 +3406,64 @@ msgid "Dupl&icate" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:15 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:61 msgid "E&nter directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:39 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:64 msgid "E&xit" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:187 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:256 msgid "E&xport..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:254 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:25 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:684 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1587 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1596 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1712 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1721 msgid "Editing failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:684 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2114 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1884 msgid "Empty command" msgstr "" @@ -3254,7 +3471,7 @@ msgid "Empty command." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2015 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2093 msgid "Empty directory listing" msgstr "" @@ -3266,13 +3483,13 @@ msgid "Empty file extension." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:208 -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:250 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:207 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:208 -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:250 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:207 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "" @@ -3280,81 +3497,97 @@ msgid "Empty quoted string." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:466 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../source/FileZilla3/locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:147 msgid "Enter &custom command..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2103 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1878 msgid "Enter command" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:572 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:136 -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:196 -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:243 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:195 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:334 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:392 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:62 msgid "Enter selected directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3363,121 +3596,138 @@ "- ftpes:// for FTP over TLS (explicit)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" "The converted file will be protected with the same password." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:65 +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/export.cpp:26 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_interface.cpp:121 +#: ../../source/FileZilla3/locales/../src/interface/asksavepassworddialog.cpp:53 +msgid "Error" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:28 -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:95 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:29 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1903 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1668 msgid "Error loading queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:214 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:971 -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:106 -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:293 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:802 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:821 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:16 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:436 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:517 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:567 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:666 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:743 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:939 -#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:244 -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1824 +#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:255 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1571 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:913 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:1005 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:118 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:309 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1350 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1370 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:91 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:525 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:585 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:694 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:782 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:884 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1813 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1560 msgid "Error saving queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../source/FileZilla3/locales/../src/interface/storj_key_interface.cpp:62 +#: ../../source/FileZilla3/locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:611 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:721 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:775 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:147 -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1842 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1591 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:634 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:759 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:816 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:111 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:281 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:335 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:113 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:285 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/update_dialog.cpp:57 +#: ../../source/FileZilla3/locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "" @@ -3485,28 +3735,27 @@ msgid "FTP" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:15 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:21 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:66 -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:204 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "" @@ -3521,75 +3770,87 @@ "connections can be established in two ways." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:20 +#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:25 msgid "FTPES - FTP over explicit TLS" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:19 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:24 msgid "FTPS - FTP over implicit TLS" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:530 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:606 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:891 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1783 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:843 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:504 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:545 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:618 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:941 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1920 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:871 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:51 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:158 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:173 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:175 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:150 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:165 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:350 +#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../source/FileZilla3/locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../source/FileZilla3/locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:621 +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:609 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:944 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:951 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:82 +#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:257 +#: ../../source/FileZilla3/locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:109 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" msgstr "" @@ -3597,109 +3858,108 @@ msgid "Failed to load panels, invalid resource files?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:347 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1003 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:193 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:625 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:313 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:173 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:151 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:140 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:51 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:175 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:147 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:137 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage.cpp:215 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1107 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:363 +#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "" @@ -3711,27 +3971,23 @@ msgid "Fall back to active mode" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:270 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1051 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:95 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "" @@ -3739,7 +3995,7 @@ msgid "File editing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1596 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1646 msgid "File exists" msgstr "" @@ -3747,7 +4003,7 @@ msgid "File exists action" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "" @@ -3755,63 +4011,67 @@ msgid "File lists" msgstr "" +#: ../../source/FileZilla3/locales/../src/engine/storj/resolve.cpp:113 +#: ../../source/FileZilla3/locales/../src/engine/storj/resolve.cpp:184 #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:124 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:618 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:703 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1550 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:640 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:730 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1602 msgid "File not found" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:739 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:744 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:127 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:118 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:137 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:122 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:132 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:130 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:115 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1137 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:429 -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:66 -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:204 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:452 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "" @@ -3821,72 +4081,76 @@ "properly." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1442 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:98 msgid "Filelist status &bars" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:276 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:373 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1084 -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:108 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:287 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:396 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1136 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:159 msgid "Filename" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "" - -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2174 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2975 +#: ../../source/FileZilla3/locales/../src/engine/ftp/delete.cpp:31 +#: ../../source/FileZilla3/locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1582 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1634 msgid "Filename invalid" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/file_utils.cpp:318 +#: ../../source/FileZilla3/locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/file_utils.cpp:293 +#: ../../source/FileZilla3/locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:277 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:374 -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:110 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:288 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:397 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "" @@ -3894,50 +4158,54 @@ msgid "Filesize format" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:278 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:375 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:111 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:289 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:398 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:149 -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:217 -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:256 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:216 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:255 #: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:354 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:410 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:261 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "" @@ -3947,11 +4215,11 @@ msgid "Filter validation failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "" @@ -3963,16 +4231,17 @@ msgid "Fingerprint (SHA-256):" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:55 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -3982,39 +4251,44 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:243 +#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:148 msgid "Force showing &hidden files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:645 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:647 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "" @@ -4022,11 +4296,15 @@ msgid "General" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:509 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:488 msgid "General SOCKS server failure" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "" @@ -4035,71 +4313,75 @@ msgid "Get external IP address from the following URL:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:354 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:410 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:261 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:212 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:214 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:208 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:206 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:127 msgid "H&igh" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:18 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:911 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:998 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1002 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1064 msgid "High" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:913 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1000 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1004 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1066 msgid "Highest" msgstr "" @@ -4107,62 +4389,69 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1062 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:157 +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:518 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:497 msgid "Host unreachable" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:155 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:115 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " "reconnect." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" @@ -4180,62 +4469,62 @@ "misconfigured servers which reject the selected transfer mode." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:563 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:572 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " "a new file gets created." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:633 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:591 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " "timezone offset in the site manager." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "" @@ -4245,11 +4534,11 @@ "and will perform some simple tests." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1159 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4259,13 +4548,13 @@ msgid "If you get any errors, your configuration is not correct." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:578 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4290,22 +4579,22 @@ "you're running FileZilla on." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:604 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:87 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:73 -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:76 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:81 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "" @@ -4327,7 +4616,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4340,37 +4629,31 @@ "to be done for this." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:328 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:111 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:860 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:881 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:185 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:610 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:634 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "" @@ -4378,71 +4661,95 @@ msgid "Interface" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1048 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:220 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:334 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:213 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:161 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:584 msgid "Invalid Content-Length" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:490 msgid "Invalid HTTP Response" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1036 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:456 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:512 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:705 msgid "Invalid chunk size" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:363 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:372 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:380 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:397 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:373 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:382 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:390 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:41 -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:55 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:224 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/file_utils.cpp:293 -#: ../../source/FileZilla3/locales/../src/interface/file_utils.cpp:318 +#: ../../source/FileZilla3/locales/../src/interface/file_utils.cpp:290 +#: ../../source/FileZilla3/locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:162 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:101 +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../source/FileZilla3/locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:108 +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:113 +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:207 +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:63 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:180 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:190 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:518 +msgid "Invalid line" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/storj/mkd.cpp:22 +#: ../../source/FileZilla3/locales/../src/engine/storj/rmd.cpp:24 +#: ../../source/FileZilla3/locales/../src/engine/storj/list.cpp:21 +msgid "Invalid path" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:13 +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:91 -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:121 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:160 +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4451,79 +4758,79 @@ "ftpes:// for FTP over TLS (explicit)." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:405 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:499 msgid "Invalid response code" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:400 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:411 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:428 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:442 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:448 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:454 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:468 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:509 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:527 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:677 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:683 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:754 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:760 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:706 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:712 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:794 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:132 +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1069 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1071 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:256 +#: ../../source/FileZilla3/locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:258 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:257 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:649 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " "some tests to check if the server supports this feature, the test may fail." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "" @@ -4531,123 +4838,146 @@ msgid "Key exchange:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:858 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:879 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:607 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:632 msgid "Key file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:139 msgid "L&owest" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1442 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:279 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:376 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:112 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:290 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:399 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:659 msgid "Line length exceeded" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:264 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:270 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:274 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:118 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:292 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:363 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:120 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:296 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1132 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1368 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1184 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1033 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1061 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:313 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:371 -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:463 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:422 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:309 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:350 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:702 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:334 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:250 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "" @@ -4655,29 +4985,29 @@ msgid "Log file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" #: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:103 @@ -4691,13 +5021,13 @@ "'%s' or '%s'" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:906 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:993 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:997 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1059 msgid "Low" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:904 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:991 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:995 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1057 msgid "Lowest" msgstr "" @@ -4709,126 +5039,159 @@ msgid "MAC:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:44 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:646 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:652 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:659 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:670 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:705 #, c-format msgid "Malformed chunk data: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:161 #, c-format -msgid "Malformed header: %s" +msgid "Malformed request header: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:459 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:465 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:518 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:574 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:584 +#, c-format +msgid "Malformed response header: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:297 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:303 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:309 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:313 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:320 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:326 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:332 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:350 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:406 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:420 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:438 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:783 +#, c-format +msgid "Malformed response: %s" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:288 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:294 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:300 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:304 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:311 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:317 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:323 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1075 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:388 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1752 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:435 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1058 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:974 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:964 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:271 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:342 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:695 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "" @@ -4836,30 +5199,34 @@ msgid "Need to enter filter name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:391 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1079 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1066 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:515 -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1050 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:494 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "" @@ -4867,41 +5234,41 @@ msgid "New &Folder" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:53 msgid "New &tab" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:695 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:725 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1306 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1347 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/welcome_dialog.cpp:51 +#: ../../source/FileZilla3/locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "" @@ -4910,41 +5277,41 @@ msgid "New filter" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:585 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:597 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:605 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:619 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1077 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/export.cpp:26 +#: ../../source/FileZilla3/locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2114 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1884 msgid "No command given, aborting." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1073 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "" @@ -4952,95 +5319,91 @@ msgid "No filter name given" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:77 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:174 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:199 +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:27 +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:122 +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:340 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:404 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:245 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1053 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:255 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:280 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:486 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:466 msgid "No supported SOCKS5 auth method" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:101 +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:61 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:17 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1073 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:854 -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:875 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:154 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:179 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:540 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:909 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:996 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:601 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:628 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:148 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:176 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:535 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1000 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1062 msgid "Normal" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queueview_failed.cpp:312 -#: ../../source/FileZilla3/locales/../src/interface/queueview_failed.cpp:337 +#: ../../source/FileZilla3/locales/../src/interface/queueview_failed.cpp:309 +#: ../../source/FileZilla3/locales/../src/interface/queueview_failed.cpp:334 msgid "Not all items could be requeued for transfer." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:180 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:483 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:211 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2011 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2089 msgid "Not connected to any server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:561 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "" @@ -5048,23 +5411,32 @@ msgid "Not connected." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1094 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:647 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:465 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:652 +msgid "Null character in line" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "" @@ -5072,40 +5444,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:396 +msgid "O&pen" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "" @@ -5115,196 +5491,217 @@ "well as the fallback mode if enabled." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:336 msgid "Open directory in system's file manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:31 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:74 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:21 msgid "Open the file." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:55 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:72 msgid "Open the settings dialog of FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1700 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1712 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1616 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1733 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1831 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1844 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1668 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1785 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1523 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:18 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:53 msgid "Opens a new tab" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:9 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:49 msgid "Opens the Site Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1044 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1035 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1056 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:244 +#: ../../source/FileZilla3/locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1089 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:266 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1039 -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1040 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1065 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:219 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:378 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:114 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:401 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:497 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2322 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:543 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "" @@ -5312,82 +5709,102 @@ msgid "Passive (recommended)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:597 #: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:610 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:621 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:623 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../source/FileZilla3/locales/../src/engine/storj/connect.cpp:82 +#: ../../source/FileZilla3/locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:109 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:160 msgid "Path" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2220 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3058 +#: ../../source/FileZilla3/locales/../src/engine/ftp/rmd.cpp:28 +#: ../../source/FileZilla3/locales/../src/engine/ftp/rmd.cpp:44 +#: ../../source/FileZilla3/locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2280 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1111 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1248 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1338 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1348 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1163 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1300 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1390 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1032 -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1041 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1058 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:377 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:113 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:400 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:562 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." msgstr "" +#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:632 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:571 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5401,13 +5818,13 @@ msgid "Please enter a custom time format." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5416,16 +5833,16 @@ msgid "Please enter a name for the new filter." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:243 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:390 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:196 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "" @@ -5446,94 +5863,106 @@ "transfers." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" - #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:334 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:187 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:168 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:572 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:902 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1293 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1878 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:954 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1334 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2609 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2704 msgid "Please enter the name of the file which should be created:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:152 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:602 #: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:615 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " "address, use the external resolver option." msgstr "" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:626 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:157 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:603 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5549,30 +5978,36 @@ "discard." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:687 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:579 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " "previously." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "" @@ -5603,7 +6038,7 @@ msgid "Please select the new attributes for the selected files." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:590 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5612,37 +6047,37 @@ "protocol specific 'fixups' have to be disabled" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:251 -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:252 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:439 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:270 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:341 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:686 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1136 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "" @@ -5654,21 +6089,21 @@ msgid "Print version information to stdout and exit" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1280 msgid "Priority" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "" @@ -5676,31 +6111,31 @@ msgid "Pro&tocol:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:107 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:111 msgid "Process &Queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1037 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "" #. @translator: Example: Processed 5 files in 1 directory -#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1042 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1096 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "" @@ -5708,53 +6143,53 @@ msgid "Protocol:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:496 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:475 msgid "Proxy authentication failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:105 -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:117 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:354 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:329 #, c-format msgid "Proxy reply: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:537 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:516 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:409 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:386 #, c-format msgid "Proxy request failed: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:561 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:540 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "" @@ -5762,87 +6197,100 @@ msgid "Public key algorithm:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3054 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2784 msgid "Queue has been fully processed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:429 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:366 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:362 -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:420 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:370 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:440 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:207 msgid "Queued files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../source/FileZilla3/locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../source/FileZilla3/locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:174 +msgid "R&eboot system once" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:104 msgid "R&emote directory tree" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:230 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:248 msgid "R&eset and requeue selected files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:586 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:37 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:81 msgid "Re&fresh" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:585 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1023 +#: ../../source/FileZilla3/locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1382 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:740 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1428 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -5850,21 +6298,21 @@ msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1380 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:738 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1425 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1387 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:744 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1433 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "" @@ -5872,302 +6320,312 @@ msgid "Really delete all selected files and/or directories from your computer?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1280 msgid "Reason" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3047 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2777 msgid "Reboot now" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:225 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:989 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:997 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1018 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1014 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1022 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:522 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:228 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:515 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:77 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1095 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:854 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1280 msgid "Remote file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:386 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:391 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:400 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:405 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:724 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1086 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the current site's servertype (%s)." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the servertype (%s) selected on the parent site." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:332 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:530 +#: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:220 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Remove &all" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:227 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:245 msgid "Remove &selected" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:354 msgid "Rename selected directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:46 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:90 msgid "Rename selected files and directories" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2419 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:400 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:377 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:403 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:380 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:397 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:374 msgid "Request rejected or failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:241 msgid "Reset and requeue &all" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1084 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1082 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1087 #, c-format msgid "Resolving address of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1043 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:113 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:286 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:346 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:411 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:115 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:290 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:358 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:421 msgid "Response:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:924 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../source/FileZilla3/locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:921 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../source/FileZilla3/locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:710 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:61 msgid "S&how files currently being edited..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:178 +msgid "S&hutdown system once" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:182 +msgid "S&uspend system once" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:97 msgid "S&ynchronized browsing" msgstr "" @@ -6175,354 +6633,411 @@ msgid "SFTP" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:179 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:141 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:168 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:846 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:437 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:429 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:439 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:432 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:146 msgid "Search server for files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:502 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:573 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:586 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:585 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:104 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1531 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1583 msgid "Select default editor" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../source/FileZilla3/locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../source/FileZilla3/locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/export.cpp:38 +#: ../../source/FileZilla3/locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/export.cpp:34 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1495 +#: ../../source/FileZilla3/locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/export.cpp:39 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1566 msgid "Select file for exported queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/export.cpp:36 +#: ../../source/FileZilla3/locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/export.cpp:32 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../source/FileZilla3/locales/../src/interface/export.cpp:36 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:16 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:242 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:513 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:238 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:481 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:479 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:485 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:124 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1476 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1550 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1528 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1602 msgid "Selected editor does not exist." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1648 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1720 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:304 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:304 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:436 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:291 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:147 msgid "Send custom command to the server otherwise not available" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:255 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:743 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:396 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:345 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:459 +msgid "Server not sending proper line endings" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:309 +msgid "Server sent data even before request headers were sent" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../source/FileZilla3/locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:418 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:424 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:459 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:468 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:480 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:503 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:510 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:519 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:530 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:406 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:420 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:438 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:783 +msgid "Server sent too much data." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:428 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:434 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:469 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:478 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:490 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:513 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:520 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:529 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1280 msgid "Server/Local file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "" @@ -6530,49 +7045,54 @@ msgid "Session details" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:121 msgid "Set &Priority" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2298 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" +msgid "Setting permissions of '%s' to '%s'" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:150 +msgid "Sh&ow notification bubble" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:171 msgid "Show &welcome dialog..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2170 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:399 +msgid "Show in file &manager" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:212 msgid "Shows available TLS ciphers" msgstr "" @@ -6580,7 +7100,7 @@ msgid "Shows this help dialog" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3043 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2773 msgid "Shutdown now" msgstr "" @@ -6588,7 +7108,11 @@ msgid "Signature algorithm:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "" @@ -6596,67 +7120,72 @@ msgid "Site Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:428 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:442 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:454 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:509 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:683 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:760 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:489 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:517 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:531 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:543 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:712 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:411 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:448 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:527 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:677 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:754 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:537 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:706 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" "Add current connection to the site manager?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1280 msgid "Size" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "" @@ -6664,85 +7193,90 @@ msgid "Size unknown" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1154 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1171 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1195 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1255 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1157 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1174 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1200 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1278 #, c-format msgid "Skipping download of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1158 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1174 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1199 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1259 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1160 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1177 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1203 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1281 #, c-format msgid "Skipping upload of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1047 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1049 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1057 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1054 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1097 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1158 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:465 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:141 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "" @@ -6750,37 +7284,37 @@ msgid "Source file:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:575 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:578 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "" @@ -6788,19 +7322,21 @@ msgid "Start with opened Site Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:213 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1568 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../source/FileZilla3/locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../source/FileZilla3/locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1571 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../source/FileZilla3/locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../source/FileZilla3/locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "" @@ -6809,30 +7345,38 @@ msgid "Starts the local site in the given path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:249 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1087 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1139 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1280 msgid "Status" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:110 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:295 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:370 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:112 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:299 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:111 msgid "Stop and remove &all" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:253 +#: ../../source/FileZilla3/locales/../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "" @@ -6848,44 +7392,48 @@ msgid "Summary of test results:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3051 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2781 msgid "Suspend now" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:239 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:253 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:259 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:269 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:356 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:364 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:372 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:932 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:940 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:946 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:955 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:981 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:263 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:278 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:285 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:296 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:395 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:403 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:411 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1070 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1078 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1085 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1094 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1121 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:371 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:85 -#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:122 +#: ../../source/FileZilla3/locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:117 +#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2282 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2324 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2441 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2486 #: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:76 #: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:82 #: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:88 @@ -6894,39 +7442,39 @@ msgid "Syntax error in command line" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1038 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1095 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:100 msgid "T&oolbar" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../source/FileZilla3/locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../source/FileZilla3/locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:524 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:503 msgid "TTL expired" msgstr "" @@ -6934,70 +7482,84 @@ msgid "Target file already exists" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2625 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2722 msgid "Target filename already exists!" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1596 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1646 msgid "Target filename already exists, really continue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1068 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "" +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../source/FileZilla3/locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " "then." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:103 +#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:627 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1074 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1087 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:665 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:742 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:464 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "" @@ -7015,42 +7577,48 @@ "The custom time format is invalid or contains unsupported format specifiers." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:141 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1511 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "" #: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:149 -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:217 -#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:256 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:216 +#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "" +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_interface.cpp:205 +#: ../../source/FileZilla3/locales/../src/interface/asksavepassworddialog.cpp:41 +msgid "The entered passwords are not the same." +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" "Please enter a new name:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1704 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1621 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1835 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1673 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7058,41 +7626,43 @@ "Please check your filetype associations." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " "FileZilla only supports SSH2 keys." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:42 +#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1700 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1616 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1831 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1668 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" "No program has been associated on your system with this file type." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1712 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1733 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1844 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1785 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" "The associated command failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:57 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:65 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7100,7 +7670,7 @@ "Do you want to continue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7111,7 +7681,7 @@ msgid "The file selected as default editor does not exist." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:86 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7120,11 +7690,11 @@ "Continue with the import?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:747 +#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:800 +#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "" @@ -7138,19 +7708,19 @@ msgid "The following characters will be replaced: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3665 +msgid "The free open source FTP solution" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3300 -msgid "The free open source FTP solution" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7161,17 +7731,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:981 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:966 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:250 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7184,65 +7754,70 @@ "port." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_interface.cpp:214 +#: ../../source/FileZilla3/locales/../src/interface/asksavepassworddialog.cpp:46 +msgid "The master password needs to be at least 8 characters long." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1823 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1570 msgid "The queue will not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:893 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:937 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:76 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1720 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1626 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:566 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:583 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "" @@ -7252,42 +7827,46 @@ "certificate to make sure the server can be trusted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " "actually trying to connect to another computer pretending to be the server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1086 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:73 +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1034 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1099 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3046 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2776 msgid "The system will soon reboot unless you click Cancel." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3042 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2772 msgid "The system will soon shut down unless you click Cancel." msgstr "" @@ -7297,11 +7876,11 @@ "Please choose an action." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:846 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:78 +#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "" @@ -7310,15 +7889,15 @@ msgid "Themes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:444 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:384 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:584 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7336,48 +7915,46 @@ "you have and tests your configuration." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1280 msgid "Time" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:329 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1032 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1622 -#, c-format -msgid "Timezone offset of server is %d seconds." +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:435 +msgid "Title:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:247 -msgid "Title:" +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2168 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2169 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7387,89 +7964,84 @@ "Red: File sizes different" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " "directory on the server accordingly and vice versa." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:472 msgid "Too long header line" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:114 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:289 -#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:356 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:116 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:293 +#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:116 msgid "Transfer &type" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:448 -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:470 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../source/FileZilla3/locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:630 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:339 -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:246 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:360 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "" @@ -7477,27 +8049,27 @@ msgid "Transfers" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2929 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2655 msgid "Transfers finished" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "" @@ -7505,69 +8077,75 @@ msgid "Trust this certificate and carry on connecting?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1085 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:406 -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:533 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:383 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:512 #, c-format msgid "Unassigned error code %d" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:246 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1117 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1145 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1169 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../source/FileZilla3/locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:454 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:434 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "" @@ -7576,44 +8154,59 @@ msgid "Unknown certificate" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../source/FileZilla3/locales/../src/engine/misc.cpp:71 +#: ../../source/FileZilla3/locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:462 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:442 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:304 +#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:605 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:616 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:574 +msgid "Unknown transfer encoding" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:618 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:592 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1098 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../source/FileZilla3/locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "" @@ -7622,94 +8215,103 @@ msgid "Updates" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1108 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:586 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:588 +#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:326 msgid "Upload selected directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:7 msgid "Upload selected files and directories" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1102 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1136 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1292 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1154 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1188 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1105 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1294 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1157 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1139 -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1296 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1191 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../source/FileZilla3/locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "" @@ -7726,7 +8328,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -7738,16 +8340,17 @@ "time. Only the version of FileZilla you're using is submitted to the server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:495 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:491 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -7764,51 +8367,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1148 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../source/FileZilla3/locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:335 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:336 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:240 +#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:229 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:958 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "" @@ -7821,93 +8420,113 @@ "Do you really want to check for nightly builds?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:445 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:451 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:455 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../source/FileZilla3/locales/../src/engine/http/request.cpp:646 msgid "Wrong line endings" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:766 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/server.cpp:65 +#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/import.cpp:28 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" @@ -7917,66 +8536,83 @@ "Please enter a character that is allowed in filenames." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../source/FileZilla3/locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1587 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:709 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1639 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1670 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1799 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:415 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:407 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:524 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "" +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:91 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:158 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:156 msgid "You have to enter a valid IPv4 address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:529 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:506 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:502 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:480 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:476 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:631 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "" @@ -7984,7 +8620,7 @@ msgid "You need to enter a name for the log file." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1472 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "" @@ -7997,198 +8633,229 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:303 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:320 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:326 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:297 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:577 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3050 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2780 msgid "Your computer will suspend unless you click Cancel." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:217 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:530 -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:549 -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:576 -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:592 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:557 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:575 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:605 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:98 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " "FileZilla executable." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../source/FileZilla3/locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../source/FileZilla3/locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1127 +#: ../../source/FileZilla3/locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/storj_key_interface.cpp:62 +#: ../../source/FileZilla3/locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:98 -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1191 -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1202 -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1217 -#: ../../source/FileZilla3/locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:63 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../source/FileZilla3/locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "" diff -Nru filezilla-3.15.0.2/locales/fr.po filezilla-3.33.0/locales/fr.po --- filezilla-3.15.0.2/locales/fr.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/fr.po 2018-04-02 18:37:17.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-30 15:29+0100\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-02 20:30+0200\n" "PO-Revision-Date: \n" "Last-Translator: Pgase \n" "Language-Team: Pgase, William GATHOYE 1);\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 2.0.4\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S écoulée(s)" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S restante(s)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -35,213 +35,214 @@ "%a - Compte (les lignes comprenant ce paramètre seront ignorées si le type " "d'authentification Compte n'est pas utilisé)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d dossier" msgstr[1] "%d dossiers" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d dossier avec son contenu" msgstr[1] "%d dossiers avec leurs contenus" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fichier" msgstr[1] "%d fichiers" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d fichier. Taille totale : %s" msgstr[1] "%d fichiers. Taille totale : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d fichier. Taille totale : Au moins %s" msgstr[1] "%d fichiers. Taille totale : Au moins %s" -#: ../../locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "%d fichiers ajoutés à la file d'attente" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Hôte" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu dossier" msgstr[1] "%llu dossiers" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu fichier" msgstr[1] "%llu fichiers" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Mot de passe" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? o/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certificat expiré !" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Pas encore valide !" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Identifiant Proxy" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s et %s. Taille totale : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s et %s. Taille totale : au moins %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s octet" msgstr[1] "%s octets" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s est introuvable. Sans ce composant de FileZilla, le SFTP ne fonctionnera " -"pas.\n" +"%s est introuvable. Sans ce composant de FileZilla, %s ne fonctionnera pas.\n" "\n" "Veuillez télécharger Filezilla à nouveau. Si le problème persiste, merci de " "soumettre un rapport d'erreur." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s est introuvable. Sans ce composant de FileZilla, le SFTP ne fonctionnera " -"pas.\n" +"%s est introuvable. Sans ce composant de FileZilla, %s ne fonctionnera pas.\n" "\n" "Solutions possibles :\n" "- Vérifiez que %s est présent comme dossier listé dans votre variable " "d'environnement PATH.\n" -"- Spécifiez le chemin complet de %s dans la variable d'environnement " -"FZ_FZSFTP." +"- Spécifiez le chemin complet de %s dans la variable d'environnement %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s avec %d bits" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Le nom d'hôte ne correspond pas au certificat" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Identifiant" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Mot de passe Proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "" "Interrompre l&a connexion précédente et se connecter dans l'onglet actuel" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "À &propos de..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "C&ompte :" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Actif" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "&Ajouter un favori..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Ajouter un dossier..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Ajouter les fichiers à la file d'attente" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Ajouter un fichier de clé..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Ajouter à la file d'attente" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Ajuster le décalage horaire du serveur :" @@ -250,74 +251,79 @@ msgstr "" "Toujours f&aire confiance à ce certificat lors des prochaines sessions." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "Toujours f&aire confiance à cet hôte, ajouter cette clé au cache" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "Toujours utiliser l'éditeur p&ar défaut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "" "Toujours utiliser l&a sélection pour les types de fichiers qui ne sont pas " "encore associés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "Toujours effectuer cette &action" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "L&aisser le système d'exploitation identifier l'adresse IP externe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Automatique" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "Détection &automatique" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "Couleu&r de fond :" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Binaire" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "" "Préfixes &binaires du Système International (SI) (ex. 1 Ko = 1024 octets)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "Fa&voris" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "P&arcourir..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Tolérance de dépassement :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "Ann&uler" @@ -329,19 +335,23 @@ msgid "&Close" msgstr "&Fermer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&Quitter FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Quitter FileZilla dès que" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "&Configurer la limitation des taux de transfert..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "Pa&ramètres..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Connexion" @@ -349,155 +359,151 @@ msgid "&Copy current connection to Site Manager..." msgstr "Ajouter la &connexion actuelle dans le Gestionnaire de Sites..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "&Copier dans le presse-papier" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Créer un dossier" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" msgstr "Ouvrir un nouvel ongle&t" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Débogage" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "Niveau de &débogage du journal des événements :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "Éditeur par &défaut :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "Action par &défaut sur les fichiers existants..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Délai entre chaque tentative :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Supprimer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Supprimer un lien symbolique" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "&Droits d'accès au dossier..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "Comparaison de &dossier" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Désactiver la navigation synchronisée et continuer le changement de dossier " "local" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Désactiver la navigation synchronisée et continuer le changement de dossier " "distant" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "" "Supprimer le fichier local puis télécharger et é&diter le fichier à nouveau" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "&Déconnexion" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Déconnecter du serveur" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Afficher temporairement le taux de transfert à la place du taux moyen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Afficher la taille en octets" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "Ne pas se souvenir &des mots de passe (recommandé)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "Ne plus afficher ce &dialogue." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "Ne pas utiliser l'a&dresse IP externe pour les connexions locales." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "Action du &double-clic sur les fichiers :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Télécharger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Télécharger vers :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Télécharger..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Téléchargements :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Édition" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "Éditer l&es règles de filtrage..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "Activ&er" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Activer la compression" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Activer la limitation des taux de transfert" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Encodage :" @@ -505,28 +511,28 @@ msgid "&Encryption:" msgstr "&Chiffrement :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "Saisir une command&e personnalisée..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "Établir une conn&exion dans un nouvel onglet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Exécuter" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Exporter les entrées du Gestionnaire de Sites" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Exporter les paramètres..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "Retour en mode acti&f" @@ -534,35 +540,47 @@ msgid "&File" msgstr "&Fichier" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "Attributs du &fichier..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "Droits d'accès au &fichier..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Fichier :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "Conditions du &filtre :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "Jeux de &filtres :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtres" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Filtres :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Terminer l'édition et supprimer le fichier local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"Écraser le chemin distant, envoyer tous les &fichiers qui y sont contenus " +"directement dans le dossier cible" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -570,56 +588,56 @@ "Écraser le chemin distant, télécharger tous les &fichiers qui y sont " "contenus directement dans le dossier cible" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "Sui&vre le lien symbolique, supprimer le contenu du dossier cible" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "Obtenir l'adresse IP e&xterne à partir de l'URL suivante :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Obtenir de l'aide..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "Favori &global" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 utilisant la méthode CONNECT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "Masquer les fic&hiers identiques" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&La plus élevée" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Port le plus élevé disponible :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Hôte :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "" "Préfixes binaires de la Commission Electrotechnique &Internationale (IEC) " "(ex. 1 Kio = 1024 octets)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (exemple : 2007-09-15)" @@ -627,90 +645,99 @@ msgid "&Import..." msgstr "&Importer les paramètres..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "" "Ut&iliser les préférences d'associations par type de fichier du système" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "Installer la nouvelle version" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "" +"Conserver la str&ucture du chemin local relative à la recherche d'origine" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "" "Conser&ver la structure du chemin distant relative à la recherche d'origine" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "&Fichier de clé :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Disposition des arborescences des fichiers et dossiers :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Limiter les ports locaux utilisés par FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Limiter le nombre de connexions simultanées" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "Arborescence des dossiers &locaux" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "Dossier &local :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Recherche locale" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "Sauvegarder &le journal des événements dans un fichier" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "T&ype d'authentification :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "T&ype d'authentification :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Basse" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "&Organiser les favoris..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "Transfert &manuel..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "Nombre &maximum de connexions :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "Nombre &maximum d'essais :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "Journal des événe&ments" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Minimiser dans la zone de notification" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "&Nom de la méthode de tri :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Nom :" @@ -718,7 +745,7 @@ msgid "&Network configuration wizard..." msgstr "Assista&nt de configuration réseau..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Nouveau" @@ -726,7 +753,7 @@ msgid "&New Site" msgstr "&Nouveau Site" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Nouvelle version disponible !" @@ -734,154 +761,165 @@ msgid "&Next >" msgstr "&Suivant >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Non" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" -msgstr "Aucu&n" +msgstr "Aucu&ne" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Normale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "Valeur &numérique :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "O&K" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "OU&VERT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Ouvrir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Remplacer" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Passif" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "Mot de &passe :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "&Jouer un son" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Port :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Préserver l'horodatage des fichiers transférés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&File d'attente" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "Connexion &rapide" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "Barre de connexion &rapide" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "Histori&que de connexion rapide" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Lire" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "&Reconnexion" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "Informations de &reconnexion" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "Actualise&r" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "Mémorise&r le mot de passe principal jusqu'à la fermeture de FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "Mémorise&r le mot de passe jusqu'à la fermeture de FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "Se souveni&r des mots de passe" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "Dossier dis&tant :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Chemin distant :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Recherche distante" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Retirer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Retirer la clé" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "&Retirer la sélection" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Renommer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Renommer..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "Ouvri&r à nouveau le fichier local" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "Rempla&cer les caractères invalides par :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "Soumettre un &rapport d'erreur..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "Interroge&r l'utilisateur" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "&Réinitialiser et replacer tous les fichiers dans la file d'attente" @@ -889,39 +927,39 @@ msgid "&Restart Wizard" msgstr "&Relancer l'assistant" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Reprendre" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "Exécute&r une commande..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "Utilise&r l'assistant de configuration..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Rechercher des mises à jour..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "Enregi&strer sous..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "Rec&hercher" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "Recherche de fichiers di&stants..." @@ -929,20 +967,20 @@ msgid "&Select Entry:" msgstr "&Sélectionnez une entrée :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Sélectionnez une langue :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Sélectionnez les colonnes qui seront affichées :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Serveur" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "Paramètre&s" @@ -950,23 +988,19 @@ msgid "&Settings..." msgstr "Paramètre&s..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Afficher le menu de débogage" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "Afficher les détail&s du journal" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "Afficher un averti&ssement" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "Afficher l'horodatage dan&s le journal des événements" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Entrées du Gestionnaire de &Sites" @@ -974,163 +1008,182 @@ msgid "&Site Manager..." msgstr "Gestio&nnaire de Sites..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "Favori spécifique au &site" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Ignorer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "Limitation des taux de tran&sfert" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Démarrer le tran&sfert immédiatement" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "Permuter le&s volets des arborescences locale et distante" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "Chiffrement &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Tester" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Thème :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Transfert" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "Mode de &transfert :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "File d'a&ttente" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "" "&Traiter les fichiers dont le nom commence par un point comme des fichiers " "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "" +"&Faire confiance à ce certificat sur les noms d'hôte alternatifs répertoriés." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "Ann&uler l'édition" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "Mettre à jo&ur la clé placée en cache pour cet hôte" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Envoyer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Envois à :" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Envoyer..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Envois :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Utiliser un programme personnalisé" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "Utiliser la navi&gation synchronisée" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Utiliser l'éditeur par défaut du système pour les fichiers texte" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Utiliser l'adresse IP suivante :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Utiliser l'adresse IP externe des serveurs à la place" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Utiliser un séparateur pour distinguer les milliers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Identifiant :" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Identifiant :" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Version %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Affichage" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "A&fficher / Éditer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Afficher les fichiers édités localement et inviter à envoyer les " "modifications" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "Lors de la recherche des mises à jour, vérifier les :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "É&crire" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Oui" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' n'existe pas ou ne peut pas être accédé." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' n'est pas un dossier." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' n'est pas un protocole pris en charge." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "" "Le type d'authentification 'Compte' n'est pas supporté par le protocole " "sélectionné" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1138,7 +1191,7 @@ "Les types d'authentification 'Normal' et 'Compte' ne sont pas disponibles, " "utilisation du type 'Demander le mot de passe' à la place." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1146,7 +1199,7 @@ "Les types d'authentification 'Normal' et 'Compte' ne sont pas disponibles. " "Votre préférence a été changée en 'Demander le mot de passe'." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1157,58 +1210,58 @@ "au serveur. Vous devriez essayer de transmettre la commande en brut, en " "omettant 'quote' au début." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objet filtré)" msgstr[1] "(%d objets filtrés)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% téléchargé)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 pour aucune limite)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 secondes)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 pour désactiver)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat est défini sur %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(exemple : %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(exemple : %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(en %s/s)" @@ -1217,7 +1270,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- restant" @@ -1237,31 +1290,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s ne peut pas être utilisé conjointement avec une URL FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Aucun" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Alarmer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Informer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Détailler" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "Système 32 bits" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Déboguer" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "Système 64 bits" @@ -1269,22 +1322,28 @@ msgid "< &Back" msgstr "< &Précédent" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "Un favori portant ce nom existe déjà. Saisissez un autre nom." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Un certificat de la chaîne a été signé en utilisant un algorithme non " +"sécurisé" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Vous devez définir un éditeur par défaut." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Un dossier ne peut pas être déplacé dans l'un de ses sous-dossiers." @@ -1298,22 +1357,22 @@ "configurés. Dans pareils cas, vous devrez utiliser le mode actif. En mode " "actif, FileZilla ouvre un port et demande au serveur de s'y connecter." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Un fichier précédemment ouvert a été modifié." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Un fichier portant ce nom est déjà en cours de transfert." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Un fichier portant ce nom est encore en cours d'édition. Veuillez le fermer " "et réessayez." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1328,11 +1387,20 @@ "apparaître dans les contenus.\n" "Aucun avertissement ne sera affiché durant cette session." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"L'oubli du mot de passe principal est irrécupérable ! Veillez à bien " +"mémoriser votre mot de passe." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Une nouvelle version de FileZilla est disponible :" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1341,7 +1409,7 @@ "certains serveurs cachent des fichiers à l'utilisateur. Utilisez cette " "option pour forcer le serveur à afficher tous les fichiers." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1349,7 +1417,7 @@ "Ceci n'est pas requis pour un serveur correctement configuré. Contactez " "l'administrateur du serveur si nécessaire." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1358,17 +1426,17 @@ "synchronisée est activée.\n" "Désactiver la navigation synchronisée et continuer le changement de dossier ?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "&Ajouter" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "Autoriser &la reprise du transfert des fichiers ASCII" @@ -1380,51 +1448,53 @@ msgid "A&pply only to uploads" msgstr "A&ppliquer uniquement aux envois" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "A&ppliquer à tous les fichiers et dossiers" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "Retirer a&utomatiquement les transferts réussis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "À propos de FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Au-dessus de la liste des fichiers" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "L'accès à certains dossiers locaux n'a pu être restauré :" + +#: ../../locales/../src/engine/server.cpp:616 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Compte" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "A&ction après &traitement de la file d'attente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Action sur le fichier sélectionné :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Action à exécuter :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Action :" @@ -1432,7 +1502,7 @@ msgid "Active mode" msgstr "Mode actif" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1440,7 +1510,7 @@ "Le test du mode FTP actif a échoué. FileZilla ne connaît pas l'adresse IP " "externe correcte." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1448,7 +1518,7 @@ "Le test du mode FTP actif a échoué. FileZilla ne connaît pas l'adresse IP " "externe correcte. En plus de cela, votre routeur a modifié l'adresse envoyée." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1458,38 +1528,39 @@ "correcte, mais votre routeur ou pare-feu a modifié de manière erronée " "l'adresse envoyée." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "Mode IP actif" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "A&jouter les fichiers à la file d'attente uniquement" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Ajouter le dossier sélectionné à la file d'attente" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Ajouter les fichiers et dossiers sélectionnés à la file d'attente" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Ajouter à la file d'attente" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Type d'adresse non supportée" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Avancé" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1504,15 +1575,16 @@ "fonctionner correctement et même corrompre votre système. Vous utiliserez " "les versions bêtas et journalières à vos propres risques." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "Toujours effectuer cette &action" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algorithme :" -#: ../../locales/../src/interface/QueueView.cpp:2937 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "Tous les fichiers ont été transférés avec succès" @@ -1522,7 +1594,7 @@ "Tous les ports de la plage spécifiée doivent être compris entre 1024 et " "65535." -#: ../../locales/../src/interface/QueueView.cpp:2933 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1531,7 +1603,7 @@ msgstr[1] "" "Tous les transferts sont terminés. %d fichiers n'ont pas pu être transférés." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Autoriser un retour sur un autre mode de trans&fert en cas d'échec" @@ -1539,17 +1611,17 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Autoriser un retour sur un autre mode de transfert en cas d'échec" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Déjà connecté" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nom alternatif :" msgstr[1] "Noms alternatifs :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1557,7 +1629,7 @@ "Vous pouvez aussi utiliser l'outil Pageant de PuTTY pour gérer vos clés, " "FileZilla supporte cet outil." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1565,7 +1637,7 @@ "Vous pouvez aussi utiliser votre agent SSH. Pour ce faire, vérifiez que la " "variable d'environnement SSH_AUTH_SOCK est définie." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1573,7 +1645,7 @@ "Alternativement, vous pouvez également télécharger la dernière version sur " "le site Web de FileZilla :" -#: ../../locales/../src/interface/QueueView.cpp:1902 +#: ../../locales/../src/interface/QueueView.cpp:1662 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1583,7 +1655,7 @@ "de \"%s\".\n" "Certains éléments placés en file d'attente n'ont peut-être pas été restaurés." -#: ../../locales/../src/interface/QueueView.cpp:1812 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1593,7 +1665,12 @@ "\"%s\".\n" "Certains éléments placés en file d'attente ont peut-être été perdus." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" +"L'émetteur de la chaîne de certificat n'a pas autorité de certification" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1601,77 +1678,76 @@ "Un objet portant un nom identique à celui glissé existe déjà dans le dossier " "de destination." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:641 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Anonyme" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Une autre opération distante est actuellement en cours d'exécution, " "impossible de changer de dossier maintenant." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "" "Les modifications apportées au Gestionnaire de Sites ne peuvent pas être " "sauvegardées." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "" "Les modifications apportées aux filtres ne peuvent pas être sauvegardées." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Les modifications apportées aux filtres ne seront pas sauvegardées." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "App&liquer uniquement aux dossiers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Appliquer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Appliquer uniquement à la file d'attente a&ctuelle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Appliquer uniquement aux &fichiers" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Archive" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Débordement de tampon de l'argument" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Comme onglet dans le volet de la file d'attente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Demander l'action à effectuer" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/engine/server.cpp:633 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Demander le mot de passe" @@ -1683,7 +1759,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Demander l'adresse IP externe au système d'exploitation" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Poser vos questions sur les forums de FileZilla" @@ -1691,7 +1767,7 @@ msgid "Associated program not found:" msgstr "Programme associé introuvable :" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Au moins une condition du filtre est incomplète" @@ -1699,100 +1775,107 @@ msgid "At this point, all required information has been gathered." msgstr "À ce stade, toutes les informations requises ont été collectées." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Attribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Échec de l'authentification." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Auteur :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Automatique" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Classement automatique par type de fichier" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Tailles disponibles" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "" "o " -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "Ignorer le Prox&y" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Descripteur de fichier incorrect" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Instructions pour une première utilisation" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Comportement" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "En cours d'édition" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Attention ! Le certificat a été révoqué" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binaire" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Tableau noir" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Bleu" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Favori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Favori :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Favoris" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Parcourir..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Seau introuvable" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Date de compilation :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Informations de compilation" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Catégorie d'entreprise :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1803,97 +1886,113 @@ "FileZilla uniquement à un nombre restreint de ports, saisissez la plage de " "ceux-ci ci-dessous." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "Annuler l'&opération en cours" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "Tout s&upprimer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "C&opier l'(es) adresse(s) dans le presse-papier" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "C&opier l'(es) adresse(s) avec mot de passe dans le presse-papier" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "P&ersonnaliser" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Associations par t&ype de fichier personnalisées :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "Caractéristiques du CPU :" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Calcul du décalage horaire du serveur..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Impossible de lire à partir du fichier" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Impossible d'écrire les données dans un fichier." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Impossible d'écrire les données dans un fichier : %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Annuler" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Annuler l'opération en cours" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Annuler l'opération en cours" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "Impossible d'accéder à '%s', aucun média inséré ou lecteur non prêt." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Impossible d'ajouter le serveur au Gestionnaire de Sites" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Impossible d'assigner la requête d'adresse" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Impossible de modifier le dossier, il existe déjà une opération de " +"navigation synchronisée en cours." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1901,7 +2000,7 @@ "Impossible de fermer l'onglet, car il est en cours d'utilisation.\n" "Voulez-vous annuler l'opération en cours et le fermer tout de même ?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1913,22 +2012,23 @@ msgid "Cannot create new filter" msgstr "Impossible de créer un nouveau filtre" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Impossible d'éditer le fichier" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Impossible d'éditer le fichier, absence de connexion à un serveur." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Impossible d'éditer le fichier, le chemin distant est inconnu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1936,85 +2036,82 @@ "Impossible d'établir une connexion FTP à un serveur SFTP. Sélectionnez le " "protocole approprié." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "" -"Impossible de charger la barre de Connexion rapide depuis le fichier de " -"ressources" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Impossible de charger le fichier de clé" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "" "Impossible de charger la barre d'outils depuis le fichier de ressources" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Impossible de se souvenir du mot de passe" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "Impossible de renommer l'entrée" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Impossible de renommer le fichier" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Impossible de résoudre le nom d'hôte avec une adresse IPv4 pour une " "utilisation avec un proxy SOCKS 4." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Impossible de sauvegarder le jeu de filtres" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Impossible de sélectionner le filtre" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Impossible de définir l'association de fichier" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Impossible d'afficher le dialogue" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Impossible d'afficher/éditer le fichier sélectionné" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Insensible à la casse" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Insensible à la casse" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Insensible à la casse (par défaut)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Sensible à la casse" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Sensible à la casse (par défaut)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Catégories à supprimer" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "" "Le certificat et les données de session ne sont pas encore disponibles." @@ -2027,38 +2124,42 @@ msgid "Certificate issuer" msgstr "Émetteur du certificat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Échec de la vérification de la signature du certificat" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Demande d'accès :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Modification des attributs du fichier" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Modifier les droits d'accès au fichier." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Toutes modifications des paramètres du fichier journal nécessitent un " "redémarrage de FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Problème d'encodage de caractères" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Jeu de caractères" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Rechercher des mises à jo&ur..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Recherche automatique des mises à jour de FileZilla :" @@ -2066,15 +2167,15 @@ msgid "Check for Updates" msgstr "Recherche des mises à jour" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Recherche des nouvelles versions de FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Échec de la recherche des mises à jour" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2082,7 +2183,7 @@ "Vérifiez vos informations de connexion. Le mot de passe saisi commence ou se " "termine par un espace." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2090,39 +2191,39 @@ "Vérifiez vos informations de connexion. Le nom d'utilisateur saisi commence " "ou se termine par un espace." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Vérification de l'adresse IP externe correcte" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Recherche des mises à jour..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "La somme de contrôle correspond à celle du fichier %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "La somme de contrôle ne correspond pas à celle du fichier %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "Sélectionnez le fichier de clé" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Sélectionnez le dossier local par défaut" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Sélectionnez le dossier local" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:668 msgid "Chunk data improperly terminated" msgstr "Paquet de données interrompu incorrectement" @@ -2131,54 +2232,62 @@ msgstr "Chiffrement :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "Fermer l'&onglet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Classique" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Purger &le cache d'agencement" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Effacer les données de mise à jo&ur automatique" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Supprimer l'historique" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Suppression des données personnelles" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Vider la barre de connexion rapide" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Cliquez sur Terminer pour sauvegarder vos paramètres." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Client vers serveur MAC :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Client vers serveur de chiffrement :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Fermer" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "Fermer tous les &autres onglets" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "Quitter FileZilla" @@ -2186,103 +2295,108 @@ msgid "Close all running instances of FileZilla" msgstr "Fermer tous les processus en cours de FileZilla" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Fermer la recherche rapide et continuer à comparer ?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Fermer l'onglet actif" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Co&mmentaires :" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Propriétés des colonnes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Configuration des colonnes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "La commande et ses arguments doivent être correctement saisis." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Échec de la commande" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Commande non supportée" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Commande non supportée par ce protocole" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Commande :" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Commentaire" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Nom commun :" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" -msgstr "La communication est corrompue par un routeur ou un pare-feu." +msgstr "La communication est corrompue par un routeur ou un pare-feu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Co&mparer l'horodatage" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Comparer la taille de&s fichiers" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Écar&t de comparaison (en minutes) :" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "L'écart de comparaison doit être compris entre 0 et 1440 minutes." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Compilé pour :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Compilé sur :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Compilé avec :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Options de compilation :" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Compressé" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Transferts simultanés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Les conditions respectent la c&asse" @@ -2298,41 +2412,42 @@ msgid "Configure port range" msgstr "Paramètres de la plage des ports" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Configuration de FileZilla et de votre réseau" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Confirmer la suppression" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Confirmation requise" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Félicitations, votre configuration semble fonctionnelle." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Connexion en ignorant les paramètres du Proxy" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Échec de la connexion : %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Connexion dans l'onglet actuel" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Connexion dans un nouvel onglet" @@ -2340,25 +2455,26 @@ msgid "Connect to specified Site Manager site" msgstr "Connexion au site spécifié dans le Gestionnaire de Sites" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Connexion en cours" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Connexion à %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Connexion à %s via %s Proxy" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Connexion à %s..." @@ -2367,186 +2483,229 @@ msgid "Connection" msgstr "Connexion" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Connexion annulée" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Échec de la tentative de connexion" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Échec de la tentative de connexion avec \"%s\", essai de l'adresse suivante." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Échec de la tentative de connexion avec \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Tentative de connexion interrompue par l'utilisateur" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Tentative de connexion expirée" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Connexion interrompue" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:303 +#: ../../locales/../src/engine/http/request.cpp:316 +#: ../../locales/../src/engine/http/request.cpp:327 +#: ../../locales/../src/engine/http/request.cpp:338 msgid "Connection closed by server" msgstr "Connexion interrompue par le serveur" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "Connexion établie, initialisation TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "Connexion établie, envoi d'une requête HTTP" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "Connexion établie, attente du message d'accueil." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Connexion établie, attente du message d'accueil..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Connexion perdue" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Connexion non permise par les règles en vigueur" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Connexion refusée" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Connexion refusée par le serveur" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Connexion réinitialisée par le serveur" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Connexion réinitialisée par un pair" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Connection interrompue après %d seconde d'inactivité" msgstr[1] "Connection interrompue après %d secondes d'inactivité" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Délai d'attente expiré." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." -msgstr "Connexion au serveur perdue" +msgstr "Connexion au serveur perdue." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "Connexion établie avec le Proxy, établissement d'une liaison..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "La connexion avec le serveur a été interrompue prématurément." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "La connexion au serveur de test a échoué." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Convertir le fichier de clé" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Copie de (%d) sur %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "Copie de %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Copier les adresses des objets sélectionnés dans le presse-papier, mot de " +"passe inclus." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Copier les adresses des objets sélectionnés dans le presse-papier." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Impossible d'accepter la connexion : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Impossible d'accéder au chemin %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Impossible d'ajouter le certificat à la liste de confiance temporaire" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Impossible d'ajouter une connexion au Gestionnaire de Sites" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Impossible de terminer l'opération" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Impossible d'établir une connexion au serveur" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Impossible d'établir une connexion au serveur : %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Impossible de convertir la commande selon l'encodage du serveur" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Impossible de convertir la clé privée" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Impossible de copier les adresses" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Impossible de copier le certificat" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Impossible de copier les données" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Impossible de créer CFURL à partir du chemin %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Impossible de créer l'URI pour ce transfert." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Impossible de créer le fichier local %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Impossible de créer le journal mutex : %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Impossible de créer un favori sécurisé à partir de l'URL :" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2556,11 +2715,11 @@ "L'extension du shell n'est pas correctement installée ou vous n'avez pas " "déposé les fichiers dans une fenêtre de l'explorateur de fichier." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Impossible d'établir une connexion au serveur" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2573,11 +2732,16 @@ "utilisant l'option de la ligne de commande '--datadir ' ou en " "paramétrant la variable d'environnement FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Impossible de générer une séquence d'identification personnalisée." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Impossible de générer la clé" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2585,7 +2749,7 @@ "Impossible d'obtenir le nom de l'émetteur du certificat, " "gnutls_x509_get_issuer_dn a échoué" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2593,42 +2757,37 @@ "Impossible d'obtenir le nom d'objet du certificat, gnutls_x509_get_dn a " "échoué" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Impossible d'obtenir le chemin complet distant." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Impossible d'obtenir le chemin d'accès natif de CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Impossible d'accéder à l'URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Impossible d'obtenir une réponse de fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "" "Impossible d'obtenir un dossier temporaire pour y télécharger le fichier." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Impossible d'importer les certificats clients, gnutls_x509_crt_import a " -"échoué" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:96 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Impossible d'initialiser Winsock (%d) : %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Impossible d'initialiser la structure pour les certificats clients, " -"gnutls_x509_crt_init a échoué" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2639,15 +2798,21 @@ "accessible.\n" "Toutes modifications effectuées dans le Gestionnaire de Sites seront perdues." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Impossible de charger le fichier de clé" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Impossible de charger la clé privée" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2659,7 +2824,7 @@ "Désactiver la navigation synchronisée et continuer le changement de dossier " "distant ?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2670,7 +2835,7 @@ "distant '%s'.\n" "La navigation synchronisée est désactivée." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2681,72 +2846,112 @@ "dossier local '%s'.\n" "La navigation synchronisée est désactivée." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Impossible d'obtenir la taille de '%s'" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Impossible d'ouvrir '%s'" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Impossible d'ouvrir le presse-papier" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Impossible d'ouvrir le journal d'événements : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Impossible d'analyser le chemin distant." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Impossible d'analyser l'adresse du serveur :" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Impossible de lire depuis '%s'" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." msgstr "Impossible de lire depuis le socket." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:380 #, c-format msgid "Could not read from socket: %s" msgstr "Impossible de lire depuis le socket : %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Impossible de lire l'étiquette du serveur." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Impossible de recevoir des données à partir du serveur." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Impossible de se rendre à l'emplacement de %s dans le fichier" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Impossible de restaurer l'accès au dossier" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Impossible de rechercher pour compenser %d dans le fichier" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Impossible de rechercher le début du fichier" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" -msgstr "Impossible d'atteindre la fin du fichier" +msgstr "Impossible de rechercher la fin du fichier" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Impossible d'envoyer la commande à fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Impossible d'envoyer la commande à fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Impossible de trier les certificats homologues" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "Impossible de générer un processus d'entrée/sortie" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Impossible d'établir une liaison avec le serveur Proxy : %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Impossible de démarrer le transfert" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2755,19 +2960,19 @@ "Impossible d'écrire \"%s\", toutes les modifications effectuées dans le " "Gestionnaire de Sites ne seront pas sauvegardées : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Impossible d'écrire \"%s\", le favori ne peut pas être ajouté : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Impossible d'écrire \"%s\", les favoris globaux ne peuvent pas être " "sauvegardés : %s" -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2776,123 +2981,125 @@ "Impossible d'écrire \"%s\", la file d'attente ne sera pas sauvegardée.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Impossible d'écrire \"%s\", les sites sélectionnés ne peuvent pas être " "exportés : %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Impossible d'écrire \"%s\" :" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Impossible d'écrire le fichier de clé : %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Impossible d'écrire vers le fichier local" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Impossible d'écrire dans le fichier journal : %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:235 #, c-format msgid "Could not write to socket: %s" msgstr "Impossible d'écrire vers le socket : %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Pays :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "Créer un &nouveau fichier" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "Créer le dossier local &manquant et y accéder" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "Créer le dossier distant &manquant et y accéder" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Créer un nouveau sous-dossier dans le dossier actuel" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "" "Créer un nouveau sous-dossier dans le dossier actuel et accéder à celui-ci" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Créer un nouveau fichier vide dans le dossier actuel" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "Créer un dossier et &y accéder" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Créer un dossier" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "Créer un fichier vide" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Création d'un dossier" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Création du dossier '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Erreur critique" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Erreur critique :" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Erreur critique lors du transfert du fichier" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "" "Erreur critique lors du transfert du fichier après avoir transféré %s en %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2901,98 +3108,103 @@ "Le dossier distant (%s) actuel n'est pas synchronisé avec la racine (%s).\n" "La navigation synchronisée a été désactivée." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Le type de transfert actuel est défini sur ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Le type de transfert actuel est défini sur détection automatique." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Le type de transfert actuel est défini sur Binaire." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Courbe :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Pers&onnaliser" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Jeu de filtres personnalisé" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Serveur personnalisé" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Cyan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Type de d&onnées" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "" "Préfix&es décimaux du Système International (SI) (ex. 1 Ko = 1000 octets)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "Par d&éfaut" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "Supprim&er" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "Comparaison de &dossier" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Tout désact&iver" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "Ne pas sauvegarder les m&ots de passe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Action du d&ouble-clic sur les dossiers :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "D&upliquer" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:56 msgid "DOS-like with virtual paths" msgstr "Accéder aux chemins virtuels à la façon de DOS" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Type de fichier dangereux" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Données" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Fermeture prématurée du socket de données." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Date" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Format des dates" @@ -3008,15 +3220,15 @@ msgid "Debug" msgstr "Débogage" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Paramètres de débogage" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Dossier &local par défaut :" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:48 msgid "Default (Autodetect)" msgstr "Par défaut (Détection automatique)" @@ -3024,17 +3236,17 @@ msgid "Default editor not properly quoted." msgstr "Éditeur par défaut incorrectement saisi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Action par défaut sur les fichiers existants" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Dossi&er distant par défaut :" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -3042,7 +3254,7 @@ "Le chemin distant par défaut ne peut pas être analysé. Assurez-vous qu'il " "est valide et reconnu par le type de serveur sélectionné." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Langue par défaut du système" @@ -3050,12 +3262,12 @@ msgid "Default transfer mode:" msgstr "Mode de transfert par défaut :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Type de transfert par défaut :" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Par défaut : http://ip.filezilla-project.org/ip.php" @@ -3066,7 +3278,7 @@ "Le délai entre chaque échec de connexion doit être compris entre 1 et 999 " "secondes." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3081,75 +3293,85 @@ "Délai d'attente de %d secondes suite à l'échec de la précédente tentative de " "connexion..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "Supprimer l'entrée du Gestionnaire de Sites" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Supprimer le dossier sélectionné" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Supprimer les fichiers et dossiers sélectionnés" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Suppression de \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Suppression de %u fichiers à partir de \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Suppression de lien symbolique" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Bureau" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Détails" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Détails pour la nouvelle clé :" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "Détection des nouvelles versions de FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "&Dossiers" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Direction" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Dossiers :" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Dossier" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Droits d'accès au dossier" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Comparaison de dossier" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Échec de la comparaison de dossier" @@ -3159,39 +3381,43 @@ "Le dossier contenant le fichier journal n'existe pas ou le nom du fichier " "est incorrect." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "Filtres d'a&ffichage du contenu du dossier..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Affichage du contenu du dossier annulée par l'utilisateur" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "Échec de l'affichage du contenu du dossier" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Filtres d'affichage du contenu du dossier" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Contenu du dossier \"%s\" affiché avec succès" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Contenu du dossier affiché avec succès" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Tout &désactiver" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Désactiver la navigation synchronisée et continuer le changement de dossier " "distant ?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3199,89 +3425,84 @@ "Désactivez cette option s'il vous est impossible de voir correctement le " "contenu des dossiers." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Déconnecter du serveur actuel" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Déconnecté du serveur" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Déconnecté du serveur : %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Déconnexion du précédent serveur" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Déconnecter du serveur actuellement visible" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Affiche le dialogue À propos de FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "&Ne pas utiliser l'éditeur par défaut" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Ne rie&n faire" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "" "Faire de même avec tous les fichiers sélectionnés déjà en cours d'édition" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Souhaitez-vous vraiment quitter FileZilla ?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Souhaitez-vous vraiment supprimer toutes les entrées du Gestionnaire de " "Sites et de la file d'attente ?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "" "Souhaitez-vous vraiment supprimer toutes les entrées du Gestionnaire de " "Sites ?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Souhaitez-vous vraiment supprimer l'entrée sélectionnée ?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Souhaitez-vous vraiment supprimer la file d'attente ?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Souhaitez-vous vraiment envoyer '%s' au serveur ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Souhaitez-vous rouvrir ce fichier ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Documentation" @@ -3289,50 +3510,50 @@ msgid "Don't use external IP address on &local connections." msgstr "Ne pas utiliser l'adresse IP externe pour les connexions &locales." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Les fichiers dont le nom commence par un point, sont, sous les systèmes de " "type Unix, des fichiers généralement cachés et/ou de configuration, ex. ." "htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Action du double-clic" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Télécharger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "&Limite de téléchargement :" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "Limite de téléchargement : %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Limite de téléchargement : aucune" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Téléchargement des résultats de la recherche" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Télécharger le dossier sélectionné" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Télécharger les fichiers et dossiers sélectionnés" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3341,24 +3562,24 @@ "Téléchargement : %s/s\n" "Envoi : %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "En cours de téléchargement" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Téléchargement de %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Téléchargement de la mise à jour..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:90 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3366,11 +3587,11 @@ "Le glisser-déposer entre plusieurs instances de FileZilla n'est pas encore " "implémenté." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:103 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Le glisser-déposer entre plusieurs serveurs n'est pas encore implémenté." @@ -3379,16 +3600,16 @@ msgid "Dupl&icate" msgstr "Dupl&iquer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "&Tout activer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "D&évelopper le dossier" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "E&xécuter" @@ -3396,49 +3617,49 @@ msgid "E&xit" msgstr "&Quitter" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." -msgstr "E&xport..." +msgstr "E&xporter..." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "Courriel :" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Chaque filtre nécessite au moins une condition." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Édition des filtres" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Éditer le fichier avec l'éditeur sélectionné et envoyer les modifications au " "serveur." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "L'édition des dossiers n'est pas supportée" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Échec de l'édition" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Édition des résultats de recherche" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Courriel :" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "Commande absente" @@ -3446,7 +3667,7 @@ msgid "Empty command." msgstr "Commande non définie." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "Ce dossier ne contient aucun élément" @@ -3458,13 +3679,13 @@ msgid "Empty file extension." msgstr "Extension de fichier non définie." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Les noms de filtres vides ne sont pas autorisés." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Le champ Nom est vide" @@ -3472,81 +3693,97 @@ msgid "Empty quoted string." msgstr "La chaîne saisie entre guillemets est vide." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Tout &activer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Activer le filtrage des ca&ractères invalides" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Chiffré" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Chiffrement" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "Clé de &chiffrement :" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "Clé de &chiffrement :" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Détails du chiffrement" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Arrêter la comparaison et changer l'ordre de tri ?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Arrêter la comparaison et ouvrir une recherche rapide ?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "Saisir une &commande personnalisée..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Saisissez 0 pour aucune limitation." -#: ../../locales/../src/interface/QueueView.cpp:2103 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "Saisir une commande" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Saisie d'une commande personnalisée" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Développer le dossier" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Saisie d'un nom pour le filtre" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Saisie du mot de passe principal" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Saisie d'un nom pour le jeu de filtres" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Saisir un nouveau nom pour le jeu de filtres" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Saisie de mot de passe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Développer le dossier sélectionné" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3554,13 +3791,12 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Saisissez l'adresse du serveur.\n" -"Pour spécifier le protocole du serveur, préfixez l'hôte avec " -"l'identificateur du protocole. Si aucun protocole n'est spécifié, le " -"protocole par défaut (ftp://) sera utilisé.\n" -"Vous pouvez également saisir des adresses URL complètes sous la forme " -"protocole://identifiant:mot_de_passe@hôte:port, les valeurs des autres " -"champs seront alors remplacées.\n" +"Saisissez l'adresse du serveur. Pour spécifier le protocole du serveur, " +"préfixez l'hôte avec l'identificateur du protocole. Si aucun protocole n'est " +"spécifié, le protocole par défaut (ftp://) sera utilisé. Vous pouvez " +"également saisir des adresses URL complètes sous la forme protocole://" +"identifiant:mot_de_passe@hôte:port, les valeurs des autres champs seront " +"alors remplacées.\n" "\n" "Les prtocoles supportés sont :\n" "- ftp:// pour le FTP normal avec option chiffrement\n" @@ -3568,7 +3804,7 @@ "- ftps:// pour le FTP sur TLS (implicite)\n" "- ftpes:// pour le FTP sur TLS (explicite)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3577,118 +3813,135 @@ "Saisissez le mot de passe pour le fichier '%s'.\n" "Le fichier converti sera protégé avec le même mot de passe." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Saisissez le port d'écoute du serveur.\n" -"Le port par défaut pour le FTP est le 21 et le 22 pour le SFTP." +"Saisissez le port d'écoute du serveur. Le port par défaut pour le FTP est le " +"21 et le 22 pour le SFTP." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Saisir un identifiant" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Saisie d'un identifiant et mot de passe" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Erreur" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Erreur lors de l'exportation des paramètres" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Erreur lors de l'importation" -#: ../../locales/../src/interface/QueueView.cpp:1903 +#: ../../locales/../src/interface/QueueView.cpp:1663 msgid "Error loading queue" msgstr "Erreur lors du chargement de la file d'attente" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1824 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Erreur lors du chargement du fichier xml" -#: ../../locales/../src/interface/QueueView.cpp:1813 +#: ../../locales/../src/interface/QueueView.cpp:1556 msgid "Error saving queue" msgstr "Erreur lors de la sauvegarde de la file d'attente" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Erreur lors du démarrage du programme" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Erreur lors de l'écriture du fichier xml" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Erreur :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Exemple : png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Exemples" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Exé&cuter" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "L'exécutable ne contient pas d'information de version, impossible de " "rechercher des mises à jour." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Explorateur" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Exporter les &Filtres" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Exporter la file &d'attente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Exporter les paramètre&s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Exportation des paramètres" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Nom du f&iltre :" @@ -3696,28 +3949,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - Protocole de Transfert de Fichiers" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Protocole de Transfert de Fichiers avec chiffrement optionnel" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Protocole de Transfert de Fichiers non sécurisé" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Le moteur FTP n'est pas initialisé, impossible de se connecter" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Paramètres anti-déconnexion" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "Proxy FTP" @@ -3734,79 +3986,91 @@ "FTP utilise des connexions secondaires pour les transferts de données. Ces " "connexions supplémentaires peuvent être établies de deux manières." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP : Types de fichiers" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP sur connexion explicite TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP sur connexion implicite TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Impossible de changer de dossier" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Impossible de changer de langue" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Impossible de convertir en jeu de caractères 8 bits" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "Impossible de copier ou de déplacer les sites" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Impossible de créer la copie de sauvegarde du fichier xml" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Impossible de créer le socket d'écoute, abandon" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Impossible de créer un socket d'écoute sur le port %d, abandon." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Impossible de créer le socket d'écoute pour le mode de transfert actif" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Impossible de décrypter le mot de passe du serveur." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Impossible d'obtenir le chemin vers 'Mes Documents'" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Impossible d'obtenir le chemin vers le Bureau" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Impossible d'obtenir l'adresse du client pour le contrôle de la connexion, " "connexion interrompue." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Impossible d'obtenir l'adresse du client pour les données de la connexion, " "connexion interrompue." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Impossible d'initialiser le moteur FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "Impossible d'initialiser le protocole TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" msgstr "Impossible d'initialiser le réseau" @@ -3816,72 +4080,72 @@ "Impossible de charger l'interface, les fichiers de ressources sont-ils " "valides ?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Impossible de charger la clé privée : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Impossible d'ouvrir \"%s\" pour ajout / écriture" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Impossible d'ouvrir \"%s\" pour lecture" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Impossible d'ouvrir \"%s\" pour écriture" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "Impossible d'analyser le chemin retourné." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Impossible de réceptionner les données" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Impossible de récupérer le contenu du dossier" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Impossible de récupérer l'adresse IP externe, abandon" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Impossible de récupérer l'adresse IP externe, abandon." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "" -"Impossible de récupérer l'adresse IP externe. Utilisation de l'adresse locale" +"Impossible de récupérer l'adresse IP externe, utilisation de l'adresse locale" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Impossible de récupérer l'adresse IP locale." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Impossible de récupérer l'adresse IP locale, abandon." -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Impossible de récupérer l'adresse IP locale. Abandon" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Impossible de récupérer l'adresse IP locale." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Impossible de récupérer l'adresse IP externe." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Impossible d'envoyer la commande." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Impossible de définir la langue sur %s (%s), utilisation de la langue par " "défaut du système" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3889,49 +4153,48 @@ "Impossible de définir la langue sur %s (%s), utilisation de la langue par " "défaut du système (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Impossible de définir la langue sur %s (%s), utilisation de la langue par " "défaut du système." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Impossible de définir la langue sur %s, utilisation de la langue par défaut " "du système" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Impossible de définir la langue sur %s, utilisation de la langue par défaut " "du système (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Impossible de définir la langue sur %s, utilisation de la langue par défaut " "du système." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Impossible de valider les paramètres" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Impossible de vérifier le certificat client" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Impossible d'écrire le fichier %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Impossible d'écrire le fichier xml" @@ -3943,27 +4206,23 @@ msgid "Fall back to active mode" msgstr "Retour en mode actif" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Fichi&er :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Fichi&ers" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Fichier" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Types de fichiers" - -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Le descripteur de fichier n'est pas un socket" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Le fichier ne contient aucune donnée importable." @@ -3971,7 +4230,7 @@ msgid "File editing" msgstr "Édition des fichiers" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "Le fichier existe" @@ -3979,7 +4238,7 @@ msgid "File exists action" msgstr "Action lorsque le fichier existe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Le fichier a été modifié" @@ -3987,65 +4246,69 @@ msgid "File lists" msgstr "Listes des fichiers" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Fichier introuvable" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Recherche de fichiers" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Transfert de fichier interrompu par l'utilisateur" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "Transfert de fichier interrompu par l'utilisateur après avoir transféré %s " "en %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Échec du transfert du fichier" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Échec du transfert du fichier après avoir transféré %s en %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Transfert de fichier ignoré" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Transfert de fichier réussi" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Transfert de fichier réussi, %s transférés en %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Transfert de fichier en cours de progression." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Transfert de fichier avec type de données ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Transfert de fichier avec type de données binaires." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Erreur de FileZilla" @@ -4057,64 +4320,60 @@ "FileZilla peut maintenant tester votre configuration afin de s'assurer que " "tout fonctionne correctement." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla est déjà connecté à un serveur." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "FileZilla doit être redémarré pour que le changement de langue prenne effet." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Mises à jour de FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "Barre d'état des ar&borescences" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Nom de fichier" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Filtres de contenus..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "Le nom de fichier ne peut pas être créé pour le dossier %s et le nom de " "fichier %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "Nom de fichier invalide" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Nom de fichier inchangé" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Nom de fichier :" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "" "Les noms de fichier ne peuvent pas contenir les caractères suivants : / * ? " "< > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" @@ -4122,14 +4381,24 @@ "Les noms de fichier ne peuvent pas contenir les caractères suivants : / \\ : " "* ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Fichiers en cours d'édition" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" +"Les fichiers correspondant à une règle de filtrage sont supprimés des listes " +"de dossiers." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Fichiers introuvables" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Taille de fichier" @@ -4137,51 +4406,56 @@ msgid "Filesize format" msgstr "Format de la taille des fichiers" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Type de fichier" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Associations par type de fichier" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Filtre appliqué aux :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Filtrage des caractères invalides des noms de fichiers" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Nom de filtre déjà existant" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Filtrer les objets qui correspondent à toutes les conditions suivantes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "" "Filtrer les objets qui correspondent à au moins une des conditions suivantes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Filtrer les objets qui correspondent à aucune des conditions suivantes" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "" +"Filtrer les objets qui ne correspondent pas à toutes les conditions suivantes" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Jeu de filtres déjà existant" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtrer le contenu des dossiers" @@ -4191,11 +4465,11 @@ msgid "Filter validation failed" msgstr "Échec de la validation du filtre" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Retrouver des &fichiers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Retrouver des doss&iers" @@ -4207,16 +4481,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Empreinte (SHA-256) :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Empreinte :" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Empreintes :" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Assistant de configuration du routeur et du pare-feu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4229,7 +4504,7 @@ msgstr "" "Pour plus de fiabilité, vous devez spécifier une plage d'au moins 10 ports." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4237,35 +4512,40 @@ "Les paramètres par défaut seront utilisés pour cette session. Toute " "modification apportée à ces paramètres ne sera pas sauvegardée." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Forcer l'&UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Forcer l'affic&hage des fichiers cachés" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Forcer l'affichage des fichiers cachés" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Spécifications du format :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Format : Extension suivie de la commande placée entre guillemets, elle-même " "suivie de ses éventuels arguments." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Nouveauté trouvée %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "La fonction %s a échoué" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Plus de documentation" @@ -4273,11 +4553,15 @@ msgid "General" msgstr "Général" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Échec général du serveur SOCKS" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Générer..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Proxy générique" @@ -4286,70 +4570,74 @@ msgid "Get external IP address from the following URL:" msgstr "Obtenir l'adresse IP externe à partir de l'URL suivante :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Obtenir de l'aide" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Le nom de jeu de filtres existe déjà, remplacer le jeu de filtres ?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Favoris globaux" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Erreur GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Erreur GnuTLS %d dans %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Erreur GnuTLS %d dans %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Erreur GnuTLS %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Vert" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Permissions de groupe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "Éle&vée" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP sur TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Hash :" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Caché" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 #: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Haute" -#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:938 #: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Le plus élevé" @@ -4359,57 +4647,66 @@ msgstr "" "Le port disponible le plus élevé doit être compris entre 1024 et 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Maintenez la touche Maj/Shift enfoncée pour activer/désactiver le filtre " "simultanément des deux côtés." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Site web :" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "L'hôte est hors service" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Empreinte de la clé de l'hôte :" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "La clé de l'hôte ne correspond pas" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "L'hôte a démarré avec '[' mais aucun crochet de fin n'a été trouvé." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Hôte inaccessible" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Hôte :" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algorithme de la clé de l'hôte :" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Heures," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"J'ai oublié mon mot de passe principal. Supprimez tous les mots de passe " +"stockés avec cette clé." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (exemple : 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Les adresses IPv6 ne sont pas supportées avec un proxy SOCKS 4" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4418,7 +4715,7 @@ "Si aucune donnée n'est envoyée ou reçue durant ce laps de temps, la " "connexion sera interrompue et FileZilla essaiera de se reconnecter." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Si vous soumettez un rapport d'erreur, merci d'y joindre un journal " @@ -4444,7 +4741,7 @@ "Si l'option de retour est activée, vous pourrez vous connecter à des " "serveurs mal configurés qui refuseront le mode de transfert sélectionné." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4452,7 +4749,7 @@ "Si le changement de clé n'était pas prévu, contactez l'administrateur du " "serveur." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4460,7 +4757,7 @@ "Si le problème persiste, c'est que votre routeur et/ou pare-feu interfère " "encore avec FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4468,7 +4765,7 @@ "Si le problème persiste, c'est que votre routeur et/ou pare-feu interrompt " "la connexion." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4478,7 +4775,7 @@ "ajoutant \".1\" à la fin du nom du fichier (d'anciens journaux peuvent être " "éventuellement remplacés) et un nouveau fichier est créé." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4486,7 +4783,7 @@ "Si le lien symbolique pointe vers un dossier, FileZilla pourra supprimer ce " "lien symbolique ou supprimer le contenu du dossier lié." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4494,13 +4791,13 @@ "Si ce problème persiste, veuillez contacter le fabricant de votre routeur ou " "de votre pare-feu pour tenter d'obtenir une solution." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Si ce problème persiste, veuillez contacter le fabricant de votre routeur." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4511,7 +4808,7 @@ "(ex. fuseau horaire différent), spécifiez un décalage horaire dans le " "Gestionnaire de Sites." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4520,7 +4817,7 @@ "fichiers seront identiques si la différence de l'horodatage ne dépasse pas " "le seuil ci-dessous." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Si vous changez de langue, vous devez redémarrer FileZilla." @@ -4532,11 +4829,11 @@ "Si vous cliquez sur Tester, FileZilla se connectera sur probe.filezilla-" "project.org et exécutera quelques tests simples." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Si vous quittez FileZilla, vos modifications seront perdues." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4550,7 +4847,7 @@ "Si vous obtenez la moindre erreur, c'est que votre configuration est " "incorrecte." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4559,7 +4856,7 @@ "pour transférer des fichiers, essayez de changer le mode de transfert par " "défaut." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4594,7 +4891,7 @@ "Si vous utilisez un routeur, assurez-vous que tous les ports seront " "redirigés vers la machine sur laquelle FileZilla est exécuté." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4602,16 +4899,16 @@ "Si votre routeur persiste à changer l'adresse IP, contactez le fabricant du " "routeur." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importer des données à partir d'une précédente version" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Importation des paramètres" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Importation réussie" @@ -4638,7 +4935,7 @@ "choisis par votre système." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4656,19 +4953,11 @@ "demande un port au serveur et s'y connecte. Aucun paramètre supplémentaire " "n'est nécessaire." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Chaîne incomplète, le certificat n'est pas un certificat auto-signé par une " -"autorité compétente" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Mot de passe incorrect" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4676,21 +4965,21 @@ "Les informations à propos de la dernière version de FileZilla n'ont pas pu " "être trouvées. Réessayer plus tard." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Initialisation de TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "Algorithme non sécurisé !" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Serveur non sécurisé, celui-ci ne supporte pas FTP sur TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:613 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interactif" @@ -4698,29 +4987,29 @@ msgid "Interface" msgstr "Interface" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Interrompu par le signal" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Interrompu par l'utilisateur" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 +#: ../../locales/../src/engine/http/request.cpp:582 msgid "Invalid Content-Length" msgstr "Longueur du contenu invalide" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:488 msgid "Invalid HTTP Response" msgstr "Réponse HTTP invalide" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Argument invalide passé" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4729,45 +5018,69 @@ "l'option UTF-8 dans le Gestionnaire de Sites pour forcer l'utilisation de " "l'UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:703 msgid "Invalid chunk size" msgstr "Taille du paquet invalide" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Données reçues invalides" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Date invalide" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Nom de fichier invalide" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Hash invalide : %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Hôte invalide, après le crochet de fin, seuls les deux-points et le port " "peuvent être renseignés." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Nom d'hôte invalide : %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Entrée invalide" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:516 +msgid "Invalid line" +msgstr "Ligne invalide" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Chemin invalide" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Port spécifié invalide. Le port doit être compris entre 1 et 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4781,74 +5094,74 @@ "ftps:// pour le FTP sur TLS (implicite) et\n" "ftpes:// pour le FTP sur TLS (explicite)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Hôte proxy invalide, après le crochet de fin, seuls les deux-points et le " "port sont autorisés." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Expression régulière invalide" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Expression invalide dans les conditions de recherche." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:497 msgid "Invalid response code" msgstr "Code de réponse invalide" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Conditions de recherche invalides : %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Chemin du site invalide" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Taille invalide dans cette condition" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Identifiant spécifié invalide." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Valeur invalide pour ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Valeur invalide pour les conseils" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Inverser le filtre" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Juridiction du pays :" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Juridiction locale :" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Juridiction d'état ou de province :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Maintenir les dossiers en tête" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4859,7 +5172,7 @@ "cette option est activée. Bien que FileZilla effectue quelques tests pour " "vérifier si le serveur supporte cette fonctionnalité, le test peut échouer." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Échange de clé" @@ -4867,123 +5180,147 @@ msgid "Key exchange:" msgstr "Échange de clé :" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:610 +#: ../../locales/../src/engine/server.cpp:635 msgid "Key file" msgstr "Fichier de clé" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Identificateur de clé :" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "La &plus basse" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Langue" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Langue modifiée" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Dernière modification" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Agencement" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Laissez le champ vide pour conserver le mot de passe existant." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Limite &des téléchargements simultanés :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Limite des envois sim&ultanés :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Limites des ports locaux" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Taille limite du fichier journal" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Limite :" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:657 msgid "Line length exceeded" msgstr "Longueur de ligne dépassée" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Dépendances" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Socket d'écoute fermé" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Contenu :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "P&ort le plus bas disponible :" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Local" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Adresse locale en usage" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Le point de terminaison local a été fermé" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Fichier local" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Le fichier local n'existe pas." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Le fichier local est %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Le fichier local est un dossier et non un fichier normal." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Le fichier local ne possède pas un nom de fichier valide." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Recherche de fichiers locaux" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Filtres locaux :" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Traitement du chemin local :" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Site local :" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "" +"La taille locale de '%s' ne correspond pas à la taille attendue : %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Localité :" @@ -4991,16 +5328,16 @@ msgid "Log file" msgstr "Fichier journal" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "Connecté" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Journalisation" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -5009,7 +5346,7 @@ "se peut que le serveur ne gère pas l'UTF-8. Impossible de rebasculer vers le " "jeu de caractères local à cause de l'utilisation d'un Proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -5018,11 +5355,11 @@ "se peut que le serveur ne gère pas l'UTF-8. Utilisation du jeu de caractères " "local." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" "La séquence d'identification a entièrement été exécutée et vous n'êtes " -"pourtant pas encore identifié. Abandon." +"pourtant pas encore identifié, abandon." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -5039,12 +5376,12 @@ "L'authentification ne peut être utilisé conjointement qu'avec une URL FTP. " "L'argument doit être '%s' ou '%s'" -#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:931 #: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Bas" -#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:929 #: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Le plus bas" @@ -5059,128 +5396,161 @@ msgid "MAC:" msgstr "MAC :" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Assurez-vous que le fichier est accessible et qu'il est bien un document XML " "correctement mis en forme." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:644 +#: ../../locales/../src/engine/http/request.cpp:650 +#: ../../locales/../src/engine/http/request.cpp:657 +#: ../../locales/../src/engine/http/request.cpp:668 +#: ../../locales/../src/engine/http/request.cpp:703 #, c-format msgid "Malformed chunk data: %s" msgstr "Paquet de données non conforme : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 #, c-format -msgid "Malformed header: %s" -msgstr "Entête non conforme : %s" +msgid "Malformed request header: %s" +msgstr "En-tête de la requête non conforme : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Réponse non conforme, le serveur envoie des fins de ligne incorrectes" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:457 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:516 +#: ../../locales/../src/engine/http/request.cpp:572 +#: ../../locales/../src/engine/http/request.cpp:582 +#, c-format +msgid "Malformed response header: %s" +msgstr "En-tête de réponse non conforme : %s" + +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +#, c-format +msgid "Malformed response: %s" +msgstr "Réponse non conforme : %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Transfert manuel" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Mot de &passe principal :" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Mot de passe principal :" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Correspondances à toutes les conditions suivantes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Correspondances à au moins une des conditions suivantes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Correspondances à aucune des conditions suivantes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Correspondances à aucune de toutes les conditions suivantes" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Nombre maximum de &transferts simultanés :" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Échec de l'allocation de mémoire" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Journal des événements" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Journal des événements" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Message trop volumineux" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "Mio" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Minutes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "&Déplacer vers le bas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Déplacer vers le ha&ut" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Ordinateur" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Mes Documents" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "Mes Sites" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/d" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Nom" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "Le nom existe déjà" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Le nom du favori existe déjà." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Nom :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Tri naturel" @@ -5188,19 +5558,23 @@ msgid "Need to enter filter name" msgstr "Saisissez un nom pour le filtre" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Saisissez un chemin local valide" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Saisissez un chemin distant valide" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "Veuillez spécifier l'encodage des caractères" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Aucun nom de nœud ou de nom de serveur fourni, ou inconnu" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5208,12 +5582,12 @@ "L'hôte du réseau n'a aucunes adresses réseau dans la famille d'adresses " "requise" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Réseau inaccessible" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Jamais" @@ -5225,37 +5599,37 @@ msgid "New &tab" msgstr "Nouvel ongle&t" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nouveau Fa&vori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Nouveau Favori" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Nouveau dossier" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Nouvelles fonctionnalités et améliorations de la version %s" @@ -5264,42 +5638,42 @@ msgid "New filter" msgstr "Nouveau filtre" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Nouveau dossier" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Nouveau site" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "À côté de la file d'attente" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "Non" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Aucune adresse associée à ce nom de nœud" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Aucune catégorie sélectionnée pour l'exportation" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." msgstr "Aucune commande spécifiée, abandon." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "" "Aucune adresse IP externe spécifiée, utilisation des paramètres par défaut." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Aucun fichier en cours d'édition." @@ -5307,99 +5681,95 @@ msgid "No filter name given" msgstr "Aucun nom de filtre spécifié" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Aucun hôte spécifié, saisissez un hôte." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Aucune image disponible" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Il n'y a plus de fichiers dans la file d'attente !" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Le jeu de filtres spécifié n'a aucun nom." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Aucun programme associé à ce type de fichier" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Aucun programme n'a été associé pour éditer les fichiers portant l'extension " "'%s'." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Aucun routage vers l'hôte" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Aucun résultat" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Aucun site disponible" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Méthode d'authentification SOCKS5 non supportée" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Aucun identifiant spécifié." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Aucune" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Pas encore sélectionné" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Échec non récupérable dans la résolution du nom" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 #: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 msgid "Normal" msgstr "Normale" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "" "Tous les objets ne peuvent pas être replacés en file d'attente pour le " "transfert." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Déconnecté" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Absence de connexion à un serveur" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Absence de connexion à un serveur." @@ -5407,28 +5777,37 @@ msgid "Not connected." msgstr "Déconnecté." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Non initialisé, vous devez appeler WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Notez que cette fonctionnalité est uniquement supportée avec le protocole " "FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Remarque : Une clé perdue ne peut pas être récupérée." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" -"Note : Ceci fonctionne uniquement avec les connexions FTP non chiffrées" +"Note : Ceci fonctionne uniquement avec les connexions FTP non chiffrées." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Note : L'utilisation d'un Proxy générique force les connexions FTP en mode " "Passif." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:650 +msgid "Null character in line" +msgstr "Caractère nul en ligne" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Nombre de décimales :" @@ -5436,40 +5815,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Le nombre d'essais doit être compris entre 0 et 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "Ou&vrir le fichier" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "O&uvrir" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "Version de l'OS :" @@ -5482,40 +5865,53 @@ "sélectionner sera configuré de même que le mode alternatif si vous l'avez " "activé." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Une seule fois" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Une fois par jour" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Une fois par semaine" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "Connexion FTP simple (non sécurisé)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Ou&vrir le fichier" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Ouvrir le dossier dans l'explorateur de fichiers de votre système" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Ouvrir le Gestionnaire de Sites" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Ouvrir le Gestionnaire de Sites." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Ouvrir le Gestionnaire de Sites. Clic droit pour afficher la liste des sites." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Ouvrir la boîte de dialogue des droits d'accès au dossier pour configurer " +"les dossiers locaux auxquels FileZilla a accès." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Ouvrir le fichier." @@ -5523,14 +5919,16 @@ msgid "Open the settings dialog of FileZilla" msgstr "Ouvrir le dialogue des paramètres de FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Ouvert comme :" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "L'ouverture a échoué" @@ -5542,112 +5940,120 @@ msgid "Opens the Site Manager" msgstr "Ouvre le Gestionnaire de Sites" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Afficher la boîte de dialogue de gestion des filtres des dossiers. Faites un " "clic droit pour activer/désactiver les filtres." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Système d'exploitation :" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Opération déjà en cours" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Opération en cours" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Opération non supportée" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Options" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Orange" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Organisation :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Autres options SFTP" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Autre erreur du système" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Autre :" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Mémoire insuffisante" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Vue d'ensemble" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Remplacer s&i la source est plus récente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Remplacer le fichier" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Remplacer le fichier si la taille est différente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "" "Remplacer le fichier si la taille est différente ou si la source est plus " "récente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Remplacer le fichier si la source est plus récente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Remplacer si la taille est &différente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "" "Remplacer si la taille est différente ou si la &source est plus récente" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Type de compilation reconnu : %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Permissions du propriétaire" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Propriétaire/Groupe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5655,31 +6061,31 @@ "Empêche&r la mise en veille de l'ordinateur pendant les transferts et toutes " "autres opérations" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Hôte P&roxy :" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "La commande PORT a été corrompue par le routeur ou le pare-feu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Pa&ssif (recommandé)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Le paramètre n'est pas une URL invalide" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Analyse de %d octets de l'information de version.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "&Mot de passe :" @@ -5687,67 +6093,82 @@ msgid "Passive (recommended)" msgstr "Passif (recommandé)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Mode passif" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Le mode passif a été défini comme mode de transfert par défaut." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Le mot de passe ou la clé de chiffrement ne sont pas définies" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Mot de passe requis" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Mots de passe" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Chemin" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "" "Le chemin ne peut pas être créé pour le dossier %s et le sous-dossier %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Chemin introuvable :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Chemins" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "En attente de retrait" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Droit d'accès" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Autorisation refusée" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Droits d'accès" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Plateforme :" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" +"Ajoutez les dossiers locaux que vous souhaitez utiliser avec FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5755,6 +6176,15 @@ "Vérifiez sur https://filezilla-project.org/probe.php que le serveur est " "démarré et revérifiez attentivement vos paramètres." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Vérifiez les droits d'accès accordés et ajoutez à nouveau les dossiers " +"locaux manquants avec lesquels vous travaillez dans la boîte de dialogue " +"suivante." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5763,11 +6193,11 @@ "Configurez vos routeurs et pare-feux afin que FileZilla puisse établir des " "connexions sortantes sur les ports que vous avez spécifiés." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Désactivez le 'mode DMZ' ou 'mode Jeu' de votre routeur." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5783,13 +6213,13 @@ msgid "Please enter a custom time format." msgstr "Saisissez un format d'heure personnalisé." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Saisissez une date au format YYYY-MM-DD comme par exemple 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5799,16 +6229,16 @@ msgid "Please enter a name for the new filter." msgstr "Saisissez un nom pour le nouveau filtre." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Saisissez un nouveau nom pour le filtre copié." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Saisissez un nouveau nom pour le jeu de filtres \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Saisissez un nouveau nom pour le filtre." @@ -5835,20 +6265,10 @@ "Saisissez un nombre compris entre 1 et 10 pour le nombre de transferts " "simultanés." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Saisissez un mot de passe pour ce serveur :" -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Saisissez un chemin et spécifiez un exécutable à exécuter.\n" -"Ex. : c:\\chemin\\fichier.exe sous MS Windows ou /chemin/fichier sous Unix.\n" -"Vous pouvez aussi spécifier des arguments au programme si vous le désirez." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5856,30 +6276,30 @@ "Saisissez un délai d'attente compris entre 10 et 9999 secondes ou 0 pour " "désactiver ces délais d'attente." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Saisissez un nom unique pour ce jeu de filtres" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Saisissez un identifiant pour ce serveur :" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Saisissez une plage de ports valide." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "" "Saisissez une URL à partir de laquelle vous obtiendrez votre adresse externe" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Saisissez une limite au taux de l'envoi supérieure ou égale à 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5887,27 +6307,48 @@ "Saisissez une commande FTP brute.\n" "L'utilisation de commandes FTP brutes vide le cache du dossier." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Saisissez le chemin complet d'un programme et ses arguments. Cette commande " +"sera exécutée lorsque la file d'attente aura terminé le traitement\n" +"Ex. : c:\\chemin\\fichier.exe sous MS Windows ou /chemin/fichier sous Unix.\n" +"Vous devez saisir correctement les commandes et leurs arguments si elles " +"contiennent des espaces." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Saisissez le nom du dossier qui doit être créé :" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "Saisissez le nom du fichier que vous souhaitez créer :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Saisissez un identifiant et un mot de passe pour ce serveur :" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Saisissez votre mot de passe principal actuel pour modifier les paramètres " +"du mot de passe." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Saisissez votre adresse IP externe" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5918,6 +6359,13 @@ "ne connaissez pas votre adresse externe, utilisez l'option de résolution " "externe." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Saisissez un mot de passe principal pour décrypter le mot de passe de ce " +"serveur :" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5926,7 +6374,7 @@ "Suivez les instructions attentivement, car une mauvaise configuration " "empêchera les connexions FTP d'aboutir." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5935,11 +6383,11 @@ "et que vous avez correctement saisi l'adresse nécessaire à la résolution des " "adresses." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "Assurez-vous que la requête locale est installée sur votre système." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5964,7 +6412,7 @@ "autres logiciels malveillants. Ce comportement peut engendrer une fausse " "alerte que vous pouvez ignorer sans risque." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5973,7 +6421,7 @@ "FTPS and FTPES ne fonctionne uniquement que si la commande MFMT est " "supportée." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5981,7 +6429,7 @@ "Notez que certains serveurs risquent de vous bannir si vous tentez de vous " "reconnecter trop souvent ou avec un intervalle de temps trop court." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5991,11 +6439,19 @@ "une modification ou si vous rencontrez des problèmes avec des serveurs qui " "fonctionnaient parfaitement auparavant." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Enregistrez cette clé dans un emplacement sécurisé. Sans la clé correcte, " +"vos fichiers envoyés sont inaccessibles." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Sélectionnez une action :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Sélectionnez les catégories que vous souhaitez importer." @@ -6029,7 +6485,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Sélectionnez les nouveaux attributs pour les fichiers sélectionnés." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -6041,40 +6497,39 @@ "dernière version de son microprogramme. En plus, votre routeur doit être " "correctement configuré. Vous devez rediriger les ports manuellement. " "N'utilisez pas le 'mode DMZ' ou 'mode Jeu' de votre routeur. Certains " -"protocoles d'inspections ou d'autres plus spécifiques doivent être " -"désactivés." +"protocoles d'inspections ou d'autres plus spécifiques doivent être désactivés" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Positio&n du journal des événements :" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Code postal :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "Espace pré&alloué avant téléchargement" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Préallocation" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Sites prédéfinis" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Préserver l'horodatage des fichiers" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Aperçu :" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Aperçu" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "" "Les certificats de la connexion primaire et de la connexion de données ne " @@ -6089,15 +6544,15 @@ msgstr "" "Imprimer les informations de version sur la sortie par défaut et quitter" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Priorité aux dossiers (par défaut)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Priorité" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6106,7 +6561,7 @@ "système d'exploitation et de l'architecture de votre processeur seront " "soumises au serveur." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "&Clés privées :" @@ -6114,31 +6569,31 @@ msgid "Pro&tocol:" msgstr "Pro&tocole :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Mot de passe Pro&xy :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Traiter la fi&le d'attente" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Débordement de la table de fichiers du processus" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Traitement de %s dans %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Protocole non supporté" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Protocole non supporté étant donné le type de socket" @@ -6146,56 +6601,56 @@ msgid "Protocol:" msgstr "Protocole :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Port du &Proxy :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "&Identifiant Proxy :" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Échec de l'authentification au Proxy" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Échec de la négociation avec le Proxy : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "L'hôte proxy commence avec '[,' mais aucun crochet fermant n'a été trouvé." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Réponse du Proxy : %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:520 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Échec de la requête au Proxy. Réponse du Proxy : %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Échec de la requête au Proxy : %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Échec de la requête au Proxy : Type d'adresse incluse dans la réponse " "CONNECT inconnue" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy spécifié mais le Proxy hôte ou le port sont invalides" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Authentification par clé publique" @@ -6203,69 +6658,79 @@ msgid "Public key algorithm:" msgstr "Algorithme de la clé publique :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Permissions publiques" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "La file d'attente a été complètement traitée" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "File d'attente : %s Mio" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "File d'attente : %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "File d'attente : vide" -#: ../../locales/../src/interface/QueueView.cpp:440 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Fichiers en file d'attente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "File d'attente :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "R&edémarrer l'ordinateur" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Recherche rapide :" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "" +"La recherche rapide ne peut pas être ouverte si vous comparez des dossiers." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "R&edémarrer l'ordinateur dès que" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "Arbor&escence des dossiers distants" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "" "Réinitialis&er et replacer les fichiers sélectionnés dans la file d'attente" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Commande FTP brute" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "L&ire" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "A&ctualiser" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Re&nommer" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6273,20 +6738,24 @@ "Exécutez à nouveau l'Assistant de configuration et vérifiez attentivement " "vos paramètres en configurant tous les routeurs et pare-feux en conséquence." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Li&re" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Lecture seule" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "La lecture du fichier local a échoué" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Souhaitez-vous vraiment annuler l'opération en cours ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6296,21 +6765,21 @@ msgstr[1] "" "Voulez-vous vraiment supprimer %d dossiers et leurs contenus du serveur ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Voulez-vous vraiment supprimer %d fichier du serveur ?" msgstr[1] "Voulez-vous vraiment supprimer %d fichiers du serveur ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Voulez-vous vraiment supprimer %s et %s du serveur ?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Voulez-vous vraiment supprimer tous les fichiers et/ou dossiers sélectionnés " @@ -6322,52 +6791,60 @@ "Voulez-vous vraiment supprimer tous les fichiers et/ou dossiers sélectionnés " "de votre ordinateur ?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Raison" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "Redémarrer maintenant" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Réc&ursion dans les sous-dossiers" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Réception d'une alerte TLS à partir du serveur : %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Reçu le contenu d'un répertoire qui semble être encodé en EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Réception d'une ligne supérieure à 10000 caractères, abandon." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"La réception de la chaîne de certificat n'a pu être vérifiée. L'état de " +"vérification est %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Données reçues corrompues" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "Réception de caractère non valide dans l'information de version" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Réception d'une alerte TLS %d inconnue à partir du serveur" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "Réception de l'information de version trop grande" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6376,77 +6853,75 @@ "êtes connecté à un serveur.\n" "Si vous continuez, votre connexion sera interrompue." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Paramètres de reconnexion" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Se reconnecter au dernier serveur utilisé" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Ajout de manière récursive des fichiers à la file d'attente." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Modification des droits d'accès récursifs." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Suppression récursive des fichiers et des dossiers." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Rouge" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Redirection vers un URI invalide ou non supporté : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Redirection vers une adresse invalide ou non supportée : %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Actualiser la liste des dossiers et des fichiers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Se souvenir des mots de passe?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Distant" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Certificat distant non approuvé." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Fichier distant" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Recherche de fichiers distants" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Filtres distants :" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Chemin distant" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6455,7 +6930,7 @@ "Le chemin distant ne peut pas être analysé. Vérifiez que le chemin absolu " "est valide et reconnu par le type de serveur du site actuel (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6465,130 +6940,134 @@ "est valide et reconnu par le type de serveur (%s) sélectionné sur le site " "parent." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Le chemin distant ne peut pas être analysé. Vérifiez que le chemin absolu " "est valide." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Le chemin d'accès à distance n'a pas pu être analysé." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Traitement du chemin distant :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Chemin distant :" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Site distant :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "&Tout retirer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Retirer la &sélection" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Renommer le fichier" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Renommer le dossier sélectionné" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Renommer les fichiers et dossiers sélectionnés" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Changement du nom de '%s' en '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Confirmer le mot de passe :" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Rapporter des bogues et demander des améliorations" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Échec de la requête - Le client n'exécute pas de protocole d'identification " "(ou n'est pas accessible à partir du serveur)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Échec de la requête - Les protocoles d'identification n'ont pas pu confirmer " "la chaîne de l'ID utilisateur" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Échec ou rejet de la requête" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "Connexion FTP explicite sur TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "Connexion FTP implicite sur TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Réiniti&aliser et replacer tous les fichiers dans la file d'attente" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Le protocole résolu est inconnu" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Résolution de l'adresse de %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Ressources temporairement indisponibles" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Réponse :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Résultats :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Reprendre le transfert du fichier" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6596,19 +7075,21 @@ "La reprise du transfert des fichiers ASCII peut poser problème si le serveur " "utilise des fins de ligne dans un format différent de celui du client." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Récupération du contenu du dossier \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Récupération du contenu du dossier..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Récupération de l'adresse IP externe depuis %s" @@ -6617,23 +7098,23 @@ msgid "S&how files currently being edited..." msgstr "Afficher les fic&hiers en cours d'édition..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "Afficher le Gestionnaire de Sites au démarrage de FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Arrêter l'&ordinateur" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "Arrêter l'&ordinateur dès que" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "Arrê&ter" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "Mise en veille de l'ordinate&ur" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "Mise en veille de l'ordinate&ur dès que" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "Navigation s&ynchronisée" @@ -6641,92 +7122,113 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Support SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Le proxy SOCKS 4 se connecte à : %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 ne supporte pas les noms d'utilisateur et les mots de passe de plus " +"de 255 caractères." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite :" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Sau&vegarder les mots de passe protégés par un mot de passe principal" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Sauvegard&er les mots de passe" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Sauvegarder les paramètres ?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "" "La sauvegarde des mots de passe a été désactivée par votre administrateur." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "Vous avez désactivé la sauvegarde des mots de passe." -#: ../../locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "Examen des fichiers à ajouter à la file d'attente" - -#: ../../locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" -msgstr "Examen des fichiers à envoyer" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Facteur d'échelle :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "&Conditions de recherche :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Chemin &de recherche :" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Recherche récursive de fichiers." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Recherche de serveur de fichiers" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Type de recherche :" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Information de sécurité" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Voir aussi : https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Séle&ctionner le serveur" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Sélectionnez une &page :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Sélection du thème" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Sélectionnez une action par défaut à effectuer si le fichier cible d'un " "transfert existe déjà." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Sélection de l'éditeur par défaut" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6734,7 +7236,7 @@ "Sélectionnez une action par défaut à effectuer si le fichier cible existe " "déjà. Cette sélection est valide uniquement pour la session en cours." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6742,138 +7244,142 @@ "Sélectionnez une action par défaut à effectuer uniquement pour les fichiers " "cibles sélectionnés présents dans la file d'attente." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Sélection du fichier contenant la clé privée" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Sélection du fichier pour l'exportation des données" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Sélection du fichier pour l'exportation des filtres" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Sélection du fichier pour l'exportation de la file d'attente" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Sélection du fichier pour l'exportation des paramètres" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "Sélection du fichier pour l'exportation des sites" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Sélection du fichier pour l'importation des paramètres" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Sélection du fichier à envoyer" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Sélection du nom pour le fichier de clé convertie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Sélectionnez la façon dont ces fichiers doivent être ouverts." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Sélectionner le dossier cible du téléchargement" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Sélection du nom de fichier cible" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Sélectionnez les catégories à exporter :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Sélectionnez les données personnelles que vous souhaitez supprimer." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "%d dossier sélectionné avec son contenu pour le transfert." msgstr[1] "%d dossiers sélectionnés avec leurs contenus pour le transfert." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Sélection de %d dossier." msgstr[1] "Sélection de %d dossiers." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "%d fichier sélectionné pour le transfert." msgstr[1] "%d fichiers sélectionnés pour le transfert." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Sélection de %d fichier. Taille totale : %s" msgstr[1] "Sélection de %d fichiers. Taille totale : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Sélection de %d fichier. Taille totale : Au moins %s" msgstr[1] "Sélection de %d fichiers. Taille totale : Au moins %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s et %s sélectionnés pour le transfert." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Sélection de %s et %s. Taille totale : %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Sélection de %s et %s. Taille totale : Au moins %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "L'éditeur sélectionné n'existe pas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Le fichier sélectionné est déjà en cours d'édition" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Le fichier sélectionné est déjà chargé" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Le fichier sélectionné est déjà ouvert" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Le fichier sélectionné est encore en cours d'édition" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Le filtre sélectionné fonctionne uniquement pour les fichiers locaux." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6882,49 +7388,49 @@ "serveur différent.\n" "Utilisez un favori spécifique au site pour ce serveur." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Le port sélectionné est habituellement utilisé par un autre protocole." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Envoyer des &commandes FTP anti-déconnexion" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "" "Envoi d'une commande personnalisée au serveur si celui-ci est indisponible" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Envoi d'une commande anti-déconnexion" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Numéro de série :" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "&Type de serveur :" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Le serveur n'a pas correctement fermé la connexion TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Le serveur ne supporte pas les caractères non-ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "" "Le serveur ne supporte pas la reprise de transfert pour les fichiers > %d " "Gio." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6934,17 +7440,21 @@ "Gio. Fin du transfert dès que la taille des fichiers en local et sur le " "serveur sont identiques." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "" "Le serveur ne supporte pas la reprise de transfert pour les fichiers > 2 Gio." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "" "Le serveur ne supporte pas la reprise de transfert pour les fichiers > 4 Gio." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Clé d'hôte du serveur" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6954,7 +7464,7 @@ "> %d Gio.Fin du transfert dès que la taille des fichiers en local et sur le " "serveur sont identiques." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6962,11 +7472,28 @@ "Le serveur requiert un compte. Essayez de spécifier un compte en utilisant " "le Gestionnaire de Sites" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:457 +msgid "Server not sending proper line endings" +msgstr "Le serveur n'envoie pas des fins de ligne correctes" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" +"Le serveur a demandé un algorithme d'authentification Digest non pris en " +"charge : %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "" +"Le serveur a demandé une qualité de protection non prise en charge : %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "Le serveur a retourné aucun chemin." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6974,13 +7501,19 @@ "Le serveur a envoyé une requête d'identification additionnelle. Vous devez " "utiliser un type d'identification interactif." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/http/request.cpp:307 +msgid "Server sent data even before request headers were sent" +msgstr "" +"Le serveur a envoyé des données avant même que les en-têtes de requête aient " +"été envoyés" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Le serveur a envoyé une réponse passive avec une adresse non routable. Échec " "du mode passif." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6988,36 +7521,50 @@ "Le serveur a envoyé une réponse passive avec une adresse non routable. " "Adresse remplacée par celle du serveur." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +msgid "Server sent too much data." +msgstr "Le serveur a envoyé trop de données." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Le serveur a envoyé une réponse inattendue." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Le serveur a envoyé une chaîne de certificat non triée en violation des " +"spécifications TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Serveur au client MAC :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Serveur au client chiffré :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "&Type de serveur :" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Serveur / Fichier local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Serveur :" @@ -7025,51 +7572,56 @@ msgid "Session details" msgstr "Détails de session" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Définir la &priorité" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Définir les permissions de '%s' à '%s'" - -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize appellé sans socket" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Définition des permissions de '%s' à '%s'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Paramètres de FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Dossier des paramètres :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Afficher une bulle de n&otification" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Afficher le contenu b&rut du dossier" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Afficher le dialogue de &bienvenue..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Afficher les arborescences des 2 côtés et continuer la comparaison ?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Afficher les détails" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "" "Afficher les détails à propos de la personnalisation du format de la date et " "de l'heure" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "Afficher dans le gestio&nnaire de fichiers" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Afficher les chiffrements TLS disponibles" @@ -7077,7 +7629,7 @@ msgid "Shows this help dialog" msgstr "Afficher ce dialogue d'aide" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "Arrêter maintenant" @@ -7085,7 +7637,11 @@ msgid "Signature algorithm:" msgstr "Signature de l'algorithme :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "S'inscrire" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Entrées du &Gestionnaire de Sites" @@ -7093,56 +7649,61 @@ msgid "Site Manager" msgstr "Gestionnaire de Sites" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "Gestionnaire de Sites - Impossible de se souvenir du mot de passe" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Gestionnaire de Sites - Clé générée" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "Gestionnaire de Sites - Données invalides" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Le Gestionnaire de Sites est déjà ouvert" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Le site n'existe pas." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Le chemin du site doit commencer par 0 ou 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Le chemin du site est incorrect." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Favoris spécifiques au site" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7152,11 +7713,11 @@ "le Gestionnaire de Sites.\n" "Ajouter les paramètres de la connexion actuelle au Gestionnaire de Sites ?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "Taille" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Format des tailles" @@ -7164,57 +7725,62 @@ msgid "Size unknown" msgstr "Taille inconnue" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Ignorer le fichier" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Ignorer le téléchargement de %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Ignorer le fichier de clé non-existant \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Ignorer l'envoi de %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "L'adresse du socket est extérieure à l'espace d'adressage" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Socket déjà connecté" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Le socket a été fermé" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Socket déconnecté" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Type de socket non supporté pour la famille d'adresses" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Certains fichiers sont encore en cours d'édition ou nécessitent d'être " "envoyés." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7222,33 +7788,33 @@ "Certains serveurs distants mal configurés, se trouvant derrière un routeur, " "peuvent répondre avec leurs adresses IP locales." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Trier les dossiers en ligne" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "" "L'ordre de tri ne peut pas être modifié pendant la comparaison des dossiers." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Tri" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "&Méthode de tri :" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "" "La source et le chemin pour l'opération de glisser-déposer sont identiques" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "La source et la cible du fichier ne peuvent être identiques" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "" "La source et la cible pour l'opération de glisser-déposer sont identiques" @@ -7257,39 +7823,39 @@ msgid "Source file:" msgstr "Fichier source :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Limitation des taux de transfert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Limitation des taux de transfert" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "" "La limitation des taux de transfert est désactivée, cliquez pour modifier." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "" "La limitation des taux de transfert est activée, cliquez pour modifier." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Versions stables et bêtas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Versions stables uniquement" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Versions stables, bêtas et journalières (nightly builds)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Démarrer le transfert &immédiatement" @@ -7297,19 +7863,21 @@ msgid "Start with opened Site Manager" msgstr "Démarrer avec l'ouverture du Gestionnaire de Sites" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Démarrage de la recherche de la mise à jour dans %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Démarrage du téléchargement de %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Démarrage de l'envoi de %s" @@ -7318,30 +7886,38 @@ msgid "Starts the local site in the given path" msgstr "Démarre le site local dans le chemin déterminé" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "État ou province :" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "Statut" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Statut :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "&Arrêter et tout retirer" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Arrêt de l'opération récursive" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Stockage décentralisé sur Cloud" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Support Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Rue :" @@ -7357,11 +7933,11 @@ msgid "Summary of test results:" msgstr "Résumé des résultats du test :" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "Suspend now" msgstr "Mise en veille immédiate" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7369,29 +7945,33 @@ "Les liens symboliques vers les fichiers ne sont pas affectés par ce choix, " "de tels liens symboliques sont toujours supprimés." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Navigation synchronisée" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "La navigation synchronisée a été désactivée." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Synchronisation des dossiers." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Erreur de syntaxe" @@ -7400,44 +7980,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Erreur de syntaxe dans la ligne de commande" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Système" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Détails du système" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "La limite d'ouverture des fichiers du système a été dépassée" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Le sous-système réseau du système a échoué" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "Barre d'&outils" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "Connexion TLS établie, envoi d'une requête HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "Connexion TLS établie, attente du message d'accueil..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "Connexion TLS établie." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL expiré" @@ -7445,37 +8025,45 @@ msgid "Target file already exists" msgstr "Le fichier cible existe déjà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Fichier cible :" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "Le fichier cible existe déjà !" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "Le fichier cible existe déjà, souhaitez-vous vraiment continuer ?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Échec temporaire dans la résolution du nom" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Test terminé avec succès" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Résultats du test" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Test de la capacité du serveur à reprendre les transferts" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Les &fichiers suivants sont en cours d'édition :" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "" "Le gestionnaire du site ne peut pas être utilisé à moins que le fichier soit " "réparé." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7485,7 +8073,7 @@ "Voulez-vous continuer ? Toutes modifications effectuées dans le Gestionnaire " "de Sites seront perdues." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7493,29 +8081,37 @@ "Le Gestionnaire de Sites est ouvert par une autre instance de FileZilla 3.\n" "Fermez celle-ci ou les données ne pourront pas être supprimées." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "L'adresse que vous avez saisie est : %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Le membre de l'ai_family n'est pas pas supporté" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Le membre ai_socktype n'est pas supporté" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Le favori ne peut pas être ajouté." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Les favoris ne peuvent pas être supprimés." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Le certificat exige que le serveur inclue un statut OCSP dans sa réponse, " +"mais le statut OCSP est manquant." + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "La connexion est chiffrée. Cliquez sur l'icône pour plus de détails." @@ -7537,35 +8133,40 @@ "Le format personnalisé de l'heure est invalide ou contient un prescripteur " "de format non pris en charge." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "La connexion des données ne peut pas être établie : %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "L'éditeur par défaut pour les fichiers texte est introuvable." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "L'éditeur par défaut pour les fichiers texte est '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "" "Le nom du filtre que vous avez saisi existe déjà. Saisissez un autre nom." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Les mots de passe saisis ne sont pas identiques." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "L'extension '%s' est déjà présente dans la liste" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7574,8 +8175,9 @@ "Le fichier %s existe déjà.\n" "Saisissez un nouveau nom :" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7586,7 +8188,7 @@ "Le programme associé (%s) n'a pas été trouvé.\n" "Vérifiez vos associations par type de fichier." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7595,29 +8197,31 @@ "Le fichier '%s' contient une clé SSH1. Le protocole SSH1 a été désapprouvée, " "FileZilla supporte que les clés SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" "Le fichier '%s' n'a pas pu être chargé ou ne contient pas de clé privée." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Le fichier '%s' ne peut pas être chargé." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" "No program has been associated on your system with this file type." msgstr "" "Le fichier '%s' n'a pas pu être ouvert :\n" -"Aucun programme n'est associé à ce type de fichier sur votre système" +"Aucun programme n'est associé à ce type de fichier sur votre système." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7626,8 +8230,8 @@ "Le fichier '%s' n'a pas pu être ouvert :\n" "Échec de la commande associée" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7639,7 +8243,7 @@ "entraîner la perte de données.\n" "Souhaitez-vous continuer ?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7652,7 +8256,7 @@ msgid "The file selected as default editor does not exist." msgstr "Le fichier sélectionné comme éditeur par défaut n'existe pas." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7666,11 +8270,11 @@ "hôte, port, identifiant et mot de passe peuvent être importés.\n" "Continuer l'importation ?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "La colonne Nom de fichier ne peut ni être cachée ni déplacée." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "La colonne Nom de fichier ne peut pas être cachée." @@ -7684,19 +8288,19 @@ msgid "The following characters will be replaced: %s" msgstr "Les caractères suivants seront remplacés : %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Les fichiers suivants sont en cours d'édition :" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "La solution FTP libre et Open Source" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "La clé de chiffrement générée est :" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Les favoris globaux ne peuvent pas être sauvegardés." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7710,17 +8314,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "La limite doit être comprise entre 1 et 2000 Mio" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Le dossier local '%s' ne peut pas être créé." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Le dossier local '%s' n'existe pas." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7738,25 +8342,30 @@ "Le port le plus bas disponible doit être inférieur ou égal au port le plus " "élevé." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Le mot de passe principal doit comporter au moins 8 caractères." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "La nouvelle version n'a pas pu être téléchargée, réessayer plus tard." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "" "La nouvelle version a été enregistré dans votre dossier de téléchargement." -#: ../../locales/../src/interface/QueueView.cpp:1823 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." msgstr "La file d'attente ne peut pas être sauvegardée." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Le dossier distant '%s' n'existe pas." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7766,30 +8375,30 @@ "Désactiver la navigation synchronisée et continuer le changement de dossier " "distant ?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Les catégories sélectionnées ont été importées." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Le fichier sélectionné contient des données importables pour les catégories " "suivantes :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Le fichier sélectionné est déjà en cours d'édition :" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Le fichier sélectionné est encore ouvert dans un autre programme, fermez ce " "dernier." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7799,15 +8408,15 @@ "Ceci peut être dangereux et corrompre votre système.\n" "Souhaitez-vous vraiment continuer ?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Le serveur ne peut pas être ajouté." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Le serveur a envoyé une réponse inattendue ou non reconnue." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "" "Le serveur utilise l'encodage de caractères suivant pour les noms de " @@ -7821,7 +8430,7 @@ "Le certificat du serveur est inconnu. Examinez le certificat avec attention " "avant de faire confiance au serveur." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7831,7 +8440,7 @@ "l'administrateur a changé la clé du serveur, soit vous essayez de vous " "connecter à un ordinateur prétendant être le serveur." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7839,11 +8448,15 @@ "La clé du serveur hôte est inconnue. Vous n'avez aucune garantie que ce " "serveur est bien le bon." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Le nom d'hôte du serveur ne correspond pas au nom d'hôte du certificat" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "Le paramètre nom du serveur n'est pas supporté pour ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7851,20 +8464,20 @@ "Les paramètres ont été importé. Vous devez redémarrer FileZilla pour que " "ceux-ci prennent effet." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "La famille d'adresses spécifiée n'est pas supportée" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Le nom du réseau spécifié n'est plus disponible" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." msgstr "" "L'ordinateur va bientôt redémarrer à moins que vous ne cliquiez sur Annuler." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "" "Le système va bientôt s'arrêter à moins que vous ne cliquiez sur Annuler." @@ -7877,11 +8490,11 @@ "Le fichier cible existe déjà.\n" "Choisissez une action." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Le test a échoué. Souhaitez-vous vraiment sauvegarder les paramètres ?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Le fichier de sauvegarde valide %s ne peut pas être restauré" @@ -7890,15 +8503,15 @@ msgid "Themes" msgstr "Thèmes" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Ce jeu de filtres ne peut pas être supprimé." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Ce jeu de filtres ne peut pas être renommé." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7921,46 +8534,44 @@ "Cet assistant va vous aider à configurer correctement vos routeurs et pare-" "feux et permettre ensuite de tester votre configuration." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "Temps" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Format des heures" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Délai d'attente en sec&ondes :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Délai d'attente" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Le décalage du fuseau horaire du serveur est de %d secondes." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Titre :" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Pour comparer des dossiers, la recherche rapide doit être fermée." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Pour comparer des dossiers, les listes de fichiers doivent être alignées des " "deux côtés." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Pour ce faire, les arborescences doivent être toutes deux visibles ou " "masquées." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7968,7 +8579,7 @@ "Pour supporter l'authentification par clé publique, FileZilla doit connaître " "les clés privées à utiliser." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7985,7 +8596,7 @@ "Vert : Le fichier est plus récent que le fichier non marqué de l'autre côté\n" "Rouge : Les tailles des fichiers sont différentes" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7995,82 +8606,77 @@ "Si activé, naviguer dans l'arborescence locale modifiera en conséquence le " "répertoire sur le serveur et inversément." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Démarrer ou arrêter le traitement de la file d'attente" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Afficher ou masquer l'arborescence des dossiers locaux" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Afficher ou masquer la journalisation" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Afficher ou masquer l'arborescence des dossiers distants" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Afficher ou masquer la file d'attente" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Too long header line" msgstr "Ligne d'en-tête trop longue" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Trop de redirections" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Suivi :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Transférer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Direction &du transfert" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "Type de &transfert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Mode de transfert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "File d'attente" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Paramètres de transfert" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Connexion interrompue : %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Les données transferrées ont été corrompues." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Transfert en cours" @@ -8078,27 +8684,27 @@ msgid "Transfers" msgstr "Transferts" -#: ../../locales/../src/interface/QueueView.cpp:2929 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "Transferts réussis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Traiter les fichiers sans &extension comme des fichiers ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Traiter les types de &fichiers suivants comme des fichiers ASCII :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "Approbation du changement de la clé de l'hôte :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "Approbation de la nouvelle clé de l'hôte :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Approuver la nouvelle clé et l'associer à la connexion ?" @@ -8106,71 +8712,77 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Approuver ce certificat et l'associer à la connexion ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Approuver ce serveur et l'associer à la connexion ?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Essayer à nouveau" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Type" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Type de Proxy FTP :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Type de Proxy générique :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "E&nvoyer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Limite de l'&envoi :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Utili&ser l'association par type de fichier si elle est disponible" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "Utili&ser la langue du système par défaut" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "UTILISATEUR@&HÔTE" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Code d'erreur non affecté %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Unité :" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Inconnu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Type de Proxy FTP inconnu, impossible de générer une séquence " "d'identification." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Version du protocole SOCKS inconnue : %d" @@ -8179,11 +8791,22 @@ msgid "Unknown certificate" msgstr "Certificat inconnu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Erreur inconnue %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Erreur inconnue %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Clé de l'hôte inconnue" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8192,15 +8815,19 @@ "Version du protocole SOCKS de négociation d'authentification Utilisateur/Mot " "de passe inconnue : %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Élément inconnu à la racine, il semblerait que ce fichier n'ait pas été " "généré par FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:572 +msgid "Unknown transfer encoding" +msgstr "Encodage de transfert inconnu" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8208,7 +8835,7 @@ "Tant que ces problèmes ne seront pas résolus, le mode FTP actif ne " "fonctionnera pas et le mode passif devra être utilisé." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8216,15 +8843,15 @@ "Tant que ce problème ne sera pas résolu, le mode FTP actif ne fonctionnera " "pas et le mode passif devra être utilisé." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Type de certificat non supporté" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Redirection non supportée" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Envoyer et terminer &l'édition" @@ -8233,96 +8860,105 @@ msgid "Updates" msgstr "Mises à jour" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Envoyer" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Échec de l'envoi" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "Limite de l'envoi : %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Limite de l'envoi : aucune" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Envoi des résultats de la recherche" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Envoyer le dossier sélectionné" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Envoyer les fichiers et les dossiers sélectionnés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Envoyer à nouveau ce fichier vers le serveur ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Envoyer ce fichier vers le serveur ?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Envoi en cours" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Envoi et attente de retrait" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Envoi et fin de l'édition" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Utiliser un jeu de &caractères personnalisé" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Utiliser l'éditeur pers&onnalisé :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Utiliser l'éditeur par &défaut pour les fichiers texte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Utiliser la navigation &synchronisée" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Utiliser des expressions régulières" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Utiliser l'UTF-8 si le serveur le supporte, sinon utiliser le jeu de " "caractères local." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Utiliser l'action par défaut" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "Connexion FTP explicite sur TLS si disponible" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Utiliser le serveur auquel vous êtes actuellement connecté" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Utiliser le serveur défini dans le Gestionnaire de Sites" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "Utiliser la langue du système par &défaut" @@ -8339,7 +8975,7 @@ msgstr "Utiliser à la place l'adresse IP externe des serveurs" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8357,16 +8993,17 @@ "du mode actif. Seule la version de FileZilla utilisée sera transmise au " "serveur." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Identifiant :" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "L'identifiant ne peut pas être une série d'espaces" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8385,53 +9022,49 @@ msgid "Verbose log messages from wxWidgets" msgstr "Détailler les historiques d'événements depuis wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Vérification du certificat..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Très haute" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" "L'option d'affichage des fichiers cachés est activée, mais n'est pas " "supportée par le serveur" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Afficher / Éditer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Colonnes visibles" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "Éc&rire" -#: ../../locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "En attente" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Attente d'une connexion pour la navigation" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Attente du mot de passe" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Attente d'annulation du transfert" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Attente avant nouvel essai..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "" "Attention, données de connexion ignorées en provenance d'une IP incorrecte." @@ -8452,23 +9085,23 @@ "\n" "Souhaitez-vous vraiment rechercher d'éventuelles versions journalières ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Attention : Faille de sécurité potentielle !" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Bienvenue sur FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Quoi de neuf ?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Quoi de neuf :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8477,7 +9110,7 @@ "reconnecter sans avoir à les resaisir la prochaine fois que vous " "réutiliserez FileZilla." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8486,37 +9119,55 @@ "sont pas supportés par le système d'exploitation local seront remplacés si " "un tel fichier est téléchargé." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "" "Lors du dém&arrage d'une nouvelle connexion tout en étant déjà connecté :" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Écran large" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Autorisez-vous FileZilla à se souvenir de vos mots de passe?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Écr&ire" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Adresse IP externe incorrecte" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:644 msgid "Wrong line endings" msgstr "Fins de ligne incorrectes" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Saisie du mot de passe principal incorrecte, il ne peut pas être utilisé " +"pour décrypter les mots de passe stockés." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Saisie du mot de passe principal incorrecte, il ne peut pas être utilisé " +"pour décrypter cet élément." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Jaune" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Oui" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8524,27 +9175,27 @@ "Il semble que vous utilisiez seulement une adresse IPv6 pour vous connecter. " "Cet assistant ne supporte pas ce type de configuration." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Vous utilisez la dernière version de FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "" "Vous pourrez toujours ouvrir cette boîte de dialogue via le menu Aide (?)." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "" "Vous pouvez télécharger la dernière version sur le site Web de FileZilla :" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" "Vous pouvez laisser le champ du port vide pour utiliser le port par défaut." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8552,7 +9203,15 @@ "Vous pouvez appliquer un x sous n'importe quelle position pour conserver les " "permissions initiales des fichiers." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Vous ne pouvez pas modifier le mot de passe et la clé de chiffrement " +"individuellement si vous utilisez un mot de passe principal." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Vous ne pouvez pas importer les paramètres de FileZilla à partir de son " @@ -8566,17 +9225,21 @@ "Vous ne pouvez pas remplacer un caractère invalide par un autre caractère " "invalide. Saisissez un caractère qui est autorisé dans les noms de fichiers." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Vous ne pouvez pas envoyer des fichiers dans le répertoire racine." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "Vous n'avez pas saisi de nouveau nom pour le fichier. Remplacer le fichier ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Vous avez sélectionné au moins un lien symbolique." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8584,7 +9247,8 @@ "Vous avez sélectionné plus de 10 fichiers pour l'édition, souhaitez-vous " "vraiment continuer ?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8592,39 +9256,47 @@ "Vous avez sélectionné plus de 10 fichiers ou dossiers à ouvrir, souhaitez-" "vous vraiment continuer ?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." msgstr "Vous devez saisir un nom d'hôte." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" -msgstr "Vous devez saisir un chemin de destination pour le fichier de clé." +msgstr "Vous devez saisir un chemin de destination pour le fichier de clé" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Vous devez saisir un dossier local." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Vous devez saisir un dossier distant." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Vous devez saisir une adresse IPv4 valide." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Vous devez saisir un dossier local" + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Vous devez saisir un dossier local accessible en écriture." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "Vous devez saisir un nom de compte" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "Vous devez spécifier un identifiant" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8632,7 +9304,11 @@ "Vous disposez probablement d'un routeur ou pare-feu qui a modifié de façon " "incorrecte les données transférées." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Vous devez saisir un mot de passe principal." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Vous devez saisir un nom pour le favori." @@ -8640,7 +9316,7 @@ msgid "You need to enter a name for the log file." msgstr "Vous devez saisir un nom pour le fichier journal." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Vous devez saisir une commande correcte et placée entre guillemets." @@ -8653,17 +9329,17 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Vous devez saisir un port Proxy compris dans une plage de 1 à 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Vous devez saisir au moins un chemin d'accès, les favoris vides ne sont pas " "supportés." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8671,7 +9347,7 @@ "Vous devez saisir un chemin d'accès local et distant afin de permettre la " "navigation synchronisée pour ce favori." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8679,23 +9355,31 @@ "Vous devez saisir un chemin d'accès local et distant afin de permettre la " "navigation synchronisée pour ce site." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Vous devez accorder l'accès aux dossiers, pour FileZilla, dans lesquels vous " +"souhaitez y télécharger des fichiers ou y en envoyer." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Vous devez spécifier un fichier local." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Vous devez spécifier un fichier distant." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Vous devez spécifier un chemin distant." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Vous devez spécifier un serveur." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8703,68 +9387,68 @@ "Vous ne devriez pas avoir de problèmes pour vous connecter à d'autres " "serveurs ; les transferts de fichiers devraient fonctionner correctement." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2775 msgid "Your computer will suspend unless you click Cancel." msgstr "" "Votre ordinateur va se mettre en veille à moins que vous ne cliquiez sur " "Annuler." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "postérieure à" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "antérieure à" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "qui commence par" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "octets" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "qui contient" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "personnalisé" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "qui ne contient pas" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "qui n'est pas égale à" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "qui se termine par" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "qui est égale à" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "fichier" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8774,93 +9458,158 @@ "Assurez-vous que cet exécutable est présent dans le même dossier que celui " "contenant l'exécutable de FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp appartient à une autre version de FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "fzsftp n'a pas pu être démarré" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "Fzstorj appartient à une autre version de FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj n'a pas pu être démarré" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"Impossible de démarrer fzstorj.\n" +"Assurez-vous que cet exécutable est présent dans le même dossier que celui " +"contenant l'exécutable de FileZilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers n'a retourné aucun certificat" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "Échec gnutls_pem_base64_encode2" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "plus grande que" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "exécutable par le groupe" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "lecture par le groupe" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "écriture par le groupe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "qui est égal à" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "défini" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "non défini" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "plus petite que" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" -msgstr "correspondant à l'expression rationnelle (regex)" +msgstr "correspond à l'expression régulière (regex)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "nouveau nom" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "exécutable par le propriétaire" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "lecture par le propriétaire" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "écriture par le propriétaire" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "inconnu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "exécutable par tous" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "lecture par tous" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "écriture par tous" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets :" -#~ msgid "Empty dirs to visit" -#~ msgstr "Dossiers vides à visiter" +#~ msgid "" +#~ "Malformed response: Server sent response body with a request verb or " +#~ "response code that disallows a response body." +#~ msgstr "" +#~ "Réponse incorrecte : Le serveur a envoyé un corps de réponse avec une " +#~ "requête ou un code de réponse qui interdit un corps de réponse." + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "Ne pas se souvenir &des mots de passe (recommandé)" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "Set permissions of '%s' to '%s'" +#~ msgstr "Définir les permissions de '%s' à '%s'" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "Le décalage du fuseau horaire du serveur est de %d secondes." + +#~ msgid "Host key fingerprint:" +#~ msgstr "Empreinte de la clé de l'hôte :" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "" +#~ "Impossible de charger la barre de Connexion rapide depuis le fichier de " +#~ "ressources" + +#~ msgid "Available sizes" +#~ msgstr "Tailles disponibles" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize appellé sans socket" + +#~ msgid "Filename &filters..." +#~ msgstr "&Filtres de contenus..." diff -Nru filezilla-3.15.0.2/locales/gl_ES.po filezilla-3.33.0/locales/gl_ES.po --- filezilla-3.15.0.2/locales/gl_ES.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/gl_ES.po 2018-04-27 13:04:09.000000000 +0000 @@ -1,38 +1,39 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Antón Méixome , 2010. -# Antón Méixome , 2012. # Iván Méndez 2009-2010. +# Antón Méixome 2010-2012. +# Daniel Muñiz Fontoira 2018. msgid "" msgstr "" "Project-Id-Version: FileZilla 3 GL 1.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-21 20:19+0200\n" -"PO-Revision-Date: 2012-07-10 19:35+0200\n" -"Last-Translator: Antón Méixome \n" -"Language-Team: proxecto@trasno.net\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-27 14:20+0200\n" +"PO-Revision-Date: 2018-04-16 10:26+0200\n" +"Last-Translator: Daniel Muñiz Fontoira \n" +"Language-Team: proxecto@trasno.gal\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.0\n" -"X-Poedit-Language: Gallegan\n" +"X-Generator: Poedit 1.8.11\n" "X-Poedit-Bookmarks: -1,-1,-1,271,-1,-1,-1,-1,-1,-1\n" -#: ../../locales/../src/interface/statuslinectrl.cpp:65 -#: ../../locales/../src/interface/statuslinectrl.cpp:225 +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "transcorreron %H:%M:%S" -#: ../../locales/../src/interface/statuslinectrl.cpp:69 -#: ../../locales/../src/interface/statuslinectrl.cpp:233 +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "faltan %H:%M:%S" -#: resources.h:788 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 +#, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" @@ -40,1159 +41,1305 @@ "%a - Conta (as liñas que conteñan isto omitiranse se non se emprega o tipo " "de identificador da conta)" +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 #: ../../locales/../src/interface/filelist_statusbar.cpp:63 -#: ../../locales/../src/interface/filelist_statusbar.cpp:74 -#: ../../locales/../src/interface/filelist_statusbar.cpp:86 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "cartafol %d" msgstr[1] "cartafoles %d" -#: ../../locales/../src/interface/RemoteListView.cpp:1709 -#: ../../locales/../src/interface/search.cpp:776 -#: ../../locales/../src/interface/search.cpp:1029 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "cartafol %d cos seus contidos" msgstr[1] "cartafoles %d cos seus contidos" -#: ../../locales/../src/interface/filelist_statusbar.cpp:62 -#: ../../locales/../src/interface/filelist_statusbar.cpp:85 -#: ../../locales/../src/interface/RemoteListView.cpp:1708 -#: ../../locales/../src/interface/search.cpp:775 -#: ../../locales/../src/interface/search.cpp:1028 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "ficheiro %d" msgstr[1] "ficheiros %d" -#: ../../locales/../src/interface/filelist_statusbar.cpp:81 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d ficheiro. Tamaño total: %s" msgstr[1] "%d ficheiros. Tamaño total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d ficheiro. Tamaño total: cando menos %s" msgstr[1] "%d ficheiros. Tamaño total: cando menos %s" -#: ../../locales/../src/interface/QueueView.cpp:2937 -#, c-format -msgid "%d files added to queue" -msgstr "%d ficheiros engadidos á cola" - -#: ../../locales/../src/engine/ControlSocket.cpp:104 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: resources.h:785 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Servidor" -#: resources.h:787 -#, no-c-format -msgid "%p - Password" -msgstr "%p - Contrasinal" +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu cartafol" +msgstr[1] "%llu cartafoles" -#: ../../locales/../src/interface/statuslinectrl.cpp:181 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format -msgid "%s (%d B/s)" -msgstr "%s (%d B/s)" +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu ficheiro" +msgstr[1] "%llu ficheiros" -#: ../../locales/../src/interface/statuslinectrl.cpp:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format -msgid "%s (%d.%d KB/s)" -msgstr "%s (%d.%d KB/s)" +msgid "%p - Password" +msgstr "%p - Contrasinal" -#: ../../locales/../src/interface/statuslinectrl.cpp:177 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format -msgid "%s (%d.%d MB/s)" -msgstr "%s (%d.%d MB/s)" +msgid "%s (%s/s)" +msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:184 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:39 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Caducou o certificado!" -#: ../../locales/../src/interface/verifycertdialog.cpp:23 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" -msgstr "%s - Xa non é correcto!" +msgstr "%s - Aínda é incorrecto!" -#: resources.h:789 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 +#, c-format msgid "%s - Proxy user" msgstr "%s - Usuario do proxy" -#: ../../locales/../src/interface/filelist_statusbar.cpp:91 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s e %s. Tamaño total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:89 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s e %s. Tamaño total: cando menos: %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:31 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s bytes" -#: ../../locales/../src/interface/updatewizard.cpp:904 -#, c-format -msgid "%s bytes" -msgstr "%s bytes" - -#: ../../locales/../src/interface/updatewizard.cpp:888 -#, c-format -msgid "%s bytes (%d B/s)" -msgstr "%s bytes (%d B/s)" - -#: ../../locales/../src/interface/updatewizard.cpp:886 -#, c-format -msgid "%s bytes (%d.%d KB/s)" -msgstr "%s bytes (%d.%d KB/s)" - -#: ../../locales/../src/interface/updatewizard.cpp:884 -#, c-format -msgid "%s bytes (%d.%d MB/s)" -msgstr "%s bytes (%d.%d MB/s)" - -#: ../../locales/../src/interface/FileZilla.cpp:701 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"Non se puido achar %s. Sen este compoñente do FileZilla, o SFTP non " +"Non se puido achar %s. Sen este compoñente do FileZilla, o %s non " "funcionará.\n" "\n" "Descargue o FileZilla outra vez. Se este problema continúa, envíenos un " "informe de erros." -#: ../../locales/../src/interface/FileZilla.cpp:795 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"Non se puido achar %s. Sen este compoñente do FileZilla, o SFTP non " +"Non se puido achar %s. Sen este compoñente do FileZilla, o %s non " "funcionará.\n" "\n" "Solucións posíbeis:\n" -"- Asegúrese de que %s se inclúe na súa variábel de ruta de entorno.\n" -"- Estabeleza a ruta completa como %s na variábel do entorno FZ_FZSFTP." +"- Asegúrese de que %s é un cartafol incluído na súa variábel de ruta de " +"entorno.\n" +"- Estabeleza a ruta completa como %s na variábel do entorno %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:56 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s con %d bits" -#: resources.h:786 -#, no-c-format +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - O nome do servidor difire do certificado." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 +#, c-format msgid "%u - Username" msgstr "%u - Nome de usuario" -#: resources.h:790 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Contrasinal do proxy" -#: resources.h:563 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 +msgid "&Abort previous connection and connect in current tab" +msgstr "Cancelar &a conexión anterior e conectar na lapela actual" + +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "&About..." -msgstr "&Sobre de..." +msgstr "&Sobre..." -#: resources.h:86 resources.h:385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Conta:" -#: resources.h:101 resources.h:690 resources.h:754 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Activo" -#: resources.h:554 +#: ../../locales/../src/interface/menu_bar.cpp:154 msgid "&Add bookmark..." msgstr "&Engadir marcador..." -#: resources.h:567 resources.h:584 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "Eng&adir cartafol..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:10 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:56 msgid "&Add files to queue" msgstr "Engadir &ficheiros á cola" -#: resources.h:798 -msgid "&Add keyfile..." -msgstr "&Engadir ficheiro de chave..." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 +msgid "&Add key file..." +msgstr "Eng&adir ficheiro de chave..." -#: resources.h:640 resources.h:659 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:266 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "&Add to queue" -msgstr "&Engadir ficheiros á cola" +msgstr "&Engadir á cola" -#: resources.h:95 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Axustar a zona horaria do servidor:" -#: resources.h:23 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "&Confiar sempre neste certificado para as próximas sesións." -#: resources.h:183 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" -msgstr "" -"&Confiar sempre neste servidor e engadir a chave á memoria intermedia (caché)" +msgstr "&Confiar sempre neste servidor e engadir a chave á caché" -#: resources.h:950 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "Us&ar sempre o editor predeterminado" -#: resources.h:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" -msgstr "&Usar sempre a escolla para ficheiros non asociados" +msgstr "Us&ar sempre a escolla para ficheiros non asociados" -#: resources.h:65 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" -msgstr "Usar sempre esta &acción" +msgstr "Us&ar sempre esta acción" -#: resources.h:766 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" -msgstr "&Preguntar o sistema operativo para enderezos de IP externos" +msgstr "Pregunt&ar ao sistema operativo polo enderezo IP externo" -#: resources.h:536 resources.h:670 resources.h:835 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:364 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 +#: ../../locales/../src/interface/menu_bar.cpp:118 msgid "&Auto" msgstr "&Auto" -#: resources.h:107 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "Detectar &automaticamente" -#: resources.h:538 resources.h:672 resources.h:837 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Cor de fondo:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:372 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 +#: ../../locales/../src/interface/menu_bar.cpp:120 msgid "&Binary" msgstr "&Binario" -#: resources.h:910 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" -msgstr "&Prefixos binarios cos símbolos SI. (por exemplo, 1 KB = 1024 bytes)" +msgstr "&Prefixos binarios cos símbolos SI. (Por exemplo, 1 KB = 1024 bytes)" -#: resources.h:553 +#: ../../locales/../src/interface/menu_bar.cpp:151 msgid "&Bookmarks" msgstr "&Marcadores" -#: resources.h:92 resources.h:367 resources.h:404 resources.h:410 -#: resources.h:427 resources.h:445 resources.h:947 resources.h:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." -msgstr "&Navegar..." +msgstr "&Explorar..." -#: resources.h:825 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" -msgstr "Tolerancia de ráfaga:" +msgstr "Tolerancia á sobrecarga:" -#: resources.h:128 resources.h:131 resources.h:198 resources.h:489 -#: resources.h:496 resources.h:738 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Cancelar" -#: resources.h:236 -msgid "&Check for beta versions of FileZilla" -msgstr "&Comprobar as versións beta do FileZilla" - -#: resources.h:513 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Clear private data..." msgstr "&Limpar os datos privados..." -#: resources.h:613 +#: ../../locales/../src/interface/resources/xrc/update.xrc:28 +msgid "&Close" +msgstr "Pe&char" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:158 msgid "&Close FileZilla" msgstr "&Pechar o FileZilla" -#: resources.h:680 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:170 +msgid "&Close FileZilla once" +msgstr "Pe&char o FileZilla deseguido" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Configure speed limits..." msgstr "&Configurar os límites de velocidade..." -#: resources.h:541 +#: ../../locales/../src/interface/menu_bar.cpp:129 msgid "&Configure..." msgstr "&Configurar..." -#: resources.h:113 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Conectar" -#: resources.h:219 -msgid "&Copy" -msgstr "&Copiar" - -#: resources.h:501 +#: ../../locales/../src/interface/menu_bar.cpp:50 msgid "&Copy current connection to Site Manager..." -msgstr "&Copiar a conexión actual no Xestor de sitios..." +msgstr "&Copiar a conexión actual no xestor de sitios..." -#: resources.h:173 resources.h:622 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "&Copy to clipboard" msgstr "&Copiar no portapapeis" -#: resources.h:627 -msgid "&Crash" -msgstr "&Erro" - -#: resources.h:575 resources.h:589 resources.h:642 resources.h:663 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:29 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:69 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&Create directory" msgstr "&Crear cartafol" -#: resources.h:675 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:404 msgid "&Create new tab" msgstr "&Crear nova lapela" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:182 msgid "&Debug" -msgstr "&Eliminar erros" +msgstr "&Depuración de erros" -#: resources.h:977 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" -msgstr "&Eliminar a información de erros neste rexistro de mensaxes:" +msgstr "A información de &depuración de erros no rexistro de mensaxes:" -#: resources.h:943 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "E&ditor predeterminado:" -#: resources.h:534 resources.h:605 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/menu_bar.cpp:113 msgid "&Default file exists action..." msgstr "&Acción por omisión se o ficheiro xa existe..." -#: resources.h:748 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" -msgstr "&Intervalo de tempo entre tentativas de inicio fallidas:" +msgstr "&Intervalo de tempo entre intentos de inicio fallados:" -#: resources.h:76 resources.h:203 resources.h:217 resources.h:417 -#: resources.h:578 resources.h:665 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:41 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Eliminar" -#: resources.h:458 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Eliminar ligazón simbólica" -#: resources.h:519 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "&Directory access permissions..." +msgstr "Permisos de acceso ao &cartafol..." + +#: ../../locales/../src/interface/menu_bar.cpp:86 msgid "&Directory comparison" -msgstr "&Comparación de cartafoles" +msgstr "Comparación &de cartafoles" + +#: ../../locales/../src/interface/state.cpp:1030 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"&Desactivar a navegación sincronizada e continuar cambiando o cartafol local" + +#: ../../locales/../src/interface/state.cpp:1108 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" +"&Desactivar a navegación sincronizada e continuar cambiando o cartafol remoto" -#: resources.h:326 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" -msgstr "&Rexeitar o ficheiro local, descargar e mais editar o ficheiro novo" +msgstr "Rexeita o ficheiro local e logo descarga e edita o ficheiro de novo" -#: resources.h:547 +#: ../../locales/../src/interface/menu_bar.cpp:143 msgid "&Disconnect" -msgstr "&Desconexión" +msgstr "&Desconectar" -#: resources.h:614 -msgid "&Disconnect from server" -msgstr "&Desconectar do servidor" - -#: resources.h:886 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "" -"&Presentar a velocidade de transferencia do momento no canto da velocidade " +"Presentar a velocidade de transferencia &do momento no canto da velocidade " "media" -#: resources.h:908 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Presentar o tamaño en bytes" -#: resources.h:494 -#, fuzzy -msgid "&Do not remember passwords" -msgstr "N&non gardar os contrasinais" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." -msgstr "&Non amosar máis este diálogo." +msgstr "Non amosar máis este &diálogo." -#: resources.h:771 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." -msgstr "&Non empregar números externos de IP en conexións locais." +msgstr "&Non empregar o enderezo IP externo en conexións locais." -#: resources.h:930 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "Accións do clic &duplo sobre os ficheiros:" -#: resources.h:582 resources.h:638 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:51 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:261 msgid "&Download" msgstr "&Descargar" -#: resources.h:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Descargar en:" -#: resources.h:673 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "&Download..." msgstr "&Descargar..." -#: resources.h:258 resources.h:847 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Descargas:" -#: resources.h:511 resources.h:573 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:24 +#: ../../locales/../src/interface/menu_bar.cpp:68 msgid "&Edit" -msgstr "&Editar" +msgstr "&Modificar" -#: resources.h:211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." -msgstr "&Editar as regras do filtro..." +msgstr "&Modificar as regras do filtro..." -#: resources.h:520 resources.h:540 resources.h:653 resources.h:679 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/menu_bar.cpp:89 +#: ../../locales/../src/interface/menu_bar.cpp:128 msgid "&Enable" msgstr "&Activar" -#: resources.h:958 -msgid "&Enable automatic update check" -msgstr "&Activar a comprobación automática de actualizacións" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 +msgid "&Enable compression" +msgstr "Activar a compr&esión" -#: resources.h:482 resources.h:820 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Activar os límites de transferencia" -#: resources.h:111 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Codificación:" -#: resources.h:82 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 msgid "&Encryption:" msgstr "&Cifrado:" -#: resources.h:621 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:192 msgid "&Enter custom command..." -msgstr "Introduza unha orde p&ersonalizada..." +msgstr "Inserir unha orde p&ersonalizada..." -#: resources.h:137 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 +msgid "&Establish connection in a new tab" +msgstr "&Estabelecer a conexión nunha nova lapela" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Executar" -#: resources.h:293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Exportar as entradas do xestor do sitio" -#: resources.h:506 resources.h:669 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:359 +#: ../../locales/../src/interface/menu_bar.cpp:57 msgid "&Export..." -msgstr "&Exportación..." +msgstr "&Exportar..." -#: resources.h:776 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Retroceder para o modo activo" -#: resources.h:498 +#: ../../locales/../src/interface/menu_bar.cpp:44 msgid "&File" msgstr "&Ficheiro" -#: resources.h:650 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "&File Attributes..." msgstr "&Atributos do ficheiro..." -#: resources.h:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "&File permissions..." msgstr "Permisos do &ficheiro..." -#: resources.h:366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Ficheiro:" -#: resources.h:221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" -msgstr "Condicións dos &filtros:" +msgstr "Condicións do &filtro:" -#: resources.h:200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "Conxuntos de &filtros:" -#: resources.h:215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtros" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Filtros:" -#: ../../locales/../src/interface/updatewizard.cpp:29 -msgid "&Finish" -msgstr "&Rematar" - -#: resources.h:318 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Rematar a edición e eliminar o ficheiro local" -#: resources.h:448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Rasar as rutas locais, enviar todos os &ficheiros contidos directamente no " +"cartafol de destino" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" -"&Rasar a rutas remotas, descargar todos os ficheiros directamente no " +"Rasar a rutas remotas, descargar todos os &ficheiros directamente no " "cartafol de destino" -#: resources.h:459 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "" -"&Seguir a ligazón simbólica e eliminar o contido do cartafol de destino" +"Seguir a ligazón simbólica e eliminar o contido do carta&fol de destino" -#: resources.h:769 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" -msgstr "&Obter o número externo de IP do URL seguinte:" +msgstr "Obter o enderezo IP externo do se&guinte URL:" -#: resources.h:561 +#: ../../locales/../src/interface/menu_bar.cpp:172 msgid "&Getting help..." -msgstr "&Buscar axuda..." +msgstr "&Obtendo axuda..." -#: resources.h:398 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" -msgstr "Marcador &global" +msgstr "Marcador glo&bal" -#: resources.h:805 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 usando o método CONNECT" -#: resources.h:557 +#: ../../locales/../src/interface/menu_bar.cpp:162 msgid "&Help" msgstr "&Axuda" -#: resources.h:523 resources.h:656 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:318 +#: ../../locales/../src/interface/menu_bar.cpp:94 msgid "&Hide identical files" -msgstr "&Ocultar ficheiros idénticos" +msgstr "Agochar ficheiros &idénticos" -#: resources.h:607 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:123 msgid "&Highest" msgstr "&Máxima" -#: resources.h:764 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "Porto máis &alto dispoñíbel:" -#: resources.h:79 resources.h:379 resources.h:728 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Servidor:" -#: resources.h:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" -msgstr "Prefixos binarios &IEC (por exemplo, 1KB = 1024 bytes)" +msgstr "Prefixos binarios &IEC (por exemplo: 1KB = 1024 bytes)" -#: resources.h:897 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (exemplo: 2007-09-15)" -#: resources.h:507 +#: ../../locales/../src/interface/menu_bar.cpp:58 msgid "&Import..." -msgstr "&Importación..." +msgstr "&Importar..." -#: resources.h:952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "Herdar as asociacións dos t&ipos de ficheiros do sistema" -#: resources.h:447 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 +msgid "&Install new version" +msgstr "&Instalar a nova versión" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Manter a estrutura da ruta local relativa á raíz de busca" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "&Manter a estrutura da ruta remota relativa á raíz de busca" -#: resources.h:870 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 +msgid "&Key file:" +msgstr "Ficheiro de &chave:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Distribución dos paneis dos ficheiros e dos cartafoles:" -#: resources.h:761 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Limitar os portos locais usados polo FileZilla" -#: resources.h:103 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Limitar o número de conexións simultáneas" -#: resources.h:529 +#: ../../locales/../src/interface/menu_bar.cpp:103 msgid "&Local directory tree" msgstr "Árbore do cartafo&l local" -#: resources.h:403 resources.h:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Cartafol local:" -#: resources.h:967 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "Busca &local" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Rexistro a ficheiro" -#: resources.h:83 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" -msgstr "&Tipo de acceso:" +msgstr "&Tipo de identificación:" -#: resources.h:382 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" -msgstr "&Modo de acceso:" +msgstr "&Modo de identificación:" -#: resources.h:610 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 msgid "&Low" msgstr "&Baixo" -#: resources.h:555 +#: ../../locales/../src/interface/menu_bar.cpp:156 msgid "&Manage bookmarks..." msgstr "&Xestionar os marcadores..." -#: resources.h:543 +#: ../../locales/../src/interface/menu_bar.cpp:133 msgid "&Manual transfer..." msgstr "&Transferencia manual..." -#: resources.h:104 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "Número &máximo de conexións:" -#: resources.h:746 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" -msgstr "&Número máximo de tentativas:" +msgstr "&Número máximo de intentos:" -#: resources.h:528 +#: ../../locales/../src/interface/menu_bar.cpp:102 msgid "&Message log" msgstr "&Rexistro de mensaxes" -#: resources.h:883 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Minimizar á bandexa" -#: resources.h:401 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +msgid "&Name sorting mode:" +msgstr "Modo de ordenación por &nome:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Nome:" -#: resources.h:512 +#: ../../locales/../src/interface/menu_bar.cpp:69 msgid "&Network configuration wizard..." msgstr "&Asistente para a configuración da rede..." -#: resources.h:216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Novo" -#: resources.h:72 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 msgid "&New Site" msgstr "&Novo Sitio" -#: ../../locales/../src/interface/updatewizard.cpp:1043 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "Hai unha &nova versión dispoñíbel!" -#: ../../locales/../src/interface/updatewizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Seguinte >" -#: resources.h:320 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Non" -#: resources.h:779 resources.h:804 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:146 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Ningún" -#: resources.h:609 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Normal" msgstr "&Normal" -#: resources.h:959 -msgid "&Number of days between update checks:" -msgstr "&Número de días entre as comprobacións de actualización:" - -#: resources.h:146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "Valor &numérico:" -#: resources.h:114 resources.h:127 resources.h:419 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&Aceptar" -#: resources.h:782 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" -msgstr "&Abrir" +msgstr "&ABRIR" -#: resources.h:571 resources.h:661 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:20 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:335 msgid "&Open" msgstr "&Abrir" -#: resources.h:58 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "S&obrescribir" -#: resources.h:102 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Pasivo" -#: resources.h:125 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Contrasinal:" -#: resources.h:617 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:166 msgid "&Play sound" msgstr "&Reproducir un son" -#: resources.h:80 resources.h:380 resources.h:732 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Porto:" -#: resources.h:876 -msgid "&Position of the message log:" -msgstr "&Posición do rexistro da mensaxe:" - -#: resources.h:539 +#: ../../locales/../src/interface/menu_bar.cpp:123 msgid "&Preserve timestamps of transferred files" msgstr "&Conservar a data e a hora nos ficheiros transferidos" -#: resources.h:302 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Cola de transferencia" -#: resources.h:734 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" -msgstr "Conexión rápida" +msgstr "Conexión &rápida" -#: resources.h:527 +#: ../../locales/../src/interface/menu_bar.cpp:101 msgid "&Quickconnect bar" msgstr "&Barra de conexión rápida" -#: resources.h:135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 +msgid "&Quickconnect history" +msgstr "Historial da &conexión rápida" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "Le&r" -#: resources.h:546 +#: ../../locales/../src/interface/menu_bar.cpp:141 msgid "&Reconnect" msgstr "&Reconectar" -#: resources.h:517 resources.h:678 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +msgid "&Reconnect information" +msgstr "Información de &reconexión" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 +#: ../../locales/../src/interface/menu_bar.cpp:80 msgid "&Refresh" msgstr "&Actualizar" -#: resources.h:126 -msgid "&Remember password for this session" -msgstr "&Lembrar o contrasinal para esta sesión" - -#: resources.h:493 -msgid "&Remember this and all future passwords" -msgstr "" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "Lemb&re o contrasinal mestre até que FileZilla estea pechado" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 +msgid "&Remember password until FileZilla is closed" +msgstr "&Lembrar o contrasinal até que FileZilla estea pechado" -#: resources.h:405 resources.h:411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Cartafol remoto:" -#: resources.h:369 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Ruta remota:" -#: resources.h:841 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "Busca &remota" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "Elimina&r" -#: resources.h:799 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" -msgstr "&Chave remota" +msgstr "&Eliminar chave" -#: resources.h:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:115 msgid "&Remove selected" msgstr "Elimina&r os seleccionados" -#: resources.h:75 resources.h:218 resources.h:416 resources.h:580 -#: resources.h:596 resources.h:646 resources.h:667 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:89 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Cambia&r o nome" -#: resources.h:202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Renomear..." -#: resources.h:325 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" -msgstr "&Volver a abrir o ficheiro local" +msgstr "&Reabrir o ficheiro local" -#: resources.h:832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" -msgstr "&Substituír os caracteres incorrectos con:" +msgstr "&Substituír os caracteres incompatíbeis con:" -#: resources.h:562 +#: ../../locales/../src/interface/menu_bar.cpp:173 msgid "&Report a bug..." msgstr "&Informar dun erro..." -#: resources.h:630 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:154 +msgid "&Request attention" +msgstr "Solicita&r atención" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "&Reset and requeue all" -msgstr "&Reiniciar e reestruturar a cola" +msgstr "&Reiniciar e reestruturar todo" -#: resources.h:727 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" msgstr "&Reiniciar o asistente" -#: resources.h:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "Continua&r" -#: resources.h:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:162 msgid "&Run command..." msgstr "Executa&r unha orde..." -#: resources.h:741 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Executar agora o asistente de configuración..." -#: resources.h:961 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Comprobar agora a existencia de actualizacións..." -#: resources.h:781 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" -msgstr "&Sitio" +msgstr "&SITIO" -#: resources.h:806 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: resources.h:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Gardar como..." -#: resources.h:433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" -msgstr "&Procurar" +msgstr "&Buscar" -#: resources.h:548 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "&Search remote files..." -msgstr "&Procurar ficheiros remotos..." +msgstr "&Buscar ficheiros..." -#: resources.h:71 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 msgid "&Select Entry:" msgstr "&Seleccionar entrada:" -#: resources.h:941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" -msgstr "&Seleccionar idioma:" +msgstr "&Seleccione o idioma:" -#: resources.h:357 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Seleccionar as columnas que se amosarán:" -#: resources.h:371 resources.h:544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/menu_bar.cpp:136 msgid "&Server" msgstr "&Servidor" -#: resources.h:301 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Configuración" -#: resources.h:514 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "&Settings..." msgstr "&Opcións..." -#: resources.h:976 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Amosar o menú de depuración" -#: resources.h:616 -msgid "&Show message" -msgstr "&Amosar a mensaxe" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +msgid "&Show detailed log" +msgstr "&Amosar o rexistro detallado" -#: resources.h:966 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" -msgstr "&Amosar as marcas de tempo no rexistro da mensaxe" +msgstr "&Amosar as marcas de tempo na mensaxe do rexistro" -#: resources.h:499 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 +msgid "&Site Manager entries" +msgstr "Entradas do xestor de &sitios" + +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "&Site Manager..." msgstr "Xestor dos &sitios..." -#: resources.h:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" -msgstr "&Marcador específico do sitio" +msgstr "Marcador &específico do sitio" -#: resources.h:64 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Saltar" -#: resources.h:542 +#: ../../locales/../src/interface/menu_bar.cpp:126 msgid "&Speed limits" -msgstr "&Límite de transferencia" +msgstr "&Límite de velocidade" -#: resources.h:450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "&Comezar a transferencia inmediatamente" -#: resources.h:875 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" -msgstr "&Mudar a orde dos paneis local e remoto" +msgstr "&Trocar a orde dos paneis local e remoto" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:211 +msgid "&TLS Ciphers" +msgstr "&TLS Ciphers" -#: ../../locales/../src/interface/netconfwizard.cpp:228 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Proba" -#: resources.h:889 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Tema:" -#: resources.h:532 +#: ../../locales/../src/interface/menu_bar.cpp:108 msgid "&Transfer" msgstr "&Tranferencia" -#: resources.h:99 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "Modo de &transferencia:" -#: resources.h:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/menu_bar.cpp:105 msgid "&Transfer queue" msgstr "&Cola de transferencias" -#: resources.h:844 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" -msgstr "&Tratar os ficheiros .dot como ficheiros ASCII" +msgstr "&Tratar os ficheiros punto como ficheiros ASCII" -#: resources.h:331 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "Confiar neste certificado nos nomes de alias al&ternativos listados." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Desfacer a edición" -#: resources.h:196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Actualizar a chave deste servidor memorizada na caché" -#: resources.h:565 resources.h:657 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 msgid "&Upload" msgstr "&Enviar" -#: resources.h:268 resources.h:856 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Enviar a:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 +msgid "&Upload..." +msgstr "&Enviar..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Envíos:" -#: resources.h:426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Usar un programa personalizado" -#: resources.h:94 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Usar un navegador sincronizado" -#: resources.h:945 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "U&sar o editor do sistema para os ficheiros de texto" -#: resources.h:767 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" -msgstr "&Usar o número de IP seguinte:" +msgstr "&Usar o seguinte enderezo IP:" -#: resources.h:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" -msgstr "&Usar, no seu lugar, o número de IP externo do servidor" +msgstr "&Usar, no seu lugar, o enderezo IP externo do servidor" -#: resources.h:912 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Usar o separador dos milleiros" -#: resources.h:84 resources.h:124 resources.h:383 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Usuario:" -#: resources.h:730 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "Nome de &usuario:" -#: ../../locales/../src/interface/updatewizard.cpp:1039 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Versión %s" -#: resources.h:516 +#: ../../locales/../src/interface/menu_bar.cpp:78 msgid "&View" msgstr "&Ver" -#: resources.h:588 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:384 msgid "&View/Edit" msgstr "&Ver/Editar" -#: resources.h:951 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" -"&Ver os ficheiros locais editados e solicitar permiso para subir as " +"&Ver os ficheiros locais alterados e solicitar permiso para subir as " "modificacións" -#: resources.h:136 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 +msgid "&When checking for updates, check for:" +msgstr "&Cando busque actualizacións, comprobar as:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Escribir" -#: resources.h:319 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Si" #: ../../locales/../src/engine/local_path.cpp:461 -#: ../../locales/../src/engine/local_path.cpp:511 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' non existe ou non se pode acceder a el." -#: ../../locales/../src/engine/local_path.cpp:477 -#: ../../locales/../src/engine/local_path.cpp:498 -#: ../../locales/../src/engine/local_path.cpp:505 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' non é un cartafol." -#: ../../locales/../src/interface/manual_transfer.cpp:445 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' non é un protocolo compatíbel." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" -msgstr "O tipo de sesión 'con conta' non é admisíbel co protocolo seleccionado" +msgstr "" +"O tipo de identificación «con conta» non é admisíbel co protocolo " +"seleccionado" + +#: ../../locales/../src/interface/manual_transfer.cpp:435 +msgid "" +"'Normal' and 'Account' logontypes are not available, using 'Ask for " +"password' instead." +msgstr "" +"Os inicios de sesión «Normal» e «Conta» non están dispoñíbeis, empregue " +"«Preguntar polo contrasinal» no seu lugar." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 +msgid "" +"'Normal' and 'Account' logontypes are not available. Your entry has been " +"changed to 'Ask for password'." +msgstr "" +"Os inicios de sesión «Normal» e «Conta» non están dispoñíbeis. A súa " +"preferencia mudou a «Preguntar polo contrasinal»." -#: ../../locales/../src/interface/Mainfrm.cpp:594 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " "command without the leading 'quote'." msgstr "" -"'quote' é, polo xeral, unha orde local que se usa nos clientes en liña para " -"enviar os argumentos seguidos de 'quote' ao servidor. É preferíbel " -"introducir a orde directamente sen 'quote'." +"«quote» é, polo xeral, unha orde local que se usa nos clientes en liña para " +"enviar os argumentos seguidos de «quote» ao servidor. É preferíbel inserir a " +"orde directamente sen «quote»." -#: ../../locales/../src/interface/filelist_statusbar.cpp:96 -#: ../../locales/../src/interface/filelist_statusbar.cpp:105 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d obxecto filtrado)" msgstr[1] "(%d obxectos filtrados)" -#: resources.h:816 resources.h:818 +#: ../../locales/../src/interface/update_dialog.cpp:313 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% descarado)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 para non limitar)" -#: resources.h:747 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: resources.h:749 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 segundos)" -#: resources.h:814 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: resources.h:743 -msgid "(5-9999, 0 to disable)" -msgstr "(5-9999, 0 para desactivar)" - -#: resources.h:960 -msgid "(At least 7 days)" -msgstr "(cando menos 7 días)" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, 0 para desactivar)" + +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 +#, c-format +msgid "(app-compat is set to %d.%d)" +msgstr "(app-compat está definido para %d.%d)" -#: resources.h:905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(exemplo: %H:%M)" -#: resources.h:899 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" -msgstr "(examplo: %Y-%m-%d)" +msgstr "(exemplo: %Y-%m-%d)" -#: resources.h:484 resources.h:486 resources.h:822 resources.h:824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(en %s/s)" -#: ../../locales/../src/interface/updatewizard.cpp:896 -msgid ", %H:%M:%S left" -msgstr ", %H:%M:%S restantes" - -#: ../../locales/../src/interface/updatewizard.cpp:900 -msgid ", --:--:-- left" -msgstr ", --:--:-- restantes" - -#: resources.h:715 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 msgid "-" msgstr "-" -#: resources.h:249 -msgid "- Broken router and/or firewall" -msgstr "- Rachou o enrutador e/ou a devasa" - -#: resources.h:250 -msgid "- File corrupted on mirror" -msgstr "- Ficheiro danado no servidor espello" - -#: resources.h:248 -msgid "- Malware on your system" -msgstr "- Software malicioso no sistema" - -#: ../../locales/../src/interface/statuslinectrl.cpp:236 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- faltan" -#: ../../locales/../src/interface/cmdline.cpp:80 +#: ../../locales/../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." msgstr "-c non se pode usar xunto cun URL de FTP." -#: ../../locales/../src/interface/cmdline.cpp:89 +#: ../../locales/../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." -msgstr "-l só se pode usar xunto cun FTP URL." +msgstr "-l só se pode usar xunto cun URL de FTP." -#: ../../locales/../src/interface/cmdline.cpp:68 +#: ../../locales/../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." msgstr "-s e -c non se poden presentar ao mesmo tempo." -#: ../../locales/../src/interface/cmdline.cpp:74 +#: ../../locales/../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." msgstr "-s non se pode empregar xunto cun URL de FTP." -#: resources.h:978 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Ningún" -#: resources.h:979 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1- Aviso" -#: resources.h:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Información" -#: resources.h:981 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Detallado" -#: ../../locales/../src/interface/aboutdialog.cpp:152 -msgid "32 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:108 +msgid "32-bit system" msgstr "Sistema de 32 bits" -#: resources.h:982 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" -msgstr "4 - Eliminación de erros" +msgstr "4 - Depurar" -#: ../../locales/../src/interface/aboutdialog.cpp:150 -msgid "64 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:105 +msgid "64-bit system" msgstr "Sistema de 64 bits" -#: ../../locales/../src/interface/updatewizard.cpp:28 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Volver" -#: resources.h:556 +#: ../../locales/../src/interface/menu_bar.cpp:160 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:108 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." -msgstr "" -"Xa existe un marcador co mesmo nome. Por tanto, debes escribir un outro nome." +msgstr "Xa existe un marcador co mesmo nome. Insira un nome sen usar." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Un certificado na cadea foi asinado usando un algoritmo inseguro" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." -msgstr "É necesario estabelecer un edior predeterminado." +msgstr "É necesario estabelecer un editor predeterminado." -#: ../../locales/../src/interface/RemoteListView.cpp:155 -#: ../../locales/../src/interface/RemoteTreeView.cpp:115 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Non se pode arrastrar un cartafol a un dous seus subcartafoles." -#: resources.h:687 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" "A few servers don't allow passive mode or are misconfigured. In such cases " "you would have to use active mode. In active mode, FileZilla opens a port " @@ -1202,29 +1349,21 @@ "configurados. En ambos os dous casos, terá que empregar o modo activo. Neste " "modo, o FileZilla abre un porto e consulta o servidor para se conectar." -#: resources.h:307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Hai cambios nun ficheiro que se abriu con anterioridade." -#: ../../locales/../src/interface/LocalListView.cpp:2069 -#, c-format -msgid "" -"A file with that name is already being edited. Do you want to reopen '%s'?" -msgstr "Xa se editou un ficheiro co mesmo nome. Quere abrir outra vez '%s'?" - -#: ../../locales/../src/interface/LocalListView.cpp:2065 -#: ../../locales/../src/interface/RemoteListView.cpp:2687 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." -msgstr "Xa se transferiu un ficheiro co mesmo nome." +msgstr "Xa se está a transferir un ficheiro co mesmo nome." -#: ../../locales/../src/interface/RemoteListView.cpp:2692 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" -"Xa se está a editar un ficheiro co mesmo nome. Debe pechalo e probar unha " -"outra vez." +"Continúa aberto un ficheiro co mesmo nome. Pécheo e inténteo outra vez." -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1232,32 +1371,40 @@ "Unless you fix this problem, files might be missing in the file listings.\n" "No further warning will be displayed this session." msgstr "" -"Non foi posíbel descodificar un ficheiro local.\n" +"Non se puido descodificar un nome de ficheiro local.\n" "Asegúrese de que a variábel de entorno LC_CTYPE (ou LC_ALL) está " "correctamente configurada.\n" "De non corrixir este problema, podería perder algúns ficheiros da lista.\n" "Non haberá avisos posteriores nesta sesión." -#: resources.h:238 -msgid "A newer version of FileZilla is available:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Non se pode recuperar un contrasinal mestre perdido! Memoríceo completamente." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 +msgid "A new version of FileZilla is available:" msgstr "Está dispoñíbel unha nova versión do FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:669 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." msgstr "" -"Un servidor axeitado sempre amosa todos os ficheiros, no entanto algúns " -"servidores avariados agochan algúns ficheiros. Use esta opción para obrigar " -"a que o servidor amose todos os ficheiros." +"Un servidor ben configurado sempre amosa todos os ficheiros, ora ben algúns " +"servidores mal configurados agochan algúns ficheiros. Use esta opción para " +"obrigar a que o servidor amose todos os ficheiros." -#: resources.h:759 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." msgstr "" -"Un servidor axeitado non require isto. Debe contactar coa administrador do " -"servidor se o precisar." +"Un servidor ben configurado non require isto. Debe contactar co " +"administrador do servidor se o precisar." #: ../../locales/../src/interface/state.cpp:284 msgid "" @@ -1269,156 +1416,175 @@ "Quere desactivar a navegación sincronizada e continuar mudando o cartafol " "local?" -#: resources.h:537 resources.h:671 resources.h:836 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:368 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 +#: ../../locales/../src/interface/menu_bar.cpp:119 msgid "A&SCII" -msgstr "A&CII" +msgstr "A&SCII" -#: resources.h:840 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "Enga&dir" -#: resources.h:867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "P&ermitir retomar ficheiros ASCII" -#: ../../locales/../src/interface/fileexistsdlg.cpp:114 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" msgstr "A&plicar só ás descargas" -#: ../../locales/../src/interface/fileexistsdlg.cpp:160 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" -msgstr "A&plicar soamente aos envíos" +msgstr "A&plicar só aos envíos" -#: resources.h:149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "A&plicar a todos os ficheiros e cartafoles" -#: resources.h:637 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:252 msgid "A&utomatically remove successful transfers" msgstr "Eliminar a&utomaticamente as transferencias completadas" -#: resources.h:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: resources.h:480 -msgid "Abort previous connection and connect in current tab" -msgstr "Cancelar a conexión anterior e conectar na lapela actual" - -#: resources.h:154 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Sobre o FileZilla" -#: resources.h:877 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Enriba da lista de ficheiros" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:161 -#: ../../locales/../src/interface/manual_transfer.cpp:194 -#: ../../locales/../src/interface/manual_transfer.cpp:560 -#: ../../locales/../src/interface/manual_transfer.cpp:561 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Non se puido restaurar o acceso a algúns cartafoles locais:" + +#: ../../locales/../src/engine/server.cpp:614 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Conta" -#: resources.h:612 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 msgid "Action after queue &completion" msgstr "Accións tras &completar a cola" -#: resources.h:330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Acción para o ficheiro seleccionado:" -#: resources.h:324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Acción para realizar:" -#: resources.h:57 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Acción:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:118 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 msgid "Active mode" msgstr "Modo activo" -#: ../../locales/../src/interface/netconfwizard.cpp:605 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "" -"Fallou a proba do modo activo do FTP. O FileZilla descoñece o número " +"Fallou a proba do modo activo do FTP. O FileZilla descoñece o enderezo " "correcto do IP externo." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." msgstr "" -"Fallou a proba do modo activo de FTP. O FileZilla descoñece o número " -"correcto do IP externo. Para alén diso, o seu enrutador modificou o enderezo " -"de envío." +"Fallou a proba do modo activo de FTP. O FileZilla descoñece o enderezo " +"correcto do IP externo. Alén diso, o seu encamiñador modificou o enderezo de " +"envío." -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " "address." msgstr "" -"Fallou a proba do modo activo de FTP. O FileZilla coñece o número correcto " -"do IP externo mais o seu enrutador ou a súa devasa modificou o enderezo de " +"Fallou a proba do modo activo de FTP. O FileZilla coñece o enderezo correcto " +"do IP externo mais o seu encamiñador ou a súa devasa modificou o enderezo de " "envío." -#: resources.h:772 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP do modo activo" -#: resources.h:451 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" -msgstr "Soamente engadir &ficheiros á cola" +msgstr "Engadir &ficheiros só á cola" -#: resources.h:641 resources.h:660 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:331 msgid "Add selected directory to the transfer queue" msgstr "Engadir o cartafol seleccionado á fila de transferencia" -#: resources.h:568 resources.h:585 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 msgid "Add selected files and folders to the transfer queue" msgstr "" "Engadir os ficheiros e cartafoles seleccionados á cola de transferencia" -#: resources.h:932 resources.h:938 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Engadir á cola" -#: ../../locales/../src/engine/proxy.cpp:451 +#: ../../locales/../src/engine/proxy.cpp:509 msgid "Address type not supported" msgstr "O tipo de enderezo non é compatíbel" -#: resources.h:88 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" -msgstr "Avanzadas" +msgstr "Avanzado" -#: resources.h:235 -msgid "Advanced options:" -msgstr "Opcións avanzadas:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 +msgid "" +"Advice: Unless you want to test new features, please keep using stable " +"versions only. Beta versions and nightly builds are development versions " +"meant for testing purposes. Nightly builds of FileZilla may not work as " +"expected and might even damage your system. Use beta versions and nightly " +"builds at your own risk." +msgstr "" +"Consello: A non ser que queira probar novas funcións, siga empregando só " +"versións estábeis. As versións beta e versións nocturnas son versións de " +"desenvolvemento destinadas a probas. As construcións nocturnas do FileZilla " +"poden non funcionar como se espera e pode até apedrar o sistema. Empregue " +"versións beta e compilacións nocturnas baixo o seu propio risco." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 +msgid "Al&ways perform this action" +msgstr "Us&ar sempre esta acción" -#: resources.h:339 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritmo:" -#: ../../locales/../src/interface/QueueView.cpp:3139 +#: ../../locales/../src/interface/QueueView.cpp:2663 msgid "All files have been successfully transferred" -msgstr "Todos os ficheiros se transferiron correctamente" +msgstr "Transferíronse correctamente todos os ficheiros" -#: resources.h:716 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 msgid "All ports in the given range have to be between 1024 and 65535." msgstr "" "Todos os portos do intervalo dado teñen de estar entre o 1024 e o 65535." -#: ../../locales/../src/interface/QueueView.cpp:3135 +#: ../../locales/../src/interface/QueueView.cpp:2659 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1427,19 +1593,25 @@ msgstr[1] "" "Remataron todas as transferencias. %d ficheiros non se puideron transferir." -#: resources.h:755 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Permitir volver a outro modo de trans&ferencia se falla" -#: resources.h:691 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" msgstr "Permitir volver a outro modo de transferencia se falla" -#: resources.h:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Xa está conectado" -#: resources.h:800 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 +msgid "Alternative name:" +msgid_plural "Alternative names:" +msgstr[0] "Nome alternativo:" +msgstr[1] "Nomes alternativos:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1447,41 +1619,46 @@ "De xeito alternativo, pode empregar a ferramenta Pageant de PuTTY para " "xestionar as chaves; o FileZilla recoñece Pageant." -#: resources.h:801 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." msgstr "" "De xeito alternativo pode empregar o axente de SSH do sistema. Para o facer, " -"cómpre asegurarse que a variábel de contorno SSH_AUTH_SOCK está configurada." +"precisa asegurarse que a variábel de contorno SSH_AUTH_SOCK está configurada." -#: ../../locales/../src/interface/updatewizard.cpp:1097 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" -"Alternatively, visit https://filezilla-project.org/ to download the most " -"recent version." +"Alternatively, you can also download the latest version from the FileZilla " +"website:" msgstr "" -"De xeito alternativo, pode visitar https://filezilla-project.org/ para " -"descargar a versión máis recente." +"Alternativamente, tamén pode descargar a última versión do sitio web de " +"FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:2051 +#: ../../locales/../src/interface/QueueView.cpp:1667 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" "Some queue items might not have been restored." msgstr "" -"Produciuse un erro ao cargar a cola de transferencia de \"%s\".\n" -"Algúns ítems da cola non se puideron restaurar." +"Produciuse un erro ao cargar a cola de transferencia de «%s».\n" +"Algúns elementos da cola non se puideron restaurar." -#: ../../locales/../src/interface/QueueView.cpp:1950 +#: ../../locales/../src/interface/QueueView.cpp:1559 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" "Some queue items might not have been saved." msgstr "" -"Produciuse un erro ao cargar a cola de transferencia de \"%s\".\n" -"Algúns ítems da cola non se puideron gardar." +"Produciuse un erro ao cargar a cola de transferencia de «%s».\n" +"Algúns elementos da cola non se puideron gardar." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" +"Un emisor da cadea de certificados non é unha autoridade de certificación" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1489,195 +1666,200 @@ "Un elemento co mesmo nome que o do ficheiro traído xa existe na localización " "de destino." -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/manual_transfer.cpp:159 -#: ../../locales/../src/interface/manual_transfer.cpp:197 -#: ../../locales/../src/interface/manual_transfer.cpp:213 -#: ../../locales/../src/interface/manual_transfer.cpp:559 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Anónimo" -#: ../../locales/../src/interface/state.cpp:1031 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Está en curso outra operación remota, polo que non se pode mudar o cartafol " "agora." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:785 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." -msgstr "Non se pode gardar ningún cambio realizado no Xestor de sitios." +msgstr "Non se pode gardar ningún cambio realizado no xestor de sitios." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:730 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"Non se gardará ningún cambio realizado no Xestor de sitios, a non ser que " -"repare o ficheiro." - -#: ../../locales/../src/interface/filter.cpp:209 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Non se puido gardar ningún cambio realizado nos filtros." -#: ../../locales/../src/interface/filter.cpp:1044 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Non se gardará ningún cambio realizado nos filtros." -#: resources.h:151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Ap&licar só aos cartafoles" -#: resources.h:214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Aplicar" -#: resources.h:66 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Aplicar á &cola actual saomente" -#: resources.h:150 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Aplicar só aos &ficheiros" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 -#: ../../locales/../src/interface/updatewizard.cpp:322 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Ficheiro" -#: resources.h:879 +#: ../../locales/../src/engine/socket.cpp:1107 +msgid "Argument buffer overflow" +msgstr "Desbordamento da memoria intermedia de argumento" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Como lapela no panel da cola de transferencias" -#: resources.h:260 resources.h:270 resources.h:848 resources.h:857 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Preguntar pola acción" -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:873 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/engine/server.cpp:605 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Preguntar polo contrasinal" -#: resources.h:712 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." msgstr "Solicitarlle un porto ao sistema operativo." -#: resources.h:702 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" -msgstr "Solicitar o número de IP externo ao sistema operativo" +msgstr "Solicitar o enderezo IP externo ao sistema operativo" -#: resources.h:472 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Formule as súas preguntas nos foros do FileZilla" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 msgid "Associated program not found:" msgstr "Non se achou o programa asociado:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Cando menos, non se completou unha condición de filtro" -#: resources.h:721 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 msgid "At this point, all required information has been gathered." msgstr "Chegados a este punto, recolleuse toda a información requirida." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atributos" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Fallou a autenticación." -#: resources.h:890 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Autor:" -#: resources.h:387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Auto" -#: resources.h:838 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Clasificación automática do tipo de ficheiro" -#: resources.h:957 -msgid "Automatic update check" -msgstr "Comprobación automática de ficheiros" - -#: resources.h:894 -msgid "Available sizes" -msgstr "Tamaños dispoñíbeis" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:129 -#: ../../locales/../src/engine/sizeformatting_base.cpp:188 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: resources.h:90 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" -msgstr "Evitar &proxy" +msgstr "Evitar o &proxy" + +#: ../../locales/../src/engine/socket.cpp:1071 +msgid "Bad file descriptor" +msgstr "Descritor de ficheiro incorrecto" -#: resources.h:468 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Instrucións de uso básico" -#: resources.h:881 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Comportamento" -#: ../../locales/../src/interface/edithandler.cpp:1262 -#: ../../locales/../src/interface/edithandler.cpp:1290 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "En edición" -#: resources.h:626 -msgid "Benchmark string coalescer" -msgstr "Clasificar a fusión de cadeas" - -#: ../../locales/../src/engine/tlssocket.cpp:903 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Atención! O certificado foi revogado" -#: resources.h:391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binario" -#: resources.h:874 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Cadro negro" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:272 -#: ../../locales/../src/interface/menu_bar.cpp:313 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:395 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Azul" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:434 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Marcador" -#: resources.h:414 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Marcador:" -#: resources.h:413 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Marcadores" -#: resources.h:162 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 +msgid "Browse..." +msgstr "Explorar..." + +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Non se atopou o contedor" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Data da compilación:" -#: resources.h:159 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Información da compilación" -#: ../../locales/../src/interface/verifycertdialog.cpp:178 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Categoría de negocio:" -#: resources.h:762 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1685,80 +1867,117 @@ msgstr "" "De modo predeterminado, emprégase calquera porto local dispoñíbel para " "estabelecer as transferencias en modo activo. Se desexa limitar o uso a un " -"pequeno intervalo de portos, debe introducilo a continuación." +"pequeno intervalo de portos, debe inserilo a continuación." -#: resources.h:545 +#: ../../locales/../src/interface/menu_bar.cpp:138 msgid "C&ancel current operation" msgstr "C&ancelar a operación actual" -#: resources.h:237 -msgid "C&heck for nightly builds of FileZilla" -msgstr "Pro&curar versións de desenvolvemento do FileZilla" - -#: resources.h:623 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "C&lear all" msgstr "&Limpar todo" -#: resources.h:598 resources.h:648 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:93 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:289 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:390 msgid "C&opy URL(s) to clipboard" -msgstr "C&opiar URL ao portapapeis" +msgstr "C&opiar o URL ao portapapeis" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "C&opy URL(s) with password to clipboard" +msgstr "C&opiar o(s) URL(s) con contrasinal ao portapapeis" -#: resources.h:898 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "Personaliz&zado" -#: resources.h:953 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Aso&ciacións de tipos de ficheiros personalizadas:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1633 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 +msgid "CPU features:" +msgstr "Características da CPU:" + +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Estase a calcular a diferenza coa zona horaria do servidor..." -#: ../../locales/../src/engine/transfersocket.cpp:733 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Non se pode ler do ficheiro" -#: ../../locales/../src/engine/transfersocket.cpp:712 -#: ../../locales/../src/engine/transfersocket.cpp:786 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Non se pode escribir o ficheiro." -#: ../../locales/../src/engine/transfersocket.cpp:710 -#: ../../locales/../src/engine/transfersocket.cpp:784 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" -msgstr "Non se poden escribir os datos no ficheiro: %s" +msgstr "Non se pode escribir os datos no ficheiro: %s" -#: resources.h:25 resources.h:69 resources.h:115 resources.h:153 -#: resources.h:185 resources.h:213 resources.h:230 resources.h:281 -#: resources.h:290 resources.h:297 resources.h:305 resources.h:328 -#: resources.h:361 resources.h:394 resources.h:408 resources.h:420 -#: resources.h:430 resources.h:453 resources.h:462 resources.h:481 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Cancelar" -#: resources.h:1000 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Cancelar a operación actual" -#: resources.h:1001 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Cancela a operación actual" -#: ../../locales/../src/engine/local_path.cpp:471 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Non se pode acceder a '%s', xa que ben non se inseriu ningún soporte ou ben " "a unidade non está preparada." -#: ../../locales/../src/interface/Mainfrm.cpp:564 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" -msgstr "Non se pode engadir o servidor ao Xestor de sitios" +msgstr "Non se pode engadir o servidor ao xestor de sitios" + +#: ../../locales/../src/engine/socket.cpp:1124 +msgid "Cannot assign requested address" +msgstr "Non se puido asignar o enderezo solicitado" + +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Non se puido cambiar o cartafol, xa existe unha operación de navegación " +"sincronizada en progreso." -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1771,33 +1990,31 @@ "Cannot compare directories, different filters for local and remote " "directories are enabled" msgstr "" -"Non se poden comparar os cartafoles pois están estabelecidos diferentes " +"Non se pode comparar os cartafoles pois están estabelecidos diferentes " "filtros para os cartafoles local e remoto" -#: ../../locales/../src/interface/RemoteListView.cpp:2791 -msgid "Cannot compare directories, not connected to a server." -msgstr "Non se puido comparar os cartafoles pois non hai conexión co servidor." - -#: ../../locales/../src/interface/filteredit.cpp:141 +#: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Non se pode crear o novo filtro" -#: ../../locales/../src/interface/LocalListView.cpp:2047 -#: ../../locales/../src/interface/LocalListView.cpp:2178 -#: ../../locales/../src/interface/RemoteListView.cpp:2621 -#: ../../locales/../src/interface/RemoteListView.cpp:2667 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" -msgstr "Non se pode editar o ficheiro" +msgstr "Non se pode modificar o ficheiro" -#: ../../locales/../src/interface/LocalListView.cpp:1963 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." -msgstr "Non se pode editar o ficheiro pois hai conexión con ningún servidor." +msgstr "" +"Non se pode modificar o ficheiro pois non hai conexión con ningún servidor." -#: ../../locales/../src/interface/LocalListView.cpp:1974 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." -msgstr "Non se pode editar o ficheiro porque se descoñece a ruta remota." +msgstr "Non se pode modificar o ficheiro porque se descoñece a ruta remota." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1805,545 +2022,674 @@ "Non se pode estabelecer unha conexión FTP cun servidor de SFTP. Escolla o " "protocolo axeitado." -#: ../../locales/../src/interface/quickconnectbar.cpp:37 -#: ../../locales/../src/interface/quickconnectbar.cpp:55 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Non se pode cargar a barra de conexión rápida do ficheiro de recurso" - -#: ../../locales/../src/interface/import.cpp:38 -msgid "Cannot load file, not a valid XML file." -msgstr "Non se pode cargar o ficheiro pois non é un XML correcto." - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 -msgid "Cannot load keyfile" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 +msgid "Cannot load key file" msgstr "Non se pode cargar o ficheiro de chaves" -#: ../../locales/../src/interface/Mainfrm.cpp:1066 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Non se pode cargar a barra de ferramentas do ficheiro de recurso" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181 +#: ../../locales/../src/interface/manual_transfer.cpp:439 +msgid "Cannot remember password" +msgstr "Non lembrar o contrasinal" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" -msgstr "Non se pode cambiar o nome da entrada" +msgstr "Non se pode renomear a entrada" -#: ../../locales/../src/interface/RemoteListView.cpp:1907 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Non se pode renomear o ficheiro" -#: ../../locales/../src/interface/filter.cpp:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../../locales/../src/engine/proxy.cpp:136 +msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." +msgstr "" +"Non se puido resolver o nome do servidor á dirección IPv4 para usar co proxy " +"SOCKS4." + +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Non se pode gardar o conxunto de filtros" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Non se pode seleccionar o filtro" -#: ../../locales/../src/interface/edithandler.cpp:1640 -#: ../../locales/../src/interface/edithandler.cpp:1645 -#: ../../locales/../src/interface/edithandler.cpp:1684 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Non se pode estabelecer a asociación de ficheiros" -#: ../../locales/../src/interface/edithandler.cpp:1221 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Non se pode amosar o diálogo" -#: ../../locales/../src/interface/LocalListView.cpp:2065 -#: ../../locales/../src/interface/RemoteListView.cpp:2687 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" -msgstr "Non se pode ver/editar o ficheiro seleccionado" +msgstr "Non se pode ver/modificar o ficheiro seleccionado" + +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Sen diferenza entre maiúsculas e minúsculas" -#: resources.h:284 -msgid "Categories" -msgstr "Categorías" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 +msgid "Case insensitive" +msgstr "Sen diferenza entre maiúsculas e minúsculas" -#: ../../locales/../src/interface/statusbar.cpp:531 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 +msgid "Case insensitive (default)" +msgstr "Sen diferenza entre maiúsculas e minúsculas (predeterminado)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +msgid "Case sensitive" +msgstr "Con diferenza entre maiúsculas e minúsculas" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +msgid "Case sensitive (default)" +msgstr "Con diferenza entre maiúsculas e minúsculas (predeterminado)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 +msgid "Categories to clear" +msgstr "Categorías a limpar" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "O certificado e os datos de sesión xa non están dispoñíbeis." -#: resources.h:26 -msgid "Certificate details" -msgstr "Detalles do certificado" - -#: resources.h:3 resources.h:27 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 msgid "Certificate in chain:" msgstr "Certificado en cadea:" -#: resources.h:13 resources.h:37 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "Emisor do certificado" -#: resources.h:123 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Non se puido verificar a sinatura do certificado" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Desafío:" -#: resources.h:132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Cambiar os atributos do ficheiro" -#: resources.h:601 resources.h:651 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:298 msgid "Change the file permissions." msgstr "Cambiar os permisos do ficheiro." -#: resources.h:974 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Mudar a configuración do ficheiro de rexistro precisa reiniciar o FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Problema de codificación de caracteres" -#: resources.h:105 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Conxunto de caracteres" -#: resources.h:962 -msgid "Check for &beta versions and release candidates" -msgstr "Comprobar por versións &beta e publicacións candidatas" - -#: resources.h:558 +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for &updates..." msgstr "Comprobe se hai act&ualizacións..." -#: resources.h:559 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +msgid "Check for FileZilla &updates automatically:" +msgstr "Verificar at&ualizacións do FileZilla automaticamente:" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:4 +msgid "Check for Updates" +msgstr "Comproba se hai actualizacións" + +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for newer versions of FileZilla" msgstr "Comprobación de novas versións do FileZilla" -#: ../../locales/../src/interface/updatewizard.cpp:163 -msgid "Check for updates" -msgstr "Comprobación de actualizacións" - -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Fallou a comprobación de actualizacións" -#: ../../locales/../src/interface/netconfwizard.cpp:765 +#: ../../locales/../src/engine/ftp/logon.cpp:283 +msgid "" +"Check your login credentials. The entered password starts or ends with a " +"space character." +msgstr "" +"Comprobe as súas credenciais de identificación. O contrasinal inserido " +"comeza ou remata cun carácter de espazo." + +#: ../../locales/../src/engine/ftp/logon.cpp:279 +msgid "" +"Check your login credentials. The entered username starts or ends with a " +"space character." +msgstr "" +"Comprobe as súas credenciais de identificación. O nome de usuario inserido " +"comeza ou remata cun carácter de espazo." + +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" -msgstr "Comprobación para corrixir o número correcto de IP externo" +msgstr "Comprobación para corrixir o enderezo IP externo" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 +msgid "Checking for updates..." +msgstr "Comprobando se hai actualizacións..." -#: resources.h:233 -msgid "Checking for updates" -msgstr "Comprobación para as actualizacións" +#: ../../locales/../src/interface/updater.cpp:780 +#, c-format +msgid "Checksum match on file %s\n" +msgstr "A suma de comprobación coincide no ficheiro %s\n" + +#: ../../locales/../src/interface/updater.cpp:776 +#, c-format +msgid "Checksum mismatch on file %s\n" +msgstr "A suma de comprobación difire no ficheiro %s\n" -#: ../../locales/../src/interface/updatewizard.cpp:1241 -msgid "Checksum mismatch of downloaded file." -msgstr "Perdeuse a suma de comprobación do ficheiro descargado." +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 +msgid "Choose a key file" +msgstr "Escolla un ficheiro chave" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Escolla o cartafol local predeterminado" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:130 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:378 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Escolla o cartafol local" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:854 +#: ../../locales/../src/engine/http/request.cpp:670 msgid "Chunk data improperly terminated" msgstr "Os datos do fragmento rematan de xeito inapropiado" -#: resources.h:18 resources.h:42 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "Cifrado:" -#: resources.h:504 resources.h:676 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:408 +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Cl&ose tab" msgstr "Pechar lape&la" -#: resources.h:871 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Clásico" -#: resources.h:287 -msgid "Clear &Site Manager entries" -msgstr "Limpar as entradas do Xestor de &sitios" - -#: resources.h:624 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "Clear &layout cache" msgstr "Limpar a caché da &disposición" -#: resources.h:285 -msgid "Clear &quickconnect history" -msgstr "Limpar o historial da &conexión rápida" - -#: resources.h:286 -msgid "Clear &reconnect information" -msgstr "Limpar a información de &reconexión" - -#: resources.h:288 -msgid "Clear &transfer queue" -msgstr "Limpar a cola de &transferencias" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +msgid "Clear auto&update data" +msgstr "Limpar os datos de act&ualización automática" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Limpar o historial" -#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Limpar os datos privados" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Limpar a barra de conexión rápida" -#: resources.h:625 -msgid "Clear string coalescer" -msgstr "Limpar a fusión de cadeas" - -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Prema Rematar para gardar a configuración." -#: ../../locales/../src/interface/updatewizard.cpp:1096 -msgid "Click on next to download the new version." -msgstr "Prema seguinte para descargar a versión nova." - -#: resources.h:348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Cliente a servidor MAC:" -#: resources.h:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Cifrado cliente a servidor:" -#: resources.h:677 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Pechar" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:411 msgid "Close &all other tabs" msgstr "Pech&ar todas os outras lapelas" -#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1195 -#: ../../locales/../src/interface/Mainfrm.cpp:1218 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "Close FileZilla" msgstr "Pechar o FileZilla" -#: ../../locales/../src/interface/cmdline.cpp:14 +#: ../../locales/../src/interface/cmdline.cpp:15 msgid "Close all running instances of FileZilla" msgstr "Pechar todas as instancias a se executaren do FileZilla" -#: resources.h:505 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Pechar a busca rápida e continúe a comparar?" + +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Closes current tab" msgstr "Pecha a lapela actual" -#: resources.h:87 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Co&mentarios:" -#: ../../locales/../src/interface/listctrlex.cpp:761 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Propiedades da columna" -#: resources.h:355 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Configuración da columna" -#: resources.h:948 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." -msgstr "A orde e os seus argumentos han de estar correctamente entre comiñas." +msgstr "A orde e os seus argumentos han de estar entre vírgulas." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Fallou a orde" -#: ../../locales/../src/engine/proxy.cpp:448 +#: ../../locales/../src/engine/proxy.cpp:506 msgid "Command not supported" msgstr "A orde non é compatíbel" -#: ../../locales/../src/engine/engineprivate.cpp:183 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "A orde non é compatíbel con este protocolo" -#: ../../locales/../src/engine/logging.cpp:214 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:336 -#: ../../locales/../src/interface/updatewizard.cpp:541 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Orde:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Comentario" -#: ../../locales/../src/interface/verifycertdialog.cpp:176 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Nome común:" -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:441 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "" -"A comunicación foi interferida polo enrutador ou a devasa de protección" +"A comunicación foi interferida polo encamiñador ou a devasa de protección" -#: resources.h:522 resources.h:655 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/menu_bar.cpp:92 msgid "Compare &modification time" msgstr "Comparar o tempo de &modificación" -#: resources.h:521 resources.h:654 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/menu_bar.cpp:91 msgid "Compare file&size" msgstr "Comparar o ta&maño do ficheiro" -#: resources.h:928 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Lími&te de comparación (en minutos):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "A árbore de comparación precisa estar entre 0 e 1440 minutos." -#: resources.h:160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Compilado por:" -#: resources.h:161 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Compilado en:" -#: resources.h:163 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Compilado con:" -#: resources.h:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Bandeiras do compilador:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Comprimido" -#: resources.h:812 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Transferencias simultáneas" -#: resources.h:225 resources.h:439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" -msgstr "As condicións distinguen entre maiúsculas e minúsculas" +msgstr "As condicións distinguen entre m&aiúsculas e minúsculas" -#: resources.h:720 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" msgstr "Proba de configuración" -#: resources.h:694 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:115 msgid "Configure passive mode" msgstr "Configurar o modo pasivo" -#: resources.h:710 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 msgid "Configure port range" -msgstr "Configura o rango do porto" +msgstr "Configuración do rango do porto" -#: resources.h:469 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Configurando o FileZilla e a rede" -#: ../../locales/../src/interface/search.cpp:1033 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Confirmar o borrado" -#: ../../locales/../src/engine/local_filesys.cpp:136 -#: ../../locales/../src/interface/LocalListView.cpp:2018 -#: ../../locales/../src/interface/LocalListView.cpp:2138 -#: ../../locales/../src/interface/RemoteListView.cpp:1713 -#: ../../locales/../src/interface/RemoteListView.cpp:2638 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1638 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" -msgstr "Requirese a confirmación" +msgstr "Requírese a confirmación" -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Parabéns, semella que a configuración funciona correctamente." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" -msgstr "Conectar enviando os axustes do próxy" +msgstr "Conectar enviando os axustes do proxy" + +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Fallou a conexión: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 +msgid "Connect in current tab" +msgstr "Conectar na lapela actual" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +msgid "Connect in new tab" +msgstr "Conectar nunha nova lapela" #: ../../locales/../src/interface/cmdline.cpp:8 msgid "Connect to specified Site Manager site" msgstr "Conectar a un sitio específico do xestor de sitios" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933 -msgid "Connected" -msgstr "Conectado" - -#: ../../locales/../src/interface/QueueView.cpp:1454 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Estase a conectar" -#: ../../locales/../src/interface/netconfwizard.cpp:207 -#: ../../locales/../src/interface/statuslinectrl.cpp:275 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Estase a conectar a %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1163 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format -msgid "Connecting to %s through proxy" -msgstr "Estase a conectar a %s a través do prxy" +msgid "Connecting to %s through %s proxy" +msgstr "Estase a conectar a %s a traveso do proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1034 -#: ../../locales/../src/engine/proxy.cpp:172 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:394 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Estase a conectar a %s..." -#: ../../locales/../src/interface/updatewizard.cpp:424 -#: ../../locales/../src/interface/updatewizard.cpp:998 -msgid "Connecting to server" -msgstr "Estase a conectar ao servidor" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 msgid "Connection" msgstr "Conexión" -#: ../../locales/../src/interface/QueueView.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1085 +msgid "Connection aborted" +msgstr "Cancelouse a conexión" + +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Fallou o intento de conexión" -#: ../../locales/../src/engine/ControlSocket.cpp:1039 -#: ../../locales/../src/engine/proxy.cpp:176 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:208 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" -"Fallou o intento de conexión con \"%s\"; tentando co seguinte enderezo." +"Fallou o intento de conexión con «%s»; intentando co seguinte enderezo." -#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." -msgstr "Fallou o intento de conexión con \"%s\"." +msgstr "Fallou o intento de conexión con «%s»." -#: ../../locales/../src/engine/ControlSocket.cpp:186 -#: ../../locales/../src/engine/engineprivate.cpp:320 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" -msgstr "O ususario interropeu a conexión" +msgstr "O usuario interrompeu a conexión" -#: ../../locales/../src/interface/netconfwizard.cpp:543 +#: ../../locales/../src/engine/socket.cpp:1078 +msgid "Connection attempt timed out" +msgstr "O intento de conexión caducou" + +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Pechouse a conexión" -#: ../../locales/../src/engine/ControlSocket.cpp:1132 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:305 +#: ../../locales/../src/engine/http/request.cpp:318 +#: ../../locales/../src/engine/http/request.cpp:329 +#: ../../locales/../src/engine/http/request.cpp:340 msgid "Connection closed by server" msgstr "Pechouse a conexión polo servidor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:305 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "Estabeleceuse a conexión; estase a iniciar o TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:340 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "Estabeleceuse a conexión; estase a enviar a solicitude de HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Estabeleceuse a conexión; estase a agardar pola mensaxe de benvida." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Estabeleceuse a conexión; estase a agardar pola mensaxe de benvida..." -#: ../../locales/../src/interface/netconfwizard.cpp:338 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Perdeuse a conexión" -#: ../../locales/../src/engine/proxy.cpp:433 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "Connection not allowed by ruleset" msgstr "A conexión non está permitida polo conxunto de regras" -#: ../../locales/../src/engine/proxy.cpp:442 +#: ../../locales/../src/engine/proxy.cpp:500 msgid "Connection refused" msgstr "Conexión rexeitada" -#: ../../locales/../src/engine/ControlSocket.cpp:681 -msgid "Connection timed out" -msgstr "Execedeuse o tempo de conexión" +#: ../../locales/../src/engine/socket.cpp:1072 +msgid "Connection refused by server" +msgstr "A conexión foi rexeitada polo servidor" + +#: ../../locales/../src/engine/socket.cpp:1081 +msgid "Connection reset by network" +msgstr "Reinicio da conexión pola rede" + +#: ../../locales/../src/engine/socket.cpp:1086 +msgid "Connection reset by peer" +msgstr "Reinicio da conexión polo par" + +#: ../../locales/../src/engine/ControlSocket.cpp:516 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "A conexión caducou despois de %d segundo de inactividade" +msgstr[1] "A conexión caducou despois de %d segundos de inactividade" -#: ../../locales/../src/interface/netconfwizard.cpp:1070 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." -msgstr "Execedeuse o tempo de conexión." +msgstr "Excedeuse o tempo de conexión." -#: ../../locales/../src/interface/search.cpp:676 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Perdeuse a conexión co servidor." -#: ../../locales/../src/engine/proxy.cpp:188 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." -msgstr "Estabeleceuse a conexión co próxy; estase a realizar a negociación..." +msgstr "Estabeleceuse a conexión co proxy; estase a realizar a negociación..." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "A conexión co servidor pechouse permanentemente." -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." -msgstr "Fallou a conexión co servidor de prova." +msgstr "Fallou a conexión co servidor de proba." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" -msgstr "Converter o ficheiro de chaves" - -#: resources.h:77 resources.h:418 -msgid "Cop&y" -msgstr "Cop&iar" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 +msgid "Convert key file" +msgstr "Converter o ficheiro chave" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:651 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Copia (%d) de %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:628 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "Copia de %s" -#: resources.h:599 resources.h:649 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:98 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:294 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Copiar os URLs dos elementos seleccionados ao portapapeis, incluíndo o " +"contrasinal." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:94 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 msgid "Copy the URLs of the selected items to clipboard." -msgstr "Copiar os URL dos elementos seleccionados ao portapapeis." +msgstr "Copiar os URLs dos elementos seleccionados ao portapapeis." -#: ../../locales/../src/engine/transfersocket.cpp:207 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Non se puido aceptar a conexión: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Non se puido aceptar a conexión: %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Non se puido engadir o certificado á lista de confianza temporal" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Non se puido engadir a conexión ao xestor do sitio" -#: ../../locales/../src/engine/ControlSocket.cpp:188 +#: ../../locales/../src/interface/state.cpp:868 +msgid "Could not complete operation" +msgstr "Non se puido completar a operación" + +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" -msgstr "Non se puido conectar ó servidor" +msgstr "Non se puido conectar co servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1205 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" -msgstr "Non se puido conectar ó servidor: %s" +msgstr "Non se puido conectar co servidor: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" -msgstr "Non foi posíbel converter a orde á codificación do servidor" +msgstr "Non se puido converter a orde á codificación do servidor" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Non se puido converter a chave privada" -#: ../../locales/../src/interface/RemoteListView.cpp:3072 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1452 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" -msgstr "Non se puido copiar os URL" +msgstr "Non se puido copiar os URLs" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Non se puido copiar o certificado" -#: ../../locales/../src/interface/aboutdialog.cpp:227 +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Non se puido copiar os datos" -#: ../../locales/../src/interface/RemoteListView.cpp:2560 -#: ../../locales/../src/interface/RemoteTreeView.cpp:897 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Non se puido crear o CFURL da ruta %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Non se puido crear un URI para esta transferencia." + +#: ../../locales/../src/interface/updater.cpp:511 +#, c-format +msgid "Could not create local file %s\n" +msgstr "Non se puido crear o ficheiro local %s\n" + +#: ../../locales/../src/engine/logging.cpp:179 +#, c-format +msgid "Could not create logging mutex: %s" +msgstr "Non se puido crear o rexistro de exclusión mutua (mutex): %s" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Non se puido crear o marcador favorito de seguridade desde o URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2353,11 +2699,11 @@ "O a extensión de interpretación de ordes non está instalada correctamente ou " "non soltou os ficheiros nunha ventá do explorador." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Non se puido estabelecer a conexión co servidor" -#: ../../locales/../src/interface/FileZilla.cpp:486 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2370,11 +2716,16 @@ "ordes '--datadir ' ou estabelecendo a variábel de contorno " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." -msgstr "Non foi posíbel xerar unha secuencia de rexistro personalizada." +msgstr "Non se puido xerar unha secuencia de rexistro personalizada." -#: ../../locales/../src/engine/tlssocket.cpp:1033 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Non se puido xerar a chave" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2382,7 +2733,7 @@ "Non se puido obter un nome diferente do emisor do certificado, fallou " "gnutls_x509_get_issuer_dn" -#: ../../locales/../src/engine/tlssocket.cpp:1008 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2390,394 +2741,491 @@ "Non se puido obter un nome diferente do asunto do certificado, fallou " "gnutls_x509_get_dn" -#: ../../locales/../src/interface/state.cpp:1015 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Non se puido obter a ruta remota completa." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Non se puido obter a ruta nativa de CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Non se puido obter a ruta do URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Non se obtivo resposta de fzputtygen." -#: ../../locales/../src/interface/RemoteListView.cpp:2621 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." -msgstr "Non foi posíbel obter un cartafol temporal para descargar o ficheiro." +msgstr "Non se puido obter un cartafol temporal para descargar o ficheiro." -#: ../../locales/../src/engine/tlssocket.cpp:961 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "Non se puido importar o certificado, fallou gnutls_x509_crt_import" - -#: ../../locales/../src/engine/tlssocket.cpp:954 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Non se puido iniciar a estrutura para certificados, fallou " -"gnutls_x509_crt_init" +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Non se puido inicializar Winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:119 -#: ../../locales/../src/interface/import.cpp:310 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " "accessed.\n" "Any changes made in the Site Manager will not be saved." msgstr "" -"Non se puido cargar \"%s\", por favor asegúrese de que o ficheiro é correcto " -"e se pode acceder.\n" +"Non se puido cargar «%s», por favor asegúrese de que o ficheiro é correcto e " +"se pode acceder.\n" "Calquera cambio que se fixer no xestor de sitios non se gardará." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223 -msgid "Could not load keyfile" -msgstr "Non se puido cargar o ficheiro de chaves" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 +msgid "Could not load key file" +msgstr "Non se puido cargar o ficheiro chave" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Non se puido cargar a chave privada" -#: ../../locales/../src/interface/state.cpp:1041 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -"Non se puido obter o cartafol local correspondente co cartafol remoto: '%" -"s'.\n" +"Non se puido obter o cartafol local correspondente co cartafol remoto: " +"'%s'.\n" "Quere desactivar a sincronización da navegación remota e continuar cambiando " "o cartafol remoto?" -#: ../../locales/../src/interface/state.cpp:381 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" "Non se puido obter o cartafol local correspondente co cartafol remoto '%s'.\n" "Desactivouse a navegación sincronizada." -#: ../../locales/../src/interface/state.cpp:295 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" -"Could not obtain corresponding remote directory for the local directory '%" -"s'.\n" +"Could not obtain corresponding remote directory for the local directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" "Non se puido obter o cartafol remoto correspondente co cartafol local '%s'.\n" "A navegación sincronizada foi desactivada." -#: ../../locales/../src/interface/aboutdialog.cpp:227 -#: ../../locales/../src/interface/RemoteListView.cpp:3072 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1452 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Non se puido obter o tamaño de «%s»" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Non se puido abrir «%s»" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Non se puido abrir o portapapeis" -#: ../../locales/../src/engine/logging.cpp:208 -#: ../../locales/../src/engine/logging.cpp:276 -#: ../../locales/../src/engine/logging.cpp:307 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Non se puido abrir o ficheiro de rexistro: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Non se puido analizar a ruta remota." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Non se puido interpretar o enderezo do servidor:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225 +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Non se puido ler de «%s»" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "Non se puido ler da toma (socket) de datos." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:382 #, c-format msgid "Could not read from socket: %s" -msgstr "Non se ler do sócket: %s" +msgstr "Non se puido ler da toma (socket): %s" -#: ../../locales/../src/interface/sitemanager.cpp:487 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Non se puido ler o elemento do servidor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2705 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Non se puido chegar á posición %s no ficheiro" +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Non se puido recibir datos do servidor." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Non se puido restaurar o acceso ao cartafol" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Non se puido atopar a compensación %d dentro do ficheiro" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Non se puido buscar até o comezo do ficheiro" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2638 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" -msgstr "Non se puido buscar ata o remate do ficheiro" +msgstr "Non se puido buscar até o remate do ficheiro" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Non se puido enviar a orde a fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2736 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Non se puido enviar a orde a fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Non se puido ordenar os certificados dos pares" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "Non se puido crear o fío de entrada e de saída" -#: ../../locales/../src/engine/ControlSocket.cpp:1178 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Non se puido iniciar a negociación co proxy: %s" -#: ../../locales/../src/interface/QueueView.cpp:1121 -#: ../../locales/../src/interface/QueueView.cpp:1126 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Non se puido iniciar a transferencia" -#: ../../locales/../src/interface/sitemanager.cpp:657 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" -"Could not write \"%s\", any changes to the Site Manager could not be saved: %" -"s" +"Could not write \"%s\", any changes to the Site Manager could not be saved: " +"%s" msgstr "" -"Non se puido escribir \"%s\", non se puideron gardar os cambios no xestor de " +"Non se puido escribir «%s», non se puideron gardar os cambios no xestor de " "sitios: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:858 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" -msgstr "Non se puido escribir \"%s\", o marcador non se puido engadir: %s" +msgstr "Non se puido escribir «%s», o marcador non se puido engadir: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:330 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" -msgstr "" -"Non se puido escribir \"%s\", o marcador global non se puido gardar: %s" +msgstr "Non se puido escribir «%s», o marcador global non se puido gardar: %s" -#: ../../locales/../src/interface/QueueView.cpp:1985 +#: ../../locales/../src/interface/QueueView.cpp:1590 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" "%s" msgstr "" -"Non se puido escribir \"%s\", a cola non se puido gardar.\n" +"Non se puido escribir «%s», a cola non se puido gardar.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:782 -#: ../../locales/../src/interface/sitemanager.cpp:842 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" -"Non se puido escribir \"%s\", os ficheiros seleccionados non se puideron " +"Non se puido escribir «%s», os ficheiros seleccionados non se puideron " "exportar: %s" -#: ../../locales/../src/interface/wrapengine.cpp:1136 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format -msgid "Could not write \"%s\": %s" -msgstr "Non se puido escribir \"%s\": %s" +msgid "Could not write \"%s\":" +msgstr "Non se puido escribir «%s»:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format -msgid "Could not write keyfile: %s" -msgstr "Non se puido escribir o ficheiro de rexistro: %s" +msgid "Could not write key file: %s" +msgstr "Non se puido escribir o ficheiro chave: «%s»" -#: ../../locales/../src/interface/QueueView.cpp:1115 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Non se puido escribir ao ficheiro local" -#: ../../locales/../src/engine/logging.cpp:315 -#: ../../locales/../src/engine/logging.cpp:386 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Non se puido escribir ao ficheiro de rexistro: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:999 -#: ../../locales/../src/engine/ControlSocket.cpp:1097 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:237 #, c-format msgid "Could not write to socket: %s" -msgstr "Non se puido escribir ao sócket: %s" +msgstr "Non se puido escribir na toma (sócket): %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:181 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "País:" -#: resources.h:628 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "" -"Pecha instantaneamente o FileZil. Só se emprega para a eliminación de erros " -"do xestor de excepcións" - -#: resources.h:591 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/menus.xrc:77 msgid "Crea&te new file" -msgstr "Non se pode crear o novo filtro" +msgstr "Crear &novo ficheiro" -#: resources.h:576 resources.h:590 resources.h:643 resources.h:664 +#: ../../locales/../src/interface/state.cpp:1107 +msgid "Create &missing local directory and enter it" +msgstr "Crea o cartafol local que &falta e entrar nel" + +#: ../../locales/../src/interface/state.cpp:1029 +msgid "Create &missing remote directory and enter it" +msgstr "Crea o cartafol remoto que &falta e entrar nel" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 msgid "Create a new subdirectory in the current directory" -msgstr "Crear un subcartafol no cartafol actual" +msgstr "Crear un novo subcartafol no cartafol actual" -#: resources.h:592 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:345 +msgid "Create a new subdirectory in the current directory and change into it" +msgstr "Crear un novo subcartafol no cartafol actual e entrar nel" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 msgid "Create a new, empty file in the current directory" -msgstr "Crear un subcartafol no cartafol actual" +msgstr "Crear un novo, ficheiro baleiro no cartafol actual" -#: ../../locales/../src/interface/LocalListView.cpp:1194 -#: ../../locales/../src/interface/LocalTreeView.cpp:1182 -#: ../../locales/../src/interface/RemoteListView.cpp:1617 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1274 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:33 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:73 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:344 +msgid "Create director&y and enter it" +msgstr "Crear &cartafol e entrar nel" + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Crear cartafol" -#: ../../locales/../src/interface/RemoteListView.cpp:3163 -#, fuzzy +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" -msgstr "Non se pode editar o ficheiro" +msgstr "Crear un ficheiro baleiro" -#: ../../locales/../src/interface/QueueView.cpp:1527 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Creando o cartafol" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3310 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Creando cartafol '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:174 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Erro crítico" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:161 +msgid "Critical error:" +msgstr "Erro crítico:" + +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Erro crítico de transferencia de ficheiro" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "" "Erro crítico de transferencia de ficheiro despois de transferir %s en %s" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" "Synchronized browsing has been disabled." msgstr "" -"O cartafol remoto actual (%s) non está debaixo da raíz de sincronización (%" -"s).\n" +"O cartafol remoto actual (%s) non está debaixo da raíz de sincronización " +"(%s).\n" "A navegación sincronizada foi desactivada." -#: ../../locales/../src/interface/statusbar.cpp:423 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." -msgstr "O tipo de transferencia actual está estabelcida a ASCII." +msgstr "O tipo de transferencia actual está estabelecida a ASCII." -#: ../../locales/../src/interface/statusbar.cpp:433 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "" -"O tipo de transferencia actual está estabelcida á detección automática." +"O tipo de transferencia actual está estabelecida á detección automática." -#: ../../locales/../src/interface/statusbar.cpp:428 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." -msgstr "O tipo de transferencia actual está estabelcido a binario." +msgstr "O tipo de transferencia actual está estabelecido a binario." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 +msgid "Curve:" +msgstr "Curva:" -#: resources.h:783 resources.h:904 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Personali&zado" -#: ../../locales/../src/interface/filter.cpp:98 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Conxunto de filtros personalizado" -#: resources.h:377 resources.h:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Servidor personalizado" -#: resources.h:386 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Ciano" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Tipo de d&atos" -#: resources.h:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Prefixos d&ecimais usando símbolos SI (por exemplo, 1KB = 1000 bytes)" -#: resources.h:100 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "D&efecto" -#: resources.h:594 resources.h:644 resources.h:674 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:85 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:387 msgid "D&elete" msgstr "&Eliminar" -#: resources.h:206 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 +msgid "D&irectory comparison" +msgstr "Comparac&ión de cartafoles" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Desact&ivar todo" -#: resources.h:882 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" -msgstr "N&non gardar os contrasinais" +msgstr "N&on gardar os contrasinais" -#: resources.h:935 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Acción de clic d&uplo nos cartafoles:" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 +msgid "D&uplicate" +msgstr "D&uplicar" + +#: ../../locales/../src/engine/server.cpp:58 msgid "DOS-like with virtual paths" msgstr "Con rutas virtuais ao xeito de DOS" -#: ../../locales/../src/interface/LocalListView.cpp:2052 -#: ../../locales/../src/interface/RemoteListView.cpp:2672 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "O tipo de ficheiro é perigoso" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Datos" -#: ../../locales/../src/interface/netconfwizard.cpp:985 -#: ../../locales/../src/interface/netconfwizard.cpp:1051 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." -msgstr "O sócket de datos pechouse moi cedo." +msgstr "A toma (socket) de datos pechouse moi cedo." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Data" -#: resources.h:895 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" -msgstr "Formato de data e hora" +msgstr "Formato de data" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:128 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" msgstr "Formato de data/hora" -#: ../../locales/../src/interface/fileexistsdlg.cpp:88 -#: ../../locales/../src/interface/fileexistsdlg.cpp:107 -#: ../../locales/../src/interface/fileexistsdlg.cpp:134 -#: ../../locales/../src/interface/fileexistsdlg.cpp:153 +#: ../../locales/../src/interface/fileexistsdlg.cpp:49 msgid "Date/time unknown" msgstr "Data/hora descoñecida" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:141 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" msgstr "Eliminación de erros" -#: resources.h:975 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Configuración para a eliminación de erros" -#: resources.h:91 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" -msgstr "cartafol &local por defecto:" +msgstr "cartafol &local predeterminado:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:50 msgid "Default (Autodetect)" msgstr "Predeterminar (detectar automaticamente)" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." -msgstr "O editor preestabelcido non se puxo entre comiñas correctamente." +msgstr "O editor predeterminado non se puxo entre vírgulas correctamente." -#: resources.h:256 resources.h:278 resources.h:865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" -msgstr "Acción do ficheiro exitente preestabelcida" +msgstr "Acción predeterminada se o ficheiro existe" -#: resources.h:93 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" -msgstr "cartafol r&emoto por defecto:" +msgstr "cartafol r&emoto predeterminado:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2785,30 +3233,31 @@ "Non se pode analizar a ruta remota predeterminada. Asegúrese de é unha ruta " "absoluta correcta para tipo de servidor seleccionado." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:78 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Idioma do sistema" -#: resources.h:688 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" -msgstr "Modo de transferencia por defecto:" +msgstr "Modo de transferencia predeterminada:" -#: resources.h:834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" -msgstr "Tipo de transferencia por defecto:" +msgstr "Tipo de transferencia predeterminada:" -#: resources.h:707 resources.h:770 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" -msgstr "Prestabelcido: http://ip.filezilla-project.org/ip.php" +msgstr "Predeterminado: http://ip.filezilla-project.org/ip.php" #: ../../locales/../src/interface/settings/optionspage_connection.cpp:41 msgid "" "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "" -"O intervalo entre tentativas de conexión erradas ten de estar entre 1 e 999 " +"O intervalo entre intentos de conexión erradas ten que estar entre 1 e 999 " "segundos." -#: ../../locales/../src/engine/engineprivate.cpp:630 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2823,100 +3272,131 @@ "Estase a demorar a conexión %d segundos por mor dunha tentativa previa de " "conexión errada..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "Eliminar a entrada do xestor do sitio" -#: resources.h:645 resources.h:666 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:282 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Delete selected directory" msgstr "Eliminar o cartafol seleccionado" -#: resources.h:579 resources.h:595 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:42 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 msgid "Delete selected files and directories" msgstr "Eliminar os cartafoles seleccionados" -#: ../../locales/../src/interface/search.cpp:1017 -msgid "Deleting directories" -msgstr "Eliminado os cartafoles" - -#: ../../locales/../src/interface/search.cpp:1017 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Non se admite aínda eliminar múltiplos cartafoles sen relación" +#: ../../locales/../src/engine/engineprivate.cpp:392 +#, c-format +msgid "Deleting \"%s\"" +msgstr "Eliminado «%s»" + +#: ../../locales/../src/engine/engineprivate.cpp:395 +#, c-format +msgid "Deleting %u files from \"%s\"" +msgstr "Eliminando %u ficheiros de «%s»" -#: resources.h:454 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Borrando ligazón simbólica" -#: ../../locales/../src/interface/LocalTreeView.cpp:1048 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Escritorio" -#: resources.h:4 resources.h:28 resources.h:177 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Detalles" -#: resources.h:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Detalles para a chave nova:" -#: resources.h:228 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 +msgid "Detected newer version of FileZilla" +msgstr "Atopouse unha nova versión do FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" -msgstr "Dire&ctories" +msgstr "&Cartafoles" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Direction" msgstr "Enderezo" -#: ../../locales/../src/interface/filelistctrl.cpp:523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Cartafoles:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Cartafol" -#: resources.h:652 resources.h:926 resources.h:1009 -#: ../../locales/../src/interface/filelistctrl.cpp:445 -#: ../../locales/../src/interface/Mainfrm.cpp:2343 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Permisos de acceso ao cartafol" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:302 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Comparación de cartafoles" #: ../../locales/../src/interface/listingcomparison.cpp:74 -#: ../../locales/../src/interface/listingcomparison.cpp:82 -#: ../../locales/../src/interface/listingcomparison.cpp:88 msgid "Directory comparison failed" msgstr "Fallou a comparación de cartafoles" #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71 msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "" -"Quer non existe cartafol que contén o ficheiro de rexistro quer o nome do " -"ficheiro non é correcto." +"Non existe cartafol que contén o ficheiro de rexistro ou o nome do ficheiro " +"é incorrecto." -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/interface/menu_bar.cpp:83 +msgid "Directory listing &filters..." +msgstr "&Filtros da listaxe en cartafol..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" -msgstr "O usuario cancelou a listaxe do cartafol" +msgstr "O usuario interrompeu a listaxe en cartafol" -#: ../../locales/../src/interface/RemoteListView.cpp:2362 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" -msgstr "Fallou a relación do cartafol" +msgstr "Fallou a listaxe en cartafol" -#: resources.h:199 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" -msgstr "Filtros da relación do cartafol" +msgstr "Filtros da listaxe en cartafol" + +#: ../../locales/../src/engine/ControlSocket.cpp:193 +#, c-format +msgid "Directory listing of \"%s\" successful" +msgstr "A listaxe en cartafol de «%s» amosouse con éxito" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" -msgstr "Relacionouse o cartafol correctamente" +msgstr "Listaxe en cartafol correcta" -#: resources.h:209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Desacti&var todo" -#: ../../locales/../src/interface/state.cpp:1049 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Quere desactivar a navegación sincronizada e continuar cambiando o cartafol " "remoto?" -#: ../../locales/../src/interface/Mainfrm.cpp:671 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -2924,677 +3404,728 @@ "Desactive esta opción se xa non pode volver ver o contido correcto do " "cartafol." -#: resources.h:1002 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Desconectar do servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:82 -#: ../../locales/../src/engine/ControlSocket.cpp:1000 -#: ../../locales/../src/engine/ControlSocket.cpp:1099 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:936 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:938 -#: ../../locales/../src/interface/QueueView.cpp:1068 -#: ../../locales/../src/interface/QueueView.cpp:1112 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:238 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Estase a desconectar do servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1134 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:953 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Desconectado do servidor: %s" -#: ../../locales/../src/interface/QueueView.cpp:1429 -#: ../../locales/../src/interface/statuslinectrl.cpp:269 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Estase a desconectar do servidor anterior" -#: resources.h:1003 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Desconecta do servidor actualmente visíbel" -#: resources.h:564 +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "Display about dialog" msgstr "Amosar o diálogo Sobre" -#: resources.h:944 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "No&n usar o editor predeterminado" -#: resources.h:620 -msgid "Do ¬hing" -msgstr "Non facer &nada" - -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61 -#: ../../locales/../src/interface/updatewizard.cpp:251 -msgid "" -"Do you really want to check for beta versions?\n" -"Unless you want to test new features, keep using stable versions." -msgstr "" -"Quere comprobar se hai versións beta?\n" -"A non ser que desexe probar novas características, é mellor que continúe " -"empregando as versións estábeis." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 +msgid "Do the same with &all selected files already being edited" +msgstr "" +"F&aga o mesmo con todos os ficheiros seleccionados que se están a modificar" -#: ../../locales/../src/interface/Mainfrm.cpp:1198 -#: ../../locales/../src/interface/Mainfrm.cpp:1222 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Quere pechar o FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" -"Quere eliminar todas as entradas do Xestor de sitios e a lista de " -"tranferencia?" +"Quere eliminar todas as entradas do xestor de sitios e a lista de " +"transferencia?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" -msgstr "Quere eliminar todas as entradas do Xestor de sitios?" +msgstr "Quere eliminar todas as entradas do xestor de sitios?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Quere eliminar as entradas seleccionadas?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" -msgstr "Desexa realmete eliminar a cola de transferencia?" +msgstr "Desexa realmente eliminar a cola de transferencia?" -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Quere enviar '%s' ao servidor?" -#: resources.h:467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 +msgid "Do you want to reopen this file?" +msgstr "Quere reabrir este ficheiro?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Documentación" -#: resources.h:709 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:250 msgid "Don't use external IP address on &local connections." -msgstr "Non empregue números externos de IP en conexións &locais." +msgstr "Non empregue enderezos IP externos en conexións &locais." -#: resources.h:845 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" -"Os ficheiros punto son os ficheiros cun nome que comezan con punto, i.e. ." +"Os ficheiros punto son os ficheiros cun nome que comeza por punto, p. ex.: ." "htaccess" -#: resources.h:929 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Acción ao premer dúas veces" -#: resources.h:363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Descargar" -#: resources.h:483 resources.h:821 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "&Límite de descarga:" -#: ../../locales/../src/interface/statusbar.cpp:604 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "Límite de descarga: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:606 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Límite de descarga: ningún" -#: resources.h:442 ../../locales/../src/interface/search.cpp:817 -#: ../../locales/../src/interface/search.cpp:823 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" -msgstr "Descargar os resultados da procura" +msgstr "Descargar os resultados da busca" -#: resources.h:639 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "Download selected directory" msgstr "Descargar o cartafol seleccionado" -#: resources.h:583 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:53 msgid "Download selected files and directories" msgstr "Descargar os ficheiros e os cartafoles seleccionados" -#: ../../locales/../src/interface/edithandler.cpp:1247 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 +#, c-format +msgid "" +"Download speed: %s/s\n" +"Upload speed: %s/s" +msgstr "" +"Velocidade de descarga: %s/s\n" +"Velocidade de envío: %s/s" + +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Estase a descargar" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:358 -#: ../../locales/../src/interface/updatewizard.cpp:415 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Estase a descargar %s" -#: ../../locales/../src/interface/search.cpp:926 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Non é aínda compatíbel descargar múltiplos cartafoles sen relación" - -#: ../../locales/../src/interface/search.cpp:926 -msgid "Downloading search results" -msgstr "Estase a descargar os resultados da procura" - -#: ../../locales/../src/interface/LocalListView.cpp:104 -#: ../../locales/../src/interface/LocalTreeView.cpp:104 -#: ../../locales/../src/interface/QueueView.cpp:83 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:88 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 +msgid "Downloading update..." +msgstr "Descargando actualización..." + +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" -"Aínda non se implementou a función de arrastrar e soltar entre diferentes " +"Aínda non se desenvolveu a función de arrastrar e soltar entre diferentes " "instancias do FileZilla." -#: ../../locales/../src/interface/LocalListView.cpp:110 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:96 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:94 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" -"Aínda non se implementou a función de arrastrar e soltar entre diferentes " +"Aínda non se desenvolveu a función de arrastrar e soltar entre diferentes " "servidores." -#: resources.h:205 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 +msgid "Dupl&icate" +msgstr "Dupl&icar" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "A&ctivar todo" -#: resources.h:569 resources.h:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:15 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 msgid "E&nter directory" msgstr "I&nserir artafol" -#: resources.h:141 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "E&xecutar" -#: resources.h:509 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "E&xit" msgstr "Saír" -#: ../../locales/../src/interface/verifycertdialog.cpp:187 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:187 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +msgid "E&xport..." +msgstr "E&xportar..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "Correo electrónico:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Cada filtro precisa, cando menos, unha condición." -#: resources.h:231 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Edición dos filtros" -#: resources.h:574 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:25 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Editar o ficheiro co editor configurado e enviar as mudanzas ao servidor." -#: ../../locales/../src/interface/LocalListView.cpp:1963 -#: ../../locales/../src/interface/LocalListView.cpp:1974 +#: ../../locales/../src/interface/search.cpp:1198 +msgid "Editing directories is not supported" +msgstr "Non se admite a modificación de cartafoless" + +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" -msgstr "Fallou a edición" +msgstr "Fallou a modificación" -#: resources.h:892 +#: ../../locales/../src/interface/search.cpp:1198 +msgid "Editing search results" +msgstr "Modificando resultados da busca" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Correo electrónico:" -#: ../../locales/../src/interface/QueueView.cpp:2297 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "Empty command" -msgstr "Orde vadía" +msgstr "Orde baleira" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 msgid "Empty command." -msgstr "Orde vadía." +msgstr "Orde baleira." -#: ../../locales/../src/interface/RemoteListView.cpp:2364 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "A listaxe do cartafol está baleira" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." -msgstr "Cartafol vadío." +msgstr "Cartafol baleiro." -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "A extensión do ficheiro está en branco." -#: ../../locales/../src/interface/filteredit.cpp:206 -#: ../../locales/../src/interface/filteredit.cpp:248 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Non están permitidos os nomes de ficheiros en branco." -#: ../../locales/../src/interface/filteredit.cpp:206 -#: ../../locales/../src/interface/filteredit.cpp:248 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" -msgstr "O nome está en branco" +msgstr "O nome está baleiro" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 msgid "Empty quoted string." -msgstr "A cadea entre comiñas está baleira." +msgstr "A cadea entre vírgulas está baleira." -#: resources.h:208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Activar todo" -#: resources.h:830 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" -msgstr "Activar o &filtro de caracteres incorrectos" +msgstr "Activar o &filtro de caracteres incompatíbeis" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Cifrado" -#: resources.h:345 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Cifrado" -#: resources.h:337 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Chave de Cifrado:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Chave de cifrado:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Detalles do cifrado" -#: ../../locales/../src/interface/filelistctrl.cpp:447 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Desexa rematar a comparación e mudar a orde?" -#: resources.h:550 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Finalizar a comparación e abrir a busca rápida?" + +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Enter &custom command..." -msgstr "Introduza unha &orde personalizada..." +msgstr "Insira unha &orde personalizada..." -#: resources.h:487 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Escriba 0 para non ter límite de velocidade." -#: ../../locales/../src/interface/QueueView.cpp:2286 +#: ../../locales/../src/interface/QueueView.cpp:1878 msgid "Enter command" -msgstr "Introduza a orde" +msgstr "Insira a orde" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" -msgstr "Introduza a orde personalizada" +msgstr "Insira a orde personalizada" -#: resources.h:936 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" -msgstr "Introducir o cartafol" +msgstr "Entrar no cartafol" -#: ../../locales/../src/interface/filteredit.cpp:134 -#: ../../locales/../src/interface/filteredit.cpp:194 -#: ../../locales/../src/interface/filteredit.cpp:241 +#: ../../locales/../src/interface/filteredit.cpp:136 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" -msgstr "Introduza o nome do filtro" +msgstr "Insira o nome do filtro" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Insira o contrasinal mestre" -#: ../../locales/../src/interface/filter.cpp:343 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" -msgstr "Introduza un nome para o conxunto de filtros" +msgstr "Insira un nome para o conxunto de filtros" -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Escriba o novo nome para o conxunto de filtros" -#: resources.h:116 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" -msgstr "Introduza un contrasinal" +msgstr "Insira un contrasinal" -#: resources.h:570 resources.h:587 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:62 msgid "Enter selected directory" -msgstr "Introduza o cartafol seleccionado" +msgstr "Insira o cartafol seleccionado" -#: resources.h:729 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then." -msgstr "" -"Introduza o enderezo do servidor.\n" -"Para especificar o protocolo do servidor, faga que o identificador de " -"protocolo preceda ao de servidor. Se non se especifica ningún protocolo, " -"usarase o protocolo predeterminado (ftp://).\n" -"Pode introducir os URL completos na forma protocol://user:pass@host:port " -"aquí, os valores nos outros campos sobrescribiranse entón." +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" +"\n" +"Supported protocols are:\n" +"- ftp:// for normal FTP with optional encryption\n" +"- sftp:// for SSH file transfer protocol\n" +"- ftps:// for FTP over TLS (implicit)\n" +"- ftpes:// for FTP over TLS (explicit)" +msgstr "" +"Insira o enderezo do servidor. Para especificar o protocolo do servidor, " +"faga que o identificador de protocolo preceda ao de servidor. Se non se " +"especifica ningún protocolo, usarase o protocolo predeterminado (ftp://). " +"Pode inserir os URLs completos na forma protocolo://usuario:" +"contrasinal@servidor:porto aquí, os valores nos outros campos " +"sobrescribiranse entón.\n" +"\n" +"Os protocolos admitidos son:\n" +"- ftp:// para FTP normal con cifrado opcional\n" +"- sftp:// para o protocolo de transferencia de ficheiros SSH\n" +"- ftps:// para FTP sobre TLS (implícito)\n" +"- ftpes:// para FTP sobre TLS (explícito)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" -"Escriba o contrasinal para o ficheiro '%s'.\n" -"Cómpre salientar que o ficheiro convertido non está protexido con " -"contrasinal." +"Insira o contrasinal para o ficheiro «%s».\n" +"O ficheiro convertido estará protexido co mesmo contrasinal." -#: resources.h:733 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Introduza o porto en que o servidor escoita.\n" -"Por defecto 21 para FTP, e 22 para SFT." +"Insira o porto en que o servidor escoita. O predeterminado é o 21 para FTP, " +"e o 22 para SFTP." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Insira o nome de usuario" -#: ../../locales/../src/interface/loginmanager.cpp:63 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Escriba o nome de usuario e o contrasinal" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Erro" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Fallou a exportación da configuración" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:38 -#: ../../locales/../src/interface/import.cpp:108 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Produciuse un erro ao importar" -#: ../../locales/../src/interface/QueueView.cpp:2052 +#: ../../locales/../src/interface/QueueView.cpp:1668 msgid "Error loading queue" msgstr "Produciuse un erro a cargar a cola" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:172 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:299 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:731 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:772 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:821 -#: ../../locales/../src/interface/filter.cpp:210 -#: ../../locales/../src/interface/filter.cpp:1045 -#: ../../locales/../src/interface/import.cpp:120 -#: ../../locales/../src/interface/import.cpp:311 -#: ../../locales/../src/interface/Options.cpp:216 -#: ../../locales/../src/interface/QueueView.cpp:1965 -#: ../../locales/../src/interface/search.cpp:1094 -#: ../../locales/../src/interface/search.cpp:1115 -#: ../../locales/../src/interface/sitemanager.cpp:250 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:544 -#: ../../locales/../src/interface/sitemanager.cpp:603 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:806 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:731 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:786 -#: ../../locales/../src/interface/wrapengine.cpp:978 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1571 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Erro ao cargar o ficheiro de XML" -#: ../../locales/../src/interface/QueueView.cpp:1951 +#: ../../locales/../src/interface/QueueView.cpp:1560 msgid "Error saving queue" msgstr "Produciuse un erro ao gardar a cola" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Erro ao iniciar o programa" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:859 -#: ../../locales/../src/interface/QueueView.cpp:1986 -#: ../../locales/../src/interface/sitemanager.cpp:658 -#: ../../locales/../src/interface/sitemanager.cpp:783 -#: ../../locales/../src/interface/sitemanager.cpp:843 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:810 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188 -#: ../../locales/../src/interface/wrapengine.cpp:1137 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1591 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Erro ao escribir o ficheiro de XML" -#: ../../locales/../src/interface/updatewizard.cpp:335 -msgid "Error, file name cannot be parsed." -msgstr "Erro, non se pode procesar o nome do ficheiro." - -#: ../../locales/../src/interface/updatewizard.cpp:351 -msgid "Error, local file exists but cannot be removed" -msgstr "Erro: o ficheiro local existe pero non se pode borrar" - -#: ../../locales/../src/engine/logging.cpp:213 -#: ../../locales/../src/interface/StatusView.cpp:284 -#: ../../locales/../src/interface/StatusView.cpp:332 -#: ../../locales/../src/interface/updatewizard.cpp:535 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Erro:" -#: resources.h:479 -msgid "Establish connection in a new tab" -msgstr "Estabelecer a conexión nunha nova lapela" - -#: resources.h:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Exemplo png \"c:\\ficheiros do programa\\visor\\visor.exe\" -open" -#: resources.h:914 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Exemplos" -#: resources.h:145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Exe&cutar" -#: ../../locales/../src/interface/updatewizard.cpp:320 -msgid "Executable" -msgstr "Executábel" - -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "O executábel non contén a información de versión polo que non se pode " "comprobar se hai actualizacións." -#: resources.h:872 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Explorador" -#: resources.h:295 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Exportar &filtros" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Exportar a &fila" -#: resources.h:294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Exportar as &opcións" -#: resources.h:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Exportar as opcións" -#: resources.h:220 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Nome do f&iltro:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:117 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:497 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - Protocolo de transferencia de ficheiros" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Protocolo de transferencia de ficheiros con cifrado opcional" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Protocolo inseguro de transferencia de ficheiros" -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" -msgstr "Non se inciou o motor de FTP, polo que non se pode conectar" +msgstr "Non se iniciou o motor do FTP, polo que non se pode conectar" -#: resources.h:757 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Manter activo o FTP" -#: resources.h:777 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:120 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" -msgstr "Proxy de FTP" +msgstr "Proxy do FTP" -#: ../../locales/../src/interface/cmdline.cpp:19 +#: ../../locales/../src/interface/cmdline.cpp:21 msgid "FTP URL" -msgstr "FTP URL" +msgstr "URL do FTP" -#: resources.h:685 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:44 msgid "" "FTP uses secondary connections for data transfers. These additional " "connections can be established in two ways." msgstr "" -"O FTP emprega conexións secundarias para a tranferencia de datos. Estas " +"O FTP emprega conexións secundarias para a transferencia de datos. Estas " "conexións adicionais poden estabelecerse de dous xeitos diferentes." -#: ../../locales/../src/engine/server.cpp:20 -msgid "FTPES - FTP over explicit TLS/SSL" -msgstr "FTPES - FTP sobre TSL/SSL explícito" - -#: ../../locales/../src/engine/server.cpp:19 -msgid "FTPS - FTP over implicit TLS/SSL" -msgstr "FTPS - FTP sobre TLS/SSL implícito" +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP: Tipos de ficheiros" + +#: ../../locales/../src/engine/server.cpp:26 +msgid "FTPES - FTP over explicit TLS" +msgstr "FTPES - FTP sobre TSL explícito" + +#: ../../locales/../src/engine/server.cpp:25 +msgid "FTPS - FTP over implicit TLS" +msgstr "FTPS - FTP sobre TLS implícito" #: ../../locales/../src/interface/LocalListView.cpp:545 -#: ../../locales/../src/interface/LocalListView.cpp:625 -#: ../../locales/../src/interface/LocalListView.cpp:2259 -#: ../../locales/../src/interface/LocalTreeView.cpp:906 -#: ../../locales/../src/interface/viewheader.cpp:535 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Produciuse un fallo ao cambiar de cartafol" -#: ../../locales/../src/interface/FileZilla.cpp:259 -#: ../../locales/../src/interface/FileZilla.cpp:267 -#: ../../locales/../src/interface/FileZilla.cpp:269 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Produciuse un fallo ao cambiar a lingua" -#: ../../locales/../src/interface/updatewizard.cpp:453 -msgid "Failed to check for newer version of FileZilla." -msgstr "Produciuse un fallo ao comprobar as novas versións do FileZilla." +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Non se puido converter a orde á codificación de 8 bits" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "Produciuse un fallo ao copiar ou ao mover os sitios" -#: ../../locales/../src/interface/xmlfunctions.cpp:524 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Produciuse un fallo ao crear a copia de seguranza do ficheiro de XML" -#: ../../locales/../src/interface/netconfwizard.cpp:791 -msgid "Failed to create listen socket, aborting" -msgstr "Produciuse un fallo ao crear un conector de escoita, abortar" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "" +"Produciuse un fallo ao crear unha toma (socket) de escoita no porto %d, " +"cancelando." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Produciuse un fallo ao crear un conector de escoita para a transferencia de " "modo activo" -#: ../../locales/../src/interface/updatewizard.cpp:455 -msgid "Failed to download the latest version of FileZilla." -msgstr "Produciuse un fallo ao descargar a última versión do FileZilla." +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Produciuse un erro ao descifrar o contrasinal do servidor." -#: ../../locales/../src/interface/LocalTreeView.cpp:660 +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" -msgstr "Produciuse un fallo ao obter a ruta de 'Os meus documentos'" +msgstr "Produciuse un fallo ao obter a ruta de «Os meus documentos»" -#: ../../locales/../src/interface/LocalTreeView.cpp:646 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Produciuse un fallo ao obter a ruta do escritorio" -#: ../../locales/../src/interface/netconfwizard.cpp:950 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Produciuse un fallo ao obter o enderezo homónimo da conexión de control; " "pechouse a conexión." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Fallou ao obter o enderezo homónimo da conexión de datos; a conexión " "pechouse." -#: ../../locales/../src/interface/context_control.cpp:77 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Fallou ao iniciar o motor de FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:313 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "Produciuse un fallo ao iniciar o TLS." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:97 +msgid "Failed to initialize networking" +msgstr "Fallou ao inicializar a rede" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "" "Fallou ao cargar os paneis; serán incorrectos os ficheiros de recursos?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Fallou ao descargar a chave privada: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" -msgstr "Fallou ao abrir \"%s\" para engadir/escribir" +msgstr "Fallou ao abrir «%s» para engadir/escribir" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" -msgstr "Fallou ao abrir \"%s\" para lectura" +msgstr "Fallou ao abrir «%s» para lectura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2668 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:391 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:448 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" -msgstr "Fallou ao abrir \"%s\" para escribir" +msgstr "Fallou ao abrir «%s» para escribir" -#: ../../locales/../src/engine/ControlSocket.cpp:415 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "Produciuse un erro ao procesar a ruta devolta." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:321 -msgid "Failed to parse trusted root cert." -msgstr "Fallou ao analizar o certificado raíz de confianza." - -#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Fallou ao recibir os datos" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Fallou ao recuperar a lista do cartafol" -#: ../../locales/../src/interface/netconfwizard.cpp:719 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Fallou ao recuperar o número de IP externo; abortando" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Fallou ao recuperar o enderezo IP externo, cancelando." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3941 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "" -"Produciuse un fallo ao recuperar o enderezo externo de IP; empregarase o " +"Produciuse un fallo ao recuperar o enderezo IP externo, empregando o " "enderezo local" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963 -msgid "Failed to retrieve local ip address." -msgstr "Fallou ao recuperar o número de IP local." - -#: ../../locales/../src/interface/netconfwizard.cpp:688 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Fallou ao recuperar o número de IP local. Abortando" +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Fallou ao recuperar o enderezo IP local, cancelando." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Fallou ao recuperar o enderezo IP local." -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." -msgstr "Fallou ao recuperar o número de IP externo." +msgstr "Fallou ao recuperar o enderezo IP externo." -#: ../../locales/../src/interface/netconfwizard.cpp:307 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Produciuse un erro ao enviar a orde." -#: ../../locales/../src/interface/FileZilla.cpp:267 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Fallou ao estabelecer o idioma como %s (%s), usarase o idioma predeterminado " "do sistema" -#: ../../locales/../src/interface/FileZilla.cpp:252 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3602,245 +4133,224 @@ "Fallou ao estabelecer o idioma como %s (%s), usarase a lingua predeterminada " "do sistema (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:240 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Fallou ao estabelecer o idioma como %s (%s), usarase a lingua predeterminada " "do sistema." -#: ../../locales/../src/interface/FileZilla.cpp:269 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Fallou ao estabelecer o idioma como %s, usarase o idioma predeterminado do " "sistema" -#: ../../locales/../src/interface/FileZilla.cpp:248 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Fallou ao estabelecer o idioma como %s, usarase o idioma predeterminado do " "sistema (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:237 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Fallou ao estabelecer o idioma como %s, usarase o idioma predeterminado do " "sistema." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Fallou ao validar a configuración" -#: ../../locales/../src/engine/tlssocket.cpp:896 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Fallou ao verificar o certificado homónimo" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:566 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Fallou ao escribir o ficheiro %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:542 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Fallou ao escribir o ficheiro de XML" #: ../../locales/../src/interface/queueview_failed.cpp:16 msgid "Failed transfers" -msgstr "Fallou a transferencia" +msgstr "Transferencias falladas" -#: resources.h:700 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 msgid "Fall back to active mode" msgstr "Volver ao modo activo" -#: resources.h:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Fich&eiro:" -#: resources.h:227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Fich&eiros" -#: ../../locales/../src/interface/filelistctrl.cpp:500 -#: ../../locales/../src/interface/filelistctrl.cpp:518 -#: ../../locales/../src/interface/filelistctrl.cpp:527 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Ficheiro" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:124 -msgid "File Types" -msgstr "Tipos de ficheiros" +#: ../../locales/../src/engine/socket.cpp:1077 +msgid "File descriptor not a socket" +msgstr "O descritor de ficheiro non é unha toma (socket)" -#: ../../locales/../src/interface/import.cpp:108 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "O ficheiro non contén ningún dato que se poida importar." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:132 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "Edición de ficheiros" -#: ../../locales/../src/interface/RemoteListView.cpp:1921 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "O ficheiro existe" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:125 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 msgid "File exists action" msgstr "Acción se o ficheiro existe" -#: resources.h:306 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Mudou o ficheiro" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:130 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 msgid "File lists" msgstr "Listas de ficheiros" -#: ../../locales/../src/interface/edithandler.cpp:1724 -#: ../../locales/../src/interface/FileZilla.cpp:702 -#: ../../locales/../src/interface/FileZilla.cpp:796 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Non se encontrou o ficheiro" -#: resources.h:1013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" -msgstr "Busca de ficheiros" +msgstr "Buscar ficheiros" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "O usuario abortou a transferencia de ficheiros" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "A transferencia de ficheiros foi abortada logo de se transferir %s en %s" -#: ../../locales/../src/engine/ControlSocket.cpp:139 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Fallou a transferencia de ficheiros" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "A transferencia de ficheiros fallou logo de se transferir %s en %s" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Omitiuse a transferencia de ficheiros" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Transferiuse o ficheiro correctamente" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Transferiuse o ficheiro correctamente, transferiuse %s en %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1197 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "A transferencia de ficheiros aínda en proceso." -#: resources.h:388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "O ficheiro transferirase co tipo de datos ASCII." -#: resources.h:389 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "O ficheiro transferirase co tipo de datos binario." -#: ../../locales/../src/interface/FileZilla.cpp:487 -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Erro do FileZilla" -#: resources.h:722 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." msgstr "" -"O FileZilla non pode probar a súa configuración para se asegurar de que todo " -"está apropiadamente configurado." +"O FileZilla pode probar agora a súa configuración para se asegurar de que " +"todo está apropiadamente configurado." -#: resources.h:492 -msgid "" -"FileZilla can remember passwords so that you can later reconnect without " -"having to reenter your password after restarting FileZilla." -msgstr "" - -#: resources.h:478 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." -msgstr "FileZilla xa está conectado ao servidor." +msgstr "O FileZilla xa está conectado ao servidor." -#: ../../locales/../src/interface/manual_transfer.cpp:453 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:965 -msgid "" -"FileZilla is running in kiosk mode.\n" -"'Normal' and 'Account' logontypes are not available in this mode." -msgstr "" -"O FileZilla está en execución en modo quiosco.\n" -"Os inicios de sesión 'Normal' e 'Conta' non están dispoñíbeis neste modo." - -#: ../../locales/../src/interface/Mainfrm.cpp:1532 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "Debe reiniciar o FileZilla para que o cambio de idioma sexa efectivo." -#: resources.h:525 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 +msgid "FileZilla updates" +msgstr "Actualizacións do FileZilla" + +#: ../../locales/../src/interface/menu_bar.cpp:98 msgid "Filelist status &bars" msgstr "&Barras de estado da lista de ficheiros" -#: ../../locales/../src/interface/edithandler.cpp:1232 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:370 -#: ../../locales/../src/interface/search.cpp:379 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" -msgstr "Nome de ficheiro" - -#: resources.h:518 -msgid "Filename &filters..." -msgstr "&Filtros de nomes de ficheiros..." +msgstr "Nome" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3107 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "Non se pode construír o nome do ficheiro para o cartafol %s e o ficheiro %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1907 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" -msgstr "O nome do ficheiro non é correcto" - -#: ../../locales/../src/interface/RemoteListView.cpp:3188 -#, fuzzy -msgid "" -"Filename may not contain any of the following characters: / \\ : * ? \" < > |" -msgstr "" -"Os nomes de ficheiro non poden conter ningún dos seguintes caracteres: / " -"\\ : * ? \" < > |" +msgstr "O nome do ficheiro é incorrecto" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Nome de ficheiro non modificado" -#: resources.h:308 resources.h:968 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Nome de ficheiro:" -#: ../../locales/../src/interface/LocalListView.cpp:1373 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "" "Os nomes de ficheiro non poden conter ningún dos seguintes caracteres: / * ? " "< > |" -#: ../../locales/../src/interface/LocalListView.cpp:1348 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" @@ -3848,91 +4358,115 @@ "Os nomes de ficheiro non poden conter ningún dos seguintes caracteres: / " "\\ : * ? \" < > |" -#: resources.h:336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Ficheiros que se están a editar actualmente" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:371 -#: ../../locales/../src/interface/search.cpp:381 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" +"Bórranse os ficheiros que coincidan cunha regra de filtro das listas de " +"cartafoles." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Non se atoparon os ficheiros" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" -msgstr "Tamaño do ficheiro" +msgstr "Tamaño" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:129 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "Formato do tamaño dos ficheiros" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:372 -#: ../../locales/../src/interface/search.cpp:382 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" -msgstr "Tipo de ficheiro" +msgstr "Tipo" -#: resources.h:956 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:133 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Asociacións do tipo de ficheiro" -#: resources.h:226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "O filtro aplícase a:" -#: resources.h:829 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" -msgstr "Filtrar caracteres non correctos nos nomes de ficheiros" +msgstr "Filtro de caracteres incompatíbeis para os nomes de ficheiro" -#: ../../locales/../src/interface/filteredit.cpp:147 -#: ../../locales/../src/interface/filteredit.cpp:215 -#: ../../locales/../src/interface/filteredit.cpp:254 -#: ../../locales/../src/interface/filteredit.cpp:356 +#: ../../locales/../src/interface/filteredit.cpp:149 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "O nome do filtro xa existe" -#: resources.h:222 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" -msgstr "Filtrar os elementos que coincidan totalmente co seguinte" +msgstr "Filtrar os elementos que coincidan con todos os seguintes" -#: resources.h:223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" -msgstr "Filtrar os elementos que coincidan con calquera dos seguintes" +msgstr "Filtrar os elementos que coincidan con algún dos seguintes" -#: resources.h:224 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" -msgstr "Filtrar todos os elementos que non coincidan cos seguintes" +msgstr "Filtrar todos os elementos que difiran de todos os seguintes" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Filtra os elementos que difiran de algún dos seguintes" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "O conxunto de filtros xa existe" -#: resources.h:1006 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtrar a lista do cartafol" -#: ../../locales/../src/interface/filteredit.cpp:338 -#: ../../locales/../src/interface/filteredit.cpp:347 -#: ../../locales/../src/interface/filteredit.cpp:356 +#: ../../locales/../src/interface/filteredit.cpp:337 +#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter validation failed" msgstr "Fallou a validación do filtro" -#: resources.h:9 resources.h:33 -msgid "Fingerprint (MD5):" -msgstr "Impresión dixital (MD5):" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 +msgid "Find &files" +msgstr "Buscar &ficheiros" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 +msgid "Find d&irectories" +msgstr "Buscar &cartafoles" -#: resources.h:10 resources.h:34 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" msgstr "Impresión dixital (SHA-1):" -#: resources.h:180 resources.h:193 -msgid "Fingerprint:" -msgstr "Impresión dixital:" +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 +msgid "Fingerprint (SHA-256):" +msgstr "Impresión dixital (SHA-256):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Impresións dixitais:" -#: ../../locales/../src/interface/netconfwizard.cpp:42 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" -msgstr "Asistente de configuración da devasa e do enrutador" +msgstr "Asistente de configuración da devasa e do encamiñador" -#: resources.h:740 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -3940,12 +4474,12 @@ "Para unha información máis detallada sobre o que estas opcións fan, pode " "executar o asistente de configuración de rede." -#: resources.h:717 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 msgid "For reliability you should specify a range of at least 10 ports." msgstr "" "Por fiabilidade, debe especificar un intervalo de, cando menos, 10 portos." -#: ../../locales/../src/interface/Options.cpp:215 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -3953,55 +4487,70 @@ "Nesta sesión empregarase a configuración predeterminada. Calquera mudanza na " "configuración non se gardará." -#: resources.h:109 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Forzar &UTF-8" -#: resources.h:552 +#: ../../locales/../src/interface/menu_bar.cpp:148 msgid "Force showing &hidden files" msgstr "Obrigar que se mostren os ficheiros &ocultos" -#: ../../locales/../src/interface/Mainfrm.cpp:666 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Obrigar que se mostren os ficheiros ocultos" -#: resources.h:784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Especificacións do formato:" -#: resources.h:954 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" -"Formato: a extensión ten de estar seguida da orde apropiada e argumentos " -"entre comiñas." +"Formato: a extensión ten que estar seguida da orde apropiada e argumentos " +"entre vírgulas." -#: resources.h:470 +#. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n +#: ../../locales/../src/interface/updater.cpp:709 +#, c-format +msgid "Found new %s %s\n" +msgstr "Atopouse un novo %s %s\n" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Fallou a función %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Documentación engadida" -#: resources.h:78 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 msgid "General" msgstr "Xeral" -#: ../../locales/../src/engine/proxy.cpp:430 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "General SOCKS server failure" msgstr "Fallo xeral no servidor de SOCKS" -#: resources.h:802 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:122 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Xerar..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Proxy xenérico" -#: resources.h:706 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" -msgstr "Obtén o número externo de IP do URL seguinte:" +msgstr "Obter o enderezo IP externo do URL seguinte:" -#: resources.h:471 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Obtendo axuda" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Xa existe un conxunto de filtros con ese nome; quere sobrescribilo?" @@ -4009,100 +4558,144 @@ msgid "Global bookmarks" msgstr "Marcadores globais" -#: resources.h:166 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 +#, c-format +msgid "GnuTLS error %d" +msgstr "Erro GnuTLS %d" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 +#, c-format +msgid "GnuTLS error %d in %s" +msgstr "Erro GnuTLS %d en %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 +#, c-format +msgid "GnuTLS error %d in %s: %s" +msgstr "Erro GnuTLS %d en %s: %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 +#, c-format +msgid "GnuTLS error %d: %s" +msgstr "Erro GnuTLS %d: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: resources.h:138 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Verde" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Permisos de grupo" -#: resources.h:608 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 msgid "H&igh" msgstr "Alta" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP sobre TLS" -#: resources.h:341 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Oculto" -#: resources.h:827 ../../locales/../src/interface/queue.cpp:924 -#: ../../locales/../src/interface/queue.cpp:1011 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:1002 +#: ../../locales/../src/interface/queue.cpp:1064 msgid "High" msgstr "Alta" -#: ../../locales/../src/interface/queue.cpp:926 -#: ../../locales/../src/interface/queue.cpp:1013 +#: ../../locales/../src/interface/queue.cpp:1004 +#: ../../locales/../src/interface/queue.cpp:1066 msgid "Highest" msgstr "Máxima" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "O porto máis alto dispoñíbel ten que ter un número entre 1024 e 65535." -#: resources.h:210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Premer e manter a tecla de maiúsculas para mudar o estado do filtro en ambos " "os lados simultaneamente." -#: resources.h:157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Sitio web:" -#: resources.h:343 -msgid "Host key fingerprint:" -msgstr "Impresión dixital da chave do servidor:" +#: ../../locales/../src/engine/socket.cpp:1088 +msgid "Host is down" +msgstr "O servidor está desconectado" -#: resources.h:186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" -msgstr "Non coincide a chave do servidor" +msgstr "A chave do servidor non coincide" -#: ../../locales/../src/engine/server.cpp:166 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." -msgstr "O servidor comeza con '[' mais non se atopou o peche para o corchete." +msgstr "O servidor comeza con «[» mais non se atopou o peche para o corchete." -#: ../../locales/../src/engine/proxy.cpp:439 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Host unreachable" -msgstr "Servidor inatinxíbel" +msgstr "Servidor inaccesíbel" -#: resources.h:16 resources.h:40 resources.h:121 resources.h:178 -#: resources.h:191 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Servidor:" -#: resources.h:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algoritmo da chave do servidor:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Horas," -#: resources.h:903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Esquecín o meu contrasinal &mestre. Elimina todos os contrasinais " +"almacenados con esta chave." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" -msgstr "I&SO 8601 (examplo: 15:47)" +msgstr "I&SO 8601 (exemplo: 15:47)" + +#: ../../locales/../src/engine/proxy.cpp:115 +msgid "IPv6 addresses are not supported with SOCKS4 proxy" +msgstr "Os enderezos IPv6 non son compatíbeis co proxy SOCKS4" -#: resources.h:744 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " "reconnect." msgstr "" -"Se non se recibe nin envia ningún dato nunha operación durante este tempo, a " -"conexión pecharase e o FileZilla tentará conectase unha outra vez." +"Se non se envía nin recibe ningún dato durante o tempo especificado, a " +"conexión pecharase e o FileZilla intentará volver conectase." -#: resources.h:984 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Se desexa informar de erros, debe especificar un nivel de rexistro " -"\"detallado\"." +"«detallado»." -#: resources.h:697 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" "If the automatic test at the end of this wizard succeeds, but you cannot " "transfer files to a particular server, the server might be misconfigured and " @@ -4112,17 +4705,18 @@ "Se a comprobación automática do asistente ten éxito mais non pode transferir " "ningún ficheiro a un servidor particular, o servidor podería estar mal " "configurado e debería probar co modo activo. Ten de configurar o modo de " -"transferencia individualmente para cada servidor no Xestor de sitios." +"transferencia individualmente para cada servidor no xestor de sitios." -#: resources.h:692 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 msgid "" "If the fallback option is enabled, you will be able to connect to " "misconfigured servers which reject the selected transfer mode." msgstr "" -"Se a opción de retroceso está activada, poderá conectarse a servidores mal " -"configurados que rexeiten o modo de transferencia seleccionado." +"Se a opción de volver a outro modo está activada, poderá conectarse a " +"servidores mal configurados que rexeiten o modo de transferencia " +"seleccionado." -#: resources.h:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4130,33 +4724,33 @@ "Se cambia a chave do servidor e non estaba previsto, contacte co " "administrador do servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:554 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" -"Se este problema persiste, algún enrutador e/ou devasa mantén trabado o " +"Se este problema persiste, algún encamiñador e/ou devasa mantén trabado o " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" -"Se este problema persistir, algún enrutador e/ou devasa mantén interrompida " -"a conexión." +"Se este problema persistir, algún encamiñador e/ou devasa mantén " +"interrompida a conexión." -#: resources.h:973 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" -"If the size of the logfile reaches the limit, it gets renamed by adding \".1" -"\" to the end of the filename (possibly overwriting older logfiles) and a " -"new file gets created." +"If the size of the logfile reaches the limit, it gets renamed by adding " +"\".1\" to the end of the filename (possibly overwriting older logfiles) and " +"a new file gets created." msgstr "" "Se o tamaño do ficheiro de rexistro supera o límite, renoméase engadíndolle " -"\".1\" ao final do ficheiro (e posíbelmente sobrescribiranse outros " -"ficheiros) e crearase un novo ficheiro." +"«.1» ao final do ficheiro (posibelmente se sobrescriban os ficheiros de " +"rexistro antigos) e crearase un novo ficheiro." -#: resources.h:456 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4164,42 +4758,43 @@ "Se a ligazón simbólica apunta a un cartafol, o FileZilla pode tanto eliminar " "a ligazón simbólica como borrar os contidos do cartafol ligado." -#: ../../locales/../src/interface/netconfwizard.cpp:624 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" -"Se este problema persistir, deberá contactar co fabricante do enrutador ou " -"da devasan para procurar a solución." +"Se este problema persistir, deberá contactar co fabricante do encamiñador ou " +"da devasa para procurar a solución." -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." -msgstr "Se o problema persistir, contacte co fabricante do enrutador." +msgstr "Se o problema persistir, contacte co fabricante do encamiñador." -#: resources.h:279 resources.h:866 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " "timezone offset in the site manager." msgstr "" -"Se está a empregar a opción 'sobrescribir se é máis recente', a hora do " -"sistema ten de estar sincronizada coa do servidor. Se a hora difire ao (p." -"ex. en dúas zonas horarias diferentes), especifique a diferenza horaria no " -"Xestor de sitios." +"Se está a empregar a opción «sobrescribir se é máis recente», a hora do " +"sistema ten que estar sincronizada coa do servidor. Se a hora difire (p.ex. " +"en dúas zonas horarias diferentes), especifique a diferenza horaria no " +"xestor de sitios." -#: resources.h:927 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." msgstr "" -"Se está a empregar un selo horario baseado na comparación, consideraranse " -"dous ficheiros igual se a diferenza entre horaria non excede deste límite." +"Se usa a comparación baseada en marca de tempo, considere dous ficheiros " +"iguais se a súa diferenza de marca de tempo non supera este límite." -#: resources.h:942 -msgid "If you change the language, you should restart FileZilla." -msgstr "Se vostede cambia o idioma, debería reiniciar o FileZilla." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 +msgid "If you change the language, you need to restart FileZilla." +msgstr "Se cambia o idioma, precisa reiniciar o FileZilla." -#: resources.h:723 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" "If you click on test, FileZilla will connect to probe.filezilla-project.org " "and will perform some simple tests." @@ -4207,49 +4802,50 @@ "Se elixe a comprobación, o FileZilla conectarase a probe.filezilla-project." "org e realizará algunhas probas sinxelas." -#: ../../locales/../src/interface/Mainfrm.cpp:1221 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." -msgstr "Se pecha o FileZilla, perderanse as súas mudanzas." +msgstr "Se pecha o FileZilla, perderanse os seus cambios." -#: resources.h:842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "" -"Se introduce un tipo de ficheiros incorrecto, estes ficheiros poden danarse " -"ao se transferiren." +"Se insire tipos de ficheiros incorrectos, estes ficheiros poden danarse ao " +"se transferiren." -#: resources.h:724 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." -msgstr "Se obtiver algún erro, a configuración non pode ser correcta." +msgstr "Se obtén algún erro significa que a configuración non é correcta." -#: resources.h:756 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." msgstr "" "Se ten problemas para recuperar as listaxes de cartafoles ou para transferir " -"ficheiros, tente mudar a configuración do modo de transferencia." +"ficheiros, intente mudar o modo de transferencia predeterminado." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " "passive mode and contact the server administrator for help." msgstr "" -"Se continúa a ter problemas cun servidor en concreto, é posíbel que estea " -"mal configurado. Neste caso, pode tentar a cambiar entre os modos activos e " -"pasivos e contactar coa administración do servidor para obter axuda." +"Se continúa a ter problemas cun servidor en concreto, pode que o servidor, o " +"encamiñador ou devasa estea mal configurado. Neste caso, pode intentar a " +"cambiar entre os modos activos e pasivos e contactar co administrador do " +"servidor para obter axuda." -#: resources.h:683 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 msgid "" "If you successfully complete the wizard and the final test succeeds, any " "firewalls and routers you have should be configured properly." msgstr "" "De se completar o asistente e se a proba final tivo éxito, todos os " -"enrutadores e as devasas estarán configuradas correctamente." +"encamiñadores e as devasas estarán configuradas correctamente." -#: resources.h:719 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 msgid "" "If you use a firewall, make sure FileZilla is allowed to accept connection " "on all given ports." @@ -4257,41 +4853,41 @@ "Se está a empregar unha devasa, debe asegurarse de que o FilleZilla está " "configurado para aceptar a conexión con todos os portos dados." -#: resources.h:718 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 msgid "" "If you use a router, make sure all these ports are forwarded to the machine " "you're running FileZilla on." msgstr "" -"Se emprega un enrutador, deberá asegurarse de que os portos están " +"Se emprega un encamiñador, deberá asegurarse de que os portos están " "redirixidos ao computador en que está a executar o FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "" -"Se o enrutador continúa a modificar o número de IP, debe contactar co " +"Se o encamiñador continúa a modificar o enderezo IP, debe contactar co " "fabricante." -#: ../../locales/../src/interface/import.cpp:96 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importar datos dunha versión anterior" -#: resources.h:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Configuración da importación" #: ../../locales/../src/interface/import.cpp:81 -#: ../../locales/../src/interface/import.cpp:84 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Importouse correctamente" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50 -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 msgid "Improperly quoted association." -msgstr "A asociación non ten as comiñas correctamente." +msgstr "A asociación non ten as vírgulas correctamente." -#: resources.h:711 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" "In active mode, FileZilla has to listen on a port for data transfers. You " "have to specify which ports FileZilla will use." @@ -4299,31 +4895,24 @@ "No modo activo, o FileZilla escoita un porto para as transferencias de " "datos. Ten de especificar que portos empregará o FileZilla." -#: resources.h:713 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 msgid "" "In case you have a router, you will have to forward all available ports, as " "FileZilla has no influence on the ports your system chooses." msgstr "" -"Caso de empregar un enrutador, terá que redirixir todos os portos " +"Caso de empregar un encamiñador, terá que redirixir todos os portos " "dispoñíbeis pois o FileZilla non inflúe sobre os portos que escolle o seu " "sistema." -#: resources.h:255 -msgid "" -"In case you prefer automatic updates, you can enable automatic update checks " -"in the settings dialog." -msgstr "" -"Caso de preferir as actualizacións automáticas, ten de activar a " -"comprobación automática no diálogo da configuración." - -#: resources.h:701 resources.h:765 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." msgstr "" -"Para empregar o modo activo, o FileZilla precisa o número de IP externo." +"Para empregar o modo activo, o FileZilla precisa o enderezo IP externo." -#: resources.h:686 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:52 msgid "" "In passive mode, which is recommended for most users, FileZilla asks the " "server for a port and connects to the given port. Not much configuration has " @@ -4333,282 +4922,373 @@ "pediralle un porto ao servidor co que se conectará. Para facer isto, non é " "preciso configurar ningunha opción." -#: ../../locales/../src/engine/tlssocket.cpp:910 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Cadea incompleta, o certificado raíz non está asinado automaticamente por " -"unha autoridade certificada" - -#: ../../locales/../src/interface/QueueView.cpp:1064 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Contrasinal incorrecto" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 +msgid "" +"Information about the latest version of FileZilla could not be retrieved. " +"Please try again later." +msgstr "" +"Non se puido recuperar información sobre a última versión de FileZilla. " +"Inténteo outra vez máis tarde." + +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Estase a iniciar o TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 +msgid "Insecure algorithm!" +msgstr "Algoritmo inseguro!" + +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Servidor inseguro, non permite FTP sobre TLS." -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/engine/server.cpp:611 +#: ../../locales/../src/engine/server.cpp:635 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interactivo" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:126 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 msgid "Interface" msgstr "Interface" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/QueueView.cpp:1021 -#: ../../locales/../src/interface/QueueView.cpp:1597 +#: ../../locales/../src/engine/socket.cpp:1074 +msgid "Interrupted by signal" +msgstr "Interrompido polo sinal" + +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Interrupción feita polo usuario" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:772 +#: ../../locales/../src/engine/http/request.cpp:161 +#: ../../locales/../src/engine/http/request.cpp:584 msgid "Invalid Content-Length" -msgstr "A lonxitude do contido non é correcta" +msgstr "A lonxitude do contido é incorrecta" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:623 +#: ../../locales/../src/engine/http/request.cpp:490 msgid "Invalid HTTP Response" -msgstr "A resposta de HTTP non é correcta" +msgstr "A resposta de HTTP é incorrecta" + +#: ../../locales/../src/engine/socket.cpp:1062 +msgid "Invalid argument passed" +msgstr "O argumento pasado é incorrecto" -#: ../../locales/../src/engine/ControlSocket.cpp:544 -#: ../../locales/../src/engine/ControlSocket.cpp:604 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." msgstr "" "Recibiuse unha secuencia incorrecta de caracteres polo que se desactiva o " -"UTF-8. Debe seleccionar a opción UTF-8 no xestor de sitios para forzar o UTF-" -"8." +"UTF-8. Debe seleccionar a opción UTF-8 no xestor de sitios para forzar o " +"UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:896 +#: ../../locales/../src/engine/http/request.cpp:705 msgid "Invalid chunk size" -msgstr "O tamaño do anaco non é correcto" +msgstr "O tamaño do anaco é incorrecto" -#: ../../locales/../src/interface/netconfwizard.cpp:353 -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Recibiuse un dato incorrecto" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 -#: ../../locales/../src/interface/verifycertdialog.cpp:48 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" -msgstr "A data non é correcta" +msgstr "A data é incorrecta" -#: ../../locales/../src/interface/LocalListView.cpp:1348 -#: ../../locales/../src/interface/LocalListView.cpp:1373 -#: ../../locales/../src/interface/RemoteListView.cpp:3188 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" -msgstr "O nome do ficheiro non é correcto" +msgstr "O nome do ficheiro é incorrecto" -#: ../../locales/../src/engine/server.cpp:173 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "O hash é incorrecto: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" -"O servidor non é valido, xa que despois de se pechar o corchete só poden " +"O servidor é incorrecto, xa que despois de se pechar o corchete só poden " "seguirlle dous puntos e o porto." -#: ../../locales/../src/interface/loginmanager.cpp:104 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "O nome do servidor é incorrecto: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Entrada incorrecta" -#: ../../locales/../src/engine/server.cpp:61 -#: ../../locales/../src/engine/server.cpp:194 -#: ../../locales/../src/engine/server.cpp:206 +#: ../../locales/../src/engine/http/request.cpp:518 +msgid "Invalid line" +msgstr "A liña é incorrecta" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "A ruta é incorrecta" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Deuse un porto incorrecto. O porto ten que ter un valor de 1 a 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:125 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" -"ftp:// for normal FTP,\n" +"ftp:// for normal FTP with optional encryption,\n" "sftp:// for SSH file transfer protocol,\n" -"ftps:// for FTP over SSL (implicit) and\n" -"ftpes:// for FTP over SSL (explicit)." +"ftps:// for FTP over TLS (implicit) and\n" +"ftpes:// for FTP over TLS (explicit)." msgstr "" -"Especificouse un protocolo que non é correcto. Os correctos son os " -"seguintes:\n" -"ftp:// para un FTP normal,\n" +"Especificouse un protocolo incorrecto. Os válidos son os seguintes:\n" +"ftp:// para un FTP norma coa opción de cifrar,\n" "sftp:// para o protocolo de transferencia de ficheiros SSH,\n" -"ftps:// para FTP sobre SSL (implícito) e\n" -"ftpes:// para FTP sobre SSL (explícito)." +"ftps:// para FTP sobre TLS (implícito) e\n" +"ftpes:// para FTP sobre TLS (explícito)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4394 -#, fuzzy +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" -"O servidor non é valido, xa que despois de se pechar o corchete só poden " -"seguirlle dous puntos e o porto." +"O servidor proxy é incorrecto, xa que despois de se pechar o corchete só " +"poden seguirlle dous puntos e o porto." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "A expresión regular é incorrecta" -#: ../../locales/../src/interface/search.cpp:698 +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." -msgstr "Expresión regular incorrecta nas condicións de procura." +msgstr "A expresión regular é incorrecta nas condicións de busca." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/http/request.cpp:499 msgid "Invalid response code" -msgstr "O código da resposta non é correcto" +msgstr "O código da resposta é incorrecto" -#: ../../locales/../src/interface/search.cpp:692 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" -msgstr "Condicións de procura incorrectas: %s" +msgstr "Condicións de busca incorrectas: %s" -#: ../../locales/../src/interface/sitemanager.cpp:419 -#: ../../locales/../src/interface/sitemanager.cpp:439 -#: ../../locales/../src/interface/sitemanager.cpp:456 -#: ../../locales/../src/interface/sitemanager.cpp:463 -#: ../../locales/../src/interface/sitemanager.cpp:470 -#: ../../locales/../src/interface/sitemanager.cpp:487 -#: ../../locales/../src/interface/sitemanager.cpp:556 -#: ../../locales/../src/interface/sitemanager.cpp:733 -#: ../../locales/../src/interface/sitemanager.cpp:740 -#: ../../locales/../src/interface/sitemanager.cpp:818 -#: ../../locales/../src/interface/sitemanager.cpp:825 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Ruta do sitio incorrecta" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" -msgstr "O tamaño da condición non é correcto" +msgstr "O tamaño da condición é incorrecto" -#: ../../locales/../src/engine/server.cpp:136 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." -msgstr "Nome de usuario incorrecto." +msgstr "Nome de usuario dado é incorrecto." -#: ../../locales/../src/interface/verifycertdialog.cpp:189 +#: ../../locales/../src/engine/socket.cpp:1095 +msgid "Invalid value for ai_flags" +msgstr "O valor de ai_flags é incorrecto" + +#: ../../locales/../src/engine/socket.cpp:1097 +msgid "Invalid value for hints" +msgstr "O valor para as suxestións é incorrecto" + +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Inverter o filtro" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "País da xurisdición:" -#: ../../locales/../src/interface/verifycertdialog.cpp:191 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Localidade de xurisdición:" -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Provincia ou estado de xurisdición:" -#: resources.h:924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Manter os cartafoles arriba" -#: ../../locales/../src/interface/Mainfrm.cpp:670 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " "some tests to check if the server supports this feature, the test may fail." msgstr "" -"Repare que non todos os servidores son compatíbeis con esta caracterísitca e " -"talvez poidan devolver listaxes incorrectas se esta opción está activada. " +"Repare que non todos os servidores son compatíbeis con esta característica e " +"pode que poidan devolver listaxes incorrectas se esta opción está activada. " "Aínda que o FileZilla realiza algunhas probas para comprobar se o servidor é " "compatíbel con esta característica, a proba pode fallar." -#: resources.h:338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Cambio de chave" -#: resources.h:611 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 +msgid "Key exchange:" +msgstr "Cambio de chave:" + +#: ../../locales/../src/engine/server.cpp:608 +#: ../../locales/../src/engine/server.cpp:633 +msgid "Key file" +msgstr "Ficheiro chave" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Identificador da chave:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 msgid "L&owest" msgstr "Mínima" -#: resources.h:940 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:131 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Idioma" -#: ../../locales/../src/interface/Mainfrm.cpp:1532 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Cambio de idioma" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" -msgstr "Ültima modificación" +msgstr "Modificado o" -#: resources.h:869 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Distribución" -#: resources.h:815 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Deixar baleiro para manter o contrasinal existente." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Límite para as &descargas simultáneas:" -#: resources.h:817 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Límite para os envíos simultáneos:" -#: resources.h:760 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" -msgstr "Limitar portos locais" +msgstr "Limitar os portos locais" -#: resources.h:970 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Tamaño límite do ficheiro" -#: resources.h:971 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Límite:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/http/request.cpp:659 msgid "Line length exceeded" msgstr "Excedeuse a lonxitude da liña" -#: resources.h:168 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Ligado contra" -#: ../../locales/../src/interface/netconfwizard.cpp:267 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" -msgstr "Sócket de escoita pechado" +msgstr "Toma (socket) de escoita pechado" -#: ../../locales/../src/engine/logging.cpp:220 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:360 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Lista:" -#: resources.h:763 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "P&orto más baixo dispoñíbel:" -#: ../../locales/../src/interface/edithandler.cpp:1280 -#: ../../locales/../src/interface/edithandler.cpp:1534 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Local" -#: resources.h:365 +#: ../../locales/../src/engine/socket.cpp:1059 +msgid "Local address in use" +msgstr "O enderezo local está en uso" + +#: ../../locales/../src/engine/socket.cpp:1087 +msgid "Local endpoint has been closed" +msgstr "O punto final local foi pechado" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Ficheiro local" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "O ficheiro local non existe." -#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 +#, c-format +msgid "Local file is %s\n" +msgstr "O ficheiro local é %s\n" + +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "O ficheiro local é un cartafol no canto dun ficheiro regular." -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "O ficheiro local ten un nome incorrecto." -#: resources.h:204 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Busca de ficheiros locais" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Filtros locais:" -#: ../../locales/../src/interface/viewheader.cpp:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Manexo de rutas locais:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Sitio local:" -#: ../../locales/../src/interface/verifycertdialog.cpp:183 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "O tamaño local de «%s» difire do tamaño esperado: %d ! = %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Localidade:" @@ -4616,16 +5296,16 @@ msgid "Log file" msgstr "Ficheiro de rexistro" -#: resources.h:252 -msgid "Log of update check:" -msgstr "Rexistrar comprobacións de actualizacións:" +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Identificado" -#: resources.h:965 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:140 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Rexistro" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4634,26 +5314,27 @@ "compatíbel co UTF-8. Non se pode volver ao xogo de caracteres local xa que " "se está a empregar o proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." msgstr "" "Os datos de identificación conteñen caracteres non-ASCII e o servidor talvez " -"non é compatíbel co UTF-8. Estase a tentar coa codificación local." +"non é compatíbel co UTF-8. Estase a intentar coa codificación local." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" -"A secuencia de indentificación executouse completamente mais aínda non se " -"conectou. Estase a deter." +"A secuencia de identificación executouse completamente mais aínda non se " +"conectou. Estase a interromper." -#: ../../locales/../src/interface/cmdline.cpp:95 +#: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." msgstr "" -"O tipo de rexistro ten de ser 'preguntar' ou 'interactivo' (sen comiñas)." +"O tipo de inicio de sesión ten que ser 'preguntar' ou 'interactivo' (sen " +"vírgulas)." -#: ../../locales/../src/interface/cmdline.cpp:10 +#: ../../locales/../src/interface/cmdline.cpp:11 #, c-format msgid "" "Logontype, can only be used together with FTP URL. Argument has to be either " @@ -4662,489 +5343,684 @@ "O rexistro só se pode empregar cun URL de FTP. O argumento debe de estar " "entre '%s' ou '%s'" -#: ../../locales/../src/interface/queue.cpp:919 -#: ../../locales/../src/interface/queue.cpp:1006 +#: ../../locales/../src/interface/queue.cpp:997 +#: ../../locales/../src/interface/queue.cpp:1059 msgid "Low" msgstr "Baixa" -#: ../../locales/../src/interface/queue.cpp:917 -#: ../../locales/../src/interface/queue.cpp:1004 +#: ../../locales/../src/interface/queue.cpp:995 +#: ../../locales/../src/interface/queue.cpp:1057 msgid "Lowest" msgstr "Mínima" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "" "O porto máis baixo dispoñíbel ten que ter un número entre 1024 e 65535." -#: resources.h:20 resources.h:44 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:67 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Maxenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" -"Cómpre asegurarse de que se pode acceder ao ficheiro e que é un documento " +"Precisa asegurarse de que se pode acceder ao ficheiro e que é un documento " "XML ben formado." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:827 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:839 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:854 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:896 +#: ../../locales/../src/engine/http/request.cpp:646 +#: ../../locales/../src/engine/http/request.cpp:652 +#: ../../locales/../src/engine/http/request.cpp:659 +#: ../../locales/../src/engine/http/request.cpp:670 +#: ../../locales/../src/engine/http/request.cpp:705 #, c-format msgid "Malformed chunk data: %s" msgstr "Anaco de datos mal formado: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:772 +#: ../../locales/../src/engine/http/request.cpp:161 #, c-format -msgid "Malformed header: %s" -msgstr "Cabeceira mal formada: %s" - -#: ../../locales/../src/engine/httpcontrolsocket.cpp:593 -msgid "Malformed reply, server not sending proper line endings" -msgstr "" -"Resposta mal formulada; o servidor non envía remates de liñas incorrectos" +msgid "Malformed request header: %s" +msgstr "A cabeceira da petición é incorrecta: %s" -#: resources.h:395 ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/engine/http/request.cpp:459 +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:518 +#: ../../locales/../src/engine/http/request.cpp:574 +#: ../../locales/../src/engine/http/request.cpp:584 +#, c-format +msgid "Malformed response header: %s" +msgstr "A cabeceira da resposta é incorrecta: %s" + +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +#, c-format +msgid "Malformed response: %s" +msgstr "A cabeceira é incorrecta: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 #: ../../locales/../src/interface/manual_transfer.cpp:323 -#: ../../locales/../src/interface/manual_transfer.cpp:328 -#: ../../locales/../src/interface/manual_transfer.cpp:336 -#: ../../locales/../src/interface/manual_transfer.cpp:343 -#: ../../locales/../src/interface/manual_transfer.cpp:350 -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Transferencia manual" -#: resources.h:435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "&Contrasinal mestre:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Contrasinal mestre:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" -msgstr "Todas estas condicións" +msgstr "Coincide con todas as seguintes" -#: resources.h:436 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" -msgstr "Usar unha das seguintes" +msgstr "Coincide con algunha das seguintes" -#: resources.h:437 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" -msgstr "Non usar unha das seguintes" +msgstr "Difire de todas as seguintes" -#: resources.h:813 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Difire de algunha das seguintes" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Número máximo de &transferencias simultáneas:" -#: ../../locales/../src/interface/Mainfrm.cpp:378 -#: ../../locales/../src/interface/Mainfrm.cpp:1860 +#: ../../locales/../src/engine/socket.cpp:1101 +msgid "Memory allocation failure" +msgstr "Fallou a asignación de memoria" + +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" -msgstr "Rexistro da mensaxe" +msgstr "Rexistro de mensaxes" -#: resources.h:880 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Posición do rexistro da mensaxe" -#: resources.h:972 +#: ../../locales/../src/engine/socket.cpp:1084 +msgid "Message too large" +msgstr "A mensaxe é longa de máis" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: resources.h:97 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Minutos" -#: resources.h:359 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Bai&xar" -#: resources.h:358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "S&ubir" -#: ../../locales/../src/interface/LocalTreeView.cpp:1067 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "O meu PC" -#: ../../locales/../src/interface/LocalTreeView.cpp:1057 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Os meus documentos" -#: ../../locales/../src/interface/sitemanager.cpp:290 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:718 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:720 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "Os meus sitios" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:176 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:178 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" -msgstr "MVSN/a" +msgstr "N/d" -#: resources.h:400 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Nome" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "O nome xa existe" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 -#: ../../locales/../src/interface/sitemanager.cpp:757 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "O nome do marcador xa existe." -#: resources.h:120 resources.h:169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Nome:" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +msgid "Natural sort" +msgstr "Ordenación natural" + +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" -msgstr "Cómpre introducir un nome de ficheiro" +msgstr "Precisa inserir un nome de filtro" + +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Precisa inserir unha ruta local correcta" -#: ../../locales/../src/interface/search.cpp:682 +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" -msgstr "Cómpre introducir unha ruta remota correcta" +msgstr "Precisa inserir unha ruta remota correcta" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:996 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "Precisa especificar unha codificación de caracteres" -#: ../../locales/../src/engine/proxy.cpp:436 +#: ../../locales/../src/engine/socket.cpp:1105 +msgid "Neither nodename nor servname provided, or not known" +msgstr "" +"Non se forneceron, nin o nome do nodo nin o nome do servidor, ou son " +"descoñecidos" + +#: ../../locales/../src/engine/socket.cpp:1092 +msgid "" +"Network host does not have any network addresses in the requested address " +"family" +msgstr "" +"O servidor de rede non ten ningún enderezo de rede na familia de enderezos " +"solicitada" + +#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" -msgstr "Rede inatinxíbel" +msgstr "Rede inaccesíbel" -#: resources.h:73 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 +msgid "Never" +msgstr "Nunca" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 msgid "New &Folder" msgstr "Carta&fol novo" -#: resources.h:502 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "New &tab" msgstr "Nova &lapela" -#: resources.h:74 resources.h:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Novo &marcador" -#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:76 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:83 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:108 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:453 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:557 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:580 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 -#: ../../locales/../src/interface/sitemanager.cpp:757 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Novo marcador" #: ../../locales/../src/interface/LocalTreeView.cpp:1185 -#: ../../locales/../src/interface/RemoteListView.cpp:1631 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1288 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Novo cartafol" -#: ../../locales/../src/interface/welcome_dialog.cpp:53 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Novas características e melloras en %s" -#: ../../locales/../src/interface/filteredit.cpp:129 +#: ../../locales/../src/interface/filteredit.cpp:131 msgid "New filter" msgstr "Novo filtro" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Novo cartafol" -#: ../../locales/../src/interface/sitemanager.cpp:622 -#: ../../locales/../src/interface/sitemanager.cpp:636 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Novo sitio" -#: resources.h:878 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" -msgstr "Preto da cola de trasnferencia" +msgstr "Contiguo á cola de transferencia" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "Non" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/engine/socket.cpp:1103 +msgid "No address associated with nodename" +msgstr "Non hai enderezos asociados co nome de nodo" + +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Non se seleccionou ningunha categoría para exportar" -#: ../../locales/../src/interface/QueueView.cpp:2297 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "No command given, aborting." msgstr "Non se especificou ningunha orde; estase a deter." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3908 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "" -"Non se configurou ningun número de IP externo, polo que se está a tentar co " -"predeterminada." +"Non se configurou ningún enderezo IP externo, polo que se está a intentar co " +"predeterminado." -#: ../../locales/../src/interface/edithandler.cpp:1221 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Actualmente non se está a editar ningún ficheiro." -#: ../../locales/../src/interface/filteredit.cpp:141 +#: ../../locales/../src/interface/filteredit.cpp:143 msgid "No filter name given" msgstr "Non se escribiu ningún nome ao ficheiro" -#: ../../locales/../src/engine/server.cpp:76 -#: ../../locales/../src/engine/server.cpp:187 -#: ../../locales/../src/engine/server.cpp:216 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." -msgstr "Non se deu o hospedador, polo que debe introducir un." +msgstr "Non forneceu o servidor, polo que debe inserir un." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:101 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Non hai imaxes dispoñíbeis" -#: ../../locales/../src/interface/QueueView.cpp:3168 -msgid "No more files in the queue!" -msgstr "Non hai máis ficheiros na cola!" - -#: ../../locales/../src/interface/filter.cpp:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Non se especificou ningún nome ao conxunto de filtros." -#: resources.h:431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Non hai ningún programa asociado co tipo de ficheiro" -#: resources.h:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Non hai ningún programa asociado para editar ficheiros coa extensión '%s'." -#: ../../locales/../src/interface/search.cpp:540 +#: ../../locales/../src/engine/socket.cpp:1079 +msgid "No route to host" +msgstr "Sen ruta para o servidor" + +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" -msgstr "Ningún resultado da procura" +msgstr "Ningún resultado da busca" -#: ../../locales/../src/interface/sitemanager.cpp:256 -#: ../../locales/../src/interface/sitemanager.cpp:268 -#: ../../locales/../src/interface/sitemanager.cpp:299 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Non hai ningún sitio dispoñíbel" -#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:466 msgid "No supported SOCKS5 auth method" msgstr "O método de autenticación SOCKS5 non é compatíbel" -#: ../../locales/../src/interface/loginmanager.cpp:104 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Non se especificou ningún nome de usuario." -#: resources.h:934 resources.h:939 -#: ../../locales/../src/interface/verifycertdialog.cpp:54 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" -msgstr "Ningún" +msgstr "Ningunha" -#: resources.h:375 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Aínda non se seleccionou nada" -#: resources.h:826 ../../locales/../src/engine/server.cpp:852 -#: ../../locales/../src/engine/server.cpp:871 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:185 -#: ../../locales/../src/interface/manual_transfer.cpp:560 -#: ../../locales/../src/interface/queue.cpp:922 -#: ../../locales/../src/interface/queue.cpp:1009 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288 +#: ../../locales/../src/engine/socket.cpp:1099 +msgid "Nonrecoverable failure in name resolution" +msgstr "Fallo irrecuperábel na resolución de nomes" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:602 +#: ../../locales/../src/engine/server.cpp:629 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:1062 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:326 -#: ../../locales/../src/interface/queueview_failed.cpp:351 -msgid "Not all items could be requeued for viewing/editing." -msgstr "Non todos os elementos poden volver á cola para se ver ou editar." +#: ../../locales/../src/interface/queueview_failed.cpp:309 +#: ../../locales/../src/interface/queueview_failed.cpp:334 +msgid "Not all items could be requeued for transfer." +msgstr "" +"Non se puido engadir á cola de novo todos os elementos para a súa " +"transferencia." -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:504 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Non conectado" -#: ../../locales/../src/interface/RemoteListView.cpp:2360 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Non está conectado a ningún servidor" -#: ../../locales/../src/interface/Mainfrm.cpp:564 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Non está conectado a ningún servidor." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Non conectado." -#: ../../locales/../src/interface/Mainfrm.cpp:668 +#: ../../locales/../src/engine/socket.cpp:1120 +msgid "Not initialized, need to call WSAStartup" +msgstr "Non inicializado, precisa chamar a WSAStartup" + +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Cómpre salientar que esta característica só é compatíbel co protocolo FTP." -#: resources.h:794 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Cómpre salientar que non se pode recuperar unha chave perdida." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" -"Cómpre ter en conta que esta opción só funciona en conexións de FTP sen " -"cifrar e planas." +"Cómpre salientar que esta opción só funciona en conexións de FTP sen cifrar " +"e planas." -#: resources.h:811 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" -"Nota: ao usar un próxy xenérico obriga ao modo pasivo nas conexións de FTP." +"Cómpre salientar que ao usar un próxy xenérico obriga ao modo pasivo nas " +"conexións do FTP." + +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:652 +msgid "Null character in line" +msgstr "Carácter nulo na liña" -#: resources.h:913 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" -msgstr "Número de lugares decimais:" +msgstr "Número de decimais:" #: ../../locales/../src/interface/settings/optionspage_connection.cpp:35 msgid "Number of retries has to be between 0 and 99." -msgstr "O número de tentativas ten que estar entre 0 e 99." +msgstr "O número de intento ten que estar entre 0 e 99." -#: resources.h:334 -msgid "O&pen file" -msgstr "A&brir ficheiro" - -#: resources.h:24 resources.h:46 resources.h:68 resources.h:130 -#: resources.h:152 resources.h:174 resources.h:184 resources.h:197 -#: resources.h:212 resources.h:229 resources.h:280 resources.h:289 -#: resources.h:296 resources.h:304 resources.h:327 resources.h:335 -#: resources.h:354 resources.h:360 resources.h:393 resources.h:407 -#: resources.h:429 resources.h:452 resources.h:461 resources.h:475 -#: resources.h:488 resources.h:495 resources.h:737 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:396 +msgid "O&pen" +msgstr "A&brir" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: resources.h:693 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 +msgid "OS version:" +msgstr "Versión do SO:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " "well as the fallback mode if enabled." msgstr "" "Nas páxinas seguintes, hase configurar o modo de transferencia seleccionado, " -"tamén no caso de estar activo o modo de retroceso." +"tamén no caso de estar activa a opción de volver a outro modo." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Unha vez" -#: resources.h:964 -msgid "" -"Only the versions of FileZilla and the operating system you are using will " -"be submitted to the server." -msgstr "" -"Só as versións do FileZilla e o sistema operativo que está a empregar serán " -"enviados ao servidor." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 +msgid "Once a day" +msgstr "Unha vez ao día" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 +msgid "Once a week" +msgstr "Unha vez á semana" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 +msgid "Only use plain FTP (insecure)" +msgstr "Utilice só o FTP sinxelo (inseguro)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Abrir fich&eiro" -#: resources.h:662 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "Open directory in system's file manager" msgstr "Abrir o cartafol no xestor de ficheiros do sistema" -#: resources.h:986 resources.h:987 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" -msgstr "Abrir o Xestor de sitios" +msgstr "Abrir o xestor de sitios" + +#: ../../locales/../src/interface/toolbar.cpp:31 +msgid "Open the Site Manager." +msgstr "Abrir o xestor de sitios." + +#: ../../locales/../src/interface/toolbar.cpp:33 +msgid "Open the Site Manager. Right-click for a list of sites." +msgstr "" +"Abre o administrador do sitio. Fai clic co botón dereito para ver unha lista " +"de sitios." -#: resources.h:572 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Abrir o diálogo de permisos de acceso a cartafoles para configurar que os " +"cartafoles locais teñan acceso ao FileZilla." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 msgid "Open the file." msgstr "Abrir o ficheiro." -#: resources.h:515 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "Open the settings dialog of FileZilla" msgstr "Abrir o diálogo de configuración do FileZilla" -#: resources.h:310 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Aberto como:" -#: ../../locales/../src/interface/LocalListView.cpp:2040 -#: ../../locales/../src/interface/LocalListView.cpp:2085 -#: ../../locales/../src/interface/LocalListView.cpp:2172 -#: ../../locales/../src/interface/LocalListView.cpp:2185 -#: ../../locales/../src/interface/RemoteListView.cpp:2660 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Fallou ao abrir" -#: resources.h:503 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "Opens a new tab" msgstr "Abre nunha nova lapela" -#: resources.h:500 +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "Opens the Site Manager" -msgstr "Abre o Xestor de sitios" +msgstr "Abre o xestor de sitios" -#: resources.h:1007 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" -"Abre o diálogo para filtro de listas de cartafoles. Prema co botón dereito " -"do rato para alternar os filtros." +"Abre o diálogo de filtros da listaxe en cartafol. Prema co botón dereito do " +"rato para seleccionar os filtros." -#: resources.h:172 -msgid "Operating system" -msgstr "Sistema operativo" - -#: ../../locales/../src/interface/FileZilla.cpp:306 -msgid "Operating system problem detected" -msgstr "Detectouse un problema no sistema opertativo" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 +msgid "Operating System:" +msgstr "Sistema operativo:" + +#: ../../locales/../src/engine/socket.cpp:1070 +msgid "Operation already in progress" +msgstr "A operación xa está en progreso" + +#: ../../locales/../src/engine/socket.cpp:1061 +msgid "Operation in progress" +msgstr "A operación está en progreso" + +#: ../../locales/../src/engine/socket.cpp:1082 +msgid "Operation not supported" +msgstr "A operación non é compatíbel" + +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Opcións" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Laranxa" -#: ../../locales/../src/interface/verifycertdialog.cpp:177 +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Organización:" -#: ../../locales/../src/interface/verifycertdialog.cpp:199 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 +msgid "Other SFTP options" +msgstr "Outras opcións do SFTP" + +#: ../../locales/../src/engine/socket.cpp:1115 +msgid "Other system error" +msgstr "Outro erro de sistema" + +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Outro:" -#: resources.h:739 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 +msgid "Out of memory" +msgstr "Sen memoria" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Sobrescribir" -#: resources.h:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Sobreescr&ibir se é máis nova a orixe" -#: resources.h:261 resources.h:271 resources.h:849 resources.h:858 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Sobrescribir ficheiro" -#: resources.h:263 resources.h:273 resources.h:851 resources.h:860 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Sobrescribir o ficheiro se o tamaño difire" -#: resources.h:264 resources.h:274 resources.h:852 resources.h:861 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "" "Sobrescribir o ficheiro se o tamaño difire ou o ficheiro de orixe é máis " "recente" -#: resources.h:262 resources.h:272 resources.h:850 resources.h:859 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Sobrescribir ficheiro se o ficheiro de orixe é máis recente" -#: resources.h:60 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Sobrescribir se teñen tamaño &diferente" -#: resources.h:61 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Sobrescribir se teñen &tamaño diferente ou a orixe é máis recente" -#: resources.h:134 +#: ../../locales/../src/interface/updater.cpp:259 +#, c-format +msgid "Own build type: %s\n" +msgstr "Tipo de compilación propia: %s\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Permisos de usuario" -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:385 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Propietario / Grupo" -#: resources.h:884 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5152,94 +6028,112 @@ "Evita&r que o sistema entre en espera durante a transferencia e outras " "operacións" -#: resources.h:791 resources.h:807 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" -msgstr "Servidor de p&roxy:" +msgstr "Servidor p&roxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:488 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." -msgstr "O enrutador ou a devasa modificou a orde PORT." +msgstr "O encamiñador ou a devasa modificou a orde PORT." -#: resources.h:753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" -msgstr "Pa&sivo (recoméndase)" - -#: ../../locales/../src/interface/updatewizard.cpp:324 -msgid "Package" -msgstr "Paquete" +msgstr "&Pasivo (recomendado)" -#: ../../locales/../src/interface/Mainfrm.cpp:2494 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "O parámetro non é un URL correcto" -#: resources.h:85 resources.h:384 resources.h:731 +#: ../../locales/../src/interface/updater.cpp:595 +#, c-format +msgid "Parsing %d bytes of version information.\n" +msgstr "Analizando %d bytes de información da versión.\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Contra&sinal:" -#: resources.h:689 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" -msgstr "Modo pasivo (recoméndase)" +msgstr "&Pasivo (recomendado)" -#: resources.h:773 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:119 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Modo pasivo" -#: ../../locales/../src/interface/netconfwizard.cpp:588 -#: ../../locales/../src/interface/netconfwizard.cpp:601 -#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "O modo de transferencia pasivo estabeleceuse como o predeterminado." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Non se estableceu o contrasinal ou a chave de cifrado" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Requírese o contrasinal" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147 -#: ../../locales/../src/interface/search.cpp:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Contrasinais" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Ruta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3195 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Non se pode construír a ruta para o cartafol %s e o subcartafol %s" -#: resources.h:402 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 +msgid "Path not found:" +msgstr "Non se atopou a ruta:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Rutas" -#: ../../locales/../src/interface/edithandler.cpp:1259 -#: ../../locales/../src/interface/edithandler.cpp:1402 -#: ../../locales/../src/interface/edithandler.cpp:1501 -#: ../../locales/../src/interface/edithandler.cpp:1514 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Pendente de eliminación" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Permiso" -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:384 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 +msgid "Permission denied" +msgstr "Permiso denegado" + +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Permisos" -#: resources.h:171 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Plataforma:" -#: resources.h:251 -msgid "" -"Please check https://filezilla-project.org/ for the most recent version of " -"FileZilla." -msgstr "" -"Vaia a https://filezilla-project.org/ para procurar a versión máis recente do " -"FileZilla." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Engada os cartafoles locais cos que quere usar FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:553 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5247,30 +6141,29 @@ "Debe comprobar en https://filezilla-project.org/probe.php se o servidor está " "en execución e logo comprobe se a configuración é correcta." -#: ../../locales/../src/interface/updatewizard.cpp:1076 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 msgid "" -"Please check the package manager of your system for an updated package or " -"visit https://filezilla-project.org/ to download the source code of FileZilla." +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." msgstr "" -"Debe comprobar o xestor de paquetes do sistema para ver se hai algún paquete " -"actualizado ou visite a páxina https://filezilla-project.org/ para descargar o " -"código de FileZilla." +"Comprobe os permisos outorgados e volva engadir os cartafoles locais que " +"estea a traballar no diálogo que segue." -#: resources.h:695 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." msgstr "" -"Debe configurar todos os enrutadores e devasas para que o FileZilla poida " +"Debe configurar todos os encamiñadores e devasas para que o FileZilla poida " "estabelecer conexións de saída a portos arbitrarios." -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Debe desactivar as configuracións 'Modo DMZ' ou 'Modo xogos' do seu " -"enrutador." +"encamiñador." -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5278,148 +6171,160 @@ "Asegúrese de ter unha conexión á rede estábel e revise a súa configuración " "unha outra vez." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 msgid "Please enter a custom date format." -msgstr "Introduza un formato de dato personalizado." +msgstr "Insira un formato de dato personalizado." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 msgid "Please enter a custom time format." -msgstr "Introduza un formato horario personalizado." +msgstr "Insira un formato horario personalizado." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." -msgstr "Introduza a data na forma Ano-Mes-Día como por exemmplo 2010-07-18." +msgstr "Insira a data na forma Ano-Mes-Día como por exemplo 2010-07-18." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." -msgstr "" -"Introduza un límite de velocidade de descarga superior ou igual a 0 %s/s." +msgstr "Insira un límite de velocidade de descarga superior ou igual a 0 %s/s." -#: ../../locales/../src/interface/filteredit.cpp:134 +#: ../../locales/../src/interface/filteredit.cpp:136 msgid "Please enter a name for the new filter." -msgstr "Introduza un nome para o novo filtro." +msgstr "Insira un nome para o novo filtro." -#: ../../locales/../src/interface/filteredit.cpp:241 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." -msgstr "Introduza un novo nome para o filtro copiado." +msgstr "Insira un novo nome para o filtro copiado." -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" -msgstr "Introduza un novo nome para o filtro configurado: \"%s\"" +msgstr "Insira un novo nome para o filtro configurado: «%s»" -#: ../../locales/../src/interface/filteredit.cpp:194 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." -msgstr "Introduza un novo nome para o filtro." +msgstr "Insira un novo nome para o filtro." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 msgid "" "Please enter a number between 0 and 10 for the number of concurrent " "downloads." -msgstr "Introduza un número entre 0 e 10 para as descargas concorrentes." +msgstr "Insira un número entre 0 e 10 para as descargas concorrentes." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 msgid "" "Please enter a number between 0 and 10 for the number of concurrent uploads." -msgstr "Introduza un número entre 0 e 10 para os envíos concorrentes." +msgstr "Insira un número entre 0 e 10 para os envíos concorrentes." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 msgid "" "Please enter a number between 1 and 10 for the number of concurrent " "transfers." -msgstr "Introduza un número entre 1 e 10 para as transferencias concorrentes." +msgstr "Insira un número entre 1 e 10 para as transferencias concorrentes." -#: resources.h:117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" -msgstr "Introduza un contrasinal para este servidor:" - -#: ../../locales/../src/interface/QueueView.cpp:2286 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Introduza unha ruta e un executábel.\n" -"Por exemplo c:\\algunharuta\\ficheiro.exe en MS Windows ou /algunharuta/" -"ficheiro en Unix.\n" -"Tamén pode especificar argumentos do programa." +msgstr "Insira un contrasinal para este servidor:" #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" -"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts." +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -"Introduza un tempo de caducidade da espera entre 5 e 9999 segundos ou 0 para " -"o desactivar." +"Insira un tempo límite de espera entre 10 e 9999 segundos ou 0 para " +"desactivalo." -#: ../../locales/../src/interface/filter.cpp:343 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" -msgstr "Introduza un nome único para este conxunto de filtros" +msgstr "Insira un nome único para este conxunto de filtros" -#: resources.h:118 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" -msgstr "Introduza un nome de usuario para este servidor:" +msgstr "Insira un nome de usuario para este servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:182 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." -msgstr "Introduza un intervalo de portos correcto." +msgstr "Insira un intervalo de portos correcto." -#: ../../locales/../src/interface/netconfwizard.cpp:161 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" -msgstr "Introduza o URL onde obter o enderezo externo" - -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41 -msgid "Please enter an update interval of at least 7 days" -msgstr "Introduza un intervalo de actualización de, cando menos, 7 días" +msgstr "Insira o URL onde obter o enderezo externo" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." -msgstr "Introduza un límite de velocidade de envío maior ou igual a 0 %s/s." +msgstr "Insira un límite de velocidade de envío maior ou igual a 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." msgstr "" -"Introduza unha orde directa de FTP.\n" +"Insira unha orde directa de FTP.\n" "Ao usar ordes directas de FTP limpará a caché do cartafol." -#: ../../locales/../src/interface/LocalListView.cpp:1194 -#: ../../locales/../src/interface/LocalTreeView.cpp:1182 -#: ../../locales/../src/interface/RemoteListView.cpp:1617 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1274 +#: ../../locales/../src/interface/QueueView.cpp:1878 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Insira a ruta completa dun programa e os seus argumentos. Esta orde " +"executarase cando a cola remate o procesamento.\n" +"Por exemplo C:\algunhaRuta\\ficheiro.exe baixo MS Windows ou /algunhaRuta/" +"ficheiro baixo Unix.\n" +"Debe empregar vírgulas para as ordes e os seus argumentos se estes conteñen " +"espazos." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" -msgstr "Introduza o nome do cartafol que se debe crear:" +msgstr "Insira o nome do cartafol que se debe crear:" -#: ../../locales/../src/interface/RemoteListView.cpp:3163 -#, fuzzy +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" -msgstr "Introduza o nome do cartafol que se debe crear:" +msgstr "Insira o nome do ficheiro que se debe crear:" -#: resources.h:119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Escriba un nome de usuario e un contrasinal para este servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Insira o seu contrasinal mestre actual para cambiar a configuración do " +"contrasinal." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" -msgstr "Introduza o seu número de IP externo" +msgstr "Insira o seu enderezo IP externo" -#: ../../locales/../src/interface/netconfwizard.cpp:593 -#: ../../locales/../src/interface/netconfwizard.cpp:606 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " "address, use the external resolver option." msgstr "" -"Introduza o seu número de IP externo na páxina do modo activo deste " -"asistente. Caso de ter un número dinámico ou non saber o seu enderezo " -"externo, use a opción de resolución externa." +"Insira o seu enderezo IP externo na páxina do modo activo deste asistente. " +"Caso de ter un enderezo dinámico ou non saber o seu enderezo externo, use a " +"opción de resolución externa." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Insira o seu contrasinal mestre para descifrar o contrasinal para este " +"servidor:" -#: resources.h:682 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." @@ -5427,7 +6332,7 @@ "Siga as instrucións con coidado pois caso de ter unha configuración errada " "non poderá conectarse correctamente co FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5436,24 +6341,25 @@ "que escribiu correctamente o enderezo do servidor de resolucións de " "enderezos." -#: ../../locales/../src/interface/FileZilla.cpp:258 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" -"Asegúrese de que o ficheiro locale solicitado está instalado no seu sistema." +"Asegúrese de que o ficheiro local solicitado está instalado no seu sistema." -#: ../../locales/../src/interface/netconfwizard.cpp:594 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " "manual port forwarding. Don't run your router in the so called 'DMZ mode' or " "'game mode'." msgstr "" -"Asegúrese de que o seu enrutador está a empregar a última versión do " -"firmware dispoñíbel. Para alén diso, o seu enrutador debe estar " -"correctamente configurado. Terá de facer un redireccionamento manual dos " -"portos. Non execute o seu enrutador no modo denominado 'DMZ' ou 'modo xogo'." +"Asegúrese de que o seu encamiñador está a empregar a última versión do " +"controlador dispoñíbel. Alén diso, o seu encamiñador debe estar " +"correctamente configurado. Terá que facer un redireccionamento manual dos " +"portos. Non execute o seu encamiñador no modo denominado 'DMZ' ou 'modo " +"xogo'." -#: resources.h:696 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 msgid "" "Please note that FileZilla has no influence on the port the server chooses. " "So the server might choose a port which your firewall thinks is only used by " @@ -5465,7 +6371,7 @@ "empregar troianos ou outras ameazas. Este feito podería provocar unha falsa " "alarma que pode ignorar tranquilamente." -#: ../../locales/../src/interface/Mainfrm.cpp:718 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5473,32 +6379,15 @@ "Cómpre salientar que a conservación do selo horario nos envíos a servidores " "FTP, FTP e FTPES só funcionará se admiten a orde MFMT." -#: resources.h:750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." msgstr "" -"Cómpre salientar que algúns servidores poderían vetalo se tenta conectarse " +"Cómpre salientar que algúns servidores poderían vetalo se intenta conectarse " "con demasiada frecuencia ou en intervalos moi curtos." -#: resources.h:900 resources.h:906 -#, no-c-format -msgid "" -"Please read https://wiki.filezilla-project.org/Date_and_Time_formatting for " -"details" -msgstr "" -"Lea https://filezilla-project.org/wiki/index.php/Date_and_Time_formatting " -"para máis detalles." - -#: resources.h:247 -msgid "" -"Please retry downloading the update. Possible reasons if the problem " -"persists (listed in order of decreasing probability):" -msgstr "" -"Tente descargar a actualización. As razóns máis probábeis se o problema " -"persiste, relacionadas en orde de probabilidade decrecente, son as seguintes:" - -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5508,43 +6397,51 @@ "se xorden problemas con servidores que funcionaban correctamente con " "anterioridade." -#: resources.h:457 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Garde esta chave nun lugar seguro. Sen a chave correcta non se pode acceder " +"aos seus ficheiros enviados." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Seleccione unha acción:" -#: resources.h:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Seleccione as categorías que desexe importar." -#: resources.h:684 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 msgid "Please select the default transfer mode you would like to use." msgstr "Seleccione o modo de transferencia predeterminado que quere usar." -#: ../../locales/../src/interface/chmoddialog.cpp:38 +#: ../../locales/../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." -msgstr "Seleccione os novos atributos para o cartafol \"%s\"." +msgstr "Seleccione os novos atributos para o cartafol «%s»." -#: ../../locales/../src/interface/chmoddialog.cpp:27 +#: ../../locales/../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." -msgstr "Seleccione os novos atributos para o ficheiro \"%s\"." +msgstr "Seleccione os novos atributos para o ficheiro «%s»." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Seleccione os novos atributos para os cartafoles seleccionados." -#: ../../locales/../src/interface/chmoddialog.cpp:44 +#: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "" "Seleccione os novos atributos para os ficheiros e cartafoles seleccionados." -#: ../../locales/../src/interface/chmoddialog.cpp:30 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Seleccione os novos atributos para os ficheiros seleccionados." -#: ../../locales/../src/interface/netconfwizard.cpp:581 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5552,325 +6449,427 @@ "called 'DMZ mode' or 'game mode'. Things like protocol inspection or " "protocol specific 'fixups' have to be disabled" msgstr "" -"Actualize a devasa e asegúrese de que o enrutador está a empregar o último " -"firmware dispoñíbel. Para alén diso, o enrutador debe estar correctamente " +"Actualice a devasa e asegúrese de que o encamiñador está a empregar o último " +"controlador dispoñíbel. Alén diso, o encamiñador debe estar correctamente " "configurado. Deberá facer un redireccionamento manual de portos. Non execute " -"o seu enrutador no chamado 'modo DMZ' nin no 'modo xogo'. Cousas como a " +"o seu encamiñador no chamado 'modo DMZ' nin no 'modo xogo'. Cousas como a " "inspección de protocolo ou os 'fixups' do protocolo específico teñen de " "estar desactivadas" -#: resources.h:254 -msgid "" -"Please visit https://filezilla-project.org/ for more information about " -"FileZilla." -msgstr "" -"Vexa https://filezilla-project.org/ para máis información sobre o FileZilla." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 +msgid "Positio&n of the message log:" +msgstr "Posició&n do rexistro de mensaxes:" -#: ../../locales/../src/interface/updatewizard.cpp:1074 -#: ../../locales/../src/interface/updatewizard.cpp:1090 -msgid "" -"Please visit https://filezilla-project.org/ to download the most recent " -"version." -msgstr "" -"Ver https://filezilla-project.org/ para descargar a versión máis recente." - -#: ../../locales/../src/interface/verifycertdialog.cpp:184 -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Código postal:" -#: ../../locales/../src/interface/sitemanager.cpp:289 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 +msgid "Pre&allocate space before downloading" +msgstr "Pre&asignar espazo antes de descargar" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 +msgid "Preallocation" +msgstr "Preasignación" + +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Sitios predeterminados" -#: ../../locales/../src/interface/Mainfrm.cpp:717 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Preservando o selo horario do ficheiro" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:223 -msgid "Preview:" -msgstr "Vista previa:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Vista previa" -#: ../../locales/../src/engine/tlssocket.cpp:936 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." -msgstr "" -"A conexión principal e os certificados de conexión de datos non coinciden." +msgstr "A conexión principal e os certificados de conexión de datos difiren." -#: ../../locales/../src/interface/cmdline.cpp:17 +#: ../../locales/../src/interface/cmdline.cpp:19 +msgid "Print diagnostic information related to startup of FileZilla" +msgstr "Imprimir información de diagnóstico relacionada co inicio de FileZilla" + +#: ../../locales/../src/interface/cmdline.cpp:18 msgid "Print version information to stdout and exit" msgstr "Imprimir a información da versión por pantalla e saír" -#: resources.h:923 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" -msgstr "Priorizar os cartafoles (por omisión)" +msgstr "Priorizar os cartafoles (predeterminado)" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Priority" msgstr "Prioridade" -#: resources.h:963 -msgid "Privacy policy:" -msgstr "Política de privacidade:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 +msgid "" +"Privacy policy: Only your version of FileZilla, your used operating system " +"and your CPU architecture will be submitted to the server." +msgstr "" +"Política de privacidade: só a súa versión de FileZilla, o seu sistema " +"operativo usado e a súa arquitectura de CPU serán enviados ao servidor." -#: resources.h:797 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" -msgstr "C&haves de privacidade:" +msgstr "C&haves privadas:" -#: resources.h:81 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 msgid "Pro&tocol:" msgstr "Pro&tocolo:" -#: resources.h:793 resources.h:810 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Contrasinal do pro&xy:" -#: resources.h:533 resources.h:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:107 +#: ../../locales/../src/interface/menu_bar.cpp:111 msgid "Process &Queue" -msgstr "Cola de procesos" +msgstr "&Procesar Cola" + +#: ../../locales/../src/engine/socket.cpp:1063 +msgid "Process file table overflow" +msgstr "Desbordamento da táboa de ficheiros de proceso" + +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 +#, c-format +msgid "Processed %s in %s." +msgstr "Procesado %s en %s." + +#: ../../locales/../src/engine/socket.cpp:1068 +msgid "Protocol not supported" +msgstr "O protocolo é incompatíbel" + +#: ../../locales/../src/engine/socket.cpp:1122 +msgid "Protocol not supported on given socket type" +msgstr "O protocolo é incompatíbel sobre o tipo de toma (socket) especificado" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 +msgid "Protocol:" +msgstr "Protocolo:" -#: resources.h:808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Porto do &proxy:" -#: resources.h:792 resources.h:809 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "&Usuario do proxy:" -#: ../../locales/../src/engine/proxy.cpp:415 +#: ../../locales/../src/engine/proxy.cpp:475 msgid "Proxy authentication failed" msgstr "Fallou a autenticación do proxy" -#: ../../locales/../src/engine/transfersocket.cpp:132 -#: ../../locales/../src/engine/transfersocket.cpp:146 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Fallou a negociación co proxy: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4386 -#, fuzzy +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." -msgstr "O servidor comeza con '[' mais non se atopou o peche para o corchete." +msgstr "" +"O servidor proxy comeza con «[» mais non se atopou o peche para o corchete." -#: ../../locales/../src/engine/proxy.cpp:309 +#: ../../locales/../src/engine/proxy.cpp:329 #, c-format msgid "Proxy reply: %s" msgstr "Resposta do proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:458 +#: ../../locales/../src/engine/proxy.cpp:516 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Fallou a solicitude do proxy. Resposta do proxy: %s" + +#: ../../locales/../src/engine/proxy.cpp:386 #, c-format msgid "Proxy request failed: %s" msgstr "Fallou a solicitude do proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:480 +#: ../../locales/../src/engine/proxy.cpp:540 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Fallou a solicitude co proxy: descoñécese o tipo de enderezo na resposta " "CONECTADO" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" -msgstr "O proxy está configurado mais o servidor ou o porto non son correctos" +msgstr "O proxy está configurado mais o servidor ou o porto é incorrecto" -#: resources.h:795 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Autenticación con chave pública" -#: resources.h:8 resources.h:32 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 msgid "Public key algorithm:" msgstr "Algoritmo de chave pública:" -#: resources.h:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Permisos públicos" -#: ../../locales/../src/interface/QueueView.cpp:3224 +#: ../../locales/../src/interface/QueueView.cpp:2784 msgid "Queue has been fully processed" msgstr "A cola procesouse completamente" -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Cola: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:392 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Cola: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:388 -#: ../../locales/../src/interface/statusbar.cpp:453 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Cola: baleira" -#: ../../locales/../src/interface/QueueView.cpp:453 +#: ../../locales/../src/interface/QueueView.cpp:207 msgid "Queued files" msgstr "Ficheiros na cola" -#: resources.h:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Na cola:" -#: resources.h:618 -msgid "R&eboot system" -msgstr "Reiniciar o sistema" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Busca rápida:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Non se pode abrir a busca rápida se compara os cartafoles." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +msgid "R&eboot system once" +msgstr "R&einiciar o sistema deseguido" -#: resources.h:530 +#: ../../locales/../src/interface/menu_bar.cpp:104 msgid "R&emote directory tree" msgstr "Árbore do cartafol r&emoto" -#: resources.h:632 resources.h:636 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:248 msgid "R&eset and requeue selected files" -msgstr "R&einiciar e reencolar os ficheiros seleccionados" +msgstr "R&einiciar e poñer de novo na cola os ficheiros seleccionados" -#: ../../locales/../src/interface/Mainfrm.cpp:592 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Orde de FTP directa" -#: resources.h:139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Ler" -#: resources.h:577 resources.h:593 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:37 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:81 msgid "Re&fresh" msgstr "Actuali&zar" -#: resources.h:63 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Cambiar o &nome" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." msgstr "" "Execute outra vez o asistente, comprobe con coidado as opcións e configure " -"todos os enrutadores e devasas en conformidade." +"todos os encamiñadores e devasas en conformidade." -#: resources.h:143 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Le&r" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Só permite lectura" -#: ../../locales/../src/interface/Mainfrm.cpp:1095 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "Fallou a lectura do ficheiro local" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Quere cancelar a operación actual?" -#: ../../locales/../src/interface/RemoteListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:1025 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 +#, c-format +msgid "Really delete %d directory with its contents from the server?" +msgid_plural "" +"Really delete %d directories with their contents from the server?" +msgstr[0] "Quere eliminar do servidor %d cartafol e o seu contido?" +msgstr[1] "Quere eliminar do servidor %d cartafoles xunto co seu contido?" + +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format -msgid "Really delete %d directory with its contents?" -msgid_plural "Really delete %d directories with their contents?" -msgstr[0] "Quere eliminar o cartafol %d e o seu contido?" -msgstr[1] "Quere eliminar %d cartafoles xunto co seu contido?" - -#: ../../locales/../src/interface/RemoteListView.cpp:1703 -#: ../../locales/../src/interface/search.cpp:1023 -#, c-format -msgid "Really delete %d file?" -msgid_plural "Really delete %d files?" -msgstr[0] "Quere eliminar o ficheiro %d?" -msgstr[1] "Quere eliminar %d ficheiros?" - -#: ../../locales/../src/interface/RemoteListView.cpp:1710 -#: ../../locales/../src/interface/search.cpp:1030 -#, c-format -msgid "Really delete %s and %s?" -msgstr "Quere eliminar %s e %s?" - -#: ../../locales/../src/engine/local_filesys.cpp:136 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1123 -msgid "Really delete all selected files and/or directories?" -msgstr "Quere eliminar todos os ficheiros e/ou cartafoles seleccionados?" +msgid "Really delete %d file from the server?" +msgid_plural "Really delete %d files from the server?" +msgstr[0] "Quere eliminar do servidor %d ficheiro?" +msgstr[1] "Quere eliminar do servidor %d ficheiros?" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 +#, c-format +msgid "Really delete %s and %s from the server?" +msgstr "Quere eliminar do servidor %s e %s?" + +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +msgid "Really delete all selected files and/or directories from the server?" +msgstr "" +"Quere eliminar do servidor todos os ficheiros e/ou cartafoles seleccionados?" + +#: ../../locales/../src/interface/file_utils.h:45 +msgid "Really delete all selected files and/or directories from your computer?" +msgstr "" +"Quere eliminar da súa computadora todos os ficheiros e/ou cartafoles " +"seleccionados?" + +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Reason" -msgstr "Razón" +msgstr "Motivo" -#: ../../locales/../src/interface/QueueView.cpp:3231 +#: ../../locales/../src/interface/QueueView.cpp:2777 msgid "Reboot now" msgstr "Reiniciar agora" -#: resources.h:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Rec&ursivamente dentro dos subartafoles" -#: ../../locales/../src/engine/directorylistingparser.cpp:3111 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 +#, c-format +msgid "Received TLS alert from the server: %s (%d)" +msgstr "Recibiuse unha alerta TLS do servidor: %s (%d)" + +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." -msgstr "" +msgstr "Recibiu unha listaxe de cartafoles que semella codificada en EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:2124 -#: ../../locales/../src/engine/directorylistingparser.cpp:2139 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Recibiuse unha liña que pasa dos 10000 caracteres, cancelar." -#: ../../locales/../src/interface/netconfwizard.cpp:998 -#: ../../locales/../src/interface/netconfwizard.cpp:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1031 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Non se puido verificar a cadea de certificados recibida. O estado da " +"verificación é %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Modificáronse os datos que se recibiron" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/updater.cpp:574 +msgid "Received invalid character in version information" +msgstr "Recibiuse un carácter incorrecto na información da versión" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 +#, c-format +msgid "Received unknown TLS alert %d from the server" +msgstr "Recibiuse unha alerta TLS descoñecida %d do servidor" + +#: ../../locales/../src/interface/updater.cpp:567 +msgid "Received version information is too large" +msgstr "A información da versión recibida é demasiado extensa" + +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." msgstr "" -"A información de reconexión non se pode limpar durante a conexión a un " +"A información de reconexión non se pode limpar mentres está conectado a un " "servidor.\n" "Se continua, perderase a conexión." -#: resources.h:751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Opcións da conexión" -#: resources.h:1004 resources.h:1005 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" -msgstr "Reconecta ao último servidor usado" +msgstr "Reconecta co último servidor usado" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 +msgid "Recursively adding files to queue." +msgstr "Engadir &ficheiros á cola de xeito recursivo." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 +msgid "Recursively changing permissions." +msgstr "Cambiar permisos de xeito recursivo." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 +msgid "Recursively deleting files and directories." +msgstr "Eliminar ficheiros e cartafoles de xeito recursivo." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:715 -msgid "Redirection to invalid address" -msgstr "Redireccionamento a un enderezo incorrecto" +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Vermello" -#: resources.h:996 resources.h:997 +#: ../../locales/../src/engine/http/filetransfer.cpp:147 +#, c-format +msgid "Redirection to invalid or unsupported URI: %s" +msgstr "O redireccionamento ao URI é incorrecto ou incompatíbel: %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:153 +#, c-format +msgid "Redirection to invalid or unsupported address: %s" +msgstr "O redireccionamento ao enderezo é incorrecto ou incompatíbel: %s" + +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Actualiza as lista de ficheiros e cartafoles" -#: resources.h:497 -#, fuzzy -msgid "Remember password?" -msgstr "Introduza un contrasinal" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 +msgid "Remember passwords?" +msgstr "Lembrar os contrasinais?" -#: ../../locales/../src/interface/edithandler.cpp:1243 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Remoto" -#: ../../locales/../src/engine/tlssocket.cpp:859 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Non se confía no certificado remoto." -#: resources.h:368 ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Remote file" msgstr "Ficheiro remoto" -#: resources.h:441 ../../locales/../src/interface/search.cpp:676 -#: ../../locales/../src/interface/search.cpp:682 -#: ../../locales/../src/interface/search.cpp:692 -#: ../../locales/../src/interface/search.cpp:698 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" -msgstr "Procura de ficheiro remoto" +msgstr "Buscar ficheiro remoto" -#: resources.h:207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Filtros remotos:" -#: ../../locales/../src/interface/edithandler.cpp:1234 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Ruta remota" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:430 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -5879,7 +6878,7 @@ "Non se pode analizar a ruta remota. Asegúrese de que sexa unha ruta absoluta " "correcta e sexa compatíbel co tipo de servidor do sitio actual (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -5888,213 +6887,297 @@ "Non se pode procesar a ruta remota. Asegúrese de que sexa unha ruta absoluta " "correcta e compatíbel co servidor (%s) seleccionado no sitio pai." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:432 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Non se pode procesar a ruta. Asegúrese de que sexa unha ruta absoluta " "correcta." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Non se puido procesar a ruta remota." -#: resources.h:446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Xestión da ruta remota:" -#: resources.h:314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Ruta remota:" -#: ../../locales/../src/interface/viewheader.cpp:560 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Sitio remoto:" -#: resources.h:629 resources.h:633 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Remove &all" msgstr "Elimin&ar todo" -#: resources.h:631 resources.h:635 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 msgid "Remove &selected" msgstr "Eliminar os &seleccionados" -#: resources.h:266 resources.h:276 resources.h:854 resources.h:863 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:256 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Cambiar o nome do ficheiro" -#: resources.h:647 resources.h:668 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "Rename selected directory" msgstr "Cambiar o nome aos cartafoles seleccionados" -#: resources.h:581 resources.h:597 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:46 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:90 msgid "Rename selected files and directories" msgstr "Cambiar o nome aos ficheiros e os cartafoles seleccionados" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Estase a cambiar o nome de '%s' a '%s'" -#: resources.h:473 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Repita o contrasinal:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Informar de erros e solicitude de características" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:514 +#: ../../locales/../src/engine/proxy.cpp:377 +msgid "" +"Request failed - client is not running identd (or not reachable from server)" +msgstr "" +"Fallou a solicitude: o cliente non está a executar «identd» (ou non se pode " +"acceder desde o servidor)" + +#: ../../locales/../src/engine/proxy.cpp:380 +msgid "Request failed - client's identd could not confirm the user ID string" +msgstr "" +"Fallou a solicitude: a identificación do cliente non puido confirmar a cadea " +"da ID de usuario" + +#: ../../locales/../src/engine/proxy.cpp:374 +msgid "Request rejected or failed" +msgstr "Solicitude rexeitada ou fallada" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "Require FTP explícito sobre TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:515 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "Require FTP implícito sobre TLS" -#: resources.h:634 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:241 msgid "Reset and requeue &all" -msgstr "Restabelecer e reencol&ar todo" +msgstr "Reiniciar e poñer de novo na col&a todo" -#: ../../locales/../src/engine/ControlSocket.cpp:1198 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:497 +#: ../../locales/../src/engine/socket.cpp:1110 +msgid "Resolved protocol is unknown" +msgstr "O protocolo resolto é descoñecido" + +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Estase a resolver o enderezo de %s" -#: ../../locales/../src/interface/updatewizard.cpp:1159 -msgid "Resolving hostname" -msgstr "Estase a resolver o nome do servidor" - -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/interface/netconfwizard.cpp:395 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:343 -#: ../../locales/../src/interface/updatewizard.cpp:544 +#: ../../locales/../src/engine/socket.cpp:1069 +msgid "Resource temporarily unavailable" +msgstr "O recurso está indispoñible temporalmente" + +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Resposta:" -#: resources.h:440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Resultados:" -#: resources.h:265 resources.h:275 resources.h:853 resources.h:862 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" -msgstr "Continuar a transferencia do ficheiro" +msgstr "Retomar a transferencia do ficheiro" -#: resources.h:868 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." msgstr "" -"Reanudar ASCII a tansferencia de ficheiros poderá ter problemas se o " -"servidor emprega un formado de fin de liña diferente que o cliente." +"Retomar a transferencia de ficheiros ASCII pode causar problemas se o " +"servidor emprega un formado de fin de liña diferente que o do cliente." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 +#, c-format +msgid "Retrieving directory listing of \"%s\"..." +msgstr "Recuperando a lista de cartafoles de «%s»..." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Estase a acadar a listaxe do cartafol..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3926 -#: ../../locales/../src/interface/netconfwizard.cpp:707 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" -msgstr "Estase a obter o número de IP externo de %s" - -#: ../../locales/../src/engine/tlssocket.cpp:917 -msgid "Root certificate is not trusted" -msgstr "O certificado raíz non se confiou" +msgstr "Estase a obter o enderezo IP externo de %s" -#: resources.h:508 +#: ../../locales/../src/interface/menu_bar.cpp:61 msgid "S&how files currently being edited..." msgstr "Amo&sar os ficheiros que se editaron recentemente..." -#: resources.h:885 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" -msgstr "Amo&sar o Xestor dos sitios no arranque" +msgstr "Amo&sar o xestor dos sitios no arranque" -#: resources.h:619 -msgid "S&hutdown system" -msgstr "Apa&gar o sistema" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 +msgid "S&hutdown system once" +msgstr "Apa&gar o sistema deseguido" -#: resources.h:438 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "De&ter" -#: resources.h:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:182 +msgid "S&uspend system once" +msgstr "S&uspender o sistema deseguido" + +#: ../../locales/../src/interface/menu_bar.cpp:97 msgid "S&ynchronized browsing" msgstr "Navegación s&incronizada" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:121 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 msgid "SFTP" msgstr "SFTP" -#: resources.h:167 -#, fuzzy +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Compatibilidade SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 +msgid "SOC&KS 4" +msgstr "SOC&KS 4" + +#: ../../locales/../src/engine/proxy.cpp:141 +#, c-format +msgid "SOCKS4 proxy will connect to: %s" +msgstr "O proxy SOCKS4 vai conectar con: %s" + +#: ../../locales/../src/engine/proxy.cpp:168 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 é incompatíbel con nomes de usuario e contrasinais maiores de 255 " +"caracteres." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" -msgstr "Límite:" +msgstr "SQLite:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "&Gardar os contrasinais protexidos por un contrasinal mestre" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "&Gardar os contrasinais" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Gardar a configuración?" -#: ../../locales/../src/interface/QueueView.cpp:1831 -msgid "Scanning for files to add to queue" -msgstr "Estanse a procurar ficheiros para engadir á cola" - -#: ../../locales/../src/interface/QueueView.cpp:1833 -msgid "Scanning for files to upload" -msgstr "Estase a buscar ficheiros para cargar" +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 +msgid "Saving of password has been disabled by your system administrator." +msgstr "" +"A opción de gardar o contrasinal foi desactivada polo administrador do " +"sistema." -#: resources.h:434 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +msgid "Saving of passwords has been disabled by you." +msgstr "A opción de gardar os contrasinais está desactivada por ti." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Factor de escala:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" -msgstr "Condi&cións da procura:" +msgstr "C&ondicións da busca:" -#: resources.h:432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" -msgstr "Procurar cartafol:" +msgstr "Buscar cartafol:" -#: resources.h:1012 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." -msgstr "Procurar ficheiros recursivamente." +msgstr "Busca ficheiros de xeito recursivo" -#: resources.h:549 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "Search server for files" -msgstr "Procurar servidor para os ficheiros" +msgstr "Buscar ficheiros no servidor" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Tipo de busca:" -#: ../../locales/../src/interface/statusbar.cpp:531 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Información de seguranza" -#: ../../locales/../src/interface/netconfwizard.cpp:564 -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" -msgstr "Tamén pode ler https://wiki.filezilla-project.org/Network_Configuration" +msgstr "" +"Tamén pode ler https://wiki.filezilla-project.org/Network_Configuration" -#: resources.h:376 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" -msgstr "Selec&cionar servidor" +msgstr "Selec&cionar o servidor" -#: resources.h:736 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" -msgstr "Seleccionar &páxina:" +msgstr "Seleccionar a &páxina:" -#: resources.h:888 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" -msgstr "Seleccionar tema" +msgstr "Seleccionar o tema" -#: resources.h:846 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Seleccionar unha acción por omisión que se realizará se o ficheiro de " "destino dunha transferencia xa existe." -#: ../../locales/../src/interface/edithandler.cpp:1704 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162 +#: ../../locales/../src/interface/edithandler.cpp:1583 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Seleccione o editor por omisión" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6102,7 +7185,7 @@ "Seleccione a acción por omisión que se executará se o ficheiro de destino " "existe. Esta escolla só é correcta na sesión actual." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6110,224 +7193,248 @@ "Seleccione a acción por omisión que se realizará se o ficheiro existe só " "para os seleccionados na cola." -#: ../../locales/../src/interface/updatewizard.cpp:328 -msgid "Select download location for package" -msgstr "Escolla o destino de descarga para o paquete" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" -msgstr "Seleccionar ficheiro que conteña unha chave privada" +msgstr "Seleccionar o ficheiro que conteña a chave privada" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" -msgstr "Seleccionar ficheiros para os datos exportados" +msgstr "Seleccionar o ficheiro para os datos exportados" + +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Seleccionar o ficheiro para os filtros exportados" -#: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1566 msgid "Select file for exported queue" -msgstr "Seleccionar ficheiro para a fila exportada" +msgstr "Seleccionar o ficheiro para a fila exportada" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" -msgstr "Escolla un ficheiro para a configuración exportada" +msgstr "Seleccionar o ficheiro para a configuración exportada" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" -msgstr "Seleccionar ficheiro para os sitios exportados" +msgstr "Seleccionar o ficheiro para os sitios exportados" -#: ../../locales/../src/interface/import.cpp:15 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" -msgstr "Escolla un ficheiro para importar as características de" +msgstr "Seleccionar o ficheiro para importar as características de" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" -msgstr "Seleccionar ficheiro para subir" +msgstr "Seleccionar o ficheiro para subir" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" -msgstr "Seleccionar un nome de ficheiro para o ficheiro de chave convertido" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 +msgid "Select filename for converted key file" +msgstr "Seleccionar o nome de ficheiro para o ficheiro de chave convertido" -#: resources.h:422 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." -msgstr "Seleccionar como se abriran estes ficheiros." +msgstr "Seleccionar como se abrirán estes ficheiros." -#: ../../locales/../src/interface/search.cpp:805 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" -msgstr "Seleccionar cartafol de descargas de destino" +msgstr "Seleccionar o cartafol destino para as descargas" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Seleccionar o nome de ficheiro de destino" -#: resources.h:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" -msgstr "Escolla as características para exportar:" +msgstr "Seleccionar as características para exportar:" -#: resources.h:283 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." -msgstr "Escolla os datos privados que desexa eliminar." +msgstr "Seleccionar os datos privados que desexa eliminar." -#: ../../locales/../src/interface/search.cpp:772 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." -msgstr[0] "Seleccionouse %d cartafol xunto co seu contido para se transferir." -msgstr[1] "" -"Seleccionouse %d cartafoles xunto cos seus contidos para transferir." +msgstr[0] "Seleccionou %d cartafol xunto co seu contido para se transferir." +msgstr[1] "Seleccionou %d cartafoles xunto co seu contido para transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Seleccionou %d cartafol." msgstr[1] "Seleccionou %d cartafoles." -#: ../../locales/../src/interface/search.cpp:770 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." -msgstr[0] "Seleccionou %d ficheiro para trasnferir." +msgstr[0] "Seleccionou %d ficheiro para transferir." msgstr[1] "Seleccionou %d ficheiros para transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:58 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" -msgstr[0] "Seleccionou %d ficheiro. Tamaño tota: %s" +msgstr[0] "Seleccionou %d ficheiro. Tamaño total: %s" msgstr[1] "Seleccionou %d ficheiros. Tamaño total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:56 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Seleccionou %d ficheiro. Tamaño total: cando menos %s" msgstr[1] "Seleccionou %d ficheiros. Tamaño total: cando menos %s" -#: ../../locales/../src/interface/search.cpp:777 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." -msgstr "Seleccionou %s e %s para trasnferir." +msgstr "Seleccionou %s e %s para transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Seleccionouse %s e %s. Tamaño total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Seleccionouse %s e %s. Tamaño total: cando menos %s" -#: ../../locales/../src/interface/edithandler.cpp:1645 -#: ../../locales/../src/interface/edithandler.cpp:1724 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "O editor que escolleu non existe." -#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2069 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "O ficheiro seleccionado estase a editar" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "O ficheiro seleccionado xa está cargado" -#: ../../locales/../src/interface/RemoteListView.cpp:2692 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "O ficheiro seleccionado xa está aberto" -#: ../../locales/../src/interface/RemoteListView.cpp:2720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "O ficheiro seleccionado xa se está a editar" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "O filtro que seleccionou só funciona con ficheiros locais." -#: ../../locales/../src/interface/menu_bar.cpp:313 +#: ../../locales/../src/interface/menu_bar.cpp:434 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" "O marcador global seleccionado e o servidor actual empregan un diferente " "tipo de servidor.\n" -"Empregue uns marcadores específicos do sitio para este servidor." +"Empregue marcadores específicos do sitio para este servidor." -#: ../../locales/../src/engine/engineprivate.cpp:281 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "" "Polo xeral, o porto que seleccionou está en uso por un protocolo diferente." -#: resources.h:758 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" -msgstr "Enviar ordes mant&er vivo o FTP" +msgstr "Enviar ordes para mant&er vivo o FTP" -#: resources.h:551 +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Send custom command to the server otherwise not available" -msgstr "Enviar unha orde persoalizada ao servidor, non dispoñíbel doutro xeito" +msgstr "" +"Enviar unha orde personalizada ao servidor, non dispoñíbel doutro xeito" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4501 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Estase a enviar a orde de manter a conexión" -#: resources.h:7 resources.h:31 -#: ../../locales/../src/interface/verifycertdialog.cpp:188 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Número de serie:" -#: resources.h:89 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "&Tipo de servidor:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "O servidor non respondeu axeitadamente, cerre a conexión TSL" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4325 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 +msgid "Server does not support non-ASCII characters." +msgstr "O servidor é incompatíbel con caracteres non-ASCII." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "O servidor non permite retomar ficheiros maiores de %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -"O servidor non permite retomar ficheiros maiores de %d GB. Remata a " -"transferencia cando os tamaños coinciden." +"O servidor non permite retomar ficheiros maiores de %d GB. Rematar a " +"transferencia cando os tamaños coincidan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "O servidor non permite retomar ficheiros maiores de 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2551 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "O servidor non permite retomar ficheiros maiores de 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Chave do servidor" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -"O servidor non permite retomar ficheiros maiores de %d GB. Remata a " -"transferencia cando os tamaños coinciden." +"O servidor non permite retomar ficheiros maiores de %d GB. Rematar a " +"transferencia cando os tamaños coincidan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" -"O servidor precisa unha conta. Debe especificar unha conta mediante o Xestor " -"do sitio" +"O servidor precisa unha conta. Debe especificar unha conta mediante o xestor " +"de sitios" + +#: ../../locales/../src/engine/http/request.cpp:459 +msgid "Server not sending proper line endings" +msgstr "O servidor non envía remates de liñas correctos" -#: ../../locales/../src/engine/ControlSocket.cpp:417 +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "O servidor solicitou un algoritmo de autenticación incompatíbel: %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "O servidor solicitou unha calidade de protección incompatíbel: %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "O servidor devolveu unha ruta vadía." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6335,13 +7442,18 @@ "O servidor enviou unha solicitude adicional de acceso. Precisa usar un tipo " "de rexistro interactivo." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868 +#: ../../locales/../src/engine/http/request.cpp:309 +msgid "Server sent data even before request headers were sent" +msgstr "" +"Servidor enviou datos antes de que se enviasen os encabezados de solicitude" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "O servidor enviou unha resposta pasiva cun enderezo non encamiñábel. Fallou " "o modo pasivo." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3862 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6349,133 +7461,187 @@ "O servidor enviou unha resposta pasiva cun enderezo non encamiñábel. Usarase " "o enderezo do servidor no seu lugar." -#: ../../locales/../src/interface/netconfwizard.cpp:403 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:458 -#: ../../locales/../src/interface/netconfwizard.cpp:470 -#: ../../locales/../src/interface/netconfwizard.cpp:494 -#: ../../locales/../src/interface/netconfwizard.cpp:501 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:521 +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +msgid "Server sent too much data." +msgstr "O servidor enviou demasiados datos." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "O servidor enviou unha resposta que non se agardaba." -#: resources.h:352 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"O servidor enviou unha cadea de certificado desordenada, violando así as " +"especificacións TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Servidor a MAC cliente:" -#: resources.h:350 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Servidor a cifrado cliente:" -#: resources.h:381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "&Tipo de servidor:" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Server/Local file" msgstr "Servidor/ficheiro local" -#: resources.h:312 resources.h:374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Servidor:" -#: resources.h:15 resources.h:39 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "Detalles da sesión" -#: resources.h:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:121 msgid "Set &Priority" msgstr "Estabelecer a &prioridade" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3693 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Estabelecer os permisos de '%s' a '%s'" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Estabelecer os permisos de «%s» a «%s»" -#: ../../locales/../src/engine/transfersocket.cpp:860 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize chamouse sen conectador" - -#: resources.h:735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Configuración" -#: resources.h:985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 +msgid "Settings directory:" +msgstr "Configuración do cartafol:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:150 +msgid "Sh&ow notification bubble" +msgstr "Am&osar a burbulla de notificación" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Amosar lite&ralmente a listaxe do cartafol" -#: resources.h:560 +#: ../../locales/../src/interface/menu_bar.cpp:171 msgid "Show &welcome dialog..." msgstr "Amosar o diálogo de ben&vida..." -#: ../../locales/../src/interface/Mainfrm.cpp:2346 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Amosar ambas as árbores do cartafol e continuar a comparación?" +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 +msgid "Show details" +msgstr "Amosar os detalles" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 +msgid "Show details about custom date and time formats" +msgstr "Amosar os detalles sobre o formatos de data e hora personalizados" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:399 +msgid "Show in file &manager" +msgstr "A&mosar no xestor de ficheiros" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:212 +msgid "Shows available TLS ciphers" +msgstr "Amosar os cifrados TLS dispoñibles" + #: ../../locales/../src/interface/cmdline.cpp:6 msgid "Shows this help dialog" msgstr "Amosar este diálogo de axuda" -#: ../../locales/../src/interface/QueueView.cpp:3233 +#: ../../locales/../src/interface/QueueView.cpp:2773 msgid "Shutdown now" msgstr "Apagar agora" -#: resources.h:300 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 +msgid "Signature algorithm:" +msgstr "Algoritmo de sinatura:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Rexistrarse" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Entradas do xestor de sitios" -#: resources.h:70 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 msgid "Site Manager" msgstr "Xestor de sitios" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:945 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:965 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 +msgid "Site Manager - Cannot remember password" +msgstr "Xestor de sitios - Non se pode lembrar o contrasinal" + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Xestor de sitios - Chave xerada" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "Xestor do sitio - Datos incorrectos" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:316 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" -msgstr "Xestor de Sitios xa aberto" +msgstr "O xestor de sitios xa está aberto" -#: ../../locales/../src/interface/sitemanager.cpp:439 -#: ../../locales/../src/interface/sitemanager.cpp:456 -#: ../../locales/../src/interface/sitemanager.cpp:470 -#: ../../locales/../src/interface/sitemanager.cpp:740 -#: ../../locales/../src/interface/sitemanager.cpp:825 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "O sitio non existe." -#: ../../locales/../src/interface/sitemanager.cpp:419 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "A ruta do sitio ten que comezar por 0 ou 1." -#: ../../locales/../src/interface/sitemanager.cpp:463 -#: ../../locales/../src/interface/sitemanager.cpp:556 -#: ../../locales/../src/interface/sitemanager.cpp:733 -#: ../../locales/../src/interface/sitemanager.cpp:818 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "A ruta do sitio está malformada." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:263 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Marcadores específicos do sitio" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6485,103 +7651,144 @@ "no xestor do sitio.\n" "Desexa engadir a conexión actual ao xestor do sitio?" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Size" msgstr "Tamaño" -#: resources.h:907 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Formato de tamaño" -#: ../../locales/../src/interface/fileexistsdlg.cpp:62 -#: ../../locales/../src/interface/fileexistsdlg.cpp:68 +#: ../../locales/../src/interface/fileexistsdlg.cpp:43 msgid "Size unknown" msgstr "Tamaño descoñecido" -#: resources.h:267 resources.h:277 resources.h:855 resources.h:864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Omitir ficheiro" -#: ../../locales/../src/engine/ControlSocket.cpp:1270 -#: ../../locales/../src/engine/ControlSocket.cpp:1289 -#: ../../locales/../src/engine/ControlSocket.cpp:1314 -#: ../../locales/../src/engine/ControlSocket.cpp:1380 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Estase a omitir a descarga de %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1274 -#: ../../locales/../src/engine/ControlSocket.cpp:1293 -#: ../../locales/../src/engine/ControlSocket.cpp:1318 -#: ../../locales/../src/engine/ControlSocket.cpp:1384 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Estase a omitir o ficheiro de chave inexistente: «%s»" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Estase a omitir a carga de %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1220 +#: ../../locales/../src/engine/socket.cpp:1073 +msgid "Socket address outside address space" +msgstr "Enderezo da toma (socket) está fora do espazo de enderezos" + +#: ../../locales/../src/engine/socket.cpp:1075 +msgid "Socket already connected" +msgstr "A toma (socket) xa está conectada" + +#: ../../locales/../src/engine/socket.cpp:1083 +msgid "Socket has been shut down" +msgstr "A toma (socket) foi desconectada" + +#: ../../locales/../src/engine/socket.cpp:1080 +msgid "Socket not connected" +msgstr "A toma (socket) non conectada" + +#: ../../locales/../src/engine/socket.cpp:1123 +msgid "Socket type not supported for address family" +msgstr "Tipo de toma (socket) é incompatible coa familia de enderezos" + +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "Algúns ficheiros seguen a se editar ou precisan ser enviados." -#: resources.h:698 resources.h:774 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." msgstr "" -"Algúns servidores remotos mal formatos que se acharen tras o seu enrutador " -"poderían responder co seu número de IP local." +"Algúns servidores remotos mal configurados que están detrás dun encamiñador, " +"poden responder coa súa dirección IP local." -#: resources.h:925 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Ordenar os cartafoles en liña" -#: ../../locales/../src/interface/filelistctrl.cpp:446 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "" "A instrución de ordenación non se pode mudar ao tempo de comparar cartafoles." -#: resources.h:921 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Clasificación" -#: resources.h:922 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "&Modo de ordenación:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:101 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "A orixe e a ruta para a operación de soltar son idénticos" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "O ficheiro de orixe e de destino talvez non son o mesmo" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "A orixe e o destino da operación de soltar son idénticos" -#: resources.h:49 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 msgid "Source file:" msgstr "Ficheiro de orixe:" -#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Límites de transferencia" -#: resources.h:819 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Límite de transferencia" -#: ../../locales/../src/interface/statusbar.cpp:597 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "" "Os límites de velocidade están desactivados; faga clic para os cambiar." -#: ../../locales/../src/interface/statusbar.cpp:601 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "O límite de velocidade está activado, prema para o cambiar." -#: resources.h:392 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 +msgid "Stable and beta versions" +msgstr "Versións estábeis e beta" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 +msgid "Stable versions only" +msgstr "Versións estábeis" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 +msgid "Stable, beta and nightly versions" +msgstr "Versións estábeis, beta e nocturnas" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Comezar a transferencia &inmediatamente" @@ -6589,43 +7796,65 @@ msgid "Start with opened Site Manager" msgstr "Comezar co xestor de sitios aberto" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633 +#: ../../locales/../src/interface/updater.cpp:253 +#, c-format +msgid "Started update check on %s\n" +msgstr "A comprobación de actualizacións comezou en %s\n" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Estase a comezar a descarga de %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2239 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Estase a comezar o envío de %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:182 +#: ../../locales/../src/interface/cmdline.cpp:9 +msgid "Starts the local site in the given path" +msgstr "Comezar o sitio local na ruta indicada" + +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Estado ou provincia:" -#: ../../locales/../src/interface/edithandler.cpp:1235 -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Status" msgstr "Estado" -#: ../../locales/../src/engine/logging.cpp:212 -#: ../../locales/../src/interface/StatusView.cpp:298 -#: ../../locales/../src/interface/StatusView.cpp:367 -#: ../../locales/../src/interface/updatewizard.cpp:538 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Estado:" -#: resources.h:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:111 msgid "Stop and remove &all" -msgstr "Deter e eliminar &todo" +msgstr "Deter e retirar &todo" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 +msgid "Stop recursive operation" +msgstr "Deter a operación recursiva" + +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Almacenamento na nube descentralizado" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Permitir Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Rúa:" -#: resources.h:11 resources.h:35 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" msgstr "Asunto do certificado" @@ -6633,11 +7862,15 @@ msgid "Successful transfers" msgstr "Transferencias exitosas" -#: resources.h:726 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" msgstr "Resumo dos resultados das probas:" -#: resources.h:460 +#: ../../locales/../src/interface/QueueView.cpp:2781 +msgid "Suspend now" +msgstr "Suspender agora" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -6645,168 +7878,238 @@ "As ligazóns simbólicas aos ficheiros non están afectadas por esta escolla, " "estas sempre se borra." -#: resources.h:1011 ../../locales/../src/interface/state.cpp:249 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 #: ../../locales/../src/interface/state.cpp:278 #: ../../locales/../src/interface/state.cpp:285 -#: ../../locales/../src/interface/state.cpp:297 -#: ../../locales/../src/interface/state.cpp:373 -#: ../../locales/../src/interface/state.cpp:383 -#: ../../locales/../src/interface/state.cpp:392 -#: ../../locales/../src/interface/state.cpp:1016 -#: ../../locales/../src/interface/state.cpp:1025 -#: ../../locales/../src/interface/state.cpp:1032 -#: ../../locales/../src/interface/state.cpp:1043 -#: ../../locales/../src/interface/state.cpp:1050 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Navegación sincronizada" -#: ../../locales/../src/interface/state.cpp:391 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "A navegación sincronizada foi desactivada." -#: ../../locales/../src/interface/quickconnectbar.cpp:88 -#: ../../locales/../src/interface/quickconnectbar.cpp:126 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Sincronizando os cartafoles." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Erro de sintaxe" -#: ../../locales/../src/interface/cmdline.cpp:68 -#: ../../locales/../src/interface/cmdline.cpp:74 -#: ../../locales/../src/interface/cmdline.cpp:80 -#: ../../locales/../src/interface/cmdline.cpp:89 -#: ../../locales/../src/interface/cmdline.cpp:95 -#: ../../locales/../src/interface/Mainfrm.cpp:2496 +#: ../../locales/../src/interface/cmdline.cpp:76 +#: ../../locales/../src/interface/cmdline.cpp:82 +#: ../../locales/../src/interface/cmdline.cpp:88 +#: ../../locales/../src/interface/cmdline.cpp:97 +#: ../../locales/../src/interface/cmdline.cpp:103 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Erro de sintaxe na liña de ordes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Sistema" -#: resources.h:526 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 +msgid "System details" +msgstr "Detalles do sistema" + +#: ../../locales/../src/engine/socket.cpp:1064 +msgid "System limit of open files exceeded" +msgstr "Superou o límite do sistema de ficheiros abertos" + +#: ../../locales/../src/engine/socket.cpp:1121 +msgid "System's network subsystem has failed" +msgstr "Fallou o subsistema de rede do sistema" + +#: ../../locales/../src/interface/menu_bar.cpp:100 msgid "T&oolbar" msgstr "B&arra de ferramentas" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:332 -msgid "TLS/SSL connection established, sending HTTP request" -msgstr "Estabeleceuse a conexión TLS/SSL, estase a enviar a solicitude de HTTP" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 -msgid "TLS/SSL connection established, waiting for welcome message..." -msgstr "Estabeleceuse a conexión TLS/SSL, agardando pola mensaxe de benvida..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411 -msgid "TLS/SSL connection established." -msgstr "Estabeleceuse a conexión TLS/SSL." +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 +msgid "TLS connection established, sending HTTP request" +msgstr "Estabeleceuse a conexión TLS, estase a enviar a solicitude de HTTP" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 +msgid "TLS connection established, waiting for welcome message..." +msgstr "Estabeleceuse a conexión TLS, agardando pola mensaxe de benvida..." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 +msgid "TLS connection established." +msgstr "Estabeleceuse a conexión TLS." -#: ../../locales/../src/engine/proxy.cpp:445 +#: ../../locales/../src/engine/proxy.cpp:503 msgid "TTL expired" msgstr "Expirou o TTL" -#: resources.h:47 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:6 msgid "Target file already exists" msgstr "O ficheiro de destino xa existe" -#: resources.h:53 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Ficheiro de destino:" -#: ../../locales/../src/interface/RemoteListView.cpp:3197 -#, fuzzy +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" -msgstr "O ficheiro de destino xa existe" +msgstr "O ficheiro de destino xa existe!" -#: ../../locales/../src/interface/RemoteListView.cpp:1921 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "O nome do ficheiro de destino xa existe, realmente desexa continuar?" -#: resources.h:725 +#: ../../locales/../src/engine/socket.cpp:1094 +msgid "Temporary failure in name resolution" +msgstr "Fallo temporal na resolución de nomes" + +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "A proba rematou con éxito" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Resultado da proba" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4342 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Probando as capacidades de retomar do servidor" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Os seguintes &ficheiros estanse a modificar:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "" +"Non se pode usar o xestor de sitios a menos que o ficheiro sexa reparado." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " "then." msgstr "" -"O Xestor de sitios está aberto noutro exemplar de FileZilla 3.\n" -"Desexa continuar? Calquera cambio que se fixer no Xestor de sitios non se " +"O xestor de sitios está aberto noutro exemplar do FileZilla 3.\n" +"Desexa continuar? Calquera cambio que se fixer no xestor de sitios non se " "gardará." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." msgstr "" -"O Xestor de sitios está aberto noutra instancia do FileZilla 3.\n" +"O xestor de sitios está aberto noutra instancia do FileZilla 3.\n" "Pécheo ou non se poderán eliminar os datos." -#: ../../locales/../src/interface/xmlfunctions.cpp:426 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "O documento XML non está composto correctamente: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" -msgstr "O enderezo que introduciu era: %s" +msgstr "O enderezo que inseriu era: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:820 -#: ../../locales/../src/interface/sitemanager.cpp:720 +#: ../../locales/../src/engine/socket.cpp:1100 +msgid "The ai_family member is not supported" +msgstr "O membro ai_family é incompatíbel" + +#: ../../locales/../src/engine/socket.cpp:1113 +msgid "The ai_socktype member is not supported" +msgstr "O membro de ai_socktype é incompatíbel" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Non se pode engadir o marcador." -#: ../../locales/../src/interface/sitemanager.cpp:805 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Os marcadores non se poden limpar." -#: ../../locales/../src/interface/statusbar.cpp:490 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"O certificado require que o servidor inclúa un estado OCSP na súa resposta, " +"pero falta o estado OCSP." + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "A conexión está cifrada. Prema a icona par ver os detalles." +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 +msgid "" +"The custom date format is invalid or contains unsupported format specifiers." +msgstr "" +"O formato de data personalizado é incorrecto ou contén indicadores de " +"formato non compatíbeis." + #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." msgstr "A secuencia de rexistro personalizada non pode estar baleira." -#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684 -#, no-c-format +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 +msgid "" +"The custom time format is invalid or contains unsupported format specifiers." +msgstr "" +"O formato de hora personalizado é incorrecto ou contén indicadores de " +"formato non compatíbeis." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 +#, c-format +msgid "The data connection could not be established: %s" +msgstr "Non se puido estabelecer a conexión de datos: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "" "Non se puido atopar o editor predeterminado para os ficheiros de texto." -#: resources.h:424 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "O editor predeterminado para os ficheiros de texto é '%s'." -#: ../../locales/../src/interface/filteredit.cpp:147 -#: ../../locales/../src/interface/filteredit.cpp:215 -#: ../../locales/../src/interface/filteredit.cpp:254 +#: ../../locales/../src/interface/filteredit.cpp:149 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." -msgstr "O nome do filtro introducido xa existe, escolla un nome diferente." +msgstr "O nome do filtro inserido xa existe, escolla un nome diferente." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Os contrasinais inseridos non coinciden." + +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "A extensión '%s' xa existe na lista" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:246 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:253 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" "Please enter a new name:" msgstr "" "O ficheiro %s xa existe.\n" -"Introduza un nome novo:" +"Insira un nome novo:" -#: ../../locales/../src/interface/LocalListView.cpp:2046 -#: ../../locales/../src/interface/LocalListView.cpp:2177 -#: ../../locales/../src/interface/RemoteListView.cpp:2666 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -6817,19 +8120,28 @@ "Non se atopou o programa asociado (%s).\n" "Comprobe as asociacións dos tipos de ficheiros." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"O ficheiro «%s» contén unha chave SSH1. O protocolo SSH1 quedou obsoleto, o " +"FileZilla só admite chaves SSH2." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "O ficheiro '%s' non se puido cargar ou non contén unha chave privada." -#: ../../locales/../src/interface/xmlfunctions.cpp:63 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Non de puido cargar o ficheiro '%s'." -#: ../../locales/../src/interface/LocalListView.cpp:2040 -#: ../../locales/../src/interface/LocalListView.cpp:2172 -#: ../../locales/../src/interface/RemoteListView.cpp:2660 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6838,8 +8150,9 @@ "Non se puido abrir o ficheiro '%s':\n" "Ningún programa está asociado no sistema con este tipo de ficheiro." -#: ../../locales/../src/interface/LocalListView.cpp:2085 -#: ../../locales/../src/interface/LocalListView.cpp:2185 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6848,20 +8161,20 @@ "Non se puido abrir o ficheiro '%s':\n" "Fallou a orde asociada" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"O ficheiro '%s' ten un formato que non é compatíbel co FileZilla.\n" -"O ficheiro ademais está protexido cun contrasinal. Os ficheiros de chaves " -"protexidos por contrasinal non son compatíbeis co FileZilla.\n" -"Quere converter o ficheiro a un formato non protexido compatíbel?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" +msgstr "" +"O ficheiro '%s' foi creado por unha versión posterior de FileZilla.\n" +"A carga de ficheiros creados por versións posteriores pode producir perdas " +"de datos.\n" +"Quere continuar?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -6870,22 +8183,11 @@ "O ficheiro '%s' non ten un formato compatíbel co FIleZilla.\n" "Quere convertelo a un formato compatíbel?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"O ficheiro '%s' está protexido por un contrasinal. Os ficheiros de chaves " -"protexidos con contrasinal non son compatíbeis co FileZilla.\n" -"Quere convertelo nun ficheiro non protexido?" - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "O ficheiro seleccionado como editor predeterminado non existe." -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -6899,49 +8201,59 @@ "porto, o nome de usuario e o contrasinal.\n" "Desexa continuar coa importación?" -#: ../../locales/../src/interface/listctrlex.cpp:761 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "A columna do nome do ficheiro non pode ocultarse nin moverse." -#: ../../locales/../src/interface/listctrlex.cpp:811 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "A columna do nome dos ficheiros non pode ocultarse." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 #, c-format msgid "The following character will be replaced: %s" msgstr "Substituirase o carácter seguinte: %s" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:66 #, c-format msgid "The following characters will be replaced: %s" msgstr "Substituiranse os caracteres seguintes: %s" -#: resources.h:329 -msgid "The following files are currently being edited:" -msgstr "Os ficheiros seguintes estanse a editar:" - -#: resources.h:464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "A solución FTP de código aberto" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:298 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "A chave de cifrado xerada é:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Non se poden gardar os marcadores globais." -#: resources.h:983 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " "performance." msgstr "" -"Cando maior for o nivel de depuración, máis información aparecerá no " +"Canto maior sexa o nivel de depuración, máis información aparecerá no " "rexistro de mensaxes. A visualización da información de depuración ten un " "impacto negativo no rendemento." #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 msgid "The limit needs to be between 1 and 2000 MiB" -msgstr "Cómpre que o límite estea entre 1 e 2000 MiB" +msgstr "Precisa que o límite estea entre 1 e 2000 MiB" + +#: ../../locales/../src/interface/state.cpp:1121 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Non se puido crear o cartafol local «%s»." + +#: ../../locales/../src/interface/state.cpp:1106 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "O cartafol local «%s» non existe." #: ../../locales/../src/interface/state.cpp:275 #, c-format @@ -6953,7 +8265,7 @@ "Quere desactivar a navegación sincronizada e continuar a cargar o cartafol " "local?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -6961,27 +8273,29 @@ "O mais baixo porto dispoñíbel ten que ser menor ou igual có porto mais alto " "dispoñíbel." -#: ../../locales/../src/interface/updatewizard.cpp:607 -msgid "" -"The most recent version has been downloaded. Click on Finish to close " -"FileZilla and to start the installation." -msgstr "" -"Descargouse a versión máis recente. Prema rematar para pechar o FileZilla e " -"comezar a instalación." - -#: ../../locales/../src/interface/updatewizard.cpp:609 -msgid "" -"The most recent version has been downloaded. Please install it the same way " -"you installed this version." -msgstr "" -"Descargou a versión máis recente. Debe instalala tal e como instalou esta " -"versión." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "O contrasinal mestre ha de ter polo menos 8 caracteres." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 +msgid "The new version could not be downloaded, please retry later." +msgstr "Non se puido descargar a nova versión, volva intentalo máis tarde." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +msgid "The new version has been saved in your Downloads directory." +msgstr "A nova versión foi gardada no seu cartafol de descargas." -#: ../../locales/../src/interface/QueueView.cpp:1964 +#: ../../locales/../src/interface/QueueView.cpp:1570 msgid "The queue will not be saved." msgstr "A cola non se gardará." -#: ../../locales/../src/interface/state.cpp:1022 +#: ../../locales/../src/interface/state.cpp:1028 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Non existe o cartafol remoto «%s»." + +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -6991,54 +8305,54 @@ "Quere desactivar a navegación sincronizada e continuar a cargar o cartafol " "remoto?" -#: ../../locales/../src/interface/import.cpp:84 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Importaranse as categorías seleccionadas." -#: resources.h:299 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "O ficheiro seleccionado contén datos que se poden importar nas seguinte " "categorías:" -#: resources.h:322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "O ficheiro seleccionado estase a editar:" -#: ../../locales/../src/interface/RemoteListView.cpp:2720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "O ficheiro que seleccionou aínda está aberto noutro programa; por tanto, " "debe pechalo." -#: ../../locales/../src/interface/LocalListView.cpp:2052 -#: ../../locales/../src/interface/RemoteListView.cpp:2672 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" -"This can be dangerous and damage your system.\n" +"This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" -"O ficheiro seleccionado ten de se executar directamente.\n" +"O ficheiro seleccionado executaríase directamente.\n" "Esta opción pode ser perigosa e pode danar o sistema.\n" -"Querecontinuar?" +"Seguro que quere continuar?" -#: ../../locales/../src/interface/sitemanager.cpp:602 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Non se puido engadir o servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:574 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "O servidor enviou unha resposta que non se coñece ou non se agardaba." -#: resources.h:106 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "" "O servidor emprega a codificación de caracteres seguintes para os nomes de " "ficheiros:" -#: resources.h:2 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 msgid "" "The server's certificate is unknown. Please carefully examine the " "certificate to make sure the server can be trusted." @@ -7046,17 +8360,17 @@ "Descoñécese o certificado do servidor. Debe examinar con coidado o " "certificado para se asegurar de que pode confiar no servidor." -#: resources.h:188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " "actually trying to connect to another computer pretending to be the server." msgstr "" -"A chave do servidor non coincide coa chave que está gardada na memoria " -"intermedia. Isto significa que o administrador a mudou ou está a tentar " -"conectarse con outro ordenador que finxe ser o servidor." +"A chave do servidor difire da chave que está gardada na memoria intermedia. " +"Isto significa que o administrador a mudou ou está a intentar conectarse con " +"outro computador que finxe ser o servidor." -#: resources.h:176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7064,6 +8378,14 @@ "Descoñécese a chave do servidor. Nada lle garante que o servidor é o " "computador que pensa que é." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "O nome do servidor non coincide co nome do certificado do servidor." + +#: ../../locales/../src/engine/socket.cpp:1112 +msgid "The servname parameter is not supported for ai_socktype" +msgstr "O parámetro servname é incompatíbel con ai_socktype" + #: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " @@ -7072,15 +8394,23 @@ "Importáronse as características. Ten de reiniciar o FileZilla para que estas " "opcións teñan o seu efecto." -#: ../../locales/../src/interface/QueueView.cpp:3222 +#: ../../locales/../src/engine/socket.cpp:1060 +msgid "The specified address family is not supported" +msgstr "A familia de enderezo especificada é incompatíbel" + +#: ../../locales/../src/engine/socket.cpp:1125 +msgid "The specified network name is no longer available" +msgstr "O nome da rede especificado xa non está dispoñible" + +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "The system will soon reboot unless you click Cancel." msgstr "Axiña se reiniciará o sistema, a non ser que prema Cancelar." -#: ../../locales/../src/interface/QueueView.cpp:3220 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "The system will soon shut down unless you click Cancel." msgstr "O sistema axiña se apagará a non ser que prema Cancelar." -#: resources.h:48 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 msgid "" "The target file already exists.\n" "Please choose an action." @@ -7088,98 +8418,97 @@ "O ficheiro de destino xa existe.\n" "Debe elixir unha acción." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" -msgstr "Fallou a comprobación. Queregardar esta configuración?" +msgstr "Fallou a comprobación. Quere gardar esta configuración?" + +#: ../../locales/../src/interface/xmlfunctions.cpp:83 +#, c-format +msgid "The valid backup file %s could not be restored" +msgstr "Non se puido restaurar o ficheiro de copia de seguridade válido %s" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:127 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Temas" -#: ../../locales/../src/interface/filter.cpp:462 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "O conxunto de filtros non se pode eliminar." -#: ../../locales/../src/interface/filter.cpp:397 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Non se pode cambiar o nome deste conxunto de filtros." -#: ../../locales/../src/interface/netconfwizard.cpp:575 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." msgstr "" -"Isto significa que algún enrutador e/ou devasa está a interferir co " +"Isto significa que algún encamiñador e/ou devasa está a interferir co " "FileZilla." -#: resources.h:703 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:183 msgid "" "This only works if you are not behind a router, else your system would just " "return your internal address." msgstr "" -"Esta opción só funciona se non está tras dun enenrutadornoutro caso, o " +"Esta opción só funciona se non está tras dun encamiñador, noutro caso o " "sistema devolverá un enderezo interno." -#: resources.h:681 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 msgid "" "This wizard will help you to properly configure any routers and firewalls " "you have and tests your configuration." msgstr "" -"O asistente axudarao a configurar calquera enrutador ou devasa e probará a " +"O asistente axudarao a configurar calquera encamiñador ou devasa e probará a " "configuración." -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Time" msgstr "Hora" -#: resources.h:901 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Formato de hora" -#: resources.h:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Tempo de agarda en segundos:" -#: resources.h:745 ../../locales/../src/interface/QueueView.cpp:1066 -#: ../../locales/../src/interface/QueueView.cpp:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Tempo de agarda" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1694 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079 -#, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Compensacións da zona horaria: servidor: %d segundos. Local: %d segundos. " -"Diferenza: %d segundos." - -#: ../../locales/../src/interface/verifycertdialog.cpp:180 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Título:" -#: ../../locales/../src/interface/Mainfrm.cpp:2344 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Para comparar cartafoles debe pechar a busca rápida." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Para comparar cartafoles as dúas relacións de ficheiros deben de estar " "aliñadas." -#: ../../locales/../src/interface/Mainfrm.cpp:2345 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Para facer isto, é preciso que as dúas árbores de cartafoles se amosen ou se " "agochen." -#: resources.h:796 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." msgstr "" -"Para permitir a autenticación con chave oculta, o FileZilla precisa saber " -"que chaves privadas se van empregar." +"Para admitir a autenticación de chave pública, o FileZilla precisa saber que " +"chaves privadas se van empregar." -#: resources.h:1008 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7188,7 +8517,7 @@ "Green: File is newer than the unmarked file on other side\n" "Red: File sizes different" msgstr "" -"Alternar a comparación de cartafoles. Prema co botón dereito para mudar o " +"Inverte a comparación de cartafoles. Prema co botón dereito para mudar o " "modo de comparación.\n" "\n" "Cores:\n" @@ -7196,202 +8525,217 @@ "Verde: o ficheiro é mais novo que o ficheiro sen marcar do outro lado\n" "Vermello: os tamaños dos ficheiros son diferentes" -#: resources.h:1010 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " "directory on the server accordingly and vice versa." msgstr "" -"Alternar a navegación sincronizada.\n" +"Inverte a navegación sincronizada.\n" "Se estiver activado, ao navegar pola xerarquía do cartafol local tamén se " "cambiará o cartafol no servidor e viceversa." -#: resources.h:998 resources.h:999 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Inverte o procesado da cola de transferencia" -#: resources.h:990 resources.h:991 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Inverte a visualización da árbore do cartafol local" -#: resources.h:988 resources.h:989 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Inverte a visualización do rexistro de mensaxes" -#: resources.h:992 resources.h:993 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Inverte a visualización da árbore do cartafol remoto" -#: resources.h:994 resources.h:995 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Inverte a visualización da cola de transferencia" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:605 +#: ../../locales/../src/engine/http/request.cpp:472 msgid "Too long header line" msgstr "A liña da cabeceira é moi longa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:666 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Demasiados redireccionamentos" -#: ../../locales/../src/engine/logging.cpp:216 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:353 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Seguimento:" -#: resources.h:931 resources.h:937 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" -msgstr "Tranferencia" +msgstr "Transferir" -#: resources.h:362 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "&Dirección da transferencia" -#: resources.h:535 +#: ../../locales/../src/interface/menu_bar.cpp:116 msgid "Transfer &type" msgstr "Tipo de &transferencia" -#: resources.h:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Modo de Transferencia" -#: resources.h:887 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Cola de transferencias" -#: resources.h:98 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Configuración de transferencia" -#: ../../locales/../src/engine/transfersocket.cpp:498 -#: ../../locales/../src/engine/transfersocket.cpp:522 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Interrompeuse a conexión de transferencia: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Danáronse os datos transferidos." -#: ../../locales/../src/interface/QueueView.cpp:1491 -#: ../../locales/../src/interface/statuslinectrl.cpp:278 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Transfirindo" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:123 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 msgid "Transfers" msgstr "Transferencias" -#: ../../locales/../src/interface/QueueView.cpp:3136 -#: ../../locales/../src/interface/QueueView.cpp:3139 +#: ../../locales/../src/interface/QueueView.cpp:2655 msgid "Transfers finished" msgstr "Configuración de transferencia" -#: resources.h:843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" -msgstr "Tratar ficheiros sen e&xtensión como arquivos ASCII" +msgstr "Tratar ficheiros sen e&xtensión como ficheiros ASCII" -#: resources.h:839 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" -msgstr "Tratar os &seguintes tipos de arquivo como arquivos ASCII:" +msgstr "Tratar os &seguintes tipos de ficheiro como ficheiros ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "Confiar na chave do servidor cambiada:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "Confiar na nova chave do servidor:" -#: resources.h:195 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Desexa confiar na nova chave e seguir conectado?" -#: resources.h:22 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" msgstr "Confiar neste certificado e seguir conectado?" -#: resources.h:182 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Desexa confiar nesta hospedaxe e seguir conectado?" -#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 +msgid "Try again" +msgstr "Outra vez" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Tipo" -#: resources.h:778 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" -msgstr "Tipo do proxy de FTP:" +msgstr "Tipo de proxy do FTP:" -#: resources.h:803 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" -msgstr "Tipo do proxy de xenérico:" +msgstr "Tipo de proxy de xenérico:" -#: resources.h:332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "En&viar" -#: resources.h:485 resources.h:823 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Límite de en&vío:" -#: resources.h:949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "U&sar as asociacións de tipo de ficheiros se estiver dispoñíbeis" -#: resources.h:902 -msgid "U&se system defaults" -msgstr "U&sar os valores predeterminados" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 +msgid "U&se system defaults for current language" +msgstr "U&sar as preferencias do sistema para o idioma actual." -#: resources.h:780 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "USUARIO@SERVIDOR" -#: ../../locales/../src/engine/proxy.cpp:454 +#: ../../locales/../src/engine/proxy.cpp:383 +#: ../../locales/../src/engine/proxy.cpp:512 #, c-format msgid "Unassigned error code %d" msgstr "Código de erro non asignado %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:179 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Unidade:" -#: ../../locales/../src/interface/edithandler.cpp:1265 -#: ../../locales/../src/interface/edithandler.cpp:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Descoñecido" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" -"Descoñécese o tipo do proxy de FTP polo que non se pode xerar a secuencia de " +"Descoñécese o tipo de proxy do FTP polo que non se pode xerar a secuencia de " "rexistro." -#: ../../locales/../src/engine/proxy.cpp:368 +#: ../../locales/../src/engine/proxy.cpp:434 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Descoñécese a versión do protocolo SOCKS: %d" -#: resources.h:1 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:4 msgid "Unknown certificate" msgstr "Descoñécese o certificado" -#: ../../locales/../src/interface/xmlfunctions.cpp:414 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" -"Produciuse un erro que se descoñece ao abrir o ficheiro. Cómpre asegurarse " -"de que se pode acceder ao ficheiro e que se trata dun documento XML ben " -"composto." +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Descoñécese o erro %d" -#: resources.h:175 +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Descoñécese o erro %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Descoñécese a chave do servidor" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:442 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7400,23 +8744,27 @@ "Descoñécese a versión do protocolo SOCKS de subnegociación de autenticación " "nome de usuario/Contrasinal: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:459 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Descoñécese o elemento raíz; o ficheiro non parece ter sido xerado mediante " -"FileZilla." +"o FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:596 -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/engine/http/request.cpp:574 +msgid "Unknown transfer encoding" +msgstr "Descoñécese a codificación da transferencia" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" -"A non ser que estes problemas se solucionaren, o FTP en modo activo non " -"funcionará e deberá empregarse o modo pasivo." +"A non ser que se solucionen estes problemas, o modo activo FTP non " +"funcionará e deberá empregar o modo pasivo." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7424,272 +8772,231 @@ "A non ser que este problema se solucionar, o FTP en modo activo non " "funcionará e terá de se usar o modo pasivo." -#: ../../locales/../src/engine/tlssocket.cpp:888 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "TIpo de certificado non compatíbel" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:650 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "O redireccionamento non é compatíbel" -#: resources.h:333 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" -msgstr "Subri e desfacer a edición" +msgstr "Subir e desfacer a edición" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:137 -msgid "Update Check" -msgstr "Comprobación de actualización" - -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61 -#: ../../locales/../src/interface/updatewizard.cpp:251 -#: ../../locales/../src/interface/updatewizard.cpp:264 -msgid "Update wizard" -msgstr "Asistente de actualización" +#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 +msgid "Updates" +msgstr "Actualizacións" -#: resources.h:364 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Enviar" -#: ../../locales/../src/interface/edithandler.cpp:1256 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Fallou o envío" -#: ../../locales/../src/interface/statusbar.cpp:609 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "Límite de envío: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:611 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Límite de envío: ningún" -#: resources.h:658 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Enviar os resultados da busca" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:326 msgid "Upload selected directory" msgstr "Enviar o cartafol seleccionado" -#: resources.h:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "Upload selected files and directories" msgstr "Enviar os ficheiros e cartafoles seleccionados" -#: resources.h:317 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Desexa subir os ficheiros e os cartafoles seleccionados?" -#: resources.h:316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Desexa subir os ficheiros ao servidor?" -#: ../../locales/../src/interface/edithandler.cpp:1250 -#: ../../locales/../src/interface/edithandler.cpp:1284 -#: ../../locales/../src/interface/edithandler.cpp:1449 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Estase a enviar" -#: ../../locales/../src/interface/edithandler.cpp:1253 -#: ../../locales/../src/interface/edithandler.cpp:1451 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Estase a enviar e pendente de eliminación" -#: ../../locales/../src/interface/edithandler.cpp:1287 -#: ../../locales/../src/interface/edithandler.cpp:1453 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Subindo e desfacendo" -#: resources.h:110 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Usar o conxunto de &caracteres personalizado" -#: resources.h:946 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" -msgstr "Usar &editor personalizado:" +msgstr "Usar o &editor personalizado:" -#: resources.h:423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Usar o e&ditor predeterminado para os ficheiros de texto" -#: resources.h:406 resources.h:412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Usar a navegación &sincronizada" -#: resources.h:108 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Usar expresións regulares" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Usar o UTF-8 se o servidor for compatíbel; caso contrario, empregar o " "conxunto de caracteres local." -#: resources.h:259 resources.h:269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Usar a acción por omisión" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 -msgid "Use plain FTP" -msgstr "Usar FTP simple" +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 +msgid "Use explicit FTP over TLS if available" +msgstr "Usar o FTP explícito sobre TLS se está dispoñible" -#: resources.h:372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Usar servidor actualmente conectado" -#: resources.h:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Usar servidor dende o xestor do sitio" -#: resources.h:896 -msgid "Use system &defaults" -msgstr "Usar o valor por omisión &do sistema" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 +msgid "Use system &defaults for current language" +msgstr "Usar as preferencias &do sistema para o idioma actual" -#: resources.h:704 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" -msgstr "Usar o número de IP seguinte:" +msgstr "Usar o enderezo IP seguinte:" -#: resources.h:714 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 msgid "Use the following port range:" msgstr "Usar o intervalo de porto seguinte:" -#: resources.h:699 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 msgid "Use the server's external IP address instead" -msgstr "Usar no seu lugar o número de IP externo do servidor" +msgstr "Usar no seu lugar o enderezo IP externo do servidor" -#: resources.h:705 resources.h:768 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" -"Use isto se estiver tras dun enrutador e ten un número de IP externo " +"Use isto se estiver tras dun encamiñador e ten un enderezo IP externo " "estático." -#: resources.h:708 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 msgid "" "Use this option if you have a dynamic IP address. FileZilla will contact the " "above server once each session as soon as you use active mode for the first " "time. Only the version of FileZilla you're using is submitted to the server." msgstr "" -"Use esta opción se ten un número de IP dinámico. O FileZilla contactará co " -"servidor unha vez por cada sesión cado empregue o modo activo por vez " +"Use esta opción se ten un enderezo IP dinámico. O FileZilla contactará co " +"servidor unha vez por cada sesión cando empregue o modo activo por vez " "primeira. Só se envía ao servidor a versión do FileZilla que está a empregar." -#: resources.h:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Usuario:" -#: ../../locales/../src/interface/manual_transfer.cpp:509 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "O nome de usuario non pode ser unha serie de espazos" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4424 -#, c-format -msgid "Using proxy %s" -msgstr "Usando o proxy %s" - -#: resources.h:112 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" "De se empregar o conxunto de caracteres incorrecto, os nomes dos ficheiros " "non se amosarán apropiadamente." -#: resources.h:232 -msgid "Using this wizard you can check for available updates to FileZilla." -msgstr "" -"Ao usar este asistente, poderá comprobar se existe algunha actualización do " -"FileZilla." - -#: resources.h:5 resources.h:29 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" msgstr "Correcto desde:" -#: resources.h:6 resources.h:30 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" msgstr "Correcto ata:" -#: ../../locales/../src/interface/cmdline.cpp:16 +#: ../../locales/../src/interface/cmdline.cpp:17 msgid "Verbose log messages from wxWidgets" msgstr "Rexistro de mensaxes de rexistro detallado de wvWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1078 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Comprobando o certificado..." -#: resources.h:170 -msgid "Version:" -msgstr "Versión:" - -#: resources.h:828 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Moi alta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1427 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" "Estabeleceuse a opción de ver os ficheiros agochados, mais o servidor non a " "admite" -#: resources.h:933 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Vista / edición" -#: resources.h:356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Columnas visíbeis" -#: resources.h:140 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "Esc&ribir" -#: ../../locales/../src/interface/QueueView.cpp:1790 -msgid "Waiting" -msgstr "Esperando" - -#: ../../locales/../src/interface/QueueView.cpp:1398 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Esperando pola conexión de navegación" -#: ../../locales/../src/interface/QueueView.cpp:1441 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Esperando polo contrasinal" -#: ../../locales/../src/interface/statuslinectrl.cpp:272 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Esperando a que se cancele a transferencia" -#: ../../locales/../src/engine/engineprivate.cpp:203 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." -msgstr "Agardando para volvelo tentar..." +msgstr "Agardando para volvelo intentar..." -#: ../../locales/../src/interface/FileZilla.cpp:297 -msgid "" -"Warning!\n" -"\n" -"A bug in Windows causes problems with FileZilla\n" -"\n" -"The bug occurs if you have\n" -"- Windows Server 2003 or XP 64\n" -"- Windows Firewall enabled\n" -"- Application Layer Gateway service enabled\n" -"See http://support.microsoft.com/kb/931130 for background information.\n" -"\n" -"Unless you either disable Windows Firewall or the Application Layer Gateway " -"service,\n" -"FileZilla will timeout on big transfers." -msgstr "" -"Aviso:\n" -"\n" -"Un erro no Windows está a provocar problemas co FileZilla\n" -"\n" -"O erro prodúcese con\n" -"- Windows Server 2003 ou XP 64\n" -"- A devasa de Windows activada.\n" -"- Pasarela de capa de aplicativo activada\n" -"Vexa http://support.microsoft.com/kb/931130 para máis información.\n" -"\n" -"A menos que desactive a devasa de Windows ou o servizo de Pasarela de capa " -"de aplicativo,\n" -"o FileZilla fallará nas transferencias grandes." - -#: ../../locales/../src/interface/netconfwizard.cpp:966 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Aviso, estase a ignorar a conexión de datos desde un IP incorrecto." -#: ../../locales/../src/interface/updatewizard.cpp:264 +#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 msgid "" "Warning, use nightly builds at your own risk.\n" "No support is given for nightly builds.\n" @@ -7697,79 +9004,120 @@ "\n" "Do you really want to check for nightly builds?" msgstr "" -"Aviso: use as compilacións diarias en desenvolvemento pola súa conta.\n" -"Non se fornece asistencia técnica para compilacións diarias.\n" -"As compilacións diarias poden non funcionar do modo que se agardaba e mesmo " -"poderían danar o sistema.\n" +"Aviso: use as compilacións nocturnas (de desenvolvemento) pola súa conta.\n" +"Non se fornece asistencia técnica para compilacións nocturnas.\n" +"As compilacións nocturnas poden non funcionar como se agarda e mesmo poden " +"danar o sistema.\n" "\n" -"Quere comprobar se existen compilacións diarias?" +"Seguro que quere comprobar se existen compilacións nocturnas?" -#: resources.h:187 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" -msgstr "Aviso: Hai unha fenda de seguranza potencial!" +msgstr "Aviso: hai unha fenda de seguranza potencial!" -#: resources.h:476 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Benvido/a ao FileZilla" -#: resources.h:465 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Cales son as novidades" -#: resources.h:242 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Cales son as novidades:" -#: resources.h:831 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 +msgid "" +"When allowing FileZilla to remember passwords, you can reconnnect without " +"having to re-enter a password after restarting FileZilla." +msgstr "" +"Cando permite que o FileZilla lembre os contrasinais, pode volver a conectar " +"sen ter que volver inserir un contrasinal despois de reiniciar o FileZilla." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." msgstr "" -"Cando activado, os caracteres dos nomes de ficheiros que non son compatíbeis " -"co sistema operativo local substituiranse ao descargalo como un ficheiro." +"Cando está activado, os caracteres dos nomes de ficheiros que non son " +"compatíbeis co sistema operativo local substituiranse se se descarga o " +"ficheiro." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 +msgid "When st&arting a new connection while already connected:" +msgstr "Cando comez&a unha nova conexión estando xa conectado:" -#: resources.h:873 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Pantalla panorámica" -#: resources.h:491 -msgid "Would you like FileZilla to remember this password?" -msgstr "" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 +msgid "Would you like FileZilla to remember passwords?" +msgstr "Quere que o FileZilla lembre os contrasinais?" -#: resources.h:144 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Escr&ibir" -#: ../../locales/../src/interface/netconfwizard.cpp:433 -#: ../../locales/../src/interface/netconfwizard.cpp:440 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" -msgstr "O enderezo IP externo non é correcto" +msgstr "O enderezo IP externo é incorrecto" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:827 +#: ../../locales/../src/engine/http/request.cpp:646 msgid "Wrong line endings" msgstr "Remates de liña incorrectos" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Inseriu un contrasinal mestre incorrecto polo que non pode usalo para " +"descifrar os contrasinais almacenados." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Inseriu un contrasinal mestre incorrecto polo que non pode usalo para " +"descifrar este elemento." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Amarelo" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Si" -#: resources.h:253 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" -"You are already using the most recent version of FileZilla. Please check " -"again in future." +"You appear to be using an IPv6-only host. This wizard does not support this " +"environment." msgstr "" -"Está a empregar a última versión do FileZilla. Volva comprobar no futuro." +"Parece que está usando un servidor de só IPv6. Este asistente non é " +"compatíbel con este contorno." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 +msgid "You are using the latest version of FileZilla." +msgstr "Está a usar a última versión do FileZilla." -#: resources.h:474 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Sempre poderá ver esta mensaxe a través do menú de axuda." -#: ../../locales/../src/engine/server.cpp:63 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 +msgid "You can download the latest version from the FileZilla website:" +msgstr "Pode descargar a última versión do sitio web do FileZilla:" + +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" "Pode deixar o campo do porto en branco para usar o porto predeterminado." -#: resources.h:147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -7777,29 +9125,41 @@ "Pode usar un x en calquera posición para manter o permiso que os ficheiros " "orixinais teñen." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Non se pode cambiar o contrasinal e a chave de cifrado individualmente se " +"está a usar un contrasinal mestre." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" -"Non pode importar opcións desde o propio servidor de opcións do FileZilla." +"Non se pode importar opcións desde o propio servidor de opcións do FileZilla." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 msgid "" "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." msgstr "" -"Non pode substituír un carácter incorrecto cun outro incorrecto. Introduza " +"Non se pode substituír un carácter incorrecto cun outro incorrecto. Insira " "un carácter admitido para nomes de ficheiros." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Non se pode enviar ficheiros ao cartafol raíz." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Non inseriu un novo nome para o ficheiro. Quere sobrescribilo?" -#: resources.h:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Seleccionou, cando menos, unha ligazón simbólica." -#: ../../locales/../src/interface/LocalListView.cpp:2019 -#: ../../locales/../src/interface/RemoteListView.cpp:2639 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -7807,7 +9167,8 @@ "Seleccionou máis que 10 ficheiros para editar; está certo de querer " "continuar?" -#: ../../locales/../src/interface/LocalListView.cpp:2139 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -7815,245 +9176,695 @@ "Seleccionou máis de 10 ficheiros ou cartafoles para abrir; está certo de " "querer continuar?" -#: ../../locales/../src/interface/manual_transfer.cpp:433 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:945 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." -msgstr "Introduza un nome de servidor." +msgstr "Insira un nome de servidor." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +msgid "You have to enter a key file path" +msgstr "Insira a ruta do ficheiro chave" -#: ../../locales/../src/interface/search.cpp:817 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." -msgstr "Introduza un cartafol local." +msgstr "Insira un cartafol local." -#: ../../locales/../src/interface/netconfwizard.cpp:149 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Introduza un número de IP correcto." +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Insira un cartafol remoto." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "Insira un enderezo IPv4 válido." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Insira unha chave de cifrado válida." -#: ../../locales/../src/interface/search.cpp:823 +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." -msgstr "Ten de introducir un cartafol local escribíbel." +msgstr "Insira un cartafol local escribíbel." -#: ../../locales/../src/interface/manual_transfer.cpp:520 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" -msgstr "Introduza un nome de conta" +msgstr "Insira un nome de conta" -#: ../../locales/../src/interface/manual_transfer.cpp:490 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" -msgstr "Ten de especificar un nome de usuario" +msgstr "Especifique un nome de usuario" -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "" -"Parece que teña un enrutador ou unha devasa que modifica erradamente os " +"Parece que ten un encamiñador ou unha devasa que modificou erradamente os " "datos transferidos." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:55 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Necesita inserir un contrasinal mestre." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." -msgstr "Cómpre introducir un nome para o marcador." +msgstr "Necesita inserir un nome para o marcador." #: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 msgid "You need to enter a name for the log file." -msgstr "Cómpre introducir un nome para o ficheiro de rexistro." +msgstr "Necesita inserir un nome para o ficheiro de rexistro." -#: ../../locales/../src/interface/edithandler.cpp:1640 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." -msgstr "Cómpre introducir unha orde de liña apropiadamente acoutada." +msgstr "Necesita inserir unha orde de liña apropiadamente acoutada." #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70 +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 msgid "You need to enter a proxy host." -msgstr "Cómpre introducir un servidor proxy." +msgstr "Necesita inserir un servidor proxy." -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75 +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 msgid "You need to enter a proxy port in the range from 1 to 65535" -msgstr "Cómpre introducir un porto de proxy con valor entre 1 e 65535" +msgstr "Necesita inserir un porto de proxy con valor entre 1 e 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:76 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:446 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" -"Precisa escribir cando menos unha ruta, non se aceptarán os marcadores " -"vadíos." +"Necesita inserir polo menos unha ruta, os marcadores baleiros non son " +"compatibles." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:83 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:453 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" -"Cómpre introducir tanto unha ruta remota como local para activar a " -"navegación sincronizada deste marcador." +"Necesita inserir unha ruta remota e unha local para activar a navegación " +"sincronizada deste marcador." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "" -"Cómpre introducir tanto unha ruta remota como unha local para activar a " -"navegación sincronizada neste sitio." +"Necesita inserir unha ruta remota e unha local para activar a navegación " +"sincronizada neste sitio." -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Necesita conceder ao FileZilla o acceso aos cartafoles nos que quere " +"descargar ficheiros ou enviar ficheiros." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." -msgstr "Ten de especificar un ficheiro local." +msgstr "Necesita especificar un ficheiro local." -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." -msgstr "Ten de especificar un ficheiro remoto." +msgstr "Necesita especificar un ficheiro remoto." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." -msgstr "Ten de especificar unha ruta remota." +msgstr "Necesita especificar unha ruta remota." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." -msgstr "Ten de especificar un servidor." +msgstr "Necesita especificar un servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "" -"Non debería ter problemas ao se conectar con outros servidores e as " +"Non debería ter problemas ao se conectar con outros servidores, as " "transferencias deberían funcionar correctamente." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/QueueView.cpp:2780 +msgid "Your computer will suspend unless you click Cancel." +msgstr "A súa computadora suspenderase a menos que prema en Cancelar." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "despois" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "antes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "comeza por" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 +msgid "bytes" +msgstr "bytes" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "contén" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/updater.cpp:257 +msgid "custom" +msgstr "personalizado" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "non contén" +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "does not equal" msgstr "non é igual a" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "remata en" +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 msgid "equals" msgstr "iguais" -#: ../../locales/../src/interface/filelistctrl.cpp:497 -#: ../../locales/../src/interface/filelistctrl.cpp:515 -#: ../../locales/../src/interface/filelistctrl.cpp:540 -#: ../../locales/../src/interface/filelistctrl.cpp:556 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "ficheiro" -#: ../../locales/../src/interface/edithandler.cpp:88 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " "FileZilla executable." msgstr "" -"fzputtygen non se pode iniciar.\n" +"Non se puido iniciar fzputtygen.\n" "Asegúrese de que existe o executábel no mesmo cartafol que o executábel " "principal do FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558 +#: ../../locales/../src/engine/sftp/connect.cpp:101 +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "fzsftp pertence a unha versión diferente do FileZilla" + +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" -msgstr "non se puido iniciar o fzsftp" +msgstr "Non se puido iniciar o fzsftp" + +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj pertence a unha versión diferente do FileZilla" -#: ../../locales/../src/engine/tlssocket.cpp:926 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "Non se puido iniciar o fzstorj" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"Non se puido iniciar o fzstorj.\n" +"Asegúrese de que existe o executábel no mesmo cartafol que o executábel " +"principal do FileZilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers non devolveu ningún certificado" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "Fallou gnutls_pem_base64_encode2" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "máis ca" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "executábel para o grupo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "lexíbel para o grupo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "escribíbel para o grupo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 +msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" +msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "é igual ca" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "está configurado" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "está sen estabelecer" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "menos que" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "coincide coa expresión regular" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "novo nome" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "executábel para o propietario" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "lexíbel para o propietario" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "escribíbel para o propietario" -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "descoñecido" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "executábel para todos" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "lexíbel para todos" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "escribíbel para todos" -#: resources.h:165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "%d files added to queue" +#~ msgstr "%d ficheiros engadidos á cola" + +#~ msgid "%s (%d.%d KB/s)" +#~ msgstr "%s (%d.%d KB/s)" + +#~ msgid "%s (%d.%d MB/s)" +#~ msgstr "%s (%d.%d MB/s)" + +#~ msgid "%s bytes (%d B/s)" +#~ msgstr "%s bytes (%d B/s)" + +#~ msgid "%s bytes (%d.%d KB/s)" +#~ msgstr "%s bytes (%d.%d KB/s)" + +#~ msgid "%s bytes (%d.%d MB/s)" +#~ msgstr "%s bytes (%d.%d MB/s)" + +#~ msgid "&Copy" +#~ msgstr "&Copiar" + +#~ msgid "&Crash" +#~ msgstr "&Erro" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Desconectar do servidor" + +#~ msgid "&Enable automatic update check" +#~ msgstr "&Activar a comprobación automática de actualizacións" + +#~ msgid "&Finish" +#~ msgstr "&Rematar" + +#~ msgid "&Number of days between update checks:" +#~ msgstr "&Número de días entre as comprobacións de actualización:" + +#~ msgid "&Remember this and all future passwords" +#~ msgstr "&Lembrar este e todos os futuros contrasinais" + +#~ msgid "&Show message" +#~ msgstr "&Amosar a mensaxe" + +#~ msgid "(At least 7 days)" +#~ msgstr "(Cando menos 7 días)" + +#~ msgid ", %H:%M:%S left" +#~ msgstr ", %H:%M:%S restantes" + +#~ msgid ", --:--:-- left" +#~ msgstr ", --:--:-- restantes" + +#~ msgid "- Broken router and/or firewall" +#~ msgstr "- Rachou o encamiñador e/ou a devasa" + +#~ msgid "- File corrupted on mirror" +#~ msgstr "- Ficheiro danado no servidor espello" + +#~ msgid "- Malware on your system" +#~ msgstr "- Software malicioso no sistema" + +#~ msgid "" +#~ "A file with that name is already being edited. Do you want to reopen '%s'?" +#~ msgstr "Xa está aberto un ficheiro co mesmo nome. Quere reabrilo '%s'?" + +#~ msgid "Advanced options:" +#~ msgstr "Opcións avanzadas:" + +#~ msgid "" +#~ "Alternatively, visit https://filezilla-project.org/ to download the most " +#~ "recent version." +#~ msgstr "" +#~ "De xeito alternativo, pode visitar https://filezilla-project.org/ para " +#~ "descargar a versión máis recente." + +#~ msgid "" +#~ "Any changes made in the Site Manager will not be saved unless you repair " +#~ "the file." +#~ msgstr "" +#~ "Non se gardará ningún cambio realizado no Xestor de sitios, a non ser que " +#~ "repare o ficheiro." + +#~ msgid "Available sizes" +#~ msgstr "Tamaños dispoñíbeis" + +#~ msgid "Benchmark string coalescer" +#~ msgstr "Clasificar a fusión de cadeas" + +#~ msgid "C&heck for nightly builds of FileZilla" +#~ msgstr "Pro&curar versións de desenvolvemento do FileZilla" + +#~ msgid "Cannot compare directories, not connected to a server." +#~ msgstr "" +#~ "Non se puido comparar os cartafoles pois non hai conexión co servidor." + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "" +#~ "Non se pode cargar a barra de conexión rápida do ficheiro de recurso" + +#~ msgid "Cannot load file, not a valid XML file." +#~ msgstr "Non se pode cargar o ficheiro pois non é un XML correcto." + +#~ msgid "Certificate details" +#~ msgstr "Detalles do certificado" + +#~ msgid "Check for &beta versions and release candidates" +#~ msgstr "Comprobar por versións &beta e publicacións candidatas" + +#~ msgid "Clear &Site Manager entries" +#~ msgstr "Limpar as entradas do Xestor de &sitios" + +#~ msgid "Clear &transfer queue" +#~ msgstr "Limpar a cola de &transferencias" + +#~ msgid "Clear string coalescer" +#~ msgstr "Limpar a fusión de cadeas" + +#~ msgid "Click on next to download the new version." +#~ msgstr "Prema seguinte para descargar a versión nova." + +#~ msgid "Connected" +#~ msgstr "Conectado" + +#~ msgid "Connecting to server" +#~ msgstr "Estase a conectar ao servidor" + +#~ msgid "Cop&y" +#~ msgstr "Cop&iar" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "Non se puido importar o certificado, fallou gnutls_x509_crt_import" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Non se puido iniciar a estrutura para certificados, fallou " +#~ "gnutls_x509_crt_init" + +#~ msgid "" +#~ "Crashes FileZilla instantly. Only used to debug the exception handler" +#~ msgstr "" +#~ "Pecha instantaneamente o FileZil. Só se emprega para a eliminación de " +#~ "erros do xestor de excepcións" + +#~ msgid "Do ¬hing" +#~ msgstr "Non facer &nada" + +#~ msgid "" +#~ "Do you really want to check for beta versions?\n" +#~ "Unless you want to test new features, keep using stable versions." +#~ msgstr "" +#~ "Quere comprobar se hai versións beta?\n" +#~ "A non ser que desexe probar novas características, é mellor que continúe " +#~ "empregando as versións estábeis." + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Non é aínda compatíbel descargar múltiplos cartafoles sen relación" + +#~ msgid "Error, file name cannot be parsed." +#~ msgstr "Erro, non se pode procesar o nome do ficheiro." + +#~ msgid "Error, local file exists but cannot be removed" +#~ msgstr "Erro: o ficheiro local existe pero non se pode borrar" + +#~ msgid "Executable" +#~ msgstr "Executábel" + +#~ msgid "Failed to check for newer version of FileZilla." +#~ msgstr "Produciuse un fallo ao comprobar as novas versións do FileZilla." + +#~ msgid "Failed to parse trusted root cert." +#~ msgstr "Fallou ao analizar o certificado raíz de confianza." + +#~ msgid "Filename &filters..." +#~ msgstr "&Filtros de nomes de ficheiros..." + +#~ msgid "" +#~ "Filename may not contain any of the following characters: / \\ : * ? \" < " +#~ "> |" +#~ msgstr "" +#~ "Os nomes de ficheiro non poden conter ningún dos seguintes caracteres: / " +#~ "\\ : * ? \" < > |" + +#~ msgid "Fingerprint (MD5):" +#~ msgstr "Impresión dixital (MD5):" + +#~ msgid "Host key fingerprint:" +#~ msgstr "Impresión dixital da chave do servidor:" + +#~ msgid "" +#~ "In case you prefer automatic updates, you can enable automatic update " +#~ "checks in the settings dialog." +#~ msgstr "" +#~ "Caso de preferir as actualizacións automáticas, ten de activar a " +#~ "comprobación automática no diálogo da configuración." + +#~ msgid "Log of update check:" +#~ msgstr "Rexistrar comprobacións de actualizacións:" + +#~ msgid "No more files in the queue!" +#~ msgstr "Non hai máis ficheiros na cola!" + +#~ msgid "Operating system problem detected" +#~ msgstr "Detectouse un problema no sistema opertativo" + +#~ msgid "Package" +#~ msgstr "Paquete" + +#~ msgid "" +#~ "Please check https://filezilla-project.org/ for the most recent version " +#~ "of FileZilla." +#~ msgstr "" +#~ "Vaia a https://filezilla-project.org/ para procurar a versión máis " +#~ "recente do FileZilla." + +#~ msgid "" +#~ "Please check the package manager of your system for an updated package or " +#~ "visit https://filezilla-project.org/ to download the source code of " +#~ "FileZilla." +#~ msgstr "" +#~ "Debe comprobar o xestor de paquetes do sistema para ver se hai algún " +#~ "paquete actualizado ou visite a páxina https://filezilla-project.org/ " +#~ "para descargar o código de FileZilla." + +#~ msgid "Please enter an update interval of at least 7 days" +#~ msgstr "Introduza un intervalo de actualización de, cando menos, 7 días" + +#~ msgid "" +#~ "Please retry downloading the update. Possible reasons if the problem " +#~ "persists (listed in order of decreasing probability):" +#~ msgstr "" +#~ "Tente descargar a actualización. As razóns máis probábeis se o problema " +#~ "persiste, relacionadas en orde de probabilidade decrecente, son as " +#~ "seguintes:" + +#~ msgid "" +#~ "Please visit https://filezilla-project.org/ for more information about " +#~ "FileZilla." +#~ msgstr "" +#~ "Vexa https://filezilla-project.org/ para máis información sobre o " +#~ "FileZilla." + +#~ msgid "" +#~ "Please visit https://filezilla-project.org/ to download the most recent " +#~ "version." +#~ msgstr "" +#~ "Ver https://filezilla-project.org/ para descargar a versión máis recente." + +#~ msgid "Privacy policy:" +#~ msgstr "Política de privacidade:" + +#~ msgid "Resolving hostname" +#~ msgstr "Estase a resolver o nome do servidor" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Estanse a procurar ficheiros para engadir á cola" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Estase a buscar ficheiros para cargar" + +#~ msgid "Select download location for package" +#~ msgstr "Escolla o destino de descarga para o paquete" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize chamouse sen conectador" + +#~ msgid "The XML document is not well-formed: %s" +#~ msgstr "O documento XML non está composto correctamente: %s" + +#~ msgid "" +#~ "The file '%s' is not in a format supported by FileZilla.\n" +#~ "The file is also password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into a supported, unprotected format?" +#~ msgstr "" +#~ "O ficheiro '%s' ten un formato que non é compatíbel co FileZilla.\n" +#~ "O ficheiro ademais está protexido cun contrasinal. Os ficheiros de chaves " +#~ "protexidos por contrasinal non son compatíbeis co FileZilla.\n" +#~ "Quere converter o ficheiro a un formato non protexido compatíbel?" + +#~ msgid "" +#~ "The file '%s' is password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into an unprotected file?" +#~ msgstr "" +#~ "O ficheiro '%s' está protexido por un contrasinal. Os ficheiros de chaves " +#~ "protexidos con contrasinal non son compatíbeis co FileZilla.\n" +#~ "Quere convertelo nun ficheiro non protexido?" + +#~ msgid "" +#~ "The most recent version has been downloaded. Click on Finish to close " +#~ "FileZilla and to start the installation." +#~ msgstr "" +#~ "Descargouse a versión máis recente. Prema rematar para pechar o FileZilla " +#~ "e comezar a instalación." + +#~ msgid "" +#~ "The most recent version has been downloaded. Please install it the same " +#~ "way you installed this version." +#~ msgstr "" +#~ "Descargou a versión máis recente. Debe instalala tal e como instalou esta " +#~ "versión." + +#~ msgid "" +#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " +#~ "seconds." +#~ msgstr "" +#~ "Compensacións da zona horaria: servidor: %d segundos. Local: %d segundos. " +#~ "Diferenza: %d segundos." + +#~ msgid "" +#~ "Unknown error opening the file. Make sure the file can be accessed and is " +#~ "a well-formed XML document." +#~ msgstr "" +#~ "Produciuse un erro que se descoñece ao abrir o ficheiro. Cómpre " +#~ "asegurarse de que se pode acceder ao ficheiro e que se trata dun " +#~ "documento XML ben composto." + +#~ msgid "Update wizard" +#~ msgstr "Asistente de actualización" + +#~ msgid "Use plain FTP" +#~ msgstr "Usar FTP simple" + +#~ msgid "Use system &defaults" +#~ msgstr "Usar o valor por omisión &do sistema" + +#~ msgid "Using proxy %s" +#~ msgstr "Usando o proxy %s" + +#~ msgid "Using this wizard you can check for available updates to FileZilla." +#~ msgstr "" +#~ "Ao usar este asistente, poderá comprobar se existe algunha actualización " +#~ "do FileZilla." + +#~ msgid "Waiting" +#~ msgstr "Esperando" + +#~ msgid "" +#~ "Warning!\n" +#~ "\n" +#~ "A bug in Windows causes problems with FileZilla\n" +#~ "\n" +#~ "The bug occurs if you have\n" +#~ "- Windows Server 2003 or XP 64\n" +#~ "- Windows Firewall enabled\n" +#~ "- Application Layer Gateway service enabled\n" +#~ "See http://support.microsoft.com/kb/931130 for background information.\n" +#~ "\n" +#~ "Unless you either disable Windows Firewall or the Application Layer " +#~ "Gateway service,\n" +#~ "FileZilla will timeout on big transfers." +#~ msgstr "" +#~ "Aviso:\n" +#~ "\n" +#~ "Un erro no Windows está a provocar problemas co FileZilla\n" +#~ "\n" +#~ "O erro prodúcese con\n" +#~ "- Windows Server 2003 ou XP 64\n" +#~ "- A devasa de Windows activada.\n" +#~ "- Pasarela de capa de aplicativo activada\n" +#~ "Vexa http://support.microsoft.com/kb/931130 para máis información.\n" +#~ "\n" +#~ "A menos que desactive a devasa de Windows ou o servizo de Pasarela de " +#~ "capa de aplicativo,\n" +#~ "o FileZilla fallará nas transferencias grandes." + +#~ msgid "" +#~ "You are already using the most recent version of FileZilla. Please check " +#~ "again in future." +#~ msgstr "" +#~ "Está a empregar a última versión do FileZilla. Volva comprobar no futuro." + #~ msgid "&Automatically remove successful transfers" #~ msgstr "&Eliminar automaticamente as transferencias correctas" diff -Nru filezilla-3.15.0.2/locales/hu_HU.po filezilla-3.33.0/locales/hu_HU.po --- filezilla-3.15.0.2/locales/hu_HU.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/hu_HU.po 2017-12-29 14:30:54.000000000 +0000 @@ -1,31 +1,31 @@ msgid "" msgstr "" "Project-Id-Version: FileZilla 3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-24 14:53+0200\n" -"PO-Revision-Date: 2015-08-21 17:45+0200\n" -"Last-Translator: György Bata \n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-12-29 12:19+0100\n" +"PO-Revision-Date: 2017-12-24 15:25+0100\n" +"Last-Translator: György Bata \n" "Language-Team: György Bata\n" "Language: hu_HU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Poedit 1.8.3\n" +"X-Generator: Poedit 2.0.5\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../src/interface/statuslinectrl.cpp:59 +#: ../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "Eltelt: %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../src/interface/statuslinectrl.cpp:64 +#: ../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "Hátralévő: %H:%M:%S" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -34,1076 +34,1130 @@ "%a - Fiók (Kihagyásra kerül, ha nem a Fiókos bejelentkezési típust " "használja.)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../src/interface/filelist_statusbar.cpp:51 +#: ../src/interface/filelist_statusbar.cpp:63 +#: ../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d mappa" msgstr[1] "%d mappa" -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/search.cpp:478 -#: ../../locales/../src/interface/search.cpp:764 +#: ../src/interface/RemoteListView.cpp:1425 ../src/interface/search.cpp:854 +#: ../src/interface/search.cpp:1239 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d mappa a tartalmával együtt" msgstr[1] "%d mappa a tartalmával együtt" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1389 -#: ../../locales/../src/interface/search.cpp:477 -#: ../../locales/../src/interface/search.cpp:763 +#: ../src/interface/filelist_statusbar.cpp:50 +#: ../src/interface/filelist_statusbar.cpp:75 +#: ../src/interface/RemoteListView.cpp:1424 ../src/interface/search.cpp:853 +#: ../src/interface/search.cpp:1238 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fájl" msgstr[1] "%d fájl" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d fájl. Fájl mérete: %s" msgstr[1] "%d fájl. Fájlok mérete: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d fájl. Fájl mérete: Legalább %s" msgstr[1] "%d fájl. Fájlok mérete: Legalább %s" -#: ../../locales/../src/interface/QueueView.cpp:2784 -#, c-format -msgid "%d files added to queue" -msgstr "%d fájl hozzáadva a várólistához" - -#: ../../locales/../src/engine/ControlSocket.cpp:103 +#: ../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d másodperc" msgstr[1] "%d másodperc" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Cím" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu mappa" msgstr[1] "%llu mappa" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu fájl" msgstr[1] "%llu fájl" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Jelszó" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - A tanúsítvány érvényessége lejárt!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - A tanúsítvány még nem érvényes!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Proxy felhasználónév" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s és %s. Fájlok mérete: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s és %s. Fájlok mérete: Legalább %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s byte" -#: ../../locales/../src/interface/FileZilla.cpp:595 +#: ../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"A következő fájl nem található: %s. A FileZilla ezen összetevője nélkül az " -"SFTP nem fog működni.\n" +"Ez a fájl nem található: %s. A FileZilla ezen összetevője nélkül a(z) %s nem " +"fog működni.\n" "\n" -"Kérem a FileZilla-t töltse le ismételten. Amennyiben a probléma továbbra is " +"Kérem a FileZilla-t töltse le újra. Amennyiben a probléma továbbra is " "fennáll, kérem küldjön egy hibajelentést." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"A következő fájl nem található: %s. A FileZilla ezen összetevője nélkül az " -"SFTP nem fog működni.\n" +"Ez a fájl nem található: %s. A FileZilla ezen összetevője nélkül a(z) %s nem " +"fog működni.\n" "\n" "Lehetséges megoldások:\n" -"- Győződjön meg róla, hogy a(z) %s a PATH környezeti változó által " -"meghatározott mappák egyikében található.\n" -"- Az FZ_FZSFTP környezeti változó értékében állítsa be a(z) %s teljes " -"elérési útját." +"- Ellenőrizze, hogy a(z) %s a PATH környezeti változó mappáinak egyikében " +"található.\n" +"- A(z) %s környezeti változó értékében állítsa be a(z) %s teljes elérési " +"útját." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s %d bittel" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../src/interface/verifycertdialog.cpp:164 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - A kiszolgáló címe nem egyezik a tanúsítványban szereplő címmel" + +#: ../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Felhasználónév" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Proxy jelszó" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "Előző kapcsolat bontása és csatlakozás a jelenlegi lapon" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "Névjegy..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "Fiók:" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../src/interface/resources/xrc/netconfwizard.xrc:80 +#: ../src/interface/resources/xrc/settings.xrc:209 +#: ../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "Aktív" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "Kedvenc könyvtár hozzáadása..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "Mappa hozzáadása..." + +#: ../src/interface/resources/xrc/menus.xrc:249 +#: ../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "Várólistához adás" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "Kulcs hozzáadása..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../src/interface/resources/xrc/menus.xrc:505 +#: ../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "Várólistához adás" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "A kiszolgáló időzónájának időeltolódása:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 +#: ../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "A továbbiakban mindig fogadja el ezt a tanúsítványt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "" "A továbbiakban mindig fogadja el ezt a címkulcsot, és tárolja el a " -"regisztrációs adatbázisban." +"regisztrációs adatbázisban" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "Mindig az alapértelmezett szerkesztő használata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "A továbbiakban mindig ezt használja a hiányzó fájl társításokhoz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "A továbbiakban mindig ez legyen a beállítás" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "A külső IP cím elkérése az operációs rendszertől" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../src/interface/resources/xrc/menus.xrc:144 +#: ../src/interface/resources/xrc/menus.xrc:603 +#: ../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "Automatikus" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "Automatikus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "Háttérszín:" + +#: ../src/interface/resources/xrc/menus.xrc:152 +#: ../src/interface/resources/xrc/menus.xrc:611 +#: ../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "Bináris" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "Bináris előtagok SI mértékegységekkel (pl. 1 KB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "Mappakedvencek" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2749 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3129 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../src/interface/resources/xrc/settings.xrc:2010 +#: ../src/interface/resources/xrc/settings.xrc:2225 +#: ../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "Tallózás..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "Burst tűrés:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3620 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3676 -#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../src/interface/resources/xrc/dialogs.xrc:386 +#: ../src/interface/resources/xrc/dialogs.xrc:494 +#: ../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../src/interface/resources/xrc/dialogs.xrc:4098 +#: ../src/interface/resources/xrc/inputdialog.xrc:40 +#: ../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "Mégse" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 +#: ../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." msgstr "Személyes adatok törlése..." -#: ../../locales/../src/interface/resources/xrc/update.xrc:28 +#: ../src/interface/resources/xrc/update.xrc:28 msgid "&Close" msgstr "Bezárás" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "FileZilla bezárása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "FileZilla bezárása egyszer" + +#: ../src/interface/resources/xrc/menus.xrc:657 msgid "&Configure speed limits..." msgstr "Sebesség korlátozása..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "Beállítás..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "Csatlakozás" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../src/interface/resources/xrc/menus.xrc:12 msgid "&Copy current connection to Site Manager..." msgstr "Jelenlegi kapcsolat másolása Kedvenc Helyekbe..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../src/interface/resources/xrc/dialogs.xrc:985 +#: ../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "Másolás a vágólapra" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../src/interface/resources/xrc/menus.xrc:268 +#: ../src/interface/resources/xrc/menus.xrc:308 +#: ../src/interface/resources/xrc/menus.xrc:511 +#: ../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "Könyvtár létrehozása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../src/interface/resources/xrc/menus.xrc:637 msgid "&Create new tab" msgstr "Új lap megnyitása" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "Hibakeresés" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "Hibakeresési információk követése az üzenet naplóban:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "Alapértelmezett szerkesztő:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../src/interface/resources/xrc/menus.xrc:139 +#: ../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "Fájl felülírás beállítása..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "Késleltetés a bejelentkezési kísérletek között:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2829 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 +#: ../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../src/interface/resources/xrc/menus.xrc:280 +#: ../src/interface/resources/xrc/menus.xrc:588 +#: ../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "Törlés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "Symlinkek törlése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "Mappahozzáférési jogosultságok..." + +#: ../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "Könyvtárak összehasonlítása" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../src/interface/state.cpp:1030 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "Szinkronizált böngészés tiltása, helyi könyvtár váltás folytatása" + +#: ../src/interface/state.cpp:1108 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "Szinkronizált böngészés tiltása, távoli könyvtár váltás folytatása" + +#: ../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" -msgstr "Helyi fájl elvetése és a távoli fájl újbóli letöltése és szerkesztése." +msgstr "Helyi fájl elvetése és a távoli fájl újbóli letöltése és szerkesztése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "Kapcsolat bontása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "Kapcsolat bontása" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "" "Pillanatnyi átviteli sebesség megjelenítése az átlagos sebesség helyett" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "Méret megjelenítése byte-okban" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 -msgid "&Do not remember passwords (recommended)" -msgstr "Ne emlékezzen a jelszavakra (alapértelmezett)" - -#: ../../locales/../src/interface/conditionaldialog.cpp:25 +#: ../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "Ezt az ablakot ne jelenítse meg a továbbiakban." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "Ne használja a külső IP címet helyi kapcsolatok esetén." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "Dupla kattintás fájlokra:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../src/interface/resources/xrc/menus.xrc:290 +#: ../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "Letöltés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "Letöltés ide:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "Letöltés..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "Letöltések:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../src/interface/resources/xrc/menus.xrc:45 +#: ../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "Szerkesztés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "Szűrő szabályok szerkesztése..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../src/interface/resources/xrc/menus.xrc:76 +#: ../src/interface/resources/xrc/menus.xrc:163 +#: ../src/interface/resources/xrc/menus.xrc:543 +#: ../src/interface/resources/xrc/menus.xrc:653 msgid "&Enable" msgstr "Engedélyezés" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "Tömörítés engedélyezése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3548 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "Sebességkorlátozás engedélyezése" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "Kódolás:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 +#: ../src/interface/resources/xrc/sitemanager.xrc:141 msgid "&Encryption:" msgstr "Titkosítás:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "Egyéni parancs beírása..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "Kapcsolat létrehozása egy új lapon" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "Végrehajtás" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "Kedvenc Helyek bejegyzései" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../src/interface/resources/xrc/menus.xrc:27 +#: ../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "Exportálás..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "Áttérés aktív módra" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../src/interface/resources/xrc/menus.xrc:5 msgid "&File" msgstr "Fájl" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "Attribútumok..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "Engedélyek..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "Fájl:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "Szűrési feltételek:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "Szűrőkészletek:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "Szűrők" + +#: ../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "Szűrők:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "Szerkesztés befejezése és a helyi fájl törlése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"Az összes tartalmazott fájlt közvetlenül a feltöltési könyvtárba töltse" + +#: ../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "Az összes tartalmazott fájlt közvetlenül a letöltési könyvtárba töltse" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "Symlinkek követése, cél könyvtárak tartalmának törlése" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "Külső IP cím lekérdezése az alábbi URL-ről:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "Online súgó..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "Globális kedvenc mappa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "HTTP/1.1 a CONNECT módszer használatával" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "Súgó" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../src/interface/resources/xrc/menus.xrc:91 +#: ../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "Azonos fájlok elrejtése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "Legmagasabb" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "Legmagasabb elérhető port:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../src/interface/resources/xrc/dialogs.xrc:2637 +#: ../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "Cím:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "IEC bináris előtagok (pl. 1 KiB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "ISO 8601 (példa: 2007-09-15)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../src/interface/resources/xrc/menus.xrc:30 msgid "&Import..." msgstr "Importálás..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "A rendszer fájl társításainak öröklése" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "Új verzió telepítése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3144 +#: ../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "A relatív helyi elérési utak megtartása" + +#: ../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "A relatív távoli elérési utak megtartása" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "Hitelesítő kulcs:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "A fájlablak és könyvtárfa panelek elrendezése:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "A FileZilla által használt helyi portok korlátozása" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "Az egyidejű kapcsolati szálak számának korlátozása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "Helyi könyvtárfa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2737 +#: ../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "Helyi mappa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "Helyi keresés" + +#: ../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "Naplózás fájlba" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "Bejelentkezés típusa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "Bejelentkezés típusa:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "Alacsony" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "Kedvenc könyvtárak szerkesztése..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "Kézi átvitel..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "A kapcsolati szálak maximális száma:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "Újrapróbálkozások maximális száma:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "Üzenet napló" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "Kicsinyítés az értesítési területre" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "Névsorrend módja:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "Név:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 +#: ../src/interface/resources/xrc/menus.xrc:47 msgid "&Network configuration wizard..." msgstr "Hálózati beállítások varázsló..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "Új" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 +#: ../src/interface/resources/xrc/sitemanager.xrc:35 msgid "&New Site" msgstr "Új állomás" -#: ../../locales/../src/interface/Mainfrm.cpp:1688 +#: ../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "Új verzió elérhető!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "Következő >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "Nem" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../src/interface/resources/xrc/menus.xrc:385 +#: ../src/interface/resources/xrc/settings.xrc:459 +#: ../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "Nincs" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "Normál" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "Számérték:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2878 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../src/interface/resources/xrc/dialogs.xrc:378 +#: ../src/interface/resources/xrc/dialogs.xrc:486 +#: ../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&OPEN" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../src/interface/resources/xrc/menus.xrc:259 +#: ../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "Megnyitás" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "Felülírás" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "Passzív" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "Jelszó:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "Hangjelzés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../src/interface/resources/xrc/dialogs.xrc:2650 +#: ../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "Port:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "Időbélyeg megtartása az átvitt fájlokon" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "Átviteli várólista" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "Csatlakozás" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "Gyorscsatlakozás eszköztár" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "Gyorscsatlakozás előzmények" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "Olvasás" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "Újracsatlakozás" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "Újracsatlakozási adatok" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../src/interface/resources/xrc/menus.xrc:65 +#: ../src/interface/resources/xrc/menus.xrc:648 msgid "&Refresh" msgstr "Frissítés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "Mesterjelszó megjegyzése a FileZilla bezárásáig" + +#: ../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "Jelszó megjegyzése a FileZilla bezárásáig" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 -msgid "&Remember passwords" -msgstr "Jelszavak megjegyzése" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2761 +#: ../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "Távoli mappa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "Távoli mappa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "Távoli keresés" + +#: ../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "Eltávolítás" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "Kulcs eltávolítása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "Kijelölt elemek eltávolítása a várólistából" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2823 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 +#: ../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../src/interface/resources/xrc/menus.xrc:284 +#: ../src/interface/resources/xrc/menus.xrc:328 +#: ../src/interface/resources/xrc/menus.xrc:524 +#: ../src/interface/resources/xrc/menus.xrc:592 +#: ../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Átnevezés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "Átnevezés..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "Helyi fájl újbóli megnyitása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "Érvénytelen karakterek cseréje erre:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "Hibajelentés küldése..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "Figyelmeztetés kérése" + +#: ../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "Összes eltávolítása és újra várólistához adása" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 +#: ../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" msgstr "Varázsló újraindítása" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "Folytatás" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "Parancs futtatása..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "Hálózati beállítások varázsló futtatása..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "Frissítések keresése most..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "Mentés másként..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "Keresés" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "Fájlkeresés a kiszolgálón..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 +#: ../src/interface/resources/xrc/sitemanager.xrc:18 msgid "&Select Entry:" msgstr "Jelölje ki a bejegyzést:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "Válassza ki a FileZilla által használt nyelvet:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "Jelölje ki a megjeleníteni kívánt oszlopokat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "Kiszolgáló" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "Beállítások" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 +#: ../src/interface/resources/xrc/menus.xrc:54 msgid "&Settings..." msgstr "Beállítások..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "A Hibakeresés menü engedélyezése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "Részletes napló" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "Üzenet megjelenítése" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "Idő megjelenítése az üzenet naplóban" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Kedvenc Helyek bejegyzései" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 +#: ../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "Kedvenc Helyek..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "Állomáshoz rendelt kedvenc mappa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "Kihagyás" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "Sebesség korlátozása" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Az átvitel megkezdése azonnal" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "A helyi és a távoli panelek felcserélése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "TLS kulcsok" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "Teszt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "Téma:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "Átvitel" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "Átviteli mód:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "Várólista" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "A dot fájlok kezelése ASCII fájlokként történjen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "Szerkesztés befejezése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" -msgstr "" -"Módosítsa a regisztrációs adatbázisban eltárolt címkulcsot ehhez a címhez." +msgstr "Módosítsa az eltárolt címkulcsot ehhez a címhez" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../src/interface/resources/xrc/menus.xrc:244 +#: ../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "Feltöltés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "Feltöltés ide:" + +#: ../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "Feltöltés..." + +#: ../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "Feltöltések:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "Egyéni program használata" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "Szinkronizált böngészés használata" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "" "A rendszer alapértelmezett szerkesztőjének használata szöveges fájlokhoz" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "A következő IP cím használata:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "Ehelyett, a kiszolgáló külső IP címének használata" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "Ezreselválasztó használata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../src/interface/resources/xrc/dialogs.xrc:323 +#: ../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "Felhasználónév:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "Felhasználónév:" -#: ../../locales/../src/interface/Mainfrm.cpp:1682 +#: ../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "Verzió: %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "Nézet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../src/interface/resources/xrc/menus.xrc:304 +#: ../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "Megnyitás / Szerkesztés" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "Helyileg szerkesztett fájlok figyelése és jelzés a feltöltéshez" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "Frissítés keresése a következőkhöz:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "Írás" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "Igen" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../src/engine/local_path.cpp:461 ../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "A következő nem létezik vagy nem hozzáférhető: '%s'." -#: ../../locales/../src/engine/local_path.cpp:459 -#: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../src/engine/local_path.cpp:479 ../src/engine/local_path.cpp:500 +#: ../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' nem egy könyvtár." -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' nem támogatott protokoll." + +#: ../src/interface/manual_transfer.cpp:419 +#: ../src/interface/sitemanager_dialog.cpp:998 msgid "'Account' logontype not supported by selected protocol" msgstr "" -"A 'Fiókos' bejelentkezési típust a kiválasztott protokoll nem támogatja." +"A 'Fiókos' bejelentkezési típust a kiválasztott protokoll nem támogatja" -#: ../../locales/../src/interface/manual_transfer.cpp:440 +#: ../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1111,7 +1165,7 @@ "'Normál' és 'Fiókos' bejelentkezési típus nem használható, helyette 'Jelszó " "bekérése' alkalmazása." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../src/interface/sitemanager_dialog.cpp:1015 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1119,7 +1173,7 @@ "'Normál' és 'Fiókos' bejelentkezési típus nem használható. A bejegyzés " "megváltozott 'Jelszó bekérése' bejelentkezési típusra." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1130,139 +1184,144 @@ "szerverre. Bizonyára a nyers parancsot szeretné megadni, a kezdő 'quote' " "nélkül." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../src/interface/filelist_statusbar.cpp:87 +#: ../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objektum ki van szűrve)" msgstr[1] "(%d objektum ki van szűrve)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% letöltve)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../src/interface/resources/xrc/settings.xrc:859 +#: ../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 ha nincs korlátozás)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 másodperc)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 a letiltáshoz)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../src/interface/aboutdialog.cpp:94 ../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat beállítva erre: %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(például: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(például: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3584 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../src/interface/resources/xrc/settings.xrc:920 +#: ../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(%s/s)" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 +#: ../src/interface/resources/xrc/netconfwizard.xrc:295 msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +# Direkt hibás +#: ../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "Hátralévő: --:--:--" -#: ../../locales/../src/interface/cmdline.cpp:88 +#: ../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." msgstr "A -c argumentum nem használható együtt FTP címmel." -#: ../../locales/../src/interface/cmdline.cpp:97 +#: ../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." msgstr "A -l argumentum nem használható együtt FTP címmel." -#: ../../locales/../src/interface/cmdline.cpp:76 +#: ../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." msgstr "A -s és -c argumentum nem használható együtt." -#: ../../locales/../src/interface/cmdline.cpp:82 +#: ../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." msgstr "A -s argumentum nem használható együtt FTP címmel." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Nincs" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Figyelmeztetések" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Információk" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Részletes" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32-bites rendszer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Hibakeresés" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64-bites rendszer" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< Vissza" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Egy kedvenc könyvtár már létezik ezen a néven. Kérem adjon meg egy új nevet." -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 +#: ../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"A hitelesítési lánc egyik tanúsítványa nem biztonságos algoritmussal van " +"aláírva" + +#: ../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Be kell állítania az alapértelmezett szerkesztőt." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:740 +#: ../src/interface/RemoteListView.cpp:164 ../src/interface/state.cpp:852 +#: ../src/interface/RemoteTreeView.cpp:123 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Egy mappa nem húzható bele a saját almappájába." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 +#: ../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" "A few servers don't allow passive mode or are misconfigured. In such cases " "you would have to use active mode. In active mode, FileZilla opens a port " @@ -1273,22 +1332,22 @@ "FileZilla megnyit egy portot, majd kéri a kiszolgálót hogy ehhez " "csatlakozzon." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Egy előzőleg megnyitott fájl módosult." -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Egy ugyanilyen nevű fájl átvitele már folyamatban van." -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Egy fájl ugyanezzel a fájlnévvel még szerkesztés alatt van. Kérem zárja be " "és próbálja újra." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1303,11 +1362,20 @@ "listázásokból.\n" "Ebben a munkamenetben már nem lesz több figyelmeztetés." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Elveszett mesterjelszó nem állítható vissza! Alaposan jegyezze meg a " +"jelszavát." + +#: ../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "A FileZilla egy újabb verziója érhető el:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1316,7 +1384,7 @@ "beállított kiszolgáló esetleg elrejtheti azokat. Ez a beállítás kényszeríti " "a kiszolgálót az összes fájl megjelenítésére." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1324,7 +1392,7 @@ "Egy megfelelő szerver ezt általában nem igényli. Forduljon a kiszolgáló " "rendszergazdájához, amennyiben használnia kell ezt a funkciót." -#: ../../locales/../src/interface/state.cpp:256 +#: ../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1333,81 +1401,82 @@ "engedélyezve van.\n" "Kikapcsolja a szinkronizált böngészést és a helyi mappaváltást folytatja?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../src/interface/resources/xrc/menus.xrc:148 +#: ../src/interface/resources/xrc/menus.xrc:607 +#: ../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "Hozzáadás" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "ASCII fájlok átviteli folytatásának engedélyezése" -#: ../../locales/../src/interface/fileexistsdlg.cpp:72 +#: ../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" msgstr "Csak a letöltésekre alkalmazza" -#: ../../locales/../src/interface/fileexistsdlg.cpp:72 +#: ../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" msgstr "Csak a feltöltésekre alkalmazza" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "Alkalmazás az összes fájlra és mappára" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "Sikeres átvitelek automatikus eltávolítása" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "FileZilla névjegye" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" -msgstr "A fájlablak fölött" +msgstr "Fájlablak fölött" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Valamely helyi mappához a hozzáférés nem állítható helyre:" + +#: ../src/engine/server.cpp:582 ../src/engine/server.cpp:605 +#: ../src/interface/manual_transfer.cpp:148 +#: ../src/interface/manual_transfer.cpp:149 +#: ../src/interface/manual_transfer.cpp:185 +#: ../src/interface/manual_transfer.cpp:535 +#: ../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Fiókos" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "Művelet a várólista végrehajtása után" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Művelet a kijelölt fájlon:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Válassza ki a műveletet:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Művelet:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 +#: ../src/interface/settings/settingsdialog.cpp:94 msgid "Active mode" msgstr "Aktív mód" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1415,7 +1484,7 @@ "Az aktív módú FTP teszt nem sikerült. A FileZilla nem ismeri a helyes külső " "IP címet." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1423,7 +1492,7 @@ "Az aktív módú FTP teszt nem sikerült. A FileZilla nem ismeri a helyes külső " "IP címet. Továbbá, a router módosította az elküldött címet." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1433,38 +1502,39 @@ "címet, azonban a router vagy tűzfal félrevezető módon megváltoztatta az " "elküldött címet." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP cím aktív módban" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "A fájlokat csak a várólistához adja hozzá" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../src/interface/resources/xrc/menus.xrc:507 +#: ../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Kijelölt mappa hozzáadása az átviteli várólistához" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../src/interface/resources/xrc/menus.xrc:251 +#: ../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Kijelölt mappák és fájlok hozzáadása az átviteli várólistához" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../src/interface/resources/xrc/settings.xrc:1903 +#: ../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Hozzáadás a várólistához" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Nem támogatott cím típus" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Speciális" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1478,48 +1548,49 @@ "az elvárt módon működnek, valamint a rendszert is károsíthatják. A beta " "verziókat és a napi változatokat csak saját felelősségére használja." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" -msgstr "A továbbiakban mindig ezt a műveletet használja." +msgstr "A továbbiakban mindig ezt a műveletet használja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritmus:" -#: ../../locales/../src/interface/QueueView.cpp:2953 +#: ../src/interface/QueueView.cpp:2652 msgid "All files have been successfully transferred" msgstr "Összes fájl átvitele sikeres" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 +#: ../src/interface/resources/xrc/netconfwizard.xrc:308 msgid "All ports in the given range have to be between 1024 and 65535." msgstr "A megadott port tartománynak 1024 és 65535 között kell lennie." -#: ../../locales/../src/interface/QueueView.cpp:2949 +#: ../src/interface/QueueView.cpp:2648 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "Összes átvitel befejeződött. %d fájl átvitele sikertelen." msgstr[1] "Összes átvitel befejeződött. %d fájl átvitele sikertelen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Áttérés a másik átviteli módra, ha hiba történik" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 +#: ../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" msgstr "Áttérés a másik átviteli módra, ha hiba történik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Már csatlakozva" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternatív név:" msgstr[1] "Alternatív nevek:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1528,7 +1599,7 @@ "is a PuTTY programcsomagból, a FileZilla együttműködik a Pageant " "alkalmazással." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1536,13 +1607,13 @@ "Másik megoldásként, használhatja a rendszer saját SSH kliensét. Ennek " "működéséhez, az SSH_AUTH_SOCK környezeti változót be kell állítani." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "Vagy pedig, a legújabb verziót letöltheti a FileZilla honlapjáról:" -#: ../../locales/../src/interface/QueueView.cpp:1919 +#: ../src/interface/QueueView.cpp:1656 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1551,7 +1622,7 @@ "Hiba történt a várólista betöltésekor innen: \"%s\".\n" "Lehet, hogy néhány elem a várólistából nem importálódott be." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../src/interface/QueueView.cpp:1549 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1560,199 +1631,203 @@ "Hiba történt a várólista mentésekor ide: \"%s\".\n" "Lehet, hogy néhány elem a várólistából nem mentődött el." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "A hitelesítési lánc egyik aláírója nem hitelesített hatóság" + +#: ../src/interface/sitemanager_dialog.cpp:2261 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Az áthúzott elemmel megegyező nevű elem már létezik a célhelyen." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../src/engine/server.cpp:607 ../src/interface/manual_transfer.cpp:147 +#: ../src/interface/manual_transfer.cpp:188 +#: ../src/interface/manual_transfer.cpp:203 +#: ../src/interface/manual_transfer.cpp:534 +#: ../src/interface/sitemanager_dialog.cpp:1716 msgid "Anonymous" msgstr "Névtelen" -#: ../../locales/../src/interface/state.cpp:914 +#: ../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Egy másik távoli művelet folyamatban van, könyvtár váltás nem lehetséges." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../src/interface/sitemanager_dialog.cpp:848 msgid "Any changes made in the Site Manager could not be saved." msgstr "A Kedvenc Helyek beállításai nem menthetőek." -#: ../../locales/../src/interface/filter.cpp:212 +#: ../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "A szűrő beállítások nem menthetőek." -#: ../../locales/../src/interface/filter.cpp:969 +#: ../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "A szűrő beállítások nem fognak mentődni." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Alkalmazás csak a mappákra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Alkalmaz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Csak az aktuális várólistára alkalmazza" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Alkalmazás csak a fájlokra" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Archív" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Túlcsordulás az argumentumokban" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Új fülként a várólista panelben" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../src/interface/resources/xrc/settings.xrc:1187 +#: ../src/interface/resources/xrc/settings.xrc:1208 +#: ../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Rákérdezés a műveletre" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../src/engine/server.cpp:573 ../src/engine/server.cpp:599 +#: ../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Jelszó bekérése" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 +#: ../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." -msgstr "Port kérése az operációs rendszertől" +msgstr "Port kérése az operációs rendszertől." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 +#: ../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" msgstr "A külső IP cím elkérése az operációs rendszertől" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3409 +#: ../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Kérdések feltétele a FileZilla fórumokban" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 +#: ../src/interface/settings/optionspage_edit_associations.cpp:63 msgid "Associated program not found:" msgstr "A társított program nem található:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" -msgstr "Legalább egy szűrő feltétel nem érvényes." +msgstr "Legalább egy szűrő feltétel nem érvényes" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 +#: ../src/interface/resources/xrc/netconfwizard.xrc:346 msgid "At this point, all required information has been gathered." msgstr "A hálózati beállításokhoz minden információ megadásra került." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Attribútum" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:658 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:221 msgid "Authentication failed." -msgstr "A hitelesítés nem sikerült" +msgstr "Hitelesítés nem sikerült." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Szerző:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Automatikus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Fájltípusok automatikus besorolása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Elérhető méretek" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../src/engine/sizeformatting_base.cpp:166 +#: ../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "Proxy kihagyása" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Hibás fájlleíró" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Alapvető használati javaslatok" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Működési mód" -#: ../../locales/../src/interface/edithandler.cpp:1115 -#: ../../locales/../src/interface/edithandler.cpp:1143 +#: ../src/interface/edithandler.cpp:1166 ../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Szerkesztés alatt" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Legyen óvatos! A tanúsítványt visszavonták" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Bináris" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Blackboard" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Kék" + +#: ../src/interface/bookmarks_dialog.cpp:271 ../src/interface/menu_bar.cpp:321 +#: ../src/interface/sitemanager_dialog.cpp:393 msgid "Bookmark" msgstr "Kedvenc mappa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Kedvenc mappák:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Kedvenc mappák" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Tallózás..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../src/engine/storj/resolve.cpp:70 ../src/engine/storj/resolve.cpp:158 +#: ../src/engine/storj/resolve.cpp:226 ../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Táska nem található" + +#: ../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Változat dátuma:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Program változat" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../src/interface/verifycertdialog.cpp:249 msgid "Business category:" msgstr "Üzleti kategória:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1762,98 +1837,116 @@ "kapcsolat létesítéséhez. Ha azt szeretné, hogy a FileZilla csak a portoknak " "egy kis tartományát használja, adja meg a port tartomány határait." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "Az aktuális művelet megszakítása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "Napló törlése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../src/interface/resources/xrc/menus.xrc:332 +#: ../src/interface/resources/xrc/menus.xrc:528 +#: ../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "URL(ek) másolása a vágólapra" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../src/interface/resources/xrc/menus.xrc:336 +#: ../src/interface/resources/xrc/menus.xrc:532 +#: ../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "URL(ek) másolása a vágólapra a jelszóval" + +# Direkt hibás +#: ../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "Egyéni:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Egyéni fájl társítások:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "CPU utasításkészletek:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1210 +#: ../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "A kiszolgáló időzónája eltolódásának számítása..." -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "A fájl nem olvasható" -#: ../../locales/../src/engine/transfersocket.cpp:648 -#: ../../locales/../src/engine/transfersocket.cpp:714 +#: ../src/engine/ftp/transfersocket.cpp:667 +#: ../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Nem sikerült az adatok fájlba írása." -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../src/engine/ftp/transfersocket.cpp:670 +#: ../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Nem sikerült az adatok írása ebbe a fájlba: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2716 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2884 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2974 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../src/interface/resources/xrc/certificate.xrc:269 +#: ../src/interface/resources/xrc/dialogs.xrc:239 +#: ../src/interface/resources/xrc/dialogs.xrc:565 +#: ../src/interface/resources/xrc/dialogs.xrc:757 +#: ../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Mégse" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Az aktuális művelet megszakítása" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Az aktuális művelet megszakítása" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "A következő meghajtóhoz nem sikerült a hozzáférés: '%s', nincs adathordozó a " "meghajtóban, vagy a meghajtó nincs kész." -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Nem sikerült az állomás hozzáadása a Kedvenc Helyekhez" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "A kért cím nem adható ki" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Könyvtár váltás nem lehetséges, szinkronizált böngésző művelet már " +"folyamatban van." + +#: ../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1861,34 +1954,32 @@ "A lap nem zárható be amíg műveletet hajt végre.\n" "Megszakítja a jelenlegi műveletet és bezárja a lapot?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" msgstr "" "A könyvtárak összehasonlítása nem lehetséges, a helyi és távoli mappákhoz " -"különböző szűrők vannak engedélyezve." +"különböző szűrők vannak engedélyezve" -#: ../../locales/../src/interface/filteredit.cpp:143 +#: ../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Az új szűrő nem hozható létre" -#: ../../locales/../src/interface/edithandler.cpp:1575 -#: ../../locales/../src/interface/edithandler.cpp:1623 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/search.cpp:712 +#: ../src/interface/edithandler.cpp:1626 ../src/interface/edithandler.cpp:1674 +#: ../src/interface/LocalListView.cpp:1835 ../src/interface/search.cpp:1184 msgid "Cannot edit file" msgstr "A fájl nem szerkeszthető" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../src/interface/LocalListView.cpp:1711 msgid "Cannot edit file, not connected to any server." msgstr "Fájl nem szerkeszthető, nincs kapcsolat kiszolgálóval." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../src/interface/LocalListView.cpp:1720 msgid "Cannot edit file, remote path unknown." msgstr "A fájl nem szerkeszthető, a távoli elérési út ismeretlen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1896,139 +1987,140 @@ "FTP kapcsolat nem létesíthető az SFTP szerverrel. Kérem válasszon megfelelő " "protokollt." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "A Gyorskapcsolódás eszköztár nem tölthető be az erőforrás fájlból." - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "A kulcsfájl nem betölthető" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" -msgstr "Az eszköztár nem tölthető be az erőforrás fájlból." +msgstr "Az eszköztár nem tölthető be az erőforrás fájlból" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "A jelszó nem menthető el" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../src/interface/bookmarks_dialog.cpp:732 +#: ../src/interface/sitemanager_dialog.cpp:1264 msgid "Cannot rename entry" msgstr "Többszörös név" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../src/interface/RemoteListView.cpp:1627 msgid "Cannot rename file" msgstr "A fájl átnevezés nem sikerült" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "A hostnév nem oldható fel IPv4 címmé SOCKS4 proxyval való használathoz." -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../src/interface/filter.cpp:245 ../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "A szűrőkészlet mentése nem sikerült" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "A kijelölt szűrő nem választható ki" -#: ../../locales/../src/interface/edithandler.cpp:1473 -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../src/interface/edithandler.cpp:1524 ../src/interface/edithandler.cpp:1528 +#: ../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "A fájl társítás nem állítható be" -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "A párbeszédpanel megjelenítése nem lehetséges" -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "A kijelölt fájl megnyitása / szerkesztése nem sikerült" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Kis és nagybetű nem különbözik" + +#: ../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Kis és nagybetű nem különbözik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Kis és nagybetűk nem különböznek (alapértelmezett)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Kis és nagybetűk különböznek" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Kis és nagybetű különbözik (alapértelmezett)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Törlendő adatok" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../src/interface/statusbar.cpp:514 msgid "Certificate and session data are not available yet." msgstr "A tanúsítvány és az adatkapcsolat adatai még nem érhetőek el." -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 +#: ../src/interface/resources/xrc/certificate.xrc:29 msgid "Certificate in chain:" msgstr "Tanúsítvány a láncban:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 +#: ../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "Tanúsítvány kiállítója" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Tanúsítvány aláírás ellenőrzése nem sikerült" + +#: ../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Kérdés:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Attribútumok módosítása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../src/interface/resources/xrc/menus.xrc:341 +#: ../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." -msgstr "Fájl engedélyek módosítása" +msgstr "Fájl engedélyek módosítása." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "A naplófájl beállítások módosításához a FileZilla újraindítása szükséges." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Karakter kódolási probléma" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Karakterkészlet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Frissítések keresése..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "FileZilla frissítések automatikus keresése:" -#: ../../locales/../src/interface/resources/xrc/update.xrc:4 +#: ../src/interface/resources/xrc/update.xrc:4 msgid "Check for Updates" msgstr "Frissítések keresése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "A FileZilla újabb verzióinak keresése" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Nem sikerült a frissítések keresése" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2036,7 +2128,7 @@ "Ellenőrizze a bejelentkezési adatokat. A megadott jelszó szóközzel kezdődik " "vagy végződik." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2044,459 +2136,509 @@ "Ellenőrizze a bejelentkezési adatokat. A megadott felhasználónév szóközzel " "kezdődik vagy végződik." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "A helyes külső IP cím ellenőrzése" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Frissítések keresése..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../src/interface/updater.cpp:770 #, c-format msgid "Checksum match on file %s\n" msgstr "Ellenőrző összeg egyezik a következő fájlon: %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../src/interface/updater.cpp:766 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Ellenőrző összeg nem egyezik a következő fájlon: %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../src/interface/sitemanager_dialog.cpp:1611 msgid "Choose a key file" msgstr "Válassza ki a hitelesítő kulcsot" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../src/interface/sitemanager_dialog.cpp:1646 msgid "Choose the default local directory" msgstr "Válassza ki az alapértelmezett helyi mappát" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2242 +#: ../src/interface/bookmarks_dialog.cpp:134 +#: ../src/interface/bookmarks_dialog.cpp:386 +#: ../src/interface/sitemanager_dialog.cpp:2502 msgid "Choose the local directory" msgstr "Válassza ki a helyi mappát" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../src/engine/http/request.cpp:462 msgid "Chunk data improperly terminated" msgstr "Az adatfolyam helytelenül záródott be" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 +#: ../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "Blokk kódolás:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../src/interface/resources/xrc/menus.xrc:21 +#: ../src/interface/resources/xrc/menus.xrc:641 msgid "Cl&ose tab" msgstr "Lap bezárása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Klasszikus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Elrendezés gyorsítótár törlése" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Automatikus frissítési adatok törlése" + +#: ../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Előzmények törlése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../src/interface/clearprivatedata.cpp:35 +#: ../src/interface/clearprivatedata.cpp:41 +#: ../src/interface/clearprivatedata.cpp:47 +#: ../src/interface/clearprivatedata.cpp:74 +#: ../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Személyes adatok törlése" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Beírt címadatok törlése" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Kattintson a Befejezés gombra a beállítások mentéséhez." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Üzenethitelesítés kódolása a klienstől a szerver felé:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Blokk kódolás a klienstől a szerver felé:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Bezárás" + +#: ../src/interface/resources/xrc/menus.xrc:644 msgid "Close &all other tabs" msgstr "Mind bezárása ennek a kivételével" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1125 -#: ../../locales/../src/interface/Mainfrm.cpp:1146 +#: ../src/interface/resources/xrc/menus.xrc:40 +#: ../src/interface/Mainfrm.cpp:1230 ../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "A FileZilla bezárása" -#: ../../locales/../src/interface/cmdline.cpp:15 +#: ../src/interface/cmdline.cpp:15 msgid "Close all running instances of FileZilla" msgstr "A FileZilla minden példányának bezárása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 +#: ../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "" +"Szeretné bezárni a gyorskeresést és folytatni a könyvtár összehasonlítást?" + +#: ../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Aktuális lap bezárása" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Megjegyzések:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Oszlopok tulajdonsága" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Oszlopok beállítása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Az idézőjelek közötti elérési utat követik az argumentumok." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:244 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:257 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:271 +#: ../src/interface/fzputtygen_interface.cpp:210 +#: ../src/interface/fzputtygen_interface.cpp:232 +#: ../src/interface/storj_key_interface.cpp:95 +#: ../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Parancs nem futtatható" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Nem támogatott parancs" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" -msgstr "Ezt a parancsot ez a protokoll nem támogatja." +msgstr "Ezt a parancsot ez a protokoll nem támogatja" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:280 -#: ../../locales/../src/interface/StatusView.cpp:336 +#: ../src/engine/logging.cpp:114 ../src/interface/StatusView.cpp:286 +#: ../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "Parancs:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Megjegyzés" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../src/interface/verifycertdialog.cpp:247 msgid "Common name:" msgstr "Rövid név:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../src/interface/netconfwizard.cpp:449 +#: ../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Az adatkapcsolatot a router vagy tűzfal sérültté teszi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../src/interface/resources/xrc/menus.xrc:86 +#: ../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Összehasonlítás a módosítás ideje alapján" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../src/interface/resources/xrc/menus.xrc:82 +#: ../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Összehasonlítás a fájlméret alapján" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Időkülönbségi küszöb a könyvtár összehasonlításhoz (percben):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "" "Az időkülönbségi küszöb értékének 0 és 1440 perc közöttinek kell lennie." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Célplatform:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Fordító platform:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Fordító:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Kapcsolók:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Tömörített" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Egyidejű kapcsolatok" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 +#: ../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Kis- és nagybetűk megkülönböztetése a szabályok alkalmazásakor" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 +#: ../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" msgstr "Beállítások tesztje" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:115 +#: ../src/interface/resources/xrc/netconfwizard.xrc:115 msgid "Configure passive mode" msgstr "Passzív mód beállítása" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 +#: ../src/interface/resources/xrc/netconfwizard.xrc:261 msgid "Configure port range" msgstr "Port tartomány beállítása" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Hálózati beállítások a FileZilla-hoz" -#: ../../locales/../src/interface/search.cpp:768 +#: ../src/interface/search.cpp:1243 msgid "Confirm deletion" msgstr "Megerősítés szükséges" -#: ../../locales/../src/engine/local_filesys.cpp:129 -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1664 -#: ../../locales/../src/interface/RemoteListView.cpp:1394 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 -#: ../../locales/../src/interface/search.cpp:724 +#: ../src/interface/edithandler.cpp:1638 ../src/interface/file_utils.h:45 +#: ../src/interface/RemoteListView.cpp:1429 +#: ../src/interface/LocalListView.cpp:1797 ../src/interface/search.cpp:1196 +#: ../src/interface/RemoteTreeView.cpp:1085 msgid "Confirmation needed" msgstr "Megerősítés szükséges" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Gratulálunk, úgy tűnik a hálózati beállítás megfelelően működik." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Csatlakozás a proxybeállítások kihagyásával" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Csatlakozás nem sikerült: %s" + +#: ../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Csatlakozás a jelenlegi lapon" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Csatlakozás új lapon" -#: ../../locales/../src/interface/cmdline.cpp:8 +#: ../src/interface/cmdline.cpp:8 msgid "Connect to specified Site Manager site" msgstr "Csatlakozás megadott kedvenc állomáshoz" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "A csatlakozás sikerült" - -#: ../../locales/../src/interface/queue.cpp:382 +#: ../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Csatlakozás" -#: ../../locales/../src/interface/netconfwizard.cpp:222 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../src/interface/statuslinectrl.cpp:256 +#: ../src/interface/netconfwizard.cpp:214 #, c-format msgid "Connecting to %s" msgstr "Csatlakozás a következő kiszolgálóhoz: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1047 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243 +#: ../src/engine/ftp/logon.cpp:96 ../src/engine/ControlSocket.cpp:1058 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Csatlakozás a következőhöz: %s, %s proxy-n keresztül" -#: ../../locales/../src/engine/ControlSocket.cpp:955 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:371 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../src/engine/storj/storjcontrolsocket.cpp:42 ../src/engine/proxy.cpp:240 +#: ../src/engine/ControlSocket.cpp:990 #, c-format msgid "Connecting to %s..." msgstr "Csatlakozás a következő kiszolgálóhoz: %s..." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 +#: ../src/interface/settings/settingsdialog.cpp:92 msgid "Connection" msgstr "Kapcsolat" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Csatlakozás megszakítva" -#: ../../locales/../src/interface/queue.cpp:383 +#: ../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "A csatlakozási kísérlet nem sikerült" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../src/engine/proxy.cpp:212 ../src/engine/ControlSocket.cpp:952 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "A csatlakozási kísérlet nem sikerült: \"%s\", a következő cím használata." -#: ../../locales/../src/engine/ControlSocket.cpp:924 +#: ../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "A csatlakozási kísérlet nem sikerült: \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:183 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../src/engine/ControlSocket.cpp:175 ../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "A csatlakozási kísérletet a felhasználó megszakította" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Időtúllépés a csatlakozáskor" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../src/interface/netconfwizard.cpp:562 msgid "Connection closed" -msgstr "A kapcsolat bezáródott." +msgstr "A kapcsolat bezáródott" -#: ../../locales/../src/engine/ControlSocket.cpp:1014 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../src/engine/http/request.cpp:184 ../src/engine/http/request.cpp:195 +#: ../src/engine/http/request.cpp:208 ../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../src/engine/ControlSocket.cpp:1036 msgid "Connection closed by server" -msgstr "A kiszolgáló bezárta a kapcsolatot." +msgstr "A kiszolgáló bezárta a kapcsolatot" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../src/engine/http/httpcontrolsocket.cpp:113 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:185 msgid "Connection established, initializing TLS..." msgstr "Az adatkapcsolat létrejött, a TLS inicializálása..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../src/engine/http/httpcontrolsocket.cpp:136 msgid "Connection established, sending HTTP request" msgstr "Az adatkapcsolat létrejött, HTTP kérés küldése" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Az adatkapcsolat létrejött, várakozás az üdvözlő üzenetre." + +#: ../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Az adatkapcsolat létrejött, várakozás az üdvözlő üzenetre..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "A kapcsolat elveszett" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "A szabályrendszer nem teszi lehetővé a kapcsolatot" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Visszautasított kapcsolat" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Szerver által visszautasított kapcsolat" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Kapcsolat megszakadt a hálózat miatt" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "A másik fél bezárta a kapcsolatot" -#: ../../locales/../src/engine/ControlSocket.cpp:557 +#: ../src/engine/ControlSocket.cpp:511 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "%d másodperc után időtúllépés a kapcsolatban" msgstr[1] "%d másodperc után időtúllépés a kapcsolatban" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Időtúllépés a kapcsolatban." -#: ../../locales/../src/interface/search.cpp:383 +#: ../src/interface/search.cpp:708 msgid "Connection to server lost." msgstr "Megszakadt a kapcsolat a kiszolgálóval." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "A kapcsolat a proxy-val létrejött, kapcsolategyeztetés folyamatban..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "A kapcsolat a kiszolgálóval a vártnál korábban bezáródott." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "A teszt szerverrel történő kapcsolatfelvétel nem sikerült." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Kulcsfájl konvertálása" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 +#: ../src/interface/bookmarks_dialog.cpp:676 +#: ../src/interface/sitemanager_dialog.cpp:2062 #, c-format msgid "Copy (%d) of %s" msgstr "(%d) másolása: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1829 +#: ../src/interface/bookmarks_dialog.cpp:655 +#: ../src/interface/sitemanager_dialog.cpp:2041 #, c-format msgid "Copy of %s" msgstr "%s másolata" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../src/interface/resources/xrc/menus.xrc:337 +#: ../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Kijelölt elemek URL-jeinek másolása a vágólapra, a jelszavakkal együtt." + +#: ../src/interface/resources/xrc/menus.xrc:333 +#: ../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." -msgstr "A kijelölt elemek URL-jeinek másolása a vágólapra" +msgstr "Kijelölt elemek URL-jeinek másolása a vágólapra." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "A kapcsolat elfogadása nem sikerült: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "A következő elérési út nem hozzáférhető: %s" + +#: ../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Tanúsítvány nem adható hozzá az ideiglenes megbízható listához" + +#: ../src/interface/bookmarks_dialog.cpp:103 +#: ../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Nem sikerült a kapcsolat hozzáadása a Kedvenc Helyekhez" -#: ../../locales/../src/interface/state.cpp:755 +#: ../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Nem fejezhető be a művelet" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "A kiszolgálóhoz nem sikerült a csatlakozás" -#: ../../locales/../src/engine/ControlSocket.cpp:1084 +#: ../src/engine/ControlSocket.cpp:1091 #, c-format msgid "Could not connect to server: %s" msgstr "A kiszolgálóhoz nem sikerült a csatlakozás: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:786 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../src/engine/sftp/filetransfer.cpp:76 +#: ../src/engine/sftp/filetransfer.cpp:97 +#: ../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Nem sikerült a parancs konvertálása a szerver kódolásához" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:153 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:162 +#: ../src/interface/fzputtygen_interface.cpp:127 +#: ../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "A titkos kulcs konvertálása nem sikerült" -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../src/interface/RemoteListView.cpp:2579 ../src/interface/search.cpp:1372 +#: ../src/interface/RemoteTreeView.cpp:1427 msgid "Could not copy URLs" msgstr "Az URL-ek nem másolhatóak" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Nem másolható a tanúsítvány" + +#: ../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Az adat nem másolható" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Nem hozható létre CFURL a következő elérési útról: %s" + +#: ../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Nem hozható létre URI ehhez az átvitelhez." + +#: ../src/interface/updater.cpp:505 #, c-format msgid "Could not create local file %s\n" msgstr "Nem hozható létre a helyi fájl: %s\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Nem hozható létre a naplózási mutex: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2193 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Nem hozható létre titkosítási célú kedvenc ebből az URL-ből:" + +#: ../src/interface/RemoteListView.cpp:2224 +#: ../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2506,11 +2648,11 @@ "A keretprogramba való beépülés nincsen megfelelően telepítve, vagy a " "fájlokat nem egy Intéző ablakba húzta bele." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4092 +#: ../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Nem létesíthető kapcsolat a kiszolgálóhoz" -#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2521,11 +2663,16 @@ "A FileZilla adatkönyvtárát beállíthatja a '--datadir ' " "parancssori kapcsolóval, vagy az FZ_DATADIR környezeti változó beállításával." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Nem sikerült az egyéni bejelentkezési parancssorozat létrehozása." -#: ../../locales/../src/engine/tlssocket.cpp:930 +#: ../src/interface/settings/optionspage_interface.cpp:121 +#: ../src/interface/asksavepassworddialog.cpp:53 +msgid "Could not generate key" +msgstr "Nem sikerült a kulcs generálása" + +#: ../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2533,7 +2680,7 @@ "Nem kérdezhető le a tanúsítvány kibocsátójának megkülönböztetett neve, " "gnutls_x509_get_issuer_dn sikertelen" -#: ../../locales/../src/engine/tlssocket.cpp:907 +#: ../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2541,38 +2688,36 @@ "Nem kérdezhető le a tanúsítvány tárgyának megkülönböztetett neve, " "gnutls_x509_get_dn sikertelen" -#: ../../locales/../src/interface/state.cpp:900 +#: ../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Nem sikerült a teljes távoli elérési út meghatározása." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:257 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:271 +#: ../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Nem sikerült a natív elérési út meghatározása a CFURL-ből" + +#: ../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Nem sikerült az elérési út meghatározása az URL-ből" + +#: ../src/interface/fzputtygen_interface.cpp:232 +#: ../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Nem sikerült választ kapni az fzputtygen alkalmazástól." -#: ../../locales/../src/interface/edithandler.cpp:1575 -#: ../../locales/../src/interface/search.cpp:712 +#: ../src/interface/edithandler.cpp:1626 ../src/interface/search.cpp:1184 msgid "Could not get temporary directory to download file into." msgstr "" "Nem sikerült az ideiglenes mappa lekérdezése vagy létrehozása a fájl " "letöltéséhez." -#: ../../locales/../src/engine/tlssocket.cpp:853 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"A másik fél tanúsítványai nem kérdezhetők le, gnutls_x509_crt_import " -"sikertelen" - -#: ../../locales/../src/engine/tlssocket.cpp:848 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"A másik fél tanúsítványainak hitelesítési lánca nem inicializálható, " -"gnutls_x509_crt_init sikertelen" +#: ../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Nem sikerült a Winsock (%d) inicializálása: %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../src/interface/import.cpp:117 ../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2583,15 +2728,21 @@ "érvényes és hozzáférhető.\n" "A Kedvenc Helyek módosításai nem lesznek menthetőek." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:53 +#: ../src/interface/fzputtygen_interface.cpp:38 +#: ../src/interface/fzputtygen_interface.cpp:65 +#: ../src/interface/fzputtygen_interface.cpp:71 +#: ../src/interface/fzputtygen_interface.cpp:78 +#: ../src/interface/fzputtygen_interface.cpp:144 +#: ../src/interface/fzputtygen_interface.cpp:149 +#: ../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Hitelesítő kulcs nem tölthető be" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "A titkos kulcs nem betölthető" -#: ../../locales/../src/interface/state.cpp:922 +#: ../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2601,7 +2752,7 @@ "A távoli mappának megfelelő helyi mappa nem található '%s'.\n" "Kikapcsolja a szinkronizált böngészést és a távoli mappaváltást folytatja?" -#: ../../locales/../src/interface/state.cpp:359 +#: ../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2611,7 +2762,7 @@ "A távoli mappának megfelelő helyi mappa nem található '%s'.\n" "A szinkronizált böngészés kikapcsolásra került." -#: ../../locales/../src/interface/state.cpp:265 +#: ../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2621,64 +2772,89 @@ "A helyi mappának megfelelő távoli mappa nem található '%s'.\n" "A szinkronizált böngészés kikapcsolásra került." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../src/interface/aboutdialog.cpp:220 +#: ../src/interface/RemoteListView.cpp:2579 ../src/interface/search.cpp:1372 +#: ../src/interface/RemoteTreeView.cpp:1427 msgid "Could not open clipboard" msgstr "A vágólap nem nyitható meg" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:177 -#: ../../locales/../src/engine/logging.cpp:208 +#: ../src/engine/logging.cpp:108 ../src/engine/logging.cpp:192 +#: ../src/engine/logging.cpp:236 ../src/engine/logging.cpp:274 +#: ../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "A naplófájl nem nyitható meg: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "A távoli mappa elérési útja nem elemezhető." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "A kiszolgáló címe nem elemezhető:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "A szoftvercsatornából történő olvasás nem sikerült." + +#: ../src/engine/http/request.cpp:173 ../src/engine/ftp/ftpcontrolsocket.cpp:64 #, c-format msgid "Could not read from socket: %s" msgstr "A szoftvercsatornából történő olvasás nem sikerült: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Az állomás bejegyzés nem olvasható." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2592 +#: ../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Nem érkezett válasz a kiszolgálótól." + +#: ../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Mappa hozzáférés nem állítható helyre" + +#: ../src/engine/ftp/filetransfer.cpp:173 #, c-format msgid "Could not seek to offset %s within file" msgstr "A fájlon belüli %s eltolás pozícionálása nem sikerült" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../src/engine/http/filetransfer.cpp:119 +#: ../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "Nem sikerült a fájl elejének pozícionálása" + +#: ../src/engine/http/filetransfer.cpp:98 ../src/engine/ftp/filetransfer.cpp:90 msgid "Could not seek to the end of the file" msgstr "A fájl végének pozícionálása nem sikerült" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:244 +#: ../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Nem sikerült a parancs küldése az fzputtygen alkalmazásnak." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2620 +#: ../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Nem sikerült a parancs küldése az fzstorj alkalmazásnak." + +#: ../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Nem sikerült a másik fél tanúsítványainak rendezése" + +#: ../src/engine/ftp/filetransfer.cpp:201 msgid "Could not spawn IO thread" msgstr "Az IO szál elágaztatása nem sikerült" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 +#: ../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "A kapcsolategyeztetés a proxy-val nem indítható: %s" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Az átvitel nem indítható el" -#: ../../locales/../src/interface/sitemanager.cpp:608 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../src/interface/sitemanager.cpp:633 +#: ../src/interface/sitemanager_dialog.cpp:869 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2687,20 +2863,20 @@ "A következő nem írható: \"%s\", a Kedvenc Helyek módosításai nem menthetőek: " "%s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "" "A következő nem írható: \"%s\", a mappakedvenc hozzáadása nem sikerült: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "A következő nem írható: \"%s\", a globális mappakedvenc mentése nem " "sikerült: %s" -#: ../../locales/../src/interface/QueueView.cpp:1858 +#: ../src/interface/QueueView.cpp:1580 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2709,112 +2885,119 @@ "A következő nem írható: \"%s\", a várólista adatai nem menthetőek.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:718 -#: ../../locales/../src/interface/sitemanager.cpp:772 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../src/interface/sitemanager.cpp:758 ../src/interface/sitemanager.cpp:815 +#: ../src/interface/sitemanager_dialog.cpp:2480 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "A következő nem írható: \"%s\", a kijelölt állomások nem exportálhatóak: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../src/interface/xmlfunctions.cpp:150 #, c-format msgid "Could not write \"%s\":" msgstr "A következő nem írható: \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:162 +#: ../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "A kulcsfájl írása nem sikerült: %s" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Nem sikerült a helyi fájl írása" -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/engine/logging.cpp:280 +#: ../src/engine/logging.cpp:249 ../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "A naplófájl írása nem sikerült: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:880 -#: ../../locales/../src/engine/ControlSocket.cpp:983 +#: ../src/engine/http/request.cpp:120 ../src/engine/ControlSocket.cpp:913 +#: ../src/engine/ControlSocket.cpp:1008 #, c-format msgid "Could not write to socket: %s" msgstr "A szoftvercsatornába történő írás nem sikerült: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../src/interface/verifycertdialog.cpp:252 msgid "Country:" msgstr "Ország:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "Új fájl létrehozása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../src/interface/state.cpp:1107 +msgid "Create &missing local directory and enter it" +msgstr "Hiányzó helyi mappa létrehozása és mappába belépés" + +#: ../src/interface/state.cpp:1029 +msgid "Create &missing remote directory and enter it" +msgstr "Hiányzó távoli mappa létrehozása és mappába belépés" + +#: ../src/interface/resources/xrc/menus.xrc:269 +#: ../src/interface/resources/xrc/menus.xrc:309 +#: ../src/interface/resources/xrc/menus.xrc:512 +#: ../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Új könyvtár létrehozása a jelenlegi mappában" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../src/interface/resources/xrc/menus.xrc:273 +#: ../src/interface/resources/xrc/menus.xrc:313 +#: ../src/interface/resources/xrc/menus.xrc:516 +#: ../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Új könyvtár létrehozása a jelenlegi mappában és belépés a mappába" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Új, üres fájl létrehozása a jelenlegi könyvtárban" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../src/interface/resources/xrc/menus.xrc:272 +#: ../src/interface/resources/xrc/menus.xrc:312 +#: ../src/interface/resources/xrc/menus.xrc:515 +#: ../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "Könyvtár létrehozása és belépés" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../src/interface/LocalTreeView.cpp:1181 +#: ../src/interface/RemoteListView.cpp:1327 +#: ../src/interface/LocalListView.cpp:954 +#: ../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Könyvtár létrehozása" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../src/interface/RemoteListView.cpp:2668 msgid "Create empty file" msgstr "Üres fájl létrehozása" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Mappa létrehozása" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3167 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1926 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Mappa létrehozása: '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Kritikus hiba" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Kritikus hiba:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Kritikus fájl átviteli hiba" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kritikus fájl átviteli hiba %s átvitele után (%s-ból)" -#: ../../locales/../src/interface/state.cpp:350 +#: ../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2824,135 +3007,145 @@ "van.\n" "A szinkronizált böngészés kikapcsolásra került." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Az átvitel típusa jelenleg ASCII-ra van állítva." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Az átvitel típusa jelenleg automatikusra van állítva." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Az átvitel típusa jelenleg binárisra van állítva." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Görbe:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +# Direkt hibás +#: ../src/interface/resources/xrc/settings.xrc:479 +#: ../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Egyéni:" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Egyéni szűrőkészlet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Egyéni kiszolgáló" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Világoskék" + +#: ../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Átvitel típusa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Decimális előtagok SI mértékegységekkel (pl. 1 KB = 1000 byte)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "Alapértelmezett" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../src/interface/resources/xrc/menus.xrc:324 +#: ../src/interface/resources/xrc/menus.xrc:520 +#: ../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "Törlés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../src/interface/resources/xrc/dialogs.xrc:2946 +msgid "D&irectory comparison" +msgstr "Könyvtárak összehasonlítása" + +#: ../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Mind tiltása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "Ne mentse a jelszavakat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Dupla kattintás könyvtárakra:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "Megkettőzés" -#: ../../locales/../src/engine/server.cpp:34 +#: ../src/engine/server.cpp:53 msgid "DOS-like with virtual paths" msgstr "DOS-szerű virtuális elérés" -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Veszélyes fájltípus" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Adat" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../src/interface/netconfwizard.cpp:996 +#: ../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Az adatcsatorna a vártnál korábban záródott be." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Dátum" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Dátum formátuma" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 +#: ../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" msgstr "Dátum/idő formátum" -#: ../../locales/../src/interface/fileexistsdlg.cpp:49 +#: ../src/interface/fileexistsdlg.cpp:49 msgid "Date/time unknown" msgstr "Dátum/idő ismeretlen" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +#: ../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" msgstr "Hibakeresés" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Hibakeresés beállítások" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Alapértelmezett helyi mappa:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../src/engine/server.cpp:45 msgid "Default (Autodetect)" msgstr "Alapértelmezett (Automatikus)" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 +#: ../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." msgstr "Az alapértelmezett szerkesztő nincs megfelelően idézőjelezve." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Fájl felülírás beállítása" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Alapértelmezett távoli mappa:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../src/interface/sitemanager_dialog.cpp:1145 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2960,31 +3153,31 @@ "A távoli mappa elérési útja nem elemezhető. Ellenőrizze, hogy érvényes " "elérési utat adott meg, és azt a megadott állomástípus támogatja." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Alapértelmezett rendszernyelv" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 +#: ../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" msgstr "Alapértelmezett átviteli mód:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Átvitel alapértelmezett típusa:" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../src/interface/resources/xrc/netconfwizard.xrc:233 +#: ../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Alapértelmezett: http://ip.filezilla-project.org/ip.php" -#: ../../locales/../src/interface/settings/optionspage_connection.cpp:41 +#: ../src/interface/settings/optionspage_connection.cpp:41 msgid "" "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "" "A sikertelen bejelentkezési kísérletek közötti késleltetésnek 1 és 999 " "másodperc közöttinek kell lennie." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2999,126 +3192,128 @@ "Csatlakozás késleltetése %d másodpercig az előző sikertelen csatlakozási " "kísérlet miatt..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../src/interface/sitemanager_dialog.cpp:1297 msgid "Delete Site Manager entry" msgstr "Kedvenc állomás törlése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../src/interface/resources/xrc/menus.xrc:521 +#: ../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Kijelölt mappa törlése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../src/interface/resources/xrc/menus.xrc:281 +#: ../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Kijelölt mappák és fájlok törlése" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Törlés: \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "%u fájl törlése innen \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Könyvtárak eltávolítása" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" -"Több könyvtár törlése jelenleg még nem támogatott, ha nem összefüggő " -"mappákról van szó" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Szimbolikus link törlése" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Asztal" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../src/interface/resources/xrc/certificate.xrc:42 +#: ../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Részletek" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Az új kulcs részletei:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../src/interface/import.cpp:66 ../src/interface/sitemanager_dialog.cpp:793 msgid "Detected newer version of FileZilla" msgstr "Újabb FileZilla verzió" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "Mappákra" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Irány" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Mappák:" + +#: ../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Könyvtár" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2776 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:463 -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Mappahozzáférési jogosultságok" + +#: ../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../src/interface/resources/xrc/menus.xrc:541 +#: ../src/interface/resources/xrc/settings.xrc:1850 +#: ../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../src/interface/toolbar.cpp:51 ../src/interface/view.cpp:109 +#: ../src/interface/filelistctrl.cpp:477 ../src/interface/Mainfrm.cpp:2306 +#: ../src/interface/Mainfrm.cpp:2323 msgid "Directory comparison" msgstr "Könyvtárak összehasonlítása" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "A könyvtárak nem összehasonlíthatóak" -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:71 +#: ../src/interface/settings/optionspage_logging.cpp:71 msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "" "A naplófájlt tartalmazó mappa nem létezik, vagy a megadott fájlnév nem " "érvényes." -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "Könyvtár listázás szűrése..." + +#: ../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "A könyvtár listázást a felhasználó megszakította" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../src/interface/RemoteListView.cpp:2056 msgid "Directory listing failed" msgstr "A könyvtár listázás nem sikerült" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Könyvtár listázás szűrése" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +# Direkt hibás +#: ../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Könyvtár listázás sikerült: \"%s\"" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "A könyvtár listázás sikerült" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Mind tiltása" -#: ../../locales/../src/interface/state.cpp:929 +#: ../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Kikapcsolja a szinkronizált böngészést és a távoli mappaváltást folytatja?" -#: ../../locales/../src/interface/Mainfrm.cpp:640 +#: ../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3126,135 +3321,124 @@ "Kapcsolja ki ezt a beállítást, amennyiben nem látja a mappa tartalmát " "megfelelően." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Kapcsolat bontása" -#: ../../locales/../src/engine/ControlSocket.cpp:79 -#: ../../locales/../src/engine/ControlSocket.cpp:881 -#: ../../locales/../src/engine/ControlSocket.cpp:985 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:879 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:881 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../src/engine/http/request.cpp:121 ../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../src/engine/ControlSocket.cpp:52 ../src/engine/ControlSocket.cpp:914 +#: ../src/engine/ControlSocket.cpp:1010 ../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Kapcsolat bontódott a kiszolgálóval" -#: ../../locales/../src/engine/ControlSocket.cpp:1016 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 +#: ../src/engine/http/httpcontrolsocket.cpp:189 +#: ../src/engine/ControlSocket.cpp:1039 #, c-format msgid "Disconnected from server: %s" msgstr "Kapcsolat bontódott a kiszolgálóval: %s" -#: ../../locales/../src/interface/queue.cpp:380 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../src/interface/statuslinectrl.cpp:250 ../src/interface/queue.cpp:351 msgid "Disconnecting from previous server" msgstr "Kapcsolat bontása az előző kiszolgálóról" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Kapcsolat bontása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "A FileZilla névjegye" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "Ne használjon alapértelmezett szerkesztőt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Nincs művelet" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Alkalmazza ezt a többi szerkesztés alatt lévő fájlokra is" -#: ../../locales/../src/interface/Mainfrm.cpp:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../src/interface/Mainfrm.cpp:1233 ../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Biztosan bezárja a FileZilla-t?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Biztos benne, hogy törölni szeretné az összes kedvenc állomás bejegyzést és " "az átviteli várólista tartalmát?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "" "Biztos benne, hogy törölni szeretné az összes kedvenc állomás bejegyzést?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../src/interface/sitemanager_dialog.cpp:1299 msgid "Do you really want to delete selected entry?" msgstr "Biztos benne, hogy törölni szeretné a kijelölt elemet?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Biztos benne, hogy törölni szeretné átviteli várólista tartalmát?" -#: ../../locales/../src/interface/Mainfrm.cpp:579 +#: ../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Biztosan el szeretné küldeni a(z) '%s' parancsot a kiszolgálónak?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Szeretné újra megnyitni ezt a fájlt?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Dokumentáció" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:250 +#: ../src/interface/resources/xrc/netconfwizard.xrc:250 msgid "Don't use external IP address on &local connections." msgstr "Ne használja a külső IP címet helyi kapcsolatok esetén." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" -msgstr "A dot fájlok nevei ponttal kezdődnek, pl: .htaccess." +msgstr "A dot fájlok nevei ponttal kezdődnek, pl: .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Dupla kattintás művelete" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Letöltés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3556 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Letöltés korlátozása:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../src/interface/statusbar.cpp:597 #, c-format msgid "Download limit: %s/s" msgstr "Letöltési korlátozása: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../src/interface/statusbar.cpp:600 msgid "Download limit: none" msgstr "Letöltés korlátozása: nincs" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3103 -#: ../../locales/../src/interface/search.cpp:518 -#: ../../locales/../src/interface/search.cpp:523 +#: ../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../src/interface/search.cpp:904 ../src/interface/search.cpp:909 msgid "Download search results" msgstr "Keresési találatok letöltése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Kijelölt mappa letöltése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Kijelölt mappák és fájlok letöltése" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3263,32 +3447,23 @@ "Letöltési sebesség: %s/s\n" "Feltöltési sebesség: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1100 +#: ../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Letöltés" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../src/engine/http/httpcontrolsocket.cpp:148 #, c-format msgid "Downloading %s" msgstr "A következő letöltése: %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Több különálló mappa letöltése jelenleg még nem támogatott" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Keresési találatok letöltése" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Frissítés letöltése..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:109 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../src/interface/LocalTreeView.cpp:121 ../src/interface/QueueView.cpp:88 +#: ../src/interface/RemoteListView.cpp:112 +#: ../src/interface/LocalListView.cpp:114 +#: ../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3296,188 +3471,200 @@ "Az áthúzás művelet a FileZilla különböző példányai között még nincs " "megvalósítva." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:115 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../src/interface/LocalTreeView.cpp:126 ../src/interface/QueueView.cpp:102 +#: ../src/interface/RemoteListView.cpp:117 +#: ../src/interface/LocalListView.cpp:119 +#: ../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Az áthúzás művelet különböző kiszolgálók között még nincs megvalósítva." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 +#: ../src/interface/resources/xrc/sitemanager.xrc:65 msgid "Dupl&icate" msgstr "Megkettőzés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "Mind engedélyezése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../src/interface/resources/xrc/menus.xrc:254 +#: ../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "Belépés a mappába" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Végrehajtás" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 +#: ../src/interface/resources/xrc/menus.xrc:39 msgid "E&xit" msgstr "Kilépés" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../src/interface/resources/xrc/menus.xrc:426 +#: ../src/interface/resources/xrc/menus.xrc:472 +#: ../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." msgstr "Exportálás..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../src/interface/verifycertdialog.cpp:258 msgid "E-Mail:" msgstr "E-Mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Minden szűrőnek legalább egy szabállyal kell rendelkeznie." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Szűrő szabályok szerkesztése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "A fájl szerkesztése a beállított szerkesztővel és a módosítások feltöltése a " "szerverre." -#: ../../locales/../src/interface/search.cpp:700 +#: ../src/interface/search.cpp:1172 msgid "Editing directories is not supported" msgstr "Könyvtárak szerkesztése nem támogatott" -#: ../../locales/../src/interface/LocalListView.cpp:1582 -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../src/interface/LocalListView.cpp:1711 +#: ../src/interface/LocalListView.cpp:1720 msgid "Editing failed" msgstr "Sikertelen szerkesztés" -#: ../../locales/../src/interface/search.cpp:700 +#: ../src/interface/search.cpp:1172 msgid "Editing search results" msgstr "Keresési találatok szerkesztése" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../src/interface/QueueView.cpp:1873 msgid "Empty command" msgstr "Üres parancs" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 +#: ../src/interface/settings/optionspage_edit_associations.cpp:59 msgid "Empty command." msgstr "Nincs megadva parancs." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../src/interface/RemoteListView.cpp:2058 msgid "Empty directory listing" msgstr "Üres mappa" -#: ../../locales/../src/interface/filelist_statusbar.cpp:14 +#: ../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "Üres mappa." -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 +#: ../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Nincs megadva fájl kiterjesztés." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../src/interface/filteredit.cpp:207 ../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Üres szűrőnevek nem megengedettek." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../src/interface/filteredit.cpp:207 ../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Üres név" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 +#: ../src/interface/settings/optionspage_edit.cpp:84 msgid "Empty quoted string." msgstr "Üres idézőjeles karakterlánc." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Mind engedélyezése" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Érvénytelen karakterek szűrése" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Titkosított" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Titkosítás" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "Titkosítási kulcs:" + +#: ../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "Titkosító kulcs:" + +#: ../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Titkosítás részletei" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "" "Szeretné az összehasonlítást kikapcsolni és a rendezés sorrendjét módosítani?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Szeretné kikapcsolni az összehasonlítást és megnyitni a gyorskeresést?" + +#: ../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "Egyéni parancs beírása..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "A korlátozás feloldásához 0 értéket írjon." -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../src/interface/QueueView.cpp:1867 msgid "Enter command" msgstr "Parancs megadása" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Egyéni parancs beírása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Belépés a mappába" -#: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../src/interface/filteredit.cpp:136 ../src/interface/filteredit.cpp:195 +#: ../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Szűrőnév megadása" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../src/interface/resources/xrc/dialogs.xrc:397 +#: ../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Mesterjelszó megadása" + +#: ../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Szűrőkészlet név megadása" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Új szűrőkészlet név megadása" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Jelszó megadása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../src/interface/resources/xrc/menus.xrc:255 +#: ../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Belépés a kijelölt mappába" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3485,179 +3672,181 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Adja meg a kiszolgáló címét.\n" -"A szerver protokoll meghatározásához, a protokollazonosítót adja a cím " -"előtagjának. Ha a protokoll nincs meghatározva, az alapértelmezett az ftp:// " -"lesz.\n" -"Teljes URL címeket is megadhat a következő formátumban: protokoll://" -"felhasználónév:jelszó@cím:port. Ekkor a többi mező értékei felülíródnak.\n" +"Adja meg a kiszolgáló címét. A protokollt a cím előtagjaként meg lehet adni. " +"Ha a protokoll nincs meghatározva, az alapértelmezett (ftp://) lesz " +"használva. Teljes URL címeket is megadhat a következő formátumban:\n" +"protokoll://felhasználónév:jelszó@cím:port\n" +"Ekkor a többi mező értékei felülíródnak.\n" "\n" "Támogatott protokollok:\n" "- ftp:// normál FTP opcionális titkosítással\n" -"- sftp:// SSH file transfer protocol\n" +"- sftp:// SSH fájl átviteli protokoll\n" "- ftps:// FTP TLS felett (implicit)\n" "- ftpes:// FTP TLS felett (explicit)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:114 +#: ../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" "Adja meg a jelszót ehhez a kulcsfájlhoz: '%s'.\n" -"Vegye figyelembe, hogy az átkonvertált kulcsfájl nem lesz jelszó által " -"védett." +"Az átkonvertált kulcsfájlt ugyanez a jelszó fogja védeni." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Adja meg a kiszolgáló portját.\n" -"FTP esetében az alapértelmezett a 21-es, SFTP esetében a 22-es port." +"Adja meg a kiszolgáló portját. Az alapértelmezett FTP esetén a 21-es, SFTP " +"esetében a 22-es port." -#: ../../locales/../src/interface/loginmanager.cpp:66 +#: ../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Jelszó megadása" + +#: ../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Felhasználónév és jelszó megadása" -#: ../../locales/../src/interface/export.cpp:26 +#: ../src/interface/settings/optionspage_interface.cpp:121 +#: ../src/interface/asksavepassworddialog.cpp:53 +msgid "Error" +msgstr "Hiba" + +#: ../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Exportálási hiba" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../src/interface/import.cpp:29 ../src/interface/import.cpp:107 msgid "Error importing" msgstr "Importálási hiba" -#: ../../locales/../src/interface/QueueView.cpp:1920 +#: ../src/interface/QueueView.cpp:1657 msgid "Error loading queue" msgstr "Hiba a várólista sor betöltésekor" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:213 -#: ../../locales/../src/interface/filter.cpp:970 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1841 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:434 -#: ../../locales/../src/interface/sitemanager.cpp:515 -#: ../../locales/../src/interface/sitemanager.cpp:565 -#: ../../locales/../src/interface/sitemanager.cpp:664 -#: ../../locales/../src/interface/sitemanager.cpp:741 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:938 +#: ../src/interface/import.cpp:118 ../src/interface/import.cpp:309 +#: ../src/interface/sitemanager.cpp:91 ../src/interface/sitemanager.cpp:525 +#: ../src/interface/sitemanager.cpp:585 ../src/interface/sitemanager.cpp:694 +#: ../src/interface/sitemanager.cpp:782 ../src/interface/sitemanager.cpp:884 +#: ../src/interface/bookmarks_dialog.cpp:174 +#: ../src/interface/bookmarks_dialog.cpp:296 +#: ../src/interface/bookmarks_dialog.cpp:748 +#: ../src/interface/bookmarks_dialog.cpp:788 +#: ../src/interface/bookmarks_dialog.cpp:841 +#: ../src/interface/QueueView.cpp:1561 ../src/interface/wrapengine.cpp:935 +#: ../src/interface/filter.cpp:913 ../src/interface/filter.cpp:1005 +#: ../src/interface/search.cpp:1304 ../src/interface/search.cpp:1323 +#: ../src/interface/Options.cpp:246 ../src/interface/sitemanager_dialog.cpp:786 +#: ../src/interface/sitemanager_dialog.cpp:849 +#: ../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../src/interface/osx_sandbox_userdirs.cpp:136 msgid "Error loading xml file" msgstr "Hiba az xml fájl betöltésekor" -#: ../../locales/../src/interface/QueueView.cpp:1830 +#: ../src/interface/QueueView.cpp:1550 msgid "Error saving queue" msgstr "Hiba a várólista sor mentésekor" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:197 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../src/interface/fzputtygen_interface.cpp:177 +#: ../src/interface/fzputtygen_interface.cpp:192 +#: ../src/interface/storj_key_interface.cpp:62 +#: ../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Hiba a program futtatásakor" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1859 -#: ../../locales/../src/interface/sitemanager.cpp:609 -#: ../../locales/../src/interface/sitemanager.cpp:719 -#: ../../locales/../src/interface/sitemanager.cpp:773 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2224 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../src/interface/sitemanager.cpp:634 ../src/interface/sitemanager.cpp:759 +#: ../src/interface/sitemanager.cpp:816 +#: ../src/interface/bookmarks_dialog.cpp:332 +#: ../src/interface/bookmarks_dialog.cpp:883 +#: ../src/interface/QueueView.cpp:1581 ../src/interface/xmlfunctions.cpp:151 +#: ../src/interface/sitemanager_dialog.cpp:870 +#: ../src/interface/sitemanager_dialog.cpp:2481 msgid "Error writing xml file" msgstr "Hiba az xml fájl írásakor" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:278 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../src/engine/logging.cpp:113 ../src/interface/StatusView.cpp:284 +#: ../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "Hiba:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Például: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Példák" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Végrehajtás" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "A program nem tartalmaz verzió információt, a frissítések keresése nem " "lehetséges." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Intéző-szerű" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Szűrők" + +#: ../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Átviteli várólista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Beállítások" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Exportálás beállításai" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Szűrő neve:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 +#: ../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../src/interface/sitemanager_dialog.cpp:516 msgid "FTP - File Transfer Protocol" msgstr "FTP - File Transfer Protocol" -#: ../../locales/../src/engine/server.cpp:15 +#: ../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - File Transfer Protocol opcionális titkosítással" -#: ../../locales/../src/engine/server.cpp:21 +#: ../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Nem biztonságos File Transfer Protocol" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Az FTP programmotor nem inicializálódott, nem lehetséges a csatlakozás" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "FTP Ébrentartás" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 +#: ../src/interface/resources/xrc/settings.xrc:446 +#: ../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP Proxy" -#: ../../locales/../src/interface/cmdline.cpp:21 +#: ../src/interface/cmdline.cpp:21 msgid "FTP URL" msgstr "FTP URL" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:44 +#: ../src/interface/resources/xrc/netconfwizard.xrc:44 msgid "" "FTP uses secondary connections for data transfers. These additional " "connections can be established in two ways." @@ -3665,148 +3854,160 @@ "Az FTP protokoll az adatok átvitelére másodlagos kapcsolati szálat használ. " "Ez a járulékos adatkapcsolat kétféle módon létesíthető." -#: ../../locales/../src/engine/server.cpp:20 +#: ../src/engine/server.cpp:25 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP explicit TLS felett" -#: ../../locales/../src/engine/server.cpp:19 +#: ../src/engine/server.cpp:24 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP implicit TLS felett" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1778 -#: ../../locales/../src/interface/LocalTreeView.cpp:846 -#: ../../locales/../src/interface/LocalTreeView.cpp:1099 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../src/interface/viewheader.cpp:499 ../src/interface/LocalTreeView.cpp:871 +#: ../src/interface/LocalTreeView.cpp:1154 +#: ../src/interface/LocalListView.cpp:545 +#: ../src/interface/LocalListView.cpp:618 +#: ../src/interface/LocalListView.cpp:941 +#: ../src/interface/LocalListView.cpp:1919 msgid "Failed to change directory" msgstr "Mappaváltás nem sikerült" -#: ../../locales/../src/interface/FileZilla.cpp:137 -#: ../../locales/../src/interface/FileZilla.cpp:152 -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../src/interface/FileZilla.cpp:150 ../src/interface/FileZilla.cpp:165 +#: ../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "A nyelv módosítása nem sikerült" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "A parancs átalakítása 8 bites karakterkészletesre nem sikerült" + +#: ../src/interface/sitemanager_dialog.cpp:2261 msgid "Failed to copy or move sites" msgstr "Nem sikerült az állomásokat másolni vagy mozgatni" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../src/interface/xmlfunctions.cpp:330 msgid "Failed to create backup copy of xml file" -msgstr "Az xml fájl biztonsági másolata nem hozható létre." +msgstr "Az xml fájl biztonsági másolata nem jött létre" -#: ../../locales/../src/interface/netconfwizard.cpp:802 -msgid "Failed to create listen socket, aborting" -msgstr "A figyelő szoftvercsatorna létrehozása nem sikerült, megszakítás" +#: ../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "" +"A figyelő szoftvercsatorna létrehozása nem sikerült a %d porton, megszakítás." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4071 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4075 +#: ../src/engine/ftp/rawtransfer.cpp:217 ../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "" "A figyelő szoftvercsatorna létrehozása nem sikerült az aktív módú átvitelhez" -#: ../../locales/../src/interface/LocalTreeView.cpp:625 +#: ../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Nem sikerült a kiszolgáló jelszó feloldása." + +#: ../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Nem sikerült a 'Dokumentumok' mappa elérési útjának lekérdezése" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Nem sikerült az asztal elérési útjának lekérdezése" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Nem sikerült a másik fél vezérlőkapcsolati címének lekérdezése, a kapcsolat " "bezárása." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Nem sikerült a másik fél adatkapcsolati címének lekérdezése, a kapcsolat " "bezárása." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Nem sikerült az FTP programmotor inicializálása" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../src/engine/http/httpcontrolsocket.cpp:120 ../src/engine/ftp/logon.cpp:257 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:193 msgid "Failed to initialize TLS." msgstr "A TLS inicializálása nem sikerült." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:146 +#: ../src/interface/FileZilla.cpp:97 +msgid "Failed to initialize networking" +msgstr "Nem sikerült a hálózat inicializálása" + +#: ../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "A panelek betöltése nem sikerült. Érvénytelen erőforrás fájlok?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "A titkos kulcs betöltése nem sikerült: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +# Direkt hibás +#: ../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" -msgstr "A következőt nem sikerült hozzáfűzésre / írásra megnyitni: \"%s\"" +msgstr "Nem sikerült hozzáfűzésre / írásra megnyitni: \"%s\"" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +# Direkt hibás +#: ../src/engine/ftp/filetransfer.cpp:138 #, c-format msgid "Failed to open \"%s\" for reading" -msgstr "A következőt nem sikerült olvasásra megnyitni: \"%s\"" +msgstr "Nem sikerült olvasásra megnyitni: \"%s\"" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +# Direkt hibás +#: ../src/engine/http/filetransfer.cpp:91 +#: ../src/engine/ftp/filetransfer.cpp:107 #, c-format msgid "Failed to open \"%s\" for writing" -msgstr "A következőt nem sikerült írásra megnyitni: \"%s\"" +msgstr "Nem sikerült írásra megnyitni: \"%s\"" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../src/engine/ControlSocket.cpp:345 msgid "Failed to parse returned path." msgstr "A kapott elérési út nem dolgozható fel." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Az adatok fogadása nem sikerült" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "A könyvtár lista lekérdezése nem sikerült" -#: ../../locales/../src/interface/netconfwizard.cpp:730 -msgid "Failed to retrieve external ip address, aborting" +#: ../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." msgstr "A külső IP cím lekérdezése nem sikerült, megszakítás." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3782 -msgid "Failed to retrieve external ip address, using local address" +#: ../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "A külső IP cím lekérdezése nem sikerült, a helyi IP cím használata" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3803 -msgid "Failed to retrieve local ip address." -msgstr "A helyi IP cím lekérdezése nem sikerült." - -#: ../../locales/../src/interface/netconfwizard.cpp:706 -msgid "Failed to retrieve local ip address. Aborting" +#: ../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." msgstr "A helyi IP cím lekérdezése nem sikerült, megszakítás." -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "A helyi IP cím lekérdezése nem sikerült." + +#: ../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "A külső IP cím lekérdezése sem sikerült." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Nem sikerült a parancs küldése." -#: ../../locales/../src/interface/FileZilla.cpp:152 +#: ../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "A(z) %s (%s) nyelv beállítása nem sikerült, az alapértelmezett rendszer " "nyelv használata" -#: ../../locales/../src/interface/FileZilla.cpp:130 +#: ../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3814,165 +4015,164 @@ "A(z) %s (%s) nyelv beállítása nem sikerült, az alapértelmezett rendszer " "nyelv (%s, %s) használata." -#: ../../locales/../src/interface/FileZilla.cpp:119 +#: ../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "A(z) %s (%s) nyelv beállítása nem sikerült, az alapértelmezett rendszer " "nyelv használata." -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "A(z) %s nyelv beállítása nem sikerült, az alapértelmezett rendszer nyelv " "használata" -#: ../../locales/../src/interface/FileZilla.cpp:126 +#: ../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "A(z) %s nyelv beállítása nem sikerült, az alapértelmezett rendszer nyelv " "(%s, %s) használata." -#: ../../locales/../src/interface/FileZilla.cpp:116 +#: ../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "A(z) %s nyelv beállítása nem sikerült, az alapértelmezett rendszer nyelv " "használata." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "A beállítások érvényesítése nem sikerült" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Nem sikerült a másik fél tanúsítványának ellenőrzése" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Nem sikerült az írás a következő fájlba: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../src/interface/xmlfunctions.cpp:373 msgid "Failed to write xml file" -msgstr "Az xml fájl írása nem sikerült." +msgstr "Az xml fájl írása nem sikerült" -#: ../../locales/../src/interface/queueview_failed.cpp:16 +#: ../src/interface/queueview_failed.cpp:16 msgid "Failed transfers" msgstr "Sikertelen átvitelek" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 +#: ../src/interface/resources/xrc/netconfwizard.xrc:159 msgid "Fall back to active mode" msgstr "Áttérés aktív módra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Fájlnév:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Fájlokra" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Fájl" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +#: ../src/interface/settings/settingsdialog.cpp:100 msgid "File Types" msgstr "Fájltípusok" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "A fájlleíró nem socket" -#: ../../locales/../src/interface/import.cpp:95 +#: ../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "A kiválasztott fájl nem tartalmaz semmilyen importálható adatot." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 +#: ../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "Fájl szerkesztés" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../src/interface/RemoteListView.cpp:1639 msgid "File exists" msgstr "A fájl már létezik" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 +#: ../src/interface/settings/settingsdialog.cpp:101 msgid "File exists action" msgstr "Fájl felülírás" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Módosított fájl" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 +#: ../src/interface/settings/settingsdialog.cpp:106 msgid "File lists" msgstr "Fájl listázás" -#: ../../locales/../src/interface/edithandler.cpp:1551 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 +#: ../src/engine/storj/resolve.cpp:113 ../src/engine/storj/resolve.cpp:184 +#: ../src/interface/settings/optionspage_edit.cpp:124 +#: ../src/interface/edithandler.cpp:1602 ../src/interface/FileZilla.cpp:640 +#: ../src/interface/FileZilla.cpp:730 msgid "File not found" msgstr "Fájl nem található" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../src/interface/toolbar.cpp:53 ../src/interface/search.cpp:723 +#: ../src/interface/search.cpp:728 msgid "File search" -msgstr "Távoli fájlok rekurzív keresése a kiszolgálón" +msgstr "Fájl keresés" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Az átvitelt a felhasználó megszakította" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" -msgstr "Az átvitelt a felhasználó megszakította %s átvitele után (%s-ból)." +msgstr "Az átvitelt a felhasználó megszakította %s átvitele után (%s-ból)" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Sikertelen fájl átvitel" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Sikertelen fájl átvitel %s átvitele után (%s-ból)" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Fájl átvitel kihagyva" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "A fájl átvitel sikerült" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Sikeres fájl átvitel, %s átvitt adat %s alatt" -#: ../../locales/../src/interface/Mainfrm.cpp:1127 +#: ../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "A fájl átvitelek folyamatban vannak." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "A fájlátvitel ASCII típusú lesz." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "A fájlátvitel bináris típusú lesz." -#: ../../locales/../src/interface/FileZilla.cpp:407 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../src/interface/quickconnectbar.cpp:99 ../src/interface/FileZilla.cpp:452 msgid "FileZilla Error" msgstr "FileZilla Hiba" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 +#: ../src/interface/resources/xrc/netconfwizard.xrc:353 msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." @@ -3980,165 +4180,165 @@ "A továbbiakban a kialakított beállításokat tesztelheti annak ellenőrzésére, " "hogy minden megfelelően működik-e." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3478 +#: ../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "A FileZilla már csatlakozott egy szerverhez." -#: ../../locales/../src/interface/Mainfrm.cpp:1457 +#: ../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "A FileZilla újraindítása szükséges a nyelv módosítás érvénybe léptetéséhez." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "FileZilla frissítések" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "Fájlpanel állapotsor" -#: ../../locales/../src/interface/edithandler.cpp:1085 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../src/interface/filter_conditions_dialog.cpp:101 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../src/interface/edithandler.cpp:1136 +#: ../src/interface/RemoteListView.cpp:395 +#: ../src/interface/LocalListView.cpp:287 ../src/interface/search.cpp:154 msgid "Filename" msgstr "Fájlnév" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Könyvtár listázás szűrése..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2971 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2168 +#: ../src/engine/ftp/delete.cpp:31 ../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "A fájlnév elérési útja nem építhető fel ezzel a könyvtárral: %s, és ezzel az " "fájlnévvel: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../src/interface/RemoteListView.cpp:1627 msgid "Filename invalid" msgstr "Érvénytelen fájlnév" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../src/interface/asyncrequestqueue.cpp:313 msgid "Filename unchanged" msgstr "A fájlnév változatlan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Fájlnév:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "A fájlnév nem tartalmazhatja a következő karaktereket: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "A fájlnév nem tartalmazhatja a következő karaktereket: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Jelenleg szerkesztett fájlok" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" +"A szűrő szabályokhoz illeszkedő fájlok a könyvtár listából el vannak " +"távolítva." + +#: ../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Fájl nem található" + +#: ../src/interface/filter_conditions_dialog.cpp:105 +#: ../src/interface/RemoteListView.cpp:396 +#: ../src/interface/LocalListView.cpp:288 ../src/interface/search.cpp:156 msgid "Filesize" msgstr "Fájlméret" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 +#: ../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "Fájlméret formátum" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../src/interface/RemoteListView.cpp:397 +#: ../src/interface/LocalListView.cpp:289 ../src/interface/search.cpp:157 msgid "Filetype" msgstr "Fájltípus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 +#: ../src/interface/resources/xrc/settings.xrc:2105 +#: ../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Fájltípus társítások" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "A szűrő vonatkozik:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Érvénytelen karakterek szűrése a fájlnevekben" -#: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../src/interface/filteredit.cpp:149 ../src/interface/filteredit.cpp:216 +#: ../src/interface/filteredit.cpp:255 ../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "A szűrőnév már létezik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" -msgstr "" -"Azon elemek kiszűrése, amelyek az alábbi szabályok mindegyikének megfelelnek" +msgstr "Az alábbi szabályok mindegyikének megfelelő elemek kiszűrése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" -msgstr "" -"Azon elemek kiszűrése, amelyek az alábbi szabályok bármelyikének megfelelnek" +msgstr "Az alábbi szabályok bármelyikének megfelelő elemek kiszűrése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" -msgstr "" -"Azon elemek kiszűrése, amelyek az alábbi szabályok egyikének sem felelnek meg" +msgstr "Az alábbi szabályok egyikének sem megfelelő elemek kiszűrése" + +#: ../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Az alábbi szabályok nem mindegyikének megfelelő elemek kiszűrése" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../src/interface/filter.cpp:261 ../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Többszörös szűrőkészlet név" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Könyvtár listázás szűrése" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../src/interface/filteredit.cpp:336 ../src/interface/filteredit.cpp:344 +#: ../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "A szűrő érvényesítése nem sikerült" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Fájlok keresése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Mappák keresése" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 +#: ../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" msgstr "Ujjlenyomat (SHA-1):" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 +#: ../src/interface/resources/xrc/certificate.xrc:89 msgid "Fingerprint (SHA-256):" msgstr "Ujjlenyomat (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Ujjlenyomat:" +#: ../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Ujjlenyomatok:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Hálózati beállítások varázsló" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4146,12 +4346,12 @@ "Futtassa a Hálózati beállítások varázslót, amennyiben részletes " "információkra kíváncsi az itt megjelenő hálózati beállításokkal kapcsolatban." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 +#: ../src/interface/resources/xrc/netconfwizard.xrc:313 msgid "For reliability you should specify a range of at least 10 ports." msgstr "" "A megbízhatóság érdekében, legalább 10 portos tartományt javasolt megadni." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../src/interface/Options.cpp:245 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4159,182 +4359,201 @@ "Erre a munkamenetre az alapértelmezett beállítások lesznek érvényben. A " "beállításokben végzett bármely módosítás nem mentődik el." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "UTF-8 kényszerítése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Rejtett fájlok megjelenítése" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Rejtett fájlok megjelenítésének kényszerítése" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Formátum specifikációk:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Formátum: A kiterjesztést követi idézőjelek között az elérési út, majd az " "argumentumok." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:646 +#: ../src/interface/updater.cpp:702 #, c-format msgid "Found new %s %s\n" msgstr "Új verzió található: %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Ez a funkció nem sikerült: %s" + +#: ../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "További dokumentáció" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 +#: ../src/interface/resources/xrc/sitemanager.xrc:86 msgid "General" msgstr "Általános" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Általános SOCKS szerver hiba" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 +#: ../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Generálás..." + +#: ../src/interface/resources/xrc/settings.xrc:707 +#: ../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Általános proxy" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 +#: ../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" msgstr "Külső IP cím lekérdezése az alábbi URL-ről:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Segítség" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../src/interface/filter.cpp:261 ../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" "A megadott szűrőkészlet név már létezik. Szeretné felülírni a szűrőkészletet?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Globális kedvenc mappák" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS hiba %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS hiba %d ebben: %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS hiba %d ebben: %s, %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS hiba %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Zöld" + +#: ../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Csoport engedélyek" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "Magas" -#: ../../locales/../src/engine/server.cpp:18 +#: ../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP TLS felett" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Ujjlenyomat típus:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Rejtett" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:870 -#: ../../locales/../src/interface/queue.cpp:957 +#: ../src/interface/resources/xrc/settings.xrc:964 +#: ../src/interface/queue.cpp:936 ../src/interface/queue.cpp:998 msgid "High" msgstr "Magas" -#: ../../locales/../src/interface/queue.cpp:872 -#: ../../locales/../src/interface/queue.cpp:959 +#: ../src/interface/queue.cpp:938 ../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Legmagasabb" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "" "A legmagasabb elérhető portnak 1024 és 65535 közötti számnak kell lennie." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Tartsa a shift billentyűt lenyomva a szűrők állapotának mindkét oldali " "változtatásához." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Honlap:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "A kiszolgáló nem elérhető" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Címkulcs ujjlenyomata:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Címkulcs eltérés" -#: ../../locales/../src/engine/server.cpp:157 +#: ../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "" "A cím '[' szögletes zárójellel kezdődik, de a zárójel másik fele nem " "található." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "A cím nem elérhető" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../src/interface/resources/xrc/certificate.xrc:180 +#: ../src/interface/resources/xrc/dialogs.xrc:284 +#: ../src/interface/resources/xrc/dialogs.xrc:420 +#: ../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Cím:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Címkulcs algoritmus:" + +#: ../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Óra," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Elfelejtettem a mester jelszavam. Minden jelszó törlése, mely ezzel a " +"kulccsal védett." + +#: ../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "ISO 8601 (példa: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 címek nem támogatottak SOCKS4 proxy esetén" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4343,13 +4562,13 @@ "Amennyiben egy műveletnél a megadottnál hosszabb idő alatt nem történik " "adatátvitel, a FileZilla bezárja a kapcsolatot, és megpróbál újracsatlakozni." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Amennyiben hibaleírást szeretne küldeni, a napló legalább \"Részletes\" " "szintű legyen." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 +#: ../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" "If the automatic test at the end of this wizard succeeds, but you cannot " "transfer files to a particular server, the server might be misconfigured and " @@ -4362,7 +4581,7 @@ "kipróbálása. Az átviteli módot szerverenként külön-külön lehet állítani a " "Kedvenc Helyek-ben." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 +#: ../src/interface/resources/xrc/netconfwizard.xrc:95 msgid "" "If the fallback option is enabled, you will be able to connect to " "misconfigured servers which reject the selected transfer mode." @@ -4371,7 +4590,7 @@ "rosszul beállított kiszolgálókhoz is, amelyek visszautasítják a kiválasztott " "átviteli módot." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4379,7 +4598,7 @@ "Ha a címkulcs módosítása nem számított, lépjen kapcsolatba a kiszolgáló " "rendszergazdájával." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4387,7 +4606,7 @@ "Amennyiben a probléma fennáll, valamely router vagy tűzfal továbbra is " "blokkolja a FileZilla-t." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4395,7 +4614,7 @@ "Amennyiben a probléma fennáll, valamely router vagy tűzfal továbbra is " "megszakítja a kapcsolatokat." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4405,7 +4624,7 @@ "\".1\" adódik hozzá (esetleg felülírva a régebbi naplófájlt), és egy új " "naplófájl jön létre." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3216 +#: ../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4413,7 +4632,7 @@ "Amennyiben egy szimbolikus link egy mappára mutat, a FileZilla törölheti " "magát a linket, vagy eltávolíthatja a hivatkozott könyvtár teljes tartalmát." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4421,12 +4640,12 @@ "Amennyiben a probléma folyamatosan fennáll, forduljon a router vagy a tűzfal " "gyártójához segítségért." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "Amennyiben a probléma megmarad, forduljon a router gyártójához." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4437,7 +4656,7 @@ "(pl. különböző időzónák), akkor adja meg a kiszolgáló időzónájának " "időeltolódását a Kedvenc Helyek speciális beállításánál." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4446,13 +4665,13 @@ "fájlt tekintse azonosnak, ha az időkülönbség nem haladja meg az alábbi " "értéket." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "" "A nyelv módosításakor, az érvénybe léptetéshez a FileZilla újraindítása " "szükséges." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 +#: ../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" "If you click on test, FileZilla will connect to probe.filezilla-project.org " "and will perform some simple tests." @@ -4460,22 +4679,22 @@ "Ha a Teszt gombra kattint, a FileZilla a 'probe.filezilla-project.org' címre " "csatlakozik, és néhány egyszerű tesztet hajt végre." -#: ../../locales/../src/interface/Mainfrm.cpp:1149 +#: ../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Ha bezárja a FileZilla-t, a módosítások el fognak veszni." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "Ha rossz fájltípust ad meg, azok az átvitel során meghibásodhatnak." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 +#: ../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." msgstr "" "Ha a teszt eredménye hibával végződik, akkor a beállítások nem megfelelőek." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4483,7 +4702,7 @@ "Ha a könyvtári fájllistázással vagy a fájlok átvitelével problémákat " "tapasztal, akkor módosítsa az alapértelmezett átviteli módot." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4494,7 +4713,7 @@ "az esetben próbálja meg az átviteli mód (aktív/passzív) átkapcsolását, vagy " "forduljon a kiszolgáló rendszergazdájához segítségért." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 +#: ../src/interface/resources/xrc/netconfwizard.xrc:24 msgid "" "If you successfully complete the wizard and the final test succeeds, any " "firewalls and routers you have should be configured properly." @@ -4502,7 +4721,7 @@ "Ha a varázsló lépéseit sikeresen elvégzi és a végső teszt sikeres, akkor a " "tűzfalak és router-ek is megfelelően vannak beállítva." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 +#: ../src/interface/resources/xrc/netconfwizard.xrc:323 msgid "" "If you use a firewall, make sure FileZilla is allowed to accept connection " "on all given ports." @@ -4510,7 +4729,7 @@ "Amennyiben tűzfalat használ, ügyeljen arra, hogy a FileZilla bejövő " "kapcsolatokat tudjon fogadni a megadott tartomány minden portján." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 +#: ../src/interface/resources/xrc/netconfwizard.xrc:318 msgid "" "If you use a router, make sure all these ports are forwarded to the machine " "you're running FileZilla on." @@ -4519,7 +4738,7 @@ "portja továbbítva legyen ahhoz a számítógéphez, amelyen a FileZilla-t " "használja." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4527,25 +4746,24 @@ "Amennyiben a router továbbra is módosítja az IP címet, forduljon a router " "gyártójához." -#: ../../locales/../src/interface/import.cpp:87 +#: ../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importálás régebbi verzióból" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Importálás beállításai" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../src/interface/import.cpp:81 ../src/interface/import.cpp:88 msgid "Import successful" msgstr "Sikeres importálás" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 +#: ../src/interface/settings/optionspage_edit_associations.cpp:49 +#: ../src/interface/settings/optionspage_edit_associations.cpp:56 msgid "Improperly quoted association." msgstr "A társítás nincs megfelelően idézőjelezve." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 +#: ../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" "In active mode, FileZilla has to listen on a port for data transfers. You " "have to specify which ports FileZilla will use." @@ -4554,7 +4772,7 @@ "e adatkapcsolat létesítése. Meg kell adnia, hogy a FileZilla mely portokat " "használhatja." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 +#: ../src/interface/resources/xrc/netconfwizard.xrc:276 msgid "" "In case you have a router, you will have to forward all available ports, as " "FileZilla has no influence on the ports your system chooses." @@ -4563,8 +4781,8 @@ "továbbítania kell, mivel a FileZilla nincs hatással arra, hogy az operációs " "rendszer milyen portot választ." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../src/interface/resources/xrc/netconfwizard.xrc:168 +#: ../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4572,7 +4790,7 @@ "Az aktív mód használatához, a külső IP cím ismerete szükséges a FileZilla " "számára." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:52 +#: ../src/interface/resources/xrc/netconfwizard.xrc:52 msgid "" "In passive mode, which is recommended for most users, FileZilla asks the " "server for a port and connects to the given port. Not much configuration has " @@ -4582,19 +4800,11 @@ "kiszolgálótól kér egy portot, és az adott porthoz csatlakozik. Ehhez nem " "szükséges bonyolult konfiguráció." -#: ../../locales/../src/engine/tlssocket.cpp:1036 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Hiányos hitelesítési lánc, a legfelső tanúsítvány nem önaláírt hatósági " -"tanúsítvány" - -#: ../../locales/../src/interface/queue.cpp:378 +#: ../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Helytelen jelszó" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4602,47 +4812,48 @@ "Nem kérhető le információ a FileZilla legújabb verziójáról. Kérem próbálja " "újra később." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "TLS inicializálása..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Nem biztonságos algoritmus!" + +#: ../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Nem biztonságos kiszolgáló, nem támogatja a TLS feletti FTP-t." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../src/engine/server.cpp:579 ../src/engine/server.cpp:603 +#: ../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interaktív" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 +#: ../src/interface/settings/settingsdialog.cpp:102 msgid "Interface" msgstr "Megjelenés" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Megszakítva egy signal által" -#: ../../locales/../src/engine/ControlSocket.cpp:218 -#: ../../locales/../src/interface/queue.cpp:384 +#: ../src/engine/ControlSocket.cpp:216 ../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Megszakítva a felhasználó által" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../src/engine/http/request.cpp:38 ../src/engine/http/request.cpp:387 msgid "Invalid Content-Length" msgstr "Érvénytelen tartalom hosszúság" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../src/engine/http/request.cpp:271 msgid "Invalid HTTP Response" msgstr "Érvénytelen HTTP válasz" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Érvénytelen argumentumok érkeztek" -#: ../../locales/../src/engine/ControlSocket.cpp:453 -#: ../../locales/../src/engine/ControlSocket.cpp:509 +#: ../src/engine/ControlSocket.cpp:454 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4650,46 +4861,60 @@ "Érvénytelen karaktersorozat érkezett, UTF-8 tiltása. Válassza az UTF-8 " "kényszerítését a Kedvenc Helyek beállításaiban." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../src/engine/http/request.cpp:495 msgid "Invalid chunk size" msgstr "Érvénytelen adathalmaz méret" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../src/interface/netconfwizard.cpp:373 +#: ../src/interface/netconfwizard.cpp:382 +#: ../src/interface/netconfwizard.cpp:390 +#: ../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Érvénytelen adat érkezett" -#: ../../locales/../src/interface/verifycertdialog.cpp:40 -#: ../../locales/../src/interface/verifycertdialog.cpp:53 +#: ../src/interface/verifycertdialog.cpp:34 +#: ../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Érvénytelen dátum" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../src/interface/file_utils.cpp:290 ../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Érvénytelen fájlnév" -#: ../../locales/../src/engine/server.cpp:162 +#: ../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Érvénytelen cím, a zárójel záró része után már csak kettőspont és a port " "következhet." -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Érvénytelen cím: %s" + +#: ../src/interface/asksavepassworddialog.cpp:41 +#: ../src/interface/asksavepassworddialog.cpp:46 +#: ../src/interface/loginmanager.cpp:108 ../src/interface/loginmanager.cpp:113 +#: ../src/interface/loginmanager.cpp:207 ../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Érvénytelen bemenet" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../src/engine/http/request.cpp:328 +msgid "Invalid line" +msgstr "Érvénytelen sor" + +#: ../src/engine/storj/rmd.cpp:24 ../src/engine/storj/mkd.cpp:22 +#: ../src/engine/storj/list.cpp:21 +msgid "Invalid path" +msgstr "Érvénytelen elérési út" + +#: ../src/interface/serverdata.cpp:13 ../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Érvénytelen portot adott meg. A port értékének 1 és 65535 közöttinek kell " "lennie." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../src/interface/serverdata.cpp:40 ../src/interface/quickconnectbar.cpp:160 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4703,74 +4928,72 @@ "ftps:// az FTP TLS felett (implicit) használatához, és\n" "ftpes:// az FTP TLS felett (explicit) használatához." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4215 +#: ../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Érvénytelen proxy cím, a zárójel zárótagja után csak kettőspont és port " "következhet." -#: ../../locales/../src/interface/search.cpp:402 +#: ../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Érvénytelen reguláris kifejezés" + +#: ../src/interface/search.cpp:728 msgid "Invalid regular expression in search conditions." msgstr "Érvénytelen reguláris kifejezés a keresés feltételeiben." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../src/engine/http/request.cpp:280 msgid "Invalid response code" msgstr "Érvénytelen válaszkód" -#: ../../locales/../src/interface/search.cpp:397 +#: ../src/interface/search.cpp:723 #, c-format msgid "Invalid search conditions: %s" msgstr "Érvénytelen keresési feltételek: %s" -#: ../../locales/../src/interface/sitemanager.cpp:409 -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:466 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:752 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../src/interface/sitemanager.cpp:706 ../src/interface/sitemanager.cpp:712 +#: ../src/interface/sitemanager.cpp:794 ../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Érvénytelen állomás specifikáció" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" -msgstr "Érvénytelen méret a feltétel mezőben." +msgstr "Érvénytelen méret a feltétel mezőben" -#: ../../locales/../src/engine/server.cpp:132 +#: ../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "A megadott felhasználónév érvénytelen." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Érvénytelen ai_flags érték" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Érvénytelen érték a kitöltéshez" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Szűrők megfordítása" + +#: ../src/interface/verifycertdialog.cpp:260 msgid "Jurisdiction country:" msgstr "Illetékes ország:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../src/interface/verifycertdialog.cpp:262 msgid "Jurisdiction locality:" msgstr "Illetékes helyszín:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../src/interface/verifycertdialog.cpp:261 msgid "Jurisdiction state or province:" msgstr "Illetékes állam vagy megye:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Mappák mindig felül legyenek" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4782,144 +5005,161 @@ "kiszolgálón a funkció támogatásának ellenőrzésére, de a teszt esetleg " "sikertelen is lehet." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Titkosító kulcsok cseréje" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 +#: ../src/interface/resources/xrc/certificate.xrc:200 msgid "Key exchange:" msgstr "Kulcs csere:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../src/engine/server.cpp:576 ../src/engine/server.cpp:601 msgid "Key file" msgstr "Kulcsos" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../src/interface/resources/xrc/dialogs.xrc:444 +#: ../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Azonosító kulcs:" + +#: ../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Legalacsonyabb" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 +#: ../src/interface/resources/xrc/settings.xrc:1943 +#: ../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Nyelvek" -#: ../../locales/../src/interface/Mainfrm.cpp:1457 +#: ../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Nyelv módosítás" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../src/interface/RemoteListView.cpp:398 +#: ../src/interface/LocalListView.cpp:290 ../src/interface/search.cpp:158 msgid "Last modified" msgstr "Módosítás ideje" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Panelek elrendezése" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../src/interface/settings/optionspage_interface.cpp:67 +#: ../src/interface/sitemanager_dialog.cpp:1810 +msgid "Leave empty to keep existing password." +msgstr "Hagyja üresen a jelenlegi jelszó megtartásához." + +#: ../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Egyidejű letöltések maximális száma:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Egyidejű feltöltések maximális száma:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Helyi portok korlátozása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "A naplófájl méretének korlátozása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Korlát:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../src/engine/http/request.cpp:451 msgid "Line length exceeded" msgstr "Sorhosszúság túllépés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Csatolt komponensek" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../src/interface/netconfwizard.cpp:274 +#: ../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "A figyelő szoftvercsatorna bezáródott" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:360 +#: ../src/engine/logging.cpp:120 ../src/interface/StatusView.cpp:295 +#: ../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "Listázás:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Legalacsonyabb elérhető port:" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1369 +#: ../src/interface/edithandler.cpp:1184 ../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Helyi" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "A helyi cím már használatban van" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "A helyi végpont bezáródott" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Helyi fájlnév" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Nem létezik a helyi fájl." -#: ../../locales/../src/interface/updater.cpp:370 -#: ../../locales/../src/interface/updater.cpp:462 +#: ../src/interface/updater.cpp:416 ../src/interface/updater.cpp:509 #, c-format msgid "Local file is %s\n" msgstr "A helyi fájl: %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "" "A helyi fájl helyett egy könyvtár van megadva. Adja meg a helyi fájlnevet." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "A helyi fájlnév érvénytelen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../src/interface/search.cpp:686 ../src/interface/search.cpp:692 +msgid "Local file search" +msgstr "Helyi fájl keresés" + +#: ../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Helyi szűrők:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Helyi elérési utak kezelése:" + +#: ../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Helyi fájlok:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../src/interface/verifycertdialog.cpp:254 msgid "Locality:" msgstr "Helység:" -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:97 +#: ../src/interface/settings/optionspage_logging.cpp:97 msgid "Log file" msgstr "Naplófájl" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 +#: ../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Belépve" + +#: ../src/interface/resources/xrc/settings.xrc:2191 +#: ../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Naplózás" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4928,7 +5168,7 @@ "kiszolgáló esetleg nem támogatja az UTF-8-at. A proxy használata miatt a " "helyi karakterkészletre váltás nem alkalmazható." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4937,720 +5177,773 @@ "kiszolgáló esetleg nem támogatja az UTF-8-at. Helyi karakterkészlet " "használata." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" -"A bejelentkezési parancssorozat lefuttatódott, de a bejelentkezés nem " -"sikerült. Megszakítás." +"A bejelentkező parancsok befejeződtek, miközben belépés nem sikerült, " +"megszakítás." -#: ../../locales/../src/interface/cmdline.cpp:103 +#: ../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." msgstr "A bejelentkezés típusa csak 'Jelszó bekérése' vagy 'Interaktív' lehet." -#: ../../locales/../src/interface/cmdline.cpp:11 +# Direkt hibás +#: ../src/interface/cmdline.cpp:11 #, c-format msgid "" "Logontype, can only be used together with FTP URL. Argument has to be either " "'%s' or '%s'" msgstr "" -"A bejelentkezési típus csak FTP URL-rel használható együtt. Az argumentum " -"'%s' vagy '%s' lehet." +"A bejelentkezési típus csak FTP URL-rel használható. Az argumentum '%s' vagy " +"'%s' lehet" -#: ../../locales/../src/interface/queue.cpp:865 -#: ../../locales/../src/interface/queue.cpp:952 +#: ../src/interface/queue.cpp:931 ../src/interface/queue.cpp:993 msgid "Low" msgstr "Alacsony" -#: ../../locales/../src/interface/queue.cpp:863 -#: ../../locales/../src/interface/queue.cpp:950 +#: ../src/interface/queue.cpp:929 ../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Legalacsonyabb" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "" "A legalacsonyabb elérhető portnak 1024 és 65535 közötti számnak kell lennie." -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 +#: ../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "Üzenethitelesítés kódolása:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Rózsaszín" + +#: ../src/interface/xmlfunctions.cpp:39 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Ellenőrizze, hogy a fájl elérhető és megfelelő XML formátummal rendelkezik." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../src/engine/http/request.cpp:438 ../src/engine/http/request.cpp:451 +#: ../src/engine/http/request.cpp:462 ../src/engine/http/request.cpp:495 #, c-format msgid "Malformed chunk data: %s" msgstr "Rossz formátumú adatfolyam: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../src/engine/http/request.cpp:38 #, c-format -msgid "Malformed header: %s" -msgstr "Rossz formátumú fejléc: %s" +msgid "Malformed request header: %s" +msgstr "Rossz formátumú kérés fejléc: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 -msgid "Malformed reply, server not sending proper line endings" +#: ../src/engine/http/request.cpp:514 +#, c-format +msgid "Malformed response body: %s" +msgstr "Rossz formátumú válasz törzs: %s" + +#: ../src/engine/http/request.cpp:241 ../src/engine/http/request.cpp:247 +#: ../src/engine/http/request.cpp:328 ../src/engine/http/request.cpp:379 +#: ../src/engine/http/request.cpp:387 ../src/engine/http/request.cpp:444 +#, c-format +msgid "Malformed response header: %s" +msgstr "Rossz formátumú válasz fejléc: %s" + +#: ../src/engine/http/request.cpp:400 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." msgstr "" -"Rossz formátumú válasz, a kiszolgáló nem megfelelő sorvégződéseket küld." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +"Rossz formátumú válasz: A kiszolgáló válaszkódja nem engedélyezi a válasz " +"törzset a válaszban." + +#: ../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../src/interface/manual_transfer.cpp:288 +#: ../src/interface/manual_transfer.cpp:294 +#: ../src/interface/manual_transfer.cpp:300 +#: ../src/interface/manual_transfer.cpp:304 +#: ../src/interface/manual_transfer.cpp:311 +#: ../src/interface/manual_transfer.cpp:317 +#: ../src/interface/manual_transfer.cpp:323 +#: ../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Kézi átvitel" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../src/interface/resources/xrc/dialogs.xrc:455 +#: ../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Mesterjelszó:" + +#: ../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Mesterjelszó:" + +#: ../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Az alábbi szabályok mindegyikének megfelelő elemek" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Az alábbi szabályok bármelyikének megfelelő elemek" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Az alábbi szabályok egyikének sem megfelelő elemek" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Az alábbi szabályok nem mindegyikének megfelelő elemek" + +#: ../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Az egyidejű kapcsolati szálak maximális száma:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Memória foglalási hiba" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1784 +#: ../src/interface/Mainfrm.cpp:435 ../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Üzenet napló" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Üzenet napló helyzete" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Túl nagy üzenet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Perc" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Mozgatás le" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Mozgatás fel" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Sajátgép" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Dokumentumok" -#: ../../locales/../src/interface/sitemanager.cpp:269 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../src/interface/sitemanager.cpp:342 +#: ../src/interface/sitemanager_dialog.cpp:772 +#: ../src/interface/sitemanager_dialog.cpp:775 msgid "My Sites" msgstr "Kedvenc állomásaim" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../src/interface/settings/optionspage_themes.cpp:197 +#: ../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/a" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Név" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../src/interface/bookmarks_dialog.cpp:732 +#: ../src/interface/sitemanager_dialog.cpp:1264 msgid "Name already exists" -msgstr "A megadott név már létezik." +msgstr "A megadott név már létezik" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 +#: ../src/interface/sitemanager.cpp:725 +#: ../src/interface/bookmarks_dialog.cpp:853 msgid "Name of bookmark already exists." msgstr "" "Egy kedvenc könyvtár már létezik ezen a néven. Kérem adjon meg egy új nevet." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../src/interface/resources/xrc/dialogs.xrc:276 +#: ../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Név:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Natív sorrend" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Szűrőnév megadása szükséges" -#: ../../locales/../src/interface/search.cpp:388 +#: ../src/interface/search.cpp:686 +msgid "Need to enter valid local path" +msgstr "Adjon meg érvényes helyi elérési utat" + +#: ../src/interface/search.cpp:713 msgid "Need to enter valid remote path" msgstr "Érvényes távoli elérési utat adjon meg" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../src/interface/sitemanager_dialog.cpp:1049 msgid "Need to specify a character encoding" msgstr "Karakter kódolás megadása szükséges" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Nem érkezett nodename vagy servname, vagy ezek ismeretlenek" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "A rendszer nem rendelkezik olyan hálózati címmel, mely a kért típusú" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../src/engine/proxy.cpp:498 ../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "A hálózat nem elérhető" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Soha" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 +#: ../src/interface/resources/xrc/sitemanager.xrc:41 msgid "New &Folder" msgstr "Új mappa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" msgstr "Új lap" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2818 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 +#: ../src/interface/resources/xrc/dialogs.xrc:3067 +#: ../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Új mappakedvenc" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2180 +#: ../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../src/interface/sitemanager.cpp:725 +#: ../src/interface/bookmarks_dialog.cpp:60 +#: ../src/interface/bookmarks_dialog.cpp:73 +#: ../src/interface/bookmarks_dialog.cpp:79 +#: ../src/interface/bookmarks_dialog.cpp:85 +#: ../src/interface/bookmarks_dialog.cpp:97 +#: ../src/interface/bookmarks_dialog.cpp:103 +#: ../src/interface/bookmarks_dialog.cpp:111 +#: ../src/interface/bookmarks_dialog.cpp:466 +#: ../src/interface/bookmarks_dialog.cpp:567 +#: ../src/interface/bookmarks_dialog.cpp:573 +#: ../src/interface/bookmarks_dialog.cpp:579 +#: ../src/interface/bookmarks_dialog.cpp:600 +#: ../src/interface/bookmarks_dialog.cpp:853 +#: ../src/interface/sitemanager_dialog.cpp:2419 msgid "New bookmark" msgstr "Új kedvenc mappa" -#: ../../locales/../src/interface/LocalTreeView.cpp:1126 -#: ../../locales/../src/interface/RemoteListView.cpp:1310 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 +#: ../src/interface/LocalTreeView.cpp:1185 +#: ../src/interface/RemoteListView.cpp:1340 +#: ../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Új mappa" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "%s verzió újdonságai és javításai" -#: ../../locales/../src/interface/filteredit.cpp:131 +#: ../src/interface/filteredit.cpp:131 msgid "New filter" msgstr "Új szűrő" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../src/interface/sitemanager_dialog.cpp:953 msgid "New folder" msgstr "Új mappa" -#: ../../locales/../src/interface/sitemanager.cpp:583 -#: ../../locales/../src/interface/sitemanager.cpp:595 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../src/interface/sitemanager.cpp:605 ../src/interface/sitemanager.cpp:619 +#: ../src/interface/sitemanager_dialog.cpp:2392 msgid "New site" msgstr "Új állomás" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" -msgstr "A várólista mellett" +msgstr "Várólista mellett" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:389 msgid "No" msgstr "Nem" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "A nodename-hez nincs cím társítva" -#: ../../locales/../src/interface/export.cpp:26 +#: ../src/interface/export.cpp:30 msgid "No category to export selected" -msgstr "Nem jelölt ki egyetlen kategóriát sem az exportálásra." +msgstr "Nem jelölt ki kategóriát az exportálásra" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../src/interface/QueueView.cpp:1873 msgid "No command given, aborting." msgstr "Nem adott meg parancsot. Megszakítás." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3754 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Nincs külső IP cím beállítva, az alapértelmezett használata." -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Jelenleg nincsen egyetlen fájl sem szerkesztés alatt." -#: ../../locales/../src/interface/filteredit.cpp:143 +#: ../src/interface/filteredit.cpp:143 msgid "No filter name given" msgstr "Nem adott meg szűrőnevet" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../src/interface/serverdata.cpp:27 ../src/interface/serverdata.cpp:122 +#: ../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Kérem adja meg a címet." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Nincs elérhető kép" -#: ../../locales/../src/interface/QueueView.cpp:2980 -msgid "No more files in the queue!" -msgstr "A várólista végrehajtódott, nincs több átviendő fájl a várólistában!" - -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../src/interface/filter.cpp:245 ../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Nem adott meg nevet a szűrőkészlethez." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Programtársítás hiányzik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "A következő kiterjesztéshez nincsen társítva program: '%s'." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Útvonal nem található a címhez" -#: ../../locales/../src/interface/search.cpp:255 +#: ../src/interface/search.cpp:433 msgid "No search results" msgstr "Nincs keresési eredmény" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Nincsenek állomások" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Nem található támogatott SOCKS5 hitelesítési mód" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Nincs megadva felhasználónév." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:59 +#: ../src/interface/resources/xrc/settings.xrc:1905 +#: ../src/interface/resources/xrc/settings.xrc:1924 +#: ../src/interface/sitemanager.cpp:17 ../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Nincs" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Nincs még kiválasztva" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Nem helyreállítható hiba a névfeloldás során" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:868 -#: ../../locales/../src/interface/queue.cpp:955 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../src/interface/resources/xrc/settings.xrc:963 ../src/engine/server.cpp:570 +#: ../src/engine/server.cpp:597 ../src/interface/manual_transfer.cpp:148 +#: ../src/interface/manual_transfer.cpp:176 +#: ../src/interface/manual_transfer.cpp:535 ../src/interface/queue.cpp:934 +#: ../src/interface/queue.cpp:996 msgid "Normal" msgstr "Normál" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../src/interface/queueview_failed.cpp:310 +#: ../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "Nem sikerült minden elemet újra a várólistába tenni." -#: ../../locales/../src/interface/state.cpp:178 -#: ../../locales/../src/interface/state.cpp:480 +#: ../src/interface/state.cpp:211 ../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Nincs kapcsolat" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../src/interface/RemoteListView.cpp:2054 msgid "Not connected to any server" msgstr "Nincs kapcsolat kiszolgálóval" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Nincs kapcsolat kiszolgálóval." -#: ../../locales/../src/interface/filelist_statusbar.cpp:15 +#: ../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Nincs kapcsolat." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Nem inicializálódott, WSAStartup meghívása szükséges" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Fontos, hogy ez a beállítás csak az FTP protokoll használatakor támogatott." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Megjegyzés: Az elveszett kulcs nem állítható vissza." + +#: ../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" "Megjegyzés: Ez csak normál, titkosítatlan FTP kapcsolatok esetén működik." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Megjegyzés: Az általános proxy használata az FTP kapcsolatok esetén maga " "után vonja a passzív módot." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../src/engine/http/request.cpp:247 ../src/engine/http/request.cpp:444 +msgid "Null character in line" +msgstr "Null karakter a sorban" + +#: ../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Tizedesjegyek száma:" -#: ../../locales/../src/interface/settings/optionspage_connection.cpp:35 +#: ../src/interface/settings/optionspage_connection.cpp:35 msgid "Number of retries has to be between 0 and 99." msgstr "" "Az újrapróbálkozások maximális számának 0 és 99 közöttinek kell lennie." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "Fájl megnyitása" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2710 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2968 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3249 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3445 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3614 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3670 -#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../src/interface/resources/xrc/certificate.xrc:263 +#: ../src/interface/resources/xrc/dialogs.xrc:233 +#: ../src/interface/resources/xrc/dialogs.xrc:559 +#: ../src/interface/resources/xrc/dialogs.xrc:751 +#: ../src/interface/resources/xrc/dialogs.xrc:994 +#: ../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../src/interface/resources/xrc/dialogs.xrc:3552 +#: ../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../src/interface/resources/xrc/dialogs.xrc:4226 +#: ../src/interface/resources/xrc/inputdialog.xrc:34 +#: ../src/interface/resources/xrc/settings.xrc:28 +#: ../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "OS verziója:" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 +#: ../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " "well as the fallback mode if enabled." msgstr "" "A következő lépésekben, az egyes átviteli módok beállításai következnek." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "Once" msgstr "Csak most" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Naponta egyszer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Hetente egyszer" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../src/interface/sitemanager_dialog.cpp:544 msgid "Only use plain FTP (insecure)" msgstr "Sima FTP használata (nem biztonságos)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Fájl megnyitása" + +#: ../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Mappa megnyitása a rendszer fájlkezelőjében" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../src/interface/toolbar.cpp:31 ../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "A Kedvenc Helyek megnyitása" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." -msgstr "Kedvenc Helyek megnyitása" +msgstr "Kedvenc Helyek megnyitása." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Kedvenc Helyek megnyitása. Jobb kattintás az állomások listájához." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Mappahozzáférési jogosultságok párbeszédablak megnyitása a helyi mappák " +"hozzáférési beállításaihoz." + +#: ../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." -msgstr "Kijelölt fájl megnyitása" +msgstr "Kijelölt fájl megnyitása." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 +#: ../src/interface/resources/xrc/menus.xrc:55 msgid "Open the settings dialog of FileZilla" msgstr "A Beállítások ablak megnyitása" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Megnyitott mint:" -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1695 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../src/interface/edithandler.cpp:1668 ../src/interface/edithandler.cpp:1785 +#: ../src/interface/LocalListView.cpp:1830 +#: ../src/interface/LocalListView.cpp:1843 msgid "Opening failed" msgstr "A megnyitás nem sikerült" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 +#: ../src/interface/resources/xrc/menus.xrc:18 msgid "Opens a new tab" msgstr "Új lap nyitása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 +#: ../src/interface/resources/xrc/menus.xrc:9 msgid "Opens the Site Manager" msgstr "A Kedvenc Helyek megnyitása" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Könyvtár listázás szűrés szerkesztése. Jobb kattintás a szűrő be- és " "kikapcsolásához." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Operációs rendszer:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "A művelet már folyamatban van" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Folyamatban lévő művelet" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Nem támogatott művelet" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Beállítások" + +#: ../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Narancs" + +#: ../src/interface/verifycertdialog.cpp:248 msgid "Organization:" msgstr "Szervezet:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Egyéb SFTP beállítások" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Egyéb rendszer hiba" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../src/interface/verifycertdialog.cpp:270 msgid "Other:" msgstr "Más:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../src/engine/socket.cpp:1065 ../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Elfogyott a memória" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Áttekintés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Felülírás, ha a forrásfájl újabb" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../src/interface/resources/xrc/settings.xrc:1188 +#: ../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Felülírás" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../src/interface/resources/xrc/settings.xrc:1190 +#: ../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Felülírás, ha a méret különböző" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../src/interface/resources/xrc/settings.xrc:1191 +#: ../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Felülírás, ha a méret különböző vagy a forrás újabb" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../src/interface/resources/xrc/settings.xrc:1189 +#: ../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Felülírás, ha a forrás újabb" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Felülírás, ha a méret különbözik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Felülírás, ha a méret különbözik vagy a forrás újabb" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../src/interface/updater.cpp:253 #, c-format msgid "Own build type: %s\n" msgstr "Meglévő változat típusa: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Tulajdonos engedélyei" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../src/interface/RemoteListView.cpp:400 ../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "Tulajdonos / Csoport" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "A rendszer készenléti módjának megakadályozása a fájlátvitelek alatt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../src/interface/resources/xrc/settings.xrc:556 +#: ../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Proxy címe:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." -msgstr "A PORT parancsot a router vagy tűzfal sérültté teszi" +msgstr "A PORT parancsot a router vagy tűzfal sérültté teszi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Passzív (ajánlott)" -#: ../../locales/../src/interface/Mainfrm.cpp:2356 +#: ../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "A megadott paraméter nem érvényes URL" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../src/interface/updater.cpp:589 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "%d byte verzió információ feldolgozása.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Jelszó:" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 +#: ../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" msgstr "Passzív (ajánlott)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 +#: ../src/interface/resources/xrc/settings.xrc:410 +#: ../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Passzív mód" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../src/interface/netconfwizard.cpp:610 +#: ../src/interface/netconfwizard.cpp:623 +#: ../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "A passzív mód állítódott be alapértelmezett átviteli módként." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:117 +#: ../src/engine/storj/connect.cpp:82 ../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Nincs beállítva jelszó vagy titkosító kulcs" + +#: ../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Jelszó szükséges" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Jelszavak" + +#: ../src/interface/filter_conditions_dialog.cpp:117 +#: ../src/interface/search.cpp:155 msgid "Path" msgstr "Elérési út" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3054 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2214 +#: ../src/engine/ftp/rmd.cpp:40 ../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "" "Az elérési út nem építhető fel ezzel a könyvtárral: %s, és ezzel az " "almappával: %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2314 +#: ../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Elérési út nem található:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Elérési utak" -#: ../../locales/../src/interface/edithandler.cpp:1112 -#: ../../locales/../src/interface/edithandler.cpp:1249 -#: ../../locales/../src/interface/edithandler.cpp:1339 -#: ../../locales/../src/interface/edithandler.cpp:1349 +#: ../src/interface/edithandler.cpp:1163 ../src/interface/edithandler.cpp:1300 +#: ../src/interface/edithandler.cpp:1390 ../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Eltávolítás függőben" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Engedély" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../src/engine/socket.cpp:1058 ../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Nincs megfelelő jogosultság" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../src/interface/RemoteListView.cpp:399 ../src/interface/search.cpp:159 msgid "Permissions" msgstr "Engedélyek" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Platform:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Adja meg a helyi mappákat a FileZilla használatához." + +#: ../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5658,7 +5951,15 @@ "Kérem ellenőrizze a https://filezilla-project.org/probe.php webcímen, hogy a " "kiszolgáló fut-e, és figyelmesen ellenőrizze a beállításokat." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 +#: ../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Ellenőrizze a megadott jogosultságot és a hiányzó helyi mappákat újra adja " +"hozzá a következő párbeszédablakban." + +#: ../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." @@ -5666,13 +5967,13 @@ "Ha van tűzfal vagy router a hálózatban, állítsa be azokat úgy, hogy a " "FileZilla kimenő kapcsolatot létesíthessen tetszőleges portra." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Tiltsa le a router-en az olyan beállításokat, mint a 'DMZ mode' vagy 'Game " "mode'." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5680,58 +5981,58 @@ "Győződjön meg róla, hogy az internetkapcsolata stabil, és figyelmesen " "ellenőrizze a beállításokat." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 +#: ../src/interface/settings/optionspage_dateformatting.cpp:72 msgid "Please enter a custom date format." msgstr "Adja meg az egyéni dátum formátumot." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 +#: ../src/interface/settings/optionspage_dateformatting.cpp:82 msgid "Please enter a custom time format." msgstr "Adja meg az egyéni idő formátumot." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Kérem a dátumot a YYYY-MM-DD formában adja meg, például 2010-07-18." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../src/interface/speedlimits_dialog.cpp:64 +#: ../src/interface/settings/optionspage_transfer.cpp:123 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" "A letöltés sebességének korlátozásához 0 %s/s-nál nagyobb vagy azzal egyenlő " "értéket írjon be." -#: ../../locales/../src/interface/filteredit.cpp:136 +#: ../src/interface/filteredit.cpp:136 msgid "Please enter a name for the new filter." -msgstr "Kérem adjon meg egy nevet az új szűrőhöz:" +msgstr "Adjon meg egy nevet az új szűrőhöz." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." -msgstr "Kérem adjon meg egy új nevet a másolt szűrőhöz:" +msgstr "Adjon meg új nevet a másolt szűrőhöz." -#: ../../locales/../src/interface/filter.cpp:389 +#: ../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Kérem adjon meg egy új nevet ehhez a szűrőkészlethez: \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." -msgstr "Kérem adjon meg egy új nevet a szűrőhöz:" +msgstr "Adjon meg új nevet a szűrőhöz." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 +#: ../src/interface/settings/optionspage_transfer.cpp:112 msgid "" "Please enter a number between 0 and 10 for the number of concurrent " "downloads." msgstr "" "Az egyidejű letöltések maximális számához 0 és 10 közötti számot írjon be." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 +#: ../src/interface/settings/optionspage_transfer.cpp:117 msgid "" "Please enter a number between 0 and 10 for the number of concurrent uploads." msgstr "" "Az egyidejű feltöltések maximális számához 0 és 10 közötti számot írjon be." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 +#: ../src/interface/settings/optionspage_transfer.cpp:107 msgid "" "Please enter a number between 1 and 10 for the number of concurrent " "transfers." @@ -5739,54 +6040,43 @@ "Az egyidejű kapcsolati szálak maximális számához 1 és 10 közötti számot " "írjon be." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Kérem adja meg a jelszót ehhez a kiszolgálóhoz:" -#: ../../locales/../src/interface/QueueView.cpp:2120 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Kérem adja meg a futtatni kívánt program elérési útját.\n" -"MS Windows alatt pl. c:\\somePath\\file.exe, vagy Unix alatt /somePath/" -"file.\n" -"Opcionálisan parancssoros argumentumokat is megadhat." - -#: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 +#: ../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" "Az időtúllépéshez 10 és 9999 másodperc közötti értéket írjon be. 0 értéket " "adjon meg az időtúllépés tiltásához." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" -msgstr "Kérem adjon meg egy egyedi nevet ehhez a szűrőkészlethez:" +msgstr "Egyedi nevet adjon meg ehhez a szűrőkészlethez" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Kérem adja meg a felhasználónevet ehhez a kiszolgálóhoz:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Kérem adjon meg egy érvényes port tartományt." -#: ../../locales/../src/interface/netconfwizard.cpp:176 +#: ../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "" -"Kérem adjon meg egy olyan URL címet, ahonnan a külső IP cím lekérdezhető." +"Kérem adjon meg egy olyan URL címet, ahonnan a külső IP cím lekérdezhető" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../src/interface/speedlimits_dialog.cpp:72 +#: ../src/interface/settings/optionspage_transfer.cpp:130 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "A feltöltés sebességének korlátozásához 0 %s/s-nál nagyobb vagy azzal " "egyenlő értéket írjon be." -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5795,27 +6085,47 @@ "Nyers FTP parancsok használatakor a távoli könyvtár gyorsítótára törlésre " "kerül." -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../src/interface/QueueView.cpp:1867 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Kérem adja meg egy program elérési útját és annak argumentumait. A parancs a " +"várólista feldolgozása után fog lefutni.\n" +"MS Windows alatt pl. c:\\somePath\\file.exe, vagy Unix alatt /somePath/" +"file.\n" +"Az elérési utat és az argumentumokat idézőjelek közé kell tenni, ha szóközt " +"is tartalmaznak." + +#: ../src/interface/LocalTreeView.cpp:1181 +#: ../src/interface/RemoteListView.cpp:1327 +#: ../src/interface/LocalListView.cpp:954 +#: ../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Kérem adja meg a létrehozni kívánt új könyvtár nevét:" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../src/interface/RemoteListView.cpp:2668 msgid "Please enter the name of the file which should be created:" msgstr "Kérem adja meg a fájl nevét, amelyet létre kíván hozni:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Kérem adja meg a felhasználónevet és jelszót ehhez a kiszolgálóhoz:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "Adja meg a jelenlegi mesterjelszót a jelszó beállítások módosításához." + +#: ../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" -msgstr "Kérem adja meg a külső IP címét." +msgstr "Kérem adja meg a külső IP címet" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../src/interface/netconfwizard.cpp:615 +#: ../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5825,7 +6135,12 @@ "Amennyiben dinamikus IP címmel rendelkezik, vagy nem tudja a külső IP címét, " "akkor használja a külső IP cím lekérdezése opciót." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 +#: ../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "Adja meg a mesterjelszót a kiszolgálóhoz tartozó jelszó feloldásához:" + +#: ../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." @@ -5833,7 +6148,7 @@ "Kérem, az útmutatókat kövesse figyelemmel, mert a rossz hálózati beállítás " "megakadályozhatja a sikeres FTP kapcsolatokat." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5842,11 +6157,11 @@ "FileZilla számára, és ellenőrizze, hogy a helyesen írta-e be a külső IP cím " "lekérdezéséhez szükséges webcímet." -#: ../../locales/../src/interface/FileZilla.cpp:136 +#: ../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "Győződjön meg róla, hogy a kért nyelv telepítve a rendszeren." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5858,7 +6173,7 @@ "alkalmaznia. A router-t ne használja a 'DMZ mode' vagy 'Game mode' nevű " "működési módban." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 +#: ../src/interface/resources/xrc/netconfwizard.xrc:131 msgid "" "Please note that FileZilla has no influence on the port the server chooses. " "So the server might choose a port which your firewall thinks is only used by " @@ -5870,7 +6185,7 @@ "a tűzfal azt gondolja, hogy valamely vírus vagy más káros szándékú program " "használja. Ez egy téves riasztást okozhat, amelyet nyugodtan elvethet." -#: ../../locales/../src/interface/Mainfrm.cpp:677 +#: ../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5879,7 +6194,7 @@ "FTP, FTPS és FTPES szervereken csak akkor lehetséges, ha azok támogatják az " "MFMT parancsot." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5887,7 +6202,7 @@ "Vegye figyelembe, hogy néhány kiszolgáló letilthatja a felhasználót, ha túl " "sokszor próbál csatlakozni, vagy túl rövid időközönként." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5897,42 +6212,50 @@ "környezetben változások történnek, vagy hirtelen problémákat tapasztal olyan " "állomásokkal, amelyek azelőtt megfelelően működtek." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Ezt a kulcsot biztonságos helyre mentse. A feltöltött fájlok a megfelelő " +"kulcs nélkül nem férhetőek hozzá." + +#: ../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Válasszon ki egy műveletet:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Kérem jelölje ki a beimportálandó kategóriákat." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 +#: ../src/interface/resources/xrc/netconfwizard.xrc:34 msgid "Please select the default transfer mode you would like to use." msgstr "Válassza ki a használni kívánt alapértelmezett átviteli módot." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." msgstr "Jelölje ki az új attribútomokat ehhez a mappához: \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:33 +#: ../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." msgstr "Jelölje ki az új attribútomokat ehhez a fájlhoz: \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:44 +#: ../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Adja meg az új attribútomokat a kijelölt mappákhoz." -#: ../../locales/../src/interface/chmoddialog.cpp:47 +#: ../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "Adja meg az új attribútomokat a kijelölt mappákhoz és fájlokhoz." -#: ../../locales/../src/interface/chmoddialog.cpp:36 +#: ../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Adja meg az új attribútomokat a kijelölt fájlokhoz." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5944,62 +6267,62 @@ "firmware-t használja. Továbbá, a router-t megfelelően be kell állítani. Kézi " "port továbbítást kell alkalmaznia. A router-t ne használja a gyakran 'DMZ " "mode' vagy 'Game mode' nevű működési módban. A protokoll vizsgálathoz vagy a " -"protokoll specifikus 'javítás'-hoz hasonló funkciókat le kell tiltani." +"protokoll specifikus 'javítás'-hoz hasonló funkciókat le kell tiltani" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Üzenet napló elhelyezkedése:" -#: ../../locales/../src/interface/verifycertdialog.cpp:223 -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../src/interface/verifycertdialog.cpp:255 +#: ../src/interface/verifycertdialog.cpp:256 msgid "Postal code:" msgstr "Irányítószám:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "Letöltés előtt a tárterület lefoglalása előre" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Tárterület foglalás" -#: ../../locales/../src/interface/sitemanager.cpp:268 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../src/interface/sitemanager.cpp:341 +#: ../src/interface/sitemanager_dialog.cpp:2120 msgid "Predefined Sites" msgstr "Előre definiált állomások" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Időbélyegek megtartása" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Előnézet:" +#: ../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Előnézet" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "" "Az elsődleges kapcsolati szál és az adatkapcsolati szál tanúsítványai nem " "egyeznek." -#: ../../locales/../src/interface/cmdline.cpp:19 +#: ../src/interface/cmdline.cpp:19 msgid "Print diagnostic information related to startup of FileZilla" msgstr "" "A FileZilla indításával kapcsolatos diagnosztikai információk megjelenítése" -#: ../../locales/../src/interface/cmdline.cpp:18 +#: ../src/interface/cmdline.cpp:18 msgid "Print version information to stdout and exit" msgstr "Verzió információ megjelenítése és kilépés" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Mappák előnyben részesítése (alapértelmezett)" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Prioritás" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6007,159 +6330,171 @@ "Adatvédelmi nyilatkozat: Csak a FileZilla verziója, az operációs rendszer és " "a CPU architektúra továbbítódik a szerverre." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Titkos kulcsok:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 +#: ../src/interface/resources/xrc/sitemanager.xrc:127 msgid "Pro&tocol:" msgstr "Protokoll:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../src/interface/resources/xrc/settings.xrc:579 +#: ../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Proxy jelszó:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../src/interface/resources/xrc/menus.xrc:133 +#: ../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Várólista végrehajtása" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Túlcsordulás a fájlleíró táblázatnál" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." -msgstr "%s fájl feldolgozva %s mappában." +msgstr "%s feldolgozva itt: %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Nem támogatott protokoll" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "A megadott socket típuson nem támogatott a protokoll" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 +#: ../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Protokoll:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Proxy port:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../src/interface/resources/xrc/settings.xrc:569 +#: ../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Proxy felhasználónév:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "A proxy hitelesítés nem sikerült" -#: ../../locales/../src/engine/transfersocket.cpp:103 -#: ../../locales/../src/engine/transfersocket.cpp:115 +#: ../src/engine/ftp/transfersocket.cpp:103 +#: ../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Nem sikerült a kapcsolategyeztetés a proxy-val: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4209 +#: ../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "A proxy címe '[' jellel kezdődik, de a zárójel másik fele nem található." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Proxy válasz: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../src/engine/proxy.cpp:520 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "A proxykérés nem sikerült. Válasz a proxytól: %s" + +#: ../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "A proxykérés nem sikerült: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "A proxykérés nem sikerült: Ismeretlen címtípus a CONNECT válaszban" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238 +#: ../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "A proxy beállítva, de a proxy címe vagy portja érvénytelen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Nyilvános kulcsú hitelesítés" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 +#: ../src/interface/resources/xrc/certificate.xrc:73 msgid "Public key algorithm:" msgstr "Nyilvános kulcsú algoritmus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Nyilvános engedélyek" -#: ../../locales/../src/interface/QueueView.cpp:3060 +#: ../src/interface/QueueView.cpp:2773 msgid "Queue has been fully processed" msgstr "A várólista végrehajtásra került" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Várólista: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Várólista: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../src/interface/statusbar.cpp:370 ../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Várólista: üres" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Várólista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Várólista kezelés:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "Rendszer újraindítása" +#: ../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Gyors keresés:" + +#: ../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "A gyors keresés nem nyitható meg könyvtár összehasonlítás közben." + +#: ../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "Rendszer újraindítása egyszer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "Távoli könyvtárfa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../src/interface/resources/xrc/menus.xrc:469 +#: ../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "Kijelöltek eltávolítása és újra várólistához adása" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Nyers FTP parancs" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Olvasás" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../src/interface/resources/xrc/menus.xrc:276 +#: ../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "Frissítés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Átnevezés" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6168,20 +6503,19 @@ "ellenőrizze a beállításokat és konfigurálja megfelelően a router-eket és a " "tűzfalakat." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Olvasás" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Írásvédett" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Biztosan megszakítja az aktuális műveletet?" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:761 +#: ../src/interface/RemoteListView.cpp:1421 ../src/interface/search.cpp:1235 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6191,76 +6525,81 @@ msgstr[1] "" "Biztosan törölni szeretne %d mappát a tartalmával együtt a szerverről?" -#: ../../locales/../src/interface/RemoteListView.cpp:1384 -#: ../../locales/../src/interface/search.cpp:759 +#: ../src/interface/RemoteListView.cpp:1418 ../src/interface/search.cpp:1232 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Biztosan törölni szeretne %d fájlt a szerverről?" msgstr[1] "Biztosan törölni szeretne %d fájlt a szerverről?" -#: ../../locales/../src/interface/RemoteListView.cpp:1391 -#: ../../locales/../src/interface/search.cpp:765 +#: ../src/interface/RemoteListView.cpp:1426 ../src/interface/search.cpp:1240 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Biztosan törölni szeretné a következőket a szerverről: %s és %s?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Biztosan törölni szeretné az összes kijelölt fájlt vagy mappát a szerverről?" -#: ../../locales/../src/engine/local_filesys.cpp:129 +#: ../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "Biztosan törölni szeretné az összes kijelölt fájlt vagy mappát a helyi gépen?" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../src/interface/queue.cpp:1214 msgid "Reason" msgstr "A hiba oka" -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../src/interface/QueueView.cpp:2766 msgid "Reboot now" msgstr "Újraindítás most" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +# Direkt hibás +#: ../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Rekurzív beállítás az almappákra is:" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "TLS riasztás érkezett a kiszolgálótól: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2969 +#: ../src/engine/directorylistingparser.cpp:3078 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "EBCDIC-ként kódolt könyvtár listázás érkezett." -#: ../../locales/../src/engine/directorylistingparser.cpp:1993 -#: ../../locales/../src/engine/directorylistingparser.cpp:2007 +#: ../src/engine/directorylistingparser.cpp:2060 +#: ../src/engine/directorylistingparser.cpp:2077 msgid "Received a line exceeding 10000 characters, aborting." msgstr "10000 karakternél többet tartalmazó sor érkezett, megszakítás." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "A kapott hitelesítési lánc nem ellenőrizhető. Ellenőrzési állapot: %d." + +#: ../src/interface/netconfwizard.cpp:1014 +#: ../src/interface/netconfwizard.cpp:1022 +#: ../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "A fogadott adat sérült" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../src/interface/updater.cpp:568 msgid "Received invalid character in version information" msgstr "Érvénytelen karakter érkezett a verzió információban" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Ismeretlen TLS riasztás %d érkezett a kiszolgálótól" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../src/interface/updater.cpp:561 msgid "Received version information is too large" msgstr "Túl nagy verzió információ érkezett" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6269,77 +6608,74 @@ "van kapcsolódva.\n" "Ha folytatja, a aktuális kapcsolat meg fog szakadni." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Újracsatlakozás beállításai" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Újracsatlakozás az utoljára használt kiszolgálóhoz" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Fájlok rekurzív hozzáadása a várólistához." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Engedélyek rekurzív módosítása." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Fájlok és mappák rekurzív törlése." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Piros" + +#: ../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Átirányítás érvénytelen vagy nem támogatott URI címre: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:656 +#: ../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Átirányítás érvénytelen vagy nem támogatott címre: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "A fájlablakok frissítése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Jelszavak megjegyzése?" -#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Távoli" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." -msgstr "A távoli tanúsítvány nem megbízható" +msgstr "A távoli tanúsítvány nem megbízható." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Távoli fájlnév" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3099 -#: ../../locales/../src/interface/search.cpp:383 -#: ../../locales/../src/interface/search.cpp:388 -#: ../../locales/../src/interface/search.cpp:397 -#: ../../locales/../src/interface/search.cpp:402 +#: ../src/interface/search.cpp:708 ../src/interface/search.cpp:713 msgid "Remote file search" msgstr "Fájlkeresés a kiszolgálón" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Távoli szűrők:" -#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Távoli elérési út" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6349,7 +6685,7 @@ "abszolút elérési utat adott meg, és azt a jelenlegi állomás típusa (%s) " "támogatja." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../src/interface/sitemanager_dialog.cpp:1177 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6359,129 +6695,131 @@ "abszolút elérési utat adott meg, és azt a hozzárendelt állomás típusa (%s) " "támogatja." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../src/interface/bookmarks_dialog.cpp:445 +#: ../src/interface/bookmarks_dialog.cpp:450 +#: ../src/interface/sitemanager_dialog.cpp:1180 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "A távoli mappa elérési útja nem elemezhető. Ellenőrizze, hogy érvényes " "abszolút elérési utat adott meg." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "A távoli elérési út nem elemezhető." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Távoli elérési utak kezelése:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Távoli elérési út:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Távoli fájlok:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../src/interface/resources/xrc/menus.xrc:459 +#: ../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Összes eltávolítása" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../src/interface/resources/xrc/menus.xrc:466 +#: ../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Kijelöltek eltávolítása" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:287 +#: ../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../src/interface/resources/xrc/settings.xrc:1193 +#: ../src/interface/resources/xrc/settings.xrc:1214 +#: ../src/interface/asyncrequestqueue.cpp:304 msgid "Rename file" msgstr "Fájl átnevezése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../src/interface/resources/xrc/menus.xrc:525 +#: ../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Kijelölt mappa átnevezése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../src/interface/resources/xrc/menus.xrc:285 +#: ../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Kijelölt mappák és fájlok átnevezése" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3393 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2413 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:595 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Objektum átnevezése erről: '%s' erre: '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Jelszó ismétlése:" + +#: ../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Hibajelentés és kívánságok küldése" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Sikertelen kérés - a kliensen nem fut identd (vagy nem elérhető a szerverről)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Sikertelen kérés - a kliens identd nem tudja ellenőrizni a felhasználó ID " "karakterláncot" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Visszautasított vagy sikertelen kérés" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../src/interface/sitemanager_dialog.cpp:542 msgid "Require explicit FTP over TLS" msgstr "TLS fölötti explicit FTP szükséges" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../src/interface/sitemanager_dialog.cpp:543 msgid "Require implicit FTP over TLS" msgstr "TLS fölötti implicit FTP szükséges" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Összes eltávolítása és újra várólistához adása" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Ismeretlen feloldott protokoll" -#: ../../locales/../src/engine/ControlSocket.cpp:1078 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:457 +#: ../src/engine/ControlSocket.cpp:1081 #, c-format msgid "Resolving address of %s" msgstr "Cím feloldása a következőhöz: %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Erőforrás ideiglenesen nem elérhető" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:343 +#: ../src/engine/logging.cpp:115 ../src/interface/StatusView.cpp:289 +#: ../src/interface/StatusView.cpp:357 ../src/interface/netconfwizard.cpp:421 msgid "Response:" msgstr "Válasz:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Találatok:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../src/interface/resources/xrc/settings.xrc:1192 +#: ../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Átvitel folytatása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6489,138 +6827,161 @@ "Az ASCII fájlok átviteli folytatása problémákat okozhat, amennyiben a " "kiszolgáló más sorvégződés formátumot használ, mint a kliens." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:923 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Könyvtár lista lekérdezése: \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:920 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Könyvtár lista lekérdezése..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3769 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "A külső IP cím lekérdezése a következő helyről: %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../src/interface/resources/xrc/menus.xrc:34 msgid "S&how files currently being edited..." msgstr "Jelenleg szerkesztett fájlok..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "Kedvenc Helyek megjelenítése az indításkor" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Rendszer leállítása" +#: ../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "Rendszer leállítása egyszer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "Megállítás" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "Rendszer alvó állapot" +#: ../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "Rendszer alvó állapot egyszer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "Szinkronizált böngészés" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 +#: ../src/interface/settings/settingsdialog.cpp:97 msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "SFTP támogatás" + +#: ../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOCKS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 proxy ide fog csatlakozni: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"A SOCKS5 nem támogatja a 255 karateresnél hosszabb felhasználóneveket és " +"jelszavakat." + +#: ../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Jelszavak mentése mesterjelszó védelemmel" + +#: ../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Jelszavak mentése" + +#: ../src/interface/netconfwizard.cpp:867 msgid "Save settings?" -msgstr "Beállítások mentése" +msgstr "Beállítások mentése?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../src/interface/manual_transfer.cpp:429 +#: ../src/interface/sitemanager_dialog.cpp:1009 msgid "Saving of password has been disabled by your system administrator." msgstr "A jelszó mentését a rendszergazda nem engedélyezte." -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../src/interface/manual_transfer.cpp:432 +#: ../src/interface/sitemanager_dialog.cpp:1012 msgid "Saving of passwords has been disabled by you." msgstr "A jelszavak mentését nem engedélyezte." -#: ../../locales/../src/interface/QueueView.cpp:1718 -msgid "Scanning for files to add to queue" -msgstr "Fájlok keresése a várólistához történő adáshoz" - -#: ../../locales/../src/interface/QueueView.cpp:1720 -msgid "Scanning for files to upload" -msgstr "Fájlok keresése a feltöltéshez" +#: ../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Nagyítás:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Keresési feltételek:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Keresés ebben a mappában:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../src/interface/toolbar.cpp:53 msgid "Search for files recursively." -msgstr "Távoli fájlok rekurzív keresése a kiszolgálón" +msgstr "Fájlok rekurzív keresése." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" -msgstr "Távoli fájlok rekurzív keresése a kiszolgálón" +msgstr "Fájlok rekurzív keresése" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Keresés típusa:" + +#: ../src/interface/statusbar.cpp:514 msgid "Security information" msgstr "Biztonsági információk" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../src/interface/netconfwizard.cpp:585 +#: ../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "További információkért látogassa meg a következő webcímet: https://wiki." "filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Állomás kiválasztása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Válassza ki az oldalt:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Téma kiválasztása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Válassza ki az alapértelmezett műveletet arra az esetre, ha a célfájl már " "létezik." -#: ../../locales/../src/interface/edithandler.cpp:1532 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 +#: ../src/interface/settings/optionspage_edit.cpp:104 +#: ../src/interface/edithandler.cpp:1583 msgid "Select default editor" msgstr "Válassza ki az alapértelmezett szerkesztőt" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6628,7 +6989,7 @@ "Válassza ki az alapértelmezett műveletet arra az esetre, ha a célfájl már " "létezik. Ez a beállítás csak az aktuális munkamenetre érvényes." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6637,138 +6998,139 @@ "létezik. Ez a beállítás csak a várólistában aktuálisan kijelölt fájlokra " "érvényes." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Válassza ki a titkos kulcsot tartalmazó fájlt" -#: ../../locales/../src/interface/export.cpp:38 +#: ../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Adja meg a fájlnevet az adatok exportálásához" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1454 +#: ../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Adja meg a fájlnevet a szűrők exportálásához" + +#: ../src/interface/export.cpp:39 ../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Adja meg a fájlnevet a várólista adatok exportálásához" -#: ../../locales/../src/interface/export.cpp:36 +#: ../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Adja meg a fájlnevet a beállítások exportálásához" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2208 +#: ../src/interface/export.cpp:36 ../src/interface/sitemanager_dialog.cpp:2464 msgid "Select file for exported sites" msgstr "Adja meg a fájlnevet a kedvenc helyek exportálásához" -#: ../../locales/../src/interface/import.cpp:16 +#: ../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Válassza ki a fájlt az importáláshoz" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Válassza ki a helyi fájlokat a feltöltéshez" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:143 +#: ../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Adja meg a fájlnevet a konvertált kulcshoz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2907 +#: ../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Adja meg hogy ezt a fájltípust milyen program nyissa meg." -#: ../../locales/../src/interface/search.cpp:507 +#: ../src/interface/search.cpp:892 msgid "Select target download directory" msgstr "Válassza ki a letöltés célkönyvtárát" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Válassza ki a helyi fájlt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Válassza ki a kiexportálandó kategóriákat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Válassza ki a törölni kívánt személyes adatokat." -#: ../../locales/../src/interface/search.cpp:475 +#: ../src/interface/search.cpp:851 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." -msgstr[0] "%d mappa a tartalmával együtt van kijelölve a letöltéshez." -msgstr[1] "%d mappa a tartalmával együtt van kijelölve a letöltéshez." +msgstr[0] "%d mappa a tartalmával együtt átvitelre kijelölve." +msgstr[1] "%d mappa a tartalmával együtt átvitelre kijelölve." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d mappa kijelölve." msgstr[1] "%d mappa kijelölve." -#: ../../locales/../src/interface/search.cpp:473 +#: ../src/interface/search.cpp:849 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." -msgstr[0] "%d fájl van kijelölve a letöltéshez." -msgstr[1] "%d fájl van kijelölve a letöltéshez." +msgstr[0] "%d fájl van átvitelre kijelölve." +msgstr[1] "%d fájl van átvitelre kijelölve." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "%d fájl kijelölve. Kijelölt fájl mérete: %s" msgstr[1] "%d fájl kijelölve. Kijelölt fájlok mérete: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "%d fájl kijelölve. Kijelölt fájl mérete: Legalább %s" msgstr[1] "%d fájl kijelölve. Kijelölt fájlok mérete: Legalább %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../src/interface/search.cpp:855 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s és %s van kijelölve a letöltéshez." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "%s és %s kijelölve. Kijelölt fájlok mérete: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s és %s kijelölve. Kijelölt fájlok mérete: Legalább %s" -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1551 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 +#: ../src/interface/settings/optionspage_edit.cpp:124 +#: ../src/interface/edithandler.cpp:1528 ../src/interface/edithandler.cpp:1602 msgid "Selected editor does not exist." msgstr "A kijelölt szerkesztő nem található." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "A kijelölt fájl már szerkesztés alatt van" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "A kiválasztott fájl már be van töltve" -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "A kijelölt fájl már meg van nyitva" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "A kijelölt fájl még szerkesztés alatt van" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "A kijelölt szűrő csak a helyi fájlokra alkalmazható." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6777,48 +7139,47 @@ "különböző típusúak.\n" "Használjon állomáshoz rendelt mappát ehhez a szerverhez." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." -msgstr "A megadott portot általában egy másik protokoll használja" +msgstr "A megadott portot általában egy másik protokoll használja." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "FTP ébrentartási parancsok küldése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "Egyéni FTP parancsok küldése a kiszolgálóra" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4314 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Ébrentartási parancs küldése" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../src/interface/resources/xrc/certificate.xrc:65 +#: ../src/interface/verifycertdialog.cpp:259 msgid "Serial number:" msgstr "Sorozatszám:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "Kiszolgáló típusa:" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" -msgstr "A kiszolgáló a TLS kapcsolatot nem megfelelően zárta le." +msgstr "A kiszolgáló a TLS kapcsolatot nem megfelelően zárta le" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../src/engine/ftp/logon.cpp:396 ../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "A kiszolgáló nem támogatja a nem-ASCII karaktereket." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4150 +#: ../src/engine/ftp/filetransfer.cpp:269 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "" "A kiszolgáló nem támogatja a(z) %d GB-nál nagyobb méretű fájlok átviteli " "folytatását." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4146 +#: ../src/engine/ftp/filetransfer.cpp:266 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6827,19 +7188,23 @@ "A kiszolgáló nem támogatja a(z) %d GB-nál nagyobb méretű fájlok átviteli " "folytatását. Az átvitel befejezése, a fájlok méretei megegyeznek." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../src/engine/ftp/filetransfer.cpp:528 msgid "Server does not support resume of files > 2GB." msgstr "" "A kiszolgáló nem támogatja a 2 GB-nál nagyobb méretű fájlok átviteli " "folytatását." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../src/engine/ftp/filetransfer.cpp:524 msgid "Server does not support resume of files > 4GB." msgstr "" "A kiszolgáló nem támogatja a 4 GB-nál nagyobb méretű fájlok átviteli " "folytatását." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4161 +#: ../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Kiszolgáló címkulcs" + +#: ../src/engine/ftp/filetransfer.cpp:277 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6848,19 +7213,22 @@ "A kiszolgáló esetleg nem támogatja a(z) %d GB-nál nagyobb méretű fájlok " "átviteli folytatását. Az átvitel befejezése, a fájlok méretei megegyeznek." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" -"A kiszolgáló esetleg egy fiókot igényel. Próbáljon meg egy fiókot megadni a " -"Kedvenc Helyek beállításaiban." +"A kiszolgáló esetleg fiókot igényel. Adjon meg egy fiókot a Kedvenc Helyekben" + +#: ../src/engine/http/request.cpp:241 +msgid "Server not sending proper line endings" +msgstr "A kiszolgáló nem megfelelő sorvégződéseket küld" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "A szerver üres elérési úttal tért vissza." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:224 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6868,13 +7236,13 @@ "A kiszolgáló egy további bejelentkezési kérést küldött el. Az interaktív " "bejelentkezési típust kell használnia." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3716 +#: ../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "A kiszolgáló nem lekérdezhető című passzív választ küldött. A passzív mód " "használata nem sikerült." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3711 +#: ../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6882,161 +7250,178 @@ "A kiszolgáló nem lekérdezhető című passzív választ küldött. A szerver " "címének használata ehelyett." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:425 -#: ../../locales/../src/interface/netconfwizard.cpp:464 -#: ../../locales/../src/interface/netconfwizard.cpp:473 -#: ../../locales/../src/interface/netconfwizard.cpp:485 -#: ../../locales/../src/interface/netconfwizard.cpp:509 -#: ../../locales/../src/interface/netconfwizard.cpp:516 -#: ../../locales/../src/interface/netconfwizard.cpp:525 -#: ../../locales/../src/interface/netconfwizard.cpp:536 +#: ../src/engine/http/request.cpp:514 +msgid "Server sent too much data." +msgstr "A kiszolgáló túl sok adatot küldött." + +#: ../src/interface/netconfwizard.cpp:428 +#: ../src/interface/netconfwizard.cpp:434 +#: ../src/interface/netconfwizard.cpp:469 +#: ../src/interface/netconfwizard.cpp:478 +#: ../src/interface/netconfwizard.cpp:490 +#: ../src/interface/netconfwizard.cpp:513 +#: ../src/interface/netconfwizard.cpp:520 +#: ../src/interface/netconfwizard.cpp:529 +#: ../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "A kiszolgáló nem várt választ küldött." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"A szerver rendezetlen hitelesítési láncot küldött, mely a TSL szabályait " +"megszegi" + +#: ../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Üzenethitelesítés kódolása a szervertől a kliens felé:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Blokk kódolás a szervertől a kliens felé:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "Adatkapcsolat típusa:" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Kiszolgáló / Helyi fájlnév" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Kiszolgáló:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 +#: ../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "Adatkapcsolat részletek" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Prioritás beállítása" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2292 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:589 #, c-format -msgid "Set permissions of '%s' to '%s'" +msgid "Setting permissions of '%s' to '%s'" msgstr "Engedélyek módosítása a '%s' objektumon erre: '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:789 -msgid "SetSocketBufferSize called without socket" -msgstr "A SetSocketBufferSize az adatcsatorna nélkül hívódott meg" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Beállítások" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Beállítások helye:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Értesítő buborék megjelenítése" + +#: ../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Nyers könyvtár lista megjelenítése az üzenet naplóban" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Üdvözlő üzenet..." -#: ../../locales/../src/interface/Mainfrm.cpp:2204 +#: ../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "" "Szeretné mindkét könyvtárfát megjeleníteni és folytatni az összehasonlítást?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../src/interface/resources/xrc/update.xrc:147 +#: ../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Részletek megjelenítése" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "További dátum és idő formázási beállítások" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "TLS rejtjelek megjelenítése" -#: ../../locales/../src/interface/cmdline.cpp:6 +#: ../src/interface/cmdline.cpp:6 msgid "Shows this help dialog" msgstr "Ezen súgó ablak megjelenítése" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../src/interface/QueueView.cpp:2762 msgid "Shutdown now" msgstr "Leállítás most" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 +#: ../src/interface/resources/xrc/certificate.xrc:81 msgid "Signature algorithm:" msgstr "Aláírás algoritmusa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Regisztrálás" + +#: ../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Kedvenc Helyek bejegyzései" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 +#: ../src/interface/resources/xrc/sitemanager.xrc:7 msgid "Site Manager" msgstr "Kedvenc Helyek" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../src/interface/sitemanager_dialog.cpp:1019 msgid "Site Manager - Cannot remember password" msgstr "Kedvenc Helyek - Jelszó nem menthető" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Kedvenc Helyek - Generált kulcs" + +#: ../src/interface/sitemanager_dialog.cpp:985 +#: ../src/interface/sitemanager_dialog.cpp:998 +#: ../src/interface/sitemanager_dialog.cpp:1032 +#: ../src/interface/sitemanager_dialog.cpp:1049 +#: ../src/interface/sitemanager_dialog.cpp:1062 +#: ../src/interface/sitemanager_dialog.cpp:1077 +#: ../src/interface/sitemanager_dialog.cpp:1087 +#: ../src/interface/sitemanager_dialog.cpp:1095 +#: ../src/interface/sitemanager_dialog.cpp:1120 +#: ../src/interface/sitemanager_dialog.cpp:1129 +#: ../src/interface/sitemanager_dialog.cpp:1145 +#: ../src/interface/sitemanager_dialog.cpp:1154 +#: ../src/interface/sitemanager_dialog.cpp:1182 +#: ../src/interface/sitemanager_dialog.cpp:1191 +#: ../src/interface/sitemanager_dialog.cpp:1198 msgid "Site Manager - Invalid data" msgstr "Kedvenc Helyek - Érvénytelen adat" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "A Kedvenc Helyek már meg van nyitva" -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../src/interface/sitemanager.cpp:489 ../src/interface/sitemanager.cpp:517 +#: ../src/interface/sitemanager.cpp:531 ../src/interface/sitemanager.cpp:543 +#: ../src/interface/sitemanager.cpp:712 ../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "A parancssorosan megadott állomás nem létezik." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "" "A parancssoros állomás specifikációnak 0-val vagy 1-gyel kell kezdődnie." -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:752 +#: ../src/interface/sitemanager.cpp:537 ../src/interface/sitemanager.cpp:706 +#: ../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "A parancssoros állomás specifikáció nem megfelelő." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Állomáshoz rendelt kedvenc mappák" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../src/interface/bookmarks_dialog.cpp:97 +#: ../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7046,67 +7431,68 @@ "Helyek között szerepelnie kell.\n" "Kívánja hozzáadni a jelenlegi kapcsolatot a Kedvenc Helyek közé?" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../src/interface/queue.cpp:1214 msgid "Size" msgstr "Méret" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Fájlméret formátuma" -#: ../../locales/../src/interface/fileexistsdlg.cpp:43 +#: ../src/interface/fileexistsdlg.cpp:43 msgid "Size unknown" msgstr "Ismeretlen méret" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../src/interface/resources/xrc/settings.xrc:1194 +#: ../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Fájl kihagyása" -#: ../../locales/../src/engine/ControlSocket.cpp:1149 -#: ../../locales/../src/engine/ControlSocket.cpp:1166 -#: ../../locales/../src/engine/ControlSocket.cpp:1190 -#: ../../locales/../src/engine/ControlSocket.cpp:1250 +#: ../src/engine/ControlSocket.cpp:1151 ../src/engine/ControlSocket.cpp:1168 +#: ../src/engine/ControlSocket.cpp:1194 ../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping download of %s" msgstr "Letöltés kihagyása: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1153 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1194 -#: ../../locales/../src/engine/ControlSocket.cpp:1254 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Nem létező kulcsfájl kihagyása: \"%s\"" + +#: ../src/engine/ControlSocket.cpp:1154 ../src/engine/ControlSocket.cpp:1171 +#: ../src/engine/ControlSocket.cpp:1197 ../src/engine/ControlSocket.cpp:1275 #, c-format msgid "Skipping upload of %s" msgstr "Feltöltés kihagyása: %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "A socket címe a címtartományon kívül esik" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "A socket már csatlakozott" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "A socket leállításra került" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "A socket nem csatlakozott" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "A socket típusa nem támogatott ehhez a cím típushoz" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "Valamely fájl még szerkesztés alatt van vagy feltöltés szükséges." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../src/interface/resources/xrc/netconfwizard.xrc:147 +#: ../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7114,143 +7500,149 @@ "Néhány, router mögött található és rosszul beállított távoli kiszolgáló, " "esetleg a saját helyi IP címével válaszolhat." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Mappák rendezése a fájlok között" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "" "A rendezés sorrendje nem módosítható miközben a könyvtárak összehasonlítása " "be van kapcsolva." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Rendezés" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Rendezés módja:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" -msgstr "Az áthúzási művelet forrása és elérési útja megegyezik." +msgstr "Az áthúzási művelet forrása és elérési útja megegyezik" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:153 +#: ../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "A forrásfájl és a célfájl lehet hogy nem ugyanaz" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" -msgstr "Az áthúzási művelet forrása és célja megegyezik." +msgstr "Az áthúzási művelet forrása és célja megegyezik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 +#: ../src/interface/resources/xrc/dialogs.xrc:24 msgid "Source file:" msgstr "Forrásfájl:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3632 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../src/interface/speedlimits_dialog.cpp:64 +#: ../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Sebesség korlátozása" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Sebesség korlátozása" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../src/interface/statusbar.cpp:591 msgid "Speed limits are disabled, click to change." msgstr "Sebesség nincs korlátozva, kattintson a módosításhoz." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../src/interface/statusbar.cpp:594 msgid "Speed limits are enabled, click to change." msgstr "Sebesség korlátozás érvényes, kattintson a módosításhoz." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Stabil és beta verziókhoz" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Csak a stabil verziókhoz" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Stabil, beta és napi változatokhoz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Az átvitel megkezdése azonnal" -#: ../../locales/../src/interface/cmdline.cpp:7 +#: ../src/interface/cmdline.cpp:7 msgid "Start with opened Site Manager" msgstr "Indítás a Kedvenc Helyek megnyitásával" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../src/interface/updater.cpp:247 #, c-format msgid "Started update check on %s\n" msgstr "Frissítés keresés indult: %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1557 +#: ../src/engine/ftp/filetransfer.cpp:36 ../src/engine/sftp/filetransfer.cpp:35 +#: ../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Letöltés indítása: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1560 +#: ../src/engine/ftp/filetransfer.cpp:39 ../src/engine/sftp/filetransfer.cpp:38 +#: ../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Feltöltés indítása: %s" -#: ../../locales/../src/interface/cmdline.cpp:9 +#: ../src/interface/cmdline.cpp:9 msgid "Starts the local site in the given path" msgstr "A helyi fájlablak a megadott elérési úttal indul" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../src/interface/verifycertdialog.cpp:253 msgid "State or province:" msgstr "Megye:" -#: ../../locales/../src/interface/edithandler.cpp:1088 -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../src/interface/edithandler.cpp:1139 ../src/interface/queue.cpp:1214 msgid "Status" msgstr "Állapot" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:367 +#: ../src/engine/logging.cpp:112 ../src/interface/StatusView.cpp:298 +#: ../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "Állapot:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Összes megállítása és eltávolítása" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Rekurzív művelet leállítása" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Decentralized Cloud Storage" + +#: ../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Storj támogatás" + +#: ../src/interface/verifycertdialog.cpp:257 msgid "Street:" msgstr "Utca:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 +#: ../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" msgstr "Tanúsítvány tulajdonosa" -#: ../../locales/../src/interface/queueview_successful.cpp:12 +#: ../src/interface/queueview_successful.cpp:12 msgid "Successful transfers" msgstr "Sikeres átvitelek" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 +#: ../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" msgstr "A tesztek eredménye:" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../src/interface/QueueView.cpp:2770 msgid "Suspend now" msgstr "Alvó állapot" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3238 +#: ../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7258,110 +7650,114 @@ "A fájlokra mutató szimbolikus linkeket ez a választás nem befolyásolja, azok " "eleve törlésre kerülnek." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:237 -#: ../../locales/../src/interface/state.cpp:251 -#: ../../locales/../src/interface/state.cpp:257 -#: ../../locales/../src/interface/state.cpp:267 -#: ../../locales/../src/interface/state.cpp:353 -#: ../../locales/../src/interface/state.cpp:361 -#: ../../locales/../src/interface/state.cpp:369 -#: ../../locales/../src/interface/state.cpp:901 -#: ../../locales/../src/interface/state.cpp:909 -#: ../../locales/../src/interface/state.cpp:915 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:930 +#: ../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../src/interface/toolbar.cpp:52 ../src/interface/state.cpp:263 +#: ../src/interface/state.cpp:278 ../src/interface/state.cpp:285 +#: ../src/interface/state.cpp:296 ../src/interface/state.cpp:395 +#: ../src/interface/state.cpp:403 ../src/interface/state.cpp:411 +#: ../src/interface/state.cpp:1070 ../src/interface/state.cpp:1078 +#: ../src/interface/state.cpp:1085 ../src/interface/state.cpp:1094 +#: ../src/interface/state.cpp:1121 msgid "Synchronized browsing" msgstr "Szinkronizált böngészés" -#: ../../locales/../src/interface/state.cpp:368 +#: ../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "A szinkronizált böngészés kikapcsolásra került." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Könyvtárak szinkronizálása." + +#: ../src/interface/quickconnectbar.cpp:117 +#: ../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Szintaktikai hiba" -#: ../../locales/../src/interface/cmdline.cpp:76 -#: ../../locales/../src/interface/cmdline.cpp:82 -#: ../../locales/../src/interface/cmdline.cpp:88 -#: ../../locales/../src/interface/cmdline.cpp:97 -#: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2316 -#: ../../locales/../src/interface/Mainfrm.cpp:2358 +#: ../src/interface/cmdline.cpp:76 ../src/interface/cmdline.cpp:82 +#: ../src/interface/cmdline.cpp:88 ../src/interface/cmdline.cpp:97 +#: ../src/interface/cmdline.cpp:103 ../src/interface/Mainfrm.cpp:2441 +#: ../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Szintaktikai hiba a parancssorban" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Rendszerfájl" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Rendszerinformációk" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "A megnyitott fájlok száma meghaladta a rendszerkorlátot" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Hálózati alrendszer probléma jelentkezett" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "Eszköztár" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../src/engine/http/httpcontrolsocket.cpp:131 msgid "TLS connection established, sending HTTP request" msgstr "TLS adatkapcsolat létrejött, HTTP kérés küldése" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS adatkapcsolat létrejött, várakozás az üdvözlő üzenetre..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." -msgstr "TLS adatkapcsolat létrejött" +msgstr "TLS adatkapcsolat létrejött." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL lejárt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:6 +#: ../src/interface/resources/xrc/dialogs.xrc:6 msgid "Target file already exists" msgstr "A fájl már létezik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Célfájl:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../src/interface/RemoteListView.cpp:2686 msgid "Target filename already exists!" msgstr "A célfájl már létezik!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../src/interface/RemoteListView.cpp:1639 msgid "Target filename already exists, really continue?" msgstr "A célfájl már létezik, biztosan folytatni szeretné?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Ideiglenes hiba a név feloldás során" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 +#: ../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Sikeresen befejeződött teszt" + +#: ../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Teszt eredmények" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4167 +#: ../src/engine/ftp/filetransfer.cpp:281 msgid "Testing resume capabilities of server" msgstr "A kiszolgáló átviteli felfüggesztés/folytatás képességeinek tesztelése" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Az alábbi fájlok vannak jelenleg szerkesztés alatt:" + +#: ../src/interface/sitemanager_dialog.cpp:785 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "A Kedvenc Helyek nem használható, amíg a fájlt nem javítják meg." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7370,7 +7766,7 @@ "A Kedvenc Helyek már meg van nyitva a FileZilla 3 egy másik példányában.\n" "Kívánja folytatni? A Kedvenc Helyek módosítai nem lesznek menthetőek." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7378,77 +7774,89 @@ "A Kedvenc Helyek már meg van nyitva a FileZilla 3 egy másik példányában.\n" "Kérem zárja be, ellenkező esetben az adat nem törölhető." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Az Ön által megadott cím: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Az ai_family típusú elem nem támogatott" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Az ai_socktype típusú elem nem támogatott" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:663 +#: ../src/interface/sitemanager.cpp:693 +#: ../src/interface/bookmarks_dialog.cpp:840 msgid "The bookmark could not be added." msgstr "Mappakedvenc nem hozzáadható." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Mappakedvenc nem törölhető." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"A tanúsítvány szerint a kiszolgálónak OCSP státuszt kellene adnia a " +"válaszban, azonban az OCSP státusz hiányzik." + +#: ../src/interface/statusbar.cpp:475 msgid "The connection is encrypted. Click icon for details." msgstr "" "A kapcsolat titkosított. Kattintson az ikonra a részletes információkért." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 +#: ../src/interface/settings/optionspage_dateformatting.cpp:75 msgid "" "The custom date format is invalid or contains unsupported format specifiers." msgstr "" "Az egyéni dátum formátum érvénytelen vagy nem támogatott formázást tartalmaz." -#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 +#: ../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." msgstr "Az egyéni bejelentkezési parancssor nem lehet üres." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 +#: ../src/interface/settings/optionspage_dateformatting.cpp:85 msgid "" "The custom time format is invalid or contains unsupported format specifiers." msgstr "" "Az egyéni idő formátum érvénytelen vagy nem támogatott formázást tartalmaz." -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Az adatkapcsolat nem hozható létre: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Szöveges fájlokhoz az alapértelmezett szerkesztő nem található." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2918 +#: ../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Az alapértelmezett szöveges fájl szerkesztő: '%s'." -#: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../src/interface/filteredit.cpp:149 ../src/interface/filteredit.cpp:216 +#: ../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "A megadott szűrőnév már létezik, kérem válasszon másikat." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../src/interface/settings/optionspage_interface.cpp:205 +#: ../src/interface/asksavepassworddialog.cpp:41 +msgid "The entered passwords are not the same." +msgstr "A megadott jelszavak nem egyformák." + +#: ../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" -msgstr "A(z) '%s' kiterjesztés már létezik a listában." +msgstr "A(z) '%s' kiterjesztés már létezik a listában" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:278 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:284 +#: ../src/interface/asyncrequestqueue.cpp:293 +#: ../src/interface/asyncrequestqueue.cpp:301 #, c-format msgid "" "The file %s already exists.\n" @@ -7457,8 +7865,8 @@ "A következő fájl már létezik: %s.\n" "Kérem adjon meg egy új nevet:" -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../src/interface/edithandler.cpp:1673 +#: ../src/interface/LocalListView.cpp:1834 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7469,19 +7877,28 @@ "Nem található a társított program (%s).\n" "Kérem ellenőrizze a fájltípus társításokat." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:52 +#: ../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"A '%s fájl SSH1 kulcsot tartalmaz. Az SSH1 protokoll elavult, " +"érvénytelenített, a FileZilla csak SSH2 kulcsokat támogat." + +#: ../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" -"A következő fájl nem tölthető be vagy nem tartalmaz titkos kulcsot: '%s'" +"A következő fájl nem tölthető be vagy nem tartalmaz titkos kulcsot: '%s'." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../src/interface/xmlfunctions.cpp:37 #, c-format msgid "The file '%s' could not be loaded." msgstr "A következő fájl nem tölthető be: '%s'." -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../src/interface/edithandler.cpp:1668 +#: ../src/interface/LocalListView.cpp:1830 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7490,18 +7907,17 @@ "A következő fájl nem nyitható meg: '%s'.\n" "A rendszerben nincs semmilyen program társítva ehhez a fájltípushoz." -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../src/interface/edithandler.cpp:1785 +#: ../src/interface/LocalListView.cpp:1843 #, c-format msgid "" "The file '%s' could not be opened:\n" "The associated command failed" msgstr "" "A következő fájl nem nyitható meg: '%s'.\n" -"A társított parancs futtatása nem sikerült." +"A társított parancs futtatása nem sikerült" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../src/interface/import.cpp:65 ../src/interface/sitemanager_dialog.cpp:792 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7512,21 +7928,7 @@ "Újabb verzióval készített fájlok betöltése adatvesztéshez vezethet.\n" "Folytatni kívánja?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 -#, c-format -msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected key files are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"A következő fájl formátumát a FileZilla nem támogatja: '%s'.\n" -"A fájl jelszóval védett. A jelszóval védett hitelesítési kulcsokat a " -"FileZilla jelenleg nem támogatja.\n" -"Szeretné a kulcsfájlt átkonvertálni támogatott, de jelszóval nem védett " -"formátumúra?" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:102 +#: ../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7535,22 +7937,11 @@ "A következő fájl formátumát a FileZilla nem támogatja: '%s'.\n" "Szeretné a kulcsfájlt átkonvertálni támogatott formátumúra?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:107 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected key files are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"A következő fájl jelszóval védett: '%s'. A jelszóval védett kulcsfájlokat a " -"FileZilla jelenleg nem támogatja.\n" -"Szeretné a kulcsfájlt átkonvertálni jelszóval nem védett formátumúra?" - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 +#: ../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Az alapértelmezett szerkesztőként megadott fájl nem létezik." -#: ../../locales/../src/interface/import.cpp:86 +#: ../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7564,37 +7955,37 @@ "jelszó importálható be.\n" "Folytatja a beimportálást?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "A fájlnév oszlop nem rejthető el és nem mozgatható." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "A fájlnév oszlop nem rejthető el." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 +#: ../src/interface/settings/optionspage_transfer.cpp:69 #, c-format msgid "The following character will be replaced: %s" msgstr "A következő karakter cserélve lesz: %s" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:66 +#: ../src/interface/settings/optionspage_transfer.cpp:66 #, c-format msgid "The following characters will be replaced: %s" msgstr "A következő karakterek lesznek cserélve: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Az alábbi fájlok vannak jelenleg szerkesztésre megnyitva:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Az ingyenes nyílt forráskódú FTP megoldás" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "A generált titkosító kulcs:" + +#: ../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Nem sikerült a globális mappakedvencek mentése." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7604,11 +7995,22 @@ "üzenet naplóban. A hibakeresési információk megjelenítése negatív hatással " "van a teljesítményre." -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 +#: ../src/interface/settings/optionspage_logging.cpp:78 msgid "The limit needs to be between 1 and 2000 MiB" -msgstr "A naplófájl méretének 1 és 2000 MiB közöttinek kell lennie." +msgstr "A naplófájl méretének 1 és 2000 MiB közöttinek kell lennie" + +#: ../src/interface/state.cpp:1121 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Ez a helyi mappa nem hozható létre: '%s'." -#: ../../locales/../src/interface/state.cpp:248 +# Direkt hibás +#: ../src/interface/state.cpp:1106 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "A helyi mappa nem létezik: '%s'" + +#: ../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7618,7 +8020,7 @@ "van.\n" "Kikapcsolja a szinkronizált böngészést és a helyi mappaváltást folytatja?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7626,19 +8028,30 @@ "A legalacsonyabb elérhető portnak kisebb vagy egyenlőnek kell lennie, mint a " "legmagasabb elérhető port." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../src/interface/settings/optionspage_interface.cpp:214 +#: ../src/interface/asksavepassworddialog.cpp:46 +msgid "The master password needs to be at least 8 characters long." +msgstr "A mesterjelszónak legalább 8 karakter hosszúnak kell lennie." + +#: ../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Az új verzió nem tölthető le, kérem próbálja újra később." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Az új verzió telepítője letöltődött a Letöltések mappába." -#: ../../locales/../src/interface/QueueView.cpp:1840 +#: ../src/interface/QueueView.cpp:1560 msgid "The queue will not be saved." msgstr "A várólista nem mentődik." -#: ../../locales/../src/interface/state.cpp:906 +# Direkt hibás +#: ../src/interface/state.cpp:1028 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "A távoli mappa nem létezik: '%s'" + +#: ../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7648,29 +8061,29 @@ "van.\n" "Kikapcsolja a szinkronizált böngészést és a távoli mappaváltást folytatja?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "A kijelölt kategóriák beimportálásra kerültek." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "A kiválasztott fájl a következő kategóriák beimportálható adatait " "tartalmazza:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Az alábbi fájl már szerkesztés alatt van:" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "A kijelölt fájl még meg van nyitva valamely programban, kérem zárja be." -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7680,20 +8093,20 @@ "Ez veszélyes lehet és a rendszert károsíthatja.\n" "Biztosan folytatni kívánja?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Az állomás nem adható hozzá." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "A kiszolgáló nem várt vagy nem felismerhető választ küldött." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "" "A kiszolgáló a következő karakterkészletet alkalmazza a fájlnevek kódolására:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 +#: ../src/interface/resources/xrc/certificate.xrc:21 msgid "" "The server's certificate is unknown. Please carefully examine the " "certificate to make sure the server can be trusted." @@ -7701,7 +8114,7 @@ "A kiszolgáló tanúsítványa nem ismert. Kérem a tanúsítványt az alábbiakban " "figyelmesen vizsgálja meg, hogy biztos legyen a szerver megbízhatóságában." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7711,7 +8124,7 @@ "hogy a rendszergazda megváltoztatta a címkulcsot, vagy pedig most egy olyan " "számítógéphez próbál csatlakozni, amely úgy tesz mintha a kiszolgáló lenne." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7719,11 +8132,15 @@ "A kiszolgáló címkulcsa ismeretlen. Semmi sem garantálja, hogy a szerver az a " "számítógép, melyre csatlakozni szeretne." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "A kiszolgáló címe nem egyezik a tanúsítványban szereplő címmel" + +#: ../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "A servername paraméter nem támogatott az ai_socktype típushoz" -#: ../../locales/../src/interface/import.cpp:73 +#: ../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7731,25 +8148,25 @@ "A beállítások beimportálásra kerültek. Az összes beállítás érvénybe " "lépéséhez a FileZilla újraindítása szükséges." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "A megadott cím típus nem támogatott" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "A megadott hálózati név már nem érvényes" -#: ../../locales/../src/interface/QueueView.cpp:3052 +#: ../src/interface/QueueView.cpp:2765 msgid "The system will soon reboot unless you click Cancel." msgstr "" "A rendszer hamarosan újraindítja magát, kivéve ha a Mégse gombra kattint." -#: ../../locales/../src/interface/QueueView.cpp:3048 +#: ../src/interface/QueueView.cpp:2761 msgid "The system will soon shut down unless you click Cancel." msgstr "" "A rendszer hamarosan leállítja magát, kivéve ha a Mégse gombra kattint." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 +#: ../src/interface/resources/xrc/dialogs.xrc:19 msgid "" "The target file already exists.\n" "Please choose an action." @@ -7757,28 +8174,28 @@ "A célfájl már létezik.\n" "Válassza ki az alkalmazandó műveletet." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "A teszt nem sikerült. Biztosan menteni szeretné a beállításokat?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../src/interface/xmlfunctions.cpp:82 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Nem állítható helyre a következő biztonsági másolat fájl: %s" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 +#: ../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Témák" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Ez a szűrőkészlet nem távolítható el." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Ez a szűrőkészlet nem nevezhető át." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7786,7 +8203,7 @@ "Ez azt jelenti, hogy valamely router vagy tűzfal továbbra is gátolja a " "FileZilla működését." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:183 +#: ../src/interface/resources/xrc/netconfwizard.xrc:183 msgid "" "This only works if you are not behind a router, else your system would just " "return your internal address." @@ -7794,7 +8211,7 @@ "Ez csak akkor működik, ha a számítógép nincs egy router mögött, különben az " "operációs rendszer csak a belső címet fogja visszaadni a programnak." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 +#: ../src/interface/resources/xrc/netconfwizard.xrc:8 msgid "" "This wizard will help you to properly configure any routers and firewalls " "you have and tests your configuration." @@ -7802,45 +8219,43 @@ "A varázsló a hálózati beállítások megfelelő kialakításában és tesztelésében " "segít, különösen ha router vagy tűzfal is található a hálózaton." -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../src/interface/queue.cpp:1214 msgid "Time" msgstr "Idő" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Idő formátuma" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Időtúllépés beállítása másodpercben:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:379 +#: ../src/interface/resources/xrc/settings.xrc:126 +#: ../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Időtúllépés" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1031 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Szerver időzóna eltolódása: %d másodperc." - -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../src/interface/verifycertdialog.cpp:251 msgid "Title:" msgstr "Beosztás:" -#: ../../locales/../src/interface/Mainfrm.cpp:2202 +#: ../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "A könyvtárak összehasonlításához a gyors keresést be kell zárni." + +#: ../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" "A könyvtárak összehasonlításához, mindkét fájllistát egy vonalba kell " "igazítani." -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Ehhez, egyszerre kell megjeleníteni vagy elrejteni mindkét könyvtárfát." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7848,7 +8263,8 @@ "A nyilvános kulcsú hitelesítés működéséhez szükség van a használni kívánt " "titkos személyes kulcsokra is." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +# Direkt hibás +#: ../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7865,7 +8281,7 @@ "Zöld: A fájl újabb mint a másik oldalon lévő fájl.\n" "Piros: A fájlméretek különböznek." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7875,196 +8291,202 @@ "Ha engedélyezve van, az egyik oldali mapparendszerben való navigálás a másik " "oldalon is megfelelően változtatja a mappát." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "A várólista végrehajtása" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "A helyi könyvtárfa megjelenítése vagy elrejtése" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Az üzenet napló megjelenítése vagy elrejtése" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "A távoli könyvtárfa megjelenítése vagy elrejtése" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "A várólista megjelenítése vagy elrejtése" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../src/engine/http/request.cpp:254 msgid "Too long header line" msgstr "Túl sok fejléc sor" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Túl sok átirányítás" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:353 +#: ../src/engine/logging.cpp:116 ../src/interface/StatusView.cpp:292 +#: ../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "Részlet:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../src/interface/resources/xrc/settings.xrc:1902 +#: ../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Átvitel" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Átvitel iránya" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "Átvitel típusa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" -msgstr "Átviteli mód:" +msgstr "Átviteli mód" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Várólista" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Átviteli beállítások" -#: ../../locales/../src/engine/transfersocket.cpp:446 -#: ../../locales/../src/engine/transfersocket.cpp:468 +#: ../src/engine/ftp/transfersocket.cpp:453 +#: ../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Az átviteli kapcsolat megszakadt: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Az átvitt adatfolyam sérült." -#: ../../locales/../src/interface/queue.cpp:389 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../src/interface/statuslinectrl.cpp:259 ../src/interface/queue.cpp:360 msgid "Transferring" msgstr "Átvitel folyamatban" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 +#: ../src/interface/settings/settingsdialog.cpp:99 msgid "Transfers" msgstr "Átvitel" -#: ../../locales/../src/interface/QueueView.cpp:2950 -#: ../../locales/../src/interface/QueueView.cpp:2953 +#: ../src/interface/QueueView.cpp:2644 msgid "Transfers finished" msgstr "Befejezett átvitelek" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "A kiterjesztés nélküli fájlok kezelése ASCII fájlokként történjen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Az alábbi fájltípusok kezelése ASCII fájlokként történjen:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:385 msgid "Trust changed Hostkey:" msgstr "Módosított címkulcs elfogadása:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:827 +#: ../src/engine/sftp/sftpcontrolsocket.cpp:382 msgid "Trust new Hostkey:" msgstr "Új címkulcs elfogadása:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Megbízik az új címkulcsban, és folytatni szeretné a csatlakozást?" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 +#: ../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" msgstr "Elfogadja a tanúsítványt, és folytatni szeretné a csatlakozást?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Megbízik a címkulcsban, és folytatni szeretné a csatlakozást?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../src/interface/resources/xrc/update.xrc:139 +#: ../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Próbálja újra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Típus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "FTP Proxy típusa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Általános proxy típusa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "Feltöltés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3573 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Feltöltés korlátozása:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Fájltípus társítások használata amennyiben elérhető" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "A rendszer alapértelmezett beállítása" +#: ../src/interface/resources/xrc/settings.xrc:1625 +msgid "U&se system defaults for current language" +msgstr "Alapértelmezett rendszerbeállítás ehhez a nyelvhez" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../src/engine/proxy.cpp:387 ../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Nem ismert hibakód %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../src/interface/verifycertdialog.cpp:250 msgid "Unit:" msgstr "Egység:" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1146 +#: ../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../src/interface/edithandler.cpp:1169 ../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Ismeretlen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "A proxy típusa ismeretlen, a bejelentkezési parancssorozat létrehozása nem " "lehetséges." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Ismeretlen SOCKS protokoll verzió: %d" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:4 +#: ../src/interface/resources/xrc/certificate.xrc:4 msgid "Unknown certificate" msgstr "Ismeretlen tanúsítvány" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../src/engine/misc.cpp:71 ../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Ismeretlen hiba %d" + +#: ../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Ismeretlen hiba %u" + +#: ../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Ismeretlen címkulcs" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8073,14 +8495,18 @@ "Ismeretlen protokoll verzió a SOCKS felhasználónév/jelszó hitelesítés " "egyeztetése során: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../src/interface/xmlfunctions.cpp:283 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Ismeretlen gyökér elem, úgy tűnik, ezt a fájlt nem FileZilla generálta." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../src/engine/http/request.cpp:379 +msgid "Unknown transfer encoding" +msgstr "Ismeretlen átviteli kódolás" + +#: ../src/interface/netconfwizard.cpp:618 +#: ../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8088,7 +8514,7 @@ "Amíg ezek a problémák meg nem oldódnak, az aktív módú FTP nem fog működni, " "és a passzív módot kell használnia." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8096,135 +8522,141 @@ "Amíg ez a probléma meg nem oldódik, az aktív módú FTP nem fog működni, és a " "passzív módot kell használnia." -#: ../../locales/../src/engine/tlssocket.cpp:1015 +#: ../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Nem támogatott tanúsítvány típus" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Nem támogatott átirányítás" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Feltöltés és a szerkesztés befejezése" -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 +#: ../src/interface/settings/optionspage_updatecheck.cpp:45 +#: ../src/interface/settings/settingsdialog.cpp:112 msgid "Updates" msgstr "Frissítések" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Feltöltés" -#: ../../locales/../src/interface/edithandler.cpp:1109 +#: ../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Sikertelen feltöltés" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../src/interface/statusbar.cpp:604 #, c-format msgid "Upload limit: %s/s" msgstr "Feltöltés korlátozása: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../src/interface/statusbar.cpp:607 msgid "Upload limit: none" msgstr "Feltöltés korlátozása: nincs" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../src/interface/search.cpp:918 +msgid "Upload search results" +msgstr "Keresési találatok feltöltése" + +#: ../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Kijelölt mappa feltöltése" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Kijelölt mappák és fájlok feltöltése" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Szeretné a fájlt visszatölteni a szerverre?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Szeretné a fájlt feltölteni a szerverre?" -#: ../../locales/../src/interface/edithandler.cpp:1103 -#: ../../locales/../src/interface/edithandler.cpp:1137 -#: ../../locales/../src/interface/edithandler.cpp:1293 +#: ../src/interface/edithandler.cpp:1154 ../src/interface/edithandler.cpp:1188 +#: ../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Feltöltés" -#: ../../locales/../src/interface/edithandler.cpp:1106 -#: ../../locales/../src/interface/edithandler.cpp:1295 +#: ../src/interface/edithandler.cpp:1157 ../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Feltöltés és eltávolítás függőben" -#: ../../locales/../src/interface/edithandler.cpp:1140 -#: ../../locales/../src/interface/edithandler.cpp:1297 +#: ../src/interface/edithandler.cpp:1191 ../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Feltöltés és befejezés" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" -msgstr "Egyéni karakterkészlet használata:" +msgstr "Egyéni karakterkészlet használata" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Egyéni szerkesztő használata:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Az alapértelmezett szöveges fájl szerkesztő használata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2771 +#: ../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Szinkronizált böngészés használata" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Reguláris kifejezés használata" + +#: ../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Amennyiben a kiszolgáló támogatja, akkor UTF-8 használata, egyébként a helyi " "karakterkészlet használata." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Alapértelmezett művelet használata" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../src/interface/sitemanager_dialog.cpp:541 msgid "Use explicit FTP over TLS if available" msgstr "TLS fölötti explicit FTP, ha elérhető" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Jelenleg csatlakozott szerveren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Kedvenc állomás használata" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "A rendszer alapértelmezett beállítása" +#: ../src/interface/resources/xrc/settings.xrc:1576 +msgid "Use system &defaults for current language" +msgstr "Alapértelmezett rendszerbeállítás ehhez a nyelvhez" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 +#: ../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" msgstr "A következő IP cím használata:" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 +#: ../src/interface/resources/xrc/netconfwizard.xrc:283 msgid "Use the following port range:" -msgstr "Az alábbi port tartomány használata" +msgstr "Az alábbi port tartomány használata:" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 +#: ../src/interface/resources/xrc/netconfwizard.xrc:152 msgid "Use the server's external IP address instead" msgstr "Ehelyett, a kiszolgáló külső IP címének használata" -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../src/interface/resources/xrc/netconfwizard.xrc:207 +#: ../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "Ezt használja, ha egy router mögött van, és a külső IP címe statikus." -#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 +#: ../src/interface/resources/xrc/netconfwizard.xrc:240 msgid "" "Use this option if you have a dynamic IP address. FileZilla will contact the " "above server once each session as soon as you use active mode for the first " @@ -8235,85 +8667,82 @@ "amikor az aktív módot először használja. Az IP cím lekérdezésekor csak a " "FileZilla verziószáma továbbítódik a kiszolgálóra." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../src/interface/resources/xrc/dialogs.xrc:292 +#: ../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Felhasználónév:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../src/interface/manual_transfer.cpp:491 +#: ../src/interface/sitemanager_dialog.cpp:1077 msgid "Username cannot be a series of spaces" -msgstr "A felhasználónév nem állhat csupa szóközből." +msgstr "A felhasználónév nem állhat csupa szóközből" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" "A nem megfelelő karakterkészlet használata a fájlnevek helytelen " "megjelenését eredményezheti." -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 +#: ../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" msgstr "Érvényesség kezdete:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 +#: ../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" msgstr "Érvényesség vége:" -#: ../../locales/../src/interface/cmdline.cpp:17 +#: ../src/interface/cmdline.cpp:17 msgid "Verbose log messages from wxWidgets" msgstr "Részletes naplóüzenetek a wxWidgets-től" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Tanúsítvány ellenőrzése..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Nagyon magas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" -"A rejtett fájlok megjelenítése opció be van kapcsolva, azonban a kiszolgáló " -"nem támogatja." +"Rejtett fájlok megjelenítése opció bekapcsolva, azonban a kiszolgáló nem " +"támogatja" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Megnyitás / Szerkesztés" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Megjelenített oszlopok" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "Írás" -#: ../../locales/../src/interface/QueueView.cpp:1678 -msgid "Waiting" -msgstr "Várakozás" - -#: ../../locales/../src/interface/queue.cpp:385 +#: ../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Várakozás a böngésző kapcsolatra" -#: ../../locales/../src/interface/queue.cpp:386 +#: ../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Várakozás a jelszóra" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Várakozás az átvitel megszakítására" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Várakozás az újracsatlakozásra..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Figyelem, adatkapcsolat figyelmen kívül hagyása a rossz IP címről." -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 +#: ../src/interface/settings/optionspage_updatecheck.cpp:45 msgid "" "Warning, use nightly builds at your own risk.\n" "No support is given for nightly builds.\n" @@ -8328,23 +8757,23 @@ "\n" "Biztosan szeretne frissítést keresni a napi programváltozatok között is?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Vigyázat: Lehetséges, hogy a biztonság sérül!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "FileZilla Üdvözlő" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Újdonságok" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Újdonságok:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3647 +#: ../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8352,7 +8781,7 @@ "Amennyiben a jelszavak megjegyzése engedélyezve van, újracsatlakozáskor nem " "kell a jelszavakat beírnia a FileZilla újraindítások után sem." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8361,36 +8790,52 @@ "által nem támogatott karaktereket a program lecseréli, amennyiben a fájl " "letöltésre kerül." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" -msgstr "Művelet új kapcsolat indításakor, ha már csatlakoztunk" +msgstr "Művelet új kapcsolat indításakor, ha már csatlakoztunk:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Szélesképernyős" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3642 +#: ../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Szeretné, hogy a FileZilla emlékezzen a jelszavakra?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Írás" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../src/interface/netconfwizard.cpp:455 +#: ../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Rosszul megadott külső IP cím" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../src/engine/http/request.cpp:438 msgid "Wrong line endings" msgstr "Rossz sorvégződések" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:841 +#: ../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"A mesterjelszó nem megfelelő, a tárolt jelszavak feloldásához nem " +"használható." + +#: ../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "A mesterjelszó nem megfelelő, az elem feloldásához nem használható." + +#: ../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Sárga" + +#: ../src/engine/sftp/sftpcontrolsocket.cpp:396 msgid "Yes" msgstr "Igen" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8398,24 +8843,24 @@ "Úgy tűnik, csak IPv6 elérhető ezen a rendszeren. A varázsló nem támogatja " "ezt a környezetet." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "A FileZilla legújabb verzióját használja." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3432 +#: ../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Ez az ablak a Súgó menüből bármikor újra megnyitható." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../src/interface/resources/xrc/update.xrc:166 +#: ../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "A legújabb verzió letölthető a FileZilla holnapjáról:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "A port mező üresen hagyható az alapértelmezett port használatához." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8423,12 +8868,20 @@ "Az 'x'-et bármely pozícióban használhatja a fájlok eredeti engedélyeinek " "megtartására." -#: ../../locales/../src/interface/import.cpp:28 +#: ../src/interface/sitemanager_dialog.cpp:1120 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Jelszó és titkosító kulcs egyénileg nem módosítható, ha mesterjelszót " +"használ." + +#: ../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "A beállítások a FileZilla saját beállítások mappájából nem importálhatóak." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 +#: ../src/interface/settings/optionspage_transfer.cpp:149 msgid "" "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." @@ -8436,23 +8889,26 @@ "Érvénytelen karakter másik érvénytelen karakterre nem cserélhető le. Olyan " "karaktert adjon meg, mely a fájlnevekben engedélyezett." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "A gyökér mappába nem tölthetőek fel a fájlok." + +#: ../src/interface/asyncrequestqueue.cpp:313 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Nem adott meg új nevet a fájlhoz. Felülírja inkább a fájlt?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Kijelölt legalább egy szimbolikus linket." -#: ../../locales/../src/interface/edithandler.cpp:1588 -#: ../../locales/../src/interface/search.cpp:725 +#: ../src/interface/edithandler.cpp:1639 ../src/interface/search.cpp:1197 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" "Több mint 10 fájlt választott ki szerkesztésre. Biztosan folytatni szeretné?" -#: ../../locales/../src/interface/LocalListView.cpp:1665 +#: ../src/interface/LocalListView.cpp:1798 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8460,39 +8916,47 @@ "Több mint 10 fájlt vagy könyvtárat választott ki megnyitásra. Biztosan " "folytatni szeretné?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../src/interface/manual_transfer.cpp:407 +#: ../src/interface/sitemanager_dialog.cpp:985 msgid "You have to enter a hostname." msgstr "Meg kell adnia egy címet." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../src/interface/sitemanager_dialog.cpp:1095 msgid "You have to enter a key file path" msgstr "Adjon meg egy elérési utat a hitelesítő kulcshoz" -#: ../../locales/../src/interface/search.cpp:518 +#: ../src/interface/search.cpp:904 msgid "You have to enter a local directory." msgstr "Adjon meg egy helyi könyvtárat." -#: ../../locales/../src/interface/netconfwizard.cpp:164 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Kérem adjon meg egy érvényes IP címet." +#: ../src/interface/search.cpp:918 +msgid "You have to enter a remote directory." +msgstr "Adjon meg egy távoli mappát." + +#: ../src/interface/settings/optionspage_connection_active.cpp:91 +#: ../src/interface/netconfwizard.cpp:156 +msgid "You have to enter a valid IPv4 address." +msgstr "Érvényes IPv4 címet adjon meg." + +#: ../src/interface/sitemanager_dialog.cpp:1129 +msgid "You have to enter a valid encryption key" +msgstr "Érvényes titkosító kulcsot adjon meg" -#: ../../locales/../src/interface/search.cpp:523 +#: ../src/interface/search.cpp:909 msgid "You have to enter a writable local directory." msgstr "Írásjoggal rendelkező helyi könyvtárat adjon meg." -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../src/interface/manual_transfer.cpp:502 +#: ../src/interface/sitemanager_dialog.cpp:1087 msgid "You have to enter an account name" -msgstr "Adjon meg egy fiók nevet." +msgstr "Adjon meg egy fiók nevet" -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../src/interface/manual_transfer.cpp:476 +#: ../src/interface/sitemanager_dialog.cpp:1062 msgid "You have to specify a user name" -msgstr "Meg kell adnia egy felhasználónevet." +msgstr "Adjon meg egy felhasználónevet" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8500,38 +8964,42 @@ "Valószínűleg egy olyan router-t vagy tűzfalat használ, amely tévesen " "módosítja az átvitt adatokat." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Adja meg a mesterjelszót." + +#: ../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Meg kell adnia egy nevet a kedvenc könyvtárhoz." -#: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 +#: ../src/interface/settings/optionspage_logging.cpp:67 msgid "You need to enter a name for the log file." msgstr "Meg kell adnia a naplófájl nevét és elérési útját." -#: ../../locales/../src/interface/edithandler.cpp:1473 +#: ../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Megfelelően idézőjelezett parancsot adjon meg." -#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 +#: ../src/interface/settings/optionspage_ftpproxy.cpp:82 +#: ../src/interface/settings/optionspage_proxy.cpp:79 msgid "You need to enter a proxy host." msgstr "Meg kell adnia a proxy címét." -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 +#: ../src/interface/settings/optionspage_proxy.cpp:88 msgid "You need to enter a proxy port in the range from 1 to 65535" -msgstr "A proxy porthoz 1 és 65535 közötti értéket adjon meg." +msgstr "A proxy porthoz 1 és 65535 közötti értéket adjon meg" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../src/interface/bookmarks_dialog.cpp:79 +#: ../src/interface/bookmarks_dialog.cpp:460 +#: ../src/interface/sitemanager_dialog.cpp:1191 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Adja meg legalább az egyik elérési utat, mindkét kedvenc könyvtár nem lehet " "üres." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../src/interface/bookmarks_dialog.cpp:85 +#: ../src/interface/bookmarks_dialog.cpp:466 +#: ../src/interface/sitemanager_dialog.cpp:1198 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8539,7 +9007,7 @@ "A szinkronizált böngészés használatához meg kell adnia a helyi és a távoli " "mappát is ehhez a kedvenc mappához." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../src/interface/sitemanager_dialog.cpp:1154 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8547,23 +9015,31 @@ "A szinkronizált böngészés használatához meg kell adnia a helyi és a távoli " "mappát is ehhez az állomáshoz." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Engedélyt kell adnia a FileZilla számára azokhoz a mappákhoz, amelyekbe " +"letölt vagy ahonnan feltölt." + +#: ../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Meg kell adnia a helyi fájlt." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Meg kell adnia a távoli fájlnevet." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Meg kell adnia a távoli könyvtárat." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Válassza ki a használni kívánt kedvenc állomást." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8571,67 +9047,66 @@ "Tudnia kell csatlakoznia más kiszolgálókhoz, és a fájl átvitelnek " "megfelelően kell működnie." -#: ../../locales/../src/interface/QueueView.cpp:3056 +#: ../src/interface/QueueView.cpp:2769 msgid "Your computer will suspend unless you click Cancel." msgstr "" "A rendszer hamarosan alvó állapotra vált, kivéve ha a Mégse gombra kattint." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "újabb, mint" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "korábbi, mint" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "kezdete" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../src/interface/filter_conditions_dialog.cpp:138 +#: ../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "byte" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "tartalmazza" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../src/interface/updater.cpp:251 msgid "custom" msgstr "egyéni" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "nem tartalmazza" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../src/interface/filter_conditions_dialog.cpp:71 +#: ../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "nem egyenlő" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "vége" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../src/interface/filter_conditions_dialog.cpp:70 +#: ../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "egyenlő" -#: ../../locales/../src/interface/filelistctrl.cpp:529 -#: ../../locales/../src/interface/filelistctrl.cpp:548 -#: ../../locales/../src/interface/filelistctrl.cpp:575 -#: ../../locales/../src/interface/filelistctrl.cpp:591 +#: ../src/interface/filelistctrl.cpp:557 ../src/interface/filelistctrl.cpp:575 +#: ../src/interface/filelistctrl.cpp:605 ../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "fájl" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:197 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +# Direkt hibás +#: ../src/interface/fzputtygen_interface.cpp:177 +#: ../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8641,94 +9116,326 @@ "Ellenőrizze, hogy ez a futtatható program ugyanabban a mappában létezik, " "mint a FileZilla főprogram." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:468 +# Direkt hibás +#: ../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "Az fzsftp a FileZilla egy másik verziójához tartozik" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1484 +# Direkt hibás +#: ../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "Az fzsftp nem indítható el" -#: ../../locales/../src/engine/tlssocket.cpp:1044 +# Direkt hibás +#: ../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "Az fzstorj a FileZilla egy másik verziójához tartozik" + +# Direkt hibás +#: ../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "Az fzstorj nem indítható el" + +# Direkt hibás +#: ../src/interface/storj_key_interface.cpp:62 +#: ../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"Az fzstorj nem indítható el.\n" +"Ellenőrizze, hogy ez a futtatható program ugyanabban a mappában létezik, " +"mint a FileZilla főprogram." + +#: ../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers nem adott vissza tanúsítványt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 nem sikerült" + +#: ../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "nagyobb, mint" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "csoport által futtatható" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "csoport által olvasható" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "csoport által írható" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "egyenlő" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "bekapcsolt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "kikapcsolt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "kisebb, mint" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "mintaillesztése" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../src/interface/asyncrequestqueue.cpp:296 +msgid "new name" +msgstr "új név" + +#: ../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "tulajdonos által futtatható" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "tulajdonos által olvasható" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "tulajdonos által írható" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1105 -#: ../../locales/../src/engine/tlssocket.cpp:1116 -#: ../../locales/../src/engine/tlssocket.cpp:1131 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../src/engine/proxy.cpp:64 ../src/engine/tlssocket_impl.cpp:1454 +#: ../src/engine/tlssocket_impl.cpp:1470 ../src/engine/tlssocket_impl.cpp:1486 +#: ../src/engine/tlssocket_impl.cpp:1502 +#: ../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "ismeretlen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "mindenki által futtatható" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "mindenki által olvasható" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "mindenki által írható" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "Ne emlékezzen a jelszavakra (alapértelmezett)" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "Szerver időzóna eltolódása: %d másodperc." + +#~ msgid "Failed to create listen socket, aborting" +#~ msgstr "A figyelő szoftvercsatorna létrehozása nem sikerült, megszakítás" + +#~ msgid "Failed to retrieve external ip address, aborting" +#~ msgstr "A külső IP cím lekérdezése nem sikerült, megszakítás." + +#~ msgid "Failed to retrieve local ip address. Aborting" +#~ msgstr "A helyi IP cím lekérdezése nem sikerült, megszakítás." + +#~ msgid "Fingerprint:" +#~ msgstr "Ujjlenyomat:" + +#~ msgid "Host key fingerprint:" +#~ msgstr "Címkulcs ujjlenyomata:" + +#~ msgid "Login sequence fully executed yet not logged in. Aborting." +#~ msgstr "" +#~ "A bejelentkezési parancssorozat lefuttatódott, de a bejelentkezés nem " +#~ "sikerült. Megszakítás." + +#~ msgid "%d files added to queue" +#~ msgstr "%d fájl hozzáadva a várólistához" + +#~ msgid "&Disconnect from server" +#~ msgstr "Kapcsolat bontása" + +#~ msgid "&Show message" +#~ msgstr "Üzenet megjelenítése" + +#~ msgid "Available sizes" +#~ msgstr "Elérhető méretek" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "A Gyorskapcsolódás eszköztár nem tölthető be az erőforrás fájlból." + +#~ msgid "Connected" +#~ msgstr "A csatlakozás sikerült" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "A másik fél tanúsítványai nem kérdezhetők le, gnutls_x509_crt_import " +#~ "sikertelen" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "A másik fél tanúsítványainak hitelesítési lánca nem inicializálható, " +#~ "gnutls_x509_crt_init sikertelen" + +#~ msgid "Deleting directories" +#~ msgstr "Könyvtárak eltávolítása" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "Több könyvtár törlése jelenleg még nem támogatott, ha nem összefüggő " +#~ "mappákról van szó" + +#~ msgid "Do ¬hing" +#~ msgstr "Nincs művelet" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Több különálló mappa letöltése jelenleg még nem támogatott" + +#~ msgid "Downloading search results" +#~ msgstr "Keresési találatok letöltése" + +#~ msgid "" +#~ "Enter the address of the server.\n" +#~ "To specify the server protocol, prepend the host with the protocol " +#~ "identifier. If no protocol is specified, the default protocol (ftp://) " +#~ "will be used.\n" +#~ "You can also enter complete URLs in the form protocol://user:pass@host:" +#~ "port here, the values in the other fields will be overwritten then.\n" +#~ "\n" +#~ "Supported protocols are:\n" +#~ "- ftp:// for normal FTP with optional encryption\n" +#~ "- sftp:// for SSH file transfer protocol\n" +#~ "- ftps:// for FTP over TLS (implicit)\n" +#~ "- ftpes:// for FTP over TLS (explicit)" +#~ msgstr "" +#~ "Adja meg a kiszolgáló címét.\n" +#~ "A szerver protokoll meghatározásához, a protokollazonosítót adja a cím " +#~ "előtagjának. Ha a protokoll nincs meghatározva, az alapértelmezett az " +#~ "ftp:// lesz.\n" +#~ "Teljes URL címeket is megadhat a következő formátumban: protokoll://" +#~ "felhasználónév:jelszó@cím:port. Ekkor a többi mező értékei felülíródnak.\n" +#~ "\n" +#~ "Támogatott protokollok:\n" +#~ "- ftp:// normál FTP opcionális titkosítással\n" +#~ "- sftp:// SSH file transfer protocol\n" +#~ "- ftps:// FTP TLS felett (implicit)\n" +#~ "- ftpes:// FTP TLS felett (explicit)" + +#~ msgid "" +#~ "Enter the password for the file '%s'.\n" +#~ "Please note that the converted file will not be password protected." +#~ msgstr "" +#~ "Adja meg a jelszót ehhez a kulcsfájlhoz: '%s'.\n" +#~ "Vegye figyelembe, hogy az átkonvertált kulcsfájl nem lesz jelszó által " +#~ "védett." + +#~ msgid "" +#~ "Enter the port on which the server listens.\n" +#~ "The default for FTP is 21, the default for SFTP is 22." +#~ msgstr "" +#~ "Adja meg a kiszolgáló portját.\n" +#~ "FTP esetében az alapértelmezett a 21-es, SFTP esetében a 22-es port." + +#~ msgid "Filename &filters..." +#~ msgstr "Könyvtár listázás szűrése..." + +#~ msgid "" +#~ "Incomplete chain, top certificate is not self-signed certificate " +#~ "authority certificate" +#~ msgstr "" +#~ "Hiányos hitelesítési lánc, a legfelső tanúsítvány nem önaláírt hatósági " +#~ "tanúsítvány" + +#~ msgid "No more files in the queue!" +#~ msgstr "" +#~ "A várólista végrehajtódott, nincs több átviendő fájl a várólistában!" + +#~ msgid "" +#~ "Please enter a path and executable to run.\n" +#~ "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under " +#~ "Unix.\n" +#~ "You can also optionally specify program arguments." +#~ msgstr "" +#~ "Kérem adja meg a futtatni kívánt program elérési útját.\n" +#~ "MS Windows alatt pl. c:\\somePath\\file.exe, vagy Unix alatt /somePath/" +#~ "file.\n" +#~ "Opcionálisan parancssoros argumentumokat is megadhat." + +#~ msgid "Preview:" +#~ msgstr "Előnézet:" + +#~ msgid "R&eboot system" +#~ msgstr "Rendszer újraindítása" + +#~ msgid "S&hutdown system" +#~ msgstr "Rendszer leállítása" + +#~ msgid "S&uspend system" +#~ msgstr "Rendszer alvó állapot" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Fájlok keresése a várólistához történő adáshoz" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Fájlok keresése a feltöltéshez" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "A SetSocketBufferSize az adatcsatorna nélkül hívódott meg" + +#~ msgid "" +#~ "The file '%s' is not in a format supported by FileZilla.\n" +#~ "The file is also password protected. Password protected key files are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into a supported, unprotected format?" +#~ msgstr "" +#~ "A következő fájl formátumát a FileZilla nem támogatja: '%s'.\n" +#~ "A fájl jelszóval védett. A jelszóval védett hitelesítési kulcsokat a " +#~ "FileZilla jelenleg nem támogatja.\n" +#~ "Szeretné a kulcsfájlt átkonvertálni támogatott, de jelszóval nem védett " +#~ "formátumúra?" + +#~ msgid "" +#~ "The file '%s' is password protected. Password protected key files are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into an unprotected file?" +#~ msgstr "" +#~ "A következő fájl jelszóval védett: '%s'. A jelszóval védett kulcsfájlokat " +#~ "a FileZilla jelenleg nem támogatja.\n" +#~ "Szeretné a kulcsfájlt átkonvertálni jelszóval nem védett formátumúra?" + +#~ msgid "U&se system defaults" +#~ msgstr "A rendszer alapértelmezett beállítása" + +#~ msgid "Use system &defaults" +#~ msgstr "A rendszer alapértelmezett beállítása" + +#~ msgid "Waiting" +#~ msgstr "Várakozás" + +#~ msgid "You have to enter a valid IP address." +#~ msgstr "Kérem adjon meg egy érvényes IP címet." + #~ msgid "&Add keyfile..." #~ msgstr "Kulcsfájl hozzáadása..." diff -Nru filezilla-3.15.0.2/locales/hy.po filezilla-3.33.0/locales/hy.po --- filezilla-3.15.0.2/locales/hy.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/hy.po 2017-01-09 16:00:55.000000000 +0000 @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: Հայերեն թարգմանություն\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-13 13:13+0100\n" -"PO-Revision-Date: 2015-12-03 11:27+0400\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-01-06 16:14+0100\n" +"PO-Revision-Date: 2016-12-31 11:36+0400\n" "Last-Translator: Hrant Ohanyan \n" "Language-Team: Hrant Ohanyan \n" "Language: hy\n" @@ -15,18 +15,26 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 1.8.11\n" "X-Poedit-Bookmarks: -1,240,-1,-1,-1,-1,-1,-1,-1,-1\n" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:114 +msgid "" +"\n" +"\n" +msgstr "" +"\n" +"\n" + #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:203 msgid "%H:%M:%S elapsed" msgstr "Անցել է՝ %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:209 msgid "%H:%M:%S left" msgstr "Մնացել է՝ %H:%M:%S" @@ -39,55 +47,50 @@ "%a - Հաշիվ (Սա պարունակող տողերը բաց կթողնվեն, եթե միայն այն չի օգտագործում " "հաշվով մուտք գործելու համար)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d թղթապանակ" msgstr[1] "%d թղթապանակներ" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1419 +#: ../../locales/../src/interface/search.cpp:818 +#: ../../locales/../src/interface/search.cpp:1198 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d թղթապանակ՝ իր բովանդակությամբ" msgstr[1] "%d թղթապանակներ՝ իրենց բովանդակությամբ" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:817 +#: ../../locales/../src/interface/search.cpp:1197 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d ֆայլ" msgstr[1] "%d ֆայլեր" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d ֆայլ։ Ընդհանուր չափը. %s" msgstr[1] "%d ֆայլեր։ Ընդհանուր չափը. %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d ֆայլ։ Ընդհանուր չափը՝ ոչ քիչ քան %s" msgstr[1] "%d ֆայլեր։ Ընդհանուր չափը՝ ոչ քիչ քան %s" -#: ../../locales/../src/interface/QueueView.cpp:2778 -#, c-format -msgid "%d files added to queue" -msgstr "%d ֆայլեր են ավելացվել" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -98,14 +101,14 @@ msgid "%h - Host" msgstr "%h - Հոսթը" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu թղթապանակ" msgstr[1] "%llu թղթապանակ" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -117,22 +120,22 @@ msgid "%p - Password" msgstr "%p - Գաղտնաբառը" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:164 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/վ)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:167 #, c-format msgid "%s (? B/s)" msgstr "%s (Բ/վ)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" -msgstr "%s - Սերտիֆիկատը սխալ է։" +msgstr "%s - Վկայագիրը սպառված է։" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ճիշտ չէ։" @@ -142,24 +145,24 @@ msgid "%s - Proxy user" msgstr "%s - Պրոքսիի օգտվող" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s և %s։ Ընդհանուր չափը. %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s և %s։ Ընդհանուր չափը. %s-ից ոչ քիչ" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s բայթ" msgstr[1] "%s բայթ" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:588 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -172,7 +175,7 @@ "\n" "Կրկին բեռնեք ծրագիրը և տեղակայեք։" -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:673 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -188,7 +191,7 @@ "-Համոզվեք, որ %s-ը գտնվում է այն թղթապանակում, որը նշված է PATH-ում։\n" "-Նշեք %s-ի ամբողջական ուղին՝ FZ_FZSFTP։" -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s %d բիթ" @@ -202,7 +205,7 @@ msgid "%w - Proxy password" msgstr "%w - Պրոքսիի գաղտնաբառը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3678 msgid "&Abort previous connection and connect in current tab" msgstr "&Ընդհատել նախորդ կապակցումը և կապակցել այս պատուհանում" @@ -210,20 +213,20 @@ msgid "&About..." msgstr "&Ծրագրի մասին..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "&Հաշիվ." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:473 msgid "&Active" msgstr "&Ակտիվ" #: ../../locales/../src/interface/resources/xrc/menus.xrc:206 msgid "&Add bookmark..." -msgstr "&Ավելացնել էջանիշներին..." +msgstr "&Ավելացնել էջանիշերում..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:245 #: ../../locales/../src/interface/resources/xrc/menus.xrc:291 @@ -234,12 +237,12 @@ msgid "&Add key file..." msgstr "&Ավելացնել բանալի ֆայլ..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "&Add to queue" msgstr "&Ավելացնել հերթականությանը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:402 msgid "&Adjust server timezone offset:" msgstr "&Կիրառել սպասարկիչի ժամանակավոր գոտու կարգավորումները." @@ -247,19 +250,19 @@ msgid "&Always trust certificate in future sessions." msgstr "&Միշտ կիրառել այս վկայագիրը բոլոր աշխատաշրջանների համար։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:896 msgid "&Always trust this host, add this key to the cache" -msgstr "&Միշտ վստահել այս հոսթին" +msgstr "&Միշտ վստահել այս հոսթին, ավելացնել բանալին շտեմում" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1969 msgid "&Always use default editor" msgstr "&Միշտ օգտագործել ծրագրային խմբագիրը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3015 msgid "&Always use selection for unassociated files" msgstr "&Միշտ օգտագործել չասոցացված ֆայլերի համար" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Միշտ օգտագործել այս գործողությունը" @@ -269,38 +272,42 @@ "&Ստանալ տեղեկություններ արտաքին IP հասցեի մասին՝ համակարգի կարգավորումներում" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Ինքնա" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Autodetect" msgstr "&Ինքնորոշում" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:273 +msgid "&Background color:" +msgstr "&Խորքի գույնը." + #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:604 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Կրկնակի" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1632 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "" "&Կրկնակի մասնիկներ, որոնք օգտագործում են SI նշաններ։ (Օր.՝ 1 ԿԲ = 1024 բայթ)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:204 msgid "&Bookmarks" -msgstr "&Էջանիշներ" +msgstr "&Էջանիշեր" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2311 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2720 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3002 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2156 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:362 msgid "&Browse..." msgstr "&Դիտել..." @@ -308,10 +315,10 @@ msgid "&Burst tolerance:" msgstr "&Հասանելի գերազանցում." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3861 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -325,11 +332,11 @@ msgid "&Close" msgstr "&Փակել" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "&Փակել FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "&Configure speed limits..." msgstr "&Կարգավորել արագության սահմանափակումները..." @@ -337,7 +344,7 @@ msgid "&Configure..." msgstr "&Կարգավորել..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:614 msgid "&Connect" msgstr "&Կապակցել" @@ -345,36 +352,36 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Պատճենել գործող կապակցումները Կայքերի կառավարիչում..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:794 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" -msgstr "&Պատճենել հիշոցում" +msgstr "&Պատճենել" #: ../../locales/../src/interface/resources/xrc/menus.xrc:264 #: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "&Create directory" msgstr "&Ստեղծել թղթապանակ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:630 msgid "&Create new tab" msgstr "&Ստեղծել նոր պատուհան" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "&Վրիպազերծել" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "&Debug information in message log:" msgstr "&Գրառում վրիպազերծումների գրանցումների ֆայլում." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Default editor:" msgstr "&Ծրագրային խմբագիրը." #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "&Ծրագրային գործողություն, եթե ֆայլը գոյություն ունի..." @@ -382,16 +389,16 @@ msgid "&Delay between failed login attempts:" msgstr "&Դադար՝ անհաջող կապակցումների ընթացքում." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1249 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2887 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Ջնջել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3407 msgid "&Delete symlink" msgstr "&Ջնջել նշան-հղումը" @@ -399,39 +406,35 @@ msgid "&Directory comparison" msgstr "&Համեմատել բաժինները" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:963 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Անջատե՞լ համաժամանակեցված դիտումը և շարունակել տեղային թղթապանակի փոփոխումը" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1041 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Անջատել համաժամանակեցված դիտումը և շարունակել հեռակա թղթապանակի փոփոխումը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 msgid "&Discard local file then download and edit file anew" -msgstr "&Մերժել համակարգչի ֆայլը, բեռնել այն և վերականգնել խմբագրումը" +msgstr "&Մերժել համակարգչի ֆայլը, ներբեռնել այն և վերականգնել խմբագրումը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Disconnect" -msgstr "&Անջատել" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Անջատվել սպասարկիչից" +msgstr "&Կապախզում" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Միջին արագության փոխարեն ցուցադրել գործող արագությունը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "&Display size in bytes" msgstr "&Ցուցադրել ֆայլի չափը բայթերով" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3844 msgid "&Do not remember passwords (recommended)" msgstr "&Չհիշել գաղտնաբառերը" @@ -443,24 +446,24 @@ msgid "&Don't use external IP address on local connections." msgstr "Չօգտագործել արտաքին IP հասցե՝ &տեղային կապակցումների ժամանակ։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1826 msgid "&Double-click action on files:" msgstr "&Գործողություն՝ մկնիկի կրկնակի սեղմամբ." #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "&Download" -msgstr "&Բեռնել" +msgstr "&Ներբեռնել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 msgid "&Download to:" -msgstr "&Բեռնել." +msgstr "&Ներբեռնել՝" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:610 msgid "&Download..." msgstr "&Բեռնում..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Բեռնումներ." @@ -470,14 +473,14 @@ msgid "&Edit" msgstr "&Խմբագրել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 msgid "&Edit filter rules..." -msgstr "&Խմբագրել զտման կանոնները..." +msgstr "&Խմբագրել զտելու կանոնները..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:646 msgid "&Enable" msgstr "&Միացնել" @@ -485,12 +488,12 @@ msgid "&Enable compression" msgstr "&Միացնել սեղմումը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3733 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "&Միացնել արագության սահմանափակումները" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:560 msgid "&Encoding:" msgstr "&Կոդավորումը." @@ -498,24 +501,24 @@ msgid "&Encryption:" msgstr "&Կոդավորումը." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "&Պատահական հրաման..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3671 msgid "&Establish connection in a new tab" msgstr "&Կապ հաստատել նոր պատուհանում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Execute" msgstr "&Գործարկել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1585 msgid "&Export Site Manager entries" msgstr "&Արտահանել Կայքերի կառավարիչի գրառումները" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 msgid "&Export..." msgstr "&Արտահանել..." @@ -527,35 +530,47 @@ msgid "&File" msgstr "&Ֆայլ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "&File Attributes..." -msgstr "&Ֆայլի հատկությունները..." +msgstr "&Ֆայլի հատկանիշները..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "&Ֆայլի թույլտվությունները ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2299 msgid "&File:" msgstr "&Ֆայլ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1296 msgid "&Filter conditions:" msgstr "&Զտիչի պայմաններ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1057 msgid "&Filter sets:" msgstr "&Զտիչներ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1660 +msgid "&Filters" +msgstr "&Զտիչներ" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 msgid "&Filters:" msgstr "&Զտիչներ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1773 msgid "&Finish editing and delete local file" msgstr "&Ավարտել խմբագրումը և ջնջել ֆայլը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3332 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Հարթեցրեք տեղային ուղիները, վերբեռնեք բոլոր պարունակող ֆայլերը միանգամից " +"թիրախային թղթապանակում" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3237 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -563,7 +578,7 @@ "&Հարթեցրեք հեռակա ուղիները, ներբեռնեք բոլոր պարունակող ֆայլերը միանգամից " "հիմնական թղթապանակում։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3414 msgid "&Follow symlink, delete target directory contents" msgstr "&Հետևելով հղում-նշանին ջնջել թղթապանակի պարունակությունը" @@ -575,7 +590,7 @@ msgid "&Getting help..." msgstr "&Ստանալ օգնություն..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2651 msgid "&Global bookmark" msgstr "&Ընդհանուր էջանիշ" @@ -588,11 +603,11 @@ msgstr "&Օգնություն" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:550 msgid "&Hide identical files" msgstr "&Թաքցնել նույնանման ֆայլերը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "&Բարձրագույն" @@ -600,17 +615,17 @@ msgid "&Highest available port:" msgstr "&Հասանելի ամենաբարձր պորտը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2446 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:51 msgid "&Host:" -msgstr "&Հոսթը." +msgstr "&Հոսթ՝" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1627 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC կրկնակի մասնիկներ (Օր.՝ 1 Կբիթ = 1024 բայթ)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1513 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (օրինակ՝ 2007-09-15)" @@ -618,15 +633,19 @@ msgid "&Import..." msgstr "&Ներմուծել..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2002 msgid "&Inherit system's filetype associations" msgstr "&Օգտագործել ֆայլերի համակարգային ասոցացումները" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Տեղակայել նոր տարբերակը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3325 +msgid "&Keep local path structure relative to search root" +msgstr "&Թողնել տեղային ուղիների կառուցվածքը՝ հարաբերական որոնման խորքին" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3230 msgid "&Keep remote path structure relative to search root" msgstr "&Թողնել հեռակա ուղիների կառուցվածքը՝ հարաբերական որոնման համար" @@ -642,7 +661,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Սահմանափակել տեղային պորտերի օգտագործումը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "&Limit number of simultaneous connections" msgstr "&Սահմանափակել միաժամանակյա կապակցումները" @@ -650,12 +669,16 @@ msgid "&Local directory tree" msgstr "&Համակարգչի ֆայլերի &ցանկը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2705 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2795 msgid "&Local directory:" msgstr "&Համակարգչային թղթապանակներ." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +msgid "&Local search" +msgstr "&Տեղային որոնում" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "&Log to file" msgstr "&Կատարել գրառում" @@ -663,23 +686,23 @@ msgid "&Logon Type:" msgstr "&Մուտքի եղանակը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2501 msgid "&Logontype:" msgstr "&Մուտքի եղանակը." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "&Ցածր" #: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Manage bookmarks..." -msgstr "&Խմբագրել էջանիշները..." +msgstr "&Խմբագրել էջանիշերը..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Manual transfer..." msgstr "&Ձեռադիր փոխանցում..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:499 msgid "&Maximum number of connections:" msgstr "&Կապուղիների մաքս. քանակը." @@ -695,19 +718,19 @@ msgid "&Minimize to tray" msgstr "&Թաքցնել ներքևում" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "&Name sorting mode:" msgstr "Խմբավորելու &եղանակը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2678 msgid "&Name:" -msgstr "&Անունը." +msgstr "&Անուն՝" #: ../../locales/../src/interface/resources/xrc/menus.xrc:47 msgid "&Network configuration wizard..." msgstr "&Ցանցի կարգավորման Օգնական..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1243 msgid "&New" msgstr "&Նորը" @@ -715,7 +738,7 @@ msgid "&New Site" msgstr "&Նոր կայք" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1671 msgid "&New version available!" msgstr "&Հասանելի է նոր տարբերակը:" @@ -723,27 +746,28 @@ msgid "&Next >" msgstr "&Առաջ »" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1786 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 msgid "&No" msgstr "&Ոչ" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 #: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&Ոչ մի" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&Նորմալ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:501 msgid "&Numeric value:" msgstr "&Համարային նշանակում." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2936 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:622 msgid "&OK" msgstr "&ԼԱՎ" @@ -752,41 +776,41 @@ msgstr "&ԲԱՑԵԼ" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 msgid "&Open" msgstr "&Բացել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Վրագրել" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:480 msgid "&Passive" msgstr "&Պասիվ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" -msgstr "&Գաղտնաբառը." +msgstr "&Գաղտնաբառ՝" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "&Վերարտադրել ձայն" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:64 msgid "&Port:" -msgstr "&Դարպասը." +msgstr "&Պորտ՝" #: ../../locales/../src/interface/resources/xrc/menus.xrc:153 msgid "&Preserve timestamps of transferred files" msgstr "&Պահպանել ֆայլերի ժամանակավոր նշանները" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 msgid "&Queue" msgstr "&Հերթականություն" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:72 msgid "&Quickconnect" msgstr "&Արագ կապակցում" @@ -794,11 +818,11 @@ msgid "&Quickconnect bar" msgstr "&Արագ կապակցման վահանակ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1518 msgid "&Quickconnect history" msgstr "Ջնջել &արագ կապակցման պատմությունը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:403 msgid "&Read" msgstr "&Կարդում է" @@ -806,32 +830,36 @@ msgid "&Reconnect" msgstr "&Կրկնել կապակցումը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1525 msgid "&Reconnect information" msgstr "&Վերակապակցումների տեղեկություն" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:641 msgid "&Refresh" msgstr "&Թարմացնել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:354 msgid "&Remember password until FileZilla is closed" msgstr "FileZilla-ն փակելուց առաջ &հիշել գաղտնաբառը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3838 msgid "&Remember passwords" msgstr "&Հիշել գաղտնաբառերը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2732 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2819 msgid "&Remote directory:" msgstr "&Հեռակա թղթապանակ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2335 msgid "&Remote path:" msgstr "&Հեռակա ուղի." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +msgid "&Remote search" +msgstr "&Հեռակա որոնում" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Ջնջել" @@ -840,25 +868,25 @@ msgid "&Remove key" msgstr "&Ջնջել բանալին" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "&Ջնջել ընտրվածը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2881 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Վերանվանել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1075 msgid "&Rename..." msgstr "&Վերանվանել..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 msgid "&Reopen local file" msgstr "&Կրկին բացել համակարգչային ֆայլը" @@ -870,7 +898,11 @@ msgid "&Report a bug..." msgstr "&Հաղորդել սխալի մասին..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "&Ուշադրության պահանջ" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 msgid "&Reset and requeue all" msgstr "&Վերակայել և վերականգնել ֆայլերը հերթում" @@ -878,11 +910,11 @@ msgid "&Restart Wizard" msgstr "&Վերաբացել Օգնականը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Շարունակել" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "&Կատարել հրաման..." @@ -890,7 +922,7 @@ msgid "&Run configuration wizard now..." msgstr "&Բացել կարգավորումների Օգնականը..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2095 msgid "&Run update check now..." msgstr "&Ստուգել թարմացումները..." @@ -902,11 +934,11 @@ msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 msgid "&Save as..." msgstr "&Պահպանել որպես..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3076 msgid "&Search" msgstr "&Փնտրել" @@ -918,20 +950,20 @@ msgid "&Select Entry:" msgstr "&Ընտրեք գրառումը." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1878 msgid "&Select language:" msgstr "&Ընտրել ծրագրի լեզուն." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2187 msgid "&Select the columns that should be displayed:" msgstr "&Ընտրեք ցուցադրվող սյուները." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" -msgstr "&Սպասարկիչը" +msgstr "&Սպասարկիչ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1648 msgid "&Settings" msgstr "&Կարգավորումներ" @@ -939,23 +971,19 @@ msgid "&Settings..." msgstr "&Կարգավորումներ..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Show debug menu" -msgstr "&Ցուցադրել վրիպազերծման ընտրացանկը" +msgstr "&Ցուցադրել վրիպազերծման ցանկը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 msgid "&Show detailed log" msgstr "&Մանրամասներ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Ցուցադրել հաղորդագրությունը" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "&Show timestamps in message log" msgstr "&Ցուցադրել ֆայլի ստեղծման ժամանակը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1531 msgid "&Site Manager entries" msgstr "&Կայքերի կառավարիչի ցանկը" @@ -963,11 +991,11 @@ msgid "&Site Manager..." msgstr "&Կայքերի կառավարիչ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 msgid "&Site-specific bookmark" msgstr "&Որոշված էջանիշ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Բաց թողնել" @@ -975,7 +1003,8 @@ msgid "&Speed limits" msgstr "&Արագության սահմանափակում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "&Start transfer immediately" msgstr "&Սկսել փոխանցումը" @@ -983,11 +1012,11 @@ msgid "&Swap local and remote panes" msgstr "&Տեղ-տեղ փոխել վահանակները" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 msgid "&TLS Ciphers" msgstr "&TLS չիպերներ" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Թեստ" @@ -999,11 +1028,11 @@ msgid "&Transfer" msgstr "&Փոխանցումներ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 msgid "&Transfer mode:" msgstr "&Փոխանցման եղանակը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "&Փոխանցման հերթականություն" @@ -1012,33 +1041,41 @@ msgid "&Treat dotfiles as ASCII files" msgstr "&ASCII նշաններով ֆայլեր" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1949 msgid "&Unedit" msgstr "&Ետարկել խմբագրումը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1017 msgid "&Update cached key for this host" -msgstr "&Թարմացնել գրանցատեղի բանալին այս հոսթի համար" +msgstr "&Թարմացնել գրանցարանի բանալին այս հոսթի համար" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "&Upload" msgstr "&Վերբեռնել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "&Upload to:" +msgstr "&Վերբեռնել՝" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +msgid "&Upload..." +msgstr "&Վերբեռնել..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Վերբեռնումներ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 msgid "&Use custom program" msgstr "&Օգտագործել ընտրված ծրագիր" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:383 msgid "&Use synchronized browsing" msgstr "&Օգտագործել համաժամանակեցված դիտումը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "&Use system's default editor for text files" msgstr "&Օգտագործել համակարգչային խմբագրիչը տեքստային ֆայլերի համար" @@ -1050,21 +1087,21 @@ msgid "&Use the server's external IP address instead" msgstr "&Օգտագործել սպասարկիչի արտաքին IP հասցեն." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1642 msgid "&Use thousands separator" msgstr "&Օգտագործել բաժանիչ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2513 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Օգտատերը." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "&Username:" -msgstr "&Օգտատերի անունը." +msgstr "&Օգտատերի անուն՝" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 #, c-format msgid "&Version %s" msgstr "&Տարբերակ %s" @@ -1074,46 +1111,46 @@ msgstr "&Տեսք" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:616 msgid "&View/Edit" msgstr "&Դիտել/Խմբագրել" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1979 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "&Հետևել ֆայլերի խմբագրմանը և հուշել փոփոխությունների վերբեռման մասին" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&When checking for updates, check for:" msgstr "&Թարմացումները ստուգելիս ստուգել՝" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Write" msgstr "&Գրել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1780 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 msgid "&Yes" msgstr "&Այո" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' գոյություն չունի կամ անհասանելի է։" -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' թղթապանակ չէ" -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 msgid "'Account' logontype not supported by selected protocol" msgstr "'Հաշիվը' եղանակով մուտք չի աջակցվում։" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:446 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1121,14 +1158,14 @@ "'Նորմալ' և 'Հաշիվը' եղանակները հասանելի չեն: Փոխարենը օգտագործեք 'Հարցնել " "գաղտնաբառը':" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" "'Նորմալ' և 'Հաշիվը' եղանակները հասանելի չեն: Փոխվել է 'Հարցնել գաղտնաբառով':" -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:587 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1138,15 +1175,15 @@ "սպասարկիչ ուղարկելու համար։ Կարող եք գրել raw հրաման՝ առանց օգտագործելու " "համար 'quote'։" -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d առարկա է զտվել)" msgstr[1] "(%d առարկաներ են զտվել)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%%-ը ներբեռնվել է)" @@ -1172,22 +1209,22 @@ msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 - անջատված է)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:90 +#: ../../locales/../src/interface/aboutdialog.cpp:179 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat is set to %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1580 msgid "(example: %H:%M)" msgstr "(օր.՝. %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 msgid "(example: %Y-%m-%d)" msgstr "(օր.՝ %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3752 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3769 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1198,7 +1235,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "--:--:-- left" msgstr "մնացել է՝ --:--:--" @@ -1218,31 +1255,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s հնարավոր չէ օգտագործել FTP-ի հետ։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2255 msgid "0 - None" msgstr "0 - Ոչինչ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2256 msgid "1 - Warning" msgstr "1 - Զգուշացում" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "2 - Info" msgstr "2 - Ինֆո" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2258 msgid "3 - Verbose" msgstr "3 - Մանրամասն" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:103 msgid "32-bit system" msgstr "32 բիթային համակարգ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2259 msgid "4 - Debug" msgstr "4 - Վրիպազերծում" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:101 msgid "64-bit system" msgstr "64 բիթային համակարգ" @@ -1254,18 +1291,22 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "Այս անունով արդեն կա։ Մուտքագրեք այլ անուն։" +#: ../../locales/../src/engine/tlssocket.cpp:1333 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Վկայագիրը շղթայում ստորագրված է ոչ անվտանգ ալգորիթմով" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Նշեք հիմնական խմբագրիչը։" -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:166 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:788 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Այս թղթապանակը չի կարող տեղափոխվել ենթաթղթապնակ։" @@ -1278,20 +1319,20 @@ "Կան սպասարկիչներ, որոնք չեն թույլատրում օգտագործել պասիվ եղանակը, կամ նշված " "չեն համապատասխան կարգավորումներ։ Այս դեպքում անհրաժեշտ կլինի ակտիվ եղանակը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1699 msgid "A file previously opened has been changed." msgstr "Բացված ֆայլը փոփոխվել է։" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "A file with that name is already being transferred." msgstr "Այս անունով ֆայլ արդեն փոխանցվում է։" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "Այս անունով ֆայլ դեռևս խմբագրվում է։ Փակեք այն և կրկին փորձեք։" -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1304,11 +1345,11 @@ "Եթե խնդիրը չլուծվի, ապա հնարավոր է ֆայլերը բացակայեն ցանկից։\n" "Այլևս հաղորդագրություն չի ցուցադրվի։" -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Հասանելի է FileZilla-ի նոր տարբերակը." -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:658 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1323,7 +1364,7 @@ "you need this." msgstr "Սովորաբար սպասարկիչը սա չի պահանջում։" -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:254 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1332,7 +1373,7 @@ "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել թղթապանակի փոփոխությունները։" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1353,19 +1394,19 @@ msgid "A&pply only to uploads" msgstr "Կ&իրառել միայն վերբեռնումներին" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:535 msgid "A&pply to all files and directories" msgstr "Կ&իրառել բոլոր ֆայլերին թղթապանակներին" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "A&utomatically remove successful transfers" msgstr "Ջնջ&ել հաջողված բեռնումները" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2590 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:576 msgid "About FileZilla" msgstr "FileZilla-ի մասին" @@ -1373,31 +1414,35 @@ msgid "Above the file lists" msgstr "Ֆայլերի ցանկից վեր" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:113 +msgid "Access to some local directories could not be restored:" +msgstr "Մուտքը որոշ տեղային թղթապանակների հնարավոր չէ վերականգնել." + +#: ../../locales/../src/engine/server.cpp:912 +#: ../../locales/../src/engine/server.cpp:933 #: ../../locales/../src/interface/manual_transfer.cpp:154 #: ../../locales/../src/interface/manual_transfer.cpp:155 #: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/manual_transfer.cpp:547 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1329 msgid "Account" msgstr "Հաշիվ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "Գործողություն՝ հերթականությունը կատարելուց &հետո" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1942 msgid "Action on selected file:" msgstr "Գործողություն ընտրված ֆայլի հետ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1822 msgid "Action to perform:" msgstr "Կատարել գործողություն." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Գործողություն." @@ -1405,7 +1450,7 @@ msgid "Active mode" msgstr "Ակտիվ եղանակ" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1413,7 +1458,7 @@ "FTP-ի ակտիվ եղանակի թեստը անհաջող էր։ FileZilla-ն չգիտի արտաքին ճիշտ IP " "հասցեն։" -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1421,7 +1466,7 @@ "FTP-ի ակտիվ եղանակի թեստը անհաջող էր։ FileZilla-ն չգիտի արտաքին ճիշտ IP " "հասցեն։ Բացի դա փոփոխվել է ուղարկված հասցեն։" -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1435,12 +1480,13 @@ msgid "Active mode IP" msgstr "IP հասցեն՝ ակտիվ եղանակի համար" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3350 msgid "Add files to &queue only" msgstr "Ֆայլերն ավելացնել միայն &հերթականությանը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "Add selected directory to the transfer queue" msgstr "Ավելացնել ընտրված թղթապանակները հերթականությանը" @@ -1449,20 +1495,20 @@ msgid "Add selected files and folders to the transfer queue" msgstr "Ավելացնել ընտրված թղթապանակները և ֆայլերը հերթականությանը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1854 msgid "Add to queue" msgstr "Ավելացնել հերթականությանը" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Address type not supported" msgstr "Հասցեի տեսակը չի աջակցվում" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:308 msgid "Advanced" msgstr "Լրացուցիչ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2086 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1475,15 +1521,16 @@ "նախատեսված են փորձարկման համար: FileZilla-ի nightly build-երը հնարավոր է " "նորմալ չաշխատեն և անգամ վնասեն ձեր համակարգը: Այնպես որ զգույշ եղեք:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3688 msgid "Al&ways perform this action" msgstr "Միշ&տ օգտագործել այս գործողությունը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2067 msgid "Algorithm:" msgstr "Ալգորիթմը." -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2577 msgid "All files have been successfully transferred" msgstr "Բոլոր ֆայլերը հաջողությամբ փոխանցվել են" @@ -1491,7 +1538,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Բոլոր պորտերը պետք է գտնվեն 1024-ի և 65535-ի միջև։" -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2573 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1506,11 +1553,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Թույլ տալ վերադառնալ այլ եղանակի՝ ձախողման դեպքում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3648 msgid "Already connected" msgstr "Արդեն կապակցված է" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Այլընտրանքային անուն." @@ -1532,13 +1579,13 @@ "Որպես այլընտրանք կարելի է օգտագործել համակարգային SSH-ը։ Դրա համար համոզվեք, " "որ ընտրված է SSH_AUTH_SOCK նշանակությունը։" -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "Նաև կարող եք ներբեռնել FileZilla-ի նոր տարբերակը ծրագրի կայքից." -#: ../../locales/../src/interface/QueueView.cpp:1908 +#: ../../locales/../src/interface/QueueView.cpp:1615 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1547,7 +1594,7 @@ "Սխալ՝ փոխանցման հերթականությունը \"%s\"-ից բեռնելիս։\n" "Հնարավոր է որոշ ֆայլեր չեն վերականգնվել։" -#: ../../locales/../src/interface/QueueView.cpp:1818 +#: ../../locales/../src/interface/QueueView.cpp:1513 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1556,61 +1603,65 @@ "Սխալ՝ փոխանցման հերթականությունը \"%s\"-ում պահպանելիս։\n" "Հնարավոր է որոշ ֆայլեր չեն պահպանվել։" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket.cpp:1336 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Վկայագրի շղթայում այն թողարկողը վկայագրի հեղինակը չէ" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2081 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Այս անունով ֆայլ արդեն կա։" -#: ../../locales/../src/engine/server.cpp:885 +#: ../../locales/../src/engine/server.cpp:935 #: ../../locales/../src/interface/manual_transfer.cpp:153 #: ../../locales/../src/interface/manual_transfer.cpp:191 #: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/interface/manual_transfer.cpp:545 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1327 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1624 msgid "Anonymous" msgstr "Անանուն" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1017 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Իրականացվում է հեռակա գործողություն, այժմ հնարավոր չէ փոխել թղթապանակը։" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:807 msgid "Any changes made in the Site Manager could not be saved." msgstr "Կայքերի կառավարչի փոփոխությունները չեն պահպանվի։" -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:955 msgid "Any changes made to the filters could not be saved." msgstr "Զտիչների որևէ փոփոխություն չի պահպանվի։" -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:863 msgid "Any changes made to the filters will not be saved." msgstr "Զտիչների որևէ փոփոխություն չի պահպանվի։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:549 msgid "App&ly to directories only" msgstr "Կիրա&ռել միայն թղթապանակներին" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1202 msgid "Apply" msgstr "Կիրառել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Կիրառել միայն &այս հերթականությանը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:542 msgid "Apply to &files only" msgstr "Կիրառել միայն &ֆայլերին" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Արխիվ" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Argument buffer overflow" msgstr "Փաստարկի պահոցը գերազանցվել է" @@ -1618,16 +1669,16 @@ msgid "As tab in the transfer queue pane" msgstr "Պատուհանի տեսքով հերթականության փեղկում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1442 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Հարցնել գործողության մասին" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/engine/server.cpp:906 +#: ../../locales/../src/engine/server.cpp:927 #: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Գաղտնաբառի հարցում" @@ -1640,7 +1691,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Հարցում օպերացիոն համակարգում արտաքին IP հասցեի մասին" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3549 msgid "Asking questions in the FileZilla forums" msgstr "Հարցեր տալ FileZilla-ի Ֆորումում" @@ -1648,7 +1699,7 @@ msgid "Associated program not found:" msgstr "Չի գտնվել ասոցացված ծրագիր." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Առնվազն մեկ զտիչ ավարտված չէ" @@ -1656,11 +1707,11 @@ msgid "At this point, all required information has been gathered." msgstr "Պահանջվող տեղեկատվությունը հավաքված է։" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Հատկանիշ" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:617 msgid "Authentication failed." msgstr "Իսկորոշումը ձախողվեց։" @@ -1668,7 +1719,7 @@ msgid "Author:" msgstr "Հեղինակը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 msgid "Auto" msgstr "Ինքնա" @@ -1676,41 +1727,37 @@ msgid "Automatic file type classification" msgstr "Ֆայլերի տեսակների սիստեմավորում" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Հասանելի չափերը" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B <Նշան բայթերի համար։ Թարգմանել միայն առաջին տառը>" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:334 msgid "B&ypass proxy" msgstr "Շ&րջանցել պրոքսին" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1027 msgid "Bad file descriptor" msgstr "Ֆայլի վատբնութագրիչ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3586 msgid "Basic usage instructions" msgstr "Օգտագործման հիմնական ցուցումներ" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 msgid "Behaviour" -msgstr "Դրությունը" +msgstr "Պահելաձևը" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1126 +#: ../../locales/../src/interface/edithandler.cpp:1154 msgid "Being edited" msgstr "Խմբագրվում է" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket.cpp:1327 msgid "Beware! Certificate has been revoked" -msgstr "Ուշադրություն. Սերտիֆիկատը մերժվել է" +msgstr "Ուշադրություն. Վկայագիրը մերժվել է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 msgid "Binary" msgstr "Կրկնակի" @@ -1718,33 +1765,37 @@ msgid "Blackboard" msgstr "Գրատախտակ" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "Կապույտ" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:300 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:381 msgid "Bookmark" msgstr "Էջանիշ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2858 msgid "Bookmark:" msgstr "Էջանիշ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2847 msgid "Bookmarks" -msgstr "Էջանիշներ" +msgstr "Էջանիշեր" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 msgid "Browse..." msgstr "Ընտրել..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:660 msgid "Build date:" -msgstr "Թողարկման ամսաթիվը." +msgstr "Թողարկման ամսաթիվը՝" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:637 msgid "Build information" msgstr "Տարբերակի մասին" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Business category:" msgstr "Գործնեության տեսակը." @@ -1762,93 +1813,100 @@ msgid "C&ancel current operation" msgstr "Չ&եղարկել այս գործողությունը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "Ջ&նջել բոլորը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "C&opy URL(s) to clipboard" msgstr "&Պատճենել հիշապահեստում" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:625 +msgid "C&opy URL(s) with password to clipboard" +msgstr "Պ&ատճենել URL(ները) գաղտնաբառերով հիշապահեստ" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1518 msgid "C&ustom" msgstr "Պ&ատահական" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2007 msgid "C&ustom filetype associations:" msgstr "Ֆ&այլերի ընտրովի ասոցացումներ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:764 msgid "CPU features:" -msgstr "CPU-ի հատկություններ." +msgstr "CPU-ի յուրահատկություններ՝" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1657 msgid "Calculating timezone offset of server..." msgstr "Ժամային գոտիների միջև տարբերության հաշվում..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/transfersocket.cpp:688 msgid "Can't read from file" msgstr "Հնարավոր չէ՝ կարդալ ֆայլի տվյալները" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:666 +#: ../../locales/../src/engine/transfersocket.cpp:741 msgid "Can't write data to file." msgstr "Հնարավոր չէ գրել տվյալներ ֆայլում։" -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/transfersocket.cpp:669 +#: ../../locales/../src/engine/transfersocket.cpp:744 #, c-format msgid "Can't write data to file: %s" msgstr "Հնարավոր չէ գրել տվյալներ %s ֆայլում" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1680 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1854 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2942 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3437 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3923 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:629 msgid "Cancel" msgstr "Չեղարկել" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Չեղարկել ընթացիկ գործողությունը" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Չեղարկել ընթացիկ գործողությունը" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "Մուտք չկա '%s'-ին։" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Cannot add server to Site Manager" msgstr "Հնարավոր չէ ավելացնել սպասարկիչը Կայքերի կառավարիչում" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Cannot assign requested address" msgstr "Հնարավոր չէ կցել պահանջվող հասցեն" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1856,7 +1914,7 @@ "Հնարավոր չէ փակել պատուհանը, քանի դեռ այն զբաղված է։\n" "Կանգնեցնե՞լ գործողությունը և փակել պատուհանը։" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1868,104 +1926,99 @@ msgid "Cannot create new filter" msgstr "Հնարավոր չէ ստեղծել նոր զտիչ" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1634 +#: ../../locales/../src/interface/LocalListView.cpp:1741 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Cannot edit file" msgstr "Հնարավոր չէ խմբագրել ֆայլը" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1622 msgid "Cannot edit file, not connected to any server." msgstr "Հնարավոր չէ խմբագրել ֆայլը։ Չկա կապ սպասարկիչի հետ։" -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Cannot edit file, remote path unknown." msgstr "Հնարավոր չէ խմբագրել ֆայլը, ուղին հայտնի չէ։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:370 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "Հնարավոր չէ հաստատել FTP կապակցում՝ SFTP սպասարկիչի համար։" -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Հնարավոր չէ բացել Արագ կապակցման վահանակը ռեսուրսների ֆայլից" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Cannot load key file" msgstr "Հնարավոր չէ բեռնել բանալի ֆայլը" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1008 msgid "Cannot load toolbar from resource file" msgstr "Հնարավոր չէ բացել գործիքաշերտը ռեսուրսների ֆայլից" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:450 msgid "Cannot remember password" msgstr "Հնարավոր չէ հիշել գաղտնաբառը" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216 msgid "Cannot rename entry" msgstr "Հնարավոր չէ վերանվանել" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Cannot rename file" msgstr "Հնարավոր չէ վերանվանել ֆայլը" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:137 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Հնարավոր չեղավ ուղղել հոսթի անունը IPv4 հասցեների համար՝ SOCKS4 պրոքսիով:" -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "Cannot save filterset" msgstr "Հնարավոր չէ պահպանել զտիչները" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Cannot select filter" msgstr "Հնարավոր չէ ընտրել զտիչ" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1484 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "Cannot set file association" msgstr "Հնարավոր չէ ասոցացնել ֆայլը" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Cannot show dialog" msgstr "Հնարավոր չէ ցուցադրել երկխոսության պատուհանը" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "Cannot view/edit selected file" msgstr "Հնարավոր չէ դիտել/խմբագրել ընտրված ֆայլը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1762 msgid "Case insensitive" msgstr "Ոչ դուրճազգայուն" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1761 msgid "Case insensitive (default)" msgstr "Ոչ դուրճազգայուն (ծրագրային)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1763 msgid "Case sensitive" msgstr "Դուրճազգայուն" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1764 msgid "Case sensitive (default)" msgstr "Դուրճազգայուն (ծրագրային)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 msgid "Categories to clear" msgstr "Ինչն է մաքրելու" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Certificate and session data are not available yet." -msgstr "Սերտիֆիկատը և տեղեկությունը աշխատաշրջանի մասին հասանելի չեն։" +msgstr "Վկայագիրը և տեղեկությունը աշխատաշրջանի մասին հասանելի չեն։" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 msgid "Certificate in chain:" @@ -1973,31 +2026,35 @@ #: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" -msgstr "Սերտիֆիկատը տրվել է" +msgstr "Վկայագիրի թողարկող" + +#: ../../locales/../src/engine/tlssocket.cpp:1330 +msgid "Certificate signature verification failed" +msgstr "Վկայագրի ստորագրության ստուգման ձախողում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Փորձ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:384 msgid "Change file attributes" msgstr "Փոխել ֆայլի հատկանիշը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:530 msgid "Change the file permissions." msgstr "Փոխել ֆայլի լիազորությունները։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2206 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Փոփոխությունը ուժի մեջ մտնելու համար պահանջվում է FileZilla-ի վերամեկնարկում։" -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "Character encoding issue" msgstr "Նշաների կոդավորման սխալ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:522 msgid "Charset" msgstr "Կոդավորումը" @@ -2005,7 +2062,7 @@ msgid "Check for &updates..." msgstr "Ստուգել &թարմացումները..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2053 msgid "Check for FileZilla &updates automatically:" msgstr "Ինքնավար ստուգել FileZilla-ի &թարմացումները." @@ -2017,55 +2074,55 @@ msgid "Check for newer versions of FileZilla" msgstr "Ստուգել FileZilla-ի նոր տարբերակի առկայությունը" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Check for updates failed" msgstr "Հնարավոր չեղավ ստուգել թարմացումները" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:828 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "Ստուգել մուտքի տվյալները: Մուտքագրված գաղտնաբառի վերջում կա բացատ:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:824 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." msgstr "Ստուգել մուտքի տվյալները: Մուտքագրված օգտվողի անվան վերջում կա բացատ:" -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "Checking for correct external IP address" msgstr "Ստուգվում է ճիշտ արտաքին IP հասցեն" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Ստուգվում է թարմացումների առկայությունը..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:754 #, c-format msgid "Checksum match on file %s\n" msgstr "Հանրագումարը համապատասխանում է՝ %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:750 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Հանրագումարը անհամապատասխան է՝ %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1525 msgid "Choose a key file" msgstr "Ընտրել բանալի ֆայը" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1556 msgid "Choose the default local directory" msgstr "Ընտրել համակարգչային հիմնական թղթապանակը" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2319 msgid "Choose the local directory" msgstr "Ընտրել թղթապանակ համակարգչում" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 msgid "Chunk data improperly terminated" msgstr "Որոշ տվյալներ ճիշտ չեն ջնջվել" @@ -2074,7 +2131,7 @@ msgstr "Նիշը." #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:634 msgid "Cl&ose tab" msgstr "Փակ&ել պատուհանը" @@ -2082,46 +2139,50 @@ msgid "Classic" msgstr "Դասական" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" -msgstr "Ջնջել &հիշոցը" +msgstr "Մաքրել &դասավորության շտեմը" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 +msgid "Clear auto&update data" +msgstr "Մաքրել ինքնա&թարմացման տվյալները" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/quickconnectbar.cpp:200 msgid "Clear history" msgstr "Ջնջել պատմությունը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1499 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Ջնջել անձնական տվյալները" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:199 msgid "Clear quickconnect bar" msgstr "Մաքրել արագ կապակցումները" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Սեղմեք 'Ավարտել'՝ կազմաձևումը պահպանելու համար։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2113 msgid "Client to server MAC:" msgstr "MAC-ի սպասրկիչ ծրագիր." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2103 msgid "Client to server cipher:" msgstr "Սպասարկիչ ծրագրի շիֆրը." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:637 msgid "Close &all other tabs" msgstr "Փակել &բոլոր այլ պատուհանները" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1144 +#: ../../locales/../src/interface/Mainfrm.cpp:1165 msgid "Close FileZilla" msgstr "Փակել FileZilla-ն" @@ -2133,66 +2194,65 @@ msgid "Closes current tab" msgstr "Փակել այս պատուհանը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:289 msgid "Co&mments:" msgstr "Մեկ&նաբանություններ." -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Սյան հատկությունները" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2172 msgid "Column setup" msgstr "Սյան կարգավորում" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1951 msgid "Command and its arguments should be properly quoted." msgstr "Հրամանը պետք է լինի չակերտներում։" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Command failed" msgstr "Հրամանի ձախողում" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Command not supported" msgstr "Հրամանը չի աջակցվում" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:227 msgid "Command not supported by this protocol" msgstr "Հրամանը չի աջակցվում" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Command:" msgstr "Հրամանը." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "Մեկնաբանություններ." -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Common name:" -msgstr "Ընդհանուր անունը." +msgstr "Ընդհանուր անուն՝" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Կապը ընդհատվել է router-ի կամ firewall-ի կողմից" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:545 msgid "Compare &modification time" msgstr "Համեմատել &փոփոխման ժամանակը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 msgid "Compare file&size" msgstr "Համեմատել ֆայլերի &չափը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1795 msgid "Comparison &threshold (in minutes):" msgstr "Համեմատման &ժամանակային դադար (րոպե)." @@ -2200,23 +2260,23 @@ msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Համեմատման &ժամանակային դադարը պետք է լինի 0-ի և 1440րոպեի միջև։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:644 msgid "Compiled for:" msgstr "Մշակված՝" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:652 msgid "Compiled on:" msgstr "Հենքը՝" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Compiled with:" -msgstr "Մշակված է ըստ." +msgstr "Կազմարկված է ըստ՝" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:676 msgid "Compiler flags:" -msgstr "Մշակման նիշերը." +msgstr "Կազմարկիչի դրոշակներ՝" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Սեղմված է" @@ -2224,10 +2284,10 @@ msgid "Concurrent transfers" msgstr "Զուգահեռ փոխանցումներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3142 msgid "Conditions are c&ase sensitive" -msgstr "Զգայուն է &գրանցատեղի նկատմամբ" +msgstr "Զգայուն է &գրանցարանի նկատմամբ" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" @@ -2239,37 +2299,37 @@ #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 msgid "Configure port range" -msgstr "Դարպասների կազմաձևում" +msgstr "Պորտերի ընդգրկույթի կազմաձևում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3592 msgid "Configuring FileZilla and your network" msgstr "Կարգավորել FileZilla-ն և Ձեր ցանցը" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1202 msgid "Confirm deletion" msgstr "Հաստատեք ջնջումը" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1598 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/RemoteListView.cpp:1423 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1051 +#: ../../locales/../src/interface/search.cpp:1158 msgid "Confirmation needed" msgstr "Պահանջվում է հաստատում" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Շնորհավորում ենք, Ձեր կազմաձևումը աշխատում է։" -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:198 msgid "Connect bypassing proxy settings" msgstr "Կապակցել՝ շրջանցելով պրոքսին" -#: ../../locales/../src/interface/netconfwizard.cpp:216 -#, fuzzy, c-format +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format msgid "Connect failed: %s" -msgstr "Պրոքսիի հարցման սխալ. %s" +msgstr "Կապակցումը ձախողվեց՝ %s" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" @@ -2283,29 +2343,25 @@ msgid "Connect to specified Site Manager site" msgstr "Կապակցել կայքին՝ Կայքերի կառավարիչից" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 -msgid "Connected" -msgstr "Կապակցված է" - -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "Կապակցում" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:246 #, c-format msgid "Connecting to %s" msgstr "Կապակցվում է %s-ին" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4333 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Կապակցվում է %s-ին՝ %s պրոքսիով" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:966 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:274 #, c-format msgid "Connecting to %s..." msgstr "Կապակցում է %s-ին..." @@ -2314,186 +2370,213 @@ msgid "Connection" msgstr "Կապակցում" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Connection aborted" msgstr "Կապակցումը անջատվել է" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "Հնարավոր չէ կապակցել" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:930 +#: ../../locales/../src/engine/proxy.cpp:210 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Հնարավոր չէ կապակցել \"%s\"-ին, փորձվում է այլ հասցե։" -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:935 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Հնարավոր չէ կապակցել \"%s\"-ին։" -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/engineprivate.cpp:700 msgid "Connection attempt interrupted by user" msgstr "Կապակցումը ընդհատվել է օգտատերի կողմից" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "Connection attempt timed out" msgstr "Գերազանցվել է սպասելու ժամանակը" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Կապակցումը անջատվել է" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1026 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:228 msgid "Connection closed by server" msgstr "Կապակցումը անջատվել է սպասարկիչի կողմից" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:272 msgid "Connection established, initializing TLS..." msgstr "Կապը հաստատված է, որոշվում է TLS-ն..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:297 msgid "Connection established, sending HTTP request" msgstr "Կապը հաստատված է, HTTP հարցում" -#: ../../locales/../src/interface/netconfwizard.cpp:333 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." -msgstr "Կապը հաստատված է, սպասվում է հրավեր..." +msgstr "Կապակցումը հաստատված է, սպասում է ողջյունի հաղորդագրությանը;" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:444 msgid "Connection established, waiting for welcome message..." msgstr "Կապը հաստատված է, սպասվում է հրավեր..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Կապը ընդհատվել է" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Connection not allowed by ruleset" msgstr "Կապը չի համապատասխանում կանոններին" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "Connection refused" msgstr "Կապը մերժված է" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1028 msgid "Connection refused by server" msgstr "Կապակցումը անջատվել է սպասարկիչի կողմից" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Connection reset by network" msgstr "Կապակցումը անջատվել է սպասարկիչի կողմից" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Connection reset by peer" msgstr "Կապակցումը անջատվել է սպասարկիչի կողմից" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:567 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Կապակցման ժամանակի լրացում %d վայրկյան պասիվությունից հետո" msgstr[1] "Կապակցման ժամանակի լրացում %d վայրկյան պասիվությունից հետո" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "Գերազանցվել է սպասելու ժամանակը։" -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:672 msgid "Connection to server lost." msgstr "Սպասարկիչի հետ կապը կորցվել է։" -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "Պրոքսի կապակցումը կատարված է, հաստատվում է ձեռքսեղմում..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Կապակցումը սպասարկիչին անջատվել է ժամանակավրեպ։" -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Հնարավոր չեղավ կապակցել թեստային սպասարկիչի հետ։" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Փոխարկել բանալի ֆայլը" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1895 #, c-format msgid "Copy (%d) of %s" msgstr "Պատճենվում է (%d)-ը %s-ից" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1875 #, c-format msgid "Copy of %s" msgstr "Պատճենել %s-ից" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Պատճենել ընտրված միույթների URL-ները, այդ թվում՝ գաղտնաբառերը:" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 msgid "Copy the URLs of the selected items to clipboard." msgstr "Պատճենել ընտրված գրառման URL-ները գզրոց։" -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/transfersocket.cpp:182 #, c-format msgid "Could not accept connection: %s" msgstr "Հնարավոր չէ կապակցել. %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:101 +#, c-format +msgid "Could not access path %s" +msgstr "Հնարավոր չէ մատչել %s ուղուն" + +#: ../../locales/../src/engine/tlssocket.cpp:1310 +msgid "Could not add certificate to temporary trust list" +msgstr "Հնարավոր չէ ավելացնել վկայագիրը ժամանակավոր վստահված ցանկում" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Հնարավոր չէ ավելացնել Կայքերի կառավարիչում" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:802 msgid "Could not complete operation" msgstr "Հնարավոր չէ ավարտել գործողությունը" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:181 msgid "Could not connect to server" msgstr "Հնարավոր չէ կապակցել սպասարկիչին" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Հնարավոր չէ կապակցել սպասարկիչին. %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:734 msgid "Could not convert command to server encoding" msgstr "Հնարավոր չեղավ փոխարկել հրամանը սպասարկիչի կոդավորման" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Հնարավոր չէ փոխակերպել գաղտնի բանալին" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2545 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1393 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not copy URLs" msgstr "Հնարավոր չէ պատճենել հասցեները" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket.cpp:1292 +msgid "Could not copy certificate" +msgstr "Հնարավոր չէ պատճենել վկայագիրը" + +#: ../../locales/../src/interface/aboutdialog.cpp:203 msgid "Could not copy data" msgstr "Հնարավոր չէ պատճենել տվյալները" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:158 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Հնարավոր չէ ստեղծել CFURL %s-ից" + +#: ../../locales/../src/interface/updater.cpp:489 #, c-format msgid "Could not create local file %s\n" msgstr "Հնարավոր չէ ստեղծել տեղային ֆայլ՝ %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Հնարավոր չէ ստեղծել մուտքային ֆայլ՝ %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Հնարավոր չէ ստեղծել անվտանգության էջանիշ URL-ից." + +#: ../../locales/../src/interface/RemoteListView.cpp:2211 +#: ../../locales/../src/interface/RemoteTreeView.cpp:848 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2502,11 +2585,11 @@ "Հնարավոր չէ որոշել Drag&Drop-ի գործողությունը։\n" "Կամ կան տեղակայման սխալներ կամ Դուք չեք վերցրել ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4187 msgid "Could not establish connection to server" msgstr "Հնարավոր չէ կապակցել սպասարկիչին" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:418 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2517,54 +2600,51 @@ "Տեղավորեք FileZilla-ի ծրագրային գրադարանը՝ օգտագործելով հրաման. '--datadir " "<ուղին>'։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:722 msgid "Could not generate custom login sequence." msgstr "Հնարավոր չէ ստեղծել պատահական մուտքային հղում։" -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/engine/tlssocket.cpp:1075 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" "Հնարավոր չէ ստանալ վկայագիրի անունը, սխալ gnutls_x509_get_issuer_dn-ում" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket.cpp:1051 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "Հնարավոր չէ ստանալ վկայագիրի անունը, սխալ gnutls_x509_get_dn-ում" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1002 msgid "Could not get full remote path." msgstr "Հնարավոր չէ ստանալ ամբողջական ուղին։" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:95 +msgid "Could not get native path from CFURL" +msgstr "Հնարավոր չէ ստանալ սեփական ուղին CFURL-ից" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:173 +msgid "Could not get path from URL" +msgstr "Հնարավոր չէ ստանալ ուղին URL-ից։" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Could not get reply from fzputtygen." msgstr "Հնարավոր չէ ստանալ պատասխան fzputtygen-ից։" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Could not get temporary directory to download file into." msgstr "Բացակայում է ժամանակավոր ֆայլերի թղթապանակը։" -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "Հնարավոր չէ բացել վկայագրերը, սխալ gnutls_x509_crt_import" - -#: ../../locales/../src/interface/FileZilla.cpp:108 -#, fuzzy, c-format +#: ../../locales/../src/interface/FileZilla.cpp:92 +#, c-format msgid "Could not initialize Winsock (%d): %s" -msgstr "Հնարավոր չէ գրանցել տվյալները. %s" - -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "Հնարավոր չէ բացել վկայագրերը, սխալ gnutls_x509_crt_init-ում" +msgstr "Հնարավոր չէ նախապատրաստել Winsock (%d)-ը՝ %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2574,15 +2654,21 @@ "Հնարավոր չէ բացել \"%s\", ստուգեք ֆայլի հասանելիությունը։\n" "Կայքերի կառավարիչում կատարված փոփոխությունները չեն պահպանվի։" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Հնարավոր չեղավ բեռնել բանալի ֆայլը" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Հնարավոր չէ բացել գաղտնի բանալին" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1025 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2592,7 +2678,7 @@ "Չկա մուտք համակարգչային թղթապանակին, որը համապատասխանում է հեռակա '%s'-ին։\n" "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել հեռակա թղթապանակի փոփոխումը։" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:371 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2602,7 +2688,7 @@ "Չկա մուտք համակարգչային թղթապանակին, որը համապատասխանում է հեռակա '%s'-ին։\n" "Համաժամանակեցված դիտումը անջատվել է։" -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:264 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2612,74 +2698,83 @@ "Չկա մուտք հեռակա թղթապանակին, որը համապատասխանում է համակարգչային '%s'-ին։\n" "Համաժամանակեցված դիտումը անջատվել է։" -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/aboutdialog.cpp:203 +#: ../../locales/../src/interface/RemoteListView.cpp:2545 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1393 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not open clipboard" msgstr "Հնարավոր չէ օգտագործել հիշապահեստը" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Հնարավոր չէ բացել %s ֆայլը" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Հնարավոր չէ որոշել հեռակա ուղին։" -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:118 msgid "Could not parse server address:" msgstr "Հնարավոր չեղավ որոշել սպասարկիչի հասցեները." -#: ../../locales/../src/interface/netconfwizard.cpp:977 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:994 msgid "Could not read from data socket." -msgstr "Հնարավոր չէ ստանալ տվյալներ բնիկից. %s" +msgstr "Հնարավոր չէ ստանալ տվյալներ բնիկից:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 #, c-format msgid "Could not read from socket: %s" msgstr "Հնարավոր չէ ստանալ տվյալներ բնիկից. %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:553 msgid "Could not read server item." msgstr "Հնարավոր չեղավ կարդալ սպասարկիչի տվյալները։" -#: ../../locales/../src/interface/netconfwizard.cpp:344 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." -msgstr "Հնարավոր չէ կապակցել սպասարկիչին" +msgstr "Հնարավոր չէ ստանալ տվյալը սպասարկիչից:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:116 +msgid "Could not restore directory access" +msgstr "Հնարավոր չեղավ վերականգնել մատչումը թղթապանակին" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2694 #, c-format msgid "Could not seek to offset %s within file" msgstr "Հնարավոր չէ գտնել դիրքը %s ֆայլում" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2603 msgid "Could not seek to the end of the file" msgstr "Հնարավոր չէ գտնել ֆայլի վերջը" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Հնարավոր չէ հրաման ուղարկել fzputtygen-ին։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/engine/tlssocket.cpp:1261 +msgid "Could not sort peer certificates" +msgstr "Հնարավոր չէ տեսակավորել peer-ի վկայագրերը" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2724 msgid "Could not spawn IO thread" msgstr "Հնարավոր չէ օգտագործել I/O գործողությունը!" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Հնարավոր չէ հաստատել պրոքսի կապակցում. %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "Հնարավոր չէ սկսել փոխանցումը" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:630 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:828 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2688,17 +2783,17 @@ "Հնարավոր չէ գրել \"%s\",Կայքերի կառավարիչում կատարված փոփոխությունները չեն " "պահպանվել. %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Հնարավոր չէ գրել \"%s\", էջանիշը չի ավելացվել. %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Հնարավոր չէ գրել \"%s\", ընդհանուր էջանիշը չի պահպանվել. %s" -#: ../../locales/../src/interface/QueueView.cpp:1847 +#: ../../locales/../src/interface/QueueView.cpp:1542 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2707,40 +2802,40 @@ "Հնարավոր չէ գրել \"%s\", հերթականությունը չի պահպանվել։\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:750 +#: ../../locales/../src/interface/sitemanager.cpp:807 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2297 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Հնարավոր չէ գրել \"%s\", հնարավոր չէ արտահանել ընտրված ֆայլերը. %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:149 #, c-format msgid "Could not write \"%s\":" msgstr "Հնարավոր չէ գրել \"%s\"." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Հնարավոր չեղավ գրել բանալու ֆայլը. %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "Հնարավոր չէ գրել համակարգչային ֆայլում" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Հնարավոր չէ գրառել %s-ում" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:890 +#: ../../locales/../src/engine/ControlSocket.cpp:994 #, c-format msgid "Could not write to socket: %s" msgstr "Հնարավոր չէ գրանցել տվյալները. %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Country:" msgstr "Երկիրը." @@ -2748,25 +2843,25 @@ msgid "Crea&te new file" msgstr "Ստեղ&ծել նոր ֆայլ" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1040 msgid "Create &missing local directory and enter it" msgstr "Ստեղծել &թղթապանակ և մուտք գործել" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:962 msgid "Create &missing remote directory and enter it" msgstr "Ստեղծել &թղթապանակ և մուտք գործել" #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:573 msgid "Create a new subdirectory in the current directory" msgstr "Ստեղծել թղթապանակ" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:509 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Ստեղծել նոր ենթաթղթապանակ տվյալ թղթապանակում" @@ -2776,50 +2871,50 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:268 #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Create director&y and enter it" msgstr "Ստեղծել թղթապանա&կ և մուտք գործել" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1233 msgid "Create directory" msgstr "Ստեղծել թղթապանակ" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2631 msgid "Create empty file" msgstr "Ստեղծել դատարկ ֆայլ" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "Ստեղծվում է թղթապանակ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3217 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1844 #, c-format msgid "Creating directory '%s'..." msgstr "Ստեղծվում է '%s' թղթապանակը..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:173 msgid "Critical error" msgstr "Կրիտիկական սխալ" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:164 msgid "Critical error:" msgstr "Կրիտիկական սխալ." -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:124 msgid "Critical file transfer error" msgstr "Կրիտիկական սխալ՝ ֆայլի փոխանցման ժամանակ" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:104 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Կրիտիկական սխալ՝ %s-ի փոխանցման ժամանակ %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2828,59 +2923,63 @@ "'%s' հեռակա թղթապանակը գտնվում է ավելի հետ հիմնականցի (%s)։\n" "Համաժամանակեցված դիտումը անջատված է։" -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:400 msgid "Current transfer type is set to ASCII." msgstr "Ընտրված է փոխանցման ASCII եղանակը։" -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:408 msgid "Current transfer type is set to automatic detection." msgstr "Ընտրված է փոխանցման եղանակի ինքնորոշման ֆունկցիան։" -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:404 msgid "Current transfer type is set to binary." msgstr "Ընտրված է binary եղանակը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2031 msgid "Curve:" msgstr "Կոր" #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1567 msgid "Cus&tom" msgstr "Պատահա&կան" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:92 msgid "Custom filter set" msgstr "Զտիչների որոշված տեսակ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2439 msgid "Custom server" msgstr "Ընտրված սպասարկիչ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "Երկնագույն" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2559 msgid "D&ata type" msgstr "Ֆ&այլերի տեսակը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1637 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "SI նշաններ (օր.՝, 1 ԿԲ = 1000 բայթ)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:466 msgid "D&efault" msgstr "Ըս&տ ծրագրայինի" #: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:619 msgid "D&elete" msgstr "Ջ&նջել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2755 msgid "D&irectory comparison" msgstr "Թ&ղթապանակների համեմատություն" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1111 msgid "D&isable all" msgstr "Ա&րգելել բոլորը" @@ -2888,43 +2987,43 @@ msgid "D&o not save passwords" msgstr "Նշեք գաղտնաբառը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "D&ouble-click action on directories:" msgstr "Գ&ործողություն մկնիկի կրկնակի սեղմամբ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1261 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2893 msgid "D&uplicate" msgstr "Կ&րկնօրինակել" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:40 msgid "DOS-like with virtual paths" msgstr "DOS-ի տեսքով՝ վիրտուալ ուղի" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "Dangerous filetype" msgstr "Ֆայլերի վտանգավոր տեսակներ" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "Տվյալներ" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." msgstr "Տվյալների բնիկը շուտ է փակվել։" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Ամսաթիվը." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 msgid "Date formatting" -msgstr "Ամսաթվի ձևը" +msgstr "Ամսաթվի ձևաչափում" #: ../../locales/../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" -msgstr "Ամսաթվի/Ժամանակի ձևը" +msgstr "Ամսաթվի/Ժամանակի ձևաչափը" #: ../../locales/../src/interface/fileexistsdlg.cpp:49 msgid "Date/time unknown" @@ -2934,15 +3033,15 @@ msgid "Debug" msgstr "Վրիպազերծում" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 msgid "Debugging settings" msgstr "Վրիպազերծման կարգավորումներ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default &local directory:" msgstr "Համակարգչային հիմնական &թղթապանակը." -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:32 msgid "Default (Autodetect)" msgstr "Ըստ ծրագրայինի (Ինքնորոշում)" @@ -2950,24 +3049,24 @@ msgid "Default editor not properly quoted." msgstr "Ծրագրային խմբագիրը սխալ է ընտրված։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1461 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "Եթե ֆայլը կար ծրագրային գործողությունը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:371 msgid "Default r&emote directory:" msgstr "Հ&եռակա հիմնական թղթապանակ." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1100 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." msgstr "" "Հնարավոր չէ որոշել հեռակա ծրագրային ուղին։ Համոզվեք, որ այն ճիշտ է նշված։" -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Համակարգային լեզուն" @@ -2989,7 +3088,7 @@ "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "Դադարը կապակցումների միջև պետք է լինի 1-ից 999 վայր." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:541 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3000,12 +3099,12 @@ msgstr[0] "Սպասում է կապակցման %d վայրկյան՝ անհաջող կապակցումից հետո..." msgstr[1] "Սպասում է միացման %d վայրկյանից անհաջող միացումից հետո..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1249 msgid "Delete Site Manager entry" msgstr "Ջնջել Կայքերի կառավարիչից" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:582 msgid "Delete selected directory" msgstr "Ջնջել ընտրված թղթապանակը" @@ -3014,61 +3113,61 @@ msgid "Delete selected files and directories" msgstr "Ջնջել ընտրված ֆայլերը և թղթապանակները" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:380 #, c-format msgid "Deleting \"%s\"" msgstr "\"%s\"-ը ջնջվում է" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:383 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "%u ֆայլերի ջնջում \"%s\"-ից" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Deleting symbolic link" msgstr "Նշանային հղման ջնջում" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:968 msgid "Desktop" msgstr "Desktop" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 msgid "Details" msgstr "Մանրամասն" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Details for new key:" msgstr "Նոր բանալու մանրամասները." -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 msgid "Detected newer version of FileZilla" msgstr "Հասանելի է FileZilla-ի նոր տարբերակ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1348 msgid "Dire&ctories" msgstr "Թղթա&պանակներ" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Direction" -msgstr "Դեպի՝" +msgstr "Ուղղությունը" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "Թղթապանակ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2834 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1781 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:390 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2220 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "Directory comparison" msgstr "Թղթապանակների համեմատում" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Հնարավոր չեղավ համեմատել թղթապանակները" @@ -3076,123 +3175,123 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "log ֆայլերով թղթապանակ գոյություն չունի կամ ուղին սխալ է։" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +msgid "Directory listing &filters..." +msgstr "Թղթապանակների ցանկի &զտիչներ..." + +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Directory listing aborted by user" msgstr "Թղթապանակների ցանկի կառուցումը ընդհատվել է օգտատերի կողմից" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2047 msgid "Directory listing failed" msgstr "Հնարավոր չեղավ կառուցել թղթապանակների ցանկը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "Directory listing filters" msgstr "Թղթապանակների ցանկի կառուցման զտիչներ" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:196 #, c-format msgid "Directory listing of \"%s\" successful" -msgstr "\"%s\"-ի թղթապանակների կազմը ստացվեց" +msgstr "\"%s\"-ի թղթապանակների ցուցակը ստացվեց" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Directory listing successful" -msgstr "Թղթապանակների կազմը ստացվեց" +msgstr "Թղթապանակների ցուցակը ստացվեց" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1146 msgid "Disa&ble all" msgstr "Արգել&ել բոլորը" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1033 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել հեռակա թղթապանակի փոփոխումը։" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:660 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "Անջատեք այս ընտրանքը, եթե թղթապանակի բովանդակությունը սխալ կդիտվի։" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" -msgstr "Անջատվում է սպասարկիչից" +msgstr "Կապախզում սպասարկիչից" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:64 +#: ../../locales/../src/engine/ControlSocket.cpp:891 +#: ../../locales/../src/engine/ControlSocket.cpp:996 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:859 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" -msgstr "Անջատում սպասարկիչից" +msgstr "Կապախզում սպասարկիչից" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1028 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:874 #, c-format msgid "Disconnected from server: %s" -msgstr "Անջատված է սպասարկիչից. %s" +msgstr "Կապախված է սպասարկիչից. %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:240 msgid "Disconnecting from previous server" -msgstr "Անջատվում է նախորդ սպասարկիչից" +msgstr "Կապախզվում է նախորդ սպասարկիչից" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" -msgstr "Անջատվում է ընթացիկ սպասարկիչից" +msgstr "Կապախզվում է ընթացիկ սպասարկիչից" #: ../../locales/../src/interface/resources/xrc/menus.xrc:234 msgid "Display about dialog" msgstr "Ցուցադրել 'Ծրագրի մասին' պատուհանը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Do ¬ use default editor" msgstr "Չօ&գտագործել ծրագրային խմբագիրը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Ոչինչ &չանել" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1896 msgid "Do the same with &all selected files already being edited" msgstr "Նույն կատարել &բոլոր ընտրված ֆայլերի համար, որոնք խմբագրվում են" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1169 msgid "Do you really want to close FileZilla?" msgstr "Փակե՞լ FileZilla-ն։" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Ջնջե՞լ բոլոր կարգավորումները և փոխանցման հերթականությունը Կայքերի " "կառավարիչից։" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Ջնջե՞լ բոլոր կարգավորումները Կայքերի կառավարիչից։" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1251 msgid "Do you really want to delete selected entry?" msgstr "Ջնջե՞լ ընտրված գրառումը։" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Ջնջե՞լ ընտրված փոխանցման հերթականությունը։" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:588 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Փոխանցե՞լ '%s'-ը սպասարկիչի վրա։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1889 msgid "Do you want to reopen this file?" msgstr "Կրկի՞ն բացել այս ֆայլը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 msgid "Documentation" msgstr "Թղթաբանություն" @@ -3206,43 +3305,43 @@ msgstr "" "Ֆայլերը կետերով, դա այն է, որ ֆայլի անունը սկսվում է կետով, օր.՝ .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1819 msgid "Double-click action" msgstr "Մկնիկի կրկնակի սեղմում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 msgid "Download" -msgstr "Բեռնել" +msgstr "Ներբեռնել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3741 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Ներբեռնելու &սահմանափակում." -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:592 #, c-format msgid "Download limit: %s/s" msgstr "Ներբեռնելու սահմանափակում. %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:595 msgid "Download limit: none" msgstr "Ներբեռնելու սահմանափակումներ. չկան" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 +#: ../../locales/../src/interface/search.cpp:868 +#: ../../locales/../src/interface/search.cpp:873 msgid "Download search results" -msgstr "Բեռնել փնտրման արդյունքը" +msgstr "Ներբեռնել որոնման արդյունքը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "Download selected directory" -msgstr "Բեռնել ընտրված թղթապանակը" +msgstr "Ներբեռնել ընտրված թղթապանակը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:288 msgid "Download selected files and directories" -msgstr "Բեռնել ընտրված ֆայլերը և թղթապանակները" +msgstr "Ներբեռնել ընտրված ֆայլերը և թղթապանակները" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:980 #, c-format msgid "" "Download speed: %s/s\n" @@ -3251,34 +3350,34 @@ "Բեռնելու արագ-ը. %s/վ\n" "Վերբեռնելու արագ-ը. %s/վ" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1111 msgid "Downloading" msgstr "Բեռնվում է" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:315 #, c-format msgid "Downloading %s" msgstr "Բեռնվում է %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Թարմացումների ներբեռնում..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:88 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:114 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:109 +#: ../../locales/../src/interface/RemoteTreeView.cpp:94 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "Drag&drop հնարավորությունը FileZilla-ի օրինակների միջև անհասանելի է։" -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:101 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:118 +#: ../../locales/../src/interface/LocalTreeView.cpp:120 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:100 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Drag&drop-ը տարբեր սպասարկիչների միջև անհասանելի է։" @@ -3286,7 +3385,7 @@ msgid "Dupl&icate" msgstr "Կ&րկնօրինակել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1104 msgid "E&nable all" msgstr "Թ&ույլատրել բոլորը" @@ -3295,7 +3394,7 @@ msgid "E&nter directory" msgstr "&Բացել թղթապանակը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "E&xecute" msgstr "Կ&իրառել" @@ -3303,21 +3402,21 @@ msgid "E&xit" msgstr "Փակ&ել" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 msgid "E&xport..." msgstr "Ա&րտահանել..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "E-Mail:" msgstr "E-Mail-ը." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Յուրաքանչյուր զտիչ պետք է ունենա գոնե մեկ պայման։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 msgid "Edit filters" msgstr "Խմբագրել տիչները" @@ -3326,16 +3425,16 @@ "Edit the file with the configured editor and upload changes to the server." msgstr "Խմբագրել ընտրված ֆայլը և վերբեռնել սպասարկիչ։" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing directories is not supported" msgstr "Գրացուցակների խմբագրումը չի աջակցվում" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Editing failed" msgstr "Հնարավոր չէ խմբագրել" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing search results" msgstr "Որոնման արդյունքների խմբագրում" @@ -3343,7 +3442,7 @@ msgid "Email:" msgstr "Email-ը." -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "Empty command" msgstr "Դատարկ հրաման" @@ -3351,7 +3450,7 @@ msgid "Empty command." msgstr "Դատարկ հրաման։" -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2049 msgid "Empty directory listing" msgstr "Թղթապանակներ չկան" @@ -3359,23 +3458,17 @@ msgid "Empty directory." msgstr "Դատարկ թղթապանակ" -#: ../../locales/../src/interface/recursive_operation.cpp:377 -#: ../../locales/../src/interface/recursive_operation.cpp:412 -#, fuzzy -msgid "Empty dirs to visit" -msgstr "Թղթապանակներ չկան" - #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Ֆայլի ընդլայնումը հայտնի չէ։" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Նշեք զտիչի անունը։" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Դատարկ անուն" @@ -3383,7 +3476,7 @@ msgid "Empty quoted string." msgstr "Դատարկ տող։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1139 msgid "En&able all" msgstr "Մի&ացնել բոլորը" @@ -3391,19 +3484,19 @@ msgid "Enable invalid character &filtering" msgstr "Թույլատրել սխալ նշանների &զտումը" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Կոդավորված" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 msgid "Encryption" msgstr "Կոդավորումը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 msgid "Encryption details" msgstr "Կոդավորման տվյալները" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "Ավարտել համեմատումը և փոփոխել դասավորման կարգը։" @@ -3411,37 +3504,37 @@ msgid "Enter &custom command..." msgstr "Գրել &հրաման..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3782 msgid "Enter 0 for unlimited speed." msgstr "Մուտքագրեք 0՝ սահմանափակումները անջատելու համար։" -#: ../../locales/../src/interface/QueueView.cpp:2109 +#: ../../locales/../src/interface/QueueView.cpp:1825 msgid "Enter command" msgstr "Մուտքագրեք հրաման" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Մուտքագրեք հրաման" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1852 msgid "Enter directory" msgstr "Մուտք թղթապանակին" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Մուտքագրեք զտիչի անունը" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Enter name for filterset" msgstr "Մուտքագրեք զտիչների անունը" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:274 msgid "Enter new name for filterset" msgstr "Զտիչների նոր անուն" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Մուտքագրեք գաղտնաբառը" @@ -3450,14 +3543,13 @@ msgid "Enter selected directory" msgstr "Բացել թղթապանակը" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:53 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3465,19 +3557,18 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Մուտքագրեք սպասարկիչի հասցեն:\n" -"Որոշելու համար սպասարկիչի արձանագրությունը՝ հոսթը ավելացրեք արձանագրության " -"որոշիչով: Եթե արձանագրությունը նշված չէ՝ կօգտագործվի ծրագրայինը (ftp://):\n" -"Այստեղ կարող եք նաև նշել ամբողջական URL-ներ՝ protocol://user:pass@host:port, " -"մյուս դաշտերի նշանակումները հետո կվերագրվեն:\n" +"Մուտքագրեք սպասարկիչի հասցեն: Որոշելու համար սպասարկիչի հաղորդակարգը՝ հոսթը " +"ավելացրեք հաղորդակարգի որոշիչով: Եթե հաղորդակարգը նշված չէ՝ կօգտագործվի " +"ծրագրայինը (ftp://): Այստեղ կարող եք նաև նշել ամբողջական URL-ներ՝ protocol://" +"user:pass@host:port, մյուս դաշտերի նշանակումները հետո կվերագրվեն:\n" "\n" -"Աջակցվում են հետևյալները՝\n" +"Աջակցվում են հետևյալ հաղորդակարգերը՝\n" "ftp:// նորմալ FTP՝ լրացուցիչ գաղտնագրումով,\n" "sftp:// SSH փոխանցումների համար,\n" "ftps:// FTP՝ TLS-ի միջոցով (ենթադրելի) և\n" "ftpes:// FTP՝ TLS-ի միջոցով (բացահայտ)." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3486,96 +3577,101 @@ "Մուտքագրեք գաղտնաբառ '%s' ֆայլի համար։\n" "Փոխարկված ֆայլը պաշտպանված կլինի նույն գաղտնաբառով։" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Մուտքագրեք սպասարկիչի պորտի համարը։\n" -"Ըստ ծրագրայինի՝ FTP-ն դա 21 է, SFTP-ի համար 22 է։" +"Մուտքագրեք սպասարկիչի պորտի համարը։ Ըստ ծրագրայինի՝ FTP-ի համար 21-ն է, SFTP-" +"ի համար՝ 22-ը։" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:73 +msgid "Enter username" +msgstr "Մուտքագրեք օգտվողի անունը" + +#: ../../locales/../src/interface/loginmanager.cpp:80 msgid "Enter username and password" msgstr "Մուտքագրեք օգտատերի անունը և գաղտնաբառը" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Սխալ՝ կարգավորումները արտահանելիս" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Սխալ՝ ներմուծման" -#: ../../locales/../src/interface/QueueView.cpp:1909 +#: ../../locales/../src/interface/QueueView.cpp:1616 msgid "Error loading queue" msgstr "Հերթականությունը բեռնելու սխալ" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1830 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:864 +#: ../../locales/../src/interface/filter.cpp:956 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:246 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:64 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:128 +#: ../../locales/../src/interface/QueueView.cpp:1525 +#: ../../locales/../src/interface/search.cpp:1262 +#: ../../locales/../src/interface/search.cpp:1281 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:522 +#: ../../locales/../src/interface/sitemanager.cpp:582 +#: ../../locales/../src/interface/sitemanager.cpp:686 +#: ../../locales/../src/interface/sitemanager.cpp:774 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "Սխալ՝ xml ֆայլը բացելիս" -#: ../../locales/../src/interface/QueueView.cpp:1819 +#: ../../locales/../src/interface/QueueView.cpp:1514 msgid "Error saving queue" msgstr "Հերթականությունը պահպանելու սխալ" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "Error starting program" msgstr "Սխալ՝ ծրագիրը բացելիս" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1848 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1543 +#: ../../locales/../src/interface/sitemanager.cpp:631 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2298 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 msgid "Error writing xml file" msgstr "Սխալ՝ xml ֆայլում գրելիս" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:342 msgid "Error:" msgstr "Սխալ." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2024 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Օրինակ՝ png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1674 msgid "Examples" msgstr "Օրինակներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Exe&cute" msgstr "Գործա&րկել" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Executable contains no version info, cannot check for updates." msgstr "Չկա տարբերակի մասին տեղեկությունը։ Հնարավոր չէ ստուգել թարմացումները։" @@ -3583,40 +3679,43 @@ msgid "Explorer" msgstr "Ուղեցույց" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1601 +msgid "Export &Filters" +msgstr "Արտահանել &զտիչները" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 msgid "Export &Queue" msgstr "Արտահանել &հերթականությունը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1591 msgid "Export &Settings" msgstr "Կարգավորումների &արտածում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1572 msgid "Export settings" msgstr "Կարգավորումների արտածում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1280 msgid "F&ilter name:" -msgstr "Զ&տիչի անունը." +msgstr "Զ&տիչի անուն՝" #: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:504 msgid "FTP - File Transfer Protocol" msgstr "FTP - Ֆայլերի փոխանցման արձանագրություն" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Ֆայլերի փոխանցման արձանագրություն՝ լրացուցիչ կոդավորմամբ" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Ֆայլերի փոխանցման արձանագրությունը վստահելի չէ" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FTP Engine not initialized, can't connect" msgstr "FTP-ի հենքը որոշված չէ, հնարավոր չէ կապակցել" @@ -3641,189 +3740,193 @@ "FTP-ն փոխանցման համար օգտագործում է երկրորդական կապուղիներ։ Այս կապումները " "կարող են իրականացվել երկու ուղիով։" -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP՝ բացահայտ TLS-ի միջոցով" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP՝ ենթադրելի TLS-ի միջոցով" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:540 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:914 +#: ../../locales/../src/interface/LocalListView.cpp:1825 +#: ../../locales/../src/interface/LocalTreeView.cpp:857 +#: ../../locales/../src/interface/LocalTreeView.cpp:1132 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Հնարավոր չէ փոխել թղթապանակը" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:142 +#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:159 msgid "Failed to change language" msgstr "Հնարավոր չէ փոխել լեզուն" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 +msgid "Failed to convert command to 8 bit charset" +msgstr "Հնարավոր չեղավ փոխարկել հրամանը 8 բիթ գրանշանի" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2081 msgid "Failed to copy or move sites" msgstr "Հնարավոր չէ պատճենել կամ տեղափոխել կայքերը" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:328 msgid "Failed to create backup copy of xml file" msgstr "Հնարավոր չէ ստեղծել xml ֆայլի պահեստային օրինակը" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:808 +#, fuzzy +msgid "Failed to create listen socket, aborting." msgstr "Հնարավոր չէ ստեղծել պորտի լսիչ, ընդհատում է" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4167 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4171 msgid "Failed to create listening socket for active mode transfer" msgstr "Հնարավոր չէ ստեղծել բնիկի լսիչ՝ փոխանցման ակտիվ եղանակի համար" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/LocalTreeView.cpp:633 msgid "Failed to get 'My Documents' path" msgstr "'My Documents'-ի ուղին հասանելի չէ" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get desktop path" msgstr "'Desktop '-ի ուղին հասանելի չէ" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "Հնարավոր չեղավ ստանալ peer հասցեն։ Կապը անջատվեց։" -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Հնարավոր չեղավ ստանալ peer հասցեն՝ տվյալների փոխանցման համար։ Կապը անջատվեց։" -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "Հնարավոր չէ որոշել FTP-ի մղիչը!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:798 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:279 msgid "Failed to initialize TLS." msgstr "Հնարավոր չէ որոշել TLS-ի մղիչը!" -#: ../../locales/../src/interface/FileZilla.cpp:109 -#, fuzzy +#: ../../locales/../src/interface/FileZilla.cpp:93 msgid "Failed to initialize networking" -msgstr "Հնարավոր չէ որոշել FTP-ի մղիչը!" +msgstr "Հնարավոր չեղավ նախապատրաստել ցանցը" #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Հնարավոր չէ բացել վահանակները։" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Հնարավոր չէ բացել գաղտնի բանալին. %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Հնարավոր չէ բացել \"%s\" ավելացնելու/գրելու համար" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2657 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Հնարավոր չէ բացել \"%s\" կարդալու համար։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2625 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:997 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Հնարավոր չէ բացել \"%s\" գրելու համար։" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:352 msgid "Failed to parse returned path." msgstr "Հնարավոր չէ որոշել վերադարձված ուղին։" -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "Հնարավոր չէ ստանալ տվյալները։" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:189 msgid "Failed to retrieve directory listing" msgstr "Հնարավոր չեղավ որոշել թղթապանակների ցանկը" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +#, fuzzy +msgid "Failed to retrieve external ip address, aborting." msgstr "Հնարավոր չեղավ որոշել արտաքին IP հասցեն, գործողությունը մերժվել է" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3849 msgid "Failed to retrieve external ip address, using local address" msgstr "Հնարավոր չեղավ որոշել արտաքին IP հասցեն, օգտագործվում է տեղային հասցե" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 +#: ../../locales/../src/interface/netconfwizard.cpp:712 +#, fuzzy +msgid "Failed to retrieve local ip address, aborting." +msgstr "Հնարավոր չեղավ որոշել տեղային IP հասցեն։ Մերժվում է" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868 msgid "Failed to retrieve local ip address." msgstr "Հնարավոր չեղավ որոշել տեղային IP հասցեն։" -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Հնարավոր չեղավ որոշել տեղային IP հասցեն։ Մերժվում է" - -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Հնարավոր չեղավ որոշել արտաքին IP հասցեն։" -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Հնարավոր չէ ուղարկել հրաման։" -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:157 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "Հնարավոր չէ անցնել %s (%s) լեզվին, օգտագործվում է ծրագրային լեզուն" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:135 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" "Հնարավոր չէ անցնել %s (%s) լեզվին, օգտագործվում է ծրագրային լեզուն (%s, %s)։" -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:124 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "Հնարավոր չէ անցնել %s (%s) լեզվին, օգտագործվում է ծրագրային լեզուն։" -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:159 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Հնարավոր չէ անցնել %s լեզվին, օգտագործվում է ծրագրային լեզուն" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:131 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Հնարավոր չէ անցնել %s լեզվին, օգտագործվում է ծրագրային լեզուն (%s, %s)։" -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:121 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Հնարավոր չէ անցնել %s լեզվին, օգտագործվում է ծրագրային լեզուն։" -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:214 msgid "Failed to validate settings" msgstr "Կարգավորումները ճիշտ չեն" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket.cpp:1320 msgid "Failed to verify peer certificate" msgstr "Հնարավոր չէ ստուգել վկայագիրը" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:508 #, c-format msgid "Failed to write to file %s" msgstr "Հնարավոր չէ գրել %s ֆայլում" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:341 msgid "Failed to write xml file" msgstr "Հնարավոր չէ գրել xml ֆայլում" @@ -3835,15 +3938,15 @@ msgid "Fall back to active mode" msgstr "Վերադարձ ակտիվ եղանակաին" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2347 msgid "Fil&e:" msgstr "Ֆայ&լ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1343 msgid "Fil&es" msgstr "Ֆայ&լեր" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "Ֆայլ" @@ -3851,11 +3954,11 @@ msgid "File Types" msgstr "Ֆայլերի տեսակները" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "File descriptor not a socket" msgstr "Ֆայլի բնութագրիչը բնիկ չէ" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Ֆայլում չկան տվյալներ, որոնք հնարավոր լինի ներմուծել։" @@ -3863,7 +3966,7 @@ msgid "File editing" msgstr "Խմբագրել ֆայլը" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1630 msgid "File exists" msgstr "Ֆայլը գոյություն ունի" @@ -3871,7 +3974,7 @@ msgid "File exists action" msgstr "Գործողություն ,եթե ֆայլը գոյություն ունի" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1694 msgid "File has changed" msgstr "Ֆայլը փոխվել է" @@ -3879,63 +3982,65 @@ msgid "File lists" msgstr "Ֆայլերի ցանկը" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/interface/edithandler.cpp:1562 +#: ../../locales/../src/interface/FileZilla.cpp:589 +#: ../../locales/../src/interface/FileZilla.cpp:674 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Ֆայլը չի գտնվել" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3185 +#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/search.cpp:692 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Փնտրել ֆայլ" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:113 msgid "File transfer aborted by user" msgstr "Ֆայլի փոխանցումը դադարեցվել է Ձեր կողմից" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:101 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Ֆայլի փոխանցումը դադարեցվել է, փոխանցվել է %s %s-ում" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer failed" msgstr "Ֆայլի փոխանցումը ձախողվեց" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:107 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Ֆայլի փոխանցումը դադարեցվել է, փոխանցվել է %s %s-ում" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:120 msgid "File transfer skipped" msgstr "Ֆայլի փոխանցումը բաց է թողնվել" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:117 msgid "File transfer successful" msgstr "Ֆայլը հաջողությամբ է փոխանցվել" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:98 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Ֆայլը հաջողությամբ է փոխանցվել, փոխանցվել է %s %s-ում" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1146 msgid "File transfers still in progress." msgstr "Ֆայլը փոխանցվում է։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2578 msgid "File would transfer with ASCII data type." msgstr "Ֆայլը փոխանցվելու է ASCII տիպի տվյալներով։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 msgid "File would transfer with binary data type." msgstr "Ֆայլը փոխանցվելու է binary տիպի տվյալներով։" -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:419 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FileZilla Error" msgstr "FileZilla-ի սխալ" @@ -3943,19 +4048,17 @@ msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." -msgstr "" -"FileZilla-ն կարող է փորձարկել կազմաձևման ձևը՝ համոզվելու համար, որ դրանք " -"ճիշտ են։" +msgstr "FileZilla-ն կարող է փորձարկել կազմաձևը՝ համոզվելու, որ այն ճիշտ է։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "FileZilla is already connected to a server." msgstr "FileZilla-ն արդեն կապակցված է սպասարկիչին։" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "Վերամեկնարկեք FileZilla-ն՝ լեզուն փոխելու համար։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2112 msgid "FileZilla updates" msgstr "FileZilla-ի թարմացումները" @@ -3963,75 +4066,71 @@ msgid "Filelist status &bars" msgstr "Դրության &տողը" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:286 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "Ֆայլի անունը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Զտիչներ՝ &ֆայլի անունով..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3017 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2088 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Հնարավոր չէ նշել %s թղթապանակի %s ֆայլի անունը" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Filename invalid" msgstr "Ֆայլի անունը սխալ է" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "Filename unchanged" msgstr "Ֆայլի անունը չի փոխվել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1711 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2144 msgid "Filename:" -msgstr "Ֆայլի անունը." +msgstr "Ֆայլի անուն՝" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Ֆայլի անվան մեջ չպետք է լինեն այս նշանները. / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "Ֆայլի անվան մեջ չպետք է լինեն այս նշանները. / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2002 msgid "Files currently being edited" msgstr "Խմբագրվող ֆայլեր" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:156 msgid "Filesize" msgstr "Չափը" #: ../../locales/../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" -msgstr "Ֆայլի չափի ձևը" +msgstr "Ֆայլի չափի ձևաչափը" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:157 msgid "Filetype" msgstr "Ֆայլի տեսակը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2036 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Համակցումներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1336 msgid "Filter applies to:" msgstr "Կիրառել զտիչ՝" @@ -4040,44 +4139,48 @@ msgstr "Ֆայլի անունում զտիչի սխալ նշաններ" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Այս անունով արդեն կա" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1303 msgid "Filter out items matching all of the following" msgstr "Բաղադրիչներ, որոնք համապատասխանում են բոլոր հետևյալներին" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1304 msgid "Filter out items matching any of the following" msgstr "Բաղադրիչներ, որոնք համապատասխանում են բոլոր հետևյալներին" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1305 msgid "Filter out items matching none of the following" msgstr "Բաղադրիչներ, որոնք չեն համապատասխանում բոլոր հետևյալներին" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1306 +msgid "Filter out items matching not all of the following" +msgstr "Չզտված միույթներ, որոնք ոչ բոլորին են համապատասխանում" + +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Filter set already exists" msgstr "Այս զտիչը արդեն գոյություն ունի" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Թղթապանակների ցանկի զտիչ" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Հնարավոր չէ ստուգել զտիչը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 msgid "Find &files" msgstr "Գտնել &ֆայլեր" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 msgid "Find d&irectories" msgstr "Գտնել թ&ղթապանակներ" @@ -4089,12 +4192,14 @@ msgid "Fingerprint (SHA-256):" msgstr "Հաշվեգումար (SHA-256)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2077 +#, fuzzy +msgid "Fingerprints:" msgstr "Հաշվեգումարը." -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Արգելապատնեշ ծրագրի կազմաձևման ծրագիր" @@ -4111,7 +4216,7 @@ msgstr "" "Ապահովության համար պորտերի միջև տարբերությունը պետք է լինի ոչ պակաս քան 10։" -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:245 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4119,7 +4224,7 @@ "Այս աշխատաշրջանում օգտագործվելու են ծրագրային կարգավորումները։ " "Կարգավորումների փոփոխությունները չեն պահպանվի։" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 msgid "Force &UTF-8" msgstr "UTF-8՝ &ստիպողաբար" @@ -4127,7 +4232,7 @@ msgid "Force showing &hidden files" msgstr "Ցուցադրել &թաքնված ֆայլերը" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:655 msgid "Force showing hidden files" msgstr "Ցուցադրել թաքնված ֆայլերը" @@ -4135,17 +4240,22 @@ msgid "Format specifications:" msgstr "Ձևի դասակարգում." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2019 msgid "Format: Extension followed by properly quoted command and arguments." -msgstr "Ձևը. ընդլայնումը \"հրաման\" հատկանիշներ։" +msgstr "Ձևաչափ. ընդլայնումը \"հրաման\" հատկանիշներ։" #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:686 #, c-format msgid "Found new %s %s\n" msgstr "Գտնվել է նոր %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:49 +#, c-format +msgid "Function %s failed" +msgstr "%s գործառույթը ձախողվեց" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "Further documentation" msgstr "Մանրամասն թղթաբանություն" @@ -4153,7 +4263,7 @@ msgid "General" msgstr "Ընդհանուր" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:476 msgid "General SOCKS server failure" msgstr "SOCKS սպասարկիչի ձախողում" @@ -4166,124 +4276,130 @@ msgid "Get external IP address from the following URL:" msgstr "Ստանալ արտաքին IP հասցեն հետևյալ URL-ից։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 msgid "Getting help" msgstr "Օգնություն" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Այս անունով զտիչներ կան։ Փոխարինե՞լ։" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" -msgstr "Ընդհանուր էջանիշներ" +msgstr "Ընդհանուր էջանիշեր" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket.cpp:319 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS սխալ %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket.cpp:322 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS սխալ %d %s-ում" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket.cpp:314 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS սխալ %d՝ %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket.cpp:311 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS սխալ %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:707 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "Կանաչ" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:430 msgid "Group permissions" msgstr "Խմբի լիազորությունները" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "Բ&արձր" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP TLS-ի միջոցով" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2041 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Թաքնված" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/queue.cpp:888 +#: ../../locales/../src/interface/queue.cpp:944 msgid "High" msgstr "Բարձր" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Highest" msgstr "Բարձրագույն" #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." -msgstr "Դարպասի ամենամեծ նշանակումը պետք է լինի 1024-ի 65535-ի միջև։" +msgstr "Պորտի ամենամեծ նշանակումը պետք է լինի 1024-ի 65535-ի միջև։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1162 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Սեղմած պահեք SHIFT-ը՝ միաժամանակ երկու կողմի համար զտիչը միացնելու համար։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:612 msgid "Homepage:" -msgstr "Վեբ կայքը." +msgstr "Վեբ կայքը՝" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Host is down" msgstr "Հոսթը հանգչել է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Հոսթի բանալու հանրագումարը." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:925 msgid "Host key mismatch" msgstr "Հոսթի բանալին չի համընկնում" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:156 msgid "Host starts with '[' but no closing bracket found." msgstr "Հոսթը սկսվում է '['-ով, բայց չկա փակագիծը վերջում։" -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:485 msgid "Host unreachable" msgstr "Հոսթը հասանելի չէ" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:970 msgid "Host:" msgstr "Հոսթ." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:980 +#, fuzzy +msgid "Hostkey algorithm:" +msgstr "Բանալու ալգորիթմը." + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:424 msgid "Hours," msgstr "Ժամ," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1562 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (Օր.՝ 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:116 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 հասցեները չեն աջակցում SOCKS4 պրոքսի" @@ -4296,7 +4412,7 @@ "Եթե գործողության ընթացքում տվյալները չփոխանցվեն այս ժամանակում, ապա կապը " "կընդհատվի և FileZilla-ն կփորձի կրկնել կապակցումը։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2276 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "Սխալների մասին հաղորդելու համար ընտրեք \"Մանրամասն\" ցանկում։" @@ -4318,13 +4434,13 @@ "Եթե կարգավորումը ընտրված է, ապա Դուք կկարողանաք կապակցել չկարգավորված " "սպասարկիչների, որոնք մերժում են փոխանցման ընտրված եղանակը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:958 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "Եթե բանալու փոփոխումը անսպասելի էր, դիմեք սպասարկիչի ադմինին։" -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4332,7 +4448,7 @@ "Եթե խնդիրը չի լուծվել, դա նշանակում է, որ router-ը և/կամ firewall-ը " "շարունակում են արգելակել FileZilla-ն։" -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4340,7 +4456,7 @@ "Եթե խնդիրը չի լուծվել, դա նշանակում է, որ router-ը և/կամ firewall-ը " "շարունակում են արգելակել կապը։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2199 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4349,7 +4465,7 @@ "Երբ հաղորդագրությունների ֆայլի չափը հասնի լիմիտին, անվան վերջում կավելացվի " "\".1\" (հնարավոր է ջնջվի հինը), որից հետո կստեղծվի նորը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4357,18 +4473,18 @@ "Եթե հղումը ցույց է տալիս թղթապանակի վրա, ապա FileZilla-ն կարող է ջնջել այս " "հղումը կամ նրա հետ կապված թղթապանակը։" -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" "Եթե խնդիրը դեռ առկա է, ապա դիմեք router կամ firewall ծրագրի հեղինակներին։" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "Եթե խնդիրը դեռ առկա է, ապա դիմեք router ծրագրի հեղինակներին։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " @@ -4378,7 +4494,7 @@ "Եթե ընտրված է 'փոխել,եթե ֆայլը նոր է', ապա Ձեր համակարգային ժամանակը " "կհամապատասխանեցվի սպասարկիչի հետ։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1788 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4386,9 +4502,9 @@ "Եթե օգտագորվում է համեմատումը ըստ ամսաթվի, ապա երկու ֆայլերը կդիտվեն նույնը, " "եթե նրանց ստեղծման կամ փոփոխման ժամանակը չի գերազանցում նշված սահմանափակումը։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1893 msgid "If you change the language, you need to restart FileZilla." -msgstr "Լեզուն փոխելուց հետո վերագործարկեք FileZilla-ն:" +msgstr "Լեզուն փոխելուց հետո վերամեկնարկեք FileZilla-ն:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" @@ -4398,7 +4514,7 @@ "Սեղմելով 'Թեստ', FileZilla-ն կմիանա probe.filezilla-project.org-ին և " "կանցկացնի մի քանի պարզ թեստեր։" -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1168 msgid "If you close FileZilla, your changes will be lost." msgstr "Եթե փակեք FileZilla-ն, փոփոխությունները չեն պահպանվի։" @@ -4422,7 +4538,7 @@ "Եթե կան խնդիրներ թղթապանակների ցանկի ստացման կամ ֆայլերի փոխանցման ժամանակ, " "փոխեք փոխանցման եղանակը։" -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4454,7 +4570,7 @@ "Եթե օգտագործում եք router, համոզվեք, որ բոլոր նշված պորտերը հասանելի են այն " "համակարգչի համար, որում աշխատում է FileZill-ն։" -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4462,16 +4578,16 @@ "Եթե Ձեր router-ը անընդհատ փոխում է IP հասցեն, ապա դիմեք այդ ծրագրի " "հեղինակներին։" -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Ներմուծել տվյալներ հին տարբերակից" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "Import settings" msgstr "Ներմուծել կարգավորումները" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Ներմուծումը հաջող էր" @@ -4511,17 +4627,11 @@ "Պասիվ եղանակում, որը խորհուրդ է տրվում, FileZilla-ն սպասարկիչից հայցում է " "պորտը և կապակցում դրան։" -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "Սերտիֆիկատի սխալ" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "Սխալ գաղտնաբառ" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4529,7 +4639,7 @@ "Հնարավոր չեղավ ստանալ տեղեկություն FileZilla-ի նոր տարբերակի մասին: Փորձեք " "ավելի ուշ:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:789 msgid "Initializing TLS..." msgstr "Որոշվում է TLS..." @@ -4537,12 +4647,12 @@ msgid "Insecure algorithm!" msgstr "Ոչ անվտանգ ալգորիթմ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:773 msgid "Insecure server, it does not support FTP over TLS." msgstr "Սպասարկիչը անվտանգ չէ, այն չի աջակցում FTP-ն TLS-ով։" -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/engine/server.cpp:910 +#: ../../locales/../src/engine/server.cpp:931 #: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Ինտերակտիվ" @@ -4551,29 +4661,29 @@ msgid "Interface" msgstr "Տեսքը" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Interrupted by signal" msgstr "Կանգնեցված է ազդանշանի կողմից" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:219 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "Կանգնեցված է օգտատերի կողմից" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 msgid "Invalid Content-Length" msgstr "Չափը սխալ է" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 msgid "Invalid HTTP Response" msgstr "HTTP-ի սխալ պատասխան" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1018 msgid "Invalid argument passed" msgstr "Սխալ փաստարկ" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:461 +#: ../../locales/../src/engine/ControlSocket.cpp:518 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4581,43 +4691,47 @@ "Գրանշանների սխալ հաջորդականություն է ստացել: UTF-8-ը անջատում է։ Ընտրեք " "UTF-8-ը Կայքերի կառավարչում ՝ այն ստիպողաբար միացնելու համար։" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 msgid "Invalid chunk size" msgstr "Տվյալների չափի սխալ" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Սխալ տվյալներ" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Սխալ ամսաթիվ" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Ֆայլի սխալ անուն" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:161 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "Սխալ հոսթ, նշանից հետո պետք է լինի կետ և պորտը։" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:641 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Հոսթի սխալ անվանում. %s" + +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "Invalid input" msgstr "Սխալ տվյալներ" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:67 +#: ../../locales/../src/engine/server.cpp:188 msgid "Invalid port given. The port has to be a value from 1 to 65535." -msgstr "Դարպասի սխալ թիվ։ Պետք է լինի 1-ից 65535" +msgstr "Պորտը սխալ է։ Պետք է լինի 1-ից 65535" -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/engine/server.cpp:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:164 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4631,40 +4745,36 @@ "ftps:// FTP՝ TLS-ի միջոցով (ենթադրելի) և\n" "ftpes:// FTP՝ TLS-ի միջոցով (բացահայտ)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4305 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "Պրոսքի հոսթ, նշանից հետո պետք է լինի կետ և պորտը։" -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Անվավեր կանոնավոր սահմանում" + +#: ../../locales/../src/interface/search.cpp:692 msgid "Invalid regular expression in search conditions." msgstr "Փնտրման պայմանների սխալ։" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:568 msgid "Invalid response code" msgstr "Պատասխանի սխալ կոդ" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:687 #, c-format msgid "Invalid search conditions: %s" msgstr "Փնտրման պայմանների սխալ. %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:786 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Invalid site path" msgstr "Կայքի սխալ ուղի" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Սխալ չափ" @@ -4672,38 +4782,38 @@ msgid "Invalid username given." msgstr "Օգտատերի անունը սխալ է։" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Invalid value for ai_flags" msgstr "Սխալ արժեք ai_flags-ի համար" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "Invalid value for hints" msgstr "Սխալ արժեք" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction country:" msgstr "Իրավաբանական երկիրը." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction locality:" msgstr "Իրավաբանական հասցեն." -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Jurisdiction state or province:" msgstr "Նահանգը կամ շրջանը." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1745 msgid "Keep directories on top" msgstr "Սկզբից ցուցադրել թղթապանակները" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:659 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " "some tests to check if the server supports this feature, the test may fail." msgstr "Ոչ բոլոր սպասարկիչներն են աջակցում այս ընտրանքը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2014 msgid "Key exchange" msgstr "Բանալիների փոխարինում" @@ -4711,35 +4821,35 @@ msgid "Key exchange:" msgstr "Բանալիների փոխանակում." -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:908 +#: ../../locales/../src/engine/server.cpp:929 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1331 msgid "Key file" msgstr "Բանալու ֆայլ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "Փ&ոքրագույն" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1874 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Լեզուն" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "Language changed" msgstr "Լեզուն փոխվել է" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:158 msgid "Last modified" msgstr "Վերջին փոփոխումը" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 msgid "Layout" -msgstr "Տեղադրությունը" +msgstr "Դասավորություն" #: ../../locales/../src/interface/resources/xrc/settings.xrc:843 msgid "Limit for concurrent &downloads:" @@ -4753,30 +4863,30 @@ msgid "Limit local ports" msgstr "Սահմանափակել տեղային պորտերը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2168 msgid "Limit size of logfile" msgstr "Սահմանափակել log ֆայլի չափը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2176 msgid "Limit:" msgstr "Սահմանափակում." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 msgid "Line length exceeded" msgstr "Շատ է երկար" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:727 msgid "Linked against" msgstr "Բացի դա՝" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "socket-ը փակ է" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Listing:" msgstr "Ցանկը." @@ -4784,50 +4894,59 @@ msgid "Lo&west available port:" msgstr "Փոք&րագույն պորտը." -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1144 +#: ../../locales/../src/interface/edithandler.cpp:1380 msgid "Local" msgstr "Համակարգչում" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1015 msgid "Local address in use" msgstr "Օգտագործում է լոկալ հասցե" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Local endpoint has been closed" msgstr "Լոկալ վերջուղին փակվել է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2291 msgid "Local file" msgstr "Ֆայլը համակարգչում" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:314 msgid "Local file does not exist." msgstr "Համակարգչում ֆայլը գոյություն չունի։" -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:400 +#: ../../locales/../src/interface/updater.cpp:493 #, c-format msgid "Local file is %s\n" msgstr "Տեղային ֆայլն է՝ %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:310 msgid "Local file is a directory instead of a regular file." msgstr "Համակարգչի ֆայլը թղթապանակ է, այլ ոչ ֆայլ։" -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Local file is not a valid filename." msgstr "Ֆայլի անունը սխալ է։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:650 +#: ../../locales/../src/interface/search.cpp:656 +msgid "Local file search" +msgstr "Տեղային ֆայլի որոնում" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1090 msgid "Local filters:" msgstr "Տեղային զտիչներ." -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3320 +msgid "Local path handling:" +msgstr "Տեղային ուղու նկարագրում." + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Տեղային կայք." -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Locality:" msgstr "Համակարգչային." @@ -4835,12 +4954,16 @@ msgid "Log file" msgstr "Գրանցումների ֆայլը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:965 +msgid "Logged in" +msgstr "Մուտք գործում" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" -msgstr "Մուտքը" +msgstr "Մուտք գործում" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:847 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4848,7 +4971,7 @@ "Մուտքի տվյալները պարունակում են ոչ ASCII նշաններ, սպասարկիչը հնարավոր է " "չաջակցի UTF-8։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:855 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4856,8 +4979,9 @@ "Մուտքի տվյալները պարունակում են ոչ ASCII նշաններ, սպասարկիչը հնարավոր է " "չաջակցի UTF-8։ Փորձվում է օգտագործել համակարգային կոդավորումը։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:884 +#, fuzzy +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "Մուտքի հաջորդականությունը հաջող է կատարվել, բայց հնարավոր չեղավ մտնել։" #: ../../locales/../src/interface/cmdline.cpp:103 @@ -4873,13 +4997,13 @@ "Մուտքի տեսակը կարող է օգտագործվել FTP հասցեի հետ։ Հատկանիշները պետք է լինեն " "'%s' կամ '%s'" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "Low" msgstr "Ցածր" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 msgid "Lowest" msgstr "Ամենացածր" @@ -4891,61 +5015,69 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "Բոսորագույն" + +#: ../../locales/../src/interface/xmlfunctions.cpp:38 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "Համոզվեք, որ ֆայլը հասանելի է և ճիշտ XMLփաստաթուղթ է։" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 #, c-format msgid "Malformed chunk data: %s" msgstr "Վնասվել են որոշ տվյալներ. %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 #, c-format msgid "Malformed header: %s" msgstr "Վնասվել է գլխագիրը. %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 msgid "Malformed reply, server not sending proper line endings" msgstr "Սպասարկիչը նորմալ պատասխան չի ուղարկում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2633 +#: ../../locales/../src/interface/manual_transfer.cpp:298 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:310 +#: ../../locales/../src/interface/manual_transfer.cpp:314 +#: ../../locales/../src/interface/manual_transfer.cpp:321 +#: ../../locales/../src/interface/manual_transfer.cpp:327 +#: ../../locales/../src/interface/manual_transfer.cpp:333 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Manual transfer" msgstr "Ձեռադիր փոխանցում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3108 msgid "Match all of the following" msgstr "Գտնվել է բոլորը հետևյալից" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 msgid "Match any of the following" msgstr "Գտնվել է ցանկացածը հետևյալից" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 msgid "Match none of the following" msgstr "Ոչինչ չի գտնվել հետևյալից" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3111 +msgid "Match not all of the following" +msgstr "Հետևյալ ոչ բոլորին է համապատասխանում" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "Միաժամանակյա առավ. &փոխանցումներ." -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Memory allocation failure" msgstr "Հնարավոր չէ ստուգել հիշողությունը" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:385 +#: ../../locales/../src/interface/Mainfrm.cpp:1762 msgid "Message log" msgstr "Հաղորդագրությունների ֆայլը" @@ -4953,95 +5085,99 @@ msgid "Message log position" msgstr "Հաղորդագրությունների ֆայլի դիրքը" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Message too large" msgstr "Հաղորդագրությունները մեծ է" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "MiB" msgstr "ՄԲ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:440 msgid "Minutes" msgstr "Րոպե" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2206 msgid "Move &down" msgstr "Շարժել ներքև" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2200 msgid "Move &up" msgstr "Շարժել վերև" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:987 msgid "My Computer" msgstr "My Computer" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:977 msgid "My Documents" msgstr "My Documents" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:339 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:738 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:740 msgid "My Sites" msgstr "Իմ կայքերը" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:201 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:204 msgid "N/a" msgstr "Չկան տվյալներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2671 msgid "Name" msgstr "Անունը" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216 msgid "Name already exists" msgstr "Անունով արդեն կա" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 msgid "Name of bookmark already exists." msgstr "Այս անունով էջանիշ արդեն կա։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 msgid "Name:" -msgstr "Անունը." +msgstr "Անուն՝" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 msgid "Natural sort" msgstr "Բնական խմբավորում" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Մուտքագրեք զտիչի անունը" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:650 +msgid "Need to enter valid local path" +msgstr "Պետք է նշել տեղային վավեր ուղի" + +#: ../../locales/../src/interface/search.cpp:677 msgid "Need to enter valid remote path" msgstr "Պետք է նշել գործող հեռակա ուղի" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 msgid "Need to specify a character encoding" msgstr "Նշեք նշանների կոդավորումը" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Neither nodename nor servname provided, or not known" msgstr "Որևէ անուն չի նշվել կամ այն հայտնի չէ" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "Ցանցի հոսթը չունի որևէ ցանցային հասցե հարցվող հասցեների ընտանիքից" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Network unreachable" msgstr "Ցանցը հասանելի չէ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2059 msgid "Never" msgstr "Երբեք" @@ -5053,37 +5189,37 @@ msgid "New &tab" msgstr "Նոր &պատուհան" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2876 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Նոր &Էջանիշ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2636 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2236 msgid "New bookmark" msgstr "Նոր էջանիշ" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1163 +#: ../../locales/../src/interface/RemoteListView.cpp:1334 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1246 msgid "New directory" msgstr "Նոր թղթապանակ" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:61 #, c-format msgid "New features and improvements in %s" msgstr "Նոր հնարավորություններ և շտկումներ %s-ում" @@ -5092,13 +5228,13 @@ msgid "New filter" msgstr "Նոր զտիչ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:938 msgid "New folder" msgstr "Նոր թղթապանակ" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:602 +#: ../../locales/../src/interface/sitemanager.cpp:616 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2209 msgid "New site" msgstr "Նոր կայք" @@ -5106,27 +5242,27 @@ msgid "Next to the transfer queue" msgstr "Փոխանցման հաջորդ հերթականությունը" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:780 msgid "No" msgstr "Ոչ" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "No address associated with nodename" msgstr "Չկա հասցեի հետ ասոցացված ծրագիր" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Ընտրված չէ արտածման բաժինը" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "No command given, aborting." msgstr "Չկա նշված հրաման։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3821 msgid "No external IP address set, trying default." msgstr "Արտաքին IP հասցեն նշված չէ։ Օգտագործում է ծրագրայինը։" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "No files are currently being edited." msgstr "Ոչ մի ֆայլ չի խմբագրվում։" @@ -5134,95 +5270,92 @@ msgid "No filter name given" msgstr "Նշված չէ զտիչի անունը" -#: ../../locales/../src/engine/server.cpp:77 +#: ../../locales/../src/engine/server.cpp:81 #: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:195 msgid "No host given, please enter a host." msgstr "Մուտքագրեք հոսթը։" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Չկան հասանելի նկարներ" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Հերթում ֆայլեր չեն մնացել։" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "No name for the filterset given." msgstr "Նշված է զտիչների անունը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3043 msgid "No program associated with filetype" msgstr "Չկա այս ֆայլերի հետ ասոցացված ծրագիր։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2960 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "Ոչ մի ծրագիր ասոցիացված չէ '%s' ֆայլերի հետ։" -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "No route to host" msgstr "Չկա բաշխիչ հոսթի համար" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:397 msgid "No search results" msgstr "Ոչինչ չի գտնվել" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:349 msgid "No sites available" msgstr "Չկան հասանելի կայքեր" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:454 msgid "No supported SOCKS5 auth method" msgstr "Չի աջակցվում SOCKS5 եղանակը" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "No username given." msgstr "Նշված չէ օգտատերի անունը։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1836 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1855 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Ոչ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2407 msgid "None selected yet" msgstr "Ոչինչ չի ընտրված" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Nonrecoverable failure in name resolution" msgstr "Անուղղելի ձախողում անվան ընդլայնման մեջ" #: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 +#: ../../locales/../src/engine/server.cpp:904 +#: ../../locales/../src/engine/server.cpp:925 #: ../../locales/../src/interface/manual_transfer.cpp:154 #: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/queue.cpp:886 +#: ../../locales/../src/interface/queue.cpp:942 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 msgid "Normal" msgstr "Նորմալ" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 msgid "Not all items could be requeued for transfer." msgstr "Ոչ բոլոր ֆայլերն են հասանելի փոխանցման համար:" -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:181 +#: ../../locales/../src/interface/state.cpp:1244 msgid "Not connected" msgstr "Կապ չկա" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2045 msgid "Not connected to any server" msgstr "Կապակցված չէ սպասարկիչին" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Կապակցված չէ սպասարկիչին։" @@ -5230,11 +5363,11 @@ msgid "Not connected." msgstr "Կապակցված չէ։" -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Not initialized, need to call WSAStartup" msgstr "Չի սկզբնավորվել, պետք է կանչի WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:657 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Ուշադրություն. Այս հնարավորությունը աջակցվում է միայն FTP եղանակի դեպքում։" @@ -5251,7 +5384,7 @@ "Ուշադրություն. Բազային պորտի օգտագործումը ստիպողաբար միացնում է FTP " "կապակցումների պասիվ եղանակը։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "Number of decimal places:" msgstr "Նշանների ք-ը ստորակետից հետո." @@ -5259,42 +5392,43 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Փորձերի քանակը պետք է լինի 0 և 99-ի միջև" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1970 msgid "O&pen file" msgstr "Բացել ֆայլ" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:560 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1480 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1848 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3266 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3633 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3799 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3855 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "ԼԱՎ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:748 msgid "OS version:" -msgstr "ՕՀ-ի տարբերակ." +msgstr "ՕՀ-ի տարբերակ՝" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" @@ -5302,35 +5436,36 @@ "well as the fallback mode if enabled." msgstr "Ընտրված եղանակը կկազմաձևևի հաջորդ էջերում։" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:790 msgid "Once" msgstr "Մեկ անգամ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "Once a day" msgstr "Ամեն օր" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2061 msgid "Once a week" msgstr "Շաբաթը մեկ անգամ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:523 msgid "Only use plain FTP (insecure)" msgstr "Օգտագործել միայն սովորական FTP" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "Open directory in system's file manager" msgstr "Բացել թղթապանակը՝ համակարգային file manager-ում" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Բացել Կայքերի կառավարիչը" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Բացել Կայքերի կառավարիչը:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Բացել Կայքերի կառավարիչը: Աջ սեղմում կայքերի ցանկում:" @@ -5342,14 +5477,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Բացել FileZilla-ի կարգավորումները" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 msgid "Opened as:" msgstr "Բացել որպես." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1736 +#: ../../locales/../src/interface/LocalListView.cpp:1748 msgid "Opening failed" msgstr "Հնարավոր չէ բացել" @@ -5361,28 +5496,32 @@ msgid "Opens the Site Manager" msgstr "Բացում է Կայքերի կառավարիչը" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "Բացում է թղթապանակների ցանկի զտիչի պատուհանը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "Operating System:" -msgstr "Օպերացիոն համակարգ." +msgstr "Օպերացիոն համակարգ՝" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1026 msgid "Operation already in progress" msgstr "Գործողությունը արդեն ընթացքի մեջ է" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1017 msgid "Operation in progress" msgstr "Գործողությունը կատարվում է" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Operation not supported" msgstr "Հրամանը չի աջակցում" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "Նարնջագույն" + +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Organization:" msgstr "Կապմակերպությունը." @@ -5390,16 +5529,16 @@ msgid "Other SFTP options" msgstr "Այլ SFTP ընտրանքներ" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Other system error" msgstr "Համակարգային այլ սխալ" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:264 msgid "Other:" msgstr "Այլ." -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1021 +#: ../../locales/../src/engine/socket.cpp:1022 msgid "Out of memory" msgstr "Հիշողությունը քիչ է" @@ -5407,57 +5546,57 @@ msgid "Overview" msgstr "Ակնարկ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Փոխարինել &ավելի նորով" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1443 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Փոխարինել ֆայլը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1445 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "Փոխարինել ֆայլը, եթե չափով մեծ է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "Փոխարինել ֆայլը, եթե չափով ավելի մեծ է կամ ավելի նոր է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1444 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" msgstr "Փոխարինել ֆայլը, եթե այն ավելի նոր է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Փոխարինել, եթե &տարբերվում է չափով" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Փոխարինել, եթե տարբերվում է չա&փով կամ ավելի նոր է" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" msgstr "Սեփական մշակման տեսակը. %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:396 msgid "Owner permissions" msgstr "Օգտվողի իրավունքները" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:404 +#: ../../locales/../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "Օգտվողը/Խումբը" @@ -5472,7 +5611,7 @@ msgid "P&roxy host:" msgstr "Պրոքս&իի հոսթը." -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "PORT հրամանը արգելված է router-ի կամ firewall-ի կողմից։" @@ -5480,20 +5619,20 @@ msgid "Pa&ssive (recommended)" msgstr "Պաս&սիվ (խորհուրդ է տրվում)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2381 msgid "Parameter not a valid URL" msgstr "Ընդունելի URL հասցե չէ" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:573 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Վերլուծում է տարբերակի մասին տեղեկության %d բայթը:\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2523 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "Pass&word:" -msgstr "Գաղտնա&բառը." +msgstr "Գաղտնա&բառ՝" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" @@ -5504,61 +5643,61 @@ msgid "Passive mode" msgstr "Պասիվ եղանակ" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Պասիվ եղանակը հաստատված է որպես ծրագրային" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Պահանջվում է գաղտնաբառ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:155 msgid "Path" msgstr "Ուղի" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3104 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2137 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Հնարավոր չէ նշել %s թղթապանակի և %s ենթաթղթապանակի ուղին" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2336 msgid "Path not found:" msgstr "Ճ-ը չի գտնվել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2698 msgid "Paths" msgstr "Ուղիներ" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1260 +#: ../../locales/../src/interface/edithandler.cpp:1350 +#: ../../locales/../src/interface/edithandler.cpp:1360 msgid "Pending removal" msgstr "Սպասում է ջնջման" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Իրավունք" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1014 +#: ../../locales/../src/engine/socket.cpp:1023 msgid "Permission denied" msgstr "Մուտք չկա" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:159 msgid "Permissions" msgstr "Իրավունք" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:756 msgid "Platform:" -msgstr "Սարքահիմքը." +msgstr "Հարթակ՝" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5574,11 +5713,11 @@ "Կարգավորեք firewall-ը և router-ը այնպես, որ FileZilla-ն կարողանա միանա " "պատահական պորտերի միջոցով։" -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Անջատեք 'DMZ' և 'Խաղային' եղանակները Ձեր router-ում։" -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5586,19 +5725,19 @@ #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 msgid "Please enter a custom date format." -msgstr "Նշեք ամսաթվի ձևը։" +msgstr "Նշեք ամսաթվի ձևաչափը։" #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 msgid "Please enter a custom time format." -msgstr "Մուտքագրեք ժամանակի ձևը։" +msgstr "Մուտքագրեք ժամանակի ձևաչափը։" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Նշեք ամսաթիվը հետևյալ ձևով Տարի/Ամիս/Օր ձևով, օրինակ՝ ՝2010-09-10" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5608,16 +5747,16 @@ msgid "Please enter a name for the new filter." msgstr "Մուտքագրեք նոր զտիչի անունը։" -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Մուտքագրեք պատճենված զտիչի անունը։" -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:272 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Մուտքագրեք նոր զտիչների անունը։ \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Մուտքագրեք նոր զտիչի անունը։։" @@ -5638,77 +5777,79 @@ "transfers." msgstr "Մուտքագրեք սպասարկիչ միաժամանակյա փոխանցումների քանակը (0-10)։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Մուտքագրեք գաղտնաբառ՝ այս սպասարկիչի համար." -#: ../../locales/../src/interface/QueueView.cpp:2109 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Նշեք ծրագրի ուղի։\n" -"Օրինակ՝ c:\\ուղին\\ֆայլ.exe Windows-ում կամ /ուղին/ֆայլ Unix-ում։\n" -"Կարող եք նաև նշել այլ ուղի։" - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "Մուտքագրեք դադարի ժամանակը՝ 10-ից 9999 վայր. (0՝ չկա դադար)։" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Please enter a unique name for this filter set" msgstr "Մուտքագրեք նոր անուն այս զտիչների համար" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Մուտքագրեք օգտատերի անունը այս սպասարկիչում." -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Նշեք պորտերի ճիշտ նշում" -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Նշեք այն URL-ն, որից պետք է վերցվի Ձեր արտաքին IP հասցեն" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" -"Մուտքագրեք վերբեռնման արագության սահմանափակում բարձր կամ հավասար 0 %s/վ։" +"Մուտքագրեք վերբեռնելու արագության սահմանափակում բարձր կամ հավասար 0 %s/վ։" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." msgstr "" "Մուտքագրեք raw FTP հրաման։\n" -"raw ftp հրամանի օգտագործումը կմաքրի հիշոցը։" +"raw ftp հրամանի օգտագործումը կմաքրի շտեմը։" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1825 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Նշեք ծրագրի ուղին և փաստարկը։ Այս հրամանը կկատարվի, երբ հերթը ավարտվի:\n" +"Օրինակ՝ c:\\somePath\\file.exe MS Windows-ում կամ /somePath/file Unix-ում։\n" +"Կարող եք նշել հրամանները և դրանց փաստարկները չակերտներով:" + +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1233 msgid "Please enter the name of the directory which should be created:" -msgstr "Մուտքագրեք թղթապանակի անունը." +msgstr "Մուտքագրեք թղթապանակի անունը՝" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2631 msgid "Please enter the name of the file which should be created:" msgstr "Մուտքագրեք ֆայլի անունը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Մուտքագրեք օգտատերի անունը և գաղտնաբառը այս սպասարկիչի համար." -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Մուտքագրեք Ձեր արտաքին IP հասցեն" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5726,7 +5867,7 @@ "Ուշադրությամբ հետևեք ցուցումներին, քանի որ սխալ կազմաձևումը կազդի FTP " "կապակցումների վրա։" -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5734,11 +5875,11 @@ "Համոզվեք, որ FileZilla-ն ունի կապակցումներ հաստատելու իրավունք և գրված " "հասցեն ճիշտ է։" -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:141 msgid "Please make sure the requested locale is installed on your system." msgstr "Համոզվեք, որ այս լեզվի ֆայլը տեղակայված է համակարգչում։" -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5756,7 +5897,7 @@ "FileZilla չի կարող ազդել սպասարկիչի ընտրության վրա։ Սպասարկիչը կարող է " "ընտրել պորտ, որը firewall-ը բնորոշել է որպես վտանգավոր և կողպել է այն։" -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:697 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5772,7 +5913,11 @@ "Հաշվի առեք այն, որ որոշ սպասարկիչներ կարող են արգելակել կապը, եթե " "կապակցումների միջև դադարը շատ կարճ լինի։" -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:115 +msgid "Please re-add local data directories in the settings dialog." +msgstr "Կրկին ավելացրեք տեղային տվյալի թղթապանակները կարգավորումներում:" + +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5781,11 +5926,11 @@ "Կրկին բացեք Օգնականը, եթե փոխել եք ցանցային կարգավորումները կամ եթե ծագում " "են խնդիրներ այն սպասարկիչի հետ, որին նախկինում նորմալ կապակցել եք։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 msgid "Please select an action:" msgstr "Ձեր քայլը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1667 msgid "Please select the categories you would like to import." msgstr "Ընտրեք ներմուծման բաժինները։" @@ -5816,7 +5961,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Ընտրեք նոր հատկանիշներ ընտրված ֆայլերի համար։" -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5829,8 +5974,8 @@ msgid "Positio&n of the message log:" msgstr "Հաղորդագրությունների տողի դիր&քը." -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Postal code:" msgstr "Փոստային ինդեքսը." @@ -5842,20 +5987,20 @@ msgid "Preallocation" msgstr "Նախաբաշխւմ" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1948 msgid "Predefined Sites" msgstr "Որոշված կայքերը" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:696 msgid "Preserving file timestamps" msgstr "Պահպանվում է ֆայլերի ստեղծման ժամանակը" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Նախադիտում." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1482 +msgid "Preview" +msgstr "Նախադիտում" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket.cpp:1359 msgid "Primary connection and data connection certificates don't match." msgstr "Հիմնական կապակցման և տվյալների ալիքի վկայագրերը չեն համապատասխանում։" @@ -5867,15 +6012,15 @@ msgid "Print version information to stdout and exit" msgstr "Տպել տարբերակի տեղեկությունը stdout և փակել" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1744 msgid "Prioritize directories (default)" -msgstr "Թղթապանակների առաջնայնությունը" +msgstr "Թղթապանակների առաջնահերթությունը" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Priority" -msgstr "Առաջնայնությունը" +msgstr "Առաջնահերթությունը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2100 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5897,25 +6042,25 @@ msgstr "&Պրոքսիի գաղտնաբառը." #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "Կատարել &հերթականությունը" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1019 msgid "Process file table overflow" msgstr "Ֆայլի աղյուսակը լրացել է" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Կատարված է %s-ը %s-ում:" -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1024 msgid "Protocol not supported" msgstr "Արջանագրությունը չի աջակցում" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Protocol not supported on given socket type" msgstr "Արձանագրությունը չի աջակցում բնիկի տեսակը" @@ -5932,40 +6077,40 @@ msgid "Proxy &user:" msgstr "Պրոքսի &օգտատեր." -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:463 msgid "Proxy authentication failed" msgstr "Պրոքսիի իսկորոշումը ձախողվեց" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/transfersocket.cpp:106 +#: ../../locales/../src/engine/transfersocket.cpp:118 #, c-format msgid "Proxy handshake failed: %s" msgstr "Հնարավոր չէ կապակցել %s պրոքսին" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4299 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Պրոսքի հոսթը սկսվում է '['-ով, բայց չկա փակագիծը վերջում։" -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:322 #, c-format msgid "Proxy reply: %s" msgstr "Պրոքսիի պատասխանը. %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:504 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Պրոքսի հարցման ձախողում. Պրոքսիի պատասխանը. %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:377 #, c-format msgid "Proxy request failed: %s" msgstr "Պրոքսիի հարցման սխալ. %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Պրոքսիի հարցման սխալ. Հասցեի անհայտ տեսակ CONNECT պատասխանում" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4328 msgid "Proxy set but proxy host or port invalid" msgstr "Նշված է պրոքսի, բայց պրոքսի հոսթը և պորտը սխալ են" @@ -5977,55 +6122,56 @@ msgid "Public key algorithm:" msgstr "Բանալու ալգորիթմը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:464 msgid "Public permissions" msgstr "Հրապարակային իրավունք" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2688 msgid "Queue has been fully processed" msgstr "Հերթականությունը կատարված է" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:436 #, c-format msgid "Queue: %s MiB" msgstr "Հերթականություն. %s ՄԲ" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:372 #, c-format msgid "Queue: %s%s" msgstr "Հերթականություն. %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:368 +#: ../../locales/../src/interface/statusbar.cpp:427 msgid "Queue: empty" msgstr "Հերթականություն. դատարկ է" -#: ../../locales/../src/interface/QueueView.cpp:438 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Ֆայլեր, որոնք հերթում են" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Queueing:" msgstr "Հերթականություն." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "Վերա&մեկնարկել" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" +msgstr "Վ&երասկզբնաբեռնել համակարգը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "Հ&եռակա թղթապանակների ցանկ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "R&eset and requeue selected files" msgstr "Մա&քրել ցանկը և կրկնել նշված ֆայլերը" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "Raw FTP-ի հրաման" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:437 msgid "Re&ad" msgstr "Կա&րդալ" @@ -6034,31 +6180,31 @@ msgid "Re&fresh" msgstr "&Թարմացնել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Վեր&անվանել" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." msgstr "" "Կրկին բացեք Օգնականը և ուշադրությամբ ստուգեք նշված բոլոր կարգավորումները։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:471 msgid "Rea&d" msgstr "Կար&դալ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Միայն կարդալ" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/interface/Mainfrm.cpp:1037 msgid "Really cancel current operation?" msgstr "Դադարեցնե՞լ։" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1415 +#: ../../locales/../src/interface/search.cpp:1195 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6066,21 +6212,21 @@ msgstr[0] "Ջնջե՞լ %d թղթապանակը սպասարկիչից։" msgstr[1] "Ջնջե՞լ %d թղթապանակները սպասարկիչից։" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1193 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Ջնջե՞լ %d ֆայլը սպասարկիչից։" msgstr[1] "Ջնջե՞լ %d ֆայլերը սպասարկիչից։" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1420 +#: ../../locales/../src/interface/search.cpp:1199 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Ջնջե՞լ %s-ը և %s-ը սպասարկիչից։" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1051 msgid "Really delete all selected files and/or directories from the server?" msgstr "Ջնջե՞լ ընտրված բոլոր ֆայլերը և/կամ թղթապանակները սպասարկիչից։" @@ -6088,52 +6234,58 @@ msgid "Really delete all selected files and/or directories from your computer?" msgstr "Ջնջե՞լ ընտրված բոլոր ֆայլերը և/կամ թղթապանակները համակարգչից։" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Reason" msgstr "Պատճառը" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2681 msgid "Reboot now" msgstr "Վերամեկնարկել այժմ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:525 msgid "Rec&urse into subdirectories" msgstr "Վերա&ուղղորդել ենթաթղթապանակներ" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket.cpp:333 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Ստացվել է TLS տագնապ հետևյալ սպասարկիչից՝ %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:2998 msgid "Received a directory listing which appears to be encoded in EBCDIC." -msgstr "Թղթապանակների կառուցվածքը, որոնք կարծես կոդավորված են EBCDIC:" +msgstr "Թղթապանակների ցուցակը, որոնք կարծես կոդավորված են EBCDIC:" -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:1984 +#: ../../locales/../src/engine/directorylistingparser.cpp:2001 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Գերազանցում է 10000 նիշը, դադարեցվում է։" -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket.cpp:1342 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "Ստացված վկայագրի շղթան հնարավոր չէ ստուգել: Վավերացման վիճակը՝ %d:" + +#: ../../locales/../src/interface/netconfwizard.cpp:1006 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "Ընդունված տվյալները սխալ էեն" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:552 msgid "Received invalid character in version information" msgstr "Ստացել է սխալ գրանշան տարբերակի մասին" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket.cpp:336 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Ստացվել է անհայտ %d TLS տագնապ սպասարկիչից" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:545 msgid "Received version information is too large" msgstr "Ստացված տեղեկությունը շատ մեծ է" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6146,73 +6298,71 @@ msgid "Reconnection settings" msgstr "Վերակապակցելու կարգավորումներ" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Միանալ վերջին օգտագործված սպասարկիչին" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Ֆայլերը ռեկուրսիվ ավելացվում են հերթականությանը" -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Թույլտվությունների ռեկրուսիվ փոփոխում:" -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Ֆայլերի և թղթապանակների ռեկրուսիվ ջնջում:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:17 +msgid "Red" +msgstr "Կարմիր" + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:619 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Վերաուղղում սխալ կամ չաջակցվող URI-ի. %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:626 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Վերաուղղում սխալ կամ չաջակցվող հասցեի. %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Թարմացնել ֆայլերի և թղթապանակների ցանկը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3875 msgid "Remember passwords?" msgstr "&Հիշե՞լ գաղտնաբառը" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1107 msgid "Remote" msgstr "Հեռակա" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket.cpp:977 msgid "Remote certificate not trusted." msgstr "Հեռակա սպասարկիչի վկայագիրը սխալ է։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2326 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Remote file" msgstr "Ֆայլը սպասարկիչում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:672 +#: ../../locales/../src/interface/search.cpp:677 msgid "Remote file search" msgstr "Հեռակա ֆայլերի որոնում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1125 msgid "Remote filters:" msgstr "Հեռակա զտիչներ." -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1098 msgid "Remote path" msgstr "Հեռակա ուղի" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6221,7 +6371,7 @@ "Հնարավոր չէ որոշել հեռակա ուղին։ Համոզվեք, որ ընտրված ուղին ճիշտ է և այն " "աջակցվում է սպասարկիչի կողմից (%s)։" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1132 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6230,48 +6380,48 @@ "Հնարավոր չէ որոշել հեռակա ուղին։ Համոզվեք, որ ընտրված ուղին ճիշտ է և այն " "աջակցվում է սպասարկիչի կողմից (%s)։" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "Հնարավոր չէ որոշել հեռակա ուղին։ Համոզվեք, որ ընտրված ուղին ճիշտ է։" -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:333 msgid "Remote path could not be parsed." msgstr "Հնարավոր չէ որոշել հեռակա ուղին։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3225 msgid "Remote path handling:" msgstr "Հեռակա ուղու նկարագրում." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Remote path:" msgstr "Հեռակա ուղի." -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Հեռակա ուղի." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 msgid "Remove &all" msgstr "Ջնջել &բոլորը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &selected" msgstr "Ջնջել &ընտրվածը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1448 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Rename file" msgstr "Վերանվանել ֆայլը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 msgid "Rename selected directory" msgstr "Փոխել ընտրված թղթապանակի անունը" @@ -6280,70 +6430,70 @@ msgid "Rename selected files and directories" msgstr "Փոխել ընտրված թղթապանակների և ֆայլերի անունները" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3455 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2332 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Վերանվանում՝ '%s'-ը '%s'-ի" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 msgid "Reporting bugs and feature requests" msgstr "Հաղորդել սխալի մասին" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:368 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Հարցումը մերժվել է - սպասառուն չի աշխատեցնում identd-ը կամ անհասանելի է" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:371 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Հարցումը մերժվել է - սպասառուի identd-ը չի կարող հաստատել օգտվողի ID-ի տողը" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:365 msgid "Request rejected or failed" msgstr "Հարցումը մերժվել է կամ ձախողվել" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:521 msgid "Require explicit FTP over TLS" msgstr "Պահանջվում է որոշակի FTP՝ TLS-ով" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "Require implicit FTP over TLS" msgstr "Պահանջվում է որոշակի FTP՝ TLS-ով" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 msgid "Reset and requeue &all" msgstr "Մաքրել ցանկը և կրկնել &բոլորը" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Resolved protocol is unknown" msgstr "Ուղղված արձանագրությունը անհայտ է" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:443 #, c-format msgid "Resolving address of %s" msgstr "%s-ի համար որոշվում է IP հասցեն" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1025 msgid "Resource temporarily unavailable" msgstr "Ռեսուրսը ժամանակավոր անհասանելի է" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:353 msgid "Response:" msgstr "Պատասխանը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3171 msgid "Results:" msgstr "Արդյունքները." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" @@ -6357,19 +6507,19 @@ "ASCII ֆայլերի ներբեռնելը կարող է հանգեցնել խնդիրների, եթե սպասարկիչը " "օգտագործում է այլ ձևաչափ։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1346 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:868 #, c-format msgid "Retrieving directory listing of \"%s\"..." -msgstr "Ստանում է \"%s\"-ի թղթապանակների կառուցվածքը..." +msgstr "Ստանում է \"%s\"-ի թղթապանակների ցուցակը..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1343 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:865 msgid "Retrieving directory listing..." -msgstr "Ստանում է թղթապանակների կառուցվածքը..." +msgstr "Ստանում է թղթապանակների ցուցակը..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3836 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Ստանում է արտաքին IP հասցեն %s-ից" @@ -6382,17 +6532,17 @@ msgid "S&how the Site Manager on startup" msgstr "Բ&ացելիս ցուցադրել Կայքերի կառավարիչը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Ան&ջատել համակարգիչը" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" +msgstr "Ա&նջատել համակարգիչը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3095 msgid "S&top" msgstr "&Դադարեցնել" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "Ա&նջատել համակարգիչը" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" +msgstr "Ը&նդհատել համակարգիչը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" @@ -6406,46 +6556,47 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:142 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 պրոքսին կկապակցի %s-ին" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:170 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "SOCKS5-ը չի աջակցում 255 նիշից երկար օգտվողի անուն կամ գաղտնաբառ:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:715 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "Պահպանե՞լ կարգավորումները։" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:442 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "Saving of password has been disabled by your system administrator." msgstr "Գաղտնաբառի պահպանումը ցուցադրվել է համակարգի ադմինին:" -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:993 msgid "Saving of passwords has been disabled by you." msgstr "Գաղտնաբառերի պահպանումը ցուցադրվել է ձեր կողմից:" -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "Փնտրվում են ֆայլեր, որոնք կավելացվեն" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "Փնտրվում են ֆայլեր, որոնք վերբեռնվելու են" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1462 +msgid "Scale factor:" +msgstr "Մասշտաբի գործոնը՝" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3101 msgid "Search &conditions:" msgstr "Որոնման &պայմանները." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3083 msgid "Search &directory:" msgstr "Փնտրել &թղթապանակ." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Ֆայլերի ինքնականչ որոնում։" @@ -6453,16 +6604,20 @@ msgid "Search server for files" msgstr "Ֆայլեր փնտրելու սպասարկիչը" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3052 +msgid "Search type:" +msgstr "Որոնման տեսակը՝" + +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Security information" msgstr "Տեղեկություն անվտանգության մասին" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Նայեք այստեղ՝ https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2414 msgid "Sele&ct server" msgstr "Ընտր&եք սպասարկիչը" @@ -6480,7 +6635,7 @@ msgstr "" "Ընտրեք ծրագրային գործողությունը, եթե փոխանցվող ֆայլը արդեն գոյություն ունի։" -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1543 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Ընտրեք ծրագրային խմբագիրը" @@ -6501,29 +6656,33 @@ "Ընտրեք ծրագրային գործողությունը, եթե փոխանցվող ֆայլը արդեն գոյությւոն ունի։ " "Միայն ընտրված ֆայլերի համար։" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "Ընտրեք գաղտնի կոդով ֆայլը" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Ընտրեք տվյալները արտահանելու ֆայլը" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Ընտրեք ֆայլ՝ արտահանված զտիչների համար" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1427 msgid "Select file for exported queue" msgstr "Ընտրեք հերթականության ֆայլերը արտահանելու ֆայլը" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Ընտրեք ֆայլերը արտահանելու ֆայլը" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2281 msgid "Select file for exported sites" msgstr "Ընտրեք ֆայլը՝ կայքերը արտահանելու համար" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Ընտրեք ֆայլ, որից ներմուծվելու են կարգավորումները" @@ -6531,15 +6690,15 @@ msgid "Select file to upload" msgstr "Ընտրեք ֆայլ՝ վերբեռնելու համար" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Ընտրեք փոխարկված բանալու ֆայլի անունը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 msgid "Select how these files should be opened." msgstr "Նշեք, թե ինչպես բացել տվյալ ֆայլը։" -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:856 msgid "Select target download directory" msgstr "Ընտրեք ներբեռնելու թղթապանակը" @@ -6547,101 +6706,101 @@ msgid "Select target filename" msgstr "Ընտրեք ֆայլի անունը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1580 msgid "Select the categories to export:" msgstr "Արտածման համար ընտրեք բաժինները." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1506 msgid "Select the private data you would like to delete." msgstr "Ընտրեք ֆայլերը, որոնք ցանկանում եք ջնջել։" -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:815 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Փոխանցելու համար ընտրված է %d թղթապանակ՝ իրենց պարունակությամբ։" msgstr[1] "Փոխանցելու համար ընտրված են %d թղթապանակներ՝ իրենց պարունակությամբ։" -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Ընտրված է %d թղթապանակ։" msgstr[1] "Ընտրված են %d թղթապանակներ։" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:813 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Փոխանցելու համար ընտրված է %d ֆայլ։" msgstr[1] "Փոխանցելու համար ընտրված են %d ֆայլեր։" -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Ընտրված է %d ֆայլ։ Չափը. %s" msgstr[1] "Ընտրված են %d ֆայլեր։ Չափը. %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Ընտրված է %d ֆայլ։ Չափը՝ ամենաքիչը %s" msgstr[1] "Ընտրված են %d ֆայլեր։ Չափը՝ ամենաքիչը %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:819 #, c-format msgid "Selected %s and %s for transfer." msgstr "Փոխանցման համար ընտրված են %s և %s։" -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Ընտրված են %s և %s։ Ընդհանուր չափը. %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Ընտրված են %s և %s։ Չափը ոչ քիչ քան՝ %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1562 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Ընտրված խմբագիրը գոյություն չունի։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1867 msgid "Selected file already being edited" msgstr "Ընտրված ֆայլը արդեն խմբագրվում է" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "Ընտրված ֆայլը արդեն բացված է" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "Selected file is already opened" msgstr "Ընտրված ֆայլը արդեն բացված է" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "Selected file is still being edited" msgstr "Ընտրված ֆայլը արդեն խմբագրվում է" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Selected filter only works for local files." msgstr "Ընտրված զտիչը վերաբերում է միայն համակարգչային ֆայլերին։" -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:300 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" "Ընտրված ընդհանուր էջանիշը և գործող սպասարկիչը օգտագործում են սպասարկիչի " "տարբեր տեսակներ։\n" -"Այս սպասարկիչի համար օգտագործեք անհատական էջանիշներ։" +"Այս սպասարկիչի համար օգտագործեք անհատական էջանիշեր։" -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:306 msgid "Selected port usually in use by a different protocol." msgstr "Ընտրված պորտը հիմնականում օգտագործում է այլ արձանագրություն։" @@ -6653,56 +6812,60 @@ msgid "Send custom command to the server otherwise not available" msgstr "Պետք է ուղարկել անհատական հրաման սպասարկիչին" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4406 msgid "Sending keep-alive command" msgstr "Ուղարկվում է FTP &ակտիվության հրաման" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Serial number:" msgstr "Սերիական համարը." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:317 msgid "Server &Type:" msgstr "Սպասարկիչի &տեսակը." -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket.cpp:866 msgid "Server did not properly shut down TLS connection" msgstr "Սպասարկիչը ճիշտ չի փակել TLS կապը" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:945 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1006 msgid "Server does not support non-ASCII characters." msgstr "Սպասարկիչը չի աջակցում ոչ-ASCII նիշեր:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4244 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Սպասարկիչը չի աջակցում ֆայլեր %d ԳԲ-ից մեծ ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "Սպասարկիչը չի աջակցում ֆայլեր %d ԳԲ-ից մեծ ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528 msgid "Server does not support resume of files > 2GB." msgstr "Սպասարկիչը չի աջակցում 2ԳԲ-ից մեծ ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 msgid "Server does not support resume of files > 4GB." msgstr "Սպասարկիչը չի աջակցում 4ԳԲ-ից մեծ ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2060 +msgid "Server host key" +msgstr "" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4253 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "Սպասարկիչը չի աջակցում %d-ից մեծ ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:886 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6710,23 +6873,23 @@ "Սպասարկիչը հնարավոր է պահանջի Հաշիվի անուն։ Փորձեք հատկորոշել այն Կայքերի " "կառավարիչի միջոցով" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/ControlSocket.cpp:349 msgid "Server returned empty path." msgstr "Սպասարկիչը վերադարձրել է դատարկ ուղի։" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:620 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "Սպասարկիչը կրկին հայցում է Մուտքանունը։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3787 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Սպասարկիչը ուղարկել է պասսիվ պատասխան՝ անորոշ հասցեով։ Պասիվ եղանակը " "չաշխատեց։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3782 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6734,36 +6897,41 @@ "Սպասարկիչը ուղարկել է պասիվ պատասխան՝ անորոշ հասցեով։ Օգտագործվում է " "սպասարկիչի գործող հասցեն։" -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Սպասարկիչը ուղարկել է անորոշ պատասխան։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket.cpp:1254 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "Սպալսարկիչը ուղարկել է չտեսակավորված շղթա՝ խախտելով TLS բնութագրերը" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Server to client MAC:" msgstr "MAC սպասառուի սպասարկիչը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2123 msgid "Server to client cipher:" msgstr "Սպասարկիչի շիֆրը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2477 msgid "Server&type:" msgstr "Սպասարկիչի &տեսակը." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Server/Local file" msgstr "Սպասարկիչը/Ֆայլը համակարգչում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1731 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2400 msgid "Server:" msgstr "Սպասարկիչը." @@ -6771,29 +6939,29 @@ msgid "Session details" msgstr "Շրջանի մանրամասները" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" -msgstr "Հաստատել &առաջնայնությունը" +msgstr "Հաստատել &առաջնահերթությունը" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3599 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2214 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Փոխել իրավունքները '%s'-ից '%s'-ին" -#: ../../locales/../src/engine/transfersocket.cpp:791 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize կանչվել է առանց սոկեթը նշելու" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "Կարգավորումներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:772 msgid "Settings directory:" -msgstr "Կարգավորումների թղթապանակ." +msgstr "Կարգավորումների թղթապանակ՝" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "Ցու&ցադրել ծանուցման պատուհանը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2284 msgid "Show &raw directory listing" msgstr "Ցուցադրել թղթապանակների &ցանկը" @@ -6801,19 +6969,20 @@ msgid "Show &welcome dialog..." msgstr "Ցուցա&դրել ողջյունի պատուհանը..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2223 msgid "Show both directory trees and continue comparing?" -msgstr "Ցուցադրել թղթապանակների կառուցվածքը և շարունակել համեմատումը։" +msgstr "Ցուցադրել թղթապանակների ցուցակը և շարունակել համեմատումը։" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Մանրամասները" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1599 msgid "Show details about custom date and time formats" msgstr "Ցուցադրել մանրամասներ ամսաթվի և ժամանակի ձևաչափերի վերաբերյալ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "Shows available TLS ciphers" msgstr "Հասանելի TLS չիպերները" @@ -6821,7 +6990,7 @@ msgid "Shows this help dialog" msgstr "Ցուցադրել օգնության այս պատուհանը" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2677 msgid "Shutdown now" msgstr "Անջատել" @@ -6829,7 +6998,7 @@ msgid "Signature algorithm:" msgstr "ՍՏորագրության ալգորիթմը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Site &Manager entries" msgstr "&Կայքերի կառավարիչի ցանկը" @@ -6837,70 +7006,69 @@ msgid "Site Manager" msgstr "Կայքերի կառավարիչ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 msgid "Site Manager - Cannot remember password" msgstr "Կայքերի կառավարիչ՝ հնարավոր չէ հիշել գաղտնաբառը" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 #: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1067 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1076 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1100 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1109 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1144 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "Site Manager - Invalid data" msgstr "Կայքերի կառավարիչ՝ սխալ տվյալներ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "Կայքերի կառավարիչը արդեն բաց է" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:486 +#: ../../locales/../src/interface/sitemanager.cpp:514 +#: ../../locales/../src/interface/sitemanager.cpp:528 +#: ../../locales/../src/interface/sitemanager.cpp:540 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Site does not exist." msgstr "Կայքը գոյություն չունի։" -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:497 msgid "Site path has to begin with 0 or 1." msgstr "Կայքի ուղին պետք է սկսվի 0-ով կամ 1-ով։" -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:534 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:786 msgid "Site path is malformed." msgstr "Սխալ ուղի։" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" -msgstr "Անհատական էջանիշներ" +msgstr "Անհատական էջանիշեր" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" "Add current connection to the site manager?" msgstr "" -"Անհատական էջանիշների համար պահանջվում է պահպանել սպասարկիչը Կայքերի " +"Անհատական էջանիշերի համար պահանջվում է պահպանել սպասարկիչը Կայքերի " "կառավարիչում։\n" "Ավելացնե՞լ գործող կապը Կայքերի կառավարիչում։" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Size" msgstr "Չափը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1613 msgid "Size formatting" msgstr "Ընդհանուր չսփը" @@ -6908,50 +7076,55 @@ msgid "Size unknown" msgstr "Չափը հայտնի չէ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1449 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "Բաց թողնել ֆայլը" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1160 +#: ../../locales/../src/engine/ControlSocket.cpp:1177 +#: ../../locales/../src/engine/ControlSocket.cpp:1203 +#: ../../locales/../src/engine/ControlSocket.cpp:1281 #, c-format msgid "Skipping download of %s" msgstr "Բաց է թողնվում %s-ի բեռնումը" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:309 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Բաց է թողնում գոյություն չունեցող \"%s\" բանալու ֆայլը" + +#: ../../locales/../src/engine/ControlSocket.cpp:1163 +#: ../../locales/../src/engine/ControlSocket.cpp:1180 +#: ../../locales/../src/engine/ControlSocket.cpp:1206 +#: ../../locales/../src/engine/ControlSocket.cpp:1284 #, c-format msgid "Skipping upload of %s" msgstr "Բաց է թողնվում %s-ի վերբեռնումը" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1029 msgid "Socket address outside address space" msgstr "Բնիկի հասցեն սահմանների դուրս է" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Socket already connected" msgstr "Կապակցել է" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Socket has been shut down" msgstr "Բնիկը անջատվել է" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Socket not connected" msgstr "Կապ չկա" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Socket type not supported for address family" msgstr "Բնիկի տեսակը չի աջակցում հասցեի ընտանիքի համար" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1167 msgid "Some files are still being edited or need to be uploaded." msgstr "Որոշ ֆայլեր խմբագրվում են կամ պահանջում են վերբեռնում սպասարկիչ։" @@ -6964,31 +7137,31 @@ "Չկարգավորված սպասարկիչները router-ի միջոցով կապակցելու դեպքում կարող են " "օգտագործել տեղային IP հասցե." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1746 msgid "Sort directories inline" msgstr "Դասավորել թղթապանակները մի գծով" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." msgstr "Դասավորման եղանակը չի կարող փոփոխվել թղթապանակները համեմատելիս։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1730 msgid "Sorting" msgstr "Դասավորում" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1737 msgid "Sorting &mode:" -msgstr "Դասավոման &եղանակը." +msgstr "Դասավորման &եղանակ՝" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:107 msgid "Source and path of the drop operation are identical" msgstr "Աղբյուրը և ուղին նույնն են" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Աղբյուրը և թիրախ ֆայլը չեն կարող նույնը լինել։" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Աղբյուրը և ուղին նույնն են" @@ -6996,9 +7169,9 @@ msgid "Source file:" msgstr "Աղբյուր-ֆայլը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3817 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Արագության սահմանափակումներ" @@ -7006,27 +7179,27 @@ msgid "Speed limits" msgstr "Արագության սահմանափակումներ" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:586 msgid "Speed limits are disabled, click to change." msgstr "Արագության սահմանափակումներ չկան, սեղմեք՝ փոխելու համար։" -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:589 msgid "Speed limits are enabled, click to change." msgstr "Արագության սահմանափակումներ չկան, սեղմեք՝ փոխելու համար։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2078 msgid "Stable and beta versions" msgstr "Կայուն և փորձարկվող տարբերակներ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2077 msgid "Stable versions only" msgstr "Միայն կայուն տարբերակները" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2079 msgid "Stable, beta and nightly versions" msgstr "Կայուն և փորձարկվող տարբերակներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "Start transfer &immediately" msgstr "Անհապաղ սկսել &փոխանցումը" @@ -7034,19 +7207,19 @@ msgid "Start with opened Site Manager" msgstr "Բացել Կայքերի կառավարիչի հետ" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" msgstr "Ստուգել թարմացումները՝ %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2232 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1468 #, c-format msgid "Starting download of %s" msgstr "Սկսվում է %s-ի բեռնումը" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1471 #, c-format msgid "Starting upload of %s" msgstr "Սկսվում է %s-ի վերբեռնումը" @@ -7055,36 +7228,36 @@ msgid "Starts the local site in the given path" msgstr "Սկսում է տեղային կայքը տրված ճ-ում" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "State or province:" msgstr "Նահանգը կամպրովինցիան." -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Status" -msgstr "Դրությունը" +msgstr "Վիճակը" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:377 msgid "Status:" msgstr "Գործողությունը." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "Կանգնեցնել և ջնջել &բոլորը" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Կանգնեցնել ռեկրուսիվ գործ.-ը" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Street:" msgstr "Փողոցը." #: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" -msgstr "Սերտիֆիկատի թեման" +msgstr "Վկայագիրի անվանում" #: ../../locales/../src/interface/queueview_successful.cpp:12 msgid "Successful transfers" @@ -7094,39 +7267,43 @@ msgid "Summary of test results:" msgstr "Թեստի արդյունքները." -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2685 msgid "Suspend now" -msgstr "Անջատել" +msgstr "Ընդհատել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3419 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." msgstr "Այսպսի հղումները միշտ ջնջվում են։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3878 +#: ../../locales/../src/interface/state.cpp:233 +#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:255 +#: ../../locales/../src/interface/state.cpp:266 +#: ../../locales/../src/interface/state.cpp:365 +#: ../../locales/../src/interface/state.cpp:373 +#: ../../locales/../src/interface/state.cpp:381 +#: ../../locales/../src/interface/state.cpp:1003 +#: ../../locales/../src/interface/state.cpp:1011 +#: ../../locales/../src/interface/state.cpp:1018 +#: ../../locales/../src/interface/state.cpp:1027 +#: ../../locales/../src/interface/state.cpp:1054 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Համաժամանակեցված դիտում" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:380 msgid "Synchronized browsing has been disabled." msgstr "Համաժամանակեցված դիտումը անջատվել է։" -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Թղթապանակների համաժամեցում:" + +#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:165 msgid "Syntax error" msgstr "Սինթեքսի սխալ" @@ -7135,24 +7312,24 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2338 +#: ../../locales/../src/interface/Mainfrm.cpp:2383 msgid "Syntax error in command line" msgstr "Սինթեքսի սխալ՝ հրամանի տողում" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Համակարգը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:784 msgid "System details" msgstr "Մանրամասներ" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1020 msgid "System limit of open files exceeded" msgstr "Բացված ֆայլերի համակարգային սա-ը գերազանցվել է" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "System's network subsystem has failed" msgstr "Համակարգի ցանցի ենթահամակարգը ձախողվել է" @@ -7160,19 +7337,19 @@ msgid "T&oolbar" msgstr "Գ&ործիքներ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:289 msgid "TLS connection established, sending HTTP request" msgstr "TLS կապակցումը հաստատված է, ուղարկվում է HTTP հարցում" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:436 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS կապակցումը հաստատված է, սպասում է ողջյունի հաղորդագրություն..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:439 msgid "TLS connection established." msgstr "TLS կապակցումը հաստատված է։" -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "TTL expired" msgstr "TTL ավարտվել է" @@ -7180,35 +7357,39 @@ msgid "Target file already exists" msgstr "Ֆայլը գոյություն ունի" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Ֆայլը սպասարկիչի վրա." -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2647 msgid "Target filename already exists!" msgstr "Այս անունով ֆայլ կա։" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1630 msgid "Target filename already exists, really continue?" msgstr "Այս անունով ֆայլ կա։ Շարունակե՞լ։" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Temporary failure in name resolution" msgstr "Ժամանակավոր ձախողում անվան ընդլայնման մեջ" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Թեստավորումը հաջող էր" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Թեստի արդյունքները" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4258 msgid "Testing resume capabilities of server" msgstr "Ստուգվում է սպասարկիչից ներբեռնելու հնարավորությունը" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:749 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Կայքերի կառավարչը չի կարող օտագործվել, քանի դեռ ֆայլը վերականգնվում է:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7217,7 +7398,7 @@ "Կայքերի կառավարիչը օգտագործվում է FileZilla-ի այլ գործողության կողմից։ 3.\n" "Շարունակե՞լ։ Կայքերի Կառավարիչում կատարված փոփոխությունները չեն պահպանվելու։" -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7225,29 +7406,29 @@ "Կայքերի կառավարիչը օգտագործվում է FileZilla-ի այլ գործողության կողմից։ 3.\n" "Փակեք այն, տվյալները չեն ջնջվելու։" -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Դուք գրել եք %s հասցե." -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "The ai_family member is not supported" msgstr "ai_family անդամը չի աջակցվում" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "The ai_socktype member is not supported" msgstr "ai_socktype տեսակը չի աջակցում" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:685 msgid "The bookmark could not be added." msgstr "Հնարավոր չէ ավելացնել էջանիշը։" -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:773 msgid "The bookmarks could not be cleared." -msgstr "Հնարավոր չէ մաքրել էջանիշները։" +msgstr "Հնարավոր չէ մաքրել էջանիշերը։" -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/interface/statusbar.cpp:471 msgid "The connection is encrypted. Click icon for details." msgstr "Կապակցումը կոդավորված է։ Սեղմեք՝ մանրամասների համար։" @@ -7269,24 +7450,24 @@ "Նշված ամսաթիվի ձևաչափը սխալ է կամ պարունակում է չաջակցվող ձևաչափի " "հատկորոշիչներ:" -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/transfersocket.cpp:144 #, c-format msgid "The data connection could not be established: %s" msgstr "Հնարավոր չէ կապ հաստատել. %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "The default editor for text files could not be found." msgstr "Չի գտնվել տեքստային ֆայլերի խմբագրման հաստատված ծրագիր։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 #, c-format msgid "The default editor for text files is '%s'." msgstr "Տեքստային ֆայլերի հաստատված ծրագիր '%s'։" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Նշված զտիչի անունը արդեն առկա է: Ընտրեք այլ անուն:" @@ -7295,8 +7476,8 @@ msgid "The extension '%s' does already exist in the list" msgstr "'%s' ընդլայնումը արդեն կա ցանկում" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:290 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:298 #, c-format msgid "" "The file %s already exists.\n" @@ -7305,8 +7486,8 @@ "%s ֆայլը գոյություն ունի։\n" "Մուտքագրեք նոր անուն." -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1633 +#: ../../locales/../src/interface/LocalListView.cpp:1740 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7317,7 +7498,7 @@ "Համակցված ծրագիր (%s) չի գտնվել։\n" "Ստուգեք ասոցացումների կարգավորումները։" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7326,18 +7507,18 @@ "'%s' ֆայլը պարունակում է SSH1 բանալի: SSH1 հաղորդակարգը արժեզրկված է:, " "FileZilla-ն աջակցում է միայն SSH2 բանալիներ:" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "'%s' ֆայլում չկա անհրաժեշտ տեղեկություններ։" -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:36 #, c-format msgid "The file '%s' could not be loaded." msgstr "'%s' ֆայլը չի կարող բացվել։" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7346,8 +7527,8 @@ "'%s' ֆայլը հնարավոր չէ բացել.\n" "Նշված չէ այս տիպի ֆայլերի հետ ասոցացված ծրագիր։" -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1748 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7356,8 +7537,8 @@ "'%s' ֆայլը չի կարելի բացել.\n" "Հրամանը չի աշխատել" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:756 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7368,7 +7549,7 @@ "Նմանատիպ ֆայլերի բեռնումը կարող է հանգեցնել ֆայլերի կորստի:\n" "Շարունակե՞լ:" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7381,7 +7562,7 @@ msgid "The file selected as default editor does not exist." msgstr "Ընտրված խմբագիրը գոյություն չունի։" -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7393,11 +7574,11 @@ "Այդ պատճառով կներմուծվեն միայն հոսթը, պորտը, օգտատերի անունը և գաղտնաբառը։\n" "Շարունակե՞լ։" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Ֆայլի անունով սյուները հանարավոր չէ թաքցնել կամ հեռացնել։" -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "Ֆայլի անունով սյուները հանարավոր չէ թաքցնել։" @@ -7411,19 +7592,19 @@ msgid "The following characters will be replaced: %s" msgstr "Այս նշանները կփոխվեն. %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1928 msgid "The following files are currently being edited:" msgstr "Խմբագրվում են հետևյալ ֆայլերը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3474 msgid "The free open source FTP solution" msgstr "Ազատ, բաց կոդով FTP ծրագիր" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." -msgstr "Ընդհանուր Էջանիշները հնարավոր չէ պահպանել։" +msgstr "Ընդհանուր Էջանիշերը հնարավոր չէ պահպանել։" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2271 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7437,17 +7618,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Պետք է լինի 1-ի և 2000 ՄԲ-ի միջև" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1054 #, c-format msgid "The local directory '%s' could not be created." msgstr "Տեղային '%s' թղթապանակը չի կարող ստեղծվել։" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1039 #, c-format msgid "The local directory '%s' does not exist." msgstr "Տեղային '%s' թղթապանակը գոյություն չունի։" -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:245 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7465,24 +7646,24 @@ "Ամենացածրը պետք է լինի կամ ավելի քիչ, կամ հավասար ընտրված պորտերի մեծագույն " "թվից։" -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Հնարավոր չէ ներբեռնել նոր տարբերակը, փորձեք ավելի ուշ:" -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Նոր տարբերակը ներբեռնվել է Downloads թղթապանակում:" -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1524 msgid "The queue will not be saved." msgstr "Հերթականությունը չի կարող պահպանվել։" -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:961 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Հեռակա '%s' թղթապանակը գոյություն չունի։" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1008 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7491,26 +7672,26 @@ "'%s' հեռակա թղթապանակը համաժամանակեցման արմատից վեր է (%s)։\n" "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել փոփոխել հեռակա թղթապանակը։" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Ընտրված բաժինները ներմուծվել են։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 msgid "" "The selected file contains importable data for the following categories:" msgstr "Ընտրված ֆայլը ունի տվյալներ հետևյալ բաժինների համար." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1874 msgid "The selected file is already being edited:" msgstr "Ընտրված ֆայլը արդեն խմբագրվում է." -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "" "The selected file is still opened in some other program, please close it." msgstr "Ընտրված ֆայլը օգտագործվում է այլ ծրագրի կողմից։ Փակեք այն։" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7520,15 +7701,15 @@ "Դա վտանգավոր է և կարող է վնասել համակարգը։\n" "Շարունակե՞լ։" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:581 msgid "The server could not be added." msgstr "Սպասարկիչը հնարավոր չէ ավելացնել։" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Սպասարկիչը ուղարկել է անհայտ պատասխան։" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:530 msgid "The server uses following charset encoding for filenames:" msgstr "Սպասարկիչի կողմից օգտագործվող կոդավորումը." @@ -7538,26 +7719,30 @@ "certificate to make sure the server can be trusted." msgstr "Սպասարկիչի անհայտ տեսակի վկայագիր" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:951 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " "actually trying to connect to another computer pretending to be the server." msgstr "" -"Սպասարկիչի և հիշոցի բանալիները չեն համընկնում։ Հնարավոր է սպասարկիչի ադմինը " +"Սպասարկիչի և շտեմի բանալիները չեն համընկնում։ Հնարավոր է սպասարկիչի ադմինը " "փոխել է բանալին։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." msgstr "Սպասարկիչի հոսթի բանալին հայտնի չէ։ Հնարավոր է սա այլ սպասարկիչ է։" -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket.cpp:1339 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Սպասարկիչի հոսթի անունը չի համապատասխանում վկայագրի հոսթի անվանը" + +#: ../../locales/../src/engine/socket.cpp:1068 msgid "The servname parameter is not supported for ai_socktype" msgstr "Սպասարկիչի անվան ցուցիչը չի աջակցվում ai_socktype-ի համար" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7565,19 +7750,19 @@ "Կարգավորումները ներմուծվել են։ Վերամեկնարկեք FileZilla-ն՝ դրանք կիրառելու " "համար։" -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1016 msgid "The specified address family is not supported" msgstr "Հասցեի նշված ընտանիքը չի աջակցում" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "The specified network name is no longer available" msgstr "Ցանցի նշված անունը այլևս հասանելի չէ" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2680 msgid "The system will soon reboot unless you click Cancel." msgstr "Համակարգիչը կվերամեկնարկի, եթե Դուք չսեղմեք 'Չեղարկել'։" -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2676 msgid "The system will soon shut down unless you click Cancel." msgstr "Համակարգիչը կանջատվի, եթե չսեղմեք 'Չեղարկել'։" @@ -7589,11 +7774,11 @@ "Ֆայլւժը արդեն գոյություն ունի։.\n" "Ինչ անել։" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Թեստը անհաջող էր։ Պահպանե՞լ կարգավորումները։" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:81 #, c-format msgid "The valid backup file %s could not be restored" msgstr "'%s' ֆայլը չի կարող վերականգնվել:" @@ -7602,15 +7787,15 @@ msgid "Themes" msgstr "Թեմաներ" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:326 msgid "This filter set cannot be removed." msgstr "Զտիչների խումբը հնարավոր չէ ջնջել։" -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:266 msgid "This filter set cannot be renamed." msgstr "Զտիչների խումբը հնարավոր չէ վերանվանել։" -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7631,39 +7816,38 @@ "you have and tests your configuration." msgstr "Այս Օգնականը կօգնի Ձեզ ճիշտ կարգավորել router և firewall ծրագրերը։" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Time" msgstr "Ժամանակը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 msgid "Time formatting" -msgstr "Ժամանակի ձևը" +msgstr "Ժամանակի ձևաչափում" #: ../../locales/../src/interface/resources/xrc/settings.xrc:96 msgid "Time&out in seconds:" msgstr "Սպասելու &ժամանակը՝ վայր." #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "Սպասելու ժամանակը" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1710 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "Ժամային գոտու տարբերությունը սպասարկիչի հետ %d վայրկյան է:" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Title:" -msgstr "Անունը." +msgstr "Անունը՝" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2221 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Համեմատելու համար թղթապանակները երկու կողմն էլ պետք է լինեն հավասարեցված։" -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2222 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "Սրա համար թղթապանակների հենքը պետք է կամ թաքցված լինեն կամ միացված։" @@ -7673,7 +7857,7 @@ "keys to use." msgstr "FileZilla-ն պետք է իմանա, թե որ բանալիները կարող է օգտագործել։" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7690,7 +7874,7 @@ "Կանաչ. Ֆայլը ավելի նոր է մյուս կողմի չնշված ֆայլից։\n" "Կարմիր. Ֆայլերի չափերը չեն համընկնում։" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7700,51 +7884,46 @@ "Միացնելու դեպքում համակարգչային թղթապանակում փոփոխությունները կբերի " "փոփոխությունների նաև սպասարկիչում և հակառակը։" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Ցուցադրել/Թաքցնել հերթականության կատարման ընթացքը" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Ցուցադրել/Թաքցնել համակարգչում թղթապանակների սխեման" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Ցուցադրել/Թաքցնել հաղորդագրությունների ֆայլը" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Ցուցադրել/Թաքցնել հեռակա թղթապանակների սխեման" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Ցուցադրել/Թաքցնել ֆայլերի հերթականությունը" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:541 msgid "Too long header line" msgstr "Շատ երկար է" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:610 msgid "Too many redirects" msgstr "Վերաուղղորդումները չափազանց շատ են" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Trace:" msgstr "Ուղեգծում." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1853 msgid "Transfer" msgstr "Փոխանցվում է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2264 msgid "Transfer &direction" msgstr "Փոխանցման &տեղը" @@ -7760,22 +7939,22 @@ msgid "Transfer Queue" msgstr "Հերթականության պատուհանը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:450 msgid "Transfer Settings" msgstr "Փոխանցման կարգավորումները" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/transfersocket.cpp:452 +#: ../../locales/../src/engine/transfersocket.cpp:474 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Կապը ընդհատվել է. %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Փոխանցված տվյալները վնասված են։" -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:249 msgid "Transferring" msgstr "Փոխանցվում է" @@ -7783,8 +7962,7 @@ msgid "Transfers" msgstr "Փոխանցումներ" -#: ../../locales/../src/interface/QueueView.cpp:2944 -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2569 msgid "Transfers finished" msgstr "Փոխանցումները ավարտվել են" @@ -7796,15 +7974,15 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Հաշվել &ֆայլերը որպես ASCII" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:776 msgid "Trust changed Hostkey:" msgstr "Ընդունել հոսթի բանալու փոփոխությունը." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:773 msgid "Trust new Hostkey:" msgstr "Հոսթի նոր բանալի." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1010 msgid "Trust the new key and carry on connecting?" msgstr "Ընդունե՞լ նոր բանալին և շարունակել կապակցումը։" @@ -7812,17 +7990,17 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Ընդունե՞լ վկայագիրը և շարունակել կապակցումը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:889 msgid "Trust this host and carry on connecting?" msgstr "Վստահե՞լ այս հոսթին և շարունակել կապակցումը։" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Կրկին փորձել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 +#: ../../locales/../src/interface/edithandler.cpp:1097 msgid "Type" msgstr "Տեսակը" @@ -7834,20 +8012,20 @@ msgid "Type of generic proxy:" msgstr "Ընդհանուր պրոքսիի տեսակը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1955 msgid "U&pload" msgstr "Վ&երբեռնել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3758 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Վ&երբեռման սահմանափակում." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1963 msgid "U&se filetype associations if available" msgstr "Բացելու համար օգտագործել ֆայլերի ասոցացումները" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "U&se system defaults for current language" msgstr "Ընթացիկ լեզվի համար օգ&տ. լռելյայնը" @@ -7855,28 +8033,34 @@ msgid "USER@&HOST" msgstr "ՕԳՏԱՏԵՐԸ@&ՀՈՍԹԸ" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:374 +#: ../../locales/../src/engine/proxy.cpp:500 #, c-format msgid "Unassigned error code %d" msgstr "Սխալի անորոշ կոդ %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Unit:" msgstr "Օբյեկտը." -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:874 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:995 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/interface/edithandler.cpp:1129 +#: ../../locales/../src/interface/edithandler.cpp:1157 msgid "Unknown" msgstr "Անհայտ է" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "FTP պրոքսի անհայտ տեսակ, հնարավոր չէ ստեղծել անհրաժեշտ հաջորդականությունը " "մուտքի համար։" -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:422 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "SOCKS արձանագրության անհայտ տեսակ. %d" @@ -7885,24 +8069,35 @@ msgid "Unknown certificate" msgstr "Անհայտ վկայագիր" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:125 +#: ../../locales/../src/engine/misc.cpp:138 +#, c-format +msgid "Unknown error %d" +msgstr "Անհայտ սխալ %d" + +#: ../../locales/../src/engine/misc.cpp:102 +#, c-format +msgid "Unknown error %u" +msgstr "Անհայտ սխալ %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:816 msgid "Unknown host key" msgstr "Անհայտ բանալի" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:430 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "SOCKS-ի անհայտ արձանագրություն. %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:282 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "Անհայտ մաս, հնարավոր է այն ստեղծվել է FileZilla-ի կողմից։" -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7910,7 +8105,7 @@ "Եթե խնդիրները չլուծվեն, FTP-ի ակտիվ եղանակը չի աշխատի և անհրաժեշտ կլինի " "օգտագործել պասիվ եղանակը։" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7918,15 +8113,15 @@ "Եթե խնդիրները չլուծվեն, FTP-ի ակտիվ եղանակը չի աշխատի և անհրաժեշտ կլինի " "օգտագործել պասիվ եղանակը։" -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket.cpp:1278 msgid "Unsupported certificate type" -msgstr "Սերտիֆիկատի տեսակը չի աջակցվում" +msgstr "Վկայագիրի տեսակը չի աջակցվում" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:598 msgid "Unsupported redirect" msgstr "Վերաուղղորդումը չի աջակցվում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1961 msgid "Up&load and unedit" msgstr "Վե&րբեռնել առանց փոփոխությունների" @@ -7935,24 +8130,29 @@ msgid "Updates" msgstr "Թարմացումներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2278 msgid "Upload" msgstr "Վերբեռնել" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1120 msgid "Upload failed" msgstr "Անհաջող էր" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Upload limit: %s/s" msgstr "Վերբեռման սահմանափակում. %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Upload limit: none" msgstr "Սահմանափակումներ չկան" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3290 +#: ../../locales/../src/interface/search.cpp:882 +msgid "Upload search results" +msgstr "Ներբեռնել որոնման արդյունքները" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Upload selected directory" msgstr "Վերբեռնել ընտրված թղթապանակը" @@ -7960,69 +8160,69 @@ msgid "Upload selected files and directories" msgstr "Վերբեռնել ընտրված ֆայլերը և թղթապանակները" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1766 msgid "Upload this file back to the server?" msgstr "Ֆայլը ետ վերբեռնե՞լ սպասարկիչ:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 msgid "Upload this file to the server?" msgstr "Վերբեռնե՞լ ֆայլը սպասարկիչ։" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1148 +#: ../../locales/../src/interface/edithandler.cpp:1304 msgid "Uploading" msgstr "Վերբեռնում է" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1306 msgid "Uploading and pending removal" msgstr "Վերբեռնվում է և սպասում է ջնջման" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1151 +#: ../../locales/../src/interface/edithandler.cpp:1308 msgid "Uploading and unediting" msgstr "Վերբեռնում առանց փոփոխությունների" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Use &custom charset" msgstr "Օգտագործել &ընտրված կոդավորումը" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1927 msgid "Use &custom editor:" msgstr "Օգտագործել &հետևյալ խմբագրիչը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2970 msgid "Use &default editor for text files" msgstr "Օգտագորխել &ծրագրային խմբագիրը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2829 msgid "Use &synchronized browsing" msgstr "Օգտագործել հ&ամաժամանակեցված դիտում" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:541 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "Օգտագործել UTF-8, եթե սպասարկիչը աջակցում է այն։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 msgid "Use default action" msgstr "Օգտ հիմնական գործ." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:520 msgid "Use explicit FTP over TLS if available" msgstr "Օգտագործել պարզ FTP TLS-ով, եթե հասանելի է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 msgid "Use server currently connected to" msgstr "Օգտագործել սպասարկիչ, որը միացրած է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2389 msgid "Use server from site manager" msgstr "Օգտագործել սպասարկիչ Կայքերի կառավարիչից" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "Use system &defaults for current language" msgstr "Ընթացիկ լեզվի համար օգտ. &լռելյայնը" @@ -8032,7 +8232,7 @@ #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 msgid "Use the following port range:" -msgstr "Օգտագործել պորտերի հետևյալ ձևը." +msgstr "Օգտագործել պորտերի հետևյալ ընդգրկույթը՝" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 msgid "Use the server's external IP address instead" @@ -8055,16 +8255,16 @@ "Օգտագործեք սա, եթե ունեք դինամիկ IP հասցե։ FileZilla-ն կուղարկի հարցումներ " "այս սպասարկիչին մեկ անգամ ամեն աշխատաշրջանի համար։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 msgid "User:" msgstr "Օգտատերը." -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:501 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 msgid "Username cannot be a series of spaces" msgstr "Օգտատերի անունը չի կարող ունենալ միայն բացեր" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:581 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8082,7 +8282,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "wxWidgets-ի հաղորդագրություն" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket.cpp:1371 msgid "Verifying certificate..." msgstr "Ստուգվում է վկայագիրը..." @@ -8090,43 +8290,39 @@ msgid "Very high" msgstr "Շատ բարձր" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1471 msgid "View hidden option set, but unsupported by server" msgstr "Նայել կարգավորումների այն մասը, որը սպասարկիչը չի աջակցում" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1835 msgid "View/Edit" msgstr "Դիտել/Խմբագրել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2180 msgid "Visible columns" msgstr "Տեսանելի սյուներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "W&rite" msgstr "Գ&րել" -#: ../../locales/../src/interface/QueueView.cpp:1671 -msgid "Waiting" -msgstr "Սպասում" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "Սպասում է կապակցման" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "Ստուգվում է գաղտնաբառը" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:243 msgid "Waiting for transfer to be cancelled" msgstr "Սպասում է փոխանցման չեղարկմանը" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:244 msgid "Waiting to retry..." msgstr "Սպասում է կրկնման..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." msgstr "Ուշադրություն, անտեսվում է կապակցումը սխալ IP-ից։" @@ -8138,31 +8334,31 @@ "\n" "Do you really want to check for nightly builds?" msgstr "" -"Ուշադրություն. Օգտագործեք 'Nightly' կառուցվածքը միայն Ձեր " +"Ուշադրություն. Օգտագործեք 'Nightly' կառույցները միայն Ձեր " "պատասխանատվությամբ։\n" "Օգտագործման ընթացքում հնարավոր են սխալներ։\n" -"Nightly կառուցվածքները հնարավոր է նորմալ չասխատեն, անգամ հանգեցման համակարգի " +"Nightly կառույցները հնարավոր է նորմալ չաշխատեն, անգամ հանգեցման համակարգի " "վնասմանը։\n" "\n" -"Ստուգե՞լ 'Nightly' կառուցվածքի առկայությունը։" +"Ստուգե՞լ 'Nightly' կառույցի առկայությունը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:944 msgid "Warning: Potential security breach!" -msgstr "Ուշադրություն. Առկա է անվտանգության չեղք։" +msgstr "Ուշադրություն. Առկա է անվտանգության ճեղք։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3645 msgid "Welcome to FileZilla" -msgstr "Բարի Գալուստ FileZilla" +msgstr "Բարի գալուստ FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3506 msgid "What's new" msgstr "Ինչն է նոր" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Ինչն է նոր." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3832 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8186,51 +8382,55 @@ msgid "Widescreen" msgstr "Լայնէկրան" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3827 msgid "Would you like FileZilla to remember passwords?" msgstr "Ցանկանու՞մ եք, որ FileZilla-ն հիշի գաղտնաբառերը:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Wr&ite" msgstr "Գր&ել" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Սխալ արտաքին IP հասցե" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 msgid "Wrong line endings" msgstr "Տողերի սխալ վերջավորություն" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "Դեղին" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:787 msgid "Yes" msgstr "Այո" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "Կարծես Դուք օգտագործում եք միայն IPv6 հոսթ: Այն չի աջակցվում:" -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Դու օգտագործում եք FileZilla-ի նոր տարբերակը:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3615 msgid "You can always open this dialog again through the help menu." -msgstr "Կարող եք բացել այս պատուհանը Օգնություն ընտրացանկից։" +msgstr "Կարող եք բացել այս պատուհանը Օգնություն ցանկից։" -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Կարող եք ներբեռնել FileZilla-ի նոր տարբերակը ծրագրի կայքից." -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:69 msgid "You can leave the port field empty to use the default port." msgstr "Թողեք դաշտը դատարկ՝ ծրագրային կարգավորումը օգտագործելու համար։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:518 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8238,7 +8438,7 @@ "Կարող եք նշել 'x'-ը ցանկացած տեղում՝ օրիգինալ ֆայլերին մուտքը պահպանելու " "համար։" -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Հնարավոր չէ ներմուծել կարգավորումները FileZilla-ի կարգավորումների " @@ -8252,67 +8452,71 @@ "Հնարավոր չէ փոխել անընդունելի նշանը մեկ այլ անընդունելի նշանով։ Նշեք այնպես, " "ինչպես որ թույլատրվում է։" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Դուք չեք մուտքագրել ֆայլի նոր անունը։ Փոխարինե՞լ այն։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "You have selected at least one symbolic link." msgstr "Ընտրեք եք առնվազն մեկ հղում։" -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1599 +#: ../../locales/../src/interface/search.cpp:1159 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "Խմբագրման համար դուք ընտրել եք 10 ֆայլից ավելի։ Շարունակե՞լ։" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1705 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "" "Բացելու համար դուք ընտրել եք 10 ֆայլից կամ թղթապանակից ավելի։ Շարունակե՞լ։" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:420 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 msgid "You have to enter a hostname." msgstr "Մուտքագրեք հոսթի անունը։" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1076 msgid "You have to enter a key file path" msgstr "Պետք է նշեք բանալու ֆայլի ուղին" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:868 msgid "You have to enter a local directory." msgstr "Մուտքագրեք տեղային թղթապանակ։" -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:882 +msgid "You have to enter a remote directory." +msgstr "Մուտքագրեք հեռակա թղթապանակ։" + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Մուտքագրեք վավեր IPv4 հասցե:" -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/search.cpp:873 msgid "You have to enter a writable local directory." msgstr "Մուտքագրեք թղթապանակ համակարգչում, որտեղ հնարավոր է պահպանել։" -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:512 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1067 msgid "You have to enter an account name" msgstr "Մուտքագրեք Հաշիվի անունը" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:486 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 msgid "You have to specify a user name" msgstr "Օգտատերի անունը" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "Ձեր Router-ը կամ firewall-ը փոփոխել են փոխանցվող ֆայլը։" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Մուտքագրեք էջանիշի անունը։" @@ -8320,7 +8524,7 @@ msgid "You need to enter a name for the log file." msgstr "Մուտքագրեք log ֆայլի անունը։" -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1484 msgid "You need to enter a properly quoted command." msgstr "Մուտքագրեք ճիշտ հրաման։" @@ -8333,15 +8537,15 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Մուտքագրեք թիվը 1-ից 65535-ի միջև" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1144 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Պետք է նշեք գոնե մեկ ուղի, հնարավոր չէ նշել դատարկ էջանիշ։" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8349,7 +8553,7 @@ "Պետք է նշեք համակարգչային և հեռակա ուղի՝ պատուհանի համաժամանակեցված դիտումը " "ապահովելու համար։" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1109 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8357,79 +8561,79 @@ "Պետք է նշեք համակարգչային և հեռակա ուղին՝ այս կայքի համար համաժամանակեցված " "դիտումը միացնելու համար։" -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "You need to specify a local file." msgstr "Նշեք ֆայլ համակարգչից։" -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:321 msgid "You need to specify a remote file." msgstr "Նշեք հեռակա ֆայլը։" -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:327 msgid "You need to specify a remote path." msgstr "Նշեք հեռակա ուղին։" -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:298 msgid "You need to specify a server." msgstr "Նշեք սպասարկիչը։" -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "Պետք է որ կապը նորմալ աշխատի։" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2684 msgid "Your computer will suspend unless you click Cancel." msgstr "Համակարգիչը կվերամեկնարկի, եթե չսեղմեք 'Չեղարկել'։" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "հետո" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "մինչ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "սկսվում է՝" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "բայթ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "պարունակում է" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "հարմարեցված" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "չի պարունակում" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "չի համապատասխանում" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "ավարտվում է՝" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "հավասարաչափ" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:535 +#: ../../locales/../src/interface/filelistctrl.cpp:554 +#: ../../locales/../src/interface/filelistctrl.cpp:581 +#: ../../locales/../src/interface/filelistctrl.cpp:597 msgid "file" msgstr "ֆայլ" @@ -8437,8 +8641,8 @@ msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8447,96 +8651,156 @@ "Հնարավոր չէ բացել fzputtygen-ը։\n" "Համոզվեք, որ ֆայլը գտնվում է այնտեղ, որտեղ որ FileZilla.ехе է։" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:374 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp-ն վերաբերում է FileZilla-ի այլ տարբերակին" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1391 msgid "fzsftp could not be started" msgstr "Հնարավոր չէ բացել fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/tlssocket.cpp:1217 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers չկան վկայագրեր" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket.cpp:1229 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 ձախողում" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "մեծ քան" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "օգտագործված խմբի համար" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "խմբային կարդացվող" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "խմբային գրվող" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1601 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "հավասարաչափ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "նշված է" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "նշված չէ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "քիչ քան" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "համապատասխանում է regex-ի" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +msgid "new name" +msgstr "նոր անուն" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "կատարող" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "միայն կարդացվող" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "կարդացվող և գրվող" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket.cpp:1423 +#: ../../locales/../src/engine/tlssocket.cpp:1439 +#: ../../locales/../src/engine/tlssocket.cpp:1455 +#: ../../locales/../src/engine/tlssocket.cpp:1471 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "անհայտ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "կատարող" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "միայն կարդացվող" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "կարդացվող և գրվող" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:699 msgid "wxWidgets:" msgstr "wxWidgets:" -#~ msgid "Deleting directories" -#~ msgstr "Թղթապանակները ջնջվում են" +#~ msgid "Host key fingerprint:" +#~ msgstr "Հոսթի բանալու հանրագումարը." + +#~ msgid "Available sizes" +#~ msgstr "Հասանելի չափերը" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Հնարավոր չէ բացել Արագ կապակցման վահանակը ռեսուրսների ֆայլից" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize կանչվել է առանց սոկեթը նշելու" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "Հնարավոր չէ բացել վկայագրերը, սխալ gnutls_x509_crt_import" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "Հնարավոր չէ բացել վկայագրերը, սխալ gnutls_x509_crt_init-ում" + +#~ msgid "Filename &filters..." +#~ msgstr "Զտիչներ՝ &ֆայլի անունով..." + +#~ msgid "%d files added to queue" +#~ msgstr "%d ֆայլեր են ավելացվել" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Անջատվել սպասարկիչից" + +#~ msgid "&Show message" +#~ msgstr "&Ցուցադրել հաղորդագրությունը" + +#~ msgid "Connected" +#~ msgstr "Կապակցված է" + +#~ msgid "Do ¬hing" +#~ msgstr "Ոչինչ &չանել" + +#, fuzzy +#~ msgid "Empty dirs to visit" +#~ msgstr "Թղթապանակներ չկան" + +#~ msgid "No more files in the queue!" +#~ msgstr "Հերթում ֆայլեր չեն մնացել։" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Փնտրվում են ֆայլեր, որոնք կավելացվեն" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Փնտրվում են ֆայլեր, որոնք վերբեռնվելու են" + +#~ msgid "Waiting" +#~ msgstr "Սպասում" #~ msgid "Deleting multiple unrelated directories is not yet supported" #~ msgstr "Իրար հետ կապ չունեցող մի քանի թղթապանակների ջնջումը չի աջակցվում։" @@ -8641,9 +8905,6 @@ #~ msgid "Operating system problem detected" #~ msgstr "Խնդիրներ՝ կապված օպերացիոն համակարգի հետ" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Սերտիֆիկատը սխալ է" - #~ msgid "" #~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " #~ "seconds." diff -Nru filezilla-3.15.0.2/locales/id_ID.po filezilla-3.33.0/locales/id_ID.po --- filezilla-3.15.0.2/locales/id_ID.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/id_ID.po 2018-04-02 18:37:17.000000000 +0000 @@ -1,11 +1,11 @@ # translation of id_ID.po to Bahasa Indonesia -# Willy Sudiarto Raharjo , 2008-2015. +# Willy Sudiarto Raharjo , 2008-2018. msgid "" msgstr "" "Project-Id-Version: id_ID\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-30 15:29+0100\n" -"PO-Revision-Date: 2016-01-28 01:43+0700\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-02 20:30+0200\n" +"PO-Revision-Date: 2018-03-25 00:04+0700\n" "Last-Translator: Willy Sudiarto Raharjo \n" "Language-Team: Bahasa Indonesia \n" "Language: id\n" @@ -13,21 +13,21 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 2.0.6\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S terlewati" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S lagi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -36,201 +36,205 @@ "%a - Akun (Baris yang mengandung informasi ini akan diabaikan jika tidak " "menggunakan jenis login Account)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d direktori" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "Direktori %d dengan isinya" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d berkas" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d berkas. Ukuran total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d berkas. Ukuran total: Paling tidak %s" -#: ../../locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "%d berkas telah dimasukkan ke antrian" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d detik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Host" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu direktori" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu berkas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Kata sandi" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Sertifikat kadaluarsa!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Belum juga valid!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Pengguna proxy" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s dan %s. Ukuran total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s dan %s. Ukuran total: Paling tidak %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s tidak bisa ditemukan. Tanpa komponen FileZilla ini, SFTP tidak akan " +"%s tidak bisa ditemukan. Tanpa komponen FileZilla ini, %s tidak akan " "bekerja.\n" "\n" "Harap mendownload FileZilla kembali. Jika hal ini masih tetap ada, harap " "kirimkan laporan kesalahan." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s tidak ditemukan. Tanpa komponen FileZilla ini, SFTP tidak akan bekerja.\n" +"%s tidak ditemukan. Tanpa komponen FileZilla ini, %s tidak akan bekerja.\n" "\n" "Solusi yang mungkin:\n" "- Pastikan %s berada dalam direktori yang terdaftar pada variabel lingkungan " "PATH Anda.\n" -"- Tentukan path lengkap pada %s pada variabel lingkungan FZ_FZSFTP." +"- Tentukan path lengkap pada %s pada variabel lingkungan %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s dengan %d bit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Nama host tidak sesuai pada sertifikat" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Nama pengguna" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Kata sandi proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "B&atalkan koneksi sebelumnya dan buka koneksi pada tab aktual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "&Tentang..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Akun:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Aktif" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "&Tambah penanda..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "T&ambahkan direktori..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Tambahkan berkas ke antrian" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Tambah berkas kunci..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Tambahkan ke antrian" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Sesuaikan offset zone waktu server:" @@ -238,71 +242,76 @@ msgid "&Always trust certificate in future sessions." msgstr "&Selalu percaya sertifikat pada sesi di masa mendatang." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "&Selalu percaya pada host ini, tambahkan kunci ini pada cache" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Selalu gunakan editor default ini" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Selalu gunakan pilihan untuk semua berkas yang tidak diasosiasikan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Selalu gunakan aksi ini" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Meminta sistem operasi anda untuk alamat IP eksternal" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Otomatis" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Deteksi otomatis" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "Warna latar &belakang:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Biner" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Awalan biner menggunakan simbol SI. (cth. 1 KB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "&Penanda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Jelajah..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Toleransi burst:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Batal" @@ -314,19 +323,23 @@ msgid "&Close" msgstr "&Tutup" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&Tutup FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Tutup FileZilla sekali" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "&Mengkonfigurasi batas kecepatan..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "&Konfigurasikan..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Menghubungkan" @@ -334,154 +347,150 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Salin koneksi saat ini ke Manajemen Situs..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "&Salin ke clipboard" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Buat direktori" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" msgstr "&Buka tab baru" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Debug" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "&Informasi debug pada pesan log:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "Editor &default:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "&Aksi default jika berkas sudah ada..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Keterlambatan diantara percobaan login yang gagal:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Hapus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Hapus symlink" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "Hak akses &direktori..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "Perbandingan &direktori" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " -"remote." +"remote" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " "remote" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "&Buang berkas lokal lalu download dan edit berkas baru" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "&Putuskan hubungan" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Terputus dari server" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Tampilkan kecepatan transfer dan bukan kecepatan rata-rata" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Tampilkan ukuran dalam byte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "&Jangan mengingat kata kunci (direkomendasikan)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Jangan tampilkan dialog ini lagi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "&Jangan gunakan alamat IP eksternal pada koneksi lokal." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "Aksi klik &ganda untuk berkas:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Download" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Download ke:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Mendownload..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Download:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Edit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "&Edit aturan filter..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "&Aktifkan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Aktifkan kompresi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Aktifkan batas kecepatan" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Enkoding:" @@ -489,28 +498,28 @@ msgid "&Encryption:" msgstr "&Enkripsi:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "&Masukkan perintah sendiri..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "Buat kon&eksi pada tab baru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Eksekusi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Ekspor daftar manajemen situs" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Ekspor..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Kembali ke mode aktif" @@ -518,35 +527,47 @@ msgid "&File" msgstr "&Berkas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "&Atribut berkas..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "Hak akses &berkas..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Berkas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Kondisi filter:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Sekumpulan filter:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 -msgid "&Filters:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" msgstr "&Filters" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +msgid "&Filters:" +msgstr "&Filters:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Selesaikan pengeditan dan hapus berkas lokal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Rampingkan path lokal, upload semua berkas yang berada didalamnya pada " +"direktori target" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -554,54 +575,54 @@ "&Path remote lebih ramping, download semua berkas yang ada langsung pada " "direktori target" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "&Ikuti symlink, hapus isi direktori target" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Dapatkan alamat IP eksternal dari URL berikut:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Mendapatkan bantuan..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "Penanda &global" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1/1 menggunakan metode CONNECT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&Bantuan" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Sembunyikan berkas yang sama" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&Tertinggi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Port tertinggi yand ada:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Mesin:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&Prefix biner IEC (cth. 1 KiB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "ISO 8601 (contoh: 2007-09-15)" @@ -609,88 +630,96 @@ msgid "&Import..." msgstr "&Import..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "&Turunkan asosiasi jenis berkas sistem" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Install versi baru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Pertahankan struktur path lokal relatif pada root pencarian" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "&Pertahankan struktur path remote relatif pada root pencarian" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "&Berkas kunci:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Layout dari berkas dan direktori:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Batasi port lokal yang digunakan oleh FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Batasi jumlah koneksi simultan" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "Pohon direktori &lokal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "Direktori &lokal:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "Pencarian &lokal" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Catat log ke berkas" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "&Tipe Logon:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "&TipeLogon:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Rendah" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "&Kelola penanda..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "Transfer &manual..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Jumlah maksimum koneksi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Jumlah maksimum percobaan:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "Log &pesan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Minimalkan ke tray" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "&Nama mode pengurutan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Nama:" @@ -698,7 +727,7 @@ msgid "&Network configuration wizard..." msgstr "&Panduan konfigurasi jaringan..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Baru" @@ -706,7 +735,7 @@ msgid "&New Site" msgstr "&Situs Baru" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Versi baru tersedia!" @@ -714,154 +743,165 @@ msgid "&Next >" msgstr "&Lanjut >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Tidak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Tidak ada" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Normal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Nilai numerik:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&BUKA" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Buka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Timpa" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Pasif" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&KataKunci:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "&Mainkan suara" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Port:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Pertahankan waktu pada berkas yang ditransfer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Antrian" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&KoneksiCepat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "Batang &koneksi cepat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "Sejarah &koneksi cepat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Baca" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "&Hubungkan ulang" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "Informasi &koneksi ulang" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "&Perbarui" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Ingat Kata kunci utama sampai FileZilla ditutup" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "&Ingat Kata kunci sampai FileZilla ditutup" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "&Ingat kata kunci?" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Direktori remote:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "Path &remote:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "Pencarian &remote" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Hapus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Hapus kunci" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "&Hapus yang dipilih" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Ganti nama" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Ganti nama..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Buka kembali berkas lokal" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Ganti karakter yang tidak valid dengan:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "&Laporkan kesalahan..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Meminta perhatian" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "&Ulangi dan antri ulang semua berkas" @@ -869,39 +909,39 @@ msgid "&Restart Wizard" msgstr "&Ulang kembali Panduan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Teruskan" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "&Jalankan perintah..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Jalankan panduan konfigurasi sekarang..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Jalankan pemeriksaan update sekarang..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Simpan sebagai..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Pencarian" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Mencari berkas remote..." @@ -909,20 +949,20 @@ msgid "&Select Entry:" msgstr "&Pilih Entri:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Pilih bahasa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Pilih kolom yang harus ditampilkan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Pengaturan" @@ -930,23 +970,19 @@ msgid "&Settings..." msgstr "&Pengaturan..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Tampilkan menu debug" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "&Tampilkan log detail" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Tampilkan pesan" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Tampilkan timestamp pada pesan log" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Daftar Manajemen &Situs" @@ -954,159 +990,177 @@ msgid "&Site Manager..." msgstr "&Manajemen Situs..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "Penanda &situs khusus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Lewati" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "&Batas kecepatan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "&Mulai transfer secepatnya" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Tukar jendela lokal dan remote" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "&TLS Cipher" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Tes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Tema:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Transfer" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" -msgstr "Mode &transfer" +msgstr "Mode &transfer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "Antrian &transfer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "&Anggap berkas bertitik sebagai berkas ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "&Percayai sertifikat ini pada datar nama alternatif." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Batalkan Edit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Update kunci yang di-cache untuk mesin ini" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Upload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Upload ke:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Upload..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Upload:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Gunakan program kustomisasi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Gunakan Penjelajahan tersinkronisasi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "Gunakan editor default sistem untuk berkas teks" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Gunakan alamat IP berikut:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Gunakan alamat IP eksternal server" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Gunakan pemisah ribuan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Pengguna:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Nama pengguna:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Versi %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Lihat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Lihat/Edit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Perhatikan berkas yang diedit secara lokal dan konfirmasikan untuk upload " "modifikasi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Ketika memeriksa update, periksa untuk:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Tulis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Ya" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' tidak ada atau tidak bisa diakses." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' bukan direktori." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' bukan protokol yang didukung." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "Jenis login 'Akun' tidak didukung oleh protokol yang dipilih" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1114,7 +1168,7 @@ "Jenis login 'Normal' dan 'Account' tidak lagi tersedia, gunakan 'Tanya kata " "sandi'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1122,7 +1176,7 @@ "Jenis akun 'Normal' dan 'Account' tidak tersedia. Pilihan Anda telah " "berganti menjadi 'Tanyakan kata sandi'." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1132,57 +1186,57 @@ "argumen mengikuti 'quote' pada server. Anda bisa memasukkan perintah tanpa " "awalan 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objek terfilter)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% terdownload)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 untuk tanpa batas)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 detik)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 untuk menonaktifkan)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat diset pada %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(contoh: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(contoh: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(dalam %s/s)" @@ -1191,7 +1245,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- Lagi" @@ -1209,33 +1263,33 @@ #: ../../locales/../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." -msgstr "-s tidak bisa digunakan bersama dengan FTP URL" +msgstr "-s tidak bisa digunakan bersama dengan FTP URL." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Tidak ada" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Peringatan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Informasi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Detail" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "Sistem 32-bit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Debug" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "Sistem 64-bit" @@ -1243,24 +1297,30 @@ msgid "< &Back" msgstr "< &Kembali" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Penanda dengan nama yang dimasukkan sudah ada. Harap masukkan nama yang " "belum terpakai." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Sebuah sertifikat dalam rangkaian ditandatangani menggunakan algoritma yang " +"tidak aman" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Editor default harus ditentukan." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Sebuah direktori tidak bisa dipindah pada salah satu sub direktorinya." @@ -1275,21 +1335,21 @@ "FileZilla membuka sebuah port dan meminta server untuk terhubung ke port " "tersebut." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Sebuah berkas yang sebelumnya dibuka sudah berubah." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Berkas dengan nama tersebut sudah ditransfer." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Berkas dengan nama tersebut masih diedit. Harap ditutup dan coba kembali." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1304,11 +1364,20 @@ "daftar.\n" "Tidak ada pesan lain yang akan ditampilkan pada sesi ini." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Kata sandi utama yang hilang tidak dapat dikembalikan! Harap mengingat kata " +"sandi Anda." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Versi baru dari FileZilla sudah tersedia:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1317,7 +1386,7 @@ "yang salah menyembunyikan berkas dari pengguna. Gunakan opsi ini untuk " "memaksa server menampilkan semua berkas." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1325,7 +1394,7 @@ "Server yang benar tidak membutuhkan ini. Kontak administrator server jika " "Anda memerlukannya." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1335,17 +1404,17 @@ "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " "lokal?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "T&ambah" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "&Ijinkan melanjutkan berkas-berkas ASCII" @@ -1357,51 +1426,53 @@ msgid "A&pply only to uploads" msgstr "G&unakan hanya untuk upload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "&Terapkan pada semua berkas dan direktori" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "&Hapus transfer yang berhasil secara otomatis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Tentang FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Diatas daftar berkas" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Akses ke beberapa direktori lokal tidak bisa dikembalikan:" + +#: ../../locales/../src/engine/server.cpp:616 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Akun" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "Aksi setelah antrian &selesai" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Aksi pada berkas yang terpilih:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Aksi yang harus dilakukan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Aksi:" @@ -1409,7 +1480,7 @@ msgid "Active mode" msgstr "Mode aktif" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1417,7 +1488,7 @@ "Pengujian mode aktif FTP gagal. FileZilla tidak tahu alamat IP eksternal " "yang benar." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1426,7 +1497,7 @@ "yang benar. Sebagai tambahan, router Anda telah memodifikasi alamat " "pengiriman." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1435,38 +1506,39 @@ "Pengujian mode aktif FTP gagal. FileZilla tahu alamat IP eksternal yang " "benar, tetapi router atau firewall Anda telah memodifikasi alamat pengiriman." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP mode aktif" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Tambahkan berkas ke hanya ke &antrian" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Masukkan direktori yang dipilih pada antrian transfer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Masukkan berkas dan direktori yang dipilih pada antrian transfer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Tambahkan ke antrian" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Jenis alamat tidak didukung" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Tingkat lanjut" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1480,15 +1552,16 @@ "dan mungkin merusak sistem Anda. Gunakan versi beta dan build harian dengan " "resiko Anda sendiri." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "&Selalu gunakan aksi ini" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritma:" -#: ../../locales/../src/interface/QueueView.cpp:2937 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "Semua berkas telah berhasil ditransfer" @@ -1496,13 +1569,13 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Semua port pada jarak yang diberikan harus diantara 1024 dan 65535." -#: ../../locales/../src/interface/QueueView.cpp:2933 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "Semua transfer sudah selesai. %d berkas tidak bisa ditransfer." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Ijinkan &kembali pada mode transfer lain jika gagal" @@ -1510,16 +1583,16 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Ijinkan kembali pada mode transfer lain jika gagal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Sudah terhubung" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nama alternatif:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1527,7 +1600,7 @@ "Alternatif lain, Anda bisa menggunakan aplikasi Pageant dari PuTTY untuk " "mengelola kunci Anda, FileZilla bisa mengenali Pageant." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1535,14 +1608,14 @@ "Alternatif lain, Anda bisa menggunakan agent SSH sistem Anda. Untuk " "melakukannya, pastikan variabel lingkungan SSH_AUTH_SOCK sudah diset." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "" "Alternatifnya, Anda bisa mendownload versi terbaru dari website FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1902 +#: ../../locales/../src/interface/QueueView.cpp:1662 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1551,7 +1624,7 @@ "Sebuah kesalahan memuat antrian transfer dari \"%s\".\n" "Beberapa antrian mungkin belum dikembalikan." -#: ../../locales/../src/interface/QueueView.cpp:1812 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1560,7 +1633,11 @@ "Sebuah kesalahan memuat antrian transfer ke \"%s\".\n" "Beberapa antrian mungkin belum dikembalikan." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Penyedia pada rangkaian sertifikat bukanlah certificate authority" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1568,74 +1645,73 @@ "Berkas dengan nama yang sama dengan berkas yang sedang di-geser sudah ada " "pada lokasi target." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:641 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Anonim" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Operasi remote lain sedang berlangsung, tidak dapat mengganti direktori saat " "ini." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "Semua perubahan pada Manajemen Situs tidak bisa disimpan." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Semua perubahan pada Manajemen Situs tidak dapat disimpan." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Semua perubahan pada filter tidak akan disimpan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "&Terapkan pada direktori saja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Terapkan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Terapkan pada &antrian saat ini saja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Terapkan pada &berkas saja" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Arsip" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Argument buffer overflow" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Sebagai tab dalam tampilan antrian transfer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Meminta tindakan" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/engine/server.cpp:633 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Meminta kata sandi" @@ -1647,7 +1723,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Meminta sistem operasi anda untuk alamat IP eksternal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Menanyakan pertanyaan pada forum FileZilla" @@ -1655,7 +1731,7 @@ msgid "Associated program not found:" msgstr "Program yang sesuai tidak ditemukan:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Paling tidak satu kondisi filter tidak lengkap" @@ -1663,99 +1739,106 @@ msgid "At this point, all required information has been gathered." msgstr "Pada titik ini, semua informasi yang diperlukan sudah didapatkan." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Authentikasi gagal." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Pembuat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Otomatis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Klasifikasi jenis berkas secara otomatis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Ukuran yang tersedia" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B " -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "L&ewati proxy" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Deskriptor berkas rusak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Instruksi penggunaan dasar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Perilaku" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Sedang diedit" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Hati-hati! Sertifikat sudah dibatalkan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Biner" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Blackboard" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Biru" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Penanda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Penanda:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Penanda" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Jelajah..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Keranjang tidak ditemukan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Tanggal pembuatan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Informasi pembuatan" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Kategori bisnis:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1766,99 +1849,115 @@ "untuk hanya menggunakan port tertentu, harap masukan batasan port dibawah " "ini." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "B&atalkan operasi saat ini" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "B&ersihkan semua" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "&Salin URL ke clipboard" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "&Salin URL dengan kata sandi ke clipboard" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "&Kustomisasi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Klasifikasi jenis berkas kustomisasi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "Fitur CPU:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Menkalkulasi offset zona waktu server..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Tidak dapat membaca dari berkas" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." -msgstr "Tidak dapat menulis data ke berkas" +msgstr "Tidak dapat menulis data ke berkas." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Tidak dapat menulis data ke berkas: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Batal" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Batalkan operasi saat ini" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Batalkan operasi saat ini" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Tidak bisa mengakses '%s', tidak ada media yang dimasukkan atau drive tidak " -"siap" +"siap." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Tidak bisa menambahkan server pada Manajemen Situs" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Tidak bisa memberikan alamat yang diminta" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Tidak bisa berubah direktori, sudah terdapat operasi sinkronisasi yang " +"sedang berjalan." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1866,7 +1965,7 @@ "Tidak bisa menutup tab ketika sedang sibuk.\n" "Batalkan operasi dan tutup tab?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1878,22 +1977,23 @@ msgid "Cannot create new filter" msgstr "Tidak dapat membuat filter baru" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Tidak dapat mengedit berkas" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Tidak dapat mengedit berkas, tidak terhubung ke server." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Tidak bisa mengedit berkas, path remote tidak diketahui." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1901,82 +2001,81 @@ "Tidak bisa membuat koneksi FTP pada server SFTP. Harap pilih protokol yang " "benar." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Tidak dapat membuka papan Koneksi cepat dari berkas sumber" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Tidak dapat memuat berkas kunci" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Tidak dapat membuka toolbar dari berkas sumber" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Tidak bisa mengingat kata sandi" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "Tidak dapat mengganti nama daftar" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Tidak dapat mengganti nama berkas" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Tidak dapat me-resolve nama host ke alamat IPv4 untuk digunakan dengan " "SOCKS4 proxy." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Tidak dapat menyimpat kumpulan filter" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Tidak dapat memilih filter" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Tidak dapat menentukan asosiasi berkas" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Tidak bisa menampilkan dialog" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Tidak bisa melihat/edit berkas yang dipilih" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Case Insensitive" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Case sensitive" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" -msgstr "ase insensitive (default)" +msgstr "Case insensitive (default)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Case insensitive" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Case insensitive (default)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Kategori yang hendak dibersihkan" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "Data sertifikat dan sesi tidak tersedia." @@ -1988,36 +2087,40 @@ msgid "Certificate issuer" msgstr "Pembuat sertifikat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Verifikasi tandatangan sertifikat gagal" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Tantangan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Ganti atribut berkas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Ganti hak akses berkas." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Mengganti pengaturan berkas log membutuhkan akses ulang FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Masalah enkoding karakter" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Charset" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Periksa &update..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Periksa untuk &update FileZilla secara otomatis:" @@ -2025,15 +2128,15 @@ msgid "Check for Updates" msgstr "Periksa untuk Update" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Periksa versi baru dari FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Pemeriksaan update gagal" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2041,7 +2144,7 @@ "Periksa hak akses login Anda. Kata sandi yang dimasukkan dimulai atau " "diakhiri dengan karakter spasi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2049,39 +2152,39 @@ "Periksa hak akses login Anda. Nama pengguna yang dimasukkan dimulai atau " "diakhiri dengan karakter spasi." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Memeriksa alamat IP eksternal yang benar" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Memeriksa update..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "Pemeriksaan checksum cocok pada berkas %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Pemeriksaan checksum tidak cocok pada berkas %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "Pilih berkas kunci" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Pilih direktori lokal default" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Pilih direktori lokal" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:668 msgid "Chunk data improperly terminated" msgstr "Potongan data terhapus secara tidak benar" @@ -2090,54 +2193,62 @@ msgstr "Cipher:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "Tut&up tab" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Klasik" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Hapus cache &layout" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Hapus data &update otomatis" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Hapus sejarah" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Hapus data privat" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Hapus koneksi cepat" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Klik pada Selesai untuk menyimpan konfigurasi Anda." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Klien ke server MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Cipher klien ke server:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Tutup" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "Tutup &semua tab yang lain" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "Tutup FileZilla" @@ -2145,103 +2256,108 @@ msgid "Close all running instances of FileZilla" msgstr "Tutup semua FileZilla yang sedang berjalan" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Tutup pencarian cepat dan lanjutkan perbandingan?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Tutup tab aktual" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Ko&mentar:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Properti kolom" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Setup kolom" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Perintah dan argumennya harus diberi tanda kutip dengan benar." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Perintah gagal" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Perintah tidak didukung" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Perintah tidak didukung oleh protokol ini" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Perintah:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Komentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Nama umum:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Komunikasi diputus oleh router atau firewall" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Bandingkan waktu &modifikasi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Bandingkan &ukuran berkas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Batasan &perbandingan (dalam menit):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Jumlah percobaan harus diantara 0 dan 1440 menit." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Dikompilasi untuk:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Dikompilasi pada:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Dikompilasi dengan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Opsi kompiler:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Terkompresi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Transfer konkurensi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Kondisi bersifat &case sensitive" @@ -2257,41 +2373,42 @@ msgid "Configure port range" msgstr "Konfigurasi batasan port" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Mengkonfigurasi FileZilla dan jaringan Anda" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Konfirmasi penghapusan" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Dibutuhkan konfirmasi" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Selamat, konfigurasi Anda bekerja." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Pengaturan koneksi tanpa melalui proxy" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Koneksi gagal: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Hubungkan pada tab aktual" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Hubungkan pada tab baru" @@ -2299,25 +2416,26 @@ msgid "Connect to specified Site Manager site" msgstr "Hubungkan ke situs Manajemen Situs yang ditentukan" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Menghubungkan" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Menghubungkan ke %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Menghubungkan ke %s melalui proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Menghubungkan ke %s..." @@ -2326,184 +2444,226 @@ msgid "Connection" msgstr "Koneksi" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Koneksi dibatalkan" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Percobaan koneksi gagal" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Percobaan koneksi gagal dengan \"%s\", mencoba alamat berikutnya." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Percobaan koneksi gagal dengan \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Percobaan koneksi diinterupsi oleh pengguna" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Koneksi time out" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Koneksi tertutup" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:303 +#: ../../locales/../src/engine/http/request.cpp:316 +#: ../../locales/../src/engine/http/request.cpp:327 +#: ../../locales/../src/engine/http/request.cpp:338 msgid "Connection closed by server" msgstr "Koneksi ditutup oleh server" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "Koneksi terbentuk, menginisialisasi TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "Koneksi terbentuk, mengirimkan permintaan HTTP" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "Koneksi terbentuk, menunggu ucapan selamat datang." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Koneksi terbentuk, menunggu ucapan selamat datang..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Koneksi putus" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Koneksi tidak diijinkan oleh kumpulan aturan" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Koneksi ditolak" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Koneksi ditolak oleh server" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Koneksi diulang oleh jaringan" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Koneksi diulang oleh peer" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Koneksi time out setelah %d detik tidak aktif" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Koneksi time out." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Koneksi ke server putus." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "Koneksi dengan proxy terbentuk, melakukan handshake..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Koneksi dengan server tertutup secara prematur." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." -msgstr "Koneksi dengan server pengujian gagal" +msgstr "Koneksi dengan server pengujian gagal." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Konversi berkas kunci" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Salin (%d) dari %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "Salinan dari %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Salin URL dari item yang dipilih pada clipboard, termasuk kata sandi." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Salin URL dari item yang dipilih pada clipboard." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Tidak dapat menerima hubungan: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Tidak dapat mengakses path %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "" +"Tidak dapat menambahkan sertifikat pada daftar sertifikat yang terpercaya" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Tidak bisa menambahkan koneksi pada Manajemen Situs" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Tidak dapat menyelesaikan operasi" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Tidak dapat terhubung ke server" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Tidak dapat terhubung ke server: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Tidak dapat mengkonversi perintah ke enkoding server" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Tidak dapat mengkonversi kunci privat" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Tidak dapat menyalin URL" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Tidak dapat menyalin sertifikat" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Tidak dapat menyalin data" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Tidak bisa membuat CFURL dari path %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Tidak bisa membuat URI untuk transfer ini." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Tidak bisa membuat berkas lokal%s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Tidak bisa membuat mutex %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Tidak bisa membuat bookmark dari URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2513,11 +2673,11 @@ "Entah ekstensi shell tidak terinstal dengan benar atau Anda tidak meletakkan " "berkas pada jendela Explorer." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Tidak dapat menjalin hubungan dengan server" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2529,11 +2689,16 @@ "perintah '--datadir ' atau dengan menentukan variabel lingkungan " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Tidak dapat menghasilkan urutan login." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Tidak dapat menghasilkan kunci" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2541,7 +2706,7 @@ "Tidak dapat mendapatkan nama unik dari pemberi sertifikat, " "gnutls_x509_get_issuer_dn gagal" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2549,39 +2714,36 @@ "Tidak dapat mendapatkan nama unik dari pemberi sertifikat, " "gnutls_x509_get_dn gagal" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." -msgstr "Tidak dapat memperoleh path remote lengkap" +msgstr "Tidak dapat memperoleh path remote lengkap." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Tidak dapat menerima path dari CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Tidak dapat mendapatkan path dari URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Tidak dapat mendapatkan jawaban dari fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." -msgstr "Tidak bisa mendapatkan direktori sementara untuk mendownload berkas" +msgstr "Tidak bisa mendapatkan direktori sementara untuk mendownload berkas." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "Tidak dapat mengimpor sertifikat peer, gnutls_x509_crt_import gagal" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:96 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Tidak bisa menginisialisasi Winsock (%d): %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Tidak dapt menginisialisasi struktur untuk sertifikat peer, " -"gnutls_x509_crt_init gagal" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2591,15 +2753,21 @@ "Tidak dapat membuka \"%s\", pastikan berkas valid dan dapat diakses.\n" "Semua perubahan di Manajemen Situs tidak akan disimpan." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Tidak dapat memuat berkas kunci" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Tidak bisa memuat kunci privat" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2610,7 +2778,7 @@ "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " "remote?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2620,7 +2788,7 @@ "Tidak dapat mendapatkan direktori lokal untuk direktori remote '%s'.\n" "Penjelajahan tersinkronisasi telah dinonaktifkan." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2631,72 +2799,112 @@ "'%s'.\n" "Penjelajahan tersinkronisasi telah dinonaktifkan." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Tidak bisa mendapatkan ukuran dari '%s'" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Tidak bisa membuka '%s'" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Tidak dapat membuka clipboard" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Tidak bisa membuka berkas log: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Tidak dapat memproses path remote." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Tidak dapat memproses alamat server:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Tidak bisa membaca dari '%s'" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." msgstr "Tidak bisa menulis dari socket data." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:380 #, c-format msgid "Could not read from socket: %s" msgstr "Tidak bisa menulis dari socket: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." -msgstr "Tidak dapat membaca item server" +msgstr "Tidak dapat membaca item server." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Tidak dapat menerima data dari server." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Tidak dapat mencari ke offset %s dari berkas" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Tidak dapat mengembalikan akses direktori" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Tidak dapat mencari ke offset %d pada berkas" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Tidak dapat mencari ke awal berkas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Tidak dapat mencari hingga ke akhir berkas" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Tidak dapat mengirimkan perintah ke fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Tidak dapat mengirimkan perintah ke fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Tidak dapat mengurutkan sertifikat peer" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "Tidak dapat mengulang thread IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Tidak dapat memulai handshake proxy: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Tidak dapat memulai transfer" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2705,17 +2913,17 @@ "Tidak dapat menulis \"%s\", semua perubahan pada Manajemen Situs tidak dapat " "disimpan: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Tidak dapat menulis \"%s\", penanda tidak dapat disimpan: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Tidak dapat menulis \"%s\", penanda global tidak dapat disimpan: %s" -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2724,122 +2932,124 @@ "Tidak dapat menulis \"%s\", antrian tidak dapat disimpan.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Tidak dapat menulis \"%s\", situs yang terpilih tidak bisa diekspor: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Tidak bisa menulis \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Tidak bisa menulis berkas kunci: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Tidak bisa menulis ke berkas lokal" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Tidak bisa menulis ke berkas log: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:235 #, c-format msgid "Could not write to socket: %s" msgstr "Tidak bisa menulis ke socket: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Negara:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "Membua&t berkas baru" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "Membuat direktori lokal yang tidak ada dan &masuk" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "Membuat direktori remote yang tidak ada dan &masuk" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Membuat sub direkori baru di direktori saat ini" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "" "Membuat sub direkori baru di direktori saat ini dan berpindah ke direktori " "baru tersebut" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Membuat berkas kosong baru di direktori saat ini" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "Membuat direktor&i dan masuk" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Membuat direktori" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "Membuat berkas kosong" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Membuat direktori" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Membuat direktori '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Kesalahan kritis" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Kesalahan kritis:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Kesalahan transfer berkas kritis" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kesalahan transfer berkas kritis setelah mentransfer %s pada %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2848,97 +3058,102 @@ "Direktori remote aktual (%s) tidak berada dibawah sinkronisasi root (%s).\n" "Penjelajahan tersinkronisasi telah dinonaktifkan." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Jenis transfer saat ini ditentukan ke ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Jenis transfer saat ini ditentukan ke pendeteksian otomatis." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Jenis transfer saat ini ditentukan ke biner." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Kurva:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Kus&tomisasi" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Sekumpulan filter kustomisasi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Server kustomisasi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Sian" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Tipe d&ata" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Prefix d&esimal menggunakan simbol SI (cth. 1 KB = 1000 byte)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "D&efault" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "H&apus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "Perbandingan d&irektori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "&Nonaktifkan semua" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "J&angan simpan kata kunci" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "A&ksi klik ganda pada direktori:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "D&uplikat" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:56 msgid "DOS-like with virtual paths" msgstr "Seperi DOS dengan path virtual" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Jenis berkas berbahaya" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Data" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." -msgstr "Soket data tertutup terlalu cepat" +msgstr "Soket data tertutup terlalu cepat." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Tanggal" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Pemformatan tanggal" @@ -2954,15 +3169,15 @@ msgid "Debug" msgstr "Debug" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Pengaturan debug" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Direktori &lokal default:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:48 msgid "Default (Autodetect)" msgstr "Default (Deteksi Otomatis)" @@ -2970,17 +3185,17 @@ msgid "Default editor not properly quoted." msgstr "Editor default tidak diberi tanda kutip dengan benar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Aksi berkas sudah ada default" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Direktori r&emote default:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2988,7 +3203,7 @@ "Path remote default tidak bisa diproses. Pastikan merupakan path absolut " "yang valid dan didukung oleh jenis server yang dipilih." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Bahasa sistem default" @@ -2996,12 +3211,12 @@ msgid "Default transfer mode:" msgstr "Mode transfer default:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Jenis transfer default:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Default: http://ip.filezilla-project.org/ip.php" @@ -3012,7 +3227,7 @@ "Keterlambatan diantara percobaan koneksi yang gagal harus diantara 1 dan 999 " "detik." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3024,75 +3239,85 @@ "Menunda koneksi selama %d detik karena percobaan koneksi yang gagal " "sebelumnya..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "Hapus daftar Manajemen Situs" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Hapus direktori yang dipilih" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Hapus berkas-berkas dan direktori yang dipilih" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Menghapus \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Menghapus %u berkas dari \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Menghapus link simbolis" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Desktop" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Detail" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Detail untuk kunci baru:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "Terdeteksi versi FileZilla yang lebih baru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "Dire&ktori" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Arah" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Direktori:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Direktori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Hak akses direktori" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Perbandingan direktori" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Perbandingan direktori gagal" @@ -3100,39 +3325,43 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "Direktori berisi berkas log tidak ada atau nama berkas tidak valid." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "&Filter pendataan direktori..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Pendataan direktori dibatalkan oleh pengguna" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "Pendataan direktori gagal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Filter pendataan direktori" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Pendataan direktori \"%s\" berhasil" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Pendataan direktori berhasil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "&Nonaktifkan semua" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " "remote?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3140,86 +3369,81 @@ "Nonaktifkan opsi ini kembali jika Anda tidak bisa melihat isi direktori " "dengan benar." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Putuskan hubungan dari server" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Telah terputus dari server" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Telah terputus dari server: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Memutuskan dari server sebelumnya" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Memutuskan dari server yang terlihat sekarang" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" -msgstr "Tampilkan dialog \"tentang\"" +msgstr "Tampilkan dialog tentang" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "&Jangan gunakan editor default ini" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Tidak &lakukan apa-apa" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Lakukan hal yang sama untuk semu&a berkas yang dipilih sedang diedit" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Apakah Anda hendak menutup FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Apakah Anda hendak menghapus semua daftar Manajemen Situs dan antrian " "transfer?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Apakah Anda hendak menghapus semua daftar Manajemen Situs?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Apakah Anda hendak menghapus daftar yang terpilih?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Apakah Anda hendak menghapus antrian transfer?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Apakah Anda hendak mengirimkan '%s' pada server?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Apakah Anda hendak membuka kembali berkas ini?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Dokumentasi" @@ -3227,49 +3451,49 @@ msgid "Don't use external IP address on &local connections." msgstr "Jangan gunakan alamat IP eksternal pada koneksi &lokal." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Berkas bertitik adalah nama berkas yang dimulai dengan titik, misalnya ." "htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Aksi klik ganda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Download" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "&Batasan download:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" -msgstr "Batasan download %s/s:" +msgstr "Batasan download %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Batasan download: tidak ada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Download hasil pencarian" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Download direktori yang dipilih" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Download berkas dan direktori yang dipilih" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3278,34 +3502,34 @@ "Kecepatan download: %s/s\n" "Kecepatan upload: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Mendownload" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Mendownload %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Mendownload update..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:90 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "Drag&drop antar FileZilla yang berbeda belum diimplementasikan." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:103 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Drag&drop antara server yang berbeda belum diimplementasikan." @@ -3313,16 +3537,16 @@ msgid "Dupl&icate" msgstr "Dupl&ikat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "&Aktifkan semua" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "&Masukkan direktori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "E&ksekusi" @@ -3330,49 +3554,49 @@ msgid "E&xit" msgstr "Ke&luar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." msgstr "E&kspor..." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "E-Mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Setiap filter perlu paling tidak satu kondisi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Edit filter" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Edit berkas dengan editor yang telah dikonfigurasi dan upload perubahan pada " "server." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "Perubahan direktori belum didukung" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Pengeditan gagal" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Mengedit hasil pencarian" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "Masukkan perintah sendiri" @@ -3380,7 +3604,7 @@ msgid "Empty command." msgstr "Perintah kosong." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "Daftar direktori kosong" @@ -3390,15 +3614,15 @@ #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." -msgstr "Ekstensi berkas kosong" +msgstr "Ekstensi berkas kosong." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Nama filter kosong tidak diijinkan." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Nama kosong" @@ -3406,81 +3630,97 @@ msgid "Empty quoted string." msgstr "String tanda kutip kosong." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Ak&tifkan semua" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Aktifkan &penyaringan karakter yang tidak valid" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Terenkripsi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Enkripsi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Kunci Enkripsi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Kunci Enkripsi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Detail enkripsi" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Akhiri perbandingan dan ganti urutan pengurutan?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Akhiri perbandingan dan buka pencarian cepat?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "Masukkan &perintah sendiri..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Masukkan 0 untuk kecepatan tidak terbatas." -#: ../../locales/../src/interface/QueueView.cpp:2103 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "Masukkan perintah" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Masukkan perintah sendiri" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Masukkan direktori" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Masukkan nama filter" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Masukkan kata kunci utama" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Masukkan nama untuk kelompok filter" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Masukkan nama baru untuk kelompok filter" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Masukkan Kata kunci" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Masukkan direktori yang terpilih" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3488,11 +3728,11 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Masukkan alamat server.\n" -"Untuk menentukan protokol server, masukkan host dengan protokolnya. Jika " -"protokol tidak ditentukan, protokol default (ftp://) akan digunakan.\n" -"Anda juga dapat memasukkan URL lengkap dalam bentuk protokol://pengguna:" -"katasandi@host:port disini, nilai di field lainnya akan ditimpa.\n" +"Masukkan alamat server. Untuk menentukan protokol server, masukkan host " +"dengan protokolnya. Jika protokol tidak ditentukan, protokol default " +"(ftp://) akan digunakan. Anda juga dapat memasukkan URL lengkap dalam bentuk " +"protokol://pengguna:katasandi@host:port disini, nilai di field lainnya akan " +"ditimpa.\n" "\n" "Protokol yang didukung:\n" "- ftp:// untuk FTP normal dengan enkripsi opsional\n" @@ -3500,7 +3740,7 @@ "- ftps:// untuk FTP melalui TLS (implisit)\n" "- ftpes:// untuk FTP melalui TLS (eksplisit)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3509,145 +3749,161 @@ "Masukkan kata sandi untuk berkas '%s'.\n" "Berkas yang dikonversi akan diproteksi dengan kata sandi yang sama." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Masukkan port yang digunakan oleh server.\n" -"Port default FTP adalah 21, port default SFTP adalah 22." +"Masukkan port yang digunakan oleh server. Port default FTP adalah 21, port " +"default SFTP adalah 22." -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Masukkan nama pengguna" + +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Masukkan nama pengguna dan kata kunci" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Kesalahan" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Kesalahan pengaturan ekspor" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Kesalahan dalam mengimpor" -#: ../../locales/../src/interface/QueueView.cpp:1903 +#: ../../locales/../src/interface/QueueView.cpp:1663 msgid "Error loading queue" msgstr "Kesalahan memuat antrian" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1824 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Kesalahan memuat berkas xml" -#: ../../locales/../src/interface/QueueView.cpp:1813 +#: ../../locales/../src/interface/QueueView.cpp:1556 msgid "Error saving queue" msgstr "Kesalahan menyimpan antrian" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Kesalahan menjalankan program" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Kesalahan menulis berkas xml" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Kesalahan:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Contoh: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Contoh" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Jal&ankan" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "Aplikasi tidak berisi informasi versi, tidak bisa memeriksa update." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Penjelajah" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "&Filter Ekspor" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Ekspor &Antrian" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "&Pengaturan Ekspor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Pengaturan ekspor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" -msgstr "Nama F&ilter" +msgstr "Nama F&ilter:" #: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - File Transfer Protocol" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - File Transfer Protocol dengan enkripsi opsional" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - File Transfer Protocol Tidak Aman" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Mesin FTP tidak bisa diinisialisasi, tidak terhubung" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "FTP Keep-alive" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "Proxy FTP" @@ -3664,77 +3920,89 @@ "FTP menggunakan koneksi kedua untuk transfer data. Koneksi tambahan ini " "harus dibuat dalam dua cara." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP: Jenis Berkas" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP diatas TLS eksplisit" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP diatas TLS implisit" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Gagal mengganti direktori" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Gagal mengganti bahasa" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Tidak dapat mengkonversi perintah ke karakter set 8 bit" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "Gagal menyalin atau memindahkan situs" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Gagal membuat salinan backup dari berkas xml" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Gagal membuat soket, membatalkan" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Gagal membuat soket pada port %d, membatalkan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Gagal membuat soket untuk mengirim mode transfer aktif" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Gagal untuk mendekripsi kata sandi server." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" -msgstr "Gagal untuk mendapatkan path 'Dokumenku'" +msgstr "Gagal untuk mendapatkan path 'Dokumen Saya'" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Gagal mengambil path desktop" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Gagal untuk mendapatkan alamat peer dari kontrol koneksi, koneksi terputus." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Gagal untuk mendapatkan alamat peer dari koneksi data, koneksi terputus." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Gagal untuk menginisialisasi mesin FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "Gagal untuk menginisialisasi TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" msgstr "Gagal untuk menginisialisasi jaringan" @@ -3742,69 +4010,69 @@ msgid "Failed to load panels, invalid resource files?" msgstr "Gagal memuat panel, berkas resource tidak valid?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Gagal memuat kunci privat: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Gagal membuka \"%s\" untuk menambah/menulis" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Gagal membuka \"%s\" untuk dibaca" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Gagal membuka \"%s\" untuk ditulis" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "Tidak dapat memproses path." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Gagal menerima data" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Gagal mengambil daftar direktori" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Gagal mengambil alamat ip eksternal, membatalkan" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" -msgstr "Gagal mengambil alamat ip eksternal, menggunakan alamat lokal" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Gagal mengambil alamat ip lokal." - -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Gagal mengambil alamat ip lokal. Membatalkan" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Gagal mendapatkan alamat IP eksternal, membatalkan." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" +msgstr "Gagal mengambil alamat IP eksternal, menggunakan alamat lokal" + +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Gagal mendapatkan alamat IP lokal. Membatalkan." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Gagal mengambil alamat IP lokal." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Gagal mengambil alamat IP eksternal." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Gagal mengirimkan perintah." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "Gagal menentukan bahasa ke %s (%s), menggunakan bahasa sistem default" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3812,41 +4080,40 @@ "Gagal menentukan bahasa ke %s (%s), menggunakan bahasa sistem default (%s, " "%s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." -msgstr "Gagal menentukan bahasa ke %s (%s), menggunakan bahasa sistem default" +msgstr "Gagal menentukan bahasa ke %s (%s), menggunakan bahasa sistem default." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Gagal menentukan bahasa ke %s, menggunakan bahasa sistem default" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "Gagal menentukan bahasa ke %s, gunakan bahasa sistem default (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Gagal menentukan bahasa ke %s, menggunakan bahasa sistem default." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Gagal memvalidasi pengaturan" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Gagal memverifikasi sertifikat peer" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Gagal menulis ke berkas %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Gagal menulis berkas xml" @@ -3858,27 +4125,23 @@ msgid "Fall back to active mode" msgstr "Kembali ke mode aktif" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "B&erkas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "B&erkas" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Berkas" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Jenis Berkas" - -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Deskriptor berkas bukan sebuah socket" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Berkas tidak mengandung data yang dapat diimpor." @@ -3886,7 +4149,7 @@ msgid "File editing" msgstr "Pengeditan berkas" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "Berkas ada" @@ -3894,7 +4157,7 @@ msgid "File exists action" msgstr "Aksi jika berkas ada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Berkas sudah berubah" @@ -3902,64 +4165,68 @@ msgid "File lists" msgstr "Daftar berkas" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Berkas tidak ditemukan" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Pencarian berkas" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Transfer berkas dibatalkan oleh pengguna" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "Transfer berkas dibatalkan oleh pengguna setelah mentransfer %s pada %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Transfer berkas gagal" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Transfer berkas gagal setelah mentransfer %s pada %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Pengiriman berkas dilewatkan" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Transfer berkas berhasil" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Transfer berkas berhasil, tertransfer %s pada %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Transfer berkas sedang dalam proses." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." -msgstr "Berkas akan ditransfer dengan tipe data ASCII" +msgstr "Berkas akan ditransfer dengan tipe data ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." -msgstr "Berkas akan ditransfer dengan tipe data biner" +msgstr "Berkas akan ditransfer dengan tipe data biner." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "FileZilla Bermasalah" @@ -3971,73 +4238,77 @@ "FileZilla sekarang bisa menguji konfigurasi Anda untuk memastikan semua " "sudah sudah benar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla sudah terhubung ke sebuah server." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "FileZilla harus dijalankan ulang agar perubahan bahasa berjalan." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Update FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "&Status bar daftar berkas" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Nama berkas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Filter nama berkas..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Nama berkas tidak bisa dibuat untuk direktori %s dan nama berkas %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "Nama berkas tidak valid" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Nama berkas tidak berubah" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Nama berkas:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Nama berkas tidak boleh menggunakan karakter berikut: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "Nama berkas tidak boleh menggunakan karakter berikut: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Berkas saat ini sedang diedit" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Berkas yang sesuai dengan aturan dihapus dari daftar isi direktori." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Berkas tidak ditemukan" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Ukuran berkas" @@ -4045,50 +4316,54 @@ msgid "Filesize format" msgstr "Format ukuran berkas" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Jenis berkas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Asosiasi jenis berkas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Filter diterapkan pada:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Saring karakter yang tidak valid pada nama berkas" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Nama filter sudah ada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Buang semua item yang cocok dengan berikut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Buang semua item yang cocok dengan salah satu berikut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Buang semua item yang tidak cocok dengan berikut" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Buang semua item yang tidak cocok dari pilihan berikut" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Kumpulan filter sudah ada" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filter daftar direktori" @@ -4098,11 +4373,11 @@ msgid "Filter validation failed" msgstr "Validasi filter gagal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Mencari &berkas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Mencari d&irektori" @@ -4114,16 +4389,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Sidik jari (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" msgstr "Sidik jari:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Panduan konfigurasi firewall dan router" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4135,7 +4411,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Untuk reliabilitas, Anda harus menentukan paling tidak 10 port." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4143,35 +4419,40 @@ "Untuk sesi ini, pengaturan default akan digunakan. Semua perubahan pada " "aturan tidak akan disimpan." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Paksa &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Paksa menampilkan berkas &tersembunyi" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Paksa menampilkan berkas tersembunyi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Klasifikasi format:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Format: Ekstensi diikuti dengan perintah dan argumen yang diberi tanda kutip " "dengan benar." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Menemukan %s %s baru\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Fungsi %s gagal" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Dokumentasi lebih lanjut" @@ -4179,11 +4460,15 @@ msgid "General" msgstr "Umum" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Kegagalan server SOCKS umum" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Menghasilkan..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Proxy generik" @@ -4192,70 +4477,74 @@ msgid "Get external IP address from the following URL:" msgstr "Dapatkan alamat IP eksternal dari URL berikut:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Mendapatkan bantuan" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Karena nama filter sudah ada, timpa kumpulan filter yang ada?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Penanda global" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Kesalahan GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Kesalahan GnuTLS %d pada %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Kesalahan GnuTLS %d pada %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Kesalahan GnuTLS %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Hijau" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Hak akses grup" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "T&inggi" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP diatas TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Tersembunyi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 #: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Tinggi" -#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:938 #: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Tertinggi" @@ -4264,57 +4553,66 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Port tertinggi yang tersedia harus angka antara 1024 dan 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Tahan kunci shift untuk mengganti kondisi filter pada kedua sisi secara " "simultan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Situs:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Situs tidak bisa diakses" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Sidik jari kunci host:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Kunci mesin tidak cocok" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Host dimulai dengan '[' tetapi tidak ada kurung penutup." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Host tidak dapat dicapai" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Mesin:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algoritma kunci host:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Jam," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Saya &lupa kata sandi utama saya. Hapus semua kata sandi yang tersimpan " +"dengan kunci ini." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (contoh: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Alamat IPv6 tidak didukung oleh SOCKS4 proxy" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4324,7 +4622,7 @@ "waktu tertentu, koneksi akan ditutup dan FileZilla akan mencoba untuk " "menyambung kembali." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Jika melaporkan kesalahan, harap sediakan log dengan level pencatatan " @@ -4350,7 +4648,7 @@ "Jika opsi kembali (fallback) diaktifkan, Anda bisa terhubung ke server yang " "salah konfigurasi yang menolak mode transfer yang dipilih." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4358,7 +4656,7 @@ "Jika perubahan pada kunci mesin tidak diharapkan, harap menghubungi " "administrator situs." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4366,7 +4664,7 @@ "Jika masalah ini tetap muncul, beberapa router dan/atau firewall akan " "menghalangi FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4374,7 +4672,7 @@ "Jika masalah ini tetap muncul, beberapa router dan/atau firewall akan " "menginterupsi koneksi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4384,7 +4682,7 @@ "menambahkan \".1\" pada akhir nama berkas (kemungkinan menimpa berkas log " "lama) dan berkas baru akan dibuat." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4392,7 +4690,7 @@ "Jika symlink mengacu ke direktori, FileZilla bisa menghapus link simbolis " "atau menghapus isi dari direktori yang dituju." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4400,12 +4698,12 @@ "Jika masalah ini tetap muncul, harap hubungi pembuat router atau firewall " "Anda untuk solusinya." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "Jika masalah ini tetap ada, harap hubungi pembuat router Anda." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4415,7 +4713,7 @@ "disinkronkan dengan server. Jika waktu berbeda (misalnya zona waktu " "berbeda), tentukan offset zona waktu pada manajemen situs." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4424,7 +4722,7 @@ "sama jika perbedaan timestamp diantara keduanya tidak melebihi batas " "threshold ini." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Jika Anda mengganti bahasa, Anda harus menjalankan ulang FileZilla." @@ -4436,24 +4734,24 @@ "Jika Anda klik pada pengujian, FileZilla akan terhubung ke probe.filezilla-" "project.org dan melakukan pengujian sederhana." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Jika Anda menutup FileZilla, perubahan Anda akan hilang." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "" "Jika Anda salah memasukkan jenis berkas, berkas tersebut mungkin akan rusak " -"ketika ditransfer" +"ketika ditransfer." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." msgstr "" "Jika Anda mendapatkan sembarang kesalahan, konfigurasi Anda tidak benar." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4461,7 +4759,7 @@ "Jika Anda memiliki masalah mendapatkan daftar direktori atau mentransfer " "berkas, coba untuk mengganti mode transfer default." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4496,7 +4794,7 @@ "Jika Anda menggunakan router, pastikan semua port diteruskan pada mesin " "dimana Anda menjalankan FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4504,23 +4802,23 @@ "Jika router Anda terus menerus berganti alamat IP, harap hubungi pembuat " "router Anda." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Mengimpor data dari versi lama" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Impor pengaturan" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Impor berhasil" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 msgid "Improperly quoted association." -msgstr "Pemberian tanda kutip pada asosiasi salah" +msgstr "Pemberian tanda kutip pada asosiasi salah." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" @@ -4539,7 +4837,7 @@ "karena FileZilla tidak punya hubungan pada port yang dipilih sistem Anda." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4556,19 +4854,11 @@ "meminta sebuah port kepada server dan terhubung melalui port tersebut. Tidak " "banyak konfigurasi yang harus dilakukan untuk ini." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Rantai yang tidak lengkap, sertifikat induk bukan sertifikat yang " -"ditandatangani certificate authority" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Kata kunci salah" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4576,21 +4866,21 @@ "Informasi tentang versi terbaru dari FileZilla tidak bisa didapatkan. Harap " "mencoba kembali nanti." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Menginisialisasi TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "Algoritma tidak aman!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Server tidak aman, tidak mendukung FTP diatas TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:613 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interaktif" @@ -4598,29 +4888,29 @@ msgid "Interface" msgstr "Antarmuka" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "DIinterupsi oleh sinyal" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" -msgstr "DIinterupsi oleh pengguna" +msgstr "Diinterupsi oleh pengguna" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 +#: ../../locales/../src/engine/http/request.cpp:582 msgid "Invalid Content-Length" msgstr "Ukuran konten tidak valid" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:488 msgid "Invalid HTTP Response" msgstr "Respon HTTP tidak valid" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Argumen yang dikirimkan tidak valid" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4628,45 +4918,69 @@ "Urutan karakter yang diterima tidak valid, menonaktifkan UTF-8. Memilih opsi " "UTF-8 pada manajemen situs untuk memaksa UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:703 msgid "Invalid chunk size" msgstr "Ukuran potongan berkas tidak valid" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Data yang diterima tidak valid" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Tanggal tidak valid" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Nama berkas tidak valid" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Hash tidak valid: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Host tidak valid, setelah kurung penutup hanya titik dua dan port yang boleh " -"mengikuti" +"mengikuti." + +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Nama host tidak valid: %s" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Masukan tidak valid" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:516 +msgid "Invalid line" +msgstr "Baris tidak valid" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Path tidak valid" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Port yang diberikan tidak valid. Port harus bernilai 1 sampai 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4680,74 +4994,74 @@ "ftps:// untuk FTP diatas TLS (implisit) dan\n" "ftpes:// untuk FTP diatas TLS (eksplisit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Host tidak valid, setelah kurung penutup hanya titik dua dan port yang boleh " "mengikuti." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Regular expression tidak valid" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Regular expression pada kondisi pencarian tidak valid." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:497 msgid "Invalid response code" msgstr "Kode respon tidak valid" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Kondisi pencarian tidak valid: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Path site tidak valid" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Ukuran tidak valid" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Nama Pengguna tidak valid." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Nilai tidak valid untuk ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Nilai tidak valid" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Filter Invert" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Negara yuridiksi:" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Lokalitas yuridiksi:" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Kota atau provinsi yuridiksi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Pertahankan direktori diatas" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4758,7 +5072,7 @@ "pengujian untuk melihat apakah server mendukung fitur ini, pengujian bisa " "gagal." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Pertukaran kunci" @@ -4766,123 +5080,147 @@ msgid "Key exchange:" msgstr "Pertukaran kunci:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:610 +#: ../../locales/../src/engine/server.cpp:635 msgid "Key file" msgstr "Berkas kunci" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Penanda kunci:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Ter&endah" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Bahasa" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Bahasa sudah berubah" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Terakhir dimodifikasi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Layout" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Biarkan kosong untuk menyimpan kata sandi yang ada." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Batas untuk &download konkuren:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Batas untuk &upload konkuren:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Batas port lokal" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Batas ukuran untuk berkas log" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Batas:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:657 msgid "Line length exceeded" msgstr "Ukuran baris kelebihan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Dihubungkan dengan" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Soket ditutup" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Daftar:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Port ter&endah yang tersedia:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" -msgstr "Lokal:" +msgstr "Lokal" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Alamat lokal digunakan" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Titik ujung lokal sudah ditutup" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Berkas lokal" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Berkas lokal tidak ada." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Berkas lokal adalah %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." -msgstr "Berkas lokal adalah direktori dan bukan berkas biasa" +msgstr "Berkas lokal adalah direktori dan bukan berkas biasa." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Berkas lokal bukan nama berkas yang valid." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Pencarian berkas lokal" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Filter lokal:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Penanganan path lokal:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Situs lokal:" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "" +"Ukuran lokal dari '%s' tidak sesuai dengan ukuran yang diharapkan: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Lokalitas:" @@ -4890,16 +5228,16 @@ msgid "Log file" msgstr "Berkas log" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "Login" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Melakukan pencatatan" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4907,7 +5245,7 @@ "Data login berisi karakter non-ASCII dan server mungkin tidak mendukung " "UTF-8. Tidak bisa kembali ke charset lokal karena menggunakan proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4915,9 +5253,9 @@ "Data login berisi karakter non-ASCII dan server mungkin tidak mendukung " "UTF-8. Mencoba charset lokal." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "Urutan login dilakukan, namun belum login. Membatalkan." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "Urutan login dilakukan, namun belum login, membatalkan." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -4932,12 +5270,12 @@ "Jenis login, hanya bisa digunakan dengan URL FTP. Argumen harus berupa '%s' " "atau '%s'" -#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:931 #: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Rendah" -#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:929 #: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Terendah" @@ -4950,127 +5288,160 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Pastikan berkas dapat diakses dan merupakan dokumen XML yang well-formed." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:644 +#: ../../locales/../src/engine/http/request.cpp:650 +#: ../../locales/../src/engine/http/request.cpp:657 +#: ../../locales/../src/engine/http/request.cpp:668 +#: ../../locales/../src/engine/http/request.cpp:703 #, c-format msgid "Malformed chunk data: %s" msgstr "Bagian data rusak: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 #, c-format -msgid "Malformed header: %s" -msgstr "Header rusak: %s" +msgid "Malformed request header: %s" +msgstr "Header request rusak: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Balasan rusak, server tidak mengirimkan akhir baris yang benar" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:457 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:516 +#: ../../locales/../src/engine/http/request.cpp:572 +#: ../../locales/../src/engine/http/request.cpp:582 +#, c-format +msgid "Malformed response header: %s" +msgstr "Isi header rusak: %s" + +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +#, c-format +msgid "Malformed response: %s" +msgstr "Respon yang tidak benar: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Transfer manual" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "&Kata kunci utama:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Kata kunci utama:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Cocokkan semua dari pilihan berikut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Cocok dengan sembarang pilihan berikut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Tidak cocok dengan pilihan berikut" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Cocok sebagian dari pilihan berikut" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Jumlah maksimum &transfer secara simultan:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Kegagalan alokasi memori" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Pesan log" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Posisi pesan log" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Pesan terlalu besar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Menit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Ke &bawah" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Ke &atas" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Komputerku" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Dokumenku" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "Situsku" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/a" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Nama" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "Nama sudah ada" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Nama penanda sudah ada." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Nama:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Pengurutan Natural" @@ -5078,19 +5449,23 @@ msgid "Need to enter filter name" msgstr "Harus memasukkan nama filter" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Harus memasukkan nama path lokal yang valid" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Harus memasukkan nama path remote yang valid" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "Harus menentukan enkoding karakter" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Nama node atau nama server disediakan atau tidak diketahui" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5098,12 +5473,12 @@ "Host jaringan tidak memiliki alamat jaringan pada keluarga alamat yang " "diminta" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Jaringan tidak dapat dicapai" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Tidak pernah" @@ -5115,37 +5490,37 @@ msgid "New &tab" msgstr "&Tab baru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Pe&nanda Baru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Penanda baru" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Direktori baru" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Fitur dan peningkatan baru pada %s" @@ -5154,42 +5529,42 @@ msgid "New filter" msgstr "Filter baru" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Direktori baru" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Situs baru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Disebelah antrian transfer" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "Tidak" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Tidak ada alamat yang terasosiasi dengan nama node" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Tidak ada kategori yang akan diekspor" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." msgstr "Tidak ada perintah yang diberikan, membatalkan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "" "Tidak ada alamat IP eksternal yang ditentukan, mencoba menggunakan default." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Tidak ada berkas yang sedang diedit." @@ -5197,97 +5572,93 @@ msgid "No filter name given" msgstr "Tidak ada nama filter yang diberikan" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Tidak ada mesin yang diberikan, harap masukkan sebuah mesin." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Tidak ada gambar yang tersedia" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Tidak ada lagi berkas pada antrian!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Tidak ada nama untuk kelompok filter yang diberikan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Tidak ada program yang diasosiasikan dengan tipe berkas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Tidak ada program yang sudah diasosiasikan untuk mengedit berkas dengan " "ekstensi '%s'." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Tidak ada rute" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Tidak ada hasil pencarian" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Tidak ada situs yang tersedia" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Tidak ada metode SOCKS5 auth yang didukung" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Tidak ada nama pengguna yang diberikan." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Tidak ada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Tidak ada yang terpilih" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Kegagalan yang tidak dapat diperbaiki pada resolusi nama" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 #: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "Tidak semua bisa diantrikan ulang untuk transfer." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Tidak terhubung" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Tidak terhubung pada sembarang server" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Tidak terhubung pada sembarang server." @@ -5295,24 +5666,33 @@ msgid "Not connected." msgstr "Tidak terhubung." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Tidak diinisialisasi, perlu memanggil WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Perhatikan bahwa fitur ini hanya didukung menggunakan protokol FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Catatan: Kunci yang hilang tidak dapat dikembalikan." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Catatan: Ini hanya bekerja dengan koneksi FTP tak terenkripsi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Catatan: Menggunakan proxy generik memaksa mode pasif pada koneksi FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:650 +msgid "Null character in line" +msgstr "Karakter null pada baris" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Jumlah bilangan desimal:" @@ -5320,40 +5700,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Jumlah percobaan harus diantara 0 dan 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "&Buka berkas" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "Bu&ka" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "Versi SO:" @@ -5365,39 +5749,52 @@ "Pada halaman berikut, mode transfer yang dipilih akan dikonfigurasi, dan " "juga mode kembali jika diaktifkan." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Satu kali" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Sekali sehari" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Sekali seminggu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "Hanya gunakan plain FTP (tidak aman)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Buka b&erkas" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Buka direktori pada manajemen berkas sistem" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Buka Manajemen Situs" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Buka Manajemen Situs." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Membuka dialog filter daftar situs. Klik kanan untuk daftar situs." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Buka dialog hak akses direktori untuk mengkonfigurasi direktori lokal dimana " +"FileZilla memiliki akses." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Buka berkas." @@ -5405,14 +5802,16 @@ msgid "Open the settings dialog of FileZilla" msgstr "Buka dialog pengaturan FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Dibuka sebagai:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Pembukaan berkas gagal" @@ -5424,139 +5823,147 @@ msgid "Opens the Site Manager" msgstr "Buka Manajemen Situs" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Membuka dialog filter daftar direktori. Klik kanan untuk mengganti status " "filter." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Sistem Operasi:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Operasi sudah berjalan" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Operasi sedang berjalan" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Operasi tidak didukung" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Opsi" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Jingga" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Organisasi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Opsi SFTP lain" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Kesalahan sistem lainnya" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Lainnya:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Kehabisan memori" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Gambaran" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Timpa &jika sumber lebih baru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Timpa berkas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Timpa berkas jika ukuran berbeda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Timpa berkas jika ukuran berbeda atau sumber lebih baru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Timpa berkas jika sumber lebih baru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Timpa jika &ukuran berbeda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Timpa jika uku&ran berbeda atau sumber lebih baru" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Jenis build: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Hak akses pemilik" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Pemilik/Grup" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "M&encegah sistem untuk memasuki idle ketika transfer dan operasi lain" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Host p&roxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Perintah PORT diabaikan oleh router atau firewall." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Pa&sif (disarankan)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Parameter bukan URL yang valid" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Mem-parsing %d byte informasi versi.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Kata &kunci:" @@ -5564,66 +5971,82 @@ msgid "Passive (recommended)" msgstr "Pasif (disarankan)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Mode pasif" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Mode pasif telah ditentukan sebagai mode transfer default." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Kata sandi atau kunci enkripsi belum ditentukan" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Kata sandi diperlukan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Kata kunci" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Path" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Path tidak bisa dibuat untuk direktori %s dan sub direktori %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Path tidak ditemukan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Path" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Penghapusan tertunda" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Hak akses" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Hak akses ditolak" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Hak akses" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Platform:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" +"Harap menambahkan ulang direktori lokal yang hendak Anda gunakan pada " +"FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5631,6 +6054,14 @@ "Harap periksa https://filezilla-project.org/probe.php bahwa server sudah " "berjalan dan periksa pengaturan Anda kembali." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Harap periksa hak akses yang diberikan dan tambahkan ulang direktori yang " +"belum ada pada dialog selanjutnya." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5639,13 +6070,13 @@ "Harap konfigurasi sembarang firewall dan router sehingga FileZilla bisa " "membuat koneksi keluar pada sembarang port." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Harap nonaktifkan pengaturan seperti 'mode DMZ' atau 'mode Game' pada router " "Anda." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5661,14 +6092,14 @@ msgid "Please enter a custom time format." msgstr "Harap masukkan format waktu kustomisasi." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" "Harap masukan tanggal dalam bentuk YYYY-MM-DD seperti contoh 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5678,16 +6109,16 @@ msgid "Please enter a name for the new filter." msgstr "Harap masukkan nama untuk filter baru." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Harap masukkan nama baru untuk filter yang disalin." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Harap masukkan nama baru untuk kelompok filter \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Harap masukkan nama baru untuk filter." @@ -5708,20 +6139,10 @@ "transfers." msgstr "Harap masukkan angka antara 1 dan 10 untuk jumlah transfer konkuren." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Harap masukkan kata sandi untuk server ini:" -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Harap masukkan path dan aplikasi yang akan dijalankan.\n" -"Misalnya c:\\path\\file.exe pada MS Windows atau /path/file pada Unix.\n" -"Anda juga bisa menentukan argumen program secara opsional." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5729,30 +6150,30 @@ "Harap masukan waktu timeout antara 10 dan 9999 detik atau 0 untuk " "menonaktifkan timeout." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Harap masukkan nama unik untuk kumpulan filter ini" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Harap masukkan nama pengguna untuk server ini:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." -msgstr "Harap masukkan jarak port yang valid" +msgstr "Harap masukkan jarak port yang valid." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Harap masukkan URL untuk mendapatkan alamat eksternal Anda" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" -"Harap masukkan batas kecepatan upload lebih besar atau sama dengan 0 %s/s" +"Harap masukkan batas kecepatan upload lebih besar atau sama dengan 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5760,27 +6181,47 @@ "Harap masukkan perintah FTP.\n" "Menggunakan perintah ftp akan menghapus cache direktori." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Harap masukkan path lengkap dari program dan argumen. Perintah ini akan " +"dieksekusi ketika antrian telah selesai diproses.\n" +"Misalnya c:\\path\\file.exe pada MS Windows atau /path/file pada Unix.\n" +"Anda perlu memberikan tanda petik dengan benar pada perintah dan argumen " +"jika mengandung spasi." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Masukkan nama direktori yang akan dibuat:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "Harap masukkan nama berkas yang akan dibuat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Harap masukkan nama pengguna dan kata sandi untuk server ini:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Harap masukkan kata sandi utama Anda untuk mengubah pengaturan kata sandi." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Harap masukkan alamat IP eksternal Anda" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5790,6 +6231,13 @@ "Jika Anda memiliki alamat dinamis atau tidak tahu alamat eksternal, gunakan " "opsi resolver eksternal." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Harap masukkan kata sandi utama untuk mendekripsi kata sandi untuk server " +"ini:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5798,7 +6246,7 @@ "Harap ikuti instruksi dengan benar, karena konfigurasi yang salah akan " "mencegah koneksi FTP yang sukses." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5806,11 +6254,11 @@ "Harap pastikan FileZilla diijinkan untuk membuat koneksi keluar dan pastikan " "Anda menuliskan alamat dari alamat resolver dengan benar." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "Harap pastikan lokal yang diminta sudah terinstall pada sistem Anda." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5834,7 +6282,7 @@ "dianggap digunakan oleh trojan atau malware. Hal ini bisa menimbulkan false " "alarm yang bisa Anda abaikan." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5842,7 +6290,7 @@ "Harap perhatikan bahwa mempertahankan waktu timestamp pada upload hanya " "berlaku pada server FTP, FTPS, dan FTPES yang mendukung perintah MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5850,7 +6298,7 @@ "Harap perhatikan bahwa beberapa server bisa memblokir Anda jika Anda terlalu " "banyak melakukan hubungan ulang pada interval yang singkat." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5860,11 +6308,19 @@ "atau Anda mengalami masalah dengan server padahal sebelumnya bekerja dengan " "baik." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Harap menyimpan kunci ini pada lokasi yang aman. Tanpa kunci yang benar, " +"berkas yang diupload tidak akan bisa diakses." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Harap pilih sebuah aksi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Harap memilih kategori yang hendak Anda import." @@ -5893,9 +6349,9 @@ #: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." -msgstr "Harap pilih attribut baru untuk berkas yang dipilih" +msgstr "Harap pilih attribut baru untuk berkas yang dipilih." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5909,37 +6365,37 @@ "pada 'mode DMZ' atau 'mode game'. Hal-hal seperti inspeksi protokol atau " "'perbaikan' pada protokol tertentu harus dinonaktifkan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Posisi dari pesa&n log:" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Kode pos:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "&Alokasi awal ruang sebelum download" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Alokasi awal" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Situs Terdefinisi" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Mempertahankan berkas waktu" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Preview:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Preview" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Sertifikat koneksi utama dan koneksi data tidak sesuai." @@ -5952,15 +6408,15 @@ msgid "Print version information to stdout and exit" msgstr "Cetak informasi versi pada stdout dan selesai" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Direktori prioritas (default)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Prioritas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5968,7 +6424,7 @@ "Kebijakan privasi: Hanya versi FileZilla, sistem operasi, dan arsitektur CPU " "Anda yang akan dikirimkan ke server." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "&Kunci privat:" @@ -5976,31 +6432,31 @@ msgid "Pro&tocol:" msgstr "Pro&tokol:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Katasandi pro&xy:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Proses &Antrian" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Memproses tabel berkas overflow" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Terproses %s dalam %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Protokol tidak didukung" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Protokol tidak didukung pada jenis socket yang diberikan" @@ -6008,53 +6464,53 @@ msgid "Protocol:" msgstr "Protokol:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "&Port proxy:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "&Pengguna proxy:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Authentikasi proxy gagal" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Handshake proxy gagal: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Host proxy dimulai dengan '[' tetapi tidak ada kurung penutup." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Balasan proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:520 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Request proxy gagal. Jawaban dari proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Request proxy gagal: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Request proxy gagal: Jenis alamat tidak diketahui pada balasan CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy ditentukan tetapi host atau port proxy tidak valid" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Authentikasi Kunci Publik" @@ -6062,68 +6518,77 @@ msgid "Public key algorithm:" msgstr "Algoritma kunci publik:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Hak akses publik" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "Antrian sudah diproses sepenuhnya" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Antrian: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Antrian: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Antrian: kosong" -#: ../../locales/../src/interface/QueueView.cpp:440 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Berkas antrian" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Mengantri:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "R&eboot sistem" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Pencarian Cepat:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Pencarian cepat tidak bisa dibuka jika membandingkan direktori." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "R&eboot sistem sekali" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "Pohon direktori R&emote" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "U&langi dan antri ulang berkas yang terpilih" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Perintah Raw FTP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Ba&ca" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "Per&barui" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Ganti &nama" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6131,40 +6596,44 @@ "Jalankan ulang panduan dan periksa pengaturan Anda dan konfigurasikan semua " "router dan firewall dengan benar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Bac&a" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Hanya-baca" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "Membaca dari berkas lokal gagal" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Yakin batalkan operasi yang sedang berjalan?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" "Really delete %d directories with their contents from the server?" msgstr[0] "Yakin menghapus %d direktori dengan isinya dari server?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Yakin menghapus %d berkas? dari server?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Yakin menghapus %s dan %s dari server?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Yakin menghapus semua berkas dan/atau direktori yang dipilih dari server?" @@ -6175,53 +6644,61 @@ "Yakin menghapus semua berkas dan/atau direktori yang dipilih dari komputer " "Anda?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Alasan" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "Reboot sistem sekarang" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Mas&uk jauh kedalam sub direktori" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Menerima peringatan TLS dari server: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" "Menerima sebuah daftar direktori yang tampaknya dikodekan dalam EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Menerima baris melebihi 10000 karakter, dibatalkan." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Rangkaian sertifikat yang diterima tidak dapat diverifikasi. Status " +"verifikasi %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Data yang diterima ditolak" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "Menerima karakter tidak valid pada informasi versi" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Menerima peringatan TLS %d yang tidak diketahui dari server" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "Informasi versi yang diterima terlalu besar" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6229,77 +6706,75 @@ "Informasi koneksi ulang tidak bisa dihapus selama terhubung ke server.\n" "Jika Anda melanjutkan, koneksi Anda akan terputus." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Pengaturan koneksi ulang" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Sambung lagi ke server yang terakhir digunakan" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Menambahkan berkas ke antrian secara rekursif." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Mengubah hak akses secara rekursif." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Menghapus berkas dan direktori secara rekursif." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Merah" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Pengalihan ke URI yang tidak valid atau tidak didukung: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Pengalihan ke alamat yang tidak valid atau tidak didukung: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Perbarui daftar berkas dan direktori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Ingat kata kunci?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Remote" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Sertifikat remote tidak dipercaya." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Berkas remote" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Pencarian berkas remote" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Filter remote:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Path Remote" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6308,7 +6783,7 @@ "Path remote tidak bisa diproses. Pastikan sudah path absolut valid dan " "didukung oleh jenis server yang dipilih (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6317,127 +6792,131 @@ "Path remote tidak bisa diproses. Pastikan sudah path absolut valid dan " "didukung oleh jenis server (%s) yang dipilih pada situs induk." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "Path remote tidak bisa diproses. Pastikan sudah path absolut valid." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Path remote tidak bisa diproses." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Penanganan path remote:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Path remote:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Situs remote:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Hapus &semua" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Hapus &yang terpilih" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Ganti nama berkas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Ganti nama direktori yang terpilih" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Ganti nama berkas dan direktori yang terpilih" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Mengganti nama '%s' menjadi '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Ulangi kata sandi:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Melaporkan kesalahan dan permintaan fitur" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Permintaan gagal - klien tidak menjalankan identd (atau tidak dapat " "dihubungi dari server)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Permintaan gagal - identd milik klien tidak dapat mengkonfirmasi string ID" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Permintaan ditolak atau gagal" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "Membutuhkan FTP diatas TLS secara eksplisit" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "Membutuhkan FTP diatas TLS secara implisit" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Ulangi dan antri ulang &semua berkas" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Protokol yang di-resolve tidak diketahui" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Me-resolve alamat dari %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Sumberdaya tidak tersedia" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Respon:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Hasil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Melanjutkan pengiriman berkas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6445,19 +6924,21 @@ "Melanjutkan berkas ASCII dapat menimbulkan masalah jika server menggunakan " "format akhir baris yang berbeda dengan klien." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Mengambil daftar direktori dari \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Mengambil daftar direktori..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Menerima alamat IP eksternal dari %s" @@ -6466,23 +6947,23 @@ msgid "S&how files currently being edited..." msgstr "&Tampilkan berkas yang sedang diedit..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "Ta&mpilkan Manajemen Situs di awal" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "&Mematikan sistem" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "&Mematikan sistem sekali" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "&Berhenti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "&Menghentikan sistem" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "&Menghentikan sistem sekali" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "Penjelajahan t&ersinkronisasi" @@ -6490,90 +6971,111 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Dukungan SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "&SOCKS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 proxy akan tersambung ke: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 tidak mendukung nama pengguna atau kata sandi lebih panjang dari 255 " +"karakter." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Si&mpan kata sandi yang terlindungi dengan kata sandi utama" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Si&mpan kata kunci" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Simpan pengaturan?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "" "Penyimpanan kata sandi telah dinonaktifkan oleh administrator sistem Anda." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "Penyimpanan kata sandi telah dinonaktifkan oleh Anda." -#: ../../locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "Membaca berkas untuk di masukkan ke antrian" - -#: ../../locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" -msgstr "Membaca file yang akan di-upload" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Faktor skala:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "&Kondisi pencarian:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "&Direktori pencarian:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Mencari berkas secara rekursif." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Mencari berkas pada server" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Jenis pencarian:" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Informasi keamanan" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Lihat juga: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Pil&ih server" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Pilih &halaman:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Pilih Tema" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "Pilih aksi default yang akan dilakukan jika berkas tujuan sudah ada." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Pilih editor default" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6581,7 +7083,7 @@ "Pilih aksi default yang akan dilakukan jika berkas tujuan sudah ada. Pilihan " "ini hanya valid untuk sesi ini saja." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6589,133 +7091,137 @@ "Pilih aksi default yang akan dilakukan hanya jika untuk berkas yang terpilih " "pada antrian." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Pilih berkas yang berisi kunci privat" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Pilih berkas untuk data yang akan diekspor" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Pilih berkas untuk filter yang akan diekspor" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Pilih berkas untuk antrian yang akan diekspor" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Pilih pengaturan untuk berkas yang akan diekspor" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "Pilih berkas untuk situs yang akan diekspor" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Pilih pengaturan lokasi berkas yang akan diimpor" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Pilih berkas yang akan di-upload" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Pilih nama berkas untuk berkas kunci yang akan dikonversi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." -msgstr "Pilih bagaimana berkas ini harus dibuka" +msgstr "Pilih bagaimana berkas ini harus dibuka." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Pilih direktori target download" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Pilih nama berkas target" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Pilih kategori yang akan diekspor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Pilih data privat yang hendak Anda hapus." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Direktori %d dengan kontentnya yang dipilih untuk ditransfer." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Direktori yang dipilih %d." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Berkas yang dipilih %d untuk ditransfer." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Berkas yang dipilih %d. Ukuran total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Berkas yang dipilih %d. Ukuran total: Paling tidak %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Terpilih %s dan %s untuk ditransfer." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Terpilih %s dan %s. Ukuran total: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Terpilih %s dan %s. Ukuran total: Paling tidak %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Editor yang dipilih tidak ada." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Berkas yang dipilih sudah diedit" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Berkas yang dipilih sudah dimuat" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Berkas yang dipilih sudah terbuka" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Berkas yang dipilih masih diedit" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Filter yang dipilih hanya bekerja untuk berkas lokal." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6724,46 +7230,46 @@ "berbeda.\n" "Gunakan penanda situs khusus untuk server ini." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Port yang dipilih biasanya digunakan oleh protokol lain." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Kirim perintah FTP &keep-alive" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "Kirim perintah tertentu ke server jika tidak tersedia" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Mengirimkan perintah keep-alive" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Nomor seri:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "&Jenis Server:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Server tidak memutuskan koneksi TLS dengan benar" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Server tidak mendukung karakter bukan ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Server tidak mendukung proses kelanjutan dari berkas > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6772,15 +7278,19 @@ "Server tidak mendukung proses kelanjutan dari berkas > %d GB. Mengakhiri " "transfer karena ukuran berkas sesuai." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Server tidak mendukung proses kelanjutan dari berkas > 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Server tidak mendukung proses kelanjutan dari berkas > 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Kunci host server" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6789,7 +7299,7 @@ "Server mungkin tidak mendukung proses kelanjutan dari berkas > %d GB. " "Mengakhiri transfer karena ukuran berkas sesuai." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6797,11 +7307,25 @@ "Server mungkin membutuhkan akun. Harap tentukan sebuah akun menggunakan " "Manajemen Situs" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:457 +msgid "Server not sending proper line endings" +msgstr "Server tidak mengirimkan akhir baris yang benar" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "Server meminta algoritma otentikasi yang tidak didukung: %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "Server meminta kualitas pengamanan yang tidak didukung: %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "Server mengirimkan path kosong." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6809,13 +7333,17 @@ "Server mengirimkan prompt login tambahan. Anda harus menggunakan jenis login " "interaktif." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/http/request.cpp:307 +msgid "Server sent data even before request headers were sent" +msgstr "Server mengirimkan data sebelum header permintaan dikirimkan" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Server mengirimkan balasan pasif dengan alamat yang tidak ada rutenya. Mode " "pasif gagal." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6823,36 +7351,50 @@ "Server mengirimkan balasan pasif dengan alamat yang tidak ada rutenya. " "Menggunakan alamat server." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +msgid "Server sent too much data." +msgstr "Server mengirimkan terlalu banyak data." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Server mengirimkan balasan yang tidak diharapkan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Server mengirimkan rantai sertifikat yang tidak urut yang merupakan " +"pelanggaran terhadap spesifikasi TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Server ke MAC klien:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Server ke cipher klien:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "Jenis &Server:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Berkas server/lokal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Server:" @@ -6860,50 +7402,55 @@ msgid "Session details" msgstr "Detail sesi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Tentukan &Prioritas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Menentukan hak akses dari '%s' menjadi '%s'" - -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize dipanggil tanpa soket" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Hak akses dari '%s' menjadi '%s'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Pengaturan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Pengaturan direktori:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Tampilkan inf&ormasi notifikasi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Tampilkan &daftar direktori" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Tampilkan dialog &selamat datang..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "" "Tampilkan struktur pohon dari dua direktori dan melanjutkan perbandingan?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Tampilkan detail" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Tampilkan detail fornat tanggal dan waktu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "Tampilkan pada &manajemen situs" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Tampilkan cipher TLS yang tersedia" @@ -6911,7 +7458,7 @@ msgid "Shows this help dialog" msgstr "Tampilkan dialog bantuan ini" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "Mematikan sistem sekarang" @@ -6919,7 +7466,11 @@ msgid "Signature algorithm:" msgstr "Algoritma tandatangan:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Daftar" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Daftar &Manajemen Situs" @@ -6927,56 +7478,61 @@ msgid "Site Manager" msgstr "Manajemen Situs" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "Manajer Situs - Tidak bisa mengingat kata sandi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Daftar Manajemen Situs - Kunci yang dihasilkan" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "Manajemen Situs - Data tidak valid" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Manajemen Situs telah dibuka" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Site tidak ada." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Path site harus dimulai dengan 0 atau 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Path situs sudah diganti." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Penanda situs khusus" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6986,11 +7542,11 @@ "Situs.\n" "Tambahkan koneksi aktual pada manajemen situs?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "Ukuran" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Pemformatan ukuran" @@ -6998,55 +7554,60 @@ msgid "Size unknown" msgstr "Ukuran tidak diketahui" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Lewati berkas" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Lewati download %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Mengabaikan berkas kunci yang tidak ada \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Lewati upload %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Alamat socket diluar ruang alamat" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Socket sudah terhubung" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Socket telah berhenti" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Socket tidak terhubung" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Jenis socket tidak didukung pada keluarga alamat" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "Beberapa berkas masih diedit atau harus diupload." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7054,31 +7615,31 @@ "Beberapa server remote yang salah konfigurasi yang berada dibelakang router, " "mungkin membalas dengan alamat IP lokal mereka." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Urutkan direktori secara inline" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "Urutan pengurutan tidak bisa diganti jika membandingkan direktori." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Pengurutan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "&Mode pengurutan:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Sumber dan path dari operasi drop sama" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Berkas sumber dan target tidak boleh sama" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "Sumber dan target dari operasi drop sama" @@ -7086,37 +7647,37 @@ msgid "Source file:" msgstr "Berkas sumber:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Batas Kecepatan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Batas kecepatan" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "Batas kecepatan dinonaktifkan, klik untuk mengubahnya." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "Batas kecepatan diaktifkan, klik untuk mengubahnya." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Versi stabil dan beta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Versi stabil saja" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Versi stabil, beta, dan harian" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Mulai transfer &secepatnya" @@ -7124,19 +7685,21 @@ msgid "Start with opened Site Manager" msgstr "Mulai dengan Manajemen Situs yang terbuka" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Pemeriksaan update dimulai pada %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Mulai mendownload %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Mulai upload %s" @@ -7145,30 +7708,38 @@ msgid "Starts the local site in the given path" msgstr "Menjalankan situs lokal pada path yang diberikan" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Kota atau provinsi:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "Status" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Status:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Stop dan hapus &semua" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Menghentikan operasi rekursif" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Penyimpanan Cloud Terdesentralisasi" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Dukungan Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Jalan:" @@ -7184,11 +7755,11 @@ msgid "Summary of test results:" msgstr "Ringkasan dari hasil pengujian:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "Suspend now" msgstr "Menghentikan sekarang" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7196,29 +7767,33 @@ "Symlink ke berkas tidak terpengaruh oleh pilihan ini, karena symlink selalu " "dihapus." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Penjelajahan tersinkronisasi" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Penjelajahan tersinkronisasi sudah dinonaktifkan." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Sinkronisasi direktori." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Kesalahan sintaks" @@ -7227,44 +7802,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Kesalahan sintaks pada perintah baris" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Sistem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Detail sistem" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Batas sistem untuk berkas yang terbuka sudah terlampaui" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Sub sistem jaringan gagal" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "T&oolbar" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "Koneksi TLS terbentuk, mengirimkan permintaan HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "Koneksi TLS terjalin, menunggu ucapan selamat datang..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "Koneksi TLS terjalin." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TLS kadaluarsa" @@ -7272,35 +7847,43 @@ msgid "Target file already exists" msgstr "Berkas tujuan telah ada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Berkas target:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "Nama berkas tujuan telah ada!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "Berkas tujuan telah ada, yakin melanjutkan?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Kegagalan sementara dalam resolusi nama" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Pengujian selesai dengan baik" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Hasil pengujian" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Menguji kemampuan melanjutkan dari server" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Berkas-berkas &berikut ini sedang diedit:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Manajer Situs tidak bisa digunakan kecuali berkas diperbaiki." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7310,7 +7893,7 @@ "Apakah Anda ingin meneruskan? Semua perubahan pada Manajemen Situs tidak " "akan disimpan." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7318,29 +7901,37 @@ "Manajemen Situs telah dibuka pada FileZilla 3 lainnya.\n" "Harap menutupnya atau data tidak akan bisa dihapus." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Alamat yang Anda masukkan adalah: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Anggota ai_family tidak didukung" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Anggota ai_socktype tidak didukung" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Penanda tidak bisa ditambahkan." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Penanda tidak bisa dibersihkan." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Sertifikat mengharuskan server menyertakan status OCSP pada responnya, " +"tetapi status OCSP tidak ditemukan." + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "Koneksi terenkripsi. Klik ikon untuk lebih detail." @@ -7358,35 +7949,40 @@ "The custom time format is invalid or contains unsupported format specifiers." msgstr "Format jam tidak valid atau mengandung format yang tidak didukung." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Koneksi data tidak dapat terbentuk: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Editor default untuk berkas teks tidak ditemukan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Editor default untuk berkas teks adalah '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "" "Nama filter yang dimasukkan sudah ada, harap memilih nama yang berbeda." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Kata sandi yang dimasukkan tidak sama." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Ektensi '%s' sudah ada ada pada daftar" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7395,8 +7991,9 @@ "Berkas %s telah ada.\n" "Masukkan nama baru:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7407,7 +8004,7 @@ "Program yang diasosiasikan (%s) tidak ditemukan.\n" "Harap periksa asosiasi tipe berkas Anda." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7416,18 +8013,19 @@ "Berkas '%s' mengandung kunci SSH1. Protokol SSH1 sudah ditinggalkan, " "FileZilla hanya mendukung kunci SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Berkas '%s' tidak bisa dimuat atau tidak mengandung kunci privat." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Berkas '%s' tidak bisa dimuat." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7436,8 +8034,9 @@ "Berkas '%s' tidak bisa dibuka:\n" "Tidak ada program yang diasosiasikan pada sistem Anda dengan berkas ini." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7446,8 +8045,8 @@ "Berkas '%s' tidak bisa dibuka:\n" "Perintah yang diasosiasikan gagal" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7459,7 +8058,7 @@ "hilangnya data.\n" "Apakah Anda hendak melanjutkan?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7472,7 +8071,7 @@ msgid "The file selected as default editor does not exist." msgstr "File yang dipilih sebagai editor default tidak ada." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7486,11 +8085,11 @@ "dan kata sandi yang akan diimpor.\n" "Lanjutkan dengan proses impor?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Kolom nama berkas tidak bisa disembunyikan atau dipindahkan." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Kolom nama berkas tidak bisa disembunyikan." @@ -7504,19 +8103,19 @@ msgid "The following characters will be replaced: %s" msgstr "Karakter berikut akan diganti: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Berkas-berkas berikut ini sedang diedit:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Solusi FTP open source yang gratis" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Kunci enkripsi yang dihasilkan adalah:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Penanda global tidak bisa disimpan." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7529,17 +8128,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Batas harus diantara 1 dan 2000 MiB" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Direktori lokal '%s' tidak bisa dibuat." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Direktori lokal '%s' tidak ada." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7557,24 +8156,29 @@ "Port terendah yang tersedia harus lebih rendah atau sama dengan port " "tertinggi yang tersedia." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Kata sandi utama harus memiliki panjang minimal 8 karakter." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Versi baru tidak bisa didownload, harap mencoba kembali lagi." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Versi baru telah disimpan pada direktori Downloads Anda." -#: ../../locales/../src/interface/QueueView.cpp:1823 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." msgstr "Antrian tidak akan disimpan." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Direktori remote '%s' tidak ada." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7584,27 +8188,27 @@ "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " "remote?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." -msgstr "Kategori yang dipilih sudah berhasil diimpor" +msgstr "Kategori yang dipilih sudah berhasil diimpor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Berkas yang terpilih berisi data yang dapat diimpor untuk kategori berikut:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Berkas yang dipilih sedang diedit:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "Berkas yang dipilih masih dibuka oleh program lain, harap ditutup." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7614,15 +8218,15 @@ "Ini bisa berbahaya dan merusak sistem Anda.\n" "Apakah Anda hendak melanjutkan?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Server tidak bisa ditambahkan." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Server mengirimkan balasan yang tidak diharapkan atau tidak dikenali." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Server menggunakan enkoding charset berikut untuk nama berkas:" @@ -7634,7 +8238,7 @@ "Sertifikat server tidak diketahui. Harap periksa sertifikat untuk memastikan " "server dapat dipercayai." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7644,7 +8248,7 @@ "berarti administrator telah mengganti kunci mesin, atau Anda mencoba " "terhubung pada komputer lain yang mencoba menjadi server." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7652,11 +8256,15 @@ "Kunci mesin server tidak diketahui. Anda tidak memiliki jaminan bahwa server " "ini adalah komputer yang Anda harapkan." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Nama host server tidak sesuai dengan nama host pada sertifikat" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "{arameter servname tidak didukung untuk ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7664,19 +8272,19 @@ "Pengaturan sudah berhasil diimpor. Anda harus menjalankan ulang FileZilla " "agar efek pengaturan berjalan." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Jenis alamat tidak didukung" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Nama jaringan yang ditentukan tidak lagi tersedia" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." msgstr "Sistem akan segera reboot kecuali Anda menekan Batal." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "Sistem akan segera mati kecuali Anda menekan Batal." @@ -7688,28 +8296,28 @@ "Berkas target telah ada.\n" "Harap pilih sebuah aksi." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Pengujian tidak sukses. Apakah Anda hendak menyimpan perubahan?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" -msgstr "Berkas cadangan '%s' tidak bisa dikembalikan." +msgstr "Berkas cadangan '%s' tidak bisa dikembalikan" #: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Tema" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Kumpulan filter ini tidak bisa dihapus." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Filter ini tidak bisa diganti namanya." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7732,44 +8340,42 @@ "Panduan ini akan membantu mengkonfigurasi router dan firewall yang Anda " "miliki dan menguji konfigurasi Anda." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "Waktu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Pemformatan waktu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Time&out dalam detik:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Timeout" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Waktu offset zona waktu server adalah %d detik." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Judul:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Untuk membandingkan direktori, pencarian cepat harus ditutup." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "Untuk membandingkan direktori, kedua daftar berkas harus sejajar." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Untuk melakukannya, struktur pohon direktori harus menampilkan berkas " -"tersembunyi dan tidak" +"tersembunyi dan tidak." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7777,7 +8383,7 @@ "Untuk mendukung authentikasi kunci publik, FileZilla harus tahu kunci privat " "yang hendak digunakan." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7795,7 +8401,7 @@ "lain\n" "Merah: Ukuran file berbeda" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7805,82 +8411,77 @@ "Jika aktif, menjelajahi hirarki direktori lokal juga mengganti direktori " "pada server dan sebaliknya." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Mengganti pemrosesan antrian pengiriman" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Mengganti tampilan pohon directori lokal" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Mengganti tampilan pesan log" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Mengganti tampilan pohon direktori remote" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Mengganti tampilan antrian pengiriman" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Too long header line" msgstr "Baris header terlalu panjang" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Terlalu banyak pengalihan" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Jejak:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Transfer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "&Arah transfer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "&Mode Transfer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Mode Transfer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Antrian Transfer" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Pengaturan Transfer" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Percobaan koneksi diinterupsi: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Data transfer rusak." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Mentransfer" @@ -7888,27 +8489,27 @@ msgid "Transfers" msgstr "Transfer" -#: ../../locales/../src/interface/QueueView.cpp:2929 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "Transfer selesai" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Anggap berkas &tanpa ekstensi sebagai berkas ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Anggap jenis berkas &berikut sebagai berkas ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "Percayai Kunci mesin yang berubah:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "Percayai Kunci mesin baru:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Percayai kunci baru dan lanjutkan dengan menghubungkan diri?" @@ -7916,69 +8517,75 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Percayai sertifikat ini dan lanjutkan dengan menghubungkan diri?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Percayai mesin ini dan lanjutkan dengan koneksi?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Coba kembali" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Jenis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Jenis Proxy FTP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Jenis proxy generik:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "U&pload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Batasn U&pload:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Gunakan asosiasi jenis berkas jika tersedia" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "Gunakan default si&stem untuk bahasa terpilih" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "PENGGUNA@HOST" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Kode kesalahan yang belum ditentukan %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Unit:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Tidak diketahui" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Jenis Proxy FTP tidak diketahui, tidak bisa menghasilkan urutan login." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versi protokol SOCKS tidak diketahui: %d" @@ -7987,11 +8594,22 @@ msgid "Unknown certificate" msgstr "Sertifikat tidak diketahui" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Kesalahan tidak diketahui %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Kesalahan tidak diketahui %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Kunci mesin tidak diketahui" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8000,15 +8618,19 @@ "Versi protokol dari Autentikasi Nama pengguna/Kata sandi SOCKS sub " "negosiasi: %d tidak diketahui" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Elemen root tidak diketahui, berkas tampaknya bukan dihasilkan oleh " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:572 +msgid "Unknown transfer encoding" +msgstr "Pengkodean transfer tidak diketahui" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8016,7 +8638,7 @@ "Kecuali masalah ini diperbaiki, mode aktif FTP tidak akan bekerja dan mode " "pasif harus digunakan." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8024,15 +8646,15 @@ "Kecuali masalah ini diperbaiki, mode aktif FTP tidak akan bekerja dan mode " "pasif harus digunakan." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Jenis sertifikat tidak didukung" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Pengalihan tidak didukung" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Up&load dan batalkan pengeditan" @@ -8041,95 +8663,104 @@ msgid "Updates" msgstr "Update" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Upload" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Upload gagal" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" -msgstr "Batasan Upload: %s/s:" +msgstr "Batasan Upload: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Batasn Upload: tidak ada" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Upload hasil pencarian" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Upload direktori yang dipilih" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Upload berkas dan direktori yang dipilih" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Upload berkas ini kembali ke server?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Upload berkas ini kembali ke server?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Mengupload" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Mengupload dan penghapusan tertunda" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Mengupload dan batalkan pengeditan" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Gunakan charset &kustomisasi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Gunakan editor &kustomisasi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Gunakan editor default untuk berkas teks" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Gunakan Penjelajahan t&ersinkronisasi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Gunakan Regular Expression" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Gunakan UTF-8 jika server mendukung, selain itu menggunakan charset lokal." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Gunakan aksi standar" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "Membutuhkan FTP diatas TLS secara eksplisit jika tersedia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Gunakan server yang saat ini terhubung" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Gunakan server dari manajemen situs" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "Gunakan &default sistem untuk bahasa terpilih" @@ -8146,7 +8777,7 @@ msgstr "Gunakan alamat eksternal server" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8164,16 +8795,17 @@ "mode aktif untuk pertama kalinya. Hanya versi FileZilla yang Anda gunakan " "yang dikirim ke server." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Pengguna:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "Pengguna tidak bisa merupakan kumpulan spasi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8192,51 +8824,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "Pesan log detail dari wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Memverifikasi sertifikat..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Sangat tinggi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "Opsi sudah ditentukan, tetapi tidak didukung oleh server" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Lihat/Edit" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Kolom yang tampak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "T&ulis" -#: ../../locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "Menunggu" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Menunggu koneksi" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Menunggu kata sandi" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Menunggu transer untuk dibatalkan" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Menunggu untuk mencoba kembali..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Peringatan, mengabaikan koneksi data dari IP yang salah." @@ -8255,23 +8883,23 @@ "\n" "Apakah Anda yakin untuk menguji build harian?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Peringatan: Kemungkinan masalah keamanan!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Selamat datang ke FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Apa yang baru" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Apa yang baru:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8280,7 +8908,7 @@ "kembali tanpa harus memasukkan kembali kata kunci setelah menjalankan ulang " "FileZilla." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8288,36 +8916,54 @@ "Bila diaktifkan, karakter yang tidak didukung oleh sistem operasi lokal " "dalam nama berkas akan diganti jika mendownload berkas tersebut." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "Ketika memul&ai koneksi baru ketika sudah terhubung:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Layar lebar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Apakah Anda menghendaki FileZilla untuk mengingat kata sandi ini?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Tu&lis" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Alamat IP eksternal salah" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:644 msgid "Wrong line endings" msgstr "Akhir baris salah" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Kata sandi utama yang dimasukan salah, tidak dapat digunakan untuk " +"mendekripsi kata sandi yang tersimpan." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Kata sandi utama yang dimasukkan salah, tidak dapat digunakan untuk " +"mendekripsi." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Kuning" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Ya" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8325,24 +8971,24 @@ "Tampaknya Anda menggunakan host berbasis IPv6. Panduan ini tidak mendukung " "lingkungan ini." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Anda menggunakan versi terbaru dari FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Anda selalu bisa membuka dialog ini kemudian melalui menu bantuan." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Anda bisa mendownload versi terbaru dari website FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "Anda bisa membiarkan kolom port kosong untuk menggunakan port default." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8350,7 +8996,15 @@ "Anda dapat menggunakan x disegala posisi untuk mempertahankan hak akses " "berkas asli." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Anda tidak bisa mengubah kata sandi dan kunci enkripsi secara individu jika " +"menggunakan kata sandi utama." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Anda tidak bisa mengimpor pengaturan dari direktori pengaturan FileZilla." @@ -8364,16 +9018,20 @@ "tidak valid lagi. Silakan masukkan karakter yang diperbolehkan dalam nama " "berkas." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Anda tidak bisa meng-upload berkas pada direktori induk." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Anda tidak memasukkan nama baru untuk berkas ini. Timpa berkas ini?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Anda telah memilih paling tidak satu link simbolis." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8381,7 +9039,8 @@ "Anda telah memilih lebih dari 10 berkas untuk pengeditan, apakah Anda hendak " "melanjutkan?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8389,39 +9048,47 @@ "Anda telah memilih lebih dari 10 berkas atau direktori untuk dibuka, apakah " "Anda hendak melanjutkan?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." -msgstr "Anda harus memasukkan nama mesin" +msgstr "Anda harus memasukkan nama host." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" msgstr "Anda harus memasukkan path berkas kunci" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Anda harus memasukkan direktori lokal." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Anda harus memasukkan direktori remote." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Anda harus memasukkan alamat IPv4 valid." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Anda harus memasukkan kunci enkripsi yang valid" + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Anda harus memasukkan direktori lokal yang dapat ditulisi." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "Anda harus memasukkan nama akun" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "Anda harus memasukkan nama pengguna" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8429,7 +9096,11 @@ "Tampaknya Anda memiliki router atau firewall yang memodifikasi data transfer " "dengan salah." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Anda harus memasukkan kata sandi utama." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Anda harus memasukan sebuah nama untuk penanda." @@ -8437,7 +9108,7 @@ msgid "You need to enter a name for the log file." msgstr "Anda harus memasukan sebuah nama untuk berkas log." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Anda harus memasukkan perintah yang dikutip dengan benar." @@ -8450,16 +9121,16 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Anda harus memasukkan port proxy antara 1 hingga 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Anda harus memasukkan paling tidak satu path, penanda kosong tidak didukung." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8467,7 +9138,7 @@ "Anda harus memasukkan path lokal dan remote untuk mengaktifkan penjelajahan " "tersinkronisasi untuk penanda ini." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8475,23 +9146,31 @@ "Anda harus memasukkan path lokal dan remote untuk mengaktifkan penjelajahan " "tersinkronisasi untuk situs ini." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Anda perlu memberikan hak akses kepada FileZilla terhadap direktori tempat " +"Anda hendak mengambil atau menyimpan berkas-berkas Anda." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." -msgstr "Anda harus menentukan berkas lokal" +msgstr "Anda harus menentukan berkas lokal." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." -msgstr "Anda harus menentukan berkas remote" +msgstr "Anda harus menentukan berkas remote." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." -msgstr "Anda harus menentukan path remote" +msgstr "Anda harus menentukan path remote." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." -msgstr "Anda harus menentukan sebuah server" +msgstr "Anda harus menentukan sebuah server." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8499,66 +9178,66 @@ "Anda seharusnya tidak memiliki masalah terhubung dengan server lain, " "transfer berkas seharusnya bekerja dengan baik." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2775 msgid "Your computer will suspend unless you click Cancel." msgstr "Komputer Anda akan segera dihentikan kecuali Anda menekan Batal." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "setelah" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "sebelum" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "diawali dengan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "byte" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "berisi" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "kustomisasi" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "tidak mengandung" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "tidak sama" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "diakhiri dengan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "sama" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "berkas" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8568,248 +9247,125 @@ "Harap pastikan program ini ada pada direktori yang sama dengan program utama " "FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" -msgstr "fzsftp bagian dari versi terbaru dari FileZilla." +msgstr "fzsftp bagian dari versi terbaru dari FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "fzsftp tidak bisa dijalankan" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj merupakan bagian dari versi yang berbeda pada FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj tidak bisa dijalankan" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj tidak bisa dijalankan.\n" +"Harap pastikan program ini ada pada direktori yang sama dengan program utama " +"FileZilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers tidak menghasilkan sertifikat" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 gagal" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "lebih besar dari" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "grup yang dapat dieksekusi" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "grup yang hanya dapat dibaca" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "grup yang hanya dapat ditulisi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "ttps://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "sama dengan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "sudah ditentukan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "sudah dihilangkan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "kurang dari" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "cocok dengan regex" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "nama baru" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "dapat dieksekusi pemilik" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "dapat dibaca pemilik" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "dapat ditulisi pemilik" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" -msgstr "Tidak diketahui" +msgstr "tidak diketahui" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "dapat dieksekusi oleh semua" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "dapat dibaca oleh semua" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "dapat ditulisi oleh semua" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" -#~ msgid "Empty dirs to visit" -#~ msgstr "Direktori kosong yang akan dikunjungi" - -#~ msgid "Connected" -#~ msgstr "Terhubung" - -#~ msgid "Deleting directories" -#~ msgstr "Menghapus direktori" - -#~ msgid "Deleting multiple unrelated directories is not yet supported" -#~ msgstr "Penghapusan banyak direktori yang tidak berelasi belum didukung" - -#~ msgid "Downloading multiple unrelated directories is not yet supported" -#~ msgstr "Menndownload banyak direktori yang tidak berhubungan belum didukung" - -#~ msgid "Downloading search results" -#~ msgstr "Mendownload hasil pencarian" - -#~ msgid "U&se system defaults" -#~ msgstr "&Gunakan default sistem" - -#~ msgid "Use system &defaults" -#~ msgstr "Gunakan &default sistem" - -#~ msgid "" -#~ "The file '%s' is not in a format supported by FileZilla.\n" -#~ "The file is also password protected. Password protected key files are not " -#~ "supported by FileZilla yet.\n" -#~ "Would you like to convert it into a supported, unprotected format?" -#~ msgstr "" -#~ "Berkas '%s' tidak dalam format yang didukung oleh FileZilla.\n" -#~ "berkas juga terproteksi dengan kata sandi. Berkas kunci yang terproteksi " -#~ "belum didukung oleh FileZilla.\n" -#~ "Apakah Anda hendak mengkonversinya menjadi format yang didukung dan tanpa " -#~ "proteksi?" - #~ msgid "" -#~ "The file '%s' is password protected. Password protected key files are not " -#~ "supported by FileZilla yet.\n" -#~ "Would you like to convert it into an unprotected file?" +#~ "Malformed response: Server sent response body with a request verb or " +#~ "response code that disallows a response body." #~ msgstr "" -#~ "Berkas '%s' diproteksi dengan kata sandi. Berkas kunci yang terproteksi " -#~ "belum didukung oleh FileZilla.\n" -#~ "Apakah Anda hendak mengkonversinya menjadi berkas tanpa proteksi?" - -#~ msgid "The XML document is not well-formed: %s" -#~ msgstr "Dokumen XML tidak well-form: %s" - -#~ msgid "" -#~ "Unknown error opening the file. Make sure the file can be accessed and is " -#~ "a well-formed XML document." -#~ msgstr "" -#~ "Kesalahan tidak diketahui saat membuka berkas. Pastikan berkas dapat " -#~ "diakses dan merupakan dokumen XML well-formed." - -#~ msgid "Using proxy %s" -#~ msgstr "Menggunakan proxy %s" - -#~ msgid "" -#~ "Any changes made in the Site Manager will not be saved unless you repair " -#~ "the file." -#~ msgstr "" -#~ "Semua perubahan pada Manajemen Situs tidak akan disimpan kecuali Anda " -#~ "memperbaiki berkasnya." - -#~ msgid "Cannot compare directories, not connected to a server." -#~ msgstr "Tidak dapat membandingkan direktori, tidak terhubung ke server." - -#~ msgid "Clear &Site Manager entries" -#~ msgstr "Hapus daftar &Manajemen Situs" - -#~ msgid "Clear &transfer queue" -#~ msgstr "Hapus antrian &transfer" - -#~ msgid "Operating system problem detected" -#~ msgstr "Masalah sistem operasi terdeteksi" - -#~ msgid "" -#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -#~ "seconds." -#~ msgstr "" -#~ "Offset zona waktu: Server: %d detik. Lokal: %d detik. Perbedaan: %d detik." - -#~ msgid "" -#~ "Warning!\n" -#~ "\n" -#~ "A bug in Windows causes problems with FileZilla\n" -#~ "\n" -#~ "The bug occurs if you have\n" -#~ "- Windows Server 2003 or XP 64\n" -#~ "- Windows Firewall enabled\n" -#~ "- Application Layer Gateway service enabled\n" -#~ "See http://support.microsoft.com/kb/931130 for background information.\n" -#~ "\n" -#~ "Unless you either disable Windows Firewall or the Application Layer " -#~ "Gateway service,\n" -#~ "FileZilla will timeout on big transfers." -#~ msgstr "" -#~ "Peringatan!\n" -#~ "\n" -#~ "Sebuah kesalahan pada Windows menyebabkan masalah dengan FileZilla\n" -#~ "\n" -#~ "Kesalahan terjadi jika Anda memiliki\n" -#~ "- Windows Server 2003 atau XP 64\n" -#~ "- Windows Firewall aktif\n" -#~ "- Layanan Application Layer Gateway aktif\n" -#~ "Lihat http://support.microsoft.com/kb/931130 untuk informasinya.\n" -#~ "\n" -#~ "Kecuali Anda menonaktifkan Windows Firewall atau layanan Application " -#~ "Layer Gateway,\n" -#~ " FileZilla akan mengalami timeout pada transfer besar." - -#~ msgid "&Crash" -#~ msgstr "&Rusak" - -#~ msgid "Certificate details" -#~ msgstr "Detail sertifikat" - -#~ msgid "Connection timed out" -#~ msgstr "Koneksi time out" - -#~ msgid "" -#~ "Crashes FileZilla instantly. Only used to debug the exception handler" -#~ msgstr "FileZilla rusak seketika. Hanya gunakan untuk melakukan debug" - -#~ msgid "" -#~ "A file with that name is already being edited. Do you want to reopen '%s'?" -#~ msgstr "" -#~ "Berkas dengan nama tersebut sudah diedit sebelumnya. Apakah Anda hendak " -#~ "membuka kembali '%s'?" - -#~ msgid "Fingerprint (MD5):" -#~ msgstr "Sidik jari (MD5):" - -#~ msgid "Benchmark string coalescer" -#~ msgstr "String benchmark coalescer" - -#~ msgid "Clear string coalescer" -#~ msgstr "Bersihkan string coalescer" - -#~ msgid "" -#~ "Filename may not contain any of the following characters: / \\ : * ? \" < " -#~ "> |" -#~ msgstr "" -#~ "Nama berkas tidak boleh mengandung karakter berikut: / \\ : * ? \" < > |" - -#~ msgid "Use plain FTP" -#~ msgstr "Gunakan FTP biasa" - -#~ msgid "Failed to parse trusted root cert." -#~ msgstr "Gagal untuk memprsing sertifikat root yang dipercaya" - -#~ msgid "Root certificate is not trusted" -#~ msgstr "Sertifikat root tidak dipercaya" - -#~ msgid "Cannot load file, not a valid XML file." -#~ msgstr "Tidak bisa memuat berkas, bukan berkas XML yang valid." +#~ "Respon yang rusak: Server mengirimkan isi pesan respon dengan kode pesan " +#~ "yang tidak mengijinkan isi pesan." diff -Nru filezilla-3.15.0.2/locales/it.po filezilla-3.33.0/locales/it.po --- filezilla-3.15.0.2/locales/it.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/it.po 2018-04-02 18:37:17.000000000 +0000 @@ -1,33 +1,33 @@ msgid "" msgstr "" -"Project-Id-Version: Filezilla italian translation 22.01.2016\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-23 18:33+0100\n" -"PO-Revision-Date: 2016-01-22 09:58+0100\n" -"Last-Translator: bovirus <@bovirus@gmail.com>\n" +"Project-Id-Version: Filezilla italian translation rev. 24.03.2018\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-02 20:30+0200\n" +"PO-Revision-Date: 2018-03-24 11:28+0100\n" +"Last-Translator: bovirus \n" "Language-Team: bovirus - Andrea Sanavia - Vincenzo Reale - Riccardo Vianello " -"\n" +"\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 2.0.6\n" "X-Poedit-SourceCharset: UTF-8\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "Trascorsi %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" -msgstr "rimanenti %H:%M:%S" +msgstr "Rimanenti %H:%M:%S" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -36,211 +36,214 @@ "%a - Account (le linee che contengono questo verranno omesse se non si " "utilizza il tipo di connessione Normale)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d cartella" msgstr[1] "%d cartelle" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d cartella con il suo contenuto" msgstr[1] "%d cartelle con il loro contenuto" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d file" msgstr[1] "%d file" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" -msgstr[0] "%d file. Dimensione totale: %s" -msgstr[1] "%d file. Dimensione totale: %s" +msgstr[0] "%d file - dimensione totale: %s" +msgstr[1] "%d file - dimensione totale: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" -msgstr[0] "%d file. Dimensione totale: almeno %s" -msgstr[1] "%d file. Dimensione totale: almeno %s" +msgstr[0] "%d file - dimensione totale: almeno %s" +msgstr[1] "%d file - dimensione totale: almeno %s" -#: ../../locales/../src/interface/QueueView.cpp:2778 -#, c-format -msgid "%d files added to queue" -msgstr "%d file aggiunti alla coda" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d secondo" msgstr[1] "%d secondi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Host" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu cartella" msgstr[1] "%llu cartelle" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu file" msgstr[1] "%llu file" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Password" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certificato scaduto!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Non ancora valido!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Utente proxy" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s e %s. Dimensione totale: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s e %s. Dimensione totale: almeno %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s byte" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"Impossibile trovare '%s'. Senza questo componente di FileZilla. SFTP non " -"funziona.\n" +"%s non è stato trovato. Senza questo componente di Filezilla, %s non " +"funzionerà.\n" "\n" -"Riscaricate FileZilla. Se il problema persiste, inviate una segnalazione per " -"questo errore." +"Riscarica nuovamente Filezilla. Se il problema persiste, invia una " +"segnalazione del bug." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"Non è stato possibile trovare %s. Senza questo componente di FileZilla, SFTP " -"non funzionerà.\n" +"%s non è stato trovato. Senza questo componente di Filezilla, %s non " +"funzionerà.\n" "\n" "Possibili soluzioni:\n" -"- Assicurarsi che %s sia in una cartella elencata nella variabile di " -"ambiente PATH.\n" -"- Impostare il percorso completo di %s nella variabile di ambiente FZ_FZSFTP." +"- Assicurati che %s sia in una cartella inserita nella variabile PATH.\n" +"- Imposta il percorso completo di %s nella varaibile ambiente %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s con %d bit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Il nome host non corrisponde al certificato" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Nome utente" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Password proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "Interrompi connessione precedente e connetti nella sched&a attuale" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "&Informazioni su..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Account:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Attiva" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "&Aggiungi preferito..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Aggiungi cartella..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Aggiungi file alla coda" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&aggiungi file chiave..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Aggiungi alla coda" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "Regol&a il fuso orario del server:" @@ -248,72 +251,77 @@ msgid "&Always trust certificate in future sessions." msgstr "&Considera sempre sicuro il certificato nelle sessioni future." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "" "Considera sempre sicuro questo host, &aggiungi questa chiave alla cache" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Utilizza sempre l'editor predefinito" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "Us&a sempre la selezione per i file non associati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Usa sempre questa azione" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "Richiedi l'indirizzo IP esterno &al sistema operativo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Automatico" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "Rilevamento &automatico" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Colore sfondo:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Binario" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "Prefissi &binari utilizzando i simboli del SI (es. 1KB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" -msgstr "&Segnalibri" +msgstr "&Preferiti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Sfoglia..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "Tolleranza &burst:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "A&nnulla" @@ -325,19 +333,23 @@ msgid "&Close" msgstr "&Chiudi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&Chiudi FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Chiudi FileZilla" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "&Configura limiti di velocità..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "&Configura..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Connetti" @@ -345,155 +357,151 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Copia connessione corrente nel Gestore siti..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" -msgstr "&Copia negli appunti" +msgstr "&Copia negli Appunti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Crea cartella" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" msgstr "&Crea nuova scheda" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Debug" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "Informazioni di &debug nel registro messaggi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "E&ditor predefinito:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "Azione &predefinita per i file esistenti..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" -msgstr "Ritar&do tra i tentativi di login non riusciti:" +msgstr "Ritar&do tra i tentativi di login falliti:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Elimina" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Elimina collegamento simbolico" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "&Permessi accesso cartella..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "&Comparazione cartelle" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Disabilita la navigazione sincronizzata e continua le modifica nella " "cartella locale" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Disabilita la navigazione sincronizzata e continua le modifica nella " "cartella remota" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "&Abbandona il file locale quindi scarica e modifica un nuovo file" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "&Disconnetti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Disconnetti dal server" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "" "&Visualizza velocità trasferimento istantanea invece della velocità media" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "Visualizza dimensione in b&yte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "Non memorizzare le passwor&d (raccomandato)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Non visualizzare più questa finestra." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "Non utilizzare l'in&dirizzo IP esterno per le connessioni locali." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "Azione &doppio clic sui file:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Scarica" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Download in:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Download..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Download:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Modifica" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "&Modifica regole filtri..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "&Abilita" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "Abilita compr&essione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Abilita Limiti di velocità" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Codifica:" @@ -501,28 +509,28 @@ msgid "&Encryption:" msgstr "&Criptazione:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "&Esegui comando personalizzato..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "Stabilisci conn&essione in una nuova scheda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Esegui" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Esporta le voci del Gestore siti" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Esporta..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Torna in modalità attiva" @@ -530,35 +538,47 @@ msgid "&File" msgstr "&File" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "&Attributi file..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "Permessi &file..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&File:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "Condizioni di &filtro:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "Gruppi di &filtri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Filtri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Termina le modifiche ed elimina il file locale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Percorso locale non strutturato, invio di tutti i file contenuti " +"direttamente nella cartella destinazione" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -566,56 +586,56 @@ "&Percorso remoto non strutturato, download di tutti i file contenuti " "direttamente nella cartella destinazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "" "&Seguire i collegamenti simbolici, eliminare il contenuto della cartella " "destinazione" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "Ottieni l'indirizzo &IP esterno dal seguente URL:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Ottieni aiuto..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "Preferito &globale" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "Metodo connessione &HTTP/1.1" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&Aiuto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Nascondi file identici" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&Massima" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Massima porta disponibile:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Host:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "Prefissi binari &IEC (es. 1KiB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (esempio: 2007-09-15)" @@ -623,88 +643,96 @@ msgid "&Import..." msgstr "&Importa..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "Eredita le assoc&iazioni dal sistema" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Installa nuova versione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Conserva struttura percorso locale relativa alla ricerca principale" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "&Mantieni struttura percorso remoto nella radice di ricerca" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "File c&hiave:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "Disposizione de&lle viste di file e cartelle:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Limita le porte locali usate da FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Limita il numero di connessioni simultanee" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "Struttura cartella &locale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "Cartella &locale:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "Ricerca &locale" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Log nel file" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "&Tipo di accesso:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "&Tipo di accesso:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Bassa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." -msgstr "Gestore &segnalibri..." +msgstr "Gestione &preferiti..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "Trasferimento &manuale..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Numero massimo di connessioni:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "Numero &massimo di nuovi tentativi:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "Registro &messaggi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Minimizza nella barra" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "Modalità ordinamento &nome:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Nome:" @@ -712,7 +740,7 @@ msgid "&Network configuration wizard..." msgstr "Configurazione guidata &rete..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Nuovo" @@ -720,7 +748,7 @@ msgid "&New Site" msgstr "&Nuovo sito" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Nuova versione disponibile!" @@ -728,154 +756,165 @@ msgid "&Next >" msgstr "&Avanti >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&No" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Nessuno" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Normale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Valore numerico:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&OPEN" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Apri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Sovrascrivi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Passiva" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Password:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "&Riproduci suono" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Porta:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Preserva data e ora dei file trasferiti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Coda" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Connessione rapida" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "Barra &connessione rapida" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "Cronologia &connessione rapida" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Lettura" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "&Riconnetti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "Informazioni &riconnessione" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "Aggio&rna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Ricorda la password principale fino alla chiusura di Filezilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "&Ricorda la password fino a che Filezilla non viene chiuso" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "Memo&rizza la password" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "Cartella &remota:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "Percorso &remoto:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "Ricerca &remota" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Rimuovi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Rimuovi chiave" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "&Rimuovi selezionato" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Rinomina" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Rinomina..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Riapri file locale" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Sostituisci i caratteri non validi con:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "&Riporta un errore..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Richiede attenzione" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "&Ripristina e rimetti in coda tutti i file" @@ -883,39 +922,39 @@ msgid "&Restart Wizard" msgstr "&Riavvia la procedura guidata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Ripristina" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "&Esegui comando..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "Avvia configu&razione guidata rete..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Controlla gli aggiornamenti adesso..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCK5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Salva come..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Trova" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Cerca i file remoti..." @@ -923,20 +962,20 @@ msgid "&Select Entry:" msgstr "&Seleziona elemento:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Seleziona la lingua:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Seleziona la colonna che deve essere visualizzata:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Impostazioni" @@ -944,23 +983,19 @@ msgid "&Settings..." msgstr "&Impostazioni..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Visualizza il menu di debug" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "Vi&sualizza registro dettagliato" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Visualizza messaggio" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "Vi&sualizza data e ora nel log messaggi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Elementi &Gestore siti" @@ -968,159 +1003,178 @@ msgid "&Site Manager..." msgstr "Gestore &siti..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" -msgstr "&Segnalibri specifici per &sito" +msgstr "Preferiti &specifici per sito" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Salta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "&Limiti di velocità" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Avvia &immediatamente il trasferimento" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "Inverti vi&sualizzazione locale/remota" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "Crittografie &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Test" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Tema:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Trasferimento" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "Modalità di &trasferimento:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "Coda di &trasferimento" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "&Tratta i file che iniziano con un punto come file ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "" +"Considera attendibile questo certificato nell'elenco alternativo nomi host." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "Ann&ulla modifiche" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Aggiorna la chiave in cache per questo host" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Upload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Invia in:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Invia..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Upload:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Usa programma personalizzato" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Usa navigazione sincronizzata" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Usa il programma predefinito di sistema per i file di testo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Usa il seguente indirizzo IP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Usa l'indirizzo IP esterno del server" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "Usa &separatore delle migliaia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Utente:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "Nome &utente:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Versione %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Visualizza" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Visualizza / modifica" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Controlla i file modificati localmente e richiedi se inviare le modifiche" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Quando controlli gli aggiornamenti, verifica:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Scrittura" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Sì" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' non esiste o non è possibile accedervi." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' non è una cartella." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' non è un protocollo supportato." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "" "L'accesso di tipo 'Account' non è supportato dal protocollo selezionato" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1128,7 +1182,7 @@ "I tipi di accesso 'Normale' e 'Account' non sono disponibili. Usa invece " "'Richiedi password'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1136,7 +1190,7 @@ "I tipi di accesso 'Normale' e 'Account' non sono disponibili. L'elemento è " "stato modificato in 'Richiedi password'." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1146,58 +1200,58 @@ "inviare al server i parametri che seguono 'quote'. Puoi inserire il comando " "senza farlo precedere da 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d oggetto filtrato)" msgstr[1] "(%d oggetti filtrati)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% scaricato)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 per senza limite)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 secondi)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 per disabilitarlo)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat impostato a %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(esempio: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(esempio: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(in %s/s)" @@ -1206,7 +1260,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- alla fine" @@ -1226,31 +1280,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s non può essere usato insieme ad una URL FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Nessuno" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Attenzione" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Informazioni" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Informazioni dettagliate" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "Sistema a 32bit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Debug" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "Sistema a 64bit" @@ -1258,24 +1312,29 @@ msgid "< &Back" msgstr "< &Indietro" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Un preferito con il nome indicato esiste già. Scegliere un nome non " "esistente." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Un certificato nella struttura è stato firmato con un algoritmpo non sicuro" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "È necessario selezionare un editor predefinito." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "" "Non è possibile trascinare una cartella in una delle sue sottocartelle." @@ -1290,20 +1349,20 @@ "questi casi è necessario utilizzare la modalità attiva. In modalità attiva, " "FileZilla apre una porta e chiede al server di connettersi ad essa." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Un file precedentemente aperto è stato modificato." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Si sta già trasferendo un file con questo nome." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "Si sta già modificando un file con questo nome. Chiuderlo e riprovare." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1318,11 +1377,20 @@ "negli elenchi.\n" "Durante questa sessione non saranno visualizzati altri avvisi." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Una password principale persa non può essere ripristinata. Memorizza la " +"password in un posto sicuro." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "È disponibile una versione nuova di FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1330,7 +1398,7 @@ "Un server standard non richiede questo. Se vi serve questo contattate " "l'amministratore del server." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1338,7 +1406,7 @@ "Un server standard non richiede questo. Se vi serve questo contattate " "l'amministratore del server." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1347,17 +1415,17 @@ "Disabilitare la navigazione sincronizzata e continuare le modifiche nella " "cartella locale?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "&Aggiungi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "&Permetti il ripristino del trasferimento di file ASCII" @@ -1369,51 +1437,53 @@ msgid "A&pply only to uploads" msgstr "A&pplica solo agli upload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "A&pplica a tutti i file e cartelle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "Rimuovi a&utomaticamente i trasferimenti completati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Informazioni su FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Sopra la lista file" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "L'accesso ad alcune cartelle locali non può essere ripristinato:" + +#: ../../locales/../src/engine/server.cpp:616 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Account" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "&Azione dopo il complemento della coda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Azione sul file selezionato:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Azione da eseguire:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Azione:" @@ -1421,7 +1491,7 @@ msgid "Active mode" msgstr "Modalità attiva" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1429,7 +1499,7 @@ "Test della modalità attiva non riuscito. Non è stato fornito l'indirizzo IP " "corretto." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1437,7 +1507,7 @@ "Test della modalità attiva non riuscito. Non è stato fornito l'indirizzo IP " "corretto. Inoltre, il vostro router ha modificato l'indirizzo inviato." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1446,38 +1516,39 @@ "Test della modalità attiva non riuscito. È stato fornito l'indirizzo IP " "corretto, ma il vostro router l'ha erroneamente modificato." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP in modalità attiva" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "&Aggiungi solo i file alla coda" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Aggiungi le cartelle selezionate alla coda di trasferimento" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Aggiungi i file e cartelle selezionati alla coda di trasferimento" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Aggiungi alla coda" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Tipo di indirizzo non supportato" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Avanzate" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1491,15 +1562,16 @@ "come ti aspetti e anche danneggiare il tuo sistema. Puoi usare le versioni " "beta e i rilasci notturni a tuo rischio." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "&Esegui sempre questa azione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritmo:" -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "Tutti i file sono stati trasferiti correttamente" @@ -1509,7 +1581,7 @@ "Tutte le porte nell'intervallo specificato devono essere comprese tra 1024 e " "65535." -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1518,7 +1590,7 @@ msgstr[1] "" "Tutti i trasferimenti completati. I file %d non possono essere trasferiti." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "" "Permetti il passaggio ad altra modalità di tras&ferimento in caso di " @@ -1530,17 +1602,17 @@ "Permetti il passaggio ad altra modalità di trasferimento in caso di " "fallimento" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Già connesso" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nome alternativo:" msgstr[1] "Nomi alternativi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1548,7 +1620,7 @@ "È possibile usare lo strumento Pageant di PuTTY per la gestione delle " "chiavi; FileZilla non riconosce Pageant." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1556,7 +1628,7 @@ "È possibile alternativamente usare il vostro agente SSH di sistema. Per fare " "ciò assicurati che la variabile SSH_AUTH_SOCK sia impostata." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1564,7 +1636,7 @@ "Alternativamente, puoi anche scaricare la versione aggiornata dal sito web " "FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1908 +#: ../../locales/../src/interface/QueueView.cpp:1662 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1574,7 +1646,7 @@ "\".\n" "Alcuni elementi della coda potrebebro non essere stati ripristinati." -#: ../../locales/../src/interface/QueueView.cpp:1818 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1584,7 +1656,11 @@ "\".\n" "Alcuni elementi della coda potrebebro non essere stati ripristinati." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "L'autore nelle info certificato non è una autorità di certificazione" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1592,73 +1668,72 @@ "Un oggetto con lo stesso nome del oggetto trascinato già esiste nella " "posizione di destinazione." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:641 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Anonimo" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Un'altra operazione remota è in corso, impossibile cambiare la cartella ora." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "Qualsiasi modifica relativa al Gestore siti non sarà salvata." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Qualsiasi modifica relativa ai filtri non sarà salvata." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Qualsiasi modifica ai filtri non verrà salvata." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "App&lica solo alle cartelle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Applica" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Applica solo alla &coda attiva" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Applica solo ai &file" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Archivio" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Buffer argomenti pieno" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Come scheda nel pannello coda trasferimento" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Richiedi un'azione" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/engine/server.cpp:633 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Richiedi password" @@ -1670,7 +1745,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Richiedi l'indirizzo IP esterno al sistema operativo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Inserimento richieste nel forum di FileZilla" @@ -1678,7 +1753,7 @@ msgid "Associated program not found:" msgstr "Programma associato non trovato:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Almeno una condizione del filtro è incompleta" @@ -1686,99 +1761,106 @@ msgid "At this point, all required information has been gathered." msgstr "A questo punto tutte le informazioni richieste sono state raccolte." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Attributo" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Autenticazione non riuscita." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Autore:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Automatico" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Classificazione automatica dei tipi di file" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Dimensioni disponibili" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B " -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "I&gnora proxy" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Errato descrittore file" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Istruzione per l'uso base" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Per conto" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Modifiche in corso" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Attenzione! Il certificato è stato revocato" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binario" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Lavagna" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Blu" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Preferito" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Preferito:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" -msgstr "Segnalibri" +msgstr "Preferiti" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Sfoglia..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Bucket non trovato" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Data di creazione:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" -msgstr "Informazioni versione" +msgstr "Modalità compilazione programma Filezilla" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Categoria business:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1789,99 +1871,115 @@ "FileZilla ad usare uno specifico intervallo di porte, inserisci valori nei " "campi sottostanti." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "A&nnulla operazione corrente" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "&Cancella tutto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "C&opia URL negli appunti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "C&opia le URL con le password negli Appunti" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "&Personalizza" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Associazioni &personalizzate:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "Funzioni CPU:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Calcolo scostamento fuso orario del server..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Non si riesce a leggere il file" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Non si riesce a scrivere nel file." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Impossibile scrivere nel file: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Annulla" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Annulla operazione attiva" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Annulla l'operazione attiva" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Non è possibile accedere a '%s', nessun supporto inserito o dispositivo non " "pronto." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Impossibile aggiungere server al Gestore siti" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Impossibile assegnare indirizzo richiesto" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Impossibile cambiare cartella. C'è già in corso una operazione si " +"navigazione sincronizzata." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1889,7 +1987,7 @@ "Impossibile chiudere la scheda mentrè in uso.\n" "Annullare l'operazione corrente e chiudere la scheda?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1901,22 +1999,23 @@ msgid "Cannot create new filter" msgstr "Non è possibile creare un nuovo filtro" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Non è possibile modificare il file" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Impossibile modificare il file, non connesso a nessun server." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Impossibile modificare il file, percorso remoto sconosciuto." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1924,82 +2023,81 @@ "Non è stato possibile stabilire una connessione FTP ad un server SFTP. " "Seleziona un protocollo adeguato." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Non è possibile caricare la barra Connessione rapida dal file risorse" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Impossibile caricare il file della chiave" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Non è possibile caricare la barra strumenti dal file risorse" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Impossibile memorizzare le password" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "Non è possibile rinominare la voce" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Non è possibile rinominare il file" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Impossibile risolvere il nome host in indirizzi IPv4 per l'uso con il proxy " -"SOCKS4" +"SOCKS4." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Non è possibile salvare un gruppo di filtri" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Impossibile selezionare il filtro" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Impossibile impostare l'associazione dei file" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Non è possibile visualizzare la finestra" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Impossibile visualizzare / modificare il file selezionato" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Non controllare maiuscole/minuscole" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Non controlla maiuscolo/minuscolo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Non controlla maiuscolo/minuscolo (predefinito)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Controllo maiuscolo/minuscolo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Controllo maiuscolo/minuscolo (predefinito)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Categorie da azzerare" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "Certificato e dati sessione non ancora disponibili." @@ -2011,36 +2109,40 @@ msgid "Certificate issuer" msgstr "Ente emissione certificato" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Verifica fallita firma certificato" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Eccezione:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Cambia gli attributi del file" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Cambia i permessi del file." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Le modifiche al file di log richiedono il riavvio di FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Problema di codifica del carattere" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Set di caratteri" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Controlla gli &aggiornamenti..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Verifica a&utomaticamente aggiornamenti Filezilla:" @@ -2048,15 +2150,15 @@ msgid "Check for Updates" msgstr "Controllo aggiornamenti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Controlla l'esistenza di versioni più recenti di FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Controllo aggiornamenti non riuscito" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2064,7 +2166,7 @@ "Verifica le credenziali di accesso. La password inserita inizia o finisce " "con uno spazio." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2072,39 +2174,39 @@ "Verifica le credenziali di accesso. Il nome inserito inizia o finisce con " "uno spazio." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Controllo di correttezza dell'IP esterno" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Controllo disponibilità aggiornamenti..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "Corrispondenza checksum nel file %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Discordanza checksum nel file %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "Scegli un file chiave" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Selezionare la cartella locale predefinita" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Selezionare la cartella locale" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:668 msgid "Chunk data improperly terminated" msgstr "Blocco di dati terminato non appropriatamente" @@ -2113,54 +2215,62 @@ msgstr "Cipher:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "C&hiudi scheda" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Classica" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Pulisci la cache del &layout" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Azzera dati aggiornamento a&utomatico" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Azzera cronologia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Elimina i dati personali" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Azzera la lista della barra di Connessione rapida" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Fai clic su [Fine] per salvare la configurazione." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Client a server MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Client a server cipher:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Chiudi" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "Chiudi &tutte le altre schede" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "Chiudi FileZilla" @@ -2168,103 +2278,108 @@ msgid "Close all running instances of FileZilla" msgstr "Chiudi tutte le istanze in esecuzione di FileZilla" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Vuoi chiudere la ricerca rapida e continuare la comparazione?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Chiudi scheda corrente" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Co&mmenti:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Proprietà colonna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Impostazione colonna" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Il comando e i parametri devono essere correttamente specificati." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Comando non riuscito" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Comando non supportato" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Comando non supportato da questo protocollo" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Comando:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Commento" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Nome comune:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Comunicazione corrotta dal router" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Confronta data &modifica" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Confronta dimen&sione file" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Soglia di confron&to (in minuti):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "La soglia di confronto deve essere tra 0 e 1440 minuti." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" -msgstr "Compilato con:" +msgstr "Compilata per:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" -msgstr "Compilato con:" +msgstr "Compilato su:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Compilato con:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" -msgstr "Opzioni di compilazione:" +msgstr "Opzioni compilazione:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Compresso" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Trasferimenti concorrenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Le condizioni f&anno distinzione tra maiuscole e minuscole" @@ -2280,41 +2395,42 @@ msgid "Configure port range" msgstr "Configura l'intervallo di porte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Configurazione di FileZilla e della rete" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Conferma cancellazione" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Richiedi conferma" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Congratulazioni, la configurazione sembra funzionante." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Connetti ignorando le impostazioni proxy" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Connessione fallita: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Connetti nella scheda attuale" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Connetti in una nuova scheda" @@ -2322,25 +2438,26 @@ msgid "Connect to specified Site Manager site" msgstr "Connetti al sito specificato nel Gestore siti" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Connessione" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Connessione a %s attraverso proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Connessione a %s..." @@ -2349,188 +2466,230 @@ msgid "Connection" msgstr "Connessione" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Connessione interrotta" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Tentativo di connessione non riuscito" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Tentativo di connessione non riuscito con \"%s\", provare l'indirizzo " "successivo." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Tentativo di connessione non riuscito con \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Tentativo di connessione interrotto dall'utente" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Scaduto tentativo connessione" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Connessione chiusa" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:303 +#: ../../locales/../src/engine/http/request.cpp:316 +#: ../../locales/../src/engine/http/request.cpp:327 +#: ../../locales/../src/engine/http/request.cpp:338 msgid "Connection closed by server" msgstr "Connessione chiusa dal server" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "Connessione stabilita, inizializzazione TLS in corso..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "Connessione stabilita, invio richiesta HTTP" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "Connessione stabilita. In attesa del messaggio di benvenuto." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Connessione stabilita, in attesa del messaggio di benvenuto..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Connessione persa" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Connessione non permessa dalle regole" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Connessione rifiutata" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Connessione rifiutata dal server" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Connessione ripristinata dalla rete" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Connessione ripristinata dal peer" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Timeout connessione dopo %d secondo di inattività" msgstr[1] "Timeout connessione dopo %d secondi di inattività" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Tempo scaduto per la connessione." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Connessione al server persa." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "" "Connessione con il proxy stabilita, in attesa del messaggio di benvenuto..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "La connessione con il server è stata chiusa prematuramente." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Connessione con il server di test non riuscita." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Converti file della chiave" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Copia (%d) di %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "Copia di %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Copia le URL degli elementi selezionati negli Appunti, incluse le password." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Copia gli URL degli elementi selezionati negli appunti." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Impossibile accettare la connessione: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Impossibile accedere al percorso %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Impossibile aggiungere certificato all'elenco temporaneo certificati" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Impossibile aggiungere il sito al Gestore siti" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" -msgstr "Impossibile completare l'operazione." +msgstr "Impossibile completare l'operazione" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Impossibile collegarsi al server" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Impossibile collegarsi al server: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Impossibile convertire comando alla codifica del server" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Impossibile convertire la chiave privata" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Impossibile copiare gli URL" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Impossibile copiare il certificato" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Impossibile copiare i dati" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Impossibile creare CFURL dal percorso %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Impossibile creare URI per questo trasferimento." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Impossibile creare il file locale %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Impossibile creare il file accesso mutex %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Impossibile creare segnalibro scopo sicurezza da URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2541,11 +2700,11 @@ "L'estensione della shell non è installata correttamente o non avete " "rilasciato i file su una finestra di Explorer." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Impossibile stabilire una connessione al server" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2558,11 +2717,16 @@ "riga di comando '--datadir ' 0 impostando la variabile " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Impossibile generare sequenza login personalizzata." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Impossibile generare la chiave" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2570,7 +2734,7 @@ "Impossibile distinguere nome del certificato emittente, " "gnutls_x509_get_issuer_dn fallito" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2578,41 +2742,36 @@ "Impossibile distinguere nome del certificato oggetto, gnutls_x509_get_dn " "fallito" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Impossibile analizzare il percorso remoto." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Impossibile ottenere percorso nativo da CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Impossibile ottenere percorso dall'URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Impossibile ricevere da fzputtyget." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "Impossibile creare la cartella temporanea per il download del file." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Impossibile importare certificato di connessione, gnutls_x509_crt_import " -"fallito" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:96 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Imposssibili inizializzare Winsock (%d): %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Impossibile inizalizzare struttura certificato connessione, " -"gnutls_x509_crt_init fallito" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2622,15 +2781,21 @@ "Impossibile caricare \"%s\", assicurarsi che questo file sia valido.\n" "Le modifiche nel Gestore siti non saranno salvate." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Impossibile caricare il file chiave" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Impossibile caricare chiave privata" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2642,7 +2807,7 @@ "Disabilitare la navigazione sincronizzata e continuare le modifiche nella " "cartella remota?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2653,7 +2818,7 @@ "'%s'.\n" "La navigazione sincronizzata è stata disabilitata." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2664,72 +2829,112 @@ "'%s'.\n" "La navigazione sincronizzata è stata disabilitata." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Impossibile ottenere la dimensione di '%s'" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Impossibile aprire '%s'" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Impossibile aprire gli appunti" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Impossibile aprire il file log: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Impossibile analizzare il percorso remoto." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Impossibile analizzare l'indirizzo del server:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Impossibile leggere dal '%s'" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." msgstr "Impossibile leggere dal socket dati." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:380 #, c-format msgid "Could not read from socket: %s" msgstr "Impossibile leggere dal socket: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Impossibile leggere l'elemento del server." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Impossibile ricevere dati dal server." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Impossibile trovare l'offset %s nel file" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Impossibile ripristinare accesso alla cartella" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Impossibile posizionarsi all'offset %d nel file" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Impossibile trovare l'inizio del file" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Impossibile trovare la fine del file" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Impossibile inviare comando a fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Imposibile inviare comando a fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Impossibile ordinare certificati peer" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "Impossibile lanciare thread di IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Impossibile avviare handshake proxy: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Impossibile avviare il trasferimento" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2738,18 +2943,18 @@ "Impossibile scrivere \"%s\", le modifiche effettuate nel Gestore siti non " "saranno salvate: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Impossibile scrivere \"%s\", il preferito %s non potrà essere aggiunto" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" -"Impossibile scrivere \"%s\", i segnalibri globali non saranno salvati: %s" +"Impossibile scrivere \"%s\", i preferiti globali non saranno salvati: %s" -#: ../../locales/../src/interface/QueueView.cpp:1847 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2758,123 +2963,125 @@ "Impossibile scrivere su \"%s\", la coda non sarà salvata.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Impossibile scrivere su \"%s\", il sito selezionato non può essere " "esportato: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" -msgstr "Impossibile scrivere su \"%s\"" +msgstr "Impossibile scrivere su \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Impossibile scrivere il file della chiave: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Impossibile scrivere nel file locale" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Impossibile scrivere nel file log: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:235 #, c-format msgid "Could not write to socket: %s" msgstr "Impossibile scrivere nel socket: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Nazione:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "Crea &un nuovo file" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" -msgstr "Crea la cartella locale &mancante e entra nella cartella." +msgstr "Crea la cartella locale &mancante e entra nella cartella" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" -msgstr "Crea la cartella re&mota mancante e entra nella cartella." +msgstr "Crea la cartella re&mota mancante e entra nella cartella" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Creare una nuova sottocartella nella cartella attuale" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "" "Creare una nuova sottocartella nella cartella attuale e entra nella " -"sottocartella." +"sottocartella" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Crea un nuovo file vuoto nella libreria attuale" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" -msgstr "Crea la &cartella e entra in essa." +msgstr "Crea la &cartella e entra in essa" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Nuova cartella" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "Crea un file vuoto" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Creazione della cartella in corso" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Creazione cartella '%s' in corso..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Errore grave" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Errore critico:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Errore critico trasferimento file" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Errore critico trasferimento file dopo aver trasferito %s in %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2884,97 +3091,102 @@ "sincronizzazione (%s).\n" "La navigazione sincronizzata è stata disabilitata." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Trasferimento corrente impostato su trasferimento ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Trasferimento corrente impostato su rilevamento automatico." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Trasferimento corrente impostato su trasferimento binario." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Curva:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "&Personalizza" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Set di filtri personalizzato" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Server personalizzato" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Ciano" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Tipo &trasferimento" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Prefissi &decimali utilizzando i simboli SI (es. 1KB = 1000 byte)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "Pred&efinita" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "&Elimina" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "Comparazione cartella" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "D&isabilita tutto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "N&on salvare la password" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Azione d&oppio clic sulle cartelle:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "D&uplica" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:56 msgid "DOS-like with virtual paths" msgstr "Tipo DOS con percorso virtuale" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "File pericoloso" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" -msgstr "data" +msgstr "Data" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Data socket chiuso troppo presto." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Data" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Formato data" @@ -2990,15 +3202,15 @@ msgid "Debug" msgstr "Debug" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Impostazioni di debug" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Cartella &locale predefinita:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:48 msgid "Default (Autodetect)" msgstr "Predefinito (rilevamento automatico)" @@ -3006,17 +3218,17 @@ msgid "Default editor not properly quoted." msgstr "L'editor predefinito non è stato specificato correttamente." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Imposta azione predefinita per i file esistenti" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Cartella r&emota predefinita:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -3024,7 +3236,7 @@ "Il percorso remoto predefinito non può essere selezionato. Assicurarsi che " "sia valido e supportato dal tipo di server selezionato." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Lingua di sistema predefinita" @@ -3032,12 +3244,12 @@ msgid "Default transfer mode:" msgstr "Modalità di trasferimento predefinita:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Tipo di trasferimento predefinito:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Predefinito: http://ip.filezilla-project.org/ip.php" @@ -3045,10 +3257,10 @@ msgid "" "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "" -"Il ritardo tra i tentativi di connessione non riusciti deve essere tra 1 e " -"999 secondi." +"Il ritardo tra i tentativi di connessione falliti deve essere tra 1 e 999 " +"secondi." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3058,80 +3270,90 @@ "attempt..." msgstr[0] "" "Ritardo di connessione di %d secondo dovuto a precedenti tentativi di " -"connessione non riusciti..." +"connessione falliti..." msgstr[1] "" "Ritardo di connessione di %d secondi dovuto a precedenti tentativi di " -"connessione non riusciti..." +"connessione falliti..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "Elimina le voci della Gestione Siti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Elimina le cartelle selezionate" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Elimina i file e cartelle selezionate" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Eliminazione di \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Eliminazione di %u file da \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Elimina collegamento simbolico" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Desktop" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Dettagli" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Dettagli per la nuova chiave:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "Rilevata una nuova versione di Filezilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "&Cartelle" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Direzione" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Cartelle:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Cartella" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Permessi accesso cartella" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Comparazione cartelle" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Comparazione cartella non riuscita" @@ -3141,39 +3363,43 @@ "La cartella contenente il file di log non esiste o il nome del file non è " "valido." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "&Filtri elenco cartelle..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Lettura cartella annullata dall'utente" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "Lettura cartella non riuscita" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Filtri di lettura contenuto cartella" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Elenco cartella di \"%s\" completato" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" -msgstr "Contenuto cartella letto con successo" +msgstr "Contenuto cartella letto correttamente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Disa&bilita tutto" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Disabilitare la navigazione sincronizzata e continuare le modifiche della " "cartella remota?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3181,85 +3407,80 @@ "Disabilitare questa opzione se non si riesce più a vedere i contenuti della " "cartella." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Disconnetti dal server" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Disconnesso dal server" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Disconnesso dal server: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Disconnessione dal server precedente" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Disconnette dal server attualmente visibile" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Visualizza la finestra informazioni" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "&Non usare il programma predefinito" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "&Non fare niente" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Fai lo stesso con &tutti i file selezionati già modificati" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Chiudere FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Vuoi eliminare tutte le voci della Gestione Siti e la coda di trasferimento?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Eliminare tutte le voci della Gestione Siti?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Eliminare le voci selezionate?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Svuotare la coda di trasferimento?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Inviare '%s' al server?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Vuoi riaprire questo file?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Documentazione" @@ -3267,47 +3488,47 @@ msgid "Don't use external IP address on &local connections." msgstr "Non utilizzare l'indirizzo IP esterno per le connessioni &locali." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "I file punto sono i file che iniziano con un punto, es. .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Azione doppio clic" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Download" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Limite di &download:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "Limite di download: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Limite di download: nessuno" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Download risultati ricerca" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Scarica le cartelle selezionate" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Scarica file e cartelle selezionate" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3316,24 +3537,24 @@ "Velocità download: %s/s\n" "Velocità upload: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Download in corso" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Download in corso di %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Download aggiornamento..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 #: ../../locales/../src/interface/QueueView.cpp:88 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3341,11 +3562,11 @@ "La funzione &Trascina e rilascia tra diverse istanze di FileZilla non è " "stata ancora implementata." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:101 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "La funzione &Trascina e rilascia tra diversi server non è stata ancora " @@ -3355,16 +3576,16 @@ msgid "Dupl&icate" msgstr "Dupl&ica" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "A&bilita tutto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "I&nserire cartella" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Ese&cuzione" @@ -3372,48 +3593,48 @@ msgid "E&xit" msgstr "&Esci" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." msgstr "E&sporta..." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "Email:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Ogni filtro richiede almeno una condizione." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Modifica filtri" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Modifica il file nell'editor predefinito e carica le modifiche sul server." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "La modifica delle cartelle non è supportata" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Modifica non riuscita" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Modifica risultati ricerca" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "Comando vuoto" @@ -3421,7 +3642,7 @@ msgid "Empty command." msgstr "Comando vuoto." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "Elenco cartella vuoto" @@ -3429,22 +3650,17 @@ msgid "Empty directory." msgstr "Cartella vuota." -#: ../../locales/../src/interface/recursive_operation.cpp:377 -#: ../../locales/../src/interface/recursive_operation.cpp:412 -msgid "Empty dirs to visit" -msgstr "Cartella vuota da visitare" - #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "File senza estensione." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Nomi di filtro vuoti non sono ammessi." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Nome vuoto" @@ -3452,81 +3668,97 @@ msgid "Empty quoted string." msgstr "Stringa vuota." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "&Abilita tutto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Abiliita &filtro caratteri non validi" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Cifrato" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Cifratura" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "C&hiave criptazione:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "C&hiave criptazione:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Dettagli di cifratura" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Fine comparazione e cambio ordine visualizzazione?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Vuoi chiudere la comparazione e aprire la ricerca rapida?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "&Esegui comando personalizzato..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Inserisci 0 per velocità illimitata." -#: ../../locales/../src/interface/QueueView.cpp:2109 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "Inserisci comando" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Inserisci comando personalizzato" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" -msgstr "digita nome cartella" +msgstr "Digita nome cartella" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Inserisci il nome filtro" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Inserisci password principale" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Inserisci il nome per il set di filtri" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Inserisci il nome per il gruppo di filtri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Inserisci password" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Inserisci la cartella selezionata" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3542,12 +3774,12 @@ "password@host:porta. I valori negli altri campi saranno sovrascritti.\n" "\n" "I protocolli supportati sono:\n" -"- ftp:// per FTP normale con criptazione opzionale,\n" -"- sftp:// per protocollo trasferimento file SSH,\n" -"- ftps:// per FTP su TLS (implicito) e\n" -"- ftpes:// per FTP su TLS (esplicito)." +"- ftp:// per FTP normale con criptazione opzionale\n" +"- sftp:// per protocollo trasferimento file SSH\n" +"- ftps:// per FTP su TLS (implicito)\n" +"- ftpes:// per FTP su TLS (esplicito)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3556,118 +3788,135 @@ "Inserisci la password per il file %s.\n" "Il file convertito verrà protetto con la stessa password." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Inserisci la porta di ascolto del server.\n" -"Il valore predefinito per FTP è 21, per SFTP è 22." +"Inserisci la porta di ascolto del server. Il valore predefinito per FTP è " +"21, per SFTP è 22." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Inserisci nome utente" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Inserisci nome utente e password" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Errore" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Errore di esportazione impostazioni" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Errore di importazione" -#: ../../locales/../src/interface/QueueView.cpp:1909 +#: ../../locales/../src/interface/QueueView.cpp:1663 msgid "Error loading queue" msgstr "Errore nel caricamento della coda" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1830 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Errore di caricamento file xml" -#: ../../locales/../src/interface/QueueView.cpp:1819 +#: ../../locales/../src/interface/QueueView.cpp:1556 msgid "Error saving queue" msgstr "Errore nel salvataggio della coda" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Errore nell'avvio del programma" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1848 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Errore di scrittura file xml" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Errore:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Esempio: png \"C:\\Programmi\\Paint\\Paint.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Esempi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Esecu&zione" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Il file eseguibile non contiene informazioni sulla versione, non è possibile " "verificare gli aggiornamenti." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Explorer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Esporta &filtri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "&Coda di esportazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Impostazioni di e&sportazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Impostazioni di esportazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Nome f&iltro:" @@ -3675,28 +3924,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - Protocollo trasferimento file" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Protocollo trasferimento file con criptazione opzione" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Protocollo trasferimento file non sicuro" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Il motore FTP non è stato inizializzato, impossibile connettersi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Mantieni attiva connessione FTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "Proxy FTP" @@ -3713,82 +3961,93 @@ "L'FTP usa connessioni secondarie per il trasferimento dei dati. Queste " "connessioni aggiuntive possono essere stabilite in due modi." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP: tipi di file" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP su TLS esplicito" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP su TLS implicito" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Non è stato possibile cambiare la cartella" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Errore durante il cambio di lingua" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Impossibile convertire il comando nel set caratteri 8bit" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "Impossibile copiare o spostare siti" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Non è stato possibile creare una copia di backup del file xml" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "" -"Non è stato possibile creare il socket di ascolto, connessione terminata" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Impossibile creare socket ascolto sulla porta %d. Annullamento." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Non è stato possibile creare un socket per la modalità di trasferimento " "attiva" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Decriptazione fallita password server." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" -msgstr "Non è possibile recuperare il percorso \"Documenti\"" +msgstr "Non è possibile recuperare il percorso 'Documenti'" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Non è stato possibile recuperare il percorso del desktop" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Non è stato possibile recuperare l'indirizzo esterno del controllo " "connessione, connessione terminata." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Non è stato possibile recuperare l'indirizzo esterno della connessione dati, " "connessione terminata." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Non è stato possibile avviare il motore FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "Non è stato possibile inizializzare TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" msgstr "Impossibile inizializzare la rete" @@ -3796,76 +4055,71 @@ msgid "Failed to load panels, invalid resource files?" msgstr "Non è stato possibile caricare il menu principale dal file risorse?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Impossibile caricare chiave privata: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Non è stato possibile aprire \"%s\" in aggiunta/scrittura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Non è stato possibile aprire \"%s\" in lettura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Non è stato possibile aprire \"%s\" in scrittura" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "Impossibile analizzare il percorso ritornato." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Non è stato possibile ricevere i dati" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Non è stato possibile leggere il contenuto della cartella" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "" -"Non è stato possibile recuperare l'indirizzo IP esterno, connessione " -"terminata" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" -msgstr "" -"Non è stato possibile recuperare l'indirizzo IP esterno, sarà utilizzato " -"l'indirizzo locale" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Non è stato possibile leggere l'indirizzo IP locale." - -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "" -"Non è stato possibile leggere l'indirizzo IP locale. Connessione terminata" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Impossibile ottenere l'indirizzo IP esterno. Annullamento." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" +msgstr "Impossibile ottenere l'indirizzo IP esterno. Uso indirizzo locale" + +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Impossibile ottenere l'indirizzo IP locale. Annulllamento." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Impossibile ottenere l'indirizzo IP locale." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Non è stato possibile leggere l'indirizzo IP esterno." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Non è stato possibile inviare il comando." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Non è stato possibile impostare la lingua %s (%s), sarà utilizzata la lingua " "predefinita" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3873,49 +4127,48 @@ "Non è stato possibile impostare la lingua su %s (%s), sarà utilizzata la " "lingua di sistema predefinita %s (%s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Non è stato possibile impostare la lingua su %s (%s), sarà utilizzata la " "lingua di sistema predefinita." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Non è stato possibile impostare la lingua su %s, sarà utilizzata la lingua " "predefinita" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Non è stato possibile impostare la lingua su %s, sarà utilizzata la lingua " "predefinita %s (%s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Non è stato possibile impostare la lingua su %s, sarà utilizzata la lingua " "di sistema predefinita." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Verifica delle impostazioni non riuscita" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Impossibile verificare il certificato connessione" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Impossibile scrivere sul file %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Errore di scrittura file xml" @@ -3927,27 +4180,23 @@ msgid "Fall back to active mode" msgstr "Prova la modalità attiva" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Fil&e:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Fil&e" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "File" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Tipi di file" - -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Il descrittore file non è un socket" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Il file non contiene dati importabili." @@ -3955,7 +4204,7 @@ msgid "File editing" msgstr "Modifica file" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "Il file esiste" @@ -3963,7 +4212,7 @@ msgid "File exists action" msgstr "Azione per file esistenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "File modificato" @@ -3971,64 +4220,68 @@ msgid "File lists" msgstr "Elenchi file" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "File non trovato" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Ricerca file" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Trasferimento interrotto dall'utente" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "Trasferimento file interrotto dall'utente dopo aver trasferito %s in %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Trasferimento fallito" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Trasferimento file fallito dopo aver trasferito %s in %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Trasferimenti ignorato" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" -msgstr "Trasferimento file completato con successo" +msgstr "Trasferimento file completato" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Trasferimento file completato; trasferiti %s in %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Trasferimento file ancora in corso." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Il file dovrebbe essere trasferito in modo ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Il file dovrebbe essere trasferito in modo binario." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Errore di FileZilla" @@ -4040,74 +4293,80 @@ "FileZilla può testare le impostazioni per assicurare che tutto sia " "configurato in modo corretto." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla è già connesso a un server." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "FileZilla deve essere riavviato per rendere effettivo il cambio di lingua." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Aggironamenti Filezilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "&Barra stato elenco file" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Nome file" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Filtri nome file..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Il nome file non può essere costruito per la cartella %s e il file %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "Nome file non valido" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Nome file non modificato" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Nome file:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Il nome del file non può contenere caratteri quali: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "Il nome del file non può contenere caratteri quali: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "File in corso di modifica" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" +"I file corrispondenti alle regola del filtro saranno rimossi dall'elenco " +"delle cartelle." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "File non trovati" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Dimensione file" @@ -4115,50 +4374,54 @@ msgid "Filesize format" msgstr "Dimensione file" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Tipo file" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Associazioni tipi di file" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Il filtro si applica a:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Filtro caratteri non validi nel nome file" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Un filtro con questo nome è già presente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Nascondi elementi corrispondenti a tutte le seguenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Nascondi elementi corrispondenti ad una delle seguenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Nascondi elementi non corrispondenti alle seguenti" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Filtra elementi corrispondenti ad eccezione dei seguenti" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Un set di filtri con questo nome è già presente" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtra il contenuto della cartella" @@ -4168,11 +4431,11 @@ msgid "Filter validation failed" msgstr "Validazione filtri non riuscita" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Trova &file" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Trova &cartelle" @@ -4184,16 +4447,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Fingerprint (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Impronta:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Impronte digitali:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Configurazione guidata firewall e router" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4207,7 +4471,7 @@ "Per motivi di affidabilità, sarebbe preferibile inserire un intervallo di " "almeno 10 porte." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4215,34 +4479,39 @@ "Per questa sessione, saranno utilizzate le impostazioni predefinite. " "Qualsiasi cambiamento alle impostazioni non sarà memorizzato." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Forza &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Visualizza file &nascosti" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Visualizza file nascosti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Specifiche formato:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Formato: estensione seguita da comando e parametri correttamente specificati." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Trovato nuovo %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Funzione %s non riuscita" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Altra documentazione" @@ -4250,11 +4519,15 @@ msgid "General" msgstr "Generale" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Errore generico server SOCKS" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Generazione..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Proxy generico" @@ -4263,70 +4536,74 @@ msgid "Get external IP address from the following URL:" msgstr "Ottieni l'indirizzo IP esterno dall'URL seguente:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Ottieni aiuto" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" -msgstr "Un set di filtri con questo nome è già presente, sovrascrivere?" +msgstr "Un set di filtri con questo nome è già presente. Vuoi sovrascriverlo?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" -msgstr "Segnalibri globali" +msgstr "Preferiti globali" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Errore GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Errore GnuTLS %d in %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Errore GnuTLS %d in %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Errore GnuTLS %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Verde" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Permessi di gruppo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "&Alto" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP su TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Nascosto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 #: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Alto" -#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:938 #: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Superiore" @@ -4336,58 +4613,67 @@ msgstr "" "La massima porta disponibile deve essere un numero compreso tra 1024 e 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Tenere premuto il tasto FISSA MAIUSC per cambiare lo stato del filtro da " "entrambe le parti simultaneamente." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Sito web:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Host non attivo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Chiave impronta:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "La chiave dell'host non corrisponde" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "" "Il nome computer inizia con \"[\" ma non c'è la parentesi quadra di chiusura." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Host non raggiungibile" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Host:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algoritmo chiave host:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Ore," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Ho &dimenticato la password principale. Elimina tutte le password salvate " +"con questa chiave." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (esempio: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Gli indirizzi IPv6 non sono supportati con il proxy SOCKS4" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4397,7 +4683,7 @@ "dell'intervallo specificato, il collegamento sarà chiuso e FileZilla proverà " "a ricollegarsi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Quando si segnalano errori di funzionamento è opportuno fornire registri con " @@ -4424,7 +4710,7 @@ "Se l'opzione di fallback è abilitata, è possibile connettersi a server mal " "configurati che rifiutano la modalità di trasferimento selezionata." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4432,20 +4718,20 @@ "Se il cambiamento della chiave dell'host non era previsto, contattare " "l'amministratore del server." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "Se il problema persiste, alcuni router/firewall bloccano FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" "Se il problema persiste, alcuni router o firewall impediscono la connessione." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4455,7 +4741,7 @@ "aggiungendo \".1\" alla fine del nome file (possibilmente sovrascrivendo i " "vecchi file di Log) e un nuovo file verrà creato." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4463,7 +4749,7 @@ "Se il collegamento simbolico punta a una cartella, FileZilla può eliminare " "il collegamento simbolico o rimuovere il contenuto della cartella collegata." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4471,12 +4757,12 @@ "Se il problema persiste, contattare il produttore del vostro router o " "firewall per una soluzione." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "Se il problema persiste, contattare il produttore del vostro router." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4486,7 +4772,7 @@ "sistema sia sincronizzato con il server. Se l'ora differisce (es. fusi orari " "diversi), specificare l'offset del fuso orario in Gestione Siti." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4494,7 +4780,7 @@ "Se si usa il confronto basato sulla data, considerare due file uguali se la " "differenza di data non supera questa soglia." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Se modifichi la linngua, è necessario riavviare Filezilla." @@ -4506,11 +4792,11 @@ "Facendo clic su [Test], FileZilla si connetterà a probe.filezilla-project." "org ed effettuerà alcuni semplici test." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Se FileZilla verrà chiuso, i cambiamenti andranno persi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4522,7 +4808,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "In caso di errori, la configurazione non è corretta." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4531,7 +4817,7 @@ "trasferimento di file, provare a modificare la modalità di trasferimento " "predefinita." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4567,25 +4853,25 @@ "Se si utilizza un router, assicurarsi che queste porte siano inoltrate alla " "macchina su cui gira FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "" "Se il router continua a cambiare IP, contattare il produttore del router." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importa i dati da una versione precedente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Importa configurazione" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" -msgstr "Importazione avvenuta con successo" +msgstr "Importazione completata" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 @@ -4610,7 +4896,7 @@ "quanto FileZilla non può indicare al sistema quali porte scegliere." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4628,19 +4914,11 @@ "FileZilla chiede una porta al server e si connette alla porta indicata. Non " "sono richieste altre configurazioni speciali." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Segmento incompleto, il certificato principale non è un certificato auto " -"firmato da una autorità di certificazione" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Password non corretta" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4648,21 +4926,21 @@ "Informazioni sulla versione aggiornata di Filezilla non disponibili. Riprova " "più tardi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Inizializzazione TLS in corso..." -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "Algoritmo non sicuro!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Server non sicuro, non supporta FTP su TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:613 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interattivo" @@ -4670,29 +4948,29 @@ msgid "Interface" msgstr "Interfaccia" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Interrotto dal segnale" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Interrotto dall'utente" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 +#: ../../locales/../src/engine/http/request.cpp:582 msgid "Invalid Content-Length" msgstr "Lunghezza contenuti non valida" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:488 msgid "Invalid HTTP Response" msgstr "Risposta HTTP non valida" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Argomento passato non valido" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4700,47 +4978,71 @@ "Ricevuta una sequenza di caratteri non valida, UTF-8 disabilitato. Seleziona " "l'opzione UTF-8 in Gestione Siti per forzare UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:703 msgid "Invalid chunk size" msgstr "Dimensione blocco non valido" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Ricevuti dati non validi" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Data non valida" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Nome file non valido" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Hash non valido: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Nome computer non valido, dopo parentesi quadra di chiusura ci possono " "essere solo virgola e numero porta." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Nome host non valido: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Input non valido" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:516 +msgid "Invalid line" +msgstr "Linea non valida" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Percorso non valido" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Porta fornita non valida. La porta deve avere un valore compreso tra 1 e " "65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4754,74 +5056,74 @@ "ftps:// per FTP su TLS (implicito) e\n" "ftpes:// per FTP su TLS (esplicito)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Nome computer proxy non valido. Dopo la parentesi quadra di chiusura può " "esserci solo virgola e numero porta." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Espressione regolare non valida" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Espressione non valida nelle condizioni di ricerca." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:497 msgid "Invalid response code" msgstr "Codice di risposta non valido" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Condizioni non valide di ricerca: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Percorso sito non valido" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Dimensione non valida nella condizione" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Nome utente fornito non valido." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Valore non valido per ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Valore non valido per i suggerimenti" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Inverti filtro" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Nazione giurisdizione:" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Località giurisdizione:" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Provincia giurisdizione:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Mantieni le cartelle in cima" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4832,7 +5134,7 @@ "Anche se FileZilla effettua alcune verifiche per vedere se il server " "supporta questa funzionalità, la prova potrebbe non avere successo." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Scambio chiave" @@ -4840,123 +5142,147 @@ msgid "Key exchange:" msgstr "Scambio chiave:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:610 +#: ../../locales/../src/engine/server.cpp:635 msgid "Key file" msgstr "File chiave" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Identificatore chiave:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Inferi&ore" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Lingua" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Lingua modificata" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Ultima modifica" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Disposizione" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Lascia vuoto per mantenere la password esistente." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Limite per &download concorrenti:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Limite per &upload concorrenti:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Limita le porte locali" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Dimensione limite file Log" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Limite:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:657 msgid "Line length exceeded" msgstr "Lunghezza riga in eccesso" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" -msgstr "Collegato contro" +msgstr "Librerie collegate" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Socket di ascolto chiuso" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Elenco:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "P&orta più bassa disponibile:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Locale" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Indirizzo locale in uso" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Il punto di chiusura locale è stato chiuso" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "File locale" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Il file locale non esiste." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Il file locale è %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Il file locale è una cartella invece di essere un file normale." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Il file locale non ha un nome file valido." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Ricerca file locale" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Filtri locali:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Gestione percorso locale:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Sito locale:" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "" +"La dimensione locale di '%s' non corrisponde alla dimensione attesa %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Località:" @@ -4964,16 +5290,16 @@ msgid "Log file" msgstr "File log" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "Accesso effettuato" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Connessione" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4982,7 +5308,7 @@ "essere compatibile UTF-8. Impossibile fallback con set caratteri locale " "usando il proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4990,11 +5316,9 @@ "Dati di login contenenti caratteri non ASCII ed il server potrebbe non " "essere compatibile UTF-8. Tentativo con set di caratteri locale." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "" -"Sequenza di login eseguita completamente ma impossibile connetersi. " -"Interruzione." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "Sequenza accesso non ancora completamente eseguita, annullamneto." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -5009,12 +5333,12 @@ "Logontype può essere usato insieme ad una URL FTP. L'argomento deve essere o " "'%s' o '%s'" -#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:931 #: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Basso" -#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:929 #: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Minimo" @@ -5028,128 +5352,159 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "Assicurarsi che il file sia accessibile e sia un documento XML valido." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:644 +#: ../../locales/../src/engine/http/request.cpp:650 +#: ../../locales/../src/engine/http/request.cpp:657 +#: ../../locales/../src/engine/http/request.cpp:668 +#: ../../locales/../src/engine/http/request.cpp:703 #, c-format msgid "Malformed chunk data: %s" msgstr "Blocco dati non corretto: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 #, c-format -msgid "Malformed header: %s" -msgstr "Intestazione non corretta: %s" +msgid "Malformed request header: %s" +msgstr "Intestazione richiesta mal formattata: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "" -"Risposta non corretta, il server non sta inviando terminazioni di riga " -"corrette" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:457 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:516 +#: ../../locales/../src/engine/http/request.cpp:572 +#: ../../locales/../src/engine/http/request.cpp:582 +#, c-format +msgid "Malformed response header: %s" +msgstr "Intestazione risposta mal formattata: %s" + +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +#, c-format +msgid "Malformed response: %s" +msgstr "Risposta non corertta: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Trasferimento manuale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "&Password principale:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Password principale:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Accetta tutti i seguenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Corrispondenza trovata per tutti i seguenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Nessuna corrispondenza trovata per i seguenti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Non controllare corrispondenza dei seguneti" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "&Trasferimenti massimi simultanei:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Fallita allocazione memoria" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Registro messaggi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Posizione registro messaggi" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Messaggio troppo lungo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Minuti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Sposta &giù" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Sposta &su" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Risorse del computer" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Documenti" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "I miei siti" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/d" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Nome" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "Nome già presente" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Nome del segnalibro già presente." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Nome:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Ordinamento naturale" @@ -5157,19 +5512,23 @@ msgid "Need to enter filter name" msgstr "Devi inserire il nome file" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Devi inserire un percorso locale valido" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "È necessario inserire un percorso remoto valido" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "Deve essere specificata la codifica del caratteri" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Nome nodo e nome server non forniti, o sconosiuti" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5177,12 +5536,12 @@ "L'host di rete non ha un indirizzo di rete nella famiglia di indirizzi " "richiesta" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Rete non raggiungibile" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Mai" @@ -5194,37 +5553,37 @@ msgid "New &tab" msgstr "Nuova &scheda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nuovo &preferito" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Nuovo preferito" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Nuova cartella" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Nuove funzionalità e miglioramenti in %s" @@ -5233,41 +5592,41 @@ msgid "New filter" msgstr "Nuovo filtro" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Nuova cartella" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Nuovo sito" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Prossimo nella coda trasferimento" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "No" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Nessun indirizzo associato con il nome nodo" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Nessuna categoria da esportare selezionata" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." msgstr "Nessun comando ottenuto, annullamento in corso." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Nessun IP esterno impostato, sarà provato quello predefinito." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Non sono in corso modifiche a file." @@ -5275,97 +5634,93 @@ msgid "No filter name given" msgstr "Nessun nome filtro fornito" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Nessun host fornito, inserisci un host." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Nessuna immagine disponibile" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Nessun file nella coda!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Nessun nome è stato fornito per il gruppo di filtri." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Nessun programma associato con il tipo di file" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Nessun programma è stato associato per la modifica di file con estensione " "'%s'." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Nessun route verso l'host" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Nessun risultato della ricerca" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Nessun sito disponibile" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Metodo autenticazione SOCKS5 non supportato" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Nessun nome fornito." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Nessuno" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Nessun elemento selezionato" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Errore non recuperabile nella risoluzione nomi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 #: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 msgid "Normal" msgstr "Normale" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "Non tutti gli elementi possono essere richiesti per il trasferimento." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Non connesso" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Nessun server collegato" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Nessun server collegato." @@ -5373,27 +5728,36 @@ msgid "Not connected." msgstr "Non connesso." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Non inizializzato, serve una chiamata a WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Attenzione che questa caratteristica è supportata solo utilizzando il " "protocollo FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Nota: una chiave smarrita non può essere recuperata." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Nota: funziona solo con connessioni FTP non cifrate." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Nota: usando un proxy generico si forza la modalità passiva nelle " "connessioni FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:650 +msgid "Null character in line" +msgstr "Caratteri nulli nella linea" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Numero di punti decimali:" @@ -5401,42 +5765,46 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Il numero di nuovi tentativi deve essere compreso tra 0 e 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "A&pri file" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "A&pri" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" -msgstr "Versione SO:" +msgstr "Versione S.O.:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" @@ -5446,39 +5814,52 @@ "Nelle pagine seguenti, sarà configurata la modalità di trasferimento " "selezionata, così come la modalità di fallback, se abilitata." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Una volta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Una volta al giorno" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Una volta la settimana" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" -msgstr "Usa solo FTP non sicuro" +msgstr "Usa solo FTP in chiaro (non sicuro)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Apri fil&e" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Apri cartella nel gestore file di sistema" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Apri Gestore siti" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Apri il Gestore siti." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Apri il Gestore siti - Clic destro per un elenco di siti." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Apri la finestra di dialogo dei permessi di accesso delle cartelle per " +"impostare le cartelle locali a cui Filezilla avrà accesso." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Apri file." @@ -5486,14 +5867,16 @@ msgid "Open the settings dialog of FileZilla" msgstr "Apri la finestra impostazioni di FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Aperto come:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Apertura non riuscita" @@ -5505,110 +5888,118 @@ msgid "Opens the Site Manager" msgstr "Apri Gestore siti" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Apri la finestra di dialogo elenco cartella. Clic tasto destro per " "abilitazione/disabilitazione filtri." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Sistema operativo:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Operazione già in corso" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Operazione in corso" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Operazione non supportata" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Opzioni" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Arancio" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Organizzazione:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Altre opzioni SFTP" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Altre errore di sistema" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Altro:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Memoria esaurita" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Descrizione generale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Sovrascr&ivi se più recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Sovrascrivi file" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Sovrascrivi file se la dimensione è differente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "" "Sovrascrivi file se la dimensione è differente o il sorgente più recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Sovrascrivi file se il sorgente è più recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Sovrascrivi se &dimensione differente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Sovrascrivi se dimensione dif&ferente o sorgente più recente" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Tipo build proprietario: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Permessi proprietario" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Proprietario/gruppo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5616,31 +6007,31 @@ "E&vita che il sistema vada in stato di standby durante il trasferimento o " "altre operazioni" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Host p&roxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Comando PORT corrotto dal router." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Pa&ssiva (consigliata)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Il parametro non è una URL valida" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Analisi %d byte informazione versione.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Pass&word:" @@ -5648,69 +6039,83 @@ msgid "Passive (recommended)" msgstr "Passiva (consigliata)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Modalità passiva" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "" "La modalità passiva è stata impostata come modalità di trasferimento " "predefinita." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Password o chiave criptazione non impostate" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "È richiesta la password" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Password" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Percorso" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "" "Il percorso non può essere costruito per la cartella %s e la sottocartella %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" -msgstr "Percorso non trovato" +msgstr "Percorso non trovato:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Percorso" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "In attesa di rimozione" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Permesso" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Permesso negato" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Permessi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Piattaforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Aggiungi le cartelle locali che vuoi suare con Filezilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5718,6 +6123,14 @@ "Controlla su https://filezilla-project.org/probe.php che il server sia in " "esecuzione e ricontrolla con attenzione le impostazioni." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Verifica i permessi di accesso e ri-aggiungi nella finestra di dialogo tutte " +"le cartelle locali mancanti che stai usando." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5726,11 +6139,11 @@ "Firewall e router devono essere configurati in modo da consentire a " "FileZilla di stabilire connessioni in uscita su porte scelte arbitrariamente." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Disabilitare le impostazioni come 'DMZ mode' o 'Game mode' sul router." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5746,13 +6159,13 @@ msgid "Please enter a custom time format." msgstr "Inserisci un formato ora personalizzato." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Inserisci una data nella forma AAAA-MM-GG come ade sempio 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5762,16 +6175,16 @@ msgid "Please enter a name for the new filter." msgstr "Inserisci un nome per il nuovo filtro." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Inserisci un nuovo nome per il filtro copiato." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Inserisci un nuovo nome per il gruppo di filtri \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Inserisci un nuovo nome per il filtro." @@ -5793,50 +6206,40 @@ msgstr "" "Inserisci un numero tra 1 e 10 per il numero di trasferimenti concorrenti." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Inserisci una password per questo server:" -#: ../../locales/../src/interface/QueueView.cpp:2109 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Inserisci il percorso del programma da eseguire.\n" -"Es. c:\\somePath\\file.exe sotto MS Windows o /somePath/file sotto Unix.\n" -"È possibile anche specificare i parametri del programma." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" "Inserisci un timeout tra 10 e 9999 secondi o 0 per disabilitare i timeout." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Inserisci un nome univoco per questo set di filtri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Inserisci un nome utente per questo server:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Inserisci un intervallo di porte valido." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Inserisci l'URL da cui ricavare l'indirizzo IP esterno" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Inserisci un limite di velocità per l'upload superiore o pari a 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5844,27 +6247,47 @@ "Inserisci un comando FTP.\n" "L'utilizzo di comandi ftp personalizzati svuoterà la cache delle cartelle." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Inserisci il percorso completo del programma e i suoi argomenti. Questo " +"comando verrà eseguito quando srà completata l'elaborazione della coda.\n" +"Es. c:\\cartella\\file.exe in MS Windows o /cartella/file in Unix.\n" +"È pnecessario quotare corretamente i comandi e i loro argomenti se " +"contengono spazi." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Inserisci il nome della cartella che deve essere creata:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "Insersci il nome del file che deve essere creato:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Inserisci nome utente e password per questo server:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Inserisci la password principale per modificare le impostazioni password." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Inserisci l'indirizzo IP esterno" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5874,15 +6297,22 @@ "di questa procedura guidata. Se l'indirizzo è dinamico o non lo conosci, usa " "l'opzione del risolutore esterno." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Inserisci la password principale per decriptare la password per questo " +"server:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." msgstr "" "Seguire attentamente le istruzioni, in quanto una configurazione errata può " -"impedire il successo delle connessioni FTP." +"impedire la riuscita delle connessioni FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5890,12 +6320,12 @@ "Assicuratevi che a FileZilla sia permesso stabilire connessioni in uscita e " "che l'indirizzo del risolutore di indirizzi sia stato scritto correttamente." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Assicuratevi che la lingua richiesta sia installata nel vostro sistema." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5919,7 +6349,7 @@ "usata da virus o altro malware. Eventuali falsi allarmi di questo tipo " "possono essere ignorati senza problemi." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5927,7 +6357,7 @@ "Notare che il mantenimento di data e ora dei file in upload funziona solo " "con server FTP, FTPS e FTPES (non SFTP) che supportano il comando MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5935,7 +6365,7 @@ "NOTA: alcuni server potrebbero bloccare i client se i tentativi di " "riconnessione sono troppi o gli intervalli tra i tentativi troppo brevi." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5945,11 +6375,19 @@ "variazioni della configurazione di rete o al verificarsi di problemi su " "server precedentemente funzionanti." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Salva questa chiave in un posto sicuro. Senza la chiave corretta i tuoi file " +"uploadati non saranno più accessibili." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Selezionare un'azione:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Selezionare le categorie da importare." @@ -5980,7 +6418,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Impostare i nuovi attributi per i file selezionati." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5995,37 +6433,37 @@ "chiamata'modo DMZ' o 'modo game'. Cose come analisi del protocollo or " "specifichefixups del protocollo devono essere disabilitati" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Posizio&ne del registro messaggi:" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "CAP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "Pre&alloca spazio prima del download" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Preallocazione" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Siti Predefiniti" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Preserva data e ora file" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Anteprima:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Anteprima" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "" "I certificati della connessione primaria e della connessione dati non " @@ -6033,21 +6471,21 @@ #: ../../locales/../src/interface/cmdline.cpp:19 msgid "Print diagnostic information related to startup of FileZilla" -msgstr "Stampa informazioni diagnostiche relative all'avvio di Filezilla." +msgstr "Stampa informazioni diagnostiche relative all'avvio di Filezilla" #: ../../locales/../src/interface/cmdline.cpp:18 msgid "Print version information to stdout and exit" msgstr "Invia informazioni versione a stdout e esci" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Cartelle prioritizzate (predefinito)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Priorità" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6055,7 +6493,7 @@ "Policy privacy: verranno inviate al server solo informazioni sulla versione " "di FileZilla, del sistema operativo e dell'architettura della CPU." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Chiavi &private:" @@ -6063,31 +6501,31 @@ msgid "Pro&tocol:" msgstr "Pro&tocollo:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Password pro&xy:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Elabora co&da" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Tabella file elaborazione piena" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." -msgstr "Elaborato %s iin %s." +msgstr "Elaborato %s in %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Protocollo non supportato" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Protocollo non supportato dal socket fornito" @@ -6095,57 +6533,57 @@ msgid "Protocol:" msgstr "Protocollo:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "&Porta proxy:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "&Utente proxy:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Autenticazione proxy non riuscita" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Handshake proxy non riuscito: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "Il nome computer proxy inizia con '[' ma non c'è la parentesi quadra di " "chiusura." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Risposta proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:520 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Richiesta proxy fallita. Risposta dal proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Richiesta proxy non riuscita: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Richiesta proxy non riuscita: tipo di indirizzo sconosciuto nella risposta " "CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy impostato ma proxy o porta proxy non validi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Autenticazione con chiave pubblica" @@ -6153,68 +6591,78 @@ msgid "Public key algorithm:" msgstr "Algoritmo chiave pubblica:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Permessi pubblici" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "Coda elaborata completamente" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Coda: %s MB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Coda: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Coda: vuota" -#: ../../locales/../src/interface/QueueView.cpp:438 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "File in coda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "In coda:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "&Riavvia il sistema" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Ricerca rapida:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "" +"La ricerca rapida non può essere aperta se stai comparando le cartelle." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "Riavvia il sist&ema" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "Struttura cartella r&emota" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "Ripristina e m&etti in coda i file selezionati" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Comando FTP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Le&ttura" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "Aggio&rna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Ri&nomina" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6222,20 +6670,24 @@ "Riavviare la configurazione e verificare attentamente le impostazioni e " "configurare in accordo tutti i router/firewall." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Lettur&a" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Sola lettura" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "Lettura fallita dal file locale" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Annullare l'operazione attiva?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6243,21 +6695,21 @@ msgstr[0] "Eliminare %d cartelle e il loro contenuto nel server?" msgstr[1] "Eliminare %d cartelle e il loro contenuto nel server?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Eliminare %d file nel server?" msgstr[1] "Eliminare %d file nel server?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Eliminare %s e %s nel server?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "Eliminare tutti i file e/o cartelle selezionati nel server?" @@ -6265,52 +6717,60 @@ msgid "Really delete all selected files and/or directories from your computer?" msgstr "Eliminare tutti i file e/o cartelle selezionati nel computer?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Motivo" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "Riavvia adesso" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "&Includi sottocartelle" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Ricevuto avviso TLS dal server: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Ricevuto un elenco di cartella che appare codificato in EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Ricevuta una linea eccedente i 10000 caratteri, interruzione." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"La struttura del certificato ricevuto non può essere verificata. Stato " +"verifica %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Ricevuti dati corrotti" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "Ricevuti caratteri non validi nell'informazione versione" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Ricevuto avviso TLS sconosciuto %d dal server" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "L'informazione versione ricevuta è troppo grande" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6319,77 +6779,75 @@ "connessi ad un server.\n" "Se si procede, la connessione sarà terminata." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Impostazioni di riconnessione" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Riconnetti all'ultimo server utilizzato" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." -msgstr "Aggiunta ricorsiva file alla coda" +msgstr "Aggiunta ricorsiva file alla coda." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Modifica ricorsiva permessi." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Eliminazione ricorsiva di file e cartelle." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Rosso" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Redirezione ad un indirizzo non valido o ad una URL non supportata: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Redirezione ad un indirizzo non valido o non supportato: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Aggiorna l'elenco file e cartelle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Memorizzare la password?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Remoto" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Certificato remoto non sicuro." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "File remoto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Ricerca file remota" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "File remoti:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Percorso remoto" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6399,7 +6857,7 @@ "sia un percorso assoluto valido e supportato dal tipo di server (%s) " "attualmente attivo." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6408,130 +6866,134 @@ "Il percorso remoto non può essere analizzato. Assicurarsi che sia un " "percorso assoluto valido e supportato dal tipo di server (%s) selezionato." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Il percorso remoto non può essere analizzato. Assicurarsi che sia un " "percorso assoluto valido." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Il percorso remoto non ha potuto essere analizzato." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Gestione percorso remoto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Percorso remoto:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Sito remoto:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Rimuovi &tutto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Rimuovi gli elementi &selezionati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Rinomina file" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Rinomina le cartelle selezionate" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Rinomina i file e cartelle selezionate" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Rinomina da '%s' a '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Ripeti password:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Segnalazione bug e richieste di nuove funzionalità" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Richiesta fallita - il client non ha in esecuzione identd (o non è " "raggiungibile dal server)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Richiesta rifiutata o fallita - inetd del client non conferma la stringa ID " "utente" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Richiesta rifiutata o fallita" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "Richiedi FTP esplicito su TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "Richiedi FTP implicito su TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Ripristina e rimetti in cod&a tutti i file" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Il protocollo risoluzione è sconosciuto" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Risoluzione dell'indirizzo IP %s in corso" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Risorsa temporaneamente non disponibile" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Risposta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Risultati:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Riprendi trasferimento file" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6539,19 +7001,21 @@ "Riprendere il trasferimento di un file ASCII può causare problemi se il " "server utilizza un formato di terminazione di riga diverso dal client." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Recupero elenco cartella di \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Lettura elenco cartelle..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "È in corso la lettura dell'indirizzo IP esterno da %s" @@ -6560,23 +7024,23 @@ msgid "S&how files currently being edited..." msgstr "Visualizza i file &su cui sono in corso modifiche..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "&Visualizza Gestore siti all'avvio" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" msgstr "&Arresta il sistema" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "&Ferma" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "&Sospendi il sistema" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "S&ospendi il sistema" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "Navigazione s&incronizzata" @@ -6584,90 +7048,110 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Supporto SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Il proxy SOCKS4 si collegherà a: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 non supporta nomi utente o password più lunghi di 255 caratteri." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Sal&va le password protette dalla password principale" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Sal&va password" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Salvare le impostazioni?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "" "Il salvataggio password è stato disabilitato dall'amministratore del sistema." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "Il salvataggio password è stato disabilitato dall'utente." -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "Cerca file da aggiungere alla coda" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "Ricerca dei file da inviare in corso" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Fattore di scala:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Cerca &condizioni:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Cerca &cartella:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Ricerca ricorsiva file." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Cerca nei server i file" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Tipo ricerca::" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Informazioni sicurezza" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Vedi anche: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Sele&ziona server" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Seleziona &pagina:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Seleziona tema" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "Imposta l'azione da eseguire se il file di destinazione esiste già." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Seleziona l'editor predefinito" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6675,7 +7159,7 @@ "Imposta l'azione da eseguire se il file di destinazione esiste già. Questa " "modifica è valida solo per la sessione corrente." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6683,138 +7167,142 @@ "Seleziona azione predefinita file esistente solo per i file attualmente " "selezionati nella coda." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Il file selezionato contiene una chiave privata" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Selezionare il file per l'esportazione dei dati" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Seleziona file per filtri esportati" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Selezionare il file per l'esportazione delle code" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Selezionare il file per l'esportazione delle impostazioni" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "Selezionare il file per l'esportazione dei siti" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Selezionare il file dal quale importare le impostazioni" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Seleziona il file da inviare" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Seleziona il nome per il file convertito della chiave" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Seleziona come questi file devono essere aperti." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Seleziona cartella per il download" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Selezionare il nome file destinazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Selezionare le categorie da esportare:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Selezionare gli elementi privati da eliminare." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Selezionato per il trasferimento %d cartella con il suo contenuto." msgstr[1] "Selezionato per il trasferimento %d cartelle con il loro contenuto." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Selezionata %d cartella." msgstr[1] "Selezionate %d cartelle." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Selezionato %d file per il trasferimento." msgstr[1] "Selezionati %d file per il trasferimento." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Selezionato %d file. Dimensione totale: %s" msgstr[1] "Selezionati %d file. Dimensione totale: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Selezionato %d file. Dimensione totale: almeno %s" msgstr[1] "Selezionati %d file. Dimensione totale: almeno %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Selezionati %s e %s per il trasferimento." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Selezionati %s e %s. Dimensione totale: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Selezionati %s e %s. Dimensione totale: almeno %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Il programma selezionato non esiste." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Si sta già modificando il file selezionato" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Il file selezionato è già stato caricato" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Il file selezionato è già aperto" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Si sta ancora modificando il file selezionato" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Il filtro selezionato opera solo su file locali." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6823,47 +7311,47 @@ "di server.\n" "Usa preferito specifico per sito per il server attuale." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "" "La porta selezionata di solito viene utilizzata da un protocollo diverso." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Invia coman&di FTP per mantenere attiva la connessione" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "Invia al server un comando personalizzato altrimenti non disponibile" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Invia comando per mantenere connessione attiva" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Numero seriale:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "&Tipo di server:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Il server non ha correttamente chiuso la connessione TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Il server non supporta caratteri non ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Il server non supporta il ripristino di file > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6872,15 +7360,19 @@ "Il server non supporta il ripristino di file > %d GB. Il trasferimento sarà " "terminato in quanto le dimensioni corrispondono." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Il server non supporta il ripristino di file > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Il server non supporta il ripristino di file > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Chiave server host" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6889,7 +7381,7 @@ "Il server potrebbe non supportare il ripristino di file > %d GB. Il " "trasferimento sarà terminato in quanto le dimensioni corrispondono." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6897,11 +7389,26 @@ "Il server richiede un account. Specificare un account utilizzando il Gestore " "siti" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:457 +msgid "Server not sending proper line endings" +msgstr "Il server non ha inviato la terminazione riga corretta" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" +"Il server ha richiesto un algoritmo di autentificazione non supportato: %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "Il server ha richiesto una tipologia di protezione non supportata: %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "Il server ha ritornato un percorso vuoto." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6909,13 +7416,19 @@ "Il server ha inviato una richiesta addizionale di login. È necessario usare " "un tipo di login interattivo." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/http/request.cpp:307 +msgid "Server sent data even before request headers were sent" +msgstr "" +"Il server ha inviato dei dati prima che sia stata inviata l'intestazione " +"della richiesta" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Il server ha inviato una risposta passiva contenente un indirizzo non " "raggiungibile. Modalità passiva non riuscita." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6923,36 +7436,50 @@ "Il server ha inviato una risposta passiva contenente un indirizzo non " "raggiungibile. Sarà usato l'indirizzo del server." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +msgid "Server sent too much data." +msgstr "Il server ha inviato troppi dati." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Il server ha inviato una risposta non prevista." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Il server ha inviato un collegamento certificato non ordinato in violazione " +"alle specifche TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Server a client MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Server a client cipher:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "&Tipo di server:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "File server/locale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Server:" @@ -6960,50 +7487,55 @@ msgid "Session details" msgstr "Dettagli sessione" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Imposta &priorità" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Imposta permessi di '%s' a '%s'" - -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "Chiamata SetSocketBufferSize senza socket" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Impostazione permessi di '%s' a '%s'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Impostazioni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Cartella impostazioni:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Visualizza fumett&o notifica" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Most&ra elenco cartelle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Visualizza finestra di &benvenuto..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "" "Visualizzare entrambi gli alberi delle cartelle e continuare la comparazione?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Visualizza dettagli" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Visualizza dettagli su formati personalizzati data e ora" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "Visualizza nel Gestore file" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Visualizza crittografie TLS disponibili" @@ -7011,7 +7543,7 @@ msgid "Shows this help dialog" msgstr "Visualizza questa finestra di aiuto" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "Arresta il sistema" @@ -7019,7 +7551,11 @@ msgid "Signature algorithm:" msgstr "Algoritmo firma:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Registrazione" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Voci del &Gestore siti" @@ -7027,70 +7563,75 @@ msgid "Site Manager" msgstr "Gestore siti" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "Gestore siti - non memorizzare le passwor&d" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Gestore siti - Chiave generata" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "Gestore siti - dati non validi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Gestore siti già aperto" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Il sito non esiste." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Il percorso del sito deve iniziare con 0 o 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Percorso sito non valido." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" -msgstr "Segnalibri specifici per sito" +msgstr "Preferiti specifici per sito" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" "Add current connection to the site manager?" msgstr "" -"Segnalibri specifici per sito richiedono che il server sia memorizzato nel " -"Gestore siti.\n" +"Preferiti per sito richiedono che il server sia memorizzato nel Gestore " +"siti.\n" "Aggiungere la connessione corrente al gestore siti?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "Dimensione" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Formato Dimensione" @@ -7098,57 +7639,62 @@ msgid "Size unknown" msgstr "Dimensione sconosciuta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Ignora file" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Salta il download di %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Salta file chiave non esistente \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Salta l'invio di %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Indirizzo socket al di fuori dello spazio indirizzi" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Socket già connesso" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Il socket è stato spento" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Socket non connesso" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Tipo socket non supportato per famiglia indirizzi" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Sono in corso modifiche ad alcuni file remoti oppure dei file hanno bisogno " "di essere inviati al server." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7156,33 +7702,33 @@ "Alcuni server remoti mal configurati, connessi a internet tramite un router " "potrebbero rispondere con il loro indirizzo IP locale." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Ordina le cartelle" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "" "L'ordine di visualizzazione non può essere modificato se si stanno " "comparando le cartelle." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Ordinamento" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "&Modalità di ordinamento:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Sorgente e percorso dell'operazione trascina e rilascia coincidono" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Sorgente e destinazione non possono essere lo stesso" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "Sorgente e destinazione dell'operazione trascina e rilascia coincidono" @@ -7190,37 +7736,37 @@ msgid "Source file:" msgstr "File sorgente:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Limiti di velocità" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Limiti di velocità" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "Limiti di velocità disabilitati, fai clic per modficarli." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "Limiti di velocità abilitati, fai clic per modficarli." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Versioni stabili e beta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Solo versioni stabili" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" -msgstr "Versioni stabili, beta e build notturne." +msgstr "Versioni stabili, beta e build notturne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Avvia &immediatamente il trasferimento" @@ -7228,19 +7774,21 @@ msgid "Start with opened Site Manager" msgstr "Avvia aprendo Gestore siti" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Controllo aggiornamenti su %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Avvio download di %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Avvio upload di %s" @@ -7249,30 +7797,38 @@ msgid "Starts the local site in the given path" msgstr "Avvia il sito locale nel percorso indicato" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Provincia:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "Stato" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Stato:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Ferm&a e rimuovi tutto" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Ferma operazioni ricorsive" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Storage cloud decentralizzato" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Supporto storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Via:" @@ -7282,17 +7838,17 @@ #: ../../locales/../src/interface/queueview_successful.cpp:12 msgid "Successful transfers" -msgstr "Trasferimenti riusciti" +msgstr "Trasferimenti completati" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" msgstr "Riepilogo dei risultati del test:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "Suspend now" msgstr "Sospendi ora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7300,29 +7856,33 @@ "I collegamenti simbolici non sono affetti dalla selezione, così i " "collegamenti simbolici saranno eliminati." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Navigazione sincronizzata" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "La navigazione sincronizzata è stata disabilitata." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Sincronizzazione cartelle." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Errore di sintassi" @@ -7331,44 +7891,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Errore di sintassi nella linea di comando" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Sistema" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Dettagli sistema" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Raggiunto limite di sistema apertura file" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Il sottosistema di rete ha fallito" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "&Barra strumenti" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "Connessione TSL stabilita. Invio richiesta HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "Connessione TLS stabilita. In attesa del messaggio di benvenuto..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "Connessione TLS stabilita." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL scaduto" @@ -7376,36 +7936,44 @@ msgid "Target file already exists" msgstr "Il file destinazione esiste già" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "File destinazione:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "Il file destinazione esiste già!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "Il file destinazione esiste già, continuare?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Fallimento temporaneo nella risoluzione nomi" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Test completato correttamente" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Risultati del test" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Verifica del supporto al ripristino trasferimenti sul server" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Sono in corso modifiche ai seguenti &file remoti:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "" "Il Gestore siti non può essere usato a meno che il file venga sistemato." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7414,7 +7982,7 @@ "Il Gestore siti è aperto in un'altra istanza di FileZilla 3.\n" "Continuare? Le modifiche effettuate nel Gestore siti non saranno salvate." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7422,29 +7990,37 @@ "Il Gestore siti è aperto in un'altra istanza di FileZilla 3.\n" "Se non viene chiusa i dati non possono essere eliminati." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "L'indirizzo inserito è: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Il membro ai_familty non è supportato" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Il membro asock_type non è supportato" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Il preferito non può essere aggiunto." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." -msgstr "I segnalibri non possono essere azzerati." +msgstr "I preferiti possono essere azzerati." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Il certificato richiede che il server includa un stato OCSP nella sua " +"risposta, ma lo stato OCSP è mancante." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "La connessione è cifrata. Selezionare l'icona per i dettagli." @@ -7466,34 +8042,39 @@ "Il formato orario personalizzato non è valido o contiene specificatori " "formato non supportati." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "La connessione dati non può essere stabilita. %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Il programma predefinito per i file di testo non è disponibile." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Il programma predefinito per i file di testo è '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Il nome filtro inserito esiste già. Scegliere un nome differente." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Le password inserite non sono le stesse." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "L'estensione '%s' è già è presente nella lista" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7502,8 +8083,9 @@ "Il file %s esiste già.\n" "Inserisci un nuovo nome:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7514,7 +8096,7 @@ "Il programma associato (%s) non è stato trovato.\n" "Verifica l'associazione dei file." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7523,20 +8105,21 @@ "Il file '%s' contiene una chiave SSH1. Il protocollo SSH1 è stato " "abbandonato. Filezilla supporta solo chiavi SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" "Non è stato possibile caricare il file '%s' o non contiene una chiave " "privata." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Impossibile caricare il file '%s'." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7545,8 +8128,9 @@ "Non è stato possibile aprire il file '%s':\n" "Nessun programma è stato associato sul vostro sistema con questo file." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7555,8 +8139,8 @@ "Non è stato possibile aprire il file '%s':\n" "Il comando associato è fallito" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7568,7 +8152,7 @@ "comportare una perdita dati.\n" "Vuoi continuare?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7581,7 +8165,7 @@ msgid "The file selected as default editor does not exist." msgstr "Il programma selezionato come editor predefinito non esiste." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7595,11 +8179,11 @@ "utente e password saranno importati.\n" "Continuare con l'importazione?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "La colonna nome file non può essere nascosta o spostata." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "La colonna nome file non può essere nascosta." @@ -7613,19 +8197,19 @@ msgid "The following characters will be replaced: %s" msgstr "I seguenti caratteri saranno sostituiti: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Sono in corso modifiche ai seguenti file remoti:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "La soluzione FTP open source gratuita" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "La chiave di criptazione generata è:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." -msgstr "I segnalibri globali non possono essere salvati." +msgstr "I preferiti globali non possono essere salvati." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7639,17 +8223,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "La soglia di confronto deve essere tra 1 e 2000 MB" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "La cartella remota '%s' non può essere creata." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "La cartella locale '%s' non esiste." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7668,24 +8252,29 @@ "La porta minima disponibile deve essere minore o uguale alla massima " "disponibile." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "La password principale deve contenere almeno 8 caratteri." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "La nuova versione non può essere scaricata. Riprova più tardi." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "La nuova versione è stata salvata nella cartella dei download." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." msgstr "La coda non verrà salvata." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "La cartella remota '%s' non esiste." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7696,27 +8285,27 @@ "Disabilitare la navigazione sincronizzata e continuare le modifiche della " "cartella remota?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Le categorie selezionate sono state importate." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Il file selezionato contiene dati importabili per le seguenti categorie:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Si sta già modificando il file selezionato:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "Il file selezionato è in uso da un'altra applicazione." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7726,15 +8315,15 @@ "Questa operazione può essere pericolosa e danneggiare il sistema.\n" "Confermi di voler continuare?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Il server non può essere aggiunto." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Il server ha inviato una risposta inaspettata o sconosciuta." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Il server utilizza la seguente codifica per i nomi di file:" @@ -7746,7 +8335,7 @@ "Il certificato del server è sconosciuto. Esaminare attentamente il " "certificato per assicurarsi che il server sia affidabile." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7756,7 +8345,7 @@ "Questo può verificarsi se la chiave è stata modificata dall'amministratore o " "se si è collegati a un computer che finge di essere il server." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7764,11 +8353,15 @@ "La chiave host del server è sconosciuta. Non è possibile garantire che tale " "server sia davvero quello che vi aspettate." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Il nome host server non corrisponde al nome host del certificato" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "Il parametro nome server non è supportato da a_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7776,19 +8369,19 @@ "Le impostazioni sono state importate. FileZilla deve essere riavviato per " "rendere effettive le nuove impostazioni." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "La famiglia di indirizzi specificata non è supportata" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Il nome rete specificato non è più disponibile" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." msgstr "Il sistema sarà riavviato a meno che non fate clic su [Annulla]." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "Il sistema si chiuderà a meno che non fate clic su [Annulla]." @@ -7800,11 +8393,11 @@ "Il file destinazione esiste già.\n" "Scegliere un'azione." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Il test ha avuto esito negativo. Salvare comunque le impostazioni?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Il file %s (backup valido) non può essere ripristinato" @@ -7813,15 +8406,15 @@ msgid "Themes" msgstr "Temi" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Questo gruppo di filtri non può essere eliminato." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Questo gruppo di filtri non può essere rinominato." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7846,45 +8439,43 @@ "Questa procedura guidata vi aiuterà a configurare correttamente router e " "firewall e a testare le nuove impostazioni di connessione." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "Ora" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Formato ora" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Timeout in sec&ondi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Timeout" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "L'offset fuso orario server è di %d secondi." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Titolo:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Per comparare le cartelle, la ricerca rapida deve essere chiusa." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Per comparare le cartelle, entrambi gli elenchi file devono essere allineati." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" -"per fare ciò, gli alberi delle cartelle devono essere entrambi vibili o " +"Per fare ciò, gli alberi delle cartelle devono essere entrambi vibili o " "nascosti." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7892,7 +8483,7 @@ "Per il supporto dell'autenticazione con chiave pubblica, FileZilla deve " "conoscere le chiavi private da usare." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7909,7 +8500,7 @@ "Verde: il file è più recente del file non selezionato nell'altro lato\n" "Rosso: dimensione file differente" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7919,83 +8510,78 @@ "Se abilitata, la navigazione nella gerarchia della cartella locale " "modificherà in accordo la cartella nel server e viceversa." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Attiva o disattiva l'elaborazione della coda di trasferimento" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "" "Attiva o disattiva la visualizzazione dell'albero delle cartelle locali" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Visualizza o nasconde la finestra del registro messaggi" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Visualizza o nasconde l'albero delle cartelle remote" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Visualizza o nasconde la finestra della coda di trasferimento" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Too long header line" msgstr "Riga di intestazione troppo lunga" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Troppi re-indirizzamenti" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Trace:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Trasferisci" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "&Direzione trasferimento" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "Modalità di &trasferimento" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Modalità di trasferimento" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Coda di trasferimento" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Impostazioni di trasferimento" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Connessione interrotta: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "I dati trasferiti sono stati alterati." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Trasferimento in corso" @@ -8003,28 +8589,27 @@ msgid "Transfers" msgstr "Trasferimenti" -#: ../../locales/../src/interface/QueueView.cpp:2944 -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "Trasferimenti completati" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "&I file senza estensione saranno interpretati come file ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "I seguenti tipi di &file saranno interpretati come file ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "Conferma chiave host modificata:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "Conferma nuova chiave host:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "" "Considerare come attendibile la nuova chiave e procedere con la connessione?" @@ -8035,71 +8620,76 @@ "Considerare come attendibile questo certificato e procedere con la " "connessione?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "" "Considerare come attendibile questo computer e procedere con la connessione?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Riprova" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Tipo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Tipo proxy FTP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Tipo di proxy generico:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "&Invia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Limite di &upload:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" -msgstr "" -"U&sa il programma associato dal sistema al tipo di file (se disponibile)" +msgstr "U&sa associazione tipi file se disponibile" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "U&sa valori predefiniti sistema per la lingua attuale" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Codice errore non assegnato %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Unità:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Sconosciuto" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Tipo proxy FTP sconosciuto, impossibile generare sequenza login." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versione protocollo SOCK sconosciuta: %d" @@ -8108,11 +8698,22 @@ msgid "Unknown certificate" msgstr "Certificato sconosciuto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Errore sconosciuto %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Errore sconosciuto %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Chiave host sconosciuta" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8120,13 +8721,17 @@ msgstr "" "Versione sconosciuta protocollo della negoziazione utente/password SOCKS: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "Elemento root sconosciuto, il file non sembra generato da FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:572 +msgid "Unknown transfer encoding" +msgstr "Codifica trasferimento sconosciuta" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8134,7 +8739,7 @@ "Finché non saranno risolti questi problemi, la modalità FTP attiva non " "funzionerà e dovrà essere utilizzata la modalità passiva." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8142,15 +8747,15 @@ "Finché non sarà risolto questo problema, la modalità FTP attiva non " "funzionerà e dovrà essere utilizzata la modalità passiva." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Tipo certificato non supportato" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Redirezione non supportata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Invia e annulla le modifi&che" @@ -8159,96 +8764,105 @@ msgid "Updates" msgstr "Aggiornamenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Invia" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Invio non riuscito" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "Limite di upload: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Limite di upload: nessuno" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Carica risultati ricerca" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Invia le cartelle selezionate" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Invia file e cartelle selezionate" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Inviare il file modificato al server?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Inviare questo file al server?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Invio in corso" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Invio in corso e in attesa di rimozione" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Invia e annulla le modifiche" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Utilizza un set di &caratteri personalizzato" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Usa &programma personalizzato:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Usa programma pre&definito per i file di testo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Usa navigazione &sincronizzata" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Usa un'espressione regolare" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Usa UTF-8 se il server lo supporta, altrimenti usa il set di caratteri " "locale." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Usa azione predefinita" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "Usa se disponibile FTP esplicito su TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Usa il server attualmente connesso" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Usa server dal Gestore siti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "Usa valori pre&definiti sistema per la lingua attuale" @@ -8265,7 +8879,7 @@ msgstr "Usa l'indirizzo IP esterno del server" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8283,16 +8897,17 @@ "sarà richiesta una connessione in modalità attiva. L'unica informazione che " "viene trasmessa è la versione di FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Utente:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "Il nome utente non può essere una serie di spazi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8311,51 +8926,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "Messaggi dettagliati log di wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Verifica del certificato in corso..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Molto alto" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "L'opzione 'visualizza file nascosti' non è supportata dal server" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Visualizza/modifica" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Colonne visibili" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "S&crittura" -#: ../../locales/../src/interface/QueueView.cpp:1671 -msgid "Waiting" -msgstr "In attesa" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "In attesa di connessione" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "In attesa della password" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "In attesa che il trasferimento venga annullato" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "In attesa di un nuovo tentativo..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Avvertimento, connessione dati da IP sbagliato ignorata." @@ -8374,23 +8985,23 @@ "\n" "Includere le nightly build?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Attenzione: Potenziale falla di sicurezza!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" -msgstr "benvenuti in FileZilla" +msgstr "Benvenuto in FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Novità" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Novità:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8398,7 +9009,7 @@ "Filezilla può memorizzare le password in modo da potersi riconenttersi senza " "dove reinserire la password dopo aver riavviato Filezilla." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8407,36 +9018,54 @@ "operativo locale per i nomi file saranno sostituiti se lo scaricherete come " "file." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "Qu&ando avvi una nuova connessione mentre sei già connesso:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Widescreen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Filezilla deve memorizzare la password?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Scr&ittura" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Indirizzo IP esterno non valido" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:644 msgid "Wrong line endings" msgstr "Terminazioni di riga non corrette" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Password principale errata. Non può essere usata per decriptare le password " +"memorizzate." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Password principale errata. Non può essere usata per decriptare questo " +"elemento." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Giallo" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Sì" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8444,26 +9073,26 @@ "Sembra che tu stia usando un host solo IPv6. Questa procedura guidata non " "supporta questa configurazione." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." -msgstr "La versione di FileZilla è aggiornata." +msgstr "La versione di FileZilla installata è aggiornata." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "" "E' possibile aprire questa finestra di dialogo dal menu della Guida in linea." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Puoi scaricare la versione più recente di FileZilla dal sito web:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" "Potete lasciare vuoto il valore della porta per usare la porta predefinita." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8471,7 +9100,15 @@ "È possibile inserire una x in qualsiasi posizione per mantenere " "l'autorizzazione originale del file." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Se usi una password principale non puoi modificare individualmente la " +"password e la chiave di criptazione." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Impossibile importare le impostazioni dalla cartella di FileZilla." @@ -8483,22 +9120,27 @@ "Non è possibile sostituire un carattere non valido con un altro carattere " "non valido. Inserisci un carattere valido per il nome file." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Non puoi caricare i file nella cartella root." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Non è stato inserito un nuovo nome per il file. Sovrascrivere il file?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "È necessario selezionare almeno un collegamento simbolico." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "Sono stati selezionati più di 10 file per le modifiche; continuare?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8506,46 +9148,58 @@ "Sono stati selezionati selezionati più di 10 file o cartelle da aprire; " "continuare?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." msgstr "Inserisci un nome host." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" msgstr "Devi inserire il percorso del file chiave" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Inserisci il nome di una cartella locale." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Devi indicare una cartella remota." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Devi inserire un indirizzo IP v4 valido." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Devi inserire una chiave di criptazione valida" + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Inserisci il nome di una cartella locale scrivibile." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "Inserisci un nome account" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "Specificare un nome utente" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "" "Probabilmente avete un router o firewall che ha modificato i dati trasferiti." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Devi inserire la password principale." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Inserisci il nome per il preferito." @@ -8553,7 +9207,7 @@ msgid "You need to enter a name for the log file." msgstr "Inserisci un nome per il nuovo file del log." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Inserisci un appropriato comando quotato." @@ -8566,17 +9220,17 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Inserisci un valore nell'intervallo 1-65535 per la porta proxy" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" -"È necessario inserire almeno un percorso, i segnalibri vuoti non sono " +"È necessario inserire almeno un percorso, i preferiti vuoti non sono " "supportati." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8584,7 +9238,7 @@ "Inserisci sia il percorso locale che quello remoto per abilitare la " "navigazione sincronizzata per questo preferito." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8592,23 +9246,31 @@ "È necessario inserire sia il percorso locale che quello remoto per abilitare " "la navigazione sincronizzata per questo sito." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"È necessario autorizzare Filezilla all'accesso alle cartelle che vuoi usare " +"per il downlaod/upload." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "È necessario specificare un file locale." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "È necessario specificare un file remoto." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "È necessario specificare un percorso remoto." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "È necessario specificare il nome di un server." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8616,66 +9278,66 @@ "Non si dovrebbero avere problemi di connessione ad altri server, i " "trasferimenti dei file dovrebbero funzionare correttamente." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2775 msgid "Your computer will suspend unless you click Cancel." msgstr "Il sistema sarà messo in sospensone a meno fai clic su [Annulla]." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "dopo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "prima" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "inizia con" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "byte" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "contiene" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "personalizzato" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "non contiene" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "non è uguale" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "termina con" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "uguale a" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "file" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8685,94 +9347,314 @@ "Assicurarsi che l'eseguibile di fzputtyget sia presente nella stessa " "cartella dell'eseguibile di FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp appartiene ad una differente versione di FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "non è stato possibile avviare fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj fa riferimento ad una versione differente di Filezilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj non può essere avviato" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj non può essere avviato.\n" +"Assicurati che l'eseguibile di fzstorj sia presente nella stessa cartella " +"dell'eseguibile principale di Filezilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers ha ritornato nessun certificato" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "Fallita gnutls_pem_base64_encode2" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "maggiore di" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "eseguibile per il gruppo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "leggibile per il gruppo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "scrivibile per il gruppo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "è uguale a" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "è impostato" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "non è impostato" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "minore di" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "corrisponde all'espressione regolare" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "nuovo nome" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "eseguibile per il proprietario" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "leggibile per il proprietario" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "scrivibile per il proprietario" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "sconosciuto" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "eseguibile per gli altri" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "leggibile per gli altri" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "scrivibile per gli altri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "" +#~ "Malformed response: Server sent response body with a request verb or " +#~ "response code that disallows a response body." +#~ msgstr "" +#~ "Risposta malformata: il server ha inviato un corpo della risposta con un " +#~ "verbo di richiesta o un codice di risposta che impedisce un corpo della " +#~ "risposta." + +#~ msgid "" +#~ "%s could not be found. Without this component of FileZilla, SFTP will not " +#~ "work.\n" +#~ "\n" +#~ "Please download FileZilla again. If this problem persists, please submit " +#~ "a bug report." +#~ msgstr "" +#~ "Impossibile trovare '%s'. Senza questo componente di FileZilla. SFTP non " +#~ "funziona.\n" +#~ "\n" +#~ "Riscaricate FileZilla. Se il problema persiste, inviate una segnalazione " +#~ "per questo errore." + +#~ msgid "" +#~ "%s could not be found. Without this component of FileZilla, SFTP will not " +#~ "work.\n" +#~ "\n" +#~ "Possible solutions:\n" +#~ "- Make sure %s is in a directory listed in your PATH environment " +#~ "variable.\n" +#~ "- Set the full path to %s in the FZ_FZSFTP environment variable." +#~ msgstr "" +#~ "Non è stato possibile trovare %s. Senza questo componente di FileZilla, " +#~ "SFTP non funzionerà.\n" +#~ "\n" +#~ "Possibili soluzioni:\n" +#~ "- Assicurarsi che %s sia in una cartella elencata nella variabile di " +#~ "ambiente PATH.\n" +#~ "- Impostare il percorso completo di %s nella variabile di ambiente " +#~ "FZ_FZSFTP." + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "Non memorizzare le passwor&d (raccomandato)" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "Failed to retrieve external ip address, aborting." +#~ msgstr "Impossibile ottenere indirizzo IP esterno, annullamento." + +#~ msgid "Failed to retrieve external ip address, using local address" +#~ msgstr "" +#~ "Non è stato possibile recuperare l'indirizzo IP esterno, sarà utilizzato " +#~ "l'indirizzo locale" + +#~ msgid "Failed to retrieve local ip address, aborting." +#~ msgstr "Impossibile ottenere indirizzo IP locale, annullamento." + +#~ msgid "Failed to retrieve local ip address." +#~ msgstr "Non è stato possibile leggere l'indirizzo IP locale." + +#~ msgid "Malformed header: %s" +#~ msgstr "Intestazione non corretta: %s" + +#~ msgid "Malformed reply, server not sending proper line endings" +#~ msgstr "" +#~ "Risposta non corretta, il server non sta inviando terminazioni di riga " +#~ "corrette" + +#~ msgid "Malformed response: Server sent too much data." +#~ msgstr "" +#~ "Risposta formattata non correttamente. Il server ha inviato troppi dati." + +#~ msgid "Set permissions of '%s' to '%s'" +#~ msgstr "Imposta permessi di '%s' a '%s'" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "L'offset fuso orario server è di %d secondi." + +#~ msgid "Failed to create listen socket, aborting" +#~ msgstr "" +#~ "Non è stato possibile creare il socket di ascolto, connessione terminata" + +#~ msgid "Failed to retrieve external ip address, aborting" +#~ msgstr "" +#~ "Non è stato possibile recuperare l'indirizzo IP esterno, connessione " +#~ "terminata" + +#~ msgid "Failed to retrieve local ip address. Aborting" +#~ msgstr "" +#~ "Non è stato possibile leggere l'indirizzo IP locale. Connessione terminata" + +#~ msgid "Fingerprint:" +#~ msgstr "Impronta:" + +#~ msgid "Host key fingerprint:" +#~ msgstr "Chiave impronta:" + +#~ msgid "Login sequence fully executed yet not logged in. Aborting." +#~ msgstr "" +#~ "Sequenza di login eseguita completamente ma impossibile connetersi. " +#~ "Interruzione." + +#~ msgid "" +#~ "Enter the address of the server. To specify the server protocol, prepend " +#~ "the host with the protocol identifier.If no protocol is specified, the " +#~ "default protocol(ftp://) will be used. You can also enter complete URLs " +#~ "in the form protocol://user:pass@host:port here, the values in the other " +#~ "fields will be overwritten then.\n" +#~ "\n" +#~ "Supported protocols are:\n" +#~ "- ftp:// for normal FTP with optional encryption\n" +#~ "- sftp:// for SSH file transfer protocol\n" +#~ "- ftps:// for FTP over TLS (implicit)\n" +#~ "- ftpes:// for FTP over TLS (explicit)" +#~ msgstr "" +#~ "Inserisci l'indirizzo del server.\n" +#~ "Per specificare il protocollo del server, anteponi all'host " +#~ "l'identificatore del protocollo. Se nessun protocollo è specificato, sarà " +#~ "utilizzato il protocollo predefinito (ftp://).\n" +#~ "È possibile inserire qui la URL completa nella forma protocollo://utente:" +#~ "password@host:porta. I valori negli altri campi saranno sovrascritti.\n" +#~ "\n" +#~ "I protocolli supportati sono:\n" +#~ "- ftp:// per FTP normale con criptazione opzionale\n" +#~ "- sftp:// per protocollo trasferimento file SSH\n" +#~ "- ftps:// per FTP su TLS (implicito)\n" +#~ "- ftpes:// per FTP su TLS (esplicito)" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "" +#~ "Non è possibile caricare la barra Connessione rapida dal file risorse" + +#~ msgid "Available sizes" +#~ msgstr "Dimensioni disponibili" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "Chiamata SetSocketBufferSize senza socket" + +#~ msgid "Filename &filters..." +#~ msgstr "&Filtri nome file..." + +#~ msgid "Could not add trust" +#~ msgstr "Impossibile aggiungere autorizzazione" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Impossibile importare certificato di connessione, gnutls_x509_crt_import " +#~ "fallito" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Impossibile inizalizzare struttura certificato connessione, " +#~ "gnutls_x509_crt_init fallito" + +#~ msgid "Package" +#~ msgstr "Pacchetto" + +#~ msgid "Updated" +#~ msgstr "Aggiornato" + +#~ msgid "%d files added to queue" +#~ msgstr "%d file aggiunti alla coda" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Cerca file da aggiungere alla coda" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Ricerca dei file da inviare in corso" + +#~ msgid "Waiting" +#~ msgstr "In attesa" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Disconnetti dal server" + +#~ msgid "&Show message" +#~ msgstr "&Visualizza messaggio" + +#~ msgid "Do ¬hing" +#~ msgstr "&Non fare niente" + +#~ msgid "Empty dirs to visit" +#~ msgstr "Cartella vuota da visitare" + +#~ msgid "No more files in the queue!" +#~ msgstr "Nessun file nella coda!" + #~ msgid "Connected" #~ msgstr "Connesso" @@ -8839,9 +9721,6 @@ #~ msgid "Could not write keyfile: %s" #~ msgstr "Impossibile scrivere il file chiave: %s" -#~ msgid "Error" -#~ msgstr "Errore" - #~ msgid "Select filename for converted keyfile" #~ msgstr "Selezionare il nome file per il file chiave convertito" @@ -8874,9 +9753,6 @@ #~ msgid " could not be started" #~ msgstr "non può essere avviato" -#~ msgid "Could not get reply from " -#~ msgstr "Impossibile ottenere risposta da " - #~ msgid "Could not send command to " #~ msgstr "Impossibile inviare comando a " @@ -9082,9 +9958,6 @@ #~ msgid "Log of update check:" #~ msgstr "Registro del controllo aggiornamenti:" -#~ msgid "Package" -#~ msgstr "Pacchetto" - #~ msgid "" #~ "Please check https://filezilla-project.org/ for the most recent version " #~ "of FileZilla." diff -Nru filezilla-3.15.0.2/locales/ja_JP.po filezilla-3.33.0/locales/ja_JP.po --- filezilla-3.15.0.2/locales/ja_JP.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/ja_JP.po 2018-04-02 18:37:17.000000000 +0000 @@ -1,510 +1,525 @@ -# Japanese translation for FileZilla client. -# Copyright (C) 2004-2010 Tim Kosse -# This file is distributed under the same license as the FileZilla client package. +# Japanese translation for FileZilla Client. +# Copyright (C) 2004-2018 Tim Kosse +# This file is distributed under the same license as the FileZilla Client package. # Toshiyuki Tega , # Kazunari INOUE , 2009. # Tadashi Jokagi , 2010. # Yuki Shira , 2011-2012. -# +# Rukoto Luther , 2017-2018. +# msgid "" msgstr "" -"Project-Id-Version: FileZilla trunk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-30 12:00+0200\n" -"PO-Revision-Date: 2015-07-11 18:20+0900\n" -"Last-Translator: Yuki Shira \n" -"Language-Team: Yuki Shira \n" +"Project-Id-Version: FileZilla 3.32.0\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-02 20:30+0200\n" +"PO-Revision-Date: 2018-03-24 02:36+0900\n" +"Last-Translator: Rukoto Luther \n" +"Language-Team: Japanese\n" "Language: ja_JP\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Japanese\n" -"X-Poedit-Country: JAPAN\n" -"X-Poedit-Bookmarks: 466,471,-1,-1,-1,-1,-1,-1,-1,-1\n" -"X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S 経過" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "残り %H:%M:%S" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" msgstr "%a - アカウント (ログオン種類がアカウントではない場合は省略されます)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d 個のディレクトリ" -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/search.cpp:478 -#: ../../locales/../src/interface/search.cpp:764 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d 個の空ではないディレクトリ" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1389 -#: ../../locales/../src/interface/search.cpp:477 -#: ../../locales/../src/interface/search.cpp:763 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d 個のファイル" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" -msgstr[0] "%d 個のファイル. 合計サイズ: %s" +msgstr[0] "%d 個のファイル。合計サイズ: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" -msgstr[0] "%d 個のファイル. 合計サイズ: %s 以上" - -#: ../../locales/../src/interface/QueueView.cpp:2784 -#, c-format -msgid "%d files added to queue" -msgstr "%d 個のファイルをキューに追加しました" +msgstr[0] "%d 個のファイル。合計サイズ: %s 以上" -#: ../../locales/../src/engine/ControlSocket.cpp:103 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - ホスト" -#: ../../locales/../src/interface/recursive_operation_status.cpp:88 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu 個のディレクトリ" -#: ../../locales/../src/interface/recursive_operation_status.cpp:87 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu 個のファイル" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - パスワード" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s バイト/秒)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? バイト/秒)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - 証明書は失効しています!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - まだ有効ではありません!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" -msgstr "%s - プロキシ ユーザ" +msgstr "%s - プロキシ ユーザー" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" -msgstr "%s と %s. 合計サイズ: %s" +msgstr "%s と %s。 合計サイズ: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" -msgstr "%s と %s. 合計サイズ: 少なくとも %s" +msgstr "%s と %s。 合計サイズ: 少なくとも %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s バイト" -#: ../../locales/../src/interface/FileZilla.cpp:595 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s が見つかりませんでした. FileZilla のこのコンポーネントなしに SFTP は動作し" -"ません.\n" +"%s が見つかりませんでした。FileZilla のこのコンポーネントなしに %s は動作しま" +"せん。\n" "\n" -"FileZilla を再度ダウンロードしてください. 問題が続く場合はバグ報告を提出して" -"ください." +"FileZilla を再度ダウンロードしてください。問題が続く場合はバグ報告を提出して" +"ください。" -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s が見つかりませんでした. FileZilla のこのコンポーネントなしに SFTP は動作し" -"ません.\n" +"%s が見つかりませんでした。FileZilla のこのコンポーネントなしに %s は動作しま" +"せん。\n" "\n" "解決法の候補:\n" -"- %s が環境変数 PATH に含まれるディレクトリにあるか確認する.\n" -"- 環境変数 FZ_FZSFTP に %s へのフルパスを設定する." +"- %s が環境変数 PATH に含まれるディレクトリにあるか確認する。\n" +"- 環境変数 %s に %s へのフルパスを設定する。" -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s - %d ビット" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - ホスト名が証明書と一致しません" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" -msgstr "%u - ユーザ名" +msgstr "%u - ユーザー名" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" -msgstr "%w - プロキシのパスワード" +msgstr "%w - プロキシ パスワード" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3480 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" -msgstr "以前の接続を中止して現在のタブで接続(&A)" +msgstr "前の接続を中止して現在のタブで接続(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "FileZilla のバージョン情報(&A)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2477 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "アカウント(&A):" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "アクティブ(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." -msgstr "ブックマークを追加(&A)..." +msgstr "ブックマークの追加(&A)..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "ディレクトリの追加(&A)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" -msgstr "ファイルをキューに追加(&A)" +msgstr "キューにファイルを追加(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." -msgstr "鍵ファイルを追加(&A)..." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 +msgid "&Add key file..." +msgstr "鍵ファイルの追加(&A)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "キューに追加(&A)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:335 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" -msgstr "サーバのタイムゾーン オフセットの調整(&A):" +msgstr "サーバーのタイムゾーン オフセットの調整(&A):" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "今後もこの証明書を常に信用する(&A)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" -msgstr "常にこのホストを信用し, この鍵をキャッシュに追加(&A)" +msgstr "常にこのホストを信用し、この鍵をキャッシュに追加(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" -msgstr "常に既定のエディタを使用(&A)" +msgstr "常にデフォルトのエディターを使用(&A)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2947 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "関連付けされていないファイルには常にこの選択を使用(&A)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "常にこの動作を利用(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "オペレーティング システムに外部 IP アドレスを尋ねる(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "自動(&A)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:468 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "自動検出(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "背景色(&B):" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "バイナリ(&B)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" -msgstr "SI 接頭辞(2進数) (例: 1 K&B = 1024 バイト)" +msgstr "SI 接頭辞 (2進数) (例: 1 KB = 1024 バイト)(&B)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "ブックマーク(&B)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2739 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2934 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3119 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:295 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "参照(&B)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "バースト耐性(&B):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "キャンセル(&C)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." -msgstr "個人情報をクリア(&C)..." +msgstr "個人データのクリア(&C)..." #: ../../locales/../src/interface/resources/xrc/update.xrc:28 msgid "&Close" msgstr "閉じる(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "FileZilla を閉じる(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "一度だけ FileZilla を閉じる(&C)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "速度制限の設定(&C)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "設定(&C)..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:547 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "接続(&C)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:12 msgid "&Copy current connection to Site Manager..." -msgstr "現在の接続をサイト マネージャにコピー(&C)..." +msgstr "現在の接続をサイト マネージャーにコピー(&C)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "クリップボードにコピー(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" -msgstr "ディレクトリを作成(&C)" +msgstr "ディレクトリの作成(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" -msgstr "新規タブを作成(&C)" +msgstr "新規タブの作成(&C)" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "デバッグ(&D)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "メッセージ ログのデバッグ情報(&D):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" -msgstr "既定のエディタ(&D):" +msgstr "デフォルトのエディター(&D):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." -msgstr "ファイル存在時の既定の動作(&D)..." +msgstr "ファイル存在時のデフォルトの動作(&D)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "ログイン失敗時の待ち時間(&D):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2819 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "削除(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" -msgstr "シンボリックリンクを削除(&D)" +msgstr "シンボリックリンクの削除(&D)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "ディレクトリのパーミッション(&D)..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" -msgstr "ディレクトリを比較(&D)" +msgstr "ディレクトリの比較(&D)" + +#: ../../locales/../src/interface/state.cpp:1030 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "同期ブラウジングを無効にしてローカル ディレクトリの移動を継続(&D)" + +#: ../../locales/../src/interface/state.cpp:1108 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "同期ブラウジングを無効にしてリモート ディレクトリの移動を継続(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "ローカル ファイルを破棄してから新たにファイルをダウンロード/編集(&D)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "切断(&D)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "サーバから切断(&D)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "平均速度の代わりに瞬間的な転送速度を表示(&D)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "サイズをバイトで表示(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 -msgid "&Do not remember passwords (recommended)" -msgstr "パスワードを保存しない(&D)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "このダイアログを今後表示しない(&D)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "ローカル接続に外部 IP アドレスを使用しません(&D)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "ファイルをダブルクリックしたときの動作(&D):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "ダウンロード(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3105 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "ダウンロード先(&D):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "ダウンロード(&D)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "ダウンロード(&D):" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "編集(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." -msgstr "フィルタ ルールを編集(&E)..." +msgstr "フィルター ルールの編集(&E)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "有効にする(&E)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "圧縮を有効にする(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3538 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "速度制限を有効にする(&E)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:493 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" -msgstr "エンコーディング(&E):" +msgstr "文字コード(&E):" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 msgid "&Encryption:" msgstr "暗号化(&E)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." -msgstr "カスタム コマンドを入力(&E)..." +msgstr "カスタム コマンドの入力(&E)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3473 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "新規タブで接続を確立(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "実行(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" -msgstr "サイト マネージャのエントリをエクスポート(&E)" +msgstr "サイト マネージャー エントリのエクスポート(&E)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "エクスポート(&E)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "アクティブ モードに戻る(&F)" @@ -512,35 +527,47 @@ msgid "&File" msgstr "ファイル(&F)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." -msgstr "ファイルの属性(&F)..." +msgstr "ファイル属性(&F)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "ファイルのパーミッション(&F)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "ファイル(&F):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" -msgstr "フィルタの条件(&F):" +msgstr "フィルターの条件(&F):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" -msgstr "フィルタ セット(&F):" +msgstr "フィルターセット(&F):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "フィルター(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" -msgstr "フィルタ(&F):" +msgstr "フィルター(&F):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "編集を終了してローカル ファイルを削除(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3141 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"ローカル パスをフラットにして、含まれるすべてのファイルを対象ディレクトリへ直" +"接ダウンロード(&F)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -548,54 +575,54 @@ "リモート パスをフラットにして、含まれるすべてのファイルを対象ディレクトリへ直" "接ダウンロード(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "シンボリックリンクを追跡して、対象ディレクトリの内容を削除(&F)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "以下の URL から外部 IP アドレスを取得(&G):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." -msgstr "ヘルプを取得(英語)(&G)..." +msgstr "ヘルプの利用 (英語)(&G)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2590 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "グローバル ブックマーク(&G)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" -msgstr "CONNECT メソッドを使用して &HTTP/1.1" +msgstr "CONNECT メソッドを使用する &HTTP/1.1" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "ヘルプ(&H)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" -msgstr "同一のファイルを隠す(&H)" +msgstr "同一ファイルの非表示(&H)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "最高(&H)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" -msgstr "利用できるポートの最大値(&H):" +msgstr "利用可能なポートの最大値(&H):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2385 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "ホスト(&H):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC 2進接頭辞 (例: 1 KiB = 1024 バイト)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (例: 2007-09-15)" @@ -603,84 +630,96 @@ msgid "&Import..." msgstr "インポート(&I)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "システムのファイルの種類の関連付けを継承(&I)" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "新しいバージョンをインストール(&I)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "ローカル パス構造を検索ルートに対して相対的に保つ(&K)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "リモート パス構造を検索ルートに対して相対的に保つ(&K)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 +msgid "&Key file:" +msgstr "鍵ファイル(&K):" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" -msgstr "ファイルとディレクトリ枠のレイアウト(&L):" +msgstr "ファイルとディレクトリ ウィンドウのレイアウト(&L):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "FileZilla が使用するローカル ポートを制限(&L)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "同時接続の数を制限(&L)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "ローカル ディレクトリ ツリー(&L)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2727 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "ローカル ディレクトリ(&L):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "ローカル ファイル検索(&L)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "ファイルにログを記録(&L)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "ログオンの種類(&L):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "ログオンの種類(&L):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "低(&L)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." -msgstr "ブックマークを管理(&M)..." +msgstr "ブックマークの管理(&M)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "手動転送(&M)..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:432 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "最大接続数(&M):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "最大再試行回数(&M):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "メッセージ ログ(&M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "トレイに最小化(&M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" -msgstr "ソートのモード(&N):" +msgstr "並べ替えモード(&N):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "名前(&N):" @@ -688,7 +727,7 @@ msgid "&Network configuration wizard..." msgstr "ネットワーク設定ウィザード(&N)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "新規(&N)" @@ -696,202 +735,213 @@ msgid "&New Site" msgstr "新しいサイト(&N)" -#: ../../locales/../src/interface/Mainfrm.cpp:1708 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "新バージョンを利用できます!(&N)" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "次へ(&N) >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "いいえ(&N)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "なし(&N)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "通常(&N)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" -msgstr "数値(&N):" +msgstr "属性値(&N):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2868 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&OPEN" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "開く(&O)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "上書き(&O)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:413 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "パッシブ(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "パスワード(&P):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "音を鳴らす(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2398 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "ポート(&P):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "転送したファイルのタイムスタンプを維持(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "キュー(&Q)" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "クイック接続(&Q)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "クイック接続バー(&Q)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "クイック接続の履歴(&Q)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" -msgstr "読み込む(&R)" +msgstr "読み取り(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "再接続(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "再接続の情報(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "更新(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "FileZilla が終了するまでマスター パスワードを記憶(&R)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "FileZilla が終了するまでパスワードを記憶(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3643 -msgid "&Remember passwords" -msgstr "パスワードを入力(&R)" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2671 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "リモート ディレクトリ(&R):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "リモート パス(&R):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "リモート ファイル検索(&R)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "削除(&R)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "鍵を削除(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" -msgstr "選択されたものを削除(&R)" +msgstr "選択したアイテムを削除(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2813 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "名前の変更(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "名前の変更(&R)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "ローカル ファイルを再び開く(&R)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "正しくない文字を置換(&R):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." -msgstr "バグを報告(英語)(&R)..." +msgstr "バグを報告 (英語)(&R)..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "ユーザーに注意を促す(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "すべてリセットして再びキューに入れる(&R)" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" -msgstr "ウィザードを再起動(&F)" +msgstr "ウィザードを再起動(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "再開(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "コマンドを実行(&R)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "今すぐ設定ウィザードを実行(&R)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "今すぐ更新チェックを実行(&R)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "名前を付けて保存(&S)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "検索(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "リモート ファイルを検索(&S)..." @@ -899,20 +949,20 @@ msgid "&Select Entry:" msgstr "エントリを選択(&S):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "言語の選択(&S):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2126 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "表示する列を選択(&S):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" -msgstr "サーバ(&S)" +msgstr "サーバー(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "設定(&S)" @@ -920,256 +970,271 @@ msgid "&Settings..." msgstr "設定(&S)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "デバッグ メニューを表示(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "ログの詳細を表示(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "メッセージを表示(&S)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "メッセージ ログのタイムスタンプを表示(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" -msgstr "サイト マネージャのエントリ(&S)" +msgstr "サイト マネージャー エントリ(&S)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." -msgstr "サイト マネージャ(&S)..." +msgstr "サイト マネージャー(&S)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "サイト別ブックマーク(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "スキップ(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "速度制限(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "今すぐ転送を開始(&S)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" -msgstr "ローカルとリモートのパネルを入れ替える(&S)" +msgstr "ローカルペインとリモートペインを入れ替える(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "暗号化方式(&T):" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" -msgstr "テスト(&R)" +msgstr "テスト(&T)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "テーマ(&T):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "転送(&T)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:389 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "転送モード(&T):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "転送キュー(&T)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "ドットファイルを ASCII ファイルとして扱う(&T)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "記載されている代替ホスト名でこの証明書を信頼する(&T)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "編集中を解除(&U)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "このホストのキャッシュされた鍵を更新(&U)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "アップロード(&U)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "アップロード先(&U):" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "アップロード(&U)..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "アップロード(&U):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "カスタム プログラムを使用(&U)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "同期ブラウジングを使用(&U)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" -msgstr "テキスト ファイルの編集にシステム既定のエディタを使用(&U)" +msgstr "テキスト ファイルの編集にシステムのデフォルトのエディターを使用(&U)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "以下の IP アドレスを使用(&U):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" -msgstr "代わりにサーバの外部 IP アドレスを使用(&U)" +msgstr "代わりにサーバーの外部 IP アドレスを使用(&U)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "桁区切りを使用(&U)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2452 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" -msgstr "ユーザ(&U):" +msgstr "ユーザー(&U):" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" -msgstr "ユーザ名(&U):" +msgstr "ユーザー名(&U):" -#: ../../locales/../src/interface/Mainfrm.cpp:1702 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "バージョン %s(&V)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "表示(&V)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "表示/編集(&V)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" -msgstr "ローカルで編集されたファイルを監視して変更のアップロードを促す(&W)" +msgstr "ローカルで編集したファイルを監視して変更のアップロードを促す(&W)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "更新チェック対象(&W):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" -msgstr "書き込む(&W)" +msgstr "書き込み(&W)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "はい(&Y)" -#: ../../locales/../src/engine/local_path.cpp:449 -#: ../../locales/../src/engine/local_path.cpp:495 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." -msgstr "'%s' は存在しないかアクセスできません." +msgstr "'%s' は存在しないかアクセスできません。" -#: ../../locales/../src/engine/local_path.cpp:464 -#: ../../locales/../src/engine/local_path.cpp:484 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." -msgstr "'%s' はディレクトリではありません." +msgstr "'%s' はディレクトリではありません。" -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:951 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' はサポートされているプロトコルではありません。" + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" -msgstr "ログオンの種類 'アカウント' は選択されたプロトコルには対応していません" +msgstr "ログオンの種類「アカウント」は選択したプロトコルに対応していません" -#: ../../locales/../src/interface/manual_transfer.cpp:440 -#, fuzzy +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." msgstr "" -"FileZilla はキオスク モードで動作しています.\n" -"ログオンの種類 '通常' と 'アカウント' はこのモードでは利用できません." +"ログオンの種類「標準」と「アカウント」は利用できません。代わりに「パスワード" +"を尋ねる」を使用してください。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:966 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" +"ログオンの種類「標準」と「アカウント」は利用できません。あなたのエントリは、" +"「パスワードを尋ねる」に変更されました。" -#: ../../locales/../src/interface/Mainfrm.cpp:598 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " "command without the leading 'quote'." msgstr "" -"'クオート' は通常引数を伴った 'クオート' をサーバに送信するためにコマンドライ" -"ン クライアントによって使われるローカル コマンドです. あなたは主要な 'クオー" -"ト' なしにそのままのコマンドを入力したくなるでしょう." +"'クオート' は通常引数を伴った 'クオート' をサーバーに送信するためにコマンドラ" +"イン クライアントによって使われるローカル コマンドです。あなたは先頭に 'ク" +"オート' 付けずにそのままのコマンドを入力することもできます。" -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" -msgstr[0] "(%d 個の項目が非表示)" +msgstr[0] "(%d 個のアイテムが非表示)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% ダウンロード)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 は無制限)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" -msgstr "(0-99)" +msgstr "(0 - 99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" -msgstr "(0-999 秒)" +msgstr "(0 - 999 秒)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" -msgstr "(1-10)" +msgstr "(1 - 10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" -msgstr "(10-9999, 0 は無効)" +msgstr "(10 - 9999、0 は無効)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" -msgstr "" +msgstr "(app-compat は %d.%d に設定されています)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(例: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(例: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3557 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(%s/秒で)" @@ -1178,77 +1243,81 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "残り --:--:--" #: ../../locales/../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." -msgstr "-c は FTP URL と同時には使用できません." +msgstr "-c は FTP URL と同時には使用できません。" #: ../../locales/../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." -msgstr "-l は FTP URL と同時には使用できません." +msgstr "-l は FTP URL と同時には使用できません。" #: ../../locales/../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." -msgstr "-s と -c は同時に使用できません." +msgstr "-s と -c は同時に使用できません。" #: ../../locales/../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." -msgstr "-s は FTP URL と同時には使用できません." +msgstr "-s は FTP URL と同時には使用できません。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - なし" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - 警告" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - 情報" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - 詳細" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32 ビット システム" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - デバッグ" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64 ビット システム" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< 戻る(&B)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" -"入力された名前のブックマークは既に存在します. 未使用の名前を入力してください." +"入力した名前のブックマークは既に存在します。未使用の名前を入力してください。" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "安全でないアルゴリズムを使用してチェーンの証明書に署名しました" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." -msgstr "既定のエディタを設定する必要があります." +msgstr "デフォルトのエディターを設定する必要があります。" -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." -msgstr "ディレクトリを自身のサブディレクトリにドラッグすることはできません." +msgstr "ディレクトリを自身のサブディレクトリにドラッグすることはできません。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" @@ -1256,24 +1325,24 @@ "you would have to use active mode. In active mode, FileZilla opens a port " "and asks the server to connect to it." msgstr "" -"いくつかのサーバはパッシブ モードを許可していないか設定が間違っています. その" -"ような場合アクティブ モードを使用するべきです. アクティブ モードでは, " -"FileZilla はポートを開いてサーバからの接続を受け付けます." +"いくつかのサーバーはパッシブ モードを許可していないか設定が間違っています。そ" +"のような場合アクティブ モードを使用するべきです。アクティブ モードでは、" +"FileZilla はポートを開いてサーバーからの接続を受け付けます。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." -msgstr "以前開かれたファイルは変更されています." +msgstr "以前開かれたファイルは変更されています。" -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." -msgstr "その名前のファイルは既に転送されています." +msgstr "その名前のファイルは既に転送されています。" -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." -msgstr "その名前のファイルはまだ編集中です. 閉じてから再度試してください." +msgstr "その名前のファイルはまだ編集中です。閉じてから再度試してください。" -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1281,52 +1350,61 @@ "Unless you fix this problem, files might be missing in the file listings.\n" "No further warning will be displayed this session." msgstr "" -"ローカルファイル名をデコードできませんでした.\n" -"環境変数 LC_CTYPE (または LC_ALL) が正しく設定されているか確認してください.\n" -"この問題を修正するまで, ファイル一覧表示にファイルが表示されないかもしれませ" -"ん.\n" -"このセッションではこれ以上の警告は表示しません." +"ローカル ファイル名をデコードできませんでした。\n" +"環境変数 LC_CTYPE (または LC_ALL) が正しく設定されているか確認してくださ" +"い。\n" +"この問題を修正するまで、ファイル リスト表示にファイルが表示されないかもしれま" +"せん。\n" +"このセッションではこれ以上の警告は表示しません。" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"紛失したマスター パスワードは回復できません! パスワードを覚えておいてくださ" +"い。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "新しいバージョンの FileZilla を利用できます:" -#: ../../locales/../src/interface/Mainfrm.cpp:658 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." msgstr "" -"適切なサーバはすべてのファイルを常に表示しますが, 問題のあるサーバはファイル" -"を隠します. このオプションを使用するはすべてのファイルを表示するようサーバに" -"強制します." +"適切なサーバーは常に、すべてのファイルを示しているが、このオプションを使用す" +"ると、サーバーにすべてのファイルの表示を強制させます。。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." msgstr "" -"これは適切なサーバでは不要です. これが必要な場合はサーバ管理者に連絡してくだ" -"さい." +"これは適切なサーバーでは不要です。これが必要な場合はサーバー管理者に連絡して" +"ください。" -#: ../../locales/../src/interface/state.cpp:256 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" -"リモート操作が進行中で同期ブラウジングが有効です.\n" +"リモート操作が進行中で同期ブラウジングが有効です。\n" "同期ブラウジングを無効にしてローカル ディレクトリの変更を継続しますか?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "追加(&D)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "ASCII ファイルの再開を許可(&L)" @@ -1338,51 +1416,53 @@ msgid "A&pply only to uploads" msgstr "アップロードのみに適用(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "すべてのファイルとディレクトリに適用(&P)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "成功した転送を自動的に削除(&U)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "FileZilla のバージョン情報" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" -msgstr "ファイル一覧の上に" +msgstr "ファイル リストの上に" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1272 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "一部のローカル ディレクトリへのアクセスを復元できませんでした:" + +#: ../../locales/../src/engine/server.cpp:616 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "アカウント" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "キュー完了後の動作(&C)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" -msgstr "選択されたファイルの操作:" +msgstr "選択したファイルの操作:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "実行する動作:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "動作:" @@ -1390,64 +1470,65 @@ msgid "Active mode" msgstr "アクティブ モード" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "" -"アクティブ モード FTP のテストに失敗しました. FileZilla は正しい外部 IP アド" -"レスを知りません." +"アクティブ モード FTP のテストに失敗しました。FileZilla は正しい外部 IP アド" +"レスを知りません。" -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." msgstr "" -"アクティブ モード FTP のテストに失敗しました. FileZilla は正しい外部 IP アド" -"レスを知りません. 加えてルータはアドレスの修正を行っています." +"アクティブ モード FTP のテストに失敗しました。FileZilla は正しい外部 IP アド" +"レスを知りません。加えてルーターはアドレスの修正を行っています。" -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " "address." msgstr "" -"アクティブ モード FTP のテストに失敗しました. FileZilla は正しい外部 IP アド" -"レスを知っていますが, ルータかファイアウォールが語弊のある送信アドレスに修正" -"しています." +"アクティブ モード FTP のテストに失敗しました。FileZilla は正しい外部 IP アド" +"レスを知っていますが、ルーターかファイアウォールが誤った送信アドレスに修正し" +"ています。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "アクティブ モード IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3159 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" -msgstr "すべてのファイルをキューのみに追加(&Q)" +msgstr "キューにのみファイルを追加(&Q)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" -msgstr "選択されたディレクトリを転送キューへ追加" +msgstr "選択したディレクトリを転送キューへ追加" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" -msgstr "選択されたファイルとフォルダを転送キューへ追加" +msgstr "選択したファイルとフォルダーを転送キューへ追加" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "キューに追加" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "未対応のアドレスの種類" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "詳細" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1455,172 +1536,178 @@ "expected and might even damage your system. Use beta versions and nightly " "builds at your own risk." msgstr "" +"アドバイス: 新しい機能をテストしない限り、安定版のみを使用してください。ベー" +"タ版とナイトリー ビルドは、テスト目的の開発バージョンです。FileZilla のナイト" +"リー ビルドは期待どおりに動作しない可能性があり、システムに損傷を与える可能性" +"があります。ベータ版とナイトリー ビルドは、自己責任で使用してください。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "常にこの動作を利用(&W)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "アルゴリズム:" -#: ../../locales/../src/interface/QueueView.cpp:2964 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "すべてのファイルを正しく転送しました" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 msgid "All ports in the given range have to be between 1024 and 65535." -msgstr "" -"入力されたすべてのポート範囲は 1024 から 65535 の範囲である必要があります." +msgstr "指定するすべてのポートは 1024 から 65535 の範囲である必要があります。" -#: ../../locales/../src/interface/QueueView.cpp:2960 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "すべての転送を終了しました。%d 個のファイルは転送できませんでした。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" -msgstr "失敗時に他の転送モードへのフォール バックを許可(&F)" +msgstr "失敗時に他の転送モードへのフォールバックを許可(&F)" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" -msgstr "失敗時に他の転送モードへのフォール バックを許可" +msgstr "失敗時に他の転送モードへのフォールバックを許可" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "既に接続されています" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" -msgstr[0] "フィルタ名:" +msgstr[0] "フィルター名:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." msgstr "" -"代わりに PuTTY の Pageant ツールを使用して鍵を管理できます, FileZilla は " -"Pageant を認識します." +"代わりに PuTTY の Pageant ツールを使用して鍵を管理できます、FileZilla は " +"Pageant を認識します。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." msgstr "" -"あなたのシステムの SSH エージェントを代わりに使用できます. そのためには " -"SSH_AUTH_SOCK 環境変数を設定してください." +"あなたのシステムの SSH エージェントを代わりに使用できます。そのためには " +"SSH_AUTH_SOCK 環境変数を設定してください。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" -msgstr "FileZilla の Web サイトから最新版をダウンロードすることもできます:" +msgstr "FileZilla の Webサイトから最新版をダウンロードすることもできます:" -#: ../../locales/../src/interface/QueueView.cpp:1919 +#: ../../locales/../src/interface/QueueView.cpp:1662 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" "Some queue items might not have been restored." msgstr "" -"\"%s\" からの転送キュー読み込み時にエラーが発生しました.\n" -"復元できなかったキュー項目があるかもしれません." +"\"%s\" からの転送キュー読み込み時にエラーが発生しました。\n" +"復元できなかったキューがあるかもしれません。" -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" "Some queue items might not have been saved." msgstr "" -"\"%s\" への転送キュー保存時にエラーが発生しました.\n" -"保存できなかったキュー項目があるかもしれません." +"\"%s\" への転送キュー保存時にエラーが発生しました。\n" +"保存できなかったキューがあるかもしれません。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1920 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "証明書チェーンの発行者は認証局ではありません" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." -msgstr "" -"目的の場所には既にドラッグされたアイテムと同じ名前のアイテムがあります." +msgstr "目的の場所には既にドラッグしたアイテムと同じ名前のアイテムがあります。" -#: ../../locales/../src/engine/server.cpp:857 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1509 +#: ../../locales/../src/engine/server.cpp:641 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "匿名" -#: ../../locales/../src/interface/state.cpp:914 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." -msgstr "他のリモート操作が既に進行中のため現在はディレクトリを変更できません." +msgstr "他のリモート操作が既に進行中のため現在はディレクトリを変更できません。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." -msgstr "サイト マネージャでの変更を保存できませんでした." +msgstr "サイト マネージャーでの変更を保存できませんでした。" -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." -msgstr "フィルタへの変更を保存できませんでした." +msgstr "フィルターへの変更を保存できませんでした。" -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." -msgstr "フィルタへの変更は保存されません." +msgstr "フィルターへの変更は保存されません。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "ディレクトリのみに適用(&L)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "適用" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "現在のキューのみに適用(&C)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "ファイルのみに適用(&F)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" -msgstr "アーカイブ" +msgstr "アーカイブ属性" -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" -msgstr "" +msgstr "引数のバッファー オーバーフロー" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" -msgstr "転送キュー ペイン内のタブとして" +msgstr "転送キュー ウィンドウ内のタブとして" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "動作を尋ねる" -#: ../../locales/../src/engine/server.cpp:832 -#: ../../locales/../src/engine/server.cpp:851 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/engine/server.cpp:633 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "パスワードを尋ねる" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." -msgstr "オペレーティング システムにポートを尋ねる." +msgstr "オペレーティング システムにポートを尋ねる" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" msgstr "オペレーティング システムに外部 IP アドレスを尋ねる" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "FileZilla フォーラムでの質問と回答" @@ -1628,204 +1715,230 @@ msgid "Associated program not found:" msgstr "関連付けられたプログラムが見つかりません:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" -msgstr "少なくとも一つのフィルタの状態は不完全です" +msgstr "少なくとも一つのフィルターの状態は不完全です" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 msgid "At this point, all required information has been gathered." -msgstr "いまのところ, すべての必要情報は集まっています." +msgstr "いまのところ、すべての必要情報は集まっています。" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "属性" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." -msgstr "認証に失敗しました." +msgstr "認証に失敗しました。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "著者:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "自動" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "自動的にファイルの種類を判別" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "利用できるサイズ" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B <バイトの単位文字。先頭の文字のみが翻訳されます>" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:267 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "プロキシを無視(&Y)" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" -msgstr "" +msgstr "不正なファイル記述子" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "基本的な使用手順" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "動作" -#: ../../locales/../src/interface/edithandler.cpp:1115 -#: ../../locales/../src/interface/edithandler.cpp:1143 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "編集中" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "注意! 証明書は失効しています" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2534 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "バイナリ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "黒板" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:402 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Blue" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "ブックマーク" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2790 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "ブックマーク:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2779 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "ブックマーク" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 +msgid "Browse..." +msgstr "参照..." + +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "バケットが見つかりません" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "ビルド日:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "ビルド情報" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "ビジネス カテゴリ:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " "please enter the port range below." msgstr "" -"既定ではアクティブ モードで転送を確立するのに利用できるローカル ポートを使用" -"します. FileZilla が使用するポート範囲を狭く制限したい場合は, 下にポート範囲" -"を入力してください." +"デフォルトではアクティブ モードで転送を確立するのに利用できるローカル ポート" +"を使用します。FileZilla が使用するポート範囲を狭く制限したい場合は、下にポー" +"ト範囲を入力してください。" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "現在の操作をキャンセル(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "すべてクリア(&L)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "URL をクリップボードにコピー(&O)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "パスワード付き URL をクリップボードにコピー(&O)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "カスタム(&U)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "カスタム ファイルの種類の関連付け(&U):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" -msgstr "" +msgstr "CPU の機能:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1201 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." -msgstr "サーバのタイムゾーン オフセットを計算しています..." +msgstr "サーバーのタイムゾーン オフセットを計算しています..." -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "ファイルから読み取れません" -#: ../../locales/../src/engine/transfersocket.cpp:648 -#: ../../locales/../src/engine/transfersocket.cpp:714 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." -msgstr "ファイルにデータを書き込めません." +msgstr "ファイルにデータを書き込めません。" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "ファイル %s にデータを書き込めません" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2560 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2874 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3246 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3508 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:562 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "キャンセル" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "現在の操作をキャンセル" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "現在の操作をキャンセル" -#: ../../locales/../src/engine/local_path.cpp:459 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" -"'%s' にアクセスできません, メディアが挿入されていないかドライブの準備ができて" -"いません." +"'%s' にアクセスできません、メディアが挿入されていないかドライブの準備ができて" +"いません。" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" -msgstr "サイト マネージャにサーバを追加できません" +msgstr "サイト マネージャーにサーバーを追加できません" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" -msgstr "" +msgstr "要求されたアドレスを割り当てることができません" + +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "ディレクトリを変更できません。すでに進行中のブラウズ操作があります。" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1833,156 +1946,160 @@ "処理中のためタブを閉じることができません\n" "現在の処理をキャンセルしてタブを閉じますか?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" msgstr "" -"ローカルとリモートのディレクトリに異なるフィルタが有効になっているため, ディ" -"レクトリを比較できません." +"ローカルとリモートのディレクトリに異なるフィルターが有効になっているため、" +"ディレクトリを比較できません" #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" -msgstr "新しいフィルタを作成できません" +msgstr "新しいフィルターを作成できません" -#: ../../locales/../src/interface/edithandler.cpp:1575 -#: ../../locales/../src/interface/edithandler.cpp:1623 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "ファイルを編集できません" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." -msgstr "ファイルを編集できません, どのサーバにも接続されていません." +msgstr "ファイルを編集できません、どのサーバーにも接続されていません。" -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." -msgstr "ファイルを編集できません, リモート パスが不明です." +msgstr "ファイルを編集できません、リモート パスが不明です。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "" -"SFTP サーバに対して FTP 接続を確立できません, 適切なプロトコルを選択してくだ" -"さい." - -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "リソース ファイルからクイック接続バーをロードできません" +"SFTP サーバーに対して FTP 接続を確立できません、適切なプロトコルを選択してく" +"ださい。" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:375 -msgid "Cannot load keyfile" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 +msgid "Cannot load key file" msgstr "鍵ファイルを読み込めません" -#: ../../locales/../src/interface/Mainfrm.cpp:1004 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" -msgstr "リソース ファイルからツールバーをロードできません" +msgstr "リソース ファイルからツールバーを読み込みできません" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "パスワードを保存しない" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1162 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "エントリの名前を変更できません" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "ファイル名を変更できません" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "お使いの SOCKS4 ではホスト名を IPv4 へ名前解決できませんでした。" -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" -msgstr "フィルタ セットを保存できません" +msgstr "フィルターセットを保存できません" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" -msgstr "フィルタを選択できません" +msgstr "フィルターを選択できません" -#: ../../locales/../src/interface/edithandler.cpp:1473 -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "ファイルの関連付けを設定できません" -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "ダイアログを表示できません" -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" -msgstr "選択されたファイルは表示/編集できません" +msgstr "選択したファイルは表示/編集できません" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "大文字小文字を区別しない" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" -msgstr "大文字と小文字を区別" +msgstr "大文字と小文字を区別しない" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" -msgstr "システム既定値を使用" +msgstr "大文字と小文字を区別しない (デフォルト)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "大文字と小文字を区別" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" -msgstr "システム既定値を使用" +msgstr "大文字と小文字を区別 (デフォルト)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" -msgstr "カテゴリをクリア" +msgstr "クリアするカテゴリ" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." -msgstr "証明書とセッション データがまだ利用できません." +msgstr "証明書とセッション データがまだ利用できません。" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 msgid "Certificate in chain:" -msgstr "認証パス" +msgstr "チェーンの証明書:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "証明書発行者" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "証明書署名の検証に失敗しました" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "チャレンジ:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" -msgstr "ファイルの属性を変更" +msgstr "ファイル属性の変更" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." -msgstr "ファイルのパーミッションを変更します." +msgstr "ファイルのパーミッションを変更します。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." -msgstr "ログファイルの設定の変更には FileZilla の再起動が必要です。" +msgstr "ログ ファイルの設定の変更には FileZilla の再起動が必要です。" -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" -msgstr "文字エンコーディングの問題" +msgstr "文字コードの問題" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" -msgstr "文字セット" +msgstr "文字コード" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "更新をチェック(&U)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "自動的に更新チェック(&U):" @@ -1990,15 +2107,15 @@ msgid "Check for Updates" msgstr "更新チェック" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "FileZilla の新しいバージョンをチェック" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "更新チェックに失敗しました" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2006,99 +2123,111 @@ "ログイン認証情報を確認してください。パスワードの最初か最後にスペースが入力さ" "れています。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." msgstr "" -"ログイン認証情報を確認してください。ユーザ名の最初か最後にスペースが入力され" -"ています。" +"ログイン認証情報を確認してください。ユーザー名の最初か最後にスペースが入力さ" +"れています。" -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "正しい外部 IP アドレスをチェック中" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "更新をチェック中..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" -msgstr "ダウンロードしたファイルのチェックサムが一致しました。 %s\n" +msgstr "ファイル %s のチェックサムが一致しました。\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" -msgstr "ダウンロードしたファイルのチェックサムが一致しません。 %s\n" +msgstr "ファイル %s のチェックサムが一致しません。\n" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 +msgid "Choose a key file" +msgstr "鍵ファイルの選択" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1440 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" -msgstr "既定のローカル ディレクトリを選択" +msgstr "デフォルトのローカル ディレクトリを選択" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2132 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "ローカル ディレクトリを選択" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 +#: ../../locales/../src/engine/http/request.cpp:668 msgid "Chunk data improperly terminated" -msgstr "チャンク データは不適切に終了しました" +msgstr "チャンク データが不正に終了しました" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "暗号化方式:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "タブを閉じる(&O)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "クラシック" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "レイアウト キャッシュをクリア(&L)" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "自動更新データをクリア" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "履歴をクリア" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" -msgstr "個人情報をクリア" +msgstr "個人データをクリア" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "クイック接続バーをクリア" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." -msgstr "設定を保存するには完了をクリックしてください." +msgstr "設定を保存するには完了をクリックしてください。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" -msgstr "クライアント -> サーバ MAC:" +msgstr "クライアント -> サーバー MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" -msgstr "クライアント -> サーバ 暗号化方式:" +msgstr "クライアント -> サーバー 暗号化方式:" + +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "閉じる" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:609 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "他のタブをすべて閉じる(&A)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1145 -#: ../../locales/../src/interface/Mainfrm.cpp:1166 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "FileZilla を閉じる" @@ -2106,103 +2235,108 @@ msgid "Close all running instances of FileZilla" msgstr "すべての実行中の FileZilla インスタンスを終了" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "クイック検索を閉じて比較を続けますか?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "現在のタブを閉じる" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "コメント(&M):" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "列のプロパティ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "列の設定" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." -msgstr "コマンドと引数は引用符で適切に囲む必要があります." +msgstr "コマンドと引数は引用符で適切に囲む必要があります。" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:140 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "コマンド失敗" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" -msgstr "コマンドはサポートされていません" +msgstr "サポートされていないコマンドです" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" -msgstr "このプロトコルではコマンドをサポートしていません." +msgstr "このプロトコルでサポートされていないコマンドです" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:280 -#: ../../locales/../src/interface/StatusView.cpp:336 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "コマンド:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "コメント" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "共有名:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" -msgstr "ルータまたはファイアウォールによって通信を失いました" +msgstr "ルーターまたはファイアウォールによって通信を失いました" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" -msgstr "修正日時で比較(&M)" +msgstr "更新日時で比較(&M)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "ファイルサイズで比較(&S)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" -msgstr "比較の閾値(分)(&T):" +msgstr "比較の閾値 (分)(&T):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." -msgstr "比較の閾値は 0 から 1440 分の範囲である必要があります." +msgstr "比較の閾値は 0 から 1440 分の範囲である必要があります。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "コンパイル対象:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "コンパイル環境:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "コンパイラ:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "コンパイラ フラグ:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" -msgstr "圧縮された" +msgstr "圧縮属性" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "同時転送" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "大文字と小文字を区別(&A)" @@ -2218,66 +2352,69 @@ msgid "Configure port range" msgstr "ポート範囲を設定" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "FileZilla とネットワークの設定" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "削除の確認" -#: ../../locales/../src/engine/local_filesys.cpp:129 -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1664 -#: ../../locales/../src/interface/RemoteListView.cpp:1394 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1638 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "必要な確認" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." -msgstr "おめでとうございます. 設定は正しく機能しているようです." +msgstr "おめでとうございます、設定は正しく機能しているようです。" -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "プロキシ設定を無視して接続" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "接続に失敗しました: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "現在のタブで接続" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "新規タブで接続" #: ../../locales/../src/interface/cmdline.cpp:8 msgid "Connect to specified Site Manager site" -msgstr "指定されたサイト マネージャ サイトに接続" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "接続されました" +msgstr "指定されたサイト マネージャー サイトに接続" -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "接続中" -#: ../../locales/../src/interface/netconfwizard.cpp:222 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "%s に接続中" -#: ../../locales/../src/engine/ControlSocket.cpp:1047 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4242 -#, fuzzy, c-format +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 +#, c-format msgid "Connecting to %s through %s proxy" -msgstr "プロキシを通して %s に接続中" +msgstr "%s にプロキシ %s を使用して接続中" -#: ../../locales/../src/engine/ControlSocket.cpp:955 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "%s に接続中..." @@ -2286,269 +2423,329 @@ msgid "Connection" msgstr "接続" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "接続が閉じられました" -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "接続の試行が失敗しました" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." -msgstr "接続の試行が失敗しました: \"%s\", 次のアドレスを試しています." +msgstr "接続の試行が失敗しました: \"%s\" 次のアドレスを試しています。" -#: ../../locales/../src/engine/ControlSocket.cpp:924 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." -msgstr "接続の試行が失敗しました: \"%s\"." +msgstr "接続の試行が失敗しました: \"%s\"" -#: ../../locales/../src/engine/ControlSocket.cpp:183 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" -msgstr "接続の試行がユーザにより中断されました" +msgstr "接続の試行がユーザーにより中断されました" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "接続タイムアウト" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" -msgstr "接続が閉じられました." +msgstr "接続が閉じられました" -#: ../../locales/../src/engine/ControlSocket.cpp:1014 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:303 +#: ../../locales/../src/engine/http/request.cpp:316 +#: ../../locales/../src/engine/http/request.cpp:327 +#: ../../locales/../src/engine/http/request.cpp:338 msgid "Connection closed by server" -msgstr "サーバによって接続が閉じられました" +msgstr "サーバーによって接続が閉じられました" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:294 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." -msgstr "接続を確立しました, TLS を初期化中..." +msgstr "接続を確立しました。TLS を初期化中..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:319 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" -msgstr "接続を確立しました, HTTP リクエストを送信中です" +msgstr "接続を確立しました。HTTP リクエストを送信中です" + +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "接続が確立しました。ウェルカム メッセージを待っています。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." -msgstr "接続を確立しました, ウェルカム メッセージを待っています..." +msgstr "接続を確立しました。ウェルカム メッセージを待っています..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "接続が失われました" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "接続がルールセットにより許可されていません" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" -msgstr "接続が拒否されました." +msgstr "接続が拒否されました" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" -msgstr "サーバによって接続が拒否されました" +msgstr "サーバーによって接続が拒否されました" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "ネットワークによって接続がリセットされました" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "相手によって接続がリセットされました" -#: ../../locales/../src/engine/ControlSocket.cpp:557 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" -msgstr[0] "" +msgstr[0] "非アクティブになってから %d 秒後に接続がタイムアウトになりました" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." -msgstr "接続がタイムアウトしました." +msgstr "接続がタイムアウトしました。" -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." -msgstr "サーバへの接続が失われました." +msgstr "サーバーへの接続が失われました。" -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." -msgstr "プロキシとの接続を確立しました. ハンドシェイクを行っています..." +msgstr "プロキシとの接続を確立しました。ハンドシェイクを行っています..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." -msgstr "サーバとの接続が早々に閉じられました." +msgstr "サーバーとの接続が途中で閉じられました。" -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." -msgstr "テスト サーバへの接続に失敗しました." +msgstr "テスト サーバーへの接続に失敗しました。" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:265 -msgid "Convert keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 +msgid "Convert key file" msgstr "鍵ファイルの変換" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "%2$s - コピー (%1$d)" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1719 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "%s - コピー" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"選択したアイテムのパスワードを含む URL をクリップボードにコピーします。" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." -msgstr "選択された項目の URL をクリップボードにコピーしてください." +msgstr "選択したアイテムの URL をクリップボードにコピーします。" -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" -msgstr "接続を受理できませんでした: %s" +msgstr "接続を受け入れることができませんでした: %s" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "パス %s にアクセスできませんでした" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "一時的な信頼リストに証明書を追加できませんでした" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" -msgstr "サイト マネージャに接続を追加できませんでした" +msgstr "サイト マネージャーに接続を追加できませんでした" -#: ../../locales/../src/interface/state.cpp:755 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "操作を完了できませんでした" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" -msgstr "サーバに接続できませんでした" +msgstr "サーバーに接続できませんでした" -#: ../../locales/../src/engine/ControlSocket.cpp:1084 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" -msgstr "サーバに接続できませんでした: %s" +msgstr "サーバーに接続できませんでした: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" -msgstr "コマンドをサーバエンコーディングに変換できません" +msgstr "コマンドをサーバーの文字コードに変換できません" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:313 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "秘密鍵を変換できません" -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "URL をコピーできませんでした" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "証明書をコピーできませんでした" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "データをコピーできませんでした" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "パス %s から CFURL を作成できませんでした" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "この転送の URI を作成できませんでした。" + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "ローカル ファイル %s に書き込めませんでした\n" -#: ../../locales/../src/engine/logging.cpp:165 -#, fuzzy, c-format +#: ../../locales/../src/engine/logging.cpp:179 +#, c-format msgid "Could not create logging mutex: %s" -msgstr "ローカル ファイル %s に書き込めませんでした\n" +msgstr "ロギング ミューテックスを作成できませんでした: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2193 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "URL からセキュリティ スコープ付きブックマークを作成できませんでした:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " "files into an Explorer window." msgstr "" -"ドラッグ & ドロップ操作の対象を決定できません.\n" -"シェル拡張が適切にインストールされてない, またはエクスプローラのウィンドウに" -"ファイルをドロップできませんでした." +"ドラッグ＆ドロップ操作の対象を決定できません。\n" +"シェル拡張が適切にインストールされてない、またはエクスプローラーのウィンドウ" +"にファイルをドロップできませんでした。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4091 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" -msgstr "サーバとの接続を確立できませんでした" +msgstr "サーバーとの接続を確立できませんでした" -#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " "' commandline option or by setting the FZ_DATADIR environment " "variable." msgstr "" -"FileZilla のリソース ファイルを見つけられなかったため, FileZilla を終了しま" -"す.\n" +"FileZilla のリソース ファイルを見つけられなかったため、FileZilla を終了しま" +"す。\n" "コマンドライン オプション '--datadir ' を使用するか環境変数 " -"FZ_DATADIR を設定することで FileZilla のデータ ディレクトリを設定できます." +"FZ_DATADIR を設定することで FileZilla のデータ ディレクトリを設定できます。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." -msgstr "カスタムログインシーケンスを生成できませんでした." +msgstr "カスタム ログイン シーケンスを生成できませんでした。" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "鍵を生成できません" -#: ../../locales/../src/engine/tlssocket.cpp:930 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" -"証明書発行者の識別名を取得できず, gnutls_x509_get_issuer_dn に失敗しました" +"証明書発行者の識別名を取得できず、gnutls_x509_get_issuer_dn に失敗しました" -#: ../../locales/../src/engine/tlssocket.cpp:907 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "" -"証明書のサブジェクトの識別名を取得できず, gnutls_x509_get_dn に失敗しました" +"証明書のサブジェクトの識別名を取得できず、gnutls_x509_get_dn に失敗しました" -#: ../../locales/../src/interface/state.cpp:900 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." -msgstr "完全なリモート パスを取得できませんでした." +msgstr "完全なリモート パスを取得できませんでした。" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "CFURL からネイティブ パスを取得できません" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "URL からパスを取得できません" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." -msgstr "fzputtygen からの結果を取得できません." +msgstr "fzputtygen からの結果を取得できません。" -#: ../../locales/../src/interface/edithandler.cpp:1575 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." -msgstr "" -"ダウンロードファイルを入れるためのテンポラリのディレクトリを取得できません." +msgstr "ファイルをダウンロードする一時ディレクトリを取得できませんでした。" -#: ../../locales/../src/engine/tlssocket.cpp:853 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "ピア証明書をインポートできず, gnutls_x509_crt_import に失敗しました" - -#: ../../locales/../src/engine/tlssocket.cpp:848 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "ピア証明書の構造を初期化できず, gnutls_x509_crt_init に失敗しました" +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Winsock を初期化できませんでした (%d): %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " "accessed.\n" "Any changes made in the Site Manager will not be saved." msgstr "" -"\"%s\" を読み込めなかったため, ファイルが適当なものでアクセスできることを確認" -"してください.\n" -"サイト マネージャで行われた変更は保存されません." - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:220 -msgid "Could not load keyfile" +"\"%s\" を読み込めなかったため、ファイルが適当なものでアクセスできることを確認" +"してください。\n" +"サイト マネージャーで行われた変更は保存されません。" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 +msgid "Could not load key file" msgstr "鍵ファイルを読み込めません" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:290 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "秘密鍵を読み込めません" -#: ../../locales/../src/interface/state.cpp:922 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2556,10 +2753,10 @@ "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "リモート ディレクトリ '%s' に対応するローカル ディレクトリを取得できませんで" -"した.\n" +"した。\n" "同期ブラウジングを無効にしてリモート ディレクトリの変更を継続しますか?" -#: ../../locales/../src/interface/state.cpp:359 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2567,10 +2764,10 @@ "Synchronized browsing has been disabled." msgstr "" "リモート ディレクトリ '%s' に対応するローカル ディレクトリを取得できませんで" -"した.\n" -"同期ブラウジングを無効にしました." +"した。\n" +"同期ブラウジングを無効にしました。" -#: ../../locales/../src/interface/state.cpp:265 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2578,203 +2775,261 @@ "Synchronized browsing has been disabled." msgstr "" "ローカル ディレクトリ '%s' に対応するリモート ディレクトリを取得できませんで" -"した.\n" -"同期ブラウジングを無効にしました." +"した。\n" +"同期ブラウジングを無効にしました。" + +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "'%s' のサイズを取得できませんでした" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "'%s' を開くことができませんでした" -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "クリップボードを開くことができませんでした" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:177 -#: ../../locales/../src/engine/logging.cpp:208 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" -msgstr "ログ ファイルを開くことができませんでした: %s" +msgstr "ログ ファイルを開けませんでした: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." -msgstr "リモート パスを構文解析できませんでした." +msgstr "リモート パスを構文解析できませんでした。" -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" -msgstr "サーバのアドレスを構文解析できませんでした:" +msgstr "サーバーのアドレスを構文解析できません:" + +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "'%s' から読み取れませんでした" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "データ ソケットから読み取れませんでした。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:380 #, c-format msgid "Could not read from socket: %s" -msgstr "ソケットから読み取ることができませんでした: %s" +msgstr "ソケットから読み取れませんでした: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." -msgstr "サーバの項目を読み取ることができませんでした." +msgstr "サーバー アイテムを読み取れませんでした。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2591 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "ファイル内のオフセット %s を探し出せませんでした" +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "サーバーからデータを受信できませんでした。" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "ディレクトリ アクセスを復元できませんでした" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "ファイル内のオフセット %d を探し出せませんでした" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "ファイルの先頭にシークすることができません" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "ファイルの終わりを見つけられませんでした" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:140 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." -msgstr "fzputtygen にコマンドを送信できませんでした." +msgstr "fzputtygen にコマンドを送信できませんでした。" + +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "fzstorj にコマンドを送信できませんでした。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2619 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "ピア証明書を並べ替えできません" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "IO スレッドを作成できません" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "プロキシ ハンドシェイクを開始できませんでした: %s" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "転送を開始できません" -#: ../../locales/../src/interface/sitemanager.cpp:608 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " "%s" msgstr "" -"\"%s\" に書き込むことができず, サイト マネージャへの変更は保存されませんでし" -"た: %s" +"\"%s\" に書き込むことができず、サイト マネージャーへの変更は保存されませんで" +"した: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" -msgstr "\"%s\" を書き込めなかったため, ブックマークを追加できませんでした: %s" +msgstr "\"%s\" を書き込めなかったため、ブックマークを追加できませんでした: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" -"\"%s\" を書き込めなかったため, グローバル ブックマークを保存できませんでし" +"\"%s\" を書き込めなかったため、グローバル ブックマークを保存できませんでし" "た: %s" -#: ../../locales/../src/interface/QueueView.cpp:1858 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" "%s" msgstr "" -"\"%s\" を書き込めなかったため, キューを保存できませんでした.\n" +"\"%s\" を書き込めなかったため、キューを保存できませんでした。\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:718 -#: ../../locales/../src/interface/sitemanager.cpp:772 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2113 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" -"\"%s\" を書き込めなかったため, 選択されたサイトをエクスポートできませんでし" -"た: %s" +"\"%s\" を書き込めなかったため、選択したサイトをエクスポートできませんでした: " +"%s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "書き込めませんでした \"%s\":" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:313 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format -msgid "Could not write keyfile: %s" +msgid "Could not write key file: %s" msgstr "鍵ファイルに書き込めませんでした: %s" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "ローカル ファイルに書き込めませんでした" -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/engine/logging.cpp:280 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "ログ ファイルに書き込めませんでした: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:880 -#: ../../locales/../src/engine/ControlSocket.cpp:983 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:235 #, c-format msgid "Could not write to socket: %s" msgstr "ソケットに書き込めませんでした: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "国:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "新しいファイルを作成(&T)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 -msgid "Create a new subdirectory in the current directory" -msgstr "現在のディレクトリに新しいサブディレクトリを作成" +#: ../../locales/../src/interface/state.cpp:1107 +msgid "Create &missing local directory and enter it" +msgstr "ディレクトリを作成して移動(&M)" + +#: ../../locales/../src/interface/state.cpp:1029 +msgid "Create &missing remote directory and enter it" +msgstr "ディレクトリを作成して移動(&M)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 +msgid "Create a new subdirectory in the current directory" +msgstr "現在のディレクトリに新しいサブディレクトリを作成" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "現在のディレクトリに新しいサブディレクトリを作成して移動" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "現在のディレクトリに空のファイルを作成" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "ディレクトリを作成して移動(&Y)" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "ディレクトリを作成" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "空のファイルを作成" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "ディレクトリを作成しています" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1917 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "ディレクトリ '%s' を作成中..." -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "致命的なエラー" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "致命的なエラー:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "ファイル転送での致命的なエラー" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "%s (%s) の転送後にファイル転送の致命的なエラーが発生しました" -#: ../../locales/../src/interface/state.cpp:350 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2782,91 +3037,104 @@ msgstr "" "現在のリモート ディレクトリ (%s) は同期されるルート (%s) の配下ではありませ" "ん.\n" -"同期ブラウジングを無効にしました." +"同期ブラウジングを無効にしました。" -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." -msgstr "現在の転送モードは ASCII に設定されています." +msgstr "現在の転送モードは ASCII に設定されています。" -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." -msgstr "現在の転送モードは自動検出に設定されています." +msgstr "現在の転送モードは自動検出に設定されています。" -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." -msgstr "現在の転送モードはバイナリに設定されています." +msgstr "現在の転送モードはバイナリに設定されています。" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 +msgid "Curve:" +msgstr "曲線:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "カスタム(&T)" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" -msgstr "カスタム フィルタ セット" +msgstr "カスタム フィルターセット" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2364 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" -msgstr "カスタム サーバ" +msgstr "カスタム サーバー" + +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Cyan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2498 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "データの種類(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" -msgstr "SI 接頭辞(10進数) (例: 1 KB = 1000 バイト)(&E)" +msgstr "SI 接頭辞 (10進数) (例: 1 KB = 1000 バイト)(&E)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" -msgstr "既定値(&E)" +msgstr "デフォルト(&E)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:597 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "削除(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 +msgid "D&irectory comparison" +msgstr "ディレクトリを比較(&I)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "すべて無効にする(&I)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "パスワードを保存しない(&O)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "ディレクトリをダブルクリックしたときの動作(&O):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" -msgstr "重複(&U)" +msgstr "複製(&U)" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:56 msgid "DOS-like with virtual paths" msgstr "DOS 風の仮想パス" -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "危険なファイルの種類" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "データ" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." -msgstr "データ ソケットは早々に閉じられました." +msgstr "データ ソケットは早々に閉じられました。" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "日付" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "日付の書式" @@ -2876,69 +3144,69 @@ #: ../../locales/../src/interface/fileexistsdlg.cpp:49 msgid "Date/time unknown" -msgstr "日付/時刻 不明" +msgstr "日付/時刻が不明" #: ../../locales/../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" msgstr "デバッグ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "デバッグの設定" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" -msgstr "既定のローカル ディレクトリ(&L):" +msgstr "デフォルトのローカル ディレクトリ(&L):" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:48 msgid "Default (Autodetect)" -msgstr "既定値 (自動検出)" +msgstr "デフォルト (自動検出)" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." -msgstr "既定のエディタが引用符で適切に囲まれていません." +msgstr "デフォルトのエディターが引用符で適切に囲まれていません。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" -msgstr "既定のファイルが存在したときの動作" +msgstr "ファイル存在時のデフォルトの動作" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" -msgstr "既定のリモート ディレクトリ(&E):" +msgstr "デフォルトのリモート ディレクトリ(&E):" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." msgstr "" -"既定のリモート パスを構文解析できません. 選択されたサーバの種類での正しい絶対" -"パスか確認してください." +"デフォルトのリモート パスを構文解析できません。選択したサーバーの種類に有効な" +"絶対パスであることを確認してください。" -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" -msgstr "既定のシステム言語" +msgstr "デフォルトのシステム言語" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" -msgstr "既定の転送モード:" +msgstr "デフォルトの転送モード:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" -msgstr "既定の転送の種類:" +msgstr "デフォルトの転送の種類:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" -msgstr "既定値: http://ip.filezilla-project.org/ip.php" +msgstr "デフォルト: http://ip.filezilla-project.org/ip.php" #: ../../locales/../src/interface/settings/optionspage_connection.cpp:41 msgid "" "Delay between failed connection attempts has to be between 1 and 999 seconds." -msgstr "接続の試行に失敗している間の遅延は 1 から 999 秒の範囲になります." +msgstr "接続の試行に失敗している間の遅延は 1 から 999 秒の範囲になります。" -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2948,207 +3216,207 @@ "attempt..." msgstr[0] "前回の接続失敗から %d 秒間再接続を遅延させています..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" -msgstr "サイト マネージャのエントリを削除" +msgstr "サイト マネージャー エントリの削除" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" -msgstr "選択されたディレクトリを削除" +msgstr "選択したディレクトリを削除" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" -msgstr "選択されたファイルとフォルダを削除" +msgstr "選択したファイルとフォルダーを削除" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "ディレクトリを削除中 \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "%u 個のファイルを \"%s\" から削除中" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "ディレクトリを削除中" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "関連しない複数のディレクトリの削除には未対応です" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3194 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" -msgstr "シンボリック リンクを削除中" +msgstr "シンボリックリンクを削除中" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "デスクトップ" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "詳細" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "新しい鍵の詳細:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:742 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "FileZilla の新しいバージョンをチェック" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "ディレクトリ(&C)" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "方向" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "ディレクトリ:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "ディレクトリ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2766 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:323 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:463 -#: ../../locales/../src/interface/Mainfrm.cpp:2221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "ディレクトリのアクセス許可" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "ディレクトリを比較" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "ディレクトリの比較に失敗しました" #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71 msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "" -"ログファイルを含むディレクトリが存在しないかファイル名が正しくありません." +"ログ ファイルを含むディレクトリが存在しないかファイル名が正しくありません。" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "ディレクトリ リストのフィルター(&F)..." -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" -msgstr "ディレクトリ一覧の表示はユーザにより中断されました" +msgstr "ディレクトリ リストの表示はユーザーにより中断されました" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" -msgstr "ディレクトリ一覧取得に失敗しました" +msgstr "ディレクトリ リスト取得に失敗しました" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" -msgstr "ディレクトリ一覧フィルタ" +msgstr "ディレクトリ リストのフィルター" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" -msgstr "ディレクトリ一覧の表示成功 \"%s\"" +msgstr "\"%s\" のディレクトリ リストの表示成功" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" -msgstr "ディレクトリ一覧の表示成功" +msgstr "ディレクトリ リストの表示成功" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "すべて無効にする(&B)" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "同期ブラウジングを無効にしてリモート ディレクトリの変更を継続しますか?" -#: ../../locales/../src/interface/Mainfrm.cpp:660 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" -"ファイルが正しく表示されない場合は, このオプションを無効にしてください." +"ファイルが正しく表示されない場合は、このオプションを無効にしてください。" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" -msgstr "サーバから切断" +msgstr "サーバーから切断" -#: ../../locales/../src/engine/ControlSocket.cpp:79 -#: ../../locales/../src/engine/ControlSocket.cpp:881 -#: ../../locales/../src/engine/ControlSocket.cpp:985 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:890 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:892 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" -msgstr "サーバから切断されました" +msgstr "サーバーから切断されました" -#: ../../locales/../src/engine/ControlSocket.cpp:1016 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:906 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" -msgstr "サーバから切断されました: %s" +msgstr "サーバーから切断されました: %s" -#: ../../locales/../src/interface/queue.cpp:380 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" -msgstr "以前のサーバから切断しています" +msgstr "前のサーバーから切断しています" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" -msgstr "現在表示されているサーバから切断" +msgstr "現在表示されているサーバーから切断" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "ダイアログについて表示" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" -msgstr "既定のエディタを使用しない(&N)" +msgstr "デフォルトのエディターを使用しない(&N)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "何もしない(&N)" - -# -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" -msgstr "選択されたファイルは既に編集中です(&A)" +msgstr "既に編集中のすべての選択したファイルで同じ操作を行う(&A)" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 -#: ../../locales/../src/interface/Mainfrm.cpp:1170 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "FileZilla を本当に終了しますか?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" -msgstr "サイト マネージャのエントリと転送キューを本当に削除しますか?" +msgstr "サイト マネージャー エントリと転送キューを本当に削除しますか?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" -msgstr "サイト マネージャのすべてのエントリを本当に削除しますか?" +msgstr "すべてのサイト マネージャー エントリを本当に削除しますか?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" -msgstr "選択されたエントリを本当に削除しますか?" +msgstr "選択したエントリを本当に削除しますか?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "転送キューを本当に削除しますか?" -#: ../../locales/../src/interface/Mainfrm.cpp:599 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" -msgstr "'%s' をサーバに本当に送信しますか?" +msgstr "'%s' をサーバーに本当に送信しますか?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "このファイルを開き直しますか?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3344 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "ドキュメント" @@ -3156,47 +3424,48 @@ msgid "Don't use external IP address on &local connections." msgstr "ローカル接続に外部 IP アドレスを使用しません(&L)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" -msgstr "ドット ファイルはファイル名がドットで始まっているもの, 例: .htaccess" +msgstr "" +"ドットファイルとはファイル名がドットで始まるファイルです。 例: .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "ダブルクリック時の動作" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "ダウンロード" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3546 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "ダウンロード制限(&L):" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "ダウンロード制限: %s/秒" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "ダウンロード制限: なし" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3093 -#: ../../locales/../src/interface/search.cpp:518 -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "検索結果をダウンロード" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "選択したディレクトリをダウンロード" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "選択したファイルとディレクトリをダウンロード" -#: ../../locales/../src/interface/Mainfrm.cpp:976 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3205,59 +3474,51 @@ "ダウンロード速度: %s/s\n" "アップロード速度: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1100 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "ダウンロード中" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:337 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "%s をダウンロード中" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "関連しない複数のディレクトリのダウンロードには未対応です" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "検索結果をダウンロード中" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "ダウンロード中..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:107 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:87 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." -msgstr "FileZilla の異なるインスタンス間でのドラッグ & ドロップは未実装です." +msgstr "FileZilla の異なるインスタンス間でのドラッグ＆ドロップは未実装です。" -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:93 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." -msgstr "異なるサーバ間でのドラッグ & ドロップは未実装です." +msgstr "異なるサーバー間でのドラッグ＆ドロップは未実装です。" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 msgid "Dupl&icate" -msgstr "重複(&I)" +msgstr "複製(&I)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "すべて有効にする(&N)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" -msgstr "ディレクトリを入力(&N)" +msgstr "ディレクトリを開く(&N)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "実行(&X)" @@ -3265,149 +3526,172 @@ msgid "E&xit" msgstr "終了(&X)" -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 +msgid "E&xport..." +msgstr "エクスポート(&X)..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "メール:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." -msgstr "各フィルタは少なくとも 1 つの条件を必要とします." +msgstr "各フィルターは少なくとも 1 つの条件を必要とします。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" -msgstr "フィルタを編集" +msgstr "フィルターを編集" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." -msgstr "設定されたエディタでファイルを編集しサーバに変更をアップロードします." +msgstr "" +"設定されたエディターでファイルを編集し、変更をサーバーにアップロードします。" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "複数ディレクトリの編集には未対応です" -#: ../../locales/../src/interface/LocalListView.cpp:1582 -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "編集に失敗" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "検索結果を編集中" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "メール:" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "空コマンド" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 msgid "Empty command." -msgstr "コマンドが空です." +msgstr "コマンドが空です。" -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" -msgstr "空のディレクトリ一覧" +msgstr "空のディレクトリ リスト" #: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." -msgstr "ディレクトリが空です." +msgstr "ディレクトリが空です。" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." -msgstr "ファイルの拡張子を空です." +msgstr "ファイルの拡張子を空です。" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." -msgstr "空のフィルタ名は認められていません." +msgstr "空のフィルター名は認められていません。" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "名前を空にする" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 msgid "Empty quoted string." -msgstr "引用符で囲まれた文字列を空にします." +msgstr "引用符で囲まれた文字列が空です。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "すべて有効にする(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "正しくない文字のフィルタリングを有効にする(&F)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" -msgstr "暗号化された" +msgstr "暗号化属性" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "暗号化" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "暗号化鍵(&K):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "暗号化鍵(&K):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "暗号化の詳細" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" -msgstr "比較を終了してソート順を変更しますか?" +msgstr "比較を終了して並べ替え順を変更しますか?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "比較を終了してクイック検索を開きますか?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "カスタム コマンドを入力(&C)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3587 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." -msgstr "速度を無制限にするには 0 を入力してください." +msgstr "速度を無制限にするには 0 を入力してください。" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "コマンドを入力" -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "カスタム コマンドを入力" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" -msgstr "ディレクトリに入る" +msgstr "ディレクトリに移動" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" -msgstr "フィルタ名を入力" +msgstr "フィルター名を入力" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "マスター パスワードを入力" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" -msgstr "フィルタ セット名を入力" +msgstr "フィルターセット名を入力" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" -msgstr "フィルタ セットの新しい名前を入力" +msgstr "フィルターセットの新しい名前を入力" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "パスワードを入力" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" -msgstr "選択されたディレクトリに入る" +msgstr "選択したディレクトリに移動" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3415,167 +3699,184 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"サーバのアドレスを入力してください.\n" -"サーバ プロトコルを指定するにはホストの前にプロトコル識別子を追加してくださ" -"い. プロトコルを指定しない場合は既定のプロトコル (ftp://) を使用します.\n" +"サーバーのアドレスを入力してください。\n" +"サーバー プロトコルを指定するにはホストの前にプロトコル識別子を追加してくださ" +"い。プロトコルを指定しない場合はデフォルトのプロトコル (ftp://) を使用しま" +"す。\n" "ここではフォームに protocol://user:pass@host:port 形式の完全な URL も入力で" -"き, その場合は他の欄の値が上書きされます.\n" +"き、その場合は他の欄の値が上書きされます。\n" "\n" "対応しているプロトコル:\n" "- ftp:// 通常の FTP\n" -"- sftp:// SSH を用いたファイル転送プロトコル\n" -"- ftps:// FTP over TLS (明示的)\n" -"- ftpes:// FTP over TLS (暗黙)" +"- sftp:// SSH を用いた FTP\n" +"- ftps:// FTP over TLS (暗黙的)\n" +"- ftpes:// FTP over TLS (明示的)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:270 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" -"ファイル '%s' のパスワードを入力してください.\n" -"変換後のファイルはパスワード保護されないことにご注意ください." +"ファイル '%s' のパスワードを入力してください。\n" +"変換後のファイルは同じパスワードで保護されます。" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"サーバが待ち受けているポートを入力してください.\n" -"FTP の既定値は 21, SFTP の既定値は 22 です." +"サーバーが待機するポートを入力します。FTP のデフォルトは 21、SFTP のデフォル" +"トは 22 です。" -#: ../../locales/../src/interface/loginmanager.cpp:66 +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "ユーザー名を入力" + +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" -msgstr "ユーザ名とパスワードを入力" +msgstr "ユーザー名とパスワードを入力" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "エラー" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "設定のエクスポート エラー" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "インポート エラー" -#: ../../locales/../src/interface/QueueView.cpp:1920 +#: ../../locales/../src/interface/QueueView.cpp:1663 msgid "Error loading queue" msgstr "キューの読み込みエラー" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:213 -#: ../../locales/../src/interface/filter.cpp:970 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1841 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:434 -#: ../../locales/../src/interface/sitemanager.cpp:515 -#: ../../locales/../src/interface/sitemanager.cpp:565 -#: ../../locales/../src/interface/sitemanager.cpp:664 -#: ../../locales/../src/interface/sitemanager.cpp:741 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:735 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:793 -#: ../../locales/../src/interface/wrapengine.cpp:937 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "xml ファイルの読み込みエラー" -#: ../../locales/../src/interface/QueueView.cpp:1830 +#: ../../locales/../src/interface/QueueView.cpp:1556 msgid "Error saving queue" msgstr "キューの保存エラー" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:96 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "プログラムの開始エラー" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1859 -#: ../../locales/../src/interface/sitemanager.cpp:609 -#: ../../locales/../src/interface/sitemanager.cpp:719 -#: ../../locales/../src/interface/sitemanager.cpp:773 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:814 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2114 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "xml ファイルの書き込みエラー" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:278 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "エラー:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "例: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "例" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "実行(&C)" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" -"実行ファイルがバージョン情報を含んでいないため更新をチェックできません." +"実行ファイルがバージョン情報を含んでいないため更新をチェックできません。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" -msgstr "エクスプローラ" +msgstr "エクスプローラー" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "フィルターのエクスポート(&F)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "キューをエクスポート(&Q)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "設定をエクスポート(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "設定をエクスポート" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" -msgstr "フィルタ名(&I):" +msgstr "フィルター名(&I):" #: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:508 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - ファイル転送プロトコル" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - ファイル転送プロトコル (任意の暗号化付き)" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - セキュアではないファイル転送プロトコル" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "FTP エンジンが初期化されていないため接続できません" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" -msgstr "FTP キープ アライブ" +msgstr "FTP キープアライブ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP プロキシ" @@ -3589,189 +3890,210 @@ "FTP uses secondary connections for data transfers. These additional " "connections can be established in two ways." msgstr "" -"FTP はデータ転送に二次的な接続を使用します. これらの付加的な接続は 2 通りの方" -"法で確立できます." +"FTP はデータ転送に二次的な接続を使用します。これらの付加的な接続は 2 通りの方" +"法で確立できます。" -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP: ファイルの種類" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" -msgstr "FTPES - FTP over TLS(明示的)" +msgstr "FTPES - FTP over TLS (明示的)" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" -msgstr "FTPS - FTP over TLS(暗黙)" +msgstr "FTPS - FTP over TLS (暗黙的)" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1778 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "ディレクトリ変更に失敗しました" -#: ../../locales/../src/interface/FileZilla.cpp:137 -#: ../../locales/../src/interface/FileZilla.cpp:152 -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "言語変更に失敗しました" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1920 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "8 ビット文字コードへ変換するコマンドに失敗しました" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "サイトのコピーまたは移動に失敗しました" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" -msgstr "xmlファイルの複製の作成に失敗しました" +msgstr "xml ファイルの複製の作成に失敗しました" -#: ../../locales/../src/interface/netconfwizard.cpp:802 -msgid "Failed to create listen socket, aborting" -msgstr "リッスン ソケットの生成に失敗しました. 中止しています." +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "ポート %d でリッスン ソケットの生成に失敗したので、中止しています。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4070 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" -msgstr "アクティブ モード転送のためのリスニング ソケット生成に失敗しました." +msgstr "アクティブ モード転送のためのリスニング ソケットの生成に失敗しました" -#: ../../locales/../src/interface/LocalTreeView.cpp:623 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "サーバーのパスワードを復号化できませんでした。" + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "'マイ ドキュメント' のパス取得に失敗しました" -#: ../../locales/../src/interface/LocalTreeView.cpp:611 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "デスクトップへのパスの取得に失敗しました" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" -"コントロール接続のピアアドレスの取得に失敗しましたので, 接続を閉じました." +"コントロール接続のピア アドレスの取得に失敗しましたので、接続を閉じました。" -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." -msgstr "データ接続のピアアドレスの取得に失敗しましたので, 接続を閉じました." +msgstr "データ接続のピア アドレスの取得に失敗しましたので、接続を閉じました。" -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" -msgstr "FTPエンジンの初期化に失敗しました." +msgstr "FTP エンジンの初期化に失敗しました" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:301 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." -msgstr "TLS の初期化に失敗しました." +msgstr "TLS の初期化に失敗しました。" + +#: ../../locales/../src/interface/FileZilla.cpp:97 +msgid "Failed to initialize networking" +msgstr "ネットワークの初期化に失敗しました" #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" -msgstr "パネルのロードに失敗しました. リソース ファイルが正しくありませんか?" +msgstr "" +"パネルの読み込みに失敗しました。リソース ファイルが正しくない可能性がありま" +"す。" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:289 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "秘密鍵の読み込みに失敗しました: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "追加/書き込み用に \"%s\" を開くのに失敗しました" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "読み取り用に \"%s\" を開くのに失敗しました" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1018 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "書き込み用に \"%s\" を開くのに失敗しました" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." -msgstr "返されたパスの構文解析に失敗しました." +msgstr "返されたパスの構文解析に失敗しました。" -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" -msgstr "データの受信に失敗しました." +msgstr "データの受信に失敗しました" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" -msgstr "ディレクトリ一覧表示の取り出しに失敗しました" +msgstr "ディレクトリ リスト表示の取り出しに失敗しました" -#: ../../locales/../src/interface/netconfwizard.cpp:730 -msgid "Failed to retrieve external ip address, aborting" -msgstr "外部 IP アドレスの取得に失敗しました. 中止しています" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "外部 IP アドレスの取得に失敗したので、中止しています。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3781 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "" -"外部 IP アドレスの取得に失敗しましたので, ローカル アドレスを使用しています" +"外部 IP アドレスの取得に失敗したので、ローカル アドレスを使用しています。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3802 -msgid "Failed to retrieve local ip address." -msgstr "ローカル IP アドレスの取得に失敗しました." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "ローカル IP アドレスの取得に失敗したので、中止しています。" -#: ../../locales/../src/interface/netconfwizard.cpp:706 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "ローカル IP アドレスの取得に失敗しました. 中止しています" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "ローカル IP アドレスの取得に失敗しました。" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." -msgstr "外部 IP アドレスの取得に失敗しました." +msgstr "外部 IP アドレスの取得に失敗しました。" -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." -msgstr "コマンドの送信に失敗しました." +msgstr "コマンドの送信に失敗しました。" -#: ../../locales/../src/interface/FileZilla.cpp:152 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" -msgstr "%s (%s) への言語設定に失敗しました, 既定のシステム言語を使用します" +msgstr "" +"%s (%s) への言語設定に失敗しました、デフォルトのシステム言語を使用します" -#: ../../locales/../src/interface/FileZilla.cpp:130 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" -"%s (%s) への言語設定に失敗しました, 既定のシステム言語 (%s, %s) を使用します." +"%s (%s) への言語設定に失敗しました、デフォルトのシステム言語 (%s, %s) を使用" +"します。" -#: ../../locales/../src/interface/FileZilla.cpp:119 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." -msgstr "%s (%s) への言語設定に失敗しました, 既定のシステム言語を利用します." +msgstr "" +"%s (%s) への言語設定に失敗しました、デフォルトのシステム言語を利用します。" -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" -msgstr "%s への言語設定に失敗しました, 既定のシステム言語を使用します" +msgstr "%s への言語設定に失敗しました、デフォルトのシステム言語を使用します" -#: ../../locales/../src/interface/FileZilla.cpp:126 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." -msgstr "%s への言語設定に失敗しました, 既定のシステム言語を使用します (%s, %s)" +msgstr "" +"%s への言語設定に失敗しました、デフォルトのシステム言語を使用します (%s, %s)" -#: ../../locales/../src/interface/FileZilla.cpp:116 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." -msgstr "%s への言語設定に失敗しました, 既定のシステム言語を使用します." +msgstr "%s への言語設定に失敗しました、デフォルトのシステム言語を使用します。" -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "設定を有効にするのに失敗しました" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "ピア証明書の検証に失敗しました" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "ファイル %s への書き込みに失敗しました" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" -msgstr "xmlファイルへの書き込みに失敗しました" +msgstr "xml ファイルへの書き込みに失敗しました" #: ../../locales/../src/interface/queueview_failed.cpp:16 msgid "Failed transfers" @@ -3781,35 +4103,31 @@ msgid "Fall back to active mode" msgstr "アクティブ モードに戻る" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2286 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "ファイル(&E):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "ファイル(&E)" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "ファイル" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "ファイルの種類" - -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" -msgstr "" +msgstr "ファイル記述子はソケットではありません" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." -msgstr "ファイルはインポートできるデータを含んでいません." +msgstr "ファイルはインポートできるデータを含んでいません。" #: ../../locales/../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "ファイルの編集" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "ファイルが存在します" @@ -3817,71 +4135,75 @@ msgid "File exists action" msgstr "ファイル存在時の動作" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "ファイルは変更されています" #: ../../locales/../src/interface/settings/settingsdialog.cpp:106 msgid "File lists" -msgstr "ファイル一覧" +msgstr "ファイル リスト" -#: ../../locales/../src/interface/edithandler.cpp:1551 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "ファイルが見つかりません" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "ファイル検索" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" -msgstr "ファイル転送はユーザによって中断されました" +msgstr "ファイル転送はユーザーによって中断されました" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" -msgstr "%s (%s) の転送後にユーザによりファイル転送が中止されました" +msgstr "%s (%s) の転送後にユーザーによりファイル転送が中止されました" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "ファイル転送に失敗しました" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "%s (%s) の転送後にファイル転送が失敗しました" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "ファイル転送はスキップされました" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "ファイル転送が成功しました" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "%s (%s) のファイル転送に成功しました" -#: ../../locales/../src/interface/Mainfrm.cpp:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." -msgstr "ファイル転送はまだ進行中です." +msgstr "ファイル転送はまだ進行中です。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." -msgstr "ファイルはデータの種類 ASCII で転送されます." +msgstr "ファイルはデータの種類 ASCII で転送されます。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2522 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." -msgstr "ファイルはデータの種類バイナリで転送されます." +msgstr "ファイルはデータの種類バイナリで転送されます。" -#: ../../locales/../src/interface/FileZilla.cpp:407 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Filezilla エラー" @@ -3889,140 +4211,148 @@ msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." -msgstr "FileZilla ではすべての設定が適切か確認するために設定をテストできます." +msgstr "FileZilla ではすべての設定が適切か確認するために設定をテストできます。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3468 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." -msgstr "FileZilla は既にサーバに接続されています." +msgstr "FileZilla は既にサーバーに接続されています。" -#: ../../locales/../src/interface/Mainfrm.cpp:1477 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." -msgstr "言語設定を有効にするには, FileZilla を再起動する必要があります." +msgstr "言語設定を有効にするには、FileZilla を再起動する必要があります。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Filezilla 更新" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" -msgstr "ファイル一覧のステータス バー(&B)" +msgstr "ファイル リストのステータス バー(&B)" -#: ../../locales/../src/interface/edithandler.cpp:1085 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:38 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" -msgstr "ファイル名" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "ファイル名のフィルタ(&F)..." +msgstr "名前" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2970 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2159 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" -msgstr "" -"ファイル名にはディレクトリ %s とファイル名 %s を含めることはできません." +msgstr "ファイル名にはディレクトリ %s とファイル名 %s を含めることはできません" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "ファイル名が不正です" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "ファイル名は変更されませんでした" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "ファイル名:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "ファイル名には次の文字は使用できません: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "ファイル名には次の文字は使用できません: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "編集中のファイルがあります" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "" +"フィルター ルールに一致するファイルは、ディレクトリ リストから削除されます。" + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "ファイルが見つかりません" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" -msgstr "ファイルサイズ" +msgstr "サイズ" #: ../../locales/../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "ファイルサイズの書式" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" -msgstr "ファイルの種類" +msgstr "種類" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "ファイルの種類の関連付け" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" -msgstr "フィルタの適用先:" +msgstr "フィルターの適用先:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" -msgstr "ファイル名の不正な文字をフィルタ" +msgstr "ファイル名の不正な文字をフィルター" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" -msgstr "フィルタ名は既に存在しています" +msgstr "フィルター名は既に存在しています" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" -msgstr "以下のすべてに一致する項目を非表示" +msgstr "以下のすべてに一致するアイテムを非表示" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" -msgstr "以下のいずれかに一致する項目を非表示" +msgstr "以下のいずれかに一致するアイテムを非表示" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" -msgstr "以下のどれにも一致しない項目を非表示" +msgstr "以下のどれにも一致しないアイテムを非表示" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "以下のいずれかに一致しないアイテムを非表示" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" -msgstr "フィルタ セットは既に存在しています" +msgstr "フィルターセットは既に存在しています" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" -msgstr "ディレクトリ一覧をフィルタ" +msgstr "ディレクトリ リストをフィルター" #: ../../locales/../src/interface/filteredit.cpp:337 #: ../../locales/../src/interface/filteredit.cpp:345 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter validation failed" -msgstr "フィルタの検証に失敗しました" +msgstr "フィルターの検証に失敗しました" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3051 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "ファイル検索(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "ディレクトリ検索(&I)" @@ -4034,60 +4364,67 @@ msgid "Fingerprint (SHA-256):" msgstr "指紋 (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" msgstr "指紋:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" -msgstr "ファイアウォールとルータ設定ウィザード" +msgstr "ファイアウォールとルーター設定ウィザード" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." msgstr "" -"これらのオプションについての詳細情報を得るには, ネットワーク設定ウィザードを" -"起動してください." +"これらのオプションの詳細については、ネットワーク設定ウィザードを実行してくだ" +"さい。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 msgid "For reliability you should specify a range of at least 10 ports." -msgstr "信頼性確保のために, 少なくとも 10 ポートの範囲指定が必要です." +msgstr "信頼性確保のために、少なくとも 10 ポートの範囲指定が必要です。" -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." -msgstr "このセッションでは既定の設定を使用します. 設定の変更は保存されません." +msgstr "" +"このセッションではデフォルトの設定を使用します。設定の変更は保存されません。" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:481 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "&UTF-8 を強制" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "強制的に隠しファイルを表示(&H)" -#: ../../locales/../src/interface/Mainfrm.cpp:655 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "強制的に隠しファイルを表示" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "書式の仕様:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." -msgstr "書式: 拡張子の後に適切に引用符で囲まれたコマンドと引数が続きます." +msgstr "書式: 拡張子の後に適切に引用符で囲まれたコマンドと引数が続きます。" #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:646 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" -msgstr "" +msgstr "新しい %s %s が見つかりました\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3368 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "関数 %s は失敗しました" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "さらに詳しいドキュメント" @@ -4095,11 +4432,15 @@ msgid "General" msgstr "一般" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" -msgstr "SOCKS サーバの一般エラー" +msgstr "SOCKS サーバーの一般エラー" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "自動生成..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "汎用プロキシ" @@ -4108,143 +4449,156 @@ msgid "Get external IP address from the following URL:" msgstr "以下の URL から外部 IP アドレスを取得:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "ヘルプを取得" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" -"入力されたフィルタ セット名は既に存在しています. フィルタ セットを上書きしま" -"すか?" +"入力したフィルターセット名は既に存在します。フィルターセットを上書きしますか?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "グローバル ブックマーク" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS エラー %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" -msgstr "" +msgstr "GnuTLS エラー %d %s 内" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" -msgstr "" +msgstr "GnuTLS エラー %d %s 内: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS エラー %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Green" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" -msgstr "グループ パーミッション" +msgstr "グループのパーミッション" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "高(&I)" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP over TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "ハッシュ:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" -msgstr "隠された" +msgstr "隠しファイル属性" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:872 -#: ../../locales/../src/interface/queue.cpp:959 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "高い" -#: ../../locales/../src/interface/queue.cpp:874 -#: ../../locales/../src/interface/queue.cpp:961 +#: ../../locales/../src/interface/queue.cpp:938 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "最高" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." -msgstr "利用できるポートの最大値は 1024 から 65535 の範囲である必要があります." +msgstr "" +"利用可能なポートの最大値は 1024 から 65535 の範囲である必要があります。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" -"フィルタの状態を両側同時に切り替えるには, Shift キーを押したままにしてくださ" -"い." +"フィルターの状態を両側同時に切り替えるには、Shift キーを押したままにしてくだ" +"さい。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "ホームページ:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" -msgstr "" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 -msgid "Host key fingerprint:" -msgstr "ホスト鍵の指紋:" +msgstr "ホストがダウンしています" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "ホスト鍵が一致しません" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." -msgstr "ホストが '[' で始まっていますが閉じ括弧がありません." +msgstr "ホストが '[' で始まっていますが閉じ括弧がありません。" -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "ホストに到達できません" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "ホスト:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:357 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "ホスト鍵アルゴリズム:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "時間," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"マスター パスワードを忘れてしまいました。この鍵で保存されているすべてのパス" +"ワードを削除します。(&F)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (例: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 アドレスは SOCKS4 プロキシではサポートされていません" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " "reconnect." msgstr "" -"操作中に指定された時間を超えてもデータが送受信されない場合は, 接続が切断され" -"て FileZilla は再接続を試みます." +"操作中に指定された時間を超えてもデータが送受信されない場合は、接続は閉じら" +"れ、FileZilla は再接続を試みます。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" -"バグを報告していただく場合は, ログ レベル \"詳細\" のログ提供をお願いします." +"バグを報告していただく場合は、ログ レベル \"詳細\" のログ提供をお願いします。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" @@ -4253,209 +4607,212 @@ "you should try active mode. You can set the transfer mode on a per-server " "basis in the Site Manager." msgstr "" -"ウィザードの最後で自動テストが成功していて特定のサーバに対してファイルを転送" -"できない場合は, サーバの設定が間違っているかもしれないためアクティブ モードを" -"試してください. サイト マネージャのサーバごとの基本設定で転送モードを設定でき" -"ます." +"ウィザードの最後で自動テストが成功していて特定のサーバーに対してファイルを転" +"送できない場合は、サーバーの設定が間違っているかもしれないためアクティブ モー" +"ドを試してください。サイト マネージャーのサーバーごとの基本設定で転送モードを" +"設定できます。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 msgid "" "If the fallback option is enabled, you will be able to connect to " "misconfigured servers which reject the selected transfer mode." msgstr "" -"フォールバック オプションを有効にすれば, 選択された転送モードを拒否する設定の" -"間違ったサーバに接続できるでしょう." +"フォールバック オプションを有効にすると、選択した転送モードを拒否する誤った設" +"定のサーバーに接続できるかもしれません。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." -msgstr "予期せずホスト鍵が変更された場合は, サーバの管理者に連絡してください." +msgstr "" +"予期せずホスト鍵が変更された場合は、サーバーの管理者に連絡してください。" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" -"問題が続く場合は, ルータ/ファイアウォールが FileZilla をブロックしているかも" -"しれません." +"問題が続く場合は、ルーター/ファイアウォールが FileZilla をブロックしているか" +"もしれません。" -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" -"問題が続く場合は, ルータ/ファイアウォールが接続を中断しているかもしれません." +"問題が続く場合は、ルーター/ファイアウォールが接続を中断しているかもしれませ" +"ん。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " "a new file gets created." msgstr "" -"ログファイルのサイズが制限に達した場合は, ファイル名の末尾に \".1\" を追加し" -"た名前に変更 (古いログファイルを上書きするかもしれません) して新規ファイルを" -"作成します." +"ログ ファイルのサイズが制限に達した場合は、ファイル名の末尾に \".1\" を追加し" +"た名前に変更して新規ファイルを作成します。(古いログ ファイルを上書きする可能" +"性があります)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." msgstr "" -"シンボリックリンクがディレクトリを指している場合, FileZilla はシンボリックリ" -"ンクまたはリンクされたディレクトリの内容のどちらかを削除できます." +"シンボリックリンクがディレクトリを指している場合、FileZilla はシンボリックリ" +"ンクまたはリンクされたディレクトリの内容のどちらかを削除できます。" -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" -"この問題が続く場合は, 解決のためにルータまたはファイアウォールの製造者に連絡" -"してください." +"この問題が解決しない場合は、ルーターまたはファイアウォールの製造元にお問い合" +"わせください。" -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." -msgstr "この問題が残るようであれば, ルータの製造者に連絡を取ってください." +msgstr "この問題が解決しない場合は、ルーターの製造元にお問い合わせください。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " "timezone offset in the site manager." msgstr "" -"'新しければ上書き' を使用する場合は, システム時刻はサーバと同期している必要が" -"あります. 時刻が異なっている場合 (例: 異なるタイムゾーン) は, サイト マネー" -"ジャでタイムゾーンのオフセットを指定してください." +"「元のファイルが新しければ上書き」を使用する場合は、システム時刻はサーバーと" +"同期している必要があります。時刻が異なっている場合 (例: 異なるタイムゾーン) " +"は、サイト マネージャーでタイムゾーンのオフセットを指定してください。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." msgstr "" -"タイムスタンプに基づいた比較を行う場合, タイムスタンプの差分がこの閾値を超え" -"ない場合は 2 つのファイルを同一と見なします." +"タイムスタンプに基づいた比較を行う場合は、タイムスタンプの差がこの閾値を超え" +"ない場合に 2 つのファイルを同一と見なします。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." -msgstr "言語の変更には FileZilla の再起動が必要です." +msgstr "言語の変更には FileZilla の再起動が必要です。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" "If you click on test, FileZilla will connect to probe.filezilla-project.org " "and will perform some simple tests." msgstr "" -"テストをクリックすると, FileZilla は probe.filezilla-project.org に接続して簡" -"単なテストを行います." +"テストをクリックすると、FileZilla は probe.filezilla-project.org に接続して簡" +"単なテストを行います。" -#: ../../locales/../src/interface/Mainfrm.cpp:1169 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." -msgstr "FileZilla を終了すると, 変更内容は破棄されます." +msgstr "FileZilla を終了すると、変更内容は破棄されます。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "" -"間違ったファイルの種類を入力すると, 転送時にファイルを破損してしまうかもしれ" -"ません." +"間違ったファイルの種類を入力すると、転送時にファイルを破損してしまうかもしれ" +"ません。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." -msgstr "エラーが出る場合は, 設定が正しくありません." +msgstr "エラーが出る場合は、設定が正しくありません。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." msgstr "" -"ディレクトリ一覧取得またはファイル転送に問題があれば, 既定の転送モードへの変" -"更を試してください." +"ディレクトリ リスト取得またはファイル転送に問題があれば、デフォルトの転送モー" +"ドへの変更を試してください。" -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " "passive mode and contact the server administrator for help." msgstr "" -"特定のサーバでの問題が続く場合は, サーバ自身またはリモート ルータ, ファイア" -"ウォールの設定が間違っているかもしれません. この場合, パッシブ モードへの切り" -"替えを試したり, サーバ管理者に問い合わせてみてください." +"特定のサーバーで問題が発生し続ける場合は、サーバー自体またはリモートのルー" +"ターまたはファイアウォールが誤って構成されている可能性があります。この場合、" +"パッシブモードへの切り替えを試したり、サーバー管理者に問い合わせてみてくださ" +"い。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 msgid "" "If you successfully complete the wizard and the final test succeeds, any " "firewalls and routers you have should be configured properly." msgstr "" -"ウィザードを正しく完了して最終テストに成功すると, お持ちのあらゆるファイア" -"ウォール/ルータが正しく設定されているはずです." +"ウィザードを正しく完了して最終テストに成功すると、お持ちのあらゆるファイア" +"ウォール/ルーターが正しく設定されているはずです。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 msgid "" "If you use a firewall, make sure FileZilla is allowed to accept connection " "on all given ports." msgstr "" -"ファイアウォールを利用している場合は, FileZilla が入力されたすべてのポートで" -"の接続の受理を許可することを確認してください." +"ファイアウォールを利用している場合は、FileZilla が指定したすべてのポートで受" +"信を許可しているか確認してください。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 msgid "" "If you use a router, make sure all these ports are forwarded to the machine " "you're running FileZilla on." msgstr "" -"ルータを利用している場合は, すべてのポートが FileZilla が動作しているマシンに" -"転送されることを確認してください." +"ルーターを利用している場合は、すべてのポートが FileZilla が動作しているマシン" +"に転送されることを確認してください。" -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "" -"ルータの IP アドレスが変化し続けるのであれば, ルータの製造者に連絡を取ってく" -"ださい." +"ルーターが IP アドレスを変更し続ける場合は、ルーターの製造元にお問い合わせく" +"ださい。" -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "古いバージョンからデータをインポート" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "設定をインポート" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "インポート成功" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 msgid "Improperly quoted association." -msgstr "引用符で不適切に囲まれた関連付け." +msgstr "引用符で不適切に囲まれた関連付け。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" "In active mode, FileZilla has to listen on a port for data transfers. You " "have to specify which ports FileZilla will use." msgstr "" -"アクティブ モードで, FileZilla はデータ転送のためにポートを開く必要がありま" -"す. FileZilla が使用するポートを指定する必要があります." +"アクティブ モードで、FileZilla はデータ転送のためにポートを開く必要がありま" +"す。FileZilla が使用するポートを指定する必要があります。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 msgid "" "In case you have a router, you will have to forward all available ports, as " "FileZilla has no influence on the ports your system chooses." msgstr "" -"ルータがある場合は, システムが選択したポートに FileZilla は関与しないものとし" -"て, すべての利用できるポートに転送すべきでしょう." +"ルーターがある場合は、システムが選択したポートに FileZilla は関与しないものと" +"して、すべての利用できるポートに転送すべきでしょう。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." msgstr "" "パッシブ モードを使用するために FileZilla は外部 IP アドレスを知る必要があり" -"ます." +"ます。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:52 msgid "" @@ -4463,115 +4820,137 @@ "server for a port and connects to the given port. Not much configuration has " "to be done for this." msgstr "" -"大部分のユーザに推奨のパッシブ モードでは, FileZilla はサーバにポートを要求し" -"て入力されたポートに接続します. ほとんどの設定はこのために行われる必要があり" -"ます." +"ほとんどのユーザーに推奨されるパッシブ モードでは、FileZilla はサーバーにポー" +"トを要求し、指定されたポートに接続します。そのため、この設定はあまり必要あり" +"ません。" -#: ../../locales/../src/engine/tlssocket.cpp:1036 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"不完全な証明書パスです, top certificate is not self-signed certificate " -"authority certificate" - -#: ../../locales/../src/interface/queue.cpp:378 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "パスワードが正しくありません" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." msgstr "" +"FileZilla の最新バージョンに関する情報を取得できませんでした。後でもう一度お" +"試しください。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "TLS を初期化しています..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 +msgid "Insecure algorithm!" +msgstr "安全ではない証明書です!" + +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." -msgstr "FTP over TLS に未対応のセキュアではないサーバです." +msgstr "FTP over TLS に未対応のセキュアではないサーバーです。" -#: ../../locales/../src/engine/server.cpp:834 -#: ../../locales/../src/engine/server.cpp:853 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:613 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "インタラクティブ" #: ../../locales/../src/interface/settings/settingsdialog.cpp:102 msgid "Interface" -msgstr "インタフェース" +msgstr "インターフェイス" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "シグナルにより中断されました" -#: ../../locales/../src/engine/ControlSocket.cpp:218 -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" -msgstr "ユーザにより中断されました" +msgstr "ユーザーにより中断されました" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/http/request.cpp:159 +#: ../../locales/../src/engine/http/request.cpp:582 msgid "Invalid Content-Length" msgstr "正しくないコンテンツ長" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:587 +#: ../../locales/../src/engine/http/request.cpp:488 msgid "Invalid HTTP Response" msgstr "正しくない HTTP レスポンス" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" -msgstr "" +msgstr "正しくない引数が渡されました" -#: ../../locales/../src/engine/ControlSocket.cpp:453 -#: ../../locales/../src/engine/ControlSocket.cpp:509 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." msgstr "" -"正しくない文字シーケンスを受信したため, UTF-8 を無効にしました. UTF-8 を強制" -"するにはサイト マネージャで UTF-8 オプションを選択してください." +"正しくない文字シーケンスを受信したため、UTF-8 を無効にしました。UTF-8 を強制" +"するにはサイト マネージャーで UTF-8 オプションを選択してください。" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../locales/../src/engine/http/request.cpp:703 msgid "Invalid chunk size" msgstr "正しくないチャンク サイズ" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" -msgstr "正しくないデータを受信しました." +msgstr "正しくないデータを受信しました" -#: ../../locales/../src/interface/verifycertdialog.cpp:40 -#: ../../locales/../src/interface/verifycertdialog.cpp:53 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "正しくない日付" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" -msgstr "ファイル名が適切ではありません" +msgstr "正しくないファイル名" + +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "正しくないハッシュ: %s\n" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." -msgstr "" -"正しくないホストです, after closing bracket only colon and port may follow." +msgstr "正しくないホストです、ホスト名の後はコロンとポートだけが続きます。" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "正しくないホスト名: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "正しくない入力" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:516 +msgid "Invalid line" +msgstr "正しくない行" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "正しくないパス" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" -"正しくないポートが入力されました. ポートは 1 から 65535 の範囲である必要があ" -"ります." +"正しくないポートが入力されました。ポートは 1 から 65535 の範囲である必要があ" +"ります。" -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4579,91 +4958,90 @@ "ftps:// for FTP over TLS (implicit) and\n" "ftpes:// for FTP over TLS (explicit)." msgstr "" -"正しくないプロトコルが指定されています. 正しいプロトコルは:\n" -"ftp:// 通常の FTP,\n" -"sftp:// SSH を用いたファイル転送プロトコル,\n" -"ftps:// FTP over TLS (明示的),\n" -"ftpes:// FTP over TLS (暗黙)." +"正しくないプロトコルが指定されています。正しいプロトコルは:\n" +"ftp:// 通常の FTP、\n" +"sftp:// SSH を用いた FTP、\n" +"ftps:// FTP over TLS (暗黙的)、\n" +"ftpes:// FTP over TLS (明示的)。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" -"正しくないプロキシホストです, after closing bracket only colon and port may " -"follow." +"正しくないプロキシ ホストです、ホスト名の後はコロンとポートだけが続きます。" -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "正しくない正規表現" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." -msgstr "検索条件内に正しくない正規表現があります." +msgstr "検索条件内に正しくない正規表現があります。" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:597 +#: ../../locales/../src/engine/http/request.cpp:497 msgid "Invalid response code" msgstr "正しくないレスポンス コード" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "正しくない検索条件: %s" -#: ../../locales/../src/interface/sitemanager.cpp:409 -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:466 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:752 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "正しくないサイト パス" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" -msgstr "状態におけるサイズが正しくありません" +msgstr "正しくないサイズの条件" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." -msgstr "正しくないユーザ名が入力されました." +msgstr "正しくないユーザー名が入力されました。" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" -msgstr "" +msgstr "ai_flags の値が正しくありません" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" -msgstr "" +msgstr "ヒントの値が正しくありません" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "反転フィルター" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "管轄する国:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "管轄する地方:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "管轄する都道府県:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "ディレクトリを常に先頭に" -#: ../../locales/../src/interface/Mainfrm.cpp:659 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " "some tests to check if the server supports this feature, the test may fail." msgstr "" -"このオプションを有効にするとすべてのサーバがこの機能をサポートしているわけで" -"はなく誤った一覧を返すかもしれないことに留意してください. FileZilla はサーバ" -"がこの機能に対応しているか確認するテストを行っていますが, テストは失敗するか" -"もしれません." +"このオプションを有効にするとすべてのサーバーがこの機能をサポートしているわけ" +"ではなく誤ったリストを返すかもしれないことに留意してください。FileZilla は" +"サーバーがこの機能に対応しているか確認するテストを行っていますが、テストは失" +"敗するかもしれません。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "鍵交換" @@ -4671,115 +5049,146 @@ msgid "Key exchange:" msgstr "鍵交換:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/engine/server.cpp:610 +#: ../../locales/../src/engine/server.cpp:635 +msgid "Key file" +msgstr "鍵ファイル" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "鍵識別子:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "最低(&O)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "言語" -#: ../../locales/../src/interface/Mainfrm.cpp:1477 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "言語が変更されました" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" -msgstr "最終更新日時" +msgstr "更新日時" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "レイアウト" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "既存のパスワードを保持するには、空のままにします。" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "同時ダウンロード数の上限(&D):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "同時アップロード数の上限(&U):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "ローカル ポートを制限" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" -msgstr "ログファイルの制限サイズ" +msgstr "ログ ファイルの制限サイズ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "制限:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/http/request.cpp:657 msgid "Line length exceeded" msgstr "行の長さを超えました" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" -msgstr "リンクされたもの" +msgstr "リンク ライブラリ" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "リッスン ソケットが閉じました" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:360 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "リスト:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" -msgstr "利用できるポートの最小値(&W):" +msgstr "利用可能なポートの最小値(&W):" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1369 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "ローカル" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" -msgstr "" +msgstr "使用中のローカル アドレス" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" -msgstr "" +msgstr "ローカル エンドポイントは閉じられています" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2230 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "ローカル ファイル" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." -msgstr "ローカル ファイルが存在しません." +msgstr "ローカル ファイルが存在しません。" -#: ../../locales/../src/interface/updater.cpp:370 -#: ../../locales/../src/interface/updater.cpp:462 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "ローカル ファイル %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." -msgstr "ローカル ファイルが通常ファイルではなくディレクトリです." +msgstr "ローカル ファイルが通常ファイルではなくディレクトリです。" -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." -msgstr "ローカル ファイルが正しいファイル名ではありません." +msgstr "ローカル ファイルが正しいファイル名ではありません。" + +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "ローカル ファイルの検索" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" -msgstr "ローカル フィルタ:" +msgstr "ローカル フィルター:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "ローカル パスの処理:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "ローカル サイト:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "'%s' のローカル サイズが予想サイズと一致しません: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "ローカル:" @@ -4787,38 +5196,42 @@ msgid "Log file" msgstr "ログ ファイル" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "ログインしました" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" -msgstr "ログ記録中" +msgstr "ログ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." msgstr "" -"ログイン データが非 ASCII 文字を含んでいて, サーバは UTF-8 に気付かないかも知" -"れません. プロキシを使用しているためローカル文字セットに戻せません." +"ログイン データが非 ASCII 文字を含んでいて、サーバーは UTF-8 に気付かないかも" +"知れません。プロキシを使用しているためローカルの文字コードに戻せません。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." msgstr "" -"ログイン データが非 ASCII 文字を含んでいて, サーバは UTF-8 に気付かないかも知" -"れません. ローカル文字セットを試しています." +"ログイン データが非 ASCII 文字を含んでいて、サーバーは UTF-8 に気付かないかも" +"知れません。ローカルの文字コードを試しています。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" -"ログイン シーケンスは完了しましたが, まだログインしていません. 中止していま" -"す." +"ログイン シーケンスは完了しましたが、まだログインしていません。中止していま" +"す。" #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." msgstr "" -"ログオンの種類は '尋ねる' または 'インタラクティブ' (引用符なし) である必要が" -"あります." +"ログオンの種類は 'パスワードを尋ねる' または 'インタラクティブ' (引用符なし) " +"である必要があります。" #: ../../locales/../src/interface/cmdline.cpp:11 #, c-format @@ -4826,426 +5239,475 @@ "Logontype, can only be used together with FTP URL. Argument has to be either " "'%s' or '%s'" msgstr "" -"ログオンの種類は FTP URL と同時に指定する必要があります. 引数は '%s' と '%s' " -"のどちらかである必要があります." +"ログオンの種類は FTP URL と同時に指定する必要があります。引数は '%s' と '%s' " +"のどちらかである必要があります。" -#: ../../locales/../src/interface/queue.cpp:867 -#: ../../locales/../src/interface/queue.cpp:954 +#: ../../locales/../src/interface/queue.cpp:931 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "低い" -#: ../../locales/../src/interface/queue.cpp:865 -#: ../../locales/../src/interface/queue.cpp:952 +#: ../../locales/../src/interface/queue.cpp:929 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "最低" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." -msgstr "利用できるポートの最小値は 1024 から 65535 の範囲である必要があります." +msgstr "" +"利用可能なポートの最小値は 1024 から 65535 の範囲である必要があります。" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" -"ファイルにアクセスでき, それが整形式の XML 文書であることを確認してください." +"ファイルにアクセスでき、それが整形式の XML 文書であることを確認してください。" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../locales/../src/engine/http/request.cpp:644 +#: ../../locales/../src/engine/http/request.cpp:650 +#: ../../locales/../src/engine/http/request.cpp:657 +#: ../../locales/../src/engine/http/request.cpp:668 +#: ../../locales/../src/engine/http/request.cpp:703 #, c-format msgid "Malformed chunk data: %s" -msgstr "正しくないチャンクデータ: %s" +msgstr "正しくないチャンク データ: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/http/request.cpp:159 #, c-format -msgid "Malformed header: %s" -msgstr "正しくないヘッダ: %s" +msgid "Malformed request header: %s" +msgstr "正しくないリクエスト ヘッダー: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:557 -msgid "Malformed reply, server not sending proper line endings" -msgstr "正しくない応答です, サーバが適切な改行文字を送信しません" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2572 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/engine/http/request.cpp:457 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:516 +#: ../../locales/../src/engine/http/request.cpp:572 +#: ../../locales/../src/engine/http/request.cpp:582 +#, c-format +msgid "Malformed response header: %s" +msgstr "正しくないレスポンス ヘッダー: %s" + +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +#, c-format +msgid "Malformed response: %s" +msgstr "正しくないレスポンス: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "手動転送" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "マスター パスワード(&P):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "マスター パスワード:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "すべての条件に一致" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3011 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "いずれかの条件に一致" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3012 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "どの条件にも一致しない" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "いずれかの条件に一致しない" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "最大同時転送数(&T):" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" -msgstr "" +msgstr "メモリ割り当てエラー" -#: ../../locales/../src/interface/Mainfrm.cpp:394 -#: ../../locales/../src/interface/Mainfrm.cpp:1804 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "メッセージ ログ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "メッセージ ログの位置" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "メッセージが長過ぎます" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "分" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "下に移動(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "上に移動(&U)" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" -msgstr "マイ コンピュータ" +msgstr "マイ コンピューター" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "マイ ドキュメント" -#: ../../locales/../src/interface/sitemanager.cpp:269 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:723 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:725 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "自分のサイト" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "利用不可" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "名前" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1162 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "名前は既に存在しています" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." -msgstr "ブックマーク名は既に存在しています." +msgstr "ブックマーク名は既に存在しています。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "名前:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "自然順" #: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" -msgstr "フィルタ名を入力する必要があります" +msgstr "フィルター名を入力する必要があります" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "正しいローカル パスを入力する必要があります" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "正しいリモート パスを入力する必要があります" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1000 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" -msgstr "文字エンコーディングを指定する必要があります" +msgstr "文字コードを指定する必要があります" -#: ../../locales/../src/engine/socket.cpp:1092 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" -msgstr "" +msgstr "ノード名も servname も提供されていないか、または不明です" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "" +"ネットワーク ホストは要求されたアドレス ファミリにネットワーク アドレスを持っ" +"ていません" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "ネットワークに到達できません" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "しない" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 msgid "New &Folder" -msgstr "新規フォルダ(&F)" +msgstr "新規フォルダー(&F)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" msgstr "新規タブ(&T)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2808 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "新規ブックマーク(&M)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2070 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "新規ブックマーク" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1310 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "新規ディレクトリ" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "%s での新機能と改善点" #: ../../locales/../src/interface/filteredit.cpp:131 msgid "New filter" -msgstr "新規フィルタ" +msgstr "新規フィルター" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:909 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" -msgstr "新規フォルダ" +msgstr "新規フォルダー" -#: ../../locales/../src/interface/sitemanager.cpp:583 -#: ../../locales/../src/interface/sitemanager.cpp:595 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2046 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "新規サイト" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "転送キューの隣" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "いいえ" -#: ../../locales/../src/engine/socket.cpp:1090 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" -msgstr "" +msgstr "ノード名に関連付けられたアドレスがありません" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" -msgstr "選択されたものをエクスポートするカテゴリがありません" +msgstr "選択したアイテムにはエクスポートするカテゴリがありません" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." -msgstr "コマンドが入力されていません. 中止しています." +msgstr "コマンドが入力されていないため、中止しています。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3753 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." -msgstr "外部 IP アドレスが設定されていないため, 既定値を試しています." +msgstr "外部 IP アドレスが設定されていないため、デフォルトを試しています。" -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." -msgstr "現在編集中のファイルはありません" +msgstr "現在編集中のファイルはありません。" #: ../../locales/../src/interface/filteredit.cpp:143 msgid "No filter name given" -msgstr "フィルタ名が入力されていません" +msgstr "フィルター名が入力されていません" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." -msgstr "ホストが入力されていません. ホストを入力してください." +msgstr "ホストが入力されていません。ホストを入力してください。" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "利用できる画像はありません" -#: ../../locales/../src/interface/QueueView.cpp:2991 -msgid "No more files in the queue!" -msgstr "キューにファイルはありません!" - -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." -msgstr "フィルタ セット名が入力されていません." +msgstr "フィルターセット名が入力されていません。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "ファイルの種類に関連付けられたプログラムがありません" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2892 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." -msgstr "拡張子 '%s' のファイルの編集に関連付けられたプログラムはありません." +msgstr "拡張子 '%s' のファイルの編集に関連付けられたプログラムはありません。" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" -msgstr "" +msgstr "ホストへのルートがありません" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "検索結果なし" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "利用できるサイトがありません" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "対応した SOCKS5 認証メソッドがありません" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." -msgstr "ユーザ名が入力されていません." +msgstr "ユーザー名が入力されていません。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:59 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "なし" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "まだ何も選択されていません" -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" -msgstr "" +msgstr "名前解決で回復不能の障害" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:830 -#: ../../locales/../src/engine/server.cpp:849 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:870 -#: ../../locales/../src/interface/queue.cpp:957 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1271 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 +#: ../../locales/../src/interface/queue.cpp:996 msgid "Normal" msgstr "通常" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." -msgstr "転送キューに再び入れられない項目がありました." +msgstr "転送キューに再び入れられないアイテムがありました。" -#: ../../locales/../src/interface/state.cpp:178 -#: ../../locales/../src/interface/state.cpp:480 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "未接続" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" -msgstr "どのサーバにも接続されていません" +msgstr "どのサーバーにも接続されていません" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." -msgstr "どのサーバにも接続されていません." +msgstr "どのサーバーにも接続されていません。" #: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." -msgstr "未接続です." +msgstr "未接続です。" -#: ../../locales/../src/engine/socket.cpp:1107 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" -msgstr "初期化されていません。WSAStartup を呼び出す必要があります。" +msgstr "初期化されていないため、WSAStartup を呼び出す必要があります" -#: ../../locales/../src/interface/Mainfrm.cpp:657 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." -msgstr "この機能は FTP プロトコルのみに対応していることにご注意ください." +msgstr "この機能は FTP プロトコルのみに対応していることにご注意ください。" + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "注意: 紛失した鍵は復元できません。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." -msgstr "注意: これは平文 (暗号化されていない FTP 接続) のみで機能します." +msgstr "注意: これは暗号化されていない平文での FTP 接続でのみ機能します。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" -"注意: 汎用プロキシを使用すると FTP 接続でパッシブ モードが強制されます." +"注意: 汎用プロキシを使用すると FTP 接続でパッシブ モードが強制されます。" + +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:650 +msgid "Null character in line" +msgstr "行内に NULL 文字が存在します" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "小数点以下の桁数:" #: ../../locales/../src/interface/settings/optionspage_connection.cpp:35 msgid "Number of retries has to be between 0 and 99." -msgstr "再試行回数は 0 から 99 になります." +msgstr "再試行回数は 0 から 99 の間でなければなりません。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "ファイルを開く(&P)" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2171 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2554 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2700 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2958 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3170 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3435 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "開く(&P)" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "OS バージョン:" @@ -5254,57 +5716,72 @@ "On the following pages, the selected transfer mode will be configured, as " "well as the fallback mode if enabled." msgstr "" -"有効になっている場合, 次のページで選択された転送モードはフォールバック モード" -"として設定されます." +"有効になっている場合、次のページで選択した転送モードはフォールバック モードに" +"設定されます。" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:834 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" -msgstr "一度だけ" +msgstr "1 度だけ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" -msgstr "1日に1回" +msgstr "1 日に 1 回" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" -msgstr "1週間に1回" +msgstr "1 週間に 1 回" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:525 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" -msgstr "" +msgstr "平文の FTP のみを使用する (安全でない)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "ファイルを開く(&E)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" -msgstr "システムのファイル マネージャのディレクトリを開く" +msgstr "システムのファイル マネージャーのディレクトリを開く" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" -msgstr "サイト マネージャを開く" +msgstr "サイト マネージャーを開く" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." -msgstr "サイト マネージャを開く." +msgstr "サイト マネージャーを開きます。" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." +msgstr "サイト マネージャーを開きます。サイトのリストを右クリックします。" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." msgstr "" +"ディレクトリ アクセス許可ダイアログを開き、FileZilla がアクセスできるローカ" +"ル ディレクトリを設定します。" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." -msgstr "ファイルを開きます." +msgstr "ファイルを開きます。" #: ../../locales/../src/interface/resources/xrc/menus.xrc:55 msgid "Open the settings dialog of FileZilla" msgstr "FileZilla の設定ダイアログを開く" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "開かれています:" -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1695 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "開くのに失敗" @@ -5314,141 +5791,149 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:9 msgid "Opens the Site Manager" -msgstr "サイト マネージャを開く" +msgstr "サイト マネージャーを開く" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" -"ディレクトリ一覧のフィルタ ダイアログを開きます. 右クリックでフィルタの ON/" -"OFF を切り替えます." +"ディレクトリ リストのフィルター ダイアログを開きます。右クリックでフィルター" +"の ON/OFF を切り替えます。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "オペレーティング システム:" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" -msgstr "操作はすでに進行中です." +msgstr "操作はすでに進行中です" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" -msgstr "操作はまだ進行中です." +msgstr "操作はまだ進行中です" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "操作はサポートされていません" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "オプション" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Orange" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "組織:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" -msgstr "そのほかの SFTP オプション" +msgstr "その他の SFTP オプション" -#: ../../locales/../src/engine/socket.cpp:1102 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" -msgstr "そのほかのシステムエラー" +msgstr "その他のシステム エラー" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "その他:" -#: ../../locales/../src/engine/socket.cpp:1052 -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "メモリ不足" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "概要" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "新しいければ上書き(&I)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "ファイルに上書き" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "サイズが異なればファイルに上書き" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "サイズが異なるか元のファイルが新しければファイルに上書き" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "元のファイルが新しければファイルに上書き" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "サイズが異なる場合は上書き(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "サイズが異なるか元のファイルが新しければ上書き(&Z)" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" -msgstr "" +msgstr "ビルド タイプ %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "所有者のパーミッション" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "所有者/グループ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "転送中や他の操作中にシステムがアイドル スリープに入るのを回避(&R)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "プロキシ ホスト(&R):" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." -msgstr "ルータまたはファイアウォールによって PORT コマンドは失われました." +msgstr "ルーターまたはファイアウォールによって PORT コマンドは失われました。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" -msgstr "パッシブ(推奨)(&S)" +msgstr "パッシブ (推奨)(&S)" -#: ../../locales/../src/interface/Mainfrm.cpp:2376 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" -msgstr "パラメータは有効な URL ではありません" +msgstr "パラメーターは有効な URL ではありません" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" -msgstr "" +msgstr "%d バイトのバージョン情報を解析します。\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "パスワード(&W):" @@ -5456,259 +5941,296 @@ msgid "Passive (recommended)" msgstr "パッシブ (推奨)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "パッシブ モード" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." -msgstr "パッシブ モードが既定の転送モードとして設定されています." +msgstr "パッシブ モードがデフォルトの転送モードとして設定されています。" + +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "パスワードまたは暗号化鍵が設定されていません" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:272 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "パスワードが必要" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "パスワード" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "パス" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3053 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2205 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "パスにはディレクトリ %s とサブディレクトリ %s を含めることはできません" -#: ../../locales/../src/interface/Mainfrm.cpp:2334 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "パスが見つかりません:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "パス" -#: ../../locales/../src/interface/edithandler.cpp:1112 -#: ../../locales/../src/interface/edithandler.cpp:1249 -#: ../../locales/../src/interface/edithandler.cpp:1339 -#: ../../locales/../src/interface/edithandler.cpp:1349 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "保留を取り除く" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "パーミッション" -#: ../../locales/../src/engine/socket.cpp:1045 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "アクセス拒否" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "パーミッション" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "プラットフォーム:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "FileZilla を使用するローカル ディレクトリを追加してください。" + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." msgstr "" -"https://filezilla-project.org/probe.php 上でサーバの挙動をチェックして再度注" -"意深く設定をチェックしてください." +"https://filezilla-project.org/probe.php 上でサーバーの挙動をチェックして再度" +"注意深く設定をチェックしてください。" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"許可されている権限を確認し、作業中の欠落しているローカル ディレクトリを次のダ" +"イアログで再追加してください。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." msgstr "" -"FileZilla が任意のポートに対して対外的な接続を確立できるように, ファイア" -"ウォールやルータを設定してください." +"FileZilla が任意のポートに対して対外的な接続を確立できるように、ファイア" +"ウォールやルーターを設定してください。" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" -"ルータ上の 'DMZ モード' や 'ゲーム モード' のような設定を無効にしてください." +"ルーター上の 'DMZ モード' や 'ゲーム モード' のような設定を無効にしてくださ" +"い。" -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." msgstr "" "安定したインターネット接続があることを確認して設定を再度注意深く確認してくだ" -"さい." +"さい。" #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 msgid "Please enter a custom date format." -msgstr "日付のカスタム書式を入力してください." +msgstr "日付のカスタム書式を入力してください。" #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 msgid "Please enter a custom time format." -msgstr "時刻のカスタム書式を入力してください." +msgstr "時刻のカスタム書式を入力してください。" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." -msgstr "日付を YYYY-MM-DD の形式で入力してください. 例: 2010-07-18" +msgstr "日付を YYYY-MM-DD の形式で入力してください。 例: 2010-07-18" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." -msgstr "ダウンロード速度制限 (0 %s/秒以上) を入力してください." +msgstr "ダウンロード速度制限 (0 %s/秒以上) を入力してください。" #: ../../locales/../src/interface/filteredit.cpp:136 msgid "Please enter a name for the new filter." -msgstr "新しいフィルタの名前を入力してください." +msgstr "新しいフィルターの名前を入力してください。" -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." -msgstr "複製されたフィルタの新しい名前を入力してください." +msgstr "複製したフィルターに新しい名前を入力してください。" -#: ../../locales/../src/interface/filter.cpp:389 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" -msgstr "フィルタ セット \"%s\" の新しい名前を入力してください" +msgstr "フィルターセット \"%s\" の新しい名前を入力してください" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." -msgstr "フィルタの新しい名前を入力してください." +msgstr "フィルターの新しい名前を入力してください。" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 msgid "" "Please enter a number between 0 and 10 for the number of concurrent " "downloads." -msgstr "同時ダウンロードの上限数として 0 から 10 の数字を入力してください." +msgstr "同時ダウンロードの上限数として 0 から 10 の数字を入力してください。" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 msgid "" "Please enter a number between 0 and 10 for the number of concurrent uploads." -msgstr "同時アップロードの上限数として 0 から 10 の数字を入力してください." +msgstr "同時アップロードの上限数として 0 から 10 の数字を入力してください。" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 msgid "" "Please enter a number between 1 and 10 for the number of concurrent " "transfers." -msgstr "同時転送の上限数として 1 から 10 の数字を入力してください." +msgstr "同時転送の上限数として 1 から 10 の数字を入力してください。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" -msgstr "このサーバのパスワードを入力してください:" - -#: ../../locales/../src/interface/QueueView.cpp:2120 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"実行するパスと実行ファイル名を入力してください.\n" -"例えば MS Windows では c:\\somePath\\file.exe, UNIX では /somePath/file .\n" -"また，プログラム引数を指定することもできます." +msgstr "このサーバーのパスワードを入力してください:" #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -"タイムアウトを入力してください (10 から 9999 秒. 0 はタイムアウトを無効にしま" -"す)." +"タイムアウトを入力してください。(10 - 9999 秒、0 はタイムアウトを無効にしま" +"す)" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" -msgstr "このフィルタ セットに一意の名前を入力してください." +msgstr "このフィルターセットに一意の名前を入力してください。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" -msgstr "このサーバのユーザ名を入力してください:" +msgstr "このサーバーのユーザー名を入力してください:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." -msgstr "正しいポートの範囲を入力してください." +msgstr "正しいポートの範囲を入力してください。" -#: ../../locales/../src/interface/netconfwizard.cpp:176 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "外部アドレスを取得するための URL を入力してください" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." -msgstr "アップロード速度制限 (0 %s/秒以上) を入力してください." +msgstr "アップロード速度制限 (0 %s/秒以上) を入力してください。" -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." msgstr "" -"生の FTP コマンドを入力してください.\n" -"生の ftp コマンドを使用するとディレクトリのキャッシュをクリアできるでしょう." +"生の FTP コマンドを入力してください。\n" +"生の ftp コマンドを使用するとディレクトリのキャッシュをクリアできるでしょう。" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"実行するパスと実行ファイル名を入力してください。\n" +"例えば MS Windows では c:\\somePath\\file.exe、UNIX では /somePath/file。\n" +"また、プログラム引数を指定することもできます。" + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "作成するディレクトリ名を入力してください:" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "作成するファイル名を入力してください:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" -msgstr "このサーバのユーザ名とパスワードを入力してください:" +msgstr "このサーバーのユーザー名とパスワードを入力してください:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"パスワード設定を変更するには、現在のマスター パスワードを入力してください。" + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "外部 IP アドレスを入力してください" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " "address, use the external resolver option." msgstr "" "このウィザードのアクティブ モードのページで外部 IP アドレスを入力してくださ" -"い. 動的アドレスを使用していたり外部アドレスが分からない場合は, 外部リゾルバ " -"オプションを使用してください." +"い。動的アドレスを使用していたり外部アドレスが分からない場合は、外部リゾル" +"バー オプションを使用してください。" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"このサーバーのパスワードを解読するには、マスター パスワードを入力してくださ" +"い:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." msgstr "" -"誤った設定を防ぎ FTP 接続を成功させるために, 注意深く指示に従ってください." +"誤った設定を防ぎ FTP 接続を成功させるために、注意深く指示に従ってください。" -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." msgstr "" -"FileZilla が外部に接続確立するのを許可されていることと, アドレス リゾルバのア" -"ドレスが正しく入力されていることを確認してください." +"FileZilla が外部に接続確立するのを許可されていることと、アドレス リゾルバーの" +"アドレスが正しく入力されていることを確認してください。" -#: ../../locales/../src/interface/FileZilla.cpp:136 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" -"要求されたロケールがあなたのシステムにインストールされていることを確認してく" -"ださい." +"要求されたロケールがシステムにインストールされていることを確認してください。" -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " "manual port forwarding. Don't run your router in the so called 'DMZ mode' or " "'game mode'." msgstr "" -"ルータの利用できる最新のファームウェアを確認してください. その上で, ルータを" -"適切に設定すべきです. 手動ポート転送を利用すべきでしょう. 'DMZ モード' や " -"'ゲーム モード' と呼ばれるもののルータでの起動はできません." +"ルーターの利用できる最新のファームウェアを確認してください。その上で、ルー" +"ターを適切に設定すべきです。手動ポート転送を利用すべきでしょう。'DMZ モード' " +"や 'ゲーム モード' と呼ばれるもののルーターでの起動はできません。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 msgid "" @@ -5717,72 +6239,80 @@ "trojans or other malware. This might raise a false alarm you can safely " "discard." msgstr "" -"FileZilla はサーバが選択したポートに関与しないことにご注意ください. このため" -"ファイアウォールがトロイの木馬やその他のマルウェアのみに利用されると考えられ" -"るポートをサーバが選ぶかもしれません. これはあなたが安全を放棄する失敗の警告" -"を取り上げるかもしれません." +"FileZilla はサーバーが選択したポートには関与しないことにご注意してください。" +"悪意のあるソフトウェアが利用しているとファイアウォールが判断するポートをサー" +"バーは選ぶ可能性があります。これにより、誤ったアラームが発生する可能性があり" +"ます。" -#: ../../locales/../src/interface/Mainfrm.cpp:697 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." msgstr "" -"MFMT コマンドに対応している場合は、FTP, FTPS と FTPES サーバへのアップロード" -"でのみタイムスタンプを保持することにご注意ください." +"\"FTP、FTPS、および FTPES サーバーへのアップロードでタイムスタンプを保持する" +"には、MFMT コマンドに対応している場合のみであることに注意してください。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." msgstr "" -"あまりにも頻繁に/あまりにも短い間隔で再接続を試みると、サーバが接続を禁止する" -"かもしれないことにご注意ください." +"あまりにも頻繁に再接続を試みたり、あまりにも短い間隔で再接続しようとすると、" +"一部のサーバーでは接続が禁止されることがあります。" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " "previously." msgstr "" -"ネットワークの設定を変更したり, 以前に動いていたサーバで突然問題に遭遇した場" -"合は再度このウィザードを起動してください." +"ネットワークの設定を変更したり、以前は正常に動作していたサーバーで突然問題に" +"遭遇した場合は再度このウィザードを起動してください。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"この鍵は安全な場所に保管してください。正しい鍵がないと、アップロードされた" +"ファイルにアクセスできません。" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "動作を選択してください:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." -msgstr "インポートしたいカテゴリを選択してください." +msgstr "インポートしたいカテゴリを選択してください。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 msgid "Please select the default transfer mode you would like to use." -msgstr "利用したい既定の転送モードを選択してください." +msgstr "利用したいデフォルトの転送モードを選択してください。" #: ../../locales/../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." -msgstr "ディレクトリ \"%s\" の新しい属性を選択してください." +msgstr "ディレクトリ \"%s\" の新しい属性を選択してください。" #: ../../locales/../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." -msgstr "ファイル \"%s\" の新しい属性を選択してください." +msgstr "ファイル \"%s\" の新しい属性を選択してください。" #: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." -msgstr "選択されたディレクトリの新しい属性を選択してください." +msgstr "選択したディレクトリの新しい属性を選択してください。" #: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." -msgstr "選択されたファイルとディレクトリの新しい属性を選択してください." +msgstr "選択したファイルとディレクトリの新しい属性を選択してください。" #: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." -msgstr "選択されたファイルの新しい属性を選択してください." +msgstr "選択したファイルの新しい属性を選択してください。" -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5790,43 +6320,43 @@ "called 'DMZ mode' or 'game mode'. Things like protocol inspection or " "protocol specific 'fixups' have to be disabled" msgstr "" -"ファイアウォールを更新してあなたのルータが最新の利用できるファームウェアを使" -"用しているか確認してください. その上でルータが適切に設定されている必要があり" -"ます. あなたは手動でポート転送を使用する必要があります. 'DMZ モード' または " -"'ゲーム モード' でルータを運用しないでください. プロトコル検知またはプロトコ" -"ルの特殊な 'fixups' は無効にする必要があります." +"ファイアウォールを更新してあなたのルーターが最新の利用できるファームウェアを" +"使用しているか確認してください。その上でルーターが適切に設定されている必要が" +"あります。あなたは手動でポート転送を使用する必要があります。'DMZ モード' また" +"は 'ゲーム モード' でルーターを運用しないでください。プロトコル検知またはプロ" +"トコルの特殊な 'fixups' は無効にする必要があります。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "メッセージ ログの位置(&N):" -#: ../../locales/../src/interface/verifycertdialog.cpp:223 -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "郵便番号:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" -msgstr "ダウンロード前に領域を事前確保する" +msgstr "ダウンロード前に領域を事前確保する(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "事前確保" -#: ../../locales/../src/interface/sitemanager.cpp:268 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1791 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "所定のサイト" -#: ../../locales/../src/interface/Mainfrm.cpp:696 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "ファイルのタイムスタンプを保持" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "プレビュー:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "プレビュー" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "プライマリ接続とデータ接続証明が一致しません。" @@ -5838,23 +6368,23 @@ msgid "Print version information to stdout and exit" msgstr "バージョン情報を標準出力に表示して終了" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" -msgstr "ディレクトリを先頭に(既定値)" +msgstr "ディレクトリを先頭に (デフォルト)" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "優先度" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." msgstr "" -"プライバシーポリシー: FileZilla のバージョン、ご使用の OS、CPU アーキテクチャ" -"だけがサーバに送信されます。" +"プライバシー ポリシー: FileZilla のバージョン、ご使用の OS、CPU アーキテク" +"チャだけがサーバーに送信されます。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "秘密鍵(&K):" @@ -5862,84 +6392,88 @@ msgid "Pro&tocol:" msgstr "プロトコル(&T)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "プロキシ パスワード(&X):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "キューを処理(&Q)" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" -msgstr "" +msgstr "プロセス ファイル テーブルのオーバーフロー" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:90 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." -msgstr "" +msgstr "%s で %s を処理しました。" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "プロトコルはサポートされていません" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" -msgstr "" +msgstr "指定されたソケット タイプはプロトコルでサポートされていません" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "プロトコル:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "プロキシ ポート(&P):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" -msgstr "プロキシ ユーザ(&U):" +msgstr "プロキシ ユーザー(&U):" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "プロキシ認証に失敗しました" -#: ../../locales/../src/engine/transfersocket.cpp:103 -#: ../../locales/../src/engine/transfersocket.cpp:115 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "プロキシ ハンドシェイクに失敗しました: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4208 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." -msgstr "プロキシホストが '[' で始まっていますが閉じ括弧がありません。" +msgstr "プロキシ ホストが '[' で始まっていますが閉じ括弧がありません。" -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" -msgstr "プロキシの返答: %s" +msgstr "プロキシの応答: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:520 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "プロキシ リクエストに失敗しました。プロキシの応答: %s" + +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "プロキシ リクエストに失敗しました: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "プロキシ リクエストに失敗しました: CONNECT の応答に不明なアドレスの種類があり" "ました" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "" -"プロキシは設定されていますがプロキシホストまたはポートが正しくありません" +"プロキシは設定されていますがプロキシ ホストまたはポートが正しくありません" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "公開鍵認証" @@ -5947,395 +6481,424 @@ msgid "Public key algorithm:" msgstr "公開鍵アルゴリズム:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" -msgstr "公開パーミッション" +msgstr "その他のパーミッション" -#: ../../locales/../src/interface/QueueView.cpp:3071 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "キューの処理が完了しました" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "キュー: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "キュー: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "キュー: ありません" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "キュー ファイル" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "待機中:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "システムを再起動(&E)" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "クイック検索:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "ディレクトリを比較中はクイック検索を開くことができません。" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "システムの再起動(&E)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "リモート ディレクトリ ツリー(&E)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" -msgstr "選択されたファイルをリセットして再度キューに入れる(&E)" +msgstr "リセットして選択したファイルを再度キューに入れる(&E)" -#: ../../locales/../src/interface/Mainfrm.cpp:596 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "生の FTP コマンド" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" -msgstr "読み込む(&A)" +msgstr "読み取り(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "更新(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" -msgstr "名前を変更(&N)" +msgstr "名前の変更(&N)" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." msgstr "" -"ウィザードを再実行して設定を注意深く確認し, すべてのルータ/ファイアウオールを" -"正しく設定してください." +"ウィザードを再実行して設定を注意深く確認し、すべてのルーター/ファイアウォール" +"を正しく設定してください。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" -msgstr "読み込む(&D)" +msgstr "読み取り(&D)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "読み取り専用" -#: ../../locales/../src/interface/Mainfrm.cpp:1033 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "ローカル ファイルの読み込みに失敗しました。" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "現在の操作を本当に中止しますか?" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:761 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" "Really delete %d directories with their contents from the server?" -msgstr[0] "サーバから %d 個のディレクトリとその中身を本当に削除しますか?" +msgstr[0] "サーバーから %d 個のディレクトリとその中身を本当に削除しますか?" -#: ../../locales/../src/interface/RemoteListView.cpp:1384 -#: ../../locales/../src/interface/search.cpp:759 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" -msgstr[0] "サーバから %d 個のファイルを本当に削除しますか?" +msgstr[0] "サーバーから %d 個のファイルを本当に削除しますか?" -#: ../../locales/../src/interface/RemoteListView.cpp:1391 -#: ../../locales/../src/interface/search.cpp:765 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" -msgstr "サーバから %s と %s を本当に削除しますか?" +msgstr "サーバーから %s と %s を本当に削除しますか?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" -msgstr "選択されたすべてのファイル/ディレクトリを本当にサーバから削除しますか?" +msgstr "選択したすべてのファイル/ディレクトリをサーバーから削除しますか?" -#: ../../locales/../src/engine/local_filesys.cpp:129 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" -msgstr "選択されたすべてのファイル/ディレクトリを本当にサーバから削除しますか?" +msgstr "選択したすべてのファイル/ディレクトリをコンピューターから削除しますか?" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "理由" -#: ../../locales/../src/interface/QueueView.cpp:3064 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "今すぐ再起動" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" -msgstr "サブディレクトリの中の再帰(&U)" +msgstr "サブディレクトリ内の再帰処理(&U)" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" -msgstr "" +msgstr "サーバーから受信した TLS アラート: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2964 +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" +"EBCDIC でエンコードされているように見えるディレクトリ リストを受信しました。" -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2006 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." -msgstr "10000 文字を超える行を受信したため中止しています." +msgstr "10000 文字を超える行を受信したため中止しています。" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"受信した証明書チェーンを検証できませんでした。確認ステータスは %d です。" -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "受信したデータは失われました" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "受信したバージョン情報に無効な文字が含まれています" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" -msgstr "" +msgstr "サーバーから未知の TLS アラート %d を受信しました" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "受信したバージョン情報が大きすぎます" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." msgstr "" -"サーバへの接続中は再接続情報を消去できません.\n" -"継続すると接続は切断されます." +"サーバーへの接続中は再接続情報を消去できません。\n" +"継続すると接続は切断されます。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "再接続設定" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" -msgstr "最後に使用したサーバに再接続" +msgstr "最後に使用したサーバーに再接続" -#: ../../locales/../src/interface/recursive_operation_status.cpp:72 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." -msgstr "ファイルを再帰的にキューへ追加." +msgstr "ファイルを再帰的にキューへ追加。" -#: ../../locales/../src/interface/recursive_operation_status.cpp:78 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." -msgstr "" +msgstr "再帰的にアクセス権を変更します。" -#: ../../locales/../src/interface/recursive_operation_status.cpp:75 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." -msgstr "ファイルとディレクトリを再帰的に削除." +msgstr "ファイルとディレクトリを再帰的に削除します。" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:653 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Red" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "正しくない URI へのリダイレクト: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:660 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:667 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "正しくないアドレスへのリダイレクト: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" -msgstr "ファイルとフォルダの一覧を更新" +msgstr "ファイルとフォルダーのリストを更新" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3680 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "パスワードを保存しますか?" -#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "リモート" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." -msgstr "リモート証明書は信用されていません." +msgstr "リモート証明書は信用されていません。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2265 -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "リモート ファイル" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3089 -#: ../../locales/../src/interface/search.cpp:383 -#: ../../locales/../src/interface/search.cpp:388 -#: ../../locales/../src/interface/search.cpp:397 -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "リモートのファイル検索" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" -msgstr "リモート フィルタ:" +msgstr "リモート フィルター:" -#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "リモート パス" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the current site's servertype (%s)." msgstr "" -"リモート パスを構文解析できません. 正しい絶対パスであること, 現在のサイトの" -"サーバの種類 (%s) が対応していることを確認してください." +"リモート パスを構文解析できません。正しい絶対パスであること、現在のサイトの" +"サーバーの種類 (%s) が対応していることを確認してください。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1079 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the servertype (%s) selected on the parent site." msgstr "" -"リモート パスを構文解析できません. 正しい絶対パスであること, 親サイトで選択さ" -"れたサーバの種類 (%s) が対応していることを確認してください." +"リモート パスを構文解析できません。正しい絶対パスであること、親サイトで選択さ" +"れたサーバーの種類 (%s) が対応していることを確認してください。" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1081 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." -msgstr "リモート パスを構文解析できません. 正しい絶対パスか確認してください." +msgstr "リモート パスを構文解析できません。正しい絶対パスか確認してください。" -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." -msgstr "リモート パスを構文解析できませんでした." +msgstr "リモート パスを構文解析できませんでした。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "リモート パスの処理:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "リモート パス:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "リモート サイト:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "すべて削除(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" -msgstr "選択されているものを削除(&S)" +msgstr "選択されているアイテムを削除(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:287 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "ファイル名の変更" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" -msgstr "選択されたディレクトリの名前を変更" +msgstr "選択したディレクトリの名前の変更" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" -msgstr "選択されたファイルとディレクトリの名前を変更" +msgstr "選択したファイルとディレクトリの名前の変更" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3392 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2404 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "名前を '%s' から '%s' に変更中" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "パスワードの再入力:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "不具合の報告と機能の要望" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" +"リクエストが失敗 - クライアントは identd を実行していません (またはサーバーか" +"ら到達できません)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" +"リクエストが失敗 - クライアントの identd がユーザー ID 文字列を確認できません" +"でした" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" -msgstr "" +msgstr "要求の拒否または失敗" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:523 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "明示的な FTP over TLS が必要" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" -msgstr "暗黙の FTP over TLS が必要" +msgstr "暗黙的な FTP over TLS が必要" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:461 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "すべてリセットして再度キューに入れる(&A)" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" -msgstr "" +msgstr "解決されたプロトコルは不明です" -#: ../../locales/../src/engine/ControlSocket.cpp:1078 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "%s のアドレスを解決中" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "リソースが一時的に使用できません" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:343 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "レスポンス:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3075 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "結果:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "ファイル転送を再開" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." msgstr "" -"ASCII ファイルの再開ではサーバがクライアントと異なる改行コードを使用している" -"場合に問題が発生するかもしれません." +"ASCII ファイルの再開ではサーバーがクライアントと異なる改行コードを使用してい" +"る場合に問題が発生するかもしれません。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:914 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." -msgstr "\"%s\" のディレクトリ一覧を取得中..." +msgstr "\"%s\" のディレクトリ リストを取得中..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." -msgstr "ディレクトリ一覧を取得中..." +msgstr "ディレクトリ リストを取得中..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3768 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "%s から外部 IP アドレスを取得中" @@ -6344,23 +6907,23 @@ msgid "S&how files currently being edited..." msgstr "現在編集中のファイルを表示(&H)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" -msgstr "開始時にサイト マネージャを表示(&H)" +msgstr "開始時にサイト マネージャーを表示(&H)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" msgstr "システムのシャットダウン(&H)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "停止(&T)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" msgstr "システムのサスペンド(&U)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "同期ブラウジング(&Y)" @@ -6368,417 +6931,483 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "SFTP サポート" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 プロキシに接続します: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 は 255 文字より長いユーザー名とパスワードをサポートしていません。" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "マスター パスワードで保護されたパスワードを保存する(&V)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "パスワードを保存(&E)" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "設定を保存しますか?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:962 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "システム管理者によりパスワードの保存が無効にされています。" -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:964 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "あなたによってパスワードの保存は無効にされています。" -#: ../../locales/../src/interface/QueueView.cpp:1718 -msgid "Scanning for files to add to queue" -msgstr "キューに追加するファイルをスキャン中" - -#: ../../locales/../src/interface/QueueView.cpp:1720 -msgid "Scanning for files to upload" -msgstr "アップロードするファイルをスキャン中" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "表示倍率:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3003 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "検索条件(&C):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2984 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "検索するディレクトリ(&D):" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." -msgstr "再帰的にファイルを検索します." +msgstr "再帰的にファイルを検索します。" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" -msgstr "サーバでファイルを検索" +msgstr "サーバーでファイルを検索" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "検索対象:" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "セキュリティ情報" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" -msgstr "ご覧ください: https://wiki.filezilla-project.org/Network_Configuration" +msgstr "URL 参照: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2353 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" -msgstr "サーバを選択(&C)" +msgstr "サーバーを選択(&C)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "ページを選択(&P):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "テーマを選択" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" -"転送対象のファイルが既に存在するとき行うべき既定の動作を選択してください." +"転送対象のファイルが既に存在するとき行うデフォルトの動作を選択してください。" -#: ../../locales/../src/interface/edithandler.cpp:1532 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" -msgstr "既定のエディタを選択" +msgstr "デフォルトのエディターを選択" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." msgstr "" -"対象が既に存在している時の既定のファイルが存在する時の動作を選択してくださ" -"い. この選択は現在のセッションのみで適切です." +"対象のファイルが既に存在している時のデフォルトの動作を選択してください。この" +"選択は現在のセッションのみで有効です。" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." msgstr "" -"キューにおいて現在選択されているファイルのためだけにファイル存在時の既定の動" -"作を選択してください." +"キューにおいて現在選択されているファイルのためだけにファイル存在時のデフォル" +"トの動作を選択してください。" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:347 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "秘密鍵が格納されたファイルを選択" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "エクスポートしたデータのファイルを選択" -#: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "エクスポートしたフィルターのファイルを選択" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "エクスポートしたキューのファイルを選択" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "エクスポートした設定のファイルを選択" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2098 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "エクスポートしたサイトのファイルを選択" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "設定をインポートするファイルを選択" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "アップロードするファイルを選択" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:294 -msgid "Select filename for converted keyfile" -msgstr "変換後の鍵ファイル名を選択" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 +msgid "Select filename for converted key file" +msgstr "変換後の鍵のファイル名を選択" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." -msgstr "これらのファイルをどのように開くか選択してください." +msgstr "これらのファイルをどのように開くか選択してください。" -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "対象のダウンロード ディレクトリを選択" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "対象のファイル名を選択" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "エクスポートするカテゴリを選択:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." -msgstr "削除したい個人データを選択してください." +msgstr "削除したい個人データを選択してください。" -#: ../../locales/../src/interface/search.cpp:475 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." -msgstr[0] "転送する %d 個のディレクトリ (空ではない) を選択しました." +msgstr[0] "転送する %d 個のディレクトリ (空ではない) を選択しました。" -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." -msgstr[0] "%d 個のディレクトリを選択." +msgstr[0] "%d 個のディレクトリを選択。" -#: ../../locales/../src/interface/search.cpp:473 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." -msgstr[0] "転送する %d 個のファイルを選択しました." +msgstr[0] "転送する %d 個のファイルを選択しました。" -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" -msgstr[0] "%d 個のファイルを選択. 合計サイズ: %s" +msgstr[0] "%d 個のファイルを選択。 合計サイズ: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" -msgstr[0] "%d 個のファイルを選択. 合計サイズ: 少なくとも %s" +msgstr[0] "%d 個のファイルを選択。 合計サイズ: 少なくとも %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." -msgstr "転送する %s と %s を選択しました." +msgstr "転送する %s と %s を選択しました。" -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" -msgstr "%s と %s を選択. 合計サイズ: %s" +msgstr "%s と %s を選択。 合計サイズ: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" -msgstr "%s と %s を選択. 合計サイズ: 少なくとも %s" +msgstr "%s と %s を選択。 合計サイズ: 少なくとも %s" -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1551 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." -msgstr "選択されたエディタは存在しません." +msgstr "選択したエディターは存在しません。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" -msgstr "選択されたファイルは既に編集中です" +msgstr "選択したファイルは既に編集中です" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:375 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" -msgstr "選択されたファイルは既に読み込まれています" +msgstr "選択したファイルは既に読み込まれています" -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" -msgstr "選択されたファイルは既に開かれています" +msgstr "選択したファイルは既に開かれています" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" -msgstr "選択されたファイルはまだ編集中です" +msgstr "選択したファイルはまだ編集中です" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." -msgstr "選択されたフィルタはローカルファイルのみに働きます." +msgstr "選択したフィルターはローカル ファイルにのみ適用されます。" -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" -"選択されたグローバル ブックマークと現在のサーバはサーバの種類が異なります.\n" -"このサーバにはサイト別ブックマークを使用してください." +"選択したグローバル ブックマークと現在のサーバーはサーバーの種類が異なりま" +"す。\n" +"このサーバーにはサイト別ブックマークを使用してください。" -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." -msgstr "選択されたポートは通常違うプロトコルによって利用されています." +msgstr "選択したポートは通常違うプロトコルによって利用されています。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" -msgstr "FTP のキープ アライブ コマンドを送信(&K)" +msgstr "FTP のキープアライブ コマンドを送信(&K)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" -msgstr "不可能でなければサーバにカスタム コマンドを送信" +msgstr "不可能でなければサーバーにカスタム コマンドを送信" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" -msgstr "キープ アライブ コマンドを送信中" +msgstr "キープアライブ コマンドを送信中" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "シリアル番号:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" -msgstr "サーバの種類(&T):" +msgstr "サーバーの種類(&T):" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" -msgstr "サーバは TLS 接続を適切にシャットダウンしませんでした." +msgstr "サーバーは TLS 接続を適切にシャットダウンしませんでした" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." -msgstr "サーバは non-ASCII の文字に対応していません." +msgstr "サーバーは non-ASCII の文字に対応していません。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4149 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." -msgstr "サーバは %d GB を超えるファイルの再開に対応していません." +msgstr "サーバーは %d GB を超えるファイルの再開に対応していません。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4145 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -"サーバは %d GB を超えるファイルの再開に対応していません. ファイル サイズが一" -"致しないため転送を終了します." +"サーバーは %d GB を超えるファイルの再開に対応していません。ファイルサイズが一" +"致しないため転送を終了します。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." -msgstr "サーバは 2GB を超えるファイルの再開に対応していません." +msgstr "サーバーは 2 GB を超えるファイルの再開に対応していません。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." -msgstr "サーバは 4GB を超えるファイルの再開に対応していません." +msgstr "サーバーは 4 GB を超えるファイルの再開に対応していません。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "サーバー ホスト鍵" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -"サーバは %d GB を超えるファイルの再開に対応していないかもしれません. ファイ" -"ル サイズが一致しないため転送を終了します." +"サーバーは %d GB を超えるファイルの再開に対応していないかもしれません。ファイ" +"ルサイズが一致しないため転送を終了します。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" -"サーバにアカウントが必要かもしれません. サイト マネージャを使ってアカウントを" -"指定してみてください." +"サーバーにアカウントが必要かもしれません。サイト マネージャーを使ってアカウン" +"トを指定してみてください。" + +#: ../../locales/../src/engine/http/request.cpp:457 +msgid "Server not sending proper line endings" +msgstr "正しくない応答です、サーバーが適切な改行文字を送信しません" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" +"サーバーにサポートされていないダイジェスト認証アルゴリズムを要求しました: %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "サーバーにサポートされていない保護品質を要求しました: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." -msgstr "サーバが空のパスを返しました." +msgstr "サーバーが空のパスを返しました。" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:654 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "" -"サーバは追加のログイン プロンプトを送信しました. ログイン種類としてインタラク" -"ティブを使用する必要があります." +"サーバーは追加のログイン プロンプトを送信しました。ログイン種類としてインタラ" +"クティブを使用する必要があります。" + +#: ../../locales/../src/engine/http/request.cpp:307 +msgid "Server sent data even before request headers were sent" +msgstr "サーバーは要求ヘッダーが送信される前にデータを送信しました" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" -"サーバはルーティング経路設定できないアドレスに受動的な返信を送信しました. " -"パッシブ モードは失敗しました." +"サーバーはルーティング経路設定できないアドレスに受動的な返信を送信しました。" +"パッシブ モードは失敗しました。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3710 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." msgstr "" -"サーバは経路設定できないアドレスで受動的な返信を送信しました. 代わりにサーバ" -"のアドレスを使っています." +"サーバーは経路設定できないアドレスで受動的な返信を送信しました。代わりにサー" +"バーのアドレスを使っています。" -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:425 -#: ../../locales/../src/interface/netconfwizard.cpp:464 -#: ../../locales/../src/interface/netconfwizard.cpp:473 -#: ../../locales/../src/interface/netconfwizard.cpp:485 -#: ../../locales/../src/interface/netconfwizard.cpp:509 -#: ../../locales/../src/interface/netconfwizard.cpp:516 -#: ../../locales/../src/interface/netconfwizard.cpp:525 -#: ../../locales/../src/interface/netconfwizard.cpp:536 +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:781 +msgid "Server sent too much data." +msgstr "サーバーから送信されたデータが多すぎます。" + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." -msgstr "サーバは予期しない返答を送信しました." +msgstr "サーバーは予期しない応答を送信しました。" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "サーバーがTLS仕様に違反して未分類の証明書チェーンを送信しました" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" -msgstr "サーバ -> クライアント MAC:" +msgstr "サーバー -> クライアント MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" -msgstr "サーバ -> クライアント 暗号化方式:" +msgstr "サーバー -> クライアント 暗号化方式:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" -msgstr "サーバの種類(&T):" +msgstr "サーバーの種類(&T):" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" -msgstr "サーバ/ローカル ファイル" +msgstr "サーバー/ローカル ファイル" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2339 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" -msgstr "サーバ:" +msgstr "サーバー:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "セッション詳細" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "優先度の設定(&P)" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3540 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2283 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" +msgid "Setting permissions of '%s' to '%s'" msgstr "'%s' のパーミッションを '%s' に設定" -#: ../../locales/../src/engine/transfersocket.cpp:789 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize はソケットなしで呼び出される" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "設定" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "ディレクトリ設定:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "通知バルーンを表示する(&O)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" -msgstr "そのままのディレクトリ一覧を表示(&R)" +msgstr "そのままのディレクトリ リストを表示(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." -msgstr "ようこそダイアログを表示(&W)..." +msgstr "ウェルカム ダイアログを表示(&W)..." -#: ../../locales/../src/interface/Mainfrm.cpp:2224 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" -msgstr "両方のディレクトリ ツリーを表示して, 比較を継続しますか?" +msgstr "両方のディレクトリ ツリーを表示して、比較を継続しますか?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "詳細の表示" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" -msgstr "" +msgstr "日付と時刻の書式を表示" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "ファイル マネージャーに表示(&M)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:438 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "TLS で使用できる暗号方式の表示" @@ -6786,7 +7415,7 @@ msgid "Shows this help dialog" msgstr "このヘルプ ダイアログを表示" -#: ../../locales/../src/interface/QueueView.cpp:3060 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "今すぐシャットダウン" @@ -6794,77 +7423,87 @@ msgid "Signature algorithm:" msgstr "署名アルゴリズム:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "サインアップ" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" -msgstr "サイト マネージャのエントリ(&M)" +msgstr "サイト マネージャー エントリ(&M)" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 msgid "Site Manager" -msgstr "サイト マネージャ" +msgstr "サイト マネージャー" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:970 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" -msgstr "サイト マネージャ - パスワードを保存しない" +msgstr "サイト マネージャー - パスワードを保存しない" + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "サイト マネージャー - 自動生成された鍵" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:938 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:951 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:983 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1000 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1013 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1060 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1082 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1091 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" -msgstr "サイト マネージャ - 正しくないデータ" +msgstr "サイト マネージャー - 正しくないデータ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:323 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" -msgstr "サイト マネージャは既に開かれています" +msgstr "サイト マネージャーは既に開かれています" -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." -msgstr "サイトは存在しません." +msgstr "サイトは存在しません。" -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." -msgstr "サイト パスは 0 か 1 で始まっている必要があります." +msgstr "サイト パスは 0 か 1 で始まっている必要があります。" -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:752 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." -msgstr "サイト パスが正しくありません." +msgstr "サイト パスが正しくありません。" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "サイト別ブックマーク" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" "Add current connection to the site manager?" msgstr "" -"サイト別ブックマークではサーバがサイト マネージャに登録されている必要がありま" -"す.\n" -"現在の接続をサイト マネージャに追加しますか?" +"サイト別ブックマークではサーバーがサイト マネージャーに登録されている必要があ" +"ります。\n" +"現在の接続をサイト マネージャーに追加しますか?" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "サイズ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "サイズの書式" @@ -6872,177 +7511,192 @@ msgid "Size unknown" msgstr "サイズ不明" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "ファイルをスキップ" -#: ../../locales/../src/engine/ControlSocket.cpp:1149 -#: ../../locales/../src/engine/ControlSocket.cpp:1166 -#: ../../locales/../src/engine/ControlSocket.cpp:1190 -#: ../../locales/../src/engine/ControlSocket.cpp:1250 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "%s のダウンロードをスキップしています" -#: ../../locales/../src/engine/ControlSocket.cpp:1153 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1194 -#: ../../locales/../src/engine/ControlSocket.cpp:1254 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "存在しない鍵ファイル \"%s\" をスキップします。" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "%s のアップロードをスキップしています" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" -msgstr "" +msgstr "アドレス空間外のソケット アドレス" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "ソケットは既に接続されています" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" -msgstr "" +msgstr "ソケットがシャットダウンされました" -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "ソケットは接続されていません" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" -msgstr "" +msgstr "ソケット タイプはアドレス ファミリではサポートされていません" -#: ../../locales/../src/interface/Mainfrm.cpp:1168 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." -msgstr "編集中またはアップロードの必要があるファイルがあります." +msgstr "編集中またはアップロードの必要があるファイルがあります。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." msgstr "" -"ルータの下にある間違った設定をされたリモートサーバはローカル IP アドレスを返" -"すかもしれません." +"ルーターの背後にある誤った構成のリモート サーバーは、ローカル IP アドレスを返" +"信することがあります。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" -msgstr "ディレクトリをインラインでソート" +msgstr "ディレクトリをインラインで並べ替え" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." -msgstr "ディレクトリ比較中はソート順を変更できません." +msgstr "ディレクトリ比較中は並べ替え順を変更できません。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" -msgstr "ソート中" +msgstr "並べ替え" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" -msgstr "ソートのモード(&M):" +msgstr "並べ替えモード(&M):" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" -msgstr "元とドロップ操作されたパスは同一です" +msgstr "元とドロップされたパスが同一です" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "元のファイルと対象のファイルは同じではないようです" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" -msgstr "ドロップの元と先が同一です" +msgstr "ドロップ元とドロップ先が同一です" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 msgid "Source file:" msgstr "元ファイル:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3622 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "速度制限" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "速度制限" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." -msgstr "速度制限は無効です. 変更するにはクリックしてください." +msgstr "速度制限は無効です。変更するにはクリックしてください。" -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." -msgstr "速度制限は有効です. 変更するにはクリックしてください." +msgstr "速度制限は有効です。変更するにはクリックしてください。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "安定版またはベータ版" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "安定版のみ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" -msgstr "安定版、ベータ版、nightly" +msgstr "安定版、ベータ版、ナイトリー ビルド" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2547 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "今すぐ転送を開始(&I)" #: ../../locales/../src/interface/cmdline.cpp:7 msgid "Start with opened Site Manager" -msgstr "サイト マネージャを開いた状態で起動" +msgstr "サイト マネージャーを開いた状態で起動" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "%s の更新チェックを開始\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1548 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "%s のダウンロードを開始しています" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1551 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "%s のアップロードを開始しています" #: ../../locales/../src/interface/cmdline.cpp:9 msgid "Starts the local site in the given path" -msgstr "" +msgstr "指定したパスでローカル サイトを開始する" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "都道府県:" -#: ../../locales/../src/interface/edithandler.cpp:1088 -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "状態" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:367 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "状態:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" -msgstr "すべてを停止して削除(&A)" +msgstr "停止してすべて削除(&A)" -#: ../../locales/../src/interface/recursive_operation_status.cpp:39 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "再帰処理を停止" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - 分散型クラウド ストレージ" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Storj サポート" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "通り:" @@ -7052,46 +7706,51 @@ #: ../../locales/../src/interface/queueview_successful.cpp:12 msgid "Successful transfers" -msgstr "転送成功" +msgstr "成功した転送" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" msgstr "テスト結果の概要:" -#: ../../locales/../src/interface/QueueView.cpp:3068 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "Suspend now" msgstr "今すぐサスペンド" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." msgstr "" -"この選択はファイルへのシンボリックリンクには影響しません. このようなシンボ" -"リックリンクは常に削除されます." +"この選択はファイルへのシンボリックリンクには影響しません。このようなシンボ" +"リックリンクは常に削除されます。" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:237 -#: ../../locales/../src/interface/state.cpp:251 -#: ../../locales/../src/interface/state.cpp:257 -#: ../../locales/../src/interface/state.cpp:267 -#: ../../locales/../src/interface/state.cpp:353 -#: ../../locales/../src/interface/state.cpp:361 -#: ../../locales/../src/interface/state.cpp:369 -#: ../../locales/../src/interface/state.cpp:901 -#: ../../locales/../src/interface/state.cpp:909 -#: ../../locales/../src/interface/state.cpp:915 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "同期ブラウジング" -#: ../../locales/../src/interface/state.cpp:368 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." -msgstr "同期ブラウジングを無効にしました." +msgstr "同期ブラウジングを無効にしました。" -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "ディレクトリを同期中。" + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "構文エラー" @@ -7100,44 +7759,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2336 -#: ../../locales/../src/interface/Mainfrm.cpp:2378 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" -msgstr "コマンド ラインでの構文エラー" +msgstr "コマンドラインでの構文エラー" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" -msgstr "システム" +msgstr "システム属性" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "システム詳細" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "システムが開けるファイル数を越えました" -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" -msgstr "" +msgstr "システムのネットワーク サブシステムに障害が発生しました" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "ツールバー(&O)" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:311 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" -msgstr "TLS 接続が確立されました, HTTP リクエストを送っています" +msgstr "TLS 接続が確立されました、HTTP リクエストを送っています" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." -msgstr "TLS 接続が確立されました, ようこそメッセージを待っています..." +msgstr "TLS 接続が確立されました、ウェルカム メッセージを待っています..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." -msgstr "TLS 接続が確立されました." +msgstr "TLS 接続が確立されました。" -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL の期限が切れました" @@ -7145,130 +7804,155 @@ msgid "Target file already exists" msgstr "対象のファイルは既に存在しています" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "対象のファイル:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" -msgstr "対象のファイルは既に存在しています！" +msgstr "対象のファイルは既に存在しています!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" -msgstr "対象のファイル名は既に存在しています, 本当に続けますか?" +msgstr "対象のファイル名は既に存在しています、本当に続けますか?" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "一時的に名前解決に失敗しました" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "ファイル転送が成功しました" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "テスト結果" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4166 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" -msgstr "サーバの再開の互換性をテストしています." +msgstr "サーバーの再開の互換性をテストしています" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "以下のファイルが現在編集中です(&F):" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:734 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." -msgstr "" +msgstr "ファイルが修復されない限り、サイト マネージャーは使用できません。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:322 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " "then." msgstr "" -"サイト マネージャは FileZilla 3 の別のインスタンスで開かれています.\n" -"続けますか? この時, なんらかの変更はサイト マネージャにおいて保存されないかも" -"しれません." +"サイト マネージャーは FileZilla 3 の別のインスタンスで開かれています。\n" +"続行しますか? サイト マネージャーでの変更内容は保存されない可能性があります。" -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." msgstr "" -"サイト マネージャは FileZilla 3 の別のインスタンスで開かれています.\n" -"それを閉じてないとデータの削除ができません." +"サイト マネージャーは FileZilla 3 の別のインスタンスで開かれています。\n" +"それを閉じなければデータの削除ができません。" -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" -msgstr "入力されたアドレス: %s" +msgstr "入力したアドレス: %s" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "ai_family メンバーには対応していません" -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "ai_socktype メンバーには対応していません" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:663 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." -msgstr "ブックマークを追加できませんでした." +msgstr "ブックマークを追加できませんでした。" -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." -msgstr "ブックマークを消去できませんでした." +msgstr "ブックマークを消去できませんでした。" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"証明書では、サーバーは応答に OCSP ステータスを含める必要がありますが、OCSP ス" +"テータスはありません。" -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." -msgstr "接続は暗号化されています. 詳細はアイコンをクリックしてください." +msgstr "接続は暗号化されています。詳細はアイコンをクリックしてください。" #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 msgid "" "The custom date format is invalid or contains unsupported format specifiers." msgstr "" +"カスタム日付形式が無効であるか、サポートされていない書式指定子が含まれていま" +"す。" #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." -msgstr "カスタム ログイン シーケンスは空にできません." +msgstr "カスタム ログイン シーケンスは空にできません。" #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 msgid "" "The custom time format is invalid or contains unsupported format specifiers." msgstr "" +"カスタム時刻形式が無効であるか、サポートされていない形式指定子が含まれていま" +"す。" -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "データ接続が確立できません: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2915 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." -msgstr "テキスト ファイルを編集する既定のエディタがありません." +msgstr "テキスト ファイルを編集するデフォルトのエディターがありません。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." -msgstr "テキスト ファイルを編集する既定のエディタは '%s' です." +msgstr "テキスト ファイルを編集するデフォルトのエディターは '%s' です。" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." -msgstr "入力されたフィルタ名は既に存在しています. 他の名前を選択してください." +msgstr "入力したフィルター名は既に存在しています。他の名前を選択してください。" -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "入力したパスワードは同じではありません。" + +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" -msgstr "拡張子 '%s' は既に一覧に存在しません" +msgstr "拡張子 '%s' は既にリストに存在しません" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:278 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:284 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" "Please enter a new name:" msgstr "" -"ファイル %s は既に存在しています.\n" +"ファイル %s は既に存在しています。\n" "新しい名前を入力してください:" -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7276,31 +7960,42 @@ "Please check your filetype associations." msgstr "" "ファイル '%s' を開くことができません:\n" -"関連付けられたプログラム (%s) が見つかりませんでした.\n" -"ファイルの種類の関連付けを確認してください." +"関連付けられたプログラム (%s) が見つかりませんでした。\n" +"ファイルの種類の関連付けを確認してください。" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"ファイル '%s' には SSH1 の鍵が含まれています。SSH1 プロトコルは推奨されておら" +"ず、FileZilla は SSH2 の鍵のみをサポートしています。" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:219 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." -msgstr "ファイル '%s' を読み込めないか, 秘密鍵を含んでいません." +msgstr "ファイル '%s' を読み込めないか、秘密鍵を含んでいません。" -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." -msgstr "ファイル '%s' を読み込めませんでした." +msgstr "ファイル '%s' を読み込めませんでした。" -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" "No program has been associated on your system with this file type." msgstr "" "ファイル '%s' を開くことができませんでした:\n" -"あなたのシステムではこのファイルの種類にプログラムが関連付けられていません." +"あなたのシステムではこのファイルの種類にプログラムが関連付けられていません。" -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7309,56 +8004,33 @@ "ファイル '%s' を開くことができませんでした:\n" "関連付けられたコマンドが失敗しました" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" "Loading files created by newer versions can result in loss of data.\n" "Do you want to continue?" msgstr "" -"ファイル '%s' は新しいバージョンの FileZilla で作成されています.\n" +"ファイル '%s' は新しいバージョンの FileZilla で作成されています。\n" "新しいバージョンで作成されたファイルを読み込むとデータの喪失を引き起こしま" -"す.\n" -"処理を続けますか？" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:260 -#, c-format -msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"FileZilla はファイル '%s' の形式に対応していません.\n" -"このファイルはパスワードで保護されていますが FileZilla はまだ対応していませ" -"ん.\n" -"FileZilla に対応した保護解除された形式に変換しますか?" +"す。\n" +"処理を続けますか?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:258 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" "Would you like to convert it into a supported format?" msgstr "" -"FileZilla はファイル '%s' の形式に対応していません.\n" +"FileZilla はファイル '%s' の形式に対応していません。\n" "FileZilla に対応した形式に変換しますか?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:263 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"'%s' はパスワードで保護されていますが, FileZilla はまだ対応していません.\n" -"FileZilla で使用するために, 保護解除されたファイルに変換しますか?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." -msgstr "既定のエディタとして選択されたファイルが存在しません." +msgstr "デフォルトのエディターとして選択したファイルが存在しません。" -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7366,19 +8038,19 @@ "password will be imported.\n" "Continue with the import?" msgstr "" -"選択されたファイルは以前のバージョンの FileZilla からのサイト マネージャ デー" -"タを含んでいます.\n" -"記憶形式が異なるため, ホストだけでなく, ポート, ユーザ名, パスワードもイン" -"ポートされます.\n" -"インポートを継続しますか?" +"選択したファイルは以前のバージョンの FileZilla のサイト マネージャーのデータ" +"を含んでいます。\n" +"記憶形式が異なるため、ホスト、ポート、ユーザー名、およびパスワードのみがイン" +"ポートされます。\n" +"インポートを続行しますか?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." -msgstr "ファイル名の列は非表示や移動ができません." +msgstr "ファイル名の列は非表示や移動ができません。" -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." -msgstr "ファイル名の列は非表示にできません." +msgstr "ファイル名の列は非表示にできません。" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 #, c-format @@ -7390,266 +8062,287 @@ msgid "The following characters will be replaced: %s" msgstr "以下の文字は置換されます: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "以下のファイルが現在編集中です:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3283 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "無料でオープン ソースの FTP ソリューション" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "生成された暗号化鍵は次のとおりです:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." -msgstr "グローバル ブックマークを保存できませんでした." +msgstr "グローバル ブックマークを保存できませんでした。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " "performance." msgstr "" -"最も高いデバッグレベルはメッセージ ログにおいてより多くの情報を表示します. デ" -"バッグ情報の表示はパフォーマンスに重大な影響を及ぼします." +"最も高いデバッグ レベルはメッセージ ログにおいてより多くの情報を表示します。" +"デバッグ情報の表示はパフォーマンスに重大な影響を及ぼします。" #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 msgid "The limit needs to be between 1 and 2000 MiB" msgstr "制限は 1 から 2000 MiB にしてください" -#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:1121 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "ローカル ディレクトリに '%s' を作成できませんでした。" + +#: ../../locales/../src/interface/state.cpp:1106 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "ローカル ディレクトリに '%s' は見つかりませんでした。" + +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" -"ローカル ディレクトリ '%s' は同期ルート (%s) の配下ではありません.\n" +"ローカル ディレクトリ '%s' は同期ルート (%s) の配下ではありません。\n" "同期ブラウジングを無効にしてローカル ディレクトリの変更を継続しますか?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." -msgstr "利用できるポートの最小値は最大値以下である必要があります." +msgstr "利用可能なポートの最小値は最大値以下である必要があります。" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "マスター パスワードは少なくとも 8 文字以上必要です。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "" -"新しいバージョンをダウンロードできませんでした。後ほど、再試行してください。" +"新しいバージョンをダウンロードできませんでした。後ほど再試行してください。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." -msgstr "ダウンロードディレクトリに新しいバージョンを保存しました。" +msgstr "ダウンロード ディレクトリに新しいバージョンを保存しました。" -#: ../../locales/../src/interface/QueueView.cpp:1840 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." -msgstr "キューは保存されません." +msgstr "キューは保存されません。" -#: ../../locales/../src/interface/state.cpp:906 +#: ../../locales/../src/interface/state.cpp:1028 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "リモート ディレクトリに '%s' は見つかりませんでした。" + +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -"リモート ディレクトリ '%s' は同期ルート (%s) の配下ではありません.\n" +"リモート ディレクトリ '%s' は同期ルート (%s) の配下ではありません。\n" "同期ブラウジングを無効にしてリモート ディレクトリの変更を継続しますか?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." -msgstr "選択されたカテゴリをインポートしました." +msgstr "選択したカテゴリをインポートしました。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" -"選択されたファイルは以下のカテゴリでのインポートできるデータを含んでいます:" +"選択したファイルには、インポート可能な次のカテゴリのデータが含まれています:" -# -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" -msgstr "選択されたファイルは既に編集中です:" +msgstr "選択したファイルは既に編集中です:" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" -"選択されたファイルは他の何らかのプログラムに開かれていますので, それを閉じて" -"ください." +"選択したファイルは他のプログラムによって開かれているので閉じてください。" -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" -"選択されたファイルは直接実行されます。\n" +"選択したファイルは直接実行されます。\n" "これは危険になり得る上、システムにダメージを与えるかもしれません。\n" "本当に続けますか?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." -msgstr "サーバを追加できませんでした." +msgstr "サーバーを追加できませんでした。" -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." -msgstr "サーバが予期しないまたは認識できない返信を送信しました." +msgstr "サーバーが予期しないまたは認識できない応答を送信しました。" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" -msgstr "このサーバはファイル名に次の文字セット エンコーディングを使用します:" +msgstr "このサーバーはファイル名に次の文字コードを使用します:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 msgid "" "The server's certificate is unknown. Please carefully examine the " "certificate to make sure the server can be trusted." msgstr "" -"サーバの証明書は不明です. 信用できるサーバか確認するために注意深く証明書を調" -"べてください." +"サーバーの証明書は不明です。信用できるサーバーか確認するために注意深く証明書" +"を調べてください。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " "actually trying to connect to another computer pretending to be the server." msgstr "" -"サーバのホスト鍵がキャッシュされた鍵と一致しません. これは管理者がホスト鍵を" -"変更したか, サーバになりすました他のコンピュータに接続しようとしていることを" -"意味します." +"サーバーのホスト鍵がキャッシュされた鍵と一致しません。これは管理者がホスト鍵" +"を変更したか、サーバーになりすました他のコンピューターに接続しようとしている" +"ことを意味します。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." msgstr "" -"サーバのホスト鍵は不明です. サーバがあなたが考えているコンピュータだという保" -"障はありません." +"サーバーのホスト鍵は不明です。サーバーがあなたが考えているコンピューターだと" +"いう保障はありません。" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "サーバーのホスト名が証明書のホスト名と一致しません" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" -msgstr "" +msgstr "servname パラメーターは ai_socktype ではサポートされていません" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." msgstr "" -"設定をインポートしました. FileZilla を再起動するまで設定は有効になりません." +"設定をインポートしました。FileZilla を再起動するまで設定は有効になりません。" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" -msgstr "指定のアドレスファミリーには対応していません" +msgstr "指定のアドレス ファミリーには対応していません" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "指定のネットワーク名は使用できません" -#: ../../locales/../src/interface/QueueView.cpp:3063 +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." -msgstr "キャンセルをクリックしない場合は, システムはまもなく再起動されます." +msgstr "キャンセルをクリックしない場合は、システムはまもなく再起動されます。" -#: ../../locales/../src/interface/QueueView.cpp:3059 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "" -"キャンセルをクリックしない場合は, システムはまもなくシャットダウンされます." +"キャンセルをクリックしない場合は、システムはまもなくシャットダウンされます。" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 msgid "" "The target file already exists.\n" "Please choose an action." msgstr "" -"対象のファイルは既に存在しています.\n" -"動作を選択してください:" +"対象のファイルは既に存在しています。\n" +"動作を選択してください。" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" -msgstr "テストは成功しませんでした. 設定を本当に保存しますか?" +msgstr "テストは成功しませんでした。設定を本当に保存しますか?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" -msgstr "バックアップファイル '%s' を復元できませんでした" +msgstr "バックアップ ファイル '%s' を復元できませんでした" #: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "テーマ" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." -msgstr "このフィルタ セットは名前を変更できません." +msgstr "このフィルターセットを削除できません。" -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." -msgstr "このフィルタ セットは削除できません." +msgstr "このフィルターセットの名前を変更できません。" -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." msgstr "" -"これはルータ/ファイアウォールがまだ FileZilla に干渉していることを意味します." +"これはルーター/ファイアウォールがまだ FileZilla に干渉していることを意味しま" +"す。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:183 msgid "" "This only works if you are not behind a router, else your system would just " "return your internal address." msgstr "" -"これはルータの下ではない場合のみ動作します, そうでない場合はシステムは内部ア" -"ドレスを返します." +"これはルーターの下ではない場合のみ動作します、そうでない場合はシステムは内部" +"アドレスを返します。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 msgid "" "This wizard will help you to properly configure any routers and firewalls " "you have and tests your configuration." msgstr "" -"このウィザードはお持ちのルータやファイアウォールを適切な設定/テストをお手伝い" -"します." +"このウィザードはお持ちのルーターやファイアウォールを適切な設定/テストをお手伝" +"いします。" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "日時" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "時刻の書式" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" -msgstr "タイムアウト(秒)(&O):" +msgstr "タイムアウト (秒)(&O):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:379 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "タイムアウト" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1022 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "サーバのタイムゾーン オフセット: %d 秒" - -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "タイトル:" -#: ../../locales/../src/interface/Mainfrm.cpp:2222 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "ディレクトリを比較するには、クイック検索を終了する必要があります。" + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" -"ディレクトリを比較するには, 両方のファイル リストの位置合わせをする必要があり" -"ます." +"ディレクトリを比較するには、両方のファイル リストの位置合わせをする必要があり" +"ます。" -#: ../../locales/../src/interface/Mainfrm.cpp:2223 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" -"これを行うには, 両方のディレクトリ ツリーはともに表示または非表示である必要が" -"あります." +"これを行うには、両方のディレクトリ ツリーはともに表示または非表示である必要が" +"あります。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." msgstr "" -"公開鍵認証を行うには, FileZilla に使用する秘密鍵を指示する必要があります." +"公開鍵認証を行うには、FileZilla に使用する秘密鍵を指示する必要があります。" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7658,99 +8351,94 @@ "Green: File is newer than the unmarked file on other side\n" "Red: File sizes different" msgstr "" -"ディレクトリ比較の切り替えです. 右クリックで比較モードを変更します.\n" +"ディレクトリ比較の切り替えです。右クリックで比較モードを変更します。\n" "\n" "色:\n" "黄: 片方のみに存在するファイル\n" "緑: 他方より新しいファイル\n" "赤: サイズが異なるファイル" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " "directory on the server accordingly and vice versa." msgstr "" -"同期ブラウジングを切り替えます.\n" -"有効の場合, ローカル ディレクトリを移動するとサーバでも同様に移動します. 逆も" -"同様です." +"同期ブラウジングを切り替えます。\n" +"有効の場合、ローカル ディレクトリを移動するとサーバーでも同様に移動します。逆" +"も同様です。" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "転送キューの処理を切り替える" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "ローカル ディレクトリ ツリーの表示を切り替える" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "メッセージ ログの表示を切り替える" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "リモート ディレクトリ ツリーの表示を切り替える" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "転送キューの表示を切り替える" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:569 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Too long header line" -msgstr "あまりにも長いヘッダ行" +msgstr "あまりにも長いヘッダー行" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:644 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "リダイレクトが多すぎます" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:353 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "トレース:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "転送" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "転送の方向(&D)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "転送の種類(&T)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "転送モード" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "転送キュー" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:383 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "転送設定" -#: ../../locales/../src/engine/transfersocket.cpp:446 -#: ../../locales/../src/engine/transfersocket.cpp:468 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "転送の接続が中断されました: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." -msgstr "転送したデータは失われました." +msgstr "転送したデータは失われました。" -#: ../../locales/../src/interface/queue.cpp:389 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "転送中" @@ -7758,28 +8446,27 @@ msgid "Transfers" msgstr "転送" -#: ../../locales/../src/interface/QueueView.cpp:2961 -#: ../../locales/../src/interface/QueueView.cpp:2964 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "転送完了" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "拡張子なしのファイルを ASCII ファイルとして扱う(&W)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "以下の拡張子のファイルを ASCII ファイルとして扱う(&F):" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "変更されたホスト鍵を信用:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "新規ホスト鍵を信用:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "新しい鍵を信用して接続を実行しますか?" @@ -7787,69 +8474,75 @@ msgid "Trust this certificate and carry on connecting?" msgstr "この証明書を信用して接続を実行しますか?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "このホストを信用して接続を実行しますか?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "再試行" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "種類" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "FTP プロキシの種類:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "汎用プロキシの種類:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "アップロード(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "アップロード制限(&P):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "可能ならファイルの種類の関連付けを使用(&S)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "システム既定値を使用(&S)" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 +msgid "U&se system defaults for current language" +msgstr "既定のシステム言語を使用(&S)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" -msgstr "ユーザ@ホスト(&H)" +msgstr "ユーザー@ホスト(&H)" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "関連付けられていないエラー コード %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "ユニット:" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "不明" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." -msgstr "不明な FTP プロキシの種類です, ログイン シーケンスを生成できません." +msgstr "不明な FTP プロキシの種類です、ログイン シーケンスを生成できません。" -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "不明な SOCKS プロトコル バージョン: %d" @@ -7858,52 +8551,67 @@ msgid "Unknown certificate" msgstr "不明な証明書" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "不明なエラー %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "不明なエラー %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "不明なホスト鍵" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "" -"SOCKS ユーザ名/パスワード認証サブネゴシエーションの不明なプロトコル バージョ" -"ン: %d" +"SOCKS ユーザー名/パスワード認証サブネゴシエーションの不明なプロトコル バー" +"ジョン: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" -"不明なルート要素です, ファイルは FileZilla が生成したものではないかもしれませ" -"ん." +"不明なルート要素です、ファイルは FileZilla が生成したものではないかもしれませ" +"ん。" -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/engine/http/request.cpp:572 +msgid "Unknown transfer encoding" +msgstr "不明な転送文字コード" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" "これらの問題を解決するまでアクティブ モード FTP は機能せずパッシブ モードが使" -"われます." +"われます。" -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" "この問題を解決するまでアクティブ モード FTP は機能せずパッシブ モードが使われ" -"ます." +"ます。" -#: ../../locales/../src/engine/tlssocket.cpp:1015 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "未対応の証明書の種類" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:629 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "未対応のリダイレクト" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "アップロードして編集中を解除(&L)" @@ -7912,98 +8620,107 @@ msgid "Updates" msgstr "アップデート" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "アップロード" -#: ../../locales/../src/interface/edithandler.cpp:1109 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "アップロード失敗" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "アップロード制限: %s/秒" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "アップロード制限: なし" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "検索結果をアップロード" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "選択したディレクトリをアップロード" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" -msgstr "選択されたファイルとディレクトリをアップロード" +msgstr "選択したファイルとディレクトリをアップロード" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" -msgstr "このファイルをサーバに戻すためにアップロードしますか?" +msgstr "このファイルをサーバーに戻すためにアップロードしますか?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" -msgstr "このファイルをサーバにアップロードしますか?" +msgstr "このファイルをサーバーにアップロードしますか?" -#: ../../locales/../src/interface/edithandler.cpp:1103 -#: ../../locales/../src/interface/edithandler.cpp:1137 -#: ../../locales/../src/interface/edithandler.cpp:1293 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "アップロード中" -#: ../../locales/../src/interface/edithandler.cpp:1106 -#: ../../locales/../src/interface/edithandler.cpp:1295 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "アップロード中と未解決を取り除く" -#: ../../locales/../src/interface/edithandler.cpp:1140 -#: ../../locales/../src/interface/edithandler.cpp:1297 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "アップロード/編集解除中" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" -msgstr "カスタム文字セットを使用(&C)" +msgstr "カスタム文字コードを使用(&C)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" -msgstr "カスタム エディタを使用(&C):" +msgstr "カスタム エディターを使用(&C):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" -msgstr "テキスト ファイルに既定のエディタを使用(&D)" +msgstr "テキスト ファイルにデフォルトのエディターを使用(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2687 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "同期ブラウジングを使用(&S)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "正規表現を使用する" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" -"サーバが対応していれば UTF-8 を使用し, そうでなければローカル文字セットを使用" -"します." +"サーバーが対応していれば UTF-8 を使用し、そうでなければローカルの文字コードを" +"使用します。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" -msgstr "既定の動作を使用" +msgstr "デフォルトの動作を使用" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "使用可能なら明示的な FTP over TLS を使用" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" -msgstr "現在接続しているサーバを使用" +msgstr "現在接続しているサーバーを使用" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2328 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" -msgstr "サイト マネージャからサーバを使用" +msgstr "サイト マネージャーからサーバーを使用" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "システムの既定値を使用(&D)" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 +msgid "Use system &defaults for current language" +msgstr "既定のシステム言語を使用(&D)" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8015,13 +8732,13 @@ #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 msgid "Use the server's external IP address instead" -msgstr "代わりにサーバの外部 IP アドレスを使用" +msgstr "代わりにサーバーの外部 IP アドレスを使用" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." -msgstr "ルータの下にいて静的な外部 IP アドレスを持つ場合はこれを使用します." +msgstr "ルーターの下にいて静的な外部 IP アドレスを持つ場合はこれを使用します。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 msgid "" @@ -8029,24 +8746,26 @@ "above server once each session as soon as you use active mode for the first " "time. Only the version of FileZilla you're using is submitted to the server." msgstr "" -"動的 IP アドレスを持つ場合はこのオプションを使用します. あなたが初めてアク" -"ティブ モードを使用するとすぐに, FileZilla は各セッションについて一度上位サー" -"バと通信します. ご使用の FileZilla のバージョンだけがサーバに送信されます." +"動的 IP アドレスを持つ場合はこのオプションを使用します。あなたが初めてアク" +"ティブ モードを使用するとすぐに、FileZilla は各セッションについて一度上位サー" +"バーと通信します。ご使用の FileZilla のバージョンだけがサーバーに送信されま" +"す。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" -msgstr "ユーザ:" +msgstr "ユーザー:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" -msgstr "ユーザ名は空白の連続であってはなりません" +msgstr "ユーザー名は空白の連続であってはなりません" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:514 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" -"間違った文字セットを使用すると結果的にファイル名が正しく表示されません." +"間違った文字コードを使用すると結果的にファイル名が正しく表示されません。" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" @@ -8060,53 +8779,51 @@ msgid "Verbose log messages from wxWidgets" msgstr "wxWidgets からの詳細ログ メッセージ" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "証明書を検証中..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "非常に高い" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" -msgstr "隠しオプション セット (サーバが未対応) を表示" +msgstr "" +"隠しオプションセットを表示しようとしましたが、サーバーにサポートされていませ" +"ん" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "表示/編集" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "表示する列" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" -msgstr "書き込む(&R)" - -#: ../../locales/../src/interface/QueueView.cpp:1678 -msgid "Waiting" -msgstr "待機中" +msgstr "書き込み(&R)" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" -msgstr "接続一覧を待っています" +msgstr "接続リストを待っています" -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "パスワードを待っています" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "転送がキャンセルされるのを待機中" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "再試行を待機中..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." -msgstr "警告, 間違った IP からのデータ接続を無視しています." +msgstr "警告、間違った IP からのデータ接続を無視しています。" #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 msgid "" @@ -8116,30 +8833,30 @@ "\n" "Do you really want to check for nightly builds?" msgstr "" -"警告, nightly builds は自己責任で使用してください.\n" -"nightly builds にはサポートはありません.\n" -"nightly builds は期待通りに動かなかったりシステムにダメージを与えるかもしれま" -"せん.\n" +"警告、ナイトリー ビルドは自己責任で使用してください。\n" +"ナイトリー ビルドにはサポートはありません。\n" +"ナイトリー ビルドは期待通りに動作しない可能性があり、システムに損傷を与える可" +"能性があります。\n" "\n" -"nightly builds を本当にチェックしますか?" +"ナイトリー ビルドを本当にチェックしますか?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "警告: セキュリティ違反の可能性!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "FileZilla にようこそ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "新着情報" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "最新情報:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3637 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8147,44 +8864,62 @@ "FileZilla にパスワードの保存を許可すると、FileZilla を再起動した後でもパス" "ワードを入力せずに再接続可能です。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." msgstr "" -"有効にすると, ファイルをダウンロードするときに, ファイル名に含まれるローカル " -"オペレーティング システムが未対応の文字を置換します." +"有効にすると、ファイルをダウンロードするときに、ファイル名に含まれるローカル " +"オペレーティング システムが未対応の文字を置換します。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "接続済みの状態で新しく接続する場合:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "ワイドスクリーン" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3632 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "パスワードを保存しますか?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" -msgstr "書き込む(&R)" +msgstr "書き込み(&I)" -#: ../../locales/../src/interface/netconfwizard.cpp:448 #: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "間違った外部 IP アドレス" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/http/request.cpp:644 msgid "Wrong line endings" msgstr "間違った改行文字" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"誤ったマスター パスワードが入力されました。これを使用して、保存されたパスワー" +"ドを復号化することはできません。" + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"誤ったマスター パスワードが入力されました。このアイテムの復号化には使用できま" +"せん。" + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Yellow" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "はい" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8192,581 +8927,388 @@ "IPv6 だけが使用されるホストのようです。このウィザードはこの環境をサポートして" "いません。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "最新版の FileZilla を使用しています。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." -msgstr "このダイアログはいつでもヘルプ メニューから開くことができます." +msgstr "このダイアログはいつでもヘルプ メニューから開くことができます。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" -msgstr "最新版の FileZilla を Web サイトからダウンロードできます:" +msgstr "最新版の FileZilla を Webサイトからダウンロードできます:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." -msgstr "既定のポートを使用するにはポート欄を空欄のままにしてください." +msgstr "デフォルトのポートを使用するにはポート欄を空欄のままにしてください。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "" -"任意の位置で x を使用することで, 元のファイルのパーミッションを維持できます." +"任意の位置で x を使用することで、元のファイルのパーミッションを維持できます。" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"マスター パスワードを使用する場合は、パスワードと暗号化鍵を個別に変更すること" +"はできません。" -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." -msgstr "FileZilla 自身の設定ディレクトリから設定をインポートできません." +msgstr "FileZilla 自身の設定ディレクトリから設定をインポートできません。" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 msgid "" "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." msgstr "" -"正しくない文字を他の正しくない文字に置換することはできません. ファイル名に使" -"用できる文字を入力してください." +"正しくない文字を他の正しくない文字に置換することはできません。ファイル名に使" +"用できる文字を入力してください。" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "ファイルをルート ディレクトリにアップロードすることはできません。" + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" -"ファイルの新しい名前を入力しませんでした. その代わりにファイルを上書きします" -"か?" +"ファイルの新しい名前を入力しませんでした。代わりにファイルを上書きしますか?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." -msgstr "少なくとも 1 つのシンボリックリンクを選択する必要があります." +msgstr "少なくとも 1 つのシンボリックリンクを選択する必要があります。" -#: ../../locales/../src/interface/edithandler.cpp:1588 -#: ../../locales/../src/interface/search.cpp:725 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" -msgstr "10 個以上のファイルを選択していますが, 本当に編集しますか?" +msgstr "10 個以上のファイルを選択していますが、本当に編集しますか?" -#: ../../locales/../src/interface/LocalListView.cpp:1665 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" -msgstr "10 個以上のファイル/ディレクトリを選択していますが, 本当に開きますか?" +msgstr "10 個以上のファイル/ディレクトリを選択していますが、本当に開きますか?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:938 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." -msgstr "ホスト名を入力する必要があります." +msgstr "ホスト名を入力する必要があります。" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +msgid "You have to enter a key file path" +msgstr "鍵ファイルのパスを入力する必要があります。" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." -msgstr "ローカル ディレクトリを入力する必要があります." +msgstr "ローカル ディレクトリを入力する必要があります。" -#: ../../locales/../src/interface/netconfwizard.cpp:164 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "適切な IP アドレスを入力する必要があります." +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "リモート ディレクトリを入力する必要があります。" + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "適切な IPv4 アドレスを入力する必要があります。" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "適切な暗号鍵を入力する必要があります。" -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." -msgstr "書き込めるローカル ディレクトリを入力する必要があります." +msgstr "書き込み可能なローカル ディレクトリを入力する必要があります。" -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" -msgstr "アカウント名を入力する必要があります." +msgstr "アカウント名を入力する必要があります。" -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1013 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" -msgstr "ユーザ名を明確にする必要があります." +msgstr "ユーザー名を明確にする必要があります。" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." -msgstr "転送されたデータを誤って変更したルータ/ファイアウォールがあるようです." +msgstr "" +"転送されたデータを誤って変更したルーター/ファイアウォールがあるようです。" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "マスター パスワードを入力する必要があります。" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "ブックマーク名を入力する必要があります。" #: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 msgid "You need to enter a name for the log file." -msgstr "ログ ファイル名を入力する必要があります." +msgstr "ログ ファイルの名前を入力する必要があります。" -#: ../../locales/../src/interface/edithandler.cpp:1473 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." -msgstr "適切に引用符で囲まれたコマンドを入力する必要があります." +msgstr "適切に引用符で囲まれたコマンドを入力する必要があります。" #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 msgid "You need to enter a proxy host." -msgstr "プロキシのホストを入力する必要があります." +msgstr "プロキシのホストを入力する必要があります。" #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "プロキシ ポートを 1 から 65535 の範囲で入力する必要があります" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1091 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" -"少なくとも 1 つのパスを入力する必要があります. 空のブックマークには未対応で" -"す." +"少なくとも 1 つのパスを入力する必要があります。空のブックマークには未対応で" +"す。" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" "このブックマークで同期ブラウジングを有効にするにはローカル パスとリモート パ" -"スの両方を入力する必要があります." +"スの両方を入力する必要があります。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1060 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "" "このサイトで同期ブラウジングを有効にするにはローカル パスとリモート パスの両" -"方を入力する必要があります." +"方を入力する必要があります。" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"ファイルをダウンロードしたり、ファイルをアップロードしたいディレクトリに " +"FileZilla がアクセスできるようにする必要があります。" -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." -msgstr "ローカル ファイルを指定する必要があります." +msgstr "ローカル ファイルを指定する必要があります。" -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." -msgstr "リモート ファイルを指定する必要があります." +msgstr "リモート ファイルを指定する必要があります。" -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." -msgstr "リモート パスを指定する必要があります." +msgstr "リモート パスを指定する必要があります。" -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." -msgstr "サーバを指定する必要があります." +msgstr "サーバーを指定する必要があります。" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "" -"他のサーバへの接続に問題がないようでしたら, ファイル転送は適切に動作していま" -"す." +"他のサーバーへの接続に問題がないようでしたら、ファイル転送は適切に動作してい" +"ます。" -#: ../../locales/../src/interface/QueueView.cpp:3067 +#: ../../locales/../src/interface/QueueView.cpp:2775 msgid "Your computer will suspend unless you click Cancel." msgstr "キャンセルをクリックしない場合はサスペンドします。" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" -msgstr "後" +msgstr "次より後" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" -msgstr "前" +msgstr "次より前" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "先頭一致" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "バイト" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "部分一致" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "カスタム" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "含まない" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "等しくない" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "後方一致" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" -msgstr "完全一致" +msgstr "等しい" -#: ../../locales/../src/interface/filelistctrl.cpp:529 -#: ../../locales/../src/interface/filelistctrl.cpp:548 +#: ../../locales/../src/interface/filelistctrl.cpp:557 #: ../../locales/../src/interface/filelistctrl.cpp:575 -#: ../../locales/../src/interface/filelistctrl.cpp:591 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "ファイル" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp ロックファイル" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:96 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " "FileZilla executable." msgstr "" -"fzputtygen を起動できませんでした.\n" +"fzputtygen を起動できませんでした。\n" "この実行ファイルが FileZilla の実行ファイルと同じディレクトリにあることを確認" -"してください." +"してください。" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:462 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp は異なるバージョンの FileZilla に属しています" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1475 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "fzsftp を起動できませんでした" -#: ../../locales/../src/engine/tlssocket.cpp:1044 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj は異なるバージョンの FileZilla に属しています" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj を起動できませんでした" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj を起動できませんでした。\n" +"この実行ファイルが FileZilla の実行ファイルと同じディレクトリにあることを確認" +"してください。" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers が証明書を返しませんでした" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 失敗" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" -msgstr "より大きい" +msgstr "次より大きい" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "グループは実行可能" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "グループは読み取り可能" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "グループは書き込み可能" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" -msgstr "等しい" +msgstr "完全一致" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "セットされている" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "セットされていない" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" -msgstr "より小さい" +msgstr "次より小さい" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "正規表現に一致" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "新しい名前" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "所有者は実行可能" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "所有者は読み取り可能" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "所有者は書き込み可能" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1105 -#: ../../locales/../src/engine/tlssocket.cpp:1116 -#: ../../locales/../src/engine/tlssocket.cpp:1131 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:30 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "不明" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "誰でも実行可能" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "誰でも読み取り可能" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "誰でも書き込み可能" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" - -#~ msgid "The XML document is not well-formed: %s" -#~ msgstr "XML 文書は整形式ではありません: %s" - -#~ msgid "" -#~ "Unknown error opening the file. Make sure the file can be accessed and is " -#~ "a well-formed XML document." -#~ msgstr "" -#~ "ファイルを開く際の不明なエラーです. ファイルにアクセスできるか整形式の " -#~ "XML 文書かを確認してください." - -#~ msgid "Using proxy %s" -#~ msgstr "プロキシ %s を使用中" - -#~ msgid "" -#~ "Any changes made in the Site Manager will not be saved unless you repair " -#~ "the file." -#~ msgstr "" -#~ "ファイルを修復しない場合, サイト マネージャでの変更は保存されません." - -#~ msgid "Cannot compare directories, not connected to a server." -#~ msgstr "サーバに接続されていないため, ディレクトリを比較できません." - -#~ msgid "Clear &Site Manager entries" -#~ msgstr "サイト マネージャのエントリをクリア(&S)" - -#~ msgid "Clear &transfer queue" -#~ msgstr "転送キューをクリア(&T)" - -#~ msgid "%s (%d.%d KB/s)" -#~ msgstr "%s (%d.%d KB/秒)" - -#~ msgid "%s (%d.%d MB/s)" -#~ msgstr "%s (%d.%d MB/秒)" - -#~ msgid "%s bytes (%d B/s)" -#~ msgstr "%s バイト (%d バイト/s)" - -#~ msgid "%s bytes (%d.%d KB/s)" -#~ msgstr "%s バイト (%d.%d KB/s)" - -#~ msgid "%s bytes (%d.%d MB/s)" -#~ msgstr "%s バイト (%d.%d MB/s)" - -#~ msgid "&Copy" -#~ msgstr "コピー(&C)" - -#~ msgid "&Crash" -#~ msgstr "クラッシュ(&C)" - -#~ msgid "&Enable automatic update check" -#~ msgstr "自動的な更新チェックを有効にする(&E)" - -#~ msgid "&Finish" -#~ msgstr "完了(&F)" - -#~ msgid "&Number of days between update checks:" -#~ msgstr "更新チェックの日数間隔(&N):" - -#~ msgid "(At least 7 days)" -#~ msgstr "(最少 7 日間)" - -#~ msgid ", %H:%M:%S left" -#~ msgstr ", 残り %H:%M:%S" - -#~ msgid ", --:--:-- left" -#~ msgstr ", 残り --:--:--" - -#~ msgid "- Broken router and/or firewall" -#~ msgstr "- 壊れたルータ/ファイアウォール" - -#~ msgid "- File corrupted on mirror" -#~ msgstr "- ミラーするときにファイルが破損" - -#~ msgid "- Malware on your system" -#~ msgstr "- あなたのシステムにマルウェアが存在" - -#~ msgid "" -#~ "A file with that name is already being edited. Do you want to reopen '%s'?" -#~ msgstr "その名前のファイルは既に編集されました. '%s' を再び開きたいですか?" - -#~ msgid "Advanced options:" -#~ msgstr "詳細設定:" - -#~ msgid "" -#~ "Alternatively, visit https://filezilla-project.org/ to download the most " -#~ "recent version." -#~ msgstr "" -#~ "最新版をダウンロードするには https://filezilla-project.org/ を訪問してくだ" -#~ "さい." - -#~ msgid "Benchmark string coalescer" -#~ msgstr "string coalescer をベンチマーク" - -#~ msgid "C&heck for nightly builds of FileZilla" -#~ msgstr "FileZilla の nightly build もチェック(&H)" - -#~ msgid "Cannot load file, not a valid XML file." -#~ msgstr "適切な XML ファイルではないため, ファイルが読み込めません." - -#~ msgid "Certificate details" -#~ msgstr "証明書の詳細" - -#~ msgid "Check for &beta versions and release candidates" -#~ msgstr "ベータ版や RC 版もチェック(&B)" - -#~ msgid "Clear string coalescer" -#~ msgstr "string coalescer を消去" - -#~ msgid "Click on next to download the new version." -#~ msgstr "最新版をダウンロードするには次へをクリックしてください." - -#~ msgid "Connecting to server" -#~ msgstr "サーバに接続中" - -#~ msgid "Cop&y" -#~ msgstr "コピー(&Y)" - -#~ msgid "" -#~ "Crashes FileZilla instantly. Only used to debug the exception handler" -#~ msgstr "" -#~ "FileZilla は即座にクラッシュします. 例外ハンドラをデバッグするためだけに使" -#~ "われます" - -#~ msgid "" -#~ "Do you really want to check for beta versions?\n" -#~ "Unless you want to test new features, keep using stable versions." -#~ msgstr "" -#~ "本当にベータ版をチェックしますか?\n" -#~ "新機能をテストしたい場合以外は, 安定版の使用を継続してください." - -#~ msgid "Error, file name cannot be parsed." -#~ msgstr "エラー, ファイル名を構文解析できません." - -#~ msgid "Error, local file exists but cannot be removed" -#~ msgstr "エラー, ローカル ファイルは存在しますが削除できません" - -#~ msgid "Executable" -#~ msgstr "実行可能" - -#~ msgid "Failed to check for newer version of FileZilla." -#~ msgstr "FileZilla の新しいバージョンのチェックに失敗しました." - -#~ msgid "Failed to parse trusted root cert." -#~ msgstr "信用されたルート証明書の構文解析に失敗しました." - -#, fuzzy -#~ msgid "" -#~ "Filename may not contain any of the following characters: / \\ : * ? \" < " -#~ "> |" -#~ msgstr "ファイル名には次の文字は使用できません: / \\ : * ? \" < > |" - -#~ msgid "Fingerprint (MD5):" -#~ msgstr "拇印 (MD5):" - -#~ msgid "" -#~ "In case you prefer automatic updates, you can enable automatic update " -#~ "checks in the settings dialog." -#~ msgstr "" -#~ "自動的に更新を参照したい時は, 設定ダイアログの自動更新チェックを有効にして" -#~ "ください." - -#~ msgid "Log of update check:" -#~ msgstr "更新チェックのログ:" - -#~ msgid "Operating system problem detected" -#~ msgstr "オペレーティング システムの問題が検知されました" - -#~ msgid "Package" -#~ msgstr "パッケージ" - -#~ msgid "" -#~ "Please check https://filezilla-project.org/ for the most recent version " -#~ "of FileZilla." -#~ msgstr "" -#~ "FileZilla の最新版を https://filezilla-project.org/ でチェックしてくださ" -#~ "い." - -#~ msgid "" -#~ "Please check the package manager of your system for an updated package or " -#~ "visit https://filezilla-project.org/ to download the source code of " -#~ "FileZilla." -#~ msgstr "" -#~ "パッケージの更新のためにシステムのパッケージ マネージャをチェックするか " -#~ "FileZilla のソース コードをダウンロードするために https://filezilla-" -#~ "project.org を訪問してください." - -#~ msgid "Please enter an update interval of at least 7 days" -#~ msgstr "7 日以上の更新間隔を入力してください" - -#~ msgid "" -#~ "Please retry downloading the update. Possible reasons if the problem " -#~ "persists (listed in order of decreasing probability):" -#~ msgstr "" -#~ "更新のダウンロードを再試行してください. 問題が続く場合の理由の候補 (可能性" -#~ "が大きい順):" - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ for more information about " -#~ "FileZilla." -#~ msgstr "" -#~ "FileZilla についてのより多くの情報は https://filezilla-project.org/ を訪問" -#~ "してください." - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ to download the most recent " -#~ "version." -#~ msgstr "" -#~ "最新版をダウンロードするには https://filezilla-project.org/ を訪問してくだ" -#~ "さい." - -#~ msgid "Privacy policy:" -#~ msgstr "個人情報について:" - -#~ msgid "Resolving hostname" -#~ msgstr "ホスト名を解決しています" - -#~ msgid "Root certificate is not trusted" -#~ msgstr "ルート証明書は信用されていません" - -#~ msgid "Select download location for package" -#~ msgstr "パッケージをダウンロードする場所を選択してください" - -#~ msgid "" -#~ "The most recent version has been downloaded. Click on Finish to close " -#~ "FileZilla and to start the installation." -#~ msgstr "" -#~ "最新版は既にダウンロードされています. インストールを開始するために終了をク" -#~ "リックして FileZilla を終了させてください." - -#~ msgid "" -#~ "The most recent version has been downloaded. Please install it the same " -#~ "way you installed this version." -#~ msgstr "" -#~ "最新バージョンはダウンロード済みです. このバージョンと同じ方法でインストー" -#~ "ルしてください." - -#~ msgid "" -#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -#~ "seconds." -#~ msgstr "タイムゾーン オフセット: %d 秒, ローカル: %d 秒, 差分 %d 秒." - -#~ msgid "Update wizard" -#~ msgstr "更新ウィザード" - -#~ msgid "Use plain FTP" -#~ msgstr "平文 FTP を使用" - -#~ msgid "Using this wizard you can check for available updates to FileZilla." -#~ msgstr "" -#~ "このウィザードを使用することで FileZilla の利用できる更新をチェックできま" -#~ "す." - -#~ msgid "" -#~ "You are already using the most recent version of FileZilla. Please check " -#~ "again in future." -#~ msgstr "" -#~ "既に最新の FileZilla を利用しています. あとで再度チェックしてください." diff -Nru filezilla-3.15.0.2/locales/ko_KR.po filezilla-3.33.0/locales/ko_KR.po --- filezilla-3.15.0.2/locales/ko_KR.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/ko_KR.po 2017-09-19 21:36:39.000000000 +0000 @@ -2,28 +2,31 @@ msgstr "" "Project-Id-Version: FileZilla3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 16:18+0200\n" -"PO-Revision-Date: 2009-01-26 21:43+0900\n" -"Last-Translator: DylanYi \n" -"Language-Team: \n" +"POT-Creation-Date: 2016-06-20 16:57+0200\n" +"PO-Revision-Date: Mon May 16 2016 13:46:03 GMT+0900 (대한민국 표준시)\n" +"Last-Translator: DylanYi <0kymmx@gmail.com>\n" +"Language-Team: Korean (Republic of Korea)\n" +"Language: ko-KR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko_KR\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Poedit-SourceCharset: UTF-8\n" -#: ../../locales/../src/interface/statuslinectrl.cpp:65 -#: ../../locales/../src/interface/statuslinectrl.cpp:224 +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:199 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S 경과" -#: ../../locales/../src/interface/statuslinectrl.cpp:69 -#: ../../locales/../src/interface/statuslinectrl.cpp:232 +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:205 msgid "%H:%M:%S left" msgstr "%H:%M:%S 남음" -#: resources.h:740 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" @@ -31,106 +34,113 @@ "%a - 계정 (로그온 유형 중 \"계정\"을 사용하지 않으면 이것이 포함된 행은 생략" "됩니다.)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 -#: ../../locales/../src/interface/filelist_statusbar.cpp:74 -#: ../../locales/../src/interface/filelist_statusbar.cpp:86 +#: ../../locales/../src/interface/filelist_statusbar.cpp:47 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 +#: ../../locales/../src/interface/filelist_statusbar.cpp:67 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d 디렉터리" -#: ../../locales/../src/interface/RemoteListView.cpp:1456 -#: ../../locales/../src/interface/search.cpp:469 -#: ../../locales/../src/interface/search.cpp:722 +#: ../../locales/../src/interface/RemoteListView.cpp:1396 +#: ../../locales/../src/interface/search.cpp:801 +#: ../../locales/../src/interface/search.cpp:1188 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d 디렉터리 및 그 내용" -#: ../../locales/../src/interface/filelist_statusbar.cpp:62 -#: ../../locales/../src/interface/filelist_statusbar.cpp:85 -#: ../../locales/../src/interface/RemoteListView.cpp:1455 -#: ../../locales/../src/interface/search.cpp:468 -#: ../../locales/../src/interface/search.cpp:721 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 +#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../../locales/../src/interface/RemoteListView.cpp:1395 +#: ../../locales/../src/interface/search.cpp:800 +#: ../../locales/../src/interface/search.cpp:1187 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d 파일" -#: ../../locales/../src/interface/filelist_statusbar.cpp:81 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d 파일. 총 크기: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#: ../../locales/../src/interface/filelist_statusbar.cpp:61 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d 파일. 총 크기: 최소 %s" -#: ../../locales/../src/interface/QueueView.cpp:2938 -#, c-format -msgid "%d files added to queue" -msgstr "%d개의 파일이 대기열에 추가됨" - -#: ../../locales/../src/engine/ControlSocket.cpp:106 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 초" -#: resources.h:737 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 msgid "%h - Host" msgstr "%h - 호스트" -#: resources.h:739 -#, no-c-format +#: ../../locales/../src/interface/recursive_operation_status.cpp:117 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu 디렉터리" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:116 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu 파일" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#, c-format msgid "%p - Password" msgstr "%p - 비밀번호" -#: ../../locales/../src/interface/statuslinectrl.cpp:180 +#: ../../locales/../src/interface/statuslinectrl.cpp:160 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:183 +#: ../../locales/../src/interface/statuslinectrl.cpp:163 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:40 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - 인증서가 만료됨!" -#: ../../locales/../src/interface/verifycertdialog.cpp:24 +#: ../../locales/../src/interface/verifycertdialog.cpp:32 #, c-format msgid "%s - Not yet valid!" msgstr "%s - 아직 유효하지 않음!" -#: resources.h:741 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#, c-format msgid "%s - Proxy user" msgstr "%s - 프록시 사용자" -#: ../../locales/../src/interface/filelist_statusbar.cpp:91 +#: ../../locales/../src/interface/filelist_statusbar.cpp:72 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s 및 %s. 총 크기: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:89 +#: ../../locales/../src/interface/filelist_statusbar.cpp:70 #, c-format msgid "%s and %s. Total size: At least %s" -msgstr "%s와 %s. 총 크기: 적어도 %s" +msgstr "%s와 %s. 총 크기: 최소 %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:34 +#: ../../locales/../src/engine/sizeformatting_base.cpp:66 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s 바이트" -#: ../../locales/../src/interface/FileZilla.cpp:704 +#: ../../locales/../src/interface/FileZilla.cpp:582 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -144,7 +154,7 @@ "\n" "FileZilla를 다시 다운로드하십시오. 이 문제가 지속되면 버그로 등록해 주십시오." -#: ../../locales/../src/interface/FileZilla.cpp:798 +#: ../../locales/../src/interface/FileZilla.cpp:667 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -161,846 +171,964 @@ "- %s이 PATH 환경 변수의 디렉터리에 존재하는지 확인하십시오.\n" "- %s의 전체 경로를 FZ_FZSFTP 환경 변수에 설정해 주십시오." -#: ../../locales/../src/interface/verifycertdialog.cpp:57 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s / %d 비트" -#: resources.h:738 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#, c-format msgid "%u - Username" msgstr "%u - 사용자명" -#: resources.h:742 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 msgid "%w - Proxy password" msgstr "%w - 프록시 비밀번호" -#: resources.h:417 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 msgid "&Abort previous connection and connect in current tab" msgstr "이전 연결을 중단하고 현재 탭에서 연결(&A)" -#: resources.h:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&About..." msgstr "FileZilla 정보(&A)..." -#: resources.h:322 resources.h:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "계정(&A):" -#: resources.h:642 resources.h:706 resources.h:984 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:478 msgid "&Active" msgstr "능동형(&A)" -#: resources.h:495 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 msgid "&Add bookmark..." msgstr "북마크 추가(&A)..." -#: resources.h:508 resources.h:527 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 msgid "&Add files to queue" msgstr "파일을 대기열에 추가(&A)" -#: resources.h:750 -msgid "&Add keyfile..." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +msgid "&Add key file..." msgstr "키 파일 추가(&A)..." -#: resources.h:588 resources.h:609 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:496 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:559 msgid "&Add to queue" msgstr "대기열에 추가(&A)" -#: resources.h:978 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:407 msgid "&Adjust server timezone offset:" msgstr "서버 시간대 맞추기(&A):" -#: resources.h:28 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "이후 세션에서 항상 인증서 신뢰(&A)" -#: resources.h:144 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 msgid "&Always trust this host, add this key to the cache" msgstr "항상 이 호스트를 신뢰하고 이 키를 캐시에 등록(&A)" -#: resources.h:913 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 msgid "&Always use default editor" msgstr "항상 기본 편집기 사용(&A)" -#: resources.h:365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "연계되지 않은 파일에 항상 선택 항목 사용(&A)" -#: resources.h:75 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 msgid "&Always use this action" msgstr "항상 이 동작 사용(&A)" -#: resources.h:718 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 msgid "&Ask your operating system for the external IP address" msgstr "운영체계를 통해 외부 IP 주소 확인(&A)" -#: resources.h:477 resources.h:622 resources.h:788 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "자동(&A)" -#: resources.h:990 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 msgid "&Autodetect" msgstr "자동 감지(&A)" -#: resources.h:479 resources.h:624 resources.h:790 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "바이너리(&B)" -#: resources.h:867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "이진수 단위의 SI 표기(&B) (예: 1 KB = 1024 바이트)" -#: resources.h:494 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 msgid "&Bookmarks" msgstr "북마크(&B)" -#: resources.h:304 resources.h:341 resources.h:347 resources.h:364 -#: resources.h:382 resources.h:910 resources.h:936 resources.h:975 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:367 msgid "&Browse..." msgstr "찾아보기(&B)..." -#: resources.h:778 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 msgid "&Burst tolerance:" msgstr "버스트 오차(&B):" -#: resources.h:92 resources.h:159 resources.h:427 resources.h:434 -#: resources.h:438 resources.h:690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3807 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" msgstr "취소(&C)" -#: resources.h:454 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." msgstr "개인 정보 비우기(&C)..." -#: resources.h:1030 +#: ../../locales/../src/interface/resources/xrc/update.xrc:28 msgid "&Close" -msgstr "" +msgstr "닫기(&C)" -#: resources.h:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "FileZilla 닫기(&C)" -#: resources.h:632 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:642 msgid "&Configure speed limits..." msgstr "속도 제한 구성(&C)..." -#: resources.h:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 msgid "&Configure..." msgstr "구성(&C)..." -#: resources.h:996 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:619 msgid "&Connect" msgstr "연결(&C)" -#: resources.h:442 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 msgid "&Copy current connection to Site Manager..." msgstr "현재의 연결을 사이트 관리자로 복사(&C)..." -#: resources.h:134 resources.h:568 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "클립보드로 복사(&C)" -#: resources.h:573 -msgid "&Crash" -msgstr "비정상 종료(&C)" - -#: resources.h:516 resources.h:532 resources.h:590 resources.h:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "&Create directory" msgstr "디렉터리 만들기(&C)" -#: resources.h:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Create new tab" msgstr "새 탭 만들기(&C)" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "디버그(&D)" -#: resources.h:944 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Debug information in message log:" msgstr "메시지 로그의 디버그 정보(&D):" -#: resources.h:906 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 msgid "&Default editor:" msgstr "기본 편집기(&D):" -#: resources.h:475 resources.h:550 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "중복 파일 기본 동작(&D)..." -#: resources.h:700 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 msgid "&Delay between failed login attempts:" msgstr "실패한 로그인 시도 간격(&D):" -#: resources.h:164 resources.h:178 resources.h:354 resources.h:521 -#: resources.h:617 resources.h:959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "삭제(&D)" -#: resources.h:395 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3353 msgid "&Delete symlink" msgstr "심링크 삭제(&D)" -#: resources.h:460 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 msgid "&Directory comparison" msgstr "디렉터리 비교(&D)" -#: resources.h:263 +#: ../../locales/../src/interface/state.cpp:918 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "탐색 동기화를 중지하고 로컬 디렉터리를 변경하시겠습니까?" + +#: ../../locales/../src/interface/state.cpp:990 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "탐색 동기화를 중지하고 리모트 디렉터리를 변경하시겠습니까?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 msgid "&Discard local file then download and edit file anew" msgstr "로컬 파일을 버리고 파일을 새로 다운로드하여 편집하기(&D)" -#: resources.h:488 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Disconnect" msgstr "연결 종료(&D)" -#: resources.h:559 -msgid "&Disconnect from server" -msgstr "서버 연결 종료(&D)" - -#: resources.h:843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "평균 전송 속도가 아니라 순간 속도 표시(&D)" -#: resources.h:865 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 msgid "&Display size in bytes" msgstr "바이트 크기로 표시(&D)" -#: resources.h:432 -msgid "&Do not remember passwords" -msgstr "비밀번호 저장 안함(&D)" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3790 +msgid "&Do not remember passwords (recommended)" +msgstr "비밀번호 저장 안함(권장)(&D)" #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "이 창 다시 보지 않음(&D)." -#: resources.h:723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 msgid "&Don't use external IP address on local connections." msgstr "로컬 연결에 외부 IP 주소를 사용하지 않음(&D)" -#: resources.h:893 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "&Double-click action on files:" msgstr "파일 더블 클릭시 동작(&D):" -#: resources.h:525 resources.h:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "&Download" msgstr "다운로드(&D)" -#: resources.h:381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 msgid "&Download to:" msgstr "다운로드 위치(&D)" -#: resources.h:625 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:608 msgid "&Download..." msgstr "다운로드(&D)..." -#: resources.h:195 resources.h:800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "다운로드(&D):" -#: resources.h:452 resources.h:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 msgid "&Edit" msgstr "편집(&E)" -#: resources.h:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 msgid "&Edit filter rules..." msgstr "필터 규칙 편집(&E)..." -#: resources.h:461 resources.h:481 resources.h:603 resources.h:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 msgid "&Enable" msgstr "기능 사용(&E)" -#: resources.h:420 resources.h:773 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +msgid "&Enable compression" +msgstr "압축 기능(&E)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3679 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "속도 제한 기능 사용(&E)" -#: resources.h:994 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:565 msgid "&Encoding:" msgstr "인코딩(&E):" -#: resources.h:965 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 msgid "&Encryption:" msgstr "암호화(&E):" -#: resources.h:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "명령어 직접 입력(&E)..." -#: resources.h:416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3614 msgid "&Establish connection in a new tab" msgstr "새 탭에서 연결하기(&E)" -#: resources.h:98 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 msgid "&Execute" msgstr "실행(&E)" -#: resources.h:230 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 msgid "&Export Site Manager entries" msgstr "사이트 관리자 항목 내보내기(&E)" -#: resources.h:447 resources.h:621 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "&Export..." msgstr "내보내기(&E)..." -#: resources.h:728 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 msgid "&Fall back to active mode" msgstr "능동형 모드로 자동 전환(&F)" -#: resources.h:439 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 msgid "&File" msgstr "파일(&F)" -#: resources.h:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:527 msgid "&File Attributes..." msgstr "파일 속성(&F)..." -#: resources.h:545 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "파일 권한(&F)..." -#: resources.h:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 msgid "&File:" msgstr "파일(&F):" -#: resources.h:182 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" msgstr "필터 조건(&F):" -#: resources.h:161 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "&Filter sets:" msgstr "필터 설정(&F):" -#: resources.h:176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "필터(&F):" -#: resources.h:255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 msgid "&Finish editing and delete local file" msgstr "로컬 파일 편집 완료 후 삭제(&F)" -#: resources.h:385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3278 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "로컬 경로를 무시하고 모든 해당 파일을 대상 디렉터리로 업로드합니다(&F)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3183 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" "(&F)원격 경로의 모든 파일을 경로에 상관 없이 대상 디렉터리로 다운로드합니다" -#: resources.h:396 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3360 msgid "&Follow symlink, delete target directory contents" msgstr "(&F)심링크를 따라 대상 디렉터리 내용을 삭제합니다" -#: resources.h:721 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 msgid "&Get external IP address from the following URL:" msgstr "다음 URL로부터 외부 IP 주소 가져오기(&G):" -#: resources.h:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 msgid "&Getting help..." msgstr "도움이 필요할 때는(&G)..." -#: resources.h:335 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 msgid "&Global bookmark" msgstr "전역 북마크(&G)" -#: resources.h:757 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 msgid "&HTTP/1.1 using CONNECT method" msgstr "CONNECT 방법을 사용한 &HTTP/1.1" -#: resources.h:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 msgid "&Help" msgstr "도움말(&H)" -#: resources.h:464 resources.h:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "&Hide identical files" msgstr "동일한 파일 숨기기(&H)" -#: resources.h:552 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "가장 높음(&H)" -#: resources.h:716 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 msgid "&Highest available port:" msgstr "가장 높은 가능 포트(&H):" -#: resources.h:316 resources.h:680 resources.h:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 msgid "&Host:" msgstr "호스트(&H):" -#: resources.h:866 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "IEC 이진수 단위(&I) (예. 1 KB = 1024 바이트)" -#: resources.h:854 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "ISO 8601(&I) (예: 2007-09-15)" -#: resources.h:448 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 msgid "&Import..." msgstr "가져오기(&I)..." -#: resources.h:915 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Inherit system's filetype associations" msgstr "시스템의 파일 연동 체계 사용(&I)" -#: resources.h:1037 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "&Install new version" -msgstr "" +msgstr "새 버전 설치(&I)" -#: resources.h:384 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3271 msgid "&Keep remote path structure relative to search root" msgstr "검색 최상위에 상대적으로 원격 경로 구조 유지(&K)" -#: resources.h:823 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +msgid "&Key file:" +msgstr "키 파일(&K):" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "파일 및 디렉터리 난 배치(&L):" -#: resources.h:713 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 msgid "&Limit local ports used by FileZilla" msgstr "FileZilla가 사용하는 로컬 포트 제한(&L)" -#: resources.h:986 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:494 msgid "&Limit number of simultaneous connections" msgstr "동시 연결 수 제한(&L)" -#: resources.h:470 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Local directory tree" msgstr "로컬 디렉터리 트리(&L)" -#: resources.h:340 resources.h:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "로컬 디렉터리(&L):" -#: resources.h:934 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 +msgid "&Local search" +msgstr "로컬 검색(&L)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "&Log to file" msgstr "로그 파일(&L)" -#: resources.h:966 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "로그온 유형(&L):" -#: resources.h:319 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 msgid "&Logontype:" msgstr "로그온 유형(&L):" -#: resources.h:555 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "낮음(&L)" -#: resources.h:496 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Manage bookmarks..." msgstr "북마크 관리(&M)..." -#: resources.h:484 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Manual transfer..." msgstr "수동 전송(&M)..." -#: resources.h:987 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:504 msgid "&Maximum number of connections:" msgstr "최대 동시 연결 수(&M):" -#: resources.h:698 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 msgid "&Maximum number of retries:" msgstr "최대 재시도 횟수(&M):" -#: resources.h:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Message log" msgstr "메시지 로그(&M)" -#: resources.h:836 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 msgid "&Minimize to tray" msgstr "트레이로 최소화(&M)" -#: resources.h:883 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 msgid "&Name sorting mode:" msgstr "정렬 모드(&N):" -#: resources.h:338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" msgstr "이름(&N):" -#: resources.h:453 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 msgid "&Network configuration wizard..." msgstr "네트워크 구성 마법사(&N)..." -#: resources.h:177 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 msgid "&New" msgstr "새로 만들기(&N)" -#: resources.h:955 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 msgid "&New Site" msgstr "새 사이트(&N)" -#: ../../locales/../src/interface/Mainfrm.cpp:1795 +#: ../../locales/../src/interface/Mainfrm.cpp:1649 msgid "&New version available!" msgstr "새 버전이 있습니다!(&N)" -#: resources.h:257 +#: ../../locales/../src/interface/netconfwizard.cpp:27 +msgid "&Next >" +msgstr "다음(&N) >" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 msgid "&No" msgstr "아니요(&N)" -#: resources.h:731 resources.h:756 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "없음(&N)" -#: resources.h:554 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "일반(&N)" -#: resources.h:107 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 msgid "&Numeric value:" msgstr "숫자값(&N)" -#: resources.h:91 resources.h:356 resources.h:997 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:627 msgid "&OK" msgstr "확인(&O)" -#: resources.h:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 msgid "&OPEN" msgstr "열기(&O)" -#: resources.h:512 resources.h:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "&Open" msgstr "열기(&O)" -#: resources.h:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 msgid "&Overwrite" msgstr "덮어쓰기(&O)" -#: resources.h:985 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:485 msgid "&Passive" msgstr "수동형(&P)" -#: resources.h:89 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 msgid "&Password:" msgstr "비밀번호(&P):" -#: resources.h:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "소리 재생(&P)" -#: resources.h:317 resources.h:684 resources.h:963 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 msgid "&Port:" msgstr "포트(&P):" -#: resources.h:480 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 msgid "&Preserve timestamps of transferred files" msgstr "전송된 파일의 파일 시간 보존(&P)" -#: resources.h:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Queue" msgstr "대기열(&Q)" -#: resources.h:686 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 msgid "&Quickconnect" msgstr "빠른 연결(&Q)" -#: resources.h:468 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "&Quickconnect bar" msgstr "빠른 연결줄(&Q)" -#: resources.h:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +msgid "&Quickconnect history" +msgstr "빠른 연결 이력(&Q)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Read" msgstr "읽기(&R)" -#: resources.h:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 msgid "&Reconnect" msgstr "다시 연결(&R)" -#: resources.h:458 resources.h:630 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +msgid "&Reconnect information" +msgstr "재연결 정보(&R)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:633 msgid "&Refresh" msgstr "새로 고침(&R)" -#: resources.h:90 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 msgid "&Remember password until FileZilla is closed" msgstr "FileZilla 종료시까지 비밀번호 기억(&R)" -#: resources.h:431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3784 msgid "&Remember passwords" msgstr "비밀번호 기억(&R)" -#: resources.h:342 resources.h:348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "리모트 디렉터리(&R):" -#: resources.h:306 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 msgid "&Remote path:" msgstr "리모트 경로(&R):" -#: resources.h:794 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3017 +msgid "&Remote search" +msgstr "리모트 검색(&R)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "제거(&R)" -#: resources.h:751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 msgid "&Remove key" msgstr "키 제거(&R)" -#: resources.h:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "선택된 항목 제거(&R)" -#: resources.h:179 resources.h:353 resources.h:523 resources.h:541 -#: resources.h:596 resources.h:619 resources.h:958 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "이름 바꾸기(&R)" -#: resources.h:163 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 msgid "&Rename..." msgstr "이름 바꾸기(&R)..." -#: resources.h:262 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 msgid "&Reopen local file" msgstr "로컬 파일 다시 열기(&R)" -#: resources.h:785 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 msgid "&Replace invalid characters with:" msgstr "비정상적인 글자를 다음으로 바꿈(&R):" -#: resources.h:503 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 msgid "&Report a bug..." msgstr "버그 신고(&R)..." -#: resources.h:578 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "주의 필요(&R)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 msgid "&Reset and requeue all" msgstr "전부 초기화하고 다시 대기(&R)" -#: resources.h:679 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" msgstr "마법사 재시작(&R)" -#: resources.h:72 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 msgid "&Resume" msgstr "전송 재개(&R)" -#: resources.h:560 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "명령 실행(&R)..." -#: resources.h:693 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 msgid "&Run configuration wizard now..." msgstr "구성 마법사 실행(&R)..." -#: resources.h:929 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 msgid "&Run update check now..." msgstr "업데이트 확인 실행(&R)..." -#: resources.h:733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 msgid "&SITE" msgstr "사이트(&S)" -#: resources.h:759 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: resources.h:162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 msgid "&Save as..." msgstr "다른 이름으로 저장(&S)..." -#: resources.h:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 msgid "&Search" msgstr "검색(&S)" -#: resources.h:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 msgid "&Search remote files..." msgstr "리모트 파일 검색(&S)..." -#: resources.h:954 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 msgid "&Select Entry:" msgstr "항목 선택(&S):" -#: resources.h:904 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 msgid "&Select language:" msgstr "언어 선택(&S):" -#: resources.h:294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 msgid "&Select the columns that should be displayed:" msgstr "표시할 열을 선택하세요(&S)." -#: resources.h:308 resources.h:485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "서버(&S)" -#: resources.h:238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "&Settings" msgstr "설정(&S)" -#: resources.h:455 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 msgid "&Settings..." msgstr "설정(&S)..." -#: resources.h:943 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 msgid "&Show debug menu" msgstr "디버그 메뉴 표시(&S)" -#: resources.h:561 -msgid "&Show message" -msgstr "메시지 표시(&S)" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +msgid "&Show detailed log" +msgstr "상세 로그 보기(&S)" -#: resources.h:933 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 msgid "&Show timestamps in message log" msgstr "메시지 로그에 일시 표시(&S)" -#: resources.h:440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +msgid "&Site Manager entries" +msgstr "사이트 관리자 항목(&S)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "사이트 관리자(&S)..." -#: resources.h:336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "&Site-specific bookmark" msgstr "사이트별 북마크(&S)" -#: resources.h:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 msgid "&Skip" msgstr "건너뛰기(&S)" -#: resources.h:483 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 msgid "&Speed limits" msgstr "속도 제한(&S)" -#: resources.h:387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3194 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3289 msgid "&Start transfer immediately" msgstr "즉시 전송 시작(&S)" -#: resources.h:828 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 msgid "&Swap local and remote panes" msgstr "로컬 창과 리모트 창 바꾸기(&S)" -#: resources.h:575 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "&TLS Ciphers" msgstr "&TLS 암호화" -#: ../../locales/../src/interface/netconfwizard.cpp:228 +#: ../../locales/../src/interface/netconfwizard.cpp:234 msgid "&Test" msgstr "시험(&T)" -#: resources.h:846 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 msgid "&Theme:" msgstr "테마(&T):" -#: resources.h:473 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 msgid "&Transfer" msgstr "전송(&T)" -#: resources.h:982 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 msgid "&Transfer mode:" msgstr "전송 모드(&T):" -#: resources.h:472 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "전송 대기열(&T)" -#: resources.h:797 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 msgid "&Treat dotfiles as ASCII files" msgstr "도트 파일은 아스키 파일로 취급(&T)" -#: resources.h:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 msgid "&Unedit" msgstr "미편집(&U)" -#: resources.h:157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 msgid "&Update cached key for this host" msgstr "이 호스트의 캐시된 키 업데이트(&U)" -#: resources.h:506 resources.h:607 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 msgid "&Upload" msgstr "업로드(&U)" -#: resources.h:205 resources.h:809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3248 +msgid "&Upload to:" +msgstr "업로드 목적지(&U):" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +msgid "&Upload..." +msgstr "업로드(&U)..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "업로드(&U):" -#: resources.h:363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "사용자 프로그램 사용(&U)" -#: resources.h:977 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:388 msgid "&Use synchronized browsing" msgstr "탐색 동기화 기능 사용(&U)" -#: resources.h:908 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Use system's default editor for text files" msgstr "텍스트 파일에 시스템의 기본 편집기 사용(&U)" -#: resources.h:719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 msgid "&Use the following IP address:" msgstr "다음 IP 주소 사용(&U):" -#: resources.h:727 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 msgid "&Use the server's external IP address instead" msgstr "서버의 외부 IP 주소 사용(&U)" -#: resources.h:869 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "&Use thousands separator" msgstr "천 단위 구분자 사용(&U)" -#: resources.h:88 resources.h:320 resources.h:967 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "사용자(&U):" -#: resources.h:682 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 msgid "&Username:" msgstr "사용자명(&U):" -#: ../../locales/../src/interface/Mainfrm.cpp:1789 +#: ../../locales/../src/interface/Mainfrm.cpp:1643 #, c-format msgid "&Version %s" msgstr "버전(&V) %s" -#: resources.h:457 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 msgid "&View" msgstr "보기(&V)" -#: resources.h:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:614 msgid "&View/Edit" msgstr "보기/편집(&V)" -#: resources.h:914 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "로컬 파일 편집을 감시하여 수정시 업로드 여부 묻기(&W)" -#: resources.h:924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "&When checking for updates, check for:" msgstr "업데이트 확인할 항목(&W):" -#: resources.h:97 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Write" msgstr "쓰기(&W)" -#: resources.h:256 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 msgid "&Yes" msgstr "예(&Y)" -#: ../../locales/../src/engine/local_path.cpp:440 +#: ../../locales/../src/engine/local_path.cpp:444 #: ../../locales/../src/engine/local_path.cpp:490 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' 이(가) 존재하지 않거나 접근할 수 없습니다." -#: ../../locales/../src/engine/local_path.cpp:456 -#: ../../locales/../src/engine/local_path.cpp:477 -#: ../../locales/../src/engine/local_path.cpp:484 +#: ../../locales/../src/engine/local_path.cpp:459 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:485 #, c-format msgid "'%s' is not a directory." msgstr "'%s'는 디렉터리가 아닙니다." -#: ../../locales/../src/interface/manual_transfer.cpp:445 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:957 +#: ../../locales/../src/interface/manual_transfer.cpp:427 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:966 msgid "'Account' logontype not supported by selected protocol" msgstr "선택된 프로토콜은 '계정' 로그온 유형을 지원하지 않습니다." -#: ../../locales/../src/interface/manual_transfer.cpp:459 +#: ../../locales/../src/interface/manual_transfer.cpp:441 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." msgstr "" +"'일반' 및 '계정' 로그온 방식을 사용할 수 없어서 대신 '비밀번호 묻기'를 사용합" +"니다." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:972 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:981 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" +"'일반' 및 '계정' 로그온 방식을 사용할 수 없습니다. '비밀번호 묻기'로 변경됐습" +"니다." -#: ../../locales/../src/interface/Mainfrm.cpp:569 +#: ../../locales/../src/interface/Mainfrm.cpp:584 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1010,57 +1138,66 @@ "자를 서버에 보내기 위해 사용됩니다. 앞부분의 'quote' 없이 그대로 명령을 입력" "하셔야 합니다." -#: ../../locales/../src/interface/filelist_statusbar.cpp:96 -#: ../../locales/../src/interface/filelist_statusbar.cpp:105 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 +#: ../../locales/../src/interface/filelist_statusbar.cpp:83 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d 항목 필터됨)" -#: resources.h:769 resources.h:771 +#: ../../locales/../src/interface/update_dialog.cpp:309 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% 다운로드됨)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 msgid "(0 for no limit)" msgstr "(0이면 제한 없음)" -#: resources.h:699 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 msgid "(0-99)" msgstr "(0-99)" -#: resources.h:701 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 msgid "(0-999 seconds)" msgstr "(0-999 초)" -#: resources.h:767 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 msgid "(1-10)" msgstr "(1-10)" -#: resources.h:695 -msgid "(5-9999, 0 to disable)" -msgstr "(5-9999, 0은 해제)" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, 0은 해제)" -#: ../../locales/../src/interface/aboutdialog.cpp:136 -#: ../../locales/../src/interface/aboutdialog.cpp:224 +#: ../../locales/../src/interface/aboutdialog.cpp:85 +#: ../../locales/../src/interface/aboutdialog.cpp:174 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "" -#: resources.h:861 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 msgid "(example: %H:%M)" msgstr "(예: %H:%M)" -#: resources.h:856 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "(example: %Y-%m-%d)" msgstr "(예: %Y-%m-%d)" -#: resources.h:422 resources.h:424 resources.h:775 resources.h:777 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3698 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3715 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format msgid "(in %s/s)" msgstr "(%s/s)" -#: resources.h:667 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:235 +#: ../../locales/../src/interface/statuslinectrl.cpp:208 msgid "--:--:-- left" msgstr "--:--:-- 남음" @@ -1080,39 +1217,43 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s는 FTP URL과 같이 사용할 수 없습니다." -#: resources.h:945 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 msgid "0 - None" msgstr "0 - 없음" -#: resources.h:946 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "1 - Warning" msgstr "1 - 경고" -#: resources.h:947 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 msgid "2 - Info" msgstr "2 - 정보" -#: resources.h:948 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 msgid "3 - Verbose" msgstr "3 - 상세" -#: ../../locales/../src/interface/aboutdialog.cpp:158 -msgid "32 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:98 +msgid "32-bit system" msgstr "32비트 시스템" -#: resources.h:949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 msgid "4 - Debug" msgstr "4 - 디버그" -#: ../../locales/../src/interface/aboutdialog.cpp:156 -msgid "64 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:96 +msgid "64-bit system" msgstr "64비트 시스템" -#: resources.h:497 +#: ../../locales/../src/interface/netconfwizard.cpp:28 +msgid "< &Back" +msgstr "< 이전(&B)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:108 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:106 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "입력하신 이름은 이미 존재하는 북마크입니다. 다른 이름을 입력해주세요." @@ -1121,13 +1262,13 @@ msgid "A default editor needs to be set." msgstr "기본 편집기를 설정해야 합니다." -#: ../../locales/../src/interface/RemoteListView.cpp:158 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:816 +#: ../../locales/../src/interface/RemoteListView.cpp:160 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:759 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "디렉터리를 하위 디렉터리에 끌어다 놓을 수는 없습니다." -#: resources.h:639 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" "A few servers don't allow passive mode or are misconfigured. In such cases " "you would have to use active mode. In active mode, FileZilla opens a port " @@ -1137,27 +1278,20 @@ "사용자는 능동형 모드를 사용해야 합니다. 능동형 모드에서는 FileZilla가 포트 하" "나를 연 후 서버가 그 포트로 연결하도록 요청합니다." -#: resources.h:244 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 msgid "A file previously opened has been changed." msgstr "이전에 연 파일이 변경됐습니다." -#: ../../locales/../src/interface/LocalListView.cpp:1748 -#, c-format -msgid "" -"A file with that name is already being edited. Do you want to reopen '%s'?" -msgstr "같은 이름의 파일을 이미 편집 중입니다. '%s' 파일을 다시 여시겠습니까?" - -#: ../../locales/../src/interface/LocalListView.cpp:1744 -#: ../../locales/../src/interface/RemoteListView.cpp:2440 +#: ../../locales/../src/interface/edithandler.cpp:1645 msgid "A file with that name is already being transferred." msgstr "같은 이름의 파일이 이미 전송되고 있습니다." -#: ../../locales/../src/interface/RemoteListView.cpp:2445 +#: ../../locales/../src/interface/edithandler.cpp:1649 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "같은 이름의 파일이 아직 편집 중입니다. 닫은 후 재시도하십시오." -#: ../../locales/../src/interface/FileZilla.cpp:683 +#: ../../locales/../src/interface/FileZilla.cpp:561 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1170,11 +1304,11 @@ "이 문제를 수정하지 않으면 해당 파일은 파일 목록에 표시되지 않습니다.\n" "이 메시지는 앞으로 이 세션에서는 더 표시되지 않습니다." -#: resources.h:1031 +#: ../../locales/../src/interface/resources/xrc/update.xrc:50 msgid "A new version of FileZilla is available:" msgstr "FileZilla 새 버전 있음:" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:644 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1182,7 +1316,7 @@ "정상적인 서버는 항상 모든 파일을 표시하지만 일부 잘못된 서버는 사용자로부터 " "파일을 숨깁니다. 강제로 서버의 모든 파일을 표시하려면 이 옵션을 사용하십시오." -#: resources.h:711 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1190,7 +1324,7 @@ "일반적인 서버에는 필요하지 않은 항목입니다. 필요하다면 서버 관리자에게 문의하" "십시오." -#: ../../locales/../src/interface/state.cpp:284 +#: ../../locales/../src/interface/state.cpp:251 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1198,79 +1332,81 @@ "리모트 작업이 진행 중인데 탐색 동기화 기능이 설정되었습니다.\n" "탐색 동기화를 중지하고 로컬 디렉터리를 변경하시겠습니까?" -#: resources.h:478 resources.h:623 resources.h:789 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "아스키(&S)" -#: resources.h:793 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 msgid "A&dd" msgstr "추가(&D)" -#: resources.h:820 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 msgid "A&llow resume of ASCII files" msgstr "아스키 파일 전송 재개 허용(&L)" -#: ../../locales/../src/interface/fileexistsdlg.cpp:109 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" msgstr "다운로드에만 적용(&P)" -#: ../../locales/../src/interface/fileexistsdlg.cpp:145 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" msgstr "업로드에만 적용(&P)" -#: resources.h:110 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 msgid "A&pply to all files and directories" msgstr "모든 파일과 디렉터리에 적용(&A)" -#: resources.h:585 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 msgid "A&utomatically remove successful transfers" msgstr "정상 전송된 경우 자동 제거(&A)" -#: resources.h:327 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "ASCII" msgstr "아스키" -#: resources.h:115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 msgid "About FileZilla" msgstr "FileZilla 정보" -#: resources.h:830 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 msgid "Above the file lists" msgstr "파일 목록 위" -#: ../../locales/../src/engine/server.cpp:837 -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:161 -#: ../../locales/../src/interface/manual_transfer.cpp:194 -#: ../../locales/../src/interface/manual_transfer.cpp:568 -#: ../../locales/../src/interface/manual_transfer.cpp:569 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1299 +#: ../../locales/../src/engine/server.cpp:885 +#: ../../locales/../src/engine/server.cpp:906 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/manual_transfer.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1314 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1315 msgid "Account" msgstr "계정" -#: resources.h:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "대기열 완료 후 동작(&C)" -#: resources.h:267 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 msgid "Action on selected file:" msgstr "선택된 파일에 대한 동작:" -#: resources.h:261 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 msgid "Action to perform:" msgstr "수행할 동작:" -#: resources.h:67 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 msgid "Action:" msgstr "동작:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 msgid "Active mode" msgstr "능동형 모드" -#: ../../locales/../src/interface/netconfwizard.cpp:605 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1278,7 +1414,7 @@ "능동형 모드 FTP 시험이 실패했습니다. FileZilla가 올바른 외부 IP 주소를 알 수 " "없습니다." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1286,7 +1422,7 @@ "능동형 모드 FTP 시험이 실패했습니다. FileZilla가 올바른 외부 IP 주소를 알 수 " "없습니다. 그 밖에 사용자의 라우터가 송신 주소를 변경했습니다." -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1295,35 +1431,39 @@ "능동형 모드 FTP 시험이 실패했습니다. FileZilla가 올바른 외부 IP 주소를 알 수 " "없습니다. 하지만 사용자의 라우터가 송신 주소를 잘못 변경했습니다." -#: resources.h:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 msgid "Active mode IP" msgstr "능동형 모드 IP" -#: resources.h:388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3296 msgid "Add files to &queue only" msgstr "대기열에만 파일 추가(&q)" -#: resources.h:589 resources.h:610 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "Add selected directory to the transfer queue" msgstr "선택된 디렉터리를 전송 대기열에 추가" -#: resources.h:509 resources.h:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 msgid "Add selected files and folders to the transfer queue" msgstr "선택된 파일과 폴더를 전송 대기열에 추가" -#: resources.h:895 resources.h:901 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "Add to queue" msgstr "대기열에 추가" -#: ../../locales/../src/engine/proxy.cpp:554 +#: ../../locales/../src/engine/proxy.cpp:529 msgid "Address type not supported" msgstr "지원되지 않는 주소 형식임" -#: resources.h:971 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:313 msgid "Advanced" msgstr "고급" -#: resources.h:928 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1331,42 +1471,52 @@ "expected and might even damage your system. Use beta versions and nightly " "builds at your own risk." msgstr "" +"도움말: 새로운 기능을 시험하는 경우가 아니면 안정(stable) 버전만 사용하시기 " +"바랍니다. 베타 버전 및 야간 빌드는 시험을 목적으로 하는 개발 버전입니다. " +"FileZilla 야간 빌드는 생각대로 동작하지 않을 수 있으며 사용자 시스템에 문제" +"를 일으킬 수도 있습니다. 베타 버전 및 야간 빌드는 본인의 책임하에 사용하십시" +"오." -#: resources.h:418 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3631 msgid "Al&ways perform this action" msgstr "항상 이 동작 수행(&w)" -#: resources.h:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 msgid "Algorithm:" msgstr "앨거리듬:" -#: ../../locales/../src/interface/QueueView.cpp:3127 +#: ../../locales/../src/interface/QueueView.cpp:2502 msgid "All files have been successfully transferred" msgstr "모든 파일 전송이 정상 완료됐습니다" -#: resources.h:668 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 msgid "All ports in the given range have to be between 1024 and 65535." msgstr "지정 범위의 모든 포트는 1024 ~ 65535 사이에 있어야 합니다." -#: ../../locales/../src/interface/QueueView.cpp:3123 +#: ../../locales/../src/interface/QueueView.cpp:2498 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "모든 전송 작업이 완료됐습니다. %d 파일은 전송하지 못했습니다." -#: resources.h:707 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 msgid "Allow &fall back to other transfer mode on failure" msgstr "실패 시 다른 전송 모드로 자동 전환 허용(&F)" -#: resources.h:643 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" msgstr "실패 시 다른 전송 모드로 자동 전환 허용" -#: resources.h:414 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 msgid "Already connected" msgstr "이미 연결됨" -#: resources.h:752 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 +msgid "Alternative name:" +msgid_plural "Alternative names:" +msgstr[0] "다른 이름:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1374,7 +1524,7 @@ "키를 관리하기 위해 PuTTY의 Pageant 도구도 사용할 수 있습니다. FileZilla는 " "Pageant를 인식합니다." -#: resources.h:753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1382,79 +1532,77 @@ "대신 시스템의 SSH 에이전트를 사용할 수 있습니다. 이 경우 SSH_AUTH_SOCK 환경 " "변수를 설정해야 합니다." -#: resources.h:1040 +#: ../../locales/../src/interface/resources/xrc/update.xrc:129 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "FileZilla 웹사이트에서 최신 버전을 받으실 수도 있습니다." -#: ../../locales/../src/interface/QueueView.cpp:2055 +#: ../../locales/../src/interface/QueueView.cpp:1543 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" "Some queue items might not have been restored." msgstr "" +"\"%s\"에서 전송 대기열을 로딩하는 동안 오류가 발생했습니다.\n" +"일부 대기열 항목이 복원되지 않았을 수 있습니다." -#: ../../locales/../src/interface/QueueView.cpp:1954 +#: ../../locales/../src/interface/QueueView.cpp:1441 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" "Some queue items might not have been saved." msgstr "" +"\"%s\"에 전송 대기열을 저장하는 동안 오류가 발생했습니다.\n" +"일부 대기열 항목이 저장되지 않았을 수 있습니다." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1966 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2055 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "끌어다 놓은 항목과 이름이 같은 항목이 이미 대상 위치에 존재합니다." -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/interface/manual_transfer.cpp:159 -#: ../../locales/../src/interface/manual_transfer.cpp:197 -#: ../../locales/../src/interface/manual_transfer.cpp:213 -#: ../../locales/../src/interface/manual_transfer.cpp:567 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1541 +#: ../../locales/../src/engine/server.cpp:908 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1313 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1598 msgid "Anonymous" msgstr "익명" -#: ../../locales/../src/interface/state.cpp:1000 +#: ../../locales/../src/interface/state.cpp:967 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "이미 다른 리모트 동작이 진행 중이므로 지금은 디렉터리를 변경할 수 없습니다." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:786 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:795 msgid "Any changes made in the Site Manager could not be saved." msgstr "사이트 관리자의 변경 사항을 저장하지 못했습니다." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:731 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "사이트 관리자의 변경 사항을 저장하려면 파일이 수정돼야 합니다." - -#: ../../locales/../src/interface/filter.cpp:209 +#: ../../locales/../src/interface/filter.cpp:213 msgid "Any changes made to the filters could not be saved." msgstr "필터의 변경 사항을 저장하지 못했습니다." -#: ../../locales/../src/interface/filter.cpp:1018 +#: ../../locales/../src/interface/filter.cpp:979 msgid "Any changes made to the filters will not be saved." msgstr "필터 변경 사항을 저장할 수 없습니다." -#: resources.h:112 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 msgid "App&ly to directories only" msgstr "디렉터리에만 적용(&L)" -#: resources.h:175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 msgid "Apply" msgstr "적용" -#: resources.h:76 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 msgid "Apply to ¤t queue only" msgstr "현재 대기열에만 적용(&C)" -#: resources.h:111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 msgid "Apply to &files only" msgstr "파일에만 적용(&F)" @@ -1462,34 +1610,37 @@ msgid "Archive" msgstr "압축" -#: ../../locales/../src/engine/socket.cpp:1251 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Argument buffer overflow" -msgstr "" +msgstr "인자 버퍼 오버플로" -#: resources.h:832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 msgid "As tab in the transfer queue pane" msgstr "전송 대기열 난의 탭" -#: resources.h:197 resources.h:207 resources.h:801 resources.h:810 -#: resources.h:840 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "동작 물어보기" -#: ../../locales/../src/engine/server.cpp:833 -#: ../../locales/../src/engine/server.cpp:852 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/engine/server.cpp:879 +#: ../../locales/../src/engine/server.cpp:900 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "비밀번호 묻기" -#: resources.h:664 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." msgstr "운영체제에 포트 요청" -#: resources.h:654 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" msgstr "사용자의 운영체제를 통해 외부 IP 주소 확인" -#: resources.h:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3536 msgid "Asking questions in the FileZilla forums" msgstr "FileZilla 게시판에 질문 올리기" @@ -1497,11 +1648,11 @@ msgid "Associated program not found:" msgstr "연결된 프로그램을 찾을 수 없음:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:711 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 msgid "At least one filter condition is incomplete" msgstr "하나 이상의 필터 상태가 불완전함" -#: resources.h:673 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 msgid "At this point, all required information has been gathered." msgstr "이제 모든 필요 정보가 수집되었습니다." @@ -1509,95 +1660,103 @@ msgid "Attribute" msgstr "속성" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:677 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "Authentication failed." msgstr "인증 실패." -#: resources.h:847 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 msgid "Author:" msgstr "제작자:" -#: resources.h:324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 msgid "Auto" msgstr "자동" -#: resources.h:791 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 msgid "Automatic file type classification" msgstr "자동 파일 종류 분류" -#: resources.h:851 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 msgid "Available sizes" msgstr "가능한 크기" -#: ../../locales/../src/engine/sizeformatting_base.cpp:124 -#: ../../locales/../src/engine/sizeformatting_base.cpp:183 +#: ../../locales/../src/engine/sizeformatting_base.cpp:154 +#: ../../locales/../src/engine/sizeformatting_base.cpp:213 msgid "B " msgstr "B" -#: resources.h:973 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:339 msgid "B&ypass proxy" msgstr "프록시 우회(&Y)" -#: ../../locales/../src/engine/socket.cpp:1216 -msgid "Bad file descriptor" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:275 +msgid "Background color:" msgstr "" -#: resources.h:405 +#: ../../locales/../src/engine/socket.cpp:1035 +msgid "Bad file descriptor" +msgstr "파일 기술자 이상" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 msgid "Basic usage instructions" msgstr "기초 사용 지침서" -#: resources.h:834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 msgid "Behaviour" msgstr "동작" -#: ../../locales/../src/interface/edithandler.cpp:1142 -#: ../../locales/../src/interface/edithandler.cpp:1170 +#: ../../locales/../src/interface/edithandler.cpp:1115 +#: ../../locales/../src/interface/edithandler.cpp:1143 msgid "Being edited" msgstr "편집 중" -#: resources.h:572 -msgid "Benchmark string coalescer" -msgstr "" - -#: ../../locales/../src/engine/tlssocket.cpp:1076 +#: ../../locales/../src/engine/tlssocket.cpp:1168 msgid "Beware! Certificate has been revoked" msgstr "주의! 인증서 재사용" -#: resources.h:328 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "Binary" msgstr "바이너리" -#: resources.h:827 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 msgid "Blackboard" msgstr "블랙보드" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:272 -#: ../../locales/../src/interface/menu_bar.cpp:315 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:396 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:257 +#: ../../locales/../src/interface/menu_bar.cpp:291 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:381 msgid "Bookmark" msgstr "북마크" -#: resources.h:351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "북마크:" -#: resources.h:350 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "북마크" -#: resources.h:123 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +msgid "Browse..." +msgstr "찾아보기..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "빌드 일시:" -#: resources.h:120 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 msgid "Build information" msgstr "빌드 정보" -#: ../../locales/../src/interface/verifycertdialog.cpp:182 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "사업 분야:" -#: resources.h:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1607,78 +1766,105 @@ "다. FileZilla가 사용할 포트를 일부 범위로 제한하려면 아래에 포트 범위를 입력" "하세요." -#: resources.h:486 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 msgid "C&ancel current operation" msgstr "현재 동작 취소(&A)" -#: resources.h:569 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "모두 비우기(&L)" -#: resources.h:543 resources.h:598 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "C&opy URL(s) to clipboard" msgstr "클립보드로 URL 복사(&o)" -#: resources.h:855 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:523 +msgid "C&opy URL(s) with password to clipboard" +msgstr "비밀번호를 포함한 URL을 클립보드로 복사(&o)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "C&ustom" msgstr "사용자 정의(&U)" -#: resources.h:916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "C&ustom filetype associations:" msgstr "사용자 정의 파일 유형 연결(&U):" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1661 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +msgid "CPU features:" +msgstr "CPU 기능:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1567 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1235 msgid "Calculating timezone offset of server..." msgstr "서버의 시간대 오차 계산..." -#: ../../locales/../src/engine/transfersocket.cpp:699 +#: ../../locales/../src/engine/transfersocket.cpp:665 msgid "Can't read from file" msgstr "파일을 읽을 수 없음" -#: ../../locales/../src/engine/transfersocket.cpp:677 -#: ../../locales/../src/engine/transfersocket.cpp:750 +#: ../../locales/../src/engine/transfersocket.cpp:645 +#: ../../locales/../src/engine/transfersocket.cpp:713 msgid "Can't write data to file." msgstr "파일에 데이터를 쓸 수 없음." -#: ../../locales/../src/engine/transfersocket.cpp:679 -#: ../../locales/../src/engine/transfersocket.cpp:752 +#: ../../locales/../src/engine/transfersocket.cpp:647 +#: ../../locales/../src/engine/transfersocket.cpp:715 #, c-format msgid "Can't write data to file: %s" msgstr "파일에 데이터를 쓸 수 없음: %s" -#: resources.h:30 resources.h:79 resources.h:114 resources.h:146 -#: resources.h:174 resources.h:191 resources.h:218 resources.h:227 -#: resources.h:234 resources.h:242 resources.h:265 resources.h:298 -#: resources.h:331 resources.h:345 resources.h:357 resources.h:367 -#: resources.h:390 resources.h:399 resources.h:419 resources.h:998 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3383 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:634 msgid "Cancel" msgstr "취소" -#: resources.h:1014 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 msgid "Cancel current operation" msgstr "현재 작업 취소" -#: resources.h:1015 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 msgid "Cancels the current operation" msgstr "현재 작업 취소" -#: ../../locales/../src/engine/local_path.cpp:450 +#: ../../locales/../src/engine/local_path.cpp:454 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "'%s'를 액세스하지 못합니다. 미디어가 삽입되지 않았거나 드라이브가 준비되지 않" "았습니다." -#: ../../locales/../src/interface/Mainfrm.cpp:539 +#: ../../locales/../src/interface/Mainfrm.cpp:557 msgid "Cannot add server to Site Manager" msgstr "사이트 관리자에 서버를 추가할 수 없음" -#: ../../locales/../src/engine/socket.cpp:1268 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Cannot assign requested address" -msgstr "" +msgstr "요청 주소를 지정할 수 없음" -#: ../../locales/../src/interface/context_control.cpp:350 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1686,281 +1872,272 @@ "동작 중에 탭을 닫을 수 없습니다.\n" "현재 작업을 취소하고 탭을 닫습니까?" -#: ../../locales/../src/interface/listingcomparison.cpp:74 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" msgstr "디렉터리 비교 불가, 로컬과 리모트 디렉터리에 다른 필터가 설정돼 있음" -#: ../../locales/../src/interface/RemoteListView.cpp:2536 -msgid "Cannot compare directories, not connected to a server." -msgstr "디렉터리 비교 불가, 서버에 연결되어 있지 않습니다." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "새 필터를 만들 수 없음" -#: ../../locales/../src/interface/LocalListView.cpp:1726 -#: ../../locales/../src/interface/LocalListView.cpp:1855 -#: ../../locales/../src/interface/RemoteListView.cpp:2374 -#: ../../locales/../src/interface/RemoteListView.cpp:2420 +#: ../../locales/../src/interface/edithandler.cpp:1575 +#: ../../locales/../src/interface/edithandler.cpp:1623 +#: ../../locales/../src/interface/LocalListView.cpp:1732 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Cannot edit file" msgstr "파일을 편집할 수 없음" -#: ../../locales/../src/interface/LocalListView.cpp:1642 +#: ../../locales/../src/interface/LocalListView.cpp:1614 msgid "Cannot edit file, not connected to any server." msgstr "파일 편집 불가, 서버에 연결되어 있지 않습니다." -#: ../../locales/../src/interface/LocalListView.cpp:1653 +#: ../../locales/../src/interface/LocalListView.cpp:1623 msgid "Cannot edit file, remote path unknown." msgstr "파일을 편집할 수 없음. 리모트 경로를 알 수 없음." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:337 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "SFTP 서버로 FTP를 연결하지 못했습니다. 적합한 프로토콜을 선택하십시오." -#: ../../locales/../src/interface/quickconnectbar.cpp:37 -#: ../../locales/../src/interface/quickconnectbar.cpp:55 +#: ../../locales/../src/interface/quickconnectbar.cpp:36 +#: ../../locales/../src/interface/quickconnectbar.cpp:54 msgid "Cannot load Quickconnect bar from resource file" msgstr "리소스 파일로부터 빠른 접속 도구모음을 열 수 없음" -#: ../../locales/../src/interface/import.cpp:36 -msgid "Cannot load file, not a valid XML file." -msgstr "파일을 열 수 없습니다. 유효한 XML 파일이 아닙니다." - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 -msgid "Cannot load keyfile" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +msgid "Cannot load key file" msgstr "키 파일을 열 수 없음" -#: ../../locales/../src/interface/Mainfrm.cpp:1059 +#: ../../locales/../src/interface/Mainfrm.cpp:991 msgid "Cannot load toolbar from resource file" msgstr "리소스 파일에서 도구 모음을 읽을 수 없음" -#: ../../locales/../src/interface/manual_transfer.cpp:463 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "비밀번호를 저장하지 못했습니다" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:681 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1202 msgid "Cannot rename entry" msgstr "파일명을 바꿀 수 없음" -#: ../../locales/../src/interface/RemoteListView.cpp:1656 +#: ../../locales/../src/interface/RemoteListView.cpp:1592 msgid "Cannot rename file" msgstr "파일명을 바꿀 수 없음" -#: ../../locales/../src/engine/proxy.cpp:147 +#: ../../locales/../src/engine/proxy.cpp:173 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." -msgstr "" +msgstr "SOCKS4 프록시에 사용할 호스트명을 IPv4 주소로 해석하지 못함" -#: ../../locales/../src/interface/filter.cpp:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "필터셋을 저장할 수 없음" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "필터를 선택할 수 없음" -#: ../../locales/../src/interface/edithandler.cpp:1520 -#: ../../locales/../src/interface/edithandler.cpp:1525 -#: ../../locales/../src/interface/edithandler.cpp:1564 +#: ../../locales/../src/interface/edithandler.cpp:1473 +#: ../../locales/../src/interface/edithandler.cpp:1477 +#: ../../locales/../src/interface/edithandler.cpp:1512 msgid "Cannot set file association" msgstr "파일 연동을 설정할 수 없음" -#: ../../locales/../src/interface/edithandler.cpp:1101 +#: ../../locales/../src/interface/edithandler.cpp:1074 msgid "Cannot show dialog" msgstr "대화 창을 표시할 수 없음" -#: ../../locales/../src/interface/LocalListView.cpp:1744 -#: ../../locales/../src/interface/RemoteListView.cpp:2440 +#: ../../locales/../src/interface/edithandler.cpp:1645 msgid "Cannot view/edit selected file" msgstr "선택 파일을 보거나 편집할 수 없음" -#: resources.h:885 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 msgid "Case insensitive" msgstr "대소문자 구별 안함" -#: resources.h:884 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 msgid "Case insensitive (default)" msgstr "대소문자 구별 안함 (기본값)" -#: resources.h:886 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 msgid "Case sensitive" msgstr "대소문자 구별" -#: resources.h:887 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "Case sensitive (default)" msgstr "대소문자 구별 (기본값)" -#: resources.h:221 -msgid "Categories" -msgstr "분류" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Categories to clear" +msgstr "삭제할 카테고리" -#: ../../locales/../src/interface/statusbar.cpp:495 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Certificate and session data are not available yet." msgstr "아직 인증서 및 세션 데이터가 없습니다." -#: resources.h:31 -msgid "Certificate details" -msgstr "인증서 상세" - -#: resources.h:3 resources.h:32 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 msgid "Certificate in chain:" msgstr "상위 인증서:" -#: resources.h:14 resources.h:43 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "인증서 발급자" -#: resources.h:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 msgid "Challenge:" msgstr "시도:" -#: resources.h:93 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 msgid "Change file attributes" msgstr "파일 속성 바꾸기" -#: resources.h:546 resources.h:601 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 msgid "Change the file permissions." msgstr "파일의 권한을 변경하십시오." -#: resources.h:941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 msgid "Changing logfile settings requires restart of FileZilla." msgstr "로그 파일 설정을 변경하면 FileZilla를 재시작해야 합니다." -#: ../../locales/../src/interface/FileZilla.cpp:683 +#: ../../locales/../src/interface/FileZilla.cpp:561 msgid "Character encoding issue" msgstr "문자 인코딩" -#: resources.h:988 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:527 msgid "Charset" msgstr "문자셋" -#: resources.h:499 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 msgid "Check for &updates..." msgstr "업데이트 확인(&U)..." -#: resources.h:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 msgid "Check for FileZilla &updates automatically:" -msgstr "FileZilla 업데이트 자동 확인 실패(&u):" +msgstr "FileZilla 업데이트 자동 확인(&u):" -#: resources.h:1028 +#: ../../locales/../src/interface/resources/xrc/update.xrc:4 msgid "Check for Updates" msgstr "업데이트 확인" -#: resources.h:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "Check for newer versions of FileZilla" msgstr "새로운 FileZilla 버전 확인" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "업데이트 확인 실패" -#: ../../locales/../src/interface/netconfwizard.cpp:765 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +msgid "" +"Check your login credentials. The entered password starts or ends with a " +"space character." +msgstr "" +"로그인 암호를 확인하세요. 입력하신 비밀번호는 시작이나 끝에 공백 문자가 있습" +"니다." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:776 +msgid "" +"Check your login credentials. The entered username starts or ends with a " +"space character." +msgstr "" +"로그인 암호를 확인하세요. 입력하신 사용자명은 시작이나 끝에 공백 문자가 있습" +"니다." + +#: ../../locales/../src/interface/netconfwizard.cpp:778 msgid "Checking for correct external IP address" msgstr "올바른 외부 IP 주소 검사" -#: resources.h:1042 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 msgid "Checking for updates..." msgstr "업데이트 확인 중..." -#: ../../locales/../src/interface/updater.cpp:699 +#: ../../locales/../src/interface/updater.cpp:757 #, c-format msgid "Checksum match on file %s\n" msgstr "%s 파일 체크섬 일치\n" -#: ../../locales/../src/interface/updater.cpp:695 +#: ../../locales/../src/interface/updater.cpp:753 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "%s 파일 체크섬 불일치\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1471 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1499 +msgid "Choose a key file" +msgstr "키 파일을 선택하세요" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1530 msgid "Choose the default local directory" msgstr "기본 로컬 디렉터리 선택" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:130 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:378 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:362 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2291 msgid "Choose the local directory" msgstr "로컬 디렉터리 선택" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "일단의 데이터가 올바르지 않게 종결됨" -#: resources.h:23 resources.h:52 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "암호화:" -#: resources.h:445 resources.h:628 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "Cl&ose tab" msgstr "탭 닫기(&o)" -#: resources.h:824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 msgid "Classic" msgstr "클래식" -#: resources.h:224 -msgid "Clear &Site Manager entries" -msgstr "사이트 관리자 항목 비우기(&S)" - -#: resources.h:570 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "배치 캐시 비우기(&L)" -#: resources.h:222 -msgid "Clear &quickconnect history" -msgstr "빠른 연결 이력 비우기(&Q)" - -#: resources.h:223 -msgid "Clear &reconnect information" -msgstr "다시 연결 정보 비우기(&R)" - -#: resources.h:225 -msgid "Clear &transfer queue" -msgstr "전송 대기열 비우기(&T)" - -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/quickconnectbar.cpp:152 msgid "Clear history" msgstr "연결 이력 비우기" -#: resources.h:219 ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "개인 정보 비우기" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:151 msgid "Clear quickconnect bar" msgstr "빠른 연결 입력란 비우기" -#: resources.h:571 -msgid "Clear string coalescer" -msgstr "" - -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:595 msgid "Click on Finish to save your configuration." msgstr "설정을 저장하려면 완료를 누르십시오." -#: resources.h:285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 msgid "Client to server MAC:" msgstr "서버 MAC으로의 클라이언트:" -#: resources.h:283 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 msgid "Client to server cipher:" msgstr "서버 암호로의 클라이언트:" -#: resources.h:629 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "Close &all other tabs" msgstr "다른 탭 전부 닫기(&a)" -#: resources.h:451 ../../locales/../src/interface/Mainfrm.cpp:1204 -#: ../../locales/../src/interface/Mainfrm.cpp:1227 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 +#: ../../locales/../src/interface/Mainfrm.cpp:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1148 msgid "Close FileZilla" msgstr "FileZilla 닫기" @@ -1968,68 +2145,70 @@ msgid "Close all running instances of FileZilla" msgstr "동작 중인 FileZilla의 모든 인스턴스 닫기" -#: resources.h:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "현재 탭 닫기" -#: resources.h:970 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:293 msgid "Co&mments:" msgstr "비고(&M):" -#: ../../locales/../src/interface/listctrlex.cpp:749 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "열 설정" -#: resources.h:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 msgid "Column setup" msgstr "열 설정" -#: resources.h:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 msgid "Command and its arguments should be properly quoted." msgstr "명령과 그 인자는 적절히 따옴표로 묶어야 합니다." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Command failed" msgstr "명령 실패" -#: ../../locales/../src/engine/proxy.cpp:551 +#: ../../locales/../src/engine/proxy.cpp:526 msgid "Command not supported" msgstr "명령어를 지원하지 않음" -#: ../../locales/../src/engine/engineprivate.cpp:183 +#: ../../locales/../src/engine/engineprivate.cpp:213 msgid "Command not supported by this protocol" msgstr "명령어를 이 프로토콜이 지원하지 않음" -#: ../../locales/../src/engine/logging.cpp:124 -#: ../../locales/../src/interface/StatusView.cpp:277 -#: ../../locales/../src/interface/StatusView.cpp:333 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:338 msgid "Command:" msgstr "명령:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" msgstr "주석" -#: ../../locales/../src/interface/verifycertdialog.cpp:180 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "이름:" -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:441 +#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:464 msgid "Communication tainted by router or firewall" msgstr "라우터 또는 방화벽에 의해 연결이 손상됨" -#: resources.h:463 resources.h:605 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 msgid "Compare &modification time" msgstr "수정 일시 비교(&M)" -#: resources.h:462 resources.h:604 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 msgid "Compare file&size" msgstr "파일 크기 비교(&S)" -#: resources.h:891 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 msgid "Comparison &threshold (in minutes):" msgstr "비교 한계값(&T) (분):" @@ -2037,19 +2216,19 @@ msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "비교 한계값은 0 ~ 1440분 사이여야 합니다." -#: resources.h:121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 msgid "Compiled for:" msgstr "컴파일 타겟:" -#: resources.h:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 msgid "Compiled on:" msgstr "컴파일 환경:" -#: resources.h:124 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 msgid "Compiled with:" msgstr "컴파일 도구:" -#: resources.h:125 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 msgid "Compiler flags:" msgstr "컴파일러 플래그:" @@ -2057,56 +2236,62 @@ msgid "Compressed" msgstr "압축됨" -#: resources.h:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 msgid "Concurrent transfers" msgstr "동시 전송" -#: resources.h:186 resources.h:376 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3088 msgid "Conditions are c&ase sensitive" msgstr "대/소문자 구별" -#: resources.h:672 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" msgstr "구성 시험" -#: resources.h:646 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:115 msgid "Configure passive mode" msgstr "수동형 모드 구성" -#: resources.h:662 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 msgid "Configure port range" msgstr "포트 범위 구성" -#: resources.h:406 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3499 msgid "Configuring FileZilla and your network" msgstr "FileZilla 및 사용자 네트워크 구성하기" -#: ../../locales/../src/interface/search.cpp:726 +#: ../../locales/../src/interface/search.cpp:1192 msgid "Confirm deletion" msgstr "삭제 확인" -#: ../../locales/../src/engine/local_filesys.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:1697 -#: ../../locales/../src/interface/LocalListView.cpp:1816 -#: ../../locales/../src/interface/RemoteListView.cpp:1460 -#: ../../locales/../src/interface/RemoteListView.cpp:2391 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1138 +#: ../../locales/../src/interface/edithandler.cpp:1587 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1696 +#: ../../locales/../src/interface/RemoteListView.cpp:1400 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 +#: ../../locales/../src/interface/search.cpp:1148 msgid "Confirmation needed" msgstr "확인이 필요함" -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "Congratulations, your configuration seems to be working." msgstr "축하합니다. 사용자의 설정이 올바르게 동작합니다." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:150 msgid "Connect bypassing proxy settings" msgstr "프록시 설정을 우회하여 연결" -#: resources.h:842 +#: ../../locales/../src/interface/netconfwizard.cpp:222 +#, c-format +msgid "Connect failed: %s" +msgstr "프록시 요청 실패: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "현재 탭에서 연결하기" -#: resources.h:841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 msgid "Connect in new tab" msgstr "새 탭에서 연결하기" @@ -2114,202 +2299,216 @@ msgid "Connect to specified Site Manager site" msgstr "지정한 사이트 관리자 사이트로 연결" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:948 -msgid "Connected" -msgstr "연결됨" - -#: ../../locales/../src/interface/QueueView.cpp:1453 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "연결 중" -#: ../../locales/../src/interface/netconfwizard.cpp:207 -#: ../../locales/../src/interface/statuslinectrl.cpp:272 +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/statuslinectrl.cpp:242 #, c-format msgid "Connecting to %s" msgstr "%s에 연결" -#: ../../locales/../src/engine/ControlSocket.cpp:1136 +#: ../../locales/../src/engine/ControlSocket.cpp:1048 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4251 #, c-format -msgid "Connecting to %s through proxy" -msgstr "프록시를 통해 %s에 연결" +msgid "Connecting to %s through %s proxy" +msgstr "%s 프록시를 통해 %s에 연결" -#: ../../locales/../src/engine/ControlSocket.cpp:1005 -#: ../../locales/../src/engine/proxy.cpp:214 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:394 +#: ../../locales/../src/engine/ControlSocket.cpp:955 +#: ../../locales/../src/engine/proxy.cpp:267 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:358 #, c-format msgid "Connecting to %s..." msgstr "%s에 연결..." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 msgid "Connection" msgstr "연결" -#: ../../locales/../src/engine/socket.cpp:1230 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Connection aborted" msgstr "연결 중단됨" -#: ../../locales/../src/interface/QueueView.cpp:1065 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "연결 시도 실패" -#: ../../locales/../src/engine/ControlSocket.cpp:1010 -#: ../../locales/../src/engine/proxy.cpp:219 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/proxy.cpp:241 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "\"%s\"(으)로 연결 시도 실패, 다음 주소 시도." -#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ControlSocket.cpp:924 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "\"%s\"(으)로 연결 시도 실패." -#: ../../locales/../src/engine/ControlSocket.cpp:188 -#: ../../locales/../src/engine/engineprivate.cpp:320 +#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/engineprivate.cpp:682 msgid "Connection attempt interrupted by user" msgstr "사용자에 의해 연결 시도 중단" -#: ../../locales/../src/engine/socket.cpp:1223 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Connection attempt timed out" msgstr "연결 시간 초과" -#: ../../locales/../src/interface/netconfwizard.cpp:543 +#: ../../locales/../src/interface/netconfwizard.cpp:564 msgid "Connection closed" msgstr "연결 닫힘" -#: ../../locales/../src/engine/ControlSocket.cpp:1103 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:216 msgid "Connection closed by server" msgstr "서버에 의해 연결 닫힘" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:298 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:381 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "연결 수립, TLS 초기화..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:333 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "연결 수립, HTTP 요청 보냄" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422 +#: ../../locales/../src/interface/netconfwizard.cpp:345 +msgid "Connection established, waiting for welcome message." +msgstr "연결 수립, 환영 메시지를 기다림." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:409 msgid "Connection established, waiting for welcome message..." msgstr "연결 수립, 환영 메시지를 기다림..." -#: ../../locales/../src/interface/netconfwizard.cpp:338 +#: ../../locales/../src/interface/netconfwizard.cpp:362 msgid "Connection lost" msgstr "연결 끊김" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:511 msgid "Connection not allowed by ruleset" msgstr "규칙에 따라 연결 불가" -#: ../../locales/../src/engine/proxy.cpp:545 +#: ../../locales/../src/engine/proxy.cpp:520 msgid "Connection refused" msgstr "연결 거부됨" -#: ../../locales/../src/engine/socket.cpp:1217 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Connection refused by server" msgstr "서버에서의 연결 거부" -#: ../../locales/../src/engine/socket.cpp:1226 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Connection reset by network" msgstr "네트웍에서의 연결 리셋" -#: ../../locales/../src/engine/socket.cpp:1231 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Connection reset by peer" msgstr "피어에서의 연결 리셋" -#: ../../locales/../src/engine/ControlSocket.cpp:652 -msgid "Connection timed out" -msgstr "연결 시간 초과" +#: ../../locales/../src/engine/ControlSocket.cpp:556 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1072 msgid "Connection timed out." msgstr "연결 시간이 초과되었습니다." -#: ../../locales/../src/interface/search.cpp:369 +#: ../../locales/../src/interface/search.cpp:660 msgid "Connection to server lost." msgstr "서버 연결 끊김." -#: ../../locales/../src/engine/proxy.cpp:231 +#: ../../locales/../src/engine/proxy.cpp:250 msgid "Connection with proxy established, performing handshake..." msgstr "프록시 연결 수립, 핸드셰이크 수행..." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "Connection with server got closed prematurely." msgstr "서버와의 연결이 끊어졌습니다." -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "Connection with the test server failed." msgstr "시험 서버에 접속이 실패했습니다." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +msgid "Convert key file" msgstr "키 파일 변환" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:651 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1774 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:627 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1869 #, c-format msgid "Copy (%d) of %s" msgstr "복사 (%d) / %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:628 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1751 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:607 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 #, c-format msgid "Copy of %s" msgstr "복사 %s" -#: resources.h:544 resources.h:599 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "선택한 항목에 대해 비밀번호를 포함한 URL을 클립보드로 복사." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Copy the URLs of the selected items to clipboard." msgstr "선택한 항목의 URL을 클립보드로 복사." -#: ../../locales/../src/engine/transfersocket.cpp:211 +#: ../../locales/../src/engine/transfersocket.cpp:178 #, c-format msgid "Could not accept connection: %s" msgstr "연결 수락 실패: %s" #: ../../locales/../src/interface/bookmarks_dialog.cpp:99 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:531 msgid "Could not add connection to Site Manager" msgstr "사이트 관리자로 연결 항목을 추가하지 못함" -#: ../../locales/../src/interface/state.cpp:831 +#: ../../locales/../src/interface/state.cpp:773 msgid "Could not complete operation" msgstr "작업 완료 실패" -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "서버에 연결하지 못함" -#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Could not connect to server: %s" msgstr "서버에 연결하지 못함: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:827 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:791 msgid "Could not convert command to server encoding" msgstr "명령을 서버 인코딩으로 변환하지 못함" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 msgid "Could not convert private key" msgstr "개인 키를 변환하지 못함" -#: ../../locales/../src/interface/RemoteListView.cpp:2803 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1489 +#: ../../locales/../src/interface/RemoteListView.cpp:2523 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not copy URLs" msgstr "URL 복사 실패" -#: ../../locales/../src/interface/aboutdialog.cpp:242 +#: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "데이터를 복사하지 못함" -#: ../../locales/../src/interface/updater.cpp:441 +#: ../../locales/../src/interface/updater.cpp:492 #, c-format msgid "Could not create local file %s\n" msgstr "%s 로컬 파일 생성 실패\n" -#: ../../locales/../src/interface/RemoteListView.cpp:2313 -#: ../../locales/../src/interface/RemoteTreeView.cpp:912 +#: ../../locales/../src/engine/logging.cpp:173 +#, c-format +msgid "Could not create logging mutex: %s" +msgstr "%s 로깅 뮤텍스 생성 실패" + +#: ../../locales/../src/interface/RemoteListView.cpp:2189 +#: ../../locales/../src/interface/RemoteTreeView.cpp:865 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2319,11 +2518,11 @@ "셸 확장이 정상 설치되지 않았거나 파일을 끌어다놓은 위치가 탐색기 창이 아닙니" "다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4100 msgid "Could not establish connection to server" msgstr "서버와의 연결을 수립하지 못함" -#: ../../locales/../src/interface/FileZilla.cpp:502 +#: ../../locales/../src/interface/FileZilla.cpp:405 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2334,48 +2533,54 @@ "사용자는 '--datadir <사용자 경로>' 명령이나, FZ_DATADIR 환경 변수 설정으로 " "FileZilla의 데이터 디렉터리를 설정할 수 있습니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:677 msgid "Could not generate custom login sequence." msgstr "사용자 정의 로그인 절차를 생성하지 못함." -#: ../../locales/../src/engine/tlssocket.cpp:1011 +#: ../../locales/../src/engine/tlssocket.cpp:1013 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" "인증서 발급자의 식별 이름을 가져올 수 없어서 gnutls_x509_get_issuer_dn 실패" -#: ../../locales/../src/engine/tlssocket.cpp:988 +#: ../../locales/../src/engine/tlssocket.cpp:990 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "인증서 주체의 식별 이름을 가져올 수 없어서 gnutls_x509_get_dn 실패" -#: ../../locales/../src/interface/state.cpp:984 +#: ../../locales/../src/interface/state.cpp:953 msgid "Could not get full remote path." msgstr "원격 경로 전체를 가져오지 못함" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Could not get reply from fzputtygen." msgstr "fzputtygen의 응답을 가져오지 못함." -#: ../../locales/../src/interface/RemoteListView.cpp:2374 +#: ../../locales/../src/interface/edithandler.cpp:1575 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Could not get temporary directory to download file into." msgstr "파일을 다운로드할 임시 디렉터리를 열지 못함." -#: ../../locales/../src/engine/tlssocket.cpp:931 +#: ../../locales/../src/engine/tlssocket.cpp:936 msgid "Could not import peer certificates, gnutls_x509_crt_import failed" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:925 +#: ../../locales/../src/interface/FileZilla.cpp:85 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Winsock(%d) 초기화 못함: %s" + +#: ../../locales/../src/engine/tlssocket.cpp:931 msgid "" "Could not initialize structure for peer certificates, gnutls_x509_crt_init " "failed" msgstr "" -#: ../../locales/../src/interface/import.cpp:108 -#: ../../locales/../src/interface/import.cpp:294 +#: ../../locales/../src/interface/import.cpp:105 +#: ../../locales/../src/interface/import.cpp:292 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2385,52 +2590,52 @@ "\"%s\"을 읽을 수 없습니다. 파일이 유효하고 접근이 가능한지 확인하십시오.\n" "사이트 관리자의 변경 사항은 저장되지 않습니다." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223 -msgid "Could not load keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +msgid "Could not load key file" msgstr "키 파일을 불러오지 못함" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "개인 키를 불러오지 못함" -#: ../../locales/../src/interface/state.cpp:1010 +#: ../../locales/../src/interface/state.cpp:975 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "리모트 디렉터리'%s'에 해당하는 로컬 디렉터리를 찾지 못했습니다.\n" "탐색 동기화를 중지하고 리모트 디렉터리를 변경하시겠습니까?" -#: ../../locales/../src/interface/state.cpp:394 +#: ../../locales/../src/interface/state.cpp:355 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" "리모트 디렉터리 '%s'에 해당하는 로컬 디렉터리를 찾지 못했습니다.\n" "탐색 동기화가 중지되었습니다." -#: ../../locales/../src/interface/state.cpp:295 +#: ../../locales/../src/interface/state.cpp:260 #, c-format msgid "" -"Could not obtain corresponding remote directory for the local directory '%" -"s'.\n" +"Could not obtain corresponding remote directory for the local directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" "로컬 디렉터리 '%s'에 해당하는 리모트 디렉터리를 찾지 못했습니다.\n" "탐색 동기화가 중지되었습니다." -#: ../../locales/../src/interface/aboutdialog.cpp:242 -#: ../../locales/../src/interface/RemoteListView.cpp:2803 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1489 +#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/interface/RemoteListView.cpp:2523 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not open clipboard" msgstr "클립보드를 열지 못함" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/engine/logging.cpp:187 +#: ../../locales/../src/engine/logging.cpp:106 +#: ../../locales/../src/engine/logging.cpp:186 #: ../../locales/../src/engine/logging.cpp:218 #, c-format msgid "Could not open log file: %s" @@ -2440,66 +2645,73 @@ msgid "Could not parse remote path." msgstr "리모트 경로를 해석하지 못함." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 +#: ../../locales/../src/interface/quickconnectbar.cpp:81 msgid "Could not parse server address:" msgstr "서버 주소를 해석하지 못함:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231 +#: ../../locales/../src/interface/netconfwizard.cpp:995 +msgid "Could not read from data socket." +msgstr "데이터 소켓을 읽지 못함." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:206 #, c-format msgid "Could not read from socket: %s" msgstr "소켓을 읽지 못함: %s" -#: ../../locales/../src/interface/sitemanager.cpp:494 +#: ../../locales/../src/interface/sitemanager.cpp:548 msgid "Could not read server item." msgstr "서버 항목을 읽지 못함." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2742 +#: ../../locales/../src/interface/netconfwizard.cpp:356 +msgid "Could not receive data from server." +msgstr "서버에서 데이터를 수신하지 못함." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 #, c-format msgid "Could not seek to offset %s within file" msgstr "파일에서 %s 위치를 찾지 못함" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2653 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2500 msgid "Could not seek to the end of the file" msgstr "파일의 끝을 찾지 못함" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "fzputtygen으로 명령을 보내지 못함." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2773 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2621 msgid "Could not spawn IO thread" msgstr "IO 스레드를 생성하지 못함" -#: ../../locales/../src/engine/ControlSocket.cpp:1150 +#: ../../locales/../src/engine/ControlSocket.cpp:1062 #, c-format msgid "Could not start proxy handshake: %s" msgstr "프록시 핸드셰이크를 시작하지 못함: %s" -#: ../../locales/../src/interface/QueueView.cpp:1116 -#: ../../locales/../src/interface/QueueView.cpp:1121 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "전송을 시작하지 못함" -#: ../../locales/../src/interface/sitemanager.cpp:672 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:810 +#: ../../locales/../src/interface/sitemanager.cpp:617 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:816 #, c-format msgid "" -"Could not write \"%s\", any changes to the Site Manager could not be saved: %" -"s" +"Could not write \"%s\", any changes to the Site Manager could not be saved: " +"%s" msgstr "" "\"%s\" 쓰기에 실패하여 사이트 관리자의 변경 사항이 저장되지 않았습니다. %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:858 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:814 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "\"%s\" 쓰기에 실패하여 북마크를 추가하지 못했습니다. %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:330 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:313 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "\"%s\" 쓰기에 실패하여 전역 북마크를 저장하지 못했습니다. %s" -#: ../../locales/../src/interface/QueueView.cpp:1989 +#: ../../locales/../src/interface/QueueView.cpp:1470 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2508,102 +2720,119 @@ "\"%s\" 쓰기에 실패하여 대기열을 저장하지 못했습니다.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:794 -#: ../../locales/../src/interface/sitemanager.cpp:850 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2177 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager.cpp:779 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2269 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "\"%s\" 쓰기에 실패하여 선택하신 사이트를 내보내지 못했습니다. %s" -#: ../../locales/../src/interface/wrapengine.cpp:1155 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 #, c-format -msgid "Could not write \"%s\": %s" -msgstr "\"%s\" 쓰지 못함: %s" +msgid "Could not write \"%s\":" +msgstr "\"%s\" 쓰지 못함:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format -msgid "Could not write keyfile: %s" +msgid "Could not write key file: %s" msgstr "키 파일을 쓰지 못함: %s" -#: ../../locales/../src/interface/QueueView.cpp:1110 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "로컬 파일을 쓰지 못함" -#: ../../locales/../src/engine/logging.cpp:226 +#: ../../locales/../src/engine/logging.cpp:230 #: ../../locales/../src/engine/logging.cpp:297 #, c-format msgid "Could not write to log file: %s" msgstr "로그 파일을 쓰지 못함: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:970 -#: ../../locales/../src/engine/ControlSocket.cpp:1068 +#: ../../locales/../src/engine/ControlSocket.cpp:879 +#: ../../locales/../src/engine/ControlSocket.cpp:983 #, c-format msgid "Could not write to socket: %s" msgstr "소켓을 쓰지 못함: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "국가:" -#: resources.h:574 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "FileZilla를 즉시 비정상 종료합니다. 예외 처리 시에만 사용됩니다." - -#: resources.h:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 msgid "Crea&te new file" msgstr "새 파일 만들기(&t)" -#: resources.h:517 resources.h:533 resources.h:591 resources.h:614 +#: ../../locales/../src/interface/state.cpp:989 +msgid "Create &missing local directory and enter it" +msgstr "로컬에 누락된 디렉터리를 만들고 그 안으로 이동(&m)" + +#: ../../locales/../src/interface/state.cpp:917 +msgid "Create &missing remote directory and enter it" +msgstr "리모트에 누락된 디렉터리를 만들고 그 안으로 이동(&m)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 msgid "Create a new subdirectory in the current directory" msgstr "현재 디렉터리에 새 하위 디렉터리 만들기" -#: resources.h:519 resources.h:535 resources.h:593 resources.h:616 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Create a new subdirectory in the current directory and change into it" msgstr "현재 디렉터리에 새 하위 디렉터리 만들고 그 안으로 이동하기" -#: resources.h:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 msgid "Create a new, empty file in the current directory" msgstr "현재 디렉터리에 빈 파일 새로 만들기" -#: resources.h:518 resources.h:534 resources.h:592 resources.h:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "Create director&y and enter it" msgstr "디렉터리 만들고 그 안으로 이동(&y)" -#: ../../locales/../src/interface/LocalListView.cpp:925 -#: ../../locales/../src/interface/LocalTreeView.cpp:1181 -#: ../../locales/../src/interface/RemoteListView.cpp:1359 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1322 +#: ../../locales/../src/interface/LocalListView.cpp:923 +#: ../../locales/../src/interface/LocalTreeView.cpp:1149 +#: ../../locales/../src/interface/RemoteListView.cpp:1303 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Create directory" msgstr "디렉터리 만들기" -#: ../../locales/../src/interface/RemoteListView.cpp:2894 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "빈 파일 만들기" -#: ../../locales/../src/interface/QueueView.cpp:1526 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "디렉터리 만들기" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3347 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2046 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1960 #, c-format msgid "Creating directory '%s'..." msgstr "'%s' 디렉터리 생성..." -#: ../../locales/../src/engine/ControlSocket.cpp:176 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "치명적 오류" -#: ../../locales/../src/engine/ControlSocket.cpp:139 +#: ../../locales/../src/engine/ControlSocket.cpp:171 +msgid "Critical error:" +msgstr "치명적 오류:" + +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "치명적인 파일 전송 오류" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:120 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "%s에서 %s 전송 후 치명적인 파일 전송 오류" -#: ../../locales/../src/interface/state.cpp:385 +#: ../../locales/../src/interface/state.cpp:346 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2612,77 +2841,93 @@ "현재 리모트 디렉터리(%s)는 동기화 루트(%s) 하위에 없습니다.\n" "탐색 동기화가 중지됐습니다." -#: ../../locales/../src/interface/statusbar.cpp:387 +#: ../../locales/../src/interface/statusbar.cpp:393 msgid "Current transfer type is set to ASCII." msgstr "현재 전송 유형이 아스키(ASCII)로 설정됩니다." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:401 msgid "Current transfer type is set to automatic detection." msgstr "현재 전송 유형이 자동 감지로 설정됩니다." -#: ../../locales/../src/interface/statusbar.cpp:392 +#: ../../locales/../src/interface/statusbar.cpp:397 msgid "Current transfer type is set to binary." msgstr "현재 전송 유형이 바이너리로 설정됩니다." -#: resources.h:735 resources.h:860 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +msgid "Curve:" +msgstr "곡선:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "Cus&tom" msgstr "사용자 정의(&T)" -#: ../../locales/../src/interface/filter.cpp:98 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "사용자 필터 설정" -#: resources.h:314 resources.h:315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 msgid "Custom server" msgstr "서버 직접 지정" -#: resources.h:323 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 msgid "D&ata type" msgstr "데이터 유형(&A)" -#: resources.h:868 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "십진수 단위의 SI 표기(&E) (예: 1 KB = 1000 bytes)" -#: resources.h:983 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:471 msgid "D&efault" msgstr "기본(&E)" -#: resources.h:539 resources.h:594 resources.h:626 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "D&elete" msgstr "삭제(&E)" -#: resources.h:167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "디렉터리 비교(&i)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "모두 해제(&I)" -#: resources.h:835 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 msgid "D&o not save passwords" msgstr "비밀번호 저장 안함(&o)" -#: resources.h:898 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "D&ouble-click action on directories:" msgstr "디렉터리 더블 클릭시 동작(&o):" -#: resources.h:180 resources.h:355 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "D&uplicate" -msgstr "" +msgstr "복제(&u)" #: ../../locales/../src/engine/server.cpp:34 msgid "DOS-like with virtual paths" msgstr "DOS 형식의 가상 경로" -#: ../../locales/../src/interface/LocalListView.cpp:1731 -#: ../../locales/../src/interface/RemoteListView.cpp:2425 +#: ../../locales/../src/interface/edithandler.cpp:1627 msgid "Dangerous filetype" msgstr "위험한 파일 유형" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Data" msgstr "데이터" -#: ../../locales/../src/interface/netconfwizard.cpp:991 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Data socket closed too early." msgstr "데이터 소켓이 너무 일찍 닫혔습니다." @@ -2690,28 +2935,27 @@ msgid "Date" msgstr "날짜" -#: resources.h:852 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 msgid "Date formatting" msgstr "날짜 형식" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" msgstr "날짜/시간 형식" -#: ../../locales/../src/interface/fileexistsdlg.cpp:67 -#: ../../locales/../src/interface/fileexistsdlg.cpp:71 +#: ../../locales/../src/interface/fileexistsdlg.cpp:49 msgid "Date/time unknown" msgstr "날짜/시간을 알 수 없음" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:117 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" msgstr "디버그" -#: resources.h:942 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 msgid "Debugging settings" msgstr "디버깅 설정" -#: resources.h:974 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:351 msgid "Default &local directory:" msgstr "기본 로컬 디렉터리(&L):" @@ -2723,15 +2967,17 @@ msgid "Default editor not properly quoted." msgstr "기본 편집기가 따옴표로 잘 묶이지 않았습니다." -#: resources.h:193 resources.h:215 resources.h:818 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "중복 파일 기본 동작" -#: resources.h:976 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 msgid "Default r&emote directory:" msgstr "기본 리모트 디렉터리(&E):" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2739,19 +2985,20 @@ "기본 리모트 경로를 해석할 수 없습니다. 선택하신 서버 유형에서 적합한 절대 경" "로인지 확인하십시오." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "시스템의 기본 언어" -#: resources.h:640 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" msgstr "기본 전송 모드:" -#: resources.h:787 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 msgid "Default transfer type:" msgstr "기본 전송 유형:" -#: resources.h:659 resources.h:722 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "기본값: http://ip.filezilla-project.org/ip.php" @@ -2760,7 +3007,7 @@ "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "실패한 연결 시도 간의 지연 시간은 1 ~ 999초입니다." -#: ../../locales/../src/engine/engineprivate.cpp:625 +#: ../../locales/../src/engine/engineprivate.cpp:523 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2770,63 +3017,75 @@ "attempt..." msgstr[0] "직전 연결 실패로 %d초 연결 지연..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1235 msgid "Delete Site Manager entry" msgstr "사이트 관리자 항목 삭제" -#: resources.h:595 resources.h:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Delete selected directory" msgstr "선택된 디렉터리 삭제" -#: resources.h:522 resources.h:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 msgid "Delete selected files and directories" msgstr "선택된 파일과 디렉터리 삭제" -#: ../../locales/../src/interface/search.cpp:710 -msgid "Deleting directories" -msgstr "디렉터리 삭제" - -#: ../../locales/../src/interface/search.cpp:710 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "연관성 없는 여러 디렉터리를 삭제하는 것은 지원되지 않음" +#: ../../locales/../src/engine/engineprivate.cpp:366 +#, c-format +msgid "Deleting \"%s\"" +msgstr "\"%s\" 디렉터리 삭제" + +#: ../../locales/../src/engine/engineprivate.cpp:369 +#, c-format +msgid "Deleting %u files from \"%s\"" +msgstr "파일 %u개를 \"%s\"에서 삭제" -#: resources.h:391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3331 msgid "Deleting symbolic link" msgstr "심볼릭 링크 삭제" -#: ../../locales/../src/interface/LocalTreeView.cpp:1016 +#: ../../locales/../src/interface/LocalTreeView.cpp:966 msgid "Desktop" msgstr "바탕 화면" -#: resources.h:4 resources.h:33 resources.h:138 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Details" msgstr "상세 정보" -#: resources.h:151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 msgid "Details for new key:" msgstr "새 키의 상세 정보:" -#: resources.h:189 +#: ../../locales/../src/interface/import.cpp:58 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:745 +msgid "Detected newer version of FileZilla" +msgstr "FileZilla 신규 버전이 확인됨" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 msgid "Dire&ctories" msgstr "디렉터리(&C)" -#: ../../locales/../src/interface/queue.cpp:1222 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Direction" msgstr "방향" -#: ../../locales/../src/interface/filelistctrl.cpp:283 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "Directory" msgstr "디렉터리" -#: resources.h:602 resources.h:889 resources.h:1023 -#: ../../locales/../src/interface/filelistctrl.cpp:471 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:395 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 +#: ../../locales/../src/interface/filelistctrl.cpp:468 +#: ../../locales/../src/interface/Mainfrm.cpp:2195 msgid "Directory comparison" msgstr "디렉터리 비교" -#: ../../locales/../src/interface/listingcomparison.cpp:74 -#: ../../locales/../src/interface/listingcomparison.cpp:82 -#: ../../locales/../src/interface/listingcomparison.cpp:88 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "Directory comparison failed" msgstr "디렉터리 비교 실패" @@ -2834,187 +3093,191 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "로그 파일 디렉터리가 존재하지 않거나 파일명에 문제가 있습니다." -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "사용자에 의해 디렉터리 목록 조회 중단" -#: ../../locales/../src/interface/RemoteListView.cpp:2115 +#: ../../locales/../src/interface/RemoteListView.cpp:2025 msgid "Directory listing failed" msgstr "디렉터리 목록 조회 실패" -#: resources.h:160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 msgid "Directory listing filters" msgstr "디렉터리 목록 조회 필터" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:199 +#, c-format +msgid "Directory listing of \"%s\" successful" +msgstr "\"%s\" 디렉터리 목록 조회 성공" + +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "디렉터리 목록 조회 성공" -#: resources.h:170 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Disa&ble all" msgstr "모두 해제(&B)" -#: ../../locales/../src/interface/state.cpp:1018 +#: ../../locales/../src/interface/state.cpp:982 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "탐색 동기화를 중지하고 리모트 디렉터리를 변경하시겠습니까?" -#: ../../locales/../src/interface/Mainfrm.cpp:651 +#: ../../locales/../src/interface/Mainfrm.cpp:646 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" "디렉터리 내용을 정상적으로 볼 수 없게 되면 다시 이 옵션을 해제하십시오." -#: resources.h:1016 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 msgid "Disconnect from server" msgstr "서버 연결 종료" -#: ../../locales/../src/engine/ControlSocket.cpp:84 -#: ../../locales/../src/engine/ControlSocket.cpp:971 -#: ../../locales/../src/engine/ControlSocket.cpp:1070 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:911 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:913 -#: ../../locales/../src/interface/QueueView.cpp:1063 -#: ../../locales/../src/interface/QueueView.cpp:1107 +#: ../../locales/../src/engine/ControlSocket.cpp:81 +#: ../../locales/../src/engine/ControlSocket.cpp:880 +#: ../../locales/../src/engine/ControlSocket.cpp:985 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "서버와의 연결이 종료됨" -#: ../../locales/../src/engine/ControlSocket.cpp:1105 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:1017 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 #, c-format msgid "Disconnected from server: %s" msgstr "%s 서버와의 연결이 종료됨" -#: ../../locales/../src/interface/QueueView.cpp:1424 -#: ../../locales/../src/interface/statuslinectrl.cpp:266 +#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/statuslinectrl.cpp:236 msgid "Disconnecting from previous server" msgstr "이전 서버와의 연결 종료 중" -#: resources.h:1017 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 msgid "Disconnects from the currently visible server" msgstr "현재 보고 있는 서버와의 연결 종료" -#: resources.h:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 msgid "Display about dialog" msgstr "FileZilla 정보 보기" -#: resources.h:907 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 msgid "Do ¬ use default editor" msgstr "기본 편집기 사용 안함(&N)" -#: resources.h:566 -msgid "Do ¬hing" -msgstr "없음(&N)" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +msgid "Do the same with &all selected files already being edited" +msgstr "이미 편집 중인 모든 선택 파일에 동일하게 적용(&a)" -#: ../../locales/../src/interface/Mainfrm.cpp:1207 -#: ../../locales/../src/interface/Mainfrm.cpp:1231 +#: ../../locales/../src/interface/Mainfrm.cpp:1130 +#: ../../locales/../src/interface/Mainfrm.cpp:1152 msgid "Do you really want to close FileZilla?" msgstr "정말 FileZilla를 닫으시겠습니까?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "정말 모든 사이트 관리자 항목과 전송 대기열을 삭제하시겠습니까?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "정말 모든 사이트 관리자 항목을 삭제하시겠습니까?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1226 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1237 msgid "Do you really want to delete selected entry?" msgstr "정말 선택된 항목을 삭제하시겠습니까?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "정말 전송 대기열을 삭제하시겠습니까?" -#: ../../locales/../src/interface/Mainfrm.cpp:570 +#: ../../locales/../src/interface/Mainfrm.cpp:585 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "정말 '%s'을(를) 서버로 보내시겠습니까?" -#: resources.h:404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +msgid "Do you want to reopen this file?" +msgstr "이 파일을 다시 여시겠습니까?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 msgid "Documentation" msgstr "설명서" -#: resources.h:661 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:250 msgid "Don't use external IP address on &local connections." msgstr "로컬 연결에 외부 IP 주소를 사용하지 않습니다(&L)." -#: resources.h:798 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "도트 파일은 .htaccess과 같이 파일명이 .(점)으로 시작하는 파일입니다." -#: resources.h:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 msgid "Double-click action" msgstr "더블 클릭 동작" -#: resources.h:300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 msgid "Download" msgstr "다운로드" -#: resources.h:421 resources.h:774 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "다운로드 제한(&L):" -#: ../../locales/../src/interface/statusbar.cpp:568 +#: ../../locales/../src/interface/statusbar.cpp:581 #, c-format msgid "Download limit: %s/s" msgstr "다운로드 제한(&L): %s/s" -#: ../../locales/../src/interface/statusbar.cpp:570 +#: ../../locales/../src/interface/statusbar.cpp:583 msgid "Download limit: none" msgstr "다운로드 제한(&L): 없음" -#: resources.h:379 ../../locales/../src/interface/search.cpp:510 -#: ../../locales/../src/interface/search.cpp:516 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3135 +#: ../../locales/../src/interface/search.cpp:851 +#: ../../locales/../src/interface/search.cpp:856 msgid "Download search results" msgstr "검색 결과 다운로드" -#: resources.h:587 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "Download selected directory" msgstr "선택된 디렉터리 다운로드" -#: resources.h:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 msgid "Download selected files and directories" msgstr "선택된 파일과 디렉터리 다운로드" -#: ../../locales/../src/interface/Mainfrm.cpp:1031 +#: ../../locales/../src/interface/Mainfrm.cpp:963 #, c-format msgid "" "Download speed: %s/s\n" "Upload speed: %s/s" msgstr "" +"다운로드 속도: %s/s\n" +"업로드 속도: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1127 +#: ../../locales/../src/interface/edithandler.cpp:1100 msgid "Downloading" msgstr "다운로드" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:351 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "%s 다운로드" -#: ../../locales/../src/interface/search.cpp:619 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" -"연관성 없는 디렉터리들을 한 번에 다운로드하는 기능은 아직 지원되지 않습니다" - -#: ../../locales/../src/interface/search.cpp:619 -msgid "Downloading search results" -msgstr "검색 결과 다운로드 중" - -#: resources.h:1034 +#: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "업데이트 다운로드..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:106 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:103 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:107 +#: ../../locales/../src/interface/LocalTreeView.cpp:111 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:105 +#: ../../locales/../src/interface/RemoteTreeView.cpp:91 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3022,61 +3285,76 @@ "서로 다른 FileZilla 인스턴스 사이에서의 드래그앤드롭은 아직 지원되지 않습니" "다.(&D)" -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:112 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:109 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:117 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:111 +#: ../../locales/../src/interface/RemoteTreeView.cpp:97 msgid "Drag&drop between different servers has not been implemented yet." msgstr "서로 다른 서버 사이에서의 드래그앤드롭은 아직 지원되지 않습니다.(&D)" -#: resources.h:960 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 msgid "Dupl&icate" -msgstr "" +msgstr "복제(&i)" -#: resources.h:166 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 msgid "E&nable all" msgstr "모두 사용(&N)" -#: resources.h:510 resources.h:529 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 msgid "E&nter directory" msgstr "디렉터리 들어가기(&N)" -#: resources.h:102 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 msgid "E&xecute" msgstr "실행(&X)" -#: resources.h:450 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 msgid "E&xit" msgstr "종료(&X)" -#: ../../locales/../src/interface/verifycertdialog.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:463 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:486 +msgid "E&xport..." +msgstr "내보내기(&E)..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E메일:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:693 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 msgid "Each filter needs at least one condition." msgstr "각 필터는 최소한 하나의 조건이 있어야 합니다." -#: resources.h:192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 msgid "Edit filters" msgstr "필터 편집" -#: resources.h:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "설정된 편집기로 파일을 편집한 후 서버에 변경 내용을 업로드하십시오." -#: ../../locales/../src/interface/LocalListView.cpp:1642 -#: ../../locales/../src/interface/LocalListView.cpp:1653 +#: ../../locales/../src/interface/search.cpp:1124 +msgid "Editing directories is not supported" +msgstr "디렉터리 편집은 지원되지 않습니다" + +#: ../../locales/../src/interface/LocalListView.cpp:1614 +#: ../../locales/../src/interface/LocalListView.cpp:1623 msgid "Editing failed" msgstr "편집 실패" -#: resources.h:849 +#: ../../locales/../src/interface/search.cpp:1124 +msgid "Editing search results" +msgstr "검색 결과 편집" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Email:" msgstr "이메일:" -#: ../../locales/../src/interface/QueueView.cpp:2275 +#: ../../locales/../src/interface/QueueView.cpp:1748 msgid "Empty command" msgstr "빈 명령어" @@ -3084,11 +3362,11 @@ msgid "Empty command." msgstr "빈 명령어입니다." -#: ../../locales/../src/interface/RemoteListView.cpp:2117 +#: ../../locales/../src/interface/RemoteListView.cpp:2027 msgid "Empty directory listing" msgstr "빈 디렉터리 목록" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "빈 디렉터리." @@ -3110,11 +3388,11 @@ msgid "Empty quoted string." msgstr "빈 따옴표 문자열." -#: resources.h:169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 msgid "En&able all" msgstr "모두 사용(&A)" -#: resources.h:783 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 msgid "Enable invalid character &filtering" msgstr "비정상 글자 필터링 기능 사용(&f)" @@ -3122,36 +3400,35 @@ msgid "Encrypted" msgstr "암호화됨" -#: resources.h:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 msgid "Encryption" msgstr "암호화" -#: resources.h:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 msgid "Encryption details" msgstr "암호화 상세" -#: ../../locales/../src/interface/filelistctrl.cpp:473 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "End comparison and change sorting order?" msgstr "비교를 끝내고 정렬 순서를 변경하시겠습니까?" -#: resources.h:491 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Enter &custom command..." msgstr "사용자 명령어 입력(&C)..." -#: resources.h:425 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Enter 0 for unlimited speed." msgstr "속도를 제한하지 않으려면 0을 입력하세요." -#: ../../locales/../src/interface/QueueView.cpp:2264 +#: ../../locales/../src/interface/QueueView.cpp:1742 msgid "Enter command" msgstr "명령어 입력" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:568 msgid "Enter custom command" msgstr "사용자 명령어 입력" -#: resources.h:899 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 msgid "Enter directory" msgstr "디렉터리 입력" @@ -3161,23 +3438,24 @@ msgid "Enter filter name" msgstr "필터명 입력" -#: ../../locales/../src/interface/filter.cpp:343 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "필터셋 이름 입력" -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "새 필터셋 이름 입력" -#: resources.h:80 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 msgid "Enter password" msgstr "비밀번호 입력" -#: resources.h:511 resources.h:530 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Enter selected directory" msgstr "선택된 디렉터리 입력" -#: resources.h:681 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 msgid "" "Enter the address of the server.\n" "To specify the server protocol, prepend the host with the protocol " @@ -3187,7 +3465,7 @@ "here, the values in the other fields will be overwritten then.\n" "\n" "Supported protocols are:\n" -"- ftp:// for normal FTP\n" +"- ftp:// for normal FTP with optional encryption\n" "- sftp:// for SSH file transfer protocol\n" "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" @@ -3196,18 +3474,24 @@ "서버 프로토콜을 지정하려면 호스트 앞에 프로토콜 식별어를 붙이세요. 프로토콜" "을 지정하지 않으면 기본 프로토콜(ftp://)이 사용됩니다.\n" "또한 여기에 protocol://user:pass@host:port 형태의 완전한 URL을 입력할 수도 있" -"는데 이때 다른 필드의 값은 덮어쓰게 됩니다." +"는데 이때 다른 필드의 값들은 덮어쓰게 됩니다.\n" +"\n" +"지원되는 프로토콜은 다음과 같습니다.\n" +"- ftp:// 일반 FTP이며 암호화를 선택할 수 있음\n" +"- sftp:// SSH 파일 전송 프로토콜\n" +"- ftps:// TLS를 통한 FTP (묵시적)\n" +"- ftpes:// TLS를 통한 FTP (명시적)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" "'%s' 파일의 비밀번호를 입력하십시오.\n" "변환된 파일은 비밀번호로 보호되지 않음에 유의하십시오." -#: resources.h:685 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" "Enter the port on which the server listens.\n" "The default for FTP is 21, the default for SFTP is 22." @@ -3215,117 +3499,120 @@ "서버가 응답하는 포트를 입력하세요.\n" "FTP의 기본값은 21이고 SFTP의 기본값은 22입니다." -#: ../../locales/../src/interface/loginmanager.cpp:63 +#: ../../locales/../src/interface/loginmanager.cpp:70 +#, fuzzy +msgid "Enter username" +msgstr "필터명 입력" + +#: ../../locales/../src/interface/loginmanager.cpp:77 msgid "Enter username and password" msgstr "사용자명과 비밀번호 입력" -#: ../../locales/../src/interface/export.cpp:25 +#: ../../locales/../src/interface/export.cpp:26 msgid "Error exporting settings" msgstr "설정 내보내기 오류" -#: ../../locales/../src/interface/import.cpp:27 -#: ../../locales/../src/interface/import.cpp:36 -#: ../../locales/../src/interface/import.cpp:98 +#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:95 msgid "Error importing" msgstr "가져오기 오류" -#: ../../locales/../src/interface/QueueView.cpp:2056 +#: ../../locales/../src/interface/QueueView.cpp:1544 msgid "Error loading queue" msgstr "대기열 로딩 오류" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:172 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:299 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:731 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:772 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:821 -#: ../../locales/../src/interface/filter.cpp:210 -#: ../../locales/../src/interface/filter.cpp:1019 -#: ../../locales/../src/interface/import.cpp:109 -#: ../../locales/../src/interface/import.cpp:295 -#: ../../locales/../src/interface/Options.cpp:225 -#: ../../locales/../src/interface/QueueView.cpp:1969 -#: ../../locales/../src/interface/search.cpp:787 -#: ../../locales/../src/interface/search.cpp:808 -#: ../../locales/../src/interface/sitemanager.cpp:241 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:555 -#: ../../locales/../src/interface/sitemanager.cpp:618 -#: ../../locales/../src/interface/sitemanager.cpp:733 -#: ../../locales/../src/interface/sitemanager.cpp:818 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:732 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:787 -#: ../../locales/../src/interface/wrapengine.cpp:997 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:282 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:697 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:734 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:780 +#: ../../locales/../src/interface/filter.cpp:214 +#: ../../locales/../src/interface/filter.cpp:980 +#: ../../locales/../src/interface/import.cpp:106 +#: ../../locales/../src/interface/import.cpp:293 +#: ../../locales/../src/interface/Options.cpp:249 +#: ../../locales/../src/interface/QueueView.cpp:1453 +#: ../../locales/../src/interface/search.cpp:1252 +#: ../../locales/../src/interface/search.cpp:1271 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:516 +#: ../../locales/../src/interface/sitemanager.cpp:574 +#: ../../locales/../src/interface/sitemanager.cpp:671 +#: ../../locales/../src/interface/sitemanager.cpp:748 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:738 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:796 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "xml 파일을 여는 중 오류" -#: ../../locales/../src/interface/QueueView.cpp:1955 +#: ../../locales/../src/interface/QueueView.cpp:1442 msgid "Error saving queue" msgstr "대기열 저장 오류" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "Error starting program" msgstr "프로그램 시작 오류" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:859 -#: ../../locales/../src/interface/QueueView.cpp:1990 -#: ../../locales/../src/interface/sitemanager.cpp:673 -#: ../../locales/../src/interface/sitemanager.cpp:795 -#: ../../locales/../src/interface/sitemanager.cpp:851 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:811 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178 -#: ../../locales/../src/interface/wrapengine.cpp:1156 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:314 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:815 +#: ../../locales/../src/interface/QueueView.cpp:1471 +#: ../../locales/../src/interface/sitemanager.cpp:618 +#: ../../locales/../src/interface/sitemanager.cpp:726 +#: ../../locales/../src/interface/sitemanager.cpp:780 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:817 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2270 +#: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "xml 파일을 쓰는 중 오류" -#: ../../locales/../src/engine/logging.cpp:123 -#: ../../locales/../src/interface/StatusView.cpp:275 -#: ../../locales/../src/interface/StatusView.cpp:329 +#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:334 msgid "Error:" msgstr "오류:" -#: resources.h:918 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "예: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: resources.h:871 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 msgid "Examples" msgstr "예:" -#: resources.h:106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 msgid "Exe&cute" msgstr "실행(&C)" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "실행 파일에 버전 정보가 없습니다. 업데이트를 확인할 수 없습니다." -#: resources.h:825 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "Explorer" msgstr "탐색기" -#: resources.h:232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 msgid "Export &Queue" msgstr "대기열 내보내기(&Q)" -#: resources.h:231 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 msgid "Export &Settings" msgstr "설정(&S) 내보내기" -#: resources.h:228 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 msgid "Export settings" msgstr "설정 내보내기" -#: resources.h:181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" msgstr "필터 이름(&I):" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:498 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:492 msgid "FTP - File Transfer Protocol" msgstr "FTP - 파일 전송 프로토콜" @@ -3337,17 +3624,16 @@ msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - 보안되지 않은 파일 전송 프로토콜" -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 msgid "FTP Engine not initialized, can't connect" msgstr "FTP 엔진이 초기화되지 않았습니다. 연결할 수 없습니다." -#: resources.h:709 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 msgid "FTP Keep-alive" msgstr "FTP 연결 유지" -#: resources.h:729 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP 프록시" @@ -3355,7 +3641,7 @@ msgid "FTP URL" msgstr "FTP URL" -#: resources.h:637 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:44 msgid "" "FTP uses secondary connections for data transfers. These additional " "connections can be established in two ways." @@ -3364,48 +3650,47 @@ "방법이 있습니다." #: ../../locales/../src/engine/server.cpp:20 -msgid "FTPES - FTP over explicit TLS/SSL" -msgstr "FTPES - 명시적 TLS/SSL을 통한 FTP" +msgid "FTPES - FTP over explicit TLS" +msgstr "FTPES - 명시적 TLS를 통한 FTP" #: ../../locales/../src/engine/server.cpp:19 -msgid "FTPS - FTP over implicit TLS/SSL" -msgstr "FTPS - 묵시적 TLS/SSL을 통한 FTP" +msgid "FTPS - FTP over implicit TLS" +msgstr "FTPS - 묵시적 TLS를 통한 FTP" -#: ../../locales/../src/interface/LocalListView.cpp:546 -#: ../../locales/../src/interface/LocalListView.cpp:626 -#: ../../locales/../src/interface/LocalListView.cpp:914 -#: ../../locales/../src/interface/LocalListView.cpp:1936 -#: ../../locales/../src/interface/LocalTreeView.cpp:866 -#: ../../locales/../src/interface/LocalTreeView.cpp:1157 -#: ../../locales/../src/interface/viewheader.cpp:538 +#: ../../locales/../src/interface/LocalListView.cpp:535 +#: ../../locales/../src/interface/LocalListView.cpp:611 +#: ../../locales/../src/interface/LocalListView.cpp:912 +#: ../../locales/../src/interface/LocalListView.cpp:1819 +#: ../../locales/../src/interface/LocalTreeView.cpp:846 +#: ../../locales/../src/interface/LocalTreeView.cpp:1125 +#: ../../locales/../src/interface/viewheader.cpp:495 msgid "Failed to change directory" msgstr "디렉터리 변경 실패" -#: ../../locales/../src/interface/FileZilla.cpp:215 -#: ../../locales/../src/interface/FileZilla.cpp:228 -#: ../../locales/../src/interface/FileZilla.cpp:230 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:135 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:152 msgid "Failed to change language" msgstr "언어 변경 실패" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1966 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2055 msgid "Failed to copy or move sites" msgstr "사이트 복사 또는 이동 실패" -#: ../../locales/../src/interface/xmlfunctions.cpp:519 +#: ../../locales/../src/interface/xmlfunctions.cpp:350 msgid "Failed to create backup copy of xml file" msgstr "xml 파일의 사본 복사 생성 실패" -#: ../../locales/../src/interface/netconfwizard.cpp:797 +#: ../../locales/../src/interface/netconfwizard.cpp:809 msgid "Failed to create listen socket, aborting" msgstr "응답 소켓 생성 실패, 중단" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4282 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4286 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4079 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4083 msgid "Failed to create listening socket for active mode transfer" msgstr "능동형 모드 전송을 위한 대기 소켓 생성 실패" -#: ../../locales/../src/interface/LocalTreeView.cpp:626 +#: ../../locales/../src/interface/LocalTreeView.cpp:624 msgid "Failed to get 'My Documents' path" msgstr "'내 문서' 경로 찾기 실패" @@ -3413,135 +3698,134 @@ msgid "Failed to get desktop path" msgstr "바탕 화면 경로 찾기 실패" -#: ../../locales/../src/interface/netconfwizard.cpp:956 +#: ../../locales/../src/interface/netconfwizard.cpp:962 msgid "Failed to get peer address of control connection, connection closed." msgstr "제어 연결의 피어 주소를 가져오는데 실패, 연결이 끊겼습니다." -#: ../../locales/../src/interface/netconfwizard.cpp:964 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of data connection, connection closed." msgstr "데이터 연결의 피어 주소를 가져오는데 실패, 연결이 끊겼습니다." -#: ../../locales/../src/interface/context_control.cpp:79 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "FTP 엔진 초기화 실패" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:787 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:306 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "TLS 초기화 실패." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:86 +msgid "Failed to initialize networking" +msgstr "네트워크 연결 초기화 실패" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "창 열기 실패, 잘못된 리소스 파일입니까?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "개인 키 열기 실패: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2642 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "쓰기를 위한 \"%s\" 열기 실패" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2704 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "읽기 위한 \"%s\" 열기 실패" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2683 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1046 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2522 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "쓰기 위한 \"%s\" 열기 실패" -#: ../../locales/../src/engine/ControlSocket.cpp:436 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "반환된 경로를 파싱하지 못함." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:314 -msgid "Failed to parse trusted root cert." -msgstr "신뢰된 루트 인증서 파싱 실패." - -#: ../../locales/../src/interface/netconfwizard.cpp:1020 +#: ../../locales/../src/interface/netconfwizard.cpp:1021 msgid "Failed to receive data" msgstr "데이터 수신 실패" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "디렉터리 목록 조회 실패" -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/interface/netconfwizard.cpp:738 msgid "Failed to retrieve external ip address, aborting" msgstr "외부 IP 주소 조회 실패, 중단" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3978 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3781 msgid "Failed to retrieve external ip address, using local address" msgstr "외부 IP 주소 조회 실패, 로컬 주소 사용" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4000 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3800 msgid "Failed to retrieve local ip address." msgstr "로컬 IP 주소 조회 실패." -#: ../../locales/../src/interface/netconfwizard.cpp:688 +#: ../../locales/../src/interface/netconfwizard.cpp:714 msgid "Failed to retrieve local ip address. Aborting" msgstr "로컬 IP 주소 조회 실패. 중단" -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/interface/netconfwizard.cpp:640 msgid "Failed to retrieve the external IP address." msgstr "외부 IP 주소 조회 실패." -#: ../../locales/../src/interface/netconfwizard.cpp:307 +#: ../../locales/../src/interface/netconfwizard.cpp:325 msgid "Failed to send command." msgstr "명령 보내기 실패." -#: ../../locales/../src/interface/FileZilla.cpp:228 +#: ../../locales/../src/interface/FileZilla.cpp:150 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "%s (%s) 언어 설정 실패, 시스템 기본 언어 사용" -#: ../../locales/../src/interface/FileZilla.cpp:208 +#: ../../locales/../src/interface/FileZilla.cpp:128 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "%s (%s) 언어 설정 실패, 시스템 기본 언어인 (%s, %s)을(를) 사용합니다." -#: ../../locales/../src/interface/FileZilla.cpp:196 +#: ../../locales/../src/interface/FileZilla.cpp:117 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "%s (%s) 언어 설정 실패, 시스템 기본 언어를 사용합니다." -#: ../../locales/../src/interface/FileZilla.cpp:230 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:152 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "%s 언어 변경 실패, 시스템의 기본 언어 사용" -#: ../../locales/../src/interface/FileZilla.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:124 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "%s 언어 설정 실패, 시스템 기본 언어인 (%s, %s)을(를) 사용합니다." -#: ../../locales/../src/interface/FileZilla.cpp:193 +#: ../../locales/../src/interface/FileZilla.cpp:114 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "%s 언어 설정 실패, 시스템 기본 언어 사용" -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:206 msgid "Failed to validate settings" msgstr "설정 검증 실패" -#: ../../locales/../src/engine/tlssocket.cpp:1069 +#: ../../locales/../src/engine/tlssocket.cpp:1162 msgid "Failed to verify peer certificate" msgstr "피어 인증서 검증 실패" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:551 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "%s 파일 쓰기 실패" -#: ../../locales/../src/interface/xmlfunctions.cpp:537 +#: ../../locales/../src/interface/xmlfunctions.cpp:363 msgid "Failed to write xml file" msgstr "xml 파일 쓰기 실패" @@ -3549,169 +3833,166 @@ msgid "Failed transfers" msgstr "전송 실패" -#: resources.h:652 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 msgid "Fall back to active mode" msgstr "능동형 모드로 자동 전환" -#: resources.h:307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "Fil&e:" msgstr "파일(&E)" -#: resources.h:188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 msgid "Fil&es" msgstr "파일(&E)" -#: ../../locales/../src/interface/filelistctrl.cpp:282 +#: ../../locales/../src/interface/filelistctrl.cpp:267 msgid "File" msgstr "파일" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 msgid "File Types" msgstr "파일 종류" -#: ../../locales/../src/engine/socket.cpp:1222 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "File descriptor not a socket" -msgstr "" +msgstr "파일 기술자가 소켓이 아님" -#: ../../locales/../src/interface/import.cpp:98 +#: ../../locales/../src/interface/import.cpp:95 msgid "File does not contain any importable data." msgstr "파일에 가져올 수 있는 데이터가 없습니다." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "파일 편집" -#: ../../locales/../src/interface/RemoteListView.cpp:1670 +#: ../../locales/../src/interface/RemoteListView.cpp:1606 msgid "File exists" msgstr "파일 존재" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 msgid "File exists action" msgstr "중복 파일 동작" -#: resources.h:243 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 msgid "File has changed" msgstr "파일이 변경됨" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 msgid "File lists" msgstr "파일 목록" -#: ../../locales/../src/interface/edithandler.cpp:1604 -#: ../../locales/../src/interface/FileZilla.cpp:705 -#: ../../locales/../src/interface/FileZilla.cpp:799 +#: ../../locales/../src/interface/edithandler.cpp:1551 +#: ../../locales/../src/interface/FileZilla.cpp:583 +#: ../../locales/../src/interface/FileZilla.cpp:668 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "파일을 찾을 수 없음" -#: resources.h:1027 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:680 msgid "File search" msgstr "파일 검색" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "사용자에 의해 파일 전송 중단" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:118 #, c-format msgid "File transfer aborted by user after transferring %s in %s" -msgstr "" +msgstr "%s에 %s 전송 후 사용자에 의해 파일 전송 중단됨" -#: ../../locales/../src/engine/ControlSocket.cpp:141 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "파일 전송 실패" -#: ../../locales/../src/engine/ControlSocket.cpp:124 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "%s에서 %s 전송 후 파일 전송 실패" -#: ../../locales/../src/engine/ControlSocket.cpp:136 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "파일 전송 생략" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "파일 전송 성공" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "파일 전송 성공, %s를 %s에 전송" -#: ../../locales/../src/interface/Mainfrm.cpp:1206 +#: ../../locales/../src/interface/Mainfrm.cpp:1129 msgid "File transfers still in progress." msgstr "파일 전송이 아직 진행 중입니다." -#: resources.h:325 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 msgid "File would transfer with ASCII data type." msgstr "파일을 ASCII 데이터 유형으로 전송합니다." -#: resources.h:326 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 msgid "File would transfer with binary data type." msgstr "파일을 바이너리 데이터 유형으로 전송합니다." -#: ../../locales/../src/interface/FileZilla.cpp:503 -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 msgid "FileZilla Error" msgstr "FileZilla 오류" -#: resources.h:674 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." msgstr "FileZilla는 이제 모든 구성 항목이 잘 구성되었는지 시험할 수 있습니다." -#: resources.h:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3609 msgid "FileZilla is already connected to a server." msgstr "FileZilla가 이미 서버에 연결돼 있습니다." -#: ../../locales/../src/interface/Mainfrm.cpp:1537 +#: ../../locales/../src/interface/Mainfrm.cpp:1426 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "변경된 언어를 적용하려면 FileZilla를 다시 시작해야 합니다." -#: resources.h:931 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 msgid "FileZilla updates" msgstr "FileZilla 업데이트" -#: resources.h:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 msgid "Filelist status &bars" msgstr "파일 목록 상태 표시줄(&b)" -#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1085 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 #: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:79 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/RemoteListView.cpp:393 +#: ../../locales/../src/interface/search.cpp:150 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Filename" msgstr "파일명" -#: resources.h:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 msgid "Filename &filters..." msgstr "파일명 필터(&F)..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3144 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2309 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2202 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "%s 디렉터리와 %s 파일명으로 파일명을 구성할 수 없습니다" -#: ../../locales/../src/interface/RemoteListView.cpp:1656 +#: ../../locales/../src/interface/RemoteListView.cpp:1592 msgid "Filename invalid" msgstr "파일명이 올바르지 않음" -#: ../../locales/../src/interface/RemoteListView.cpp:2919 -msgid "" -"Filename may not contain any of the following characters: / \\ : * ? \" < > |" -msgstr "파일명에는 다음과 같은 문자를 포함할 수 없습니다. / \\ : * ? \" < > |" - -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "파일명이 변경되지 않음" -#: resources.h:245 resources.h:935 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "파일명:" @@ -3725,91 +4006,100 @@ "|" msgstr "파일명에는 다음과 같은 문자를 포함할 수 없습니다: / \\ : * ? \" < > |" -#: resources.h:273 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 msgid "Files currently being edited" msgstr "현재 편집 중인 파일" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 #: ../../locales/../src/interface/LocalListView.cpp:280 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:81 +#: ../../locales/../src/interface/RemoteListView.cpp:394 +#: ../../locales/../src/interface/search.cpp:152 msgid "Filesize" msgstr "크기" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "파일 크기 형식" #: ../../locales/../src/interface/LocalListView.cpp:281 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:82 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:153 msgid "Filetype" msgstr "파일 유형" -#: resources.h:919 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "파일 유형 연결" -#: resources.h:187 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 msgid "Filter applies to:" msgstr "필터 적용:" -#: resources.h:782 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 msgid "Filter invalid characters in filenames" msgstr "파일명의 비정상 글자 필터링" #: ../../locales/../src/interface/filteredit.cpp:149 #: ../../locales/../src/interface/filteredit.cpp:217 #: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:358 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "필터명이 이미 존재함" -#: resources.h:183 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 msgid "Filter out items matching all of the following" msgstr "다음과 모두 일치하는 항목 필터링" -#: resources.h:184 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 msgid "Filter out items matching any of the following" msgstr "다음과 하나라도 일치하는 항목 필터링" -#: resources.h:185 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 msgid "Filter out items matching none of the following" msgstr "다음과 하나도 일치하지 않는 항목 필터링" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Filter set already exists" msgstr "필터 설정이 이미 존재함" -#: resources.h:1020 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 msgid "Filter the directory listings" msgstr "디렉터리 목록 조회 필터링" -#: ../../locales/../src/interface/filteredit.cpp:340 -#: ../../locales/../src/interface/filteredit.cpp:349 -#: ../../locales/../src/interface/filteredit.cpp:358 +#: ../../locales/../src/interface/filteredit.cpp:337 +#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter validation failed" msgstr "필터 유효성 실패" -#: resources.h:10 resources.h:39 -msgid "Fingerprint (MD5):" -msgstr "지문 (MD5):" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3093 +msgid "Find &files" +msgstr "파일 찾기(&f)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3098 +msgid "Find d&irectories" +msgstr "디렉터리 찾기(&i)" -#: resources.h:11 resources.h:40 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" msgstr "지문 (SHA-1):" -#: resources.h:141 resources.h:154 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 +msgid "Fingerprint (SHA-256):" +msgstr "지문 (SHA-256):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 msgid "Fingerprint:" msgstr "지문:" -#: ../../locales/../src/interface/netconfwizard.cpp:42 +#: ../../locales/../src/interface/netconfwizard.cpp:56 msgid "Firewall and router configuration wizard" msgstr "방화벽 및 라우터 설정 마법사" -#: resources.h:692 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -3817,11 +4107,11 @@ "설정 항목에 대한 자세한 내용을 확인하려면 네트워크 구성 마법사를 실행하십시" "오." -#: resources.h:669 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 msgid "For reliability you should specify a range of at least 10 ports." msgstr "확실한 설정을 위해 포트 범위는 최소 10개를 지정하도록 합니다." -#: ../../locales/../src/interface/Options.cpp:224 +#: ../../locales/../src/interface/Options.cpp:248 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -3829,74 +4119,99 @@ "현재 세션은 기본 설정값을 사용하게 됩니다. 설정 변경 사항은 저장되지 않습니" "다." -#: resources.h:992 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Force &UTF-8" msgstr "UTF-8로 강제 설정(&U)" -#: resources.h:493 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Force showing &hidden files" msgstr "숨김 파일 강제 표시(&H)" -#: ../../locales/../src/interface/Mainfrm.cpp:646 +#: ../../locales/../src/interface/Mainfrm.cpp:641 msgid "Force showing hidden files" msgstr "숨김 파일 강제 표시" -#: resources.h:736 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 msgid "Format specifications:" msgstr "형식 지정:" -#: resources.h:917 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "형식: 확장명 다음에 따옴표로 묶은 명령 및 인자" -#: ../../locales/../src/interface/updater.cpp:630 +#. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n +#: ../../locales/../src/interface/updater.cpp:689 #, c-format msgid "Found new %s %s\n" -msgstr "" +msgstr "새로운 %s %s 찾음\n" -#: resources.h:407 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3505 msgid "Further documentation" msgstr "기타 문서" -#: resources.h:961 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 msgid "General" msgstr "일반" -#: ../../locales/../src/engine/proxy.cpp:533 +#: ../../locales/../src/engine/proxy.cpp:508 msgid "General SOCKS server failure" msgstr "일반 SOCK 서버 장애" -#: resources.h:754 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "일반 프록시" -#: resources.h:658 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" msgstr "다음의 URL로부터 외부 IP 주소 가져오기:" -#: resources.h:408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3524 msgid "Getting help" msgstr "도움이 필요할 때는" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Given filterset name already exists, overwrite filter set?" msgstr "필터명이 이미 존재합니다. 덮어쓰시겠습니까?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:244 msgid "Global bookmarks" msgstr "전역 북마크" -#: resources.h:127 +#: ../../locales/../src/engine/tlssocket.cpp:265 +#, c-format +msgid "GnuTLS error %d" +msgstr "GnuTLS 오류 %d" + +#: ../../locales/../src/engine/tlssocket.cpp:267 +#, c-format +msgid "GnuTLS error %d in %s" +msgstr "GnuTLS 오류 %d in %s" + +#: ../../locales/../src/engine/tlssocket.cpp:261 +#, c-format +msgid "GnuTLS error %d in %s: %s" +msgstr "GnuTLS 오류 %d in %s: %s" + +#: ../../locales/../src/engine/tlssocket.cpp:259 +#, c-format +msgid "GnuTLS error %d: %s" +msgstr "GnuTLS 오류 %d: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "GnuTLS:" msgstr "GnuTLS:" -#: resources.h:99 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 msgid "Group permissions" msgstr "그룹 권한" -#: resources.h:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "높음(&I)" @@ -3904,7 +4219,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - TLS를 통한 HTTP" -#: resources.h:278 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 msgid "Hash:" msgstr "해시:" @@ -3912,63 +4227,70 @@ msgid "Hidden" msgstr "숨김" -#: resources.h:780 ../../locales/../src/interface/queue.cpp:921 -#: ../../locales/../src/interface/queue.cpp:1008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "High" msgstr "높음" -#: ../../locales/../src/interface/queue.cpp:923 -#: ../../locales/../src/interface/queue.cpp:1010 +#: ../../locales/../src/interface/queue.cpp:885 +#: ../../locales/../src/interface/queue.cpp:941 msgid "Highest" msgstr "가장 높음" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "사용 가능한 가장 높은 포트 번호는 1024 ~ 65535입니다." -#: resources.h:171 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "Shift 키를 누르고 있으면 양쪽 필터 상태를 동시에 켜고 끌 수 있습니다." -#: resources.h:118 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Homepage:" msgstr "홈페이지:" -#: resources.h:280 +#: ../../locales/../src/engine/socket.cpp:1052 +msgid "Host is down" +msgstr "호스트 다운" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 msgid "Host key fingerprint:" msgstr "호스트 키 지문:" -#: resources.h:147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 msgid "Host key mismatch" msgstr "호스트 키 불일치" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:158 msgid "Host starts with '[' but no closing bracket found." msgstr "호스트가 '['로 시작하는데 닫는 괄호가 없습니다." -#: ../../locales/../src/engine/proxy.cpp:542 +#: ../../locales/../src/engine/proxy.cpp:517 msgid "Host unreachable" msgstr "호스트 도달 불가" -#: resources.h:17 resources.h:46 resources.h:85 resources.h:139 -#: resources.h:152 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 msgid "Host:" msgstr "호스트:" -#: resources.h:979 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 msgid "Hours," msgstr "시간," -#: resources.h:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 msgid "I&SO 8601 (example: 15:47)" msgstr "ISO 8601(&S) (예: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:140 +#: ../../locales/../src/engine/proxy.cpp:154 msgid "IPv6 addresses are not supported with SOCKS4 proxy" -msgstr "" +msgstr "IPv6 주소는 SOCKS4 프록시에서 지원되지 않습니다" -#: resources.h:696 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -3977,11 +4299,11 @@ "어느 한 동작 동안 지정 시간 이상 데이터 송수신이 없으면 FileZilla는 접속을 종" "료하고 재접속합니다." -#: resources.h:951 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "버그를 등록하는 경우 \"상세\" 로깅 수준의 로그를 올려주시기 바랍니다." -#: resources.h:649 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" "If the automatic test at the end of this wizard succeeds, but you cannot " "transfer files to a particular server, the server might be misconfigured and " @@ -3993,7 +4315,7 @@ "다. 사이트 관리자에서 전송 모드를 설정하는 것은 서버마다 개별적으로 가능합니" "다." -#: resources.h:644 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 msgid "" "If the fallback option is enabled, you will be able to connect to " "misconfigured servers which reject the selected transfer mode." @@ -4001,35 +4323,35 @@ "자동 전환 옵션을 사용하면 서버가 잘못 구성돼 있어서 전송 모드를 거부하더라도 " "연결 가능할 수 있습니다." -#: resources.h:150 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "호스트 키 변경이 예정에 없던 일인 경우 관리자에게 문의하십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:554 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" "문제가 계속 발생하면 라우터 또는 방화벽이 FileZilla를 차단하는 것입니다." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "문제가 계속 발생하면 라우터 또는 방화벽이 연결을 방해하는 것입니다." -#: resources.h:940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "" -"If the size of the logfile reaches the limit, it gets renamed by adding \".1" -"\" to the end of the filename (possibly overwriting older logfiles) and a " -"new file gets created." +"If the size of the logfile reaches the limit, it gets renamed by adding " +"\".1\" to the end of the filename (possibly overwriting older logfiles) and " +"a new file gets created." msgstr "" "로그 파일이 제한된 크기에 도달하면 \".1\"이 붙는 형태로 파일명이 변경되며(이" "전 로그 파일이 있으면 덮어씀) 새 파일이 생성됩니다." -#: resources.h:393 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4037,17 +4359,18 @@ "심링크가 디렉터리를 나타내는 경우 FileZilla는 심볼릭 링크를 삭제할 수도 있고 " "링크된 디렉터리의 내용을 삭제할 수도 있습니다." -#: ../../locales/../src/interface/netconfwizard.cpp:624 +#: ../../locales/../src/interface/netconfwizard.cpp:648 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "이 문제가 계속 발생하면, 라우터 또는 공유기 제조사에 문의하십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:606 msgid "If this problem stays, please contact your router manufacturer." msgstr "이 문제가 계속 발생하면, 라우터 제조사에 문의하십시오." -#: resources.h:216 resources.h:819 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4057,7 +4380,7 @@ "시간대가 다른 등의 이유로 양쪽 시간이 다른 경우 사이트 관리자에서 시간대를 지" "정하십시오." -#: resources.h:890 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4065,12 +4388,11 @@ "파일 시간에 근거한 비교는 두 파일의 시간차가 한계값을 초과하지 않으면 같은지 " "보는 것입니다." -#: resources.h:905 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 msgid "If you change the language, you need to restart FileZilla." msgstr "언어를 변경하는 경우 FileZilla를 다시 시작해야 합니다." -#: resources.h:675 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" "If you click on test, FileZilla will connect to probe.filezilla-project.org " "and will perform some simple tests." @@ -4078,21 +4400,21 @@ "[시험]을 누르면 FileZilla는 probe.filezilla-project.org에 연결하여 몇 가지 간" "단한 시험을 수행합니다." -#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1151 msgid "If you close FileZilla, your changes will be lost." msgstr "FileZilla를 닫으면 변경 내용이 손실됩니다." -#: resources.h:795 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "잘못된 파일 유형을 입력하면 해당 파일들은 전송시 손상될 수 있습니다." -#: resources.h:676 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." msgstr "오류가 발생하는 경우는 구성이 적절하지 않은 것입니다." -#: resources.h:708 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4100,7 +4422,7 @@ "디렉터리 목록을 가져오거나 파일 전송에 문제가 있으면 전송 모드 기본값을 변경" "해보세요." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4110,7 +4432,7 @@ "못되었을 수 있습니다. 이 경우 수동형 모드 켜기/끄기를 시도해보고 서버 관리자" "에게 문의하십시오." -#: resources.h:635 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 msgid "" "If you successfully complete the wizard and the final test succeeds, any " "firewalls and routers you have should be configured properly." @@ -4118,7 +4440,7 @@ "정상적으로 마법사가 완료되고 최종 시험이 성공하면 사용자의 방화벽과 라우터가 " "잘 설정된 것입니다." -#: resources.h:671 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 msgid "" "If you use a firewall, make sure FileZilla is allowed to accept connection " "on all given ports." @@ -4126,7 +4448,7 @@ "방화벽을 사용하는 경우 모든 지정 포트에 FileZilla가 접속할 수 있도록 허용하십" "시오." -#: resources.h:670 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 msgid "" "If you use a router, make sure all these ports are forwarded to the machine " "you're running FileZilla on." @@ -4134,7 +4456,7 @@ "라우터를 사용하는 경우 모든 해당 포트들이 FileZilla를 실행 중인 머신으로 포워" "드될 수 있게 하십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:619 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4142,11 +4464,11 @@ "라우터가 지속적으로 IP 주소를 변경하는 것인 경우 라우터 제조사에 문의하십시" "오." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:87 msgid "Import data from older version" msgstr "구버전으로부터 데이터 가져오기" -#: resources.h:235 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 msgid "Import settings" msgstr "설정 가져오기" @@ -4160,7 +4482,7 @@ msgid "Improperly quoted association." msgstr "적합하지 않은 파일 연결입니다." -#: resources.h:663 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" "In active mode, FileZilla has to listen on a port for data transfers. You " "have to specify which ports FileZilla will use." @@ -4168,7 +4490,7 @@ "능동형 모드의 데이터 전송을 위해서는 FileZilla가 포트를 하나 열고 대기해야 합" "니다. 사용자는 FileZilla가 사용할 포트를 지정해야 합니다." -#: resources.h:665 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 msgid "" "In case you have a router, you will have to forward all available ports, as " "FileZilla has no influence on the ports your system chooses." @@ -4176,14 +4498,15 @@ "라우터를 사용하는 경우에는 모든 가능 포트를 포워드해야 합니다. FileZilla는 시" "스템이 포트를 선택하는 데 영향을 주지 않기 때문입니다." -#: resources.h:653 resources.h:717 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." msgstr "" "능동형 모드를 사용하려면 FileZilla가 사용자의 외부 IP 주소를 알아야 합니다." -#: resources.h:638 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:52 msgid "" "In passive mode, which is recommended for most users, FileZilla asks the " "server for a port and connects to the given port. Not much configuration has " @@ -4193,64 +4516,67 @@ "를 요청하고 그에 따라 주어진 포트로 연결합니다. 이 모드는 간단히 설정이 완료" "됩니다." -#: ../../locales/../src/engine/tlssocket.cpp:1083 +#: ../../locales/../src/engine/tlssocket.cpp:1174 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" msgstr "최상위 인증서가 자체 서명되지 않은 기관의 인증서임" -#: ../../locales/../src/interface/QueueView.cpp:1059 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "비밀번호 오류" -#: resources.h:1043 +#: ../../locales/../src/interface/resources/xrc/update.xrc:196 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:742 msgid "Initializing TLS..." msgstr "TLS 초기화..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:763 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 +msgid "Insecure algorithm!" +msgstr "안전하지 않은 앨거리듬임!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:726 msgid "Insecure server, it does not support FTP over TLS." msgstr "보안되지 않은 서버입니다. TLS를 통한 FTP를 지원하지 않습니다." -#: ../../locales/../src/engine/server.cpp:835 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/engine/server.cpp:883 +#: ../../locales/../src/engine/server.cpp:904 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "인터랙티브" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 msgid "Interface" msgstr "인터페이스" -#: ../../locales/../src/engine/socket.cpp:1219 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Interrupted by signal" msgstr "시그널에 의해 중단됨" -#: ../../locales/../src/engine/ControlSocket.cpp:221 -#: ../../locales/../src/interface/QueueView.cpp:1016 -#: ../../locales/../src/interface/QueueView.cpp:1595 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "사용자에 의해 중단" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:758 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "유효하지 않은 컨텐트-길이" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:608 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "유효하지 않은 HTTP 응답" -#: ../../locales/../src/engine/socket.cpp:1207 +#: ../../locales/../src/engine/socket.cpp:1026 msgid "Invalid argument passed" msgstr "전달받은 인자 이상" -#: ../../locales/../src/engine/ControlSocket.cpp:551 -#: ../../locales/../src/engine/ControlSocket.cpp:597 +#: ../../locales/../src/engine/ControlSocket.cpp:452 +#: ../../locales/../src/engine/ControlSocket.cpp:508 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4258,122 +4584,115 @@ "비정상적인 문자열이 수신되어 UTF-8을 해제합니다. UTF-8 강제 사용은 사이트 관" "리자에서 선택하십시오." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:872 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "데이터 크기 이상" -#: ../../locales/../src/interface/netconfwizard.cpp:353 -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../../locales/../src/interface/netconfwizard.cpp:375 +#: ../../locales/../src/interface/netconfwizard.cpp:384 +#: ../../locales/../src/interface/netconfwizard.cpp:392 +#: ../../locales/../src/interface/netconfwizard.cpp:409 msgid "Invalid data received" msgstr "데이터 수신 이상" -#: ../../locales/../src/interface/verifycertdialog.cpp:33 -#: ../../locales/../src/interface/verifycertdialog.cpp:49 +#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:55 msgid "Invalid date" msgstr "날짜 이상" #: ../../locales/../src/interface/file_utils.cpp:290 #: ../../locales/../src/interface/file_utils.cpp:315 -#: ../../locales/../src/interface/RemoteListView.cpp:2919 msgid "Invalid filename" msgstr "파일명 이상" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:163 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "호스트 지정 이상. 닫는 괄호 후에는 콜론 및 포트만 올 수 있습니다." -#: ../../locales/../src/interface/loginmanager.cpp:104 +#: ../../locales/../src/interface/loginmanager.cpp:103 msgid "Invalid input" msgstr "입력 이상" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:64 +#: ../../locales/../src/engine/server.cpp:181 +#: ../../locales/../src/engine/server.cpp:191 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "지정 포트 이상. 포트 번호는 1 ~ 65535 사이 값이어야 합니다." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:125 +#: ../../locales/../src/engine/server.cpp:92 +#: ../../locales/../src/interface/quickconnectbar.cpp:120 msgid "" "Invalid protocol specified. Valid protocols are:\n" -"ftp:// for normal FTP,\n" +"ftp:// for normal FTP with optional encryption,\n" "sftp:// for SSH file transfer protocol,\n" "ftps:// for FTP over TLS (implicit) and\n" "ftpes:// for FTP over TLS (explicit)." msgstr "" -"지정한 프로토콜 이상. 유효한 프로토콜:\n" -"ftp:// 일반 FTP,\n" +"프로토콜 지정 오류. 유효한 프로토콜:\n" +"ftp:// 암호화 선택 가능한 일반 FTP,\n" "sftp:// SSH 파일 전송 프로토콜,\n" -"ftps:// 묵시적 SSL을 통한 FTP\n" -"ftpes:// 명시적 SSL을 통한 FTP." +"ftps:// 묵시적 TLS를 통한 FTP\n" +"ftpes:// 명시적 TLS를 통한 FTP." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4434 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4223 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" -"부족합한 프록시 호스트. 닫는 괄호 뒤에는 콜론 및 포트만 올 수 있습니다." +"부적합한 프록시 호스트. 닫는 괄호 뒤에는 콜론 및 포트만 올 수 있습니다." -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:680 msgid "Invalid regular expression in search conditions." msgstr "검색 조건 정규식 이상" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "응답 코드 이상" -#: ../../locales/../src/interface/search.cpp:385 +#: ../../locales/../src/interface/search.cpp:675 #, c-format msgid "Invalid search conditions: %s" msgstr "검색 조건 이상: %s" -#: ../../locales/../src/interface/sitemanager.cpp:425 -#: ../../locales/../src/interface/sitemanager.cpp:445 -#: ../../locales/../src/interface/sitemanager.cpp:462 -#: ../../locales/../src/interface/sitemanager.cpp:469 -#: ../../locales/../src/interface/sitemanager.cpp:476 -#: ../../locales/../src/interface/sitemanager.cpp:494 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:745 -#: ../../locales/../src/interface/sitemanager.cpp:752 -#: ../../locales/../src/interface/sitemanager.cpp:829 -#: ../../locales/../src/interface/sitemanager.cpp:835 +#: ../../locales/../src/interface/sitemanager.cpp:682 +#: ../../locales/../src/interface/sitemanager.cpp:688 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:765 msgid "Invalid site path" msgstr "사이트 경로 이상" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:726 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 msgid "Invalid size in condition" msgstr "조건 크기 이상" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/engine/server.cpp:133 msgid "Invalid username given." msgstr "잘못된 사용자명 지정." -#: ../../locales/../src/engine/socket.cpp:1239 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Invalid value for ai_flags" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1241 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Invalid value for hints" msgstr "힌트 값 이상" -#: ../../locales/../src/interface/verifycertdialog.cpp:193 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "관할 국가:" -#: ../../locales/../src/interface/verifycertdialog.cpp:195 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "관할 지역:" -#: ../../locales/../src/interface/verifycertdialog.cpp:194 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "관할 주 또는 도" -#: resources.h:881 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 msgid "Keep directories on top" msgstr "디렉터리를 상위에 유지" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4383,123 +4702,139 @@ "가져올 수 있습니다. FileZilla는 서버가 이 기능을 지원하는지 몇 가지 확인을 하" "지만 확인이 틀릴 수 있습니다." -#: resources.h:275 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Key exchange" msgstr "키 교환" -#: resources.h:21 resources.h:50 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 msgid "Key exchange:" msgstr "키 교환:" -#: resources.h:556 +#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/engine/server.cpp:902 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1316 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1317 +msgid "Key file" +msgstr "키 파일" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "가장 낮음(&O)" -#: resources.h:903 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "언어" -#: ../../locales/../src/interface/Mainfrm.cpp:1537 +#: ../../locales/../src/interface/Mainfrm.cpp:1426 msgid "Language changed" msgstr "언어 변경됨" #: ../../locales/../src/interface/LocalListView.cpp:282 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:154 msgid "Last modified" msgstr "최종 수정" -#: resources.h:822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 msgid "Layout" msgstr "레이아웃" -#: resources.h:768 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 msgid "Limit for concurrent &downloads:" msgstr "동시 다운로드 수 제한(&D):" -#: resources.h:770 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 msgid "Limit for concurrent &uploads:" msgstr "동시 업로드 수 제한(&U):" -#: resources.h:712 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 msgid "Limit local ports" msgstr "로컬 포트 제한" -#: resources.h:937 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 msgid "Limit size of logfile" msgstr "로그 파일 크기 제한" -#: resources.h:938 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 msgid "Limit:" msgstr "제한:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:825 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "라인 길이 초과됨" -#: resources.h:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 msgid "Linked against" msgstr "링크된 대상" -#: ../../locales/../src/interface/netconfwizard.cpp:267 +#: ../../locales/../src/interface/netconfwizard.cpp:276 +#: ../../locales/../src/interface/netconfwizard.cpp:282 msgid "Listen socket closed" msgstr "대기 소켓이 닫힘" -#: ../../locales/../src/engine/logging.cpp:130 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:357 +#: ../../locales/../src/engine/logging.cpp:118 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:362 msgid "Listing:" msgstr "목록:" -#: resources.h:715 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 msgid "Lo&west available port:" msgstr "가장 낮은 가능 포트(&W):" -#: ../../locales/../src/interface/edithandler.cpp:1160 -#: ../../locales/../src/interface/edithandler.cpp:1414 +#: ../../locales/../src/interface/edithandler.cpp:1133 +#: ../../locales/../src/interface/edithandler.cpp:1369 msgid "Local" msgstr "로컬" -#: ../../locales/../src/engine/socket.cpp:1204 +#: ../../locales/../src/engine/socket.cpp:1023 msgid "Local address in use" msgstr "사용 중인 로컬 주소" -#: ../../locales/../src/engine/socket.cpp:1232 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Local endpoint has been closed" msgstr "" -#: resources.h:302 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 msgid "Local file" msgstr "로컬 파일" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "로컬 파일이 존재하지 않습니다." -#: ../../locales/../src/interface/updater.cpp:368 -#: ../../locales/../src/interface/updater.cpp:445 +#: ../../locales/../src/interface/updater.cpp:403 +#: ../../locales/../src/interface/updater.cpp:496 #, c-format msgid "Local file is %s\n" msgstr "로컬 파일은 %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:309 msgid "Local file is a directory instead of a regular file." msgstr "로컬 파일은 일반 파일이 아니라 디렉터리입니다." -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "로컬 파일의 이름이 정상적이지 않습니다." -#: resources.h:165 +#: ../../locales/../src/interface/search.cpp:644 +msgid "Local file search" +msgstr "로컬 파일 검색" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "로컬 필터:" -#: ../../locales/../src/interface/viewheader.cpp:363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3266 +msgid "Local path handling:" +msgstr "로컬 경로 처리:" + +#: ../../locales/../src/interface/viewheader.cpp:335 msgid "Local site:" msgstr "로컬 사이트:" -#: ../../locales/../src/interface/verifycertdialog.cpp:187 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "지역:" @@ -4507,28 +4842,32 @@ msgid "Log file" msgstr "로그 파일" -#: resources.h:932 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:905 +msgid "Logged in" +msgstr "로그인" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "로깅" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:830 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:800 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." msgstr "" -"로그인 데이터는 비 아스키 문자를 포함합니다. 서버는 UTF-8을 인식하지 못 할 " -"수 있습니다.프록시를 사용하면 로컬 문자셋을 설정할 수 없습니다." +"로그인 데이터에 비 아스키 문자가 포함돼 있어서 서버가 UTF-8을 인식하지 못 할 " +"수 있습니다. 프록시를 사용하면 로컬 문자셋을 설정할 수 없습니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:807 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." msgstr "" -"로그인 데이터는 비 아스키 문자를 포함합니다. 서버을 UTF-8을 인식하지 못 할 " -"수 있습니다.로컬 문자셋으로 시도해 보십시오." +"로그인 데이터에 비 아스키 문자가 포함돼 있어서 서버가 UTF-8을 인식하지 못 할 " +"수 있습니다. 로컬 문자셋으로 시도합니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:866 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:834 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "로그인 절차가 완전히 실행되지 못했습니다. 중단합니다." @@ -4545,116 +4884,121 @@ "로그온 형식은 FTP URL과 함께 사용해야 합니다. 인자가 '%s' 또는 '%s' 중 하나여" "야 합니다." -#: ../../locales/../src/interface/queue.cpp:916 -#: ../../locales/../src/interface/queue.cpp:1003 +#: ../../locales/../src/interface/queue.cpp:878 +#: ../../locales/../src/interface/queue.cpp:934 msgid "Low" msgstr "낮음" -#: ../../locales/../src/interface/queue.cpp:914 -#: ../../locales/../src/interface/queue.cpp:1001 +#: ../../locales/../src/interface/queue.cpp:876 +#: ../../locales/../src/interface/queue.cpp:932 msgid "Lowest" msgstr "가장 낮음" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "사용 가능한 가장 작은 포트 번호는 1024 ~ 65535입니다." -#: resources.h:25 resources.h:54 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:67 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "" + +#: ../../locales/../src/interface/xmlfunctions.cpp:44 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:813 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:825 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:872 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 #, c-format msgid "Malformed chunk data: %s" msgstr "일단의 데이터 구성 오류: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:758 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "헤더 이상: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:578 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 msgid "Malformed reply, server not sending proper line endings" msgstr "응답 이상, 서버가 정상적인 줄 종료를 송신하지 않음" -#: resources.h:332 ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:316 -#: ../../locales/../src/interface/manual_transfer.cpp:323 -#: ../../locales/../src/interface/manual_transfer.cpp:328 -#: ../../locales/../src/interface/manual_transfer.cpp:336 -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 +#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:332 #: ../../locales/../src/interface/manual_transfer.cpp:350 -#: ../../locales/../src/interface/manual_transfer.cpp:369 msgid "Manual transfer" msgstr "수동 전송" -#: resources.h:372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3057 msgid "Match all of the following" msgstr "아래와 모두 일치" -#: resources.h:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3058 msgid "Match any of the following" msgstr "아래와 하나라도 일치" -#: resources.h:374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3059 msgid "Match none of the following" msgstr "아래와 하나도 일치 안함" -#: resources.h:766 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "최대 동시 전송 수(&T):" -#: ../../locales/../src/engine/socket.cpp:1245 +#: ../../locales/../src/engine/socket.cpp:1065 msgid "Memory allocation failure" msgstr "메모리 할당 실패" -#: ../../locales/../src/interface/Mainfrm.cpp:359 -#: ../../locales/../src/interface/Mainfrm.cpp:1891 +#: ../../locales/../src/interface/Mainfrm.cpp:382 +#: ../../locales/../src/interface/Mainfrm.cpp:1740 msgid "Message log" msgstr "메시지 로그" -#: resources.h:833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 msgid "Message log position" msgstr "메시지 로그 위치" -#: ../../locales/../src/engine/socket.cpp:1229 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Message too large" msgstr "메시지가 너무 큼" -#: resources.h:939 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 msgid "MiB" msgstr "MB" -#: resources.h:980 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:445 msgid "Minutes" msgstr "분" -#: resources.h:296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 msgid "Move &down" msgstr "아래로(&D)" -#: resources.h:295 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 msgid "Move &up" msgstr "위로(&U)" -#: ../../locales/../src/interface/LocalTreeView.cpp:1035 +#: ../../locales/../src/interface/LocalTreeView.cpp:985 msgid "My Computer" msgstr "내 컴퓨터" -#: ../../locales/../src/interface/LocalTreeView.cpp:1025 +#: ../../locales/../src/interface/LocalTreeView.cpp:975 msgid "My Documents" msgstr "내 문서" -#: ../../locales/../src/interface/sitemanager.cpp:281 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:719 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:721 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:726 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:728 msgid "My Sites" msgstr "내 사이트" @@ -4663,92 +5007,98 @@ msgid "N/a" msgstr "(없음)" -#: resources.h:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" msgstr "이름:" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:681 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1202 msgid "Name already exists" msgstr "이름이 이미 존재함" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 -#: ../../locales/../src/interface/sitemanager.cpp:769 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager.cpp:700 msgid "Name of bookmark already exists." msgstr "북마크 이름이 이미 존재함" -#: resources.h:84 resources.h:130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 msgid "Name:" msgstr "이름:" -#: resources.h:888 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 msgid "Natural sort" msgstr "" -#: ../../locales/../src/interface/filteredit.cpp:349 +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" msgstr "필터 이름 입력 필요" -#: ../../locales/../src/interface/search.cpp:375 +#: ../../locales/../src/interface/search.cpp:644 +msgid "Need to enter valid local path" +msgstr "적합한 로컬 경로 입력 필요" + +#: ../../locales/../src/interface/search.cpp:665 msgid "Need to enter valid remote path" msgstr "적합한 원격 경로 입력 필요" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1006 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Need to specify a character encoding" msgstr "문자 인코딩 지정 필요" -#: ../../locales/../src/engine/socket.cpp:1249 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Neither nodename nor servname provided, or not known" -msgstr "" +msgstr "노드명이나 서버명이 지정되지 않았거나 알 수 없음" -#: ../../locales/../src/engine/socket.cpp:1236 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "" "Network host does not have any network addresses in the requested address " "family" -msgstr "" +msgstr "네트웍 호스트가 요청 주소군에서는 네트웍 주소가 없음" -#: ../../locales/../src/engine/proxy.cpp:539 -#: ../../locales/../src/engine/socket.cpp:1221 +#: ../../locales/../src/engine/proxy.cpp:514 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Network unreachable" -msgstr "모두 읽기 가능" +msgstr "네트웍에 도달할 수 없음" -#: resources.h:921 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "Never" -msgstr "" +msgstr "안 함" -#: resources.h:956 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 msgid "New &Folder" msgstr "새 폴더(&F)" -#: resources.h:443 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" msgstr "새 탭(&t)" -#: resources.h:352 resources.h:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "새 북마크(&M)" -#: resources.h:333 ../../locales/../src/interface/bookmarks_dialog.cpp:55 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:76 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:83 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 #: ../../locales/../src/interface/bookmarks_dialog.cpp:93 #: ../../locales/../src/interface/bookmarks_dialog.cpp:99 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:108 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:453 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:106 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:433 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:526 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:531 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:537 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:580 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 -#: ../../locales/../src/interface/sitemanager.cpp:769 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2131 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager.cpp:700 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2210 msgid "New bookmark" msgstr "새 북마크" -#: ../../locales/../src/interface/LocalTreeView.cpp:1184 -#: ../../locales/../src/interface/RemoteListView.cpp:1373 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1336 +#: ../../locales/../src/interface/LocalTreeView.cpp:1152 +#: ../../locales/../src/interface/RemoteListView.cpp:1316 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1248 msgid "New directory" msgstr "새 디렉터리" @@ -4761,41 +5111,41 @@ msgid "New filter" msgstr "새 필터" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:915 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:924 msgid "New folder" msgstr "새 폴더" -#: ../../locales/../src/interface/sitemanager.cpp:637 -#: ../../locales/../src/interface/sitemanager.cpp:651 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2107 +#: ../../locales/../src/interface/sitemanager.cpp:592 +#: ../../locales/../src/interface/sitemanager.cpp:604 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 msgid "New site" msgstr "새 사이트" -#: resources.h:831 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 msgid "Next to the transfer queue" msgstr "전송 대기열 옆" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:881 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:838 msgid "No" msgstr "아니요" -#: ../../locales/../src/engine/socket.cpp:1247 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "No address associated with nodename" msgstr "노드명에 연동된 주소 없음" -#: ../../locales/../src/interface/export.cpp:25 +#: ../../locales/../src/interface/export.cpp:26 msgid "No category to export selected" msgstr "내보낼 항목이 선택되지 않았음" -#: ../../locales/../src/interface/QueueView.cpp:2275 +#: ../../locales/../src/interface/QueueView.cpp:1748 msgid "No command given, aborting." msgstr "명령어가 없어서 중단." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3945 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3753 msgid "No external IP address set, trying default." msgstr "외부 IP 주소가 설정되지 않아 기본값으로 시도." -#: ../../locales/../src/interface/edithandler.cpp:1101 +#: ../../locales/../src/interface/edithandler.cpp:1074 msgid "No files are currently being edited." msgstr "현재 편집 중인 파일이 없습니다." @@ -4803,9 +5153,9 @@ msgid "No filter name given" msgstr "필터에 이름이 없음" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:78 +#: ../../locales/../src/engine/server.cpp:175 +#: ../../locales/../src/engine/server.cpp:200 msgid "No host given, please enter a host." msgstr "호스트가 없습니다. 호스트를 입력하십시오." @@ -4813,109 +5163,106 @@ msgid "No images available" msgstr "이미지 없음" -#: ../../locales/../src/interface/QueueView.cpp:3156 -msgid "No more files in the queue!" -msgstr "대기열에 남은 파일 없음!" - -#: ../../locales/../src/interface/filter.cpp:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "No name for the filterset given." msgstr "필터셋에 이름이 없음." -#: resources.h:368 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "파일 유형에 연결된 프로그램이 없음" -#: resources.h:358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "확장명이 '%s'인 파일을 편집할 연동 프로그램이 없습니다." -#: ../../locales/../src/engine/socket.cpp:1224 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "No route to host" -msgstr "" +msgstr "호스트로의 경로 없음" -#: ../../locales/../src/interface/search.cpp:234 +#: ../../locales/../src/interface/search.cpp:391 msgid "No search results" msgstr "검색 결과 없음" -#: ../../locales/../src/interface/sitemanager.cpp:247 -#: ../../locales/../src/interface/sitemanager.cpp:259 -#: ../../locales/../src/interface/sitemanager.cpp:290 +#: ../../locales/../src/interface/sitemanager.cpp:347 msgid "No sites available" msgstr "가능한 사이트 없음" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:485 msgid "No supported SOCKS5 auth method" msgstr "지원되지 않는 SOCKS5 인증 방법임" -#: ../../locales/../src/interface/loginmanager.cpp:104 +#: ../../locales/../src/interface/loginmanager.cpp:103 msgid "No username given." msgstr "사용자명 없음." -#: resources.h:897 resources.h:902 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "없음" -#: resources.h:312 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 msgid "None selected yet" msgstr "아직 선택 안됨" -#: ../../locales/../src/engine/socket.cpp:1243 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Nonrecoverable failure in name resolution" -msgstr "" +msgstr "이름 해석 실패" -#: resources.h:779 ../../locales/../src/engine/server.cpp:831 -#: ../../locales/../src/engine/server.cpp:850 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:185 -#: ../../locales/../src/interface/manual_transfer.cpp:568 -#: ../../locales/../src/interface/queue.cpp:919 -#: ../../locales/../src/interface/queue.cpp:1006 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 +#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/engine/server.cpp:898 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1314 msgid "Normal" msgstr "일반" -#: ../../locales/../src/interface/queueview_failed.cpp:326 -#: ../../locales/../src/interface/queueview_failed.cpp:351 -msgid "Not all items could be requeued for viewing/editing." -msgstr "모든 항목을 보기/편집으로 다시 대기시킬 수는 없습니다." +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 +msgid "Not all items could be requeued for transfer." +msgstr "모든 항목을 전송하도록 대기열에 다시 넣지 못함." -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:516 +#: ../../locales/../src/interface/state.cpp:178 +#: ../../locales/../src/interface/state.cpp:1182 msgid "Not connected" msgstr "연결되지 않았음" -#: ../../locales/../src/interface/RemoteListView.cpp:2113 +#: ../../locales/../src/interface/RemoteListView.cpp:2023 msgid "Not connected to any server" msgstr "서버에 연결되지 않았음" -#: ../../locales/../src/interface/Mainfrm.cpp:539 +#: ../../locales/../src/interface/Mainfrm.cpp:557 msgid "Not connected to any server." msgstr "서버에 연결되지 않았음." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "연결되지 않았음." -#: ../../locales/../src/engine/socket.cpp:1264 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Not initialized, need to call WSAStartup" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:643 msgid "Note that this feature is only supported using the FTP protocol." msgstr "이 기능은 FTP 프로토콜 사용 시에만 지원됩니다." -#: resources.h:746 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "비고: 이 기능은 일반 비 암호화된 FTP 연결에서만 동작합니다." -#: resources.h:764 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "비고: 일반 프록시를 사용하면 FTP가 무조건 수동형 모드로 연결됩니다." -#: resources.h:870 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 msgid "Number of decimal places:" msgstr "소숫점 미만 자리 수:" @@ -4923,21 +5270,45 @@ msgid "Number of retries has to be between 0 and 99." msgstr "재시도 회수는 0 ~ 99입니다." -#: resources.h:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 msgid "O&pen file" msgstr "파일 열기(&P)" -#: resources.h:29 resources.h:56 resources.h:78 resources.h:113 -#: resources.h:135 resources.h:145 resources.h:158 resources.h:173 -#: resources.h:190 resources.h:217 resources.h:226 resources.h:233 -#: resources.h:241 resources.h:264 resources.h:272 resources.h:291 -#: resources.h:297 resources.h:330 resources.h:344 resources.h:366 -#: resources.h:389 resources.h:398 resources.h:412 resources.h:426 -#: resources.h:433 resources.h:437 resources.h:689 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3801 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "확인" -#: resources.h:645 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +msgid "OS version:" +msgstr "OS 버전:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " "well as the fallback mode if enabled." @@ -4945,225 +5316,246 @@ "이후의 페이지에서는 선택하신 전송 모드를 구성하게 되는데 자동 전환 모드를 설" "정한 경우에는 다른 모드도 구성하게 됩니다." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:848 msgid "Once" msgstr "한번만" -#: resources.h:922 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 msgid "Once a day" -msgstr "" +msgstr "하루 한 번" -#: resources.h:923 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 msgid "Once a week" -msgstr "" +msgstr "주당 한 번" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:511 +msgid "Only use plain FTP (insecure)" +msgstr "평문 FTP만 사용(보안 취약)" -#: resources.h:612 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Open directory in system's file manager" msgstr "디렉터리를 시스템의 파일 관리자로 열기" -#: resources.h:999 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 msgid "Open the Site Manager" msgstr "사이트 관리자 열기" -#: resources.h:1000 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 msgid "Open the Site Manager." msgstr "사이트 관리자 열기" -#: resources.h:1001 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "사이트 관리자를 엽니다. 사이트 목록은 오른쪽 클릭하세요." -#: resources.h:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 msgid "Open the file." msgstr "파일을 엽니다." -#: resources.h:456 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 msgid "Open the settings dialog of FileZilla" msgstr "FileZilla 설정 창 열기" -#: resources.h:247 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 msgid "Opened as:" msgstr "다음으로 열림:" -#: ../../locales/../src/interface/LocalListView.cpp:1719 -#: ../../locales/../src/interface/LocalListView.cpp:1764 -#: ../../locales/../src/interface/LocalListView.cpp:1849 -#: ../../locales/../src/interface/LocalListView.cpp:1862 -#: ../../locales/../src/interface/RemoteListView.cpp:2413 +#: ../../locales/../src/interface/edithandler.cpp:1617 +#: ../../locales/../src/interface/edithandler.cpp:1734 +#: ../../locales/../src/interface/LocalListView.cpp:1727 +#: ../../locales/../src/interface/LocalListView.cpp:1739 msgid "Opening failed" msgstr "열기 실패" -#: resources.h:444 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 msgid "Opens a new tab" msgstr "새 탭 열기" -#: resources.h:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 msgid "Opens the Site Manager" msgstr "사이트 관리자 열기" -#: resources.h:1021 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "디렉터리 목록 필터 대화 창을 엽니다. 오른쪽 클릭하면 필터 여부를 전환합니다." -#: resources.h:133 -msgid "Operating system" -msgstr "운영체제" - -#: ../../locales/../src/interface/FileZilla.cpp:319 -msgid "Operating system problem detected" -msgstr "운영체제 문제를 발견했습니다." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +msgid "Operating System:" +msgstr "운영체제:" -#: ../../locales/../src/engine/socket.cpp:1215 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "Operation already in progress" -msgstr "" +msgstr "이미 작업이 진행 중임" -#: ../../locales/../src/engine/socket.cpp:1206 +#: ../../locales/../src/engine/socket.cpp:1025 msgid "Operation in progress" msgstr "작업 진행 중" -#: ../../locales/../src/engine/socket.cpp:1227 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Operation not supported" msgstr "지원되지 않는 작업임" -#: ../../locales/../src/interface/verifycertdialog.cpp:181 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "" + +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "기관:" -#: ../../locales/../src/engine/socket.cpp:1259 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +msgid "Other SFTP options" +msgstr "기타 SFTP 옵션" + +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Other system error" -msgstr "" +msgstr "기타 시스템 오류" -#: ../../locales/../src/interface/verifycertdialog.cpp:203 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "기타:" -#: ../../locales/../src/engine/socket.cpp:1210 -#: ../../locales/../src/engine/socket.cpp:1211 +#: ../../locales/../src/engine/socket.cpp:1029 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Out of memory" -msgstr "" +msgstr "메모리 부족" -#: resources.h:691 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 msgid "Overview" msgstr "개요" -#: resources.h:69 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite &if source newer" msgstr "새 파일이면 덮어쓰기(&I)" -#: resources.h:198 resources.h:208 resources.h:802 resources.h:811 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "파일 덮어쓰기" -#: resources.h:200 resources.h:210 resources.h:804 resources.h:813 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "파일 크기가 다르면 덮어쓰기" -#: resources.h:201 resources.h:211 resources.h:805 resources.h:814 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "파일 크기가 다르거나 원본 파일이 더 최신이면 덮어쓰기" -#: resources.h:199 resources.h:209 resources.h:803 resources.h:812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" msgstr "원본 파일이 더 최신이면 덮어쓰기" -#: resources.h:70 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 msgid "Overwrite if &different size" msgstr "크기가 다르면 덮어쓰기(&d)" -#: resources.h:71 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 msgid "Overwrite if different si&ze or source newer" msgstr "크기가 다르거나 원본이 더 최신이면 덮어쓰기(&z)" -#: ../../locales/../src/interface/updater.cpp:245 +#: ../../locales/../src/interface/updater.cpp:246 #, c-format msgid "Own build type: %s\n" -msgstr "" +msgstr "자체 빌드 유형: %s\n" -#: resources.h:95 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 msgid "Owner permissions" msgstr "소유자 권한" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:156 msgid "Owner/Group" msgstr "소유자/그룹" -#: resources.h:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "전송 및 기타 작업 도중 시스템이 대기 상태로 바뀌지 않게 하기" -#: resources.h:743 resources.h:760 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 msgid "P&roxy host:" msgstr "프록시 호스트(&R):" -#: ../../locales/../src/interface/netconfwizard.cpp:488 +#: ../../locales/../src/interface/netconfwizard.cpp:509 msgid "PORT command tainted by router or firewall." msgstr "PORT 명령어가 라우터에 의해 손상되었습니다." -#: resources.h:705 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 msgid "Pa&ssive (recommended)" msgstr "수동형(&S) (권장)" -#: ../../locales/../src/interface/Mainfrm.cpp:2517 +#: ../../locales/../src/interface/Mainfrm.cpp:2350 msgid "Parameter not a valid URL" msgstr "인수가 유효하지 않은 URL" -#: ../../locales/../src/interface/updater.cpp:527 +#: ../../locales/../src/interface/updater.cpp:576 #, c-format msgid "Parsing %d bytes of version information.\n" -msgstr "" +msgstr "버전 정보 %d 바이트 파싱.\n" -#: resources.h:321 resources.h:683 resources.h:968 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 msgid "Pass&word:" msgstr "비밀번호(&W):" -#: resources.h:641 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" msgstr "수동형 (권장)" -#: resources.h:725 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "수동형 모드" -#: ../../locales/../src/interface/netconfwizard.cpp:588 -#: ../../locales/../src/interface/netconfwizard.cpp:601 #: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:636 msgid "Passive mode has been set as default transfer mode." msgstr "수동형 모드가 기본 전송 모드로 설정되었습니다." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "비밀번호 요구됨" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:80 +#: ../../locales/../src/interface/search.cpp:151 msgid "Path" msgstr "경로" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3232 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2354 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2248 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "%s 디렉터리와 %s 하위디렉터리로 경로를 구성할 수 없습니다" -#: ../../locales/../src/interface/Mainfrm.cpp:2470 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 msgid "Path not found:" msgstr "경로를 찾을 수 없음:" -#: resources.h:339 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 msgid "Paths" msgstr "경로" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1282 -#: ../../locales/../src/interface/edithandler.cpp:1381 -#: ../../locales/../src/interface/edithandler.cpp:1394 +#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1249 +#: ../../locales/../src/interface/edithandler.cpp:1339 +#: ../../locales/../src/interface/edithandler.cpp:1349 msgid "Pending removal" msgstr "삭제 보류" @@ -5171,21 +5563,21 @@ msgid "Permission" msgstr "권한" -#: ../../locales/../src/engine/socket.cpp:1203 -#: ../../locales/../src/engine/socket.cpp:1212 +#: ../../locales/../src/engine/socket.cpp:1022 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Permission denied" msgstr "권한 거부" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:155 msgid "Permissions" msgstr "권한" -#: resources.h:132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 msgid "Platform:" msgstr "플랫폼:" -#: ../../locales/../src/interface/netconfwizard.cpp:553 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5193,7 +5585,7 @@ "서버가 동작 중이고 설정이 올바른지 https://filezilla-project.org/probe.php에" "서 확인하세요." -#: resources.h:647 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." @@ -5201,30 +5593,30 @@ "FileZilla가 임의의 포트로 외부 연결을 할 수 있도록 방화벽과 라우터를 설정하십" "시오." -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:647 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "라우터의 'DMZ mode' 혹은 'Game mode' 설정을 해제하여 주십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." msgstr "인터넷 연결이 안정적인지 점검하고 설정 값들을 다시 잘 확인하십시오." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 msgid "Please enter a custom date format." msgstr "사용자 날짜 형식을 입력하십시오." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 msgid "Please enter a custom time format." msgstr "사용자 시간 형식을 입력하십시오." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:742 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:714 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "예를 들어 2010-07-18과 같이 YYYY-MM-DD 형식으로 날짜를 입력해주십시오." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:119 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." @@ -5238,7 +5630,7 @@ msgid "Please enter a new name for the copied filter." msgstr "복사된 필터의 새 이름을 입력하십시오." -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:390 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "\"%s\" 필터의 새 이름을 입력하십시오" @@ -5247,67 +5639,57 @@ msgid "Please enter a new name for the filter." msgstr "필터의 새 이름을 입력하십시오." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 msgid "" "Please enter a number between 0 and 10 for the number of concurrent " "downloads." msgstr "0에서 10 사이의 동시 다운로드 수를 입력하십시오." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:113 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 msgid "" "Please enter a number between 0 and 10 for the number of concurrent uploads." msgstr "0에서 10 사이의 동시 업로드 수를 입력하십시오." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:103 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 msgid "" "Please enter a number between 1 and 10 for the number of concurrent " "transfers." msgstr "0에서 10 사이의 동시 전송 수를 입력하십시오." -#: resources.h:81 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 msgid "Please enter a password for this server:" msgstr "이 서버의 암호를 입력하십시오:" -#: ../../locales/../src/interface/QueueView.cpp:2264 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"실행하려면 경로와 실행 파일을 입력하십시오.\n" -"예. c:\\somePath\\file.exe (MS Windows) 또는 /somePath/file (Unix).\n" -"선택적으로 프로그램 인수도 지정할 수 있습니다." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" -"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts." +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -"시간 초과 설정은 5 ~ 9999초 사이의 값을 입력하십시오. 0은 시간 초과 기능을 사" -"용하지 않습니다." +"시간 초과 값은 10 ~ 9999초 사이로 입력해주세요. 0은 시간 초과 기능을 사용하" +"지 않습니다." -#: ../../locales/../src/interface/filter.cpp:343 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "이 필터의 이름을 입력하십시오" -#: resources.h:82 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 msgid "Please enter a username for this server:" msgstr "이 서버의 사용자명을 입력하십시오:" -#: ../../locales/../src/interface/netconfwizard.cpp:182 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "올바른 포트 범위를 입력하십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:161 +#: ../../locales/../src/interface/netconfwizard.cpp:168 msgid "Please enter an URL where to get your external address from" msgstr "사용자의 외부 주소를 가져올 URL을 입력하십시오." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:126 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "업로드 속도 제한 값을 0 %s/s 이상으로 입력해주세요." -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:568 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5315,27 +5697,40 @@ "FTP 명령을 직접 입력하십시오.\n" "FTP 명령을 직접 사용하면 디렉터리 캐시는 제거됩니다." -#: ../../locales/../src/interface/LocalListView.cpp:925 -#: ../../locales/../src/interface/LocalTreeView.cpp:1181 -#: ../../locales/../src/interface/RemoteListView.cpp:1359 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1322 +#: ../../locales/../src/interface/QueueView.cpp:1742 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"프로그램의 전체 경로와 인자들을 입력하십시오. 대기열 처리가 끝나면 이 명령이 " +"실행됩니다.\n" +"예. c:\\somePath\\file.exe (MS Windows) 또는 /somePath/file (Unix).\n" +"명령 인자에 공백이 들어가는 경우 적절히 따옴표를 붙여야 할 수 있습니다." + +#: ../../locales/../src/interface/LocalListView.cpp:923 +#: ../../locales/../src/interface/LocalTreeView.cpp:1149 +#: ../../locales/../src/interface/RemoteListView.cpp:1303 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Please enter the name of the directory which should be created:" msgstr "생성할 디렉터리 명을 입력하세요." -#: ../../locales/../src/interface/RemoteListView.cpp:2894 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "생성할 파일 명을 입력하세요." -#: resources.h:83 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 msgid "Please enter username and password for this server:" msgstr "이 서버의 사용자명과 암호를 입력하십시오:" -#: ../../locales/../src/interface/netconfwizard.cpp:142 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "사용자의 외부 IP 주소를 입력하십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:593 -#: ../../locales/../src/interface/netconfwizard.cpp:606 +#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5345,14 +5740,14 @@ "가 유동 IP 주소를 사용하거나 외부 주소를 모르는 경우 외부 해석 설정을 사용하" "십시오." -#: resources.h:634 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." msgstr "" "구성이 잘못되면 FTP 연결이 되지 않으므로 설명 내용을 잘 따르시기 바랍니다." -#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:641 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5360,11 +5755,11 @@ "FileZilla가 외부 연결에 허가되어 있는지 그리고, 입력된 주소가 유효한지 확인하" "십시오." -#: ../../locales/../src/interface/FileZilla.cpp:214 +#: ../../locales/../src/interface/FileZilla.cpp:134 msgid "Please make sure the requested locale is installed on your system." msgstr "요청된 언어가 시스템에 설치되어 있는지 확인하십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:594 +#: ../../locales/../src/interface/netconfwizard.cpp:618 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5375,7 +5770,7 @@ "가 제대로 설정되어 있는지도 확인하십시오. 사용자가 직접 포트 포워딩을 설정해" "야 합니다. 라우터의 'DMZ mode' 혹은 'Game mode' 기능은 사용하지 마십시오." -#: resources.h:648 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 msgid "" "Please note that FileZilla has no influence on the port the server chooses. " "So the server might choose a port which your firewall thinks is only used by " @@ -5387,7 +5782,7 @@ "성웨어에서 사용하는 것으로 여길 수도 있습니다. 이 경우 잘못된 경고가 나타나기" "도 하는데 사용자는 이를 무시하면 됩니다." -#: ../../locales/../src/interface/Mainfrm.cpp:698 +#: ../../locales/../src/interface/Mainfrm.cpp:683 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5395,7 +5790,7 @@ "FTP 및 FTPS, FTPES로 업로드할 때 파일 시간을 보존하는 것은 서버가 MFMT 명령어" "를 지원할 때만 작동하는 것이므로 주의하십시오." -#: resources.h:702 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5403,7 +5798,7 @@ "일부 서버는 너무 자주 재접속을 시도하거나 시간 간격이 너무 짧으면 접속이 거부" "될 수 있음에 유의하십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:594 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5412,42 +5807,42 @@ "사용자가 네트워크 환경을 바꾸거나 이전에 접속하던 서버에 갑자스런 문제가 나타" "나면, 이 마법사를 다시 실행하십시오." -#: resources.h:394 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 msgid "Please select an action:" msgstr "동작을 선택해주세요." -#: resources.h:240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Please select the categories you would like to import." msgstr "가져올 구분 항목을 선택해주세요." -#: resources.h:636 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 msgid "Please select the default transfer mode you would like to use." msgstr "기본 전송 모드를 선택하십시오." -#: ../../locales/../src/interface/chmoddialog.cpp:51 +#: ../../locales/../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." msgstr "\"%s\" 디렉터리의 새로운 속성을 선택하십시오." -#: ../../locales/../src/interface/chmoddialog.cpp:40 +#: ../../locales/../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." msgstr "\"%s\" 파일의 새로운 속성을 선택하십시오." -#: ../../locales/../src/interface/chmoddialog.cpp:54 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "선택된 디렉터리의 새로운 속성을 선택하십시오." -#: ../../locales/../src/interface/chmoddialog.cpp:57 +#: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "선택된 파일과 디렉터리의 새로운 속성을 선택하십시오." -#: ../../locales/../src/interface/chmoddialog.cpp:43 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "선택된 파일의 새로운 속성을 선택하십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:581 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5460,21 +5855,29 @@ "야 합니다. 라우터의 'DMZ mode' 혹은 'Game mode' 기능은 사용하지 마십시오. 프" "로토콜 검사 또는 프로토콜 고정 등과 같은 기능은 해제되어야 합니다." -#: resources.h:829 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 msgid "Positio&n of the message log:" msgstr "메시지 로그의 위치(&n):" -#: ../../locales/../src/interface/verifycertdialog.cpp:188 -#: ../../locales/../src/interface/verifycertdialog.cpp:189 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Postal code:" msgstr "우편 번호:" -#: ../../locales/../src/interface/sitemanager.cpp:280 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1829 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +msgid "Pre&allocate space before downloading" +msgstr "다운로드하기 전에 미리 공간 할당하기(&a)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +msgid "Preallocation" +msgstr "선할당" + +#: ../../locales/../src/interface/sitemanager.cpp:337 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1922 msgid "Predefined Sites" msgstr "기 정의된 사이트" -#: ../../locales/../src/interface/Mainfrm.cpp:697 +#: ../../locales/../src/interface/Mainfrm.cpp:682 msgid "Preserving file timestamps" msgstr "파일 시간 보존" @@ -5482,27 +5885,27 @@ msgid "Preview:" msgstr "미리 보기:" -#: ../../locales/../src/engine/tlssocket.cpp:1109 +#: ../../locales/../src/engine/tlssocket.cpp:1191 msgid "Primary connection and data connection certificates don't match." msgstr "1차 연결과 데이터 연결의 인증서가 일치하지 않습니다." #: ../../locales/../src/interface/cmdline.cpp:19 msgid "Print diagnostic information related to startup of FileZilla" -msgstr "" +msgstr "FileZilla 시작 구동과 관련한 진단 정보 인쇄" #: ../../locales/../src/interface/cmdline.cpp:18 msgid "Print version information to stdout and exit" msgstr "버전 정보를 stdout에 출력하고 종료" -#: resources.h:880 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 msgid "Prioritize directories (default)" msgstr "디렉터리 우선 (기본값)" -#: ../../locales/../src/interface/queue.cpp:1222 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Priority" msgstr "우선 순위" -#: resources.h:930 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5510,147 +5913,163 @@ "개인 정보 처리 방침: 서버로 전송되는 정보는 사용자의 FileZilla 버전 및 운영체" "계 버전, CPU 아키텍처 뿐입니다." -#: resources.h:749 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 msgid "Private &keys:" -msgstr "개인 키((&K):" +msgstr "개인 키(&K):" -#: resources.h:964 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 msgid "Pro&tocol:" msgstr "프로토콜(&T):" -#: resources.h:745 resources.h:763 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 msgid "Pro&xy password:" msgstr "프록시 비밀번호(&X):" -#: resources.h:474 resources.h:547 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "대기열 처리(&Q)" -#: ../../locales/../src/engine/socket.cpp:1208 +#: ../../locales/../src/engine/socket.cpp:1027 msgid "Process file table overflow" -msgstr "" +msgstr "프로세스 파일 테이블 오버플로" -#: ../../locales/../src/engine/socket.cpp:1213 +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, c-format +msgid "Processed %s in %s." +msgstr "%s에 %s 처리됨." + +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Protocol not supported" msgstr "지원되지 않는 프로토콜임" -#: ../../locales/../src/engine/socket.cpp:1266 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Protocol not supported on given socket type" -msgstr "" +msgstr "지정한 소켓 유형에 지원되지 않는 프로토콜" -#: resources.h:19 resources.h:48 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "프로토콜:" -#: resources.h:761 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 msgid "Proxy &port:" msgstr "프록시 포트(&P):" -#: resources.h:744 resources.h:762 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 msgid "Proxy &user:" msgstr "프록시 사용자(&U):" -#: ../../locales/../src/engine/proxy.cpp:518 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Proxy authentication failed" msgstr "프록시 인증 실패" -#: ../../locales/../src/engine/transfersocket.cpp:132 -#: ../../locales/../src/engine/transfersocket.cpp:145 +#: ../../locales/../src/engine/transfersocket.cpp:105 +#: ../../locales/../src/engine/transfersocket.cpp:117 #, c-format msgid "Proxy handshake failed: %s" msgstr "프록시 핸드셰이크 실패: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4426 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4217 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "호스트가 '['로 시작하는데 닫는 괄호가 없습니다." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:353 #, c-format msgid "Proxy reply: %s" msgstr "프록시 응답: %s" -#: ../../locales/../src/engine/proxy.cpp:416 -#: ../../locales/../src/engine/proxy.cpp:561 +#: ../../locales/../src/engine/proxy.cpp:536 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "프록시 요청 실패: %s" + +#: ../../locales/../src/engine/proxy.cpp:408 #, c-format msgid "Proxy request failed: %s" msgstr "프록시 요청 실패: %s" -#: ../../locales/../src/engine/proxy.cpp:583 +#: ../../locales/../src/engine/proxy.cpp:560 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "프록시 요청 실패: CONNECT 응답의 주소 형식을 알 수 없음" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4459 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 msgid "Proxy set but proxy host or port invalid" msgstr "프록시 호스트 또는 포트가 유효하지 않음" -#: resources.h:747 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 msgid "Public Key Authentication" msgstr "공인 키 인증" -#: resources.h:8 resources.h:37 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 msgid "Public key algorithm:" msgstr "공인 키 앨거리듬:" -#: resources.h:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 msgid "Public permissions" msgstr "공개 권한" -#: ../../locales/../src/interface/QueueView.cpp:3236 +#: ../../locales/../src/interface/QueueView.cpp:2613 msgid "Queue has been fully processed" msgstr "대기열이 전부 처리되었음" -#: ../../locales/../src/interface/statusbar.cpp:426 +#: ../../locales/../src/interface/statusbar.cpp:429 #, c-format msgid "Queue: %s MiB" msgstr "대기열: %s MB" -#: ../../locales/../src/interface/statusbar.cpp:356 +#: ../../locales/../src/interface/statusbar.cpp:366 #, c-format msgid "Queue: %s%s" msgstr "대기열: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:352 -#: ../../locales/../src/interface/statusbar.cpp:417 +#: ../../locales/../src/interface/statusbar.cpp:362 +#: ../../locales/../src/interface/statusbar.cpp:420 msgid "Queue: empty" msgstr "대기열: 비었음" -#: ../../locales/../src/interface/QueueView.cpp:460 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "대기 파일" -#: resources.h:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3284 msgid "Queueing:" msgstr "대기:" -#: resources.h:563 -msgid "R&eboot system" -msgstr "시스템 재시작(&E)" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" +msgstr "시스템 1회 재시작(&e)" -#: resources.h:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "리모트 디렉터리 트리(&E)" -#: resources.h:580 resources.h:584 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:460 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "R&eset and requeue selected files" msgstr "선택 파일을 초기화하고 다시 대기(&e)" -#: ../../locales/../src/interface/Mainfrm.cpp:567 +#: ../../locales/../src/interface/Mainfrm.cpp:582 msgid "Raw FTP command" msgstr "FTP 직접 명령" -#: resources.h:100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "Re&ad" msgstr "읽기(&A)" -#: resources.h:520 resources.h:538 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Re&fresh" msgstr "새로 고침(&R)" -#: resources.h:73 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 msgid "Re&name" msgstr "이름 바꾸기(&N)" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:600 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -5658,7 +6077,7 @@ "마법사를 다시 시작하여 설정을 잘 확인하고 그에 맞게 라우터와 방화벽을 구성하" "십시오." -#: resources.h:104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Rea&d" msgstr "읽기(&D)" @@ -5666,75 +6085,85 @@ msgid "Read-only" msgstr "읽기 전용" -#: ../../locales/../src/interface/Mainfrm.cpp:1088 +#: ../../locales/../src/interface/Mainfrm.cpp:1020 msgid "Really cancel current operation?" msgstr "정말 현재 작업을 취소하시겠습니까?" -#: ../../locales/../src/interface/RemoteListView.cpp:1452 -#: ../../locales/../src/interface/search.cpp:718 +#: ../../locales/../src/interface/RemoteListView.cpp:1392 +#: ../../locales/../src/interface/search.cpp:1185 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" "Really delete %d directories with their contents from the server?" msgstr[0] "정말 서버에서 %d 디렉터리 및 그 하위 내용을 삭제하시겠습니까?" -#: ../../locales/../src/interface/RemoteListView.cpp:1450 -#: ../../locales/../src/interface/search.cpp:716 +#: ../../locales/../src/interface/RemoteListView.cpp:1390 +#: ../../locales/../src/interface/search.cpp:1183 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "정말 서버에서 파일 %d개를 삭제하시겠습니까?" -#: ../../locales/../src/interface/RemoteListView.cpp:1457 -#: ../../locales/../src/interface/search.cpp:723 +#: ../../locales/../src/interface/RemoteListView.cpp:1397 +#: ../../locales/../src/interface/search.cpp:1189 #, c-format msgid "Really delete %s and %s from the server?" msgstr "정말 서버에서 %s 및 %s을 삭제하시겠습니까?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1138 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 msgid "Really delete all selected files and/or directories from the server?" msgstr "정말 서버에서 파일과 디렉터리 선택 항목을 전부 삭제시겠습니까?" -#: ../../locales/../src/engine/local_filesys.cpp:135 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "정말 컴퓨터에서 파일과 디렉터리 선택 항목을 전부 삭제시겠습니까?" -#: ../../locales/../src/interface/queue.cpp:1222 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Reason" msgstr "이유" -#: ../../locales/../src/interface/QueueView.cpp:3229 +#: ../../locales/../src/interface/QueueView.cpp:2606 msgid "Reboot now" msgstr "지금 재시작" -#: resources.h:109 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 msgid "Rec&urse into subdirectories" msgstr "하위 디렉터리로 이동(&U)" -#: ../../locales/../src/engine/directorylistingparser.cpp:3040 +#: ../../locales/../src/engine/tlssocket.cpp:278 +#, c-format +msgid "Received TLS alert from the server: %s (%d)" +msgstr "서버에서 TLS 경보를 수신함: %s (%d)" + +#: ../../locales/../src/engine/directorylistingparser.cpp:2962 msgid "Received a directory listing which appears to be encoded in EBCDIC." -msgstr "" +msgstr "EBCDIC로 인코딩된 것으로 보이는 디렉터리 목록을 수신함." -#: ../../locales/../src/engine/directorylistingparser.cpp:2051 -#: ../../locales/../src/engine/directorylistingparser.cpp:2066 +#: ../../locales/../src/engine/directorylistingparser.cpp:1997 +#: ../../locales/../src/engine/directorylistingparser.cpp:2013 msgid "Received a line exceeding 10000 characters, aborting." msgstr "수신된 행 중 1000자를 초과하는 행이 있어서 중단합니다." -#: ../../locales/../src/interface/netconfwizard.cpp:1004 -#: ../../locales/../src/interface/netconfwizard.cpp:1013 -#: ../../locales/../src/interface/netconfwizard.cpp:1037 +#: ../../locales/../src/interface/netconfwizard.cpp:1007 +#: ../../locales/../src/interface/netconfwizard.cpp:1015 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Received data tainted" msgstr "받은 데이터 손상" -#: ../../locales/../src/interface/updater.cpp:506 +#: ../../locales/../src/interface/updater.cpp:555 msgid "Received invalid character in version information" msgstr "버전 정보에서 비정상적인 글자를 받음" -#: ../../locales/../src/interface/updater.cpp:499 +#: ../../locales/../src/engine/tlssocket.cpp:281 +#, c-format +msgid "Received unknown TLS alert %d from the server" +msgstr "정말 서버에서 파일 %d개를 삭제하시겠습니까?" + +#: ../../locales/../src/interface/updater.cpp:548 msgid "Received version information is too large" msgstr "수신된 버전 정보가 너무 큼" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -5742,61 +6171,80 @@ "서버에 연결된 후에는 재연결 정보를 지울 수 없습니다.\n" "계속 하면 연결이 종료됩니다." -#: resources.h:703 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 msgid "Reconnection settings" msgstr "재연결 설정" -#: resources.h:1018 resources.h:1019 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 msgid "Reconnects to the last used server" msgstr "마지막으로 사용한 서버로 재접속" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:674 +#: ../../locales/../src/interface/recursive_operation_status.cpp:101 +msgid "Recursively adding files to queue." +msgstr "하위 디렉터리까지의 파일을 대기열에 추가." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +msgid "Recursively changing permissions." +msgstr "하위 디렉터리까지 권한 변경." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:104 +msgid "Recursively deleting files and directories." +msgstr "하위 디렉터리까지 파일 및 디렉터리 삭제." + +#: ../../locales/../src/interface/sitemanager.cpp:17 +#, fuzzy +msgid "Red" +msgstr "읽기(&R)" + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "유효하지 않거나 지원되지 않는 URI %s로의 변경" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:681 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:688 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "유효하지 않거나 지원되지 않는 주소 %s로의 변경" -#: resources.h:1010 resources.h:1011 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 msgid "Refresh the file and folder lists" msgstr "파일과 폴더 목록 새로 고침" -#: resources.h:435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3821 msgid "Remember passwords?" msgstr "비밀번호를 기억할까요?" -#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1096 msgid "Remote" msgstr "리모트" -#: ../../locales/../src/engine/tlssocket.cpp:900 +#: ../../locales/../src/engine/tlssocket.cpp:909 msgid "Remote certificate not trusted." msgstr "리모트 인증서 신뢰 불가." -#: resources.h:305 ../../locales/../src/interface/queue.cpp:1222 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Remote file" msgstr "리모트 파일" -#: resources.h:378 ../../locales/../src/interface/search.cpp:369 -#: ../../locales/../src/interface/search.cpp:375 -#: ../../locales/../src/interface/search.cpp:385 -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3131 +#: ../../locales/../src/interface/search.cpp:660 +#: ../../locales/../src/interface/search.cpp:665 msgid "Remote file search" msgstr "리모트 파일 검색" -#: resources.h:168 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" msgstr "리모트 필터:" -#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1087 msgid "Remote path" msgstr "리모트 경로" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:430 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:412 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -5805,7 +6253,7 @@ "리모트 경로를 해석할 수 없습니다. 해당 경로가 적절한 절대 경로인지, 현재 사이" "트의 서버 유형(%s)에서 지원하는 것인지 확인하십시오." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -5814,116 +6262,126 @@ "리모트 경로를 해석할 수 없습니다. 해당 경로가 적절한 절대 경로인지, 상위 사이" "트에서 선택한 서버 유형(%s)에서 지원하는 것인지 확인하십시오." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:432 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "리모트 경로를 해석할 수 없습니다. 해당 경로가 적절한 절대 경로인지 확인하십시" "오." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "리모트 경로를 해석할 수 없습니다." -#: resources.h:383 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3171 msgid "Remote path handling:" msgstr "리모트 경로 처리:" -#: resources.h:251 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "Remote path:" msgstr "리모트 경로:" -#: ../../locales/../src/interface/viewheader.cpp:564 +#: ../../locales/../src/interface/viewheader.cpp:523 msgid "Remote site:" msgstr "리모트 사이트:" -#: resources.h:577 resources.h:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 msgid "Remove &all" msgstr "모두 제거(&A)" -#: resources.h:579 resources.h:583 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:457 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:475 msgid "Remove &selected" msgstr "선택 부분 제거(&S)" -#: resources.h:203 resources.h:213 resources.h:807 resources.h:816 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:256 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 msgid "Rename file" msgstr "파일 이름 바꾸기" -#: resources.h:597 resources.h:620 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Rename selected directory" msgstr "선택된 디렉터리 이름 바꾸기" -#: resources.h:524 resources.h:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Rename selected files and directories" msgstr "선택된 파일과 폴더 이름 바꾸기" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3578 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2447 #, c-format msgid "Renaming '%s' to '%s'" msgstr "'%s' -> '%s' 이름 바꾸기" -#: resources.h:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3542 msgid "Reporting bugs and feature requests" msgstr "버그 및 기능 요청 등록하기" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:399 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:410 +#: ../../locales/../src/engine/proxy.cpp:402 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:396 msgid "Request rejected or failed" -msgstr "" +msgstr "요청이 거부됐거나 실패함" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:515 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:509 msgid "Require explicit FTP over TLS" msgstr "TLS를 통한 명시적 FTP 필요" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:510 msgid "Require implicit FTP over TLS" msgstr "TLS를 통한 묵시적 FTP 필요" -#: resources.h:582 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Reset and requeue &all" msgstr "전부 초기화하고 다시 대기" -#: ../../locales/../src/engine/socket.cpp:1254 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Resolved protocol is unknown" -msgstr "" +msgstr "해석된 프로토콜을 알 수 없음" -#: ../../locales/../src/engine/ControlSocket.cpp:1167 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:482 +#: ../../locales/../src/engine/ControlSocket.cpp:1079 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 #, c-format msgid "Resolving address of %s" msgstr "%s 주소 해석" -#: ../../locales/../src/engine/socket.cpp:1214 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Resource temporarily unavailable" -msgstr "" +msgstr "일시적으로 해당 자원 사용 불가" -#: ../../locales/../src/engine/logging.cpp:125 -#: ../../locales/../src/interface/netconfwizard.cpp:395 -#: ../../locales/../src/interface/StatusView.cpp:280 -#: ../../locales/../src/interface/StatusView.cpp:340 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/netconfwizard.cpp:423 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:345 msgid "Response:" msgstr "응답:" -#: resources.h:377 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3117 msgid "Results:" msgstr "결과" -#: resources.h:202 resources.h:212 resources.h:806 resources.h:815 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" msgstr "파일 전송 재개" -#: resources.h:821 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -5931,127 +6389,125 @@ "서버가 클라이언트와 다른 라인 엔딩 형식을 사용하는 경우 아스키 파일 전송 재개" "는 문제를 일으킬 수 있습니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1320 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:959 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1269 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:930 +#, c-format +msgid "Retrieving directory listing of \"%s\"..." +msgstr "\"%s\" 디렉터리 목록 조회..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:927 msgid "Retrieving directory listing..." msgstr "디렉터리 목록 조회..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963 -#: ../../locales/../src/interface/netconfwizard.cpp:707 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3768 +#: ../../locales/../src/interface/netconfwizard.cpp:727 #, c-format msgid "Retrieving external IP address from %s" msgstr "%s에서 외부 IP 주소 조회" -#: ../../locales/../src/engine/tlssocket.cpp:1090 -msgid "Root certificate is not trusted" -msgstr "루트 인증서가 신뢰되지 않음" - -#: resources.h:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 msgid "S&how files currently being edited..." msgstr "현재 편집 중인 파일 보기(&H)..." -#: resources.h:838 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 msgid "S&how the Site Manager on startup" msgstr "시작시 사이트 관리자 보기(&H)" -#: resources.h:564 -msgid "S&hutdown system" -msgstr "시스템 종료(&H)" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" +msgstr "시스템 1회 종료(&h)" -#: resources.h:375 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3044 msgid "S&top" msgstr "중지(&t)" -#: resources.h:565 -msgid "S&uspend system" -msgstr "시스템 정지(&u)" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" +msgstr "시스템 1회 정지(&u)" -#: resources.h:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" msgstr "탐색 동기화(&y)" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 msgid "SFTP" msgstr "SFTP" -#: resources.h:758 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 msgid "SOC&KS 4" -msgstr "" +msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:178 #, c-format msgid "SOCKS4 proxy will connect to: %s" -msgstr "" +msgstr "SOCKS4 프록시가 다음에 연결하려 함: %s" -#: resources.h:128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 msgid "SQLite:" -msgstr "" +msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:852 +#: ../../locales/../src/interface/netconfwizard.cpp:863 msgid "Save settings?" msgstr "설정을 저장하시겠습니까?" -#: ../../locales/../src/interface/manual_transfer.cpp:455 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:968 +#: ../../locales/../src/interface/manual_transfer.cpp:437 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:977 msgid "Saving of password has been disabled by your system administrator." -msgstr "" +msgstr "시스템 관리자가 비밀번호 저장을 중지했습니다." -#: ../../locales/../src/interface/manual_transfer.cpp:457 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:970 +#: ../../locales/../src/interface/manual_transfer.cpp:439 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:979 msgid "Saving of passwords has been disabled by you." -msgstr "" - -#: ../../locales/../src/interface/QueueView.cpp:1838 -msgid "Scanning for files to add to queue" -msgstr "대기열에 추가할 파일 검사" - -#: ../../locales/../src/interface/QueueView.cpp:1840 -msgid "Scanning for files to upload" -msgstr "업로드할 파일 검사" +msgstr "사용자에 의해 비밀번호 저장이 중지됐습니다." -#: resources.h:371 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3050 msgid "Search &conditions:" msgstr "검색 조건(&c):" -#: resources.h:369 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3032 msgid "Search &directory:" msgstr "검색 디렉터리(&d):" -#: resources.h:1026 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 msgid "Search for files recursively." msgstr "하위 경로까지 파일 검색." -#: resources.h:490 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 msgid "Search server for files" msgstr "서버에서 파일 검색" -#: ../../locales/../src/interface/statusbar.cpp:495 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +msgid "Search type:" +msgstr "검색 유형:" + +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Security information" msgstr "보안 정보" -#: ../../locales/../src/interface/netconfwizard.cpp:564 -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:601 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "참고: https://wiki.filezilla-project.org/Network_Configuration" -#: resources.h:313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Sele&ct server" msgstr "서버 선택(&C)" -#: resources.h:688 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 msgid "Select &page:" msgstr "페이지 선택(&P)" -#: resources.h:845 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 msgid "Select Theme" msgstr "테마 선택" -#: resources.h:799 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "전송 대상 파일이 이미 존재할 경우 수행할 기본 동작을 선택하십시오." -#: ../../locales/../src/interface/edithandler.cpp:1584 +#: ../../locales/../src/interface/edithandler.cpp:1532 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "기본 편집기 선택" @@ -6070,177 +6526,180 @@ "the queue." msgstr "대기열에 현재 선택된 파일에 대해서만 중복 파일 동작을 선택하십시오." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 msgid "Select file containing private key" msgstr "개인 키가 포함된 파일 선택" -#: ../../locales/../src/interface/export.cpp:37 +#: ../../locales/../src/interface/export.cpp:38 msgid "Select file for exported data" msgstr "데이터를 내보낼 파일 선택" -#: ../../locales/../src/interface/export.cpp:33 +#: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/queue.cpp:1415 msgid "Select file for exported queue" msgstr "대기열을 내보낼 파일 선택" -#: ../../locales/../src/interface/export.cpp:35 +#: ../../locales/../src/interface/export.cpp:36 msgid "Select file for exported settings" msgstr "설정을 내보낼 파일 선택" -#: ../../locales/../src/interface/export.cpp:31 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/export.cpp:32 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 msgid "Select file for exported sites" msgstr "사이트를 내보낼 파일 선택" -#: ../../locales/../src/interface/import.cpp:15 +#: ../../locales/../src/interface/import.cpp:16 msgid "Select file to import settings from" msgstr "설정을 가져올 파일 선택" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "업로드할 파일 선택" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" -msgstr "변환될 파일명 선택" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +msgid "Select filename for converted key file" +msgstr "변환되는 키 파일명 선택" -#: resources.h:359 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 msgid "Select how these files should be opened." msgstr "파일 열기 방법을 선택해주세요." -#: ../../locales/../src/interface/search.cpp:498 +#: ../../locales/../src/interface/search.cpp:839 msgid "Select target download directory" msgstr "대상 다운로드 디렉터리 선택" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "대상 파일명 선택" -#: resources.h:229 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 msgid "Select the categories to export:" msgstr "내보낼 구분 항목을 선택해주세요." -#: resources.h:220 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 msgid "Select the private data you would like to delete." msgstr "삭제할 개인 정보를 선택하십시오." -#: ../../locales/../src/interface/search.cpp:465 +#: ../../locales/../src/interface/search.cpp:798 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "%d 디렉터리 및 그 내용을 전송하도록 선택함." -#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:37 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "디렉터리 %d개 선택됨." -#: ../../locales/../src/interface/search.cpp:463 +#: ../../locales/../src/interface/search.cpp:796 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "전송할 파일 %d개 선택." -#: ../../locales/../src/interface/filelist_statusbar.cpp:58 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "파일 %d개 선택됨. 총 크기: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:56 +#: ../../locales/../src/interface/filelist_statusbar.cpp:41 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "파일 %d개 선택됨. 총 크기: 최소 %s" -#: ../../locales/../src/interface/search.cpp:470 +#: ../../locales/../src/interface/search.cpp:802 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s, %s 선택, 전송 예정." -#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#: ../../locales/../src/interface/filelist_statusbar.cpp:52 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "%s, %s 선택. 총 크기: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s, %s 선택. 총 크기: 최소 %s" -#: ../../locales/../src/interface/edithandler.cpp:1525 -#: ../../locales/../src/interface/edithandler.cpp:1604 +#: ../../locales/../src/interface/edithandler.cpp:1477 +#: ../../locales/../src/interface/edithandler.cpp:1551 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "선택된 편집기는 존재하지 않음." -#: resources.h:258 ../../locales/../src/interface/LocalListView.cpp:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 msgid "Selected file already being edited" msgstr "선택된 파일이 이미 편집 중임" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 msgid "Selected file is already loaded" msgstr "선택된 파일이 이미 읽혔음" -#: ../../locales/../src/interface/RemoteListView.cpp:2445 +#: ../../locales/../src/interface/edithandler.cpp:1649 msgid "Selected file is already opened" msgstr "선택된 파일이 이미 열려 있음" -#: ../../locales/../src/interface/RemoteListView.cpp:2473 +#: ../../locales/../src/interface/edithandler.cpp:1721 msgid "Selected file is still being edited" msgstr "선택된 파일이 아직 편집 중임" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "선택된 필터는 로컬 파일에만 적용됩니다." -#: ../../locales/../src/interface/menu_bar.cpp:315 +#: ../../locales/../src/interface/menu_bar.cpp:291 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" +"선택된 전역 북마크와 현재 서버가 다른 서버 유형을 사용합니다.\n" +"이 서버에는 사이트별 북마크를 사용하십시오." -#: ../../locales/../src/engine/engineprivate.cpp:281 +#: ../../locales/../src/engine/engineprivate.cpp:292 msgid "Selected port usually in use by a different protocol." msgstr "선택된 포트는 다른 프로토콜에서 자주 사용됩니다." -#: resources.h:710 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 msgid "Send FTP &keep-alive commands" msgstr "FTP 연결 유지 명령 보내기" -#: resources.h:492 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 msgid "Send custom command to the server otherwise not available" msgstr "다른 방법으로 서버에 사용자 명령을 보냄" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4541 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4322 msgid "Sending keep-alive command" msgstr "연결 유지 명령 보내기" -#: resources.h:7 resources.h:36 -#: ../../locales/../src/interface/verifycertdialog.cpp:192 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "일련 번호:" -#: resources.h:972 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:322 msgid "Server &Type:" msgstr "서버 종류(&T):" -#: ../../locales/../src/engine/tlssocket.cpp:778 +#: ../../locales/../src/engine/tlssocket.cpp:798 msgid "Server did not properly shut down TLS connection" msgstr "서버가 TLS 연결을 정상 해제하지 않았습니다" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:926 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:989 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:887 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:940 msgid "Server does not support non-ASCII characters." msgstr "서버에서 비 ASCII 문자를 지원하지 않습니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4365 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "서버가 %d GB 이상의 파일의 전송 재개를 지원하지 않습니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4361 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4154 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6249,15 +6708,15 @@ "서버가 %d GB가 넘는 파일의 전송 재개를 지원하지 않습니다. 해당 파일 크기가 되" "어 전송을 종료합니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2571 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2424 msgid "Server does not support resume of files > 2GB." msgstr "서버가 2GB가 넘는 파일의 전송 재개를 지원하지 않습니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2566 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2420 msgid "Server does not support resume of files > 4GB." msgstr "서버가 4GB가 넘는 파일의 전송 재개를 지원하지 않습니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4376 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4169 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6266,17 +6725,17 @@ "서버가 %dGB가 넘는 파일의 전송 재개를 지원하지 않을 수 있습니다. 해당 파일 크" "기가 되어 전송을 종료합니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:868 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:836 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "계정이 필요합니다. 사이트 관리자를 이용하여 계정을 입력하십시오." -#: ../../locales/../src/engine/ControlSocket.cpp:434 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "서버가 빈 경로를 반환했습니다." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:679 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:663 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6284,13 +6743,13 @@ "서버가 추가적인 로그인 프롬프트를 보냈습니다. 인터랙티브 로그인 유형을 사용해" "야 합니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3905 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3719 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "서버가 라우트 불가능한 주소의 수동형 응답을 보냈습니다. 수동형 모드가 실패했" "습니다." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3899 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6298,82 +6757,90 @@ "서버가 알 수 없는 주소와 수동형 응답을 보냈습니다. 대신 서버 주소를 사용합니" "다." -#: ../../locales/../src/interface/netconfwizard.cpp:403 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:458 -#: ../../locales/../src/interface/netconfwizard.cpp:470 -#: ../../locales/../src/interface/netconfwizard.cpp:494 -#: ../../locales/../src/interface/netconfwizard.cpp:501 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:521 +#: ../../locales/../src/interface/netconfwizard.cpp:430 +#: ../../locales/../src/interface/netconfwizard.cpp:436 +#: ../../locales/../src/interface/netconfwizard.cpp:471 +#: ../../locales/../src/interface/netconfwizard.cpp:480 +#: ../../locales/../src/interface/netconfwizard.cpp:492 +#: ../../locales/../src/interface/netconfwizard.cpp:515 +#: ../../locales/../src/interface/netconfwizard.cpp:522 +#: ../../locales/../src/interface/netconfwizard.cpp:531 +#: ../../locales/../src/interface/netconfwizard.cpp:542 msgid "Server sent unexpected reply." msgstr "서버가 예기치 않은 응답을 보냈습니다." -#: resources.h:289 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 msgid "Server to client MAC:" msgstr "클라이언트 MAC으로의 서버:" -#: resources.h:287 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 msgid "Server to client cipher:" msgstr "클라이언트 암호로의 서버:" -#: resources.h:318 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 msgid "Server&type:" msgstr "서버 종류(&T)" -#: ../../locales/../src/interface/queue.cpp:1222 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Server/Local file" msgstr "서버/로컬 파일" -#: resources.h:249 resources.h:311 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 msgid "Server:" msgstr "서버:" -#: resources.h:16 resources.h:45 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "세션 상세" -#: resources.h:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "우선 순위 설정(&P)" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3730 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2434 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2326 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "'%s' ->'%s' 권한 설정" -#: ../../locales/../src/engine/transfersocket.cpp:825 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "소켓없이 SetSocketBufferSize 호출됨" -#: resources.h:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "설정" -#: resources.h:952 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +msgid "Settings directory:" +msgstr "설정 디렉터리:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "알림 풍선 보이기(&o)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" msgstr "디렉터리 목록의 원시 데이터 보임(&R)" -#: resources.h:501 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Show &welcome dialog..." msgstr "최초 실행 대화창 보기(&w)..." -#: ../../locales/../src/interface/Mainfrm.cpp:2360 +#: ../../locales/../src/interface/Mainfrm.cpp:2198 msgid "Show both directory trees and continue comparing?" msgstr "양쪽 디렉터리 트리를 표시하고 비교를 계속 하시겠습니까?" -#: resources.h:1045 +#: ../../locales/../src/interface/resources/xrc/update.xrc:214 msgid "Show details" msgstr "상세 정보 보기" -#: resources.h:862 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 msgid "Show details about custom date and time formats" -msgstr "" +msgstr "사용자 정의 날짜 및 시간 형식에 대한 자세한 설명 보기" -#: resources.h:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:445 msgid "Shows available TLS ciphers" msgstr "TLS 암호화 목록" @@ -6381,70 +6848,71 @@ msgid "Shows this help dialog" msgstr "이 도움말 대화 창 보기" -#: ../../locales/../src/interface/QueueView.cpp:3225 +#: ../../locales/../src/interface/QueueView.cpp:2602 msgid "Shutdown now" msgstr "지금 종료" -#: resources.h:9 resources.h:38 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 msgid "Signature algorithm:" msgstr "서명 앨거리듬:" -#: resources.h:237 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 msgid "Site &Manager entries" msgstr "사이트 관리자 항목(&M)" -#: resources.h:953 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 msgid "Site Manager" msgstr "사이트 관리자" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:976 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 msgid "Site Manager - Cannot remember password" msgstr "사이트 관리자 - 비밀번호 기억 실패" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:946 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:957 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:992 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1006 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1019 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1048 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:953 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:966 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1053 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1073 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1108 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1121 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1130 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1137 msgid "Site Manager - Invalid data" msgstr "사이트 관리자 - 데이터 이상" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:317 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "사이트 관리자가 이미 열려 있음" -#: ../../locales/../src/interface/sitemanager.cpp:445 -#: ../../locales/../src/interface/sitemanager.cpp:462 -#: ../../locales/../src/interface/sitemanager.cpp:476 -#: ../../locales/../src/interface/sitemanager.cpp:752 -#: ../../locales/../src/interface/sitemanager.cpp:835 +#: ../../locales/../src/interface/sitemanager.cpp:481 +#: ../../locales/../src/interface/sitemanager.cpp:508 +#: ../../locales/../src/interface/sitemanager.cpp:522 +#: ../../locales/../src/interface/sitemanager.cpp:534 +#: ../../locales/../src/interface/sitemanager.cpp:688 +#: ../../locales/../src/interface/sitemanager.cpp:765 msgid "Site does not exist." msgstr "사이트가 존재하지 않습니다." -#: ../../locales/../src/interface/sitemanager.cpp:425 +#: ../../locales/../src/interface/sitemanager.cpp:491 msgid "Site path has to begin with 0 or 1." msgstr "사이트 경로는 0 또는 1로 시작되어야 합니다." -#: ../../locales/../src/interface/sitemanager.cpp:469 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:745 -#: ../../locales/../src/interface/sitemanager.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:528 +#: ../../locales/../src/interface/sitemanager.cpp:682 +#: ../../locales/../src/interface/sitemanager.cpp:759 msgid "Site path is malformed." msgstr "사이트 경로가 잘못됨." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:263 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 msgid "Site-specific bookmarks" msgstr "사이트별 북마크" #: ../../locales/../src/interface/bookmarks_dialog.cpp:93 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:526 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6453,64 +6921,67 @@ "사이트별 북마크를 사용하려면 사이트 관리자에 서버를 저장해야 합니다.\n" "현재 연결을 사이트 관리자에 추가합니까?" -#: ../../locales/../src/interface/queue.cpp:1222 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Size" msgstr "크기" -#: resources.h:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 msgid "Size formatting" msgstr "크기 형식" -#: ../../locales/../src/interface/fileexistsdlg.cpp:59 -#: ../../locales/../src/interface/fileexistsdlg.cpp:63 +#: ../../locales/../src/interface/fileexistsdlg.cpp:43 msgid "Size unknown" msgstr "알 수 없는 크기" -#: resources.h:204 resources.h:214 resources.h:808 resources.h:817 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "파일 건너뜀" -#: ../../locales/../src/engine/ControlSocket.cpp:1238 -#: ../../locales/../src/engine/ControlSocket.cpp:1257 -#: ../../locales/../src/engine/ControlSocket.cpp:1282 -#: ../../locales/../src/engine/ControlSocket.cpp:1348 +#: ../../locales/../src/engine/ControlSocket.cpp:1151 +#: ../../locales/../src/engine/ControlSocket.cpp:1168 +#: ../../locales/../src/engine/ControlSocket.cpp:1192 +#: ../../locales/../src/engine/ControlSocket.cpp:1252 #, c-format msgid "Skipping download of %s" msgstr "%s 다운로드 건너뛰기" -#: ../../locales/../src/engine/ControlSocket.cpp:1242 -#: ../../locales/../src/engine/ControlSocket.cpp:1261 -#: ../../locales/../src/engine/ControlSocket.cpp:1286 -#: ../../locales/../src/engine/ControlSocket.cpp:1352 +#: ../../locales/../src/engine/ControlSocket.cpp:1155 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 +#: ../../locales/../src/engine/ControlSocket.cpp:1196 +#: ../../locales/../src/engine/ControlSocket.cpp:1256 #, c-format msgid "Skipping upload of %s" msgstr "%s 업로드 취소 중" -#: ../../locales/../src/engine/socket.cpp:1218 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Socket address outside address space" -msgstr "" +msgstr "소켓 주소가 주소 공간을 벗어남" -#: ../../locales/../src/engine/socket.cpp:1220 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Socket already connected" msgstr "소켓이 이미 연결됨" -#: ../../locales/../src/engine/socket.cpp:1228 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket has been shut down" msgstr "소켓이 닫혔습니다" -#: ../../locales/../src/engine/socket.cpp:1225 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Socket not connected" msgstr "소켓이 연결되지 않았음" -#: ../../locales/../src/engine/socket.cpp:1267 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Socket type not supported for address family" -msgstr "" +msgstr "소켓 유형이 주소군에서 지원되지 않는 것임" -#: ../../locales/../src/interface/Mainfrm.cpp:1229 +#: ../../locales/../src/interface/Mainfrm.cpp:1150 msgid "Some files are still being edited or need to be uploaded." msgstr "아직 편집 중이거나 업로드할 파일이 남아 있습니다." -#: resources.h:650 resources.h:726 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -6518,68 +6989,69 @@ "간혹 잘못 구성된 리모트 서버가 라우터에 연동돼 있을 때 그 응답이 서버의 로컬 " "IP 주소일 수도 있습니다." -#: resources.h:882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 msgid "Sort directories inline" msgstr "디렉터리 함께 정렬" -#: ../../locales/../src/interface/filelistctrl.cpp:472 +#: ../../locales/../src/interface/filelistctrl.cpp:469 msgid "Sort order cannot be changed if comparing directories." msgstr "정렬 순서는 디렉터리 비교 중에는 변경될 수 없습니다." -#: resources.h:878 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 msgid "Sorting" msgstr "정렬" -#: resources.h:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 msgid "Sorting &mode:" msgstr "정렬 모드(&M):" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:104 msgid "Source and path of the drop operation are identical" msgstr "끌어다놓기 동작의 원본과 경로가 동일함" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "원본 및 대상 파일이 동일하지 않은 것 같습니다." -#: ../../locales/../src/interface/RemoteListView.cpp:142 +#: ../../locales/../src/interface/RemoteListView.cpp:144 msgid "Source and target of the drop operation are identical" msgstr "끌어다놓기 동작의 원본과 대상이 동일합니다." -#: resources.h:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 msgid "Source file:" msgstr "원본 파일:" -#: resources.h:428 ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3763 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 msgid "Speed Limits" msgstr "속도 제한" -#: resources.h:772 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 msgid "Speed limits" msgstr "속도 제한" -#: ../../locales/../src/interface/statusbar.cpp:561 +#: ../../locales/../src/interface/statusbar.cpp:575 msgid "Speed limits are disabled, click to change." msgstr "속도 제한은 중지돼 있습니다. 변경하려면 클릭하세요." -#: ../../locales/../src/interface/statusbar.cpp:565 +#: ../../locales/../src/interface/statusbar.cpp:578 msgid "Speed limits are enabled, click to change." msgstr "속도 제한이 사용 중입니다. 변경하려면 클릭하세요." -#: resources.h:926 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 msgid "Stable and beta versions" msgstr "안정 버전 및 베타 버전" -#: resources.h:925 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 msgid "Stable versions only" msgstr "안정 버전만" -#: resources.h:927 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 msgid "Stable, beta and nightly versions" msgstr "안정, 베타, 야간 빌드 버전" -#: resources.h:329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 msgid "Start transfer &immediately" msgstr "즉시 전송 시작(&I)" @@ -6587,19 +7059,19 @@ msgid "Start with opened Site Manager" msgstr "열려진 사이트 관리자로 시작" -#: ../../locales/../src/interface/updater.cpp:239 +#: ../../locales/../src/interface/updater.cpp:240 #, c-format msgid "Started update check on %s\n" msgstr "%s 업데이트 확인 시작함\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2257 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2144 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1592 #, c-format msgid "Starting download of %s" msgstr "%s 다운로드 시작" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2261 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1595 #, c-format msgid "Starting upload of %s" msgstr "%s 업로드 시작" @@ -6608,30 +7080,34 @@ msgid "Starts the local site in the given path" msgstr "지정한 경로에 로컬 사이트를 시작합니다" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "시/도:" -#: ../../locales/../src/interface/edithandler.cpp:1115 -#: ../../locales/../src/interface/queue.cpp:1222 +#: ../../locales/../src/interface/edithandler.cpp:1088 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Status" msgstr "상태" -#: ../../locales/../src/engine/logging.cpp:122 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:364 +#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:369 msgid "Status:" msgstr "상태:" -#: resources.h:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "중지 후 모두 제거(&A)" -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../../locales/../src/interface/recursive_operation_status.cpp:42 +msgid "Stop recursive operation" +msgstr "하위 디렉터리 작업 중지" + +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "거리:" -#: resources.h:12 resources.h:41 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" msgstr "인증서 주체" @@ -6639,15 +7115,15 @@ msgid "Successful transfers" msgstr "전송 성공" -#: resources.h:678 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" msgstr "시험 결과 요약:" -#: ../../locales/../src/interface/QueueView.cpp:3233 +#: ../../locales/../src/interface/QueueView.cpp:2610 msgid "Suspend now" msgstr "지금 정지" -#: resources.h:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3365 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -6655,27 +7131,29 @@ "파일의 심볼릭 링크는 이 선택에 영향 받지 않습니다. 해당 심볼릭 링크는 항상 삭" "제됩니다." -#: resources.h:1025 ../../locales/../src/interface/state.cpp:249 -#: ../../locales/../src/interface/state.cpp:278 -#: ../../locales/../src/interface/state.cpp:285 -#: ../../locales/../src/interface/state.cpp:297 -#: ../../locales/../src/interface/state.cpp:388 -#: ../../locales/../src/interface/state.cpp:396 -#: ../../locales/../src/interface/state.cpp:404 -#: ../../locales/../src/interface/state.cpp:985 -#: ../../locales/../src/interface/state.cpp:994 -#: ../../locales/../src/interface/state.cpp:1001 -#: ../../locales/../src/interface/state.cpp:1012 -#: ../../locales/../src/interface/state.cpp:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 +#: ../../locales/../src/interface/state.cpp:232 +#: ../../locales/../src/interface/state.cpp:246 +#: ../../locales/../src/interface/state.cpp:252 +#: ../../locales/../src/interface/state.cpp:262 +#: ../../locales/../src/interface/state.cpp:349 +#: ../../locales/../src/interface/state.cpp:357 +#: ../../locales/../src/interface/state.cpp:365 +#: ../../locales/../src/interface/state.cpp:954 +#: ../../locales/../src/interface/state.cpp:962 +#: ../../locales/../src/interface/state.cpp:968 +#: ../../locales/../src/interface/state.cpp:977 +#: ../../locales/../src/interface/state.cpp:1003 msgid "Synchronized browsing" msgstr "탐색 동기화" -#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:364 msgid "Synchronized browsing has been disabled." msgstr "탐색 동기화가 중지됐습니다." -#: ../../locales/../src/interface/quickconnectbar.cpp:88 -#: ../../locales/../src/interface/quickconnectbar.cpp:126 +#: ../../locales/../src/interface/quickconnectbar.cpp:84 +#: ../../locales/../src/interface/quickconnectbar.cpp:121 msgid "Syntax error" msgstr "구문 오류" @@ -6684,8 +7162,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2472 -#: ../../locales/../src/interface/Mainfrm.cpp:2519 +#: ../../locales/../src/interface/Mainfrm.cpp:2310 +#: ../../locales/../src/interface/Mainfrm.cpp:2352 msgid "Syntax error in command line" msgstr "명령행 구문 오류" @@ -6693,63 +7171,75 @@ msgid "System" msgstr "시스템" -#: ../../locales/../src/engine/socket.cpp:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +msgid "System details" +msgstr "시스템 상세 정보" + +#: ../../locales/../src/engine/socket.cpp:1028 msgid "System limit of open files exceeded" msgstr "시스템의 열린 파일 수 제한이 초과됨" -#: ../../locales/../src/engine/socket.cpp:1265 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "System's network subsystem has failed" msgstr "시스템의 네트웍 서브시스템에 장애 발생" -#: resources.h:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 msgid "T&oolbar" msgstr "도구 모음줄(&O)" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:325 -msgid "TLS/SSL connection established, sending HTTP request" -msgstr "TLS/SSL 연결 수립, HTTP 요청 보냄" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414 -msgid "TLS/SSL connection established, waiting for welcome message..." -msgstr "TLS/SSL 연결 수립, 환영 메시지 기다림..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418 -msgid "TLS/SSL connection established." -msgstr "TLS/SSL 연결 수립." +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +msgid "TLS connection established, sending HTTP request" +msgstr "TLS 연결 수립, HTTP 요청 보냄" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:401 +msgid "TLS connection established, waiting for welcome message..." +msgstr "TLS 연결 수립, 환영 메시지 기다림..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +msgid "TLS connection established." +msgstr "TLS 연결 수립." -#: ../../locales/../src/engine/proxy.cpp:548 +#: ../../locales/../src/engine/proxy.cpp:523 msgid "TTL expired" msgstr "TTL 만기됨" -#: resources.h:57 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:6 msgid "Target file already exists" msgstr "대상 파일이 이미 존재함" -#: resources.h:63 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 msgid "Target file:" msgstr "대상 파일:" -#: ../../locales/../src/interface/RemoteListView.cpp:2928 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "대상 파일명이 이미 존재함" -#: ../../locales/../src/interface/RemoteListView.cpp:1670 +#: ../../locales/../src/interface/RemoteListView.cpp:1606 msgid "Target filename already exists, really continue?" msgstr "지정한 파일이 이미 존재합니다. 정말 계속 하시겠습니까?" -#: ../../locales/../src/engine/socket.cpp:1238 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Temporary failure in name resolution" -msgstr "" +msgstr "이름 해석 중 일시 장애" + +#: ../../locales/../src/interface/netconfwizard.cpp:590 +msgid "Test finished successfully" +msgstr "시험을 성공적으로 완료함" -#: resources.h:677 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "시험 결과" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4175 msgid "Testing resume capabilities of server" msgstr "서버의 전송 재개 기능 여부 시험" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:316 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:737 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "파일이 수정되지 않으면 사이트 관리자를 사용할 수 없습니다." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -6758,7 +7248,7 @@ "다른 FileZilla 3 실행본에서 사이트 관리자를 연 상태입니다.\n" "사이트 관리자의 변경 내용이 저장되지 않게 됩니다. 계속 진행하시겠습니까?" -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -6766,52 +7256,61 @@ "다른 FileZilla 3 실행본에서 사이트 관리자를 연 상태입니다.\n" "해당 사이트 관리자를 닫지 않으면 데이터를 삭제할 수 없습니다." -#: ../../locales/../src/interface/xmlfunctions.cpp:431 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "XML 문서가 well-formed되지 않았음: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:642 #, c-format msgid "The address you entered was: %s" msgstr "사용자가 입력한 주소: %s" -#: ../../locales/../src/engine/socket.cpp:1244 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "The ai_family member is not supported" -msgstr "" +msgstr "ai_family 요소는 지원되지 않습니다" -#: ../../locales/../src/engine/socket.cpp:1257 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "The ai_socktype member is not supported" msgstr "ai_socktype 멤버는 지원되지 않음" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:820 -#: ../../locales/../src/interface/sitemanager.cpp:732 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:779 +#: ../../locales/../src/interface/sitemanager.cpp:670 msgid "The bookmark could not be added." msgstr "북마크를 추가하지 못했습니다." -#: ../../locales/../src/interface/sitemanager.cpp:817 +#: ../../locales/../src/interface/sitemanager.cpp:747 msgid "The bookmarks could not be cleared." msgstr "북마크를 비우지 못했습니다." -#: ../../locales/../src/interface/statusbar.cpp:454 +#: ../../locales/../src/interface/statusbar.cpp:464 msgid "The connection is encrypted. Click icon for details." msgstr "연결이 암호화 되었습니다. 상세 정보는 아이콘을 클릭하십시오." +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 +msgid "" +"The custom date format is invalid or contains unsupported format specifiers." +msgstr "" +"사용자 정의 날짜 형식이 부적합하거나 그 안의 형식 지정어가 지원되지 않는 것입" +"니다." + #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." msgstr "사용자 로그인 절차는 비워 둘 수 없습니다." -#: ../../locales/../src/engine/transfersocket.cpp:169 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 +msgid "" +"The custom time format is invalid or contains unsupported format specifiers." +msgstr "" +"사용자 정의 시간 형식이 부적합하거나 그 안의 형식 지정어가 지원되지 않는 것입" +"니다." + +#: ../../locales/../src/engine/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "데이터 연결을 수립하지 못함: %s" -#: resources.h:362 ../../locales/../src/interface/edithandler.cpp:1564 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/edithandler.cpp:1512 msgid "The default editor for text files could not be found." msgstr "텍스트 파일의 기본 편집기를 찾을 수 없습니다." -#: resources.h:361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "텍스트 파일의 기본 편집기는 '%s'입니다." @@ -6822,13 +7321,13 @@ msgid "The entered filter name already exists, please choose a different name." msgstr "입력된 필터명이 이미 존재합니다. 다른 이름을 선택해주세요." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "'%s' 확장자명이 이미 존재함" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:246 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:253 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 #, c-format msgid "" "The file %s already exists.\n" @@ -6837,9 +7336,8 @@ "%s 파일이 이미 존재합니다.\n" "새로운 이름을 입력하십시오:" -#: ../../locales/../src/interface/LocalListView.cpp:1725 -#: ../../locales/../src/interface/LocalListView.cpp:1854 -#: ../../locales/../src/interface/RemoteListView.cpp:2419 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1731 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -6850,19 +7348,27 @@ "연결된 프로그램(%s)을 찾을 수 없습니다.\n" "파일 형식 연결을 확인해보시기 바랍니다." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"'%s' 파일에 SSH1 키가 들어 있습니다. SSH1 프로토콜은 사용 중단 권고 상태이며 " +"FileZilla는 SSH2 키만 지원합니다." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "'%s' 파일은 열지 못하거나 개인 키가 들어있지 않습니다." -#: ../../locales/../src/interface/xmlfunctions.cpp:63 +#: ../../locales/../src/interface/xmlfunctions.cpp:42 #, c-format msgid "The file '%s' could not be loaded." msgstr "'%s' 파일을 불러들이지 못했습니다." -#: ../../locales/../src/interface/LocalListView.cpp:1719 -#: ../../locales/../src/interface/LocalListView.cpp:1849 -#: ../../locales/../src/interface/RemoteListView.cpp:2413 +#: ../../locales/../src/interface/edithandler.cpp:1617 +#: ../../locales/../src/interface/LocalListView.cpp:1727 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6871,8 +7377,8 @@ "'%s' 파일을 열 수 없음:\n" "이 파일 유형에 연결된 프로그램이 없습니다." -#: ../../locales/../src/interface/LocalListView.cpp:1764 -#: ../../locales/../src/interface/LocalListView.cpp:1862 +#: ../../locales/../src/interface/edithandler.cpp:1734 +#: ../../locales/../src/interface/LocalListView.cpp:1739 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6881,44 +7387,32 @@ "'%s' 파일을 열 수 없음:\n" "연결된 명령어 실패" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../../locales/../src/interface/import.cpp:57 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:744 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"'%s' 파일은 FileZilla에서 지원하지 않습니다.\n" -"또한 비밀번호로 보호되어 있습니다. 비밀번호로 보호된 키 파일은 FileZilla에서 " -"아직 지원되지 않습니다.\n" -"지원되는 보호되지 않는 형식으로 변환하시겠습니까?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" +msgstr "" +"'%s' 파일은 보다 나중 버전의 FileZilla에서 만든 것입니다.\n" +"새로운 버전으로 만든 파일을 로딩하면 데이터가 손실될 수 있습니다.\n" +"계속 진행하시겠습니까?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" "Would you like to convert it into a supported format?" msgstr "" -"%s' 파일은 FileZilla에서 지원하지 않습니다.\n" +"%s' 파일은 FileZilla에서 지원하지 않는 형식입니다.\n" "지원되는 형식으로 변환하시겠습니까?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"'%s' 파일은 비밀번호로 보호되어 있습니다. 비밀번호로 보호된 키 파일은 " -"FileZilla에서 아직 지원하지 않습니다.\n" -"보호되지 않는 파일로 변환하시겠습니까?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "기본 편집기로 선택한 파일이 존재하지 않습니다." -#: ../../locales/../src/interface/import.cpp:85 +#: ../../locales/../src/interface/import.cpp:86 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -6932,11 +7426,11 @@ "있습니다.\n" "그래도 가져오시겠습니까?" -#: ../../locales/../src/interface/listctrlex.cpp:749 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "파일명 열은 숨기거나 이동할 수 없습니다." -#: ../../locales/../src/interface/listctrlex.cpp:799 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "파일명 열은 숨길 수 없습니다." @@ -6950,19 +7444,19 @@ msgid "The following characters will be replaced: %s" msgstr "바꾸게 되는 글자: %s" -#: resources.h:266 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 msgid "The following files are currently being edited:" msgstr "아래 파일들이 현재 편집 중임:" -#: resources.h:401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3420 msgid "The free open source FTP solution" msgstr "자유 오픈 소스 FTP 솔루션" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:298 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:281 msgid "The global bookmarks could not be saved." msgstr "전역 북마크를 저장하지 못했습니다." -#: resources.h:950 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -6975,7 +7469,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "제한 값은 1 ~ 2000 MB 사이여야 합니다." -#: ../../locales/../src/interface/state.cpp:275 +#: ../../locales/../src/interface/state.cpp:1003 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "'%s' 파일을 불러들이지 못했습니다." + +#: ../../locales/../src/interface/state.cpp:988 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "로컬 디렉터리 '%s' 존재하지 않음." + +#: ../../locales/../src/interface/state.cpp:243 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -6984,7 +7488,7 @@ "로컬 디렉터리 '%s'는 동기화 루트(%s) 하위에 있지 않습니다.\n" "탐색 동기화를 중지하고 로컬 디렉터리를 변경하시겠습니까?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -6992,19 +7496,24 @@ "사용 가능한 가장 작은 포트 번호는 사용 가능한 가장 큰 포트 번호보다 작거나 같" "아야 합니다." -#: resources.h:1038 +#: ../../locales/../src/interface/resources/xrc/update.xrc:117 msgid "The new version could not be downloaded, please retry later." msgstr "새 버전을 다운로드하지 못했습니다. 나중에 다시 해보세요." -#: resources.h:1036 +#: ../../locales/../src/interface/resources/xrc/update.xrc:104 msgid "The new version has been saved in your Downloads directory." -msgstr "" +msgstr "새 버전이 다운로드 디렉터리에 저장됐습니다." -#: ../../locales/../src/interface/QueueView.cpp:1968 +#: ../../locales/../src/interface/QueueView.cpp:1452 msgid "The queue will not be saved." msgstr "대기열이 저장되지 않습니다." -#: ../../locales/../src/interface/state.cpp:991 +#: ../../locales/../src/interface/state.cpp:916 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "리모트 디렉터리 '%s' 존재하지 않음." + +#: ../../locales/../src/interface/state.cpp:959 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7017,45 +7526,45 @@ msgid "The selected categories have been imported." msgstr "선택하신 구분 항목을 가져왔습니다." -#: resources.h:236 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 msgid "" "The selected file contains importable data for the following categories:" msgstr "선택하신 파일에서 가져올 수 있는 데이터 구분은 다음과 같습니다." -#: resources.h:259 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 msgid "The selected file is already being edited:" msgstr "선택된 파일이 이미 편집 중임:" -#: ../../locales/../src/interface/RemoteListView.cpp:2473 +#: ../../locales/../src/interface/edithandler.cpp:1721 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "선택된 파일이 이미 다른 응용 프로그램에서 사용 중입니다, 먼저 닫아 주십시오." -#: ../../locales/../src/interface/LocalListView.cpp:1731 -#: ../../locales/../src/interface/RemoteListView.cpp:2425 +#: ../../locales/../src/interface/edithandler.cpp:1627 msgid "" "The selected file would be executed directly.\n" -"This can be dangerous and damage your system.\n" +"This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" "선택된 파일은 직접 실행됩니다.\n" -"이는 시스템에 장애를 초래할 수 있습니다.\n" +"이는 위험하여 시스템을 손상시킬 수 있습니다.\n" "정말 계속하시겠습니까?" -#: ../../locales/../src/interface/sitemanager.cpp:617 +#: ../../locales/../src/interface/sitemanager.cpp:573 msgid "The server could not be added." msgstr "서버를 추가하지 못했습니다." -#: ../../locales/../src/interface/netconfwizard.cpp:574 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "The server sent an unexpected or unrecognized reply." msgstr "서버가 예기치 않았거나 인식할 수 없는 응답을 보냈습니다." -#: resources.h:989 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "The server uses following charset encoding for filenames:" msgstr "서버에서 파일명에 사용하는 문자셋 인코딩:" -#: resources.h:2 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 msgid "" "The server's certificate is unknown. Please carefully examine the " "certificate to make sure the server can be trusted." @@ -7063,7 +7572,7 @@ "알 수 없는 서버 인증서입니다. 신뢰할 수 있는 서버인지 인증서를 잘 확인하십시" "오." -#: resources.h:149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7072,7 +7581,7 @@ "서버의 호스트 키가 저장된 키와 일치하지 않습니다. 이는 관리자가 호스트 키를 " "바꿨거나 사용자가 실제로는 서버를 사칭하는 다른 컴퓨터에 연결하는 것입니다." -#: resources.h:137 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7080,7 +7589,7 @@ "서버의 호스트 키가 레지스트리에 저장되어 있지 않습니다. 서버가 사용자가 알고 " "있는 그 컴퓨터라고 보증할 수 없습니다." -#: ../../locales/../src/engine/socket.cpp:1256 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "The servname parameter is not supported for ai_socktype" msgstr "" @@ -7091,23 +7600,23 @@ msgstr "" "설정을 가져왔습니다. 변경된 내용을 적용하려면 FileZilla를 재시작해야 합니다." -#: ../../locales/../src/engine/socket.cpp:1205 +#: ../../locales/../src/engine/socket.cpp:1024 msgid "The specified address family is not supported" msgstr "지정된 주소군은 지원되지 않음" -#: ../../locales/../src/engine/socket.cpp:1269 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "The specified network name is no longer available" -msgstr "" +msgstr "지정된 네트워크 이름이 지금은 사용 가능하지 않습니다" -#: ../../locales/../src/interface/QueueView.cpp:3228 +#: ../../locales/../src/interface/QueueView.cpp:2605 msgid "The system will soon reboot unless you click Cancel." msgstr "취소를 누르지 않으면 시스템이 곧 재시작됩니다." -#: ../../locales/../src/interface/QueueView.cpp:3224 +#: ../../locales/../src/interface/QueueView.cpp:2601 msgid "The system will soon shut down unless you click Cancel." msgstr "취소를 누르지 않으면 시스템이 곧 종료됩니다." -#: resources.h:58 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 msgid "" "The target file already exists.\n" "Please choose an action." @@ -7115,30 +7624,35 @@ "대상 파일이 이미 존재합니다.\n" "동작을 선택하십시오." -#: ../../locales/../src/interface/netconfwizard.cpp:852 +#: ../../locales/../src/interface/netconfwizard.cpp:863 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "시험이 성공하지 않았습니다. 정말 설정을 저장하시겠습니까?" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 +#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#, c-format +msgid "The valid backup file %s could not be restored" +msgstr "'%s' 파일을 불러들이지 못했습니다." + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "테마" -#: ../../locales/../src/interface/filter.cpp:462 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "이 필터 설정은 삭제할 수 없습니다." -#: ../../locales/../src/interface/filter.cpp:397 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "이 필터 설정은 이름을 변경할 수 없습니다." -#: ../../locales/../src/interface/netconfwizard.cpp:575 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." msgstr "" "이것은 어떤 라우터나 방화벽이 여전히 FileZilla에 영향을 주고 있는 것입니다." -#: resources.h:655 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:183 msgid "" "This only works if you are not behind a router, else your system would just " "return your internal address." @@ -7146,7 +7660,7 @@ "이 기능은 라우터에 연동되지 않은 경우만 작동합니다. 그렇지 않으면 사용자의 내" "부 주소밖에 알아내지 못합니다." -#: resources.h:633 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 msgid "" "This wizard will help you to properly configure any routers and firewalls " "you have and tests your configuration." @@ -7154,51 +7668,48 @@ "이 마법사는 사용자의 라우터와 방화벽을 적절히 구성하고 구성 내용을 시험할 수 " "있도록 안내합니다." -#: ../../locales/../src/interface/queue.cpp:1222 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Time" msgstr "시간" -#: resources.h:857 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 msgid "Time formatting" msgstr "시간 형식" -#: resources.h:694 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 msgid "Time&out in seconds:" msgstr "시간 초과 설정(초)(&O):" -#: resources.h:697 ../../locales/../src/interface/QueueView.cpp:1061 -#: ../../locales/../src/interface/QueueView.cpp:1105 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "시간 초과" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1722 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1083 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1618 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1038 #, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "시간대 오차: 서버: %d 초. 로컬: %d 초. 차이: %d 초." +msgid "Timezone offset of server is %d seconds." +msgstr "서버의 시간대 차이는 %d초입니다." -#: ../../locales/../src/interface/verifycertdialog.cpp:184 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "제목:" -#: ../../locales/../src/interface/Mainfrm.cpp:2358 +#: ../../locales/../src/interface/Mainfrm.cpp:2196 msgid "To compare directories, both file lists have to be aligned." msgstr "디렉터리를 비교하려면 양쪽 파일 목록이 정렬되어야 합니다." -#: ../../locales/../src/interface/Mainfrm.cpp:2359 +#: ../../locales/../src/interface/Mainfrm.cpp:2197 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "이를 위해 디렉터리 트리는 모두 보이거나 모두 숨겨져야 합니다." -#: resources.h:748 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." msgstr "공인 키 인증을 지원하려면 FileZilla가 사용할 개인 키를 알아야 합니다." -#: resources.h:1022 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7214,7 +7725,7 @@ "녹색: 파일이 반대쪽에 표시되지 않은 파일보다 새 파일임\n" "빨간색: 파일 크기가 다름" -#: resources.h:1024 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7224,207 +7735,206 @@ "설정하면 로컬 디렉터리 간에 이동할 때 그에 따라 서버의 디렉터리도 이동하게 되" "며 그 반대도 마찬가지입니다." -#: resources.h:1012 resources.h:1013 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 msgid "Toggles processing of the transfer queue" msgstr "전송 대기열 처리 여부" -#: resources.h:1004 resources.h:1005 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 msgid "Toggles the display of the local directory tree" msgstr "로컬 디렉터리 트리 표시 여부" -#: resources.h:1002 resources.h:1003 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 msgid "Toggles the display of the message log" msgstr "메시지 로그 표시 여부" -#: resources.h:1006 resources.h:1007 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 msgid "Toggles the display of the remote directory tree" msgstr "서버 디렉터리 트리 표시 여부" -#: resources.h:1008 resources.h:1009 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 msgid "Toggles the display of the transfer queue" msgstr "전송 대기열 표시 여부" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:590 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "너무 긴 헤더 라인" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:665 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "너무 많은 리다이렉트" -#: ../../locales/../src/engine/logging.cpp:126 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:350 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:355 msgid "Trace:" msgstr "추적:" -#: resources.h:894 resources.h:900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 msgid "Transfer" msgstr "전송" -#: resources.h:299 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 msgid "Transfer &direction" msgstr "전송 방향(&D)" -#: resources.h:476 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 msgid "Transfer &type" msgstr "전송 유형(&T)" -#: resources.h:704 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 msgid "Transfer Mode" msgstr "전송 모드" -#: resources.h:844 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Transfer Queue" msgstr "전송 대기열" -#: resources.h:981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "Transfer Settings" msgstr "전송 설정" -#: ../../locales/../src/engine/transfersocket.cpp:495 -#: ../../locales/../src/engine/transfersocket.cpp:517 +#: ../../locales/../src/engine/transfersocket.cpp:443 +#: ../../locales/../src/engine/transfersocket.cpp:465 #, c-format msgid "Transfer connection interrupted: %s" msgstr "전송 연결 장애: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Transferred data got tainted." msgstr "전송된 데이터가 손상되었습니다." -#: ../../locales/../src/interface/QueueView.cpp:1490 -#: ../../locales/../src/interface/statuslinectrl.cpp:275 +#: ../../locales/../src/interface/queue.cpp:339 +#: ../../locales/../src/interface/statuslinectrl.cpp:245 msgid "Transferring" msgstr "전송 중" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 msgid "Transfers" msgstr "전송" -#: ../../locales/../src/interface/QueueView.cpp:3124 -#: ../../locales/../src/interface/QueueView.cpp:3127 +#: ../../locales/../src/interface/QueueView.cpp:2494 msgid "Transfers finished" msgstr "전송 완료" -#: resources.h:796 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 msgid "Treat files &without extension as ASCII file" msgstr "확장자명이 없으면 아스키 파일로 취급(&W)" -#: resources.h:792 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 msgid "Treat the &following filetypes as ASCII files:" msgstr "다음의 파일 유형을 아스키 파일로 취급(&F)" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:834 msgid "Trust changed Hostkey:" msgstr "변경된 호스트 키 신뢰:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:875 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 msgid "Trust new Hostkey:" msgstr "새 호스트 키 신뢰:" -#: resources.h:156 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 msgid "Trust the new key and carry on connecting?" msgstr "새로운 키를 신뢰하고 연결에 사용하시겠습니까?" -#: resources.h:27 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" msgstr "이 인증서를 신뢰하고 연결하시겠습니까?" -#: resources.h:143 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 msgid "Trust this host and carry on connecting?" msgstr "이 호스트를 신뢰하고 연결에 사용하시겠습니까?" -#: resources.h:1039 resources.h:1044 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 +#: ../../locales/../src/interface/resources/xrc/update.xrc:201 msgid "Try again" -msgstr "" +msgstr "다시 시도" -#: resources.h:334 ../../locales/../src/interface/edithandler.cpp:1113 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 +#: ../../locales/../src/interface/edithandler.cpp:1086 msgid "Type" msgstr "유형" -#: resources.h:730 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 msgid "Type of FTP Proxy:" msgstr "FTP 프록시 유형:" -#: resources.h:755 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 msgid "Type of generic proxy:" msgstr "일반 프록시 유형:" -#: resources.h:269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 msgid "U&pload" msgstr "업로드(&P)" -#: resources.h:423 resources.h:776 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3704 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "업로드 제한(&P):" -#: resources.h:912 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 msgid "U&se filetype associations if available" msgstr "가능한 경우 파일 연동 체계 사용(&S)" -#: resources.h:858 -msgid "U&se system defaults" -msgstr "시스템 기본값 사용(&S)" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +msgid "U&se system defaults for current language" +msgstr "현재 언어에 시스템 기본 값 사용(&s)" -#: resources.h:732 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "사용자@호스트" -#: ../../locales/../src/engine/proxy.cpp:413 -#: ../../locales/../src/engine/proxy.cpp:557 +#: ../../locales/../src/engine/proxy.cpp:405 +#: ../../locales/../src/engine/proxy.cpp:532 #, c-format msgid "Unassigned error code %d" msgstr "미지정 오류 코드 %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:183 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "단위:" -#: ../../locales/../src/interface/edithandler.cpp:1145 -#: ../../locales/../src/interface/edithandler.cpp:1173 +#: ../../locales/../src/interface/edithandler.cpp:1118 +#: ../../locales/../src/interface/edithandler.cpp:1146 msgid "Unknown" msgstr "알 수 없음" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:714 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:682 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "FTP 프록시 유형을 알 수 없습니다. 로그인 할 수 없습니다." -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:453 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "알 수 없는 SOCKS 프로토콜 버전: %d" -#: resources.h:1 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:4 msgid "Unknown certificate" msgstr "알 수 없는 인증서" -#: ../../locales/../src/interface/xmlfunctions.cpp:419 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" -"파일 여는 중 알 수 없는 오류 발생. 파일을 열 수 있는지, well-formed XML 문서" -"인지 확인하세요." - -#: resources.h:136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "알 수 없는 호스트키" -#: ../../locales/../src/engine/proxy.cpp:481 +#: ../../locales/../src/engine/proxy.cpp:461 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "" -#: ../../locales/../src/interface/xmlfunctions.cpp:464 +#: ../../locales/../src/interface/xmlfunctions.cpp:304 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "알 수 없는 최상위 요소. FileZilla가 만든 파일이 아닌 것으로 보입니다." -#: ../../locales/../src/interface/netconfwizard.cpp:596 -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7432,7 +7942,7 @@ "이 문제를 수정하지 않으면 능동형 모드 FTP는 작동하지 않으며 수동형 모드가 사" "용됩니다." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:607 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7440,131 +7950,139 @@ "이 문제를 수정하지 않으면 능동형 모드 FTP는 작동하지 않으며 수동형 모드가 사" "용됩니다." -#: ../../locales/../src/engine/tlssocket.cpp:1061 +#: ../../locales/../src/engine/tlssocket.cpp:1153 msgid "Unsupported certificate type" msgstr "지원되지 않는 인증서 유형" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:650 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "지원되지 않는 리다이렉트" -#: resources.h:270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "Up&load and unedit" msgstr "업로드 및 미편집(&L)" #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:113 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 msgid "Updates" msgstr "업데이트" -#: resources.h:301 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Upload" msgstr "업로드" -#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/edithandler.cpp:1109 msgid "Upload failed" msgstr "업로드 실패" -#: ../../locales/../src/interface/statusbar.cpp:573 +#: ../../locales/../src/interface/statusbar.cpp:586 #, c-format msgid "Upload limit: %s/s" msgstr "업로드 제한: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:588 msgid "Upload limit: none" msgstr "업로드 제한: 없음" -#: resources.h:608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3236 +#: ../../locales/../src/interface/search.cpp:865 +msgid "Upload search results" +msgstr "검색 결과 업로드" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "Upload selected directory" msgstr "선택된 디렉터리 업로드" -#: resources.h:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 msgid "Upload selected files and directories" msgstr "선택된 파일 및 디렉터리 업로드" -#: resources.h:254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Upload this file back to the server?" msgstr "이 파일을 서버로 다시 업로드하시겠습니까?" -#: resources.h:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 msgid "Upload this file to the server?" msgstr "이 파일을 서버로 업로드하시겠습니까?" -#: ../../locales/../src/interface/edithandler.cpp:1130 -#: ../../locales/../src/interface/edithandler.cpp:1164 -#: ../../locales/../src/interface/edithandler.cpp:1329 +#: ../../locales/../src/interface/edithandler.cpp:1103 +#: ../../locales/../src/interface/edithandler.cpp:1137 +#: ../../locales/../src/interface/edithandler.cpp:1293 msgid "Uploading" msgstr "업로드" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1331 +#: ../../locales/../src/interface/edithandler.cpp:1106 +#: ../../locales/../src/interface/edithandler.cpp:1295 msgid "Uploading and pending removal" msgstr "업로드 및 제거 보류" -#: ../../locales/../src/interface/edithandler.cpp:1167 -#: ../../locales/../src/interface/edithandler.cpp:1333 +#: ../../locales/../src/interface/edithandler.cpp:1140 +#: ../../locales/../src/interface/edithandler.cpp:1297 msgid "Uploading and unediting" msgstr "업로드 및 미편집" -#: resources.h:993 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:558 msgid "Use &custom charset" msgstr "문자셋 직접 설정(&c)" -#: resources.h:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Use &custom editor:" msgstr "사용자 편집기 사용(&C)" -#: resources.h:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "텍스트 파일의 기본 편집기 사용(&d)" -#: resources.h:343 resources.h:349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "탐색 동기화 사용(&s)" -#: resources.h:991 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:546 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "서버가 UTF-8을 지원하면 사용, 아니면 로컬 문자셋 사용." -#: resources.h:196 resources.h:206 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 msgid "Use default action" msgstr "기본 동작 사용(&D)" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:514 -msgid "Use plain FTP" -msgstr "일반 FTP 사용" +#: ../../locales/../src/interface/sitemanager_dialog.cpp:508 +msgid "Use explicit FTP over TLS if available" +msgstr "TLS를 통한 명시적 FTP가 가능한 경우 사용" -#: resources.h:309 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 msgid "Use server currently connected to" msgstr "현재 연결된 서버 사용" -#: resources.h:310 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 msgid "Use server from site manager" msgstr "사이트 관리자 내 서버 사용" -#: resources.h:853 -msgid "Use system &defaults" -msgstr "시스템 기본값 사용(&D)" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +msgid "Use system &defaults for current language" +msgstr "현재 언어에 시스템 기본 값 사용(&d)" -#: resources.h:656 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" msgstr "다음의 IP 주소 사용:" -#: resources.h:666 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 msgid "Use the following port range:" msgstr "다음의 포트 범위 사용:" -#: resources.h:651 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 msgid "Use the server's external IP address instead" msgstr "서버의 외부 IP 주소 사용" -#: resources.h:657 resources.h:720 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" "라우터에 연동되어 있고 고정 외부 IP 주소가 있는 경우 여기에 입력하세요." -#: resources.h:660 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 msgid "" "Use this option if you have a dynamic IP address. FileZilla will contact the " "above server once each session as soon as you use active mode for the first " @@ -7574,30 +8092,25 @@ "모드를 사용할 때 세션 당 한번만 위 서버에 접속합니다. 서버로 제공되는 정보는 " "FileZilla의 버전뿐입니다." -#: resources.h:86 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 msgid "User:" msgstr "사용자:" -#: ../../locales/../src/interface/manual_transfer.cpp:518 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/manual_transfer.cpp:495 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 msgid "Username cannot be a series of spaces" msgstr "사용자명은 공백의 연속일 수 없습니다" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464 -#, c-format -msgid "Using proxy %s" -msgstr "%s 프록시 사용" - -#: resources.h:995 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:586 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "문자셋을 잘못 지정하면 파일명이 올바르게 표시되지 않을 수 있습니다." -#: resources.h:5 resources.h:34 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" msgstr "유효 시작일:" -#: resources.h:6 resources.h:35 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" msgstr "유효 종료일:" @@ -7605,84 +8118,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "wxWidgets으로부터 상세 로그 메시지" -#: ../../locales/../src/engine/tlssocket.cpp:1147 +#: ../../locales/../src/engine/tlssocket.cpp:1203 msgid "Verifying certificate..." msgstr "인증서 검증..." -#: resources.h:131 -msgid "Version:" -msgstr "버전:" - -#: resources.h:781 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "매우 높음" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1455 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1388 msgid "View hidden option set, but unsupported by server" msgstr "숨김 설정 보기, 그러나 서버에 의해 지원되지 않음" -#: resources.h:896 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 msgid "View/Edit" msgstr "보기/편집" -#: resources.h:293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 msgid "Visible columns" msgstr "표시 가능 열" -#: resources.h:101 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "W&rite" msgstr "쓰기(&R)" -#: ../../locales/../src/interface/QueueView.cpp:1797 -msgid "Waiting" -msgstr "대기 중" - -#: ../../locales/../src/interface/QueueView.cpp:1393 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "브라우징 연결 대기 중" -#: ../../locales/../src/interface/QueueView.cpp:1440 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "비밀번호 대기 중" -#: ../../locales/../src/interface/statuslinectrl.cpp:269 +#: ../../locales/../src/interface/statuslinectrl.cpp:239 msgid "Waiting for transfer to be cancelled" msgstr "전송이 취소되도록 기다림" -#: ../../locales/../src/engine/engineprivate.cpp:203 +#: ../../locales/../src/engine/engineprivate.cpp:230 msgid "Waiting to retry..." msgstr "재시도 대기..." -#: ../../locales/../src/interface/FileZilla.cpp:310 -msgid "" -"Warning!\n" -"\n" -"A bug in Windows causes problems with FileZilla\n" -"\n" -"The bug occurs if you have\n" -"- Windows Server 2003 or XP 64\n" -"- Windows Firewall enabled\n" -"- Application Layer Gateway service enabled\n" -"See http://support.microsoft.com/kb/931130 for background information.\n" -"\n" -"Unless you either disable Windows Firewall or the Application Layer Gateway " -"service,\n" -"FileZilla will timeout on big transfers." -msgstr "" -"경고!\n" -"\n" -"Windows의 버그로 FileZilla에 문제가 발생합니다.\n" -"\n" -"다음의 경우 버그가 발생합니다.\n" -"- Windows 서버 2003 또는 XP 64\n" -"- Windows 방화벽 작동시\n" -"- 애플리케이션 레이어 게이트웨이 서비스 작동시\n" -"이에 대한 정보는 http://support.microsoft.com/kb/931130 을 참고하세요.\n" -"\n" -"방화벽이나 애플리케이션 레이어 게이트웨이 서비스를 중지하지 않으면\n" -"대용량 전송시 FileZilla에 시간 초과가 발생할 수 있습니다." - -#: ../../locales/../src/interface/netconfwizard.cpp:972 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Warning, ignoring data connection from wrong IP." msgstr "경고, 잘못된 IP로부터의 데이터 연결을 무시함" @@ -7701,23 +8177,23 @@ "\n" "정말 야간 빌드 업데이트를 확인하시겠습니까?" -#: resources.h:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 msgid "Warning: Potential security breach!" msgstr "경고: 잠재적인 보안 침투!" -#: resources.h:413 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "Welcome to FileZilla" msgstr "FileZilla 안내" -#: resources.h:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3450 msgid "What's new" msgstr "새 소식" -#: resources.h:1033 +#: ../../locales/../src/interface/resources/xrc/update.xrc:61 msgid "What's new:" msgstr "새 소식:" -#: resources.h:430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3778 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -7725,7 +8201,7 @@ "FileZilla에서 비밀번호를 기억하도록 하면 새로 시작한 후에도 비밀번호를 다시 " "입력하지 않고 재연결할 수 있습니다." -#: resources.h:784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -7733,36 +8209,40 @@ "이 기능을 설정하면 파일을 다운로드할 때 파일명에 로컬 운영 체계에서 지원하지 " "않는 글자가 있으면 다른 글자로 바꿉니다." -#: resources.h:839 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 msgid "When st&arting a new connection while already connected:" -msgstr "" +msgstr "이미 연결된 상태에서 새로 연결을 시작하는 경우(&a):" -#: resources.h:826 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 msgid "Widescreen" msgstr "와이드스크린" -#: resources.h:429 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3773 msgid "Would you like FileZilla to remember passwords?" -msgstr "" +msgstr "FileZilla에서 비밀번호를 기억하도록 하시겠습니까?" -#: resources.h:105 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Wr&ite" msgstr "쓰기(&I)" -#: ../../locales/../src/interface/netconfwizard.cpp:433 -#: ../../locales/../src/interface/netconfwizard.cpp:440 +#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:463 msgid "Wrong external IP address" msgstr "잘못된 외부 IP 주소" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:813 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "잘못된 라인 엔딩" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:889 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 msgid "Yes" msgstr "예" -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:783 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -7770,33 +8250,34 @@ "사용자의 컴퓨터에서는 IPv6만 사용하는 것으로 보입니다. 이 마법사에서는 지원되" "지 않습니다." -#: resources.h:1047 +#: ../../locales/../src/interface/resources/xrc/update.xrc:245 msgid "You are using the latest version of FileZilla." msgstr "FileZilla 최신 버전을 사용하고 계십니다." -#: resources.h:411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3559 msgid "You can always open this dialog again through the help menu." msgstr "이 대화 창은 도움말 메뉴에서 다시 열 수 있습니다." -#: resources.h:1041 resources.h:1046 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "You can download the latest version from the FileZilla website:" msgstr "FileZilla 웹사이트에서 최신 버전을 다운로드할 수 있습니다." -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:66 msgid "You can leave the port field empty to use the default port." msgstr "포트 필드를 비워두면 기본 포트를 사용합니다." -#: resources.h:108 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "원래 파일의 권한을 유지하려면 해당 자리에 x를 지정하면 됩니다." -#: ../../locales/../src/interface/import.cpp:27 +#: ../../locales/../src/interface/import.cpp:28 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "FileZilla의 설정 디렉터리로부터 설정값을 가져올 수 없습니다." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:145 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 msgid "" "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." @@ -7804,64 +8285,72 @@ "비정상 글자를 다시 비정상 글자로 바꿀 수 없습니다. 파일명에 사용할 수 있는 글" "자를 입력해주세요." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "새 파일명을 입력하지 않았습니다. 덮어쓰시겠습니까?" -#: resources.h:392 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "You have selected at least one symbolic link." msgstr "심볼릭 링크가 하나 이상 선택되었습니다." -#: ../../locales/../src/interface/LocalListView.cpp:1698 -#: ../../locales/../src/interface/RemoteListView.cpp:2392 +#: ../../locales/../src/interface/edithandler.cpp:1588 +#: ../../locales/../src/interface/search.cpp:1149 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "10개 이상의 파일을 선택하여 편집하려고 합니다. 정말 편집하시겠습니까?" -#: ../../locales/../src/interface/LocalListView.cpp:1817 +#: ../../locales/../src/interface/LocalListView.cpp:1697 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "" "10개 이상의 파일이나 디렉터리를 선택하여 열려고 합니다. 정말 여시겠습니까?" -#: ../../locales/../src/interface/manual_transfer.cpp:433 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:946 +#: ../../locales/../src/interface/manual_transfer.cpp:415 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:953 msgid "You have to enter a hostname." msgstr "호스트명을 입력해야 합니다." -#: ../../locales/../src/interface/search.cpp:510 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 +msgid "You have to enter a key file path" +msgstr "키 파일 경로를 입력해야 합니다." + +#: ../../locales/../src/interface/search.cpp:851 msgid "You have to enter a local directory." msgstr "로컬 디렉터리를 입력해야 합니다." -#: ../../locales/../src/interface/netconfwizard.cpp:149 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "유효한 IP 주소를 입력해야 합니다." +#: ../../locales/../src/interface/search.cpp:865 +msgid "You have to enter a remote directory." +msgstr "원격 디렉터리를 입력해야 합니다." + +#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "유효한 IPv4 주소를 입력해야 합니다." -#: ../../locales/../src/interface/search.cpp:516 +#: ../../locales/../src/interface/search.cpp:856 msgid "You have to enter a writable local directory." msgstr "쓰기 가능한 로컬 디렉터리를 입력해야 합니다." -#: ../../locales/../src/interface/manual_transfer.cpp:529 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1048 +#: ../../locales/../src/interface/manual_transfer.cpp:506 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1053 msgid "You have to enter an account name" msgstr "계정명을 입력해야 합니다." -#: ../../locales/../src/interface/manual_transfer.cpp:499 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1019 +#: ../../locales/../src/interface/manual_transfer.cpp:480 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 msgid "You have to specify a user name" msgstr "사용자명을 지정해야 합니다." -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "" "사용자의 라우터나 방화벽이 전송 데이터를 수정하는 오류가 있는 것 같습니다." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:55 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 msgid "You need to enter a name for the bookmark." msgstr "북마크 이름을 입력해야 합니다." @@ -7869,7 +8358,7 @@ msgid "You need to enter a name for the log file." msgstr "로그 파일 이름을 입력해야 합니다." -#: ../../locales/../src/interface/edithandler.cpp:1520 +#: ../../locales/../src/interface/edithandler.cpp:1473 msgid "You need to enter a properly quoted command." msgstr "명령을 따옴표로 적절히 묶어 입력해야 합니다." @@ -7882,15 +8371,15 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "프록시 포트는 1 ~ 65535 범위로 입력해야 합니다." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:76 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:446 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1108 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:427 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1130 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "경로 하나는 입력해야 합니다. 북마크를 공백으로 만들 수 없습니다." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:83 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:453 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:433 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1137 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -7898,7 +8387,7 @@ "로컬과 리모트 경로를 모두 입력해야 이 북마크에 탐색 동기화를 설정할 수 있습니" "다." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1073 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -7906,23 +8395,23 @@ "로컬과 리모트 경로를 모두 입력해야 이 사이트에 탐색 동기화를 설정할 수 있습니" "다." -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "로컬 파일을 지정해야 합니다." -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "리모트 파일을 지정해야 합니다." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "리모트 경로를 지정해야 합니다." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "서버를 지정해야 합니다." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -7930,7 +8419,7 @@ "다른 서버로 접속하는데 아무런 문제가 없으면, 파일 전송이 제대로 작동할 것입니" "다." -#: ../../locales/../src/interface/QueueView.cpp:3232 +#: ../../locales/../src/interface/QueueView.cpp:2609 msgid "Your computer will suspend unless you click Cancel." msgstr "Cancel을 누르지 않으면 컴퓨터가 정지됩니다." @@ -7947,7 +8436,7 @@ msgstr "다음으로 시작" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 msgid "bytes" msgstr "바이트" @@ -7955,7 +8444,7 @@ msgid "contains" msgstr "다음을 포함" -#: ../../locales/../src/interface/updater.cpp:243 +#: ../../locales/../src/interface/updater.cpp:244 msgid "custom" msgstr "사용자 정의" @@ -7977,19 +8466,19 @@ msgid "equals" msgstr "다음과 일치" -#: ../../locales/../src/interface/filelistctrl.cpp:535 -#: ../../locales/../src/interface/filelistctrl.cpp:554 -#: ../../locales/../src/interface/filelistctrl.cpp:581 -#: ../../locales/../src/interface/filelistctrl.cpp:597 +#: ../../locales/../src/interface/filelistctrl.cpp:534 +#: ../../locales/../src/interface/filelistctrl.cpp:553 +#: ../../locales/../src/interface/filelistctrl.cpp:580 +#: ../../locales/../src/interface/filelistctrl.cpp:596 msgid "file" msgstr "파일" -#: ../../locales/../src/interface/edithandler.cpp:85 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -7999,11 +8488,15 @@ "이 실행 파일이 FileZilla 실행 파일과 같은 디렉터리 내에 존재하는지 확인하십시" "오." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:455 +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "fzsftp가 다른 버전의 FileZilla에서 나온 것임" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1519 msgid "fzsftp could not be started" msgstr "fzsftp를 시작할 수 없음" -#: ../../locales/../src/engine/tlssocket.cpp:1099 +#: ../../locales/../src/engine/tlssocket.cpp:1182 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers에서 인증서를 반환하지 않았습니다" @@ -8023,12 +8516,9 @@ msgid "group writeable" msgstr "그룹 쓰기 가능" -#: resources.h:863 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" -msgstr "" -"상세한 정보는 https://wiki.filezilla-project.org/Date_and_Time_formatting 페이" -"지를 참조하십시오." +msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "is equal to" @@ -8062,10 +8552,11 @@ msgid "owner writeable" msgstr "소유자 쓰기 가능" -#: ../../locales/../src/engine/tlssocket.cpp:1158 -#: ../../locales/../src/engine/tlssocket.cpp:1169 -#: ../../locales/../src/engine/tlssocket.cpp:1184 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29 +#: ../../locales/../src/engine/proxy.cpp:97 +#: ../../locales/../src/engine/tlssocket.cpp:1246 +#: ../../locales/../src/engine/tlssocket.cpp:1257 +#: ../../locales/../src/engine/tlssocket.cpp:1272 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 msgid "unknown" msgstr "알 수 없음" @@ -8081,193 +8572,6 @@ msgid "world writeable" msgstr "모두 쓰기 가능" -#: resources.h:126 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 msgid "wxWidgets:" msgstr "wxWidgets:" - -#~ msgid "%s (%d.%d KB/s)" -#~ msgstr "%s (%d.%d KB/s)" - -#~ msgid "%s (%d.%d MB/s)" -#~ msgstr "%s (%d.%d MB/s)" - -#~ msgid "%s bytes (%d B/s)" -#~ msgstr "%s 바이트 (%d B/s)" - -#~ msgid "%s bytes (%d.%d KB/s)" -#~ msgstr "%s 바이트 (%d.%d KB/s)" - -#~ msgid "%s bytes (%d.%d MB/s)" -#~ msgstr "%s 바이트 (%d.%d MB/s)" - -#~ msgid "&Check for beta versions of FileZilla" -#~ msgstr "FileZilla 베타 버전 확인(&C)" - -#~ msgid "&Copy" -#~ msgstr "복사(&C)" - -#~ msgid "&Enable automatic update check" -#~ msgstr "자동 업데이트 확인 기능 사용(&E)" - -#~ msgid "&Finish" -#~ msgstr "완료(&F)" - -#~ msgid "&Next >" -#~ msgstr "다음(&N) >" - -#~ msgid "&Number of days between update checks:" -#~ msgstr "업데이트 확인 간격 일 수(&N):" - -#~ msgid "(At least 7 days)" -#~ msgstr "(최소 7일)" - -#~ msgid ", %H:%M:%S left" -#~ msgstr ", %H:%M:%S 남음" - -#~ msgid ", --:--:-- left" -#~ msgstr ", --:--:-- 남음" - -#~ msgid "- Broken router and/or firewall" -#~ msgstr "- 라우터 또는 방화벽 이상" - -#~ msgid "- File corrupted on mirror" -#~ msgstr "- 미러의 파일 이상" - -#~ msgid "- Malware on your system" -#~ msgstr "- 이 컴퓨터의 악성 소프트웨어" - -#~ msgid "< &Back" -#~ msgstr "< 이전(&B)" - -#~ msgid "Advanced options:" -#~ msgstr "세부 옵션:" - -#~ msgid "" -#~ "Alternatively, visit https://filezilla-project.org/ to download the most " -#~ "recent version." -#~ msgstr "" -#~ "최신 버전을 다운로드하려면 https://filezilla-project.org/ 사이트를 방문하십" -#~ "시오." - -#~ msgid "C&heck for nightly builds of FileZilla" -#~ msgstr "FileZilla 야간 빌드 확인(&H)" - -#~ msgid "Check for &beta versions and release candidates" -#~ msgstr "베타 버전 및 릴리즈 후보 확인(&b)" - -#~ msgid "Click on next to download the new version." -#~ msgstr "새 버전을 다운로드하려면 다음을 누르십시오." - -#~ msgid "Connecting to server" -#~ msgstr "서버로 연결 중" - -#~ msgid "Cop&y" -#~ msgstr "복사(&Y)" - -#~ msgid "" -#~ "Do you really want to check for beta versions?\n" -#~ "Unless you want to test new features, keep using stable versions." -#~ msgstr "" -#~ "베타 버전을 확인하시겠습니까?\n" -#~ "새로 추가된 기능을 시험하는 경우가 아니면 안정된 버전을 사용하십시오." - -#~ msgid "Error, file name cannot be parsed." -#~ msgstr "오류: 파일 이름을 해석할 수 없습니다." - -#~ msgid "Error, local file exists but cannot be removed" -#~ msgstr "오류: 로컬 파일이 존재하지만 제거할 수 없습니다." - -#~ msgid "Executable" -#~ msgstr "실행 가능" - -#~ msgid "Failed to check for newer version of FileZilla." -#~ msgstr "새 FileZilla 버전 확인 실패." - -#~ msgid "" -#~ "In case you prefer automatic updates, you can enable automatic update " -#~ "checks in the settings dialog." -#~ msgstr "" -#~ "업데이트를 자동으로 하게 하려면 설정 창에서 자동 업데이트 확인을 지정하시" -#~ "면 됩니다." - -#~ msgid "Log of update check:" -#~ msgstr "업데이트 확인 로그:" - -#~ msgid "Package" -#~ msgstr "패키지" - -#~ msgid "" -#~ "Please check https://filezilla-project.org/ for the most recent version of " -#~ "FileZilla." -#~ msgstr "" -#~ "https://filezilla-project.org/에서 FileZilla의 최신 뉴스를 확인하십시오." - -#~ msgid "" -#~ "Please check the package manager of your system for an updated package or " -#~ "visit https://filezilla-project.org/ to download the source code of " -#~ "FileZilla." -#~ msgstr "" -#~ "패키지 업데이트를 위해 시스템의 패키지 관리자를 확인하거나, FileZilla의 소" -#~ "스코드를 다운로드하려면 https://filezilla-project.org/ 사이트를 방문하십시" -#~ "오." - -#~ msgid "Please enter an update interval of at least 7 days" -#~ msgstr "최소 7일 이상으로 업데이트 주기를 입력하십시오." - -#~ msgid "" -#~ "Please retry downloading the update. Possible reasons if the problem " -#~ "persists (listed in order of decreasing probability):" -#~ msgstr "" -#~ "업데이트 다운로드를 다시 해보세요. 문제가 재발하는 이유로 가능한 것은 다음" -#~ "과 같습니다(확률이 높은 순)." - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ for more information about " -#~ "FileZilla." -#~ msgstr "" -#~ "https://filezilla-project.org/ 사이트를 방문하시면 FileZilla에 대해 많은 정" -#~ "보를 구할 수 있습니다." - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ to download the most recent " -#~ "version." -#~ msgstr "" -#~ "https://filezilla-project.org/ 사이트를 방문하시면 최신 버전을 다운로드하실 " -#~ "수 있습니다." - -#~ msgid "Privacy policy:" -#~ msgstr "개인 정보 정책:" - -#~ msgid "Resolving hostname" -#~ msgstr "호스트명 해석" - -#~ msgid "Select download location for package" -#~ msgstr "패키지의 다운로드 위치 선택" - -#~ msgid "" -#~ "The most recent version has been downloaded. Click on Finish to close " -#~ "FileZilla and to start the installation." -#~ msgstr "" -#~ "최신 버전을 다운로드했습니다. 설치를 시작하려면 완료를 눌러 FileZilla를 닫" -#~ "은 후 재시작하십시오." - -#~ msgid "" -#~ "The most recent version has been downloaded. Please install it the same " -#~ "way you installed this version." -#~ msgstr "" -#~ "최신 버전이 다운로드됐습니다. 이전 버전과 같은 방법으로 설치하십시오." - -#~ msgid "Update wizard" -#~ msgstr "업데이트 마법사" - -#~ msgid "Using this wizard you can check for available updates to FileZilla." -#~ msgstr "이 마법사를 사용하면 FileZilla의 업데이트를 확인할 수 있습니다." - -#~ msgid "" -#~ "You are already using the most recent version of FileZilla. Please check " -#~ "again in future." -#~ msgstr "" -#~ "사용 중인 FileZilla는 이미 최신 버전입니다. 다음에 다시 확인해주세요." - -#~ msgid "Duplicate filter name" -#~ msgstr "파일명 중복" diff -Nru filezilla-3.15.0.2/locales/lt_LT.po filezilla-3.33.0/locales/lt_LT.po --- filezilla-3.15.0.2/locales/lt_LT.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/lt_LT.po 2017-09-19 21:36:39.000000000 +0000 @@ -1,39 +1,41 @@ # translation of lt_LT_updated.po to Lithuanian -# +# # Darius Žitkevičius , 2006. # Tomas Jakstas , 2008. # Darius Žitkevičius , 2008. # Algimantas Margevičius , 2012-2014. -# +# msgid "" msgstr "" "Project-Id-Version: lt_LT_updated\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-10 22:52+0100\n" -"PO-Revision-Date: 2014-02-24 10:43+0200\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2016-09-24 16:04+0200\n" +"PO-Revision-Date: 2016-09-14 13:55+0300\n" "Last-Translator: Algimantas Margevičius \n" "Language-Team: Lietuvių <>\n" +"Language: lt_LT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lt_LT\n" "X-Poedit-SourceCharset: UTF-8\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.6.4\n" - -#: ../../locales/../src/interface/statuslinectrl.cpp:65 -#: ../../locales/../src/interface/statuslinectrl.cpp:230 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.8.9\n" + +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:199 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S praėjo" -#: ../../locales/../src/interface/statuslinectrl.cpp:69 -#: ../../locales/../src/interface/statuslinectrl.cpp:238 +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:205 msgid "%H:%M:%S left" msgstr "%H:%M:%S liko" -#: resources.h:776 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" @@ -41,9 +43,9 @@ "%a - Paskyra (Jei nebus naudojamas Paskyros prisijungimo tipas, eilutės " "turinčios tai nebus įtrauktos)" +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 #: ../../locales/../src/interface/filelist_statusbar.cpp:63 -#: ../../locales/../src/interface/filelist_statusbar.cpp:74 -#: ../../locales/../src/interface/filelist_statusbar.cpp:86 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" @@ -51,9 +53,9 @@ msgstr[1] "%d aplankai" msgstr[2] "%d aplankų" -#: ../../locales/../src/interface/RemoteListView.cpp:1711 -#: ../../locales/../src/interface/search.cpp:759 -#: ../../locales/../src/interface/search.cpp:1012 +#: ../../locales/../src/interface/RemoteListView.cpp:1399 +#: ../../locales/../src/interface/search.cpp:809 +#: ../../locales/../src/interface/search.cpp:1188 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -61,11 +63,11 @@ msgstr[1] "%d aplankai su savo turiniu" msgstr[2] "%d aplankų su savo turiniu" -#: ../../locales/../src/interface/filelist_statusbar.cpp:62 -#: ../../locales/../src/interface/filelist_statusbar.cpp:85 -#: ../../locales/../src/interface/RemoteListView.cpp:1710 -#: ../../locales/../src/interface/search.cpp:758 -#: ../../locales/../src/interface/search.cpp:1011 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1398 +#: ../../locales/../src/interface/search.cpp:808 +#: ../../locales/../src/interface/search.cpp:1187 #, c-format msgid "%d file" msgid_plural "%d files" @@ -73,7 +75,7 @@ msgstr[1] "%d failai" msgstr[2] "%d failų" -#: ../../locales/../src/interface/filelist_statusbar.cpp:81 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" @@ -81,7 +83,7 @@ msgstr[1] "%d failai. Bendras dydis: %s" msgstr[2] "%d failų. Bendras dydis: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" @@ -89,12 +91,7 @@ msgstr[1] "%d failai. Bendras dydis: Bent %s" msgstr[2] "%d failų. Bendras dydis: Bent %s" -#: ../../locales/../src/interface/QueueView.cpp:2941 -#, c-format -msgid "%d files added to queue" -msgstr "%d failai pridėti į eilę" - -#: ../../locales/../src/engine/ControlSocket.cpp:104 +#: ../../locales/../src/engine/ControlSocket.cpp:102 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -102,51 +99,67 @@ msgstr[1] "%d sekundės" msgstr[2] "%d sekundžių" -#: resources.h:773 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 msgid "%h - Host" msgstr "%h - Serveris" -#: resources.h:775 -#, no-c-format +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, fuzzy, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%d aplankas" +msgstr[1] "%d aplankai" +msgstr[2] "%d aplankų" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:118 +#, fuzzy, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%d failas" +msgstr[1] "%d failai" +msgstr[2] "%d failų" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#, c-format msgid "%p - Password" msgstr "%p - Slaptažodis" -#: ../../locales/../src/interface/statuslinectrl.cpp:186 +#: ../../locales/../src/interface/statuslinectrl.cpp:160 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:189 +#: ../../locales/../src/interface/statuslinectrl.cpp:163 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:39 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Sertifikatas nebegalioja!" -#: ../../locales/../src/interface/verifycertdialog.cpp:23 +#: ../../locales/../src/interface/verifycertdialog.cpp:32 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Dar negalioja!" -#: resources.h:777 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#, c-format msgid "%s - Proxy user" msgstr "%s - Tarpinio serverio naudotojas" -#: ../../locales/../src/interface/filelist_statusbar.cpp:91 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s ir %s. Bendras dydis: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:89 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s ir %s. Bendras dydis: Bent %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:31 +#: ../../locales/../src/engine/sizeformatting_base.cpp:67 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -154,7 +167,7 @@ msgstr[1] "%s baitai" msgstr[2] "%s baitų" -#: ../../locales/../src/interface/FileZilla.cpp:690 +#: ../../locales/../src/interface/FileZilla.cpp:581 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -168,7 +181,7 @@ "Prašau atsisiųsti FileZilla dar kartą. Jei ši problema kartosis, praneškite " "apie klaidą." -#: ../../locales/../src/interface/FileZilla.cpp:784 +#: ../../locales/../src/interface/FileZilla.cpp:666 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -185,320 +198,394 @@ "kintamajame.\n" "- Nustatykite visą kelią iki %s, FZ_FZSFTP aplinkos kintamajame." -#: ../../locales/../src/interface/verifycertdialog.cpp:56 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s su %d bitais" -#: resources.h:774 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#, c-format msgid "%u - Username" msgstr "%u - Naudotojo vardas" -#: resources.h:778 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 msgid "%w - Proxy password" msgstr "%w - Tarpinio serverio slaptažodis" -#: resources.h:549 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3640 +#, fuzzy +msgid "&Abort previous connection and connect in current tab" +msgstr "Nutraukti ankstesnį ryšį ir užmegzti naują dabartinėje kortelėje" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&About..." msgstr "&Apie..." -#: resources.h:96 resources.h:371 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2499 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "Pask&yra:" -#: resources.h:111 resources.h:678 resources.h:742 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:478 msgid "&Active" msgstr "&Aktyvi veiksena" -#: resources.h:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 msgid "&Add bookmark..." msgstr "&Pridėti žymelę..." -#: resources.h:553 resources.h:570 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 msgid "&Add files to queue" msgstr "&Pridėti failus į eilę" -#: resources.h:786 -msgid "&Add keyfile..." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#, fuzzy +msgid "&Add key file..." msgstr "&Pridėti raktinį failą..." -#: resources.h:628 resources.h:647 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:496 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:559 msgid "&Add to queue" msgstr "&Pridėti į eilę" -#: resources.h:105 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:407 msgid "&Adjust server timezone offset:" msgstr "&Pritaikyti serverio laiko juostos poslinkį:" -#: resources.h:28 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "&Ateityje visada pasitikėti sertifikatu." -#: resources.h:193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 msgid "&Always trust this host, add this key to the cache" msgstr "&Visada pasitikėti šiuo serveriu, pridėti šį raktą į podėlį" -#: resources.h:939 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 msgid "&Always use default editor" msgstr "Visada n&audoti numatytąjį redaktorių" -#: resources.h:414 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 msgid "&Always use selection for unassociated files" msgstr "&Nesusietiems failams, visada naudoti pasirinkimą" -#: resources.h:75 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 msgid "&Always use this action" msgstr "Visada n&audoti šį veiksmą" -#: resources.h:754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 msgid "&Ask your operating system for the external IP address" msgstr "&Paprašyti operacinės sistemos, kad suteiktų išorinį IP adresą" -#: resources.h:522 resources.h:658 resources.h:824 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Auto" -#: resources.h:117 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 msgid "&Autodetect" msgstr "Nustatyti &automatiškai" -#: resources.h:524 resources.h:660 resources.h:826 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:275 +msgid "&Background color:" +msgstr "&Fono spalva:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Dvejetainis" -#: resources.h:899 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "" "&Dvejetainiai priešdėliai naudojant SI simbolius. (pvz. 1 KB = 1024 baitų)" -#: resources.h:539 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 msgid "&Bookmarks" msgstr "Ž&ymelės" -#: resources.h:102 resources.h:353 resources.h:390 resources.h:396 -#: resources.h:413 resources.h:431 resources.h:936 resources.h:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2963 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:367 msgid "&Browse..." msgstr "&Naršyti..." -#: resources.h:814 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 msgid "&Burst tolerance:" msgstr "&Pliūpsnių tolerancija:" -#: resources.h:138 resources.h:141 resources.h:208 resources.h:475 -#: resources.h:482 resources.h:726 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3826 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" msgstr "&Atšaukti" -#: resources.h:499 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." msgstr "&Išvalyti privačius duomenis..." -#: resources.h:1009 +#: ../../locales/../src/interface/resources/xrc/update.xrc:28 #, fuzzy msgid "&Close" msgstr "Už&verti kortelę" -#: resources.h:599 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "&Užverti FileZilla" -#: resources.h:668 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:642 msgid "&Configure speed limits..." msgstr "&Konfigūruoti greičio ribas..." -#: resources.h:527 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 msgid "&Configure..." msgstr "&Konfigūruoti..." -#: resources.h:123 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:619 msgid "&Connect" msgstr "&Prisijungti" -#: resources.h:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 msgid "&Copy current connection to Site Manager..." msgstr "&Kopijuoti šį prisijungimą į Serverių tvarkyklę..." -#: resources.h:183 resources.h:608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "&Kopijuoti į iškarpinę" -#: resources.h:613 -msgid "&Crash" -msgstr "&Lūžti" - -#: resources.h:561 resources.h:575 resources.h:630 resources.h:651 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "&Create directory" msgstr "&Sukurti aplanką" -#: resources.h:663 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Create new tab" msgstr "&Sukurti naują kortelę" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "&Derinimas" -#: resources.h:970 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Debug information in message log:" msgstr "&Derinimo informacija pranešimų žurnale:" -#: resources.h:932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 msgid "&Default editor:" msgstr "&Numatytasis redaktorius:" -#: resources.h:520 resources.h:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "&Numatytasis failo egzistavimo veiksmas..." -#: resources.h:736 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 msgid "&Delay between failed login attempts:" msgstr "&Delsimas tarp nepavykusių prisijungimų:" -#: resources.h:86 resources.h:213 resources.h:227 resources.h:403 -#: resources.h:564 resources.h:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2848 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Pašalinti" -#: resources.h:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 msgid "&Delete symlink" msgstr "&Pašalinti simbolinę nuorodą" -#: resources.h:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 msgid "&Directory comparison" msgstr "&Aplankų palyginimai" -#: resources.h:312 +#: ../../locales/../src/interface/state.cpp:913 +#, fuzzy +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"Ar uždrausti sinchronizuotąjį naršymą ir pratęsti nuotolinio aplanko keitimą?" + +#: ../../locales/../src/interface/state.cpp:985 +#, fuzzy +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" +"Ar uždrausti sinchronizuotąjį naršymą ir pratęsti nuotolinio aplanko keitimą?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1821 msgid "&Discard local file then download and edit file anew" msgstr "&Atsikratyti vietinio failo, tada atsisiųsti ir redaguoti iš naują" -#: resources.h:533 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Disconnect" msgstr "&Atsijungti" -#: resources.h:600 -msgid "&Disconnect from server" -msgstr "&Atsijungti nuo serverio" - -#: resources.h:875 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Rodyti trumpalaikį perdavimo greitį, užuot rodžius vidutinį greitį" -#: resources.h:897 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 msgid "&Display size in bytes" msgstr "&Rodyti dydį baitais" -#: resources.h:480 -msgid "&Do not remember passwords" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3809 +#, fuzzy +msgid "&Do not remember passwords (recommended)" msgstr "&Neprisiminti slaptažodžių" #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Daugiau nerodyti šio lango." -#: resources.h:759 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 msgid "&Don't use external IP address on local connections." msgstr "&Nenaudoti išorinio IP adreso vietiniams prisijungimams." -#: resources.h:919 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "&Double-click action on files:" msgstr "&Dvigubo paspaudimo veiksmas failams:" -#: resources.h:568 resources.h:626 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "&Download" msgstr "&Atsisiųsti" -#: resources.h:430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3160 msgid "&Download to:" msgstr "&Atsiųsti į:" -#: resources.h:661 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:608 msgid "&Download..." msgstr "&Atsisiųsti..." -#: resources.h:244 resources.h:836 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Atsiuntimai:" -#: resources.h:497 resources.h:559 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 msgid "&Edit" msgstr "&Keisti" -#: resources.h:221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 msgid "&Edit filter rules..." msgstr "&Keisti filtrų taisykles..." -#: resources.h:506 resources.h:526 resources.h:641 resources.h:667 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 msgid "&Enable" msgstr "&Leisti" -#: resources.h:468 resources.h:809 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +msgid "&Enable compression" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3698 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "&Įjungti greičio ribas" -#: resources.h:121 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:565 msgid "&Encoding:" msgstr "&Koduotė:" -#: resources.h:92 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 msgid "&Encryption:" msgstr "&Šifravimas:" -#: resources.h:607 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "Į&veskite pasirinktinę komandą..." -#: resources.h:147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3633 +#, fuzzy +msgid "&Establish connection in a new tab" +msgstr "Užmegzti ryšį naujoje kortelėje" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 msgid "&Execute" msgstr "&Vykdyti" -#: resources.h:279 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1572 msgid "&Export Site Manager entries" msgstr "&Eksportuoti serverių įrašus" -#: resources.h:492 resources.h:657 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "&Export..." msgstr "&Eksportuoti..." -#: resources.h:764 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 msgid "&Fall back to active mode" msgstr "&Sugrįžti į aktyvią veikseną" -#: resources.h:484 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 msgid "&File" msgstr "&Failas" -#: resources.h:638 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:527 msgid "&File Attributes..." msgstr "&Failo atributai..." -#: resources.h:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "&Failo prieigos teisės..." -#: resources.h:352 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 msgid "&File:" msgstr "&Failas:" -#: resources.h:231 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" msgstr "&Filtro sąlygos:" -#: resources.h:210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "&Filter sets:" msgstr "&Paruošti filtrai:" -#: resources.h:225 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1647 +#, fuzzy +msgid "&Filters" +msgstr "&Filtrai:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Filtrai:" -#: resources.h:304 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 msgid "&Finish editing and delete local file" msgstr "&Užbaigti redagavimą ir ištrinti vietinį failą" -#: resources.h:434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3291 +#, fuzzy +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Išlyginti nuotolinius kelius, atsiųsti visus ten esančius failus tiesiai į " +"paskirties vietos aplanką" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -506,509 +593,593 @@ "&Išlyginti nuotolinius kelius, atsiųsti visus ten esančius failus tiesiai į " "paskirties vietos aplanką" -#: resources.h:445 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "&Follow symlink, delete target directory contents" msgstr "&Sekti simbolinę nuorodą, ištrinti paskirties vietos aplanko turinį" -#: resources.h:757 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 msgid "&Get external IP address from the following URL:" msgstr "&Gauti išorinį IP adresą iš šio URL:" -#: resources.h:547 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 msgid "&Getting help..." msgstr "&Pagalba..." -#: resources.h:384 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2612 msgid "&Global bookmark" msgstr "&Bendroji žymelė" -#: resources.h:793 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 naudojant CONNECT metodą" -#: resources.h:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 msgid "&Help" msgstr "&Žinynas" -#: resources.h:509 resources.h:644 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "&Hide identical files" msgstr "&Slėpti identiškus failus" -#: resources.h:593 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "&Didžiausias" -#: resources.h:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 msgid "&Highest available port:" msgstr "&Aukščiausias galimas prievadas:" -#: resources.h:89 resources.h:365 resources.h:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2407 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 msgid "&Host:" msgstr "&Serveris:" -#: resources.h:898 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC dvejetainiai priešdėliai (pvz. 1 KiB = 1024 baitų)" -#: resources.h:886 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (pavyzdys: 2007-09-15)" -#: resources.h:493 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 msgid "&Import..." msgstr "&Importuoti..." -#: resources.h:941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Inherit system's filetype associations" msgstr "&Paveldėti sistemos failų tipų susiejimus" -#: resources.h:1016 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 #, fuzzy msgid "&Install new version" msgstr "Stabilios ir beta versijos" -#: resources.h:433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3284 +#, fuzzy +msgid "&Keep local path structure relative to search root" +msgstr "" +"&Išlaikyti nuotolinio kelio struktūrą atitinkamą paieškos šakniniam aplankui" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 msgid "&Keep remote path structure relative to search root" msgstr "" "&Išlaikyti nuotolinio kelio struktūrą atitinkamą paieškos šakniniam aplankui" -#: resources.h:859 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#, fuzzy +msgid "&Key file:" +msgstr "&Atverti failą" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "&Failų ir aplankų išdėstymo polangiai:" -#: resources.h:749 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 msgid "&Limit local ports used by FileZilla" msgstr "&Riboti vietinių FileZilla prievadų skaičių" -#: resources.h:113 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:494 msgid "&Limit number of simultaneous connections" msgstr "&Riboti lygiagrečių prisijungimų skaičių" -#: resources.h:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Local directory tree" msgstr "&Vietinių aplankų medis" -#: resources.h:389 resources.h:395 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 msgid "&Local directory:" msgstr "&Vietinis aplankas:" -#: resources.h:960 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#, fuzzy +msgid "&Local search" +msgstr "Failo paieška" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "&Log to file" msgstr "&Registruoti į failą" -#: resources.h:93 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "&Prisijungimo tipas:" -#: resources.h:368 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 msgid "&Logontype:" msgstr "&Prisijungimo tipas:" -#: resources.h:596 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "Ž&emas" -#: resources.h:541 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Manage bookmarks..." msgstr "&Tvarkyti žymeles..." -#: resources.h:529 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Manual transfer..." msgstr "&Rankinis siuntimas..." -#: resources.h:114 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:504 msgid "&Maximum number of connections:" msgstr "&Maksimalus prisijungimų skaičius:" -#: resources.h:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 msgid "&Maximum number of retries:" msgstr "&Maksimalus bandymų skaičius:" -#: resources.h:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Message log" msgstr "&Pranešimų žurnalas" -#: resources.h:872 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 msgid "&Minimize to tray" msgstr "&Sumažinti į dėklą" -#: resources.h:387 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#, fuzzy +msgid "&Name sorting mode:" +msgstr "Rikiavimo &būdas:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2639 msgid "&Name:" msgstr "&Pavadinimas:" -#: resources.h:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 msgid "&Network configuration wizard..." msgstr "&Tinklo konfigūravimo vedlys..." -#: resources.h:226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 msgid "&New" msgstr "&Naujas" -#: resources.h:82 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 msgid "&New Site" msgstr "&Naujas serveris" -#: ../../locales/../src/interface/Mainfrm.cpp:1854 +#: ../../locales/../src/interface/Mainfrm.cpp:1657 msgid "&New version available!" msgstr "&Prieinama nauja versija!" -#: resources.h:306 +#: ../../locales/../src/interface/netconfwizard.cpp:27 +msgid "&Next >" +msgstr "&Kitas >" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1896 msgid "&No" msgstr "&Ne" -#: resources.h:767 resources.h:792 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&Nėra" -#: resources.h:595 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&Normalus" -#: resources.h:156 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 msgid "&Numeric value:" msgstr "&Skaitinė reikšmė:" -#: resources.h:124 resources.h:137 resources.h:405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2897 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:627 msgid "&OK" msgstr "&Gerai" -#: resources.h:770 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 msgid "&OPEN" msgstr "&ATVERTI" -#: resources.h:557 resources.h:649 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "&Open" msgstr "&Atverti" -#: resources.h:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 msgid "&Overwrite" msgstr "Perra&šyti" -#: resources.h:112 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:485 msgid "&Passive" msgstr "&Pasyvus" -#: resources.h:135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 msgid "&Password:" msgstr "&Slaptažodis:" -#: resources.h:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "&Groti garsą" -#: resources.h:90 resources.h:366 resources.h:720 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2420 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 msgid "&Port:" msgstr "&Prievadas:" -#: resources.h:865 -msgid "&Position of the message log:" -msgstr "P&ranešimų žurnalo vieta:" - -#: resources.h:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 msgid "&Preserve timestamps of transferred files" msgstr "&Išlaikyti failo laiko įspaudus" -#: resources.h:288 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1641 msgid "&Queue" msgstr "&Eilė" -#: resources.h:722 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 msgid "&Quickconnect" msgstr "&Greitas prisijungimas" -#: resources.h:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "&Quickconnect bar" msgstr "&Greito prisijungimo juosta" -#: resources.h:145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1505 +#, fuzzy +msgid "&Quickconnect history" +msgstr "Išvalyti &greito prisijungimo istoriją" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Read" msgstr "&Skaityti" -#: resources.h:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 msgid "&Reconnect" msgstr "Prisijungti iš &naujo" -#: resources.h:503 resources.h:666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1512 +#, fuzzy +msgid "&Reconnect information" +msgstr "Išvalyti &prisijungimų informacija" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:633 msgid "&Refresh" msgstr "&Atnaujinti" -#: resources.h:136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 msgid "&Remember password until FileZilla is closed" msgstr "&Atsiminti slaptažodį iki užveriant FileZilla" -#: resources.h:479 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3803 msgid "&Remember passwords" msgstr "&Prisiminti slaptažodžius" -#: resources.h:391 resources.h:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2693 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2780 msgid "&Remote directory:" msgstr "&Nutolęs aplankas:" -#: resources.h:355 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "&Remote path:" msgstr "&Nutolęs kelias:" -#: resources.h:830 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#, fuzzy +msgid "&Remote search" +msgstr "Nuotolinio failo paieška" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Pašalinti" -#: resources.h:787 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 msgid "&Remove key" msgstr "&Pašalinti raktą" -#: resources.h:590 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "&Pašalinti pažymėtus" -#: resources.h:85 resources.h:228 resources.h:402 resources.h:566 -#: resources.h:582 resources.h:634 resources.h:655 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Perva&dinti" -#: resources.h:212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 msgid "&Rename..." msgstr "&Pervardinti..." -#: resources.h:311 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1814 msgid "&Reopen local file" msgstr "&Atverti vietinį failą" -#: resources.h:821 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 msgid "&Replace invalid characters with:" msgstr "&Pakeisti netinkamus simbolius į:" -#: resources.h:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 msgid "&Report a bug..." msgstr "Pranešti apie &klaidą..." -#: resources.h:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 msgid "&Reset and requeue all" msgstr "&Atstatyti ir visus perkelti į eilę" -#: resources.h:715 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" msgstr "&Perkrauti konfigūravimo vedlį" -#: resources.h:72 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 msgid "&Resume" msgstr "&Tęsti" -#: resources.h:601 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "&Paleisti komandą..." -#: resources.h:729 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 msgid "&Run configuration wizard now..." msgstr "&Paleisti konfigūravimo vedlį..." -#: resources.h:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 msgid "&Run update check now..." msgstr "&Paleisti atnaujinimų tikrinimą dabar..." -#: resources.h:769 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 msgid "&SITE" msgstr "&SERVERIS" -#: resources.h:795 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: resources.h:211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 msgid "&Save as..." msgstr "&Išsaugoti kaip..." -#: resources.h:419 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "&Search" msgstr "&Ieškoti" -#: resources.h:534 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 msgid "&Search remote files..." msgstr "&Ieškoti nutolusių failų..." -#: resources.h:81 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 msgid "&Select Entry:" msgstr "&Pasirinkite elementą:" -#: resources.h:930 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 msgid "&Select language:" msgstr "&Pasirinkite kalbą:" -#: resources.h:343 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2148 msgid "&Select the columns that should be displayed:" msgstr "&Pasirinkite stulpelius kurie bus rodomi:" -#: resources.h:357 resources.h:530 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2335 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Serveris" -#: resources.h:287 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Settings" msgstr "&Nustatymai" -#: resources.h:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 msgid "&Settings..." msgstr "&Nustatymai..." -#: resources.h:969 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 msgid "&Show debug menu" msgstr "&Rodyti derinimo meniu" -#: resources.h:602 -msgid "&Show message" -msgstr "&Rodyti pranešimą" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#, fuzzy +msgid "&Show detailed log" +msgstr "Sesijos detalės" -#: resources.h:959 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 msgid "&Show timestamps in message log" msgstr "&Pranešimų žurnale rodyti žinutės laiko įspaudus" -#: resources.h:485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1518 +#, fuzzy +msgid "&Site Manager entries" +msgstr "Serverių &tvarkyklės įrašai" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Serverių tvarkyklė..." -#: resources.h:385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "&Site-specific bookmark" msgstr "&Konkrečios vietos žymelė" -#: resources.h:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 msgid "&Skip" msgstr "&Praleisti" -#: resources.h:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 msgid "&Speed limits" msgstr "&Greičio ribos" -#: resources.h:436 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 msgid "&Start transfer immediately" msgstr "&Pradėti persiuntimą nedelsiant" -#: resources.h:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 msgid "&Swap local and remote panes" msgstr "&Sukeisti vietinius ir nuotolinius polangius" -#: resources.h:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "&TLS Ciphers" msgstr "&TLS šifras" -#: ../../locales/../src/interface/netconfwizard.cpp:228 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Testas" -#: resources.h:878 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 msgid "&Theme:" msgstr "&Tema:" -#: resources.h:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 msgid "&Transfer" msgstr "&Perdavimas" -#: resources.h:109 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 msgid "&Transfer mode:" msgstr "P&erdavimo būdas:" -#: resources.h:517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "Perdavimų &eilė" -#: resources.h:833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 msgid "&Treat dotfiles as ASCII files" msgstr "&Failus su tašku priekyje laikyti ASCII failais" -#: resources.h:317 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "&Unedit" msgstr "&Atredaguoti" -#: resources.h:206 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 msgid "&Update cached key for this host" msgstr "&Atnaujinti patalpintą šio serverio raktą" -#: resources.h:551 resources.h:645 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 msgid "&Upload" msgstr "&Išsiųsti" -#: resources.h:254 resources.h:845 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3261 +#, fuzzy +msgid "&Upload to:" +msgstr "&Išsiuntimai:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#, fuzzy +msgid "&Upload..." +msgstr "&Išsiųsti" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Išsiuntimai:" -#: resources.h:412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 msgid "&Use custom program" msgstr "&Naudoti pasirinktinę programą" -#: resources.h:104 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:388 msgid "&Use synchronized browsing" msgstr "&Naudoti sinchronizuotą naršymą" -#: resources.h:934 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Use system's default editor for text files" msgstr "&Tekstiniams failams naudoti sistemos numatytąjį redaktorių." -#: resources.h:755 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 msgid "&Use the following IP address:" msgstr "&Naudoti šį IP adresą:" -#: resources.h:763 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 msgid "&Use the server's external IP address instead" msgstr "&Vietoj to naudoti serverio išorinį IP adresą" -#: resources.h:901 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "&Use thousands separator" msgstr "&Naudoti tūkstančių skirtuką" -#: resources.h:94 resources.h:134 resources.h:369 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Naudotojas:" -#: resources.h:718 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 msgid "&Username:" msgstr "&Naudotojo vardas:" -#: ../../locales/../src/interface/Mainfrm.cpp:1848 +#: ../../locales/../src/interface/Mainfrm.cpp:1651 #, c-format msgid "&Version %s" msgstr "&Versija %s" -#: resources.h:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 msgid "&View" msgstr "Ro&dymas" -#: resources.h:574 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:614 msgid "&View/Edit" msgstr "&Rodyti/Taisyti" -#: resources.h:940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "&Peržiūrėti redaguotus failus ir paraginti išsiųsti keitimus" -#: resources.h:950 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "&When checking for updates, check for:" msgstr "&Ieškant atnaujinimų, ieškoti:" -#: resources.h:146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Write" msgstr "&Rašyti" -#: resources.h:305 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1767 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "&Yes" msgstr "&Taip" -#: ../../locales/../src/engine/local_path.cpp:461 -#: ../../locales/../src/engine/local_path.cpp:511 +#: ../../locales/../src/engine/local_path.cpp:444 +#: ../../locales/../src/engine/local_path.cpp:490 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "„%s“ neegzistuoja arba neprieinamas." -#: ../../locales/../src/engine/local_path.cpp:477 -#: ../../locales/../src/engine/local_path.cpp:498 -#: ../../locales/../src/engine/local_path.cpp:505 +#: ../../locales/../src/engine/local_path.cpp:459 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:485 #, c-format msgid "'%s' is not a directory." msgstr "„%s“ nėra aplankas." -#: ../../locales/../src/interface/manual_transfer.cpp:445 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../locales/../src/interface/manual_transfer.cpp:427 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:974 msgid "'Account' logontype not supported by selected protocol" msgstr "Pasirinktas protokolas nepalaiko „Paskyros“ prisijungimo tipo" -#: ../../locales/../src/interface/manual_transfer.cpp:459 +#: ../../locales/../src/interface/manual_transfer.cpp:441 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1016,7 +1187,7 @@ "„Normal“ ir „Account“ prisijungimo tipai negalimi, bus naudojama „Ask for " "password“." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:989 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1024,7 +1195,7 @@ "„Normali“ ir „Paskyra“ prisijungimo tipai nepalaikomi šioje veiksenoje. Jūsų " "įrašas pakeistas į „Prašyti slaptažodžio“." -#: ../../locales/../src/interface/Mainfrm.cpp:601 +#: ../../locales/../src/interface/Mainfrm.cpp:587 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1034,8 +1205,8 @@ "klientai perduoti argumentus serveriui. Gali būti jog norėsite įvesti " "komandą be priekį esančio „citata“." -#: ../../locales/../src/interface/filelist_statusbar.cpp:96 -#: ../../locales/../src/interface/filelist_statusbar.cpp:105 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" @@ -1043,50 +1214,60 @@ msgstr[1] "(%d prafiltruoti objektai)" msgstr[2] "(%d prafiltruotų objektų)" -#: resources.h:805 resources.h:807 +#: ../../locales/../src/interface/update_dialog.cpp:308 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% atsiųsta)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 msgid "(0 for no limit)" msgstr "(0 be ribos)" -#: resources.h:735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 msgid "(0-99)" msgstr "(0-99)" -#: resources.h:737 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 msgid "(0-999 seconds)" msgstr "(0-999 sekundės)" -#: resources.h:803 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 msgid "(1-10)" msgstr "(1-10)" -#: resources.h:731 -msgid "(5-9999, 0 to disable)" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#, fuzzy +msgid "(10-9999, 0 to disable)" msgstr "(5-9999, 0 neleisti)" -#: ../../locales/../src/interface/aboutdialog.cpp:136 -#: ../../locales/../src/interface/aboutdialog.cpp:224 +#: ../../locales/../src/interface/aboutdialog.cpp:85 +#: ../../locales/../src/interface/aboutdialog.cpp:174 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(„app-compat“ nustatyta %d.%d)" -#: resources.h:894 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 msgid "(example: %H:%M)" msgstr "(pavyzdys: %H:%M)" -#: resources.h:888 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "(example: %Y-%m-%d)" msgstr "(pavyzdys: %Y-%m-%d)" -#: resources.h:470 resources.h:472 resources.h:811 resources.h:813 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3717 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format msgid "(in %s/s)" msgstr "(%s/s)" -#: resources.h:703 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:241 +#: ../../locales/../src/interface/statuslinectrl.cpp:208 msgid "--:--:-- left" msgstr "--:--:-- liko" @@ -1106,54 +1287,64 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s negali būti naudojamas kartu su FTP URL." -#: resources.h:971 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 msgid "0 - None" msgstr "0 - Nėra" -#: resources.h:972 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "1 - Warning" msgstr "1 - Įspėjimas" -#: resources.h:973 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 msgid "2 - Info" msgstr "2 - Informacija" -#: resources.h:974 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 msgid "3 - Verbose" msgstr "3 - Išsamesnė" -#: ../../locales/../src/interface/aboutdialog.cpp:158 -msgid "32 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:98 +#, fuzzy +msgid "32-bit system" msgstr "32 bitų sistema" -#: resources.h:975 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 msgid "4 - Debug" msgstr "4 - Derinimas" -#: ../../locales/../src/interface/aboutdialog.cpp:156 -msgid "64 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:96 +#, fuzzy +msgid "64-bit system" msgstr "64 bitų sistema" -#: resources.h:542 +#: ../../locales/../src/interface/netconfwizard.cpp:28 +msgid "< &Back" +msgstr "< &Atgal" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:108 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:107 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "Žymelė su įvestu vardu jau yra. Prašome įvesti nenaudojamą pavadinimą:" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:98 +#: ../../locales/../src/engine/tlssocket.cpp:1318 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Sertifikatas gijoje buvo pasirašytas nesaugiu algoritmu" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Reikia nustatyti numatytąjį redaktorių." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:117 -#: ../../locales/../src/interface/state.cpp:827 +#: ../../locales/../src/interface/RemoteListView.cpp:160 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:758 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Aplankas negali būti nutemptas į vieną iš savo poaplankių." -#: resources.h:675 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" "A few servers don't allow passive mode or are misconfigured. In such cases " "you would have to use active mode. In active mode, FileZilla opens a port " @@ -1164,30 +1355,22 @@ "veiksenoje, FileZilla atidaro prievadą ir prašo serverio prisijungti prie " "šio prievado." -#: resources.h:293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 msgid "A file previously opened has been changed." msgstr "Prieš tai atidarytas failas buvo pakeistas." -#: ../../locales/../src/interface/LocalListView.cpp:1994 -#, c-format -msgid "" -"A file with that name is already being edited. Do you want to reopen '%s'?" -msgstr "" -"Failas su tokiu pavadinimu jau redaguojamas. Ar norite iš naujo atverti „%s“?" - -#: ../../locales/../src/interface/LocalListView.cpp:1990 -#: ../../locales/../src/interface/RemoteListView.cpp:2695 +#: ../../locales/../src/interface/edithandler.cpp:1650 msgid "A file with that name is already being transferred." msgstr "Failas su tokiu pavadinimu jau siunčiamas." -#: ../../locales/../src/interface/RemoteListView.cpp:2700 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Failas su tokiu pavadinimu dar redaguojamas. Prašau jį uždaryti ir pabandyti " "dar kartą." -#: ../../locales/../src/interface/FileZilla.cpp:669 +#: ../../locales/../src/interface/FileZilla.cpp:560 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1201,12 +1384,12 @@ "Kol neištaisysite šios problemos, failų sąrašuose gali trūkti elementų.\n" "Šioje sesijoje šis įspėjimas nebebus kartojamas." -#: resources.h:1010 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 #, fuzzy msgid "A new version of FileZilla is available:" msgstr "Prieinama naujesnė FileZilla versija:" -#: ../../locales/../src/interface/Mainfrm.cpp:684 +#: ../../locales/../src/interface/Mainfrm.cpp:649 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1215,7 +1398,7 @@ "serveriai slepia failus nuo naudotojo. Šį punktą naudokite norėdami " "priversti serverį rodyti visus failus." -#: resources.h:747 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1223,7 +1406,7 @@ "Tinkamam serveriui nereikia šito. Susisiekite su serverio administratoriumi " "jei jums reikia šito." -#: ../../locales/../src/interface/state.cpp:284 +#: ../../locales/../src/interface/state.cpp:251 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1231,83 +1414,81 @@ "Nuotolinė operacija yra vykdoma ir įgalintas sinchronizuotasis naršymas.\n" "Ar uždrausti sinchronizuotąjį naršymą ir pratęsti vietinio aplanko keitimą?" -#: resources.h:523 resources.h:659 resources.h:825 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" -#: resources.h:829 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 msgid "A&dd" msgstr "P&ridėti" -#: resources.h:856 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 msgid "A&llow resume of ASCII files" msgstr "&Leisti atnaujinti ASCII failus" -#: ../../locales/../src/interface/fileexistsdlg.cpp:109 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" msgstr "&Pritaikyti tik parsiuntimams" -#: ../../locales/../src/interface/fileexistsdlg.cpp:145 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" msgstr "&Pritaikyti tik išsiuntimams" -#: resources.h:159 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 msgid "A&pply to all files and directories" msgstr "&Pritaikyti visiems failams ir aplankams" -#: resources.h:625 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 msgid "A&utomatically remove successful transfers" msgstr "&Automatiškai pašalinti sėkmingus siuntimus" -#: resources.h:376 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2551 msgid "ASCII" msgstr "ASCII" -#: resources.h:466 -msgid "Abort previous connection and connect in current tab" -msgstr "Nutraukti ankstesnį ryšį ir užmegzti naują dabartinėje kortelėje" - -#: resources.h:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 msgid "About FileZilla" msgstr "Apie FileZilla" -#: resources.h:866 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 msgid "Above the file lists" msgstr "Virš failų sąrašo" -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:161 -#: ../../locales/../src/interface/manual_transfer.cpp:194 -#: ../../locales/../src/interface/manual_transfer.cpp:568 -#: ../../locales/../src/interface/manual_transfer.cpp:569 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298 +#: ../../locales/../src/engine/server.cpp:886 +#: ../../locales/../src/engine/server.cpp:907 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/manual_transfer.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1322 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1323 msgid "Account" msgstr "Paskyra" -#: resources.h:598 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "Veiksmas po eilės &užbaigimo" -#: resources.h:316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1929 msgid "Action on selected file:" msgstr "Veiksmas su pasirinktu failu:" -#: resources.h:310 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 msgid "Action to perform:" msgstr "Atlikti veiksmą:" -#: resources.h:67 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 msgid "Action:" msgstr "Veiksmas:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:118 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 msgid "Active mode" msgstr "Aktyvi veiksena" -#: ../../locales/../src/interface/netconfwizard.cpp:605 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1315,7 +1496,7 @@ "Aktyvios veiksenos FTP testas nepavyko. FileZilla nežino teisingo išorinio " "adreso." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1323,7 +1504,7 @@ "Aktyvios veiksenos FTP testas nepavyko. FileZilla nežino teisingo išorinio " "adreso. Ir jūsų maršrutizatorius pakeitė išsiuntimo adresą." -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1333,35 +1514,39 @@ "adresą, tačiau jūsų maršrutizatorius ar ugniasienė klaidingai pakeitė " "išsiuntimo adresą." -#: resources.h:760 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 msgid "Active mode IP" msgstr "Aktyvios veiksenos IP" -#: resources.h:437 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3309 msgid "Add files to &queue only" msgstr "Pridėti failus tik į &eilę" -#: resources.h:629 resources.h:648 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "Add selected directory to the transfer queue" msgstr "Pridėti pasirinktą aplanką į siuntimų eilę" -#: resources.h:554 resources.h:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 msgid "Add selected files and folders to the transfer queue" msgstr "Pažymėtus failus ir aplankus pridėti į siuntimų eilę" -#: resources.h:921 resources.h:927 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "Add to queue" msgstr "Pridėti į eilę" -#: ../../locales/../src/engine/proxy.cpp:553 +#: ../../locales/../src/engine/proxy.cpp:496 msgid "Address type not supported" msgstr "Adreso tipas nepalaikomas" -#: resources.h:98 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:313 msgid "Advanced" msgstr "Sudėtingiau" -#: resources.h:954 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1374,19 +1559,24 @@ "„Nightly“ FileZilla versijos gali neveikti taip kaip iš jų tikimasi ir netgi " "sugadinti sistemą. Už beta ir „Nightly“ versijas atsakote patys." -#: resources.h:325 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3650 +#, fuzzy +msgid "Al&ways perform this action" +msgstr "Visada n&audoti šį veiksmą" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2008 msgid "Algorithm:" msgstr "Algoritmas:" -#: ../../locales/../src/interface/QueueView.cpp:3130 +#: ../../locales/../src/interface/QueueView.cpp:2485 msgid "All files have been successfully transferred" msgstr "Visi failai buvo sėkmingai perduoti" -#: resources.h:704 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Visi prievadai turi būti tarp 1024 ir 65535." -#: ../../locales/../src/interface/QueueView.cpp:3126 +#: ../../locales/../src/interface/QueueView.cpp:2481 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1394,19 +1584,27 @@ msgstr[1] "Visi perdavimai buvo užbaigti. %d failai nebuvo perduoti." msgstr[2] "Visi perdavimai buvo užbaigti. %d failų nebuvo perduota." -#: resources.h:743 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 msgid "Allow &fall back to other transfer mode on failure" msgstr "Įvykus klaidai leisti &sugrįžti į kitą siuntimo būdą" -#: resources.h:679 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" msgstr "Įvykus klaidai leisti sugrįžti į kitą siuntimo būdą" -#: resources.h:463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "Already connected" msgstr "Jau prisijungta" -#: resources.h:788 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#, fuzzy +msgid "Alternative name:" +msgid_plural "Alternative names:" +msgstr[0] "F&iltro pavadinimas:" +msgstr[1] "F&iltro pavadinimas:" +msgstr[2] "F&iltro pavadinimas:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1414,7 +1612,7 @@ "FileZilla neapažįsta Pageant, bet raktų tvarkymui galite naudoti Pageant " "įrankį iš PuTTY." -#: resources.h:789 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1422,14 +1620,14 @@ "Taipogi galite naudotis savo sistemos SSH agentu. Norėdami tai padaryti, " "įsitikinkite, kad SSH_AUTH_SOCK aplinkos kintamasis yra nustatytas." -#: resources.h:1019 +#: ../../locales/../src/interface/resources/xrc/update.xrc:134 #, fuzzy msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "Nepavyko parsiųsti naujausios FileZilla versijos." -#: ../../locales/../src/interface/QueueView.cpp:2048 +#: ../../locales/../src/interface/QueueView.cpp:1542 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1438,7 +1636,7 @@ "Įkraunant perdavimų eilę iš „%s“ įvyko klaida.\n" "Kai kurių eilės elementų atstatyti nepavyko." -#: ../../locales/../src/interface/QueueView.cpp:1947 +#: ../../locales/../src/interface/QueueView.cpp:1440 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1447,63 +1645,62 @@ "Saugant perdavimų eilę į „%s“ įvyko klaida.\n" "Kai kurių eilės elementų išsaugoti nepavyko." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1962 +#: ../../locales/../src/engine/tlssocket.cpp:1321 +#, fuzzy +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" +"Neužbaigta grandinė, viršutinis liudijimas nėra savarankiškai " +"prisijungiantis liudijimų įstaigos liudijimas" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2066 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Elementas tokiu pavadinimu kaip atvilktas elementas jau egzistuoja." -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:159 -#: ../../locales/../src/interface/manual_transfer.cpp:197 -#: ../../locales/../src/interface/manual_transfer.cpp:213 -#: ../../locales/../src/interface/manual_transfer.cpp:567 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1540 +#: ../../locales/../src/engine/server.cpp:909 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1609 msgid "Anonymous" msgstr "Anonimiškai" -#: ../../locales/../src/interface/state.cpp:1011 +#: ../../locales/../src/interface/state.cpp:962 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Kita nuotolinė operacija jau yra vykdoma, šiuo metu pakeisti aplanko " "neįmanoma." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:785 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:803 msgid "Any changes made in the Site Manager could not be saved." msgstr "" "Bet kokie pakeitimai padaryti serverių tvarkyklėje negali būti išsaugoti." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:730 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"Bet kokie pakeitimai padaryti serverių tvarkyklėje nebus išsaugoti, nebent " -"jūs pataisytumėte failą." - -#: ../../locales/../src/interface/filter.cpp:209 +#: ../../locales/../src/interface/filter.cpp:955 msgid "Any changes made to the filters could not be saved." msgstr "Bet kokie pakeitimai padaryti filtrams negali būti išsaugoti." -#: ../../locales/../src/interface/filter.cpp:1031 +#: ../../locales/../src/interface/filter.cpp:863 msgid "Any changes made to the filters will not be saved." msgstr "Bet kokia pakeitimai padaryti filtrams nebus išsaugoti." -#: resources.h:161 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 msgid "App&ly to directories only" msgstr "Pritaikyti &tik aplankams" -#: resources.h:224 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 msgid "Apply" msgstr "Pritaikyti" -#: resources.h:76 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 msgid "Apply to ¤t queue only" msgstr "Pritaikyti &tik šiai eilei" -#: resources.h:160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 msgid "Apply to &files only" msgstr "Pritaikyti &tik failams" @@ -1511,41 +1708,49 @@ msgid "Archive" msgstr "Archyvas" -#: resources.h:868 +#: ../../locales/../src/engine/socket.cpp:1076 +msgid "Argument buffer overflow" +msgstr "Argumento buferio perpildymas" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 msgid "As tab in the transfer queue pane" msgstr "Kaip kortelė persiuntimų eilės langelyje" -#: resources.h:246 resources.h:256 resources.h:837 resources.h:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Klausti ką daryti" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/engine/server.cpp:880 +#: ../../locales/../src/engine/server.cpp:901 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Klausti slaptažodžio" -#: resources.h:700 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." msgstr "Paprašyti operacinės sistemos, kad suteiktų prievadą." -#: resources.h:690 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" msgstr "Paprašyti operacinės sistemos, kad suteiktų išorinį IP adresą" -#: resources.h:458 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 msgid "Asking questions in the FileZilla forums" msgstr "Klausti FileZilla forume" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 msgid "Associated program not found:" msgstr "Susieta programa nerasta:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:709 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:698 msgid "At least one filter condition is incomplete" msgstr "Bent vienas sąlygos filtras yra neužbaigtas" -#: resources.h:709 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 msgid "At this point, all required information has been gathered." msgstr "Šioje vietoje, visa konfigūracija buvo surinkta." @@ -1553,91 +1758,100 @@ msgid "Attribute" msgstr "Atributas" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:677 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:596 msgid "Authentication failed." msgstr "Tapatybės patvirtinti nepavyko." -#: resources.h:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 msgid "Author:" msgstr "Autorius:" -#: resources.h:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2529 msgid "Auto" msgstr "Auto" -#: resources.h:827 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 msgid "Automatic file type classification" msgstr "Automatinis failų tipų klasifikavimas" -#: resources.h:883 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 msgid "Available sizes" msgstr "Prieinami dydžiai" -#: ../../locales/../src/engine/sizeformatting_base.cpp:129 -#: ../../locales/../src/engine/sizeformatting_base.cpp:188 +#: ../../locales/../src/engine/sizeformatting_base.cpp:155 +#: ../../locales/../src/engine/sizeformatting_base.cpp:214 msgid "B " msgstr "B" -#: resources.h:100 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:339 msgid "B&ypass proxy" msgstr "A&peiti tarpinį serverį" -#: resources.h:454 +#: ../../locales/../src/engine/socket.cpp:1040 +msgid "Bad file descriptor" +msgstr "Blogas failo deskriptorius" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 msgid "Basic usage instructions" msgstr "Pagrindinės naudojimo instrukcijos" -#: resources.h:870 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 msgid "Behaviour" msgstr "Elgsena" -#: ../../locales/../src/interface/edithandler.cpp:1142 -#: ../../locales/../src/interface/edithandler.cpp:1170 +#: ../../locales/../src/interface/edithandler.cpp:1120 +#: ../../locales/../src/interface/edithandler.cpp:1148 msgid "Being edited" msgstr "Redaguojama" -#: resources.h:612 -msgid "Benchmark string coalescer" -msgstr "Lyginamoji „coalescer“ eilutė" - -#: ../../locales/../src/engine/tlssocket.cpp:1086 +#: ../../locales/../src/engine/tlssocket.cpp:1312 msgid "Beware! Certificate has been revoked" msgstr "Saugokitės! Liudijimas buvo panaikintas" -#: resources.h:377 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2556 msgid "Binary" msgstr "Dvejetainis" -#: resources.h:863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 msgid "Blackboard" msgstr "Lenta" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:272 -#: ../../locales/../src/interface/menu_bar.cpp:315 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:395 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "Mėlyna" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:259 +#: ../../locales/../src/interface/menu_bar.cpp:291 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:381 msgid "Bookmark" msgstr "Žymelė" -#: resources.h:400 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2819 msgid "Bookmark:" msgstr "Žymelė:" -#: resources.h:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2808 msgid "Bookmarks" msgstr "Žymelės" -#: resources.h:172 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#, fuzzy +msgid "Browse..." +msgstr "&Naršyti..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "Sukūrimo data:" -#: resources.h:169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 msgid "Build information" msgstr "Sukūrimo informacija" -#: ../../locales/../src/interface/verifycertdialog.cpp:181 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Verslo kategorija:" -#: resources.h:750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1647,72 +1861,104 @@ "kokį prieinamą vidinį prievadą. Jei norite leisti naudoti tik mažą prievadų " "sritį, nurodykite ją žemiau." -#: resources.h:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 msgid "C&ancel current operation" msgstr "A&tšaukti dabartinę operaciją" -#: resources.h:609 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "&Išvalyti viską" -#: resources.h:584 resources.h:636 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "C&opy URL(s) to clipboard" msgstr "K&opijuoti URL į iškarpinę" -#: resources.h:887 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:523 +#, fuzzy +msgid "C&opy URL(s) with password to clipboard" +msgstr "K&opijuoti URL į iškarpinę" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "C&ustom" msgstr "&Pasirinktas" -#: resources.h:942 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "C&ustom filetype associations:" msgstr "&Pasirinktas failų tipų susiejimas:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +msgid "CPU features:" +msgstr "CPU ypatybės:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1575 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1128 msgid "Calculating timezone offset of server..." msgstr "Skaičiuojamas serverio laiko juostos poslinkis..." -#: ../../locales/../src/engine/transfersocket.cpp:725 +#: ../../locales/../src/engine/transfersocket.cpp:666 msgid "Can't read from file" msgstr "Neįmanoma perskaityti failo" -#: ../../locales/../src/engine/transfersocket.cpp:704 -#: ../../locales/../src/engine/transfersocket.cpp:778 +#: ../../locales/../src/engine/transfersocket.cpp:646 +#: ../../locales/../src/engine/transfersocket.cpp:714 msgid "Can't write data to file." msgstr "Neįmanoma įrašyti duomenų į failą." -#: ../../locales/../src/engine/transfersocket.cpp:702 -#: ../../locales/../src/engine/transfersocket.cpp:776 +#: ../../locales/../src/engine/transfersocket.cpp:648 +#: ../../locales/../src/engine/transfersocket.cpp:716 #, c-format msgid "Can't write data to file: %s" msgstr "Neįmanoma įrašyti duomenų į failą: %s" -#: resources.h:30 resources.h:79 resources.h:125 resources.h:163 -#: resources.h:195 resources.h:223 resources.h:240 resources.h:267 -#: resources.h:276 resources.h:283 resources.h:291 resources.h:314 -#: resources.h:347 resources.h:380 resources.h:394 resources.h:406 -#: resources.h:416 resources.h:439 resources.h:448 resources.h:467 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1473 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1667 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2735 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2993 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3231 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3326 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3396 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3668 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3888 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:634 msgid "Cancel" msgstr "Atšaukti" -#: resources.h:994 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 msgid "Cancel current operation" msgstr "Atšaukti dabartinę operaciją" -#: resources.h:995 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 msgid "Cancels the current operation" msgstr "Atšaukia dabartinę operaciją" -#: ../../locales/../src/engine/local_path.cpp:471 +#: ../../locales/../src/engine/local_path.cpp:454 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "Neįmanoma pasiekti „%s“, laikmena neįdėta arba diskas neparuoštas." -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Cannot add server to Site Manager" msgstr "Neįmanoma pridėti serverio į Serverių tvarkyklę" -#: ../../locales/../src/interface/context_control.cpp:348 +#: ../../locales/../src/engine/socket.cpp:1093 +msgid "Cannot assign requested address" +msgstr "Neįmanoma priskirti prašomo adreso" + +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1720,7 +1966,7 @@ "Kol kortelė užimta jos užverti neįmanoma.\n" "Atšaukti dabartinę operaciją ir užverti kortelę?" -#: ../../locales/../src/interface/listingcomparison.cpp:74 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1728,30 +1974,26 @@ "Neįmanoma palyginti aplankų, įgalinti skirtingi filtrai vietiniams ir " "nuotoliniams aplankams" -#: ../../locales/../src/interface/RemoteListView.cpp:2799 -msgid "Cannot compare directories, not connected to a server." -msgstr "Neįmanoma palyginti aplankų, neprisijungta prie serverio." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Neįmanoma sukurti naujo filtro" -#: ../../locales/../src/interface/LocalListView.cpp:1972 -#: ../../locales/../src/interface/LocalListView.cpp:2101 -#: ../../locales/../src/interface/RemoteListView.cpp:2629 -#: ../../locales/../src/interface/RemoteListView.cpp:2675 +#: ../../locales/../src/interface/edithandler.cpp:1580 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/LocalListView.cpp:1737 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Cannot edit file" msgstr "Neįmanoma redaguoti failo" -#: ../../locales/../src/interface/LocalListView.cpp:1888 +#: ../../locales/../src/interface/LocalListView.cpp:1618 msgid "Cannot edit file, not connected to any server." msgstr "Neįmanoma keisti failo, neprisijungta prie jokio serverio." -#: ../../locales/../src/interface/LocalListView.cpp:1899 +#: ../../locales/../src/interface/LocalListView.cpp:1627 msgid "Cannot edit file, remote path unknown." msgstr "Neįmanoma redaguoti failo, nes nuotolinis kelias nežinomas." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1759,235 +2001,258 @@ "Neįmanoma sukurti FTP prisijungimo su SFTP serveriu. Pasirinkite tinkamą " "protokolą." -#: ../../locales/../src/interface/quickconnectbar.cpp:37 -#: ../../locales/../src/interface/quickconnectbar.cpp:55 +#: ../../locales/../src/interface/quickconnectbar.cpp:36 +#: ../../locales/../src/interface/quickconnectbar.cpp:54 msgid "Cannot load Quickconnect bar from resource file" msgstr "Iš resursų failo neįmanoma įkrauti greito prisijungimo juostos" -#: ../../locales/../src/interface/import.cpp:38 -msgid "Cannot load file, not a valid XML file." -msgstr "Neįmanoma įkrauti failo, netinkamas XML failas." - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 -msgid "Cannot load keyfile" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#, fuzzy +msgid "Cannot load key file" msgstr "Neįmanoma įkrauti raktinio failo" -#: ../../locales/../src/interface/Mainfrm.cpp:1096 +#: ../../locales/../src/interface/Mainfrm.cpp:996 msgid "Cannot load toolbar from resource file" msgstr "Iš resursų failo įkrauti įrankinės nepavyko" -#: ../../locales/../src/interface/manual_transfer.cpp:463 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Neįmanoma prisiminti slaptažodžio" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:683 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1210 msgid "Cannot rename entry" msgstr "Neįmanoma pervadinti elemento" -#: ../../locales/../src/interface/RemoteListView.cpp:1911 +#: ../../locales/../src/interface/RemoteListView.cpp:1599 msgid "Cannot rename file" msgstr "Neįmanoma pervadinti failo" -#: ../../locales/../src/engine/proxy.cpp:147 +#: ../../locales/../src/engine/proxy.cpp:136 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Nepavyko išversti kompiuterio vardo į IPv4 adresą suderinamą su SOCKS4 " "tarpiniu serveriu." -#: ../../locales/../src/interface/filter.cpp:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "Cannot save filterset" msgstr "Neįmanoma išsaugoti filtrų" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Cannot select filter" msgstr "Neįmanoma pasirinkti filtro" -#: ../../locales/../src/interface/edithandler.cpp:1520 -#: ../../locales/../src/interface/edithandler.cpp:1525 -#: ../../locales/../src/interface/edithandler.cpp:1564 +#: ../../locales/../src/interface/edithandler.cpp:1478 +#: ../../locales/../src/interface/edithandler.cpp:1482 +#: ../../locales/../src/interface/edithandler.cpp:1517 msgid "Cannot set file association" msgstr "Neįmanoma nustatyti failo susiejimo" -#: ../../locales/../src/interface/edithandler.cpp:1101 +#: ../../locales/../src/interface/edithandler.cpp:1079 msgid "Cannot show dialog" msgstr "Neįmanoma parodyti dialogo" -#: ../../locales/../src/interface/LocalListView.cpp:1990 -#: ../../locales/../src/interface/RemoteListView.cpp:2695 +#: ../../locales/../src/interface/edithandler.cpp:1650 msgid "Cannot view/edit selected file" msgstr "Neįmanoma peržiūrėti/keisti pasirinkto failo" -#: resources.h:270 -msgid "Categories" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#, fuzzy +msgid "Case insensitive" +msgstr "Sąlygos jautrios raidžių ®istrui" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#, fuzzy +msgid "Case insensitive (default)" +msgstr "Naudoti &sistemos numatytuosius" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#, fuzzy +msgid "Case sensitive" +msgstr "Sąlygos jautrios raidžių ®istrui" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#, fuzzy +msgid "Case sensitive (default)" +msgstr "Naudoti &sistemos numatytuosius" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1498 +#, fuzzy +msgid "Categories to clear" msgstr "Kategorijos" -#: ../../locales/../src/interface/statusbar.cpp:531 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Certificate and session data are not available yet." msgstr "Sertifikatas ir sesijos duomenys dar nepasiekiami." -#: resources.h:31 -msgid "Certificate details" -msgstr "Sertifikato informacija" - -#: resources.h:3 resources.h:32 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 msgid "Certificate in chain:" msgstr "Liudijimas grandinėje:" -#: resources.h:14 resources.h:43 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "Sertifikato išdavėjas" -#: resources.h:133 +#: ../../locales/../src/engine/tlssocket.cpp:1315 +#, fuzzy +msgid "Certificate signature verification failed" +msgstr "Liudijimas grandinėje:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 msgid "Challenge:" msgstr "Iššūkis:" -#: resources.h:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 msgid "Change file attributes" msgstr "Keisti failo atributus" -#: resources.h:587 resources.h:639 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 msgid "Change the file permissions." msgstr "Keisti failo prieigos teises." -#: resources.h:967 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Pakeistos žurnalo failo nuostatos reikalauja įkelti FileZilla iš naujo." -#: ../../locales/../src/interface/FileZilla.cpp:669 +#: ../../locales/../src/interface/FileZilla.cpp:560 msgid "Character encoding issue" msgstr "Simbolių koduotės problema" -#: resources.h:115 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:527 msgid "Charset" msgstr "Koduotė" -#: resources.h:544 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 msgid "Check for &updates..." msgstr "Ieškoti atna&ujinimų..." -#: resources.h:946 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 msgid "Check for FileZilla &updates automatically:" msgstr "Automatiškai tikrinti ar yra FileZilla atnaujinimų:" -#: resources.h:1008 +#: ../../locales/../src/interface/resources/xrc/update.xrc:4 #, fuzzy msgid "Check for Updates" msgstr "Tikrinti ar yra atnaujinimų" -#: resources.h:545 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "Check for newer versions of FileZilla" msgstr "Tikrinti ar yra naujesnių FileZilla versijų" -#: ../../locales/../src/interface/update_dialog.cpp:55 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Atnaujinimų patikrinimas nepavyko" -#: ../../locales/../src/interface/netconfwizard.cpp:765 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:788 +msgid "" +"Check your login credentials. The entered password starts or ends with a " +"space character." +msgstr "" +"Patikrink savo prisijungimo duomenis. Įvestas slaptažodis prasideda ir " +"baigiasi tuščiu tarpo ženklu." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +msgid "" +"Check your login credentials. The entered username starts or ends with a " +"space character." +msgstr "" +"Patikrink savo prisijungimo duomenis. Įvestas vartotojo vardas prasideda ir " +"baigiasi tuščiu tarpo ženklu." + +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "Checking for correct external IP address" msgstr "Tikrinama ar teisingas išorinis adresas" -#: resources.h:1021 +#: ../../locales/../src/interface/resources/xrc/update.xrc:169 #, fuzzy msgid "Checking for updates..." msgstr "Ieškoma atnaujinimų" -#: ../../locales/../src/interface/updater.cpp:651 +#: ../../locales/../src/interface/updater.cpp:756 #, fuzzy, c-format msgid "Checksum match on file %s\n" msgstr "Atsisiųsto failo kontrolinė suma nesutampa." -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:752 #, fuzzy, c-format msgid "Checksum mismatch on file %s\n" msgstr "Atsisiųsto failo kontrolinė suma nesutampa." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1470 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1510 +#, fuzzy +msgid "Choose a key file" +msgstr "Konvertuoti raktinį failą" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1541 msgid "Choose the default local directory" msgstr "Nurodykite numatytą vietinį aplanką" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:130 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:378 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2192 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:129 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2302 msgid "Choose the local directory" msgstr "Pasirinkite aplanką" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:868 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:797 msgid "Chunk data improperly terminated" msgstr "Duomenų fragmentas užbaigtas neteisingai" -#: resources.h:23 resources.h:52 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "Šifras:" -#: resources.h:490 resources.h:664 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "Cl&ose tab" msgstr "Už&verti kortelę" -#: resources.h:860 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 msgid "Classic" msgstr "Klasikinis" -#: resources.h:273 -msgid "Clear &Site Manager entries" -msgstr "Išvalyti &Serverio tvarkyklės įrašus" - -#: resources.h:610 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "Išvalyti &išdėstymo atmintį" -#: resources.h:271 -msgid "Clear &quickconnect history" -msgstr "Išvalyti &greito prisijungimo istoriją" - -#: resources.h:272 -msgid "Clear &reconnect information" -msgstr "Išvalyti &prisijungimų informacija" - -#: resources.h:274 -msgid "Clear &transfer queue" -msgstr "Išvalyti &siuntimų eilę" - -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/quickconnectbar.cpp:154 msgid "Clear history" msgstr "Išvalyti istoriją" -#: resources.h:268 ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1486 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Pašalinti privačius duomenis" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:153 msgid "Clear quickconnect bar" msgstr "Išvalyti greitų prisijungimų juostą" -#: resources.h:611 -msgid "Clear string coalescer" -msgstr "Išvalyti „coalescer“ eilutę" - -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Norėdami išsaugoti savo konfigūraciją paspauskite „Baigti“." -#: resources.h:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2074 msgid "Client to server MAC:" msgstr "Iš kliento į serverį MAC:" -#: resources.h:332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2064 msgid "Client to server cipher:" msgstr "Kliento serveriui šifras:" -#: resources.h:665 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "Close &all other tabs" msgstr "Užverti &visas kitas korteles" -#: resources.h:496 ../../locales/../src/interface/Mainfrm.cpp:1241 -#: ../../locales/../src/interface/Mainfrm.cpp:1264 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 +#: ../../locales/../src/interface/Mainfrm.cpp:1132 +#: ../../locales/../src/interface/Mainfrm.cpp:1153 msgid "Close FileZilla" msgstr "Užverti FileZilla" @@ -1995,88 +2260,90 @@ msgid "Close all running instances of FileZilla" msgstr "Uždaryti visas paleistas FileZilla kopijas" -#: resources.h:491 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Užveriama esama kortelė" -#: resources.h:97 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:293 msgid "Co&mments:" msgstr "Ko&mentarai:" -#: ../../locales/../src/interface/listctrlex.cpp:759 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Stulpelio savybės" -#: resources.h:341 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Column setup" msgstr "Stulpelio nustatymai" -#: resources.h:937 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 msgid "Command and its arguments should be properly quoted." msgstr "Komanda ir jos argumentai turėtų būti tarp kabučių." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Command failed" msgstr "Komanda nepavyko" -#: ../../locales/../src/engine/proxy.cpp:550 +#: ../../locales/../src/engine/proxy.cpp:493 msgid "Command not supported" msgstr "Komanda nepalaikoma" -#: ../../locales/../src/engine/engineprivate.cpp:183 +#: ../../locales/../src/engine/engineprivate.cpp:223 msgid "Command not supported by this protocol" msgstr "Komanda nepalaikoma šio protokolo" -#: ../../locales/../src/engine/logging.cpp:214 -#: ../../locales/../src/interface/StatusView.cpp:300 -#: ../../locales/../src/interface/StatusView.cpp:353 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:338 msgid "Command:" msgstr "Komanda:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" msgstr "Komentaras" -#: ../../locales/../src/interface/verifycertdialog.cpp:179 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Bendras pavadinimas:" -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:441 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Susisiekimas sugadintas maršrutizatoriaus arba ugniasienės" -#: resources.h:508 resources.h:643 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 msgid "Compare &modification time" msgstr "Palyginti &keitimų laiką" -#: resources.h:507 resources.h:642 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 msgid "Compare file&size" msgstr "Palyginti failo &dydį" -#: resources.h:917 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 msgid "Comparison &threshold (in minutes):" msgstr "Palyginimų &slenkstis (minutėmis):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Palyginimų slenkstis turi būti tarp 0 ir 1440 minučių." -#: resources.h:170 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 msgid "Compiled for:" msgstr "Sukompiliuota:" -#: resources.h:171 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 msgid "Compiled on:" msgstr "Sukompiliuota ant:" -#: resources.h:173 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 msgid "Compiled with:" msgstr "Kompiliuota su:" -#: resources.h:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 msgid "Compiler flags:" msgstr "Kompiliatoriaus parametrai:" @@ -2084,231 +2351,301 @@ msgid "Compressed" msgstr "Suglaudintas" -#: resources.h:801 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 msgid "Concurrent transfers" msgstr "Lygiagretūs siuntimai" -#: resources.h:235 resources.h:425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3101 msgid "Conditions are c&ase sensitive" msgstr "Sąlygos jautrios raidžių ®istrui" -#: resources.h:708 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" msgstr "Konfigūracijos testas" -#: resources.h:682 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:115 msgid "Configure passive mode" msgstr "Konfigūruoti pasyvią veikseną" -#: resources.h:698 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 msgid "Configure port range" msgstr "Konfigūruoti prievadų sritį" -#: resources.h:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3517 msgid "Configuring FileZilla and your network" msgstr "Konfigūruojama FileZilla ir tinklas" -#: ../../locales/../src/interface/search.cpp:1016 +#: ../../locales/../src/interface/search.cpp:1192 msgid "Confirm deletion" msgstr "Patvirtinti šalinimą" -#: ../../locales/../src/engine/local_filesys.cpp:134 -#: ../../locales/../src/interface/LocalListView.cpp:1943 -#: ../../locales/../src/interface/LocalListView.cpp:2062 -#: ../../locales/../src/interface/RemoteListView.cpp:1715 -#: ../../locales/../src/interface/RemoteListView.cpp:2646 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1125 +#: ../../locales/../src/interface/edithandler.cpp:1592 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/RemoteListView.cpp:1403 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 +#: ../../locales/../src/interface/search.cpp:1148 msgid "Confirmation needed" msgstr "Reikalingas patvirtinimas" -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Sveikiname, jūsų konfigūracija veikia." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:152 msgid "Connect bypassing proxy settings" msgstr "Prisijungti apeinant tarpinio serverio nustatymus" +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, fuzzy, c-format +msgid "Connect failed: %s" +msgstr "Tarpinio serverio užklausimas nepavyko: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#, fuzzy +msgid "Connect in current tab" +msgstr "Užveriama esama kortelė" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#, fuzzy +msgid "Connect in new tab" +msgstr "Prisijungimo laikas baigėsi" + #: ../../locales/../src/interface/cmdline.cpp:8 msgid "Connect to specified Site Manager site" msgstr "Prisijungti prie nurodyto Serverių tvarkyklės įrašo" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943 -msgid "Connected" -msgstr "Prisijungta" - -#: ../../locales/../src/interface/QueueView.cpp:1446 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Jungiamasi" -#: ../../locales/../src/interface/netconfwizard.cpp:207 -#: ../../locales/../src/interface/statuslinectrl.cpp:280 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:242 #, c-format msgid "Connecting to %s" msgstr "Jungiamasi prie %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1122 -#, c-format -msgid "Connecting to %s through proxy" +#: ../../locales/../src/engine/ControlSocket.cpp:1048 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4196 +#, fuzzy, c-format +msgid "Connecting to %s through %s proxy" msgstr "Jungiamasi prie %s per tarpinį serverį" -#: ../../locales/../src/engine/ControlSocket.cpp:990 -#: ../../locales/../src/engine/proxy.cpp:214 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:394 +#: ../../locales/../src/engine/ControlSocket.cpp:955 +#: ../../locales/../src/engine/proxy.cpp:235 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:261 #, c-format msgid "Connecting to %s..." msgstr "Jungiamasi prie %s..." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 msgid "Connection" msgstr "Prisijungimas" -#: ../../locales/../src/interface/QueueView.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1054 +#, fuzzy +msgid "Connection aborted" +msgstr "Prisijungimas baigtas" + +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Prisijungti nepavyko" -#: ../../locales/../src/engine/ControlSocket.cpp:995 -#: ../../locales/../src/engine/proxy.cpp:218 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/proxy.cpp:209 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Prisijungti su „%s“ nepavyko, bandomas kitas adresas." -#: ../../locales/../src/engine/ControlSocket.cpp:1000 +#: ../../locales/../src/engine/ControlSocket.cpp:924 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Prisijungimas su „%s“ nepavyko." -#: ../../locales/../src/engine/ControlSocket.cpp:186 -#: ../../locales/../src/engine/engineprivate.cpp:320 +#: ../../locales/../src/engine/ControlSocket.cpp:182 +#: ../../locales/../src/engine/engineprivate.cpp:692 msgid "Connection attempt interrupted by user" msgstr "Prisijungimo bandymą nutraukė naudotojas" -#: ../../locales/../src/interface/netconfwizard.cpp:543 +#: ../../locales/../src/engine/socket.cpp:1047 +#, fuzzy +msgid "Connection attempt timed out" +msgstr "Prisijungimo laikas baigėsi" + +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Prisijungimas baigtas" -#: ../../locales/../src/engine/ControlSocket.cpp:1088 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 msgid "Connection closed by server" msgstr "Prisijungimą nutraukė serveris" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:299 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:270 msgid "Connection established, initializing TLS..." msgstr "Prisijungta, inicijuoju TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:334 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:295 msgid "Connection established, sending HTTP request" msgstr "Prisijungta, siunčiama HTTP užklausa" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +#, fuzzy +msgid "Connection established, waiting for welcome message." +msgstr "Prisijungta, laukiama pasveikinimo pranešimo..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 msgid "Connection established, waiting for welcome message..." msgstr "Prisijungta, laukiama pasveikinimo pranešimo..." -#: ../../locales/../src/interface/netconfwizard.cpp:338 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Ryšys nutrūko" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:478 msgid "Connection not allowed by ruleset" msgstr "Prisijungimas neleidžiamas pagal taisykles" -#: ../../locales/../src/engine/proxy.cpp:544 +#: ../../locales/../src/engine/proxy.cpp:487 msgid "Connection refused" msgstr "Prisijungimas atmestas" -#: ../../locales/../src/engine/ControlSocket.cpp:637 -msgid "Connection timed out" -msgstr "Prisijungimo laikas baigėsi" +#: ../../locales/../src/engine/socket.cpp:1041 +#, fuzzy +msgid "Connection refused by server" +msgstr "Prisijungimą nutraukė serveris" + +#: ../../locales/../src/engine/socket.cpp:1050 +#, fuzzy +msgid "Connection reset by network" +msgstr "Prisijungimą nutraukė serveris" + +#: ../../locales/../src/engine/socket.cpp:1055 +#, fuzzy +msgid "Connection reset by peer" +msgstr "Prisijungimą nutraukė serveris" + +#: ../../locales/../src/engine/ControlSocket.cpp:556 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "Prisijungimo laikas baigėsi po %d sekundės neaktyvumo" +msgstr[1] "Prisijungimo laikas baigėsi po %d sekundžių neaktyvumo" +msgstr[2] "Prisijungimo laikas baigėsi po %d sekundžių neaktyvumo" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "Prisijungimo laikas baigėsi." -#: ../../locales/../src/interface/search.cpp:659 +#: ../../locales/../src/interface/search.cpp:666 msgid "Connection to server lost." msgstr "Ryšys su serveriu nutrūko." -#: ../../locales/../src/engine/proxy.cpp:230 +#: ../../locales/../src/engine/proxy.cpp:218 msgid "Connection with proxy established, performing handshake..." msgstr "Prisijungta per tarpinį serverį, atliekamas rankos paspaudimas..." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Prisijungimas su serveriu buvo prieš laiką uždarytas." -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Prisijungimo bandymas su testuojamu serveriu nepavyko." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#, fuzzy +msgid "Convert key file" msgstr "Konvertuoti raktinį failą" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:651 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1773 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:629 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1880 #, c-format msgid "Copy (%d) of %s" msgstr "Kopijuoti (%d) iš %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:628 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1750 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:609 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1860 #, c-format msgid "Copy of %s" msgstr "%s Kopija" -#: resources.h:585 resources.h:637 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#, fuzzy +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Kopijuoti pasirinktų elementų URL adresus į iškarpinę." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopijuoti pasirinktų elementų URL adresus į iškarpinę." -#: ../../locales/../src/engine/transfersocket.cpp:219 +#: ../../locales/../src/engine/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Negaliu priimti prisijungimo: %s" +#: ../../locales/../src/engine/tlssocket.cpp:1295 +#, fuzzy +msgid "Could not add certificate to temporary trust list" +msgstr "Šakninis liudijimas nepatikimas" + #: ../../locales/../src/interface/bookmarks_dialog.cpp:99 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:533 msgid "Could not add connection to Site Manager" msgstr "Nepavyko pridėti ryšio prie serverių tvarkyklės" -#: ../../locales/../src/interface/state.cpp:842 +#: ../../locales/../src/interface/state.cpp:772 msgid "Could not complete operation" msgstr "Baigti operacijos nepavyko" -#: ../../locales/../src/engine/ControlSocket.cpp:188 +#: ../../locales/../src/engine/ControlSocket.cpp:184 msgid "Could not connect to server" msgstr "Nepavyko prisijungti prie serverio" -#: ../../locales/../src/engine/ControlSocket.cpp:1164 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Could not connect to server: %s" msgstr "Nepavyko prisijungti prie serverio: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:827 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:693 msgid "Could not convert command to server encoding" msgstr "Nepavyko konvertuoti komandos į serverio koduotę" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 msgid "Could not convert private key" msgstr "Nepavyko konvertuoti privataus rakto" -#: ../../locales/../src/interface/RemoteListView.cpp:3065 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1454 +#: ../../locales/../src/interface/RemoteListView.cpp:2528 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not copy URLs" msgstr "Nepavyko nukopijuoti URL" -#: ../../locales/../src/interface/aboutdialog.cpp:242 +#: ../../locales/../src/engine/tlssocket.cpp:1277 +#, fuzzy +msgid "Could not copy certificate" +msgstr "Nepavyko nukopijuoti duomenų" + +#: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "Nepavyko nukopijuoti duomenų" -#: ../../locales/../src/interface/updater.cpp:419 +#: ../../locales/../src/interface/updater.cpp:491 #, fuzzy, c-format msgid "Could not create local file %s\n" msgstr "Nepavyko įrašyti į vietinį failą" -#: ../../locales/../src/interface/RemoteListView.cpp:2568 -#: ../../locales/../src/interface/RemoteTreeView.cpp:899 +#: ../../locales/../src/engine/logging.cpp:177 +#, fuzzy, c-format +msgid "Could not create logging mutex: %s" +msgstr "Nepavyko įrašyti į vietinį failą" + +#: ../../locales/../src/interface/RemoteListView.cpp:2194 +#: ../../locales/../src/interface/RemoteTreeView.cpp:865 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2318,11 +2655,11 @@ "Arba apvalko (shell) plėtinys reikiamai neįdiegtas arba jūs nenumėtėte failų " "į naršyklės langą." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4300 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4052 msgid "Could not establish connection to server" msgstr "Nepavyko prisijungti prie serverio" -#: ../../locales/../src/interface/FileZilla.cpp:494 +#: ../../locales/../src/interface/FileZilla.cpp:404 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2334,52 +2671,45 @@ "“ komandinės eilutės nuostata arba nustatant FZ_DATADIR aplinkos " "kintamąjį." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 msgid "Could not generate custom login sequence." msgstr "Nepavyko sugeneruoti pasirinktinės prisijungimo sekos." -#: ../../locales/../src/engine/tlssocket.cpp:1021 +#: ../../locales/../src/engine/tlssocket.cpp:1062 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" "Nepavyko gauti liudijimo išdavėjo vardo, gnutls_x509_get_issuer_dn nepavyko" -#: ../../locales/../src/engine/tlssocket.cpp:997 +#: ../../locales/../src/engine/tlssocket.cpp:1038 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "" "Nepavyko gauti liudijimo objekto unikalaus vardo, gnutls_x509_get_dn nepavyko" -#: ../../locales/../src/interface/state.cpp:995 +#: ../../locales/../src/interface/state.cpp:948 msgid "Could not get full remote path." msgstr "Nepavyko gauti pilno nutolusio kelio." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Could not get reply from fzputtygen." msgstr "Nepavyko gauti atsakymo iš fzputtygen." -#: ../../locales/../src/interface/RemoteListView.cpp:2629 +#: ../../locales/../src/interface/edithandler.cpp:1580 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Could not get temporary directory to download file into." msgstr "Nepavyko gauti laikino aplanko į kurį būtų atsiunčiami failai." -#: ../../locales/../src/engine/tlssocket.cpp:939 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Nepavyko importuoti tokių pat liudijimų, gnutls_x509_crt_import nepavyko" - -#: ../../locales/../src/engine/tlssocket.cpp:933 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Nepavyko inicijuoti tokių pat struktūros liudijimų, gnutls_x509_crt_init " -"nepavyko" +#: ../../locales/../src/interface/FileZilla.cpp:84 +#, fuzzy, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Negaliu įrašyti į lizdą: %s" -#: ../../locales/../src/interface/import.cpp:119 -#: ../../locales/../src/interface/import.cpp:310 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:304 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2389,53 +2719,55 @@ "Negaliu įkrauti „%s“, įsitikinkite, kad failas tinkamas ir yra prieinamas.\n" "Bet kokie serverių tvarkyklės pakeitimai nebus išsaugoti." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223 -msgid "Could not load keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#, fuzzy +msgid "Could not load key file" msgstr "Nepavyko įkelti rakto failo" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Nepavyko įkelti privataus rakto" -#: ../../locales/../src/interface/state.cpp:1021 +#: ../../locales/../src/interface/state.cpp:970 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Nepavyko gauti atitinkamo vietinio aplanko nuotoliniam aplankui „%s“.\n" "Ar uždrausti sinchronizuotąjį naršymą ir pratęsti nuotolinio aplanko keitimą?" -#: ../../locales/../src/interface/state.cpp:404 +#: ../../locales/../src/interface/state.cpp:355 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" "Neįmanoma gauti atitinkamo vietinio aplanko nuotoliniam aplankui „%s“.\n" "Sinchronizuotasis naršymas buvo uždraustas." -#: ../../locales/../src/interface/state.cpp:295 +#: ../../locales/../src/interface/state.cpp:260 #, c-format msgid "" -"Could not obtain corresponding remote directory for the local directory '%" -"s'.\n" +"Could not obtain corresponding remote directory for the local directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" "Nepavyko gauti atitinkamo nuotolinio aplanko vietiniam aplankui „%s“.\n" "Sinchronizuotasis naršymas buvo uždraustas." -#: ../../locales/../src/interface/aboutdialog.cpp:242 -#: ../../locales/../src/interface/RemoteListView.cpp:3065 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1454 +#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/interface/RemoteListView.cpp:2528 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not open clipboard" msgstr "Nepavyko atverti iškarpinės" -#: ../../locales/../src/engine/logging.cpp:208 -#: ../../locales/../src/engine/logging.cpp:276 -#: ../../locales/../src/engine/logging.cpp:307 +#: ../../locales/../src/engine/logging.cpp:106 +#: ../../locales/../src/engine/logging.cpp:190 +#: ../../locales/../src/engine/logging.cpp:222 +#: ../../locales/../src/engine/logging.cpp:286 #, c-format msgid "Could not open log file: %s" msgstr "Nepavyko atverti žurnalo failo: %s" @@ -2444,67 +2776,81 @@ msgid "Could not parse remote path." msgstr "Nuotolinio kelio apdoroti nepavyko." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 +#: ../../locales/../src/interface/quickconnectbar.cpp:81 msgid "Could not parse server address:" msgstr "Serverio adreso apdoroti nepavyko:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231 +#: ../../locales/../src/interface/netconfwizard.cpp:994 +#, fuzzy +msgid "Could not read from data socket." +msgstr "Perskaityti iš jungties nepavyko: %s" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:209 #, c-format msgid "Could not read from socket: %s" msgstr "Perskaityti iš jungties nepavyko: %s" -#: ../../locales/../src/interface/sitemanager.cpp:494 +#: ../../locales/../src/interface/sitemanager.cpp:548 msgid "Could not read server item." msgstr "Nepavyko perskaityti serverio elemento." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2735 +#: ../../locales/../src/interface/netconfwizard.cpp:354 +#, fuzzy +msgid "Could not receive data from server." +msgstr "Nepavyko prisijungti prie serverio" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2602 #, c-format msgid "Could not seek to offset %s within file" msgstr "Nepavyko pasiekti pozicijos faile %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2646 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2509 msgid "Could not seek to the end of the file" msgstr "Nepavyko pereiti į failo pabaigą" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Nepavyko nusiųsti komandos į fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2766 +#: ../../locales/../src/engine/tlssocket.cpp:1246 +#, fuzzy +msgid "Could not sort peer certificates" +msgstr "Nepavyko patikrinti siuntėjo liudijimo" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2630 msgid "Could not spawn IO thread" msgstr "Nepavyko interpretuoti IO srauto" -#: ../../locales/../src/engine/ControlSocket.cpp:1137 +#: ../../locales/../src/engine/ControlSocket.cpp:1062 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Nepavyko paleisti tarpinio serverio pasveikinimo: %s" -#: ../../locales/../src/interface/QueueView.cpp:1109 -#: ../../locales/../src/interface/QueueView.cpp:1114 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Nepavyko pradėti siuntimo" -#: ../../locales/../src/interface/sitemanager.cpp:670 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 +#: ../../locales/../src/interface/sitemanager.cpp:620 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:824 #, c-format msgid "" -"Could not write \"%s\", any changes to the Site Manager could not be saved: %" -"s" +"Could not write \"%s\", any changes to the Site Manager could not be saved: " +"%s" msgstr "" "Nepavyko įrašyti „%s“, bet kokie serverių tvarkyklės pakeitimai nebus " "išsaugoti: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:858 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:816 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Nepavyko įrašyti „%s“, žymelė nebuvo pridėta: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:330 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:315 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Nepavyko įrašyti į „%s“, visuotinės žymelės negali būti išsaugotos: %s" -#: ../../locales/../src/interface/QueueView.cpp:1982 +#: ../../locales/../src/interface/QueueView.cpp:1469 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2513,94 +2859,122 @@ "Nepavyko įrašyti į „%s“, eilė negali būti išsaugota.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:791 -#: ../../locales/../src/interface/sitemanager.cpp:851 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2173 +#: ../../locales/../src/interface/sitemanager.cpp:728 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2280 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Nepavyko įrašyti „%s“, pažymėti tinklapiai nebuvo eksportuoti: %s" -#: ../../locales/../src/interface/wrapengine.cpp:1147 -#, c-format -msgid "Could not write \"%s\": %s" +#: ../../locales/../src/interface/xmlfunctions.cpp:145 +#, fuzzy, c-format +msgid "Could not write \"%s\":" msgstr "Nepavyko įrašyti „%s“: %s" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 -#, c-format -msgid "Could not write keyfile: %s" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#, fuzzy, c-format +msgid "Could not write key file: %s" msgstr "Nepavyko įrašyti į raktinį failą: %s" -#: ../../locales/../src/interface/QueueView.cpp:1103 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Nepavyko įrašyti į vietinį failą" -#: ../../locales/../src/engine/logging.cpp:315 -#: ../../locales/../src/engine/logging.cpp:386 +#: ../../locales/../src/engine/logging.cpp:234 +#: ../../locales/../src/engine/logging.cpp:302 #, c-format msgid "Could not write to log file: %s" msgstr "Nepavyko įrašyti į žurnalo failą: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:955 -#: ../../locales/../src/engine/ControlSocket.cpp:1053 +#: ../../locales/../src/engine/ControlSocket.cpp:879 +#: ../../locales/../src/engine/ControlSocket.cpp:983 #, c-format msgid "Could not write to socket: %s" msgstr "Negaliu įrašyti į lizdą: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:184 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Šalis:" -#: resources.h:614 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "FileZilla iškart nulūžta. Naudojama tik klaidų paieškai" - -#: resources.h:577 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 msgid "Crea&te new file" msgstr "&Sukurti naują failą" -#: resources.h:562 resources.h:576 resources.h:631 resources.h:652 +#: ../../locales/../src/interface/state.cpp:984 +msgid "Create &missing local directory and enter it" +msgstr "Sukurti &trūkstamą vietinį aplanką ir įeiti į jį" + +#: ../../locales/../src/interface/state.cpp:912 +msgid "Create &missing remote directory and enter it" +msgstr "Sukurti &trūkstamą nuotolinį aplanką ir įeiti į jį" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 msgid "Create a new subdirectory in the current directory" msgstr "Sukurti aplanką šiame aplanke" -#: resources.h:578 -msgid "Create a new, empty file in the current directory" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#, fuzzy +msgid "Create a new subdirectory in the current directory and change into it" +msgstr "Sukurti aplanką šiame aplanke" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +msgid "Create a new, empty file in the current directory" msgstr "Šiame aplanke sukurti naują tuščią failą" -#: ../../locales/../src/interface/LocalListView.cpp:1174 -#: ../../locales/../src/interface/LocalTreeView.cpp:1177 -#: ../../locales/../src/interface/RemoteListView.cpp:1617 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 +#, fuzzy +msgid "Create director&y and enter it" +msgstr "Sukurti aplanką" + +#: ../../locales/../src/interface/LocalListView.cpp:924 +#: ../../locales/../src/interface/LocalTreeView.cpp:1153 +#: ../../locales/../src/interface/RemoteListView.cpp:1301 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Create directory" msgstr "Sukurti aplanką" -#: ../../locales/../src/interface/RemoteListView.cpp:3156 +#: ../../locales/../src/interface/RemoteListView.cpp:2614 msgid "Create empty file" msgstr "Sukurti tuščią failą" -#: ../../locales/../src/interface/QueueView.cpp:1519 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Kuriamas aplankas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3340 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2046 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3118 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1862 #, c-format msgid "Creating directory '%s'..." msgstr "Kuriamas aplankas „%s“..." -#: ../../locales/../src/engine/ControlSocket.cpp:174 +#: ../../locales/../src/engine/ControlSocket.cpp:177 msgid "Critical error" msgstr "Kritinė klaida" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:168 +#, fuzzy +msgid "Critical error:" +msgstr "Kritinė klaida" + +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "Critical file transfer error" msgstr "Kritinė failo perdavimo klaida" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:117 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kritinė failo perdavimo klaida po perdavimo %s į %s" -#: ../../locales/../src/interface/state.cpp:393 +#: ../../locales/../src/interface/state.cpp:346 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2610,60 +2984,78 @@ "(%s).\n" "Sinchronizuotasis naršymas buvo uždraustas." -#: ../../locales/../src/interface/statusbar.cpp:423 +#: ../../locales/../src/interface/statusbar.cpp:393 msgid "Current transfer type is set to ASCII." msgstr "Dabartinis prisijungimo tipas nustatytas ASCII." -#: ../../locales/../src/interface/statusbar.cpp:433 +#: ../../locales/../src/interface/statusbar.cpp:401 msgid "Current transfer type is set to automatic detection." msgstr "Dabartinis siuntimų tipas yra nustatytas į automatinį aptikimą." -#: ../../locales/../src/interface/statusbar.cpp:428 +#: ../../locales/../src/interface/statusbar.cpp:397 msgid "Current transfer type is set to binary." msgstr "Dabartinis prisijungimo tipas nustatytas dvejetainiui." -#: resources.h:771 resources.h:893 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 +msgid "Curve:" +msgstr "Kreivė:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "Cus&tom" msgstr "&Pasirinktinis" -#: ../../locales/../src/interface/filter.cpp:98 +#: ../../locales/../src/interface/filter.cpp:92 msgid "Custom filter set" msgstr "Naudotojo paruoštas filtras" -#: resources.h:363 resources.h:364 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2400 msgid "Custom server" msgstr "Naudotojo paruoštas serveris" -#: resources.h:372 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "Žydra" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2520 msgid "D&ata type" msgstr "D&uomenų tipas" -#: resources.h:900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "" "D&ešimtainiai priešdėliai naudojant SI simbolius (pvz. 1 KB = 1000 baitų)" -#: resources.h:110 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:471 msgid "D&efault" msgstr "N&umatytas" -#: resources.h:580 resources.h:632 resources.h:662 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "D&elete" msgstr "&Ištrinti" -#: resources.h:216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2716 +#, fuzzy +msgid "D&irectory comparison" +msgstr "Aplankų palyginimas" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "&Išjungti viską" -#: resources.h:871 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 msgid "D&o not save passwords" msgstr "&Nesaugoti slaptažodžių" -#: resources.h:924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "D&ouble-click action on directories:" msgstr "D&vigubo paspaudimo veiksmas aplankams:" -#: resources.h:229 resources.h:404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2854 msgid "D&uplicate" msgstr "&Duplikatas" @@ -2671,17 +3063,16 @@ msgid "DOS-like with virtual paths" msgstr "Kaip DOS su virtualiais keliais" -#: ../../locales/../src/interface/LocalListView.cpp:1977 -#: ../../locales/../src/interface/RemoteListView.cpp:2680 +#: ../../locales/../src/interface/edithandler.cpp:1632 msgid "Dangerous filetype" msgstr "Pavojingi failų tipai" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Data" msgstr "Duomenys" -#: ../../locales/../src/interface/netconfwizard.cpp:991 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." msgstr "Duomenų jungtis uždaryta per anksti." @@ -2689,28 +3080,27 @@ msgid "Date" msgstr "Data" -#: resources.h:884 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 msgid "Date formatting" msgstr "Datos formatavimas" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:128 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" msgstr "Data/laikas formatas" -#: ../../locales/../src/interface/fileexistsdlg.cpp:67 -#: ../../locales/../src/interface/fileexistsdlg.cpp:71 +#: ../../locales/../src/interface/fileexistsdlg.cpp:49 msgid "Date/time unknown" msgstr "Data/laikas nežinomas" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:141 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" msgstr "Derinimas" -#: resources.h:968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 msgid "Debugging settings" msgstr "Derinimo nustatymai" -#: resources.h:101 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:351 msgid "Default &local directory:" msgstr "Numatytas &vietinis aplankas:" @@ -2718,19 +3108,21 @@ msgid "Default (Autodetect)" msgstr "Numatytasis (Automatinis aptikimas)" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:83 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." msgstr "Neteisingos numatyto redaktoriaus kabutės." -#: resources.h:242 resources.h:264 resources.h:854 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "Numatytasis failo egzistavimo veiksmas" -#: resources.h:103 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 msgid "Default r&emote directory:" msgstr "Numatytas nut&olęs aplankas:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2738,19 +3130,20 @@ "Numatytasis nuotolinis kelias negali būti apdorotas. Įsitikinkite, kad tai " "yra tinkamas absoliutus kelias, šiam serverio tipui." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:78 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Numatytoji sistemos kalba" -#: resources.h:676 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" msgstr "Numatytasis siuntimo būdas:" -#: resources.h:823 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 msgid "Default transfer type:" msgstr "Numatytas perdavimo tipas:" -#: resources.h:695 resources.h:758 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Numatyta: http://ip.filezilla-project.org/ip.php" @@ -2760,7 +3153,7 @@ msgstr "" "Uždelsimas tarp nepavykusių prisijungimų turi būti tarp 1 ir 999 sekundžių." -#: ../../locales/../src/engine/engineprivate.cpp:630 +#: ../../locales/../src/engine/engineprivate.cpp:533 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2776,63 +3169,76 @@ "Uždelsiamas ryšys %d sekundžių, dėl anksčiau sutrikusio bandymo " "prisijungti..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1243 msgid "Delete Site Manager entry" msgstr "Ištrinti serverių tvarkyklės įrašą" -#: resources.h:633 resources.h:654 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Delete selected directory" msgstr "Ištrinti pasirinktą aplanką" -#: resources.h:565 resources.h:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 msgid "Delete selected files and directories" msgstr "Ištrinti pažymėtus failus ir aplankus" -#: ../../locales/../src/interface/search.cpp:1000 -msgid "Deleting directories" +#: ../../locales/../src/engine/engineprivate.cpp:376 +#, fuzzy, c-format +msgid "Deleting \"%s\"" msgstr "Šalinami aplankai" -#: ../../locales/../src/interface/search.cpp:1000 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Kelių nesusijusių aplankų naikinimas dar nėra palaikomas" +#: ../../locales/../src/engine/engineprivate.cpp:379 +#, c-format +msgid "Deleting %u files from \"%s\"" +msgstr "Šalinami %u failai iš \"%s\"" -#: resources.h:440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3344 msgid "Deleting symbolic link" msgstr "Ištrinama simbolinė nuoroda" -#: ../../locales/../src/interface/LocalTreeView.cpp:1043 +#: ../../locales/../src/interface/LocalTreeView.cpp:971 msgid "Desktop" msgstr "Darbastalis" -#: resources.h:4 resources.h:33 resources.h:187 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Details" msgstr "Detalės" -#: resources.h:200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 msgid "Details for new key:" msgstr "Naujo rakto detalės:" -#: resources.h:238 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:753 +#, fuzzy +msgid "Detected newer version of FileZilla" +msgstr "Tikrinti ar yra naujesnių FileZilla versijų" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1335 msgid "Dire&ctories" msgstr "&Aplankai" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Direction" msgstr "Kryptis" -#: ../../locales/../src/interface/filelistctrl.cpp:283 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "Directory" msgstr "Aplankas" -#: resources.h:640 resources.h:915 resources.h:1003 -#: ../../locales/../src/interface/filelistctrl.cpp:449 -#: ../../locales/../src/interface/Mainfrm.cpp:2432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2795 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:395 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 +#: ../../locales/../src/interface/filelistctrl.cpp:468 +#: ../../locales/../src/interface/Mainfrm.cpp:2204 msgid "Directory comparison" msgstr "Aplankų palyginimas" -#: ../../locales/../src/interface/listingcomparison.cpp:74 -#: ../../locales/../src/interface/listingcomparison.cpp:82 -#: ../../locales/../src/interface/listingcomparison.cpp:88 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "Directory comparison failed" msgstr "Aplankų palyginimas nepavyko" @@ -2842,158 +3248,176 @@ "Aplankas kuriame yra žurnalo failas neegzistuoja arba failo pavadinimas yra " "netinkamas." -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +#, fuzzy +msgid "Directory listing &filters..." +msgstr "Aplankų sąrašo filtrai" + +#: ../../locales/../src/engine/ControlSocket.cpp:188 msgid "Directory listing aborted by user" msgstr "Aplankų sąrašo generavimą nutraukė naudotojas" -#: ../../locales/../src/interface/RemoteListView.cpp:2370 +#: ../../locales/../src/interface/RemoteListView.cpp:2030 msgid "Directory listing failed" msgstr "Aplankų sąrašo sudarymas nepavyko" -#: resources.h:209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 msgid "Directory listing filters" msgstr "Aplankų sąrašo filtrai" #: ../../locales/../src/engine/ControlSocket.cpp:196 +#, fuzzy, c-format +msgid "Directory listing of \"%s\" successful" +msgstr "Aplankų sąrašas sudarytas" + +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Directory listing successful" msgstr "Aplankų sąrašas sudarytas" -#: resources.h:219 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Disa&ble all" msgstr "&Išjungti viską" -#: ../../locales/../src/interface/state.cpp:1029 +#: ../../locales/../src/interface/state.cpp:977 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Ar uždrausti sinchronizuotąjį naršymą ir pratęsti nuotolinio aplanko keitimą?" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:651 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" "Išjunkite šią parinktį jeigu negalėsite matyti teisingo aplankų turinio." -#: resources.h:996 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 msgid "Disconnect from server" msgstr "Atsijungti nuo serverio" -#: ../../locales/../src/engine/ControlSocket.cpp:82 -#: ../../locales/../src/engine/ControlSocket.cpp:956 -#: ../../locales/../src/engine/ControlSocket.cpp:1055 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:950 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:952 -#: ../../locales/../src/interface/QueueView.cpp:1056 -#: ../../locales/../src/interface/QueueView.cpp:1100 +#: ../../locales/../src/engine/ControlSocket.cpp:78 +#: ../../locales/../src/engine/ControlSocket.cpp:880 +#: ../../locales/../src/engine/ControlSocket.cpp:985 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:864 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:867 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Atsijungta nuo serverio" -#: ../../locales/../src/engine/ControlSocket.cpp:1090 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:968 +#: ../../locales/../src/engine/ControlSocket.cpp:1017 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 #, c-format msgid "Disconnected from server: %s" msgstr "Atsijungta nuo serverio: %s" -#: ../../locales/../src/interface/QueueView.cpp:1417 -#: ../../locales/../src/interface/statuslinectrl.cpp:274 +#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/statuslinectrl.cpp:236 msgid "Disconnecting from previous server" msgstr "Atsijungti nuo ankstesnio serverio" -#: resources.h:997 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 msgid "Disconnects from the currently visible server" msgstr "Atsijungia nuo šiuo metu matomo serverio" -#: resources.h:550 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 msgid "Display about dialog" msgstr "Rodyti „apie“ dialogą" -#: resources.h:933 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 msgid "Do ¬ use default editor" msgstr "&Nenaudoti numatytojo redaktoriaus" -#: resources.h:606 -msgid "Do ¬hing" -msgstr "Nieko &nedaryti" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1883 +#, fuzzy +msgid "Do the same with &all selected files already being edited" +msgstr "Pažymėtas failas jau redaguojamas:" -#: ../../locales/../src/interface/Mainfrm.cpp:1244 -#: ../../locales/../src/interface/Mainfrm.cpp:1268 +#: ../../locales/../src/interface/Mainfrm.cpp:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1157 msgid "Do you really want to close FileZilla?" msgstr "Ar tikrai norite uždaryti FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Ar tikrai norite ištrinti visus Serverių tvarkyklės įrašus ir siuntimų eilę?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Ar tikrai norite ištrinti visus Serverių tvarkyklės įrašus?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1245 msgid "Do you really want to delete selected entry?" msgstr "Ar tikrai norite ištrinti pasirinktą įrašą?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Ar tikrai norite ištrinti siuntimų eilę?" -#: ../../locales/../src/interface/Mainfrm.cpp:602 +#: ../../locales/../src/interface/Mainfrm.cpp:588 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Ar tikrai norite išsiųsti „%s“ serveriui?" -#: resources.h:453 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1876 +#, fuzzy +msgid "Do you want to reopen this file?" +msgstr "Ar tikrai norite uždaryti FileZilla?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3499 msgid "Documentation" msgstr "Dokumentacija" -#: resources.h:697 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:250 msgid "Don't use external IP address on &local connections." msgstr "&Vietiniams prisijungimams nenaudoti išorinio IP adreso." -#: resources.h:834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "„Failai su tašku priekyje“ yra failai kurių pavadinimas prasideda tašku, " "pvz. .htaccess" -#: resources.h:918 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 msgid "Double-click action" msgstr "Dvigubo paspaudimo veiksmas" -#: resources.h:349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2229 msgid "Download" msgstr "Atsisiųsti" -#: resources.h:469 resources.h:810 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3706 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Atsisiuntimų &riba:" -#: ../../locales/../src/interface/statusbar.cpp:604 +#: ../../locales/../src/interface/statusbar.cpp:581 #, c-format msgid "Download limit: %s/s" msgstr "Atsisiuntimo riba:%s/s" -#: ../../locales/../src/interface/statusbar.cpp:606 +#: ../../locales/../src/interface/statusbar.cpp:583 msgid "Download limit: none" msgstr "Atsisiuntimo riba: nėra" -#: resources.h:428 ../../locales/../src/interface/search.cpp:800 -#: ../../locales/../src/interface/search.cpp:806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3148 +#: ../../locales/../src/interface/search.cpp:859 +#: ../../locales/../src/interface/search.cpp:864 msgid "Download search results" msgstr "Atsisiųsti paieškos rezultatus" -#: resources.h:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "Download selected directory" msgstr "Atsisiųsti pasirinktą aplanką" -#: resources.h:569 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 msgid "Download selected files and directories" msgstr "Atsisiųsti pažymėtus failus ir aplankus" -#: ../../locales/../src/interface/Mainfrm.cpp:1068 +#: ../../locales/../src/interface/Mainfrm.cpp:968 #, c-format msgid "" "Download speed: %s/s\n" @@ -3002,112 +3426,122 @@ "Atsisiuntimo greitis: %s/s\n" "Išsiuntimo greitis: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1127 +#: ../../locales/../src/interface/edithandler.cpp:1105 msgid "Downloading" msgstr "Atsiunčiama" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:352 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:313 #, c-format msgid "Downloading %s" msgstr "Atsiunčiama %s" -#: ../../locales/../src/interface/search.cpp:909 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Kelių nesusijusių aplankų atsisiuntimas dar nėra palaikomas" - -#: ../../locales/../src/interface/search.cpp:909 -msgid "Downloading search results" -msgstr "Atsisiunčiami paieškos rezultatai" - -#: resources.h:1013 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 #, fuzzy msgid "Downloading update..." msgstr "Atsiunčiama" -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:105 -#: ../../locales/../src/interface/QueueView.cpp:83 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:88 +#: ../../locales/../src/interface/LocalListView.cpp:107 +#: ../../locales/../src/interface/LocalTreeView.cpp:111 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:105 +#: ../../locales/../src/interface/RemoteTreeView.cpp:91 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" "&Vilkimas ir numetimas tarp skirtingų FileZilla kopijų dar nėra įgyvendintas." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:111 -#: ../../locales/../src/interface/QueueView.cpp:96 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:94 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:117 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:111 +#: ../../locales/../src/interface/RemoteTreeView.cpp:97 msgid "Drag&drop between different servers has not been implemented yet." msgstr "&Vilkimas ir numetimas tarp skirtingų serverių dar nėra įgyvendintas." -#: resources.h:87 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 msgid "Dupl&icate" msgstr "Du&plikatas" -#: resources.h:215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 msgid "E&nable all" msgstr "&Įjungti viską" -#: resources.h:555 resources.h:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 msgid "E&nter directory" msgstr "Į&veskite aplanką" -#: resources.h:151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 msgid "E&xecute" msgstr "&Vykdyti" -#: resources.h:495 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 msgid "E&xit" msgstr "Iš&eiti" -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:463 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:486 +#, fuzzy +msgid "E&xport..." +msgstr "&Eksportuoti..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "El. paštas:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:691 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:676 msgid "Each filter needs at least one condition." msgstr "Kiekvienam filtrui reikia bent vienos sąlygos." -#: resources.h:241 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1374 msgid "Edit filters" msgstr "Redaguoti filtrus" -#: resources.h:560 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Redaguokite failą su sukonfigūruotu redaktoriumi ir išsiųskite pakeitimus " "serveriui." -#: ../../locales/../src/interface/LocalListView.cpp:1888 -#: ../../locales/../src/interface/LocalListView.cpp:1899 +#: ../../locales/../src/interface/search.cpp:1124 +#, fuzzy +msgid "Editing directories is not supported" +msgstr "Kelių nesusijusių aplankų naikinimas dar nėra palaikomas" + +#: ../../locales/../src/interface/LocalListView.cpp:1618 +#: ../../locales/../src/interface/LocalListView.cpp:1627 msgid "Editing failed" msgstr "Redagavimas nepavyko" -#: resources.h:881 +#: ../../locales/../src/interface/search.cpp:1124 +#, fuzzy +msgid "Editing search results" +msgstr "Atsisiunčiami paieškos rezultatai" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Email:" msgstr "El. paštas:" -#: ../../locales/../src/interface/QueueView.cpp:2292 +#: ../../locales/../src/interface/QueueView.cpp:1747 msgid "Empty command" msgstr "Tuščia komanda" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 msgid "Empty command." msgstr "Tuščia komanda." -#: ../../locales/../src/interface/RemoteListView.cpp:2372 +#: ../../locales/../src/interface/RemoteListView.cpp:2032 msgid "Empty directory listing" msgstr "Tuščių aplankų sąrašas" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "Tuščias aplankas." -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Tuščias failo plėtinys." @@ -3121,15 +3555,15 @@ msgid "Empty name" msgstr "Tuščias pavadinimas" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:86 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 msgid "Empty quoted string." msgstr "Tuščia eilutė kabutėse." -#: resources.h:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 msgid "En&able all" msgstr "Įjun>i viską" -#: resources.h:819 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 msgid "Enable invalid character &filtering" msgstr "Įgalinti netinkamo simbolio &filtravimą" @@ -3137,36 +3571,35 @@ msgid "Encrypted" msgstr "Užšifruotas" -#: resources.h:331 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 msgid "Encryption" msgstr "Šifravimas" -#: resources.h:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1993 msgid "Encryption details" msgstr "Šifravimo informacija" -#: ../../locales/../src/interface/filelistctrl.cpp:451 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "End comparison and change sorting order?" msgstr "Baigti palyginimą ir pakeisti rūšiavimo tvarką?" -#: resources.h:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Enter &custom command..." msgstr "Įveskite &pasirinktinę komandą..." -#: resources.h:473 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3747 msgid "Enter 0 for unlimited speed." msgstr "Įveskite 0 neribotam greičiui." -#: ../../locales/../src/interface/QueueView.cpp:2281 +#: ../../locales/../src/interface/QueueView.cpp:1741 msgid "Enter command" msgstr "Įveskite komandą" -#: ../../locales/../src/interface/Mainfrm.cpp:583 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Įveskite pasirinktinę komandą" -#: resources.h:925 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 msgid "Enter directory" msgstr "Įveskite aplanką" @@ -3176,23 +3609,25 @@ msgid "Enter filter name" msgstr "Įveskite filtro pavadinimą" -#: ../../locales/../src/interface/filter.cpp:343 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Enter name for filterset" msgstr "Įveskite paruošto filtro pavadinimą" -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:274 msgid "Enter new name for filterset" msgstr "Įveskite naują filtrų rinkinio pavadinimą" -#: resources.h:126 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 msgid "Enter password" msgstr "Įveskite slaptažodį" -#: resources.h:556 resources.h:573 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Enter selected directory" msgstr "Įveskite pasirinktą aplanką" -#: resources.h:717 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#, fuzzy msgid "" "Enter the address of the server.\n" "To specify the server protocol, prepend the host with the protocol " @@ -3202,7 +3637,7 @@ "here, the values in the other fields will be overwritten then.\n" "\n" "Supported protocols are:\n" -"- ftp:// for normal FTP\n" +"- ftp:// for normal FTP with optional encryption\n" "- sftp:// for SSH file transfer protocol\n" "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" @@ -3220,16 +3655,16 @@ "- ftps:// FTP per TLS (numanomas)\n" "- ftpes:// FTP per TLS (nustatytas)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279 -#, c-format +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#, fuzzy, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" "Įveskite failo „%s“ slaptažodį.\n" "Prašau įsidėmėti, kad konvertuotas failas nebus apsaugotas slaptažodžiu." -#: resources.h:721 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" "Enter the port on which the server listens.\n" "The default for FTP is 21, the default for SFTP is 22." @@ -3237,123 +3672,127 @@ "Nurodykite prievadą, kuriuo serveris lauks užklausų.\n" "Numatytas FTP prievadas yra 21, naudojant SFTP numatytas prievadas yra 22." -#: ../../locales/../src/interface/loginmanager.cpp:63 +#: ../../locales/../src/interface/loginmanager.cpp:72 +#, fuzzy +msgid "Enter username" +msgstr "Įveskite filtro pavadinimą" + +#: ../../locales/../src/interface/loginmanager.cpp:79 msgid "Enter username and password" msgstr "Įveskite naudotojo vardą ir slaptažodį" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Klaida eksportuojant nustatymus" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:38 -#: ../../locales/../src/interface/import.cpp:108 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Importavimo klaida" -#: ../../locales/../src/interface/QueueView.cpp:2049 +#: ../../locales/../src/interface/QueueView.cpp:1543 msgid "Error loading queue" msgstr "Klaida įkraunant eilę" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:172 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:299 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:731 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:772 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:821 -#: ../../locales/../src/interface/filter.cpp:210 -#: ../../locales/../src/interface/filter.cpp:1032 -#: ../../locales/../src/interface/import.cpp:120 -#: ../../locales/../src/interface/import.cpp:311 -#: ../../locales/../src/interface/Options.cpp:216 -#: ../../locales/../src/interface/QueueView.cpp:1962 -#: ../../locales/../src/interface/search.cpp:1077 -#: ../../locales/../src/interface/search.cpp:1098 -#: ../../locales/../src/interface/sitemanager.cpp:241 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:553 -#: ../../locales/../src/interface/sitemanager.cpp:616 -#: ../../locales/../src/interface/sitemanager.cpp:730 -#: ../../locales/../src/interface/sitemanager.cpp:815 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:731 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:786 -#: ../../locales/../src/interface/wrapengine.cpp:989 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:169 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:284 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:699 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:736 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:782 +#: ../../locales/../src/interface/filter.cpp:864 +#: ../../locales/../src/interface/filter.cpp:956 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:305 +#: ../../locales/../src/interface/Options.cpp:244 +#: ../../locales/../src/interface/QueueView.cpp:1452 +#: ../../locales/../src/interface/search.cpp:1252 +#: ../../locales/../src/interface/search.cpp:1271 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:577 +#: ../../locales/../src/interface/sitemanager.cpp:674 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:746 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:804 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "Klaida įkraunant xml failą" -#: ../../locales/../src/interface/QueueView.cpp:1948 +#: ../../locales/../src/interface/QueueView.cpp:1441 msgid "Error saving queue" msgstr "Klaida saugant eilę" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "Error starting program" msgstr "Klaida paleidžiant programą" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:859 -#: ../../locales/../src/interface/QueueView.cpp:1983 -#: ../../locales/../src/interface/sitemanager.cpp:671 -#: ../../locales/../src/interface/sitemanager.cpp:792 -#: ../../locales/../src/interface/sitemanager.cpp:852 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:810 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2174 -#: ../../locales/../src/interface/wrapengine.cpp:1148 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:316 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:817 +#: ../../locales/../src/interface/QueueView.cpp:1470 +#: ../../locales/../src/interface/sitemanager.cpp:621 +#: ../../locales/../src/interface/sitemanager.cpp:729 +#: ../../locales/../src/interface/sitemanager.cpp:783 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:825 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2281 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 msgid "Error writing xml file" msgstr "Klaida rašant į xml failą" -#: ../../locales/../src/engine/logging.cpp:213 -#: ../../locales/../src/interface/StatusView.cpp:298 -#: ../../locales/../src/interface/StatusView.cpp:349 +#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:334 msgid "Error:" msgstr "Klaida:" -#: resources.h:465 -msgid "Establish connection in a new tab" -msgstr "Užmegzti ryšį naujoje kortelėje" - -#: resources.h:944 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Pavyzdžiui: png „c:\\program files\\viewer\\viewer.exe“ -open" -#: resources.h:903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 msgid "Examples" msgstr "Pavyzdžiai" -#: resources.h:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 msgid "Exe&cute" msgstr "&Vykdyti" -#: ../../locales/../src/interface/update_dialog.cpp:55 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Vykdomoji programa neturi versijos informacijos, neįmanoma patikrinti ar yra " "atnaujinimų." -#: resources.h:861 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "Explorer" msgstr "Naršyklė" -#: resources.h:281 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1588 +#, fuzzy +msgid "Export &Filters" +msgstr "&Filtrai:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1583 msgid "Export &Queue" msgstr "Eksportuoti &eilę" -#: resources.h:280 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Export &Settings" msgstr "Eksportuoti &nustatymus" -#: resources.h:277 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1559 msgid "Export settings" msgstr "Eksportavimo nustatymai" -#: resources.h:230 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" msgstr "F&iltro pavadinimas:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:117 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:497 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:500 msgid "FTP - File Transfer Protocol" msgstr "FTP - Failų perdavimo protokolas" @@ -3365,17 +3804,16 @@ msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Nesaugus failų perdavimo protokolas" -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 msgid "FTP Engine not initialized, can't connect" msgstr "FTP varikliukas neinicijuotas, negalima prisijungti" -#: resources.h:745 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 msgid "FTP Keep-alive" msgstr "FTP Palaikyti-gyvą" -#: resources.h:765 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:120 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP tarpinis serveris" @@ -3383,7 +3821,7 @@ msgid "FTP URL" msgstr "FTP URL" -#: resources.h:673 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:44 msgid "" "FTP uses secondary connections for data transfers. These additional " "connections can be established in two ways." @@ -3392,188 +3830,191 @@ "prisijungimai gali būti sukurti dvejais būdais." #: ../../locales/../src/engine/server.cpp:20 -msgid "FTPES - FTP over explicit TLS/SSL" +#, fuzzy +msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP išskirtinai per TLS/SSL" #: ../../locales/../src/engine/server.cpp:19 -msgid "FTPS - FTP over implicit TLS/SSL" +#, fuzzy +msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP jei įmanoma per TLS/SSL" -#: ../../locales/../src/interface/LocalListView.cpp:549 -#: ../../locales/../src/interface/LocalListView.cpp:629 -#: ../../locales/../src/interface/LocalListView.cpp:2182 -#: ../../locales/../src/interface/LocalTreeView.cpp:901 -#: ../../locales/../src/interface/viewheader.cpp:535 +#: ../../locales/../src/interface/LocalListView.cpp:537 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:913 +#: ../../locales/../src/interface/LocalListView.cpp:1824 +#: ../../locales/../src/interface/LocalTreeView.cpp:851 +#: ../../locales/../src/interface/LocalTreeView.cpp:1129 +#: ../../locales/../src/interface/viewheader.cpp:495 msgid "Failed to change directory" msgstr "Nepavyko pakeisti aplanko" -#: ../../locales/../src/interface/FileZilla.cpp:264 -#: ../../locales/../src/interface/FileZilla.cpp:272 -#: ../../locales/../src/interface/FileZilla.cpp:274 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +#: ../../locales/../src/interface/FileZilla.cpp:134 +#: ../../locales/../src/interface/FileZilla.cpp:149 +#: ../../locales/../src/interface/FileZilla.cpp:151 msgid "Failed to change language" msgstr "Nepavyko pakeisti kalbos" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1962 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2066 msgid "Failed to copy or move sites" msgstr "Nepavyko nukopijuoti ar perkelti tinklalapio" -#: ../../locales/../src/interface/xmlfunctions.cpp:519 +#: ../../locales/../src/interface/xmlfunctions.cpp:340 msgid "Failed to create backup copy of xml file" msgstr "Nepavyko sukurti xml failo atsarginės kopijos" -#: ../../locales/../src/interface/netconfwizard.cpp:797 +#: ../../locales/../src/interface/netconfwizard.cpp:808 msgid "Failed to create listen socket, aborting" msgstr "Nepavyko sukurti klausymo jungties, nutraukiama" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4275 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4279 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4031 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4035 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Nepavyko sukurti klausymo jungties, aktyvios veiksenos failų perdavimui" -#: ../../locales/../src/interface/LocalTreeView.cpp:666 +#: ../../locales/../src/interface/LocalTreeView.cpp:628 msgid "Failed to get 'My Documents' path" msgstr "Nepavyko gauti „Mano Dokumentai“ kelio" -#: ../../locales/../src/interface/LocalTreeView.cpp:652 +#: ../../locales/../src/interface/LocalTreeView.cpp:616 msgid "Failed to get desktop path" msgstr "Nepavyko gauti darbastalio kelio" -#: ../../locales/../src/interface/netconfwizard.cpp:956 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "Nepavyko gauti kliento adreso, prisijungimas uždarytas." -#: ../../locales/../src/interface/netconfwizard.cpp:964 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "Nepavyko gauti kliento adreso, prisijungimas uždarytas." -#: ../../locales/../src/interface/context_control.cpp:79 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "Nepavyko inicijuoti FTP variklio" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:307 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:759 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:277 msgid "Failed to initialize TLS." msgstr "Nepavyko inicijuoti TLS." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:85 +#, fuzzy +msgid "Failed to initialize networking" +msgstr "Nepavyko inicijuoti FTP variklio" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Nepavyko užkrauti skydelių, netinkami resursų failai?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Nepavyko įkelti privataus rakto: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2635 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2499 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Nepavyko atverti „%s“ papildymui/įrašymui" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2697 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2565 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Nepavyko atverti „%s“ skaitymui" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2676 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1086 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2531 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1005 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Nepavyko atverti „%s“ rašymui" -#: ../../locales/../src/engine/ControlSocket.cpp:418 +#: ../../locales/../src/engine/ControlSocket.cpp:344 msgid "Failed to parse returned path." msgstr "Nepavyko apdoroti grąžinto kelio." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:315 -msgid "Failed to parse trusted root cert." -msgstr "Nepavyko apdoroti patikimo šakninio liudijimo." - #: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "Nepavyko gauti duomenų" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Failed to retrieve directory listing" msgstr "Nepavyko gauti aplankų sąrašo" -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/interface/netconfwizard.cpp:737 msgid "Failed to retrieve external ip address, aborting" msgstr "Nepavyko gauti išorinio IP adreso, nutraukiama" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3971 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3733 msgid "Failed to retrieve external ip address, using local address" msgstr "Nepavyko gauti išorinio IP adreso, naudojamas vidinis adresas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3993 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3752 msgid "Failed to retrieve local ip address." msgstr "Nepavyko gauti vidinio IP adreso." -#: ../../locales/../src/interface/netconfwizard.cpp:688 +#: ../../locales/../src/interface/netconfwizard.cpp:712 msgid "Failed to retrieve local ip address. Aborting" msgstr "Nepavyko gauti vidinio IP adreso. Nutraukiama" -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Nepavyko gauti išorinio IP adreso." -#: ../../locales/../src/interface/netconfwizard.cpp:307 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Nepavyko išsiųsti komandos." -#: ../../locales/../src/interface/FileZilla.cpp:272 +#: ../../locales/../src/interface/FileZilla.cpp:149 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Nepavyko nustatyti kalbos į %s (%s), naudojama numatytoji sistemos kalba" -#: ../../locales/../src/interface/FileZilla.cpp:257 +#: ../../locales/../src/interface/FileZilla.cpp:127 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" -"Nepavyko nustatyti kalbos į %s (%s), naudojama numatytoji sistemos kalba (%" -"s, %s)." +"Nepavyko nustatyti kalbos į %s (%s), naudojama numatytoji sistemos kalba " +"(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:245 +#: ../../locales/../src/interface/FileZilla.cpp:116 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Nepavyko nustatyti kalbos į %s (%s), naudojama numatytoji sistemos kalba." -#: ../../locales/../src/interface/FileZilla.cpp:274 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +#: ../../locales/../src/interface/FileZilla.cpp:151 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Nepavyko nustatyti kalbos į %s, naudojama numatytoji sistemos kalba" -#: ../../locales/../src/interface/FileZilla.cpp:253 +#: ../../locales/../src/interface/FileZilla.cpp:123 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Nepavyko nustatyti kalbos į %s, naudojama numatytoji sistemos kalba (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:242 +#: ../../locales/../src/interface/FileZilla.cpp:113 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Nepavyko nustatyti kalbos į %s, naudojama numatytoji sistemos kalba." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:206 msgid "Failed to validate settings" msgstr "Nepavyko patvirtini nuostatų" -#: ../../locales/../src/engine/tlssocket.cpp:1079 +#: ../../locales/../src/engine/tlssocket.cpp:1305 msgid "Failed to verify peer certificate" msgstr "Nepavyko patikrinti siuntėjo liudijimo" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:554 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:509 #, c-format msgid "Failed to write to file %s" msgstr "Nepavyko įrašyti į failą %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:537 +#: ../../locales/../src/interface/xmlfunctions.cpp:353 msgid "Failed to write xml file" msgstr "Klaida rašant xml failą" @@ -3581,111 +4022,117 @@ msgid "Failed transfers" msgstr "Nepavykę siuntimai" -#: resources.h:688 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 msgid "Fall back to active mode" msgstr "Sugrįžti į aktyvią veikseną" -#: resources.h:356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2308 msgid "Fil&e:" msgstr "Fa&ilas:" -#: resources.h:237 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "Fil&es" msgstr "Fa&ilai" -#: ../../locales/../src/interface/filelistctrl.cpp:282 +#: ../../locales/../src/interface/filelistctrl.cpp:267 msgid "File" msgstr "Failas" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:124 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 msgid "File Types" msgstr "Failų tipai" -#: ../../locales/../src/interface/import.cpp:108 +#: ../../locales/../src/engine/socket.cpp:1046 +msgid "File descriptor not a socket" +msgstr "Failo deskriptorius ne socket'as" + +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Failas neturi jokių importuojamų duomenų." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:132 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "Failo redagavimas" -#: ../../locales/../src/interface/RemoteListView.cpp:1925 +#: ../../locales/../src/interface/RemoteListView.cpp:1613 msgid "File exists" msgstr "Failas egzistuoja" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:125 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 msgid "File exists action" msgstr "Failo egzistavimo veiksmas" -#: resources.h:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 msgid "File has changed" msgstr "Failas buvo pakeistas" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:130 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 msgid "File lists" msgstr "Failų sąrašai" -#: ../../locales/../src/interface/edithandler.cpp:1604 -#: ../../locales/../src/interface/FileZilla.cpp:691 -#: ../../locales/../src/interface/FileZilla.cpp:785 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:127 +#: ../../locales/../src/interface/edithandler.cpp:1556 +#: ../../locales/../src/interface/FileZilla.cpp:582 +#: ../../locales/../src/interface/FileZilla.cpp:667 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Failas nerastas" -#: resources.h:1007 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3144 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/search.cpp:681 +#: ../../locales/../src/interface/search.cpp:686 msgid "File search" msgstr "Failo paieška" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:124 msgid "File transfer aborted by user" msgstr "Failo perdavimą nutraukė naudotojas" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Failo perdavimas nutrauktas naudotojas perdavus %s į %s" -#: ../../locales/../src/engine/ControlSocket.cpp:139 +#: ../../locales/../src/engine/ControlSocket.cpp:134 msgid "File transfer failed" msgstr "Failo perdavimas nepavyko" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:119 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Failo perdavimas nepavyko perdavus %s į %s" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:129 msgid "File transfer skipped" msgstr "Praleistas failo perdavimas" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer successful" msgstr "Failas perduotas sėkmingai" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:112 #, c-format msgid "File transfer successful, transferred %s in %s" -msgstr "Failo perdavimas pavyko, perduotas %s į %s" +msgstr "Failo perdavimas pavyko, perduotas %s per %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1243 +#: ../../locales/../src/interface/Mainfrm.cpp:1134 msgid "File transfers still in progress." msgstr "Failų siuntimas vis dar vyksta." -#: resources.h:374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "File would transfer with ASCII data type." msgstr "Failas bus perduotas naudojant ASCII duomenų tipą." -#: resources.h:375 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "File would transfer with binary data type." msgstr "Failas bus perduotas naudojant dvejetainį duomenų tipą." -#: ../../locales/../src/interface/FileZilla.cpp:495 -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/FileZilla.cpp:405 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 msgid "FileZilla Error" msgstr "FileZilla klaida" -#: resources.h:710 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." @@ -3693,57 +4140,48 @@ "FileZilla gali patikrinti jūsų konfigūraciją, kad įsitikintų jog viskas " "sukonfigūruota teisingai." -#: resources.h:464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 msgid "FileZilla is already connected to a server." msgstr "FileZilla jau yra prisijungusi prie serverio." -#: ../../locales/../src/interface/Mainfrm.cpp:1576 +#: ../../locales/../src/interface/Mainfrm.cpp:1434 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "FileZilla turi būti perkrauta, kad kalbos pakeitimas įsigaliotų." -#: resources.h:957 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 msgid "FileZilla updates" msgstr "FileZilla atnaujinimai" -#: resources.h:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 msgid "Filelist status &bars" msgstr "Failų sąrašo būsenos &juosta" -#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1090 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:372 -#: ../../locales/../src/interface/search.cpp:369 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/LocalListView.cpp:279 +#: ../../locales/../src/interface/RemoteListView.cpp:393 +#: ../../locales/../src/interface/search.cpp:150 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Filename" msgstr "Failo pavadinimas" -#: resources.h:504 -msgid "Filename &filters..." -msgstr "Failo &filtrai..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3137 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2309 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2922 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2106 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "Failo pavadinimas negali būti sukurtas aplankui %s ir failo pavadinimui %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1911 +#: ../../locales/../src/interface/RemoteListView.cpp:1599 msgid "Filename invalid" msgstr "Netinkamas failo pavadinimas" -#: ../../locales/../src/interface/RemoteListView.cpp:3181 -msgid "" -"Filename may not contain any of the following characters: / \\ : * ? \" < > |" -msgstr "" -"Failų pavadinimai negali būti sudaryti iš šių simbolių: / \\ : * ? \" < > |" - -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "Failo pavadinimas nepakeistas" -#: resources.h:294 resources.h:961 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1698 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "Failo pavadinimas:" @@ -3758,102 +4196,119 @@ msgstr "" "Failų pavadinimai negali būti sudaryti iš šių simbolių: / \\ : * ? \" < > |" -#: resources.h:322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Files currently being edited" msgstr "Šiuo metu redaguojami failai" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:371 +#: ../../locales/../src/interface/LocalListView.cpp:280 +#: ../../locales/../src/interface/RemoteListView.cpp:394 +#: ../../locales/../src/interface/search.cpp:152 msgid "Filesize" msgstr "Failo dydis" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:129 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "Failo dydžio formatas" -#: ../../locales/../src/interface/LocalListView.cpp:280 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:372 +#: ../../locales/../src/interface/LocalListView.cpp:281 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:153 msgid "Filetype" msgstr "Failo tipas" -#: resources.h:945 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:133 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Failų tipų susiejimai" -#: resources.h:236 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1323 msgid "Filter applies to:" msgstr "Filtras taikomas:" -#: resources.h:818 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 msgid "Filter invalid characters in filenames" msgstr "Netinkami simboliai filtro pavadinime" #: ../../locales/../src/interface/filteredit.cpp:149 #: ../../locales/../src/interface/filteredit.cpp:217 #: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:358 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Toks failas jau yra" -#: resources.h:232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 msgid "Filter out items matching all of the following" msgstr "Išfiltruoti įrašus kurie atitinka visus šiuos" -#: resources.h:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 msgid "Filter out items matching any of the following" msgstr "Išfiltruoti įrašus kurie atitinka bet kuriuos iš šių" -#: resources.h:234 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 msgid "Filter out items matching none of the following" msgstr "Išfiltruoti įrašus kurie neatitinka jokio iš šių" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 +#, fuzzy +msgid "Filter out items matching not all of the following" +msgstr "Išfiltruoti įrašus kurie atitinka visus šiuos" + +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Filter set already exists" msgstr "Filtras tokiu pavadinimu jau yra" -#: resources.h:1000 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 msgid "Filter the directory listings" msgstr "Filtruoti aplankų sąrašus" -#: ../../locales/../src/interface/filteredit.cpp:340 -#: ../../locales/../src/interface/filteredit.cpp:349 -#: ../../locales/../src/interface/filteredit.cpp:358 +#: ../../locales/../src/interface/filteredit.cpp:337 +#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter validation failed" msgstr "Filtro patikrinimas nepavyko" -#: resources.h:10 resources.h:39 -msgid "Fingerprint (MD5):" -msgstr "Antspaudas (MD5):" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 +#, fuzzy +msgid "Find &files" +msgstr "%d failas" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3111 +#, fuzzy +msgid "Find d&irectories" +msgstr "Šalinami aplankai" -#: resources.h:11 resources.h:40 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" msgstr "Antspaudas (SHA-1):" -#: resources.h:190 resources.h:203 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 +#, fuzzy +msgid "Fingerprint (SHA-256):" +msgstr "Antspaudas (SHA-1):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 msgid "Fingerprint:" msgstr "Antspaudas:" -#: ../../locales/../src/interface/netconfwizard.cpp:42 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Ugniasienės ir maršrutizatoriaus konfigūravimo vedlys" -#: resources.h:728 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." msgstr "" "Išsamesnei pasirinkčių informacijai, paleiskite tinklo konfigūracijos vedlį." -#: resources.h:705 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 msgid "For reliability you should specify a range of at least 10 ports." msgstr "Normaliam darbui reikia nustatyti bent 10-ties prievadų sritį." -#: ../../locales/../src/interface/Options.cpp:215 +#: ../../locales/../src/interface/Options.cpp:243 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -3861,70 +4316,100 @@ "Šiam seansui bus naudojamos numatytosios nuostatos. Bet kokie nuostatų " "pakeitimai nebus išsaugoti." -#: resources.h:119 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Force &UTF-8" msgstr "Priverstinai &UTF-8" -#: resources.h:538 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Force showing &hidden files" msgstr "Priversti rodyti &paslėptus failus" -#: ../../locales/../src/interface/Mainfrm.cpp:681 +#: ../../locales/../src/interface/Mainfrm.cpp:646 msgid "Force showing hidden files" msgstr "Priversti rodyti paslėptus failus" -#: resources.h:772 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 msgid "Format specifications:" msgstr "Formato nustatymai:" -#: resources.h:943 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Formatas: Plėtinys, po to seka tinkama komanda ir argumentai - tarp kabučių." -#: resources.h:456 +#. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n +#: ../../locales/../src/interface/updater.cpp:688 +#, c-format +msgid "Found new %s %s\n" +msgstr "Rastas naujas %s %s\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 msgid "Further documentation" msgstr "Papildoma dokumentacija" -#: resources.h:88 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 msgid "General" msgstr "Pagrindinis" -#: ../../locales/../src/engine/proxy.cpp:532 +#: ../../locales/../src/engine/proxy.cpp:475 msgid "General SOCKS server failure" msgstr "General SOCKS serverio klaida" -#: resources.h:790 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:122 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Bazinis tarpinis serveris" -#: resources.h:694 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" msgstr "Gauti išorinį IP iš šio URL:" -#: resources.h:457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3542 msgid "Getting help" msgstr "Naudojimasis žinynu" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Toks filtrų rinkinys jau yra, perrašyti?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:246 msgid "Global bookmarks" msgstr "Bendrosios žymelės" -#: resources.h:176 +#: ../../locales/../src/engine/tlssocket.cpp:313 +#, c-format +msgid "GnuTLS error %d" +msgstr "GnuTLS klaida %d" + +#: ../../locales/../src/engine/tlssocket.cpp:315 +#, c-format +msgid "GnuTLS error %d in %s" +msgstr "GnuTLS klaida %d viduje %s" + +#: ../../locales/../src/engine/tlssocket.cpp:309 +#, c-format +msgid "GnuTLS error %d in %s: %s" +msgstr "GnuTLS klaida %d viduje %s: %s" + +#: ../../locales/../src/engine/tlssocket.cpp:307 +#, c-format +msgid "GnuTLS error %d: %s" +msgstr "GnuTLS klaida %d: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "GnuTLS:" msgstr "GnuTLS:" -#: resources.h:148 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "Žalia" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 msgid "Group permissions" msgstr "Grupės prieigos teisės" -#: resources.h:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "Au&kštas" @@ -3932,7 +4417,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP per TLS" -#: resources.h:327 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2028 msgid "Hash:" msgstr "Maiša:" @@ -3940,65 +4425,72 @@ msgid "Hidden" msgstr "Paslėpta" -#: resources.h:816 ../../locales/../src/interface/queue.cpp:924 -#: ../../locales/../src/interface/queue.cpp:1011 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "High" msgstr "Aukštas" -#: ../../locales/../src/interface/queue.cpp:926 -#: ../../locales/../src/interface/queue.cpp:1013 +#: ../../locales/../src/interface/queue.cpp:885 +#: ../../locales/../src/interface/queue.cpp:941 msgid "Highest" msgstr "Aukščiausias" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Didžiausias galimas prievadas turi būti skaičius tarp 1024 ir 65535." -#: resources.h:220 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Norėdami perjungti filtro būseną abiejose pusėse kartu, laikykite nuspaustą " "„shift“ klavišą." -#: resources.h:167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Homepage:" msgstr "Namų puslapis:" -#: resources.h:329 +#: ../../locales/../src/engine/socket.cpp:1057 +msgid "Host is down" +msgstr "Serveris atsijungęs" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2038 msgid "Host key fingerprint:" msgstr "Serverio rakto antspaudas:" -#: resources.h:196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 msgid "Host key mismatch" msgstr "Serverio raktas nesutampa" -#: ../../locales/../src/engine/server.cpp:168 +#: ../../locales/../src/engine/server.cpp:158 msgid "Host starts with '[' but no closing bracket found." msgstr "Rastas serveris prasideda „[“, bet nėra uždarančio skliausto." -#: ../../locales/../src/engine/proxy.cpp:541 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "Host unreachable" msgstr "Serveris nepasiekiamas" -#: resources.h:17 resources.h:46 resources.h:131 resources.h:188 -#: resources.h:201 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 msgid "Host:" msgstr "Serveris:" -#: resources.h:106 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 msgid "Hours," msgstr "Valandos" -#: resources.h:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (pavyzdys: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:140 +#: ../../locales/../src/engine/proxy.cpp:115 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 adresai nesuderinami su SOCKS4 tarpiniu serveriu" -#: resources.h:732 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4008,13 +4500,13 @@ "numatytą laiką, ryšys bus nutrauktas ir FileZilla bandys prisijungti iš " "naujo." -#: resources.h:977 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Pranešdami apie programos defektus, prašome pridėti žurnalą sukurtą esant " "įjungtam detaliam žurnalo pildymui." -#: resources.h:685 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" "If the automatic test at the end of this wizard succeeds, but you cannot " "transfer files to a particular server, the server might be misconfigured and " @@ -4026,7 +4518,7 @@ "nesuderintas ir jums reikėtų išbandyti aktyvią veikseną. Serverių " "tvarkyklėje galima nustatyti veikseną kiekvienam serveriui atskirai." -#: resources.h:680 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 msgid "" "If the fallback option is enabled, you will be able to connect to " "misconfigured servers which reject the selected transfer mode." @@ -4034,7 +4526,7 @@ "Jei sugrįžimo pasirinktis įgalinta, jūs galėsite prisijungti prie blogai " "sukonfigūruotų serverių kurie atmeta pasirinktą siuntimo būdą." -#: resources.h:199 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4042,31 +4534,31 @@ "Jei serverio rakto pakeitimas buvo netikėtas, prašome susisiekti su serverio " "administratoriumi." -#: ../../locales/../src/interface/netconfwizard.cpp:554 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" "Jei problema išlieka, tai maršrutizatorius ir/ar užkarda blokuoja FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" "Jei problema išlieka, tai tam maršrutizatorius ir/ar užkarda pertraukia ryšį." -#: resources.h:966 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "" -"If the size of the logfile reaches the limit, it gets renamed by adding \".1" -"\" to the end of the filename (possibly overwriting older logfiles) and a " -"new file gets created." +"If the size of the logfile reaches the limit, it gets renamed by adding " +"\".1\" to the end of the filename (possibly overwriting older logfiles) and " +"a new file gets created." msgstr "" "Jeigu žurnalo failo dydis pasiekia savo apribojimą, tai jis yra pervadinamas " "pridedant „.1“ prie failo pavadinimo pabaigos (gali būti jog perrašomi seni " "žurnalo failai) ir sukuriamas naujas failas." -#: resources.h:442 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3356 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4074,7 +4566,7 @@ "Jeigu simbolinė nuoroda nurodo aplanką, FilleZilla gali arba ištrinti " "simbolinę nuorodą, arba pašalinti susieto aplanko turinį." -#: ../../locales/../src/interface/netconfwizard.cpp:624 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4082,13 +4574,14 @@ "Jei ši problema kartosis, prašau susisiekti su savo maršrutizatoriaus arba " "ugniasienės gamintoju dėl sprendimo." -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Jei ši problema išliks, prašau susisiekti su savo maršrutizatoriaus " "gamintoju." -#: resources.h:265 resources.h:855 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1457 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4098,7 +4591,7 @@ "suderintas su serveriu. Jei laikas skirsis (pvz. skirtinga laiko zona), " "nurodykite laiko juostos poslinkį serverių tvarkyklėje." -#: resources.h:916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4106,11 +4599,12 @@ "Jei naudojatės laiko įspaudais paremtu palyginimu, laikykite du failus " "lygiais, jei jų laiko įspaudų skirtumas neviršija šio slenksčio." -#: resources.h:931 -msgid "If you change the language, you should restart FileZilla." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#, fuzzy +msgid "If you change the language, you need to restart FileZilla." msgstr "Pakeitę kalbą, turėtumėte FileZilla paleisti iš naujo." -#: resources.h:711 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" "If you click on test, FileZilla will connect to probe.filezilla-project.org " "and will perform some simple tests." @@ -4118,23 +4612,23 @@ "Jei paspausite testas, tuomet FileZilla prisijungs prie serverio probe." "filezilla-project.org ir atliks keletą paprastų testų." -#: ../../locales/../src/interface/Mainfrm.cpp:1267 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "If you close FileZilla, your changes will be lost." msgstr "Jeigu užversite FileZilla, pakeitimai bus prarasti." -#: resources.h:831 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "" "Jei failų tipus nurodysite neteisingai, siunčiant jie gali būti sugadinti." -#: resources.h:712 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." msgstr "" "Jei pamatysite pranešimų apie klaidas, tuomet jūsų konfigūracija neteisinga." -#: resources.h:744 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4142,7 +4636,7 @@ "Jei jums nepavyksta gauti aplankų sąrašo ar persiųsti failus, pamėginkite " "pakeisti numatytąjį siuntimo būdą." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4153,7 +4647,7 @@ "pabandykite perjungti pasyvią veikseną ir susisiekite su serverio " "administratoriumi dėl pagalbos." -#: resources.h:671 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 msgid "" "If you successfully complete the wizard and the final test succeeds, any " "firewalls and routers you have should be configured properly." @@ -4161,7 +4655,7 @@ "Jei sėkmingai užbaigėte vedlį ir paskutinis testas buvo sėkmingas, visos " "jūsų naudojamos ugniasienės ar maršrutizatoriai buvo paruošti naudoti." -#: resources.h:707 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 msgid "" "If you use a firewall, make sure FileZilla is allowed to accept connection " "on all given ports." @@ -4169,7 +4663,7 @@ "Jei naudojate ugniasienę, tuomet įsitikinkite, kad programai FileZilla " "leidžiama priimti prisijungimus prie nurodytų prievadų." -#: resources.h:706 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 msgid "" "If you use a router, make sure all these ports are forwarded to the machine " "you're running FileZilla on." @@ -4177,7 +4671,7 @@ "Jei jūs naudojate maršrutizatorių, tuomet įsitikinkite, kad visi prievadai, " "kuriuos naudoja FileZilla, yra atidaryti (forwarded)." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4185,25 +4679,25 @@ "Jei jūsų maršrutizatorius vis keičia IP adresus, prašau susisiekti su jūsų " "maršrutizatoriaus gamintoju." -#: ../../locales/../src/interface/import.cpp:96 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importuoti duomenis iš senesnės versijos" -#: resources.h:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 msgid "Import settings" msgstr "Importuoti nustatymus" #: ../../locales/../src/interface/import.cpp:81 -#: ../../locales/../src/interface/import.cpp:84 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Importavimas sėkmingas" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50 -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 msgid "Improperly quoted association." msgstr "Neteisingai panaudotos kabutės susiejime." -#: resources.h:699 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" "In active mode, FileZilla has to listen on a port for data transfers. You " "have to specify which ports FileZilla will use." @@ -4211,7 +4705,7 @@ "Esant aktyviai veiksenai, FileZilla duomenų perdavimui turi laukti užklausų " "tam tikrais prievadais. Reikia nurodyti, kokius prievadus naudos FileZilla." -#: resources.h:701 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 msgid "" "In case you have a router, you will have to forward all available ports, as " "FileZilla has no influence on the ports your system chooses." @@ -4219,7 +4713,8 @@ "Maršrutizatoriaus atveju, reikia atidaryti visus turimus prievadus, kadangi " "FileZilla neturi įtakos tam, kokius prievadus parinks sistema." -#: resources.h:689 resources.h:753 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4227,7 +4722,7 @@ "Norint naudoti aktyvią veikseną, programai reikia žinoti jūsų išorinį IP " "adresą." -#: resources.h:674 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:52 msgid "" "In passive mode, which is recommended for most users, FileZilla asks the " "server for a port and connects to the given port. Not much configuration has " @@ -4237,58 +4732,66 @@ "serverio prievado ir prie jo prisijungs. Šiuo atveju daug konfigūracijos " "nereikia." -#: ../../locales/../src/engine/tlssocket.cpp:1093 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Neužbaigta grandinė, viršutinis liudijimas nėra savarankiškai " -"prisijungiantis liudijimų įstaigos liudijimas" - -#: ../../locales/../src/interface/QueueView.cpp:1052 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Neteisingas slaptažodis" -#: resources.h:1022 +#: ../../locales/../src/interface/resources/xrc/update.xrc:199 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." msgstr "" +"Informacija apie naujausią FileZilla versiją nebuvo gauta. Prašoma pabandyti " +"dar kartą vėliau." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750 msgid "Initializing TLS..." msgstr "Inicijuojama TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#, fuzzy +msgid "Insecure algorithm!" +msgstr "Parašo algoritmas:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:734 msgid "Insecure server, it does not support FTP over TLS." msgstr "Nesaugus serveris, jis nepalaiko FTP per TLS." -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/engine/server.cpp:884 +#: ../../locales/../src/engine/server.cpp:905 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktyviai" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:126 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 msgid "Interface" msgstr "Sąsaja" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/QueueView.cpp:1009 -#: ../../locales/../src/interface/QueueView.cpp:1588 +#: ../../locales/../src/engine/socket.cpp:1043 +#, fuzzy +msgid "Interrupted by signal" +msgstr "Pertraukė naudotojas" + +#: ../../locales/../src/engine/ControlSocket.cpp:217 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Pertraukė naudotojas" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:786 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:715 msgid "Invalid Content-Length" msgstr "Netinkamas turinio ilgis" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:565 msgid "Invalid HTTP Response" msgstr "Netinkamas HTTP atsakymas" -#: ../../locales/../src/engine/ControlSocket.cpp:536 -#: ../../locales/../src/engine/ControlSocket.cpp:582 +#: ../../locales/../src/engine/socket.cpp:1031 +#, fuzzy +msgid "Invalid argument passed" +msgstr "Netinkamas atsakymo kodas" + +#: ../../locales/../src/engine/ControlSocket.cpp:451 +#: ../../locales/../src/engine/ControlSocket.cpp:508 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4296,48 +4799,49 @@ "Gauta netinkama simbolių seka, išjungiamas UTF-8. Pasirinkite UTF-8 " "pasirinktį serverių tvarkyklėje jei norite priversti naudoti UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:910 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:829 msgid "Invalid chunk size" msgstr "Netinkamas fragmento dydis" -#: ../../locales/../src/interface/netconfwizard.cpp:353 -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Gauti netinkami duomenys" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 -#: ../../locales/../src/interface/verifycertdialog.cpp:48 +#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:55 msgid "Invalid date" msgstr "Netinkama data" #: ../../locales/../src/interface/file_utils.cpp:290 #: ../../locales/../src/interface/file_utils.cpp:315 -#: ../../locales/../src/interface/RemoteListView.cpp:3181 msgid "Invalid filename" msgstr "Netinkamas failo pavadinimas" -#: ../../locales/../src/engine/server.cpp:175 +#: ../../locales/../src/engine/server.cpp:163 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Netinkamas serveris, po uždarančio skliausto gali būti tik dvitaškis ir " "prievadas." -#: ../../locales/../src/interface/loginmanager.cpp:104 +#: ../../locales/../src/interface/loginmanager.cpp:105 msgid "Invalid input" msgstr "Netinkama įvestis" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:196 -#: ../../locales/../src/engine/server.cpp:208 +#: ../../locales/../src/engine/server.cpp:64 +#: ../../locales/../src/engine/server.cpp:181 +#: ../../locales/../src/engine/server.cpp:191 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Pateiktas netinkamas prievadas. Prievadas gali būti nuo 1 iki 65535." -#: ../../locales/../src/engine/server.cpp:93 -#: ../../locales/../src/interface/quickconnectbar.cpp:125 +#: ../../locales/../src/engine/server.cpp:92 +#: ../../locales/../src/interface/quickconnectbar.cpp:120 +#, fuzzy msgid "" "Invalid protocol specified. Valid protocols are:\n" -"ftp:// for normal FTP,\n" +"ftp:// for normal FTP with optional encryption,\n" "sftp:// for SSH file transfer protocol,\n" "ftps:// for FTP over TLS (implicit) and\n" "ftpes:// for FTP over TLS (explicit)." @@ -4348,65 +4852,72 @@ "ftps:// FTP per SSL (implicit) ir\n" "ftpes:// FTP per SSL (explicit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4427 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Netinkamas serveris, po uždarančio skliausto gali būti tik dvitaškis ir " "prievadas." -#: ../../locales/../src/interface/search.cpp:681 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:710 +#, fuzzy +msgid "Invalid regular expression" +msgstr "Paieškos sąlygose yra netinkam reguliarioji išraiška." + +#: ../../locales/../src/interface/search.cpp:686 msgid "Invalid regular expression in search conditions." msgstr "Paieškos sąlygose yra netinkam reguliarioji išraiška." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:575 msgid "Invalid response code" msgstr "Netinkamas atsakymo kodas" -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:681 #, c-format msgid "Invalid search conditions: %s" msgstr "Netinkamos paieškos sąlygos: %s" -#: ../../locales/../src/interface/sitemanager.cpp:425 -#: ../../locales/../src/interface/sitemanager.cpp:445 -#: ../../locales/../src/interface/sitemanager.cpp:462 -#: ../../locales/../src/interface/sitemanager.cpp:469 -#: ../../locales/../src/interface/sitemanager.cpp:476 -#: ../../locales/../src/interface/sitemanager.cpp:494 -#: ../../locales/../src/interface/sitemanager.cpp:565 -#: ../../locales/../src/interface/sitemanager.cpp:742 -#: ../../locales/../src/interface/sitemanager.cpp:749 -#: ../../locales/../src/interface/sitemanager.cpp:827 -#: ../../locales/../src/interface/sitemanager.cpp:834 +#: ../../locales/../src/interface/sitemanager.cpp:685 +#: ../../locales/../src/interface/sitemanager.cpp:691 +#: ../../locales/../src/interface/sitemanager.cpp:762 +#: ../../locales/../src/interface/sitemanager.cpp:768 msgid "Invalid site path" msgstr "Netinkamas nuorodos kelias" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:724 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:726 msgid "Invalid size in condition" msgstr "Sąlygoje netinkamas dydis" -#: ../../locales/../src/engine/server.cpp:138 +#: ../../locales/../src/engine/server.cpp:133 msgid "Invalid username given." msgstr "Netinkamas naudotojo vardas." -#: ../../locales/../src/interface/verifycertdialog.cpp:192 +#: ../../locales/../src/engine/socket.cpp:1064 +msgid "Invalid value for ai_flags" +msgstr "Neteisinga ai_flags reikšmė" + +#: ../../locales/../src/engine/socket.cpp:1066 +#, fuzzy +msgid "Invalid value for hints" +msgstr "Netinkama įvestis" + +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Jurisdikcijos šalis:" -#: ../../locales/../src/interface/verifycertdialog.cpp:194 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Jurisdikcijos vietovė:" -#: ../../locales/../src/interface/verifycertdialog.cpp:193 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Jurisdikcijos valstija arba provincija:" -#: resources.h:913 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 msgid "Keep directories on top" msgstr "Laikyti aplankus viršuje" -#: ../../locales/../src/interface/Mainfrm.cpp:685 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4417,115 +4928,144 @@ "atlieka kai kuriuos testus, kad įsitikintų jog serveris palaiko šią ypatybę, " "testas gali nepavykti." -#: resources.h:324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 msgid "Key exchange" msgstr "Rakto apsikeitimas" -#: resources.h:21 resources.h:50 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 msgid "Key exchange:" msgstr "Rakto apsikeitimas:" -#: resources.h:597 +#: ../../locales/../src/engine/server.cpp:882 +#: ../../locales/../src/engine/server.cpp:903 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1324 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1325 +#, fuzzy +msgid "Key file" +msgstr "%d failas" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "Že&miausias" -#: resources.h:929 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:131 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Kalba" -#: ../../locales/../src/interface/Mainfrm.cpp:1576 +#: ../../locales/../src/interface/Mainfrm.cpp:1434 msgid "Language changed" msgstr "Kalba pakeista" -#: ../../locales/../src/interface/LocalListView.cpp:281 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:373 +#: ../../locales/../src/interface/LocalListView.cpp:282 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:154 msgid "Last modified" msgstr "Paskutinį kartą redaguotas" -#: resources.h:858 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 msgid "Layout" msgstr "Išdėstymas" -#: resources.h:804 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 msgid "Limit for concurrent &downloads:" msgstr "Riboti vienu metu vykstančius &atsisiuntimus:" -#: resources.h:806 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 msgid "Limit for concurrent &uploads:" msgstr "Riboti vienu metu vykstančius &išsiuntimus:" -#: resources.h:748 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 msgid "Limit local ports" msgstr "Riboti vietinių prievadų naudojimą" -#: resources.h:963 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 msgid "Limit size of logfile" msgstr "Apriboti žurnalo failo dydį" -#: resources.h:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 msgid "Limit:" msgstr "Riba:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:853 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:782 msgid "Line length exceeded" msgstr "Viršytas eilutės ilgis" -#: resources.h:178 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 msgid "Linked against" msgstr "Susijęs su" -#: ../../locales/../src/interface/netconfwizard.cpp:267 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Klausanti jungtis uždaryta" -#: ../../locales/../src/engine/logging.cpp:220 -#: ../../locales/../src/interface/StatusView.cpp:309 -#: ../../locales/../src/interface/StatusView.cpp:377 +#: ../../locales/../src/engine/logging.cpp:118 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:362 msgid "Listing:" msgstr "Sąrašas:" -#: resources.h:751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 msgid "Lo&west available port:" msgstr "Že&miausias galimas prievadas:" -#: ../../locales/../src/interface/edithandler.cpp:1160 -#: ../../locales/../src/interface/edithandler.cpp:1414 +#: ../../locales/../src/interface/edithandler.cpp:1138 +#: ../../locales/../src/interface/edithandler.cpp:1374 msgid "Local" msgstr "Vietinis" -#: resources.h:351 +#: ../../locales/../src/engine/socket.cpp:1028 +#, fuzzy +msgid "Local address in use" +msgstr "Nustatomas %s adresas" + +#: ../../locales/../src/engine/socket.cpp:1056 +msgid "Local endpoint has been closed" +msgstr "Vietinis pabaigos taškas buvo uždarytas" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2252 msgid "Local file" msgstr "Vietinis failas" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Vietinis failas neegzistuoja." -#: ../../locales/../src/interface/updater.cpp:346 -#: ../../locales/../src/interface/updater.cpp:423 +#: ../../locales/../src/interface/updater.cpp:402 +#: ../../locales/../src/interface/updater.cpp:495 #, fuzzy, c-format msgid "Local file is %s\n" msgstr "Vietinis failas" -#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:309 msgid "Local file is a directory instead of a regular file." msgstr "Vietinis failas yra ne failas, o aplankas." -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Vietinio failo yra pavadinimas netinkamas." -#: resources.h:214 +#: ../../locales/../src/interface/search.cpp:644 +#: ../../locales/../src/interface/search.cpp:650 +#, fuzzy +msgid "Local file search" +msgstr "Nuotolinio failo paieška" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Vietiniai filtrai:" -#: ../../locales/../src/interface/viewheader.cpp:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3279 +#, fuzzy +msgid "Local path handling:" +msgstr "Nuotolinio kelio dorojimas:" + +#: ../../locales/../src/interface/viewheader.cpp:335 msgid "Local site:" msgstr "Vietinis serveris:" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Lokalumas:" @@ -4533,12 +5073,17 @@ msgid "Log file" msgstr "Žurnalo failas" -#: resources.h:958 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:140 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:913 +#, fuzzy +msgid "Logged in" +msgstr "Registruojama žurnalui" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Registruojama žurnalui" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4547,7 +5092,7 @@ "UTF-8. Negaliu sugrįžti prie vietinės simbolių koduotės, nes naudojamas " "tarpinis serveris." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:815 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4555,7 +5100,7 @@ "Prisijungimo duomenys turi ne-ASCII simbolių ir serveris gali neatpažinti " "UTF-8. Bandoma vietinė simbolių koduotė." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:842 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" "Prisijungimo seka visiškai įvykdyta, tačiau vis dar neprisijungta. " @@ -4576,193 +5121,235 @@ "Prisijungimo tipas gali būti naudojamas tik kartu su FTP URL. Argumentas " "turi būti vienas iš dviejų „%s“ arba „%s“" -#: ../../locales/../src/interface/queue.cpp:919 -#: ../../locales/../src/interface/queue.cpp:1006 +#: ../../locales/../src/interface/queue.cpp:878 +#: ../../locales/../src/interface/queue.cpp:934 msgid "Low" msgstr "Žemas" -#: ../../locales/../src/interface/queue.cpp:917 -#: ../../locales/../src/interface/queue.cpp:1004 +#: ../../locales/../src/interface/queue.cpp:876 +#: ../../locales/../src/interface/queue.cpp:932 msgid "Lowest" msgstr "Žemiausias" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "Žemiausias galimas prievadas turi būti skaičius tarp 1024 ir 65535." -#: resources.h:25 resources.h:54 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:67 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "Rausvai raudona" + +#: ../../locales/../src/interface/xmlfunctions.cpp:43 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Įsitikinkite, kad failą galima pasiekti ir jis yra gerai suformuotas XML " "dokumentas." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:841 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:853 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:868 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:910 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:770 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:782 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:797 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:829 #, c-format msgid "Malformed chunk data: %s" msgstr "Netinkamas duomenų fragmentas: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:786 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:715 #, c-format msgid "Malformed header: %s" msgstr "Netaisyklinga antraštė: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:581 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:535 msgid "Malformed reply, server not sending proper line endings" msgstr "Netaisyklingas atsakymas, serveris nesiunčia tinkamų eilučių pabaigų" -#: resources.h:381 ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:316 -#: ../../locales/../src/interface/manual_transfer.cpp:323 -#: ../../locales/../src/interface/manual_transfer.cpp:328 -#: ../../locales/../src/interface/manual_transfer.cpp:336 -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2594 +#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:332 #: ../../locales/../src/interface/manual_transfer.cpp:350 -#: ../../locales/../src/interface/manual_transfer.cpp:369 msgid "Manual transfer" msgstr "Rankinis siuntimas" -#: resources.h:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3069 msgid "Match all of the following" msgstr "Atitinka visi sekantys" -#: resources.h:422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3070 msgid "Match any of the following" msgstr "Atitinka bet kuris sekantis" -#: resources.h:423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3071 msgid "Match none of the following" msgstr "Neatitinka nei vienas sekantis" -#: resources.h:802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#, fuzzy +msgid "Match not all of the following" +msgstr "Atitinka visi sekantys" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "Maksimalus lygiagrečių &siuntimų skaičius:" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1961 +#: ../../locales/../src/engine/socket.cpp:1070 +#, fuzzy +msgid "Memory allocation failure" +msgstr "Filtro patikrinimas nepavyko" + +#: ../../locales/../src/interface/Mainfrm.cpp:385 +#: ../../locales/../src/interface/Mainfrm.cpp:1748 msgid "Message log" msgstr "Pranešimų žurnalas" -#: resources.h:869 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 msgid "Message log position" msgstr "Pranešimų žurnalo vieta" -#: resources.h:965 +#: ../../locales/../src/engine/socket.cpp:1053 +#, fuzzy +msgid "Message too large" +msgstr "Pranešimų žurnalas" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 msgid "MiB" msgstr "MiB" -#: resources.h:107 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:445 msgid "Minutes" msgstr "Minutės" -#: resources.h:345 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2167 msgid "Move &down" msgstr "Perkelti ž&emyn" -#: resources.h:344 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 msgid "Move &up" msgstr "Perkelti &aukštyn" -#: ../../locales/../src/interface/LocalTreeView.cpp:1062 +#: ../../locales/../src/interface/LocalTreeView.cpp:990 msgid "My Computer" msgstr "Mano kompiuteris" -#: ../../locales/../src/interface/LocalTreeView.cpp:1052 +#: ../../locales/../src/interface/LocalTreeView.cpp:980 msgid "My Documents" msgstr "Mano dokumentai" -#: ../../locales/../src/interface/sitemanager.cpp:281 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:718 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:720 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:734 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:736 msgid "My Sites" msgstr "Mano serveriai" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:176 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:178 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 msgid "N/a" msgstr "Nėra" -#: resources.h:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2632 msgid "Name" msgstr "Pavadinimas" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:683 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1210 msgid "Name already exists" msgstr "Toks pavadinimas jau yra" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 -#: ../../locales/../src/interface/sitemanager.cpp:766 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:703 msgid "Name of bookmark already exists." msgstr "Pavadinimas iš adresyno jau egzistuoja." -#: resources.h:130 resources.h:179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 msgid "Name:" msgstr "Pavadinimas:" -#: ../../locales/../src/interface/filteredit.cpp:349 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +msgid "Natural sort" +msgstr "Natūralus rūšiavimas" + +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" msgstr "Reikia įvesti failo pavadinimą" -#: ../../locales/../src/interface/search.cpp:665 +#: ../../locales/../src/interface/search.cpp:644 +#, fuzzy +msgid "Need to enter valid local path" +msgstr "Reikia įvesti galiojantį nuotolinį kelią" + +#: ../../locales/../src/interface/search.cpp:671 msgid "Need to enter valid remote path" msgstr "Reikia įvesti galiojantį nuotolinį kelią" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1023 msgid "Need to specify a character encoding" msgstr "Reikia nurodyti simbolių koduotę" -#: ../../locales/../src/engine/proxy.cpp:538 +#: ../../locales/../src/engine/socket.cpp:1074 +msgid "Neither nodename nor servname provided, or not known" +msgstr "" + +#: ../../locales/../src/engine/socket.cpp:1061 +msgid "" +"Network host does not have any network addresses in the requested address " +"family" +msgstr "" + +#: ../../locales/../src/engine/proxy.cpp:481 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Network unreachable" msgstr "Tinklas nepasiekiamas" -#: resources.h:947 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "Never" msgstr "Niekada" -#: resources.h:83 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 msgid "New &Folder" msgstr "Naujas &aplankas" -#: resources.h:488 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" msgstr "Nauja &kortelė" -#: resources.h:84 resources.h:401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2837 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nauja žy&melė" -#: resources.h:382 ../../locales/../src/interface/bookmarks_dialog.cpp:55 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2597 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:76 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:83 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 #: ../../locales/../src/interface/bookmarks_dialog.cpp:93 #: ../../locales/../src/interface/bookmarks_dialog.cpp:99 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:108 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:453 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:557 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:580 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 -#: ../../locales/../src/interface/sitemanager.cpp:766 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:107 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:528 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:533 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:559 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:703 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2221 msgid "New bookmark" msgstr "Nauja žymelė" -#: ../../locales/../src/interface/LocalTreeView.cpp:1180 -#: ../../locales/../src/interface/RemoteListView.cpp:1631 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1290 +#: ../../locales/../src/interface/LocalTreeView.cpp:1156 +#: ../../locales/../src/interface/RemoteListView.cpp:1314 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1248 msgid "New directory" msgstr "Naujas aplankas" -#: ../../locales/../src/interface/welcome_dialog.cpp:52 +#: ../../locales/../src/interface/welcome_dialog.cpp:56 #, c-format msgid "New features and improvements in %s" msgstr "Naujos funkcijos ir patobulinimai yra čia %s" @@ -4771,37 +5358,42 @@ msgid "New filter" msgstr "Naujas filtras" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:932 msgid "New folder" msgstr "Naujas aplankas" -#: ../../locales/../src/interface/sitemanager.cpp:635 -#: ../../locales/../src/interface/sitemanager.cpp:649 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2103 +#: ../../locales/../src/interface/sitemanager.cpp:595 +#: ../../locales/../src/interface/sitemanager.cpp:607 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "New site" msgstr "Naujas serveris" -#: resources.h:867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 msgid "Next to the transfer queue" msgstr "Šalia perdavimo eilės" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:881 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:737 msgid "No" msgstr "Ne" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/engine/socket.cpp:1072 +#, fuzzy +msgid "No address associated with nodename" +msgstr "Jokia programa nesusieta su šiuo failo tipu" + +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Nepasirinkta kategorija eksportuoti" -#: ../../locales/../src/interface/QueueView.cpp:2292 +#: ../../locales/../src/interface/QueueView.cpp:1747 msgid "No command given, aborting." msgstr "Nenurodyta komanda, nutraukiama." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3938 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3705 msgid "No external IP address set, trying default." msgstr "Nenustatytas išorinis IP adresas, bandau numatytąjį." -#: ../../locales/../src/interface/edithandler.cpp:1101 +#: ../../locales/../src/interface/edithandler.cpp:1079 msgid "No files are currently being edited." msgstr "Šiuo metu nėra redaguojamų failų." @@ -4810,110 +5402,120 @@ msgstr "Nenurodytas filtro pavadinimas" #: ../../locales/../src/engine/server.cpp:78 -#: ../../locales/../src/engine/server.cpp:189 -#: ../../locales/../src/engine/server.cpp:218 +#: ../../locales/../src/engine/server.cpp:175 +#: ../../locales/../src/engine/server.cpp:200 msgid "No host given, please enter a host." msgstr "Nenurodytas serveris, prašau nurodyti serverį." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:101 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 msgid "No images available" msgstr "Nėra paveikslėlių" -#: ../../locales/../src/interface/QueueView.cpp:3159 -msgid "No more files in the queue!" -msgstr "Eilėje nebėra failų!" - -#: ../../locales/../src/interface/filter.cpp:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "No name for the filterset given." msgstr "Filtrų rinkinys nepavadintas." -#: resources.h:417 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3004 msgid "No program associated with filetype" msgstr "Jokia programa nesusieta su šiuo failo tipu" -#: resources.h:407 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2921 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "Jokia programa, skirta redagavimui, nebuvo susieta su plėtiniu „%s“." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/engine/socket.cpp:1048 +msgid "No route to host" +msgstr "Jokio kelio iki serverio" + +#: ../../locales/../src/interface/search.cpp:391 msgid "No search results" msgstr "Rezultatų nėra" -#: ../../locales/../src/interface/sitemanager.cpp:247 -#: ../../locales/../src/interface/sitemanager.cpp:259 -#: ../../locales/../src/interface/sitemanager.cpp:290 +#: ../../locales/../src/interface/sitemanager.cpp:347 msgid "No sites available" msgstr "Nėra pasiekiamų nuorodų" -#: ../../locales/../src/engine/proxy.cpp:506 +#: ../../locales/../src/engine/proxy.cpp:453 msgid "No supported SOCKS5 auth method" msgstr "Nepalaikomas SOKS5 autorizacijos metodas" -#: ../../locales/../src/interface/loginmanager.cpp:104 +#: ../../locales/../src/interface/loginmanager.cpp:105 msgid "No username given." msgstr "Nepateiktas naudotojo vardas." -#: resources.h:923 resources.h:928 -#: ../../locales/../src/interface/verifycertdialog.cpp:54 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "Niekas" -#: resources.h:361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2368 msgid "None selected yet" msgstr "Dar niekas nepažymėta" -#: resources.h:815 ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:873 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:185 -#: ../../locales/../src/interface/manual_transfer.cpp:568 -#: ../../locales/../src/interface/queue.cpp:922 -#: ../../locales/../src/interface/queue.cpp:1009 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297 +#: ../../locales/../src/engine/socket.cpp:1068 +msgid "Nonrecoverable failure in name resolution" +msgstr "Neatstatoma klaida vardo atpažinime" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 +#: ../../locales/../src/engine/server.cpp:878 +#: ../../locales/../src/engine/server.cpp:899 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1322 msgid "Normal" msgstr "Normalus" -#: ../../locales/../src/interface/queueview_failed.cpp:326 -#: ../../locales/../src/interface/queueview_failed.cpp:351 -msgid "Not all items could be requeued for viewing/editing." +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 +#, fuzzy +msgid "Not all items could be requeued for transfer." msgstr "" "Ne visi elementai gali būti pakartotinai perkelti į eilę peržiūrai/" "redagavimui." -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:527 +#: ../../locales/../src/interface/state.cpp:178 +#: ../../locales/../src/interface/state.cpp:1177 msgid "Not connected" msgstr "Neprisijungta" -#: ../../locales/../src/interface/RemoteListView.cpp:2368 +#: ../../locales/../src/interface/RemoteListView.cpp:2028 msgid "Not connected to any server" msgstr "Neprisijungta prie jokio serverio" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Neprisijungta prie jokio serverio." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Neprisijungta." -#: ../../locales/../src/interface/Mainfrm.cpp:683 +#: ../../locales/../src/engine/socket.cpp:1089 +msgid "Not initialized, need to call WSAStartup" +msgstr "" + +#: ../../locales/../src/interface/Mainfrm.cpp:648 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Ši savybė veikia tik naudojant FTP protokolą." -#: resources.h:782 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Pastaba: Tai veikia tik su neužšifruotais FTP prisijungimais." -#: resources.h:800 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Pastaba: Bazinio tarpinio serverio naudojimas priverstinai įjungia pasyvius " "FTP prisijungimus." -#: resources.h:902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 msgid "Number of decimal places:" msgstr "Dešimtainių pozicijų skaičius:" @@ -4921,21 +5523,46 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Pakartotinų bandymų skaičius turi būti tarp 0 ir 99." -#: resources.h:320 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "O&pen file" msgstr "&Atverti failą" -#: resources.h:29 resources.h:56 resources.h:78 resources.h:140 -#: resources.h:162 resources.h:184 resources.h:194 resources.h:207 -#: resources.h:222 resources.h:239 resources.h:266 resources.h:275 -#: resources.h:282 resources.h:290 resources.h:313 resources.h:321 -#: resources.h:340 resources.h:346 resources.h:379 resources.h:393 -#: resources.h:415 resources.h:438 resources.h:447 resources.h:461 -#: resources.h:474 resources.h:481 resources.h:725 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1538 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1972 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2118 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2576 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2987 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3225 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3320 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3389 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3764 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3820 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "Gerai" -#: resources.h:681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#, fuzzy +msgid "OS version:" +msgstr "Versija:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " "well as the fallback mode if enabled." @@ -4943,197 +5570,252 @@ "Sekančiuose puslapiuose bus sukonfigūruojamas pažymėtas perdavimo būdas, " "tokiu pat, kaip atsarginis būdas, jei jis įgalintas." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:746 msgid "Once" msgstr "Kartą" -#: resources.h:948 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 #, fuzzy msgid "Once a day" msgstr "Kartą per savaitę" -#: resources.h:949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 msgid "Once a week" msgstr "Kartą per savaitę" -#: resources.h:650 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:519 +msgid "Only use plain FTP (insecure)" +msgstr "Naudoti tik paprastą FTP (nesaugu)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Open directory in system's file manager" msgstr "Aplanką atverti sistemos failų tvarkyklėje" -#: resources.h:979 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 msgid "Open the Site Manager" msgstr "Atverti serverių tvarkyklę" -#: resources.h:980 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 msgid "Open the Site Manager." msgstr "Atverti serverių tvarkyklę." -#: resources.h:981 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Atveriama serverių tvarkyklė. Dešiniu mygtuku atveriamas serverių sąrašas." -#: resources.h:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 msgid "Open the file." msgstr "Atveriamas failas." -#: resources.h:501 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 msgid "Open the settings dialog of FileZilla" msgstr "Atveria FileZilla nuostatų dialogą" -#: resources.h:296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1708 msgid "Opened as:" msgstr "Atvertas kaip:" -#: ../../locales/../src/interface/LocalListView.cpp:1965 -#: ../../locales/../src/interface/LocalListView.cpp:2010 -#: ../../locales/../src/interface/LocalListView.cpp:2095 -#: ../../locales/../src/interface/LocalListView.cpp:2108 -#: ../../locales/../src/interface/RemoteListView.cpp:2668 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/edithandler.cpp:1739 +#: ../../locales/../src/interface/LocalListView.cpp:1732 +#: ../../locales/../src/interface/LocalListView.cpp:1744 msgid "Opening failed" msgstr "Atverti nepavyko" -#: resources.h:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 msgid "Opens a new tab" msgstr "Atveria naują kortelę" -#: resources.h:486 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 msgid "Opens the Site Manager" msgstr "Atveria serverių tvarkyklę" -#: resources.h:1001 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Atveria aplankų sąrašo filtro dialogą. Dešinysis pelės mygtukas perjungia " "filtrus." -#: resources.h:182 -msgid "Operating system" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#, fuzzy +msgid "Operating System:" msgstr "Operacinė sistema" -#: ../../locales/../src/interface/FileZilla.cpp:311 -msgid "Operating system problem detected" -msgstr "Aptikta operacinės sistemos problema" +#: ../../locales/../src/engine/socket.cpp:1039 +msgid "Operation already in progress" +msgstr "Operacija jau yra progrese" + +#: ../../locales/../src/engine/socket.cpp:1030 +#, fuzzy +msgid "Operation in progress" +msgstr "Failų siuntimas vis dar vyksta." + +#: ../../locales/../src/engine/socket.cpp:1051 +#, fuzzy +msgid "Operation not supported" +msgstr "Komanda nepalaikoma" + +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "Oranžinė" -#: ../../locales/../src/interface/verifycertdialog.cpp:180 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organizacija:" -#: ../../locales/../src/interface/verifycertdialog.cpp:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +msgid "Other SFTP options" +msgstr "Kiti SFTP nustatymai" + +#: ../../locales/../src/engine/socket.cpp:1084 +msgid "Other system error" +msgstr "Kita sistemos klaida" + +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Kitas:" -#: resources.h:727 +#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1035 +msgid "Out of memory" +msgstr "Nepakanka atminties" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 msgid "Overview" msgstr "Peržiūra" -#: resources.h:69 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite &if source newer" msgstr "Perrašyti je&i šaltinis naujesnis" -#: resources.h:247 resources.h:257 resources.h:838 resources.h:847 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Pakeisti failą" -#: resources.h:249 resources.h:259 resources.h:840 resources.h:849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "Pakeisti failą, jei skiriasi dydis" -#: resources.h:250 resources.h:260 resources.h:841 resources.h:850 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "Pakeisti failą, jei skiriasi dydis arba pradinis failas yra naujesnis" -#: resources.h:248 resources.h:258 resources.h:839 resources.h:848 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" msgstr "Pakeisti failą, jei pradinis failas naujesnis" -#: resources.h:70 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 msgid "Overwrite if &different size" msgstr "Pakeisti, jei &skiriasi dydis" -#: resources.h:71 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 msgid "Overwrite if different si&ze or source newer" msgstr "Pakeisti, jei skiriasi dy&dis arba šaltinis naujesnis" -#: resources.h:144 +#: ../../locales/../src/interface/updater.cpp:245 +#, c-format +msgid "Own build type: %s\n" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 msgid "Owner permissions" msgstr "Savininko prieigos teisės" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:375 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:156 msgid "Owner/Group" msgstr "Savininkas/Grupė" -#: resources.h:873 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "&Neleisti sistemai užmigti, vykdant perdavimus ir kitas operacijas" -#: resources.h:779 resources.h:796 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 msgid "P&roxy host:" msgstr "&Tarpinio serverio adresas:" -#: ../../locales/../src/interface/netconfwizard.cpp:488 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Komandą PORT sugadino maršrutizatorius arba ugniasienė." -#: resources.h:741 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 msgid "Pa&ssive (recommended)" msgstr "Pa&syvus (rekomenduojamas)" -#: ../../locales/../src/interface/Mainfrm.cpp:2597 +#: ../../locales/../src/interface/Mainfrm.cpp:2359 msgid "Parameter not a valid URL" msgstr "Parametras yra netinkamas URL" -#: resources.h:95 resources.h:370 resources.h:719 +#: ../../locales/../src/interface/updater.cpp:575 +#, c-format +msgid "Parsing %d bytes of version information.\n" +msgstr "Apdorojama %d baitų versijos informacijos.\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2484 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 msgid "Pass&word:" msgstr "Slap&tažodis:" -#: resources.h:677 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" msgstr "Pasyvi veiksena (rekomenduojama)" -#: resources.h:761 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:119 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Pasyvi veiksena" -#: ../../locales/../src/interface/netconfwizard.cpp:588 -#: ../../locales/../src/interface/netconfwizard.cpp:601 -#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Numatytas pasyvus perdavimo būdas." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Reikalingas slaptažodis" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:370 +#: ../../locales/../src/interface/search.cpp:151 msgid "Path" msgstr "Kelias" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3225 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2354 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3005 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2153 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Aplankui %s ir %s negali būti sukonstruotas kelias" -#: ../../locales/../src/interface/Mainfrm.cpp:2548 +#: ../../locales/../src/interface/Mainfrm.cpp:2316 msgid "Path not found:" msgstr "Kelias nerastas:" -#: resources.h:388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 msgid "Paths" msgstr "Keliai" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1282 -#: ../../locales/../src/interface/edithandler.cpp:1381 -#: ../../locales/../src/interface/edithandler.cpp:1394 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1254 +#: ../../locales/../src/interface/edithandler.cpp:1344 +#: ../../locales/../src/interface/edithandler.cpp:1354 msgid "Pending removal" msgstr "Laukia pašalinimo" @@ -5141,16 +5823,22 @@ msgid "Permission" msgstr "Leidimas" -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:374 +#: ../../locales/../src/engine/socket.cpp:1027 +#: ../../locales/../src/engine/socket.cpp:1036 +#, fuzzy +msgid "Permission denied" +msgstr "Leidimas" + +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:155 msgid "Permissions" msgstr "Leidimai" -#: resources.h:181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 msgid "Platform:" msgstr "Platforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:553 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5158,7 +5846,7 @@ "Svetainėje https://filezilla-project.org/probe.php patikrinkite ar serveris " "veikia, tada dar kartą patikrinkite savo nustatymus." -#: resources.h:683 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." @@ -5166,13 +5854,13 @@ "Sukonfigūruokite ugniasienę ar maršrutizatorių taip, kad FileZilla galėtų " "sukurti išeinančius susijungimus prie sutartų prievadų." -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Išjunkite maršrutizatoriaus Demilitarizuotą zoną (DMZ mode) arba žaidimų " "veikseną (Game mode)." -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5180,20 +5868,20 @@ "Prašome užtikrinti, kad turite stabilų interneto ryšį ir atidžiai " "patikrinote nuostatas dar kartą." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 msgid "Please enter a custom date format." msgstr "Įveskite pasirinktinį datos formatą." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 msgid "Please enter a custom time format." msgstr "Įveskite pasirinktinį laiko formatą." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:740 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:741 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Įveskite datą iš formos YYYY-MM-DD, tokią kaip pavyzdys 2010-07-18." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." @@ -5207,7 +5895,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Įveskite naują nukopijuoto filtro pavadinimą." -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:272 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Įveskite naują pavadinimą nustatytam filtrui „%s“" @@ -5216,68 +5904,58 @@ msgid "Please enter a new name for the filter." msgstr "Įveskite naują filtro pavadinimą." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 msgid "" "Please enter a number between 0 and 10 for the number of concurrent " "downloads." msgstr "Įveskite lygiagrečių atsisiuntimų skaičių. Skaičius tarp 1 ir 10." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 msgid "" "Please enter a number between 0 and 10 for the number of concurrent uploads." msgstr "Įveskite lygiagrečių išsiuntimų skaičių. Skaičius tarp 1 ir 10." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 msgid "" "Please enter a number between 1 and 10 for the number of concurrent " "transfers." msgstr "Įveskite lygiagrečių persiuntimų skaičių. Skaičius tarp 1 ir 10." -#: resources.h:127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 msgid "Please enter a password for this server:" msgstr "Įveskite šio serverio slaptažodį:" -#: ../../locales/../src/interface/QueueView.cpp:2281 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Įveskite kelią iki vykdomojo failo.\n" -"Pvz.: c:\\kelias\\failas.exe MS Windows sistemoje arba /kelias/failas Unix " -"sistemoje.\n" -"Papildomai galima nurodyti programos argumentus." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 +#, fuzzy msgid "" -"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts." +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" "Įveskite laiko ribą (tarp 5 ir 9999 sek.). Norėdami nenaudoti laiko ribos " "įveskite 0." -#: ../../locales/../src/interface/filter.cpp:343 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Please enter a unique name for this filter set" msgstr "Šiam filtrui įveskite unikalų pavadinimą" -#: resources.h:128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 msgid "Please enter a username for this server:" msgstr "Įveskite šio serverio prisijungimo vardą:" -#: ../../locales/../src/interface/netconfwizard.cpp:182 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Įveskite tinkamų prievadų sritį." -#: ../../locales/../src/interface/netconfwizard.cpp:161 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Nurodykite URL iš kurio gauti jūsų išorinį IP adresą" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Prašome įvesti išsiuntimo greičio ribą didesnę arba lygią 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:583 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5285,27 +5963,41 @@ "Įveskite gryną FTP komandą.\n" "Grynų ftp komandų naudojimas išvalo aplankų podėlį." -#: ../../locales/../src/interface/LocalListView.cpp:1174 -#: ../../locales/../src/interface/LocalTreeView.cpp:1177 -#: ../../locales/../src/interface/RemoteListView.cpp:1617 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1276 +#: ../../locales/../src/interface/QueueView.cpp:1741 +#, fuzzy +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Įveskite kelią iki vykdomojo failo.\n" +"Pvz.: c:\\kelias\\failas.exe MS Windows sistemoje arba /kelias/failas Unix " +"sistemoje.\n" +"Papildomai galima nurodyti programos argumentus." + +#: ../../locales/../src/interface/LocalListView.cpp:924 +#: ../../locales/../src/interface/LocalTreeView.cpp:1153 +#: ../../locales/../src/interface/RemoteListView.cpp:1301 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Please enter the name of the directory which should be created:" msgstr "Nurodykite kuriamo aplanko pavadinimą:" -#: ../../locales/../src/interface/RemoteListView.cpp:3156 +#: ../../locales/../src/interface/RemoteListView.cpp:2614 msgid "Please enter the name of the file which should be created:" msgstr "Nurodykite kuriamo failo pavadinimą:" -#: resources.h:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 msgid "Please enter username and password for this server:" msgstr "Įveskite šio serverio prisijungimo vardą ir slaptažodį:" -#: ../../locales/../src/interface/netconfwizard.cpp:142 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Įveskite jūsų išorinį IP adresą" -#: ../../locales/../src/interface/netconfwizard.cpp:593 -#: ../../locales/../src/interface/netconfwizard.cpp:606 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5315,7 +6007,7 @@ "turite dinaminį adresą arba nežinote savo išorinio adreso, tuomet naudokitės " "išoriniu adresų nustatytuoju." -#: resources.h:670 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." @@ -5323,7 +6015,7 @@ "Atidžiai sekite instrukcijas, esant blogai konfigūracijai bus neįmanoma " "sukurti FTP susijungimų." -#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5331,11 +6023,11 @@ "Įsitikinkite, kad FileZilla gali sukurti išeinančius prisijungimus. Taip pat " "įsitikinkite, kad teisingai įrašėte adresų nustatytojo adresą." -#: ../../locales/../src/interface/FileZilla.cpp:263 +#: ../../locales/../src/interface/FileZilla.cpp:133 msgid "Please make sure the requested locale is installed on your system." msgstr "Įsitikinkite, kad nurodyta lokalė įdiegta jūsų sistemoje." -#: ../../locales/../src/interface/netconfwizard.cpp:594 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5348,7 +6040,7 @@ "suderintas rankiniu būdu, nenaudokite maršrutizatoriaus naudojant " "„Demilitarizuotą zoną“ (DMZ mode) arba „game mode“." -#: resources.h:684 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 msgid "" "Please note that FileZilla has no influence on the port the server chooses. " "So the server might choose a port which your firewall thinks is only used by " @@ -5360,7 +6052,7 @@ "ugniasienė manys kad jis yra naudojamas tik interneto šiukšlių ir kenkėjiškų " "programų. Tai gali sukelti saugumo aliarmą, kurį galite saugiai atmesti." -#: ../../locales/../src/interface/Mainfrm.cpp:733 +#: ../../locales/../src/interface/Mainfrm.cpp:688 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5368,7 +6060,7 @@ "Įkeliant failus FTP, FTPS ir FTPES išsaugoti failų laiko žymes galima tik " "tuo atveju jei serveris palaiko komandą MFMT." -#: resources.h:738 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5377,16 +6069,7 @@ "kas labai mažus intervalus, tuomet kai kurie serveriai gali jus įtraukti į " "juodus sąrašus ir nebeleisti prisijungti niekada." -#: resources.h:889 resources.h:895 -#, no-c-format -msgid "" -"Please read https://wiki.filezilla-project.org/Date_and_Time_formatting for " -"details" -msgstr "" -"Norėdami sužinoti daugiau apsilankykite https://wiki.filezilla-project.org/" -"Date_and_Time_formatting svetainėje" - -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5396,42 +6079,42 @@ "tinklo nustatymai ar staiga kyla problemos su serveriais, kurie anksčiau " "puikiai veikė." -#: resources.h:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Please select an action:" msgstr "Pasirinkite veiksmą:" -#: resources.h:289 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 msgid "Please select the categories you would like to import." msgstr "Nurodykite kurias kategorijas norite importuoti." -#: resources.h:672 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 msgid "Please select the default transfer mode you would like to use." msgstr "Pasirinkite numatytąjį perdavimo režimą." -#: ../../locales/../src/interface/chmoddialog.cpp:51 +#: ../../locales/../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." msgstr "Aplankui „%s“ parinkite naujus atributus." -#: ../../locales/../src/interface/chmoddialog.cpp:40 +#: ../../locales/../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." msgstr "Failui „%s“ parinkite naujus atributus." -#: ../../locales/../src/interface/chmoddialog.cpp:54 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Pažymėtiems aplankams parinkite naujus atributus." -#: ../../locales/../src/interface/chmoddialog.cpp:57 +#: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "Pažymėtiems failams ir aplankams parinkite naujus atributus." -#: ../../locales/../src/interface/chmoddialog.cpp:43 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Pažymėtiems failams parinkite naujus atributus." -#: ../../locales/../src/interface/netconfwizard.cpp:581 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5446,25 +6129,39 @@ "„Demilitarizuotą zoną“ (DMZ mode) arba „game mode“. Tokie dalykai kaip " "protokolų inspekcija ar specifiniai protokolų „fixups“ turi būti išjungti" -#: ../../locales/../src/interface/verifycertdialog.cpp:187 -#: ../../locales/../src/interface/verifycertdialog.cpp:188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#, fuzzy +msgid "Positio&n of the message log:" +msgstr "P&ranešimų žurnalo vieta:" + +#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Postal code:" msgstr "Pašto kodas:" -#: ../../locales/../src/interface/sitemanager.cpp:280 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1828 -msgid "Predefined Sites" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +msgid "Pre&allocate space before downloading" +msgstr "Pri&skirti atminties prieš atsiuntimą" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#, fuzzy +msgid "Preallocation" +msgstr "Kryptis" + +#: ../../locales/../src/interface/sitemanager.cpp:337 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +msgid "Predefined Sites" msgstr "Iš anksto nustatyti tinklapiai" -#: ../../locales/../src/interface/Mainfrm.cpp:732 +#: ../../locales/../src/interface/Mainfrm.cpp:687 msgid "Preserving file timestamps" msgstr "Saugomos failų laiko žymės" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:223 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 msgid "Preview:" msgstr "Peržiūra:" -#: ../../locales/../src/engine/tlssocket.cpp:1119 +#: ../../locales/../src/engine/tlssocket.cpp:1344 msgid "Primary connection and data connection certificates don't match." msgstr "Pirminio prisijungimo ir duomenų prisijungimo sertifikatai nesutampa." @@ -5476,15 +6173,15 @@ msgid "Print version information to stdout and exit" msgstr "Parodyti versijos informaciją ir išeiti" -#: resources.h:912 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 msgid "Prioritize directories (default)" msgstr "Aplankų prioritetai (numatyti)" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Priority" msgstr "Prioritetas" -#: resources.h:956 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5492,138 +6189,168 @@ "Privatumo politika: Serveriui bus nusiųsta tik jūsų FileZilla versija, " "naudojama OS ir CPU architektūra." -#: resources.h:785 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 msgid "Private &keys:" msgstr "Privatūs &raktai:" -#: resources.h:91 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 msgid "Pro&tocol:" msgstr "Pro&tokolas:" -#: resources.h:781 resources.h:799 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 msgid "Pro&xy password:" msgstr "&Tarpinio serverio slaptažodis:" -#: resources.h:519 resources.h:588 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "Vykdyti &eilę" -#: resources.h:19 resources.h:48 +#: ../../locales/../src/engine/socket.cpp:1032 +msgid "Process file table overflow" +msgstr "" + +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:121 +#, c-format +msgid "Processed %s in %s." +msgstr "Atlikta %s viduje %s." + +#: ../../locales/../src/engine/socket.cpp:1037 +#, fuzzy +msgid "Protocol not supported" +msgstr "Komanda nepalaikoma" + +#: ../../locales/../src/engine/socket.cpp:1091 +msgid "Protocol not supported on given socket type" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Protokolas:" -#: resources.h:797 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 msgid "Proxy &port:" msgstr "Tarpinio serverio &prievadas:" -#: resources.h:780 resources.h:798 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 msgid "Proxy &user:" msgstr "Tarpinio serverio &naudotojas:" -#: ../../locales/../src/engine/proxy.cpp:517 +#: ../../locales/../src/engine/proxy.cpp:462 msgid "Proxy authentication failed" msgstr "Tarpinio serverio tapatybės patvirtinimas nepavyko" -#: ../../locales/../src/engine/transfersocket.cpp:135 -#: ../../locales/../src/engine/transfersocket.cpp:149 +#: ../../locales/../src/engine/transfersocket.cpp:106 +#: ../../locales/../src/engine/transfersocket.cpp:118 #, c-format msgid "Proxy handshake failed: %s" msgstr "Pasisveikinimas su tarpiniu serveriu nepavyko: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4162 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Serveris prasideda „[“, bet nėra uždarančio skliausto." -#: ../../locales/../src/engine/proxy.cpp:351 +#: ../../locales/../src/engine/proxy.cpp:321 #, c-format msgid "Proxy reply: %s" msgstr "Tarpinio serverio atsakymas: %s" -#: ../../locales/../src/engine/proxy.cpp:415 -#: ../../locales/../src/engine/proxy.cpp:560 +#: ../../locales/../src/engine/proxy.cpp:503 +#, fuzzy, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Tarpinio serverio užklausimas nepavyko: %s" + +#: ../../locales/../src/engine/proxy.cpp:376 #, c-format msgid "Proxy request failed: %s" msgstr "Tarpinio serverio užklausimas nepavyko: %s" -#: ../../locales/../src/engine/proxy.cpp:582 +#: ../../locales/../src/engine/proxy.cpp:527 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Tarpinio serverio užklausimas nepavyko: CONNECT atsake nežinomas adreso tipas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4452 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4191 msgid "Proxy set but proxy host or port invalid" msgstr "" "Tarpinis serveris nustatytas, bet nurodytas netinkamas serveris arba " "prievadas" -#: resources.h:783 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 msgid "Public Key Authentication" msgstr "Viešojo rakto tapatybės patikrinimas" -#: resources.h:8 resources.h:37 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 msgid "Public key algorithm:" msgstr "Viešojo rakto algoritmas:" -#: resources.h:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 msgid "Public permissions" msgstr "Viešos prieigos teisės" -#: ../../locales/../src/interface/QueueView.cpp:3217 +#: ../../locales/../src/interface/QueueView.cpp:2596 msgid "Queue has been fully processed" msgstr "Eilė pilnai įvykdyta" -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../locales/../src/interface/statusbar.cpp:429 #, c-format msgid "Queue: %s MiB" msgstr "Eilė: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:392 +#: ../../locales/../src/interface/statusbar.cpp:366 #, c-format msgid "Queue: %s%s" msgstr "Eilė: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:388 -#: ../../locales/../src/interface/statusbar.cpp:453 +#: ../../locales/../src/interface/statusbar.cpp:362 +#: ../../locales/../src/interface/statusbar.cpp:420 msgid "Queue: empty" msgstr "Eilė: tuščia" -#: ../../locales/../src/interface/QueueView.cpp:455 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Failai eilėje" -#: resources.h:435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3297 msgid "Queueing:" msgstr "Eilės sudarymas:" -#: resources.h:604 -msgid "R&eboot system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +#, fuzzy +msgid "R&eboot system once" msgstr "&Perkrauti sistemą" -#: resources.h:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "&Nutolęs aplankų medis" -#: resources.h:620 resources.h:624 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:460 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "R&eset and requeue selected files" msgstr "&Atstatyti pažymėtų failų būseną ir perkelti į eilę" -#: ../../locales/../src/interface/Mainfrm.cpp:599 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "Gryna FTP komanda" -#: resources.h:149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "Re&ad" msgstr "&Skaityti" -#: resources.h:563 resources.h:579 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Re&fresh" msgstr "At&naujinti" -#: resources.h:73 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 msgid "Re&name" msgstr "Pervadi&nti" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -5631,7 +6358,7 @@ "Paleiskite iš naujo vedlį ir atidžiai patikrinkite savo nustatymus ir " "atitinkamai sukonfigūruokite visus maršrutizatorius, bei ugniasienes." -#: resources.h:153 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Rea&d" msgstr "&Skaityti" @@ -5639,12 +6366,12 @@ msgid "Read-only" msgstr "Tik skaityti" -#: ../../locales/../src/interface/Mainfrm.cpp:1125 +#: ../../locales/../src/interface/Mainfrm.cpp:1025 msgid "Really cancel current operation?" msgstr "Tikrai atšaukti dabartinę operaciją?" -#: ../../locales/../src/interface/RemoteListView.cpp:1707 -#: ../../locales/../src/interface/search.cpp:1008 +#: ../../locales/../src/interface/RemoteListView.cpp:1395 +#: ../../locales/../src/interface/search.cpp:1185 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -5653,8 +6380,8 @@ msgstr[1] "Ar tikrai iš serverio pašalinti %d aplankus su jų turiniu?" msgstr[2] "Ar tikrai iš serverio pašalinti %d aplankų su jų turiniu?" -#: ../../locales/../src/interface/RemoteListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:1006 +#: ../../locales/../src/interface/RemoteListView.cpp:1392 +#: ../../locales/../src/interface/search.cpp:1183 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" @@ -5662,49 +6389,75 @@ msgstr[1] "Ar tikrai iš serverio pašalinti %d failus?" msgstr[2] "Ar tikrai iš serverio pašalinti %d failų?" -#: ../../locales/../src/interface/RemoteListView.cpp:1712 -#: ../../locales/../src/interface/search.cpp:1013 +#: ../../locales/../src/interface/RemoteListView.cpp:1400 +#: ../../locales/../src/interface/search.cpp:1189 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Ar tikrai norite pašalinti %s ir %s iš serverio?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1125 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 msgid "Really delete all selected files and/or directories from the server?" msgstr "Ar tikrai iš serverio pašalinti visus pažymėtus failus ir/ar aplankus?" -#: ../../locales/../src/engine/local_filesys.cpp:134 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "Ar tikrai iš kompiuterio pašalinti visus pažymėtus failus ir/ar aplankus?" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Reason" msgstr "Priežastis" -#: ../../locales/../src/interface/QueueView.cpp:3224 +#: ../../locales/../src/interface/QueueView.cpp:2589 msgid "Reboot now" msgstr "Perkrauti sistemą dabar" -#: resources.h:158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 msgid "Rec&urse into subdirectories" msgstr "Taikyti &rekursiškai(ir poaplankiams)" -#: ../../locales/../src/engine/directorylistingparser.cpp:3070 +#: ../../locales/../src/engine/tlssocket.cpp:326 +#, c-format +msgid "Received TLS alert from the server: %s (%d)" +msgstr "" + +#: ../../locales/../src/engine/directorylistingparser.cpp:2928 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Gautas aplanko failų sąrašas kuris atrodo užkoduotas EBDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:2081 -#: ../../locales/../src/engine/directorylistingparser.cpp:2096 +#: ../../locales/../src/engine/directorylistingparser.cpp:1969 +#: ../../locales/../src/engine/directorylistingparser.cpp:1985 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Gauta eilutė didesnė nei 10000 simbolių, nutraukiama." -#: ../../locales/../src/interface/netconfwizard.cpp:1004 -#: ../../locales/../src/interface/netconfwizard.cpp:1013 -#: ../../locales/../src/interface/netconfwizard.cpp:1037 +#: ../../locales/../src/engine/tlssocket.cpp:1327 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" + +#: ../../locales/../src/interface/netconfwizard.cpp:1006 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "Gauti duomenys sugadinti" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/updater.cpp:554 +#, fuzzy +msgid "Received invalid character in version information" +msgstr "&Pakeisti netinkamus simbolius į:" + +#: ../../locales/../src/engine/tlssocket.cpp:329 +#, fuzzy, c-format +msgid "Received unknown TLS alert %d from the server" +msgstr "Ar tikrai iš serverio pašalinti %d failą?" + +#: ../../locales/../src/interface/updater.cpp:547 +#, fuzzy +msgid "Received version information is too large" +msgstr "Parodyti versijos informaciją ir išeiti" + +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -5713,54 +6466,81 @@ "informacijos.\n" "Jei tęsite, jūsų prisijungimas bus nutrauktas." -#: resources.h:739 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 msgid "Reconnection settings" msgstr "Prisijungimo iš naujo nustatymai" -#: resources.h:998 resources.h:999 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 msgid "Reconnects to the last used server" msgstr "Prisijungs prie paskutinio naudoto serverio" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:718 -msgid "Redirection to invalid address" +#: ../../locales/../src/interface/recursive_operation_status.cpp:99 +#, fuzzy +msgid "Recursively adding files to queue." +msgstr "&Pridėti failus į eilę" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:105 +msgid "Recursively changing permissions." +msgstr "" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:102 +#, fuzzy +msgid "Recursively deleting files and directories." +msgstr "Pervadinti pažymėtus failus ir aplankus" + +#: ../../locales/../src/interface/sitemanager.cpp:17 +#, fuzzy +msgid "Red" +msgstr "&Skaityti" + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:631 +#, fuzzy, c-format +msgid "Redirection to invalid or unsupported URI: %s" msgstr "Peradresavimas į netinkamą adresą" -#: resources.h:990 resources.h:991 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:638 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#, fuzzy, c-format +msgid "Redirection to invalid or unsupported address: %s" +msgstr "Peradresavimas į netinkamą adresą" + +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 msgid "Refresh the file and folder lists" msgstr "Atnaujinti failų ir aplankų sąrašą" -#: resources.h:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3840 msgid "Remember passwords?" msgstr "Prisiminti slaptažodžius?" -#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1101 msgid "Remote" msgstr "Nutolęs" -#: ../../locales/../src/engine/tlssocket.cpp:908 +#: ../../locales/../src/engine/tlssocket.cpp:966 msgid "Remote certificate not trusted." msgstr "Nutolusiu sertifikatu nėra pasitikima." -#: resources.h:354 ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Remote file" msgstr "Nutolęs failas" -#: resources.h:427 ../../locales/../src/interface/search.cpp:659 -#: ../../locales/../src/interface/search.cpp:665 -#: ../../locales/../src/interface/search.cpp:675 -#: ../../locales/../src/interface/search.cpp:681 +#: ../../locales/../src/interface/search.cpp:666 +#: ../../locales/../src/interface/search.cpp:671 msgid "Remote file search" msgstr "Nuotolinio failo paieška" -#: resources.h:217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" msgstr "Nutolę filtrai:" -#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1092 msgid "Remote path" msgstr "Nutolęs kelias" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:430 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -5770,7 +6550,7 @@ "galiojantis absoliutus kelias ir jis palaikomas esamos svetainės serverio " "tipo (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -5780,109 +6560,127 @@ "galiojantis absoliutus kelias ir jis palaikomas pažymėto serverio tipo (%s) " "aukštesniajame aplanke." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:432 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1128 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Nuotolinis kelias negali būti išanalizuotas. Įsitikinkite, kad tai " "galiojantis absoliutus kelias." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Nepavyko apdoroti nutolusio kelio." -#: resources.h:432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3184 msgid "Remote path handling:" msgstr "Nuotolinio kelio dorojimas:" -#: resources.h:300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 msgid "Remote path:" msgstr "Nutolęs kelias:" -#: ../../locales/../src/interface/viewheader.cpp:561 +#: ../../locales/../src/interface/viewheader.cpp:523 msgid "Remote site:" msgstr "Nutolęs serveris:" -#: resources.h:617 resources.h:621 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 msgid "Remove &all" msgstr "Pašalinti &viską" -#: resources.h:619 resources.h:623 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:457 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:475 msgid "Remove &selected" msgstr "&Pašalinti pažymėtus" -#: resources.h:252 resources.h:262 resources.h:843 resources.h:852 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:256 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 msgid "Rename file" msgstr "Pervadinti failą" -#: resources.h:635 resources.h:656 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Rename selected directory" msgstr "Pervadinti pažymėtą aplanką" -#: resources.h:567 resources.h:583 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Rename selected files and directories" msgstr "Pervadinti pažymėtus failus ir aplankus" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3344 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2349 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Pervadinamas „%s“ į „%s“" -#: resources.h:459 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3560 msgid "Reporting bugs and feature requests" msgstr "Pranešimai apie klaidas ir naujų galimybių prašymas" -#: ../../locales/../src/engine/proxy.cpp:406 +#: ../../locales/../src/engine/proxy.cpp:367 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Užklausa nepavyko - kliente neveikia „identd“ (arba nepasiekiama iš serverio)" -#: ../../locales/../src/engine/proxy.cpp:409 +#: ../../locales/../src/engine/proxy.cpp:370 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "Užklausa nepavyko - kliento „identd“ nesugebėjo pranešti naudotojo ID" -#: ../../locales/../src/engine/proxy.cpp:403 +#: ../../locales/../src/engine/proxy.cpp:364 msgid "Request rejected or failed" msgstr "Prašyti atmesto ar nepavykusio" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:517 msgid "Require explicit FTP over TLS" msgstr "Reikalauti išskirtinai FTP per TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:515 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:518 msgid "Require implicit FTP over TLS" msgstr "Reikalauti FTP per TLS(jei įmanoma)" -#: resources.h:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Reset and requeue &all" msgstr "&Atstatyti pažymėtų failų būseną ir perkelti į eilę" -#: ../../locales/../src/engine/ControlSocket.cpp:1157 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:485 +#: ../../locales/../src/engine/socket.cpp:1079 +msgid "Resolved protocol is unknown" +msgstr "" + +#: ../../locales/../src/engine/ControlSocket.cpp:1079 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:444 #, c-format msgid "Resolving address of %s" msgstr "Nustatomas %s adresas" -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/interface/netconfwizard.cpp:395 -#: ../../locales/../src/interface/StatusView.cpp:303 -#: ../../locales/../src/interface/StatusView.cpp:360 +#: ../../locales/../src/engine/socket.cpp:1038 +msgid "Resource temporarily unavailable" +msgstr "" + +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:345 msgid "Response:" msgstr "Atsakymas:" -#: resources.h:426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3130 msgid "Results:" msgstr "Rezultatai:" -#: resources.h:251 resources.h:261 resources.h:842 resources.h:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" msgstr "Tęsti failo perdavimą" -#: resources.h:857 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -5890,127 +6688,137 @@ "Pratęsiant siuntimą ASCII failams gali kilti problemų, jei serveris naudoja " "kitokį eilutės pabaigos simbolį nei klientas." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:959 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1277 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:828 +#, fuzzy, c-format +msgid "Retrieving directory listing of \"%s\"..." +msgstr "Gaunamas aplankų sąrašas..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1274 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825 msgid "Retrieving directory listing..." msgstr "Gaunamas aplankų sąrašas..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3956 -#: ../../locales/../src/interface/netconfwizard.cpp:707 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Gaunamas išorinis IP adresas iš %s" -#: ../../locales/../src/engine/tlssocket.cpp:1100 -msgid "Root certificate is not trusted" -msgstr "Šakninis liudijimas nepatikimas" - -#: resources.h:494 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 msgid "S&how files currently being edited..." msgstr "&Rodyti failus, kurie šiuo metu redaguojami..." -#: resources.h:874 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 msgid "S&how the Site Manager on startup" msgstr "&Paleidžiant rodyti serverių tvarkyklę" -#: resources.h:605 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +#, fuzzy +msgid "S&hutdown system once" msgstr "&Išjungti sistemą" -#: resources.h:424 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 msgid "S&top" msgstr "S&tabdyti" -#: resources.h:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +#, fuzzy +msgid "S&uspend system once" +msgstr "&Išjungti sistemą" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" msgstr "Sin&chronizuotasis naršymas" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:121 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 msgid "SFTP" msgstr "SFTP" -#: resources.h:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:141 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 tarpinis serveris prisijungs prie: %s" -#: resources.h:177 +#: ../../locales/../src/engine/proxy.cpp:169 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:852 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "Išsaugoti nustatymus?" -#: ../../locales/../src/interface/manual_transfer.cpp:455 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:437 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 msgid "Saving of password has been disabled by your system administrator." msgstr "Slaptažodžių saugojimą išjungė sistemos administratorius." -#: ../../locales/../src/interface/manual_transfer.cpp:457 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../locales/../src/interface/manual_transfer.cpp:439 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:987 msgid "Saving of passwords has been disabled by you." msgstr "Jūs išjungėte slaptažodžių saugojimą." -#: ../../locales/../src/interface/QueueView.cpp:1831 -msgid "Scanning for files to add to queue" -msgstr "Ieškomi failai, kurie bus pridėti į eilę" - -#: ../../locales/../src/interface/QueueView.cpp:1833 -msgid "Scanning for files to upload" -msgstr "Ieškomi failai išsiuntimui" - -#: resources.h:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3062 msgid "Search &conditions:" msgstr "Paieškos &sąlygos:" -#: resources.h:418 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3044 msgid "Search &directory:" msgstr "Paieškos &aplankas:" -#: resources.h:1006 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 msgid "Search for files recursively." msgstr "Ieškoti failų rekursyviai." -#: resources.h:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 msgid "Search server for files" msgstr "Ieškoti failų serveryje" -#: ../../locales/../src/interface/statusbar.cpp:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#, fuzzy +msgid "Search type:" +msgstr "Paieškos &aplankas:" + +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Security information" msgstr "Saugumo informacija" -#: ../../locales/../src/interface/netconfwizard.cpp:564 -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "Taip pat žiūrėkite: https://wiki.filezilla-project.org/Network_Configuration" -#: resources.h:362 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2375 msgid "Sele&ct server" msgstr "Pasirin&kite serverį" -#: resources.h:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 msgid "Select &page:" msgstr "Pasirinkite &puslapį:" -#: resources.h:877 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 msgid "Select Theme" msgstr "Pasirinkite temą" -#: resources.h:835 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Pasirinkite numatytąjį veiksmą, kuris bus atliekamas kai paskirties failas " "arba persiuntimas jau yra." -#: ../../locales/../src/interface/edithandler.cpp:1584 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:107 +#: ../../locales/../src/interface/edithandler.cpp:1537 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Pasirinkite numatytąjį redaktorių" @@ -6030,61 +6838,67 @@ "Pasirinkite ką daryti jei toks failas jau yra. Šis veiksmas galios tik tiems " "failas kurie šiuo metu yra eilėje." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 msgid "Select file containing private key" msgstr "Nurodykite failą, kuriame yra privatus raktas" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Pasirinkite failą eksportuojamiems duomenims" -#: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/export.cpp:45 +#, fuzzy +msgid "Select file for exported filters" +msgstr "Pasirinkite failą eksportuojamiems tinklapiams" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1415 msgid "Select file for exported queue" msgstr "Pasirinkite failą eksportuojamai eilei" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Pasirinkite failą į kurį eksportuosite nustatymus" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2155 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2265 msgid "Select file for exported sites" msgstr "Pasirinkite failą eksportuojamiems tinklapiams" -#: ../../locales/../src/interface/import.cpp:15 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Nurodykite failą iš kurio importuosite nustatymus" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Pasirinkite failą išsiuntimui" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#, fuzzy +msgid "Select filename for converted key file" msgstr "Nurodykite failo pavadinimą konvertuojamam raktui" -#: resources.h:408 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2926 msgid "Select how these files should be opened." msgstr "Pasirinkite, kaip šie failai bus atveriami." -#: ../../locales/../src/interface/search.cpp:788 +#: ../../locales/../src/interface/search.cpp:847 msgid "Select target download directory" msgstr "Pasirinkite paskirties atsisiuntimo aplanką" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Pasirinkite gauto failo pavadinimą" -#: resources.h:278 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 msgid "Select the categories to export:" msgstr "Pasirinkite eksportuojamas kategorijas:" -#: resources.h:269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1493 msgid "Select the private data you would like to delete." msgstr "Pasirinkite privačius duomenis, kuriuos norite pašalinti." -#: ../../locales/../src/interface/search.cpp:755 +#: ../../locales/../src/interface/search.cpp:806 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6092,7 +6906,7 @@ msgstr[1] "Pasirinkti %d aplankai, su jų turiniu, perdavimui." msgstr[2] "Pasirinkta %d aplankų, su jų turiniu, perdavimui." -#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." @@ -6100,7 +6914,7 @@ msgstr[1] "Pažymėti %d aplankai." msgstr[2] "Pažymėta %d aplankų." -#: ../../locales/../src/interface/search.cpp:753 +#: ../../locales/../src/interface/search.cpp:804 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6108,7 +6922,7 @@ msgstr[1] "Pažymėti %d failai perdavimui." msgstr[2] "Pažymėta %d failų perdavimui." -#: ../../locales/../src/interface/filelist_statusbar.cpp:58 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" @@ -6116,7 +6930,7 @@ msgstr[1] "Pasirinkti %d failai. Bendras dydis: %s" msgstr[2] "Pasirinkta %d failų. Bendras dydis: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:56 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" @@ -6124,48 +6938,49 @@ msgstr[1] "Pasirinkti %d failai. Bendras dydis: bent %s" msgstr[2] "Pasirinkta %d failų. Bendras dydis: bent %s" -#: ../../locales/../src/interface/search.cpp:760 +#: ../../locales/../src/interface/search.cpp:810 #, c-format msgid "Selected %s and %s for transfer." msgstr "Pasirinktas %s ir %s perdavimui." -#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Parinkti %s ir %s. Bendras dydis: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Parinkti %s ir %s. Bendras dydis: bent %s" -#: ../../locales/../src/interface/edithandler.cpp:1525 -#: ../../locales/../src/interface/edithandler.cpp:1604 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:127 +#: ../../locales/../src/interface/edithandler.cpp:1482 +#: ../../locales/../src/interface/edithandler.cpp:1556 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Pasirinktas redaktorius neegzistuoja." -#: resources.h:307 ../../locales/../src/interface/LocalListView.cpp:1994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1854 msgid "Selected file already being edited" msgstr "Pasirinktas failas jau redaguojamas" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 msgid "Selected file is already loaded" msgstr "Pasirinktas failas jau įkeltas" -#: ../../locales/../src/interface/RemoteListView.cpp:2700 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "Selected file is already opened" msgstr "Parinktas failas jau atvertas" -#: ../../locales/../src/interface/RemoteListView.cpp:2728 +#: ../../locales/../src/interface/edithandler.cpp:1726 msgid "Selected file is still being edited" msgstr "Pasirinktas failas vis dar redaguojamas" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Selected filter only works for local files." msgstr "Pasirinktas filtras veikia tik su vietiniais failais." -#: ../../locales/../src/interface/menu_bar.cpp:315 +#: ../../locales/../src/interface/menu_bar.cpp:291 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6174,46 +6989,46 @@ "tipą.\n" "Naudokite konkrečios vietos žymeles šiam serveriui." -#: ../../locales/../src/engine/engineprivate.cpp:281 +#: ../../locales/../src/engine/engineprivate.cpp:302 msgid "Selected port usually in use by a different protocol." msgstr "Nurodytas prievadas paprastai naudojamas kitam protokolui." -#: resources.h:746 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 msgid "Send FTP &keep-alive commands" msgstr "Siųsti FTP &palikti-gyvą komandas" -#: resources.h:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 msgid "Send custom command to the server otherwise not available" msgstr "Serveriui siųsti pasirinktinę komandą, kitu atveju neprieinama" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4534 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267 msgid "Sending keep-alive command" msgstr "Siunčiama palikti-gyvą komanda" -#: resources.h:7 resources.h:36 -#: ../../locales/../src/interface/verifycertdialog.cpp:191 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Serijos numeris:" -#: resources.h:99 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:322 msgid "Server &Type:" msgstr "Serverio &tipas:" -#: ../../locales/../src/engine/tlssocket.cpp:786 +#: ../../locales/../src/engine/tlssocket.cpp:855 msgid "Server did not properly shut down TLS connection" msgstr "Serveris tinkamai neužbaigė TLS susijungimo" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:895 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:948 msgid "Server does not support non-ASCII characters." msgstr "Serveris nepalaiko ne ASCII simbolių." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4358 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4107 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Serveris nepalaiko pratęsimo failams > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4354 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4103 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6222,15 +7037,15 @@ "Serveris nepalaiko pratęsimo failams > %d GB. Siuntimas užbaigtas, nes failų " "dydžiai sutampa." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2564 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2433 msgid "Server does not support resume of files > 2GB." msgstr "Serveris nepalaiko pratęsimo failams > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2429 msgid "Server does not support resume of files > 4GB." msgstr "Serveris nepalaiko pratęsimo failams > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4369 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4116 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6239,7 +7054,7 @@ "Serveris gali nepalaikyti pratęsimo failams > %d GB. Siuntimas užbaigtas, " "nes failų dydžiai sutampa." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:844 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6247,11 +7062,11 @@ "Serveris reikalauja paskyros. Pabandykite nurodyti paskyrą serverių " "tvarkyklėje" -#: ../../locales/../src/engine/ControlSocket.cpp:420 +#: ../../locales/../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "Serveris grąžino tuščią kelią." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:679 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:599 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6259,13 +7074,13 @@ "Serveris atsiuntė papildomą registravimosi užklausą. Jums reikia naudoti " "interaktyvų registravimosi būdą." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3671 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Serveris atsiuntė pasyvų atsakymą su nepasiekiamu adresu. Pasyvi veiksena " "nepavyko." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3892 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3666 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6273,78 +7088,97 @@ "Serveris atsiuntė pasyvų atsakymą su nepasiekiamu adresu. Vietoj jo " "naudojamas serverio adresas." -#: ../../locales/../src/interface/netconfwizard.cpp:403 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:458 -#: ../../locales/../src/interface/netconfwizard.cpp:470 -#: ../../locales/../src/interface/netconfwizard.cpp:494 -#: ../../locales/../src/interface/netconfwizard.cpp:501 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:521 +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Serveris perdavė netikėtą atsakymą." -#: resources.h:338 +#: ../../locales/../src/engine/tlssocket.cpp:1239 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "Server to client MAC:" msgstr "Iš serverio į klientą MAC:" -#: resources.h:336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2084 msgid "Server to client cipher:" msgstr "Šifras iš serverio į klientą:" -#: resources.h:367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2438 msgid "Server&type:" msgstr "Serverio &tipas:" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Server/Local file" msgstr "Serveris/Vietinis failas" -#: resources.h:298 resources.h:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1718 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2361 msgid "Server:" msgstr "Serveris:" -#: resources.h:16 resources.h:45 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "Sesijos detalės" -#: resources.h:592 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "Nustatyti &prioritetą" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3723 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2434 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3492 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2230 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "„%s“ prieigos teises nustatyti į „%s“" -#: ../../locales/../src/engine/transfersocket.cpp:852 +#: ../../locales/../src/engine/transfersocket.cpp:794 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize iškviestas be lizdo" -#: resources.h:723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "Nuostatos" -#: resources.h:978 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#, fuzzy +msgid "Settings directory:" +msgstr "Kuriamas aplankas" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" msgstr "Rodyti &nepakeistą aplankų sąrašą" -#: resources.h:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Show &welcome dialog..." msgstr "Rodyti &pasisveikinimo langą..." -#: ../../locales/../src/interface/Mainfrm.cpp:2435 +#: ../../locales/../src/interface/Mainfrm.cpp:2207 msgid "Show both directory trees and continue comparing?" msgstr "Rodyti abu aplankų medžius ir tęsti palyginimą?" -#: resources.h:1024 +#: ../../locales/../src/interface/resources/xrc/update.xrc:217 #, fuzzy msgid "Show details" msgstr "Sesijos detalės" -#: resources.h:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +msgid "Show details about custom date and time formats" +msgstr "Rodyti detalę informaciją apie pasirinktinus datos ir laiko formatus" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:445 msgid "Shows available TLS ciphers" msgstr "Rodo prieinamus TLS šifrus" @@ -6352,70 +7186,71 @@ msgid "Shows this help dialog" msgstr "Rodyti šį pagalbos dialogą" -#: ../../locales/../src/interface/QueueView.cpp:3226 +#: ../../locales/../src/interface/QueueView.cpp:2585 msgid "Shutdown now" msgstr "Išjungti dabar" -#: resources.h:9 resources.h:38 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 msgid "Signature algorithm:" msgstr "Parašo algoritmas:" -#: resources.h:286 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "Site &Manager entries" msgstr "Serverių &tvarkyklės įrašai" -#: resources.h:80 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 msgid "Site Manager" msgstr "Serverių tvarkyklė" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:993 msgid "Site Manager - Cannot remember password" msgstr "Serverių tvarkyklė - neįmanoma įsiminti slaptažodžių" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:945 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:961 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:974 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1006 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1023 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1036 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1070 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1138 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "Site Manager - Invalid data" msgstr "Svetainės tvarkyklė - netinkami duomenys" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:316 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "Serverių tvarkyklė jau atidaryta" -#: ../../locales/../src/interface/sitemanager.cpp:445 -#: ../../locales/../src/interface/sitemanager.cpp:462 -#: ../../locales/../src/interface/sitemanager.cpp:476 -#: ../../locales/../src/interface/sitemanager.cpp:749 -#: ../../locales/../src/interface/sitemanager.cpp:834 +#: ../../locales/../src/interface/sitemanager.cpp:481 +#: ../../locales/../src/interface/sitemanager.cpp:509 +#: ../../locales/../src/interface/sitemanager.cpp:523 +#: ../../locales/../src/interface/sitemanager.cpp:535 +#: ../../locales/../src/interface/sitemanager.cpp:691 +#: ../../locales/../src/interface/sitemanager.cpp:768 msgid "Site does not exist." msgstr "Serveris neegzistuoja." -#: ../../locales/../src/interface/sitemanager.cpp:425 +#: ../../locales/../src/interface/sitemanager.cpp:492 msgid "Site path has to begin with 0 or 1." msgstr "Serverio kelias turi prasidėti 0 arba 1." -#: ../../locales/../src/interface/sitemanager.cpp:469 -#: ../../locales/../src/interface/sitemanager.cpp:565 -#: ../../locales/../src/interface/sitemanager.cpp:742 -#: ../../locales/../src/interface/sitemanager.cpp:827 +#: ../../locales/../src/interface/sitemanager.cpp:529 +#: ../../locales/../src/interface/sitemanager.cpp:685 +#: ../../locales/../src/interface/sitemanager.cpp:762 msgid "Site path is malformed." msgstr "Serverio kelias neteisingas." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:263 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:250 msgid "Site-specific bookmarks" msgstr "Konkrečios vietos žymelės" #: ../../locales/../src/interface/bookmarks_dialog.cpp:93 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:528 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6425,44 +7260,69 @@ "tvarkyklę“.\n" "Ar pridėti dabartinį ryšį prie serverių tvarkyklės?" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Size" msgstr "Dydis" -#: resources.h:896 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 msgid "Size formatting" msgstr "Dydžio formatas" -#: ../../locales/../src/interface/fileexistsdlg.cpp:59 -#: ../../locales/../src/interface/fileexistsdlg.cpp:63 +#: ../../locales/../src/interface/fileexistsdlg.cpp:43 msgid "Size unknown" msgstr "Dydis nežinomas" -#: resources.h:253 resources.h:263 resources.h:844 resources.h:853 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1436 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "Praleisti failą" -#: ../../locales/../src/engine/ControlSocket.cpp:1229 -#: ../../locales/../src/engine/ControlSocket.cpp:1248 -#: ../../locales/../src/engine/ControlSocket.cpp:1273 -#: ../../locales/../src/engine/ControlSocket.cpp:1339 +#: ../../locales/../src/engine/ControlSocket.cpp:1149 +#: ../../locales/../src/engine/ControlSocket.cpp:1166 +#: ../../locales/../src/engine/ControlSocket.cpp:1190 +#: ../../locales/../src/engine/ControlSocket.cpp:1268 #, c-format msgid "Skipping download of %s" msgstr "Praleidžiamas failo %s gavimas" -#: ../../locales/../src/engine/ControlSocket.cpp:1233 -#: ../../locales/../src/engine/ControlSocket.cpp:1252 -#: ../../locales/../src/engine/ControlSocket.cpp:1277 -#: ../../locales/../src/engine/ControlSocket.cpp:1343 +#: ../../locales/../src/engine/ControlSocket.cpp:1153 +#: ../../locales/../src/engine/ControlSocket.cpp:1169 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping upload of %s" msgstr "Praleidžiamas failo %s siuntimas" -#: ../../locales/../src/interface/Mainfrm.cpp:1266 +#: ../../locales/../src/engine/socket.cpp:1042 +msgid "Socket address outside address space" +msgstr "" + +#: ../../locales/../src/engine/socket.cpp:1044 +#, fuzzy +msgid "Socket already connected" +msgstr "Jau prisijungta" + +#: ../../locales/../src/engine/socket.cpp:1052 +msgid "Socket has been shut down" +msgstr "" + +#: ../../locales/../src/engine/socket.cpp:1049 +#, fuzzy +msgid "Socket not connected" +msgstr "Neprisijungta" + +#: ../../locales/../src/engine/socket.cpp:1092 +msgid "Socket type not supported for address family" +msgstr "" + +#: ../../locales/../src/interface/Mainfrm.cpp:1155 msgid "Some files are still being edited or need to be uploaded." msgstr "Kai kurie failai vis dar redaguojami arba juos reikia įkelti." -#: resources.h:686 resources.h:762 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -6470,69 +7330,70 @@ "Netinkamai sukonfigūruoti serveriai, esantys už maršrutizatoriaus, gali " "nurodyti savo vietinio tinklo IP adresą." -#: resources.h:914 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 msgid "Sort directories inline" msgstr "Rikiuoti aplankus iš eilės" -#: ../../locales/../src/interface/filelistctrl.cpp:450 +#: ../../locales/../src/interface/filelistctrl.cpp:469 msgid "Sort order cannot be changed if comparing directories." msgstr "Lyginant aplankus, rūšiavimo tvarka negali būti keičiama." -#: resources.h:910 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 msgid "Sorting" msgstr "Rikiavimas" -#: resources.h:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 msgid "Sorting &mode:" msgstr "Rikiavimo &būdas:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:101 +#: ../../locales/../src/interface/RemoteTreeView.cpp:104 msgid "Source and path of the drop operation are identical" msgstr "Perkėlimo operacijoje šaltinis ir kelias tokie pat" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "Šaltinio ir tikslo failai negali būti tie patys" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:144 msgid "Source and target of the drop operation are identical" msgstr "Pernešant failą šaltinio ir tikslo failas tas pats" -#: resources.h:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 msgid "Source file:" msgstr "Šaltinio failas:" -#: resources.h:476 ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3782 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 msgid "Speed Limits" msgstr "Greičio apribojimai" -#: resources.h:808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 msgid "Speed limits" msgstr "Greičio apribojimai" -#: ../../locales/../src/interface/statusbar.cpp:597 +#: ../../locales/../src/interface/statusbar.cpp:575 msgid "Speed limits are disabled, click to change." msgstr "Greičio ribos yra išjungtos, spragtelėkite, kad pakeistumėte." -#: ../../locales/../src/interface/statusbar.cpp:601 +#: ../../locales/../src/interface/statusbar.cpp:578 msgid "Speed limits are enabled, click to change." msgstr "Greičio ribos yra įjungtos, spragtelėkite, kad pakeistumėte." -#: resources.h:952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 msgid "Stable and beta versions" msgstr "Stabilios ir beta versijos" -#: resources.h:951 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 msgid "Stable versions only" msgstr "Tik stabilios versijos" -#: resources.h:953 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 #, fuzzy msgid "Stable, beta and nightly versions" msgstr "Stabilios ir beta versijos" -#: resources.h:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2569 msgid "Start transfer &immediately" msgstr "Pradėti siuntimą &nedelsiant" @@ -6540,19 +7401,19 @@ msgid "Start with opened Site Manager" msgstr "Pradėti su atidaryta serverių tvarkykle" -#: ../../locales/../src/interface/updater.cpp:223 +#: ../../locales/../src/interface/updater.cpp:239 #, fuzzy, c-format msgid "Started update check on %s\n" msgstr "Automatinis atnaujinimų tikrinimas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2250 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2152 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1485 #, c-format msgid "Starting download of %s" msgstr "Pradedamas failo %s gavimas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2254 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2155 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1488 #, c-format msgid "Starting upload of %s" msgstr "Pradedamas failo %s siuntimas" @@ -6561,30 +7422,35 @@ msgid "Starts the local site in the given path" msgstr "Paleidžia vietinį puslapį nurodytame kelyje" -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "Valstija arba provincija:" -#: ../../locales/../src/interface/edithandler.cpp:1115 -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/edithandler.cpp:1093 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Status" msgstr "Būsena" -#: ../../locales/../src/engine/logging.cpp:212 -#: ../../locales/../src/interface/StatusView.cpp:312 -#: ../../locales/../src/interface/StatusView.cpp:384 +#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:369 msgid "Status:" msgstr "Būsena:" -#: resources.h:589 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "Stabdyti ir &viską pašalinti" -#: ../../locales/../src/interface/verifycertdialog.cpp:189 +#: ../../locales/../src/interface/recursive_operation_status.cpp:42 +#, fuzzy +msgid "Stop recursive operation" +msgstr "Saugumo informacija" + +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Gatvė:" -#: resources.h:12 resources.h:41 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" msgstr "Sertifikato antraštė" @@ -6592,11 +7458,16 @@ msgid "Successful transfers" msgstr "Sėkmingi siuntimai" -#: resources.h:714 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" msgstr "Testo rezultatų suvestinė:" -#: resources.h:446 +#: ../../locales/../src/interface/QueueView.cpp:2593 +#, fuzzy +msgid "Suspend now" +msgstr "Išjungti dabar" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -6604,27 +7475,34 @@ "Simbolinės nuorodos į failus nėra paveiktos šiuo pasirinkimu, tokios " "simbolinės nuorodos visuomet ištrinamos." -#: resources.h:1005 ../../locales/../src/interface/state.cpp:249 -#: ../../locales/../src/interface/state.cpp:278 -#: ../../locales/../src/interface/state.cpp:285 -#: ../../locales/../src/interface/state.cpp:297 -#: ../../locales/../src/interface/state.cpp:396 -#: ../../locales/../src/interface/state.cpp:406 -#: ../../locales/../src/interface/state.cpp:415 -#: ../../locales/../src/interface/state.cpp:996 -#: ../../locales/../src/interface/state.cpp:1005 -#: ../../locales/../src/interface/state.cpp:1012 -#: ../../locales/../src/interface/state.cpp:1023 -#: ../../locales/../src/interface/state.cpp:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3843 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 +#: ../../locales/../src/interface/state.cpp:232 +#: ../../locales/../src/interface/state.cpp:246 +#: ../../locales/../src/interface/state.cpp:252 +#: ../../locales/../src/interface/state.cpp:262 +#: ../../locales/../src/interface/state.cpp:349 +#: ../../locales/../src/interface/state.cpp:357 +#: ../../locales/../src/interface/state.cpp:365 +#: ../../locales/../src/interface/state.cpp:949 +#: ../../locales/../src/interface/state.cpp:957 +#: ../../locales/../src/interface/state.cpp:963 +#: ../../locales/../src/interface/state.cpp:972 +#: ../../locales/../src/interface/state.cpp:998 msgid "Synchronized browsing" msgstr "Sinchronizuotasis naršymas" -#: ../../locales/../src/interface/state.cpp:414 +#: ../../locales/../src/interface/state.cpp:364 msgid "Synchronized browsing has been disabled." msgstr "Sinchronizuotasis naršymas buvo uždraustas." -#: ../../locales/../src/interface/quickconnectbar.cpp:88 -#: ../../locales/../src/interface/quickconnectbar.cpp:126 +#: ../../locales/../src/interface/recursive_operation_status.cpp:109 +#, fuzzy +msgid "Synchronizing directories." +msgstr "Šalinami aplankai" + +#: ../../locales/../src/interface/quickconnectbar.cpp:84 +#: ../../locales/../src/interface/quickconnectbar.cpp:121 msgid "Syntax error" msgstr "Sintaksės klaida" @@ -6633,8 +7511,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2550 -#: ../../locales/../src/interface/Mainfrm.cpp:2599 +#: ../../locales/../src/interface/Mainfrm.cpp:2318 +#: ../../locales/../src/interface/Mainfrm.cpp:2361 msgid "Syntax error in command line" msgstr "Komandų eilutės sintaksės klaida" @@ -6642,51 +7520,80 @@ msgid "System" msgstr "Sistema" -#: resources.h:512 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#, fuzzy +msgid "System details" +msgstr "Sesijos detalės" + +#: ../../locales/../src/engine/socket.cpp:1033 +msgid "System limit of open files exceeded" +msgstr "Pasiektas atidarytų failų sistemos limitas" + +#: ../../locales/../src/engine/socket.cpp:1090 +msgid "System's network subsystem has failed" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 msgid "T&oolbar" msgstr "&Įrankinė" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 -msgid "TLS/SSL connection established, sending HTTP request" +#: ../../locales/../src/engine/httpcontrolsocket.cpp:287 +#, fuzzy +msgid "TLS connection established, sending HTTP request" msgstr "TLS/SSL ryšys užmegztas, siunčiama HTTP užklausa" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414 -msgid "TLS/SSL connection established, waiting for welcome message..." +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +#, fuzzy +msgid "TLS connection established, waiting for welcome message..." msgstr "TLS/SSL prisijungimas sėkmingas, laukiama pasveikinimo pranešimo..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418 -msgid "TLS/SSL connection established." +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 +#, fuzzy +msgid "TLS connection established." msgstr "TLS/SSL prisijungimas sėkmingas." -#: ../../locales/../src/engine/proxy.cpp:547 +#: ../../locales/../src/engine/proxy.cpp:490 msgid "TTL expired" msgstr "TTL galiojimas pasibaigęs" -#: resources.h:57 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:6 msgid "Target file already exists" msgstr "Paskirties failas jau yra" -#: resources.h:63 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 msgid "Target file:" msgstr "Paskirties failas:" -#: ../../locales/../src/interface/RemoteListView.cpp:3190 +#: ../../locales/../src/interface/RemoteListView.cpp:2630 msgid "Target filename already exists!" msgstr "Paskirties failas jau yra!" -#: ../../locales/../src/interface/RemoteListView.cpp:1925 +#: ../../locales/../src/interface/RemoteListView.cpp:1613 msgid "Target filename already exists, really continue?" msgstr "Paskirties failas jau yra, tikrai norite tęsti?" -#: resources.h:713 +#: ../../locales/../src/engine/socket.cpp:1063 +msgid "Temporary failure in name resolution" +msgstr "Laikinas sutrikimas vardo atpažinime" + +#: ../../locales/../src/interface/netconfwizard.cpp:588 +#, fuzzy +msgid "Test finished successfully" +msgstr "Failas perduotas sėkmingai" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Testo rezultatai" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4375 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4121 msgid "Testing resume capabilities of server" msgstr "Tikrinama ar serveris palaiko siuntimo pratęsimą" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:315 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:745 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -6696,7 +7603,7 @@ "Ar norite tęsti? Tokiu atveju bet kokie serverių tvarkyklės pakeitimai nebus " "išsaugoti." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -6704,45 +7611,59 @@ "Serverių tvarkyklė jau atidaryta kitoje FileZilla kopijoje.\n" "Uždarykite ją arba duomenys negalės būti ištrinti." -#: ../../locales/../src/interface/xmlfunctions.cpp:431 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "XML dokumentas nėra gerai suformuotas: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Įvestas adresas buvo: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:820 -#: ../../locales/../src/interface/sitemanager.cpp:729 +#: ../../locales/../src/engine/socket.cpp:1069 +msgid "The ai_family member is not supported" +msgstr "" + +#: ../../locales/../src/engine/socket.cpp:1082 +#, fuzzy +msgid "The ai_socktype member is not supported" +msgstr "Adreso tipas nepalaikomas" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:781 +#: ../../locales/../src/interface/sitemanager.cpp:673 msgid "The bookmark could not be added." msgstr "Žymelė nebuvo pridėta." -#: ../../locales/../src/interface/sitemanager.cpp:814 +#: ../../locales/../src/interface/sitemanager.cpp:750 msgid "The bookmarks could not be cleared." msgstr "Žymelės nebuvo išvalytos." -#: ../../locales/../src/interface/statusbar.cpp:490 +#: ../../locales/../src/interface/statusbar.cpp:464 msgid "The connection is encrypted. Click icon for details." msgstr "" "Susijungimas yra šifruotas. Paspauskite piktogramą norėdami sužinoti daugiau." +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 +msgid "" +"The custom date format is invalid or contains unsupported format specifiers." +msgstr "" + #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." msgstr "Pasirinktinė registravimosi seka negali būti tuščia." -#: ../../locales/../src/engine/transfersocket.cpp:176 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 +msgid "" +"The custom time format is invalid or contains unsupported format specifiers." +msgstr "" + +#: ../../locales/../src/engine/transfersocket.cpp:142 #, c-format msgid "The data connection could not be established: %s" msgstr "Nepavyko nustatyti duomenų ryšio: %s" -#: resources.h:411 ../../locales/../src/interface/edithandler.cpp:1564 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 +#: ../../locales/../src/interface/edithandler.cpp:1517 msgid "The default editor for text files could not be found." msgstr "Numatytojo tekstinių failų redaktoriaus rasti nepavyko." -#: resources.h:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2937 #, c-format msgid "The default editor for text files is '%s'." msgstr "Numatytasis tekstinių failų redaktoriaus yra „%s“." @@ -6753,13 +7674,13 @@ msgid "The entered filter name already exists, please choose a different name." msgstr "Filtras tokiu vardu jau yra, pasirinkite kitokį vardą." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Plėtinys „%s“ sąraše jau yra" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:246 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:253 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 #, c-format msgid "" "The file %s already exists.\n" @@ -6768,9 +7689,8 @@ "Failas %s jau yra.\n" "Nurodykite kitą pavadinimą:" -#: ../../locales/../src/interface/LocalListView.cpp:1971 -#: ../../locales/../src/interface/LocalListView.cpp:2100 -#: ../../locales/../src/interface/RemoteListView.cpp:2674 +#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -6781,19 +7701,25 @@ "Susieta programa (%s) nerasta.\n" "Patikrinkite savo failo tipo susiejimus." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Failas „%s“ negali būti įkeltas arba jame nėra privataus rakto." -#: ../../locales/../src/interface/xmlfunctions.cpp:63 +#: ../../locales/../src/interface/xmlfunctions.cpp:41 #, c-format msgid "The file '%s' could not be loaded." msgstr "Failas „%s“ negali būti įkeltas." -#: ../../locales/../src/interface/LocalListView.cpp:1965 -#: ../../locales/../src/interface/LocalListView.cpp:2095 -#: ../../locales/../src/interface/RemoteListView.cpp:2668 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1732 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6802,8 +7728,8 @@ "Failas „%s“ negali būti atvertas:\n" "Su šio tipo failu nesusieta jokia jūsų sistemos programa." -#: ../../locales/../src/interface/LocalListView.cpp:2010 -#: ../../locales/../src/interface/LocalListView.cpp:2108 +#: ../../locales/../src/interface/edithandler.cpp:1739 +#: ../../locales/../src/interface/LocalListView.cpp:1744 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6812,20 +7738,16 @@ "Failas „%s“ negali būti atvertas:\n" "Susieta komanda neįvykdyta" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:752 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"Failo „%s“ formatas yra nesuderinamas su FileZilla.\n" -"Failas taip pat apsaugotas slaptažodžiu. Slaptažodžiu apsaugoti raktai su " -"FileZilla dar nesuderinami.\n" -"Ar norite šį failą konvertuoti į palaikomą ir neapsaugotą formatą?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" +msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -6834,22 +7756,11 @@ "Failo „%s“ formatas nepalaikomas FileZilla.\n" "Ar norite jį konvertuoti į palaikomą formatą?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"Failas „%s“ yra apsaugotas slaptažodžiu. Slaptažodžiu apsaugotų raktų " -"FileZilla dar nepalaiko.\n" -"Ar norėtumėte jį konvertuoti į neapsaugotą failą?" - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:89 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Failas nurodytas kaip numatytasis redaktorius neegzistuoja." -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -6863,37 +7774,37 @@ "serveris, prievadas, naudotojo vardas ir slaptažodis.\n" "Tęsti importavimą?" -#: ../../locales/../src/interface/listctrlex.cpp:759 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Failo pavadinimo stulpelis negali būti nei paslėptas nei perkeltas." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "Failo pavadinimo stulpelis negali būti paslėptas." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 #, c-format msgid "The following character will be replaced: %s" msgstr "Šis simbolis bus pakeistas: %s" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:66 #, c-format msgid "The following characters will be replaced: %s" msgstr "Šie simboliai bus pakeisti: %s" -#: resources.h:315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 msgid "The following files are currently being edited:" msgstr "Šie failai šiuo metu yra redaguojami:" -#: resources.h:450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3433 msgid "The free open source FTP solution" msgstr "Nemokamas atviro kodo FTP sprendimas" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:298 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:283 msgid "The global bookmarks could not be saved." msgstr "Visuotinės žymelės negali būti išsaugotos." -#: resources.h:976 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -6907,7 +7818,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Riba turi būti tarp 1 ir 2000 MiB" -#: ../../locales/../src/interface/state.cpp:275 +#: ../../locales/../src/interface/state.cpp:998 +#, fuzzy, c-format +msgid "The local directory '%s' could not be created." +msgstr "Failas „%s“ negali būti įkeltas." + +#: ../../locales/../src/interface/state.cpp:983 +#, fuzzy, c-format +msgid "The local directory '%s' does not exist." +msgstr "Pasirinktas redaktorius neegzistuoja." + +#: ../../locales/../src/interface/state.cpp:243 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -6916,7 +7837,7 @@ "Vietinis aplankas „%s“ nėra po sinchronizacijos šakniniu aplanku (%s).\n" "Ar uždrausti sinchronizuotąjį naršymą ir pratęsti vietinio aplanko keitimą?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -6924,20 +7845,25 @@ "Mažiausias galimas prievadas turi būti mažesnis arba lygus didžiausiam " "galimam prievadui." -#: resources.h:1017 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 #, fuzzy msgid "The new version could not be downloaded, please retry later." msgstr "Serveris nebuvo pridėtas." -#: resources.h:1015 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." -msgstr "" +msgstr "Nauja versija buvo išsaugota Atsisiuntimų aplanke." -#: ../../locales/../src/interface/QueueView.cpp:1961 +#: ../../locales/../src/interface/QueueView.cpp:1451 msgid "The queue will not be saved." msgstr "Eilė nebus išsaugota." -#: ../../locales/../src/interface/state.cpp:1002 +#: ../../locales/../src/interface/state.cpp:911 +#, fuzzy, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Pasirinktas redaktorius neegzistuoja." + +#: ../../locales/../src/interface/state.cpp:954 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -6946,49 +7872,50 @@ "Nuotolinis aplankas „%s“ nėra po sinchronizacijos šakniniu aplanku (%s).\n" "Ar uždrausti sinchronizuotąjį naršymą ir pratęsti vietinio aplanko keitimą?" -#: ../../locales/../src/interface/import.cpp:84 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Pažymėtos kategorijos buvo importuotos." -#: resources.h:285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1624 msgid "" "The selected file contains importable data for the following categories:" msgstr "Pažymėto failo turinys importuoja duomenis į kitas kategorijas:" -#: resources.h:308 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1861 msgid "The selected file is already being edited:" msgstr "Pažymėtas failas jau redaguojamas:" -#: ../../locales/../src/interface/RemoteListView.cpp:2728 +#: ../../locales/../src/interface/edithandler.cpp:1726 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Pažymėtas failas vis dar atidarytas kažkurioje programoje, uždarykite jį." -#: ../../locales/../src/interface/LocalListView.cpp:1977 -#: ../../locales/../src/interface/RemoteListView.cpp:2680 +#: ../../locales/../src/interface/edithandler.cpp:1632 +#, fuzzy msgid "" "The selected file would be executed directly.\n" -"This can be dangerous and damage your system.\n" +"This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" "Pažymėtas failas bus tiesiogiai įvykdytas.\n" "Tai gali būti pavojinga ir gali sugadinti jūsų sistemą.\n" "Ar tikrai norite tęsti?" -#: ../../locales/../src/interface/sitemanager.cpp:615 +#: ../../locales/../src/interface/sitemanager.cpp:576 msgid "The server could not be added." msgstr "Serveris nebuvo pridėtas." -#: ../../locales/../src/interface/netconfwizard.cpp:574 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Serveris perdavė netikėtą ar neatpažįstamą atsakymą." -#: resources.h:116 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "The server uses following charset encoding for filenames:" msgstr "Failų pavadinimams serveris naudoja kitą koduotę:" -#: resources.h:2 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 msgid "" "The server's certificate is unknown. Please carefully examine the " "certificate to make sure the server can be trusted." @@ -6996,7 +7923,7 @@ "Serverio sertifikatas nežinomas. Atidžiai peržiūrėkite sertifikatą, kad " "įsitikintumėte jog serveriu galima pasitikėti." -#: resources.h:198 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7006,7 +7933,7 @@ "reiškia, kad kažkuris administratorius pakeitė kompiuterio raktą, arba jūs " "bandote prisijungti prie kito kompiuterio, kuris apsimeta serveriu." -#: resources.h:186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7014,6 +7941,14 @@ "Serverio kompiuterio raktas yra nežinomas. Jūs neturite garantijos, kad " "serveris yra būtent tas kompiuteris, apie kurį galvojate." +#: ../../locales/../src/engine/tlssocket.cpp:1324 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "" + +#: ../../locales/../src/engine/socket.cpp:1081 +msgid "The servname parameter is not supported for ai_socktype" +msgstr "" + #: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " @@ -7021,15 +7956,24 @@ msgstr "" "Nustatymai importuoti. Kad jie įsigalėtų reikia paleisti FileZilla iš naujo." -#: ../../locales/../src/interface/QueueView.cpp:3215 +#: ../../locales/../src/engine/socket.cpp:1029 +#, fuzzy +msgid "The specified address family is not supported" +msgstr "Adreso tipas nepalaikomas" + +#: ../../locales/../src/engine/socket.cpp:1094 +msgid "The specified network name is no longer available" +msgstr "" + +#: ../../locales/../src/interface/QueueView.cpp:2588 msgid "The system will soon reboot unless you click Cancel." msgstr "Sistema netrukus bus perkrauta, nebent, spragtelėsite Atsisakyti." -#: ../../locales/../src/interface/QueueView.cpp:3213 +#: ../../locales/../src/interface/QueueView.cpp:2584 msgid "The system will soon shut down unless you click Cancel." msgstr "Sistema netrukus bus sustabdyta, nebent, spragtelėsite Atsisakyti." -#: resources.h:58 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 msgid "" "The target file already exists.\n" "Please choose an action." @@ -7037,23 +7981,28 @@ "Paskirties failas jau egzistuoja.\n" "Pasirinkite veiksmą." -#: ../../locales/../src/interface/netconfwizard.cpp:852 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Testas nepavyko. Ar tikrai norite išsaugoti šiuos nustatymus?" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:127 +#: ../../locales/../src/interface/xmlfunctions.cpp:77 +#, fuzzy, c-format +msgid "The valid backup file %s could not be restored" +msgstr "Failas „%s“ negali būti įkeltas." + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Temos" -#: ../../locales/../src/interface/filter.cpp:462 +#: ../../locales/../src/interface/filter.cpp:326 msgid "This filter set cannot be removed." msgstr "Ši filtrų grupė negali būti pašalinta." -#: ../../locales/../src/interface/filter.cpp:397 +#: ../../locales/../src/interface/filter.cpp:266 msgid "This filter set cannot be renamed." msgstr "Šis parinktas filtras negali būti pervardytas." -#: ../../locales/../src/interface/netconfwizard.cpp:575 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7061,7 +8010,7 @@ "Tai reiškia, kad dalis maršrutizatoriaus ir/arba ugniasienės vis dar kišasi " "į FileZilla." -#: resources.h:691 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:183 msgid "" "This only works if you are not behind a router, else your system would just " "return your internal address." @@ -7069,7 +8018,7 @@ "Tai veiks tik jei jūs esate ne už maršrutizatoriaus, priešingu atveju " "sistemą grąžins tik jūsų vidinį adresą." -#: resources.h:669 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 msgid "" "This wizard will help you to properly configure any routers and firewalls " "you have and tests your configuration." @@ -7077,47 +8026,43 @@ "Šis vedlys padės teisingai sukonfigūruoti bet kokius jūsų naudojamus " "maršrutizatorius ar ugniasienes ir konfigūraciją išbandys." -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Time" msgstr "Laikas" -#: resources.h:890 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 msgid "Time formatting" msgstr "Laiko formatas" -#: resources.h:730 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 msgid "Time&out in seconds:" msgstr "Laiko &riba sekundėmis:" -#: resources.h:733 ../../locales/../src/interface/QueueView.cpp:1054 -#: ../../locales/../src/interface/QueueView.cpp:1098 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Laukimo laikas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1083 -#, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Laiko juostos poslinkis: Serveris: %d sek. Vietinis: %d sek. Skirtumas: %d " -"sek." +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1626 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:933 +#, fuzzy, c-format +msgid "Timezone offset of server is %d seconds." +msgstr "Skaičiuojamas serverio laiko juostos poslinkis..." -#: ../../locales/../src/interface/verifycertdialog.cpp:183 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Antraštė:" -#: ../../locales/../src/interface/Mainfrm.cpp:2433 +#: ../../locales/../src/interface/Mainfrm.cpp:2205 msgid "To compare directories, both file lists have to be aligned." msgstr "Palyginti aplankus, abu failų sąrašai turi būti išlyginti." -#: ../../locales/../src/interface/Mainfrm.cpp:2434 +#: ../../locales/../src/interface/Mainfrm.cpp:2206 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Norint tai atlikti, aplankų medžiai turi būti abu rodomi arba abu paslėpti." -#: resources.h:784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7125,7 +8070,7 @@ "Norint naudoti viešo rakto autentikaciją, FileZilla turi žinoti kuriuos " "privačius raktus naudoti." -#: resources.h:1002 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7142,7 +8087,7 @@ "Žalia: Failas yra naujesnis už nepaženklintą failą kitoje pusėje\n" "Raudona: Skiriasi failo dydžiai" -#: resources.h:1004 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7152,196 +8097,196 @@ "Jei įjungtas, žvalgymasis vietinio aplanko hierarchijoje taip pat pakeis " "aplanką serveryje atitinkamai ir atvirkščiai." -#: resources.h:992 resources.h:993 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 msgid "Toggles processing of the transfer queue" msgstr "Perjungia siuntimų eilės vykdymą" -#: resources.h:984 resources.h:985 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 msgid "Toggles the display of the local directory tree" msgstr "Perjungia vietinio aplankų medžio rodymą" -#: resources.h:982 resources.h:983 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 msgid "Toggles the display of the message log" msgstr "Perjungia pranešimų žurnalo rodymą" -#: resources.h:986 resources.h:987 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 msgid "Toggles the display of the remote directory tree" msgstr "Perjungia nutolusio aplankų medžio rodymą" -#: resources.h:988 resources.h:989 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 msgid "Toggles the display of the transfer queue" msgstr "Perjungia siuntimų sąrašo rodymą" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:593 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:547 msgid "Too long header line" msgstr "Per ilga antraštės eilutė" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:669 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:622 msgid "Too many redirects" msgstr "Per daug peradresavimų" -#: ../../locales/../src/engine/logging.cpp:216 -#: ../../locales/../src/interface/StatusView.cpp:306 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:355 msgid "Trace:" msgstr "Pėdsakas:" -#: resources.h:920 resources.h:926 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 msgid "Transfer" msgstr "Perdavimas" -#: resources.h:348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2225 msgid "Transfer &direction" msgstr "Siuntimo &kryptis" -#: resources.h:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 msgid "Transfer &type" msgstr "Siuntimo &būdas" -#: resources.h:740 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 msgid "Transfer Mode" msgstr "Siuntimo būdas" -#: resources.h:876 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Transfer Queue" msgstr "Perdavimo eilė" -#: resources.h:108 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "Transfer Settings" msgstr "Perdavimo nuostatos" -#: ../../locales/../src/engine/transfersocket.cpp:513 -#: ../../locales/../src/engine/transfersocket.cpp:537 +#: ../../locales/../src/engine/transfersocket.cpp:444 +#: ../../locales/../src/engine/transfersocket.cpp:466 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Siuntimo prisijungimas nutrauktas: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Persiųsti duomenys buvo sugadinti." -#: ../../locales/../src/interface/QueueView.cpp:1483 -#: ../../locales/../src/interface/statuslinectrl.cpp:283 +#: ../../locales/../src/interface/queue.cpp:339 +#: ../../locales/../src/interface/statuslinectrl.cpp:245 msgid "Transferring" msgstr "Siunčiama" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:123 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 msgid "Transfers" msgstr "Siuntimai" -#: ../../locales/../src/interface/QueueView.cpp:3127 -#: ../../locales/../src/interface/QueueView.cpp:3130 +#: ../../locales/../src/interface/QueueView.cpp:2477 msgid "Transfers finished" msgstr "Perdavimai užbaigti" -#: resources.h:832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 msgid "Treat files &without extension as ASCII file" msgstr "Failus &be plėtinio interpretuoti kaip ASCII failus" -#: resources.h:828 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 msgid "Treat the &following filetypes as ASCII files:" msgstr "Šiuos &failų tipus laikyti ASCII failais:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:734 msgid "Trust changed Hostkey:" msgstr "Pasitikėti pasikeitusiu serverio raktu:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:875 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:732 msgid "Trust new Hostkey:" msgstr "Pasitikėti nauju serverio raktu:" -#: resources.h:205 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 msgid "Trust the new key and carry on connecting?" msgstr "Pasitikėti nauju raktu ir tęsti prisijungimą?" -#: resources.h:27 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" msgstr "Pasitikėti šiuo sertifikatu ir tęsti prisijungimą?" -#: resources.h:192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 msgid "Trust this host and carry on connecting?" msgstr "Pasitikėti serveriu ir tęsti prisijungimą?" -#: resources.h:1018 resources.h:1023 +#: ../../locales/../src/interface/resources/xrc/update.xrc:127 +#: ../../locales/../src/interface/resources/xrc/update.xrc:204 msgid "Try again" -msgstr "" +msgstr "Bandyti dar kartą" -#: resources.h:383 ../../locales/../src/interface/edithandler.cpp:1113 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 +#: ../../locales/../src/interface/edithandler.cpp:1091 msgid "Type" msgstr "Tipas" -#: resources.h:766 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 msgid "Type of FTP Proxy:" msgstr "FTP tarpinio serverio tipas:" -#: resources.h:791 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 msgid "Type of generic proxy:" msgstr "Bendro tarpinio serverio tipas:" -#: resources.h:318 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1942 msgid "U&pload" msgstr "&Išsiųsti" -#: resources.h:471 resources.h:812 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "I&šsiuntimo greičio riba:" -#: resources.h:938 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 msgid "U&se filetype associations if available" msgstr "Jei įmanoma, naudoti failų tipų &susiejimus" -#: resources.h:891 -msgid "U&se system defaults" -msgstr "Naudoti &sistemos numatytuosius" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#, fuzzy +msgid "U&se system defaults for current language" +msgstr "&Tekstiniams failams naudoti sistemos numatytąjį redaktorių." -#: resources.h:768 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "NAUDOTOJAS@&SERVERIS" -#: ../../locales/../src/engine/proxy.cpp:412 -#: ../../locales/../src/engine/proxy.cpp:556 +#: ../../locales/../src/engine/proxy.cpp:373 +#: ../../locales/../src/engine/proxy.cpp:499 #, c-format msgid "Unassigned error code %d" msgstr "Nepriskirtas klaidos kodas %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:182 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Vienetas:" -#: ../../locales/../src/interface/edithandler.cpp:1145 -#: ../../locales/../src/interface/edithandler.cpp:1173 +#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Unknown" msgstr "Nežinomas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:690 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Nežinomas FTP tarpinio serverio tipas, nepavyko sugeneruoti prisijungimo " "sekos." -#: ../../locales/../src/engine/proxy.cpp:470 +#: ../../locales/../src/engine/proxy.cpp:421 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Nežinoma SOCKS protokolo versija: %d" -#: resources.h:1 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:4 msgid "Unknown certificate" msgstr "Nežinomas sertifikatas" -#: ../../locales/../src/interface/xmlfunctions.cpp:419 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" -"Nežinoma klaida atveriant failą. Įsitikinkite, kad failas pasiekiamas ir yra " -"gerai suformuotas XML dokumentas." - -#: resources.h:185 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "Nežinomas serverio raktas" -#: ../../locales/../src/engine/proxy.cpp:480 +#: ../../locales/../src/engine/proxy.cpp:429 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7350,13 +8295,13 @@ "Nežinomas protokolo SOCKS versijos naudotojo/slaptažodžio tapatybės " "poinversija: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:464 +#: ../../locales/../src/interface/xmlfunctions.cpp:294 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "Nežinomas šakninis elementas, nepanašu jog failą sugeneravo FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:596 -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7364,7 +8309,7 @@ "Kol problemos nebus sutvarkytos, aktyvi FTP veiksena neveiks, todėl " "naudokite pasyvią veikseną." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7372,132 +8317,143 @@ "Kol problema nebus sutvarkyta, aktyvi FTP veiksena neveiks, todėl naudokite " "pasyvią veikseną." -#: ../../locales/../src/engine/tlssocket.cpp:1071 +#: ../../locales/../src/engine/tlssocket.cpp:1263 msgid "Unsupported certificate type" msgstr "Nepalaikomas tapatybės liudijimo tipas" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:653 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:607 msgid "Unsupported redirect" msgstr "Nepalaikomas peradresavimas" -#: resources.h:319 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1948 msgid "Up&load and unedit" msgstr "Į&kelti ir atšaukti redagavimą" #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:137 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 msgid "Updates" msgstr "Atnaujinimai" -#: resources.h:350 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2239 msgid "Upload" msgstr "Išsiųsti" -#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/edithandler.cpp:1114 msgid "Upload failed" msgstr "Išsiųsti nepavyko" -#: ../../locales/../src/interface/statusbar.cpp:609 +#: ../../locales/../src/interface/statusbar.cpp:586 #, c-format msgid "Upload limit: %s/s" msgstr "Išsiuntimo riba: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:611 +#: ../../locales/../src/interface/statusbar.cpp:588 msgid "Upload limit: none" msgstr "Išsiuntimo riba: nėra" -#: resources.h:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3249 +#: ../../locales/../src/interface/search.cpp:873 +#, fuzzy +msgid "Upload search results" +msgstr "Atsisiųsti paieškos rezultatus" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "Upload selected directory" msgstr "Įkelti pažymėtą aplanką" -#: resources.h:552 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 msgid "Upload selected files and directories" msgstr "Išsiųsti pažymėtus failus ir aplankus" -#: resources.h:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1753 msgid "Upload this file back to the server?" msgstr "Įkelti šį failą atgal į serverį?" -#: resources.h:302 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 msgid "Upload this file to the server?" msgstr "Įkelti šį failą į serverį?" -#: ../../locales/../src/interface/edithandler.cpp:1130 -#: ../../locales/../src/interface/edithandler.cpp:1164 -#: ../../locales/../src/interface/edithandler.cpp:1329 +#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1298 msgid "Uploading" msgstr "Įkeliama" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1331 +#: ../../locales/../src/interface/edithandler.cpp:1111 +#: ../../locales/../src/interface/edithandler.cpp:1300 msgid "Uploading and pending removal" msgstr "Įkeliamas ir laukiama pašalinimo" -#: ../../locales/../src/interface/edithandler.cpp:1167 -#: ../../locales/../src/interface/edithandler.cpp:1333 +#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/edithandler.cpp:1302 msgid "Uploading and unediting" msgstr "Įkeliama ir atšaukiamas redagavimas" -#: resources.h:120 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:558 msgid "Use &custom charset" msgstr "Naudoti &pasirinktąją koduotę" -#: resources.h:935 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Use &custom editor:" msgstr "Naudoti &pasirinktąjį redaktorių:" -#: resources.h:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2931 msgid "Use &default editor for text files" msgstr "Tekstiniams failams naudoti &numatytąjį redaktorių" -#: resources.h:392 resources.h:398 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2709 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2790 msgid "Use &synchronized browsing" msgstr "Naudoti &sinchronizuotąjį naršymą" -#: resources.h:118 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:546 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "Jei serveris palaiko naudoti UTF-8, priešingu atveju naudoti koduotę." -#: resources.h:245 resources.h:255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 msgid "Use default action" msgstr "Naudoti numatytąjį veiksmą" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 -msgid "Use plain FTP" -msgstr "Naudoti paprastą FTP" +#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 +#, fuzzy +msgid "Use explicit FTP over TLS if available" +msgstr "Reikalauti išskirtinai FTP per TLS" -#: resources.h:358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2344 msgid "Use server currently connected to" msgstr "Naudoti serverį, prie kurio šiuo metu prisijungta" -#: resources.h:359 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2350 msgid "Use server from site manager" msgstr "Naudoti serverį iš serverių tvarkyklės" -#: resources.h:885 -msgid "Use system &defaults" -msgstr "Naudoti &numatytas sistemos reikšmes" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#, fuzzy +msgid "Use system &defaults for current language" +msgstr "&Tekstiniams failams naudoti sistemos numatytąjį redaktorių." -#: resources.h:692 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" msgstr "Naudoti kitą IP adresą:" -#: resources.h:702 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 msgid "Use the following port range:" msgstr "Naudoti šią prievadų sritį:" -#: resources.h:687 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 msgid "Use the server's external IP address instead" msgstr "Naudoti serverio išorinį IP" -#: resources.h:693 resources.h:756 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" "Naudokite šį nustatymą, jei jūs esate už maršrutizatoriaus ir turite statinį " "išorinį IP adresą." -#: resources.h:696 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 msgid "" "Use this option if you have a dynamic IP address. FileZilla will contact the " "above server once each session as soon as you use active mode for the first " @@ -7508,32 +8464,27 @@ "kartą bus panaudota aktyvi veiksena. Serveriui bus perduota tik jūsų " "naudojama FileZilla versija." -#: resources.h:132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 msgid "User:" msgstr "Naudotojas:" -#: ../../locales/../src/interface/manual_transfer.cpp:518 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037 +#: ../../locales/../src/interface/manual_transfer.cpp:495 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 msgid "Username cannot be a series of spaces" msgstr "Naudotojo varde negali būti iš eilės keli tarpai" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4457 -#, c-format -msgid "Using proxy %s" -msgstr "Naudojant tarpinį serverį %s" - -#: resources.h:122 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:586 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" "Naudojant neteisingą koduotę, failų pavadinimai gali būti parodyti " "neteisingai." -#: resources.h:5 resources.h:34 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" msgstr "Galioja nuo:" -#: resources.h:6 resources.h:35 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" msgstr "Galioja iki:" @@ -7541,85 +8492,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "Išsamūs wxWidgets pranešimai" -#: ../../locales/../src/engine/tlssocket.cpp:1157 +#: ../../locales/../src/engine/tlssocket.cpp:1356 msgid "Verifying certificate..." msgstr "Tikrinamas sertifikatas..." -#: resources.h:180 -msgid "Version:" -msgstr "Versija:" - -#: resources.h:817 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "Labai aukštas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1396 msgid "View hidden option set, but unsupported by server" msgstr "Rodyti paslėptus nustatymus, kurie nesuderinami su serveriu" -#: resources.h:922 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 msgid "View/Edit" msgstr "Peržiūrėti/Keisti" -#: resources.h:342 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2141 msgid "Visible columns" msgstr "Rodomi stulpeliai" -#: resources.h:150 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "W&rite" msgstr "&Rašyti" -#: ../../locales/../src/interface/QueueView.cpp:1790 -msgid "Waiting" -msgstr "Laukiama" - -#: ../../locales/../src/interface/QueueView.cpp:1386 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Laukiama naršymui skirto prisijungimo" -#: ../../locales/../src/interface/QueueView.cpp:1433 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Laukiama slaptažodžio" -#: ../../locales/../src/interface/statuslinectrl.cpp:277 +#: ../../locales/../src/interface/statuslinectrl.cpp:239 msgid "Waiting for transfer to be cancelled" msgstr "Laukiama, kol siuntimas bus atšauktas" -#: ../../locales/../src/engine/engineprivate.cpp:203 +#: ../../locales/../src/engine/engineprivate.cpp:240 msgid "Waiting to retry..." msgstr "Laukiama pakartoti..." -#: ../../locales/../src/interface/FileZilla.cpp:302 -msgid "" -"Warning!\n" -"\n" -"A bug in Windows causes problems with FileZilla\n" -"\n" -"The bug occurs if you have\n" -"- Windows Server 2003 or XP 64\n" -"- Windows Firewall enabled\n" -"- Application Layer Gateway service enabled\n" -"See http://support.microsoft.com/kb/931130 for background information.\n" -"\n" -"Unless you either disable Windows Firewall or the Application Layer Gateway " -"service,\n" -"FileZilla will timeout on big transfers." -msgstr "" -"Dėmesio!\n" -"\n" -"Windows klaida sukelia FileZilla problemas.\n" -"\n" -"Klaida pasireiškia jei naudojate\n" -"- Windows Server 2003 ar XP 64\n" -"- Windows su įjungta ugniasiene\n" -"- esant įjungtai „Application Layer Gateway“ tarnybai\n" -"Daugiau informacijos rasite http://support.microsoft.com/kb/931130\n" -"\n" -"Siunčiant didelius failus FileZilla gali užstrigti,\n" -"nebent išjungsite Windows ugniasienę arba „Application Layer Gateway“ " -"tarnybą." - -#: ../../locales/../src/interface/netconfwizard.cpp:972 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." msgstr "Dėmesio, iš netinkamo IP duomenų prisijungimas nepaisomas." @@ -7638,23 +8551,23 @@ "\n" "Tikrai norite ieškoti naktimis kompiliuotų versijų?" -#: resources.h:197 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 msgid "Warning: Potential security breach!" msgstr "Dėmesio: Galima saugumo spraga!" -#: resources.h:462 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3607 msgid "Welcome to FileZilla" msgstr "Sveiki atvykę į FileZilla" -#: resources.h:451 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3468 msgid "What's new" msgstr "Kas naujo" -#: resources.h:1012 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Kas naujo:" -#: resources.h:478 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3797 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -7662,7 +8575,7 @@ "Leidus FileZilla prisiminti slaptažodžius ir jums kitą kart jungiantis " "nebereiks jų iš naujo vesti." -#: resources.h:820 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -7670,58 +8583,67 @@ "Kuomet įgalinta, simboliai kurie nėra palaikomi vietinės operacinės " "sistemos, failo varduose yra pakeičiami, jei atsiunčiamas toks failas." -#: resources.h:862 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +msgid "When st&arting a new connection while already connected:" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 msgid "Widescreen" msgstr "Plačiaekranis" -#: resources.h:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3792 msgid "Would you like FileZilla to remember passwords?" msgstr "Ar norite jog FileZilla prisimintų slaptažodžius?" -#: resources.h:154 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Wr&ite" msgstr "&Rašyti" -#: ../../locales/../src/interface/netconfwizard.cpp:433 -#: ../../locales/../src/interface/netconfwizard.cpp:440 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Blogas išorinis IP adresas" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:841 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:770 msgid "Wrong line endings" msgstr "Blogas eilučių pabaigų formatas" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:889 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "Geltona" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:744 msgid "Yes" msgstr "Taip" -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "" "Atrodo naudojate tik-IPv6 serverį. Šis vedlys nepalaiko tokios aplinkos." -#: resources.h:1026 +#: ../../locales/../src/interface/resources/xrc/update.xrc:248 #, fuzzy msgid "You are using the latest version of FileZilla." msgstr "Nepavyko parsiųsti naujausios FileZilla versijos." -#: resources.h:460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3577 msgid "You can always open this dialog again through the help menu." msgstr "Jūs galite visuomet atverti šį dialogo langą vėl, per pagalbos meniu." -#: resources.h:1020 resources.h:1025 +#: ../../locales/../src/interface/resources/xrc/update.xrc:144 +#: ../../locales/../src/interface/resources/xrc/update.xrc:224 #, fuzzy msgid "You can download the latest version from the FileZilla website:" msgstr "Nepavyko parsiųsti naujausios FileZilla versijos." -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:66 msgid "You can leave the port field empty to use the default port." msgstr "" "Prievado laukelį galite palikti tuščią, tada bus naudojamas numatytasis." -#: resources.h:157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -7729,11 +8651,11 @@ "Bet kurioje vietoje galima naudoti x, kad išlaikyti prieigos teises " "nepakeistas." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Nepavyko įkelti nustatymų iš FileZilla nustatymų aplanko." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 msgid "" "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." @@ -7741,16 +8663,16 @@ "Jūs negalite pakeisti netinkamo simbolio kitu netinkamu simboliu. Prašome " "įvesti simbolį, kuris yra leidžiamas failo varduose." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Jūs nenurodėte kitokio failo pavadinimo. Ar šį failą perrašyti?" -#: resources.h:441 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3351 msgid "You have selected at least one symbolic link." msgstr "Jūs turite pasirinkti mažiausiai vieną simbolinę nuorodą." -#: ../../locales/../src/interface/LocalListView.cpp:1944 -#: ../../locales/../src/interface/RemoteListView.cpp:2647 +#: ../../locales/../src/interface/edithandler.cpp:1593 +#: ../../locales/../src/interface/search.cpp:1149 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -7758,7 +8680,7 @@ "Jūs pasirinkote daugiau negu 10 failų redagavimui. Ar jūs tikrai norite " "tęsti?" -#: ../../locales/../src/interface/LocalListView.cpp:2063 +#: ../../locales/../src/interface/LocalListView.cpp:1701 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -7766,35 +8688,46 @@ "Jūs pasirinkote daugiau negu 10 failų ar aplankų atvėrimui. Ar jūs tikrai " "norite tęsti?" -#: ../../locales/../src/interface/manual_transfer.cpp:433 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:945 +#: ../../locales/../src/interface/manual_transfer.cpp:415 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:961 msgid "You have to enter a hostname." msgstr "Reikia įvesti serverio pavadinimą." -#: ../../locales/../src/interface/search.cpp:800 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1070 +#, fuzzy +msgid "You have to enter a key file path" +msgstr "Jūs turite įvesti vietinį aplanką." + +#: ../../locales/../src/interface/search.cpp:859 msgid "You have to enter a local directory." msgstr "Jūs turite įvesti vietinį aplanką." -#: ../../locales/../src/interface/netconfwizard.cpp:149 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." +#: ../../locales/../src/interface/search.cpp:873 +#, fuzzy +msgid "You have to enter a remote directory." +msgstr "Jūs turite įvesti vietinį aplanką." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +#, fuzzy +msgid "You have to enter a valid IPv4 address." msgstr "Įveskite tinkamą IP adresą." -#: ../../locales/../src/interface/search.cpp:806 +#: ../../locales/../src/interface/search.cpp:864 msgid "You have to enter a writable local directory." msgstr "Turite įvesti vietinį aplanką, į kurį galima rašyti." -#: ../../locales/../src/interface/manual_transfer.cpp:529 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047 +#: ../../locales/../src/interface/manual_transfer.cpp:506 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 msgid "You have to enter an account name" msgstr "Reikia įvesti paskyros pavadinimą" -#: ../../locales/../src/interface/manual_transfer.cpp:499 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +#: ../../locales/../src/interface/manual_transfer.cpp:480 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1036 msgid "You have to specify a user name" msgstr "Reikia nurodyti naudotojo vardą" -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -7802,7 +8735,7 @@ "Greičiausiai yra maršrutizatorius arba ugniasienė, kuri klaidingai pakeitė " "siunčiamus duomenis." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:55 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 msgid "You need to enter a name for the bookmark." msgstr "Jums reikia įvesti žymelės pavadinimą." @@ -7810,7 +8743,7 @@ msgid "You need to enter a name for the log file." msgstr "Jums reikia įvesti žurnalo failo pavadinimą." -#: ../../locales/../src/interface/edithandler.cpp:1520 +#: ../../locales/../src/interface/edithandler.cpp:1478 msgid "You need to enter a properly quoted command." msgstr "Jums reikia įvesti tinkamą pacituotą komandą." @@ -7823,15 +8756,15 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Reikia įvesti tarpinio serverio prievadą nuo 1 iki 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:76 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:446 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1138 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Jums reikia įvesti bent vieną kelią. Tuščios žymelės nepalaikomos." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:83 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:453 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -7839,7 +8772,7 @@ "Jums reikia įvesti abu: vietinį ir nuotolinį kelią, kad įgalintumėte " "sinchronizuotąjį naršymą šiai žymelei." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -7847,23 +8780,23 @@ "Jums reikia įvesti abu: vietinį ir nuotolinį kelią, kad įgalintumėte " "sinchronizuotąjį naršymą šiam serveriui." -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Reikia nurodyti vietinį failą." -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Reikia nurodyti nutolusį failą." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Reikia nurodyti nutolusį kelią." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Reikia nurodyti serverį." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -7871,6 +8804,11 @@ "Prisijungiant prie kitų serverių neturėtų kilti problemų, failų perdavimas " "turėtų veikti tinkamai." +#: ../../locales/../src/interface/QueueView.cpp:2592 +#, fuzzy +msgid "Your computer will suspend unless you click Cancel." +msgstr "Sistema netrukus bus perkrauta, nebent, spragtelėsite Atsisakyti." + #: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 msgid "after" msgstr "po" @@ -7884,7 +8822,7 @@ msgstr "prasideda" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 msgid "bytes" msgstr "baitai" @@ -7892,6 +8830,11 @@ msgid "contains" msgstr "turi" +#: ../../locales/../src/interface/updater.cpp:243 +#, fuzzy +msgid "custom" +msgstr "&Pasirinktas" + #: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "does not contain" msgstr "neturi" @@ -7910,19 +8853,19 @@ msgid "equals" msgstr "lygus" -#: ../../locales/../src/interface/filelistctrl.cpp:513 -#: ../../locales/../src/interface/filelistctrl.cpp:532 -#: ../../locales/../src/interface/filelistctrl.cpp:559 -#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:534 +#: ../../locales/../src/interface/filelistctrl.cpp:553 +#: ../../locales/../src/interface/filelistctrl.cpp:580 +#: ../../locales/../src/interface/filelistctrl.cpp:596 msgid "file" msgstr "failas" -#: ../../locales/../src/interface/edithandler.cpp:85 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -7932,14 +8875,23 @@ "Įsitikinkite, kad šis vykdomasis failas yra tame pačiame aplanke kaip ir " "pagrindinis FileZilla vykdomasis failas." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:354 +#, fuzzy +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "Nepavyko parsiųsti naujausios FileZilla versijos." + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1412 msgid "fzsftp could not be started" msgstr "Paleisti fzsftp nepavyko" -#: ../../locales/../src/engine/tlssocket.cpp:1109 +#: ../../locales/../src/engine/tlssocket.cpp:1202 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers negrąžino liudijimų" +#: ../../locales/../src/engine/tlssocket.cpp:1214 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "" + #: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "greater than" msgstr "daugiau nei" @@ -7956,6 +8908,13 @@ msgid "group writeable" msgstr "rašyti grupei" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#, fuzzy +msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" +msgstr "" +"Norėdami sužinoti daugiau apsilankykite https://wiki.filezilla-project.org/" +"Date_and_Time_formatting svetainėje" + #: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "is equal to" msgstr "yra" @@ -7988,10 +8947,11 @@ msgid "owner writeable" msgstr "rašyti savininkui" -#: ../../locales/../src/engine/tlssocket.cpp:1168 -#: ../../locales/../src/engine/tlssocket.cpp:1179 -#: ../../locales/../src/engine/tlssocket.cpp:1194 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29 +#: ../../locales/../src/engine/proxy.cpp:62 +#: ../../locales/../src/engine/tlssocket.cpp:1400 +#: ../../locales/../src/engine/tlssocket.cpp:1411 +#: ../../locales/../src/engine/tlssocket.cpp:1426 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 msgid "unknown" msgstr "nežinomas" @@ -8007,10 +8967,186 @@ msgid "world writeable" msgstr "rašyti visiems" -#: resources.h:175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Filename &filters..." +#~ msgstr "Failo &filtrai..." + +#~ msgid "%d files added to queue" +#~ msgstr "%d failai pridėti į eilę" + +#~ msgid "&Crash" +#~ msgstr "&Lūžti" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Atsijungti nuo serverio" + +#~ msgid "&Show message" +#~ msgstr "&Rodyti pranešimą" + +#~ msgid "" +#~ "A file with that name is already being edited. Do you want to reopen '%s'?" +#~ msgstr "" +#~ "Failas su tokiu pavadinimu jau redaguojamas. Ar norite iš naujo atverti " +#~ "„%s“?" + +#~ msgid "" +#~ "Any changes made in the Site Manager will not be saved unless you repair " +#~ "the file." +#~ msgstr "" +#~ "Bet kokie pakeitimai padaryti serverių tvarkyklėje nebus išsaugoti, " +#~ "nebent jūs pataisytumėte failą." + +#~ msgid "Benchmark string coalescer" +#~ msgstr "Lyginamoji „coalescer“ eilutė" + +#~ msgid "Cannot compare directories, not connected to a server." +#~ msgstr "Neįmanoma palyginti aplankų, neprisijungta prie serverio." + +#~ msgid "Cannot load file, not a valid XML file." +#~ msgstr "Neįmanoma įkrauti failo, netinkamas XML failas." + +#~ msgid "Certificate details" +#~ msgstr "Sertifikato informacija" + +#~ msgid "Clear &Site Manager entries" +#~ msgstr "Išvalyti &Serverio tvarkyklės įrašus" + +#~ msgid "Clear &transfer queue" +#~ msgstr "Išvalyti &siuntimų eilę" + +#~ msgid "Clear string coalescer" +#~ msgstr "Išvalyti „coalescer“ eilutę" + +#~ msgid "Connected" +#~ msgstr "Prisijungta" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Nepavyko importuoti tokių pat liudijimų, gnutls_x509_crt_import nepavyko" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Nepavyko inicijuoti tokių pat struktūros liudijimų, gnutls_x509_crt_init " +#~ "nepavyko" + +#~ msgid "" +#~ "Crashes FileZilla instantly. Only used to debug the exception handler" +#~ msgstr "FileZilla iškart nulūžta. Naudojama tik klaidų paieškai" + +#~ msgid "Do ¬hing" +#~ msgstr "Nieko &nedaryti" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Kelių nesusijusių aplankų atsisiuntimas dar nėra palaikomas" + +#~ msgid "Failed to parse trusted root cert." +#~ msgstr "Nepavyko apdoroti patikimo šakninio liudijimo." + +#~ msgid "" +#~ "Filename may not contain any of the following characters: / \\ : * ? \" < " +#~ "> |" +#~ msgstr "" +#~ "Failų pavadinimai negali būti sudaryti iš šių simbolių: / \\ : * ? \" < > " +#~ "|" + +#~ msgid "Fingerprint (MD5):" +#~ msgstr "Antspaudas (MD5):" + +#~ msgid "No more files in the queue!" +#~ msgstr "Eilėje nebėra failų!" + +#~ msgid "Operating system problem detected" +#~ msgstr "Aptikta operacinės sistemos problema" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Ieškomi failai, kurie bus pridėti į eilę" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Ieškomi failai išsiuntimui" + +#~ msgid "The XML document is not well-formed: %s" +#~ msgstr "XML dokumentas nėra gerai suformuotas: %s" + +#~ msgid "" +#~ "The file '%s' is not in a format supported by FileZilla.\n" +#~ "The file is also password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into a supported, unprotected format?" +#~ msgstr "" +#~ "Failo „%s“ formatas yra nesuderinamas su FileZilla.\n" +#~ "Failas taip pat apsaugotas slaptažodžiu. Slaptažodžiu apsaugoti raktai su " +#~ "FileZilla dar nesuderinami.\n" +#~ "Ar norite šį failą konvertuoti į palaikomą ir neapsaugotą formatą?" + +#~ msgid "" +#~ "The file '%s' is password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into an unprotected file?" +#~ msgstr "" +#~ "Failas „%s“ yra apsaugotas slaptažodžiu. Slaptažodžiu apsaugotų raktų " +#~ "FileZilla dar nepalaiko.\n" +#~ "Ar norėtumėte jį konvertuoti į neapsaugotą failą?" + +#~ msgid "" +#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " +#~ "seconds." +#~ msgstr "" +#~ "Laiko juostos poslinkis: Serveris: %d sek. Vietinis: %d sek. Skirtumas: " +#~ "%d sek." + +#~ msgid "" +#~ "Unknown error opening the file. Make sure the file can be accessed and is " +#~ "a well-formed XML document." +#~ msgstr "" +#~ "Nežinoma klaida atveriant failą. Įsitikinkite, kad failas pasiekiamas ir " +#~ "yra gerai suformuotas XML dokumentas." + +#~ msgid "Use plain FTP" +#~ msgstr "Naudoti paprastą FTP" + +#~ msgid "Use system &defaults" +#~ msgstr "Naudoti &numatytas sistemos reikšmes" + +#~ msgid "Using proxy %s" +#~ msgstr "Naudojant tarpinį serverį %s" + +#~ msgid "Waiting" +#~ msgstr "Laukiama" + +#~ msgid "" +#~ "Warning!\n" +#~ "\n" +#~ "A bug in Windows causes problems with FileZilla\n" +#~ "\n" +#~ "The bug occurs if you have\n" +#~ "- Windows Server 2003 or XP 64\n" +#~ "- Windows Firewall enabled\n" +#~ "- Application Layer Gateway service enabled\n" +#~ "See http://support.microsoft.com/kb/931130 for background information.\n" +#~ "\n" +#~ "Unless you either disable Windows Firewall or the Application Layer " +#~ "Gateway service,\n" +#~ "FileZilla will timeout on big transfers." +#~ msgstr "" +#~ "Dėmesio!\n" +#~ "\n" +#~ "Windows klaida sukelia FileZilla problemas.\n" +#~ "\n" +#~ "Klaida pasireiškia jei naudojate\n" +#~ "- Windows Server 2003 ar XP 64\n" +#~ "- Windows su įjungta ugniasiene\n" +#~ "- esant įjungtai „Application Layer Gateway“ tarnybai\n" +#~ "Daugiau informacijos rasite http://support.microsoft.com/kb/931130\n" +#~ "\n" +#~ "Siunčiant didelius failus FileZilla gali užstrigti,\n" +#~ "nebent išjungsite Windows ugniasienę arba „Application Layer Gateway“ " +#~ "tarnybą." + #~ msgid "%s bytes" #~ msgstr "%s baitai" @@ -8023,9 +9159,6 @@ #~ msgid "&Finish" #~ msgstr "&Baigti" -#~ msgid "&Next >" -#~ msgstr "&Kitas >" - #~ msgid ", %H:%M:%S left" #~ msgstr ", %H:%M:%S liko" @@ -8041,9 +9174,6 @@ #~ msgid "- Malware on your system" #~ msgstr "- Jūsų sistemoje kenkėjiška įranga" -#~ msgid "< &Back" -#~ msgstr "< &Atgal" - #~ msgid "Advanced options:" #~ msgstr "Sudėtingesnės parinktys:" @@ -8102,8 +9232,8 @@ #~ msgstr "Paketas" #~ msgid "" -#~ "Please check https://filezilla-project.org/ for the most recent version of " -#~ "FileZilla." +#~ "Please check https://filezilla-project.org/ for the most recent version " +#~ "of FileZilla." #~ msgstr "" #~ "Naujausios FileZilla versijos ieškokite https://filezilla-project.org/ " #~ "svetainėje." @@ -8114,8 +9244,8 @@ #~ "FileZilla." #~ msgstr "" #~ "Atnaujinto FileZilla paketo ieškokite savo sistemos paketų tvarkyklėje " -#~ "arba apsilankykite https://filezilla-project.org/ ir atsisiųskite programos " -#~ "FileZilla programos pradinį kodą." +#~ "arba apsilankykite https://filezilla-project.org/ ir atsisiųskite " +#~ "programos FileZilla programos pradinį kodą." #~ msgid "" #~ "Please retry downloading the update. Possible reasons if the problem " diff -Nru filezilla-3.15.0.2/locales/lv_LV.po filezilla-3.33.0/locales/lv_LV.po --- filezilla-3.15.0.2/locales/lv_LV.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/lv_LV.po 2018-03-29 08:59:00.000000000 +0000 @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: lv\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-16 16:47+0100\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-03-23 15:52+0100\n" "PO-Revision-Date: 2015-03-23 22:57+0200\n" "Last-Translator: Ivo Simsons \n" "Language-Team: Latvian \n" @@ -18,30 +18,30 @@ "X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -"X-Generator: Poedit 1.7.5\n" +"X-Generator: Lokalize 1.5\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "Pagājušas %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "Palikušas %H:%M:%S" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" msgstr "" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" @@ -49,9 +49,9 @@ msgstr[1] "%d direktoriji" msgstr[2] "%d direktoriju" -#: ../../locales/../src/interface/RemoteListView.cpp:1417 -#: ../../locales/../src/interface/search.cpp:453 -#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -59,11 +59,11 @@ msgstr[1] "%d direktoriji ar to saturu" msgstr[2] "%d direktoriju ar to saturu" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1416 -#: ../../locales/../src/interface/search.cpp:452 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" @@ -71,7 +71,7 @@ msgstr[1] "%d datnes" msgstr[2] "%d datnes" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" @@ -79,7 +79,7 @@ msgstr[1] "%d datnes. Kopējais izmērs: %s" msgstr[2] "%d datnes. Kopējais izmērs: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" @@ -87,12 +87,7 @@ msgstr[1] "%d datnes. Kopējais izmērs: Vismaz %s" msgstr[2] "%d datnes. Kopējais izmērs: Vismaz %s" -#: ../../locales/../src/interface/QueueView.cpp:2797 -#, c-format -msgid "%d files added to queue" -msgstr "%d datnes pievienotas rindai" - -#: ../../locales/../src/engine/ControlSocket.cpp:101 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -100,46 +95,62 @@ msgstr[1] "%d sekundes" msgstr[2] "%d sekundes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Saimniekdators" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 +#, fuzzy, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%d direktorijs" +msgstr[1] "%d direktoriji" +msgstr[2] "%d direktoriju" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, fuzzy, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%d datne" +msgstr[1] "%d datnes" +msgstr[2] "%d datnes" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Parole" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:44 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Sertifikāts beidzies!" -#: ../../locales/../src/interface/verifycertdialog.cpp:31 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Vel nav derīgs!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Starpniekservera lietotājs" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s un %s. Kopējais izmērs: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s un %s. Kopējais izmērs: Vismaz %s" @@ -152,79 +163,88 @@ msgstr[1] "%s baiti" msgstr[2] "%s baiti" -#: ../../locales/../src/interface/FileZilla.cpp:670 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -#: ../../locales/../src/interface/FileZilla.cpp:755 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -#: ../../locales/../src/interface/verifycertdialog.cpp:60 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Lietotājvārds" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Starpniekservera parole" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" -msgstr "&Pārtrāukt iepriekšējo savienojumu un savienoties aktuālajā cilnē" +msgstr "&Pārtraukt iepriekšējo savienojumu un savienoties aktuālajā cilnē" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "&Par..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Konts:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Aktīvs" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." -msgstr "&Pievieot grāmatzīmi..." +msgstr "&Pievienot grāmatzīmi..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Pievienot direktoriju..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Pievienot datnes rindai" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." -msgstr "&pievienot atslēgdatni..." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 +msgid "&Add key file..." +msgstr "&Pievienot atslēgdatni..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Pievienot rindai" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Uzstādiet servera laika joslas nobīdi:" @@ -232,72 +252,77 @@ msgid "&Always trust certificate in future sessions." msgstr "&Turpmāk vienmēr uzticēties sertifikātam." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:879 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "" "Vienmēr uzticēties šim saimniekdatoram, pievienot šo atslēgu kešatmiņai" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Vienmēr lietot noklusējuma redaktoru" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Vienmēr lietot šo darbību" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Jautāt operetājsistēmai pēc ārējās IP adreses" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Automātiski" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Automātiski noteikt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Binārs" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "&Grāmatzīmes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2235 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2724 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3099 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:295 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Pārlūkot..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1009 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Atcelt" @@ -309,19 +334,23 @@ msgid "&Close" msgstr "&Aizvērt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&Aizvērt FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Aizvērt FileZilla vienreiz" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "&Konfigurēt ātruma ierobežojumus..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "&Konfigurēt..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Savienoties" @@ -329,140 +358,146 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Kopēt aktuālo savienojumu uz Vietņu pārvaldnieku..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:787 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "&Kopēt uz starpliktuvi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Izveidot direktoriju" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" msgstr "&Izveidot jaunu cilni" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Atkļūdot" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "&Atkļūdošanas informācija ziņojumu žurnālā:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "&Noklusējuma redaktors:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "&Noklusējuma datne eksistē darbība..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Aizkave starp neizdevušamies pieslēgšanās mēģinājumiem:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1053 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1223 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Dzēst" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Dzēst simbolsaiti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "&Direktoriju pieejas atļaujas..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "&Direktoriju salīdzināšana" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/state.cpp:1030 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" + +#: ../../locales/../src/interface/state.cpp:1108 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "&Izmest lokālo datni, tad lejupielādēt un rediģēt datni no jauna" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "&Atvienoties" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Atvienoties no servera" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Rādīt momentāno pārsūtīšanas ātrumu vidējā ātruma vietā" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Rādīt izmēru baitos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3629 -msgid "&Do not remember passwords (recommended)" -msgstr "&Nesaglabāt paroles (ieteicams)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Vairs nerādīt šo dialogu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "&Neizmantot ārējo IP adresi lokālajos savienojumos." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "&Dubultklikšķa darbība ar datnēm:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Lejupielādēt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Lejupielādēt uz:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Lejupielādēt..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1382 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Lejupielādes:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Rediģēt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "&Rediģēt filtru noteikumus..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "&Iespējot" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Iespējot saspiešanu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Iespējot ātruma ierobežojumus" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Kodējums:" @@ -470,28 +505,28 @@ msgid "&Encryption:" msgstr "&Šifrēšana:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "&Ievadīt pielāgotu komandu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3453 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "&Izveidot savienojumu jaunā cilnē" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Izpildīt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Eksportēt vietņu pārvaldnieka ierakstus" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Eksportēt..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Atkāpties uz aktīvo režīmu" @@ -499,88 +534,98 @@ msgid "&File" msgstr "&Datne" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "&Datnes atribūti..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "&Datnes atļaujas..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Datne:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Filtru noteikumi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Filtru komplekti:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Filtri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Beigt rediģēt un izdzēst lokālo datni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "&Sekot simbolsaitei, dzēst mērķa direktoriju saturu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Iegūt ārējo IP adresi no sekojošā URL:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Iegūt palīdzību..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Vispārējā grāmatzīme" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&Palīdzība" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Slēpt identiskās datnes" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&Augstākā" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Augstākā pieejamā pieslēgvieta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2370 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Saimniekdators:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (piemēram: 2007-09-15)" @@ -588,84 +633,97 @@ msgid "&Import..." msgstr "&Importēt..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "&Mantot sistēmas datņu tipu asociācijas" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Instalēt jauno versiju" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 +msgid "&Key file:" +msgstr "&Atslēgdatne" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Datņu un direktoriju paneļu izkārtojums:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Ierobežot FileZilla lietotās pieslēgvietas" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Ierobežot vienlaicīgo savienojumu skaitu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "&Lokālais direktoriju koks" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2629 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2712 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Lokālais direktorijs" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +#, fuzzy +msgid "&Local search" +msgstr "Datnes meklēšana" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Reģistrēt datnē" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "&Pieteikšanās veids:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "&Pieteikšanās veids:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Zema" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "&Pārvaldīt grāmatzīmes..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "&Manuāls pārsūtījums..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Maksimālais savienojumu skaits:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Maksimālais atkārtošanu skaits:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "&Ziņojumu žurnāls" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Minimizēt uz uzdevumjoslu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "& Vārdu kārtošanas režīms:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Vārds:" @@ -673,7 +731,7 @@ msgid "&Network configuration wizard..." msgstr "&Tīkla konfigurācijas vednis..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Jauns" @@ -681,154 +739,177 @@ msgid "&New Site" msgstr "&Jauna vietne" -#: ../../locales/../src/interface/Mainfrm.cpp:1736 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Pieejama jauna versija!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Turpināt >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1746 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Nē" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Neviens" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Normāla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Skaitliskā vērtība:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2848 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&Labi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&ATVĒRT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Atvērt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Pārrakstīt" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Pasīvs" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Parole:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "&Atskaņot skaņu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Pieslēgvieta:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Saglabāt pārsūtīto datņu laikspiedolus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Rindā" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Ātrais savienojums" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "&Ātrā savienojuma josla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 +#, fuzzy +msgid "&Quickconnect history" +msgstr "Dzēst &ātrā savienojuma joslu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Lasīt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "&Savienoties" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#, fuzzy +msgid "&Reconnect information" +msgstr "Dzēst &atkalsavienojuma informāciju" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "&Atsvaidzināt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 -msgid "&Remember password until FileZilla is closed" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +#, fuzzy +msgid "&Remember master password until FileZilla is closed" msgstr "&Saglabāt paroli līdz FileZilla aizvēršanai" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3623 -msgid "&Remember passwords" -msgstr "&Saglabāt paroles" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 +msgid "&Remember password until FileZilla is closed" +msgstr "&Saglabāt paroli līdz FileZilla aizvēršanai" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2656 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Attālais direktorijs:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2259 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Attālais ceļš:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +#, fuzzy +msgid "&Remote search" +msgstr "Attālā datņu meklēšana" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Aizvākt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Aizvākt atslēgu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "&Aizvākt atlasītos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1229 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2793 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Pārdēvēt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1048 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Pārdēvēt..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Atvērt no jauna lokālo datni" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Aizstāt nederīgas rakstzīmes ar:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "&Ziņot par kļūdu..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "&Atiestatīt un sarindot visu" @@ -836,39 +917,39 @@ msgid "&Restart Wizard" msgstr "&Restartēt vedni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Turpināt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "&Izpildīt komandu..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Palaist konfigurācijas vedni..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Palaist atjaunināšanas pārbaudi..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&VIETNE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Saglabāt kā..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Meklēt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Meklēt attālinātās datnes...." @@ -876,20 +957,20 @@ msgid "&Select Entry:" msgstr "&Izvēlieties ierakstu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Izvēlieties valodu:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Atlasiet kolonnas, kas būtu redzamas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2298 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Serveris" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "Uzstādījumi" @@ -897,196 +978,219 @@ msgid "&Settings..." msgstr "&Uzstādījumi..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Rādīt atkļūdošanas izvēlni" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Rādīt ziņojumu" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Rādīt laikspiedolus ziņojumu žurnālā" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 +#, fuzzy +msgid "&Site Manager entries" +msgstr "Vietņu &pārvaldnieka ieraksti" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Vietņu pārvaldnieks..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "&Vietnei specifiska grāmatzīme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Izlaist" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "&Ātruma ierobežojumi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "&Sākt pārsūtīšanu tūlīt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Apmainīt vietām lokālo un attālo paneli" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "&TLS šifri" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Tests" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Tēma:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Pārsūtīšana" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:382 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "&Pārsūtīšanas režīms:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "&Pārsūtījumu rinda" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +#, fuzzy +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "Uzticēties šim sertifikātam un turpināt savienošanos?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Atrediģēt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Augšupielādēt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +#, fuzzy +msgid "&Upload to:" +msgstr "&Augšupielādes:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +#, fuzzy +msgid "&Upload..." +msgstr "&Augšupielādēt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Augšupielādes:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Lietot pielāgotu programmu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Izmantot sinhonizēto pārlūkošanu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Lietot sistēmas noklusēto redaktoru teksta datnēm" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Lietot sekojošo IP adresi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Izmantot tās vietā servera ārējo IP adresi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Lietot tūkstošu atdalītāju" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2437 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Lietotājs:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Lietotājvārds:" -#: ../../locales/../src/interface/Mainfrm.cpp:1730 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Versija %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Skatīt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Skatīt/Rediģēt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "&Sekot lokāli rediģēdātām datnēm un piedāvāt augšupielādēt izmaiņas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Pārbaudot atjauninājumus, pārbaudīt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Rakstīt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1740 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Jā" -#: ../../locales/../src/engine/local_path.cpp:449 -#: ../../locales/../src/engine/local_path.cpp:495 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' neeksistē, vai arī tam nevar piekļūt." -#: ../../locales/../src/engine/local_path.cpp:464 -#: ../../locales/../src/engine/local_path.cpp:484 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' nav direktorijs." -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, fuzzy, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' nav direktorijs." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "" -#: ../../locales/../src/interface/manual_transfer.cpp:440 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:611 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " "command without the leading 'quote'." msgstr "" -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" @@ -1094,50 +1198,50 @@ msgstr[1] "" msgstr[2] "" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% lejupielādēts)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 neierobežotam)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 sekundes)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 lai atslēgtu)" -#: ../../locales/../src/interface/aboutdialog.cpp:84 -#: ../../locales/../src/interface/aboutdialog.cpp:161 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(piemēram: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(piemēram: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(%s/s)" @@ -1146,7 +1250,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "Palikušas --:--:--" @@ -1166,55 +1270,59 @@ msgid "-s cannot be used together with an FTP URL." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Nekas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Brīdinājums" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Informācija" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Izplūdis" -#: ../../locales/../src/interface/aboutdialog.cpp:97 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32 bitu sistēma" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Atkļūdot" -#: ../../locales/../src/interface/aboutdialog.cpp:95 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64 bitu sistēma" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Atpakaļ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Grāmatzīme ar izvēlēto vārdu jau eksistē. Lūdzu ievadiet neizmantotu vārdu." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Jāiestata noklusējuma redaktors." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:808 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Direktoriju nevar ievilkt vienā no tā apakšdirektorijiem." @@ -1225,22 +1333,22 @@ "and asks the server to connect to it." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Iepriekš atvērta datne ir mainījusies." -#: ../../locales/../src/interface/edithandler.cpp:1679 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Datne ar šādu vārdu jau tiek pārsūtīta." -#: ../../locales/../src/interface/edithandler.cpp:1683 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Datne ar šādu vārdu joprojām tiek rediģēta. Lūdzu aizveriet to un mēģiniet " "vēlreiz." -#: ../../locales/../src/interface/FileZilla.cpp:649 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1249,39 +1357,46 @@ "No further warning will be displayed this session." msgstr "" -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Ir pieejama jauna FileZilla versija:" -#: ../../locales/../src/interface/Mainfrm.cpp:671 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." msgstr "" -#: ../../locales/../src/interface/state.cpp:283 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "P&ievienot" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "A&tļaut ASCII datņu turpināšanu" @@ -1293,51 +1408,54 @@ msgid "A&pply only to uploads" msgstr "P&ielietot tikai augšupielādēm" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "P&ielietot visām datnēm un direktorijām" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "A&utomātiski aizvākt veiksmīgus pārsūtījumus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2514 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Par FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Virs datņu sarakstiem" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1276 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1277 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +#, fuzzy +msgid "Access to some local directories could not be restored:" +msgstr "Nevar atjaunot derīgu dublējuma datni %s" + +#: ../../locales/../src/engine/server.cpp:616 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Konts" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "Darbība pēc rindas &pabeigšanas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Darbība ar atlasīto datni:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Veicamā darbība:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Darbība:" @@ -1345,14 +1463,14 @@ msgid "Active mode" msgstr "Aktīvais režīms" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "" "Aktīvā režīma FTP tests neizdevās. FileZilla nezin pareizu ārējo IP adresi." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1360,7 +1478,7 @@ "Aktīvā režīma FTP tests neizdevās. FileZilla nezin pareizu ārējo IP adresi. " "Pietam jūsu maršrutētājs modificējis nosūtīto adresi." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1369,38 +1487,39 @@ "Aktīvā režīma FTP tests neizdevās. FileZilla zin pareizu ārējo IP adresi, " "bet jūsu maršrutētājs vai ugunsmūris maldinoši modificējis nosūtīto adresi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "Aktīvā režīma IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Tikai pievienot datnes &rindai" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Pievienot izvēlēto direktoriju pārsūtīšanas rinadai" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Pievienot izvēlētās datnes un direktoriji pārsūtīšanas rinadai" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Pievienot rindai" -#: ../../locales/../src/engine/proxy.cpp:488 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Neatbalstīts adreses veids" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Izvērsts" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1409,15 +1528,16 @@ "builds at your own risk." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "Vi&enmēr lietot šo darbību" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritms:" -#: ../../locales/../src/interface/QueueView.cpp:2979 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "Visas datnes ir veiksmīgi pārsūtītas" @@ -1425,7 +1545,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Visām pieslēgvietām šajā diapazonā jābūt starp 1024 un 65535." -#: ../../locales/../src/interface/QueueView.cpp:2975 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1433,7 +1553,7 @@ msgstr[1] "Visi pārsūtijumi ir pabeigti. %d datnes nevarēja tikt pārsūtītas." msgstr[2] "Visi pārsūtijumi ir pabeigti. %d datņu nevarēja tikt pārsūtītas." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Kļūmes gadījumā ļaut &atkāpties uz citu pārsūtīšanas režīmu" @@ -1441,129 +1561,124 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Kļūmes gadījumā ļaut atkāpties uz citu pārsūtīšanas režīmu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Jau savienots" -#: ../../locales/../src/interface/verifycertdialog.cpp:81 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." msgstr "" -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "Jūs varat arī lejupielādēt jaunāko versiju no FileZilla mājas lapas:" -#: ../../locales/../src/interface/QueueView.cpp:1925 +#: ../../locales/../src/interface/QueueView.cpp:1662 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" "Some queue items might not have been restored." msgstr "" -#: ../../locales/../src/interface/QueueView.cpp:1830 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" "Some queue items might not have been saved." msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "" -#: ../../locales/../src/engine/server.cpp:857 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1275 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1516 +#: ../../locales/../src/engine/server.cpp:641 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Anonīms" -#: ../../locales/../src/interface/state.cpp:992 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "Jebkādas izmaiņas, kas veiktas vietņu pārvaldniekā, nevar saglabāt." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:740 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"Jebkādas izmaiņas, kas veiktas vietņu pārvaldniekā, netiks saglabātas, ja " -"vien nesalabosiet datni." - -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Jebkādas izmaiņas, kas veiktas filtriem, nevar saglabāt." -#: ../../locales/../src/interface/filter.cpp:971 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Jebkādas izmaiņas, kas veiktas filtriem, netiks saglabātas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Pieliet&ot tikai direktorijām" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Pielietot" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Pielietot tikai aktuālajai rindai" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Pielietot tikai &datnēm" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Arhīvs" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Kā cilni pārsūtījumu rindas panelī" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1390 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Jautāt pēc darbības" -#: ../../locales/../src/engine/server.cpp:832 -#: ../../locales/../src/engine/server.cpp:851 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/engine/server.cpp:633 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Jautāt paroli" @@ -1575,7 +1690,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Jautāt operetājsistēmai pēc ārējās IP adreses" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Uzdodot jautājumus FileZilla forumos" @@ -1583,7 +1698,7 @@ msgid "Associated program not found:" msgstr "Asociētā programma netika atrasta:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:709 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Vismaz viens filtra nosacījums ir nederīgs" @@ -1591,187 +1706,220 @@ msgid "At this point, all required information has been gathered." msgstr "Uz doto brīdi visa nepieciešamā informācija ir savākta." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atribūti" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Autentificēšana neizdevās." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Autors:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Automātiski" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Automātiska datnes tipa klasifikācija" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Pieejamie izmēri" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:160 -#: ../../locales/../src/engine/sizeformatting_base.cpp:219 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:267 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "A&piet starpniekserveri" -#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Pamata lietošanas instrukcijas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Rīcība" -#: ../../locales/../src/interface/edithandler.cpp:1130 -#: ../../locales/../src/interface/edithandler.cpp:1158 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Tiek rediģēts" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Uzmanieties! Sertifikāts ir ticis anulēts" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2519 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binārs" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Tāfele" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:269 -#: ../../locales/../src/interface/menu_bar.cpp:307 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Grāmatzīme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Grāmatzīmes:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Grāmatzīmes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 +#, fuzzy +msgid "Browse..." +msgstr "&Pārlūkot..." + +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +#, fuzzy +msgid "Bucket not found" +msgstr "Datne netika atrasta" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Būvējuma datums:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Būvējuma informācija" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Uzņēmējdarbības kategorija:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " "please enter the port range below." msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "A&tcelt pašreizējo darbību" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "Attīrīt visu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "K&opēt URL uz starpliktuvi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +#, fuzzy +msgid "C&opy URL(s) with password to clipboard" +msgstr "K&opēt URL uz starpliktuvi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "P&ielāgots" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "P&ielāgotās datņu tipu asociācijas:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1605 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 +msgid "CPU features:" +msgstr "" + +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Aprēķina servera laika joslu nobīdi..." -#: ../../locales/../src/engine/transfersocket.cpp:639 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Nevar nolasīt datni." -#: ../../locales/../src/engine/transfersocket.cpp:619 -#: ../../locales/../src/engine/transfersocket.cpp:685 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Nevar ierakstīt informāciju datnē." -#: ../../locales/../src/engine/transfersocket.cpp:621 -#: ../../locales/../src/engine/transfersocket.cpp:687 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Nevar ierakstīt informāciju datnē: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1169 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1350 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1457 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1528 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1581 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1814 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2163 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2545 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2854 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3488 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:555 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Atcelt" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Atcelt pašreizējo darbību" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Atceļ pašreizējo darbību" -#: ../../locales/../src/engine/local_path.cpp:459 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Nevar pievienot serveri Vietņu pārvaldniekam" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1787,30 +1935,27 @@ "Nevar salīdzināt direktorijus, ir iespējoti dažādi filtri vietējiem un " "attālajiem direktorijiem" -#: ../../locales/../src/interface/RemoteListView.cpp:2365 -msgid "Cannot compare directories, not connected to a server." -msgstr "Nevar salīdzināt direktorijus, nav savienojuma ar serveri." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Nevar izveidot jaunu filtru" -#: ../../locales/../src/interface/edithandler.cpp:1609 -#: ../../locales/../src/interface/edithandler.cpp:1657 -#: ../../locales/../src/interface/LocalListView.cpp:1712 -#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Nevar rediģēt datni" -#: ../../locales/../src/interface/LocalListView.cpp:1594 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Nevar salīdzināt direktorijus, nav savienojuma ar serveri." -#: ../../locales/../src/interface/LocalListView.cpp:1603 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Nevar rediģēt datni, nezināms attālais ceļš." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:324 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1818,80 +1963,82 @@ "Nevar izveidot FTP savienojumu ar SFTP serveri. Lūdzu izvēlieties pareizu " "protokolu." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Nevar ielādēt ātrā savienojuma joslu no resursu datnes" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:388 -msgid "Cannot load keyfile" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 +#, fuzzy +msgid "Cannot load key file" msgstr "Nevar ielādēt atslēgdatni" -#: ../../locales/../src/interface/Mainfrm.cpp:1032 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Nevar ielādēt rīkjoslu no resursu datnes" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Nevar iegaumēt paroli" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "Nevar pārsaukt ierakstu" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Nevar pārsaukt datni" -#: ../../locales/../src/engine/proxy.cpp:131 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Nevar saglabāt filtru komplektu" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Nevar atlasīt filtru" -#: ../../locales/../src/interface/edithandler.cpp:1506 -#: ../../locales/../src/interface/edithandler.cpp:1510 -#: ../../locales/../src/interface/edithandler.cpp:1545 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Nevar iestatīt datņu asociācijas" -#: ../../locales/../src/interface/edithandler.cpp:1089 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Nevar parādīt dialogu" -#: ../../locales/../src/interface/edithandler.cpp:1679 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Nevar parādīt/rediģēt atlasīto datni" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +#, fuzzy +msgid "Case Insensitive" +msgstr "Reģistrnejutīgi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Reģistrnejutīgi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Reģistrnejutīgi (noklusējuma)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Reģistrjutīgi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Reģistrjutīgi (noklusējuma)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1482 -msgid "Categories" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 +#, fuzzy +msgid "Categories to clear" msgstr "Kategorijas" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "" @@ -1903,36 +2050,41 @@ msgid "Certificate issuer" msgstr "Sertifikāta izsniedzējs" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +#, fuzzy +msgid "Certificate signature verification failed" +msgstr "Sertifikāts ķēdē:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Mainīt dates atribūtus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Mainīt datnes atļaujas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" -#: ../../locales/../src/interface/FileZilla.cpp:649 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Rakstzīmju kodējuma problēma" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Rakstzīmju kopa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Pārbaudīt &atjauninājumus..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Pārbaudīt FileZilla &atjauninājumus automātiski:" @@ -1940,55 +2092,60 @@ msgid "Check for Updates" msgstr "Pārbaudīt atjauninājumus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Meklēt jaunas Filezilla versijas" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Neizdevās pārbaudīt atjauninājumus" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Pārbauda pareizu ārējo IP adresi" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Pārbauda atjauninājumus..." -#: ../../locales/../src/interface/updater.cpp:779 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "" -#: ../../locales/../src/interface/updater.cpp:775 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1447 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 +#, fuzzy +msgid "Choose a key file" +msgstr "Konvertēt atslēgdatni" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Izvēlaties lokālo noklusējuma direktoriju" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:131 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:372 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2160 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Izvēlaties lokālo direktoriju" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 +#: ../../locales/../src/engine/http/request.cpp:667 msgid "Chunk data improperly terminated" msgstr "" @@ -1997,70 +2154,64 @@ msgstr "Šifrs:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "Ai&zvērt cilni" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Klasiskais" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1502 -msgid "Clear &Site Manager entries" -msgstr "Dzēst &vietņu pārvaldnieka ierakstus" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Notīrīt &izkārtojuma kešatmiņu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1489 -msgid "Clear &quickconnect history" -msgstr "Dzēst &ātrā savienojuma joslu" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 -msgid "Clear &reconnect information" -msgstr "Dzēst &atkalsavienojuma informāciju" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1508 -msgid "Clear &transfer queue" -msgstr "Dzēst &pārsūtījumu rindu" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +#, fuzzy +msgid "Clear auto&update data" +msgstr "Dzēst privātos datus" -#: ../../locales/../src/interface/quickconnectbar.cpp:147 +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Attīrīt vēsturi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Dzēst privātos datus" -#: ../../locales/../src/interface/quickconnectbar.cpp:146 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Attīrīt ātrā savienojuma joslu" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Nospiediet uz Beigt, lai saglabātu konfigurāciju." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:609 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +#, fuzzy +msgid "Close" +msgstr "&Aizvērt" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "Aizvērt &visas citas cilnes" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1173 -#: ../../locales/../src/interface/Mainfrm.cpp:1194 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "Aizvērt FileZilla" @@ -2068,103 +2219,109 @@ msgid "Close all running instances of FileZilla" msgstr "" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +#, fuzzy +msgid "Close quick search and continue comparing?" +msgstr "Rādīt abus direktoriju kokus un turpināt salīdzināt?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Aizver aktuālo cilni" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Ko&mentāri:" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Kolonnas īpašības" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Kolonnas iestatīšana" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:140 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:171 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Komanda neizdevās" -#: ../../locales/../src/engine/proxy.cpp:485 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Komanda nav atbalstīta" -#: ../../locales/../src/engine/engineprivate.cpp:209 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Komandu neatbalsta šis protokols" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:276 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Komanda:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Komentārs" -#: ../../locales/../src/interface/verifycertdialog.cpp:214 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Salīdzināt &modifikācijas laiku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Salīdzināt datnes &izmēru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Kompilēts:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Kompilēts ar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Kompilēts ar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Kompilatora karodziņi:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Saspiests" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Vienlaicīgie pārsūtījumi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1300 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Nosacījumi ir &reģistrjutīgi" @@ -2180,36 +2337,42 @@ msgid "Configure port range" msgstr "Konfigurēt pieslēgvietu diapazonu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3342 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "FileZilla un jūsu tīkla konfigurēšana" -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Apstiprināt dzēšanu" -#: ../../locales/../src/engine/local_filesys.cpp:127 -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1676 -#: ../../locales/../src/interface/RemoteListView.cpp:1421 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1072 -#: ../../locales/../src/interface/search.cpp:699 +#: ../../locales/../src/interface/edithandler.cpp:1638 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Nepieciešams apstiprinājums" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Apsveicam, izskatās, ka jūsu konfigurācija darbojas." -#: ../../locales/../src/interface/quickconnectbar.cpp:145 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Savienoties apejot starpniekservera iestatījumus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, fuzzy, c-format +msgid "Connect failed: %s" +msgstr "Starpniekservera pieprasījums neizdevās: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Savienoties aktuālajā cilnē" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Savienoties jaunā cilnē" @@ -2217,28 +2380,26 @@ msgid "Connect to specified Site Manager site" msgstr "Savienoties ar norādīto Vietņu pārvaldiena vietni" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:910 -msgid "Connected" -msgstr "Savienots" - -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Savienojas" -#: ../../locales/../src/interface/netconfwizard.cpp:222 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Savienojas ar %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 -#, c-format -msgid "Connecting to %s through proxy" +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 +#, fuzzy, c-format +msgid "Connecting to %s through %s proxy" msgstr "Savienojas ar %s caur starpserveri" -#: ../../locales/../src/engine/ControlSocket.cpp:956 -#: ../../locales/../src/engine/proxy.cpp:226 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Savienojas ar %s..." @@ -2247,81 +2408,90 @@ msgid "Connection" msgstr "Savienojas" -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Savienojums atcelts" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Savienošanās mēģinājums neizdevās" -#: ../../locales/../src/engine/ControlSocket.cpp:921 -#: ../../locales/../src/engine/proxy.cpp:200 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Savienošanās mēģinājums ar \"%s\" neizdevās, mēģinu nākamo adresi." -#: ../../locales/../src/engine/ControlSocket.cpp:925 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Savienošanās mēģinājums ar \"%s\" neizdevās." -#: ../../locales/../src/engine/ControlSocket.cpp:181 -#: ../../locales/../src/engine/engineprivate.cpp:677 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Savienošanās mēģinājumu pārtraucis lietotājs" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Savienojuma mēginājums noildzis" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Savienojums slēgts" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:303 +#: ../../locales/../src/engine/http/request.cpp:316 +#: ../../locales/../src/engine/http/request.cpp:327 +#: ../../locales/../src/engine/http/request.cpp:338 msgid "Connection closed by server" msgstr "Savienojumu slēdza serveris" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:368 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:294 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "Nodibināts savienojums, inicializē TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:319 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "Nodibināts savienojums, sūta HTTP pieprasījumu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:396 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +#, fuzzy +msgid "Connection established, waiting for welcome message." +msgstr "Nodibināts savienojums, gaida sagaidīšanas ziņojumu..." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Nodibināts savienojums, gaida sagaidīšanas ziņojumu..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Pazaudēts savienojums" -#: ../../locales/../src/engine/proxy.cpp:470 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Savienojumu neļauj noteikumu kopa" -#: ../../locales/../src/engine/proxy.cpp:479 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Savienojums atteikts" -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Savienojumu atteica serveris" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Savienojumu atiestatīja tīkls" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Savienojumu atiestatīja dalībnieks" -#: ../../locales/../src/engine/ControlSocket.cpp:558 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" @@ -2329,107 +2499,154 @@ msgstr[1] "" msgstr[2] "" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Savienojums noildzis." -#: ../../locales/../src/interface/search.cpp:358 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Savienojums ar serveri pazudis." -#: ../../locales/../src/engine/proxy.cpp:209 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "" "Nodibināts savienojums ar starpniekserveri, gaida sagaidīšanas ziņojumu..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Savienojums ar serveri tika slēgts priekšlaicīgi." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Savienošanās ar testa serveri neizdevās." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:276 -msgid "Convert keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 +#, fuzzy +msgid "Convert key file" msgstr "Konvertēt atslēgdatni" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:642 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1745 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Kopēt (%d) no %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:622 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1725 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "%s kopija" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +#, fuzzy +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Kopē atlasīto vienumu URL uz starpliktuvi." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopē atlasīto vienumu URL uz starpliktuvi." -#: ../../locales/../src/engine/transfersocket.cpp:170 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Nevar pieņemt savienojumu: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, fuzzy, c-format +msgid "Could not access path %s" +msgstr "Nevar pieņemt savienojumu: %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +#, fuzzy +msgid "Could not add certificate to temporary trust list" +msgstr "Saknes sertifikāts nav uzticams" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Nevar pievienot savienojumu vietņu pārvaldniekam" -#: ../../locales/../src/interface/state.cpp:823 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Nevar pabeigt darbību" -#: ../../locales/../src/engine/ControlSocket.cpp:183 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Nevar savienoties ar serveri" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Nevar savienoties ar serveri: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:324 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Nevar pārveidot privāto atslēgu" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1420 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Nevar nokopēt URL" -#: ../../locales/../src/interface/aboutdialog.cpp:175 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +#, fuzzy +msgid "Could not copy certificate" +msgstr "Nevar nokopet datus" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Nevar nokopet datus" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, fuzzy, c-format +msgid "Could not create CFURL from path %s" +msgstr "Neizdevās izveidot lokālo datni %s\n" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +#, fuzzy +msgid "Could not create URI for this transfer." +msgstr "Neizdevās uzsākt pārsūtījumu" + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Neizdevās izveidot lokālo datni %s\n" -#: ../../locales/../src/interface/RemoteListView.cpp:2273 -#: ../../locales/../src/interface/RemoteTreeView.cpp:864 +#: ../../locales/../src/engine/logging.cpp:179 +#, fuzzy, c-format +msgid "Could not create logging mutex: %s" +msgstr "Neizdevās izveidot lokālo datni %s\n" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " "files into an Explorer window." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4175 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Nevar izveidot savienojumu ar serveri" -#: ../../locales/../src/interface/FileZilla.cpp:481 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2437,48 +2654,60 @@ "variable." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:937 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +#, fuzzy +msgid "Could not generate key" +msgstr "Nevar pārveidot privāto atslēgu" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:914 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "" -#: ../../locales/../src/interface/state.cpp:976 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Nevarēja iegūt pilnu attālināto ceļu." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:171 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +#, fuzzy +msgid "Could not get native path from CFURL" +msgstr "Nevarēja iegūt pilnu attālināto ceļu." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +#, fuzzy +msgid "Could not get path from URL" +msgstr "Nevar nokopēt URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "" -#: ../../locales/../src/interface/edithandler.cpp:1609 -#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:860 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" - -#: ../../locales/../src/engine/tlssocket.cpp:855 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" msgstr "" -#: ../../locales/../src/interface/import.cpp:98 -#: ../../locales/../src/interface/import.cpp:284 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2486,15 +2715,22 @@ "Any changes made in the Site Manager will not be saved." msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:227 -msgid "Could not load keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 +#, fuzzy +msgid "Could not load key file" msgstr "Neizdevās ielādēt atslēgdatni" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:301 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Neizdevās ielādēt privāto atslēgdatni" -#: ../../locales/../src/interface/state.cpp:1002 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2502,7 +2738,7 @@ "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../locales/../src/interface/state.cpp:391 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2510,7 +2746,7 @@ "Synchronized browsing has been disabled." msgstr "" -#: ../../locales/../src/interface/state.cpp:292 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2518,64 +2754,117 @@ "Synchronized browsing has been disabled." msgstr "" -#: ../../locales/../src/interface/aboutdialog.cpp:175 -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1420 +#: ../../locales/../src/interface/updater.cpp:741 +#, fuzzy, c-format +msgid "Could not obtain size of '%s'" +msgstr "Nevar atvērt žurnāla datni %s" + +#: ../../locales/../src/interface/updater.cpp:755 +#, fuzzy, c-format +msgid "Could not open '%s'" +msgstr "Nevar atvērt žurnāla datni %s" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Neizdevās atvērt starpliktuvi" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:172 -#: ../../locales/../src/engine/logging.cpp:204 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Nevar atvērt žurnāla datni %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "" -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:222 +#: ../../locales/../src/interface/updater.cpp:764 +#, fuzzy, c-format +msgid "Could not read from '%s'" +msgstr "Nevar nolasīt servera vienumu." + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 +#, fuzzy +msgid "Could not read from data socket." +msgstr "Nevar nolasīt servera vienumu." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:380 #, c-format msgid "Could not read from socket: %s" msgstr "" -#: ../../locales/../src/interface/sitemanager.cpp:488 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Nevar nolasīt servera vienumu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2654 -#, c-format -msgid "Could not seek to offset %s within file" +#: ../../locales/../src/interface/netconfwizard.cpp:354 +#, fuzzy +msgid "Could not receive data from server." +msgstr "Nevar savienoties ar serveri" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +#, fuzzy +msgid "Could not restore directory access" +msgstr "Neizdevās iegūt direktoriju sarakstu" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, fuzzy, c-format +msgid "Could not seek to offset %d within file" +msgstr "Neizdevās rakstīt lokalo datni" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2566 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:140 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2682 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#, fuzzy +msgid "Could not send command to fzstorj." +msgstr "Neizdevās nosūtīt komandu." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +#, fuzzy +msgid "Could not sort peer certificates" +msgstr "Neizdevās pārbaudīt vienranga sertifikātu" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Neizdevās uzsākt pārsūtījumu" -#: ../../locales/../src/interface/sitemanager.cpp:656 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2584,17 +2873,17 @@ "Nevarēja rakstīt \"%s\", nekādas izmaiņas Vietņu pārvaldniekā nevar " "saglabāt: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Nevarēja rakstīt \"%s\", grāmatzīmi nevar pievienot: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:324 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Nevarēja rakstīt \"%s\", vispārējās grāmatzīmes nevar saglabāt: %s" -#: ../../locales/../src/interface/QueueView.cpp:1859 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2603,200 +2892,226 @@ "Nevarēja rakstīt \"%s\", rindu nevar saglabāt.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager.cpp:828 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2141 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Nevarēja rakstīt \"%s\", atlasītās vietnes nevar eksportēt: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:125 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Nevarēja rakstīt \"%s\":" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:324 -#, c-format -msgid "Could not write keyfile: %s" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 +#, fuzzy, c-format +msgid "Could not write key file: %s" msgstr "Neizdevās rakstīt atslēgdatni: %s" -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Neizdevās rakstīt lokalo datni" -#: ../../locales/../src/engine/logging.cpp:212 -#: ../../locales/../src/engine/logging.cpp:277 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Neizdevās rakstīt žurnāla datni: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:881 -#: ../../locales/../src/engine/ControlSocket.cpp:984 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:235 #, c-format msgid "Could not write to socket: %s" msgstr "" -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Valsts:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "Izveid&ot jaunu datni" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 -msgid "Create a new subdirectory in the current directory" -msgstr "Izveidot jaunu apakšdirektoriju aktuālajā direktorijā" +#: ../../locales/../src/interface/state.cpp:1107 +#, fuzzy +msgid "Create &missing local directory and enter it" +msgstr "Izveidot direktorij&u un ieiet tajā" + +#: ../../locales/../src/interface/state.cpp:1029 +#, fuzzy +msgid "Create &missing remote directory and enter it" +msgstr "Izveidot direktorij&u un ieiet tajā" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 +msgid "Create a new subdirectory in the current directory" +msgstr "Izveidot jaunu apakšdirektoriju aktuālajā direktorijā" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Izveidot jaunu apakšdirektoriju aktuālajā direktorijā un ieiet tajā" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Izveido jaunu, tukšu datni aktuālajā direktorijā" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "Izveidot direktorij&u un ieiet tajā" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1148 -#: ../../locales/../src/interface/RemoteListView.cpp:1324 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1256 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Izveidot direktoriju" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "Izveidot tukšu datni" -#: ../../locales/../src/interface/queue.cpp:392 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Izveido direktoriju" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3234 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1955 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Izveido direktoriju '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:176 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Kritiska kļūda" -#: ../../locales/../src/engine/ControlSocket.cpp:167 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Kritiska kļūda:" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Kritiska datnes pārsūtīšanas kļūda" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "" -#: ../../locales/../src/interface/state.cpp:382 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" "Synchronized browsing has been disabled." msgstr "" -#: ../../locales/../src/interface/statusbar.cpp:391 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Aktuālais pārsūtījumu veids ir iestatīts uz ASCII." -#: ../../locales/../src/interface/statusbar.cpp:399 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Aktuālais pārsūtījumu veids ir iestatīts uz automātisko noteikšanu." -#: ../../locales/../src/interface/statusbar.cpp:395 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Aktuālais pārsūtījumu veids ir iestatīts uz bināro." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 +msgid "Curve:" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Pielā&gots" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Pielāgots filtru komplekts" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Pielāgots serveris" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2483 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "D&atu veids" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:392 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "N&oklusējums" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:597 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "D&zēst" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1084 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 +#, fuzzy +msgid "D&irectory comparison" +msgstr "Direktoriju salīdzināšana" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "A&tslēgt visu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "N&esaglabāt paroles" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "D&ubultklikšķa darbība ar direktorijiem:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1235 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "D&ublēt" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:56 msgid "DOS-like with virtual paths" msgstr "DOS-veidīgi ar virtuālajiem ceļiem" -#: ../../locales/../src/interface/edithandler.cpp:1661 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Bīstams datnes tips" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Dati" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Datums" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Datuma formatēšana" @@ -2812,15 +3127,15 @@ msgid "Debug" msgstr "Atkļūdot" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Atkļūdošanas uzstādījumi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Noklusējuma &lokālais direktorijs:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:48 msgid "Default (Autodetect)" msgstr "Noklusējuma (Automātiskā noteikšana)" @@ -2828,23 +3143,23 @@ msgid "Default editor not properly quoted." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1362 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Noklusējuma datne eksistē darbība" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Noklusējuma a&ttālā direktorijs:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." msgstr "" -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Sistēmas noklusējuma valoda" @@ -2852,12 +3167,12 @@ msgid "Default transfer mode:" msgstr "Noklusējuma pārsūtīšanas režīms" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Noklusējuma pārsūtīšanas veids:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Noklusējuma: http://ip.filezilla-project.org/ip.php" @@ -2868,7 +3183,7 @@ "Aizkavei starp neizdevušamies savienošanās mēģinājumiem jābūt starp 1 un 999 " "sekundēm." -#: ../../locales/../src/engine/engineprivate.cpp:519 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2880,78 +3195,88 @@ msgstr[1] "" msgstr[2] "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1200 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "Dzēst vietņu pārvaldnieka ierakstu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Dzēst izvēlēto direktoriju" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Dzēst izvēlētās datnes un direktoriji" -#: ../../locales/../src/engine/engineprivate.cpp:364 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Dzēš \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:367 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Dzēš %u datnes no \"%s\"" -#: ../../locales/../src/interface/search.cpp:728 -msgid "Deleting directories" -msgstr "Dzēš direktorijus" - -#: ../../locales/../src/interface/search.cpp:728 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "" -#: ../../locales/../src/interface/LocalTreeView.cpp:983 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Darbavirsma" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Detaļas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:946 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Jaunās atslēgas detaļas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1319 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 +#, fuzzy +msgid "Detected newer version of FileZilla" +msgstr "Meklēt jaunas Filezilla versijas" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "Ma&pes" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Virziens" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +#, fuzzy +msgid "Directories:" +msgstr "Ma&pes" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Direktorijs" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:464 -#: ../../locales/../src/interface/Mainfrm.cpp:2245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +#, fuzzy +msgid "Directory access permissions" +msgstr "Direktoriju salīdzināšana" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Direktoriju salīdzināšana" #: ../../locales/../src/interface/listingcomparison.cpp:74 -#: ../../locales/../src/interface/listingcomparison.cpp:82 -#: ../../locales/../src/interface/listingcomparison.cpp:88 msgid "Directory comparison failed" msgstr "Direktoriju salīdzināšana neizdevās" @@ -2959,122 +3284,122 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#, fuzzy +msgid "Directory listing &filters..." +msgstr "Direktorija izdrukas filtri" + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Direktorija izdruku pārtrauca lietotājs" -#: ../../locales/../src/interface/RemoteListView.cpp:2075 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "Direktorija izdruka neizdevās" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Direktorija izdrukas filtri" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Direktorija izdruka veiksmīga" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Ats&lēgt visu" -#: ../../locales/../src/interface/state.cpp:1010 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:673 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Atvienoties no servera" -#: ../../locales/../src/engine/ControlSocket.cpp:77 -#: ../../locales/../src/engine/ControlSocket.cpp:882 -#: ../../locales/../src/engine/ControlSocket.cpp:986 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:224 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:890 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:892 -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Atvienots no servera" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:906 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Atvienots no servera: %s" -#: ../../locales/../src/interface/queue.cpp:382 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Atvienojas no iepriekšējā servera" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Atvienojas no pašreizējā servera" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Parāda \"Par\" dialogu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "Nelietot &noklusējuma redaktoru" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Nedarīt &neko" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1801 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1856 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:1176 -#: ../../locales/../src/interface/Mainfrm.cpp:1198 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Vai tiešām vēlaties aizvērt FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Vai tiešām vēlaties dzēst visus vietņu pārvaldnieka ierakstus un pārsūtījumu " "rindu?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Vai tiešām vēlaties dzēst visus vietņu pārvaldnieka ierakstus?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1202 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Vai tiešām vēlaties dzēst atlasīto ierakstu?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Vai tiešām vēlaties dzēst pārsūtīšanas rindu?" -#: ../../locales/../src/interface/Mainfrm.cpp:612 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Vai tiešām vēlaties sūtīt '%s' uz serveri?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Vai vēlaties atkārtoti atvērt šo datni?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Dokumentācija" @@ -3082,47 +3407,47 @@ msgid "Don't use external IP address on &local connections." msgstr "Neizmantot ārējās IP adreses lokālajos savienojumos." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Dubultklikšķa darbība" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Lejupielādēt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3526 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Lejupielādēs &ierobežojums:" -#: ../../locales/../src/interface/statusbar.cpp:579 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "Lejupielādēs ierobežojums: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Lejupielādēs ierobežojums: nekāds" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 -#: ../../locales/../src/interface/search.cpp:493 -#: ../../locales/../src/interface/search.cpp:498 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Lejupielādēt meklēšanas rezultātus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Lejupielādēt izvēlēto direktoriju" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Lejupielādēt atlasītās datnes un direktorijus" -#: ../../locales/../src/interface/Mainfrm.cpp:1004 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3131,43 +3456,35 @@ "Lejupielādes ātrums: %s/s\n" "Augšupielādes ātrums: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1115 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Lejupielādē" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:337 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Lejupielādē %s" -#: ../../locales/../src/interface/search.cpp:590 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" - -#: ../../locales/../src/interface/search.cpp:590 -msgid "Downloading search results" -msgstr "Lejupielādē meklēšanas rezultātus" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 #, fuzzy msgid "Downloading update..." msgstr "Lejupielādē" -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:107 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:87 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:93 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" @@ -3175,16 +3492,16 @@ msgid "Dupl&icate" msgstr "Dubl&ikāts" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1077 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "A&ktivizēt visus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "I&eiet direktorijā" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "I&zpildīt" @@ -3192,41 +3509,48 @@ msgid "E&xit" msgstr "I&ziet" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 +#, fuzzy +msgid "E&xport..." +msgstr "&Eksportēt..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "E-pasts:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:693 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Katram filtram vajag vismaz vienu nosacījumu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Rediģēt filtrus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "Direktoriju rediģēšana netiek atbalstīta" -#: ../../locales/../src/interface/LocalListView.cpp:1594 -#: ../../locales/../src/interface/LocalListView.cpp:1603 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Rediģēšana neizdevāš" -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Meklēšanas rezultātu rediģēšana" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "E-pasts:" -#: ../../locales/../src/interface/QueueView.cpp:2144 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "Tukša komanda" @@ -3234,7 +3558,7 @@ msgid "Empty command." msgstr "Tukša komanda." -#: ../../locales/../src/interface/RemoteListView.cpp:2077 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "Tukša direktorija izdruka" @@ -3246,13 +3570,13 @@ msgid "Empty file extension." msgstr "Tukšs datnes paplašinājums." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Tukši filtru vārdi nav atļauti." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Tukšs vārds" @@ -3260,81 +3584,101 @@ msgid "Empty quoted string." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1112 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Ak&tivizēt visus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Iespējot nederīgu rakstzīmju &filtrēšanu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Šifrēts" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Šifrēšana" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1966 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +#, fuzzy +msgid "Encryption &Key:" +msgstr "&Šifrēšana:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +#, fuzzy +msgid "Encryption &key:" +msgstr "&Šifrēšana:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Šifrēšanas detaļas" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "Ievadīt &pielāgotu komandu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Ievadiet 0 neierobežotam ātrumam." -#: ../../locales/../src/interface/QueueView.cpp:2133 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "Ievadiet komandu" -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Ievadiet pielāgotu komandu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Ieiet direktorijā" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Ievadiet filtra vārdu" -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +#, fuzzy +msgid "Enter master password" +msgstr "Ievadiet paroli" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Ievadiet filtru komplekta vārdu" -#: ../../locales/../src/interface/filter.cpp:393 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Ievadiet jaunu filtru komplekta vārdu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Ievadiet paroli" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Ieiet atlasītājā direktorijā" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 +#, fuzzy msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3342,124 +3686,158 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" +"Ievadiet servera adresi.\n" +"Lai norādītu servera protokolu, ievadiet pirms saimniekdatora adreses " +"protokola identifikatoru. Ja protokols nav norādīts, tad tiks izmantots " +"noklusējuma (ftp://).\n" +"Jūs varat arī ievadīt pilnīgu URL: protokols://lietotājs:" +"parole@saimniekdators:pieslēgvieta. Pārējo lauku vērtības tad tiks " +"pārrakstītas.\n" +"\n" +"Atbalstītie protokoli:\n" +"- ftp:// normālam FTP\n" +"- sftp:// SSH datņu pārsūtīšanas protokols\n" +"- ftps:// FTP pār TLS (netiešs)\n" +"- ftpes:// FTP pār TLS (skaidrs)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 +#, fuzzy msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" "Ievadiet pieslēgvietu, kuru serveris klausās.\n" "FTP noklusējuma ir 21, SFTP noklusējuma ir 22." -#: ../../locales/../src/interface/loginmanager.cpp:61 +#: ../../locales/../src/interface/loginmanager.cpp:167 +#, fuzzy +msgid "Enter username" +msgstr "Ievadiet filtra vārdu" + +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Ievadiet lietotājvārdu un paroli" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +#, fuzzy +msgid "Error" +msgstr "Kļūda:" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Kļūda eksportējot uzstādījumus" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Kļūda importējot" -#: ../../locales/../src/interface/QueueView.cpp:1926 +#: ../../locales/../src/interface/QueueView.cpp:1663 msgid "Error loading queue" msgstr "Kļūda ielādējot rindu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:171 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:294 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:717 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:756 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:803 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:972 -#: ../../locales/../src/interface/import.cpp:99 -#: ../../locales/../src/interface/import.cpp:285 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/search.cpp:798 -#: ../../locales/../src/interface/search.cpp:817 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:451 -#: ../../locales/../src/interface/sitemanager.cpp:547 -#: ../../locales/../src/interface/sitemanager.cpp:606 -#: ../../locales/../src/interface/sitemanager.cpp:715 -#: ../../locales/../src/interface/sitemanager.cpp:797 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:793 -#: ../../locales/../src/interface/wrapengine.cpp:949 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Kļūda ielādējot xml datni" -#: ../../locales/../src/interface/QueueView.cpp:1831 +#: ../../locales/../src/interface/QueueView.cpp:1556 msgid "Error saving queue" msgstr "Kļūda saglabājot rindu" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:98 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Kļūda uzsākot pprogrammu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:325 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:837 -#: ../../locales/../src/interface/QueueView.cpp:1860 -#: ../../locales/../src/interface/sitemanager.cpp:657 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager.cpp:829 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:814 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2142 -#: ../../locales/../src/interface/xmlfunctions.cpp:126 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Kļūda rakstot xml datni" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:274 -#: ../../locales/../src/interface/StatusView.cpp:328 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Kļūda:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Piemērs: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Piemēri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Izp&ildīt" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Pārlūks" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +#, fuzzy +msgid "Export &Filters" +msgstr "&Filtri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Eksportēt &rindu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Eksportēt &uzstādījumus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Eksporta uzstādījumi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "F&iltra vārds:" @@ -3467,28 +3845,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "FTP programma nav inicializēta, nevar savienoties" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP starpniekserveris" @@ -3503,183 +3880,205 @@ "connections can be established in two ways." msgstr "" -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +#, fuzzy +msgid "FTP: File Types" +msgstr "Datņu tipi" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1790 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 #: ../../locales/../src/interface/LocalTreeView.cpp:871 -#: ../../locales/../src/interface/LocalTreeView.cpp:1124 -#: ../../locales/../src/interface/viewheader.cpp:507 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Neizdevās nomainīt direktoriju" -#: ../../locales/../src/interface/FileZilla.cpp:199 -#: ../../locales/../src/interface/FileZilla.cpp:212 -#: ../../locales/../src/interface/FileZilla.cpp:214 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Neizdevās nomainīt valodu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "Neizdevās kopēt vai pārvietot vietnes" -#: ../../locales/../src/interface/xmlfunctions.cpp:466 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Neizdevās izveidot xml faila rezerves kopiju" -#: ../../locales/../src/interface/netconfwizard.cpp:802 -msgid "Failed to create listen socket, aborting" -msgstr "" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, fuzzy, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Neizdevās iegūt ārējo ip adresi, pārtraucu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4154 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "" -#: ../../locales/../src/interface/LocalTreeView.cpp:629 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#, fuzzy +msgid "Failed to decrypt server password." +msgstr "Neizdevās kopēt vai pārvietot vietnes" + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Neizdevās iegūt 'Mani dokumenti' ceļu" -#: ../../locales/../src/interface/LocalTreeView.cpp:617 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Neizdevās iegūt darbavirsmas ceļu" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Neizdevās inicializēt FTP programmu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:376 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:301 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "Neizdevās inicializēt TLS." +#: ../../locales/../src/interface/FileZilla.cpp:97 +#, fuzzy +msgid "Failed to initialize networking" +msgstr "Neizdevās inicializēt FTP programmu" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Neizdevās ielādēt paneļus, nederīgas resursu datnes?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Neizdevās ielādēt privāto atslēgu: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Neizdevās atvērt \"%s\" pievienošanai/rakstīšanai" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2622 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Neizdevās atvērt \"%s\" lasīšanai" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2588 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1018 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Neizdevās atvērt \"%s\" rakstīšanai" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Neizdevās saņemt datus" -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Neizdevās iegūt direktoriju sarakstu" -#: ../../locales/../src/interface/netconfwizard.cpp:730 -msgid "Failed to retrieve external ip address, aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +#, fuzzy +msgid "Failed to retrieve external IP address, aborting." msgstr "Neizdevās iegūt ārējo ip adresi, pārtraucu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3865 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +#, fuzzy +msgid "Failed to retrieve external IP address, using local address" msgstr "Neizdevās iegūt ārējo ip adresi, izmantoju lokālo adresi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3886 -msgid "Failed to retrieve local ip address." -msgstr "Neizdevās iegūt lokālo ip adresi." - -#: ../../locales/../src/interface/netconfwizard.cpp:706 -msgid "Failed to retrieve local ip address. Aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:712 +#, fuzzy +msgid "Failed to retrieve local IP address, aborting." msgstr "Neizdevās iegūt lokālo ip adresi, pārtraucu" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +#, fuzzy +msgid "Failed to retrieve local IP address." +msgstr "Neizdevās iegūt lokālo ip adresi." + +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Neizdevās iegūt ārējo ip adresi." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Neizdevās nosūtīt komandu." -#: ../../locales/../src/interface/FileZilla.cpp:212 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "Neizdevās iestatīt valodu %s (%s), lieto sistēmas noklusējuma valodu" -#: ../../locales/../src/interface/FileZilla.cpp:192 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" "Neizdevās iestatīt valodu %s (%s), lieto sistēmas noklusējuma valodu(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:181 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "Neizdevās iestatīt valodu %s (%s), lieto sistēmas noklusējuma valodu." -#: ../../locales/../src/interface/FileZilla.cpp:214 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Neizdevās uzstādīt valodu %s, tiks izmantota noklusējuma valoda" -#: ../../locales/../src/interface/FileZilla.cpp:188 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Neizdevās iestatīt valodu %s, lieto sistēmas noklusējuma valodu (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:178 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Neizdevās iestatīt valodu %s, lieto sistēmas noklusējuma valodu." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Neizdevās apstiprināt uzstādījumus" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Neizdevās pārbaudīt vienranga sertifikātu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Neizdevās rakstīt datni %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:483 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Neizdevās ierakstīt xml datnē" @@ -3691,27 +4090,23 @@ msgid "Fall back to active mode" msgstr "Atkāpšanās uz aktīvo režīmu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Datn&e:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Datn&es" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Datne" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Datņu tipi" - -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "" -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Datne nesatur importējamus datus." @@ -3719,7 +4114,7 @@ msgid "File editing" msgstr "Datnes rediģēšana" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "Datne eksistē" @@ -3727,7 +4122,7 @@ msgid "File exists action" msgstr "Datne eksistē darbība" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Datne ir mainījusies" @@ -3735,63 +4130,67 @@ msgid "File lists" msgstr "Datņu saraksti" -#: ../../locales/../src/interface/edithandler.cpp:1585 -#: ../../locales/../src/interface/FileZilla.cpp:671 -#: ../../locales/../src/interface/FileZilla.cpp:756 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Datne netika atrasta" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Datnes meklēšana" -#: ../../locales/../src/engine/ControlSocket.cpp:123 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Datnes pārsūtīšanu pārtrauca lietotājs" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Datnes pārsūtīšana neizdevās" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Datnes pārsūtīšana izlaista" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Datnes pārsūtīšana veiksmīga" -#: ../../locales/../src/engine/ControlSocket.cpp:111 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Datnes pārsūtīšana veiksmīga, %s pārsūtīti %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1175 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Joprojām notiek datnes pārsūtīšana" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "" -#: ../../locales/../src/interface/FileZilla.cpp:482 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "FileZilla kļūda" @@ -3801,73 +4200,79 @@ "properly." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla jau ir savienota ar serveri." -#: ../../locales/../src/interface/Mainfrm.cpp:1505 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "Vajag rerstartēt FileZilla, lai valodas maiņa stātos spēkā." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "FileZilla jauninājumi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "Datņu sarakstau stāvokļa joslas" -#: ../../locales/../src/interface/edithandler.cpp:1100 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:80 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Datnes vārds" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Datnes vārda &filtri..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3038 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2216 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "Datnes vārds nederīgs" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Datnes vārds nemainīts" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Datnes vārds:" -#: ../../locales/../src/interface/file_utils.cpp:317 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Datņu vārdi nevar saturēt nevinu no sekojošajām zīmēm: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:292 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "Datņu vārdi nevar saturēt nevinu no sekojošajām zīmēm: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Pašlaik rediģētās datnes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:82 +#: ../../locales/../src/interface/toolbar.cpp:50 +#, fuzzy +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Neizdevās iegūt direktoriju sarakstu" + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +#, fuzzy +msgid "Files not found" +msgstr "Datne netika atrasta" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Datnes izmērs" @@ -3875,64 +4280,69 @@ msgid "Filesize format" msgstr "Datnes izmēra formāts" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Datnes tips" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Datņu tipu asociācijas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Filtrs attiecas uz:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Filtrēt nederīgās rakstzīmes datņu vārdos" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:355 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Filtra vārds jau eksistē" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1277 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Izfiltrēt vienumus, kuriem saskan viss no sekojošajiem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Izfiltrēt vienumus, kuriem saskan jebkas no sekojošajiem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1279 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Izfiltrēt vienumus, kuriem nesaskan nekas no sekojošajiem" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#, fuzzy +msgid "Filter out items matching not all of the following" +msgstr "Izfiltrēt vienumus, kuriem saskan viss no sekojošajiem" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Filtru komplekts jau eksistē" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtrēt direktorija izdrukas" -#: ../../locales/../src/interface/filteredit.cpp:339 -#: ../../locales/../src/interface/filteredit.cpp:347 -#: ../../locales/../src/interface/filteredit.cpp:355 +#: ../../locales/../src/interface/filteredit.cpp:337 +#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter validation failed" msgstr "Filtra validēšana neizdevās" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3031 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Atrast &datnes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Atrast d&irektorijus" @@ -3944,16 +4354,18 @@ msgid "Fingerprint (SHA-256):" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:852 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +#, fuzzy +msgid "Fingerprints:" msgstr "Id-summa:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Ugunsmūra un maršrutētāja konfigurācijas vednis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -3965,39 +4377,44 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "" -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." msgstr "" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Uzspiest &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Uzspiest rādīt &slēptās datnes" -#: ../../locales/../src/interface/Mainfrm.cpp:668 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Uzspiest rādīt slēptās datnes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Formāta specifikācija:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:710 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Atrada jaunu %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, fuzzy, c-format +msgid "Function %s failed" +msgstr "Autentificēšana neizdevās." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Papildu dokumentācija" @@ -4005,11 +4422,16 @@ msgid "General" msgstr "Vispārējs" -#: ../../locales/../src/engine/proxy.cpp:467 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +#, fuzzy +msgid "Generate..." +msgstr "Vispārējs" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Standarta starpniekserveris" @@ -4018,132 +4440,148 @@ msgid "Get external IP address from the following URL:" msgstr "Iegūt ārējo IP adresi no sekojošā URL:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Iegūt palīdzību" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Filtru kompleka vārds jau eksistē, pārrakstīt filtru komplektu?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:255 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Vispārējās grāmatzīmes" -#: ../../locales/../src/engine/tlssocket.cpp:185 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:187 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:181 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:179 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Grupas atļaujas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "A&ugsta" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Slēpts" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:885 -#: ../../locales/../src/interface/queue.cpp:972 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Augsta" -#: ../../locales/../src/interface/queue.cpp:887 -#: ../../locales/../src/interface/queue.cpp:974 +#: ../../locales/../src/interface/queue.cpp:938 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Augstākā" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Augstākajai pieejamai pieslēgvietai jābūt skaitlim starp 1024 un 65535" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Turiet \"shift\" taustiņu, lai pārslēgtu filtra stāvokļus abās pusēs " "vienlaicīgi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Mājaslapa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 -msgid "Host key fingerprint:" +#: ../../locales/../src/engine/socket.cpp:1088 +msgid "Host is down" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "" -#: ../../locales/../src/engine/proxy.cpp:476 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Saimniekdators nav sasniedzams" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:953 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Saimniekdators:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:350 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +#, fuzzy +msgid "Hostkey algorithm:" +msgstr "Publiskais atslēgas algoritms:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Stundas," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (piemēram: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:124 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " "reconnect." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" @@ -4161,62 +4599,62 @@ "misconfigured servers which reject the selected transfer mode." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:941 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " "a new file gets created." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " "timezone offset in the site manager." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Ja jūs nomaināt valodu, jums vajadzēs restartēt FileZilla." @@ -4226,11 +4664,11 @@ "and will perform some simple tests." msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:1197 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Ja aizvērsiet Filezilla, jūsu veiktās izmaiņas pazudīs." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4240,7 +4678,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "Ja jums ir kādas kļūdas, jūsu konfigurācija nav pareiza." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4248,7 +4686,7 @@ "Ja jums ir problēmas iegūt direktoriju sarakstu vai pārsūtīt datnes, " "mēģiniet pamainīt noklusējuma pārsūtīšanas režīmu." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4273,22 +4711,22 @@ "you're running FileZilla on." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "" -#: ../../locales/../src/interface/import.cpp:80 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importēt datus no vecākas versijas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Importa uzstādījumi" -#: ../../locales/../src/interface/import.cpp:66 -#: ../../locales/../src/interface/import.cpp:69 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Imports veiksmīgs" @@ -4310,7 +4748,7 @@ msgstr "" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4323,33 +4761,32 @@ "to be done for this." msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:1036 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" - -#: ../../locales/../src/interface/queue.cpp:380 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Nepareiza parole" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Inicializē TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 +#, fuzzy +msgid "Insecure algorithm!" +msgstr "Paraksta algoritms:" + +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "" -#: ../../locales/../src/engine/server.cpp:834 -#: ../../locales/../src/engine/server.cpp:853 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:613 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interaktīvs" @@ -4357,72 +4794,99 @@ msgid "Interface" msgstr "Interaktīvs" -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Signāls pārtraucis" -#: ../../locales/../src/engine/ControlSocket.cpp:216 -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Lietotājs pārtraucis" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/http/request.cpp:159 +#: ../../locales/../src/engine/http/request.cpp:581 msgid "Invalid Content-Length" msgstr "" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:587 +#: ../../locales/../src/engine/http/request.cpp:488 msgid "Invalid HTTP Response" msgstr "Nederīga HTTP atbilde" -#: ../../locales/../src/engine/socket.cpp:1030 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:454 -#: ../../locales/../src/engine/ControlSocket.cpp:510 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." msgstr "" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../locales/../src/engine/http/request.cpp:702 msgid "Invalid chunk size" msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Saņemti nederīga dati" -#: ../../locales/../src/interface/verifycertdialog.cpp:39 -#: ../../locales/../src/interface/verifycertdialog.cpp:52 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Nederīgs datums" -#: ../../locales/../src/interface/file_utils.cpp:292 -#: ../../locales/../src/interface/file_utils.cpp:317 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Nederīgs datnes vārds" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, fuzzy, c-format +msgid "Invalid hash: %s\n" +msgstr "Nederīgs datums" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, fuzzy, c-format +msgid "Invalid hostname: %s" +msgstr "Nederīgs saimniekdatora vārds vai saimniekdatoru nevar atrast" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Nederīga ievade" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:516 +#, fuzzy +msgid "Invalid line" +msgstr "Nederīga ievade" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +#, fuzzy +msgid "Invalid path" +msgstr "Nederīgs datums" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Ievadīta nederīga pieslēgvieta. Pieslēgvietai jābūt ar vērtību no 1 līdz " "65534." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4431,79 +4895,80 @@ "ftpes:// for FTP over TLS (explicit)." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4298 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" -#: ../../locales/../src/interface/search.cpp:377 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:597 +#: ../../locales/../src/engine/http/request.cpp:497 msgid "Invalid response code" msgstr "Nederīgs atbildes kods" -#: ../../locales/../src/interface/search.cpp:372 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Nederīgi meklēšanas nosacījumi: %s" -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:443 -#: ../../locales/../src/interface/sitemanager.cpp:457 -#: ../../locales/../src/interface/sitemanager.cpp:464 -#: ../../locales/../src/interface/sitemanager.cpp:471 -#: ../../locales/../src/interface/sitemanager.cpp:488 -#: ../../locales/../src/interface/sitemanager.cpp:539 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:734 -#: ../../locales/../src/interface/sitemanager.cpp:808 -#: ../../locales/../src/interface/sitemanager.cpp:814 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Nederīgs vietnes ceļš" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:723 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Nederīgs izmērs nosacījumos" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Ievadīts nederīgs lietotājsvārds." -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "" -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +#, fuzzy +msgid "Invert Filter" +msgstr "Konvertēt atslēgdatni" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Jurisdikcijas valsts:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Jurisdikcijas apgabals:" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Jurisdikcijas pavalsts vai province:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Paturēt direktorijus augšpusē" -#: ../../locales/../src/interface/Mainfrm.cpp:672 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " "some tests to check if the server supports this feature, the test may fail." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1974 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Atslēgu apmaiņa" @@ -4511,115 +4976,150 @@ msgid "Key exchange:" msgstr "Atslēgu apmaiņa:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/engine/server.cpp:610 +#: ../../locales/../src/engine/server.cpp:635 +#, fuzzy +msgid "Key file" +msgstr "%d datne" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +#, fuzzy +msgid "Key identifier:" +msgstr "&Slēpt identiskās datnes" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Z&emākā" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Valoda" -#: ../../locales/../src/interface/Mainfrm.cpp:1505 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Valoda nomainīta" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Pēdējo reizi modificēts" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Izkārtojums" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Vienlaicīgo lejupielāžu skaits:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Vienlaicīgo augšupielāžu skaits:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Ierobežot lokālās pieslēgvietas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Ierobežot žurnāldatnes lielumu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Ierobežojums:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/http/request.cpp:656 msgid "Line length exceeded" msgstr "Pārsniegts rindiņas garums" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:285 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Saraksts:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Ze&mākā pieejamā pieslēgvieta:" -#: ../../locales/../src/interface/edithandler.cpp:1148 -#: ../../locales/../src/interface/edithandler.cpp:1402 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Lokāli" -#: ../../locales/../src/engine/socket.cpp:1027 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Lokālā datne" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Lokālā datne neeksistē." -#: ../../locales/../src/interface/updater.cpp:434 -#: ../../locales/../src/interface/updater.cpp:526 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Lokālā datne ir %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Lokālā datne ir direktorijs un ne parasta datne." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Lokālā datne nav derīgs datnes vārds." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1063 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +#, fuzzy +msgid "Local file search" +msgstr "Attālā datņu meklēšana" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Lokālie filtri:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +#, fuzzy +msgid "Local path handling:" +msgstr "Attālā ceļa apstrāde:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Lokālā vietne:" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Apkaime:" @@ -4627,25 +5127,29 @@ msgid "Log file" msgstr "Žurnāla datne" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" #: ../../locales/../src/interface/cmdline.cpp:103 @@ -4659,17 +5163,17 @@ "'%s' or '%s'" msgstr "" -#: ../../locales/../src/interface/queue.cpp:880 -#: ../../locales/../src/interface/queue.cpp:967 +#: ../../locales/../src/interface/queue.cpp:931 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Zema" -#: ../../locales/../src/interface/queue.cpp:878 -#: ../../locales/../src/interface/queue.cpp:965 +#: ../../locales/../src/interface/queue.cpp:929 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Zemākā" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "Zemākajai pieejamajai pieslēgvietai jābūt skaitlim starp 1024 un 65535" @@ -4677,158 +5181,198 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:43 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../locales/../src/engine/http/request.cpp:643 +#: ../../locales/../src/engine/http/request.cpp:649 +#: ../../locales/../src/engine/http/request.cpp:656 +#: ../../locales/../src/engine/http/request.cpp:667 +#: ../../locales/../src/engine/http/request.cpp:702 #, c-format msgid "Malformed chunk data: %s" msgstr "" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 -#, c-format -msgid "Malformed header: %s" +#: ../../locales/../src/engine/http/request.cpp:159 +#, fuzzy, c-format +msgid "Malformed request header: %s" msgstr "Izkropļota galvene: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:557 -msgid "Malformed reply, server not sending proper line endings" -msgstr "" +#: ../../locales/../src/engine/http/request.cpp:457 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:516 +#: ../../locales/../src/engine/http/request.cpp:571 +#: ../../locales/../src/engine/http/request.cpp:581 +#, fuzzy, c-format +msgid "Malformed response header: %s" +msgstr "Izkropļota galvene: %s" + +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:780 +#, fuzzy, c-format +msgid "Malformed response: %s" +msgstr "Izkropļota galvene: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Manuāls pārsūtijums" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +#, fuzzy +msgid "Master &Password:" +msgstr "&Parole:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +#, fuzzy +msgid "Master password:" +msgstr "Ievadiet paroli" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Saskan visi no sekojošajiem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Atbilst kādam no sekojošajiem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Neatbilst neviens no sekojošajiem" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +#, fuzzy +msgid "Match not all of the following" +msgstr "Saskan visi no sekojošajiem" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Vienlaicīgo &pārsūtījumu skaits:" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:403 -#: ../../locales/../src/interface/Mainfrm.cpp:1832 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Ziņojumu žurnāls" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Ziņojumu žurnāla pozīcija" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Ziņa par lielu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:366 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Minūtes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Pārvietot &lejup" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2124 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Pārvietot &augšup" -#: ../../locales/../src/interface/LocalTreeView.cpp:1002 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Mans dators" -#: ../../locales/../src/interface/LocalTreeView.cpp:992 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Mani dokumenti" -#: ../../locales/../src/interface/sitemanager.cpp:286 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:728 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:730 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "Manas vietnes" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "Nav piemerojams" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Vārds" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "Vārds jau eksistē" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:816 -#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Grāmatzīmes vārds jau eksistē." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Vārds:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" msgstr "Jāievada filtra vārdu" -#: ../../locales/../src/interface/search.cpp:363 +#: ../../locales/../src/interface/search.cpp:702 +#, fuzzy +msgid "Need to enter valid local path" +msgstr "Jāievada derīgu attālo ceļu" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Jāievada derīgu attālo ceļu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "Jānorāda rakstzīmju kodējumu" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:473 -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Tīkls nesasniedzams" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Nekad" @@ -4840,37 +5384,37 @@ msgid "New &tab" msgstr "Jauna &cilne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2788 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Jauna grāmat&zīme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2560 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:574 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:816 -#: ../../locales/../src/interface/sitemanager.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Jauna grāmatzīme" -#: ../../locales/../src/interface/LocalTreeView.cpp:1151 -#: ../../locales/../src/interface/RemoteListView.cpp:1337 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1270 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Jauns direktorijs" -#: ../../locales/../src/interface/welcome_dialog.cpp:53 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Jaunas iespējas un uzlabojumi %s" @@ -4879,41 +5423,41 @@ msgid "New filter" msgstr "Jauns filtrs" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Jauna mape" -#: ../../locales/../src/interface/sitemanager.cpp:625 -#: ../../locales/../src/interface/sitemanager.cpp:639 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2074 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Jauna vietne" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Pie pārsūtījumu rindas" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "Nē" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Nav izvēlēta neviena kategorija eksportam" -#: ../../locales/../src/interface/QueueView.cpp:2144 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3837 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Nav uzstādīta neviena ārējā IP adrese, mēģinu noklusējuma." -#: ../../locales/../src/interface/edithandler.cpp:1089 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Neviena datne pašlaik netiek rediģēta." @@ -4921,95 +5465,91 @@ msgid "No filter name given" msgstr "Nav iedots filtra vārds" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Nav dots saimniekdators, lūdzu ievadiet saimniekdatoru." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Neviens attēls nav pieejams" -#: ../../locales/../src/interface/QueueView.cpp:3008 -msgid "No more files in the queue!" -msgstr "Rindā datņu vairs nav!" - -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Nav iedots filtru komplekta vārds." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2955 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Neviena programma nav asociēta ar datnes tipu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2872 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "" -#: ../../locales/../src/interface/search.cpp:227 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Nav meklēšanas rezultātu" -#: ../../locales/../src/interface/sitemanager.cpp:295 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Neviena vietne nav pieejama" -#: ../../locales/../src/engine/proxy.cpp:444 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "" -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Nav iedots lietotājvārds." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:58 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Neviens" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2331 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Nekas vel nav atlasīts" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:830 -#: ../../locales/../src/engine/server.cpp:849 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:883 -#: ../../locales/../src/interface/queue.cpp:970 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1276 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 +#: ../../locales/../src/interface/queue.cpp:996 msgid "Normal" msgstr "Normāls" -#: ../../locales/../src/interface/queueview_failed.cpp:325 -#: ../../locales/../src/interface/queueview_failed.cpp:350 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "" -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:508 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Nav savienots" -#: ../../locales/../src/interface/RemoteListView.cpp:2073 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Nav savienots ne ar vienu serveri" -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Nav savienots ne ar vienu serveri." @@ -5017,25 +5557,36 @@ msgid "Not connected." msgstr "Nav savienots." -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:670 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Ņemiet vērā, ka šī iespēja ir atbalstīta tikai izmantojot FTP protokolu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +#, fuzzy +msgid "Note: A lost key cannot be recovered." +msgstr "Šo filtru komlektu nevar aizvākt." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" "Piezīme: Tas tikai strādā ar vienkāršiem, nešifrētiem FTP savienojumiem." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:649 +#, fuzzy +msgid "Null character in line" +msgstr "Filtrēt nederīgās rakstzīmes datņu vārdos" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Zīmju skaits aiz komata:" @@ -5043,78 +5594,100 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Atkārtošanu skaitam jābūt starp 0 un 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 -msgid "O&pen file" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +#, fuzzy +msgid "O&pen" msgstr "&Atvērt datni" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:796 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:892 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1003 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1162 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1344 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1451 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1522 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1575 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1808 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2081 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2156 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2685 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2938 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3150 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3219 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3584 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3640 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "Labi" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 +#, fuzzy +msgid "OS version:" +msgstr "Versija:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " "well as the fallback mode if enabled." msgstr "" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:834 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Vienreiz" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Reizi dienā" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Reizi nedēļā" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:530 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "Izmantot tikai vienkāršu FTP (nedrošs)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +#, fuzzy +msgid "Op&en file" +msgstr "&Atvērt datni" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Atvērt direktoriju sistēmas datņu pārvaldniekā" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Atver vietņu pārvaldnieku" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Atver vietņu pārvaldnieku." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Atver vietņu pārvaldnieku. Labais klikšķis vietņu sarakstam." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Atvērt datni." @@ -5122,14 +5695,16 @@ msgid "Open the settings dialog of FileZilla" msgstr "Atver Filezilla uzstādījumu dialogu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Atvērts kā:" -#: ../../locales/../src/interface/edithandler.cpp:1651 -#: ../../locales/../src/interface/edithandler.cpp:1768 -#: ../../locales/../src/interface/LocalListView.cpp:1707 -#: ../../locales/../src/interface/LocalListView.cpp:1719 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Atvēršana neizdevās" @@ -5141,142 +5716,147 @@ msgid "Opens the Site Manager" msgstr "Atver vietņu pārvaldnieku" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Atver direktorija izdrukas filtru dialogu. Labais klikšķis pārslēdz filtrus." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:777 -msgid "Operating system" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 +#, fuzzy +msgid "Operating System:" msgstr "Operētājsistēma" -#: ../../locales/../src/interface/FileZilla.cpp:306 -msgid "Operating system problem detected" -msgstr "Uzieta operētājsistēmas problēma" - -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Darbība jau notiek" -#: ../../locales/../src/engine/socket.cpp:1029 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Notiek darbība" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Darbība nav atbalstīta" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Organizācija:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Citas SFTP opcijas" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Cita sistēmas kļūda" -#: ../../locales/../src/interface/verifycertdialog.cpp:237 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Cits:" -#: ../../locales/../src/engine/socket.cpp:1033 -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Nepietiek atmiņas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Pārskats" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Pārrakstīt &ja jaunāks avots" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Pārrakstīt datni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1416 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Pārrakstīt datni ja izmērs atšķiras" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1394 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1417 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Pārrakstīt ja izmērs atšķiras vai jaunāka avota datne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1392 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1415 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Pārrakstīt datni ja avota datne jaunāka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Pārrakstīt ja &atšķirīga izmēra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Pārrakstīt ja atšķirīga i&zmēra vai jaunāks avots" -#: ../../locales/../src/interface/updater.cpp:282 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Īpašnieka atļaujas" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:86 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Īpašnieks/Grupa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "S&tarpserveris:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Pa&sīvs (ieteikts)" -#: ../../locales/../src/interface/Mainfrm.cpp:2401 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Parametrs nav derīgs URL" -#: ../../locales/../src/interface/updater.cpp:606 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2447 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Par&ole:" @@ -5284,66 +5864,81 @@ msgid "Passive (recommended)" msgstr "Pasīvs (ieteikts)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Pasīvais režīms" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Pasīvais režīms uzstādīts kā noklusējuma pārsūtīšanas režīms." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:283 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Nepieciešama parole" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:81 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +#, fuzzy +msgid "Passwords" +msgstr "&Parole:" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Ceļš" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3121 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2258 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:2358 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Ceļš nav atrasts:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2622 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Ceļi" -#: ../../locales/../src/interface/edithandler.cpp:1127 -#: ../../locales/../src/interface/edithandler.cpp:1270 -#: ../../locales/../src/interface/edithandler.cpp:1369 -#: ../../locales/../src/interface/edithandler.cpp:1382 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Aizvākšana aizkavēta" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Atļauja" -#: ../../locales/../src/engine/socket.cpp:1026 -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Atļauja liegta" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Atļaujas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Platforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5351,19 +5946,25 @@ "Lūdzu pārbaudiet http://filezilla-project.org/probe.php vai serveris " "darbojas un vēlreiz rūpīgi pārbaudiet savus uzstādījumus." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Lūdzu atspējojiet maršrutētājā tādus uzstādījumus kā 'DMZ mode' vai 'Game " "mode'." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5379,13 +5980,13 @@ msgid "Please enter a custom time format." msgstr "Lūdzu ievadiet pielāgotu laika formātu." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:737 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5396,16 +5997,16 @@ msgid "Please enter a name for the new filter." msgstr "Lūdzu ievadiet vārdu jaunajam filtram." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Lūdzu ievadiet jaunu vārdu nokopētajam filtram." -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Lūdzu ievadiet jaunu vārdu filtru komplektam \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Lūdzu ievadiet jaunu vārdu filtram." @@ -5426,96 +6027,109 @@ "transfers." msgstr "Lūdzu ievadiet skaitli starp 1 un 10 vienlaicīgo pārsūtīšanu skaitam" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Lūdzu ievadiet paroli šim serverim:" -#: ../../locales/../src/interface/QueueView.cpp:2133 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Lūdzu ievadiet unikālu vārdu šim filtru komplektam" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Lūdzu ievadiet lietotājvārdu šim serverim:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Lūdzu ievadiet derīgu pieslēgvietu diapazonu." -#: ../../locales/../src/interface/netconfwizard.cpp:176 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Lūdzu ievadiet URL kur iegūt jūsu ārējo adresi" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Lūdzu ievadiet augšupielādes ātruma ierobežojumu lielāku vai vienādu ar 0 %s/" "s." -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." msgstr "" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1148 -#: ../../locales/../src/interface/RemoteListView.cpp:1324 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1256 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Lūdzu ievadiet jaunizveidojamā direktorija vārdu:" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "Lūdzu ievadiet izveidojamās datnes vārdu:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Lūdzu ievadiet lietotājvārdu un paroli šim serverim:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Lūdzu ievadiet savu ārējo IP adresi" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " "address, use the external resolver option." msgstr "" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#, fuzzy +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "Lūdzu ievadiet lietotājvārdu un paroli šim serverim:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." msgstr "" -#: ../../locales/../src/interface/FileZilla.cpp:198 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5531,13 +6145,13 @@ "discard." msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:710 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5545,18 +6159,24 @@ "Lūdzu ņemiet vērā, ka daži serveri var jūs aizliegt, ja mēģināsiet " "atkalsavienoties pārāk bieži vai ar pārāk īsiem intervāliem." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " "previously." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3191 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Lūdzu izvēlieties darbību:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Lūdzu izvēlieties kategorijas importam." @@ -5564,31 +6184,31 @@ msgid "Please select the default transfer mode you would like to use." msgstr "Lūdzu izvēlieties noklusējuma pārsūtīšanas režīmu." -#: ../../locales/../src/interface/chmoddialog.cpp:46 +#: ../../locales/../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." msgstr "Lūdzu, izvēlieties jaunus atribūtus direktorijam \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:38 +#: ../../locales/../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." msgstr "Lūdzu, izvēlieties jaunus atribūtus datnei \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:49 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Lūdzu, izvēlieties jaunus atribūtus atlasītajiem direktorijiem." -#: ../../locales/../src/interface/chmoddialog.cpp:52 +#: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "" "Lūdzu, izvēlieties jaunus atribūtus atlasītajām datnēm un direktorijiem." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Lūdzu, izvēlieties jaunus atribūtus atlasītajām datnēm." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5597,37 +6217,38 @@ "protocol specific 'fixups' have to be disabled" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Ziņojum&u žurnāla pozīcija:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 -#: ../../locales/../src/interface/verifycertdialog.cpp:223 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Pasta indekss:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "" -#: ../../locales/../src/interface/sitemanager.cpp:285 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1797 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Iepriekš definētas vietnes" -#: ../../locales/../src/interface/Mainfrm.cpp:709 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Saglabā datnes laikspiedolus" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#, fuzzy +msgid "Preview" msgstr "Priekšskatījums:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "" @@ -5639,21 +6260,21 @@ msgid "Print version information to stdout and exit" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Prioritizēt direktorijus (noklusējuma)" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Prioritāte" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Privātās &atslēgas:" @@ -5661,25 +6282,31 @@ msgid "Pro&tocol:" msgstr "Pro&tokols:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Starpniek&servera parole:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Apstrādāt &rindu" -#: ../../locales/../src/engine/socket.cpp:1031 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1036 +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 +#, c-format +msgid "Processed %s in %s." +msgstr "" + +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Neatbalstīts protokols" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "" @@ -5687,49 +6314,53 @@ msgid "Protocol:" msgstr "Protokols:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Starpniekservera &pieslēgvieta:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Starpniekservera &lietotājs:" -#: ../../locales/../src/engine/proxy.cpp:454 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Starpniekservera autentifikācija neizdevās" -#: ../../locales/../src/engine/transfersocket.cpp:95 -#: ../../locales/../src/engine/transfersocket.cpp:107 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" -#: ../../locales/../src/engine/proxy.cpp:312 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Starpniekservera atbilde: %s" -#: ../../locales/../src/engine/proxy.cpp:367 -#: ../../locales/../src/engine/proxy.cpp:495 +#: ../../locales/../src/engine/proxy.cpp:520 +#, fuzzy, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Starpniekservera pieprasījums neizdevās: %s" + +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Starpniekservera pieprasījums neizdevās: %s" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Publiskās atslēgas autentifikācija" @@ -5737,87 +6368,103 @@ msgid "Public key algorithm:" msgstr "Publiskais atslēgas algoritms:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Publiskās atļaujas" -#: ../../locales/../src/interface/QueueView.cpp:3088 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "Rinda pilnībā apstrādāta" -#: ../../locales/../src/interface/statusbar.cpp:427 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Rinda: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:364 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Rinda: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:360 -#: ../../locales/../src/interface/statusbar.cpp:418 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Rinda: tukša" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Sarindotās datnes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Rindā:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +#, fuzzy +msgid "Quick Search:" +msgstr "&Meklēt" + +#: ../../locales/../src/interface/view.cpp:110 +#, fuzzy +msgid "Quick search cannot be opened if comparing directories." +msgstr "Kārtošanas secību nevar mainīt, ja salīdzina direktorijus." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +#, fuzzy +msgid "R&eboot system once" msgstr "R&estartēt sistēmu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "Attālais dir&ektoriju koks" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "A&tiestatīt un sarindot atlasītās datnes" -#: ../../locales/../src/interface/Mainfrm.cpp:609 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "La&sīt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "At&svaidzināt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Pār&dēvēt" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Las&īt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Lasīšanas režīms" -#: ../../locales/../src/interface/Mainfrm.cpp:1061 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Tiešām pārtraukt aktuālo operāciju?" -#: ../../locales/../src/interface/RemoteListView.cpp:1413 -#: ../../locales/../src/interface/search.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -5826,8 +6473,8 @@ msgstr[1] "Tiešām dzēst %d direktorijus ar to saturu no servera?" msgstr[2] "Tiešām dzēst %d direktorijus ar to saturu no servera?" -#: ../../locales/../src/interface/RemoteListView.cpp:1411 -#: ../../locales/../src/interface/search.cpp:734 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" @@ -5835,280 +6482,306 @@ msgstr[1] "Tiešām dzēst %d datnes no servera?" msgstr[2] "Tiešām dzēst %d datnes no servera?" -#: ../../locales/../src/interface/RemoteListView.cpp:1418 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Tiešām dzēst %s un %s no servera?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1072 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "Tiešām dzēst visas izvēlētās datnes un/vai direktorijus no servera?" -#: ../../locales/../src/engine/local_filesys.cpp:127 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "Tiešām dzēst visas izvēlētās datnes un/vai direktorijus no jūsu datora?" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Iemesls" -#: ../../locales/../src/interface/QueueView.cpp:3081 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "Atsāknēt tagad" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "" -#: ../../locales/../src/engine/directorylistingparser.cpp:3021 +#: ../../locales/../src/engine/directorylistingparser.cpp:3078 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" -#: ../../locales/../src/engine/directorylistingparser.cpp:2022 -#: ../../locales/../src/engine/directorylistingparser.cpp:2036 +#: ../../locales/../src/engine/directorylistingparser.cpp:2060 +#: ../../locales/../src/engine/directorylistingparser.cpp:2077 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Saņemtā līnija pārsniedz 10000 rakstzīmes, pārtraucu." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Saņemtie dati bojāti" -#: ../../locales/../src/interface/updater.cpp:585 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "" -#: ../../locales/../src/interface/updater.cpp:578 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Atkalsavienošanās uzstādījumi" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Savienojas ar pēdējo lietoto serveri" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:653 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 +#, fuzzy +msgid "Recursively adding files to queue." +msgstr "&Pievienot datnes rindai" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 +msgid "Recursively changing permissions." +msgstr "" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 +#, fuzzy +msgid "Recursively deleting files and directories." +msgstr "Pārdēvēt izvēlētās datnes un direktorijus" + +#: ../../locales/../src/interface/sitemanager.cpp:18 +#, fuzzy +msgid "Red" +msgstr "&Lasīt" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Novirzīšana uz nederīgu vai neatbalstītu URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:660 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:667 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Novirzīšana uz nederīgu vai neatbalstītu adresi: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Atsvaidzināt datņu un mapju sarakstu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Atcerēties paroles?" -#: ../../locales/../src/interface/edithandler.cpp:1111 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Attālināts" -#: ../../locales/../src/engine/tlssocket.cpp:833 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Attālinātais sertifikāts nav uzticams." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2250 -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Attālā datne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3069 -#: ../../locales/../src/interface/search.cpp:358 -#: ../../locales/../src/interface/search.cpp:363 -#: ../../locales/../src/interface/search.cpp:372 -#: ../../locales/../src/interface/search.cpp:377 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Attālā datņu meklēšana" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Attālie filtri:" -#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Attālais ceļš" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:424 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the current site's servertype (%s)." msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the servertype (%s) selected on the parent site." msgstr "" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:426 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:430 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Attālā ceļa apstrāde:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1701 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Attālā ceļš:" -#: ../../locales/../src/interface/viewheader.cpp:533 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Attālā vietne:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Aizvākt &visu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Aizvākt &atlasītos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1396 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:287 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Pārdēvēt datni" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Pārdēvēt izvēlēto direktoriju" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Pārdēvēt izvēlētās datnes un direktorijus" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3471 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2457 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Pārdēvē '%s' par '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +#, fuzzy +msgid "Repeat password:" +msgstr "&Saglabāt paroles" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:358 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:361 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:355 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Pieprasījums noraidīts vai neizdevās" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:528 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:461 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Atiestatīt un sarindot &visu" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "" -#: ../../locales/../src/engine/ControlSocket.cpp:1079 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Nosaka %s IP adresi" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/StatusView.cpp:279 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Atbilde:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Rezultāti:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1395 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Turpināt datņu pārsūtīšanu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1277 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:914 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1274 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Iegūst direktorija izdruku..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Iegūst ārējo IP adresi no %s" @@ -6117,23 +6790,25 @@ msgid "S&how files currently being edited..." msgstr "Rā&dīt pašlaik rediģētās datnes..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "P&arādīt Vietņu pārvaldnieku pie palaišanas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#, fuzzy +msgid "S&hutdown system once" msgstr "&Izslēgt sistēmu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3000 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "S&top" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#, fuzzy +msgid "S&uspend system once" msgstr "I&emidzināt sistēmu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "S&inhonizētā pārlūkošana" @@ -6141,91 +6816,113 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "" -#: ../../locales/../src/engine/proxy.cpp:137 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +#, fuzzy +msgid "Sav&e passwords" +msgstr "&Saglabāt paroles" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Saglabāt uzstādījumus?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "" -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "" -#: ../../locales/../src/interface/QueueView.cpp:1717 -msgid "Scanning for files to add to queue" -msgstr "Skenē pēc datnēm, lai pievienotu rindai" - -#: ../../locales/../src/interface/QueueView.cpp:1719 -msgid "Scanning for files to upload" -msgstr "Skenē pēc datnēm augšupielādei" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +#, fuzzy +msgid "Scale factor:" +msgstr "&Lokālais direktorijs" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Meklēšanas &nosacījumi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Meklēt &direktorijā:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Meklēt datnes rekursīvi." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Meklēt serverī datnes" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +#, fuzzy +msgid "Search type:" +msgstr "Meklēt &direktorijā:" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Drošības informācija" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Skatīt arī: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Izvēlie&ties serveri" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Izvēlieties &lapu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Izvēlieties tēmu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Izvēlieties noklusējuma darbību, kas tiks pielietota, ja pārsūtījuma mērķa " "datne jau eksistēs." -#: ../../locales/../src/interface/edithandler.cpp:1565 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Izvēlieties noklusējuma redaktoru" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6233,7 +6930,7 @@ "Izvēlieties noklusējuma \"datne eksistē\" darbību, ja mērķa datne jau " "eksistē. Šī izvēle būs derīga tikai aktuālajai sesijai." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6241,60 +6938,67 @@ "Izvēlieties noklusējuma \"datne eksistē\" darbību tikai izvēlētajām datnēm " "rindā." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:359 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Atlasiet privāto atslēgu saturošo datni" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Atlasiet datni eksportētajiem datiem" -#: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/export.cpp:45 +#, fuzzy +msgid "Select file for exported filters" +msgstr "Atlasiet datni eksportētajām vietnēm" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Atlasiet datni eksportētajai rinadi" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Izvēlieties datni eksportējamajiem uzstādījumiem" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2126 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "Atlasiet datni eksportētajām vietnēm" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Izvēlieties datni uzstādījumu importam" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Izvēlieties datni augšupielādei" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:305 -msgid "Select filename for converted keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 +#, fuzzy +msgid "Select filename for converted key file" msgstr "Izvēlieties vārdu konvertētajai atslēgdatnei" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2877 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Atlasiet kā šīs datnes vajadzētu atvērt." -#: ../../locales/../src/interface/search.cpp:482 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Atlasiet mērķa lejupielādes direktoriju" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Atlasiet mērķa datnes vārdu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Izvēlieties kategoriju eksportam:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Izvēlieties privātos datus, kurus vēlaties izdzēst." -#: ../../locales/../src/interface/search.cpp:450 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6302,7 +7006,7 @@ msgstr[1] "Atlasīti %d direktoriji ar to saturu pārsūtīšanai." msgstr[2] "Atlasīts %d direktoriju ar to saturu pārsūtīšanai." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." @@ -6310,7 +7014,7 @@ msgstr[1] "Atlasīti %d direktoriji." msgstr[2] "Atlasīti %d direktoriju." -#: ../../locales/../src/interface/search.cpp:448 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6318,7 +7022,7 @@ msgstr[1] "Atlasītas %d datnes pārsūtīšanai." msgstr[2] "Atlasītas %d datnes pārsūtīšanai." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" @@ -6326,7 +7030,7 @@ msgstr[1] "Atlasītas %d datnes. Kopejais izmērs: %s" msgstr[2] "Atlasītas %d datnes. Kopejais izmērs: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" @@ -6334,94 +7038,94 @@ msgstr[1] "Atlasītas %d datnes. Kopejais izmērs: Vismaz %s" msgstr[2] "Atlasītas %d datnes. Kopejais izmērs: Vismaz %s" -#: ../../locales/../src/interface/search.cpp:454 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Atlasīti %s un %s pārsūtīšanai." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Atlasīti: %s un %s. Kopējais izmērs: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Atlasīti: %s un %s. Kopējais izmērs: vismaz %s" -#: ../../locales/../src/interface/edithandler.cpp:1510 -#: ../../locales/../src/interface/edithandler.cpp:1585 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Izvēlētais redaktors neeskistē." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Atlasītā datne jau tiek rediģēta" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:388 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Atlasītā datne jau ir ielādēta" -#: ../../locales/../src/interface/edithandler.cpp:1683 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Atlasītā datne jau ir atvērta" -#: ../../locales/../src/interface/edithandler.cpp:1755 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Atlasītā datne joprojām tiek rediģēta" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Atlasītais filtrs darbojas tikai lokālajām datnēm." -#: ../../locales/../src/interface/menu_bar.cpp:307 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" -#: ../../locales/../src/engine/engineprivate.cpp:288 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4399 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Seriālais numurs:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "Servera &veids:" -#: ../../locales/../src/engine/tlssocket.cpp:722 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:892 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:945 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Serveris neatbalsta atsākšanu datnēm > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4229 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6430,15 +7134,19 @@ "Serveris neatbalsta atsākšanu datnēm > %d GB. Pārtrauc pārsūtīšanu, jo datņu " "izmērs saskan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Serveris neatbalsta atsākšanu datnēm > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2486 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Serveris neatbalsta atsākšanu datnēm > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4244 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6447,64 +7155,95 @@ "Serveris var neatbalstīt atsākšanu datnēm > %d GB. Pārtrauc pārsūtīšanu, jo " "datņu izmērs saskan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 -msgid "" -"Server might require an account. Try specifying an account using the Site " -"Manager" +#: ../../locales/../src/engine/ftp/logon.cpp:338 +msgid "" +"Server might require an account. Try specifying an account using the Site " +"Manager" +msgstr "" +"Serveris var pieprasīt kontu. Lūdzu norādiet kontu izmantojot vietņu " +"pārvaldnieku" + +#: ../../locales/../src/engine/http/request.cpp:457 +#, fuzzy +msgid "Server not sending proper line endings" +msgstr "Nepareizas rindiņas beigas" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" msgstr "" -"Serveris var pieprasīt kontu. Lūdzu norādiet kontu izmantojot vietņu " -"pārvaldnieku" -#: ../../locales/../src/engine/ControlSocket.cpp:340 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "Serveris atsūtīja tukšu ceļu." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:654 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3797 +#: ../../locales/../src/engine/http/request.cpp:307 +msgid "Server sent data even before request headers were sent" +msgstr "" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3791 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:425 -#: ../../locales/../src/interface/netconfwizard.cpp:464 -#: ../../locales/../src/interface/netconfwizard.cpp:473 -#: ../../locales/../src/interface/netconfwizard.cpp:485 -#: ../../locales/../src/interface/netconfwizard.cpp:509 -#: ../../locales/../src/interface/netconfwizard.cpp:516 -#: ../../locales/../src/interface/netconfwizard.cpp:525 -#: ../../locales/../src/interface/netconfwizard.cpp:536 +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:780 +msgid "Server sent too much data." +msgstr "" + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Serveris atsūtīja negaidītu atbildi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Serveris klienta MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2047 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "Servera &veids:" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Serveris/Lokālā datne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Serveris:" @@ -6512,45 +7251,56 @@ msgid "Session details" msgstr "Sesijas detaļas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Uzstādīt &prioritāti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2336 -#, c-format -msgid "Set permissions of '%s' to '%s'" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 +#, fuzzy, c-format +msgid "Setting permissions of '%s' to '%s'" msgstr "Iestatīt atļaujas '%s' uz '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:760 -msgid "SetSocketBufferSize called without socket" -msgstr "" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Uzstādījumi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 +#, fuzzy +msgid "Settings directory:" +msgstr "Izveido direktoriju" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Rādīt &sveiciena dialogu..." -#: ../../locales/../src/interface/Mainfrm.cpp:2248 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Rādīt abus direktoriju kokus un turpināt salīdzināt?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Rādīt detaļas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:438 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +#, fuzzy +msgid "Show in file &manager" +msgstr "Vietņu pārvaldnieks" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "" @@ -6558,7 +7308,7 @@ msgid "Shows this help dialog" msgstr "Rāda šo palīdzības dialogu" -#: ../../locales/../src/interface/QueueView.cpp:3077 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "Izslēgt sistēmu" @@ -6566,7 +7316,11 @@ msgid "Signature algorithm:" msgstr "Paraksta algoritms:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Vietņu &pārvaldnieka ieraksti" @@ -6574,55 +7328,62 @@ msgid "Site Manager" msgstr "Vietņu pārvaldnieks" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "Vietņu pārvaldnieks - nevar atcerēties paroli" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:988 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +#, fuzzy +msgid "Site Manager - Generated key" +msgstr "Vietņu &pārvaldnieka ieraksti" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "Vietņu pārvaldnieks - Nederīgi dati" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Vietņu pārvaldnieks jau atvērts" -#: ../../locales/../src/interface/sitemanager.cpp:443 -#: ../../locales/../src/interface/sitemanager.cpp:457 -#: ../../locales/../src/interface/sitemanager.cpp:471 -#: ../../locales/../src/interface/sitemanager.cpp:539 -#: ../../locales/../src/interface/sitemanager.cpp:734 -#: ../../locales/../src/interface/sitemanager.cpp:814 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Vietne neeksistē." -#: ../../locales/../src/interface/sitemanager.cpp:426 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Vietnes ceļam ir jāsākas ar 0 vai 1." -#: ../../locales/../src/interface/sitemanager.cpp:464 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:260 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Vietnei specifiskas grāmatzīmes" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6632,11 +7393,11 @@ "pārvaldniekā.\n" "Pievienot aktuālo savienojumu Vietņu pārvaldniekam?" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "Lielums" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Izmēra formatēšana" @@ -6644,86 +7405,91 @@ msgid "Size unknown" msgstr "Nezināms lielums" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Izlaist datni" -#: ../../locales/../src/engine/ControlSocket.cpp:1150 -#: ../../locales/../src/engine/ControlSocket.cpp:1167 -#: ../../locales/../src/engine/ControlSocket.cpp:1191 -#: ../../locales/../src/engine/ControlSocket.cpp:1252 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Tiek izlaista %s lejupielāde" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1170 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1256 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Tiek izlaista %s augšupielāde" -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1090 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:1196 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Kādas datnes joprojām tiek rediģētas vai arī nepieciešams tās augšupielādēt." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Kārtot direktorijus rindā" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "Kārtošanas secību nevar mainīt, ja salīdzina direktorijus." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Kārtošana" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Kārtošanas &režīms:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Avota un mērķa datne nevar būt tā pati" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "" @@ -6731,37 +7497,37 @@ msgid "Source file:" msgstr "Avota datne:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3602 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Ātruma ierobežojumi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Ātruma ierobežojumi" -#: ../../locales/../src/interface/statusbar.cpp:573 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "Ātruma ierobežojumi ir atspējoti, noklikšķiniet, lai izmainītu." -#: ../../locales/../src/interface/statusbar.cpp:576 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "Ātruma ierobežojumi ir iespējoti, noklikšķiniet, lai izmainītu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Stabilas un beta versijas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Tikai stabilas versijas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Stabilas, beta un nakts versijas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Sākt pārsūtīšanu &tūlīt" @@ -6769,19 +7535,21 @@ msgid "Start with opened Site Manager" msgstr "Sākt ar atvērtu Vietņu pārvaldnieku" -#: ../../locales/../src/interface/updater.cpp:276 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Sāka atjauninājumu pārbaudi %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2192 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1556 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Sāk %s lejupielādi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2195 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Sāk %s augšupielādi" @@ -6790,26 +7558,39 @@ msgid "Starts the local site in the given path" msgstr "" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Štats vai province:" -#: ../../locales/../src/interface/edithandler.cpp:1103 -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "Status" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:288 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Status:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Apstādināt un aizvākt &visus" -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 +#, fuzzy +msgid "Stop recursive operation" +msgstr "Drošības informācija" + +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Iela:" @@ -6825,38 +7606,44 @@ msgid "Summary of test results:" msgstr "Testa rezultātu kopsavilkums:" -#: ../../locales/../src/interface/QueueView.cpp:3085 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "Suspend now" msgstr "Iemidzināt tagad" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." msgstr "" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:264 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 #: ../../locales/../src/interface/state.cpp:278 -#: ../../locales/../src/interface/state.cpp:284 -#: ../../locales/../src/interface/state.cpp:294 -#: ../../locales/../src/interface/state.cpp:385 -#: ../../locales/../src/interface/state.cpp:393 -#: ../../locales/../src/interface/state.cpp:401 -#: ../../locales/../src/interface/state.cpp:977 -#: ../../locales/../src/interface/state.cpp:986 -#: ../../locales/../src/interface/state.cpp:993 -#: ../../locales/../src/interface/state.cpp:1004 -#: ../../locales/../src/interface/state.cpp:1011 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Sinhronizētā pārlūkošana" -#: ../../locales/../src/interface/state.cpp:400 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Sinhronizētā pārlūkošana ir atspējota." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:123 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#, fuzzy +msgid "Synchronizing directories." +msgstr "Dzēš direktorijus" + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Sintakses kļūda" @@ -6865,40 +7652,45 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2360 -#: ../../locales/../src/interface/Mainfrm.cpp:2403 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Sintakses kļūda komandrindā" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Sistēma" -#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 +#, fuzzy +msgid "System details" +msgstr "Rādīt detaļas" + +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "R&īkjosla" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:311 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:388 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "TLS savienojums nodibināts." -#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL beidzies" @@ -6906,31 +7698,45 @@ msgid "Target file already exists" msgstr "Mērķa datne jau eksistē" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Mērķa datne:" -#: ../../locales/../src/interface/RemoteListView.cpp:2728 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "Mērķa datnes vārds jau eksistē!" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "Mērķa datne jau eksistē, tiešām turpināt?" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +#, fuzzy +msgid "Test finished successfully" +msgstr "Datnes pārsūtīšana veiksmīga" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Testa rezultāti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4250 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Testē servera turpināšanas iespējas" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +#, fuzzy +msgid "The &following files are currently being edited:" +msgstr "Sekojošās datnes šobrīd tiek rediģētas:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -6939,7 +7745,7 @@ "Vietņu pārvaldnieks ir atvērts citā FileZilla 3 instancē.\n" "Vai gribāt turpināt? Jebkuras izmaiņas vietņu pārvaldniekā netiks saglabātas." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -6947,34 +7753,35 @@ "Vietņu pārvaldnieks ir atvērts citā FileZilla 3 instancē.\n" "Lūdzu aizveriet to, vai arī dati netiks dzēsti." -#: ../../locales/../src/interface/xmlfunctions.cpp:389 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "XML dokuments nav labi veidots: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Ievadītā adrese bija: %s" -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:802 -#: ../../locales/../src/interface/sitemanager.cpp:714 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Grāmatzīmi nevar pievienot." -#: ../../locales/../src/interface/sitemanager.cpp:796 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Grāmatzīmes nevar notīrīt." -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "Savienojums tiek šifrēts. Noklikšķiniet ikonu sīkākai informācijai." @@ -6992,34 +7799,40 @@ "The custom time format is invalid or contains unsupported format specifiers." msgstr "" -#: ../../locales/../src/engine/transfersocket.cpp:131 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2895 -#: ../../locales/../src/interface/edithandler.cpp:1545 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Nevar atrast noklusējuma redaktoru teksta datnēm." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Noklusējuma redaktors teksta datnēm ir '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Ievadītais filtra vārds jau eksistē, lūdzu izvēlieties citu vārdu." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +#, fuzzy +msgid "The entered passwords are not the same." +msgstr "Lūdzu ievadiet paroli šim serverim:" + +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Paplašinājums '%s' jau eksistē sarakstā" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:278 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:284 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7028,8 +7841,9 @@ "Datne %s jau eksistē.\n" "Lūdzu ievadiet jaunu vārdu:" -#: ../../locales/../src/interface/edithandler.cpp:1656 -#: ../../locales/../src/interface/LocalListView.cpp:1711 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7040,18 +7854,26 @@ "Nevar atrast saistīto programmu (%s).\n" "Lūdzu pārbaudiet jūsu datņu tipu asociācijas." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:226 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" -#: ../../locales/../src/interface/xmlfunctions.cpp:41 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Datni '%s' nevar ielādēt." -#: ../../locales/../src/interface/edithandler.cpp:1651 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7060,43 +7882,36 @@ "Datni '%s' nevar atvērt:\n" "Neviena programma nav asociēta uz jūsu sistēmas ar šo datņu tipu." -#: ../../locales/../src/interface/edithandler.cpp:1768 -#: ../../locales/../src/interface/LocalListView.cpp:1719 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" "The associated command failed" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:269 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" "Would you like to convert it into a supported format?" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:274 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Datne, kas izvēlēta kā noklusējuma redaktors, neeskistē." -#: ../../locales/../src/interface/import.cpp:79 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7105,11 +7920,11 @@ "Continue with the import?" msgstr "" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Datņu kolonnu nevar ne noslēpt, ne pārvietot." -#: ../../locales/../src/interface/listctrlex.cpp:808 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Datņu kolonnu nevar noslēpt." @@ -7123,19 +7938,19 @@ msgid "The following characters will be replaced: %s" msgstr "Sekojošās rakstzīmes tiks aizstātas: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1888 -msgid "The following files are currently being edited:" -msgstr "Sekojošās datnes šobrīd tiek rediģētas:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Bezmaksas atklātā pirmkoda FTP risinājums" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:293 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Globālās grāmatzīmes nevar saglabāt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7146,6 +7961,16 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Limitam jābūt starp 1 un 2000 MiB" +#: ../../locales/../src/interface/state.cpp:1121 +#, fuzzy, c-format +msgid "The local directory '%s' could not be created." +msgstr "Datni '%s' nevar ielādēt." + +#: ../../locales/../src/interface/state.cpp:1106 +#, fuzzy, c-format +msgid "The local directory '%s' does not exist." +msgstr "Izvēlētais redaktors neeskistē." + #: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" @@ -7153,66 +7978,76 @@ "Disable synchronized browsing and continue changing the local directory?" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." msgstr "" -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Jauno versiju nevar lejupielādēt, lūdzu, mēģiniet vēlāk vēlreiz." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "" -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." msgstr "Rinda netiks saglabāta." -#: ../../locales/../src/interface/state.cpp:983 +#: ../../locales/../src/interface/state.cpp:1028 +#, fuzzy, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Izvēlētais redaktors neeskistē." + +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../locales/../src/interface/import.cpp:69 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Izvēlētās kategorijas importētas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1603 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "Izvēlētā datne satur importējamus datus šādām kategorijām:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1767 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Atlasītā datne jau tiek rediģēta:" -#: ../../locales/../src/interface/edithandler.cpp:1755 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" -#: ../../locales/../src/interface/edithandler.cpp:1661 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" -#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Serveri nevar pievienot." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Serveris nosūtija negaidītu vai neatpazītu atbildi." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Serveris lieto sekojošo rakstzīmju kopas kodējumu datņu vārdiem:" @@ -7222,24 +8057,28 @@ "certificate to make sure the server can be trusted." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:934 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " "actually trying to connect to another computer pretending to be the server." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." msgstr "" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "" -#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7247,19 +8086,19 @@ "Uzstādījumi tika importēti. Jums jārestartē Filezilla, lai visiem " "uzstādījumiem būtu efekts." -#: ../../locales/../src/engine/socket.cpp:1028 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "" -#: ../../locales/../src/engine/socket.cpp:1092 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "" -#: ../../locales/../src/interface/QueueView.cpp:3080 +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." msgstr "Sistēma drīzumā restartēsies, ja vien jūs nenoklikšķiniet uz Atcelt." -#: ../../locales/../src/interface/QueueView.cpp:3076 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "Sistēma drīzumā izslēgsies, ja vien jūs nenoklikšķiniet uz Atcelt." @@ -7271,11 +8110,11 @@ "Mērķa datne jau eksistē.\n" "Lūdzu izvēlieties darbību." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "" -#: ../../locales/../src/interface/xmlfunctions.cpp:77 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Nevar atjaunot derīgu dublējuma datni %s" @@ -7284,15 +8123,15 @@ msgid "Themes" msgstr "Tēmas" -#: ../../locales/../src/interface/filter.cpp:445 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Šo filtru komlektu nevar aizvākt." -#: ../../locales/../src/interface/filter.cpp:385 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Šo filtru komlektu nevar pārsaukt." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7310,52 +8149,47 @@ "you have and tests your configuration." msgstr "" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "Laiks" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Laika formatēšana" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Noil&dze pēc sekundēm:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Noildze" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1666 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1030 -#, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Laika joslas nobīdes: Serveris %d sekundes. Lokāli: %d sekundes. Atšķirība: " -"%d sekundes." - -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Virsraksts:" -#: ../../locales/../src/interface/Mainfrm.cpp:2246 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +#, fuzzy +msgid "To compare directories quick search must be closed." +msgstr "Nevar salīdzināt direktorijus, nav savienojuma ar serveri." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" -#: ../../locales/../src/interface/Mainfrm.cpp:2247 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." msgstr "" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7372,7 +8206,7 @@ "Zaļa: Datne ir jaunāka nekā neatzīmētā datne otrā pusē\n" "Sarkana: Datnes izmēri atšķiras" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7382,82 +8216,77 @@ "Ja iespējota, pārvietojoties pa lokālo direktoriju hierarhiju, mainīs " "direktorijus arī servera pusē un otrādi." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Pārslēdz pārsūtījumu rindas apstrādi" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Pārslēdz lokālā direktoriju koka attēlošanu" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Pārslēdz ziņojumu žurnāla attēlošanu" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Pārslēdz attālā direktoriju koka attēlošanu" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Pārslēdz pārsūtījumu rindas attēlošanu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:569 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Too long header line" msgstr "Pārāk gara galvenes rindiņa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:644 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Par daudz virziena maiņas" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:282 -#: ../../locales/../src/interface/StatusView.cpp:349 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Izsekot" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Pārsūtīt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Pārsūtīšanas &virziens" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "Pārsūtīšanas &režīms" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Pārsūtīšanas režīms" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Pārsūtījumu rinda" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Pārsūtīšanas uzstādījumi" -#: ../../locales/../src/engine/transfersocket.cpp:438 -#: ../../locales/../src/engine/transfersocket.cpp:460 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Pārsūtīšanas savienojums pārtraukts: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Pārsūtītie dati sabojājās." -#: ../../locales/../src/interface/queue.cpp:391 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Pārsūta" @@ -7465,28 +8294,27 @@ msgid "Transfers" msgstr "Pārsūtījumi" -#: ../../locales/../src/interface/QueueView.cpp:2976 -#: ../../locales/../src/interface/QueueView.cpp:2979 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "Pārsūtījumi pabeigti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Apstrādāt datnes &bez paplašinājuma kā ASCII datnes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Apstrādāt &sekojošos datņu veidus kā ASCII datnes:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Uzticēties jaunajai atslēgai un turpināt savienošanos?" @@ -7494,69 +8322,76 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Uzticēties šim sertifikātam un turpināt savienošanos?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:872 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Uzticēties šim saimniekdatoram un turpināt savienošanos?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Mēģiniet vēlreiz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 -#: ../../locales/../src/interface/edithandler.cpp:1101 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Tips" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "FTP starpniekdatora tips:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "&Augšupielādēt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3543 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "A&ugšupielādes ierobežojums:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "J&a pieejamas, lietot datņu tipu asociācijas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "L&ietot sistēmas noklusējuma" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 +#, fuzzy +msgid "U&se system defaults for current language" +msgstr "&Lietot sistēmas noklusēto redaktoru teksta datnēm" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "LIETOTĀJS@&SAIMNIEKDATORS" -#: ../../locales/../src/engine/proxy.cpp:364 -#: ../../locales/../src/engine/proxy.cpp:491 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Vienība:" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1161 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Nezināms" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" -#: ../../locales/../src/engine/proxy.cpp:412 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "" @@ -7565,51 +8400,59 @@ msgid "Unknown certificate" msgstr "Nezināms sertifikāts" -#: ../../locales/../src/interface/xmlfunctions.cpp:380 -#: ../../locales/../src/interface/xmlfunctions.cpp:392 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, fuzzy, c-format +msgid "Unknown error %d" +msgstr "Nezināma saimniekdatora atslēga" + +#: ../../locales/../src/engine/misc.cpp:48 +#, fuzzy, c-format +msgid "Unknown error %u" +msgstr "Nezināma saimniekdatora atslēga" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Nezināma saimniekdatora atslēga" -#: ../../locales/../src/engine/proxy.cpp:420 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "" -#: ../../locales/../src/interface/xmlfunctions.cpp:420 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/engine/http/request.cpp:571 +msgid "Unknown transfer encoding" +msgstr "" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:1017 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Neatbalstīts sertifikātu veids" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:629 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Neatbalstīta virzienmaiņa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Au&gšupielādēt un atmest rediģējumu" @@ -7618,97 +8461,108 @@ msgid "Updates" msgstr "Atjauninājumi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Augšupielāde" -#: ../../locales/../src/interface/edithandler.cpp:1124 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Augšupielāde neizdevās" -#: ../../locales/../src/interface/statusbar.cpp:584 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "Augšupielādes ierobežojums: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Augšupielādes ierobežojums: nekāds" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +#, fuzzy +msgid "Upload search results" +msgstr "Lejupielādēt meklēšanas rezultātus" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Augšupielādēt atlasīto direktoriju" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Augšupielādēt atlasītās datnes un direktorijus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Augšupielādēt šo datni atpakaļ uz serveri?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Augšupielādēt šo datni uz serveri?" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1152 -#: ../../locales/../src/interface/edithandler.cpp:1317 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Augšupielādē" -#: ../../locales/../src/interface/edithandler.cpp:1121 -#: ../../locales/../src/interface/edithandler.cpp:1319 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Augšupielādē un gaida aizvākšanu" -#: ../../locales/../src/interface/edithandler.cpp:1155 -#: ../../locales/../src/interface/edithandler.cpp:1321 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Augšupielādē un atmet rediģējumu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Lietot &pielāgotu rakstzīmju kopu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Lietot &pielāgotu redaktoru:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2882 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Lietot &noklusējuma redaktoru teksta datnēm" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2672 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2746 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Izmantot &sinhonizēto pārlūkošanu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:467 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Lieto UTF-8, ja serveris to atbalsta, citādi lieto lokālo rakstzīmju kopu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1389 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Lietot noklusējuma darbību" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:527 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Izmantot aktuālā savienojuma serveri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Lietot serveri no Vietņu pārvaldnieka" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Lietot sistēmas &noklusējuma" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 +#, fuzzy +msgid "Use system &defaults for current language" +msgstr "&Lietot sistēmas noklusēto redaktoru teksta datnēm" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -7723,7 +8577,7 @@ msgstr "Izmantot tās vietā servera ārējo IP adresi" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -7736,21 +8590,17 @@ "time. Only the version of FileZilla you're using is submitted to the server." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Lietotājs:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "Lietotāja vārds nevar būt vairākas atstarpes" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326 -#, c-format -msgid "Using proxy %s" -msgstr "Lieto starpniekserveri %s" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:507 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -7769,72 +8619,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Pārbauda sertifikātu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -msgid "Version:" -msgstr "Versija:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Ļoti augsts" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1405 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Skatīt/Rediģēt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Redzamās kolonnas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "R&akstīt" -#: ../../locales/../src/interface/QueueView.cpp:1677 -msgid "Waiting" -msgstr "Gaida" - -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Gaida pārlūkošanas savienojumu" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Gaida paroli" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Gaida pārsūtīšanas atcelšanu" -#: ../../locales/../src/engine/engineprivate.cpp:226 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Gaida, lai atkārtotu..." -#: ../../locales/../src/interface/FileZilla.cpp:297 -msgid "" -"Warning!\n" -"\n" -"A bug in Windows causes problems with FileZilla\n" -"\n" -"The bug occurs if you have\n" -"- Windows Server 2003 or XP 64\n" -"- Windows Firewall enabled\n" -"- Application Layer Gateway service enabled\n" -"See http://support.microsoft.com/kb/931130 for background information.\n" -"\n" -"Unless you either disable Windows Firewall or the Application Layer Gateway " -"service,\n" -"FileZilla will timeout on big transfers." -msgstr "" - -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "" @@ -7847,94 +8672,114 @@ "Do you really want to check for nightly builds?" msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Brīdinājums: Iespējams drošības pārkāpums!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Laipni lūgti FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Kas jauns" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Kas jauns:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Platekrāna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Vai vēlaties, lai FileZilla iegaumē paroles?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Ra&kstīt" -#: ../../locales/../src/interface/netconfwizard.cpp:448 #: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Nepareiza ārējā IP adrese" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/http/request.cpp:643 msgid "Wrong line endings" msgstr "Nepareizas rindiņas beigas" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Jā" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "" -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Jūs lietojat jaunāko FileZilla versiju." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "" -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Jūs varat lejupielādēt jaunāko versiju no FileZilla mājas lapas:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "" "Jūs varat izmantot x jebkurā vietā, lai saglabātu datnes oriģinālās atļaujas." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" @@ -7944,62 +8789,89 @@ "Please enter a character that is allowed in filenames." msgstr "" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +#, fuzzy +msgid "You cannot upload files into the root directory." +msgstr "Izveido jaunu, tukšu datni aktuālajā direktorijā" + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Jus neievadījāt jaunu vārdu datnei. Vai pārrakstīt datni?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "" -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" -#: ../../locales/../src/interface/LocalListView.cpp:1677 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." msgstr "Jāievada saimniekdatora vārds." -#: ../../locales/../src/interface/search.cpp:493 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#, fuzzy +msgid "You have to enter a key file path" +msgstr "Jāievada lokāls direktorijs." + +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Jāievada lokāls direktorijs." -#: ../../locales/../src/interface/netconfwizard.cpp:164 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." +#: ../../locales/../src/interface/search.cpp:941 +#, fuzzy +msgid "You have to enter a remote directory." +msgstr "Jāievada lokāls direktorijs." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +#, fuzzy +msgid "You have to enter a valid IPv4 address." msgstr "Jāievada derīga IP adrese." -#: ../../locales/../src/interface/search.cpp:498 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#, fuzzy +msgid "You have to enter a valid encryption key" +msgstr "Jāievada lokāls direktorijs." + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Jāievada rakstāms lokālais direktorijs." -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "Jāievada saimniekdatora vārds" -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "Jānorāda lietotājvārds" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +#, fuzzy +msgid "You need to enter a master password." +msgstr "Jums jāievada starpserveris." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Jums jāievada grāmatzīmes vārds." @@ -8007,7 +8879,7 @@ msgid "You need to enter a name for the log file." msgstr "Jums jāievada žurnāla vārds." -#: ../../locales/../src/interface/edithandler.cpp:1506 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Jums jāievada pareizi citētu komandu." @@ -8020,201 +8892,310 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Jāievada starpniekservera pieslēgvietu diapazonā no 1 līdz 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:440 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "" -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Jānorāda lokālā datne." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Jānorāda attālā datne." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Jānorāda attālais ceļš." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Jānorāda serveris." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "" -#: ../../locales/../src/interface/QueueView.cpp:3084 +#: ../../locales/../src/interface/QueueView.cpp:2775 msgid "Your computer will suspend unless you click Cancel." msgstr "" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "pēc" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "pirms" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "sākas ar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "baiti" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "satur" -#: ../../locales/../src/interface/updater.cpp:280 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "pielāgots" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "nesatur" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "nav vienāds" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "beidzas ar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "vienāds ar" -#: ../../locales/../src/interface/filelistctrl.cpp:530 -#: ../../locales/../src/interface/filelistctrl.cpp:549 -#: ../../locales/../src/interface/filelistctrl.cpp:576 -#: ../../locales/../src/interface/filelistctrl.cpp:592 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "datne" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:98 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " "FileZilla executable." msgstr "" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:462 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" -msgstr "" +msgstr "fzsftp ir citā FileZilla versijā" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1483 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "nevar palaist fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1044 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj ir citā FileZilla versijā" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "Nevar palaist fzstorj" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "lielāks nekā" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "grupai izpildāma" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "grupa lasāma" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "grupa rakstāma" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "ir vienāds ar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "ir iestatīts" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "ir atstatīts" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "mazāk kā" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "sakrīt ar regex" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "jaunais nosaukums" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "īpašniekam izpildāma" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "īpašniekam lasāma" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "īpašniekam rakstāma" -#: ../../locales/../src/engine/tlssocket.cpp:1100 -#: ../../locales/../src/engine/tlssocket.cpp:1111 -#: ../../locales/../src/engine/tlssocket.cpp:1126 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:30 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "nezināms" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "pasaulei izpildāma" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "pasaulei lasāma" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "pasaulei rakstāma" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "%d files added to queue" +#~ msgstr "%d datnes pievienotas rindai" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Atvienoties no servera" + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "&Nesaglabāt paroles (ieteicams)" + +#~ msgid "&Show message" +#~ msgstr "&Rādīt ziņojumu" + +#~ msgid "" +#~ "Any changes made in the Site Manager will not be saved unless you repair " +#~ "the file." +#~ msgstr "" +#~ "Jebkādas izmaiņas, kas veiktas vietņu pārvaldniekā, netiks saglabātas, ja " +#~ "vien nesalabosiet datni." + +#~ msgid "Available sizes" +#~ msgstr "Pieejamie izmēri" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Nevar ielādēt ātrā savienojuma joslu no resursu datnes" + +#~ msgid "Clear &Site Manager entries" +#~ msgstr "Dzēst &vietņu pārvaldnieka ierakstus" + +#~ msgid "Clear &transfer queue" +#~ msgstr "Dzēst &pārsūtījumu rindu" + +#~ msgid "Connected" +#~ msgstr "Savienots" + +#~ msgid "Do ¬hing" +#~ msgstr "Nedarīt &neko" + +#~ msgid "Downloading search results" +#~ msgstr "Lejupielādē meklēšanas rezultātus" + +#~ msgid "Filename &filters..." +#~ msgstr "Datnes vārda &filtri..." + +#~ msgid "No more files in the queue!" +#~ msgstr "Rindā datņu vairs nav!" + +#~ msgid "Operating system problem detected" +#~ msgstr "Uzieta operētājsistēmas problēma" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Skenē pēc datnēm, lai pievienotu rindai" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Skenē pēc datnēm augšupielādei" + +#~ msgid "The XML document is not well-formed: %s" +#~ msgstr "XML dokuments nav labi veidots: %s" + +#~ msgid "" +#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " +#~ "seconds." +#~ msgstr "" +#~ "Laika joslas nobīdes: Serveris %d sekundes. Lokāli: %d sekundes. " +#~ "Atšķirība: %d sekundes." + +#~ msgid "U&se system defaults" +#~ msgstr "L&ietot sistēmas noklusējuma" + +#~ msgid "Use system &defaults" +#~ msgstr "Lietot sistēmas &noklusējuma" + +#~ msgid "Using proxy %s" +#~ msgstr "Lieto starpniekserveri %s" + +#~ msgid "Waiting" +#~ msgstr "Gaida" + #~ msgid "&Crash" #~ msgstr "&Avārija" @@ -8234,34 +9215,6 @@ #~ msgstr "Savienojums noildzis" #~ msgid "" -#~ "Enter the address of the server.\n" -#~ "To specify the server protocol, prepend the host with the protocol " -#~ "identifier. If no protocol is specified, the default protocol (ftp://) " -#~ "will be used.\n" -#~ "You can also enter complete URLs in the form protocol://user:pass@host:" -#~ "port here, the values in the other fields will be overwritten then.\n" -#~ "\n" -#~ "Supported protocols are:\n" -#~ "- ftp:// for normal FTP\n" -#~ "- sftp:// for SSH file transfer protocol\n" -#~ "- ftps:// for FTP over TLS (implicit)\n" -#~ "- ftpes:// for FTP over TLS (explicit)" -#~ msgstr "" -#~ "Ievadiet servera adresi.\n" -#~ "Lai norādītu servera protokolu, ievadiet pirms saimniekdatora adreses " -#~ "protokola identifikatoru. Ja protokols nav norādīts, tad tiks izmantots " -#~ "noklusējuma (ftp://).\n" -#~ "Jūs varat arī ievadīt pilnīgu URL: protokols://lietotājs:" -#~ "parole@saimniekdators:pieslēgvieta. Pārējo lauku vērtības tad tiks " -#~ "pārrakstītas.\n" -#~ "\n" -#~ "Atbalstītie protokoli:\n" -#~ "- ftp:// normālam FTP\n" -#~ "- sftp:// SSH datņu pārsūtīšanas protokols\n" -#~ "- ftps:// FTP pār TLS (netiešs)\n" -#~ "- ftpes:// FTP pār TLS (skaidrs)" - -#~ msgid "" #~ "Filename may not contain any of the following characters: / \\ : * ? \" < " #~ "> |" #~ msgstr "" @@ -8290,9 +9243,6 @@ #~ msgid "Cannot load file, not a valid XML file." #~ msgstr "Nevar ielādēt datni, nederīga xml datne." -#~ msgid "Root certificate is not trusted" -#~ msgstr "Saknes sertifikāts nav uzticams" - #~ msgid "%s (%d.%d KB/s)" #~ msgstr "%s (%d.%d KB/s)" @@ -8556,9 +9506,6 @@ #~ msgid "Error %d writing to socket" #~ msgstr "Kļūda %d rakstot ligzdā" -#~ msgid "Invalid hostname or host not found" -#~ msgstr "Nederīgs saimniekdatora vārds vai saimniekdatoru nevar atrast" - #~ msgid "Updatecheck failed" #~ msgstr "Atjauninājumu pārbaude neizdevās" diff -Nru filezilla-3.15.0.2/locales/Makefile.am filezilla-3.33.0/locales/Makefile.am --- filezilla-3.15.0.2/locales/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/Makefile.am 2017-09-19 21:36:39.000000000 +0000 @@ -40,7 +40,7 @@ XGETTEXT=@xgettext@ # common xgettext args: C++ syntax, use the specified macro names as markers -XGETTEXT_ARGS=-C -k_ -kwxGetTranslation -kwxTRANSLATE -kTRANSLATE_T -kwxPLURAL:1,2 -kwxPLURAL_LL:1,2 -s -j -c@translator +XGETTEXT_ARGS=-C -k_ -kfztranslate:1,1t -kfztranslate:1,2,3t -kfztranslate_mark:1,1t -kfztranslate_mark:1,2,3t -kwxPLURAL:1,2 -s -j -c@translator --msgid-bugs-address='https://trac.filezilla-project.org/' # implicit rules %.mo: %.po.new diff -Nru filezilla-3.15.0.2/locales/Makefile.in filezilla-3.33.0/locales/Makefile.in --- filezilla-3.15.0.2/locales/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/locales/Makefile.in 2018-05-07 08:45:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,16 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = locales -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_noinst_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -100,6 +111,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -125,6 +138,7 @@ esac DATA = $(dist_noinst_DATA) $(noinst_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -136,11 +150,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -164,6 +178,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -184,16 +200,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -245,6 +269,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -284,6 +309,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -320,7 +346,7 @@ XGETTEXT = @xgettext@ # common xgettext args: C++ syntax, use the specified macro names as markers -XGETTEXT_ARGS = -C -k_ -kwxGetTranslation -kwxTRANSLATE -kTRANSLATE_T -kwxPLURAL:1,2 -kwxPLURAL_LL:1,2 -s -j -c@translator +XGETTEXT_ARGS = -C -k_ -kfztranslate:1,1t -kfztranslate:1,2,3t -kfztranslate_mark:1,1t -kfztranslate_mark:1,2,3t -kwxPLURAL:1,2 -s -j -c@translator --msgid-bugs-address='https://trac.filezilla-project.org/' # on the Mac copy the .mo files into the application bundle @MACAPPBUNDLE_TRUE@noinst_DATA = $(top_builddir)/FileZilla.app/Contents/SharedSupport/locales @@ -339,7 +365,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu locales/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu locales/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -516,6 +541,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-local +.PRECIOUS: Makefile + install-data-local: install-filezilla-catalogs diff -Nru filezilla-3.15.0.2/locales/nb_NO.po filezilla-3.33.0/locales/nb_NO.po --- filezilla-3.15.0.2/locales/nb_NO.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/nb_NO.po 2017-11-06 17:00:23.000000000 +0000 @@ -1,14 +1,14 @@ # Norwegian bokmål translation of FileZilla -# Copyright (C) 2016 Tim Kosse +# Copyright (C) 2017 Tim Kosse # This file is distributed under the same license as the filezilla package. -# Åka Sikrom , 2015-2016. +# Åka Sikrom , 2017. # msgid "" msgstr "" "Project-Id-Version: FileZilla 3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-30 15:29+0100\n" -"PO-Revision-Date: 2016-01-26 08:52+0100\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-11-06 09:37+0100\n" +"PO-Revision-Date: 2017-11-05 20:27+0100\n" "Last-Translator: Åka Sikrom \n" "Language-Team: Norwegian Bokmål \n" "Language: nb_NO\n" @@ -16,21 +16,21 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.7.1\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S brukt" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S gjenstår" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -39,208 +39,212 @@ "%a - Konto (Linjer som inneholder dette utelates hvis innloggingstypen " "«Konto» ikke brukes)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d mappe" msgstr[1] "%d mapper" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1425 +#: ../../locales/../src/interface/search.cpp:854 +#: ../../locales/../src/interface/search.cpp:1239 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d mappe med innhold" msgstr[1] "%d mapper med innhold" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:853 +#: ../../locales/../src/interface/search.cpp:1238 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fil" msgstr[1] "%d filer" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d fil. Total størrelse: %s" msgstr[1] "%d filer. Total størrelse: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d fil. Total størrelse: Minst %s" msgstr[1] "%d filer. Total størrelse: Minst %s" -#: ../../locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "%d filer lagt i kø" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekund" msgstr[1] "%d sekunder" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Vert" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu mappe" msgstr[1] "%llu mapper" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu fil" msgstr[1] "%llu filer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Passord" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" -msgstr "%s - Sertifikat utgått!" +msgstr "%s - Utgått sertifikat!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ikke gyldig ennå!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Mellomtjener-bruker" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s og %s. Total størrelse: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s og %s. Total størrelse: Minst %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s byte" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:629 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"Fant ikke %s. SFTP fungerer ikke uten denne komponenten.\n" +"Fant ikke %s. %s fungerer ikke uten denne komponenten.\n" "\n" -"Last ned FileZilla på nytt. Send gjerne en feilrapport hvis problemet " -"vedvarer." +"Last ned FileZilla på nytt. Send gjerne en feilrapport hvis problemet ikke " +"forsvinner." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:719 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"Fant ikke %s. SFTP fungerer ikke uten denne komponenten.\n" +"Fant ikke %s. %s fungerer ikke uten denne komponenten.\n" "\n" "Mulige løsninger:\n" "- Kontroller at %s finnes i en mappe som er med i miljøvariabelen «PATH».\n" -"- Legg inn fullstendig filsti til %s i miljøvariabelen «FZ_FZSFTP»." +"- Legg inn fullstendig filsti til %s i miljøvariabelen «%s»." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s med %d bits" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:164 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - vertsnavn samsvarer ikke med sertifikat" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Brukernavn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - mellomtjener-passord" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "Avbryt tidligere tilkobling og koble til i gjeldende fane" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "&Om …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Konto:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Aktiv" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "&Legg til bokmerke …" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Legg til mappe …" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Legg i kø" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Legg til nøkkelfil …" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Legg i kø" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Juster tjenerens tidssoneforskjell:" @@ -248,95 +252,104 @@ msgid "&Always trust certificate in future sessions." msgstr "&Tillat alltid sertifikatet i fremtidige økter." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "&Godta alltid denne tjeneren (legg til denne nøkkelen i hurtiglager)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Bruk alltid standard redigeringsprogram" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Bruk alltid dette valget for filer uten tilordnet program" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Bruk alltid denne handlinga" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" -msgstr "&Be operativsystemet om å oppgi ekstern adresse" +msgstr "&Be operativsystemet om å oppgi ekstern IP-adresse" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Automatisk" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Oppdag automatisk" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Bakgrunnsfarge:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Binær" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Binærprefiks med SI-symboler (f.eks. 1 KB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "&Bokmerker" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Bla gjennom …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Burst-toleranse:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Avbryt" #: ../../locales/../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." -msgstr "&Tøm private data …" +msgstr "&Tøm personlige data …" #: ../../locales/../src/interface/resources/xrc/update.xrc:28 msgid "&Close" msgstr "&Lukk" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&Avslutt FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Avslutt FileZilla én gang" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:657 msgid "&Configure speed limits..." -msgstr "&Sett opp fartsbegrensninger …" +msgstr "&Sett opp fartsgrenser …" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "&Sett opp …" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Koble til" @@ -344,152 +357,148 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Kopier gjeldende tilkobling til Tjeneroppsett …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "&Kopier til utklippstavle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Ny mappe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:637 msgid "&Create new tab" msgstr "&Ny fane" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Feilsøking" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "&Feilsøkingsinfo i meldingslogg:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "Stan&dard redigeringsprogram:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "&Standardhandling når filer finnes allerede …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Forsinkelse mellom mislykkede innloggingsforsøk:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Slett" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Slett symbolsk lenke" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "&Mappetillatelser …" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "&Mappesammenlikning" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Slå av synkronisert filbehandling og fortsett med å bytte ekstern mappe" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Slå av synkronisert filbehandling og fortsett med å bytte ekstern mappe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" -msgstr "&Forkast gjeldende lokal fil, last ned og rediger den på nytt" +msgstr "&Forkast gjeldende lokal fil, og last ned og rediger den på nytt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "Koble &fra" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Koble fra tjener" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Vis gjeldende (i stedet for gjennomsnittlig) hastighet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Vis størrelser i byte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "&Ikke husk passord (anbefales)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Ikke vis denne dialogen igjen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "&Ikke bruk ekstern IP-adresse på lokalt nettverk." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "&Ved dobbeltklikk på filer:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Last ned" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Last ned til:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Last ned …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Nedlastinger:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Rediger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "&Rediger filterregler …" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:653 msgid "&Enable" msgstr "&Slå på" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Slå på komprimering" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" -msgstr "&Bruk hastighetsgrenser" +msgstr "&Bruk fartsgrenser" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Koding:" @@ -497,28 +506,28 @@ msgid "&Encryption:" msgstr "&Kryptering:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "&Skriv inn kommando …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" -msgstr "&Opprett tilkobling i ny fane" +msgstr "&Koble til i ny fane" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Kjør" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" -msgstr "&Eksporter oppføringer fra tjeneroppsett" +msgstr "&Eksporter elementer fra tjeneroppsett" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Eksporter …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Fall tilbake på aktiv modus" @@ -526,35 +535,45 @@ msgid "&File" msgstr "&Fil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "&Filattributter …" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "&Filtillatelser …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Fil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Filtervalg:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Filtersett:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtre" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Filtre:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "Avslutt redigering og slett lokal &fil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "&Flat ut lokale stier, og last opp alle filer direkte til målmappe" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -562,54 +581,54 @@ "&Bruk flat struktur på eksterne filstier, og last ned alle filer direkte til " "målmappe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "&Følg symbolske lenker, og slett innholdet i målmappa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Hent ekstern IP-adresse fra følgende nettside:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Få hjelp …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Globalt bokmerke" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 med CONNECT-metoden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&Hjelp" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Skjul identiske filer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&Høyeste" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Høyeste tilgjengelig port:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Vert:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC binær-prefiks (f.eks. 1 KiB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (f.eks. 2007-09-15)" @@ -617,88 +636,96 @@ msgid "&Import..." msgstr "&Importer …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "Bruk systemets tilordnede f&iltyper" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Installer ny versjon" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Hold lokal mappestruktur relativ til søkerot" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" -msgstr "&Hold ekstern mappestruktur relativ til søkeroten" +msgstr "&Hold ekstern mappestruktur relativ til søkerot" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "&Nøkkelfil:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Utseende for fil- og mappevinduer:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Begrens lokale FileZilla-porter" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Begrens antall samtidige tilkoblinger" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "&Lokalt mappetre" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Lokal mappe:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Lokalt søk" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Lagre logg i fil" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "&Innloggingstype:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "&Innloggingstype" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Laveste" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "&Behandle bokmerker …" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "&Manuell overføring …" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Maksimalt antall tilkoblinger:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Maksimalt antall forsøk:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "&Meldingslogg" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Minimer til systemkurv" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "&Sorteringsmodus for navn:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Navn:" @@ -706,7 +733,7 @@ msgid "&Network configuration wizard..." msgstr "&Veiviser for nettverksoppsett …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Ny" @@ -714,7 +741,7 @@ msgid "&New Site" msgstr "&Ny tjener" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1765 msgid "&New version available!" msgstr "&Ny versjon tilgjengelig!" @@ -722,154 +749,165 @@ msgid "&Next >" msgstr "&Neste >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Nei" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "I&ngen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Normal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Numerisk verdi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&ÅPNE" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Åpne med filutforsker" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "S&kriv over" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Passiv" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Passord" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "Avs&pill lyd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Port:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Behold tidsstempel på overførte filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Kø" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" -msgstr "&Hurtigtilkobling" +msgstr "H&urtigtilkobling" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "&Hurtigtilkoblingslinje" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "&Hurtigtilkoblingslogg" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Les" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "&Koble til på nytt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "&Koble til på nytt-info" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:648 msgid "&Refresh" msgstr "&Oppdater" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 -msgid "&Remember password until FileZilla is closed" -msgstr "&Husk passordet frem til FileZilla lukkes" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Husk hovedpassord frem til FileZilla lukkes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "&Husk passord" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 +msgid "&Remember password until FileZilla is closed" +msgstr "&Husk passord frem til FileZilla lukkes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Ekstern mappe:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "Ekstern sti:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Eksternt søk" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Fjern" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Fjern nøkkel" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" -msgstr "Fjern &valgte" +msgstr "Fjern &valgt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Gi nytt navn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Gi nytt navn …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "Åpne lokal fil &på ny" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Erstatt ugyldige tegn med:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." -msgstr "&Rapporter en feil …" +msgstr "&Rapporter programfeil …" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Be om oppmerksomhet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "&Nullstill og legg alle tilbake i kø" @@ -877,60 +915,60 @@ msgid "&Restart Wizard" msgstr "&Start veiviser på ny" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Fortsett (resume)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "Kjø&r kommando …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Kjør oppsettsveiviser nå …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Se etter oppdateringer nå …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&TJENER" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "Lagre &som …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Søk" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Søk etter eksterne filer …" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 msgid "&Select Entry:" -msgstr "&Velg oppføring:" +msgstr "&Velg element:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Velg språk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" -msgstr "&Velg kolonnene som skal vises:" +msgstr "&Velg kolonner som skal vises:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Tjener" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Innstillinger" @@ -938,182 +976,192 @@ msgid "&Settings..." msgstr "&Innstillinger …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Vis feilsøkingsmeny" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "&Vis detaljert logg" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "Vi&s melding" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Vis tidsstempel i meldingslogg" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" -msgstr "&Oppføringer i Tjeneroppsett" +msgstr "&Elementer i Tjeneroppsett" #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Tjeneroppsett …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "&Tjenerspesifikt bokmerke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Hopp over" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" -msgstr "&Hastighetsgrenser" +msgstr "&Fartsgrenser" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "&Start overføring umiddelbart" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Omvendt plassering av lokal- og tjenervindu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "&TLS-krypteringsmetoder" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Test" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Tema" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Overfør" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "&Overføringsmodus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "&Overføringskø" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "&Behandle punktum-filer som ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Tilbakestill" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Oppdater den lagrede nøkkelen for denne verten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Last opp" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Last opp til:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Last opp …" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Opplastinger:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Bruk selvvalgt program" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Bruk synkronisert filutforsking" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Bruk systemets standardprogram for redigering av tekstfiler" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Bruk følgende IP-adresse:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Bruk tjenerens eksterne IP-adresse" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "Br&uk skilletegn for tusen-tall" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Bruker:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Brukernavn:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1759 #, c-format msgid "&Version %s" msgstr "&Versjon %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Vis" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Vis/Rediger" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Spor endring av lokale filer, og spør om endrede filer skal lastes opp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Se etter denne typen oppdateringer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Skriv" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Ja" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "«%s» finnes ikke, eller du mangler tilgang til den." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "«%s» er ikke en mappe." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "Protokollen «%s» støttes ikke." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 msgid "'Account' logontype not supported by selected protocol" msgstr "Innloggingstype «Konto» støttes ikke av valgt protokoll" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1121,7 +1169,7 @@ "Innloggingstypene «Normal» og «Konto» er ikke tilgjengelig. Bruker derfor " "«Be om passord» i stedet." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1129,68 +1177,68 @@ "Innloggingstypene «Normal» og «Konto» er ikke tilgjengelig. Innstillinga er " "derfor endret til «Be om passord»." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:642 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " "command without the leading 'quote'." msgstr "" -"«quote» er vanligvis en lokal kommando som brukes av kommandolinjeklienter " -"for å sende argumenter til tjeneren. Du skriver sannsynligvis inn rene " +"«quote» er vanligvis en lokal kommando som brukes av kommandolinje-klienter " +"for å sende argumenter til tjenere. Du skriver sannsynligvis inn rene " "kommandoer uten «quote»." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objekt filtrert)" msgstr[1] "(%d objekter filtrert)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% lastet ned)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 for ingen grense)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 sekunder)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 for å slå av)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat er stilt til %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(f.eks. %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(f.eks. %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(på %s/s)" @@ -1199,9 +1247,9 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" -msgstr "--:--:-- igjen" +msgstr "--:--:-- gjenstår" #: ../../locales/../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." @@ -1209,7 +1257,7 @@ #: ../../locales/../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." -msgstr "-I kan kun brukes sammen med en FTP-nettadresse." +msgstr "«-l» kan bare brukes sammen med en FTP-nettadresse." #: ../../locales/../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." @@ -1219,31 +1267,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "«-s» kan ikke brukes sammen med en FTP-nettadresse." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Ingen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Advarsel" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Informasjon" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Detaljert" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32-bit-system" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Feilsøking" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64-bit-system" @@ -1251,24 +1299,28 @@ msgid "< &Back" msgstr "< &Tilbake" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Det finnes allerede et bokmerke med dette navnet. Skriv inn et navn som ikke " "er i bruk." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Et sertifikat i kjeden ble signert med usiiker algoritme" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Du må velge standard redigeringsprogram." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:164 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Du kan ikke dra en mappe inn i en av dens egne undermapper." @@ -1282,22 +1334,22 @@ "tilfeller må du bruke aktiv modus, som betyr at FileZilla må åpne en port " "lokalt og be tjeneren om å koble seg til denne." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "En tidligere åpnet fil er blitt endret." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." -msgstr "En fil med dette navnet overføres allerede." +msgstr "En fil med dette navnet er allerede under overføring." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "En fil med dette navnet er under redigering. Lukk fila i " "redigeringsprogrammet og prøv igjen." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:595 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1307,51 +1359,59 @@ msgstr "" "Klarte ikke å dekode et lokalt filnavn.\n" "Kontroller at miljøvariablene LC_CTYPE (eller LC_ALL) har korrekte verdier.\n" -"Hvis du ikke fikser problemet, kan enkelte filer mangle i fillista.\n" +"Hvis du ikke retter opp dette, kan enkelte filer mangle i fillista.\n" "Du får ingen flere advarsler om dette i denne programøkta." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Hvis du mister hovedpassordet, kan det ikke gjenopprettes. Pass på at du " +"virkelig husker passordet." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Det har kommet en ny versjon av FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." msgstr "" -"En ordentlig oppsatt tjener viser alltid alle filer, men noen tjenere " -"gjemmer filer fra brukeren. Bruk denne innstillingen for å tvinge tjeneren " -"til å vise alle filer." +"En korrekt oppsatt tjener viser alltid alle filer, men noen tjenere skjuler " +"filer fra brukeren. Bruk dette valget for å tvinge tjeneren til å vise alle " +"filer." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." msgstr "" -"En korrekt oppsatt tjener skal ikke kreve dette. Ta kontakt med " -"administrator for tjenermaskinen hvis valget likevel viser seg nødvendig." +"En korrekt oppsatt tjener skal ikke kreve dette valget. Ta kontakt med " +"administrator for tjenermaskinen hvis det viser seg å være nødvendig likevel." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" msgstr "" -"En ekstern operasjon er under behandling, og synkronisert filutforsking er " -"slått på.\n" +"En ekstern handling pågår, og synkronisert filutforsking er slått på.\n" "Vil du slå av synkronisert filutforsking og fortsette med å bytte lokal " "mappe?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "&Legg til" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "&Tillat gjenopptakelse (resume) av ASCII-filer" @@ -1363,51 +1423,53 @@ msgid "A&pply only to uploads" msgstr "&Bruk bare på opplastinger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" -msgstr "&Gjør gjeldende for alle filer og mapper" +msgstr "&Bruk på alle filer og mapper" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "&Fjern fullførte overføringer automatisk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Om FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" -msgstr "Over fillista" +msgstr "Over fillister" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:114 +msgid "Access to some local directories could not be restored:" +msgstr "Klarte ikke å gjenopprette tilgang til lokale mapper:" + +#: ../../locales/../src/engine/server.cpp:581 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Konto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" -msgstr "Handling etter &utførelse av kø" +msgstr "Handling når køen er &ferdig" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Handling for valgt fil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Handling som skal utføres:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Handling:" @@ -1415,7 +1477,7 @@ msgid "Active mode" msgstr "Aktiv modus" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1423,7 +1485,7 @@ "Test av aktiv FTP-modus mislyktes. FileZilla vet ikke hva som er korrekt " "ekstern IP-adresse." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1431,7 +1493,7 @@ "Test av aktiv FTP-modus mislyktes. FileZilla vet ikke hva som er korrekt " "ekstern IP-adresse. I tillegg har en ruter endret adressen som ble sendt." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1440,38 +1502,39 @@ "Test av aktiv FTP-modus mislyktes. FileZilla vet hva som er korrekt ekstern " "IP-adresse, men en ruter eller brannmur har endret adressen som ble sendt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP for aktiv modus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "&Bare legg filer i kø" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Legg valgt mappe i overføringskø" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Legg valgte filer og mapper i overføringskø" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Legg i kø" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Adressetypen støttes ikke" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Avansert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1479,186 +1542,190 @@ "expected and might even damage your system. Use beta versions and nightly " "builds at your own risk." msgstr "" -"Råd: Bruk alltid stabile versjoner av programmet, med mindre du vil teste " +"Råd: Bruk alltid stabile versjoner av programmet, med mindre du vil prøve ut " "nye funksjoner. Beta- og dagsversjoner («nightly builds») er tilgjengelig " "til testformål. Dagsversjoner av FileZilla virker ofte ikke som forventet, " "og kan skade systemet. Beta- og dagsversjoner brukes derfor på egen risiko." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" -msgstr "&Bruk alltid denne handlinga" +msgstr "&Gjør alltid dette" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritme:" -#: ../../locales/../src/interface/QueueView.cpp:2937 +#: ../../locales/../src/interface/QueueView.cpp:2652 msgid "All files have been successfully transferred" msgstr "Alle filer ble overført uten problemer" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 msgid "All ports in the given range have to be between 1024 and 65535." -msgstr "Alle porter i rekken må være mellom 1024 og 65535." +msgstr "Alle porter i rekkevidda må være mellom 1024 og 65535." -#: ../../locales/../src/interface/QueueView.cpp:2933 +#: ../../locales/../src/interface/QueueView.cpp:2648 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." -msgstr[0] "Alle overføringer er fullført. %d fil ble ikke overført." -msgstr[1] "Alle overføringer er fullført. %d filer ble ikke overført." +msgstr[0] "Overføring er fullført. %d fil ble ikke overført." +msgstr[1] "Overføring er fullført. %d filer ble ikke overført." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" -msgstr "Tillat &tilbakefall til alternativ overføringsmodus ved feil" +msgstr "Tillat &tilbakefall til annen overføringsmodus ved feil" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" -msgstr "Tillat tilbakefall til alternativt overføringsmodus ved feil" +msgstr "Tillat tilbakefall til annen overføringsmodus ved feil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" -msgstr "Allerede tilkoblet" +msgstr "Allerede koblet til" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternativt navn:" msgstr[1] "Alternative navn:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." msgstr "" -"Du kan også bruke Pageant fra PuTTY for å administrere nøkler. FileZilla " +"Du kan også bruke Pageant fra PuTTY til å administrere nøkler. FileZilla " "fungerer med Pageant." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." msgstr "" -"Alternativt kan du bruke operativsystemets SSH-klient. Sjekk i så fall at " -"SSH_AUTH_SOCK-miljøvariabelen har en verdi før du fortsetter." +"Du kan også bruke operativsystemets SSH-klient. Sjekk i så fall at " +"miljøvariabelen «SSH_AUTH_SOCK» har en verdi før du fortsetter." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "Du kan også laste ned siste versjon fra FileZilla-nettstedet:" -#: ../../locales/../src/interface/QueueView.cpp:1902 +#: ../../locales/../src/interface/QueueView.cpp:1656 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" "Some queue items might not have been restored." msgstr "" "Det oppstod en feil under innlasting av overføringskø fra «%s».\n" -"Enkelte oppføringer ble kanskje ikke gjenopprettet." +"Enkelte elementer ble kanskje ikke gjenopprettet." -#: ../../locales/../src/interface/QueueView.cpp:1812 +#: ../../locales/../src/interface/QueueView.cpp:1549 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" "Some queue items might not have been saved." msgstr "" "Det oppstod en feil under lagring av overføringskø til «%s».\n" -"Enkelte oppføringer ble kanskje ikke lagret." +"Enkelte elementer ble kanskje ikke lagret." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "En utsteder i sertifikatkjeden mangler utsteder-autoritet" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Det finnes allerede en fil med samme navn som den du prøver å flytte." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:606 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1709 msgid "Anonymous" msgstr "Anonym" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" -"En annen ekstern operasjon er allerede under behandling. Du kan derfor ikke " -"gå til en annen mappe nå." +"Det pågår allerede en annen ekstern handling. Du må vente til denne er " +"ferdig før du kan bytte mappe." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:845 msgid "Any changes made in the Site Manager could not be saved." msgstr "Eventuelle endringer i Tjeneroppsett ble ikke lagret." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." -msgstr "Eventuelle endringer i filtrene ble ikke lagret." +msgstr "Eventuelle filterendringer ble ikke lagret." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." -msgstr "Eventuelle endringer gjort på filtrene blir ikke lagret." +msgstr "Eventuelle filterendringer blir ikke lagret." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" -msgstr "Bruk kun på &mapper" +msgstr "Bare bruk på &mapper" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" -msgstr "Lagre" +msgstr "Bruk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Bare bruk på gjeldende kø" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" -msgstr "Bruk kun på &filer" +msgstr "Bare bruk på &filer" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Arkiv" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" -msgstr "Mellomlageret for argumenter er fullt" +msgstr "Argument-mellomlageret er fullt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Som en fane ved overføringskøen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Spør hva som skal gjøres" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:572 +#: ../../locales/../src/engine/server.cpp:598 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Be om passord" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." -msgstr "Spør operativsystemet etter port." +msgstr "Be operativsystemet om en port." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" -msgstr "Spør operativsystemet etter ekstern IP-adresse" +msgstr "Be operativsystem om ekstern IP-adresse" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" -msgstr "Stille spørsmål på FileZilla-forumet" +msgstr "Still spørsmål på FileZilla-forumet" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 msgid "Associated program not found:" -msgstr "Finner ikke tilordnet program" +msgstr "Fant ikke tilordnet program:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Minst ett av filtrene inneholder feil" @@ -1666,209 +1733,232 @@ msgid "At this point, all required information has been gathered." msgstr "All nødvendig informasjon skal nå være innhentet." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Attributt" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:221 msgid "Authentication failed." msgstr "Autentisering mislyktes." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Forfatter:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Automatisk" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Automatisk filtype-klassifisering" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Tilgjengelige størrelser" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "&Hopp over mellomtjener" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Ugyldig fildeskriptor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Grunnleggende brukerveiledning" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Oppførsel" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Redigeres" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" -msgstr "Obs! Sertifikatet har blitt tilbaketrukket" +msgstr "Obs! Sertifikatet er tilbakekalt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binær" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Tavleoppsett" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Blå" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:390 msgid "Bookmark" msgstr "Bokmerke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Bokmerke:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Bokmerker" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Bla gjennom …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:150 +#: ../../locales/../src/engine/storj/resolve.cpp:218 +#: ../../locales/../src/engine/storj/resolve.cpp:291 +msgid "Bucket not found" +msgstr "Fant ikke bøtte" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Byggedato:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" -msgstr "Byggeinformasjon" +msgstr "Bygginfo" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Business category:" msgstr "Firmakategori:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " "please enter the port range below." msgstr "" "Som standard brukes alle tilgjengelige porter for tilkobling i aktiv modus. " -"Hvis du vil begrense hvilke porter FileZilla skal bruke, kan du angi " -"rekkevidde under." +"Skriv inn en rekkevidde nedenfor for å begrense hvilke porter FileZilla kan " +"bruke." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "&Avbryt gjeldende handling" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "&Fjern alt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "&Kopier nettadresse(r) til utklippstavle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "K&opier nettadresse(r) med passord til utklippstavle" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "&Selvvalgt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "&Selvvalgte filtilordninger:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "CPU-funksjoner:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." -msgstr "Beregn tidsforskjell mellom klient og tjener …" +msgstr "Beregner tidsforskjell mellom klient og tjener …" -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Klarte ikke å lese fra fil" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Klarte ikke å skrive data til fil." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Klarte ikke å skrive data til fil: %s" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Avbryt" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Avbryt gjeldende handling" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Avbryt gjeldende handling" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Fikk ikke tilgang til «%s». Kontroller at mediet er satt inn, og at enheten " "ikke er i bruk." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:613 msgid "Cannot add server to Site Manager" -msgstr "Klarte ikke å legge til tjeneren i tjeneroppsettet" +msgstr "Klarte ikke å legge til tjeneren i Tjeneroppsett" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Klarte ikke å tildele forespurt adresse" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Klarte ikke å bytte mappe. Klienten er allerede opptatt med å utføre en " +"synkronisert filhandling." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" msgstr "" -"Klarte ikke å lukke fanen mens handlinga pågikk.\n" -"Vil du avbyte gjeldende handling og lukke fanen?" +"Fanen er opptatt.\n" +"Vil du avbyte gjeldende handling og lukke den?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1880,22 +1970,22 @@ msgid "Cannot create new filter" msgstr "Klarte ikke å legge til nytt filter" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1780 +#: ../../locales/../src/interface/search.cpp:1184 msgid "Cannot edit file" msgstr "Klarte ikke å redigere fil" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1661 msgid "Cannot edit file, not connected to any server." -msgstr "Klarte ikke å redigere fil. Du er ikke tilkoblet en tjener." +msgstr "Klarte ikke å redigere fil. Du er ikke koblet til en tjener." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "Cannot edit file, remote path unknown." -msgstr "Klarte ikke å redigere fil, fordi ekstern sti er ukjent." +msgstr "Klarte ikke å redigere fil. Ekstern sti er ukjent." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1903,82 +1993,81 @@ "Du kan ikke koble til en SFTP-tjener via vanlig FTP-protokoll. Velg riktig " "protokoll." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Klarte ikke å laste inn hurtigtilkoblingslinje fra ressursfil" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Cannot load key file" msgstr "Klarte ikke å laste inn nøkkelfil" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1079 msgid "Cannot load toolbar from resource file" msgstr "Klarte ikke å laste inn verktøylinje fra ressursfil" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Klarte ikke å lagre passord" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1261 msgid "Cannot rename entry" msgstr "Klarte ikke å gi nytt navn" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Cannot rename file" msgstr "Klarte ikke å gi fila nytt navn" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Klarte ikke å slå opp vertsnavnets IPv4-adresse for bruk med SOCKS4-" "mellomtjener." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Klarte ikke å lagre filtersett" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Klarte ikke å velge filter" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Klarte ikke å velge programtilknytning for filer." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Klarte ikke å vise dialog" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Klarte ikke å vise/redigere valgt fil" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Ikke skill mellom små og store bokstaver" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Ikke skill mellom små og store bokstaver" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Ikke skill mellom små og store bokstaver (standard)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Skill mellom små og store bokstaver" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Skill mellom små og store bokstaver (standard)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Kategorier som skal tømmes" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:514 msgid "Certificate and session data are not available yet." msgstr "Sertifikat- og øktdata er ikke tilgjengelig ennå." @@ -1990,36 +2079,40 @@ msgid "Certificate issuer" msgstr "Sertifikateier" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Bekreftelse av sertifikat-signatur mislyktes" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Utfordring (challenge):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Endre filattributter" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Endre filtillatelser." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Du må starte FileZilla på nytt for at endringer her skal tre i kraft." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:595 msgid "Character encoding issue" msgstr "Problem med tegnkoding" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Tegnsett" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Se etter oppdateringer …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Se etter FileZilla-&oppdateringer automatisk:" @@ -2027,15 +2120,15 @@ msgid "Check for Updates" msgstr "Se etter oppdateringer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Sjekk etter nye versjoner av FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Klarte ikke å se etter oppdateringer" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2043,7 +2136,7 @@ "Kontroller akkreditivene dine. Passordet du skrev inn begynner eller slutter " "med mellomrom." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2051,39 +2144,39 @@ "Kontroller akkreditivene dine. Brukernavnet du skrev inn begynner eller " "slutter med mellomrom." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" -msgstr "Sjekker etter korrekt ekstern IP-adresse" +msgstr "Ser etter korrekt ekstern IP-adresse" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." -msgstr "Se etter oppdateringer …" +msgstr "Ser etter oppdateringer …" -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:762 #, c-format msgid "Checksum match on file %s\n" msgstr "Kontrollsum samsvarer med fila %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:758 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Kontrollsum samsvarer ikke med fila %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1608 msgid "Choose a key file" msgstr "Velg en nøkkelfil" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1639 msgid "Choose the default local directory" msgstr "Velg lokal standardmappe" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2495 msgid "Choose the local directory" msgstr "Velg lokal mappe" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:437 msgid "Chunk data improperly terminated" msgstr "Chunk-data ikke skikkelig terminert" @@ -2092,54 +2185,62 @@ msgstr "Krypteringsmetode:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:641 msgid "Cl&ose tab" msgstr "&Lukk fane" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Klassisk" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Tøm mellomlager for &layout" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Tøm auto&oppdateringsdata" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Tøm historikk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" -msgstr "Tøm private data" +msgstr "Tøm personlige data" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Tøm hurtigtilkoblingslinje" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Klikk Ferdig for å lagre oppsettet." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "MAC-adresse (klient til tjener):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Krypteringsmetode (klient til tjener):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Lukk" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:644 msgid "Close &all other tabs" msgstr "Lukk &alle andre faner" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Close FileZilla" msgstr "Lukk FileZilla" @@ -2147,103 +2248,108 @@ msgid "Close all running instances of FileZilla" msgstr "Lukk alle instanser av FileZilla" +#: ../../locales/../src/interface/Mainfrm.cpp:2310 +msgid "Close quick search and continue comparing?" +msgstr "Vil du lukke hurtigsøk og fortsette å sammenlikne?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Lukker gjeldende fane" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "K&ommentarer:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Kolonneegenskaper" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Kolonneinnstillinger" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Kommandoer og eventuelle argumenter må angis korrekt." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Kommando mislyktes" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Kommandoen støttes ikke" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Kommandoen støttes ikke av denne protokollen" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "Kommando:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "Kommentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Common name:" msgstr "Navn:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Kommunikasjonen ødelagt av ruteren eller brannmuren" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Sammenlikn &endringstidspunkt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Sammenlikn fil&størrelse" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Sammenlikn &terskel (i minutter):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Terskel for sammenlikning må være mellom 0 og 1440 minutter." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Kompilert for:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Kompil.system:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Kompilert med:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Kompileringsvalg:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Komprimert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Samtidige overføringer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Skill mellom små og store bokst&aver" @@ -2259,41 +2365,41 @@ msgid "Configure port range" msgstr "Velg portområde" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Oppsett av av FileZilla og nettverk" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1243 msgid "Confirm deletion" msgstr "Bekreft sletting" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1743 +#: ../../locales/../src/interface/RemoteListView.cpp:1429 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1070 +#: ../../locales/../src/interface/search.cpp:1196 msgid "Confirmation needed" msgstr "Bekreftelse kreves" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Godt jobba! Oppsettet ser ut til å fungere." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Koble til uten å bruke mellomtjener-oppsett" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Tilkobling mislyktes. %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Koble til i gjeldende fane" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Koble til i ny fane" @@ -2301,25 +2407,26 @@ msgid "Connect to specified Site Manager site" msgstr "Koble til valgt tjener fra Tjeneroppsett" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "Kobler til" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Kobler til %s via %s-mellomtjener" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:990 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Kobler til %s …" @@ -2328,185 +2435,222 @@ msgid "Connection" msgstr "Tilkobling" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Tilkobling avbrutt" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "Tilkoblingsforsøk mislyktes" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:952 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Tilkoblingsforsøk mislyktes med «%s». Prøver neste adresse." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Tilkoblingsforsøk mislyktes med «%s»." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Tilkoblingsforsøket ble avbrutt av bruker" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Tilkoblingsforsøk gikk ut på tid" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Tilkobling lukket" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1036 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 msgid "Connection closed by server" msgstr "Tilkobling ble lukket lukket av tjener" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:113 msgid "Connection established, initializing TLS..." msgstr "Tilkobling etablert. Laster inn TLS …" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:136 msgid "Connection established, sending HTTP request" msgstr "Tilkoblet. Sender HTTP-forespørsel" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "Tilkoblet. Venter på velkomstmelding." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Tilkoblet. Venter på velkomstmelding …" -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Tilkobling mistet" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Tilkoblinga tillates ikke av regelsett" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Tilkoblinga ble nektet" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Tjeneren nektet tilkobling" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Tjeneren lukket tilkobling" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Tjeneren tilbakestilte tilkobling" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:511 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Tilkoblinga gikk ut på tid etter %d sekund uten aktivitet" msgstr[1] "Tilkoblinga gikk ut på tid etter %d sekunder uten aktivitet" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Tidsavbrudd på tilkobling." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:708 msgid "Connection to server lost." msgstr "Mistet tilkoblinga til tjener." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "Tilkoblet mellomtjener. Utfører hilseprosess …" -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Tilkobling til tjeneren ble lukket for tidlig." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Tilkobling til testtjener mislyktes." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Konverter nøkkelfil" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2055 #, c-format msgid "Copy (%d) of %s" msgstr "Kopi (%d) av %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2034 #, c-format msgid "Copy of %s" msgstr "Kopi av %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Kopier valgte nettadresser for valgte elementer til utklippstavle, inkludert " +"passord." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." -msgstr "Kopier valgte objekters nettadresser til utklippstavle." +msgstr "Kopier valgte nettadresser for valgte elementer til utklippstavle." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Klarte ikke å akseptere tilkobling: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Fikk ikke tilgang til sti %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Klarte ikke å legge til sertifikat i midlertidig tillitsliste" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Klarte ikke å legge tilkoblinga i Tjeneroppsett" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Klarte ikke å fullføre handlinga" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Klarte ikke å koble til tjeneren" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1091 #, c-format msgid "Could not connect to server: %s" msgstr "Klarte ikke å koble til tjeneren: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Klarte ikke å kode kommandoer slik at tjeneren forstår dem" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Klarte ikke å konvertere privatnøkkel" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2579 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1372 msgid "Could not copy URLs" msgstr "Klarte ikke å kopiere nettadresser" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Klarte ikke å kopiere sertifikat" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Klarte ikke å kopiere data" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:161 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Klarte ikke å lage CFURL av sti %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Klarte ikke å lage nettadresse for gjeldende overføring." + +#: ../../locales/../src/interface/updater.cpp:497 #, c-format msgid "Could not create local file %s\n" msgstr "Klarte ikke å lage den lokale fila %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Klarte ikke å lage loggføringsmutex %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:170 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Klarte ikke å lage sikkert bokmerke av nettadresse:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2224 +#: ../../locales/../src/interface/RemoteTreeView.cpp:866 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2516,11 +2660,11 @@ "Skallutvidelsen er ikke installert, eller du dro ikke filene til et " "utforskervindu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Klarte ikke å opprette forbindelse med tjeneren" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:441 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2531,11 +2675,16 @@ "Du kan velge datamappe for FileZilla ved å bruke «--datadir » " "på kommandolinja, eller ved å gi miljøvariabelen «FZ_DATADIR» en verdi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Klarte ikke å lage tilpasset innloggingssekvens." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Klarte ikke å lage nøkkel" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2543,7 +2692,7 @@ "Fant ikke «distinguished name» på sertifikatutsteder. " "«gnutls_x509_get_issuer_dn» mislyktes" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2551,40 +2700,35 @@ "Fant ikke «distinguished name» på sertifikatsubjekt. «gnutls_x509_get_dn» " "mislyktes" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Klarte ikke å hente fullstendig ekstern filsti" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Fant ikke innebygget sti i CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +msgid "Could not get path from URL" +msgstr "Fant ikke sti i nettadresse" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Fikk ikke svar fra fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1184 msgid "Could not get temporary directory to download file into." msgstr "Klarte ikke å finne fram en midlertidig mappe å laste ned fila til." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Klarte ikke å importere sertifikater. «gnutls_x509_crt_import» mislyktes" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:96 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Klarte ikke å starte Winsock (%d). %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Klarte ikke å laste inn struktur for sertifikater. «gnutls_x509_crt_init» " -"mislyktes" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2595,15 +2739,21 @@ "filsystemets tillatelse til å bruke den.\n" "Endringer i Tjeneroppsett blir ikke lagret." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Klarte ikke å laste inn nøkkelfil" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Klarte ikke å laste inn privatnøkkel" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2614,7 +2764,7 @@ "Vil du slå av synkronisert filbehandling og fortsette med å endre ekstern " "mappe?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2624,7 +2774,7 @@ "Fant ikke lokal mappe som tilsvarer den eksterne mappa «%s».\n" "Synkronisert filbehandling er derfor slått av." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2634,72 +2784,93 @@ "Fant ikke ekstern mappe som tilsvarer den lokale mappa «%s».\n" "Synkronisert filbehandling har blitt slått av." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2579 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1372 msgid "Could not open clipboard" msgstr "Klarte ikke å åpne utklippstavle" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Klarte ikke å åpne loggfil: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Klarte ikke å tolke ekstern filsti." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Ugyldig tolkning av tjeneradresse:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." msgstr "Klarte ikke å lese fra datasokkel." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 #, c-format msgid "Could not read from socket: %s" msgstr "Klarte ikke å lese fra sokkel: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." -msgstr "Klarte ikke å lese tjenerobjekt." +msgstr "Klarte ikke å lese tjenerelement." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Klarte ikke å motta data fra tjeneren." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:117 +msgid "Could not restore directory access" +msgstr "Klarte ikke å gjenopprette mappetilgang" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:173 #, c-format msgid "Could not seek to offset %s within file" msgstr "Klarte ikke å søke til %s i fila" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/http/filetransfer.cpp:119 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "Klarte ikke å gå til begynnelse av fil" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Klarte ikke å søke til slutten av fila" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Klarte ikke å sende kommando til fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Klarte ikke å sende kommando til fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Klarte ikke å sortere likemann-sertifikater" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:201 msgid "Could not spawn IO thread" msgstr "Klarte ikke å frembringe IO-tråd" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Klarte ikke å starte hilseprosess med mellomtjener: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "Klarte ikke å starte overføring" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:866 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2708,17 +2879,17 @@ "Klarte ikke å lagre «%s». Eventuelle endringer i Tjeneroppsett ble ikke " "lagret. %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Klarte ikke å lagre «%s». Bokmerket er ikke lagt til: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Klarte ikke å lagre «%s». Globale bokmerker ble ikke lagret: %s" -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1580 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2727,119 +2898,121 @@ "Klarte ikke å lagre «%s». Køen er ikke lagret.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2473 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Klarte ikke å lagre «%s». Valgte tjenere er ikke eksportert: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 #, c-format msgid "Could not write \"%s\":" msgstr "Klarte ikke å lagre «%s»." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Klarte ikke å lagre nøkkelfil. %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "Klarte ikke å skrive til lokal fil" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Klarte ikke å skrive til loggfil: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:913 +#: ../../locales/../src/engine/ControlSocket.cpp:1008 +#: ../../locales/../src/engine/http/request.cpp:113 #, c-format msgid "Could not write to socket: %s" msgstr "Klarte ikke å skrive til sokkel: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Country:" msgstr "Land:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "La&g ny fil" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "Lag manglende lokal &mappe, og gå inn i den" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "Lag manglende ekstern &mappe, og gå inn i den" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Lag en ny undermappe i gjeldende mappe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Lag en ny undermappe i gjeldende mappe, og gå inn i den" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Lag en tom fil i gjeldende mappe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "Lag map&pe, og gå inn i den" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:944 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1252 msgid "Create directory" msgstr "Ny mappe" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2668 msgid "Create empty file" msgstr "Lag tom fil" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "Oppretter mappe" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Oppretter mappa «%s» …" -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Kritisk feil" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Kritisk feil:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Krisik filoverføringsfeil" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kritisk filoverføringsfeil etter overføring av %s i løpet av %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2849,97 +3022,102 @@ "(%s).\n" "Synkronisert filbehandling er derfor slått av." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Gjeldende overføringstype er ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Gjeldende overføringstype er satt opp til å oppdages automatisk." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Gjeldende overføringstype er binær." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Kurve:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Selvvalg&t" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Selvvalgt filtersett" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Selvvalgt tjener" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Cyan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "D&atatype" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "&Desimalprefikser bruker SI-symboler (f.eks. 1 KB = 1000 byte)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "&Standard" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "&Slett" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "Sammenl&ikning av mapper" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Slå &av alle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "&Ikke lagre passord" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Ved d&obbeltklikk på mapper:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "D&uplikat" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:52 msgid "DOS-like with virtual paths" msgstr "DOS-lignende virtuelle stier" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Farlig filtype" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "Data" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Datasokkel ble lukket for tidlig." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Dato" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Dato formatering" @@ -2955,15 +3133,15 @@ msgid "Debug" msgstr "Feilsøking" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Feilsøkingsoppsett" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Standard&mappe:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:44 msgid "Default (Autodetect)" msgstr "Standard (Automatisk)" @@ -2971,17 +3149,17 @@ msgid "Default editor not properly quoted." msgstr "Standard redigeringsprogram har ikke korrekte hermetegn («\"»)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Standardhandling når filer finnes allerede" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Standard tjenermappe:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2989,7 +3167,7 @@ "Klarte ikke å tolke ekstern standard-filsti. Kontroller at stien er en " "gyldig absolutt filsti for valgt tjenertype." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Standard systemspråk" @@ -2997,12 +3175,12 @@ msgid "Default transfer mode:" msgstr "Standard overføringstype:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Standard overføringstype:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Standard: http://ip.filezilla-project.org/ip.php" @@ -3013,7 +3191,7 @@ "Forsinkelsen mellom mislykkede tilkoblingsforsøk må være mellom 1 og 999 " "sekunder." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3028,75 +3206,85 @@ "Venter med tilkobling i %d sekunder på grunn av tidligere mislykket " "tilkoblingsforsøk …" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1294 msgid "Delete Site Manager entry" -msgstr "Fjern oppføring fra Tjeneroppsett" +msgstr "Fjern element fra Tjeneroppsett" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Slett valgt mappe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Slett valgte filer og mapper" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Sletter «%s»" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Sletter %u filer fra «%s»" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Sletter symbolsk lenke" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Skrivebord" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Detaljer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Detaljer for ny nøkkel:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:790 msgid "Detected newer version of FileZilla" msgstr "Fant nyere versjon av FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "&Mapper" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Direction" msgstr "Retning" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Mapper:" + +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "Mappe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Mappetillatelser" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Sammenlikning av mapper" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Sammenlikning av mapper mislyktes." @@ -3104,124 +3292,123 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "Mappa som inneholder loggfil finnes ikke, eller filnavnet er ugyldig." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "Filtre for mappevisning …" + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Mappelisting avbrutt av bruker" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2056 msgid "Directory listing failed" msgstr "Mappevisning mislyktes." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Filtre for mappevisning" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Mappevisning av «%s» vellykket" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Mappevisning fullført" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Slå &av alle" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Slå av synkronisert filbehandling og fortsette med å bytte ekstern mappe?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:715 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" "Slå av denne innstillinga igjen hvis du ikke kan se filene dine lengre." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Koble fra tjener" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:914 +#: ../../locales/../src/engine/ControlSocket.cpp:1010 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:114 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" msgstr "Koblet fra tjener" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1039 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:189 #, c-format msgid "Disconnected from server: %s" msgstr "Koblet fra tjener: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Kobler fra forrige tjener" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Koble fra gjeldende tjener" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Vis om-dialogen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "Ikke &bruk standard redigeringsprogram" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Gjør &ingenting" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Gjør det samme med &alle valgte filer som allerede er under redigering" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1235 +#: ../../locales/../src/interface/Mainfrm.cpp:1257 msgid "Do you really want to close FileZilla?" msgstr "Er du sikker på at du vil lukke FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Er du sikker på at du vil fjerne alle tjenere fra tjeneroppsettet og tømme " "overføringskøen?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" -msgstr "Er du sikker på at du vil fjerne alle oppføringer fra tjeneroppsettet?" +msgstr "Er du sikker på at du vil fjerne alle elementer fra tjeneroppsettet?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296 msgid "Do you really want to delete selected entry?" msgstr "Er du sikker på at du vil fjerne valgt tjener?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Er du sikker på at du vil tømme overføringskøen?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:643 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Er du sikker på at du vil sende «%s» til tjeneren?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Vil du åpne denne fila på nytt?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Dokumentasjon" @@ -3229,48 +3416,48 @@ msgid "Don't use external IP address on &local connections." msgstr "Ikke bruk ekstern IP-adresse på &lokale tilkoblinger." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Punktum-filer har filnavn som starter med punktum, som f.eks. .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Handling ved dobbeltklikk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Last ned" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Ned&lastingsgrense:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:597 #, c-format msgid "Download limit: %s/s" msgstr "Nedlastingsgrense: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:600 msgid "Download limit: none" msgstr "Nedlastingsgrense: ingen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:904 +#: ../../locales/../src/interface/search.cpp:909 msgid "Download search results" msgstr "Last ned søkeresultater" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Last ned valgt mappe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Last ned valgte filer og mapper" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1051 #, c-format msgid "" "Download speed: %s/s\n" @@ -3279,24 +3466,24 @@ "Nedlastingsfart: %s/s\n" "Opplastingsfart: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Laster ned" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:148 #, c-format msgid "Downloading %s" msgstr "Laster ned %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Laster ned oppdatering …" -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:90 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:112 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3304,11 +3491,11 @@ "Dra-og-slipp mellom forskjellige instanser av FileZilla er ikke implementert " "ennå." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:103 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:117 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Dra-og-slipp mellom forskjellige tilkoblinger er ikke implementert ennå." @@ -3317,16 +3504,16 @@ msgid "Dupl&icate" msgstr "Dupl&iser" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "&Slå på alle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "&Gå inn i mappe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "&Kjør" @@ -3334,48 +3521,48 @@ msgid "E&xit" msgstr "&Avslutt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." msgstr "&Eksporter …" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "E-Mail:" msgstr "E-post:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Hvert filter trenger minst én betingelse." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Rediger filtre" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Rediger fila med valgt redigeringsprogram, og last opp endringene til tjener." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1172 msgid "Editing directories is not supported" msgstr "Redigering av mapper støttes ikke" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1661 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "Editing failed" msgstr "Redigering mislyktes" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1172 msgid "Editing search results" msgstr "Redigerer søkeresultater" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Epost:" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Empty command" msgstr "Tom kommando" @@ -3383,7 +3570,7 @@ msgid "Empty command." msgstr "Tom kommando" -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2058 msgid "Empty directory listing" msgstr "Tom mappeliste" @@ -3395,13 +3582,13 @@ msgid "Empty file extension." msgstr "Fil-endelse mangler." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Tomme filternavn er ikke tillatt." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Tomt navn" @@ -3409,81 +3596,97 @@ msgid "Empty quoted string." msgstr "Tom mappeliste." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "S&lå på alle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Slå på &filtrering av ugyldige tegn" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Kryptert" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Kryptering" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Krypteringsnøkkel:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Krypteringsnøkkel:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Krypteringsdetaljer" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "Vil du avslutte sammenlikning og endre sorteringsrekkefølge?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Vil du avslutte sammenlikning og åpne hurtigsøk?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "&Skriv inn kommando …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Skriv inn 0 for ubegrenset hastighet." -#: ../../locales/../src/interface/QueueView.cpp:2103 +#: ../../locales/../src/interface/QueueView.cpp:1867 msgid "Enter command" msgstr "Angi kommando" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:625 msgid "Enter custom command" msgstr "Skriv inn kommando" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Skriv inn mappe" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Angi filternavn" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Skriv inn hovedpassord" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Skriv inn et navn for filtersettet." -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Skriv inn nytt navn for filtersett" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Angi passord" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Skriv inn valgt mappe" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3494,8 +3697,8 @@ "Skriv inn adresse til tjenermaskin.\n" "Valg av protokoll må komme før tjeneradressen. Hvis du ikke velger " "protokoll, brukes standardprotokollen «ftp://».\n" -"Du kan også bruke fullstendige nettadresser i form av protokoll://brukernavn:" -"passord@tjeneradresse:port . Verdier i andre felt blir i så fall overstyrt.\n" +"Du kan også bruke fullstendige nettadresser i form av protokoll://bruker:" +"passord@tjener:port . Verdier i andre felt blir i så fall overstyrt.\n" "\n" "Følgende protokoller støttes:\n" "- ftp:// for vanlig FTP med valgfri kryptering\n" @@ -3503,7 +3706,7 @@ "- ftps:// for FTP via TLS (implisitt)\n" "- ftpes:// for FTP via TLS (eksplisitt)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3512,118 +3715,135 @@ "Skriv inn passordet til fila «%s».\n" "Konvertert fil blir kryptert med dette passordet." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Skriv inn porten som denne tjeneren bruker.\n" -"Standardport for FTP er 21. SFTP bruker 22." +"Skriv inn porten som denne tjeneren bruker. Standardport er 21 for FTP og 22 " +"for SFTP." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Skriv inn brukernavn" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Angi brukernavn og passord" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Feil" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Feil ved eksportering av innstillinger" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Feil ved importering" -#: ../../locales/../src/interface/QueueView.cpp:1903 +#: ../../locales/../src/interface/QueueView.cpp:1657 msgid "Error loading queue" msgstr "Feil ved lasting av kø" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1824 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:247 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:131 +#: ../../locales/../src/interface/QueueView.cpp:1561 +#: ../../locales/../src/interface/search.cpp:1304 +#: ../../locales/../src/interface/search.cpp:1323 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:783 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:846 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Feil ved innlasting av xml-fil" -#: ../../locales/../src/interface/QueueView.cpp:1813 +#: ../../locales/../src/interface/QueueView.cpp:1550 msgid "Error saving queue" msgstr "Feil ved lagring av kø" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Feil ved oppstart av program" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1581 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:867 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2474 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 msgid "Error writing xml file" msgstr "Feil ved skriving til xml-fil" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:284 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "Feil:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "F.eks.: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Eksempler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "K&jør:" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Kjørbare fil inneholder ingen versjonsinformasjon. Klarte derfor ikke å se " "etter oppdateringer." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Utforsker" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Eksporter &filtre:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Eksporter &kø" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Eksporter &innstillinger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Eksporter innstillinger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "F&ilternavn:" @@ -3631,28 +3851,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 msgid "FTP - File Transfer Protocol" msgstr "FTP - File Transfer Protocol" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - File Transfer Protocol med mulighet for kryptering" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Usikret File Transfer Protocol" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "FTP-motoren er ikke lastet inn. Klarte ikke å koble til" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Bevaring av FTP-tilkobling" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP-mellomtjener" @@ -3669,75 +3888,83 @@ "FTP bruker sekundære tilkoblinger for overføring av data. Slike tilkoblinger " "kan etableres på to måter." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP via eksplisitt TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:24 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP via implisitt TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:542 +#: ../../locales/../src/interface/LocalListView.cpp:615 +#: ../../locales/../src/interface/LocalListView.cpp:931 +#: ../../locales/../src/interface/LocalListView.cpp:1864 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Klarte ikke å bytte mappe" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Feil ved endring av språket" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Klarte ikke å konvertere kommando til 8-bits-tegnsett" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 msgid "Failed to copy or move sites" msgstr "Klarte ikke å kopiere eller flytte lagrede tjenere" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:330 msgid "Failed to create backup copy of xml file" msgstr "Klarte ikke å lage sikkerhetskopi av xml-fil" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Klarte ikke å lage lyttesokkel. Avbryter" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Klarte ikke å lage lyttesokkel på port %d. Avbryter." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Feil ved oppretting av listesokkel for overføring i aktiv modus" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Klarte ikke å dekryptere tjenerpassord." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Fant ikke sti til «Mine dokumenter»" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Fant ikke filsti til skrivebordet" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "Fant ikke maskinadressen for kontrolltilkobling. Tilkobling lukket." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "Fant ikke maskinadressen for datakobling. Tilkobling lukket." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Feil ved innlasting av FTP-motoren." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:120 msgid "Failed to initialize TLS." msgstr "Feil ved initialisering av TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" msgstr "Klarte ikke å starte nettverksfunksjoner." @@ -3745,111 +3972,110 @@ msgid "Failed to load panels, invalid resource files?" msgstr "Feil ved lasting av paneler, ugyldige resursfiler?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" -msgstr "Feil ved lasting av privat nøkkel: %s" +msgstr "Feil under innlasting av privatnøkkel: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Klarte ikke å åpne «%s» for tilføying/skriving" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:138 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Klarte ikke å åpne «%s» for lesing" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Klarte ikke å åpne «%s» for skriving" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Failed to parse returned path." msgstr "Klarte ikke å tolke mottatt filsti." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Klarte ikke å ta imot data" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Feil ved mottak av mappeliste" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Fant ikke ekstern IP-adresse. Avbryter" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Fant ikke ekstern IP-adresse. Avbryter." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "Fant ikke ekstern IP-adresse. Bruker lokal adresse" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Fant ikke lokal IP-adresse." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Fant ikke lokal IP-adresse. Avbryter" -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Fant ikke lokal IP-adresse. Avslutter" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Fant ikke lokal IP-adresse." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Fant ikke ekstern IP-adresse." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Klarte ikke å sende kommando." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "Feil ved endring av språk til %s (%s). Bruker standard systemspråk" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" "Feil ved endring av språk til %s (%s). Bruker standard systemspråk (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "Feil ved endring av språk til %s (%s). Bruker standard systemspråk." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Feil ved endring av språk til %s. Bruker standard systemspråk" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Feil ved endring av språk til %s. Bruker standard systemspråk (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Feil ved endring av språk til %s. Bruker standard systemspråk." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Klarte ikke å kontrollere oppsettet" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Bekreftelse av sertifikat mislyktes" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Klarte ikke å skrive til fil %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:373 msgid "Failed to write xml file" msgstr "Klarte ikke å skrive til xml-fil" @@ -3861,15 +4087,15 @@ msgid "Fall back to active mode" msgstr "Fall tilbake på aktiv modus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Fi&l:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Fil&er" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "Fil" @@ -3877,11 +4103,11 @@ msgid "File Types" msgstr "Filtyper" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Fildeskriptor er ikke en sokkel" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Fila inneholder ikke data som kan importeres." @@ -3889,7 +4115,7 @@ msgid "File editing" msgstr "Filredigering" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "File exists" msgstr "Fila eksisterer" @@ -3897,7 +4123,7 @@ msgid "File exists action" msgstr "Handling når filer finnes allerede" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Fila er endret" @@ -3905,63 +4131,67 @@ msgid "File lists" msgstr "Fillister" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:105 +#: ../../locales/../src/engine/storj/resolve.cpp:176 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:630 +#: ../../locales/../src/interface/FileZilla.cpp:720 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Fil ikke funnet" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:723 +#: ../../locales/../src/interface/search.cpp:728 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Filsøk" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Overføring avbrutt av bruker" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Filoverføring avbrutt av bruker etter overføring av %s i løpet av %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Filoverføring mislyktes" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Filoverføring mislyktes etter overføring av %s i løpet av %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Filoverføring hoppet over" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Filoverføring vellykket" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Filoverføring vellykket, overførte %s i løpet av %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1234 msgid "File transfers still in progress." msgstr "Filoverføring pågår fremdeles." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Fila ville blitt overført i form av ASCII-data." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Fila ville blitt overført i binærform." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:442 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "FileZilla-feil" @@ -3972,72 +4202,76 @@ msgstr "" "FileZilla kan nå teste oppsettet og kontrollere om alt er satt opp skikkelig." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla er allerede tilkoblet en tjener." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1541 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "FileZilla må startes på nytt for at språkendringene skal tre i kraft." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "FileZilla-oppdateringer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "Status&bar til filliste" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "Filnavn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Filnavnfiltre …" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Klarte ikke å konstruere filnavn for mappa %s og filnavnet %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Filename invalid" msgstr "Ugyldig filnavn" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 msgid "Filename unchanged" msgstr "Filnavn uendret" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Filnavn:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Filnavn kan ikke inneholde følgende tegn: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "Filnavn kan ikke inneholde følgende tegn: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Filer som er åpnet for redigering nå" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Filer som samsvarer med filterregel blir fjernet fra mappevisning." + +#: ../../locales/../src/engine/storj/resolve.cpp:313 +msgid "Files not found" +msgstr "Fant ingen filer" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:156 msgid "Filesize" msgstr "Filstørrelse" @@ -4045,64 +4279,68 @@ msgid "Filesize format" msgstr "Filstørrelser" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:157 msgid "Filetype" msgstr "Filtype" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Tilordninger for filtyper" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Bruk filter på:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Filtrer ugyldige tegn i filnavn" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Filternavnet finnes allerede" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" -msgstr "Filtrer ut objekter som samsvarer med alle følgende" +msgstr "Filtrer ut elementer som samsvarer med alle følgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" -msgstr "Filtrer ut objekter som samsvarer med hvilke som helst av følgende" +msgstr "Filtrer ut elementer som samsvarer med hvilke som helst av følgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" -msgstr "Filtrer ut objekter som ikke samsvarer med noen av følgende" +msgstr "Filtrer ut elementer som ikke samsvarer med noen av følgende" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Filtrer ut elementer som ikke samsvarer med alle følgende" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Filtersettet finnes allerede" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtrer mappelister" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Kontroll av filter mislyktes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Søk etter &filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Søk etter m&apper" @@ -4114,16 +4352,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Fingeravtrykk (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" msgstr "Fingeravtrykk:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Veiviser for oppsett av brannmur og ruter" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4135,7 +4374,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "For pålitelighet bør du angi en rekkevide på minst 10 porter." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:246 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4143,45 +4382,54 @@ "Under denne økta brukes et standardoppsett. Eventuelle endringer av " "oppsettet blir ikke lagret." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Tving &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Tving visning av &skjulte filer" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Force showing hidden files" msgstr "Tving visning av skjulte filer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Format:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "Format: Filetternavn etterfulgt av gyldig kommando og argument(er)." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:694 #, c-format msgid "Found new %s %s\n" msgstr "Fant ny %s: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Funksjon %s mislyktes" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" -msgstr "Mer dokumentasjon" +msgstr "Annen dokumentasjon" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 msgid "General" msgstr "Generell" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Generell SOCKS-tjenerfeil" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Lag …" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Generisk mellomtjener" @@ -4190,71 +4438,75 @@ msgid "Get external IP address from the following URL:" msgstr "Hent ekstern IP-adresse fra følgende nettadresse:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Få hjelp" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" -msgstr "Filtersett-navnet finnes allerede. Vil du overskrive det?" +msgstr "Filtersett-navnet finnes allerede. Vil du overskrive filtersettet?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Globale bokmerker" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS-feil %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS-feil %d i %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS-feil %d i %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS-feil %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Grønn" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Gruppetillatelser" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "H&øy" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP over TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Nøkkel:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Skjult" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:892 +#: ../../locales/../src/interface/queue.cpp:948 msgid "High" msgstr "Høy" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:894 +#: ../../locales/../src/interface/queue.cpp:950 msgid "Highest" msgstr "Høyeste" @@ -4262,56 +4514,65 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Høyeste tilgjengelig port må være et nummer mellom 1024 og 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Hold inne shift-knappen for å endre filteroppsettet på begge sider samtidig." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Nettside:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Verten er frakoblet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Vertsnøkkelens fingeravtrykk:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Vertsnøklene er ikke like" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Vertsnavnet begynner med «[», men slutter ikke på «]»." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Fikk ikke forbindelse med tjeneren" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Vertsnavn:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Vertsnøkkel-algoritme:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Timer," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Jeg &glemte hovedpassordet mitt. Slett alle passord som er lagret med denne " +"nøkkelen." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (f.eks. 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6-adresser støttes ikke med SOCKS4-mellomtjenere" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4320,7 +4581,7 @@ "Tilkoblinger lukkes og forsøkes oppsatt på nytt hvis ingen data blir sendt " "eller mottatt i løpet av valgt tid." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Legg ved logger med detaljert («verbose») loggføringsnivå hvis du " @@ -4346,13 +4607,13 @@ "Hvis tilbakefall er valgt, kan du koble til feiloppsatte tjenere som ikke " "tillater aktuell overføringsmodus." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "Kontakt administrator for tjenermaskinen hvis nøkkelbyttet er uventet." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4360,7 +4621,7 @@ "Hvis problemet vedvarer er det en ruter og/eller brannmur som fortsetter å " "blokkere FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4368,7 +4629,7 @@ "Hvis problemet vedvarer er det en ruter og/eller brannmur som fortsetter å " "avbryte tilkoblinga." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4378,7 +4639,7 @@ "legges til i slutten av filnavnet. Dette kan overskrive eldre loggfiler. En " "ny loggfil blir deretter opprettet og tatt i bruk." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4386,20 +4647,20 @@ "Hvis en symbolske lenke peker til en mappe, kan FileZilla enten slette lenka " "eller fjerne innholdet i den lenkede mappa." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" "Ta kontakt med ruter-/brannmurfabrikanten hvis dette problemet vedvarer." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Ta konakt med fabrikanten av aktuell ruter hvis problemet ikke forsvinner." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4409,7 +4670,7 @@ "synkronisert med tjenerens klokke. Hvis klokkene ikke kan synkroniseres (f." "eks. pga. ulike tidssoner), kan du kompensere for dette ii tjeneroppsettet." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4417,7 +4678,7 @@ "Hvis du sammenlikner basert på tidsstempler, vurderes to filer som like når " "evt. tidsforskjell ikke overskrider denne terskelen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "" "Du må starte FileZilla på nytt for at en eventuell endring av språk skal tre " @@ -4431,11 +4692,11 @@ "Hvis du velger test, kobler FileZilla til probe.filezilla-project.org og " "utfører noen enkle tester." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1256 msgid "If you close FileZilla, your changes will be lost." -msgstr "Dersom FileZilla lukkes, mister du endringene dine." +msgstr "Hvis du lukker FileZilla, går alle endringer tapt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4447,7 +4708,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "Hvis du får feilmeldinger, har du ikke satt opp FileZilla riktig." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4455,7 +4716,7 @@ "Hvis du har problemer med å motta mappelister eller overføre filer, kan du " "bytte standard overføringstype." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4489,22 +4750,22 @@ "Hvis du bruker en ruter, sørg for at alle disse portene blir videresendt til " "maskinen du kjører FileZilla på." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "Ta kontakt med produsenten av ruteren hvis den bytter IP-adresse ofte." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importer data fra en eldre versjon" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Importer innstillinger" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Importering vellykket" @@ -4531,7 +4792,7 @@ "bruke." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4549,19 +4810,11 @@ "en tjenerport som den kan koble seg til. Du skal ikke måtte sette opp noe " "spesielt for at dette skal fungere." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Ufullstendig kjede, toppsertifikatet er ikke en selvsignerbar " -"sertifikatsutsteders sertifikat" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "Feil passord" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4569,21 +4822,21 @@ "Klarte ikke å hente informasjon om nyeste versjon av FileZilla. Prøv igjen " "senere." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Laster inn TLS …" -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 msgid "Insecure algorithm!" msgstr "Usikker algoritme!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Tjeneren støtter ikke FTP via TLS, og regnes derfor som usikker." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:578 +#: ../../locales/../src/engine/server.cpp:602 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interaktiv" @@ -4591,29 +4844,29 @@ msgid "Interface" msgstr "Grensesnitt" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Avbrutt av signal" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:216 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "Avbrutt av bruker" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:36 +#: ../../locales/../src/engine/http/request.cpp:363 msgid "Invalid Content-Length" msgstr "Ugyldig Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:260 msgid "Invalid HTTP Response" msgstr "Ugyldig HTTP-respons" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Sendte ugyldig argument" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:454 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4621,45 +4874,64 @@ "Ugyldig tegnsekvens mottatt. Slår av UTF-8. Velg UTF-8 i tjeneroppsettet for " "å tvinge bruk av UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Invalid chunk size" msgstr "Ugyldig chunk-størrelse" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Ugyldig data mottatt" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Ugyldig dato" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Ugyldig filnavn" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Ugyldig tjeneradresse. Det er bare kolon og port som kan følge avsluttende " "firkant-parentes." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Ugyldig vertsnavn: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Ugyldig input" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:317 +msgid "Invalid line" +msgstr "Ugyldig linje" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Ugyldig filsti" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Ugyldig port angitt. Porten må være en verdi mellom 1 og 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4673,74 +4945,74 @@ "ftps:// for FTP via TLS (implisitt) og\n" "ftpes:// for FTP via TLS (eksplisitt)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Ugyldig mellomtjener-adresse. Det er bare kolon og port som kan følge " "avsluttende firkant-parantes." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Ugyldig regulært uttrykk" + +#: ../../locales/../src/interface/search.cpp:728 msgid "Invalid regular expression in search conditions." msgstr "Ugyldig regulært uttrykk i søkekriteriene." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:269 msgid "Invalid response code" msgstr "Ugyldig reponskode" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:723 #, c-format msgid "Invalid search conditions: %s" msgstr "Ugyldige søkekriterier: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Ugyldig tjenersti" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Ugylidg størrelse i betingelse" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Ugyldig brukernavn angitt." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "«ai_flags» har ugyldig verdi" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Ugyldig hintverdi" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Inverter filter" + +#: ../../locales/../src/interface/verifycertdialog.cpp:260 msgid "Jurisdiction country:" msgstr "Jurisdiksjonsland:" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Jurisdiction locality:" msgstr "Jurisdiksjonslokalitet:" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:261 msgid "Jurisdiction state or province:" msgstr "Jurisdiksjonsstat eller provins:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Ha mapper på toppen" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:714 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4751,7 +5023,7 @@ "enkelte tester for å kontrollere at tjeneren støtter denne funksjonen, kan " "testene mislykkes." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Nøkkelutbytte" @@ -4759,123 +5031,141 @@ msgid "Key exchange:" msgstr "Nøkkelutveksling:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:575 +#: ../../locales/../src/engine/server.cpp:600 msgid "Key file" msgstr "Nøkkelfil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "&Nøkkelidentitet:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "L&avest" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Språk" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1541 msgid "Language changed" msgstr "Språk endret" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:291 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:158 msgid "Last modified" msgstr "Sist endret" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Utseende" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1803 +msgid "Leave empty to keep existing password." +msgstr "La feltet stå tomt for å beholde gjeldende passord." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Grense for samtidige &nedlastinger:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Grense for samtidige o&pplastinger:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Begrense lokale porter" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Begrens størrelse på loggfil" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Grense:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:427 msgid "Line length exceeded" msgstr "Linjelengde overskredet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Lenket med" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Lyttesokkel lukket" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "Liste:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "L&avest tilgjengelig port:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Lokal" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Lokal adresse er i bruk" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Lokalt endepunkt er lukket" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Lokal fil" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Lokal fil finnes ikke." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:408 +#: ../../locales/../src/interface/updater.cpp:501 #, c-format msgid "Local file is %s\n" msgstr "Lokal fil er %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Lokale fil er en mappe, i stedet for en vanlig fil." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Lokal fil er ikke et gyldig filnavn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:686 +#: ../../locales/../src/interface/search.cpp:692 +msgid "Local file search" +msgstr "Lokalt filsøk" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Lokale filter:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Lokal stihåndtering:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Lokal maskin:" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Locality:" msgstr "Lokalitet:" @@ -4883,16 +5173,16 @@ msgid "Log file" msgstr "Loggfil" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "Logget inn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Loggføring" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4901,7 +5191,7 @@ "tjeneren støtter UTF-8. Klarte ikke å falle tilbake på lokalt tegnsett nå, " "fordi du bruker mellomtjener." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4909,9 +5199,11 @@ "Innloggingsdata inneholder ikke-ASCII tegn, og tjeneren støtter kanskje ikke " "UTF-8. Prøver lokalt tegnsett." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "Innloggings-sekvens utført men allikevel ikke innlogget. Avslutter." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "" +"Innloggingssekvens utført, men du ser ikke ut til å være logget inn likevel. " +"Avslutter." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -4928,13 +5220,13 @@ "Innloggingstype kan bare brukes sammen med FTP-nettadresser. Verdien må være " "enten «%s» eller «%s»" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:887 +#: ../../locales/../src/interface/queue.cpp:943 msgid "Low" msgstr "Lav" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:885 +#: ../../locales/../src/interface/queue.cpp:941 msgid "Lowest" msgstr "Laveste" @@ -4946,159 +5238,201 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:39 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Kontroller at fila er tilgjengelig, og at den er et korrekt formatert («well-" "formed») XML-dokument." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:414 +#: ../../locales/../src/engine/http/request.cpp:427 +#: ../../locales/../src/engine/http/request.cpp:437 +#: ../../locales/../src/engine/http/request.cpp:470 #, c-format msgid "Malformed chunk data: %s" msgstr "Feilformatert datastykke: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:36 #, c-format -msgid "Malformed header: %s" -msgstr "Feilformatert hode: %s" +msgid "Malformed request header: %s" +msgstr "Feilformatert responshode: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Feilformatert respons. Tjeneren sender ikke korrekte linjeavslutninger" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:489 +#, c-format +msgid "Malformed response body: %s" +msgstr "Feilformatert responsinnhold: %s" + +#: ../../locales/../src/engine/http/request.cpp:230 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/engine/http/request.cpp:317 +#: ../../locales/../src/engine/http/request.cpp:355 +#: ../../locales/../src/engine/http/request.cpp:363 +#: ../../locales/../src/engine/http/request.cpp:420 +#, c-format +msgid "Malformed response header: %s" +msgstr "Feilformatert responshode: %s" + +#: ../../locales/../src/engine/http/request.cpp:376 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." +msgstr "" +"Feilformatert svar: Tjener sendte responsinnhold med et verb eller en kode " +"som ikke tillater responsinnhold." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Manuell overføring" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Hoved&passord" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Hovedpassord:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Samsvarer med alle følgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Samsvarer med hvilke som helst av følgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Samsvarer ikke med noen av følgende" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Ikke samsvar med alle følgende" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Maksimalt antall samtidige &overføringer:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Minnetildelingsfeil" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1856 msgid "Message log" msgstr "Meldingslogg" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Meldingsloggens posisjon" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Meldinga er for lang" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Minutter" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Flytt &ned" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Flytt &opp" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Min Datamaskin" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Mine Dokumenter" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:769 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:772 msgid "My Sites" msgstr "Tjenere" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/a" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Navn" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1261 msgid "Name already exists" msgstr "Navnet finnes allerede" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Navn på bokmerke finnes allerede." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Navn:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Naturlig rekkefølge" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Du må skrive inn et filternavn" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:686 +msgid "Need to enter valid local path" +msgstr "Du må skrive inn en gyldig lokal sti" + +#: ../../locales/../src/interface/search.cpp:713 msgid "Need to enter valid remote path" msgstr "Du må skrive inn en gyldig ekstern filsti" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1046 msgid "Need to specify a character encoding" msgstr "Du må velge tegnkoding." -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Hverken «nodename» eller «servname» er oppgitt/kjent" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "Nettverksverten har ingen adresser i forespurt adressefamilie" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Nettverk utilgjengelig" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Aldri" @@ -5110,37 +5444,37 @@ msgid "New &tab" msgstr "Ny &fane" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nytt bok&merke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2412 msgid "New bookmark" msgstr "Nytt bokmerke" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1340 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1265 msgid "New directory" msgstr "Ny mappe" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Ny funksjonalitet og forbedringer i %s" @@ -5149,41 +5483,41 @@ msgid "New filter" msgstr "Nytt filter" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:950 msgid "New folder" msgstr "Ny mappe" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2385 msgid "New site" msgstr "Ny tjener" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Ved siden av overføringskøen" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:389 msgid "No" msgstr "Nei" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Ingen adresse er tildelt nodenavnet" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Ingen eksporteringskategori er valgt" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "No command given, aborting." -msgstr "Ingen kommando gitt, avslutter." +msgstr "Ingen kommando gitt. Avslutter." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Ingen ekstern IP-adresse satt, prøver standard." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Ingen filer blir redigert for øyeblikket" @@ -5191,95 +5525,91 @@ msgid "No filter name given" msgstr "Navn på filteret ikke angitt" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Ingen vert valgt. Skriv inn et vertsnavn." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Ingen bilder tilgjengelig" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Ingen flere filer i kø!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Navn på filtersettet ikke angitt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Ingen program er tilknyttet filtypen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "Ingen program er satt opp som redigeringprogram for filtypen «%s»." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Ingen rute å tjene" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:433 msgid "No search results" msgstr "Ingen søkeresultater" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Ingen tjenere tilgjengelig" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Ingen støttede SOCKS5-autentiseringssmetoder" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Brukernavn ikke angitt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Ingen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Ingen valgt ennå" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Ikke-korrigerbar feil i navneoppslag" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:569 +#: ../../locales/../src/engine/server.cpp:596 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "Klarte ikke å legge alle elementer tilbake i overføringskø." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Ikke tilkoblet" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2054 msgid "Not connected to any server" msgstr "Ikke tilkoblet" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:613 msgid "Not connected to any server." msgstr "Ikke tilkoblet." @@ -5287,24 +5617,33 @@ msgid "Not connected." msgstr "Ikke tilkoblet." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Ikke lastet inn. Må laste inn WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Merk at denne funksjonen bare støttes når du bruker FTP-protokollen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Merk: du kan ikke gjenopprette en nøkkel hvis du mister den." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Merk: Dette fungerer bare med enkle, ukrypterte FTP-tilkoblinger." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Merk: Du må koble til i passiv modus ved bruk av generisk mellomtjener." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/engine/http/request.cpp:420 +msgid "Null character in line" +msgstr "Nulltegn på linje" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Antall desimalplasser:" @@ -5312,40 +5651,40 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Antall forsøk må være mellom 0 og 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "Å&pne fil" - #: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "OS-versjon:" @@ -5356,15 +5695,15 @@ msgstr "" "Her setter vi opp valgt modus, samt tilbakefallsmodus hvis det er slått på." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "Once" msgstr "Én gang" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Én gang om dagen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Én gang i uka" @@ -5372,23 +5711,36 @@ msgid "Only use plain FTP (insecure)" msgstr "Bare bruk FTP (usikkert)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Åpn&e fil" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Åpne mappe i systemets filbehandler" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Åpne tjeneroppsett" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Åpne tjeneroppsett." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Åpner Tjeneroppsett. Høyre-klikk for å vise en liste over tjenere." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Åpne dialogvindu for mappetilgang for å velge hvilke lokale mapper FileZilla " +"skal ha tilgang til." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Åpne fila." @@ -5396,14 +5748,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Åpne innstillingene til FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Åpnet som:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1775 +#: ../../locales/../src/interface/LocalListView.cpp:1787 msgid "Opening failed" msgstr "Åpning mislyktes" @@ -5415,139 +5767,147 @@ msgid "Opens the Site Manager" msgstr "Åpner Tjeneroppsett" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Åpne filterdialog for mappeliste. Høyreklikk for å bytte mellom filtre." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Operativsystem:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Handlinga er allerede i gang" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Handling pågår" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Denne handlinga støttes ikke" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Valg" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Oransje" + +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Organization:" msgstr "Organisasjon:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Andre SFTP-valg" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Annen systemfeil" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Other:" msgstr "Annet:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Minnet er oppbrukt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Oversikt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Overskriv &hvis kilden er nyere" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Overskriv målfil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Overskriv målfil hvis størrelsen er ulik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Overskriv målfil hvis størrelsen er ulik eller hvis kilden er nyere" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Overskriv hvis kildefila er nyere" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Overskriv hvis størrelsen er &ulik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Overskriv hvis størrelsen er ulik eller hvis &kildefila er nyere" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:252 #, c-format msgid "Own build type: %s\n" msgstr "Egen oppbyggingstype: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Eiertillatelser" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "Eier/Gruppe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "" "Hind&re systemet i å gå i hvilemodus under overføring og andre handlinger" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Mellomtjene&r-vertsnavn:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "PORT-kommando ble ødelagt av ruter eller brannmur." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Pa&ssiv (anbefalt)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Parameter not a valid URL" msgstr "Parameteret er ikke en gyldig nettadresse" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:581 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Tolker %d byte med versjonsinformasjon.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "&Passord" @@ -5555,66 +5915,79 @@ msgid "Passive (recommended)" msgstr "Passiv modus (anbefalt)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Passiv modus" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Passiv modus har blitt satt som standard overføringstype." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Passord eller krypteringsnøkkel er ikke valgt" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Passord nødvendig" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Passord" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:155 msgid "Path" msgstr "Sti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:40 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Klarte ikke å konstruere sti for for mappa %s og undermappa %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 msgid "Path not found:" msgstr "Fant ikke sti:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Filstier" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Fjern ventende handlinger" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Tillatelse" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Ingen tilgang" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:159 msgid "Permissions" msgstr "Tillatelser" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Plattform:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Legg til lokale mapper som du vil at FileZilla skal fungere med." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5623,19 +5996,27 @@ "filezilla-project.org/probe.php . Hvis den er tilgjengelig, bør du " "kontrollere oppsettet på nytt." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:116 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Kontroller tillatelser og legg til lokale direktiver i neste dialog hvis de " +"mangler." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." msgstr "" -"Sett opp eventuelle brannmurer og/eller rutere slik at FileZilla kan sette " -"opp utgående tilkoblinger på vilkårlige porter." +"Sett opp eventuelle brannmurer og/eller rutere slik at FileZilla kan gjøre " +"utgående tilkobling via vilkårlige porter." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Slå av innstillinger som «DMZ-modus» eller «spillmodus» på ruteren." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5651,13 +6032,13 @@ msgid "Please enter a custom time format." msgstr "Skriv inn et selvvalgt tidsformat." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." -msgstr "Skriv inn en dato i formatet ÅÅÅÅ-MM-DD, som i eksempelet 2010-07-18." +msgstr "Skriv inn en dato i formatet ÅÅÅÅ-MM-DD, som f.eks.2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "Velg en nedlastingsgrense som er høyere eller lik 0 %s/s." @@ -5666,16 +6047,16 @@ msgid "Please enter a name for the new filter." msgstr "Skriv inn et navn på det nye filteret." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Skriv inn et nytt navn på det kopierte filteret." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Skriv inn et nytt navn på filtersettet «%s»" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Skriv inn et nytt navn på filteret." @@ -5702,21 +6083,10 @@ "Skriv inn et tall mellom 0 og 10 som bestemmer maksimalt antall samtidige " "overføringer." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Skriv inn et passord for denne tjeneren:" -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Velg sti og fil som skal kjøres.\n" -"F.eks. «c:\\enSti\\fil.exe» i Windows, eller «/enSti/fil» i Unix-liknende " -"systemer.\n" -"Du kan bruke argumenter her hvis du ønsker det." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5724,29 +6094,29 @@ "Velg et tidsavbrudd på mellom 10 og 9999 sekunder (bruk 0 for å slå av " "tidsavbrudd)." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Skriv inn et unikt navn på dette filtersettet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Skriv inn et brukernavn for denne tjeneren:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Skriv inn en gyldig portrekkevidde." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Skriv inn en adresse til et sted hvor ekstern adresse kan hentes fra" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Skriv inn en opplastingsgrense som er høyere eller lik 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:625 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5754,27 +6124,46 @@ "Skriv inn en ren FTP-kommando.\n" "Bruk av rene FTP-kommandoer tømmer hurtiglageret for mapper." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1867 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Skriv inn komplett sti til et program og evt. argumenter. Kommandoen blir " +"kjørt når køen er ferdigbehandlet.\n" +"F.eks. «c:\\enSti\\fil.exe» i Windows, eller «/enSti/fil» i Unix-liknende " +"systemer.\n" +"Bruk anførselstegn rundt kommandoer og argumenter som inneholder mellomrom." + +#: ../../locales/../src/interface/LocalListView.cpp:944 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1252 msgid "Please enter the name of the directory which should be created:" msgstr "Skriv inn navn på mappa som skal opprettes:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2668 msgid "Please enter the name of the file which should be created:" msgstr "Skriv inn navn på fila som skal opprettes:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Skriv inn brukernavn og passord for denne tjeneren:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "Skriv inn gjeldende hovedpassord for å endre passordinnstillinger." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Skriv inn ekstern IP-adresse" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5784,6 +6173,13 @@ "du har en dynamisk adresse eller ikke kjenner ekstern adresse til denne " "maskinen, kan du bruke adressefinneren." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Skriv inn hovedpassord for å dekryptere passordet som brukes på denne " +"tjeneren:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5791,19 +6187,19 @@ msgstr "" "Følg instruksjonene nøye. Galt oppsett fører til mislykkede FTP-tilkoblinger." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." msgstr "" -"Kontroller at FileZilla har tillatelse til å etablere utgående tilkoblinger, " -"og at du har skrevet adressen til adressefinneren riktig." +"Kontroller at FileZilla har tillatelse til å foreta utgående tilkoblinger, " +"og at du har skrevet inn rett adresse til adressefinneren." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." -msgstr "Kontroller at forespurt språk er installert på systemet." +msgstr "Kontroller at forespurt regionoppsett er installert på systemet." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5826,7 +6222,7 @@ "andre uønskede programmer. Dette kan gi en falsk alarm som du trygt kan " "overse." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:752 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5834,7 +6230,7 @@ "Bevaring av tidsstempel ved opplasting fungerer bare på FTP-, FTPS- og FTPES-" "tjenere som støtter kommandoen MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5842,20 +6238,28 @@ "Vær obs på at noen tjenere kan blokkere deg hvis du prøver å koble til for " "ofte." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " "previously." msgstr "" -"Kjør denne veiviseren på nytt hvis nettverksmiljøet endres, eller hvis du " +"Kjør denne veiviseren på nytt hvis du endrer nettverksmiljø, eller hvis du " "plutselig opplever problemer med tjenere som har fungert tidligere." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Lagre nøkkelen på et sikkert sted. Du får ikke tilgang til filer du laster " +"opp uten denne." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Velg en handling:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Velg kategoriene du vil importere." @@ -5886,7 +6290,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Velg nye attributter for valgte filer." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5900,37 +6304,37 @@ "eller liknende. Funksjoner som protokoll-inspeksjon eller protokoll-" "spesifikke «triks» må slås av" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Plassering av meldingslogg:" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Postal code:" msgstr "Postnummer:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "Tildel plass i filsystemet før nedlasting" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Forhåndstildeling" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2113 msgid "Predefined Sites" msgstr "Forhåndsdefinerte tjenere" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:751 msgid "Preserving file timestamps" -msgstr "Behold timestamp på filer" +msgstr "Behold tidsstempel på filer" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Forhåndsvisning:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Forhåndsvisning" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Sertifikatene til primær- og datatilkoblinga samsvarer ikke." @@ -5942,15 +6346,15 @@ msgid "Print version information to stdout and exit" msgstr "Skriv versjonsinformasjon til stdout og avslutt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Prioriter mapper (standard)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Priority" msgstr "Prioritet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5958,7 +6362,7 @@ "Personvernsregler: Tjeneren får vite hvilken versjon av FileZilla, hvilket " "operativsystem og hvilken prosessor-arkitektur du bruker." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Privat&nøkler:" @@ -5966,87 +6370,87 @@ msgid "Pro&tocol:" msgstr "Pro&tokoll:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Mellomtjener-passo&rd:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Behandle &kø" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Prosessfil-tabellen er for stor" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Behandlet %s i %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" -msgstr "Kommandoen støttes ikke" +msgstr "Protokoll støttes ikke" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" -msgstr "Protokollen støttes ikke på valgt sokkeltype" +msgstr "Protokoll støttes ikke på valgt sokkeltype" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Protokoll:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Mellomtjener-p&ort:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Mellomtjener-&bruker:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Autentisering ovenfor mellomtjener mislyktes" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Hilseprosess for mellomtjener mislyktes: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Mellomtjenernavnet begynner på «[», men mangler «]» i slutten." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Svar fra mellomtjener: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:520 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Mellomtjener-forespørsel mislyktes. Svar fra mellomtjener: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Etterspørsel av mellomtjener mislyktes. %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Etterspørsel av mellomtjener mislyktes. Adressetypen i CONNECT-responsen er " "ukjent" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Mellomtjener er valgt, men mellomtjeners vert eller port er ugyldig" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Autentisering med offentlig nøkkel" @@ -6054,68 +6458,77 @@ msgid "Public key algorithm:" msgstr "Algoritme for offentlig nøkkel:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Allmenne tillatelser" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2773 msgid "Queue has been fully processed" msgstr "Overføringskø er ferdigbehandlet." -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Kø: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Kø: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Kø: tom" -#: ../../locales/../src/interface/QueueView.cpp:440 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Filer i kø" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Kølegging:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Hurtigsøk:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Du kan ikke bruke hurtigsøk og sammenlikne mapper samtidig." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" msgstr "Start syst&emet på nytt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "&Eksternt mappetre" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "&Nullstill og legg tilbake valgte filer i kø" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "Raw FTP command" msgstr "Ren FTP-kommando" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "&Les" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "&Oppdater" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "&Gi nytt navn" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6123,20 +6536,20 @@ "Kjør veiviseren på nytt, kontroller innstillingene nøye, og sjekk at ruter" "(e) og/eller brannmur(er) er satt opp skikkelig." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "L&es" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Skrivebeskyttet" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/interface/Mainfrm.cpp:1116 msgid "Really cancel current operation?" msgstr "Er du sikker på at du vil avbryte gjeldende handling?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1421 +#: ../../locales/../src/interface/search.cpp:1235 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6144,21 +6557,21 @@ msgstr[0] "Er du sikker på at du vil slette %d mappe fra tjenermaskinen?" msgstr[1] "Er du sikker på at du vil slette %d mapper fra tjenermaskinen?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:1232 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Er du sikker på at du vil slette %d fil fra tjeneren?" msgstr[1] "Er du sikker på at du vil slette %d filer fra tjeneren?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1426 +#: ../../locales/../src/interface/search.cpp:1240 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Er du sikker på at du vil slette %s og %s fra tjeneren?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1070 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Er du sikker på at du vil slette alle markerte filer og/eller mapper fra " @@ -6170,52 +6583,59 @@ "Er du sikker på at du vil slette alle markerte filer og/eller mapper fra " "lokal maskin?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Reason" msgstr "Årsak" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2766 msgid "Reboot now" msgstr "Start maskinen på nytt nå" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Også i subfiler og -mapper" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Mottok TLS-varsel fra tjeneren: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3075 msgid "Received a directory listing which appears to be encoded in EBCDIC." -msgstr "Mottok en mappeoppføring som ser ut til å være kodet i EBCDIC." +msgstr "Mottok mappeelement som ser ut til å være kodet i EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2057 +#: ../../locales/../src/engine/directorylistingparser.cpp:2074 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Mottok en linje på over 10 000 tegn, avbryter." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Klarte ikke å bekrefte mottatt sertifikatkjede. Bekreftelsesstatus er %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" -msgstr "Mottatt data ødelagt" +msgstr "Mottatt data er ødelagt" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:560 msgid "Received invalid character in version information" -msgstr "Versjonsinformasjonen inneholder ugyldig(e) tegn" +msgstr "Versjonsinformasjon inneholder ugyldig(e) tegn" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Mottok ukjent TLS-varsel %d fra tjeneren" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:553 msgid "Received version information is too large" msgstr "Versjonsinformasjonen er for lang" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6223,77 +6643,75 @@ "Tlkoblingsinformasjon kan ikke tømmes mens du er tilkoblet en tjener.\n" "Hvis du fortsetter, blir du koblet fra." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Tilkoblingsinnstillinger" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Koble til sist brukte tjener" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Legger filer i kø rekursivt." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Endrer påminnelser rekursivt." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Sletter filer og mapper rekursivt." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Rød" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Videresending til ugyldig eller ustøttet nettadresse: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Videresending til ugyldig eller ustøttet adresse: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Frisk opp fil- og mappelistene" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Vil du at programmet skal huske passord?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Ekstern" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Tjenerens sertifikat regnes ikke som sikkert." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Remote file" msgstr "Fil på tjenermaskin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/search.cpp:713 msgid "Remote file search" msgstr "Eksternt filsøk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Vertsfilter:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Ekstern sti" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6302,7 +6720,7 @@ "Klarte ikke å tolke ekstern filsti. Kontroller at stien er en gyldig og " "absolutt filsti som støttes av gjeldende tjenertype (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1174 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6312,82 +6730,87 @@ "absolutt filsti som støttes av tjenertypen (%s) som er valgt på " "hovedtjeneren." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1177 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Klarte ikke å tolke ekstern filsti. Kontroller at stien er en gyldig og " "absolutt filsti." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Klarte ikke å tolke ekstern filsti." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Håndtering av ekstern filsti:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Ekstern filsti:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Ekstern tjener:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Fjern &alle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Fjern &valgte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:304 msgid "Rename file" msgstr "Gi nytt navn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Gi nytt navn til valgt mappe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Gi nytt navn til valgte filer og mapper" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:595 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Endrer navn fra «%s» til «%s»" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Gjenta passord:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" -msgstr "Feilrapportering og ønsker om ny funksjonalitet" +msgstr "Rapporter feil og ønsker om ny funksjonalitet" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" -"Forespørsel mislyktes. Klienten kjører ikke - eller tjeneren når ikke frem " -"til - identd" +"Forespørsel mislyktes. Klienten kjører ikke - eller tjeneren får ikke " +"kontakt med - identd" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Forespørsel mislyktes. Klientens identd klarte ikke å bekrefte bruker-ID-" "strengen" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Forespørselen mislyktes eller ble avvist" @@ -6399,43 +6822,42 @@ msgid "Require implicit FTP over TLS" msgstr "Krev implisitt FTP via TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Nullstill og legg &alle tilbake i kø" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Protokollen er ukjent" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1081 #, c-format msgid "Resolving address of %s" msgstr "Finner IP-adresse for %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Ressursen er midlertidig utilgjengelig" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:357 msgid "Response:" msgstr "Respons:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Resultat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Gjenoppta filoverføring" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6443,19 +6865,21 @@ "Å gjenoppta overføring av ASCII-filer kan skape problemer hvis tjener og " "klient bruker ulike formater for linjeendelse." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Mottar mappeliste for «%s» …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Mottar mappeliste …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Henter ekstern IP-adresse fra %s:" @@ -6464,23 +6888,23 @@ msgid "S&how files currently being edited..." msgstr "&Vis filer som blir redigert …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "V&is tjeneroppsett ved oppstart" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "&Slå av datamaskin" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "&Slå av systemet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "S&topp" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" msgstr "Sett s&ystem i hvilemodus" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "S&ynkronisert filbehandling" @@ -6488,89 +6912,108 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:606 +msgid "SFTP support" +msgstr "SFTP-støtte" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4-mellomtjener kobler til: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "SOCKS5 støtter ikke brukernavn og passord på over 255 tegn." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "&Beskytt lagrede passord med et hovedpassord" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "&Lagre passord" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Lagre innstillinger?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1006 msgid "Saving of password has been disabled by your system administrator." -msgstr "Systemadministratoren har slått av passordlagring." +msgstr "Systemadministrator har slått av passordlagring." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 msgid "Saving of passwords has been disabled by you." msgstr "Du har slått av passordlagring." -#: ../../locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "Søker etter filer som skal legges i kø" - -#: ../../locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" -msgstr "Søker etter filer å laste opp" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Skalering:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Søke&alternativer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Søk i &mappe:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Søk etter filer rekursivt." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Søk etter filer på tjener" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Søketype:" + +#: ../../locales/../src/interface/statusbar.cpp:514 msgid "Security information" msgstr "Sikkerhetsinformasjon" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Se også: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "&Velg tjener" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Velg &side:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Velg tema" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "Velg hva som skal skje som standard når målfiler finnes allerede." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Velg standard redigeringsprogram" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6578,7 +7021,7 @@ "Velg hva som skal brukes som standardhandling når målfiler finnes allerede. " "Valget her er bare gyldig for gjeldende programøkt." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6586,138 +7029,142 @@ "Velg hva som skal brukes som standardhandling når målfiler i kø finnes " "allerede." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "Velg fil som inneholder privatnøkkel" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Velg fil for eksporterte data" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Velg fil for eksporterte filtre" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1431 msgid "Select file for exported queue" msgstr "Velg fil for eksportert kø" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Velg fil for eksporterte innstillinger" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2457 msgid "Select file for exported sites" msgstr "Velg fil for eksporterte tjenere" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Velg fil å importere innstillinger fra" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Velg fil for opplasting" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Gi navn til konvertert nøkkelfil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Velg hvordan disse filene skal åpnes." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:892 msgid "Select target download directory" msgstr "Velg målmappe for nedlasting" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Velg navn på målfil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Velg kategori å eksportere:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Velg hvilke private data du vil tømme." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:851 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Markert %d mappe inkl. innhold for overføring." msgstr[1] "Markert %d mapper inkl. innhold for overføring." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d mappe er valgt." msgstr[1] "%d mapper er valgt." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:849 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "%d fil er merket for overføring." msgstr[1] "%d filer er merket for overføring." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "%d fil er valgt. Total størrelse: %s" msgstr[1] "%d filer er valgt. Total størrelse: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "%d fil er valgt. Total størrelse: minst %s" msgstr[1] "%d filer er valgt. Total størrelse: minst %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:855 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s og %s er merket for overføring." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "%s og %s er valgt. Total størrelse: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s og %s er valgt. Total størrelse: minst %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Valgt redigeringsprogram finnes ikke." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Valgt fil redigeres allerede" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "Valgt fil er allerede lastet" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Valgt fil er allerede åpen" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Valgt fil er fortsatt åpen for redigering" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Valgt filter fungerer bare på lokale filer." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6725,46 +7172,46 @@ "Valgt globalt bokmerke og gjeldende tjener bruker en annen tjenertype.\n" "Bruk tjenerspesifikke bokmerker for denne tjeneren." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Valgt port brukes normalt av en annen protokoll." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Be FTP-tjener om å holde forbindelsen («keep-alive»)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "Send selvvalgt kommando til tjeneren" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Be FTP-tjener om å holde forbindelsen («keep-alive»)" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:259 msgid "Serial number:" msgstr "Serienummer:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "Tjener&type:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Tjeneren avsluttet ikke TLS-tilkoblinga skikkelig" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Tjeneren støtter ikke tegn som ikke er ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:269 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Tjeneren støtter ikke å fortsette overføring av filer som er > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:266 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6773,15 +7220,19 @@ "Tjeneren støtter ikke å fortsette overføring av filer som er > %d GB. " "Overføring avbrytes fordi filene er av samme størrelse." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:528 msgid "Server does not support resume of files > 2GB." msgstr "Tjeneren støtter ikke å fortsette overføring av filer som er > 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:524 msgid "Server does not support resume of files > 4GB." msgstr "Tjeneren støtter ikke å fortsette overføring av filer som er > 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Vertsnøkkel for tjener" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:277 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6790,7 +7241,7 @@ "Tjeneren støtter kanskje ikke å fortsette overføring av filer som er > %d " "GB. Overføring avbrytes fordi filene er av samme størrelse." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6798,11 +7249,15 @@ "Tjeneren krever kanskje at du har en konto. Prøv å velge en konto i " "tjeneroppsettet" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:230 +msgid "Server not sending proper line endings" +msgstr "Tjener avslutter ikke linjer korrekt" + +#: ../../locales/../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "Tjeneren sendte en tom sti i retur." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:224 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6810,13 +7265,13 @@ "Tjeneren sendte en ekstra innloggingsforespørsel. Du må bruke interaktiv " "innloggingstype." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Tjeneren sendte passiv respons med ikke-rutbar adresse. Passiv modus " "mislyktes." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6824,36 +7279,46 @@ "Tjeneren sendte passiv respons med ikke-rutbar adresse. Bruker tjeneradresse " "i stedet." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:489 +msgid "Server sent too much data." +msgstr "Tjener sendte for mye data." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Tjeneren sendte en uventet respons." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Tjener sendte usortert sertifikatkjede i strid med gjeldende TLS-standard" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Tjener til klient-MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Krypteringsmetode (tjener til klient):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "Tjener&type:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Server/Local file" msgstr "Tjener-/lokal fil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Tjener:" @@ -6861,49 +7326,50 @@ msgid "Session details" msgstr "Detaljer om økt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Velg &prioritet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:589 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Bruk «%2$s» som tillatelsesoppsett for «%1$s»" - -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "«SetSocketBufferSize» sendte et kall uten sokkel" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Endrer tillatelser for «%s» til «%s»" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Innstillinger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Oppsettsmappe:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Vi&s varslingsboble" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Vis &ren mappeliste" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Vis &velkomstdialog …" -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2328 msgid "Show both directory trees and continue comparing?" msgstr "Vil du se begge mappetrærne og fortsette sammenlikning?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Vis detaljer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Vis detaljer om selvvalgte dato- og klokkeslettformater" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Viser tilgjengelige TLS-krypteringsmetoder" @@ -6911,72 +7377,81 @@ msgid "Shows this help dialog" msgstr "Viser denne hjelpdialogen" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2762 msgid "Shutdown now" -msgstr "Slå av maskinen nå" +msgstr "Slå avnå" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 msgid "Signature algorithm:" msgstr "Signatur-algoritme:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Registrer meg" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" -msgstr "Oppføringer i Tjeneroppsett" +msgstr "Elementer i Tjeneroppsett" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 msgid "Site Manager" msgstr "Tjeneroppsett" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 msgid "Site Manager - Cannot remember password" -msgstr "Tjeneroppsett - Klarte ikke å lagre passord" +msgstr "Tjeneroppsett - klarte ikke å lagre passord" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Tjeneroppsett - laget nøkkel" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1046 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1059 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1092 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1179 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 msgid "Site Manager - Invalid data" -msgstr "Tjeneroppsett - Ugyldige data" +msgstr "Tjeneroppsett - ugyldige data" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:300 msgid "Site Manager already open" msgstr "Tjeneroppsett er allerede åpent" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Tjeneren finnes ikke." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Tjenerstien må begynne med 0 eller 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Tjenerstien er feilformatert." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Tjenerspesifikke bokmerker" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6986,11 +7461,11 @@ "tjeneroppsettet.\n" "Vil du legge til gjeldende tilkobling i tjeneroppsettet?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Size" msgstr "Størrelse" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Størrelsesformater" @@ -6998,55 +7473,60 @@ msgid "Size unknown" msgstr "Ukjent størrelse" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Hopp over fil" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1151 +#: ../../locales/../src/engine/ControlSocket.cpp:1168 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping download of %s" msgstr "Hopper over nedlasting av %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Nøkkelfil «%s» finnes ikke, og blir hoppet over" + +#: ../../locales/../src/engine/ControlSocket.cpp:1154 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 +#: ../../locales/../src/engine/ControlSocket.cpp:1197 +#: ../../locales/../src/engine/ControlSocket.cpp:1275 #, c-format msgid "Skipping upload of %s" msgstr "Hopper over opplasting av %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Sokkeladresse er utenfor adresseområdet" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Sokkel allerede tilkoblet" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Sokkel er avsluttet" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Sokkel ikke tilkoblet" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Sokkeltypen støttes ikke av aktuell adressefamilie" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Some files are still being edited or need to be uploaded." msgstr "Noen eksterne filer blir fremdeles redigert eller må lastes opp." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7054,31 +7534,31 @@ "Enkelte feiloppsatte tjenere som er koblet bak rutere kan svare med sin " "lokale IP-adresse." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Sorter mapper sammen med filer" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." msgstr "Sorteringsrekkefølgen kan ikke endres når du sammenlikner mapper." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Sortering" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Sorterings&modus:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Kilde og sti for dra-operasjonen er identiske" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Kildefil kan ikke være målfil" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Kilde og mål for slipp-handling er identiske" @@ -7086,37 +7566,37 @@ msgid "Source file:" msgstr "Kildefil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" -msgstr "Hastighetsgrenser" +msgstr "Fartsgrenser" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" -msgstr "Hastighetsgrenser" +msgstr "Fartsgrenser" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:591 msgid "Speed limits are disabled, click to change." -msgstr "Hastighetsgenser er slått av. Trykk for å endre." +msgstr "Fartsgrenser er slått av. Trykk for å endre." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:594 msgid "Speed limits are enabled, click to change." -msgstr "Hastighetsgenser er slått på. Trykk for å endre." +msgstr "Fartsgrenser er slått på. Trykk for å endre." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Stabile og beta-versjoner." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Bare stabile versjoner" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Stabile, beta- og dagsversjoner" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Start overføring &umiddelbart" @@ -7124,19 +7604,21 @@ msgid "Start with opened Site Manager" msgstr "Åpne tjeneroppsett ved oppstart" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:246 #, c-format msgid "Started update check on %s\n" msgstr "Begynte å se etter oppdateringer %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Starter nedlasting av %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Starter opplasting av %s" @@ -7145,30 +7627,38 @@ msgid "Starts the local site in the given path" msgstr "Starter lokal filliste på valgt sti" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "State or province:" msgstr "Stat eller provins:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Status" msgstr "Status" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:298 +#: ../../locales/../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "Status:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Stopp og fjern &alle" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Stopp rekursiv handling" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - desentralisert fjernlagring" + +#: ../../locales/../src/interface/FileZilla.cpp:613 +msgid "Storj support" +msgstr "Storj-støtte" + +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Street:" msgstr "Gate:" @@ -7184,11 +7674,11 @@ msgid "Summary of test results:" msgstr "Oppsummering av testresultater:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2770 msgid "Suspend now" msgstr "Sett i hvilemodus nå" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7196,29 +7686,33 @@ "Symbolske lenker til filer påvirkes ikke av dette valget, da slike alltid " "slettes." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Synkronisert filbehandling" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Synkronisert filbehandling er avslått." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Synkroniserer mapper." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Syntaksfeil" @@ -7227,44 +7721,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2443 +#: ../../locales/../src/interface/Mainfrm.cpp:2488 msgid "Syntax error in command line" msgstr "Syntaksfeil på kommandolinja" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "System" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Systemdetaljer" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Du har flere åpne filer enn systemet tillater" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Systemets undersystem for nettverk er nede" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "&Verktøylinje" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:131 msgid "TLS connection established, sending HTTP request" msgstr "TLS-tilkobling etablert. Sender HTTP-forespørsel" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS-tilkobling etablert. Venter på velkomstmelding …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "TLS-tilkobling etablert." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL utløpt" @@ -7272,35 +7766,43 @@ msgid "Target file already exists" msgstr "Målfila finnes allerede" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Målfil:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2686 msgid "Target filename already exists!" msgstr "Målfila finnes allerede!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "Target filename already exists, really continue?" msgstr "Målfila finnes allerede. Er du sikker på at du vil fortsette?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Midlertidig feil i navnoppslag" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Test fullført uten problemer" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Testresultater" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:281 msgid "Testing resume capabilities of server" msgstr "Tester fortsettelses-/resume-støtte på tjener" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "&Følgende filer er åpne for redigering:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:782 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Du må reparere fila før Tjeneroppsett kan brukes." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:299 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7309,7 +7811,7 @@ "Tjeneroppsettet er åpent i en annen instans av FileZilla 3.\n" "Vil du fortsette? Eventuelle endringer gjort i Tjeneroppsett går tapt." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7317,29 +7819,37 @@ "Tjeneroppsettet er åpent i en annen instans av FileZilla 3.\n" "Dataene kan ikke slettes så lenge aktuell instans er åpen." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Adressen du skrev inn var: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "«ai_family»-medlem støttes ikke" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "«ai_socktype»-medlem støttes ikke" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Klarte ikke å legge til bokmerke." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Klarte ikke å tømme bokmerker." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Et sertifikat krever at tjeneren tar med OCSP-status i responsmeldinger, men " +"OCSP-status mangler." + +#: ../../locales/../src/interface/statusbar.cpp:475 msgid "The connection is encrypted. Click icon for details." msgstr "Tilkoblinga er kryptert. Klikk på ikonet for detaljer." @@ -7361,34 +7871,39 @@ "Selvvalgt tidsformat er ugyldig, eller inneholder formatspesifikasjoner som " "ikke støttes." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Klarte ikke å sette opp datatilkobling: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Fant ikke standard redigeringsprogram for tekstfiler." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Standard redigeringsprogram for tekstfiler er «%s»." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Aktuelt filternavn finnes allerede. Velg et annet navn." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Du skrev inn to ulike passord." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Filetternavnet «%s» finnes allerede i lista" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 #, c-format msgid "" "The file %s already exists.\n" @@ -7397,8 +7912,8 @@ "Fila %s finnes allerede.\n" "Velg et nytt navn:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1779 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7409,7 +7924,7 @@ "Fant ikke tilknyttet program (%s).\n" "Kontroller hvilket program som er tilordnet aktuell filtype." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7418,19 +7933,19 @@ "Fila «%s» inneholder en SSH1-nøkkel. SSH1-protokollen er utdatert, og " "FileZilla støtter bare nøkler av typen SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" "Fila «%s» kunne ikke lastes inn, eller inneholder ikke en privatnøkkel." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:37 #, c-format msgid "The file '%s' could not be loaded." msgstr "Klarte ikke å laste inn fila «%s»." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1775 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7439,8 +7954,8 @@ "Klarte ikke å åpne fila «%s».\n" "Denne filtypen er ikke tilordnet et program." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1787 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7449,8 +7964,8 @@ "Klarte ikke å åpne fila «%s».\n" "Tilordnet program mislyktes" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:789 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7461,7 +7976,7 @@ "Du risikerer datatap ved å laste inn filer fra nyere versjoner.\n" "Er du sikker på at du vil fortsette?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7474,7 +7989,7 @@ msgid "The file selected as default editor does not exist." msgstr "Valgt standard redigeringsprogram finnes ikke." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7488,11 +8003,11 @@ "brukernavn og passord.\n" "Vil du fortsette importeringsprosessen?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Filnavn-kolonnen kan hverken skjules eller flyttes." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Filnavn-kolonnen kan ikke skjules." @@ -7506,19 +8021,19 @@ msgid "The following characters will be replaced: %s" msgstr "Følgende tegn blir erstattet: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Følgende filer er for øyeblikket åpnet for redigering:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Gratis FTP-løsning med åpen kildekode" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Kryteringsnøkkelen er:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Klarte ikke å lagre globale bokmerker." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7531,17 +8046,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Grensen må være på mellom 1 og 2000 MiB" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Klarte ikke å opprette lokal mappe «%s»." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Lokal mappe «%s» finnes ikke." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7560,24 +8075,29 @@ "Den laveste tilgjengelige porten må være mindre eller lik den høyeste " "tilgjengelige porten." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Hovedpassord må bestå av minst 8 tegn." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Klarte ikke å laste ned ny versjon. Prøv igjen senere." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Ny versjon er lagret i gjeldende brukers nedlastingsmappe." -#: ../../locales/../src/interface/QueueView.cpp:1823 +#: ../../locales/../src/interface/QueueView.cpp:1560 msgid "The queue will not be saved." msgstr "Køen blir ikke lagret." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Ekstern mappe «%s» finnes ikke." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7588,26 +8108,26 @@ "Vil du slå av synkronisert filbehandling og fortsette med å endre ekstern " "mappe?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "De valgte kategoriene har blitt importert." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "Valgt fil inneholder data som kan importeres for følgende kategorier:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Du redigerer allerede valgt fil:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "Valgt fil er fremdeles i bruk av et annet program. Lukk programmet." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7617,15 +8137,15 @@ "Dette kan være skadelig for systemet.\n" "Er du sikker på at du vil fortsette?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Tjeneren ble ikke lagt til." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Tjeneren sendte en uventet eller ugjenkjennelig respons." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Tjeneren bruker følgende tegnsett for filnavn:" @@ -7637,7 +8157,7 @@ "Tjenerens sertifikat er ukjent. Kontroller sertifikatet nøye for å finne ut " "om tjeneren er pålitelig." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7647,7 +8167,7 @@ "administratoren har endret nøkkelen, eller at du prøver å koble til en annen " "datamaskin som utgir seg for å være den egentlige tjeneren." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7655,11 +8175,15 @@ "Tjenerens vertsnøkkel er ukjent. Du har nå ingen garanti for at tjeneren " "faktisk er den maskinen du tror den er." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Tjenerens vertsnavn samsvarer ikke med sertifikatets vertsnavn" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "«servname»-parameteret støttes ikke for «ai_socktype»" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7667,19 +8191,19 @@ "Oppsettet er importert. Du må starte FileZilla på nytt for at det skal tre i " "kraft." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Valgt adressefamilie støttes ikke" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Valgt nettverksnavn er ikke lenger tilgjengelig" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2765 msgid "The system will soon reboot unless you click Cancel." msgstr "Datamaskinen startes på nytt om kort tid, med mindre du avbryter." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2761 msgid "The system will soon shut down unless you click Cancel." msgstr "Datamaskinen slår seg av om kort tid, med mindre du avbryter." @@ -7691,11 +8215,11 @@ "Fila finnes allerede.\n" "Hva vil du gjøre?" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Testen mislyktes. Er du sikker på at du vil lagre oppsettet likevel?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:82 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Klarte ikke å laste inn den gyldige sikkerhetskopien «%s»." @@ -7704,15 +8228,15 @@ msgid "Themes" msgstr "Tema" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Dette filtersettet kan ikke fjernes." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Du kan ikke gi et nytt navn til dette filtersettet." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7735,43 +8259,41 @@ "Denne veiviseren hjelper deg med å sette opp eventuelle rutere og/eller " "brannmurer du har, og tester deretter oppsettet." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Time" msgstr "Tid" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Tidsformat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Tids&avbrudd i sekunder:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "Tidsavbrudd" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Tidssone-forskyvning av tjenertid er %d sekunder." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Title:" msgstr "Tittel" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2309 +msgid "To compare directories quick search must be closed." +msgstr "Hvis du vil sammenlikne mapper, må du lukke hurtigsøk" + +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Fillistene må være oppstilt på samme linje for å kunne sammenlikne mapper." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2327 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "For å gjøre dette må du enten vise eller skjule begge mappelistene." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7779,7 +8301,7 @@ "FileZilla må vite hvilke privatnøkler som skal brukes for å kunne " "autentisere mot offentlige nøkler." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7795,7 +8317,7 @@ "Grønn: Fila er nyere enn umerket fil på andre siden\n" "Rød: Filene er av ulik størrelse" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7805,82 +8327,77 @@ "Når dette valget er slått på, navigerer filutforskeren likt på ekstern " "tjener ved mappebytte lokalt, og omvendt." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Slå på/av behandling av overføringskø" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Slå på/av visning av lokalt mappetre" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Slå på/av visning av meldingslogg" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Slå på/av visning av tjenerens mappehierarki" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Slår av og på visning av overføringskø" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:243 msgid "Too long header line" msgstr "For lang header-linje" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "For mange videresendinger" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "Sporing:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Overfør" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Overførings&retning" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "Overførings&modus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Overføringsmodus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Overføringskø" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Overføringsvalg" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" -msgstr "Tilkoblingsforsøket avbrutt: %s" +msgstr "Tilkoblingsforsøk avbrutt. %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Overført data ble ødelagt." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Overfører" @@ -7888,27 +8405,27 @@ msgid "Transfers" msgstr "Overføringer" -#: ../../locales/../src/interface/QueueView.cpp:2929 +#: ../../locales/../src/interface/QueueView.cpp:2644 msgid "Transfers finished" msgstr "Overføringer er ferdige" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Behandle filer &uten filetternavn som ASCII-filer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Behandle &følgende filtyper som ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:385 msgid "Trust changed Hostkey:" msgstr "Godkjenn endret vertsnøkkel:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:382 msgid "Trust new Hostkey:" msgstr "Godkjenn ny vertsnøkkel:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Vil du godkjenne ny nøkkel og fortsette med å koble til?" @@ -7916,69 +8433,75 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Vil du godkjenne dette sertifikatet og fortsette med å koble til?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Vil du godkjenne verten og fortsette med å koble til?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Prøv igjen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Type" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Type FTP-mellomtjener:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Type generisk mellomtjener:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "Last o&pp" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "O&pplastingsgrense:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Bruk filtype-&tilordninger hvis tilgjengelig" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "&Bruk systemets standardverdier for gjeldende språk" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "BRUKER@&VERT" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Ikke tilordnet feilkode %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Unit:" msgstr "Enhet:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Ukjent" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Ukjent type FTP-mellomtjener. Kan derfor ikke lage innloggingssekvens." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Ukjent SOCKS protokollversjon: %d" @@ -7987,25 +8510,40 @@ msgid "Unknown certificate" msgstr "Ukjent sertifikat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Ukjent feil %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Ukjent feil %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Ukjent vertsnøkkel" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "Ukjent protokollversjon for delforhandling av SOCKS-autentisering: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:283 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Ukjent rotelement. Fila ser ikke ut til å ha blitt generert av FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:355 +msgid "Unknown transfer encoding" +msgstr "Ukjent overføringskoding" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8013,7 +8551,7 @@ "Aktiv modus fungerer ikke med mindre du løser disse problemene. Inntil du " "gjør det, må du bruke passiv modus." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8021,15 +8559,15 @@ "Aktiv modus fungerer ikke med mindre du løser dette problemet. Inntil du " "gjør det, må du bruke passiv modus." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Sertifikattypen støttes ikke" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Denne videresendinga støttes ikke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "&Last opp uten endringer" @@ -8038,78 +8576,87 @@ msgid "Updates" msgstr "Oppdateringer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Last opp" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Opplasting mislyktes" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:604 #, c-format msgid "Upload limit: %s/s" msgstr "Opplastingsgrense: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:607 msgid "Upload limit: none" msgstr "Opplastingsgrense: ingen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:918 +msgid "Upload search results" +msgstr "Last opp søkeresultater" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Last opp valgte mappe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Last opp valgte filer og mapper" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Vil du laste opp denne fila til tjeneren igjen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Vil du laste opp denne fila til tjeneren?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Laster opp" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Fjern opplastinger og ventende handlinger" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Laster opp uten endringer" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Bruk &selvvalgt tegnsett" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Bruk &selvvalgt redigeringsprogram:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Bruk &standard redigeringsprogram for tekstfiler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Bruk &synkronisert filbehandling" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Bruk regulære uttrykk" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "UTF-8 brukes hvis tjeneren støtter det. Ellers brukes lokalt tegnsett." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Bruk standardhandling" @@ -8117,15 +8664,15 @@ msgid "Use explicit FTP over TLS if available" msgstr "Bruk eksplisitt FTP via TLS, hvis tilgjengelig" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Bruk tjeneren som er tilkoblet nå" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Bruk en tjener fra tjeneroppsettet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "Bruk systemets &standardverdier for gjeldende språk" @@ -8142,7 +8689,7 @@ msgstr "Bruk tjenerens eksterne IP-adresse i stedet" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8158,16 +8705,17 @@ "kontakter denne tjeneren for hver økt så snart du begynner å bruke aktiv " "modus. Denne tjeneren får vite hvilken versjon av FIleZilla du kjører." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Brukernavn:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 msgid "Username cannot be a series of spaces" msgstr "Brukernavn kan ikke være en rekke av mellomrom" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "Bruk av feil tegnsett kan føre til at filnavn vises feil." @@ -8184,51 +8732,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "Logg meldinger fra wxWidgets fortløpende" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Bekrefter sertifikat …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Veldig høy" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "Visning av skjulte filer er slått på, men støttes ikke av tjeneren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Vis/Rediger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Synlige kolonner" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "&Skriv" -#: ../../locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "Venter" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "Venter på filutforskertilkobling" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "Venter på passord" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Venter på at overføringa skal bli avbrutt" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Venter med å prøve på nytt …" -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Advarsel: ignorerer datatilkobling fra feil IP." @@ -8247,23 +8791,23 @@ "\n" "Er du sikker på at du vil se etter dagsversjoner?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Advarsel: Potensielt sikkerhetsbrudd!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Velkommen til FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Nyheter" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Nyheter:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8271,7 +8815,7 @@ "Når du lar FileZilla huske passord, kan du avslutte programmet og/eller " "koble til på nytt uten å måtte skrive inn passordet igjen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8279,36 +8823,50 @@ "Når dette er valgt, blir tegn i evt. filnavn som ikke støttes av lokalt " "filsystem erstattet med andre tegn." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "Når en ny tilkobling startes mens en annen pågår:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Widescreen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Vil du at FileZilla skal huske passord?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "S&kriv" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Ugyldig ekstern IP-adresse:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:414 msgid "Wrong line endings" msgstr "Ugyldige linjeendelser" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "Du skrev inn feil hovedpassord." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "Du skrev inn feil hovedpassord." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Gul" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:396 msgid "Yes" msgstr "Ja" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8316,24 +8874,24 @@ "Det ser ut som du bruker en vert som bare støtter IPv6. Denne veiviseren " "støtter ikke slike arbeidsmiljøer." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Du bruker nyeste versjon av FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Du kan finne igjen denne dialogboksen via hjelpemenyen." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Du kan laste ned nyeste versjon fra FileZilla-nettstedet:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "Du kan la port-feltet stå tomt for å bruke standardporten." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8341,7 +8899,15 @@ "Du kan bruke en x i enhver posisjon for å bevare rettighetene de orginale " "filene har." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Du kan ikke endre passord og krypteringsnøkkel hver for seg hvis du bruker " +"hovedpassord." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Du kan ikke importere innstillinger fra FileZillas egen innstillingsmappe." @@ -8354,16 +8920,20 @@ "Du kan ikke erstatte et ugyldig tegn med et annet ugyldig tegn. Skriv inn et " "tegn som kan brukes i filnavn." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Du kan ikke laste opp filer til rotmappe." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Du skrev ikke inn et nytt filnavn. Vil du overskrive fila?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Du har valgt minst én symbolsk lenke." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1197 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8371,7 +8941,7 @@ "Du har valgt å redigere flere enn ti filer samtidig. Er du sikker på at du " "vil fortsette?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1744 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8379,39 +8949,47 @@ "Du har valgt å åpne flere enn ti filer eller mapper samtidig. Er du sikker " "på at du vil fortsette?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 msgid "You have to enter a hostname." msgstr "Du må skrive inn et vertsnavn." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1092 msgid "You have to enter a key file path" msgstr "Du må skrive inn en sti til en nøkkelfil" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:904 msgid "You have to enter a local directory." msgstr "Du må angi en lokal mappe." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:918 +msgid "You have to enter a remote directory." +msgstr "Du må skrive inn en ekstern mappe." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Du må skrive inn en gyldig IPv4-adresse." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "You have to enter a valid encryption key" +msgstr "Du må skrive inn en gyldig krypteringsnøkkel" + +#: ../../locales/../src/interface/search.cpp:909 msgid "You have to enter a writable local directory." msgstr "Du må angi en skrivbar lokal mappe." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 msgid "You have to enter an account name" msgstr "Du må skrive inn et kontonavn" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1059 msgid "You have to specify a user name" msgstr "Du må skrive inn et brukernavn" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8419,7 +8997,11 @@ "Du har sannsynligvis en ruter eller brannmur som feilaktig endret dataene " "under overføring." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Du må skrive inn et hovedpassord." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Du må gi bokmerket et navn." @@ -8427,7 +9009,7 @@ msgid "You need to enter a name for the log file." msgstr "Du må gi loggfila et navn." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Du må bruke korrekte hermetegn (\") i kommandoen." @@ -8440,15 +9022,15 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Du må angi et mellomtjener-portnummer mellom 1 og 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Du må skrive inn minst én filsti. Tomme bokmerker støttes ikke." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8456,7 +9038,7 @@ "Du må skrive inn både en lokal og en ekstern sti for å kunne synkronisere " "filbehandling med dette bokmerket." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8464,23 +9046,31 @@ "Du må skrive inn både en lokal og en ekstern sti for å kunne synkronisere " "filbehandling med denne tjeneren." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Du må gi FileZilla tilgang til mapper som du vil laste ned filer til og/" +"eller laste opp filer fra." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Du må velge en lokal fil." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Du må velge en ekstern fil." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Du må velge en ekstern sti." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Du må angi en tjener." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8488,171 +9078,267 @@ "Du skal ikke ha problemer med å koble til andre tjenere. Filoverføring burde " "fungere." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2769 msgid "Your computer will suspend unless you click Cancel." msgstr "Datamaskinen går i hvilemodus med mindre du avbryter." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "etter" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "før" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "begynner med" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "byte" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "inneholder" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:250 msgid "custom" msgstr "selvvalgt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "inneholder ikke" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "er ikke lik" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "slutter på" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "er lik" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:545 +#: ../../locales/../src/interface/filelistctrl.cpp:563 #: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:608 msgid "file" msgstr "fil" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-låsfil" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " "FileZilla executable." msgstr "" "Klarte ikke å starte fzputtygen.\n" -"Kontroller at fila finnes i samme mappe som den kjørbare FileZilla-fila." +"Kontroller at fila ligger i samme mappe som den kjørbare FileZilla-fila." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp hører til en annen versjon av FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "klarte ikke å starte fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj hører til en annen versjon av FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "klarte ikke å starte fzstorj" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"Klarte ikke å starte fzstorj.\n" +"Kontroller at fila finnes i samme mappe som FileZilla-programmet." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers returnerte ingen sertifikater" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "«gnutls_pem_base64_encode2» mislyktes" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "større enn" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "kjørbar for tilhørende gruppe" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "lesbar for tilhørende gruppe" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "overskrivbar for tilhørende gruppe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "er lik" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "er satt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "er ikke valgt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "mindre enn" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "samsvarer med reg.uttrykk" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +msgid "new name" +msgstr "nytt navn" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "kjørbar for eier" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "lesbar for eier" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "overskrivbar for eier" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "ukjent" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "kjørbar for alle" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "lesbar for alle" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "overskrivbar for alle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "&Ikke husk passord (anbefales)" + +#~ msgid "Set permissions of '%s' to '%s'" +#~ msgstr "Bruk «%2$s» som tillatelsesoppsett for «%1$s»" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "Tidssone-forskyvning av tjenertid er %d sekunder." + +#~ msgid "Host key fingerprint:" +#~ msgstr "Vertsnøkkelens fingeravtrykk:" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Klarte ikke å laste inn hurtigtilkoblingslinje fra ressursfil" + +#~ msgid "Available sizes" +#~ msgstr "Tilgjengelige størrelser" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "«SetSocketBufferSize» sendte et kall uten sokkel" + +#~ msgid "Filename &filters..." +#~ msgstr "&Filnavnfiltre …" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Klarte ikke å importere sertifikater. «gnutls_x509_crt_import» mislyktes" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Klarte ikke å laste inn struktur for sertifikater. «gnutls_x509_crt_init» " +#~ "mislyktes" + +#~ msgid "Package" +#~ msgstr "Pakke" + +#~ msgid "Updated" +#~ msgstr "Oppdatert" + +#~ msgid "%d files added to queue" +#~ msgstr "%d filer lagt i kø" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Søker etter filer som skal legges i kø" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Søker etter filer å laste opp" + +#~ msgid "Waiting" +#~ msgstr "Venter" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Koble fra tjener" + +#~ msgid "&Show message" +#~ msgstr "Vi&s melding" + +#~ msgid "Do ¬hing" +#~ msgstr "Gjør &ingenting" + +#~ msgid "No more files in the queue!" +#~ msgstr "Ingen flere filer i kø!" + #~ msgid "Empty dirs to visit" #~ msgstr "Tomme mapper å besøke" #~ msgid "Connected" #~ msgstr "Tilkoblet" -#~ msgid "Deleting directories" -#~ msgstr "Sletter mapper" - #~ msgid "Deleting multiple unrelated directories is not yet supported" #~ msgstr "Sletting av flere urelaterte mapper samtidig støttes ikke ennå" @@ -8692,9 +9378,6 @@ #~ msgid "Could not load keyfile" #~ msgstr "Klarte ikke å laste inn nøkkelfil" -#~ msgid "Error" -#~ msgstr "Feil" - #~ msgid "The specified key file does not exist" #~ msgstr "Valgt nøkkelfil støttes ikke" @@ -8911,9 +9594,6 @@ #~ msgid "Log of update check:" #~ msgstr "Oppdateringslogg:" -#~ msgid "Package" -#~ msgstr "Pakke" - #~ msgid "" #~ "Please check https://filezilla-project.org/ for the most recent version " #~ "of FileZilla." @@ -8960,9 +9640,6 @@ #~ msgid "Resolving hostname" #~ msgstr "Finner vertsnavn" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Serverens rotsertifikat er ikke tiltrodd" - #~ msgid "Select download location for package" #~ msgstr "Velg nedlastingsmappe for pakke" diff -Nru filezilla-3.15.0.2/locales/nl.po filezilla-3.33.0/locales/nl.po --- filezilla-3.15.0.2/locales/nl.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/nl.po 2017-09-19 21:36:39.000000000 +0000 @@ -1,28 +1,34 @@ msgid "" msgstr "" "Project-Id-Version: filezilla_nl\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-24 14:53+0200\n" -"PO-Revision-Date: 2015-08-24 14:33+0200\n" -"Last-Translator: Niko Strijbol \n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-01-06 16:14+0100\n" +"PO-Revision-Date: 2016-12-08 12:36+0100\n" +"Last-Translator: Jan Verheijen\n" "Language-Team: en@li.org\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.4\n" +"X-Generator: Poedit 1.8.11\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:114 +msgid "" +"\n" +"\n" +msgstr "" + #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:203 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S verstreken" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:209 msgid "%H:%M:%S left" msgstr "%H:%M:%S resterend" @@ -35,55 +41,50 @@ "%a - Account (regels die dit bevatten worden weggelaten als het inlogtype " "Account niet gebruikt wordt)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d map" msgstr[1] "%d mappen" -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/search.cpp:478 -#: ../../locales/../src/interface/search.cpp:764 +#: ../../locales/../src/interface/RemoteListView.cpp:1419 +#: ../../locales/../src/interface/search.cpp:818 +#: ../../locales/../src/interface/search.cpp:1198 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d map met inhoud" msgstr[1] "%d mappen met inhoud" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1389 -#: ../../locales/../src/interface/search.cpp:477 -#: ../../locales/../src/interface/search.cpp:763 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:817 +#: ../../locales/../src/interface/search.cpp:1197 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d bestand" msgstr[1] "%d bestanden" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d bestand. Totale grootte: %s" msgstr[1] "%d bestanden. Totale grootte: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d bestand. Totale grootte: minstens %s" msgstr[1] "%d bestanden. Totale grootte: minstens %s" -#: ../../locales/../src/interface/QueueView.cpp:2784 -#, c-format -msgid "%d files added to queue" -msgstr "%d bestanden toegevoegd aan wachtrij" - -#: ../../locales/../src/engine/ControlSocket.cpp:103 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -94,41 +95,41 @@ msgid "%h - Host" msgstr "%h - Host" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 -#, fuzzy, c-format +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 +#, c-format msgid "%llu directory" msgid_plural "%llu directories" -msgstr[0] "%d map" -msgstr[1] "%d mappen" +msgstr[0] "%llu map" +msgstr[1] "%llu mappen" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 -#, fuzzy, c-format +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, c-format msgid "%llu file" msgid_plural "%llu files" -msgstr[0] "%d bestand" -msgstr[1] "%d bestanden" +msgstr[0] "%llu bestand" +msgstr[1] "%llu bestanden" #: ../../locales/../src/interface/resources/xrc/settings.xrc:517 #, c-format msgid "%p - Password" msgstr "%p - Wachtwoord" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:164 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:167 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certificaat verlopen!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Nog niet geldig!" @@ -138,24 +139,24 @@ msgid "%s - Proxy user" msgstr "%s - Proxy-gebruiker" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s en %s. Totale grootte: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s en %s. Totale grootte: minstens %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s bytes" -#: ../../locales/../src/interface/FileZilla.cpp:595 +#: ../../locales/../src/interface/FileZilla.cpp:588 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -169,7 +170,7 @@ "Download FileZilla opnieuw. Als het probleem zich blijft voordoen, verzend " "dan een foutenrapport." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:673 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -186,7 +187,7 @@ "omgevingsvariable.\n" "- Zet het volledige pad naar %s in de FZ_FZSFTP-omgevingsvariable." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s met %d bits" @@ -200,7 +201,7 @@ msgid "%w - Proxy password" msgstr "%w - Proxy-wachtwoord" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3678 msgid "&Abort previous connection and connect in current tab" msgstr "Vorige verbinding afbreken en verbinden in huidige tab" @@ -208,14 +209,14 @@ msgid "&About..." msgstr "Over..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "Account:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:473 msgid "&Active" msgstr "Actief" @@ -229,16 +230,15 @@ msgstr "Bestanden toevoegen aan wachtrij" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -#, fuzzy msgid "&Add key file..." msgstr "Sleutelbestand toevoegen..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "&Add to queue" msgstr "Toevoegen aan wachtrij" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:402 msgid "&Adjust server timezone offset:" msgstr "Offset van servertijdzone aanpassen:" @@ -246,19 +246,19 @@ msgid "&Always trust certificate in future sessions." msgstr "Altijd het certificaat vertrouwen in toekomstige sessies." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:896 msgid "&Always trust this host, add this key to the cache" msgstr "Deze host altijd vertrouwen en deze sleutel toevoegen aan de cache" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1969 msgid "&Always use default editor" msgstr "Altijd het standaard bewerkingsprogramma gebruiken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3015 msgid "&Always use selection for unassociated files" msgstr "Selectie altijd gebruiken voor ongeassocieerde bestanden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "Deze actie altijd gebruiken" @@ -267,22 +267,26 @@ msgstr "Vraag uw besturingssysteem naar het externe IP-adres" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "Automatisch" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Autodetect" msgstr "Auto-detectie" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:273 +msgid "&Background color:" +msgstr "Achtergrondkleur:" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:604 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "Binair" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1632 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "Binaire voorvoegsels met SI-symbolen (bijv. 1 kB = 1024 bytes)." @@ -290,14 +294,14 @@ msgid "&Bookmarks" msgstr "Bladwijzers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2749 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3129 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2311 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2720 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3002 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2156 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:362 msgid "&Browse..." msgstr "Bladeren..." @@ -305,10 +309,10 @@ msgid "&Burst tolerance:" msgstr "Burst-tolerantie:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3620 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3676 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3861 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -322,11 +326,11 @@ msgid "&Close" msgstr "Sluiten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "FileZilla sluiten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "&Configure speed limits..." msgstr "Snelheidslimieten configureren..." @@ -334,7 +338,7 @@ msgid "&Configure..." msgstr "Configureren..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:614 msgid "&Connect" msgstr "Verbinden" @@ -342,36 +346,36 @@ msgid "&Copy current connection to Site Manager..." msgstr "Huidige verbinding naar Sitebeheer kopiëren..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:794 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "Kopiëren naar klembord" #: ../../locales/../src/interface/resources/xrc/menus.xrc:264 #: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "&Create directory" msgstr "Map aanmaken" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:630 msgid "&Create new tab" msgstr "Nieuwe tab aanmaken" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "Debuggen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "&Debug information in message log:" msgstr "Debug-informatie in berichtenlogboek:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Default editor:" msgstr "Standaard bewerkingsprogramma:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "Standaard 'bestand bestaat al'-actie..." @@ -379,16 +383,16 @@ msgid "&Delay between failed login attempts:" msgstr "Tijdsverschil tussen mislukte inlogpogingen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2829 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1249 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2887 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "Verwijderen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3407 msgid "&Delete symlink" msgstr "Symbolische link verwijderen" @@ -396,7 +400,21 @@ msgid "&Directory comparison" msgstr "Mappenvergelijking" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/state.cpp:963 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"Gesynchroniseerd bladeren uitschakelen en doorgaan met het wijzigen van de " +"lokale map" + +#: ../../locales/../src/interface/state.cpp:1041 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" +"Gesynchroniseerd bladeren uitschakelen en doorgaan met het wijzigen van de " +"externe map" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 msgid "&Discard local file then download and edit file anew" msgstr "Lokale bestand verwerpen en een nieuwe downloaden en bewerken" @@ -404,48 +422,44 @@ msgid "&Disconnect" msgstr "Verbinding verbreken" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "Verbinding met server verbreken" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "Actuele overdrachtsnelheid weergeven i.p.v. de gemiddelde snelheid" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "&Display size in bytes" msgstr "Grootte in bytes weergeven" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3844 msgid "&Do not remember passwords (recommended)" -msgstr "&Wachtwoorden niet opslaan (aanbevolen)" +msgstr "Wachtwoorden niet opslaan (aanbevolen)" #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." -msgstr "Dit dialoogvenster niet meer weergeven." +msgstr "Dit dialoogvenster niet meer tonen." #: ../../locales/../src/interface/resources/xrc/settings.xrc:389 msgid "&Don't use external IP address on local connections." msgstr "Geen extern IP-adres gebruiken op lokale verbindingen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1826 msgid "&Double-click action on files:" msgstr "Dubbeklikactie voor bestanden:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "&Download" msgstr "Downloaden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 msgid "&Download to:" msgstr "Downloaden naar:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:610 msgid "&Download..." msgstr "Downloaden..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "Downloads:" @@ -455,27 +469,27 @@ msgid "&Edit" msgstr "Bewerken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 msgid "&Edit filter rules..." msgstr "Filterregels bewerken..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:646 msgid "&Enable" msgstr "Inschakelen" #: ../../locales/../src/interface/resources/xrc/settings.xrc:687 msgid "&Enable compression" -msgstr "" +msgstr "Compressie inschakelen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3733 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "Snelheidslimieten inschakelen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:560 msgid "&Encoding:" msgstr "Codering:" @@ -483,24 +497,24 @@ msgid "&Encryption:" msgstr "Versleuteling:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "Aangepaste opdracht invoeren..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3671 msgid "&Establish connection in a new tab" msgstr "Verbinding maken in een nieuwe tab" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Execute" msgstr "Uitvoeren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1585 msgid "&Export Site Manager entries" -msgstr "Sitebeheervermeldingen exporteren" +msgstr "Sitebeheeringangen exporteren" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 msgid "&Export..." msgstr "Exporteren..." @@ -512,41 +526,51 @@ msgid "&File" msgstr "Bestand" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "&File Attributes..." msgstr "Bestandsattributen..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "Bestandsrechten..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2299 msgid "&File:" msgstr "Bestand:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1296 msgid "&Filter conditions:" msgstr "Filtervoorwaarden:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1057 msgid "&Filter sets:" msgstr "Filtergroepen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1660 +msgid "&Filters" +msgstr "Filters" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 msgid "&Filters:" msgstr "Filters:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1773 msgid "&Finish editing and delete local file" msgstr "Bewerken voltooien en het lokale bestand verwijderen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3332 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "Lokale paden vlakmaken, alle bestanden direct naar doelmap uploaden" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3237 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "Externe paden vlakmaken, alle bestanden direct naar doelmap downloaden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3414 msgid "&Follow symlink, delete target directory contents" msgstr "Symbolische link volgen, inhoud van doelmap verwijderen" @@ -558,7 +582,7 @@ msgid "&Getting help..." msgstr "Hulp vragen..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2651 msgid "&Global bookmark" msgstr "Globale bladwijzer" @@ -571,11 +595,11 @@ msgstr "Help" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:550 msgid "&Hide identical files" msgstr "Identieke bestanden verbergen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "Hoogst" @@ -583,17 +607,17 @@ msgid "&Highest available port:" msgstr "Hoogst beschikbare poort:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2446 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:51 msgid "&Host:" msgstr "Host:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1627 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "IEC-binaire voorvoegsels (bijv. 1 KiB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1513 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "ISO 8601 (voorbeeld: 2007-09-15)" @@ -601,22 +625,25 @@ msgid "&Import..." msgstr "Importeren..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2002 msgid "&Inherit system's filetype associations" msgstr "Bestandstype-associaties van systeem overnemen" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "Nieuwe versie installeren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3144 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3325 +msgid "&Keep local path structure relative to search root" +msgstr "Structuur van lokaal pad relatief houden aan basispad" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3230 msgid "&Keep remote path structure relative to search root" msgstr "Structuur van externe pad relatief houden aan zoekroot" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 -#, fuzzy msgid "&Key file:" -msgstr "Bestand openen" +msgstr "Sleutelbestand:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" @@ -626,7 +653,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "Lokale poorten gebruikt door FileZilla begrenzen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "&Limit number of simultaneous connections" msgstr "Het aantal gelijktijdige verbindingen begrenzen" @@ -634,12 +661,16 @@ msgid "&Local directory tree" msgstr "Lokale mappenstructuur:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2737 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2705 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2795 msgid "&Local directory:" msgstr "Lokale map:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +msgid "&Local search" +msgstr "Lokaal zoeken" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "&Log to file" msgstr "Naar bestand loggen" @@ -647,11 +678,11 @@ msgid "&Logon Type:" msgstr "Inlogtype:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2501 msgid "&Logontype:" msgstr "Inlogtype:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "Laag" @@ -663,7 +694,7 @@ msgid "&Manual transfer..." msgstr "Handmatige overdracht..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:499 msgid "&Maximum number of connections:" msgstr "Maximaal aantal verbindingen:" @@ -679,11 +710,11 @@ msgid "&Minimize to tray" msgstr "Minimaliseren naar systeemvak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "&Name sorting mode:" msgstr "Naam van sorteermodus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2678 msgid "&Name:" msgstr "Naam:" @@ -691,7 +722,7 @@ msgid "&Network configuration wizard..." msgstr "Netwerkconfiguratiewizard..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1243 msgid "&New" msgstr "Nieuw" @@ -699,35 +730,36 @@ msgid "&New Site" msgstr "Nieuwe site" -#: ../../locales/../src/interface/Mainfrm.cpp:1688 +#: ../../locales/../src/interface/Mainfrm.cpp:1671 msgid "&New version available!" msgstr "Nieuwe versie beschikbaar!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "Volgende >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1786 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 msgid "&No" msgstr "Nee" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 #: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "Geen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "Normaal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:501 msgid "&Numeric value:" msgstr "Numerieke waarde:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2878 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2936 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:622 msgid "&OK" msgstr "OK" @@ -736,29 +768,29 @@ msgstr "OPEN" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 msgid "&Open" msgstr "Openen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "Overschrijven" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:480 msgid "&Passive" msgstr "Passief" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "Wachtwoord:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "Geluid afspelen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:64 msgid "&Port:" msgstr "Poort:" @@ -766,11 +798,11 @@ msgid "&Preserve timestamps of transferred files" msgstr "Tijdstempels van overgedragen bestanden behouden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 msgid "&Queue" msgstr "Wachtrij" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:72 msgid "&Quickconnect" msgstr "Snelverbinden" @@ -778,11 +810,11 @@ msgid "&Quickconnect bar" msgstr "Snelverbindenbalk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1518 msgid "&Quickconnect history" msgstr "Snelverbindengeschiedenis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:403 msgid "&Read" msgstr "Lezen" @@ -790,33 +822,36 @@ msgid "&Reconnect" msgstr "Opnieuw verbinden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1525 msgid "&Reconnect information" -msgstr "Herverbindeninformatie wissen" +msgstr "Herverbindingsinformatie" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:641 msgid "&Refresh" msgstr "Vernieuwen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:354 msgid "&Remember password until FileZilla is closed" msgstr "Wachtwoord onthouden totdat FileZilla wordt afgesloten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3838 msgid "&Remember passwords" msgstr "Wachtwoorden onthouden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2732 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2819 msgid "&Remote directory:" msgstr "Externe map:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2335 msgid "&Remote path:" msgstr "Extern pad:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +msgid "&Remote search" +msgstr "Extern zoeken" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "Verwijderen" @@ -825,25 +860,25 @@ msgid "&Remove key" msgstr "Sleutel verwijderen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "Selectie verwijderen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2823 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2881 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Hernoemen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1075 msgid "&Rename..." msgstr "Hernoemen..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 msgid "&Reopen local file" msgstr "Lokaal bestand heropenen" @@ -855,7 +890,11 @@ msgid "&Report a bug..." msgstr "Fout rapporteren..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "Aandacht vragen" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 msgid "&Reset and requeue all" msgstr "Resetten en allemaal opnieuw in wachtrij zetten" @@ -863,11 +902,11 @@ msgid "&Restart Wizard" msgstr "Wizard herstarten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "Hervatten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "Opdracht uitvoeren..." @@ -875,7 +914,7 @@ msgid "&Run configuration wizard now..." msgstr "Configuratiewizard nu uitvoeren..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2095 msgid "&Run update check now..." msgstr "Nu controleren op updates..." @@ -887,11 +926,11 @@ msgid "&SOCKS 5" msgstr "SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 msgid "&Save as..." msgstr "Opslaan als..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3076 msgid "&Search" msgstr "Zoeken" @@ -903,20 +942,20 @@ msgid "&Select Entry:" msgstr "Item selecteren:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1878 msgid "&Select language:" msgstr "Taal selecteren:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2187 msgid "&Select the columns that should be displayed:" msgstr "De kolommen die weergegeven moeten worden selecteren:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "Server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1648 msgid "&Settings" msgstr "Instellingen" @@ -924,36 +963,31 @@ msgid "&Settings..." msgstr "Instellingen..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Show debug menu" -msgstr "Debug-menu weergeven" +msgstr "Debug-menu tonen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 msgid "&Show detailed log" -msgstr "&Gedetailleerde log weergeven" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "Bericht weergeven" +msgstr "&Gedetailleerde log tonen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "&Show timestamps in message log" -msgstr "Tijdstempels in berichtenlogboek weergeven" +msgstr "Tijdstempels in berichtenlogboek tonen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1531 msgid "&Site Manager entries" -msgstr "Sitebeheeritems" +msgstr "Sitebeheeringangen" #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "Sitebeheer..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 msgid "&Site-specific bookmark" msgstr "Site-specifieke bladwijzer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "Overslaan" @@ -961,7 +995,8 @@ msgid "&Speed limits" msgstr "Snelheidslimieten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "&Start transfer immediately" msgstr "Overdracht meteen beginnen" @@ -969,11 +1004,11 @@ msgid "&Swap local and remote panes" msgstr "Lokale en externe panelen verwisselen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 msgid "&TLS Ciphers" msgstr "TLS-Code" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "Testen" @@ -985,11 +1020,11 @@ msgid "&Transfer" msgstr "Overdracht" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 msgid "&Transfer mode:" msgstr "Overdrachtmodus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "Overdrachtwachtrij" @@ -998,33 +1033,41 @@ msgid "&Treat dotfiles as ASCII files" msgstr "Puntbestanden als ASCII-bestanden behandelen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1949 msgid "&Unedit" msgstr "Niet bewerken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1017 msgid "&Update cached key for this host" msgstr "Gecachte sleutel voor deze host bijwerken" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "&Upload" msgstr "Uploaden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "&Upload to:" +msgstr "Uploaden naar:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +msgid "&Upload..." +msgstr "Uploaden..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "Uploads:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 msgid "&Use custom program" msgstr "Aangepast programma gebruiken" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:383 msgid "&Use synchronized browsing" msgstr "Gesynchroniseerd bladeren gebruiken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "&Use system's default editor for text files" msgstr "" "Standaard bewerkingsprogramma van systeem voor tekstbestanden gebruiken" @@ -1037,21 +1080,21 @@ msgid "&Use the server's external IP address instead" msgstr "Het externe IP-adres van de server gebruiken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1642 msgid "&Use thousands separator" msgstr "Duizend-scheidingsteken gebruiken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2513 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "Gebruiker:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "&Username:" msgstr "Gebruikersnaam:" -#: ../../locales/../src/interface/Mainfrm.cpp:1682 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 #, c-format msgid "&Version %s" msgstr "Versie %s" @@ -1061,49 +1104,49 @@ msgstr "Beeld" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:616 msgid "&View/Edit" msgstr "Bekijken/bewerken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1979 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "Lokaal bewerkte bestanden monitoren en vragen om wijzigingen te uploaden" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&When checking for updates, check for:" msgstr "Bij het controleren op updates, controleren op:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Write" msgstr "Schrijven" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1780 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 msgid "&Yes" msgstr "Ja" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "%s bestaat niet of kan niet gelezen worden." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' is geen map." -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 msgid "'Account' logontype not supported by selected protocol" msgstr "" "Het inlogtype 'Account' wordt niet ondersteund door het geselecteerde " "protocol" -#: ../../locales/../src/interface/manual_transfer.cpp:440 +#: ../../locales/../src/interface/manual_transfer.cpp:446 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1111,7 +1154,7 @@ "De inlogtypes 'Normaal' en 'Account' zijn niet beschikbaar. 'Vragen naar een " "wachtwoord' wordt in die plaats gebruikt." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1119,7 +1162,7 @@ "De inlogtypes 'Normaal' en 'Account' zijn niet beschikbaar. Uw keuze is " "aangepast in 'Vragen naar een wachtwoord'." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../locales/../src/interface/Mainfrm.cpp:587 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1129,18 +1172,18 @@ "opdrachtregelcliënten om de argumenten achter 'quote' naar de server te " "sturen. U wilt misschien de ruwe opdracht gebruiken zonder 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d object gefilterd)" msgstr[1] "(%d objecten gefilterd)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" -msgstr "" +msgstr "(%u%% gedownload)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:858 #: ../../locales/../src/interface/resources/xrc/settings.xrc:879 @@ -1163,22 +1206,22 @@ msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 om uit te schakelen)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:90 +#: ../../locales/../src/interface/aboutdialog.cpp:179 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat is ingesteld op %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1580 msgid "(example: %H:%M)" msgstr "(voorbeeld: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 msgid "(example: %Y-%m-%d)" msgstr "(voorbeeld: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3584 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3752 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3769 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1189,7 +1232,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "--:--:-- left" msgstr "--:--:-- resterend" @@ -1209,35 +1252,35 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s kan niet samen gebruikt worden met een FTP-URL." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2255 msgid "0 - None" msgstr "0 - Niets" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2256 msgid "1 - Warning" msgstr "1 - Waarschuwing" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "2 - Info" msgstr "2 - Informatie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2258 msgid "3 - Verbose" msgstr "3 - Uitgebreid" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:103 msgid "32-bit system" msgstr "32-bitsysteem" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2259 msgid "4 - Debug" msgstr "4 - Debug" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:101 msgid "64-bit system" msgstr "64-bitsysteem" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< Vorige" @@ -1245,20 +1288,24 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Er bestaat al een bladwijzer met de ingevoerde naam. Kies een niet gebruikte " "naam." +#: ../../locales/../src/engine/tlssocket.cpp:1333 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Een certificaat in de keten is getekend met een onveilig algoritme" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Er moet een standaard bewerkingsprogramma ingesteld worden." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:166 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:788 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Een map kan niet in één van zijn submappen worden gesleept." @@ -1272,21 +1319,21 @@ "zo'n geval kunt u gebruik maken van de actieve modus. In actieve modus opent " "FileZilla een poort en vraagt de server ermee te verbinden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1699 msgid "A file previously opened has been changed." msgstr "Een eerder geopend bestand is gewijzigd." -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "A file with that name is already being transferred." msgstr "Een bestand met die naam wordt al overgezet." -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Een bestand met die naam wordt nog bewerkt. Sluit het en probeer het opnieuw." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1301,11 +1348,11 @@ "bestandenlijsten.\n" "Er wordt geen waarschuwing meer gegeven worden gedurende deze sessie." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Een nieuwe versie van FileZilla is beschikbaar:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../locales/../src/interface/Mainfrm.cpp:658 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1320,9 +1367,9 @@ "you need this." msgstr "" "Een goede server vereist dit niet. Neem contact op met de serverbeheerder " -"indien u dit nodig heeft." +"als u dit nodig hebt." -#: ../../locales/../src/interface/state.cpp:256 +#: ../../locales/../src/interface/state.cpp:254 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1333,7 +1380,7 @@ "lokale map?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "ASCII" @@ -1354,19 +1401,19 @@ msgid "A&pply only to uploads" msgstr "Alleen toepassen op uploads" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:535 msgid "A&pply to all files and directories" msgstr "Toepassen op alle bestanden en mappen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "A&utomatically remove successful transfers" msgstr "Succesvolle overdrachten automatisch verwijderen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2590 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:576 msgid "About FileZilla" msgstr "Over FileZilla" @@ -1374,31 +1421,36 @@ msgid "Above the file lists" msgstr "Boven de bestandenlijsten" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:113 +#, fuzzy +msgid "Access to some local directories could not be restored:" +msgstr "De lokale map '%s' kan niet gemaakt worden." + +#: ../../locales/../src/engine/server.cpp:912 +#: ../../locales/../src/engine/server.cpp:933 #: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/manual_transfer.cpp:547 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1329 msgid "Account" msgstr "Account" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "Actie na verwerking van wachtrij" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1942 msgid "Action on selected file:" msgstr "Actie voor geselecteerd bestand:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1822 msgid "Action to perform:" msgstr "Uit te voeren actie:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Actie:" @@ -1406,7 +1458,7 @@ msgid "Active mode" msgstr "Actieve modus" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1414,7 +1466,7 @@ "FTP-test met actieve modus is mislukt. FileZilla herkent het juiste externe " "IP-adres niet." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1422,7 +1474,7 @@ "FTP-test met actieve modus is mislukt. FileZilla herkent het juiste externe " "IP-adres niet. Daarnaast heeft uw router het verzendadres aangepast." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1436,12 +1488,13 @@ msgid "Active mode IP" msgstr "IP voor actieve modus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3350 msgid "Add files to &queue only" msgstr "Bestanden alleen aan wachtrij toevoegen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "Add selected directory to the transfer queue" msgstr "Geselecteerde map toevoegen aan de overdrachtwachtrij" @@ -1450,20 +1503,20 @@ msgid "Add selected files and folders to the transfer queue" msgstr "Geselecteerde bestanden en mappen toevoegen aan de overdrachtwachtrij" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1854 msgid "Add to queue" msgstr "Toevoegen aan wachtrij" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Address type not supported" msgstr "Adrestype niet ondersteund" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:308 msgid "Advanced" msgstr "Geavanceerd" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2086 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1477,15 +1530,16 @@ "zelfs uw systeem beschadigen. Gebruik bèta- en ontwikkelversies op eigen " "risico." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3688 msgid "Al&ways perform this action" msgstr "Deze actie altijd gebruiken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2067 msgid "Algorithm:" msgstr "Algoritme:" -#: ../../locales/../src/interface/QueueView.cpp:2953 +#: ../../locales/../src/interface/QueueView.cpp:2577 msgid "All files have been successfully transferred" msgstr "Alle bestanden zijn succesvol overgedragen" @@ -1494,7 +1548,7 @@ msgstr "" "Alle poorten in het opgegeven bereik moeten tussen 1024 en 65535 liggen." -#: ../../locales/../src/interface/QueueView.cpp:2949 +#: ../../locales/../src/interface/QueueView.cpp:2573 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1512,11 +1566,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Bij een fout terugvallen op een andere overdrachtmodus toestaan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3648 msgid "Already connected" msgstr "Al verbonden" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternatieve naam:" @@ -1538,13 +1592,13 @@ "U kunt ook de SSH-agent van uw systeem gebruiken. Hiervoor moet de " "SSH_AUTH_SOCK-variabele ingeschakeld zijn." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "U kunt ook de laatste versie van de FileZilla-website downloaden:" -#: ../../locales/../src/interface/QueueView.cpp:1919 +#: ../../locales/../src/interface/QueueView.cpp:1615 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1553,7 +1607,7 @@ "Er is een fout opgetreden bij het laden van de wachtrij van \"%s\".\n" "Het is mogelijk dat een aantal items uit de wachtrij niet werd hersteld." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1513 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1562,7 +1616,11 @@ "Er is een fout opgetreden bij het opslaan van de wachtrij van \"%s\".\n" "Het is mogelijk dat een aantal items uit de wachtrij niet is opgeslagen." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/engine/tlssocket.cpp:1336 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Een uitgever in de certificaatketen is geen certificeringsinstantie" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2081 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1570,54 +1628,54 @@ "Een bestand met dezelfde naam als het gesleepte item bestaat al op de " "doellocatie." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:935 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:545 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1327 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1624 msgid "Anonymous" msgstr "Anoniem" -#: ../../locales/../src/interface/state.cpp:914 +#: ../../locales/../src/interface/state.cpp:1017 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "Een andere externe bewerking is al bezig. Kan de map nu niet wijzigen." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:807 msgid "Any changes made in the Site Manager could not be saved." msgstr "De veranderingen in Sitebeheer kunnen niet worden opslagen." -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:955 msgid "Any changes made to the filters could not be saved." msgstr "De veranderingen aan de filters kunnen niet worden opslagen." -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:863 msgid "Any changes made to the filters will not be saved." msgstr "De veranderingen aan de filters worden niet opgeslagen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:549 msgid "App&ly to directories only" msgstr "Alleen toepassen op mappen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1202 msgid "Apply" msgstr "Toepassen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Alleen toepassen op huidige wachtrij" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:542 msgid "Apply to &files only" msgstr "Alleen toepassen op bestanden" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Archief" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Argument buffer overflow" msgstr "Argument-buffergrootte overschreden" @@ -1625,17 +1683,17 @@ msgid "As tab in the transfer queue pane" msgstr "Als tab in het overdrachtwachtrijpaneel" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1442 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Vragen naar actie" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:906 +#: ../../locales/../src/engine/server.cpp:927 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Vragen naar een wachtwoord" @@ -1647,7 +1705,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Het besturingssysteem naar het externe IP-adres vragen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3549 msgid "Asking questions in the FileZilla forums" msgstr "Vragen stellen in de FileZilla-forums" @@ -1655,7 +1713,7 @@ msgid "Associated program not found:" msgstr "Geassocieerde programma is niet gevonden:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Minstens een filtervoorwaarde is onvolledig" @@ -1663,11 +1721,11 @@ msgid "At this point, all required information has been gathered." msgstr "Alle benodigde informatie is nu verzameld." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Attribuut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:658 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:617 msgid "Authentication failed." msgstr "Authenticatie mislukt" @@ -1675,7 +1733,7 @@ msgid "Author:" msgstr "Auteur:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 msgid "Auto" msgstr "Automatisch" @@ -1683,24 +1741,20 @@ msgid "Automatic file type classification" msgstr "Automatische bestandstypeclassificatie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Beschikbare groottes" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:334 msgid "B&ypass proxy" msgstr "Proxy niet gebruiken" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1027 msgid "Bad file descriptor" msgstr "Beschrijving van beschadigd bestand" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3586 msgid "Basic usage instructions" msgstr "Basisinstructies voor gebruik" @@ -1708,16 +1762,16 @@ msgid "Behaviour" msgstr "Gedrag" -#: ../../locales/../src/interface/edithandler.cpp:1115 -#: ../../locales/../src/interface/edithandler.cpp:1143 +#: ../../locales/../src/interface/edithandler.cpp:1126 +#: ../../locales/../src/interface/edithandler.cpp:1154 msgid "Being edited" msgstr "Wordt bewerkt" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1327 msgid "Beware! Certificate has been revoked" msgstr "Let op! Het certificaat is ingetrokken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 msgid "Binary" msgstr "Binair" @@ -1725,17 +1779,21 @@ msgid "Blackboard" msgstr "Schoolbord" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "Blauw" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:300 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:381 msgid "Bookmark" msgstr "Bladwijzer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2858 msgid "Bookmark:" msgstr "Bladwijzer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2847 msgid "Bookmarks" msgstr "Bladwijzers" @@ -1743,15 +1801,15 @@ msgid "Browse..." msgstr "Bladeren..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:660 msgid "Build date:" msgstr "Build-datum:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:637 msgid "Build information" msgstr "Build-informatie" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Business category:" msgstr "Categorie zakelijk:" @@ -1769,93 +1827,101 @@ msgid "C&ancel current operation" msgstr "Huidige actie annuleren" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "Alles wissen" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "C&opy URL(s) to clipboard" msgstr "URL('s) naar klembord kopiëren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:625 +msgid "C&opy URL(s) with password to clipboard" +msgstr "URL('s) met wachtwoord naar klembord kopiëren" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1518 msgid "C&ustom" msgstr "Aangepast" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2007 msgid "C&ustom filetype associations:" msgstr "Aangepaste bestandstype-associaties:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:764 msgid "CPU features:" -msgstr "" +msgstr "CPU-eigenschappen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1210 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1657 msgid "Calculating timezone offset of server..." msgstr "Tijdzoneverschil van server berekenen..." -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../../locales/../src/engine/transfersocket.cpp:688 msgid "Can't read from file" msgstr "Kan niet lezen van bestand" -#: ../../locales/../src/engine/transfersocket.cpp:648 -#: ../../locales/../src/engine/transfersocket.cpp:714 +#: ../../locales/../src/engine/transfersocket.cpp:666 +#: ../../locales/../src/engine/transfersocket.cpp:741 msgid "Can't write data to file." msgstr "Kan geen gegevens schrijven naar bestand." -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:669 +#: ../../locales/../src/engine/transfersocket.cpp:744 #, c-format msgid "Can't write data to file: %s" msgstr "Kan geen gegevens schrijven naar bestand: %s" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2716 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2884 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2974 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1680 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1854 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2942 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3437 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3923 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:629 msgid "Cancel" msgstr "Annuleren" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Huidige bewerking annuleren" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Onderbreekt de huidige bewerking" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Kan %s niet benaderen, geen media aanwezig of het station is niet gereed." -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Cannot add server to Site Manager" msgstr "Kan server niet aan Sitebeheer toevoegen" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Cannot assign requested address" msgstr "Kan het gevraagde adres niet toewijzen" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1863,7 +1929,7 @@ "Kan de tab niet sluiten als er nog activiteit is.\n" "Wilt u de huidige bewerking annuleren en de tab sluiten?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1875,22 +1941,22 @@ msgid "Cannot create new filter" msgstr "Kan geen nieuwe filter aanmaken" -#: ../../locales/../src/interface/edithandler.cpp:1575 -#: ../../locales/../src/interface/edithandler.cpp:1623 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1634 +#: ../../locales/../src/interface/LocalListView.cpp:1741 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Cannot edit file" msgstr "Kan bestand niet bewerken" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1622 msgid "Cannot edit file, not connected to any server." msgstr "Kan bestand niet bewerken: niet verbonden met een server." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Cannot edit file, remote path unknown." msgstr "Kan bestand niet bewerken: externe pad onbekend." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:370 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1898,84 +1964,77 @@ "Kan geen FTP-verbinding maken met een SFTP-server. Selecteer een geschikt " "protocol." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Kan de snelverbindenbalk niet laden uit bronbestand" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 -#, fuzzy +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Cannot load key file" msgstr "Kan sleutelbestand niet laden" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:1008 msgid "Cannot load toolbar from resource file" msgstr "Kan de werkbalk niet laden uit bronbestand" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:450 msgid "Cannot remember password" msgstr "Kan wachtwoord niet onthouden" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216 msgid "Cannot rename entry" msgstr "Kan de vermelding niet hernoemen" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Cannot rename file" msgstr "Kan het bestand niet hernoemen" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:137 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Kan de hostnaam niet naar IPv4-adres omzetten om te gebruiken met de SOCKS4 " "proxy." -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "Cannot save filterset" msgstr "Kan filtergroep niet opslaan" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Cannot select filter" msgstr "Kan filter niet selecteren" -#: ../../locales/../src/interface/edithandler.cpp:1473 -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../../locales/../src/interface/edithandler.cpp:1484 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "Cannot set file association" msgstr "Kan bestandsassociatie niet instellen" -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Cannot show dialog" -msgstr "Kan het dialoogvenster niet weergeven" +msgstr "Kan het dialoogvenster niet tonen" -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "Cannot view/edit selected file" msgstr "Kan geselecteerde bestand niet bekijken/bewerken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1762 msgid "Case insensitive" msgstr "Niet-hoofdlettergevoelig" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1761 msgid "Case insensitive (default)" msgstr "Niet-hoofdlettergevoelig (standaard)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1763 msgid "Case sensitive" msgstr "Hoofdlettergevoelig" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1764 msgid "Case sensitive (default)" msgstr "Hoofdlettergevoelig (standaard)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 msgid "Categories to clear" -msgstr "Categorieën" +msgstr "Te wissen categorieën" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Certificate and session data are not available yet." msgstr "Certificaat- en sessiegegevens zijn nog niet beschikbaar." @@ -1987,30 +2046,34 @@ msgid "Certificate issuer" msgstr "Certificaatuitgever" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket.cpp:1330 +msgid "Certificate signature verification failed" +msgstr "Verificatie certificaathandtekening mislukt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Oproepen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:384 msgid "Change file attributes" msgstr "Bestandsattributen wijzigen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:530 msgid "Change the file permissions." msgstr "Bestandsrechten wijzigen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2206 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Na het wijzigen van de logbestandsinstellingen moet FileZilla herstart " "worden." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "Character encoding issue" msgstr "Probleem met tekenomzetting" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:522 msgid "Charset" msgstr "Tekenset" @@ -2018,7 +2081,7 @@ msgid "Check for &updates..." msgstr "Controleren op updates..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2053 msgid "Check for FileZilla &updates automatically:" msgstr "Automatisch controleren op FileZilla updates:" @@ -2030,11 +2093,11 @@ msgid "Check for newer versions of FileZilla" msgstr "Zoeken naar nieuwere versies van FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Check for updates failed" msgstr "Updatecontrole mislukt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:828 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2042,7 +2105,7 @@ "Controleer uw login-gegevens. Het ingevoerde wachtwoord begint of eindigt " "met een spatie." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:824 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2050,40 +2113,39 @@ "Controleer uw login-gegevens. De ingevoerde gebruikersnaam begint of eindigt " "met een spatie." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "Checking for correct external IP address" msgstr "Controleren op correct extern IP-adres" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Zoeken naar updates..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:754 #, c-format msgid "Checksum match on file %s\n" msgstr "Checksum komt overeen met bestand %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:750 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Checksum komt niet overeen met bestand %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 -#, fuzzy +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1525 msgid "Choose a key file" -msgstr "Sleutelbestand converteren" +msgstr "Sleutelbestand kiezen" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1556 msgid "Choose the default local directory" msgstr "De standaard lokale map kiezen" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2242 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2319 msgid "Choose the local directory" msgstr "De lokale map kiezen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 msgid "Chunk data improperly terminated" msgstr "Blokgegevens verkeerd afgesloten" @@ -2092,54 +2154,58 @@ msgstr "Code:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:634 msgid "Cl&ose tab" -msgstr "Tab sluiten" +msgstr "Tab s&luiten" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 msgid "Classic" msgstr "Klassiek" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" -msgstr "Lay-outcache wissen" +msgstr "&Lay-outcache wissen" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 +msgid "Clear auto&update data" +msgstr "Auto-&update data wissen" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/quickconnectbar.cpp:200 msgid "Clear history" msgstr "Geschiedenis wissen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1499 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Privégegevens wissen" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:199 msgid "Clear quickconnect bar" msgstr "Snelverbindenbalk wissen" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Klik op Afsluiten om uw configuratie op te slaan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2113 msgid "Client to server MAC:" msgstr "MAC van cliënt naar server:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2103 msgid "Client to server cipher:" msgstr "Code van cliënt naar server:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:637 msgid "Close &all other tabs" msgstr "Alle andere tabs sluiten" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1125 -#: ../../locales/../src/interface/Mainfrm.cpp:1146 +#: ../../locales/../src/interface/Mainfrm.cpp:1144 +#: ../../locales/../src/interface/Mainfrm.cpp:1165 msgid "Close FileZilla" msgstr "FileZilla sluiten" @@ -2151,66 +2217,65 @@ msgid "Closes current tab" msgstr "De huidige tab sluiten" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:289 msgid "Co&mments:" msgstr "Opmerkingen:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Kolomeigenschappen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2172 msgid "Column setup" msgstr "Kolominstellingen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1951 msgid "Command and its arguments should be properly quoted." msgstr "De opdracht en de argumenten moeten correct opgemaakt zijn." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:244 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:257 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:271 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Command failed" msgstr "Opdracht mislukt" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Command not supported" msgstr "Opdracht niet ondersteund" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:227 msgid "Command not supported by this protocol" msgstr "Opdracht wordt niet ondersteund door het geselecteerde protocol" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:280 -#: ../../locales/../src/interface/StatusView.cpp:336 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Command:" msgstr "Opdracht:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "Opmerking" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Common name:" msgstr "Gebruikelijke naam:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Communicatie onderbroken door router of firewall" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:545 msgid "Compare &modification time" msgstr "Wijzigingstijd vergelijken" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 msgid "Compare file&size" msgstr "Bestandsgrootte vergelijken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1795 msgid "Comparison &threshold (in minutes):" msgstr "Vergelijkingsdrempel (in minuten):" @@ -2218,23 +2283,23 @@ msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "De vergelijkingsdrempel moet liggen tussen 0 en 1440 minuten." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:644 msgid "Compiled for:" msgstr "Gecompileerd voor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:652 msgid "Compiled on:" msgstr "Gecompileerd op:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Compiled with:" msgstr "Gecompileerd met:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:676 msgid "Compiler flags:" msgstr "Compilatievlaggen:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Gecomprimeerd" @@ -2242,8 +2307,8 @@ msgid "Concurrent transfers" msgstr "Gelijktijdige overdrachten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3142 msgid "Conditions are c&ase sensitive" msgstr "Voorwaarden zijn hoofdlettergevoelig" @@ -2259,31 +2324,36 @@ msgid "Configure port range" msgstr "Poortbereik configureren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3592 msgid "Configuring FileZilla and your network" msgstr "FileZilla en uw netwerk configureren" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:1202 msgid "Confirm deletion" msgstr "Verwijdering bevestigen" -#: ../../locales/../src/engine/local_filesys.cpp:129 -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1664 -#: ../../locales/../src/interface/RemoteListView.cpp:1394 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1598 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/RemoteListView.cpp:1423 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1051 +#: ../../locales/../src/interface/search.cpp:1158 msgid "Confirmation needed" msgstr "Bevestiging vereist" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Gefeliciteerd, uw configuratie lijkt te werken." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:198 msgid "Connect bypassing proxy settings" msgstr "Verbinden zonder proxyinstellingen te gebruiken" +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Verbinding maken mislukt: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Verbinden in de huidige tab" @@ -2296,29 +2366,25 @@ msgid "Connect to specified Site Manager site" msgstr "Verbinden met de gespecificeerde site in Sitebeheer" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "Verbonden" - -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "Verbinden" -#: ../../locales/../src/interface/netconfwizard.cpp:222 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:246 #, c-format msgid "Connecting to %s" msgstr "Verbinden met %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1047 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243 -#, fuzzy, c-format +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4333 +#, c-format msgid "Connecting to %s through %s proxy" -msgstr "Verbinden met %s via proxy" +msgstr "Verbinden met %s via %s proxy" -#: ../../locales/../src/engine/ControlSocket.cpp:955 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:371 +#: ../../locales/../src/engine/ControlSocket.cpp:966 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:274 #, c-format msgid "Connecting to %s..." msgstr "Verbinden met %s..." @@ -2327,196 +2393,229 @@ msgid "Connection" msgstr "Verbinding" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Connection aborted" msgstr "Verbinding verbroken" -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "Verbindingspoging mislukt" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:930 +#: ../../locales/../src/engine/proxy.cpp:210 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Verbindingspoging mislukt met \"%s\", probeert nu volgende adres." -#: ../../locales/../src/engine/ControlSocket.cpp:924 +#: ../../locales/../src/engine/ControlSocket.cpp:935 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Verbindingspoging mislukt met \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:183 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/engineprivate.cpp:700 msgid "Connection attempt interrupted by user" msgstr "Verbindingspoging onderbroken door gebruiker" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "Connection attempt timed out" msgstr "Verbindingingspoging verlopen" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Verbinding gesloten" -#: ../../locales/../src/engine/ControlSocket.cpp:1014 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1026 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:228 msgid "Connection closed by server" msgstr "Verbinding gesloten door server" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:272 msgid "Connection established, initializing TLS..." msgstr "Verbinding aangemaakt, TLS initialiseren..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:297 msgid "Connection established, sending HTTP request" msgstr "Verbinding aangemaakt, HTTP-verzoek verzenden" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Verbinding gemaakt, welkomstbericht afwachten." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:444 msgid "Connection established, waiting for welcome message..." -msgstr "Verbinding aangemaakt, welkomstbericht afwachten..." +msgstr "Verbinding gemaakt, welkomstbericht afwachten..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" -msgstr "Verbinding verloren" +msgstr "Verbinding verbroken" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Connection not allowed by ruleset" msgstr "Verbinding niet toegestaan door regelset" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "Connection refused" msgstr "Verbinding geweigerd" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1028 msgid "Connection refused by server" msgstr "Verbinding geweigerd door server" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Connection reset by network" msgstr "Verbinding gereset door netwerk" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Connection reset by peer" msgstr "Verbinding gereset door server" -#: ../../locales/../src/engine/ControlSocket.cpp:557 +#: ../../locales/../src/engine/ControlSocket.cpp:567 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Verbinding verlopen na %d seconde inactiviteit" msgstr[1] "Verbinding verlopen na %d seconden inactiviteit" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "Verbinding verlopen" -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:672 msgid "Connection to server lost." msgstr "Verbinding met server verloren" -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "Verbinding met proxy aangemaakt, handschudden..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Verbinding met de server is voortijdig afgebroken" -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Verbinding maken met de testserver is mislukt." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 -#, fuzzy +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Sleutelbestand converteren" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1895 #, c-format msgid "Copy (%d) of %s" msgstr "Kopiëren (%d) van %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1829 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1875 #, c-format msgid "Copy of %s" msgstr "Kopiëren van %s" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"De URL's van de geselecteerde items naar klembord kopiëren, inclusief " +"wachtwoord." + #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 msgid "Copy the URLs of the selected items to clipboard." msgstr "De URL's van de geselecteerde items naar klembord kopiëren" -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:182 #, c-format msgid "Could not accept connection: %s" msgstr "Kan verbinding niet accepteren: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:101 +#, fuzzy, c-format +msgid "Could not access path %s" +msgstr "Kan verbinding niet accepteren: %s" + +#: ../../locales/../src/engine/tlssocket.cpp:1310 +msgid "Could not add certificate to temporary trust list" +msgstr "Kan certificaat niet toevoegen aan tijdelijke vertrouwenslijst" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Kan verbinding niet toevoegen aan Sitebeheer" -#: ../../locales/../src/interface/state.cpp:755 +#: ../../locales/../src/interface/state.cpp:802 msgid "Could not complete operation" msgstr "Kan bewerking niet voltooien" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:181 msgid "Could not connect to server" msgstr "Kan niet verbinden met server" -#: ../../locales/../src/engine/ControlSocket.cpp:1084 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Kan niet verbinden met server: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:786 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:734 msgid "Could not convert command to server encoding" msgstr "Kan opdracht niet converteren naar servercodering" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:153 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:162 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Kan privésleutel niet converteren" -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/RemoteListView.cpp:2545 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1393 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not copy URLs" msgstr "Kan URL's niet kopiëren" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket.cpp:1292 +msgid "Could not copy certificate" +msgstr "Kan certificaat niet kopiëren" + +#: ../../locales/../src/interface/aboutdialog.cpp:203 msgid "Could not copy data" msgstr "Kan gegevens niet kopiëren" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:158 +#, fuzzy, c-format +msgid "Could not create CFURL from path %s" +msgstr "Kan niet lezen van socket: %s" + +#: ../../locales/../src/interface/updater.cpp:489 #, c-format msgid "Could not create local file %s\n" msgstr "Kan lokaal bestand %s niet aanmaken\n" -#: ../../locales/../src/engine/logging.cpp:165 -#, fuzzy, c-format +#: ../../locales/../src/engine/logging.cpp:179 +#, c-format msgid "Could not create logging mutex: %s" -msgstr "Kan lokaal bestand %s niet aanmaken\n" +msgstr "Kan geen mutex-logbestand aanmaken: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2193 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "" + +#: ../../locales/../src/interface/RemoteListView.cpp:2211 +#: ../../locales/../src/interface/RemoteTreeView.cpp:848 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " "files into an Explorer window." msgstr "" "Kan niet het doel van de 'Slepen en Zetten'-bewerking bepalen.\n" -"Óf de shellextensie is niet goed geïnstalleerd óf u heeft de bestanden niet " +"Óf de shellextensie is niet goed geïnstalleerd óf u hebt de bestanden niet " "naar een Verkenner-venster gesleept." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4092 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4187 msgid "Could not establish connection to server" msgstr "Kan geen verbinding maken met de server" -#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../../locales/../src/interface/FileZilla.cpp:418 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2528,11 +2627,11 @@ "datadir '-opdrachtregeloptie of door de FZ_DATADIR-" "omgevingsvariabele in te stellen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:722 msgid "Could not generate custom login sequence." msgstr "Kan geen aangepaste inlogreeks genereren" -#: ../../locales/../src/engine/tlssocket.cpp:930 +#: ../../locales/../src/engine/tlssocket.cpp:1075 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2540,7 +2639,7 @@ "Kan geen onderscheidende naam verkrijgen van certificaatverschaffer: " "gnutls_x509_get_issuer_dn mislukte" -#: ../../locales/../src/engine/tlssocket.cpp:907 +#: ../../locales/../src/engine/tlssocket.cpp:1051 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2548,34 +2647,36 @@ "Kan geen onderscheidende naam verkrijgen het certificaatonderwerp: " "gnutls_x509_get_dn mislukte" -#: ../../locales/../src/interface/state.cpp:900 +#: ../../locales/../src/interface/state.cpp:1002 msgid "Could not get full remote path." msgstr "Kan externe pad niet volledig verkrijgen." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:257 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:271 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:95 +#, fuzzy +msgid "Could not get native path from CFURL" +msgstr "Kan geen gegevens ontvangen van server." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:173 +#, fuzzy +msgid "Could not get path from URL" +msgstr "Kan geen antwoord krijgen van fzputtygen" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Could not get reply from fzputtygen." msgstr "Kan geen antwoord krijgen van fzputtygen" -#: ../../locales/../src/interface/edithandler.cpp:1575 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Could not get temporary directory to download file into." msgstr "Kan geen tijdelijke map gebruiken om het bestand in te downloaden" -#: ../../locales/../src/engine/tlssocket.cpp:853 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "Kan peercertificaten niet importeren: gnutls_x509_crt_import mislukte" - -#: ../../locales/../src/engine/tlssocket.cpp:848 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Kan de structuur voor peercertificaten niet initialiseren: " -"gnutls_x509_crt_init mislukte" +#: ../../locales/../src/interface/FileZilla.cpp:92 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Kan Winsock niet initialiseren (%d):%s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2585,16 +2686,21 @@ "Kan \"%s\" niet laden, controleer of het bestand geldig en toegankelijk is.\n" "Wijzigingen in Sitebeheer worden niet opgeslagen." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:53 -#, fuzzy +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Kan sleutelbestand niet laden" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Kan privésleutel niet laden" -#: ../../locales/../src/interface/state.cpp:922 +#: ../../locales/../src/interface/state.cpp:1025 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2605,7 +2711,7 @@ "Gesynchroniseerd bladeren uitschakelen en doorgaan met het wijzigen van de " "externe map?" -#: ../../locales/../src/interface/state.cpp:359 +#: ../../locales/../src/interface/state.cpp:371 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2615,7 +2721,7 @@ "Kan geen corresponderende lokale map verkrijgen voor de externe map '%s'.\n" "Gesynchroniseerd bladeren is uitgeschakeld." -#: ../../locales/../src/interface/state.cpp:265 +#: ../../locales/../src/interface/state.cpp:264 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2625,86 +2731,106 @@ "Kan geen corresponderende externe map verkrijgen voor de lokale map '%s'.\n" "Gesynchroniseerd bladeren is uitgeschakeld." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/aboutdialog.cpp:203 +#: ../../locales/../src/interface/RemoteListView.cpp:2545 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1393 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not open clipboard" msgstr "Kan klembord niet openen" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:177 -#: ../../locales/../src/engine/logging.cpp:208 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Kan logbestand niet openen: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." -msgstr "Kan externe pad niet analyseren" +msgstr "Kan externe pad niet analyseren." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:118 msgid "Could not parse server address:" msgstr "Kan serveradres niet analyseren:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:994 +msgid "Could not read from data socket." +msgstr "Kan niet lezen van data-socket." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 #, c-format msgid "Could not read from socket: %s" msgstr "Kan niet lezen van socket: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:553 msgid "Could not read server item." msgstr "Kan serveritem niet lezen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2592 +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Kan geen gegevens ontvangen van server." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:116 +#, fuzzy +msgid "Could not restore directory access" +msgstr "Kan serveradres niet analyseren:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2694 #, c-format msgid "Could not seek to offset %s within file" msgstr "Kan niet springen naar punt %s binnen bestand" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2603 msgid "Could not seek to the end of the file" msgstr "Kan niet tot einde van het bestand zoeken" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:244 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Kan geen opdracht versturen naar fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2620 +#: ../../locales/../src/engine/tlssocket.cpp:1261 +msgid "Could not sort peer certificates" +msgstr "Kan peercertificaat niet sorteren" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2724 msgid "Could not spawn IO thread" msgstr "Kan IO-thread niet maken" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Kan handschudden met proxy niet starten: %s" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "Kan de overdracht niet starten" -#: ../../locales/../src/interface/sitemanager.cpp:608 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:630 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:828 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " "%s" msgstr "" -"Kan \"%s\" niet schrijven,wijzigingen in Sitebeheer kunnen niet opgeslagen " +"Kan \"%s\" niet schrijven, wijzigingen in Sitebeheer kunnen niet opgeslagen " "worden: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "" "Kan \"%s\" niet schrijven, de bladwijzer kan niet toegevoegd worden: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Kan \"%s\" niet schrijven, de globale bladwijzers kunnen niet toegevoegd " "worden: %s" -#: ../../locales/../src/interface/QueueView.cpp:1858 +#: ../../locales/../src/interface/QueueView.cpp:1542 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2713,42 +2839,42 @@ "Kan \"%s\" niet schrijven, de wachtrij kan niet opgeslagen worden.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:718 -#: ../../locales/../src/interface/sitemanager.cpp:772 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../../locales/../src/interface/sitemanager.cpp:750 +#: ../../locales/../src/interface/sitemanager.cpp:807 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2297 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Kan \"%s\" niet schrijven, de geselecteerde sites kunnen niet geëxporteerd " "worden: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:149 #, c-format msgid "Could not write \"%s\":" msgstr "Kan \"%s\" niet schrijven:" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:162 -#, fuzzy, c-format +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 +#, c-format msgid "Could not write key file: %s" -msgstr "Kan sleutelbestand niet schrijven: %s" +msgstr "Kan niet schrijven naar sleutelbestand: %s" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "Kan niet schrijven naar lokaal bestand" -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/engine/logging.cpp:280 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Kan niet schrijven naar logbestand: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:880 -#: ../../locales/../src/engine/ControlSocket.cpp:983 +#: ../../locales/../src/engine/ControlSocket.cpp:890 +#: ../../locales/../src/engine/ControlSocket.cpp:994 #, c-format msgid "Could not write to socket: %s" msgstr "Kan niet schrijven naar socket: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Country:" msgstr "Land:" @@ -2756,17 +2882,25 @@ msgid "Crea&te new file" msgstr "Nieuw bestand aanmaken" +#: ../../locales/../src/interface/state.cpp:1040 +msgid "Create &missing local directory and enter it" +msgstr "Ontbrekende lokale map aanmaken en openen" + +#: ../../locales/../src/interface/state.cpp:962 +msgid "Create &missing remote directory and enter it" +msgstr "Ontbrekende externe map aanmaken en openen" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:573 msgid "Create a new subdirectory in the current directory" msgstr "Nieuwe submap aanmaken in de huidige map" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:509 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 msgid "Create a new subdirectory in the current directory and change into it" msgstr "In de huidige map een nieuwe submap aanmaken en openen" @@ -2776,50 +2910,50 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:268 #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Create director&y and enter it" msgstr "Map aanmaken en openen" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1233 msgid "Create directory" msgstr "Map aanmaken" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2631 msgid "Create empty file" msgstr "Leeg bestand aanmaken" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "Map aanmaken" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3167 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1926 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3217 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1844 #, c-format msgid "Creating directory '%s'..." msgstr "Map '%s' aanmaken..." -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:173 msgid "Critical error" msgstr "Fatale fout" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:164 msgid "Critical error:" msgstr "Fatale fout:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:124 msgid "Critical file transfer error" msgstr "Fatale bestandsoverdrachtfout" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:104 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Fatale bestandsoverdrachtfout na het overdragen van %s naar %s" -#: ../../locales/../src/interface/state.cpp:350 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2829,55 +2963,63 @@ "(%s).\n" "Gesynchroniseerd bladeren is uitgeschakeld." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:400 msgid "Current transfer type is set to ASCII." msgstr "Huidige overdrachttype is ingesteld op ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:408 msgid "Current transfer type is set to automatic detection." msgstr "Huidige overdrachttype is ingesteld op automatische detectie." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:404 msgid "Current transfer type is set to binary." msgstr "Huidige overdrachttype is ingesteld op binair." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2031 msgid "Curve:" -msgstr "" +msgstr "Grafiek:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1567 msgid "Cus&tom" msgstr "Aangepast" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:92 msgid "Custom filter set" msgstr "Aangepaste filtergroep" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2439 msgid "Custom server" msgstr "Aangepaste server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "Cyaan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2559 msgid "D&ata type" msgstr "Gegevenstype" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1637 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Decimale voorvoegsels met SI-symbolen (bijv. 1 kB = 1000 bytes)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:466 msgid "D&efault" msgstr "Standaard" #: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:619 msgid "D&elete" msgstr "Verwijderen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2755 +msgid "D&irectory comparison" +msgstr "Mappenvergelijking" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1111 msgid "D&isable all" msgstr "Alles uitschakelen" @@ -2885,37 +3027,37 @@ msgid "D&o not save passwords" msgstr "Geen wachtwoorden opslaan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "D&ouble-click action on directories:" msgstr "Dubbelklikactie voor mappen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1261 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2893 msgid "D&uplicate" msgstr "Kopiëren" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:40 msgid "DOS-like with virtual paths" msgstr "DOS-achtig met virtuele paden" -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "Dangerous filetype" msgstr "Gevaarlijk bestandstype" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "Gegevens" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." -msgstr "Datasocket te snel gesloten." +msgstr "Gegevenssocket te snel gesloten." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Datum" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 msgid "Date formatting" msgstr "Datumformaat" @@ -2931,15 +3073,15 @@ msgid "Debug" msgstr "Debuggen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 msgid "Debugging settings" msgstr "Instellingen debuggen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default &local directory:" msgstr "Standaard lokale map:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:32 msgid "Default (Autodetect)" msgstr "Standaard (autodetectie)" @@ -2947,17 +3089,17 @@ msgid "Default editor not properly quoted." msgstr "Standaard bewerkingsprogramma is niet correct opgegeven." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1461 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "Standaard 'bestand bestaat al'-actie" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:371 msgid "Default r&emote directory:" msgstr "Standaard externe map:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1100 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2965,7 +3107,7 @@ "Standaard extern pad kan niet geanalyseerd worden. Zorg ervoor dat het een " "geldig absoluut pad is voor het geselecteerde servertype." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Standaardsysteemtaal" @@ -2989,7 +3131,7 @@ "De vertraging tussen mislukte verbindingspogingen moet tussen 1 en 999 " "seconden liggen." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:541 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3004,12 +3146,12 @@ "De verbinding wordt %d seconden vertraagd als gevolg van een vorige mislukte " "verbindingspoging..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1249 msgid "Delete Site Manager entry" -msgstr "Sitebeheervermelding verwijderen" +msgstr "Sitebeheeringang verwijderen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:582 msgid "Delete selected directory" msgstr "Geselecteerde map verwijderen" @@ -3018,71 +3160,61 @@ msgid "Delete selected files and directories" msgstr "Geselecteerde bestanden en mappen verwijderen" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:380 #, c-format msgid "Deleting \"%s\"" msgstr "\"%s\" verwijderen" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:383 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "%u bestanden verwijderen uit \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Mappen verwijderen" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" -"Het verwijderen van meerdere ongerelateerde mappen wordt nog niet ondersteund" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Deleting symbolic link" msgstr "Symbolische link verwijderen" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:968 msgid "Desktop" msgstr "Bureaublad" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 msgid "Details" msgstr "Details" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Details for new key:" msgstr "Details voor nieuwe sleutel:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 -#, fuzzy +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 msgid "Detected newer version of FileZilla" -msgstr "Zoeken naar nieuwere versies van FileZilla" +msgstr "Nieuwere versies van FileZilla gevonden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1348 msgid "Dire&ctories" msgstr "Mappen" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Direction" msgstr "Richting" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "Map" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2776 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:463 -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2834 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1781 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:390 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2220 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "Directory comparison" msgstr "Mappenvergelijking" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Mappenvergelijking mislukt" @@ -3090,72 +3222,75 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "De map met het logbestand bestaat niet of de bestandsnaam is ongeldig." -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +msgid "Directory listing &filters..." +msgstr "Mappenlijstfilters..." + +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Directory listing aborted by user" msgstr "Weergeven van mappenlijst is onderbroken door gebruiker" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2047 msgid "Directory listing failed" msgstr "Mappenlijst opmaken mislukt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "Directory listing filters" msgstr "Mappenlijstfilters opmaken" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:196 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Mappenlijst van \"%s\" opmaken geslaagd" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Directory listing successful" msgstr "Mappenlijst opmaken geslaagd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1146 msgid "Disa&ble all" msgstr "Alles uitschakelen" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1033 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Gesynchroniseerd bladeren uitschakelen en doorgaan met het wijzigen van de " "externe map?" -#: ../../locales/../src/interface/Mainfrm.cpp:640 +#: ../../locales/../src/interface/Mainfrm.cpp:660 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" -"Schakel deze optie weer uit, indien u uw mappeninhoud niet meer correct kunt " -"zien." +"Schakel deze optie weer uit, als uw mappeninhoud niet meer correct kunt zien." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Verbinding met server verbreken" -#: ../../locales/../src/engine/ControlSocket.cpp:79 -#: ../../locales/../src/engine/ControlSocket.cpp:881 -#: ../../locales/../src/engine/ControlSocket.cpp:985 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:879 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:881 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/engine/ControlSocket.cpp:64 +#: ../../locales/../src/engine/ControlSocket.cpp:891 +#: ../../locales/../src/engine/ControlSocket.cpp:996 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:859 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" msgstr "Verbinding met server verbroken" -#: ../../locales/../src/engine/ControlSocket.cpp:1016 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 +#: ../../locales/../src/engine/ControlSocket.cpp:1028 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:874 #, c-format msgid "Disconnected from server: %s" msgstr "Verbinding verbroken met server: %s" -#: ../../locales/../src/interface/queue.cpp:380 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:240 msgid "Disconnecting from previous server" msgstr "Verbinding verbreken met vorige server" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Verbreekt de verbinding met de nu zichtbare server" @@ -3163,53 +3298,48 @@ msgid "Display about dialog" msgstr "'Over...'-venster weergeven" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Do ¬ use default editor" msgstr "Niet het standaard bewerkingsprogramma gebruiken" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Niets doen" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1896 msgid "Do the same with &all selected files already being edited" msgstr "Hetzelfde doen met &alle geselecteerde bestanden die bewerkt worden" -#: ../../locales/../src/interface/Mainfrm.cpp:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1169 msgid "Do you really want to close FileZilla?" msgstr "Wilt u FileZilla werkelijk sluiten?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" -"Wilt u de Sitebeheervermeldingen en de overdrachtwachtrij werkelijk " -"verwijderen?" +"Wilt u de Sitebeheeringangen en de overdrachtwachtrij werkelijk verwijderen?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" -msgstr "Wilt u de Sitebeheervermeldingen werkelijk verwijderen?" +msgstr "Wilt u de Sitebeheeringangen werkelijk verwijderen?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1251 msgid "Do you really want to delete selected entry?" msgstr "Wilt u de geselecteerde vermelding werkelijk verwijderen?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Wilt u de overdrachtwachtij werkelijk verwijderen?" -#: ../../locales/../src/interface/Mainfrm.cpp:579 +#: ../../locales/../src/interface/Mainfrm.cpp:588 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Wilt u werkelijk %s naar de server verzenden?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1889 msgid "Do you want to reopen this file?" msgstr "Wilt u dit bestand heropenen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 msgid "Documentation" msgstr "Documentatie" @@ -3223,35 +3353,35 @@ "Puntbestanden zijn bestandsnamen die beginnen met een punt, bijvoorbeeld ." "htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1819 msgid "Double-click action" msgstr "Dubbelklikactie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 msgid "Download" msgstr "Downloaden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3741 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Downloadlimiet:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:592 #, c-format msgid "Download limit: %s/s" msgstr "Downloadlimiet: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:595 msgid "Download limit: none" msgstr "Downloadlimiet: geen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3103 -#: ../../locales/../src/interface/search.cpp:518 -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 +#: ../../locales/../src/interface/search.cpp:868 +#: ../../locales/../src/interface/search.cpp:873 msgid "Download search results" msgstr "Zoekresultaten downloaden" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "Download selected directory" msgstr "Geselecteerde map downloaden" @@ -3259,7 +3389,7 @@ msgid "Download selected files and directories" msgstr "Geselecteerde bestanden en mappen downloaden" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../../locales/../src/interface/Mainfrm.cpp:980 #, c-format msgid "" "Download speed: %s/s\n" @@ -3268,33 +3398,24 @@ "Downloadsnelheid: %s/s\n" "Uploadsnelheid: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1100 +#: ../../locales/../src/interface/edithandler.cpp:1111 msgid "Downloading" msgstr "Downloaden" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:315 #, c-format msgid "Downloading %s" msgstr "%s downloaden" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" -"Het downloaden van meerdere ongerelateerde mappen wordt nog niet ondersteund" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Zoekresultaten downloaden" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Update downloaden..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:109 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:114 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:109 +#: ../../locales/../src/interface/RemoteTreeView.cpp:94 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3302,11 +3423,11 @@ "Slepen en Zetten tussen verschillende instanties van FileZilla is op dit " "moment nog niet mogelijk." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:115 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:118 +#: ../../locales/../src/interface/LocalTreeView.cpp:120 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:100 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Slepen en Zetten tussen verschillende servers is op dit moment nog niet " @@ -3316,7 +3437,7 @@ msgid "Dupl&icate" msgstr "Kopiëren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1104 msgid "E&nable all" msgstr "Alles inschakelen" @@ -3325,7 +3446,7 @@ msgid "E&nter directory" msgstr "Map invoeren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "E&xecute" msgstr "Uitvoeren" @@ -3333,21 +3454,21 @@ msgid "E&xit" msgstr "Afsluiten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 msgid "E&xport..." msgstr "Exporteren..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "E-Mail:" msgstr "E-mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Elke filter vereist minstens één voorwaarde." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 msgid "Edit filters" msgstr "Filters bewerken" @@ -3358,16 +3479,16 @@ "Het bestand bewerken met het geconfigureerde bewerkingsprogramma en " "wijzigingen uploaden naar de server." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing directories is not supported" msgstr "Mappen bewerken wordt niet ondersteund" -#: ../../locales/../src/interface/LocalListView.cpp:1582 -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Editing failed" msgstr "Bewerken mislukt" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing search results" msgstr "Zoekresultaten bewerken" @@ -3375,7 +3496,7 @@ msgid "Email:" msgstr "E-mail:" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "Empty command" msgstr "Lege opdracht" @@ -3383,7 +3504,7 @@ msgid "Empty command." msgstr "Lege opdracht" -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2049 msgid "Empty directory listing" msgstr "Lege mappenlijst" @@ -3395,13 +3516,13 @@ msgid "Empty file extension." msgstr "Lege bestandsextensie" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Lege filternamen zijn niet toegestaan." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Lege naam" @@ -3409,7 +3530,7 @@ msgid "Empty quoted string." msgstr "Leeg citaat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1139 msgid "En&able all" msgstr "Alles inschakelen" @@ -3417,19 +3538,19 @@ msgid "Enable invalid character &filtering" msgstr "Filtering van ongeldige tekens inschakelen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Versleuteld" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 msgid "Encryption" msgstr "Versleuteling" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 msgid "Encryption details" msgstr "Versleutelingdetails" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "Vergelijken beëindigen en sorteervolgorde wijzigen?" @@ -3437,37 +3558,37 @@ msgid "Enter &custom command..." msgstr "Een aangepaste opdracht invoeren..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3782 msgid "Enter 0 for unlimited speed." msgstr "Voer 0 in voor onbegrensde snelheid." -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1825 msgid "Enter command" msgstr "Voer een opdracht in" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Voer een aangepaste opdracht in" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1852 msgid "Enter directory" msgstr "Map invoeren" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Voer een filternaam in" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Enter name for filterset" msgstr "Voer een naam voor de filtergroep in" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:274 msgid "Enter new name for filterset" msgstr "Voer een nieuwe naam voor de filtergroep in" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Voer een wachtwoord in" @@ -3476,14 +3597,13 @@ msgid "Enter selected directory" msgstr "Voer de geselecteerde map in" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:53 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3491,120 +3611,122 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Vul het adres van de server in.\n" -"Om het serverprotocol te specificeren, vult u voor de host de protocol-" -"identificateur in. Als er geen protocol gegeven is, zal het " -"standaardprotocol (ftp://) gebruikt worden.\n" -"U kunt hier ook de volledige URL's in het formaat protocol://gebruiker:" -"wachtwoord@host:poort invoeren. De waarden in andere velden worden dan " -"overschreven.\n" +"Vul het adres van de server in. Om het serverprotocol te specificeren, vult " +"u voor de host de protocolidentificatie in. Als er geen protocol gegeven is, " +"zal het standaardprotocol (ftp://) gebruikt worden. U kunt hier ook " +"volledige URL's in het formaat protocol://gebruiker:wachtwoord@host:poort " +"invoeren. De waarden in andere velden worden dan overschreven.\n" "\n" "Ondersteunde protocollen zijn:\n" -"- ftp:// voor normale FTP\n" -"- sftp:// voor SSH- bestandsoverdrachtprotocol\n" +"- ftp:// voor normale FTP met optionele encryptie\n" +"- sftp:// voor SSH-bestandsoverdrachtprotocol\n" "- ftps:// voor FTP over TLS (impliciet)\n" "- ftpes:// voor FTP over TLS (expliciet)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:114 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" "Voer het wachtwoord in voor het bestand '%s'.\n" -"Houd er rekening mee dat het geconverteerde bestand niet beschermd zal zijn " -"met een wachtwoord." +"Het geconverteerde bestand wordt met hetzelfde wachtwoord beschermd." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Vul de poort in waar de server op reageert.\n" -"De standaard FTP-poort is 21, de standaard SFTP-poort is 22." +"Vul de poort in waar de server op luistert. De standaard voor FTP is 21, de " +"standaard voor SFTP is 22." + +#: ../../locales/../src/interface/loginmanager.cpp:73 +msgid "Enter username" +msgstr "Voer een gebruikersnaam in" -#: ../../locales/../src/interface/loginmanager.cpp:66 +#: ../../locales/../src/interface/loginmanager.cpp:80 msgid "Enter username and password" msgstr "Voer een gebruikersnaam en wachtwoord in" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Fout bij exporteren van instellingen" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Fout bij importeren" -#: ../../locales/../src/interface/QueueView.cpp:1920 +#: ../../locales/../src/interface/QueueView.cpp:1616 msgid "Error loading queue" msgstr "Fout bij laden van de wachtrij" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:213 -#: ../../locales/../src/interface/filter.cpp:970 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1841 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:434 -#: ../../locales/../src/interface/sitemanager.cpp:515 -#: ../../locales/../src/interface/sitemanager.cpp:565 -#: ../../locales/../src/interface/sitemanager.cpp:664 -#: ../../locales/../src/interface/sitemanager.cpp:741 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:938 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:864 +#: ../../locales/../src/interface/filter.cpp:956 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:246 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:64 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:128 +#: ../../locales/../src/interface/QueueView.cpp:1525 +#: ../../locales/../src/interface/search.cpp:1262 +#: ../../locales/../src/interface/search.cpp:1281 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:522 +#: ../../locales/../src/interface/sitemanager.cpp:582 +#: ../../locales/../src/interface/sitemanager.cpp:686 +#: ../../locales/../src/interface/sitemanager.cpp:774 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "Fout bij laden van XML-bestand" -#: ../../locales/../src/interface/QueueView.cpp:1830 +#: ../../locales/../src/interface/QueueView.cpp:1514 msgid "Error saving queue" msgstr "Fout bij het opslaan van de wachtrij" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:197 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "Error starting program" msgstr "Fout bij starten van programma" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1859 -#: ../../locales/../src/interface/sitemanager.cpp:609 -#: ../../locales/../src/interface/sitemanager.cpp:719 -#: ../../locales/../src/interface/sitemanager.cpp:773 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2224 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1543 +#: ../../locales/../src/interface/sitemanager.cpp:631 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2298 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 msgid "Error writing xml file" msgstr "Fout bij schrijven van XML-bestand" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:278 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:342 msgid "Error:" msgstr "Fout:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2024 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Voorbeeld: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1674 msgid "Examples" msgstr "Voorbeelden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Exe&cute" msgstr "Uitvoeren" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Toepassing bevat geen versie-informatie, kan niet controleren op updates." @@ -3613,19 +3735,23 @@ msgid "Explorer" msgstr "Verkenner" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1601 +msgid "Export &Filters" +msgstr "Export&filters" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 msgid "Export &Queue" msgstr "Wachtrij exporteren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1591 msgid "Export &Settings" msgstr "Instellingen exporteren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1572 msgid "Export settings" msgstr "Instellingen exporteren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1280 msgid "F&ilter name:" msgstr "Filternaam:" @@ -3633,20 +3759,19 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:504 msgid "FTP - File Transfer Protocol" msgstr "FTP - File Transfer Protocol" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - File Transfer Protocol met optionele versleuteling" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Onveilig File Transfer Protocol" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FTP Engine not initialized, can't connect" msgstr "FTP-systeem niet geïnitialiseerd, kan niet verbinden" @@ -3671,147 +3796,157 @@ "FTP gebruikt secundaire verbindingen voor gegevensoverdrachten. Deze " "toegevoegde verbindingen kunnen op twee manieren opgezet worden." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP over expliciet TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP over impliciet TLS" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1778 -#: ../../locales/../src/interface/LocalTreeView.cpp:846 -#: ../../locales/../src/interface/LocalTreeView.cpp:1099 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:540 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:914 +#: ../../locales/../src/interface/LocalListView.cpp:1825 +#: ../../locales/../src/interface/LocalTreeView.cpp:857 +#: ../../locales/../src/interface/LocalTreeView.cpp:1132 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Wijzigen van de map is mislukt" -#: ../../locales/../src/interface/FileZilla.cpp:137 -#: ../../locales/../src/interface/FileZilla.cpp:152 -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:142 +#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:159 msgid "Failed to change language" msgstr "Wijzen van de taal is mislukt" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 +msgid "Failed to convert command to 8 bit charset" +msgstr "Converteren van de opdracht naar 8-bit karakterset mislukt" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2081 msgid "Failed to copy or move sites" msgstr "Het kopiëren of verplaatsen van sites is mislukt" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:328 msgid "Failed to create backup copy of xml file" msgstr "Maken van back-upkopie van XML-bestand is mislukt" -#: ../../locales/../src/interface/netconfwizard.cpp:802 -msgid "Failed to create listen socket, aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:808 +#, fuzzy +msgid "Failed to create listen socket, aborting." msgstr "Aanmaken van luistersocket is mislukt, breekt af" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4071 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4075 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4167 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4171 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Aanmaken van luistersocket voor overdracht met actieve modus is mislukt." -#: ../../locales/../src/interface/LocalTreeView.cpp:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:633 msgid "Failed to get 'My Documents' path" msgstr "Verkrijgen van 'Mijn documenten'-pad is mislukt" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get desktop path" msgstr "Verkrijgen van 'Bureaublad'-pad is mislukt" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Ontvangen van peeradres van controleverbinding mislukt, verbinding verbroken." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "" -"Ontvangen van peeradres van dataverbinding mislukt, verbinding verbroken." +"Ontvangen van peeradres van gegevensverbinding mislukt, verbinding verbroken." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "Initialiseren van FTP-systeem is mislukt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:798 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:279 msgid "Failed to initialize TLS." msgstr "Initialiseren van TLS is mislukt." +#: ../../locales/../src/interface/FileZilla.cpp:93 +msgid "Failed to initialize networking" +msgstr "Initialiseren van netwerk is mislukt" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Laden van panelen is mislukt, ongeldige bronbestanden?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Laden van privésleutel mislukt: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Openen van \"%s\" voor toevoegen/schrijven is mislukt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2657 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Openen van \"%s\" voor lezen is mislukt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2625 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:997 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Openen van \"%s\" voor schrijven is mislukt" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:352 msgid "Failed to parse returned path." msgstr "Kan het teruggestuurde pad niet analyseren." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "Ontvangen van gegevens is mislukt" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:189 msgid "Failed to retrieve directory listing" msgstr "Ontvangen van mappenlijst is mislukt" -#: ../../locales/../src/interface/netconfwizard.cpp:730 -msgid "Failed to retrieve external ip address, aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +#, fuzzy +msgid "Failed to retrieve external ip address, aborting." msgstr "Ontvangen van het externe IP-adres is mislukt, er wordt afgebroken" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3782 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3849 msgid "Failed to retrieve external ip address, using local address" msgstr "" "Ontvangen van het externe IP-adres is mislukt, lokaal adres wordt gebruikt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3803 +#: ../../locales/../src/interface/netconfwizard.cpp:712 +#, fuzzy +msgid "Failed to retrieve local ip address, aborting." +msgstr "Ontvangen van het lokale IP-adres is mislukt. Er wordt geannuleerd." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868 msgid "Failed to retrieve local ip address." msgstr "Ontvangen van het lokale IP-adres is mislukt." -#: ../../locales/../src/interface/netconfwizard.cpp:706 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Ontvangen van het lokale IP-adres is mislukt. Er wordt geannuleerd." - -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Ontvangen van het externe IP-adres is mislukt." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Versturen van opdracht is mislukt." -#: ../../locales/../src/interface/FileZilla.cpp:152 +#: ../../locales/../src/interface/FileZilla.cpp:157 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "De taal instellen als %s (%s) is mislukt, de standaard systeemtaal wordt " "gebruikt." -#: ../../locales/../src/interface/FileZilla.cpp:130 +#: ../../locales/../src/interface/FileZilla.cpp:135 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3819,47 +3954,46 @@ "De taal instellen als %s (%s) is mislukt, de standaard systeemtaal (%s, %s) " "wordt gebruikt." -#: ../../locales/../src/interface/FileZilla.cpp:119 +#: ../../locales/../src/interface/FileZilla.cpp:124 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "De taal instellen als %s (%s) is mislukt, de standaard systeemtaal wordt " "gebruikt." -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:159 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Taal naar %s overzetten is mislukt, de standaard systeemtaal wordt gebruikt." -#: ../../locales/../src/interface/FileZilla.cpp:126 +#: ../../locales/../src/interface/FileZilla.cpp:131 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "De taal instellen als %s is mislukt, de standaard systeemtaal (%s, %s) wordt " "gebruikt." -#: ../../locales/../src/interface/FileZilla.cpp:116 +#: ../../locales/../src/interface/FileZilla.cpp:121 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "De taal instellen als %s is mislukt, de standaard systeemtaal wordt gebruikt." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:214 msgid "Failed to validate settings" msgstr "Valideren van instellingen is mislukt" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1320 msgid "Failed to verify peer certificate" msgstr "Controleren van peercertificaat is mislukt" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:508 #, c-format msgid "Failed to write to file %s" msgstr "Schrijven van bestand %s is mislukt" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:341 msgid "Failed to write xml file" msgstr "Schrijven van XML-bestand is mislukt" @@ -3871,15 +4005,15 @@ msgid "Fall back to active mode" msgstr "Terugvallen naar actieve modus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2347 msgid "Fil&e:" msgstr "Bestand:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1343 msgid "Fil&es" msgstr "Bestanden" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "Bestand" @@ -3887,11 +4021,11 @@ msgid "File Types" msgstr "Bestandstypes" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "File descriptor not a socket" msgstr "Bestandsbeschrijving is geen socket" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Het bestand bevat geen importeerbare gegevens." @@ -3899,7 +4033,7 @@ msgid "File editing" msgstr "Bestandsbewerking" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1630 msgid "File exists" msgstr "Bestand bestaat al" @@ -3907,7 +4041,7 @@ msgid "File exists action" msgstr "'Bestand bestaat al'-actie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1694 msgid "File has changed" msgstr "Bestand is gewijzigd" @@ -3915,65 +4049,67 @@ msgid "File lists" msgstr "Bestandenlijsten" -#: ../../locales/../src/interface/edithandler.cpp:1551 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/edithandler.cpp:1562 +#: ../../locales/../src/interface/FileZilla.cpp:589 +#: ../../locales/../src/interface/FileZilla.cpp:674 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Bestand niet gevonden" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3185 +#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/search.cpp:692 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Bestand zoeken" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:113 msgid "File transfer aborted by user" msgstr "Bestandsoverdracht afgebroken door gebruiker" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:101 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" -"Bestandsoverdracht afgebroken door de gebruiker na het overdragen van %s " -"naar %s" +"Bestandsoverdracht afgebroken door de gebruiker na het overdragen van %s in " +"%s" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer failed" msgstr "Bestandsoverdracht mislukt" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:107 #, c-format msgid "File transfer failed after transferring %s in %s" -msgstr "Bestandsoverdracht mislukt na het overdragen van %s naar %s" +msgstr "Bestandsoverdracht mislukt na het overdragen van %s inr %s" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:120 msgid "File transfer skipped" msgstr "Bestandsoverdracht overgeslagen" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:117 msgid "File transfer successful" msgstr "Bestandsoverdracht geslaagd" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:98 #, c-format msgid "File transfer successful, transferred %s in %s" -msgstr "Bestandsoverdracht geslaagd, %s naar %s overgedragen" +msgstr "Bestandsoverdracht geslaagd: %s in %s overgedragen" -#: ../../locales/../src/interface/Mainfrm.cpp:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1146 msgid "File transfers still in progress." msgstr "Bestandsoverdrachten zijn nog bezig." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2578 msgid "File would transfer with ASCII data type." -msgstr "Het bestand zal overgebracht worden met het ASCII-datatype." +msgstr "Het bestand zal overgebracht worden met het ASCII-gegevenstype." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 msgid "File would transfer with binary data type." -msgstr "Het bestand zal overgebracht worden met het binaire datatype." +msgstr "Het bestand zal overgebracht worden met het binaire gegevenstype." -#: ../../locales/../src/interface/FileZilla.cpp:407 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/FileZilla.cpp:419 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FileZilla Error" msgstr "FileZilla-fout" @@ -3985,15 +4121,15 @@ "FileZilla kan uw configuratie nu testen om u ervan te verzekeren dat alles " "correct is ingesteld." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3478 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "FileZilla is already connected to a server." msgstr "FileZilla is al verbonden met een server." -#: ../../locales/../src/interface/Mainfrm.cpp:1457 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "FileZilla moet herstart worden om de taalverandering door te voeren." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2112 msgid "FileZilla updates" msgstr "FileZilla-updates" @@ -4001,57 +4137,53 @@ msgid "Filelist status &bars" msgstr "Balken voor bestandenlijststatus" -#: ../../locales/../src/interface/edithandler.cpp:1085 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:286 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "Bestandsnaam" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Bestandsnaamfilters..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2971 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2168 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3017 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2088 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Bestandsnaam kan niet gemaakt worden voor de map %s en het bestand %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Filename invalid" msgstr "Bestandsnaam ongeldig" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "Filename unchanged" msgstr "Bestandsnaam ongewijzigd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1711 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2144 msgid "Filename:" msgstr "Bestandsnaam:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Bestandsnamen mogen geen van de volgende tekens bevatten: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "Bestandsnamen mogen geen van de volgende tekens bevatten: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2002 msgid "Files currently being edited" msgstr "Bestanden die nu bewerkt worden" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:156 msgid "Filesize" msgstr "Bestandsgrootte" @@ -4059,18 +4191,18 @@ msgid "Filesize format" msgstr "Bestandsgrootteformaat" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:157 msgid "Filetype" msgstr "Bestandstype" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2036 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Bestandstype-associaties" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1336 msgid "Filter applies to:" msgstr "Filter toepassen op:" @@ -4079,44 +4211,48 @@ msgstr "Ongeldige tekens in bestandsnamen uitfilteren" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Filternaam bestaat al" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1303 msgid "Filter out items matching all of the following" msgstr "Items uitfilteren die overeenkomen met alle van de volgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1304 msgid "Filter out items matching any of the following" msgstr "Items uitfilteren die overeenkomen met elk van de volgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1305 msgid "Filter out items matching none of the following" msgstr "Items uitfilteren die overeenkomen met geen van de volgende" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1306 +msgid "Filter out items matching not all of the following" +msgstr "Items uitfilteren die overeenkomen met niet alle van de volgende" + +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Filter set already exists" msgstr "Filtergroep bestaat al" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Mappenlijst filteren" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Filtervalidatie mislukt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 msgid "Find &files" msgstr "&Bestanden vinden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 msgid "Find d&irectories" msgstr "M&appen vinden" @@ -4128,12 +4264,14 @@ msgid "Fingerprint (SHA-256):" msgstr "Vingerafdruk (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2077 +#, fuzzy +msgid "Fingerprints:" msgstr "Vingerafdruk:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Firewall- en routerconfiguratiewizard" @@ -4151,7 +4289,7 @@ "Voor de betrouwbaarheid moet u een bereik van minstens 10 poorten " "specifiëren." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:245 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4159,34 +4297,39 @@ "Voor deze sessie worden de standaarinstellingen gebruikt. Wijzigingen in de " "instellingen worden niet opgeslagen." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 msgid "Force &UTF-8" msgstr "&UTF-8 forceren" #: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Force showing &hidden files" -msgstr "Weergeven van verborgen bestanden forceren" +msgstr "Tonen van verborgen bestanden forceren" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:655 msgid "Force showing hidden files" -msgstr "Weergeven van verborgen bestanden forceren" +msgstr "Tonen van verborgen bestanden forceren" #: ../../locales/../src/interface/resources/xrc/settings.xrc:493 msgid "Format specifications:" msgstr "Formaatspecificaties:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2019 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Formaat: extensie gevolgd door correct opgemaakte opdracht met argumenten." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:646 +#: ../../locales/../src/interface/updater.cpp:686 #, c-format msgid "Found new %s %s\n" msgstr "Nieuw gevonden %s%s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:49 +#, fuzzy, c-format +msgid "Function %s failed" +msgstr "Authenticatie mislukt" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "Further documentation" msgstr "Verdere documentatie" @@ -4194,7 +4337,7 @@ msgid "General" msgstr "Algemeen" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:476 msgid "General SOCKS server failure" msgstr "Algemene SOCKS-serverfout" @@ -4207,127 +4350,133 @@ msgid "Get external IP address from the following URL:" msgstr "Extern IP-adres ophalen van de volgende URL:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 msgid "Getting help" msgstr "Hulp vragen" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" "De opgegeven filtergroepnaam bestaat al. Wilt u deze filtergroep " "overschrijven?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Globale bladwijzers" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:319 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS-fout voor %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:322 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS-fout %d in %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:314 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS-fout %d in %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:311 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS-fout %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:707 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "Groen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:430 msgid "Group permissions" msgstr "Groepsrechten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "Hoog" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP over TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2041 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Verborgen" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:870 -#: ../../locales/../src/interface/queue.cpp:957 +#: ../../locales/../src/interface/queue.cpp:888 +#: ../../locales/../src/interface/queue.cpp:944 msgid "High" msgstr "Hoog" -#: ../../locales/../src/interface/queue.cpp:872 -#: ../../locales/../src/interface/queue.cpp:959 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Highest" msgstr "Hoogst" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "De hoogst beschikbare poort moet tussen 1024 en 65535 liggen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1162 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Houd de Shift-knop ingedrukt om de filterstatus aan beide kanten tegelijk in/" "uit te schakelen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:612 msgid "Homepage:" msgstr "Website:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Host is down" msgstr "Host is down" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Hostsleutelvingerafdruk:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:925 msgid "Host key mismatch" msgstr "Verkeerde hostsleutel" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:156 msgid "Host starts with '[' but no closing bracket found." msgstr "De host begint met '[', maar er is geen sluithaakje gevonden." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:485 msgid "Host unreachable" msgstr "Host onbereikbaar" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:970 msgid "Host:" msgstr "Host:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:980 +#, fuzzy +msgid "Hostkey algorithm:" +msgstr "Openbaar sleutelalgoritme:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:424 msgid "Hours," msgstr "Uren," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1562 msgid "I&SO 8601 (example: 15:47)" msgstr "ISO 8601 (voorbeeld: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:116 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6-adressen worden niet ondersteund met een SOCKS4-proxy" @@ -4337,11 +4486,11 @@ "specified time, the connection will be closed and FileZilla will try to " "reconnect." msgstr "" -"Indien er geen gegevens verzonden of ontvangen worden tijdens een bewerking " +"Als er geen gegevens verzonden of ontvangen worden tijdens een bewerking " "voor langer dan de gespecificeerde tijd, wordt de verbinding gesloten en zal " "FileZilla proberen opnieuw verbinding te maken." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2276 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Bij het rapporteren van fouten is het gewenst dat u logboeken toevoegt met " @@ -4354,10 +4503,10 @@ "you should try active mode. You can set the transfer mode on a per-server " "basis in the Site Manager." msgstr "" -"Indien de automatische test op het einde van deze wizard slaagt, maar u kunt " -"nog steeds geen bestanden overdragen naar een bepaalde server, dan kan de " -"server verkeerd ingesteld zijn en moet u de actieve modus eens proberen. U " -"kunt de instellingen voor overdrachtmodus voor iedere server afzonderlijk " +"Als de automatische test op het einde van deze wizard slaagt, maar u kunt " +"nog steeds geen bestanden overdragen naar een bepaalde server, kan de server " +"verkeerd ingesteld zijn en moet u de actieve modus eens proberen. U kunt de " +"instellingen voor overdrachtmodus voor iedere server afzonderlijk " "specificeren in Sitebeheer." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 @@ -4365,44 +4514,44 @@ "If the fallback option is enabled, you will be able to connect to " "misconfigured servers which reject the selected transfer mode." msgstr "" -"Indien de terugvallen-optie geactiveerd is, kunt u verbinden met slecht " +"Als de terugvallen-optie geactiveerd is, kunt u verbinden met slecht " "geconfigureerde servers die de geselecteerde overdrachtmodus niet accepteren." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:958 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "" -"Neem contact op met de serverbeheerder indien de hostsleutelwijziging " +"Neem contact op met de serverbeheerder als de hostsleutelwijziging " "onverwacht was." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" -"Indien dit probleem zich blijft voordoen, blijft mogelijk de router en/of " +"Als dit probleem zich blijft voordoen, blijft mogelijk de router en/of " "firewall FileZilla blokkeren." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" -"Indien dit probleem zich blijft voordoen, blijft mogelijk de router en/of " +"Als dit probleem zich blijft voordoen, blijft mogelijk de router en/of " "firewall de verbinding onderbreken." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2199 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " "a new file gets created." msgstr "" -"Indien de grootte van het logbestand de limiet bereikt, wordt dit hernoemd " -"door toevoegen van \".1\" aan het einde van de bestandsnaam (dit kan oudere " +"Als de grootte van het logbestand de limiet bereikt, wordt dit hernoemd door " +"toevoegen van \".1\" aan het einde van de bestandsnaam (dit kan oudere " "logbestanden overschrijven) en wordt er een nieuw logbestand aangemaakt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4410,64 +4559,62 @@ "Als de symbolische link naar een map wijst, kan FileZilla óf de symbolische " "link verwijderen óf de inhoud van de gelinkte map verwijderen." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" -"Indien dit probleem zich blijft voordoen, neem dan contact op met de " -"fabrikant van de router of firewall." +"Als dit probleem zich blijft voordoen, neem dan contact op met de fabrikant " +"van de router of firewall." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" -"Indien dit probleem zich blijft voordoen, neem dan contact op met de " -"fabrikant van de router." +"Als dit probleem zich blijft voordoen, neem dan contact op met de fabrikant " +"van de router." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " "timezone offset in the site manager." msgstr "" -"Indien u de optie 'Overschrijven indien nieuwer' gebruikt, moet de " -"systeemtijd gesynchroniseerd worden met de server. Als de tijd verschilt " -"(bijv. verschillende tijdzones), specificeer dan een tijdzoneverschil in " -"Sitebeheer." +"Als de optie 'Overschrijven als nieuwer' gebruikt, moet de systeemtijd " +"gesynchroniseerd worden met de server. Als de tijd verschilt (bijv. " +"verschillende tijdzones), specificeer dan een tijdzoneverschil in Sitebeheer." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1788 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." msgstr "" -"Indien u tijdstempel-gebaseerde vergelijking gebruikt, beschouw twee " -"bestanden dan gelijk als hun tijdstempelverschil niet deze drempel " -"overschrijdt." +"Als u tijdstempel-gebaseerd vergelijken gebruikt, beschouw twee bestanden " +"dan gelijk als hun tijdstempelverschil niet deze drempel overschrijdt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1893 msgid "If you change the language, you need to restart FileZilla." -msgstr "Indien u de taal wijzigt, moet u FileZilla herstarten." +msgstr "Als u de taal wijzigt, moet u FileZilla herstarten." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" "If you click on test, FileZilla will connect to probe.filezilla-project.org " "and will perform some simple tests." msgstr "" -"Indien u op 'Testen' klikt, zal FileZilla verbinden met probe.filezilla-" -"project.org en een aantal eenvoudige tests uitvoeren." +"Als u op 'Testen' klikt, zal FileZilla verbinden met probe.filezilla-project." +"org en een aantal eenvoudige tests uitvoeren." -#: ../../locales/../src/interface/Mainfrm.cpp:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1168 msgid "If you close FileZilla, your changes will be lost." -msgstr "Indien u Fillezilla sluit, gaan uw wijzigingen verloren." +msgstr "Als u Fillezilla sluit, gaan uw wijzigingen verloren." #: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "" -"Deze bestanden beschadigd worden tijdens de overdracht indien u de verkeerde " -"bestandstypes invult." +"Als de verkeerde bestandstypes invult, kunnen deze bestanden tijdens de " +"overdracht beschadigd worden." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." @@ -4478,17 +4625,17 @@ "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." msgstr "" -"Indien u problemen ondervindt met het ontvangen van bestandenlijsten of met " -"het overdragen van bestanden, probeer dan de standaard overdrachtmodus te " +"Als u problemen ondervindt met het ontvangen van bestandenlijsten of met het " +"overdragen van bestanden, probeer dan de standaard overdrachtmodus te " "wijzigen." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " "passive mode and contact the server administrator for help." msgstr "" -"Indien de problemen met een specifieke server zich blijven voordoen, zal de " +"Als de problemen met een specifieke server zich blijven voordoen, zal de " "server zelf of de externe router of firewall verkeerd ingesteld zijn. In dat " "geval schakelt u de passieve modus in/uit en neemt u contact op met de " "serverbeheerder voor verdere hulp." @@ -4498,7 +4645,7 @@ "If you successfully complete the wizard and the final test succeeds, any " "firewalls and routers you have should be configured properly." msgstr "" -"Indien u de wizard succesvol heeft afgerond en de laatste tests gelukt zijn, " +"Als u de wizard succesvol hebt afgerond en de laatste tests gelukt zijn, " "zijn uw firewall en router correct ingesteld." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 @@ -4506,7 +4653,7 @@ "If you use a firewall, make sure FileZilla is allowed to accept connection " "on all given ports." msgstr "" -"Indien u een firewall gebruikt, zorg er dan voor dat FileZilla toegang heeft " +"Als u een firewall gebruikt, zorg er dan voor dat FileZilla toegang heeft " "tot alle opgegeven poorten." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 @@ -4514,27 +4661,27 @@ "If you use a router, make sure all these ports are forwarded to the machine " "you're running FileZilla on." msgstr "" -"Indien u een router gebruikt, zorg er dan voor dat al deze poorten " -"doorgestuurd worden naar de machine waarop u FileZilla uitvoert." +"Als u een router gebruikt, zorg er dan voor dat al deze poorten doorgestuurd " +"worden naar de machine waarop u FileZilla uitvoert." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "" -"Indien uw router voortdurend blijft veranderen van IP-adres, neem dan " -"contact op met de fabrikant van de router." +"Als uw router voortdurend van IP-adres verandert, neem dan contact op met de " +"fabrikant van de router." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Gegevens van een oudere versie importeren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "Import settings" msgstr "Instellingen importeren" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Importeren geslaagd" @@ -4556,7 +4703,7 @@ "In case you have a router, you will have to forward all available ports, as " "FileZilla has no influence on the ports your system chooses." msgstr "" -"In het geval dat u een router heeft, zult u alle beschikbare poorten moeten " +"In het geval dat u een router hebt, zult u alle beschikbare poorten moeten " "doorsturen, aangezien FileZilla geen invloed heeft op de poorten die door uw " "systeem gekozen worden." @@ -4578,19 +4725,11 @@ "FileZilla de server naar een poort en zal met de gegeven poort verbinden. Er " "hoeft hiervoor niet veel ingesteld te worden." -#: ../../locales/../src/engine/tlssocket.cpp:1036 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Onvolledige ketting, topcertificaat is geen zelfondertekend " -"autoriteitscertificaat" - -#: ../../locales/../src/interface/queue.cpp:378 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "Onjuist wachtwoord" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4598,17 +4737,21 @@ "Informatie over de laatste versie van FileZilla kan niet worden opgehaald. " "Probeer het later opnieuw." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:789 msgid "Initializing TLS..." msgstr "TLS initialiseren..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Onveilig algoritme!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:773 msgid "Insecure server, it does not support FTP over TLS." msgstr "Onveilige server, die geen FTP over TLS ondersteunt." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:910 +#: ../../locales/../src/engine/server.cpp:931 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interactief" @@ -4616,29 +4759,29 @@ msgid "Interface" msgstr "Gebruikersomgeving" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Interrupted by signal" msgstr "Onderbroken door signaal" -#: ../../locales/../src/engine/ControlSocket.cpp:218 -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/engine/ControlSocket.cpp:219 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "Onderbroken door gebruiker" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 msgid "Invalid Content-Length" msgstr "Ongeldige inhoudslengte" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 msgid "Invalid HTTP Response" msgstr "Ongeldig HTTP-antwoord" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1018 msgid "Invalid argument passed" msgstr "Ongeldig argument opgegeven" -#: ../../locales/../src/engine/ControlSocket.cpp:453 -#: ../../locales/../src/engine/ControlSocket.cpp:509 +#: ../../locales/../src/engine/ControlSocket.cpp:461 +#: ../../locales/../src/engine/ControlSocket.cpp:518 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4646,45 +4789,50 @@ "Ongeldige tekenreeks ontvangen, bezig met uitschakelen van UTF-8. Selecteer " "de UTF-8-optie in Sitebeheer om UTF-8 te forceren." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 msgid "Invalid chunk size" msgstr "Ongeldige blokgrootte" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Ongeldige gegevens ontvangen" -#: ../../locales/../src/interface/verifycertdialog.cpp:40 -#: ../../locales/../src/interface/verifycertdialog.cpp:53 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Ongeldige datum" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Ongeldige bestandsnaam" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:161 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Ongeldige host, na het sluithaakje mogen er alleen een dubbele punt en een " "poort volgen." -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:641 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Ongeldige hostnaam: %s" + +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "Invalid input" msgstr "Ongeldige invoer" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:67 +#: ../../locales/../src/engine/server.cpp:188 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" -"Ongeldige poort ingevoerd. Het poortnummer moet tussen 1 en 65535 liggen." +"Ongeldige poort ingevoerd. De poort moet een waarde hebben tussen 1 en 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/engine/server.cpp:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:164 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4698,42 +4846,38 @@ "ftps:// voor FTP over SSL (impliciet) en\n" "ftpes:// voor FTP over SSL (expliciet)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4305 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Ongeldige proxy host, na het sluithaakje mogen er alleen een dubbele punt en " "een poort volgen." -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Ongeldige reguliere expressie" + +#: ../../locales/../src/interface/search.cpp:692 msgid "Invalid regular expression in search conditions." msgstr "Ongeldige reguliere uitdrukking in zoekvoorwaarden." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:568 msgid "Invalid response code" msgstr "Ongeldige antwoordcode" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:687 #, c-format msgid "Invalid search conditions: %s" msgstr "Ongeldige zoekvoorwaarden: %s" -#: ../../locales/../src/interface/sitemanager.cpp:409 -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:466 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:752 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:786 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Invalid site path" msgstr "Ongeldig sitepad" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Ongeldige grootte in voorwaarde" @@ -4741,42 +4885,42 @@ msgid "Invalid username given." msgstr "Ongeldige gebruikersnaam ingevoerd." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Invalid value for ai_flags" msgstr "Ongeldige waarde voor ai-vlaggen" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "Invalid value for hints" msgstr "Ongeldige waarde voor aanwijzingen" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction country:" msgstr "Land van jurisdictie:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction locality:" msgstr "Plaats van jurisdictie:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Jurisdiction state or province:" msgstr "Staat of provincie van jurisdictie:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1745 msgid "Keep directories on top" msgstr "Mappen op de voorgrond houden" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../locales/../src/interface/Mainfrm.cpp:659 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " "some tests to check if the server supports this feature, the test may fail." msgstr "" "Onthoud dat niet alle servers deze functie ondersteunen en incorrecte " -"lijsten kunnen sturen indien deze optie ingeschakeld is. FileZilla voert " -"enkele tests uit om te kijken of de server deze functie ondersteunt, maar de " -"testen kunnen mislukken." +"lijsten kunnen sturen als deze optie ingeschakeld is. FileZilla voert enkele " +"tests uit om te kijken of de server deze functie ondersteunt, maar de testen " +"kunnen mislukken." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2014 msgid "Key exchange" msgstr "Sleuteluitwisseling" @@ -4784,30 +4928,29 @@ msgid "Key exchange:" msgstr "Sleuteluitwisseling:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 -#, fuzzy +#: ../../locales/../src/engine/server.cpp:908 +#: ../../locales/../src/engine/server.cpp:929 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1331 msgid "Key file" -msgstr "%d bestand" +msgstr "Sleutelbestand" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "Laagst" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1874 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Taal" -#: ../../locales/../src/interface/Mainfrm.cpp:1457 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "Language changed" msgstr "Taal is gewijzigd" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:158 msgid "Last modified" msgstr "Laatst gewijzigd" @@ -4827,29 +4970,30 @@ msgid "Limit local ports" msgstr "Lokale poorten begrenzen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2168 msgid "Limit size of logfile" msgstr "Limietgrootte van het logbestand" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2176 msgid "Limit:" msgstr "Limiet:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 msgid "Line length exceeded" msgstr "Regellengte overschreden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:727 msgid "Linked against" msgstr "Gekoppeld aan" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Luistersocket gesloten" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:360 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Listing:" msgstr "Lijst:" @@ -4857,50 +5001,59 @@ msgid "Lo&west available port:" msgstr "Laagst beschikbare poort:" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1369 +#: ../../locales/../src/interface/edithandler.cpp:1144 +#: ../../locales/../src/interface/edithandler.cpp:1380 msgid "Local" msgstr "Lokaal" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1015 msgid "Local address in use" -msgstr "Locaal adres is in gebruik" +msgstr "Lokaal adres is in gebruik" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Local endpoint has been closed" msgstr "Lokaal eindpunt is gesloten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2291 msgid "Local file" msgstr "Lokaal bestand" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:314 msgid "Local file does not exist." msgstr "Het lokale bestand bestaat niet." -#: ../../locales/../src/interface/updater.cpp:370 -#: ../../locales/../src/interface/updater.cpp:462 +#: ../../locales/../src/interface/updater.cpp:400 +#: ../../locales/../src/interface/updater.cpp:493 #, c-format msgid "Local file is %s\n" msgstr "Lokaal bestand is %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../../locales/../src/interface/manual_transfer.cpp:310 msgid "Local file is a directory instead of a regular file." msgstr "Het lokaal bestand is een map in plaats van een normaal bestand." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Local file is not a valid filename." msgstr "Lokaal bestand heeft geen geldige bestandsnaam." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:650 +#: ../../locales/../src/interface/search.cpp:656 +msgid "Local file search" +msgstr "Lokaal bestand zoeken" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1090 msgid "Local filters:" msgstr "Lokale filters:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3320 +msgid "Local path handling:" +msgstr "Lokaalpadbewerking:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Lokale site:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Locality:" msgstr "Lokaliteit:" @@ -4908,12 +5061,16 @@ msgid "Log file" msgstr "Logbestand" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:965 +msgid "Logged in" +msgstr "Ingelogd" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Loggen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:847 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4922,7 +5079,7 @@ "UTF-8 werken. Kan niet terugvallen op lokale tekenset, omdat proxy gebruikt " "wordt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:855 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4930,8 +5087,9 @@ "Inloggegevens bevatten niet-ASCII-tekens en de server kan misschien niet met " "UTF-8 werken. De lokale tekenset wordt gebruikt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:884 +#, fuzzy +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" "De inlogreeks is volledig uitgevoerd, maar er is niet ingelogd. Er wordt " "afgebroken." @@ -4950,17 +5108,17 @@ "Het inlogtype kan alleen samen gebruikt worden met een FTP-URL. Het argument " "moet óf '%s' óf '%s' zijn" -#: ../../locales/../src/interface/queue.cpp:865 -#: ../../locales/../src/interface/queue.cpp:952 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "Low" msgstr "Laag" -#: ../../locales/../src/interface/queue.cpp:863 -#: ../../locales/../src/interface/queue.cpp:950 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 msgid "Lowest" msgstr "Laagst" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "De laagst beschikbare poort moet tussen 1024 en 65535 liggen." @@ -4968,63 +5126,71 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:38 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Zorg ervoor dat het bestand toegankelijk is en dat het een correct opgemaakt " "XML-bestand is." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 #, c-format msgid "Malformed chunk data: %s" msgstr "Misvormde blokgegevens: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 #, c-format msgid "Malformed header: %s" msgstr "Misvormde header: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 msgid "Malformed reply, server not sending proper line endings" msgstr "Misvormd antwoord, server verstuurt niet de juiste regeleindes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2633 +#: ../../locales/../src/interface/manual_transfer.cpp:298 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:310 +#: ../../locales/../src/interface/manual_transfer.cpp:314 +#: ../../locales/../src/interface/manual_transfer.cpp:321 +#: ../../locales/../src/interface/manual_transfer.cpp:327 +#: ../../locales/../src/interface/manual_transfer.cpp:333 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Manual transfer" msgstr "Handmatige overdracht" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3108 msgid "Match all of the following" -msgstr "Komt overeen met al het volgende" +msgstr "Overeenkomen met alle van de volgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 msgid "Match any of the following" msgstr "Overeenkomen met elk van de volgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 msgid "Match none of the following" msgstr "Overeenkomen met geen van de volgende" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3111 +msgid "Match not all of the following" +msgstr "Overeenkomen met niet alle van de volgende" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "Maximum aantal gelijktijdige overdrachten:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Memory allocation failure" msgstr "Fout in geheugentoewijzing" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1784 +#: ../../locales/../src/interface/Mainfrm.cpp:385 +#: ../../locales/../src/interface/Mainfrm.cpp:1762 msgid "Message log" msgstr "Berichtenlogboek" @@ -5032,96 +5198,100 @@ msgid "Message log position" msgstr "Berichtenlogboekpositie" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Message too large" msgstr "Bericht is te lang" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:440 msgid "Minutes" msgstr "Minuten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2206 msgid "Move &down" msgstr "Omlaag verplaatsen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2200 msgid "Move &up" msgstr "Omhoog verplaatsen" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:987 msgid "My Computer" msgstr "Mijn computer" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:977 msgid "My Documents" msgstr "Mijn documenten" -#: ../../locales/../src/interface/sitemanager.cpp:269 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:339 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:738 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:740 msgid "My Sites" msgstr "Mijn sites" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:201 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:204 msgid "N/a" msgstr "Niet beschikbaar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2671 msgid "Name" msgstr "Naam" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216 msgid "Name already exists" msgstr "Naam bestaat al" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 msgid "Name of bookmark already exists." msgstr "Bladwijzernaam bestaat al" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 msgid "Name:" msgstr "Naam:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 msgid "Natural sort" msgstr "Normale soort" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Filternaam moet ingevoerd worden" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:650 +msgid "Need to enter valid local path" +msgstr "Er moet een geldig lokaal pad ingevoerd worden" + +#: ../../locales/../src/interface/search.cpp:677 msgid "Need to enter valid remote path" msgstr "Er moet een geldig extern pad ingevoerd worden" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 msgid "Need to specify a character encoding" msgstr "Er moet een tekencodering opgegeven worden" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Neither nodename nor servname provided, or not known" msgstr "Er zijn geen nodenaam en servnaam of ze zijn niet bekend" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "" "De netwerkhost heeft geen netwerkadressen in de gevraagde adressenfamilie" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Network unreachable" msgstr "Netwerk onbereikbaar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2059 msgid "Never" msgstr "Nooit" @@ -5133,37 +5303,37 @@ msgid "New &tab" msgstr "Nieuwe tab" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2818 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2876 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nieuwe bladwijzer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2636 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2180 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2236 msgid "New bookmark" msgstr "Nieuwe bladwijzer" -#: ../../locales/../src/interface/LocalTreeView.cpp:1126 -#: ../../locales/../src/interface/RemoteListView.cpp:1310 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 +#: ../../locales/../src/interface/LocalTreeView.cpp:1163 +#: ../../locales/../src/interface/RemoteListView.cpp:1334 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1246 msgid "New directory" msgstr "Nieuwe map" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:61 #, c-format msgid "New features and improvements in %s" msgstr "Nieuwe functies en verbeteringen in %s" @@ -5172,13 +5342,13 @@ msgid "New filter" msgstr "Nieuw filter" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:938 msgid "New folder" msgstr "Nieuwe map" -#: ../../locales/../src/interface/sitemanager.cpp:583 -#: ../../locales/../src/interface/sitemanager.cpp:595 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../../locales/../src/interface/sitemanager.cpp:602 +#: ../../locales/../src/interface/sitemanager.cpp:616 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2209 msgid "New site" msgstr "Nieuwe site" @@ -5186,27 +5356,27 @@ msgid "Next to the transfer queue" msgstr "Achteraan in de overdrachtwachtrij" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:780 msgid "No" msgstr "Nee" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "No address associated with nodename" msgstr "Geen programma geassocieerd met nodenaam" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Geen exportcategorie geselecteerd" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "No command given, aborting." msgstr "Er is geen opdracht gegeven, er wordt afgebroken." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3754 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3821 msgid "No external IP address set, trying default." msgstr "Er is geen extern IP-adres ingesteld, de standaard wordt gebruikt." -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "No files are currently being edited." msgstr "Er worden nu geen bestanden bewerkt." @@ -5214,97 +5384,94 @@ msgid "No filter name given" msgstr "Geen filternaam ingevoerd" -#: ../../locales/../src/engine/server.cpp:77 +#: ../../locales/../src/engine/server.cpp:81 #: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:195 msgid "No host given, please enter a host." msgstr "Geen host ingevuld, vul een host in." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Geen afbeeldingen beschikbaar" -#: ../../locales/../src/interface/QueueView.cpp:2980 -msgid "No more files in the queue!" -msgstr "Er zijn geen bestanden meer in de wachtrij!" - -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "No name for the filterset given." msgstr "Er is geen naam ingevoerd voor de filtergroep." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3043 msgid "No program associated with filetype" msgstr "Er is geen programma geassocieerd met bestandstype" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2960 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Er is geen programma geassocieerd om bestanden met de extensie '%s' te " "bewerken." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "No route to host" msgstr "Geen route naar de host" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:397 msgid "No search results" msgstr "Geen zoekresultaten" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:349 msgid "No sites available" msgstr "Geen sites beschikbaar" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:454 msgid "No supported SOCKS5 auth method" msgstr "Geen ondersteunde SOCKS5-authenticatiemethode" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "No username given." msgstr "Geen gebruikersnaam ingevoerd." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:59 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1836 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1855 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Geen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2407 msgid "None selected yet" msgstr "Nog geen geselecteerd" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Nonrecoverable failure in name resolution" msgstr "Onherstelbare fout in de naamomzetting" #: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:868 -#: ../../locales/../src/interface/queue.cpp:955 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/engine/server.cpp:904 +#: ../../locales/../src/engine/server.cpp:925 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/queue.cpp:886 +#: ../../locales/../src/interface/queue.cpp:942 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 msgid "Normal" msgstr "Normaal" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 msgid "Not all items could be requeued for transfer." msgstr "Niet alle items konden in de wachtrij geplaatst worden." -#: ../../locales/../src/interface/state.cpp:178 -#: ../../locales/../src/interface/state.cpp:480 +#: ../../locales/../src/interface/state.cpp:181 +#: ../../locales/../src/interface/state.cpp:1244 msgid "Not connected" msgstr "Niet verbonden" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2045 msgid "Not connected to any server" msgstr "Met geen enkele server verbonden" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Met geen enkele server verbonden." @@ -5312,11 +5479,11 @@ msgid "Not connected." msgstr "Niet verbonden." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Not initialized, need to call WSAStartup" msgstr "Niet geïnitialiseerd. WSAStartup moet aangeroepen worden" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../../locales/../src/interface/Mainfrm.cpp:657 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Houd er rekening mee dat deze functie alleen ondersteund wordt bij gebruik " @@ -5333,7 +5500,7 @@ "Opmerking: het gebruik van een generieke proxy forceert passieve modus op " "FTP-verbindingen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "Number of decimal places:" msgstr "Aantal decimale plaatsen:" @@ -5341,43 +5508,43 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Het aantal pogingen moet tussen 0 en 99 zijn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1970 msgid "O&pen file" msgstr "Bestand openen" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2710 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2968 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3249 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3445 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3614 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3670 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:560 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1480 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1848 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3266 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3633 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3799 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3855 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:748 msgid "OS version:" -msgstr "Versie:" +msgstr "OS-versie:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" @@ -5388,37 +5555,38 @@ "geconfigureerd. Indien ingeschakeld wordt ook de terugvallen-modus " "geconfigureerd." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:790 msgid "Once" msgstr "Eenmaal" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "Once a day" msgstr "Dagelijks" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2061 msgid "Once a week" msgstr "Wekelijks" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:523 msgid "Only use plain FTP (insecure)" msgstr "Gebruik platte FTP (onveilig)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "Open directory in system's file manager" msgstr "Map openen in het bestandsbeheer van het systeem" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" -msgstr "Opent Sitebeheer" +msgstr "Sitebeheer openen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." -msgstr "Opent Sitebeheer" +msgstr "Sitebeheer openen." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." -msgstr "Opent Sitebeheer. Klik rechts voor een lijst met sites." +msgstr "Sitebeheer openen. Klik rechts voor een lijst met sites." #: ../../locales/../src/interface/resources/xrc/menus.xrc:256 msgid "Open the file." @@ -5428,14 +5596,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Instellingendialoogvenster van FileZilla openen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 msgid "Opened as:" msgstr "Geopend als:" -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1695 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1736 +#: ../../locales/../src/interface/LocalListView.cpp:1748 msgid "Opening failed" msgstr "Openen is mislukt" @@ -5447,29 +5615,33 @@ msgid "Opens the Site Manager" msgstr "Opent Sitebeheer" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Opent het mapfilteringsdialoogvenster. Klik rechts om de filters te wisselen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "Operating System:" msgstr "Besturingssysteem:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1026 msgid "Operation already in progress" msgstr "Bewerking wordt al uitgevoerd" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1017 msgid "Operation in progress" msgstr "Bewerking wordt uitgevoerd" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Operation not supported" msgstr "Bewerking wordt niet ondersteund" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "Oranje" + +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Organization:" msgstr "Organisatie:" @@ -5477,16 +5649,16 @@ msgid "Other SFTP options" msgstr "Andere SFTP-opties" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Other system error" msgstr "Andere systeemfout" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:264 msgid "Other:" msgstr "Anders:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1021 +#: ../../locales/../src/engine/socket.cpp:1022 msgid "Out of memory" msgstr "Te weinig geheugen" @@ -5494,58 +5666,57 @@ msgid "Overview" msgstr "Overzicht" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" -msgstr "Overschrijven indien bron nieuwer is" +msgstr "Overschrijven als bron nieuwer is" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1443 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Bestand overschrijven" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1445 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" -msgstr "Bestand overschrijven indien grootte verschilt" +msgstr "Bestand overschrijven als grootte verschilt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" -msgstr "" -"Bestand overschrijven indien grootte verschilt of bronbestand nieuwer is" +msgstr "Bestand overschrijven als grootte verschilt of bronbestand nieuwer is" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1444 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" -msgstr "Bestand overschrijven indien bronbestand nieuwer is" +msgstr "Bestand overschrijven als bronbestand nieuwer is" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" -msgstr "Overschrijven indien andere grootte" +msgstr "Overschrijven als de grootte anders is" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" -msgstr "Overschrijven indien andere grootte of nieuwere bron" +msgstr "Overschrijven als de grootte anders is of de bron nieuwer" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" msgstr "Eigen build-type: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:396 msgid "Owner permissions" msgstr "Eigenaarsrechten" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:404 +#: ../../locales/../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "Eigenaar/groep" @@ -5562,7 +5733,7 @@ msgid "P&roxy host:" msgstr "Proxy-host:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "PORT-opdracht is onderbroken door router of firewall." @@ -5570,18 +5741,18 @@ msgid "Pa&ssive (recommended)" msgstr "Passief (aanbevolen)" -#: ../../locales/../src/interface/Mainfrm.cpp:2356 +#: ../../locales/../src/interface/Mainfrm.cpp:2381 msgid "Parameter not a valid URL" msgstr "Parameter is geen geldige URL" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:573 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "%d bytes van versie-informatie analyseren.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2523 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "Pass&word:" msgstr "Wachtwoord:" @@ -5594,61 +5765,61 @@ msgid "Passive mode" msgstr "Passieve modus" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Passieve modus is ingesteld als standaard overdrachtmodus." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:117 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Wachtwoord vereist" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:155 msgid "Path" msgstr "Pad" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3054 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2214 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3104 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2137 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Pad kan niet gemaakt worden voor de map %s en de submap %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2314 +#: ../../locales/../src/interface/Mainfrm.cpp:2336 msgid "Path not found:" msgstr "Pad niet gevonden:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2698 msgid "Paths" msgstr "Paden" -#: ../../locales/../src/interface/edithandler.cpp:1112 -#: ../../locales/../src/interface/edithandler.cpp:1249 -#: ../../locales/../src/interface/edithandler.cpp:1339 -#: ../../locales/../src/interface/edithandler.cpp:1349 +#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1260 +#: ../../locales/../src/interface/edithandler.cpp:1350 +#: ../../locales/../src/interface/edithandler.cpp:1360 msgid "Pending removal" msgstr "Nog uit te voeren verwijdering" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Toegang" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1014 +#: ../../locales/../src/engine/socket.cpp:1023 msgid "Permission denied" msgstr "Toegang geweigerd" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:159 msgid "Permissions" msgstr "Rechten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:756 msgid "Platform:" msgstr "Platform:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5664,16 +5835,16 @@ "Configureer firewalls en routers, zodat FileZilla een uitgaande verbinding " "naar willekeurige poorten kan opzetten." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Schakel instellingen als 'DMZ-modus' of 'Game-modus' uit in uw router." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." msgstr "" -"Zorg ervoor dat u een stabiele internetverbinding heeft en controleer uw " +"Zorg ervoor dat u een stabiele internetverbinding hebt en controleer uw " "instellingen opnieuw." #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 @@ -5684,14 +5855,14 @@ msgid "Please enter a custom time format." msgstr "Voer een aangepast tijdformaat in" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" "Voer een datum in van het formaat JJJJ-MM-DD zoals bijvoorbeeld 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5701,16 +5872,16 @@ msgid "Please enter a name for the new filter." msgstr "Voer een naam in voor de nieuwe filter." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Voer een nieuwe naam in voor deze gekopieerde filtergroep." -#: ../../locales/../src/interface/filter.cpp:389 +#: ../../locales/../src/interface/filter.cpp:272 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Voer een nieuwe naam in voor de filtergroep \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Voer een nieuwe naam in voor de filter." @@ -5737,20 +5908,10 @@ "Voer een getal tussen 1 en 10 in voor het maximum aantal gelijktijdige " "overdrachten." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Voer een wachtwoord in voor deze server:" -#: ../../locales/../src/interface/QueueView.cpp:2120 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Voer een pad en een uitvoerbaar bestand in om uit te voeren.\n" -"Bijv.: c:\\Pad\\bestand.exe onder MS Windows of /Pad/bestand onder Unix.\n" -"U kunt ook optioneel programma-argumenten specificeren." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5758,65 +5919,79 @@ "Voer een timeout in tussen de 10 en de 9999 seconden of 0 om timeout uit te " "schakelen." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Please enter a unique name for this filter set" msgstr "Voer een unieke naam voor deze filtergroep in" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Voer een gebruikersnaam in voor deze server:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Voer een geldig poortbereik in." -#: ../../locales/../src/interface/netconfwizard.cpp:176 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Voer de URL in waar uw externe adres van opgehaald kan worden." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Voer een snelheidslimiet voor uploads in groter of gelijk aan 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." msgstr "" "Voer een ruwe FTP-opdracht in.\n" -"Indien u een FTP-opdracht gebruikt, wordt de cache gewist." +"Als u een FTP-opdracht gebruikt, wordt de cache gewist." -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/QueueView.cpp:1825 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Voer het volledige pad van een programma en zijn argumenten in. Deze " +"opdracht wordt uitgevoerd als de wachtrij is afgewerkt.\n" +"Bijv.: c:\\Pad\\bestand.exe onder MS Windows of /Pad/bestand onder Unix.\n" +"U moet opdrachten en hun argumenten tussen quotes plaatsen als deze spaties " +"bevatten." + +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1233 msgid "Please enter the name of the directory which should be created:" msgstr "Voer een naam in voor de aan te maken map:" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2631 msgid "Please enter the name of the file which should be created:" msgstr "Voer een naam in voor het aan te maken bestand:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Voer een gebruikersnaam en wachtwoord in voor deze server:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Voer uw externe IP-adres in" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " "address, use the external resolver option." msgstr "" "Voer uw externe IP-adres in op de 'actieve modus'-pagina van deze wizard. " -"Indien u een dynamisch adres hebt of u kent uw externe adres niet, gebruik " -"dan de optie voor externe adresbepaling." +"Als u een dynamisch adres hebt of u kent uw externe adres niet, gebruik dan " +"de optie voor externe adresbepaling." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" @@ -5826,7 +6001,7 @@ "Volg de instructies goed op, omdat slechte instellingen succesvolle FTP-" "verbindingen in de weg zitten." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5835,12 +6010,12 @@ "maken en zorg ervoor dat u het juiste adres of de juiste adresbepaler heeft " "ingevoerd." -#: ../../locales/../src/interface/FileZilla.cpp:136 +#: ../../locales/../src/interface/FileZilla.cpp:141 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Zorg ervoor dat het gevraagde taalbestand geïnstalleerd is op uw systeem." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5863,7 +6038,7 @@ "dat die alleen gebruikt wordt door trojans of andere malware. Dit zal een " "vals alarm veroorzaken dat u gerust kunt negeren." -#: ../../locales/../src/interface/Mainfrm.cpp:677 +#: ../../locales/../src/interface/Mainfrm.cpp:697 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5876,23 +6051,27 @@ "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." msgstr "" -"Houd er rekening mee dat sommige servers u kunnen blokkeren, indien u te " -"vaak probeert te verbinden of telkens voor een korte tijd." +"Houd er rekening mee dat sommige servers u kunnen blokkeren, als u te vaak " +"probeert te verbinden of telkens voor een korte tijd." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:115 +msgid "Please re-add local data directories in the settings dialog." +msgstr "" + +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " "previously." msgstr "" -"Voer deze wizard opnieuw uit indien u uw netwerkomgeving wijzigt of indien " -"er problemen optreden met servers die voorheen wel goed werkten." +"Voer deze wizard opnieuw uit als u uw netwerkomgeving wijzigt of als er " +"problemen optreden met servers die voorheen wel goed werkten." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 msgid "Please select an action:" msgstr "Selecteer een actie:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1667 msgid "Please select the categories you would like to import." msgstr "Selecteer de categorieën die u wilt importeren." @@ -5924,7 +6103,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Selecteer de nieuwe attributen voor de geselecteerde bestanden." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5942,8 +6121,8 @@ msgid "Positio&n of the message log:" msgstr "Positie van het berichtenlogboek:" -#: ../../locales/../src/interface/verifycertdialog.cpp:223 -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Postal code:" msgstr "Postcode:" @@ -5955,24 +6134,24 @@ msgid "Preallocation" msgstr "Toewijzing vooraf" -#: ../../locales/../src/interface/sitemanager.cpp:268 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1948 msgid "Predefined Sites" msgstr "Voorgedefinieerde sites" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:696 msgid "Preserving file timestamps" msgstr "Tijdstempels in bestand behouden" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Voorvertoning:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1482 +msgid "Preview" +msgstr "Voorbeeld" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1359 msgid "Primary connection and data connection certificates don't match." msgstr "" -"Pimaire verbindingscertificaten en dataverbindingscertificaten komen niet " -"overeen." +"Pimaire verbindingscertificaten en gegevensverbindingscertificaten komen " +"niet overeen." #: ../../locales/../src/interface/cmdline.cpp:19 msgid "Print diagnostic information related to startup of FileZilla" @@ -5983,15 +6162,15 @@ msgid "Print version information to stdout and exit" msgstr "Versie-informatie afdrukken naar stdout en afsluiten" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1744 msgid "Prioritize directories (default)" msgstr "Mappen indelen op voorkeur (standaard)" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Priority" msgstr "Prioriteit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2100 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6013,25 +6192,25 @@ msgstr "Proxy-wachtwoord:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "Wachtrij verwerken" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1019 msgid "Process file table overflow" msgstr "Grootte van bestandstabel van het proces overschreden" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "%s in %s verwerkt." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1024 msgid "Protocol not supported" msgstr "Protocol wordt niet ondersteund" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Protocol not supported on given socket type" msgstr "Protocol van dit sockettype wordt niet ondersteund" @@ -6048,36 +6227,40 @@ msgid "Proxy &user:" msgstr "Proxy-gebruiker:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:463 msgid "Proxy authentication failed" msgstr "Proxy-authenticatie mislukt" -#: ../../locales/../src/engine/transfersocket.cpp:103 -#: ../../locales/../src/engine/transfersocket.cpp:115 +#: ../../locales/../src/engine/transfersocket.cpp:106 +#: ../../locales/../src/engine/transfersocket.cpp:118 #, c-format msgid "Proxy handshake failed: %s" msgstr "Handschudden met proxy mislukt: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4209 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4299 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Proxy host begint met '[', maar er is geen sluithaakje gevonden." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:322 #, c-format msgid "Proxy reply: %s" msgstr "Proxy-antwoord: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:504 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Proxy-aanvraag mislukt. Beantwoord van de proxy: %s" + +#: ../../locales/../src/engine/proxy.cpp:377 #, c-format msgid "Proxy request failed: %s" msgstr "Proxy-aanvraag mislukt: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Proxy-aanvraag mislukt: onbekend adrestype in CONNECT-antwoord" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4328 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy is ingesteld, maar de proxy-host of -poort is ongeldig" @@ -6089,55 +6272,56 @@ msgid "Public key algorithm:" msgstr "Openbaar sleutelalgoritme:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:464 msgid "Public permissions" msgstr "Openbare rechten" -#: ../../locales/../src/interface/QueueView.cpp:3060 +#: ../../locales/../src/interface/QueueView.cpp:2688 msgid "Queue has been fully processed" msgstr "De wachtrij is volledig verwerkt" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:436 #, c-format msgid "Queue: %s MiB" msgstr "Wachtrij: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:372 #, c-format msgid "Queue: %s%s" msgstr "Wachtrij: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:368 +#: ../../locales/../src/interface/statusbar.cpp:427 msgid "Queue: empty" msgstr "Wachtrij: leeg" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Bestanden in de wachtrij" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Queueing:" msgstr "In wachtrij:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" msgstr "Systeem herstarten" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "Externe mappenstructuur" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "R&eset and requeue selected files" msgstr "Geselecteerde bestanden resetten en opnieuw in wachtrij zetten" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "Ruwe FTP-opdracht" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:437 msgid "Re&ad" msgstr "Lezen" @@ -6146,11 +6330,11 @@ msgid "Re&fresh" msgstr "Vernieuwen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Hernoemen" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6158,20 +6342,20 @@ "Voer de wizard opnieuw uit, controleer uw instellingen en configureer alle " "routers en firewalls volgens de wizard." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:471 msgid "Rea&d" msgstr "Lezen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Alleen-lezen" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1037 msgid "Really cancel current operation?" msgstr "Weet u zeker dat u de huidige bewerking wilt annuleren?" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:761 +#: ../../locales/../src/interface/RemoteListView.cpp:1415 +#: ../../locales/../src/interface/search.cpp:1195 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6179,79 +6363,87 @@ msgstr[0] "Wilt u %d map met inhoud werkelijk verwijderen van de server?" msgstr[1] "Wilt u %d mappen met inhoud werkelijk verwijderen van de server?" -#: ../../locales/../src/interface/RemoteListView.cpp:1384 -#: ../../locales/../src/interface/search.cpp:759 +#: ../../locales/../src/interface/RemoteListView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1193 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Wilt u %d bestand werkelijk verwijderen van de server?" msgstr[1] "Wilt u %d bestanden werkelijk verwijderen van de server?" -#: ../../locales/../src/interface/RemoteListView.cpp:1391 -#: ../../locales/../src/interface/search.cpp:765 +#: ../../locales/../src/interface/RemoteListView.cpp:1420 +#: ../../locales/../src/interface/search.cpp:1199 #, c-format msgid "Really delete %s and %s from the server?" msgstr "%s en %s werkelijk verwijderen van de server?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1051 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Weet u zeker dat u alle geselecteerde bestanden en/of mappen van de server " "wilt verwijderen?" -#: ../../locales/../src/engine/local_filesys.cpp:129 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "Weet u zeker dat u alle geselecteerde bestanden en/of mappen van uw computer " "wilt verwijderen?" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Reason" msgstr "Reden" -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:2681 msgid "Reboot now" msgstr "Nu opnieuw opstarten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:525 msgid "Rec&urse into subdirectories" -msgstr "Toepassen op alle submappen" +msgstr "Terugkeren naar submappen" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:333 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "TLS-waarschuwing ontvangen van server: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2969 +#: ../../locales/../src/engine/directorylistingparser.cpp:2998 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Mappenlijst ontvangen die gecodeerd lijkt te zijn EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1993 -#: ../../locales/../src/engine/directorylistingparser.cpp:2007 +#: ../../locales/../src/engine/directorylistingparser.cpp:1984 +#: ../../locales/../src/engine/directorylistingparser.cpp:2001 msgid "Received a line exceeding 10000 characters, aborting." msgstr "" "Er is een regel ontvangen met meer dan 10.000 tekens. Er wordt afgebroken." +#: ../../locales/../src/engine/tlssocket.cpp:1342 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Ontvangen certificaatketen kon niet worden geverifieerd. Verificatiestatus " +"is %d." + #: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "Corrupte gegevens ontvangen" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:552 msgid "Received invalid character in version information" msgstr "Ongeldig teken in de versie-informatie ontvangen" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:336 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Onbekende TLS-waarschuwing %d van de server ontvangen" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:545 msgid "Received version information is too large" msgstr "Ontvangen versie-informatie is te groot" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6264,75 +6456,71 @@ msgid "Reconnection settings" msgstr "Herverbindeninstellingen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Herverbindt met de laatst gebruikte server" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 -#, fuzzy +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." -msgstr "Bestanden toevoegen aan wachtrij" +msgstr "Bestanden recursief toevoegen aan wachtrij." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." -msgstr "" +msgstr "Rechten recursief wijzigen." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 -#, fuzzy +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." -msgstr "Geselecteerde bestanden en mappen hernoemen" +msgstr "Bestanden en mappen recursief verwijderen." + +#: ../../locales/../src/interface/sitemanager.cpp:17 +msgid "Red" +msgstr "Rood" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:619 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Omleiding naar ongeldige of niet ondersteunde URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:656 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:626 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Omleiding naar ongeldig of niet ondersteund adres: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Ververst de bestanden- en mappenlijst" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3875 msgid "Remember passwords?" msgstr "Wachtwoorden onthouden?" -#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/edithandler.cpp:1107 msgid "Remote" msgstr "Extern" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:977 msgid "Remote certificate not trusted." msgstr "Externe certificaat is niet vertrouwd." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2326 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Remote file" msgstr "Extern bestand" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3099 -#: ../../locales/../src/interface/search.cpp:383 -#: ../../locales/../src/interface/search.cpp:388 -#: ../../locales/../src/interface/search.cpp:397 -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/search.cpp:672 +#: ../../locales/../src/interface/search.cpp:677 msgid "Remote file search" msgstr "Externe bestandszoekopdracht" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1125 msgid "Remote filters:" msgstr "Externe filters:" -#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/edithandler.cpp:1098 msgid "Remote path" msgstr "Extern pad" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6342,7 +6530,7 @@ "absoluut pad is en dat het ondersteund wordt door het servertype (%s) van de " "huidige site." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1132 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6352,50 +6540,50 @@ "absoluut pad is en dat het ondersteund wordt door het servertype (%s) van de " "oudersite." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Het externe pad kan niet geanalyseerd worden. Zorg ervoor dat het een geldig " "absoluut pad is." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:333 msgid "Remote path could not be parsed." msgstr "Het externe pad kan niet geanalyseerd worden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3225 msgid "Remote path handling:" msgstr "Behandeling van externe paden:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Remote path:" msgstr "Extern pad:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Externe site:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 msgid "Remove &all" msgstr "Alles verwijderen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &selected" msgstr "Selectie verwijderen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1448 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:287 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Rename file" msgstr "Bestand hernoemen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 msgid "Rename selected directory" msgstr "Geselecteerde map hernoemen" @@ -6404,72 +6592,72 @@ msgid "Rename selected files and directories" msgstr "Geselecteerde bestanden en mappen hernoemen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3393 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2413 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3455 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2332 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Hernoemen van '%s' naar '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 msgid "Reporting bugs and feature requests" msgstr "Bugs en functieaanvragen rapporteren" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:368 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Verzoek mislukt - de client draait identd niet (of is niet bereikbaar vanaf " "de server)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:371 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Verzoek mislukt - identd van de client kan de gebruikers-ID-tekst niet " "bevestigen" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:365 msgid "Request rejected or failed" msgstr "Verzoek geweigerd of mislukt" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:521 msgid "Require explicit FTP over TLS" msgstr "Vereist expliciet FTP over TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "Require implicit FTP over TLS" msgstr "Vereist impliciet FTP over TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 msgid "Reset and requeue &all" msgstr "Alles resetten en opnieuw in wachtrij zetten" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Resolved protocol is unknown" msgstr "Gevonden protocol is onbekend" -#: ../../locales/../src/engine/ControlSocket.cpp:1078 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:443 #, c-format msgid "Resolving address of %s" msgstr "Adres bepalen van %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1025 msgid "Resource temporarily unavailable" msgstr "Uitweg tijdelijk niet beschikbaar" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:343 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:353 msgid "Response:" msgstr "Antwoord:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3171 msgid "Results:" msgstr "Resultaten:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" @@ -6483,41 +6671,41 @@ "Het hervatten van ASCII-bestanden kan problemen geven, als de server een " "ander regeleindeformaat gebruikt dan de cliënt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:923 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1346 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:868 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Mappenlijst van \"%s\" ophalen..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:920 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1343 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:865 msgid "Retrieving directory listing..." msgstr "Mappenlijst ophalen..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3769 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3836 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Extern IP-adres ophalen van %s" #: ../../locales/../src/interface/resources/xrc/menus.xrc:34 msgid "S&how files currently being edited..." -msgstr "Bestanden weergeven die nu worden bewerkt..." +msgstr "Bestanden tonen die nu worden bewerkt..." #: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 msgid "S&how the Site Manager on startup" -msgstr "Sitebeheer bij het opstarten weergeven" +msgstr "Sitebeheer bij het opstarten tonen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" msgstr "Systeem afsluiten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3095 msgid "S&top" msgstr "Stoppen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" msgstr "Systeem pauzeren" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 @@ -6532,47 +6720,50 @@ msgid "SOC&KS 4" msgstr "SOCKS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:142 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4-proxy zal verbinden naar: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:170 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 ondersteunt geen gebruikersnamen of wachtwoorden langer dan 255 " +"tekens." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:715 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "Instellingen opslaan?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:442 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "Saving of password has been disabled by your system administrator." msgstr "" "Het opslaan van wachtwoorden is uitgeschakeld door uw systeembeheerder." -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:993 msgid "Saving of passwords has been disabled by you." msgstr "Het opslaan van wachtwoorden is uitgeschakeld door uzelf." -#: ../../locales/../src/interface/QueueView.cpp:1718 -msgid "Scanning for files to add to queue" -msgstr "Zoeken naar bestanden om toe te voegen aan de wachtrij" - -#: ../../locales/../src/interface/QueueView.cpp:1720 -msgid "Scanning for files to upload" -msgstr "Zoeken naar bestanden om te uploaden" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1462 +msgid "Scale factor:" +msgstr "Schaalfactor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3101 msgid "Search &conditions:" msgstr "Zoekvoorwaarden:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3083 msgid "Search &directory:" msgstr "Zoekmap:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Zoekt recursief naar bestanden" @@ -6580,16 +6771,20 @@ msgid "Search server for files" msgstr "Server afzoeken voor bestanden" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3052 +msgid "Search type:" +msgstr "Zoektype:" + +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Security information" msgstr "Beveiligingsinformatie" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Zie ook: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2414 msgid "Sele&ct server" msgstr "Selecteer een server" @@ -6608,7 +6803,7 @@ "Selecteer een standaardactie voor als het bestand van een overdracht al " "bestaat." -#: ../../locales/../src/interface/edithandler.cpp:1532 +#: ../../locales/../src/interface/edithandler.cpp:1543 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Selecteer een standaard bewerkingsprogramma" @@ -6629,139 +6824,142 @@ "Selecteer de standaard 'bestand bestaat al'-actie alleen voor nu de " "geselecteerde bestanden in de wachtrij." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "Selecteer een bestand met een privésleutel" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Selecteer bestand voor geëxporteerde gegevens" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1454 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Selecteer bestand voor geëxporteerde filters" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1427 msgid "Select file for exported queue" msgstr "Selecteer bestand voor geëxporteerde wachtrij" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Selecteer het bestand voor geëxporteerde instellingen" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2208 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2281 msgid "Select file for exported sites" msgstr "Selecteer bestand voor geëxporteerde sites" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Selecteer het bestand waaruit instellingen geïmporteerd worden" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Selecteer een bestand om te uploaden" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:143 -#, fuzzy +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Selecteer een bestandsnaam voor het geconverteerde sleutelbestand" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2907 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 msgid "Select how these files should be opened." msgstr "Selecteer hoe deze bestanden geopend moeten worden." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:856 msgid "Select target download directory" msgstr "Selecteer de doeldownloadmap" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Selecteer de doelbestandsnaam" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1580 msgid "Select the categories to export:" msgstr "Selecteer de te exporteren categorieën:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1506 msgid "Select the private data you would like to delete." msgstr "Selecteer de privégegevens die u wilt verwijderen." -#: ../../locales/../src/interface/search.cpp:475 +#: ../../locales/../src/interface/search.cpp:815 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." -msgstr[0] "U selecteerde %d map met inhoud voor overdracht." -msgstr[1] "U selecteerde %d mappen met inhoud voor overdracht." +msgstr[0] "%d map met inhoud geselecteerd voor overdracht." +msgstr[1] "%d mappen met inhoud geselecteerd voor overdracht." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d map geselecteerd." msgstr[1] "%d mappen geselecteerd." -#: ../../locales/../src/interface/search.cpp:473 +#: ../../locales/../src/interface/search.cpp:813 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." -msgstr[0] "U selecteerde %d bestand voor overdracht." -msgstr[1] "U selecteerde %d bestanden voor overdracht." +msgstr[0] "%d bestand geselecteerd voor overdracht." +msgstr[1] "%d bestanden gesekecteerd voor overdracht." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "%d bestand geselecteerd. Totale grootte: %s" msgstr[1] "%d bestanden geselecteerd. Totale grootte: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "%d bestand geselecteerd. Totale grootte: minstens %s" msgstr[1] "%d bestanden geselecteerd. Totale grootte: minstens %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:819 #, c-format msgid "Selected %s and %s for transfer." -msgstr "U selecteerde %s en %s voor overdracht." +msgstr "%s en %s geselecteerd voor overdracht." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "%s en %s geselecteerd. Totale grootte: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s en %s geselecteerd. Totale grootte: minstens %s" -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1551 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1562 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Het geselecteerde bewerkingsprogramma bestaat niet." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1867 msgid "Selected file already being edited" msgstr "Het geselecteerde bestand wordt al bewerkt" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "Het geselecteerde bestand is al geladen" -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "Selected file is already opened" msgstr "Het geselecteerde bestand is al geopend" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "Selected file is still being edited" msgstr "Het geselecteerde bestand wordt nog steeds bewerkt" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Selected filter only works for local files." msgstr "De geselecteerde filter werkt alleen voor lokale bestanden." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:300 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6770,7 +6968,7 @@ "verschillend servertype.\n" "Gebruik site-specifieke bladwijzers voor deze server." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:306 msgid "Selected port usually in use by a different protocol." msgstr "" "De geselecteerde poort wordt waarschijnlijk gebruikt door een ander protocol." @@ -6785,34 +6983,34 @@ "Stuur een aangepaste opdracht naar de server als deze anders niet bereikbaar " "is" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4314 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4406 msgid "Sending keep-alive command" msgstr "Sturen van keepalive-opdracht" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Serial number:" msgstr "Serienummer:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:317 msgid "Server &Type:" msgstr "Servertype:" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket.cpp:866 msgid "Server did not properly shut down TLS connection" msgstr "Server heeft de TLS-verbinding niet goed gesloten" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:945 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1006 msgid "Server does not support non-ASCII characters." msgstr "Server ondersteunt geen niet-ASCII tekens." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4150 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4244 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Server ondersteunt niet het hervatten van bestanden > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4146 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6821,15 +7019,19 @@ "Server ondersteunt niet het hervatten van bestanden > %d GB. Beëindig de " "overdracht omdat de bestandsgrootte overeenkomt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528 msgid "Server does not support resume of files > 2GB." msgstr "Server ondersteunt niet het hervatten van bestanden > 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 msgid "Server does not support resume of files > 4GB." msgstr "Server ondersteunt niet het hervatten van bestanden > 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4161 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2060 +msgid "Server host key" +msgstr "" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4253 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6838,7 +7040,7 @@ "Server ondersteunt niet het hervatten van bestanden > %d GB. Beëindig de " "overdacht omdat de bestandsgrootte overeenkomt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:886 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6846,11 +7048,11 @@ "De server vereist misschien een account. Probeer via Sitebeheer een account " "op te geven" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:349 msgid "Server returned empty path." msgstr "De server stuurde een leeg pad terug." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:620 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6858,13 +7060,13 @@ "De server stuurde een extra inlogaanvraag. U moet het interactieve inlogtype " "gebruiken." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3716 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3787 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "De server stuurde een passief antwoord met een onbestelbaar adres. Passieve " "modus is mislukt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3711 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3782 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6872,36 +7074,43 @@ "Server stuurde een passief antwoord met een onbestelbaar adres. Gebruikt het " "serveradres in de plaats daarvan." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:425 -#: ../../locales/../src/interface/netconfwizard.cpp:464 -#: ../../locales/../src/interface/netconfwizard.cpp:473 -#: ../../locales/../src/interface/netconfwizard.cpp:485 -#: ../../locales/../src/interface/netconfwizard.cpp:509 -#: ../../locales/../src/interface/netconfwizard.cpp:516 -#: ../../locales/../src/interface/netconfwizard.cpp:525 -#: ../../locales/../src/interface/netconfwizard.cpp:536 +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Server stuurde een onverwacht antwoord." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket.cpp:1254 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Server stuurde ongesorteerde certificaatketen in strijd met de TLS " +"specificaties" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Server to client MAC:" msgstr "MAC voor server naar cliënt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2123 msgid "Server to client cipher:" msgstr "Code voor server naar cliënt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2477 msgid "Server&type:" msgstr "Servertype" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Server/Local file" msgstr "Server/Lokaal bestand" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1731 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2400 msgid "Server:" msgstr "Server:" @@ -6909,50 +7118,50 @@ msgid "Session details" msgstr "Sessiedetails" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "Prioriteit instellen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2292 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3599 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2214 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Rechten instellen van '%s' naar '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:789 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize aangeroepen zonder socket" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "Instellingen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:772 msgid "Settings directory:" -msgstr "Map aanmaken" +msgstr "Inst6ellingen van map:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "Info-ballon tonen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2284 msgid "Show &raw directory listing" -msgstr "Ruwe mappenlijst weergeven" +msgstr "Ruwe mappenlijst tonen" #: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Show &welcome dialog..." -msgstr "Welkomstvenster weergeven..." +msgstr "Welkomstvenster tonen..." -#: ../../locales/../src/interface/Mainfrm.cpp:2204 +#: ../../locales/../src/interface/Mainfrm.cpp:2223 msgid "Show both directory trees and continue comparing?" -msgstr "Beide mappenstructuren weergeven en doorgaan met vergelijken?" +msgstr "Beide mappenstructuren tonen en doorgaan met vergelijken?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" -msgstr "Details weergeven" +msgstr "Details tonen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1599 msgid "Show details about custom date and time formats" -msgstr "Details weergeven over aangepaste datum- en tijdformaten" +msgstr "Details tonen over aangepaste datum- en tijdformaten" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "Shows available TLS ciphers" msgstr "Geeft beschikbare TLS-codes wwer" @@ -6960,7 +7169,7 @@ msgid "Shows this help dialog" msgstr "Geeft dit helpdialoogvenster weer" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:2677 msgid "Shutdown now" msgstr "Nu afsluiten" @@ -6968,7 +7177,7 @@ msgid "Signature algorithm:" msgstr "Handtekening-algoritme:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Site &Manager entries" msgstr "Sitebeheeritems" @@ -6976,56 +7185,55 @@ msgid "Site Manager" msgstr "Sitebeheer" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 msgid "Site Manager - Cannot remember password" msgstr "Sitebeheer - Kan wachtwoord niet onthouden" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 #: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1067 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1076 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1100 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1109 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1144 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "Site Manager - Invalid data" msgstr "Sitebeheer - ongeldige gegevens" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "Sitebeheer is al geopend" -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:486 +#: ../../locales/../src/interface/sitemanager.cpp:514 +#: ../../locales/../src/interface/sitemanager.cpp:528 +#: ../../locales/../src/interface/sitemanager.cpp:540 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Site does not exist." msgstr "Site bestaat niet." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:497 msgid "Site path has to begin with 0 or 1." msgstr "Sitepad moet beginnen met 0 of 1." -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:752 +#: ../../locales/../src/interface/sitemanager.cpp:534 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:786 msgid "Site path is malformed." msgstr "Het sitepad is corrupt." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Site-specifieke bladwijzers" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7035,11 +7243,11 @@ "Sitebeheer.\n" "Wilt u de huidige verbinding aan Sitebeheer toevoegen?" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Size" msgstr "Grootte" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1613 msgid "Size formatting" msgstr "Grootte-opmaak" @@ -7047,50 +7255,55 @@ msgid "Size unknown" msgstr "Grootte onbekend" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1449 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "Bestand overslaan" -#: ../../locales/../src/engine/ControlSocket.cpp:1149 -#: ../../locales/../src/engine/ControlSocket.cpp:1166 -#: ../../locales/../src/engine/ControlSocket.cpp:1190 -#: ../../locales/../src/engine/ControlSocket.cpp:1250 +#: ../../locales/../src/engine/ControlSocket.cpp:1160 +#: ../../locales/../src/engine/ControlSocket.cpp:1177 +#: ../../locales/../src/engine/ControlSocket.cpp:1203 +#: ../../locales/../src/engine/ControlSocket.cpp:1281 #, c-format msgid "Skipping download of %s" msgstr "Download overslaan van %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1153 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1194 -#: ../../locales/../src/engine/ControlSocket.cpp:1254 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:309 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Niet-bestaand sleutelbestand \"%s\" overslaan" + +#: ../../locales/../src/engine/ControlSocket.cpp:1163 +#: ../../locales/../src/engine/ControlSocket.cpp:1180 +#: ../../locales/../src/engine/ControlSocket.cpp:1206 +#: ../../locales/../src/engine/ControlSocket.cpp:1284 #, c-format msgid "Skipping upload of %s" msgstr "Upload overslaan van %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1029 msgid "Socket address outside address space" msgstr "Socket-adres buiten de adresruimte" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Socket already connected" msgstr "Socket is al verbonden" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Socket has been shut down" msgstr "Socket is uitgeschakeld" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Socket not connected" msgstr "Socket is niet verbonden" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Socket type not supported for address family" msgstr "Sockettype voor deze adresfamilie wordt niet ondersteund" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1167 msgid "Some files are still being edited or need to be uploaded." msgstr "Sommige bestanden worden nog bewerkt of moeten geüpload worden." @@ -7103,32 +7316,32 @@ "Sommige slecht ingestelde externe servers achter een router kunnen " "antwoorden met hun lokale IP-adres." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1746 msgid "Sort directories inline" msgstr "Mappen inline sorteren" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." msgstr "" "De sorteervolgorde kan niet gewijzigd worden bij het vergelijken van mappen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1730 msgid "Sorting" msgstr "Sorteren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1737 msgid "Sorting &mode:" msgstr "Sorteermodus:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:107 msgid "Source and path of the drop operation are identical" msgstr "Bron en pad van de zetbewerking zijn identiek" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:153 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Bron- en doelbestand kunnen niet hetzelfde zijn" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Bron en doel van de zetbewerking zijn identiek" @@ -7136,9 +7349,9 @@ msgid "Source file:" msgstr "Bronbestand:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3632 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3817 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Snelheidslimieten" @@ -7146,27 +7359,27 @@ msgid "Speed limits" msgstr "Snelheidslimieten" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:586 msgid "Speed limits are disabled, click to change." msgstr "Snelheidslimieten zijn uitgeschakeld, klik om te wijzigen." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:589 msgid "Speed limits are enabled, click to change." msgstr "Snelheidslimieten zijn ingeschakeld, klik om te wijzigen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2078 msgid "Stable and beta versions" msgstr "Stabiele versies en bètaversies" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2077 msgid "Stable versions only" msgstr "Alleen stabiele versies" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2079 msgid "Stable, beta and nightly versions" msgstr "Stabiele, bèta- en ontwikkelversies" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "Start transfer &immediately" msgstr "Overdracht meteen starten" @@ -7174,19 +7387,19 @@ msgid "Start with opened Site Manager" msgstr "Opstarten met Sitebeheer geopend" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" msgstr "Updatecontrole gestart op %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1557 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2232 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1468 #, c-format msgid "Starting download of %s" msgstr "Download van %s starten" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1560 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1471 #, c-format msgid "Starting upload of %s" msgstr "Upload van %s starten" @@ -7195,31 +7408,30 @@ msgid "Starts the local site in the given path" msgstr "Start de lokale site in het ingevoerde pad." -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "State or province:" msgstr "Staat of provincie:" -#: ../../locales/../src/interface/edithandler.cpp:1088 -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Status" msgstr "Status" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:367 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:377 msgid "Status:" msgstr "Status:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "Stoppen en alles verwijderen" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 -#, fuzzy +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" -msgstr "Beveiligingsinformatie" +msgstr "Recursieve bewerking stoppen" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Street:" msgstr "Straat:" @@ -7235,11 +7447,11 @@ msgid "Summary of test results:" msgstr "Samenvatting van testresultaten:" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:2685 msgid "Suspend now" msgstr "Nu pauzeren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3419 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7247,28 +7459,33 @@ "Symbolische koppelingen naar bestanden worden niet beïnvloed door deze " "keuze, zulke symbolische koppelingen worden altijd verwijderd." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:237 -#: ../../locales/../src/interface/state.cpp:251 -#: ../../locales/../src/interface/state.cpp:257 -#: ../../locales/../src/interface/state.cpp:267 -#: ../../locales/../src/interface/state.cpp:353 -#: ../../locales/../src/interface/state.cpp:361 -#: ../../locales/../src/interface/state.cpp:369 -#: ../../locales/../src/interface/state.cpp:901 -#: ../../locales/../src/interface/state.cpp:909 -#: ../../locales/../src/interface/state.cpp:915 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3878 +#: ../../locales/../src/interface/state.cpp:233 +#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:255 +#: ../../locales/../src/interface/state.cpp:266 +#: ../../locales/../src/interface/state.cpp:365 +#: ../../locales/../src/interface/state.cpp:373 +#: ../../locales/../src/interface/state.cpp:381 +#: ../../locales/../src/interface/state.cpp:1003 +#: ../../locales/../src/interface/state.cpp:1011 +#: ../../locales/../src/interface/state.cpp:1018 +#: ../../locales/../src/interface/state.cpp:1027 +#: ../../locales/../src/interface/state.cpp:1054 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Gesynchroniseerd bladeren" -#: ../../locales/../src/interface/state.cpp:368 +#: ../../locales/../src/interface/state.cpp:380 msgid "Synchronized browsing has been disabled." msgstr "Gesynchroniseerd bladeren is uitgeschakeld." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Mappen synchroniseren." + +#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:165 msgid "Syntax error" msgstr "Syntaxfout" @@ -7277,25 +7494,24 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2316 -#: ../../locales/../src/interface/Mainfrm.cpp:2358 +#: ../../locales/../src/interface/Mainfrm.cpp:2338 +#: ../../locales/../src/interface/Mainfrm.cpp:2383 msgid "Syntax error in command line" msgstr "Syntaxfout in opdrachtregel" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Systeem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:784 msgid "System details" -msgstr "Details weergeven" +msgstr "Systeemdetails" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1020 msgid "System limit of open files exceeded" msgstr "De systeemlimiet van open bestanden is overschreden" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "System's network subsystem has failed" msgstr "Er is een fout opgetreden in het subsysteem van het systeemnetwerk" @@ -7303,19 +7519,19 @@ msgid "T&oolbar" msgstr "Werkbalk" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:289 msgid "TLS connection established, sending HTTP request" msgstr "TLS-verbinding opgezet, HTTP-aanvraag verzenden" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:436 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS-verbinding opgezet, wachten op welkomstbericht..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:439 msgid "TLS connection established." msgstr "TLS-verbinding opgezet." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "TTL expired" msgstr "TLL verlopen" @@ -7323,45 +7539,49 @@ msgid "Target file already exists" msgstr "Doelbestand bestaat al" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Doelbestand:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2647 msgid "Target filename already exists!" msgstr "Doelbestandsnaam bestaat al!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1630 msgid "Target filename already exists, really continue?" -msgstr "Doelbestandsnaam bestaat al. Wilt u echt verdergaan?" +msgstr "Doelbestandsnaam bestaat al. Wilt u echt doorgaan?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Temporary failure in name resolution" msgstr "Tijdelijke fout in de naamomzetting" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Test is geslaagd" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Testresultaten" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4167 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4258 msgid "Testing resume capabilities of server" msgstr "Hervatmogelijkheden op de server testen" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:749 msgid "The Site Manager cannot be used unless the file gets repaired." -msgstr "" +msgstr "Sitebeheer kan niet gebruikt worden totdat het bestand is gerepareerd." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " "then." msgstr "" "Sitebeheer is geopend in een andere instantie van FileZilla 3.\n" -"Wilt u verdergaan? De in Sitebeheer gemaakte wijzigingen worden niet " +"Wilt u doorgaan? De in Sitebeheer gemaakte wijzigingen worden niet " "opgeslagen." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7369,29 +7589,29 @@ "Sitebeheer isl geopend in een andere instantie van FileZilla 3.\n" "Sluit deze af zodat de gegevens verwijderd kunnen worden." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Het ingevoerde adres is: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "The ai_family member is not supported" msgstr "Dit ai-familielid wordt niet ondersteund" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "The ai_socktype member is not supported" msgstr "Dit ai-socktype-lid wordt niet ondersteund" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:663 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:685 msgid "The bookmark could not be added." msgstr "De bladwijzer kan niet toegevoegd worden." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:773 msgid "The bookmarks could not be cleared." msgstr "De bladwijzers kunnen niet gewist worden." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/interface/statusbar.cpp:471 msgid "The connection is encrypted. Click icon for details." msgstr "De verbinding is versleuteld. Klik op het icoon voor details." @@ -7413,36 +7633,36 @@ "Het aangepaste tijdformaat is ongeldig of bevat niet-ondersteunde " "formaataanduidingen" -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../locales/../src/engine/transfersocket.cpp:144 #, c-format msgid "The data connection could not be established: %s" -msgstr "De dataverbinding kan niet tot stand worden gebracht: %s" +msgstr "De gegevensverbinding kan niet tot stand worden gebracht: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "The default editor for text files could not be found." msgstr "" "Hetstandaard bewerkingsprogramma voor tekstbestanden kan niet gevonden " "worden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2918 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 #, c-format msgid "The default editor for text files is '%s'." msgstr "Het standaard bewerkingsprogramma voor tekstbestanden is '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "De ingevoerde filternaam bestaat al. Kies een andere naam." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "De extensie '%s' komt al voor in de lijst" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:278 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:284 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:290 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:298 #, c-format msgid "" "The file %s already exists.\n" @@ -7451,8 +7671,8 @@ "Het bestand %s bestaat al.\n" "Vul een nieuwe bestandsnaam in:" -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../../locales/../src/interface/edithandler.cpp:1633 +#: ../../locales/../src/interface/LocalListView.cpp:1740 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7463,18 +7683,27 @@ "Het bijbehorende programma (%s) kan niet gevonden worden.\n" "Controleer uw bestandstype-associaties." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:52 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"Het bestand '%s' bevat een SSH1-sleutel. Het SSH1-protocol is afgewezen, " +"FileZilla ondersteunt alleen SSH2-sleutels." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Het bestand '%s' kan niet geladen worden of bevat geen privésleutel." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:36 #, c-format msgid "The file '%s' could not be loaded." msgstr "Het bestand '%s' kan niet geladen worden." -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7483,8 +7712,8 @@ "Het bestand '%s' kan niet geopend worden:\n" "Er is op uw systeem geen programma geassocieerd met dit bestandstype." -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1748 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7493,29 +7722,20 @@ "Het bestand '%s' kan niet geopend worden:\n" "De bijbehorende opdracht is mislukt" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:756 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" "Loading files created by newer versions can result in loss of data.\n" "Do you want to continue?" msgstr "" +"Het bestand '%s' is aangemaakt met een nieuwere versie van FileZilla.\n" +"Het laden van bestanden die zijn aangemaakt met nieuwere versies kan " +"gegevensverlies tot gevolg hebben.\n" +"Wilt u doorgaan?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 -#, fuzzy, c-format -msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected key files are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" -msgstr "" -"Het formaat van het bestand '%s' wordt niet ondersteund door FileZilla.\n" -"Het bestand is tevens beschermd met een wachtwoord. Sleutelbestanden met een " -"wachtwoord worden nog niet ondersteund door FileZilla.\n" -"Wilt u het converteren naar een ondersteund, onbeschermd formaat?" - -#: ../../locales/../src/interface/fzputtygen_interface.cpp:102 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7524,24 +7744,13 @@ "Het formaat van het bestand '%s' wordt niet ondersteund door FileZilla.\n" "Wilt u het converteren naar een ondersteund formaat?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:107 -#, fuzzy, c-format -msgid "" -"The file '%s' is password protected. Password protected key files are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"Het bestand '%s' is beschermd met een wachtwoord. Sleutelbestanden met een " -"wachtwoord worden nog niet ondersteund door FileZilla.\n" -"Wilt u het converteren naar een onbeschermd bestand?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "" "Het bestand dat geselecteerd is als standaard bewerkingsprogramma bestaat " "niet." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7549,17 +7758,17 @@ "password will be imported.\n" "Continue with the import?" msgstr "" -"Het bestand dat u geselecteerd heeft, bevat sitebeheergegevens van een " +"Het bestand dat u geselecteerd hebt, bevat sitebeheergegevens van een " "eerdere versie van FileZilla.\n" "Door verschillen in het opslagformaat worden alleen host, poort, " "gebruikersnaam en wachtwoord geïmporteerd.\n" -"Wilt u verdergaan met het importeren?" +"Wilt u doorgaan met importeren?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "De bestandsnaamkolom kan niet verborgen of verplaatst worden." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "De bestandsnaamkolom kan niet verborgen worden." @@ -7573,19 +7782,19 @@ msgid "The following characters will be replaced: %s" msgstr "De volgende tekens worden vervangen: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1928 msgid "The following files are currently being edited:" msgstr "De volgende bestanden worden nu bewerkt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3474 msgid "The free open source FTP solution" msgstr "De gratis open-source FTP-oplossing" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "De globale bladwijzers kunnen niet opgeslagen worden." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2271 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7598,7 +7807,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "De limiet moet liggen tussen 1 en 2000 MiB" -#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:1054 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "De lokale map '%s' kan niet gemaakt worden." + +#: ../../locales/../src/interface/state.cpp:1039 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "De lokale map '%s' bestaat niet." + +#: ../../locales/../src/interface/state.cpp:245 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7608,7 +7827,7 @@ "Gesynchroniseerd bladeren uitschakelen en doorgaan met het wijzigen van de " "lokale map?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7616,20 +7835,25 @@ "De laagst beschikbare poort moet kleiner of gelijk zijn aan de hoogst " "beschikbare poort" -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "" "De nieuwe versie kan niet worden gedownload. Probeer het later opnieuw." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "De nieuwe versie is opgeslagen in uw Downloads-map." -#: ../../locales/../src/interface/QueueView.cpp:1840 +#: ../../locales/../src/interface/QueueView.cpp:1524 msgid "The queue will not be saved." msgstr "De wachtrij wordt niet opgeslagen." -#: ../../locales/../src/interface/state.cpp:906 +#: ../../locales/../src/interface/state.cpp:961 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "De externe map '%s' bestaat niet." + +#: ../../locales/../src/interface/state.cpp:1008 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7639,29 +7863,29 @@ "Gesynchroniseerd bladeren uitschakelen en doorgaan met het wijzigen van de " "externe map?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "De geselecteerde categorieën zijn geïmporteerd." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Het geselecteerde bestand bevat importeerbare gegevens voor de volgende " "categorieën:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1874 msgid "The selected file is already being edited:" msgstr "Het geselecteerde bestand wordt al bewerkt:" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Het geselecteerde bestand is nog open in een ander programma, sluit het." -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7669,17 +7893,17 @@ msgstr "" "Het geselecteerde bestand zou rechtstreeks uitgevoerd worden.\n" "Dit kan gevaarlijk zijn en uw systeem beschadigen.\n" -"Weet u zeker dat u verder wilt gaan?" +"Weet u zeker dat u wilt doorgaan?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../../locales/../src/interface/sitemanager.cpp:581 msgid "The server could not be added." msgstr "De server kan niet toegevoegd worden." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "De server stuurde een onverwacht of onherkenbaar antwoord." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:530 msgid "The server uses following charset encoding for filenames:" msgstr "De server gebruikt de volgende tekenset om bestandsnamen te coderen:" @@ -7691,7 +7915,7 @@ "Het certificaat van de server is onbekend. Controleer het certificaat " "zorgvuldig om vast te stellen of de server vertrouwd kan worden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:951 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7702,7 +7926,7 @@ "een verbinding met een andere computer probeert te maken die beweert de " "server te zijn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7710,11 +7934,17 @@ "De hostsleutel van de server is onbekend. Er bestaat geen garantie dat de " "server de computer is die u denkt dat deze is." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/tlssocket.cpp:1339 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "" +"De hostnaam van de server komt niet overeen met de hostnaam van het " +"certificaat" + +#: ../../locales/../src/engine/socket.cpp:1068 msgid "The servname parameter is not supported for ai_socktype" msgstr "De servernaam-parameter voor het ai-socktype wordt niet ondersteund" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7722,19 +7952,19 @@ "De instellingen zijn geïmporteerd. U moet FileZilla herstarten voordat de " "instellingen effect hebben." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1016 msgid "The specified address family is not supported" msgstr "De opgegeven adresfamilie wordt niet ondersteund" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "The specified network name is no longer available" msgstr "De opgegeven netwerknaam is niet langer beschikbaar" -#: ../../locales/../src/interface/QueueView.cpp:3052 +#: ../../locales/../src/interface/QueueView.cpp:2680 msgid "The system will soon reboot unless you click Cancel." msgstr "Het systeem zal snel opnieuw opstarten tenzij u op Annuleren klikt." -#: ../../locales/../src/interface/QueueView.cpp:3048 +#: ../../locales/../src/interface/QueueView.cpp:2676 msgid "The system will soon shut down unless you click Cancel." msgstr "Het systeem zal snel afsluiten tenzij u op Annuleren klikt." @@ -7746,12 +7976,12 @@ "Het doelbestand bestaat al.\n" "Kies een actie." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "" "De test is niet geslaagd. Weet u zeker dat u de instellingen wilt opslaan?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:81 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Het geldige back-upbestand %s kon niet hersteld worden" @@ -7760,15 +7990,15 @@ msgid "Themes" msgstr "Thema's" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:326 msgid "This filter set cannot be removed." msgstr "Deze filtergroep kan niet verwijderd worden." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:266 msgid "This filter set cannot be renamed." msgstr "Deze filterset kan niet hernoemd worden." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7781,7 +8011,7 @@ "This only works if you are not behind a router, else your system would just " "return your internal address." msgstr "" -"Dit werkt alleen indien u zich niet achter een router bevindt, anders zou uw " +"Dit werkt alleen als u zich niet achter een router bevindt, anders zou uw " "systeem alleen uw interne adres terugsturen." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 @@ -7792,11 +8022,11 @@ "Deze wizard helpt u om uw firewall en routers juist in te stellen en uw " "instellingen te testen." -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Time" msgstr "Tijd" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 msgid "Time formatting" msgstr "Tijdformaat" @@ -7805,27 +8035,26 @@ msgstr "Timeout in seconden:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:379 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "Timeout" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1031 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1710 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "Tijdzoneverschil van server is %d seconden." -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Title:" msgstr "Titel:" -#: ../../locales/../src/interface/Mainfrm.cpp:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2221 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Om mappen te vergelijken moeten beide bestandenlijsten uitgelijnd naast " "elkaar staan." -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2222 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Hiervoor moeten beide mappenstructuren worden weergegeven of verborgen." @@ -7838,7 +8067,7 @@ "Om authenticatie voor publieke sleutels te ondersteunen moet FileZilla weten " "welke privésleutels gebruikt moeten worden." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7855,7 +8084,7 @@ "Groen: bestand is nieuwer dan het ongemarkeerde bestand aan de andere kant\n" "Rood: bestandsgroottes verschillend" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7865,51 +8094,46 @@ "Indien ingeschakeld zal het navigeren door de lokale maphiërarchie ook de " "map op de server overeenkomstig veranderen en vice versa." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Schakelt het verwerken van de overdrachtwachtrij in/uit" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Schakelt de weergave van de lokale mappenstructuur in/uit" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Schakelt de weergave van het berichtenlogboek in/uit" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Schakelt de weergave van de externe mappenstructuur in/uit" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Schakelt de weergave van de overdrachtwachtrij in/uit" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:541 msgid "Too long header line" msgstr "Te lange headerregel" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:610 msgid "Too many redirects" msgstr "Te veel omleidingen" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:353 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Trace:" msgstr "Opsporen:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1853 msgid "Transfer" msgstr "Overdracht" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2264 msgid "Transfer &direction" msgstr "Overdrachtrichting" @@ -7925,22 +8149,22 @@ msgid "Transfer Queue" msgstr "Overdrachtwachtrij" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:450 msgid "Transfer Settings" msgstr "Overdrachtinstellingen" -#: ../../locales/../src/engine/transfersocket.cpp:446 -#: ../../locales/../src/engine/transfersocket.cpp:468 +#: ../../locales/../src/engine/transfersocket.cpp:452 +#: ../../locales/../src/engine/transfersocket.cpp:474 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Overdrachtverbinding onderbroken: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Gegevensoverdracht is onderbroken." -#: ../../locales/../src/interface/queue.cpp:389 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:249 msgid "Transferring" msgstr "Overdragen" @@ -7948,8 +8172,7 @@ msgid "Transfers" msgstr "Overdrachten" -#: ../../locales/../src/interface/QueueView.cpp:2950 -#: ../../locales/../src/interface/QueueView.cpp:2953 +#: ../../locales/../src/interface/QueueView.cpp:2569 msgid "Transfers finished" msgstr "Overdrachten afgerond" @@ -7961,15 +8184,15 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "De volgende bestandstypes als ASCII-bestanden behandelen:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:776 msgid "Trust changed Hostkey:" msgstr "Vertrouw de gewijzigde hostsleutel:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:827 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:773 msgid "Trust new Hostkey:" msgstr "Vertrouw de nieuwe hostsleutel:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1010 msgid "Trust the new key and carry on connecting?" msgstr "De nieuwe sleutel vertrouwen en verdergaan met verbinden?" @@ -7977,17 +8200,17 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Wilt u dit certificaat vertrouwen en doorgaan met verbinden?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:889 msgid "Trust this host and carry on connecting?" msgstr "Deze host vertrouwen en verdergaan met verbinden?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Probeer het opnieuw" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 +#: ../../locales/../src/interface/edithandler.cpp:1097 msgid "Type" msgstr "Type" @@ -7999,47 +8222,53 @@ msgid "Type of generic proxy:" msgstr "Type generieke proxy:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1955 msgid "U&pload" msgstr "Uploaden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3573 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3758 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Uploadlimiet:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1963 msgid "U&se filetype associations if available" msgstr "Bestandstype-associaties gebruiken indien beschikbaar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Systeemstandaarden gebruiken" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +msgid "U&se system defaults for current language" +msgstr "Voor de huidige taal systeemstandaardinstellingen gebruiken" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "GEBRUIKER@HOST" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:374 +#: ../../locales/../src/engine/proxy.cpp:500 #, c-format msgid "Unassigned error code %d" msgstr "Niet-toegewezen foutcode %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Unit:" msgstr "Deel:" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:874 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:995 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/interface/edithandler.cpp:1129 +#: ../../locales/../src/interface/edithandler.cpp:1157 msgid "Unknown" msgstr "Onbekend" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Onbekend FTP-proxytype, kan geen inlogreeks genereren." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:422 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Onbekende versie van SOCKS-protocol: %d" @@ -8048,11 +8277,22 @@ msgid "Unknown certificate" msgstr "Onbekend certificaat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:125 +#: ../../locales/../src/engine/misc.cpp:138 +#, c-format +msgid "Unknown error %d" +msgstr "Onbekende fout %d" + +#: ../../locales/../src/engine/misc.cpp:102 +#, c-format +msgid "Unknown error %u" +msgstr "Onbekende fout %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:816 msgid "Unknown host key" msgstr "Onbekende hostsleutel" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:430 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8061,15 +8301,15 @@ "Onbekende protocolversie van authenticatie-onderhandeling van SOCKS voor " "gebruikersnaam en wachtwoord: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:282 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Onbekend rootelement, het bestand lijkt niet gegenereerd te zijn door " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8077,7 +8317,7 @@ "Totdat deze problemen hersteld zijn zal de actieve modus voor FTP niet " "werken en zal de passieve modus gebruikt moeten worden." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8085,15 +8325,15 @@ "Totdat dit probleem hersteld is zal de actieve modus voor FTP niet werken en " "zal de passieve modus gebruikt moeten worden." -#: ../../locales/../src/engine/tlssocket.cpp:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1278 msgid "Unsupported certificate type" msgstr "Niet-ondersteund certificaattype" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:598 msgid "Unsupported redirect" msgstr "Niet-ondersteunde omleiding" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1961 msgid "Up&load and unedit" msgstr "Uploaden en niet bewerken" @@ -8102,24 +8342,29 @@ msgid "Updates" msgstr "Updates" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2278 msgid "Upload" msgstr "Uploaden" -#: ../../locales/../src/interface/edithandler.cpp:1109 +#: ../../locales/../src/interface/edithandler.cpp:1120 msgid "Upload failed" msgstr "Uploaden mislukt" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Upload limit: %s/s" msgstr "Uploadlimiet: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Upload limit: none" msgstr "Uploadlimiet: geen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3290 +#: ../../locales/../src/interface/search.cpp:882 +msgid "Upload search results" +msgstr "Zoekresultaten uploaden" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Upload selected directory" msgstr "Geselecteerde map uploaden" @@ -8127,73 +8372,73 @@ msgid "Upload selected files and directories" msgstr "Geselecteerde bestanden en mappen uploaden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1766 msgid "Upload this file back to the server?" msgstr "Wilt u dit bestand terug uploaden naar de server?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 msgid "Upload this file to the server?" msgstr "Wilt u dit bestand uploaden naar de server?" -#: ../../locales/../src/interface/edithandler.cpp:1103 -#: ../../locales/../src/interface/edithandler.cpp:1137 -#: ../../locales/../src/interface/edithandler.cpp:1293 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1148 +#: ../../locales/../src/interface/edithandler.cpp:1304 msgid "Uploading" msgstr "Uploaden" -#: ../../locales/../src/interface/edithandler.cpp:1106 -#: ../../locales/../src/interface/edithandler.cpp:1295 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1306 msgid "Uploading and pending removal" msgstr "Uploaden en wachten op verwijdering" -#: ../../locales/../src/interface/edithandler.cpp:1140 -#: ../../locales/../src/interface/edithandler.cpp:1297 +#: ../../locales/../src/interface/edithandler.cpp:1151 +#: ../../locales/../src/interface/edithandler.cpp:1308 msgid "Uploading and unediting" msgstr "Uploaden en niet bewerken" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Use &custom charset" msgstr "Aangepaste tekenset gebruiken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1927 msgid "Use &custom editor:" msgstr "Aangepast bewerkingsprogramma gebruiken:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2970 msgid "Use &default editor for text files" msgstr "Standaard bewerkingsprogramma voor tekstbestanden gebruiken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2829 msgid "Use &synchronized browsing" msgstr "Gesynchroniseerd bladeren gebruiken" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:541 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" -"Indien de server het ondersteunt UTF-8 gebruiken anders de lokale tekenset " +"Als de server het ondersteunt, UTF-8 gebruiken anders de lokale tekenset " "gebruiken." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 msgid "Use default action" msgstr "Standaardactie gebruiken" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:520 msgid "Use explicit FTP over TLS if available" msgstr "Gebruik expliciete FTP via TLS indien beschikbaar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 msgid "Use server currently connected to" msgstr "De server die nu verbonden is gebruiken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2389 msgid "Use server from site manager" msgstr "De server uit Sitebeheer gebruiken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Systeemstandaarden gebruiken" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +msgid "Use system &defaults for current language" +msgstr "Voor de huidige taal systeemstandaardinstellingen gebruiken" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8212,8 +8457,8 @@ msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" -"Dit gebruiken indien u zich achter een router bevindt en u een statisch " -"extern IP-adres hebt." +"Dit gebruiken als u zich achter een router bevindt en u een statisch extern " +"IP-adres hebt." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 msgid "" @@ -8221,21 +8466,21 @@ "above server once each session as soon as you use active mode for the first " "time. Only the version of FileZilla you're using is submitted to the server." msgstr "" -"Deze optie gebruiken indien u een dynamisch IP-adres hebt. FileZilla zal de " +"Deze optie gebruiken als u een dynamisch IP-adres hebt. FileZilla zal de " "bovenstaande server elke sessie eenmalig contacteren zodra u de actieve " "modus voor de eerste keer gebruikt. Alleen de versie van FileZilla die u " "gebruikt wordt verzonden naar de server." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 msgid "User:" msgstr "Gebruiker:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:501 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 msgid "Username cannot be a series of spaces" msgstr "Gebruikersnaam mag niet uit spaties bestaan" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:581 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8254,7 +8499,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Uitgebreide logberichten van wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1371 msgid "Verifying certificate..." msgstr "Certificaat controleren...." @@ -8262,45 +8507,41 @@ msgid "Very high" msgstr "Zeer hoog" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1471 msgid "View hidden option set, but unsupported by server" msgstr "De verborgen opties bekijken, maar niet ondersteund door de server" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1835 msgid "View/Edit" msgstr "Bekijken/bewerken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2180 msgid "Visible columns" msgstr "Zichtbare kolommen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "W&rite" msgstr "Schrijven" -#: ../../locales/../src/interface/QueueView.cpp:1678 -msgid "Waiting" -msgstr "Wachten" - -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "Wachten op verbinding om te bladeren" -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "Wachten op wachtwoord" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:243 msgid "Waiting for transfer to be cancelled" msgstr "Wachten op annuleren van de overdracht" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:244 msgid "Waiting to retry..." msgstr "Wachten om opnieuw te proberen...." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." -msgstr "Waarschuwing, dataverbinding van verkeerd IP wordt genegeerd." +msgstr "Waarschuwing, gegevensverbinding van onjuist IP wordt genegeerd." #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 msgid "" @@ -8317,23 +8558,23 @@ "\n" "Wilt u werkelijk controleren op ontwikkelversies ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:944 msgid "Warning: Potential security breach!" msgstr "Waarschuwing: mogelijk veiligheidsrisico!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3645 msgid "Welcome to FileZilla" msgstr "Welkom bij FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3506 msgid "What's new" msgstr "Wat is er nieuw" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Wat er nieuw is:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3832 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8360,28 +8601,32 @@ msgid "Widescreen" msgstr "Breedbeeld" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3827 msgid "Would you like FileZilla to remember passwords?" msgstr "Wilt u dat FileZilla wachtwoorden onthoudt?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Wr&ite" msgstr "Schrijven" -#: ../../locales/../src/interface/netconfwizard.cpp:448 #: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Verkeerd extern IP-adres:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 msgid "Wrong line endings" msgstr "Verkeerde regeleinden" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:841 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "Geel" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:787 msgid "Yes" msgstr "Ja" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8389,24 +8634,24 @@ "Het lijkt erop dat u een IPv6-only host gebruikt. Deze wizard ondersteunt " "deze omgeving niet." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "U gebruikt de laatste versie van FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3615 msgid "You can always open this dialog again through the help menu." msgstr "U kunt dit venster altijd weer openen via het helpmenu." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "U kunt de laatste versie downloaden van de FileZilla-website:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:69 msgid "You can leave the port field empty to use the default port." msgstr "U kunt het poortveld leeg laten om de standaardpoort te gebruiken." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:518 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8414,7 +8659,7 @@ "U kunt een x op elke positie zetten om de rechten die de originele bestanden " "hebben te behouden." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "U kunt geen instellingen importeren uit Fillezilla's eigen instellingenmap." @@ -8427,67 +8672,70 @@ "U kunt een ongeldig teken niet vervangen door een ander ongeldig teken. Voer " "een teken in dat toegestaan is in bestandsnamen." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" -"U heeft geen nieuwe bestandsnaam voor het bestand ingevuld. Dit bestand " +"U hebt geen nieuwe bestandsnaam voor het bestand ingevuld. Dit bestand " "overschrijven?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "You have selected at least one symbolic link." -msgstr "U heeft minstens één symbolische koppeling geselecteerd." +msgstr "U hebt minstens één symbolische koppeling geselecteerd." -#: ../../locales/../src/interface/edithandler.cpp:1588 -#: ../../locales/../src/interface/search.cpp:725 +#: ../../locales/../src/interface/edithandler.cpp:1599 +#: ../../locales/../src/interface/search.cpp:1159 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" -"U heeft meer dan 10 bestanden geselecteerd om te bewerken. Weet u zeker dat " -"u door wilt gaan?" +"U hebt meer dan 10 bestanden geselecteerd om te bewerken. Weet u zeker dat u " +"wilt doorgaan?" -#: ../../locales/../src/interface/LocalListView.cpp:1665 +#: ../../locales/../src/interface/LocalListView.cpp:1705 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "" -"U heeft meer dan 10 bestanden of mappen geselecteerd om te openen. Weet u " -"zeker dat u door wilt gaan?" +"U hebt meer dan 10 bestanden of mappen geselecteerd om te openen. Weet u " +"zeker dat u wilt doorgaan?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:420 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 msgid "You have to enter a hostname." msgstr "U moet een hostnaam opgeven." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#, fuzzy +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1076 msgid "You have to enter a key file path" -msgstr "U moet een lokale map opgeven." +msgstr "U moet een pad opgeven voor het sleutelbestand" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:868 msgid "You have to enter a local directory." msgstr "U moet een lokale map opgeven." -#: ../../locales/../src/interface/netconfwizard.cpp:164 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "U moet een geldig IP-adres opgeven." +#: ../../locales/../src/interface/search.cpp:882 +msgid "You have to enter a remote directory." +msgstr "U moet een externe map opgeven." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "U moet een geldig IPv4-adres opgeven." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:873 msgid "You have to enter a writable local directory." msgstr "U moet een schrijfbare lokale map opgeven." -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:512 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1067 msgid "You have to enter an account name" msgstr "U moet een accountnaam opgeven" -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:486 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 msgid "You have to specify a user name" msgstr "U moet een gebruikersnaam opgeven" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8495,7 +8743,7 @@ "U hebt waarschijnlijk een router of firewall die de overgedragen gegevens " "foutief heeft gewijzigd." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "U moet een naam voor de bladwijzer opgeven." @@ -8503,7 +8751,7 @@ msgid "You need to enter a name for the log file." msgstr "U moet een naam voor het logbestand opgeven." -#: ../../locales/../src/interface/edithandler.cpp:1473 +#: ../../locales/../src/interface/edithandler.cpp:1484 msgid "You need to enter a properly quoted command." msgstr "U moet een correcte opdracht opgeven." @@ -8516,16 +8764,16 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "U moet een proxy-poortopgeven met een getal tussen 1 en 65535." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1144 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "U moet ten minste één pad opgeven. U kunt geen lege bladwijzer aanmaken." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8533,7 +8781,7 @@ "U moet een lokaal en een extern pad opgeven om gesynchroniseerd bladeren " "voor deze bladwijzer in te schakelen." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1109 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8541,23 +8789,23 @@ "U moet een lokaal en een extern pad opgeven om gesynchroniseerd bladeren " "voor deze site in te schakelen." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "You need to specify a local file." msgstr "U moet een lokaal bestand opgeven." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:321 msgid "You need to specify a remote file." msgstr "U moet een extern bestand opgeven." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:327 msgid "You need to specify a remote path." msgstr "U moet een extern pad opgeven." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:298 msgid "You need to specify a server." msgstr "U moet een server opgeven." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8565,66 +8813,66 @@ "Verbinding maken met andere servers en bestanden overdragen zou perfect " "moeten werken." -#: ../../locales/../src/interface/QueueView.cpp:3056 +#: ../../locales/../src/interface/QueueView.cpp:2684 msgid "Your computer will suspend unless you click Cancel." msgstr "Uw computer zal in slaapmodus gaan tenzij u op Annuleren klikt." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "na" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "vóór" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "begint met" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "bytes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "bevat" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "aangepast" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "bevat geen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "is niet gelijk aan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "eindigt met" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "is gelijk aan" -#: ../../locales/../src/interface/filelistctrl.cpp:529 -#: ../../locales/../src/interface/filelistctrl.cpp:548 -#: ../../locales/../src/interface/filelistctrl.cpp:575 -#: ../../locales/../src/interface/filelistctrl.cpp:591 +#: ../../locales/../src/interface/filelistctrl.cpp:535 +#: ../../locales/../src/interface/filelistctrl.cpp:554 +#: ../../locales/../src/interface/filelistctrl.cpp:581 +#: ../../locales/../src/interface/filelistctrl.cpp:597 msgid "file" msgstr "bestand" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:197 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8634,94 +8882,201 @@ "Zorg ervoor dat dit uitvoerbare bestand in dezelfde map staat als het " "uitvoerbare bestand van FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:374 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp behoort tot een andere versie van FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1484 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1391 msgid "fzsftp could not be started" msgstr "fzsftp kan niet gestart worden" -#: ../../locales/../src/engine/tlssocket.cpp:1044 +#: ../../locales/../src/engine/tlssocket.cpp:1217 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers gaf geen certificaten terug" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket.cpp:1229 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 mislukt" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "groter dan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "door groep uitvoerbaar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "door groep leesbaar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "door groep schrijfbaar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1601 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "is gelijk aan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "is ingesteld" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "is niet ingesteld" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "kleiner dan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "komt overeen met regex" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +msgid "new name" +msgstr "nieuwe naam" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "door eigenaar uitvoerbaar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "door eigenaar leesbaar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "door eigenaar schrijfbaar" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1105 -#: ../../locales/../src/engine/tlssocket.cpp:1116 -#: ../../locales/../src/engine/tlssocket.cpp:1131 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket.cpp:1423 +#: ../../locales/../src/engine/tlssocket.cpp:1439 +#: ../../locales/../src/engine/tlssocket.cpp:1455 +#: ../../locales/../src/engine/tlssocket.cpp:1471 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "onbekend" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "door iedereen uitvoerbaar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "door iedereen leesbaar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "door iedereen schrijfbaar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:699 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Host key fingerprint:" +#~ msgstr "Hostsleutelvingerafdruk:" + +#~ msgid "Available sizes" +#~ msgstr "Beschikbare groottes" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Kan de snelverbindenbalk niet laden uit bronbestand" + +#, fuzzy +#~ msgid "Could not add trust" +#~ msgstr "Kan de overdracht niet starten" + +#~ msgid "Filename &filters..." +#~ msgstr "Bestandsnaamfilters..." + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize aangeroepen zonder socket" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Kan peercertificaten niet importeren: gnutls_x509_crt_import mislukte" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Kan de structuur voor peercertificaten niet initialiseren: " +#~ "gnutls_x509_crt_init mislukte" + +#~ msgid "%d files added to queue" +#~ msgstr "%d bestanden toegevoegd aan wachtrij" + +#~ msgid "&Disconnect from server" +#~ msgstr "Verbinding met server verbreken" + +#~ msgid "&Show message" +#~ msgstr "Bericht weergeven" + +#~ msgid "Connected" +#~ msgstr "Verbonden" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "Het verwijderen van meerdere ongerelateerde mappen wordt nog niet " +#~ "ondersteund" + +#~ msgid "Do ¬hing" +#~ msgstr "Niets doen" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "Het downloaden van meerdere ongerelateerde mappen wordt nog niet " +#~ "ondersteund" + +#~ msgid "Downloading search results" +#~ msgstr "Zoekresultaten downloaden" + +#~ msgid "No more files in the queue!" +#~ msgstr "Er zijn geen bestanden meer in de wachtrij!" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Zoeken naar bestanden om toe te voegen aan de wachtrij" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Zoeken naar bestanden om te uploaden" + +#, fuzzy +#~ msgid "" +#~ "The file '%s' is not in a format supported by FileZilla.\n" +#~ "The file is also password protected. Password protected key files are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into a supported, unprotected format?" +#~ msgstr "" +#~ "Het formaat van het bestand '%s' wordt niet ondersteund door FileZilla.\n" +#~ "Het bestand is tevens beschermd met een wachtwoord. Sleutelbestanden met " +#~ "een wachtwoord worden nog niet ondersteund door FileZilla.\n" +#~ "Wilt u het converteren naar een ondersteund, onbeschermd formaat?" + +#, fuzzy +#~ msgid "" +#~ "The file '%s' is password protected. Password protected key files are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into an unprotected file?" +#~ msgstr "" +#~ "Het bestand '%s' is beschermd met een wachtwoord. Sleutelbestanden met " +#~ "een wachtwoord worden nog niet ondersteund door FileZilla.\n" +#~ "Wilt u het converteren naar een onbeschermd bestand?" + +#~ msgid "U&se system defaults" +#~ msgstr "Systeemstandaarden gebruiken" + +#~ msgid "Use system &defaults" +#~ msgstr "Systeemstandaarden gebruiken" + +#~ msgid "Waiting" +#~ msgstr "Wachten" + #~ msgid "&Crash" #~ msgstr "Crash" @@ -8830,9 +9185,6 @@ #~ msgid "Fingerprint (MD5):" #~ msgstr "Vingerafdruk (MD5):" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Rootcertificaat is niet vertrouwd" - #~ msgid "Use plain FTP" #~ msgstr "Gewoon FTP gebruiken" @@ -9195,9 +9547,6 @@ #~ msgid "Example:" #~ msgstr "Voorbeeld:" -#~ msgid "&Local path:" -#~ msgstr "Lokale pad:" - #~ msgid "Trace" #~ msgstr "Opsporen" @@ -9223,6 +9572,3 @@ #~ msgid "Error %d writing to socket" #~ msgstr "Fout %d bij schrijven naar socket" - -#~ msgid "Invalid hostname or host not found" -#~ msgstr "Ongeldige hostnaam of host niet gevonden" diff -Nru filezilla-3.15.0.2/locales/nn_NO.po filezilla-3.33.0/locales/nn_NO.po --- filezilla-3.15.0.2/locales/nn_NO.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/nn_NO.po 2016-09-28 08:57:50.000000000 +0000 @@ -1,33 +1,31 @@ -# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# Yngve Spjeld Landro , 2010, 2011, 2012, 2014, 2015. -# +# +# Yngve Spjeld Landro , 2010, 2011, 2012, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: filezilla\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-31 14:43+0100\n" -"PO-Revision-Date: 2015-03-01 03:22+0100\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2016-09-24 16:04+0200\n" +"PO-Revision-Date: 2016-09-24 03:44+0100\n" "Last-Translator: Yngve Spjeld Landro \n" -"Language-Team: Norsk (nynorsk) <>\n" +"Language-Team: NorwegianNynorsk \n" "Language: nn_NO\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Lokalize 2.0\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:199 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S brukt" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:205 msgid "%H:%M:%S left" msgstr "%H:%M:%S igjen" @@ -40,55 +38,50 @@ "%a - konto (linjer som inneheld denne vil bli utelatne om ein ikkje nyttar " "kontopålogging)" +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 #: ../../locales/../src/interface/filelist_statusbar.cpp:63 -#: ../../locales/../src/interface/filelist_statusbar.cpp:74 -#: ../../locales/../src/interface/filelist_statusbar.cpp:86 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d katalog" msgstr[1] "%d katalogar" -#: ../../locales/../src/interface/RemoteListView.cpp:1417 -#: ../../locales/../src/interface/search.cpp:469 -#: ../../locales/../src/interface/search.cpp:780 +#: ../../locales/../src/interface/RemoteListView.cpp:1399 +#: ../../locales/../src/interface/search.cpp:809 +#: ../../locales/../src/interface/search.cpp:1188 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d katalog med innhald" msgstr[1] "%d katalogar med innhald" -#: ../../locales/../src/interface/filelist_statusbar.cpp:62 -#: ../../locales/../src/interface/filelist_statusbar.cpp:85 -#: ../../locales/../src/interface/RemoteListView.cpp:1416 -#: ../../locales/../src/interface/search.cpp:468 -#: ../../locales/../src/interface/search.cpp:779 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1398 +#: ../../locales/../src/interface/search.cpp:808 +#: ../../locales/../src/interface/search.cpp:1187 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fil" msgstr[1] "%d filer" -#: ../../locales/../src/interface/filelist_statusbar.cpp:81 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d fil. Total storleik: %s" msgstr[1] "%d filer. Total storleik: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d fil. Total storleik: minst %s" msgstr[1] "%d filer. Total storleik: minst %s" -#: ../../locales/../src/interface/QueueView.cpp:2841 -#, c-format -msgid "%d files added to queue" -msgstr "%d filer er lagde til i køen" - -#: ../../locales/../src/engine/ControlSocket.cpp:103 +#: ../../locales/../src/engine/ControlSocket.cpp:102 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -99,27 +92,41 @@ msgid "%h - Host" msgstr "%h - vert" +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, fuzzy, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%d katalog" +msgstr[1] "%d katalogar" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:118 +#, fuzzy, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%d fil" +msgstr[1] "%d filer" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:517 #, c-format msgid "%p - Password" msgstr "%p - passord" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:160 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:163 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - sertifikatet er gått ut" -#: ../../locales/../src/interface/verifycertdialog.cpp:28 +#: ../../locales/../src/interface/verifycertdialog.cpp:32 #, c-format msgid "%s - Not yet valid!" msgstr "%s - enno ikkje gyldig" @@ -129,24 +136,24 @@ msgid "%s - Proxy user" msgstr "%s - mellomtenarbrukar" -#: ../../locales/../src/interface/filelist_statusbar.cpp:91 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s og %s. Total storleik: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:89 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s og %s. Total storleik: minst %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:34 +#: ../../locales/../src/engine/sizeformatting_base.cpp:67 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s bytar" -#: ../../locales/../src/interface/FileZilla.cpp:674 +#: ../../locales/../src/interface/FileZilla.cpp:581 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -160,7 +167,7 @@ "Last ned FileZilla på nytt. Du bør senda ei feilmelding om problemet " "framleis er der då." -#: ../../locales/../src/interface/FileZilla.cpp:759 +#: ../../locales/../src/interface/FileZilla.cpp:666 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -176,7 +183,7 @@ "- sjå til at %s finst i ein katalog som ligg i miljøvariabelen PATH.\n" "- legg %s si fulle filbane til i miljøvariabelen FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:57 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s med %d bitar" @@ -190,7 +197,7 @@ msgid "%w - Proxy password" msgstr "%w - mellomtenarpassord" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3640 msgid "&Abort previous connection and connect in current tab" msgstr "Avbryt den &førre tilkoplinga og kopla til i denne fana" @@ -198,16 +205,16 @@ msgid "&About..." msgstr "&Om …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2499 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "&Konto:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:478 msgid "&Active" -msgstr "A&ktiv" +msgstr "Akt&iv" #: ../../locales/../src/interface/resources/xrc/menus.xrc:206 msgid "&Add bookmark..." @@ -219,31 +226,31 @@ msgstr "Legg til &filer i køen" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." +msgid "&Add key file..." msgstr "Legg til &nøkkelfil …" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:547 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:496 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:559 msgid "&Add to queue" msgstr "Legg til i &køen" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:407 msgid "&Adjust server timezone offset:" -msgstr "&Juster tenaren si tidssoneforskyving:" +msgstr "J&uster tenaren si tidssoneforskyving:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "Stol alltid på &sertifikatet i framtidige økter." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:879 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 msgid "&Always trust this host, add this key to the cache" msgstr "Stol alltid på denne &verten - legg denne nøkkelen til i mellomlageret" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1939 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 msgid "&Always use default editor" msgstr "Bruk &alltid førehandsvalt skriveprogram" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 msgid "&Always use selection for unassociated files" msgstr "Bruk &alltid valet for filer utan tilknyting" @@ -256,22 +263,26 @@ msgstr "Spør operativsystemet ditt etter den &eksterne IP-adressa" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:582 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Auto" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 msgid "&Autodetect" msgstr "&Auto-oppdaging" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:275 +msgid "&Background color:" +msgstr "B&akgrunnsfarge:" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Binær" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Binærprefiks nyttar SI-symbol (t.d. 1kB = 1024 bytar)" @@ -279,25 +290,25 @@ msgid "&Bookmarks" msgstr "&Bokmerke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2235 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2724 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3099 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2126 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:295 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2963 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:367 msgid "&Browse..." -msgstr "&Bla …" +msgstr "Bl&a …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:936 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 msgid "&Burst tolerance:" msgstr "&Spreiegrense (burst tolerance):" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1009 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3826 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -311,11 +322,11 @@ msgid "&Close" msgstr "L&ukk" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "L&ukk FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:642 msgid "&Configure speed limits..." msgstr "&Fartsgrenseinnstillingar …" @@ -323,7 +334,7 @@ msgid "&Configure..." msgstr "&Innstillingar …" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:619 msgid "&Connect" msgstr "Kop&la til" @@ -331,40 +342,36 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Kopier noverande tilkopling til tilkoplingsstyraren …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:787 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "Kopier til &utklippstavla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 -msgid "&Crash" -msgstr "&Krasj" - #: ../../locales/../src/interface/resources/xrc/menus.xrc:264 #: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "&Create directory" msgstr "Lag &katalog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Create new tab" msgstr "&Lag ny fane" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "&Feilsøk" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Debug information in message log:" msgstr "Feilsøkingsopplysningar i &meldingsloggen:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1881 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 msgid "&Default editor:" msgstr "&Førehandsvalt skriveprogram:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "&Standardhandling når fila finst …" @@ -372,24 +379,34 @@ msgid "&Delay between failed login attempts:" msgstr "&Forseinking ved mislykka innloggingsforsøk:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1053 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1223 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2848 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Slett" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 msgid "&Delete symlink" msgstr "&Slett symlenkja" #: ../../locales/../src/interface/resources/xrc/menus.xrc:70 msgid "&Directory comparison" -msgstr "Katalog&samanlikning" +msgstr "Katalogsamanl&ikning" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/state.cpp:913 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "Slå &av synkronisert blaing og hald fram med å endra lokalkatalogen" + +#: ../../locales/../src/interface/state.cpp:985 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "Slå av synkronisert blaing og hald fram med å endra &fjernkatalogen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1821 msgid "&Discard local file then download and edit file anew" msgstr "&Forkast den lokale fila. Last ned og endra ho på nytt" @@ -397,19 +414,15 @@ msgid "&Disconnect" msgstr "Kopla &frå" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "Kopla frå &tenaren" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "Syn den &gjeldande overføringsfarten i staden for gjennomsnittet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1589 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 msgid "&Display size in bytes" msgstr "Sy&n storleik i bytar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3809 msgid "&Do not remember passwords (recommended)" msgstr "Hugs &ikkje passorda (tilrådd)" @@ -422,25 +435,25 @@ msgstr "Bruk ikkje &ekstern IP-adresse på lokale tilkoplingar." # var: Vel handling for dobbeltklikk på &filer: -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1796 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "&Double-click action on files:" msgstr "På &filer:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "&Download" msgstr "&Last ned" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3160 msgid "&Download to:" msgstr "&Last ned til:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:608 msgid "&Download..." msgstr "&Last ned …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1382 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Nedlastingar:" @@ -449,35 +462,39 @@ msgid "&Edit" msgstr "En&dra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 msgid "&Edit filter rules..." msgstr "&Endra filterreglane …" #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 msgid "&Enable" msgstr "&Bruk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:877 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +msgid "&Enable compression" +msgstr "Bruk &komprimering" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3698 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "Bruk &fartsgrense:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:565 msgid "&Encoding:" -msgstr "Teikn&koding:" +msgstr "T&eiknkoding:" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 msgid "&Encryption:" -msgstr "&Kryptering:" +msgstr "Krypter&ing:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "Skriv inn &tilpassa kommando …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3453 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3633 msgid "&Establish connection in a new tab" msgstr "Gjer &tilkoplinga i ei ny fane" @@ -485,12 +502,12 @@ msgid "&Execute" msgstr "&Utfør" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1572 msgid "&Export Site Manager entries" msgstr "&Eksporter oppføringane i tilkoplingsstyraren" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "&Export..." msgstr "&Eksporter …" @@ -502,41 +519,52 @@ msgid "&File" msgstr "&Fil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:527 msgid "&File Attributes..." msgstr "&Filattributt …" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "Fil&rettar …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 msgid "&File:" msgstr "F&il:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" msgstr "Filter&vilkår:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "&Filter sets:" msgstr "&Filtersamlingar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1647 +#, fuzzy +msgid "&Filters" +msgstr "&Filter:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Filter:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 msgid "&Finish editing and delete local file" msgstr "&Avslutt endring og slett lokal fil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3291 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "&Flat ut lokalstiane, last opp alle filene direkte til målkatalogen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "&Flat ut fjernbanene, last ned alle filene direkte til målkatalogen." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "&Follow symlink, delete target directory contents" msgstr "&Følg symlenkja, slett målkataloginnhaldet" @@ -548,11 +576,11 @@ msgid "&Getting help..." msgstr "&Få hjelp …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2612 msgid "&Global bookmark" msgstr "&Globalt bokmerke" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:705 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 og nyttar CONNECT-metoden" @@ -561,11 +589,11 @@ msgstr "&Hjelp" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "&Hide identical files" msgstr "&Gøym identiske filer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "&Høgste" @@ -573,17 +601,17 @@ msgid "&Highest available port:" msgstr "&Høgste tilgjengelege port:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2407 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 msgid "&Host:" msgstr "V&ert:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1597 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC binærprefiks (t.d.. 1 KiB = 1024 bytar)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1483 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (døme: 2007-09-15)" @@ -591,19 +619,27 @@ msgid "&Import..." msgstr "&Importer …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1972 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Inherit system's filetype associations" msgstr "&Bruk systemet sine filtypetilknytingar" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Installer ny utgåve" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3284 +msgid "&Keep local path structure relative to search root" +msgstr "Hald &lokalstitrukturen relativ til søkjerota" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 msgid "&Keep remote path structure relative to search root" msgstr "Hald &fjernbanestrukturen relativ til søkjerota" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1259 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +msgid "&Key file:" +msgstr "N&økkelfil:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "&Formgjeving av fil- og katalogvindauga:" @@ -611,7 +647,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "Avgrens dei &lokale portane FileZilla kan nytta" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:494 msgid "&Limit number of simultaneous connections" msgstr "Avgrens talet på samstundes &tilkoplingar" @@ -619,24 +655,28 @@ msgid "&Local directory tree" msgstr "Lok&alt katalogtre" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2629 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2712 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 msgid "&Local directory:" msgstr "&Lokal katalog:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +msgid "&Local search" +msgstr "&Lokalsøk" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "&Log to file" msgstr "&Logg til fil" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "P&åloggingstype:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 msgid "&Logontype:" msgstr "P&åloggingstype:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "&Låg" @@ -648,7 +688,7 @@ msgid "&Manual transfer..." msgstr "&Manuell overføring …" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:504 msgid "&Maximum number of connections:" msgstr "&Høgste tal tilkoplingar:" @@ -660,15 +700,15 @@ msgid "&Message log" msgstr "&Meldingslogg" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 msgid "&Minimize to tray" msgstr "&Plasser i systemfeltet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 msgid "&Name sorting mode:" msgstr "&Namnesorteringsmåte:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2639 msgid "&Name:" msgstr "&Namn:" @@ -676,7 +716,7 @@ msgid "&Network configuration wizard..." msgstr "Rettleiar &nettverksinnstillingar …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 msgid "&New" msgstr "&Ny" @@ -684,25 +724,26 @@ msgid "&New Site" msgstr "&Ny nettstad" -#: ../../locales/../src/interface/Mainfrm.cpp:1733 +#: ../../locales/../src/interface/Mainfrm.cpp:1657 msgid "&New version available!" msgstr "Ny utg&åve er tilgjengeleg." -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Neste >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1746 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1896 msgid "&No" msgstr "&Nei" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:700 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&Ingen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&Normal" @@ -711,8 +752,8 @@ msgstr "&Talverdi:" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2848 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2897 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:627 msgid "&OK" msgstr "&OK" @@ -721,7 +762,7 @@ msgstr "OP&EN" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "&Open" msgstr "&Opna" @@ -730,7 +771,7 @@ msgid "&Overwrite" msgstr "&Skriv over" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:485 msgid "&Passive" msgstr "&Passiv" @@ -738,11 +779,11 @@ msgid "&Password:" msgstr "&Passord:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "&Spel lyd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2420 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 msgid "&Port:" @@ -752,7 +793,7 @@ msgid "&Preserve timestamps of transferred files" msgstr "Ta vare på &tidsstempelet til dei overførte filene" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1641 msgid "&Queue" msgstr "&Kø" @@ -764,6 +805,10 @@ msgid "&Quickconnect bar" msgstr "Lyn&tilkoplingslinja" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1505 +msgid "&Quickconnect history" +msgstr "&Lyntilkoplingshistorikken" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Read" msgstr "&Les" @@ -772,8 +817,12 @@ msgid "&Reconnect" msgstr "Kopla til &att" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1512 +msgid "&Reconnect information" +msgstr "Oppattilkoplings&historikken" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:633 msgid "&Refresh" msgstr "&Oppdater" @@ -781,20 +830,24 @@ msgid "&Remember password until FileZilla is closed" msgstr "Hugs passordet berre so lenge FileZilla køyrer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3803 msgid "&Remember passwords" msgstr "&Hugs passord" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2656 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2693 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2780 msgid "&Remote directory:" msgstr "&Fjernkatalog:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2259 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "&Remote path:" msgstr "&Fjernfilbane:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +msgid "&Remote search" +msgstr "&Fjernfilsøk" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Fjern" @@ -802,29 +855,29 @@ msgid "&Remove key" msgstr "&Fjern nøkkel" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "&Fjern vald(e)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1229 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "En&dra namn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1048 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 msgid "&Rename..." msgstr "En&dra namn …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1814 msgid "&Reopen local file" msgstr "Opna lokal fil på &nytt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 msgid "&Replace invalid characters with:" msgstr "Byt ut ugyldige &teikn med:" @@ -832,7 +885,11 @@ msgid "&Report a bug..." msgstr "&Meld frå om feil …" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "&Be om merksemd" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 msgid "&Reset and requeue all" msgstr "&Nullstill og legg alle i køen igjen" @@ -844,7 +901,7 @@ msgid "&Resume" msgstr "&Gå vidare" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "&Køyr kommando …" @@ -852,7 +909,7 @@ msgid "&Run configuration wizard now..." msgstr "Køyr &innstillingsrettleiaren no …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2065 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 msgid "&Run update check now..." msgstr "Køyr oppdaterings&kontroll no …" @@ -860,15 +917,15 @@ msgid "&SITE" msgstr "&NETTSTAD" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 msgid "&SOCKS 5" msgstr "SO&CKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 msgid "&Save as..." msgstr "Lagra so&m …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "&Search" msgstr "&Søk" @@ -880,20 +937,20 @@ msgid "&Select Entry:" msgstr "Vel opp&føring:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1848 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 msgid "&Select language:" msgstr "Vel spr&åk:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2148 msgid "&Select the columns that should be displayed:" msgstr "Vel kva for kolonnar som skal &synast:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2335 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Tenar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Settings" msgstr "&Innstillingar" @@ -901,27 +958,27 @@ msgid "&Settings..." msgstr "&Innstillingar …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2204 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 msgid "&Show debug menu" msgstr "Syn &feilsøkingsmenyen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 msgid "&Show detailed log" msgstr "Syn &detaljert logg" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "Syn &melding" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2098 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 msgid "&Show timestamps in message log" msgstr "Vis &tidsstempel i meldingsloggen" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1518 +msgid "&Site Manager entries" +msgstr "&Oppføringar i tilkoplingsstyraren" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Tilkoplingsstyraren …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "&Site-specific bookmark" msgstr "Nettstad&spesifikt bokmerke" @@ -933,23 +990,24 @@ msgid "&Speed limits" msgstr "&Fartsgrenser" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 msgid "&Start transfer immediately" msgstr "Start overføringa &med ein gong" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1280 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 msgid "&Swap local and remote panes" msgstr "&Byt om på lokal- og fjernvindauga" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "&TLS Ciphers" msgstr "&TLS-krypteringsmetode" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Test" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 msgid "&Theme:" msgstr "&Drakt:" @@ -957,45 +1015,54 @@ msgid "&Transfer" msgstr "&Overfør" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:382 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 msgid "&Transfer mode:" -msgstr "&Overføringsmodus:" +msgstr "Overf&øringsmodus:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1524 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "Overførings&kø" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1122 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 msgid "&Treat dotfiles as ASCII files" msgstr "Behandla filer som begynner med &punktum som ASCII-filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "&Unedit" msgstr "&Gjer om" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 msgid "&Update cached key for this host" msgstr "&Oppdater den mellomlagra nøkkelen for denne verten" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 msgid "&Upload" msgstr "&Last opp" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3261 +msgid "&Upload to:" +msgstr "Last &opp til:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +msgid "&Upload..." +msgstr "&Last opp …" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "Opp&lastingar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 msgid "&Use custom program" msgstr "Bruk tilpassa &program" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:388 msgid "&Use synchronized browsing" msgstr "Bruk synk&ronisert blaing" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Use system's default editor for text files" msgstr "&Bruk systemet sitt førehandsvalde skriveprogram til tekstfiler" @@ -1007,13 +1074,13 @@ msgid "&Use the server's external IP address instead" msgstr "Bruk heller tenaren si &eksterne adresse" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "&Use thousands separator" msgstr "Bruk &tusenskilje" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2437 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "Br&ukar:" @@ -1021,7 +1088,7 @@ msgid "&Username:" msgstr "Brukar&namn:" -#: ../../locales/../src/interface/Mainfrm.cpp:1727 +#: ../../locales/../src/interface/Mainfrm.cpp:1651 #, c-format msgid "&Version %s" msgstr "&Utgåve %s" @@ -1031,15 +1098,15 @@ msgstr "&Syn" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:599 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:614 msgid "&View/Edit" msgstr "&Syn/endra" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "Følg &lokalt endra filer og spør om å lasta opp endringane" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2041 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "&When checking for updates, check for:" msgstr "Ved søk etter &oppdateringar, sjå etter:" @@ -1047,30 +1114,30 @@ msgid "&Write" msgstr "&Skriv" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1740 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1767 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "&Yes" msgstr "&Ja" -#: ../../locales/../src/engine/local_path.cpp:449 -#: ../../locales/../src/engine/local_path.cpp:495 +#: ../../locales/../src/engine/local_path.cpp:444 +#: ../../locales/../src/engine/local_path.cpp:490 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' finst ikkje eller ein får ikkje tilgang." -#: ../../locales/../src/engine/local_path.cpp:464 -#: ../../locales/../src/engine/local_path.cpp:484 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:459 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:485 #, c-format msgid "'%s' is not a directory." msgstr "'%s' er ikkje ein katalog." -#: ../../locales/../src/interface/manual_transfer.cpp:445 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../locales/../src/interface/manual_transfer.cpp:427 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:974 msgid "'Account' logontype not supported by selected protocol" msgstr "Påloggingstypen 'konto' er ikkje støtta av den valde protokollen" -#: ../../locales/../src/interface/manual_transfer.cpp:459 +#: ../../locales/../src/interface/manual_transfer.cpp:441 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1078,7 +1145,7 @@ "Påloggingstypane \"Normal\" og \"Konto\" er ikkje tilgjengelege, bruk \"Spør " "etter passord\" i staden for." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:989 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1086,7 +1153,7 @@ "Påloggingstypane \"Normal\" og \"Konto\" er ikkje tilgjengelege. Oppføringa " "di er i staden for vorten endra til \"Spør etter passord\"." -#: ../../locales/../src/interface/Mainfrm.cpp:611 +#: ../../locales/../src/interface/Mainfrm.cpp:587 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1096,16 +1163,21 @@ "å senda argumenta etter 'quote' til tenaren. Du bør heller skriva inn " "råkommandoen utan den leiande 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:96 -#: ../../locales/../src/interface/filelist_statusbar.cpp:105 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objekt filtrert)" msgstr[1] "(%d objekt filtrerte)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:839 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:860 +#: ../../locales/../src/interface/update_dialog.cpp:308 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% nedlasta)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 msgid "(0 for no limit)" msgstr "(0 gjev inga grense)" @@ -1117,33 +1189,33 @@ msgid "(0-999 seconds)" msgstr "(0-999 sekund)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:818 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 msgid "(1-10)" msgstr "(1-10)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:109 -msgid "(5-9999, 0 to disable)" -msgstr "(5-9999, 0 for å slå av)" +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, 0 for å slå av)" # ? òg omsetja "app compat" -#: ../../locales/../src/interface/aboutdialog.cpp:84 -#: ../../locales/../src/interface/aboutdialog.cpp:161 +#: ../../locales/../src/interface/aboutdialog.cpp:85 +#: ../../locales/../src/interface/aboutdialog.cpp:174 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat er no %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 msgid "(example: %H:%M)" msgstr "(døme: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "(example: %Y-%m-%d)" msgstr "(døme: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:900 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3717 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format msgid "(in %s/s)" msgstr "(i %s/s)" @@ -1152,7 +1224,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:208 msgid "--:--:-- left" msgstr "--:--:-- igjen" @@ -1172,35 +1244,35 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s kan ikkje nyttast saman mned ei FTP-adresse." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 msgid "0 - None" msgstr "0 - Ingen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2226 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "1 - Warning" msgstr "1 - Åtvaring" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 msgid "2 - Info" msgstr "2 - Info" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2228 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 msgid "3 - Verbose" msgstr "3 - Alle meldingar" -#: ../../locales/../src/interface/aboutdialog.cpp:97 +#: ../../locales/../src/interface/aboutdialog.cpp:98 msgid "32-bit system" msgstr "32-bit-system" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2229 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 msgid "4 - Debug" msgstr "4 - Feilsøk" -#: ../../locales/../src/interface/aboutdialog.cpp:95 +#: ../../locales/../src/interface/aboutdialog.cpp:96 msgid "64-bit system" msgstr "64-bit-system" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Attende" @@ -1208,20 +1280,24 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:107 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Det finst allereie eit bokmerke med det innskrivne namnet. Skriv inn eit " "namn som ikkje er i bruk." +#: ../../locales/../src/engine/tlssocket.cpp:1318 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Eit sertifikat i kjeda vart signert med ein utrygg algoritme" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Ein må velja eit føretrekt skriveprogram." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:808 +#: ../../locales/../src/interface/RemoteListView.cpp:160 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:758 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Ein katalog kan ikkje bli dregen til ein av underkatalogane sine." @@ -1235,21 +1311,21 @@ "innstillingar. I slike tilfelle må du bruka aktivmodus. Aktivmodus betyr at " "FileZilla opnar ein port og spør tenaren om å få kopla seg til han." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 msgid "A file previously opened has been changed." msgstr "Ei fil som tidlegare er opna, er blitt endra." -#: ../../locales/../src/interface/edithandler.cpp:1687 +#: ../../locales/../src/interface/edithandler.cpp:1650 msgid "A file with that name is already being transferred." msgstr "Ei fil med det namnet blir allereie overført." -#: ../../locales/../src/interface/edithandler.cpp:1691 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Ei fil med det namnet held allereie på å bli endra. Lukk ho og prøv på nytt." -#: ../../locales/../src/interface/FileZilla.cpp:653 +#: ../../locales/../src/interface/FileZilla.cpp:560 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1263,11 +1339,11 @@ "fillistingane.\n" "Det vil ikkje bli vist fleire åtvaringar i denne økta." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Ei ny utgåve av FileZilla er tilgjengeleg:" -#: ../../locales/../src/interface/Mainfrm.cpp:674 +#: ../../locales/../src/interface/Mainfrm.cpp:649 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1283,7 +1359,7 @@ "Ein tenar med rette innstillingar treng ikkje dette. Kontakt " "tenaradministratoren om du verkeleg treng det." -#: ../../locales/../src/interface/state.cpp:283 +#: ../../locales/../src/interface/state.cpp:251 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1293,16 +1369,16 @@ "katalogen?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1043 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "AS&CII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1091 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 msgid "A&dd" msgstr "&Legg til" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1228 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 msgid "A&llow resume of ASCII files" msgstr "Tillata &framhald av ASCII-filer" @@ -1318,11 +1394,11 @@ msgid "A&pply to all files and directories" msgstr "&Bruk på alle filer og katalogar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 msgid "A&utomatically remove successful transfers" msgstr "Fjern &automatisk vellykka overføringar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2514 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2551 msgid "ASCII" msgstr "ASCII" @@ -1330,31 +1406,31 @@ msgid "About FileZilla" msgstr "Om FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 msgid "Above the file lists" msgstr "Over fillistene" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:161 -#: ../../locales/../src/interface/manual_transfer.cpp:194 -#: ../../locales/../src/interface/manual_transfer.cpp:563 -#: ../../locales/../src/interface/manual_transfer.cpp:564 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1276 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1277 +#: ../../locales/../src/engine/server.cpp:886 +#: ../../locales/../src/engine/server.cpp:907 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/manual_transfer.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1322 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1323 msgid "Account" msgstr "Konto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "Handling etter at køen er &tømt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1929 msgid "Action on selected file:" msgstr "Handling på vald fil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 msgid "Action to perform:" msgstr "Utføra handlinga:" @@ -1366,7 +1442,7 @@ msgid "Active mode" msgstr "Aktivmodus" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1374,7 +1450,7 @@ "FTP-testen i aktivmodus feila. FileZilla er ukjend med den rette eksterne IP-" "adressa." -#: ../../locales/../src/interface/netconfwizard.cpp:608 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1382,7 +1458,7 @@ "FTP-testen i aktivmodus feila. FileZilla er ukjend med den rette eksterne IP-" "adressa. Dessutan har rutaren din endra sendingsadressa." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1395,12 +1471,13 @@ msgid "Active mode IP" msgstr "IP-adressa i aktivmodus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3309 msgid "Add files to &queue only" msgstr "Legg berre til filer i &køen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "Add selected directory to the transfer queue" msgstr "Legg den valde katalogen til overføringskøen" @@ -1409,20 +1486,20 @@ msgid "Add selected files and folders to the transfer queue" msgstr "Legg valde filer og mapper til overføringskøen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1804 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "Add to queue" msgstr "Legg til i køen" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:496 msgid "Address type not supported" msgstr "Adressetypen er ikkje støtta" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:313 msgid "Advanced" msgstr "Avansert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2056 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1436,15 +1513,15 @@ "og kan til og med øydeleggja systemet ditt. Bruk beta- og nattutgåvene på " "eigen risiko!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3650 msgid "Al&ways perform this action" msgstr "Bruk alltid denne &handlinga" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2008 msgid "Algorithm:" msgstr "Algoritme:" -#: ../../locales/../src/interface/QueueView.cpp:3023 +#: ../../locales/../src/interface/QueueView.cpp:2485 msgid "All files have been successfully transferred" msgstr "Alle filene blei overførde" @@ -1452,7 +1529,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Alle portar i det gjevne området må vera mellom 1024 og 65535." -#: ../../locales/../src/interface/QueueView.cpp:3019 +#: ../../locales/../src/interface/QueueView.cpp:2481 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1467,11 +1544,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Tillèt tilbakefall til annan overføringsmåte ved feil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "Already connected" msgstr "Allereie tilkopla" -#: ../../locales/../src/interface/verifycertdialog.cpp:76 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Anna namn:" @@ -1493,7 +1570,7 @@ "Alternativt kan du nytta systemet ditt sin SSH-agent. For å kunna gjera " "dette må miljøvariabelen SSH_AUTH_SOCK vera lagra." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:134 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1501,7 +1578,7 @@ "Alternativt kan du ogso lasta ned den siste utgåva frå FileZilla sin " "nettstad:" -#: ../../locales/../src/interface/QueueView.cpp:1962 +#: ../../locales/../src/interface/QueueView.cpp:1542 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1510,7 +1587,7 @@ "Klarte ikkje å lasta overføringskøen frå \"%s\".\n" "Somme køelement er kanskje ikkje førde attende." -#: ../../locales/../src/interface/QueueView.cpp:1867 +#: ../../locales/../src/interface/QueueView.cpp:1440 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1519,7 +1596,11 @@ "Klarte ikkje å lagra overføringskøen på \"%s\".\n" "Somme element blei kanskje ikkje lagra." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/engine/tlssocket.cpp:1321 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Ein utferdar i sertifikatkjeda er ikkje ein sertifiseringsinstans" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2066 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1527,37 +1608,31 @@ "Eit element finst allereie på lagringsstaden med det same namnet som det du " "dreg." -#: ../../locales/../src/engine/server.cpp:857 -#: ../../locales/../src/interface/manual_transfer.cpp:159 -#: ../../locales/../src/interface/manual_transfer.cpp:197 -#: ../../locales/../src/interface/manual_transfer.cpp:213 -#: ../../locales/../src/interface/manual_transfer.cpp:562 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1275 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1516 +#: ../../locales/../src/engine/server.cpp:909 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1609 msgid "Anonymous" msgstr "Anonym" -#: ../../locales/../src/interface/state.cpp:992 +#: ../../locales/../src/interface/state.cpp:962 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Ei anna fjernhandling er allereie i gang - kan ikkje endra katalogen no." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:803 msgid "Any changes made in the Site Manager could not be saved." msgstr "Klarte ikkje å lagra endringane i tilkoplingsstyraren." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:740 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "Du må reparera fila om du vil lagra endringane i tilkoplingsstyraren." - -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:955 msgid "Any changes made to the filters could not be saved." msgstr "Klarte ikkje å lagra eventuelle filterendringar." -#: ../../locales/../src/interface/filter.cpp:971 +#: ../../locales/../src/interface/filter.cpp:863 msgid "Any changes made to the filters will not be saved." msgstr "Ingen filterendringar vil lagrast." @@ -1565,7 +1640,7 @@ msgid "App&ly to directories only" msgstr "Bruk berre på &katalogar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 msgid "Apply" msgstr "Ta i bruk" @@ -1581,25 +1656,25 @@ msgid "Archive" msgstr "Arkiv" -#: ../../locales/../src/engine/socket.cpp:1184 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Argument buffer overflow" msgstr "Argumentmellomlageret er fullt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 msgid "As tab in the transfer queue pane" msgstr "Som fane i overføringskøvindauget" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1390 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Spør etter handling" -#: ../../locales/../src/engine/server.cpp:832 -#: ../../locales/../src/engine/server.cpp:851 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/engine/server.cpp:880 +#: ../../locales/../src/engine/server.cpp:901 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Spør etter passord" @@ -1611,7 +1686,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Spør operativsystemet ditt etter den eksterne IP-adressa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 msgid "Asking questions in the FileZilla forums" msgstr "Stilla spørsmål i FileZilla-foruma" @@ -1619,7 +1694,7 @@ msgid "Associated program not found:" msgstr "Fann ikkje tilknytta program:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:709 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:698 msgid "At least one filter condition is incomplete" msgstr "Minst eitt filtervilkår er ufullstendig" @@ -1631,79 +1706,87 @@ msgid "Attribute" msgstr "Attributt" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:639 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:596 msgid "Authentication failed." msgstr "Autentiseringa feila." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 msgid "Author:" msgstr "Forfattar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2529 msgid "Auto" msgstr "Auto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1061 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 msgid "Automatic file type classification" msgstr "Automatisk filtypeklassifisering" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 msgid "Available sizes" msgstr "Tilgjengelege storleikar" -#: ../../locales/../src/engine/sizeformatting_base.cpp:124 -#: ../../locales/../src/engine/sizeformatting_base.cpp:183 +#: ../../locales/../src/engine/sizeformatting_base.cpp:155 +#: ../../locales/../src/engine/sizeformatting_base.cpp:214 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:267 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:339 msgid "B&ypass proxy" msgstr "Bruk ikkje &mellomtenar" -#: ../../locales/../src/engine/socket.cpp:1149 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Bad file descriptor" msgstr "Ugyldig filskildrar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 msgid "Basic usage instructions" msgstr "Rettleiing i grunnleggjande bruk" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 msgid "Behaviour" msgstr "Oppførsel" -#: ../../locales/../src/interface/edithandler.cpp:1131 -#: ../../locales/../src/interface/edithandler.cpp:1159 +#: ../../locales/../src/interface/edithandler.cpp:1120 +#: ../../locales/../src/interface/edithandler.cpp:1148 msgid "Being edited" msgstr "Blir endra" -#: ../../locales/../src/engine/tlssocket.cpp:1037 +#: ../../locales/../src/engine/tlssocket.cpp:1312 msgid "Beware! Certificate has been revoked" msgstr "Ver merksam! Sertifikatet er blitt trekt tilbake" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2519 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2556 msgid "Binary" msgstr "Binær" # ? -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 msgid "Blackboard" msgstr "Tavle" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:269 -#: ../../locales/../src/interface/menu_bar.cpp:307 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "Blå" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:259 +#: ../../locales/../src/interface/menu_bar.cpp:291 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:381 msgid "Bookmark" msgstr "Bokmerke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2819 msgid "Bookmark:" msgstr "Bokmerke:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2808 msgid "Bookmarks" msgstr "Bokmerke" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +msgid "Browse..." +msgstr "Bl&a …" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "Utgåvedato:" @@ -1712,7 +1795,7 @@ msgid "Build information" msgstr "Utgåveopplysningar" -#: ../../locales/../src/interface/verifycertdialog.cpp:187 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Forretningskategori:" @@ -1730,63 +1813,74 @@ msgid "C&ancel current operation" msgstr "A&vbryt noverande handling" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "Tøm &alle" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "C&opy URL(s) to clipboard" msgstr "&Kopier adresse(r) til utklippstavla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1488 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:523 +msgid "C&opy URL(s) with password to clipboard" +msgstr "&Kopier adresse(r) med passord til utklippstavla" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "C&ustom" msgstr "Ti&lpassa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "C&ustom filetype associations:" msgstr "&Tilpassa filtypetilknytingar:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1606 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1197 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +msgid "CPU features:" +msgstr "Prosessoreigenskapar:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1575 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1128 msgid "Calculating timezone offset of server..." msgstr "Reknar ut tidssoneforskyvinga til tenaren …" -#: ../../locales/../src/engine/transfersocket.cpp:691 +#: ../../locales/../src/engine/transfersocket.cpp:666 msgid "Can't read from file" msgstr "Klarer ikkje å lesa frå fila" -#: ../../locales/../src/engine/transfersocket.cpp:669 -#: ../../locales/../src/engine/transfersocket.cpp:742 +#: ../../locales/../src/engine/transfersocket.cpp:646 +#: ../../locales/../src/engine/transfersocket.cpp:714 msgid "Can't write data to file." msgstr "Klarer ikkje å skriva data til fila." -#: ../../locales/../src/engine/transfersocket.cpp:671 -#: ../../locales/../src/engine/transfersocket.cpp:744 +#: ../../locales/../src/engine/transfersocket.cpp:648 +#: ../../locales/../src/engine/transfersocket.cpp:716 #, c-format msgid "Can't write data to file: %s" msgstr "Klarer ikkje å skriva data til fila: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:264 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1169 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1350 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1457 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1528 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1581 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1814 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2163 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2545 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2854 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3488 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1473 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1667 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2735 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2993 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3231 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3326 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3396 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3668 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3888 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:634 msgid "Cancel" msgstr "A&vbryt" @@ -1798,21 +1892,21 @@ msgid "Cancels the current operation" msgstr "Avbryt gjeldande handling" -#: ../../locales/../src/engine/local_path.cpp:459 +#: ../../locales/../src/engine/local_path.cpp:454 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Kan ikkje bruka '%s': media er ikkje sett i, eller stasjonen er ikkje klar." -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Cannot add server to Site Manager" msgstr "Klarer ikkje å leggja til tenaren i tilkoplingsstyraren" -#: ../../locales/../src/engine/socket.cpp:1201 +#: ../../locales/../src/engine/socket.cpp:1093 msgid "Cannot assign requested address" msgstr "Klarte ikkje å tildela adressa" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1821,7 +1915,7 @@ "Vil du avbryta arbeidet og lukka fana?" # var: Klarer ikkje å samanlikna katalogane sidan forskjellige filter for lokal- og fjernkatalogane er i bruk -#: ../../locales/../src/interface/listingcomparison.cpp:74 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1829,32 +1923,26 @@ "Klarer ikkje å samanlikna katalogane sidan lokal- og fjernkatalogane nyttar " "forskjellige filter" -#: ../../locales/../src/interface/RemoteListView.cpp:2365 -msgid "Cannot compare directories, not connected to a server." -msgstr "" -"Klarer ikkje å samanlikna katalogane sidan det ikkje er samband mot ein " -"tenar." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Klarer ikkje å oppretta nytt filter" -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/edithandler.cpp:1665 -#: ../../locales/../src/interface/LocalListView.cpp:1720 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1580 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/LocalListView.cpp:1737 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Cannot edit file" msgstr "Klarer ikkje å endra fila" -#: ../../locales/../src/interface/LocalListView.cpp:1602 +#: ../../locales/../src/interface/LocalListView.cpp:1618 msgid "Cannot edit file, not connected to any server." msgstr "Klarer ikkje å endra fila - er ikkje tilkopla ein tenar." -#: ../../locales/../src/interface/LocalListView.cpp:1611 +#: ../../locales/../src/interface/LocalListView.cpp:1627 msgid "Cannot edit file, remote path unknown." msgstr "Klarer ikkje å endra fila sidan fjernbana er ukjend." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:325 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1865,94 +1953,92 @@ msgid "Cannot load Quickconnect bar from resource file" msgstr "Klarer ikkje å lasta lyntilkoplinga si verktøylinje frå ressursfila" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 -msgid "Cannot load keyfile" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +msgid "Cannot load key file" msgstr "Klarer ikkje å lasta nøkkelfila" -#: ../../locales/../src/interface/Mainfrm.cpp:1035 +#: ../../locales/../src/interface/Mainfrm.cpp:996 msgid "Cannot load toolbar from resource file" msgstr "Klarer ikkje å lasta verktøylinja frå ressursfila" -#: ../../locales/../src/interface/manual_transfer.cpp:463 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Kan ikkje hugsa passord" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:706 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:683 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1210 msgid "Cannot rename entry" msgstr "Klarer ikkje å gje oppføringa nytt namn" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1599 msgid "Cannot rename file" msgstr "Klarer ikkje å gje fila nytt namn" -#: ../../locales/../src/engine/proxy.cpp:135 +#: ../../locales/../src/engine/proxy.cpp:136 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Klarer ikkje å slå opp vertsnamnet til IPv4-adressa for bruk med SOCKS4-" "mellomtenaren." -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "Cannot save filterset" msgstr "Klarer ikkje å lagra filtersamlinga" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Cannot select filter" msgstr "Klarer ikkje å velja filter" -#: ../../locales/../src/interface/edithandler.cpp:1509 -#: ../../locales/../src/interface/edithandler.cpp:1514 -#: ../../locales/../src/interface/edithandler.cpp:1553 +#: ../../locales/../src/interface/edithandler.cpp:1478 +#: ../../locales/../src/interface/edithandler.cpp:1482 +#: ../../locales/../src/interface/edithandler.cpp:1517 msgid "Cannot set file association" msgstr "Klarer ikkje å laga filtilknytingar" -#: ../../locales/../src/interface/edithandler.cpp:1090 +#: ../../locales/../src/interface/edithandler.cpp:1079 msgid "Cannot show dialog" msgstr "Klarer ikkje å syna meldingsvindauget" -#: ../../locales/../src/interface/edithandler.cpp:1687 +#: ../../locales/../src/interface/edithandler.cpp:1650 msgid "Cannot view/edit selected file" msgstr "Klarer ikkje å syna/endra vald val" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1732 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 msgid "Case insensitive" msgstr "Skil mellom store/små bokstavar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1731 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 msgid "Case insensitive (default)" msgstr "Skil mellom store/små bokstavar (standard)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 msgid "Case sensitive" msgstr "Vilkåra skil mellom &store/små bokstavar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "Case sensitive (default)" msgstr "Skil mellom store/små bokstavar (standard)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1482 -msgid "Categories" -msgstr "Kategoriar" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1498 +msgid "Categories to clear" +msgstr "Kategoriar som skal tømmast" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Certificate and session data are not available yet." msgstr "Sertifikat og øktdata er enno ikkje tilgjengelege." -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 -msgid "Certificate details" -msgstr "Sertifikatdetaljar" - #: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:294 msgid "Certificate in chain:" msgstr "Sertifikat i kjeda:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:139 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:404 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "Sertifikatutferdar" +#: ../../locales/../src/engine/tlssocket.cpp:1315 +msgid "Certificate signature verification failed" +msgstr "Sertifikatsignaturverifiseringa feila" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 msgid "Challenge:" msgstr "Utfordring:" @@ -1961,20 +2047,20 @@ msgid "Change file attributes" msgstr "Endra filattributt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 msgid "Change the file permissions." msgstr "Endra filrettane." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Endring av loggfilinnstillingane krev omstart av FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:653 +#: ../../locales/../src/interface/FileZilla.cpp:560 msgid "Character encoding issue" msgstr "Teiknkodehending" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:527 msgid "Charset" msgstr "Teiknkoding" @@ -1982,7 +2068,7 @@ msgid "Check for &updates..." msgstr "&Sjå etter oppdateringar …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2023 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 msgid "Check for FileZilla &updates automatically:" msgstr "Sjå &automatisk etter FileZilla-oppdateringar:" @@ -1994,11 +2080,11 @@ msgid "Check for newer versions of FileZilla" msgstr "Sjå etter nyare utgåver av FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Oppdateringskontrollen feila" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:785 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:788 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2006,7 +2092,7 @@ "Kontroller pålogginga di. Passordet du skreiv byrjar eller sluttar med eit " "mellomrom." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2018,106 +2104,93 @@ msgid "Checking for correct external IP address" msgstr "Ser etter den rette, eksterne IP-adressa" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:169 msgid "Checking for updates..." msgstr "Ser etter oppdateringar …" -#: ../../locales/../src/interface/updater.cpp:710 +#: ../../locales/../src/interface/updater.cpp:756 #, c-format msgid "Checksum match on file %s\n" msgstr "Kontrollsummen samsvarer med fila %s\n" -#: ../../locales/../src/interface/updater.cpp:706 +#: ../../locales/../src/interface/updater.cpp:752 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Kontrollsummen samsvarer ikkje med fila %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1447 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1510 +msgid "Choose a key file" +msgstr "Vel ei nøkkelfil" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1541 msgid "Choose the default local directory" msgstr "Vel standard lokalkatalog" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:131 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:371 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2160 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:129 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2302 msgid "Choose the local directory" msgstr "Vel lokalkatalogen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:797 msgid "Chunk data improperly terminated" msgstr "Datamengda er ikkje rett avslutta" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:205 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:470 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "Krypteringsmetode:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "Cl&ose tab" msgstr "&Lukk fana" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1266 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 msgid "Classic" msgstr "Klassisk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1502 -msgid "Clear &Site Manager entries" -msgstr "Tøm oppføringane i &tilkoplingsstyraren" - # ? -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "Tøm &utformingslageret" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1489 -msgid "Clear &quickconnect history" -msgstr "Tøm &lyntilkoplingshistorikken" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 -msgid "Clear &reconnect information" -msgstr "Tøm oppattilkoplings&historikken" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1508 -msgid "Clear &transfer queue" -msgstr "Tøm overførings&køen" - -#: ../../locales/../src/interface/quickconnectbar.cpp:147 +#: ../../locales/../src/interface/quickconnectbar.cpp:154 msgid "Clear history" msgstr "Tøm historikken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1486 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Tøm private opplysningar" -#: ../../locales/../src/interface/quickconnectbar.cpp:146 +#: ../../locales/../src/interface/quickconnectbar.cpp:153 msgid "Clear quickconnect bar" msgstr "Tøm lyntilkoplingsdataa" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Klikk på Avslutt for å lagra innstillingane dine." # maskinvareadressa? -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2074 msgid "Client to server MAC:" msgstr "Maskinvareadressa klient til tenar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2064 msgid "Client to server cipher:" msgstr "Krypteringsmetode klient til tenar:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:614 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "Close &all other tabs" msgstr "Lukk alle &andre faner" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1176 -#: ../../locales/../src/interface/Mainfrm.cpp:1197 +#: ../../locales/../src/interface/Mainfrm.cpp:1132 +#: ../../locales/../src/interface/Mainfrm.cpp:1153 msgid "Close FileZilla" msgstr "Lukk FileZilla" @@ -2130,66 +2203,66 @@ msgid "Closes current tab" msgstr "Lukkar denne fana" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:293 msgid "Co&mments:" msgstr "&Merknader:" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Kolonneeigenskapar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Column setup" msgstr "Kolonneinnstillingar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 msgid "Command and its arguments should be properly quoted." msgstr "Kommandoen og argumenta må vera i rett form." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Command failed" msgstr "Kommandoen feila" -#: ../../locales/../src/engine/proxy.cpp:504 +#: ../../locales/../src/engine/proxy.cpp:493 msgid "Command not supported" msgstr "Kommandoen er ikkje støtta" -#: ../../locales/../src/engine/engineprivate.cpp:199 +#: ../../locales/../src/engine/engineprivate.cpp:223 msgid "Command not supported by this protocol" msgstr "Protokollen støttar ikkje denne kommandoen" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:276 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:338 msgid "Command:" msgstr "Kommando:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" msgstr "Merknad" -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Namn:" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Sambandet er øydelagd av rutar eller brannmur" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 msgid "Compare &modification time" msgstr "Samanlikna &endringstidspunkt" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:527 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 msgid "Compare file&size" msgstr "Samanlikna &filstorleik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 msgid "Comparison &threshold (in minutes):" msgstr "Samanliknings&grense (i minutt):" @@ -2217,12 +2290,12 @@ msgid "Compressed" msgstr "Komprimert" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 msgid "Concurrent transfers" msgstr "Samtidige overføringar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1300 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3101 msgid "Conditions are c&ase sensitive" msgstr "Vilkåra skil mellom &store/små bokstavar" @@ -2239,37 +2312,42 @@ msgstr "Områdeinnstillingar" # ? -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3342 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3517 msgid "Configuring FileZilla and your network" msgstr "FileZilla- og nettverksinnstillingar" -#: ../../locales/../src/interface/search.cpp:784 +#: ../../locales/../src/interface/search.cpp:1192 msgid "Confirm deletion" msgstr "Stadfest slettinga" -#: ../../locales/../src/engine/local_filesys.cpp:134 -#: ../../locales/../src/interface/edithandler.cpp:1629 -#: ../../locales/../src/interface/LocalListView.cpp:1684 -#: ../../locales/../src/interface/RemoteListView.cpp:1421 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1120 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/edithandler.cpp:1592 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/RemoteListView.cpp:1403 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 +#: ../../locales/../src/interface/search.cpp:1148 msgid "Confirmation needed" msgstr "Treng stadfesting" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Gratulerer, innstillingane ser ut til å verka." -#: ../../locales/../src/interface/quickconnectbar.cpp:145 +#: ../../locales/../src/interface/quickconnectbar.cpp:152 msgid "Connect bypassing proxy settings" msgstr "Kopla til forbi mellomtenaren" +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Sambandet feila: %s" + # Lukkar gjeldande fane? -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1364 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Kopla til i denne fana" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1363 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 msgid "Connect in new tab" msgstr "Kopla til i ny fane" @@ -2277,28 +2355,25 @@ msgid "Connect to specified Site Manager site" msgstr "Kopla til den spesifiserte staden i tilkoplingsstyraren" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:911 -msgid "Connected" -msgstr "Tilkopla" - -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Koplar til" -#: ../../locales/../src/interface/netconfwizard.cpp:223 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:242 #, c-format msgid "Connecting to %s" msgstr "Koplar opp mot %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1030 +#: ../../locales/../src/engine/ControlSocket.cpp:1048 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4196 #, c-format -msgid "Connecting to %s through proxy" -msgstr "Koplar opp mot %s gjennom mellomtenar" +msgid "Connecting to %s through %s proxy" +msgstr "Koplar opp mot %s gjennom %s mellomtenar" -#: ../../locales/../src/engine/ControlSocket.cpp:906 -#: ../../locales/../src/engine/proxy.cpp:198 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:366 +#: ../../locales/../src/engine/ControlSocket.cpp:955 +#: ../../locales/../src/engine/proxy.cpp:235 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:261 #, c-format msgid "Connecting to %s..." msgstr "Koplar opp mot %s …" @@ -2307,175 +2382,201 @@ msgid "Connection" msgstr "Tilkopling" -#: ../../locales/../src/engine/socket.cpp:1163 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Connection aborted" msgstr "Tilkoplinga vart avbroten" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Tilkoplingsforsøket feila" -#: ../../locales/../src/engine/ControlSocket.cpp:911 -#: ../../locales/../src/engine/proxy.cpp:203 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/proxy.cpp:209 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Tilkoplingsforsøket feila med \"%s\". Prøver neste adresse." -#: ../../locales/../src/engine/ControlSocket.cpp:915 +#: ../../locales/../src/engine/ControlSocket.cpp:924 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Tilkoplingsforsøket feila med \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:184 -#: ../../locales/../src/engine/engineprivate.cpp:678 +#: ../../locales/../src/engine/ControlSocket.cpp:182 +#: ../../locales/../src/engine/engineprivate.cpp:692 msgid "Connection attempt interrupted by user" msgstr "Brukaren braut av tilkoplingsforsøket" -#: ../../locales/../src/engine/socket.cpp:1156 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Connection attempt timed out" msgstr "Tidsavbrot under tilkoplingsforsøket" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Tilkoplinga er lukka" -#: ../../locales/../src/engine/ControlSocket.cpp:997 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:232 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 msgid "Connection closed by server" msgstr "Tenaren kopla ned sambandet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:369 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:296 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:270 msgid "Connection established, initializing TLS..." msgstr "Tilkopla, startar TLS …" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:321 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:295 msgid "Connection established, sending HTTP request" msgstr "Sambandet er i orden, sender HTTP-førespurnad" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Sambandet er i orden, ventar på velkomstmelding." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 msgid "Connection established, waiting for welcome message..." msgstr "Sambandet er i orden, ventar på velkomstmelding …" -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Sambandet er nede" -#: ../../locales/../src/engine/proxy.cpp:489 +#: ../../locales/../src/engine/proxy.cpp:478 msgid "Connection not allowed by ruleset" msgstr "Regelsamlinga tillèt ikkje dette sambandet" -#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/proxy.cpp:487 msgid "Connection refused" msgstr "Tilkoplinga avvist" -#: ../../locales/../src/engine/socket.cpp:1150 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Connection refused by server" msgstr "Tenaren avviste tilkoplinga" -#: ../../locales/../src/engine/socket.cpp:1159 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Connection reset by network" msgstr "Nettverket nullstilte sambandet" -#: ../../locales/../src/engine/socket.cpp:1164 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by peer" msgstr "Annan node nullstilte sambandet" -#: ../../locales/../src/engine/ControlSocket.cpp:564 -#, fuzzy -msgid "Connection timed out" -msgstr "Tidsavbrot på sambandet." +#: ../../locales/../src/engine/ControlSocket.cpp:556 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "Sambandet kopla ut etter %d sekund utan aktivitet" +msgstr[1] "Sambandet kopla ut etter %d sekund utan aktivitet" -#: ../../locales/../src/interface/netconfwizard.cpp:1083 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "Tidsavbrot på sambandet." -#: ../../locales/../src/interface/search.cpp:370 +#: ../../locales/../src/interface/search.cpp:666 msgid "Connection to server lost." msgstr "Mista sambandet til tenaren." -#: ../../locales/../src/engine/proxy.cpp:213 +#: ../../locales/../src/engine/proxy.cpp:218 msgid "Connection with proxy established, performing handshake..." msgstr "Tilkopla mellomtenaren, utfører godkjenningsprosedyre …" -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Sambandet mot tenaren blei lukka for tidleg." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Klarte ikkje å kopla til testtenaren." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +msgid "Convert key file" msgstr "Konverter nøkkelfila" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:644 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1745 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:629 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1880 #, c-format msgid "Copy (%d) of %s" msgstr "Kopier (%d) av %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:621 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1725 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:609 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1860 #, c-format msgid "Copy of %s" msgstr "Kopi av %s" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Kopier adressene til dei valde elementa til utklippstavla (inkludert " +"passorda)." + #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopier adressene til dei valde elementa til utklippstavla." -#: ../../locales/../src/engine/transfersocket.cpp:206 +#: ../../locales/../src/engine/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Klarte ikkje å godta tilkoplinga: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:544 +#: ../../locales/../src/engine/tlssocket.cpp:1295 +msgid "Could not add certificate to temporary trust list" +msgstr "Klarte ikkje å leggja til sertifikatet i mellombels tiltruddliste" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:533 msgid "Could not add connection to Site Manager" msgstr "Klarte ikkje å leggja tilkoplinga til i tilkoplingsstyraren" -#: ../../locales/../src/interface/state.cpp:823 +#: ../../locales/../src/interface/state.cpp:772 msgid "Could not complete operation" msgstr "Klarte ikkje å fullføra handlinga" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:184 msgid "Could not connect to server" msgstr "Klarte ikkje å kopla opp mot tenaren" -#: ../../locales/../src/engine/ControlSocket.cpp:1067 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Could not connect to server: %s" msgstr "Klarte ikkje å kopl opp mot tenaren: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:765 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:693 msgid "Could not convert command to server encoding" msgstr "Klarte ikkje å tilpassa kommandoen til tenarkodinga" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 msgid "Could not convert private key" msgstr "Klarte ikkje å konvertera privatnøkkelen" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1464 +#: ../../locales/../src/interface/RemoteListView.cpp:2528 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not copy URLs" msgstr "Klarte ikkje å kopiera adressene (URL)" -#: ../../locales/../src/interface/aboutdialog.cpp:175 +#: ../../locales/../src/engine/tlssocket.cpp:1277 +msgid "Could not copy certificate" +msgstr "Klarte ikkje å kopiera sertifikatet" + +#: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "Klarte ikkje å kopiera dataa" -#: ../../locales/../src/interface/updater.cpp:453 +#: ../../locales/../src/interface/updater.cpp:491 #, c-format msgid "Could not create local file %s\n" msgstr "Klarer ikkje å laga den lokale fila %s\n" +#: ../../locales/../src/engine/logging.cpp:177 +#, c-format +msgid "Could not create logging mutex: %s" +msgstr "Klarer ikkje å laga loggings-mutex: %s" + # set om Explorer -#: ../../locales/../src/interface/RemoteListView.cpp:2273 -#: ../../locales/../src/interface/RemoteTreeView.cpp:912 +#: ../../locales/../src/interface/RemoteListView.cpp:2194 +#: ../../locales/../src/interface/RemoteTreeView.cpp:865 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2485,11 +2586,11 @@ "Anten er ikkje skalutvidinga rett installert, eller så sleppte du ikkje " "filene i eit Utforskar-vindauge." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4181 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4052 msgid "Could not establish connection to server" msgstr "Fekk ikkje kontakt med tenaren" -#: ../../locales/../src/interface/FileZilla.cpp:485 +#: ../../locales/../src/interface/FileZilla.cpp:404 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2501,11 +2602,11 @@ "kommandolinjevalet '--datadir ' eller ved å lagra miljøvariabelen " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 msgid "Could not generate custom login sequence." msgstr "Klarte ikkje å laga tilpassa påloggingssekvens." -#: ../../locales/../src/engine/tlssocket.cpp:944 +#: ../../locales/../src/engine/tlssocket.cpp:1062 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2513,7 +2614,7 @@ "Klarte ikkje å få det eintydige namnet til sertifikatutferdaren, " "gnutls_x509_get_issuer_dn feila" -#: ../../locales/../src/engine/tlssocket.cpp:921 +#: ../../locales/../src/engine/tlssocket.cpp:1038 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2521,33 +2622,27 @@ "Klarte ikkje å få det eintydige namnet til sertifikatentiteten, " "gnutls_x509_get_issuer_dn feila" -#: ../../locales/../src/interface/state.cpp:976 +#: ../../locales/../src/interface/state.cpp:948 msgid "Could not get full remote path." msgstr "Klarte ikkje å henta full fjernfilbane." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Could not get reply from fzputtygen." msgstr "Klarte ikkje å få svar frå fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1580 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Could not get temporary directory to download file into." msgstr "Klarte ikkje å finna ein mellombels katalog å lasta filer ned til." -#: ../../locales/../src/engine/tlssocket.cpp:867 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "Klarte ikkje å importera sertifikata, gnutls_x509_crt_import feila" - -#: ../../locales/../src/engine/tlssocket.cpp:862 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Klarte ikkje å klargjera sertifikatstrukturen, gnutls_x509_crt_init feila" +#: ../../locales/../src/interface/FileZilla.cpp:84 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Klarte ikkje å starta winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:95 -#: ../../locales/../src/interface/import.cpp:281 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:304 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2558,15 +2653,15 @@ "til ho.\n" "Ingen endringar i tilkoplingsstyraren vil bli lagra." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223 -msgid "Could not load keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +msgid "Could not load key file" msgstr "Klarte ikkje å lasta nøkkelfila" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Klarte ikkje å lasta den private nøkkelen" -#: ../../locales/../src/interface/state.cpp:1002 +#: ../../locales/../src/interface/state.cpp:970 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2576,7 +2671,7 @@ "Klarte ikkje å henta fjernkatalogen '%s' sin tilsvarande lokalkatalog.\n" "Vil du slå av synkronisert blaing og halda fram med å endra fjernkatalogen?" -#: ../../locales/../src/interface/state.cpp:391 +#: ../../locales/../src/interface/state.cpp:355 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2586,7 +2681,7 @@ "Klarte ikkje å henta fjernkatalogen '%s' sin tilsvarande lokalkatalog.\n" "Synkronisert blaing er slått av." -#: ../../locales/../src/interface/state.cpp:292 +#: ../../locales/../src/interface/state.cpp:260 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2596,64 +2691,78 @@ "Klarte ikkje å henta lokalkatalogen '%s' sin tilsvarande fjernkatalog.\n" "Synkronisert blaing er slått av." -#: ../../locales/../src/interface/aboutdialog.cpp:175 -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1464 +#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/interface/RemoteListView.cpp:2528 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not open clipboard" msgstr "Klarte ikkje å opna utklippstavla" -#: ../../locales/../src/engine/logging.cpp:104 -#: ../../locales/../src/engine/logging.cpp:171 -#: ../../locales/../src/engine/logging.cpp:203 +#: ../../locales/../src/engine/logging.cpp:106 +#: ../../locales/../src/engine/logging.cpp:190 +#: ../../locales/../src/engine/logging.cpp:222 +#: ../../locales/../src/engine/logging.cpp:286 #, c-format msgid "Could not open log file: %s" msgstr "Klarte ikkje å opna loggfila: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 msgid "Could not parse remote path." msgstr "Klarte ikkje å tolka fjernfilbana." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:81 msgid "Could not parse server address:" msgstr "Klarte ikkje å tolka tenaradressa:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223 +#: ../../locales/../src/interface/netconfwizard.cpp:994 +msgid "Could not read from data socket." +msgstr "Klarte ikkje å lesa frå endepunktet." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:209 #, c-format msgid "Could not read from socket: %s" msgstr "Klarte ikkje å lesa endepunktet: %s" -#: ../../locales/../src/interface/sitemanager.cpp:488 +#: ../../locales/../src/interface/sitemanager.cpp:548 msgid "Could not read server item." msgstr "Klarte ikkje å lesa tenarelementet." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659 +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Klarte ikkje å henta data frå tenaren." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2602 #, c-format msgid "Could not seek to offset %s within file" msgstr "Klarte ikkje å finna posisjonen %s i fila" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2571 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2509 msgid "Could not seek to the end of the file" msgstr "Klarte ikkje å gå til slutten av fila" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Klarte ikkje å senda kommandoen til fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2687 +# ? +#: ../../locales/../src/engine/tlssocket.cpp:1246 +msgid "Could not sort peer certificates" +msgstr "Klarte ikkje å sortera tenarsertifikata" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2630 msgid "Could not spawn IO thread" msgstr "Klarte ikkje å starta I/U-tråden" -#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/ControlSocket.cpp:1062 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Klarte ikkje å starta mellomtenargodkjenninga: %s" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Klarte ikkje å starta overføringa" -#: ../../locales/../src/interface/sitemanager.cpp:656 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../locales/../src/interface/sitemanager.cpp:620 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:824 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2662,18 +2771,18 @@ "Klarte ikkje å skriva \"%s\". Endringar i tilkoplingsstyraren blei ikkje " "lagra: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:816 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Klarte ikkje å skriva \"%s\" - bokmerket kunne ikkje leggjast til: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:323 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:315 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Klarte ikkje å skriva \"%s\". Dei globale bokmerka blei ikkje lagra: %s" -#: ../../locales/../src/interface/QueueView.cpp:1896 +#: ../../locales/../src/interface/QueueView.cpp:1469 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2682,64 +2791,68 @@ "Klarte ikkje å skriva \"%s\" - køen kunne ikkje lagrast.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager.cpp:828 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2141 +#: ../../locales/../src/interface/sitemanager.cpp:728 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2280 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Klarte ikkje å skriva \"%s\". Dei valde nettstadene blei ikkje eksporterte: " "%s" -#: ../../locales/../src/interface/xmlfunctions.cpp:124 +#: ../../locales/../src/interface/xmlfunctions.cpp:145 #, c-format msgid "Could not write \"%s\":" msgstr "Klarte ikkje å skriva \"%s\":" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format -msgid "Could not write keyfile: %s" +msgid "Could not write key file: %s" msgstr "Klarte ikkje å skriva nøkkelfila: %s" -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Klarte ikkje å skriva til lokal fil" -#: ../../locales/../src/engine/logging.cpp:211 -#: ../../locales/../src/engine/logging.cpp:276 +#: ../../locales/../src/engine/logging.cpp:234 +#: ../../locales/../src/engine/logging.cpp:302 #, c-format msgid "Could not write to log file: %s" msgstr "Klarte ikkje å skriva til loggfila: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:875 -#: ../../locales/../src/engine/ControlSocket.cpp:966 +#: ../../locales/../src/engine/ControlSocket.cpp:879 +#: ../../locales/../src/engine/ControlSocket.cpp:983 #, c-format msgid "Could not write to socket: %s" msgstr "Klarte ikkje å skriva til endepunktet: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Land:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:438 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "Crashes FileZilla instantly. Only used to debug the exception handler" - #: ../../locales/../src/interface/resources/xrc/menus.xrc:312 msgid "Crea&te new file" msgstr "Lag &ny fil" +#: ../../locales/../src/interface/state.cpp:984 +msgid "Create &missing local directory and enter it" +msgstr "Lag den manglande &lokalkatalogen og gå til han" + +#: ../../locales/../src/interface/state.cpp:912 +msgid "Create &missing remote directory and enter it" +msgstr "Lag den manglande &fjernkatalogen og gå til han" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:559 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 msgid "Create a new subdirectory in the current directory" msgstr "Lag ein ny underkatalog i den gjeldande katalogen" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Lag ein ny underkatalog i den gjeldande katalogen og gå til han" @@ -2749,50 +2862,50 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:268 #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "Create director&y and enter it" msgstr "&Lag katalog og gå til han" -#: ../../locales/../src/interface/LocalListView.cpp:901 -#: ../../locales/../src/interface/LocalTreeView.cpp:1174 -#: ../../locales/../src/interface/RemoteListView.cpp:1324 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1304 +#: ../../locales/../src/interface/LocalListView.cpp:924 +#: ../../locales/../src/interface/LocalTreeView.cpp:1153 +#: ../../locales/../src/interface/RemoteListView.cpp:1301 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Create directory" msgstr "Laga katalog" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2614 msgid "Create empty file" msgstr "Lag ei tom fil" -#: ../../locales/../src/interface/queue.cpp:392 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Lagar katalog" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3240 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1943 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3118 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1862 #, c-format msgid "Creating directory '%s'..." msgstr "Lagar katalogen '%s …" -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:177 msgid "Critical error" msgstr "Kritisk feil" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:168 msgid "Critical error:" msgstr "Kritisk feil:" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "Critical file transfer error" msgstr "Kritisk filoverføringsfeil" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:117 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kritisk filoverføringsfeil etter å ha overført %s i %s" -#: ../../locales/../src/interface/state.cpp:382 +#: ../../locales/../src/interface/state.cpp:346 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2801,65 +2914,77 @@ "Gjeldande fjernkatalog (%s) er ikkje under synkronseringsrota (%s).\n" "Synkronisert blaing er slått av." -#: ../../locales/../src/interface/statusbar.cpp:388 +#: ../../locales/../src/interface/statusbar.cpp:393 msgid "Current transfer type is set to ASCII." msgstr "Gjeldande overføringstype er ASCII." -#: ../../locales/../src/interface/statusbar.cpp:398 +#: ../../locales/../src/interface/statusbar.cpp:401 msgid "Current transfer type is set to automatic detection." msgstr "Gjeldande overføringstype blir automatisk oppdaga." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:397 msgid "Current transfer type is set to binary." msgstr "Gjeldande overføringstype er binær." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 +msgid "Curve:" +msgstr "Kurve:" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1537 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "Cus&tom" msgstr "&Tilpassa" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:92 msgid "Custom filter set" msgstr "Tilpassa filtersamling" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2400 msgid "Custom server" msgstr "Eigen tenar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2483 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "Cyanblå" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2520 msgid "D&ata type" msgstr "D&atatype" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "&Desimalprefiks nyttar SI-symbol (dvs. 1kB = 1000 bytar)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:392 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:471 msgid "D&efault" -msgstr "Stan&dard" +msgstr "St&andard" #: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "D&elete" msgstr "&Slett" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1084 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2716 +msgid "D&irectory comparison" +msgstr "K&atalogsamanlikning" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Slå &av alle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1332 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 msgid "D&o not save passwords" msgstr "Lagra &ikkje passorda" # var: Dobbeltklikkhandling for &katalogar: -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "D&ouble-click action on directories:" msgstr "For &katalogar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1235 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2854 msgid "D&uplicate" msgstr "&Kopier" @@ -2867,16 +2992,16 @@ msgid "DOS-like with virtual paths" msgstr "DOS-liknande med virtuelle baner" -#: ../../locales/../src/interface/edithandler.cpp:1669 +#: ../../locales/../src/interface/edithandler.cpp:1632 msgid "Dangerous filetype" msgstr "Farleg filtype" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Data" msgstr "Data" -#: ../../locales/../src/interface/netconfwizard.cpp:1000 -#: ../../locales/../src/interface/netconfwizard.cpp:1064 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." msgstr "Dataendepunktet blei lukka for tidleg." @@ -2884,7 +3009,7 @@ msgid "Date" msgstr "Dato" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 msgid "Date formatting" msgstr "Datoformatering" @@ -2900,11 +3025,11 @@ msgid "Debug" msgstr "Feilretting" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 msgid "Debugging settings" msgstr "Feilsøkingsinnstillingar" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:351 msgid "Default &local directory:" msgstr "Standard lokalkatalo&g" @@ -2916,17 +3041,17 @@ msgid "Default editor not properly quoted." msgstr "Førehandsvalt skriveprogram er utan rette argument." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1362 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "Standardhandling når fila finst" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 msgid "Default r&emote directory:" -msgstr "Standard fjern&katalog:" +msgstr "Standard f&jernkatalog:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2934,7 +3059,7 @@ "Klarer ikkje å tolka standard fjernbane. Sjå til at ho er ei gyldig absolutt " "bane for den valde tenartypen." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Standard systempråk" @@ -2942,7 +3067,7 @@ msgid "Default transfer mode:" msgstr "Standard overføringsmodus:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 msgid "Default transfer type:" msgstr "Standard overføringstype:" @@ -2958,7 +3083,7 @@ "Forseinkinga mellom mislykka tilkoplingsforsøk må vera mellom 1 og 999 " "sekund." -#: ../../locales/../src/engine/engineprivate.cpp:519 +#: ../../locales/../src/engine/engineprivate.cpp:533 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2971,12 +3096,12 @@ msgstr[1] "" "Lèt sambandet venta i %d sekund sidan det førre tilkoplingsforsøket feila …" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1200 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1243 msgid "Delete Site Manager entry" msgstr "Slett oppføringa i tilkoplingsstyraren" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Delete selected directory" msgstr "Sletta vald katalog" @@ -2985,65 +3110,61 @@ msgid "Delete selected files and directories" msgstr "Sletta valde filer og katalogar" -#: ../../locales/../src/engine/engineprivate.cpp:361 +#: ../../locales/../src/engine/engineprivate.cpp:376 #, c-format msgid "Deleting \"%s\"" msgstr "Slettar \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:364 +#: ../../locales/../src/engine/engineprivate.cpp:379 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Slettar %u filer frå \"%s\"" -#: ../../locales/../src/interface/search.cpp:768 -msgid "Deleting directories" -msgstr "Slettar katalogar" - -#: ../../locales/../src/interface/search.cpp:768 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Sletting av fleire ikkje-relaterte katalogar er enno ikkje støtta" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3344 msgid "Deleting symbolic link" msgstr "Slettar symbolsk lenkje" -#: ../../locales/../src/interface/LocalTreeView.cpp:1009 +#: ../../locales/../src/interface/LocalTreeView.cpp:971 msgid "Desktop" msgstr "Arbeidsflate" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:307 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Details" msgstr "Detaljar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:946 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 msgid "Details for new key:" msgstr "Detaljar for ny nøkkel:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1319 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:753 +msgid "Detected newer version of FileZilla" +msgstr "Fann nyare utgåve av FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1335 msgid "Dire&ctories" msgstr "&Katalogar" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Direction" msgstr "Retning" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "Directory" msgstr "Katalog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2795 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:395 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:459 -#: ../../locales/../src/interface/Mainfrm.cpp:2242 +#: ../../locales/../src/interface/filelistctrl.cpp:468 +#: ../../locales/../src/interface/Mainfrm.cpp:2204 msgid "Directory comparison" msgstr "Katalogsamanlikning" -#: ../../locales/../src/interface/listingcomparison.cpp:74 -#: ../../locales/../src/interface/listingcomparison.cpp:82 -#: ../../locales/../src/interface/listingcomparison.cpp:88 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "Directory comparison failed" msgstr "Katalogsamanlikninga feila" @@ -3052,37 +3173,41 @@ msgstr "" "Katalogen som skal innehalda loggfila finst ikkje eller filnamnet er ugyldig." -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +msgid "Directory listing &filters..." +msgstr "Katalogliste&filter …" + +#: ../../locales/../src/engine/ControlSocket.cpp:188 msgid "Directory listing aborted by user" msgstr "Kataloglistinga avbroten av brukaren" -#: ../../locales/../src/interface/RemoteListView.cpp:2075 +#: ../../locales/../src/interface/RemoteListView.cpp:2030 msgid "Directory listing failed" msgstr "Klarte ikkje å lista opp katalogar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 msgid "Directory listing filters" msgstr "Kataloglistefilter" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:196 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Vellykka kataloglistinga av \"%s\"" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Directory listing successful" msgstr "Vellykka kataloglisting" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Disa&ble all" msgstr "S&lå av alle" -#: ../../locales/../src/interface/state.cpp:1010 +#: ../../locales/../src/interface/state.cpp:977 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "Slå av synkronisert blaing og halda fram med å endra fjernkatalogen?" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:651 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3094,24 +3219,24 @@ msgid "Disconnect from server" msgstr "Kopla frå tenaren" -#: ../../locales/../src/engine/ControlSocket.cpp:79 -#: ../../locales/../src/engine/ControlSocket.cpp:876 -#: ../../locales/../src/engine/ControlSocket.cpp:968 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:897 -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../locales/../src/engine/ControlSocket.cpp:78 +#: ../../locales/../src/engine/ControlSocket.cpp:880 +#: ../../locales/../src/engine/ControlSocket.cpp:985 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:864 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:867 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Fråkopla tenaren" -#: ../../locales/../src/engine/ControlSocket.cpp:999 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/ControlSocket.cpp:1017 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 #, c-format msgid "Disconnected from server: %s" msgstr "Fråkopla tenaren: %s" -#: ../../locales/../src/interface/queue.cpp:382 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/statuslinectrl.cpp:236 msgid "Disconnecting from previous server" msgstr "Koplar frå den førre tenaren" @@ -3123,53 +3248,49 @@ msgid "Display about dialog" msgstr "Syn opplysningsvindauget" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1886 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 msgid "Do ¬ use default editor" msgstr "Bruk &ikkje det førehandsvalde skriveprogrammet" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Gjer &ingenting" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1801 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1856 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1883 msgid "Do the same with &all selected files already being edited" msgstr "Gjer det same med &alle dei merka filene som vert endra no" -#: ../../locales/../src/interface/Mainfrm.cpp:1179 -#: ../../locales/../src/interface/Mainfrm.cpp:1201 +#: ../../locales/../src/interface/Mainfrm.cpp:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1157 msgid "Do you really want to close FileZilla?" msgstr "Vil du verkeleg lukka FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Vil du verkeleg sletta alle oppføringane til tilkoplingsstyraren og heile " "overføringskøen?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Vil du verkeleg sletta alle oppføringane til tilkoplingsstyraren?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1202 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1245 msgid "Do you really want to delete selected entry?" msgstr "Vil du verkeleg sletta den valde oppføringa?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Vil du verkeleg sletta overføringskøen?" -#: ../../locales/../src/interface/Mainfrm.cpp:612 +#: ../../locales/../src/interface/Mainfrm.cpp:588 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Vil du verkeleg senda '%s' til tenaren?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1876 msgid "Do you want to reopen this file?" msgstr "Vil du opna opp att denne fila?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3499 msgid "Documentation" msgstr "Dokumentasjon" @@ -3177,40 +3298,40 @@ msgid "Don't use external IP address on &local connections." msgstr "Bruk ikkje ekstern IP-adresse på &lokale tilkoplingar." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Punktumsfiler er filnamn som begynner med eit punktum, slik som .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1789 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 msgid "Double-click action" msgstr "Dobbeltklikkhandling" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2229 msgid "Download" msgstr "Last ned" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3526 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:886 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3706 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "N&edlastingsgrense:" -#: ../../locales/../src/interface/statusbar.cpp:579 +#: ../../locales/../src/interface/statusbar.cpp:581 #, c-format msgid "Download limit: %s/s" msgstr "Nedlastingsgrense: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:583 msgid "Download limit: none" msgstr "Nedlastingsgrense: inga" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 -#: ../../locales/../src/interface/search.cpp:510 -#: ../../locales/../src/interface/search.cpp:516 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3148 +#: ../../locales/../src/interface/search.cpp:859 +#: ../../locales/../src/interface/search.cpp:864 msgid "Download search results" msgstr "Last ned søkjeresultata" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "Download selected directory" msgstr "Last ned vald katalog" @@ -3218,7 +3339,7 @@ msgid "Download selected files and directories" msgstr "Last ned valde filer og katalogar" -#: ../../locales/../src/interface/Mainfrm.cpp:1007 +#: ../../locales/../src/interface/Mainfrm.cpp:968 #, c-format msgid "" "Download speed: %s/s\n" @@ -3227,43 +3348,35 @@ "Nedlastingsfart: %s/s\n" "Opplastingsfart: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1116 +#: ../../locales/../src/interface/edithandler.cpp:1105 msgid "Downloading" msgstr "Lastar ned" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:339 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:313 #, c-format msgid "Downloading %s" msgstr "Lastar ned %s" -#: ../../locales/../src/interface/search.cpp:619 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Ein kan ikkje lasta ned fleire ikkje-relaterte katalogar." - -#: ../../locales/../src/interface/search.cpp:619 -msgid "Downloading search results" -msgstr "Lastar ned søkjeresultata" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Lastar ned oppdateringa …" -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:107 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:87 +#: ../../locales/../src/interface/LocalListView.cpp:107 +#: ../../locales/../src/interface/LocalTreeView.cpp:111 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:105 +#: ../../locales/../src/interface/RemoteTreeView.cpp:91 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" "Ein kan ikkje nytta dra-og-slepp mellom forskjellige &instansar av FileZilla." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:93 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:117 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:111 +#: ../../locales/../src/interface/RemoteTreeView.cpp:97 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Ein kan ikkje nytta dra-og-slepp mellom forskjellige &tenarar." @@ -3271,7 +3384,7 @@ msgid "Dupl&icate" msgstr "&Kopier" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1077 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 msgid "E&nable all" msgstr "Slå p&å alle" @@ -3289,15 +3402,21 @@ msgid "E&xit" msgstr "Avsl&utt" -#: ../../locales/../src/interface/verifycertdialog.cpp:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:463 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:486 +msgid "E&xport..." +msgstr "&Eksporter …" + +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E-post:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:693 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:676 msgid "Each filter needs at least one condition." msgstr "Kvart filter treng minst eitt vilkår." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1374 msgid "Edit filters" msgstr "Endra filtera" @@ -3308,25 +3427,25 @@ "Arbeid med fila i det førehandsvalde skriveprogrammet og last opp endringane " "til tenaren." -#: ../../locales/../src/interface/search.cpp:710 +#: ../../locales/../src/interface/search.cpp:1124 msgid "Editing directories is not supported" msgstr "Katalogendringar er ikkje støtta" -#: ../../locales/../src/interface/LocalListView.cpp:1602 -#: ../../locales/../src/interface/LocalListView.cpp:1611 +#: ../../locales/../src/interface/LocalListView.cpp:1618 +#: ../../locales/../src/interface/LocalListView.cpp:1627 msgid "Editing failed" msgstr "Endringa feila." -#: ../../locales/../src/interface/search.cpp:710 +#: ../../locales/../src/interface/search.cpp:1124 msgid "Editing search results" msgstr "Endrar søkjeresultata" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Email:" msgstr "E-post:" # ? -#: ../../locales/../src/interface/QueueView.cpp:2181 +#: ../../locales/../src/interface/QueueView.cpp:1747 msgid "Empty command" msgstr "Tom kommando" @@ -3334,11 +3453,11 @@ msgid "Empty command." msgstr "Tom kommando." -#: ../../locales/../src/interface/RemoteListView.cpp:2077 +#: ../../locales/../src/interface/RemoteListView.cpp:2032 msgid "Empty directory listing" msgstr "Tom katalogliste" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "Tom katalog." @@ -3360,12 +3479,12 @@ msgid "Empty quoted string." msgstr "Tom sitatstreng." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1112 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 msgid "En&able all" msgstr "Slå &på alle" # Må vel ha bindestrek for å visa at filtreringa gjeld "ugyldige teikn" og ikkje berre "teikn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:967 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 msgid "Enable invalid character &filtering" msgstr "Bruk &filtrering av ugyldige teikn" @@ -3373,15 +3492,15 @@ msgid "Encrypted" msgstr "Kryptert" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 msgid "Encryption" msgstr "Kryptering" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1966 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1993 msgid "Encryption details" msgstr "Krypteringsdetaljar" -#: ../../locales/../src/interface/filelistctrl.cpp:461 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "End comparison and change sorting order?" msgstr "Avslutta samanlikningog endra sorteringsrekkjefølgja?" @@ -3389,19 +3508,19 @@ msgid "Enter &custom command..." msgstr "Skriv inn &tilpassa kommando …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3747 msgid "Enter 0 for unlimited speed." msgstr "Verdien 0 gjev uavgrensa fart." -#: ../../locales/../src/interface/QueueView.cpp:2170 +#: ../../locales/../src/interface/QueueView.cpp:1741 msgid "Enter command" msgstr "Skriv inn kommando" -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Skriv inn tilpassa kommando" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 msgid "Enter directory" msgstr "Opna katalog" @@ -3411,11 +3530,11 @@ msgid "Enter filter name" msgstr "Skriv filternamn" -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Enter name for filterset" msgstr "Skriv inn namnet til filtersamlinga" -#: ../../locales/../src/interface/filter.cpp:393 +#: ../../locales/../src/interface/filter.cpp:274 msgid "Enter new name for filterset" msgstr "Skriv inn det nye namnet til filtersamlinga" @@ -3457,14 +3576,14 @@ "- ftps:// for FTP over TLS (implisitt)\n" "- ftpes:// for FTP over TLS (eksplisitt)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" "Skriv inn passordet til fila '%s'.\n" -"Ver merksam på at den konverterte fila ikkje vil vera passordbeskytta." +"Den konverterte fila vil vera beskytta med det same passordet." #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" @@ -3474,80 +3593,83 @@ "Før opp porten tenaren lyttar til.\n" "FTP-standarden er port 21, SFTP nyttar port 22." -#: ../../locales/../src/interface/loginmanager.cpp:61 +#: ../../locales/../src/interface/loginmanager.cpp:72 +msgid "Enter username" +msgstr "Skriv brukarnamn" + +#: ../../locales/../src/interface/loginmanager.cpp:79 msgid "Enter username and password" msgstr "Skriv inn brukarnamn og passord" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Feil under eksporten av innstillingane" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:85 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Feil under importeringa" -#: ../../locales/../src/interface/QueueView.cpp:1963 +#: ../../locales/../src/interface/QueueView.cpp:1543 msgid "Error loading queue" msgstr "Klarte ikkje å lasta køen" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:171 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:294 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:722 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:761 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:808 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:972 -#: ../../locales/../src/interface/import.cpp:96 -#: ../../locales/../src/interface/import.cpp:282 -#: ../../locales/../src/interface/Options.cpp:236 -#: ../../locales/../src/interface/QueueView.cpp:1879 -#: ../../locales/../src/interface/search.cpp:843 -#: ../../locales/../src/interface/search.cpp:862 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:451 -#: ../../locales/../src/interface/sitemanager.cpp:547 -#: ../../locales/../src/interface/sitemanager.cpp:606 -#: ../../locales/../src/interface/sitemanager.cpp:715 -#: ../../locales/../src/interface/sitemanager.cpp:797 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:793 -#: ../../locales/../src/interface/wrapengine.cpp:949 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:169 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:284 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:699 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:736 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:782 +#: ../../locales/../src/interface/filter.cpp:864 +#: ../../locales/../src/interface/filter.cpp:956 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:305 +#: ../../locales/../src/interface/Options.cpp:244 +#: ../../locales/../src/interface/QueueView.cpp:1452 +#: ../../locales/../src/interface/search.cpp:1252 +#: ../../locales/../src/interface/search.cpp:1271 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:577 +#: ../../locales/../src/interface/sitemanager.cpp:674 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:746 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:804 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "Feil under lastinga av xml-fil" -#: ../../locales/../src/interface/QueueView.cpp:1868 +#: ../../locales/../src/interface/QueueView.cpp:1441 msgid "Error saving queue" msgstr "Klarte ikkje å lagra køen" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "Error starting program" msgstr "Programstartfeil" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:324 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:842 -#: ../../locales/../src/interface/QueueView.cpp:1897 -#: ../../locales/../src/interface/sitemanager.cpp:657 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager.cpp:829 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:814 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2142 -#: ../../locales/../src/interface/xmlfunctions.cpp:125 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:316 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:817 +#: ../../locales/../src/interface/QueueView.cpp:1470 +#: ../../locales/../src/interface/sitemanager.cpp:621 +#: ../../locales/../src/interface/sitemanager.cpp:729 +#: ../../locales/../src/interface/sitemanager.cpp:783 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:825 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2281 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 msgid "Error writing xml file" msgstr "Feil under skrivinga av xml-fil" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:274 -#: ../../locales/../src/interface/StatusView.cpp:328 +#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:334 msgid "Error:" msgstr "Feil:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1994 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Døme: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1644 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 msgid "Examples" msgstr "Døme" @@ -3555,29 +3677,33 @@ msgid "Exe&cute" msgstr "&Utfør" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Programfila inneheld ikkje utgåveopplysningar. Klarer derfor ikkje å sjå " "etter oppdateringar." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1267 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "Explorer" msgstr "Utforskar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1588 +msgid "Export &Filters" +msgstr "Eksport&filter" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1583 msgid "Export &Queue" msgstr "Eksporter &køen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Export &Settings" msgstr "Eksporter &innstillingane" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1559 msgid "Export settings" msgstr "Eksporter innstillingane" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" msgstr "&Filternamn:" @@ -3585,7 +3711,7 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:500 msgid "FTP - File Transfer Protocol" msgstr "FTP - filoverføringsprotokoll" @@ -3598,7 +3724,6 @@ msgstr "FTP - utrygg filoverføringsprotokoll" #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 msgid "FTP Engine not initialized, can't connect" msgstr "Klarer ikkje å kopla til: FTP-motoren er ikkje starta" @@ -3631,121 +3756,124 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP over implisitt TLS" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:605 -#: ../../locales/../src/interface/LocalListView.cpp:890 -#: ../../locales/../src/interface/LocalListView.cpp:1800 -#: ../../locales/../src/interface/LocalTreeView.cpp:877 -#: ../../locales/../src/interface/LocalTreeView.cpp:1150 -#: ../../locales/../src/interface/viewheader.cpp:498 +#: ../../locales/../src/interface/LocalListView.cpp:537 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:913 +#: ../../locales/../src/interface/LocalListView.cpp:1824 +#: ../../locales/../src/interface/LocalTreeView.cpp:851 +#: ../../locales/../src/interface/LocalTreeView.cpp:1129 +#: ../../locales/../src/interface/viewheader.cpp:495 msgid "Failed to change directory" msgstr "Klarte ikkje å endra katalogen" -#: ../../locales/../src/interface/FileZilla.cpp:199 -#: ../../locales/../src/interface/FileZilla.cpp:212 -#: ../../locales/../src/interface/FileZilla.cpp:214 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:134 +#: ../../locales/../src/interface/FileZilla.cpp:149 +#: ../../locales/../src/interface/FileZilla.cpp:151 msgid "Failed to change language" msgstr "Klarte ikkje å endra språket" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2066 msgid "Failed to copy or move sites" msgstr "Klarte ikkje å kopiera eller flytta nettstadene" -#: ../../locales/../src/interface/xmlfunctions.cpp:463 +#: ../../locales/../src/interface/xmlfunctions.cpp:340 msgid "Failed to create backup copy of xml file" msgstr "Klarte ikkje å laga tryggleikskopi av xml-fila" -#: ../../locales/../src/interface/netconfwizard.cpp:809 +#: ../../locales/../src/interface/netconfwizard.cpp:808 msgid "Failed to create listen socket, aborting" msgstr "Klarte ikkje å laga lyttande endepunkt - avbryt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4160 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4031 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4035 msgid "Failed to create listening socket for active mode transfer" msgstr "Klarte ikkje å laga lyttande endepunkt til aktivmodusoverføringa" -#: ../../locales/../src/interface/LocalTreeView.cpp:632 +#: ../../locales/../src/interface/LocalTreeView.cpp:628 msgid "Failed to get 'My Documents' path" msgstr "Klarte ikkje å finna bana til 'Mine dokument'" -#: ../../locales/../src/interface/LocalTreeView.cpp:618 +#: ../../locales/../src/interface/LocalTreeView.cpp:616 msgid "Failed to get desktop path" msgstr "Klarte ikkje å finna skrivebordsbana" -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Klarte ikkje å henta adressa til kontrollsambandet - sambandet er lukka." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "Klarte ikkje å henta adressa til datasambandet - sambandet er lukka." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "Klarte ikkje å starta FTP-motoren" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:377 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:756 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:303 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:759 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:277 msgid "Failed to initialize TLS." msgstr "Klarte ikkje å setja i gang TLS." +#: ../../locales/../src/interface/FileZilla.cpp:85 +msgid "Failed to initialize networking" +msgstr "Klarte ikkje å starta nettverksamband" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Klarte ikkje å lasta panela. Er ressursfilene ugyldige?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Klarte ikkje å lasta den private nøkkelen: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2561 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2499 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Klarte ikkje å opna \"%s\" for tilføying/skriving" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2565 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Klarte ikkje å opna \"%s\" for lesing" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1023 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2531 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1005 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Klarte ikkje å opna \"%s\" for skriving" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/ControlSocket.cpp:344 msgid "Failed to parse returned path." msgstr "Klarte ikkje å tolka filbana." -#: ../../locales/../src/interface/netconfwizard.cpp:1029 +#: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "Klarte ikkje å ta i mot data" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Failed to retrieve directory listing" msgstr "Klarte ikkje å ta i mot kataloglista" -#: ../../locales/../src/interface/netconfwizard.cpp:731 +#: ../../locales/../src/interface/netconfwizard.cpp:737 msgid "Failed to retrieve external ip address, aborting" msgstr "Klarte ikkje å henta ekstern IP-adresse - avbryt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3871 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3733 msgid "Failed to retrieve external ip address, using local address" msgstr "Klarte ikkje å henta ekstern IP-adresse - bruker lokaladresse" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3892 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3752 msgid "Failed to retrieve local ip address." msgstr "Klarte ikkje å henta lokal IP-adresse." -#: ../../locales/../src/interface/netconfwizard.cpp:704 +#: ../../locales/../src/interface/netconfwizard.cpp:712 msgid "Failed to retrieve local ip address. Aborting" msgstr "Klarte ikkje å henta lokal IP-adresse. Avbryt" -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Klarte ikkje å henta den eksterne IP-adressa." @@ -3753,12 +3881,12 @@ msgid "Failed to send command." msgstr "Klarte ikkje å senda kommandoen." -#: ../../locales/../src/interface/FileZilla.cpp:212 +#: ../../locales/../src/interface/FileZilla.cpp:149 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "Klarte ikkje å lagra språkvalet %s (%s). Nyttar standard systemspråk." -#: ../../locales/../src/interface/FileZilla.cpp:192 +#: ../../locales/../src/interface/FileZilla.cpp:127 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3766,43 +3894,42 @@ "Klarte ikkje å lagra språkvalet %s (%s). Nyttar standard systemspråk (%s, " "%s)." -#: ../../locales/../src/interface/FileZilla.cpp:181 +#: ../../locales/../src/interface/FileZilla.cpp:116 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "Klarte ikkje å lagra språkvalet %s (%s). Nyttar standard systemspråk." -#: ../../locales/../src/interface/FileZilla.cpp:214 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:151 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Klarte ikkje å lagra språkvalet %s. Nyttar standard systemspråk" -#: ../../locales/../src/interface/FileZilla.cpp:188 +#: ../../locales/../src/interface/FileZilla.cpp:123 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Klarte ikkje å lagra språkvalet %s. Nyttar standard systemspråk (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:178 +#: ../../locales/../src/interface/FileZilla.cpp:113 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Klarte ikkje å lagra språkvalet %s. Nyttar standard systemspråk." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:206 msgid "Failed to validate settings" msgstr "Klarte ikkje å stadfesta innstillingane" # ? -#: ../../locales/../src/engine/tlssocket.cpp:1031 +#: ../../locales/../src/engine/tlssocket.cpp:1305 msgid "Failed to verify peer certificate" msgstr "Klarte ikkje å stadfesta tenarsertifikatet" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:536 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:509 #, c-format msgid "Failed to write to file %s" msgstr "Klarte ikkje å skriva til fila %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:480 +#: ../../locales/../src/interface/xmlfunctions.cpp:353 msgid "Failed to write xml file" msgstr "Klarte ikkje å skriva XML-fila" @@ -3814,15 +3941,15 @@ msgid "Fall back to active mode" msgstr "Fall tilbake til aktivmodus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2308 msgid "Fil&e:" msgstr "Fi&l:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "Fil&es" msgstr "&Filer" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:267 msgid "File" msgstr "Fil" @@ -3830,11 +3957,11 @@ msgid "File Types" msgstr "Filtypar" -#: ../../locales/../src/engine/socket.cpp:1155 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "File descriptor not a socket" msgstr "Filskildraren er ikkje eit endepunkt" -#: ../../locales/../src/interface/import.cpp:85 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Fila innheld ikkje data som kan importerast." @@ -3842,7 +3969,7 @@ msgid "File editing" msgstr "Filendring" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1613 msgid "File exists" msgstr "Fila finst" @@ -3850,7 +3977,7 @@ msgid "File exists action" msgstr "Handling når fila finst" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 msgid "File has changed" msgstr "Fila er endra" @@ -3858,63 +3985,65 @@ msgid "File lists" msgstr "Fillister" -#: ../../locales/../src/interface/edithandler.cpp:1593 -#: ../../locales/../src/interface/FileZilla.cpp:675 -#: ../../locales/../src/interface/FileZilla.cpp:760 +#: ../../locales/../src/interface/edithandler.cpp:1556 +#: ../../locales/../src/interface/FileZilla.cpp:582 +#: ../../locales/../src/interface/FileZilla.cpp:667 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Fann ikkje fila" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3144 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/search.cpp:681 +#: ../../locales/../src/interface/search.cpp:686 msgid "File search" msgstr "Filsøk" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:124 msgid "File transfer aborted by user" msgstr "Filoverføringa blei avbroten av brukaren" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Filoverføringa avbroten av brukaren etter å ha overført %s i %s" -#: ../../locales/../src/engine/ControlSocket.cpp:136 +#: ../../locales/../src/engine/ControlSocket.cpp:134 msgid "File transfer failed" msgstr "Filoverføringa feila" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:119 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Filoverføringa feila etter å ha overført %s i %s" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:129 msgid "File transfer skipped" msgstr "Hoppa over filoverføringa" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer successful" msgstr "Vellykka filoverføring" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:112 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Vellykka filoverføring, overførte %s i %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1178 +#: ../../locales/../src/interface/Mainfrm.cpp:1134 msgid "File transfers still in progress." msgstr "Det er framleis filoverføringar i gang." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "File would transfer with ASCII data type." msgstr "Fila nyttar ASCII datatype-overføring." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "File would transfer with binary data type." msgstr "Fila nyttar binær datatype-overføring." -#: ../../locales/../src/interface/FileZilla.cpp:486 +#: ../../locales/../src/interface/FileZilla.cpp:405 #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 msgid "FileZilla Error" msgstr "FileZilla-feil" @@ -3925,15 +4054,15 @@ msgstr "" "FileZilla kan no testa innstillingane dine for å sikra at alt er gjort rett." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 msgid "FileZilla is already connected to a server." msgstr "FileZilla er allereie tilkopla ein tenar." -#: ../../locales/../src/interface/Mainfrm.cpp:1508 +#: ../../locales/../src/interface/Mainfrm.cpp:1434 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "Du tek i bruk språkendringa ved å starta om att FileZilla." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2082 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 msgid "FileZilla updates" msgstr "FileZilla-oppdateringar" @@ -3941,35 +4070,31 @@ msgid "Filelist status &bars" msgstr "Status&linje filliste" -#: ../../locales/../src/interface/edithandler.cpp:1101 +#: ../../locales/../src/interface/edithandler.cpp:1090 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:80 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/LocalListView.cpp:279 +#: ../../locales/../src/interface/RemoteListView.cpp:393 +#: ../../locales/../src/interface/search.cpp:150 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Filename" msgstr "Filnamn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "F&ilnamnfilter …" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3044 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2204 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2922 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2106 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Klarer ikkje å laga filnamn for katalogen %s og filnamnet %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1599 msgid "Filename invalid" msgstr "Ugyldig filnamn" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "Filnamnet er uendra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1698 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "Filnamn:" @@ -3983,14 +4108,14 @@ "|" msgstr "Filnamn kan ikkje innehalda nokon av desse teikna: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Files currently being edited" msgstr "Filer som blir endra no" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:82 +#: ../../locales/../src/interface/LocalListView.cpp:280 +#: ../../locales/../src/interface/RemoteListView.cpp:394 +#: ../../locales/../src/interface/search.cpp:152 msgid "Filesize" msgstr "Filstorleik" @@ -3998,46 +4123,50 @@ msgid "Filesize format" msgstr "Format filstorleik" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/LocalListView.cpp:281 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:153 msgid "Filetype" msgstr "Filtype" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Filtypetilknytingar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1323 msgid "Filter applies to:" msgstr "Filteret nyttast på:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:961 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 msgid "Filter invalid characters in filenames" msgstr "Filtrer ugyldige teikn i filnamn" #: ../../locales/../src/interface/filteredit.cpp:149 #: ../../locales/../src/interface/filteredit.cpp:217 #: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:355 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Filtrer om namnet finst allereie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1277 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 msgid "Filter out items matching all of the following" msgstr "Filtrer ut element som passar alle følgjande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 msgid "Filter out items matching any of the following" msgstr "Filtrer ut element som passar eit av dei følgjande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1279 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 msgid "Filter out items matching none of the following" msgstr "Filtrer ut element som ikkje passar nokon av dei følgjande" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 +msgid "Filter out items matching not all of the following" +msgstr "Filtrer ut element som ikkje passar alle følgjande" + +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Filter set already exists" msgstr "Filtersamlinga finst allereie" @@ -4045,36 +4174,34 @@ msgid "Filter the directory listings" msgstr "Filtrera kataloglistinga" -#: ../../locales/../src/interface/filteredit.cpp:339 -#: ../../locales/../src/interface/filteredit.cpp:347 -#: ../../locales/../src/interface/filteredit.cpp:355 +#: ../../locales/../src/interface/filteredit.cpp:337 +#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter validation failed" msgstr "Filterstadfestinga feila" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3031 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 msgid "Find &files" msgstr "Finn &filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3111 msgid "Find d&irectories" msgstr "Finn &mapper" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:362 msgid "Fingerprint (SHA-1):" msgstr "Fingeravtrykk (SHA-1):" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:354 msgid "Fingerprint (SHA-256):" msgstr "Fingeravtrykk (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:852 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 msgid "Fingerprint:" msgstr "Fingeravtrykk:" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Brannmur- og rutarinnstillingsrettleiar" @@ -4090,7 +4217,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "For å auka støleiken, bør du oppgje eit område på minst 10 portar." -#: ../../locales/../src/interface/Options.cpp:235 +#: ../../locales/../src/interface/Options.cpp:243 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4098,7 +4225,7 @@ "Standardinnstillingane vil nyttast i denne økta. Endringar vil ikkje bli " "lagra." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Force &UTF-8" msgstr "Tvungen &UTF-8" @@ -4106,7 +4233,7 @@ msgid "Force showing &hidden files" msgstr "Tving fram vising av &skjulte filer" -#: ../../locales/../src/interface/Mainfrm.cpp:671 +#: ../../locales/../src/interface/Mainfrm.cpp:646 msgid "Force showing hidden files" msgstr "Tving fram vising av skjulte filer" @@ -4114,17 +4241,17 @@ msgid "Format specifications:" msgstr "Formatspesifikasjonar:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "Format: utviding etterfølgt av kommando og argument i rett form." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:641 +#: ../../locales/../src/interface/updater.cpp:688 #, c-format msgid "Found new %s %s\n" msgstr "Fann ny %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 msgid "Further documentation" msgstr "Meir dokumentasjon" @@ -4132,11 +4259,11 @@ msgid "General" msgstr "Generelt" -#: ../../locales/../src/engine/proxy.cpp:486 +#: ../../locales/../src/engine/proxy.cpp:475 msgid "General SOCKS server failure" msgstr "Generell SOCKS-tenarfeil" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Generisk mellomtenar" @@ -4145,35 +4272,35 @@ msgid "Get external IP address from the following URL:" msgstr "Få ekstern IP-adresse frå denne adressa:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3542 msgid "Getting help" msgstr "Få hjelp" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Det oppgjevne filternamnet finst allereie. Vil du skriva over det?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:255 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:246 msgid "Global bookmarks" msgstr "Globale bokmerke" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:313 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS-feil %d" -#: ../../locales/../src/engine/tlssocket.cpp:188 +#: ../../locales/../src/engine/tlssocket.cpp:315 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS-feil %d i %s" -#: ../../locales/../src/engine/tlssocket.cpp:182 +#: ../../locales/../src/engine/tlssocket.cpp:309 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS-feil %d i %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS-feil %d: %s" @@ -4182,11 +4309,15 @@ msgid "GnuTLS:" msgstr "GNUTLS:" +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "Grøn" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 msgid "Group permissions" msgstr "Grupperettar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "H&øg" @@ -4194,7 +4325,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP over TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2028 msgid "Hash:" msgstr "Nøkkel:" @@ -4202,22 +4333,22 @@ msgid "Hidden" msgstr "Gøymd" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 -#: ../../locales/../src/interface/queue.cpp:890 -#: ../../locales/../src/interface/queue.cpp:977 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "High" msgstr "Høg" -#: ../../locales/../src/interface/queue.cpp:892 -#: ../../locales/../src/interface/queue.cpp:979 +#: ../../locales/../src/interface/queue.cpp:885 +#: ../../locales/../src/interface/queue.cpp:941 msgid "Highest" msgstr "Høgste" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Høgste tilgjengelege port må vera eit tal mellom 1024 og 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" @@ -4228,40 +4359,43 @@ msgid "Homepage:" msgstr "Heimeside:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 +#: ../../locales/../src/engine/socket.cpp:1057 +msgid "Host is down" +msgstr "Verten er nede" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2038 msgid "Host key fingerprint:" msgstr "Fingeravtrykk vertsnøkkel:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 msgid "Host key mismatch" msgstr "Vertsnøkkelen samsvarte ikkje" # ? -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:158 msgid "Host starts with '[' but no closing bracket found." msgstr "Verten startar med '[', men manglar avsluttande parentes." -#: ../../locales/../src/engine/proxy.cpp:495 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "Host unreachable" msgstr "Klarer ikkje å nå verten" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:175 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:440 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:953 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 msgid "Host:" msgstr "Vert:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:350 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 msgid "Hours," msgstr "timar," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 msgid "I&SO 8601 (example: 15:47)" msgstr "ISO &8601 (døme: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:128 +#: ../../locales/../src/engine/proxy.cpp:115 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "SOCKS4-mellomtenaren kan ikkje nytta IPv6-adresser" @@ -4275,7 +4409,7 @@ "oppgjevne tida, vil sambandet bli lukka og FileZilla vil prøva å kopla til " "att." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "Om du rapporterer feil bør du bruka loggenivået \"Alle meldingar\"." @@ -4299,7 +4433,7 @@ "Om tilbakefallsvalet er slått på, vil du vera i stand til å kopla til " "feilkonfigurerte tenarar som avslår den valde overføringsmåten." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:941 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4307,7 +4441,7 @@ "Dersom vertsnøkkelendringa ikkje var venta, bør du kontakta " "tenaradministratoren." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4315,7 +4449,7 @@ "Om problemet held fram, kan det vera fordi ein rutar og/eller brannmur " "blokkerer FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4323,7 +4457,7 @@ "Om problemet held fram, kan det vera fordi ein rutar og/eller brannmur bryt " "av sambandet." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4333,7 +4467,7 @@ "\".1\" blir lagt til slutten av filnamnet og det blir laga ei ny fil. Då kan " "det vera at eldre loggfiler blir overskrivne." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3356 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4341,7 +4475,7 @@ "Om symlenkja peikar på ein katalog, kan FileZilla anten sletta den symbolske " "lenkja eller fjerna innhaldet til den lenkja katalogen." -#: ../../locales/../src/interface/netconfwizard.cpp:640 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4349,12 +4483,12 @@ "Om problemet held fram, kontakt rutar- eller brannmurleverandøren for å " "finna ei løysing." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "Om problemet held fram, kontakt rutarleverandøren din." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1220 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1457 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4364,7 +4498,7 @@ "tenaren. Om tida er forskjellig (til dømes grunna anna tidssone), skriv ei " "tidssoneforskyving i tilkoplingsstyraren." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1758 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4372,7 +4506,7 @@ "Dersom ein bruker tidsbasert samanlikning, rekn to filer for å vera like om " "tidsskilnaden er innanfor denne grensa." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 msgid "If you change the language, you need to restart FileZilla." msgstr "Endrar du språket, må du starta om att FileZilla." @@ -4384,11 +4518,11 @@ "Om du klikkar på test-knappen vil FileZilla kopla seg til probe.filezilla-" "project.org og utføra nokre enkle testar." -#: ../../locales/../src/interface/Mainfrm.cpp:1200 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "If you close FileZilla, your changes will be lost." msgstr "Om du lukkar FileZilla, vil du mista alle endringane." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1108 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4407,7 +4541,7 @@ "Endra standard overføringsmåte dersom du ikkje klarer å henta kataloglister " "eller overføra filer." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4441,23 +4575,23 @@ "Om du nyttar ein rutar bør du sjå til alle desse portane blir vidaresende " "til maskina der du køyrer FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "" "Om rutaren held fram med å endra IP-adressa, kontakt rutarleverandøren din." -#: ../../locales/../src/interface/import.cpp:77 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importer data frå eldre utgåve" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 msgid "Import settings" msgstr "Importer innstillingar" -#: ../../locales/../src/interface/import.cpp:63 -#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Vellykka import" @@ -4501,19 +4635,11 @@ "spør tenaren etter ein port og koplar seg til den gjevne porten. Metoden " "krev få innstillingar." -#: ../../locales/../src/engine/tlssocket.cpp:1043 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Ufullstendig kjede, rotsertifikatet er ikkje eit sjølvsignert " -"sertifiseringsinstanssertifikat" - -#: ../../locales/../src/interface/queue.cpp:380 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Feil passord" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:199 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4521,17 +4647,21 @@ "Klarte ikkje å henta opplysningar om den siste FileZilla-utgåva. Prøv att " "seinare." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:747 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750 msgid "Initializing TLS..." msgstr "Startar TLS …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:731 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 +msgid "Insecure algorithm!" +msgstr "Utrygg algoritme!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:734 msgid "Insecure server, it does not support FTP over TLS." msgstr "Utrygg tenar - han kan ikkje nytta FTP over TLS." -#: ../../locales/../src/engine/server.cpp:834 -#: ../../locales/../src/engine/server.cpp:853 -#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/engine/server.cpp:884 +#: ../../locales/../src/engine/server.cpp:905 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktiv" @@ -4539,29 +4669,29 @@ msgid "Interface" msgstr "Grensesnitt" -#: ../../locales/../src/engine/socket.cpp:1152 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Interrupted by signal" msgstr "Avbrote av signal" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/engine/ControlSocket.cpp:217 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Avbroten av brukaren" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:742 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:715 msgid "Invalid Content-Length" msgstr "Ugyldig innhaldslengd" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:592 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:565 msgid "Invalid HTTP Response" msgstr "Ugyldig HTTP-svar" -#: ../../locales/../src/engine/socket.cpp:1140 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Invalid argument passed" msgstr "Sende ugyldig argument" -#: ../../locales/../src/engine/ControlSocket.cpp:457 -#: ../../locales/../src/engine/ControlSocket.cpp:513 +#: ../../locales/../src/engine/ControlSocket.cpp:451 +#: ../../locales/../src/engine/ControlSocket.cpp:508 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4569,18 +4699,19 @@ "Motteke ugyldig teiknrekke, slår av UTF-8. Bruk UTF-8-valet i " "tilkoplingsstyraren for å tvinga fram bruk av UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:829 msgid "Invalid chunk size" msgstr "Ugyldig oppdelingsstorleik" -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Motteke ugyldige data" -#: ../../locales/../src/interface/verifycertdialog.cpp:36 -#: ../../locales/../src/interface/verifycertdialog.cpp:49 +#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:55 msgid "Invalid date" msgstr "Ugyldig dato" @@ -4589,22 +4720,22 @@ msgid "Invalid filename" msgstr "Ugyldig filnamn" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:163 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "Ugyldig vert - berre kolon og port kan følgja etter sluttparentes." -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:105 msgid "Invalid input" msgstr "Ugyldige inndata" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:64 +#: ../../locales/../src/engine/server.cpp:181 +#: ../../locales/../src/engine/server.cpp:191 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Ugyldig port - portnummeret må vera mellom 1 og 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/engine/server.cpp:92 +#: ../../locales/../src/interface/quickconnectbar.cpp:120 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4618,73 +4749,69 @@ "ftps:// for FTP over TLS (implisitt) og\n" "ftpes:// for FTP over TLS (eksplisitt)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4304 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Ugyldig mellomtenarvert - berre kolon og port kan følgja etter sluttparentes." -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:710 +msgid "Invalid regular expression" +msgstr "Ugyldig regulært uttrykk" + +#: ../../locales/../src/interface/search.cpp:686 msgid "Invalid regular expression in search conditions." msgstr "Ugyldig regulært uttrykk i søkjevilkåra." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:602 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:575 msgid "Invalid response code" msgstr "Ugyldig svarkode" -#: ../../locales/../src/interface/search.cpp:385 +#: ../../locales/../src/interface/search.cpp:681 #, c-format msgid "Invalid search conditions: %s" msgstr "Ugyldige søkjevilkår: %s" -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:443 -#: ../../locales/../src/interface/sitemanager.cpp:457 -#: ../../locales/../src/interface/sitemanager.cpp:464 -#: ../../locales/../src/interface/sitemanager.cpp:471 -#: ../../locales/../src/interface/sitemanager.cpp:488 -#: ../../locales/../src/interface/sitemanager.cpp:539 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:734 -#: ../../locales/../src/interface/sitemanager.cpp:808 -#: ../../locales/../src/interface/sitemanager.cpp:814 +#: ../../locales/../src/interface/sitemanager.cpp:685 +#: ../../locales/../src/interface/sitemanager.cpp:691 +#: ../../locales/../src/interface/sitemanager.cpp:762 +#: ../../locales/../src/interface/sitemanager.cpp:768 msgid "Invalid site path" msgstr "Ugyldig nettstadbane" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:723 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:726 msgid "Invalid size in condition" msgstr "Ugyldig storleik på føresetnaden" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/engine/server.cpp:133 msgid "Invalid username given." msgstr "Brukarnamnet er ugyldig." -#: ../../locales/../src/engine/socket.cpp:1172 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "Invalid value for ai_flags" msgstr "Ugyldig verdi for ai_flags" -#: ../../locales/../src/engine/socket.cpp:1174 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Invalid value for hints" msgstr "Ugyldig hint-verdi" -#: ../../locales/../src/interface/verifycertdialog.cpp:198 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Rettsområde land:" -#: ../../locales/../src/interface/verifycertdialog.cpp:200 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Domsmyndeområde:" -#: ../../locales/../src/interface/verifycertdialog.cpp:199 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Domsmyndestat/-provins:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1715 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 msgid "Keep directories on top" msgstr "Hald alltid katalogane øvst" -#: ../../locales/../src/interface/Mainfrm.cpp:675 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4694,44 +4821,50 @@ "lister om dette valet er slått på. Sjølv om FileZilla utfører nokre testar " "for å sjå om tenaren støttar denne eigenskapen, kan testen feila." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1974 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 msgid "Key exchange" msgstr "Nøkkelutveksling" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:195 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:460 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 msgid "Key exchange:" msgstr "Nøkkelutveksling:" +#: ../../locales/../src/engine/server.cpp:882 +#: ../../locales/../src/engine/server.cpp:903 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1324 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1325 +msgid "Key file" +msgstr "Nøkkelfil" + # L& -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "L&ågaste" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Språk" -#: ../../locales/../src/interface/Mainfrm.cpp:1508 +#: ../../locales/../src/interface/Mainfrm.cpp:1434 msgid "Language changed" msgstr "Språket er endra" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/LocalListView.cpp:282 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:154 msgid "Last modified" msgstr "Sist endra" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1251 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 msgid "Layout" msgstr "Utforming" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 msgid "Limit for concurrent &downloads:" msgstr "Grense for samtidige &nedlastingar:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:845 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 msgid "Limit for concurrent &uploads:" msgstr "Grense for samtidige oppl&astingar:" @@ -4739,15 +4872,15 @@ msgid "Limit local ports" msgstr "Avgrens lokale portar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2138 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 msgid "Limit size of logfile" msgstr "Avgrens loggfilstorleiken" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 msgid "Limit:" msgstr "Grense:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:809 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:782 msgid "Line length exceeded" msgstr "For lang linjelengd" @@ -4755,14 +4888,15 @@ msgid "Linked against" msgstr "Lenka til" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Lytteendepuktet er lukka" # var: Listing: -#: ../../locales/../src/engine/logging.cpp:116 -#: ../../locales/../src/interface/StatusView.cpp:285 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:118 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:362 msgid "Listing:" msgstr "Listar:" @@ -4770,50 +4904,59 @@ msgid "Lo&west available port:" msgstr "L&ågaste tilgjengelege port:" -#: ../../locales/../src/interface/edithandler.cpp:1149 -#: ../../locales/../src/interface/edithandler.cpp:1403 +#: ../../locales/../src/interface/edithandler.cpp:1138 +#: ../../locales/../src/interface/edithandler.cpp:1374 msgid "Local" msgstr "Lokal" -#: ../../locales/../src/engine/socket.cpp:1137 +#: ../../locales/../src/engine/socket.cpp:1028 msgid "Local address in use" msgstr "Den lokale adressa er i bruk" -#: ../../locales/../src/engine/socket.cpp:1165 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Local endpoint has been closed" msgstr "Det lokale endepunktet vart lukka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2252 msgid "Local file" msgstr "Lokal fil" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Lokal fil finst ikkje." -#: ../../locales/../src/interface/updater.cpp:365 -#: ../../locales/../src/interface/updater.cpp:457 +#: ../../locales/../src/interface/updater.cpp:402 +#: ../../locales/../src/interface/updater.cpp:495 #, c-format msgid "Local file is %s\n" msgstr "Lokal fil er %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:309 msgid "Local file is a directory instead of a regular file." msgstr "Lokal fil er ein katalog, ikkje ei vanleg fil." -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Lokal fil er ikkje eit gyldig filnamn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1063 +#: ../../locales/../src/interface/search.cpp:644 +#: ../../locales/../src/interface/search.cpp:650 +msgid "Local file search" +msgstr "Lokalt filsøk" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Lokale filter:" -#: ../../locales/../src/interface/viewheader.cpp:325 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3279 +msgid "Local path handling:" +msgstr "Lokal stibehandling:" + +#: ../../locales/../src/interface/viewheader.cpp:335 msgid "Local site:" msgstr "Lokal stad:" -#: ../../locales/../src/interface/verifycertdialog.cpp:192 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Stad:" @@ -4821,12 +4964,16 @@ msgid "Log file" msgstr "Loggfil" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2092 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:913 +msgid "Logged in" +msgstr "Pålogga" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Loggføring" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:805 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4835,7 +4982,7 @@ "forstår UTF-8. Det er ikkje mogleg å falla tilbake til lokalt teiknsett " "grunna bruk av mellomtenar." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:812 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:815 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4843,7 +4990,7 @@ "Påloggingsdataa inneheld ikkje-ASCII-teikn og det kan vera at tenaren ikkje " "forstår UTF-8. Prøver lokalt teiknsett." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:842 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "Påloggingssekvensen er fullført, men er likevel ikkje pålogga. Avbryt." @@ -4861,120 +5008,127 @@ "Påloggingstypen kan berre nyttast saman med ei FTP-adresse. Argumentet må " "anten vera '%s' eller '%s'" -#: ../../locales/../src/interface/queue.cpp:885 -#: ../../locales/../src/interface/queue.cpp:972 +#: ../../locales/../src/interface/queue.cpp:878 +#: ../../locales/../src/interface/queue.cpp:934 msgid "Low" msgstr "Låg" -#: ../../locales/../src/interface/queue.cpp:883 -#: ../../locales/../src/interface/queue.cpp:970 +#: ../../locales/../src/interface/queue.cpp:876 +#: ../../locales/../src/interface/queue.cpp:932 msgid "Lowest" msgstr "Lågaste" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "Det lågaste portnummeret må vera mellom 1024 og 65535." # Nettkortadresse? -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:215 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:480 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "Magentaraud" + +#: ../../locales/../src/interface/xmlfunctions.cpp:43 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Sjå til at ein har tilgang til fila og at ho er eit velforma XML-dokument." +#: ../../locales/../src/engine/httpcontrolsocket.cpp:770 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:782 #: ../../locales/../src/engine/httpcontrolsocket.cpp:797 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:809 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:824 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:829 #, c-format msgid "Malformed chunk data: %s" msgstr "Ugyldige oppdelingsdata: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:742 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:715 #, c-format msgid "Malformed header: %s" msgstr "Ugyldig hovud: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:562 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:535 msgid "Malformed reply, server not sending proper line endings" msgstr "Svaret er ikkje velforma: tenaren sender ikkje rette linjeavslutningar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2594 +#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:303 #: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:316 -#: ../../locales/../src/interface/manual_transfer.cpp:323 -#: ../../locales/../src/interface/manual_transfer.cpp:328 -#: ../../locales/../src/interface/manual_transfer.cpp:336 -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:332 #: ../../locales/../src/interface/manual_transfer.cpp:350 -#: ../../locales/../src/interface/manual_transfer.cpp:369 msgid "Manual transfer" msgstr "Manuell overføring" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3069 msgid "Match all of the following" msgstr "Samsvar med alle følgjande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3070 msgid "Match any of the following" msgstr "Samsvar med kva som helst av følgjande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3071 msgid "Match none of the following" msgstr "Samsvar med ingen av dei følgjande" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:803 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +msgid "Match not all of the following" +msgstr "Samsvar ikkje med alle følgjande" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "&Høgste tal samtidige overføringar:" -#: ../../locales/../src/engine/socket.cpp:1178 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Memory allocation failure" msgstr "Minnetildelingsfeil" -#: ../../locales/../src/interface/Mainfrm.cpp:403 -#: ../../locales/../src/interface/Mainfrm.cpp:1829 +#: ../../locales/../src/interface/Mainfrm.cpp:385 +#: ../../locales/../src/interface/Mainfrm.cpp:1748 msgid "Message log" msgstr "Meldingslogg" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 msgid "Message log position" msgstr "Meldingsloggposisjon" -#: ../../locales/../src/engine/socket.cpp:1162 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "Message too large" msgstr "Meldinga er for stor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2158 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:366 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:445 msgid "Minutes" msgstr "minutt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2167 msgid "Move &down" msgstr "Flytt &ned" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2124 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 msgid "Move &up" msgstr "Flytt &opp" -#: ../../locales/../src/interface/LocalTreeView.cpp:1028 +#: ../../locales/../src/interface/LocalTreeView.cpp:990 msgid "My Computer" msgstr "Datamaskina mi" -#: ../../locales/../src/interface/LocalTreeView.cpp:1018 +#: ../../locales/../src/interface/LocalTreeView.cpp:980 msgid "My Documents" msgstr "Dokumenta mine" -#: ../../locales/../src/interface/sitemanager.cpp:286 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:728 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:730 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:734 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:736 msgid "My Sites" msgstr "Nettstadene mine" @@ -4983,46 +5137,49 @@ msgid "N/a" msgstr "-" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2632 msgid "Name" msgstr "Namn" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:706 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:683 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1210 msgid "Name already exists" msgstr "Namnet finst allereie" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:703 msgid "Name of bookmark already exists." msgstr "Bokmerkenamnet finst allereie." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 msgid "Name:" msgstr "Namn:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 msgid "Natural sort" msgstr "Naturleg sortering" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" msgstr "Du må skriva inn filternamnet" -#: ../../locales/../src/interface/search.cpp:376 +#: ../../locales/../src/interface/search.cpp:644 +msgid "Need to enter valid local path" +msgstr "Du må skriva inn gyldig lokalsti" + +#: ../../locales/../src/interface/search.cpp:671 msgid "Need to enter valid remote path" msgstr "Du må skriva inn gyldig fjernsti" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1023 msgid "Need to specify a character encoding" msgstr "Ein må føra opp teiknkoding" -#: ../../locales/../src/engine/socket.cpp:1182 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Neither nodename nor servname provided, or not known" msgstr "Verken node- eller tenarnamnet er oppgjeve - eller so er det ukjent" -#: ../../locales/../src/engine/socket.cpp:1169 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5030,12 +5187,12 @@ "Nettverksverten har ikkje ei nettverksadresse i den førespurde " "adressefamilien" -#: ../../locales/../src/engine/proxy.cpp:492 -#: ../../locales/../src/engine/socket.cpp:1154 +#: ../../locales/../src/engine/proxy.cpp:481 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Network unreachable" msgstr "Klarer ikkje å nå nettverket" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2029 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "Never" msgstr "Aldri" @@ -5047,37 +5204,37 @@ msgid "New &tab" msgstr "Ny &fane" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2788 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2837 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" -msgstr "Nytt bok&merke" +msgstr "Nytt &bokmerke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2560 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2597 #: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:446 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:538 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:544 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:550 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2098 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:107 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:528 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:533 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:559 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:703 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2221 msgid "New bookmark" msgstr "Nytt bokmerke" -#: ../../locales/../src/interface/LocalTreeView.cpp:1177 -#: ../../locales/../src/interface/RemoteListView.cpp:1337 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1318 +#: ../../locales/../src/interface/LocalTreeView.cpp:1156 +#: ../../locales/../src/interface/RemoteListView.cpp:1314 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1248 msgid "New directory" msgstr "Ny katalog" -#: ../../locales/../src/interface/welcome_dialog.cpp:53 +#: ../../locales/../src/interface/welcome_dialog.cpp:56 #, c-format msgid "New features and improvements in %s" msgstr "Nye eigenskapar og forbetringar i %s" @@ -5086,42 +5243,42 @@ msgid "New filter" msgstr "Nytt filter" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:932 msgid "New folder" msgstr "Ny mappe" -#: ../../locales/../src/interface/sitemanager.cpp:625 -#: ../../locales/../src/interface/sitemanager.cpp:639 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2074 +#: ../../locales/../src/interface/sitemanager.cpp:595 +#: ../../locales/../src/interface/sitemanager.cpp:607 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "New site" msgstr "Ny stad" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1308 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 msgid "Next to the transfer queue" msgstr "Ved sida av overføringskøen" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:812 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:737 msgid "No" msgstr "Nei" -#: ../../locales/../src/engine/socket.cpp:1180 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "No address associated with nodename" msgstr "Inga adresse er knytt til nodenamnet" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Ingen kategori er vald for eksportering" -#: ../../locales/../src/interface/QueueView.cpp:2181 +#: ../../locales/../src/interface/QueueView.cpp:1747 msgid "No command given, aborting." msgstr "Ingen kommando er oppgjeven - avbryt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3843 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3705 msgid "No external IP address set, trying default." msgstr "Inga ekstern IP-adresse er lagra - prøver standardverdien." # var: Ingen filer held på å bli endra no. -#: ../../locales/../src/interface/edithandler.cpp:1090 +#: ../../locales/../src/interface/edithandler.cpp:1079 msgid "No files are currently being edited." msgstr "Ingen filer blir endra no." @@ -5129,9 +5286,9 @@ msgid "No filter name given" msgstr "Er ikkje oppgjeve noko filternamn" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:78 +#: ../../locales/../src/engine/server.cpp:175 +#: ../../locales/../src/engine/server.cpp:200 msgid "No host given, please enter a host." msgstr "Manglar vertsnamnet - skriv det inn." @@ -5139,97 +5296,94 @@ msgid "No images available" msgstr "Ingen bilete er tilgjengelege" -#: ../../locales/../src/interface/QueueView.cpp:3052 -msgid "No more files in the queue!" -msgstr "Ingen fleire filer i køen." - -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "No name for the filterset given." msgstr "Er ikkje oppgjeve noko filtersamlingsnamn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2955 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3004 msgid "No program associated with filetype" msgstr "Ikkje noko program er knytt til filtypen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2872 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2921 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "Ikkje noko program er knytt til endring av filer med filtypen '%s'." -#: ../../locales/../src/engine/socket.cpp:1157 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "No route to host" msgstr "Inga rute til verten" -#: ../../locales/../src/interface/search.cpp:236 +#: ../../locales/../src/interface/search.cpp:391 msgid "No search results" msgstr "Ingen søkjeresultat" -#: ../../locales/../src/interface/sitemanager.cpp:295 +#: ../../locales/../src/interface/sitemanager.cpp:347 msgid "No sites available" msgstr "Ingen nettstader er tilgjengelege" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:453 msgid "No supported SOCKS5 auth method" msgstr "Ingen støtta SOCKS5-godkjenningsmetode" -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:105 msgid "No username given." msgstr "Brukarnamn er ikkje oppgjeve." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "Ingen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2331 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2368 msgid "None selected yet" msgstr "Ingen er enno valde" -#: ../../locales/../src/engine/socket.cpp:1176 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Nonrecoverable failure in name resolution" msgstr "Klarte ikkje å ordna namneoppløysingsfeilen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:943 -#: ../../locales/../src/engine/server.cpp:830 -#: ../../locales/../src/engine/server.cpp:849 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:185 -#: ../../locales/../src/interface/manual_transfer.cpp:563 -#: ../../locales/../src/interface/queue.cpp:888 -#: ../../locales/../src/interface/queue.cpp:975 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1276 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 +#: ../../locales/../src/engine/server.cpp:878 +#: ../../locales/../src/engine/server.cpp:899 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1322 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:325 -#: ../../locales/../src/interface/queueview_failed.cpp:350 +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 msgid "Not all items could be requeued for transfer." msgstr "Ikkje alle elementa vart lagde attende i overføringskøen." -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:508 +#: ../../locales/../src/interface/state.cpp:178 +#: ../../locales/../src/interface/state.cpp:1177 msgid "Not connected" msgstr "Ikkje tilkopla" -#: ../../locales/../src/interface/RemoteListView.cpp:2073 +#: ../../locales/../src/interface/RemoteListView.cpp:2028 msgid "Not connected to any server" msgstr "Ikkje tilkopla mot nokon tenar" -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Ikkje tilkopla mot nokon tenar." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Ikkje tilkopla." -#: ../../locales/../src/engine/socket.cpp:1197 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Not initialized, need to call WSAStartup" msgstr "Ikkje starta, må kalla opp WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:673 +#: ../../locales/../src/interface/Mainfrm.cpp:648 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Ver merksam på at denne eigenskapen berre er støtta når ein nyttar FTP-" @@ -5239,11 +5393,11 @@ msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Obs: dette fungerer berre med vanlege, ikkje-krypterte FTP-samband." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "Obs: bruk av generisk mellomtenar gjev passivmodus på FTP-sambanda." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 msgid "Number of decimal places:" msgstr "Tal på desimalplassar:" @@ -5251,41 +5405,45 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Talet på forsøk må vera mellom 0 og 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "O&pen file" msgstr "O&pna fil" # ? skal vi ha med hurtigtast? -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:258 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:513 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:796 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:892 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1003 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1162 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1344 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1451 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1522 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1575 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1808 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2081 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2156 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2685 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2938 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3150 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3219 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3584 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3640 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1538 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1972 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2118 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2576 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2987 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3225 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3320 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3389 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3764 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3820 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "&OK" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +msgid "OS version:" +msgstr "OS-utgåve:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " @@ -5294,23 +5452,23 @@ "På dei følgjande sidene stiller ein inn overførings- og tilbakefallsmåten " "(dersom slått på)." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:822 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:746 msgid "Once" msgstr "Éin gong" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 msgid "Once a day" msgstr "Éin gong om dagen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 msgid "Once a week" msgstr "Éin gong i veka" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:530 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:519 msgid "Only use plain FTP (insecure)" msgstr "Bruk berre vanleg FTP (utrygg)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Open directory in system's file manager" msgstr "Opna katalogen i systemet sin filbehandlar" @@ -5334,14 +5492,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Opna FileZilla sine innstillingar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1708 msgid "Opened as:" msgstr "Opna som:" -#: ../../locales/../src/interface/edithandler.cpp:1659 -#: ../../locales/../src/interface/edithandler.cpp:1753 -#: ../../locales/../src/interface/LocalListView.cpp:1715 -#: ../../locales/../src/interface/LocalListView.cpp:1727 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/edithandler.cpp:1739 +#: ../../locales/../src/interface/LocalListView.cpp:1732 +#: ../../locales/../src/interface/LocalListView.cpp:1744 msgid "Opening failed" msgstr "Opninga feila" @@ -5359,40 +5517,44 @@ msgstr "" "Opnar filtervindauget for kataloglister. Høgreklikk for å slå filtera av/på." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:777 -msgid "Operating system" -msgstr "Operativsystem" - -#: ../../locales/../src/interface/FileZilla.cpp:310 -msgid "Operating system problem detected" -msgstr "Fann eit operativsystemproblem" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +msgid "Operating System:" +msgstr "Operativsystem:" -#: ../../locales/../src/engine/socket.cpp:1148 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Operation already in progress" -msgstr "Handlinga er allereie i bruk" +msgstr "Handlinga er allereie i gang" -#: ../../locales/../src/engine/socket.cpp:1139 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Operation in progress" msgstr "Handlinga held på" -#: ../../locales/../src/engine/socket.cpp:1160 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Operation not supported" msgstr "Kommandoen er ikkje støtta" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "Oransje" + +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organisasjon:" -#: ../../locales/../src/engine/socket.cpp:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +msgid "Other SFTP options" +msgstr "Andre SFTP-val" + +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Other system error" msgstr "Annan systemfeil" -#: ../../locales/../src/interface/verifycertdialog.cpp:208 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Anna:" -#: ../../locales/../src/engine/socket.cpp:1143 -#: ../../locales/../src/engine/socket.cpp:1144 +#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Out of memory" msgstr "Ikkje nok minne" @@ -5405,31 +5567,31 @@ msgstr "Skriv over om &kjelda er nyare" # var: Skriva over fila -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Skriv over fila" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1416 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1170 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "Skriv over fila om storleiken er forskjellig" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1394 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1417 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1171 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "Skriv over fila om storleiken er forskjellig eller kjeldefila er nyare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1392 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1415 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1169 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" msgstr "Skriv over fila om kjeldefila er nyare" @@ -5442,22 +5604,21 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Skr&iv over om forskjellig storleik eller kjeldefila er nyare" -# ?treng ein definera 'build' -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" -msgstr "Eigen type: %s\n" +msgstr "Eigen utgåvetype: %s\n" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 msgid "Owner permissions" msgstr "Eigarrettar" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:86 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:156 msgid "Owner/Group" msgstr "Eigar/gruppe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1342 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5466,11 +5627,11 @@ # var: &Vert: #: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 msgid "P&roxy host:" msgstr "&Mellomtenarvert:" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "PORT-kommandoen er endra av rutaren eller brannmuren." @@ -5478,18 +5639,18 @@ msgid "Pa&ssive (recommended)" msgstr "&Passiv (tilrådd)" -#: ../../locales/../src/interface/Mainfrm.cpp:2398 +#: ../../locales/../src/interface/Mainfrm.cpp:2359 msgid "Parameter not a valid URL" msgstr "Parameteren er ikkje ei gyldig adresse" -#: ../../locales/../src/interface/updater.cpp:537 +#: ../../locales/../src/interface/updater.cpp:575 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Tolkar %d bytar av oppgåveopplysningane.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2484 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:191 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 msgid "Pass&word:" msgstr "&Passord:" @@ -5502,39 +5663,39 @@ msgid "Passive mode" msgstr "Passivmodus" -#: ../../locales/../src/interface/netconfwizard.cpp:604 -#: ../../locales/../src/interface/netconfwizard.cpp:617 -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Passivmodus er no standard overføringsmodus." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Passord er påkravd" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:81 +#: ../../locales/../src/interface/search.cpp:151 msgid "Path" msgstr "Filbane" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3127 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2248 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3005 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2153 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Klarer ikkje å laga bane for katalogen %s og underkatalogen %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2316 msgid "Path not found:" msgstr "Fann ikkje bana:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2622 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 msgid "Paths" msgstr "Stigar" -#: ../../locales/../src/interface/edithandler.cpp:1128 -#: ../../locales/../src/interface/edithandler.cpp:1271 -#: ../../locales/../src/interface/edithandler.cpp:1370 -#: ../../locales/../src/interface/edithandler.cpp:1383 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1254 +#: ../../locales/../src/interface/edithandler.cpp:1344 +#: ../../locales/../src/interface/edithandler.cpp:1354 msgid "Pending removal" msgstr "Ventar på fjerning" @@ -5542,13 +5703,13 @@ msgid "Permission" msgstr "Løyve" -#: ../../locales/../src/engine/socket.cpp:1136 -#: ../../locales/../src/engine/socket.cpp:1145 +#: ../../locales/../src/engine/socket.cpp:1027 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Permission denied" msgstr "Tilgang avvist" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:155 msgid "Permissions" msgstr "Tilgangar" @@ -5556,7 +5717,7 @@ msgid "Platform:" msgstr "Plattform:" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5572,13 +5733,13 @@ "Still inn brannmur og rutar slik at FileZilla kan laga utgåanda samband mot " "vilkårlege portar." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Slå av innstillingar slik som \"DMZ-modus\" eller \"spelemodus\" i rutaren " "din." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5594,7 +5755,7 @@ msgid "Please enter a custom time format." msgstr "Før opp eit tilpassa tidformat." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:737 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:741 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" @@ -5614,7 +5775,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Gje det kopierte filteret eit nytt namn." -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:272 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Skriv inn eit nytt namn for filtersamlinga \"%s\"" @@ -5650,24 +5811,14 @@ msgid "Please enter a password for this server:" msgstr "Skriv inn eit passord for denne tenaren:" -#: ../../locales/../src/interface/QueueView.cpp:2170 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Skriv bana og programmet som skal køyrast.\n" -"T.d. c:\\bane\\fil.exe i MS Windows eller /bane/fil i Unix.\n" -"Du kan òg føra opp valfrie programargument." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" -"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts." +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -"Skriv eit tidsavbrot mellom 5 og 9999 sekund, eller 0 for å slå av " +"Skriv eit tidsavbrot mellom 10 og 9999 sekund, eller 0 for å slå av " "tidsavbrot." -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Please enter a unique name for this filter set" msgstr "Gje filtersamlinga eit eintydig namn" @@ -5675,11 +5826,11 @@ msgid "Please enter a username for this server:" msgstr "Skriv inn eit brukarnamn for denne tenaren:" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Skriv inn eit gyldig portområde." -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Skriv nettadressa der du kan få den eksterne adressa di frå" @@ -5689,7 +5840,7 @@ msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Skriv inn ei opplastingsfartsgrense større enn eller lik 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5697,14 +5848,28 @@ "Skriv ein rå FTP-kommando.\n" "Bruk av råe FTP-kommandoar medfører tømming av katalogmellomlageret." -#: ../../locales/../src/interface/LocalListView.cpp:901 -#: ../../locales/../src/interface/LocalTreeView.cpp:1174 -#: ../../locales/../src/interface/RemoteListView.cpp:1324 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1304 +#: ../../locales/../src/interface/QueueView.cpp:1741 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Skriv den fullstendige stien og argumenta til programmet. Kommandoen vil " +"verta utført når behandlingskøen er ferdig.\n" +"Døme: c:\\bane\\fil.exe i MS Windows eller /bane/fil i Unix.\n" +"Du må òg føra opp kommandoane og argumenta deira med hermeteikn om dei " +"inneheld mellomrom." + +#: ../../locales/../src/interface/LocalListView.cpp:924 +#: ../../locales/../src/interface/LocalTreeView.cpp:1153 +#: ../../locales/../src/interface/RemoteListView.cpp:1301 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Please enter the name of the directory which should be created:" msgstr "Skriv namnet på katalogen som skal opprettast:" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2614 msgid "Please enter the name of the file which should be created:" msgstr "Skriv namnet på fila som skal opprettast:" @@ -5712,12 +5877,12 @@ msgid "Please enter username and password for this server:" msgstr "Skriv inn brukarnamn og passord for denne tenaren:" -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Skriv inn den eksterne IP-adressa di" -#: ../../locales/../src/interface/netconfwizard.cpp:609 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5735,7 +5900,7 @@ "Følg rettleiinga nøye sidan feil innstillingar vil medføra at du ikkje får " "FTP-samband." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5743,12 +5908,12 @@ "Sjå til at FileZilla kan etablera utgåande tilkoplingar og at du skreiv rett " "adresse til adresseløysaren." -#: ../../locales/../src/interface/FileZilla.cpp:198 +#: ../../locales/../src/interface/FileZilla.cpp:133 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Sjå til at regionaltilpassinga du bad om er installert på systemet ditt." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5771,7 +5936,7 @@ "blir brukt av trojanarar eller andre skadeprogram. Du kan trygt sjå vekk frå " "slike falske alarmar." -#: ../../locales/../src/interface/Mainfrm.cpp:713 +#: ../../locales/../src/interface/Mainfrm.cpp:688 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5787,7 +5952,7 @@ "Ver merksam på at somme tenarar kan stengja deg ute om du koplar til for " "ofte eller med for korte opphald." -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5796,11 +5961,11 @@ "Køyr denne rettleiaren ein gong til om nettverket endrar seg eller du får " "problem med tenarar som tidlegare fungerte." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Please select an action:" msgstr "Vel ei handling:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 msgid "Please select the categories you would like to import." msgstr "Vel kategoriane du vil importera." @@ -5808,30 +5973,30 @@ msgid "Please select the default transfer mode you would like to use." msgstr "Vel kva standard overføringstype du ønskjer å bruka." -#: ../../locales/../src/interface/chmoddialog.cpp:46 +#: ../../locales/../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." msgstr "Gje katalogen \"%s\" nye attributt." -#: ../../locales/../src/interface/chmoddialog.cpp:38 +#: ../../locales/../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." msgstr "Gje fila \"%s\" nye attributt." -#: ../../locales/../src/interface/chmoddialog.cpp:49 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Gje dei valde katalogane nye attributt." -#: ../../locales/../src/interface/chmoddialog.cpp:52 +#: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "Gje dei valde filene og katalogane nye attributt." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Gje dei valde filene nye attributt." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5845,29 +6010,29 @@ "\"spelemodus\" i rutaren din. Bruk heller ikkje protokollkontrollar eller " "protokollspesifikke \"fiksar\"." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 msgid "Positio&n of the message log:" msgstr "&Meldingsloggposisjonen:" -#: ../../locales/../src/interface/verifycertdialog.cpp:193 -#: ../../locales/../src/interface/verifycertdialog.cpp:194 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Postal code:" msgstr "Postnummer:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1012 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 msgid "Pre&allocate space before downloading" -msgstr "Førehandstillat plass før nedlastinga" +msgstr "F&ørehandstildel plass før nedlastinga" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 msgid "Preallocation" msgstr "Førehandstildeling" -#: ../../locales/../src/interface/sitemanager.cpp:285 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1797 +#: ../../locales/../src/interface/sitemanager.cpp:337 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 msgid "Predefined Sites" msgstr "Førehandsdefinerte stader" -#: ../../locales/../src/interface/Mainfrm.cpp:712 +#: ../../locales/../src/interface/Mainfrm.cpp:687 msgid "Preserving file timestamps" msgstr "Tek vare på tidsstempel" @@ -5875,7 +6040,7 @@ msgid "Preview:" msgstr "Førehandsvising:" -#: ../../locales/../src/engine/tlssocket.cpp:1060 +#: ../../locales/../src/engine/tlssocket.cpp:1344 msgid "Primary connection and data connection certificates don't match." msgstr "Sertifikata til primær- og datatilkoplingane samsvarer ikkje." @@ -5887,15 +6052,15 @@ msgid "Print version information to stdout and exit" msgstr "Skriv ut utgåveopplysningane til standard utkanal og avslutt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 msgid "Prioritize directories (default)" msgstr "Prioriter katalogar (standard)" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Priority" msgstr "Prioritet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2070 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5913,74 +6078,83 @@ # var: &Mellomtenarpassord: #: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:756 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 msgid "Pro&xy password:" msgstr "P&assord:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "Behandla &køen" -#: ../../locales/../src/engine/socket.cpp:1141 +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Process file table overflow" msgstr "Behandla filtabelloverflyt" -#: ../../locales/../src/engine/socket.cpp:1146 +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:121 +#, c-format +msgid "Processed %s in %s." +msgstr "Behandla %s i %s." + +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Protocol not supported" msgstr "Protokollen er ikkje støtta" -#: ../../locales/../src/engine/socket.cpp:1199 +#: ../../locales/../src/engine/socket.cpp:1091 msgid "Protocol not supported on given socket type" -msgstr "Protokolltypen er ikkje støtta av den gjevne endepunktstypen" +msgstr "Protokollen er ikkje støtta av den gjevne endepunktstypen" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:185 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:450 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Protokoll:" # var: Mellomtenar&port: -#: ../../locales/../src/interface/resources/xrc/settings.xrc:733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 msgid "Proxy &port:" msgstr "&Port:" # var: Mellomtenar&brukar: #: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:746 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 msgid "Proxy &user:" msgstr "&Brukar:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:462 msgid "Proxy authentication failed" msgstr "Mellomtenarautentiseringa feila" -#: ../../locales/../src/engine/transfersocket.cpp:127 -#: ../../locales/../src/engine/transfersocket.cpp:140 +#: ../../locales/../src/engine/transfersocket.cpp:106 +#: ../../locales/../src/engine/transfersocket.cpp:118 #, c-format msgid "Proxy handshake failed: %s" msgstr "Mellomtenargodkjenningsprosedyren feila: %s" # ? -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4298 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4162 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Mellomlagerverten startar med '[', men manglar avsluttande parentes." -#: ../../locales/../src/engine/proxy.cpp:320 +#: ../../locales/../src/engine/proxy.cpp:321 #, c-format msgid "Proxy reply: %s" msgstr "Svar frå mellomtenar: %s" -#: ../../locales/../src/engine/proxy.cpp:379 -#: ../../locales/../src/engine/proxy.cpp:514 +#: ../../locales/../src/engine/proxy.cpp:503 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Mellomtenarførespurnaden feila. Svaret frå mellomtenaren: %s" + +#: ../../locales/../src/engine/proxy.cpp:376 #, c-format msgid "Proxy request failed: %s" msgstr "Førespurnaden til mellomtenaren feilar: %s" -#: ../../locales/../src/engine/proxy.cpp:539 +#: ../../locales/../src/engine/proxy.cpp:527 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Mellomtenarførespurnaden feila: ukjend adressetype i CONNECT-svaret" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4327 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4191 msgid "Proxy set but proxy host or port invalid" msgstr "Mellomtenarinnstillinga er lagra, men verten eller porten er ugyldig" @@ -5989,7 +6163,6 @@ msgstr "Offentleg nøkkel-autentisering" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:338 msgid "Public key algorithm:" msgstr "Offentleg nøkkel-algoritme:" @@ -5997,47 +6170,48 @@ msgid "Public permissions" msgstr "Offentlege tilgangar" -#: ../../locales/../src/interface/QueueView.cpp:3132 +#: ../../locales/../src/interface/QueueView.cpp:2596 msgid "Queue has been fully processed" msgstr "Køen er blitt fullstendig behandla" -#: ../../locales/../src/interface/statusbar.cpp:427 +#: ../../locales/../src/interface/statusbar.cpp:429 #, c-format msgid "Queue: %s MiB" msgstr "Kø: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:357 +#: ../../locales/../src/interface/statusbar.cpp:366 #, c-format msgid "Queue: %s%s" msgstr "Kø: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:353 -#: ../../locales/../src/interface/statusbar.cpp:418 +#: ../../locales/../src/interface/statusbar.cpp:362 +#: ../../locales/../src/interface/statusbar.cpp:420 msgid "Queue: empty" msgstr "Kø: tom" -#: ../../locales/../src/interface/QueueView.cpp:439 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Filer i køen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3297 msgid "Queueing:" msgstr "I kø:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "Start &om att systemet" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" +msgstr "Start &om att systemet éin gong" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "&Fjernkatalogtre" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:460 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "R&eset and requeue selected files" msgstr "N&ullstill og legg dei valde filene i køen igjen" -#: ../../locales/../src/interface/Mainfrm.cpp:609 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "Rå FTP-kommando" @@ -6054,7 +6228,7 @@ msgid "Re&name" msgstr "Gje &nytt namn" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6070,12 +6244,12 @@ msgid "Read-only" msgstr "Berre lesing" -#: ../../locales/../src/interface/Mainfrm.cpp:1064 +#: ../../locales/../src/interface/Mainfrm.cpp:1025 msgid "Really cancel current operation?" msgstr "Vil du verkeleg avslutta den gjeldande handlinga?" -#: ../../locales/../src/interface/RemoteListView.cpp:1413 -#: ../../locales/../src/interface/search.cpp:776 +#: ../../locales/../src/interface/RemoteListView.cpp:1395 +#: ../../locales/../src/interface/search.cpp:1185 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6083,35 +6257,35 @@ msgstr[0] "Vil du verkeleg sletta %d katalog og innhaldet i han frå tenaren?" msgstr[1] "Vil du verkeleg sletta %d katalogar og innhaldet i dei frå tenaren?" -#: ../../locales/../src/interface/RemoteListView.cpp:1411 -#: ../../locales/../src/interface/search.cpp:774 +#: ../../locales/../src/interface/RemoteListView.cpp:1392 +#: ../../locales/../src/interface/search.cpp:1183 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Vil du verkeleg sletta %d fil frå tenaren?" msgstr[1] "Vil du verkeleg sletta %d filer frå tenaren?" -#: ../../locales/../src/interface/RemoteListView.cpp:1418 -#: ../../locales/../src/interface/search.cpp:781 +#: ../../locales/../src/interface/RemoteListView.cpp:1400 +#: ../../locales/../src/interface/search.cpp:1189 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Vil du verkeleg sletta %s og %s frå tenaren?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Vil du verkeleg sletta dei valde filene og/eller katalogane frå tenaren?" -#: ../../locales/../src/engine/local_filesys.cpp:134 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "Vil du verkeleg sletta dei valde filene og/eller katalogane frå tenaren?" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Reason" msgstr "Årsak" -#: ../../locales/../src/interface/QueueView.cpp:3125 +#: ../../locales/../src/interface/QueueView.cpp:2589 msgid "Reboot now" msgstr "Start om att no" @@ -6119,41 +6293,49 @@ msgid "Rec&urse into subdirectories" msgstr "Ta med &underkatalogar|" -#: ../../locales/../src/engine/tlssocket.cpp:199 +#: ../../locales/../src/engine/tlssocket.cpp:326 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Motteke TLS-varsel frå tenaren: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:3070 +#: ../../locales/../src/engine/directorylistingparser.cpp:2928 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Den mottekne kataloglista verkar vera koda med EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:2068 -#: ../../locales/../src/engine/directorylistingparser.cpp:2083 +#: ../../locales/../src/engine/directorylistingparser.cpp:1969 +#: ../../locales/../src/engine/directorylistingparser.cpp:1985 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Avbryt: motteke ei linje med over 10000 teikn." -#: ../../locales/../src/interface/netconfwizard.cpp:1013 -#: ../../locales/../src/interface/netconfwizard.cpp:1022 -#: ../../locales/../src/interface/netconfwizard.cpp:1045 +#: ../../locales/../src/engine/tlssocket.cpp:1327 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Klarte ikkje å verifisera den mottekne sertifikatkjeda. " +"Verifiseringsstatusen er %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1006 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "Mottekne data er øydelagde" -#: ../../locales/../src/interface/updater.cpp:516 +#: ../../locales/../src/interface/updater.cpp:554 msgid "Received invalid character in version information" msgstr "Mottok ugyldig teikn i utgåveopplysningane" -#: ../../locales/../src/engine/tlssocket.cpp:202 +#: ../../locales/../src/engine/tlssocket.cpp:329 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Mottok det ukjende TLS-varselet %d frå tenaren" -#: ../../locales/../src/interface/updater.cpp:509 +#: ../../locales/../src/interface/updater.cpp:547 msgid "Received version information is too large" msgstr "Dei mottekne utgåveopplysningane er for store" # Oppattilkopling? -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6170,13 +6352,29 @@ msgid "Reconnects to the last used server" msgstr "Koplar seg opp att til den sist nytta tenaren." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:658 +#: ../../locales/../src/interface/recursive_operation_status.cpp:99 +msgid "Recursively adding files to queue." +msgstr "Legg til &filer rekursivt i køen." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:105 +msgid "Recursively changing permissions." +msgstr "Endra tilgangsløyva rekursivt." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:102 +msgid "Recursively deleting files and directories." +msgstr "Slett filer og katalogar rekursivt." + +#: ../../locales/../src/interface/sitemanager.cpp:17 +msgid "Red" +msgstr "Raud" + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:631 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Omdirigering til ugyldig eller ikkje-støtta URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:665 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:638 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Omdirigering til ugyldig eller ikkje-støtta adresse: %s" @@ -6186,40 +6384,37 @@ msgid "Refresh the file and folder lists" msgstr "Frisk opp att fil- og mappelista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3840 msgid "Remember passwords?" msgstr "Hugsa passord?" -#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1101 msgid "Remote" msgstr "Fjern" -#: ../../locales/../src/engine/tlssocket.cpp:840 +#: ../../locales/../src/engine/tlssocket.cpp:966 msgid "Remote certificate not trusted." msgstr "Fjernsertifikatet er ikkje tiltrudd." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2250 -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Remote file" msgstr "Fjernfil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3069 -#: ../../locales/../src/interface/search.cpp:370 -#: ../../locales/../src/interface/search.cpp:376 -#: ../../locales/../src/interface/search.cpp:385 -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:666 +#: ../../locales/../src/interface/search.cpp:671 msgid "Remote file search" msgstr "Fjernfilsøk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" msgstr "Fjernfilter:" -#: ../../locales/../src/interface/edithandler.cpp:1103 +#: ../../locales/../src/interface/edithandler.cpp:1092 msgid "Remote path" msgstr "Fjernfilbane" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:423 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6228,7 +6423,7 @@ "Klarer ikkje å tolka fjernbana. Sjå til at ho er ei gyldig, absolutt bane og " "at ho er støtta av tenartypen (%s) til den gjeldande nettstaden." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6237,49 +6432,49 @@ "Klarer ikkje å tolka fjernbana. Sjå til at ho er ei gyldig, absolutt bane og " "at ho er støtta av tenartypen (%s) på den overordna nettstaden." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:425 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1128 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Klarer ikkje å tolka fjernbana. Sjå til at ho er ei gyldig, absolutt bane." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Klarte ikkje å tolka fjernfilbana." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3184 msgid "Remote path handling:" msgstr "Fjernstibehandling" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1701 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 msgid "Remote path:" msgstr "Fjernfilbane:" -#: ../../locales/../src/interface/viewheader.cpp:524 +#: ../../locales/../src/interface/viewheader.cpp:523 msgid "Remote site:" msgstr "Fjernstad:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:448 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:463 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 msgid "Remove &all" msgstr "Fjern &alle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:457 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:475 msgid "Remove &selected" msgstr "Fjern &valde" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1396 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1173 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:287 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 msgid "Rename file" msgstr "Gje fila nytt namn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Rename selected directory" msgstr "Gje vald katalog nytt namn" @@ -6288,78 +6483,78 @@ msgid "Rename selected files and directories" msgstr "Gje nytt namn til valde filer og katalogar" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3477 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2447 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3344 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2349 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Gjev '%s' det nye namnet '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3560 msgid "Reporting bugs and feature requests" msgstr "Senda forslag og feilmeldingar" -#: ../../locales/../src/engine/proxy.cpp:370 +#: ../../locales/../src/engine/proxy.cpp:367 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Førespurnaden feila - klienten køyrer ikkje identd (eller tenaren kan ikkje " "nå han)" -#: ../../locales/../src/engine/proxy.cpp:373 +#: ../../locales/../src/engine/proxy.cpp:370 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Førespurnaden feila - klienten sin identd-prosess klarte ikkje å stadfesta " "brukaren sin ID-streng" -#: ../../locales/../src/engine/proxy.cpp:367 +#: ../../locales/../src/engine/proxy.cpp:364 msgid "Request rejected or failed" msgstr "Førespurnaden vart avvist eller feila" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:528 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:517 msgid "Require explicit FTP over TLS" msgstr "Krev eksplisitt FTP over TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:518 msgid "Require implicit FTP over TLS" msgstr "Krev implisitt FTP over TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Reset and requeue &all" msgstr "Nullstill og legg &alle i køen igjen" -#: ../../locales/../src/engine/socket.cpp:1187 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Resolved protocol is unknown" -msgstr "Protokollen er ukjend" +msgstr "Den funne protokollen er ukjend" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:470 +#: ../../locales/../src/engine/ControlSocket.cpp:1079 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:444 #, c-format msgid "Resolving address of %s" msgstr "Slår opp adressa til %s" -#: ../../locales/../src/engine/socket.cpp:1147 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Resource temporarily unavailable" msgstr "Ressursen er mellombels utilgjengeleg" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:279 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:345 msgid "Response:" msgstr "Svar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3130 msgid "Results:" msgstr "Resultat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1395 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1172 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" msgstr "Hald fram med filoverføringa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1233 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6367,19 +6562,19 @@ "Dersom tenaren bruker eit anna linjeendingsformat enn klienten kan ein få " "problem ved oppattaking av ASCII-filer." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1278 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:902 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1277 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:828 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Hentar kataloglista til \"%s\" …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1275 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:899 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1274 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825 msgid "Retrieving directory listing..." msgstr "Hentar kataloglista …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Hentar ekstern IP-adresse frå %s:" @@ -6388,21 +6583,21 @@ msgid "S&how files currently being edited..." msgstr "&Vis filer som blir endra no …" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 msgid "S&how the Site Manager on startup" msgstr "&Start med tilkoplingsstyraren" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Slå &av systemet" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" +msgstr "Slå &av systemet éin gong" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3000 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 msgid "S&top" msgstr "S&topp" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "D&valemodus" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" +msgstr "D&valemodus éin gong" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" @@ -6412,7 +6607,7 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:710 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 msgid "SOC&KS 4" msgstr "SOC&KS 4" @@ -6421,37 +6616,35 @@ msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4-mellomtenaren vil kopla seg til: %s" +#: ../../locales/../src/engine/proxy.cpp:169 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 kan ikkje nytta brukarnamn eller passord som er lengre enn 255 teikn." + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:864 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "Lagra innstillingane?" -#: ../../locales/../src/interface/manual_transfer.cpp:455 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:437 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 msgid "Saving of password has been disabled by your system administrator." msgstr "Systemadministratoren har slått av høvet til å lagra passord." -#: ../../locales/../src/interface/manual_transfer.cpp:457 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../locales/../src/interface/manual_transfer.cpp:439 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:987 msgid "Saving of passwords has been disabled by you." msgstr "Du har slått av høvet til å lagra passord." -#: ../../locales/../src/interface/QueueView.cpp:1754 -msgid "Scanning for files to add to queue" -msgstr "Søkjer etter filer som skal leggjast til i køen" - -#: ../../locales/../src/interface/QueueView.cpp:1756 -msgid "Scanning for files to upload" -msgstr "Søkjer etter filer som skal lastast opp" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3062 msgid "Search &conditions:" msgstr "Søkje&vilkår:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3044 msgid "Search &directory:" msgstr "Søkje&katalog:" @@ -6463,16 +6656,20 @@ msgid "Search server for files" msgstr "Søk i heile tenaren etter filer" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +msgid "Search type:" +msgstr "Søkjetype:" + +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Security information" msgstr "Tryggleiksopplysningar" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Sjå òg: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2375 msgid "Sele&ct server" msgstr "&Vel tenar" @@ -6480,16 +6677,16 @@ msgid "Select &page:" msgstr "Vel &side:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 msgid "Select Theme" msgstr "Vel drakt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "Vel standardhandlinga om målfila til overføringa allereie finst." -#: ../../locales/../src/interface/edithandler.cpp:1573 +#: ../../locales/../src/interface/edithandler.cpp:1537 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Vel føretrekt skriveprogram" @@ -6510,74 +6707,79 @@ "Vel standardhandlinga om målfila allereie finst. Valet gjeld berre for dei " "valde filene i køen." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 msgid "Select file containing private key" msgstr "Vel fila som inneheld privatnøkkelen" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Vel fil for eksporterte data" -#: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Vel fil for eksporterte filter" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1415 msgid "Select file for exported queue" msgstr "Vel fil for eksportert kø" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Vel fil for eksporterte innstillingar" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2126 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2265 msgid "Select file for exported sites" msgstr "Vel fil for eksporterte stader" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Vel kva fil du ønskjer å importere frå" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Vel fila som skal lastast opp" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +msgid "Select filename for converted key file" msgstr "Vel filnamn til den konverterte nøkkelfila" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2877 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2926 msgid "Select how these files should be opened." msgstr "Vel korleis desse filene skal opnast" -#: ../../locales/../src/interface/search.cpp:498 +#: ../../locales/../src/interface/search.cpp:847 msgid "Select target download directory" msgstr "Vel målet sin nedlastingskatalog" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Vel målfilnamn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 msgid "Select the categories to export:" msgstr "Vel kategoriane du vil eksportera:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1493 msgid "Select the private data you would like to delete." msgstr "Vel kva for private data du vil sletta." -#: ../../locales/../src/interface/search.cpp:465 +#: ../../locales/../src/interface/search.cpp:806 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Vald %d katalog med innhald for overføring" msgstr[1] "Vald %d katalogar med innhald for overføring" -#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d katalog er vald." msgstr[1] "%d katalogar er valde." -#: ../../locales/../src/interface/search.cpp:463 +#: ../../locales/../src/interface/search.cpp:804 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6585,63 +6787,63 @@ msgstr[1] "Vald %d filer for overføring." # var: Vald %d fil. Total storleik: %s -#: ../../locales/../src/interface/filelist_statusbar.cpp:58 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Vald %d fil. Storleik: %s" msgstr[1] "Vald %d filer. Total storleik: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:56 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "%d fil vald. Storleik: minst %s" msgstr[1] "%d filer valde. Total storleik: minst %s" -#: ../../locales/../src/interface/search.cpp:470 +#: ../../locales/../src/interface/search.cpp:810 #, c-format msgid "Selected %s and %s for transfer." msgstr "Vald %s og %s for overføring." -#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Vald %s og %s. Total storleik: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s og %s er valde. Total storleik: minst %s" -#: ../../locales/../src/interface/edithandler.cpp:1514 -#: ../../locales/../src/interface/edithandler.cpp:1593 +#: ../../locales/../src/interface/edithandler.cpp:1482 +#: ../../locales/../src/interface/edithandler.cpp:1556 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Det valde skriveprogrammet finst ikkje." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1854 msgid "Selected file already being edited" msgstr "Den valde fila er allereie i bruk" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 msgid "Selected file is already loaded" msgstr "Den valde fila er allereie lasta" -#: ../../locales/../src/interface/edithandler.cpp:1691 +#: ../../locales/../src/interface/edithandler.cpp:1654 msgid "Selected file is already opened" msgstr "Den valde fila er allereie opna" -#: ../../locales/../src/interface/edithandler.cpp:1740 +#: ../../locales/../src/interface/edithandler.cpp:1726 msgid "Selected file is still being edited" msgstr "Den valde fila blir framleis endra" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Selected filter only works for local files." msgstr "Det valde filteret gjeld berre for lokale filer." -#: ../../locales/../src/interface/menu_bar.cpp:307 +#: ../../locales/../src/interface/menu_bar.cpp:291 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6650,7 +6852,7 @@ "tenartype.\n" "Bruk nettstad-spesifikke bokmerke for denne tenaren." -#: ../../locales/../src/engine/engineprivate.cpp:285 +#: ../../locales/../src/engine/engineprivate.cpp:302 msgid "Selected port usually in use by a different protocol." msgstr "Den valde porten blir vanlegvis brukt av ein annan protokoll." @@ -6663,35 +6865,34 @@ msgstr "" "Send ein tilpassa kommando, som elles ikkje er tilgjengeleg, til tenaren" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267 msgid "Sending keep-alive command" msgstr "Sender vedlikehaldstilkoplingskommando" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:330 -#: ../../locales/../src/interface/verifycertdialog.cpp:197 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Serienummer:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:322 msgid "Server &Type:" msgstr "&Tenartype:" -#: ../../locales/../src/engine/tlssocket.cpp:726 +#: ../../locales/../src/engine/tlssocket.cpp:855 msgid "Server did not properly shut down TLS connection" msgstr "Tenaren lukka ikkje TLS-sambandet på rett vis" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:893 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:946 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:895 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:948 msgid "Server does not support non-ASCII characters." msgstr "Tenaren støttar berre ASCII-teikn." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4239 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4107 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Tenaren kan ikkje overføra filer på nytt om dei er større enn %dGB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4103 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6700,15 +6901,15 @@ "Tenaren kan ikkje overføra filer på nytt om dei er større enn %dGB. " "Avsluttar overføringa sidan filstorleiken samsvarer." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2494 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2433 msgid "Server does not support resume of files > 2GB." msgstr "Tenaren kan ikkje overføra filer på nytt om dei er større enn 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2429 msgid "Server does not support resume of files > 4GB." msgstr "Tenaren kan ikkje overføra filer på nytt om dei er større enn 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4250 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4116 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6717,7 +6918,7 @@ "Det kan vera at tenaren ikkje støttar oppattaking av filer > %d GB. " "Avsluttar overføringa sidan filene er like store." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:844 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6725,11 +6926,11 @@ "Det kan vera at tenaren krev ein konto. Prøv å laga ein konto i " "tilkoplingsstyraren." -#: ../../locales/../src/engine/ControlSocket.cpp:343 +#: ../../locales/../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "Tenaren sende attende ei tom filbane." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:641 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:599 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6737,13 +6938,13 @@ "Tenaren sende ein ekstra leietekst. Då må bruka den interaktive " "påloggingstypen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3803 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3671 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Tenaren sende eit passivsvar med ei adresse som ikkje kan rutast. " "Passivmodusen feila." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3797 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3666 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6751,55 +6952,59 @@ "Tenaren sende eit passivsvar med ei adresse som ikkje kan rutast. Bruker " "tenaradressa i staden for." -#: ../../locales/../src/interface/netconfwizard.cpp:419 -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:465 -#: ../../locales/../src/interface/netconfwizard.cpp:474 -#: ../../locales/../src/interface/netconfwizard.cpp:486 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Tenaren sende eit uventa svar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 +#: ../../locales/../src/engine/tlssocket.cpp:1239 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "Tenaren sende usortert sertifikatkjede. Dette bryt med TLS-krava" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "Server to client MAC:" msgstr "Maskinvareadresse tenar-klient" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2047 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2084 msgid "Server to client cipher:" msgstr "Krypteringsmetode tenar til klient:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2438 msgid "Server&type:" msgstr "&Tenartype" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Server/Local file" msgstr "Tenar / lokal fil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1718 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2361 msgid "Server:" msgstr "Tenar:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:166 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:431 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "Øktopplysningar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "Gje &forrang" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3625 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2326 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3492 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2230 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Vel tilgang for '%s' til '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:817 +#: ../../locales/../src/engine/transfersocket.cpp:794 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize blei kalla utan endepunkt" @@ -6807,7 +7012,15 @@ msgid "Settings" msgstr "Innstillingar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +msgid "Settings directory:" +msgstr "Innstillingskatalogen:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "Syn sprettopp&varsel" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" msgstr "Syn &rå katalogliste" @@ -6815,19 +7028,19 @@ msgid "Show &welcome dialog..." msgstr "Syn &velkomstvindauget …" -#: ../../locales/../src/interface/Mainfrm.cpp:2245 +#: ../../locales/../src/interface/Mainfrm.cpp:2207 msgid "Show both directory trees and continue comparing?" msgstr "Syna begge katalogtrea og halda fram med samanlikninga?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:217 msgid "Show details" msgstr "Syn detaljar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 msgid "Show details about custom date and time formats" msgstr "Syn detaljar om tilpassa dato- og tidsformat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:445 msgid "Shows available TLS ciphers" msgstr "Syner tilgjengelege TLS-krypteringsmetodar" @@ -6835,16 +7048,15 @@ msgid "Shows this help dialog" msgstr "Syner dette hjelpevindauget" -#: ../../locales/../src/interface/QueueView.cpp:3121 +#: ../../locales/../src/interface/QueueView.cpp:2585 msgid "Shutdown now" msgstr "Slå av no" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:346 msgid "Signature algorithm:" msgstr "Signaturalgoritme:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "Site &Manager entries" msgstr "&Oppføringar i tilkoplingsstyraren" @@ -6852,55 +7064,55 @@ msgid "Site Manager" msgstr "Tilkoplingsstyraren" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:993 msgid "Site Manager - Cannot remember password" msgstr "Tilkoplingsstyraren - kan ikkje hugsa passord" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:988 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:961 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:974 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1006 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1023 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1036 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1070 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1138 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "Site Manager - Invalid data" msgstr "Tilkoplingsstyraren - ugyldige data" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "Tilkoplingsstyraren er allereie opna" -#: ../../locales/../src/interface/sitemanager.cpp:443 -#: ../../locales/../src/interface/sitemanager.cpp:457 -#: ../../locales/../src/interface/sitemanager.cpp:471 -#: ../../locales/../src/interface/sitemanager.cpp:539 -#: ../../locales/../src/interface/sitemanager.cpp:734 -#: ../../locales/../src/interface/sitemanager.cpp:814 +#: ../../locales/../src/interface/sitemanager.cpp:481 +#: ../../locales/../src/interface/sitemanager.cpp:509 +#: ../../locales/../src/interface/sitemanager.cpp:523 +#: ../../locales/../src/interface/sitemanager.cpp:535 +#: ../../locales/../src/interface/sitemanager.cpp:691 +#: ../../locales/../src/interface/sitemanager.cpp:768 msgid "Site does not exist." msgstr "Nettstaden finst ikkje." -#: ../../locales/../src/interface/sitemanager.cpp:426 +#: ../../locales/../src/interface/sitemanager.cpp:492 msgid "Site path has to begin with 0 or 1." msgstr "Nettstadstien må begynna med 0 eller 1." -#: ../../locales/../src/interface/sitemanager.cpp:464 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager.cpp:529 +#: ../../locales/../src/interface/sitemanager.cpp:685 +#: ../../locales/../src/interface/sitemanager.cpp:762 msgid "Site path is malformed." msgstr "Nettstadbana er ikkje velforma" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:260 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:250 msgid "Site-specific bookmarks" msgstr "Nettstadspesifikke bokmerke" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:538 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:528 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6909,11 +7121,11 @@ "Nettspesifikke bokmerke krev at tenaren er lagra i tilkoplingsstyraren.\n" "Vil du leggja til den gjeldande tilkoplinga?" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Size" msgstr "Storleik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1583 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 msgid "Size formatting" msgstr "Storleiksformatering" @@ -6921,50 +7133,50 @@ msgid "Size unknown" msgstr "Ukjend storleik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1174 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1195 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1436 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "Hopp over fila" -#: ../../locales/../src/engine/ControlSocket.cpp:1132 #: ../../locales/../src/engine/ControlSocket.cpp:1149 -#: ../../locales/../src/engine/ControlSocket.cpp:1173 -#: ../../locales/../src/engine/ControlSocket.cpp:1234 +#: ../../locales/../src/engine/ControlSocket.cpp:1166 +#: ../../locales/../src/engine/ControlSocket.cpp:1190 +#: ../../locales/../src/engine/ControlSocket.cpp:1268 #, c-format msgid "Skipping download of %s" msgstr "Hoppar over nedlastinga av %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1136 -#: ../../locales/../src/engine/ControlSocket.cpp:1152 -#: ../../locales/../src/engine/ControlSocket.cpp:1177 -#: ../../locales/../src/engine/ControlSocket.cpp:1238 +#: ../../locales/../src/engine/ControlSocket.cpp:1153 +#: ../../locales/../src/engine/ControlSocket.cpp:1169 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping upload of %s" msgstr "Hoppar over opplastinga av %s" -#: ../../locales/../src/engine/socket.cpp:1151 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Socket address outside address space" msgstr "Endepunktsadressa er utanfor adresseområdet" -#: ../../locales/../src/engine/socket.cpp:1153 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Socket already connected" msgstr "Endepunktet er allereie tilkopla" -#: ../../locales/../src/engine/socket.cpp:1161 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Socket has been shut down" msgstr "Endepunktet er vorte slått av" -#: ../../locales/../src/engine/socket.cpp:1158 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket not connected" msgstr "Endepunktet er ikkje tilkopla" -#: ../../locales/../src/engine/socket.cpp:1200 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "Socket type not supported for address family" msgstr "Adressefamilien støttar ikkje endepunktstypen" -#: ../../locales/../src/interface/Mainfrm.cpp:1199 +#: ../../locales/../src/interface/Mainfrm.cpp:1155 msgid "Some files are still being edited or need to be uploaded." msgstr "Somme filer er framleis opne eller treng å bli lasta opp." @@ -6978,31 +7190,31 @@ "kanskje svara med den lokale IP-adressa deira." # inline? -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 msgid "Sort directories inline" msgstr "Sorter katalogane" -#: ../../locales/../src/interface/filelistctrl.cpp:460 +#: ../../locales/../src/interface/filelistctrl.cpp:469 msgid "Sort order cannot be changed if comparing directories." msgstr "Ein kan ikkje endra sorteringsrekkjefølgja ved katalogsamanlikning." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1700 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 msgid "Sorting" msgstr "Sorterer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1707 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 msgid "Sorting &mode:" msgstr "Sorterings&måte:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:104 msgid "Source and path of the drop operation are identical" msgstr "Kjelda og bana til sleppe-handlinga er like" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "Kjelde- og målfila kan ikkje vera like" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:144 msgid "Source and target of the drop operation are identical" msgstr "Kjelda og målet til sleppe-handlinga er like" @@ -7010,37 +7222,37 @@ msgid "Source file:" msgstr "Kjeldefil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3782 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 msgid "Speed Limits" msgstr "Fartsgrenser" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:873 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 msgid "Speed limits" msgstr "Fartsgrenser" -#: ../../locales/../src/interface/statusbar.cpp:573 +#: ../../locales/../src/interface/statusbar.cpp:575 msgid "Speed limits are disabled, click to change." msgstr "Fartsavgrensing er slått av. Klikk for å endra." -#: ../../locales/../src/interface/statusbar.cpp:576 +#: ../../locales/../src/interface/statusbar.cpp:578 msgid "Speed limits are enabled, click to change." msgstr "Fartsavgrensing er slått på. Klikk for å endra." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 msgid "Stable and beta versions" msgstr "Stabile og beta-utgåver" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2047 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 msgid "Stable versions only" msgstr "Berre stabile utgåver" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 msgid "Stable, beta and nightly versions" msgstr "Stabile, beta- og nattutgåver" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2569 msgid "Start transfer &immediately" msgstr "Start overføringa &no" @@ -7048,19 +7260,19 @@ msgid "Start with opened Site Manager" msgstr "Start med open tilkoplingsstyrar" -#: ../../locales/../src/interface/updater.cpp:207 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" msgstr "Starta oppdateringskontrollen hos %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2196 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1544 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2152 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1485 #, c-format msgid "Starting download of %s" msgstr "Begynner nedlastinga av %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2199 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1547 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2155 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1488 #, c-format msgid "Starting upload of %s" msgstr "Begynner opplastinga av %s" @@ -7069,31 +7281,34 @@ msgid "Starts the local site in the given path" msgstr "Startar den lokale staden med den gjevne bana" -#: ../../locales/../src/interface/verifycertdialog.cpp:191 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "Stat/fylke eller provins:" -#: ../../locales/../src/interface/edithandler.cpp:1104 -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1093 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Status" msgstr "Status" -#: ../../locales/../src/engine/logging.cpp:108 -#: ../../locales/../src/interface/StatusView.cpp:288 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:369 msgid "Status:" msgstr "Status:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "Stopp og fjern &alle" -#: ../../locales/../src/interface/verifycertdialog.cpp:195 +#: ../../locales/../src/interface/recursive_operation_status.cpp:42 +msgid "Stop recursive operation" +msgstr "Slå av rekursiv handling" + +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Gate:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:381 msgid "Subject of certificate" msgstr "Sertifikat utferda til" @@ -7105,11 +7320,11 @@ msgid "Summary of test results:" msgstr "Samandrag av prøveresultat:" -#: ../../locales/../src/interface/QueueView.cpp:3129 +#: ../../locales/../src/interface/QueueView.cpp:2593 msgid "Suspend now" msgstr "Gå i kvile no" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7117,28 +7332,33 @@ "Symbolske lenkjer til filer er ikkje berørte av dette valet, slike " "symlenkjer blir alltid sletta." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3843 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:264 -#: ../../locales/../src/interface/state.cpp:278 -#: ../../locales/../src/interface/state.cpp:284 -#: ../../locales/../src/interface/state.cpp:294 -#: ../../locales/../src/interface/state.cpp:385 -#: ../../locales/../src/interface/state.cpp:393 -#: ../../locales/../src/interface/state.cpp:401 -#: ../../locales/../src/interface/state.cpp:977 -#: ../../locales/../src/interface/state.cpp:986 -#: ../../locales/../src/interface/state.cpp:993 -#: ../../locales/../src/interface/state.cpp:1004 -#: ../../locales/../src/interface/state.cpp:1011 +#: ../../locales/../src/interface/state.cpp:232 +#: ../../locales/../src/interface/state.cpp:246 +#: ../../locales/../src/interface/state.cpp:252 +#: ../../locales/../src/interface/state.cpp:262 +#: ../../locales/../src/interface/state.cpp:349 +#: ../../locales/../src/interface/state.cpp:357 +#: ../../locales/../src/interface/state.cpp:365 +#: ../../locales/../src/interface/state.cpp:949 +#: ../../locales/../src/interface/state.cpp:957 +#: ../../locales/../src/interface/state.cpp:963 +#: ../../locales/../src/interface/state.cpp:972 +#: ../../locales/../src/interface/state.cpp:998 msgid "Synchronized browsing" msgstr "Synkronisert blaing" -#: ../../locales/../src/interface/state.cpp:400 +#: ../../locales/../src/interface/state.cpp:364 msgid "Synchronized browsing has been disabled." msgstr "Synkronisert blaing er slått av" -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:123 +#: ../../locales/../src/interface/recursive_operation_status.cpp:109 +msgid "Synchronizing directories." +msgstr "Synkroniserer katalogar." + +#: ../../locales/../src/interface/quickconnectbar.cpp:84 +#: ../../locales/../src/interface/quickconnectbar.cpp:121 msgid "Syntax error" msgstr "Syntaksfeil" @@ -7147,8 +7367,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 -#: ../../locales/../src/interface/Mainfrm.cpp:2400 +#: ../../locales/../src/interface/Mainfrm.cpp:2318 +#: ../../locales/../src/interface/Mainfrm.cpp:2361 msgid "Syntax error in command line" msgstr "Syntaksfeil i kommandolinja" @@ -7156,11 +7376,15 @@ msgid "System" msgstr "System" -#: ../../locales/../src/engine/socket.cpp:1142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +msgid "System details" +msgstr "Systemdetaljar" + +#: ../../locales/../src/engine/socket.cpp:1033 msgid "System limit of open files exceeded" msgstr "Systemgrensa for opne filer er overskriden" -#: ../../locales/../src/engine/socket.cpp:1198 +#: ../../locales/../src/engine/socket.cpp:1090 msgid "System's network subsystem has failed" msgstr "Systemet sitt nettverksundersystem har feila" @@ -7168,19 +7392,19 @@ msgid "T&oolbar" msgstr "&Verktøylinje" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:313 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:287 msgid "TLS connection established, sending HTTP request" msgstr "TLS-tilkoplinga er oppretta, sender HTTP-førespurnad" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS-sambandet er oppretta, ventar på velkomstmeldinga …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 msgid "TLS connection established." msgstr "TLS-sambandet er oppretta." -#: ../../locales/../src/engine/proxy.cpp:501 +#: ../../locales/../src/engine/proxy.cpp:490 msgid "TTL expired" msgstr "TTL er gått ut" @@ -7192,27 +7416,35 @@ msgid "Target file:" msgstr "Målfil:" -#: ../../locales/../src/interface/RemoteListView.cpp:2728 +#: ../../locales/../src/interface/RemoteListView.cpp:2630 msgid "Target filename already exists!" msgstr "Filnamnet finst allereie." -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1613 msgid "Target filename already exists, really continue?" msgstr "Målfila finst allereie. Vil du verkeleg halda fram?" -#: ../../locales/../src/engine/socket.cpp:1171 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Temporary failure in name resolution" msgstr "Mellombels svikt i namneløysinga" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Vellykka test" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Prøveresultat" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4121 msgid "Testing resume capabilities of server" msgstr "Testar oppattakingseigenskapane til tenaren" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:745 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "Tilkoplingsstyraren kan ikkje nyttast før fila vert vøla." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7221,7 +7453,7 @@ "Tilkoplingsstyraren er open i ein annan instans av FileZilla 3.\n" "Vil du halda fram? Då vil ikkje endringar i tilkoplingsstyraren bli lagra." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7229,34 +7461,29 @@ "Tilkoplingsstyraren er open i ein annan instans av FileZilla 3.\n" "Lukk han, elles vil ikkje dataa kunne slettast." -#: ../../locales/../src/interface/xmlfunctions.cpp:386 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "XML-dokumentet er ikkje velforma: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:634 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Adressa du skreiv inn var: %s" -#: ../../locales/../src/engine/socket.cpp:1177 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "The ai_family member is not supported" -msgstr "Ai-familiemedlemmen er ikkje støtta" +msgstr "Ai_family-medlemmen er ikkje støtta" -#: ../../locales/../src/engine/socket.cpp:1190 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "The ai_socktype member is not supported" msgstr "Ai_socktype-medlemmen er ikkje støtta" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:807 -#: ../../locales/../src/interface/sitemanager.cpp:714 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:781 +#: ../../locales/../src/interface/sitemanager.cpp:673 msgid "The bookmark could not be added." msgstr "Klarte ikkje å leggja til bokmerket." -#: ../../locales/../src/interface/sitemanager.cpp:796 +#: ../../locales/../src/interface/sitemanager.cpp:750 msgid "The bookmarks could not be cleared." msgstr "Klarte ikkje å tømma bokmerka." -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../locales/../src/interface/statusbar.cpp:464 msgid "The connection is encrypted. Click icon for details." msgstr "Sambandet er kryptert. Klikk på ikonet for fleire detaljar." @@ -7278,18 +7505,18 @@ "Det tilpassa tidsformatet er ugyldig eller inneheld ikkje-støtta " "formatspesifikasjonar." -#: ../../locales/../src/engine/transfersocket.cpp:164 +#: ../../locales/../src/engine/transfersocket.cpp:142 #, c-format msgid "The data connection could not be established: %s" msgstr "Klarte ikkje å kopla til datasambandet: %s" # skriv ikkje ut heile setninga -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2895 -#: ../../locales/../src/interface/edithandler.cpp:1553 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 +#: ../../locales/../src/interface/edithandler.cpp:1517 msgid "The default editor for text files could not be found." msgstr "Fann ikkje det førehandsvalde skriveprogrammet." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2937 #, c-format msgid "The default editor for text files is '%s'." msgstr "Førehandsvalt skriveprogram for tekstfiler er '%s'." @@ -7300,13 +7527,13 @@ msgid "The entered filter name already exists, please choose a different name." msgstr "Filternamnet du skreiv finst allereie. Vel eit anna namn." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Utvidinga'%s' finst allereie i lista" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:278 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:284 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 #, c-format msgid "" "The file %s already exists.\n" @@ -7315,8 +7542,8 @@ "Fila %s finst allereie.\n" "Skriv eit anna namn:" -#: ../../locales/../src/interface/edithandler.cpp:1664 -#: ../../locales/../src/interface/LocalListView.cpp:1719 +#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7327,19 +7554,28 @@ "Fann ikkje det tilknytte programmet (%s).\n" "Sjå over filtypetilknytingane dine." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"Fila '%s' inneheld ein SSH1-nøkkel. SSH1-protokollen er ikkje lenger i bruk. " +"FileZilla kan berre nytta SSH2-nøklar." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" "Klarte ikkje å lasta fila '%s' eller ho inneheld ikkje ein privatnøkkel." -#: ../../locales/../src/interface/xmlfunctions.cpp:40 +#: ../../locales/../src/interface/xmlfunctions.cpp:41 #, c-format msgid "The file '%s' could not be loaded." -msgstr "Klarte ikkje å laste fila '%s'." +msgstr "Klarte ikkje å lasta fila '%s'." -#: ../../locales/../src/interface/edithandler.cpp:1659 -#: ../../locales/../src/interface/LocalListView.cpp:1715 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1732 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7348,8 +7584,8 @@ "Klarte ikkje å opna fila '%s':\n" "Ikkje noko program på systemet ditt er knytt til denne filtypen." -#: ../../locales/../src/interface/edithandler.cpp:1753 -#: ../../locales/../src/interface/LocalListView.cpp:1727 +#: ../../locales/../src/interface/edithandler.cpp:1739 +#: ../../locales/../src/interface/LocalListView.cpp:1744 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7358,20 +7594,19 @@ "Klarte ikkje å opna fila '%s':\n" "Den tilknytte kommandoen feila" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:752 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" msgstr "" -"Fila '%s' er ikkje i eit format som FileZilla støttar.\n" -"Fila er òg passordbeskytta. Passordbeskytta nøkkelfiler er enno ikkje støtta " -"av FileZilla.\n" -"Vil du konvertera til eit støtta, men ikkje-beskytta format?" +"Fila '%s'er laga av ei nyare utgåve av FileZilla.\n" +"Å lasta filer laga av nyare utgåver kan føra med seg datatap.\n" +"Vil du halda fram?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7380,22 +7615,11 @@ "Fila '%s' er ikkje i eit format som FileZilla støttar.\n" "Vil du konvertera ho til eit støtta format?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"Fila '%s' er passordbeskytta. FileZilla støttar enno ikkje passordbeskytta " -"nøkkelfiler.\n" -"Vil du endra fila til å vera ubeskytta?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Vald skriveprogram finst ikkje." -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7409,11 +7633,11 @@ "passord bli importerte.\n" "Vil du halda fram med importen?" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Filnamnkolonnen kan verken skjulast eller flyttast." -#: ../../locales/../src/interface/listctrlex.cpp:805 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "Filnamnkolonnen kan ikkje skjulast." @@ -7427,19 +7651,19 @@ msgid "The following characters will be replaced: %s" msgstr "Dei følgjande teikna vil bli bytta ut: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 msgid "The following files are currently being edited:" msgstr "Dei følgjande filene held på å bli endra no:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3433 msgid "The free open source FTP solution" msgstr "Den frie og opne FTP-løysinga" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:293 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:283 msgid "The global bookmarks could not be saved." msgstr "Klarte ikkje å lagra dei globale bokmerka." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2241 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7452,7 +7676,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Grensa må vera mellom 1 og 2000 MiB" -#: ../../locales/../src/interface/state.cpp:275 +#: ../../locales/../src/interface/state.cpp:998 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Klarte ikkje å laga lokalkatalogen '%s'." + +#: ../../locales/../src/interface/state.cpp:983 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "Lokalkatalogen '%s' finst ikkje." + +#: ../../locales/../src/interface/state.cpp:243 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7462,7 +7696,7 @@ "Vil du slå av den synkroniserte blainga og halda fram med å endra " "lokalkatalogen?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7470,19 +7704,24 @@ "Den lågast tilgjengelege porten må vera lågare eller lik med den høgste " "tilgjengelege porten." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Klarte ikkje å lasta ned den nye utgåva; prøv igjen seinare." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Den nye utgåva vart lagra i nedlastingskatalogen din." -#: ../../locales/../src/interface/QueueView.cpp:1878 +#: ../../locales/../src/interface/QueueView.cpp:1451 msgid "The queue will not be saved." msgstr "Køen vil ikkje bli lagra." -#: ../../locales/../src/interface/state.cpp:983 +#: ../../locales/../src/interface/state.cpp:911 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Fjernkatalogen '%s' finst ikkje." + +#: ../../locales/../src/interface/state.cpp:954 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7492,27 +7731,27 @@ "Vil du slå av den synkroniserte blainga og halda fram med å endra " "fjernkatalogen?" -#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Dei valde elementa er blitt importerte." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1603 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1624 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Den valde fila inneheld data som kan importerast for desse kategoriane:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1767 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1861 msgid "The selected file is already being edited:" msgstr "Den valde fila er allereie i bruk:" -#: ../../locales/../src/interface/edithandler.cpp:1740 +#: ../../locales/../src/interface/edithandler.cpp:1726 msgid "" "The selected file is still opened in some other program, please close it." msgstr "Den valde fila er opna av eit anna program. Lukk det." -#: ../../locales/../src/interface/edithandler.cpp:1669 +#: ../../locales/../src/interface/edithandler.cpp:1632 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7522,15 +7761,15 @@ "Dette kan vera farleg og kan skada systemet ditt.\n" "Vil du verkeleg halda fram?" -#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:576 msgid "The server could not be added." msgstr "Klarte ikkje å leggja til tenaren." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Tenaren sende eit uventa eller ukjend svar." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "The server uses following charset encoding for filenames:" msgstr "Tenaren bruker denne teiknkodinga på filnamn:" @@ -7542,7 +7781,7 @@ "Tenarsertifikatet er ukjend. Sjå nøye over det for å sikra at ein kan stola " "på tenaren." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:934 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7552,7 +7791,7 @@ "betyr anten at administratoren har endra vertsnøkkelen eller at du faktisk " "prøver å kopla deg til ei anna maskin som gjer seg ut for å vera tenaren." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7560,11 +7799,15 @@ "Tenaren sin vertsnøkkel er ukjend. Du kan ikkje vera trygg på at tenaren er " "den maskina han gjev seg ut for å vera." -#: ../../locales/../src/engine/socket.cpp:1189 +#: ../../locales/../src/engine/tlssocket.cpp:1324 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Vertsnamnet til tenaren samsvarer ikkje med sertifikatet sitt" + +#: ../../locales/../src/engine/socket.cpp:1081 msgid "The servname parameter is not supported for ai_socktype" -msgstr "Tenarparameteren er ikkje støtta for ai_sock-typen" +msgstr "Ai_socktype støttar ikkje parameteren servname" -#: ../../locales/../src/interface/import.cpp:63 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7572,19 +7815,19 @@ "Innstillingane er blitt importerte. Du må starta om att FileZilla for at dei " "skal bli tekne i bruk." -#: ../../locales/../src/engine/socket.cpp:1138 +#: ../../locales/../src/engine/socket.cpp:1029 msgid "The specified address family is not supported" msgstr "Den oppgjevne adressefamilen er ikkje støtta" -#: ../../locales/../src/engine/socket.cpp:1202 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "The specified network name is no longer available" msgstr "Det oppgjevne nettverksnamnet er ikkje lenger tilgjengeleg" -#: ../../locales/../src/interface/QueueView.cpp:3124 +#: ../../locales/../src/interface/QueueView.cpp:2588 msgid "The system will soon reboot unless you click Cancel." msgstr "Systemet vil starta om att om du ikkje trykkjer Avbryt." -#: ../../locales/../src/interface/QueueView.cpp:3120 +#: ../../locales/../src/interface/QueueView.cpp:2584 msgid "The system will soon shut down unless you click Cancel." msgstr "Systemet vil snart takast ned om du ikkje trykkjer Avbryt." @@ -7597,11 +7840,11 @@ "Vel ei handling." # Prøven feila? -#: ../../locales/../src/interface/netconfwizard.cpp:864 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Testen feila. Vil du verkeleg lagra innstillingane?" -#: ../../locales/../src/interface/xmlfunctions.cpp:76 +#: ../../locales/../src/interface/xmlfunctions.cpp:77 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Klarte ikkje å føra attende den gyldige tryggleikskopifila %s" @@ -7610,15 +7853,15 @@ msgid "Themes" msgstr "Drakter" -#: ../../locales/../src/interface/filter.cpp:445 +#: ../../locales/../src/interface/filter.cpp:326 msgid "This filter set cannot be removed." msgstr "Denne filtersamlinga kan ikkje fjernast." -#: ../../locales/../src/interface/filter.cpp:385 +#: ../../locales/../src/interface/filter.cpp:266 msgid "This filter set cannot be renamed." msgstr "Denne filtersamlinga kan ikkje få nytt namn." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7641,11 +7884,11 @@ "Denne rettleiaren vil hjelpa deg å stilla inn kvar rutar eller brannmur du " "måtte ha. Han vil òg testa innstillingane." -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Time" msgstr "Tid" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 msgid "Time formatting" msgstr "Tidsformatering" @@ -7654,28 +7897,25 @@ msgstr "Tids&avbrot i sekund:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Tidsavbrot" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1667 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1626 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:933 #, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Tidssoneforskyving: Tenar: %d sekund. Lokalt: %d sekund. Skilnad: %d sekund." +msgid "Timezone offset of server is %d seconds." +msgstr "Tidssoneforskyvinga til tenaren er %d sekund." -#: ../../locales/../src/interface/verifycertdialog.cpp:189 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Tittel:" -#: ../../locales/../src/interface/Mainfrm.cpp:2243 +#: ../../locales/../src/interface/Mainfrm.cpp:2205 msgid "To compare directories, both file lists have to be aligned." msgstr "Begge fillistene må vera justerte saman for å samanlikna dei." -#: ../../locales/../src/interface/Mainfrm.cpp:2244 +#: ../../locales/../src/interface/Mainfrm.cpp:2206 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "For å kunna gjera dette må begge katalogtrea anten synast eller skjulast." @@ -7739,27 +7979,27 @@ msgid "Toggles the display of the transfer queue" msgstr "Slår av/på visinga av overføringskøen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:574 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:547 msgid "Too long header line" msgstr "Filhovudet er for langt" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:622 msgid "Too many redirects" msgstr "For mange vidaresendingar" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:282 -#: ../../locales/../src/interface/StatusView.cpp:349 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:355 msgid "Trace:" msgstr "Sporing:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1803 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 msgid "Transfer" msgstr "Overfør" # Strengen MÅ vera kort -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2225 msgid "Transfer &direction" msgstr "Overførings&retning" @@ -7771,26 +8011,26 @@ msgid "Transfer Mode" msgstr "Overføringsmodus" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Transfer Queue" msgstr "Overføringskø" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "Transfer Settings" msgstr "Overføringsinnstillingar" -#: ../../locales/../src/engine/transfersocket.cpp:489 -#: ../../locales/../src/engine/transfersocket.cpp:511 +#: ../../locales/../src/engine/transfersocket.cpp:444 +#: ../../locales/../src/engine/transfersocket.cpp:466 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Overføringssambandet blei lukka: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Dei overførte dataa blei endra (\"tainted\")." -#: ../../locales/../src/interface/queue.cpp:391 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:339 +#: ../../locales/../src/interface/statuslinectrl.cpp:245 msgid "Transferring" msgstr "Overfører" @@ -7799,46 +8039,45 @@ msgstr "Overføringar" # Strengen MÅ vera kort? -#: ../../locales/../src/interface/QueueView.cpp:3020 -#: ../../locales/../src/interface/QueueView.cpp:3023 +#: ../../locales/../src/interface/QueueView.cpp:2477 msgid "Transfers finished" msgstr "Overføringane er ferdige" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1116 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 msgid "Treat files &without extension as ASCII file" msgstr "Behandla filer &utan filtype som ASCII-fil" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 msgid "Treat the &following filetypes as ASCII files:" msgstr "Behandla &desse filtypane som ASCII-filer:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:734 msgid "Trust changed Hostkey:" msgstr "Stol på den endra vertsnøkkelen:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:806 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:732 msgid "Trust new Hostkey:" msgstr "Stol på den nye vertsnøkkelen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 msgid "Trust the new key and carry on connecting?" msgstr "Stoler du på den nye nøkkelen og vil du halda fram med tilkoplinga?" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:232 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" msgstr "Stoler du på dette sertifikatet og vil du halda fram med tilkoplinga?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:872 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 msgid "Trust this host and carry on connecting?" msgstr "Stoler du på denne verten og vil du halda fram med tilkoplinga?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:127 +#: ../../locales/../src/interface/resources/xrc/update.xrc:204 msgid "Try again" msgstr "Prøv igjen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 -#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 +#: ../../locales/../src/interface/edithandler.cpp:1091 msgid "Type" msgstr "Type" @@ -7846,51 +8085,51 @@ msgid "Type of FTP Proxy:" msgstr "Type FTP-mellomtenar:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:695 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 msgid "Type of generic proxy:" msgstr "Type generisk mellomtenar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1942 msgid "U&pload" msgstr "&Opplasting" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3543 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Opp&lastingsgrense:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1933 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 msgid "U&se filetype associations if available" msgstr "Bruk filtype&tilknyting om mogleg" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1526 -msgid "U&se system defaults" -msgstr "Bruk syst&emstandardane" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +msgid "U&se system defaults for current language" +msgstr "&Bruk systemverdiane for det gjeldande språket" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "BRUKAR@VE&RT" -#: ../../locales/../src/engine/proxy.cpp:376 -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:373 +#: ../../locales/../src/engine/proxy.cpp:499 #, c-format msgid "Unassigned error code %d" msgstr "Utildelt feilkode %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:188 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Eining:" -#: ../../locales/../src/interface/edithandler.cpp:1134 -#: ../../locales/../src/interface/edithandler.cpp:1162 +#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Unknown" msgstr "Ukjent" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:687 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:690 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Ukjend FTP-mellomlagertype. Klarer ikkje å laga påloggingssekvens." -#: ../../locales/../src/engine/proxy.cpp:426 +#: ../../locales/../src/engine/proxy.cpp:421 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Ukjend SOCKS-protokollutgåve: %d" @@ -7899,21 +8138,12 @@ msgid "Unknown certificate" msgstr "Sertifikatet er ukjent" -#: ../../locales/../src/interface/xmlfunctions.cpp:377 -#: ../../locales/../src/interface/xmlfunctions.cpp:389 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" -"Ukjend feil ved opninga av fila. Sjå til at ein har tilgang til fila og at " -"ho er eit velforma XML-dokument." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "Ukjend vertsnøkkel" # upresist!? -#: ../../locales/../src/engine/proxy.cpp:435 +#: ../../locales/../src/engine/proxy.cpp:429 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7921,13 +8151,13 @@ msgstr "" "Ukjend protokollutgåve av SOCKS brukarnamn-/passordautentiseringsdialogen: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:417 +#: ../../locales/../src/interface/xmlfunctions.cpp:294 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "Ukjend rotelement. Det ser ikkje ut til at fila er laga av FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:612 -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7935,7 +8165,7 @@ "Dersom ikkje desse problema blir ordna, vil ikkje FTP-aktivmodus verka og " "ein må nytta passivmodus." -#: ../../locales/../src/interface/netconfwizard.cpp:599 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7943,15 +8173,15 @@ "Dersom ikkje problemet blir ordna, vil ikkje FTP-aktivmodusen verka og ein " "må nytta passivmodus." -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1263 msgid "Unsupported certificate type" msgstr "Sertifikattypen er ikkje støtta" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:634 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:607 msgid "Unsupported redirect" msgstr "Ustøtta vidaresending" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1948 msgid "Up&load and unedit" msgstr "Last &opp utan å lagra ikkje endringa(ne)" @@ -7960,24 +8190,29 @@ msgid "Updates" msgstr "Oppdateringar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2239 msgid "Upload" msgstr "Last opp" -#: ../../locales/../src/interface/edithandler.cpp:1125 +#: ../../locales/../src/interface/edithandler.cpp:1114 msgid "Upload failed" msgstr "Opplastinga feila" -#: ../../locales/../src/interface/statusbar.cpp:584 +#: ../../locales/../src/interface/statusbar.cpp:586 #, c-format msgid "Upload limit: %s/s" msgstr "Opplastingsgrense: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:588 msgid "Upload limit: none" msgstr "Opplastingsgrense: inga" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3249 +#: ../../locales/../src/interface/search.cpp:873 +msgid "Upload search results" +msgstr "Last opp søkjeresultata" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "Upload selected directory" msgstr "Last opp vald katalog" @@ -7985,72 +8220,72 @@ msgid "Upload selected files and directories" msgstr "Lasta opp valde filer og katalogar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1753 msgid "Upload this file back to the server?" msgstr "Lasta opp fila tilbake til tenaren?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 msgid "Upload this file to the server?" msgstr "Lasta opp denne fila til tenaren?" -#: ../../locales/../src/interface/edithandler.cpp:1119 -#: ../../locales/../src/interface/edithandler.cpp:1153 -#: ../../locales/../src/interface/edithandler.cpp:1318 +#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1298 msgid "Uploading" msgstr "Lastar opp" -#: ../../locales/../src/interface/edithandler.cpp:1122 -#: ../../locales/../src/interface/edithandler.cpp:1320 +#: ../../locales/../src/interface/edithandler.cpp:1111 +#: ../../locales/../src/interface/edithandler.cpp:1300 msgid "Uploading and pending removal" msgstr "Lastar opp og ventar på fjerning" -#: ../../locales/../src/interface/edithandler.cpp:1156 -#: ../../locales/../src/interface/edithandler.cpp:1322 +#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/edithandler.cpp:1302 msgid "Uploading and unediting" msgstr "Lasta opp utan å lagra endringane" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:558 msgid "Use &custom charset" msgstr "Bruk tilpassa &teiknkoding" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1897 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Use &custom editor:" msgstr "&Eige skriveprogram:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2882 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2931 msgid "Use &default editor for text files" msgstr "&Bruk det førehandvalde skriveprogrammet på tekstfiler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2672 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2746 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2709 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2790 msgid "Use &synchronized browsing" msgstr "Br&uk synkronisert blaing" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:467 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:546 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "Bruk UTF-8 dersom tenaren støttar det, elles bruk lokal teiknkoding." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1389 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 msgid "Use default action" msgstr "Bruk standardhandlinga" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:527 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 msgid "Use explicit FTP over TLS if available" msgstr "Bruk eksplisitt FTP over TLS om mogleg" # var: Bruk tenaren som no er tilkopla til /* originalen uklår */ -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2344 msgid "Use server currently connected to" msgstr "Bruk tenaren som no er tilkopla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2350 msgid "Use server from site manager" msgstr "Bruk tenar frå tilkoplingsstyraren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1477 -msgid "Use system &defaults" -msgstr "Bruk syste&mstandardane" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +msgid "Use system &defaults for current language" +msgstr "Bruk &systemverdiane for det gjeldande språket" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8086,28 +8321,21 @@ msgid "User:" msgstr "Brukar:" -#: ../../locales/../src/interface/manual_transfer.cpp:518 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 +#: ../../locales/../src/interface/manual_transfer.cpp:495 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 msgid "Username cannot be a series of spaces" msgstr "Brukarnamnet kan ikkje vera ei rekkje av mellomrom" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 -#, c-format -msgid "Using proxy %s" -msgstr "Bruker mellomtenaren %s" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:507 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:586 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "Bruk av feil teiknkoding kan medføra at filnamn ikkje blir viste rett." #: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:314 msgid "Valid from:" msgstr "Gyldig frå:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:322 msgid "Valid to:" msgstr "Gyldig til:" @@ -8115,27 +8343,23 @@ msgid "Verbose log messages from wxWidgets" msgstr "Fulle loggmeldingar frå wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1096 +#: ../../locales/../src/engine/tlssocket.cpp:1356 msgid "Verifying certificate..." msgstr "Stadfestar sertifikatet …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -msgid "Version:" -msgstr "Utgåve:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "Veldig høg" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1406 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1396 msgid "View hidden option set, but unsupported by server" msgstr "Vis skjult-valet er i bruk, men ikkje støtta av tenaren." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1805 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 msgid "View/Edit" msgstr "Vis/endra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2141 msgid "Visible columns" msgstr "Synlege kolonnar" @@ -8143,57 +8367,23 @@ msgid "W&rite" msgstr "&Lagra" -#: ../../locales/../src/interface/QueueView.cpp:1713 -msgid "Waiting" -msgstr "Ventar" - -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Ventar på samband" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Ventar på passord" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:239 msgid "Waiting for transfer to be cancelled" msgstr "Ventar på at overførings skal avbrytast" -#: ../../locales/../src/engine/engineprivate.cpp:216 +#: ../../locales/../src/engine/engineprivate.cpp:240 msgid "Waiting to retry..." msgstr "Ventar på å få forsøkja igjen …" -#: ../../locales/../src/interface/FileZilla.cpp:301 -msgid "" -"Warning!\n" -"\n" -"A bug in Windows causes problems with FileZilla\n" -"\n" -"The bug occurs if you have\n" -"- Windows Server 2003 or XP 64\n" -"- Windows Firewall enabled\n" -"- Application Layer Gateway service enabled\n" -"See http://support.microsoft.com/kb/931130 for background information.\n" -"\n" -"Unless you either disable Windows Firewall or the Application Layer Gateway " -"service,\n" -"FileZilla will timeout on big transfers." -msgstr "" -"Åtvaring.\n" -"\n" -"Ein feil i Windows lagar vanskar i FileZilla\n" -"\n" -"Feilen kjem om du har\n" -"- Windows Server 2003 eller XP 64\n" -"- Windows sin brannmur er slått på\n" -"- Application Layer Gateway-tenesta er slått på\n" -"Sida http://support.microsoft.com/kb/931130 gjev bakgrunnsopplysningar.\n" -"\n" -"FileZilla vil gje tidsavbrot under store overføringar om du ikkje slår av " -"Windows-brannmuren\n" -"eller Application Layer Gateway-tenesta." - -#: ../../locales/../src/interface/netconfwizard.cpp:981 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." msgstr "Åtvaring: ignorerer datasamband frå feil IP." @@ -8212,23 +8402,23 @@ "\n" "Vil du verkeleg sjå etter dei?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 msgid "Warning: Potential security breach!" msgstr "Åtvaring: mogleg tryggleiksbrot!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3607 msgid "Welcome to FileZilla" msgstr "Velkomen til FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3468 msgid "What's new" msgstr "Kva er nytt" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Nytt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3797 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8237,7 +8427,7 @@ "skriva det inn. Krev omstart av FileZilla." # ? Dersom du lastar ned ei fil som bruker teikn i filnamnet som det lokale operativsystemet ikkje nyttar, vil dette valet ... -#: ../../locales/../src/interface/resources/xrc/settings.xrc:972 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8245,15 +8435,15 @@ "Dersom slått på, vil teikn som ikkje er støtta av det lokale " "operativsystemet verta bytte ut i filer som blir lasta ned." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 msgid "When st&arting a new connection while already connected:" msgstr "Om ein &startar ei ny tilkopling medan ein er tilkopla:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 msgid "Widescreen" msgstr "Breiskjerm" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3792 msgid "Would you like FileZilla to remember passwords?" msgstr "Ønskjer du at FileZilla skal hugsa passord?" @@ -8261,20 +8451,24 @@ msgid "Wr&ite" msgstr "&Lagra" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Feil ekstern IP-adresse" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:797 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:770 msgid "Wrong line endings" msgstr "Feil linjeavslutningar" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "Gul" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:744 msgid "Yes" msgstr "Ja" -#: ../../locales/../src/interface/netconfwizard.cpp:783 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8282,20 +8476,20 @@ "Det ser ut til at du nyttar ein vert som berre bruker IPv6. Denne " "rettleiaren støttar ikkje dette miljøet." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:248 msgid "You are using the latest version of FileZilla." msgstr "Du nyttar den siste utgåva av FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3577 msgid "You can always open this dialog again through the help menu." msgstr "Du kan alltid opna dette vindauget igjen frå hjelpemenyen." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:144 +#: ../../locales/../src/interface/resources/xrc/update.xrc:224 msgid "You can download the latest version from the FileZilla website:" msgstr "Du kan lasta ned den siste utgåva frå nettstaden til FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:66 msgid "You can leave the port field empty to use the default port." msgstr "Standardporten blir nytta om du lèt portfeltet vera tomt." @@ -8307,7 +8501,7 @@ "Du kan bruka ein x i kva posisjon som helst for å halda på tilgangen dei " "originale filene hadde." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Du kan ikkje importera innstillingane frå FileZilla sin eigen " @@ -8321,22 +8515,22 @@ "Du kan ikkje byta ut eit ugyldig teikn med eit anna ugyldig eit. Bruk eit " "tekn som er gyldig i filnamn." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Du gav ikkje fila eit nytt namn. Vil du heller skriva over ho?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3351 msgid "You have selected at least one symbolic link." msgstr "Du har vald minst éi symbolsk lenkje." -#: ../../locales/../src/interface/edithandler.cpp:1630 -#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/edithandler.cpp:1593 +#: ../../locales/../src/interface/search.cpp:1149 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "Du har vald å endra meir enn ti filer. Vil du verkeleg halda fram?" -#: ../../locales/../src/interface/LocalListView.cpp:1685 +#: ../../locales/../src/interface/LocalListView.cpp:1701 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8344,35 +8538,43 @@ "Du har vald å opna meir enn ti filer eller katalogar. Vil du verkeleg halda " "fram?" -#: ../../locales/../src/interface/manual_transfer.cpp:433 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 +#: ../../locales/../src/interface/manual_transfer.cpp:415 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:961 msgid "You have to enter a hostname." msgstr "Du må skriva eit vertsnamn." -#: ../../locales/../src/interface/search.cpp:510 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1070 +msgid "You have to enter a key file path" +msgstr "Du må føra opp ein nøkkelfilsti" + +#: ../../locales/../src/interface/search.cpp:859 msgid "You have to enter a local directory." msgstr "Du må føra opp ein lokal katalog." -#: ../../locales/../src/interface/netconfwizard.cpp:165 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Du må skriva ei gyldig IP-adresse." +#: ../../locales/../src/interface/search.cpp:873 +msgid "You have to enter a remote directory." +msgstr "Du må føra opp ein fjernkatalog." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "Du må skriva ei gyldig IPv4-adresse." -#: ../../locales/../src/interface/search.cpp:516 +#: ../../locales/../src/interface/search.cpp:864 msgid "You have to enter a writable local directory." msgstr "Du må føra opp ein lokal katalog som kan skrivast til." -#: ../../locales/../src/interface/manual_transfer.cpp:529 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../../locales/../src/interface/manual_transfer.cpp:506 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 msgid "You have to enter an account name" msgstr "Du må føra opp eit kontonamn" -#: ../../locales/../src/interface/manual_transfer.cpp:499 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +#: ../../locales/../src/interface/manual_transfer.cpp:480 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1036 msgid "You have to specify a user name" msgstr "Du må skriva eit brukarnamn" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8388,7 +8590,7 @@ msgid "You need to enter a name for the log file." msgstr "Du må gje loggfila eit namn." -#: ../../locales/../src/interface/edithandler.cpp:1509 +#: ../../locales/../src/interface/edithandler.cpp:1478 msgid "You need to enter a properly quoted command." msgstr "Du må skriva kommandoen i rett form." @@ -8401,15 +8603,15 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Du må oppgje eit mellomtenarportnummer mellom 1 og 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1138 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Bokmerke kan ikkje vera tomme - du må skriva inn minst éi filbane." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:446 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8417,7 +8619,7 @@ "Du må skriva inn både lokal- og fjernfilbanene for å slå på synkronisert " "blaing for dette bokmerket." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1103 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8425,23 +8627,23 @@ "Du må skriva inn både lokal- og fjernfilbanene for å slå på synkronisert " "blaing for denne staden." -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Du må føra opp ei lokal fil." -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Du må føra opp ei fjernfil." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Du må skriva inn ei fjernfilbane." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Du må føra opp ein tenar." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8449,7 +8651,7 @@ "Du bør ikkje ha vanskar med å kopla deg til andre tenarar. Filoverføringar " "skal kunna fungera." -#: ../../locales/../src/interface/QueueView.cpp:3128 +#: ../../locales/../src/interface/QueueView.cpp:2592 msgid "Your computer will suspend unless you click Cancel." msgstr "Maskina di vil gå i dvale om du ikkje trykkjer Avbryt." @@ -8466,7 +8668,7 @@ msgstr "begynner med" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 msgid "bytes" msgstr "bytar" @@ -8474,7 +8676,7 @@ msgid "contains" msgstr "inneheld" -#: ../../locales/../src/interface/updater.cpp:211 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "tilpassa" @@ -8496,19 +8698,19 @@ msgid "equals" msgstr "er lik" -#: ../../locales/../src/interface/filelistctrl.cpp:525 -#: ../../locales/../src/interface/filelistctrl.cpp:544 -#: ../../locales/../src/interface/filelistctrl.cpp:571 -#: ../../locales/../src/interface/filelistctrl.cpp:587 +#: ../../locales/../src/interface/filelistctrl.cpp:534 +#: ../../locales/../src/interface/filelistctrl.cpp:553 +#: ../../locales/../src/interface/filelistctrl.cpp:580 +#: ../../locales/../src/interface/filelistctrl.cpp:596 msgid "file" msgstr "fil" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-låsefil" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8517,14 +8719,22 @@ "Klarte ikkje å starta fzputtygen.\n" "Sjå til at programmet finst i same katalogen som FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1471 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:354 +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "fzsftp høyrer til ei anna utgåve av FileZilla" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1412 msgid "fzsftp could not be started" msgstr "Klarte ikkje å starta fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1051 +#: ../../locales/../src/engine/tlssocket.cpp:1202 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers gav ingen sertifikat" +#: ../../locales/../src/engine/tlssocket.cpp:1214 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 feila" + #: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "greater than" msgstr "større enn" @@ -8541,7 +8751,7 @@ msgid "group writeable" msgstr "gruppe kan lesa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" @@ -8577,10 +8787,11 @@ msgid "owner writeable" msgstr "eigar kan skriva" -#: ../../locales/../src/engine/tlssocket.cpp:1107 -#: ../../locales/../src/engine/tlssocket.cpp:1118 -#: ../../locales/../src/engine/tlssocket.cpp:1133 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29 +#: ../../locales/../src/engine/proxy.cpp:62 +#: ../../locales/../src/engine/tlssocket.cpp:1400 +#: ../../locales/../src/engine/tlssocket.cpp:1411 +#: ../../locales/../src/engine/tlssocket.cpp:1426 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 msgid "unknown" msgstr "ukjent" @@ -8600,16 +8811,158 @@ msgid "wxWidgets:" msgstr "wxWidgets:" -#~ msgid "(%u%% downloaded)" -#~ msgstr "(%u%% nedlasta)" +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "Klarte ikkje å importera sertifikata, gnutls_x509_crt_import feila" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Klarte ikkje å klargjera sertifikatstrukturen, gnutls_x509_crt_init feila" + +#~ msgid "Filename &filters..." +#~ msgstr "F&ilnamnfilter …" + +#~ msgid "Package" +#~ msgstr "Pakke" + +#, fuzzy +#~ msgid "Updated" +#~ msgstr "Oppdateringar" + +#~ msgid "%d files added to queue" +#~ msgstr "%d filer er lagde til i køen" + +#~ msgid "&Disconnect from server" +#~ msgstr "Kopla frå &tenaren" + +#~ msgid "&Show message" +#~ msgstr "Syn &melding" -#~ msgid "Connection timed out after %d second of inactivity" -#~ msgid_plural "Connection timed out after %d seconds of inactivity" -#~ msgstr[0] "Sambandet kopla ut etter %d sekund utan aktivitet" -#~ msgstr[1] "Sambandet kopla ut etter %d sekund utan aktivitet" +#~ msgid "" +#~ "Any changes made in the Site Manager will not be saved unless you repair " +#~ "the file." +#~ msgstr "" +#~ "Du må reparera fila om du vil lagra endringane i tilkoplingsstyraren." + +#~ msgid "Cannot compare directories, not connected to a server." +#~ msgstr "" +#~ "Klarer ikkje å samanlikna katalogane sidan det ikkje er samband mot ein " +#~ "tenar." + +#~ msgid "Clear &Site Manager entries" +#~ msgstr "Tøm oppføringane i &tilkoplingsstyraren" + +#~ msgid "Clear &transfer queue" +#~ msgstr "Tøm overførings&køen" + +#~ msgid "Connected" +#~ msgstr "Tilkopla" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "Sletting av fleire ikkje-relaterte katalogar er enno ikkje støtta" + +#~ msgid "Do ¬hing" +#~ msgstr "Gjer &ingenting" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Ein kan ikkje lasta ned fleire ikkje-relaterte katalogar." + +#~ msgid "Downloading search results" +#~ msgstr "Lastar ned søkjeresultata" -#~ msgid "fzsftp belongs to a different version of FileZilla" -#~ msgstr "fzsftp høyrer til ei anna utgåve av FileZilla" +#~ msgid "No more files in the queue!" +#~ msgstr "Ingen fleire filer i køen." + +#~ msgid "Operating system problem detected" +#~ msgstr "Fann eit operativsystemproblem" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Søkjer etter filer som skal leggjast til i køen" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Søkjer etter filer som skal lastast opp" + +#~ msgid "The XML document is not well-formed: %s" +#~ msgstr "XML-dokumentet er ikkje velforma: %s" + +#~ msgid "" +#~ "The file '%s' is not in a format supported by FileZilla.\n" +#~ "The file is also password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into a supported, unprotected format?" +#~ msgstr "" +#~ "Fila '%s' er ikkje i eit format som FileZilla støttar.\n" +#~ "Fila er òg passordbeskytta. Passordbeskytta nøkkelfiler er enno ikkje " +#~ "støtta av FileZilla.\n" +#~ "Vil du konvertera til eit støtta, men ikkje-beskytta format?" + +#~ msgid "" +#~ "The file '%s' is password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into an unprotected file?" +#~ msgstr "" +#~ "Fila '%s' er passordbeskytta. FileZilla støttar enno ikkje " +#~ "passordbeskytta nøkkelfiler.\n" +#~ "Vil du endra fila til å vera ubeskytta?" + +#~ msgid "" +#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " +#~ "seconds." +#~ msgstr "" +#~ "Tidssoneforskyving: Tenar: %d sekund. Lokalt: %d sekund. Skilnad: %d " +#~ "sekund." + +#~ msgid "U&se system defaults" +#~ msgstr "Bruk syst&emstandardane" + +#~ msgid "" +#~ "Unknown error opening the file. Make sure the file can be accessed and is " +#~ "a well-formed XML document." +#~ msgstr "" +#~ "Ukjend feil ved opninga av fila. Sjå til at ein har tilgang til fila og " +#~ "at ho er eit velforma XML-dokument." + +#~ msgid "Use system &defaults" +#~ msgstr "Bruk syste&mstandardane" + +#~ msgid "Using proxy %s" +#~ msgstr "Bruker mellomtenaren %s" + +#~ msgid "Waiting" +#~ msgstr "Ventar" + +#~ msgid "" +#~ "Warning!\n" +#~ "\n" +#~ "A bug in Windows causes problems with FileZilla\n" +#~ "\n" +#~ "The bug occurs if you have\n" +#~ "- Windows Server 2003 or XP 64\n" +#~ "- Windows Firewall enabled\n" +#~ "- Application Layer Gateway service enabled\n" +#~ "See http://support.microsoft.com/kb/931130 for background information.\n" +#~ "\n" +#~ "Unless you either disable Windows Firewall or the Application Layer " +#~ "Gateway service,\n" +#~ "FileZilla will timeout on big transfers." +#~ msgstr "" +#~ "Åtvaring.\n" +#~ "\n" +#~ "Ein feil i Windows lagar vanskar i FileZilla\n" +#~ "\n" +#~ "Feilen kjem om du har\n" +#~ "- Windows Server 2003 eller XP 64\n" +#~ "- Windows sin brannmur er slått på\n" +#~ "- Application Layer Gateway-tenesta er slått på\n" +#~ "Sida http://support.microsoft.com/kb/931130 gjev bakgrunnsopplysningar.\n" +#~ "\n" +#~ "FileZilla vil gje tidsavbrot under store overføringar om du ikkje slår av " +#~ "Windows-brannmuren\n" +#~ "eller Application Layer Gateway-tenesta." + +#~ msgid "&Crash" +#~ msgstr "&Krasj" #~ msgid "" #~ "A file with that name is already being edited. Do you want to reopen '%s'?" @@ -8623,9 +8976,17 @@ #~ msgid "Cannot load file, not a valid XML file." #~ msgstr "Klarer ikkje å lasta fila sidan ho ikkje er ei gyldig XML-fil." +#~ msgid "Certificate details" +#~ msgstr "Sertifikatdetaljar" + #~ msgid "Clear string coalescer" #~ msgstr "Tøm strengsamlaren" +#~ msgid "" +#~ "Crashes FileZilla instantly. Only used to debug the exception handler" +#~ msgstr "" +#~ "Crashes FileZilla instantly. Only used to debug the exception handler" + #~ msgid "Failed to parse trusted root cert." #~ msgstr "Klarte ikkje å tolka tiltrudd rotsertifikat." @@ -8638,9 +8999,6 @@ #~ msgid "Fingerprint (MD5):" #~ msgstr "Fingeravtrykk (MD5):" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Rotsertifikatet er ikkje tiltrudd." - #~ msgid "Use plain FTP" #~ msgstr "Bruk vanleg FTP" @@ -8720,9 +9078,6 @@ #~ msgid "Log of update check:" #~ msgstr "Oppdateringskontrollogg:" -#~ msgid "Package" -#~ msgstr "Pakke" - #~ msgid "" #~ "Please check https://filezilla-project.org/ for the most recent version " #~ "of FileZilla." diff -Nru filezilla-3.15.0.2/locales/pl_PL.po filezilla-3.33.0/locales/pl_PL.po --- filezilla-3.15.0.2/locales/pl_PL.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/pl_PL.po 2018-04-27 13:04:09.000000000 +0000 @@ -1,38 +1,41 @@ -# This file is distributed under the same license as the filezilla package. -# Michał Trzebiatowski , 2008, 2009, 2010, 2011 +# Polish translation for FileZilla +# Copyright (C) 2018 Tim Kosse +# This file is distributed under the same license as the FileZilla package. +# +# Translators: +# Michał Trzebiatowski , 2008-2018 # Krystian Biesaga , 2013 -# +# Krzysztof Blachnicki , 2016 msgid "" msgstr "" -"Project-Id-Version: FileZilla 3.10.x\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-13 13:13+0100\n" -"PO-Revision-Date: 2015-12-06 15:52+0100\n" -"Last-Translator: Maciej Gryniuk \n" -"Language-Team: translationproject.org/team/pl.html, Maciej Gryniuk " -"\n" +"Project-Id-Version: FileZilla 3.x.x\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-27 14:20+0200\n" +"PO-Revision-Date: 2018-04-04 23:37+0100\n" +"Last-Translator: Michał Trzebiatowski , 2018\n" +"Language-Team: Polish (Poland) (http://www.transifex.com/zeron/filezilla/" +"language/pl_PL/)\n" "Language: pl_PL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-SourceCharset: UTF-8\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.6\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" +"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S upłynęło" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S pozostało" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -41,296 +44,312 @@ "%a - Konto (linie zawierające to będą pominięte dla trybu logowania innego " "niż Konto)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d katalog" msgstr[1] "%d katalogi" msgstr[2] "%d katalogów" +msgstr[3] "%d katalogów" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d katalog wraz z zawartością" msgstr[1] "%d katalogi wraz z zawartością" msgstr[2] "%d katalogów wraz z zawartością" +msgstr[3] "%d katalogów wraz z zawartością" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d plik" msgstr[1] "%d pliki" msgstr[2] "%d plików" +msgstr[3] "%d plików" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d plik. Całkowity rozmiar: %s" msgstr[1] "%d pliki. Całkowity rozmiar: %s" msgstr[2] "%d plików. Całkowity rozmiar: %s" +msgstr[3] "%d plików. Całkowity rozmiar: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d plik. Całkowity rozmiar: Co najmniej %s" msgstr[1] "%d pliki. Całkowity rozmiar: Co najmniej %s" msgstr[2] "%d plików. Całkowity rozmiar: Co najmniej %s" +msgstr[3] "%d plików. Całkowity rozmiar: Co najmniej %s" -#: ../../locales/../src/interface/QueueView.cpp:2778 -#, c-format -msgid "%d files added to queue" -msgstr "%d pliki dodane do kolejki" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekunda" msgstr[1] "%d sekundy" msgstr[2] "%d sekund" +msgstr[3] "%d sekund" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Host" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu katalog" msgstr[1] "%llu katalogi" msgstr[2] "%llu katalogów" +msgstr[3] "%llu katalogów" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu plik" msgstr[1] "%llu pliki" msgstr[2] "%llu plików" +msgstr[3] "%llu plików" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Hasło" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certyfikat wygasł!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Jeszcze nieważny!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Użytkownik proxy" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s i %s. Całkowity rozmiar: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s i %s. Całkowity rozmiar: Co najmniej %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s bajt" msgstr[1] "%s bajty" msgstr[2] "%s bajtów" +msgstr[3] "%s bajtów" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s nie może zostać znaleziony. Bez tego komponentu FileZilla, SFTP nie " -"będzie działać.\n" +"Nie można znaleźć %s. Bez tego składnika FileZilla, %s nie będzie działać.\n" "\n" -"Proszę pobrać FileZilla ponownie. Jeśli problem będzie się powtarzał, wyślij " -"raport błędów." +"Pobierz ponownie FileZillę. Jeśli ten problem się powtórzy, prześlij " +"zgłoszenie błędu." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s nie może zostać znaleziony. Bez tego komponentu, SFTP nie będzie " -"działać.\n" +"Nie można znaleźć %s. Bez tego składnika FileZilla, %s nie będzie działać.\n" "\n" "Możliwe rozwiązania:\n" -"- Upewnij się, że %s znajduje się w katalogu umieszczonym w zmiennej " +"- Upewnij się, czy %s znajduje się w katalogu wymienionym w zmiennej " "środowiskowej PATH.\n" -"- Ustaw pełną ścieżkę do %s w zmiennej środowiskowej FZ_FZFSTP." +"- Ustaw pełną ścieżkę do %s w zmiennej środowiskowej %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" -msgstr "%s z %d bitów" +msgstr "%s z %d bitami" + +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Nazwa hosta nie jest zgodna z certyfikatem" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Nazwa użytkownika" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Hasło proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "&Przerwij poprzednie połączenie i połącz się w bieżącej karcie" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "&About..." msgstr "&O FileZilla..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Konto:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Aktywny" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/menu_bar.cpp:154 msgid "&Add bookmark..." msgstr "&Dodaj zakładkę..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Dodaj katalog..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:10 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:56 msgid "&Add files to queue" msgstr "&Dodaj pliki do kolejki" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Dodaj plik klucza..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:266 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "&Add to queue" msgstr "&Dodaj do kolejki" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" -msgstr "&Określ przesunięcie czasu serwera:" +msgstr "&Określ przesunięcie strefy czasowej serwera:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "&Zawsze ufaj certyfikatowi w kolejnych sesjach." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "&Zawsze ufaj temu hostowi, dodaj ten klucz do pamięci podręcznej" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Zawsze używaj domyślnego edytora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Zawsze używaj wyboru dla nieskojarzonych plików" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Zawsze wykonuj tę akcję" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Pytaj system operacyjny o zewnętrzny adres IP" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:364 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 +#: ../../locales/../src/interface/menu_bar.cpp:118 msgid "&Auto" msgstr "&Automatyczny" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Wykryj automatycznie" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "Kolor &tła:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:372 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 +#: ../../locales/../src/interface/menu_bar.cpp:120 msgid "&Binary" msgstr "&Binarny" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "Prefiksy binarne o &symbolach SI (np. 1 KB = 1024 bajty)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/menu_bar.cpp:151 msgid "&Bookmarks" msgstr "&Zakładki" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Przeglądaj..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "Odporność na przerwanie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Anuluj" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Clear private data..." msgstr "&Wyczyść prywatne dane..." @@ -338,173 +357,173 @@ msgid "&Close" msgstr "&Zamknij" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:158 msgid "&Close FileZilla" msgstr "&Zamknij FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:170 +msgid "&Close FileZilla once" +msgstr "&Zamknij FileZillę jednorazowo" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Configure speed limits..." msgstr "&Konfiguruj limity prędkości..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/menu_bar.cpp:129 msgid "&Configure..." msgstr "&Konfiguruj..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Połącz" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../locales/../src/interface/menu_bar.cpp:50 msgid "&Copy current connection to Site Manager..." msgstr "&Kopiuj aktualne połączenie do Menedżera Stron..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "&Copy to clipboard" msgstr "&Kopiuj do schowka" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:29 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:69 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&Create directory" msgstr "Utwórz &katalog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:404 msgid "&Create new tab" msgstr "Otwórz nową kartę" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:182 msgid "&Debug" msgstr "&Debugowanie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "Informacje o debugu w dzienniku &wiadomości:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "&Domyślny edytor:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/menu_bar.cpp:113 msgid "&Default file exists action..." msgstr "&Domyślna akcja, jeśli plik już istnieje..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Opóźnienie między nieudanymi próbami logowania:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:41 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "U&suń" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "U&suń symlinka" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "&Directory access permissions..." +msgstr "&Uprawnienia dostępu do katalogu..." + +#: ../../locales/../src/interface/menu_bar.cpp:86 msgid "&Directory comparison" msgstr "&Porównywanie katalogów" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "Wyłączyć synchronizowane przeglądanie i kontynuować zmianę katalogu " "lokalnego?" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "Wyłączyć synchronizowane przeglądanie i kontynuować zmianę katalogu zdalnego?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "&Odrzuć plik lokalny, pobierz ponownie i edytuj na nowo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/menu_bar.cpp:143 msgid "&Disconnect" msgstr "&Rozłącz" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Odłącz od serwera" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Pokazuj chwilową prędkość transferu zamiast średniej prędkości" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Pokazuj rozmiar w bajtach" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "&Nie zapisuj haseł (zalecane)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Nie pokazuj więcej tego okna." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "Nie używaj &zewnętrznego adresu IP przy połączeniach lokalnych." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "Akcja &dwukrotnego kliknięcia na plikach:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:51 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:261 msgid "&Download" msgstr "&Pobierz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Pobierz do:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "&Download..." msgstr "&Pobierz..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Pobierania:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:24 +#: ../../locales/../src/interface/menu_bar.cpp:68 msgid "&Edit" msgstr "&Edytuj" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "&Edytuj reguły filtrów..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/menu_bar.cpp:89 +#: ../../locales/../src/interface/menu_bar.cpp:128 msgid "&Enable" msgstr "&Włącz" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "Włącz &kompresję" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Włącz limity prędkości" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "K&odowanie:" @@ -512,64 +531,76 @@ msgid "&Encryption:" msgstr "&Szyfrowanie:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:192 msgid "&Enter custom command..." msgstr "&Wprowadź dowolne polecenie..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "Nawiąż połączenie w &nowej karcie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Wykonanie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Eksportuj wpisy Menedżera Stron" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:359 +#: ../../locales/../src/interface/menu_bar.cpp:57 msgid "&Export..." msgstr "&Eksportuj..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Powróć do trybu aktywnego" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../locales/../src/interface/menu_bar.cpp:44 msgid "&File" msgstr "&Plik" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "&File Attributes..." msgstr "&Atrybuty pliku..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "&File permissions..." msgstr "&Prawa pliku..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Plik:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Warunki filtrów:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Zestawy filtrów:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtry" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Filtry:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Zakończ edycję i skasuj plik lokalny" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Omijaj lokalne ścieżki, prześlij wszystkie zawarte pliki bezpośrednio do " +"katalogu docelowego" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -577,152 +608,161 @@ "&Omijaj zdalne ścieżki, pobierz wszystkie zawarte pliki bezpośrednio do " "katalogu docelowego" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "Ś&ledź symlinka, usuń zawartość katalogu docelowego" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "Po&bierz zewnętrzny adres IP z następującego adresu:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/menu_bar.cpp:172 msgid "&Getting help..." msgstr "&Pomoc..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Globalna zakładka" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 z użyciem metody CONNECT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/menu_bar.cpp:162 msgid "&Help" msgstr "Pomo&c" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:318 +#: ../../locales/../src/interface/menu_bar.cpp:94 msgid "&Hide identical files" msgstr "&Ukryj identyczne pliki" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:123 msgid "&Highest" msgstr "&Najwyższy" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "Naj&wyższy dostępny port:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Serwer:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "Prefiksy w p&ostaci symboli IEC (np. 1 KiB = 1024 bajty)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (przykład: 2007-09-15)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../locales/../src/interface/menu_bar.cpp:58 msgid "&Import..." msgstr "&Importuj..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "Dziedzicz &systemowe skojarzenia plików" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "Za&instaluj nową wersję" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "" +"&Zachowaj lokalną strukturę ścieżki w stosunku do głównego wyszukiwania" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "" "&Zachowaj strukturę zdalnej ścieżki w stosunku do głównego wyszukiwania" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "Plik &klucza:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Układ paneli plików i katalogów:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Ogranicz porty lokalne używane przez FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Ogranicz liczbę jednoczesnych połączeń" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/menu_bar.cpp:103 msgid "&Local directory tree" msgstr "D&rzewo lokalnych katalogów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "Katalog &lokalny:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Lokalne" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Dziennik do pliku" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" -msgstr "Typ logo&wania:" +msgstr "Tryb logo&wania:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" -msgstr "Typ logo&wania:" +msgstr "Tryb logo&wania:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 msgid "&Low" msgstr "Ni&ski" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/menu_bar.cpp:156 msgid "&Manage bookmarks..." msgstr "&Zarządzaj zakładkami..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/menu_bar.cpp:133 msgid "&Manual transfer..." msgstr "&Ręczny transfer..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Maksymalna liczba połączeń:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Maksymalna liczba ponownych prób:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/menu_bar.cpp:102 msgid "&Message log" msgstr "&Dziennik wiadomości" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Minimalizuj do zasobnika" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "Tryb &sortowania nazw:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Etykieta:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 +#: ../../locales/../src/interface/menu_bar.cpp:69 msgid "&Network configuration wizard..." msgstr "&Kreator konfiguracji sieci..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Nowy" @@ -730,7 +770,7 @@ msgid "&New Site" msgstr "&Nowy adres" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Dostępna jest nowa wersja!" @@ -738,194 +778,205 @@ msgid "&Next >" msgstr "&Dalej >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Nie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:146 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Brak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Normal" msgstr "No&rmalny" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "Wartość numeryczna:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&OK" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&OPEN" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:20 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:335 msgid "&Open" msgstr "&Otwórz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Zamień" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Pasywny" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Hasło:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:166 msgid "&Play sound" msgstr "O°raj dzwięk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Port:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/menu_bar.cpp:123 msgid "&Preserve timestamps of transferred files" msgstr "&Zachowaj daty przesyłanych plików" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Kolejka" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "S&zybkie łączenie" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/menu_bar.cpp:101 msgid "&Quickconnect bar" msgstr "Pasek &szybkiego łączenia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "Historia &szybkiego łączenia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Odczyt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/menu_bar.cpp:141 msgid "&Reconnect" msgstr "&Połącz ponownie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "Informacje o &ponownym łączeniu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 +#: ../../locales/../src/interface/menu_bar.cpp:80 msgid "&Refresh" msgstr "&Odśwież" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Zapamiętaj hasło główne dla tej sesji FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "&Zapamiętaj hasło dla tej sesji FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "&Pamiętaj hasła" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Zdalny katalog:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Zdalna ścieżka:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Zdalne" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Usuń" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Usuń klucz" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:115 msgid "&Remove selected" msgstr "&Usuń zaznaczone" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:89 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Zm&ień nazwę" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "Zm&ień nazwę..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Otwórz ponownie plik lokalny" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Zamień nieprawidłowe znaki na:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/menu_bar.cpp:173 msgid "&Report a bug..." msgstr "&Zgłoś błąd..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:154 +msgid "&Request attention" +msgstr "Podświetl pasek zadań" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "&Reset and requeue all" msgstr "Z&resetuj wszystkie pliki i ponownie dodaj do kolejki" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" -msgstr "&Zrestartuj kreatora" +msgstr "&Uruchom ponowniej kreatora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Wznów" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:162 msgid "&Run command..." msgstr "&Wprowadź polecenie..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "Uruchom kreatora &konfiguracji..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Sprawdź dostępność aktualizacji..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Zapisz jako..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Szukaj" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "&Search remote files..." msgstr "&Szukaj zdalnych plików..." @@ -933,280 +984,296 @@ msgid "&Select Entry:" msgstr "&Wybierz wpis:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Wybierz język:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Wybierz kolumny, które mają być widoczne:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/menu_bar.cpp:136 msgid "&Server" msgstr "&Serwer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Ustawienia" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "&Settings..." msgstr "&Ustawienia..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "Pokaż menu &debugowania" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 msgid "&Show detailed log" msgstr "&Pokaż szczegółowy dziennik" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Pokaż wiadomość" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Pokaż daty w dzienniku wiadomości" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Wpisy &Menedżera Stron" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "&Site Manager..." msgstr "&Menedżer Stron..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "Zakładka konkretnej &strony" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Pomiń" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/menu_bar.cpp:126 msgid "&Speed limits" msgstr "&Limity prędkości" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "&Natychmiast rozpocznij transfer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Zamień miejscami panel lokalny i panel serwera" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:211 msgid "&TLS Ciphers" msgstr "Szyfrowanie &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Testuj" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Styl:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/menu_bar.cpp:108 msgid "&Transfer" msgstr "&Transfer" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "&Tryb transferu:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/menu_bar.cpp:105 msgid "&Transfer queue" msgstr "&Kolejka transferów" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "Tra&ktuj pliki zaczynające się od kropki jako pliki ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "" +"&Zaufaj temu certyfikatowi na wymienionych alternatywnych nazwach hostów." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Zakończ edycję" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Uaktualnij klucz zapisany w pamięci podręcznej dla tego hosta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 msgid "&Upload" msgstr "&Wyślij" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Prześlij do:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 +msgid "&Upload..." +msgstr "&Prześlij..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Wysyłania:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Użyj własnego programu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "Użyj &synchronizowanego przeglądania" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Użyj domyślnego edytora systemu dla plików tekstowych" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Użyj następującego adresu IP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Użyj zewnętrznego adresu IP serwera" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Użyj separatora tysięcy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Użytkownik:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Nazwa użytkownika:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "Wersja %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/menu_bar.cpp:78 msgid "&View" msgstr "&Podgląd" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:384 msgid "&View/Edit" msgstr "&Podgląd/Edycja" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "&Sprawdzaj lokalnie edytowane pliki i pytaj, czy przesłać zmiany" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Sprawdzaj dostępność aktualizacji dla:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Zapis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Tak" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' nie istnieje lub nie jest dostępny." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' nie jest katalogiem." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' nie jest obsługiwanym protokołem" + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" -msgstr "Typ logowania 'Konto' nieobsługiwany przez wybrany protokół" +msgstr "Tryb logowania 'Konto' nieobsługiwany przez wybrany protokół" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." msgstr "" -"Typy logowania 'Normalny' i 'Konto' są niedostępne, zostanie użyta opcja " +"Tryby logowania 'Normalny' i 'Konto' są niedostępne. Zostanie użyta opcja " "'Pytaj o hasło'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" -"Typy logowania 'Normalny' i 'Konto' są niedostępne. Zmieniono opcję na " +"Tryby logowania 'Normalny' i 'Konto' są niedostępne. Zmieniono opcję na " "'Pytaj o hasło'." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " "command without the leading 'quote'." msgstr "" -"'cudzysłów' jest zazwyczaj lokalnym poleceniem używanym przez klienty " -"wiersza poleceń, aby wysyłać argumenty za 'cudzysłowem' do serwera. Możesz " -"chcieć wprowadzić polecenia bez wiodących 'cudzysłowów'." +"'quote' jest zazwyczaj lokalnym poleceniem używanym przez niegraficzne " +"klienty, służacym do wysyłania serwerowi poleceń. Możesz wprowadzić surowe " +"polecenia bez poprzedzającego 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d obiekt filtrowany)" msgstr[1] "(%d obiekty filtrowane)" msgstr[2] "(%d obiektów filtrowanych)" +msgstr[3] "(%d obiektów filtrowanych)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(pobrano %u%%)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 dla braku limitu)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 sekund)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 aby wyłączyć)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat określone jako %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(przykład: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(przykład: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(w %s/s)" @@ -1215,17 +1282,17 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- pozostało" #: ../../locales/../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." -msgstr "-c nie może być używane wraz z adresem typu FTP." +msgstr "-c nie może być używane wraz z adresem FTP." #: ../../locales/../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." -msgstr "-l może być używane jedynie wraz z adresem typu FTP." +msgstr "-l może być używane jedynie wraz z adresem FTP." #: ../../locales/../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." @@ -1233,33 +1300,33 @@ #: ../../locales/../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." -msgstr "-s nie może być używane wraz z adresem typu FTP." +msgstr "-s nie może być używane wraz z adresem FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Brak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Ostrzeżenia" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Informacje" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Szczegółowe" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32-bitowy system" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Debugowanie" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64-bitowy system" @@ -1267,24 +1334,30 @@ msgid "< &Back" msgstr "< &Wstecz" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/menu_bar.cpp:160 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Zakładka z podaną nazwą już istnieje. Proszę wpisać jeszcze niewykorzystaną " "nazwę." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Certyfikat w łańcuchu został podpisany przy użyciu niezabezpieczonego " +"algorytmu" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." -msgstr "Domyślny edytor musi zostać ustawiony." +msgstr "Należy ustawić domyślny edytor." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "" "Katalog nie może zostać przeniesiony do jednego z własnych podkatalogów." @@ -1296,25 +1369,25 @@ "and asks the server to connect to it." msgstr "" "Część serwerów nie obsługuje trybu pasywnego lub są źle skonfigurowane. W " -"tych przypadkach musisz użyć trybu aktywnego. W trybie aktywnym FileZilla " +"tych przypadkach należy użyć trybu aktywnego. W trybie aktywnym FileZilla " "otwiera port i wysyła do serwera prośbę o połączenie." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Wcześniej otworzony plik został zmieniony." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Plik o tej nazwie jest już przesyłany." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Plik o tej nazwie jest wciąż edytowany. Proszę go zamknąć i spróbować " "ponownie." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1323,26 +1396,35 @@ "No further warning will be displayed this session." msgstr "" "Lokalna nazwa pliku nie może zostać zdekodowana.\n" -"Upewnij się, czy wartość zmiennej środowiskowej LC_TYPE (lub LC_ALL) jest " +"Upewnij się, że wartość zmiennej środowiskowej LC_TYPE (lub LC_ALL) jest " "ustawiona poprawnie.\n" "Jeśli nie rozwiążesz tego problemu, na liście może brakować niektórych " "plików.\n" -"Ostrzeżenie nie zostanie ponownie wyświetlane podczas tej sesji." +"Ostrzeżenia nie będą ponownie wyświetlane podczas tej sesji." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Utraconego hasła głównego nie będzie może odzyskać! Zapamiętaj dokładnie " +"swoje hasło." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Dostępna jest nowa wersja FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." msgstr "" -"Właściwie skonfigurowany serwer zawsze pokazuje wszytkie pliki, jednak " -"niektóre serwery mogą ukrywać pliki przed użytkownikiem. Uzyj tej opcji, aby " -"wymusić pokazywanie wszystkich plików przez serwer." +"Sprawny serwer zawsze pokazuje wszytkie pliki, jednak niektóre, źle " +"skonfigurowane serwery mogą je ukrywać. Uzyj tej opcji, aby wymusić " +"pokazywanie wszystkich plików przez serwer." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1350,7 +1432,7 @@ "Nie jest wymagane przez właściwie skonfigurowany serwer. Skontaktuj się z " "administratorem serwera, jeśli potrzebujesz tej opcji." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1359,17 +1441,17 @@ "Wyłączyc synchronizowane przeglądanie i kontynuować zmianę lokalnego " "katalogu?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:368 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 +#: ../../locales/../src/interface/menu_bar.cpp:119 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "D&odaj" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "&Pozwól na wznawianie plików ASCII" @@ -1381,51 +1463,53 @@ msgid "A&pply only to uploads" msgstr "Zastosuj tylko dla wysyłań" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "Zastosuj dla wszystkich plików i katalogów" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:252 msgid "A&utomatically remove successful transfers" msgstr "A&utomatycznie usuń udane transfery" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "O FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Powyżej listy plików" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Nie można przywrócić dostępu do niektórych katalogów lokalnych:" + +#: ../../locales/../src/engine/server.cpp:614 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Konto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 msgid "Action after queue &completion" msgstr "Akcja po wykonaniu zadań z &kolejki" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Akcja dla zaznaczonego pliku:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Akcja do wykonania:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "&Akcja:" @@ -1433,7 +1517,7 @@ msgid "Active mode" msgstr "Tryb aktywny" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1441,7 +1525,7 @@ "Test trybu aktywnego FTP nie powiódł się. FileZilla nie zna poprawnego " "zewnętrznego adresu IP." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1449,7 +1533,7 @@ "Test trybu aktywnego nie powiódł się. FileZilla nie zna prawidłowego adresu " "zewnętrznego IP. W dodatku, Twój router zmodyfikował wysłany adres." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1458,38 +1542,39 @@ "Test trybu aktywnego nie powiódł się. FileZilla zna prawidłowy zewnętrzny " "adres IP, ale został on zmodyfikowany przez Twój router lub zaporę." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "Aktywny tryb IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Dodaj pliki tylko do &kolejki" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:331 msgid "Add selected directory to the transfer queue" msgstr "Dodaj zaznaczony katalog do kolejki" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 msgid "Add selected files and folders to the transfer queue" msgstr "Dodaj zaznaczone pliki i katalogi do kolejki wysyłania" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Dodaj do kolejki" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:509 msgid "Address type not supported" -msgstr "Typ adresu nieobsługiwany" +msgstr "Tryb adresu nieobsługiwany" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Zaawansowane" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1503,15 +1588,16 @@ "oczekiwaniami i istnieje ryzyko uszkodzenia Twojego systemu. Używasz wersji " "beta oraz dziennych kompilacji na własne ryzyko." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "&Zawsze wykonuj tę akcję" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algorytm:" -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2663 msgid "All files have been successfully transferred" msgstr "Wszystkie pliki zostały wysłane pomyślnie" @@ -1519,37 +1605,40 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Wszystkie porty w danym zakresie muszą być między 1024 a 65535." -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2659 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "" -"Wszystkie transfery się zakończyły. Transfer %d pliku się nie powiódł" +"Wszystkie transfery zostały zakończone. Transfer %d pliku nie powiódł się" msgstr[1] "" -"Wszystkie transfery się zakończyły. Transfer %d plików się nie powiódł" +"Wszystkie transfery zostały zakończone. Transfer %d plików nie powiódł się" msgstr[2] "" -"Wszystkie transfery się zakończyły. Transfer %d plików się nie powiódł" +"Wszystkie transfery zostały zakończone. Transfer %d plików nie powiódł się" +msgstr[3] "" +"Wszystkie transfery zostały zakończone. Transfer %d plików nie powiódł się" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" -msgstr "Pozwól na powrót do innego trybu transferu po &niepowodzeniu" +msgstr "Pozwól na powrót do innego trybu transferu w przypadku &niepowodzenia" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" -msgstr "Pozwól na powrót do innego trybu transferu po niepowodzeniu" +msgstr "Pozwól na powrót do innego trybu transferu w przypadku niepowodzenia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Już połączono" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nazwa alternatywna:" msgstr[1] "Nazwy alternatywne:" -msgstr[2] "Nazwy alternatywne:" +msgstr[2] "Nazw alternatywnych:" +msgstr[3] "Nazw alternatywnych:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1557,7 +1646,7 @@ "Do zarządzania kluczami można również użyć narzędzia Pageant z PuTTY." "FileZilla rozpoznaje program Pageant." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1565,13 +1654,13 @@ "Alternatywnie, możesz użyć systemowego agenta SSH. By to zrobić, upewnij " "się, że ustawiona jest zmienna środowiskowa SSH_AUTH_SOCK." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "Ewentualnie, możesz pobrać najnowszą wersję ze strony FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1908 +#: ../../locales/../src/interface/QueueView.cpp:1667 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1580,7 +1669,7 @@ "Wystąpił błąd podczas ładowania transferu kolejki z \"%s\".\n" "Niektóre pozycje kolejki mogły nie zostać przywrócone." -#: ../../locales/../src/interface/QueueView.cpp:1818 +#: ../../locales/../src/interface/QueueView.cpp:1559 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1589,7 +1678,11 @@ "Wystąpił błąd podczas zapisywania transferu kolejki z \"%s\".\n" "Niektóre pozycje kolejki mogły nie zostać zapisane." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Wystawca w łańcuchu certyfikatu nie jest urzędem certyfikacji" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1597,72 +1690,71 @@ "W lokalizacji docelowej istnieje już obiekt o takej samej nazwie, jak obiekt " "przeciągany." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Anonimowy" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "Trwa już inna zdalna operacja, nie można teraz zmieniać katalogu." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "Wszelkie zmiany dokonane w Managerze Stron nie mogły być zapisane." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Wszelkie zmiany filtrów nie mogły zostać zapisane." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Wszelkie zmiany dokonane w filtrach nie zostaną zapisane." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Zastosuj tylko do katalogów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Zastosuj" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Zastosuj tylko do bieżącej kolejki" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Zastosuj tylko do plików" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Archiwum" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" -msgstr "Przepełnienie buforu argumentu" +msgstr "Przepełnienie buforu paremetru" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Jako karta w panelu kolejki transferu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Pytaj o akcję" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:605 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Pytaj o hasło" @@ -1674,15 +1766,15 @@ msgid "Ask your operating system for the external IP address" msgstr "Pytaj system operacyjny o zewnętrzny adres IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" -msgstr "Zadawanie pytań na forum FileZilli" +msgstr "Zadawanie pytań na forum FileZilla" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 msgid "Associated program not found:" msgstr "Skojarzony program nie został znaleziony:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Przynajmniej jeden warunek filtra jest niekompletny" @@ -1690,99 +1782,106 @@ msgid "At this point, all required information has been gathered." msgstr "Na tę chwilę, wszystkie wymagane informacje zostały zebrane." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atrybut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Uwierzytelnianie nie powiodło się." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Autor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Automatyczny" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Automatyczna klasyfikacja typów plików" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Dostępne rozmiary" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "&Obejście proxy" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Błędne opisanie pliku" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Podstawowe instrukcje użytkowania" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Zachowanie" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "W edycji" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Uważaj! Certyfikat został unieważniony" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Binarny" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Tablica" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Niebieski" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:434 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Zakładka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Zakładka:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Zakładki" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Przeglądaj..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Nie znaleziono zasobu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Data kompilacji:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Informacje o kompilacji" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Kategoria biznes:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1792,99 +1891,114 @@ "jakikolwiek wolny port lokalny. Jeśli chcesz ograniczyć liczbę portów " "używanych przez FileZilla, wprowadź zakres portów poniżej." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/menu_bar.cpp:138 msgid "C&ancel current operation" msgstr "Anuluj &bieżącą operację" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "C&lear all" msgstr "Wy&czyść wszystkie" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:93 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:289 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:390 msgid "C&opy URL(s) to clipboard" msgstr "&Kopiuj adres(y) do schowka" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "C&opy URL(s) with password to clipboard" +msgstr "S&kopiuj adresy URL z hasłem do schowka" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "&Własny" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "&Własne skojarzenia plików:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" -msgstr "Cechy CPU:" +msgstr "Cechy procesora:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." -msgstr "Obliczanie przesunięcia czasu serwera..." +msgstr "Obliczanie przesunięcia strefy czasowej serwera..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Nie można odczytać pliku" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Nie można zapisać danych do pliku." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Nie można zapisać danych do pliku: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Anuluj" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Anuluj bieżącą operację" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Anuluje bieżącą operację" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" -"Nie można uzyskać dostępu do '%s', brak włożonego nośnika, bądź napęd nie " -"jest gotowy." +"Nie można uzyskać dostępu do '%s' - brak nośnika lub napęd nie jest gotowy." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Nie można dodać serwera do Menedżera Stron" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Nie można przydzielić żądanego adresu" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Nie można zmienić katalogu, operacja zsynchronizowanej zmiany katalogu już " +"działa." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1892,7 +2006,7 @@ "Nie można zamknąć karty, gdy jest zajęta.\n" "Anulować bieżącą operację i zamknąć kartę?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1904,22 +2018,23 @@ msgid "Cannot create new filter" msgstr "Nie można utworzyć nowego filtra." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Nie można edytować pliku" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Nie można edytować pliku, nie podłączono do serwera." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Nie można edytować pliku, zdalna ścieżka nieznana." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1927,80 +2042,79 @@ "Nie można nawiązać połączenia FTP z serwerem SFTP. Wybierz odpowiedni " "protokół." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Nie można załadować paska szybkiego łączenia z pliku z zasobami" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Nie można załadować pliku klucza" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Nie można załadować paska narzędzi z pliku z zasobami" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Nie można zapamiętać hasła" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "Nie można zmienić nazwy wpisu" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Nie można zmienić nazwy pliku" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:136 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "Nie można ustalić nazwy hosta dla adresu IPv4 do użytku z proxy SOCKS4" -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Nie można zapisać zbioru filtrów" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Nie można wybrać filtra" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Nie można ustawić skojarzenia pliku" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Nie można wyświetlić okna" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Nie można wyświetlić/edytować zaznaczonego pliku" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Bez rozróżniania małych i dużych liter" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" -msgstr "Rozróżnianie małych i dużych liter" +msgstr "Bez rozróżniania małych i dużych liter" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Bez wielkości liter (domyślnie)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Rozróżnianie małych i dużych liter" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Z wielkością liter (domyślnie)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Kategorie do wyczyszczenia" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "Certyfikat oraz dane sesji nie są jeszcze dostępne." @@ -2012,37 +2126,41 @@ msgid "Certificate issuer" msgstr "Wystawca certyfikatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Nieudana weryfikacja podpisu certyfikatu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Żądanie:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Zmień atrybuty pliku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:298 msgid "Change the file permissions." msgstr "Zmień prawa dostępu do pliku." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Zmiana ustawień pliku dziennika wymaga ponownego uruchomienia FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Problem z kodowaniem znaków" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Kodowanie" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for &updates..." msgstr "&Sprawdź dostępność aktualizacji..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Sprawdzaj dostępność &aktualizacji programu FileZilla automatycznie:" @@ -2050,22 +2168,22 @@ msgid "Check for Updates" msgstr "Sprawdź dostępność aktualizacji" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for newer versions of FileZilla" msgstr "Sprawdź dostępność nowszej wersji FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Sprawdzenie dostępności aktualizacji nieudane" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "" "Sprawdź swoje dane logowania. Podane hasło rozpoczyna lub kończy się spacją." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2073,39 +2191,39 @@ "Sprawdź swoje dane logowania. Podana nazwa użytkownika rozpoczyna lub kończy " "się spacją." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Sprawdzanie zewnętrznego adresu IP" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Sprawdzanie aktualizacji..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "Suma kontrolna zgodna w pliku %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Suma kontrolna niezgodna w pliku %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "Wybierz plik klucza" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Wybierz domyślny katalog lokalny" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Wybierz katalog lokalny" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:670 msgid "Chunk data improperly terminated" msgstr "Fragment danych niepoprawnie zakończony" @@ -2113,55 +2231,63 @@ msgid "Cipher:" msgstr "Szyfr:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:408 +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Cl&ose tab" msgstr "Z&amknij kartę" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Klasyczny" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "Clear &layout cache" msgstr "Wy&czyść pamięć podręczną układu okien" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +msgid "Clear auto&update data" +msgstr "Wyczyść dane &automatycznej aktualizacji" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Wyczyść historię" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Wyczyść prywatne dane" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Wyczyść pasek szybkiego łączenia" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Kliknij na Zakończ, aby zapisać swoją konfigurację." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "MAC klienta dla serwera:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Szyfr klienta dla serwera:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Zamknij" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:411 msgid "Close &all other tabs" msgstr "Zamknij wszystkie inne karty" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "Close FileZilla" msgstr "Zamknij FileZilla" @@ -2169,104 +2295,108 @@ msgid "Close all running instances of FileZilla" msgstr "Zamknij wszystkie uruchomione kopie FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Zamknąć szybkie wyszukiwanie i kontynuować porównywanie?" + +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Closes current tab" msgstr "Zamyka bieżącą kartę" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "K&omentarze:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Właściwości kolumn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Ustawienia kolumn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." -msgstr "" -"Polecenie i jego argumenty powinny być poprawnie umieszczone w cudzysłowach." +msgstr "Polecenie i jego parametry powinny być poprawnie zacytowane." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Wykonanie polecenia nie powiodło się" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:506 msgid "Command not supported" msgstr "Polecenie nieobsługiwane" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Polecenie nieobsługiwane przez ten protokół" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Polecenie:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Komentarz" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Aktualna nazwa:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Połączenie zniekształcone przez router lub zaporę" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/menu_bar.cpp:92 msgid "Compare &modification time" msgstr "Porównaj czas &modyfikacji" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/menu_bar.cpp:91 msgid "Compare file&size" msgstr "Porównaj &rozmiar pliku" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Próg poró&wnywania (w minutach):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." -msgstr "Wartość progu porównywania musi być między 0 a 1440 minut." +msgstr "Wartość progu porównywania musi zawierać się między 0 a 1440 minut." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Skompilowano dla:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Skompilowano na:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Skompilowano z:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Flagi kompilatora:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Skompresowany" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Jednoczesne transfery" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Warunki &rozróżniają małe i duże litery" @@ -2282,41 +2412,42 @@ msgid "Configure port range" msgstr "Konfiguracja zakresu portów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" -msgstr "Konfiguracja FileZilli i Twojej sieci" +msgstr "Konfiguracja FileZilla i Twojej sieci" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Potwierdź usunięcie" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Wymagane potwierdzenie" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Gratulacje, wygląda na to, że Twoja konfiguracja działa." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Połącz z pominięciem ustawień serwera proxy" -#: ../../locales/../src/interface/netconfwizard.cpp:216 -#, fuzzy, c-format +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format msgid "Connect failed: %s" -msgstr "Żądanie proxy nie powiodło się: %s" +msgstr "Połączenie nieudane: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Połącz w aktywnej karcie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Połącz w nowej karcie" @@ -2324,29 +2455,26 @@ msgid "Connect to specified Site Manager site" msgstr "Połącz do podanego serwera z Menedżera Stron" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 -msgid "Connected" -msgstr "Połączono" - -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Łączenie" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Łączenie z %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Łączenie z %s poprzez proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Łączenie z %s..." @@ -2355,188 +2483,231 @@ msgid "Connection" msgstr "Połączenie" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Połączenie zamknięte" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Nieudana próba połączenia" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:208 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Nieudana próba połączenia z \"%s\", próbowanie następnego adresu." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Nieudana próba połączenia z \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Próba połączenia przerwana przez użytkownika" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Przekroczony czas oczekiwania na połączenie" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Połączenie zamknięte" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:305 +#: ../../locales/../src/engine/http/request.cpp:318 +#: ../../locales/../src/engine/http/request.cpp:329 +#: ../../locales/../src/engine/http/request.cpp:340 msgid "Connection closed by server" msgstr "Połączenie zakończone przez serwer" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "Połączenie nawiązane, inicjowanie TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "Połączenie nawiązane, wysyłanie żądania HTTP" -#: ../../locales/../src/interface/netconfwizard.cpp:333 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." -msgstr "Połączenie nawiązanie, oczekiwanie na wiadomość powitalną..." +msgstr "Połączenie nawiązanie, oczekiwanie na wiadomość powitalną." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Połączenie nawiązanie, oczekiwanie na wiadomość powitalną..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Połączenie zerwane" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "Connection not allowed by ruleset" msgstr "Połączenie niedozwolone przez zbiór reguł" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:500 msgid "Connection refused" msgstr "Połączenie odrzucone" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Połączenie odmówione przez serwer" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Połączenie zresetowane przez sieć" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Użytkownik resetuje połączenie" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Połączenie zakończone po %d sekundzie nieaktywności" msgstr[1] "Połączenie zakończone po %d sekundach nieaktywności" msgstr[2] "Połączenie zakończone po %d sekundach nieaktywności" +msgstr[3] "Połączenie zakończone po %d sekundach nieaktywności" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Przekroczony czas oczekiwania na połączenie." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Połączenie z serwerem przerwane." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "" "Połączenie z proxy nawiązanie, wykonywanie wymiany danych powitalnych..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Połączenie z serwerem zostało przedwcześnie zakończone." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Połączenie z serwerem testowym nie powiodło się." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Przekształć plik klucza" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Kopiowanie (%d) z %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "Kopiowanie z %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:98 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:294 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Skopiuj adresy URL wybranych elementów, wraz z hasłami do schowka." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:94 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopiuj adresy wybranych przedmiotów do schowka." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Nie można nawiązać połączenia: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Nie można uzyskać dostępu do ścieżki %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Nie można dodać certyfikatu do tymczasowej listy zaufania" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Nie można dodać połączenia do Menedżera Stron" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Nie można ukończyć operacji" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Nie można połączyć się z serwerem" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Nie można połączyć się z serwerem: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Nie można przetworzyć polecenia na kodowanie serwera" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Nie można przekształcić prywatnego klucza" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Nie można skopiować adresów" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Nie można skopiować certyfikatu" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Nie można skopiować danych" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Nie można utworzyć CFURL ze ścieżki %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Nie można utworzyć identyfikatora URI dla tego transferu." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Nie można stworzyć pliku lokalnego %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Nie można stworzyć śledzenia mutex'u: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "" +"Nie można utworzyć zakładki o określonym zakresie bezpieczeństwa z adresu " +"URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2546,11 +2717,11 @@ "Rozszerzenie powłoki nie jest poprawnie zainstalowane lub pliki nie zostały " "przeciągnięte do okna Explorera." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Nie można nawiązać połączenia z serwerem" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2562,11 +2733,16 @@ "datadir <ścieżka>' lub przez ustawienie wartości zmiennej środowiskowej " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Nie można wygenerować własnej sekwencji logowania." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Nie można wygenerować klucza" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2574,7 +2750,7 @@ "Nie można otrzymać nazwy wydawcy certyfikatu, gnutls_x509_get_issuer_dn nie " "powiodło się" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2582,41 +2758,36 @@ "Nie można otrzymać nazwy podmiotu certyfikatu, gnutls_x509_get_dn nie " "powiodło się" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Nie można uzyskać pełnej ścieżki zdalnej." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Nie udało się uzyskać natywnej ścieżki od CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Nie można uzyskać ścieżki z adresu URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Nie można pobrać odpowiedzi z fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "Nie można znaleźć katalogu tymczasowego do zapisania w nim pliku." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Nie można zaimportować certyfikatu drugiej strony, gnutls_x509_crt_import " -"nie powiodło się" - -#: ../../locales/../src/interface/FileZilla.cpp:108 -#, fuzzy, c-format +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format msgid "Could not initialize Winsock (%d): %s" -msgstr "Nie można zapisać do gniazda: %s" - -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Nie można zainicjować struktury certyfikatów drugiej strony, " -"gnutls_x509_crt_init nie powiodło się" +msgstr "Nie Udało się zainicjować Winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2626,15 +2797,21 @@ "Nie można załadować \"%s\", upewnij się, że plik jest poprawny i dostępny.\n" "Wszystkie zmiany dokonane w Menedżerze Stron nie zostaną zapisane." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Nie można załadować pliku klucza" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Nie można załadować prywatnego klucza" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2645,7 +2822,7 @@ "'%s'.\n" "Wyłączyć synchronizowane przeglądanie i kontynuować zmianę katalogu zdalnego?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2656,7 +2833,7 @@ "'%s'.\n" "Synchronizowane przeglądanie zostało wyłączone." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2667,74 +2844,112 @@ "'%s'.\n" "Synchronizowane przeglądanie zostało wyłączone." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Nie można uzyskać rozmiaru '%s'" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Nie można otworzyć %s" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Nie można otworzyć schowka" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Nie można otworzyć pliku dziennika: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Nie można zanalizować zdalnej ścieżki." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Nie można zanalizować adresu serwera:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 -#, fuzzy +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Nie można czytać z %s" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." -msgstr "Nie można czytać z gniazda: %s" +msgstr "Nie można odczytać danych z gniazda." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:382 #, c-format msgid "Could not read from socket: %s" msgstr "Nie można czytać z gniazda: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Nie można odczytać elementu serwera." -#: ../../locales/../src/interface/netconfwizard.cpp:344 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." -msgstr "Nie można połączyć się z serwerem" +msgstr "Nie udało się otrzymać danych z serwera." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Nie można przejść na pozycję %s w pliku" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Nie można przywrócić dostępu do katalogu" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Nie można przejść na pozycję %d w pliku" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Nie można przejść na początek pliku" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Nie można przejść na koniec pliku" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Nie można wysłać polecenia do fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Nie można wysłać polecenia do fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Nie można sortować certyfikatów drugiej strony" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "Nie można utworzyć wątku IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Nie można zacząć wymiany danych powitalnych z serwerem proxy: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Nie można rozpocząć transferu" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2743,18 +2958,18 @@ "Nie można zapisać \"%s\", zmiany w Menedżerze Stron, które nie zostały " "zapisane: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Nie można zapisać \"%s\", zakładka nie mogła zostać dodana: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Nie można zapisać \"%s\", globalne zakładki nie mogły zostać zapisana: %s" -#: ../../locales/../src/interface/QueueView.cpp:1847 +#: ../../locales/../src/interface/QueueView.cpp:1590 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2763,120 +2978,122 @@ "Nie można zapisać \"%s\", kolejka nie mogła zostać zapisana.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Nie można zapisać \"%s\", wybrane witryny nie mogły być wyeksportowane: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Nie można zapisać \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Nie można zapisać pliku klucza: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Nie można zapisać do pliku lokalnego" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Nie można zapisać do pliku dziennika: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:237 #, c-format msgid "Could not write to socket: %s" msgstr "Nie można zapisać do gniazda: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Kraj:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:77 msgid "Crea&te new file" msgstr "Utwórz &nowy plik" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "Utwórz lokalny &katalog i otwórz go" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "Utwórz zdalny &katalog i otwórz go" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 msgid "Create a new subdirectory in the current directory" msgstr "Utwórz nowy podkatalog w bieżącym katalogu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:345 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Utwórz nowy podkatalog w bieżącym katalogu i przejdź do niego" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 msgid "Create a new, empty file in the current directory" msgstr "Utwórz nowy pusty plik w aktualnym katalogu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:33 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:73 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:344 msgid "Create director&y and enter it" msgstr "Utwórz &katalog i otwórz go" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Utwórz katalog" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "Utwórz pusty plik" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Tworzenie katalogu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Tworzenie katalogu '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Błąd krytyczny" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Błąd krytyczny:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Błąd krytyczny transferu pliku" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Błąd krytyczny transferu pliku po przeniesieniu %s w %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2886,97 +3103,102 @@ "synchronizacji (%s).\n" "Synchronizowane przeglądanie zostało wyłączone." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." -msgstr "Bieżący typ transferu jest ustawiony na ASCII." +msgstr "Bieżący tryb transferu jest ustawiony na ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." -msgstr "Bieżący typ transferu jest ustawiony na wykrywanie automatyczne." +msgstr "Bieżący tryb transferu jest ustawiony na wykrywanie automatyczne." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." -msgstr "Bieżący typ transferu jest ustawiony na binarny." +msgstr "Bieżący tryb transferu jest ustawiony na binarny." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Krzywa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Włas&ne" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Własny zestaw filtrów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Własny serwer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Błękitny" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" -msgstr "Typ d&anych" +msgstr "Rodzaj d&anych" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Prefiksy &dziesiętne, używające symboli SI (np. 1 KB = 1000 bajtów)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "&Domyślny" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:85 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:387 msgid "D&elete" msgstr "&Usuń" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "Poró&wnywanie katalogów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Deaktywuj wszystkie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "&Nie zapisuj haseł" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Akcja &dwukrotnego kliknięcia na katalogach:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "&Duplikuj" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:58 msgid "DOS-like with virtual paths" msgstr "Wirtualne ścieżki w stylu DOS" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Niebezpieczny typ pliku" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Dane" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Gniazdo danych zamknięte zbyt wcześnie." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Data" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Format daty" @@ -2992,41 +3214,41 @@ msgid "Debug" msgstr "Debugowanie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Ustawienia debugowania" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Domyślny katalog lokalny:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:50 msgid "Default (Autodetect)" msgstr "Wykryj automatycznie" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." -msgstr "Domyślny edytor niepoprawnie wywołany z cytowaniem." +msgstr "Niepoprawne cytowanie domyślnego edytora." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Domyślna akcja dla istniejącego pliku" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Domyślny katalog zdalny:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." msgstr "" "Domyślna ścieżka nie może być zanalizowana. Upewnij się, czy jest poprawna i " -"obsługiwana przez wybrany typ serwera." +"obsługiwana przez wybrany rodzaj serwera." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Domyślny język systemu" @@ -3034,12 +3256,12 @@ msgid "Default transfer mode:" msgstr "Domyślny tryb transferu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Domyślny tryb transferu:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Domyślnie: http://ip.filezilla-project.org/ip.php" @@ -3047,10 +3269,10 @@ msgid "" "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "" -"Opóźnienie między nieudanymi próbami połączenia musi być między 1 a 999 " -"sekund." +"Opóźnienie między nieudanymi próbami połączenia musi zawierać się między 1 a " +"999 sekund." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3067,76 +3289,89 @@ msgstr[2] "" "Opóźnianie połączenia na %d sekund z powodu wcześniejszej nieudanej próby " "połączenia..." +msgstr[3] "" +"Opóźnianie połączenia na %d sekund z powodu wcześniejszej nieudanej próby " +"połączenia..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "Wyczyść wpis Menedżera Stron" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:282 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Delete selected directory" msgstr "Usuń zaznaczony katalog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:42 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 msgid "Delete selected files and directories" msgstr "Usuń zaznaczone pliki i katalogi" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Usuwanie \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Usuwanie plików (%u) z \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Usuwanie linka symbolicznego" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Pulpit" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Szczegóły" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Szczegóły nowego klucza:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "Wykryto nowszą wersję FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "&Katalogi" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Direction" msgstr "Kierunek" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Katalogi:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Katalog" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Uprawnienia dostępu do katalogu" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:302 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Porównywanie katalogów" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Porównanie katalogów nie powiodło się" @@ -3146,38 +3381,42 @@ "Katalog zawierający plik dziennika nie istnieje lub nazwa pliku jest " "nieprawidłowa." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/menu_bar.cpp:83 +msgid "Directory listing &filters..." +msgstr "&Filtry listy katalogów..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Listowanie katalogów przerwane przez użytkownika" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "Listowanie katalogów nieudane" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Filtry listy katalogów" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Listowanie katalogów w \"%s\" zakończone pomyślnie" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Listowanie katalogów zakończone pomyślnie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Deaktywuj wszystkie" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Wyłączyć synchronizowane przeglądanie i kontynuować zmianę katalogu zdalnego?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3185,86 +3424,81 @@ "Wyłącz tę opcję ponownie, jeśli nie będziesz widzieć prawidłowej zawartości " "katalogu." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Odłącz od serwera" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:238 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Odłączono od serwera" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Odłączono od serwera: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Odłączanie od poprzedniego serwera" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Odłącza od aktualnie widocznego serwera" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "Display about dialog" msgstr "Pokaż okno O FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "&Nie używaj domyślnego edytora" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Brak &akcji" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Zrób to samo dla &każdego edytowanego pliku z wybranych" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Czy na pewno chcesz zamknąć FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Czy na pewno chcesz usunąć wszystkie wpisy Menedżera Stron oraz transfery z " "kolejki?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Czy na pewno chcesz usunąć wszystkie wpisy Menedżera Stron?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Czy na pewno chcesz usunąć zaznaczony wpis?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Czy na pewno chcesz usunąć wszystkie transfery z kolejki?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Czy na pewno chcesz wysłać '%s' do serwera?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Chcesz ponownie otworzyć ten plik?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Dokumentacja" @@ -3272,47 +3506,47 @@ msgid "Don't use external IP address on &local connections." msgstr "Nie używaj zewnętrznego adresu IP przy połączeniach lokalnych." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "Plik zaczynający się od kropki to przykładowo .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Akcja dwukrotnego kliknięcia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Pobieranie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Limit pobierania:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "Limit pobierania: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Limit pobierania: brak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Pobierz wyniki wyszukiwania" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "Download selected directory" msgstr "Pobierz zaznaczony katalog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:53 msgid "Download selected files and directories" msgstr "Pobierz zaznaczone pliki i katalogi" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3321,24 +3555,24 @@ "Prędkość pobierania: %s/s\n" "Prędkość wysyłania: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Pobieranie" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Pobieranie %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Pobieranie aktualizacji..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 #: ../../locales/../src/interface/QueueView.cpp:88 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3346,11 +3580,11 @@ "Operacja drag&drop pomiędzy różnymi instancjami FileZilla nie została " "jeszcze zaimplementowana." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:101 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Operacja drag&drop pomiędzy różnymi serwerami nie została jeszcze " @@ -3360,65 +3594,65 @@ msgid "Dupl&icate" msgstr "Dupl&ikuj" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "Aktywuj wszystkie" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:15 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 msgid "E&nter directory" msgstr "&Otwórz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Wy&konaj" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "E&xit" msgstr "&Zakończ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:187 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 msgid "E&xport..." msgstr "&Eksportuj..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "E-mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Każdy filtr potrzebuje przynajmniej jednego warunku." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Edytuj filtry" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:25 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Edytuj plik za pomocą zdefiniowanego edytora i wyślij zmiany na serwer." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "Edytowanie katalogów nie jest wspierane" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Edytowanie nie powiodło się" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Edytowanie wyników wyszukiwania" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "E-mail:" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "Empty command" msgstr "Puste polecenie" @@ -3426,7 +3660,7 @@ msgid "Empty command." msgstr "Puste polecenie." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "Pusta lista katalogów" @@ -3434,23 +3668,17 @@ msgid "Empty directory." msgstr "Pusty katalog." -#: ../../locales/../src/interface/recursive_operation.cpp:377 -#: ../../locales/../src/interface/recursive_operation.cpp:412 -#, fuzzy -msgid "Empty dirs to visit" -msgstr "Pusta lista katalogów" - #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Puste rozszerzenie pliku." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Puste nazwy filtra nie są dozwolone." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Pusta nazwa" @@ -3458,81 +3686,97 @@ msgid "Empty quoted string." msgstr "Pusty ciąg." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Aktywuj wszystkie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Włącz &filtrowanie nieprawidłowych znaków" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Zaszyfrowany" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Szyfrowanie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Klucz szyfrowania:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Klucz szyfrowania:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Szczegóły szyfrowania" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Zakończyć porównywanie i zmienić porządek sortowania?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Zakończyć porównywanie i otworzyć szybkie wyszukiwanie?" + +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Enter &custom command..." msgstr "&Wprowadź dowolne polecenie..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Wpisz 0 dla nieograniczonej prędkości." -#: ../../locales/../src/interface/QueueView.cpp:2109 +#: ../../locales/../src/interface/QueueView.cpp:1878 msgid "Enter command" msgstr "Wprowadź polecenie" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Wprowadź dowolne polecenie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" -msgstr "Podaj katalog" +msgstr "Wejdź do katalog" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Wprowadź nazwę filtra" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Wprowadź hasło główne" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Wprowadź nazwę zestawu filtrów" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Wprowadź nową nazwę zestawu filtrów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Wprowadź hasło" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:62 msgid "Enter selected directory" -msgstr "Podaj zaznaczony katalog" +msgstr "Wejdź do zaznaczonego katalog" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3540,19 +3784,19 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Wprowadź adres serwera.\n" -"Aby określić protokół serwera, dodaj na początku identyfikator protokołu. " -"Jeśli nie określisz protokołu, zostanie użyty domyślny protokół (ftp://).\n" -"Możesz także wprowadzać całe adresy w formie protokół://użytkownik:" -"hasło@host:port, wartości innych pół zostaną wtedy zamienione.\n" +"Wprowadź adres serwera. Aby określić protokół serwera, dodaj na początku " +"identyfikator protokołu. Jeśli nie określisz protokołu, zostanie użyty " +"domyślny protokół (ftp://). Możesz także wprowadzać pełne adresy URL w " +"formie protokół://użytkownik:hasło@host:port, wartości w innych polach " +"zostaną nadpisane.\n" "\n" "Wspierane protokoły:\n" -"ftp:// dla zwykłego FTP z opcjonalnym szyfrowaniem,\n" -"sftp:// dla protokołu transferu plików SSH,\n" -"ftps:// dla FTP przez TLS (domniemany) i\n" -"ftpes:// dla FTP przez TLS (bezpośredni)." +"- ftp:// dla zwykłego FTP z opcjonalnym szyfrowaniem\n" +"- sftp:// dla protokołu transferu plików SSH\n" +"- ftps:// dla FTP przez TLS (domniemany)\n" +"- ftpes:// dla FTP przez TLS (bezpośredni)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3561,118 +3805,134 @@ "Wprowadź hasło do pliku '%s'.\n" "Przekształcony plik nie będzie chroniony hasłem." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Wprowadź port nasłuchu serwera.\n" -"Domyślnie dla FTP jest to 21, a dla SFTP 22." +"Wprowadź port nasłuchu serwera. Domyślnie dla FTP jest to 21, a dla SFTP 22." -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Wprowadź nazwę użytkownika" + +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Wprowadź nazwę użytkownika i hasło" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Błąd" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Błąd eksportowania ustawień" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Błąd importowania" -#: ../../locales/../src/interface/QueueView.cpp:1909 +#: ../../locales/../src/interface/QueueView.cpp:1668 msgid "Error loading queue" msgstr "Błąd przy wczytywaniu kolejki" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1830 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1571 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Błąd ładowania pliku XML" -#: ../../locales/../src/interface/QueueView.cpp:1819 +#: ../../locales/../src/interface/QueueView.cpp:1560 msgid "Error saving queue" msgstr "Błąd przy zapisywaniu kolejki" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Błąd podczas uruchomienia programu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1848 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1591 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Błąd zapisywania pliku XML" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Błąd:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Przykład: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Przykłady" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Wyko&naj" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Plik wykonywalny nie zawiera informacji o wersji, nie można sprawdzić " "aktualizacji." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Eksplorator" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Eksportuj &filtry" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Eksportuj &kolejkę" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Eksportuj &ustawienia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Eksportuj ustawienia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "&Nazwa filtra:" @@ -3680,31 +3940,30 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - protokół transferu plików" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - protokół transferu plików z możliwością szyfrowania" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - niezabezpieczony protokół transferu plików" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Nie zainicjowano silnika FTP, nie można się połączyć" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Podtrzymywanie FTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" -msgstr "FTP Proxy" +msgstr "Proxy FTP" #: ../../locales/../src/interface/cmdline.cpp:21 msgid "FTP URL" @@ -3718,153 +3977,164 @@ "FTP używa podwójnych połączeń dla transferów danych. Te dodatkowe połączenia " "mogą zostać nawiązane na dwa sposoby." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP: Typy plików" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP przez bezpośredni TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP przez domniemany TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Nie udało się zmienić katalogu" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Nie udało się zmienić języka" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Nie udało się przekonwertować polecenia na 8-bitowy zestaw znaków" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "Nie udało się skopiować lub przenieść lokalizacji" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Nie udało się stworzyć kopii zapasowej pliku XML" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Nie udało się utworzyć nasłuchującego gniazda, przerywanie" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Nie udało się utworzyć gniazda nasłuchu na porcie %d, przerwanie." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Nie udało się utworzyć nasłuchującego gniazda dla aktywnego trybu transferu" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Nie można odszyfrować hasła serwera." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Nie udało się pobrać ścieżki do katalogu 'Moje dokumenty'" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Nie udało się pobrać ścieżki do pulpitu" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Nie udało się otrzymać adresu połączenia sterującego drugiej strony, " "połączenie zakończone." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Nie udało się otrzymać adresu połączenia danych drugiej strony, połączenie " "zakończone." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Nie udało się zainicjować silnika FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "Nie udało się zainicjalizować TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 -#, fuzzy +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" -msgstr "Nie udało się zainicjować silnika FTP" +msgstr "Nie udało się zainicjować sieci" #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Nie udało się załadować paneli, nieprawidłowy pliki z zasobami?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Nie powiodło sie załadowanie prywatnego klucza: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Nie udało się otworzyć \"%s\" do dopisywania/pisania" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Nie udało się otworzyć \"%s\" do odczytu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Nie udało się otworzyć \"%s\" do zapisu" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "Nie można zanalizować zwróconej ścieżki." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Nie udało się otrzymać danych" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Nie udało się otrzymać listy katalogów" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Nie udało się uzyskać zewnętrznego adresu IP, przerywanie" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" -msgstr "Nie udało się uzyskać zewnętrznego adresu IP, używam lokalnego adresu" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Nie udało się uzyskać lokalnego adresu IP." - -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Nie udało się uzyskać lokalnego adresu IP. Przerywanie" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Nie można pobrać zewnętrznego adresu IP, przerwanie." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" +msgstr "Nie można pobrać zewnętrznego adresu IP przy użyciu lokalnego adresu" + +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Nie można pobrać lokalnego adresu IP, przerwanie." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Nie można pobrać lokalnego adresu IP." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Nie udało się uzyskać zewnętrznego adresu IP." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Nie udało się wysłać polecenia." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Nie udało się ustawić języka na %s (%s), nastąpi użycie domyślnego języka " "systemu" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3872,47 +4142,46 @@ "Nie udało się ustawić języka na %s (%s), nastąpi użycie domyślnego języka " "systemu (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Nie udało się ustawić języka na %s (%s), nastąpi użycie domyślnego języka " "systemu." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Nie udało się ustawić języka na %s, nastąpi użycie domyślnego języka systemu" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Nie udało się ustawić języka na %s, nastąpi użycie domyślnego języka systemu " "(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Nie udało się ustawić języka na %s, nastąpi użycie domyślnego języka systemu." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Nie udało się sprawdzić ustawień" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Nie udało się zweryfikować certyfikatu drugiej strony" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Nie udało się zapisać do pliku %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Nie udało się zapisać pliku XML" @@ -3924,27 +4193,23 @@ msgid "Fall back to active mode" msgstr "Wróć do trybu aktywnego." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "P&lik:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "P&liki" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Plik" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Typy plików" - -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Plik nie opisuje gniazda" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Plik nie zawiera danych, które można by zaimportować." @@ -3952,7 +4217,7 @@ msgid "File editing" msgstr "Edycja pliku" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "Plik istnieje" @@ -3960,7 +4225,7 @@ msgid "File exists action" msgstr "Akcja dla istniejącego pliku" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Plik został zmieniony" @@ -3968,63 +4233,67 @@ msgid "File lists" msgstr "Listy plików" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Nie znaleziono pliku" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Wyszukiwanie plików" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Transfer plików przerwany przez użytkownika" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Transfer plików przerwany przez użytkownika po przeniesieniu %s w %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Transfer plików nie powiódł się" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Transfer plików nie powiódł się po przeniesieniu %s w %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Transfer plików pominięty" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Transfer plików zakończony pomyślnie" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Transfer plików zakończony pomyślnie, przeniesione %s w %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." -msgstr "Transfer plików jeszcze trwa." +msgstr "Transfer plików wciąż trwa." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." -msgstr "Plik byłby transferowany z typem danych ASCII." +msgstr "Plik byłby przesyłany w trybie ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." -msgstr "Plik byłby transferowany z binarnym typem danych." +msgstr "Plik byłby przesyłany w trybie binarnym." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Błąd FileZilla" @@ -4032,63 +4301,61 @@ msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." -msgstr "FileZilla może teraz przetestować poprawność konfiguracji." +msgstr "" +"FileZilla może teraz przetestować poprawność konfiguracji, aby upewnić się " +"czy wszystko jest w porządku." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla już jest podłączona do serwera." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" -"FileZilla musi zostać zrestartowany, aby zmiana języka przyniosła efekt." +"Należy uruchomić ponownie FileZilla, aby zmiana języka przyniosła efekt." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Aktualizacje FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/menu_bar.cpp:98 msgid "Filelist status &bars" msgstr "Paski &statusu listy plików" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Nazwa pliku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Filtry nazw plików..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Nie można utworzyć nazwy pliku dla katalogu %s i nazwy pliku %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "Nieprawidłowa nazwa pliku" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Nazwa pliku niezmieniona" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Nazwa pliku:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "" "Nazwy plików nie mogą zawierać żadnego z następujących znaków: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" @@ -4096,14 +4363,22 @@ "Nazwa pliku nie może zawierać żadnego z następujących znaków: / \\ : * ? \" " "< > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Pliki obecnie edytowane" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Pliki pasujące do reguły filtrowania są usuwane z listy katalogów." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Nie znaleziono plików" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Rozmiar pliku" @@ -4111,50 +4386,54 @@ msgid "Filesize format" msgstr "Format rozmiaru pliku" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Typ pliku" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Skojarzenia typu plików" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Filtr stosowany do:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Filtruj nieprawidłowe znaki w nazwach plików" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Nazwa filtra już istnieje" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Filtruj pozycje pasujące do wszystkiego z następujących" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Filtruj pozycje pasujące do czegokolwiek z następujących" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Filtruj pozycje nie pasujące do żadnego z następujących" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Filtruj pozycje niepasujące do wszystkiego z następujących" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Zbiór filtrów już istnieje" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtruj listy katalogów" @@ -4164,11 +4443,11 @@ msgid "Filter validation failed" msgstr "Walidacja filtra nieudana" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Znajdź &pliki" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Znajdź &katalogi" @@ -4180,16 +4459,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Odcisk palca (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Hash:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Odciski palców:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Kreator konfiguracji zapory i routera" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4203,7 +4483,7 @@ "Dla pewności powinien zostać podany przedział zawierający co najmniej 10 " "portów." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4211,35 +4491,40 @@ "Dla tej sesji zostaną użyte domyślne ustawienia. Żadne zmiany ustawień nie " "zostaną zapamiętane." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Wymuś &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/menu_bar.cpp:148 msgid "Force showing &hidden files" msgstr "Wymuś wyświetlanie &ukrytych plików" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Wymuś wyświetlanie ukrytych plików" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Określenia formatu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" -"Format: Po rozszerzeniu powinno następować prawidłowo cytowane polecenie i " -"argumenty." +"Format: po rozszerzeniu powinno następować prawidłowo zacytowane polecenie i " +"parametry." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Znaleziono nowe %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Funkcja %s nie powiodła się" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Dalsza dokumentacja" @@ -4247,142 +4532,158 @@ msgid "General" msgstr "Ogólne" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "General SOCKS server failure" -msgstr "Awaria serwera SOCKS" +msgstr "Ogólna awaria serwera SOCKS" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Wygeneruj..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" -msgstr "Ogólne proxy" +msgstr "Typowe proxy" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" msgstr "Pobierz zewnętrzny adres IP z następującego adresu:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Uzyskiwanie pomocy" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Podana nazwa zestawu filtrów już istnieje, nadpisać zestaw filtrów?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Globalne zakładki" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Błąd GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Błąd GnuTLS %d w %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Błąd GnuTLS %d w %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Błąd GnuTLS %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Zielony" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Grupowe prawa dostępu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 msgid "H&igh" msgstr "&Wysoki" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP przez TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Hash:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Ukryty" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:1002 +#: ../../locales/../src/interface/queue.cpp:1064 msgid "High" msgstr "Wysoka" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:1004 +#: ../../locales/../src/interface/queue.cpp:1066 msgid "Highest" msgstr "Najwyższy" #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." -msgstr "Najwyższy dostępny port musi być między 1024 a 65535." +msgstr "Najwyższy dostępny port musi zawierać się między 1024 a 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Przytrzymaj shift w celu przełączenia stanu filtra jednocześnie dla obu " "stron." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Strona domowa:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Host jest wyłączony" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Hash klucza hosta:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Niezgodność klucza hosta" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Host rozpoczyna się od '[', jednak brakuje nawiasu zamykającego." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Host unreachable" msgstr "Host nieosiągalny" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Host:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algorytm klucza hosta:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "godzin," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Zapomniałem &głównego hasła. Usuń wszystkie hasła zapisane tym kluczem." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (przykład: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:115 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Adresy IPv6 nie są wspierane z proxy SOCKS4" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4392,7 +4693,7 @@ "okres dłuższy niż określony czas, połączenie zostanie zamknięte, a FileZilla " "spróbuje ponowić połączenie." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "Jeśli zgłaszasz błędy, dołącz dzienniki z trybem 'Szczegółowe'." @@ -4406,7 +4707,7 @@ "Jeśli powiedzie się automatyczny test na końcu tego kreatora, a przesyłanie " "plików do określonego serwera nie będzie możliwe, serwer może być źle " "skonfigurowany i powinien zostać sprawdzony tryb aktywny. Możesz ustawić " -"tryb transferu dla każdego serwera w Menedżerze Stron." +"tryb transferu osobno dla każdego serwera w Menedżerze Stron." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 msgid "" @@ -4416,7 +4717,7 @@ "Jeśli opcja powrotu została zaznaczona, możliwe będzie łączenie się ze źle " "skonfigurowanymi serwerami, które odrzucają wybrany tryb transferu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4424,7 +4725,7 @@ "Jeżeli zmiana klucza nie była oczekiwana, skontaktuj się z administratorem " "serwera." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4432,14 +4733,14 @@ "Jeśli ten problem nie zniknie, jakiś router i/lub zapora blokuje program " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "" "Jeśli ten problem nie zniknie, jakiś router i/lub zapora przerywa połączenie." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4449,7 +4750,7 @@ "zmieniona nazwa przez dodanie \".1\" na końcu nazwy pliku (ewentualnie " "zostaną nadpisanie starsze pliki dziennika) i zostanie utworzony nowy plik." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4457,7 +4758,7 @@ "Jeśli link symboliczny wskazuje katalog, FileZilla może albo usunąć link " "symboliczny albo usunąć zawartość powiązanego katalogu." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4465,13 +4766,13 @@ "Jeśli ten problem nie zniknie, skontaktuj się z producentem Twojego routera " "lub zapory." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Jeśli ten problem nie zniknie, skontaktuj się z producentem Twojego routera." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4479,9 +4780,9 @@ msgstr "" "W przypadku użycia 'Zamień, jeśli nowszy', czas systemowy musi być " "zsynchronizowany z serwerem. Jeśli istnieje różnica (np. inna strefa " -"czasowa), określ przesunięcie w Menedżerze Stron." +"czasowa), określ przesunięcie strefy czasowej w Menedżerze Stron." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4489,9 +4790,9 @@ "Jeśli jest używane porównywanie oparte na czasie, przyjmij, że dwa pliki są " "jednakowe, jeżeli różnica w czasie nie przekracza tego progu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." -msgstr "If you change the language, you need to restart FileZilla." +msgstr "Po zmianie języka należy uruchomić ponownie FileZilla." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" @@ -4501,24 +4802,24 @@ "Jeśli klikniesz przetestuj, FileZilla połączy się z probe.filezilla-project." "org i wykona kilka prostych testów." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Jeśli zamkniesz program FileZilla, Twoje zmiany zostaną utracone." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "" -"Jeśli wprowadzisz błędne rodzaje plików, te pliki mogą zostać uszkodzone " -"podczas transferu." +"Pliki mogą zostać uszkodzone podczas transferu, jeśli wprowadzisz ich błędne " +"typy." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." msgstr "" "Zwrócenie błędów będzie oznaczało, że Twoja konfiguracja nie jest poprawna." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4526,7 +4827,7 @@ "Jeśli masz problemy z uzyskiwaniem listy katalogów albo z transferem plików, " "spróbuj zmienić domyślny tryb transferu." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4560,49 +4861,49 @@ "Jeśli używasz routera, upewnij się, że wszystkie te porty są przekierowane " "do komputera, na którym została uruchomiona FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "" "Jeśli Twój router ciągle zmienia adres IP, skontaktuj się z jego producentem." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importuj dane ze starszej wersji" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Importuj ustawienia" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Importowanie pomyślne" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 msgid "Improperly quoted association." -msgstr "Niepoprawnie zapisane cytowanie w skojarzeniu." +msgstr "Niepoprawnie zacytowane skojarzenia." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" "In active mode, FileZilla has to listen on a port for data transfers. You " "have to specify which ports FileZilla will use." msgstr "" -"W trybie aktywnym, FileZilla musi nasłuchiwać na porcie do transferów " -"danych. Musisz podać, których portów FileZilla ma użyć." +"W trybie aktywnym, FileZilla musi nasłuchiwać portu transferów danych. " +"Należy podać których portów FileZilla ma użyć." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 msgid "" "In case you have a router, you will have to forward all available ports, as " "FileZilla has no influence on the ports your system chooses." msgstr "" -"W sytuacji, gdy masz router, musisz przekierować wszystkie dostępne porty, " -"jako że FileZilla nie ma wpływu na porty wybierane przez Twój system." +"Jeśli używasz routera, należy przekierować wszystkie dostępne porty, jako że " +"FileZilla nie ma wpływu na porty wybierane przez Twój system." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4620,19 +4921,11 @@ "serwer o port i łączy się z podanym portem. Do tego nie potrzeba wiele " "konfiguracji." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Niekompletny łańcuch, górny certyfikat nie jest samopodpisanym certyfikatem " -"urzędu certyfikacji" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Nieprawidłowe hasło" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4640,21 +4933,21 @@ "Informacje o najnowszej wersji FileZilla nie mogły zostać pobrane. Proszę " "spróbować ponownie później." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Inicjowanie TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:107 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "Niebezpieczny algorytm!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Niezabezpieczony serwer, nie obsługuje FTP przez TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:611 +#: ../../locales/../src/engine/server.cpp:635 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Interaktywny" @@ -4662,29 +4955,29 @@ msgid "Interface" msgstr "Interfejs" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Przerwane na sygnał" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Przerwane przez użytkownika" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:161 +#: ../../locales/../src/engine/http/request.cpp:584 msgid "Invalid Content-Length" msgstr "Nieprawidłowy znacznik Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:490 msgid "Invalid HTTP Response" msgstr "Nieprawidłowa odpowiedź HTTP" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" -msgstr "Nieprawidłowo podany argument" +msgstr "Nieprawidłowo podany parametr" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4692,45 +4985,69 @@ "Otrzymano nieprawidłową sekwencję znaków, wyłączanie UTF-8. Wybierz opcję " "UTF-8 w Menedżerze Stron, aby wymusić UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:705 msgid "Invalid chunk size" msgstr "Nieprawidłowy rozmiar fragmentu" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Otrzymano nieprawidłowe dane" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Nieprawidłowa data" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Nieprawidłowa nazwa pliku" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Nieprawidłowy hash: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Nieprawidłowy host, po nawiasie zamykającym może znajdować się tylko " "dwukropek i port." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Nieprawidłowa nazwa hosta: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Nieprawidłowe wejście" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:518 +msgid "Invalid line" +msgstr "Nieprawidłowy wiersz" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Nieprawidłowa ścieżka" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." -msgstr "Nieprawidłowy port. Numer portu musi być liczbą od 1 do 65535." +msgstr "Nieprawidłowy port. Numer portu musi zawierać się między 1 a 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4744,74 +5061,74 @@ "ftps:// dla FTP przez TLS (domniemany) i\n" "ftpes:// dla FTP przez TLS (bezpośredni)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Nieprawidłowy host, po nawiasie zamykającym może znajdować się tylko " "dwukropek i port." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Nieprawidłowe wyrażenie regularne" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Nieprawidłowe wyrażenie regularne w warunkach wyszukiwania." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:499 msgid "Invalid response code" msgstr "Nieprawidłowy kod odpowiedzi" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Nieprawidłowe warunki wyszukiwania: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Nieprawidłowa ścieżka adresu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Nieprawidłowy rozmiar w warunku" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Nieprawidłowa nazwa użytkownika." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Nieprawidłowa wartość dla ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Nieprawidłowa wartość dla wskazówek" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Odwróć filtr" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Jurysdykcja kraju:" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Jurysdykcja regionalna:" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Jurysdykcja państwa lub prowincji:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Katalogi na wierzchu" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4821,7 +5138,7 @@ "nieprawidłowe listy, jeśli ta opcja jest włączona. FileZilla wykonuje testy, " "aby sprawdzić, czy serwer obsługuje tę opcję, lecz mogą one się nie powieść." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Wymiana klucza" @@ -4829,123 +5146,146 @@ msgid "Key exchange:" msgstr "Wymiana klucza:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:608 +#: ../../locales/../src/engine/server.cpp:633 msgid "Key file" msgstr "Plik klucza" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Identyfikator klucza:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 msgid "L&owest" msgstr "N&ajniższy" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Język" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Język zmieniony" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Data modyfikacji" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Układ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Pozostaw puste, aby zachować istniejące hasło." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Limit jednoczesnych pobierań:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Limit jednoczesnych wysyłań:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Ograniczenia lokalnych portów" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Limit rozmiaru pliku dziennika" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Limit:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:659 msgid "Line length exceeded" msgstr "Długość linii przekroczona" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" -msgstr "Związana z" +msgstr "Zależności" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Gniazdo nasłuchujące zamknięte" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Lista:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "&Najniższy dostępny port:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Lokalny" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Adres lokalny w użyciu" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Lokalny punkt końcowy został zamknięty" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Plik lokalny" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Plik lokalny nie istnieje." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Plik lokalny: %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Plik lokalny jest katalogiem zamiast normalnym plikiem." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Plik lokalny posiada nieprawidłową nazwę." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Wyszukiwanie plików lokalnych" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Filtry lokalne:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Obsługa zdalnej ścieżki:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Adres lokalny:" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "Lokalny rozmiar '%s' nie zgadza się z oczekiwanym rozmiarem: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Lokalizacja:" @@ -4953,20 +5293,24 @@ msgid "Log file" msgstr "Plik dziennika" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Zalogowany" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Dziennik" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." msgstr "" "Dane logowania zawierają znaki spoza ASCII i serwer może nie obsługiwać " -"UTF-8. Nie można zastosować lokalnego zestawu znaków używając proxy." +"UTF-8. Nie można zastosować lokalnego zestawu znaków z powodu użycia proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4974,15 +5318,14 @@ "Dane logowania zawierają znaki spoza ASCII i serwer może nie obsługiwać " "UTF-8. Próbowanie lokalnego zestawu znaków." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "" -"Sekwencja logowania została całkowicie wykonana, lecz użytkownik nie jest " -"zalogowany. Przerywanie." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "Proces logowania zakończony, ale niezalogowany, przerwanie." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." -msgstr "Typ loginu musi być 'ask' lub 'interactive' (bez cudzysłowów)." +msgstr "" +"Należy wybrać tryb logowania 'ask' lub 'interactive' (bez cudzysłowów)." #: ../../locales/../src/interface/cmdline.cpp:11 #, c-format @@ -4990,150 +5333,182 @@ "Logontype, can only be used together with FTP URL. Argument has to be either " "'%s' or '%s'" msgstr "" -"Typ loginu musi używany być wraz z adresem typu FTP. Argumentem musi być " -"'%s' lub '%s'" +"Ten tryb logowania działa jedynie z adresem typu FTP. Parametrem musi być " +"albo '%s', albo '%s'" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:997 +#: ../../locales/../src/interface/queue.cpp:1059 msgid "Low" msgstr "Niski" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:995 +#: ../../locales/../src/interface/queue.cpp:1057 msgid "Lowest" msgstr "Najniższy" #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." -msgstr "Najniższy dostępny port musi być liczbą między 1024 a 65535." +msgstr "Najniższy dostępny port musi zawierać się między 1024 a 65535." #: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Fioletowy" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Upewnij się, że plik jest dostępny i jest poprawnie sformatowanym dokumentem " "XML." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:646 +#: ../../locales/../src/engine/http/request.cpp:652 +#: ../../locales/../src/engine/http/request.cpp:659 +#: ../../locales/../src/engine/http/request.cpp:670 +#: ../../locales/../src/engine/http/request.cpp:705 #, c-format msgid "Malformed chunk data: %s" msgstr "Zniekształcony fragment danych: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:161 #, c-format -msgid "Malformed header: %s" -msgstr "Zniekształcony nagłówek: %s" +msgid "Malformed request header: %s" +msgstr "Nieprawidłowy nagłówek żądania: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "" -"Zniekształcona odpowiedź, serwer nie wysyła odpowiednich zakończeń linii" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:459 +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:518 +#: ../../locales/../src/engine/http/request.cpp:574 +#: ../../locales/../src/engine/http/request.cpp:584 +#, c-format +msgid "Malformed response header: %s" +msgstr "Nieprawidłowy nagłówek odpowiedzi: %s" + +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +#, c-format +msgid "Malformed response: %s" +msgstr "Nieprawidłowa odpowiedź: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Ręczny transfer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "&Hasło główne:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Hasło główne:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "pasować do wszystkich z następujących" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "pasować do jakiegokolwiek z następujących" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "nie może pasować do żadnego z następujących" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "nie może pasować do wszystkich z następujących" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Maksymalna liczba jednoczesnych transferów:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Alokacja pamięci nieudana" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Dziennik wiadomości" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Pozycja dziennika wiadomości" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Wiadomość za duża" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "minut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Przesuń w &dół" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Przesuń w &górę" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Mój komputer" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Moje dokumenty" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "Moje strony" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/a" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Nazwa" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "Nazwa już istnieje" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Nazwa zakładki już istnieje" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Nazwa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Naturalne sortowanie" @@ -5141,19 +5516,23 @@ msgid "Need to enter filter name" msgstr "Należy wpisać nazwę filtra" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Należy wprowadzić prawidłową ścieżkę lokalną" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Należy wprowadzić prawidłową ścieżkę zdalną" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" -msgstr "Należy wybrać rodzaj kodowania znaków" +msgstr "Należy wybrać kodowanie znaków" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Nie dostarczarczo ani nazwy hosta ani nazwy serwera, lub jest nieznana" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5161,12 +5540,12 @@ "Host połączenia nie posiada żadnych adresów połączeń z żądanej rodziny " "adresów" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Sieć nieosiągalna" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Nigdy" @@ -5174,41 +5553,41 @@ msgid "New &Folder" msgstr "Nowy ka&talog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "New &tab" msgstr "Nowa &karta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nowa &zakładka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Nowa zakładka" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Nowy katalog" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Nowe funkcje i ulepszenia w %s" @@ -5217,41 +5596,41 @@ msgid "New filter" msgstr "Nowy filtr" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Nowy katalog" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Nowy adres" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Następny po kolejce transferów" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "Nie" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Żaden program nie jest skojarzony z nazwą serwera" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Nie zaznaczono żadnej kategorii do eksportowania" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "No command given, aborting." msgstr "Nie podano polecenia, przerywanie." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Brak ustawionego zewnętrznego adresu IP, próbowanie domyślnego." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Żadne pliki nie są obecnie edytowane." @@ -5259,96 +5638,92 @@ msgid "No filter name given" msgstr "Nie podano nazwy filtra" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." -msgstr "Nie podano hosta, podaj host." +msgstr "Nie podano hosta, proszę go wprowadzić." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" -msgstr "Brak dostępnych obrazków" +msgstr "Brak dostępnych obrazów" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Brak plików w kolejce!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Nie podano nazwy zbioru filtrów." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Żaden program nie jest skojarzony z typem pliku" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Nie został skojarzony żaden program do edycji plików z rozszerzeniem '%s'." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Brak trasy do hosta" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Brak wyników wyszukiwania" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Brak dostępnych stron" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:466 msgid "No supported SOCKS5 auth method" msgstr "Metoda autoryzacji SOCKS5 jest nieobsługiwana" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Nie podano nazwy użytkownika." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Brak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Jeszcze nic nie wybrano" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Niepowodzenie w wymiarze nazwy - nie do odzyskania" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:602 +#: ../../locales/../src/engine/server.cpp:629 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:1062 msgid "Normal" msgstr "Normalne" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:309 +#: ../../locales/../src/interface/queueview_failed.cpp:334 msgid "Not all items could be requeued for transfer." msgstr "Nie wszystkie elementy mogą zostać zażądane do transferu" -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Nie połączono" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Nie połączono z żadnym serwerem" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Nie połączono z jakimkolwiek serwerem." @@ -5356,66 +5731,79 @@ msgid "Not connected." msgstr "Nie połączono." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Nie zainicjalizowane, trzeba wywołać WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Ta opcja jest dostępna tylko, gdy używany jest protokół FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Uwaga: Zgubionego klucza nie można odzyskać." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" -"Uwaga: To działa tylko w przypadku zwykłych, nieszyfrowanych połączeń FTP." +"Uwaga! Działa to tylko w przypadku zwykłych, nieszyfrowanych połączeń FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" -"Uwaga: Użycie ogólnego proxy wymusza tryb pasywny przy połączeniach FTP." +"Uwaga! Użycie typowego proxy wymusza tryb pasywny przy połączeniach FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:652 +msgid "Null character in line" +msgstr "Znak null w wierszu" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Liczba cyfr po przecinku:" #: ../../locales/../src/interface/settings/optionspage_connection.cpp:35 msgid "Number of retries has to be between 0 and 99." -msgstr "Liczba ponownych prób musi być między 0 a 99." +msgstr "Liczba ponownych prób musi zawierać się między 0 a 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "O&twórz plik" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:396 +msgid "O&pen" +msgstr "O&twórz" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "Wersja OS:" @@ -5427,170 +5815,193 @@ "Na następujących stronach zostanie skonfigurowany wybrany tryb transferu " "oraz opcja powrotu, jeśli została wybrana." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Raz" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Raz na dzień" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Raz na tydzień" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "Używaj tylko zwykłego FTP (niepewne)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "O&twórz plik" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "Open directory in system's file manager" msgstr "Otwórz katalog w systemowym menedżerze plików" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Otwórz Menedżera Stron" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Otwórz Menedżera Stron." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Otwiera okno Menedżera Stron. Kliknij prawym klawiszem myszy, aby wyświetlić " "listę stron." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Otwórz okno dialogowe uprawnień dostępu do katalogu, aby skonfigurować " +"lokalne katalogi, do których FileZilla ma dostęp." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 msgid "Open the file." msgstr "Otwórz plik." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "Open the settings dialog of FileZilla" msgstr "Otwarcie okna ustawień FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Otwarty jako:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Otwarcie nie powiodło się" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "Opens a new tab" msgstr "Otwiera nową kartę" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "Opens the Site Manager" msgstr "Otwiera Menedżera Stron" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Otwiera okno filtrów nazw. Kliknij prawym klawiszem myszy, aby włączyć/" "wyłączyć filtry." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "System operacyjny:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Operacja jest już w toku" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Operacja w toku" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Operacja nieobsługiwana" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Opcje" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Pomarańczowy" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Organizacja:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Pozostałe opcje SFTP" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Inny błąd systemowy" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Inne:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Brak pamięci" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Przegląd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Zamień, &jeśli źródło nowsze" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Zastąp plik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Zastąp plik, jeśli rożni się rozmiarem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Zastąp plik, jeśli rożni się rozmiarem lub plik źródłowy jest nowszy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Zastąp plik, jeśli plik źródłowy jest nowszy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Zastąp, jeśli inny &rozmiar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Zastąp, jeśli inny rozmiar lu&b nowsze źródło" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Własny rodzaj kompilacji: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Uprawnienia właściciela" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Właściciel/Grupa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5598,31 +6009,31 @@ "Zapobieganie wchodzenia systemu w tryb stand-by podczas transferów lub " "innych operacji" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Hos&t proxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Polecenie PORT zniekształcone przez router lub zaporę." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "&Pasywny (zalecany)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Parametr nie jest prawidłowym adresem" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Parsowanie %d bajtów z informacji o wersji.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "&Hasło:" @@ -5630,66 +6041,80 @@ msgid "Passive (recommended)" msgstr "&Pasywny (zalecane)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Tryb pasywny" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." -msgstr "Tryb pasywny został ustawiony jako domyślny tryb transferu." +msgstr "Tryb pasywny został ustawiony jako domyślny." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Hasło lub klucz szyfrowania nie jest ustawione" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Wymagane hasło" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Hasła" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Ścieżka" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Nie można utworzyć ścieżki dla katalogu %s i podkatalogu %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Nie znaleziono ścieżki:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Ścieżki" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "W trakcie usuwania" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Prawo dostępu" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Odmówiono dostępu" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Prawa dostępu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Platforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Dodaj lokalne katalogi, których chcesz używać z FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5697,6 +6122,14 @@ "Sprawdź na https://filezilla-project.org/probe.php, czy serwer działa i " "ponownie sprawdź ustawienia." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Sprawdź przyznane uprawnienia i ponownie dodaj brakujące katalogi lokalne, z " +"którymi współpracujesz w następującym oknie dialogowym." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5705,11 +6138,11 @@ "Skonfiguruj wszelkie zapory i routery, aby FileZilla mogła nawiązać " "połączenia wychodzące do dowolnego portu." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Wyłącz ustawienia typu 'tryb DMZ' lub 'tryb gier' na twoim routerze." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5725,14 +6158,14 @@ msgid "Please enter a custom time format." msgstr "Podaj własny format czasu." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" "Proszę wpisać datę w postaci RRRR-MM-DD, taką jak na przykład 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "Podaj limit prędkości pobierania większy lub równy 0 %s/s." @@ -5741,16 +6174,16 @@ msgid "Please enter a name for the new filter." msgstr "Podaj nazwę nowego filtra." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." -msgstr "Podaj nową nazwę dla skopiowanego filtra." +msgstr "Podaj nową nazwę dla kopiowanego filtra." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Podaj nową nazwę dla zestawu filtrów \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Podaj nową nazwę dla filtra." @@ -5771,77 +6204,86 @@ "transfers." msgstr "Podaj liczbę między 1 a 10 dla liczby jednoczesnych transferów." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Podaj hasło do tego serwera:" -#: ../../locales/../src/interface/QueueView.cpp:2109 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Podaj ścieżkę i plik wykonywalny do uruchomienia.\n" -"Np. c:\\jakaś_ścieżka\\plik.exe w środowisku MS Windows lub /jakaś_ścieżka/" -"plik w środowisku Unix.\n" -"Opcjonalnie możesz także podać argumenty programu." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "Proszę podać opóźnienie pomiędzy 10 a 9999 sekund, lub 0 aby wyłączyć." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Podaj unikalną nazwę dla tego zestawu filtrów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Podaj nazwę użytkownika do tego serwera:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Podaj poprawny zakres portów." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Podaj adres URL, z którego ma zostać pobrany Twój adres zewnętrzny" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Podaj limit prędkości wysyłania większy lub równy 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." msgstr "" -"Podaj polecenie FTP.\n" -"Używanie poleceń FTP wyczyści pamięć podręczną katalogu." +"Podaj surowe polecenie FTP.\n" +"Używanie surowych poleceń FTP wyczyści pamięć podręczną katalogu." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1878 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Podaj pełną ścieżkę i parametry programu do uruchomienia. Polecenie zostanie " +"wykonane po zakończeniu zadań w kolejce.\n" +"Np. c:\\jakaś_ścieżka\\plik.exe w środowisku MS Windows lub /jakaś_ścieżka/" +"plik w środowisku Unix.\n" +"Należy odpowiednio zastosować cudzysłowy jeśli komenda lub jej parametry " +"zawierają spacje." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Podaj nazwę katalogu, który powinien zostać utworzony:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "Wprowadź nazwę pliku, który powinien zostać utworzony:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Podaj nazwę użytkownika i hasło do tego serwera:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "Wpisz bieżące główne hasło, aby zmienić ustawienia hasła." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Podaj swój zewnętrzny adres IP" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5851,6 +6293,11 @@ "Jeśli masz adres dynamiczny lub nie znasz zewnętrznego adresu, użyj opcji " "zewnętrznego rozwiązywatora problemów." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "Podaj główne hasło do odszyfrowania hasła dla tego serwera:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5859,7 +6306,7 @@ "Podążaj uważnie za instrukcjami, gdyż niewłaściwa konfiguracja uniemożliwi " "połączenia FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5867,21 +6314,20 @@ "Upewnij się, że FileZila została uprawniona do nawiązywania połączeń " "wychodzących, oraz że adres rozwiązywatora problemów został podany poprawnie." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "Upewnij się, że wymagany język istnieje w twoim systemie." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " "manual port forwarding. Don't run your router in the so called 'DMZ mode' or " "'game mode'." msgstr "" -"Upewnij się, że Twój router używa najnowszego dostępnego oprogramowania. " -"Ponadto, Twój router musi zostać właściwie skonfigurowany. Będziesz musiał " -"ręcznie przekierować porty. Nie włączaj twojego routera w tzw. 'trybie DMZ' " -"lub 'trybie gier'." +"Upewnij się, że Twój router używa najnowszego oprogramowania. Ponadto, Twój " +"router musi zostać właściwie skonfigurowany. Będziesz musiał ręcznie " +"przekierować porty. Nie włączaj w routerze tzw. 'trybu DMZ' lub 'trybu gier'." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 msgid "" @@ -5894,7 +6340,7 @@ "port, który według Twojej zapory jest używany tylko przez trojany czy inne " "malware. To może wywołać fałszywy alarm, który można bezpiecznie zignorować." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5902,7 +6348,7 @@ "Zachowywanie dat plików podczas wysyłania będzie działać tylko dla serwerów " "FTP, FTPS i FTPES obsługujących polecenie MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5910,7 +6356,7 @@ "Niektóre serwery mogą Cię zablokować, jeżeli próbujesz łączyć się zbyt " "często." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5919,11 +6365,19 @@ "Uruchom tego kreatora ponownie, gdy zmienisz środowisko sieciowe lub gdy " "nagle napotkasz problemy z serwerami, które uprzednio działały." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Zapisz ten klucz w bezpiecznym miejscu. Bez prawidłowego klucza nie można " +"uzyskać dostępu do przesłanych plików." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Wybierz akcję:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Wybierz kategorie, które chcesz zaimportować." @@ -5954,7 +6408,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Wybierz nowe atrybuty dla zaznaczonych plików." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5964,41 +6418,41 @@ msgstr "" "Uaktualnij zaporę i upewnij się, że Twój router używa najnowszego dostępnego " "oprogramowania. Ponadto, Twój router musi zostać poprawnie skonfigurowany. " -"Należy w nim ręcznie przekierować porty. Nie włączaj swojego routera w tzw. " -"'trybie DMZ' lub 'trybie gier'. Inspekcja protokołu lub poprawki protokołu " -"muszą zostać wyłączone." +"Należy w nim ręcznie przekierować porty. Nie włączaj w routerze tzw. 'trybu " +"DMZ' lub 'trybu gier'. Funkcje jak inspekcja protokołu lub \"poprawki " +"protokołu\" muszą zostać wyłączone." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "&Pozycja dziennika wiadomości:" -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Kod pocztowy:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "&Zarezerwuj miejsce przed pobieraniem" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Prealokacja" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Predefiniowane witryny" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Zachowywanie dat plików" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Podgląd:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Podgląd" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Certyfikaty podstawowego połączenia i połączenia danych nie pasują." @@ -6011,15 +6465,15 @@ msgid "Print version information to stdout and exit" msgstr "Wydrukuj informacje wersji do stdout i wyjdź" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Nadaj piorytet katalogom (domyślne)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Priority" msgstr "Priorytet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6027,7 +6481,7 @@ "Polityka prywatności: Na serwer zostanie wysłana tylko Twoja wersja " "Filezilla, nazwa Twojego systemu operacyjnego oraz architektura procesora." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "&Klucze prywatne:" @@ -6035,31 +6489,31 @@ msgid "Pro&tocol:" msgstr "Pro&tokół:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Hasło pro&xy:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:107 +#: ../../locales/../src/interface/menu_bar.cpp:111 msgid "Process &Queue" msgstr "&Rozpocznij" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Przetwarzanie przepełnienia tabeli pliku" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Przetwarzanie %s w %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Protokół nieobsługiwany" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Protokół niewspierany na danym rodzaju gniazda" @@ -6067,54 +6521,53 @@ msgid "Protocol:" msgstr "Protokół:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Po&rt proxy:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "&Użytkownik proxy:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:475 msgid "Proxy authentication failed" -msgstr "Uwierzytelnianie proxy nie powiodło się." +msgstr "Uwierzytelnianie proxy nie powiodło się" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Wymiana danych powitalnych z proxy nie powiodła się: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Host rozpoczyna się od '[', jednak brakuje nawiasu zamykającego." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:329 #, c-format msgid "Proxy reply: %s" msgstr "Odpowiedź proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Proxy request failed. Reply from proxy: %s" -msgstr "Żądanie proxy nie powiodło się: %s" +msgstr "Nieudane żądanie proxy. Odpowiedź proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:386 #, c-format msgid "Proxy request failed: %s" -msgstr "Żądanie proxy nie powiodło się: %s" +msgstr "Nieudane żądanie proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:540 msgid "Proxy request failed: Unknown address type in CONNECT reply" -msgstr "" -"Żądanie proxy nie powiodło się: Nieznany typ adresu w odpowiedzi CONNECT" +msgstr "Nieudane żądanie proxy: Nieznany rodzaj adresu w odpowiedzi CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" -msgstr "Proxy ustawione, jednak host lub port proxy jest nieprawidłowy" +msgstr "Proxy ustawione, jednak jego host lub port jest nieprawidłowy" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Uwierzytelnianie kluczem publicznym" @@ -6122,68 +6575,78 @@ msgid "Public key algorithm:" msgstr "Algorytm klucza publicznego:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Publiczne prawa dostępu" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2784 msgid "Queue has been fully processed" msgstr "Kolejka została całkowicie przetworzona" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Kolejka: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Kolejka: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Kolejka: pusta" -#: ../../locales/../src/interface/QueueView.cpp:438 +#: ../../locales/../src/interface/QueueView.cpp:207 msgid "Queued files" msgstr "Pliki w kolejce" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Kolejkowanie:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "Z&restartuj system" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Szybkie wyszukiwanie:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "" +"Nie można otworzyc Szybkiego wyszukiwania w trakcie porównywania katalogów." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +msgid "R&eboot system once" +msgstr "U&ruchom ponownie system jednorazowo" + +#: ../../locales/../src/interface/menu_bar.cpp:104 msgid "R&emote directory tree" msgstr "Dr&zewo zdalnych katalogów" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:248 msgid "R&eset and requeue selected files" msgstr "Zr&esetuj zaznaczone pliki i ponownie dodaj do kolejki" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Polecenie FTP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "O&dczyt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:37 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:81 msgid "Re&fresh" msgstr "&Odśwież" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Zmi&eń nazwę" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6191,20 +6654,24 @@ "Ponownie uruchom kreatora i dokładnie sprawdzić swoje ustawienia i " "odpowiednio skonfiguruj wszystkie routery i zapory." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Od&czyt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Tylko do odczytu" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "Nie udało się wczytać lokalnego pliku" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Naprawdę przerwać bieżącą operację?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6212,23 +6679,25 @@ msgstr[0] "Czy na pewno usunąć %d katalog z serwera wraz z jego zawartością?" msgstr[1] "Czy na pewno usunąć %d katalogi z serwera wraz z ich zawartością?" msgstr[2] "Czy na pewno usunąć %d katalogów z serwera wraz z ich zawartością?" +msgstr[3] "Czy na pewno usunąć %d katalogów z serwera wraz z ich zawartością?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Czy na pewno usunąć %d plik z serwera?" msgstr[1] "Czy na pewno usunąć %d pliki z serwera?" msgstr[2] "Czy na pewno usunąć %d plików z serwera?" +msgstr[3] "Czy na pewno usunąć %d plików z serwera?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Czy na pewno usunąć %s i %s z serwera?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "Na pewno usunąć wszystkie zaznaczone pliki i/lub katalogi z serwera?" @@ -6238,52 +6707,60 @@ "Na pewno usunąć wszystkie zaznaczone pliki i/lub katalogi ze swojego " "komputera?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Reason" msgstr "Powód" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2777 msgid "Reboot now" -msgstr "Zrestartuj teraz" +msgstr "Uruchom ponownie teraz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Przechodź do podkatalogów" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Otrzymano z serwera sygnał TLS: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Otrzymano listę katalogów, która wydaje się być zakodowana w EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Otrzymano linę powyżej 10000 znaków, przerywanie." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Nie można zweryfikować odebranego łańcucha certyfikatu. Status weryfikacji " +"to %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Otrzymane dane zniekształcone" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "Otrzymano nieprawidłowe znaki w informacji o wersji" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Otrzymano z serwera nieznany sygnał TLS %d" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "Otrzymane informacje o wersji są zbyt duże" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6292,218 +6769,220 @@ "połączenia do serwera.\n" "Jeśli będziesz kontynuować, połączenie zostanie przewane." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Ustawienia ponownego łączenia" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Łączy z ostatnio używanym serwerem" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Rekurencyjne dodawanie plików do kolejki." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Rekurencyjne zmienianie uprawnień." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Rekurencyjne usuwanie plików i katalogów." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Czerwony" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Przekierowanie do nieprawidłowego lub niewspieranego adresu URL: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Przekierowanie do nieprawidłowego lub niewspieranego adresu: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Odśwież plik i listę katalogów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Zapamiętać hasła?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Zdalny" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Zdalny certyfikat nie jest zaufany." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Remote file" msgstr "Zdalny plik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Zdalne wyszukiwanie plików" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Zdalne filtry:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Zdalna ścieżka" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the current site's servertype (%s)." msgstr "" "Zdalna ścieżka nie może być zanalizowana. Upewnij się, czy jest to poprawna " -"bezwzględna ścieżka i jest obsługiwana przez typ serwera bieżącej witryny " +"bezwzględna ścieżka i jest obsługiwana przez rodzaj serwera bieżącej witryny " "(%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the servertype (%s) selected on the parent site." msgstr "" "Zdalna ścieżka nie może być zanalizowana. Upewnij się, czy jest to poprawna " -"bezwzględna ścieżka i jest obsługiwana przez typ serwera witryny (%s) " -"wybranego na głównej stronie." +"bezwzględna ścieżka i czy jest obsługiwana przez rodzaj serwera (%s) " +"wybranego na nadrzędnej stronie." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Zdalna ścieżka nie może być zanalizowana. Upewnij się, czy jest to poprawna " "bezwzględna ścieżka." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Zdalna ścieżka nie może być zanalizowana." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Obsługa zdalnej ścieżki:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Zdalna ścieżka:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Serwer zdalny:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Remove &all" msgstr "Usuń &wszystkie" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 msgid "Remove &selected" msgstr "Usuń &zaznaczone" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Zmień nazwę pliku" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "Rename selected directory" msgstr "Zmień nazwę zaznazconego katalogu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:46 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:90 msgid "Rename selected files and directories" msgstr "Zmień nazwy zaznaczonych plików i katalogów" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Zmiana nazwy z '%s' na '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Powtórz hasło:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Zgłoś błędy i propozycje funkcji" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:377 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Żądanie nieudane - klient nie używa identd (lub nieosiągalne z serwera)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:380 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Żądanie nieudane - identd klienta nie może potwierdzić ciągu ID użytkownika" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:374 msgid "Request rejected or failed" msgstr "Żądanie odrzucone lub nieudane" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "Wymagaj bezpośredniego FTP przez TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "Wymagaj domniemanego FTP przez TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:241 msgid "Reset and requeue &all" msgstr "Zresetuj &wszystkie pliki i ponownie dodaj do kolejki" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Ustalony protokół jest nieznany" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Ustalanie adresu IP dla %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Zasób tymczasowo niedostępny" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Odpowiedź" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Wyniki:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Wznów transfer pliku" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6511,44 +6990,46 @@ "Wznawianie plików ASCII może powodować problemy, jeżeli serwer używa innych " "zakończeń linii niż klient." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Uzyskiwanie listy katalogów w \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Uzyskiwanie listy katalogów..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Otrzymywanie zewnętrznego adresu IP z %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../locales/../src/interface/menu_bar.cpp:61 msgid "S&how files currently being edited..." msgstr "&Pokaż obecnie edytowane pliki..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "&Wyświetlaj okno Menedżera Stron przy uruchamianiu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "W&yłącz system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 +msgid "S&hutdown system once" +msgstr "W&yłącz system jednorazowo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "S&top" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "U&śpij system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:182 +msgid "S&uspend system once" +msgstr "U&śpij system jednorazowo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/menu_bar.cpp:97 msgid "S&ynchronized browsing" msgstr "S&ynchronizowane przeglądanie" @@ -6556,93 +7037,113 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Obsługa SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:141 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Proxy SOCKS4 połączy się z: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:168 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 nie obsługuje nazwy użytkownika ani hasła dłuższego niż 255 znaków." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Zapisz hasła &chronione głównym hasłem" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Z&apisz hasła" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Zapisać ustawienia?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "" "Zapisywanie haseł zostało wyłączone przez administratora Twojego systemu." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "Zapisywanie haseł zostało przez Ciebie wyłączone." -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "Skanuje w poszukiwaniu plików w celu dodania do kolejki" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "Skanuje w poszukiwaniu plików do wysłania na serwer" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Współczynnik skali:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "&Warunki wyszukiwania:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "&Katalog wyszukiwania:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Szukaj plików rekursywnie." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "Search server for files" msgstr "Szukaj plików na serwerze" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Rodzaj wyszukiwania:" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Informacje o zabezpieczeniach" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "Zobacz również: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Wybierz serwer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Wybierz stronę:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Wybierz styl" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Wybierz domyślną akcję do wykonania, jeśli plik docelowy transferu już " "istnieje." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Wybierz domyślny edytor" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6650,7 +7151,7 @@ "Wybierz domyślną akcję do wykonania, jeśli plik docelowy już istnieje. Ten " "wybór jest ważny tylko dla bieżącej sesji." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6658,216 +7159,229 @@ "Wybierz domyślną akcję do wykonania, jeśli plik docelowy już istnieje, tylko " "dla aktualnie zaznaczonych plików w kolejce." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Wybierz plik zawierający prywatny klucz" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Wybierz plik dla eksportowanych danych" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Wybierz plik dla eksportowanych filtrów" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1566 msgid "Select file for exported queue" msgstr "Wybierz plik dla eksportowanej kolejki" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Wybierz plik dla eksportowanych ustawień" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "Wybierz plik dla eksportowanych witryn" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Wybierz plik do importowania ustawień" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Wybierz plik do wysłania" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Wybierz nazwę pliku dla przekształconego pliku klucza" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Wybierz sposób, w jaki te pliki powinny być otwierane." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Wybierz docelowy katalog pobierania" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Wybierz nazwę pliku docelowego" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Wybierz kategorie do eksportowania:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Wybierz prywatne dane, które chcesz usunąć." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Zaznaczony %d katalog wraz z zawartością do transferu." msgstr[1] "Zaznaczone %d katalogi wraz z zawartością do transferu." msgstr[2] "Zaznaczone %d katalogów wraz z zawartością do transferu." +msgstr[3] "Zaznaczone %d katalogów wraz z zawartością do transferu." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Zaznaczono %d katalog." msgstr[1] "Zaznaczono %d katalogi." msgstr[2] "Zaznaczono %d katalogów." +msgstr[3] "Zaznaczono %d katalogów." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Zaznaczony %d plik do transferu." msgstr[1] "Zaznaczone %d pliki do transferu." msgstr[2] "Zaznaczone %d plików do transferu." +msgstr[3] "Zaznaczone %d plików do transferu." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Zaznaczono %d plik. Całkowity rozmiar: %s" msgstr[1] "Zaznaczono %d pliki. Całkowity rozmiar: %s" msgstr[2] "Zaznaczono %d plików. Całkowity rozmiar: %s" +msgstr[3] "Zaznaczono %d plików. Całkowity rozmiar: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Zaznaczono %d plik. Całkowity rozmiar: Co najmniej %s" msgstr[1] "Zaznaczono %d pliki. Całkowity rozmiar: Co najmniej %s" msgstr[2] "Zaznaczono %d plików. Całkowity rozmiar: Co najmniej %s" +msgstr[3] "Zaznaczono %d plików. Całkowity rozmiar: Co najmniej %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Zaznaczone %s i %s do transferu." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Zaznaczono %s i %s. Całkowity rozmiar: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Zaznaczono %s i %s. Całkowity rozmiar: Co najmniej %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Wybrany edytor nie istnieje." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Zaznaczony plik jest już edytowany" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Zaznaczony plik jest już załadowany" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Zaznaczony plik jest już otwarty" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Zaznaczony plik wciąż jest edytowany" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Zaznaczony filtr działa tylko dla plików lokalnych." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:434 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" -"Wybrana globalna zakładka i aktualny serwer używają innego typu serwera.\n" +"Wybrana globalna zakładka i aktualny serwer używają innego rodzaju serwera.\n" "Użyj konkretnej zakładki strony dla tego serwera." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Wybrany port jest zwykle używany przez inny protokół." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Wysyłaj polecenia &podtrzymywania połączenia FTP" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Send custom command to the server otherwise not available" msgstr "Wyślij ręcznie niedostępne w inny sposób polecenie do serwera" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Wysyłanie polecenia utrzymania połączenia" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Numer seryjny:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" -msgstr "&Typ serwera:" +msgstr "&Rodzaj serwera:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Serwer niepoprawnie zakończył połączenie TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Serwer nie obsługuje znaków spoza ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Serwer nie obsługuje wznawiania plików > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -"Serwer nie obsługuje wznawiania plików > %d GB. Koniec transferu gdyż " -"rozmiary plików się zgadzają." +"Serwer nie obsługuje wznawiania plików > %d GB. Transferu zakończony z " +"powodu różnicy rozmiarów plików." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Serwer nie obsługuje wznawiania plików > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Serwer nie obsługuje wznawiania plików > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Klucz hosta serwera" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "" -"Serwer może nie obsługiwać wznawiania plików > %d GB. Koniec transferu gdyż " -"rozmiary plików się zgadzają." +"Serwer może nie obsługiwać wznawiania plików > %d GB. Transferu zakończony z " +"powodu różnicy rozmiarów plików." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6875,25 +7389,43 @@ "Serwer może wymagać posiadania konta. Wprowadź konto, używając Menedżera " "Stron" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:459 +msgid "Server not sending proper line endings" +msgstr "Serwer nie wysyła prawidłowych zakończeń wierszu" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "Serwer zażądał nieobsługiwanego algorytmu uwierzytelniania skrótu: %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "Serwer zażądał nieobsługiwanej jakości ochrony: %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "Serwer zwrócił pustą ścieżkę." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "" -"Serwer wysłał dodatkową zachętę do zalogowania się. Musisz użyć " -"interaktywnego typu logowania." +"Serwer wysłał dodatkową zachętę do zalogowania się. Należy użyć " +"interaktywnego trybu logowania." + +#: ../../locales/../src/engine/http/request.cpp:309 +msgid "Server sent data even before request headers were sent" +msgstr "Serwer wysłał dane przed wysłaniem nagłówków żądania" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Serwer wysłał pasywną odpowiedź z nieroutowalnym adresem. Uzycie trybu " "pasywnego nie powiodło się" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6901,36 +7433,50 @@ "Serwer wysłał pasywną odpowiedź z nieroutowalnym adresem. Zamiast tego " "zostanie użyty adres serwera." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +msgid "Server sent too much data." +msgstr "Serwer wysłał za dużo danych." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Serwer wysłał nieoczekiwaną odpowiedź." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Serwer wysłał łańcuch niesortowanych certyfikatów z naruszeniem specyfikacji " +"TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "MAC serwera dla klienta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Szyfr serwera dla klienta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" -msgstr "&Typ serwera:" +msgstr "&Rodzaj serwera:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Server/Local file" msgstr "Plik lokalny/serwerowy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Serwer:" @@ -6938,49 +7484,54 @@ msgid "Session details" msgstr "Szczegóły sesji" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:121 msgid "Set &Priority" msgstr "U&staw priorytet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Ustaw prawa dostępu '%s' na '%s'" - -#: ../../locales/../src/engine/transfersocket.cpp:791 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize wywołane bez gniazda" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Ustawianie uprawnień dla '%s' na '%s'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Ustawienia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Katalog ustawień:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:150 +msgid "Sh&ow notification bubble" +msgstr "Pokaż dymek podpowiedzi" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Pokaż proste listy &katalogów" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/menu_bar.cpp:171 msgid "Show &welcome dialog..." msgstr "Pokaż okno po&witalne..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Pokazać obydwa drzewa katalogów i kontynuować porównywanie?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Pokaż szczegóły" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Pokaż szczegóły o własnych formatach daty i czasu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:399 +msgid "Show in file &manager" +msgstr "Pokaż w &menedżerze plików" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:212 msgid "Shows available TLS ciphers" msgstr "Pokazuje dostępne szyfry TLS" @@ -6988,7 +7539,7 @@ msgid "Shows this help dialog" msgstr "Pokazuje to okienko pomocy" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2773 msgid "Shutdown now" msgstr "Wyłączanie systemu teraz" @@ -6996,7 +7547,11 @@ msgid "Signature algorithm:" msgstr "Algorytm sygnatury:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Zarejestruj się" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Wpisy &Menedżera Stron" @@ -7004,56 +7559,61 @@ msgid "Site Manager" msgstr "Menedżer Stron" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "Menedżer Stron - nie można zapamiętać hasła" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Menedżer Stron - wygenerowany klucz" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "Menedżer Stron - Błędne dane" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Menedżer Stron jest już otworzony" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Adres nie istnieje." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Adres powinien zaczynać się od 0 lub 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Ścieżka strony jest źle sformułowana." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Zakładki dla konkretnej strony" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7063,11 +7623,11 @@ "Menedżerze Stron.\n" "Dodaj bieżące połączenie do Menedżera Stron?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Size" msgstr "Rozmiar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Format rozmiaru" @@ -7075,55 +7635,60 @@ msgid "Size unknown" msgstr "Rozmiar nieznany" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Pomiń plik" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Pomijanie pobierania %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Pomijanie nieistniejącego pliku klucza \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Pomijanie wysyłania %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Adres gniazda poza przestrzenią adresu" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Gniazdo już połączone" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Gniazdo zostało wyłączone" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Gniazdo nie jest połączone" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Rodzaj gniazda niewspierany dla rodziny adresów" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "Niektóre pliki są wciąż edytowane lub muszą zostać przesłane." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7131,32 +7696,32 @@ "Niektóre źle skonfigurowane serwery znajdujące się za routerem mogą " "odpowiadać z ich lokalnym adresem IP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Sortuj katalogi in-line" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "" "Nie można zmienić kolejności sortowania w trakcie porównywania katalogów." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Sortowanie" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Tryb &sortowania:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Źródło i cel operacji upuszczania są identyczne" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Źródło i plik docelowy nie mogą być takie same" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "Źródło i plik docelowy operacji upuszczania są identyczne" @@ -7164,37 +7729,37 @@ msgid "Source file:" msgstr "Plik źródłowy:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Limity prędkości" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Limity prędkości" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "Limity prędkości są wyłączone, kliknij aby zmienić." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "Limity prędkości są włączone, kliknij aby zmienić." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Wersje stabilne i beta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Tylko wersje stabilne" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Wersje stabilne, beta i dzienne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "&Natychmiast rozpocznij transfer" @@ -7202,19 +7767,21 @@ msgid "Start with opened Site Manager" msgstr "Otwórz Menedżera Stron przy starcie" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Rozpoczęgo sprawdzanie aktualizacji na %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Rozpoczynanie pobierania %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Rozpoczynanie wysyłania %s" @@ -7223,30 +7790,38 @@ msgid "Starts the local site in the given path" msgstr "Rozpoczyna lokalną stronę w danej ścieżce" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Państwo lub prowincja:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Status" msgstr "Status" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Status:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:111 msgid "Stop and remove &all" msgstr "&Zatrzymaj i usuń wszystko" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Zatrzymaj rekurencyjną operację" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Zdecentralizowane przechowywanie w chmurze" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Obsługa Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Ulica:" @@ -7262,11 +7837,11 @@ msgid "Summary of test results:" msgstr "Podsumowanie wyników testu:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2781 msgid "Suspend now" msgstr "Wyłącz teraz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7274,29 +7849,33 @@ "Ta decyzja nie ma wpływu na symlinki do plików, takie linki są zawsze " "usuwane." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Synchronizowane przeglądanie" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Synchronizowane przeglądanie zostało wyłączone." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Synchronizowanie katalogów." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Błąd składni" @@ -7305,44 +7884,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Błąd składni na linii poleceń" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Systemowy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Szczegóły systemu" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Limit systemu przekroczenia otwartych plików" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Połączenie systemu z podsystemem nieudane" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/menu_bar.cpp:100 msgid "T&oolbar" msgstr "P&asek narzędzi" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "Połączenie TLS nawiązane, wysyłanie zapytania HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "Połączenie TLS nawiązane, oczekiwanie na wiadomość powitalną..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "Połączenie TLS nawiązane." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:503 msgid "TTL expired" msgstr "TTL wygasł" @@ -7350,36 +7929,44 @@ msgid "Target file already exists" msgstr "Plik docelowy już istnieje" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Plik docelowy:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "Plik docelowy już istnieje!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "Plik docelowy już istnieje, naprawdę kontynuować?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Tymczasowe niepowodzenie w wymiarze nazwy" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Test zakończony pomyślnie" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Wyniki testu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Testowanie zdolności wznowień serwera" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "&Obecnie edytowane są następujące pliki:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "" "Menedżer Stron nie może zostać użyty, dopóki nie zostaną naprawione pliki." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7389,7 +7976,7 @@ "Czy chcesz kontynuować? Wszystkie zmiany dokonane w Menedżerze Stron nie " "zostaną wtedy zapisane." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7397,29 +7984,37 @@ "Menedżer Stron jest otwarty w innej kopii FileZilla 3.\n" "Zamknij go, albo dane nie będą mogły zostać usunięte." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Adres, który wprowadziłeś to: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Członek ai_family nie jest wspierany" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Członek ai_socktype nie jest wspierany" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Zakładka nie mogła zostać dodana." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Zakładki nie mogły zostać wyczyszczone." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Certyfikat wymaga, aby serwer uwzględnił status OCSP w swojej odpowiedzi, " +"ale brakuje statusu OCSP." + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "Połączenie jest szyfrowane. Kliknij ikonę, aby zobaczyć szczegóły." @@ -7441,34 +8036,39 @@ "Własny format czasu jest nieprawidłowy lub zawiera niewspierane " "specyfikatory formatu." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Połączenie danych nie mogło zostać nawiązane: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Nie można znaleźć domyślnego edytora dla plików tekstowych." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Domyślny edytor dla plików tekstowych to '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Wprowadzona nazwa filtra już istnieje, proszę wybrać inną nazwę." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Wprowadzone hasła nie są takie same." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Rozszerzenie '%s' już istnieje na liście" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7477,8 +8077,9 @@ "Plik %s już istnieje.\n" "Wprowadź nową nazwę:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7489,7 +8090,7 @@ "Nie można znaleźć skojarzonego programu (%s).\n" "Proszę sprawdź swoje skojarzenia plików." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7498,29 +8099,31 @@ "Plik '%s' zawiera klucz SSH1. Protokół SSH1 jest przestarzały, FileZilla " "wspiera jedynie klucze SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" "Plik '%s' nie mógł zostać załadowany lub nie zawiera prywatnego klucza." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Plik '%s' nie mógł zostać załadowany." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" "No program has been associated on your system with this file type." msgstr "" -"Plik '%s' nie mógł być otwarty:\n" -"Żaden program nie został skojarzony w twoim systemie z tym typem pliku." +"Plik '%s' nie mógł zostać otwarty:\n" +"Żaden program nie jest skojarzony z tym typem pliku." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7529,8 +8132,8 @@ "Plik '%s' nie mógł być otwarty:\n" "Skojarzone polecenie nie powiodło się" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7542,7 +8145,7 @@ "danych.\n" "Chcesz kontynuować?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7555,7 +8158,7 @@ msgid "The file selected as default editor does not exist." msgstr "Plik wybrany jako domyślny edytor nie istnieje." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7568,11 +8171,11 @@ "port, nazwa użytkownika oraz hasło.\n" "Kontynuować importowanie?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Kolumna z nazwą pliku nie może być ukryta ani przeniesiona" -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Kolumna z nazwą pliku nie może być ukryta." @@ -7586,19 +8189,19 @@ msgid "The following characters will be replaced: %s" msgstr "Następujące znaki zostaną zastąpione: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Następujące pliki są aktualnie edytowane:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Bezpłatne i otwarte rozwiązanie FTP" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Wygenerowany klucz szyfrowania to:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Globalne zakładki nie mogły zostać zapisane." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7610,19 +8213,19 @@ #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 msgid "The limit needs to be between 1 and 2000 MiB" -msgstr "Limit musi być między 1 i 2000 MiB" +msgstr "Limit musi zawierać się między 1 a 2000 MiB" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Nie można utworzyć katalogu lokalnego '%s'." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Lokalny katalog '%s' nie istnieje." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7641,25 +8244,30 @@ "Najniższy dostępny port musi być mniejszy lub równy najwyższemu dostępnemu " "portowi." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Główne hasło musi mieć co najmniej 8 znaków." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "" "Nowa wersja nie może zostać pobrana, proszę spróbować ponownie później." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Nowa wersja została zapisana w Twoim katalogu pobierania" -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1570 msgid "The queue will not be saved." msgstr "Kolejka nie zostanie zapisana." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Zdalny katalog '%s' nie istnieje." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7668,29 +8276,29 @@ "Zdalny katalog '%s' nie jest pod katalogiem nadrzędnym synchronizacji (%s).\n" "Wyłączyć synchronizowane przeglądanie i kontynuować zmianę katalogu zdalnego?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Wybrane kategorie zostały zaimportowane." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Zaznaczony plik zawiera dane, które można zaimportować do nastepujących " "kategorii:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Zaznaczony plik jest już edytowany:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Zaznaczony plik wciąż jest otwarty w jakimś innym programie, zamknij go." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7700,15 +8308,15 @@ "To może być niebezpieczne i może uszkodzić Twój system.\n" "Na pewno chcesz kontynuować?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Serwer nie mógł zostać dodany." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Serwer wysłał nieoczekiwaną lub nierozpoznaną odpowiedź." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Ten serwer używa następującego kodowania znaków:" @@ -7720,17 +8328,17 @@ "Certyfikat serwera jest nieznany. Sprawdź uważnie certyfikat, by upewnić " "się, że serwer jest zaufany." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " "actually trying to connect to another computer pretending to be the server." msgstr "" -"Ten klucz serwera nie pasuje do klucza z cache. To znaczy, że albo " -"administrator zmienił klucz hosta, albo próbujesz połączyć się z komputerem " -"podszywającym się pod ten serwer." +"Ten klucz serwera nie pasuje do klucza z pamięci podręcznej. To znaczy, że " +"albo administrator zmienił klucz hosta, albo próbujesz połączyć się z " +"komputerem podszywającym się pod ten serwer." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7738,31 +8346,35 @@ "Klucz hosta serwera jest nieznany. Nie masz gwarancji, że ten serwer jest na " "pewno tym, którego szukasz." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Nazwa hosta serwera nie jest zgodna z nazwą hosta certyfikatu" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "Parametr nazwy serwera nie jest wspierany przy ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." msgstr "" -"Ustawienia zostały zaimportowane. Musisz zrestartować FileZilla, aby " +"Ustawienia zostały zaimportowane. Należy uruchomić ponownie FileZilla, aby " "wszystkie ustawienia odniosły skutek." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Określona rodzina adresów nie jest wspierana" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Określona nazwa sieci nie jest już dostępna" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "The system will soon reboot unless you click Cancel." msgstr "System wkrótce uruchomi się ponownie, chyba że klikniesz Anuluj." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "The system will soon shut down unless you click Cancel." msgstr "System wkrótce się zamknie, chyba że klikniesz Anuluj." @@ -7774,11 +8386,11 @@ "Plik docelowy już istnieje.\n" "Proszę wybrać jakąś akcję." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Test się nie powiódł. Czy na pewno chcesz zapisać ustawienia?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Plik kopii zapasowej \"%s\" nie mógł zostać przywrócony" @@ -7787,15 +8399,15 @@ msgid "Themes" msgstr "Style" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Zestaw filtrów nie może zostać usunięty." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Ten zestaw filtrów nie może mieć innej nazwy." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7818,43 +8430,41 @@ "Ten kreator pomoże prawidłowo skonfigurować wszelkie posiadane przez Ciebie " "routery i zapory oraz przetestuje Twoją konfigurację." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Time" msgstr "Czas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Format czasu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "&Limit czasu oczekiwania w sekundach:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Limit czasu oczekiwania" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Przesunięcie strefy czasu serwera w sekundach: %d." - -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Tytuł:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Aby porównać katalogi, Szybkie wyszukiwanie musi być zamknięte." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "Aby porównać katalogi, obydwie listy plików muszą być wyrównane." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Aby to zrobić, obydwa drzewa katalogów muszą być pokazane lub obydwa ukryte." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7862,7 +8472,7 @@ "FileZilla musi znać prywatny klucz, aby obsłużyć uwierzytelnianie kluczem " "publicznym." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7879,92 +8489,87 @@ "Zielony: Plik jest nowszy niż nieoznakowany plik na drugiej stronie\n" "Czerwony: Różne rozmiary pliku" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " "directory on the server accordingly and vice versa." msgstr "" "Przełącza synchronizowane przeglądanie.\n" -"Jeśli opcja ta jest włączona, nawigacja hierarchii katalogu lokalnego będzie " -"również odpowiednio zmieniać katalog na serwerze i odwrotnie." +"Jeśli włączone, nawigacja hierarchii katalogu lokalnego będzie również " +"odpowiednio zmieniać katalog na serwerze i vice versa." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Uruchom/zatrzymaj przetwarzanie kolejki transferów" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Włącz/wyłącz okno lokalnego drzewa katalogów" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Włącz/wyłącz okno logu wiadomości" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Włącz/wyłącz okno drzewa katalogów na serwerze" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Włącz/wyłącz okno kolejki transferów" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:472 msgid "Too long header line" msgstr "Za długa linia nagłówka" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Za dużo przekierowań" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Dojście:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Transfer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "&Kierunek transferu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/menu_bar.cpp:116 msgid "Transfer &type" msgstr "Tryb &transferu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Tryb transferu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Kolejka transferów" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Ustawienia przesyłania" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Przesyłanie przerwane: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Przesłane dane niepoprawne." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Przesyłanie" @@ -7972,28 +8577,27 @@ msgid "Transfers" msgstr "Transfery" -#: ../../locales/../src/interface/QueueView.cpp:2944 -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2655 msgid "Transfers finished" msgstr "Transfery zakończone" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "T&raktuj pliki bez rozszerzenia jako pliki ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "&Traktuj następujące typy plików jako pliki ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "Ufaj zmienionemu kluczowi hosta:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "Ufaj nowemu kluczowi hosta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Zaufać nowemu kluczowi i doprowadzić do połączenia?" @@ -8001,69 +8605,75 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Zaufać temu certyfikatowi i kontynuować łączenie?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Zaufać temu hostowi i doprowadzić do połączenia?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Spróbuj ponownie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Typ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" -msgstr "Typ FTP proxy" +msgstr "Rodzaj proxy FTP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" -msgstr "Typ ogólnego proxy:" +msgstr "Rodzaj typowego proxy:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "W&yślij" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Limit wysyłania:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "&Użyj skojarzeń typów plików, jeśli są dostępne" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "&Użyj domyślnego edytora systemu dla bieżącego języka" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:383 +#: ../../locales/../src/engine/proxy.cpp:512 #, c-format msgid "Unassigned error code %d" msgstr "Nieprzypisany kod błędu %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Jednostka:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Nieznany" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." -msgstr "Nieznany typ FTP proxy, nie można wygenerować sekwencji logowania." +msgstr "Nieznany rodzaj proxy FTP, nie można wygenerować sekwencji logowania." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:434 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Nieznana wersja protokołu SOCKS: %d" @@ -8072,11 +8682,22 @@ msgid "Unknown certificate" msgstr "Nieznany certyfikat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Nieznany błąd %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Nieznany błąd %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Nieznany klucz hosta" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:442 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8085,15 +8706,19 @@ "Nieznana wersja protokołu podnegocjacji uwierzytelniania SOCKS Nazwa " "użytkownika/Hasło: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Nieznany główny element, plik nie wydaje się być wygenerowany przez " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:574 +msgid "Unknown transfer encoding" +msgstr "Nieznane kodowanie transferu" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8101,7 +8726,7 @@ "Dopóki te problemy nie zostaną rozwiązane, tryb aktywny FTP nie będzie " "działał i należy używać trybu pasywnego." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8109,15 +8734,15 @@ "Dopóki ten problem nie zostanie rozwiązany, tryb aktywny FTP nie będzie " "działał i trzeba używać trybu pasywnego." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Nieobsługiwany typ certyfikatu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Nieobsługiwane przekierowanie" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Prześ&lij i zakończ edycję" @@ -8126,96 +8751,105 @@ msgid "Updates" msgstr "Aktualizacje" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Wyślij" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Wysyłanie nie powiodło się" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "Limit wysyłania: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Limit wysyłania: brak" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Prześlij wyniki wyszukiwania" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:326 msgid "Upload selected directory" msgstr "Wyślij zaznaczony katalog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "Upload selected files and directories" msgstr "Wyślij zaznaczone pliki i katalogi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Wysłać z powrotem ten plik na serwer?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Wysłać ten plik na serwer?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Wysyłanie" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Wysyłanie oraz usuwanie w toku" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Wysyłanie i kończenie edycji" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Użyj własnego &kodowania" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Użyj własnego edytora:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Użyj &domyślnego edytora dla plików tekstowych" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Użyj &synchronizowanego przeglądania" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Użyj wyrażeń regularnych" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Użyj UTF-8, jeśli serwer to obsługuje, w innym przypadku użyj lokalnego " "zestawu znaków." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Użyj domyślnej akcji" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "Jeżeli dostepne, używaj bezpośredniego FTP przez TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Użyj serwera aktualnie podłączonego" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Użyj serwera z Menedżera Stron" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "Użyj &domyślnego edytora systemu dla bieżącego języka" @@ -8232,7 +8866,7 @@ msgstr "Użyj zewnętrznego adresu IP serwera" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "Użyj tego, jeśli używasz routera i masz stały zewnętrzny adres IP." @@ -8243,26 +8877,26 @@ "above server once each session as soon as you use active mode for the first " "time. Only the version of FileZilla you're using is submitted to the server." msgstr "" -"Użyj tej opcji, jeśli masz dynamiczny adres IP. FileZilla będzie kontaktować " -"się z powyższym serwerem, podczas każdej sesji, gdy użyjesz trybu aktywnego " -"po raz pierwszy. Tylko numer używanej wersji FileZilla będzie przesyłany do " -"serwera." +"Użyj tej opcji, jeśli masz dynamiczny adres IP. FileZilla użyje podanego " +"serwerem podczas każdej sesji, od czasu gdy użyjesz trybu aktywnego po raz " +"pierwszy. Tylko numer używanej wersji FileZilla będzie przesyłany do serwera." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Użytkownik:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" -msgstr "Nazwa użytkownika nie może składać się ze spacji" +msgstr "Nazwa użytkownika nie może składać się wyłącznie ze spacji" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" -"Użycie nieprawidłowego kodowania może spowodować niepoprawne wyświetlanie " -"nazw plików." +"Użycie nieprawidłowego kodowania znaków może spowodować niepoprawne " +"wyświetlanie nazw plików." #: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" @@ -8274,54 +8908,50 @@ #: ../../locales/../src/interface/cmdline.cpp:17 msgid "Verbose log messages from wxWidgets" -msgstr "Szczegółowe logi wiadomości z wxWidgets" +msgstr "Szczegółowe logi wiadomości wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Weryfikacja certyfikatu..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Bardzo wysoka" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "" "Wyświetlanie ukrytych plików ustawione, ale nieobsługiwane przez serwer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Podgląd/Edycja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Widoczne kolumny" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "Z&apis" -#: ../../locales/../src/interface/QueueView.cpp:1671 -msgid "Waiting" -msgstr "Oczekiwanie" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Oczekiwanie na połączenie do przeglądania" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Oczekiwanie na hasło" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Oczekiwanie na anulowanie transferu" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Oczekiwanie na ponowienie..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Ostrzeżenie, ignorowanie połączenia danych z niewłaściwego IP." @@ -8340,23 +8970,23 @@ "\n" "Czy naprawdę chcesz sprawdzić dostępność dziennych kompilacji?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" -msgstr "Uwaga: Potencjalne złamanie zabezpieczeń!" +msgstr "Uwaga! Potencjalne przełamanie zabezpieczeń!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" -msgstr "Witaj w FileZilli" +msgstr "Witaj w FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" -msgstr "Co nowego" +msgstr "Nowości" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" -msgstr "Co nowego:" +msgstr "Nowości:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8364,7 +8994,7 @@ "Umożliwienie zapisywania haseł przez FileZilla pozwala ci na łączenie się z " "serwerem bez potrzeby ponownego wpisywania hasła po restarcie programu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8373,36 +9003,54 @@ "przez lokalny system operacyjny, będą wymienione, jeżeli pobierasz takie " "pliki." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "Podczas &rozpoczynania nowego połączenia, gdy już nawiązane:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Szeroki ekran" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Czy chcesz, aby FileZilla pamiętała hasła?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Zapi&s" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Nieprawidłowy zewnętrzny adres IP" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:646 msgid "Wrong line endings" msgstr "Nieprawidłowe zakończenia linii" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Wprowadzono nieprawidłowe główne hasło, nie może być ono użyte do " +"odszyfrowania przechowywanych haseł." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Wprowadzono nieprawidłowe główne hasło, nie może być ono użyte do " +"odszyfrowania tego obiektu." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Żółty" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Tak" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8410,32 +9058,40 @@ "Używasz hosta obsługującego tylko IPv6. Ten kreator nie obsługuje tego " "środowiska." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Używasz najnowszej wersji FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Zawsze możesz ponownie otworzyć to okno poprzez menu Pomoc." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Możesz pobrać najnowszą wersję ze strony FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "Możesz zostawić pole portu puste używając domyślnego portu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "" -"Możesz użyć x na każdej pozycji, aby pozostawić oryginalne prawa dostępu do " -"plików." +"Aby pozostawić obecne prawa dostępu do plików, użyj \"x\" w miejscu " +"odpowiedniej cyfry." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Nie można zmieniać hasła i klucza szyfrowania indywidualnie, jeśli używane " +"jest główne hasło." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Nie można importować ustawień z własnego katalogu ustawień FileZilla." @@ -8447,23 +9103,28 @@ "Nie możesz zastąpić nieprawidłowego znaku innym nieprawidłowym znakiem. " "Proszę wpisz znak, który jest dozwolony w nazwach plików." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Nie możesz przesłać plików do katalogu nadrzędnego." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Nie wprowadzono nowej nazwy pliku. Zastąpić plik?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Wybrano przynajmniej jeden link symboliczny." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" "Wybrano więcej niż 10 plików do edycji, czy na pewno chcesz kontynuować?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8471,39 +9132,47 @@ "Wybrano więcej niż 10 plików lub katalogów do otwarcia, czy na pewno chcesz " "kontynuować?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." -msgstr "Musisz podać nazwę hosta." +msgstr "Należy podać nazwę hosta." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" -msgstr "Musisz podać ścieżkę pliku klucza" +msgstr "Należy podać ścieżkę pliku klucza" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." -msgstr "Musisz podać katalog lokalny." +msgstr "Należy podać katalog lokalny." + +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Musisz określić katalog zdalny." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." -msgstr "Musisz podać poprawny adres IPv4." +msgstr "Należy podać poprawny adres IPv4." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Należy podać klucz szyfrowania." + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." -msgstr "Musisz podać zapisywalny katalog lokalny." +msgstr "Należy podać zapisywalny katalog lokalny." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" -msgstr "Musisz podać nazwę konta" +msgstr "Należy podać nazwę konta" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" -msgstr "Musisz podać nazwę użytkownika" +msgstr "Należy podać nazwę użytkownika" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8511,69 +9180,81 @@ "Prawdopodobnie masz router lub zaporę, które błędnie zmodyfikowały przesłane " "dane." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Należy podać główne hasło." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." -msgstr "Musisz podać nazwę zakładki." +msgstr "Należy podać nazwę zakładki." #: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 msgid "You need to enter a name for the log file." -msgstr "Musisz podać nazwę pliku dziennika." +msgstr "Należy podać nazwę pliku dziennika." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." -msgstr "Musisz podać wprowadzić prawidłowo cytowane polecenie." +msgstr "Należy wprowadzić prawidłowo zacytowane polecenie." #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 msgid "You need to enter a proxy host." -msgstr "Musisz podać nazwę hosta proxy." +msgstr "Należy podać nazwę hosta proxy." #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 msgid "You need to enter a proxy port in the range from 1 to 65535" -msgstr "Port serwera proxy musi znajdować się w przedziale od 1 do 65535" +msgstr "Port serwera proxy musi znajdować się między 1 a 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" -"Musisz wpisać co najmniej jedną ścieżkę, puste zakładki nie są obsługiwane." +"Należy wpisać co najmniej jedną ścieżkę. Puste zakładki nie są obsługiwane." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" -"Musisz wpisać zarówno lokalną, jak i zdalną ścieżkę, aby umożliwić " +"Należy wpisać zarówno lokalną, jak i zdalną ścieżkę, aby umożliwić " "synchronizowane przeglądanie dla tej zakładki." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "" -"Musisz wpisać zarówno lokalną, jak i zdalną ścieżkę, aby umożliwić " +"Należy wpisać zarówno lokalną, jak i zdalną ścieżkę, aby umożliwić " "synchronizowane przeglądanie dla tej strony." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Musisz przyznać FileZilli dostęp do katalogów, do których chcesz pobierać " +"pliki, lub z nich przesyłać." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." -msgstr "Musisz podać plik lokalny." +msgstr "Należy podać plik lokalny." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." -msgstr "Musisz podać zdalny plik." +msgstr "Należy podać zdalny plik." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." -msgstr "Musisz podać zdalną ścieżkę." +msgstr "Należy podać zdalną ścieżkę." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." -msgstr "Musisz podać serwer." +msgstr "Należy podać serwer." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8581,66 +9262,66 @@ "Nie powinny występować problemy w łączeniu się z innymi serwerami, transfer " "plików powinien działać poprawnie." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2780 msgid "Your computer will suspend unless you click Cancel." msgstr "Twój komputer zostanie wyłączony, chyba że naciśniesz Anuluj." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "za" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "przed" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "zaczyna się od" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "bajtów" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "zawiera" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "własne" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "nie zawiera" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "nie równa się" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "kończy się z" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "równa się" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "plik" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8650,402 +9331,118 @@ "Proszę upewnić się, że plik wykonywalny istnieje w tym samym katalogu, co " "plik wykonywalny FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp należy do innej wersji FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "fzsftp nie mógł zostać uruchomiony" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj należy do innej wersji FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj nie mógł zostać uruchomiony" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj nie mógł zostać uruchomiony.\n" +"Proszę upewnić się, że plik wykonywalny istnieje w tym samym katalogu, co " +"plik wykonywalny FileZilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers zwróciła brak certyfikatów" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 nie powiodło się" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "większy niż" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "wykonywanie - grupa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "odczyt - grupa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "zapis - grupa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "jest równe" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "jest ustawione" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "nie jest ustawiony" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "mniejsze niż" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "pasuje do wyrażenia regularnego" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "nowa nazwa" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "wykonywanie - właściciel" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "odczyt - właściciel" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "zapis - właściciel" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "nieznany" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "wykonywanie - wszyscy" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "odczyt - wszyscy" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "zapis - wszyscy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" - -#~ msgid "Deleting directories" -#~ msgstr "Usuwanie katalogów" - -#~ msgid "Deleting multiple unrelated directories is not yet supported" -#~ msgstr "" -#~ "Usuwanie kilku niepowiązanych katalogów nie jest jeszcze obsługiwane" - -#~ msgid "Downloading multiple unrelated directories is not yet supported" -#~ msgstr "" -#~ "Pobieranie kilku niepowiązanych katalogów nie jest jeszcze obsługiwane" - -#~ msgid "Downloading search results" -#~ msgstr "Pobieranie wyników wyszukiwania" - -#~ msgid "U&se system defaults" -#~ msgstr "&Użyj domyślnych wartości systemowych" - -#~ msgid "Use system &defaults" -#~ msgstr "Użyj &domyślnych wartości systemowych" - -#~ msgid "" -#~ "The file '%s' is not in a format supported by FileZilla.\n" -#~ "The file is also password protected. Password protected key files are not " -#~ "supported by FileZilla yet.\n" -#~ "Would you like to convert it into a supported, unprotected format?" -#~ msgstr "" -#~ "Plik '%s' nie jest w formacie obsługiwanym przez FileZilla.\n" -#~ "Plik jest dodatkowo zabezpieczony hasłem. Pliki zabezpieczone hasłem nie " -#~ "są jeszcze obsługiwane przez FileZilla.\n" -#~ "Czy chcesz przekształcić plik do obsługiwanego, niezabezpieczonego " -#~ "formatu?" - -#~ msgid "" -#~ "The file '%s' is password protected. Password protected key files are not " -#~ "supported by FileZilla yet.\n" -#~ "Would you like to convert it into an unprotected file?" -#~ msgstr "" -#~ "Plik '%s' jest zabezpieczony hasłem. Pliki kluczy zabezpieczone hasłem " -#~ "nie są jeszcze obsługiwane przez FileZilla.\n" -#~ "Czy chcesz przekształcić plik do niezabezpieczonego hasłem?" - -#~ msgid "The XML document is not well-formed: %s" -#~ msgstr "Dokument XML nie jest w właściwym formacie: %s" - -#~ msgid "" -#~ "Unknown error opening the file. Make sure the file can be accessed and is " -#~ "a well-formed XML document." -#~ msgstr "" -#~ "Nieznany błąd podczas otwierania pliku. Upewnij się, że plik jest " -#~ "dostępny i jest poprawnie sformatowanym dokumentem XML." - -#~ msgid "Using proxy %s" -#~ msgstr "Użycie proxy %s" - -#~ msgid "" -#~ "Any changes made in the Site Manager will not be saved unless you repair " -#~ "the file." -#~ msgstr "" -#~ "Wszelkie zmiany dokonane w Menedżerze Stron nie zostaną zapisane, dopóki " -#~ "nie naprawisz pliku." - -#~ msgid "Cannot compare directories, not connected to a server." -#~ msgstr "Nie można porównać katalogów, nie podłączono do serwera." - -#~ msgid "Clear &Site Manager entries" -#~ msgstr "&Wyczyść wpisy Menedżera Stron" - -#~ msgid "Clear &transfer queue" -#~ msgstr "Wyczyść &kolejkę transferów" - -#~ msgid "Operating system problem detected" -#~ msgstr "Wykryto problem z systemem operacyjnym" - -#~ msgid "" -#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -#~ "seconds." -#~ msgstr "" -#~ "Przesunięcie czasu: Serwer: %d sekund. Komputer lokalny: %d sekund. " -#~ "Różnica: %d sekund." - -#~ msgid "" -#~ "Warning!\n" -#~ "\n" -#~ "A bug in Windows causes problems with FileZilla\n" -#~ "\n" -#~ "The bug occurs if you have\n" -#~ "- Windows Server 2003 or XP 64\n" -#~ "- Windows Firewall enabled\n" -#~ "- Application Layer Gateway service enabled\n" -#~ "See http://support.microsoft.com/kb/931130 for background information.\n" -#~ "\n" -#~ "Unless you either disable Windows Firewall or the Application Layer " -#~ "Gateway service,\n" -#~ "FileZilla will timeout on big transfers." -#~ msgstr "" -#~ "Uwaga!\n" -#~ "\n" -#~ "Błąd Windowsa powoduje problemy z FileZilla\n" -#~ "\n" -#~ "Błąd występuje, jeśli masz\n" -#~ "- Windows Server 2003 lub XP 64\n" -#~ "- włączoną Zaporę systemu Windows\n" -#~ "- włączoną Usługę bramy warstwy aplikacji\n" -#~ "Dowiedz się więcej na http://support.microsoft.com/kb/931130\n" -#~ "\n" -#~ "Jeśli nie wyłączysz Zapory systemu Windows lub Usługi bramy warstwy " -#~ "aplikacji,\n" -#~ "FileZilla będzie przekraczać limity oczekiwania w przypadku większych " -#~ "transferów." - -#~ msgid "&Crash" -#~ msgstr "&Zawieś" - -#~ msgid "Certificate details" -#~ msgstr "Szczegóły certyfikatu" - -#~ msgid "Connection timed out" -#~ msgstr "Przekroczony czas oczekiwania na połączenie" - -#~ msgid "" -#~ "Crashes FileZilla instantly. Only used to debug the exception handler" -#~ msgstr "Ciągle zawiesza FileZilla. Używane tylko do debugowania wyjątków." - -#~ msgid "" -#~ "A file with that name is already being edited. Do you want to reopen '%s'?" -#~ msgstr "Plik o tej nazwie jest już edytowany. Otworzyć ponownie '%s'?" - -#~ msgid "Fingerprint (MD5):" -#~ msgstr "Hash (MD5):" - -#~ msgid "Benchmark string coalescer" -#~ msgstr "Przeprowadź Benchmark stringa coalescer" - -#~ msgid "Clear string coalescer" -#~ msgstr "Wyczyść stringa coalescer" - -#~ msgid "Not all items could be requeued for viewing/editing." -#~ msgstr "" -#~ "Nie wszystki pliki mogły zostać wpisane do kolejki do podglądu/edycji." - -#~ msgid "%s bytes" -#~ msgstr "%s bajtów" - -#~ msgid "%s bytes (%s/s)" -#~ msgstr "%s bajtów (%s/s)" - -#~ msgid "&Check for beta versions of FileZilla" -#~ msgstr "Sprawdzaj dostępność wersji beta FileZilla" - -#~ msgid "&Finish" -#~ msgstr "&Zakończ" - -#~ msgid ", %H:%M:%S left" -#~ msgstr ", pozostało %H:%M:%S" - -#~ msgid ", --:--:-- left" -#~ msgstr ", pozostało --:--:--" - -#~ msgid "- Broken router and/or firewall" -#~ msgstr "- Zepsuty router i/lub firewall" - -#~ msgid "- File corrupted on mirror" -#~ msgstr "- Plik uszkodzony na serwerze lustrzanym" - -#~ msgid "- Malware on your system" -#~ msgstr "- Malware na twoim komputerze" - -#~ msgid "Advanced options:" -#~ msgstr "Opcje zaawansowane:" - -#~ msgid "" -#~ "Alternatively, visit https://filezilla-project.org/ to download the most " -#~ "recent version." -#~ msgstr "" -#~ "Alternatywnie, wejdź na https://filezilla-project.org/, by " -#~ "pobraćnajnowszą wersję." - -#~ msgid "C&heck for nightly builds of FileZilla" -#~ msgstr "Sprawdzaj codzienne kompilacje FileZilla" - -#~ msgid "Cannot load file, not a valid XML file." -#~ msgstr "Nie można załadować pliku, niepoprawny plik XML." - -#~ msgid "Click on next to download the new version." -#~ msgstr "Kliknij Dalej, aby pobrać nową wersję." - -#~ msgid "Connecting to server" -#~ msgstr "Łączenie z serwerem" - -#~ msgid "" -#~ "Do you really want to check for beta versions?\n" -#~ "Unless you want to test new features, keep using stable versions." -#~ msgstr "" -#~ "Na pewno chcesz sprawdzać dostępność wersji beta?\n" -#~ "Jeśli nie chcesz testować nowych opcji, używaj stabilnych wersji." - -#~ msgid "Error, file name cannot be parsed." -#~ msgstr "Błąd, nazwa pliku nie może być zanalizowana." - -#~ msgid "Error, local file exists but cannot be removed" -#~ msgstr "Błąd, lokalny plik istnieje, ale nie może być usunięty" - -#~ msgid "Every month" -#~ msgstr "Co miesiąc" - -#~ msgid "Every two weeks" -#~ msgstr "Co dwa tygodnie" - -#~ msgid "Executable" -#~ msgstr "Plik wykonywalny" - -#~ msgid "Failed to check for newer version of FileZilla." -#~ msgstr "Nie udało się sprawdzić aktualizacji FileZilla." - -#~ msgid "Failed to parse trusted root cert." -#~ msgstr "Nie udało się zanalizować zaufanego certyfikatu głównego." - -#~ msgid "" -#~ "Filename may not contain any of the following characters: / \\ : * ? \" < " -#~ "> |" -#~ msgstr "" -#~ "Nazwa pliku nie może zawierać żadnego z następujących znaków: / \\ : * ? " -#~ "\" < > |" - -#~ msgid "" -#~ "In case you prefer automatic updates, you can enable automatic update " -#~ "checks in the settings dialog." -#~ msgstr "" -#~ "Jeśli wolisz aktualizacje automatyczne, możesz włączyć automatyczne " -#~ "sprawdzanie aktualizacji w oknie ustawień." - -#~ msgid "Log of update check:" -#~ msgstr "Dziennik sprawdzania aktualizacji:" - -#~ msgid "Package" -#~ msgstr "Paczka" - -#~ msgid "" -#~ "Please check https://filezilla-project.org/ for the most recent version " -#~ "of FileZilla." -#~ msgstr "" -#~ "Sprawdź najnowszą wersję FileZilla na https://filezilla-project.org/." - -#~ msgid "" -#~ "Please check the package manager of your system for an updated package or " -#~ "visit https://filezilla-project.org/ to download the source code of " -#~ "FileZilla." -#~ msgstr "" -#~ "Sprawdź, czy w menadżerze pakietów twojego systemu są dostępne " -#~ "aktualizacje, lub odwiedź https://filezilla-project.org/, aby pobrać kod " -#~ "źródłowy FileZilla." - -#~ msgid "" -#~ "Please retry downloading the update. Possible reasons if the problem " -#~ "persists (listed in order of decreasing probability):" -#~ msgstr "" -#~ "Proszę ponów próbę pobierania aktualizacji. Możliwe przyczyny, jeśli " -#~ "problem nadal istnieje (wymienione w kolejności malejącego " -#~ "prawdopodobieństwa):" - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ for more information about " -#~ "FileZilla." -#~ msgstr "" -#~ "Odwiedź https://filezilla-project.org/, aby uzyskać więcej informacji o " -#~ "FileZilla." - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ to download the most recent " -#~ "version." -#~ msgstr "" -#~ "Odwiedź https://filezilla-project.org/, aby pobrać najnowszą wersję." - -#~ msgid "Resolving hostname" -#~ msgstr "Znajdowanie nazwy hosta" - -#~ msgid "Root certificate is not trusted" -#~ msgstr "Główny certyfikat nie jest zaufany" - -#~ msgid "Select download location for package" -#~ msgstr "Wybierz miejsce pobrania dla paczki" - -#~ msgid "" -#~ "The most recent version has been downloaded. Click on Finish to close " -#~ "FileZilla and to start the installation." -#~ msgstr "" -#~ "Najnowsza wersja została pobrana. Kliknij Zakończ, aby zamknąć FileZilla " -#~ "i rozpocząć instalację." - -#~ msgid "" -#~ "The most recent version has been downloaded. Please install it the same " -#~ "way you installed this version." -#~ msgstr "" -#~ "Została pobrana najnowsza wersja. Zainstaluj ją w ten sam sposób, jak " -#~ "zainstalowałeś tą wersję." - -#~ msgid "Update wizard" -#~ msgstr "Kreator aktualizacji" - -#~ msgid "Use plain FTP" -#~ msgstr "Użyj zwykłego FTP" - -#~ msgid "Using this wizard you can check for available updates to FileZilla." -#~ msgstr "" -#~ "Używając tego kreatora, możesz sprawdzić dostępność aktualizacji " -#~ "FileZilla." - -#~ msgid "" -#~ "You are already using the most recent version of FileZilla. Please check " -#~ "again in future." -#~ msgstr "Używasz już najnowszej wersji FileZilla. Sprawdź innym razem." diff -Nru filezilla-3.15.0.2/locales/pt_BR.po filezilla-3.33.0/locales/pt_BR.po --- filezilla-3.15.0.2/locales/pt_BR.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/pt_BR.po 2017-09-19 21:36:39.000000000 +0000 @@ -1,32 +1,35 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Copyright (C) 2016 FileZilla's COPYRIGHT HOLDER +# This file is distributed under the same license as the FileZilla package. +# Felipe Santello , ?. +# Nelson Luiz Dumbra , 2016. +# Rodolfo Ribeiro Gomes , 2016. # msgid "" msgstr "" -"Project-Id-Version: FileZilla 3 pt\n" +"Project-Id-Version: FileZilla 3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-21 14:34+0200\n" -"PO-Revision-Date: 2014-10-03 11:57-0300\n" -"Last-Translator: Victor Westmann \n" -"Language-Team: Felipe Santello \n" +"POT-Creation-Date: 2016-06-20 16:57+0200\n" +"PO-Revision-Date: 2016-06-19 05:33-0300\n" +"Last-Translator: Rodolfo Ribeiro Gomes \n" +"Language-Team: Brazilian Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: utf-8\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.9\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Gtranslator 2.91.7\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:54 -#: ../../locales/../src/interface/statuslinectrl.cpp:198 +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:199 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S decorridos" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:59 -#: ../../locales/../src/interface/statuslinectrl.cpp:204 +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:205 msgid "%H:%M:%S left" msgstr "%H:%M:%S restantes" @@ -39,55 +42,50 @@ "%a - Conta (As linhas contendo isso serão omitidas se não utilizar o tipo de " "logon de conta)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 -#: ../../locales/../src/interface/filelist_statusbar.cpp:74 -#: ../../locales/../src/interface/filelist_statusbar.cpp:86 +#: ../../locales/../src/interface/filelist_statusbar.cpp:47 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 +#: ../../locales/../src/interface/filelist_statusbar.cpp:67 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d pasta" msgstr[1] "%d pastas" -#: ../../locales/../src/interface/RemoteListView.cpp:1456 -#: ../../locales/../src/interface/search.cpp:467 -#: ../../locales/../src/interface/search.cpp:778 +#: ../../locales/../src/interface/RemoteListView.cpp:1396 +#: ../../locales/../src/interface/search.cpp:801 +#: ../../locales/../src/interface/search.cpp:1188 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d pasta com o seu conteúdo" msgstr[1] "%d pastas com seus conteúdos" -#: ../../locales/../src/interface/filelist_statusbar.cpp:62 -#: ../../locales/../src/interface/filelist_statusbar.cpp:85 -#: ../../locales/../src/interface/RemoteListView.cpp:1455 -#: ../../locales/../src/interface/search.cpp:466 -#: ../../locales/../src/interface/search.cpp:777 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 +#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../../locales/../src/interface/RemoteListView.cpp:1395 +#: ../../locales/../src/interface/search.cpp:800 +#: ../../locales/../src/interface/search.cpp:1187 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d arquivo" msgstr[1] "%d arquivos" -#: ../../locales/../src/interface/filelist_statusbar.cpp:81 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d arquivo. Tamanho: %s" msgstr[1] "%d arquivos. Tamanho: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#: ../../locales/../src/interface/filelist_statusbar.cpp:61 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d arquivo. Tamanho: No mínimo %s" msgstr[1] "%d arquivos. Tamanho: No mínimo %s" -#: ../../locales/../src/interface/QueueView.cpp:2920 -#, c-format -msgid "%d files added to queue" -msgstr "%d arquivos adicionados à fila" - -#: ../../locales/../src/engine/ControlSocket.cpp:99 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -98,27 +96,41 @@ msgid "%h - Host" msgstr "%h - Domínio" +#: ../../locales/../src/interface/recursive_operation_status.cpp:117 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu diretório" +msgstr[1] "%llu diretórios" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:116 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu arquivo" +msgstr[1] "%llu arquivos" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:517 #, c-format msgid "%p - Password" msgstr "%p - Senha" -#: ../../locales/../src/interface/statuslinectrl.cpp:159 +#: ../../locales/../src/interface/statuslinectrl.cpp:160 #, c-format msgid "%s (%s/s)" msgstr "%s bytes (%s B/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:162 +#: ../../locales/../src/interface/statuslinectrl.cpp:163 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certificado expirado!" -#: ../../locales/../src/interface/verifycertdialog.cpp:28 +#: ../../locales/../src/interface/verifycertdialog.cpp:32 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ainda não é válido!" @@ -128,24 +140,24 @@ msgid "%s - Proxy user" msgstr "%s - Usuário proxy" -#: ../../locales/../src/interface/filelist_statusbar.cpp:91 +#: ../../locales/../src/interface/filelist_statusbar.cpp:72 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s e %s. Tamanho: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:89 +#: ../../locales/../src/interface/filelist_statusbar.cpp:70 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s e %s. Tamanho: No mínimo %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:34 +#: ../../locales/../src/engine/sizeformatting_base.cpp:66 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s bytes" -#: ../../locales/../src/interface/FileZilla.cpp:701 +#: ../../locales/../src/interface/FileZilla.cpp:582 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -160,7 +172,7 @@ "Faça o download do FileZilla novamente. Caso esse problema persista, por " "favor reporte esse bug." -#: ../../locales/../src/interface/FileZilla.cpp:795 +#: ../../locales/../src/interface/FileZilla.cpp:667 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -178,7 +190,7 @@ "PATH.\n" "- Defina o caminho completo para %s na variável de ambiente FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:58 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s com %d bits" @@ -186,54 +198,54 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:509 #, c-format msgid "%u - Username" -msgstr "%u - Nome de usuário:" +msgstr "%u - Nome de usuário" #: ../../locales/../src/interface/resources/xrc/settings.xrc:540 msgid "%w - Proxy password" msgstr "%w - Senha do proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 msgid "&Abort previous connection and connect in current tab" msgstr "C&ancelar conexão anterior e conectar na aba atual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:232 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&About..." msgstr "&Sobre..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2422 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "Con&ta:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:478 msgid "&Active" msgstr "Ati&vo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:205 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 msgid "&Add bookmark..." msgstr "&Adicionar marcador..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 msgid "&Add files to queue" msgstr "&Adicionar arquivos à fila" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." -msgstr "&Adicionar arquivo de chave..." +msgid "&Add key file..." +msgstr "&Adicionar arquivo chave..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:496 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:559 msgid "&Add to queue" msgstr "&Adicionar à fila" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:407 msgid "&Adjust server timezone offset:" msgstr "Ajustar a diferença do fuso &horário do servidor:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:251 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "&Confiar sempre nesse certificado em sessões futuras." @@ -241,11 +253,11 @@ msgid "&Always trust this host, add this key to the cache" msgstr "&Confiar sempre nesse host, adicionar esta chave ao cache" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1929 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 msgid "&Always use default editor" msgstr "Utiliz&ar sempre o editor padrão" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2887 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Utilizar sempre a seleção para arquivos não associados" @@ -258,48 +270,48 @@ msgstr "&Pedir ao sistema operational pelo endereço IP externo" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1022 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Automático" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 msgid "&Autodetect" msgstr "Auto&detectar" #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1037 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Binário" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1591 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "Prefixos &binários usando símbolos SI (p.ex. 1 KB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 msgid "&Bookmarks" msgstr "&Marcadores" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2604 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2684 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2874 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3043 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1901 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2116 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:295 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:367 msgid "&Browse..." msgstr "&Procurar..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:936 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 msgid "&Burst tolerance:" msgstr "&Tolerância a picos:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3590 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3807 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -313,11 +325,11 @@ msgid "&Close" msgstr "Fe&char" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:376 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "&Sair do FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:642 msgid "&Configure speed limits..." msgstr "&Configurar limites de velocidade..." @@ -325,7 +337,7 @@ msgid "&Configure..." msgstr "&Configurar..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:619 msgid "&Connect" msgstr "&Conectar" @@ -334,39 +346,35 @@ msgstr "&Copiar a conexão atual para o Gerenciador de Sites..." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "&Copiar para a área de transferência" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 -msgid "&Crash" -msgstr "&Abortar" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:303 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:496 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:560 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "&Create directory" msgstr "&Criar pasta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:609 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Create new tab" msgstr "&Criar nova aba" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "&Depuração de erros" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2205 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Debug information in message log:" msgstr "&Informações de depuração de erros no log de mensagens:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 msgid "&Default editor:" msgstr "&Editor padrão:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:348 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "&Ação padrão se o arquivo existir..." @@ -375,15 +383,15 @@ msgstr "&Tempo de espera entre tentativas de login com falha:" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1241 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:275 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:569 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Apagar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3140 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3353 msgid "&Delete symlink" msgstr "&Apagar atalho simbólico" @@ -391,30 +399,38 @@ msgid "&Directory comparison" msgstr "&Comparação de pastas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1812 +#: ../../locales/../src/interface/state.cpp:918 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"&Desativar a navegação sincronizada e continuar a alterar o diretório local" + +#: ../../locales/../src/interface/state.cpp:990 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "" +"&Desativar a navegação sincronizada e continuar a alterar o diretório remoto" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 msgid "&Discard local file then download and edit file anew" msgstr "&Descartar o arquivo local e depois Baixar e editar um arquivo novo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:184 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Disconnect" msgstr "&Desconectar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:380 -msgid "&Disconnect from server" -msgstr "&Desconectar do servidor" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1372 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "" "E&xibir velocidades de transferência momentâneas ao invés da velocidade média" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1578 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 msgid "&Display size in bytes" msgstr "&Mostrar o tamanho em bytes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3573 -msgid "&Do not remember passwords" -msgstr "Nã&o relembrar senhas" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3790 +msgid "&Do not remember passwords (recommended)" +msgstr "Não se lembrar &de senhas (recomendado)" #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." @@ -424,50 +440,54 @@ msgid "&Don't use external IP address on local connections." msgstr "&Não usar o endereço IP externo em conexões locais." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1785 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "&Double-click action on files:" msgstr "Ação para clique &duplo nos arquivos:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "&Download" msgstr "&Baixar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 msgid "&Download to:" msgstr "&Baixar para:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:608 msgid "&Download..." msgstr "&Baixar..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1400 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Downloads:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:258 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 msgid "&Edit" msgstr "&Editar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 msgid "&Edit filter rules..." msgstr "&Editar regras dos filtros..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:625 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 msgid "&Enable" msgstr "&Ativar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3462 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:877 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +msgid "&Enable compression" +msgstr "&Ativar a compactação" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3679 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "&Ativar limites de velocidade" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:565 msgid "&Encoding:" msgstr "Codi&ficação:" @@ -475,24 +495,24 @@ msgid "&Encryption:" msgstr "Cripto&grafia" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:416 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "&Entre com comando personalizado…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3614 msgid "&Establish connection in a new tab" msgstr "&Estabelecer conexão em nova aba" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 msgid "&Execute" msgstr "&Executar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1574 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 msgid "&Export Site Manager entries" msgstr "&Exportar entradas do Gerenciador de Sites" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "&Export..." msgstr "&Exportar..." @@ -504,19 +524,19 @@ msgid "&File" msgstr "&Arquivo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:527 msgid "&File Attributes..." msgstr "&Atributos do arquivo..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:331 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "Permissões do &arquivo..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 msgid "&File:" msgstr "&Arquivo:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" msgstr "Condições para o &filtro:" @@ -524,15 +544,23 @@ msgid "&Filter sets:" msgstr "&Conjuntos de filtros:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1219 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Filtros:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 msgid "&Finish editing and delete local file" msgstr "&Terminar edição e apagar o arquivo local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3278 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Consolidar caminhos locais, enviar todos os arquivos diretamente para a " +"pasta de destino" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3183 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -540,7 +568,7 @@ "&Consolidar caminhos remotos, baixar todos os arquivos diretamente para a " "pasta de destino" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3360 msgid "&Follow symlink, delete target directory contents" msgstr "&Seguir o atalho simbólico, apagar o conteúdo da pasta de destino" @@ -548,28 +576,28 @@ msgid "&Get external IP address from the following URL:" msgstr "&Obter um endereço IP externo a partir da seguinte URL:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:225 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 msgid "&Getting help..." msgstr "&Obter ajuda..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2535 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 msgid "&Global bookmark" msgstr "&Marcador global" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:705 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 usando o método CONNECT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 msgid "&Help" msgstr "Aj&uda" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:538 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "&Hide identical files" msgstr "&Ocultar arquivos idênticos" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "&Maior" @@ -577,17 +605,17 @@ msgid "&Highest available port:" msgstr "M&aior porta disponível:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2328 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 msgid "&Host:" msgstr "&Host:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1586 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&Prefixos binários IEC (p.ex. 1 KiB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1472 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (exemplo: 2007-09-15)" @@ -595,7 +623,7 @@ msgid "&Import..." msgstr "&Importar..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Inherit system's filetype associations" msgstr "&Usar associações de tipos de arquivo do sistema" @@ -603,11 +631,16 @@ msgid "&Install new version" msgstr "&Instalar nova versão" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3271 msgid "&Keep remote path structure relative to search root" msgstr "Manter a estrutura remota de caminhos relativa à rai&z de procura" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1246 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +msgid "&Key file:" +msgstr "&Arquivo com chave" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "&Disposição das janelas de arquivos e pastas:" @@ -615,7 +648,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Limitar portas locais usadas pelo FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:494 msgid "&Limit number of simultaneous connections" msgstr "&Limitar o número de conexões simultâneas" @@ -623,28 +656,32 @@ msgid "&Local directory tree" msgstr "Árvore de pastas &local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2589 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2672 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "Pasta &local:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 +msgid "&Local search" +msgstr "Procura de arquivo &local" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "&Log to file" msgstr "&Log no arquivo" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "Tipo de lo&gon:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2384 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 msgid "&Logontype:" msgstr "&Tipo de logon:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:365 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "&Baixo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:209 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Manage bookmarks..." msgstr "&Gerenciar marcadores..." @@ -652,7 +689,7 @@ msgid "&Manual transfer..." msgstr "Transferência &manual..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:504 msgid "&Maximum number of connections:" msgstr "Número &máximo de conexões:" @@ -664,15 +701,15 @@ msgid "&Message log" msgstr "Log de &mensagens" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1324 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 msgid "&Minimize to tray" msgstr "&Minimizar para a barra de notificação" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1712 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 msgid "&Name sorting mode:" msgstr "&Modo de ordenação por nome:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" msgstr "&Nome:" @@ -680,7 +717,7 @@ msgid "&Network configuration wizard..." msgstr "&Assistente de configuração de rede..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1235 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 msgid "&New" msgstr "&Novo" @@ -688,34 +725,36 @@ msgid "&New Site" msgstr "&Novo Site" -#: ../../locales/../src/interface/Mainfrm.cpp:1814 +#: ../../locales/../src/interface/Mainfrm.cpp:1649 msgid "&New version available!" msgstr "&Nova versão disponível!" -#: ../../locales/../src/interface/netconfwizard.cpp:20 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Próximo >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1764 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 msgid "&No" msgstr "&Não" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:700 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&Nenhum" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:361 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&Normal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:513 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 msgid "&Numeric value:" msgstr "Valor &numérico:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2808 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:627 msgid "&OK" msgstr "&OK" @@ -723,8 +762,8 @@ msgid "&OPEN" msgstr "&ABERTO" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:555 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "&Open" msgstr "&Abrir" @@ -732,19 +771,19 @@ msgid "&Overwrite" msgstr "&Substituir" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:485 msgid "&Passive" msgstr "&Passivo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 msgid "&Password:" msgstr "Sen&ha:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:392 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "&Reproduzir som" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2341 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 msgid "&Port:" @@ -754,7 +793,7 @@ msgid "&Preserve timestamps of transferred files" msgstr "&Preservar data e hora dos arquivos transferidos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Queue" msgstr "&Fila" @@ -766,37 +805,49 @@ msgid "&Quickconnect bar" msgstr "Barra de cone&xão rápida" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +msgid "&Quickconnect history" +msgstr "&Histórico de conexões rápidas" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Read" msgstr "&Ler" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 msgid "&Reconnect" msgstr "&Reconectar" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +msgid "&Reconnect information" +msgstr "Informações de &reconexões" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:633 msgid "&Refresh" msgstr "&Atualizar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 msgid "&Remember password until FileZilla is closed" msgstr "Lemb&rar da senha até que o FileZilla seja fechado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3784 msgid "&Remember passwords" msgstr "&Lembrar senhas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "Pasta &remota:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 msgid "&Remote path:" msgstr "Caminho &remoto:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3017 +msgid "&Remote search" +msgstr "Procura de arquivos &remotos" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Remover" @@ -804,16 +855,16 @@ msgid "&Remove key" msgstr "&Remover chave" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:345 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "&Remover selecionados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1247 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2753 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:279 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:509 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:573 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Renomear" @@ -822,18 +873,22 @@ msgid "&Rename..." msgstr "&Renomear..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 msgid "&Reopen local file" msgstr "&Reabrir o arquivo local" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:985 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 msgid "&Replace invalid characters with:" msgstr "Substitui&r caracteres inválidos com:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:228 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 msgid "&Report a bug..." msgstr "&Reportar um erro..." +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "&Pedido de atenção" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:453 msgid "&Reset and requeue all" msgstr "Limpar e &recolocar todos na fila" @@ -846,7 +901,7 @@ msgid "&Resume" msgstr "Continua&r" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:384 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "E&xecutar comando..." @@ -854,7 +909,7 @@ msgid "&Run configuration wizard now..." msgstr "E&xecutar o assistente de configuração agora..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2055 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 msgid "&Run update check now..." msgstr "&Verificar atualizações agora..." @@ -862,7 +917,7 @@ msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 msgid "&SOCKS 5" msgstr "&SOCKS 5" @@ -870,11 +925,11 @@ msgid "&Save as..." msgstr "&Salvar como..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 msgid "&Search" msgstr "&Procurar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 msgid "&Search remote files..." msgstr "&Procurar arquivos remotos..." @@ -882,20 +937,20 @@ msgid "&Select Entry:" msgstr "&Selecionar Entrada:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 msgid "&Select language:" msgstr "&Selecionar idioma:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 msgid "&Select the columns that should be displayed:" msgstr "&Selecione as colunas a serem mostradas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2256 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Servidor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "&Settings" msgstr "&Configurações" @@ -903,23 +958,27 @@ msgid "&Settings..." msgstr "&Configurações..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 msgid "&Show debug menu" msgstr "Mo&strar menu de depuração de erros" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:388 -msgid "&Show message" -msgstr "Mo&strar mensagem" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +msgid "&Show detailed log" +msgstr "Mo&strar o registo detalhado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 msgid "&Show timestamps in message log" msgstr "Mo&strar data e hora no log de mensagens" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +msgid "&Site Manager entries" +msgstr "Entrada&s do Administrador do Site" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Gerenciador de Sites..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "&Site-specific bookmark" msgstr "Marcador próprio do &site" @@ -931,11 +990,12 @@ msgid "&Speed limits" msgstr "&Limites de velocidade" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3076 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3194 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3289 msgid "&Start transfer immediately" msgstr "Começar a transferência &imediatamente" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1267 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 msgid "&Swap local and remote panes" msgstr "&Inverter a ordem das janelas local e remota" @@ -947,7 +1007,7 @@ msgid "&Test" msgstr "&Teste" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1399 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 msgid "&Theme:" msgstr "&Tema:" @@ -955,19 +1015,20 @@ msgid "&Transfer" msgstr "&Transferir" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:382 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 msgid "&Transfer mode:" msgstr "Modo de &transferência:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "Fila de &transferência" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 msgid "&Treat dotfiles as ASCII files" msgstr "&Tratar arquivos de ponto como arquivos ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 msgid "&Unedit" msgstr "&Sem editar" @@ -975,25 +1036,33 @@ msgid "&Update cached key for this host" msgstr "At&ualizar a chave do cache para esse host" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:239 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 msgid "&Upload" msgstr "&Upload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1423 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3248 +msgid "&Upload to:" +msgstr "&Enviar para:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +msgid "&Upload..." +msgstr "&Enviar..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Uploads:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Usar um programa personalizado" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:388 msgid "&Use synchronized browsing" msgstr "&Usar navegação sincronizada" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Use system's default editor for text files" msgstr "&Usar o editor de texto do sistema" @@ -1005,13 +1074,13 @@ msgid "&Use the server's external IP address instead" msgstr "&Usar o endereço IP externo do servidor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1601 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "&Use thousands separator" msgstr "&Usar separador de milhares" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:335 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Usuário:" @@ -1019,7 +1088,7 @@ msgid "&Username:" msgstr "Nome de &usuário:" -#: ../../locales/../src/interface/Mainfrm.cpp:1808 +#: ../../locales/../src/interface/Mainfrm.cpp:1643 #, c-format msgid "&Version %s" msgstr "&Versão %s" @@ -1028,47 +1097,48 @@ msgid "&View" msgstr "&Ver" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:299 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:601 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:614 msgid "&View/Edit" msgstr "&Ver/Editar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1939 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Monitorar os arquivos locais editados e perguntar para enviar as alterações" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "&When checking for updates, check for:" msgstr "&Quando verificar atualizações, verificar por:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Write" msgstr "&Gravar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1758 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 msgid "&Yes" msgstr "&Sim" -#: ../../locales/../src/engine/local_path.cpp:458 -#: ../../locales/../src/engine/local_path.cpp:508 +#: ../../locales/../src/engine/local_path.cpp:444 +#: ../../locales/../src/engine/local_path.cpp:490 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' não existe ou não pode ser acessado." -#: ../../locales/../src/engine/local_path.cpp:474 -#: ../../locales/../src/engine/local_path.cpp:495 -#: ../../locales/../src/engine/local_path.cpp:502 +#: ../../locales/../src/engine/local_path.cpp:459 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:485 #, c-format msgid "'%s' is not a directory." msgstr "'%s' não é uma pasta." -#: ../../locales/../src/interface/manual_transfer.cpp:445 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:950 +#: ../../locales/../src/interface/manual_transfer.cpp:427 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:966 msgid "'Account' logontype not supported by selected protocol" msgstr "O tipo de logon 'Conta' não é suportado pelo protocolo selecionado" -#: ../../locales/../src/interface/manual_transfer.cpp:459 +#: ../../locales/../src/interface/manual_transfer.cpp:441 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1076,7 +1146,7 @@ "Os inícios de sessão 'Normal' e 'Conta' não estão disponíveis, em vez disso " "use 'Pedir senha'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:965 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:981 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1084,7 +1154,7 @@ "Os tipos de início de sessão 'Normal' e 'Conta' não estão disponíveis. Sua " "entrada precisa ser alterada para 'Pedir Senha'." -#: ../../locales/../src/interface/Mainfrm.cpp:623 +#: ../../locales/../src/interface/Mainfrm.cpp:584 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1094,16 +1164,21 @@ "comandos para enviar os argumentos após 'quote' para o servidor. Você pode " "preferir entrar com o comando sem o 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:96 -#: ../../locales/../src/interface/filelist_statusbar.cpp:105 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 +#: ../../locales/../src/interface/filelist_statusbar.cpp:83 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objeto filtrado)" msgstr[1] "(%d objetos filtrados)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:839 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:860 +#: ../../locales/../src/interface/update_dialog.cpp:309 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% baixado)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 msgid "(0 for no limit)" msgstr "(0 para ilimitado)" @@ -1115,32 +1190,32 @@ msgid "(0-999 seconds)" msgstr "(0-999 segundos)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:818 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 msgid "(1-10)" msgstr "(1-10)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:109 -msgid "(5-9999, 0 to disable)" -msgstr "(5-9999, 0 para desativar)" +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, 0 para desabilitar)" -#: ../../locales/../src/interface/aboutdialog.cpp:84 -#: ../../locales/../src/interface/aboutdialog.cpp:161 +#: ../../locales/../src/interface/aboutdialog.cpp:85 +#: ../../locales/../src/interface/aboutdialog.cpp:174 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat está definido para %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 msgid "(example: %H:%M)" msgstr "(exemplo: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "(example: %Y-%m-%d)" msgstr "(exemplo: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3498 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:900 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3698 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3715 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format msgid "(in %s/s)" msgstr "(em %s/s)" @@ -1149,7 +1224,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:207 +#: ../../locales/../src/interface/statuslinectrl.cpp:208 msgid "--:--:-- left" msgstr "--:--:-- restantes" @@ -1169,43 +1244,43 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s não pode ser usado com uma URL FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 msgid "0 - None" msgstr "0 - Nenhum" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "1 - Warning" msgstr "1 - Aviso" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 msgid "2 - Info" msgstr "2 - Info" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 msgid "3 - Verbose" -msgstr "3 - Verboso" +msgstr "3 - Detalhado" -#: ../../locales/../src/interface/aboutdialog.cpp:97 -msgid "32 bit system" -msgstr "Sistema de 32 bit" +#: ../../locales/../src/interface/aboutdialog.cpp:98 +msgid "32-bit system" +msgstr "32-bits Sistema" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2219 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 msgid "4 - Debug" msgstr "4 - Debug" -#: ../../locales/../src/interface/aboutdialog.cpp:95 -msgid "64 bit system" -msgstr "Sistema de 64 bit" +#: ../../locales/../src/interface/aboutdialog.cpp:96 +msgid "64-bit system" +msgstr "64-bits Sistema" -#: ../../locales/../src/interface/netconfwizard.cpp:21 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Anterior" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:106 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "Já existe um marcador com esse nome. Entre com um nome não usado." @@ -1215,8 +1290,8 @@ msgstr "É necessário definir um editor padrão." #: ../../locales/../src/interface/RemoteListView.cpp:160 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:816 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:759 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Uma pasta não pode ser arrastada para dentro de uma de suas subpastas." @@ -1230,27 +1305,21 @@ "Nesses casos é necessário usar o modo ativo. Em modo ativo, o FileZilla abre " "uma porta e pede ao servidor para se conectar a ela." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 msgid "A file previously opened has been changed." msgstr "Um arquivo previamente aberto foi alterado." -#: ../../locales/../src/interface/edithandler.cpp:1665 -#, c-format -msgid "" -"A file with that name is already being edited. Do you want to reopen '%s'?" -msgstr "Um arquivo com esse nome já está sendo editado. Quer reabrir '%s'?" - -#: ../../locales/../src/interface/edithandler.cpp:1655 +#: ../../locales/../src/interface/edithandler.cpp:1645 msgid "A file with that name is already being transferred." msgstr "Um arquivo com esse nome já está sendo transferido." -#: ../../locales/../src/interface/edithandler.cpp:1659 +#: ../../locales/../src/interface/edithandler.cpp:1649 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Um arquivo com esse nome ainda está sendo editado. Feche-o e tente outra vez." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:561 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1269,7 +1338,7 @@ msgid "A new version of FileZilla is available:" msgstr "Uma nova versão do FileZilla está disponível:" -#: ../../locales/../src/interface/Mainfrm.cpp:703 +#: ../../locales/../src/interface/Mainfrm.cpp:644 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1286,7 +1355,7 @@ "Um servidor bem configurado não requer isso. Contacte o administrador do " "servidor se você precisar disso." -#: ../../locales/../src/interface/state.cpp:284 +#: ../../locales/../src/interface/state.cpp:251 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1297,68 +1366,68 @@ "local?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1078 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 msgid "A&dd" msgstr "A&dicionar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 msgid "A&llow resume of ASCII files" msgstr "P&ermitir a continuação de arquivos ASCII" -#: ../../locales/../src/interface/fileexistsdlg.cpp:70 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" msgstr "A&plicar somente a downloads" -#: ../../locales/../src/interface/fileexistsdlg.cpp:70 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" msgstr "A&plicar somente a uploads" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:547 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 msgid "A&pply to all files and directories" msgstr "A&plicar a todos os arquivos e pastas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:479 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 msgid "A&utomatically remove successful transfers" msgstr "Remover a&utomaticamente as transferências bem sucedidas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2474 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:588 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 msgid "About FileZilla" msgstr "Sobre o FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 msgid "Above the file lists" msgstr "Acima das listas de arquivos" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:161 -#: ../../locales/../src/interface/manual_transfer.cpp:194 -#: ../../locales/../src/interface/manual_transfer.cpp:568 -#: ../../locales/../src/interface/manual_transfer.cpp:569 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1291 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1292 +#: ../../locales/../src/engine/server.cpp:885 +#: ../../locales/../src/engine/server.cpp:906 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/manual_transfer.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1314 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1315 msgid "Account" msgstr "Conta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "Ação após &término da fila" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 msgid "Action on selected file:" msgstr "Ação para o arquivo selecionado:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 msgid "Action to perform:" msgstr "Ação a executar:" @@ -1366,11 +1435,11 @@ msgid "Action:" msgstr "Ação:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 msgid "Active mode" msgstr "Modo ativo" -#: ../../locales/../src/interface/netconfwizard.cpp:611 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1378,7 +1447,7 @@ "Teste ao modo ativo do FTP falhou. O FileZilla desconhece o endereço IP " "externo correto." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1386,7 +1455,7 @@ "Teste ao modo ativo do FTP falhou. O FileZilla desconhece o endereço IP " "externo correto. Além disso, o seu roteador modificou o endereço enviado." -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1400,34 +1469,35 @@ msgid "Active mode IP" msgstr "Modo de IP ativo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3083 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3296 msgid "Add files to &queue only" msgstr "&Somente adicione os arquivos à fila" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "Add selected directory to the transfer queue" msgstr "Adicionar pastas selecionadas à fila de transferência" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 msgid "Add selected files and folders to the transfer queue" msgstr "Adicionar arquivos e pastas selecionados à fila de transferência" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1793 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "Add to queue" msgstr "Adicionar à fila" -#: ../../locales/../src/engine/proxy.cpp:509 +#: ../../locales/../src/engine/proxy.cpp:529 msgid "Address type not supported" msgstr "Tipo do endereço não é suportado" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:313 msgid "Advanced" msgstr "Avançado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2046 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1442,15 +1512,15 @@ "danificar o sistema. Use versões beta e compilações noturnas por sua conta e " "risco." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3414 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3631 msgid "Al&ways perform this action" msgstr "Se&mpre realizar esta ação" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1937 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 msgid "Algorithm:" msgstr "Algoritmo:" -#: ../../locales/../src/interface/QueueView.cpp:3109 +#: ../../locales/../src/interface/QueueView.cpp:2502 msgid "All files have been successfully transferred" msgstr "Todos os arquivos foram transferidos com sucesso" @@ -1458,7 +1528,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Todas as portas do intervalo têm que estar entre 1024 e 65535." -#: ../../locales/../src/interface/QueueView.cpp:3105 +#: ../../locales/../src/interface/QueueView.cpp:2498 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1475,10 +1545,16 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Permitir fallback para outro modo de transferência em caso de falha" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 msgid "Already connected" msgstr "Já conectado" +#: ../../locales/../src/interface/verifycertdialog.cpp:84 +msgid "Alternative name:" +msgid_plural "Alternative names:" +msgstr[0] "Nome alternativo:" +msgstr[1] "Nomes alternativo:" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:660 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " @@ -1503,7 +1579,7 @@ "Alternativamente, você também pode baixar a última versão do FileZilla do " "website:" -#: ../../locales/../src/interface/QueueView.cpp:2038 +#: ../../locales/../src/interface/QueueView.cpp:1543 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1512,7 +1588,7 @@ "Ocorreu um erro ao carregar a fila detransferência de \"%s\".\n" "Alguns itens da fila podem não ter sido restaurados." -#: ../../locales/../src/interface/QueueView.cpp:1943 +#: ../../locales/../src/interface/QueueView.cpp:1441 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1521,7 +1597,7 @@ "Ocorreu um erro ao salvar a fila detransferência para \"%s\".\n" "Alguns itens da fila podem não ter sido salvos." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1958 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2055 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1529,48 +1605,40 @@ "Um item com o mesmo nome daquele que está sendo arrastado já existe no " "destino." -#: ../../locales/../src/engine/server.cpp:857 -#: ../../locales/../src/interface/manual_transfer.cpp:159 -#: ../../locales/../src/interface/manual_transfer.cpp:197 -#: ../../locales/../src/interface/manual_transfer.cpp:213 -#: ../../locales/../src/interface/manual_transfer.cpp:567 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1290 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1534 +#: ../../locales/../src/engine/server.cpp:908 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1313 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1598 msgid "Anonymous" msgstr "Anônimo" -#: ../../locales/../src/interface/state.cpp:1000 +#: ../../locales/../src/interface/state.cpp:967 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Outra operação remota já está sendo executada, não é possível alterar a " "pasta agora." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:786 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:795 msgid "Any changes made in the Site Manager could not be saved." msgstr "Quaisquer alterações ao Gerenciador de Sites não poderão ser salvas." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:733 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"Alterações no Gerenciador de Sites não serão salvas a não ser que se repare " -"o arquivo." - -#: ../../locales/../src/interface/filter.cpp:214 +#: ../../locales/../src/interface/filter.cpp:213 msgid "Any changes made to the filters could not be saved." msgstr "Alterações nos filtros não poderão ser salvas." -#: ../../locales/../src/interface/filter.cpp:1012 +#: ../../locales/../src/interface/filter.cpp:979 msgid "Any changes made to the filters will not be saved." msgstr "Alterações nos filtros não serão salvas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:561 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 msgid "App&ly to directories only" msgstr "Apl&icar somente a pastas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 msgid "Apply" msgstr "Aplicar" @@ -1578,7 +1646,7 @@ msgid "Apply to ¤t queue only" msgstr "Aplicar somente à &fila atual" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:554 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 msgid "Apply to &files only" msgstr "Aplicar somente a ar&quivos" @@ -1586,25 +1654,25 @@ msgid "Archive" msgstr "Arquivo" -#: ../../locales/../src/engine/socket.cpp:1163 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Argument buffer overflow" msgstr "Argumento de buffer overflow" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1296 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 msgid "As tab in the transfer queue pane" msgstr "Como aba no painel da fila de transferência" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1154 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1175 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Perguntar a ação" -#: ../../locales/../src/engine/server.cpp:832 -#: ../../locales/../src/engine/server.cpp:851 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/engine/server.cpp:879 +#: ../../locales/../src/engine/server.cpp:900 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Pedir a senha" @@ -1616,7 +1684,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Pedir o endereço IP externo ao sistema operacional" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3536 msgid "Asking questions in the FileZilla forums" msgstr "Fazer perguntas nos fóruns do FileZilla" @@ -1624,7 +1692,7 @@ msgid "Associated program not found:" msgstr "Programa associado não encontrado:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:711 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 msgid "At least one filter condition is incomplete" msgstr "Pelo menos uma condição de filtro está incompleta" @@ -1636,92 +1704,100 @@ msgid "Attribute" msgstr "Atributo" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:722 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "Authentication failed." msgstr "Falha de autenticação." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1410 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 msgid "Author:" msgstr "Autor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 msgid "Auto" msgstr "Auto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 msgid "Automatic file type classification" msgstr "Classificação de tipo de arquivo automática" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1441 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 msgid "Available sizes" msgstr "Tamanhos disponíveis" -#: ../../locales/../src/engine/sizeformatting_base.cpp:124 -#: ../../locales/../src/engine/sizeformatting_base.cpp:183 +#: ../../locales/../src/engine/sizeformatting_base.cpp:154 +#: ../../locales/../src/engine/sizeformatting_base.cpp:213 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:267 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:339 msgid "B&ypass proxy" msgstr "Contornar o prox&y" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:275 +msgid "Background color:" +msgstr "Cor de fundo:" + # Mesmo que o termo "descritor" soa meio estranho eu verifiquei no dicionário Michaelis (www.michaelis.com.br) e a palavra existe. Então decidi manter. :) -#: ../../locales/../src/engine/socket.cpp:1128 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Bad file descriptor" msgstr "Descritor de arquivo inválido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3280 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 msgid "Basic usage instructions" msgstr "Instruções básicas de uso" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1313 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 msgid "Behaviour" msgstr "Comportamento" -#: ../../locales/../src/interface/edithandler.cpp:1148 -#: ../../locales/../src/interface/edithandler.cpp:1176 +#: ../../locales/../src/interface/edithandler.cpp:1115 +#: ../../locales/../src/interface/edithandler.cpp:1143 msgid "Being edited" msgstr "Sendo editado" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 -msgid "Benchmark string coalescer" -msgstr "Benchmark do aglutinador de strings" - -#: ../../locales/../src/engine/tlssocket.cpp:1014 +#: ../../locales/../src/engine/tlssocket.cpp:1168 msgid "Beware! Certificate has been revoked" msgstr "Atenção! O certificado foi revogado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2479 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "Binary" msgstr "Binário" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1256 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 msgid "Blackboard" msgstr "Quadro negro" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:270 -#: ../../locales/../src/interface/menu_bar.cpp:315 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:396 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "Azul" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:257 +#: ../../locales/../src/interface/menu_bar.cpp:291 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:381 msgid "Bookmark" msgstr "Marcador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2730 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Marcador:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2719 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Marcadores" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:679 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +msgid "Browse..." +msgstr "Procurar..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "Data da versão:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:652 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 msgid "Build information" msgstr "Informações da versão" -#: ../../locales/../src/interface/verifycertdialog.cpp:183 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Categoria de negócio:" @@ -1739,90 +1815,101 @@ msgid "C&ancel current operation" msgstr "&Cancelar a operação atual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:423 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "&Limpar todos" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:327 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "C&opy URL(s) to clipboard" msgstr "C&opiar URL(s) para a área de transferência" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1477 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:523 +msgid "C&opy URL(s) with password to clipboard" +msgstr "C&opiar URL(s) com senha para a área de transferência" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "C&ustom" msgstr "&Personalizado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1967 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "C&ustom filetype associations:" msgstr "Associações dos tipos de arq&uivo personalizadas:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1639 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +msgid "CPU features:" +msgstr "Recursos da CPU:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1567 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1235 msgid "Calculating timezone offset of server..." msgstr "Calculando o fuso horário do servidor..." -#: ../../locales/../src/engine/transfersocket.cpp:689 +#: ../../locales/../src/engine/transfersocket.cpp:665 msgid "Can't read from file" msgstr "Não foi possível ler o arquivo" -#: ../../locales/../src/engine/transfersocket.cpp:667 -#: ../../locales/../src/engine/transfersocket.cpp:740 +#: ../../locales/../src/engine/transfersocket.cpp:645 +#: ../../locales/../src/engine/transfersocket.cpp:713 msgid "Can't write data to file." msgstr "Não foi possível gravar dados no arquivo." -#: ../../locales/../src/engine/transfersocket.cpp:669 -#: ../../locales/../src/engine/transfersocket.cpp:742 +#: ../../locales/../src/engine/transfersocket.cpp:647 +#: ../../locales/../src/engine/transfersocket.cpp:715 #, c-format msgid "Can't write data to file: %s" msgstr "Não foi possível gravar dados no arquivo: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:278 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:578 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1368 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1475 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1546 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1599 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1658 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2505 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2651 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2814 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2904 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3100 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3170 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3432 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3383 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:634 msgid "Cancel" msgstr "Cancelar" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:51 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 msgid "Cancel current operation" msgstr "Cancelar operação atual" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 msgid "Cancels the current operation" msgstr "Cancela a operação atual" -#: ../../locales/../src/engine/local_path.cpp:468 +#: ../../locales/../src/engine/local_path.cpp:454 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Não foi possível acessar '%s', nenhum disco inserido ou a unidade não está " "pronta." -#: ../../locales/../src/interface/Mainfrm.cpp:593 +#: ../../locales/../src/interface/Mainfrm.cpp:557 msgid "Cannot add server to Site Manager" msgstr "Não foi possível adicionar o servidor ao Gerenciador de Sites" -#: ../../locales/../src/engine/socket.cpp:1180 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Cannot assign requested address" msgstr "Não é possível designar o endereço requisitado" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1830,7 +1917,7 @@ "Não é possível fechar a aba enquanto estiver ocupado.\n" "Cancelar a operação atual e fechar a aba?" -#: ../../locales/../src/interface/listingcomparison.cpp:74 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1838,30 +1925,26 @@ "Não é possivel comparar as pastas, existem filtros diferentes para as pastas " "locais e remotas" -#: ../../locales/../src/interface/RemoteListView.cpp:2430 -msgid "Cannot compare directories, not connected to a server." -msgstr "Não é possível comparar pastas, não conectado a um servidor." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Não é possível criar um novo filtro" -#: ../../locales/../src/interface/edithandler.cpp:1637 -#: ../../locales/../src/interface/LocalListView.cpp:1775 -#: ../../locales/../src/interface/RemoteListView.cpp:2367 -#: ../../locales/../src/interface/search.cpp:722 +#: ../../locales/../src/interface/edithandler.cpp:1575 +#: ../../locales/../src/interface/edithandler.cpp:1623 +#: ../../locales/../src/interface/LocalListView.cpp:1732 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Cannot edit file" msgstr "Não é possível editar o arquivo" -#: ../../locales/../src/interface/LocalListView.cpp:1639 +#: ../../locales/../src/interface/LocalListView.cpp:1614 msgid "Cannot edit file, not connected to any server." msgstr "Não é possível editar o arquivo, não está conectado a um servidor." -#: ../../locales/../src/interface/LocalListView.cpp:1648 +#: ../../locales/../src/interface/LocalListView.cpp:1623 msgid "Cannot edit file, remote path unknown." msgstr "Não é possível editar o arquivo, caminho remoto desconhecido." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:329 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:337 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1876,128 +1959,122 @@ "Não é possível carregar a barra de conexão rápida a partir do arquivo de " "recursos" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 -msgid "Cannot load keyfile" -msgstr "Não é possível carregar o arquivo de chave" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +msgid "Cannot load key file" +msgstr "Não foi possível carregar o arquivo chave" -#: ../../locales/../src/interface/Mainfrm.cpp:1113 +#: ../../locales/../src/interface/Mainfrm.cpp:991 msgid "Cannot load toolbar from resource file" msgstr "" "Não é possível carregar a barra de ferramentas a partir de arquivo de " "recursos" -#: ../../locales/../src/interface/manual_transfer.cpp:463 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Não foi possível relembrar a senha" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:707 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1184 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:681 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1202 msgid "Cannot rename entry" msgstr "Não é possível renomear da entrada" -#: ../../locales/../src/interface/RemoteListView.cpp:1657 +#: ../../locales/../src/interface/RemoteListView.cpp:1592 msgid "Cannot rename file" msgstr "Não é possível renomear o arquivo" -#: ../../locales/../src/engine/proxy.cpp:134 +#: ../../locales/../src/engine/proxy.cpp:173 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Não é possível resolver hostname para o endereço IPv4 para usar com proxy " "SOCKS4." -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:424 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Não é possível salvar o conjunto de filtros" -#: ../../locales/../src/interface/filter.cpp:315 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Não é possível selecionar o filtro" -#: ../../locales/../src/interface/edithandler.cpp:1526 -#: ../../locales/../src/interface/edithandler.cpp:1531 -#: ../../locales/../src/interface/edithandler.cpp:1570 +#: ../../locales/../src/interface/edithandler.cpp:1473 +#: ../../locales/../src/interface/edithandler.cpp:1477 +#: ../../locales/../src/interface/edithandler.cpp:1512 msgid "Cannot set file association" msgstr "Não é possível definir a associação de arquivos" -#: ../../locales/../src/interface/edithandler.cpp:1107 +#: ../../locales/../src/interface/edithandler.cpp:1074 msgid "Cannot show dialog" msgstr "Não é possível mostrar janela" -#: ../../locales/../src/interface/edithandler.cpp:1655 +#: ../../locales/../src/interface/edithandler.cpp:1645 msgid "Cannot view/edit selected file" msgstr "Não é possível ler/editar o arquivo selecionado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1721 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 msgid "Case insensitive" msgstr "Sem diferença entre maiúsculas e minúsculas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1720 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 msgid "Case insensitive (default)" msgstr "Sem diferença entre maiúsculas e minúsculas (padrão)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1722 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 msgid "Case sensitive" msgstr "Diferença entre maiúsculas e minúsculas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "Case sensitive (default)" msgstr "Diferença entre maiúsculas e minúsculas (padrão)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1500 -msgid "Categories" -msgstr "Categorias" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Categories to clear" +msgstr "Categorias para limpar" -#: ../../locales/../src/interface/statusbar.cpp:495 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Certificate and session data are not available yet." msgstr "O certificado e os dados da sessão ainda não estão disponíveis." -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:288 -msgid "Certificate details" -msgstr "Detalhes do certificado" - #: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:308 msgid "Certificate in chain:" msgstr "Certificado na cadeia:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:153 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:432 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "Emissor do certificado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:318 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 msgid "Challenge:" msgstr "Desafio:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:396 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 msgid "Change file attributes" msgstr "Alterar atributos do arquivo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 msgid "Change the file permissions." msgstr "Alterar as permissões do arquivo." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2166 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "A alteração das configurações do arquivo de log requer que se reinicie o " "FileZila." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:561 msgid "Character encoding issue" msgstr "Problema de codificação de caracteres" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:527 msgid "Charset" msgstr "Mapa de caracteres" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:217 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 msgid "Check for &updates..." msgstr "&Procurar atualizações..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 msgid "Check for FileZilla &updates automatically:" msgstr "Verificar at&ualizações do FileZilla automaticamente:" @@ -2005,15 +2082,15 @@ msgid "Check for Updates" msgstr "Procurar por Atualizações" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "Check for newer versions of FileZilla" msgstr "Procurar novas versões do FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Procura por atualizações falhou" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:798 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2021,7 +2098,7 @@ "Cheque suas credenciais de login. A senha fornecida começa ou acaba com um " "caractere de espaço." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:794 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:776 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2029,112 +2106,95 @@ "Cheque suas credenciais de login. O nome de usuário fornecido começa ou " "acaba com um caractere de espaço." -#: ../../locales/../src/interface/netconfwizard.cpp:768 +#: ../../locales/../src/interface/netconfwizard.cpp:778 msgid "Checking for correct external IP address" msgstr "Verificando o endereço IP externo correto" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 msgid "Checking for updates..." msgstr "Procurando por atualizações..." -#: ../../locales/../src/interface/updater.cpp:684 +#: ../../locales/../src/interface/updater.cpp:757 #, c-format msgid "Checksum match on file %s\n" msgstr "Checksum correspondente no arquivo %s\n" -#: ../../locales/../src/interface/updater.cpp:680 +#: ../../locales/../src/interface/updater.cpp:753 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Checksum não correspondente no arquivo %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1464 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1499 +msgid "Choose a key file" +msgstr "Escolha um arquivo de chave" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1530 msgid "Choose the default local directory" msgstr "Escolha a pasta local padrão" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:131 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:372 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2185 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:362 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2291 msgid "Choose the local directory" msgstr "Escolha a pasta local" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:826 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Bloco de dados encerrado indevidamente" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:219 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:498 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "Cifra:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "Cl&ose tab" msgstr "&Fechar aba" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 msgid "Classic" msgstr "Clássico" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 -msgid "Clear &Site Manager entries" -msgstr "Limpar as entradas do Gerenciador de &Sites" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "&Limpar cache de layout" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1507 -msgid "Clear &quickconnect history" -msgstr "Limpar histórico de cone&xões rápidas" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1514 -msgid "Clear &reconnect information" -msgstr "Limpar registro de &reconexões" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1526 -msgid "Clear &transfer queue" -msgstr "Limpar fila de &transferência" - -#: ../../locales/../src/interface/quickconnectbar.cpp:147 +#: ../../locales/../src/interface/quickconnectbar.cpp:152 msgid "Clear history" msgstr "Limpar histórico" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1488 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Limpar dados privados" -#: ../../locales/../src/interface/quickconnectbar.cpp:146 +#: ../../locales/../src/interface/quickconnectbar.cpp:151 msgid "Clear quickconnect bar" msgstr "Limpar a barra de conexão rápida" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 -msgid "Clear string coalescer" -msgstr "Limpar aglutinador de strings" - -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:595 msgid "Click on Finish to save your configuration." msgstr "Clique em Terminar para salvar a configuração." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1993 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 msgid "Client to server MAC:" msgstr "MAC do cliente para o servidor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 msgid "Client to server cipher:" msgstr "Cifra do cliente para o servidor:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:616 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "Close &all other tabs" msgstr "Fechar todas as outras &abas" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1254 -#: ../../locales/../src/interface/Mainfrm.cpp:1275 +#: ../../locales/../src/interface/Mainfrm.cpp:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1148 msgid "Close FileZilla" msgstr "Sair do FileZilla" @@ -2146,66 +2206,66 @@ msgid "Closes current tab" msgstr "Fecha a aba atual" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:293 msgid "Co&mments:" msgstr "Co&mentários:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Propriedades da coluna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 msgid "Column setup" msgstr "Configuração da coluna" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 msgid "Command and its arguments should be properly quoted." msgstr "O comando e os seus parâmetros devem ser inseridos entre aspas." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Command failed" msgstr "O comando falhou" -#: ../../locales/../src/engine/proxy.cpp:506 +#: ../../locales/../src/engine/proxy.cpp:526 msgid "Command not supported" msgstr "Comando não suportado" -#: ../../locales/../src/engine/engineprivate.cpp:135 +#: ../../locales/../src/engine/engineprivate.cpp:213 msgid "Command not supported by this protocol" msgstr "Comando não suportado por esse protocolo" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:280 -#: ../../locales/../src/interface/StatusView.cpp:336 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:338 msgid "Command:" msgstr "Comando:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" msgstr "Comentário" -#: ../../locales/../src/interface/verifycertdialog.cpp:181 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Nome comum:" -#: ../../locales/../src/interface/netconfwizard.cpp:432 -#: ../../locales/../src/interface/netconfwizard.cpp:447 +#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:464 msgid "Communication tainted by router or firewall" msgstr "Comunicação danificada pelo rotador ou pelo firewall" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 msgid "Compare &modification time" msgstr "Comparar a &hora da modificação" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 msgid "Compare file&size" msgstr "Comparar o &tamanho do arquivo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 msgid "Comparison &threshold (in minutes):" msgstr "Limi&te de comparação (em minutos):" @@ -2213,19 +2273,19 @@ msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "O limite de comparação precisa ser entre 0 e 1440 minutos." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 msgid "Compiled for:" msgstr "Compilado para:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 msgid "Compiled on:" msgstr "Compilado em:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:689 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 msgid "Compiled with:" msgstr "Compilado com:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:699 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 msgid "Compiler flags:" msgstr "Parâmetros da compilação:" @@ -2233,12 +2293,12 @@ msgid "Compressed" msgstr "Comprimido" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 msgid "Concurrent transfers" msgstr "Transferências simultâneas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1318 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2982 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3088 msgid "Conditions are c&ase sensitive" msgstr "As condições são sensíveis a &maiúsculas e minúsculas" @@ -2254,37 +2314,41 @@ msgid "Configure port range" msgstr "Configurar intervalo de portas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3499 msgid "Configuring FileZilla and your network" msgstr "Configurando FileZilla e a sua rede" -#: ../../locales/../src/interface/search.cpp:782 +#: ../../locales/../src/interface/search.cpp:1192 msgid "Confirm deletion" msgstr "Confirme para apagar" -#: ../../locales/../src/engine/local_filesys.cpp:134 -#: ../../locales/../src/interface/LocalListView.cpp:1686 -#: ../../locales/../src/interface/LocalListView.cpp:1739 -#: ../../locales/../src/interface/RemoteListView.cpp:1460 -#: ../../locales/../src/interface/RemoteListView.cpp:2382 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1119 -#: ../../locales/../src/interface/search.cpp:736 +#: ../../locales/../src/interface/edithandler.cpp:1587 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1696 +#: ../../locales/../src/interface/RemoteListView.cpp:1400 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 +#: ../../locales/../src/interface/search.cpp:1148 msgid "Confirmation needed" msgstr "Confirmação requerida" -#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "Congratulations, your configuration seems to be working." msgstr "Parabéns, a configuração parece estar funcionando." -#: ../../locales/../src/interface/quickconnectbar.cpp:145 +#: ../../locales/../src/interface/quickconnectbar.cpp:150 msgid "Connect bypassing proxy settings" msgstr "Conectar contornando as configurações do proxy" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/netconfwizard.cpp:222 +#, c-format +msgid "Connect failed: %s" +msgstr "Conecte falhou: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Conectar na aba atual" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1350 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 msgid "Connect in new tab" msgstr "Conectar em nova aba" @@ -2292,218 +2356,234 @@ msgid "Connect to specified Site Manager site" msgstr "Conectar ao site especificado no Gerenciador de Sites" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:938 -msgid "Connected" -msgstr "Conectado" - -#: ../../locales/../src/interface/QueueView.cpp:1442 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Conectando" -#: ../../locales/../src/interface/netconfwizard.cpp:213 -#: ../../locales/../src/interface/statuslinectrl.cpp:241 +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/statuslinectrl.cpp:242 #, c-format msgid "Connecting to %s" msgstr "Conectando %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1101 +#: ../../locales/../src/engine/ControlSocket.cpp:1048 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4251 #, c-format -msgid "Connecting to %s through proxy" -msgstr "Conectando %s através do proxy" +msgid "Connecting to %s through %s proxy" +msgstr "Conectando ao %s através de %s proxy" -#: ../../locales/../src/engine/ControlSocket.cpp:977 -#: ../../locales/../src/engine/proxy.cpp:197 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:451 +#: ../../locales/../src/engine/ControlSocket.cpp:955 +#: ../../locales/../src/engine/proxy.cpp:267 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:358 #, c-format msgid "Connecting to %s..." msgstr "Conectando %s..." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 msgid "Connection" msgstr "Conexão" -#: ../../locales/../src/engine/socket.cpp:1142 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Connection aborted" msgstr "Conexão cancelada" -#: ../../locales/../src/interface/QueueView.cpp:1060 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Tentativa de conexão falhou" -#: ../../locales/../src/engine/ControlSocket.cpp:982 -#: ../../locales/../src/engine/proxy.cpp:202 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/proxy.cpp:241 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Tentativa de conexão falhou com \"%s\", tentando endereço seguinte." -#: ../../locales/../src/engine/ControlSocket.cpp:986 +#: ../../locales/../src/engine/ControlSocket.cpp:924 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Tentativa de conexão falhou com \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:184 -#: ../../locales/../src/engine/engineprivate.cpp:593 +#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/engineprivate.cpp:682 msgid "Connection attempt interrupted by user" msgstr "Tentativa de conexão interrompida pelo usuário" -#: ../../locales/../src/engine/socket.cpp:1135 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Connection attempt timed out" msgstr "Tempo de tentativa de conexão excedido" -#: ../../locales/../src/interface/netconfwizard.cpp:549 +#: ../../locales/../src/interface/netconfwizard.cpp:564 msgid "Connection closed" msgstr "Conexão terminada" -#: ../../locales/../src/engine/ControlSocket.cpp:1068 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:216 msgid "Connection closed by server" msgstr "Conexão terminada pelo servidor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:373 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:294 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:381 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Conexão estabelecida, iniciando o TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:319 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Conexão estabelecida, enviando pedido HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/interface/netconfwizard.cpp:345 +msgid "Connection established, waiting for welcome message." +msgstr "Conexão estabelecida, à espera da mensagem de boas vindas." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:409 msgid "Connection established, waiting for welcome message..." msgstr "Conexão estabelecida, esperando mensagem de boas-vindas..." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:362 msgid "Connection lost" msgstr "Conexão perdida" -#: ../../locales/../src/engine/proxy.cpp:491 +#: ../../locales/../src/engine/proxy.cpp:511 msgid "Connection not allowed by ruleset" msgstr "Conexão não permitida pelo conjunto de regras" -#: ../../locales/../src/engine/proxy.cpp:500 +#: ../../locales/../src/engine/proxy.cpp:520 msgid "Connection refused" msgstr "Conexão recusada" -#: ../../locales/../src/engine/socket.cpp:1129 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Connection refused by server" msgstr "Conexão recusada pelo servidor" -#: ../../locales/../src/engine/socket.cpp:1138 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Connection reset by network" msgstr "Conexão redefinida pela rede" # Não tenho certeza aqui como traduzir "peer". No site www.linguee.com encontrei como "mesmo nível" mas não fiquei seguro para usar este termo... -#: ../../locales/../src/engine/socket.cpp:1143 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Connection reset by peer" msgstr "Conexão redefinida" -#: ../../locales/../src/engine/ControlSocket.cpp:627 -msgid "Connection timed out" -msgstr "A conexão excedeu limite de tempo" +#: ../../locales/../src/engine/ControlSocket.cpp:556 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "Conexão expirou após %d segundo de inatividade" +msgstr[1] "Conexão expirou após %d segundos de inatividade" -#: ../../locales/../src/interface/netconfwizard.cpp:1079 +#: ../../locales/../src/interface/netconfwizard.cpp:1072 msgid "Connection timed out." msgstr "A conexão excedeu limite de tempo." -#: ../../locales/../src/interface/search.cpp:369 +#: ../../locales/../src/interface/search.cpp:660 msgid "Connection to server lost." msgstr "Conexão com servidor perdida." -#: ../../locales/../src/engine/proxy.cpp:212 +#: ../../locales/../src/engine/proxy.cpp:250 msgid "Connection with proxy established, performing handshake..." msgstr "Conexão estabelecida com o proxy, fazendo saudação..." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "Connection with server got closed prematurely." msgstr "A conexão com servidor terminou prematuramente." -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "Connection with the test server failed." msgstr "A conexão com servidor de teste falhou." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" -msgstr "Converter arquivo de chave" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +msgid "Convert key file" +msgstr "Converter arquivo chave" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:645 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1767 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:627 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1869 #, c-format msgid "Copy (%d) of %s" msgstr "Cópia (%d) de %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:622 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1744 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:607 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 #, c-format msgid "Copy of %s" msgstr "Cópia de %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Copiar URLs dos itens selecionados para a área de transferência, incluindo " +"senha." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Copy the URLs of the selected items to clipboard." msgstr "Copiar URLs dos itens selecionados para a área de transferência." -#: ../../locales/../src/engine/transfersocket.cpp:206 +#: ../../locales/../src/engine/transfersocket.cpp:178 #, c-format msgid "Could not accept connection: %s" msgstr "Não foi possível aceitar a conexão: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:531 msgid "Could not add connection to Site Manager" msgstr "Não foi possível adicionar a conexão ao Gerenciador de Sites" -#: ../../locales/../src/interface/state.cpp:831 +#: ../../locales/../src/interface/state.cpp:773 msgid "Could not complete operation" msgstr "Não foi possível concluir a operação" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Não foi possível conectar ao servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1138 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Could not connect to server: %s" msgstr "Não foi possível conectar ao servidor: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:851 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:791 msgid "Could not convert command to server encoding" msgstr "Não foi possível converter o comando para o código do servidor" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 msgid "Could not convert private key" msgstr "Não foi possível converter a chave privada" -#: ../../locales/../src/interface/RemoteListView.cpp:2695 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1463 +#: ../../locales/../src/interface/RemoteListView.cpp:2523 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not copy URLs" msgstr "Não foi possível copiar os caminhos URL" -#: ../../locales/../src/interface/aboutdialog.cpp:175 +#: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "Não foi possível copiar os dados" -#: ../../locales/../src/interface/updater.cpp:425 +#: ../../locales/../src/interface/updater.cpp:492 #, c-format msgid "Could not create local file %s\n" msgstr "Não foi possível criar arquivo local %s\n" -#: ../../locales/../src/interface/RemoteListView.cpp:2314 -#: ../../locales/../src/interface/RemoteTreeView.cpp:911 +#: ../../locales/../src/engine/logging.cpp:173 +#, c-format +msgid "Could not create logging mutex: %s" +msgstr "Não foi possível criar mutex de identificação: %s" + +#: ../../locales/../src/interface/RemoteListView.cpp:2189 +#: ../../locales/../src/interface/RemoteTreeView.cpp:865 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " "files into an Explorer window." msgstr "" "Não foi possível determinar o destino da operação de arrastar e soltar.\n" -"Ou a extensão do Explorer não está instalada corretamente ou você não soltou " -"os arquivos na janela do Explorer." +"Ou a extensão não está instalada corretamente ou você não soltou os arquivos " +"em uma janela do explorador." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4220 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4100 msgid "Could not establish connection to server" msgstr "Não foi possível establecer a conexão com o servidor" -#: ../../locales/../src/interface/FileZilla.cpp:507 +#: ../../locales/../src/interface/FileZilla.cpp:405 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2516,11 +2596,11 @@ "comandos '--pasta de dados ' ou configurar a variável de ambiente " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:688 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:677 msgid "Could not generate custom login sequence." msgstr "Não foi possível gerar a sequência de login personalizada." -#: ../../locales/../src/engine/tlssocket.cpp:953 +#: ../../locales/../src/engine/tlssocket.cpp:1013 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2528,7 +2608,7 @@ "Não foi possível obter o nome distinto do emissor do certificado, o módulo " "'gnutls_x509_get_issuer_dn' falhou" -#: ../../locales/../src/engine/tlssocket.cpp:930 +#: ../../locales/../src/engine/tlssocket.cpp:990 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2536,27 +2616,32 @@ "Não foi possível obter o nome distinto do sujeito do certificado, o módulo " "'gnutls_x509_get_dn' falhou" -#: ../../locales/../src/interface/state.cpp:984 +#: ../../locales/../src/interface/state.cpp:953 msgid "Could not get full remote path." msgstr "Não foi possível obter o caminho remoto completo." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:150 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:167 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Could not get reply from fzputtygen." msgstr "Não foi possível obter uma resposta do fzputtygen." -#: ../../locales/../src/interface/RemoteListView.cpp:2367 -#: ../../locales/../src/interface/search.cpp:722 +#: ../../locales/../src/interface/edithandler.cpp:1575 +#: ../../locales/../src/interface/search.cpp:1136 msgid "Could not get temporary directory to download file into." msgstr "Não foi possível obter a pasta temporária para download do arquivo." -#: ../../locales/../src/engine/tlssocket.cpp:873 +#: ../../locales/../src/engine/tlssocket.cpp:936 msgid "Could not import peer certificates, gnutls_x509_crt_import failed" msgstr "" "Não foi possível importar os certificados de pares, módulo " "'gnutls_x509_crt_import' falhou" -#: ../../locales/../src/engine/tlssocket.cpp:868 +#: ../../locales/../src/interface/FileZilla.cpp:85 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Não foi possível inicializar Winsock (%d): %s" + +#: ../../locales/../src/engine/tlssocket.cpp:931 msgid "" "Could not initialize structure for peer certificates, gnutls_x509_crt_init " "failed" @@ -2564,8 +2649,8 @@ "Não foi possível iniciar a estrutura para os certificados de pares, o módulo " "'gnutls_x509_crt_init' falhou" -#: ../../locales/../src/interface/import.cpp:95 -#: ../../locales/../src/interface/import.cpp:281 +#: ../../locales/../src/interface/import.cpp:105 +#: ../../locales/../src/interface/import.cpp:292 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2576,15 +2661,15 @@ "pode ser acessado.\n" "Alterações feitas ao Gerenciador de Sites não serão salvas." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223 -msgid "Could not load keyfile" -msgstr "Não foi possível carregar arquivo de chave" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +msgid "Could not load key file" +msgstr "Não foi possível carregar arquivo chave" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Não foi possível carregar a chave privada" -#: ../../locales/../src/interface/state.cpp:1010 +#: ../../locales/../src/interface/state.cpp:975 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2595,7 +2680,7 @@ "Desconectar a navegação sincronizada e continuar com as alterações na pasta " "remota?" -#: ../../locales/../src/interface/state.cpp:394 +#: ../../locales/../src/interface/state.cpp:355 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2605,7 +2690,7 @@ "Não foi posível encontrar a pasta local correspondente à pasta remota '%s'.\n" "A navegação sincronizada foi desativada." -#: ../../locales/../src/interface/state.cpp:295 +#: ../../locales/../src/interface/state.cpp:260 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2615,65 +2700,72 @@ "Não foi posível encontrar a pasta remota correspondente à pasta local '%s'.\n" "A navegação sincronizada foi desativada." -#: ../../locales/../src/interface/aboutdialog.cpp:175 -#: ../../locales/../src/interface/RemoteListView.cpp:2695 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1463 +#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/interface/RemoteListView.cpp:2523 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1394 msgid "Could not open clipboard" msgstr "Não foi possível abrir a área de transferência" -#: ../../locales/../src/engine/logging.cpp:104 -#: ../../locales/../src/engine/logging.cpp:171 -#: ../../locales/../src/engine/logging.cpp:203 +#: ../../locales/../src/engine/logging.cpp:106 +#: ../../locales/../src/engine/logging.cpp:186 +#: ../../locales/../src/engine/logging.cpp:218 #, c-format msgid "Could not open log file: %s" msgstr "Não foi possível abrir o arquivo de log: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 msgid "Could not parse remote path." msgstr "Não foi possível analisar o caminho remoto." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:81 msgid "Could not parse server address:" msgstr "Não foi possível analisar o endereço do servidor:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225 +#: ../../locales/../src/interface/netconfwizard.cpp:995 +msgid "Could not read from data socket." +msgstr "Não foi possível ler a partir da tomada de dados." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:206 #, c-format msgid "Could not read from socket: %s" msgstr "Não foi possível ler do soquete: %s" -#: ../../locales/../src/interface/sitemanager.cpp:488 +#: ../../locales/../src/interface/sitemanager.cpp:548 msgid "Could not read server item." msgstr "Não foi possível ler o item do servidor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2698 +#: ../../locales/../src/interface/netconfwizard.cpp:356 +msgid "Could not receive data from server." +msgstr "Não foi possível receber dados de servidor." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 #, c-format msgid "Could not seek to offset %s within file" msgstr "Não foi possível ir até à posição %s dentro do arquivo" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2609 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2500 msgid "Could not seek to the end of the file" msgstr "Não foi possível procurar o término do arquivo" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Não foi possível enviar o comando para o fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2729 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2621 msgid "Could not spawn IO thread" msgstr "Não foi possível criar o processo de IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1115 +#: ../../locales/../src/engine/ControlSocket.cpp:1062 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Não foi possível saudar o proxy: %s" -#: ../../locales/../src/interface/QueueView.cpp:1107 -#: ../../locales/../src/interface/QueueView.cpp:1112 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Não foi possível iniciar a transferência" -#: ../../locales/../src/interface/sitemanager.cpp:658 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:807 +#: ../../locales/../src/interface/sitemanager.cpp:617 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:816 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2682,19 +2774,19 @@ "Não foi possível gravar \"%s\", alterações feitas no Gerenciador de Sites " "não poderão ser salvas: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:842 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:814 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Não foi possível gravar \"%s\", o marcador não pode ser adicionado: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:324 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:313 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Não foi possível gravar \"%s\", os marcadores globais não puderam ser " "salvos: %s" -#: ../../locales/../src/interface/QueueView.cpp:1972 +#: ../../locales/../src/interface/QueueView.cpp:1470 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2703,119 +2795,121 @@ "Não foi possível gravar \"%s\", a fila não pode ser salva.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:776 -#: ../../locales/../src/interface/sitemanager.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2166 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager.cpp:779 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2269 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Não foi possível gravar \"%s\", os sites selecionados não foram exportados: " "%s" -#: ../../locales/../src/interface/xmlfunctions.cpp:124 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 #, c-format msgid "Could not write \"%s\":" msgstr "Não foi possível gravar \"%s\":" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format -msgid "Could not write keyfile: %s" -msgstr "Não foi possível gravar o arquivo de chave: %s" +msgid "Could not write key file: %s" +msgstr "Não foi possível gravar arquivo chave: %s" -#: ../../locales/../src/interface/QueueView.cpp:1102 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Não foi possível gravar arquivo local" -#: ../../locales/../src/engine/logging.cpp:211 -#: ../../locales/../src/engine/logging.cpp:276 +#: ../../locales/../src/engine/logging.cpp:230 +#: ../../locales/../src/engine/logging.cpp:297 #, c-format msgid "Could not write to log file: %s" msgstr "Não foi possível gravar arquivo de log: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:942 -#: ../../locales/../src/engine/ControlSocket.cpp:1037 +#: ../../locales/../src/engine/ControlSocket.cpp:879 +#: ../../locales/../src/engine/ControlSocket.cpp:983 #, c-format msgid "Could not write to socket: %s" msgstr "Não foi possível esvrever para o ponto: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "País:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "" -"Encerra o Filezilla abruptamente. Usado somente para fins de depuração de " -"erros." - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:311 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 msgid "Crea&te new file" msgstr "Cr&iar novo arquivo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:497 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 +#: ../../locales/../src/interface/state.cpp:989 +msgid "Create &missing local directory and enter it" +msgstr "Criar diretório local que está &faltando e entrar nele" + +#: ../../locales/../src/interface/state.cpp:917 +msgid "Create &missing remote directory and enter it" +msgstr "Criar diretório remoto que está &faltando e entrar nele" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 msgid "Create a new subdirectory in the current directory" msgstr "Criar uma nova subpasta na pasta atual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:501 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Criar uma nova subpasta na atual pasta e mudar para ela" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 msgid "Create a new, empty file in the current directory" msgstr "Criar um novo arquivo em branco no diretório atual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:267 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:307 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:564 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "Create director&y and enter it" msgstr "Criar pas&ta e entrar nela" -#: ../../locales/../src/interface/LocalListView.cpp:924 -#: ../../locales/../src/interface/LocalTreeView.cpp:1170 -#: ../../locales/../src/interface/RemoteListView.cpp:1359 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1303 +#: ../../locales/../src/interface/LocalListView.cpp:923 +#: ../../locales/../src/interface/LocalTreeView.cpp:1149 +#: ../../locales/../src/interface/RemoteListView.cpp:1303 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Create directory" msgstr "Criar pasta" -#: ../../locales/../src/interface/RemoteListView.cpp:2783 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Criar arquivo em branco" -#: ../../locales/../src/interface/QueueView.cpp:1515 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Criando pasta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3286 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2039 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1960 #, c-format msgid "Creating directory '%s'..." msgstr "Criando pasta '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Erro crítico" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Erro crítico:" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Erro crítico na transferência de arquivo" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:120 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Erro crítico na transferência de arquivo após transferir %s em %s" -#: ../../locales/../src/interface/state.cpp:385 +#: ../../locales/../src/interface/state.cpp:346 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2824,64 +2918,76 @@ "A pasta remota atual (%s) não está sob o caminho de sincronização (%s).\n" "A navegação sincronizada foi desativada." -#: ../../locales/../src/interface/statusbar.cpp:387 +#: ../../locales/../src/interface/statusbar.cpp:393 msgid "Current transfer type is set to ASCII." msgstr "O tipo de transferência atual está definido para ASCII." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:401 msgid "Current transfer type is set to automatic detection." msgstr "O tipo de transferência atual está definido para deteção automática." -#: ../../locales/../src/interface/statusbar.cpp:392 +#: ../../locales/../src/interface/statusbar.cpp:397 msgid "Current transfer type is set to binary." msgstr "O tipo de transferência atual está definido para binário." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +msgid "Curve:" +msgstr "Curva:" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1526 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "Cus&tom" msgstr "Personali&zado" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Conjunto de filtros personalizado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2307 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2321 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 msgid "Custom server" msgstr "Servidor personalizado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2443 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "Ciano" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 msgid "D&ata type" msgstr "Tipo de d&ados" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1596 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Pr&efixos decimais usando símbolos SI (p.ex. 1 KB = 1000 bytes)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:392 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:471 msgid "D&efault" msgstr "Pa&drão" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:319 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:604 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "D&elete" msgstr "A&pagar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1101 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "Comparação de &Diretório" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Desat&ivar todos" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1319 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 msgid "D&o not save passwords" msgstr "Nã&o salvar senhas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "D&ouble-click action on directories:" msgstr "Açã&o para clique duplo em pastas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1253 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "D&uplicate" msgstr "D&uplicar" @@ -2889,16 +2995,16 @@ msgid "DOS-like with virtual paths" msgstr "Como em DOS com caminhos virtuais" -#: ../../locales/../src/interface/edithandler.cpp:1641 +#: ../../locales/../src/interface/edithandler.cpp:1627 msgid "Dangerous filetype" msgstr "Tipo de arquivo perigoso" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Data" msgstr "Dados" -#: ../../locales/../src/interface/netconfwizard.cpp:994 -#: ../../locales/../src/interface/netconfwizard.cpp:1060 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Data socket closed too early." msgstr "Ponto de dados fechado prematuramente." @@ -2906,27 +3012,27 @@ msgid "Date" msgstr "Data" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1460 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 msgid "Date formatting" msgstr "Formato da data" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" msgstr "Formato de data/hora" -#: ../../locales/../src/interface/fileexistsdlg.cpp:47 +#: ../../locales/../src/interface/fileexistsdlg.cpp:49 msgid "Date/time unknown" msgstr "Data/hora desconhecida" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:117 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" msgstr "Depuração de erros" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 msgid "Debugging settings" msgstr "Configurações para depuração de erros" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:351 msgid "Default &local directory:" msgstr "Pasta &local padrão:" @@ -2938,17 +3044,17 @@ msgid "Default editor not properly quoted." msgstr "O editor padrão não foi colocado entre aspas corretamente." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1450 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "Ação padrão para arquivo existente" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 msgid "Default r&emote directory:" msgstr "Pasta r&emota padrão:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2956,7 +3062,7 @@ "O caminho remoto padrão não pode ser analisado. Certifique-se de que é um " "caminho absoluto válido para o tipo de servidor selecionado." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Idioma padrão do sistema" @@ -2964,7 +3070,7 @@ msgid "Default transfer mode:" msgstr "Modo de transferência padrão:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1018 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 msgid "Default transfer type:" msgstr "Tipo de transferência padrão:" @@ -2980,7 +3086,7 @@ "O tempo de espera entre tentativas de conexão com falha tem que ser entre 1 " "e 999 segundos." -#: ../../locales/../src/engine/engineprivate.cpp:438 +#: ../../locales/../src/engine/engineprivate.cpp:523 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2993,39 +3099,39 @@ msgstr[1] "" "Postergando a conexão por %d segundos devido à falha na tentativa anterior..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1217 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1235 msgid "Delete Site Manager entry" msgstr "Apagar entrada no Gerenciador de Sites" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Delete selected directory" msgstr "Apagar a pasta selecionada" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 msgid "Delete selected files and directories" msgstr "Apagar os arquivos e as pastas selecionados" -#: ../../locales/../src/interface/search.cpp:766 -msgid "Deleting directories" -msgstr "Apagando as pastas" +#: ../../locales/../src/engine/engineprivate.cpp:366 +#, c-format +msgid "Deleting \"%s\"" +msgstr "Apagando \"%s\"" -#: ../../locales/../src/interface/search.cpp:766 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" -"A opção 'apagar múltiplas pastas não relacionadas' ainda não é suportada" +#: ../../locales/../src/engine/engineprivate.cpp:369 +#, c-format +msgid "Deleting %u files from \"%s\"" +msgstr "Excluindo %u arquivos de \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3118 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3331 msgid "Deleting symbolic link" msgstr "Apagando o atalho simbólico" -#: ../../locales/../src/interface/LocalTreeView.cpp:1005 +#: ../../locales/../src/interface/LocalTreeView.cpp:966 msgid "Desktop" msgstr "Área de trabalho" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:321 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Details" msgstr "Detalhes" @@ -3034,29 +3140,34 @@ msgid "Details for new key:" msgstr "Detalhes para a nova chave:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 +#: ../../locales/../src/interface/import.cpp:58 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:745 +msgid "Detected newer version of FileZilla" +msgstr "Encontrada nova versão do FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 msgid "Dire&ctories" msgstr "&Pastas" -#: ../../locales/../src/interface/queue.cpp:1197 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Direction" msgstr "Direção" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "Directory" msgstr "Pasta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1740 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 -#: ../../locales/../src/interface/filelistctrl.cpp:459 -#: ../../locales/../src/interface/Mainfrm.cpp:2327 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:395 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 +#: ../../locales/../src/interface/filelistctrl.cpp:468 +#: ../../locales/../src/interface/Mainfrm.cpp:2195 msgid "Directory comparison" msgstr "Comparação de pastas" -#: ../../locales/../src/interface/listingcomparison.cpp:74 -#: ../../locales/../src/interface/listingcomparison.cpp:82 -#: ../../locales/../src/interface/listingcomparison.cpp:88 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "Directory comparison failed" msgstr "Comparação de pastas falhou" @@ -3066,11 +3177,11 @@ "A pasta que contém o arquivo de log não existe ou o nome do arquivo é " "inválido." -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Listagem de pastas abortada pelo usuário" -#: ../../locales/../src/interface/RemoteListView.cpp:2116 +#: ../../locales/../src/interface/RemoteListView.cpp:2025 msgid "Directory listing failed" msgstr "Falha na listagem de pastas" @@ -3078,22 +3189,27 @@ msgid "Directory listing filters" msgstr "Filtros da listagem de pastas" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:199 +#, c-format +msgid "Directory listing of \"%s\" successful" +msgstr "Listagem do diretório \"%s\" bem sucedida" + +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Listagem de pastas bem sucedida" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1137 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Disa&ble all" msgstr "&Desativar todos" -#: ../../locales/../src/interface/state.cpp:1018 +#: ../../locales/../src/interface/state.cpp:982 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Desconectar a navegação sincronizada e continuar com as alterações na pasta " "remota?" -#: ../../locales/../src/interface/Mainfrm.cpp:705 +#: ../../locales/../src/interface/Mainfrm.cpp:646 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3101,78 +3217,83 @@ "Desmarque esta opção outra vez se deixar de ver o conteúdo correcto das " "pastas." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:56 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 msgid "Disconnect from server" msgstr "Desconectar do servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:77 -#: ../../locales/../src/engine/ControlSocket.cpp:943 -#: ../../locales/../src/engine/ControlSocket.cpp:1039 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:897 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:899 -#: ../../locales/../src/interface/QueueView.cpp:1058 -#: ../../locales/../src/interface/QueueView.cpp:1100 +#: ../../locales/../src/engine/ControlSocket.cpp:81 +#: ../../locales/../src/engine/ControlSocket.cpp:880 +#: ../../locales/../src/engine/ControlSocket.cpp:985 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Desconectado do servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1070 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:913 +#: ../../locales/../src/engine/ControlSocket.cpp:1017 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 #, c-format msgid "Disconnected from server: %s" msgstr "Desconectado do servidor: %s" -#: ../../locales/../src/interface/QueueView.cpp:1413 -#: ../../locales/../src/interface/statuslinectrl.cpp:235 +#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/statuslinectrl.cpp:236 msgid "Disconnecting from previous server" msgstr "Desconectando do servidor anterior" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 msgid "Disconnects from the currently visible server" msgstr "Desconecta do servidor atualmente visível" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 msgid "Display about dialog" msgstr "Exibe a caixa 'Sobre...'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1876 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 msgid "Do ¬ use default editor" msgstr "&Não usar o editor padrão" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 -msgid "Do ¬hing" -msgstr "Não &fazer nada" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +msgid "Do the same with &all selected files already being edited" +msgstr "" +"Faça o mesmo com todos os arquivos selecionados que já estão sendo editados" -#: ../../locales/../src/interface/Mainfrm.cpp:1257 -#: ../../locales/../src/interface/Mainfrm.cpp:1279 +#: ../../locales/../src/interface/Mainfrm.cpp:1130 +#: ../../locales/../src/interface/Mainfrm.cpp:1152 msgid "Do you really want to close FileZilla?" msgstr "Quer mesmo sair do FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Quer mesmo apagar todas as entradas do Gerenciador de Sites e fila de " "transferência?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Quer mesmo apagar todas as entradas do Gerenciador de Sites?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1219 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1237 msgid "Do you really want to delete selected entry?" msgstr "Quer mesmo apagar a entrada selecionada?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Quer mesmo apagar a fila de transferência?" -#: ../../locales/../src/interface/Mainfrm.cpp:624 +#: ../../locales/../src/interface/Mainfrm.cpp:585 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Quer mesmo enviar '%s' para o servidor?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +msgid "Do you want to reopen this file?" +msgstr "Você quer reabrir esse arquivo?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 msgid "Documentation" msgstr "Documentação" @@ -3180,114 +3301,106 @@ msgid "Don't use external IP address on &local connections." msgstr "Não usar o endereço IP externo em conexões &locais." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1115 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Arquivos de ponto são nomes de arquivo que começam com um ponto, p.ex., ." "htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1778 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 msgid "Double-click action" msgstr "Ação para clique duplo do mouse" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2150 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 msgid "Download" msgstr "Download" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3470 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:886 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Limite de do&wnload:" -#: ../../locales/../src/interface/statusbar.cpp:568 +#: ../../locales/../src/interface/statusbar.cpp:581 #, c-format msgid "Download limit: %s/s" msgstr "Limite de download: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:570 +#: ../../locales/../src/interface/statusbar.cpp:583 msgid "Download limit: none" msgstr "Limite de download: nenhum" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3017 -#: ../../locales/../src/interface/search.cpp:508 -#: ../../locales/../src/interface/search.cpp:514 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3135 +#: ../../locales/../src/interface/search.cpp:851 +#: ../../locales/../src/interface/search.cpp:856 msgid "Download search results" msgstr "Baixar os resultados da procura" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "Download selected directory" msgstr "Baixar a pasta selecionada" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:287 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 msgid "Download selected files and directories" msgstr "Baixar os arquivos e as pastas selecionados" -#: ../../locales/../src/interface/Mainfrm.cpp:1085 +#: ../../locales/../src/interface/Mainfrm.cpp:963 #, c-format msgid "" "Download speed: %s/s\n" "Upload speed: %s/s" msgstr "" -"Velocidade ad transferência: %s/s\n" -"Velocidade do envio: %s/s" +"Velocidade de recebimento: %s/s\n" +"Velocidade de envio: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1133 +#: ../../locales/../src/interface/edithandler.cpp:1100 msgid "Downloading" msgstr "Baixando" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:337 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Baixando %s" -#: ../../locales/../src/interface/search.cpp:617 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" -"A opção 'Baixar múltiplas pastas não relacionadas' ainda não é suportada" - -#: ../../locales/../src/interface/search.cpp:617 -msgid "Downloading search results" -msgstr "Baixando os resultados da procura" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Baixando atualização..." #: ../../locales/../src/interface/LocalListView.cpp:107 -#: ../../locales/../src/interface/LocalTreeView.cpp:109 -#: ../../locales/../src/interface/QueueView.cpp:90 +#: ../../locales/../src/interface/LocalTreeView.cpp:111 +#: ../../locales/../src/interface/QueueView.cpp:85 #: ../../locales/../src/interface/RemoteListView.cpp:105 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/RemoteTreeView.cpp:91 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" -"O 'arrastar e largar' entre instâncias diferentes do FileZilla ainda não foi " -"implementado." +"O \"arrastar e soltar\" entre instâncias diferentes do FileZilla ainda não " +"foi implementado." #: ../../locales/../src/interface/LocalListView.cpp:113 -#: ../../locales/../src/interface/LocalTreeView.cpp:115 -#: ../../locales/../src/interface/QueueView.cpp:103 +#: ../../locales/../src/interface/LocalTreeView.cpp:117 +#: ../../locales/../src/interface/QueueView.cpp:97 #: ../../locales/../src/interface/RemoteListView.cpp:111 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/RemoteTreeView.cpp:97 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" -"O 'arrastar e soltar' entre servidores diferentes ainda não foi implementado." +"O \"arrastar e soltar\" entre servidores diferentes ainda não foi " +"implementado." #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 msgid "Dupl&icate" msgstr "Dupl&icar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1094 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 msgid "E&nable all" msgstr "Ati&var todos" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 msgid "E&nter directory" msgstr "E&ntrar na pasta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:461 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 msgid "E&xecute" msgstr "E&xecutar" @@ -3295,43 +3408,49 @@ msgid "E&xit" msgstr "&Sair" -#: ../../locales/../src/interface/verifycertdialog.cpp:192 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:463 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:486 +msgid "E&xport..." +msgstr "E&xportar..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E-mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:693 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 msgid "Each filter needs at least one condition." msgstr "Cada filtro deve ter pelo menos uma condição." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1376 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 msgid "Edit filters" msgstr "Editar filtros" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Editar o arquivo com o editor configurado e enviar as mudanças para o " "servidor." -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/search.cpp:1124 msgid "Editing directories is not supported" msgstr "Edição de pastas não é compatível" -#: ../../locales/../src/interface/LocalListView.cpp:1639 -#: ../../locales/../src/interface/LocalListView.cpp:1648 +#: ../../locales/../src/interface/LocalListView.cpp:1614 +#: ../../locales/../src/interface/LocalListView.cpp:1623 msgid "Editing failed" msgstr "A edição falhou" -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/search.cpp:1124 msgid "Editing search results" msgstr "Editando resultados de busca" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2257 +#: ../../locales/../src/interface/QueueView.cpp:1748 msgid "Empty command" msgstr "Comando vazio" @@ -3339,11 +3458,11 @@ msgid "Empty command." msgstr "Comando vazio." -#: ../../locales/../src/interface/RemoteListView.cpp:2118 +#: ../../locales/../src/interface/RemoteListView.cpp:2027 msgid "Empty directory listing" msgstr "Lista de pastas vazia" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "Pasta vazia." @@ -3365,11 +3484,11 @@ msgid "Empty quoted string." msgstr "String vazia." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 msgid "En&able all" msgstr "A&tivar todos" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:972 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 msgid "Enable invalid character &filtering" msgstr "Ativar &filtragem de caracteres inválidos" @@ -3377,35 +3496,35 @@ msgid "Encrypted" msgstr "Criptografado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1976 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 msgid "Encryption" msgstr "Criptografia" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 msgid "Encryption details" msgstr "Detalhes da encriptação" -#: ../../locales/../src/interface/filelistctrl.cpp:461 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "End comparison and change sorting order?" msgstr "Parar comparação e alterar a ordenação?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Enter &custom command..." msgstr "&Entrar comando personalizado..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Enter 0 for unlimited speed." -msgstr "Entre com 0 para velocidade ilimitada." +msgstr "Informe 0 para velocidade ilimitada." -#: ../../locales/../src/interface/QueueView.cpp:2246 +#: ../../locales/../src/interface/QueueView.cpp:1742 msgid "Enter command" -msgstr "Entre com o comando" +msgstr "Informe o comando" -#: ../../locales/../src/interface/Mainfrm.cpp:605 +#: ../../locales/../src/interface/Mainfrm.cpp:568 msgid "Enter custom command" -msgstr "Entre com o comando personalizado" +msgstr "Informe o comando personalizado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1811 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 msgid "Enter directory" msgstr "Entrar na pasta" @@ -3413,24 +3532,24 @@ #: ../../locales/../src/interface/filteredit.cpp:196 #: ../../locales/../src/interface/filteredit.cpp:243 msgid "Enter filter name" -msgstr "Entre com o nome do filtro" +msgstr "Informe o nome do filtro" -#: ../../locales/../src/interface/filter.cpp:348 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" -msgstr "Entre com o nome para o conjunto de filtros" +msgstr "Informe o nome para o conjunto de filtros" -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" -msgstr "Entre com o novo nome para conjunto de filtros" +msgstr "Informe o novo nome para conjunto de filtros" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 msgid "Enter password" -msgstr "Entre com a senha" +msgstr "Informe a senha" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Enter selected directory" -msgstr "Entre com a pasta selecionada" +msgstr "Informe a pasta selecionada" #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 msgid "" @@ -3442,154 +3561,156 @@ "here, the values in the other fields will be overwritten then.\n" "\n" "Supported protocols are:\n" -"- ftp:// for normal FTP\n" +"- ftp:// for normal FTP with optional encryption\n" "- sftp:// for SSH file transfer protocol\n" "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Insira o endereço do servidor.\n" -"Para especificar o protocolo do servidor, adicione o domínio com o " -"identificador de protocolo. Se não for especificado nenhum protocolo, o " +"Informe o endereço do servidor.\n" +"Para especificar o protocolo do servidor, preceder o domínio com o " +"identificador de protocolo. Se nenhum protocolo for especificado, o " "protocolo padrão (ftp://) será usado.\n" -"Você também pode inserir endereços completos de URLs na forma: protocolo://" -"usuário:pass@host:porta aqui, então os valores nos outros campos serão " -"substituídos.\n" +"Você também pode inserir URLs completos aqui no formato protocolo://usuário:" +"senha@host:porta, os valores nos outros campos serão substituídos.\n" "\n" -"Os protocolos suportados:\n" -"- ftp:// para FTP normal\n" -"- sftp:// para protocolo de transferência de arquivos SSH\n" -"- ftps:// para FTP sobre TLS (implicito)\n" +"Os protocolos suportados são:\n" +"- ftp:// para FTP normal com criptografia opcional\n" +"- sftp:// para o protocolo de transferência de arquivos SSH\n" +"- ftps:// para FTP sobre TLS (implícito)\n" "- ftpes:// para FTP sobre TLS (explícito)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" -"Entre com a senha para o arquivo '%s'.\n" -"Note que o arquivo convertido não estará protegido por senha." +"Informe a senha para o arquivo \"%s\".\n" +"O arquivo convertido será protegido com a mesma senha." #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" "Enter the port on which the server listens.\n" "The default for FTP is 21, the default for SFTP is 22." msgstr "" -"Entre com a porta na qual o servidor supervisionará.\n" +"Informe a porta que o servidor supervisionará.\n" "A porta padrão para FTP é a 21, para SFTP é a 22." -#: ../../locales/../src/interface/loginmanager.cpp:61 +#: ../../locales/../src/interface/loginmanager.cpp:70 +msgid "Enter username" +msgstr "Informe o nome de usuário" + +#: ../../locales/../src/interface/loginmanager.cpp:77 msgid "Enter username and password" -msgstr "Entre com o nome de usuário e a senha" +msgstr "Informe o nome de usuário e a senha" #: ../../locales/../src/interface/export.cpp:26 msgid "Error exporting settings" msgstr "Erro ao exportar as configurações" #: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:85 +#: ../../locales/../src/interface/import.cpp:95 msgid "Error importing" msgstr "Erro ao importar" -#: ../../locales/../src/interface/QueueView.cpp:2039 +#: ../../locales/../src/interface/QueueView.cpp:1544 msgid "Error loading queue" msgstr "Erro ao carregar fila" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:171 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:723 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:762 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:809 -#: ../../locales/../src/interface/filter.cpp:215 -#: ../../locales/../src/interface/filter.cpp:1013 -#: ../../locales/../src/interface/import.cpp:96 -#: ../../locales/../src/interface/import.cpp:282 -#: ../../locales/../src/interface/Options.cpp:219 -#: ../../locales/../src/interface/QueueView.cpp:1955 -#: ../../locales/../src/interface/search.cpp:841 -#: ../../locales/../src/interface/search.cpp:860 -#: ../../locales/../src/interface/sitemanager.cpp:241 -#: ../../locales/../src/interface/sitemanager.cpp:450 -#: ../../locales/../src/interface/sitemanager.cpp:549 -#: ../../locales/../src/interface/sitemanager.cpp:608 -#: ../../locales/../src/interface/sitemanager.cpp:717 -#: ../../locales/../src/interface/sitemanager.cpp:799 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:734 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:787 -#: ../../locales/../src/interface/wrapengine.cpp:949 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:282 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:697 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:734 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:780 +#: ../../locales/../src/interface/filter.cpp:214 +#: ../../locales/../src/interface/filter.cpp:980 +#: ../../locales/../src/interface/import.cpp:106 +#: ../../locales/../src/interface/import.cpp:293 +#: ../../locales/../src/interface/Options.cpp:249 +#: ../../locales/../src/interface/QueueView.cpp:1453 +#: ../../locales/../src/interface/search.cpp:1252 +#: ../../locales/../src/interface/search.cpp:1271 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:516 +#: ../../locales/../src/interface/sitemanager.cpp:574 +#: ../../locales/../src/interface/sitemanager.cpp:671 +#: ../../locales/../src/interface/sitemanager.cpp:748 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:738 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:796 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "Erro ao carregar arquivo xml" -#: ../../locales/../src/interface/QueueView.cpp:1944 +#: ../../locales/../src/interface/QueueView.cpp:1442 msgid "Error saving queue" msgstr "Erro ao salvar fila" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "Error starting program" msgstr "Erro ao iniciar o programa" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:325 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:843 -#: ../../locales/../src/interface/QueueView.cpp:1973 -#: ../../locales/../src/interface/sitemanager.cpp:659 -#: ../../locales/../src/interface/sitemanager.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:831 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2167 -#: ../../locales/../src/interface/xmlfunctions.cpp:125 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:314 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:815 +#: ../../locales/../src/interface/QueueView.cpp:1471 +#: ../../locales/../src/interface/sitemanager.cpp:618 +#: ../../locales/../src/interface/sitemanager.cpp:726 +#: ../../locales/../src/interface/sitemanager.cpp:780 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:817 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2270 +#: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Erro ao gravar arquivo xml" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:278 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:334 msgid "Error:" msgstr "Erro:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1984 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Exemplo: png \"c:\\Programas\\editor\\editor.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 msgid "Examples" msgstr "Exemplos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:495 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 msgid "Exe&cute" msgstr "Exe&cutar" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "O executável não contém informação sobre a versão, não foi possível " "verificar se há atualizações." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1254 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "Explorer" msgstr "Explorer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1585 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 msgid "Export &Queue" msgstr "Exportar &Fila" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1580 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 msgid "Export &Settings" msgstr "Exportar &Configurações" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1561 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 msgid "Export settings" msgstr "Exportar configurações" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" msgstr "Nome do f&iltro:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:500 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:492 msgid "FTP - File Transfer Protocol" msgstr "FTP - Protocolo de Transferência de Arquivos" @@ -3602,7 +3723,6 @@ msgstr "FTP - Protocolo de Transferência de Arquivos sem segurança" #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 msgid "FTP Engine not initialized, can't connect" msgstr "Motor de FTP ainda não iniciado, não é possivel conectar" @@ -3611,7 +3731,7 @@ msgstr "Manter o FTP ativo" #: ../../locales/../src/interface/resources/xrc/settings.xrc:445 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "Proxy do FTP" @@ -3628,147 +3748,150 @@ "adicionais podem ser estabelecidas em ambas as direções." #: ../../locales/../src/engine/server.cpp:20 -msgid "FTPES - FTP over explicit TLS/SSL" -msgstr "FTPES - FTP sobre TLS/SSL explícito" +msgid "FTPES - FTP over explicit TLS" +msgstr "FTPES - FTP sobre TLS explícito" #: ../../locales/../src/engine/server.cpp:19 -msgid "FTPS - FTP over implicit TLS/SSL" -msgstr "FTPES - FTP sobre TLS/SSL implícito" +msgid "FTPS - FTP over implicit TLS" +msgstr "FTPES - FTP sobre TLS implícito" -#: ../../locales/../src/interface/LocalListView.cpp:545 -#: ../../locales/../src/interface/LocalListView.cpp:625 -#: ../../locales/../src/interface/LocalListView.cpp:913 -#: ../../locales/../src/interface/LocalListView.cpp:1856 -#: ../../locales/../src/interface/LocalTreeView.cpp:873 -#: ../../locales/../src/interface/LocalTreeView.cpp:1146 -#: ../../locales/../src/interface/viewheader.cpp:500 +#: ../../locales/../src/interface/LocalListView.cpp:535 +#: ../../locales/../src/interface/LocalListView.cpp:611 +#: ../../locales/../src/interface/LocalListView.cpp:912 +#: ../../locales/../src/interface/LocalListView.cpp:1819 +#: ../../locales/../src/interface/LocalTreeView.cpp:846 +#: ../../locales/../src/interface/LocalTreeView.cpp:1125 +#: ../../locales/../src/interface/viewheader.cpp:495 msgid "Failed to change directory" msgstr "Falha ao alterar pasta" -#: ../../locales/../src/interface/FileZilla.cpp:216 -#: ../../locales/../src/interface/FileZilla.cpp:229 -#: ../../locales/../src/interface/FileZilla.cpp:231 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:135 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:152 msgid "Failed to change language" msgstr "Falh ao alterar idioma" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1958 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2055 msgid "Failed to copy or move sites" msgstr "Falha ao copiar ou o mover sites" -#: ../../locales/../src/interface/xmlfunctions.cpp:463 +#: ../../locales/../src/interface/xmlfunctions.cpp:350 msgid "Failed to create backup copy of xml file" msgstr "Falha na criação de uma cópia de segurança do arquivo xml" -#: ../../locales/../src/interface/netconfwizard.cpp:800 +#: ../../locales/../src/interface/netconfwizard.cpp:809 msgid "Failed to create listen socket, aborting" msgstr "Falha na criação de um soquete de escuta, abortando" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4199 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4203 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4079 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4083 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Falha na criação de um soquete de escuta para a transferência em modo Ativo" -#: ../../locales/../src/interface/LocalTreeView.cpp:628 +#: ../../locales/../src/interface/LocalTreeView.cpp:624 msgid "Failed to get 'My Documents' path" msgstr "Falha na obtenção do caminho para 'Meus Documentos'" -#: ../../locales/../src/interface/LocalTreeView.cpp:614 +#: ../../locales/../src/interface/LocalTreeView.cpp:612 msgid "Failed to get desktop path" msgstr "Falha na obtenção do caminho para a área de trabalho" -#: ../../locales/../src/interface/netconfwizard.cpp:959 +#: ../../locales/../src/interface/netconfwizard.cpp:962 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Falha na obtenção do endereço do ponto da conexão de controlo, conexão " "terminada." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Falha na obtenção do endereço do ponto da conexão de dados, conexão " "terminada." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "Falha na iniciação de um motor FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:767 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:301 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Falha na iniciação do TLS" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:86 +msgid "Failed to initialize networking" +msgstr "Falha ao inicializar rede" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Falha na carga dos painéis, arquivos de recursos inválidos?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Falha ao carregar a chave privada: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2598 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Falha na abertura de \"%s\" para anexação/escrita" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2660 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Falha na abertura de \"%s\" para leitura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2639 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1025 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2522 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Falha na abertura de \"%s\" para escrita" -#: ../../locales/../src/engine/ControlSocket.cpp:415 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Falha ao analisar o caminho retornado." -#: ../../locales/../src/interface/netconfwizard.cpp:1023 +#: ../../locales/../src/interface/netconfwizard.cpp:1021 msgid "Failed to receive data" msgstr "Falha na recepção de dados" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Falha na obtenção da lista de pastas" -#: ../../locales/../src/interface/netconfwizard.cpp:722 +#: ../../locales/../src/interface/netconfwizard.cpp:738 msgid "Failed to retrieve external ip address, aborting" msgstr "Falha na obtenção de um endereço IP externo, abortando" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3910 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3781 msgid "Failed to retrieve external ip address, using local address" msgstr "Falha na obtenção de um endereço IP externo, usando o endereço local" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3800 msgid "Failed to retrieve local ip address." msgstr "Falha na obtenção de um endereço IP local" -#: ../../locales/../src/interface/netconfwizard.cpp:694 +#: ../../locales/../src/interface/netconfwizard.cpp:714 msgid "Failed to retrieve local ip address. Aborting" msgstr "Falha na obtenção de um endereço IP local. Abortando" -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:640 msgid "Failed to retrieve the external IP address." msgstr "Falha na obtenção de um endereço IP externo." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:325 msgid "Failed to send command." msgstr "Falha no envio do comando." -#: ../../locales/../src/interface/FileZilla.cpp:229 +#: ../../locales/../src/interface/FileZilla.cpp:150 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Falha na definição do idioma para %s (%s), a utilizar o idioma padrão do " "sistema" -#: ../../locales/../src/interface/FileZilla.cpp:209 +#: ../../locales/../src/interface/FileZilla.cpp:128 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3776,48 +3899,47 @@ "Falha na definição do idioma para %s (%s), a utilizar o idioma padrão do " "sistema %s (%s)." -#: ../../locales/../src/interface/FileZilla.cpp:197 +#: ../../locales/../src/interface/FileZilla.cpp:117 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Falha na definição do idioma para %s (%s), a utilizar o idioma padrão do " "sistema." -#: ../../locales/../src/interface/FileZilla.cpp:231 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:152 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Falha na definição de um idioma para %s, a utilizar o idioma padrão do " "sistema" -#: ../../locales/../src/interface/FileZilla.cpp:205 +#: ../../locales/../src/interface/FileZilla.cpp:124 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Falha na definição do idioma para %s, utilizando o idioma padrão do sistema " "(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:194 +#: ../../locales/../src/interface/FileZilla.cpp:114 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Falha na definição do idioma para %s, utilizando o idioma padrão do sistema." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:206 msgid "Failed to validate settings" msgstr "Falha na validação das configurações" -#: ../../locales/../src/engine/tlssocket.cpp:1008 +#: ../../locales/../src/engine/tlssocket.cpp:1162 msgid "Failed to verify peer certificate" msgstr "Falha na verificação do certificado de ponto" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:537 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Falha na escrita no arquivo %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:476 +#: ../../locales/../src/interface/xmlfunctions.cpp:363 msgid "Failed to write xml file" msgstr "Falha na escrita no arquivo xml" @@ -3829,108 +3951,109 @@ msgid "Fall back to active mode" msgstr "Alternar para o modo ativo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2229 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "Fil&e:" msgstr "Ar&quivo:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 msgid "Fil&es" msgstr "Ar&quivos" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:267 msgid "File" msgstr "Arquivo" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 msgid "File Types" msgstr "Tipos de arquivo" -#: ../../locales/../src/engine/socket.cpp:1134 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "File descriptor not a socket" msgstr "Descritor de arquivo não é um socket" -#: ../../locales/../src/interface/import.cpp:85 +#: ../../locales/../src/interface/import.cpp:95 msgid "File does not contain any importable data." msgstr "O arquivo não contém qualquer dado que possa ser importado." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "Edição do arquivo" -#: ../../locales/../src/interface/RemoteListView.cpp:1671 +#: ../../locales/../src/interface/RemoteListView.cpp:1606 msgid "File exists" msgstr "Arquivo já existe" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 msgid "File exists action" msgstr "O arquivo existe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1672 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 msgid "File has changed" msgstr "O arquivo foi alterado" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 msgid "File lists" msgstr "Listas de arquivos" -#: ../../locales/../src/interface/edithandler.cpp:1610 -#: ../../locales/../src/interface/FileZilla.cpp:702 -#: ../../locales/../src/interface/FileZilla.cpp:796 +#: ../../locales/../src/interface/edithandler.cpp:1551 +#: ../../locales/../src/interface/FileZilla.cpp:583 +#: ../../locales/../src/interface/FileZilla.cpp:668 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Arquivo não encontrado" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:680 msgid "File search" msgstr "Procura de arquivo" -#: ../../locales/../src/engine/ControlSocket.cpp:123 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Transferência interrompida pelo usuário" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:118 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "Transferência de foi interrompida pelo usuário após transferir %s em %s" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Transferência do arquivo falhou" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Transferência de arquivo falhou após transferir %s em %s" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Transferência de arquivos ignorados" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Transferência do arquivo bem sucedida" -#: ../../locales/../src/engine/ControlSocket.cpp:110 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Transferência do arquivo bem sucedida, transferência de %s em %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1256 +#: ../../locales/../src/interface/Mainfrm.cpp:1129 msgid "File transfers still in progress." msgstr "Transferência do arquivo ainda em andamento." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 msgid "File would transfer with ASCII data type." msgstr "O arquivo será transferido com o tipo de dados ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 msgid "File would transfer with binary data type." msgstr "O arquivo será transferido com o tipo de dados binários" -#: ../../locales/../src/interface/FileZilla.cpp:508 +#: ../../locales/../src/interface/FileZilla.cpp:406 #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 msgid "FileZilla Error" msgstr "Erro do FileZilla" @@ -3942,17 +4065,17 @@ "O FileZilla pode testar a sua configuração agora para certificar-se que está " "tudo configurado corretamente ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3609 msgid "FileZilla is already connected to a server." msgstr "O FileZilla já está conectado a um servidor." -#: ../../locales/../src/interface/Mainfrm.cpp:1591 +#: ../../locales/../src/interface/Mainfrm.cpp:1426 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "O FileZilla tem que ser reiniciado para que a alteração de idioma tenha " "efeito." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 msgid "FileZilla updates" msgstr "Atualizações do FileZilla" @@ -3960,12 +4083,12 @@ msgid "Filelist status &bars" msgstr "&Barras de estado da lista de arquivos" -#: ../../locales/../src/interface/edithandler.cpp:1118 +#: ../../locales/../src/interface/edithandler.cpp:1085 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:79 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/LocalListView.cpp:279 +#: ../../locales/../src/interface/RemoteListView.cpp:393 +#: ../../locales/../src/interface/search.cpp:150 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Filename" msgstr "Nome" @@ -3973,30 +4096,23 @@ msgid "Filename &filters..." msgstr "&Filtros..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3087 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2300 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2202 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "O nome do arquivo para a pasta %s e o arquivo %s não pode ser construído" -#: ../../locales/../src/interface/RemoteListView.cpp:1657 +#: ../../locales/../src/interface/RemoteListView.cpp:1592 msgid "Filename invalid" msgstr "Nome de arquivo inválido" -#: ../../locales/../src/interface/RemoteListView.cpp:2808 -msgid "" -"Filename may not contain any of the following characters: / \\ : * ? \" < > |" -msgstr "" -"O nome do arquivo não pode conter nenhum dos seguintes caracteres: / \\ : " -"* ? \" < > |" - -#: ../../locales/../src/interface/asyncrequestqueue.cpp:266 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "Nome de arquivo não modificado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1689 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "Nome do arquivo:" @@ -4014,90 +4130,96 @@ "Os nomes de arquivo não podem conter quaisquer dos seguintes caracteres: / " "\\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1918 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 msgid "Files currently being edited" msgstr "Arquivos que estão sendo editados" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:81 +#: ../../locales/../src/interface/LocalListView.cpp:280 +#: ../../locales/../src/interface/RemoteListView.cpp:394 +#: ../../locales/../src/interface/search.cpp:152 msgid "Filesize" msgstr "Tamanho" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "Formato do tamanho de arquivo" -#: ../../locales/../src/interface/LocalListView.cpp:280 -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:82 +#: ../../locales/../src/interface/LocalListView.cpp:281 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:153 msgid "Filetype" msgstr "Tipo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Associações dos tipos de arquivos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1325 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 msgid "Filter applies to:" msgstr "O filtro aplica-se a:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:966 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 msgid "Filter invalid characters in filenames" msgstr "Filtrar caracteres inválidos nos nomes dos arquivos" #: ../../locales/../src/interface/filteredit.cpp:149 #: ../../locales/../src/interface/filteredit.cpp:217 #: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:358 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Esse nome de filtro já existe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 msgid "Filter out items matching all of the following" msgstr "As saídas do filtro correspondem a todos os seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 msgid "Filter out items matching any of the following" msgstr "As saídas do filtro não correspondem a quaisquer dos seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1297 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 msgid "Filter out items matching none of the following" msgstr "As saídas do filtro não correspondem a nenhum dos seguintes" -#: ../../locales/../src/interface/filter.cpp:370 -#: ../../locales/../src/interface/filter.cpp:431 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Filter set already exists" msgstr "Esse conjunto de filtros já existe" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:67 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 msgid "Filter the directory listings" msgstr "Filtrar as listas de pastas" -#: ../../locales/../src/interface/filteredit.cpp:340 -#: ../../locales/../src/interface/filteredit.cpp:349 -#: ../../locales/../src/interface/filteredit.cpp:358 +#: ../../locales/../src/interface/filteredit.cpp:337 +#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter validation failed" msgstr "Falha na validação do filtro" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:99 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:378 -msgid "Fingerprint (MD5):" -msgstr "Impressão digital (MD5):" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3093 +msgid "Find &files" +msgstr "Localizar &arquivos" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3098 +msgid "Find d&irectories" +msgstr "Localizar d&iretórios" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:109 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:388 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" msgstr "Impressão digital (SHA-1):" +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 +msgid "Fingerprint (SHA-256):" +msgstr "Impressão digital (SHA-256):" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 msgid "Fingerprint:" msgstr "Impressão digital:" -#: ../../locales/../src/interface/netconfwizard.cpp:48 +#: ../../locales/../src/interface/netconfwizard.cpp:56 msgid "Firewall and router configuration wizard" msgstr "Assistente de configuração de firewall e roteador" @@ -4115,7 +4237,7 @@ "Para confiabilidade deve ser especificado um intervalo de pelo menos 10 " "portas." -#: ../../locales/../src/interface/Options.cpp:218 +#: ../../locales/../src/interface/Options.cpp:248 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4123,15 +4245,15 @@ "Para essa sessão, serão usadas as configurações padrão. Nenhuma alteração às " "configurações serão salvas." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Force &UTF-8" msgstr "Forçar &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:198 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Force showing &hidden files" msgstr "&Forçar a mostra de arquivos ocultos" -#: ../../locales/../src/interface/Mainfrm.cpp:700 +#: ../../locales/../src/interface/Mainfrm.cpp:641 msgid "Force showing hidden files" msgstr "Forçar a mostra de arquivos ocultos" @@ -4139,17 +4261,17 @@ msgid "Format specifications:" msgstr "Especificações do formato:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1979 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "Formato: Extensão seguida do comando entre aspas e seus parâmetros." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:615 +#: ../../locales/../src/interface/updater.cpp:689 #, c-format msgid "Found new %s %s\n" msgstr "Encontrado novo %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3505 msgid "Further documentation" msgstr "Documentação adicional" @@ -4157,12 +4279,12 @@ msgid "General" msgstr "Geral" -#: ../../locales/../src/engine/proxy.cpp:488 +#: ../../locales/../src/engine/proxy.cpp:508 msgid "General SOCKS server failure" msgstr "Falha geral do servidor de SOCKS" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Proxy genérico" @@ -4170,30 +4292,54 @@ msgid "Get external IP address from the following URL:" msgstr "Obter um endereço IP externo a partir do seguinte URL:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3311 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3524 msgid "Getting help" msgstr "Obtendo ajuda" -#: ../../locales/../src/interface/filter.cpp:370 -#: ../../locales/../src/interface/filter.cpp:431 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" "O nome de conjunto de filtros dado já existe, pretende substituir o conjunto " "de filtros?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:256 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:244 msgid "Global bookmarks" msgstr "Marcadores globais" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:732 +#: ../../locales/../src/engine/tlssocket.cpp:265 +#, c-format +msgid "GnuTLS error %d" +msgstr "GnuTLS erro %d" + +#: ../../locales/../src/engine/tlssocket.cpp:267 +#, c-format +msgid "GnuTLS error %d in %s" +msgstr "GnuTLS erro %d em %s" + +#: ../../locales/../src/engine/tlssocket.cpp:261 +#, c-format +msgid "GnuTLS error %d in %s: %s" +msgstr "GnuTLS erro %d em %s: %s" + +#: ../../locales/../src/engine/tlssocket.cpp:259 +#, c-format +msgid "GnuTLS error %d: %s" +msgstr "GnuTLS erro %d: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:442 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "Verde" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 msgid "Group permissions" msgstr "Permissões de grupo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "A<o" @@ -4201,7 +4347,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP sobre TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1947 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 msgid "Hash:" msgstr "Mistura:" @@ -4209,33 +4355,37 @@ msgid "Hidden" msgstr "Oculto" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 -#: ../../locales/../src/interface/queue.cpp:896 -#: ../../locales/../src/interface/queue.cpp:983 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "High" msgstr "Alta" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../locales/../src/interface/queue.cpp:885 +#: ../../locales/../src/interface/queue.cpp:941 msgid "Highest" msgstr "Maior" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "A maior porta disponível tem que ser um número entre 1024 e 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1153 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Mantenha pressionada a tecla shift para alterar o estado do filtro em ambos " "os lados simultaneamente." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Homepage:" msgstr "Página oficial:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 +#: ../../locales/../src/engine/socket.cpp:1052 +msgid "Host is down" +msgstr "O host está desligado" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 msgid "Host key fingerprint:" msgstr "Impressão digital da chave do host:" @@ -4243,31 +4393,30 @@ msgid "Host key mismatch" msgstr "A chave do host não coincide" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:158 msgid "Host starts with '[' but no closing bracket found." msgstr "O host começa com '[' mas não foi encontrado o parêntesis no fecho." -#: ../../locales/../src/engine/proxy.cpp:497 +#: ../../locales/../src/engine/proxy.cpp:517 msgid "Host unreachable" -msgstr "host inacessível" +msgstr "Host inacessível" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:189 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:468 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 msgid "Host:" -msgstr "host:" +msgstr "Host:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:350 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 msgid "Hours," msgstr "Horas," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1521 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (exemplo: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:127 +#: ../../locales/../src/engine/proxy.cpp:154 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "ENdereços IPv6 não são compatíveis com proxy SOCKS4" @@ -4281,11 +4430,11 @@ "tempo do que o especificado, a conexão será fechada e o FileZilla tentará " "reconectar-se." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2236 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" -"Se reportar erros, por favor providencie a informação dada no nível de log " -"\"Verboso\"." +"Se reportar erros, por favor providencie a informação dada no nível de " +"registro \"Detalhado\"." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" @@ -4315,7 +4464,7 @@ "Se a mudança de chave do host não era esperada, por favor contacte o " "administrador do servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:560 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4323,7 +4472,7 @@ "Se o problema persistir, algum roteador e/ou firewall continua a bloquear o " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4331,7 +4480,7 @@ "Se o problema persistir, algum roteador e/ou firewall continua a interromper " "a conexão." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2159 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4341,7 +4490,7 @@ "adicionand um \".1\" no fim do nome (podendo substituir arquivos de log mais " "antigos) e um novo arquivo será criado." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4349,7 +4498,7 @@ "Se o atalho simbólico apontar para uma pasta, o FileZilla pode apagar o " "atalho ou remover os conteúdos da pasta indicada." -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:648 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4357,12 +4506,12 @@ "Se esse problema persistir, contacte o fabricante do seu roteador ou " "firewall para uma solução." -#: ../../locales/../src/interface/netconfwizard.cpp:588 +#: ../../locales/../src/interface/netconfwizard.cpp:606 msgid "If this problem stays, please contact your router manufacturer." msgstr "Se esse problema persistir, contacte o fabricante do seu roteador." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1459 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4372,7 +4521,7 @@ "estar sincronizada com a do servidor. Se as horas forem diferentes (p.ex. " "fuso horário diferente), entre com um fuso horário no Gerenciador de Sites." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1747 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4380,7 +4529,7 @@ "Ao usar uma comparação baseada em fusos horários, considera-se dois arquivos " "iguais quando as diferenças de fuso não excederem esse intervalo." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1853 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 msgid "If you change the language, you need to restart FileZilla." msgstr "Se você mudar o idioma, você terá que reiniciar o FileZilla." @@ -4392,11 +4541,11 @@ "Se você clicar em Teste, o FileZilla irá fazer a conexão a \"probe.filezilla-" "project.org\" e realizar alguns testes simples." -#: ../../locales/../src/interface/Mainfrm.cpp:1278 +#: ../../locales/../src/interface/Mainfrm.cpp:1151 msgid "If you close FileZilla, your changes will be lost." msgstr "Se você sair do FileZilla as alterações serão perdidas." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1095 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4416,7 +4565,7 @@ "Se tiver problemas para obter a lista de pastas ou transferir arquivos, " "tente mudar o modo de transferência." -#: ../../locales/../src/interface/netconfwizard.cpp:575 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4452,7 +4601,7 @@ "Se você usa um roteador, certifique-se que todas essas portas estão " "direcionadas para a máquina que está sendo executando o FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:619 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4460,16 +4609,16 @@ "Se o seu roteador continuar a alterar o endereço IP, contacte o fabricante " "do seu roteador." -#: ../../locales/../src/interface/import.cpp:77 +#: ../../locales/../src/interface/import.cpp:87 msgid "Import data from older version" msgstr "Importar dados de uma versão anterior" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 msgid "Import settings" msgstr "Importar configurações" -#: ../../locales/../src/interface/import.cpp:63 -#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:76 msgid "Import successful" msgstr "Importação bem sucedida" @@ -4514,7 +4663,7 @@ "FileZilla pede ao servidor uma porta e se conecta à porta dada. Não há muita " "configuração a ser feita para isso." -#: ../../locales/../src/engine/tlssocket.cpp:1020 +#: ../../locales/../src/engine/tlssocket.cpp:1174 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4522,11 +4671,11 @@ "Cadeia incompleta, o certificado raiz não está assinado por uma autoridade " "certificadora" -#: ../../locales/../src/interface/QueueView.cpp:1054 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "senha incorreta" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:196 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4534,48 +4683,51 @@ "Não foi possível obter informação da última versão do FileZilla. Por favor " "tente novamente mais tarde." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:757 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:742 msgid "Initializing TLS..." msgstr "A iniciar o TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 +msgid "Insecure algorithm!" +msgstr "Algoritmo inseguro!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:726 msgid "Insecure server, it does not support FTP over TLS." msgstr "Servidor sem segurança, não suporta FTP sobre TLS" -#: ../../locales/../src/engine/server.cpp:834 -#: ../../locales/../src/engine/server.cpp:853 -#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/engine/server.cpp:883 +#: ../../locales/../src/engine/server.cpp:904 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interativo" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 msgid "Interface" msgstr "Interface" -#: ../../locales/../src/engine/socket.cpp:1131 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Interrupted by signal" msgstr "Interrompido por sinal" -#: ../../locales/../src/engine/ControlSocket.cpp:213 -#: ../../locales/../src/interface/QueueView.cpp:1015 -#: ../../locales/../src/interface/QueueView.cpp:1584 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Interrompido pelo usuário" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:744 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Comprimento de conteúdo inválido" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:594 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Resposta HTTP inválida" -#: ../../locales/../src/engine/socket.cpp:1119 +#: ../../locales/../src/engine/socket.cpp:1026 msgid "Invalid argument passed" msgstr "Argumento inválido passado" -#: ../../locales/../src/engine/ControlSocket.cpp:529 -#: ../../locales/../src/engine/ControlSocket.cpp:575 +#: ../../locales/../src/engine/ControlSocket.cpp:452 +#: ../../locales/../src/engine/ControlSocket.cpp:508 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4583,127 +4735,119 @@ "Recebida uma sequência de caracteres inválida, desabilitando UTF-8. " "Selecione a opção UTF-8 no Gerenciador de Sites para forçar ao UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:858 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Tamanho inválido" -#: ../../locales/../src/interface/netconfwizard.cpp:359 -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:378 +#: ../../locales/../src/interface/netconfwizard.cpp:375 +#: ../../locales/../src/interface/netconfwizard.cpp:384 +#: ../../locales/../src/interface/netconfwizard.cpp:392 +#: ../../locales/../src/interface/netconfwizard.cpp:409 msgid "Invalid data received" msgstr "Recebidos dados inválidos" -#: ../../locales/../src/interface/verifycertdialog.cpp:36 -#: ../../locales/../src/interface/verifycertdialog.cpp:50 +#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:55 msgid "Invalid date" msgstr "Data inválida" #: ../../locales/../src/interface/file_utils.cpp:290 #: ../../locales/../src/interface/file_utils.cpp:315 -#: ../../locales/../src/interface/RemoteListView.cpp:2808 msgid "Invalid filename" msgstr "Nome de arquivo inválido" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:163 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Host inválido, após o fecha colchete só pode haver dois pontos e a porta." -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:103 msgid "Invalid input" msgstr "Entrada inválida" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:64 +#: ../../locales/../src/engine/server.cpp:181 +#: ../../locales/../src/engine/server.cpp:191 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Porta especificada inválida. A porta deve ter um valor entre 1 e 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/engine/server.cpp:92 +#: ../../locales/../src/interface/quickconnectbar.cpp:120 msgid "" "Invalid protocol specified. Valid protocols are:\n" -"ftp:// for normal FTP,\n" +"ftp:// for normal FTP with optional encryption,\n" "sftp:// for SSH file transfer protocol,\n" "ftps:// for FTP over TLS (implicit) and\n" "ftpes:// for FTP over TLS (explicit)." msgstr "" -"O protocolo especificado é inválido. Os protocolos válidos são:\n" -"ftp:// para FTP normal,\n" -"sftp:// para o protocolo de transferência SSH,\n" -"ftps:// para FTP sobre SSL (implícito) e\n" -"ftpes:// para FTP sobre SSL (explícito)." +"Protocolo inválido especificado. Protocolos válidos são:\n" +"ftp:// para FTP normal com criptografia opcional,\n" +"sftp:// para o protocolo de transferência de arquivos SSH,\n" +"ftps:// para FTP sobre TSL (implícito) e\n" +"ftpes:// para FTP sobre TSL (explícito)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4347 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4223 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "O proxy do domínio é inválido, após o fecha colchete pode apenas haver dois " "pontos e a porta." -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:680 msgid "Invalid regular expression in search conditions." msgstr "Expressão regular inválida nas condições para a procura." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:604 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Código de resposta inválido" -#: ../../locales/../src/interface/search.cpp:385 +#: ../../locales/../src/interface/search.cpp:675 #, c-format msgid "Invalid search conditions: %s" msgstr "Condições para a procura inválidas: %s" -#: ../../locales/../src/interface/sitemanager.cpp:425 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:456 -#: ../../locales/../src/interface/sitemanager.cpp:463 -#: ../../locales/../src/interface/sitemanager.cpp:470 -#: ../../locales/../src/interface/sitemanager.cpp:488 -#: ../../locales/../src/interface/sitemanager.cpp:541 -#: ../../locales/../src/interface/sitemanager.cpp:559 -#: ../../locales/../src/interface/sitemanager.cpp:729 -#: ../../locales/../src/interface/sitemanager.cpp:736 -#: ../../locales/../src/interface/sitemanager.cpp:810 -#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager.cpp:682 +#: ../../locales/../src/interface/sitemanager.cpp:688 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:765 msgid "Invalid site path" msgstr "Caminho do site inválido" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:726 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 msgid "Invalid size in condition" msgstr "Tamanho inválido nesta condição" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/engine/server.cpp:133 msgid "Invalid username given." msgstr "Nome de usuário inválido." -#: ../../locales/../src/engine/socket.cpp:1151 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Invalid value for ai_flags" msgstr "Valor inválido para ai_flags" # Devemos deixar "hints" como "dicas" ou como "hints" mesmo? -#: ../../locales/../src/engine/socket.cpp:1153 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Invalid value for hints" msgstr "Valor inválido para dicas" -#: ../../locales/../src/interface/verifycertdialog.cpp:194 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "País de jurisdição:" -#: ../../locales/../src/interface/verifycertdialog.cpp:196 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Localidade de jurisdição:" -#: ../../locales/../src/interface/verifycertdialog.cpp:195 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Estado ou província de jurisdição:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1704 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 msgid "Keep directories on top" msgstr "Manter as pastas em cima" -#: ../../locales/../src/interface/Mainfrm.cpp:704 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4714,43 +4858,49 @@ "alguns testes para verificar se o servidor suporta essa funcionalidade, o " "teste pode falhar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Key exchange" msgstr "Troca de chave" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:209 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:488 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 msgid "Key exchange:" msgstr "Troca de chave:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:369 +#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/engine/server.cpp:902 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1316 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1317 +msgid "Key file" +msgstr "Arquivo chave" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "M&enor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Idioma" -#: ../../locales/../src/interface/Mainfrm.cpp:1591 +#: ../../locales/../src/interface/Mainfrm.cpp:1426 msgid "Language changed" msgstr "Idioma alterado" -#: ../../locales/../src/interface/LocalListView.cpp:281 -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/LocalListView.cpp:282 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:154 msgid "Last modified" msgstr "Modificado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1238 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 msgid "Layout" msgstr "Disposição" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 msgid "Limit for concurrent &downloads:" msgstr "Limite para &downloads simultâneos:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:845 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 msgid "Limit for concurrent &uploads:" msgstr "Limite para &uploads simultâneos:" @@ -4758,29 +4908,30 @@ msgid "Limit local ports" msgstr "Limitar portas locais" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 msgid "Limit size of logfile" msgstr "Limite para o tamanho do arquivo de log" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 msgid "Limit:" msgstr "Limite:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Excedido o comprimento da linha" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:752 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 msgid "Linked against" msgstr "Lincados com" -#: ../../locales/../src/interface/netconfwizard.cpp:273 +#: ../../locales/../src/interface/netconfwizard.cpp:276 +#: ../../locales/../src/interface/netconfwizard.cpp:282 msgid "Listen socket closed" msgstr "Soquete de supervisão fechado" -#: ../../locales/../src/engine/logging.cpp:116 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:360 +#: ../../locales/../src/engine/logging.cpp:118 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:362 msgid "Listing:" msgstr "Listando:" @@ -4788,50 +4939,58 @@ msgid "Lo&west available port:" msgstr "M&enor porta disponível:" -#: ../../locales/../src/interface/edithandler.cpp:1166 -#: ../../locales/../src/interface/edithandler.cpp:1420 +#: ../../locales/../src/interface/edithandler.cpp:1133 +#: ../../locales/../src/interface/edithandler.cpp:1369 msgid "Local" msgstr "Local" -#: ../../locales/../src/engine/socket.cpp:1116 +#: ../../locales/../src/engine/socket.cpp:1023 msgid "Local address in use" msgstr "Endereço local em uso" -#: ../../locales/../src/engine/socket.cpp:1144 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Local endpoint has been closed" msgstr "Endpoint local foi fechado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2173 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 msgid "Local file" msgstr "Arquivo local" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "O arquivo local não existe." -#: ../../locales/../src/interface/updater.cpp:352 -#: ../../locales/../src/interface/updater.cpp:429 +#: ../../locales/../src/interface/updater.cpp:403 +#: ../../locales/../src/interface/updater.cpp:496 #, c-format msgid "Local file is %s\n" msgstr "Arquivo local em %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:309 msgid "Local file is a directory instead of a regular file." msgstr "O arquivo local é uma pasta e não um arquivo normal." -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Arquivo local não é um nome de arquivo válido." +#: ../../locales/../src/interface/search.cpp:644 +msgid "Local file search" +msgstr "Procura de arquivos locais" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Filtros locais:" -#: ../../locales/../src/interface/viewheader.cpp:325 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3266 +msgid "Local path handling:" +msgstr "Tratando caminho local:" + +#: ../../locales/../src/interface/viewheader.cpp:335 msgid "Local site:" msgstr "Endereço local:" -#: ../../locales/../src/interface/verifycertdialog.cpp:188 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Localidade:" @@ -4839,12 +4998,16 @@ msgid "Log file" msgstr "Arquivo de log" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2082 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:905 +msgid "Logged in" +msgstr "Identificado" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" -msgstr "Logging" +msgstr "Identificando-se" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:800 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4853,7 +5016,7 @@ "não entender UTF-8. Não é possivel tentar o mapa de caracteres local uma vez " "que está sendo usado proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:827 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:807 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4861,10 +5024,11 @@ "Os dados para login contêm caracteres que não são ASCII e o servidor pode " "não entender UTF-8. Tentando o mapa de caracteres local." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:834 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" -"Sequência de login executada mas mesmo assim não foi logado. Cancelando." +"Sequência de login executada, mas mesmo assim não foi identificado. " +"Cancelando." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -4879,180 +5043,186 @@ "O tipo de login só pode ser usado com URL FTP. O argumento tem que ser '%s' " "ou '%s'" -#: ../../locales/../src/interface/queue.cpp:891 -#: ../../locales/../src/interface/queue.cpp:978 +#: ../../locales/../src/interface/queue.cpp:878 +#: ../../locales/../src/interface/queue.cpp:934 msgid "Low" msgstr "Baixo" -#: ../../locales/../src/interface/queue.cpp:889 -#: ../../locales/../src/interface/queue.cpp:976 +#: ../../locales/../src/interface/queue.cpp:876 +#: ../../locales/../src/interface/queue.cpp:932 msgid "Lowest" msgstr "Menor" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "A menor porta disponível tem que ser um número entre 1024 e 65535." -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:229 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:508 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:44 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Certifique-se de que o arquivo está acessível e de que é um documento XML " "correcto." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:799 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 #: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:826 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:858 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 #, c-format msgid "Malformed chunk data: %s" msgstr "Dados mal formados: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:744 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Titulo mal formado: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:564 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 msgid "Malformed reply, server not sending proper line endings" msgstr "" "Resposta malformada, o servidor não está a enviar fins de linha correctos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 +#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:303 #: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:316 -#: ../../locales/../src/interface/manual_transfer.cpp:323 -#: ../../locales/../src/interface/manual_transfer.cpp:328 -#: ../../locales/../src/interface/manual_transfer.cpp:336 -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:332 #: ../../locales/../src/interface/manual_transfer.cpp:350 -#: ../../locales/../src/interface/manual_transfer.cpp:369 msgid "Manual transfer" msgstr "Transferência &manual" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3057 msgid "Match all of the following" msgstr "Corresponder a todos os seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3058 msgid "Match any of the following" msgstr "Corresponder a qualquer dos seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2952 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3059 msgid "Match none of the following" msgstr "Corresponder a nenhum dos seguintes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:803 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "Máximo de &transferências simultâneas:" -#: ../../locales/../src/engine/socket.cpp:1157 +#: ../../locales/../src/engine/socket.cpp:1065 msgid "Memory allocation failure" msgstr "Falha na alocação de memória" -#: ../../locales/../src/interface/Mainfrm.cpp:408 -#: ../../locales/../src/interface/Mainfrm.cpp:1910 +#: ../../locales/../src/interface/Mainfrm.cpp:382 +#: ../../locales/../src/interface/Mainfrm.cpp:1740 msgid "Message log" msgstr "Janela de mensagens" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 msgid "Message log position" msgstr "Posição do log de mensagens" -#: ../../locales/../src/engine/socket.cpp:1141 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Message too large" msgstr "Mensagem muito comprida" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:366 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:445 msgid "Minutes" msgstr "Minutos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2088 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 msgid "Move &down" msgstr "Mover para &baixo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 msgid "Move &up" msgstr "Mover para &cima" -#: ../../locales/../src/interface/LocalTreeView.cpp:1024 +#: ../../locales/../src/interface/LocalTreeView.cpp:985 msgid "My Computer" -msgstr "O meu computador" +msgstr "Meu Computador" -#: ../../locales/../src/interface/LocalTreeView.cpp:1014 +#: ../../locales/../src/interface/LocalTreeView.cpp:975 msgid "My Documents" -msgstr "Os meus documentos" +msgstr "Meus Documentos" -#: ../../locales/../src/interface/sitemanager.cpp:281 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:721 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:723 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:726 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:728 msgid "My Sites" msgstr "Meus Sites" #: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 msgid "N/a" -msgstr "N/a" +msgstr "N/d" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" msgstr "Nome" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:707 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1184 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:681 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1202 msgid "Name already exists" msgstr "Esse nome já existe" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:822 -#: ../../locales/../src/interface/sitemanager.cpp:753 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager.cpp:700 msgid "Name of bookmark already exists." msgstr "O nome do marcador já existe." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 msgid "Name:" msgstr "Nome:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 msgid "Natural sort" msgstr "Ordenação natural" -#: ../../locales/../src/interface/filteredit.cpp:349 +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" -msgstr "É necessário introduzir o nome do filtro" +msgstr "É necessário informar o nome do filtro" + +#: ../../locales/../src/interface/search.cpp:644 +msgid "Need to enter valid local path" +msgstr "É necessário informar um caminho local válido" -#: ../../locales/../src/interface/search.cpp:375 +#: ../../locales/../src/interface/search.cpp:665 msgid "Need to enter valid remote path" -msgstr "É necessário entrar com um caminho remoto válido" +msgstr "É necessário informar um caminho remoto válido" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Need to specify a character encoding" msgstr "É necessário especificar a codificação de caracteres" -#: ../../locales/../src/engine/socket.cpp:1161 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Neither nodename nor servname provided, or not known" msgstr "Nem nodename nem servname fornecidos, ou desconhecidos" -#: ../../locales/../src/engine/socket.cpp:1148 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "Host da rede não possui nenhum endereço de rede" -#: ../../locales/../src/engine/proxy.cpp:494 -#: ../../locales/../src/engine/socket.cpp:1133 +#: ../../locales/../src/engine/proxy.cpp:514 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Network unreachable" msgstr "Rede inacessível" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2019 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "Never" msgstr "Nunca" @@ -5064,37 +5234,37 @@ msgid "New &tab" msgstr "&Nova aba" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Novo &Marcador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 #: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:574 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:822 -#: ../../locales/../src/interface/sitemanager.cpp:753 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2123 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:106 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:433 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:526 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:531 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:537 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:557 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager.cpp:700 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2210 msgid "New bookmark" msgstr "Novo marcador" -#: ../../locales/../src/interface/LocalTreeView.cpp:1173 -#: ../../locales/../src/interface/RemoteListView.cpp:1373 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1317 +#: ../../locales/../src/interface/LocalTreeView.cpp:1152 +#: ../../locales/../src/interface/RemoteListView.cpp:1316 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1248 msgid "New directory" msgstr "Nova pasta" -#: ../../locales/../src/interface/welcome_dialog.cpp:53 +#: ../../locales/../src/interface/welcome_dialog.cpp:56 #, c-format msgid "New features and improvements in %s" msgstr "Novas funcionalidades e melhoramentos em %s" @@ -5103,25 +5273,25 @@ msgid "New filter" msgstr "Novo filtro" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:908 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:924 msgid "New folder" msgstr "Nova pasta" -#: ../../locales/../src/interface/sitemanager.cpp:627 -#: ../../locales/../src/interface/sitemanager.cpp:641 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2099 +#: ../../locales/../src/interface/sitemanager.cpp:592 +#: ../../locales/../src/interface/sitemanager.cpp:604 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 msgid "New site" msgstr "Novo site" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1295 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 msgid "Next to the transfer queue" msgstr "Ao lado da fila de transferência" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:905 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:838 msgid "No" msgstr "Não" -#: ../../locales/../src/engine/socket.cpp:1159 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "No address associated with nodename" msgstr "Nenhum endereço associado com nodename" @@ -5129,15 +5299,15 @@ msgid "No category to export selected" msgstr "Nenhuma categoria selecionada para exportar" -#: ../../locales/../src/interface/QueueView.cpp:2257 +#: ../../locales/../src/interface/QueueView.cpp:1748 msgid "No command given, aborting." msgstr "Nenhum comando dado, abortando." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3882 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3753 msgid "No external IP address set, trying default." msgstr "Endereço IP externo não especificado, a tentar o padrão." -#: ../../locales/../src/interface/edithandler.cpp:1107 +#: ../../locales/../src/interface/edithandler.cpp:1074 msgid "No files are currently being edited." msgstr "Nenhum arquivo está sendo editado." @@ -5145,9 +5315,9 @@ msgid "No filter name given" msgstr "Não foi dado um nome ao filtro" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:78 +#: ../../locales/../src/engine/server.cpp:175 +#: ../../locales/../src/engine/server.cpp:200 msgid "No host given, please enter a host." msgstr "Host não especificado, entre com um host." @@ -5155,101 +5325,95 @@ msgid "No images available" msgstr "Nehuma imagem disponível" -#: ../../locales/../src/interface/QueueView.cpp:3138 -msgid "No more files in the queue!" -msgstr "Não há mais arquivos na fila!" - -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:424 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "No name for the filterset given." msgstr "Não foi dado um nome ao conjunto de filtros." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Não há programa associado a esse tipo de arquivo." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2832 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Não foi associado um programa para editar arquivos com essa extensão '%s'." -#: ../../locales/../src/engine/socket.cpp:1136 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "No route to host" msgstr "Sem rota para host" -#: ../../locales/../src/interface/search.cpp:235 +#: ../../locales/../src/interface/search.cpp:391 msgid "No search results" msgstr "Nenhum resultado para a procura" -#: ../../locales/../src/interface/sitemanager.cpp:247 -#: ../../locales/../src/interface/sitemanager.cpp:259 -#: ../../locales/../src/interface/sitemanager.cpp:290 +#: ../../locales/../src/interface/sitemanager.cpp:347 msgid "No sites available" msgstr "Nenhum sites disponível" -#: ../../locales/../src/engine/proxy.cpp:462 +#: ../../locales/../src/engine/proxy.cpp:485 msgid "No supported SOCKS5 auth method" msgstr "Nenhum método de autenticação SOCKS5 suportado" -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:103 msgid "No username given." msgstr "Não foi dado nenhum nome de usuário." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1795 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 -#: ../../locales/../src/interface/verifycertdialog.cpp:56 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "Nenhuma" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2289 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 msgid "None selected yet" msgstr "Nenhum selecionado" -#: ../../locales/../src/engine/socket.cpp:1155 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Nonrecoverable failure in name resolution" msgstr "Falha não recuperável em resolução de nome" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:943 -#: ../../locales/../src/engine/server.cpp:830 -#: ../../locales/../src/engine/server.cpp:849 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:185 -#: ../../locales/../src/interface/manual_transfer.cpp:568 -#: ../../locales/../src/interface/queue.cpp:894 -#: ../../locales/../src/interface/queue.cpp:981 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1291 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 +#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/engine/server.cpp:898 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1314 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:325 -#: ../../locales/../src/interface/queueview_failed.cpp:350 -msgid "Not all items could be requeued for viewing/editing." -msgstr "" -"Nem todos os items puderam serrecolocados na fila para serem vistos/editados." +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 +msgid "Not all items could be requeued for transfer." +msgstr "Nem todos os itens podem ser recolocados para transferência." -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:516 +#: ../../locales/../src/interface/state.cpp:178 +#: ../../locales/../src/interface/state.cpp:1182 msgid "Not connected" msgstr "Não conectado" -#: ../../locales/../src/interface/RemoteListView.cpp:2114 +#: ../../locales/../src/interface/RemoteListView.cpp:2023 msgid "Not connected to any server" msgstr "Não conectado a qualquer servidor" -#: ../../locales/../src/interface/Mainfrm.cpp:593 +#: ../../locales/../src/interface/Mainfrm.cpp:557 msgid "Not connected to any server." msgstr "Não conectado a qualquer servidor." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Não conectado." -#: ../../locales/../src/engine/socket.cpp:1176 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Not initialized, need to call WSAStartup" msgstr "Não inicializado, precisa invocar WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:702 +#: ../../locales/../src/interface/Mainfrm.cpp:643 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Note que essa opção apenas é suportada se usar o protocolo FTP." @@ -5257,11 +5421,11 @@ msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Nota: Isso só funciona com conexões FTP simples e não encriptadas." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "Nota: Usar um proxy genérico força o modo passivo em conexões FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 msgid "Number of decimal places:" msgstr "Número de casas decimais:" @@ -5269,40 +5433,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "O número de tentativas tem que ser entre 0 e 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1886 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 msgid "O&pen file" msgstr "A&brir arquivo" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:272 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:541 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1362 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1469 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1540 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1593 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1819 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1901 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2037 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2114 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2499 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2645 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2898 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3094 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3163 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3528 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3584 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3801 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "OK" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +msgid "OS version:" +msgstr "OS versão:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " @@ -5311,19 +5479,23 @@ "Nas páginas seguintes, o modo de transferência selecionado será configurado, " "assim como o modo de fallback, se ativado." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:915 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:848 msgid "Once" msgstr "Uma vez" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 msgid "Once a day" msgstr "Uma vez ao dia" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2021 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 msgid "Once a week" msgstr "Uma vez por semana" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:511 +msgid "Only use plain FTP (insecure)" +msgstr "Usar somente FTP simples (inseguro)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Open directory in system's file manager" msgstr "Abrir pasta no Gerenciador de arquivos do sistema" @@ -5341,7 +5513,7 @@ "Abre o Gerenciador de Sites. CLique o botão direito do mouse para listas os " "sites." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 msgid "Open the file." msgstr "Abrir o arquivo." @@ -5349,14 +5521,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Abre a caixa de configurações do FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1699 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 msgid "Opened as:" msgstr "Aberto como:" -#: ../../locales/../src/interface/edithandler.cpp:1631 -#: ../../locales/../src/interface/edithandler.cpp:1706 -#: ../../locales/../src/interface/LocalListView.cpp:1770 -#: ../../locales/../src/interface/LocalListView.cpp:1782 +#: ../../locales/../src/interface/edithandler.cpp:1617 +#: ../../locales/../src/interface/edithandler.cpp:1734 +#: ../../locales/../src/interface/LocalListView.cpp:1727 +#: ../../locales/../src/interface/LocalListView.cpp:1739 msgid "Opening failed" msgstr "Falha na abertura" @@ -5368,47 +5540,51 @@ msgid "Opens the Site Manager" msgstr "Abre o Gerenciador de Sites" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:69 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Abre a janela dos filtros da lista de pastas. Botão direito do mouse para " "alternar entre filtros." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 -msgid "Operating system" -msgstr "Sistema operacional" - -#: ../../locales/../src/interface/FileZilla.cpp:328 -msgid "Operating system problem detected" -msgstr "Foi detectado um problema no sistema operational" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +msgid "Operating System:" +msgstr "Sistema Operacional:" -#: ../../locales/../src/engine/socket.cpp:1127 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "Operation already in progress" msgstr "Operação já em progresso" -#: ../../locales/../src/engine/socket.cpp:1118 +#: ../../locales/../src/engine/socket.cpp:1025 msgid "Operation in progress" msgstr "Operação em progresso" -#: ../../locales/../src/engine/socket.cpp:1139 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Operation not supported" msgstr "Operação não compatível" -#: ../../locales/../src/interface/verifycertdialog.cpp:182 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "Laranja" + +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organização:" -#: ../../locales/../src/engine/socket.cpp:1171 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +msgid "Other SFTP options" +msgstr "Outras opções de SFTP" + +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Other system error" msgstr "Outro erro de sistema" -#: ../../locales/../src/interface/verifycertdialog.cpp:204 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Outro:" -#: ../../locales/../src/engine/socket.cpp:1122 -#: ../../locales/../src/engine/socket.cpp:1123 +#: ../../locales/../src/engine/socket.cpp:1029 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Out of memory" msgstr "Sem memória" @@ -5420,33 +5596,33 @@ msgid "Overwrite &if source newer" msgstr "Substituir &se for mais recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1155 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Substituir arquivo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1157 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1178 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "Substituir arquivo se o tamanho diferir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1158 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "" "Substituir arquivo se o tamanho diferir ou o arquivo de origem for mais " "recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1156 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1177 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" msgstr "Substituir arquivo se o arquivo de origem for mais recente" @@ -5460,21 +5636,21 @@ "Substituir se o ta&manho for diferente ou o arquivo de origem for mais " "recente" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:246 #, c-format msgid "Own build type: %s\n" msgstr "Próprio tipo de compilação: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 msgid "Owner permissions" msgstr "Permissões do proprietário" -#: ../../locales/../src/interface/RemoteListView.cpp:381 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:156 msgid "Owner/Group" msgstr "Proprietário/Grupo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5482,11 +5658,11 @@ "Impedi&r a suspenção do sistema durante as transferências e outras operações" #: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 msgid "P&roxy host:" msgstr "Host do p&roxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:494 +#: ../../locales/../src/interface/netconfwizard.cpp:509 msgid "PORT command tainted by router or firewall." msgstr "Comando PORT danificado pelo roteador ou firewall." @@ -5494,18 +5670,18 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssivo (recomendado)" -#: ../../locales/../src/interface/Mainfrm.cpp:2487 +#: ../../locales/../src/interface/Mainfrm.cpp:2350 msgid "Parameter not a valid URL" msgstr "O parâmetro não é um URL válido" -#: ../../locales/../src/interface/updater.cpp:511 +#: ../../locales/../src/interface/updater.cpp:576 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Analisando %d bytes de informações sobre a versão.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2407 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:191 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 msgid "Pass&word:" msgstr "&Senha:" @@ -5514,43 +5690,43 @@ msgstr "Pa&ssivo (recomendado)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:409 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Modo passivo" -#: ../../locales/../src/interface/netconfwizard.cpp:594 -#: ../../locales/../src/interface/netconfwizard.cpp:607 -#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:636 msgid "Passive mode has been set as default transfer mode." msgstr "O modo passivo foi definido como modo padrão de transferência" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Senha requerida" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:80 +#: ../../locales/../src/interface/search.cpp:151 msgid "Path" msgstr "Caminho" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3173 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2344 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2248 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "O caminho para a pasta %s e a subpasta %s não pode ser construído" -#: ../../locales/../src/interface/Mainfrm.cpp:2440 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 msgid "Path not found:" msgstr "Caminho não encontrado:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 msgid "Paths" msgstr "Caminhos" -#: ../../locales/../src/interface/edithandler.cpp:1145 -#: ../../locales/../src/interface/edithandler.cpp:1288 -#: ../../locales/../src/interface/edithandler.cpp:1387 -#: ../../locales/../src/interface/edithandler.cpp:1400 +#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1249 +#: ../../locales/../src/interface/edithandler.cpp:1339 +#: ../../locales/../src/interface/edithandler.cpp:1349 msgid "Pending removal" msgstr "Remoção pendente" @@ -5558,21 +5734,21 @@ msgid "Permission" msgstr "Permissões" -#: ../../locales/../src/engine/socket.cpp:1115 -#: ../../locales/../src/engine/socket.cpp:1124 +#: ../../locales/../src/engine/socket.cpp:1022 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Permission denied" msgstr "Permissão negada" -#: ../../locales/../src/interface/RemoteListView.cpp:380 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:155 msgid "Permissions" msgstr "Permissões" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 msgid "Platform:" msgstr "Plataforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5588,11 +5764,11 @@ "Configure firewalls e roteadores de modo que o FileZilla possa estabelecer " "conexões para portas arbitrárias." -#: ../../locales/../src/interface/netconfwizard.cpp:629 +#: ../../locales/../src/interface/netconfwizard.cpp:647 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Desative configurações como 'DMZ mode' ou 'Game mode' no seu roteador." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5608,12 +5784,12 @@ msgid "Please enter a custom time format." msgstr "Entre com um formato personalizado para a hora." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:742 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:714 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Entre a data no formato AAAA-MM-DD como, por exemplo, 2010-07-18" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:119 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." @@ -5627,7 +5803,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Entre com um novo nome para o filtro copiado." -#: ../../locales/../src/interface/filter.cpp:408 +#: ../../locales/../src/interface/filter.cpp:390 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Entre com um novo nome para o conjunto de filtros\"%s\"" @@ -5636,19 +5812,19 @@ msgid "Please enter a new name for the filter." msgstr "Entre com um novo nome para o filtro." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 msgid "" "Please enter a number between 0 and 10 for the number of concurrent " "downloads." msgstr "" "Entre com um número entre 0 e 10 para o número de downloads simultâneos." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:113 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 msgid "" "Please enter a number between 0 and 10 for the number of concurrent uploads." msgstr "Entre com um número entre 0 e 10 para o número de envios simultâneos." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:103 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 msgid "" "Please enter a number between 1 and 10 for the number of concurrent " "transfers." @@ -5659,23 +5835,14 @@ msgid "Please enter a password for this server:" msgstr "Entre com uma senha para esse servidor:" -#: ../../locales/../src/interface/QueueView.cpp:2246 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Entre com um caminho e arquivo executável para ser executado.\n" -"P.ex. c:\\caminho\\arquivo.exe no MS Windows ou /caminho/arquivo no Unix.\n" -"Opcionalmente podem ser especificados os argumentos do programa." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" -"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts." +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -"Entre com um limite de tempo entre 5 e 9999 segundos ou 0 para nenhum limite." +"Por favor, indique um tempo limite entre 10 e 9999 segundos ou 0 para " +"desativar o tempo limite." -#: ../../locales/../src/interface/filter.cpp:348 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Entre com um nome único para esse conjunto de filtros" @@ -5683,21 +5850,21 @@ msgid "Please enter a username for this server:" msgstr "Entre com um nome de usuário para esse servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:188 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Entre com um intervalo de portas válido." -#: ../../locales/../src/interface/netconfwizard.cpp:167 +#: ../../locales/../src/interface/netconfwizard.cpp:168 msgid "Please enter an URL where to get your external address from" msgstr "Entre com uma URL onde se possa obter o seu endereço externo." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:126 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Entre com um limite de velocidade de envio maior ou igual a 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:605 +#: ../../locales/../src/interface/Mainfrm.cpp:568 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5705,14 +5872,29 @@ "Entre com um comando FTP bruto.\n" "Usar comandos FTP brutos limpará o cache de pastas." -#: ../../locales/../src/interface/LocalListView.cpp:924 -#: ../../locales/../src/interface/LocalTreeView.cpp:1170 -#: ../../locales/../src/interface/RemoteListView.cpp:1359 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1303 +#: ../../locales/../src/interface/QueueView.cpp:1742 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Por favor, indique o caminho completo de um programa e seus argumentos. Este " +"comando será executado quando a fila concluir o processamento.\n" +"Por exemplo. c:\\caminho\\arquivo.exe em MS Windows ou /caminho/arquivo sob " +"Unix.\n" +"Você precisa citar corretamente os comandos e seus argumentos se eles contêm " +"espaços." + +#: ../../locales/../src/interface/LocalListView.cpp:923 +#: ../../locales/../src/interface/LocalTreeView.cpp:1149 +#: ../../locales/../src/interface/RemoteListView.cpp:1303 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1235 msgid "Please enter the name of the directory which should be created:" msgstr "Entre com o nome da pasta que deve ser criada:" -#: ../../locales/../src/interface/RemoteListView.cpp:2783 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "Insira o nome do arquivo que deve ser criado:" @@ -5720,12 +5902,12 @@ msgid "Please enter username and password for this server:" msgstr "Entre com um nome de usuário e uma senha para esse servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:148 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Entre com o seu endereço IP externo" -#: ../../locales/../src/interface/netconfwizard.cpp:599 -#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5743,7 +5925,7 @@ "Siga as instruções com cuidado, pois configurações erradas resultarão em " "falha nas conexões FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:641 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5752,11 +5934,11 @@ "outros computadores e certifique-se que você entrou com o nome endereço de " "resolução corretamente." -#: ../../locales/../src/interface/FileZilla.cpp:215 +#: ../../locales/../src/interface/FileZilla.cpp:134 msgid "Please make sure the requested locale is installed on your system." msgstr "Certifique-se que o local pedido está instalado no seu sistema." -#: ../../locales/../src/interface/netconfwizard.cpp:600 +#: ../../locales/../src/interface/netconfwizard.cpp:618 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5780,7 +5962,7 @@ "utilizada por cavalos de tróia ou outro tipo de malware. Isto poderá gerar " "um falso alarme que pode ser ignorado com segurança." -#: ../../locales/../src/interface/Mainfrm.cpp:752 +#: ../../locales/../src/interface/Mainfrm.cpp:683 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5796,7 +5978,7 @@ "Note que alguns servidores podem bani-lo se tentar conectar demasiadas vezes " "em intervalos de tempo muito curtos." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:594 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5805,11 +5987,11 @@ "Execute de novo esse assistente se o ambiente de rede for alterado ou em " "caso de encontrar problemas com servidores que anteriormente funcionaram bem." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 msgid "Please select an action:" msgstr "Selecione uma ação:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1645 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Please select the categories you would like to import." msgstr "Selecione as categorias que deseja importar" @@ -5817,30 +5999,30 @@ msgid "Please select the default transfer mode you would like to use." msgstr "Selecione o modo de transferência padrão que deseja usar." -#: ../../locales/../src/interface/chmoddialog.cpp:46 +#: ../../locales/../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." msgstr "Selecione os novos atributos para a pasta \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:38 +#: ../../locales/../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." msgstr "Selecione os novos atributos para o arquivo \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:49 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Selecione os novos atributos para as pastas Selecionadas." -#: ../../locales/../src/interface/chmoddialog.cpp:52 +#: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "Selecione os novos atributos para os arquivos e pastas selecionados." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Selecione os novos atributos para os arquivos selecionados." -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5854,21 +6036,29 @@ "o roteador nos chamados 'DMZ mode' ou 'game mode'. Coisas como inspeção de " "protocolo ou 'fixups' específicos do protocolo têm que ser desativados" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 msgid "Positio&n of the message log:" msgstr "Posição do log de me&nsagens:" -#: ../../locales/../src/interface/verifycertdialog.cpp:189 -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Postal code:" msgstr "Código postal:" -#: ../../locales/../src/interface/sitemanager.cpp:280 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1821 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +msgid "Pre&allocate space before downloading" +msgstr "Pré&Alocar espaço antes de baixar" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +msgid "Preallocation" +msgstr "Pré-alocação" + +#: ../../locales/../src/interface/sitemanager.cpp:337 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1922 msgid "Predefined Sites" msgstr "Sites predefinidos" -#: ../../locales/../src/interface/Mainfrm.cpp:751 +#: ../../locales/../src/interface/Mainfrm.cpp:682 msgid "Preserving file timestamps" msgstr "Preservando data e hora dos arquivos" @@ -5876,7 +6066,7 @@ msgid "Preview:" msgstr "Preview:" -#: ../../locales/../src/engine/tlssocket.cpp:1037 +#: ../../locales/../src/engine/tlssocket.cpp:1191 msgid "Primary connection and data connection certificates don't match." msgstr "" "Os certificados da conexão anterior e da conexão de dados não coincidem." @@ -5890,15 +6080,15 @@ msgid "Print version information to stdout and exit" msgstr "Imprimir informação sobre a versão para o 'stdout' e sair" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1703 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 msgid "Prioritize directories (default)" msgstr "Priorizar pastas (padrão)" -#: ../../locales/../src/interface/queue.cpp:1197 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Priority" msgstr "Prioridade" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5916,74 +6106,83 @@ msgstr "Protoco&lo:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:756 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 msgid "Pro&xy password:" msgstr "Senha do pro&xy" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "Processar &fila" -#: ../../locales/../src/engine/socket.cpp:1120 +#: ../../locales/../src/engine/socket.cpp:1027 msgid "Process file table overflow" msgstr "Overflow de tabela de processo de arquivo" -#: ../../locales/../src/engine/socket.cpp:1125 +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, c-format +msgid "Processed %s in %s." +msgstr "Processado %s em %s." + +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Protocol not supported" msgstr "Protocolo não compatível" -#: ../../locales/../src/engine/socket.cpp:1178 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Protocol not supported on given socket type" msgstr "Protocolo não compatível com tipo de socket especificado" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:199 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:478 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Protocolo:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 msgid "Proxy &port:" msgstr "&Porta do &proxy:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:746 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 msgid "Proxy &user:" msgstr "&Usuário do proxy:" -#: ../../locales/../src/engine/proxy.cpp:473 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Proxy authentication failed" msgstr "A autenticação do proxy falhou" -#: ../../locales/../src/engine/transfersocket.cpp:127 -#: ../../locales/../src/engine/transfersocket.cpp:140 +#: ../../locales/../src/engine/transfersocket.cpp:105 +#: ../../locales/../src/engine/transfersocket.cpp:117 #, c-format msgid "Proxy handshake failed: %s" msgstr "A saudação do proxy falhou: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4339 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4217 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "O domínio proxy começa com '[' mas não foi encontrado o fechar parêntesis." -#: ../../locales/../src/engine/proxy.cpp:322 +#: ../../locales/../src/engine/proxy.cpp:353 #, c-format msgid "Proxy reply: %s" msgstr "Resposta do proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:536 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Pedido do proxy falhou. Resposta do proxy: %s" + +#: ../../locales/../src/engine/proxy.cpp:408 #, c-format msgid "Proxy request failed: %s" msgstr "O pedido de proxy falhou: %s" -#: ../../locales/../src/engine/proxy.cpp:541 +#: ../../locales/../src/engine/proxy.cpp:560 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "O pedido de proxy falhou: tipo do endereço desconhecido na resposta do " "CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4372 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 msgid "Proxy set but proxy host or port invalid" msgstr "" "Configuração do proxy feita mas ou o servidor proxy ou a porta são inválidos" @@ -5992,65 +6191,65 @@ msgid "Public Key Authentication" msgstr "Autenticação por Chave Pública" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:79 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:358 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 msgid "Public key algorithm:" msgstr "Algoritmo da chave pública:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:476 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 msgid "Public permissions" msgstr "Permissões públicas" -#: ../../locales/../src/interface/QueueView.cpp:3218 +#: ../../locales/../src/interface/QueueView.cpp:2613 msgid "Queue has been fully processed" msgstr "A fila foi processada totalmente" -#: ../../locales/../src/interface/statusbar.cpp:426 +#: ../../locales/../src/interface/statusbar.cpp:429 #, c-format msgid "Queue: %s MiB" msgstr "Fila: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:356 +#: ../../locales/../src/interface/statusbar.cpp:366 #, c-format msgid "Queue: %s%s" msgstr "Fila: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:352 -#: ../../locales/../src/interface/statusbar.cpp:417 +#: ../../locales/../src/interface/statusbar.cpp:362 +#: ../../locales/../src/interface/statusbar.cpp:420 msgid "Queue: empty" msgstr "Fila: vazia" -#: ../../locales/../src/interface/QueueView.cpp:465 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Arquivos na fila" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3071 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3284 msgid "Queueing:" msgstr "Enfileirando:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:396 -msgid "R&eboot system" -msgstr "R&einiciar o computador" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" +msgstr "R&einicialize o sistema uma vez" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "Árvore de pastas &remota" #: ../../locales/../src/interface/resources/xrc/menus.xrc:460 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:475 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "R&eset and requeue selected files" msgstr "Limpar &e recolocar arquivos selecionados na fila" -#: ../../locales/../src/interface/Mainfrm.cpp:621 +#: ../../locales/../src/interface/Mainfrm.cpp:582 msgid "Raw FTP command" msgstr "Comando FTP bruto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "Re&ad" msgstr "L&er" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:271 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:315 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Re&fresh" msgstr "A&tualizar" @@ -6058,7 +6257,7 @@ msgid "Re&name" msgstr "Re&nomear" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:600 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6066,7 +6265,7 @@ "Reexecute o assistente e verifique com cuidado as configurações de todos as " "roteadores e firewalls." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Rea&d" msgstr "Le&r" @@ -6074,83 +6273,94 @@ msgid "Read-only" msgstr "Somente leitura" -#: ../../locales/../src/interface/Mainfrm.cpp:1142 +#: ../../locales/../src/interface/Mainfrm.cpp:1020 msgid "Really cancel current operation?" msgstr "Deseja mesmo cancelar a operação atual?" -#: ../../locales/../src/interface/RemoteListView.cpp:1452 -#: ../../locales/../src/interface/search.cpp:774 +#: ../../locales/../src/interface/RemoteListView.cpp:1392 +#: ../../locales/../src/interface/search.cpp:1185 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" "Really delete %d directories with their contents from the server?" msgstr[0] "" -"Deseja realmente excluir o diretório %d e todo o seu conteúdo do servidor?" +"Deseja realmente excluir %d diretório e todo o seu conteúdo do servidor?" msgstr[1] "" -"Deseja realmente excluir os diretórios '%d' e todo o seu conteúdo de seu " -"computador?" +"Deseja realmente excluir %d diretórios e todo o seu conteúdo do servidor?" -#: ../../locales/../src/interface/RemoteListView.cpp:1450 -#: ../../locales/../src/interface/search.cpp:772 +#: ../../locales/../src/interface/RemoteListView.cpp:1390 +#: ../../locales/../src/interface/search.cpp:1183 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" -msgstr[0] "Deseja realmente excluir o arquivo %d do servidor?" -msgstr[1] "Deseja realmente excluir os arquivos %d do servidor?" +msgstr[0] "Deseja realmente excluir %d arquivo do servidor?" +msgstr[1] "Deseja realmente excluir %d arquivos do servidor?" -#: ../../locales/../src/interface/RemoteListView.cpp:1457 -#: ../../locales/../src/interface/search.cpp:779 +#: ../../locales/../src/interface/RemoteListView.cpp:1397 +#: ../../locales/../src/interface/search.cpp:1189 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Deseja realmente excluir %s e %s do servidor?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1119 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1057 msgid "Really delete all selected files and/or directories from the server?" -msgstr "Deseja realmente excluir todos arquivos e/ou diretórios do servidor?" +msgstr "" +"Deseja realmente excluir todos arquivos e/ou diretórios selecionados do " +"servidor?" -#: ../../locales/../src/engine/local_filesys.cpp:134 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" -"Deseja realmente excluir todos arquivos e/ou diretórios selecionados de seu " +"Deseja realmente excluir todos arquivos e/ou diretórios selecionados do seu " "computador?" -#: ../../locales/../src/interface/queue.cpp:1197 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Reason" msgstr "Motivo" -#: ../../locales/../src/interface/QueueView.cpp:3211 +#: ../../locales/../src/interface/QueueView.cpp:2606 msgid "Reboot now" msgstr "Reiniciar agora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:537 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 msgid "Rec&urse into subdirectories" msgstr "Incl&uir subpastas" -#: ../../locales/../src/engine/directorylistingparser.cpp:3056 +#: ../../locales/../src/engine/tlssocket.cpp:278 +#, c-format +msgid "Received TLS alert from the server: %s (%d)" +msgstr "Recebido alerta TLS do servidor: %s (%d)" + +#: ../../locales/../src/engine/directorylistingparser.cpp:2962 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" "Foi recebida uma listagem de diretório que parece ser codificado em EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:2063 -#: ../../locales/../src/engine/directorylistingparser.cpp:2078 +#: ../../locales/../src/engine/directorylistingparser.cpp:1997 +#: ../../locales/../src/engine/directorylistingparser.cpp:2013 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Recebida uma linha com mais de 10000 carateres, cancelando." #: ../../locales/../src/interface/netconfwizard.cpp:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1016 -#: ../../locales/../src/interface/netconfwizard.cpp:1040 +#: ../../locales/../src/interface/netconfwizard.cpp:1015 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Received data tainted" msgstr "Dados recebidos danificados." -#: ../../locales/../src/interface/updater.cpp:490 +#: ../../locales/../src/interface/updater.cpp:555 msgid "Received invalid character in version information" msgstr "Caractere recebido inválido em informação de versão" -#: ../../locales/../src/interface/updater.cpp:483 +#: ../../locales/../src/engine/tlssocket.cpp:281 +#, c-format +msgid "Received unknown TLS alert %d from the server" +msgstr "Recebido alerta TLS desconhecido %d a partir do servidor" + +#: ../../locales/../src/interface/updater.cpp:548 msgid "Received version information is too large" msgstr "Informação da versão recebida é muito comprida" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6163,61 +6373,75 @@ msgid "Reconnection settings" msgstr "Configurações para voltar a conectar" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:61 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 msgid "Reconnects to the last used server" msgstr "Volta a conectar ao último servidor usado" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:660 +#: ../../locales/../src/interface/recursive_operation_status.cpp:101 +msgid "Recursively adding files to queue." +msgstr "Adicionando arquivos recursivamente para a fila." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +msgid "Recursively changing permissions." +msgstr "Alterando permissões recursivamente" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:104 +msgid "Recursively deleting files and directories." +msgstr "Exclusão de arquivos e diretórios de forma recursiva" + +#: ../../locales/../src/interface/sitemanager.cpp:17 +msgid "Red" +msgstr "Vermelho" + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Redirecionado para URI inválido ou não compatível: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:667 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:674 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Redirecionado para endereço inválido ou não compatível: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:40 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 msgid "Refresh the file and folder lists" msgstr "Atualiza as listas de arquivos e de pastas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3821 msgid "Remember passwords?" msgstr "Re&lembrar senhas?" -#: ../../locales/../src/interface/edithandler.cpp:1129 +#: ../../locales/../src/interface/edithandler.cpp:1096 msgid "Remote" msgstr "Remoto" -#: ../../locales/../src/engine/tlssocket.cpp:846 +#: ../../locales/../src/engine/tlssocket.cpp:909 msgid "Remote certificate not trusted." msgstr "O certificado remoto não é de confiança." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2208 -#: ../../locales/../src/interface/queue.cpp:1197 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Remote file" msgstr "Arquivo remoto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 -#: ../../locales/../src/interface/search.cpp:369 -#: ../../locales/../src/interface/search.cpp:375 -#: ../../locales/../src/interface/search.cpp:385 -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3131 +#: ../../locales/../src/interface/search.cpp:660 +#: ../../locales/../src/interface/search.cpp:665 msgid "Remote file search" msgstr "Procura de arquivos remotos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" msgstr "Filtros remotos:" -#: ../../locales/../src/interface/edithandler.cpp:1120 +#: ../../locales/../src/interface/edithandler.cpp:1087 msgid "Remote path" msgstr "Caminho remoto" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:424 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:412 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6226,7 +6450,7 @@ "Não foi possível analisar o caminho remoto. Certifique-se de que é um " "caminho absoluto válido e suportado pelo tipo do servidor atual do site (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6236,130 +6460,130 @@ "caminho absoluto válido e suportado pelo tipo do servidor (%s) selecionado " "no site origem." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:426 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:430 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1090 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Não foi possível analisar o caminho remoto. Certifique-se de que é um " "caminho absoluto válido" -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Não foi possível analisar o caminho local." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3053 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3171 msgid "Remote path handling:" msgstr "Tratando caminho remoto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "Remote path:" msgstr "Caminho remoto:" -#: ../../locales/../src/interface/viewheader.cpp:526 +#: ../../locales/../src/interface/viewheader.cpp:523 msgid "Remote site:" msgstr "Endereço remoto:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:450 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 msgid "Remove &all" msgstr "Remover &todos" #: ../../locales/../src/interface/resources/xrc/menus.xrc:457 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:475 msgid "Remove &selected" msgstr "Remover &selecionados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1437 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1160 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1181 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 msgid "Rename file" msgstr "Renomear arquivo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:510 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Rename selected directory" msgstr "Renomear a pasta selecionada" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Rename selected files and directories" msgstr "Renomear arquivos e pastas selecionadas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3516 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2543 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2447 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Renomeando '%s' para '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3542 msgid "Reporting bugs and feature requests" msgstr "Reportar erros e pedidos de funcionalidades" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:399 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Requisição falhou - cliente não está executando identd (ou não é possível de " "alcançá-lo pelo servidor)" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:402 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Requisição falhou - identd do cliente não pode confirmar a string de ID do " "usuário" -#: ../../locales/../src/engine/proxy.cpp:369 +#: ../../locales/../src/engine/proxy.cpp:396 msgid "Request rejected or failed" msgstr "Requisição foi rejeitada ou falhou" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:517 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:509 msgid "Require explicit FTP over TLS" msgstr "Requer FTP sobre TLS explícito" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:518 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:510 msgid "Require implicit FTP over TLS" msgstr "Requer FTP sobre TLS implícito" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Reset and requeue &all" msgstr "Limp&ar e recolocar todos na fila" -#: ../../locales/../src/engine/socket.cpp:1166 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Resolved protocol is unknown" msgstr "Protocolo resolvido desconhecido" -#: ../../locales/../src/engine/ControlSocket.cpp:1132 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/ControlSocket.cpp:1079 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 #, c-format msgid "Resolving address of %s" msgstr "A resolver o endereço de %s" -#: ../../locales/../src/engine/socket.cpp:1126 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Resource temporarily unavailable" msgstr "Recurso temporariamente desconhecido" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/netconfwizard.cpp:401 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:343 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/netconfwizard.cpp:423 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:345 msgid "Response:" msgstr "Resposta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3117 msgid "Results:" msgstr "Resultados:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1436 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1159 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" msgstr "Continuar transferência de arquivos" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1220 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6367,13 +6591,19 @@ "A continuação de arquivos ASCII pode causar problemas se o servidor usar um " "término de linha diferente da do cliente." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1309 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:983 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1269 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:930 +#, c-format +msgid "Retrieving directory listing of \"%s\"..." +msgstr "Recuperando listagem do diretório de \"%s\"..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:927 msgid "Retrieving directory listing..." msgstr "Obtendo lista de pastas..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3768 +#: ../../locales/../src/interface/netconfwizard.cpp:727 #, c-format msgid "Retrieving external IP address from %s" msgstr "Obtendo endereço IP externo a partir de %s" @@ -6382,91 +6612,87 @@ msgid "S&how files currently being edited..." msgstr "&Mostrar os arquivos que estão sendo editados..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 msgid "S&how the Site Manager on startup" msgstr "M&ostrar o Gerenciador de Sites ao iniciar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:400 -msgid "S&hutdown system" -msgstr "D&esligar o computador" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" +msgstr "Desligar o sistema, uma vez" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2960 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3044 msgid "S&top" msgstr "&Parar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:404 -msgid "S&uspend system" -msgstr "S&uspender sistema" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" +msgstr "S&uspender o sistema, uma vez" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" msgstr "Navegação &sincronizada" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:710 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:140 +#: ../../locales/../src/engine/proxy.cpp:178 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Proxy SOCKS4 vai conectar com: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:855 +#: ../../locales/../src/interface/netconfwizard.cpp:863 msgid "Save settings?" msgstr "Salvar configurações?" -#: ../../locales/../src/interface/manual_transfer.cpp:455 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:961 +#: ../../locales/../src/interface/manual_transfer.cpp:437 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:977 msgid "Saving of password has been disabled by your system administrator." msgstr "O salvamento de senha foi desativado pelo administrador do sistema." -#: ../../locales/../src/interface/manual_transfer.cpp:457 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:963 +#: ../../locales/../src/interface/manual_transfer.cpp:439 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:979 msgid "Saving of passwords has been disabled by you." msgstr "O salvamento de senha foi desativado por você." -#: ../../locales/../src/interface/QueueView.cpp:1827 -msgid "Scanning for files to add to queue" -msgstr "Procurando arquivos para adicionar à fila" - -#: ../../locales/../src/interface/QueueView.cpp:1829 -msgid "Scanning for files to upload" -msgstr "Procurando arquivos para enviar" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3050 msgid "Search &conditions:" msgstr "&Condições para a procura:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3032 msgid "Search &directory:" msgstr "Procurar na &pasta:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:85 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 msgid "Search for files recursively." msgstr "Procurar arquivos novamente." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 msgid "Search server for files" msgstr "Procurar no servidor pelos arquivos" -#: ../../locales/../src/interface/statusbar.cpp:495 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +msgid "Search type:" +msgstr "Tipo de busca:" + +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Security information" msgstr "Informações de segurança" -#: ../../locales/../src/interface/netconfwizard.cpp:570 -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:601 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Veja também: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Sele&ct server" msgstr "Sele&cione o servidor" @@ -6474,17 +6700,17 @@ msgid "Select &page:" msgstr "Selecione a &página:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 msgid "Select Theme" msgstr "Selecione o tema" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Selecione a ação padrão a ser executada se o arquivo já existir no destino." -#: ../../locales/../src/interface/edithandler.cpp:1590 +#: ../../locales/../src/interface/edithandler.cpp:1532 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Selecione o editor padrão" @@ -6505,7 +6731,7 @@ "Selecione a ação padrão se o arquivo já existir no destino somente para os " "arquivos atualmente selecionados na fila." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 msgid "Select file containing private key" msgstr "Selecione arquivo que contém a chave privada" @@ -6514,6 +6740,7 @@ msgstr "Selecione arquivo para os dados exportados" #: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/queue.cpp:1415 msgid "Select file for exported queue" msgstr "Selecione arquivo para a fila exportada" @@ -6522,7 +6749,7 @@ msgstr "Selecione arquivo para exportadar as configurações" #: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 msgid "Select file for exported sites" msgstr "Selecione arquivo para os sites exportados" @@ -6530,112 +6757,112 @@ msgid "Select file to import settings from" msgstr "Selecione arquivo para importar as configurações" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Selecione arquivo para enviar" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" -msgstr "Selecione nome de arquivo para a chave de arquivo convertida" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +msgid "Select filename for converted key file" +msgstr "Escolha um nome para o arquivo chave convertido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2837 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 msgid "Select how these files should be opened." msgstr "Selecione como deverão ser abertos esses arquivos." -#: ../../locales/../src/interface/search.cpp:496 +#: ../../locales/../src/interface/search.cpp:839 msgid "Select target download directory" msgstr "Selecione pasta destino para download" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Selecione nome do arquivo destino" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 msgid "Select the categories to export:" msgstr "Selecione as categorias a serem exportadas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 msgid "Select the private data you would like to delete." msgstr "Selecione os dados privados que deseja apagar." -#: ../../locales/../src/interface/search.cpp:463 +#: ../../locales/../src/interface/search.cpp:798 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Selecionada %d pasta e o seu conteúdo para transferir." msgstr[1] "Selecionadas %d pastas e o seu conteúdo para transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:37 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Selecionada %d pasta." msgstr[1] "Selecionadas %d pastas." -#: ../../locales/../src/interface/search.cpp:461 +#: ../../locales/../src/interface/search.cpp:796 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Selecionado %d arquivo para transferir." msgstr[1] "Selecionados %d arquivos para transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:58 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Selecionado %d arquivo. Tamanho: %s" msgstr[1] "Selecionados %d arquivos. Tamanho: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:56 +#: ../../locales/../src/interface/filelist_statusbar.cpp:41 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Selecionado %d arquivo. Tamanho: No mínimo %s" msgstr[1] "selecionados %d arquivos. Tamanho: No mínimo %s" -#: ../../locales/../src/interface/search.cpp:468 +#: ../../locales/../src/interface/search.cpp:802 #, c-format msgid "Selected %s and %s for transfer." msgstr "Selecionados %s e %s para transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#: ../../locales/../src/interface/filelist_statusbar.cpp:52 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Selecionados %s e %s. Tamanho: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Selecionados %s e %s. Tamanho: No mínimo %s" -#: ../../locales/../src/interface/edithandler.cpp:1531 -#: ../../locales/../src/interface/edithandler.cpp:1610 +#: ../../locales/../src/interface/edithandler.cpp:1477 +#: ../../locales/../src/interface/edithandler.cpp:1551 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "O editor selecionado não existe." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1778 -#: ../../locales/../src/interface/edithandler.cpp:1665 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 msgid "Selected file already being edited" msgstr "O arquivo selecionado já está sendo editado." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 msgid "Selected file is already loaded" msgstr "O arquivo selecionado já está carregado." -#: ../../locales/../src/interface/edithandler.cpp:1659 +#: ../../locales/../src/interface/edithandler.cpp:1649 msgid "Selected file is already opened" msgstr "O arquivo selecionado já está aberto" -#: ../../locales/../src/interface/edithandler.cpp:1693 +#: ../../locales/../src/interface/edithandler.cpp:1721 msgid "Selected file is still being edited" msgstr "O arquivo selecionado ainda está sendo editado" -#: ../../locales/../src/interface/filter.cpp:315 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "O filtro selecionado só funciona para arquivos locais." -#: ../../locales/../src/interface/menu_bar.cpp:315 +#: ../../locales/../src/interface/menu_bar.cpp:291 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6644,7 +6871,7 @@ "servidor.\n" "Use marcadores próprios para esse servidor." -#: ../../locales/../src/engine/engineprivate.cpp:214 +#: ../../locales/../src/engine/engineprivate.cpp:292 msgid "Selected port usually in use by a different protocol." msgstr "A porta selecionada é habitualmente usada por um protocolo diferente." @@ -6652,40 +6879,39 @@ msgid "Send FTP &keep-alive commands" msgstr "Enviar &comandos para manter o FTP ativo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 msgid "Send custom command to the server otherwise not available" msgstr "" "Envia comandos personalizados ao servidor de outro modo não disponíveis" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4453 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4322 msgid "Sending keep-alive command" msgstr "A enviar um comando para manter a atividade" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:69 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:348 -#: ../../locales/../src/interface/verifycertdialog.cpp:193 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Número de série:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:322 msgid "Server &Type:" msgstr "&Tipo de servidor:" -#: ../../locales/../src/engine/tlssocket.cpp:724 +#: ../../locales/../src/engine/tlssocket.cpp:798 msgid "Server did not properly shut down TLS connection" msgstr "O servidor não fechou devidamente a conexão TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:916 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:979 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:887 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:940 msgid "Server does not support non-ASCII characters." msgstr "O servidor não suporta caracteres que não sejam ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4278 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "O servidor não suporta continuação de arquivos > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4274 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4154 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6694,15 +6920,15 @@ "O servidor não suporta continuação de arquivos > %d GB. Terminar a " "transferência se o tamanho dos arquivos for maior." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2527 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2424 msgid "Server does not support resume of files > 2GB." msgstr "O servidor não suporta continuação de arquivos > 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2420 msgid "Server does not support resume of files > 4GB." msgstr "O servidor não suporta continuação de arquivos > 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4289 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4169 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6711,7 +6937,7 @@ "O servidor pode não suportar a continuação de arquivos > %d GB. Terminar a " "transferência se o tamanho dos arquivos for maior." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:858 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:836 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6719,11 +6945,11 @@ "O servidor pode exigir uma conta. Tenter especificar uma conta através do " "Gerenciador de Sites." -#: ../../locales/../src/engine/ControlSocket.cpp:413 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "O servidor enviou um caminho em branco." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:724 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:663 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6731,13 +6957,13 @@ "O servidor enviou um pedido de login adicional. É necessário usar de usar " "login interativo." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3842 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3719 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "O servidor enviou uma resposta passiva com um endereço não roteável. Modo " "passivo falhou." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3836 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6745,55 +6971,54 @@ "O servidor enviou uma resposta passiva com um endereço não roteável. Usando " "o endereço do servidor como alternativa." -#: ../../locales/../src/interface/netconfwizard.cpp:409 -#: ../../locales/../src/interface/netconfwizard.cpp:416 -#: ../../locales/../src/interface/netconfwizard.cpp:455 -#: ../../locales/../src/interface/netconfwizard.cpp:464 -#: ../../locales/../src/interface/netconfwizard.cpp:476 -#: ../../locales/../src/interface/netconfwizard.cpp:500 -#: ../../locales/../src/interface/netconfwizard.cpp:507 -#: ../../locales/../src/interface/netconfwizard.cpp:516 -#: ../../locales/../src/interface/netconfwizard.cpp:527 +#: ../../locales/../src/interface/netconfwizard.cpp:430 +#: ../../locales/../src/interface/netconfwizard.cpp:436 +#: ../../locales/../src/interface/netconfwizard.cpp:471 +#: ../../locales/../src/interface/netconfwizard.cpp:480 +#: ../../locales/../src/interface/netconfwizard.cpp:492 +#: ../../locales/../src/interface/netconfwizard.cpp:515 +#: ../../locales/../src/interface/netconfwizard.cpp:522 +#: ../../locales/../src/interface/netconfwizard.cpp:531 +#: ../../locales/../src/interface/netconfwizard.cpp:542 msgid "Server sent unexpected reply." msgstr "O servidor enviou uma resposta inesperada." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 msgid "Server to client MAC:" msgstr "MAC do servidor para o cliente:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2003 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 msgid "Server to client cipher:" msgstr "Cifra do servidor para o cliente:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2359 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 msgid "Server&type:" msgstr "Tipo de &servidor:" -#: ../../locales/../src/interface/queue.cpp:1197 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Server/Local file" msgstr "Arquivo remoto/local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 msgid "Server:" msgstr "Servidor:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:459 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "Detalhes da sessão" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:351 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "Definir &Prioridade" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2422 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2326 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Definir permissões de '%s' para '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:815 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize chamado sem soquete" @@ -6801,23 +7026,31 @@ msgid "Settings" msgstr "Configurações" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +msgid "Settings directory:" +msgstr "Configurações diretório:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "M&ostrar balão de notificação" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" msgstr "Mostrar &lista bruta de pastas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Show &welcome dialog..." msgstr "&Mostrar a janela de boas-vindas..." -#: ../../locales/../src/interface/Mainfrm.cpp:2330 +#: ../../locales/../src/interface/Mainfrm.cpp:2198 msgid "Show both directory trees and continue comparing?" msgstr "Mostrar ambas as árvores de pastas e continuar a comparação?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:214 msgid "Show details" msgstr "Mostrar detalhes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 msgid "Show details about custom date and time formats" msgstr "Mostrar detalhes sobre formatos personalizados de data e hora" @@ -6829,16 +7062,15 @@ msgid "Shows this help dialog" msgstr "Mostra essa janela de ajuda" -#: ../../locales/../src/interface/QueueView.cpp:3207 +#: ../../locales/../src/interface/QueueView.cpp:2602 msgid "Shutdown now" msgstr "Desconectar o computador" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:368 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 msgid "Signature algorithm:" msgstr "Assinatura do algortimo:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 msgid "Site &Manager entries" msgstr "Entradas do &Gerenciador de Sites" @@ -6846,55 +7078,55 @@ msgid "Site Manager" msgstr "Gerenciador de Sites" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 msgid "Site Manager - Cannot remember password" msgstr "Gerenciador de Sites - Não foi possível relembrar a senha" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:939 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:950 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1031 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1041 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1066 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1091 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1110 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:953 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:966 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1053 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1121 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1130 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1137 msgid "Site Manager - Invalid data" msgstr "Gerenciador de Sites - Dados Inválidos" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:317 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "Gerenciador de Sites já aberto" -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:456 -#: ../../locales/../src/interface/sitemanager.cpp:470 -#: ../../locales/../src/interface/sitemanager.cpp:541 -#: ../../locales/../src/interface/sitemanager.cpp:736 -#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager.cpp:481 +#: ../../locales/../src/interface/sitemanager.cpp:508 +#: ../../locales/../src/interface/sitemanager.cpp:522 +#: ../../locales/../src/interface/sitemanager.cpp:534 +#: ../../locales/../src/interface/sitemanager.cpp:688 +#: ../../locales/../src/interface/sitemanager.cpp:765 msgid "Site does not exist." msgstr "O site não existe." -#: ../../locales/../src/interface/sitemanager.cpp:425 +#: ../../locales/../src/interface/sitemanager.cpp:491 msgid "Site path has to begin with 0 or 1." msgstr "O caminho do site tem que começar com 0 ou 1." -#: ../../locales/../src/interface/sitemanager.cpp:463 -#: ../../locales/../src/interface/sitemanager.cpp:559 -#: ../../locales/../src/interface/sitemanager.cpp:729 -#: ../../locales/../src/interface/sitemanager.cpp:810 +#: ../../locales/../src/interface/sitemanager.cpp:528 +#: ../../locales/../src/interface/sitemanager.cpp:682 +#: ../../locales/../src/interface/sitemanager.cpp:759 msgid "Site path is malformed." msgstr "O caminho para o site está incorreto." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 msgid "Site-specific bookmarks" msgstr "Marcadores próprios dos sites" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:526 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6904,62 +7136,62 @@ "Gerenciador de Sites.\n" "Adicionar a conexão atual ao Gerenciador de Sites?" -#: ../../locales/../src/interface/queue.cpp:1197 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Size" msgstr "Tamanho" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1572 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 msgid "Size formatting" msgstr "Formato do tamanho" -#: ../../locales/../src/interface/fileexistsdlg.cpp:41 +#: ../../locales/../src/interface/fileexistsdlg.cpp:43 msgid "Size unknown" msgstr "Tamanho desconhecido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1415 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1438 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1161 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1182 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "Pular arquivo" -#: ../../locales/../src/engine/ControlSocket.cpp:1203 -#: ../../locales/../src/engine/ControlSocket.cpp:1220 -#: ../../locales/../src/engine/ControlSocket.cpp:1244 -#: ../../locales/../src/engine/ControlSocket.cpp:1305 +#: ../../locales/../src/engine/ControlSocket.cpp:1151 +#: ../../locales/../src/engine/ControlSocket.cpp:1168 +#: ../../locales/../src/engine/ControlSocket.cpp:1192 +#: ../../locales/../src/engine/ControlSocket.cpp:1252 #, c-format msgid "Skipping download of %s" msgstr "Pulando a transferência de %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1207 -#: ../../locales/../src/engine/ControlSocket.cpp:1223 -#: ../../locales/../src/engine/ControlSocket.cpp:1248 -#: ../../locales/../src/engine/ControlSocket.cpp:1309 +#: ../../locales/../src/engine/ControlSocket.cpp:1155 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 +#: ../../locales/../src/engine/ControlSocket.cpp:1196 +#: ../../locales/../src/engine/ControlSocket.cpp:1256 #, c-format msgid "Skipping upload of %s" msgstr "Pulando o envio de %s" -#: ../../locales/../src/engine/socket.cpp:1130 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Socket address outside address space" msgstr "Endereço de socket fora do espaço do endereço" -#: ../../locales/../src/engine/socket.cpp:1132 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Socket already connected" msgstr "Socket já conectado" -#: ../../locales/../src/engine/socket.cpp:1140 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket has been shut down" msgstr "Socket foi desligado" -#: ../../locales/../src/engine/socket.cpp:1137 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Socket not connected" msgstr "Socket não conectado" -#: ../../locales/../src/engine/socket.cpp:1179 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Socket type not supported for address family" msgstr "Tipo de socket não compatível com família de endereços" -#: ../../locales/../src/interface/Mainfrm.cpp:1277 +#: ../../locales/../src/interface/Mainfrm.cpp:1150 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Alguns arquivos ainda estão sendo editados ou precisam de ser enviados." @@ -6973,27 +7205,27 @@ "Alguns servidores mal configurados que estão atrás de um roteador podem " "responder com o endereço IP local deles." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1705 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 msgid "Sort directories inline" msgstr "Ordenar as pastas em linha" -#: ../../locales/../src/interface/filelistctrl.cpp:460 +#: ../../locales/../src/interface/filelistctrl.cpp:469 msgid "Sort order cannot be changed if comparing directories." msgstr "A ordenação não pode ser alterada se estiver comparando pastas." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1689 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 msgid "Sorting" msgstr "Ordenação" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 msgid "Sorting &mode:" msgstr "&Modo de ordenação:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:104 msgid "Source and path of the drop operation are identical" msgstr "O caminho e a fonte da operação 'soltar' são idênticos" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "O arquivo original e o de destino podem não ser os mesmos" @@ -7005,37 +7237,37 @@ msgid "Source file:" msgstr "Arquivo de origem:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3546 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3763 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 msgid "Speed Limits" msgstr "Limites de velocidade" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:873 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 msgid "Speed limits" msgstr "Limites de velocidade" -#: ../../locales/../src/interface/statusbar.cpp:561 +#: ../../locales/../src/interface/statusbar.cpp:575 msgid "Speed limits are disabled, click to change." msgstr "Limites de velocidade estão desativados, clique aqui para modificar." -#: ../../locales/../src/interface/statusbar.cpp:565 +#: ../../locales/../src/interface/statusbar.cpp:578 msgid "Speed limits are enabled, click to change." msgstr "Limites de velocidade estão ativados, clique aqui para modificar." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 msgid "Stable and beta versions" msgstr "Versões beta e estável" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2037 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 msgid "Stable versions only" msgstr "Apenas versões estáveis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 msgid "Stable, beta and nightly versions" msgstr "Versão estável, beta e noturna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 msgid "Start transfer &immediately" msgstr "Começar a transferência &imediatamente" @@ -7043,19 +7275,19 @@ msgid "Start with opened Site Manager" msgstr "Começar com o Gerenciador de Sites aberto" -#: ../../locales/../src/interface/updater.cpp:207 +#: ../../locales/../src/interface/updater.cpp:240 #, c-format msgid "Started update check on %s\n" msgstr "Iniciada a verificação de atualização em %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2144 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1592 #, c-format msgid "Starting download of %s" msgstr "Iniciando a transferência de %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2232 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1641 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1595 #, c-format msgid "Starting upload of %s" msgstr "Iniciando o envio de %s" @@ -7064,31 +7296,34 @@ msgid "Starts the local site in the given path" msgstr "Iniciar o site local no caminho dado" -#: ../../locales/../src/interface/verifycertdialog.cpp:187 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "Estado ou província:" -#: ../../locales/../src/interface/edithandler.cpp:1121 -#: ../../locales/../src/interface/queue.cpp:1197 +#: ../../locales/../src/interface/edithandler.cpp:1088 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Status" msgstr "Status" -#: ../../locales/../src/engine/logging.cpp:108 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:367 +#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:369 msgid "Status:" msgstr "Estado:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "Parar e remover &todos" -#: ../../locales/../src/interface/verifycertdialog.cpp:191 +#: ../../locales/../src/interface/recursive_operation_status.cpp:42 +msgid "Stop recursive operation" +msgstr "Parar operação recursiva" + +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Rua:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:130 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:409 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" msgstr "Objeto do certificado" @@ -7100,11 +7335,11 @@ msgid "Summary of test results:" msgstr "Sumário dos resultados do teste:" -#: ../../locales/../src/interface/QueueView.cpp:3215 +#: ../../locales/../src/interface/QueueView.cpp:2610 msgid "Suspend now" msgstr "Suspender agora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3365 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7112,28 +7347,29 @@ "Atalhos simbólicos a arquivos não são afetadas por essa opção, tais atalhos " "são sempre apagados." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 -#: ../../locales/../src/interface/state.cpp:249 -#: ../../locales/../src/interface/state.cpp:278 -#: ../../locales/../src/interface/state.cpp:285 -#: ../../locales/../src/interface/state.cpp:297 -#: ../../locales/../src/interface/state.cpp:388 -#: ../../locales/../src/interface/state.cpp:396 -#: ../../locales/../src/interface/state.cpp:404 -#: ../../locales/../src/interface/state.cpp:985 -#: ../../locales/../src/interface/state.cpp:994 -#: ../../locales/../src/interface/state.cpp:1001 -#: ../../locales/../src/interface/state.cpp:1012 -#: ../../locales/../src/interface/state.cpp:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 +#: ../../locales/../src/interface/state.cpp:232 +#: ../../locales/../src/interface/state.cpp:246 +#: ../../locales/../src/interface/state.cpp:252 +#: ../../locales/../src/interface/state.cpp:262 +#: ../../locales/../src/interface/state.cpp:349 +#: ../../locales/../src/interface/state.cpp:357 +#: ../../locales/../src/interface/state.cpp:365 +#: ../../locales/../src/interface/state.cpp:954 +#: ../../locales/../src/interface/state.cpp:962 +#: ../../locales/../src/interface/state.cpp:968 +#: ../../locales/../src/interface/state.cpp:977 +#: ../../locales/../src/interface/state.cpp:1003 msgid "Synchronized browsing" msgstr "Navegação sincronizada" -#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:364 msgid "Synchronized browsing has been disabled." msgstr "A navegação sincronizada foi desativada." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:123 +#: ../../locales/../src/interface/quickconnectbar.cpp:84 +#: ../../locales/../src/interface/quickconnectbar.cpp:121 msgid "Syntax error" msgstr "Erro de sintaxe" @@ -7142,8 +7378,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2442 -#: ../../locales/../src/interface/Mainfrm.cpp:2489 +#: ../../locales/../src/interface/Mainfrm.cpp:2310 +#: ../../locales/../src/interface/Mainfrm.cpp:2352 msgid "Syntax error in command line" msgstr "Erro de sintaxe na linha de comandos" @@ -7151,11 +7387,15 @@ msgid "System" msgstr "Sistema" -#: ../../locales/../src/engine/socket.cpp:1121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +msgid "System details" +msgstr "Detalhes do sistema" + +#: ../../locales/../src/engine/socket.cpp:1028 msgid "System limit of open files exceeded" msgstr "Limite de arquivos abertos no sistema excedido" -#: ../../locales/../src/engine/socket.cpp:1177 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "System's network subsystem has failed" msgstr "Subsistema de rede do sistema falhou" @@ -7163,19 +7403,19 @@ msgid "T&oolbar" msgstr "Barra de F&erramentas" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:311 -msgid "TLS/SSL connection established, sending HTTP request" -msgstr "Conexão TLS/SSL estabelecida, a enviar o pedido HTTP" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:394 -msgid "TLS/SSL connection established, waiting for welcome message..." -msgstr "Conexão TLS/SSL estabelecida, à espera da mensagem de boas-vindas..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:398 -msgid "TLS/SSL connection established." -msgstr "Conexão TLS/SSL estabelecida." +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +msgid "TLS connection established, sending HTTP request" +msgstr "Conexão TLS estabelecida, enviando o pedido HTTP" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:401 +msgid "TLS connection established, waiting for welcome message..." +msgstr "Conexão TLS estabelecida, aguardando a mensagem de boas-vindas..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +msgid "TLS connection established." +msgstr "Conexão TLS estabelecida." -#: ../../locales/../src/engine/proxy.cpp:503 +#: ../../locales/../src/engine/proxy.cpp:523 msgid "TTL expired" msgstr "TTL expirado" @@ -7187,28 +7427,38 @@ msgid "Target file:" msgstr "Arquivo destino:" -#: ../../locales/../src/interface/RemoteListView.cpp:2817 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "O arquivo já existe no destino!" -#: ../../locales/../src/interface/RemoteListView.cpp:1671 +#: ../../locales/../src/interface/RemoteListView.cpp:1606 msgid "Target filename already exists, really continue?" msgstr "" "O nome do arquivo já existe no destino, tem a certeza que quer continuar?" -#: ../../locales/../src/engine/socket.cpp:1150 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Temporary failure in name resolution" msgstr "Falha temporária em resolução de nome" +#: ../../locales/../src/interface/netconfwizard.cpp:590 +msgid "Test finished successfully" +msgstr "Teste concluído com êxito" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Resultados do teste" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4295 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4175 msgid "Testing resume capabilities of server" msgstr "Testando as capacidades de continuação de arquivos do servidor" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:316 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:737 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "" +"O Administrador do Site não pode ser usado a menos que o arquivo seja " +"reparado." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7217,7 +7467,7 @@ "O Gerenciador de Sites está aberto em outra instância do FileZilla 3.\n" "Deseja continuar? Alterações ao Gerenciador de Sites não serão salvas." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7225,34 +7475,29 @@ "O Gerenciador de Sites está aberto em outra instância do FileZilla 3.\n" "Feche-o ou os dados não serão apagados." -#: ../../locales/../src/interface/xmlfunctions.cpp:386 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "O código do documento XML não está correto: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:624 +#: ../../locales/../src/interface/netconfwizard.cpp:642 #, c-format msgid "The address you entered was: %s" msgstr "O endereço que você introduziu foi: %s" -#: ../../locales/../src/engine/socket.cpp:1156 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "The ai_family member is not supported" msgstr "O membro ai_family não é compatível" -#: ../../locales/../src/engine/socket.cpp:1169 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "The ai_socktype member is not supported" msgstr "O membro ai_socktype não é compatível" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:808 -#: ../../locales/../src/interface/sitemanager.cpp:716 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:779 +#: ../../locales/../src/interface/sitemanager.cpp:670 msgid "The bookmark could not be added." msgstr "Não foi possível salvar o marcador." -#: ../../locales/../src/interface/sitemanager.cpp:798 +#: ../../locales/../src/interface/sitemanager.cpp:747 msgid "The bookmarks could not be cleared." msgstr "Não foi possível limpar os marcadores." -#: ../../locales/../src/interface/statusbar.cpp:454 +#: ../../locales/../src/interface/statusbar.cpp:464 msgid "The connection is encrypted. Click icon for details." msgstr "A conexão está encriptada. Clique no ícone para mais detalhes." @@ -7274,17 +7519,17 @@ "O formato personalizado de hora é inválido ou contém especificadores de " "formato não compatíveis." -#: ../../locales/../src/engine/transfersocket.cpp:164 +#: ../../locales/../src/engine/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "A conexão de dados não pode ser estabalecida: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2855 -#: ../../locales/../src/interface/edithandler.cpp:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/edithandler.cpp:1512 msgid "The default editor for text files could not be found." msgstr "Não foi encontrado o editor para os arquivos de texto." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2848 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "O editor para os arquivos de texto é o '%s'." @@ -7296,13 +7541,13 @@ msgstr "" "O nome de filtro inserido já existe, por favor escolha um nome diferente." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "A extensão '%s' já existe na lista" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:244 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:251 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 #, c-format msgid "" "The file %s already exists.\n" @@ -7311,8 +7556,8 @@ "O arquivo %s já existe.\n" "Entre com um novo nome:" -#: ../../locales/../src/interface/edithandler.cpp:1636 -#: ../../locales/../src/interface/LocalListView.cpp:1774 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1731 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7323,20 +7568,29 @@ "Não foi encontrado o programa associado (%s).\n" "Verifique as associações dos tipos de arquivos." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"O arquivo '%s' contém uma chave SSH 1. O protocolo SSH1 foi preterido, " +"FileZilla suporta apenas chaves SSH2." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" "Não foi possível carregar o arquivo '%s' ou esse não contém uma chave " "privada." -#: ../../locales/../src/interface/xmlfunctions.cpp:40 +#: ../../locales/../src/interface/xmlfunctions.cpp:42 #, c-format msgid "The file '%s' could not be loaded." msgstr "Não foi possível carregar o arquivo '%s'." -#: ../../locales/../src/interface/edithandler.cpp:1631 -#: ../../locales/../src/interface/LocalListView.cpp:1770 +#: ../../locales/../src/interface/edithandler.cpp:1617 +#: ../../locales/../src/interface/LocalListView.cpp:1727 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7345,8 +7599,8 @@ "Não foi possível abrir o arquivo '%s':\n" "Nenhum programa está associado no seu sistema a esse tipo de arquivo." -#: ../../locales/../src/interface/edithandler.cpp:1706 -#: ../../locales/../src/interface/LocalListView.cpp:1782 +#: ../../locales/../src/interface/edithandler.cpp:1734 +#: ../../locales/../src/interface/LocalListView.cpp:1739 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7355,20 +7609,20 @@ "Não foi possível abrir o arquivo '%s':\n" "O comando associado falhou" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../../locales/../src/interface/import.cpp:57 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:744 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" msgstr "" -"O arquivo '%s' não está num formato suportado pelo FileZilla.\n" -"O arquivo também é protegido por senha. arquivos protegidos por senha ainda " -"não são suportados pelo FileZilla.\n" -"Gostaria de o converter para um formato desprotegido e suportado?" +"O arquivo '%s' foi criado por uma versão mais recente do FileZilla.\n" +"Carregar arquivos criados por versões mais recentes pode resultar em perda " +"de dados.\n" +"Você deseja continuar?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7377,22 +7631,11 @@ "O arquivo '%s' não está num formato suportado pelo FileZilla.\n" "Gostaria de o converter para um formato suportado?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"O arquivo '%s' é protegido por senha. arquivos protegidos por senha ainda " -"não são suportados pelo FileZilla.\n" -"Gostaria de o converter para um arquivo desprotegido?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "O arquivo selecionado como editor padrão não existe." -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:86 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7406,11 +7649,11 @@ "senha serão importados.\n" "Continuar com a importação?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "A coluna do nome de arquivos não pode ser oculta nem movida." -#: ../../locales/../src/interface/listctrlex.cpp:806 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "A coluna do nome dos arquivos não pode ser oculta." @@ -7424,19 +7667,19 @@ msgid "The following characters will be replaced: %s" msgstr "Os seguintes caracteres serão substituídos: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 msgid "The following files are currently being edited:" msgstr "Os arquivos seguintes estão sendo editados:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3420 msgid "The free open source FTP solution" msgstr "A solução FTP de código aberto gratuita" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:294 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:281 msgid "The global bookmarks could not be saved." msgstr "Não foi possível salvar os marcadores globais." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2231 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7450,7 +7693,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "O limite tem que ser entre 1 e 2000 MiB." -#: ../../locales/../src/interface/state.cpp:275 +#: ../../locales/../src/interface/state.cpp:1003 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "O diretório local '%s' não pode ser criado." + +#: ../../locales/../src/interface/state.cpp:988 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "O diretório local '%s' não existe." + +#: ../../locales/../src/interface/state.cpp:243 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7460,7 +7713,7 @@ "Desativar a navegação sincronizada e continuar com as alterações na pasta " "local?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7475,11 +7728,16 @@ msgid "The new version has been saved in your Downloads directory." msgstr "A nova versão foi salva na sua pasta de Downloads." -#: ../../locales/../src/interface/QueueView.cpp:1954 +#: ../../locales/../src/interface/QueueView.cpp:1452 msgid "The queue will not be saved." msgstr "A fila não será salva." -#: ../../locales/../src/interface/state.cpp:991 +#: ../../locales/../src/interface/state.cpp:916 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "O diretório remoto '%s' não existe." + +#: ../../locales/../src/interface/state.cpp:959 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7489,45 +7747,46 @@ "Desativar a navegação sincronizada e continuar com as alterações na pasta " "remota?" -#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/import.cpp:76 msgid "The selected categories have been imported." msgstr "As categorias Selecionadas foram importadas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "O arquivo selecionado contém dados importáveis para as seguintes categorias." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1785 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 msgid "The selected file is already being edited:" msgstr "O arquivo selecionado já está sendo editado:" -#: ../../locales/../src/interface/edithandler.cpp:1693 +#: ../../locales/../src/interface/edithandler.cpp:1721 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "O arquivo selecionado ainda está aberto em outro programa, por favor feche-o." -#: ../../locales/../src/interface/edithandler.cpp:1641 +#: ../../locales/../src/interface/edithandler.cpp:1627 msgid "" "The selected file would be executed directly.\n" -"This can be dangerous and damage your system.\n" +"This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" "O arquivo selecionado será executado diretamente.\n" "Isto pode ser perigoso e danificar o seu sistema.\n" -"Quer mesmo continuar?" +"Você realmente deseja continuar?" -#: ../../locales/../src/interface/sitemanager.cpp:607 +#: ../../locales/../src/interface/sitemanager.cpp:573 msgid "The server could not be added." msgstr "Não foi possível adicionar o servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "The server sent an unexpected or unrecognized reply." msgstr "O servidor enviou uma resposta inesperada ou não reconhecida." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "The server uses following charset encoding for filenames:" msgstr "" "O servidor utiliza o seguinte mapa de caracteres para os nomes de arquivo:" @@ -7558,11 +7817,11 @@ "A chave do servidor host é desconhecida. Não tem garantias que o servidor é " "o computador que pensa que é." -#: ../../locales/../src/engine/socket.cpp:1168 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "The servname parameter is not supported for ai_socktype" msgstr "O parâmetro servname não é compatível com ai_socktype" -#: ../../locales/../src/interface/import.cpp:63 +#: ../../locales/../src/interface/import.cpp:73 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7570,19 +7829,19 @@ "As configurações foram importadas. Tem de reiniciar o FileZilla para que " "todas as configurações produzam efeito." -#: ../../locales/../src/engine/socket.cpp:1117 +#: ../../locales/../src/engine/socket.cpp:1024 msgid "The specified address family is not supported" msgstr "A famílida de endereços especificada não é compatível" -#: ../../locales/../src/engine/socket.cpp:1181 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "The specified network name is no longer available" msgstr "O nome da rede especificada não está mais disponível" -#: ../../locales/../src/interface/QueueView.cpp:3210 +#: ../../locales/../src/interface/QueueView.cpp:2605 msgid "The system will soon reboot unless you click Cancel." msgstr "O sistema irá reiniciar em breve a não ser que clique em Cancelar." -#: ../../locales/../src/interface/QueueView.cpp:3206 +#: ../../locales/../src/interface/QueueView.cpp:2601 msgid "The system will soon shut down unless you click Cancel." msgstr "O sistema irá desligar em breve a não ser que clique em Cancelar." @@ -7594,28 +7853,28 @@ "O arquivo já existe.\n" "Escolha uma ação." -#: ../../locales/../src/interface/netconfwizard.cpp:855 +#: ../../locales/../src/interface/netconfwizard.cpp:863 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "O teste não foi bem sucedido. Quer mesmo salvar as configurações?" -#: ../../locales/../src/interface/xmlfunctions.cpp:76 +#: ../../locales/../src/interface/xmlfunctions.cpp:78 #, c-format msgid "The valid backup file %s could not be restored" msgstr "O arquivo válido de backup %s não pode ser restaurado" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Temas" -#: ../../locales/../src/interface/filter.cpp:467 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Esse conjunto de filtros não pode ser removido." -#: ../../locales/../src/interface/filter.cpp:402 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Esse conjunto de filtros não pode ser renomeado." -#: ../../locales/../src/interface/netconfwizard.cpp:581 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7639,11 +7898,11 @@ "Esse assistente irá ajudá-lo a configurar corretamente qualquer roteador ou " "firewall que você tenha e testar essa configuração." -#: ../../locales/../src/interface/queue.cpp:1197 +#: ../../locales/../src/interface/queue.cpp:1150 msgid "Time" msgstr "Hora" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 msgid "Time formatting" msgstr "Formato da hora" @@ -7652,31 +7911,26 @@ msgstr "Time&out, em segundos:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/QueueView.cpp:1056 -#: ../../locales/../src/interface/QueueView.cpp:1098 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Timeout" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1700 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1106 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1618 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1038 #, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Fusos horários: Servidor: %d segundos. Local %d segundos. Diferença: %d " -"segundos." +msgid "Timezone offset of server is %d seconds." +msgstr "Fuso horário do servidor é de %d segundos." -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Título:" -#: ../../locales/../src/interface/Mainfrm.cpp:2328 +#: ../../locales/../src/interface/Mainfrm.cpp:2196 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Para comparar pastas, ambas as listas de arquivos têm que estar alinhadas." -#: ../../locales/../src/interface/Mainfrm.cpp:2329 +#: ../../locales/../src/interface/Mainfrm.cpp:2197 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Para fazer isso, as árvores de pastas têm que estar ambas visíveis ou ambas " @@ -7690,7 +7944,7 @@ "Para suportar autenticação por chave pública, o FileZilla precisa saber que " "chaves privadas usar." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7707,7 +7961,7 @@ "Verde: O arquivo é mais recente do que aquele não marcado do outro lado\n" "Vermelho: Tamanhos de arquivo diferentes" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:80 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7717,51 +7971,51 @@ "Se ativada, ao navegar na pasta local também mudará a pasta correspondente " "no servidor e vice-versa." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:45 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 msgid "Toggles processing of the transfer queue" msgstr "Inicia ou pára a fila de transferência" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:21 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:23 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 msgid "Toggles the display of the local directory tree" msgstr "Mostra ou oculta a árvore de pastas locais" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:15 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:17 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 msgid "Toggles the display of the message log" msgstr "Mostra ou oculta o log de mensagens" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:27 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:29 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 msgid "Toggles the display of the remote directory tree" msgstr "Mostra ou oculta a árvore de pastas remotas" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:33 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:35 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 msgid "Toggles the display of the transfer queue" msgstr "Mostra ou oculta a fila de transferência" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Linha de cabeçalho longa demais" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:651 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Muitos redirecionamentos" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:353 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:355 msgid "Trace:" msgstr "Traçar:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1792 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1812 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 msgid "Transfer" msgstr "Transferência" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 msgid "Transfer &direction" msgstr "&Direção da transferência" @@ -7773,51 +8027,50 @@ msgid "Transfer Mode" msgstr "Modo de transferência" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1379 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Transfer Queue" msgstr "Fila de transferência" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "Transfer Settings" msgstr "Configurações de transferência" -#: ../../locales/../src/engine/transfersocket.cpp:484 -#: ../../locales/../src/engine/transfersocket.cpp:506 +#: ../../locales/../src/engine/transfersocket.cpp:443 +#: ../../locales/../src/engine/transfersocket.cpp:465 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Transferência interrompida: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Transferred data got tainted." msgstr "Os dados transferidos foram danificados." -#: ../../locales/../src/interface/QueueView.cpp:1479 -#: ../../locales/../src/interface/statuslinectrl.cpp:244 +#: ../../locales/../src/interface/queue.cpp:339 +#: ../../locales/../src/interface/statuslinectrl.cpp:245 msgid "Transferring" msgstr "Transferindo" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 msgid "Transfers" msgstr "Transferências" -#: ../../locales/../src/interface/QueueView.cpp:3106 -#: ../../locales/../src/interface/QueueView.cpp:3109 +#: ../../locales/../src/interface/QueueView.cpp:2494 msgid "Transfers finished" msgstr "Transferências completadas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1103 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 msgid "Treat files &without extension as ASCII file" msgstr "Tratar arquivos sem e&xtensão como arquivos ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 msgid "Treat the &following filetypes as ASCII files:" msgstr "Tratar os se&guintes tipos de arquivo como arquivos ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:901 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:834 msgid "Trust changed Hostkey:" msgstr "Confiar na chave de host alterada:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:899 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 msgid "Trust new Hostkey:" msgstr "Confiar na chave de host nova:" @@ -7825,7 +8078,7 @@ msgid "Trust the new key and carry on connecting?" msgstr "Confiar na nova chave e continuar a conexão?" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:246 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" msgstr "Confiar nesse certificado e continuar a conexão?" @@ -7834,12 +8087,12 @@ msgstr "Confiar nesse host e continuar a conexão?" #: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:201 msgid "Try again" msgstr "Tente de novo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2528 -#: ../../locales/../src/interface/edithandler.cpp:1119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 +#: ../../locales/../src/interface/edithandler.cpp:1086 msgid "Type" msgstr "Tipo" @@ -7847,52 +8100,52 @@ msgid "Type of FTP Proxy:" msgstr "Tipo de Proxy FTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:695 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 msgid "Type of generic proxy:" msgstr "Tipo de proxy genérico:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 msgid "U&pload" msgstr "E&nviar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3487 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3704 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Limite de u&pload:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 msgid "U&se filetype associations if available" msgstr "U&sar as associações dos tipos de arquivos, se disponíveis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1515 -msgid "U&se system defaults" -msgstr "&Usar o padrão do sistema" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +msgid "U&se system defaults for current language" +msgstr "U&se padrões do sistema para o idioma atual." #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "USUÁRIO@&HOST" -#: ../../locales/../src/engine/proxy.cpp:378 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:405 +#: ../../locales/../src/engine/proxy.cpp:532 #, c-format msgid "Unassigned error code %d" msgstr "Código de erro não atribuído %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:184 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Unidade:" -#: ../../locales/../src/interface/edithandler.cpp:1151 -#: ../../locales/../src/interface/edithandler.cpp:1179 +#: ../../locales/../src/interface/edithandler.cpp:1118 +#: ../../locales/../src/interface/edithandler.cpp:1146 msgid "Unknown" msgstr "Desconhecido" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:694 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:682 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Tipo de proxy FTP desconhecido, não é possivel gerar a sequência de login." -#: ../../locales/../src/engine/proxy.cpp:428 +#: ../../locales/../src/engine/proxy.cpp:453 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versão do protocolo SOCKS desconhecida: %d" @@ -7901,20 +8154,11 @@ msgid "Unknown certificate" msgstr "Certificado desconhecido" -#: ../../locales/../src/interface/xmlfunctions.cpp:377 -#: ../../locales/../src/interface/xmlfunctions.cpp:389 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" -"Erro desconhecido ao abrir o arquivo. Certifique-se que o arquivo pode ser " -"acedido e de que é um documento XML correcto." - #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "Chave de host desconhecida" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:461 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7923,14 +8167,14 @@ "Versão do protocolo da autenticação de nome de usuário / senha de SOCKS " "desconhecida: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:417 +#: ../../locales/../src/interface/xmlfunctions.cpp:304 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Elemento desconhecido, o arquivo não parece ter sido gerado pelo FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:602 -#: ../../locales/../src/interface/netconfwizard.cpp:613 +#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7938,7 +8182,7 @@ "A não ser que esses problemas sejam corrigidos, o modo ativo de FTP não " "funcionará e o modo passivo terá de ser usado." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:607 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7946,114 +8190,119 @@ "A não ser que esse problema seja corrigido, o modo ativo de FTP não " "funcionará e o modo passivo terá de ser usado." -#: ../../locales/../src/engine/tlssocket.cpp:1001 +#: ../../locales/../src/engine/tlssocket.cpp:1153 msgid "Unsupported certificate type" msgstr "Tipo de certificado não suportado" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Redirecionamento não suportado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1877 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "Up&load and unedit" msgstr "En&viar sem editar" #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:113 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 msgid "Updates" msgstr "Atualizações" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Upload" msgstr "Enviar" -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1109 msgid "Upload failed" msgstr "Envio falhou" -#: ../../locales/../src/interface/statusbar.cpp:573 +#: ../../locales/../src/interface/statusbar.cpp:586 #, c-format msgid "Upload limit: %s/s" msgstr "Limite de upload: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:588 msgid "Upload limit: none" msgstr "Limite de upload: nenhum" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3236 +#: ../../locales/../src/interface/search.cpp:865 +msgid "Upload search results" +msgstr "Enviar os resultados da procura" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "Upload selected directory" msgstr "Enviar pasta selecionada" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:241 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 msgid "Upload selected files and directories" msgstr "Enviar os arquivos e pastas selecionados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Upload this file back to the server?" msgstr "Enviar esse arquivo de volta ao servidor?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1739 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 msgid "Upload this file to the server?" msgstr "Enviar esse arquivo para o servidor?" -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1170 -#: ../../locales/../src/interface/edithandler.cpp:1335 +#: ../../locales/../src/interface/edithandler.cpp:1103 +#: ../../locales/../src/interface/edithandler.cpp:1137 +#: ../../locales/../src/interface/edithandler.cpp:1293 msgid "Uploading" msgstr "Enviando" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1337 +#: ../../locales/../src/interface/edithandler.cpp:1106 +#: ../../locales/../src/interface/edithandler.cpp:1295 msgid "Uploading and pending removal" msgstr "Enviando e remoção pendente" -#: ../../locales/../src/interface/edithandler.cpp:1173 -#: ../../locales/../src/interface/edithandler.cpp:1339 +#: ../../locales/../src/interface/edithandler.cpp:1140 +#: ../../locales/../src/interface/edithandler.cpp:1297 msgid "Uploading and unediting" msgstr "Enviando e a terminando a edição" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:558 msgid "Use &custom charset" msgstr "Usar um mapa de caracteres personali&zado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1887 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Use &custom editor:" msgstr "Usar um editor &personalizado:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "Usar o &editor padrão para arquivos de texto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2632 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Usar a navegação &sincronizada" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:467 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:546 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Usa UTF-8 se o servidor o suportar, senão usa o mapa de caracteres local." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 msgid "Use default action" msgstr "Usar ação padrão" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 -msgid "Use plain FTP" -msgstr "Usar FTP simples" +#: ../../locales/../src/interface/sitemanager_dialog.cpp:508 +msgid "Use explicit FTP over TLS if available" +msgstr "Use FTP explícito sobre TLS se disponível" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 msgid "Use server currently connected to" msgstr "Usar o servidor conectado atualmente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 msgid "Use server from site manager" msgstr "Usar um servidor do Gerenciador de Sites" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1466 -msgid "Use system &defaults" -msgstr "Usar o pa&drão do sistema" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +msgid "Use system &defaults for current language" +msgstr "Usar padrões &do sistema para linguagem corrente" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8086,21 +8335,16 @@ "primeira vez. Somente a versão do FileZilla que está sendo usadar será " "submetida ao servidor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:302 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 msgid "User:" msgstr "Usuário:" -#: ../../locales/../src/interface/manual_transfer.cpp:518 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1031 +#: ../../locales/../src/interface/manual_transfer.cpp:495 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 msgid "Username cannot be a series of spaces" msgstr "O nome de usuário não pode ser uma série de espaços" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4377 -#, c-format -msgid "Using proxy %s" -msgstr "Usando o proxy %s" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:507 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:586 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8108,98 +8352,58 @@ "não sejam mostrados corretamente." #: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:328 msgid "Valid from:" msgstr "Válido desde:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:59 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:338 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" msgstr "Válido até:" #: ../../locales/../src/interface/cmdline.cpp:17 msgid "Verbose log messages from wxWidgets" -msgstr "Mensagens de entrada verbosas a partir de wxWidgets" +msgstr "Mensagens de registro detalhadas a partir de wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1073 +#: ../../locales/../src/engine/tlssocket.cpp:1203 msgid "Verifying certificate..." msgstr "Verificando certificado..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 -msgid "Version:" -msgstr "Versão" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "Muito alta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1437 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1388 msgid "View hidden option set, but unsupported by server" msgstr "Ver conjunto de opções oculto, mas não suportado pelo servidor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 msgid "View/Edit" msgstr "Ver/Editar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 msgid "Visible columns" msgstr "Colunas visíveis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "W&rite" msgstr "G&ravar" -#: ../../locales/../src/interface/QueueView.cpp:1786 -msgid "Waiting" -msgstr "Aguardando" - -#: ../../locales/../src/interface/QueueView.cpp:1382 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Aguardando conexão do navegador" -#: ../../locales/../src/interface/QueueView.cpp:1429 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Aguardando a senha" -#: ../../locales/../src/interface/statuslinectrl.cpp:238 +#: ../../locales/../src/interface/statuslinectrl.cpp:239 msgid "Waiting for transfer to be cancelled" msgstr "Aguardando a transferência ser cancelada" -#: ../../locales/../src/engine/engineprivate.cpp:152 +#: ../../locales/../src/engine/engineprivate.cpp:230 msgid "Waiting to retry..." msgstr "Aguardando para tentar novamente..." -#: ../../locales/../src/interface/FileZilla.cpp:319 -msgid "" -"Warning!\n" -"\n" -"A bug in Windows causes problems with FileZilla\n" -"\n" -"The bug occurs if you have\n" -"- Windows Server 2003 or XP 64\n" -"- Windows Firewall enabled\n" -"- Application Layer Gateway service enabled\n" -"See http://support.microsoft.com/kb/931130 for background information.\n" -"\n" -"Unless you either disable Windows Firewall or the Application Layer Gateway " -"service,\n" -"FileZilla will timeout on big transfers." -msgstr "" -"Aviso!\n" -"\n" -"Um erro no Windows causa problemas com o FileZilla\n" -"\n" -"O erro ocorre se você tiver:\n" -"- O Windows Server 2003 ou o XP 64\n" -"- O firewall do Windows ativado\n" -"- O 'Serviço de gateway de camada de aplicação' ativado\n" -"Veja o site http://support.microsoft.com/kb/931130 para outras informações.\n" -"\n" -"A não ser que o Firewall do Windows ou o 'Serviço de gateway de camada de " -"aplicação' sejam desligados,\n" -"o FileZilla entrará em espera em grandes transferências." - -#: ../../locales/../src/interface/netconfwizard.cpp:975 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Warning, ignoring data connection from wrong IP." msgstr "Aviso, ignorando a conexão de um IP errado." @@ -8222,11 +8426,11 @@ msgid "Warning: Potential security breach!" msgstr "Aviso: Possível quebra de segurança!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3371 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "Welcome to FileZilla" msgstr "Bem-vindo ao FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3237 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3450 msgid "What's new" msgstr "Novidades" @@ -8234,7 +8438,7 @@ msgid "What's new:" msgstr "Novidades:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3561 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3778 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8242,7 +8446,7 @@ "Ao permitir que o FileZilla relembre senhas, você pode se reconectar sem ter " "que reintroduzir uma senha depois de reiniciar o FileZilla." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:977 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8251,36 +8455,40 @@ "operacional local nos nomes de arquivos são substituídos se fizer o download " "do arquivo." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1343 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 msgid "When st&arting a new connection while already connected:" msgstr "Começar um&a nova conexão quando já estiver conectado:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1255 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 msgid "Widescreen" msgstr "Tela panorâmica" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3773 msgid "Would you like FileZilla to remember passwords?" msgstr "Você gostaria que o FileZilla relembre senhas?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Wr&ite" msgstr "Gra&var" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:446 +#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:463 msgid "Wrong external IP address" msgstr "Endereço de IP externo incorreto" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:799 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Fins de linha incorretos" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:913 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "Amarelo" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 msgid "Yes" msgstr "Sim" -#: ../../locales/../src/interface/netconfwizard.cpp:774 +#: ../../locales/../src/interface/netconfwizard.cpp:783 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8288,24 +8496,24 @@ "Parece que você está usando apenas um domínio IPv6. Este assistente não " "suporta esse ambiente." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:245 msgid "You are using the latest version of FileZilla." msgstr "Você está usando a última versão do FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3559 msgid "You can always open this dialog again through the help menu." msgstr "Pode sempre voltar a abrir essa janela a partir do menu de ajuda." #: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "You can download the latest version from the FileZilla website:" msgstr "Você pode baixar a última versão do website do FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:66 msgid "You can leave the port field empty to use the default port." msgstr "Você pode manter o campo de Portas vazio para utilizar a porta padrão." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8319,7 +8527,7 @@ "Você não pode importar as configurações da própria pasta de configurações do " "FileZilla." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:145 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 msgid "" "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." @@ -8327,26 +8535,25 @@ "Um caracter inválido por pode ser substituído por outro caracter inválido. " "Entre com um caracter que seja permitido em nomes de arquivos." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:266 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "Você não entrou com um novo nome para o arquivo. Substituir o arquivo " "existente?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3125 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "You have selected at least one symbolic link." msgstr "Você selecionou pelo menos um atalho simbólico." -#: ../../locales/../src/interface/LocalListView.cpp:1687 -#: ../../locales/../src/interface/RemoteListView.cpp:2383 -#: ../../locales/../src/interface/search.cpp:737 +#: ../../locales/../src/interface/edithandler.cpp:1588 +#: ../../locales/../src/interface/search.cpp:1149 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" "Você selecionou mais de 10 arquivos para edição, deseja mesmo continuar?" -#: ../../locales/../src/interface/LocalListView.cpp:1740 +#: ../../locales/../src/interface/LocalListView.cpp:1697 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8354,35 +8561,43 @@ "Você selecionou mais de 10 arquivos ou pastas para serem abertos, deseja " "mesmo continuar?" -#: ../../locales/../src/interface/manual_transfer.cpp:433 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:939 +#: ../../locales/../src/interface/manual_transfer.cpp:415 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:953 msgid "You have to enter a hostname." -msgstr "É necessário entrar com um nome de host." +msgstr "É necessário informar um nome de host." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 +msgid "You have to enter a key file path" +msgstr "Você tem que informar um caminho para o arquivo chave" -#: ../../locales/../src/interface/search.cpp:508 +#: ../../locales/../src/interface/search.cpp:851 msgid "You have to enter a local directory." -msgstr "É necessário entrar com uma pasta local." +msgstr "É necessário informar uma pasta local." -#: ../../locales/../src/interface/netconfwizard.cpp:155 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "É necessário entrar com um endereço IP válido." +#: ../../locales/../src/interface/search.cpp:865 +msgid "You have to enter a remote directory." +msgstr "É necessário informar uma pasta remota." + +#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "Você tem que informar um endereço IPv4 válido." -#: ../../locales/../src/interface/search.cpp:514 +#: ../../locales/../src/interface/search.cpp:856 msgid "You have to enter a writable local directory." -msgstr "É necessário entrar com uma pasta local com permissão de escrita." +msgstr "É necessário informar uma pasta local com permissão de escrita." -#: ../../locales/../src/interface/manual_transfer.cpp:529 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1041 +#: ../../locales/../src/interface/manual_transfer.cpp:506 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1053 msgid "You have to enter an account name" -msgstr "É necessário entrar com um nome de conta" +msgstr "É necessário informar um nome de conta" -#: ../../locales/../src/interface/manual_transfer.cpp:499 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 +#: ../../locales/../src/interface/manual_transfer.cpp:480 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 msgid "You have to specify a user name" -msgstr "É necessário entrar com um nome de usuário" +msgstr "É necessário informar um nome de usuário" -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8392,77 +8607,76 @@ #: ../../locales/../src/interface/bookmarks_dialog.cpp:56 msgid "You need to enter a name for the bookmark." -msgstr "É necessário entrar com um nome para o marcador." +msgstr "É necessário informar um nome para o marcador." #: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 msgid "You need to enter a name for the log file." -msgstr "É necessário entrar com um nome para o arquivo de log." +msgstr "É necessário informar um nome para o arquivo de log." -#: ../../locales/../src/interface/edithandler.cpp:1526 +#: ../../locales/../src/interface/edithandler.cpp:1473 msgid "You need to enter a properly quoted command." -msgstr "É necessário entrar com um comando entre aspas." +msgstr "É necessário informar um comando entre aspas." #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 msgid "You need to enter a proxy host." -msgstr "É necessário entrar com um host de proxy." +msgstr "É necessário informar um host de proxy." #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 msgid "You need to enter a proxy port in the range from 1 to 65535" -msgstr "" -"É necessário entrar com uma porta do proxy do intervalo entre 1 e 65535" +msgstr "É necessário informar uma porta do proxy no intervalo entre 1 e 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:440 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:427 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1130 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" -"É necessário entrar com pelo menos um caminho, não são suportados marcadores " +"É necessário informar pelo menos um caminho; não são suportados marcadores " "vazios." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1110 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:433 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1137 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "" -"É necessário entrar com ambos os caminhos, local e remoto, para permitir a " +"É necessário informar ambos os caminhos, local e remoto, para permitir a " "navegação sincronizada para esse marcador." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1066 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "" -"É necessário entrar com ambos os caminhos, local e remoto, para permitir a " +"É necessário informar ambos os caminhos, local e remoto, para permitir a " "navegação sincronizada para esse site." -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." -msgstr "É necessário entrar com um arquivo local." +msgstr "É necessário informar um arquivo local." -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." -msgstr "É necessário entrar com um arquivo remoto." +msgstr "É necessário informar um arquivo remoto." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." -msgstr "É necessário entrar com um caminho remoto." +msgstr "É necessário informar um caminho remoto." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." -msgstr "É necessário entrar com um servidor." +msgstr "É necessário informar um servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:574 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "" -"Não deve haver problemas em conectar outros servidores, as transferências de " +"Não deve haver problemas em conectar outros servidores; as transferências de " "arquivos devem funcionar normalmente." -#: ../../locales/../src/interface/QueueView.cpp:3214 +#: ../../locales/../src/interface/QueueView.cpp:2609 msgid "Your computer will suspend unless you click Cancel." msgstr "" "Seu computador entrará em modo de suspensão a menos que você clique em " @@ -8481,7 +8695,7 @@ msgstr "começa com" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 msgid "bytes" msgstr "bytes" @@ -8489,13 +8703,13 @@ msgid "contains" msgstr "contém" -#: ../../locales/../src/interface/updater.cpp:211 +#: ../../locales/../src/interface/updater.cpp:244 msgid "custom" msgstr "personalizado" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "does not contain" -msgstr "não contêm" +msgstr "não contém" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 @@ -8511,19 +8725,19 @@ msgid "equals" msgstr "é igual a" -#: ../../locales/../src/interface/filelistctrl.cpp:525 -#: ../../locales/../src/interface/filelistctrl.cpp:544 -#: ../../locales/../src/interface/filelistctrl.cpp:571 -#: ../../locales/../src/interface/filelistctrl.cpp:587 +#: ../../locales/../src/interface/filelistctrl.cpp:534 +#: ../../locales/../src/interface/filelistctrl.cpp:553 +#: ../../locales/../src/interface/filelistctrl.cpp:580 +#: ../../locales/../src/interface/filelistctrl.cpp:596 msgid "file" msgstr "arquivo" -#: ../../locales/../src/interface/edithandler.cpp:85 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:94 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:116 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8533,11 +8747,15 @@ "Certifique-se que esse executável existe na mesma pasta de programa do " "FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1565 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:455 +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "fzsftp pertence a uma versão diferente do FileZilla" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1519 msgid "fzsftp could not be started" msgstr "fzsftp não pôde ser iniciado" -#: ../../locales/../src/engine/tlssocket.cpp:1028 +#: ../../locales/../src/engine/tlssocket.cpp:1182 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "" "o módulo gnutls_certificate_get_peers não retornou qualquer certificado" @@ -8558,7 +8776,7 @@ msgid "group writeable" msgstr "grupo de gravação" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1560 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" @@ -8594,10 +8812,11 @@ msgid "owner writeable" msgstr "proprietário para gravação" -#: ../../locales/../src/engine/tlssocket.cpp:1084 -#: ../../locales/../src/engine/tlssocket.cpp:1095 -#: ../../locales/../src/engine/tlssocket.cpp:1110 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29 +#: ../../locales/../src/engine/proxy.cpp:97 +#: ../../locales/../src/engine/tlssocket.cpp:1246 +#: ../../locales/../src/engine/tlssocket.cpp:1257 +#: ../../locales/../src/engine/tlssocket.cpp:1272 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 msgid "unknown" msgstr "desconhecido" @@ -8613,10 +8832,181 @@ msgid "world writeable" msgstr "gravação global" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "%d files added to queue" +#~ msgstr "%d arquivos adicionados à fila" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Procurando arquivos para adicionar à fila" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Procurando arquivos para enviar" + +#~ msgid "Waiting" +#~ msgstr "Aguardando" + +#~ msgid "&Crash" +#~ msgstr "&Abortar" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Desconectar do servidor" + +#~ msgid "&Show message" +#~ msgstr "Mo&strar mensagem" + +#~ msgid "" +#~ "A file with that name is already being edited. Do you want to reopen '%s'?" +#~ msgstr "Um arquivo com esse nome já está sendo editado. Quer reabrir '%s'?" + +#~ msgid "" +#~ "Any changes made in the Site Manager will not be saved unless you repair " +#~ "the file." +#~ msgstr "" +#~ "Alterações no Gerenciador de Sites não serão salvas a não ser que se " +#~ "repare o arquivo." + +#~ msgid "Benchmark string coalescer" +#~ msgstr "Benchmark do aglutinador de strings" + +#~ msgid "Cannot compare directories, not connected to a server." +#~ msgstr "Não é possível comparar pastas, não conectado a um servidor." + +#~ msgid "Certificate details" +#~ msgstr "Detalhes do certificado" + +#~ msgid "Clear &Site Manager entries" +#~ msgstr "Limpar as entradas do Gerenciador de &Sites" + +#~ msgid "Clear &transfer queue" +#~ msgstr "Limpar fila de &transferência" + +#~ msgid "Clear string coalescer" +#~ msgstr "Limpar aglutinador de strings" + +#~ msgid "Connected" +#~ msgstr "Conectado" + +#~ msgid "Connection timed out" +#~ msgstr "A conexão excedeu limite de tempo" + +#~ msgid "" +#~ "Crashes FileZilla instantly. Only used to debug the exception handler" +#~ msgstr "" +#~ "Encerra o Filezilla abruptamente. Usado somente para fins de depuração de " +#~ "erros." + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "A opção 'apagar múltiplas pastas não relacionadas' ainda não é suportada" + +#~ msgid "Do ¬hing" +#~ msgstr "Não &fazer nada" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "A opção 'Baixar múltiplas pastas não relacionadas' ainda não é suportada" + +#~ msgid "Downloading search results" +#~ msgstr "Baixando os resultados da procura" + +#~ msgid "" +#~ "Filename may not contain any of the following characters: / \\ : * ? \" < " +#~ "> |" +#~ msgstr "" +#~ "O nome do arquivo não pode conter nenhum dos seguintes caracteres: / \\ : " +#~ "* ? \" < > |" + +#~ msgid "Fingerprint (MD5):" +#~ msgstr "Impressão digital (MD5):" + +#~ msgid "No more files in the queue!" +#~ msgstr "Não há mais arquivos na fila!" + +#~ msgid "Operating system problem detected" +#~ msgstr "Foi detectado um problema no sistema operational" + +#~ msgid "The XML document is not well-formed: %s" +#~ msgstr "O código do documento XML não está correto: %s" + +#~ msgid "" +#~ "The file '%s' is not in a format supported by FileZilla.\n" +#~ "The file is also password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into a supported, unprotected format?" +#~ msgstr "" +#~ "O arquivo '%s' não está num formato suportado pelo FileZilla.\n" +#~ "O arquivo também é protegido por senha. arquivos protegidos por senha " +#~ "ainda não são suportados pelo FileZilla.\n" +#~ "Gostaria de o converter para um formato desprotegido e suportado?" + +#~ msgid "" +#~ "The file '%s' is password protected. Password protected keyfiles are not " +#~ "supported by FileZilla yet.\n" +#~ "Would you like to convert it into an unprotected file?" +#~ msgstr "" +#~ "O arquivo '%s' é protegido por senha. arquivos protegidos por senha ainda " +#~ "não são suportados pelo FileZilla.\n" +#~ "Gostaria de o converter para um arquivo desprotegido?" + +#~ msgid "" +#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " +#~ "seconds." +#~ msgstr "" +#~ "Fusos horários: Servidor: %d segundos. Local %d segundos. Diferença: %d " +#~ "segundos." + +#~ msgid "U&se system defaults" +#~ msgstr "&Usar o padrão do sistema" + +#~ msgid "" +#~ "Unknown error opening the file. Make sure the file can be accessed and is " +#~ "a well-formed XML document." +#~ msgstr "" +#~ "Erro desconhecido ao abrir o arquivo. Certifique-se que o arquivo pode " +#~ "ser acedido e de que é um documento XML correcto." + +#~ msgid "Use plain FTP" +#~ msgstr "Usar FTP simples" + +#~ msgid "Use system &defaults" +#~ msgstr "Usar o pa&drão do sistema" + +#~ msgid "Using proxy %s" +#~ msgstr "Usando o proxy %s" + +#~ msgid "" +#~ "Warning!\n" +#~ "\n" +#~ "A bug in Windows causes problems with FileZilla\n" +#~ "\n" +#~ "The bug occurs if you have\n" +#~ "- Windows Server 2003 or XP 64\n" +#~ "- Windows Firewall enabled\n" +#~ "- Application Layer Gateway service enabled\n" +#~ "See http://support.microsoft.com/kb/931130 for background information.\n" +#~ "\n" +#~ "Unless you either disable Windows Firewall or the Application Layer " +#~ "Gateway service,\n" +#~ "FileZilla will timeout on big transfers." +#~ msgstr "" +#~ "Aviso!\n" +#~ "\n" +#~ "Um erro no Windows causa problemas com o FileZilla\n" +#~ "\n" +#~ "O erro ocorre se você tiver:\n" +#~ "- O Windows Server 2003 ou o XP 64\n" +#~ "- O firewall do Windows ativado\n" +#~ "- O 'Serviço de gateway de camada de aplicação' ativado\n" +#~ "Veja o site http://support.microsoft.com/kb/931130 para outras " +#~ "informações.\n" +#~ "\n" +#~ "A não ser que o Firewall do Windows ou o 'Serviço de gateway de camada de " +#~ "aplicação' sejam desligados,\n" +#~ "o FileZilla entrará em espera em grandes transferências." + #~ msgid "%s bytes" #~ msgstr "%s bytes" diff -Nru filezilla-3.15.0.2/locales/pt_PT.po filezilla-3.33.0/locales/pt_PT.po --- filezilla-3.15.0.2/locales/pt_PT.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/pt_PT.po 2017-09-19 21:36:39.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: FileZilla 3 pt\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-12 10:26+0100\n" -"PO-Revision-Date: 2015-11-11 00:23-0000\n" -"Last-Translator: Inácio Barroso \n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-01-06 16:14+0100\n" +"PO-Revision-Date: 2017-01-04 12:23+0000\n" +"Last-Translator: Vítor\n" "Language-Team: enVide neFelibata \n" "Language: pt_PT\n" "MIME-Version: 1.0\n" @@ -16,19 +16,25 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.9\n" +"X-Generator: Poedit 1.8.11\n" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:114 +msgid "" +"\n" +"\n" +msgstr "" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:203 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S decorrido" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:209 msgid "%H:%M:%S left" -msgstr "%H:%M:%S restante" +msgstr "%H:%M:%S left" #: ../../locales/../src/interface/resources/xrc/settings.xrc:524 #, c-format @@ -39,55 +45,50 @@ "%a - Conta (As linhas que contenham isto serão omitidas ao não usar o tipo " "de início de sessão Conta)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" -msgstr[0] "%d diretório" -msgstr[1] "%d diretórios" +msgstr[0] "%d pasta" +msgstr[1] "%d pastas" -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/search.cpp:478 -#: ../../locales/../src/interface/search.cpp:764 +#: ../../locales/../src/interface/RemoteListView.cpp:1419 +#: ../../locales/../src/interface/search.cpp:818 +#: ../../locales/../src/interface/search.cpp:1198 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d pasta com o seu conteúdo" msgstr[1] "%d pastas com o seu conteúdo" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1389 -#: ../../locales/../src/interface/search.cpp:477 -#: ../../locales/../src/interface/search.cpp:763 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:817 +#: ../../locales/../src/interface/search.cpp:1197 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d ficheiro" msgstr[1] "%d ficheiros" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d ficheiro. Tamanho: %s" msgstr[1] "%d ficheiros. Tamanho: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d ficheiro. Tamanho: No mínimo %s" msgstr[1] "%d ficheiros. Tamanho: No mínimo %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 -#, c-format -msgid "%d files added to queue" -msgstr "%d ficheiros adicionados à lista" - -#: ../../locales/../src/engine/ControlSocket.cpp:104 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -98,14 +99,14 @@ msgid "%h - Host" msgstr "%h - Servidor" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu pasta" msgstr[1] "%llu pastas" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -117,22 +118,22 @@ msgid "%p - Password" msgstr "%p - Palavra-passe" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:164 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:167 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certificado expirou!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ainda não é válido!" @@ -142,24 +143,24 @@ msgid "%s - Proxy user" msgstr "%s - Utilizador proxy" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s e %s. Tamanho: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s e %s. Tamanho: No mínimo %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s bytes" -#: ../../locales/../src/interface/FileZilla.cpp:595 +#: ../../locales/../src/interface/FileZilla.cpp:588 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -174,7 +175,7 @@ "Por favor, descarregue o FileZilla novamente. Se este problema persistir, " "por favor reporte este erro." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:673 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -192,7 +193,7 @@ "pastas do sistema.\n" "- Indique o caminho completo para o %s na lista do FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s com %d bits" @@ -206,7 +207,7 @@ msgid "%w - Proxy password" msgstr "%w - Palavra-passe do Proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3678 msgid "&Abort previous connection and connect in current tab" msgstr "&Abortar a ligação anterior e ligar no separador actual" @@ -214,14 +215,14 @@ msgid "&About..." msgstr "&Sobre ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "&Conta:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:473 msgid "&Active" msgstr "&Activo" @@ -238,12 +239,12 @@ msgid "&Add key file..." msgstr "&Adicionar ficheiro chave ..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "&Add to queue" msgstr "&Adicionar à lista" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:402 msgid "&Adjust server timezone offset:" msgstr "&Ajustar a diferença do fuso horário do servidor:" @@ -251,19 +252,19 @@ msgid "&Always trust certificate in future sessions." msgstr "&Confiar sempre neste certificado em sessões futuras." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:896 msgid "&Always trust this host, add this key to the cache" msgstr "&Confiar sempre neste servidor, adicionar esta chave ao cofre" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1969 msgid "&Always use default editor" msgstr "&Utilizar sempre o editor predefinido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3015 msgid "&Always use selection for unassociated files" msgstr "&Utilizar sempre a selecção para ficheiros não associados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Utilizar sempre esta acção" @@ -272,22 +273,26 @@ msgstr "&Pedir ao sistema operativo pelo endereço IP externo" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Automático" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Autodetect" msgstr "&Auto-detectar" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:273 +msgid "&Background color:" +msgstr "Cor de &fundo:" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:604 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Binário" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1632 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "A usar símbolos SI nos prefixos &binários. (p.ex. 1 KB = 1024 bytes)." @@ -295,14 +300,14 @@ msgid "&Bookmarks" msgstr "&Marcadores" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2311 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2720 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3002 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2156 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:362 msgid "&Browse..." msgstr "&Explorar ..." @@ -310,10 +315,10 @@ msgid "&Burst tolerance:" msgstr "&Tolerância à falha" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3861 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -327,11 +332,11 @@ msgid "&Close" msgstr "&Fechar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "&Sair do FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "&Configure speed limits..." msgstr "&Configurar os limites de velocidade..." @@ -339,7 +344,7 @@ msgid "&Configure..." msgstr "&Configurar..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:614 msgid "&Connect" msgstr "&Ligar" @@ -347,36 +352,36 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Copiar a ligação actual para o Gestor de Sítios..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:794 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "&Copiar para a área de transferência" #: ../../locales/../src/interface/resources/xrc/menus.xrc:264 #: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "&Create directory" msgstr "&Criar pasta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:630 msgid "&Create new tab" msgstr "&Criar novo separador" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "&Corrigir erros" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "&Debug information in message log:" msgstr "&Informações sobre a correcção de erros na janela de mensagens:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Default editor:" msgstr "&Editor predefinido:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "&Acções ..." @@ -384,16 +389,16 @@ msgid "&Delay between failed login attempts:" msgstr "&Tempo de espera entre tentativas de início de sessão falhadas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1249 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2887 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Apagar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3407 msgid "&Delete symlink" msgstr "&Apagar a ligação simbólica" @@ -401,21 +406,21 @@ msgid "&Directory comparison" msgstr "&Comparação de pastas" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:963 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Desligar a navegação sincronizada e continuar com as alterações na pasta " "local" -#: ../../locales/../src/interface/state.cpp:966 +#: ../../locales/../src/interface/state.cpp:1041 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Desligar a navegação sincronizada e continuar com as alterações na pasta " "remota" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 msgid "&Discard local file then download and edit file anew" msgstr "" "&Descartar o ficheiro local e depois transferir e editar um ficheiro novo" @@ -424,21 +429,17 @@ msgid "&Disconnect" msgstr "&Desligar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Desligar do servidor" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "" "&Mostrar a velocidade de transferência temporária em vez da velocidade " "teórica" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "&Display size in bytes" msgstr "&Mostrar o tamanho em bytes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3844 msgid "&Do not remember passwords (recommended)" msgstr "&Não lembrar as palavras-passe (recomendado)" @@ -450,24 +451,24 @@ msgid "&Don't use external IP address on local connections." msgstr "&Não usar o endereço IP externo em ligações locais." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1826 msgid "&Double-click action on files:" msgstr "Acção para o clique &duplo nos ficheiros:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "&Download" msgstr "&Transferir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 msgid "&Download to:" msgstr "&Transferir para:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:610 msgid "&Download..." msgstr "&Transferir ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Descargas:" @@ -477,14 +478,14 @@ msgid "&Edit" msgstr "&Editar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 msgid "&Edit filter rules..." msgstr "&Editar regras dos filtros ..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:646 msgid "&Enable" msgstr "&Activar" @@ -492,12 +493,12 @@ msgid "&Enable compression" msgstr "&Activar compressão" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3733 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "&Autorizar os limites de velocidade" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:560 msgid "&Encoding:" msgstr "&Codificação:" @@ -505,24 +506,24 @@ msgid "&Encryption:" msgstr "&Encriptação:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "&Indique um comando personalizado ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3671 msgid "&Establish connection in a new tab" msgstr "&Ligar num novo separador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Execute" msgstr "&Executar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1585 msgid "&Export Site Manager entries" msgstr "&Exportar as Entradas do Gestor de Sítios" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 msgid "&Export..." msgstr "&Exportar ..." @@ -534,35 +535,48 @@ msgid "&File" msgstr "&Ficheiro" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "&File Attributes..." msgstr "&Atributos do ficheiro ..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "Permissões do &ficheiro ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2299 msgid "&File:" msgstr "&Ficheiro:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1296 msgid "&Filter conditions:" msgstr "Condições para os &filtros:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1057 msgid "&Filter sets:" msgstr "&Conjuntos de filtros:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1660 +#, fuzzy +msgid "&Filters" +msgstr "&Filtros:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 msgid "&Filters:" msgstr "&Filtros:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1773 msgid "&Finish editing and delete local file" msgstr "&A terminar de editar e a apagar o ficheiro local." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3332 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Unir os caminhos locais, transferir todos os ficheiros directamente para a " +"pasta indicada" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3237 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -570,7 +584,7 @@ "&Unir os caminhos remotos, transferir todos os ficheiros directamente para a " "pasta indicada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3414 msgid "&Follow symlink, delete target directory contents" msgstr "&Seguir a ligação simbólica, apagar o conteúdo da pasta indicada" @@ -582,7 +596,7 @@ msgid "&Getting help..." msgstr "&Obter ajuda ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2651 msgid "&Global bookmark" msgstr "&Marcador Universal" @@ -595,11 +609,11 @@ msgstr "&Ajuda" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:550 msgid "&Hide identical files" msgstr "&Esconder ficheiros idênticos" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "&Maior" @@ -607,17 +621,17 @@ msgid "&Highest available port:" msgstr "&Porta maior disponível:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2446 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:51 msgid "&Host:" msgstr "&Servidor:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1627 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&Prefixos binários IEC (p.ex. 1 KiB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1513 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (exemplo: 2007-09-15)" @@ -625,15 +639,19 @@ msgid "&Import..." msgstr "&Importar ..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2002 msgid "&Inherit system's filetype associations" msgstr "&Associações dos tipos de ficheiro do sistema" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Instalar a nova versão" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3325 +msgid "&Keep local path structure relative to search root" +msgstr "&Manter a estrutura de caminhos local relativa à raiz de procura" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3230 msgid "&Keep remote path structure relative to search root" msgstr "&Manter a estrutura remota de caminhos relativa à raiz de procura" @@ -649,20 +667,24 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Limitar as portas locais usadas pelo FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "&Limit number of simultaneous connections" msgstr "&Limitar o número de ligações simultâneas" #: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Local directory tree" -msgstr "&Árvore de ficheiros local" +msgstr "&Árvore de pasta local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2705 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2795 msgid "&Local directory:" msgstr "Pasta &local:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +msgid "&Local search" +msgstr "Procura &local" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "&Log to file" msgstr "&Ligar ao ficheiro" @@ -670,11 +692,11 @@ msgid "&Logon Type:" msgstr "&Tipo de início de sessão:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2501 msgid "&Logontype:" msgstr "&Tipo de início de sessão:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "&Baixo" @@ -686,7 +708,7 @@ msgid "&Manual transfer..." msgstr "Transferência &manual ..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:499 msgid "&Maximum number of connections:" msgstr "&Número máximo de ligações:" @@ -702,11 +724,11 @@ msgid "&Minimize to tray" msgstr "&Minimizar para a Barra de Ferramentas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "&Name sorting mode:" msgstr "Modo de ordenação por &nome:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2678 msgid "&Name:" msgstr "&Nome:" @@ -714,7 +736,7 @@ msgid "&Network configuration wizard..." msgstr "&Assistente de configuração de rede ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1243 msgid "&New" msgstr "&Novo" @@ -722,7 +744,7 @@ msgid "&New Site" msgstr "&Novo Sítio" -#: ../../locales/../src/interface/Mainfrm.cpp:1663 +#: ../../locales/../src/interface/Mainfrm.cpp:1671 msgid "&New version available!" msgstr "&Nova versão disponível!" @@ -730,27 +752,28 @@ msgid "&Next >" msgstr "&Próximo >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1786 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 msgid "&No" msgstr "&Não" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 #: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&Nenhum" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&Normal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:501 msgid "&Numeric value:" msgstr "&Valor numérico:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2936 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:622 msgid "&OK" msgstr "&OK" @@ -759,29 +782,29 @@ msgstr "&ABRIR" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 msgid "&Open" msgstr "&Abrir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Substituir" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:480 msgid "&Passive" msgstr "&Passivo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Palavra-passe:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "&Reproduzir som" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:64 msgid "&Port:" msgstr "&Porta:" @@ -789,11 +812,11 @@ msgid "&Preserve timestamps of transferred files" msgstr "&Preservar a data e a hora dos ficheiros transferidos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 msgid "&Queue" msgstr "&Lista" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:72 msgid "&Quickconnect" msgstr "&Ligação rápida" @@ -801,11 +824,11 @@ msgid "&Quickconnect bar" msgstr "&Barra de ligação rápida" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1518 msgid "&Quickconnect history" msgstr "Histórico de ligações &rápidas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:403 msgid "&Read" msgstr "&Ler" @@ -813,32 +836,36 @@ msgid "&Reconnect" msgstr "&Voltar a ligar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1525 msgid "&Reconnect information" msgstr "&Informação de retoma da ligação" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:641 msgid "&Refresh" msgstr "&Actualizar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:354 msgid "&Remember password until FileZilla is closed" msgstr "&Lembrar palavra-passe até que o FileZilla encerre" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3838 msgid "&Remember passwords" msgstr "&Lembrar as palavra-passe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2732 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2819 msgid "&Remote directory:" msgstr "Pasta &remota:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2335 msgid "&Remote path:" msgstr "Caminho &remoto:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +msgid "&Remote search" +msgstr "Procura &remota" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Remover" @@ -847,25 +874,25 @@ msgid "&Remove key" msgstr "&Remover chave" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "&Remover seleccionados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2881 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Mudar o Nome" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1075 msgid "&Rename..." msgstr "&Mudar o nome ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 msgid "&Reopen local file" msgstr "&Reabrir o ficheiro local" @@ -877,7 +904,11 @@ msgid "&Report a bug..." msgstr "&Reportar um erro ..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "&Requer atenção" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 msgid "&Reset and requeue all" msgstr "&Limpar e voltar a listar todos os ficheiros" @@ -885,11 +916,11 @@ msgid "&Restart Wizard" msgstr "&Reinicar o Assistente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Retomar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "&Correr o comando ..." @@ -897,7 +928,7 @@ msgid "&Run configuration wizard now..." msgstr "&Correr o assistente de configuração rede agora ..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2095 msgid "&Run update check now..." msgstr "&Verificar a existência de actualizações ..." @@ -909,11 +940,11 @@ msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 msgid "&Save as..." msgstr "&Guardar como ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3076 msgid "&Search" msgstr "&Procurar" @@ -925,20 +956,20 @@ msgid "&Select Entry:" msgstr "&Seleccionar Entrada:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1878 msgid "&Select language:" msgstr "&Seleccionar idioma:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2187 msgid "&Select the columns that should be displayed:" msgstr "Seleccione as colunas a serem mostradas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Servidor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1648 msgid "&Settings" msgstr "&Configurações" @@ -946,23 +977,19 @@ msgid "&Settings..." msgstr "&Configurações ..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Show debug menu" msgstr "&Mostrar o menu de correcção de erros" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 msgid "&Show detailed log" msgstr "&Mostrar detalhes" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Mostrar mensagem" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "&Show timestamps in message log" msgstr "&Mostrar a data e a hora na janela de mensagens" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1531 msgid "&Site Manager entries" msgstr "Entradas do &Gestor de Sítios" @@ -970,11 +997,11 @@ msgid "&Site Manager..." msgstr "&Gestor de Sítios ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 msgid "&Site-specific bookmark" msgstr "&Marcador próprio para o sítio" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Saltar" @@ -982,7 +1009,8 @@ msgid "&Speed limits" msgstr "Limites de &velocidade" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "&Start transfer immediately" msgstr "&Começar a transferência de imediato" @@ -990,11 +1018,11 @@ msgid "&Swap local and remote panes" msgstr "&Trocar a ordem das janelas local e remota" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 msgid "&TLS Ciphers" msgstr "Cifras &TLS:" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Teste" @@ -1006,11 +1034,11 @@ msgid "&Transfer" msgstr "&Transferência" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 msgid "&Transfer mode:" msgstr "&Modo de transferência:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "&Lista de transferências" @@ -1019,33 +1047,41 @@ msgid "&Treat dotfiles as ASCII files" msgstr "&Tratar ficheiros de ponto como ficheiros ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1949 msgid "&Unedit" msgstr "&Sem editar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1017 msgid "&Update cached key for this host" msgstr "&Actualizar a chave do cofre para este servidor" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "&Upload" msgstr "&Enviar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "&Upload to:" +msgstr "&Enviar para:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +msgid "&Upload..." +msgstr "&Enviar..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Envios:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 msgid "&Use custom program" msgstr "&Usar um programa próprio" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:383 msgid "&Use synchronized browsing" msgstr "&Usar a navegação sincronizada" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "&Use system's default editor for text files" msgstr "&Usar o editor de texto do sistema" @@ -1057,21 +1093,21 @@ msgid "&Use the server's external IP address instead" msgstr "&Usar em alternativa o endereço IP externo do servidor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1642 msgid "&Use thousands separator" msgstr "Usar o &separador dos milhares" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2513 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Utilizador:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "&Username:" msgstr "&Nome de utilizador:" -#: ../../locales/../src/interface/Mainfrm.cpp:1657 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 #, c-format msgid "&Version %s" msgstr "&Versão %s" @@ -1081,47 +1117,47 @@ msgstr "&Ver" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:616 msgid "&View/Edit" msgstr "&Ver/Editar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1979 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Vigiar os ficheiros locais editados e perguntar para enviar as alterações" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&When checking for updates, check for:" msgstr "&Ao procurar actualizações, verificar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Write" msgstr "&Escrever" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1780 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 msgid "&Yes" msgstr "&Sim" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' não existe ou não pode ser acedido." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' não é uma pasta." -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 msgid "'Account' logontype not supported by selected protocol" msgstr "O início de sessão 'Conta' não é suportado pelo protocolo seleccionado" -#: ../../locales/../src/interface/manual_transfer.cpp:440 +#: ../../locales/../src/interface/manual_transfer.cpp:446 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1129,7 +1165,7 @@ "Os tipos de início de sessão 'Normal' e 'Conta' não estão disponíveis, a " "utilizar em alternativa \"Pedir Palavra-chave\"." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1147,15 +1183,15 @@ "comandos para enviar os argumentos seguidos de 'quote' para o servidor. " "Poderá querer inserir o comando sem o 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d objecto filtrado)" msgstr[1] "(%d objectos filtrados)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% transferidos)" @@ -1181,22 +1217,22 @@ msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 para nenhum)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:90 +#: ../../locales/../src/interface/aboutdialog.cpp:179 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat está configurado para %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1580 msgid "(example: %H:%M)" msgstr "(exemplo: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 msgid "(example: %Y-%m-%d)" msgstr "(exemplo: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3752 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3769 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1207,7 +1243,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "--:--:-- left" msgstr "--:--:-- restantes" @@ -1227,31 +1263,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s não pode ser usado junto com um endereço FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2255 msgid "0 - None" msgstr "0 - Nada" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2256 msgid "1 - Warning" msgstr "1 - Aviso" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "2 - Info" msgstr "2 - Info" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2258 msgid "3 - Verbose" msgstr "3 - Verboso" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:103 msgid "32-bit system" msgstr "sistema de 32 bits" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2259 msgid "4 - Debug" msgstr "4 - Correcção de erros" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:101 msgid "64-bit system" msgstr "sistema de 64 bits" @@ -1263,19 +1299,23 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Já existe um marcador com este nome. Por favor indique um nome não usado." +#: ../../locales/../src/engine/tlssocket.cpp:1333 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Um certificado na cadeia foi assinado com um algorítmo inseguro" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "É necessário predefinir um editor" -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/RemoteListView.cpp:166 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:788 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "" "Uma pasta não pode ser arrastada para dentro de uma das suas subpastas." @@ -1290,22 +1330,22 @@ "tais casos terá que utilizar o modo activo. Em modo activo, o FileZilla abre " "uma porta e pede ao servidor para se ligar a ela." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1699 msgid "A file previously opened has been changed." msgstr "Um ficheiro previamente aberto foi alterado." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "A file with that name is already being transferred." msgstr "Um ficheiro com esse nome já está a ser transferido." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Um ficheiro com esse nome ainda está a ser editado. Por favor feche-o e " "tente outra vez." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1320,11 +1360,11 @@ "listas.\n" "Não será exibido mais nenhum aviso durante esta sessão." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Está disponível uma nova versão do FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:658 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1341,7 +1381,7 @@ "Um servidor bem configurado não requer isto. Contacte o administrador do " "servidor se precisar disto." -#: ../../locales/../src/interface/state.cpp:257 +#: ../../locales/../src/interface/state.cpp:254 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1352,7 +1392,7 @@ "local?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1373,19 +1413,19 @@ msgid "A&pply only to uploads" msgstr "A&plicar apenas a envios" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:535 msgid "A&pply to all files and directories" msgstr "A&plicar a todos os ficheiros e pastas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "A&utomatically remove successful transfers" msgstr "&Remover automaticamente as transferências bem sucedidas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2590 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:576 msgid "About FileZilla" msgstr "Sobre o FileZilla" @@ -1393,31 +1433,36 @@ msgid "Above the file lists" msgstr "Acima das listas de ficheiros" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:113 +#, fuzzy +msgid "Access to some local directories could not be restored:" +msgstr "Não foi possível criar a pasta local '%s'." + +#: ../../locales/../src/engine/server.cpp:912 +#: ../../locales/../src/engine/server.cpp:933 #: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/manual_transfer.cpp:547 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1329 msgid "Account" msgstr "Conta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "Resposta após a lista estar &completa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1942 msgid "Action on selected file:" msgstr "Acção para o ficheiro seleccionado:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1822 msgid "Action to perform:" msgstr "Acção a realizar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Acção:" @@ -1425,7 +1470,7 @@ msgid "Active mode" msgstr "Modo activo" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1433,7 +1478,7 @@ "Falhou o teste ao modo activo do FTP. O FileZilla desconhece o endereço IP " "externo correcto." -#: ../../locales/../src/interface/netconfwizard.cpp:608 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1441,7 +1486,7 @@ "Falhou o teste ao modo activo do FTP. O FileZilla desconhece o endereço IP " "externo correcto. Para além disso, o seu router modificou o endereço enviado." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1455,12 +1500,13 @@ msgid "Active mode IP" msgstr "Activar o modo IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3350 msgid "Add files to &queue only" msgstr "&Adicionar ficheiros apenas à lista" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "Add selected directory to the transfer queue" msgstr "Adicionar as pastas seleccionadas à lista de transferências" @@ -1470,20 +1516,20 @@ msgstr "" "Adicionar os ficheiros e pastas seleccionados à lista de transferências" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1854 msgid "Add to queue" msgstr "Adicionar à lista" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Address type not supported" msgstr "O tipo do endereço não é suportado" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:308 msgid "Advanced" msgstr "Avançado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2086 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1498,15 +1544,16 @@ "sistema. Use as versões beta e as versões de desenvolvimento por sua própria " "conta e risco." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3688 msgid "Al&ways perform this action" msgstr "&Executar sempre esta acção" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2067 msgid "Algorithm:" msgstr "Algoritmo:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2577 msgid "All files have been successfully transferred" msgstr "Todos os ficheiros foram transferidos com sucesso" @@ -1514,7 +1561,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Todas as portas do intervalo têm que estar entre 1024 e 65535." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../locales/../src/interface/QueueView.cpp:2573 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1532,11 +1579,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Permitir recuo para outro modo de transferência em caso de falha." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3648 msgid "Already connected" msgstr "Já ligado" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nome alternativo:" @@ -1558,7 +1605,7 @@ "Em alternativa pode usar o agente SSH do seu sistema. Para o fazer, " "certifique-se que a variável de ambiente SSH_AUTH_SOCK está configurada." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1566,7 +1613,7 @@ "Em alternativa, também pode descarregar a última versão a partir do sítio do " "FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1615 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1575,7 +1622,7 @@ "Ocorreu um erro ao ler a lista de transferências de \"%s\".\n" "Alguns itens da lista podem não ter sido actualizados." -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1513 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1584,7 +1631,11 @@ "Ocorreu um erro ao guardar a lista de transferências em \"%s\".\n" "Alguns itens da lista podem não ter sido guardados." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/engine/tlssocket.cpp:1336 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Um emissor na cadeia do certificado não é uma autoridade certificadora" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2081 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1592,55 +1643,55 @@ "Um item com o mesmo nome daquele que está a ser arrastado já existe no " "destino." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:935 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:545 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1327 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1624 msgid "Anonymous" msgstr "Anónimo" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:1017 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Está já a decorrer uma operação remota, não é possível alterar a pasta." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:807 msgid "Any changes made in the Site Manager could not be saved." msgstr "Quaisquer alterações ao Gestor de Sítios não poderão ser quardadas." -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:955 msgid "Any changes made to the filters could not be saved." msgstr "Quaisquer alterações aos filtros não poderão ser quardadas." -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:863 msgid "Any changes made to the filters will not be saved." msgstr "Não será guardada qualquer alteração nos filtros." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:549 msgid "App&ly to directories only" msgstr "Apl&icar apenas a pastas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1202 msgid "Apply" msgstr "Aplicar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Aplicar apenas &à lista actual" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:542 msgid "Apply to &files only" msgstr "Aplicar apenas &aos ficheiros" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "&Ficheiro" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Argument buffer overflow" msgstr "Excedido o argumento do buffer" @@ -1648,17 +1699,17 @@ msgid "As tab in the transfer queue pane" msgstr "Como tópico no painel da lista de transferências" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1442 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Perguntar" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:906 +#: ../../locales/../src/engine/server.cpp:927 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Pedir palavra-passe" @@ -1670,7 +1721,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Pedir o endereço IP externo ao sistema operativo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3549 msgid "Asking questions in the FileZilla forums" msgstr "Fazer perguntas nos Fóruns do FileZilla" @@ -1678,7 +1729,7 @@ msgid "Associated program not found:" msgstr "Não foi encontrado o programa associado:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Pelo menos uma condição de filtro está incompleta" @@ -1686,11 +1737,11 @@ msgid "At this point, all required information has been gathered." msgstr "Neste momento, está reunida toda a informação necessária." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atributo" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:617 msgid "Authentication failed." msgstr "Falhou a validação." @@ -1698,7 +1749,7 @@ msgid "Author:" msgstr "Autor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 msgid "Auto" msgstr "Auto" @@ -1706,24 +1757,20 @@ msgid "Automatic file type classification" msgstr "Classificação de tipo de ficheiro automática" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Tamanhos disponíveis" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:334 msgid "B&ypass proxy" msgstr "Con&tornar o proxy" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1027 msgid "Bad file descriptor" msgstr "Descritor de ficheiro errado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3586 msgid "Basic usage instructions" msgstr "Instruções básicas de utilização" @@ -1731,16 +1778,16 @@ msgid "Behaviour" msgstr "Comportamento" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1126 +#: ../../locales/../src/interface/edithandler.cpp:1154 msgid "Being edited" msgstr "A ser editado" -#: ../../locales/../src/engine/tlssocket.cpp:1111 +#: ../../locales/../src/engine/tlssocket.cpp:1327 msgid "Beware! Certificate has been revoked" msgstr "Atenção! O Certificado foi revogado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 msgid "Binary" msgstr "Binário" @@ -1748,17 +1795,21 @@ msgid "Blackboard" msgstr "Quadro negro" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "Azul" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:300 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:381 msgid "Bookmark" msgstr "Marcador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2858 msgid "Bookmark:" msgstr "Marcador:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2847 msgid "Bookmarks" msgstr "Marcadores" @@ -1766,15 +1817,15 @@ msgid "Browse..." msgstr "Explorar ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:660 msgid "Build date:" msgstr "Data da versão:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:637 msgid "Build information" msgstr "Informações da versão" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Business category:" msgstr "Categoria de negócio:" @@ -1792,80 +1843,87 @@ msgid "C&ancel current operation" msgstr "C&ancelar a operação actual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "L&impar tudo" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "C&opy URL(s) to clipboard" msgstr "C&opiar os caminhos URL para a área de transferência" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:625 +msgid "C&opy URL(s) with password to clipboard" +msgstr "C&opiar os caminhos URL com palavra-passe para a área de transferência" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1518 msgid "C&ustom" msgstr "P&ersonalizado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2007 msgid "C&ustom filetype associations:" msgstr "A&ssociações dos tipos de ficheiro predefinidas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:764 msgid "CPU features:" msgstr "Caraterísticas do CPU:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1570 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1226 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1657 msgid "Calculating timezone offset of server..." msgstr "A calcular o fuso horário do servidor..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/transfersocket.cpp:688 msgid "Can't read from file" msgstr "Impossível ler a partir do ficheiro" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:666 +#: ../../locales/../src/engine/transfersocket.cpp:741 msgid "Can't write data to file." msgstr "Impossível escrever dados para o ficheiro." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/transfersocket.cpp:669 +#: ../../locales/../src/engine/transfersocket.cpp:744 #, c-format msgid "Can't write data to file: %s" msgstr "Não é possível escrever dados para o ficheiro: %s" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1680 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1854 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2942 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3437 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3923 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:629 msgid "Cancel" msgstr "Cancelar" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Cancelar a operação actual" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Cancela a operação actual" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" @@ -1876,11 +1934,11 @@ msgid "Cannot add server to Site Manager" msgstr "Não é possível adicionar o servidor ao Gestor de Sítios" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Cannot assign requested address" msgstr "Incapaz de aplicar endereço pedido" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1888,7 +1946,7 @@ "Não é possível fechar o separador enquanto estiver ocupado.\n" "Cancelar a operação actual e fechar o separador?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1900,22 +1958,22 @@ msgid "Cannot create new filter" msgstr "Não é possível criar um novo filtro" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1634 +#: ../../locales/../src/interface/LocalListView.cpp:1741 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Cannot edit file" msgstr "Não é possível editar o ficheiro" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1622 msgid "Cannot edit file, not connected to any server." msgstr "Não é possível editar o ficheiro, não está ligado a um servidor." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Cannot edit file, remote path unknown." msgstr "Não é possível editar o ficheiro, o caminho remoto é desconhecido." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:370 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1923,86 +1981,79 @@ "Não é possível establecer uma ligação por FTP a um servidor SFTP. Por favor " "seleccione o protocolo correcto." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "" -"Não é possível carregar a Barra de Ligação Rápida a partir do ficheiro de " -"recursos" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Cannot load key file" msgstr "Não é possível carregar o ficheiro chave" -#: ../../locales/../src/interface/Mainfrm.cpp:993 +#: ../../locales/../src/interface/Mainfrm.cpp:1008 msgid "Cannot load toolbar from resource file" msgstr "" "Não é possível carregar a barra de ferramentas a partir de ficheiro de " "recursos" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:450 msgid "Cannot remember password" msgstr "Não é possível lembrar a palavra-passe" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216 msgid "Cannot rename entry" msgstr "Não é possível mudar o nome da entrada" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Cannot rename file" msgstr "Não é possível mudar o nome do ficheiro" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:137 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Não é possivel determinar o nome do servidor para endereços IPv4 para uso " "com proxy SOCKS4." -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "Cannot save filterset" msgstr "Não é possível guardar o conjunto de filtros" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Cannot select filter" msgstr "Não é possível seleccionar o filtro" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1484 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "Cannot set file association" msgstr "Não é possível configurar as associações dos ficheiros" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Cannot show dialog" msgstr "Não é possível mostrar a caixa de diálogo" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "Cannot view/edit selected file" msgstr "Não é possível ler/editar o ficheiro seleccionado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1762 msgid "Case insensitive" msgstr "Insensível a maiúsculas/minúsculas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1761 msgid "Case insensitive (default)" msgstr "Insensível a maiúsculas/minúsculas (por defeito)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1763 msgid "Case sensitive" msgstr "Sensível a maiúsculas/minúsculas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1764 msgid "Case sensitive (default)" msgstr "Sensível a maiúsculas/minúsculas (por defeito)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 msgid "Categories to clear" msgstr "Categorias a limpar" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Certificate and session data are not available yet." msgstr "O certificado e os dados da sessão ainda não estão disponíveis." @@ -2014,30 +2065,34 @@ msgid "Certificate issuer" msgstr "Emissor do certificado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket.cpp:1330 +msgid "Certificate signature verification failed" +msgstr "Falhou a verificação da assinatura do certificado" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Desafio:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:384 msgid "Change file attributes" msgstr "Alterar atributos do ficheiro" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:530 msgid "Change the file permissions." msgstr "Alterar as permissões do ficheiro." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2206 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "A alteração das configurações do ficheiro 'logfile' requer que reinicie o " "FileZila." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "Character encoding issue" msgstr "Problema de codificação de caracteres" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:522 msgid "Charset" msgstr "Mapa de caracteres" @@ -2045,7 +2100,7 @@ msgid "Check for &updates..." msgstr "Procurar &actualizações ..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2053 msgid "Check for FileZilla &updates automatically:" msgstr "Procurar automaticamente as actualizações do FileZilla:" @@ -2057,11 +2112,11 @@ msgid "Check for newer versions of FileZilla" msgstr "Procurar novas versões do FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Check for updates failed" msgstr "Procurar por actualizações falhadas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:783 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:828 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2069,7 +2124,7 @@ "Verifique as suas credenciais de entrada. A palavra-passe indicada inicia ou " "termina com um espaço." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:824 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2077,39 +2132,39 @@ "Verifique as suas credenciais de entrada. O nome de utilizador indicado " "inicia ou termina com um espaço." -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "Checking for correct external IP address" msgstr "A verificar pelo endereço IP externo correcto" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "A procurar actualizações ..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:754 #, c-format msgid "Checksum match on file %s\n" msgstr "A verificação sumária corresponde no ficheiro %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:750 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "A verificação sumária difere no ficheiro %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1525 msgid "Choose a key file" msgstr "Escolha um ficheiro chave" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1556 msgid "Choose the default local directory" msgstr "Escolha a pasta local predefinida" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2242 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2319 msgid "Choose the local directory" msgstr "Escolha a pasta local" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 msgid "Chunk data improperly terminated" msgstr "Dados tratados indevidamente" @@ -2118,7 +2173,7 @@ msgstr "Cifra:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:634 msgid "Cl&ose tab" msgstr "Fe&char separador" @@ -2126,46 +2181,51 @@ msgid "Classic" msgstr "Clássico" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "Limpar &a vista do cofre" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 +#, fuzzy +msgid "Clear auto&update data" +msgstr "Limpar os dados privados" + +#: ../../locales/../src/interface/quickconnectbar.cpp:200 msgid "Clear history" msgstr "Limpar o histórico" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1499 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Limpar os dados privados" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:199 msgid "Clear quickconnect bar" msgstr "Limpar a barra de ligação rápida" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Prima em Terminar para guardar a configuração." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2113 msgid "Client to server MAC:" msgstr "MAC do cliente para o servidor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2103 msgid "Client to server cipher:" msgstr "Cifra do cliente para o servidor:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:637 msgid "Close &all other tabs" msgstr "Fechar &todos os outros separadores" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1134 -#: ../../locales/../src/interface/Mainfrm.cpp:1155 +#: ../../locales/../src/interface/Mainfrm.cpp:1144 +#: ../../locales/../src/interface/Mainfrm.cpp:1165 msgid "Close FileZilla" msgstr "Sair do FileZilla" @@ -2177,66 +2237,65 @@ msgid "Closes current tab" msgstr "Fecha o separador actual" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:289 msgid "Co&mments:" msgstr "Co&mentários:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Propriedades da coluna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2172 msgid "Column setup" msgstr "Configuração da coluna" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1951 msgid "Command and its arguments should be properly quoted." msgstr "O comando e os seus parâmetros devem ser inseridos de forma correcta." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Command failed" msgstr "O comando falhou" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Command not supported" msgstr "O comando não é suportado" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:227 msgid "Command not supported by this protocol" msgstr "O comando não é suportado por este protocolo" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Command:" msgstr "Comando:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "Comentário" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Common name:" msgstr "Nome comum:" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Comunicação marcada pelo router ou pela firewall" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:545 msgid "Compare &modification time" msgstr "Comparar a hora da &modificação" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 msgid "Compare file&size" msgstr "Comparar o &tamanho do ficheiro" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1795 msgid "Comparison &threshold (in minutes):" msgstr "Intervalo para a &comparação (em minutos):" @@ -2244,23 +2303,23 @@ msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "O intervalo para a comparação tem de ser entre 0 e 1440 minutos." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:644 msgid "Compiled for:" msgstr "Compilado para:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:652 msgid "Compiled on:" msgstr "Compilado em:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Compiled with:" msgstr "Compilado com:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:676 msgid "Compiler flags:" msgstr "Parâmetros da compilação:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Comprimido" @@ -2268,8 +2327,8 @@ msgid "Concurrent transfers" msgstr "Transferências simultâneas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3142 msgid "Conditions are c&ase sensitive" msgstr "As condições são sensíveis a m&aiúsculas e minúsculas" @@ -2285,31 +2344,36 @@ msgid "Configure port range" msgstr "Configurar o intervalo de portas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3592 msgid "Configuring FileZilla and your network" msgstr "Configurar o FileZilla e a sua rede" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:1202 msgid "Confirm deletion" msgstr "Confirme para apagar" -#: ../../locales/../src/engine/local_filesys.cpp:129 -#: ../../locales/../src/interface/edithandler.cpp:1586 -#: ../../locales/../src/interface/LocalListView.cpp:1664 -#: ../../locales/../src/interface/RemoteListView.cpp:1394 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1598 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/RemoteListView.cpp:1423 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1051 +#: ../../locales/../src/interface/search.cpp:1158 msgid "Confirmation needed" msgstr "Confirmação necessária" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Parabéns, a configuração parece estar funcionar." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:198 msgid "Connect bypassing proxy settings" msgstr "A conectar as configurações de contorno do proxy" +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Falhou a ligação: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Ligar no separador actual" @@ -2322,29 +2386,25 @@ msgid "Connect to specified Site Manager site" msgstr "Ligar a um sítio específico do Gestor de Sítios" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:908 -msgid "Connected" -msgstr "Ligado" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "A ligar" -#: ../../locales/../src/interface/netconfwizard.cpp:223 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:246 #, c-format msgid "Connecting to %s" msgstr "A ligar a %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1050 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4333 #, c-format msgid "Connecting to %s through %s proxy" msgstr "A ligar a %s via o proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:958 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../locales/../src/engine/ControlSocket.cpp:966 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:274 #, c-format msgid "Connecting to %s..." msgstr "A ligar a %s ..." @@ -2353,183 +2413,219 @@ msgid "Connection" msgstr "Ligação" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Connection aborted" msgstr "Ligação terminada" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "Falhou a tentativa de ligação" -#: ../../locales/../src/engine/ControlSocket.cpp:922 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:930 +#: ../../locales/../src/engine/proxy.cpp:210 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Falhou a tentativa de ligação com \"%s\", a tentar o endereço seguinte." -#: ../../locales/../src/engine/ControlSocket.cpp:927 +#: ../../locales/../src/engine/ControlSocket.cpp:935 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Falhou a tentativa de ligação com \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:184 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/engineprivate.cpp:700 msgid "Connection attempt interrupted by user" msgstr "Tentativa de ligação interrompida pelo utilizador" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "Connection attempt timed out" msgstr "A tentativa de ligação excedeu o tempo" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Ligação terminada" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/ControlSocket.cpp:1026 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:228 msgid "Connection closed by server" msgstr "Ligação terminada pelo servidor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:272 msgid "Connection established, initializing TLS..." msgstr "Ligação estabelecida, a iniciar o TLS ..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:297 msgid "Connection established, sending HTTP request" msgstr "Ligação estabelecida, a enviar o pedido HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Ligação estabelecida, a esperar pela mensagem de boas-vindas." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:444 msgid "Connection established, waiting for welcome message..." msgstr "Ligação estabelecida, à espera da mensagem de boas-vindas ..." -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Ligação perdida" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Connection not allowed by ruleset" msgstr "Ligação não permitida pelo conjunto de regras" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "Connection refused" msgstr "Ligação recusada" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1028 msgid "Connection refused by server" msgstr "Ligação recusada pelo servidor" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Connection reset by network" msgstr "Ligação redefinida pelo servidor" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Connection reset by peer" msgstr "Ligação redefinida pelo servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:559 +#: ../../locales/../src/engine/ControlSocket.cpp:567 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "A ligação caiu ao fim de %d segundo de inactividade" msgstr[1] "A ligação caiu ao fim de %d segundos de inactividade" -#: ../../locales/../src/interface/netconfwizard.cpp:1077 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "Ligação terminada." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:672 msgid "Connection to server lost." msgstr "Perdida a ligação ao servidor." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "Ligação estabelecida com o proxy, a saudar ..." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "A ligação ao servidor terminou prematuramente." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "A ligação ao servidor de teste falhou." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Converter o ficheiro chave" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1895 #, c-format msgid "Copy (%d) of %s" msgstr "Cópia (%d) de %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1829 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1875 #, c-format msgid "Copy of %s" msgstr "Cópia de %s" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Copiar os caminhos dos itens seleccionados para a área de transferência, " +"inclusivé a palavra-passe." + #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 msgid "Copy the URLs of the selected items to clipboard." msgstr "" "Copiar os caminhos dos itens seleccionados para a Área de Transferência." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/transfersocket.cpp:182 #, c-format msgid "Could not accept connection: %s" msgstr "Não foi possível aceitar a ligação: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:101 +#, fuzzy, c-format +msgid "Could not access path %s" +msgstr "Não foi possível aceitar a ligação: %s" + +#: ../../locales/../src/engine/tlssocket.cpp:1310 +msgid "Could not add certificate to temporary trust list" +msgstr "" +"Não foi possível adicionar o certificado à lista de confiança temporária" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Não foi possível adicionar a ligação ao Gestor de Sítios" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:802 msgid "Could not complete operation" msgstr "Não foi possível terminar a operação" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:181 msgid "Could not connect to server" msgstr "Não foi possível ligar ao servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1087 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Não foi possível ligar ao servidor: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:803 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:734 msgid "Could not convert command to server encoding" msgstr "Não foi possível converter o comando para o código do servidor" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Não foi possível converter a chave privada" -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/RemoteListView.cpp:2545 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1393 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not copy URLs" msgstr "Não foi possível copiar os caminhos URL" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket.cpp:1292 +msgid "Could not copy certificate" +msgstr "Não foi possível copiar o certificado" + +#: ../../locales/../src/interface/aboutdialog.cpp:203 msgid "Could not copy data" msgstr "Não foi possível copiar os dados" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:158 +#, fuzzy, c-format +msgid "Could not create CFURL from path %s" +msgstr "Não foi possível ler do ponto: %s" + +#: ../../locales/../src/interface/updater.cpp:489 #, c-format msgid "Could not create local file %s\n" msgstr "Não foi possível criar o ficheiro local %s\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Não foi possível criar o início de sessão mútuo: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2193 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "" +"Não foi possível criar um marcador de âmbito de segurança a partir da URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2211 +#: ../../locales/../src/interface/RemoteTreeView.cpp:848 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2539,11 +2635,11 @@ "Ou a extensão do explorador não está devidamente instalada ou não largou os " "ficheiros na janela do Explorador." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4095 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4187 msgid "Could not establish connection to server" msgstr "Impossível establecer a ligação com o servidor" -#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../../locales/../src/interface/FileZilla.cpp:418 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2555,11 +2651,11 @@ "Pode definir a pasta de dados do FileZilla com a opção da linha de comandos " "'--pasta de dados ' ou configurar a variável de ambiente FZ_DATADIR" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:722 msgid "Could not generate custom login sequence." msgstr "Não foi possível gerar a sequência de início de sessão personalizada." -#: ../../locales/../src/engine/tlssocket.cpp:956 +#: ../../locales/../src/engine/tlssocket.cpp:1075 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2567,7 +2663,7 @@ "Não foi possível obter um nome do emissor do certificado legível, o módulo " "'gnutls_x509_get_issuer_dn' falhou" -#: ../../locales/../src/engine/tlssocket.cpp:933 +#: ../../locales/../src/engine/tlssocket.cpp:1051 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2575,36 +2671,36 @@ "Não foi possível obter um nome do sujeito do certificado legível, o módulo " "'gnutls_x509_get_dn' falhou" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1002 msgid "Could not get full remote path." msgstr "Não é possível obter o caminho remoto completo." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:95 +#, fuzzy +msgid "Could not get native path from CFURL" +msgstr "Não foi possível receber dados do servidor." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:173 +#, fuzzy +msgid "Could not get path from URL" +msgstr "Não foi possível obter uma resposta do fzputtygen." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Could not get reply from fzputtygen." msgstr "Não foi possível obter uma resposta do fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Could not get temporary directory to download file into." msgstr "Impossível obter a pasta temporária para descarga do ficheiro." -#: ../../locales/../src/engine/tlssocket.cpp:879 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Não foi possível importar os certificados de ponto, o módulo " -"'gnutls_x509_crt_import' falhou" - -#: ../../locales/../src/engine/tlssocket.cpp:874 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Não foi possível iniciar a estrutura para os certificados de ponto, o módulo " -"'gnutls_x509_crt_init' falhou" +#: ../../locales/../src/interface/FileZilla.cpp:92 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Não foi possível iniciar Winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2615,15 +2711,21 @@ "e pode ser acedido.\n" "Qualquer alteração feita ao Gestor de Sítios não será guardada." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Não foi possível carregar o ficheiro chave" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Não foi possível carregar a chave privada" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:1025 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2634,7 +2736,7 @@ "Desligar a navegação sincronizada e continuar com as alterações na pasta " "remota?" -#: ../../locales/../src/interface/state.cpp:361 +#: ../../locales/../src/interface/state.cpp:371 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2644,7 +2746,7 @@ "Não foi posível encontrar a pasta local correspondente à pasta remota '%s'.\n" "A navegação sincronizada foi desligada." -#: ../../locales/../src/interface/state.cpp:266 +#: ../../locales/../src/interface/state.cpp:264 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2654,64 +2756,84 @@ "Não foi posível encontrar a pasta remota correspondente à pasta local '%s'.\n" "A navegação sincronizada foi desligada." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/aboutdialog.cpp:203 +#: ../../locales/../src/interface/RemoteListView.cpp:2545 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1393 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not open clipboard" msgstr "Não foi possível abrir a área de transferência" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:177 -#: ../../locales/../src/engine/logging.cpp:208 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Não foi possível abrir o ficheiro das configurações iniciais: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Impossível analisar o caminho remoto." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:118 msgid "Could not parse server address:" msgstr "Impossível analisar o endereço do servidor:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 +#: ../../locales/../src/interface/netconfwizard.cpp:994 +msgid "Could not read from data socket." +msgstr "Não foi possível ler o suporte de dados." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 #, c-format msgid "Could not read from socket: %s" msgstr "Não foi possível ler do ponto: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:553 msgid "Could not read server item." msgstr "Não foi possível ler o item do servidor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2595 +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Não foi possível receber dados do servidor." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:116 +#, fuzzy +msgid "Could not restore directory access" +msgstr "Impossível analisar o endereço do servidor:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2694 #, c-format msgid "Could not seek to offset %s within file" msgstr "Impossível ir até à posição %s dentro do ficheiro" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2502 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2603 msgid "Could not seek to the end of the file" msgstr "Impossível procurar o término do ficheiro" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Não foi possível enviar o comando para o fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2623 +#: ../../locales/../src/engine/tlssocket.cpp:1261 +msgid "Could not sort peer certificates" +msgstr "Não foi possível ordenar os certificados de ponto" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2724 msgid "Could not spawn IO thread" msgstr "Impossível criar o processo IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1064 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Não foi possível saudar o proxy: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "Impossível iniciar a transferência" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:630 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:828 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2720,19 +2842,19 @@ "Impossível escrever em \"%s\", quaisquer alterações ao Gestor de Sítios não " "poderão ser quardadas: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Impossível escrever em \"%s\", o marcador não pode ser guardado: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Impossível escrever em \"%s\", os marcadores globais não puderam ser " "guardados: %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1542 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2741,42 +2863,42 @@ "Impossível escrever em \"%s\", a lista não pode ser guardada.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../../locales/../src/interface/sitemanager.cpp:750 +#: ../../locales/../src/interface/sitemanager.cpp:807 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2297 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Impossível escrever \"%s\", os sítios seleccionados não foram exportados: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:149 #, c-format msgid "Could not write \"%s\":" msgstr "Incapaz de escrever \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Não foi possível escrever o ficheiro chave: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "Não foi possível esvrever para o ficheiro local" -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/engine/logging.cpp:280 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "" "Não foi possível escrever para o ficheiro das configurações iniciais: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:882 -#: ../../locales/../src/engine/ControlSocket.cpp:986 +#: ../../locales/../src/engine/ControlSocket.cpp:890 +#: ../../locales/../src/engine/ControlSocket.cpp:994 #, c-format msgid "Could not write to socket: %s" msgstr "Não foi possível esvrever para o ponto: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Country:" msgstr "País" @@ -2784,25 +2906,25 @@ msgid "Crea&te new file" msgstr "Criar um &novo ficheiro" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:1040 msgid "Create &missing local directory and enter it" msgstr "Criar a pasta local em &falta e abri-la" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:962 msgid "Create &missing remote directory and enter it" msgstr "Criar a pasta remota em &falta e abri-la" #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:573 msgid "Create a new subdirectory in the current directory" msgstr "Criar uma nova subpasta na pasta actual" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:509 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Criar uma nova subpasta na pasta actual e abri-la" @@ -2812,50 +2934,50 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:268 #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Create director&y and enter it" msgstr "Criar &pasta e abri-la" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1233 msgid "Create directory" msgstr "Criar pasta" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2631 msgid "Create empty file" msgstr "Criar um ficheiro vazio" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "A criar a pasta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1951 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3217 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1844 #, c-format msgid "Creating directory '%s'..." msgstr "A criar a pasta '%s' ..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:173 msgid "Critical error" msgstr "Erro crítico" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:164 msgid "Critical error:" msgstr "Erro crítico:" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:124 msgid "Critical file transfer error" msgstr "Erro crítico na transferência do ficheiro" -#: ../../locales/../src/engine/ControlSocket.cpp:119 +#: ../../locales/../src/engine/ControlSocket.cpp:104 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Erro crítico de transferência depois ter transferido %s em %s" -#: ../../locales/../src/interface/state.cpp:352 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2864,59 +2986,63 @@ "A pasta remota actual (%s) não está sob o caminho a sincronizar (%s).\n" "A navegação sincronizada foi desligada." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:400 msgid "Current transfer type is set to ASCII." msgstr "O tipo de transferência actual está definido para ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:408 msgid "Current transfer type is set to automatic detection." msgstr "O tipo de transferência actual está definido para detecção automática." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:404 msgid "Current transfer type is set to binary." msgstr "O tipo de transferência actual está definido para binário." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2031 msgid "Curve:" msgstr "Curva:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1567 msgid "Cus&tom" msgstr "Perso&nalizado" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:92 msgid "Custom filter set" msgstr "Conjunto de filtros personalizado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2439 msgid "Custom server" msgstr "Servidor personalizado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "Ciano" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2559 msgid "D&ata type" msgstr "Tipo de D&ados" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1637 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Prefixos decimais a usar símbolos SI (p.ex. 1 KB = 1000 bytes)." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:466 msgid "D&efault" msgstr "P&redefinição" #: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:619 msgid "D&elete" msgstr "A&pagar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2755 msgid "D&irectory comparison" msgstr "Compa&ração de pastas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1111 msgid "D&isable all" msgstr "D&esactivar tudo" @@ -2924,37 +3050,37 @@ msgid "D&o not save passwords" msgstr "Nã&o guardar as palavras-passe" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "D&ouble-click action on directories:" msgstr "Acçã&o para o clique duplo nas pastas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1261 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2893 msgid "D&uplicate" msgstr "D&uplicar" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:40 msgid "DOS-like with virtual paths" msgstr "Como em DOS com caminhos virtuais" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "Dangerous filetype" msgstr "Tipo de ficheiro perigoso" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "Dados" -#: ../../locales/../src/interface/netconfwizard.cpp:994 -#: ../../locales/../src/interface/netconfwizard.cpp:1058 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." msgstr "Ponto de dados fechado prematuramente." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Data" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 msgid "Date formatting" msgstr "Formato para a data" @@ -2970,15 +3096,15 @@ msgid "Debug" msgstr "Corrigir erros" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 msgid "Debugging settings" msgstr "Configurações para corrigir erros" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default &local directory:" msgstr "Pasta &local predefinida:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:32 msgid "Default (Autodetect)" msgstr "Predefinição (Auto-detectar)" @@ -2986,17 +3112,17 @@ msgid "Default editor not properly quoted." msgstr "O editor predefinido não foi chamado de forma correcta." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1461 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "O ficheiro existe no destino" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:371 msgid "Default r&emote directory:" msgstr "Pasta &remota predefinida:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1100 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -3004,7 +3130,7 @@ "O caminho remoto definido não pode ser analisado. Certifique-se de que é " "válido para o tipo de servidor seleccionado." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Idioma indicado pelo sistema" @@ -3028,7 +3154,7 @@ "O tempo de espera entre tentativas de ligação falhadas tem de ser entre 1 e " "999 segundos." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:541 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3041,12 +3167,12 @@ msgstr[1] "" "A atrasar a ligação por %d segundos devido a uma tentativa prévia falhada ..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1249 msgid "Delete Site Manager entry" msgstr "Apagar a entrada no Gestor de Sítios" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:582 msgid "Delete selected directory" msgstr "Apagar a pasta seleccionada" @@ -3055,70 +3181,61 @@ msgid "Delete selected files and directories" msgstr "Apagar os ficheiros e as pastas seleccionados" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:380 #, c-format msgid "Deleting \"%s\"" msgstr "A apagar \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:383 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "A apagar %u ficheiros de \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "A apagar as pastas" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" -"A opção 'apagar múltiplas pastas não relacionadas' ainda não é suportada" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Deleting symbolic link" msgstr "A apagar a ligação simbólica" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:968 msgid "Desktop" msgstr "Ambiente de trabalho" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 msgid "Details" msgstr "Detalhes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Details for new key:" msgstr "Detalhes para a nova chave:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 msgid "Detected newer version of FileZilla" msgstr "Encontrada uma nova versão do FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1348 msgid "Dire&ctories" msgstr "Past&as" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Direction" msgstr "Direcção" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "Pasta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:463 -#: ../../locales/../src/interface/Mainfrm.cpp:2165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2834 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1781 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:390 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2220 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "Directory comparison" msgstr "Comparação de pastas" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Comparação de pastas falhada" @@ -3128,39 +3245,44 @@ "A pasta que contém o ficheiro 'logfile' não existe ou o nome do ficheiro é " "inválido." -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +#, fuzzy +msgid "Directory listing &filters..." +msgstr "Filtros da lista de pastas" + +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Directory listing aborted by user" msgstr "Listagem de pastas abortada pelo utilizador" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2047 msgid "Directory listing failed" msgstr "Listagem de pastas falhada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "Directory listing filters" msgstr "Filtros da lista de pastas" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:196 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Listagem de pastas de \"%s\" bem sucedida" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Directory listing successful" msgstr "Listagem de pastas bem sucedida" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1146 msgid "Disa&ble all" msgstr "Desa&ctivar tudo" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1033 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Desligar a navegação sincronizada e continuar com as alterações na pasta " "remota?" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:660 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3168,32 +3290,32 @@ "Desmarque esta opção outra vez se deixar de ver o conteúdo correcto das " "pastas." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Desligar do servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:80 -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:988 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:212 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:879 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:881 -#: ../../locales/../src/interface/queue.cpp:325 +#: ../../locales/../src/engine/ControlSocket.cpp:64 +#: ../../locales/../src/engine/ControlSocket.cpp:891 +#: ../../locales/../src/engine/ControlSocket.cpp:996 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:859 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" msgstr "Desligado do servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1019 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 +#: ../../locales/../src/engine/ControlSocket.cpp:1028 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:874 #, c-format msgid "Disconnected from server: %s" msgstr "Desligado do servidor: %s" -#: ../../locales/../src/interface/queue.cpp:324 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:240 msgid "Disconnecting from previous server" msgstr "A desligar do servidor anterior" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Desliga do servidor actualmente visível" @@ -3201,40 +3323,36 @@ msgid "Display about dialog" msgstr "Exibe a caixa 'Sobre ...'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Do ¬ use default editor" msgstr "&Não utilizar o editor predefinido" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Não &fazer nada" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1896 msgid "Do the same with &all selected files already being edited" msgstr "Fazer o mesmo a todos os ficheiros seleccionados já em edição" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1169 msgid "Do you really want to close FileZilla?" msgstr "Quer mesmo sair do FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Quer mesmo apagar todas as entradas do Gestor de Sítios e lista de " "transferências?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Quer mesmo apagar todas as entradas do Gestor de Sítios?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1251 msgid "Do you really want to delete selected entry?" msgstr "Quer mesmo apagar a entrada seleccionada?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Quer mesmo apagar a lista de transferências?" @@ -3243,11 +3361,11 @@ msgid "Do you really want to send '%s' to the server?" msgstr "Quer mesmo enviar '%s' para o servidor?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1889 msgid "Do you want to reopen this file?" msgstr "Quer reabrir este ficheiro?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 msgid "Documentation" msgstr "Documentação" @@ -3261,35 +3379,35 @@ "Ficheiros de ponto são nomes de ficheiro que começam com um ponto, p.ex. ." "htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1819 msgid "Double-click action" msgstr "Acção por clique duplo do rato" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 msgid "Download" msgstr "Transferir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3741 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Limite em &descarga" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:592 #, c-format msgid "Download limit: %s/s" msgstr "Limite para &descarga: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:595 msgid "Download limit: none" msgstr "Limite para &descarga: nenhum" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:518 -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 +#: ../../locales/../src/interface/search.cpp:868 +#: ../../locales/../src/interface/search.cpp:873 msgid "Download search results" msgstr "Transferir os resultados da procura" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "Download selected directory" msgstr "Transferir a pasta seleccionada" @@ -3297,7 +3415,7 @@ msgid "Download selected files and directories" msgstr "Transferir os ficheiros e as pastas seleccionados" -#: ../../locales/../src/interface/Mainfrm.cpp:965 +#: ../../locales/../src/interface/Mainfrm.cpp:980 #, c-format msgid "" "Download speed: %s/s\n" @@ -3306,33 +3424,24 @@ "Velocidade de descarga: %s/s\n" "Velocidade de envio: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1111 msgid "Downloading" msgstr "A transferir" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:315 #, c-format msgid "Downloading %s" msgstr "A transferir %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" -"A opção 'transferir múltiplas pastas não relacionadas' ainda não é suportada" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "A transferir os resultados da procura" - -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "A transferir a actualização ..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:109 -#: ../../locales/../src/interface/QueueView.cpp:87 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:114 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:109 +#: ../../locales/../src/interface/RemoteTreeView.cpp:94 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3340,11 +3449,11 @@ "O 'arrastar e largar' entre instâncias diferentes do FileZilla ainda não foi " "implementado." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:115 -#: ../../locales/../src/interface/QueueView.cpp:100 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:118 +#: ../../locales/../src/interface/LocalTreeView.cpp:120 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:100 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "O 'arrastar e largar' entre servidores diferentes ainda não foi implementado." @@ -3353,7 +3462,7 @@ msgid "Dupl&icate" msgstr "Dupl&icar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1104 msgid "E&nable all" msgstr "A&ctivar tudo" @@ -3362,7 +3471,7 @@ msgid "E&nter directory" msgstr "E&ntrar na pasta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "E&xecute" msgstr "E&xecutar" @@ -3370,21 +3479,21 @@ msgid "E&xit" msgstr "S&air" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 msgid "E&xport..." msgstr "E&xportar ..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "E-Mail:" msgstr "E-mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Cada filtro necessita de pelo menos uma condição." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 msgid "Edit filters" msgstr "Editar filtros" @@ -3395,16 +3504,16 @@ "Editar o ficheiro com o editor configurado e enviar as mudanças para o " "servidor." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing directories is not supported" msgstr "Editar diretórios não é suportado" -#: ../../locales/../src/interface/LocalListView.cpp:1582 -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Editing failed" msgstr "Falhou a edição" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing search results" msgstr "A editar os resultados da busca" @@ -3412,7 +3521,7 @@ msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "Empty command" msgstr "Limpar comando" @@ -3420,7 +3529,7 @@ msgid "Empty command." msgstr "Comando vazio." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2049 msgid "Empty directory listing" msgstr "Limpar lista de pastas" @@ -3432,13 +3541,13 @@ msgid "Empty file extension." msgstr "Limpar as extenções de ficheiros." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Não são permitidos nomes de filtros vazios." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Nome vazio" @@ -3446,7 +3555,7 @@ msgid "Empty quoted string." msgstr "Limpar as chaves guardadas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1139 msgid "En&able all" msgstr "Ac&tivar tudo" @@ -3454,19 +3563,19 @@ msgid "Enable invalid character &filtering" msgstr "Activar a &filtragem de caracteres inválidos" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Encriptado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 msgid "Encryption" msgstr "Encriptação" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 msgid "Encryption details" msgstr "Detalhes da encriptação" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "Terminar comparação e alterar a ordenação?" @@ -3474,11 +3583,11 @@ msgid "Enter &custom command..." msgstr "Indicar comando &personalizado ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3782 msgid "Enter 0 for unlimited speed." msgstr "Indique 0 para velocidade ilimitada." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:1825 msgid "Enter command" msgstr "Indicar comando" @@ -3486,25 +3595,25 @@ msgid "Enter custom command" msgstr "Indicar comando personalizado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1852 msgid "Enter directory" msgstr "Abrir pasta" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Indique o nome do filtro" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Enter name for filterset" msgstr "Indique um nome para o conjunto de filtros" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:274 msgid "Enter new name for filterset" msgstr "Indique um novo nome para o conjunto de filtros" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Indique a palavra-passe" @@ -3513,14 +3622,14 @@ msgid "Enter selected directory" msgstr "Abrir a pasta seleccionada" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:53 +#, fuzzy msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3542,7 +3651,7 @@ "- ftps:// para FTP sobre TLS (implícito)\n" "- ftpes:// para FTP sobre TLS (explícito)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3551,96 +3660,102 @@ "Indique a palavra-passe para o ficheiro '%s'.\n" "O ficheiro convertido estará protegido com a mesma palavra-passe." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 +#, fuzzy msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" "Indique a porta na qual o servidor supervisionará.\n" "A porta predefinida para FTP é a 21, para SFTP é a 22." -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:73 +msgid "Enter username" +msgstr "Indique o nome de utilizador" + +#: ../../locales/../src/interface/loginmanager.cpp:80 msgid "Enter username and password" msgstr "Indique o nome de utilizador e a palavra-passe" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Erro ao exportar as configurações" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Erro ao importar" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1616 msgid "Error loading queue" msgstr "Erro ao ler a lista" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:213 -#: ../../locales/../src/interface/filter.cpp:970 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1833 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:938 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:864 +#: ../../locales/../src/interface/filter.cpp:956 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:246 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:64 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:128 +#: ../../locales/../src/interface/QueueView.cpp:1525 +#: ../../locales/../src/interface/search.cpp:1262 +#: ../../locales/../src/interface/search.cpp:1281 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:522 +#: ../../locales/../src/interface/sitemanager.cpp:582 +#: ../../locales/../src/interface/sitemanager.cpp:686 +#: ../../locales/../src/interface/sitemanager.cpp:774 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "Erro ao carregar ficheiro xml" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1514 msgid "Error saving queue" msgstr "Erro ao guardar a lista" #: ../../locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "Error starting program" msgstr "Erro ao iniciar o programa" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1851 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2224 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1543 +#: ../../locales/../src/interface/sitemanager.cpp:631 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2298 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 msgid "Error writing xml file" msgstr "Erro ao escrever ficheiro xml" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:342 msgid "Error:" msgstr "Erro:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2024 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Exemplo: png \"c:\\Programas\\editor\\editor.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1674 msgid "Examples" msgstr "Exemplos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Exe&cute" msgstr "Exe&cutar" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Executable contains no version info, cannot check for updates." msgstr "" "O executável não contém informação sobre a versão, não é possível verificar " @@ -3650,19 +3765,24 @@ msgid "Explorer" msgstr "Explorador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1601 +#, fuzzy +msgid "Export &Filters" +msgstr "&Filtros:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 msgid "Export &Queue" msgstr "Exportar &Lista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1591 msgid "Export &Settings" msgstr "Exportar &Configurações" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1572 msgid "Export settings" msgstr "Exportar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1280 msgid "F&ilter name:" msgstr "F&iltrar nome:" @@ -3670,20 +3790,19 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:504 msgid "FTP - File Transfer Protocol" msgstr "FTP - Protocolo de Transferência de Ficheiros" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Protocolo de Transferência de Ficheiros com encriptação opcional" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Protocolo de Transferência de Ficheiros Inseguro" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FTP Engine not initialized, can't connect" msgstr "Motor de FTP ainda não iniciado, não é possivel a ligação" @@ -3708,55 +3827,60 @@ "O FTP usa ligações secundárias para transferências de dados. Estas ligações " "adicionais podem ser estabelecidas em ambas as direcções." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP sobre TLS explícito" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP sobre TLS implícito" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1778 -#: ../../locales/../src/interface/LocalTreeView.cpp:846 -#: ../../locales/../src/interface/LocalTreeView.cpp:1099 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:540 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:914 +#: ../../locales/../src/interface/LocalListView.cpp:1825 +#: ../../locales/../src/interface/LocalTreeView.cpp:857 +#: ../../locales/../src/interface/LocalTreeView.cpp:1132 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Falhou a mudança de pasta" -#: ../../locales/../src/interface/FileZilla.cpp:137 -#: ../../locales/../src/interface/FileZilla.cpp:152 -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:142 +#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:159 msgid "Failed to change language" msgstr "Falhou a alteração do idioma" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 +#, fuzzy +msgid "Failed to convert command to 8 bit charset" +msgstr "Não foi possível converter o comando para o código do servidor" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2081 msgid "Failed to copy or move sites" msgstr "Falhou a cópia ou o mover dos sítios" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:328 msgid "Failed to create backup copy of xml file" msgstr "Falhou a criação de uma cópia de segurança do ficheiro xml" -#: ../../locales/../src/interface/netconfwizard.cpp:803 -msgid "Failed to create listen socket, aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:808 +#, fuzzy +msgid "Failed to create listen socket, aborting." msgstr "Falhou a criação de um ponto de supervisão, a abortar" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4078 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4167 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4171 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Falhou a criação de um ponto de supervisão para a transferência em modo " "activo" -#: ../../locales/../src/interface/LocalTreeView.cpp:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:633 msgid "Failed to get 'My Documents' path" msgstr "Falhou a obtenção do caminho para 'Os meus documentos'" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get desktop path" msgstr "Falhou a obtenção do caminho para o ambiente de trabalho" @@ -3772,70 +3896,76 @@ "Falhou a obtenção do endereço do ponto da conexão de dados, ligação " "terminada." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "Falhou a iniciação de um motor FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:754 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:798 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:279 msgid "Failed to initialize TLS." msgstr "Falhou a iniciação do TLS" +#: ../../locales/../src/interface/FileZilla.cpp:93 +msgid "Failed to initialize networking" +msgstr "Falhou a iniciação da rede de trabalho" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Falhou a carga dos painéis, ficheiros de recursos inválidos?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Falha ao carregar a chave privada: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2492 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Falhou a abertura de \"%s\" para anexação/escrita" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2558 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2657 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Falhou a abertura de \"%s\" para leitura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2625 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:997 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Falhou a abertura de \"%s\" para escrita" -#: ../../locales/../src/engine/ControlSocket.cpp:346 +#: ../../locales/../src/engine/ControlSocket.cpp:352 msgid "Failed to parse returned path." msgstr "Falhou a análise do caminho devolvido." -#: ../../locales/../src/interface/netconfwizard.cpp:1023 +#: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "Falhou a recepção de dados" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:189 msgid "Failed to retrieve directory listing" msgstr "Falhou a obtenção da lista de pastas" -#: ../../locales/../src/interface/netconfwizard.cpp:731 -msgid "Failed to retrieve external ip address, aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +#, fuzzy +msgid "Failed to retrieve external ip address, aborting." msgstr "Falhou a obtenção de um endereço IP externo, a abortar" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3785 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3849 msgid "Failed to retrieve external ip address, using local address" msgstr "Falhou a obtenção de um endereço IP externo, a usar o endereço local" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3806 +#: ../../locales/../src/interface/netconfwizard.cpp:712 +#, fuzzy +msgid "Failed to retrieve local ip address, aborting." +msgstr "Falhou a obtenção de um endereço IP local. A abortar" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868 msgid "Failed to retrieve local ip address." msgstr "Falhou a obtenção de um endereço IP local" -#: ../../locales/../src/interface/netconfwizard.cpp:707 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Falhou a obtenção de um endereço IP local. A abortar" - -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Falhou a obtenção de um endereço IP externo." @@ -3843,14 +3973,14 @@ msgid "Failed to send command." msgstr "Falhou o envio do comando." -#: ../../locales/../src/interface/FileZilla.cpp:152 +#: ../../locales/../src/interface/FileZilla.cpp:157 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Falhou a definição do idioma para %s (%s), a utilizar o idioma indicado pelo " "sistema" -#: ../../locales/../src/interface/FileZilla.cpp:130 +#: ../../locales/../src/interface/FileZilla.cpp:135 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3858,49 +3988,48 @@ "Falhou a definição do idioma para %s (%s), a utilizar o idioma indicado pelo " "sistema (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:119 +#: ../../locales/../src/interface/FileZilla.cpp:124 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Falhou a definição do idioma para %s (%s), a utilizar o idioma indicado pelo " "sistema." -#: ../../locales/../src/interface/FileZilla.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:159 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Falhou a definição do idioma para %s, a utilizar o idioma indicado pelo " "sistema" -#: ../../locales/../src/interface/FileZilla.cpp:126 +#: ../../locales/../src/interface/FileZilla.cpp:131 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Falhou a definição do idioma para %s, a utilizar o idioma indicado pelo " "sistema (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:116 +#: ../../locales/../src/interface/FileZilla.cpp:121 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Falhou a definição do idioma para %s, a utilizar o idioma indicado pelo " "sistema." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:214 msgid "Failed to validate settings" msgstr "Falhou a validação das configurações" -#: ../../locales/../src/engine/tlssocket.cpp:1105 +#: ../../locales/../src/engine/tlssocket.cpp:1320 msgid "Failed to verify peer certificate" msgstr "Falhou a verificação do certificado de ponto" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:508 #, c-format msgid "Failed to write to file %s" msgstr "Falhou a escrita no ficheiro %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:341 msgid "Failed to write xml file" msgstr "Falhou a escrita no ficheiro xml" @@ -3912,15 +4041,15 @@ msgid "Fall back to active mode" msgstr "Retroceder para o modo activo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2347 msgid "Fil&e:" msgstr "Fich&eiro:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1343 msgid "Fil&es" msgstr "Fic&heiros" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "Ficheiro" @@ -3928,11 +4057,11 @@ msgid "File Types" msgstr "Tipos de ficheiro" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "File descriptor not a socket" msgstr "Descritor de ficheiro não é um socket" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "O ficheiro não contém qualquer dado que possa ser importado." @@ -3940,7 +4069,7 @@ msgid "File editing" msgstr "Edição do ficheiro" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1630 msgid "File exists" msgstr "O ficheiro existe" @@ -3948,7 +4077,7 @@ msgid "File exists action" msgstr "O ficheiro existe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1694 msgid "File has changed" msgstr "O ficheiro foi alterado" @@ -3956,65 +4085,67 @@ msgid "File lists" msgstr "Listas de ficheiros" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/edithandler.cpp:1562 +#: ../../locales/../src/interface/FileZilla.cpp:589 +#: ../../locales/../src/interface/FileZilla.cpp:674 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Ficheiro não encontrado" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3185 +#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/search.cpp:692 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Procura de ficheiro" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:113 msgid "File transfer aborted by user" msgstr "Transferência interrompida pelo utilizador" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../../locales/../src/engine/ControlSocket.cpp:101 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" "Transferência de ficheiros interrompida pelo utilizador depois de " "transferidos %s em %s" -#: ../../locales/../src/engine/ControlSocket.cpp:136 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer failed" msgstr "Transferência falhada" -#: ../../locales/../src/engine/ControlSocket.cpp:121 +#: ../../locales/../src/engine/ControlSocket.cpp:107 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Transferência do ficheiro falhou depois ter transferido %s em %s" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:120 msgid "File transfer skipped" msgstr "Transferências ignoradas" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:117 msgid "File transfer successful" msgstr "Transferência do ficheiro bem sucedida" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:98 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Transferência bem sucedida, tranferidos %s in %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1136 +#: ../../locales/../src/interface/Mainfrm.cpp:1146 msgid "File transfers still in progress." msgstr "Transferência ainda a decorrer." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2578 msgid "File would transfer with ASCII data type." msgstr "O ficheiro será transferido com o tipo de dados ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 msgid "File would transfer with binary data type." msgstr "O ficheiro será transferido com o tipo de dados binários" -#: ../../locales/../src/interface/FileZilla.cpp:407 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:419 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FileZilla Error" msgstr "Erro do FileZilla" @@ -4026,17 +4157,17 @@ "O FileZilla pode testar a sua configuração agora para certificar-se que está " "tudo correctamente configurado." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "FileZilla is already connected to a server." msgstr "O FileZilla já está ligado a um servidor." -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "O FileZilla tem de ser reiniciado para que tenha efeito a alteração do " "idioma." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2112 msgid "FileZilla updates" msgstr "Actualizações do FileZilla" @@ -4044,46 +4175,42 @@ msgid "Filelist status &bars" msgstr "&Barras de estado das listas de ficheiros" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:286 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "Nome" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Filtros ..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2193 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3017 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2088 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" "O nome do ficheiro para a pasta %s e o ficheiro %s não pode ser construído" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Filename invalid" msgstr "Nome de ficheiro inválido" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "Filename unchanged" msgstr "Nome de ficheiro não modificado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1711 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2144 msgid "Filename:" msgstr "Nome do ficheiro:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "" "Os nomes de ficheiro não podem conter quaisquer dos seguintes caracteres: / " "* ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" @@ -4091,14 +4218,14 @@ "Os nomes de ficheiro não podem conter quaisquer dos seguintes caracteres: / " "\\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2002 msgid "Files currently being edited" msgstr "Ficheiros que estão a ser editados" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:156 msgid "Filesize" msgstr "Tamanho" @@ -4106,18 +4233,18 @@ msgid "Filesize format" msgstr "Formato do tamanho de ficheiro" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:157 msgid "Filetype" msgstr "Tipo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2036 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Associações dos tipos de ficheiros" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1336 msgid "Filter applies to:" msgstr "O filtro aplica-se a:" @@ -4126,44 +4253,49 @@ msgstr "Filtrar caracteres inválidos nos nomes dos ficheiros" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Este nome de filtro já existe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1303 msgid "Filter out items matching all of the following" msgstr "As saídas do filtro correspondem a todos os seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1304 msgid "Filter out items matching any of the following" msgstr "As saídas do filtro não correspondem a quaisquer dos seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1305 msgid "Filter out items matching none of the following" msgstr "As saídas do filtro não correspondem a nenhum dos seguintes" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1306 +#, fuzzy +msgid "Filter out items matching not all of the following" +msgstr "As saídas do filtro correspondem a todos os seguintes" + +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Filter set already exists" msgstr "Este conjunto de filtros já existe" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtrar as listas de pastas" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Falhou a validação do filtro" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 msgid "Find &files" msgstr "Procurar &ficheiros" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 msgid "Find d&irectories" msgstr "Procurar &pastas" @@ -4175,12 +4307,14 @@ msgid "Fingerprint (SHA-256):" msgstr "Impressão digital (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2077 +#, fuzzy +msgid "Fingerprints:" msgstr "Impressão digital:" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Assistente de configuração de firewall e router" @@ -4196,7 +4330,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Para fiabilidade deverá especificar um leque de pelo menos 10 portas." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:245 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4204,7 +4338,7 @@ "Para esta sessão, serão usadas as configurações predefinidas. Qualquer " "alteração a estas não será guardada." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 msgid "Force &UTF-8" msgstr "Forçar ao &UTF-8" @@ -4212,7 +4346,7 @@ msgid "Force showing &hidden files" msgstr "Forçar a mostra de &ficheiros escondidos" -#: ../../locales/../src/interface/Mainfrm.cpp:644 +#: ../../locales/../src/interface/Mainfrm.cpp:655 msgid "Force showing hidden files" msgstr "Forçar a mostra de ficheiros escondidos" @@ -4220,17 +4354,22 @@ msgid "Format specifications:" msgstr "Especificações do formato:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2019 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "Formato: Extensão seguida do comando correcto e dos seus parâmetros." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:646 +#: ../../locales/../src/interface/updater.cpp:686 #, c-format msgid "Found new %s %s\n" msgstr "Procurar novo %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:49 +#, fuzzy, c-format +msgid "Function %s failed" +msgstr "Falhou a validação." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "Further documentation" msgstr "Documentação adicional" @@ -4238,7 +4377,7 @@ msgid "General" msgstr "Geral" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:476 msgid "General SOCKS server failure" msgstr "Falha geral do servidor de SOCKS" @@ -4251,129 +4390,135 @@ msgid "Get external IP address from the following URL:" msgstr "Obter um endereço IP externo a partir do seguinte URL:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 msgid "Getting help" msgstr "Obtendo ajuda" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" "O nome de conjunto de filtros dado já existe, pretende substituir o conjunto " "de filtros?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Marcadores universais" -#: ../../locales/../src/engine/tlssocket.cpp:210 +#: ../../locales/../src/engine/tlssocket.cpp:319 #, c-format msgid "GnuTLS error %d" msgstr "Erro GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket.cpp:322 #, c-format msgid "GnuTLS error %d in %s" msgstr "Erro GnuTLS %d em %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket.cpp:314 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Erro GnuTLS %d em %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:204 +#: ../../locales/../src/engine/tlssocket.cpp:311 #, c-format msgid "GnuTLS error %d: %s" msgstr "Erro GnuTLS %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:707 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "Verde" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:430 msgid "Group permissions" msgstr "Permissões de grupo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "A<o" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP sobre TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2041 msgid "Hash:" msgstr "Mistura:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Escondido" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:905 -#: ../../locales/../src/interface/queue.cpp:992 +#: ../../locales/../src/interface/queue.cpp:888 +#: ../../locales/../src/interface/queue.cpp:944 msgid "High" msgstr "Alta" -#: ../../locales/../src/interface/queue.cpp:907 -#: ../../locales/../src/interface/queue.cpp:994 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Highest" msgstr "Maior" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "A maior porta disponível tem que ser um número entre 1024 e 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1162 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Mantenha premida a tecla shift para alterar o estado do filtro em ambos os " "lados simultaneamente." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:612 msgid "Homepage:" msgstr "Página oficial:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Host is down" msgstr "O Servidor está em baixo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Impressão digital da chave do servidor:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:925 msgid "Host key mismatch" msgstr "A chave do servidor não coincide" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:156 msgid "Host starts with '[' but no closing bracket found." msgstr "" "O nome do servidor começa com '[' mas não foi encontrado o parêntesis no " "fecho." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:485 msgid "Host unreachable" msgstr "Servidor inacessível" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:970 msgid "Host:" msgstr "Servidor:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:980 +#, fuzzy +msgid "Hostkey algorithm:" +msgstr "Algoritmo da chave pública:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:424 msgid "Hours," msgstr "Horas," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1562 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (exemplo: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:116 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Não são suportados endereços IPv6 com proxy SOCKS4" @@ -4387,7 +4532,7 @@ "do que o tempo especificado, a ligação será fechada e o FileZilla tentará " "reconectar-se." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2276 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Se reportar erros, por favor providencie a informação dada no nível \"Verboso" @@ -4413,7 +4558,7 @@ "Se a opção de recuar estiver marcada, será capaz de ligar a servidores " "desconfigurados que regeitem o modo de transferência seleccionado." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:958 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4421,7 +4566,7 @@ "Se não era esperada a mudança na chave do servidor, por favor, contacte o " "administrador." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4429,7 +4574,7 @@ "Se o problema persistir, alguma router e/ou firewall continua a bloquear o " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4437,7 +4582,7 @@ "Se o problema persistir, alguma router e/ou firewall continua a interromper " "a ligação." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2199 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4447,7 +4592,7 @@ "com um \".1\" no fim do nome (talvez reescrevendo ficheiros antigos) e um " "novo ficheiro será criado." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4455,7 +4600,7 @@ "Se a ligação simbólica apontar para uma pasta, o FileZilla pode apagar a " "ligação ou remover os conteúdos da pasta indicada." -#: ../../locales/../src/interface/netconfwizard.cpp:640 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4463,12 +4608,12 @@ "Se este problema persistir, por favor contacte o fabricante do seu router ou " "firewall para uma solução." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Se este problema persistir, por favor contacte o fabricante do seu router." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " @@ -4479,7 +4624,7 @@ "sincronizada com a do servidor. Se as horas forem diferentes (p.ex. fuso " "horário diferente), indique um fuso horário no gestor de sítios." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1788 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4487,7 +4632,7 @@ "Ao usar uma comparação baseada em fusos horários, considera-se dois " "ficheiros iguais quando as diferenças de fuso não excederem este intervalo." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1893 msgid "If you change the language, you need to restart FileZilla." msgstr "Se alterar o idioma, terá de reiniciar o FileZilla." @@ -4499,7 +4644,7 @@ "Se premir em teste, o FileZilla irá fazer a ligação a \"probe.filezilla-" "project.org\" e irá realizar alguns testes simples." -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1168 msgid "If you close FileZilla, your changes will be lost." msgstr "Se sair do FileZilla as alterações serão perdidas." @@ -4523,7 +4668,7 @@ "Se tiver problemas para obter a lista de pastas ou transferir ficheiros, " "tente mudar o modo de transferência." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4558,7 +4703,7 @@ "Se usa um router, certifique-se que todas estas portas são direccionadas " "para a máquina na qual está a correr o FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4566,16 +4711,16 @@ "Se o seu router continuar a alterar o endereço IP, por favor contacte o " "fabricante do seu router." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importar dados de uma versão anterior" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "Import settings" msgstr "Importar configurações" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Importação bem sucedida" @@ -4619,19 +4764,11 @@ "FileZilla pede ao servidor uma porta e liga à porta dada. Não há muita " "configuração a ser feita para isto." -#: ../../locales/../src/engine/tlssocket.cpp:1117 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Cadeia incompleta, o certificado de topo não está assinado por uma " -"autoridade certificadora" - -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "Palavra-passe incorrecta" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4639,7 +4776,7 @@ "Não foi possível obter a informação sobre a última versão do FileZilla. Por " "favor, tente mais tarde." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:745 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:789 msgid "Initializing TLS..." msgstr "A iniciar o TLS ..." @@ -4647,13 +4784,13 @@ msgid "Insecure algorithm!" msgstr "Algorítmo inseguro!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:773 msgid "Insecure server, it does not support FTP over TLS." msgstr "Servidor inseguro, não suporta FTP sobre TLS" -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:910 +#: ../../locales/../src/engine/server.cpp:931 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interactivo" @@ -4661,29 +4798,29 @@ msgid "Interface" msgstr "Interface" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Interrupted by signal" msgstr "Interrompido pelo sinal" #: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "Interrompido pelo utilizador" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 msgid "Invalid Content-Length" msgstr "Comprimento de conteúdo inválido" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 msgid "Invalid HTTP Response" msgstr "Resposta HTTP inválida" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1018 msgid "Invalid argument passed" msgstr "Argumento inválido transmitido" -#: ../../locales/../src/engine/ControlSocket.cpp:455 -#: ../../locales/../src/engine/ControlSocket.cpp:511 +#: ../../locales/../src/engine/ControlSocket.cpp:461 +#: ../../locales/../src/engine/ControlSocket.cpp:518 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4691,45 +4828,50 @@ "Recebida uma sequência de caracteres inválida, a desabilitar UTF-8. " "Seleccione a opção UTF-8 no gestor de sítios para forçar ao UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 msgid "Invalid chunk size" msgstr "Tamanho inválido" -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Recebidos dados inválidos" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Data inválida" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Nome de ficheiro inválido" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:161 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Nome de servidor inválido, após o parêntesis no fecho apenas se podem seguir " "os dois-pontos e a porta." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:641 +#, fuzzy, c-format +msgid "Invalid hostname: %s" +msgstr "Nome de ficheiro inválido" + +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "Invalid input" msgstr "Entrada inválida" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:67 +#: ../../locales/../src/engine/server.cpp:188 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Porta especificada inválida. A porta deve ter um valor entre 1 e 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/engine/server.cpp:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:164 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4743,42 +4885,38 @@ "ftps:// para FTP sobre TLS (implícito) e\n" "ftpes:// para FTP sobre TLS (explícito)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4305 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Servidor proxy inválido, após o parêntesis de fecho apenas se podem seguir " "os dois-pontos e a porta." -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Expressão regular inválida" + +#: ../../locales/../src/interface/search.cpp:692 msgid "Invalid regular expression in search conditions." msgstr "Expressão regular inválida nas condições para a procura." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:568 msgid "Invalid response code" msgstr "Código de resposta inválido" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:687 #, c-format msgid "Invalid search conditions: %s" msgstr "Condições para a procura inválidas: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:786 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Invalid site path" msgstr "Caminho do sítio inválido" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Tamanho inválido nesta condição" @@ -4786,31 +4924,31 @@ msgid "Invalid username given." msgstr "Nome de utilizador inválido." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Invalid value for ai_flags" msgstr "Valor inválido para ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "Invalid value for hints" msgstr "Valor inválido para dicas" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction country:" msgstr "País de jurisdição:" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction locality:" msgstr "Localidade de jurisdição:" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Jurisdiction state or province:" msgstr "Estado ou província de jurisdição:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1745 msgid "Keep directories on top" msgstr "Manter as pastas em cima" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:659 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4821,7 +4959,7 @@ "FilleZilla efectuar alguns testes para verificar se o servidor suporta esta " "funcionalidade, o teste pode falhar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2014 msgid "Key exchange" msgstr "Troca de chave" @@ -4829,29 +4967,29 @@ msgid "Key exchange:" msgstr "Troca de chave:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:908 +#: ../../locales/../src/engine/server.cpp:929 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1331 msgid "Key file" msgstr "Ficheiro chave" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "M&enor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1874 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Idioma" -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "Language changed" msgstr "Idioma alterado" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:158 msgid "Last modified" msgstr "Modificado" @@ -4871,29 +5009,30 @@ msgid "Limit local ports" msgstr "Limitar portas locais" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2168 msgid "Limit size of logfile" msgstr "Limite para o tamanho do ficheiro 'logfile'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2176 msgid "Limit:" msgstr "Limite:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 msgid "Line length exceeded" msgstr "Excedido o comprimento da linha" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:727 msgid "Linked against" msgstr "Unidos contra" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Ponto de supervisão fechado" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Listing:" msgstr "A listar:" @@ -4901,50 +5040,59 @@ msgid "Lo&west available port:" msgstr "Porta &menor disponível:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1144 +#: ../../locales/../src/interface/edithandler.cpp:1380 msgid "Local" msgstr "Local" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1015 msgid "Local address in use" msgstr "Endereços locais em uso" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Local endpoint has been closed" msgstr "O ponto de término local foi encerrado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2291 msgid "Local file" msgstr "Ficheiro local" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:314 msgid "Local file does not exist." msgstr "O ficheiro local não existe." -#: ../../locales/../src/interface/updater.cpp:370 -#: ../../locales/../src/interface/updater.cpp:462 +#: ../../locales/../src/interface/updater.cpp:400 +#: ../../locales/../src/interface/updater.cpp:493 #, c-format msgid "Local file is %s\n" msgstr "O ficheiro local é %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../../locales/../src/interface/manual_transfer.cpp:310 msgid "Local file is a directory instead of a regular file." msgstr "O ficheiro local é na verdade uma pasta e não um ficheiro normal." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Local file is not a valid filename." msgstr "O ficheiro local não tem um nome válido." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:650 +#: ../../locales/../src/interface/search.cpp:656 +msgid "Local file search" +msgstr "Procura de ficheiros locais" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1090 msgid "Local filters:" msgstr "Filtros locais:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3320 +msgid "Local path handling:" +msgstr "Manipulação do caminho local:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Endereço local:" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Locality:" msgstr "Localidade:" @@ -4952,12 +5100,16 @@ msgid "Log file" msgstr "Ligar ao ficheiro" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:965 +msgid "Logged in" +msgstr "Sessão iniciada" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "A iniciar sessão" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:847 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4966,7 +5118,7 @@ "pode não entender UTF-8. Não é possivel tentar o mapa de caracteres local " "uma vez que está a usar o proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:855 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4974,8 +5126,9 @@ "Os dados para início de sessão contêm caracteres que não ASCII e o servidor " "pode não entender o UTF-8. A tentar o mapa de caracteres local." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:884 +#, fuzzy +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" "Sequência de início de sessão totalmente executada no entanto ainda não " "ligado. A abortar." @@ -4995,17 +5148,17 @@ "O tipo de início de sessão apenas pode ser usado com endereços FTP. O " "argumento tem de ser '%s' ou '%s'" -#: ../../locales/../src/interface/queue.cpp:900 -#: ../../locales/../src/interface/queue.cpp:987 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "Low" msgstr "Baixo" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 msgid "Lowest" msgstr "Menor" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "A menor porta disponível tem que ser um número entre 1024 e 65535." @@ -5013,64 +5166,73 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:38 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Certifique-se de que o ficheiro está acessível e de que é um documento XML " "correcto." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 #, c-format msgid "Malformed chunk data: %s" msgstr "Dados mal formados: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 #, c-format msgid "Malformed header: %s" msgstr "Titulo mal formado: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 msgid "Malformed reply, server not sending proper line endings" msgstr "" "Resposta malformada, o servidor não está a enviar fins de linha correctos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2633 +#: ../../locales/../src/interface/manual_transfer.cpp:298 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:310 +#: ../../locales/../src/interface/manual_transfer.cpp:314 +#: ../../locales/../src/interface/manual_transfer.cpp:321 +#: ../../locales/../src/interface/manual_transfer.cpp:327 +#: ../../locales/../src/interface/manual_transfer.cpp:333 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Manual transfer" msgstr "Transferência manual" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3108 msgid "Match all of the following" msgstr "Corresponder a todos os seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 msgid "Match any of the following" msgstr "Corresponder a qualquer dos seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 msgid "Match none of the following" msgstr "Corresponder a nenhum dos seguintes" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3111 +#, fuzzy +msgid "Match not all of the following" +msgstr "Corresponder a todos os seguintes" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "Máximo de &transferências simultâneas:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Memory allocation failure" msgstr "Falha de alocação de memória" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1750 +#: ../../locales/../src/interface/Mainfrm.cpp:385 +#: ../../locales/../src/interface/Mainfrm.cpp:1762 msgid "Message log" msgstr "Janela de mensagens" @@ -5078,84 +5240,88 @@ msgid "Message log position" msgstr "Posição da janela de mensagens" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Message too large" msgstr "Mensagem demasiado grande" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:440 msgid "Minutes" msgstr "Minutos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2206 msgid "Move &down" msgstr "Mover para &baixo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2200 msgid "Move &up" msgstr "Mover para &cima" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:987 msgid "My Computer" msgstr "O meu computador" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:977 msgid "My Documents" msgstr "Os meus documentos" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:339 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:738 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:740 msgid "My Sites" msgstr "Os meus sítios" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:201 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:204 msgid "N/a" msgstr "N/a" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2671 msgid "Name" msgstr "Nome" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216 msgid "Name already exists" msgstr "Este nome já existe" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 msgid "Name of bookmark already exists." msgstr "O nome do marcador já existe." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 msgid "Name:" msgstr "Nome:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 msgid "Natural sort" msgstr "Ordenação natural" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Tem que indicar o nome do filtro" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:650 +msgid "Need to enter valid local path" +msgstr "Tem que indicar um caminho local válido" + +#: ../../locales/../src/interface/search.cpp:677 msgid "Need to enter valid remote path" msgstr "Tem que indicar um caminho remoto válido" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 msgid "Need to specify a character encoding" msgstr "Tem que especificar a codificação de caracteres" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Neither nodename nor servname provided, or not known" msgstr "Nome de nódulo e nome de servidor não providenciados, ou desconhecidos" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5163,12 +5329,12 @@ "O servidor de rede não possui endereços de rede na família de endereços " "requesitados" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Network unreachable" msgstr "Rede inacessível" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2059 msgid "Never" msgstr "Nunca" @@ -5180,37 +5346,37 @@ msgid "New &tab" msgstr "Novo &separador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2876 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Novo &Marcador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2636 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2180 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2236 msgid "New bookmark" msgstr "Novo marcador" -#: ../../locales/../src/interface/LocalTreeView.cpp:1126 -#: ../../locales/../src/interface/RemoteListView.cpp:1310 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 +#: ../../locales/../src/interface/LocalTreeView.cpp:1163 +#: ../../locales/../src/interface/RemoteListView.cpp:1334 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1246 msgid "New directory" msgstr "Nova pasta" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:61 #, c-format msgid "New features and improvements in %s" msgstr "Novas funcionalidades e melhoramentos em %s" @@ -5219,13 +5385,13 @@ msgid "New filter" msgstr "Novo filtro" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:938 msgid "New folder" msgstr "Nova pasta" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../../locales/../src/interface/sitemanager.cpp:602 +#: ../../locales/../src/interface/sitemanager.cpp:616 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2209 msgid "New site" msgstr "Novo sítio" @@ -5233,27 +5399,27 @@ msgid "Next to the transfer queue" msgstr "A seguir à lista de transferências" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:850 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:780 msgid "No" msgstr "Não" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "No address associated with nodename" msgstr "Nenhum endereço associado ao nome do nódulo." -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Nenhuma categoria seleccionada para exportar" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "No command given, aborting." msgstr "Nenhum comando dado, a abortar." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3757 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3821 msgid "No external IP address set, trying default." msgstr "Endereço IP externo não especificado, a tentar o predefinido." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "No files are currently being edited." msgstr "Nenhum ficheiro está a ser editado." @@ -5261,92 +5427,89 @@ msgid "No filter name given" msgstr "Não foi dado um nome ao filtro" -#: ../../locales/../src/engine/server.cpp:77 +#: ../../locales/../src/engine/server.cpp:81 #: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:195 msgid "No host given, please enter a host." msgstr "Servidor não indicado, por favor indique um servidor." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Não há imagens disponíveis" -#: ../../locales/../src/interface/QueueView.cpp:2977 -msgid "No more files in the queue!" -msgstr "Não há mais ficheiros na lista!" - -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "No name for the filterset given." msgstr "Não foi dado um nome ao conjunto de filtros." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3043 msgid "No program associated with filetype" msgstr "Não há programa associado a este tipo de ficheiro." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2960 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Não foi associado um programa para editar ficheiros com esta extensão '%s'." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "No route to host" msgstr "Sem caminho para o servidor" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:397 msgid "No search results" msgstr "Nenhum resultado para a procura" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:349 msgid "No sites available" msgstr "Não há sítios disponíveis" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:454 msgid "No supported SOCKS5 auth method" msgstr "O método de autenticação SOCKS5 não é suportado" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "No username given." msgstr "Não foi indicado nenhum nome de utilizador." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1836 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1855 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Nada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2407 msgid "None selected yet" msgstr "Nenhum seleccionado" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Nonrecoverable failure in name resolution" msgstr "Falha não recuperável na resolução do nome" #: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:903 -#: ../../locales/../src/interface/queue.cpp:990 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/engine/server.cpp:904 +#: ../../locales/../src/engine/server.cpp:925 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/queue.cpp:886 +#: ../../locales/../src/interface/queue.cpp:942 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 msgid "Not all items could be requeued for transfer." msgstr "Nem todos os items podem ser listados para transferência." -#: ../../locales/../src/interface/state.cpp:179 -#: ../../locales/../src/interface/state.cpp:482 +#: ../../locales/../src/interface/state.cpp:181 +#: ../../locales/../src/interface/state.cpp:1244 msgid "Not connected" msgstr "Não ligado" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2045 msgid "Not connected to any server" msgstr "Não ligado a qualquer servidor" @@ -5358,11 +5521,11 @@ msgid "Not connected." msgstr "Não ligado." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Not initialized, need to call WSAStartup" msgstr "Não inicializado, é necessário chamar WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:646 +#: ../../locales/../src/interface/Mainfrm.cpp:657 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Note que esta opção apenas é suportada se usar o protocolo FTP." @@ -5375,7 +5538,7 @@ msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "Nota: Usar um proxy genérico força ao modo passivo, em ligações FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "Number of decimal places:" msgstr "Número de locais decimais:" @@ -5383,40 +5546,41 @@ msgid "Number of retries has to be between 0 and 99." msgstr "O número de tentativas tem de ser entre 0 e 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1970 msgid "O&pen file" msgstr "A&brir ficheiro" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:560 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1480 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1848 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3266 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3633 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3799 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3855 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:748 msgid "OS version:" msgstr "Versão do SO:" @@ -5428,35 +5592,36 @@ "Nas páginas seguintes, o modo de transferência seleccionado será " "configurado, à medida que o modo de recuo seja permitido." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:860 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:790 msgid "Once" msgstr "Uma vez" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "Once a day" msgstr "Uma vez por dia" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2061 msgid "Once a week" msgstr "Uma vez por semana" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:523 msgid "Only use plain FTP (insecure)" msgstr "Usar apenas FTP simples (inseguro)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "Open directory in system's file manager" msgstr "Abrir pasta no gestor de ficheiros do sistema" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Abrir o Gestor de Sítios" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Abre o Gestor de Sítios." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Abre o Gestor de Sítios. Prima o botão direito do rato para ver uma lista de " @@ -5470,14 +5635,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Abre a caixa de configurações do FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 msgid "Opened as:" msgstr "Aberto como:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1695 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1736 +#: ../../locales/../src/interface/LocalListView.cpp:1748 msgid "Opening failed" msgstr "Falhou a abertura" @@ -5489,30 +5654,34 @@ msgid "Opens the Site Manager" msgstr "Abre o Gestor de Sítios" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Abre a caixa de diálogo dos filtros da lista de pastas. Prima o botão " "direito do rato para alternar entre filtros." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "Operating System:" msgstr "Sistema Operativo:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1026 msgid "Operation already in progress" msgstr "Operação já em progresso" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1017 msgid "Operation in progress" msgstr "Operação em progresso" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Operation not supported" msgstr "Operação não suportada" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "Laranja" + +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Organization:" msgstr "Organização:" @@ -5520,16 +5689,16 @@ msgid "Other SFTP options" msgstr "Outras opções SFTP" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Other system error" msgstr "Outro erro de sistema" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:264 msgid "Other:" msgstr "Outro:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1021 +#: ../../locales/../src/engine/socket.cpp:1022 msgid "Out of memory" msgstr "Sem memória" @@ -5537,26 +5706,26 @@ msgid "Overview" msgstr "Introdução" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Substituir &se for mais recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1443 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Substituir ficheiro" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1445 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "Substituir ficheiro se o tamanho diferir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" @@ -5564,34 +5733,34 @@ "Substituir ficheiro se o tamanho diferir ou o ficheiro de origem for mais " "recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1444 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" msgstr "Substituir ficheiro se o ficheiro de origem for mais recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Substituir se o tamanho for &diferente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "" "Substituir se o ta&manho for diferente ou o ficheiro de origem for mais " "recente" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" msgstr "Próprio tipo de compilação: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:396 msgid "Owner permissions" msgstr "Permissões do proprietário" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:404 +#: ../../locales/../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "Proprietário/Grupo" @@ -5607,7 +5776,7 @@ msgid "P&roxy host:" msgstr "Servidor de p&roxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Comando PORT marcado pelo router ou pela firewall." @@ -5615,18 +5784,18 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssivo (recomendado)" -#: ../../locales/../src/interface/Mainfrm.cpp:2320 +#: ../../locales/../src/interface/Mainfrm.cpp:2381 msgid "Parameter not a valid URL" msgstr "O parâmetro não é um caminho URL válido" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:573 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "A analisar %d bytes de informação da versão.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2523 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "Pass&word:" msgstr "&Palavra-passe:" @@ -5639,61 +5808,61 @@ msgid "Passive mode" msgstr "Modo passivo" -#: ../../locales/../src/interface/netconfwizard.cpp:604 -#: ../../locales/../src/interface/netconfwizard.cpp:617 -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "O modo passivo foi definido por defeito para as transferências" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Palavra-passe pedida" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:155 msgid "Path" msgstr "Caminho" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2239 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3104 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2137 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "O caminho para a pasta %s e a subpasta %s não pode ser construído" -#: ../../locales/../src/interface/Mainfrm.cpp:2278 +#: ../../locales/../src/interface/Mainfrm.cpp:2336 msgid "Path not found:" msgstr "Caminho não encontrado:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2698 msgid "Paths" msgstr "Caminhos" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1260 +#: ../../locales/../src/interface/edithandler.cpp:1350 +#: ../../locales/../src/interface/edithandler.cpp:1360 msgid "Pending removal" msgstr "Remoção pendente" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Permissões" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1014 +#: ../../locales/../src/engine/socket.cpp:1023 msgid "Permission denied" msgstr "Permissão negada" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:159 msgid "Permissions" msgstr "Permissões" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:756 msgid "Platform:" msgstr "Plataforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5709,13 +5878,13 @@ "Por favor configure qualquer firewall e router de modo a que o FileZilla " "possa estabelecer ligações a portas arbitrárias." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Por favor desmarque configurações como 'DMZ mode' ou 'Game mode' no seu " "router." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5731,7 +5900,7 @@ msgid "Please enter a custom time format." msgstr "Por favor indique um formato para a hora." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "" @@ -5739,7 +5908,7 @@ "2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5749,16 +5918,16 @@ msgid "Please enter a name for the new filter." msgstr "Por favor indique um nome para o filtro novo." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Por favor indique um novo nome para o filtro copiado." -#: ../../locales/../src/interface/filter.cpp:389 +#: ../../locales/../src/interface/filter.cpp:272 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Por favor indique um novo nome para o conjunto de filtros\"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Por favor indique um novo nome para o filtro." @@ -5784,20 +5953,10 @@ "Por favor insira um número entre 1 e 10 para o número de transferências " "simultâneas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Por favor indique uma palavra-passe para este servidor:" -#: ../../locales/../src/interface/QueueView.cpp:2112 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Por favor indique um caminho e um ficheiro excutável para correr.\n" -"P.ex. c:\\caminho\\ficheiro.exe no MS Windows ou /caminho/ficheiro no Unix.\n" -"Opcionalmente pode especificar os argumentos do programa." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5805,24 +5964,24 @@ "Por favor insira um tempo de espera entre 10 e 9999 segundos ou 0 para " "nenhum." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Please enter a unique name for this filter set" msgstr "Por favor indique um nome único para este conjunto de filtros" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Por favor indique um nome de utilizador para este servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Por favor indique um intervalo de portas válido." -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Por favor indique um URL onde se possa obter o seu endereço externo." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Por favor indique uma velocidade de envio maior ou igual que 0 %s/s." @@ -5835,29 +5994,43 @@ "Por favor indique um comando FTP bruto.\n" "Ao usar comandos ftp brutos limpará o cofre das pastas." -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/QueueView.cpp:1825 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Por favor indique o caminho completo de um programa e os seus argumentos. " +"Este comando será executado assim que terminar o processamento da lista.\n" +"P.ex. c:\\caminho\\ficheiro.exe no MS Windows ou /caminho/ficheiro no Unix.\n" +"É necessário usar aspas para os comandos e seus argumantos se estes conterem " +"espaços." + +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1233 msgid "Please enter the name of the directory which should be created:" msgstr "Por favor indique o nome da pasta que deve ser criada:" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2631 msgid "Please enter the name of the file which should be created:" msgstr "Por favor indique o nome do ficheiro que deve ser criado:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "" "Por favor indique um nome de utilizador e uma palavra-passe para este " "servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Por favor indique o seu endereço IP externo" -#: ../../locales/../src/interface/netconfwizard.cpp:609 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5875,7 +6048,7 @@ "Por favor siga as instruções com cuidado, configurações erradas resultarão " "em ligações FTP falhadas." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5884,12 +6057,12 @@ "ligações com outros computadores e certifique-se de que está a indicou o " "endereço correcto." -#: ../../locales/../src/interface/FileZilla.cpp:136 +#: ../../locales/../src/interface/FileZilla.cpp:141 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Por favor, certifique-se que o local pedido está instalado no seu sistema." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5914,7 +6087,7 @@ "malware. Isto poderá levantar um falso alarme que poderá ignorar com " "segurança." -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:697 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5930,7 +6103,13 @@ "Por favor note que alguns servidores podem bani-lo se tentar ligar " "demasiadas vezes em intervalos de tempo muito curtos." -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:115 +msgid "Please re-add local data directories in the settings dialog." +msgstr "" +"Por favor, volte a adicionar pastas de dados locais na caixa de " +"configurações." + +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5940,11 +6119,11 @@ "ou em caso de encontrar problemas com servidores que anteriormente " "funcionaram bem." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 msgid "Please select an action:" msgstr "Por favor seleccione uma acção:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1667 msgid "Please select the categories you would like to import." msgstr "Por favor seleccione as categorias que deseja importar" @@ -5979,7 +6158,7 @@ msgstr "" "Por favor seleccione os novos atributos para os ficheiros seleccionados." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5998,8 +6177,8 @@ msgid "Positio&n of the message log:" msgstr "Posição da &janela de mensagens:" -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Postal code:" msgstr "Código Postal:" @@ -6011,20 +6190,21 @@ msgid "Preallocation" msgstr "Reserva" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1948 msgid "Predefined Sites" msgstr "Sítios predefinidos" -#: ../../locales/../src/interface/Mainfrm.cpp:685 +#: ../../locales/../src/interface/Mainfrm.cpp:696 msgid "Preserving file timestamps" msgstr "A preservar a data e a hora dos ficheiros" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1482 +#, fuzzy +msgid "Preview" msgstr "Pré-visualizar:" -#: ../../locales/../src/engine/tlssocket.cpp:1134 +#: ../../locales/../src/engine/tlssocket.cpp:1359 msgid "Primary connection and data connection certificates don't match." msgstr "" "Os certificados da ligação anterior e da ligação de dados não coincidem." @@ -6037,15 +6217,15 @@ msgid "Print version information to stdout and exit" msgstr "Imprimir informação sobre a versão para o 'stdout' e sair" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1744 msgid "Prioritize directories (default)" msgstr "Pastas prioritárias (predefinição)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Priority" msgstr "Prioridade" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2100 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6067,25 +6247,25 @@ msgstr "Pa&lavra-passe de Proxy" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "Processar &Lista" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1019 msgid "Process file table overflow" msgstr "Tabela de processo de ficheiro transbordou" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Processado %s em %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1024 msgid "Protocol not supported" msgstr "Protocolo não suportado" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Protocol not supported on given socket type" msgstr "Protocolo não suportado no tipo de socket" @@ -6102,38 +6282,42 @@ msgid "Proxy &user:" msgstr "&Utilizador de Proxy:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:463 msgid "Proxy authentication failed" msgstr "Falhou a autenticação do proxy." -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/transfersocket.cpp:106 +#: ../../locales/../src/engine/transfersocket.cpp:118 #, c-format msgid "Proxy handshake failed: %s" msgstr "Falhou a saudação do proxy: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4299 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "O nome do servidor de proxy começa com '[' mas não foi encontrado o " "parêntesis no fecho." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:322 #, c-format msgid "Proxy reply: %s" msgstr "Resposta do proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:504 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Falhou o pedido de proxy. Resposta do proxy: %s" + +#: ../../locales/../src/engine/proxy.cpp:377 #, c-format msgid "Proxy request failed: %s" msgstr "Falhou o pedido de proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Falhou o pedido de proxy: Desconhecido o tipo do endereço na resposta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4241 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4328 msgid "Proxy set but proxy host or port invalid" msgstr "" "Configuração do Proxy feita mas ou o servidor proxy ou a porta são inválidos" @@ -6146,47 +6330,48 @@ msgid "Public key algorithm:" msgstr "Algoritmo da chave pública:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:464 msgid "Public permissions" msgstr "Permissões públicas" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:2688 msgid "Queue has been fully processed" msgstr "A lista foi processada totalmente" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:436 #, c-format msgid "Queue: %s MiB" msgstr "Fila de espera: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:372 #, c-format msgid "Queue: %s%s" msgstr "Lista de espera: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:368 +#: ../../locales/../src/interface/statusbar.cpp:427 msgid "Queue: empty" msgstr "Lista: vazia" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Ficheiros listados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Queueing:" msgstr "A Listar:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "R&einiciar o computador" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" +msgstr "R&einiciar o sistema uma vez" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "Á&rvore de pastas remota" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "R&eset and requeue selected files" msgstr "&Limpar e voltar a listar os ficheiros seleccionados" @@ -6194,7 +6379,7 @@ msgid "Raw FTP command" msgstr "Comando FTP bruto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:437 msgid "Re&ad" msgstr "L&er" @@ -6203,11 +6388,11 @@ msgid "Re&fresh" msgstr "Ac&tualizar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Mu&dar o nome" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6215,20 +6400,20 @@ "Volte a correr o assistente e verifique com cuidado as configurações de " "todas as routers e firewalls." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:471 msgid "Rea&d" msgstr "Le&r" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Apenas Leitura" -#: ../../locales/../src/interface/Mainfrm.cpp:1022 +#: ../../locales/../src/interface/Mainfrm.cpp:1037 msgid "Really cancel current operation?" msgstr "Tem a certeza que pretende cancelar a operação actual?" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:761 +#: ../../locales/../src/interface/RemoteListView.cpp:1415 +#: ../../locales/../src/interface/search.cpp:1195 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6236,77 +6421,85 @@ msgstr[0] "Deseja mesmo apagar a pasta %d e todo o seu conteúdo ?" msgstr[1] "Deseja mesmo apagar as pastas '%d' e todo o seu conteúdo ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1384 -#: ../../locales/../src/interface/search.cpp:759 +#: ../../locales/../src/interface/RemoteListView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1193 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Deseja mesmo apagar o ficheiro %d ?" msgstr[1] "Deseja mesmo apagar os ficheiros %d ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1391 -#: ../../locales/../src/interface/search.cpp:765 +#: ../../locales/../src/interface/RemoteListView.cpp:1420 +#: ../../locales/../src/interface/search.cpp:1199 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Deseja mesmo apagar %s e %s ?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1051 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Deseja mesmo apagar os ficheiros e/ou pastas seleccionados, no servidor?" -#: ../../locales/../src/engine/local_filesys.cpp:129 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" "Deseja mesmo apagar os ficheiros e/ou pastas seleccionados, no seu " "computador?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Reason" msgstr "Razão" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2681 msgid "Reboot now" msgstr "Reiniciar agora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:525 msgid "Rec&urse into subdirectories" msgstr "Exp&lorar subpastas" -#: ../../locales/../src/engine/tlssocket.cpp:223 +#: ../../locales/../src/engine/tlssocket.cpp:333 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Recebido um alerta TLS do servidor: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:2998 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Foi recebida uma lista de pastas que parece ser codificada em EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:1984 +#: ../../locales/../src/engine/directorylistingparser.cpp:2001 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Recebida uma linha que excede os 10000 caracteres, a abortar." -#: ../../locales/../src/interface/netconfwizard.cpp:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1016 -#: ../../locales/../src/interface/netconfwizard.cpp:1039 +#: ../../locales/../src/engine/tlssocket.cpp:1342 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Não foi possível verificar a cadeia recebida no certificado. O estado da " +"verificação é %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1006 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "Dados marcados recebidos." -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:552 msgid "Received invalid character in version information" msgstr "Caracteres inválidos recebidos na informação sobre a versão" -#: ../../locales/../src/engine/tlssocket.cpp:226 +#: ../../locales/../src/engine/tlssocket.cpp:336 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Recebido do servidor o alerta TLS desconhecido %d" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:545 msgid "Received version information is too large" msgstr "A informação sobre a versão recebida é demasiado grande" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6319,73 +6512,71 @@ msgid "Reconnection settings" msgstr "Configurações para voltar a ligar" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Volta a ligar ao último servidor usado" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "A adicionar constantemente ficheiros à lista." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "A alterar permissóes constantemente." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "A apagar constantemente ficheiros e pastas." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/interface/sitemanager.cpp:17 +msgid "Red" +msgstr "Vermelho" + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:619 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Redireccionamento para um inválido ou não suportado URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:656 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:626 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Redireccionamento para endereços inválidos ou não suportados: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Actualiza as listas de ficheiros e de pastas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3875 msgid "Remember passwords?" msgstr "Lembrar as palavras-passe?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1107 msgid "Remote" msgstr "Remoto" -#: ../../locales/../src/engine/tlssocket.cpp:852 +#: ../../locales/../src/engine/tlssocket.cpp:977 msgid "Remote certificate not trusted." msgstr "O certificado remoto não é de confiança." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2326 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Remote file" msgstr "Ficheiro remoto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:383 -#: ../../locales/../src/interface/search.cpp:388 -#: ../../locales/../src/interface/search.cpp:397 -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/search.cpp:672 +#: ../../locales/../src/interface/search.cpp:677 msgid "Remote file search" msgstr "Procura de ficheiros remotos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1125 msgid "Remote filters:" msgstr "Filtros remotos:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1098 msgid "Remote path" msgstr "Caminho remoto" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6395,7 +6586,7 @@ "caminho absoluto válido e suportado pelo tipo do servidor actual do sítio " "(%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1132 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6405,50 +6596,50 @@ "caminho absoluto válido e suportado pelo tipo do servidor (%s) seleccionado " "no sítio origem." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Não foi possível analisar o caminho remoto. Certifique-se de que é um " "caminho absoluto válido" -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:333 msgid "Remote path could not be parsed." msgstr "Não foi possível analisar o caminho remoto." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3225 msgid "Remote path handling:" msgstr "A tratar caminho remoto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Remote path:" msgstr "Caminho remoto:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Endereço remoto:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 msgid "Remove &all" msgstr "Remover &tudo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &selected" msgstr "Remover &seleccionados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1448 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Rename file" msgstr "Mudar o nome do ficheiro" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 msgid "Rename selected directory" msgstr "Mudar o nome da pasta seleccionada" @@ -6457,70 +6648,70 @@ msgid "Rename selected files and directories" msgstr "Mudar o nome aos ficheiros e às pastas seleccionados" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2438 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3455 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2332 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Mudar o nome de '%s' para '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 msgid "Reporting bugs and feature requests" msgstr "Reportar erros e pedidos de funcionalidades" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:368 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "O pedido falhou - o cliente não está a correr identd (ou não está acessível " "pelo servidor)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:371 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "O pedido falhou - o identd do cliente não confirmou o ID do utilizador" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:365 msgid "Request rejected or failed" msgstr "Pedido rejeitado ou falhado" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:521 msgid "Require explicit FTP over TLS" msgstr "Requer FTP sobre TLS explícito" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "Require implicit FTP over TLS" msgstr "Requer FTP sobre TLS implícito" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 msgid "Reset and requeue &all" msgstr "Limpar e voltar a listar &todos os ficheiros" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Resolved protocol is unknown" msgstr "Protocolo desconhecido" -#: ../../locales/../src/engine/ControlSocket.cpp:1081 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:443 #, c-format msgid "Resolving address of %s" msgstr "A resolver o endereço de %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1025 msgid "Resource temporarily unavailable" msgstr "Recurso temporariamente indisponível" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:353 msgid "Response:" msgstr "Resposta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3171 msgid "Results:" msgstr "Resultados:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" @@ -6534,19 +6725,19 @@ "O retomar de ficheiros ASCII pode causar problemas se o servidor usar um " "término de linha diferente da do cliente." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:939 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1346 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:868 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "A obter a lista de pastas de \"%s\" ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1269 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:936 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1343 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:865 msgid "Retrieving directory listing..." msgstr "A obter a lista de pastas ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3772 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3836 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "A obter endereço IP externo a partir de %s" @@ -6559,17 +6750,17 @@ msgid "S&how the Site Manager on startup" msgstr "Mostrar o &Gestor de Sítios ao iniciar." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "D&esligar o computador" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" +msgstr "D&esligar o sistema uma vez" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3095 msgid "S&top" msgstr "&Parar" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "S&uspender o sistema" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" +msgstr "S&uspender o sistema uma vez" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" @@ -6583,47 +6774,51 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:142 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "O proxy SOCKS4 ligará a: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:170 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"O SOCKS5 não suporta nomes de utilizador ou palavra-passes com mais de 255 " +"caracteres." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:715 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "Guardar configurações?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:442 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "Saving of password has been disabled by your system administrator." msgstr "" "O guardar da palavra-passe não tem a permissão do administrador do sistema." -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:993 msgid "Saving of passwords has been disabled by you." msgstr "O guardar das palavras-passe não tem a sua permissão." -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "A procurar ficheiros para adicionar à lista" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "A procurar ficheiros para enviar" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1462 +#, fuzzy +msgid "Scale factor:" +msgstr "Pasta &local:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3101 msgid "Search &conditions:" msgstr "&Condições para a procura:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3083 msgid "Search &directory:" msgstr "Procurar na &pasta:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Procurar ficheiros novamente." @@ -6631,17 +6826,21 @@ msgid "Search server for files" msgstr "Procurar no servidor pelos ficheiros" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3052 +msgid "Search type:" +msgstr "Tipo de procura:" + +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Security information" msgstr "Informações de segurança" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "Consulte também: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2414 msgid "Sele&ct server" msgstr "Sele&ccionar servidor" @@ -6660,7 +6859,7 @@ "Seleccione as acções predefinidas para executar se o ficheiro já existir no " "destino." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1543 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Seleccionar o editor predefinido" @@ -6681,138 +6880,143 @@ "Seleccione a acção predefinida se o ficheiro já existir no destino, apenas " "para os ficheiros actualmente seleccionados na lista." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "Seleccione o ficheiro que contém a chave privada" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Seleccione um ficheiro para os dados exportados" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1489 +#: ../../locales/../src/interface/export.cpp:45 +#, fuzzy +msgid "Select file for exported filters" +msgstr "Seleccione um ficheiro para os sítios exportados" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1427 msgid "Select file for exported queue" msgstr "Seleccione um ficheiro para a lista exportada" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Seleccione um ficheiro para exportadar as configurações" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2208 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2281 msgid "Select file for exported sites" msgstr "Seleccione um ficheiro para os sítios exportados" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Seleccione um ficheiro para importar as configurações" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Seleccione o ficheiro para enviar" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Seleccione um nome para o ficheiro chave convertido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 msgid "Select how these files should be opened." msgstr "Seleccione como deverão ser abertos estes ficheiros." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:856 msgid "Select target download directory" msgstr "Seleccione a pasta de destino para descargas" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Seleccionar o nome do ficheiro pretendido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1580 msgid "Select the categories to export:" msgstr "Seleccione as categorias para exportar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1506 msgid "Select the private data you would like to delete." msgstr "Seleccione os dados privados que deseja apagar." -#: ../../locales/../src/interface/search.cpp:475 +#: ../../locales/../src/interface/search.cpp:815 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Seleccionada %d pasta e o seu conteúdo para transferir." msgstr[1] "Seleccionadas %d pastas e o seu conteúdo para transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Seleccionada %d pasta." msgstr[1] "Seleccionadas %d pastas." -#: ../../locales/../src/interface/search.cpp:473 +#: ../../locales/../src/interface/search.cpp:813 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Seleccionado %d ficheiro para transferir." msgstr[1] "Seleccionados %d ficheiros para transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Seleccionado %d ficheiro. Tamanho: %s" msgstr[1] "Seleccionados %d ficheiros. Tamanho: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Seleccionado %d ficheiro. Tamanho: No mínimo %s" msgstr[1] "Seleccionados %d ficheiros. Tamanho: No mínimo %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:819 #, c-format msgid "Selected %s and %s for transfer." msgstr "Seleccionados %s e %s para transferir." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Seleccionados %s e %s. Tamanho: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Seleccionados %s e %s. Tamanho: No mínimo %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1562 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "O editor seleccionado não existe." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1867 msgid "Selected file already being edited" msgstr "O ficheiro seleccionado já está a ser editado." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "O ficheiro seleccionado já está carregado." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "Selected file is already opened" msgstr "O ficheiro seleccionado já está aberto" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "Selected file is still being edited" msgstr "O ficheiro seleccionado ainda está a ser editado" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Selected filter only works for local files." msgstr "O filtro seleccionado apenas funciona para ficheiros locais." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:300 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6821,7 +7025,7 @@ "de servidor.\n" "Use marcadores próprios para este servidor." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:306 msgid "Selected port usually in use by a different protocol." msgstr "A porta seleccionada é habitualmente usada por um protocolo diferente." @@ -6834,34 +7038,34 @@ msgstr "" "Envia comandos personalizados ao servidor de outro modo não disponíveis" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4406 msgid "Sending keep-alive command" msgstr "A enviar um comando para manter a actividade" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Serial number:" msgstr "Número de série:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:317 msgid "Server &Type:" msgstr "&Tipo de Servidor:" -#: ../../locales/../src/engine/tlssocket.cpp:741 +#: ../../locales/../src/engine/tlssocket.cpp:866 msgid "Server did not properly shut down TLS connection" msgstr "O servidor não fechou devidamente a ligação TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:890 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:945 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1006 msgid "Server does not support non-ASCII characters." msgstr "O Servidor não suporta caracteres que não sejam ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4153 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4244 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "O Servidor não suporta o retomar de ficheiros > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4149 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6870,15 +7074,19 @@ "O Servidor não suporta o retomar de ficheiros > %d GB. Terminar a " "transferência se o tamanho dos ficheiros for maior." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2426 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528 msgid "Server does not support resume of files > 2GB." msgstr "O Servidor não suporta o retomar de ficheiros > 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2422 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 msgid "Server does not support resume of files > 4GB." msgstr "O Servidor não suporta o retomar de ficheiros > 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2060 +msgid "Server host key" +msgstr "" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4253 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6887,7 +7095,7 @@ "O Servidor pode não suportar o retomar de ficheiros > %d GB. Terminar a " "transferência se o tamanho dos ficheiros for maior." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:886 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6895,11 +7103,11 @@ "O Servidor pode exigir uma conta. Tente especificar uma conta através do " "Gestor de Sítios." -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:349 msgid "Server returned empty path." msgstr "O servidor devolveu um caminho vazio." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:620 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6907,13 +7115,13 @@ "O servidor enviou um pedido de início de sessão adicional. Precisa de usar " "início de sessão interactivo." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3787 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "O servidor enviou uma resposta passiva com um endereço indeterminável. " "Falhou o modo passivo." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3782 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6921,36 +7129,43 @@ "O servidor enviou uma resposta passiva com um endereço indeterminável. A " "usar, ao invés, o endereço do servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:419 -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:465 -#: ../../locales/../src/interface/netconfwizard.cpp:474 -#: ../../locales/../src/interface/netconfwizard.cpp:486 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "O servidor enviou uma resposta inesperada." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket.cpp:1254 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"O servidor enviou uma cadeia não ordenada no certificado, violando assim as " +"específicações TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Server to client MAC:" msgstr "MAC do servidor para o cliente:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2123 msgid "Server to client cipher:" msgstr "Cifra do servidor para o cliente:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2477 msgid "Server&type:" msgstr "Tipo de &servidor:" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Server/Local file" msgstr "Ficheiro remoto/local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1731 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2400 msgid "Server:" msgstr "Servidor:" @@ -6958,29 +7173,29 @@ msgid "Session details" msgstr "Detalhes da sessão" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "Definir &Prioridade" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3599 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2214 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Definir permissões de '%s' para '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:791 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize chamado sem socket" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "Configurações" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:772 msgid "Settings directory:" msgstr "Pasta de configurações:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "Mostrar &o balão de notificação" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2284 msgid "Show &raw directory listing" msgstr "Mostrar &lista de pastas em bruto" @@ -6988,19 +7203,20 @@ msgid "Show &welcome dialog..." msgstr "Mostrar a janela de &boas-vindas..." -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2223 msgid "Show both directory trees and continue comparing?" msgstr "Mostrar ambas as árvores de pastas e continuar a comparação?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Mostrar detalhes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1599 msgid "Show details about custom date and time formats" msgstr "Mostrar detalhes sobre formatos de data e hora personalizados" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "Shows available TLS ciphers" msgstr "Mostrar as cifras TLS disponíveis" @@ -7008,7 +7224,7 @@ msgid "Shows this help dialog" msgstr "Mostra esta janela de ajuda" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2677 msgid "Shutdown now" msgstr "Desligar o computador" @@ -7016,7 +7232,7 @@ msgid "Signature algorithm:" msgstr "Algorítmo de assinatura:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Site &Manager entries" msgstr "Entradas do &Gestor de Sítios" @@ -7024,56 +7240,55 @@ msgid "Site Manager" msgstr "Gestor de Sítios" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 msgid "Site Manager - Cannot remember password" msgstr "Gestor de Sítios - Não lembrar a palavra-passe" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 #: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1067 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1076 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1100 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1109 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1144 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "Site Manager - Invalid data" msgstr "Gestor de Sítios - Dados inválidos" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "Gestor de Sítios já aberto" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:486 +#: ../../locales/../src/interface/sitemanager.cpp:514 +#: ../../locales/../src/interface/sitemanager.cpp:528 +#: ../../locales/../src/interface/sitemanager.cpp:540 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Site does not exist." msgstr "O sítio não existe." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:497 msgid "Site path has to begin with 0 or 1." msgstr "O caminho do sítio tem de começar com 0 ou 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:534 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:786 msgid "Site path is malformed." msgstr "O caminho para o sítio está incorrecto." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Marcadores próprios dos sítios" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7083,11 +7298,11 @@ "Gestor de Sítios.\n" "Adicionar a ligação actual ao gestor de sítios?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Size" msgstr "Tamanho" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1613 msgid "Size formatting" msgstr "Formato do tamanho" @@ -7095,50 +7310,55 @@ msgid "Size unknown" msgstr "Tamanho desconhecido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1449 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "Saltar ficheiro" -#: ../../locales/../src/engine/ControlSocket.cpp:1152 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1193 -#: ../../locales/../src/engine/ControlSocket.cpp:1253 +#: ../../locales/../src/engine/ControlSocket.cpp:1160 +#: ../../locales/../src/engine/ControlSocket.cpp:1177 +#: ../../locales/../src/engine/ControlSocket.cpp:1203 +#: ../../locales/../src/engine/ControlSocket.cpp:1281 #, c-format msgid "Skipping download of %s" msgstr "A saltar a transferência de %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1156 -#: ../../locales/../src/engine/ControlSocket.cpp:1172 -#: ../../locales/../src/engine/ControlSocket.cpp:1197 -#: ../../locales/../src/engine/ControlSocket.cpp:1257 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:309 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Ignorando arquivo chave não existente \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1163 +#: ../../locales/../src/engine/ControlSocket.cpp:1180 +#: ../../locales/../src/engine/ControlSocket.cpp:1206 +#: ../../locales/../src/engine/ControlSocket.cpp:1284 #, c-format msgid "Skipping upload of %s" msgstr "A saltar o envio de %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1029 msgid "Socket address outside address space" msgstr "Endereço de socket fora do espaço do endereço" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Socket already connected" msgstr "Socket já ligado" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Socket has been shut down" msgstr "O socket foi encerrado" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Socket not connected" msgstr "Socket não ligado" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Socket type not supported for address family" msgstr "Tipo de socket não suportado para endereço de família" -#: ../../locales/../src/interface/Mainfrm.cpp:1157 +#: ../../locales/../src/interface/Mainfrm.cpp:1167 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Alguns ficheiros ainda estão a ser editados ou precisam de ser enviados." @@ -7152,31 +7372,31 @@ "Alguns servidores desconfigurados e que estão atrás de um router podem " "responder com o endereço IP local, deles próprios." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1746 msgid "Sort directories inline" msgstr "Ordenar as pastas em linha" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." msgstr "A ordenação não pode ser alterada quando a comparar pastas." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1730 msgid "Sorting" msgstr "Ordenar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1737 msgid "Sorting &mode:" msgstr "Modo de &classificação:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:107 msgid "Source and path of the drop operation are identical" msgstr "O caminho e a fonte da operação 'largar' são idênticos" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "O ficheiro original e o de destino podem não ser os mesmos" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "O destino e a fonte da operação 'largar' são idênticos" @@ -7184,9 +7404,9 @@ msgid "Source file:" msgstr "Ficheiro fonte:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3817 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Limites de Velocidade" @@ -7194,27 +7414,27 @@ msgid "Speed limits" msgstr "Limites de velocidade" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:586 msgid "Speed limits are disabled, click to change." msgstr "Os limites de velocidade estão desativados, prima para mudar" -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:589 msgid "Speed limits are enabled, click to change." msgstr "Os limites de velocidade estão activados, prima para mudar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2078 msgid "Stable and beta versions" msgstr "Versões estáveis e beta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2077 msgid "Stable versions only" msgstr "Apenas versões estáveis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2079 msgid "Stable, beta and nightly versions" msgstr "Versões estáveis, beta e de desenvolvimento" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "Start transfer &immediately" msgstr "Começar a transferência de &imediato" @@ -7222,19 +7442,19 @@ msgid "Start with opened Site Manager" msgstr "Começar com o Gestor de Sítios aberto" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" msgstr "Iniciada verificação de actualização em %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2146 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1583 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2232 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1468 #, c-format msgid "Starting download of %s" msgstr "A iniciar a transferência de %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2149 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1586 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1471 #, c-format msgid "Starting upload of %s" msgstr "A iniciar o envio de %s" @@ -7243,30 +7463,30 @@ msgid "Starts the local site in the given path" msgstr "Inicia o sítio local no caminho indicado" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "State or province:" msgstr "Estado ou província" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Status" msgstr "Estado" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:377 msgid "Status:" msgstr "Estado:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "Parar e remover &tudo" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Parar a operação constante" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Street:" msgstr "Rua:" @@ -7282,11 +7502,11 @@ msgid "Summary of test results:" msgstr "Sumário dos resultados do teste:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2685 msgid "Suspend now" msgstr "Suspender agora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3419 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7294,29 +7514,33 @@ "As ligações simbólicas aos ficheiros não são afectadas por esta opção, tais " "ligações são sempre apagadas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:238 -#: ../../locales/../src/interface/state.cpp:252 -#: ../../locales/../src/interface/state.cpp:258 -#: ../../locales/../src/interface/state.cpp:268 -#: ../../locales/../src/interface/state.cpp:355 -#: ../../locales/../src/interface/state.cpp:363 -#: ../../locales/../src/interface/state.cpp:371 -#: ../../locales/../src/interface/state.cpp:930 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3878 +#: ../../locales/../src/interface/state.cpp:233 +#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:255 +#: ../../locales/../src/interface/state.cpp:266 +#: ../../locales/../src/interface/state.cpp:365 +#: ../../locales/../src/interface/state.cpp:373 +#: ../../locales/../src/interface/state.cpp:381 +#: ../../locales/../src/interface/state.cpp:1003 +#: ../../locales/../src/interface/state.cpp:1011 +#: ../../locales/../src/interface/state.cpp:1018 +#: ../../locales/../src/interface/state.cpp:1027 +#: ../../locales/../src/interface/state.cpp:1054 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Navegação sincronizada" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:380 msgid "Synchronized browsing has been disabled." msgstr "A navegação sincronizada foi desligada." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "A sincronizar pastas." + +#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:165 msgid "Syntax error" msgstr "Erro de sintaxe" @@ -7325,24 +7549,24 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2280 -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2338 +#: ../../locales/../src/interface/Mainfrm.cpp:2383 msgid "Syntax error in command line" msgstr "Erro de sintaxe na linha de comandos" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Sistema" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:784 msgid "System details" msgstr "Detalhes do sistema" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1020 msgid "System limit of open files exceeded" msgstr "Limite do sistema para ficheiros abertos excedido" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "System's network subsystem has failed" msgstr "Subsistema do sistema de rede falhou" @@ -7350,19 +7574,19 @@ msgid "T&oolbar" msgstr "Barra de &ferramentas" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:289 msgid "TLS connection established, sending HTTP request" msgstr "Ligação TLS estabelecida, a enviar o pedido HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:436 msgid "TLS connection established, waiting for welcome message..." msgstr "Ligação TLS estabelecida, à espera da mensagem de boas-vindas ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:439 msgid "TLS connection established." msgstr "Ligação TLS estabelecida." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "TTL expired" msgstr "TTL expirado" @@ -7370,37 +7594,41 @@ msgid "Target file already exists" msgstr "O ficheiro já existe no destino" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Ficheiro destino:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2647 msgid "Target filename already exists!" msgstr "O nome do ficheiro já existe no destino!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1630 msgid "Target filename already exists, really continue?" msgstr "" "O nome do ficheiro já existe no destino, tem a certeza que quer continuar?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Temporary failure in name resolution" msgstr "Falha temporária na resolução do nome" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "O teste foi bem sucedido" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Resultados do teste" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4170 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4258 msgid "Testing resume capabilities of server" msgstr "A testar as capacidades de retoma do servidor" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:749 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "" "O Gestor de Sítios não pode ser usado sem que o ficheiro seja reparado." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7410,7 +7638,7 @@ "Deseja continuar? Quaisquer alterações ao Gestor de Sítios não serão " "guardadas." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7418,29 +7646,29 @@ "O Gestor de Sítios está aberto noutra instância do FileZilla 3.\n" "Por favor feche-o ou os dados não serão apagados." -#: ../../locales/../src/interface/netconfwizard.cpp:634 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "O endereço que introduziu foi: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "The ai_family member is not supported" msgstr "O membro ai_family não é suportado" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "The ai_socktype member is not supported" msgstr "O membro ai_socktype não é suportado" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:685 msgid "The bookmark could not be added." msgstr "Não foi possível guardar o marcador." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:773 msgid "The bookmarks could not be cleared." msgstr "Não foi possível limpar os marcadores." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/interface/statusbar.cpp:471 msgid "The connection is encrypted. Click icon for details." msgstr "A ligação está encriptada. Prima o ícone para mais detalhes." @@ -7462,34 +7690,34 @@ "O formato de hora personalizado é inválido ou contém especificadores não " "suportados." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/transfersocket.cpp:144 #, c-format msgid "The data connection could not be established: %s" msgstr "Não foi possível estabelecer a ligação de dados: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "The default editor for text files could not be found." msgstr "Não foi encontrado o editor para os ficheiros de texto." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 #, c-format msgid "The default editor for text files is '%s'." msgstr "O editor para os ficheiros de texto é o '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "O nome de filtro indicado já existe, por favor, indique um diferente." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "A extensão '%s' já existe na lista" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:290 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:298 #, c-format msgid "" "The file %s already exists.\n" @@ -7498,8 +7726,8 @@ "O ficheiro %s já existe.\n" "Por favor insira um novo nome:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../../locales/../src/interface/edithandler.cpp:1633 +#: ../../locales/../src/interface/LocalListView.cpp:1740 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7510,7 +7738,7 @@ "Não foi encontrado o programa associado (%s).\n" "Por favor verifique as associações dos tipos de ficheiros." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7519,20 +7747,20 @@ "O ficheiro '%s' comtêm uma chave SSH1. O protocolo SSH1 está obsoleto. O " "FileZilla apenas suporta chaves SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" "Não foi possível carregar o ficheiro '%s' ou este não contém uma chave " "privada." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:36 #, c-format msgid "The file '%s' could not be loaded." msgstr "Não foi possível carregar o ficheiro '%s'." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7541,8 +7769,8 @@ "Não foi possível abrir o ficheiro '%s':\n" "Nenhum programa está associado no seu sistema a este tipo de ficheiro." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1748 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7551,8 +7779,8 @@ "Não foi possível abrir o ficheiro '%s':\n" "O comando associado falhou" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:756 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7564,7 +7792,7 @@ "de informação.\n" "Quer continuar?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7577,7 +7805,7 @@ msgid "The file selected as default editor does not exist." msgstr "O ficheiro seleccionado como editor predefinido não existe." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7591,11 +7819,11 @@ "e palavra-passe serão importados.\n" "Continuar com a importação?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "A coluna do nome de ficheiros não pode ser escondida nem movida." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "A coluna do nome dos ficheiros não pode ser escondida." @@ -7609,19 +7837,19 @@ msgid "The following characters will be replaced: %s" msgstr "Os seguintes caracteres serão substituídos: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1928 msgid "The following files are currently being edited:" msgstr "Os ficheiros seguintes estão a ser editados:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3474 msgid "The free open source FTP solution" msgstr "A solução FTP de código aberto gratuita" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Não foi possível guardar os marcadores globais." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2271 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7635,17 +7863,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "O limite tem de ser entre 1 e 2000 MiB." -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:1054 #, c-format msgid "The local directory '%s' could not be created." msgstr "Não foi possível criar a pasta local '%s'." -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:1039 #, c-format msgid "The local directory '%s' does not exist." msgstr "Não existe a pasta local '%s'." -#: ../../locales/../src/interface/state.cpp:249 +#: ../../locales/../src/interface/state.cpp:245 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7655,32 +7883,32 @@ "Desligar a navegação sincronizada e continuar com as alterações na pasta " "local?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." msgstr "" "A menor porta disponível tem que ser menor ou igual à maior porta disponível." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "" "Não foi possível transferir a nova versão, por favor, tente mais tarde." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "A nova versão foi guardada na sua pasta de Transferências." -#: ../../locales/../src/interface/QueueView.cpp:1832 +#: ../../locales/../src/interface/QueueView.cpp:1524 msgid "The queue will not be saved." msgstr "A lista não será guardada." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:961 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Não existe a pasta remota '%s'." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:1008 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7690,30 +7918,30 @@ "Desligar a navegação sincronizada e continuar com as alterações na pasta " "remota?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "As categorias seleccionadas foram importadas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "O ficheiro seleccionado contém dados importáveis para as seguintes " "categorias." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1874 msgid "The selected file is already being edited:" msgstr "O ficheiro seleccionado já está a ser editado:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "O ficheiro seleccionado ainda está aberto noutro qualquer programa, por " "favor feche-o." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7723,15 +7951,15 @@ "Isto poderá ser perigoso e danificar o seu sistema.\n" "Quer mesmo continuar?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:581 msgid "The server could not be added." msgstr "Não foi possível adicionar o servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "O servidor enviou uma resposta inesperada ou não reconhecida." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:530 msgid "The server uses following charset encoding for filenames:" msgstr "" "O servidor utiliza o seguinte mapa de caracteres para os nomes de ficheiro:" @@ -7744,7 +7972,7 @@ "O certificado do servidor é desconhecido. Por favor examine com cuidado o " "certificado para ter a certeza que o servidor é de confiança." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:951 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7754,7 +7982,7 @@ "que, ou o administrador alterou a chave do servidor, ou está a tentar ligar " "a um computador que se faz passar pelo servidor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7762,11 +7990,15 @@ "A chave do servidor é desconhecida. Não tem garantias que o servidor é o " "computador que pensa que é." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/tlssocket.cpp:1339 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "O nome do servidor não corresponde ao indicado no certificado" + +#: ../../locales/../src/engine/socket.cpp:1068 msgid "The servname parameter is not supported for ai_socktype" msgstr "O parâmetro não é suportado para ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7774,19 +8006,19 @@ "As configurações foram importadas. Tem de reiniciar o FileZilla para que " "todas as configurações produzam efeito." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1016 msgid "The specified address family is not supported" msgstr "A família de endereços especificada não é suportada" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "The specified network name is no longer available" msgstr "O nome da rede especificado já não se encontra disponível" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:2680 msgid "The system will soon reboot unless you click Cancel." msgstr "O sistema irá reiniciar em breve a não ser que prima em Cancelar." -#: ../../locales/../src/interface/QueueView.cpp:3045 +#: ../../locales/../src/interface/QueueView.cpp:2676 msgid "The system will soon shut down unless you click Cancel." msgstr "O sistema irá encerrar em breve a não ser que prima em Cancelar." @@ -7798,11 +8030,11 @@ "O ficheiro já existe.\n" "Por favor escolha uma acção." -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "O teste não foi bem sucedido. Quer mesmo guardar as configurações?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:81 #, c-format msgid "The valid backup file %s could not be restored" msgstr "O ficheiro de cópia de segurança %s não pode ser restaurado" @@ -7811,15 +8043,15 @@ msgid "Themes" msgstr "Temas" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:326 msgid "This filter set cannot be removed." msgstr "Este conjunto de filtros não pode ser removido." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:266 msgid "This filter set cannot be renamed." msgstr "Este conjunto de filtros não pode ser renomeado." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7843,11 +8075,11 @@ "Este assistente ajudá-lo-á a configurar correctamente qualquer router ou " "firewall que tiver e testa a configuração." -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Time" msgstr "Tempo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 msgid "Time formatting" msgstr "Formato para a hora" @@ -7856,26 +8088,25 @@ msgstr "Tempo de espera, em &segundos:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "Tempo de espera" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1621 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1047 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1710 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "A diferença para o fuso horário do servidor é de %d segundos." -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Title:" msgstr "Título:" -#: ../../locales/../src/interface/Mainfrm.cpp:2166 +#: ../../locales/../src/interface/Mainfrm.cpp:2221 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Para comparar pastas, ambas as listas de ficheiros têm de ser alinhadas." -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/Mainfrm.cpp:2222 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Para fazer isto, ambas as árvores de pastas têm de estar visíveis ou " @@ -7889,7 +8120,7 @@ "Para suportar uma autenticação por chave pública, o FileZilla precisa de " "saber que chaves privadas usar." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7906,7 +8137,7 @@ "Verde: O ficheiro é mais recente do que aquele não marcado, do outro lado\n" "Vermelho: Tamanhos de ficheiro diferentes" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7916,51 +8147,46 @@ "Se ligada, ao navegar na pasta local também mudará a pasta correspondente no " "servidor e vice-versa." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Inicia ou pára a lista de transferências" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Mostra ou esconde a árvore das pastas locais" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Mostra ou esconde a janela de mensagens" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Mostra ou esconde a árvore das pastas remotas" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Mostra ou esconde a lista de transferências" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:541 msgid "Too long header line" msgstr "Linha de cabeçalho demasiado longa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:610 msgid "Too many redirects" msgstr "Demasiados redireccionamentos" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Trace:" msgstr "Traçar:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1853 msgid "Transfer" msgstr "Transferência" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2264 msgid "Transfer &direction" msgstr "&Direcção da transferência" @@ -7976,22 +8202,22 @@ msgid "Transfer Queue" msgstr "Lista de Transferências" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:450 msgid "Transfer Settings" msgstr "Configurações para Transferências" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/transfersocket.cpp:452 +#: ../../locales/../src/engine/transfersocket.cpp:474 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Transferência interrompida: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Os dados transferidos foram marcados." -#: ../../locales/../src/interface/queue.cpp:333 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:249 msgid "Transferring" msgstr "A transferir" @@ -7999,8 +8225,7 @@ msgid "Transfers" msgstr "Transferências" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2569 msgid "Transfers finished" msgstr "Transferências acabadas" @@ -8012,15 +8237,15 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Tratar os &seguintes tipos de ficheiro como ficheiros ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:776 msgid "Trust changed Hostkey:" msgstr "Confiar na Chave de Servidor alterada:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:844 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:773 msgid "Trust new Hostkey:" msgstr "Confiar na nova Chave de Servidor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1010 msgid "Trust the new key and carry on connecting?" msgstr "Confiar nesta nova chave e continuar a ligar?" @@ -8028,17 +8253,17 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Confiar neste certificado e continuar a ligação?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:889 msgid "Trust this host and carry on connecting?" msgstr "Confiar neste servidor e continuar a ligar?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Tente de novo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 +#: ../../locales/../src/interface/edithandler.cpp:1097 msgid "Type" msgstr "Tipo" @@ -8050,20 +8275,20 @@ msgid "Type of generic proxy:" msgstr "Tipo de proxy genérico:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1955 msgid "U&pload" msgstr "E&nviar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3758 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Limite em &envio:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1963 msgid "U&se filetype associations if available" msgstr "U&sar as associações dos tipos de ficheiros, se disponíveis" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "U&se system defaults for current language" msgstr "U&sar o idioma indicado pelo sistema" @@ -8071,28 +8296,34 @@ msgid "USER@&HOST" msgstr "UTILIZADOR@&SERVIDOR" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:374 +#: ../../locales/../src/engine/proxy.cpp:500 #, c-format msgid "Unassigned error code %d" msgstr "Código de erro não atribuído %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Unit:" msgstr "Unidade:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:874 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:995 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/interface/edithandler.cpp:1129 +#: ../../locales/../src/interface/edithandler.cpp:1157 msgid "Unknown" msgstr "Desconhecido" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Tipo de proxy do FTP desconhecido, não é possivel gerar a sequência para " "início de sessão." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:422 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versão do protocolo SOCKS desconhecida: %d" @@ -8101,11 +8332,22 @@ msgid "Unknown certificate" msgstr "Certificado desconhecido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:125 +#: ../../locales/../src/engine/misc.cpp:138 +#, fuzzy, c-format +msgid "Unknown error %d" +msgstr "Erro GnuTLS %d" + +#: ../../locales/../src/engine/misc.cpp:102 +#, fuzzy, c-format +msgid "Unknown error %u" +msgstr "Chave de servidor desconhecida" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:816 msgid "Unknown host key" msgstr "Chave de servidor desconhecida" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:430 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8114,14 +8356,14 @@ "Versão do Protocolo da Autenticação, Nome de Utilizador / Palavra-Passe, por " "SOCKS desconhecida: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:282 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Elemento desconhecido, o ficheiro não parece ter sido gerado pelo FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:612 -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8129,7 +8371,7 @@ "A não ser que estes problemas sejam corrigidos, o modo activo não funcionará " "e terá de ser usado o modo passivo." -#: ../../locales/../src/interface/netconfwizard.cpp:599 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8137,15 +8379,15 @@ "A não ser que este problema seja corrigido, o modo activo não funcionará e " "terá de ser usado o modo passivo." -#: ../../locales/../src/engine/tlssocket.cpp:1096 +#: ../../locales/../src/engine/tlssocket.cpp:1278 msgid "Unsupported certificate type" msgstr "Este tipo de certificado não é suportado" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:598 msgid "Unsupported redirect" msgstr "Este redireccionamento não é suportado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1961 msgid "Up&load and unedit" msgstr "E&nviar sem editar" @@ -8154,24 +8396,29 @@ msgid "Updates" msgstr "Actualizações" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2278 msgid "Upload" msgstr "Enviar" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1120 msgid "Upload failed" msgstr "O envio falhou" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Upload limit: %s/s" msgstr "Limite para envio: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Upload limit: none" msgstr "Limite para envio: nenhum" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3290 +#: ../../locales/../src/interface/search.cpp:882 +msgid "Upload search results" +msgstr "Resultados da procura nos envios" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Upload selected directory" msgstr "Enviar a pasta seleccionada" @@ -8179,70 +8426,70 @@ msgid "Upload selected files and directories" msgstr "Enviar os ficheiros e as pastas seleccionados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1766 msgid "Upload this file back to the server?" msgstr "Enviar este ficheiro de volta ao servidor?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 msgid "Upload this file to the server?" msgstr "Enviar este ficheiro para o servidor?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1148 +#: ../../locales/../src/interface/edithandler.cpp:1304 msgid "Uploading" msgstr "A enviar" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1306 msgid "Uploading and pending removal" msgstr "A enviar e a remoção pendente" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1151 +#: ../../locales/../src/interface/edithandler.cpp:1308 msgid "Uploading and unediting" msgstr "A enviar e a terminar a edição" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Use &custom charset" msgstr "Usar um &mapa de caracteres personalizado" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1927 msgid "Use &custom editor:" msgstr "Usar um editor &próprio:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2970 msgid "Use &default editor for text files" msgstr "Usar o &editor predefinido para ficheiros de texto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2829 msgid "Use &synchronized browsing" msgstr "Usar a navegação &sincronizada" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:541 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Utiliza UTF-8 se o servidor o suportar, senão usa o mapa de caracteres local." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 msgid "Use default action" msgstr "Usar a acção predefinida" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:520 msgid "Use explicit FTP over TLS if available" msgstr "Usar FTP sobre TLS explícito se disponível" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 msgid "Use server currently connected to" msgstr "Usar o servidor agora ligado para" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2389 msgid "Use server from site manager" msgstr "Usar um servidor do Gestor de Sítios" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "Use system &defaults for current language" msgstr "Usar o &idioma indicado pelo sistema" @@ -8277,16 +8524,16 @@ "primeira vez. Apenas a versão do FileZilla que está a utilizar será " "submetida ao servidor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 msgid "User:" msgstr "Utilizador:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:501 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 msgid "Username cannot be a series of spaces" msgstr "O nome de utilizador não pode ser uma série de espaços" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:581 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8305,7 +8552,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Mensagens de entrada eloquentes a partir de wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1146 +#: ../../locales/../src/engine/tlssocket.cpp:1371 msgid "Verifying certificate..." msgstr "A verificar o certificado ..." @@ -8313,39 +8560,35 @@ msgid "Very high" msgstr "Muito alta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1471 msgid "View hidden option set, but unsupported by server" msgstr "Ver o conjunto escondido de opções, mas não suportado pelo servidor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1835 msgid "View/Edit" msgstr "Ver/Editar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2180 msgid "Visible columns" msgstr "Colunas vísiveis" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "W&rite" msgstr "E&screver" -#: ../../locales/../src/interface/QueueView.cpp:1670 -msgid "Waiting" -msgstr "À espera" - -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "A esperar pela ligação do navegador" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "À espera da palavra-passe" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:243 msgid "Waiting for transfer to be cancelled" msgstr "À espera do cancelamento da transferência" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:244 msgid "Waiting to retry..." msgstr "À espera para voltar a tentar ..." @@ -8368,23 +8611,23 @@ "\n" "Quer mesmo procurar versões de desenvolvimento?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:944 msgid "Warning: Potential security breach!" msgstr "Aviso: Possível quebra de segurança!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3645 msgid "Welcome to FileZilla" msgstr "Bem-vindo ao FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3506 msgid "What's new" msgstr "Novidades" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Novidades:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3832 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8409,28 +8652,32 @@ msgid "Widescreen" msgstr "Ecrã panorâmico" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3827 msgid "Would you like FileZilla to remember passwords?" msgstr "Deseja que o FileZilla lembre as palavras-passe?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Wr&ite" msgstr "Es&crever" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Endereço de IP externo errado" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 msgid "Wrong line endings" msgstr "Fins de linha incorrectos" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:858 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "Amarelo" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:787 msgid "Yes" msgstr "Sim" -#: ../../locales/../src/interface/netconfwizard.cpp:777 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8438,24 +8685,24 @@ "Parece estar a utilizar um servidor com ligação IPv6 apenas. Este assistente " "não suporta esta ligação." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Está a usar a última versão do FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3615 msgid "You can always open this dialog again through the help menu." msgstr "Pode sempre voltar a abrir esta janela através do menu de ajuda." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Pode transferir a última versão a partir do sítio do FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:69 msgid "You can leave the port field empty to use the default port." msgstr "Para usar a porta predefinida, deixe o campo da porta vazio." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:518 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8463,7 +8710,7 @@ "Pode utilizar um x em qualquer posição para manter a permissão do ficheiro " "original." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Não pode importar as configurações da própria pasta de configurações do " @@ -8477,23 +8724,23 @@ "Não pode substituir um caracter inválido por outro caracter inválido. Por " "favor insira um caracter que seja permitido em nomes de ficheiros." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "Não indicou um novo nome para o ficheiro. Substituir ao invés o ficheiro?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "You have selected at least one symbolic link." msgstr "Seleccionou pelo menos uma ligação simbólica." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:725 +#: ../../locales/../src/interface/edithandler.cpp:1599 +#: ../../locales/../src/interface/search.cpp:1159 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "Seleccionou mais de 10 ficheiros para edição, deseja mesmo continuar?" -#: ../../locales/../src/interface/LocalListView.cpp:1665 +#: ../../locales/../src/interface/LocalListView.cpp:1705 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8501,39 +8748,43 @@ "Seleccionou mais de 10 ficheiros ou pastas para abrir, deseja mesmo " "continuar?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:420 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 msgid "You have to enter a hostname." msgstr "Tem que inserir um nome de servidor." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1076 msgid "You have to enter a key file path" msgstr "Tem de indicar o caminho para o ficheiro chave" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:868 msgid "You have to enter a local directory." msgstr "Tem que indicar uma pasta local." -#: ../../locales/../src/interface/netconfwizard.cpp:165 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Tem que inserir um endereço IP válido." +#: ../../locales/../src/interface/search.cpp:882 +msgid "You have to enter a remote directory." +msgstr "Tem que indicar uma pasta remota." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "Tem que indicar um endereço IPv4 válido." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:873 msgid "You have to enter a writable local directory." msgstr "Tem que indicar uma pasta local com permissão de escrita." -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:512 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1067 msgid "You have to enter an account name" msgstr "Tem que inserir um nome de conta" -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:486 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 msgid "You have to specify a user name" msgstr "Tem de indicar um nome de utilizador" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8541,7 +8792,7 @@ "É provável que tenha um router ou firewall que modificaram indevidamente os " "dados transferidos." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Precisa de indicar um nome para o marcador" @@ -8549,7 +8800,7 @@ msgid "You need to enter a name for the log file." msgstr "Precisa de indicar um nome para o ficheiro das configurações iniciais." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1484 msgid "You need to enter a properly quoted command." msgstr "Tem que indicar um comando apropriado." @@ -8562,16 +8813,16 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Tem que inserir uma porta do proxy do intervalo entre 1 e 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1144 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Tem de indicar pelo menos um caminho, não são suportados marcadores vazios." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8579,7 +8830,7 @@ "Precisa de indicar ambos os caminhos, local e remoto, para permitir a " "navegação sincronizada para este marcador." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1109 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8587,23 +8838,23 @@ "Precisa de indicar ambos os caminhos, local e remoto, para permitir a " "navegação sincronizada para este sítio." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "You need to specify a local file." msgstr "Tem de indicar um ficheiro local." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:321 msgid "You need to specify a remote file." msgstr "Tem de indicar um ficheiro remoto." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:327 msgid "You need to specify a remote path." msgstr "Tem de indicar um caminho remoto." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:298 msgid "You need to specify a server." msgstr "Tem de indicar um servidor" -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8611,66 +8862,66 @@ "Não deve ter problemas em ligar a outros servidores, as transferências de " "ficheiros devem funcionar normalmente." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:2684 msgid "Your computer will suspend unless you click Cancel." msgstr "O computador entrará em suspensão caso não prima em Cancelar." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "depois" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "antes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "começa com" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "bytes" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "contém" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "personalizado" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "não contém" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "não é igual" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "termina com" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "igual a" -#: ../../locales/../src/interface/filelistctrl.cpp:529 -#: ../../locales/../src/interface/filelistctrl.cpp:548 -#: ../../locales/../src/interface/filelistctrl.cpp:575 -#: ../../locales/../src/interface/filelistctrl.cpp:591 +#: ../../locales/../src/interface/filelistctrl.cpp:535 +#: ../../locales/../src/interface/filelistctrl.cpp:554 +#: ../../locales/../src/interface/filelistctrl.cpp:581 +#: ../../locales/../src/interface/filelistctrl.cpp:597 msgid "file" msgstr "ficheiro" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" #: ../../locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8680,95 +8931,173 @@ "Por favor, certifique-se que este executável existe na mesma pasta de " "programa do FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:467 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:374 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp pertence a uma versão diferente do FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1510 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1391 msgid "fzsftp could not be started" msgstr "fzsftp não pôde ser iniciado" -#: ../../locales/../src/engine/tlssocket.cpp:1125 +#: ../../locales/../src/engine/tlssocket.cpp:1217 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "" "o módulo gnutls_certificate_get_peers não devolveu qualquer certificado" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket.cpp:1229 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "falhou gnutls_pem_base64_encode2" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "maior que" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "agrupar executáveis" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "grupo só de leitura" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "grupo de arquivo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1601 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "é igual a" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "está configurado" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "está desconfigurado" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "menor que" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "condiz com o regex" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +#, fuzzy +msgid "new name" +msgstr "&Mudar o Nome" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "proprietário para executáveis" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "proprietário para leitura" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "proprietário para escrita" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1189 -#: ../../locales/../src/engine/tlssocket.cpp:1200 -#: ../../locales/../src/engine/tlssocket.cpp:1215 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket.cpp:1423 +#: ../../locales/../src/engine/tlssocket.cpp:1439 +#: ../../locales/../src/engine/tlssocket.cpp:1455 +#: ../../locales/../src/engine/tlssocket.cpp:1471 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "desconhecido" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "universo executável" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "universo só de leitura" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "universo de arquivo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:699 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Host key fingerprint:" +#~ msgstr "Impressão digital da chave do servidor:" + +#~ msgid "Available sizes" +#~ msgstr "Tamanhos disponíveis" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "" +#~ "Não é possível carregar a Barra de Ligação Rápida a partir do ficheiro de " +#~ "recursos" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize chamado sem socket" + +#~ msgid "Filename &filters..." +#~ msgstr "&Filtros ..." + +#~ msgid "%d files added to queue" +#~ msgstr "%d ficheiros adicionados à lista" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Desligar do servidor" + +#~ msgid "&Show message" +#~ msgstr "&Mostrar mensagem" + +#~ msgid "Connected" +#~ msgstr "Ligado" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Não foi possível importar os certificados de ponto, o módulo " +#~ "'gnutls_x509_crt_import' falhou" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Não foi possível iniciar a estrutura para os certificados de ponto, o " +#~ "módulo 'gnutls_x509_crt_init' falhou" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "A opção 'apagar múltiplas pastas não relacionadas' ainda não é suportada" + +#~ msgid "Do ¬hing" +#~ msgstr "Não &fazer nada" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "A opção 'transferir múltiplas pastas não relacionadas' ainda não é " +#~ "suportada" + +#~ msgid "Downloading search results" +#~ msgstr "A transferir os resultados da procura" + +#~ msgid "No more files in the queue!" +#~ msgstr "Não há mais ficheiros na lista!" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "A procurar ficheiros para adicionar à lista" + +#~ msgid "Scanning for files to upload" +#~ msgstr "A procurar ficheiros para enviar" + +#~ msgid "Waiting" +#~ msgstr "À espera" + #~ msgid "" #~ "Any changes made in the Site Manager will not be saved unless you repair " #~ "the file." @@ -8909,9 +9238,6 @@ #~ msgid "Failed to parse trusted root cert." #~ msgstr "A análise ao certificado de raíz confiável falhou." -#~ msgid "Root certificate is not trusted" -#~ msgstr "O certificado de raiz não é de confiança" - #~ msgid "%s bytes" #~ msgstr "%s bytes" diff -Nru filezilla-3.15.0.2/locales/ru.po filezilla-3.33.0/locales/ru.po --- filezilla-3.15.0.2/locales/ru.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/ru.po 2018-02-16 16:26:26.000000000 +0000 @@ -5,15 +5,15 @@ # Last update: December 14, 2009 # boobaloo , 2010. # Updated by Sergey (private_joker) , 2013, 2014 -# Updated by Pavel Starosek , 2015 +# Updated by Pavel Starosek , 2015-2018 msgid "" msgstr "" "Project-Id-Version: Русский перевод\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-30 15:29+0100\n" -"PO-Revision-Date: 2016-01-25 11:31+0600\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-02-16 14:59+0100\n" +"PO-Revision-Date: 2018-01-17 00:01+0600\n" "Last-Translator: Pavel Starosek \n" -"Language-Team: Oleg Koptev\n" +"Language-Team: Pavel Starosek\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,18 +23,18 @@ "X-Generator: Poedit 1.7.3\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S затрачено" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S осталось" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -43,9 +43,9 @@ "%a - Учетная запись (Строки, содержащие это будут пропущены, если только не " "используется вход с помощью учетной записи)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" @@ -53,9 +53,9 @@ msgstr[1] "%d каталога" msgstr[2] "%d каталогов" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1425 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -63,11 +63,11 @@ msgstr[1] "%d каталога вместе с содержимым" msgstr[2] "%d каталогов вместе с содержимым" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" @@ -75,7 +75,7 @@ msgstr[1] "%d файла" msgstr[2] "%d файлов" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" @@ -83,7 +83,7 @@ msgstr[1] "%d файла. Общий размер: %s" msgstr[2] "%d файлов. Общий размер: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" @@ -91,12 +91,7 @@ msgstr[1] "%d файла. Общий размер: не менее %s" msgstr[2] "%d файлов. Общий размер: не менее %s" -#: ../../locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "%d файлов добавлено в задание" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -104,11 +99,11 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Хост" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" @@ -116,7 +111,7 @@ msgstr[1] "%llu каталога" msgstr[2] "%llu каталогов" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -124,47 +119,47 @@ msgstr[1] "%llu файла" msgstr[2] "%llu файлов" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Пароль" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/сек)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? Б/сек)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Срок действия сертификата истек!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Пока не действителен!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Пользователь прокси" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s и %s. Общий размер: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s и %s. Общий размер: Не менее %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -172,89 +167,98 @@ msgstr[1] "%s байт" msgstr[2] "%s байт" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s не найден. Без этого компонента FileZilla, SFTP не будет работать.\n" +"%s не найден. Без этого компонента FileZilla, %s не будет работать.\n" "\n" "Пожалуйста, загрузите FileZilla снова. Если проблема не решится, отправьте " "сообщение об ошибке." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s не найден. Без этого компонента FileZilla, SFTP не будет работать.\n" +"%s не найден. Без этого компонента FileZilla, %s не будет работать.\n" "\n" -"Возможное решение:\n" +"Возможные решения:\n" "- Убедитесь, что %s находится в каталоге, указанном в переменной среды " "PATH.\n" -"- Укажите полный путь к %s в переменной среды FZ_FZSFTP." +"- Укажите полный путь к %s в переменной среды %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s с %d бит" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Имя хоста не совпадает с сертификатом" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Имя пользователя" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Пароль прокси" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "&Прервать предыдущее соединение и подключиться в текущей вкладке" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "&О программе..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Учетная запись:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Активный" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "&Добавить закладку..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Добавить каталог..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Добавить файлы в задание" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Добавить файл с ключом..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Добавить в задание" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Применить настройки временной зоны сервера:" @@ -262,71 +266,76 @@ msgid "&Always trust certificate in future sessions." msgstr "&Всегда принимать сертификат в будущих сессиях" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "&Всегда доверять этому хосту, добавить ключ в кэш" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Всегда использовать редактор по умолчанию" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Всегда использовать для файлов без ассоциации" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Всегда использовать это действие" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Получить сведения о внешнем IP-адресе в настройках системы" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&Авто" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Автоопределение" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Цвет фона:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&Двоичный" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Двоичные префиксы в системе СИ (напр., 1 KБ = 1024 байт)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "&Закладки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Обзор..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Допустимое превышение:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Отмена" @@ -338,19 +347,23 @@ msgid "&Close" msgstr "Зак&рыть" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&Закрыть FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Закрыть FileZilla один раз" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "&Настройка ограничения скорости..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "&Настройка..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Соединиться" @@ -358,154 +371,150 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Копировать текущее соединение в Менеджер Сайтов..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "&Копировать в буфер" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Создать каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" msgstr "&Создать новую вкладку" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Отладка" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "&Записи в журнале отладки:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "&Редактор по умолчанию:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "&Действие по умолчанию, если файл существует..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Пауза между неудачными попытками:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Удалить" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Удалить символьную ссылку" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "&Права доступа к каталогу..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "&Сравнить каталоги" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Выключить синхронизированный просмотр и продолжить изменение локального " "каталога?" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Выключить синхронизированный просмотр и продолжить изменение удалённого " "каталога?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "&Отменить локальный файл, закачать и возобновить редактирование" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "&Разъединить" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Отключиться от сервера" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Показывать мгновенную скорость передачи вместо средней" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Показывать размер файла в байтах" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "&Не запоминать пароли (рекомендуется)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Больше не показывать." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "Не использовать внешний IP-адрес при &локальных соединениях" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "&Действие по двойному клику на файлах:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "&Скачать" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Скачать в:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "&Скачать..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Загрузки:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "&Редактирование" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "&Править правила фильтрования..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "&Включить" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Включить сжатие" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Включить ограничения скорости" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Кодировка:" @@ -513,28 +522,28 @@ msgid "&Encryption:" msgstr "&Шифрование:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "&Ввести произвольную команду..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "&Установить соединение на новой вкладке" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Выполнить" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Экспорт записей из Менеджера Сайтов" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Экспорт..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Вернуться в активный режим" @@ -542,90 +551,102 @@ msgid "&File" msgstr "&Файл" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "&Атрибуты файла..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "&Права доступа к файлу..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Файл:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Условия фильтра:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Наборы фильтров:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Фильтры" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Фильтры:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Закончить правку и удалить локальный файл" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Не сохранять структуру локальных путей, закачать все содержащиеся файлы " +"прямо в целевой каталог" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" -"&Сгладьте удаленные пути, загрузите все содержащиеся файлы прямо в целевой " -"каталог" +"&Не сохранять структуру удаленных путей, загрузите все содержащиеся файлы " +"прямо в целевой каталог" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "&Следуя символьной ссылке удалить содержимое каталога" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Получить внешний IP-адрес со следующей страницы:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "&Получение помощи..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Общая закладка" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 используя метод CONNECT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&Помощь" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Скрыть одинаковые файлы" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&Высочайший" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Наибольший доступный порт:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Хост:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&Двоичные префиксы &IEC (например, 1 КиБ = 1024 байт)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (например: 2007-09-15)" @@ -633,88 +654,96 @@ msgid "&Import..." msgstr "&Импорт..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "&Использовать системные ассоциации файлов" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Установить новую версию" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Сохранить структуру локальных путей относительно корня поиска" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" -msgstr "&Оставьте структуру удаленных путей относительно корня поиска" +msgstr "&Сохранить структуру удаленных путей относительно корня поиска" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "&Файл с ключом:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Раскладка панелей:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Ограничение используемых локальных портов" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Ограничение одновременных подключений" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "&Локальный &список" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Локальный каталог:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Локальный поиск" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Записать в лог-файл" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "&Тип входа:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "&Тип входа:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Низкий" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "&Редактировать закладки..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "&Передача вручную..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Макс. число подключений:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Максимальное число попыток:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "&Журнал сообщений" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Сворачивать в трей" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "&Имена файлов:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Имя:" @@ -722,7 +751,7 @@ msgid "&Network configuration wizard..." msgstr "&Мастер настройки сети..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Новый" @@ -730,7 +759,7 @@ msgid "&New Site" msgstr "&Новый Сайт" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Доступна новая версия!" @@ -738,154 +767,165 @@ msgid "&Next >" msgstr "&Дальше >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Нет" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Ничего" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Нормальный" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Числовое значение:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&ОК" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&OPEN" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Открыть" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Перезаписать" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Пассивный" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Пароль:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "&Проиграть звук" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Порт:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Сохранять временные метки файлов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Задание" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Быстрое соединение" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "&Панель быстрого соединения" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "&История Быстрого соединения" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Чтение" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "&Переподключиться" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "Информация &повторного соединения" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "&Обновить" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Запомнить мастер-пароль до закрытия FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "&Запомнить пароль до закрытия FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "&Запомнить пароли" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Удаленный каталог:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Удаленный путь:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Удаленный поиск" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Удалить" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Удалить ключ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "&Удалить выбранное" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Переименовать" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Переименовать..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Заново открыть локальный файл" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Заменять недопустимые символы на:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "&Сообщить об ошибке..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Обратить внимание на приложение" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "&Очистить все и получить снова" @@ -893,39 +933,39 @@ msgid "&Restart Wizard" msgstr "&Перезапустить мастер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Докачать" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "&Выполнить команду..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Запустить мастер настройки сейчас..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Проверить обновление..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Сохранить как..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Искать" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Поиск файлов на сервере..." @@ -933,20 +973,20 @@ msgid "&Select Entry:" msgstr "&Выберите запись:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Выбрать язык:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Выбрать колонки для отображения:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Сервер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Настройки" @@ -954,23 +994,19 @@ msgid "&Settings..." msgstr "&Настройки..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Показать меню отладки" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "&Показать детали" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Показать сообщение" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Показывать время создания файлов в журнале сообщений" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Записи &Менеджера Сайтов" @@ -978,157 +1014,176 @@ msgid "&Site Manager..." msgstr "&Менеджер Сайтов..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "&Индивидуальная закладка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Пропустить" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "&Ограничение скорости" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "&Начать передачу сейчас" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Поменять панели местами" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "&TLS Шифрование" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Тест" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Тема:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Передача" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "&Режим передачи:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "&Окно задания" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "&Файлы с точками как ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +#, fuzzy +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "Принять сертификат и продолжить соединение?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Отменить правку" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Обновить ключ в кэше для этого хоста" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Закачать на сервер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Закачать в:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Закачать на сервер..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Закачки:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Использовать программу по выбору" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Использовать синхронизированный просмотр" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Использовать системный редактор для текстовых файлов" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Использовать следующий IP-адрес:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Использовать внешний IP-адрес сервера" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Использовать разделитель тысяч" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Пользователь:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Имя пользователя" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Версия %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Вид" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Просмотр/Правка" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "&Следить за редактированием файлов и подсказывать о передаче изменений" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "Проверяя наличие обновлений, проверять:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Запись" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Да" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." -msgstr "'%s' не существует либо недоступен" +msgstr "'%s' не существует либо недоступен." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." -msgstr "'%s' не каталог" +msgstr "'%s' не каталог." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "Протокол '%s' не поддерживается." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 msgid "'Account' logontype not supported by selected protocol" msgstr "Вход с помощью учетной записи не поддерживается выбранным протоколом" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1136,7 +1191,7 @@ "Типы входа 'Нормальный' и 'Учетная запись' недоступны, используйте 'Спросить " "пароль'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1144,7 +1199,7 @@ "Типы входа 'Нормальный' и 'Учетная запись' недоступны. Ваша запись будет " "изменена на 'Спросить пароль'." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1154,8 +1209,8 @@ "чтобы посылать данный аргумент на сервер. Вы можете ввести raw команду, без " "использования 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" @@ -1163,50 +1218,50 @@ msgstr[1] "(%d объекта отфильтровано)" msgstr[2] "(%d объектов отфильтрован)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% скачано)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 - без ограничения)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 секунд)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 - отключено)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat установлен в %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(например: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(например: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(в %s/сек)" @@ -1215,7 +1270,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- осталось" @@ -1235,31 +1290,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s нельзя использовать вместе с адресом FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Ничего" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Предупреждения" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Инфо" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Подробности" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32-битная система" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Отладка" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64-битная система" @@ -1267,23 +1322,28 @@ msgid "< &Back" msgstr "< &Назад" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Закладка с таким именем уже существует. Пожалуйста, введите другое имя." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Сертификат в цепочке был подписан с использованием незащищенного алгоритма" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Необходимо указать редактор по умолчанию." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:164 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Каталог не может быть перенесен в один из своих подкаталогов." @@ -1297,22 +1357,22 @@ "не настроены. В этом случае требуется активный режим. В этом режиме " "FileZilla открывает порт и просит сервер подключиться к нему." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Ранее открытый файл был изменен." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Файл в таким именем уже передается." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Файл с таким именем все еще редактируется. Пожалуйста, закройте его и " "попробуйте снова." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1326,11 +1386,20 @@ "Пока вы не устраните проблему, файлы могут быть не указаны в списке.\n" "Предупреждение не будет более показываться в этой сессии." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Потерянный мастер-пароль восстановлению не подлежит! Пожалуйста, тщательно " +"запомните свой пароль." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Доступна новая версия FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1339,7 +1408,7 @@ "файлы от пользователя. Воспользуйтесь данной настройкой, чтобы заставить " "сервер показывать все файлы." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1347,7 +1416,7 @@ "Обычно сервер не требует этого. Свяжитесь с администратором, если вам это " "нужно." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1356,17 +1425,17 @@ "Выключить синхронизированный просмотр и продолжить изменение локального " "каталога?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "Д&обавить" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "Р&азрешить докачку ASCII файлов" @@ -1378,51 +1447,53 @@ msgid "A&pply only to uploads" msgstr "П&рименить только к загрузкам на сервер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "П&рименить ко всем файлам и каталогам" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "&Автоматически очищать успешные загрузки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "О FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Поверх списка файлов" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Невозможно восстановить доступ к некоторым локальным каталогам:" + +#: ../../locales/../src/engine/server.cpp:582 +#: ../../locales/../src/engine/server.cpp:605 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Учетная запись" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "Действие после завершения &задания" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Действие с выбранным файлом:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Выполнить действие:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Действие:" @@ -1430,7 +1501,7 @@ msgid "Active mode" msgstr "Активный режим" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1438,7 +1509,7 @@ "Тест активного режима не удался. FileZilla не знает правильного внешнего IP-" "адреса." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1446,7 +1517,7 @@ "Тест активного режима не удался. FileZilla не знает правильный внешний IP-" "адрес. Кроме того, ваш маршрутизатор изменил отправленный адрес." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1455,38 +1526,39 @@ "Тест активного режима не удался. FileZilla знает правильный внешний IP-" "адрес, однако ваш маршрутизатор некорректно изменил отправленный адрес." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "IP-адрес для активного режима" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "&Добавить файлы только в задание" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Добавить выбранный каталог в задание" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Добавить выбранные файлы и каталоги в задание" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Добавить в задание" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Этот тип адреса не поддерживается" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Дополнительно" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1501,15 +1573,16 @@ "могут даже повредить вашу систему. Используйте бета-версии и ночные сборки " "на свой страх и риск." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "&Всегда использовать это действие" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Алгоритм:" -#: ../../locales/../src/interface/QueueView.cpp:2937 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "Все файлы успешно переданы" @@ -1517,7 +1590,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Все порты должны находиться в диапазоне между 1024 и 65535." -#: ../../locales/../src/interface/QueueView.cpp:2933 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1525,7 +1598,7 @@ msgstr[1] "Все передачи завершены. %d файла не был передан." msgstr[2] "Все передачи завершены. %d файлов не был передан." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Разрешить возврат к другому режиму при сбое" @@ -1533,18 +1606,18 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Разрешить возврат к другому режиму передачи при сбое" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Соединение установлено" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Альтернативное имя:" msgstr[1] "Альтернативные имена:" msgstr[2] "Альтернативные имена:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1553,7 +1626,7 @@ "программе PuTTY для управления вашими ключами. FileZilla может работать с " "Pageant." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1561,14 +1634,14 @@ "В качестве альтернативы можно воспользоваться системным SSH агентом. Для " "этого убедитесь, что выбрано значение переменной SSH&AUTH&SOCK." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "" "Кроме того, вы также можете загрузить последнюю версию с сайта FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1902 +#: ../../locales/../src/interface/QueueView.cpp:1662 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1577,7 +1650,7 @@ "Ошибка при загрузке очереди передач из \"%s\".\n" "Часть передач не была восстановлена." -#: ../../locales/../src/interface/QueueView.cpp:1812 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1586,79 +1659,82 @@ "Ошибка при сохранении очереди передач в \"%s\".\n" "Часть передач не была сохранена." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Издатель в цепочке сертификатов не является центром сертификации" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2276 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Объект с таким именем уже существует в целевом каталоге." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1731 msgid "Anonymous" msgstr "Анонимный" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Выполняется другая удалённая операция, невозможно сменить каталог сейчас." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:848 msgid "Any changes made in the Site Manager could not be saved." msgstr "Любые изменения в Менеджере Сайтов не будут сохранены." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Любые изменения в фильтрах не будут сохранены." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Любые изменения в фильтрах не будут сохранены." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "При&менить только к каталогам" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Применить" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Применить только к &текущему заданию" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Применить только к &файлам" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Архив" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Переполнение буфера" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "В виде закладки в панели заданий" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Спросить о действии" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:573 +#: ../../locales/../src/engine/server.cpp:599 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Запросить пароль" @@ -1670,7 +1746,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Запросить внешний IP-адрес в операционной системе" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Задать вопрос на FileZilla форуме" @@ -1678,7 +1754,7 @@ msgid "Associated program not found:" msgstr "Не найдена ассоциированная программа:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Как минимум один фильтр незавершен" @@ -1686,99 +1762,106 @@ msgid "At this point, all required information has been gathered." msgstr "Вся необходимая информация была собрана." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Атрибут" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:221 msgid "Authentication failed." msgstr "Сбой аутентификации." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Автор:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Авто" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Автоматическая классификация типа файла" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Доступные размеры" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B <Символ для байта. Переводится только первое письмо>" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "О&бход прокси" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Неверный дескриптор файла" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Основные инструкции по применению" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Состояние" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Редактируется" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Внимание! Сертификат был отозван" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Двоичный" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Доска объявлений" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Синий" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:393 msgid "Bookmark" msgstr "Закладка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Закладка:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Закладки" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Обзор..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Bucket не найден" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Дата сборки:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Информация о сборке" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Вид деятельности:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1788,97 +1871,113 @@ "активном режиме. Если вы хотите ограничить FileZilla использованием только " "небольшого диапазона портов, пожалуйста, введите диапазон портов ниже." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "О&тменить текущую операцию" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "О&чистить все" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "&Копировать адрес в буфер обмена" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "&Копировать адрес с паролем в буфер обмена" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "Произвольный" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Произвольные ассоциации файлов:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "Характеристики ЦП:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Подсчет разницы между часовыми поясами..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Невозможно прочитать данные из файла!" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Невозможно записать данные в файл!" -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Невозможно записать данные в файл: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Отмена" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Отменить текущую операцию" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Отменить текущую операцию" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "Нет доступа к '%s', нет данных, либо диск не готов." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Невозможно добавить сервер в Менеджер Сайтов" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Невозможно назначить запрошенный адрес" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Невозможно изменить каталог, выполняется операция синхронизированного " +"просмотра." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1886,7 +1985,7 @@ "Невозможно закрыть вкладку, пока она занята.\n" "Прервать текущую операцию и закрыть вкладку?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1898,22 +1997,23 @@ msgid "Cannot create new filter" msgstr "Невозможно создать новый фильтр" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Невозможно редактировать файл" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Невозможно редактировать файл: нет подключения к серверу." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Невозможно редактировать файл: неизвестен удаленный путь." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1921,82 +2021,81 @@ "Невозможно установить FTP соединение на SFTP сервер. Пожалуйста, выберите " "правильный протокол." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Невозможно загрузить панель быстрого соединения из файла ресурсов" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Невозможно загрузить файл с ключом" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Невозможно загрузить панель инструментов из файла ресурсов" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Не запоминать пароль" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1264 msgid "Cannot rename entry" msgstr "Невозможно переименовать запись" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Cannot rename file" msgstr "Невозможно переименовать файл" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Не удается перевести имя хоста в IPv4 адрес для использования с SOCKS4 " "прокси." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Невозможно сохранить фильтры" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Невозможно выбрать фильтр" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Невозможно ассоциировать файл" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Невозможно отобразить диалоговое окно" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Невозможно просмотреть/редактировать выделенный файл" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Без учета регистра" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Без учета регистра" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Без учета регистра (по умолчанию)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "С учетом регистра" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "С учетом регистра (по умолчанию)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Категории для очистки" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:515 msgid "Certificate and session data are not available yet." msgstr "Сертификаты и информация по сессии еще не доступны." @@ -2008,36 +2107,40 @@ msgid "Certificate issuer" msgstr "Сертификат выдан" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Не удалось проверить подпись сертификата" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Попытка:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Изменить атрибуты файла" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Изменить права для файлов." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Требуется перезагрузка FileZilla для изменения настроек лог-файла." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Проблема кодирования символов" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Кодировка" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Проверить &обновления..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Автоматически проверять &обновления FileZilla:" @@ -2045,15 +2148,15 @@ msgid "Check for Updates" msgstr "Проверить обновления" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Проверить наличие новой версии FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Не удалось проверить обновления" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2061,7 +2164,7 @@ "Проверьте свои учетные данные для входа. Введенный пароль начинается или " "заканчивается пробелом." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2069,39 +2172,39 @@ "Проверьте свои учетные данные для входа. Введенное имя пользователя " "начинается или заканчивается пробелом." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Проверка корректного внешнего IP" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Проверка наличия обновлений..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "Контрольная сумма совпадает у файла %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Контрольная сумма не совпадает у файла %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1617 msgid "Choose a key file" msgstr "Конвертировать файл с ключом" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1655 msgid "Choose the default local directory" msgstr "Выбрать локальный каталог по умолчанию" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2517 msgid "Choose the local directory" msgstr "Выбрать локальный каталог" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:464 msgid "Chunk data improperly terminated" msgstr "Часть данных неправильно удалена" @@ -2110,54 +2213,62 @@ msgstr "Шифр:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "Зак&рыть вкладку" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Классический" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Очистить &кэш раскладки" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Очистить авто&обновленные данные" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Очистить историю" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Стереть личные данные" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Очистить строку соединения" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Нажмите 'Завершить' для сохранения конфигурации." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "MAC-адрес клиент-сервер:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Шифр клиент-сервер:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Закрыть" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "Закрыть &все прочие вкладки" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "Закрыть FileZilla" @@ -2165,103 +2276,108 @@ msgid "Close all running instances of FileZilla" msgstr "Закрыть все запущенные копии FileZilla" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Закрыть быстрый поиск и продолжить сравнение?" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Закрыть текущую вкладку" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Ко&мментарии:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Свойства колонки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Настройка колонки" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Команда и ее аргументы должны быть заключены в кавычки." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Сбой команды" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Команда не поддерживается" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Команда не поддерживается этим протоколом" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "Команда:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Комментарии" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Общее название:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Соединение испорчено маршрутизатором или брандмауэром" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Сравнить время модификации" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Сравнить размеры файлов" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Временной интервал сравнения (в минутах):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Временной интервал сравнения должен быть между 0 и 1440 мин." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Скомпилировано для:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Скомпилировано:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Скомпилировано:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Флаги компилятора:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Сжат" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Число одновременных передач" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Условия чувствительны к р&егистру" @@ -2277,41 +2393,42 @@ msgid "Configure port range" msgstr "Настройка диапазона портов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Настройка FileZilla и вашей сети" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Подтвердите удаление" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1429 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Необходимо подтверждение" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Поздравляем, ваша конфигурация работает." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Подключиться в обход настроек прокси" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Не удалось подключиться: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Подключиться в текущей вкладке" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Подключиться в новой вкладке" @@ -2319,25 +2436,26 @@ msgid "Connect to specified Site Manager site" msgstr "Подключиться к сайту указанному в Менеджере Сайтов" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Соединение" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Соединяюсь с %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Соединяюсь с %s через %s прокси" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:990 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Соединяюсь с %s..." @@ -2346,85 +2464,88 @@ msgid "Connection" msgstr "Соединение" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Соединение прервано" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Не удалось установить соединение" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:952 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Не удалось установить соединение с \"%s\", использую другой адрес." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Не удалось установить соединение с \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Соединение прервано пользователем" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Превышено время ожидания соединения" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Соединение закрыто" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1036 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:183 +#: ../../locales/../src/engine/http/request.cpp:194 +#: ../../locales/../src/engine/http/request.cpp:207 msgid "Connection closed by server" msgstr "Соединение закрыто сервером" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:121 msgid "Connection established, initializing TLS..." msgstr "Соединение установлено, инициализация TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:144 msgid "Connection established, sending HTTP request" msgstr "Соединение установлено, отправка HTTP запроса" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "Соединение установлено, ожидание приглашения." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Соединение установлено, ожидание приглашения..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Соединение потеряно" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Соединение не соответствует правилам" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Отказано в соединении" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Соединение отклонено сервером" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Соединение сброшено сетью" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Соединение сброшено сервером" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:511 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" @@ -2432,100 +2553,137 @@ msgstr[1] "Соединение прервано после %d секунд неактивности" msgstr[2] "Соединение прервано после %d секунд неактивности" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Превышено время ожидания соединения." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Соединение с сервером потеряно." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "Соединение с прокси установлено, подтверждаю установление связи..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Соединение с сервером закрыто преждевременно." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Не удалось соединиться с тестовым сервером" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Конвертировать файл с ключом" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2077 #, c-format msgid "Copy (%d) of %s" msgstr "Копировать (%d) из %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2056 #, c-format msgid "Copy of %s" msgstr "Копировать из %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Скопировать ссылки выбранных элементов в буфер обмена, включая пароль." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Скопировать ссылки выбранных элементов в буфер обмена." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Невозможно принять подключение: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Невозможно получить доступ к пути %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Невозможно добавить сертификат во временный список доверия" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Невозможно добавить соединение в Менеджер Сайтов" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Невозможно завершить операцию" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Невозможно подключиться к серверу" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1091 #, c-format msgid "Could not connect to server: %s" msgstr "Невозможно подключиться к серверу: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Невозможно преобразовать команду в кодировку сервера" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Невозможно преобразовать секретный ключ" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2584 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Невозможно скопировать адреса" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Невозможно скопировать сертификат" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Невозможно скопировать данные" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Невозможно создать CFURL из пути %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Невозможно создать URI для этой передачи." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Невозможно создать локальный файл %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Невозможно создать мьютекс для логов %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Невозможно создать безопасную закладку из URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2229 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2535,11 +2693,11 @@ "Либо расширение не установлено должным образом, либо вы не перетащили файлы " "в окно проводника." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Невозможно установить соединение с сервером" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2550,11 +2708,16 @@ "Установите каталог данных FileZilla, используя параметр командной строки '--" "datadir <путь_к_каталогу>', либо установите переменную среды FZ_DATADIR" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Невозможно сгенерировать произвольный логин." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Невозможно сгенерировать ключ" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2562,46 +2725,43 @@ "Невозможно получить имя издателя сертификата, ошибка в " "gnutls_x509_get_issuer_dn" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "" "Невозможно получить имя субъекта сертификата, ошибка в gnutls_x509_get_dn" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Невозможно получить полный путь." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Невозможно получить родной путь из CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Невозможно получить путь по URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Невозможно получить ответ от fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "Невозможно получить временный каталог для закачки файла." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "Невозможно импортировать сертификаты, ошибка в gnutls_x509_crt_import" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:96 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Невозможно инициализировать Winsock (%d): %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Невозможно инициализировать структуру для сертификатов, ошибка в " -"gnutls_x509_crt_init" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2612,15 +2772,21 @@ "может быть доступен.\n" "Любые изменения, сделанные в Менеджере Сайтов, не будут сохранены." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Невозможно загрузить файл с ключом" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Невозможно загрузить секретный ключ" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2631,7 +2797,7 @@ "Выключить синхронизированный просмотр и продолжить изменение удалённого " "каталога?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2641,7 +2807,7 @@ "Нет доступа к локальному каталогу, соответствующему удалённому '%s'.\n" "Синхронизированный просмотр был отключен." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2651,72 +2817,110 @@ "Нет доступа к удалённому каталогу, соответствующему локальному '%s'.\n" "Синхронизированный просмотр был отключен." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Невозможно получить размер '%s'" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Невозможно открыть '%s'" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2584 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Невозможно открыть буфер обмена" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Невозможно открыть лог-файл: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Невозможно разобрать удаленный путь." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Невозможно разобрать адрес сервера:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Невозможно прочитать из '%s'" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." msgstr "Невозможно прочитать данные с сокета данных." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:172 #, c-format msgid "Could not read from socket: %s" msgstr "Невозможно получить данные с сокета: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Невозможно прочитать данные на сервере." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Невозможно получить данные с сервера." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Невозможно найти положение %s в файле" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Невозможно восстановить доступ к каталогу" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Невозможно найти смещение %d внутри файла" + +#: ../../locales/../src/engine/http/filetransfer.cpp:119 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "Невозможно найти начало файла" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Невозможно найти конец файла" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Невозможно послать команду на fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Невозможно послать команду на fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Невозможно отсортировать конечные сертификаты" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "Невозможно создать IO поток" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Невозможно подтвердить установление связи с прокси: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Невозможно начать передачу" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:869 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2725,17 +2929,17 @@ "Невозможно записать \"%s\", любые изменения в Менеджере Сайтов не будут " "сохранены: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Невозможно записать \"%s\", закладка не может быть добавлена: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Невозможно записать \"%s\", общая закладка не может быть сохранена: %s" -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2744,119 +2948,121 @@ "Невозможно записать \"%s\", задание не может быть сохранено.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2495 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Невозможно записать \"%s\", нельзя экспортировать выбранные сайты: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Невозможно записать \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Невозможно записать файл с ключом: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Невозможно записать данные в локальный файл" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Невозможно записать данные в лог-файл: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:913 +#: ../../locales/../src/engine/ControlSocket.cpp:1008 +#: ../../locales/../src/engine/http/request.cpp:119 #, c-format msgid "Could not write to socket: %s" msgstr "Невозможно записать данные в сокет: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Страна:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "Созда&ть новый файл" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "Создать &отсутствующий локальный каталог и открыть его" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "Создать &отсутствующий удалённый каталог и открыть его" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Создать подкаталог в текущем каталоге" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Создать подкаталог в текущем каталоге и перейти в него" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Создать новый, пустой файл в текущем каталоге" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "Создать катало&г и открыть его" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Создать каталог" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2673 msgid "Create empty file" msgstr "Создать пустой файл" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Создание каталога" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Создание каталога '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Критическая ошибка" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Критическая ошибка:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Критическая ошибка при передаче файлов" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Критическая ошибка после передачи %s в %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2866,97 +3072,102 @@ "синхронизации (%s).\n" "Синхронизированный просмотр был выключен." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Выбран ASCII тип передачи." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Выбрано автоопределение типа передачи." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Выбран бинарный тип передачи." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Кривая:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Произвольный" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Пользовательский набор фильтров" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Сервер, выбранный пользователем" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Голубой" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Т&ип данных" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Десятичные префиксы в системе СИ (напр., 1 КБ = 1000 байт)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "П&о умолчанию" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "У&далить" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "Сравнение &каталогов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "З&апретить все" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "Н&е сохранять пароли" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Д&ействие по двойному клику на каталогах:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "Д&ублировать" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:53 msgid "DOS-like with virtual paths" msgstr "В виде DOS с виртуальными путями" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Опасные типы файлов" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Данные" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Сокет данных закрыт слишком рано." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Дата" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Формат даты" @@ -2972,15 +3183,15 @@ msgid "Debug" msgstr "Отладка" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Настройки отладки" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Локальный &каталог по умолчанию:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:45 msgid "Default (Autodetect)" msgstr "По умолчанию (автоопределение)" @@ -2988,17 +3199,17 @@ msgid "Default editor not properly quoted." msgstr "Неверно выбран редактор по умолчанию." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Действие по умолчанию, если файл существует" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "У&даленный каталог по умолчанию:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -3006,7 +3217,7 @@ "Невозможно разобрать удаленный путь по умолчанию. Убедитесь, что он указан " "верно и поддерживается выбранным типом сервера." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Системный язык по умолчанию" @@ -3014,12 +3225,12 @@ msgid "Default transfer mode:" msgstr "Режим передачи по умолчанию:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Тип передачи по умолчанию:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "По умолчанию: http://ip.filezilla-project.org/ip.php" @@ -3028,7 +3239,7 @@ "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "Пауза между повторными соединениями должна быть от 1 до 999 секунд." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3040,75 +3251,85 @@ msgstr[1] "Ожидание подключения в %d секунды после неудачной попытки..." msgstr[2] "Ожидание подключения в %d секунд после неудачной попытки..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1299 msgid "Delete Site Manager entry" msgstr "Удалить запись из Менеджера Сайтов" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Удалить выбранный каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Удалить выбранные файлы и каталоги" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Удаление \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Удаление %u файлов из \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Удаление символьной ссылки" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Рабочий стол" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Детали" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Детали нового ключа:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:793 msgid "Detected newer version of FileZilla" msgstr "Доступна новая версия FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "Ката&логи" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Направление" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Каталоги:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Каталог" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Разрешения доступа к каталогу" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Сравнение каталогов" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Не удалось сравнить каталоги" @@ -3116,39 +3337,43 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "Каталог с лог-файлом не существует или неверно указано имя." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "&Фильтры построения списка каталогов..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Построение списка каталогов прервано пользователем" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2061 msgid "Directory listing failed" msgstr "Не удалось построить список каталогов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Фильтры построения списка каталогов" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Список каталогов \"%s\" извлечен" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Список каталогов извлечен" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Запр&етить все" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Выключить синхронизированный просмотр и продолжить изменение удалённого " "каталога?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3156,84 +3381,79 @@ "Отключите эту настройку, если содержимое каталогов будет отображаться " "некорректно." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Отключиться от сервера" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:914 +#: ../../locales/../src/engine/ControlSocket.cpp:1010 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:120 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Отключен от сервера" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1039 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:197 #, c-format msgid "Disconnected from server: %s" msgstr "Отключен от сервера: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Отключаюсь от предыдущего сервера" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Отключиться от просматриваемого сервера" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Показать окно 'О программе'" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "Не &использовать редактор по умолчанию" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Ничего &не делать" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Сделать то же самое со &всеми отредактированными файлами" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Уверены, что хотите закрыть FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "Уверены, что хотите удалить все записи Менеджера Сайтов и все задания?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Уверены, что хотите удалить все записи Менеджера Сайтов?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1301 msgid "Do you really want to delete selected entry?" msgstr "Уверены, что хотите удалить выбранный пункт?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Уверены, что хотите удалить задание?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Уверены, что хотите отправить '%s' на сервер?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Вы хотите заново открыть этот файл?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Документация" @@ -3241,48 +3461,48 @@ msgid "Don't use external IP address on &local connections." msgstr "Не использовать внешний IP-адрес при &локальных соединениях" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Файлы с точками, это имена файлов, начинающиеся с точки, например .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Действие по двойному клику" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Загрузить" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Ограничение &скачивания:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:598 #, c-format msgid "Download limit: %s/s" msgstr "Ограничение скачивания: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:601 msgid "Download limit: none" msgstr "Ограничение скачивания: нет" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Скачать результаты поиска" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Скачать выбранный каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Скачать выбранные файлы и каталоги" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3291,34 +3511,34 @@ "Скорость скачивания: %s/s\n" "Скорость загрузки: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Скачиваю" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:156 #, c-format msgid "Downloading %s" msgstr "Скачиваю %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Скачивается обновление..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:90 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:112 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "Перетаскивание между запущенными копиями FileZilla не было выполнено." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:103 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:117 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Перетаскивание между различными серверами не было выполнено." @@ -3326,16 +3546,16 @@ msgid "Dupl&icate" msgstr "Д&ублировать" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "Р&азрешить все" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "&Войти в каталог" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "В&ыполнить" @@ -3343,49 +3563,49 @@ msgid "E&xit" msgstr "В&ыход" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." msgstr "&Экспорт..." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "E-Mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Каждый фильтр должен содержать не менее одного условия." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Править фильтры" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Редактировать файл выбранным редактором и загрузить изменения на сервер." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "" "Редактирование нескольких несвязанных каталогов пока не поддерживается." -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Не удалось отредактировать" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Редактирование результатов поиска" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "Пустая команда" @@ -3393,7 +3613,7 @@ msgid "Empty command." msgstr "Пустая команда." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2063 msgid "Empty directory listing" msgstr "Пустой список каталогов" @@ -3405,13 +3625,13 @@ msgid "Empty file extension." msgstr "Пустое расширение файла." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Заполните имя фильтра!" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Пустое имя" @@ -3419,81 +3639,97 @@ msgid "Empty quoted string." msgstr "Пустая строка в кавычках." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Вк&лючить все" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Разрешить &фильтрацию недопустимых символов" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Зашифровано" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Шифрование" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Ключ шифрования:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Ключ шифрования:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Параметры шифра" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Закончить сравнение и изменить порядок сортировки?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Закончить сравнение и открыть быстрый поиск?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "Ввести &команду..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Введите 0 для отключения ограничения." -#: ../../locales/../src/interface/QueueView.cpp:2103 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "Введите команду" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Введите произвольную команду" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Войти в каталог" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Введите имя фильтра" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Введите мастер-пароль" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Введите имя набора фильтров" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Введите новое название набора фильтров" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Введите пароль" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Войти в выбранный каталог" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3501,12 +3737,11 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Введите адрес сервера.\n" -"Для указания серверного протокола, введите перед адресом идентификатор " -"протокола. Если протокол не указан, будет использован FTP протокол " -"(ftp://).\n" -"Также вы можете вводить сюда полные URL в формате protocol://user:pass@host:" -"port, при этом значения в других полях будут перезаписаны.\n" +"Введите адрес сервера. Для указания серверного протокола, введите перед " +"адресом идентификатор протокола. Если протокол не указан, будет использован " +"FTP протокол (ftp://). Также вы можете вводить сюда полные URL в формате " +"protocol://user:pass@host:port, при этом значения в других полях будут " +"перезаписаны.\n" "\n" "Поддерживаемые протоколы:\n" "- ftp:// для нормального FTP с опциональным шифрованием\n" @@ -3514,7 +3749,7 @@ "- ftps:// для FTP через SSL (неявным)\n" "- ftpes:// для FTP через SSL (явным)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3523,118 +3758,135 @@ "Введите пароль для файла '%s'.\n" "Преобразованный файл будет защищен тем же паролем." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Введите порт, который прослушивает сервер.\n" -"По умолчанию, для FTP это 21, для SFTP это 22" +"Введите порт, который прослушивает сервер. По умолчанию, для FTP это 21, для " +"SFTP это 22" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Введите имя пользователя" + +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Введите имя пользователя и пароль" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Ошибка" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Ошибка при экспорте настроек" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Ошибка импорта" -#: ../../locales/../src/interface/QueueView.cpp:1903 +#: ../../locales/../src/interface/QueueView.cpp:1663 msgid "Error loading queue" msgstr "Ошибка загрузки очереди" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1824 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:786 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:849 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Ошибка загрузки файла xml" -#: ../../locales/../src/interface/QueueView.cpp:1813 +#: ../../locales/../src/interface/QueueView.cpp:1556 msgid "Error saving queue" msgstr "Ошибка сохранения очереди" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Ошибка запуска программы" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:870 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2496 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Ошибка записи файла xml" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:284 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "Ошибка:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Пример: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Примеры" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Вып&олнить" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Исполняемый файл не содержит указания версии, невозможно проверить " "обновление." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Проводник" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Экспорт &Фильтров" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Экспорт &задания" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Экспорт настроек" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Экспорт настроек" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "И&мя фильтра:" @@ -3642,28 +3894,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 msgid "FTP - File Transfer Protocol" msgstr "FTP - Протокол передачи файлов" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Протокол передачи файлов с опциональным шифрованием" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Небезопасный протокол передачи файлов" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Движок FTP не инициализирован, невозможно соединиться" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Поддержка FTP соединения" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP прокси" @@ -3680,78 +3931,86 @@ "FTP использует вторичные соединения для передачи. Эти соединения могут быть " "установлены двумя путями:" -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP через явный TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:24 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP через неявный TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Не удалось изменить каталог" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Не удалось изменить язык" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Не удалось преобразовать команду в 8-битную кодировку" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2276 msgid "Failed to copy or move sites" msgstr "Не удалось скопировать или переместить сайты" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Не удалось создать резервную копию файла xml" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Не удалось создать сокет прослушивания, действие отменено" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Не удалось создать сокет прослушивания на порту %d, действие отменено." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Не удалось создать сокет прослушивания для активного режима передачи" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Не удалось расшифровать пароль сервера." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Не удалось получить путь к каталогу 'Мои документы'" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Не удалось получить путь к 'Рабочему столу'" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" -"Не удалось получить peer-адрес контрольного соединения, соединение закрыто!" +"Не удалось получить peer-адрес контрольного соединения, соединение закрыто." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Не удалось получить peer-адрес соединения передачи данных, соединение " -"закрыто!" +"закрыто." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Не удалось инициализировать движок FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:128 msgid "Failed to initialize TLS." msgstr "Не удалось инициализировать TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" msgstr "Не удалось инициализировать сеть" @@ -3759,69 +4018,69 @@ msgid "Failed to load panels, invalid resource files?" msgstr "Не удалось загрузить панели, неправильные файлы ресурсов?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Не удалось загрузить секретный ключ: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Не удалось открыть \"%s\" для добавления/записи" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Не удалось открыть \"%s\" для чтения" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Не удалось открыть \"%s\" для записи" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Failed to parse returned path." msgstr "Не удалось разобрать возвращенный путь." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Не удалось получить данные" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Не удалось получить список каталогов" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Не удалось получить внешний IP-адрес, действие отменено" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Не удалось получить внешний IP-адрес, действие отменено." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "Не удалось получить внешний IP-адрес, используется локальный" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Не удалось получить локальный IP-адрес." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Не удалось получить локальный IP-адрес, действие отменено." -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Не удалось получить локальный IP-адрес, действие отменено" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Не удалось получить локальный IP-адрес." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Не удалось получить внешний IP-адрес." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Не удалось отправить команду." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "Не удалось установить %s (%s) язык, использую системный по умолчанию" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3829,42 +4088,41 @@ "Не удалось установить %s (%s) язык, использую системный по умолчанию (%s, " "%s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "Не удалось установить %s (%s) язык, использую системный по умолчанию" -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Не удалось установить %s язык, использую системный по умолчанию" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Не удалось установить %s язык, использую системный по умолчанию (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Не удалось установить %s язык, использую системный по умолчанию" -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Не удалось проверить настройки" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Не удалось проверить сертификат" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Не удалось записать в файл %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Не удалось записать в файл xml" @@ -3876,15 +4134,15 @@ msgid "Fall back to active mode" msgstr "Возврат в активный режим" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Фай&л:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Фай&лы" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Файл" @@ -3892,11 +4150,11 @@ msgid "File Types" msgstr "Типы файлов" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Файловый дескриптор не является сокетом" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Файл не содержит данных, пригодных для импорта." @@ -3904,7 +4162,7 @@ msgid "File editing" msgstr "Правка файлов" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "File exists" msgstr "Файл существует" @@ -3912,7 +4170,7 @@ msgid "File exists action" msgstr "Действие, если файл существует" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Файл изменен" @@ -3920,63 +4178,67 @@ msgid "File lists" msgstr "Списки файлов" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Файл не найден" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Поиск файла" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Передача файлa прервана пользователем" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Передача файла прервана пользователем после передачи %s в %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Передача файла потерпела неудачу" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Передача файла потерпела неудачу после передачи %s в %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Передача файла пропущена" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Файл передан успешно" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Файл передан успешно, передан %s в %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Идет передача файлов." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Файл будет передан с типом данных ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Файл будет передан с бинарным типом данных." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Ошибка FileZilla" @@ -3988,72 +4250,76 @@ "FileZilla может протестировать конфигурацию, чтобы убедиться, что все " "настроено правильно." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla уже подключен к серверу." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "Необходимо перезапустить FileZilla для смены языка." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Обновления FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "Строка &состояния" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Имя файла" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Фильтры по названию файлов..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Невозможно задать имя файла для каталога %s и файла %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Filename invalid" msgstr "Неправильное имя файла" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Имя файла не изменено" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Имя файла:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Имя файла не может содержать знаки: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "Имена файлов не могут содержать знаки: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Редактируемые файлы" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Файлы, совпадающие с фильтром исключаются из списка каталога." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Файлы не найдены" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Размер" @@ -4061,64 +4327,68 @@ msgid "Filesize format" msgstr "Формат размера файлов" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Тип файла" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Ассоциации файлов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Применить фильтр к:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Фильтр недопустимых символов в именах файлов" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Название фильтра уже существует" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Элементы, соответствующие всем следующего" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Элементы, соответствующие любому из следующего" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Элементы, соответствующие ничему из следующего" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Элементы, соответствующие не со всем из следующего" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Набор фильтров уже существует" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Фильтр списка каталогов" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Не удалось проверить фильтр" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Искать &файлы" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Искать &каталоги" @@ -4130,16 +4400,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Контрольная сумма (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Контрольная сумма:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Контрольные суммы:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Мастер настройки брандмауэра и маршрутизатора" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4151,7 +4422,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Для надежности, диапазон портов должен быть не менее 10." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4159,33 +4430,38 @@ "Эта сессия будет использовать настройки по умолчанию. Любые изменения в " "настройках не будут сохранены." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "UTF-8 &принудительно" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Принудительно отображать &скрытые файлы" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Принудительно отображать скрытые файлы" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Спецификации формата:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "Формат: расширение \"команда\" аргументы" #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Найдена новая %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Ошибка выполнения функции %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Подробная документация" @@ -4193,11 +4469,15 @@ msgid "General" msgstr "Общие" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Общий сбой сервера SOCKS" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Сгенерировать..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Базовый прокси" @@ -4206,70 +4486,74 @@ msgid "Get external IP address from the following URL:" msgstr "Получить внешний IP-адрес со следующией страницы:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Получение помощи" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Набор фильтров существует. Заменить?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Общие закладки" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Ошибка GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Ошибка GnuTLS %d в %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Ошибка GnuTLS %d в %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Ошибка GnuTLS %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Зеленый" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Групповые права" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "В&ысокий" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP через TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Хэш:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Скрытый" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 #: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Высокий" -#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:938 #: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Наивысший" @@ -4278,55 +4562,64 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Наивысший номер порта должен быть между 1024 и 65535" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "Удерживайте SHIFT, чтобы включить фильтр одновременно на обе стороны." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Хост недоступен" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Контрольная сумма ключа хоста:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Ключ хоста не совпадает" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Хост начинается с '[', но отсутствует кавычка в конце." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Хост недоступен" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Хост:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Алгоритм ключа хоста:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Часы," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Я &забыл свой мастер-пароль. Удалить все пароли, сохраненные с помощью этого " +"ключа." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (например: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 адреса не поддерживаются вместе с SOCKS4 прокси" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4335,7 +4628,7 @@ "Если во время операции данные не будут переданы дольше этого времени, то " "соединение будет закрыто и FileZilla попытается подключиться заново." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "Для сообщения об ошибках, выберите \"Подробности\" из списка." @@ -4358,14 +4651,14 @@ "Если настройка включена, то вы сможете подключаться к ненастроенным " "серверам, которые отвергают выбранный режим передачи." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "" "Если смена ключа не была запланирована, обратитесь к администратору сервера." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4373,7 +4666,7 @@ "Если проблема осталась, значит маршрутизатор и/или брандмауэр продолжает " "блокировать FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4381,7 +4674,7 @@ "Если проблема осталась, значит маршрутизатор и/или брандмауэр продолжает " "прерывать соединение." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4391,7 +4684,7 @@ "\".1\" (возможна перезапись старых лог-файлов), после чего создается новый " "лог-файл." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4399,7 +4692,7 @@ "Если символьная ссылка указывает на каталог, FileZilla может удалить эту " "ссылку или удалить связанный с ней каталог." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4407,13 +4700,13 @@ "Если проблема осталась, обратитесь к производителю вашего брандмауэра или " "маршрутизатора." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Если проблема осталась, обратитесь к производителю вашего маршрутизатора." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4423,7 +4716,7 @@ "синхронизировано с сервером. Если вы и сервер находитесь в разных часовых " "поясах, то сделайте поправку в Менеджере Сайтов." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4431,7 +4724,7 @@ "Если используется сравнение по дате, считать оба файла одинаковыми если " "разница во времени их создания или модификации не превышает заданного лимита." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "После смены языка потребуется перезапустить FileZilla." @@ -4443,11 +4736,11 @@ "Нажав 'Тест', FileZilla подключится к probe.filezilla-project.org и проведет " "несколько простых тестов." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Если вы закроете FileZilla, изменения не будут сохранены." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4459,7 +4752,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "Если возникнут ошибки - ваша конфигурация неправильная." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4467,7 +4760,7 @@ "Если у вас проблемы с получением списка каталогов или передачей файлов, " "попробуйте сменить режим передачи по умолчанию." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4502,7 +4795,7 @@ "Если вы используете маршрутизатор, убедитесь, что все указанные порты " "доступны компьютеру, на котором запущена FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4510,16 +4803,16 @@ "Если ваш маршрутизатор постоянно меняет IP-адреса, то обратитесь к " "производителю маршрутизатора." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Импорт данных из старой версии" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Импортировать настройки" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Импорт успешно завершен" @@ -4545,7 +4838,7 @@ "необходимые порты, так как FileZilla не может менять системные настройки." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4563,19 +4856,11 @@ "сервера порт и присоединяется к нему. В этом случае больше настроек не " "понадобится." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Незавершенная цепочка сертификатов, верхний сертификат не является " -"самоподписанным авторизованным сертификатом." - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Неправильный пароль" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4583,21 +4868,21 @@ "Информация о последней версии FileZilla не может быть получена. Пожалуйста, " "повторите попытку позже." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Инициализирую TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "Небезопасный алгоритм!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Небезопасный сервер, не поддерживает FTP через TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:579 +#: ../../locales/../src/engine/server.cpp:603 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Интерактивный" @@ -4605,29 +4890,29 @@ msgid "Interface" msgstr "Интерфейс" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Прервано сигналом" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:216 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Прервано пользователем" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:40 +#: ../../locales/../src/engine/http/request.cpp:388 msgid "Invalid Content-Length" msgstr "Неправильная длина контента" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:271 msgid "Invalid HTTP Response" msgstr "Неправильный ответ HTTP" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Передан недопустимый аргумент" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:454 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4635,43 +4920,67 @@ "Принята неправильная последовательность символов, отключение UTF-8. Выберите " "UTF-8 в Менеджере Сайтов, чтобы включить UTF-8 принудительно." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:498 msgid "Invalid chunk size" msgstr "Неправильный размер части данных" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Приняты неверные данные" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Неправильная дата" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Неправильное имя файла" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Неверная контрольная сумма: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "Неверный хост, после кавычки может стоять только точка и порт." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Неверное имя хоста: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Неверные данные" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:330 +msgid "Invalid line" +msgstr "Неверная строка" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Неверный путь" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Неправильный номер порта. Задайте номер в диапазоне от 1 до 65535" -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4685,74 +4994,74 @@ "ftps:// для FTP через SSL (неявным)\n" "ftpes:// для FTP через SSL (явным)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Неверный хост прокси, после закрывающей скобки может следовать только " "двоеточие и порт." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Неверное регулярное выражение" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Неверное регулярное выражение в условии поиска." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:280 msgid "Invalid response code" msgstr "Неверный код ответа" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Неверные условия поиска: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Неверный путь сайта" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Неверный размер" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Неверное имя пользователя." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Неверное значение ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Неверное значение hints" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Инвертировать фильтр" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Страна юрисдикции:" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Место юрисдикции:" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Штат или провинция юрисдикции:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Показывать сначала каталоги" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4763,7 +5072,7 @@ "некоторые тесты для проверки, поддерживает ли сервер эту возможность, " "однако, тест может не удаться." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Обмен ключами" @@ -4771,123 +5080,146 @@ msgid "Key exchange:" msgstr "Обмен ключами:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:576 +#: ../../locales/../src/engine/server.cpp:601 msgid "Key file" msgstr "Файл с ключом" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Идентификатор ключа:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Н&аименьший" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Язык" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Язык изменен" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Последнее изменение" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Раскладка" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1825 +msgid "Leave empty to keep existing password." +msgstr "Оставьте пустым, чтобы сохранить текущий пароль." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Ограничить число одновременных &скачиваний:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Ограничить число одновременных &закачек:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Ограничение локальных портов" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Ограничить размер лог-файла" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Лимит:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:453 msgid "Line length exceeded" msgstr "Превышена длина строки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Кроме того" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Сокет прослушивания закрыт" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "Список:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Наименьший порт:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Локальный" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Локальный адрес уже используется" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Локальная конечная точка была закрыта" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Локальный файл" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Локальный файл не существует." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Локальный файл %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Локальный файл является каталогом а не файлом." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Локальный файл имеет неверное имя." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Локальный поиск файлов" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Локальные фильтры:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Способ обработки локального пути:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Локальный сайт:" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "Локальный размер '%s' не совпадает ожидаемому размеру: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Локальность:" @@ -4895,16 +5227,16 @@ msgid "Log file" msgstr "Файл журнала" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "Авторизовались" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Вход" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4912,7 +5244,7 @@ "Логин содержит не ASCII символы, сервер может не поддерживать UTF-8. Нельзя " "вернуться к локальной кодировке из-за использования прокси." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4920,9 +5252,10 @@ "Логин содержит не ASCII символы, сервер может не поддерживать UTF-8. Попытка " "использовать локальную кодировку." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "Последовательность входа выполнена, но войти не удалось. Отменяю." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "" +"Последовательность входа выполнена, но войти не удалось, операция отменена." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -4938,12 +5271,12 @@ "Тип входа может использоваться вместе с адресом FTP. Параметры должны быть " "'%s' или '%s'" -#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:931 #: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Низкий" -#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:929 #: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Самый низкий" @@ -4956,146 +5289,188 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Пурпурный" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "Убедитесь, что файл доступен и имеет правильный XML-формат документа." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:440 +#: ../../locales/../src/engine/http/request.cpp:453 +#: ../../locales/../src/engine/http/request.cpp:464 +#: ../../locales/../src/engine/http/request.cpp:498 #, c-format msgid "Malformed chunk data: %s" msgstr "Повреждена часть данных: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:40 #, c-format -msgid "Malformed header: %s" -msgstr "Поврежден заголовок: %s" +msgid "Malformed request header: %s" +msgstr "Поврежден заголовок запроса: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Поврежден ответ, сервер не посылает надлежащие окончания строк" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:517 +#, c-format +msgid "Malformed response body: %s" +msgstr "Повреждено тело ответа: %s" + +#: ../../locales/../src/engine/http/request.cpp:241 +#: ../../locales/../src/engine/http/request.cpp:247 +#: ../../locales/../src/engine/http/request.cpp:330 +#: ../../locales/../src/engine/http/request.cpp:380 +#: ../../locales/../src/engine/http/request.cpp:388 +#: ../../locales/../src/engine/http/request.cpp:446 +#, c-format +msgid "Malformed response header: %s" +msgstr "Поврежден заголовок ответа: %s" + +#: ../../locales/../src/engine/http/request.cpp:401 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." +msgstr "" +"Неправильный формат ответа: сервер прислал тело ответа с запросом действия " +"или кодом ответа, который не допускает тело ответа." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Передача вручную" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Мастер-&пароль:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Мастер-пароль:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Найдено все из следующего" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Найдено любое из следующего" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Найдено ничего из следующего" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Найдено не все из следующего" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Максимум одновременных &передач:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Ошибка выделения памяти" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Журнал сообщений" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Позиция журнала сообщений" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Слишком длинное сообщение" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "Мб" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Минут" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Переместить вниз" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Переместить вверх" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Мой компьютер" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Мои документы" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:772 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:775 msgid "My Sites" msgstr "Мои Сайты" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "Нет данных" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Имя" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1264 msgid "Name already exists" msgstr "Имя уже существует" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Закладка с таким именем уже существует." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Имя:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Естественная сортировка" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Нужно ввести имя фильтра" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Нужно ввести действительный локальный путь" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Нужно ввести действительный удаленный путь" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1049 msgid "Need to specify a character encoding" msgstr "Укажите кодировку символов" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Не указаны параметры nodename или servername, или не известны" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5103,12 +5478,12 @@ "Сетевой хост не имеет каких-либо сетевых адресов в запрашиваемом семействе " "адресов" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Сеть недоступна" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Никогда" @@ -5120,37 +5495,37 @@ msgid "New &tab" msgstr "Новая &вкладка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Новая &закладка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2434 msgid "New bookmark" msgstr "Новая закладка" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1340 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Новый каталог" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Новые возможности и исправления в %s" @@ -5159,41 +5534,41 @@ msgid "New filter" msgstr "Новый фильтр" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:953 msgid "New folder" msgstr "Новый каталог" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2407 msgid "New site" msgstr "Новый сайт" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Рядом с панелью заданий" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:389 msgid "No" msgstr "Нет" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Адрес не ассоциирован с nodename" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Не выбрана категория экспорта" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." msgstr "Не указана команда. Отбой." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Внешний IP-адрес неустановлен, использую по умолчанию." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Ни один файл сейчас не редактируется." @@ -5201,95 +5576,91 @@ msgid "No filter name given" msgstr "Не указано имя фильтра" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Пожалуйста, укажите хост." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Нет доступных изображений" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Нет больше файлов в задании!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Не указано имя набора фильтров." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Нет программы, ассоциированной с данным типом файлов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "Ни одна программа не ассоциирована с файлами с расширением '%s'." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Отсутствует маршрут к хосту" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Ничего не найдено" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Нет доступных сайтов" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Неподдерживаемый метод авторизации SOCKS5" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Не указано имя пользователя." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Нет" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Ничего не выбрано" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Непоправимая ошибка в определении имен" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:570 +#: ../../locales/../src/engine/server.cpp:597 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 #: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 msgid "Normal" msgstr "Нормальный" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "Не все элементы могут быть доступны для передачи." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Нет соединения" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2059 msgid "Not connected to any server" msgstr "Нет подключения к серверу" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Нет подключения к серверу." @@ -5297,29 +5668,38 @@ msgid "Not connected." msgstr "Нет соединения." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Не инициализирован, нужно вызвать WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Предупреждение: эта особенность поддерживается, только при использовании " "протокола FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Примечание: потерянный ключ восстановить невозможно." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" "Предупреждение: это работает только для обычных, незашифрованных FTP-" "соединений." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Внимание: использование базового прокси принудительно включает пассивный " "режим для FTP соединений." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:247 +#: ../../locales/../src/engine/http/request.cpp:446 +msgid "Null character in line" +msgstr "Null-символ в строке" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Кол-во знаков после запятой:" @@ -5327,40 +5707,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Число попыток должно быть между 0 и 99" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "Открыть файл" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "О&ткрыть" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "ОК" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "Версия ОС:" @@ -5372,40 +5756,53 @@ "Выбранный режим будет сконфигурирован далее, так же как и режим возврата " "(если включен)." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "Once" msgstr "Однажды" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Каждый день" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Каждую неделю" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:544 msgid "Only use plain FTP (insecure)" msgstr "Использовать обычный FTP (небезопасно)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Откр&ыть файл" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Открыть каталог в системном менеджере файлов" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Открыть Менеджер Сайтов" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Открыть Менеджер Сайтов" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Открыть Менеджер Сайтов. Нажмите правую клавишу мыши для списка сайтов." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Открыть диалоговое окно разрешений доступа к каталогу, чтобы настроить " +"локальные каталоги, к которым FileZilla имеет доступ." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Открыть файл." @@ -5413,14 +5810,16 @@ msgid "Open the settings dialog of FileZilla" msgstr "Открыть окно настроек FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Открыт как:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Не удалось открыть" @@ -5432,139 +5831,147 @@ msgid "Opens the Site Manager" msgstr "Открывает Менеджер Сайтов" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Открывает окно фильтра списка каталогов. Нажмите правую клавишу мыши для " "переключения между фильтрами." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Операционная система:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Операция уже выполняется" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Операция выполняется" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Операция не поддерживается" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Параметры" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Оранженый" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Организация:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Другие настройки SFTP" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Другая системная ошибка" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Другое:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Недостаточно памяти" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Обзор" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Заменить &более новым" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Заменить файл" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Заменить файл, если отличается размер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Заменить файл, если отличается размер или файл новее" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Заменить файл, если файл новее" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Заменить, если отличается размер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Заменить, если отличается размер или новее" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Собственный тип сборки: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Права владельца" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Владелец/Группа" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "Препятствовать засыпанию системы во время передач и других операций" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Хост прокси:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Команда PORT повреждена маршрутизатором или брандмауэром." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Па&ссивный (рекомендуется)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Параметр не является допустимым URL-адресом" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Анализируем %d байт информации о версии.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Паро&ль:" @@ -5572,66 +5979,81 @@ msgid "Passive (recommended)" msgstr "Пассивный (рекомендуется)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Пассивный режим" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Пассивный режим установлен по умолчанию." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Пароль или ключ шифрования не задан" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Требуется пароль" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Пароли" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Путь" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Невозможно задать путь для каталога %s и подкаталога %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Путь не найден:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Пути" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Ожидаю удаления" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Право" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Доступ запрещен" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Права" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Платформа:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" +"Добавьте локальные каталоги, которые хотите использовать с помощью FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5639,6 +6061,15 @@ "Посетите https://filezilla-project.org/probe.php чтобы убедиться, что сервер " "работает и проверьте установки еще раз." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"В появившемся диалоговом окне проверьте предоставленные разрешения и " +"повторно добавьте все отсутствующие локальные каталоги, с которыми вы " +"работаете." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5647,12 +6078,12 @@ "Сконфигурируйте брандмауэр и маршрутизатор так, чтобы FileZilla могла " "установить исходящее соединение с произвольными портами." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Пожалуйста, отключите режимы 'DMZ' и 'Игровой' на вашем маршрутизаторе." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5668,13 +6099,13 @@ msgid "Please enter a custom time format." msgstr "Введите свой формат времени." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Введите дату в формате ГГГГ-ММ-ДД, например 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5685,16 +6116,16 @@ msgid "Please enter a name for the new filter." msgstr "Введите название нового фильтра." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Введите название для копии фильтра." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Введите новое название набора фильтров \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Введите новое название фильтра." @@ -5715,50 +6146,40 @@ "transfers." msgstr "Введите число одновременных передач (0-10)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Введите пароль для данного сервера:" -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Пожалуйста, укажите путь к программе.\n" -"Например: c:\\путь\\файл.exe в Windows или /путь/файл в Unix.\n" -"Дополнительно, можете также указать аргументы для запуска." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "Введите время паузы от 10 до 9999 сек. (0 - нет паузы)" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Введите уникальное имя для этого набора фильтров" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Введите имя пользователя для данного сервера:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Введите правильный диапазон портов" -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Введите URL, с которого будет получен ваш внешний IP-адрес" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Пожалуйста, введите ограничение скорости загрузки (больше или равно 0 %s/" "сек)." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5766,27 +6187,46 @@ "Введите raw FTP команду.\n" "Использование raw команд очищает кэш каталогов." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Пожалуйста, укажите полный путь к программе и её аргументы. Эта команда " +"будет выполнена после завершения операций в очереди\n" +"Например: c:\\путь\\файл.exe в Windows или /путь/файл в Unix.\n" +"Вам необходимо корректно заключать команды и их аргументы в кавычки, если " +"они содержат пробелы." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Введите имя создаваемого каталога:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2673 msgid "Please enter the name of the file which should be created:" msgstr "Введите имя создаваемого файла:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Введите имя пользователя и пароль для данного сервера:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "Введите ваш текущий мастер-пароль для изменения настроек пароля." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Введите ваш внешний IP-адрес" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5796,6 +6236,12 @@ "странице мастера. Если же у вас динамический IP, либо вы не знаете вашего " "внешнего IP, то включите настройку получения внешнего IP." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Введите ваш текущий мастер-пароль для расшифровки пароля данного сервера:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5804,7 +6250,7 @@ "Внимательно следуйте инструкциям, так как неверная конфигурация приведет к " "проблемам с соединением." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5812,11 +6258,11 @@ "Убедитесь, что FileZilla имеет право устанавливать соединение и что " "введенный адрес правильный." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "Убедитесь, что выбранный язык установлен в системе." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5839,7 +6285,7 @@ "троянами и другими вредоносными программами. Это может вызвать ложный сигнал " "тревоги, который вы можете спокойно отключить." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5847,7 +6293,7 @@ "Учтите, что сохранение времени создания файла при закачках на FTP, FTPS и " "FTPES серверы работает только если они поддерживают команду MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5855,7 +6301,7 @@ "Учтите, что некоторые серверы могут забанить вас, если вы будете делать " "попытки соединения с очень коротким интервалом." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5865,11 +6311,19 @@ "вас возникнут проблемы с серверами, к которым ранее вы подключались " "нормально." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Сохраните этот ключ в безопасном месте. Без правильного ключа ваши " +"загруженные файлы станут недоступны." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Пожалуйста, выберите действие:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Пожалуйста, выберите категории для импорта." @@ -5900,7 +6354,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Выберите новые атрибуты для выбранных файлов." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5914,37 +6368,37 @@ "такие режимы маршрутизатора, как 'DMZ' или 'Игровой'. Кроме этого, проверка " "протокола должна быть отключена." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Позиция &журнала сообщений:" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Почтовый индекс:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "&Резервировать место перед скачиванием" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Резервирование" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2135 msgid "Predefined Sites" msgstr "Предустановленные Сайты" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Сохраняю время создания файлов" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Предпросмотр:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Предпросмотр" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Сертификаты основного соединения и канала данных не соответсвуют." @@ -5956,15 +6410,15 @@ msgid "Print version information to stdout and exit" msgstr "Печать версии на stdout и выйти" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Приоритет каталогов (по умолчанию)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Приоритет" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5972,7 +6426,7 @@ "Политика конфиденциальности: Будет передана информация только о версии " "FileZilla, используемой операционной системе и архитектуре процессора." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Личные &ключи:" @@ -5980,31 +6434,31 @@ msgid "Pro&tocol:" msgstr "Про&токол:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "&Пароль прокси:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Выполнить &задание" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Переполнение таблицы для обработки файлов" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Обработано %s в %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Протокол не поддерживается" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Протокол не поддерживается данным типом сокета" @@ -6012,53 +6466,53 @@ msgid "Protocol:" msgstr "Протокол:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Порт прокси:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Пользователь прокси" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Аутентификация прокси не удалась" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Не установлена связь с прокси: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Хост прокси начинается с '[', но закрывающая скобка не найдена." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Ответ прокси: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:520 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Сбой запроса прокси. Ответ от прокси: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Сбой запроса прокси: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Сбой запроса прокси: Неизвестный тип адреса в ответе CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Прокси установлен, но хост или порт прокси недействителен" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Аутентификация с открытым ключом" @@ -6066,68 +6520,77 @@ msgid "Public key algorithm:" msgstr "Алгоритм публичного ключа:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Публичные права" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "Задание полностью завершено" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Задание: %s Мб" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Задание: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Задание: пусто" -#: ../../locales/../src/interface/QueueView.cpp:440 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Файлы в задании" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Задание:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Быстрый поиск:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "При сравнении каталогов быстрый поиск открыть невозможно." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" msgstr "П&ерезагрузить систему" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "У&даленный список" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "О&чистить выбранные и получить снова" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Raw команда FTP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Чт&ение" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "&Обновить" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Пе&реименовать" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6135,20 +6598,20 @@ "Повторно запустите Мастер и тщательно проверьте настройки и конфигурирование " "всех маршрутизаторов и брандмауэров." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Чте&ние" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Только чтение" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Отменить текущую операцию?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1421 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6157,8 +6620,8 @@ msgstr[1] "Удалить %d каталога вместе со всем содержимым с сервера?" msgstr[2] "Удалить %d каталогов вместе со всем содержимым с сервера?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" @@ -6166,13 +6629,13 @@ msgstr[1] "Удалить %d файла с сервера?" msgstr[2] "Удалить %d файлов с сервера?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1426 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Удалить %s и %s с сервера?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "Удалить все выбранные файлы и/или каталоги с сервера?" @@ -6180,52 +6643,60 @@ msgid "Really delete all selected files and/or directories from your computer?" msgstr "Удалить все выбранные файлы и/или каталоги с вашего компьютера?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Причина" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "Перезагрузить сейчас" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Пер&енаправить во вложенные каталоги" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "От сервера получено TLS оповещение: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3078 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Получен список каталога который вероятно закодирован в EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2060 +#: ../../locales/../src/engine/directorylistingparser.cpp:2077 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Получена строка, содержащая более 10000 символов, остановка." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Полученную цепочку сертификатов невозможно проверить. Проверка находится в " +"состоянии %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Принятые данные повреждены" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "Получен недопустимый символ в информации о версии" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "От сервера получено неизвестное TLS оповещение %d" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "Полученная информация о версии слишком большая" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6234,77 +6705,75 @@ "серверу.\n" "Если Вы продолжите, то подключение будет разорвано." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Настройка переподключения" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Подключиться к последнему использованному серверу" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Рекурсивное добавление файлов в очередь." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Рекурсивное изменение разрешений." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Рекурсивное удаление файлов и каталогов." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Красный" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Перенаправление на неправильный или неподдерживаемый URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Перенаправление на неправильный или неподдерживаемый адрес: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Обновить список файлов и каталогов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Запомнить пароли?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Удаленный" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Сертификат удаленного сервера не действителен" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Файл на сервере" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Удаленный поиск файлов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Удаленные фильтры:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Удаленный путь" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6313,7 +6782,7 @@ "Невозможно разобрать удаленный путь. Убедитесь, что указан верный абсолютный " "путь и что он поддерживается типом сервера (%s) данного сайта." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1177 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6323,128 +6792,132 @@ "путь и что он поддерживается типом сервера (%s) установленном на исходном " "сайте." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Невозможно разобрать удаленный путь. Убедитесь, что указан верный абсолютный " "путь." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Невозможно разобрать удаленный путь." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Удаленный путь:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Удаленный путь:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Удаленный сайт:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Очистить &все" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Очистить &выбранные" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Переименовать файл" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Переименовать выбранный каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Переименовать выбранные файлы и каталоги" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:595 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Переименование '%s' в '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Повторите пароль:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Отчет об ошибках и запрос возможностей" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Запрос не удался - клиент не запустил identd (или не доступен с сервера)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Запрос не удался - identd клиента не может подтвердить строку ID пользователя" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "Запрос отклонен или не удался" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:542 msgid "Require explicit FTP over TLS" msgstr "Требовать FTP через TLS (явный)" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:543 msgid "Require implicit FTP over TLS" msgstr "Требовать FTP через TLS (неявный)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "Очистить все и получить снова" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Полученный протокол неизвестен" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1081 #, c-format msgid "Resolving address of %s" msgstr "Определение IP-адреса для %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Ресурс временно недоступен" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:357 msgid "Response:" msgstr "Ответ:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Результаты:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Докачать файл" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6452,19 +6925,21 @@ "Режим докачки ASCII файлов может вызвать проблемы, если сервер использует " "другой формат конца строки." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Получение списка каталогов \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Получение списка каталогов..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Получение внешнего IP-адреса с %s" @@ -6473,23 +6948,23 @@ msgid "S&how files currently being edited..." msgstr "Показать редактируемые файлы..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "П&оказывать Менеджер Сайтов на запуске" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Выключить систему" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "В&ыключить систему" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "&Прервать" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" msgstr "П&риостановить систему" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "С&инхронизированный просмотр." @@ -6497,90 +6972,111 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Поддержка SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 прокси будет подключаться к: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 не поддерживает имена пользователей или пароли длиннее, чем 255 " +"символов." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Сох&ранить пароли, защищая мастер-паролем" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Со&хранить пароли" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Сохранить настройки?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 msgid "Saving of password has been disabled by your system administrator." msgstr "Сохранение пароля было отключено вашим системным администратором." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 msgid "Saving of passwords has been disabled by you." msgstr "Сохранение паролей было отключено вами." -#: ../../locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "Поиск файлов для добавления в задание" - -#: ../../locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" -msgstr "Поиск файлов для загрузки на сервер" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Коэффициент масштабирования:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Условия &поиска:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Поиск каталога:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Рекурсивный поиск файлов." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Искать файлы на сервере" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Тип поиска:" + +#: ../../locales/../src/interface/statusbar.cpp:515 msgid "Security information" msgstr "Информация о безопасности" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "Смотрите также: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Выберите сервер" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Выберите &страницу:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Выбор темы" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "Выберите действие по умолчанию, если объект существует" -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Выберите редактор по умолчанию" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6588,7 +7084,7 @@ "Выберите действие по умолчанию, если объект существует (работает только в " "текущей сессии)." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6596,61 +7092,65 @@ "Выберите действие по умолчанию, если объект существует (только для выбранных " "файлов в задании)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Выберите файл содержащий личный ключ" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Выберите файл для экспорта данных" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Выберите файл для экспорта фильтров" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Выберите файл для экспорта содержимого очереди" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Выберите файл для экспорта настроек" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2479 msgid "Select file for exported sites" msgstr "Выберите файл для экспорта сайтов" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Выберите файл, из которого будут импортироваться настройки" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Выбор файла для загрузки на сервер" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Выберите название для файла с ключом" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Определите, как открывать данные файлы." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Выберите каталог для загрузки" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Выберите имя файла" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Выберите категории для экспорта:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Выберите личные данные, которые вы хотите удалить." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6658,7 +7158,7 @@ msgstr[1] "Выбрано %d каталога вместе с содержимым для передачи." msgstr[2] "Выбрано %d каталогов вместе с содержимым для передачи." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." @@ -6666,7 +7166,7 @@ msgstr[1] "Выбрано %d каталога." msgstr[2] "Выбрано %d каталогов." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6674,7 +7174,7 @@ msgstr[1] "Выбрано %d файла для передачи." msgstr[2] "Выбрано %d файлов для передачи." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" @@ -6682,7 +7182,7 @@ msgstr[1] "Выбрано %d файла. Размер: %s" msgstr[2] "Выбрано %d файлов. Размер: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" @@ -6690,49 +7190,49 @@ msgstr[1] "Выбрано %d файла. Размер: не менее %s" msgstr[2] "Выбрано %d файлаов. Размер: не менее %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Выбраны %s и %s для передачи." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Выбраны %s и %s. Общий размер: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Выбраны %s и %s. Размер: не менее %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Выбранный редактор не существует." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Выбранный файл уже редактируется" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Выбранный файл уже загружен" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Выбранный файл уже открыт" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Выбранный файл все еще редактируется" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Выбранный фильтр касается только для локальных файлов." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6740,47 +7240,47 @@ "Выбранная общая закладка и текущий сервер используют различный тип сервера.\n" "Используйте индивидуальные закладки для данного сервера." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Выбранный порт обычно используется с другим протоколом." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Посылать команды FTP активности" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "" "Отправить индивидуальную команду на сервер, не доступную стандартным способом" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Посылаю команду FTP активности" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Серийный номер:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "Тип &сервера:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Сервер неверно закрыл TLS соединение" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Сервер не поддерживает символы не ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Сервер не поддерживает докачку файлов более %d ГБ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6789,15 +7289,19 @@ "Сервер не поддерживает докачку файлов более %d ГБ. Окончить передачу, так " "как размеры файлов совпадают." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Сервер не поддерживает докачку файлов более 2 ГБ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Сервер не поддерживает докачку файлов более 4 ГБ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Ключ хоста сервера" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6806,7 +7310,7 @@ "Сервер может не поддерживать докачку файлов более %d ГБ. Окончить передачу, " "так как размеры файлов совпадают." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6814,11 +7318,15 @@ "Сервер может потребовать учетную запить. Попробуйте указать учетную запись " "используя Менеджер Сайтов" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:241 +msgid "Server not sending proper line endings" +msgstr "Сервер не отправляет правильные окончания строк" + +#: ../../locales/../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "Сервер вернул пустой путь." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:224 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6826,13 +7334,13 @@ "Сервер послал дополнительный запрос на логин. Необходимо использовать " "интерактивный логин." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Сервер отправил пассивный ответ с неопределяемым адресом. Пассивный режим не " "сработал." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6840,36 +7348,47 @@ "Сервер отправил пассивный ответ с неопределяемым адресом. Использую " "существующий адрес сервера." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:517 +msgid "Server sent too much data." +msgstr "Сервер отправил слишком много данных." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Сервер направил неожиданный ответ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Сервер отправил несортированную цепочку сертификатов с нарушением " +"спецификации TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "MAC-адрес сервер-клиент:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Шифр сервер-клиент:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "Тип &сервера:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Сервер/Локальный файл" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Сервер:" @@ -6877,49 +7396,54 @@ msgid "Session details" msgstr "Детали сессии" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Установить &приоритет" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:589 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Сменить права '%s' на '%s'" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Установка разрешений '%s' на '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize вызван без указания сокета" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Настройки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Каталог настроек:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "П&оказать оповещение" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Показать необработанный &список каталогов" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Показать окно приветствия..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Показать оба дерева каталогов и продолжить сравнение?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Показать детали" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Показать сведения о других форматах даты и времени" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "Показать в файловом &менеджере" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Показывать доступность TLS шифрования" @@ -6927,7 +7451,7 @@ msgid "Shows this help dialog" msgstr "Показывать это окно помощи" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "Выключить систему" @@ -6935,7 +7459,11 @@ msgid "Signature algorithm:" msgstr "Алгоритм подписи:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Регистрация" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Записи &Менеджера Сайтов" @@ -6943,56 +7471,61 @@ msgid "Site Manager" msgstr "Менеджер Сайтов" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1019 msgid "Site Manager - Cannot remember password" msgstr "Менеджер Сайтов - Не сохранять пароль" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Менеджер Сайтов - Сгенерированный ключ" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1032 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1049 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1077 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1154 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1182 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Site Manager - Invalid data" msgstr "Менеджер Сайтов - Некорректные данные" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Менеджер Сайтов уже открыт" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Сайт не существует." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Путь к сайту должен начинаться с 0 или 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Неправильный путь к сайту." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Индивидуальные закладки" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7001,11 +7534,11 @@ "Для индивидуальных закладок требуется сохранить сервер в Менеджере Сайтов.\n" "Добавить текущее соединение в Менеджер Сайтов?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "Размер" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Отображение размера" @@ -7013,55 +7546,60 @@ msgid "Size unknown" msgstr "Размер неизвестен" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Пропустить файл" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1151 +#: ../../locales/../src/engine/ControlSocket.cpp:1168 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping download of %s" msgstr "Пропускаю закачку %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Пропуск несуществующего файла ключа \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1154 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 +#: ../../locales/../src/engine/ControlSocket.cpp:1197 +#: ../../locales/../src/engine/ControlSocket.cpp:1275 #, c-format msgid "Skipping upload of %s" msgstr "Пропускаю загрузку %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Адрес сокета за пределами адресного пространства" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Сокет уже подключен" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Сокет был закрыт" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Сокет не подключен" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Тип сокета не поддерживается для семейства адреса" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "Некоторые файлы все еще редактируются или требуют закачки на сервер." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7069,31 +7607,31 @@ "Некоторые неправильно настроенные удаленные серверы, находящиеся за " "маршрутизатором, могут отвечать с их локального IP адреса." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Линейная сортировка каталогов" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "Режим сортировки не может быть изменен при сравнении каталогов." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Сортировка" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Сортировка:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Источник и путь одинаковы" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Источник и место назначения не могут быть одинаковы" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Источник и место назначения одинаковы" @@ -7101,37 +7639,37 @@ msgid "Source file:" msgstr "Исходный файл:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Ограничение скорости" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Ограничение скорости" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:592 msgid "Speed limits are disabled, click to change." msgstr "Ограничение скорости выключено, кликните для изменения." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:595 msgid "Speed limits are enabled, click to change." msgstr "Ограничение скорости включено, кликните для изменения." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Стабильные и бета версии" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Только стабильные версии" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Стабильные, бета и ночные версии" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Начать передачу немедленно" @@ -7139,19 +7677,21 @@ msgid "Start with opened Site Manager" msgstr "Запускать с открытым Менеджером Сайтов" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Началась проверка обновлений на %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Начинаю скачивать %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Начинаю закачивать %s" @@ -7160,30 +7700,38 @@ msgid "Starts the local site in the given path" msgstr "Запуск локального сайта по указанному пути" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Штат или провинция:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "Состояние" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:298 +#: ../../locales/../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "Статус:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Остановить и удалить &все" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Остановить рекурсивную операцию" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Децентрализованное облачное хранилище" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Поддержка Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Улица:" @@ -7199,11 +7747,11 @@ msgid "Summary of test results:" msgstr "Результаты теста:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "Suspend now" msgstr "Приостановить сейчас" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7211,29 +7759,33 @@ "Символьные ссылки на файлы не затронуты этим выбором, такие ссылки всегда " "удаляются." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Синхронизированный просмотр." -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Синхронизированный просмотр был отключен." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Синхронизация каталогов." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Ошибка синтаксиса" @@ -7242,44 +7794,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Ошибка синтаксиса в командной строке" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Система" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Сведения о системе" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Превышен системный предел открытых файлов" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Системная сетевая подсистема не удалась" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "П&анель инструментов" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:139 msgid "TLS connection established, sending HTTP request" msgstr "TLS соединение установлено, отправка HTTP запроса" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS соединение установлено, ожидаю приветственное сообщение..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "TLS соединение установлено." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL истекло" @@ -7287,35 +7839,43 @@ msgid "Target file already exists" msgstr "Файл существует" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Файл на сервере:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2691 msgid "Target filename already exists!" msgstr "Файл с таким именем уже существует!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "Target filename already exists, really continue?" msgstr "Файл с таким именем уже существует! Продолжить?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Временный сбой в определении имен" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Тест успешно завершен" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Результаты теста" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Проверяется возможность докачки с сервера" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "В данный момент редактируются &следующие файлы:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:785 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Для использования Менеджера Сайтов необходимо восстановить файл." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7325,7 +7885,7 @@ "Желаете продолжить? Любые изменения внесенные в Менеджер Сайтов не будут " "сохранены." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7333,29 +7893,37 @@ "Менеджер Сайтов открыт другим процессом FileZilla 3.\n" "Закройте его или данные не будут удалены." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Вы ввели адрес: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Член параметра ai_family не поддерживается" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Член параметра ai_socktype не поддерживается" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Закладка не может быть добавлена." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Закладки не могут быть очищены." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Сертификат требует, чтобы сервер в своем ответе включил статус OCSP, однако " +"статус OCSP отсутствует." + +#: ../../locales/../src/interface/statusbar.cpp:475 msgid "The connection is encrypted. Click icon for details." msgstr "Соединение зашифровано. Нажмите значок для получения доп. сведений." @@ -7377,34 +7945,39 @@ "Формат настраиваемого времени недействителен или содержит неподдерживаемые " "определители формата." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Соединение передачи данных не может быть установлено: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Редактор текстовых файлов по умолчанию не найден." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Редактор текстовых файлов по умолчанию - '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Фильтр с таким именем уже существует, выберите другое имя." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Введенные пароли не совпадают" + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Расширение '%s' уже есть в списке" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7413,8 +7986,9 @@ "Файл %s существует.\n" "Введите новое имя:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7425,7 +7999,7 @@ "Ассоциированная программа (%s) не найдена.\n" "Проверьте настройки ассоциации файлов." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7434,18 +8008,19 @@ "Файл '%s' содержит ключ SSH1. Протокол SSH1 устарел, FileZilla поддерживает " "только ключи SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Файл '%s' нельзя загрузить или он не содержит секретного ключа." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Файл '%s' не может быть загружен." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7454,8 +8029,9 @@ "Файл '%s' нельзя открыть:\n" "Не указана программа, ассоциированная с этим типом файлов." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7464,8 +8040,8 @@ "Файл '%s' нельзя открыть:\n" "Команда не сработала" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7476,7 +8052,7 @@ "Загрузка файлов более новых версий может привести к потере данных.\n" "Вы хотите продолжить?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7489,7 +8065,7 @@ msgid "The file selected as default editor does not exist." msgstr "Выбранный редактор не существует." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7503,11 +8079,11 @@ "пользователя и пароль.\n" "Продолжить импорт?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Колонку с названиями файлов нельзя скрывать или перемещать." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Колонку с названиями файлов нельзя скрыть." @@ -7521,19 +8097,19 @@ msgid "The following characters will be replaced: %s" msgstr "Следующие символы будут заменены: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "В данный момент редактируются следующие файлы:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Бесплатный FTP клиент с открытым исходным кодом" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Сгенерированный ключ шифрования:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Общие закладки не могут быть сохранены." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7546,17 +8122,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Лимит должен быть между 1 и 2000 Мб." -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Локальный каталог '%s' не может быть создан." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Локальный каталог '%s' не существует." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7575,25 +8151,30 @@ "Наименьший доступный порт должен быть либо меньше, либо равен наибольшему из " "выбранных портов." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Длина мастер-пароля должна составлять не менее 8 символов." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "" "Новая версия не может быть загружена, пожалуйста, повторите попытку позже." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Новая версия была сохранена в вашем каталоге загрузок." -#: ../../locales/../src/interface/QueueView.cpp:1823 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." msgstr "Очередь не может быть сохранена." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Удалённый каталог '%s' не существует." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7604,27 +8185,27 @@ "Выключить синхронизированный просмотр и продолжить изменение удалённого " "каталога?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Выбранные категории импортированы." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "Выбранный файл содержит импортируемые данные для следующих категорий:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Выбранный файл уже редактируется" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Выбранный файл все еще используется каким-то приложением. Закройте его." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7634,15 +8215,15 @@ "Это опасно и может повредить вашу систему.\n" "Уверены, что хотите продолжить?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Сервер не может быть добавлен." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Сервер отправил неожиданный или непознанный ответ." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Кодировка, используемая сервером:" @@ -7654,7 +8235,7 @@ "Неизвестный сертификат сервера. Проверьте сертификат, чтобы убедиться, что " "он может быть принят." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7664,7 +8245,7 @@ "администратор сервера сменил ключ, либо вы пытаетесь подключиться к какому-" "то другому компьютеру, выдающему себя за сервер." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7672,31 +8253,35 @@ "Ключ хоста сервера неизвестен. Нет гарантии, что это именно тот сервер, что " "вам нужен." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Имя хоста сервера не совпадает с именем хоста сертификата" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "Параметр servname не поддерживается для ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." msgstr "" "Настройки импортированы. Перезапустите FileZilla для применения настроек." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Указанное семейство адресов не поддерживается" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Указанное сетевое имя больше недоступно" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." msgstr "" "Система вскоре будет перезагружена, если только вы нажмете кнопку 'Отмена'." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "" "Система вскоре будет выключена, если только вы не нажмете кнопку 'Отмена'." @@ -7709,11 +8294,11 @@ "Файл уже существует.\n" "Выберите действие." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Тест не удался. Уверены, что хотите сохранить настройки?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Корректный резервный файл '%s' не может быть загружен." @@ -7722,15 +8307,15 @@ msgid "Themes" msgstr "Темы" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Набор фильтров не может быть удален." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Набор фильтров не может быть переименован." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7754,43 +8339,41 @@ "Этот мастер поможет вам правильно настроить маршрутизатор и брандмауэр и " "протестировать вашу конфигурацию." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "Время" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Формат времени" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Время ожид&ания, сек.:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Время ожидания" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Смещение часового пояса сервера составляет %d секунд." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Название:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Для того, чтобы сравнить каталоги необходимо закрыть быстрый поиск." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "Для сравнения каталогов, оба списка должны быть выровнены." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Для этого, оба дерева каталогов должны быть либо скрыты, либо включены." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7798,7 +8381,7 @@ "Для поддержки аутентификации с открытым ключом, FileZilla должен знать, " "какие личные ключи можно использовать." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7814,7 +8397,7 @@ "Зеленый: Файл новее неотмеченного файла на другой стороне\n" "Красный: Размеры файлов не совпадают" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7824,82 +8407,77 @@ "При включении, навигация в локальном каталоге также приводит к " "соответствующей смене каталога на сервере и наоборот." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Показать/скрыть процесс выполнения задания" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Показать/скрыть локальное дерево каталогов" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Показать/скрыть журнал сообщений" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Показать/скрыть удаленное дерево каталогов" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Показать/скрыть задание" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:254 msgid "Too long header line" msgstr "Слишком длинный заголовок" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Слишком много перенаправлений" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "Трассировка:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Передача" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Направление &передачи" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "Режим &передачи" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Режим передачи" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Окно задания" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Настройки передачи" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Соединение прервано: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Преданные данные повреждены." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Передача" @@ -7907,27 +8485,27 @@ msgid "Transfers" msgstr "Передачи" -#: ../../locales/../src/interface/QueueView.cpp:2929 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "Передачи завершены" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Считать файлы &без расширения как ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Считать &следующие типы файлов как ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:385 msgid "Trust changed Hostkey:" msgstr "Принять измененный ключ хоста:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:382 msgid "Trust new Hostkey:" msgstr "Принять новый ключ хоста:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Принять новый ключ и продолжить соединение?" @@ -7935,71 +8513,77 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Принять сертификат и продолжить соединение?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Доверить этому хосту и продолжить соединение?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Попробовать снова" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Тип" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Тип FTP прокси:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Тип базового прокси:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "Загрузить на сервер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "О&граничение загрузки:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Для открытия использовать ассоциации файлов" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "&Использовать системные настройки текущего языка" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Неопределенный код ошибки %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Объект:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Неизвестен" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Неизвестный тип FTP прокси, невозможно сгенерировать последовательность для " "входа." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Неопределенная версия протокола SOCKS: %d" @@ -8008,11 +8592,22 @@ msgid "Unknown certificate" msgstr "Неизвестный сертификат" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Неизвестная ошибка %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Неизвестная ошибка %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Неизвестный ключ" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8021,13 +8616,17 @@ "Неизвестная версия протокола доп. согласования аутентификации имени " "пользователя/пароля SOCKS: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "Неизвестный корневой элемент, файл по-видимому сгенерирован FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:380 +msgid "Unknown transfer encoding" +msgstr "Неизвестная кодировка передачи" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8035,7 +8634,7 @@ "Если не исправить эти проблемы, активный режим FTP не будет работать и нужно " "будет использовать пассивный режим." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8043,15 +8642,15 @@ "Если не исправить эту проблему, активный режим FTP не будет работать и нужно " "будет использовать пассивный режим." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Тип сертификата не поддерживается" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Перенаправление не поддерживается" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Загрузить без изменений" @@ -8060,96 +8659,105 @@ msgid "Updates" msgstr "Обновления" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Закачать" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Загрузка не удалась" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:605 #, c-format msgid "Upload limit: %s/s" msgstr "Ограничение загрузки: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:608 msgid "Upload limit: none" msgstr "Ограничение загрузки: нет" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Закачать на сервер результаты поиска" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Загрузить выбранный каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Загрузить выбранные файлы и каталоги" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Загрузить файл обратно на сервер?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Загрузить файл на сервер?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Загрузка" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Загрузка и ожидание удаления" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Загрузка без изменений" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Использовать &указанную кодировку" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Использовать &следующий редактор:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Использовать &редактор по умолчанию" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Использовать с&инхронизированный просмотр" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Использовать регулярные выражения" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Использовать UTF-8 если сервер поддерживает, иначе использовать локальную " "кодировку." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Использовать по умолчанию" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 msgid "Use explicit FTP over TLS if available" msgstr "Использовать явный FTP через TLS если доступен" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Использовать сервер к которому подключены" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Использовать сервер из Менеджера Сайтов" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "И&спользовать системные настройки текущего языка" @@ -8166,7 +8774,7 @@ msgstr "Использовать внешний IP-адрес сервера" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8184,16 +8792,17 @@ "использования активного режима. Передаваться будет только информация об " "используемой версии FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Пользователь:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1077 msgid "Username cannot be a series of spaces" msgstr "Имя пользователя не может состоять из одних пробелов" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8212,51 +8821,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "Подробные сообщения журнала wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Проверка сертификата..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Очень высокий" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "Просмотреть скрытый набор настроек, неподдерживаемый сервером" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Просмотр/Правка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Видимые колонки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "З&апись" -#: ../../locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "Ожидание" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Ожидание соединения для просмотра" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Ожидание пароля" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Ожидание отмены передачи" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Ожидание повтора..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Внимание, игнорирую соединение с неправильного IP." @@ -8274,23 +8879,23 @@ "\n" "Проверить наличие 'ночных' сборок?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Внимание! Обнаружена уязвимость в системе защиты!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Добро пожаловать в FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Что нового" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Что нового:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8298,7 +8903,7 @@ "Позволяя FileZilla запоминать пароли, вы можете повторно соединятся без " "необходимости повторного ввода пароля после перезапуска FileZilla." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8306,37 +8911,55 @@ "Если включено, то символы, которые не поддерживаются локальной операционной " "системой в именах файлов, будут заменены в именах скачиваемых файлов." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "" "При запуске &нового соединения при наличии уже установленного соединения:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Широкоэкранный" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Н&е сохранять пароли" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "За&пись" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Неправильный внешний IP-адрес" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:440 msgid "Wrong line endings" msgstr "Неправильные концы строк" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Введен неправильный мастер-пароль, который нельзя использовать для " +"расшифровки сохраненных паролей." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Введен неправильный мастер-пароль, который нельзя использовать для " +"расшифровки этого элемента." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Желтый" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:396 msgid "Yes" msgstr "Да" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8344,25 +8967,25 @@ "Кажется вы используете хост, поддерживающий только IPv6. Этот мастер не " "поддерживает это состояние." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Вы используете последнюю версию FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Вы всегда можете открыть это окно снова из меню." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Вы можете скачать последнюю версию с сайта FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" "Вы можете оставить поле порта пустым, чтобы использовать порт по умолчанию." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8370,7 +8993,15 @@ "Вы можете поставить 'x' в любое место, чтобы сохранить права доступа " "оригинальных файлов." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Нельзя по отдельности менять пароль и ключ шифрования с помощью мастер-" +"пароля." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Нельзя импортировать настройки из каталога с настройками FileZilla." @@ -8382,16 +9013,20 @@ "Нельзя заменять недопустимый символ на другой недопустимый. Пожалуйста, " "введите символ допустимый в именах файлов." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Нельзя загружать файлы в корневой каталог." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Вы не указали новое название файла. Заменить файл?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Вы выбрали по крайней мере одну символьную ссылку." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8399,7 +9034,8 @@ "Вы выбрали более 10 файлов для редактирования, вы действительно хотите " "продолжить?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8407,39 +9043,47 @@ "Вы выбрали более 10 файлов или каталогов для открытия, вы действительно " "хотите продолжить?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 msgid "You have to enter a hostname." msgstr "Укажите имя хоста." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 msgid "You have to enter a key file path" msgstr "Укажите путь к файлу с ключом." -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Укажите локальный каталог." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Укажите удаленный каталог." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Укажите правильный IPv4-адрес." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +msgid "You have to enter a valid encryption key" +msgstr "Укажите действительный ключ шифрования" + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Укажите локальный каталог с доступом на запись." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 msgid "You have to enter an account name" msgstr "Укажите имя учетной записи" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 msgid "You have to specify a user name" msgstr "Укажите имя пользователя" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8447,7 +9091,11 @@ "Похоже, что ваш маршрутизатор или брандмауэр внес ошибки в передаваемые " "данные." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Нужно ввести мастер-пароль." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Введите имя закладки." @@ -8455,7 +9103,7 @@ msgid "You need to enter a name for the log file." msgstr "Введите название лог-файла." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Необходимо ввести правильно сформулированную команду." @@ -8468,15 +9116,15 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Укажите порт прокси в пределах от 1 до 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Укажите как минимум один путь, пустые закладки не поддерживаются." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8484,7 +9132,7 @@ "Необходимо ввести локальный и удалённый путь, чтобы включить " "синхронизированный просмотр для этой закладки." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1154 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8492,23 +9140,31 @@ "Необходимо ввести локальный и удалённый путь, чтобы включить " "синхронизированный просмотр для этого сайта." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Необходимо предоставить FileZilla доступ к каталогам загрузки или выгрузки " +"файлов." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Укажите локальный файл." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Укажите удаленный файл." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Укажите удаленный путь." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Укажите сервер." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8516,67 +9172,67 @@ "У вас не должно возникнуть проблем при соединении с другими серверами. " "Соединение должно работать нормально." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2775 msgid "Your computer will suspend unless you click Cancel." msgstr "" "Система вскоре будет перезагружена, если только вы нажмете кнопку 'Отмена'." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "после" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "до" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "начинается с" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "байт" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "содержит" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "другая" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "не содержит" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "не равно" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "заканчивается на" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "эквивалентно" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "файл" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8586,103 +9242,191 @@ "Убедитесь, что файл программы находится в том же каталоге, что и FileZilla." "ехе." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp принадлежит другой версии FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "Невозможно запустить fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj принадлежит другой версии FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "Невозможно запустить fzstorj" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"Невозможно запустить fzstorj.\n" +"Убедитесь, что этот исполняемый файл находится в том же каталоге, что и " +"FileZilla.ехе." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers вернула отсутствие сертификатов" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 завершен с ошибкой" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "больше чем" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "исполняемый (для группы)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "только чтение (для группы)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "чтение и запись (для группы)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "эквивалентно" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "установлен" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "неустановлен" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "меньше чем" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "соответствует regex" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "новое имя" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "исполняемый (для владельца)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "только чтение (для владельца)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "чтение и запись (для владельца)" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "неизвестен" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "исполняемый (для всех)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "только чтение (для всех)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "чтение и запись (для всех)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "&Не запоминать пароли (рекомендуется)" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "Available sizes" +#~ msgstr "Доступные размеры" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Невозможно загрузить панель быстрого соединения из файла ресурсов" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Невозможно импортировать сертификаты, ошибка в gnutls_x509_crt_import" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Невозможно инициализировать структуру для сертификатов, ошибка в " +#~ "gnutls_x509_crt_init" + +#~ msgid "Filename &filters..." +#~ msgstr "Фильтры по названию файлов..." + +#~ msgid "Host key fingerprint:" +#~ msgstr "Контрольная сумма ключа хоста:" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize вызван без указания сокета" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "Смещение часового пояса сервера составляет %d секунд." + +#~ msgid "%d files added to queue" +#~ msgstr "%d файлов добавлено в задание" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Отключиться от сервера" + +#~ msgid "&Show message" +#~ msgstr "&Показать сообщение" + +#~ msgid "Do ¬hing" +#~ msgstr "Ничего &не делать" + +#~ msgid "No more files in the queue!" +#~ msgstr "Нет больше файлов в задании!" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Поиск файлов для добавления в задание" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Поиск файлов для загрузки на сервер" + +#~ msgid "Waiting" +#~ msgstr "Ожидание" + #~ msgid "Empty dirs to visit" #~ msgstr "Пустые каталоги для посещения" #~ msgid "Connected" #~ msgstr "Соединение установлено" -#~ msgid "Deleting directories" -#~ msgstr "Удаление каталогов" - #~ msgid "Deleting multiple unrelated directories is not yet supported" #~ msgstr "Удаление нескольких несвязанных каталогов пока не поддерживается." @@ -8826,9 +9570,6 @@ #~ "> |" #~ msgstr "Имена файлов не могут содержать следущие знаки: / \\ : * ? \" < > |" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Корневой сертификат не действителен" - #~ msgid "Use plain FTP" #~ msgstr "Использовать простой FTP" diff -Nru filezilla-3.15.0.2/locales/sl_SI.po filezilla-3.33.0/locales/sl_SI.po --- filezilla-3.15.0.2/locales/sl_SI.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/sl_SI.po 2018-02-23 09:35:39.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) 2004. # This file is distributed under the same license as the FileZilla package. # Martin Srebotnjak , 2004. -# +# msgid "" msgstr "" "Project-Id-Version: FileZilla 3.3.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-20 18:34+0100\n" -"PO-Revision-Date: 2010-07-30 15:09+0100\n" -"Last-Translator: Martin Srebotnjak \n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-02-23 10:26+0100\n" +"PO-Revision-Date: 2018-02-22 15:57+0100\n" +"Last-Translator: Martin Srebotnjak \n" "Language-Team: Martin Srebotnjak \n" "Language: sl_SI\n" "MIME-Version: 1.0\n" @@ -16,32 +16,33 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Poedit-Country: SLOVENIA\n" "X-Poedit-SourceCharset: iso-8859-1\n" -"X-Poedit-Language: Slovenian\n" +"X-Generator: Poedit 2.0.6\n" -#: ../../locales/../src/interface/statuslinectrl.cpp:65 -#: ../../locales/../src/interface/statuslinectrl.cpp:225 +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "Pretečeni čas: %H:%M:%S" -#: ../../locales/../src/interface/statuslinectrl.cpp:69 -#: ../../locales/../src/interface/statuslinectrl.cpp:233 +#. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "Preostali čas: %H:%M:%S" -#: resources.h:775 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 +#, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" msgstr "" -"%a - Račun (vrstice, ki vsebujejo ta niz, bodo izpuščene, če ne uporabljate " +"%a – Račun (vrstice, ki vsebujejo ta niz, bodo izpuščene, če ne uporabljate " "prijave v račun)" +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 #: ../../locales/../src/interface/filelist_statusbar.cpp:63 -#: ../../locales/../src/interface/filelist_statusbar.cpp:74 -#: ../../locales/../src/interface/filelist_statusbar.cpp:86 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" @@ -50,9 +51,9 @@ msgstr[2] "%d mapi" msgstr[3] "%d mape" -#: ../../locales/../src/interface/RemoteListView.cpp:1660 -#: ../../locales/../src/interface/search.cpp:776 -#: ../../locales/../src/interface/search.cpp:1024 +#: ../../locales/../src/interface/RemoteListView.cpp:1425 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -61,11 +62,11 @@ msgstr[2] "%d mapi z vso vsebino" msgstr[3] "%d mape z vso vsebino" -#: ../../locales/../src/interface/filelist_statusbar.cpp:62 -#: ../../locales/../src/interface/filelist_statusbar.cpp:85 -#: ../../locales/../src/interface/RemoteListView.cpp:1659 -#: ../../locales/../src/interface/search.cpp:775 -#: ../../locales/../src/interface/search.cpp:1023 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" @@ -74,7 +75,7 @@ msgstr[2] "%d datoteki" msgstr[3] "%d datoteke" -#: ../../locales/../src/interface/filelist_statusbar.cpp:81 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" @@ -83,7 +84,7 @@ msgstr[2] "%d datoteki. Skupna velikost: %s" msgstr[3] "%d datoteke. Skupna velikost: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:79 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" @@ -92,12 +93,7 @@ msgstr[2] "%d datoteki. Skupna velikost: najmanj %s" msgstr[3] "%d datoteke. Skupna velikost: najmanj %s" -#: ../../locales/../src/interface/QueueView.cpp:2839 -#, c-format -msgid "%d files added to queue" -msgstr "%d datotek dodanih v vrsto" - -#: ../../locales/../src/engine/ControlSocket.cpp:104 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -106,61 +102,69 @@ msgstr[2] "%d sekundi" msgstr[3] "%d sekunde" -#: resources.h:772 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" -msgstr "%h - Gostitelj" - -#: resources.h:774 -#, no-c-format -msgid "%p - Password" -msgstr "%p - Geslo" +msgstr "%h – Gostitelj" -#: ../../locales/../src/interface/statuslinectrl.cpp:181 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format -msgid "%s (%d B/s)" -msgstr "%s (%d B/s)" +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu map" +msgstr[1] "%llu mapa" +msgstr[2] "%llu mapi" +msgstr[3] "%llu mape" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu datotek" +msgstr[1] "%llu datoteka" +msgstr[2] "%llu datoteki" +msgstr[3] "%llu datoteke" -#: ../../locales/../src/interface/statuslinectrl.cpp:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format -msgid "%s (%d.%d KB/s)" -msgstr "%s (%d,%d KB/s)" +msgid "%p - Password" +msgstr "%p – Geslo" -#: ../../locales/../src/interface/statuslinectrl.cpp:177 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format -msgid "%s (%d.%d MB/s)" -msgstr "%s (%d,%d MB/s)" +msgid "%s (%s/s)" +msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:184 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:39 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" -msgstr "%s - Veljavnost je potrdilu potekla!" +msgstr "%s – Veljavnost potrdila je potekla!" -#: ../../locales/../src/interface/verifycertdialog.cpp:23 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" -msgstr "%s - Še ni veljavna!" +msgstr "%s – Še ni veljavna!" -#: resources.h:776 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 +#, c-format msgid "%s - Proxy user" -msgstr "%s - Uporabnik posredovalnega strežnika" +msgstr "%s – Uporabnik posredovalnega strežnika" -#: ../../locales/../src/interface/filelist_statusbar.cpp:91 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s in %s. Skupna velikost: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:89 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s in %s. Skupna velikost: najmanj %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:31 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -169,260 +173,290 @@ msgstr[2] "%s bajta" msgstr[3] "%s bajti" -#: ../../locales/../src/interface/updatewizard.cpp:904 -#, c-format -msgid "%s bytes" -msgstr "%s bajtov" - -#: ../../locales/../src/interface/updatewizard.cpp:888 -#, c-format -msgid "%s bytes (%d B/s)" -msgstr "%s bajtov (%d B/s)" - -#: ../../locales/../src/interface/updatewizard.cpp:886 -#, c-format -msgid "%s bytes (%d.%d KB/s)" -msgstr "%s bajtov (%d,%d KB/s)" - -#: ../../locales/../src/interface/updatewizard.cpp:884 -#, c-format -msgid "%s bytes (%d.%d MB/s)" -msgstr "%s bajtov (%d,%d MB/s)" - -#: ../../locales/../src/interface/FileZilla.cpp:701 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s ni mogoče najti. Brez te komponente FileZille SFTP ne bo deloval.\n" +"%s ni mogoče najti. Brez te komponente FileZille %s ne bo deloval.\n" "\n" "Prosimo, prenesite FileZillo znova. Če se ta težava ponavlja, sporočite " "hrošča." -#: ../../locales/../src/interface/FileZilla.cpp:795 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s ni mogoče najti. Brez te komponente FileZille SFTP ne bo deloval.\n" +"%s ni mogoče najti. Brez te komponente FileZille %s ne bo deloval.\n" "\n" "Možne rešitve:\n" "- Preverite, da je %s v mapi, navedeni v okoljski spremenljivki PATH.\n" -"- Nastavite polno pot do %s v okoljski spremenljivki FZ_FZSFTP." +"- Nastavite polno pot do %s v okoljski spremenljivki %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:56 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s, %d-bitni" -#: resources.h:773 -#, no-c-format +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s: %d – ime gostitelja ne ustreza potrdilu" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 +#, c-format msgid "%u - Username" -msgstr "%u - Uporabniško ime" +msgstr "%u – Uporabniško ime" -#: resources.h:777 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" -msgstr "%w - Geslo za posredovalni strežnik" +msgstr "%w – Geslo za posredovalni strežnik" -#: resources.h:554 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 +msgid "&Abort previous connection and connect in current tab" +msgstr "&Prekini prejšnjo povezavo in poveži v trenutnem zavihku" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "&O programu ..." -#: resources.h:86 resources.h:384 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "R&ačun:" -#: resources.h:101 resources.h:677 resources.h:741 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Aktivni" -#: resources.h:545 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "&Dodaj zaznamek ..." -#: resources.h:558 resources.h:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Dodaj mapo …" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "&Dodaj datoteke v vrsto" -#: resources.h:785 -msgid "&Add keyfile..." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 +msgid "&Add key file..." msgstr "&Dodaj datoteko ključa ..." -#: resources.h:627 resources.h:646 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "&Dodaj v vrsto" -#: resources.h:95 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "P&rilagodi odmik časovnega pasu strežnika:" -#: resources.h:23 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "&Vedno zaupaj potrdilu v bodočih sejah." -#: resources.h:182 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "&Vedno zaupaj temu gostitelju, dodaj ključ v pomnilnik" -#: resources.h:936 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "Vedno uporabi &privzeti urejevalnik" -#: resources.h:427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Vedno uporabi izbor za nepovezane datoteke" -#: resources.h:65 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" -msgstr "Vedno uporabi to &akcijo" +msgstr "Vedno uporabi to &dejanje" -#: resources.h:753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Vprašaj operacijski sistem za zunanji naslov IP" -#: resources.h:527 resources.h:657 resources.h:822 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "&samodejno" -#: resources.h:107 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Samorazpoznava" -#: resources.h:529 resources.h:659 resources.h:824 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Barva ozadja:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "&binarno" -#: resources.h:896 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Dvojiške predpone s simboli SI (npr. 1 KB = 1024 bajtov)." -#: resources.h:544 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "&Zaznamki" -#: resources.h:92 resources.h:366 resources.h:403 resources.h:409 -#: resources.h:426 resources.h:444 resources.h:933 resources.h:955 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "Pre&brskaj ..." -#: resources.h:812 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Toleranca sunka:" -#: resources.h:128 resources.h:131 resources.h:197 resources.h:488 -#: resources.h:725 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Prekliči" -#: resources.h:235 -msgid "&Check for beta versions of FileZilla" -msgstr "Preveri za različice &beta FileZille" - -#: resources.h:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." msgstr "&Počisti zasebne podatke ..." -#: resources.h:602 +#: ../../locales/../src/interface/resources/xrc/update.xrc:28 +msgid "&Close" +msgstr "&Zapri" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "&Zapri FileZillo" -#: resources.h:667 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&Zapri FileZillo enkrat" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "&Prilagodi omejitve hitrosti ..." -#: resources.h:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "&Prilagodi ..." -#: resources.h:113 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Poveži" -#: resources.h:218 -msgid "&Copy" -msgstr "&Kopiraj" - -#: resources.h:493 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 msgid "&Copy current connection to Site Manager..." msgstr "&Kopiraj trenutno povezavo v upravljalnik strežnikov ..." -#: resources.h:172 resources.h:611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "&Kopiraj na odložišče" -#: resources.h:614 -msgid "&Crash" -msgstr "&Sesutje" - -#: resources.h:566 resources.h:580 resources.h:629 resources.h:650 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "&Ustvari mapo" -#: resources.h:662 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" msgstr "&Ustvari nov zavihek" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Razhrošči" -#: resources.h:963 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "&Podatki o razhroščevanju v dnevniku:" -#: resources.h:929 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "Privzeti &urejevalnik:" -#: resources.h:525 resources.h:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "&Privzeto dejanje, če obstaja datoteka ..." -#: resources.h:735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "Pre&mor med neuspelimi poskusi prijave:" -#: resources.h:76 resources.h:202 resources.h:216 resources.h:416 -#: resources.h:569 resources.h:652 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "I&zbriši" -#: resources.h:457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "I&zbriši simbolično povezavo" -#: resources.h:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "&Dovoljenja dostopa do map ..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" msgstr "Primerjava &map" -#: resources.h:325 +#: ../../locales/../src/interface/state.cpp:1030 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "&Izključi sinhrono brskanje in nadaljuj s spreminjanjem krajevne mape" + +#: ../../locales/../src/interface/state.cpp:1108 +msgid "" +"&Disable synchronized browsing and continue changing the remote directory" +msgstr "&Izključi sinhrono brskanje in nadaljuj s spreminjanjem oddaljene mape" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "&Opusti krajevno datoteko, nato znova prenesi in uredi datoteko" -#: resources.h:538 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "Pre&kini povezavo" -#: resources.h:603 -msgid "&Disconnect from server" -msgstr "&Razveži s strežnikom" - -#: resources.h:872 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Prikaži trenutno hitrost prenosa namesto povprečne hitrosti" -#: resources.h:894 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Izpiši velikost v bajtih" @@ -430,116 +464,135 @@ msgid "&Don't show this dialog again." msgstr "&Tega okna ne pokaži več." -#: resources.h:758 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "Ne uporabi zunanjega naslova IP na &krajevnih povezavah." -#: resources.h:916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "&Dejanje nad datotekami ob dvokliku:" -#: resources.h:573 resources.h:625 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "Prenesi &s strežnika" -#: resources.h:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "P&renesi v:" -#: resources.h:660 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "Prenesi &s strežnika ..." -#: resources.h:257 resources.h:834 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Prenosi s strežnika:" -#: resources.h:503 resources.h:564 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "Ur&edi" -#: resources.h:210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "Ur&edi pravila filtra ..." -#: resources.h:512 resources.h:531 resources.h:640 resources.h:666 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "&Omogoči" -#: resources.h:944 -msgid "&Enable automatic update check" -msgstr "&Omogoči samodejno preverjanje obstoja posodobitev" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 +msgid "&Enable compression" +msgstr "&Omogoči stiskanje" -#: resources.h:481 resources.h:807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Omogoči omejitve hitrosti" -#: resources.h:111 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Kodiranje:" -#: resources.h:82 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 msgid "&Encryption:" -msgstr "Šifriranje" +msgstr "&Šifriranje:" -#: resources.h:610 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "&Vnesi ukaz po meri ..." -#: resources.h:137 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 +msgid "&Establish connection in a new tab" +msgstr "Povezavo s &strežnikom vzpostavi v novem zavihku" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Izvedi" -#: resources.h:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Izvozi vnose upravljalnika strežnikov" -#: resources.h:498 resources.h:656 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "&Izvozi ..." -#: resources.h:763 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Povrni v aktivni način" -#: resources.h:490 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 msgid "&File" msgstr "&Datoteka" -#: resources.h:637 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "&Atributi datoteke ..." -#: resources.h:589 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "&Dovoljenja datotek ..." -#: resources.h:365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Datoteka:" -#: resources.h:220 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "Pogoji &filtrov:" -#: resources.h:199 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "Sklopi &filtrov:" -#: resources.h:214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Filtri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Filtri:" -#: ../../locales/../src/interface/updatewizard.cpp:29 -msgid "&Finish" -msgstr "&Dokončaj" - -#: resources.h:317 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Končaj z urejanjem in izbriši krajevno datoteko" -#: resources.h:447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Poravnaj krajevne poti, naloži vse vsebovane datoteke neposredno v ciljno " +"mapo" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -547,502 +600,607 @@ "&Poravnaj oddaljene poti, prenesi vse vsebovane datoteke neposredno v ciljno " "mapo" -#: resources.h:458 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "&Sledi simbolični povezavi, izbriši vsebino ciljne mape" -#: resources.h:756 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "Prido&bi zunanji naslov IP iz naslednjega URL:" -#: resources.h:552 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "Kako &do pomoči ..." -#: resources.h:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Splošen zaznamek" -#: resources.h:792 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 z rabo metode CONNECT" -#: resources.h:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "Po&moč" -#: resources.h:515 resources.h:643 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "&Skrij identične datoteke" -#: resources.h:596 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&najvišje" -#: resources.h:751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Najvišja vrata na voljo:" -#: resources.h:79 resources.h:378 resources.h:715 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Gostitelj:" -#: resources.h:895 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "Dvojiške predpone &IEC (npr. 1 KiB = 1024 bajtov)" -#: resources.h:883 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (primer: 2007-09-15)" -#: resources.h:499 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 msgid "&Import..." msgstr "&Uvozi ..." -#: resources.h:938 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "&Podeduj povezave s končnicami datotek iz sistema" -#: resources.h:446 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 +msgid "&Install new version" +msgstr "&Namesti novo različico" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Ohrani strukturo krajevne poti relativno glede na koren iskanja" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "&Ohrani strukturo oddaljene poti relativno glede na koren iskanja" -#: resources.h:857 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 +msgid "&Key file:" +msgstr "Datote&ka ključa:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Razmestitev podoken datotek in map:" -#: resources.h:748 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Omeji krajevna vrata, ki jih uporablja FileZilla" -#: resources.h:103 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Omeji število hkratnih povezav" -#: resources.h:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "&Drevo krajevne mape" -#: resources.h:402 resources.h:408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Krajevna mapa:" -#: resources.h:953 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Krajevno iskanje" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Beleži v datoteko" -#: resources.h:83 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "&Vrsta prijave:" -#: resources.h:381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "&Vrsta prijave:" -#: resources.h:599 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&nizko" -#: resources.h:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "Upravljaj z &zaznamki ..." -#: resources.h:534 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "&Ročni prenos ..." -#: resources.h:104 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Največje število povezav:" -#: resources.h:733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "Največje &število poskusov:" -#: resources.h:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "&Dnevnik sporočil" -#: resources.h:870 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "Po&manjšaj v pladenj" -#: resources.h:400 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +msgid "&Name sorting mode:" +msgstr "&Način razvrščanja imen:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Ime:" -#: resources.h:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 msgid "&Network configuration wizard..." msgstr "Čarovnik za nastavitev &omrežja ..." -#: resources.h:215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Nov" -#: resources.h:72 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 msgid "&New Site" msgstr "&Nov strežnik" -#: ../../locales/../src/interface/updatewizard.cpp:1043 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Na voljo je nova različica!" -#: ../../locales/../src/interface/updatewizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Naprej >" -#: resources.h:319 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Ne" -#: resources.h:766 resources.h:791 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Brez" -#: resources.h:598 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "O&bičajno" -#: resources.h:945 -msgid "&Number of days between update checks:" -msgstr "&Število dni med posameznimi preverjanji:" - -#: resources.h:146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Številska vrednost:" -#: resources.h:114 resources.h:127 resources.h:418 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&V redu" -#: resources.h:769 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&Odpri" -#: resources.h:562 resources.h:648 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Odpri" -#: resources.h:58 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Prepiši" -#: resources.h:102 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&pasivni" -#: resources.h:125 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Geslo:" -#: resources.h:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "&Predvajaj zvok" -#: resources.h:80 resources.h:379 resources.h:719 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Vrata:" -#: resources.h:863 -msgid "&Position of the message log:" -msgstr "Po&ložaj dnevnika sporočil:" - -#: resources.h:530 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "&Ohrani časovne žige prenesenih datotek" -#: resources.h:301 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Postavi v vrsto" -#: resources.h:721 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Hitro poveži" -#: resources.h:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "Vrstica &hitre povezave" -#: resources.h:135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 +msgid "&Quickconnect history" +msgstr "&Zgodovina hitrih povezav" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "Pre&beri" -#: resources.h:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "Po&novno poveži" -#: resources.h:509 resources.h:665 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +msgid "&Reconnect information" +msgstr "&Podatki ponovnega povezovanja" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "&Osveži" -#: resources.h:126 -msgid "&Remember password for this session" -msgstr "&Zapomni si geslo za to sejo" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Zapomni si glavno geslo, dokler je odprta FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 +msgid "&Remember password until FileZilla is closed" +msgstr "&Zapomni si geslo, dokler je odprta FileZilla" -#: resources.h:404 resources.h:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Oddaljena mapa:" -#: resources.h:368 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Oddaljena pot:" -#: resources.h:828 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Oddaljeno iskanje" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Odstrani" -#: resources.h:786 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Odstrani ključ" -#: resources.h:593 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "Odstrani &izbrane" -#: resources.h:75 resources.h:217 resources.h:415 resources.h:571 -#: resources.h:585 resources.h:633 resources.h:654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "P&reimenuj" -#: resources.h:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "P&reimenuj ..." -#: resources.h:324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Ponovno odpri krajevno datoteko" -#: resources.h:819 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "Zamenjaj &neveljavne znake z:" -#: resources.h:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "Poročaj o &hrošču ..." -#: resources.h:617 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Zahtevaj pozornost" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" -msgstr "Ponastavi in ponovno postavi izbrane datoteke v vrsto" +msgstr "&Ponastavi in ponovno postavi izbrane datoteke v vrsto" -#: resources.h:714 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" msgstr "&Ponovno zaženi čarovnika" -#: resources.h:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Nadaljuj" -#: resources.h:604 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "&Zaženi ukaz ..." -#: resources.h:728 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Zaženi čarovnika za nastavitev ..." -#: resources.h:947 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Zaženi preverjanje obstoja posodobitev zdaj ..." -#: resources.h:768 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&Mesto" -#: resources.h:793 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: resources.h:200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Shrani kot ..." -#: resources.h:432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Išči" -#: resources.h:539 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "&Išči oddaljene datoteke ..." -#: resources.h:71 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 msgid "&Select Entry:" msgstr "&Izberite vnos:" -#: resources.h:927 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Izberite jezik:" -#: resources.h:356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Izberite stolpce, ki naj bodo prikazani:" -#: resources.h:370 resources.h:535 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Strežnik" -#: resources.h:300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Nastavitve" -#: resources.h:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 msgid "&Settings..." msgstr "&Nastavitve ..." -#: resources.h:962 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Pokaži meni razhroščevanja" -#: resources.h:605 -msgid "&Show message" -msgstr "&Pokaži sporočilo" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 +msgid "&Show detailed log" +msgstr "&Pokaži podroben dnevnik sporočil" -#: resources.h:952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Pokaži časovne žige v dnevniku sporočil" -#: resources.h:491 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 +msgid "&Site Manager entries" +msgstr "Vnosi &Upravljalnika strežnikov" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "Upravljalnik &strežnikov ..." -#: resources.h:398 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" -msgstr "Zaznamki določenega strežnika" +msgstr "Zaznamki &določenega strežnika" -#: resources.h:64 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Preskoči" -#: resources.h:533 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "&Omejitve hitrosti" -#: resources.h:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "&Takoj začni s prenosom" -#: resources.h:862 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Zamenjaj krajevno in oddaljeno podokno" -#: ../../locales/../src/interface/netconfwizard.cpp:228 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 +msgid "&TLS Ciphers" +msgstr "Šifre &TLS" + +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Preizkusi" -#: resources.h:875 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Tema:" -#: resources.h:523 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "&Prenesi" -#: resources.h:99 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "&Način prenosa:" -#: resources.h:522 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "&Čakalna vrsta prenosov" -#: resources.h:831 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "O&bravnavaj datoteke brez končnice kot datoteke ASCII" -#: resources.h:330 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "&Zaupaj temu potrdilu na navedenih alternativnih imenih gostiteljev." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "Prek&liči urejanje" -#: resources.h:195 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Osveži shranjeni ključ gostitelja" -#: resources.h:556 resources.h:644 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "Prenesi &na strežnik" -#: resources.h:267 resources.h:843 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "Prenesi &na:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "Prenesi &na strežnik ..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "Prenosi &na strežnik:" -#: resources.h:425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Uporabi program po meri" -#: resources.h:94 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "Uporabi sin&hrono brskanje" -#: resources.h:931 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" -msgstr "&Uporabi privzeti urejevalnik sistema za datoteke z besedilom." +msgstr "&Uporabi privzeti urejevalnik sistema za datoteke z besedilom" -#: resources.h:754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Uporabi naslednji naslov IP:" -#: resources.h:762 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Uporabi zunanji naslov IP strežnika" -#: resources.h:898 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Uporabi ločilo tisočic" -#: resources.h:84 resources.h:124 resources.h:382 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Uporabnik:" -#: resources.h:717 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Uporabniško ime:" -#: ../../locales/../src/interface/updatewizard.cpp:1039 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Različica %s" -#: resources.h:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "Po&gled" -#: resources.h:579 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Pokaži/uredi" -#: resources.h:937 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Opazuj krajevno urejene datoteke in vprašaj po prenosu sprememb na strežnik" -#: resources.h:136 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 +msgid "&When checking for updates, check for:" +msgstr "&Ob preverjanju obstoja posodobitev išči:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Zapiši" -#: resources.h:318 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Da" -#: ../../locales/../src/engine/local_path.cpp:451 -#: ../../locales/../src/engine/local_path.cpp:501 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' ne obstaja ali pa dostop do nje ni mogoč." -#: ../../locales/../src/engine/local_path.cpp:467 -#: ../../locales/../src/engine/local_path.cpp:488 -#: ../../locales/../src/engine/local_path.cpp:495 +#: ../../locales/../src/engine/local_path.cpp:479 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' ni mapa." -#: ../../locales/../src/interface/manual_transfer.cpp:442 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:955 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "»%s« ni podprti protokol." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 msgid "'Account' logontype not supported by selected protocol" msgstr "Izbrani protokol ne podpira prijave v račun" -#: ../../locales/../src/interface/Mainfrm.cpp:590 +#: ../../locales/../src/interface/manual_transfer.cpp:435 +msgid "" +"'Normal' and 'Account' logontypes are not available, using 'Ask for " +"password' instead." +msgstr "" +"Prijavi vrste »Navadno« in »Račun« v tem načinu nista na voljo; namesto tega " +"bo uporabljen način »Vprašaj za geslo«." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 +msgid "" +"'Normal' and 'Account' logontypes are not available. Your entry has been " +"changed to 'Ask for password'." +msgstr "" +"Vrsti prijav »Navadno« in »Račun« nista na voljo. Vaš vnos je spremenjen v " +"»Vprašaj za geslo«." + +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1052,8 +1210,8 @@ "vrstice, da pošljejo strežniku argumente, ki sledijo 'quote'. Surovi ukaz bi " "bilo morda bolj smiselno vnesti brez vodilnega 'quote'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:96 -#: ../../locales/../src/interface/filelist_statusbar.cpp:105 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" @@ -1062,139 +1220,135 @@ msgstr[2] "(%d filtrirana predmeta)" msgstr[3] "(%d filtrirani predmeti)" -#: resources.h:803 resources.h:805 +#: ../../locales/../src/interface/update_dialog.cpp:313 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% preneseno)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 za neomejeno)" -#: resources.h:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: resources.h:736 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 sekund)" -#: resources.h:801 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: resources.h:730 -msgid "(5-9999, 0 to disable)" -msgstr "(5-9999, 0 za onemogočeno)" - -#: resources.h:946 -msgid "(At least 7 days)" -msgstr "(vsaj 7 dni)" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, 0 za onemogočeno)" + +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 +#, c-format +msgid "(app-compat is set to %d.%d)" +msgstr "(združljivost nastavljena na %d.%d)" -#: resources.h:891 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(primer: %H:%M)" -#: resources.h:885 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(primer: %Y-%m-%d)" -#: resources.h:483 resources.h:485 resources.h:809 resources.h:811 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(v %s/s)" -#: ../../locales/../src/interface/updatewizard.cpp:896 -msgid ", %H:%M:%S left" -msgstr ", %H:%M:%S preostalega časa" - -#: ../../locales/../src/interface/updatewizard.cpp:900 -msgid ", --:--:-- left" -msgstr ", --:--:-- preostalega časa" - -#: resources.h:702 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 msgid "-" msgstr "-" -#: resources.h:248 -msgid "- Broken router and/or firewall" -msgstr "- Okvarjen usmerjevalnik in/ali požarni zid" - -#: resources.h:249 -msgid "- File corrupted on mirror" -msgstr "- Datoteka okvarjena na zrcalnem strežniku" - -#: resources.h:247 -msgid "- Malware on your system" -msgstr "- Škodljivo programje na vašem sistemu" - -#: ../../locales/../src/interface/statuslinectrl.cpp:236 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- preostalega časa" -#: ../../locales/../src/interface/cmdline.cpp:80 +#: ../../locales/../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." msgstr "-c ni mogoče uporabiti skupaj z URL-jem za FTP." -#: ../../locales/../src/interface/cmdline.cpp:89 +#: ../../locales/../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." msgstr "-l je mogoče uporabiti le skupaj z URL-jem za FTP." -#: ../../locales/../src/interface/cmdline.cpp:68 +#: ../../locales/../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." msgstr "-s in -c ne smeta biti uporabljena istočasno." -#: ../../locales/../src/interface/cmdline.cpp:74 +#: ../../locales/../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." msgstr "-s ni mogoče uporabiti skupaj z URL-jem za FTP." -#: resources.h:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" -msgstr "0 - Nič" +msgstr "0 – Nič" -#: resources.h:965 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" -msgstr "1 - Opozorilo" +msgstr "1 – Opozorilo" -#: resources.h:966 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" -msgstr "2 - Informacije" +msgstr "2 – Informacije" -#: resources.h:967 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" -msgstr "3 - Obširno" +msgstr "3 – Obširno" -#: ../../locales/../src/interface/aboutdialog.cpp:148 -msgid "32 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:108 +msgid "32-bit system" msgstr "32-bitni sistem" -#: resources.h:968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" -msgstr "4 - Razhrošči" +msgstr "4 – Razhrošči" -#: ../../locales/../src/interface/aboutdialog.cpp:146 -msgid "64 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:105 +msgid "64-bit system" msgstr "64-bitni sistem" -#: ../../locales/../src/interface/updatewizard.cpp:28 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< Na&zaj" -#: resources.h:547 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:108 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Datoteka s podanim imenom že obstaja. Prosimo, vnesite še nezasedeno ime." -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Potrdilo v verigi je bilo podpisano z algoritmom, ki ni varen" + +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Določiti morate privzeti urejevalnik." -#: ../../locales/../src/interface/RemoteListView.cpp:154 -#: ../../locales/../src/interface/RemoteTreeView.cpp:115 +#: ../../locales/../src/interface/RemoteListView.cpp:164 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Mape ne morete povleči v eno njenih podmap." -#: resources.h:674 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:60 msgid "" "A few servers don't allow passive mode or are misconfigured. In such cases " "you would have to use active mode. In active mode, FileZilla opens a port " @@ -1204,29 +1358,22 @@ "konfigurirani. V takšnih primerih morate uporabiti aktivni način. V aktivnem " "načinu FileZilla odpre vrata in povpraša strežnik, da se poveže nanja." -#: resources.h:306 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Predhodno odprta datoteka je bila spremenjena." -#: ../../locales/../src/interface/LocalListView.cpp:2058 -#, c-format -msgid "" -"A file with that name is already being edited. Do you want to reopen '%s'?" -msgstr "Datoteka s tem imenom je že v urejanju. Želite ponovno odpreti '%s'?" - -#: ../../locales/../src/interface/LocalListView.cpp:2054 -#: ../../locales/../src/interface/RemoteListView.cpp:2640 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Datoteka s tem imenom se že prenaša." -#: ../../locales/../src/interface/RemoteListView.cpp:2645 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Datoteka s tem imenom je še vedno v urejanju. Prosim, da jo zaprete in " "poskusite znova." -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1241,11 +1388,20 @@ "manjkajo.\n" "V tej seji ne bo nobenih drugih izpisanih opozoril." -#: resources.h:237 -msgid "A newer version of FileZilla is available:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Izgubljenega glavnega gesla ni mogoče obnoviti! Zato si dobro zapomnite " +"svoje geslo." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 +msgid "A new version of FileZilla is available:" msgstr "Na voljo je novejša različica FileZille:" -#: ../../locales/../src/interface/Mainfrm.cpp:655 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1254,7 +1410,7 @@ "strežniki skrivajo datoteke pred uporabnikom. Uporabite to možnost za " "prisilitev strežnika, da pokaže vse datoteke." -#: resources.h:746 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1271,84 +1427,83 @@ "Želite onemogočiti sinhrono brskanje in nadaljevati s spreminjanjem krajevne " "mape?" -#: resources.h:528 resources.h:658 resources.h:823 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: resources.h:827 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "&Dodaj" -#: resources.h:854 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "Dovo&li nadaljevanje datotek ASCII" -#: ../../locales/../src/interface/fileexistsdlg.cpp:114 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" msgstr "&Uporabi le pri prenosih k sebi" -#: ../../locales/../src/interface/fileexistsdlg.cpp:160 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" msgstr "&Uporabi le pri prenosih od sebe" -#: resources.h:149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "Uporabi na &vseh mapah in datotekah" -#: resources.h:624 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "&Samodejno odstrani uspešne prenose" -#: resources.h:389 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: resources.h:479 -msgid "Abort previous connection and connect in current tab" -msgstr "Prekini prejšnjo pocezavo in poveži v trenutnem zavihku." - -#: resources.h:154 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "O programu FileZilla" -#: resources.h:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Nad seznami datotek" -#: ../../locales/../src/engine/server.cpp:848 -#: ../../locales/../src/engine/server.cpp:867 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:161 -#: ../../locales/../src/interface/manual_transfer.cpp:194 -#: ../../locales/../src/interface/manual_transfer.cpp:557 -#: ../../locales/../src/interface/manual_transfer.cpp:558 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Dostopa do nekaterih krajevnih map ni mogoče obnoviti:" + +#: ../../locales/../src/engine/server.cpp:584 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" -msgstr "račun" +msgstr "Račun" -#: resources.h:601 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "&Dejanje po dokončanju vrste" -#: resources.h:329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Dejanje nad izbrano datoteko:" -#: resources.h:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Dejanje, ki naj se izvede:" -#: resources.h:57 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Dejanje:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:118 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 msgid "Active mode" msgstr "Aktivni način" -#: ../../locales/../src/interface/netconfwizard.cpp:605 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1356,7 +1511,7 @@ "Preizkus aktivnega načina FTP ni uspell. FileZilla ne pozna pravega " "zunanjega naslova IP." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1364,7 +1519,7 @@ "Preizkus aktivnega načina FTP ni uspel. FileZilla ne pozna natančnega " "zunanjega naslova IP. Poleg tega je usmerjevalnik spremenil poslani naslov." -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1374,51 +1529,70 @@ "naslova IP, vendar je usmerjevalnik ali požarni zid zavajajoče spremenil " "poslani naslov." -#: resources.h:759 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "Aktivni način IP" -#: resources.h:450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Datoteke dodaj &le v vrsto" -#: resources.h:628 resources.h:647 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "Dodaj izbrano mapo v vrsto za prenos" -#: resources.h:559 resources.h:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "Dodaj izbrane datoteke in mape v vrsto za prenos" -#: resources.h:918 resources.h:924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Dodaj v vrsto" -#: ../../locales/../src/engine/proxy.cpp:451 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "Vrsta naslova ni podprta" -#: resources.h:88 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Napredno" -#: resources.h:234 -msgid "Advanced options:" -msgstr "Napredne možnosti:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 +msgid "" +"Advice: Unless you want to test new features, please keep using stable " +"versions only. Beta versions and nightly builds are development versions " +"meant for testing purposes. Nightly builds of FileZilla may not work as " +"expected and might even damage your system. Use beta versions and nightly " +"builds at your own risk." +msgstr "" +"Nasvet: razen če želite preizkušati novosti, uporabljajte le stabilne " +"različice. Beta in nočne gradnje so razvojne različice, ki so namenjene " +"preizkušanju. Nočne gradnje FileZille morda ne delujejo pričakovano in lahko " +"celo škodujejo vašemu sistemu. Beta različice in nočne gradnje uporabljate " +"na lastno odgovornost." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 +msgid "Al&ways perform this action" +msgstr "Vedno uporabi to &dejanje" -#: resources.h:338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritem:" -#: ../../locales/../src/interface/QueueView.cpp:3041 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "Vse datoteke so bile uspešno prenesene" -#: resources.h:703 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Vsa vrata v danem razponu morajo biti med 1024 in 65535." -#: ../../locales/../src/interface/QueueView.cpp:3037 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1427,19 +1601,27 @@ msgstr[2] "Vsi prenosi so dokončani. %d datotek ni bilo mogoče prenesti." msgstr[3] "Vsi prenosi so dokončani. %d datotek ni bilo mogoče prenesti." -#: resources.h:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Dovo&li prehod na drug način prenosa ob neuspehu" -#: resources.h:678 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" msgstr "Dovoli prehod na drug način prenosa ob neuspehu" -#: resources.h:476 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Že povezani" -#: resources.h:787 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 +msgid "Alternative name:" +msgid_plural "Alternative names:" +msgstr[0] "Nadomestna imena:" +msgstr[1] "Nadomestno ime:" +msgstr[2] "Nadomestni imeni:" +msgstr[3] "Nadomestna imena:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1447,7 +1629,7 @@ "Sicer lahko za upravljanje s svojimi ključi uporabite orodje Pageant iz " "PuTTY, FileZilla prepozna Pageant." -#: resources.h:788 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1455,203 +1637,233 @@ "Sicer lahko uporabite sistemskega agenta SSH. To zagotovite tako, da " "nastavite okoljsko spremenljivko SSH_AUTH_SOCK." -#: ../../locales/../src/interface/updatewizard.cpp:1097 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 +msgid "" +"Alternatively, you can also download the latest version from the FileZilla " +"website:" +msgstr "" +"Namesto tega lahko tudi prenesete novejšo različico s spletišča FileZille:" + +#: ../../locales/../src/interface/QueueView.cpp:1662 +#, c-format +msgid "" +"An error occurred loading the transfer queue from \"%s\".\n" +"Some queue items might not have been restored." +msgstr "" +"Pri nalaganju vrste prenosov iz »%s« je prišlo do napake.\n" +"Nekateri vnosi vrste morda niso obnovljeni." + +#: ../../locales/../src/interface/QueueView.cpp:1555 +#, c-format msgid "" -"Alternatively, visit https://filezilla-project.org/ to download the most " -"recent version." +"An error occurred saving the transfer queue to \"%s\".\n" +"Some queue items might not have been saved." msgstr "" -"Za prenos najsodobnejše različice lahko obiščete tudi https://filezilla-" -"project.org." +"Pri shranjevanju vrste prenosov v »%s« je prišlo do napake.\n" +"Nekateri vnosi vrste morda niso shranjeni." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Izdajatelj v verigi potrdila ni avtoriteta potrdil" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2276 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Datoteka z istim imenom že obstaja na ciljnem mestu." -#: ../../locales/../src/engine/server.cpp:869 -#: ../../locales/../src/interface/manual_transfer.cpp:159 -#: ../../locales/../src/interface/manual_transfer.cpp:197 -#: ../../locales/../src/interface/manual_transfer.cpp:213 -#: ../../locales/../src/interface/manual_transfer.cpp:556 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528 +#: ../../locales/../src/engine/server.cpp:609 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1731 msgid "Anonymous" -msgstr "anonimna" +msgstr "Anonimna" -#: ../../locales/../src/interface/state.cpp:1031 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "Druga oddaljena operacija že poteka, mape zdaj ni mogoče spremeniti." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:784 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:848 msgid "Any changes made in the Site Manager could not be saved." msgstr "Spremembe upravljalnika strežnikov niso bile shranjene." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:729 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"Nobena sprememba upravljalnika strežnikov ne bo shranjena, če ne popravite " -"datoteke." - -#: ../../locales/../src/interface/filter.cpp:210 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Sprememb nad filtri ni bilo mogoče shraniti." -#: ../../locales/../src/interface/filter.cpp:1045 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Spremembe, opravljene na filtrih, ne bodo shranjene." -#: resources.h:151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Uporabi le na &mapah" -#: resources.h:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Uporabi" -#: resources.h:66 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Uporabi le na &trenutni vrsti" -#: resources.h:150 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Uporabi le na &datotekah" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 -#: ../../locales/../src/interface/updatewizard.cpp:322 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Arhiv" -#: resources.h:866 +#: ../../locales/../src/engine/socket.cpp:1107 +msgid "Argument buffer overflow" +msgstr "Prekoračen medpomnilnik argumentov" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Kot zavihek v podoknu vrste prenosov" -#: resources.h:259 resources.h:269 resources.h:835 resources.h:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Vprašaj za dejanje" -#: ../../locales/../src/engine/server.cpp:844 -#: ../../locales/../src/engine/server.cpp:863 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/engine/server.cpp:575 +#: ../../locales/../src/engine/server.cpp:601 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" -msgstr "vprašaj za geslo" +msgstr "Vprašaj za geslo" -#: resources.h:699 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." msgstr "Vprašaj operacijski sistem za vrata." -#: resources.h:689 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" msgstr "Vprašaj operacijski sistem za zunanji naslov IP" -#: resources.h:471 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Zastavljanje vprašanj na forumih FileZilla" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:63 msgid "Associated program not found:" msgstr "Povezanega programa ni mogoče najti:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Vsaj en pogoj filtra ni popoln" -#: resources.h:708 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 msgid "At this point, all required information has been gathered." msgstr "Na tej točki so zbrani vsi potrebni podatki." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Atribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:221 msgid "Authentication failed." msgstr "Overovitev ni uspela." -#: resources.h:876 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Avtor:" -#: resources.h:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" -msgstr "samodejno" +msgstr "Samodejno" -#: resources.h:825 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Samodejna razvrstitev vrst datotek" -#: resources.h:943 -msgid "Automatic update check" -msgstr "Samodejno preverjanje obstoja posodobitev" - -#: resources.h:880 -msgid "Available sizes" -msgstr "Velikosti na voljo" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:129 -#: ../../locales/../src/engine/sizeformatting_base.cpp:188 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: resources.h:90 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "O&bidi posredovalni strežnik" -#: resources.h:467 +#: ../../locales/../src/engine/socket.cpp:1071 +msgid "Bad file descriptor" +msgstr "Napačen opisnik datotek" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Osnovna navodila za uporabo" -#: resources.h:868 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Vedenje" -#: ../../locales/../src/interface/edithandler.cpp:1260 -#: ../../locales/../src/interface/edithandler.cpp:1288 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "V urejanju" -#: ../../locales/../src/engine/tlssocket.cpp:887 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Pozor! Potrdilo je bilo preklicano" -#: resources.h:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" -msgstr "binarno" +msgstr "Binarno" -#: resources.h:861 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Tabla" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:272 -#: ../../locales/../src/interface/menu_bar.cpp:311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:394 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Modra" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:393 msgid "Bookmark" msgstr "Zaznamek" -#: resources.h:413 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Zaznamek:" -#: resources.h:412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Zaznamki" -#: resources.h:162 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 +msgid "Browse..." +msgstr "Prebrskaj ..." + +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Vedra ni mogoče najti" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Datum različice:" -#: resources.h:159 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Podatki o različici" -#: ../../locales/../src/interface/verifycertdialog.cpp:178 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Poslovna kategorija:" -#: resources.h:749 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1661,77 +1873,113 @@ "krajevnem načinu. Če želite omejiti FileZillo le na manjši obseg vrat, " "prosimo, vnesite ta razpon vrat spodaj." -#: resources.h:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "Pre&kliči trenutno operacijo" -#: resources.h:236 -msgid "C&heck for nightly builds of FileZilla" -msgstr "P&reveri za nočne gradnje FileZille" - -#: resources.h:612 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "I&zbriši vse" -#: resources.h:587 resources.h:635 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "K&opiraj URL-je na odložišče" -#: resources.h:884 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "K&opiraj URL-je z geslom na odložišče" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "Po &meri" -#: resources.h:939 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Povezave vrste datotek po &meri:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 +msgid "CPU features:" +msgstr "Funkcionalnosti CPE:" + +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Izračunavanje zamika časovnega pasu strežnika ..." -#: ../../locales/../src/engine/transfersocket.cpp:733 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Iz datoteke ni mogoče brati" -#: ../../locales/../src/engine/transfersocket.cpp:712 -#: ../../locales/../src/engine/transfersocket.cpp:786 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "V datoteko ni mogoče zapisovati podatkov." -#: ../../locales/../src/engine/transfersocket.cpp:710 -#: ../../locales/../src/engine/transfersocket.cpp:784 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "V datoteko ni mogoče zapisovati podatkov: %s" -#: resources.h:25 resources.h:69 resources.h:115 resources.h:153 -#: resources.h:184 resources.h:212 resources.h:229 resources.h:280 -#: resources.h:289 resources.h:296 resources.h:304 resources.h:327 -#: resources.h:360 resources.h:393 resources.h:407 resources.h:419 -#: resources.h:429 resources.h:452 resources.h:461 resources.h:480 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Prekliči" -#: resources.h:986 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Prekliči trenutno operacijo" -#: resources.h:987 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" -msgstr "Prekine trenutno operacijo." +msgstr "Prekine trenutno operacijo" -#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Dostop do '%s' ni mogoč, medij ni vstavljen ali pa pogon ni pripravljen." -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Strežnika upravljalniku strežnikov ni mogoče dodati" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/engine/socket.cpp:1124 +msgid "Cannot assign requested address" +msgstr "Zahtevanega naslova ni mogoče dodeliti" + +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Ni mogoče spremeniti mape; dejanje sinhroniziranega brskanja je že v teku." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1747,30 +1995,27 @@ "Primerjava map ni bila možna, vključeni so različni filtri za krajevne in " "oddaljene mape" -#: ../../locales/../src/interface/RemoteListView.cpp:2743 -msgid "Cannot compare directories, not connected to a server." -msgstr "Primerjava map ni mogoča, niste povezani s strežnikom." - -#: ../../locales/../src/interface/filteredit.cpp:141 +#: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Novega filtra ni mogoče ustvariti" -#: ../../locales/../src/interface/LocalListView.cpp:2036 -#: ../../locales/../src/interface/LocalListView.cpp:2167 -#: ../../locales/../src/interface/RemoteListView.cpp:2574 -#: ../../locales/../src/interface/RemoteListView.cpp:2620 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Datoteke ni mogoče urediti" -#: ../../locales/../src/interface/LocalListView.cpp:1952 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Urejanje datoteke ni mogoče, niste povezani s strežnikom." -#: ../../locales/../src/interface/LocalListView.cpp:1963 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Datoteke ni mogoče urediti, oddaljena pot ni znana." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1778,543 +2023,675 @@ "Povezave FTP s strežnikom SFTP ni mogoče vzpostaviti. Prosimo, izberite " "ustrezni protokol." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Vrstice Quickconnect ni mogoče naložiti iz datoteke virov." - -#: ../../locales/../src/interface/import.cpp:38 -msgid "Cannot load file, not a valid XML file." -msgstr "Datoteke ni mogoče uvoziti, saj ni veljavna datoteka XML." - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 -msgid "Cannot load keyfile" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 +msgid "Cannot load key file" msgstr "Datoteke ključa ni mogoče naložiti" -#: ../../locales/../src/interface/Mainfrm.cpp:1033 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" -msgstr "Orodne vrstice ni mogoče naložiti iz datoteke virov." +msgstr "Orodne vrstice ni mogoče naložiti iz datoteke virov" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180 +#: ../../locales/../src/interface/manual_transfer.cpp:439 +msgid "Cannot remember password" +msgstr "Gesla se ni mogoče spomniti" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1264 msgid "Cannot rename entry" msgstr "Vnosa ni mogoče preimenovati" -#: ../../locales/../src/interface/RemoteListView.cpp:1858 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Cannot rename file" msgstr "Datoteke ni mogoče preimenovati" -#: ../../locales/../src/interface/filter.cpp:351 -#: ../../locales/../src/interface/filter.cpp:420 +#: ../../locales/../src/engine/proxy.cpp:139 +msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." +msgstr "" +"Imena gostitelja ni mogoče razločiti na naslov IPv4 za uporabo s " +"posredovalnim strežnikom SOCKS4." + +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Nabora filtrov ni mogoče shraniti" -#: ../../locales/../src/interface/filter.cpp:311 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Filtra ni mogoče izbrati" -#: ../../locales/../src/interface/edithandler.cpp:1638 -#: ../../locales/../src/interface/edithandler.cpp:1643 -#: ../../locales/../src/interface/edithandler.cpp:1682 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Povezave vrste datotek ni mogoče nastaviti" -#: ../../locales/../src/interface/edithandler.cpp:1219 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Pogovornega okna ni mogoče pokazati" -#: ../../locales/../src/interface/LocalListView.cpp:2054 -#: ../../locales/../src/interface/RemoteListView.cpp:2640 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Izbrane datoteke ni mogoče pokazati/urejati" -#: resources.h:283 -msgid "Categories" -msgstr "Kategorije" +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Brez razlikovanja malih/velikih črk" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 +msgid "Case insensitive" +msgstr "Brez razlikovanja malih/velikih črk" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 +msgid "Case insensitive (default)" +msgstr "Brez razlikovanja malih/velikih črk (privzeto)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +msgid "Case sensitive" +msgstr "Razlikovanje malih/velikih črk" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +msgid "Case sensitive (default)" +msgstr "Razlikovanje malih/velikih črk (privzeto)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 +msgid "Categories to clear" +msgstr "Kategorije za čiščenje" -#: ../../locales/../src/interface/statusbar.cpp:531 +#: ../../locales/../src/interface/statusbar.cpp:515 msgid "Certificate and session data are not available yet." msgstr "Podatki o potrdilu in seji še niso na voljo." -#: resources.h:26 -msgid "Certificate details" -msgstr "Podrobnosti potrdila" - -#: resources.h:3 resources.h:27 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 msgid "Certificate in chain:" msgstr "Potrdilo v verigi:" -#: resources.h:13 resources.h:37 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "Izdajatelj potrdila" -#: resources.h:123 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Overjanje podpisa potrdila je spodletelo" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Izzovi:" -#: resources.h:132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Spremeni lastnosti datoteke" -#: resources.h:590 resources.h:638 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Spremeni dovoljenja datotek." -#: resources.h:960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Spremembe nastavitev beleženja v dnevnik zahtevajo ponoven zagon FileZille." -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Napaka kodiranja znakov" -#: resources.h:105 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Nabor znakov" -#: resources.h:948 -msgid "Check for &beta versions and release candidates" -msgstr "Preveri za različice &beta in kandidate za izdajo" - -#: resources.h:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "Preveri obstoj &posodobitev ..." -#: resources.h:550 -msgid "Check for newer versions of FileZilla" -msgstr "Preveri za novejše različice FileZille" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +msgid "Check for FileZilla &updates automatically:" +msgstr "Samodejno preveri stanje posodobitev:" -#: ../../locales/../src/interface/updatewizard.cpp:163 -msgid "Check for updates" +#: ../../locales/../src/interface/resources/xrc/update.xrc:4 +msgid "Check for Updates" msgstr "Preveri obstoj posodobitev" -#: ../../locales/../src/interface/Mainfrm.cpp:1749 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +msgid "Check for newer versions of FileZilla" +msgstr "Preveri za novejše različice FileZille" + +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Preverjanje stanja posodobitev ni uspelo" -#: ../../locales/../src/interface/netconfwizard.cpp:765 +#: ../../locales/../src/engine/ftp/logon.cpp:283 +msgid "" +"Check your login credentials. The entered password starts or ends with a " +"space character." +msgstr "" +"Preverite svoje prijavne poverilnice. Vneseno geslo se začenja ali končuje s " +"presledkom." + +#: ../../locales/../src/engine/ftp/logon.cpp:279 +msgid "" +"Check your login credentials. The entered username starts or ends with a " +"space character." +msgstr "" +"Preverite svoje prijavne poverilnice. Vneseno uporabniško ime se začenja ali " +"končuje s presledkom." + +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Preverjanje pravilnosti zunanjega naslova IP" -#: resources.h:232 -msgid "Checking for updates" -msgstr "Preverjanje obstoja posodobitev" - -#: ../../locales/../src/interface/updatewizard.cpp:1241 -msgid "Checksum mismatch of downloaded file." -msgstr "Neujemanje kontrolne vsote prenesene datoteke s strežnika." +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 +msgid "Checking for updates..." +msgstr "Preverjanje obstoja posodobitev ..." + +#: ../../locales/../src/interface/updater.cpp:780 +#, c-format +msgid "Checksum match on file %s\n" +msgstr "Ujemanje kontrolne vsote pri datoteki %s\n" + +#: ../../locales/../src/interface/updater.cpp:776 +#, c-format +msgid "Checksum mismatch on file %s\n" +msgstr "Neujemanje kontrolne vsote pri datoteki %s\n" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1617 +msgid "Choose a key file" +msgstr "Izberite datoteko ključa" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1655 msgid "Choose the default local directory" msgstr "Izberite privzeto krajevno mapo" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:130 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:378 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2517 msgid "Choose the local directory" msgstr "Izberite krajevno mapo" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:854 +#: ../../locales/../src/engine/http/request.cpp:464 msgid "Chunk data improperly terminated" msgstr "Košček podatkov nepravilno zaključen" -#: resources.h:18 resources.h:42 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "Šifra:" -#: resources.h:496 resources.h:663 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "&Zapri zavihek" -#: resources.h:858 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" -msgstr "klasična" - -#: resources.h:286 -msgid "Clear &Site Manager entries" -msgstr "Počisti vnose &upravljalnika strežnikov" +msgstr "Klasična" -#: resources.h:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "Počisti &predpomnilnik postavitve" -#: resources.h:284 -msgid "Clear &quickconnect history" -msgstr "Počisti &zgodovino hitrih povezav" - -#: resources.h:285 -msgid "Clear &reconnect information" -msgstr "Počisti &podatke ponovnega povezovanja" - -#: resources.h:287 -msgid "Clear &transfer queue" -msgstr "Počisti čakalno &vrsto prenosov" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Počisti samoposo&dobitvene podatke" -#: ../../locales/../src/interface/quickconnectbar.cpp:143 +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Počisti zgodovino" -#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Počisti zasebne podatke" -#: ../../locales/../src/interface/quickconnectbar.cpp:142 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Počisti vrstico hitre povezave" -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." -msgstr "Kliknite na Dokončaj za shranitev vaši" - -#: ../../locales/../src/interface/updatewizard.cpp:1096 -msgid "Click on next to download the new version." -msgstr "Kliknite Naprej za prenos najnovejše različice." +msgstr "Kliknite na Dokončaj za shranitev vaše konfiguracije." -#: resources.h:347 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Odjemalec na naslov MAC strežnika:" -#: resources.h:345 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Odjemalec na cifro strežnika:" -#: resources.h:664 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Zapri" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "Zapri &vse druge zavihke" -#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1105 -#: ../../locales/../src/interface/Mainfrm.cpp:1128 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "Zapri FileZillo" -#: ../../locales/../src/interface/cmdline.cpp:14 +#: ../../locales/../src/interface/cmdline.cpp:15 msgid "Close all running instances of FileZilla" msgstr "Zapri vse odprte programe FileZilla" -#: resources.h:497 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Želite zapreti hitro iskanje in nadaljevati s primerjavo?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Zapre trenutni zavihek" -#: resources.h:87 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Ko&mentarji:" -#: ../../locales/../src/interface/listctrlex.cpp:761 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Lastnosti stolpca" -#: resources.h:354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Nastavitev stolpcev" -#: resources.h:934 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "" "Ukaz in njegovi argumenti morajo biti pravilno navedeni (z narekovaji, kjer " "je to potrebno)." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Ukaz ni uspel" -#: ../../locales/../src/engine/proxy.cpp:448 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Ukaz ni podprt" -#: ../../locales/../src/engine/engineprivate.cpp:183 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Izbrani protokol ne podpira tega ukaza" -#: ../../locales/../src/engine/logging.cpp:214 -#: ../../locales/../src/interface/StatusView.cpp:287 -#: ../../locales/../src/interface/StatusView.cpp:337 -#: ../../locales/../src/interface/updatewizard.cpp:541 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "Ukaz:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Komentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:176 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Običajno ime:" -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:441 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Komunikacijo je onečedil usmerjevalnik ali požarni zid" -#: resources.h:514 resources.h:642 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "Primerjaj &čas sprememb" -#: resources.h:513 resources.h:641 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "Primerjaj &velikost" -#: resources.h:914 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "&Prag primerjave (v minutah):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Prag primerjave mora biti med 0 in 1440 minutami." -#: resources.h:160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Prevedeno za:" -#: resources.h:161 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Prevedeno na:" -#: resources.h:163 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Prevedeno z:" -#: resources.h:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Zastavice prevajalnika:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Stisnjeno" -#: resources.h:799 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Hkratni prenosi" -#: resources.h:224 resources.h:438 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Pogoji razlikujejo velike/male &začetnice" -#: resources.h:707 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" msgstr "Preizkus nastavitev" -#: resources.h:681 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:115 msgid "Configure passive mode" msgstr "Prilagodi pasivni način" -#: resources.h:697 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 msgid "Configure port range" msgstr "Nastavi obseg vrat" -#: resources.h:468 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Prilagajanje FileZille in vašega omrežja" -#: ../../locales/../src/interface/search.cpp:1028 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Potrditev brisanja" -#: ../../locales/../src/engine/local_filesys.cpp:136 -#: ../../locales/../src/interface/LocalListView.cpp:2007 -#: ../../locales/../src/interface/LocalListView.cpp:2127 -#: ../../locales/../src/interface/RemoteListView.cpp:1664 -#: ../../locales/../src/interface/RemoteListView.cpp:2591 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1124 +#: ../../locales/../src/interface/edithandler.cpp:1638 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1429 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Potrditev je potrebna" -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Čestitamo, vaše nastavitve očitno delujejo." -#: ../../locales/../src/interface/quickconnectbar.cpp:141 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Poveži se mimo posredovalnih strežnikov" +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format +msgid "Connect failed: %s" +msgstr "Povezava je spodletela: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 +msgid "Connect in current tab" +msgstr "Poveži v trenutnem zavihku" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +msgid "Connect in new tab" +msgstr "Poveži v novem zavihku" + #: ../../locales/../src/interface/cmdline.cpp:8 msgid "Connect to specified Site Manager site" msgstr "Povezani z navedenim strežnikom iz upravljalnika strežnikov" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933 -msgid "Connected" -msgstr "Povezano" - -#: ../../locales/../src/interface/QueueView.cpp:1438 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Povezovanje v teku" -#: ../../locales/../src/interface/netconfwizard.cpp:207 -#: ../../locales/../src/interface/statuslinectrl.cpp:275 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Povezovanje z %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1163 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format -msgid "Connecting to %s through proxy" -msgstr "Povezovanje z %s prek posredovalnega strežnika" +msgid "Connecting to %s through %s proxy" +msgstr "Povezovanje z %s prek posredovalnega strežnika %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1034 -#: ../../locales/../src/engine/proxy.cpp:172 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:394 +#: ../../locales/../src/engine/ControlSocket.cpp:990 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Povezovanje z %s ..." -#: ../../locales/../src/interface/updatewizard.cpp:424 -#: ../../locales/../src/interface/updatewizard.cpp:998 -msgid "Connecting to server" -msgstr "Povezovanje s strežnikom" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 msgid "Connection" msgstr "Povezava" -#: ../../locales/../src/interface/QueueView.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1085 +msgid "Connection aborted" +msgstr "Povezava prekinjena" + +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Poskus povezave ni uspel" -#: ../../locales/../src/engine/ControlSocket.cpp:1039 -#: ../../locales/../src/engine/proxy.cpp:176 +#: ../../locales/../src/engine/ControlSocket.cpp:952 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Poskus povezave z \"%s\" ni uspel, sledi poskus z naslednjim naslovom." -#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Poskus povezave z \"%s\" ni uspel." -#: ../../locales/../src/engine/ControlSocket.cpp:186 -#: ../../locales/../src/engine/engineprivate.cpp:320 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Poskus povezave prekinil uporabnik" -#: ../../locales/../src/interface/netconfwizard.cpp:543 +#: ../../locales/../src/engine/socket.cpp:1078 +msgid "Connection attempt timed out" +msgstr "Poskus povezave je časovno potekel" + +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Povezava zaprta" -#: ../../locales/../src/engine/ControlSocket.cpp:1132 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235 +#: ../../locales/../src/engine/ControlSocket.cpp:1036 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:183 +#: ../../locales/../src/engine/http/request.cpp:194 +#: ../../locales/../src/engine/http/request.cpp:207 msgid "Connection closed by server" msgstr "Povezava zaprta na strani strežnika" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:305 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:121 msgid "Connection established, initializing TLS..." msgstr "Povezava je vzpostavljena, poteka inicializacija TLS ..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:340 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:144 msgid "Connection established, sending HTTP request" msgstr "Povezava je vzpostavljena, pošiljanje zahteve HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415 +#: ../../locales/../src/interface/netconfwizard.cpp:343 +msgid "Connection established, waiting for welcome message." +msgstr "Povezava je vzpostavljena, v pričakovanju pozdravnega sporočila." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Povezava je vzpostavljena, v pričakovanju pozdravnega sporočila ..." -#: ../../locales/../src/interface/netconfwizard.cpp:338 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Povezava izgubljena" -#: ../../locales/../src/engine/proxy.cpp:433 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "Povezave nabor pravil ne dovoljuje" -#: ../../locales/../src/engine/proxy.cpp:442 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Povezava zavrnjena" -#: ../../locales/../src/engine/ControlSocket.cpp:681 -msgid "Connection timed out" -msgstr "Povezava je časovno potekla" +#: ../../locales/../src/engine/socket.cpp:1072 +msgid "Connection refused by server" +msgstr "Povezava zavrnjena na strani strežnika" + +#: ../../locales/../src/engine/socket.cpp:1081 +msgid "Connection reset by network" +msgstr "Povezava zavrnjena na strani omrežja" + +#: ../../locales/../src/engine/socket.cpp:1086 +msgid "Connection reset by peer" +msgstr "Povezava zaprta na strani vrstnika" + +#: ../../locales/../src/engine/ControlSocket.cpp:511 +#, c-format +msgid "Connection timed out after %d second of inactivity" +msgid_plural "Connection timed out after %d seconds of inactivity" +msgstr[0] "Povezava je pretekla po %d sekundah nedejavnosti" +msgstr[1] "Povezava je pretekla po %d sekundi nedejavnosti" +msgstr[2] "Povezava je pretekla po %d sekundah nedejavnosti" +msgstr[3] "Povezava je pretekla po %d sekundah nedejavnosti" -#: ../../locales/../src/interface/netconfwizard.cpp:1070 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Povezava je časovno potekla." -#: ../../locales/../src/interface/search.cpp:676 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Povezava s strežnikom izgubljena." -#: ../../locales/../src/engine/proxy.cpp:188 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "" "Povezava s posredovalnim strežnikom je vzpostavljena, v pričakovanju " "pozdravnega sporočila ..." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Povezava s strežnikom se je predčasno zaprla." -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Povezava s preizkusnim strežnikom ni uspela." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 +msgid "Convert key file" msgstr "Pretvori datoteko ključa" -#: resources.h:77 resources.h:417 -msgid "Cop&y" -msgstr "Kop&iraj" - -#: ../../locales/../src/interface/bookmarks_dialog.cpp:651 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2077 #, c-format msgid "Copy (%d) of %s" msgstr "Kopija (%d) %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:628 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2056 #, c-format msgid "Copy of %s" msgstr "Kopija %s" -#: resources.h:588 resources.h:636 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Kopiraj URL-je izbranih elementov na odložišče, vključno z geslom." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopiraj URL-je izbranih elementov na odložišče." -#: ../../locales/../src/engine/transfersocket.cpp:207 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Povezave ni mogoče sprejeti: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Do poti %s ni mogoče dostopati" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Potrdila ni mogoče dodati na začasni seznam zaupanja vrednih" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Povezave ni mogoče dodati upravljalniku strežnikov" -#: ../../locales/../src/engine/ControlSocket.cpp:188 +#: ../../locales/../src/interface/state.cpp:868 +msgid "Could not complete operation" +msgstr "Dejanja ni mogoče dokončati" + +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Povezava s strežnikom ni uspela" -#: ../../locales/../src/engine/ControlSocket.cpp:1205 +#: ../../locales/../src/engine/ControlSocket.cpp:1091 #, c-format msgid "Could not connect to server: %s" msgstr "Povezava s strežnikom ni uspela: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Ukaza ni mogoče pretvoriti v kodno tabelo strežnika" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Zasebnega ključa ni mogoče pretvoriti" -#: ../../locales/../src/interface/RemoteListView.cpp:3044 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1453 +#: ../../locales/../src/interface/RemoteListView.cpp:2584 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "URL-jev ni mogoče kopirati" -#: ../../locales/../src/interface/aboutdialog.cpp:219 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Potrdila ni mogoče kopirati" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Podatkov ni mogoče kopirati" -#: ../../locales/../src/interface/RemoteListView.cpp:2513 -#: ../../locales/../src/interface/RemoteTreeView.cpp:898 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Ni mogoče ustvariti CFURL iz poti %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Ni mogoče ustvariti URI za ta prenos." + +#: ../../locales/../src/interface/updater.cpp:511 +#, c-format +msgid "Could not create local file %s\n" +msgstr "Krajevne datoteke %s ni mogoče ustvariti\n" + +#: ../../locales/../src/engine/logging.cpp:179 +#, c-format +msgid "Could not create logging mutex: %s" +msgstr "Beležnega mutexa ni mogoče ustvariti: %s" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Varnostno obsegajočega zaznamka iz URL ni mogoče ustvariti:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2229 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2324,11 +2701,11 @@ "Morda končnica v lupino ni pravilno nameščena ali pa datotek niste spustili " "v okno Raziskovalca." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Povezave s strežnikom ni mogoče vzpostaviti" -#: ../../locales/../src/interface/FileZilla.cpp:486 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2340,53 +2717,60 @@ "' v ukazni vrstici ali z nastavljanjem spremenljivke okolja " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Prijavnega zaporedja po meri ni mogoče ustvariti." -#: ../../locales/../src/engine/tlssocket.cpp:1017 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Kjuča ni mogoče tvoriti" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" "Imena izdajatelja potrdila ni mogoče pridobiti, gnutls_x509_get_issuer_dn ni " -"uspel." +"uspel" -#: ../../locales/../src/engine/tlssocket.cpp:992 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "" -"Imena potrditvenega subjekta ni mogoče pridobiti, gnutls_x509_get_dn ni " -"uspel." +"Imena potrditvenega subjekta ni mogoče pridobiti, gnutls_x509_get_dn ni uspel" -#: ../../locales/../src/interface/state.cpp:1015 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Polne oddaljene poti ni mogoče dobiti." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Domače poti iz CFURL ni mogoče dobiti" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Poti iz URL ni mogoče pridobiti" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Odgovora od fzputtygen ni mogoče dobiti." -#: ../../locales/../src/interface/RemoteListView.cpp:2574 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "Začasne mape za prenos datoteke ni mogoče pridobiti." -#: ../../locales/../src/engine/tlssocket.cpp:945 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "Vrstniških potrdil ni mogoče uvoziti, gnutls_x509_crt_import ni uspel." - -#: ../../locales/../src/engine/tlssocket.cpp:938 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Strukture za vrstniška potrdila ni mogoče inicializirati, " -"gnutls_x509_crt_init ni uspel." +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Ni mogoče inicializirati Winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:119 -#: ../../locales/../src/interface/import.cpp:310 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2397,125 +2781,175 @@ "dosegljiva.\n" "Vsakršne spremembe nastavitev ne bo mogoče shraniti." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223 -msgid "Could not load keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 +msgid "Could not load key file" msgstr "Datoteke ključa ni mogoče naložiti" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Zasebnega ključa ni mogoče naložiti" -#: ../../locales/../src/interface/state.cpp:1041 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Ustrezne krajevne mape za oddaljeno mapo '%s' ni mogoče pridobiti.\n" "Želite izključiti sinhrono brskanje in nadaljevati s spremembo oddaljene " "mape?" -#: ../../locales/../src/interface/state.cpp:381 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" -"Could not obtain corresponding local directory for the remote directory '%" -"s'.\n" +"Could not obtain corresponding local directory for the remote directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" "Ustrezne krajevne mape za oddaljeno mapo '%s' ni mogoče pridobiti.\n" "Sinhrono brskanje je bilo izključeno." -#: ../../locales/../src/interface/state.cpp:295 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" -"Could not obtain corresponding remote directory for the local directory '%" -"s'.\n" +"Could not obtain corresponding remote directory for the local directory " +"'%s'.\n" "Synchronized browsing has been disabled." msgstr "" "Ustrezne oddaljene mape za krajevno mapo '%s' ni mogoče pridobiti.\n" "Sinhrono brskanje je bilo izključeno." -#: ../../locales/../src/interface/aboutdialog.cpp:219 -#: ../../locales/../src/interface/RemoteListView.cpp:3044 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1453 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Ni mogoče pridobiti velikosti '%s'" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Ni mogoče odpreti '%s'" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2584 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Odložišča ni mogoče kopirati" -#: ../../locales/../src/engine/logging.cpp:208 -#: ../../locales/../src/engine/logging.cpp:276 -#: ../../locales/../src/engine/logging.cpp:307 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Dnevniške datoteke ni mogoče odpreti: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Oddaljene poti ni mogoče razčleniti." -#: ../../locales/../src/interface/quickconnectbar.cpp:84 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Naslova strežnika ni mogoče razbrati:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225 +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Ni mogoče brati s '%s'" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 +msgid "Could not read from data socket." +msgstr "Ni mogoče brati s podatkovnih vrat." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:172 #, c-format msgid "Could not read from socket: %s" msgstr "Ni mogoče brati z vrat: %s" -#: ../../locales/../src/interface/sitemanager.cpp:487 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Elementa strežnika ni mogoče prebrati." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Iskanje do odmika %s v datoteki ni možno." +#: ../../locales/../src/interface/netconfwizard.cpp:354 +msgid "Could not receive data from server." +msgstr "Prejemanje podatkov s strežnika ni uspelo." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Dostopa do map ni mogoče obnoviti" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Iskanje do odmika %d v datoteki ni možno" + +#: ../../locales/../src/engine/http/filetransfer.cpp:119 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "Neizvedljivo iskanje do začetka datoteke" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Neizvedljivo iskanje do konca datoteke" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Ukaza ni mogoče poslati k fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Ukaza ni mogoče poslati k fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Razvrščanje vrstniških potrdil ni uspelo" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "V/I niti ni mogoče razmnožiti" -#: ../../locales/../src/engine/ControlSocket.cpp:1178 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Rokovanja s posredovalnim strežnikom ni mogoče začeti: %s" -#: ../../locales/../src/interface/QueueView.cpp:1107 -#: ../../locales/../src/interface/QueueView.cpp:1112 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Prenosa ni mogoče začeti" -#: ../../locales/../src/interface/sitemanager.cpp:657 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:869 #, c-format msgid "" -"Could not write \"%s\", any changes to the Site Manager could not be saved: %" -"s" +"Could not write \"%s\", any changes to the Site Manager could not be saved: " +"%s" msgstr "" "Pisanje \"%s\" ni bilo možno, zato spremembe upravljalnika strežnikov niso " "shranjene: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:858 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Pisanje \"%s\" ni bilo možno, zaznamka ni bilo mogoče dodati: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:330 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Pisanje \"%s\" ni bilo možno, splošnih zaznamkov ni bilo mogoče shraniti: %s" -#: ../../locales/../src/interface/QueueView.cpp:1948 -#: ../../locales/../src/interface/QueueView.cpp:1984 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2524,86 +2958,123 @@ "Pisanje \"%s\" ni bilo možno, zato vrsta ni bila shranjena.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:784 -#: ../../locales/../src/interface/sitemanager.cpp:846 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2495 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Pisanje \"%s\" ni bilo možno, zato izbranih strežnikov ni bilo mogoče " "izvoziti: %s" -#: ../../locales/../src/interface/wrapengine.cpp:1134 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format -msgid "Could not write \"%s\": %s" -msgstr "Ni mogoče pisati \"%s\": %s" +msgid "Could not write \"%s\":" +msgstr "Ni mogoče pisati »%s«:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format -msgid "Could not write keyfile: %s" +msgid "Could not write key file: %s" msgstr "Datoteke ključa ni mogoče zapisati: %s" -#: ../../locales/../src/interface/QueueView.cpp:1101 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "V krajevno datoteko ni mogoče pisati" -#: ../../locales/../src/engine/logging.cpp:315 -#: ../../locales/../src/engine/logging.cpp:386 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "V dnevniško datoteko ni mogoče pisati: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:999 -#: ../../locales/../src/engine/ControlSocket.cpp:1097 +#: ../../locales/../src/engine/ControlSocket.cpp:913 +#: ../../locales/../src/engine/ControlSocket.cpp:1008 +#: ../../locales/../src/engine/http/request.cpp:119 #, c-format msgid "Could not write to socket: %s" msgstr "Ni mogoče pisati na vrata: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:181 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Država:" -#: resources.h:615 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "" -"Sesuje FileZillo v trenutku. Uporabljeno le za razhroščevanje upravljalnika " -"izjem." - -#: resources.h:567 resources.h:581 resources.h:630 resources.h:651 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +msgid "Crea&te new file" +msgstr "Ustvari novo datoteko" + +#: ../../locales/../src/interface/state.cpp:1107 +msgid "Create &missing local directory and enter it" +msgstr "Ustvari &manjkajočo krajevno mapo in vstopi vanjo" + +#: ../../locales/../src/interface/state.cpp:1029 +msgid "Create &missing remote directory and enter it" +msgstr "Ustvari &manjkajočo oddaljeno mapo in vstopi vanjo" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Ustvari novo podmapo v trenutni mapi" -#: ../../locales/../src/interface/LocalListView.cpp:1183 -#: ../../locales/../src/interface/LocalTreeView.cpp:1189 -#: ../../locales/../src/interface/RemoteListView.cpp:1568 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1275 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 +msgid "Create a new subdirectory in the current directory and change into it" +msgstr "Ustvari novo podmapo v trenutni mapi in se postavi vanjo" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 +msgid "Create a new, empty file in the current directory" +msgstr "Ustvari novo, prazno datoteko v trenutni mapi" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 +msgid "Create director&y and enter it" +msgstr "Ustvari map&o in vstopi vanjo" + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Ustvari mapo" -#: ../../locales/../src/interface/QueueView.cpp:1511 +#: ../../locales/../src/interface/RemoteListView.cpp:2673 +msgid "Create empty file" +msgstr "Ustvari prazno datoteko" + +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Ustvarjanje mape" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Ustvarjanje mape '%s' ..." -#: ../../locales/../src/engine/ControlSocket.cpp:174 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Kritična napaka" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:161 +msgid "Critical error:" +msgstr "Kritična napaka:" + +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Kritična napaka pri prenosu datoteke" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kritična napaka pri prenosu datoteke po prenesenih %s v %s" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2612,125 +3083,144 @@ "Trenutna oddaljena mapa (%s) ni pod sinhroniziranim izhodiščem (%s).\n" "Sinhrono brskanje je bilo izključeno." -#: ../../locales/../src/interface/statusbar.cpp:423 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Trenutno je vrsta prenosa nastavljena na ASCII." -#: ../../locales/../src/interface/statusbar.cpp:433 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Trenutno je vrsta prenosa nastavljena na samodejno razpoznavo." -#: ../../locales/../src/interface/statusbar.cpp:428 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Trenutno je vrsta prenosa nastavljena na dvojiško." -#: resources.h:770 resources.h:890 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 +msgid "Curve:" +msgstr "Krivulja:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Po &meri" -#: ../../locales/../src/interface/filter.cpp:99 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Sklop filtrov po meri" -#: resources.h:376 resources.h:377 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Strežnik po meri" -#: resources.h:385 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Cijan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Vrsta &podatkov" -#: resources.h:897 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "D&esetiške predpone z uporabo simbolov SI (npr. 1 KB = 1000 bajtov)." -#: resources.h:100 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "Pri&vzeto" -#: resources.h:583 resources.h:631 resources.h:661 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "I&zbriši" -#: resources.h:205 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 +msgid "D&irectory comparison" +msgstr "Pr&imerjava map" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Onemogoč&i vse" -#: resources.h:869 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" -msgstr "Vnesite geslo" +msgstr "&Ne shranjuj gesel" -#: resources.h:921 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Dejanje nad &mapami ob dvokliku:" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 +msgid "D&uplicate" +msgstr "P&odvoji" + +#: ../../locales/../src/engine/server.cpp:55 msgid "DOS-like with virtual paths" msgstr "Podobno DOS-u z navideznimi potmi" -#: ../../locales/../src/interface/LocalListView.cpp:2041 -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Nevarna vrsta datoteke" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Podatki" -#: ../../locales/../src/interface/netconfwizard.cpp:985 -#: ../../locales/../src/interface/netconfwizard.cpp:1051 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Podatkovna vrata prehitro zaprta." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:151 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Datum" -#: resources.h:881 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Oblikovanje datuma" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:128 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" msgstr "Zapis datuma/časa" -#: ../../locales/../src/interface/fileexistsdlg.cpp:88 -#: ../../locales/../src/interface/fileexistsdlg.cpp:107 -#: ../../locales/../src/interface/fileexistsdlg.cpp:134 -#: ../../locales/../src/interface/fileexistsdlg.cpp:153 +#: ../../locales/../src/interface/fileexistsdlg.cpp:49 msgid "Date/time unknown" msgstr "Datum/čas neznan" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:141 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" msgstr "Razhrošči" -#: resources.h:961 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Nastavitve razhroščevanja" -#: resources.h:91 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Privzeta &krajevna mapa:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:47 msgid "Default (Autodetect)" msgstr "Privzeto (samorazpoznaj)" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." msgstr "Privzeti urejevalnik ni pravilno naveden." -#: resources.h:255 resources.h:277 resources.h:852 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Dejanje privzeta datoteka obstaja" -#: resources.h:93 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Privzeta &oddaljena mapa:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2738,19 +3228,20 @@ "Privzete oddaljene poti ni mogoče razčleniti. Preverite, da je veljavna " "absolutna pot za izbrano vrsto strežnikov." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:78 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Privzeti jezik sistema" -#: resources.h:675 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" msgstr "Privzeti način prenosa:" -#: resources.h:821 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Privzeti način prenosa:" -#: resources.h:694 resources.h:757 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Privzeto: http://ip.filezilla-project.org/ip.php" @@ -2759,7 +3250,7 @@ "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "Premor med poskusi povezovanja mora biti med 1 in 999 sekundami." -#: ../../locales/../src/engine/engineprivate.cpp:630 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2780,63 +3271,85 @@ "Časovno zamikanje povezave za %d sekunde zaradi predhodnjega neuspešnega " "poskusa povezave ..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1299 msgid "Delete Site Manager entry" msgstr "Izbriši vnos Upravljalnika strežnikov" -#: resources.h:632 resources.h:653 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "Izbriši izbrano mapo" -#: resources.h:570 resources.h:584 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "Izbriši izbrane datoteke in mape" -#: ../../locales/../src/interface/search.cpp:1012 -msgid "Deleting directories" -msgstr "Brisanje map" - -#: ../../locales/../src/interface/search.cpp:1012 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Brisanje več nepovezanih map še ni podprto" +#: ../../locales/../src/engine/engineprivate.cpp:392 +#, c-format +msgid "Deleting \"%s\"" +msgstr "Brisanje »%s«" + +#: ../../locales/../src/engine/engineprivate.cpp:395 +#, c-format +msgid "Deleting %u files from \"%s\"" +msgstr "Brisanje %u datotek iz »%s«" -#: resources.h:453 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Brisanje simbolične povezave" -#: ../../locales/../src/interface/LocalTreeView.cpp:1055 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Namizje" -#: resources.h:4 resources.h:28 resources.h:176 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Podrobnosti" -#: resources.h:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Podrobnosti za nov ključ:" -#: resources.h:227 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:793 +msgid "Detected newer version of FileZilla" +msgstr "Zaznana novejša različica FileZille" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "&Mape" -#: ../../locales/../src/interface/queue.cpp:1211 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "Smer" -#: ../../locales/../src/interface/filelistctrl.cpp:523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Mape:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Mapa" -#: resources.h:639 resources.h:912 resources.h:995 -#: ../../locales/../src/interface/filelistctrl.cpp:445 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Dovoljenja za dostop do map" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 #: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Primerjava map" #: ../../locales/../src/interface/listingcomparison.cpp:74 -#: ../../locales/../src/interface/listingcomparison.cpp:82 -#: ../../locales/../src/interface/listingcomparison.cpp:88 msgid "Directory comparison failed" msgstr "Primerjava map ni uspela" @@ -2844,543 +3357,593 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "Mapa z dnevniško datoteko ne obstaja ali pa je njeno ime neveljavno." -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "&Filtri seznama mape ..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Pridobivanje seznama mape prekinil uporabnik" -#: ../../locales/../src/interface/RemoteListView.cpp:2313 +#: ../../locales/../src/interface/RemoteListView.cpp:2061 msgid "Directory listing failed" msgstr "Izpis vsebine mape ni uspel" -#: resources.h:198 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Filtri seznama mape" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:193 +#, c-format +msgid "Directory listing of \"%s\" successful" +msgstr "Pridobivanje seznama mape »%s« uspešno" + +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" -msgstr "Pridobivanje seznama mape uspešno." +msgstr "Pridobivanje seznama mape uspešno" -#: resources.h:208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Onemogo&či vse" -#: ../../locales/../src/interface/state.cpp:1049 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Želite izključiti sinhrono brskanje in nadaljevati s spreminjanjem oddaljene " "mape?" -#: ../../locales/../src/interface/Mainfrm.cpp:657 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "Onemogočite to možnost, če ni več mogoče pravilno videti datotek." -#: resources.h:988 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Razveži s strežnikom" -#: ../../locales/../src/engine/ControlSocket.cpp:82 -#: ../../locales/../src/engine/ControlSocket.cpp:1000 -#: ../../locales/../src/engine/ControlSocket.cpp:1099 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:936 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:938 -#: ../../locales/../src/interface/QueueView.cpp:1054 -#: ../../locales/../src/interface/QueueView.cpp:1098 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:914 +#: ../../locales/../src/engine/ControlSocket.cpp:1010 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:120 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Razvezan s strežnikom" -#: ../../locales/../src/engine/ControlSocket.cpp:1134 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:953 +#: ../../locales/../src/engine/ControlSocket.cpp:1039 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:197 #, c-format msgid "Disconnected from server: %s" msgstr "Razvezani s strežnikom: %s" -#: ../../locales/../src/interface/QueueView.cpp:1413 -#: ../../locales/../src/interface/statuslinectrl.cpp:269 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Prekini povezavo s prejšnjim strežnikom" -#: resources.h:989 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" -msgstr "Razveže povezavo od trenutno vidnega strežnika." +msgstr "Razveže povezavo od trenutno vidnega strežnika" -#: resources.h:555 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Prikaži pogovorno okno o programu" -#: resources.h:930 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "&Ne uporabi privzetega urejevalnika" -#: resources.h:609 -msgid "Do ¬hing" -msgstr "&Ne naredi ničesar" - -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61 -#: ../../locales/../src/interface/updatewizard.cpp:251 -msgid "" -"Do you really want to check for beta versions?\n" -"Unless you want to test new features, keep using stable versions." -msgstr "" -"Ste prepričani, da želite preveriti za različice beta?\n" -"Če ne nameravate preizkušati novih funkcionalnosti, uporabljajte raje " -"stabilne različice." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 +msgid "Do the same with &all selected files already being edited" +msgstr "Stori enako z &vsemi izbranimi datotekami, ki se že urejajo" -#: ../../locales/../src/interface/Mainfrm.cpp:1108 -#: ../../locales/../src/interface/Mainfrm.cpp:1132 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Resnično želite zapreti FileZillo?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Resnično želite izbrisati vse vnose v upravljalniku strežnikov in v čakalni " "vrsti prenosov?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Resnično želite izbrisati vse vnose v upravljalniku strežnikov?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1301 msgid "Do you really want to delete selected entry?" msgstr "Resnično želite izbrisati izbrani vnos?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Resnično želite izbrisati čakalno vrsto prenosov?" -#: ../../locales/../src/interface/Mainfrm.cpp:591 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Resnično želite poslati '%s' na strežnik?" -#: resources.h:466 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 +msgid "Do you want to reopen this file?" +msgstr "Želite ponovno odpreti to datoteko?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Dokumentacija" -#: resources.h:696 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:250 msgid "Don't use external IP address on &local connections." msgstr "Ne uporabljajte zunanjega naslova IP na &krajevnih povezavah." -#: resources.h:832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "Imena s piko so imena datotek, ki se začnejo s piko, npr. .htaccess" -#: resources.h:915 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Dejanje ob dvokliku" -#: resources.h:362 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Prenesi s strežnika" -#: resources.h:482 resources.h:808 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Omejitev prenosov &s strežnika:" -#: ../../locales/../src/interface/statusbar.cpp:604 +#: ../../locales/../src/interface/statusbar.cpp:598 #, c-format msgid "Download limit: %s/s" msgstr "Omejitev prenosov s strežnika: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:606 +#: ../../locales/../src/interface/statusbar.cpp:601 msgid "Download limit: none" msgstr "Omejitev prenosov s strežnika: brez" -#: resources.h:441 ../../locales/../src/interface/search.cpp:817 -#: ../../locales/../src/interface/search.cpp:823 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Prenesi rezultate iskanja" -#: resources.h:626 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "Prenesi izbrano mapo" -#: resources.h:574 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "Prenesi sem izbrane datoteke in mape" -#: ../../locales/../src/interface/edithandler.cpp:1245 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 +#, c-format +msgid "" +"Download speed: %s/s\n" +"Upload speed: %s/s" +msgstr "" +"Hitrost prenosa: %s/s\n" +"Hitrost nalaganja: %s/s" + +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Prenašanje" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:358 -#: ../../locales/../src/interface/updatewizard.cpp:415 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:156 #, c-format msgid "Downloading %s" msgstr "Prenašanje %s" -#: ../../locales/../src/interface/search.cpp:926 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Prenos več nepovezanih map še ni podprt" - -#: ../../locales/../src/interface/search.cpp:926 -msgid "Downloading search results" -msgstr "Prenašanje rezultatov iskanja" - -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:104 -#: ../../locales/../src/interface/QueueView.cpp:83 -#: ../../locales/../src/interface/RemoteListView.cpp:101 -#: ../../locales/../src/interface/RemoteTreeView.cpp:88 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 +msgid "Downloading update..." +msgstr "Prenašanje posodobitve ..." + +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:112 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "Funkcija povleci-in-spusti med dvema FileZillama še ni implementirana." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:96 -#: ../../locales/../src/interface/RemoteListView.cpp:107 -#: ../../locales/../src/interface/RemoteTreeView.cpp:94 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:117 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Funkcija povleci-in-spusti med dvema strežnikoma še ni implementirana." -#: ../../locales/../src/interface/filteredit.cpp:147 -#: ../../locales/../src/interface/filteredit.cpp:215 -#: ../../locales/../src/interface/filteredit.cpp:254 -msgid "Duplicate filter name" -msgstr "Dvojnik imena filtra" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 +msgid "Dupl&icate" +msgstr "Podvoj&i" -#: resources.h:204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "O&mogoči vse" -#: resources.h:560 resources.h:577 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "&Vstopi v mapo" -#: resources.h:141 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "&Izvedi" -#: resources.h:501 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 msgid "E&xit" -msgstr "&Izvedi" +msgstr "&Izhod" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 +msgid "E&xport..." +msgstr "&Izvozi ..." -#: ../../locales/../src/interface/verifycertdialog.cpp:187 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "E-poštni naslov:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Vsak filter potrebuje vsaj en pogoj." -#: resources.h:230 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Uredi filtre" -#: resources.h:565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Uredite datoteko z nastavljenim urejevalnikom in prenesite spremembe na " "strežnik." -#: ../../locales/../src/interface/LocalListView.cpp:1952 -#: ../../locales/../src/interface/LocalListView.cpp:1963 +#: ../../locales/../src/interface/search.cpp:1198 +msgid "Editing directories is not supported" +msgstr "Urejanje map še ni podprto" + +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Urejanje ni uspelo" -#: resources.h:878 +#: ../../locales/../src/interface/search.cpp:1198 +msgid "Editing search results" +msgstr "Urejanje rezultatov iskanja" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "E-pošta:" -#: ../../locales/../src/interface/QueueView.cpp:2227 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "Prazen ukaz" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 msgid "Empty command." msgstr "Prazen ukaz." -#: ../../locales/../src/interface/RemoteListView.cpp:2315 +#: ../../locales/../src/interface/RemoteListView.cpp:2063 msgid "Empty directory listing" msgstr "Izprazni izpis vsebine map" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "Prazna mapa." -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Prazna končnica datoteke." -#: ../../locales/../src/interface/filteredit.cpp:206 -#: ../../locales/../src/interface/filteredit.cpp:248 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Prazna imena filtrov niso dovoljena." -#: ../../locales/../src/interface/filteredit.cpp:206 -#: ../../locales/../src/interface/filteredit.cpp:248 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Prazno ime" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 msgid "Empty quoted string." msgstr "Prazen navedeni niz." -#: resources.h:207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Om&ogoči vse" -#: resources.h:817 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Omogoči &filtriranje neveljavnih znakov" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Šifrirano" -#: resources.h:344 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Šifriranje" -#: resources.h:336 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "Šifrirni &ključ:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "Šifrirni &ključ:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Podrobnosti o šifriranju" -#: ../../locales/../src/interface/filelistctrl.cpp:447 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Želite končati primerjanje in spremeniti zaporedje razvrščanja?" -#: resources.h:541 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Želite končati primerjanje in odpreti hitro iskanje?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "Vnesi ukaz &po meri ..." -#: resources.h:486 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Vnesite 0 za neomejeno hitrost." -#: ../../locales/../src/interface/QueueView.cpp:2216 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "Vnesite ukaz" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Vnesi ukaz po meri" -#: resources.h:922 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Vstopi v mapo" -#: ../../locales/../src/interface/filteredit.cpp:134 -#: ../../locales/../src/interface/filteredit.cpp:194 -#: ../../locales/../src/interface/filteredit.cpp:241 +#: ../../locales/../src/interface/filteredit.cpp:136 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Vnesite ime filtra" -#: ../../locales/../src/interface/filter.cpp:344 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Vnesite glavno geslo" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Vnesite ime za sklop filtrov" -#: ../../locales/../src/interface/filter.cpp:406 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Vnesite novo ime za sklop filtrov" -#: resources.h:116 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Vnesite geslo" -#: resources.h:561 resources.h:578 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "Vstopi v izbrano mapo" -#: resources.h:716 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then." -msgstr "" -"Vnesite naslov strežnika.\n" -"Za določitev protokola strežnika dodajte gostitelju predpono, ki " -"identificira protokol. Če protokol ni določen, bo uporabljen privzeti " -"protokol (ftp://).\n" -"Prav tako lahko tukaj vnesete celotne naslove URL v obliki protocol://" -"uporabnik:geslo@gostitelj:vrata, vrednosti v drugih poljih bodo s tem " -"prepisane." +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" +"\n" +"Supported protocols are:\n" +"- ftp:// for normal FTP with optional encryption\n" +"- sftp:// for SSH file transfer protocol\n" +"- ftps:// for FTP over TLS (implicit)\n" +"- ftpes:// for FTP over TLS (explicit)" +msgstr "" +"Vnesite naslov strežnika. Za določitev protokola strežnika dodajte " +"gostitelju predpono, ki identificira protokol. Če protokol ni določen, bo " +"uporabljen privzeti protokol (ftp://). Prav tako lahko tukaj vnesete celotne " +"naslove URL v obliki protocol://uporabnik:geslo@gostitelj:vrata, vrednosti v " +"drugih poljih bodo s tem prepisane.\n" +"\n" +"Podprti protokoli so:\n" +"- ftp:// za navaden FTP z možnostjo šifriranja,\n" +"- sftp:// za protokol prenosa datotek SSH,\n" +"- ftps:// za FTP prek TLS (implicitno) in\n" +"- ftpes:// za FTP prek TLS (eksplicitno)." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" -"Please note that the converted file will not be password protected." +"The converted file will be protected with the same password." msgstr "" -"Vnesite geslo za datoteko '%s'.\n" -"Upoštevajte, da pretvorjena datoteka ne bo zaščitena z geslom." +"Vnesite geslo za datoteko %s\n" +"Pretvorjena datoteka bo zaščitena z istim geslom." -#: resources.h:720 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Vnesite vrata, na katerih posluša strežnik.\n" -"Privzeta vrata za FTP so 21, privzeta vrednost za SFTP pa 22." +"Vnesite vrata, na katerih posluša strežnik. Privzeta vrata za FTP so 21, " +"privzeta vrednost za SFTP pa 22." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Vnesite uporabniško ime" -#: ../../locales/../src/interface/loginmanager.cpp:63 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Vnesite uporabniško ime in geslo" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Napaka" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Napaka pri izvažanju nastavitev" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:38 -#: ../../locales/../src/interface/import.cpp:108 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Napaka pri uvažanju" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:172 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:299 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:731 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:772 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:821 -#: ../../locales/../src/interface/filter.cpp:211 -#: ../../locales/../src/interface/filter.cpp:1046 -#: ../../locales/../src/interface/import.cpp:120 -#: ../../locales/../src/interface/import.cpp:311 -#: ../../locales/../src/interface/Options.cpp:213 -#: ../../locales/../src/interface/QueueView.cpp:1938 -#: ../../locales/../src/interface/QueueView.cpp:1965 -#: ../../locales/../src/interface/search.cpp:1089 -#: ../../locales/../src/interface/search.cpp:1110 -#: ../../locales/../src/interface/sitemanager.cpp:250 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:544 -#: ../../locales/../src/interface/sitemanager.cpp:603 -#: ../../locales/../src/interface/sitemanager.cpp:723 -#: ../../locales/../src/interface/sitemanager.cpp:810 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:730 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:785 -#: ../../locales/../src/interface/wrapengine.cpp:976 +#: ../../locales/../src/interface/QueueView.cpp:1663 +msgid "Error loading queue" +msgstr "Napaka pri nalaganju vrste" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:786 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:849 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Napaka pri nalaganju datoteke xml" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 +#: ../../locales/../src/interface/QueueView.cpp:1556 +msgid "Error saving queue" +msgstr "Napaka pri shranjevanju vrste" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Napaka pri zagonu programa" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:859 -#: ../../locales/../src/interface/QueueView.cpp:1949 -#: ../../locales/../src/interface/QueueView.cpp:1985 -#: ../../locales/../src/interface/sitemanager.cpp:658 -#: ../../locales/../src/interface/sitemanager.cpp:785 -#: ../../locales/../src/interface/sitemanager.cpp:847 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187 -#: ../../locales/../src/interface/wrapengine.cpp:1135 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:870 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2496 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Napaka pri pisanju datoteke xml" -#: ../../locales/../src/interface/updatewizard.cpp:335 -msgid "Error, file name cannot be parsed." -msgstr "Napaka, imena datoteke ni mogoče razčleniti." - -#: ../../locales/../src/interface/updatewizard.cpp:351 -msgid "Error, local file exists but cannot be removed" -msgstr "Napaka, krajevna datoteka obstaja, a je ni mogoče odstraniti." - -#: ../../locales/../src/engine/logging.cpp:213 -#: ../../locales/../src/interface/StatusView.cpp:285 -#: ../../locales/../src/interface/StatusView.cpp:333 -#: ../../locales/../src/interface/updatewizard.cpp:535 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:284 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "Napaka:" -#: resources.h:478 -msgid "Establish connection in a new tab" -msgstr "Povezavo s strežnikom vzpostavi v novem zavihku" - -#: resources.h:941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "" "Primer: png \"c:\\program files\\ogledovalnik\\ogledovalnik.exe\" -open" -#: resources.h:900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Primeri" -#: resources.h:145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "&Izvedi" -#: ../../locales/../src/interface/updatewizard.cpp:320 -msgid "Executable" -msgstr "Izvršilna datoteka" - -#: ../../locales/../src/interface/Mainfrm.cpp:1749 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Izvršilna datoteka ne vsebuje informacij o različici, preverjanje obstoja " "posodobitev ni možno." -#: resources.h:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Raziskovalec" -#: resources.h:294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Izvozni &filtri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Izvozi &vrsto" -#: resources.h:293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "&Izvozi nastavitve" -#: resources.h:290 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Izvozi nastavitve" -#: resources.h:219 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "&Ime filtra:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:117 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:496 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:516 msgid "FTP - File Transfer Protocol" -msgstr "" +msgstr "FTP (File Transfer Protocol)" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" -msgstr "" +msgstr "FTP (File Transfer Protocol) z možnim šifriranjem" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" -msgstr "" +msgstr "Nezaščiteni FTP" -#: ../../locales/../src/interface/quickconnectbar.cpp:68 -#: ../../locales/../src/interface/quickconnectbar.cpp:198 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Pogon FTP ni inicializiran, povezava ni možna" -#: resources.h:744 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Obdrži-pri-življenju FTP" -#: resources.h:764 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:120 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "Posredovalni strežnik FTP" -#: ../../locales/../src/interface/cmdline.cpp:19 +#: ../../locales/../src/interface/cmdline.cpp:21 msgid "FTP URL" msgstr "URL za FTP" -#: resources.h:672 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:44 msgid "" "FTP uses secondary connections for data transfers. These additional " "connections can be established in two ways." @@ -3388,153 +3951,158 @@ "FTP uporablja za prenos podatkov sekundarne povezave. Te dodatne povezave " "lahko vzpostavite na dva načina." -#: ../../locales/../src/engine/server.cpp:20 -msgid "FTPES - FTP over explicit TLS/SSL" -msgstr "FTPES - FTP prek eksplicitnega TLS/SSL" - -#: ../../locales/../src/engine/server.cpp:19 -msgid "FTPS - FTP over implicit TLS/SSL" -msgstr "FTPS - FTP prek implicitnega TLS/SSL" - -#: ../../locales/../src/interface/LocalListView.cpp:534 -#: ../../locales/../src/interface/LocalListView.cpp:614 -#: ../../locales/../src/interface/LocalListView.cpp:2248 -#: ../../locales/../src/interface/LocalTreeView.cpp:913 -#: ../../locales/../src/interface/viewheader.cpp:522 +#: ../../locales/../src/engine/server.cpp:25 +msgid "FTPES - FTP over explicit TLS" +msgstr "FTPES – FTP prek izrecnega TLS" + +#: ../../locales/../src/engine/server.cpp:24 +msgid "FTPS - FTP over implicit TLS" +msgstr "FTPS – FTP prek implicitnega TLS" + +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Sprememba mape ni uspela" -#: ../../locales/../src/interface/FileZilla.cpp:259 -#: ../../locales/../src/interface/FileZilla.cpp:267 -#: ../../locales/../src/interface/FileZilla.cpp:269 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Sprememba jezika ni uspela" -#: ../../locales/../src/interface/updatewizard.cpp:453 -msgid "Failed to check for newer version of FileZilla." -msgstr "Preverjanje za novejše različice FileZille ni uspelo." +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Ukaza ni mogoče pretvoriti v 8-bitni nabor znakov" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2276 msgid "Failed to copy or move sites" msgstr "Kopiranje ali premikanje strežnikov ni uspelo" -#: ../../locales/../src/interface/xmlfunctions.cpp:511 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" -msgstr "Varnostne kopije datoteke xml ni mogoče ustvariti." +msgstr "Varnostne kopije datoteke xml ni mogoče ustvariti" -#: ../../locales/../src/interface/netconfwizard.cpp:791 -msgid "Failed to create listen socket, aborting" -msgstr "Ni mogoče ustvariti vrat za poslušanje, prekinjanje" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Ni mogoče ustvariti vtičnika za poslušanje na vratih %d, prekinjanje." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Za aktivni način prenosa ni mogoče ustvariti vrat za poslušanje" -#: ../../locales/../src/interface/updatewizard.cpp:455 -msgid "Failed to download the latest version of FileZilla." -msgstr "Prenos novejše različice FileZille ni uspel." +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Gesla strežnika ni mogoče dešifrirati." -#: ../../locales/../src/interface/LocalTreeView.cpp:667 +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Pridobivanje poti do 'Mojih dokumentov' ni bilo uspešno" -#: ../../locales/../src/interface/LocalTreeView.cpp:653 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Pridobivanje namizne poti ni uspelo" -#: ../../locales/../src/interface/netconfwizard.cpp:950 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Naslova vrstnika nadzorne povezave ni mogoče pridobiti, povezava zaprta." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Naslova vrstnika podatkovne povezave ni mogoče pridobiti, povezava zaprta." -#: ../../locales/../src/interface/context_control.cpp:77 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Pogona FTP ni mogoče inicializirati" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:313 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:128 msgid "Failed to initialize TLS." msgstr "TLS ni mogoče inicializirati." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:97 +msgid "Failed to initialize networking" +msgstr "Mreženja ni mogoče inicializirati" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Razdelkov ni mogoče naložiti, neveljavne datoteke virov?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Nalaganje zasebnega ključa ni uspelo: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "\"%s\" ni mogoče odpreti za dopisovanje/pisanje" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "\"%s\" ni mogoče odpreti za branje" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:391 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:448 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "\"%s\" ni mogoče odpreti za pisanje" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:321 -msgid "Failed to parse trusted root cert." -msgstr "Razčlenitev zaupanja vrednega korenskega potrdila ni uspela." +#: ../../locales/../src/engine/ControlSocket.cpp:345 +msgid "Failed to parse returned path." +msgstr "Vrnjene poti ni mogoče razčleniti." -#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Podatki ni uspelo sprejeti" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Seznama mape ni mogoče pridobiti" -#: ../../locales/../src/interface/netconfwizard.cpp:719 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Zunanjega naslova IP ni mogoče pridobiti, prekinitev" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Zunanjega naslova IP ni mogoče pridobiti, prekinitev." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "" "Zunanjega naslova IP ni mogoče pridobiti, sledi uporaba krajevnega naslova" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953 -msgid "Failed to retrieve local ip address." -msgstr "Krajevnega naslova IP ni mogoče pridobiti." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Krajevnega naslova IP ni mogoče pridobiti. Prekinitev." -#: ../../locales/../src/interface/netconfwizard.cpp:688 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Krajevnega naslova IP ni mogoče pridobiti. Prekinitev" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Krajevnega naslova IP ni mogoče pridobiti." -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Zunanjega naslova IP ni mogoče pridobiti." -#: ../../locales/../src/interface/netconfwizard.cpp:307 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Ukaza ni mogoče poslati." -#: ../../locales/../src/interface/FileZilla.cpp:267 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Jezika ni bilo mogoče nastaviti na %s (%s), zato je v uporabi privzeti " -"sistemski jezik." +"sistemski jezik" -#: ../../locales/../src/interface/FileZilla.cpp:252 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3542,163 +4110,168 @@ "Jezika ni bilo mogoče nastaviti na %s (%s), zato je v uporabi privzeti " "sistemski jezik (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:240 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Jezika ni bilo mogoče nastaviti na %s (%s), zato je v uporabi privzeti " "sistemski jezik." -#: ../../locales/../src/interface/FileZilla.cpp:269 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Jezika ni bilo mogoče nastaviti na %s, zato je v uporabi privzeti sistemski " -"jezik." +"jezik" -#: ../../locales/../src/interface/FileZilla.cpp:248 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Jezika ni bilo mogoče nastaviti na %s, zato je v uporabi privzeti sistemski " "jezik (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:237 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Jezika ni bilo mogoče nastaviti na %s, zato je v uporabi privzeti sistemski " "jezik." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Nastavitev ni mogoče preveriti" -#: ../../locales/../src/engine/tlssocket.cpp:880 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" -msgstr "Preverjanje vrstniškega potrdila ni uspelo." +msgstr "Preverjanje vrstniškega potrdila ni uspelo" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:566 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Zapisovanje v datoteko %s ni uspelo" -#: ../../locales/../src/interface/xmlfunctions.cpp:529 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" -msgstr "V datoteko xml ni mogoče pisati." +msgstr "V datoteko xml ni mogoče pisati" #: ../../locales/../src/interface/queueview_failed.cpp:16 msgid "Failed transfers" msgstr "Neuspeli prenosi" -#: resources.h:687 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 msgid "Fall back to active mode" msgstr "Povrnitev v aktivni način" -#: resources.h:369 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Da&toteka:" -#: resources.h:226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "&Datoteke" -#: ../../locales/../src/interface/filelistctrl.cpp:500 -#: ../../locales/../src/interface/filelistctrl.cpp:518 -#: ../../locales/../src/interface/filelistctrl.cpp:527 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Datoteka" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:124 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 msgid "File Types" msgstr "Vrsta datotek" -#: ../../locales/../src/interface/import.cpp:108 +#: ../../locales/../src/engine/socket.cpp:1077 +msgid "File descriptor not a socket" +msgstr "Opisnik datoteke ne predstavlja vrat" + +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Datoteka ne vsebuje nobenih podatkov za uvoz." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:132 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "Urejanje datoteke" -#: ../../locales/../src/interface/RemoteListView.cpp:1872 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "File exists" msgstr "Datoteka obstaja" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:125 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 msgid "File exists action" msgstr "Dejanje datoteka obstaja" -#: resources.h:305 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Datoteka je bila spremenjena" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:130 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 msgid "File lists" msgstr "Seznami datotek" -#: ../../locales/../src/interface/edithandler.cpp:1722 -#: ../../locales/../src/interface/FileZilla.cpp:702 -#: ../../locales/../src/interface/FileZilla.cpp:796 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Datoteke ni mogoče najti" -#: resources.h:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Iskanje datotek" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Prenos je prekinil uporabnik" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Prenos datoteke je prekinil uporabnik po prenesenih %s v %s" -#: ../../locales/../src/engine/ControlSocket.cpp:139 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Prenos datoteke ni uspel" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Prenos datoteke ni uspel po prenesenih %s v %s" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Prenos datoteke preskočen" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Prenos datoteke je bil uspešen" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Prenos datoteke je bil uspešen, preneseno %s v %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1107 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Prenosi datotek so v teku." -#: resources.h:387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Datoteka se bo prenesla kot datoteka ASCII." -#: resources.h:388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Datoteka se bo prenesla kot dvojiška datoteka." -#: ../../locales/../src/interface/FileZilla.cpp:487 -#: ../../locales/../src/interface/quickconnectbar.cpp:68 -#: ../../locales/../src/interface/quickconnectbar.cpp:198 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Napaka FileZilla" -#: resources.h:709 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." @@ -3706,65 +4279,57 @@ "FileZilla lahko preizkusi vaše nastavitve za zagotovitev pravilnega " "delovanja." -#: resources.h:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla je že povezan s strežnikom." -#: ../../locales/../src/interface/manual_transfer.cpp:450 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:964 -msgid "" -"FileZilla is running in kiosk mode.\n" -"'Normal' and 'Account' logontypes are not available in this mode." -msgstr "" -"FileZilla teče v načinu kiosk.\n" -"Prijavi vrste 'Navadno' in 'Račun' v tem načinu nista na voljo." - -#: ../../locales/../src/interface/Mainfrm.cpp:1494 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "Če želite uveljaviti spremembo jezika, morate ponovno zagnati FileZillo." -#: resources.h:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 +msgid "FileZilla updates" +msgstr "Posodobitve FileZilla" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "&Vrstice stanj seznama datotek" -#: ../../locales/../src/interface/edithandler.cpp:1230 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:126 -#: ../../locales/../src/interface/LocalListView.cpp:265 -#: ../../locales/../src/interface/RemoteListView.cpp:358 -#: ../../locales/../src/interface/search.cpp:379 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Ime datoteke" -#: resources.h:510 -msgid "Filename &filters..." -msgstr "&Filtri imen datotek ..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Za mapo %s in datoteko %s ni mogoče sestaviti imena datoteke" -#: ../../locales/../src/interface/RemoteListView.cpp:1858 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Filename invalid" msgstr "Ime datoteke ni veljavno" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Nespremenjeno ime datoteke" -#: resources.h:307 resources.h:954 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Ime datoteke:" -#: ../../locales/../src/interface/LocalListView.cpp:1362 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "" "Imena datotek ne smejo vsebovati nobenega od naslednjih znakov: / * ? < > |" -#: ../../locales/../src/interface/LocalListView.cpp:1337 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" @@ -3772,88 +4337,113 @@ "Imena datotek ne smejo vsebovati nobenega od naslednjih znakov: / \\ : * ? " "\" < > |" -#: resources.h:335 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Trenutno urejevane datoteke" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:131 -#: ../../locales/../src/interface/LocalListView.cpp:266 -#: ../../locales/../src/interface/RemoteListView.cpp:359 -#: ../../locales/../src/interface/search.cpp:381 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Datoteke, ki ustrezajo pravilu filtra, se odstranijo iz seznama mape." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Datotek ni mogoče najti" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Velikost" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:129 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "Zapis velikosti datotek" -#: ../../locales/../src/interface/LocalListView.cpp:267 -#: ../../locales/../src/interface/RemoteListView.cpp:360 -#: ../../locales/../src/interface/search.cpp:382 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Vrsta" -#: resources.h:942 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:133 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Povezave vrste datotek" -#: resources.h:225 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Filter se nanaša na:" -#: resources.h:816 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Filtriraj neveljavne znake v imenih datotek" -#: ../../locales/../src/interface/filteredit.cpp:356 +#: ../../locales/../src/interface/filteredit.cpp:149 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Ime filtra že obstaja" -#: resources.h:221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Izpusti vse, ki ustrezajo vsem naslednjim pogojem" -#: resources.h:222 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Izpusti vse, ki ustrezajo kateremu od naslednjih pogojev" -#: resources.h:223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Izpusti vse, ki ne ustrezajo nobenemu od naslednjih pogojev" -#: ../../locales/../src/interface/filter.cpp:366 -#: ../../locales/../src/interface/filter.cpp:427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Izpusti vse, ki ustrezajo nekaterim, ne vsem od naslednjih pogojev" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Sklop filtrov že obstaja" -#: resources.h:992 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtriraj vsebino map" -#: ../../locales/../src/interface/filteredit.cpp:338 -#: ../../locales/../src/interface/filteredit.cpp:347 -#: ../../locales/../src/interface/filteredit.cpp:356 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Overovitev filtra ni uspela" -#: resources.h:9 resources.h:33 -msgid "Fingerprint (MD5):" -msgstr "Prstni odtis (MD5):" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 +msgid "Find &files" +msgstr "Najdi &datoteke" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 +msgid "Find d&irectories" +msgstr "Najdi &mape" -#: resources.h:10 resources.h:34 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" msgstr "Prstni odtis (SHA-1):" -#: resources.h:179 resources.h:192 -msgid "Fingerprint:" -msgstr "Prstni odtis:" +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 +msgid "Fingerprint (SHA-256):" +msgstr "Prstni odtis (SHA-256):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Prstni odtisi:" -#: ../../locales/../src/interface/netconfwizard.cpp:42 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Čarovnik za nastavitev požarnega zidu in usmerjevalnika" -#: resources.h:727 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -3861,12 +4451,12 @@ "Za več podrobnosti o teh možnostih, prosimo, zaženite čarovnika za " "nastavitev omrežja." -#: resources.h:704 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 msgid "For reliability you should specify a range of at least 10 ports." msgstr "" "Zavoljo zanesljivosti je priporočljivo, da navedete obseg vsaj desetih vrat." -#: ../../locales/../src/interface/Options.cpp:212 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -3874,53 +4464,68 @@ "Za to sejo bodo uporabljene privzete nastavitve. Nobena sprememba nastavitev " "ne bo shranjena." -#: resources.h:109 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Vsili &UTF-8" -#: resources.h:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "Vsili izpis &skritih datotek" -#: ../../locales/../src/interface/Mainfrm.cpp:652 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Vsili izpis skritih datotek" -#: resources.h:771 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Lastnosti vrste datotek:" -#: resources.h:940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "Oblika: končnici sledi pravilno naveden ukaz z argumenti." -#: resources.h:469 +#. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n +#: ../../locales/../src/interface/updater.cpp:709 +#, c-format +msgid "Found new %s %s\n" +msgstr "Najden nov %s %s\n" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Funkcija %s je spodletela" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Nadaljnja dokumentacija" -#: resources.h:78 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 msgid "General" msgstr "Splošno" -#: ../../locales/../src/engine/proxy.cpp:430 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "Splošna napaka SOCKS strežnika" -#: resources.h:789 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:122 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Tvori …" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Splošen posredovalni strežnik" -#: resources.h:693 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" msgstr "Pridobi zunanji naslov IP iz naslednjega URL:" -#: resources.h:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Kako do pomoči" -#: ../../locales/../src/interface/filter.cpp:366 -#: ../../locales/../src/interface/filter.cpp:427 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" "Ime danega sklopa filtrov že obstaja, želite prepisati obstoječi sklop " @@ -3930,85 +4535,128 @@ msgid "Global bookmarks" msgstr "Splošni zaznamki" -#: resources.h:166 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 +#, c-format +msgid "GnuTLS error %d" +msgstr "Napaka GnuTLS %d" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 +#, c-format +msgid "GnuTLS error %d in %s" +msgstr "Napaka GnuTLS %d v %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 +#, c-format +msgid "GnuTLS error %d in %s: %s" +msgstr "Napaka GnuTLS %d v %s: %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 +#, c-format +msgid "GnuTLS error %d: %s" +msgstr "Napaka GnuTLS %d: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: resources.h:138 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Zelena" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Dovoljenja skupine" -#: resources.h:597 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "&visoko" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" -msgstr "HTTPS - HTTP prek TLS" +msgstr "HTTPS – HTTP prek TLS" -#: resources.h:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Izvleček:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Skrito" -#: resources.h:814 ../../locales/../src/interface/queue.cpp:910 -#: ../../locales/../src/interface/queue.cpp:997 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" -msgstr "visoka" +msgstr "Visoka" -#: ../../locales/../src/interface/queue.cpp:912 -#: ../../locales/../src/interface/queue.cpp:999 +#: ../../locales/../src/interface/queue.cpp:938 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" -msgstr "najvišja" +msgstr "Najvišja" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Najvišja vrata na voljo morajo imeti številko med 1024 in 65535." -#: resources.h:209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Za preklop stanja filtriranja na obeh straneh hkrati držite pritisnjeno " "tipko Shift." -#: resources.h:157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Domača stran:" -#: resources.h:342 -msgid "Host key fingerprint:" -msgstr "Ključ prstnega odtisa gostitelja:" +#: ../../locales/../src/engine/socket.cpp:1088 +msgid "Host is down" +msgstr "Gostitelj ni postavljen" -#: resources.h:185 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Neujemanje ključa gostitelja" -#: ../../locales/../src/engine/server.cpp:166 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Gostitelj se začne z '[', vendar manjka oglati zaklepaj." -#: ../../locales/../src/engine/proxy.cpp:439 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Gostitelj ni dosegljiv" -#: resources.h:16 resources.h:40 resources.h:121 resources.h:177 -#: resources.h:190 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Gostitelj:" -#: resources.h:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Algoritem ključa gostitelja:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "ur," -#: resources.h:889 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"&Pozabil sem svoje glavno geslo. Izbriši vsa gesla, shranjena s tem ključem." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (primer: 15:47)" -#: resources.h:731 +#: ../../locales/../src/engine/proxy.cpp:118 +msgid "IPv6 addresses are not supported with SOCKS4 proxy" +msgstr "Naslovi IPv6 niso podprti prek posredovalnega strežnika SOCKS4" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4017,13 +4665,13 @@ "Če v navedenem času ni mogoče pošiljati ali sprejemati podatkov, bo povezava " "zaprta, program FileZilla pa bo poskusil z novo povezavo." -#: resources.h:970 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Če sporočate hrošče, ob tem zagotovite tudi dnevnike z ravnijo beleženja " "\"Obširno\"." -#: resources.h:684 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" "If the automatic test at the end of this wizard succeeds, but you cannot " "transfer files to a particular server, the server might be misconfigured and " @@ -4035,7 +4683,7 @@ "poskusiti morate še v aktivnem načinu. Način prenosa lahko nastavite za vsak " "strežnik posebej v Upravljalniku." -#: resources.h:679 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:95 msgid "" "If the fallback option is enabled, you will be able to connect to " "misconfigured servers which reject the selected transfer mode." @@ -4043,7 +4691,7 @@ "Če je omogočen preklop na drug način prenosa, se boste lahko povezali na " "napačno nastavljene strežnike, ki zavračajo izbrani način povezovanja." -#: resources.h:188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4051,7 +4699,7 @@ "Če sprememba ključa gostitelja ni pričakovana, stopite v stik s skrbinkom " "sistema." -#: ../../locales/../src/interface/netconfwizard.cpp:554 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4059,7 +4707,7 @@ "Če ta težava ne izgine, nek usmerjevalnik in/ali požarni zid še naprej " "blokira FileZillo." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4067,17 +4715,17 @@ "Če ta težava ne izgine, nek usmerjevalnik in/ali požarni zid še naprej " "prekinja povezavo." -#: resources.h:959 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" -"If the size of the logfile reaches the limit, it gets renamed by adding \".1" -"\" to the end of the filename (possibly overwriting older logfiles) and a " -"new file gets created." +"If the size of the logfile reaches the limit, it gets renamed by adding " +"\".1\" to the end of the filename (possibly overwriting older logfiles) and " +"a new file gets created." msgstr "" "Če velikost dnevniške datoteke doseže omejitev, je preimenovana z dodajanjem " "\".1\" na konec imena datoteke (prepiše starejše dnevniške datoteke s " "takšnim imenom), ustvari pa se nova dnevniška datoteka." -#: resources.h:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4085,7 +4733,7 @@ "Če simbolična povezava kaže v mapo, lahko FileZilla izbriše simbolično " "povezavo ali odstrani vsebino povezane mape." -#: ../../locales/../src/interface/netconfwizard.cpp:624 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4093,13 +4741,14 @@ "Če ta težava ne izgine, prosimo, da za rešitev povprašate izdelovalca " "svojega usmerjevalnika ali požarnega zidu." -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Če ta težava ne izgine, prosimo, povprašajte izdelovalca svojega " "usmerjevalnika." -#: resources.h:278 resources.h:853 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4109,7 +4758,7 @@ "sinhroniziran s strežnikom. Če se čas razlikuje (npr. drug časovni pas), " "določite zamik časovnega pasu v upravljalniku strežnikov." -#: resources.h:913 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4117,11 +4766,11 @@ "Pri primerjanju na osnovi časovnega žiga šteje datoteki za enaki, če je " "razlika med njunima časovnima žigoma v okviru tega praga." -#: resources.h:928 -msgid "If you change the language, you should restart FileZilla." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 +msgid "If you change the language, you need to restart FileZilla." msgstr "Če spremenite jezik, morate FileZillo ponovno zagnati." -#: resources.h:710 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" "If you click on test, FileZilla will connect to probe.filezilla-project.org " "and will perform some simple tests." @@ -4129,22 +4778,22 @@ "Če kliknete na preizkus, se bo FileZilla povezala s probe.filezilla-project." "org in izvedla nekaj enostavnih preizkusov." -#: ../../locales/../src/interface/Mainfrm.cpp:1131 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Če zaprete FileZillo, bodo spremembe izgubljene." -#: resources.h:829 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "" "Če vnesete napačne vrste datotek, se lahko te datoteke ob prenosu okvarijo." -#: resources.h:711 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." msgstr "Če pride do napak, vaše nastavitve niso pravilne." -#: resources.h:743 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4152,7 +4801,7 @@ "Če imate težave s pridobivanjem vsebine map ali s prenosom datotek, " "poskusite spremeniti privzeti način prenosa." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4163,7 +4812,7 @@ "poskusite preklopiti v pasivni način in vprašati upravitelja strežnika za " "pomoč." -#: resources.h:670 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:24 msgid "" "If you successfully complete the wizard and the final test succeeds, any " "firewalls and routers you have should be configured properly." @@ -4171,7 +4820,7 @@ "Če se čarovnik uspešno dokonča in zaključni preizkus uspe, bi morali biti " "pravilno konfigurirani vsi požarni zidovi in usmerjevalniki." -#: resources.h:706 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:323 msgid "" "If you use a firewall, make sure FileZilla is allowed to accept connection " "on all given ports." @@ -4179,7 +4828,7 @@ "Če uporabljate požarni zid, preverite, da lahko FileZilla sprejema povezave " "na vseh danih vratih." -#: resources.h:705 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:318 msgid "" "If you use a router, make sure all these ports are forwarded to the machine " "you're running FileZilla on." @@ -4187,7 +4836,7 @@ "Če uporabljate usmerjevalnik, preverite, da se vsa ta vrata posredujejo " "računalniku, na katerem zaganjate FileZillo." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4195,25 +4844,25 @@ "Če bo vaš usmerjevalnik še naprej zamenjaval naslov IP, prosimo, povprašajte " "proizvajalca svojega usmerjevalnika." -#: ../../locales/../src/interface/import.cpp:96 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Uvozi podatke iz starejše različice" -#: resources.h:297 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Uvozi nastavitve" #: ../../locales/../src/interface/import.cpp:81 -#: ../../locales/../src/interface/import.cpp:84 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" -msgstr "Uvoz uspešen." +msgstr "Uvoz uspešen" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50 -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 msgid "Improperly quoted association." msgstr "Nepravilno navedena povezava." -#: resources.h:698 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" "In active mode, FileZilla has to listen on a port for data transfers. You " "have to specify which ports FileZilla will use." @@ -4221,7 +4870,7 @@ "V aktivnem načinu mora FileZilla poslušati na vratih za prenos podatkov. " "Navesti morate, katera vrata bo FileZilla uporabljala." -#: resources.h:700 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:276 msgid "" "In case you have a router, you will have to forward all available ports, as " "FileZilla has no influence on the ports your system chooses." @@ -4229,15 +4878,8 @@ "Če imate usmerjevalnik, morate posredovati vsa vrata, ki so na voljo, saj " "FileZilla nima vpliva na to, katera vrata izbira vaš sistem." -#: resources.h:254 -msgid "" -"In case you prefer automatic updates, you can enable automatic update checks " -"in the settings dialog." -msgstr "" -"Če imate raje samodejne posodobitve, lahko omogočite samodejno preverjanje " -"obstoja posodobitev v pogovornem oknu nastavitev." - -#: resources.h:688 resources.h:752 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4245,7 +4887,7 @@ "Da bi lahko uporabili aktivni način, mora FileZilla poznati vaš notranji " "naslov IP." -#: resources.h:673 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:52 msgid "" "In passive mode, which is recommended for most users, FileZilla asks the " "server for a port and connects to the given port. Not much configuration has " @@ -4255,52 +4897,63 @@ "strežnik za vrata in se poveže na dana vrata. Za to ni potrebnih nobenih " "posebnih nastavitev." -#: ../../locales/../src/engine/tlssocket.cpp:894 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Nepopolna veriga, vrhnje potrdilo ni samopodpisano potrdilo avtoritete " -"podpisov" - -#: ../../locales/../src/interface/QueueView.cpp:1050 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Nepravilno geslo" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 +msgid "" +"Information about the latest version of FileZilla could not be retrieved. " +"Please try again later." +msgstr "" +"Informacij o najnovejši različici FileZille ni mogoče pridobiti. Poskusite " +"znova kasneje." + +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Inicializacija TLS ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 +msgid "Insecure algorithm!" +msgstr "Algoritem ni varen!" + +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." -msgstr "" +msgstr "Strežnik ni varen, ne podpira FTP prek TLS." -#: ../../locales/../src/engine/server.cpp:846 -#: ../../locales/../src/engine/server.cpp:865 -#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/engine/server.cpp:581 +#: ../../locales/../src/engine/server.cpp:605 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" -msgstr "interaktivna" +msgstr "Interaktivna" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:126 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 msgid "Interface" msgstr "Vmesnik" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/QueueView.cpp:1007 -#: ../../locales/../src/interface/QueueView.cpp:1581 +#: ../../locales/../src/engine/socket.cpp:1074 +msgid "Interrupted by signal" +msgstr "Prekinil signal" + +#: ../../locales/../src/engine/ControlSocket.cpp:216 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Prekinil uporabnik" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:772 +#: ../../locales/../src/engine/http/request.cpp:40 +#: ../../locales/../src/engine/http/request.cpp:388 msgid "Invalid Content-Length" msgstr "Neveljavna dolžina vsebine" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:623 +#: ../../locales/../src/engine/http/request.cpp:271 msgid "Invalid HTTP Response" msgstr "Neveljaven odziv HTTP" -#: ../../locales/../src/engine/ControlSocket.cpp:544 -#: ../../locales/../src/engine/ControlSocket.cpp:604 +#: ../../locales/../src/engine/socket.cpp:1062 +msgid "Invalid argument passed" +msgstr "Podan neveljaven argument" + +#: ../../locales/../src/engine/ControlSocket.cpp:454 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4308,111 +4961,152 @@ "Prejeto neveljavno zaporedje znakov, sledi onemogočanje UTF-8. Izberite " "možnost UTF-8 v upravljalniku strežnikov za vsiljenje UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:896 +#: ../../locales/../src/engine/http/request.cpp:498 msgid "Invalid chunk size" msgstr "Neveljavna velikost koščka" -#: ../../locales/../src/interface/netconfwizard.cpp:353 -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Prejeti neveljavni podatki" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 -#: ../../locales/../src/interface/verifycertdialog.cpp:48 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Neveljaven datum" -#: ../../locales/../src/interface/LocalListView.cpp:1337 -#: ../../locales/../src/interface/LocalListView.cpp:1362 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Neveljavno ime datoteke" -#: ../../locales/../src/engine/server.cpp:173 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Neveljaven izvleček: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Neveljaven gostitelj, po oglatem zaklepaju lahko sledita le dvopičje in " "številka vrat." -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Neveljavno ime gostitelja: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Neveljaven vnos" -#: ../../locales/../src/engine/server.cpp:61 -#: ../../locales/../src/engine/server.cpp:194 -#: ../../locales/../src/engine/server.cpp:206 +#: ../../locales/../src/engine/http/request.cpp:330 +msgid "Invalid line" +msgstr "Neveljavna vrstica" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Neveljavna pot" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Podana so bila neveljavna vrata. Vrednost vrat mora biti število med 1 in " "65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" -"ftp:// for normal FTP,\n" +"ftp:// for normal FTP with optional encryption,\n" "sftp:// for SSH file transfer protocol,\n" -"ftps:// for FTP over SSL (implicit) and\n" -"ftpes:// for FTP over SSL (explicit)." +"ftps:// for FTP over TLS (implicit) and\n" +"ftpes:// for FTP over TLS (explicit)." msgstr "" "Naveden je neveljaven protokol. Veljavni protokoli so:\n" -"ftp:// za navaden FTP,\n" +"ftp:// za navaden FTP z možnostjo šifriranja,\n" "sftp:// za protokol prenosa datotek SSH,\n" -"ftps:// za FTP prek SSL (implicitno) in\n" -"ftpes:// za FTP prek SSL (eksplicitno)." +"ftps:// za FTP prek TLS (implicitno) in\n" +"ftpes:// za FTP prek TLS (eksplicitno)." + +#: ../../locales/../src/engine/ftp/logon.cpp:70 +msgid "" +"Invalid proxy host, after closing bracket only colon and port may follow." +msgstr "" +"Neveljaven gostitelj posredovalnega strežnika, po oglatem zaklepaju lahko " +"sledita le dvopičje in številka vrat." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Neveljaven regularni izraz" -#: ../../locales/../src/interface/search.cpp:698 +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Neveljaven regularni izraz v iskalnih pogojih." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/http/request.cpp:280 msgid "Invalid response code" msgstr "Neveljavna odzivna koda" -#: ../../locales/../src/interface/search.cpp:692 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Neveljavni pogoji iskanja: %s" -#: ../../locales/../src/interface/sitemanager.cpp:419 -#: ../../locales/../src/interface/sitemanager.cpp:439 -#: ../../locales/../src/interface/sitemanager.cpp:456 -#: ../../locales/../src/interface/sitemanager.cpp:463 -#: ../../locales/../src/interface/sitemanager.cpp:470 -#: ../../locales/../src/interface/sitemanager.cpp:487 -#: ../../locales/../src/interface/sitemanager.cpp:556 -#: ../../locales/../src/interface/sitemanager.cpp:735 -#: ../../locales/../src/interface/sitemanager.cpp:742 -#: ../../locales/../src/interface/sitemanager.cpp:822 -#: ../../locales/../src/interface/sitemanager.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Neveljavna pot na strežniku" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Neustrezna velikost v pogoju" -#: ../../locales/../src/engine/server.cpp:136 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Podano uporabniško ime ni veljavno." -#: ../../locales/../src/interface/verifycertdialog.cpp:189 +#: ../../locales/../src/engine/socket.cpp:1095 +msgid "Invalid value for ai_flags" +msgstr "Neveljavna vrednost za ai_flags" + +#: ../../locales/../src/engine/socket.cpp:1097 +msgid "Invalid value for hints" +msgstr "Neveljavna vrednost za namige" + +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Preobrni filter" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Država sodne oblasti:" -#: ../../locales/../src/interface/verifycertdialog.cpp:191 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Kraj sodne oblasti:" -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Pokrajina sodne oblasti:" -#: resources.h:910 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Obdrži mape na vrhu" -#: ../../locales/../src/interface/Mainfrm.cpp:656 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4422,106 +5116,154 @@ "sezname, če vključite to možnost. Čeprav FileZilla izvaja nekatere preizkuse " "za preverjanje, če strežnik to podpira, morda preizkus ne bo uspel." -#: resources.h:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Izmenjava ključev" -#: resources.h:600 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 +msgid "Key exchange:" +msgstr "Izmenjava ključev:" + +#: ../../locales/../src/engine/server.cpp:578 +#: ../../locales/../src/engine/server.cpp:603 +msgid "Key file" +msgstr "Datoteka ključa" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Identifikator ključa:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "Naj&nižje" -#: resources.h:926 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:131 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Jezik" -#: ../../locales/../src/interface/Mainfrm.cpp:1494 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Jezik spremenjen" -#: ../../locales/../src/interface/LocalListView.cpp:268 -#: ../../locales/../src/interface/RemoteListView.cpp:361 -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Zadnjič spremenjeno" -#: resources.h:856 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Postavitev" -#: resources.h:802 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1825 +msgid "Leave empty to keep existing password." +msgstr "Pustite prazno, če želite obdržati obstoječe geslo." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Omejitev hkratnih prenosov &s strežnika:" -#: resources.h:804 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Omejitev hkratnih prenosov &na strežnik:" -#: resources.h:747 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Omeji krajevna vrata" -#: resources.h:956 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Omeji velikost dnevniške datoteke" -#: resources.h:957 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Omejitev:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/http/request.cpp:453 msgid "Line length exceeded" msgstr "Dolžina vrstice presežena" -#: resources.h:167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Povezano z" -#: ../../locales/../src/interface/netconfwizard.cpp:267 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Vrata za poslušanje zaprta" -#: ../../locales/../src/engine/logging.cpp:220 -#: ../../locales/../src/interface/StatusView.cpp:296 -#: ../../locales/../src/interface/StatusView.cpp:361 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "Seznam:" -#: resources.h:750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "&Najnižja vrata na voljo:" -#: ../../locales/../src/interface/edithandler.cpp:1278 -#: ../../locales/../src/interface/edithandler.cpp:1532 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Krajevno" -#: resources.h:364 +#: ../../locales/../src/engine/socket.cpp:1059 +msgid "Local address in use" +msgstr "Krajevni naslov je v rabi" + +#: ../../locales/../src/engine/socket.cpp:1087 +msgid "Local endpoint has been closed" +msgstr "Krajevna zaključna točka je zaprta" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Krajevna datoteka" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Krajevna datoteka ne obstaja." -#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 +#, c-format +msgid "Local file is %s\n" +msgstr "Krajevna datoteka je %s\n" + +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Krajevna datoteka je mapa in ne navadna datoteka." -#: ../../locales/../src/interface/manual_transfer.cpp:369 -#, fuzzy +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." -msgstr "Datoteke ni mogoče uvoziti, saj ni veljavna datoteka XML." +msgstr "Krajevna datoteka ni veljavno ime datoteke." + +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Iskanje krajevnih datotek" -#: resources.h:203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Krajevni filtri:" -#: ../../locales/../src/interface/viewheader.cpp:347 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Obravnava krajevne poti:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Krajevni strežnik:" -#: ../../locales/../src/interface/verifycertdialog.cpp:183 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "Lokalna velikost '%s' se ne ujema s pričakovano velikostjo: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Krajevnost:" @@ -4529,382 +5271,480 @@ msgid "Log file" msgstr "Dnevniška datoteka" -#: resources.h:251 -msgid "Log of update check:" -msgstr "Dnevnik preverjanja obstoja posodobitev:" +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Prijavljeni" -#: resources.h:951 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:140 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Beleženje" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." msgstr "" +"Prijavni podatki vsebujejo ne-ASCII znake in strežnik morda ne podpira " +"UFT-8. Ker uporabljate posredovalni strežnik, povrnitev na krajevni nabor " +"znakov ni možna." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." msgstr "" +"Prijavni podatki vsebujejo ne-ASCII znake in strežnik morda ne podpira " +"UFT-8. Sledi poskus povrnitve na krajevni nabor znakov." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" "Prijavno zaporedje v celoti izvedeno, vendar še vedno niste prijavljeni. " "Sledi prekinitev." -#: ../../locales/../src/interface/cmdline.cpp:95 +#: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." msgstr "" "Vrsta prijave (logontype) mora biti 'ask' ali 'interactive' (brez " "narekovajev)." -#: ../../locales/../src/interface/cmdline.cpp:10 +#: ../../locales/../src/interface/cmdline.cpp:11 #, c-format msgid "" "Logontype, can only be used together with FTP URL. Argument has to be either " "'%s' or '%s'" msgstr "" -"Vrsta prijave (logontype) lahko uporabite le z FTP URL. Argument mora biti '%" -"s' ali '%s'." +"Vrsta prijave (logontype) lahko uporabite le s FTP URL. Argument mora biti " +"'%s' ali '%s'" -#: ../../locales/../src/interface/queue.cpp:905 -#: ../../locales/../src/interface/queue.cpp:992 +#: ../../locales/../src/interface/queue.cpp:931 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" -msgstr "nizko" +msgstr "Nizko" -#: ../../locales/../src/interface/queue.cpp:903 -#: ../../locales/../src/interface/queue.cpp:990 +#: ../../locales/../src/interface/queue.cpp:929 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" -msgstr "najnižje" +msgstr "Najnižje" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "Najnižja vrata na voljo morajo imeti številko med 1024 in 65535." -#: resources.h:20 resources.h:44 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:220 msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:63 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Preverite, da je do datoteke mogoče dostopati in da gre za pravilno " "oblikovan dokument XML." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:827 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:839 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:854 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:896 +#: ../../locales/../src/engine/http/request.cpp:440 +#: ../../locales/../src/engine/http/request.cpp:453 +#: ../../locales/../src/engine/http/request.cpp:464 +#: ../../locales/../src/engine/http/request.cpp:498 #, c-format msgid "Malformed chunk data: %s" msgstr "Nepravilno oblikovan kos podatkov: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:772 +#: ../../locales/../src/engine/http/request.cpp:40 +#, c-format +msgid "Malformed request header: %s" +msgstr "Nepravilno oblikovana glava zahteve: %s" + +#: ../../locales/../src/engine/http/request.cpp:517 #, c-format -msgid "Malformed header: %s" -msgstr "Nepravilno oblikovana glava: %s" +msgid "Malformed response body: %s" +msgstr "Nepravilno oblikovano telo odgovora: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:593 -msgid "Malformed reply, server not sending proper line endings" +#: ../../locales/../src/engine/http/request.cpp:241 +#: ../../locales/../src/engine/http/request.cpp:247 +#: ../../locales/../src/engine/http/request.cpp:330 +#: ../../locales/../src/engine/http/request.cpp:380 +#: ../../locales/../src/engine/http/request.cpp:388 +#: ../../locales/../src/engine/http/request.cpp:446 +#, c-format +msgid "Malformed response header: %s" +msgstr "Nepravilno oblikovana glava odgovora: %s" + +#: ../../locales/../src/engine/http/request.cpp:401 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." msgstr "" -"Nepravilno oblikovan odgovor, strežnik ne pošilja pravilnih prelomov vrstic" +"Nepravilno oblikovan odgovor: Stežnik je poslal telo odgovora z glagolom " +"zahteve ali odzivno kodo, ki ne dovoljuje telesa odgovora." -#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 #: ../../locales/../src/interface/manual_transfer.cpp:323 -#: ../../locales/../src/interface/manual_transfer.cpp:328 -#: ../../locales/../src/interface/manual_transfer.cpp:336 -#: ../../locales/../src/interface/manual_transfer.cpp:343 -#: ../../locales/../src/interface/manual_transfer.cpp:350 -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Ročni prenos" -#: resources.h:434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "&Glavno geslo:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Glavno geslo:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" -msgstr "ustrezajo vsem naslednjim pogojem" +msgstr "Ustrezajo vsem naslednjim pogojem" -#: resources.h:435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" -msgstr "ustrezajo poljubnemu izmed naslednjih pogojev" +msgstr "Ustrezajo poljubnemu izmed naslednjih pogojev" -#: resources.h:436 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" -msgstr "ne ustrezajo nobenemu od naslednjih pogojev" +msgstr "Ne ustrezajo nobenemu od naslednjih pogojev" -#: resources.h:800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Ustrezajo nekaterim od naslednjih pogojev" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Največ hkra&tnih prenosov:" -#: ../../locales/../src/interface/Mainfrm.cpp:375 -#: ../../locales/../src/interface/Mainfrm.cpp:1826 +#: ../../locales/../src/engine/socket.cpp:1101 +msgid "Memory allocation failure" +msgstr "Spodletelo dodeljevanje pomnilnika" + +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Dnevnik sporočil" -#: resources.h:867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Položaj dnevnika sporočil" -#: resources.h:958 +#: ../../locales/../src/engine/socket.cpp:1084 +msgid "Message too large" +msgstr "Sporočilo je preveliko" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MB" -#: resources.h:97 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "minut" -#: resources.h:358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Premakni navz&dol" -#: resources.h:357 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Premakni navz&gor" -#: ../../locales/../src/interface/LocalTreeView.cpp:1074 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Moj računalnik" -#: ../../locales/../src/interface/LocalTreeView.cpp:1064 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Moji dokumenti" -#: ../../locales/../src/interface/sitemanager.cpp:290 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:717 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:719 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:772 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:775 msgid "My Sites" msgstr "Moji naslovi" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:176 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:178 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" -msgstr "ni na voljo" +msgstr "Ni na voljo" -#: resources.h:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Ime" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1264 msgid "Name already exists" msgstr "Ime že obstaja" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 -#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Ime zaznamka že obstaja." -#: resources.h:120 resources.h:168 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Ime:" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +msgid "Natural sort" +msgstr "Naravno sortiranje" + +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Vnesite ime filtra" -#: ../../locales/../src/interface/search.cpp:682 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Vnesti morate veljavno krajevno pot" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Vnesti morate veljavno oddaljeno pot" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1049 msgid "Need to specify a character encoding" msgstr "Kodiranje znakov mora biti izbrano" -#: ../../locales/../src/engine/proxy.cpp:436 +#: ../../locales/../src/engine/socket.cpp:1105 +msgid "Neither nodename nor servname provided, or not known" +msgstr "" +"Ime vozlišča (nodename) in ime strežnika (servname) nista podana ali nista " +"znana" + +#: ../../locales/../src/engine/socket.cpp:1092 +msgid "" +"Network host does not have any network addresses in the requested address " +"family" +msgstr "Omrežni gostitelj nima omrežnih naslovov v zahtevani družini naslovov" + +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Omrežje ni dostopno" -#: resources.h:73 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 +msgid "Never" +msgstr "Nikoli" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 msgid "New &Folder" msgstr "Nova ma&pa" -#: resources.h:494 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" msgstr "Nov &zavihek" -#: resources.h:74 resources.h:414 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nov &zaznamek" -#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:76 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:83 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:108 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:453 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:557 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:580 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 -#: ../../locales/../src/interface/sitemanager.cpp:759 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2434 msgid "New bookmark" msgstr "Nov zaznamek" -#: ../../locales/../src/interface/LocalTreeView.cpp:1192 -#: ../../locales/../src/interface/RemoteListView.cpp:1582 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1289 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1340 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Nova mapa" -#: ../../locales/../src/interface/welcome_dialog.cpp:50 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Nove zmožnosti in izboljšave v %s" -#: ../../locales/../src/interface/filteredit.cpp:129 +#: ../../locales/../src/interface/filteredit.cpp:131 msgid "New filter" msgstr "Nov filter" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:913 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:953 msgid "New folder" msgstr "Nova mapa" -#: ../../locales/../src/interface/sitemanager.cpp:622 -#: ../../locales/../src/interface/sitemanager.cpp:636 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2407 msgid "New site" msgstr "Nov naslov" -#: resources.h:865 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Poleg vrste prenosov" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:389 msgid "No" msgstr "Ne" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/engine/socket.cpp:1103 +msgid "No address associated with nodename" +msgstr "S tem imenom vozlišča ni povezan noben naslov" + +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Nobena kategorija izvoza ni izbrana" -#: ../../locales/../src/interface/QueueView.cpp:2227 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." msgstr "Ukaz ni bil podan, prekinjanje." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Ker zunanji naslov IP ni nastavljen, poskušamo s privzetim." -#: ../../locales/../src/interface/edithandler.cpp:1219 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Nobena datoteka trenutno ni v urejanju." -#: ../../locales/../src/interface/filteredit.cpp:141 +#: ../../locales/../src/interface/filteredit.cpp:143 msgid "No filter name given" msgstr "Ime filtra ni podano" -#: ../../locales/../src/engine/server.cpp:76 -#: ../../locales/../src/engine/server.cpp:187 -#: ../../locales/../src/engine/server.cpp:216 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Gostitelj ni podan, prosimo, vnesite gostitelja." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:101 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Slike niso na voljo" -#: ../../locales/../src/interface/QueueView.cpp:3070 -msgid "No more files in the queue!" -msgstr "V vrsti ni več datotek!" - -#: ../../locales/../src/interface/filter.cpp:351 -#: ../../locales/../src/interface/filter.cpp:420 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Ime za sklop filtrov ni podano." -#: resources.h:430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "S to vrsto datoteke ni povezan noben program" -#: resources.h:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "Za urejanje datotek s končnico '%s' ni trenutno povezan noben program." -#: ../../locales/../src/interface/search.cpp:540 +#: ../../locales/../src/engine/socket.cpp:1079 +msgid "No route to host" +msgstr "Ni poti do gostitelja" + +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Ni rezultatov iskanja" -#: ../../locales/../src/interface/sitemanager.cpp:256 -#: ../../locales/../src/interface/sitemanager.cpp:268 -#: ../../locales/../src/interface/sitemanager.cpp:299 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Ni strežnikov na voljo" -#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Nobena metoda overjanja SOCKS5 ni podprta" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Uporabniško ime ni podano." -#: resources.h:920 resources.h:925 -#: ../../locales/../src/interface/verifycertdialog.cpp:54 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Brez" -#: resources.h:374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Nič še ni izbrano" -#: resources.h:813 ../../locales/../src/engine/server.cpp:842 -#: ../../locales/../src/engine/server.cpp:861 -#: ../../locales/../src/interface/manual_transfer.cpp:160 -#: ../../locales/../src/interface/manual_transfer.cpp:185 -#: ../../locales/../src/interface/manual_transfer.cpp:557 -#: ../../locales/../src/interface/queue.cpp:908 -#: ../../locales/../src/interface/queue.cpp:995 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287 +#: ../../locales/../src/engine/socket.cpp:1099 +msgid "Nonrecoverable failure in name resolution" +msgstr "Neobnovljiva napaka pri razločevanju imena" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:572 +#: ../../locales/../src/engine/server.cpp:599 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 +#: ../../locales/../src/interface/queue.cpp:996 msgid "Normal" -msgstr "običajna" +msgstr "Običajna" -#: ../../locales/../src/interface/queueview_failed.cpp:326 -#: ../../locales/../src/interface/queueview_failed.cpp:351 -msgid "Not all items could be requeued for viewing/editing." -msgstr "" -"Vseh datotek ni mogoče ponovno postaviti v vrsto za ogledovanje/urejanje." +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 +msgid "Not all items could be requeued for transfer." +msgstr "Vseh datotek ni mogoče ponovno postaviti v vrsto za prenos." -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:504 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Nepovezani" -#: ../../locales/../src/interface/RemoteListView.cpp:2311 +#: ../../locales/../src/interface/RemoteListView.cpp:2059 msgid "Not connected to any server" msgstr "Niste povezani z nobenim strežnikom" -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Niste povezani z nobenim strežnikom." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Nepovezani." -#: ../../locales/../src/interface/Mainfrm.cpp:654 +#: ../../locales/../src/engine/socket.cpp:1120 +msgid "Not initialized, need to call WSAStartup" +msgstr "Ni inicializirano, potreben je klic WSAStartup" + +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Upoštevajte, da je to podprto le pri uporabi protokola FTP." -#: resources.h:781 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Opomba: izgubljenega ključa ni mogoče obnoviti." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Opomba: To deluje le z navadnimi, nešifriranimi povezavami FTP." -#: resources.h:798 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Opomba: Uporaba splošnega posredovalnega strežnika vsili pasivni način pri " "povezavah FTP." -#: resources.h:899 +#: ../../locales/../src/engine/http/request.cpp:247 +#: ../../locales/../src/engine/http/request.cpp:446 +msgid "Null character in line" +msgstr "Ničelni znak v vrstici" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Število decimalnih mest:" @@ -4912,21 +5752,48 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Število ponovnih poskusov mora biti med 0 in 99." -#: resources.h:333 -msgid "O&pen file" -msgstr "&Odpri datoteko" - -#: resources.h:24 resources.h:46 resources.h:68 resources.h:130 -#: resources.h:152 resources.h:173 resources.h:183 resources.h:196 -#: resources.h:211 resources.h:228 resources.h:279 resources.h:288 -#: resources.h:295 resources.h:303 resources.h:326 resources.h:334 -#: resources.h:353 resources.h:359 resources.h:392 resources.h:406 -#: resources.h:428 resources.h:451 resources.h:460 resources.h:474 -#: resources.h:487 resources.h:724 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "O&dpri" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 +#: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "V redu" -#: resources.h:680 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 +msgid "OS version:" +msgstr "Različica OS:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " "well as the fallback mode if enabled." @@ -4934,119 +5801,191 @@ "Na naslednjih straneh boste nastavili izbrani način prenosa, kot tudi " "preklop na rezervni način, če je omogočen." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "Once" msgstr "Enkrat" -#: resources.h:950 -msgid "" -"Only the versions of FileZilla and the operating system you are using will " -"be submitted to the server." -msgstr "" -"Strežniku bo posredovana le različica FileZille in operacijski sistem, ki ga " -"uporabljate." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 +msgid "Once a day" +msgstr "Enkrat dnevno" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 +msgid "Once a week" +msgstr "Enkrat tedensko" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:544 +msgid "Only use plain FTP (insecure)" +msgstr "Uporabi le navadni FTP (ni varno)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Odpr&i datoteko" -#: resources.h:649 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Odpri mapo v raziskovalcu sistema" -#: resources.h:972 resources.h:973 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Odpri Upravljalnika strežnikov" -#: resources.h:563 +#: ../../locales/../src/interface/toolbar.cpp:31 +msgid "Open the Site Manager." +msgstr "Odpri Upravljalnika strežnikov." + +#: ../../locales/../src/interface/toolbar.cpp:33 +msgid "Open the Site Manager. Right-click for a list of sites." +msgstr "" +"Odprite Upravitelja strežnikov. Z desnim klikom se odpre seznam spletišč." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Odprite pogovorno okno dovoljenj dostopa do mape, da nastavite lokalne mape, " +"do katerih ima FileZilla dostop." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Odpri datoteko." -#: resources.h:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 msgid "Open the settings dialog of FileZilla" msgstr "Odpri pogovorno okno nastavitev FileZille" -#: resources.h:309 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Odprta kot:" -#: ../../locales/../src/interface/LocalListView.cpp:2029 -#: ../../locales/../src/interface/LocalListView.cpp:2074 -#: ../../locales/../src/interface/LocalListView.cpp:2161 -#: ../../locales/../src/interface/LocalListView.cpp:2174 -#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Odpiranje ni uspelo" -#: resources.h:495 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 msgid "Opens a new tab" msgstr "Odpre nov zavihek" -#: resources.h:492 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 msgid "Opens the Site Manager" msgstr "Odpre upravljlanik strežnikov" -#: resources.h:993 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Odpre pogovorno okno filtra izpisa mape. Z desnim klikom preklapljate filtre." -#: resources.h:171 -msgid "Operating system" -msgstr "Operacijski sistem" - -#: ../../locales/../src/interface/FileZilla.cpp:306 -msgid "Operating system problem detected" -msgstr "Pojavila se je težava z operacijskim sistemom" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 +msgid "Operating System:" +msgstr "Operacijski sistem:" + +#: ../../locales/../src/engine/socket.cpp:1070 +msgid "Operation already in progress" +msgstr "Dejanje je že v teku" + +#: ../../locales/../src/engine/socket.cpp:1061 +msgid "Operation in progress" +msgstr "Operacija je v teku" + +#: ../../locales/../src/engine/socket.cpp:1082 +msgid "Operation not supported" +msgstr "Opravilo ni podprto" + +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Možnosti" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Oranžna" -#: ../../locales/../src/interface/verifycertdialog.cpp:177 +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Organizacija:" -#: ../../locales/../src/interface/verifycertdialog.cpp:199 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 +msgid "Other SFTP options" +msgstr "Druge možnosti SFTP" + +#: ../../locales/../src/engine/socket.cpp:1115 +msgid "Other system error" +msgstr "Druga sistemska napaka" + +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Drugo:" -#: resources.h:726 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 +msgid "Out of memory" +msgstr "Pomanjkanje pomnilnika" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Pregled" -#: resources.h:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Prepiši, &če je vir novejši" -#: resources.h:260 resources.h:270 resources.h:836 resources.h:845 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Prepiši datoteko" -#: resources.h:262 resources.h:272 resources.h:838 resources.h:847 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Prepiši, če sta različne velikosti" -#: resources.h:263 resources.h:273 resources.h:839 resources.h:848 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Prepiši, če sta različne velikosti ali če je vir novejši" -#: resources.h:261 resources.h:271 resources.h:837 resources.h:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Prepiši, če je vir novejši" -#: resources.h:60 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Prepiši, če sta &različne velikosti" -#: resources.h:61 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" -msgstr "Prepiši, če sta &različne velikosti" +msgstr "Prepiši, če sta ra&zlične velikosti ali če je vir novejši" + +#: ../../locales/../src/interface/updater.cpp:259 +#, c-format +msgid "Own build type: %s\n" +msgstr "Lastna vrsta gradnje: %s\n" -#: resources.h:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Dovoljenja lastnika" -#: ../../locales/../src/interface/RemoteListView.cpp:363 -#: ../../locales/../src/interface/search.cpp:385 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Lastnik/skupina" -#: resources.h:871 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5054,94 +5993,113 @@ "Prepreči sistemu, da bi vstopil v stanje &mirovanja med prenosi in drugimi " "dejanji" -#: resources.h:778 resources.h:794 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "&Gostitelj posredovalnega strežnika:" -#: ../../locales/../src/interface/netconfwizard.cpp:488 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Ukaz PORT je onečedil usmerjevalnik ali požarni zid." -#: resources.h:740 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Pa&sivni (priporočeno)" -#: ../../locales/../src/interface/updatewizard.cpp:324 -msgid "Package" -msgstr "Paket" - -#: ../../locales/../src/interface/Mainfrm.cpp:2451 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Parameter ni veljavni URL" -#: resources.h:85 resources.h:383 resources.h:718 +#: ../../locales/../src/interface/updater.cpp:595 +#, c-format +msgid "Parsing %d bytes of version information.\n" +msgstr "Razčlenjevanje %d bajtov podatkov o različici.\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Ge&slo:" -#: resources.h:676 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" msgstr "Pasivni (priporočeno)" -#: resources.h:760 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:119 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Pasivni način" -#: ../../locales/../src/interface/netconfwizard.cpp:588 -#: ../../locales/../src/interface/netconfwizard.cpp:601 -#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Pasiven način je nastavljen kot privzeti način prenosa." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Geslo oz. šifrirni ključ ni določen" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Potrebno je geslo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:146 -#: ../../locales/../src/interface/search.cpp:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Gesla" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Pot" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Za mapo %s in podmapo %s ni mogoče izdelati poti" -#: resources.h:401 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 +msgid "Path not found:" +msgstr "Poti ni mogoče najti:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Poti" -#: ../../locales/../src/interface/edithandler.cpp:1257 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 #: ../../locales/../src/interface/edithandler.cpp:1400 -#: ../../locales/../src/interface/edithandler.cpp:1499 -#: ../../locales/../src/interface/edithandler.cpp:1512 msgid "Pending removal" msgstr "Čaka na odstranitev" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:141 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Dovoljenje" -#: ../../locales/../src/interface/RemoteListView.cpp:362 -#: ../../locales/../src/interface/search.cpp:384 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 +msgid "Permission denied" +msgstr "Ni ustreznih dovoljenj" + +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Dovoljenja" -#: resources.h:170 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Platforma:" -#: resources.h:250 -msgid "" -"Please check https://filezilla-project.org/ for the most recent version of " -"FileZilla." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." msgstr "" -"Prosimo, preverite na https://filezilla-project.org/ za najnovejšo različico " -"FileZille." +"Dodajte krajevne podatkovne mape, ki jih želite uporabljati s FileZillo." -#: ../../locales/../src/interface/netconfwizard.cpp:553 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5149,15 +6107,15 @@ "Prosimo, preverite na https://filezilla-project.org/probe.php, da strežnik " "deluje in znova podrobno preverite svoje nastavitve." -#: ../../locales/../src/interface/updatewizard.cpp:1076 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 msgid "" -"Please check the package manager of your system for an updated package or " -"visit https://filezilla-project.org/ to download the source code of FileZilla." +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." msgstr "" -"Preverite paketnega upravljalnik svojega sistema za posodobljen paket ali " -"obiščite https://filezilla-project.org/ za prenos izvorne kode FileZille." +"Prosimo, da v pogovornem oknu, ki sledi, preverite dodeljena dovoljenja in " +"ponovno dodate morebitne manjkajoče lokalne mape, ki jih uporabljate." -#: resources.h:682 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " "outgoing connection to arbitrary ports." @@ -5165,13 +6123,13 @@ "Prosimo, nastavite požarni zid in usmerjevalnik tako, da lahko FileZilla " "vzpostavi odhodno povezavo na poljubnih vratih." -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Na svojem usmerjevalniku, prosimo, onemogočite nastavitve, kot so 'Način " "DMZ' ali 'Igralni način'." -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5179,45 +6137,45 @@ "Prosimo, zagotovite, da imate stabilno spletno povezavo in previdno znova " "preverite svoje nastavitve." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 msgid "Please enter a custom date format." msgstr "Prosimo, vnesite zapis datuma po meri." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 msgid "Please enter a custom time format." msgstr "Prosimo, vnesite zapis časa po meri." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Vnesite datum v obliki LLLL-MM-DD, kot je npr. 2010-07-18." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" "Prosimo, vnesite omejitev hitrosti prenosa s strežnika, ki je večja ali " "enaka 0 %s/s." -#: ../../locales/../src/interface/filteredit.cpp:134 +#: ../../locales/../src/interface/filteredit.cpp:136 msgid "Please enter a name for the new filter." msgstr "Prosimo, vnesite ime za nov filter." -#: ../../locales/../src/interface/filteredit.cpp:241 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Prosimo, vnesite ime za kopirani filter." -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Prosimo, vnesite novo ime za nabor filtrov \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:194 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Prosimo, vnesite ime za filter." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:112 msgid "" "Please enter a number between 0 and 10 for the number of concurrent " "downloads." @@ -5225,70 +6183,55 @@ "Prosimo, vnesite številko med 0 in 10 za število hkratnih prenosov s " "strežnika." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:117 msgid "" "Please enter a number between 0 and 10 for the number of concurrent uploads." msgstr "" "Prosimo, vnesite številko med 0 in 10 za število hkratnih prenosov na " "strežnik." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:107 msgid "" "Please enter a number between 1 and 10 for the number of concurrent " "transfers." msgstr "Prosimo, vnesite številko med 0 in 10 za število hkratnih prenosov." -#: resources.h:117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Prosimo, vnesite geslo za ta strežnik:" -#: ../../locales/../src/interface/QueueView.cpp:2216 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Vnesite pot in datoteko, ki naj bo izvedena.\n" -"Primer: c:\\določenaPot\\datoteka.exe v okolju MS Windows ali /določenaPot/" -"datoteka v okolju Unix.\n" -"Dodatno lahko navedete tudi argumente za izvajanje." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" -"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts." +"Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -"Prosimo, vnesite pretek časa med 5 in 9999 sekundami ali 0 za onemogočen čas " -"preteka." +"Prosimo, vnesite pretek časa med 10 in 9999 sekundami ali 0 za onemogočen " +"čas preteka." -#: ../../locales/../src/interface/filter.cpp:344 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Prosimo, vnesite ime za ta sklop filtrov" -#: resources.h:118 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Prosimo, vnesite uporabniško ime za ta strežnik:" -#: ../../locales/../src/interface/netconfwizard.cpp:182 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Prosimo, vnesite veljaven obseg vrat." -#: ../../locales/../src/interface/netconfwizard.cpp:161 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Vnesite URL, od koder naj bi pridobili vaš zunanji naslov" -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41 -msgid "Please enter an update interval of at least 7 days" -msgstr "Prosimo, vnesite interval posodabljanja z najmanj 7 dnevi" - -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Prosimo, vnesite omejitev hitrosti prenosa na strežnik, ki je večja ali " "enaka 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5296,23 +6239,48 @@ "Prosimo, vnestite surov ukaz FTP.\n" "Z uporabo surovih ukazov se medpomnilnik mape počisti." -#: ../../locales/../src/interface/LocalListView.cpp:1183 -#: ../../locales/../src/interface/LocalTreeView.cpp:1189 -#: ../../locales/../src/interface/RemoteListView.cpp:1568 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1275 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Vnesite celotno pot programa in njegove argumente. Ta ukaz bo izveden, ko bo " +"vrsta do konca obdelana.\n" +"Primer: c:\\določenaPot\\datoteka.exe v okolju MS Windows ali /določenaPot/" +"datoteka v okolju Unix.\n" +"Pravilno morate navesti v narekovajih tudi ukaze in njihove argumente za " +"izvajanje, če vsebujejo presledke." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Prosimo, vnesite ime mape, ki naj bo ustvarjena:" -#: resources.h:119 +#: ../../locales/../src/interface/RemoteListView.cpp:2673 +msgid "Please enter the name of the file which should be created:" +msgstr "Vnesite ime datoteke, ki naj bo ustvarjena:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Prosimo, vnesite uporabniško ime in geslo za ta strežnik:" -#: ../../locales/../src/interface/netconfwizard.cpp:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Prosimo, vnesite svoje trenutno glavno geslo, da spremenite nastavitve gesla." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Prosimo, vnesite svoj zunanji naslov IP" -#: ../../locales/../src/interface/netconfwizard.cpp:593 -#: ../../locales/../src/interface/netconfwizard.cpp:606 +#: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5322,7 +6290,12 @@ "čarovniku. V primeru, da imate dinamičen naslov ali zunanjega naslova ne " "poznate, uporabite možnost zunanjega razčlenilnika." -#: resources.h:669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "Prosimo, vnesite glavno geslo, da dešifrirate geslo za ta strežnik:" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." @@ -5330,7 +6303,7 @@ "Prosimo, sledite navodilom pazljivo, saj bo napačna nastavitev preprečila " "uspešne povezave FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5338,13 +6311,13 @@ "Prosimo, preverite, da FileZilla lahko vzpostavlja odhodne povezave in da " "ste pravilno vnesli naslov razčlenilnika naslovov." -#: ../../locales/../src/interface/FileZilla.cpp:258 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Preverite, prosim, da je zahtevana krajevna nastavitev nameščena v vašem " "sistemu." -#: ../../locales/../src/interface/netconfwizard.cpp:594 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5356,7 +6329,7 @@ "nastaviti posredovanje vrat. Ne uporabljajte usmerjevalnika v načinu DMZ ali " "načinu za igrice." -#: resources.h:683 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:131 msgid "" "Please note that FileZilla has no influence on the port the server chooses. " "So the server might choose a port which your firewall thinks is only used by " @@ -5368,7 +6341,7 @@ "jih uporabljajo le trojanski konji ali drugi škodljivi programi. Tako lahko " "sproži lažen alarm, ki ga lahko mirno prezrete." -#: ../../locales/../src/interface/Mainfrm.cpp:704 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5376,7 +6349,7 @@ "Upoštevajte, da ohranjevanje časovnih žigov pri prenosih na strežnik deluje " "le na strežnikih FTP, FTPS in FTPES, ki podpirajo ukaz MFMT." -#: resources.h:737 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5384,24 +6357,7 @@ "Upoštevajte, da nekateri strežniki prepovejo dostop, če se skušate povezati " "prepogosto v prekratkih intervalih." -#: resources.h:886 resources.h:892 -#, no-c-format -msgid "" -"Please read https://wiki.filezilla-project.org/Date_and_Time_formatting for " -"details" -msgstr "" -"Za podrobnosti si preberite https://wiki.filezilla-project.org/" -"Date_and_Time_formatting (v angl.)" - -#: resources.h:246 -msgid "" -"Please retry downloading the update. Possible reasons if the problem " -"persists (listed in order of decreasing probability):" -msgstr "" -"Znova poskusite prenesti posodobitev. Možni razlogi za ponavljanje težave (v " -"zaporedju padajoče verjetnosti):" - -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5410,42 +6366,50 @@ "Prosimo, ponovno zaženite tega čarovnika, če spremenite omrežno okolje ali " "nenadoma doživite težave s strežniki, ki so dotlej delovali." -#: resources.h:456 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Prosimo, shranite ključ na varni lokaciji. Brez pravilnega ključa ne boste " +"mogli dostopati do vaših naloženih datotek." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Prosimo, izberite dejanje:" -#: resources.h:302 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Prosimo, izberite kategorije, ki bi jih želeli uvoziti." -#: resources.h:671 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 msgid "Please select the default transfer mode you would like to use." msgstr "Prosimo, izberite privzeti način prenosa." -#: ../../locales/../src/interface/chmoddialog.cpp:38 +#: ../../locales/../src/interface/chmoddialog.cpp:41 #, c-format msgid "Please select the new attributes for the directory \"%s\"." msgstr "Prosimo, izberite nove atribute za mapo \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:27 +#: ../../locales/../src/interface/chmoddialog.cpp:33 #, c-format msgid "Please select the new attributes for the file \"%s\"." msgstr "Prosimo, izberite nove atribute za datoteko \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Prosimo, izberite nove atribute za izbrane mape." -#: ../../locales/../src/interface/chmoddialog.cpp:44 +#: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." msgstr "Prosimo, izberite nove atribute za izbrane datoteke in mape." -#: ../../locales/../src/interface/chmoddialog.cpp:30 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Prosimo, izberite nove atribute za izbrane datoteke." -#: ../../locales/../src/interface/netconfwizard.cpp:581 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5459,183 +6423,236 @@ "načinu DMZ ali načinu za igrice. Stvari, kot je preverjanje protokola ali " "posameznemu protokolu namenjene prilagoditve morajo biti izključene" -#: resources.h:253 -msgid "" -"Please visit https://filezilla-project.org/ for more information about " -"FileZilla." -msgstr "Za več podatkov o FileZilli obiščite https://filezilla-project.org/." - -#: ../../locales/../src/interface/updatewizard.cpp:1074 -#: ../../locales/../src/interface/updatewizard.cpp:1090 -msgid "" -"Please visit https://filezilla-project.org/ to download the most recent " -"version." -msgstr "" -"Obiščite https://filezilla-project.org/ za prenos najsodobnejše različice." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 +msgid "Positio&n of the message log:" +msgstr "Po&ložaj dnevnika sporočil:" -#: ../../locales/../src/interface/verifycertdialog.cpp:184 -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Poštna številka:" -#: ../../locales/../src/interface/sitemanager.cpp:289 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 +msgid "Pre&allocate space before downloading" +msgstr "Vnaprej &dodeli prostor pred prenašanjem" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 +msgid "Preallocation" +msgstr "Vnaprejšnja dodelitev" + +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2135 msgid "Predefined Sites" msgstr "Vnaprej določeni strežniki" -#: ../../locales/../src/interface/Mainfrm.cpp:703 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Ohranjevanje časovnih žigov datotek" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:223 -msgid "Preview:" -msgstr "Predogled:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Predogled" -#: ../../locales/../src/engine/tlssocket.cpp:920 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Primarna povezava in potrdila za podatkovno povezavo se ne ujemajo." -#: ../../locales/../src/interface/cmdline.cpp:17 +#: ../../locales/../src/interface/cmdline.cpp:19 +msgid "Print diagnostic information related to startup of FileZilla" +msgstr "Natisni diagnostične podatke, ki se nanašajo na zagon FileZille" + +#: ../../locales/../src/interface/cmdline.cpp:18 msgid "Print version information to stdout and exit" msgstr "Izpiši podatke o različici na stdout in zapri" -#: resources.h:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Mape obravnavaj prioritetno (privzeto)" -#: ../../locales/../src/interface/queue.cpp:1211 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "Prioriteta" -#: resources.h:949 -msgid "Privacy policy:" -msgstr "Politika zasebnosti:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 +msgid "" +"Privacy policy: Only your version of FileZilla, your used operating system " +"and your CPU architecture will be submitted to the server." +msgstr "" +"Politika zasebnosti: strežniku bo posredovana le različica FileZille, " +"operacijski sistem, ki ga uporabljate, ter arhitektura CPE." -#: resources.h:784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Zasebni &ključi:" -#: resources.h:81 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 msgid "Pro&tocol:" -msgstr "" +msgstr "Pro&tokol:" -#: resources.h:780 resources.h:797 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Geslo za posredovalni stre&žnik:" -#: resources.h:524 resources.h:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "Obdelaj &vrsto" -#: resources.h:795 +#: ../../locales/../src/engine/socket.cpp:1063 +msgid "Process file table overflow" +msgstr "Prekoračitev tabele obdelave datotek" + +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 +#, c-format +msgid "Processed %s in %s." +msgstr "Obdelano %s v %s." + +#: ../../locales/../src/engine/socket.cpp:1068 +msgid "Protocol not supported" +msgstr "Protokol ni podprt" + +#: ../../locales/../src/engine/socket.cpp:1122 +msgid "Protocol not supported on given socket type" +msgstr "Protokol na dani vrsti vrat ni podprt" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 +msgid "Protocol:" +msgstr "Protokol:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Vrata &posredovalnega strežnika:" -#: resources.h:779 resources.h:796 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "&Uporabnik posredovalnega strežnika:" -#: ../../locales/../src/engine/proxy.cpp:415 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" -msgstr "Overovitev posredovalnega strežnika ni uspela." +msgstr "Overovitev posredovalnega strežnika ni uspela" -#: ../../locales/../src/engine/transfersocket.cpp:132 -#: ../../locales/../src/engine/transfersocket.cpp:146 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Rokovanje s posredovalnim strežnikom ni uspelo: %s" -#: ../../locales/../src/engine/proxy.cpp:309 +#: ../../locales/../src/engine/ftp/logon.cpp:65 +msgid "Proxy host starts with '[' but no closing bracket found." +msgstr "" +"Gostitelj posredovalnega strežnika se začne z '[', vendar manjka oglati " +"zaklepaj." + +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Odgovor posredovalnega strežnika: %s" -#: ../../locales/../src/engine/proxy.cpp:458 +#: ../../locales/../src/engine/proxy.cpp:520 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "" +"Zahteva za posredovalni strežnik ni uspela. Odgovor s posr. strežnika: %s" + +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Zahteva za posredovalni strežnik ni uspela: %s" -#: ../../locales/../src/engine/proxy.cpp:480 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Zahteva za posredovalni strežnik ni uspela: Neznana vrsta naslova v odgovoru " "CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "" "Posredovalni strežnik je nastavljen, vendar gostitelj ali vrata " "posredovalnega strežnika niso veljavna" -#: resources.h:782 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Overovitev javnega ključa" -#: resources.h:8 resources.h:32 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 msgid "Public key algorithm:" msgstr "Algoritem javnega ključa:" -#: resources.h:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Javna dovoljenja" -#: ../../locales/../src/interface/QueueView.cpp:3125 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "Vrsta je bila v celoti obdelana" -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Vrsta: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:392 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Vrsta: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:388 -#: ../../locales/../src/interface/statusbar.cpp:453 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Vrsta: prazna" -#: ../../locales/../src/interface/QueueView.cpp:448 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Datoteke v vrsti za prenos" -#: resources.h:448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Postavljanje v vrsto:" -#: resources.h:607 -msgid "R&eboot system" -msgstr "&Ponovno zaženi sistem" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Hitro iskanje:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Hitrega iskanja ne morete odpreti, če primerjate mapi." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "P&onovno zaženi sistem enkrat" -#: resources.h:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "Drevo odda&ljene mape" -#: resources.h:619 resources.h:623 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" -msgstr "Ponastavi in ponovno postavi izbrane datoteke v vrsto" +msgstr "Ponastavi in ponovno postavi izbran&e datoteke v vrsto" -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Surovi ukaz FTP" -#: resources.h:139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Pre&beri" -#: resources.h:568 resources.h:582 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "&Osveži" -#: resources.h:63 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Preime&nuj" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -5643,73 +6660,107 @@ "Ponovno zaženite čarovnika in previdno preverite svoje nastavitve ter " "ustrezno prilagodite vse usmerjevalnike in požarne zidove." -#: resources.h:143 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Pre&beri" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Samo za branje" -#: ../../locales/../src/interface/Mainfrm.cpp:1062 +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Resnično želite prekinitev trenutne operacije?" -#: ../../locales/../src/interface/RemoteListView.cpp:1656 -#: ../../locales/../src/interface/search.cpp:1020 +#: ../../locales/../src/interface/RemoteListView.cpp:1421 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format -msgid "Really delete %d directory with its contents?" -msgid_plural "Really delete %d directories with their contents?" -msgstr[0] "Želite resnično izbrisati %d map z vso vsebino?" -msgstr[1] "Želite resnično izbrisati %d mapo z vso vsebino?" -msgstr[2] "Želite resnično izbrisati %d mapi z vso vsebino?" -msgstr[3] "Želite resnično izbrisati %d mape z vso vsebino?" - -#: ../../locales/../src/interface/RemoteListView.cpp:1654 -#: ../../locales/../src/interface/search.cpp:1018 -#, c-format -msgid "Really delete %d file?" -msgid_plural "Really delete %d files?" -msgstr[0] "Želite resnično izbrisati %d datotek?" -msgstr[1] "Želite resnično izbrisati %d datoteko?" -msgstr[2] "Želite resnično izbrisati %d datoteki?" -msgstr[3] "Želite resnično izbrisati %d datoteke?" - -#: ../../locales/../src/interface/RemoteListView.cpp:1661 -#: ../../locales/../src/interface/search.cpp:1025 -#, c-format -msgid "Really delete %s and %s?" -msgstr "Resnično želite izbrisati %s in %s?" - -#: ../../locales/../src/engine/local_filesys.cpp:136 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1124 -msgid "Really delete all selected files and/or directories?" -msgstr "Resnično želite izbrisati vse izbrane datotek in/ali mape?" +msgid "Really delete %d directory with its contents from the server?" +msgid_plural "" +"Really delete %d directories with their contents from the server?" +msgstr[0] "Želite resnično izbrisati %d map z vso vsebino s strežnika?" +msgstr[1] "Želite resnično izbrisati %d mapo z vso vsebino s strežnika?" +msgstr[2] "Želite resnično izbrisati %d mapi z vso vsebino s strežnika?" +msgstr[3] "Želite resnično izbrisati %d mape z vso vsebino s strežnika?" + +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:1256 +#, c-format +msgid "Really delete %d file from the server?" +msgid_plural "Really delete %d files from the server?" +msgstr[0] "Želite resnično izbrisati %d datotek s strežnika?" +msgstr[1] "Želite resnično izbrisati %d datoteko s strežnika?" +msgstr[2] "Želite resnično izbrisati %d datoteki s strežnika?" +msgstr[3] "Želite resnično izbrisati %d datoteke s strežnika?" + +#: ../../locales/../src/interface/RemoteListView.cpp:1426 +#: ../../locales/../src/interface/search.cpp:1264 +#, c-format +msgid "Really delete %s and %s from the server?" +msgstr "Resnično želite izbrisati %s in %s s strežnika?" + +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +msgid "Really delete all selected files and/or directories from the server?" +msgstr "Resnično želite izbrisati vse izbrane datotek in/ali mape s strežnika?" + +#: ../../locales/../src/interface/file_utils.h:45 +msgid "Really delete all selected files and/or directories from your computer?" +msgstr "" +"Resnično želite izbrisati vse izbrane datotek in/ali mape s svojega " +"računalnika?" -#: ../../locales/../src/interface/queue.cpp:1211 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "Razlog" -#: ../../locales/../src/interface/QueueView.cpp:3133 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "Ponovno zaženi računalnik zdaj" -#: resources.h:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Raz&vejaj v podmape" -#: ../../locales/../src/engine/directorylistingparser.cpp:2110 -#: ../../locales/../src/engine/directorylistingparser.cpp:2125 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 +#, c-format +msgid "Received TLS alert from the server: %s (%d)" +msgstr "Prejeto opozorilo TLS s strežnika: %s (%d)" + +#: ../../locales/../src/engine/directorylistingparser.cpp:3078 +msgid "Received a directory listing which appears to be encoded in EBCDIC." +msgstr "Prejet seznam mape, ki se zdi kodiran v EBCDIC." + +#: ../../locales/../src/engine/directorylistingparser.cpp:2060 +#: ../../locales/../src/engine/directorylistingparser.cpp:2077 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Prejeta vrstica, ki presega 10000 znakov, prekinjanje." -#: ../../locales/../src/interface/netconfwizard.cpp:998 -#: ../../locales/../src/interface/netconfwizard.cpp:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1031 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "Prejete verige potrdila ni mogoče preveriti. Stanje preverjanja je %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Preneseni podatki okvarjeni" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/updater.cpp:574 +msgid "Received invalid character in version information" +msgstr "Prejet neveljavni znak v podatkih o različici" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 +#, c-format +msgid "Received unknown TLS alert %d from the server" +msgstr "Prejeto neznano opozorilo TLS %d s strežnika" + +#: ../../locales/../src/interface/updater.cpp:567 +msgid "Received version information is too large" +msgstr "Prejeti podatki o različici so preobsežni" + +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -5718,50 +6769,75 @@ "strežnik.\n" "Če nadaljujete, bo vaša povezava prekinjena." -#: resources.h:738 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Nastavitve ponovnega povezovanja" -#: resources.h:990 resources.h:991 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Ponovna povezava z nazadnje uporabljenim strežnikom" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:715 -msgid "Redirection to invalid address" -msgstr "Preusmeritev na neveljaven naslov" +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 +msgid "Recursively adding files to queue." +msgstr "Rekurzivno dodajanje datotek v vrsto." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 +msgid "Recursively changing permissions." +msgstr "Rekurzivno spreminjanje dovoljenj." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 +msgid "Recursively deleting files and directories." +msgstr "Rekurzivno brisanje datotek in map." + +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Rdeča" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 +#, c-format +msgid "Redirection to invalid or unsupported URI: %s" +msgstr "Preusmeritev na neveljaven ali nepodprt URI: %s" -#: resources.h:982 resources.h:983 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 +#, c-format +msgid "Redirection to invalid or unsupported address: %s" +msgstr "Preusmeritev na neveljaven ali nepodprt naslov: %s" + +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Osveži sezname datotek in map" -#: ../../locales/../src/interface/edithandler.cpp:1241 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 +msgid "Remember passwords?" +msgstr "Želite pomnjenje gesel?" + +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Oddaljeno" -#: ../../locales/../src/engine/tlssocket.cpp:843 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Oddaljeno potrdilo ni vredno zaupanja." -#: resources.h:367 ../../locales/../src/interface/queue.cpp:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "Oddaljena datoteka" -#: resources.h:440 ../../locales/../src/interface/search.cpp:676 -#: ../../locales/../src/interface/search.cpp:682 -#: ../../locales/../src/interface/search.cpp:692 -#: ../../locales/../src/interface/search.cpp:698 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Iskanje oddaljenih datotek" -#: resources.h:206 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Oddaljeni filtri:" -#: ../../locales/../src/interface/edithandler.cpp:1232 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Oddaljena pot" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:430 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -5770,7 +6846,7 @@ "Oddaljene poti ni mogoče razčleniti. Preverite, da je veljavna absolutna pot " "in da jo izbrana vrsta strežnikov (%s) podpira." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1177 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -5780,100 +6856,133 @@ "in da jo izbrana vrsta strežnikov (%s), izbrana na starševskem strežniku, " "podpira." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:432 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Oddaljene poti ni mogoče razčleniti. Preverite, da je veljavna absolutna pot." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Oddaljene poti ni mogoče razčleniti." -#: resources.h:445 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Obravnava oddaljene poti:" -#: resources.h:313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Oddaljena pot:" -#: ../../locales/../src/interface/viewheader.cpp:547 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Oddaljeni naslov:" -#: resources.h:616 resources.h:620 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Odstrani &vse" -#: resources.h:618 resources.h:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "Odstrani &izbrane" -#: resources.h:265 resources.h:275 resources.h:841 resources.h:850 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:256 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Preimenuj datoteko" -#: resources.h:634 resources.h:655 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "Preimenuj izbrano mapo" -#: resources.h:572 resources.h:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "Preimenuj izbrane datoteke in mape" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:595 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Preimenovanje iz '%s' v '%s'" -#: resources.h:472 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Potrditev gesla:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Javljanje hroščev in predlogov" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 -msgid "Require explicit FTP over TLS" +#: ../../locales/../src/engine/proxy.cpp:381 +msgid "" +"Request failed - client is not running identd (or not reachable from server)" msgstr "" +"Zahteva je spodletela – odjemalec ne poganja identd (ali ta ni dosegljiv s " +"strežnika)" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:514 -msgid "Require implicit FTP over TLS" +#: ../../locales/../src/engine/proxy.cpp:384 +msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" +"Zahteva je spodetela – odjemalčev identd ne more potrditi niza " +"uporabnikovega ID" + +#: ../../locales/../src/engine/proxy.cpp:378 +msgid "Request rejected or failed" +msgstr "Zahteva zavrnjena ali spodletela" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:542 +msgid "Require explicit FTP over TLS" +msgstr "Zahtevaj izrecni FTP prek TLS" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:543 +msgid "Require implicit FTP over TLS" +msgstr "Zahtevaj posredni FTP prek TLS" -#: resources.h:621 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" -msgstr "Ponastavi in ponovno postavi izbrane datoteke v vrsto" +msgstr "Ponastavi in ponovno postavi &vse v vrsto" + +#: ../../locales/../src/engine/socket.cpp:1110 +msgid "Resolved protocol is unknown" +msgstr "Razločeni protokol ni znan" -#: ../../locales/../src/engine/ControlSocket.cpp:1198 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:497 +#: ../../locales/../src/engine/ControlSocket.cpp:1081 #, c-format msgid "Resolving address of %s" msgstr "Razločevanje naslova za %s" -#: ../../locales/../src/interface/updatewizard.cpp:1159 -msgid "Resolving hostname" -msgstr "Razločevanje imena gostitelja" - -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/interface/netconfwizard.cpp:395 -#: ../../locales/../src/interface/StatusView.cpp:290 -#: ../../locales/../src/interface/StatusView.cpp:344 -#: ../../locales/../src/interface/updatewizard.cpp:544 +#: ../../locales/../src/engine/socket.cpp:1069 +msgid "Resource temporarily unavailable" +msgstr "Vir trenutno ni na voljo" + +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:357 msgid "Response:" msgstr "Odgovor:" -#: resources.h:439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Rezultati:" -#: resources.h:264 resources.h:274 resources.h:840 resources.h:849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Nadaljuj prenos datoteke" -#: resources.h:855 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -5881,101 +6990,155 @@ "Nadaljevanje prenosa datotek ASCII lahko povzroči težave, če strežnik " "uporablja drugačno obliko zaključevanja vrstic kot odjemalec." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 +#, c-format +msgid "Retrieving directory listing of \"%s\"..." +msgstr "Pridobivanje seznama mape »%s« …" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Prenos seznama mape ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916 -#: ../../locales/../src/interface/netconfwizard.cpp:707 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Pridobivanje zunanjega naslova IP od %s" -#: ../../locales/../src/engine/tlssocket.cpp:901 -msgid "Root certificate is not trusted" -msgstr "Korensko potrdilo ni vredno zaupanja." - -#: resources.h:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 msgid "S&how files currently being edited..." msgstr "P&okaži trenutno urejevane datoteke ..." -#: resources.h:608 -msgid "S&hutdown system" -msgstr "&Izključi računalnik" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 +msgid "S&how the Site Manager on startup" +msgstr "&Ob zagonu pokaži upravljalnika strežnikov" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "I&zključi računalnik enkrat" -#: resources.h:437 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "Us&tavi" -#: resources.h:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "Posta&vi sistem v stanje pripravljenosti enkrat" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "Sin&hrono brskanje" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:121 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Podpora SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 +msgid "SOC&KS 4" +msgstr "SOC&KS 4" + +#: ../../locales/../src/engine/proxy.cpp:144 +#, c-format +msgid "SOCKS4 proxy will connect to: %s" +msgstr "Posredovalni strežnik SOCKS4 se bo povezal z: %s" + +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "SOCKS5 ne podpira uporabniških imen in gesel, daljših od 255 znakov." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 +msgid "SQLite:" +msgstr "SQLite:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Shra&ni gesla, zaščitena z glavnim geslom" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Shran&i gesla" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Želite shraniti nastavitve?" -#: ../../locales/../src/interface/QueueView.cpp:1815 -msgid "Scanning for files to add to queue" -msgstr "Iskanje datotek za dodajanje v vrsto" - -#: ../../locales/../src/interface/QueueView.cpp:1817 -msgid "Scanning for files to upload" -msgstr "Iskanje datotek za prenos na strežnik" +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 +msgid "Saving of password has been disabled by your system administrator." +msgstr "Shranjevanje gesla je onemogočil skrbnik vašega sistema." + +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 +msgid "Saving of passwords has been disabled by you." +msgstr "Shranjevanje gesel ste onemogočili." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Faktor merila:" -#: resources.h:433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Po&goji iskanja:" -#: resources.h:431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Išči v &mapi:" -#: resources.h:998 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Datoteke išči rekurzivno." -#: resources.h:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Išči datoteke na strežniku" -#: ../../locales/../src/interface/statusbar.cpp:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Išči vrsto:" + +#: ../../locales/../src/interface/statusbar.cpp:515 msgid "Security information" msgstr "Podatki o varnosti" -#: ../../locales/../src/interface/netconfwizard.cpp:564 -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Glejte tudi: https://wiki.filezilla-project.org/Network_Configuration" -#: resources.h:375 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Iz&berite strežnik" -#: resources.h:723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Izberite &stran:" -#: resources.h:874 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Izberite temo" -#: resources.h:833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "Izberite privzeto dejanje, če ciljna datoteka prenosa že obstaja." -#: ../../locales/../src/interface/edithandler.cpp:1702 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162 +#: ../../locales/../src/interface/edithandler.cpp:1583 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Izberite privzeti urejevalnik" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -5983,7 +7146,7 @@ "Izberite privzeto dejanje, če obstaja datoteka, če ciljna datoteka že " "obstaja. Ta izbira je veljavna samo za trenutno sejo." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -5991,65 +7154,65 @@ "Izberite privzeto dejanje, če obstaja datoteka, samo za trenutno izbrane " "datoteke v vrsti." -#: ../../locales/../src/interface/updatewizard.cpp:328 -msgid "Select download location for package" -msgstr "Izberite mesto prenosa za paket" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Izberite datoteko z zasebnim ključem" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Izberite datoteko za izvoz podatkov" -#: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Izberite datoteko za izvoz filtrov" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "Izberite datoteko za izvoz vrste" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Izberite datoteko za izvoz nastavitev" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2479 msgid "Select file for exported sites" msgstr "Izberite datoteko za izvoz strežnikov" -#: ../../locales/../src/interface/import.cpp:15 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Izberite datoteko za uvoz nastavitev" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Izberite datoteko za prenos na strežnik" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" -msgstr "Izberite datoteko za pretvorjeno datoteko ključa" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 +msgid "Select filename for converted key file" +msgstr "Izberite ime za datoteko pretvorjenega ključa" -#: resources.h:421 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Izberite, kako naj se tovrstne datoteke odpirajo." -#: ../../locales/../src/interface/search.cpp:805 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Izberite ciljno mapo za prenos" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Izberite ime ciljne datoteke" -#: resources.h:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Izberite kategorije uvoza:" -#: resources.h:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Izberite zasebne podatke, ki bi jih želeli izbrisati." -#: ../../locales/../src/interface/search.cpp:772 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6058,7 +7221,7 @@ msgstr[2] "Za prenos sta izbrani %d mapi z vso vsebino." msgstr[3] "Za prenos so izbrane %d mape z vso vsebino." -#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." @@ -6067,7 +7230,7 @@ msgstr[2] "Izbrani %d mapi." msgstr[3] "Izbrane %d mape." -#: ../../locales/../src/interface/search.cpp:770 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6076,7 +7239,7 @@ msgstr[2] "Izbrani %d datoteki za prenos." msgstr[3] "Izbrane %d datoteke za prenos." -#: ../../locales/../src/interface/filelist_statusbar.cpp:58 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" @@ -6085,7 +7248,7 @@ msgstr[2] "Izbrani %d datoteki. Skupna velikost: %s" msgstr[3] "Izbrane %d datoteke. Skupna velikost: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:56 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" @@ -6094,50 +7257,49 @@ msgstr[2] "Izbrani %d datoteki. Skupna velikost: najmanj %s" msgstr[3] "Izbrane %d datoteke. Skupna velikost: najmanj %s" -#: ../../locales/../src/interface/search.cpp:777 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Za prenos sta izbrani %s in %s." -#: ../../locales/../src/interface/filelist_statusbar.cpp:68 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Izbrani %s in %s. Skupna velikost: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Izbrani %s in %s. Skupna velikost: najmanj %s" -#: ../../locales/../src/interface/edithandler.cpp:1643 -#: ../../locales/../src/interface/edithandler.cpp:1722 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Izbrani urejevalnik ne obstaja." -#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Urejanje izbrane datoteke je že v teku" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" -msgstr "Izbrana datoteka je že naložena." +msgstr "Izbrana datoteka je že naložena" -#: ../../locales/../src/interface/RemoteListView.cpp:2645 -#, fuzzy +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" -msgstr "Izbrana datoteka je že odprta." +msgstr "Izbrana datoteka je že odprta" -#: ../../locales/../src/interface/RemoteListView.cpp:2673 -#, fuzzy +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" -msgstr "Izbrana datoteka je še vedno v urejevanju" +msgstr "Izbrana datoteka je še vedno v urejanju" -#: ../../locales/../src/interface/filter.cpp:311 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Izbrani filter deluje le na krajevnih datotekah." -#: ../../locales/../src/interface/menu_bar.cpp:311 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6146,41 +7308,46 @@ "strežnika.\n" "Za ta strežnik uporabite zaznamek določenega strežnika." -#: ../../locales/../src/engine/engineprivate.cpp:281 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Izbrana vrata ponavadi uporablja drug protokol." -#: resources.h:745 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Pošiljaj &ukaze obdrži-pri-življenju FTP" -#: resources.h:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" -msgstr "Pošiljanje ukaza po meri na strežnik sicer ni na voljo." +msgstr "Pošiljanje ukaza po meri na strežnik sicer ni na voljo" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Pošiljanje ukaza obdrži-pri-življenju" -#: resources.h:7 resources.h:31 -#: ../../locales/../src/interface/verifycertdialog.cpp:188 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Serijska številka:" -#: resources.h:89 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "&Vrsta strežnika:" -#: ../../locales/../src/engine/tlssocket.cpp:727 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Strežnik ni pravilno zaprl povezave TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 +msgid "Server does not support non-ASCII characters." +msgstr "Strežnik ne podpira znakov, ki niso ASCII." + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Strežnik ne podpira nadaljevanja prenosov za datoteke, večje kot %dGb." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6189,15 +7356,19 @@ "Strežnik ne podpira nadaljevanja prenosov za datoteke, večje kot %d Gb. " "Končajte prenos, saj se velikosti datotek ujemata." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Strežnik ne podpira nadaljevanja prenosov za datoteke, večje kot 2Gb." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Strežnik ne podpira nadaljevanja prenosov za datoteke, večje kot 4Gb." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Strežnikov ključ gostitelja" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6206,15 +7377,23 @@ "Strežnik morda ne podpira nadaljevanja prenosov za datoteke, večje kot %d " "GB. Končajte prenos, saj se velikosti datotek ujemata." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" "Strežnik morda zahteva račun. Račun poskusite navesti v Upravljalniku " -"strežnikov." +"strežnikov" + +#: ../../locales/../src/engine/http/request.cpp:241 +msgid "Server not sending proper line endings" +msgstr "Strežnik ne pošilja pravilnih prelomov vrstic" + +#: ../../locales/../src/engine/ControlSocket.cpp:342 +msgid "Server returned empty path." +msgstr "Strežnik je vrnil prazno pot." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:224 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6222,13 +7401,13 @@ "Strežnik je poslal dodatno prijavno vprašanje. Uporabiti morate interaktivno " "vrsto prijave." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Strežnik je poslal pasiven odgovor z neusmerjenim naslovom. Pasivni način ni " "uspel." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6236,133 +7415,183 @@ "Strežnik je poslal pasiven odgovor z neusmerjenim naslovom. Namesto tega " "uporabite naslov strežnika." -#: ../../locales/../src/interface/netconfwizard.cpp:403 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:458 -#: ../../locales/../src/interface/netconfwizard.cpp:470 -#: ../../locales/../src/interface/netconfwizard.cpp:494 -#: ../../locales/../src/interface/netconfwizard.cpp:501 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:521 +#: ../../locales/../src/engine/http/request.cpp:517 +msgid "Server sent too much data." +msgstr "Strežnik je poslal preveč podatkov." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Strežnik je poslal nepričakovan odgovor." -#: resources.h:351 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Strežnik je poslal nerazvrščeno verigo potrdil, kar krši specifikacije TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Strežnik na naslov MAC odjemalca:" -#: resources.h:349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Strežnik na cifro odjemalca:" -#: resources.h:380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "&Vrsta strežnika:" -#: ../../locales/../src/interface/queue.cpp:1211 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "Strežnik/krajevna datoteka" -#: resources.h:311 resources.h:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Strežnik:" -#: resources.h:15 resources.h:39 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "Podrobnosti o seji" -#: resources.h:595 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Nastavi &prioriteto" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:589 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Nastavi dovoljenja iz '%s' v '%s'" - -#: ../../locales/../src/engine/transfersocket.cpp:860 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize klican brez vrat" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Nastavljanje dovoljenj za »%s« v »%s«" -#: resources.h:722 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Nastavitve" -#: resources.h:971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 +msgid "Settings directory:" +msgstr "Mapa nastavitev:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "P&okaži obvestilni oblaček" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Pokaži &surovi izpis vsebine map" -#: resources.h:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "Po&kaži pozdravno okno ..." -#: ../../locales/../src/interface/Mainfrm.cpp:2309 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Želite prikaz obeh dreves map in nadaljevati s primerjavo?" +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 +msgid "Show details" +msgstr "Pokaži podrobnosti" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 +msgid "Show details about custom date and time formats" +msgstr "Pokaži podrobnosti o oblikah datuma in časa po meri" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "Pokaži v &upravitelju datotek" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 +msgid "Shows available TLS ciphers" +msgstr "Pokaže šifre TLS, ki so na voljo" + #: ../../locales/../src/interface/cmdline.cpp:6 msgid "Shows this help dialog" msgstr "Pokaži to pogovorno okno pomoči" -#: ../../locales/../src/interface/QueueView.cpp:3135 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "Izključi računalnik zdaj" -#: resources.h:299 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 +msgid "Signature algorithm:" +msgstr "Algoritem podpisa:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Vpis" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Vnosi &Upravljalnika strežnikov" -#: resources.h:70 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 msgid "Site Manager" msgstr "Upravljalnik strežnikov" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:944 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:955 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:964 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:981 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1019 +msgid "Site Manager - Cannot remember password" +msgstr "Upravljalnik strežnikov – gesla se ni mogoče spomniti" + +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Upravljalnika strežnikov – tvorjeni ključ" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:998 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1032 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1049 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1077 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1145 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1154 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1182 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Site Manager - Invalid data" -msgstr "Upravljalnik strežnikov - neveljavni podatki" +msgstr "Upravljalnik strežnikov – neveljavni podatki" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:315 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Upravljalnik strežnikov je že odprt" -#: ../../locales/../src/interface/sitemanager.cpp:439 -#: ../../locales/../src/interface/sitemanager.cpp:456 -#: ../../locales/../src/interface/sitemanager.cpp:470 -#: ../../locales/../src/interface/sitemanager.cpp:742 -#: ../../locales/../src/interface/sitemanager.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Mesto ne obstaja." -#: ../../locales/../src/interface/sitemanager.cpp:419 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Pot strežnika se mora začeti z 0 ali 1." -#: ../../locales/../src/interface/sitemanager.cpp:463 -#: ../../locales/../src/interface/sitemanager.cpp:556 -#: ../../locales/../src/interface/sitemanager.cpp:735 -#: ../../locales/../src/interface/sitemanager.cpp:822 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Pot strežnika je neprimerno oblikovana." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:263 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Zaznamki določenega strežnika" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6372,46 +7601,74 @@ "Upravljalnikom strežnikov.\n" "Želite dodati trenutno povezavo upravljalniku strežnikov?" -#: ../../locales/../src/interface/queue.cpp:1211 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "Velikost" -#: resources.h:893 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Oblikovanje zapisa velikosti" -#: ../../locales/../src/interface/fileexistsdlg.cpp:62 -#: ../../locales/../src/interface/fileexistsdlg.cpp:68 +#: ../../locales/../src/interface/fileexistsdlg.cpp:43 msgid "Size unknown" msgstr "Velikost ni znana" -#: resources.h:266 resources.h:276 resources.h:842 resources.h:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Preskoči datoteko" -#: ../../locales/../src/engine/ControlSocket.cpp:1270 -#: ../../locales/../src/engine/ControlSocket.cpp:1289 -#: ../../locales/../src/engine/ControlSocket.cpp:1314 -#: ../../locales/../src/engine/ControlSocket.cpp:1380 +#: ../../locales/../src/engine/ControlSocket.cpp:1151 +#: ../../locales/../src/engine/ControlSocket.cpp:1168 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping download of %s" msgstr "Preskok dol potega %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1274 -#: ../../locales/../src/engine/ControlSocket.cpp:1293 -#: ../../locales/../src/engine/ControlSocket.cpp:1318 -#: ../../locales/../src/engine/ControlSocket.cpp:1384 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Preskakovanje neobstoječe datoteke ključa »%s«" + +#: ../../locales/../src/engine/ControlSocket.cpp:1154 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 +#: ../../locales/../src/engine/ControlSocket.cpp:1197 +#: ../../locales/../src/engine/ControlSocket.cpp:1275 #, c-format msgid "Skipping upload of %s" msgstr "Preskok gor potega %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1130 +#: ../../locales/../src/engine/socket.cpp:1073 +msgid "Socket address outside address space" +msgstr "Naslov vrat je zunaj naslovnega prostora" + +#: ../../locales/../src/engine/socket.cpp:1075 +msgid "Socket already connected" +msgstr "Vrata so že povezana" + +#: ../../locales/../src/engine/socket.cpp:1083 +msgid "Socket has been shut down" +msgstr "Vrata so zaprta" + +#: ../../locales/../src/engine/socket.cpp:1080 +msgid "Socket not connected" +msgstr "Vrata niso povezana" + +#: ../../locales/../src/engine/socket.cpp:1123 +msgid "Socket type not supported for address family" +msgstr "Vrsta vrat ni podprta za družino naslovov" + +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Nekatere datoteke so še vedno v urejanju ali pa jih je potrebno prenesti na " "strežnik." -#: resources.h:685 resources.h:761 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -6419,56 +7676,69 @@ "Nekateri napačno nastavljeni oddaljeni strežniki za usmerjevalniki lahko " "odgovarjajo s svojim krajevnim naslovom IP." -#: resources.h:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Notranje razvrsti mape" -#: ../../locales/../src/interface/filelistctrl.cpp:446 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "Zaporedja razvrščanja ne morete spremeniti, če primerjate mapi." -#: resources.h:907 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Razvrščanje" -#: resources.h:908 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "&Način razvrščanja:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:101 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Vir in pot operacije vlečenja sta enaka" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" -msgstr "Izvorna in ciljna datoteka morda nista enaki." +msgstr "Izvorna in ciljna datoteka morda nista enaki" -#: ../../locales/../src/interface/RemoteListView.cpp:140 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" -msgstr "Vir in cilj operacije vlečenja sta enaka." +msgstr "Vir in cilj operacije vlečenja sta enaka" -#: resources.h:49 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 msgid "Source file:" msgstr "Izvorna datoteka:" -#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Omejitve hitrosti" -#: resources.h:806 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Omejitve hitrosti" -#: ../../locales/../src/interface/statusbar.cpp:597 +#: ../../locales/../src/interface/statusbar.cpp:592 msgid "Speed limits are disabled, click to change." msgstr "Omejitve hitrosti so izključene, kliknite za spremembo." -#: ../../locales/../src/interface/statusbar.cpp:601 +#: ../../locales/../src/interface/statusbar.cpp:595 msgid "Speed limits are enabled, click to change." msgstr "Omejitve hitrosti so vključene, kliknite za spremembo." -#: resources.h:391 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 +msgid "Stable and beta versions" +msgstr "Stabilne in beta različice" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 +msgid "Stable versions only" +msgstr "Samo stabilne različice" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 +msgid "Stable, beta and nightly versions" +msgstr "Stabilne, beta in nočne različice" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "&Takoj začni s prenosom" @@ -6476,43 +7746,65 @@ msgid "Start with opened Site Manager" msgstr "Zaženi z odprtim Upravljalnikom strežnikov" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633 +#: ../../locales/../src/interface/updater.cpp:253 +#, c-format +msgid "Started update check on %s\n" +msgstr "Začeto preverjanje obstoja posodobitev na %s\n" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Pričetek prenasanja %s na naslov" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Pričetek prenašanja %s sem" -#: ../../locales/../src/interface/verifycertdialog.cpp:182 +#: ../../locales/../src/interface/cmdline.cpp:9 +msgid "Starts the local site in the given path" +msgstr "Zažene krajevno mesto v dani poti" + +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Zvezna država ali pokrajina:" -#: ../../locales/../src/interface/edithandler.cpp:1233 -#: ../../locales/../src/interface/queue.cpp:1211 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "Stanje" -#: ../../locales/../src/engine/logging.cpp:212 -#: ../../locales/../src/interface/StatusView.cpp:299 -#: ../../locales/../src/interface/StatusView.cpp:368 -#: ../../locales/../src/interface/updatewizard.cpp:538 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:298 +#: ../../locales/../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "Stanje:" -#: resources.h:592 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "Ustavi in odstrani &vse" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 +msgid "Stop recursive operation" +msgstr "Zaustavi rekurzivno operacijo" + +#: ../../locales/../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj – decentralizirana hramba v oblaku" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Podpora Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Ulica:" -#: resources.h:11 resources.h:35 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" msgstr "Predmet potrdila" @@ -6520,11 +7812,15 @@ msgid "Successful transfers" msgstr "Uspešni prenosi" -#: resources.h:713 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" msgstr "Povzetek rezultatov preizkusa:" -#: resources.h:459 +#: ../../locales/../src/interface/QueueView.cpp:2776 +msgid "Suspend now" +msgstr "Postavi v pripravljenost zdaj" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -6532,81 +7828,126 @@ "Ta nastavitev ne vpliva na simbolične povezave do datotek, te so vedno " "izbrisane." -#: resources.h:997 ../../locales/../src/interface/state.cpp:249 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 #: ../../locales/../src/interface/state.cpp:278 #: ../../locales/../src/interface/state.cpp:285 -#: ../../locales/../src/interface/state.cpp:297 -#: ../../locales/../src/interface/state.cpp:373 -#: ../../locales/../src/interface/state.cpp:383 -#: ../../locales/../src/interface/state.cpp:392 -#: ../../locales/../src/interface/state.cpp:1016 -#: ../../locales/../src/interface/state.cpp:1025 -#: ../../locales/../src/interface/state.cpp:1032 -#: ../../locales/../src/interface/state.cpp:1043 -#: ../../locales/../src/interface/state.cpp:1050 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Sinhrono brskanje" -#: ../../locales/../src/interface/state.cpp:391 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Sinhrono brskanje je bilo onemogočeno." -#: ../../locales/../src/interface/quickconnectbar.cpp:87 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Usklajevanje map." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Skladenjska napaka" -#: ../../locales/../src/interface/cmdline.cpp:68 -#: ../../locales/../src/interface/cmdline.cpp:74 -#: ../../locales/../src/interface/cmdline.cpp:80 -#: ../../locales/../src/interface/cmdline.cpp:89 -#: ../../locales/../src/interface/cmdline.cpp:95 -#: ../../locales/../src/interface/Mainfrm.cpp:2453 +#: ../../locales/../src/interface/cmdline.cpp:76 +#: ../../locales/../src/interface/cmdline.cpp:82 +#: ../../locales/../src/interface/cmdline.cpp:88 +#: ../../locales/../src/interface/cmdline.cpp:97 +#: ../../locales/../src/interface/cmdline.cpp:103 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Skladenjska napaka v ukazni vrstici" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Sistem" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:332 -msgid "TLS/SSL connection established, sending HTTP request" -msgstr "Povezava TSL/SSL je vzpostavljena, pošiljanje zahteve HTTP" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 +msgid "System details" +msgstr "Podrobnosti o sistemu" + +#: ../../locales/../src/engine/socket.cpp:1064 +msgid "System limit of open files exceeded" +msgstr "Sistemska meja odprtih datotek je presežena" + +#: ../../locales/../src/engine/socket.cpp:1121 +msgid "System's network subsystem has failed" +msgstr "Omrežni podsistem sistema je spodletel" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +msgid "T&oolbar" +msgstr "&Orodna vrstica" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 -msgid "TLS/SSL connection established, waiting for welcome message..." +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:139 +msgid "TLS connection established, sending HTTP request" +msgstr "Povezava TSL je vzpostavljena, pošiljanje zahteve HTTP" + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 +msgid "TLS connection established, waiting for welcome message..." msgstr "" -"Povezava TLS/SSL je vzpostavljena, v pričakovanju pozdravnega sporočila ..." +"Povezava TLS je vzpostavljena, v pričakovanju pozdravnega sporočila ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411 -msgid "TLS/SSL connection established." -msgstr "Vzpostavljena povezava TLS/SSL." +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 +msgid "TLS connection established." +msgstr "Vzpostavljena povezava TLS." -#: ../../locales/../src/engine/proxy.cpp:445 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL je pretekel" -#: resources.h:47 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:6 msgid "Target file already exists" msgstr "Ciljna datoteka že obstaja" -#: resources.h:53 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Ciljna datoteka:" -#: ../../locales/../src/interface/RemoteListView.cpp:1872 +#: ../../locales/../src/interface/RemoteListView.cpp:2691 +msgid "Target filename already exists!" +msgstr "Ciljna datoteka s tem imenom že obstaja!" + +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "Target filename already exists, really continue?" msgstr "Ciljna datoteka že obstaja, resnično želite nadaljevati?" -#: resources.h:712 +#: ../../locales/../src/engine/socket.cpp:1094 +msgid "Temporary failure in name resolution" +msgstr "Začasen neuspeh v razločevanju imena" + +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Preizkus je bil uspešno dokončan" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Rezultati preizkusa" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Preskušanje sposobnosti funkcije resume na strežniku" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Nasle&dnje datoteke so trenutno v urejanju:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:785 +msgid "The Site Manager cannot be used unless the file gets repaired." +msgstr "" +"Upravitelja strežnikov ni mogoče uporabiti, dokler datoteka ne bo " +"popravljena." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -6616,7 +7957,7 @@ "Želite nadaljevati? Nobena sprememba v upravljalniku strežnikov zato ne bo " "shranjena." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -6624,56 +7965,89 @@ "Upravljalnik strežnikov je odprt v drugem programu FileZille 3.\n" "Zaprite ga ali pa podatki ne bodo izbrisani." -#: ../../locales/../src/interface/xmlfunctions.cpp:421 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "Dokument XML ni pravilno oblikovan: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Naslov, ki ste ga vnesli: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:820 -#: ../../locales/../src/interface/sitemanager.cpp:722 +#: ../../locales/../src/engine/socket.cpp:1100 +msgid "The ai_family member is not supported" +msgstr "Član ai_family ni podprt" + +#: ../../locales/../src/engine/socket.cpp:1113 +msgid "The ai_socktype member is not supported" +msgstr "Član ai_socktype ni podprt" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Zaznamka ni mogoče dodati." -#: ../../locales/../src/interface/sitemanager.cpp:809 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Zaznamkov ni mogoče počistiti." -#: ../../locales/../src/interface/statusbar.cpp:490 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Certifikat zahteva, da strežnik v svojem odgovoru vključi stanje OCSP, " +"vendar stanje OCSP manjka." + +#: ../../locales/../src/interface/statusbar.cpp:475 msgid "The connection is encrypted. Click icon for details." msgstr "Povezava je šifrirana. Kliknite ikono za podrobnosti." +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 +msgid "" +"The custom date format is invalid or contains unsupported format specifiers." +msgstr "" +"Oblika datuma po meri ni veljavna ali vsebuje nepodprte določitelje oblike." + #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." msgstr "Prijavno zaporedje po meri ne sme biti prazno." -#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682 -#, no-c-format +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 +msgid "" +"The custom time format is invalid or contains unsupported format specifiers." +msgstr "" +"Oblika časa po meri ni veljavna ali vsebuje nepodprte določitelje oblike." + +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 +#, c-format +msgid "The data connection could not be established: %s" +msgstr "Podatkovne povezave ni mogoče vzpostaviti: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Privzetega urejevalnika za datoteke z besedilom ni mogoče najti." -#: resources.h:423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Privzeti urejevalnik za datoteke z besedilom je '%s'." -#: ../../locales/../src/interface/filteredit.cpp:147 -#: ../../locales/../src/interface/filteredit.cpp:215 -#: ../../locales/../src/interface/filteredit.cpp:254 -msgid "The entered filter name already exists." -msgstr "Vneseno ime filtra že obstaja." +#: ../../locales/../src/interface/filteredit.cpp:149 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +msgid "The entered filter name already exists, please choose a different name." +msgstr "Vneseno ime filtra že obstaja, izberite drugo ime." + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Vneseni gesli nista enaki." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Razširitev '%s' že obstaja v seznamu" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:246 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:253 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -6682,9 +8056,9 @@ "Datoteka %s že obstaja.\n" "Prosimo, vnesite novo ime:" -#: ../../locales/../src/interface/LocalListView.cpp:2035 -#: ../../locales/../src/interface/LocalListView.cpp:2166 -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -6695,19 +8069,28 @@ "Povezanega programa (%s) ni mogoče najti.\n" "Preverite povezave za tovrstne datoteke." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 +#, c-format +msgid "" +"The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " +"FileZilla only supports SSH2 keys." +msgstr "" +"Datoteka »%s« vsebuje ključ SSH1. Protokol SSH1 je opiščen, FileZilla " +"podpira le ključe SSH2." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Datoteke '%s' ni mogoče naložiti ali pa ne vsebuje zasebnega ključa." -#: ../../locales/../src/interface/xmlfunctions.cpp:59 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Datoteke '%s' ni mogoče naložiti." -#: ../../locales/../src/interface/LocalListView.cpp:2029 -#: ../../locales/../src/interface/LocalListView.cpp:2161 -#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6716,8 +8099,9 @@ "Datoteke '%s' ni mogoče odpreti:\n" "S to vrsto datotek ni v vašem sistemu povezan noben program." -#: ../../locales/../src/interface/LocalListView.cpp:2074 -#: ../../locales/../src/interface/LocalListView.cpp:2174 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6726,20 +8110,20 @@ "Datoteke '%s' ni mogoče odpreti:\n" "Povezan ukaz ni uspel" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 #, c-format msgid "" -"The file '%s' is not in a format supported by FileZilla.\n" -"The file is also password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into a supported, unprotected format?" +"The file '%s' has been created by a more recent version of FileZilla.\n" +"Loading files created by newer versions can result in loss of data.\n" +"Do you want to continue?" msgstr "" -"Datoteka '%s' ni v obliki, ki jo podpira FileZilla.\n" -"Datoteka je tudi zaščitena z geslom. Z geslom zaščitene datoteke ključev " -"FileZilla še ne podpira.\n" -"Jo želite pretvoriti v podprto, nezaščiteno obliko?" +"Datoteka »%s« je ustvarjena z novejšo različico programa FileZilla.\n" +"Nalaganje datotek, ustvarjenih z novejšimi različicami, lahko povzroči " +"izgubo podatkov.\n" +"Želite nadaljevati?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -6748,22 +8132,11 @@ "Datoteka '%s' ni v obliki, ki jo podpira FileZilla.\n" "Jo želite pretvoriti v podprto obliko?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 -#, c-format -msgid "" -"The file '%s' is password protected. Password protected keyfiles are not " -"supported by FileZilla yet.\n" -"Would you like to convert it into an unprotected file?" -msgstr "" -"Datoteka '%s' je zaščitena z geslom. Z geslom zaščitene datoteke ključev " -"FileZilla še ne podpira.\n" -"Jo želite pretvoriti v nezaščiteno datoteko?" - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Datoteka, izbrana kot privzeti urejevalnik, ne obstaja." -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -6777,37 +8150,37 @@ "uporabniško ime in geslo.\n" "Želite nadaljevati z uvozom?" -#: ../../locales/../src/interface/listctrlex.cpp:761 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Stolpca z imeni datotek ni mogoče skriti ali premikati." -#: ../../locales/../src/interface/listctrlex.cpp:811 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Stolpca z imeni datotek ni mogoče skriti." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:69 #, c-format msgid "The following character will be replaced: %s" msgstr "Naslednji znak bo zamenjan: %s" -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:66 #, c-format msgid "The following characters will be replaced: %s" msgstr "Zamenjani bodo naslednji znaki: %s" -#: resources.h:328 -msgid "The following files are currently being edited:" -msgstr "Naslednje datoteke so trenutno v urejanju:" - -#: resources.h:463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Brezplačna odprto-kodna rešitev za FTP" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:298 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Tvorjeni šifrirni ključ je:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Splošnih zaznamkov ni mogoče shraniti." -#: resources.h:969 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -6818,7 +8191,17 @@ #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 msgid "The limit needs to be between 1 and 2000 MiB" -msgstr "Omejitev mora biti med 1 in 2000 MB." +msgstr "Omejitev mora biti med 1 in 2000 MiB" + +#: ../../locales/../src/interface/state.cpp:1121 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Krajevne mape »%s« ni mogoče ustvariti." + +#: ../../locales/../src/interface/state.cpp:1106 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "Krajevna mapa »%s« ne obstaja." #: ../../locales/../src/interface/state.cpp:275 #, c-format @@ -6830,7 +8213,7 @@ "Želite izključiti sinhrono brskanje in nadaljevati s spreminjanjem krajevne " "mape?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -6838,28 +8221,29 @@ "Najnižja vrata na voljo morajo biti manjša ali enaka kot najvišja vrata na " "voljo." -#: ../../locales/../src/interface/updatewizard.cpp:607 -msgid "" -"The most recent version has been downloaded. Click on Finish to close " -"FileZilla and to start the installation." -msgstr "" -"Prenesli ste najnovejšo različico. Kliknite Dokončaj za izhod iz FileZille " -"in začetek namestitve." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Glavno geslo mora biti dolgo vsaj 8 znakov." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 +msgid "The new version could not be downloaded, please retry later." +msgstr "Nove različice ni mogoče prenesti, poskusite znova kasneje." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +msgid "The new version has been saved in your Downloads directory." +msgstr "Nova različica je shranjena v vašo mapo Prenosi oz. Downloads." -#: ../../locales/../src/interface/updatewizard.cpp:609 -msgid "" -"The most recent version has been downloaded. Please install it the same way " -"you installed this version." -msgstr "" -"Prenesli ste najnovejšo različico. Namestite jo na enak način, kot ste " -"namestili to različico." - -#: ../../locales/../src/interface/QueueView.cpp:1937 -#: ../../locales/../src/interface/QueueView.cpp:1964 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." msgstr "Vrsta ne bo shranjena." -#: ../../locales/../src/interface/state.cpp:1022 +#: ../../locales/../src/interface/state.cpp:1028 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Oddaljena mapa »%s« ne obstaja." + +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -6869,50 +8253,50 @@ "Želite izključiti sinhrono brskanje in nadaljevati s spreminjanjem oddaljene " "mape?" -#: ../../locales/../src/interface/import.cpp:84 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Izbrane kategorije so bile uvožene." -#: resources.h:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "Izbrana datoteka vsebuje podatke za uvoz iz naslednjih kategorij:" -#: resources.h:321 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Urejanje izbrane datoteke je že v teku:" -#: ../../locales/../src/interface/RemoteListView.cpp:2673 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Izbrana datoteka je še vedno odprta z nekim drugim programom, zato jo prej " "zaprite." -#: ../../locales/../src/interface/LocalListView.cpp:2041 -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" -"This can be dangerous and damage your system.\n" +"This can be dangerous and might damage your system.\n" "Do you really want to continue?" msgstr "" "Izbrana datoteka bo neposredno izvedena.\n" "To je lahko nevarno in poškoduje vaš sistem.\n" "Resnično želite nadaljevati?" -#: ../../locales/../src/interface/sitemanager.cpp:602 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Strežnika ni mogoče dodati." -#: ../../locales/../src/interface/netconfwizard.cpp:574 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Strežnik je poslal nepričakovan ali nerazpoznaven odgovor." -#: resources.h:106 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" -msgstr "Strežnik uporablja naslednje kodiranje znakov za imena datotek:" +msgstr "Strežnik uporablja naslednje kodiranje nabora znakov za imena datotek:" -#: resources.h:2 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 msgid "" "The server's certificate is unknown. Please carefully examine the " "certificate to make sure the server can be trusted." @@ -6920,7 +8304,7 @@ "Potrdilo strežnika ni znano. Prosimo, pazljivo preučite digitalno potrdilo, " "da se prepričate, če lahko zaupate strežniku." -#: resources.h:187 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -6930,7 +8314,7 @@ "da je oskrbnik zamenjal ključ gostitelja ali pa se skušate povezati z drugim " "računalnikom, ki se izdaja, da je strežnik." -#: resources.h:175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -6938,6 +8322,14 @@ "Strežnikov ključ gostitelja ni shranjen v registru. Nimate nobenih " "zagotovil, da je strežnik računalnik, za katerega mislite, da je." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Ime gostitelja strežnika se ne ujema z imenom gostitelja potrdila" + +#: ../../locales/../src/engine/socket.cpp:1112 +msgid "The servname parameter is not supported for ai_socktype" +msgstr "Za ai_socktype parameter servname ni podprt" + #: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " @@ -6946,15 +8338,23 @@ "Nastavitve so bile uvožene. Da bi začele veljati, morate zapreti in ponovno " "zagnati FileZillo." -#: ../../locales/../src/interface/QueueView.cpp:3123 +#: ../../locales/../src/engine/socket.cpp:1060 +msgid "The specified address family is not supported" +msgstr "Navedena družina naslovov ni podprta" + +#: ../../locales/../src/engine/socket.cpp:1125 +msgid "The specified network name is no longer available" +msgstr "Navedeno ime omrežja ni več na voljo" + +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." msgstr "Sistem se bo v kratkem ponovno zagnal, če ne kliknete Prekliči." -#: ../../locales/../src/interface/QueueView.cpp:3121 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "Sistem se bo v kratkem izključil, če ne kliknete Prekliči." -#: resources.h:48 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 msgid "" "The target file already exists.\n" "Please choose an action." @@ -6962,30 +8362,35 @@ "Ciljna datoteka že obstaja.\n" "Prosimo, izberite dejanje." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Preizkus ni uspel. Resnično želite shraniti nastavitve?" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:127 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 +#, c-format +msgid "The valid backup file %s could not be restored" +msgstr "Veljavne datoteke varnostne kopije %s ni mogoče obnoviti" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Teme" -#: ../../locales/../src/interface/filter.cpp:463 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Tega sklopa filtrov ni mogoče odstraniti." -#: ../../locales/../src/interface/filter.cpp:398 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Tega sklopa filtrov ni mogoče preimenovati." -#: ../../locales/../src/interface/netconfwizard.cpp:575 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." msgstr "" "To pomeni, da nek usmerjevalnik in/ali požarni zid še vedno nagaja FileZilli." -#: resources.h:690 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:183 msgid "" "This only works if you are not behind a router, else your system would just " "return your internal address." @@ -6993,7 +8398,7 @@ "To deluje le v primeru, da se ne nahajate za usmerjevalnikom, sicer sistem " "vrne le vaš notranji naslov." -#: resources.h:668 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:8 msgid "" "This wizard will help you to properly configure any routers and firewalls " "you have and tests your configuration." @@ -7001,47 +8406,40 @@ "S tem čarovnikom boste pravilno nastavili usmerjevalnike in požarne zidove, " "ki jih imate, in svoje nastavitve tudi preizkusili." -#: ../../locales/../src/interface/queue.cpp:1211 -#, fuzzy +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" -msgstr "Pretek časa" +msgstr "Čas" -#: resources.h:887 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Oblikovanje zapisa časa" -#: resources.h:729 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Pretek &časa v sekundah:" -#: resources.h:732 ../../locales/../src/interface/QueueView.cpp:1052 -#: ../../locales/../src/interface/QueueView.cpp:1096 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Pretek časa" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079 -#, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Zamiki časovnih pasov: Strežnik: %d sekund. Krajevno: %d sekund. Razlika: %d " -"sekund." - -#: ../../locales/../src/interface/verifycertdialog.cpp:180 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Naziv:" #: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Za primerjavo map mora biti hitro iskanje zaprto." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "Za primerjavo map morata biti oba seznama datotek poravnana." -#: ../../locales/../src/interface/Mainfrm.cpp:2308 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "To pomeni, da morata biti obe drevesi map razprti ali zaprti." -#: resources.h:783 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7049,7 +8447,7 @@ "Za podporo overovitvi z javnim ključem mora FileZilla vedeti, katere javne " "ključe naj uporabi." -#: resources.h:994 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7062,11 +8460,11 @@ "primerjave.\n" "\n" "Barve:\n" -"rumena - datoteka obstaja le na eni strani;\n" -"zelena - datoteka je novejša kot neoznačena datoteka na drugi strani;\n" -"rdeča - velikosti datotek se razlikujeta." +"rumena – datoteka obstaja le na eni strani;\n" +"zelena – datoteka je novejša kot neoznačena datoteka na drugi strani;\n" +"rdeča – velikosti datotek se razlikujeta." -#: resources.h:996 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7076,194 +8474,207 @@ "Če je vključeno, z brskanjem po krajevni hierarhiji map ustrezno spreminjate " "tudi mape na strežniku in obratno." -#: resources.h:984 resources.h:985 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Preklopi obdelovanje prenosne vrste" -#: resources.h:976 resources.h:977 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Preklopi prikaz drevesa krajevnih map" -#: resources.h:974 resources.h:975 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Preklopi prikaz sporočil dnevnika" -#: resources.h:978 resources.h:979 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Preklopi prikaz drevesa oddaljene mape" -#: resources.h:980 resources.h:981 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Preklopi prikaz vrste prenosov" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:605 +#: ../../locales/../src/engine/http/request.cpp:254 msgid "Too long header line" msgstr "Predolga vrstica glave" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:666 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Preveč preusmeritev" -#: ../../locales/../src/engine/logging.cpp:216 -#: ../../locales/../src/interface/StatusView.cpp:293 -#: ../../locales/../src/interface/StatusView.cpp:354 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "Sledi:" -#: resources.h:917 resources.h:923 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Prenesi" -#: resources.h:361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "S&mer prenosov" -#: resources.h:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "&Vrsta prenosa" -#: resources.h:739 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Način prenosa" -#: resources.h:873 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Vrsta prenosov" -#: resources.h:98 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Nastavitve prenosov" -#: ../../locales/../src/engine/transfersocket.cpp:498 -#: ../../locales/../src/engine/transfersocket.cpp:522 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Povezava prenosa prekinjena: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Preneseni podatki so bili okvarjeni." -#: ../../locales/../src/interface/QueueView.cpp:1475 -#: ../../locales/../src/interface/statuslinectrl.cpp:278 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Prenašanje v teku" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:123 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 msgid "Transfers" msgstr "Prenosi" -#: ../../locales/../src/interface/QueueView.cpp:3038 -#: ../../locales/../src/interface/QueueView.cpp:3041 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "Dokočani prenosi" -#: resources.h:830 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Obravnavaj datoteke &brez končnice kot datoteke ASCII" -#: resources.h:826 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Obravnavaj &sledeče vrste datotek kot datoteke ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873 -#, fuzzy +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:385 msgid "Trust changed Hostkey:" -msgstr "Zaupaj spremenjenemu ključu gostitelja: " +msgstr "Zaupaj spremenjenemu ključu gostitelja:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871 -#, fuzzy +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:382 msgid "Trust new Hostkey:" -msgstr "Zaupaj novemu ključu gostitelja: " +msgstr "Zaupaj novemu ključu gostitelja:" -#: resources.h:194 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Zaupate novemu ključu in želite nadaljevati s povezavo?" -#: resources.h:22 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" msgstr "Želite zaupati temu potrdilu in nadaljevati s povezovanjem?" -#: resources.h:181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Zaupate gostitelju in želite nadaljevati s povezavo?" -#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 +msgid "Try again" +msgstr "Poskusi znova" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Vrsta" -#: resources.h:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Vrsta posredovalnega strežnika FTP:" -#: resources.h:790 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Vrsta splošnega posredovalnega strežnika:" -#: resources.h:331 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "Prenesi &na strežnik" -#: resources.h:484 resources.h:810 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Omejitev prenosa &na strežnik:" -#: resources.h:935 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Upora&bi povezave z vrstami datotek, če so na voljo" -#: resources.h:888 -#, fuzzy -msgid "U&se system defaults" -msgstr "Uporabi sistemske pri&vzeto" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 +msgid "U&se system defaults for current language" +msgstr "&Uporabi privzete vrednosti sistema za trenutni jezik" -#: resources.h:767 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "UPORABNIK@&GOSTITELJ" -#: ../../locales/../src/engine/proxy.cpp:454 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Nedodeljena koda napake %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:179 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Enota:" -#: ../../locales/../src/interface/edithandler.cpp:1263 -#: ../../locales/../src/interface/edithandler.cpp:1291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Neznano" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Neznana vrsta posredovalnega strežnika FTP, prijavnega zaporedja ni mogoče " "sestaviti." -#: ../../locales/../src/engine/proxy.cpp:368 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Neznana različica protokola SOCKS: %d" -#: resources.h:1 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:4 msgid "Unknown certificate" msgstr "Neznano potrdilo" -#: ../../locales/../src/interface/xmlfunctions.cpp:409 -msgid "" -"Unknown error opening the file. Make sure the file can be accessed and is a " -"well-formed XML document." -msgstr "" -"Neznana napaka pri odpiranju datoteke. Preverite, da je datoteka dosegljiva " -"in da gre za pravilno oblikovan dokument XML." +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Neznana napaka %d" -#: resources.h:174 +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Neznana napaka %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Neznani ključ gostitelja" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7272,14 +8683,18 @@ "Neznana različica protokola SOCKS pri pod-pogajanju overjanja uporabniškega " "imena/gesla: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:454 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Neznani korenski element, datoteka se ne zdi ustvarjena s strani FileZille." -#: ../../locales/../src/interface/netconfwizard.cpp:596 -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/engine/http/request.cpp:380 +msgid "Unknown transfer encoding" +msgstr "Neznano kodiranje prenosa" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7287,7 +8702,7 @@ "Če teh težav ne odpravite, aktivni način FTP ne bo deloval, prisiljeni boste " "uporabljati pasivni način." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7295,137 +8710,144 @@ "Če te težave ne odpravite, aktivni način FTP ne bo deloval, prisiljeni boste " "uporabljati pasivni način." -#: ../../locales/../src/engine/tlssocket.cpp:872 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Nepodprta vrsta potrdila" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:650 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Nepodprta preusmeritev" -#: resources.h:332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Pre&nesi na strežnik in odstrani urejanje" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:137 -msgid "Update Check" -msgstr "Preverjanje posodobitev" - -#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61 -#: ../../locales/../src/interface/updatewizard.cpp:251 -#: ../../locales/../src/interface/updatewizard.cpp:264 -msgid "Update wizard" -msgstr "Čarovnik za posodobitev" +#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 +msgid "Updates" +msgstr "Posodobitve" -#: resources.h:363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Prenesi na strežnik" -#: ../../locales/../src/interface/edithandler.cpp:1254 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Prenos na strežnik ni uspel" -#: ../../locales/../src/interface/statusbar.cpp:609 +#: ../../locales/../src/interface/statusbar.cpp:605 #, c-format msgid "Upload limit: %s/s" msgstr "Omejitev prenosa na strežnik: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:611 +#: ../../locales/../src/interface/statusbar.cpp:608 msgid "Upload limit: none" msgstr "Omejitev prenosa na strežnik: brez" -#: resources.h:645 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Naloži rezultate iskanja" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "Prenesi izbrano mapo na strežnik" -#: resources.h:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "Prenesi izbrane datoteke in mape na strežnik" -#: resources.h:316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Želite to datoteko prenesti nazaj na strežnik?" -#: resources.h:315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Želite to datoteko prenesti na strežnik?" -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1282 -#: ../../locales/../src/interface/edithandler.cpp:1447 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Prenašanje na strežnik" -#: ../../locales/../src/interface/edithandler.cpp:1251 -#: ../../locales/../src/interface/edithandler.cpp:1449 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Prenašanje na strežnik in čakanje na odstranitev" -#: ../../locales/../src/interface/edithandler.cpp:1285 -#: ../../locales/../src/interface/edithandler.cpp:1451 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Prenašanje na strežnik in odstranjevanje urejanja" -#: resources.h:110 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Uporabi nabor znakov &po meri" -#: resources.h:932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Uporabi urejevalnik &po meri:" -#: resources.h:422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "&Privzeti urejevalnik za datoteke z besedilom" -#: resources.h:405 resources.h:411 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Uporabi sin&hrono brskanje" -#: resources.h:108 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Uporabi regularne izraze" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Uporabi UTF-8, če ga podpira strežnik, sicer uporabi krajevni nabor znakov." -#: resources.h:258 resources.h:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Uporabi privzeto dejanje" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:512 -msgid "Use plain FTP" -msgstr "" +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +msgid "Use explicit FTP over TLS if available" +msgstr "Uporabi izrecni FTP prek TLS, če je na voljo" -#: resources.h:371 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Uporabi strežnik, s katerim je trenutno vzpostavljena povezava" -#: resources.h:372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Uporabi strežnik iz upravljalnika strežnikov" -#: resources.h:882 -msgid "Use system &defaults" -msgstr "Uporabi sistemske pri&vzeto" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 +msgid "Use system &defaults for current language" +msgstr "&Uporabi privzete vrednosti sistema za trenutni jezik" -#: resources.h:691 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" msgstr "Uporabi naslednji naslov IP:" -#: resources.h:701 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 msgid "Use the following port range:" msgstr "Uporabi naslednji obseg vrat:" -#: resources.h:686 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 msgid "Use the server's external IP address instead" msgstr "Uporabi zunanji naslov IP strežnika" -#: resources.h:692 resources.h:755 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" "Uporabite, če ste za usmerjevalnikom in imate statičen zunanji naslov IP." -#: resources.h:695 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 msgid "" "Use this option if you have a dynamic IP address. FileZilla will contact the " "above server once each session as soon as you use active mode for the first " @@ -7435,127 +8857,79 @@ "seji povezala z gornjim strežnikom, ko prvič uporabite aktivni način. Le " "različica FileZille, ki jo uporabljate, je posredovana strežniku." -#: resources.h:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Uporabnik:" -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1077 msgid "Username cannot be a series of spaces" msgstr "Uporabniško ime ne sme biti niz presledkov" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387 -#, c-format -msgid "Using proxy %s" -msgstr "Uporaba posredovalnega strežnika %s" - -#: resources.h:112 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" "Uporaba napačnega nabora znakov lahko povzroči nepravilen izpis imen datotek." -#: resources.h:231 -msgid "Using this wizard you can check for available updates to FileZilla." -msgstr "" -"S tem čarovnikom lahko preverite, če so na voljo posodobitve za FileZillo." - -#: resources.h:5 resources.h:29 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" msgstr "Veljaven od:" -#: resources.h:6 resources.h:30 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" msgstr "Veljaven do:" -#: ../../locales/../src/interface/cmdline.cpp:16 +#: ../../locales/../src/interface/cmdline.cpp:17 msgid "Verbose log messages from wxWidgets" msgstr "Izpiši sporočila in opozorila wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1062 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Preverjanje potrdila ..." -#: resources.h:169 -msgid "Version:" -msgstr "Različica:" - -#: resources.h:815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" -msgstr "zelo visoka" +msgstr "Zelo visoka" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "Pokaži skriti nabor možnosti, ki jih strežnik ne podpira" -#: resources.h:919 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Pokaži / uredi" -#: resources.h:355 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Vidni stolpci" -#: resources.h:140 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "&Zapiši" -#: ../../locales/../src/interface/QueueView.cpp:1774 -msgid "Waiting" -msgstr "Čakanje" - -#: ../../locales/../src/interface/QueueView.cpp:1382 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Čakanje na povezavo za brskanje" -#: ../../locales/../src/interface/QueueView.cpp:1425 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Čakanje na geslo" -#: ../../locales/../src/interface/statuslinectrl.cpp:272 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Čakanje na prekinitev prenosa" -#: ../../locales/../src/engine/engineprivate.cpp:203 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Čakanje na ponoven poskus ..." -#: ../../locales/../src/interface/FileZilla.cpp:297 -msgid "" -"Warning!\n" -"\n" -"A bug in Windows causes problems with FileZilla\n" -"\n" -"The bug occurs if you have\n" -"- Windows Server 2003 or XP 64\n" -"- Windows Firewall enabled\n" -"- Application Layer Gateway service enabled\n" -"See http://support.microsoft.com/kb/931130 for background information.\n" -"\n" -"Unless you either disable Windows Firewall or the Application Layer Gateway " -"service,\n" -"FileZilla will timeout on big transfers." -msgstr "" -"Opozorilo!\n" -"\n" -"Hrošč v okolju Windows povzroča težave FileZilli.\n" -"\n" -"Hrošč se prikrade, če imate:\n" -"- Windows Server 2003 ali XP 64\n" -"- omogočen požarni zid Windows Firewall\n" -"- omogočeno storitev Application Layer Gateway\n" -"Oglejte si http://support.microsoft.com/kb/931130 za bolj podrobne " -"informacije.\n" -"\n" -"Če ne boste izključili požarnega zidu Windows Firewall ali storitve " -"Application Layer Gateway,\n" -"bo FileZilla časovno prekoračila obsežne prenose." - -#: ../../locales/../src/interface/netconfwizard.cpp:966 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Opozorilo, podatkovna povezava z napačnega IP bo prezrta." -#: ../../locales/../src/interface/updatewizard.cpp:264 +#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 msgid "" "Warning, use nightly builds at your own risk.\n" "No support is given for nightly builds.\n" @@ -7570,23 +8944,31 @@ "\n" "Resnično želite preveriti za nočne gradnje?" -#: resources.h:186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Opozorilo: možnost ogrožene varnosti!" -#: resources.h:475 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Dobrodošli v FileZilli" -#: resources.h:464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Kaj je novega" -#: resources.h:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Kaj je novega:" -#: resources.h:818 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 +msgid "" +"When allowing FileZilla to remember passwords, you can reconnnect without " +"having to re-enter a password after restarting FileZilla." +msgstr "" +"Ko dovolite FileZilli, da pomni gesla, se lahko ponovno povežete, ne da bi " +"ponovno vnesli geslo po ponovnem zagonu programa FileZilla." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -7594,44 +8976,77 @@ "Če je vključeno, se pri prenosu takšne datoteke s strežnika znaki, ki jih " "krajevni operacijski sistem v imenih datotek ne podpira, zamenjajo." -#: resources.h:860 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 +msgid "When st&arting a new connection while already connected:" +msgstr "Pri z&agonu nove povezave ob že povezanih:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" -msgstr "širokozaslonska" +msgstr "Širokozaslonska" -#: resources.h:144 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 +msgid "Would you like FileZilla to remember passwords?" +msgstr "Želite, da FileZilla pomni gesla?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "&Zapiši" -#: ../../locales/../src/interface/netconfwizard.cpp:433 -#: ../../locales/../src/interface/netconfwizard.cpp:440 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Napačen zunanji naslov IP" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:827 +#: ../../locales/../src/engine/http/request.cpp:440 msgid "Wrong line endings" msgstr "Napačni prelomi vrstic" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Vneseno napačno glavno geslo, shranjenih gesel z njim ni mogoče dešifrirati." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Vneseno napačno glavno geslo, tega elementa z njim ni mogoče dešifrirati." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Rumena" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:396 msgid "Yes" msgstr "Da" -#: resources.h:252 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" -"You are already using the most recent version of FileZilla. Please check " -"again in future." +"You appear to be using an IPv6-only host. This wizard does not support this " +"environment." msgstr "" -"Trenutno že uporabljate zadnjo različico FileZille. Prosimo, preverite znova " -"v prihodnje." +"Zdi se, da uporabljate gostitelja z le IPv6. Ta čarovnik tega okolja ne " +"podpira." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 +msgid "You are using the latest version of FileZilla." +msgstr "Uporabljate najnovejšo različico FileZille." -#: resources.h:473 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Vedno znova lahko odprete to okno prek menija pomoči." -#: ../../locales/../src/engine/server.cpp:63 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 +msgid "You can download the latest version from the FileZilla website:" +msgstr "Najnovejšo različico lahko prenesete s spletišča FileZilla:" + +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "Polje vrat lahko pustite prazno, uporabljena bodo privzeta vrata." -#: resources.h:147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -7639,11 +9054,19 @@ "Uporabite lahko x na vsakem mestu, kjer želite ohraniti dovoljenje, kot ga " "ima izvorna datoteka." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1120 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Če uporabljate glavno geslo, ne morete individualno spremeniti gesla in " +"šifrirnega ključa." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Nastavitev ne morete uvoziti iz lastne mape nastavitev FileZille." -#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137 +#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 msgid "" "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." @@ -7651,24 +9074,29 @@ "Neveljavnega znaka ne morete nadomestiti z drugim neveljavnim znakom. " "Vnesite znak, ki je dovoljen v imenih datotek." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "V korensko mapo ne morete naložiti datotek." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "Niste vnesli novega imena datoteke. Želite prepisati obstoječo datoteko?" -#: resources.h:454 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Izbrali ste najmanj eno simbolično povezavo." -#: ../../locales/../src/interface/LocalListView.cpp:2008 -#: ../../locales/../src/interface/RemoteListView.cpp:2592 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" "Izbrali ste več kot deset datotek za urejanje, resnično želite nadaljevati?" -#: ../../locales/../src/interface/LocalListView.cpp:2128 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -7676,35 +9104,47 @@ "Izbrali ste več kot deset datotek ali map za odpiranje, resnično želite " "nadaljevati?" -#: ../../locales/../src/interface/manual_transfer.cpp:430 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:944 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:985 msgid "You have to enter a hostname." msgstr "Vnesti morate ime gostitelja." -#: ../../locales/../src/interface/search.cpp:817 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1095 +msgid "You have to enter a key file path" +msgstr "Vnesti morate pot datoteke ključa" + +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Vnesti morate krajevno mapo." -#: ../../locales/../src/interface/netconfwizard.cpp:149 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Vnesti morate veljaven naslov IP." +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Vnesti morate oddaljeno mapo." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "Vnesti morate veljaven naslov IPv4." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1129 +msgid "You have to enter a valid encryption key" +msgstr "Vnesti morate veljaven šifrirni ključ" -#: ../../locales/../src/interface/search.cpp:823 +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Vnesti morate krajevno mapo, v katero je mogoče pisati." -#: ../../locales/../src/interface/manual_transfer.cpp:517 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 msgid "You have to enter an account name" -msgstr "Vnesti morate ime računa." +msgstr "Vnesti morate ime računa" -#: ../../locales/../src/interface/manual_transfer.cpp:487 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 msgid "You have to specify a user name" -msgstr "Vnesti morate uporabniško ime." +msgstr "Vnesti morate uporabniško ime" -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -7712,7 +9152,11 @@ "Najverjetneje imate usmerjevalnik ali požarni zid, ki je napačno spremenil " "prenesene podatke." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:55 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Vnesti morate ime glavno geslo." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Vnesti morate ime zaznamka." @@ -7720,28 +9164,28 @@ msgid "You need to enter a name for the log file." msgstr "Vnesti morate ime za dnevniško datoteko." -#: ../../locales/../src/interface/edithandler.cpp:1638 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Vnesti morate ime pravilno citiran ukaz." #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70 +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 msgid "You need to enter a proxy host." msgstr "Vnesti morate ime posredovalnega strežnika." -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75 +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 msgid "You need to enter a proxy port in the range from 1 to 65535" -msgstr "Vnesti morate vrata posredovalnega strežnika med 1 in 65535." +msgstr "Vnesti morate vrata posredovalnega strežnika med 1 in 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:76 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:446 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1191 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Vnesti morate vsaj eno pot, prazni zaznamki niso podprti." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:83 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:453 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -7749,7 +9193,7 @@ "Vnesti morate tako krajevno kot oddaljeno pot, da omogočite sinhrono " "brskanje za ta zaznamek." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1154 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -7757,23 +9201,31 @@ "Vnesti morate tako krajevno kot oddaljeno pot, da omogočite sinhrono " "brskanje za ta strežnik." -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"FileZilla potrebuje dostop do map, v katere želite prenesti datoteke ali iz " +"katerih želite naložiti datoteke." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Določiti morate krajevno datoteko." -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Določiti morate oddaljeno datoteko." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Določiti morate oddaljeno pot." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Določiti morate strežnik." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -7781,54 +9233,68 @@ "Pri povezovanju z drugimi strežniki ne bi smeli imeti težav, prenosi datotek " "bi morali delovati pravilno." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:2775 +msgid "Your computer will suspend unless you click Cancel." +msgstr "" +"Sistem se bo v kratkem postavil v stanje pripravljenosti, če ne kliknete " +"Prekliči." + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "po" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "pred" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "se začne z" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 +msgid "bytes" +msgstr "bajtov" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "vsebuje" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/updater.cpp:257 +msgid "custom" +msgstr "po meri" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "ne vsebuje" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 -#, fuzzy +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" -msgstr "ne vsebuje" +msgstr "ni enako" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "se konča z" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "je enak" -#: ../../locales/../src/interface/filelistctrl.cpp:497 -#: ../../locales/../src/interface/filelistctrl.cpp:515 -#: ../../locales/../src/interface/filelistctrl.cpp:540 -#: ../../locales/../src/interface/filelistctrl.cpp:556 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "datoteka" -#: ../../locales/../src/interface/edithandler.cpp:88 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-datotekazaklepa" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -7838,82 +9304,118 @@ "Prosimo, preverite, da ta izvršilna datoteka obstaja v isti mapi kot glavni " "program FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558 +#: ../../locales/../src/engine/sftp/connect.cpp:101 +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "fzsftp je iz druge različice FileZille" + +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "fzsftp ni mogoče zagnati" -#: ../../locales/../src/engine/tlssocket.cpp:910 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj je iz druge različice FileZille" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj ni mogoče zagnati" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj ni mogoče zagnati.\n" +"Prosimo, preverite, da ta izvršilna datoteka obstaja v isti mapi kot glavni " +"program FileZilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers ni vrnil nobenega potrdila" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 je spodletel" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "je večje kot" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "skupini izvršljivo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "skupini berljivo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "skupini zapisljivo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 +msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" +msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting (v angl.)" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "je enako" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "je nastavljeno" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "ni nastavljeno" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "je manjše kot" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "se ujema z regularnim izrazom" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "novo ime" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "lastniku izvršljivo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "lastniku berljivo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "lastniku zapisljivo" -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "neznano" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "vsem izvršljivo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "vsem berljivo" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "vsem zapisljivo" -#: resources.h:165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" - -#, fuzzy -#~ msgid "Serial Number:" -#~ msgstr "Serijska številka:" diff -Nru filezilla-3.15.0.2/locales/sv.po filezilla-3.33.0/locales/sv.po --- filezilla-3.15.0.2/locales/sv.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/sv.po 2017-09-19 21:36:39.000000000 +0000 @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: FileZilla 3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-30 15:29+0100\n" -"PO-Revision-Date: 2016-01-26 14:47+0100\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-01-06 16:14+0100\n" +"PO-Revision-Date: 2016-12-11 21:36+0100\n" "Last-Translator: Magnus Hovén \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -18,15 +18,21 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:114 +msgid "" +"\n" +"\n" +msgstr "" + #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:55 +#: ../../locales/../src/interface/statuslinectrl.cpp:203 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S förflutet" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:60 +#: ../../locales/../src/interface/statuslinectrl.cpp:209 msgid "%H:%M:%S left" msgstr "%H:%M:%S kvar" @@ -39,55 +45,50 @@ "%a - Konto (Rader av denna typ kommer att utelämnas om inloggningstyp inte " "är Konto)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d katalog" msgstr[1] "%d kataloger" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1419 +#: ../../locales/../src/interface/search.cpp:818 +#: ../../locales/../src/interface/search.cpp:1198 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d katalog och dess innehåll" msgstr[1] "%d kataloger och deras innehåll" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:817 +#: ../../locales/../src/interface/search.cpp:1197 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fil" msgstr[1] "%d filer" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d fil. Total storlek: %s" msgstr[1] "%d filer. Total storlek: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d fil. Total storlek: Minst %s" msgstr[1] "%d filer. Total storlek: Minst %s" -#: ../../locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "%d filer tillagda i kön" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -98,14 +99,14 @@ msgid "%h - Host" msgstr "%h - Värd" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu katalog" msgstr[1] "%llu kataloger" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -117,22 +118,22 @@ msgid "%p - Password" msgstr "%p - Lösenord" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:164 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:167 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certifikatet förfallet!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ännu inte giltigt!" @@ -142,24 +143,24 @@ msgid "%s - Proxy user" msgstr "%s - Proxyanvändare" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s och %s. Total storlek: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s och %s. Total storlek: Minst %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" msgstr[1] "%s byte" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:588 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -173,7 +174,7 @@ "\n" "Hämta FileZilla igen. Om detta problem kvarstår, skicka en felrapport." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:673 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -191,7 +192,7 @@ "PATH.\n" "- Ställ in fullständig sökväg till %s i miljövariablen FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s med %d bitar" @@ -205,7 +206,7 @@ msgid "%w - Proxy password" msgstr "%w - Proxylösenord" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3678 msgid "&Abort previous connection and connect in current tab" msgstr "&Avbryt föregående anslutning och anslut i aktuell flik" @@ -213,14 +214,14 @@ msgid "&About..." msgstr "&Om..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "&Konto:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 #: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:473 msgid "&Active" msgstr "Akti&vt" @@ -237,12 +238,12 @@ msgid "&Add key file..." msgstr "&Lägg till nyckelfil..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:561 msgid "&Add to queue" msgstr "&Lägg till i kön" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:402 msgid "&Adjust server timezone offset:" msgstr "&Justera serverns tidszonsskillnad:" @@ -250,19 +251,19 @@ msgid "&Always trust certificate in future sessions." msgstr "&Lita alltid på certifikatet i framtida sessioner." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:896 msgid "&Always trust this host, add this key to the cache" msgstr "&Lita alltid på denna värd, lägg till nyckeln i cachen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1969 msgid "&Always use default editor" msgstr "Använd alltid &standardredigeraren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3015 msgid "&Always use selection for unassociated files" msgstr "&Använd alltid detta val för oassocierade filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Använd alltid denna åtgärd" @@ -271,22 +272,26 @@ msgstr "&Fråga ditt operativsystem efter den externa IP-adressen" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "Aut&o" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Autodetect" msgstr "&Identifiera automatiskt" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:273 +msgid "&Background color:" +msgstr "&Bakgrundsfärg:" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:604 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Binär" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1632 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "&Binära prefix med SI-symboler. (t.ex. 1 kB = 1024 byte)" @@ -294,14 +299,14 @@ msgid "&Bookmarks" msgstr "&Bokmärken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2311 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2720 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3002 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2156 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:362 msgid "&Browse..." msgstr "&Bläddra..." @@ -309,10 +314,10 @@ msgid "&Burst tolerance:" msgstr "S&pridningstolerans:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3805 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3861 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -326,11 +331,11 @@ msgid "&Close" msgstr "&Stäng" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Close FileZilla" msgstr "&Stäng FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "&Configure speed limits..." msgstr "&Konfigurera hastighetsgränser..." @@ -338,7 +343,7 @@ msgid "&Configure..." msgstr "&Konfigurera..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:614 msgid "&Connect" msgstr "&Anslut" @@ -346,36 +351,36 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Kopiera aktuell anslutning till Platshanteraren..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:794 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:432 msgid "&Copy to clipboard" msgstr "&Kopiera till urklipp" #: ../../locales/../src/interface/resources/xrc/menus.xrc:264 #: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "&Create directory" msgstr "S&kapa katalog" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:630 msgid "&Create new tab" msgstr "&Skapa ny flik" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:67 msgid "&Debug" msgstr "&Felsök" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "&Debug information in message log:" msgstr "&Felsökningsinformation i meddelandeloggen:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Default editor:" msgstr "&Standardredigerare:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 msgid "&Default file exists action..." msgstr "&Standardåtgärd om filen redan finns..." @@ -383,16 +388,16 @@ msgid "&Delay between failed login attempts:" msgstr "&Fördröjning mellan misslyckade inloggningsförsök:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1249 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2887 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Ta bort" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3407 msgid "&Delete symlink" msgstr "&Ta bort symbolisk länk" @@ -400,18 +405,18 @@ msgid "&Directory comparison" msgstr "&Katalogjämförelse" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:963 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Inaktivera synkroniserad bläddring och fortsätt byta den lokala katalogen" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1041 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "&Inaktivera synkroniserad bläddring och fortsätt byta fjärrkatalogen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 msgid "&Discard local file then download and edit file anew" msgstr "&Förkasta den lokala filen, hämta därefter filen igen och redigera den" @@ -419,19 +424,15 @@ msgid "&Disconnect" msgstr "&Koppla från" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Koppla från servern" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "Visa mom&entan överföringshastighet istället för medelhastighet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "&Display size in bytes" msgstr "&Visa storlek i bytes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3844 msgid "&Do not remember passwords (recommended)" msgstr "Kom &inte ihåg lösenord (rekommenderat)" @@ -443,24 +444,24 @@ msgid "&Don't use external IP address on local connections." msgstr "Använd &inte den externa IP-adressen för lokala anslutningar." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1826 msgid "&Double-click action on files:" msgstr "Åtgärd vid &dubbelklick på filer:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:493 msgid "&Download" msgstr "&Hämta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 msgid "&Download to:" msgstr "&Hämta till:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:610 msgid "&Download..." msgstr "&Hämta..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Hämtningar:" @@ -470,14 +471,14 @@ msgid "&Edit" msgstr "R&edigera" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 msgid "&Edit filter rules..." msgstr "R&edigera filterregler..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:72 #: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:646 msgid "&Enable" msgstr "&Aktivera" @@ -485,12 +486,12 @@ msgid "&Enable compression" msgstr "Aktiv&era komprimering" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3733 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "A&ktivera hastighetsgränser" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:560 msgid "&Encoding:" msgstr "&Kodning:" @@ -498,24 +499,24 @@ msgid "&Encryption:" msgstr "&Kryptering:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Enter custom command..." msgstr "&Ange anpassat kommando..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3671 msgid "&Establish connection in a new tab" msgstr "&Etablera anslutning i en ny flik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Execute" msgstr "&Kör" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1585 msgid "&Export Site Manager entries" msgstr "&Exportera Platshanterarens poster" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 msgid "&Export..." msgstr "&Exportera..." @@ -527,35 +528,47 @@ msgid "&File" msgstr "&Arkiv" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "&File Attributes..." msgstr "&Filattribut..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "&File permissions..." msgstr "&Filrättigheter..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2299 msgid "&File:" msgstr "&Arkiv:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1296 msgid "&Filter conditions:" msgstr "&Filtervillkor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1057 msgid "&Filter sets:" msgstr "&Filteruppsättningar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1660 +msgid "&Filters" +msgstr "&Filter" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 msgid "&Filters:" msgstr "&Filter:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1773 msgid "&Finish editing and delete local file" msgstr "&Slutför redigering och ta bort den lokala filen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3332 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Platta till de lokala sökvägarna, skicka alla innehållande filer direkt " +"till målkatalogen" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3237 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -563,7 +576,7 @@ "&Platta till fjärrsökvägarna, hämta alla innehållande filer direkt till " "målkatalogen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3414 msgid "&Follow symlink, delete target directory contents" msgstr "&Följ den symboliska länken, ta bort innehållet i målkatalogen" @@ -575,7 +588,7 @@ msgid "&Getting help..." msgstr "&Få hjälp..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2651 msgid "&Global bookmark" msgstr "&Globalt bokmärke" @@ -588,11 +601,11 @@ msgstr "&Hjälp" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:550 msgid "&Hide identical files" msgstr "&Dölj identiska filer" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "&Highest" msgstr "&Högst" @@ -600,17 +613,17 @@ msgid "&Highest available port:" msgstr "Hö&gsta tillgängliga port:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2446 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:51 msgid "&Host:" msgstr "&Värd:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1627 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "Binära prefix enligt &IEC (t.ex. 1 KiB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1513 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (exempel: 2007-09-15)" @@ -618,15 +631,19 @@ msgid "&Import..." msgstr "&Importera..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2002 msgid "&Inherit system's filetype associations" msgstr "A&nvänd systemets filtypsassociationer" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Installera ny version" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3325 +msgid "&Keep local path structure relative to search root" +msgstr "&Behåll strukturen för den lokala sökvägen relativ jämte sökroten" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3230 msgid "&Keep remote path structure relative to search root" msgstr "&Behåll strukturen för fjärrsökvägen relativ jämte sökroten" @@ -642,7 +659,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Begränsa lokala portar som används av FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "&Limit number of simultaneous connections" msgstr "&Begränsa antalet samtida anslutningar" @@ -650,12 +667,16 @@ msgid "&Local directory tree" msgstr "&Lokalt katalogträd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2705 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2795 msgid "&Local directory:" msgstr "&Lokal katalog:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +msgid "&Local search" +msgstr "&Lokal sökning" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "&Log to file" msgstr "&Logga till fil" @@ -663,11 +684,11 @@ msgid "&Logon Type:" msgstr "&Inloggningstyp:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2501 msgid "&Logontype:" msgstr "&Inloggningstyp:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Low" msgstr "&Lågt" @@ -679,7 +700,7 @@ msgid "&Manual transfer..." msgstr "&Manuell överföring..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:499 msgid "&Maximum number of connections:" msgstr "&Maximalt antal anslutningar:" @@ -695,11 +716,11 @@ msgid "&Minimize to tray" msgstr "&Minimera till aktivitetsfältet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "&Name sorting mode:" msgstr "&Namnsorteringsläge:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2678 msgid "&Name:" msgstr "&Namn:" @@ -707,7 +728,7 @@ msgid "&Network configuration wizard..." msgstr "&Nätverkskonfigurationsguide..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1243 msgid "&New" msgstr "&Ny" @@ -715,7 +736,7 @@ msgid "&New Site" msgstr "&Ny plats" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1671 msgid "&New version available!" msgstr "&Ny version finns tillgänglig!" @@ -723,27 +744,28 @@ msgid "&Next >" msgstr "&Nästa >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1786 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 msgid "&No" msgstr "&Nej" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 #: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "&Ingen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Normal" msgstr "&Normal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:501 msgid "&Numeric value:" msgstr "&Numeriskt värde:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2936 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:622 msgid "&OK" msgstr "&OK" @@ -752,29 +774,29 @@ msgstr "&OPEN" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 msgid "&Open" msgstr "&Öppna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Skriv över" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:480 msgid "&Passive" msgstr "&Passivt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Lösenord:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Play sound" msgstr "&Spela ljud" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:64 msgid "&Port:" msgstr "&Port:" @@ -782,11 +804,11 @@ msgid "&Preserve timestamps of transferred files" msgstr "&Bevara de överförda filernas tidsstämplar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 msgid "&Queue" msgstr "&Kö" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:72 msgid "&Quickconnect" msgstr "&Snabbanslut" @@ -794,11 +816,11 @@ msgid "&Quickconnect bar" msgstr "&Snabbanslutningsrad" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1518 msgid "&Quickconnect history" msgstr "Historik för s&nabbanslutningar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:403 msgid "&Read" msgstr "&Läsa" @@ -806,32 +828,36 @@ msgid "&Reconnect" msgstr "Återa&nslut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1525 msgid "&Reconnect information" msgstr "Information om åte&ranslutning" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:641 msgid "&Refresh" msgstr "&Uppdatera" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:354 msgid "&Remember password until FileZilla is closed" msgstr "&Kom ihåg lösenordet tills FileZilla avslutas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3838 msgid "&Remember passwords" msgstr "&Komma ihåg lösenord" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2732 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2819 msgid "&Remote directory:" msgstr "&Fjärrkatalog:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2335 msgid "&Remote path:" msgstr "&Fjärrsökväg:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +msgid "&Remote search" +msgstr "&Fjärrsökning" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Ta bort" @@ -840,25 +866,25 @@ msgid "&Remove key" msgstr "&Ta bort nyckel" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "&Remove selected" msgstr "&Ta bort markerad" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2881 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Byt namn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1075 msgid "&Rename..." msgstr "&Byt namn..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 msgid "&Reopen local file" msgstr "&Öppna lokal fil på nytt" @@ -870,7 +896,11 @@ msgid "&Report a bug..." msgstr "&Rapportera ett fel..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "&Request attention" +msgstr "&Begär uppmärksamhet" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 msgid "&Reset and requeue all" msgstr "&Återställ och lägg alla filer i kö på nytt" @@ -878,11 +908,11 @@ msgid "&Restart Wizard" msgstr "&Starta om guiden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "Å&teruppta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Run command..." msgstr "&Kör kommando..." @@ -890,7 +920,7 @@ msgid "&Run configuration wizard now..." msgstr "&Kör konfigurationsguiden nu..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2095 msgid "&Run update check now..." msgstr "Kör &uppdateringskontrollen nu..." @@ -902,11 +932,11 @@ msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 msgid "&Save as..." msgstr "&Spara som..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3076 msgid "&Search" msgstr "&Sök" @@ -918,20 +948,20 @@ msgid "&Select Entry:" msgstr "&Välj post:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1878 msgid "&Select language:" msgstr "&Välj språk:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2187 msgid "&Select the columns that should be displayed:" msgstr "&Markera de kolumner som skall visas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1648 msgid "&Settings" msgstr "In&ställningar" @@ -939,23 +969,19 @@ msgid "&Settings..." msgstr "&Inställningar..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Show debug menu" msgstr "&Visa felsökningsmenyn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 msgid "&Show detailed log" msgstr "&Visa detaljerad logg" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Visa meddelande" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "&Show timestamps in message log" msgstr "&Visa tidsstämplar i meddelandeloggen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1531 msgid "&Site Manager entries" msgstr "&Platshanterarens poster" @@ -963,11 +989,11 @@ msgid "&Site Manager..." msgstr "&Platshanteraren..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2659 msgid "&Site-specific bookmark" msgstr "&Platsspecifikt bokmärke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Hoppa över" @@ -975,7 +1001,8 @@ msgid "&Speed limits" msgstr "&Hastighetsgränser" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "&Start transfer immediately" msgstr "&Starta överföringen genast" @@ -983,11 +1010,11 @@ msgid "&Swap local and remote panes" msgstr "&Växla lokal- och fjärrpanel" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 msgid "&TLS Ciphers" msgstr "&TLS-chiffer" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Testa" @@ -999,11 +1026,11 @@ msgid "&Transfer" msgstr "&Överför" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 msgid "&Transfer mode:" msgstr "&Överföringsläge:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "&Överföringskö" @@ -1012,33 +1039,41 @@ msgid "&Treat dotfiles as ASCII files" msgstr "Behandla &punktfiler som ASCII-filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1949 msgid "&Unedit" msgstr "&Ångra ändringar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1017 msgid "&Update cached key for this host" msgstr "&Uppdatera cachelagrad nyckel för denna värd" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:556 msgid "&Upload" msgstr "&Skicka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "&Upload to:" +msgstr "&Skicka till:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +msgid "&Upload..." +msgstr "&Skicka..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Sändningar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 msgid "&Use custom program" msgstr "&Använd anpassat program" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:383 msgid "&Use synchronized browsing" msgstr "&Använd synkroniserad bläddring" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "&Use system's default editor for text files" msgstr "A&nvänd systemets standardredigerare för textfiler" @@ -1050,21 +1085,21 @@ msgid "&Use the server's external IP address instead" msgstr "A&nvänd serverns externa IP-adress istället" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1642 msgid "&Use thousands separator" msgstr "A&nvänd tusenavgränsare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2513 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Användare:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "&Username:" msgstr "&Användarnamn:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 #, c-format msgid "&Version %s" msgstr "&Version %s" @@ -1074,47 +1109,47 @@ msgstr "&Visa" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:616 msgid "&View/Edit" msgstr "&Visa/Redigera" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1979 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "B&evaka filer som redigerats lokalt och fråga om ändringarna skall skickas" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&When checking for updates, check for:" msgstr "&Vid sökning efter uppdateringar, sök efter:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Write" msgstr "&Skriva" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1780 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 msgid "&Yes" msgstr "&Ja" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "\"%s\" finns inte eller går inte att komma åt." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "\"%s\" är ingen katalog." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 msgid "'Account' logontype not supported by selected protocol" msgstr "Inloggningstypen \"Account\" stöds inte av valt protokoll" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:446 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1122,7 +1157,7 @@ "Inloggningstyperna \"Normal\" och \"Konto\" är inte tillgängliga, använder " "\"Fråga efter lösenord\" istället." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1130,7 +1165,7 @@ "Inloggningstyperna \"Normal\" och \"Konto\" är inte tillgängliga. Din post " "har ändrats till \"Fråga efter lösenord\"." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:587 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1140,15 +1175,15 @@ "kommandoradsklienter för att skicka argumenten följt av \"quote\" till " "servern. Du kanske vill ange det råa kommandot utan inledande \"quote\"." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d filtrerat objekt)" msgstr[1] "(%d filtrerade objekt)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% hämtat)" @@ -1174,22 +1209,22 @@ msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 för att inaktivera)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:90 +#: ../../locales/../src/interface/aboutdialog.cpp:179 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat är inställd till %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1580 msgid "(example: %H:%M)" msgstr "(exempel: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 msgid "(example: %Y-%m-%d)" msgstr "(exempel: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3752 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3769 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1200,7 +1235,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "--:--:-- left" msgstr "--:--:-- kvar" @@ -1220,31 +1255,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s kan inte användas tillsammans med en URL för FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2255 msgid "0 - None" msgstr "0 - Ingenting" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2256 msgid "1 - Warning" msgstr "1 - Varning" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "2 - Info" msgstr "2 - Information" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2258 msgid "3 - Verbose" msgstr "3 - Utförlig" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:103 msgid "32-bit system" msgstr "32-bitars system" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2259 msgid "4 - Debug" msgstr "4 - Felsökning" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:101 msgid "64-bit system" msgstr "64-bitars system" @@ -1256,20 +1291,24 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Ett bokmärke med det angivna namnet finns redan. Ange ett namn som inte " "redan används." +#: ../../locales/../src/engine/tlssocket.cpp:1333 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "Ett certifikat i kedjan var signerat med en osäker algoritm" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "En standardredigerare måste ställas in." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:166 +#: ../../locales/../src/interface/RemoteTreeView.cpp:120 +#: ../../locales/../src/interface/state.cpp:788 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "En katalog kan inte dras till en av dess underkataloger." @@ -1283,21 +1322,21 @@ "detta är fallet måste du ansluta i aktivt läge. I aktivt läge öppnar " "FileZilla en port och ber servern att ansluta till den." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1699 msgid "A file previously opened has been changed." msgstr "En tidigare öppnad fil har ändrats." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "A file with that name is already being transferred." msgstr "En fil med det namnet håller redan på att överföras." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "En fil med det namnet redigeras fortfarande. Stäng den och försök igen." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1312,11 +1351,11 @@ "fillistningarna.\n" "Inga ytterligare varningar kommer att visas i den här sessionen." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "En ny version av FileZilla finns tillgänglig:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:658 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1333,7 +1372,7 @@ "En korrekt server kräver inte detta. Kontakta administratören av servern om " "du behöver detta." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:254 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1342,7 +1381,7 @@ "Inaktivera synkroniserad bläddring och fortsätta byta den lokala katalogen?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1363,19 +1402,19 @@ msgid "A&pply only to uploads" msgstr "V&erkställ endast på sändningar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:535 msgid "A&pply to all files and directories" msgstr "V&erkställ på alla filer och kataloger" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "A&utomatically remove successful transfers" msgstr "Ta a&utomatiskt bort lyckade överföringar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2590 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:576 msgid "About FileZilla" msgstr "Om FileZilla" @@ -1383,31 +1422,36 @@ msgid "Above the file lists" msgstr "Ovanför fillistorna" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:113 +#, fuzzy +msgid "Access to some local directories could not be restored:" +msgstr "Den lokala katalogen \"%s\" kunde inte skapas." + +#: ../../locales/../src/engine/server.cpp:912 +#: ../../locales/../src/engine/server.cpp:933 #: ../../locales/../src/interface/manual_transfer.cpp:154 #: ../../locales/../src/interface/manual_transfer.cpp:155 #: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/manual_transfer.cpp:547 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1329 msgid "Account" msgstr "Konto" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:379 msgid "Action after queue &completion" msgstr "Åtgärd efter att kön &behandlats" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1942 msgid "Action on selected file:" msgstr "Åtgärd för vald fil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1822 msgid "Action to perform:" msgstr "Åtgärd att utföra:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Åtgärd:" @@ -1415,7 +1459,7 @@ msgid "Active mode" msgstr "Aktivt läge" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1423,7 +1467,7 @@ "FTP-test av aktivt läge misslyckades. FileZilla känner inte till den " "korrekta externa IP-adressen." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1432,7 +1476,7 @@ "korrekta externa IP-adressen. Dessutom har din router ändrat på den utgående " "adressen." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1446,12 +1490,13 @@ msgid "Active mode IP" msgstr "IP-adress för aktivt läge" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3255 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3350 msgid "Add files to &queue only" msgstr "Lägg bara till filer i &kön" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "Add selected directory to the transfer queue" msgstr "Lägg till markerad katalog i överföringskön" @@ -1460,20 +1505,20 @@ msgid "Add selected files and folders to the transfer queue" msgstr "Lägg till markerade filer och kataloger i överföringskön" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1854 msgid "Add to queue" msgstr "Lägg till i kön" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Address type not supported" msgstr "Adresstypen stöds inte" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:308 msgid "Advanced" msgstr "Avancerat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2086 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1487,15 +1532,16 @@ "som de skall och de kan även skada ditt system. Använd betaversioner och " "dagliga byggen på egen risk." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3688 msgid "Al&ways perform this action" msgstr "An&vänd alltid denna åtgärd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2067 msgid "Algorithm:" msgstr "Algoritm:" -#: ../../locales/../src/interface/QueueView.cpp:2937 +#: ../../locales/../src/interface/QueueView.cpp:2577 msgid "All files have been successfully transferred" msgstr "Alla filer har överförts med lyckat resultat" @@ -1504,7 +1550,7 @@ msgstr "" "Alla portar i det angivna intervallet måste vara mellan 1024 och 65535." -#: ../../locales/../src/interface/QueueView.cpp:2933 +#: ../../locales/../src/interface/QueueView.cpp:2573 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1519,11 +1565,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Tillåt att falla tillbaka på andra överföringslägen vid fel" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3648 msgid "Already connected" msgstr "Redan ansluten" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternativt namn:" @@ -1545,7 +1591,7 @@ "Alternativt kan du använda ditt systems SSH-agent. För att göra det, se till " "att miljövariabeln SSH_AUTH_SOCK är inställd." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1553,7 +1599,7 @@ "Alternativt kan du också hämta den senaste versionen ifrån FileZillas " "hemsida:" -#: ../../locales/../src/interface/QueueView.cpp:1902 +#: ../../locales/../src/interface/QueueView.cpp:1615 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1562,7 +1608,7 @@ "Ett fel inträffade när överföringskön lästes in från \"%s\".\n" "Några objekt i kön har kanske inte återställts." -#: ../../locales/../src/interface/QueueView.cpp:1812 +#: ../../locales/../src/interface/QueueView.cpp:1513 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1571,61 +1617,65 @@ "Ett fel inträffade när överföringskön sparades till \"%s\".\n" "Några objekt i kön har kanske inte sparats." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket.cpp:1336 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "En av utfärdarna i certifikatkedjan är ingen certifikatutfärdare" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2081 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "" "Ett objekt med samma namn som objektet som dras finns redan på målplatsen." -#: ../../locales/../src/engine/server.cpp:885 +#: ../../locales/../src/engine/server.cpp:935 #: ../../locales/../src/interface/manual_transfer.cpp:153 #: ../../locales/../src/interface/manual_transfer.cpp:191 #: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/interface/manual_transfer.cpp:545 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1327 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1624 msgid "Anonymous" msgstr "Anonym" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1017 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "En annan fjärråtgärd pågår redan, kan inte byta katalog nu." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:807 msgid "Any changes made in the Site Manager could not be saved." msgstr "Ändringar gjorda i Platshanteraren kunde inte sparas." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:955 msgid "Any changes made to the filters could not be saved." msgstr "Ändringar av filtren kunde inte sparas." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:863 msgid "Any changes made to the filters will not be saved." msgstr "Ändringar av filtren kommer inte att sparas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:549 msgid "App&ly to directories only" msgstr "Ve&rkställ endast på kataloger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1202 msgid "Apply" msgstr "Verkställ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Ver&kställ endast på aktuell kö" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:542 msgid "Apply to &files only" msgstr "Verkställ endast på &filer" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Arkiv" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Argument buffer overflow" msgstr "Överflöde i argumentbufferten" @@ -1633,16 +1683,16 @@ msgid "As tab in the transfer queue pane" msgstr "Som flik i panelen för överföringskön" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1442 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 msgid "Ask for action" msgstr "Fråga efter åtgärd" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/engine/server.cpp:906 +#: ../../locales/../src/engine/server.cpp:927 #: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Fråga efter lösenord" @@ -1655,7 +1705,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Fråga ditt operativsystem efter den externa IP-adressen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3549 msgid "Asking questions in the FileZilla forums" msgstr "Ställ frågor i FileZillas forum" @@ -1663,7 +1713,7 @@ msgid "Associated program not found:" msgstr "Associerat program hittades inte:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Åtminstone ett filtervillkor är ofullständigt" @@ -1671,11 +1721,11 @@ msgid "At this point, all required information has been gathered." msgstr "Nu har all nödvändig information samlats in." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Attribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:617 msgid "Authentication failed." msgstr "Autentiseringen misslyckades." @@ -1683,7 +1733,7 @@ msgid "Author:" msgstr "Upphovsman:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 msgid "Auto" msgstr "Automatisk" @@ -1691,24 +1741,20 @@ msgid "Automatic file type classification" msgstr "Automatisk klassificering av filtyp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Tillgängliga storlekar" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:334 msgid "B&ypass proxy" msgstr "&Kringgå proxyn" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1027 msgid "Bad file descriptor" msgstr "Felaktig filbeskrivare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3586 msgid "Basic usage instructions" msgstr "Grundläggande användarinstruktioner" @@ -1716,16 +1762,16 @@ msgid "Behaviour" msgstr "Beteende" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1126 +#: ../../locales/../src/interface/edithandler.cpp:1154 msgid "Being edited" msgstr "Redigeras" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket.cpp:1327 msgid "Beware! Certificate has been revoked" msgstr "Se upp! Certifikatet har återkallats" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 msgid "Binary" msgstr "Binär" @@ -1733,17 +1779,21 @@ msgid "Blackboard" msgstr "Blackboard" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Blue" +msgstr "Blå" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:300 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:381 msgid "Bookmark" msgstr "Bokmärke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2858 msgid "Bookmark:" msgstr "Bokmärke:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2847 msgid "Bookmarks" msgstr "Bokmärken" @@ -1751,15 +1801,15 @@ msgid "Browse..." msgstr "Bläddra..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:660 msgid "Build date:" msgstr "Byggdatum:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:637 msgid "Build information" msgstr "Bygginformation" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Business category:" msgstr "Verksamhetskategori:" @@ -1777,95 +1827,102 @@ msgid "C&ancel current operation" msgstr "A&vbryt aktuell åtgärd" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "C&lear all" msgstr "&Töm allt" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "C&opy URL(s) to clipboard" msgstr "K&opiera URL:en (URL:erna) till urklipp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:625 +msgid "C&opy URL(s) with password to clipboard" +msgstr "K&opiera URL:en (URL:erna) med lösenord till urklipp" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1518 msgid "C&ustom" msgstr "A&npassad" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2007 msgid "C&ustom filetype associations:" msgstr "An&passade filtypsassociationer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:764 msgid "CPU features:" msgstr "CPU-funktioner:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1657 msgid "Calculating timezone offset of server..." msgstr "Beräknar serverns tidzonsskillnad..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/transfersocket.cpp:688 msgid "Can't read from file" msgstr "Kan inte läsa från filen" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/transfersocket.cpp:666 +#: ../../locales/../src/engine/transfersocket.cpp:741 msgid "Can't write data to file." msgstr "Kan inte skriva data till filen." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/transfersocket.cpp:669 +#: ../../locales/../src/engine/transfersocket.cpp:744 #, c-format msgid "Can't write data to file: %s" msgstr "Kan inte skriva data till filen: %s" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1680 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1854 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2942 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3437 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3923 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:629 msgid "Cancel" msgstr "Avbryt" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Avbryt aktuell åtgärd" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Avbryter den aktuella åtgärden" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" "Kan inte komma åt \"%s\", inget media har matats in eller enheten är inte " "redo." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Cannot add server to Site Manager" msgstr "Kan inte lägga till servern i Platshanteraren" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Cannot assign requested address" msgstr "Kan inte tilldela begärd adress" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/context_control.cpp:353 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1873,7 +1930,7 @@ "Kan inte stänga fliken under pågående aktivitet.\n" "Avbryta aktuell åtgärd och stänga fliken?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1885,22 +1942,22 @@ msgid "Cannot create new filter" msgstr "Kan inte skapa nytt filter" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1634 +#: ../../locales/../src/interface/LocalListView.cpp:1741 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Cannot edit file" msgstr "Kan inte redigera filen" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1622 msgid "Cannot edit file, not connected to any server." msgstr "Kan inte redigera filen, inte ansluten till någon server." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Cannot edit file, remote path unknown." msgstr "Kan inte redigera filen, okänd fjärrsökväg." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:370 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1908,81 +1965,76 @@ "Kan inte etablera FTP-anslutning till en SFTP-server. Välj det korrekta " "protokollet." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Kan inte läsa in snabbanslutningsraden ifrån resursfilen" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Cannot load key file" msgstr "Kan inte läsa in nyckelfilen" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1008 msgid "Cannot load toolbar from resource file" msgstr "Kan inte läsa in verktygsfält från resursfil" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:450 msgid "Cannot remember password" msgstr "Kan inte komma ihåg lösenord" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216 msgid "Cannot rename entry" msgstr "Kan inte byta namn på posten" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Cannot rename file" msgstr "Kan inte byta namn på filen" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:137 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Kan inte slå upp värdnamnets IPv4-adress för användning med SOCKS4-proxy." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "Cannot save filterset" msgstr "Kan inte spara filteruppsättningen" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Cannot select filter" msgstr "Filtret kan inte väljas" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1484 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "Cannot set file association" msgstr "Kan inte ställa in filassociationen" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Cannot show dialog" msgstr "Kan inte visa dialogrutan" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1656 msgid "Cannot view/edit selected file" msgstr "Kan inte visa/redigera markerad fil" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1762 msgid "Case insensitive" msgstr "Skiftlägesokänsligt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1761 msgid "Case insensitive (default)" msgstr "Skiftlägesokänsligt (standard)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1763 msgid "Case sensitive" msgstr "Skiftlägeskänsligt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1764 msgid "Case sensitive (default)" msgstr "Skiftlägeskänsligt (standard)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 msgid "Categories to clear" msgstr "Kategorier att rensa" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Certificate and session data are not available yet." msgstr "Certifikats- och sessionsdata är inte tillgänglig ännu." @@ -1994,28 +2046,32 @@ msgid "Certificate issuer" msgstr "Certifikatutfärdare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket.cpp:1330 +msgid "Certificate signature verification failed" +msgstr "Verifieringen av certifikatets signatur misslyckades" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Utmaning:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:384 msgid "Change file attributes" msgstr "Ändra filattribut" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:530 msgid "Change the file permissions." msgstr "Ändra filens rättigheter." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2206 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Att ändra loggfilsinställningarna kräver att FileZilla startas om." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:567 msgid "Character encoding issue" msgstr "Teckenkodningsproblem" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:522 msgid "Charset" msgstr "Teckenuppsättning" @@ -2023,7 +2079,7 @@ msgid "Check for &updates..." msgstr "Sök efter &uppdateringar..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2053 msgid "Check for FileZilla &updates automatically:" msgstr "Sök efter &uppdateringar av FileZilla automatiskt:" @@ -2035,11 +2091,11 @@ msgid "Check for newer versions of FileZilla" msgstr "Sök efter nyare versioner av FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Check for updates failed" msgstr "Sökningen efter uppdateringar misslyckades" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:828 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2047,7 +2103,7 @@ "Kontrollera inloggningsuppgifterna. Det angivna lösenordet börjar eller " "slutar med ett blankstegstecken." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:824 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2055,39 +2111,39 @@ "Kontrollera inloggningsuppgifterna. Det angivna användarnamnet börjar eller " "slutar med ett blankstegstecken." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "Checking for correct external IP address" msgstr "Söker efter den korrekta externa IP-adressen" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Söker efter uppdateringar..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:754 #, c-format msgid "Checksum match on file %s\n" msgstr "Kontrollsumman stämmer för filen %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:750 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Kontrollsumman stämmer inte för filen %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1525 msgid "Choose a key file" msgstr "Välj en nyckelfil" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1556 msgid "Choose the default local directory" msgstr "Välj den lokala standardkatalogen" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2319 msgid "Choose the local directory" msgstr "Välj den lokala katalogen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 msgid "Chunk data improperly terminated" msgstr "Chunk-data felaktigt avslutad" @@ -2096,7 +2152,7 @@ msgstr "Chiffer:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:634 msgid "Cl&ose tab" msgstr "St&äng flik" @@ -2104,46 +2160,50 @@ msgid "Classic" msgstr "Klassisk" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "Clear &layout cache" msgstr "Töm &layoutcachen" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 +msgid "Clear auto&update data" +msgstr "Rensa data för automatisk &uppdatering" + +#: ../../locales/../src/interface/quickconnectbar.cpp:200 msgid "Clear history" msgstr "Töm historiken" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1499 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Rensa ut känslig data" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:199 msgid "Clear quickconnect bar" msgstr "Töm snabbanslutningsraden" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Klicka på Slutför för att spara din konfiguration." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2113 msgid "Client to server MAC:" msgstr "Klient till server MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2103 msgid "Client to server cipher:" msgstr "Chiffer, klient till server:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:637 msgid "Close &all other tabs" msgstr "Stäng &alla andra flikar" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1144 +#: ../../locales/../src/interface/Mainfrm.cpp:1165 msgid "Close FileZilla" msgstr "Stäng FileZilla" @@ -2155,67 +2215,66 @@ msgid "Closes current tab" msgstr "Stänger aktuell flik" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:289 msgid "Co&mments:" msgstr "Ko&mmentarer:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Kolumnegenskaper" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2172 msgid "Column setup" msgstr "Spaltinställningar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1951 msgid "Command and its arguments should be properly quoted." msgstr "" "Kommandot och dess argument skall vara korrekt angivna med citationstecken." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Command failed" msgstr "Kommandot misslyckades" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Command not supported" msgstr "Kommandot stöds inte" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:227 msgid "Command not supported by this protocol" msgstr "Kommandot stöds inte av det här protokollet" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:282 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Command:" msgstr "Kommando:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "Kommentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Common name:" msgstr "Namn:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Anslutningen påverkad av en router eller brandvägg" #: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:545 msgid "Compare &modification time" msgstr "Jämför &ändringstid" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 msgid "Compare file&size" msgstr "Jämför fil&storlek" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1795 msgid "Comparison &threshold (in minutes):" msgstr "&Tröskelvärde för jämförelse (i minuter):" @@ -2223,23 +2282,23 @@ msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Tröskelvärdet för jämförelse måste vara mellan 0 och 1440 minuter." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:644 msgid "Compiled for:" msgstr "Byggd för:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:652 msgid "Compiled on:" msgstr "Byggd på:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Compiled with:" msgstr "Byggd med:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:676 msgid "Compiler flags:" msgstr "Kompilatorflaggor:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Komprimerad" @@ -2247,8 +2306,8 @@ msgid "Concurrent transfers" msgstr "Samtidiga överföringar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3142 msgid "Conditions are c&ase sensitive" msgstr "Villkoren är skiftläges&känsliga" @@ -2264,32 +2323,32 @@ msgid "Configure port range" msgstr "Konfigurera portintervall" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3592 msgid "Configuring FileZilla and your network" msgstr "Konfigurera FileZilla och ditt nätverk" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1202 msgid "Confirm deletion" msgstr "Bekräfta borttagning" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1598 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/RemoteListView.cpp:1423 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1051 +#: ../../locales/../src/interface/search.cpp:1158 msgid "Confirmation needed" msgstr "Bekräftelse krävs" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Gratulerar, din konfiguration verkar fungera." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:198 msgid "Connect bypassing proxy settings" msgstr "Anslut men kringgå proxyinställningar" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Anslutningen misslyckades: %s" @@ -2306,25 +2365,25 @@ msgid "Connect to specified Site Manager site" msgstr "Anslut till angiven plats i Platshanteraren" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "Ansluter" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:246 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4333 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Ansluter till %s genom %s proxy" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:966 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:274 #, c-format msgid "Connecting to %s..." msgstr "Ansluter till %s..." @@ -2333,200 +2392,231 @@ msgid "Connection" msgstr "Anslutning" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Connection aborted" msgstr "Anslutningen avbröts" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "Anslutningsförsöket misslyckades" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:930 +#: ../../locales/../src/engine/proxy.cpp:210 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Försöket att ansluta till \"%s\" misslyckades, försöker med nästa adress." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:935 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Försöket att ansluta till \"%s\" misslyckades." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/engineprivate.cpp:700 msgid "Connection attempt interrupted by user" msgstr "Anslutningsförsöket avbröts av användaren" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "Connection attempt timed out" msgstr "Tidsgränsen för anslutningsförsöket överstegs" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Anslutningen stängd" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1026 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:228 msgid "Connection closed by server" msgstr "Anslutningen stängdes av servern" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:272 msgid "Connection established, initializing TLS..." msgstr "Anslutningen etablerad, initierar TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:297 msgid "Connection established, sending HTTP request" msgstr "Anslutningen etablerad, skickar HTTP-begäran" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "Anslutningen etablerad, väntar på välkomstmeddelande." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:444 msgid "Connection established, waiting for welcome message..." msgstr "Anslutningen etablerad, väntar på välkomstmeddelande..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Anslutningen tappad" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Connection not allowed by ruleset" msgstr "Anslutningen tillåts inte av regeluppsättningen" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "Connection refused" msgstr "Anslutningen nekades" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1028 msgid "Connection refused by server" msgstr "Anslutningen nekades av servern" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Connection reset by network" msgstr "Anslutningen återställdes av nätverket" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Connection reset by peer" msgstr "Anslutningen återställdes av andra parten" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:567 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Anslutningens tidsgräns överstegs efter %d sekunds inaktivitet" msgstr[1] "Anslutningens tidsgräns överstegs efter %d sekunders inaktivitet" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1071 msgid "Connection timed out." msgstr "Tidsgränsen för anslutningen överstegs." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:672 msgid "Connection to server lost." msgstr "Anslutningen till servern tappad." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "Anslutningen till proxyn är etablerad, handskakning utförs..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Anslutningen till servern stängdes förtidigt." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Anslutningen till testservern misslyckades." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Konvertera nyckelfil" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1895 #, c-format msgid "Copy (%d) of %s" msgstr "Kopia (%d) av %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1875 #, c-format msgid "Copy of %s" msgstr "Kopia av %s" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Kopiera URL:erna för de markerade objekten till urklipp, inklusive lösenord." + #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopiera URL:erna för de markerade objekten till urklipp." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/transfersocket.cpp:182 #, c-format msgid "Could not accept connection: %s" msgstr "Kunde inte tillåta anslutningen: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:101 +#, fuzzy, c-format +msgid "Could not access path %s" +msgstr "Kunde inte tillåta anslutningen: %s" + +#: ../../locales/../src/engine/tlssocket.cpp:1310 +msgid "Could not add certificate to temporary trust list" +msgstr "" +"Kunde inte lägga till certifikatet till listan av tillfälligt betrodda " +"certifikat" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Kunde inte lägga till anslutningen i Platshanteraren" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:802 msgid "Could not complete operation" msgstr "Kunde inte slutföra åtgärden" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:181 msgid "Could not connect to server" msgstr "Kunde inte ansluta till servern" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Kunde inte ansluta till servern: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:734 msgid "Could not convert command to server encoding" msgstr "Kunde inte konvertera kommandot till serverns kodning" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Kunde inte konvertera den privata nyckeln" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2545 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1393 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not copy URLs" msgstr "Kunde inte kopiera URL:erna" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket.cpp:1292 +msgid "Could not copy certificate" +msgstr "Kunde inte kopiera certifikat" + +#: ../../locales/../src/interface/aboutdialog.cpp:203 msgid "Could not copy data" msgstr "Kunde inte kopiera data" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:158 +#, fuzzy, c-format +msgid "Could not create CFURL from path %s" +msgstr "Kunde inte läsa från sockeln: %s" + +#: ../../locales/../src/interface/updater.cpp:489 #, c-format msgid "Could not create local file %s\n" msgstr "Kunde inte skapa den lokala filen %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Kunde inte skapa loggningsmutex: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "" + +#: ../../locales/../src/interface/RemoteListView.cpp:2211 +#: ../../locales/../src/interface/RemoteTreeView.cpp:848 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " "files into an Explorer window." msgstr "" -"Kunde inte fastställa målet för dra och släpp-åtgärden.\n" +"Kunde inte fastställa målet för dra och s&läpp-åtgärden.\n" "Antingen är skaltillägget inte installerat korrekt eller så släppte du inte " "filen i ett Utforskar-fönster." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4187 msgid "Could not establish connection to server" msgstr "Kunde inte etablera en anslutning till servern" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:418 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2538,11 +2628,11 @@ "kommandoradsflaggan \"--datadir \" eller genom att ställa " "in miljövariabeln FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:722 msgid "Could not generate custom login sequence." msgstr "Kunde inte skapa anpassad inloggningssekvens." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/engine/tlssocket.cpp:1075 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2550,7 +2640,7 @@ "Fick inget unikt namn för certifikatsutfärdaren, gnutls_x509_get_issuer_dn " "misslyckades" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket.cpp:1051 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2558,41 +2648,36 @@ "Fick inget unikt namn för certifikatsobjektet, gnutls_x509_get_dn " "misslyckades" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1002 msgid "Could not get full remote path." msgstr "Kunde inte komma åt den fullständiga fjärrsökvägen." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:95 +#, fuzzy +msgid "Could not get native path from CFURL" +msgstr "Kunde inte ta emot data från servern." + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:173 +#, fuzzy +msgid "Could not get path from URL" +msgstr "Fick inget svar ifrån fzputtygen." + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 msgid "Could not get reply from fzputtygen." msgstr "Fick inget svar ifrån fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/search.cpp:1146 msgid "Could not get temporary directory to download file into." msgstr "Kunde inte komma åt den temporära katalogen för filhämtning." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Kunde inte importera andra partens certifikat, gnutls_x509_crt_import " -"misslyckades" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:92 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Kunde inte initiera Winsock (%d): %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Kunde inte initiera strukturen för andra partens certifikat, " -"gnutls_x509_crt_init misslyckades" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2603,15 +2688,21 @@ "åtkomlig.\n" "Ändringar gjorda i Platshanteraren kommer inte att sparas." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Kunde inte läsa in nyckelfilen" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Kunde inte läsa in den privata nyckeln" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1025 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2622,7 +2713,7 @@ "\".\n" "Inaktivera synkroniserad bläddring och fortsätta byta fjärrkatalogen?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:371 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2633,7 +2724,7 @@ "\".\n" "Synkroniserad bläddring har inaktiverats." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:264 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2644,72 +2735,84 @@ "\".\n" "Synkroniserad bläddring har inaktiverats." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/aboutdialog.cpp:203 +#: ../../locales/../src/interface/RemoteListView.cpp:2545 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1393 +#: ../../locales/../src/interface/search.cpp:1329 msgid "Could not open clipboard" msgstr "Kunde inte öppna urklipp" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Kunde inte öppna loggfilen: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Kunde inte tolka fjärrsökvägen." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:118 msgid "Could not parse server address:" msgstr "Kunde inte tolka serveradressen:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/netconfwizard.cpp:994 msgid "Could not read from data socket." msgstr "Kunde inte läsa från datasockeln." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 #, c-format msgid "Could not read from socket: %s" msgstr "Kunde inte läsa från sockeln: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:553 msgid "Could not read server item." msgstr "Kunde inte läsa serverobjektet." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Kunde inte ta emot data från servern." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:116 +#, fuzzy +msgid "Could not restore directory access" +msgstr "Kunde inte tolka serveradressen:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2694 #, c-format msgid "Could not seek to offset %s within file" msgstr "Kunde inte söka till position %s i filen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2603 msgid "Could not seek to the end of the file" msgstr "Kunde inte söka till slutet av filen" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Kunde inte skicka kommandot till fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/engine/tlssocket.cpp:1261 +msgid "Could not sort peer certificates" +msgstr "Kunde inte sortera andra partens certifikat" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2724 msgid "Could not spawn IO thread" msgstr "Kunde inte starta I/O-tråd" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Kunde inte starta handskakningen med proxyn: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "Kunde inte starta överföring" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:630 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:828 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2718,18 +2821,18 @@ "Kunde inte skriva till \"%s\", ändringar gjorda i Platshanteraren kunde inte " "sparas: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Kunde inte skriva till \"%s\", bokmärket kunde inte läggas till: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" "Kunde inte skriva till \"%s\", de globala bokmärkena kunde inte sparas: %s" -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1542 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2738,41 +2841,41 @@ "Kunde inte skriva till \"%s\", kön kunde inte sparas.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:750 +#: ../../locales/../src/interface/sitemanager.cpp:807 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2297 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" "Kunde inte skriva till \"%s\", de valda platserna kunde inte exporteras: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:149 #, c-format msgid "Could not write \"%s\":" msgstr "Kunde inte skriva till \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Kunde inte skriva till nyckelfilen: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "Kunde inte skriva till den lokala filen" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Kunde inte skriva till loggfilen: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:890 +#: ../../locales/../src/engine/ControlSocket.cpp:994 #, c-format msgid "Could not write to socket: %s" msgstr "Kunde inte skriva till sockeln: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Country:" msgstr "Land:" @@ -2780,25 +2883,25 @@ msgid "Crea&te new file" msgstr "S&kapa ny fil" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1040 msgid "Create &missing local directory and enter it" msgstr "Skapa lokal katalog so&m saknas och gå in i den" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:962 msgid "Create &missing remote directory and enter it" msgstr "Skapa fjärrkatalog so&m saknas och gå in i den" #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:573 msgid "Create a new subdirectory in the current directory" msgstr "Skapa en ny underkatalog i den aktuella katalogen" #: ../../locales/../src/interface/resources/xrc/menus.xrc:269 #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:509 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Skapa en ny underkatalog i den aktuella katalogen och byt till den" @@ -2808,50 +2911,50 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:268 #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Create director&y and enter it" msgstr "Skapa &katalog och gå in i den" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1233 msgid "Create directory" msgstr "Skapa katalog" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2631 msgid "Create empty file" msgstr "Skapa tom fil" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "Skapar katalog" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3217 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1844 #, c-format msgid "Creating directory '%s'..." msgstr "Skapar katalogen \"%s\"..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:173 msgid "Critical error" msgstr "Kritiskt fel" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:164 msgid "Critical error:" msgstr "Kritiskt fel:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:124 msgid "Critical file transfer error" msgstr "Kritiskt filöverföringsfel" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:104 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Kritiskt filöverföringsfel efter att ha överfört %s på %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2860,59 +2963,63 @@ "Aktuell fjärrkatalog (%s) ligger inte under synkroniseringsroten (%s).\n" "Synkroniserad bläddring har inaktiverats." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:400 msgid "Current transfer type is set to ASCII." msgstr "Aktuell inställning för överföringsläge är ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:408 msgid "Current transfer type is set to automatic detection." msgstr "Aktuell inställning för överföringsläge är automatisk detektering." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:404 msgid "Current transfer type is set to binary." msgstr "Aktuell inställning för överföringsläge är binärt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2031 msgid "Curve:" msgstr "Kurva:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1567 msgid "Cus&tom" msgstr "An&passad" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:92 msgid "Custom filter set" msgstr "Anpassad filteruppsättning" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2439 msgid "Custom server" msgstr "Anpassad server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Cyan" +msgstr "Cyan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2559 msgid "D&ata type" msgstr "D&atatyp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1637 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "D&ecimala prefix med SI-symboler (t.ex. 1 kB = 1000 byte)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:466 msgid "D&efault" msgstr "&Standard" #: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:619 msgid "D&elete" msgstr "&Ta bort" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2755 msgid "D&irectory comparison" msgstr "K&atalogjämförelse" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1111 msgid "D&isable all" msgstr "&Inaktivera allt" @@ -2920,37 +3027,37 @@ msgid "D&o not save passwords" msgstr "Spara inte lösen&ord" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "D&ouble-click action on directories:" msgstr "Åtgärd vid d&ubbelklick på kataloger:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1261 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2893 msgid "D&uplicate" msgstr "&Kopiera" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:40 msgid "DOS-like with virtual paths" msgstr "Som DOS med virtuella sökvägar" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "Dangerous filetype" msgstr "Farlig filtyp" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "Data" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:988 +#: ../../locales/../src/interface/netconfwizard.cpp:1053 msgid "Data socket closed too early." msgstr "Datasockeln stängdes för tidigt." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Datum" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 msgid "Date formatting" msgstr "Datumformatering" @@ -2966,15 +3073,15 @@ msgid "Debug" msgstr "Felsök" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 msgid "Debugging settings" msgstr "Felsökningsinställningar" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default &local directory:" msgstr "Standardkatalog (&lokal):" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:32 msgid "Default (Autodetect)" msgstr "Standard (Identifiera automatiskt)" @@ -2982,17 +3089,17 @@ msgid "Default editor not properly quoted." msgstr "Standardredigeraren har inte angivits korrekt med citationstecken." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1461 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" msgstr "Standardåtgärd om filen redan finns" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:371 msgid "Default r&emote directory:" msgstr "Standardkatalog (&fjärr):" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1100 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -3000,7 +3107,7 @@ "Standardfjärrsökvägen kan inte tolkas. Försäkra dig om att det är en giltig " "absolut sökväg för den valda servertypen." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Systemets standardspråk" @@ -3024,7 +3131,7 @@ "Fördröjning mellan misslyckades anslutningsförsök måste vara mellan 1 och " "999 sekunder." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:541 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3039,12 +3146,12 @@ "Fördröjer anslutningen med %d sekunder på grund av tidigare misslyckat " "anslutningsförsök..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1249 msgid "Delete Site Manager entry" msgstr "Ta bort post i Platshanteraren" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:514 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:582 msgid "Delete selected directory" msgstr "Ta bort markerad katalog" @@ -3053,61 +3160,61 @@ msgid "Delete selected files and directories" msgstr "Ta bort markerade filer och kataloger" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:380 #, c-format msgid "Deleting \"%s\"" msgstr "Tar bort \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:383 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Tar bort %u filer från \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Deleting symbolic link" msgstr "Tar bort den symboliska länken" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:968 msgid "Desktop" msgstr "Skrivbord" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:842 msgid "Details" msgstr "Detaljer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Details for new key:" msgstr "Detaljer för ny nyckel:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 msgid "Detected newer version of FileZilla" msgstr "Upptäckte nyare version av FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1348 msgid "Dire&ctories" msgstr "Katalo&ger" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Direction" msgstr "Riktning" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "Katalog" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2834 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:534 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1781 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:390 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2220 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "Directory comparison" msgstr "Katalogjämförelse" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Katalogjämförelsen misslyckades" @@ -3116,37 +3223,41 @@ msgstr "" "Katalogen innehållandes loggfilen finns inte eller är filnamnet felaktigt." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 +msgid "Directory listing &filters..." +msgstr "Kataloglistnings&filter..." + +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Directory listing aborted by user" msgstr "Kataloglistningen avbröts av användaren" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2047 msgid "Directory listing failed" msgstr "Kataloglistningen mislyckades" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "Directory listing filters" msgstr "Kataloglistningsfilter" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:196 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Kataloglistningen av \"%s\" lyckades" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Directory listing successful" msgstr "Kataloglistningen lyckades" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1146 msgid "Disa&ble all" msgstr "Ina&ktivera allt" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1033 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "Inaktivera synkroniserad bläddring och fortsätta byta fjärrkatalogen?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:660 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3154,32 +3265,32 @@ "Inaktivera det här alternativet igen om du inte längre kan se rätt " "kataloginnehåll." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Koppla från servern" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:64 +#: ../../locales/../src/engine/ControlSocket.cpp:891 +#: ../../locales/../src/engine/ControlSocket.cpp:996 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:859 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" msgstr "Frånkopplad från servern" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1028 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:874 #, c-format msgid "Disconnected from server: %s" msgstr "Frånkopplad från servern: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:240 msgid "Disconnecting from previous server" msgstr "Kopplar från föregående server" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Kopplar från den för närvarande synliga servern" @@ -3187,52 +3298,48 @@ msgid "Display about dialog" msgstr "Visa Om-dialogrutan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Do ¬ use default editor" msgstr "Använd &inte standardredigeraren" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Gör &ingenting" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1896 msgid "Do the same with &all selected files already being edited" msgstr "Gör samma sak för &alla markerade filer som redan redigeras" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1169 msgid "Do you really want to close FileZilla?" msgstr "Vill du verkligen stänga FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Vill du verkligen ta bort alla poster i Platshanteraren och överföringskön?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Vill du verkligen ta bort alla poster i Platshanteraren?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1251 msgid "Do you really want to delete selected entry?" msgstr "Vill du verkligen ta bort markerad post?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Vill du verkligen ta bort överföringskön?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:588 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Vill du verkligen skicka \"%s\" till servern?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1889 msgid "Do you want to reopen this file?" msgstr "Vill du öppna den här filen igen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 msgid "Documentation" msgstr "Dokumentation" @@ -3244,35 +3351,35 @@ msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "Punktfiler är filnamn som börjar med en punkt, t.ex. .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1819 msgid "Double-click action" msgstr "Åtgärd vid dubbelklick" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 msgid "Download" msgstr "Hämta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3741 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Gräns för hä&mtning:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:592 #, c-format msgid "Download limit: %s/s" msgstr "Gräns för hämtning: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:595 msgid "Download limit: none" msgstr "Gräns för hämtning: ingen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3189 +#: ../../locales/../src/interface/search.cpp:868 +#: ../../locales/../src/interface/search.cpp:873 msgid "Download search results" msgstr "Hämta sökresultat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "Download selected directory" msgstr "Hämta markerad katalog" @@ -3280,7 +3387,7 @@ msgid "Download selected files and directories" msgstr "Hämta markerade filer och kataloger" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:980 #, c-format msgid "" "Download speed: %s/s\n" @@ -3289,24 +3396,24 @@ "Hämtningshastighet: %s/s\n" "Sändningshastighet: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1111 msgid "Downloading" msgstr "Hämtar" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:315 #, c-format msgid "Downloading %s" msgstr "Hämtar %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Hämtar uppdatering..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:90 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:114 +#: ../../locales/../src/interface/QueueView.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:109 +#: ../../locales/../src/interface/RemoteTreeView.cpp:94 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3314,11 +3421,11 @@ "Dra och s&läpp mellan olika instanser av FileZilla har ännu inte " "implementerats." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:103 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:118 +#: ../../locales/../src/interface/LocalTreeView.cpp:120 +#: ../../locales/../src/interface/QueueView.cpp:97 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:100 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Dra och s&läpp mellan olika servrar har ännu inte implementerats." @@ -3326,7 +3433,7 @@ msgid "Dupl&icate" msgstr "Kop&iera" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1104 msgid "E&nable all" msgstr "A&ktivera allt" @@ -3335,7 +3442,7 @@ msgid "E&nter directory" msgstr "G&å in i katalogen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "E&xecute" msgstr "Kö&r" @@ -3343,21 +3450,21 @@ msgid "E&xit" msgstr "A&vsluta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:419 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 msgid "E&xport..." msgstr "E&xportera..." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "E-Mail:" msgstr "E-postadress:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Varje filter behöver minst ett villkor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 msgid "Edit filters" msgstr "Redigera filter" @@ -3368,16 +3475,16 @@ "Redigera filen med den konfigurerade redigeraren och skicka ändringarna till " "servern." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing directories is not supported" msgstr "Redigering av kataloger stöds inte" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1631 msgid "Editing failed" msgstr "Redigeringen misslyckades" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1134 msgid "Editing search results" msgstr "Redigerar sökresultat" @@ -3385,7 +3492,7 @@ msgid "Email:" msgstr "E-postadress:" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "Empty command" msgstr "Tomt kommando" @@ -3393,7 +3500,7 @@ msgid "Empty command." msgstr "Tomt kommando." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2049 msgid "Empty directory listing" msgstr "Listning av tomma kataloger" @@ -3405,13 +3512,13 @@ msgid "Empty file extension." msgstr "Tom filändelse." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Tomma filternamn tillåts inte." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Tomt namn" @@ -3419,7 +3526,7 @@ msgid "Empty quoted string." msgstr "Tom textsträng innanför citationstecken." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1139 msgid "En&able all" msgstr "Akt&ivera allt" @@ -3427,19 +3534,19 @@ msgid "Enable invalid character &filtering" msgstr "Aktivera &filtrering av felaktiga tecken" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Krypterad" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 msgid "Encryption" msgstr "Kryptering" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 msgid "Encryption details" msgstr "Krypteringsinformation" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "Avsluta jämförelsen och ändra sorteringsordning?" @@ -3447,37 +3554,37 @@ msgid "Enter &custom command..." msgstr "Ange an&passat kommando..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3782 msgid "Enter 0 for unlimited speed." msgstr "Ange 0 för obegränsad hastighet." -#: ../../locales/../src/interface/QueueView.cpp:2103 +#: ../../locales/../src/interface/QueueView.cpp:1825 msgid "Enter command" msgstr "Ange kommando" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Ange anpassat kommando" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1852 msgid "Enter directory" msgstr "Gå in i katalogen" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Ange filternamn" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Enter name for filterset" msgstr "Ange namn för filteruppsättning" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:274 msgid "Enter new name for filterset" msgstr "Ange ett nytt namn för filteruppsättningen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Ange lösenord" @@ -3486,14 +3593,13 @@ msgid "Enter selected directory" msgstr "Gå in i markerad katalog" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:53 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3501,12 +3607,11 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Ange adressen till servern.\n" -"För att ange serverprotokollet, inled värden med protokollidentifieraren. Om " -"inget protokoll anges kommer standardprotokollet (ftp://) att användas.\n" -"Du kan även ange fullständiga URL:er i formatet protokoll://användare:" -"lösenord@värd:port här, värdena i de andra fälten kommer då att skrivas " -"över.\n" +"Ange serverns adress. För att ange serverprotokollet, inled värden med " +"protokollidentifieraren. Om inget protokoll anges, kommer " +"standardprotokollet (ftp://) att användas. Du kan även ange fullständiga URL:" +"er i formatet protokoll://användare:lösenord@värd:port här, värdena i de " +"andra fälten kommer då att skrivas över.\n" "\n" "Protokoll som stöds:\n" "- ftp:// för vanlig FTP med frivillig kryptering\n" @@ -3514,7 +3619,7 @@ "- ftps:// för FTP över TLS (implicit)\n" "- ftpes:// för FTP över TLS (explicit)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3523,96 +3628,101 @@ "Ange lösenordet för filen \"%s\".\n" "Den konverterade filen kommer att vara skyddad med samma lösenord." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Ange porten på vilken servern lyssnar.\n" -"Standard för FTP är 21, standard för SFTP är 22." +"Ange porten som servern lyssnar på. Standard för FTP är 21, standard för " +"SFTP är 22." + +#: ../../locales/../src/interface/loginmanager.cpp:73 +msgid "Enter username" +msgstr "Ange användarnamn" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:80 msgid "Enter username and password" msgstr "Ange användarnamn och lösenord" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Fel vid export av instaällningar" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Importfel" -#: ../../locales/../src/interface/QueueView.cpp:1903 +#: ../../locales/../src/interface/QueueView.cpp:1616 msgid "Error loading queue" msgstr "Fel vid inläsning av kön" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1824 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:864 +#: ../../locales/../src/interface/filter.cpp:956 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:246 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:64 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:128 +#: ../../locales/../src/interface/QueueView.cpp:1525 +#: ../../locales/../src/interface/search.cpp:1262 +#: ../../locales/../src/interface/search.cpp:1281 +#: ../../locales/../src/interface/sitemanager.cpp:90 +#: ../../locales/../src/interface/sitemanager.cpp:522 +#: ../../locales/../src/interface/sitemanager.cpp:582 +#: ../../locales/../src/interface/sitemanager.cpp:686 +#: ../../locales/../src/interface/sitemanager.cpp:774 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "Fel vid inläsning av XML-fil" -#: ../../locales/../src/interface/QueueView.cpp:1813 +#: ../../locales/../src/interface/QueueView.cpp:1514 msgid "Error saving queue" msgstr "Fel vid sparande av kön" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "Error starting program" msgstr "Fel vid start av programmet" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1543 +#: ../../locales/../src/interface/sitemanager.cpp:631 +#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2298 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 msgid "Error writing xml file" msgstr "Fel vid skrivning av XML-fil" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:280 +#: ../../locales/../src/interface/StatusView.cpp:342 msgid "Error:" msgstr "Fel:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2024 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Exempel: png \"c:\\program\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1674 msgid "Examples" msgstr "Exempel" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Exe&cute" msgstr "&Kör" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:60 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Den körbara filen innehåller ingen versionsinformation, kan därför inte söka " @@ -3622,19 +3732,23 @@ msgid "Explorer" msgstr "Utforskare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1601 +msgid "Export &Filters" +msgstr "Exportera &Filter" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 msgid "Export &Queue" msgstr "Exportera &kö" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1591 msgid "Export &Settings" msgstr "Exportera &inställningar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1572 msgid "Export settings" msgstr "Exportera inställningar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1280 msgid "F&ilter name:" msgstr "F&ilternamn:" @@ -3642,20 +3756,19 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:504 msgid "FTP - File Transfer Protocol" msgstr "FTP - Filöverföringsprotokoll" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Filöverföringsprotokoll med frivillig kryptering" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Osäkert Filöverföringsprotokoll" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FTP Engine not initialized, can't connect" msgstr "FTP-motorn är inte initierad, kan inte ansluta" @@ -3680,80 +3793,84 @@ "FTP använder sekundära anslutningar för dataöverföringar. Dessa " "extraanslutningar kan etableras på två sätt." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP över explicit TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP över implicit TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:540 +#: ../../locales/../src/interface/LocalListView.cpp:613 +#: ../../locales/../src/interface/LocalListView.cpp:914 +#: ../../locales/../src/interface/LocalListView.cpp:1825 +#: ../../locales/../src/interface/LocalTreeView.cpp:857 +#: ../../locales/../src/interface/LocalTreeView.cpp:1132 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Misslyckades med att byta katalog" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:142 +#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:159 msgid "Failed to change language" msgstr "Misslyckades med att byta språk" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 +msgid "Failed to convert command to 8 bit charset" +msgstr "Kunde inte konvertera kommandot till 8-bits teckenuppsättning" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2081 msgid "Failed to copy or move sites" msgstr "Misslyckades med att kopiera eller flytta platserna" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:328 msgid "Failed to create backup copy of xml file" msgstr "Misslyckades med att skapa en säkerhetskopia av XML-filen" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:808 +#, fuzzy +msgid "Failed to create listen socket, aborting." msgstr "Misslyckades med att skapa ett lyssningssockel, avbryter" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4167 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4171 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Misslyckades med att skapa en lyssningssockel för överföring i aktivt läge" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/LocalTreeView.cpp:633 msgid "Failed to get 'My Documents' path" msgstr "Misslyckades med att erhålla sökvägen till \"Mina dokument\"" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get desktop path" msgstr "Misslyckades med att erhålla sökvägen till Skrivbordet" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Misslyckades med att läsa av andra partens adress för kontrollanslutningen, " "anslutningen stängd." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Misslyckades med att läsa av andra partens adress för dataanslutningen, " "anslutningen stängd." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:86 msgid "Failed to initialize FTP engine" msgstr "Misslyckades med att initiera FTP-motorn" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:798 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:279 msgid "Failed to initialize TLS." msgstr "Misslyckades med att initiera TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:93 msgid "Failed to initialize networking" msgstr "Misslyckades med att initiera nätverket" @@ -3761,71 +3878,73 @@ msgid "Failed to load panels, invalid resource files?" msgstr "Misslyckades med att läsa in paneler, ogiltiga resursfiler?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Misslyckades med att läsa in den privata nyckeln: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Misslyckades med att öppna \"%s\" för skrivning" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2657 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Misslyckades med att öppna \"%s\" för läsning" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2625 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:997 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Misslyckades med att öppna \"%s\" för skrivning" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:352 msgid "Failed to parse returned path." msgstr "Misslyckades med att tolka returnerad sökväg." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1020 msgid "Failed to receive data" msgstr "Misslyckades med att ta emot data" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:189 msgid "Failed to retrieve directory listing" msgstr "Misslyckades med att hämta kataloglistning" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +#, fuzzy +msgid "Failed to retrieve external ip address, aborting." msgstr "Misslyckades med att hämta extern ip-adress, avbryter" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3849 msgid "Failed to retrieve external ip address, using local address" msgstr "Misslyckades med att hämta extern ip-adress, använder lokal adress" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 +#: ../../locales/../src/interface/netconfwizard.cpp:712 +#, fuzzy +msgid "Failed to retrieve local ip address, aborting." +msgstr "Misslyckades med att läsa av lokal ip-adress. Avbryter" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868 msgid "Failed to retrieve local ip address." msgstr "Misslyckades med att läsa av lokal ip-adress." -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Misslyckades med att läsa av lokal ip-adress. Avbryter" - -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Misslyckades med att läsa av den externa IP-adressen." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Misslyckades med att skicka kommandot." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:157 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Misslyckades med att ställa in språket till %s (%s), använder systemets " "standardspråk" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:135 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3833,49 +3952,48 @@ "Misslyckades med att ställa in språket till %s (%s), använder systemets " "standardspråk (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:124 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Misslyckades med att ställa in språket till %s (%s), använder systemets " "standardspråk." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:159 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" "Misslyckades med att ställa in språket till %s, använder systemets " "standardspråk" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:131 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Misslyckades med att ställa in språket till %s, använder systemets " "standardspråk (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:121 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" "Misslyckades med att ställa in språket till %s, använder systemets " "standardspråk." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:214 msgid "Failed to validate settings" msgstr "Misslyckades med att validera inställningarna" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket.cpp:1320 msgid "Failed to verify peer certificate" msgstr "Misslyckades med att verifiera andra partens certifikat" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:508 #, c-format msgid "Failed to write to file %s" msgstr "Misslyckades med att skriva till filen %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:341 msgid "Failed to write xml file" msgstr "Misslyckades med att skriva XML-fil" @@ -3887,15 +4005,15 @@ msgid "Fall back to active mode" msgstr "Fall tillbaka till aktivt läge" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2347 msgid "Fil&e:" msgstr "Fi&l:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1343 msgid "Fil&es" msgstr "Fil&er" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "Fil" @@ -3903,11 +4021,11 @@ msgid "File Types" msgstr "Filtyper" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "File descriptor not a socket" msgstr "Filbeskrivaren är ingen sockel" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Filen innehåller ingen importerbar data." @@ -3915,7 +4033,7 @@ msgid "File editing" msgstr "Filredigering" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1630 msgid "File exists" msgstr "Filen finns" @@ -3923,7 +4041,7 @@ msgid "File exists action" msgstr "Åtgärd om filen finns" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1694 msgid "File has changed" msgstr "Filen har ändrats" @@ -3931,63 +4049,65 @@ msgid "File lists" msgstr "Fillistor" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/interface/edithandler.cpp:1562 +#: ../../locales/../src/interface/FileZilla.cpp:589 +#: ../../locales/../src/interface/FileZilla.cpp:674 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Filen hittades inte" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3185 +#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/search.cpp:692 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Filsökning" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:113 msgid "File transfer aborted by user" msgstr "Filöverföringen avbröts av användaren" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:101 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Filöverföringen avbröts av användaren efter att ha överfört %s på %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer failed" msgstr "Filöverföringen misslyckades" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:107 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Filöverföringen misslyckades efter att ha överfört %s på %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:120 msgid "File transfer skipped" msgstr "Filöverföringen hoppades över" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:117 msgid "File transfer successful" msgstr "Filöverföringen lyckades" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:98 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Filöverföringen lyckades, överförde %s på %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1146 msgid "File transfers still in progress." msgstr "Filöverföringar pågår fortfarande." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2578 msgid "File would transfer with ASCII data type." msgstr "Filen skulle gå att överföra som ASCII-data." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 msgid "File would transfer with binary data type." msgstr "Filen skulle gå att överföra som binär data." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:419 +#: ../../locales/../src/interface/quickconnectbar.cpp:103 msgid "FileZilla Error" msgstr "FileZilla-fel" @@ -3999,15 +4119,15 @@ "FileZilla kan nu testa din konfiguration för att säkerställa att allt är " "korrekt konfigurerat." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "FileZilla is already connected to a server." msgstr "FileZilla är redan anslutet till en server." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "FileZilla måste startas om för att bytet av språk skall träda i kraft." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2112 msgid "FileZilla updates" msgstr "Uppdateringar av FileZilla" @@ -4015,57 +4135,53 @@ msgid "Filelist status &bars" msgstr "Fillistornas status&rad" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:286 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "Filnamn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Filnamns&filter..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3017 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2088 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Filnamnet kan inte skapas för katalogen %s och filnamnet %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1616 msgid "Filename invalid" msgstr "Filnamnet är ogiltigt" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "Filename unchanged" msgstr "Filnamnet är oförändrat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1711 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2144 msgid "Filename:" msgstr "Filnamn:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Filnamn får inte innehålla något av följande tecken: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "Filnamn får inte innehålla något av följande tecken: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2002 msgid "Files currently being edited" msgstr "Filer som för närvarande redigeras" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:156 msgid "Filesize" msgstr "Filstorlek" @@ -4073,18 +4189,18 @@ msgid "Filesize format" msgstr "Format för filstorlek" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:157 msgid "Filetype" msgstr "Filtyp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2036 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Filtypsassociationer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1336 msgid "Filter applies to:" msgstr "Filtret gäller för:" @@ -4093,44 +4209,48 @@ msgstr "Filtrera felaktiga tecken i filnamn" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Filternamnet finns redan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1303 msgid "Filter out items matching all of the following" msgstr "Filtrera ut objekt som matchar alla av följande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1304 msgid "Filter out items matching any of the following" msgstr "Filtrera ut objekt som matchar något av följande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1305 msgid "Filter out items matching none of the following" msgstr "Filtrera ut objekt som inte matchar något av följande" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1306 +msgid "Filter out items matching not all of the following" +msgstr "Filtrera ut objekt som inte matchar alla av följande" + +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Filter set already exists" msgstr "Filteruppsättningen finns redan" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Filtrera kataloglistningar" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Filtervalideringen misslyckades" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 msgid "Find &files" msgstr "Hitta &filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 msgid "Find d&irectories" msgstr "Hitta &kataloger" @@ -4142,12 +4262,14 @@ msgid "Fingerprint (SHA-256):" msgstr "Fingeravtryck (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2077 +#, fuzzy +msgid "Fingerprints:" msgstr "Fingeravtryck:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Konfigurationsguide för brandvägg och router" @@ -4164,7 +4286,7 @@ msgstr "" "För högre tillförlitlighet bör du ange ett intervall på minst 10 portar." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:245 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4172,7 +4294,7 @@ "För denna session kommer standardinställningarna att användas. Ändringar i " "inställningarna kommer inte att sparas." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:548 msgid "Force &UTF-8" msgstr "Tvinga &UTF-8" @@ -4180,7 +4302,7 @@ msgid "Force showing &hidden files" msgstr "Tvinga visning av &dolda filer" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:655 msgid "Force showing hidden files" msgstr "Tvinga visning av dolda filer" @@ -4188,19 +4310,24 @@ msgid "Format specifications:" msgstr "Formatspecifikationer:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2019 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Format: Filändelsen följd av kommando och argument korrekt angivna med " "citationstecken." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:686 #, c-format msgid "Found new %s %s\n" msgstr "Hittade ny %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:49 +#, fuzzy, c-format +msgid "Function %s failed" +msgstr "Autentiseringen misslyckades." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "Further documentation" msgstr "Vidare dokumentation" @@ -4208,7 +4335,7 @@ msgid "General" msgstr "Allmänt" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:476 msgid "General SOCKS server failure" msgstr "Allmänt SOCKS-serverfel" @@ -4221,72 +4348,76 @@ msgid "Get external IP address from the following URL:" msgstr "Läs av extern IP-adress från följande URL:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 msgid "Getting help" msgstr "Få hjälp" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:236 +#: ../../locales/../src/interface/filter.cpp:292 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" "Angivet namn för filteruppsättning finns redan. Skriv över filteruppsättning?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Globala bokmärken" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket.cpp:319 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS-fel %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket.cpp:322 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS-fel %d i %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket.cpp:314 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS-fel %d i %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket.cpp:311 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS-fel %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:707 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Green" +msgstr "Grön" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:430 msgid "Group permissions" msgstr "Grupprättigheter" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "H&igh" msgstr "H&ög" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP över TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2041 msgid "Hash:" msgstr "Hashsumma:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Dold" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/queue.cpp:888 +#: ../../locales/../src/interface/queue.cpp:944 msgid "High" msgstr "Hög" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Highest" msgstr "Högst" @@ -4294,53 +4425,55 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Högsta tillgängliga porten måste vara ett tal mellan 1024 och 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1162 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Håll Skift-tangenten nedtryckt för att växla filtertillståndet på båda " "sidorna samtidigt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:612 msgid "Homepage:" msgstr "Webbsida:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Host is down" msgstr "Värden ligger nere" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Värdnyckelns fingeravtryck:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:925 msgid "Host key mismatch" msgstr "Värdnyckeln stämmer inte" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:156 msgid "Host starts with '[' but no closing bracket found." msgstr "Värden börjar med \"[\" men ingen avslutande hakparentes hittades." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:485 msgid "Host unreachable" msgstr "Värden är inte tillgänglig" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:970 msgid "Host:" msgstr "Värd:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:980 +#, fuzzy +msgid "Hostkey algorithm:" +msgstr "Publik nyckel-algoritm:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:424 msgid "Hours," msgstr "Timmar," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1562 msgid "I&SO 8601 (example: 15:47)" msgstr "IS&O 8601 (exempel: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:116 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6-adresser stöds inte vid användning av SOCKS4-proxy" @@ -4354,7 +4487,7 @@ "tid än den specificerade, kommer anslutningen att stängas och FileZilla " "kommer att försöka återansluta." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2276 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Tillhandahåll loggar med loggningsnivån \"Utförlig\" vid felrapportering." @@ -4380,14 +4513,14 @@ "ansluta till felkonfigurerade servrar som vägrar använda det valda " "överföringsläget." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:958 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "" "Om bytet av värdnyckel inte var väntat bör du kontakta serveradministratören." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4395,7 +4528,7 @@ "Om problemet kvarstår, är det någon router och/eller brandvägg som hindrar " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4403,7 +4536,7 @@ "Om problemet kvarstår, är det någon router och/eller brandvägg som avbryter " "anslutningen." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2199 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4413,7 +4546,7 @@ "till \".1\" i slutet på filnamnet (möjligen skrivs äldre loggfiler över) och " "en ny fil skapas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4421,7 +4554,7 @@ "Om den symboliska länken pekar på en katalog, kan FileZilla antingen ta bort " "den symboliska länken eller ta bort innehållet i katalogen." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4429,12 +4562,12 @@ "Om det här problemet kvarstår bör du kontakta tillverkaren av din router " "eller brandvägg för att hitta en lösning." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Om det här problemet kvarstår bör du kontakta tillverkaren av din router." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " @@ -4445,7 +4578,7 @@ "synkroniserad med serverns. Om tiden skiljer sig (t.ex. olika tidszoner), " "ange en tidszonsskillnad i Platshanteraren." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1788 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4453,7 +4586,7 @@ "Om tidsstämpelbaserad jämförelse används, anse två filer som likvärdiga när " "deras tidsstämplar inte skiljer sig mer än detta tröskelvärde." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1893 msgid "If you change the language, you need to restart FileZilla." msgstr "Om du ändrar språket måste du starta om FileZilla." @@ -4465,7 +4598,7 @@ "Om du klickar på Testa, kommer FileZilla att ansluta till probe.filezilla-" "project.org och genomföra några enkla tester." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1168 msgid "If you close FileZilla, your changes will be lost." msgstr "Om du stänger FileZilla kommer du att förlora dina ändringar." @@ -4487,7 +4620,7 @@ "Om du har problem att hämta kataloglistningar eller överföra filer, prova " "att ändra standardöverföringsläget." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4522,7 +4655,7 @@ "Om du använder en router bör du försäkra dig om att alla dessa portar är " "vidarebefordrade till maskinen som du kör FileZilla på." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4530,16 +4663,16 @@ "Om din router fortsätter att ändra IP-adressen bör du kontakta tillverkaren " "av din router." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Importera data från tidigare version" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "Import settings" msgstr "Importinställningar" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Importen lyckades" @@ -4583,19 +4716,11 @@ "FileZilla att fråga servern efter en port och ansluta till den angivna " "porten. För detta behöver inte så mycket konfigureras." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Ofullständig kedja, toppcertifikatet är inget självsignerat certifikat från " -"en certifikatsutfärdare" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "Fel lösenord" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4603,20 +4728,20 @@ "Information om senaste versionen av FileZilla kunde inte hämtas. Försök igen " "senare." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:789 msgid "Initializing TLS..." msgstr "Initierar TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 msgid "Insecure algorithm!" msgstr "Osäker algoritm!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:773 msgid "Insecure server, it does not support FTP over TLS." msgstr "Osäker server, den stöder inte FTP över TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/engine/server.cpp:910 +#: ../../locales/../src/engine/server.cpp:931 #: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktiv" @@ -4625,29 +4750,29 @@ msgid "Interface" msgstr "Gränssnitt" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Interrupted by signal" msgstr "Avbruten av signal" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:219 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "Avbröts av användaren" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 msgid "Invalid Content-Length" msgstr "Ogiltig Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 msgid "Invalid HTTP Response" msgstr "Ogiltigt HTTP-svar" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1018 msgid "Invalid argument passed" msgstr "Ogiltigt argument gavs" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:461 +#: ../../locales/../src/engine/ControlSocket.cpp:518 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4655,44 +4780,48 @@ "Ogiltig teckensekvens togs emot, inaktiverar UTF-8. Välj UTF-8-alternativet " "i Platshanteraren för att tvinga UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 msgid "Invalid chunk size" msgstr "Ogiltig chunk-storlek" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Ogiltigt data togs emot" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Ogiltigt datum" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Ogiltigt filnamn" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:161 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Ogiltig värd, efter avslutande hakparentes får bara kolon och port följa." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:641 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Ogiltigt värdnamn: %s" + +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "Invalid input" msgstr "Ogiltig inmatning" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:67 +#: ../../locales/../src/engine/server.cpp:188 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Ogiltig port angiven. Porten måste vara ett värde från 1 till 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/engine/server.cpp:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:164 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4706,42 +4835,38 @@ "ftps:// för FTP över TLS (implicit) och\n" "ftpes:// för FTP över TLS (explicit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4305 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Ogiltig proxyvärd, efter avslutande hakparentes får bara kolon och port " "följa." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Ogiltigt reguljärt uttryck" + +#: ../../locales/../src/interface/search.cpp:692 msgid "Invalid regular expression in search conditions." msgstr "Ogiltigt reguljärt uttryck i sökvillkoren." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:568 msgid "Invalid response code" msgstr "Ogiltig svarskod" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:687 #, c-format msgid "Invalid search conditions: %s" msgstr "Ogiltiga sökvillkor: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:786 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Invalid site path" msgstr "Ogiltig sökväg för platsen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Ogiltig storlek i villkor" @@ -4749,31 +4874,31 @@ msgid "Invalid username given." msgstr "Ogiltigt användarnamn angivet." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Invalid value for ai_flags" msgstr "Felaktigt värde för ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "Invalid value for hints" msgstr "Ogiltigt värde för tips" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction country:" msgstr "Rättskipningsland:" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction locality:" msgstr "Rättskipningsplats:" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Jurisdiction state or province:" msgstr "Rättskipningsstat eller provins:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1745 msgid "Keep directories on top" msgstr "Lista kataloger överst" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:659 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4784,7 +4909,7 @@ "FileZilla genomför vissa tester för att kontrollera om servern stöder den " "här funktionen, kan testet misslyckas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2014 msgid "Key exchange" msgstr "Nyckelutbyte" @@ -4792,29 +4917,29 @@ msgid "Key exchange:" msgstr "Nyckelutbyte:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:908 +#: ../../locales/../src/engine/server.cpp:929 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1331 msgid "Key file" msgstr "Nyckelfil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "L&owest" msgstr "&Lägst" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1874 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Språk" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1448 msgid "Language changed" msgstr "Språket har ändrats" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:158 msgid "Last modified" msgstr "Senast ändrad" @@ -4834,30 +4959,30 @@ msgid "Limit local ports" msgstr "Begränsa lokala portar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2168 msgid "Limit size of logfile" msgstr "Begränsa loggfilens storlek" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2176 msgid "Limit:" msgstr "Gräns:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 msgid "Line length exceeded" msgstr "Radlängd överstigen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:727 msgid "Linked against" msgstr "Länkad mot" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Lyssningssockel stängd" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:291 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Listing:" msgstr "Listning:" @@ -4865,50 +4990,59 @@ msgid "Lo&west available port:" msgstr "&Lägsta tillgängliga port:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1144 +#: ../../locales/../src/interface/edithandler.cpp:1380 msgid "Local" msgstr "Lokal" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1015 msgid "Local address in use" msgstr "Lokal adress används" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Local endpoint has been closed" msgstr "Lokal ändpunkt har stängts" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2291 msgid "Local file" msgstr "Lokal fil" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:314 msgid "Local file does not exist." msgstr "Den lokala filen finns inte." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:400 +#: ../../locales/../src/interface/updater.cpp:493 #, c-format msgid "Local file is %s\n" msgstr "Lokal fil är %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:310 msgid "Local file is a directory instead of a regular file." msgstr "Den lokala filen är en katalog istället för en vanlig fil." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Local file is not a valid filename." msgstr "Den lokala filen har inget giltigt filnamn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:650 +#: ../../locales/../src/interface/search.cpp:656 +msgid "Local file search" +msgstr "Lokal filsökning" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1090 msgid "Local filters:" msgstr "Lokala filter:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3320 +msgid "Local path handling:" +msgstr "Hantering av lokal sökväg:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Lokal plats:" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Locality:" msgstr "Plats:" @@ -4916,16 +5050,16 @@ msgid "Log file" msgstr "Loggfil" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:965 msgid "Logged in" msgstr "Inloggad" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Loggning" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:847 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4934,7 +5068,7 @@ "servern kan hantera UTF-8. Kan inte falla tillbaka på lokal " "teckenuppsättning eftersom proxy används." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:855 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4942,8 +5076,9 @@ "Inloggningsdata innehåller icke-ASCII-tecken och det är inte säkert att " "servern kan hantera UTF-8. Provar lokal teckenuppsättning." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:884 +#, fuzzy +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" "Inloggningssekvensen fullständigt utförd, ändå inte inloggad. Avbryter." @@ -4962,13 +5097,13 @@ "Inloggningstyp, kan bara användas tillsammans med en URL för FTP. Argumentet " "måste antingen vara \"%s\" eller \"%s\"" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:883 +#: ../../locales/../src/interface/queue.cpp:939 msgid "Low" msgstr "Låg" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:881 +#: ../../locales/../src/interface/queue.cpp:937 msgid "Lowest" msgstr "Lägst" @@ -4980,63 +5115,71 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Magenta" +msgstr "Magenta" + +#: ../../locales/../src/interface/xmlfunctions.cpp:38 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Försäkra dig om att filen är åtkomlig och att den är ett välformat XML-" "dokument." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:774 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:789 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:821 #, c-format msgid "Malformed chunk data: %s" msgstr "Felaktig chunk-data: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:706 #, c-format msgid "Malformed header: %s" msgstr "Felaktigt huvud: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 msgid "Malformed reply, server not sending proper line endings" msgstr "Felaktigt svar, servern skickar inte korrekta radslut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2633 +#: ../../locales/../src/interface/manual_transfer.cpp:298 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:310 +#: ../../locales/../src/interface/manual_transfer.cpp:314 +#: ../../locales/../src/interface/manual_transfer.cpp:321 +#: ../../locales/../src/interface/manual_transfer.cpp:327 +#: ../../locales/../src/interface/manual_transfer.cpp:333 +#: ../../locales/../src/interface/manual_transfer.cpp:354 msgid "Manual transfer" msgstr "Manuell överföring" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3108 msgid "Match all of the following" msgstr "Matcha alla av följande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 msgid "Match any of the following" msgstr "Matcha något av följande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 msgid "Match none of the following" msgstr "Matcha inget av följande" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3111 +msgid "Match not all of the following" +msgstr "Matcha inte alla av följande" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "Maximalt antal samtidiga ö&verföringar:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Memory allocation failure" msgstr "Minnesallokeringsfel" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:385 +#: ../../locales/../src/interface/Mainfrm.cpp:1762 msgid "Message log" msgstr "Meddelandelogg" @@ -5044,95 +5187,99 @@ msgid "Message log position" msgstr "Placering av meddelandeloggen" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Message too large" msgstr "Meddelandet är för stort" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:440 msgid "Minutes" msgstr "Minuter" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2206 msgid "Move &down" msgstr "Flytta &ner" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2200 msgid "Move &up" msgstr "Flytta &upp" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:987 msgid "My Computer" msgstr "Den här Datorn" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:977 msgid "My Documents" msgstr "Mina Dokument" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:339 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:738 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:740 msgid "My Sites" msgstr "Mina platser" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:201 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:204 msgid "N/a" msgstr "Inte tillgänglig" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2671 msgid "Name" msgstr "Namn" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216 msgid "Name already exists" msgstr "Namnet finns redan" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 msgid "Name of bookmark already exists." msgstr "Ett bokmärke med det namnet finns redan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 msgid "Name:" msgstr "Namn:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 msgid "Natural sort" msgstr "Naturlig sortering" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Du måste ange ett filternamn" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:650 +msgid "Need to enter valid local path" +msgstr "Du måste ange en giltig lokal sökväg" + +#: ../../locales/../src/interface/search.cpp:677 msgid "Need to enter valid remote path" msgstr "Du måste ange en giltig fjärrsökväg" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 msgid "Need to specify a character encoding" msgstr "Du måste ange en teckenkodning" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Neither nodename nor servname provided, or not known" msgstr "Varken nodnamn eller servname tillhandahållet, eller okända" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "Nätverksvärden har inga nätverksadresser inom begärd adressfamilj" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Network unreachable" msgstr "Nätverket är inte tillgängligt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2059 msgid "Never" msgstr "Aldrig" @@ -5144,37 +5291,37 @@ msgid "New &tab" msgstr "Ny &flik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2876 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nytt Bok&märke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2636 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:717 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2236 msgid "New bookmark" msgstr "Nytt bokmärke" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1163 +#: ../../locales/../src/interface/RemoteListView.cpp:1334 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1246 msgid "New directory" msgstr "Ny katalog" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:61 #, c-format msgid "New features and improvements in %s" msgstr "Nya funktioner och förbättringar i %s" @@ -5183,13 +5330,13 @@ msgid "New filter" msgstr "Nytt filter" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:938 msgid "New folder" msgstr "Ny katalog" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:602 +#: ../../locales/../src/interface/sitemanager.cpp:616 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2209 msgid "New site" msgstr "Ny plats" @@ -5197,27 +5344,27 @@ msgid "Next to the transfer queue" msgstr "Bredvid överföringskön" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:780 msgid "No" msgstr "Nej" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "No address associated with nodename" msgstr "Ingen adress är associerad med nodnamnet" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Ingen kategori att exportera" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1831 msgid "No command given, aborting." msgstr "Inget kommando gavs, avbryter." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3821 msgid "No external IP address set, trying default." msgstr "Ingen extern IP-adress inställd, provar standard." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "No files are currently being edited." msgstr "Inga filer redigeras för närvarande." @@ -5225,96 +5372,93 @@ msgid "No filter name given" msgstr "Inget filternamn angivet" -#: ../../locales/../src/engine/server.cpp:77 +#: ../../locales/../src/engine/server.cpp:81 #: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:195 msgid "No host given, please enter a host." msgstr "Ingen värd angiven, ange en värd." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Inga bilder tillgängliga" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Inga fler filer i kön!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:222 +#: ../../locales/../src/interface/filter.cpp:286 msgid "No name for the filterset given." msgstr "Inget namn för filteruppsättning angivet." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3043 msgid "No program associated with filetype" msgstr "Inget program är associerat med filtypen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2960 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Inget program har associerats för att redigera filer med ändelsen \"%s\"." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "No route to host" msgstr "Ingen väg till värden" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:397 msgid "No search results" msgstr "Inga sökresultat" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:349 msgid "No sites available" msgstr "Inga platser tillgängliga" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:454 msgid "No supported SOCKS5 auth method" msgstr "Ingen autentiseringsmetod för SOCKS5 stöds" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:107 msgid "No username given." msgstr "Inget användarnamn angivet." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1836 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1855 +#: ../../locales/../src/interface/sitemanager.cpp:16 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Ingen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2407 msgid "None selected yet" msgstr "Ingenting markerat ännu" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Nonrecoverable failure in name resolution" msgstr "Oåterställbart fel vid namnuppslagningen" #: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 +#: ../../locales/../src/engine/server.cpp:904 +#: ../../locales/../src/engine/server.cpp:925 #: ../../locales/../src/interface/manual_transfer.cpp:154 #: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/manual_transfer.cpp:546 +#: ../../locales/../src/interface/queue.cpp:886 +#: ../../locales/../src/interface/queue.cpp:942 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1328 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:311 +#: ../../locales/../src/interface/queueview_failed.cpp:336 msgid "Not all items could be requeued for transfer." msgstr "Alla poster kunde inte återplaceras i kö för överföring." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:181 +#: ../../locales/../src/interface/state.cpp:1244 msgid "Not connected" msgstr "Inte ansluten" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2045 msgid "Not connected to any server" msgstr "Inte ansluten till någon server" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Inte ansluten till någon server." @@ -5322,11 +5466,11 @@ msgid "Not connected." msgstr "Inte ansluten." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Not initialized, need to call WSAStartup" msgstr "Inte initierad, måste anropa WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:657 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Observera att den här funktionen endast stöds med FTP-protokollet." @@ -5341,7 +5485,7 @@ "Observera: Att använda en allmän proxy påtvingar passivt läge för FTP-" "anslutningar." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "Number of decimal places:" msgstr "Antal decimaler:" @@ -5349,40 +5493,41 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Antal försök måste vara mellan 0 och 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1970 msgid "O&pen file" msgstr "Ö&ppna fil" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:560 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1480 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1848 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3266 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3633 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3799 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3855 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "OK" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:748 msgid "OS version:" msgstr "OS-version:" @@ -5394,35 +5539,36 @@ "På följande sidor kommer det valda överföringsläget att konfigureras, såväl " "som läget att falla tillbaka på om det är aktiverat." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:790 msgid "Once" msgstr "En gång" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "Once a day" msgstr "En gång om dagen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2061 msgid "Once a week" msgstr "En gång i veckan" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:523 msgid "Only use plain FTP (insecure)" msgstr "Använd bara enkel FTP (osäkert)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "Open directory in system's file manager" msgstr "Öppna katalogen i systemets filhanterare" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Öppna Platshanteraren" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Öppna Platshanteraren." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Öppna Platshanteraren. Högerklicka för en lista av platser." @@ -5434,14 +5580,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Öppna Inställningsdialogen för FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 msgid "Opened as:" msgstr "Öppnad som:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1736 +#: ../../locales/../src/interface/LocalListView.cpp:1748 msgid "Opening failed" msgstr "Öppnandet misslyckades" @@ -5453,30 +5599,34 @@ msgid "Opens the Site Manager" msgstr "Öppnar Platshanteraren" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Öppnar dialogrutan för filtrering av kataloglistning. Högerklicka för att " "aktivera/inaktivera filtrena." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "Operating System:" msgstr "Operativsystem:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1026 msgid "Operation already in progress" msgstr "Åtgärden pågår redan" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1017 msgid "Operation in progress" msgstr "Åtgärden pågår" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Operation not supported" msgstr "Åtgärden stöds inte" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Orange" +msgstr "Orange" + +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Organization:" msgstr "Organisation:" @@ -5484,16 +5634,16 @@ msgid "Other SFTP options" msgstr "Andra SFTP-alternativ" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Other system error" msgstr "Annat systemfel" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:264 msgid "Other:" msgstr "Övrigt:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1021 +#: ../../locales/../src/engine/socket.cpp:1022 msgid "Out of memory" msgstr "Slut på minne" @@ -5501,57 +5651,57 @@ msgid "Overview" msgstr "Översikt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Skriv över om källan är &nyare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1443 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 msgid "Overwrite file" msgstr "Skriv över filen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1445 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if size differs" msgstr "Skriv över filen om storleken skiljer sig" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs or source file is newer" msgstr "Skriv över filen om storleken skiljer sig eller källfilen är nyare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1444 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file if source file newer" msgstr "Skriv över filen om källfilen är nyare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Skriv över om storleken &skiljer sig" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Skriv över om storle&ken skiljer sig eller källan är nyare" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" msgstr "Egen byggtyp: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:396 msgid "Owner permissions" msgstr "Ägarrättigheter" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:404 +#: ../../locales/../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "Ägare/Grupp" @@ -5568,7 +5718,7 @@ msgid "P&roxy host:" msgstr "Proxy&värd:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "PORT-kommandot påverkat av en router eller brandvägg." @@ -5576,18 +5726,18 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssivt läge (rekommenderas)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2381 msgid "Parameter not a valid URL" msgstr "Parametern är ingen giltig URL" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:573 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Tolkar %d byte versionsinformation.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2523 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "Pass&word:" msgstr "Lösen&ord:" @@ -5600,61 +5750,61 @@ msgid "Passive mode" msgstr "Passivt läge" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Passivt läge har ställts in som standardöverföringsläge." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Lösenord krävs" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:155 msgid "Path" msgstr "Sökväg" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3104 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2137 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Sökvägen kan inte skapas för katalogen %s och underkatalogen %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2336 msgid "Path not found:" msgstr "Sökvägen hittades inte:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2698 msgid "Paths" msgstr "Sökvägar" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1123 +#: ../../locales/../src/interface/edithandler.cpp:1260 +#: ../../locales/../src/interface/edithandler.cpp:1350 +#: ../../locales/../src/interface/edithandler.cpp:1360 msgid "Pending removal" msgstr "Borttagning pågår" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Rättighet" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1014 +#: ../../locales/../src/engine/socket.cpp:1023 msgid "Permission denied" msgstr "Åtkomst nekad" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:159 msgid "Permissions" msgstr "Rättigheter" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:756 msgid "Platform:" msgstr "Plattform:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5670,12 +5820,12 @@ "Konfigurera eventuella brandväggar och routrar så att FileZilla kan etablera " "utgående anslutningar till godtyckliga portar." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Inaktivera inställningar som \"DMZ mode\" eller \"Game mode\" på din router." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5691,13 +5841,13 @@ msgid "Please enter a custom time format." msgstr "Ange ett anpassat tidsformat." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Ange ett datum på formen ÅÅÅÅ-MM-DD såsom till exempel 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "Ange en hastighetsgräns större eller lika med 0 %s/s för hämtningar." @@ -5706,16 +5856,16 @@ msgid "Please enter a name for the new filter." msgstr "Ange ett namn för det nya filtret." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Ange ett nytt namn för det kopierade filtret." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:272 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Ange ett nytt namn för filteruppsättningen \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Ange ett nytt namn för filtret." @@ -5736,20 +5886,10 @@ "transfers." msgstr "Ange en siffra mellan 0 och 10 för antalet samtidiga överföringar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Ange ett lösenord för denna server:" -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Ange en sökväg och exekverbar fil att köra.\n" -"T.ex. c:\\somePath\\file.exe i MS Windows eller /somePath/file i Unix.\n" -"Du kan även ange programargument." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5757,29 +5897,29 @@ "Ange en tidsgräns mellan 10 och 9999 sekunder eller 0 för att inaktivera " "tidsgränser." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:216 msgid "Please enter a unique name for this filter set" msgstr "Ange ett unikt namn för den här filteruppsättningen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Ange ett användarnamn för den här servern:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Ange ett giltigt portintervall." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "Ange en URL från vilken man kan läsa av din externa IP-adress" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Ange en hastighetsgräns större eller lika med 0 %s/s för sändningar." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5787,27 +5927,41 @@ "Ange ett rått FTP-kommando.\n" "Användandet av råa FTP-kommandon kommer att tömma katalogcachen." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1825 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Ange komplett sökväg för ett program och dess argument. Kommandot kommer att " +"köras när kön har behandlats färdigt.\n" +"T.ex. c:\\somePath\\file.exe i MS Windows eller /somePath/file i Unix.\n" +"Du måste ange kommandon och dess argument korrekt med citationstecken om de " +"innehåller blanksteg." + +#: ../../locales/../src/interface/LocalListView.cpp:927 +#: ../../locales/../src/interface/LocalTreeView.cpp:1159 +#: ../../locales/../src/interface/RemoteListView.cpp:1321 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1233 msgid "Please enter the name of the directory which should be created:" msgstr "Ange namnet på katalogen som skall skapas:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2631 msgid "Please enter the name of the file which should be created:" msgstr "Ange namnet på filen som skall skapas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Ange användarnamn och lösenord för den här servern:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Ange din externa IP-adress" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5825,7 +5979,7 @@ "Följ instruktionerna noga då en felaktig konfiguration kommer att förhindra " "lyckade FTP-ansluningar." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5833,12 +5987,12 @@ "Försäkra dig om att FileZilla tillåts etablera utgående anslutningar och att " "du har angivit adressen till adressuppslagningstjänsten korrekt." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:141 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Försäkra dig om att önskad språkkonvention är installerad på ditt system." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5862,7 +6016,7 @@ "andra skadliga program. Det här kan ge upphov till ett falsklarm som du " "tryggt kan ignorera." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:697 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5878,7 +6032,11 @@ "Observera att vissa servrar kan bannlysa dig om du försöker återansluta för " "ofta eller med för korta intervall." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:115 +msgid "Please re-add local data directories in the settings dialog." +msgstr "" + +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5887,11 +6045,11 @@ "Kör den här guiden igen om du gör ändringar i din nätverksutrustning eller " "om du plötsligt upplever problem med servrar som tidigare har fungerat." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 msgid "Please select an action:" msgstr "Välj en åtgärd:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1667 msgid "Please select the categories you would like to import." msgstr "Välj kategori att importera." @@ -5922,7 +6080,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Välj de nya attributen för de markerade filerna." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5941,8 +6099,8 @@ msgid "Positio&n of the message log:" msgstr "&Placering av meddelandeloggen:" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Postal code:" msgstr "Postnummer:" @@ -5954,20 +6112,20 @@ msgid "Preallocation" msgstr "Förallokering" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:338 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1948 msgid "Predefined Sites" msgstr "Fördefinierade platser" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:696 msgid "Preserving file timestamps" msgstr "Bevarar tidsstämplar för filer" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Förhandsgranska:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1482 +msgid "Preview" +msgstr "Förhandsgranska" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket.cpp:1359 msgid "Primary connection and data connection certificates don't match." msgstr "" "Certifikateten för primär anslutning och dataanslutning stämmer inte överens." @@ -5980,15 +6138,15 @@ msgid "Print version information to stdout and exit" msgstr "Skriv versionsinformation till stdout och avsluta" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1744 msgid "Prioritize directories (default)" msgstr "Prioritera kataloger (standard)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Priority" msgstr "Prioritet" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2100 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6010,25 +6168,25 @@ msgstr "Proxy&lösenord:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Process &Queue" msgstr "Behandla &kön" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1019 msgid "Process file table overflow" msgstr "Överflöde i processfiltabellen" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Behandlade %s i %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1024 msgid "Protocol not supported" msgstr "Protokollet stöds inte" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Protocol not supported on given socket type" msgstr "Protokollet stöds inte på angiven sockeltyp" @@ -6045,41 +6203,41 @@ msgid "Proxy &user:" msgstr "Proxya&nvändare:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:463 msgid "Proxy authentication failed" msgstr "Proxyns autentisering misslyckades" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/transfersocket.cpp:106 +#: ../../locales/../src/engine/transfersocket.cpp:118 #, c-format msgid "Proxy handshake failed: %s" msgstr "Proxyhandskakningen misslyckades: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4299 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" "Proxyvärden börjar med \"[\" men ingen avslutande hakparentes hittades." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:322 #, c-format msgid "Proxy reply: %s" msgstr "Proxysvar: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:504 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Proxyns begäran misslyckades. Svar från proxyn: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:377 #, c-format msgid "Proxy request failed: %s" msgstr "Proxyns begäran misslyckades: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Proxyns begäran misslyckades: Okänd adresstyp i svaret från CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4328 msgid "Proxy set but proxy host or port invalid" msgstr "Proxyn är inställd men proxyns värd eller port är ogiltig" @@ -6091,55 +6249,56 @@ msgid "Public key algorithm:" msgstr "Publik nyckel-algoritm:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:464 msgid "Public permissions" msgstr "Publika rättigheter" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2688 msgid "Queue has been fully processed" msgstr "Hela kön har behandlats" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:436 #, c-format msgid "Queue: %s MiB" msgstr "Kö: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:372 #, c-format msgid "Queue: %s%s" msgstr "Kö: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:368 +#: ../../locales/../src/interface/statusbar.cpp:427 msgid "Queue: empty" msgstr "Kö: tom" -#: ../../locales/../src/interface/QueueView.cpp:440 +#: ../../locales/../src/interface/QueueView.cpp:195 msgid "Queued files" msgstr "Filer i kö" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Queueing:" msgstr "Köar:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "S&tarta om systemet" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "R&eboot system once" +msgstr "S&tarta om systemet en gång" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "F&järrkatalogträd" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "R&eset and requeue selected files" msgstr "Åt&erställ och lägg markerade filer i kö på nytt" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "Rått FTP-kommando" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:437 msgid "Re&ad" msgstr "&Läs" @@ -6148,11 +6307,11 @@ msgid "Re&fresh" msgstr "&Uppdatera" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "&Byt namn" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6160,20 +6319,20 @@ "Kör guiden igen och kontrollera noggrant dina inställningar och konfigurera " "alla routrar och brandväggar i enlighet med dessa." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:471 msgid "Rea&d" msgstr "Lä&s" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Skrivskyddad" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/interface/Mainfrm.cpp:1037 msgid "Really cancel current operation?" msgstr "Vill du verkligen avbryta aktuell åtgärd?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1415 +#: ../../locales/../src/interface/search.cpp:1195 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6183,21 +6342,21 @@ msgstr[1] "" "Vill du verkligen ta bort %d kataloger och deras innehåll från servern?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1193 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Vill du verkligen ta bort %d fil från servern?" msgstr[1] "Vill du verkligen ta bort %d filer från servern?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1420 +#: ../../locales/../src/interface/search.cpp:1199 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Vill du verkligen ta bort %s och %s från servern?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1051 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Vill du verkligen ta bort alla markerade filer och/eller kataloger från " @@ -6209,52 +6368,60 @@ "Vill du verkligen ta bort alla markerade filer och/eller kataloger från din " "dator?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Reason" msgstr "Orsak" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2681 msgid "Reboot now" msgstr "Starta om nu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:525 msgid "Rec&urse into subdirectories" msgstr "&Upprepa i underkataloger" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket.cpp:333 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Mottog TLS-varning från severn: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:2998 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Mottog en kataloglistning som verkar vara kodad i EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:1984 +#: ../../locales/../src/engine/directorylistingparser.cpp:2001 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Mottog en rad som överskred 10000 tecken, avbryter." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket.cpp:1342 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Den mottagna certikfatskedjan kunde inte verifieras. Verifieringsstatus är " +"%d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1006 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1035 msgid "Received data tainted" msgstr "Mottagen data är påverkad" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:552 msgid "Received invalid character in version information" msgstr "Mottog felaktigt tecken i versionsinformationen" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket.cpp:336 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Mottog okänd TLS-varning %d från servern" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:545 msgid "Received version information is too large" msgstr "Mottagen versionsinformation är för stor" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6266,73 +6433,71 @@ msgid "Reconnection settings" msgstr "Inställningar för återanslutning" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Återansluter till senaste använda servern" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Lägger till filer i kön rekursivt." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Ändrar rättigheter rekursivt." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Tar bort filer och kataloger rekursivt." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:17 +msgid "Red" +msgstr "Röd" + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:619 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Omdirigering till ogiltig URI eller URI som inte stöds: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:626 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Omdirigering till ogiltig adress eller adress som inte stöds: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Uppdatera fil- och kataloglistor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3875 msgid "Remember passwords?" msgstr "Komma ihåg lösenord?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1107 msgid "Remote" msgstr "Fjärran" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket.cpp:977 msgid "Remote certificate not trusted." msgstr "Fjärrcertifikatet inte pålitligt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2326 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Remote file" msgstr "Fjärrfil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:672 +#: ../../locales/../src/interface/search.cpp:677 msgid "Remote file search" msgstr "Fjärrfilsökning" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1125 msgid "Remote filters:" msgstr "Fjärrfilter:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1098 msgid "Remote path" msgstr "Fjärrsökväg" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6341,7 +6506,7 @@ "Fjärrsökvägen kan inte tolkas. Försäkra dig om att det är en giltig absolut " "sökväg och att den stöds av den aktuella platsens servertyp (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1132 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6350,50 +6515,50 @@ "Fjärrsökvägen kan inte tolkas. Försäkra dig om att det är en giltig absolut " "sökväg och att den stöds av den valda servertypen (%s)." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Fjärrsökvägen kan inte tolkas. Försäkra dig om att det är en giltig absolut " "sökväg." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:333 msgid "Remote path could not be parsed." msgstr "Fjärrsökvägen kunde inte tolkas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3225 msgid "Remote path handling:" msgstr "Hantering av fjärrsökväg:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Remote path:" msgstr "Fjärrsökväg:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Fjärrplats:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 msgid "Remove &all" msgstr "&Ta bort alla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &selected" msgstr "Ta bort &markerade" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1448 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Rename file" msgstr "Byt namn på fil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 msgid "Rename selected directory" msgstr "Byt namn på markerad katalog" @@ -6402,71 +6567,71 @@ msgid "Rename selected files and directories" msgstr "Byt namn på markerade filer och kataloger" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3455 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2332 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Byter namn på \"%s\" till \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 msgid "Reporting bugs and feature requests" msgstr "Rapportera fel och efterfråga funktioner" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:368 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Begäran misslyckades - klienten kör inte identd (eller är den inte åtkomlig " "från servern)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:371 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Begäran misslyckades - klientens identd kunde inte bekräfta användar-ID:t" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:365 msgid "Request rejected or failed" msgstr "Begäran vägrades eller misslyckades" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:521 msgid "Require explicit FTP over TLS" msgstr "Kräv explicit FTP över TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "Require implicit FTP over TLS" msgstr "Kräv implicit FTP över TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 msgid "Reset and requeue &all" msgstr "&Återställ och lägg alla filer i kö på nytt" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Resolved protocol is unknown" msgstr "Uppslaget protokoll är okänt" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:443 #, c-format msgid "Resolving address of %s" msgstr "Slår upp adressen för %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1025 msgid "Resource temporarily unavailable" msgstr "Resursen är tillfälligt otillgänglig" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:353 msgid "Response:" msgstr "Svar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3171 msgid "Results:" msgstr "Resultat:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Resume file transfer" @@ -6480,19 +6645,19 @@ "Återupptagning av ASCII-filer kan skapa problem om servern använder ett " "annat radslutsformat än klienten." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1346 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:868 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Hämtar kataloglistning för \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1343 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:865 msgid "Retrieving directory listing..." msgstr "Hämtar kataloglistning..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3836 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Hämtar extern IP-adress från %s" @@ -6505,17 +6670,17 @@ msgid "S&how the Site Manager on startup" msgstr "Visa Plats&hanteraren vid start" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "S&täng av systemet" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&hutdown system once" +msgstr "S&täng av systemet en gång" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3095 msgid "S&top" msgstr "S&toppa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "Försätt systemet i &vänteläge" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:414 +msgid "S&uspend system once" +msgstr "F&örsätt systemet i vänteläge en gång" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" @@ -6529,46 +6694,48 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:142 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4-proxyn kommer ansluta till: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:170 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 stöder inte användarnamn och lösenord som är längre än 255 tecken." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:715 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "Save settings?" msgstr "Spara inställningarna?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:442 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "Saving of password has been disabled by your system administrator." msgstr "Sparande av lösenord har inaktiverats av din systemadministratör." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:993 msgid "Saving of passwords has been disabled by you." msgstr "Sparande av lösenord har inaktiverats av dig." -#: ../../locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "Söker efter filer att lägga till i kön" - -#: ../../locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" -msgstr "Söker efter filer att skicka" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1462 +msgid "Scale factor:" +msgstr "Skalningsfaktor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3101 msgid "Search &conditions:" msgstr "Sök&villkor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3083 msgid "Search &directory:" msgstr "Sök i &katalogen:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Sök rekursivt efter filer." @@ -6576,16 +6743,20 @@ msgid "Search server for files" msgstr "Sök efter filer på servern" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3052 +msgid "Search type:" +msgstr "Typ av sökning:" + +#: ../../locales/../src/interface/statusbar.cpp:509 msgid "Security information" msgstr "Säkerhetsinformation" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Se även: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2414 msgid "Sele&ct server" msgstr "Väl&j server" @@ -6603,7 +6774,7 @@ msgstr "" "Välj standardåtgärd att utföra om målfilen för en överföring redan finns." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1543 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Välj standardredigerare" @@ -6624,29 +6795,33 @@ "Välj standardåtgärd om filen redan finns (gäller bara för de för närvarande " "markerade filerna i kön)." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "Välj filen som innehåller den privata nyckeln" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Välj fil för exporterad data" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Välj fil för exporterade filter" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1427 msgid "Select file for exported queue" msgstr "Välj fil för exporterad kö" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Välj fil för exporterade inställningar" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2281 msgid "Select file for exported sites" msgstr "Välj fil för exporterade platser" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Välj fil att importera inställningar från" @@ -6654,15 +6829,15 @@ msgid "Select file to upload" msgstr "Välj fil att skicka" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Välj filnamn för den konverterade nyckelfilen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 msgid "Select how these files should be opened." msgstr "Välj hur dessa filer skall öppnas." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:856 msgid "Select target download directory" msgstr "Välj katalog att hämta till" @@ -6670,92 +6845,92 @@ msgid "Select target filename" msgstr "Välj målfilens namn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1580 msgid "Select the categories to export:" msgstr "Välj kategorier att exportera:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1506 msgid "Select the private data you would like to delete." msgstr "Välj känslig data som du vill rensa ut." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:815 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "%d katalog med innehåll är markerad för överföring." msgstr[1] "%d kataloger med innehåll är markerade för överföring." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d katalog markerad." msgstr[1] "%d kataloger markerade." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:813 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "%d fil är markerad för överföring." msgstr[1] "%d filer är markerade för överföring." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "%d fil är markerad. Total storlek: %s" msgstr[1] "%d filer är markerade. Total storlek: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "%d fil är markerad. Total storlek: Minst %s" msgstr[1] "%d filer är markerade. Total storlek: Minst %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:819 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s och %s är markerade för överföring." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "%s och %s är markerade. Total storlek: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "%s och %s är markerade. Total storlek: Minst %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1488 +#: ../../locales/../src/interface/edithandler.cpp:1562 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Vald redigerare finns inte." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1867 msgid "Selected file already being edited" msgstr "Vald fil redigeras redan" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "Vald fil är redan inläst" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1660 msgid "Selected file is already opened" msgstr "Vald fil är redan öppnad" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "Selected file is still being edited" msgstr "Vald fil redigeras fortfarande" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:186 msgid "Selected filter only works for local files." msgstr "Det valda filtret fungerar bara för lokala filer." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:300 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6764,7 +6939,7 @@ "servertyper.\n" "Använd platsspecifika bokmärken för denna server." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:306 msgid "Selected port usually in use by a different protocol." msgstr "Varning: Vald port används ofta av ett annat protokoll." @@ -6776,34 +6951,34 @@ msgid "Send custom command to the server otherwise not available" msgstr "Skicka anpassat kommando till servern annars inte tillgänglig" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4406 msgid "Sending keep-alive command" msgstr "Skickar keep-alive kommando" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Serial number:" msgstr "Serienummer:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:317 msgid "Server &Type:" msgstr "Server&typ:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket.cpp:866 msgid "Server did not properly shut down TLS connection" msgstr "Servern stängde inte ner TLS-anslutningen korrekt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:945 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1006 msgid "Server does not support non-ASCII characters." msgstr "Servern stöder inte icke-ASCII-tecken." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4244 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Servern stöder inte återupptagande av filer > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6812,15 +6987,19 @@ "Servern stöder inte återupptagande av filer > %d GB. Avsluta överföringen " "eftersom filerna är lika stora." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528 msgid "Server does not support resume of files > 2GB." msgstr "Servern stöder inte återupptagande av filer > 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 msgid "Server does not support resume of files > 4GB." msgstr "Servern stöder inte återupptagande av filer > 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2060 +msgid "Server host key" +msgstr "" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4253 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6829,18 +7008,18 @@ "Servern saknar kanske stöd för att återuppta filer > %d GB. Avsluta " "överföringen eftersom filerna är lika stora." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:886 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" "Servern kräver kanske ett konto. Försök ange ett konto i Platshanteraren" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/ControlSocket.cpp:349 msgid "Server returned empty path." msgstr "Servern returnerade en tom sökväg." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:620 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6848,13 +7027,13 @@ "Servern skickade en extra inloggningsuppmaning. Du måste använda den " "interaktiva inloggningstypen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3787 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Servern skickade ett passivt svar med en adress som inte är routningsbar. " "Passivt läge misslyckades." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3782 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6862,36 +7041,43 @@ "Servern skickade ett passivt svar med en adress som inte är routningsbar. " "Använder serveradressen istället." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Servern skickade ett oväntat svar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket.cpp:1254 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Servern skickade en osorterad certifikatkedja vilket strider mot " +"specifikationerna för TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Server to client MAC:" msgstr "Server till klient MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2123 msgid "Server to client cipher:" msgstr "Server till klient chiffer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2477 msgid "Server&type:" msgstr "Server&typ:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Server/Local file" msgstr "Server/Lokal fil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1731 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2400 msgid "Server:" msgstr "Server:" @@ -6899,29 +7085,29 @@ msgid "Session details" msgstr "Sessionsinformation" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:356 msgid "Set &Priority" msgstr "Ställ in &prioritet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3599 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2214 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Ställ in rättigheter för \"%s\" till \"%s\"" -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize anropades utan sockel" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "Inställningar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:772 msgid "Settings directory:" msgstr "Katalog för inställningar:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "Sh&ow notification bubble" +msgstr "Visa n&otifieringsbubbla" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2284 msgid "Show &raw directory listing" msgstr "Visa &rå kataloglistning" @@ -6929,19 +7115,20 @@ msgid "Show &welcome dialog..." msgstr "Visa &välkomstdialogruta..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2223 msgid "Show both directory trees and continue comparing?" msgstr "Visa båda katalogträden och fortsätta med jämförelsen?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Visa detaljer" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1599 msgid "Show details about custom date and time formats" msgstr "Visa detaljer om anpassade datum- och tidsformat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:444 msgid "Shows available TLS ciphers" msgstr "Visar tillgängliga TLS-chiffer" @@ -6949,7 +7136,7 @@ msgid "Shows this help dialog" msgstr "Visar denna hjälpdialogruta" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2677 msgid "Shutdown now" msgstr "Stäng av nu" @@ -6957,7 +7144,7 @@ msgid "Signature algorithm:" msgstr "Signaturalgoritm:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Site &Manager entries" msgstr "&Platshanterarens poster" @@ -6965,56 +7152,55 @@ msgid "Site Manager" msgstr "Platshanteraren" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 msgid "Site Manager - Cannot remember password" msgstr "Platshanteraren - Kan inte komma ihåg lösenord" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 #: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1067 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1076 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1100 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1109 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1144 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "Site Manager - Invalid data" msgstr "Platshanteraren - Felaktig data" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:292 msgid "Site Manager already open" msgstr "Platshanteraren är redan öppen" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:486 +#: ../../locales/../src/interface/sitemanager.cpp:514 +#: ../../locales/../src/interface/sitemanager.cpp:528 +#: ../../locales/../src/interface/sitemanager.cpp:540 +#: ../../locales/../src/interface/sitemanager.cpp:704 +#: ../../locales/../src/interface/sitemanager.cpp:792 msgid "Site does not exist." msgstr "Platsen finns inte." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:497 msgid "Site path has to begin with 0 or 1." msgstr "Platsens sökväg måste börja med 0 eller 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:534 +#: ../../locales/../src/interface/sitemanager.cpp:698 +#: ../../locales/../src/interface/sitemanager.cpp:786 msgid "Site path is malformed." msgstr "Platssökvägen är felaktig." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Platsspecifika bokmärken" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7023,11 +7209,11 @@ "Platsspecifika bokmärken kräver att servern lagras i Platshanteraren.\n" "Lägga till nuvarande anslutning i Platshanteraren?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Size" msgstr "Storlek" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1613 msgid "Size formatting" msgstr "Storleksformatering" @@ -7035,50 +7221,55 @@ msgid "Size unknown" msgstr "Storleken är okänd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1449 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 msgid "Skip file" msgstr "Hoppa över filen" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1160 +#: ../../locales/../src/engine/ControlSocket.cpp:1177 +#: ../../locales/../src/engine/ControlSocket.cpp:1203 +#: ../../locales/../src/engine/ControlSocket.cpp:1281 #, c-format msgid "Skipping download of %s" msgstr "Hoppar över hämtningen av %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:309 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Hoppar över icke existerande nyckelfil \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1163 +#: ../../locales/../src/engine/ControlSocket.cpp:1180 +#: ../../locales/../src/engine/ControlSocket.cpp:1206 +#: ../../locales/../src/engine/ControlSocket.cpp:1284 #, c-format msgid "Skipping upload of %s" msgstr "Hoppar över sändningen av %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1029 msgid "Socket address outside address space" msgstr "Sockeladressen är utanför adressrymden" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Socket already connected" msgstr "Sockeln är redan ansluten" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Socket has been shut down" msgstr "Sockeln har stängts ner" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Socket not connected" msgstr "Sockeln är inte ansluten" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Socket type not supported for address family" msgstr "Sockeltypen stöds inte för adressfamiljen" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1167 msgid "Some files are still being edited or need to be uploaded." msgstr "Några filer redigeras fortfarande eller behöver skickas." @@ -7091,31 +7282,31 @@ "Vissa felkonfigurerade fjärrservrar som finns bakom en router kan svara med " "sin lokala IP-adress." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1746 msgid "Sort directories inline" msgstr "Sortera kataloger som filer" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." msgstr "Sorteringsordningen kan inte ändras när kataloger jämförs." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1730 msgid "Sorting" msgstr "Sortering" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1737 msgid "Sorting &mode:" msgstr "Sorterings&läge:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:107 msgid "Source and path of the drop operation are identical" msgstr "Källa och sökväg för släppåtgärden är identiska" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Källfilen och målfilen får inte vara identiska" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Källa och mål för släppåtgärden är identiska" @@ -7123,9 +7314,9 @@ msgid "Source file:" msgstr "Källfil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3817 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Hastighetsgränser" @@ -7133,27 +7324,27 @@ msgid "Speed limits" msgstr "Hastighetsgränser" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:586 msgid "Speed limits are disabled, click to change." msgstr "Hastighetsgränser är inaktiverade, klicka för att ändra." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:589 msgid "Speed limits are enabled, click to change." msgstr "Hastighetsgränser är aktiverade, klicka för att ändra." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2078 msgid "Stable and beta versions" msgstr "Stabila versioner och betaversioner" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2077 msgid "Stable versions only" msgstr "Endast stabila versioner" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2079 msgid "Stable, beta and nightly versions" msgstr "Stabila, beta- och dagliga versioner" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "Start transfer &immediately" msgstr "Starta överföringen &genast" @@ -7161,19 +7352,19 @@ msgid "Start with opened Site Manager" msgstr "Starta med Platshanteraren öppen" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" msgstr "Kontroll av uppdateringar startade %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2232 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1468 #, c-format msgid "Starting download of %s" msgstr "Påbörjar hämtning av %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1471 #, c-format msgid "Starting upload of %s" msgstr "Påbörjar sändning av %s" @@ -7182,30 +7373,30 @@ msgid "Starts the local site in the given path" msgstr "Startar lokal plats vid angiven sökväg" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "State or province:" msgstr "Stat eller provins:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Status" msgstr "Status" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:294 +#: ../../locales/../src/interface/StatusView.cpp:377 msgid "Status:" msgstr "Status:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Stop and remove &all" msgstr "Stoppa och ta bort &allt" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Stoppa den rekursiva åtgärden" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Street:" msgstr "Gata:" @@ -7221,11 +7412,11 @@ msgid "Summary of test results:" msgstr "Sammanfattning av testresultatet:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2685 msgid "Suspend now" msgstr "Försätt i vänteläge nu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3419 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7233,29 +7424,33 @@ "Symboliska länkar till filer påverkas inte av det här valet, sådana " "symboliska länkar tas alltid bort." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3878 +#: ../../locales/../src/interface/state.cpp:233 +#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:255 +#: ../../locales/../src/interface/state.cpp:266 +#: ../../locales/../src/interface/state.cpp:365 +#: ../../locales/../src/interface/state.cpp:373 +#: ../../locales/../src/interface/state.cpp:381 +#: ../../locales/../src/interface/state.cpp:1003 +#: ../../locales/../src/interface/state.cpp:1011 +#: ../../locales/../src/interface/state.cpp:1018 +#: ../../locales/../src/interface/state.cpp:1027 +#: ../../locales/../src/interface/state.cpp:1054 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Synkroniserad bläddring" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:380 msgid "Synchronized browsing has been disabled." msgstr "Synkroniserad bläddring har inaktiverats." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Synkroniserar kataloger." + +#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:165 msgid "Syntax error" msgstr "Syntaxfel" @@ -7264,24 +7459,24 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2338 +#: ../../locales/../src/interface/Mainfrm.cpp:2383 msgid "Syntax error in command line" msgstr "Syntaxfel i kommandoraden" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "System" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:784 msgid "System details" msgstr "Systemdetaljer" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1020 msgid "System limit of open files exceeded" msgstr "Systemets gräns för antal öppna filer har överskridits" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "System's network subsystem has failed" msgstr "Systemets underliggande nätverkssystem har fallerat" @@ -7289,19 +7484,19 @@ msgid "T&oolbar" msgstr "&Verktygsfält" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:289 msgid "TLS connection established, sending HTTP request" msgstr "TLS-anslutningen är etablerad, skickar HTTP-begäran" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:436 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS-anslutning etablerad, väntar på välkomstmeddelande..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:439 msgid "TLS connection established." msgstr "TLS-anslutning etablerad." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "TTL expired" msgstr "TTL har förfallit" @@ -7309,35 +7504,39 @@ msgid "Target file already exists" msgstr "Målfilen finns redan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Målfil:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2647 msgid "Target filename already exists!" msgstr "Målfilnamnet finns redan!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1630 msgid "Target filename already exists, really continue?" msgstr "Målfilnamnet finns redan, vill du verkligen fortsätta?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Temporary failure in name resolution" msgstr "Tillfälligt fel vid namnuppslagningen" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Testet lyckades" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Testresultat" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4258 msgid "Testing resume capabilities of server" msgstr "Testar om servern klarar av att återuppta överföringar" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:749 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Platshanteraren kan inte användas om inte filen repareras." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:291 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7346,7 +7545,7 @@ "Platshanteraren är öppnad i en annan instans av FileZilla 3.\n" "Vill du fortsätta? Ändringar gjorda i Platshanteraren kommer inte att sparas." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7354,29 +7553,29 @@ "Platshanteraren är öppnad i en annan instans av FileZilla 3.\n" "Stäng den annars kan inte informationen tas bort." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Adressen som du angav var: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "The ai_family member is not supported" msgstr "ai_family-medlemmen stöds inte" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "The ai_socktype member is not supported" msgstr "ai_socktype-medlemmen stöds inte" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:685 msgid "The bookmark could not be added." msgstr "Bokmärket kunde inte läggas till." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:773 msgid "The bookmarks could not be cleared." msgstr "Bokmärkerna kunde inte tömmas." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/interface/statusbar.cpp:471 msgid "The connection is encrypted. Click icon for details." msgstr "Anslutningen är krypterad. Klicka på ikonen för mer information." @@ -7398,24 +7597,24 @@ "Det anpassade tidsformatet är ogiltigt eller innehåller det " "formatspecifikationer som inte stöds." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/transfersocket.cpp:144 #, c-format msgid "The data connection could not be established: %s" msgstr "Dataanslutningen kunde inte etableras: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/edithandler.cpp:1523 msgid "The default editor for text files could not be found." msgstr "Standardredigeraren för textfiler kunde inte hittas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 #, c-format msgid "The default editor for text files is '%s'." msgstr "Standardredigeraren för textfiler är \"%s\"." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Det angivna filternamnet finns redan, välj ett annat namn." @@ -7424,8 +7623,8 @@ msgid "The extension '%s' does already exist in the list" msgstr "Filändelsen \"%s\" finns redan i listan" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:290 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:298 #, c-format msgid "" "The file %s already exists.\n" @@ -7434,8 +7633,8 @@ "Filen %s finns redan.\n" "Ange ett nytt namn:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1633 +#: ../../locales/../src/interface/LocalListView.cpp:1740 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7446,7 +7645,7 @@ "Det associerade programmet (%s) kunde inte hittas.\n" "Kontrollera dina filtypsassocationer." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7455,20 +7654,20 @@ "Filen \"%s\" innehåller en SSH1-nyckel. SSH1-protokollet är föråldrat, " "FileZilla stöder bara SSH2-nycklar." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "" "Filen \"%s\" kunde inte läsas in eller innehåller den inte någon privat " "nyckel." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:36 #, c-format msgid "The file '%s' could not be loaded." msgstr "Filen \"%s\" kunde inte läsas in." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1628 +#: ../../locales/../src/interface/LocalListView.cpp:1736 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7477,8 +7676,8 @@ "Filen \"%s\" kunde inte öppnas:\n" "I ditt system är inget program associerat med den här filtypen." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1745 +#: ../../locales/../src/interface/LocalListView.cpp:1748 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7487,8 +7686,8 @@ "Filen \"%s\" kunde inte öppnas:\n" "Associerat kommando misslyckades" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:756 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7499,7 +7698,7 @@ "Att läsa in filer skapade av nyare versioner kan leda till förlorad data.\n" "Vill du fortsätta?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7512,7 +7711,7 @@ msgid "The file selected as default editor does not exist." msgstr "Den körbara filen som är vald som standardredigerare finns inte." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7526,11 +7725,11 @@ "och lösenord importeras.\n" "Vill du fortsätta med importen?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Filnamnskolumnen kan varken döljas eller flyttas." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:798 msgid "The filename column cannot be hidden." msgstr "Filnamnskolumnen kan inte döljas." @@ -7544,19 +7743,19 @@ msgid "The following characters will be replaced: %s" msgstr "Följande tecken kommer att ersättas: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1928 msgid "The following files are currently being edited:" msgstr "Följande filer redigeras för närvarande:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3474 msgid "The free open source FTP solution" msgstr "Den fria öppenkällkodslösningen för FTP" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "De globala bokmärkena kunde inte sparas." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2271 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7570,17 +7769,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Gränsen måste vara mellan 1 och 2000 MiB" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1054 #, c-format msgid "The local directory '%s' could not be created." msgstr "Den lokala katalogen \"%s\" kunde inte skapas." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1039 #, c-format msgid "The local directory '%s' does not exist." msgstr "Den lokala katalogen \"%s\" finns inte." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:245 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7597,24 +7796,24 @@ "Den lägsta tillgängliga porten måste vara mindre än eller lika med den " "högsta tillgängliga porten." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Den nya versionen kunde inte hämtas, försök igen senare." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Den nya versionen har sparats i din katalog för hämtade filer." -#: ../../locales/../src/interface/QueueView.cpp:1823 +#: ../../locales/../src/interface/QueueView.cpp:1524 msgid "The queue will not be saved." msgstr "Kön kommer inte att sparas." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:961 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Fjärrkatalogen \"%s\" finns inte." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1008 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7623,27 +7822,27 @@ "Fjärrkatalogen \"%s\" ligger inte under synkroniseringsroten (%s).\n" "Inaktivera synkroniserad bläddring och fortsätta ändra fjärrkatalogen?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "De valda kategorierna har importerats." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 msgid "" "The selected file contains importable data for the following categories:" msgstr "Den valda filen innehåller importerbar data för följande kategorier:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1874 msgid "The selected file is already being edited:" msgstr "Den valda filen redigeras redan:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1732 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Den markerade filen är fortfarande öppen i något annat program, stäng filen." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1638 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7653,15 +7852,15 @@ "Detta kan vara farligt och skulle kunna skada ditt sytem.\n" "Vill du verkligen fortsätta?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:581 msgid "The server could not be added." msgstr "Servern kunde inte läggas till." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Servern skickade ett oväntat eller okänt svar." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:530 msgid "The server uses following charset encoding for filenames:" msgstr "Servern använder följande teckenkodning för filnamn:" @@ -7673,7 +7872,7 @@ "Serverns certifikat är okänt. Undersök certifikatet noggrant för att " "försäkra dig om att servern är pålitlig." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:951 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7684,7 +7883,7 @@ "försöker du faktiskt ansluta till en annan dator som utger sig för att vara " "servern." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7692,11 +7891,15 @@ "Serverns värdnyckel är okänd. Det finns inget som garanterar att servern är " "den dator som du tror det är." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket.cpp:1339 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Serverns värdnamn stämmer inte överens med värdnamnet i certifikatet" + +#: ../../locales/../src/engine/socket.cpp:1068 msgid "The servname parameter is not supported for ai_socktype" msgstr "Parametern servname stöds inte för ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7704,19 +7907,19 @@ "Inställningarna har importerats. Du måste starta om FileZilla för att " "inställningarna skall gälla." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1016 msgid "The specified address family is not supported" msgstr "Den angivna familjen av adresser stöds inte" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "The specified network name is no longer available" msgstr "Angivet nätverksnamn är inte längre tillgängligt" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2680 msgid "The system will soon reboot unless you click Cancel." msgstr "Systemet kommer snart att startas om ifall du inte klickar på Avbryt." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2676 msgid "The system will soon shut down unless you click Cancel." msgstr "Systemet kommer snart att stängas ner om du inte klickar på Avbryt." @@ -7728,11 +7931,11 @@ "Målfilen finns redan.\n" "Välj en åtgärd." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:862 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Testet misslyckades. Vill du verkligen spara inställningarna?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:81 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Den giltiga backupfilen %s kunde inte återställas" @@ -7741,15 +7944,15 @@ msgid "Themes" msgstr "Teman" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:326 msgid "This filter set cannot be removed." msgstr "Den här filteruppsättningen kan inte tas bort." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:266 msgid "This filter set cannot be renamed." msgstr "Den här filteruppsättningens namn kan inte bytas." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7773,11 +7976,11 @@ "Den här guiden kommer att hjälpa dig konfigurera din router och brandvägg " "samt att testa din konfiguration." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1159 msgid "Time" msgstr "Tid" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 msgid "Time formatting" msgstr "Tidsformatering" @@ -7786,25 +7989,24 @@ msgstr "Tids&gräns i sekunder:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "Tidsgräns" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1710 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "Serverns tidszonsskillnad är %d sekunder." -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Title:" msgstr "Titel:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2221 msgid "To compare directories, both file lists have to be aligned." msgstr "För att jämföra katalogerna måste båda fillistorna vara lika." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2222 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "För att göra detta måste båda katalogträden vara synliga eller dolda." @@ -7816,7 +8018,7 @@ "För att stödja autentisering med publika nycklar måste FileZilla veta vilka " "privata nycklar som skall användas." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7833,7 +8035,7 @@ "Grön: Filen är nyare än den omarkerade filen på andra sidan\n" "Röd: Filstorleken skiljer sig" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7843,51 +8045,46 @@ "Om aktiverat, kommer serverns katalog att ändras i enlighet med hur " "navigeringen i den lokala katalogstrukturen sker och vice versa." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Påbörja/avbryt behandling av överföringskön" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Visa/dölj det lokala katalogträdet" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Visa/dölj meddelandeloggen" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Visa/dölj fjärrkatalogträdet" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Visa/dölj överföringskön" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:541 msgid "Too long header line" msgstr "För lång huvudrad" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:610 msgid "Too many redirects" msgstr "För många omdirigeringar" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:288 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Trace:" msgstr "Spårning:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1853 msgid "Transfer" msgstr "Överför" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2264 msgid "Transfer &direction" msgstr "Överföringens &riktning" @@ -7903,22 +8100,22 @@ msgid "Transfer Queue" msgstr "Överföringskö" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:450 msgid "Transfer Settings" msgstr "Överföringsinställningar" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/transfersocket.cpp:452 +#: ../../locales/../src/engine/transfersocket.cpp:474 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Överföringens anslutning avbröts: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Överförd data blev påverkad." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:249 msgid "Transferring" msgstr "Överför" @@ -7926,7 +8123,7 @@ msgid "Transfers" msgstr "Överföringar" -#: ../../locales/../src/interface/QueueView.cpp:2929 +#: ../../locales/../src/interface/QueueView.cpp:2569 msgid "Transfers finished" msgstr "Slutförda överföringar" @@ -7938,15 +8135,15 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Behandla &följande filtyper som ASCII-filer:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:776 msgid "Trust changed Hostkey:" msgstr "Lita på ändrad värdnyckel:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:773 msgid "Trust new Hostkey:" msgstr "Lita på ny värdnyckel:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1010 msgid "Trust the new key and carry on connecting?" msgstr "Lita på den nya nyckeln och fortsätt anslutningen?" @@ -7954,17 +8151,17 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Lita på det här certifikatet och fortsätta med anslutningen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:889 msgid "Trust this host and carry on connecting?" msgstr "Lita på den här värden och fortsätt anslutningen?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Försök igen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 +#: ../../locales/../src/interface/edithandler.cpp:1097 msgid "Type" msgstr "Typ" @@ -7976,20 +8173,20 @@ msgid "Type of generic proxy:" msgstr "Typ av allmän proxy:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1955 msgid "U&pload" msgstr "S&kicka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3758 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Gräns för sä&ndning:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1963 msgid "U&se filetype associations if available" msgstr "An&vänd filtypsassociationer om tillgängligt" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "U&se system defaults for current language" msgstr "A&nvänd systemets standardinställningar för aktuellt språk" @@ -7997,26 +8194,32 @@ msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:374 +#: ../../locales/../src/engine/proxy.cpp:500 #, c-format msgid "Unassigned error code %d" msgstr "Okänd felkod %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Unit:" msgstr "Avdelning:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:874 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:995 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/interface/edithandler.cpp:1129 +#: ../../locales/../src/interface/edithandler.cpp:1157 msgid "Unknown" msgstr "Okänd" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Okänd typ av FTP-proxy, kan inte skapa inloggningssekvensen." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:422 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Okänd protokollversion av SOCKS: %d" @@ -8025,11 +8228,22 @@ msgid "Unknown certificate" msgstr "Okänt certifikat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:125 +#: ../../locales/../src/engine/misc.cpp:138 +#, c-format +msgid "Unknown error %d" +msgstr "Okänt fel %d" + +#: ../../locales/../src/engine/misc.cpp:102 +#, c-format +msgid "Unknown error %u" +msgstr "Okänt fel %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:816 msgid "Unknown host key" msgstr "Okänd värdnyckel" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:430 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8038,13 +8252,13 @@ "Okänd protokollversion för SOCKS vidareförhandling av användarnamn/lösenord-" "autentisering: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:282 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "Okänt rotelement, filen verkar inte vara skapad av FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8052,7 +8266,7 @@ "Såvida inte dessa problem korrigeras kommer inte aktivt läge att fungera och " "passivt läge måste användas." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8060,15 +8274,15 @@ "Såvida inte detta problem korrigeras kommer inte aktivt läge att fungera och " "passivt läge måste användas." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket.cpp:1278 msgid "Unsupported certificate type" msgstr "Certifikatstypen stöds inte" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:598 msgid "Unsupported redirect" msgstr "Omdirigeringen stöds inte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1961 msgid "Up&load and unedit" msgstr "Sk&icka och ångra ändringar" @@ -8077,24 +8291,29 @@ msgid "Updates" msgstr "Uppdateringar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2278 msgid "Upload" msgstr "Skicka" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1120 msgid "Upload failed" msgstr "Sändningen misslyckades" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Upload limit: %s/s" msgstr "Gräns för sändning: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Upload limit: none" msgstr "Gräns för sändning: ingen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3290 +#: ../../locales/../src/interface/search.cpp:882 +msgid "Upload search results" +msgstr "Skicka sökresultat" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Upload selected directory" msgstr "Skicka markerad katalog" @@ -8102,70 +8321,70 @@ msgid "Upload selected files and directories" msgstr "Skicka markerade filer och kataloger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1766 msgid "Upload this file back to the server?" msgstr "Skicka tillbaka den här filen till servern?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 msgid "Upload this file to the server?" msgstr "Skicka den här filen till servern?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1148 +#: ../../locales/../src/interface/edithandler.cpp:1304 msgid "Uploading" msgstr "Skickar" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1306 msgid "Uploading and pending removal" msgstr "Skickar och borttagning pågår" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1151 +#: ../../locales/../src/interface/edithandler.cpp:1308 msgid "Uploading and unediting" msgstr "Skickar och ångrar ändringar" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:553 msgid "Use &custom charset" msgstr "Använd anpassad t&eckenuppsättning" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1927 msgid "Use &custom editor:" msgstr "Använd an&passad redigerare:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2970 msgid "Use &default editor for text files" msgstr "Använd &standardredigeraren för textfiler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2829 msgid "Use &synchronized browsing" msgstr "Använd &synkroniserad bläddring" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:541 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Använd UTF-8 om servern stöder det, använd annars lokal teckenuppsättning." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 msgid "Use default action" msgstr "Använd standardåtgärden" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:520 msgid "Use explicit FTP over TLS if available" msgstr "Använd explicit FTP över TLS om tillgängligt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 msgid "Use server currently connected to" msgstr "Använd den aktuella anslutningens server" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2389 msgid "Use server from site manager" msgstr "Använd servern från Platshanteraren" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "Use system &defaults for current language" msgstr "Använd systemets &standardinställningar för aktuellt språk" @@ -8199,16 +8418,16 @@ "läge för första gången. Endast versionen av FileZilla som du använder kommer " "att skickas till servern." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 msgid "User:" msgstr "Användare:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:501 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1057 msgid "Username cannot be a series of spaces" msgstr "Användarnamnet får inte bestå av en följd av blanksteg" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:581 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8227,7 +8446,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Utförliga loggmeddelanden från vxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket.cpp:1371 msgid "Verifying certificate..." msgstr "Validerar certifikatet..." @@ -8235,44 +8454,40 @@ msgid "Very high" msgstr "Mycket hög" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1471 msgid "View hidden option set, but unsupported by server" msgstr "" "Alternativet för att visa dolda objekt är inställt men stöds inte av servern" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1835 msgid "View/Edit" msgstr "Visa/Redigera" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2180 msgid "Visible columns" msgstr "Synliga kolumner" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "W&rite" msgstr "S&kriv" -#: ../../locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "Väntar" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "Väntar på anslutning för att bläddra" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "Väntar på lösenord" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:243 msgid "Waiting for transfer to be cancelled" msgstr "Väntar på att överföringen skall avbrytas" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:244 msgid "Waiting to retry..." msgstr "Väntar på att försöka igen..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." msgstr "Varning, ignorerar dataanslutning från felaktig IP-adress." @@ -8291,23 +8506,23 @@ "\n" "Vill du verkligen söka efter dagliga byggen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:944 msgid "Warning: Potential security breach!" msgstr "Varning: Möjlig säkerhetsöverträdelse!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3645 msgid "Welcome to FileZilla" msgstr "Välkommen till FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3506 msgid "What's new" msgstr "Vad är nytt" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Vad är nytt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3832 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8331,28 +8546,32 @@ msgid "Widescreen" msgstr "Bredbild" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3827 msgid "Would you like FileZilla to remember passwords?" msgstr "Vill du att FileZilla skall komma ihåg lösenord?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Wr&ite" msgstr "Sk&riv" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Felaktig extern IP-adress" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:762 msgid "Wrong line endings" msgstr "Felaktiga radslut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Yellow" +msgstr "Gul" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:787 msgid "Yes" msgstr "Ja" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:782 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8360,24 +8579,24 @@ "Du verkar använda en värd som bara stödjer IPv6. Den här guiden stöder inte " "den här miljön." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Du använder den senaste versionen av FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3615 msgid "You can always open this dialog again through the help menu." msgstr "Du kan alltid öppna den här dialogrutan igen ifrån hjälpmenyn." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Du kan hämta den senaste versionen från FileZillas hemsida:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:69 msgid "You can leave the port field empty to use the default port." msgstr "Du kan lämna fältet för port tomt för att använda standardporten." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:518 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8385,7 +8604,7 @@ "Du kan använda ett x vid valfri position för att behålla rättigheterna som " "originalfilerna har." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "" "Du kan inte importera inställningar ifrån FileZillas egen katalog för " @@ -8399,23 +8618,23 @@ "Du kan inte ersätta ett felaktigt tecken med ett annat felaktigt tecken. " "Ange ett tecken som är tillåtet i filnamn." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:310 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Du angav inte ett nytt namn för filen. Skriv över filen istället?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "You have selected at least one symbolic link." msgstr "Du har markerat minst en symbolisk länk." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1599 +#: ../../locales/../src/interface/search.cpp:1159 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" "Du har markerat fler än 10 filer för redigering, vill du verkligen fortsätta?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1705 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8423,39 +8642,43 @@ "Du har markerat fler än 10 filer eller kataloger att öppna, vill du " "verkligen fortsätta?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:420 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 msgid "You have to enter a hostname." msgstr "Du måste ange ett värdnamn." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1076 msgid "You have to enter a key file path" msgstr "Du måste ange en sökväg till nyckelfilen" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:868 msgid "You have to enter a local directory." msgstr "Du måste ange en lokal katalog." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:882 +msgid "You have to enter a remote directory." +msgstr "Du måste ange en fjärrkatalog." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Du måste ange en giltig IPv4-adress." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/search.cpp:873 msgid "You have to enter a writable local directory." msgstr "Du måste ange en skrivbar lokal katalog." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:512 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1067 msgid "You have to enter an account name" msgstr "Du måste ange ett kontonamn" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:486 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1042 msgid "You have to specify a user name" msgstr "Du måste ange ett användarnamn" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8463,7 +8686,7 @@ "Du har troligen en router eller brandvägg som på ett felaktigt sätt ändrade " "överförd data." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Du måste ange ett namn för bokmärket." @@ -8471,7 +8694,7 @@ msgid "You need to enter a name for the log file." msgstr "Du måste ange ett namn för loggfilen." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1484 msgid "You need to enter a properly quoted command." msgstr "Du måste ange ett kommando korrekt med citationstecken." @@ -8484,15 +8707,15 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Du måste ange en port för proxyn inom intervallet 1 till 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1144 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Du måste åtminstone ange en sökväg, tomma bokmärken stöds inte." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8500,7 +8723,7 @@ "Du måste ange både en lokal sökväg och en fjärrsökväg för att aktivera " "synkroniserad bläddring för det här bokmärket." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1109 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8508,23 +8731,23 @@ "Du måste ange både en lokal sökväg och en fjärrsökväg för att aktivera " "synkroniserad bläddring för den här platsen." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "You need to specify a local file." msgstr "Du måste ange en lokal fil." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:321 msgid "You need to specify a remote file." msgstr "Du måste ange en fjärrfil." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:327 msgid "You need to specify a remote path." msgstr "Du måste ange en fjärrsökväg." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:298 msgid "You need to specify a server." msgstr "Du måste ange en server." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8532,57 +8755,57 @@ "Du borde inte ha några problem med att ansluta till andra servrar, " "filöverföringar borde fungera korrekt." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2684 msgid "Your computer will suspend unless you click Cancel." msgstr "Din dator kommer försättas i vänteläge om du inte klickar på Avbryt." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "efter" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "före" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "börjar med" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "byte" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "innehåller" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "anpassad" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "innehåller inte" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "är inte lika med" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "slutar med" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "är lika med" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:535 +#: ../../locales/../src/interface/filelistctrl.cpp:554 +#: ../../locales/../src/interface/filelistctrl.cpp:581 +#: ../../locales/../src/interface/filelistctrl.cpp:597 msgid "file" msgstr "fil" @@ -8590,8 +8813,8 @@ msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8601,103 +8824,160 @@ "Försäkra dig om att den här körbara filen finns i samma katalog som den " "körbara filen som startar FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:374 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp hör till en annan version av FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1391 msgid "fzsftp could not be started" msgstr "fzsftp kunde inte startas" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/tlssocket.cpp:1217 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers returnerade inga certifikat" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket.cpp:1229 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 misslyckades" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "är större än" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "körbar för gruppen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "läsbar för gruppen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "skrivbar för gruppen" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1601 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "är lika med" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "är satt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "är inte satt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "är mindre än" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "matchar reguljära uttrycket" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +msgid "new name" +msgstr "nytt namn" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "körbar för ägaren" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "läsbar för ägaren" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "skrivbar för ägaren" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket.cpp:1423 +#: ../../locales/../src/engine/tlssocket.cpp:1439 +#: ../../locales/../src/engine/tlssocket.cpp:1455 +#: ../../locales/../src/engine/tlssocket.cpp:1471 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "okänd" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "körbar för alla" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "läsbar för alla" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "skrivbar för alla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:699 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Host key fingerprint:" +#~ msgstr "Värdnyckelns fingeravtryck:" + +#~ msgid "%d files added to queue" +#~ msgstr "%d filer tillagda i kön" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Koppla från servern" + +#~ msgid "&Show message" +#~ msgstr "&Visa meddelande" + +#~ msgid "Available sizes" +#~ msgstr "Tillgängliga storlekar" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Kan inte läsa in snabbanslutningsraden ifrån resursfilen" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Kunde inte importera andra partens certifikat, gnutls_x509_crt_import " +#~ "misslyckades" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Kunde inte initiera strukturen för andra partens certifikat, " +#~ "gnutls_x509_crt_init misslyckades" + +#~ msgid "Do ¬hing" +#~ msgstr "Gör &ingenting" + #~ msgid "Empty dirs to visit" #~ msgstr "Tomma kataloger att besöka" +#~ msgid "Filename &filters..." +#~ msgstr "Filnamns&filter..." + +#~ msgid "No more files in the queue!" +#~ msgstr "Inga fler filer i kön!" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Söker efter filer att lägga till i kön" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Söker efter filer att skicka" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize anropades utan sockel" + +#~ msgid "Waiting" +#~ msgstr "Väntar" + #~ msgid "Connected" #~ msgstr "Ansluten" -#~ msgid "Deleting directories" -#~ msgstr "Tar bort kataloger" - #~ msgid "Deleting multiple unrelated directories is not yet supported" #~ msgstr "Borttagning av flera orelaterade kataloger stöds ännu inte" @@ -8836,9 +9116,6 @@ #~ msgid "Fingerprint (MD5):" #~ msgstr "Fingeravtryck (MD5):" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Rotcertifikatet är inte pålitligt" - #~ msgid "" #~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " #~ "seconds." diff -Nru filezilla-3.15.0.2/locales/tr.po filezilla-3.33.0/locales/tr.po --- filezilla-3.15.0.2/locales/tr.po 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/locales/tr.po 2017-10-30 17:26:35.000000000 +0000 @@ -4,17 +4,18 @@ # # Translators: # Roman Neumüller , 2007 -# Kaya Zeren , 2014-2016 +# Kaya Zeren , 2014-2017 +# Roman Neumüller , 2007 # Volkan Gezer , 2013 msgid "" msgstr "" "Project-Id-Version: FileZilla\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-30 15:29+0100\n" -"PO-Revision-Date: 2016-01-31 09:02+0000\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2017-10-30 18:09+0100\n" +"PO-Revision-Date: 2017-10-10 16:12+0000\n" "Last-Translator: Kaya Zeren \n" -"Language-Team: Turkish (Turkey) (http://www.transifex.com/kayazeren/" -"filezilla/language/tr_TR/)\n" +"Language-Team: Turkish (Turkey) (http://www.transifex.com/zeron/filezilla/" +"language/tr_TR/)\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,219 +23,223 @@ "Plural-Forms: nplurals=1; plural=0;\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "Geçen: %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "Kalan: %H:%M:%S" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" msgstr "" -"%a - Hesap (Hesap giriş tipi kullanılmıyorsa bunu içeren satırlar dikkate " +"%a - Hesap (Hesap giriş türü kullanılmıyorsa bunu içeren satırlar dikkate " "alınmaz)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d klasör" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1425 +#: ../../locales/../src/interface/search.cpp:854 +#: ../../locales/../src/interface/search.cpp:1239 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "İçindekilerle %d klasör" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:853 +#: ../../locales/../src/interface/search.cpp:1238 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d dosya" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d dosya. Toplam boyut: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d dosya. Toplam boyut: En az %s" -#: ../../locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "%d dosya aktarım kuyruğuna eklendi" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d saniye" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Sunucu" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu klasör" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu dosya" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Parola" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:39 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Sertifikanın süresi dolmuş!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:24 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Henüz doğrulanmamış!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Vekil sunucu kullanıcısı" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s ve %s. Toplam boyut: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s ve %s. Toplam boyut: En az %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s bayt" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:629 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s bulunamadı. Bu FileZilla bileşeni olmadan SFTP çalışmaz.\n" +"%s bulunamadı. Bu FileZilla bileşeni olmadan %s çalışmaz.\n" "\n" "FileZilla yazılımını yeniden indirip kurun. Sorun çözülmüyorsa bir hata " "raporu gönderin." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:719 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s bulunamıyor. Bu FileZilla bileşeni olmadan, SFTP çalışmaz.\n" +"%s bulunamadı. Bu FileZilla bileşeni olmadan, %s çalışmaz.\n" "\n" "Olası çözümler:\n" -"- %s klasörün PATH çevre değişkeninde listelenmiş olduğundan emin olun.\n" -"- FZ_FZSFTP çevre değişkenine tam yolu olarak %s yazın." +"- %s klasörünün PATH çevre değişkeninde listelenmiş olduğundan emin olun.\n" +"- %s tam yolunu %s ortam değişkenine yazın." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:59 #, c-format msgid "%s with %d bits" msgstr "%s ve %d bit" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:164 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Sunucu adı sertifika ile uyuşmuyor" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Kullanıcı adı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Vekil sunucu parolası" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" -msgstr "Ö&nceki bağlantıyı iptal edip geçerli sekmede bağlan" +msgstr "Ö&nceki bağlantıdan vazgeçip geçerli sekmede bağlan" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "H&akkında..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "Hes&ap:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Aktif" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." -msgstr "Yer imi &ekle..." +msgstr "Yer İmi &Ekle..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Klasör ekle..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" -msgstr "&Aktarım kuyruğuna ekle" +msgstr "&Aktarım Kuyruğuna Ekle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Anahtar Dosyası Ekle..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" -msgstr "&Aktarım kuyruğuna ekle" +msgstr "&Aktarım Kuyruğuna Ekle" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "Sunucu s&aat dilimi farkı:" @@ -242,246 +247,251 @@ msgid "&Always trust certificate in future sessions." msgstr "Sonr&aki oturumlarda bu sertifikaya güvenilsin." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "Bu sunucuy&a güvenilerek anahtarı belleğe eklensin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "Her z&aman varsayılan düzenleyici kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "Bu seçim tüm ilişkilendirilmemiş dosy&alar için kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "Her z&aman şu işlem yapılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "Dış IP &adresi işletim sistemine sorulsun" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "Otom&atik" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" -msgstr "Otomatik &algılanan" +msgstr "Otomatik &algılansın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "A&rtalan rengi:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "İk&ili" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" -msgstr "SI sem&bollerini kullanan ikili önekler. (örnek: 1 KB = 1024 bytes)" +msgstr "SI sem&bollerini kullanan ikili ön ekler. (örnek: 1 KB = 1024 bayt)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" -msgstr "&Yer İmleri" +msgstr "Ye&r İmleri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Gözat..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Hoşgörü:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "İ&ptal" #: ../../locales/../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." -msgstr "&Kişisel verileri sil..." +msgstr "&Kişisel Verileri Sil..." #: ../../locales/../src/interface/resources/xrc/update.xrc:28 msgid "&Close" msgstr "&Kapat" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" -msgstr "FileZilla &Kapansın" +msgstr "FileZilla &Kapatılsın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "&FileZilla Kapatılsın" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:657 msgid "&Configure speed limits..." msgstr "Hız &aınırı ayarları..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." -msgstr "A&yarla..." +msgstr "A&yarlar..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Bağlan" #: ../../locales/../src/interface/resources/xrc/menus.xrc:12 msgid "&Copy current connection to Site Manager..." -msgstr "Geçerli bağlantıyı Site Yöneti&cisine kopyala..." +msgstr "Geçerli Bağlantıyı Site Yöneti&cisine Kopyala..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" -msgstr "Panoya &kopyala" +msgstr "Panoya &Kopyala" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" -msgstr "&Klasör oluştur" +msgstr "&Klasör Oluştur" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:637 msgid "&Create new tab" -msgstr "&Sekme ekle" +msgstr "&Sekme Ekle" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "&Hata Ayıklama" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "Hata ayıklama günlüğünün &düzeyi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "Varsayılan &Düzenleyici:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." -msgstr "Varsayılan &dosya var işlemi..." +msgstr "Varsayılan &Dosya Var İşlemi..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "Başarısız bağlantılar arası &bekleme süresi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Sil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" -msgstr "&Sembolik bağlantıyı sil" +msgstr "&Sembolik Bağlantıyı Sil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "&Klasör erişim izinleri..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" -msgstr "&Klasör karşılaştırma" +msgstr "&Klasör Karşılaştırma" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "&Eşzamanlı taramayı devre dışı bırakıp yerel klasörü değiştir" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "&Eşzamanlı taramayı devre dışı bırakıp uzak klasörü değiştir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" -msgstr "Yerel &dosyayı boşver, dosyayı yeniden indirip düzenle" +msgstr "Yerel &dosyayı boşver, yeniden indirip düzenle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" -msgstr "&Bağlantıyı kes" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "Sunucu ile &bağlantıyı kes" +msgstr "&Bağlantıyı Kes" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "Ortalama aktarım hızı yerine &anlık aktarım hızı görüntülensin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" -msgstr "&Boyut görüntülensin (bayt)" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "Parolalar &hatırlanmasın (önerilir)" +msgstr "&Boyut bayt olarak görüntülensin" #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "Bu pencere artık &görüntülenmesin." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "Yerel bağlantılar için &dış IP adresleri kullanılmasın." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "&Dosyalara çift tıklayınca ne olsun:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "İn&dir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "Şuraya İn&dir:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "İn&dir..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "İn&dirme:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "Düz&enle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." -msgstr "Süzg&eç kurallarını düzenle..." +msgstr "Süzg&eç Kurallarını Düzenle..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:653 msgid "&Enable" msgstr "&Etkinleştir" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "Sıkıştırma &kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" -msgstr "Hız sınırlarına &uyulsun" +msgstr "Hız sınırları &uygulansın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Kodlama:" @@ -489,28 +499,28 @@ msgid "&Encryption:" msgstr "Şifr&eleme:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "Öz&el komut yazın..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "Bağlantı y&eni sekmede açılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "Çalış&tırma" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" -msgstr "Sit&e bilgileri verilsin" +msgstr "&Site bilgileri dışa aktarılsın" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." -msgstr "Bilgileri V&er..." +msgstr "Bilgileri &Dışa Aktar..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "Akti&f kipe geçilsin" @@ -518,35 +528,47 @@ msgid "&File" msgstr "&Dosya" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "&Dosya İzinleri..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." -msgstr "&Dosya izinleri..." +msgstr "&Dosya İzinleri..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Dosya:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" -msgstr "&Süzme ölçütleri:" +msgstr "&Süzgeç Ölçütleri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" -msgstr "&Süzme setleri:" +msgstr "&Süzgeç Kümeleri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 -msgid "&Filters:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" msgstr "&Süzgeçler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +msgid "&Filters:" +msgstr "&Süzgeçler:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "Düzenlemeyi &bitirip yerel dosyayı sil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"Yerel yollara aldırmadan, bulunan tüm dosyalar doğrudan hede&f klasöre " +"yüklensin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -554,151 +576,159 @@ "Uzak yollara aldırmadan, bulunan tüm dosyalar doğrudan hede&f klasöre " "indirilsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "Sembolik bağlantı izlensin, hede&f klasörün içeriği silinsin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" -msgstr "Dış I&P adresi şu İnternet adresinden alınsın:" +msgstr "Dış I&P adresi şu adresten alınsın:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." -msgstr "&Yardım alın..." +msgstr "&Yardım Başlıkları..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" -msgstr "&Küresel yer imi" +msgstr "&Genel yer imi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "CONNECT yöntemi kullanılarak &HTTP/1.1" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "&Yardım" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" -msgstr "Eş dosyalar &gizlensin" +msgstr "Eş Dosyalar &Gizlensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "&En büyük" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Kullanılabilecek en büyük kapı:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" -msgstr "&Sunucu:" +msgstr "Su&nucu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" -msgstr "&IEC ikili önekleri (örnek 1KiB = 1024 bayt)" +msgstr "&IEC ikili ön ekleri (örnek 1KiB = 1024 bayt)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (örnek: 2007-09-15)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:30 msgid "&Import..." -msgstr "Bilgileri &Al..." +msgstr "Bilgileri İçe &Aktar..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" -msgstr "Sistem dosya tipi &ilişkileri devralınsın" +msgstr "Sistem dosya türü &ilişkileri devralınsın" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" -msgstr "&Yeni sürüm yüklensin" +msgstr "&Yeni sürümü yükle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "Arama &köküne göre yerel yol yapısı korunsun" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "Arama &köküne göre uzaktaki yol yapısı korunsun" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "&Anahtar dosyası:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "Dosya ve k&lasör pencerelerinin yerleşimi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "FileZilla tarafından ku&llanılabilecek yerel kapılar sınırlansın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "Eş zaman&lı bağlantı sayısı sınırlansın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" -msgstr "Yere&l klasör ağacı" +msgstr "Yere&l Klasör Ağacı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "Yere&l klasör:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Yerel arama" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "Gün&lük dosyalansın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" -msgstr "&Oturum Açma Tipi:" +msgstr "&Oturum Açma Türü:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" -msgstr "&Oturum Açma Tipi:" +msgstr "&Oturum Açma Türü:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "&Düşük" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." -msgstr "Yer i&mleri yönetimi..." +msgstr "Yer İ&mleri Yönetimi..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." -msgstr "El ile aktarı&m..." +msgstr "El ile Aktarı&m..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&En fazla bağlantı sayısı:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&En fazla bağlanma denemesi:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" -msgstr "&Günlük kaydı" +msgstr "&Günlük Kaydı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "Siste&m tepsisine küçültülsün" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "A&d sıralama kipi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Ad:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:47 msgid "&Network configuration wizard..." -msgstr "Ağ ayarla&ma yardımcısı..." +msgstr "Ağ Ayarla&ma Yardımcısı..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "Ye&ni" @@ -706,223 +736,234 @@ msgid "&New Site" msgstr "Site E&kle" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1765 msgid "&New version available!" -msgstr "Ye&ni bir sürüm yayınlanmış!" +msgstr "Ye&ni Bir Sürüm Yayınlanmış!" #: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "İ&leri >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Hayır" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Yok" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "&Normal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Sayısal değer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&Tamam" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&AÇIK" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "&Aç" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "Ü&zerine Yazılsın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Pasif" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Parola:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" -msgstr "&Ses çalınsın" +msgstr "&Ses Çalınsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "Ka&pı:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" -msgstr "Dosya zaman damgaları &korunsun" +msgstr "Dosya Zamanları &Korunsun" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "Aktarım &kuyruğu" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" -msgstr "&Hızlı bağlan" +msgstr "&Hızlı Bağlan" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" -msgstr "&Hızlı bağlantı çubuğu" +msgstr "&Hızlı Bağlantı Çubuğu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" -msgstr "&Hızlı bağlantı geçmişi" +msgstr "&Hızlı Bağlantı Geçmişi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Okuma" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" -msgstr "&Yeniden bağlan" +msgstr "&Yeniden Bağlan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "&Yeniden bağlanma bilgileri" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:648 msgid "&Refresh" msgstr "&Yenile" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "FileZilla kapatılana kadar ana parola &hatırlansın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "Parola, FileZilla kapatılana kadar hatırlansın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "Pa&rolalar hatırlansın" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "Uzak klasö&r:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Uzak yol:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Uzak arama" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Sil" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "Anahta&rı Sil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" -msgstr "Seçilmişi kaldı&r" +msgstr "Seçilmişi Kaldı&r" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Yeniden Adlandı&r" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "Yeniden Adlandı&r..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "Ye&rel dosyayı yeniden aç" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "Geçe&rsiz karakterler şununla değiştirilsin:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." -msgstr "Hata bildi&rin (İngilizce)..." +msgstr "Hata Bildi&rimi (İngilizce)..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "&Dikkat Çekilsin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "Bu&rayı boşaltarak tümünü yeniden kuyruğa al" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" -msgstr "Ya&rdımcıyı baştan başlat" +msgstr "Ya&rdımcıyı Baştan Başlat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "Sü&rdür" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." -msgstr "Komut çalıştı&r..." +msgstr "Komut &Yürütülsün..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." -msgstr "Ağ aya&r yardımcısını başlat..." +msgstr "Ağ Aya&r Yardımcısını Başlat..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." -msgstr "Güncellemele&ri denetle..." +msgstr "Güncellemele&ri Denetle..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&SITE" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." -msgstr "&Farklı kaydet..." +msgstr "&Farklı Kaydet..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Ara" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." -msgstr "&Uzak dosyalarda arama..." +msgstr "&Uzak Dosyalarda Arama..." #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 msgid "&Select Entry:" msgstr "Kayıt &Seçin:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "Dil &Seçimi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "Görüntülenmesini istediğiniz &sütunları seçin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "&Sunucu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "Aya&rlar" @@ -930,199 +971,209 @@ msgid "&Settings..." msgstr "Aya&rlar..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "Hata ayıklama menü&sü görüntülensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "A&yrıntılı günlüğe bakın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "İleti gö&rüntülensin" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" -msgstr "Günlük kayıtlarına &zaman damgası eklensin" +msgstr "Günlük kayıtlarına &zaman eklensin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" -msgstr "&Site Yöneticisi Kayıtları" +msgstr "&Site Yöneticisi kayıtları" #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Site Yöneticisi..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "&Siteye özgü yer imi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Atla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" -msgstr "Hız &sınırlaması" +msgstr "Hız &Sınırlaması" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Aktarıma &hemen başla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Yerel ve Uzak panellerin yerini değiştir" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "&TLS Şifreleri" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Sına" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Tema:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "Ak&tarım" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" -msgstr "Ak&tarım yöntemi:" +msgstr "Ak&tarım Yöntemi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" -msgstr "Ak&tarım kuyruğu" +msgstr "Ak&tarım Kuyruğu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "Noktalı dosyalar ASCII olarak kabul e&dilsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Düzeltme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" -msgstr "B&u sunucunun önbellekteki anahtarı güncellensin" +msgstr "B&u sunucunun ön bellekteki anahtarı güncellensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "&Yükle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "Şuraya &Yükle:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "&Yükle..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Yükleme:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "Özel program k&ullanılsın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "Eş zamanlı tarama k&ullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "Metin dosyaları için varsayılan sistem düzenleyicisi k&ullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "Ş&u IP adresi kullanılsın:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "Yerine s&unucunun dış IP adresi kullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "Binlik basamak ayracı k&ullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "K&ullanıcı:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "K&ullanıcı Adı:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1759 #, c-format msgid "&Version %s" msgstr "&Sürüm %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "&Görünüm" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "&Göster/Düzenle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" -"&Yerel olarak düzenlenen dosyalar izlenerek değişikliklerin kayıt durumu " -"sorulsun." +"&Yerel olarak düzenlenen dosyalar izlenerek değişikliklerin kaydedilmesi " +"sorulsun" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Denetlenecek güncelleme sürümleri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Yazma" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Evet" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s' yok ya da erişilemiyor." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' bir klasör adı değil." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' iletişim kuralı desteklenmiyor." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 msgid "'Account' logontype not supported by selected protocol" -msgstr "'Hesap' ile oturum açma tipi bu iletişim kuralı için desteklenmiyor" +msgstr "'Hesap' ile oturum açma türü bu iletişim kuralı için desteklenmiyor" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." msgstr "" -"'Normal' ve 'Hesap' oturum açma tipleri kullanılamıyor. Onun yerine 'Parola " -"sorulsun' tipi kullanılıyor." +"'Normal' ve 'Hesap' oturum açma türleri kullanılamıyor. Onun yerine 'Parola " +"sorulsun' türü kullanılıyor." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1012 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "" -"'Normal' ve 'Hesap' oturum açma tipleri kullanılamıyor. Kaydınız 'Parola " -"sorulsun' olarak değiştirildi." +"'Normal' ve 'Hesap' oturum açma türleri kullanılamıyor. Kaydınız 'Parola " +"sorulsun' türüne değiştirildi." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:642 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1132,76 +1183,76 @@ "parametreleri göndermek için kullanılan bir yerel komuttur. Başlangıçtaki " "'quote' olmadan ham bir komut yazmak isteyebilirsiniz." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d nesne süzüldü)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% indirildi)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(Sınırsız için 0)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 saniye)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(En çok: 1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, kapatmak için 0)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat %d.%d olarak ayarlandı)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(örnek: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(örnek: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" -msgstr "(ile %s/s)" +msgstr "(%s/s)" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- kaldı" #: ../../locales/../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." -msgstr "-c ile FTP İnternet adresi birlikte kullanılamaz." +msgstr "-c seçeneği FTP adresi ile birlikte kullanılamaz." #: ../../locales/../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." -msgstr "-l yalnız bir FTP İnternet adresi ile birlikte kullanılabilir." +msgstr "-l seçeneği yalnız bir FTP adresi ile birlikte kullanılabilir." #: ../../locales/../src/interface/cmdline.cpp:76 msgid "-s and -c cannot be present at the same time." @@ -1209,33 +1260,33 @@ #: ../../locales/../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." -msgstr "-s ile FTP İnternet adresi birlikte kullanılamaz." +msgstr "-s seçeneği FTP adresi ile birlikte kullanılamaz." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Yok" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Uyarı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Bilgi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Ayrıntılı" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32-bit sistem" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Hata ayıklama" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64-bit sistem" @@ -1243,22 +1294,28 @@ msgid "< &Back" msgstr "< &Geri" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." -msgstr "Aynı adlı bir yer imi var. Lütfen farklı bir im adı yazın:" +msgstr "Aynı adlı bir yer imi var. Lütfen farklı bir ad yazın." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Zincirdeki bir sertifika güvenli olmayan bir algoritma kullanılarak " +"imzalanmış" #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Varsayılan bir düzenleyici ayarlamalısınız." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:164 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Bir klasör kendi alt klasörlerinden birine sürüklenemez." @@ -1272,21 +1329,21 @@ "durumlarda aktif kipi kullanmalısınız. Aktif kipte, FileZilla bir kapı açar " "ve sunucuya bu kapıya bağlanmasını söyler." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Açık bir dosya değiştirilmiş." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Aynı adlı bir dosya zaten aktarıldı." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "" "Aynı adlı bir dosya zaten düzenleniyor. Açık dosyayı kapatıp yeniden deneyin." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:595 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1299,28 +1356,35 @@ "Bu sorunu çözmezseniz bazı dosyalar listelerde görüntülenmeyebilir.\n" "Bu oturum boyunca başka uyarı almayacaksınız." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "Ana parola kaybedilirse geri alınamaz! Lütfen parolanızı iyi saklayın." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Yeni bir FileZilla sürümü yayınlanmış:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." msgstr "" -"Normal bir sunucu her zaman tüm dosyaları gösterir. Fakat bazı bozuk " -"sunucular dosyaları kullanıcıdan gizleyebilir. Sunucuyu tüm dosyaları " +"Normal bir sunucuda tüm dosyalar her zaman görüntülenir. Fakat bazı sorunlu " +"sunucularda dosyalar kullanıcıdan gizlenebilir. Sunucuyu tüm dosyaları " "görüntülemeye zorlamak için bu seçeneği kullanın." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." msgstr "" -"Normal bir sunucu buna gerek duymaz. Kullanmak zorundaysanız sunucu " -"yöneticisi ile görüşün." +"Normal bir sunucu için gerekmez. Kullanmanız gerekiyorsa sunucu yöneticisi " +"ile görüşün." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1329,17 +1393,17 @@ "Eşzamanlı taramayı devre dışı bırakıp yerel klasörlerde gezinmeye devam " "etmek ister misiniz?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "E&kle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "ASCII Dosya&lar Sürdürülebilsin" @@ -1351,51 +1415,53 @@ msgid "A&pply only to uploads" msgstr "Y&alnız yüklemelere uygulansın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "Tüm dosy&a ve klasörlere uygulansın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "T&amamlanan aktarımlar kendiliğinden silinsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "FileZilla Hakkında" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Yerel ve uzak dosya gezginlerinin üzerinde" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:114 +msgid "Access to some local directories could not be restored:" +msgstr "Bazı yerel klasörlere erişim geri yüklenemedi:" + +#: ../../locales/../src/engine/server.cpp:581 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Hesap" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" -msgstr "Kuyruk tamamlandıktan sonra yapıla&cak işlem" +msgstr "Kuyruk Tamamlandığında Yapıla&cak İşlem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" -msgstr "Seçili dosyaya yapılacak işlem:" +msgstr "Seçilmiş dosyaya yapılacak işlem:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Yapılacak işlem:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "İşlem:" @@ -1403,14 +1469,14 @@ msgid "Active mode" msgstr "Aktif Kip" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "" "Aktif kip FTP sınaması yapılamadı. FileZilla doğru dış IP adresini bilmiyor." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1418,7 +1484,7 @@ "Aktif kip FTP sınaması yapılamadı. FileZilla doğru dış IP adresini bilmiyor. " "Ayrıca yönelticiniz giden adresi değiştirdi." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1427,38 +1493,39 @@ "Aktif kip FTP sınaması yapılamadı. FileZilla doğru dış IP adresini biliyor, " "ama yönelticiniz ya da güvenlik duvarınız giden adresi değiştirdi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "Aktif Kip IP Adresi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Dosyalar yalnız &kuyruğa eklensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" -msgstr "Seçili klasörler aktarım kuyruğuna eklensin" +msgstr "Seçilmiş klasörler aktarım kuyruğuna eklensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" -msgstr "Seçili dosya ve klasörler aktarım kuyruğuna eklensin" +msgstr "Seçilmiş dosya ve klasörler aktarım kuyruğuna eklensin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Aktarım kuyruğuna eklensin" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" -msgstr "Adres tipi desteklenmiyor" +msgstr "Adres türü desteklenmiyor" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Gelişmiş" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1467,20 +1534,21 @@ "builds at your own risk." msgstr "" "Öneri: Yeni özellikleri denemek istediğiniz durumların dışında, kararlı " -"sürümleri kullanın. Beta ve gecelik yapımlar, deneme amacıyla " +"sürümleri kullanın. Deneme sürümleri ve gecelik yapımlar, deneme amacıyla " "kullanılabilecek geliştirme sürümleridir. Gecelik yapımlar beklendiği gibi " -"çalışmayarak sisteminize zarar verebilir. Beta sürümleri ve gecelik " -"yapımları kullanmaktan doğabilecek zararların riski size aittir." +"çalışmayarak sisteminize zarar verebilir. Deneme sürümleri ve gecelik " +"yapımları kullanmaktan doğabilecek zararları üstlenme riski size aittir." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "Her &zaman şu işlem yapılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Algoritma:" -#: ../../locales/../src/interface/QueueView.cpp:2937 +#: ../../locales/../src/interface/QueueView.cpp:2652 msgid "All files have been successfully transferred" msgstr "Tüm dosyalar aktarıldı" @@ -1488,13 +1556,13 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Yazılan tüm kapılar 1024 ile 65535 arasında olmalı." -#: ../../locales/../src/interface/QueueView.cpp:2933 +#: ../../locales/../src/interface/QueueView.cpp:2648 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "Tüm aktarımlar bitti. %d dosya aktarılamadı." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Hata durumunda diğer aktarım &yöntemi kullanılsın" @@ -1502,16 +1570,16 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Hata durumunda diğer aktarım yöntemi kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Zaten bağlı" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:80 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Diğer adlar:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1519,7 +1587,7 @@ "Alternatif olarak PuTTY anahtarlarınızı Pageant aracıyla yönetebilirsiniz. " "FileZilla Pageant ile çalışır." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1527,14 +1595,14 @@ "Alternatif olarak sisteminizdeki SSH programını kullanabilirsiniz. Bunu " "yapmak için SSH_AUTH_SOCK değişkeninin ayarlandığından emin olun." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "" "Alternatif olarak, son sürümü FileZilla web sitesinden indirebilirsiniz:" -#: ../../locales/../src/interface/QueueView.cpp:1902 +#: ../../locales/../src/interface/QueueView.cpp:1656 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1543,7 +1611,7 @@ "Aktarım kuyruğu \"%s\" üzerinden yüklenirken hata oluştu.\n" "Bazı aktarım kuyruğu ögeleri yüklenememiş olabilir." -#: ../../locales/../src/interface/QueueView.cpp:1812 +#: ../../locales/../src/interface/QueueView.cpp:1549 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1552,79 +1620,82 @@ "Aktarım kuyruğu \"%s\" üzerine yüklenirken hata oluştu.\n" "Bazı aktarım kuyruğu ögeleri kaydedilmemiş olabilir." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Sertifika zincirindeki yayıncılardan biri sertifika yetkilisi değil" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Hedefte, sürüklediğiniz nesne ile aynı adı taşıyan bir nesne var." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:606 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1709 msgid "Anonymous" msgstr "Anonim" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Şu anda başka bir uzak işlem yürütülüyor, klasörü şimdi değiştiremezsiniz." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:845 msgid "Any changes made in the Site Manager could not be saved." msgstr "Site Yöneticisi kayıtlarındaki değişiklikler kaydedilemeyecek." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Site Yöneticisi'nde yapılan değişiklikler kaydedilemeyecek." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Süzgeçlerde yaptığınız değişiklikler kaydedilmeyecek." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Yalnız k&lasörlere uygulansın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Uygula" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Yal&nız geçerli aktarım kuyruğuna uygulansın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Yalnız &dosyalara uygulansın" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Arşiv" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" -msgstr "Argüman tampon bellek taşması" +msgstr "Seçenek tampon bellek taşması" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Aktarım kuyruğu bölümünde sekme olarak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Ne yapılacağı sorulsun" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:572 +#: ../../locales/../src/engine/server.cpp:598 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Parola sorulan" @@ -1636,7 +1707,7 @@ msgid "Ask your operating system for the external IP address" msgstr "İşletim sistemine dış IP adresi sorulsun" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "FileZilla forumlarında soru sorabilirsiniz" @@ -1644,7 +1715,7 @@ msgid "Associated program not found:" msgstr "İlgili program bulunamadı:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "En az bir süzme ölçütü eksik kalmış" @@ -1652,99 +1723,106 @@ msgid "At this point, all required information has been gathered." msgstr "Tüm ayar bilgileri toplandı." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "İzinler" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:221 msgid "Authentication failed." msgstr "Kimlik doğrulanamadı." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" -msgstr "Yazar:" +msgstr "Geliştiren:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Otomatik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" -msgstr "Otomatik Dosya Tipi Sınıflandırması" +msgstr "Otomatik Dosya Türü Sınıflandırması" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Kullanılabilecek Boyutlar" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "&Vekil sunucu atlansın" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Dosya belirteci bozuk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Basit kullanım bilgileri" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Davranış" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Düzenlendi" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Dikkat! Sertifika geçersiz kılınmış" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "İkili" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Karatahta" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Mavi" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:390 msgid "Bookmark" msgstr "Yer imi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Yer imi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Yer imleri" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Gözat..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:150 +#: ../../locales/../src/engine/storj/resolve.cpp:218 +#: ../../locales/../src/engine/storj/resolve.cpp:291 +msgid "Bucket not found" +msgstr "Buket bulunamadı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" -msgstr "Yapım tarihi:" +msgstr "Yapım Tarihi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" -msgstr "Yapım bilgileri" +msgstr "Yapım Bilgileri" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Business category:" msgstr "İş kategorisi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1754,97 +1832,112 @@ "kullanılabilir. Yalnız belli bir aralıktaki kapıların FileZilla tarafından " "kullanmasını istiyorsanız, bu aralığı aşağıya yazın." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" -msgstr "Yürürlükteki işlemi ipt&al et" +msgstr "Yürürlükteki İşlemi İpt&al Et" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "Hepsini temiz&le" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" -msgstr "İnternet adresini pan&oya kopyala" +msgstr "Adresi Pan&oya Kopyala" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "Adreslerini Parola ile Pan&oya Kopyala" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" -msgstr "İsteğe &Göre Uyarlanmış" +msgstr "İsteğe &Göre Uyarlanmış Biçim" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" -msgstr "Ö&zel dosya tipi ilişkileri:" +msgstr "Ö&zel dosya türü ilişkileri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "CPU Özellikleri:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Sunucunun saat dilimi farkı hesaplanıyor..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Dosya okunamıyor" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Veri dosyaya yazılamıyor." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Veri %s dosyasına yazılamıyor" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "İptal" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Yürürlükteki işlemi iptal et" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Yürürlükteki işlemi iptal eder" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "'%s' erişilemiyor, sürücü hazır değil ya da bir ortam takılmamış." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:613 msgid "Cannot add server to Site Manager" msgstr "Sunucu Site Yöneticisine eklenemiyor" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "İstenen adres atanamadı" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Klasör değiştirilemedi, şu anda zaten eşzamanlı gözatma işlemi yapılıyor." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1852,7 +1945,7 @@ "İşlem yapılırken sekmeyi kapatamazsınız.\n" "Yürürlükteki işlem durdurulup sekme kapatılsın mı?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1864,104 +1957,103 @@ msgid "Cannot create new filter" msgstr "Yeni süzgeç oluşturulamıyor" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1780 +#: ../../locales/../src/interface/search.cpp:1184 msgid "Cannot edit file" msgstr "Dosya düzenlenemiyor" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1661 msgid "Cannot edit file, not connected to any server." -msgstr "Dosya düzenlenemiyor, hiç bir sunucuya bağlı değilsiniz." +msgstr "Dosya düzenlenemiyor, herhangi bir sunucuya bağlı değil." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "Cannot edit file, remote path unknown." msgstr "Uzaktaki yol bilinmediğinden dosya düzenlenemiyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "" -"SFTP sunucusu ile bağlantı kurulamadı. Lütfen uygun iletişim kuralını seçin" - -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Hızlı Bağlantı çubuğu kaynak dosyasından yüklenemiyor" +"SFTP sunucusu ile FTP bağlantısı kurulamadı. Lütfen uygun iletişim kuralını " +"seçin." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Cannot load key file" msgstr "Anahtar dosyası yüklenemedi" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1079 msgid "Cannot load toolbar from resource file" msgstr "Araç çubuğu kaynak dosyasından yüklenemiyor" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Parola hatırlanamıyor" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1261 msgid "Cannot rename entry" msgstr "Kayıt yeniden adlandırılamıyor" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Cannot rename file" msgstr "Dosya yeniden adlandırılamıyor" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" -"Sunucu adresindan SOCKS4 vekil sunucu ile kullanılacak IPv4 adresi " -"çözümlenemiyor" +"SOCKS4 vekil sunucusu ile kullanılacak IPv4 sunucu adresi çözümlenemedi." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" -msgstr "Süzgeç seti kaydedilemiyor" +msgstr "Süzgeç kümesi kaydedilemiyor" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Süzgeç seçilemiyor" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Dosya ilişkisi ayarlanamıyor" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" -msgstr "Pencere görüntülenemiyor" +msgstr "Görüntülenemiyor" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Seçilen dosyada görüntüleme/düzenleme yapılamıyor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Büyük Küçük Harfe Duyarsız" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Büyük küçük harfe duyarsız" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Büyük küçük harfe duyarsız (varsayılan)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Büyük küçük harfe duyarlı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Büyük küçük harfe duyarlı (varsayılan)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Silinecek kategoriler" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:514 msgid "Certificate and session data are not available yet." msgstr "Sertifika ve oturum verileri henüz bilinmiyor." @@ -1973,54 +2065,58 @@ msgid "Certificate issuer" msgstr "Sertifika Yayıncısı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Sertifika imzası doğrulanamadı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Kimlik Sor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Dosya izinlerini değiştir" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "Dosya izinlerini değiştir." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "" "Değiştirilen günlük dosyası ayarlarının etkin olması için FileZilla yeniden " "başlatılmalıdır." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:595 msgid "Character encoding issue" msgstr "Karakter kodlaması sorunu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" -msgstr "Karakter Seti" +msgstr "Karakter Kümesi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." -msgstr "Güncellemeleri &denetle..." +msgstr "Güncellemeleri &Denetle..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" -msgstr "&Güncelleme denetim sıklığı:" +msgstr "&Güncelleme denetimi sıklığı:" #: ../../locales/../src/interface/resources/xrc/update.xrc:4 msgid "Check for Updates" msgstr "Güncellemeleri denetle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "Yeni FileZilla sürümlerini denetle" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Güncellemeler denetlenemedi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2028,7 +2124,7 @@ "Oturum açma bilgilerinizi denetleyin. Yazdığınız parolanın başında ya da " "sonunda boşluk karakteri var." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2036,39 +2132,39 @@ "Oturum açma bilgilerinizi denetleyin. Yazdığınız kullanıcı adının başında ya " "da sonunda boşluk karakteri var." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Doğru dış IP adresi denetleniyor" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Güncellemeler denetleniyor..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:755 #, c-format msgid "Checksum match on file %s\n" msgstr "%s dosyasının sağlaması tutuyor\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:751 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "%s dosyasının sağlaması tutmuyor\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1608 msgid "Choose a key file" msgstr "Bir anahtar dosyası seçin" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1639 msgid "Choose the default local directory" msgstr "Varsayılan yerel klasörü seçin" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2495 msgid "Choose the local directory" msgstr "Yerel klasörü seçin" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:437 msgid "Chunk data improperly terminated" msgstr "İri veri uygunsuz olarak sonlandırıldı" @@ -2077,160 +2173,173 @@ msgstr "Şifre:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:641 msgid "Cl&ose tab" -msgstr "Sekmeyi &kapat" +msgstr "Sekmeyi &Kapat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Klasik" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" -msgstr "Arayüz önbelleğini temiz&le" +msgstr "Arayüz Önbelleğini Temiz&le" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "Otomatik &Güncelleme Verisini Temizle" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Önceki hızlı bağlantı bilgilerini sil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Kişisel verileri sil" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Hızlı bağlantı çubuğunu temizle" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Ayarlarınızı kaydetmek için Bitti düğmesine tıklayın." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "İstemciden sunucunun MAC adresine:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "İstemciden sunucuya şifre:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Kapat" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:644 msgid "Close &all other tabs" msgstr "Diğer tüm sekmeleri k&apat" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Close FileZilla" -msgstr "FileZilla yazılımını kapat" +msgstr "FileZilla uygulamasını kapatır" #: ../../locales/../src/interface/cmdline.cpp:15 msgid "Close all running instances of FileZilla" -msgstr "Çalışan tüm FileZilla kopyalarını kapat" +msgstr "Çalışan Tüm FileZilla Kopyalarını Kapat" + +#: ../../locales/../src/interface/Mainfrm.cpp:2310 +msgid "Close quick search and continue comparing?" +msgstr "Hızlı arama kapatılarak karşılaştırmaya devam edilsin mi?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Geçerli sekmeyi kapatır" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "No&tlar:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Sütun özellikleri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Sütun ayarları" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." -msgstr "Komut ve parametreleri doğru şekilde tırnak içinde yazmalısınız." +msgstr "Komut ve parametreleri tırnak içine doğru şekilde yazmalısınız." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Komut yürütülemedi" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "Komut desteklenmiyor" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Bu iletişim kuralı bu komutu desteklemiyor" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:350 msgid "Command:" msgstr "Komut:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Comment" msgstr "Not" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Common name:" msgstr "Bilinen Ad:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "İletişim, yöneltici ya da güvenlik duvarı tarafından bozuldu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" -msgstr "Son değişiklik za&manları karşılaştırılsın" +msgstr "Değişiklik Za&manları Karşılaştırılsın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" -msgstr "Do&sya boyutları karşılaştırılsın" +msgstr "Do&sya Boyutları Karşılaştırılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Karşılaş&tırma eşiği (dakika cinsinden):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Karşılaştırma eşiği 0 ile 1.440 dakika arasında olmalıdır." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" -msgstr "Çalışacağı ortam:" +msgstr "Çalışma Ortamı:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" -msgstr "Derleme ortamı:" +msgstr "Derleme Ortamı:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Derleyici:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" -msgstr "Derleyici bayrakları:" +msgstr "Derleyici Bayrakları:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Sıkıştırılmış" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Eşzamanlı Aktarım" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" -msgstr "Ölçütler büyük küçük h&arfe duyarlı" +msgstr "Büyük küçük h&arfe duyarlı aransın" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" @@ -2244,67 +2353,68 @@ msgid "Configure port range" msgstr "Kapı aralığını ayarlayın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" -msgstr "Filezilla ve ağınızın ayarları" +msgstr "FileZilla ve ağ ayarlarınız" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1243 msgid "Confirm deletion" msgstr "Silme işlemini onaylayın" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1743 +#: ../../locales/../src/interface/RemoteListView.cpp:1429 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1070 +#: ../../locales/../src/interface/search.cpp:1196 msgid "Confirmation needed" msgstr "Onay gerekiyor" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Tebrikler, ayarlarınız çalışıyor gibi görünüyor." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Vekil sunucu ayarları atlanarak bağlanılsın" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Bağlantı kurulamadı: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" -msgstr "Geçerli sekmede bağlansın" +msgstr "Geçerli sekmede bağlanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" -msgstr "Yeni sekmede bağlansın" +msgstr "Yeni sekmede bağlanılsın" #: ../../locales/../src/interface/cmdline.cpp:8 msgid "Connect to specified Site Manager site" msgstr "Site Yöneticisinde belirtilen siteye bağlanılsın" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Connecting" msgstr "Bağlanıyor" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "%s sunucusuna bağlanılıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1058 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "%s bağlantısı %s vekil sunucusu üzerinden yapılıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:990 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "%s bağlantısı kuruluyor..." @@ -2313,184 +2423,219 @@ msgid "Connection" msgstr "Bağlantı" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Bağlantıdan vazgeçildi" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:341 msgid "Connection attempt failed" msgstr "Bağlantı kurulamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:952 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "\"%s\" ile bağlantı kurulamadı, sonraki adres deneniyor." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:958 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "\"%s\" ile bağlantı kurulamadı." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Bağlantı denemesi kullanıcı tarafından kesildi" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Bağlanma denemesi zaman aşımına uğradı" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Bağlantı kapandı" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1036 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 msgid "Connection closed by server" msgstr "Bağlantı sunucu tarafından kapatıldı" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:113 msgid "Connection established, initializing TLS..." -msgstr "Bağlanıldı, TLS yükleniyor..." +msgstr "Bağlantu kuruldu, TLS yükleniyor..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:136 msgid "Connection established, sending HTTP request" -msgstr "Bağlanıldı, HTTP isteği gönderiliyor" +msgstr "Bağlantı kuruldu, HTTP isteği gönderiliyor" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." -msgstr "Bağlantı kuruldu, hoşgeldiniz iletisi bekleniyor." +msgstr "Bağlantı kuruldu, karşılama iletisi bekleniyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." -msgstr "Bağlanıldı, hoş geldin iletisi bekleniyor..." +msgstr "Bağlantı kuruldu, karşılama iletisi bekleniyor..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Bağlantı koptu" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" -msgstr "Kural seti bağlantıya izin vermedi" +msgstr "Kural kümesi bağlantıya izin vermedi" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "Bağlantı reddedildi" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Bağlantı sunucu tarafından reddedildi" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Bağlantı ağ tarafından sıfırlandı" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Bağlantı diğer uç tarafndan sıfırlandı" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:511 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" -msgstr[0] "%d saniye boyunca işlem yapılmadığından bağlantı kesildi" +msgstr[0] "İşlem %d saniye içinde yapılamadığından bağlantı kesildi" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Bağlantı zaman aşımına uğradı." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:708 msgid "Connection to server lost." msgstr "Sunucuyla bağlantı kesildi." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "Vekil sunucu ile bağlantı sağlandı, iletişim kuruluyor..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Sunucuyla bağlantı vaktinden önce kapandı." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Sınama sunucusuyla bağlantı kurulamadı." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Anahtar dosyasını dönüştür" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2055 #, c-format msgid "Copy (%d) of %s" msgstr "%d / (%s) kopya" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2034 #, c-format msgid "Copy of %s" msgstr "%s kopyası" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "Seçilmiş ögelerin adreslerini parolaları ile panoya kopyalar." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." -msgstr "Seçili ögelerin İnternet adreslerini panoya kopyalar." +msgstr "Seçilmiş ögelerin adreslerini panoya kopyalar." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "%s bağlantısı kabul edilemedi" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "%s yoluna erişilemedi" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Sertifika geçici güvenilirlik listesine eklenemedi" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Bağlantı Site Yöneticisine eklenemedi" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "İşlem tamamlanamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Sunucuyla bağlantı kurulamıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1091 #, c-format msgid "Could not connect to server: %s" msgstr "%s sunucusuyla bağlantı kurulamadı" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:332 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Komut, sunucu kodlamasına dönüştürülemedi" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Kişisel anahtar dönüştürülemedi" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2579 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1372 msgid "Could not copy URLs" -msgstr "İnternet adresleri kopyalanamadı" +msgstr "Adresler kopyalanamadı" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Sertifika kopyalanamadı" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Veri kopyalanamadı" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:161 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "%s yolundan CFURL oluşturulamadı" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Bu aktarım için adres oluşturulamadı." + +#: ../../locales/../src/interface/updater.cpp:490 #, c-format msgid "Could not create local file %s\n" msgstr "%s yerel dosyası oluşturulamıyor\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Günlükleme için mutex oluşturulamadı: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:170 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Adresten güvenli aralıkta yer imi oluşturulamadı:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2224 +#: ../../locales/../src/interface/RemoteTreeView.cpp:866 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2500,11 +2645,11 @@ "Ya kabuk eklentileri yüklü değil ya da dosyaları bir Gezgin penceresine " "sürüklemediniz." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Sunucu ile bağlantı kurulamadı" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:441 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2515,56 +2660,57 @@ "FileZilla veri klasörü '--datadir ' komut satırı seçeneği ile ya " "da FZ_DATADIR ortam değişkeni değiştirilerek ayarlanabilir." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Özel oturum açma sıralaması üretilemedi." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Anahtar üretilemedi" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" "Sertifika yayıncısının adı alınamadı, gnutls_x509_get_issuer_dn başarısız" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "Sertifika konusunun adı alınamadı, gnutls_x509_get_dn başarısız" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Uzaktaki yolun tamamı okunamadı." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "CFURL değerinden doğal yol alınamadı" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +msgid "Could not get path from URL" +msgstr "Adresten yol alınamadı" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." -msgstr "fzputtygen yanıt vermiyor." +msgstr "Beklenen fzputtygen yanıtı alınamadı." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1184 msgid "Could not get temporary directory to download file into." msgstr "Dosyanın kayıt edileceği geçici klasöre erişilemedi." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "Denklik sertifikaları alınamadı, gnutls_x509_crt_import başarısız" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:96 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Winsock başlatılamadı (%d): %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Denklik sertifikaları için yapı oluşturulamadı, gnutls_x509_crt_init " -"başarısız" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2575,15 +2721,21 @@ "olun.\n" "Site Yöneticisi'nde yapılan değişiklikler kaydedilmeyecek." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Anahtar dosyası yüklenemedi" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Kişisel anahtar yüklenemedi" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2593,7 +2745,7 @@ "Uzaktaki '%s' klasörüne karşı gelen yerel klasöre geçilemedi.\n" "Eşzamanlı tarama devre dışı bırakılıp uzak klasör değiştirilsin mi?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2603,7 +2755,7 @@ "Uzaktaki '%s' klasörüne karşı gelen yerel klasöre geçilemedi.\n" "Eşzamanlı tarama devre dışı bırakıldı." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2613,72 +2765,93 @@ "Yerel '%s' klasörüne karşı gelen uzak klasöre geçilemedi.\n" "Eşzamanlı tarama devre dışı bırakıldı." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2579 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1412 +#: ../../locales/../src/interface/search.cpp:1372 msgid "Could not open clipboard" msgstr "Pano açılamadı" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "%s adındaki günlük dosyası açılamıyor" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Uzaktaki yola gidilemedi." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Sunucu adresi çözümlenemedi:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." msgstr "Soketten veri okunamadı." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 #, c-format msgid "Could not read from socket: %s" msgstr "Soketten okunamadı: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Sunucu nesnesi okunamıyor." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Sunucudan veri alınamadı." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:117 +msgid "Could not restore directory access" +msgstr "Klasör erişimi geri yüklenemedi" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:173 #, c-format msgid "Could not seek to offset %s within file" msgstr "Dosyadaki %s satırına ulaşılamıyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/http/filetransfer.cpp:119 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +msgid "Could not seek to the beginning of the file" +msgstr "Dosyanın başına ulaşılamıyor" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Dosyanın sonuna ulaşılamıyor" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Komut fzputtygen üzerine gönderilemedi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Komut fzstorj üzerine gönderilemedi." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Eş sertifikaları sıralanamadı" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:201 msgid "Could not spawn IO thread" -msgstr "GÇ işlemi başlatılamıyor:" +msgstr "Giriş Çıkış işlemi başlatılamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1072 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Vekil sunucu ile iletişim kurulamadı: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:346 msgid "Could not start transfer" msgstr "Aktarım işlemi başlatılamadı" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:866 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2687,17 +2860,17 @@ "\"%s\" dosyasına yazılamıyor, Site Yöneticisi'nde yapılan değişiklikler " "kaydedilemeyecek: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "\"%s\" dosyasına yazılamıyor, yer imi kaydedilemedi: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" -msgstr "\"%s\" dosyasına yazılamıyor, küresel yer imleri kaydedilemedi: %s" +msgstr "\"%s\" dosyasına yazılamıyor, genel yer imleri kaydedilemedi: %s" -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1580 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2706,119 +2879,123 @@ "\"%s\" dosyasına yazılamıyor, aktarım kuyruğu kaydedilemedi.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2473 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" -msgstr "\"%s\" dosyasına yazılamıyor, seçilen siteler verilemedi: %s" +msgstr "\"%s\" dosyasına yazılamıyor, seçilen siteler dışa aktarılamadı: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:150 #, c-format msgid "Could not write \"%s\":" msgstr "\"%s\" yazılamıyor:" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Anahtar dosyası yazılamadı: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:345 msgid "Could not write to local file" msgstr "Yerel dosyaya yazılamıyor" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "%s günlük dosyasına yazılamıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:913 +#: ../../locales/../src/engine/ControlSocket.cpp:1008 +#: ../../locales/../src/engine/http/request.cpp:113 #, c-format msgid "Could not write to socket: %s" msgstr "%s soketine yazılamıyor" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Country:" msgstr "Ülke:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" -msgstr "&Dosya oluştur" +msgstr "&Dosya Oluştur" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" -msgstr "&Eksik yerel klasörü oluştur ve aç" +msgstr "&Eksik Yerel Klasörü Oluştur ve Aç" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" -msgstr "&Eksik uzak klasörü oluştur ve aç" +msgstr "&Eksik Uzak Klasörü Oluştur ve Aç" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "Geçerli klasörde yeni bir alt klasör oluşturur" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Geçerli klasörde yeni bir alt klasör oluşturup içine geçin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "Geçerli klasörde yeni bir boş dosya oluşturur" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" -msgstr "Kla&sör oluştur ve aç" +msgstr "Kla&sör Oluştur ve Aç" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:944 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1252 msgid "Create directory" -msgstr "Klasör oluştur" +msgstr "Klasör Oluştur" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2668 msgid "Create empty file" msgstr "Boş dosya oluştur" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:348 msgid "Creating directory" msgstr "Klasör oluşturuluyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:551 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "'%s' klasörü oluşturuluyor..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Kritik hata" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Kritik hata:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Kritik dosya aktarım hatası" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" -msgstr "Aktarımın %s/%s kadarı iletildikten sonra kritik dosya aktarım hatası" +msgstr "" +"%s boyutundaki dosya %s aktarıldıktan sonra ciddi bir dosya aktarım sorunu " +"çıktı" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2827,97 +3004,102 @@ "Geçerli (%s) uzak klasörü, (%s) eşleştirme kökü altında değil.\n" "Eşzamanlı tarama devre dışı bırakıldı." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." -msgstr "Geçerli aktarım tipi ASCII olarak ayarlandı." +msgstr "Geçerli aktarım türü ASCII olarak ayarlandı." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." -msgstr "Geçerli aktarım tipi otomatik algılanacak şekilde ayarlandı." +msgstr "Geçerli aktarım türü otomatik algılanacak şekilde ayarlandı." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." -msgstr "Geçerli aktarım tipi ikili olarak ayarlandı." +msgstr "Geçerli aktarım türü ikili olarak ayarlandı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Eğri:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" -msgstr "İsteğe Gö&re Uyarlanmış" +msgstr "İsteğe Gö&re Uyarlanmış Biçim" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" -msgstr "Özel süzme seti" +msgstr "Özel Süzgeç Kümesi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Özel sunucu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Koyu Mavi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" -msgstr "V&eri tipi" +msgstr "V&eri türü" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Ondalık ön&ekleri kullanan SI sembolleri (örnek: 1 KB = 1000 bayt)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "V&arsayılan" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "S&il" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" -msgstr "&Klasör karşılaştırma" +msgstr "&Klasör karşılaştırma kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" -msgstr "Tü&münü devre dışı bırak" +msgstr "Tü&münü Devre Dışı Bırak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "Par&olalar kaydedilmesin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Klasörlerlere çift &tıklayınca ne olsun:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "K&opyala" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:52 msgid "DOS-like with virtual paths" msgstr "DOS benzeri sanal yollar" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" -msgstr "Tehlikeli dosya tipi" +msgstr "Tehlikeli dosya türü" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Data" msgstr "Veri" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Veri soketi çok erken kapandı." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Tarih" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Tarih Biçimi" @@ -2933,15 +3115,15 @@ msgid "Debug" msgstr "Hata Ayıklama" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Hata Ayıklama Ayarları" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Varsayılan yere&l klasör:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:44 msgid "Default (Autodetect)" msgstr "Varsayılan (otomatik algılansın)" @@ -2949,25 +3131,25 @@ msgid "Default editor not properly quoted." msgstr "Varsayılan düzenleyici düzgün yazılmamış." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Varsayılan Dosya Var İşlemi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Varsayılan &uzak klasör:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." msgstr "" -"Varsayılan uzaktaki yola gidilemedi. Yolun seçili sunucu tipi için geçerli " +"Varsayılan uzaktaki yola gidilemedi. Yolun seçilmiş sunucu türü için geçerli " "olduğuna emin olun." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Varsayılan sistem dili" @@ -2975,12 +3157,12 @@ msgid "Default transfer mode:" msgstr "Varsayılan Aktarım Kipi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" -msgstr "Varsayılan Aktarım Tipi:" +msgstr "Varsayılan Aktarım Türü:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Varsayılan: http://ip.filezilla-project.org/ip.php" @@ -2991,7 +3173,7 @@ "Başarısız bağlantı denemeleri arasındaki süre 1-999 saniye arasında " "olmalıdır." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3003,75 +3185,85 @@ "Bir önceki bağlantının kurulamaması nedeniyle bağlantı %d saniye " "bekletiliyor..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1294 msgid "Delete Site Manager entry" msgstr "Site Yöneticisi kaydını sil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" -msgstr "Seçili klasörü sil" +msgstr "Seçilmiş klasörü sil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" -msgstr "Seçili dosya ve klasörleri sil" +msgstr "Seçilmiş dosya ve klasörleri sil" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" -msgstr "\"%s\" siliniyor" +msgstr "Siliniyor: \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" -msgstr "%u dosya \"%s\" üzerinden siliniyor" +msgstr "%u dosya şuradan siliniyor: \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Sembolik bağlantı siliniyor" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Masaüstü" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Ayrıntılar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Yeni anahtarın ayrıntıları:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:790 msgid "Detected newer version of FileZilla" msgstr "Yeni bir FileZilla sürümü yayınlanmış" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "K&lasörler" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Direction" msgstr "Yön" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Klasörler:" + +#: ../../locales/../src/interface/filelistctrl.cpp:269 msgid "Directory" msgstr "Klasör" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Klasör erişim izinleri" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:469 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" -msgstr "Klasör Karşılaştırma" +msgstr "K&lasör karşılaştırma kullanılsın" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Klasörler karşılaştırılamadı" @@ -3079,123 +3271,123 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "Günlük dosyasını içeren klasör yok ya da dosya adı geçersiz." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +msgid "Directory listing &filters..." +msgstr "Klasör Listeleme &Süzgeçleri..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" -msgstr "Kullanıcı klasör listelemeyi durdurdu" +msgstr "Kullanıcı klasör listesini almaktan vazgeçti" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2056 msgid "Directory listing failed" msgstr "Klasör listelenemedi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" -msgstr "Klasör listeleme süzgeçleri" +msgstr "Klasör Listeleme Süzgeçleri" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "\"%s\" klasörleri listelendi" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Klasör listelendi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" -msgstr "Tümünü &devre dışı bırak" +msgstr "Tümünü &Devre Dışı Bırak" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "Eşzamanlı tarama devre dışı bırakılıp uzak klasör değiştirilsin mi?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:715 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" -"Doğru klasör içeriğini göremiyorsanız bu seçeneği tekrar devre dışı bırakın." +"Klasör içeriğini doğru şekilde göremiyorsanız bu seçeneği tekrar devre dışı " +"bırakın." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Sunucu ile bağlantıyı kes" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:914 +#: ../../locales/../src/engine/ControlSocket.cpp:1010 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:114 +#: ../../locales/../src/interface/queue.cpp:339 msgid "Disconnected from server" msgstr "Sunucu ile bağlantı kesildi" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1039 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:189 #, c-format msgid "Disconnected from server: %s" msgstr "%s sunucusu ile bağlantı kesildi" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Önceki sunucu ile bağlantı kesiliyor" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Görüntüdeki sunucu bağlantısını keser" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "Hakkında penceresini görüntüler" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "Varsayılan düzenleyici kulla&nılmasın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "&Hiç bir şey yapılmasın" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Düzenlenen &tüm dosyalar için aynı işlem uygulansın" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1235 +#: ../../locales/../src/interface/Mainfrm.cpp:1257 msgid "Do you really want to close FileZilla?" msgstr "FileZilla kapatılsın mı?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Tüm Site Yöneticisi kayıtlarını ve aktarım kuyruğunu silmek istediğinize " "emin misiniz?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Site Yöneticisi kayıtlarını silmek istediğinize emin misiniz?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296 msgid "Do you really want to delete selected entry?" -msgstr "Seçili kayıdı silmek istiyor musunuz?" +msgstr "Seçilmiş kaydı silmek istiyor musunuz?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Aktarım kuyruğunu gerçekten silmek istiyor musunuz?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:643 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "'%s' sunucuya gönderilsin mi?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Bu dosyayı yeniden açmak ister misiniz?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Belgeler" @@ -3203,84 +3395,84 @@ msgid "Don't use external IP address on &local connections." msgstr "Yere&l bağlantılar için dış IP adresi kullanılmasın." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" -msgstr "Noktalı dosyalar, .htaccess gibi adı nokta ile başlayan dosyalardır" +msgstr "*Noktalı dosyalar: .htaccess gibi adı nokta ile başlayan dosyalar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Çift Tıklama Eylemleri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "İndirme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" -msgstr "Karşıdan indirme &sınırı:" +msgstr "İndirme &sınırı:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:597 #, c-format msgid "Download limit: %s/s" -msgstr "İndirme sınırı: %s/s." +msgstr "İndirme sınırı: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:600 msgid "Download limit: none" msgstr "İndirme sınırı: yok" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:904 +#: ../../locales/../src/interface/search.cpp:909 msgid "Download search results" msgstr "Arama sonuçlarını indir" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" -msgstr "Seçili klasörü indir" +msgstr "Seçilmiş klasörü indir" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" -msgstr "Seçili dosya ve klasörleri indir" +msgstr "Seçilmiş dosya ve klasörleri indir" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1051 #, c-format msgid "" "Download speed: %s/s\n" "Upload speed: %s/s" msgstr "" -"İndirme hızı: %s/s\n" -"Yükleme hızı: %s/s" +"İndirme Hızı: %s/s\n" +"Yükleme Hızı: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "İndiriliyor" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:148 #, c-format msgid "Downloading %s" msgstr "%s indiriliyor" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Güncelleme indiriliyor..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:90 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:112 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" "Henüz farklı FileZilla kopyaları arasında sürükleyip bırakma desteklenmiyor." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:103 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:117 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Farklı sunucular arasında Sürükle Bırak henüz desteklenmiyor." @@ -3288,66 +3480,66 @@ msgid "Dupl&icate" msgstr "Kopya&la" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" -msgstr "Tümü&nü etkinleştir" +msgstr "Tümü&nü Etkinleştir" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "K&lasörü aç" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Ça&lıştırma" #: ../../locales/../src/interface/resources/xrc/menus.xrc:39 msgid "E&xit" -msgstr "FileZilla yazılımını &kapat" +msgstr "Çı&kış" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." -msgstr "Bilgileri &Ver..." +msgstr "Bilgileri &Dışa Aktar..." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "E-Mail:" msgstr "E-posta:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Her süzgeç en az bir ölçüte sahip olmalı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" -msgstr "Süzgeçleri düzenle" +msgstr "Süzgeçleri Düzenle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Dosya ayarlanmış olan düzenleyici ile düzenlensin ve değişiklikler sunucuya " "yüklensin." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1172 msgid "Editing directories is not supported" msgstr "Klasörleri düzenleme işlemi desteklenmiyor" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1661 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "Editing failed" msgstr "Düzenleme yapılamadı" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1172 msgid "Editing search results" msgstr "Arama sonuçları düzenleniyor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "E-posta:" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Empty command" msgstr "Boş komut" @@ -3355,7 +3547,7 @@ msgid "Empty command." msgstr "Boş komut." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2058 msgid "Empty directory listing" msgstr "Klasör listesi boş" @@ -3367,13 +3559,13 @@ msgid "Empty file extension." msgstr "Boş dosya uzantısı." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Süzgeç adını boş bırakamazsınız." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Boş ad" @@ -3381,81 +3573,97 @@ msgid "Empty quoted string." msgstr "Boş ifade." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" -msgstr "&Tümünü etkinleştir" +msgstr "&Tümünü Etkinleştir" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Geçersiz karakterler &süzülsün" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Şifreli" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Şifreleme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "Şifreleme &Anahtarı:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "Şifreleme &anahtarı:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Şifreleme ayrıntıları" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:471 msgid "End comparison and change sorting order?" msgstr "Karşılaştırma bitirilip sıralama düzeni değiştirilsin mi?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Karşılaştırma ve hızlı arama sona erdirilsin mi?" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." -msgstr "Özel &komut yazın..." +msgstr "Özel &Komut Yazın..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." -msgstr "Sınırsız hız için 0 yazın." +msgstr "Hız sınırlaması olmaması için 0 yazın." -#: ../../locales/../src/interface/QueueView.cpp:2103 +#: ../../locales/../src/interface/QueueView.cpp:1867 msgid "Enter command" msgstr "Komutu yazın" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:625 msgid "Enter custom command" -msgstr "Özel komutu yazın" +msgstr "Özel komut yazın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Klasör açılsın" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Süzgeç adını yazın" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Ana parolayı yaz" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" -msgstr "Süzmeseti için bir ad yazın" +msgstr "Süzgeç kümesinin adını yazın" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" -msgstr "Süzme seti için ad yazın" +msgstr "Süzgeç kümesinin yeni adını yazın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Parolayı yazın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" -msgstr "Seçili klasörü aç" +msgstr "Seçilmiş klasörü aç" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3463,21 +3671,20 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Sunucu adresini yazın.\n" -"Sunucu iletişim kuralını belirtmek için, sunucu adının önüne iletişim kuralı " -"belirtecini ekleyin. İletişim kuralı belirtilmemişse, varsayılan iletişim " -"kuralı (ftp://) kullanılır.\n" -"Aynı zamanda tam İnternet adresini, iletişimkuralı://kullanıcı:parola@sunucu:" -"kapı şeklinde yazabilirsiniz. Bu durumda diğer alanlardaki değerler hesaba " +"Sunucu adresini yazın. Sunucu iletişim kuralını belirtmek için, sunucu " +"adının önüne iletişim kuralı belirtecini ekleyin. İletişim kuralı " +"belirtilmemişse, varsayılan iletişim kuralı (ftp://) kullanılır.\n" +"Aynı zamanda tam adresi, iletişimkuralı://kullanıcı:parola@sunucu:kapı " +"şeklinde yazabilirsiniz. Bu durumda diğer alanlardaki değerler hesaba " "katılmaz.\n" "\n" "Desteklenen iletişim kuralları:\n" -"- ftp:// isteğe bağlı şifreleme ile normal FTP için\n" -"- sftp:// SSH dosya aktarım iletişim kuralı için\n" -"- ftps:// TLS (örtülü) üzerinden FTP için\n" -"- ftpes:// TLS (açıkta) üzerinden FTP" +"- ftp:// isteğe bağlı şifreleme ile normal FTP\n" +"- sftp:// SSH şifrelemesi ile FTP\n" +"- ftps:// FTP için TLS (örtülü)\n" +"- ftpes:// FTP için TLS (açıkta)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3486,154 +3693,170 @@ "'%s' dosyası için parolayı yazın.\n" "Dönüştürülen dosya aynı parola ile korunacak." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Sunucunun dinlediği kapıyı yazın.\n" -"Varsayılan kapılar FTP için 21, SFTP için 22'dir." +"Sunucunun dinlediği kapıyı yazın. Varsayılan kapılar FTP için 21, SFTP için " +"22'dir." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Kullanıcı adını yazın" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Kullanıcı adı ve parolayı yazın" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Hata" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" -msgstr "Ayarlar verilirken hata oluştu" +msgstr "Ayarlar dışa aktarılırken sorun çıktı" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" -msgstr "Alırken hata oluştu" +msgstr "Veriler içe aktarılırken sorun çıktı" -#: ../../locales/../src/interface/QueueView.cpp:1903 +#: ../../locales/../src/interface/QueueView.cpp:1657 msgid "Error loading queue" -msgstr "Kuyruk yüklenirken hata oluştu" +msgstr "Kuyruk yüklenirken sorun çıktı" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1824 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:247 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:131 +#: ../../locales/../src/interface/QueueView.cpp:1561 +#: ../../locales/../src/interface/search.cpp:1304 +#: ../../locales/../src/interface/search.cpp:1323 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:783 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:846 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" -msgstr "XML dosyası okunurken hata oluştu" +msgstr "XML dosyası yüklenirken sorun çıktı" -#: ../../locales/../src/interface/QueueView.cpp:1813 +#: ../../locales/../src/interface/QueueView.cpp:1550 msgid "Error saving queue" -msgstr "Kuyruk kaydedilirken hata oluştu" +msgstr "Kuyruk kaydedilirken sorun çıktı" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" -msgstr "Yazılım başlatılırken hata oluştu" +msgstr "Uygulama başlatılırken sorun çıktı" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1581 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:867 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2474 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 msgid "Error writing xml file" -msgstr "XML dosyası yazılırken hata oluştu" +msgstr "XML dosyası yazılırken sorun çıktı" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:284 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Error:" msgstr "Hata:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Örnek: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Örnekler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Çal&ıştırma" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Kullandığınız uygulama sürüm bilgisini içermediğinden güncelleme denetimi " "yapılamıyor." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Gezgin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Süz&geçler dışa aktarılsın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" -msgstr "&Aktarım kuyruğu verilsin" +msgstr "&Aktarım kuyruğu dışa aktarılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" -msgstr "Ayarlar &verilsin" +msgstr "Ayarlar &dışa aktarılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" -msgstr "Ayarları verin" +msgstr "Verileri Dışa Aktar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" -msgstr "Sü&zgeç adı:" +msgstr "Sü&zgeç Adı:" #: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 msgid "FTP - File Transfer Protocol" msgstr "FTP - Dosya aktarımı iletişim kuralı" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:20 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - İsteğe bağlı şifreleme ile dosya aktarımı iletişim kuralı" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:26 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Güvenliksiz dosya aktarımı iletişim kuralı" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "FTP motoru başlatılamadı, bağlanamıyor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" -msgstr "FTP Canlı-tut" +msgstr "FTP Canlı Tutma" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP Vekil Sunucusu" #: ../../locales/../src/interface/cmdline.cpp:21 msgid "FTP URL" -msgstr "FTP İnternet Adresi" +msgstr "FTP Adresi" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:44 msgid "" @@ -3643,75 +3866,83 @@ "FTP, veri aktarımı için ikincil bağlantılar kullanır. Bu ek bağlantılar iki " "şekilde sağlanabilir." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP üzerinden açıkta TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:24 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP üzerinden örtülü TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:542 +#: ../../locales/../src/interface/LocalListView.cpp:615 +#: ../../locales/../src/interface/LocalListView.cpp:931 +#: ../../locales/../src/interface/LocalListView.cpp:1864 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Klasör değiştirilemedi" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Dil değiştirilemedi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "8 bit karakter kümesine dönüştürme komutu yürütülemedi" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2254 msgid "Failed to copy or move sites" msgstr "Siteler kopyalanamadı ya da taşınamadı" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:330 msgid "Failed to create backup copy of xml file" msgstr "Xml dosyasının yedeği alınamadı" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Dinleme soketi oluşturulamadı, iptal ediliyor" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "%d üzerinde dinleme soketi oluşturulamadı. Vazgeçiliyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Aktif kip aktarımı için dinleme soketi oluşturulamadı" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Sunucu parolasının şifresi çözülemedi." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "'Belgelerim' klasörüne erişilemedi" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Masaüstü yolu alınamadı" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "Denetim bağlantısının denklik adresi alınamadı, bağlantı kapatıldı." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "Veri bağlantısının denklik adresi alınamadı, bağlantı kapandı." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "FTP motoru başlatılamadı" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:120 msgid "Failed to initialize TLS." -msgstr "TLS başlatılamadı" +msgstr "TLS başlatılamadı." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" msgstr "Ağ sistemi başlatılamadı" @@ -3719,70 +3950,70 @@ msgid "Failed to load panels, invalid resource files?" msgstr "Paneller yüklenemedi, kaynak dosyalar bozuk mu?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Kişisel anahtar yüklenemedi: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "\"%s\" ekleme/yazma için açılamıyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:138 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "\"%s\" okuma için açılamıyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "\"%s\" yazma için açılamıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Failed to parse returned path." msgstr "Döndürülen yol çözümlenemedi." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Veri alınamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Klasör listesi alınamadı" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Dış IP adresi alınamadı, iptal ediliyor" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" -msgstr "Dış IP adresi okunamadı, yerel IP deneniyor" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Yerel IP adresi okunamadı." - -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Yerel IP adresi okunamadı. Vazgeçiliyor" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Dış IP adresi öğrenilemedi. Vazgeçiliyor." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" +msgstr "Dış IP adresi öğrenilemedi, yerel adres deneniyor" + +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Yerel IP adresi öğrenilemedi. Vazgeçiliyor." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Yerel IP adresi öğrenilemedi." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Dış IP adresi okunamadı." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Komut gönderilemedi." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" "Dil %s (%s) olarak değiştirilemiyor, sistem varsayılan dili kullanılacak" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3790,43 +4021,42 @@ "Dil %s (%s) olarak değiştirilemedi, sistem varsayılan dili kullanılacak (%s, " "%s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Dil %s (%s) olarak değiştirilemiyor, sistem varsayılan dili kullanılacak." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Dil %s olarak değiştirilemiyor, sistem varsayılan dili kullanılacak" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Dil %s olarak değiştirilemiyor, sistem varsayılan dili kullanılacak (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Dil %s olarak değiştirilemiyor, sistem varsayılan dili kullanılacak." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Ayarlar doğrulanamadı" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Denklik sertifikası doğrulanamadı" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "%s dosyasına yazılamadı" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:373 msgid "Failed to write xml file" msgstr "XML dosyasına yazılamadı" @@ -3838,35 +4068,35 @@ msgid "Fall back to active mode" msgstr "Aktif kipe geçilsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Dos&ya:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Dos&yalar" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:268 msgid "File" msgstr "Dosya" #: ../../locales/../src/interface/settings/settingsdialog.cpp:100 msgid "File Types" -msgstr "Dosya Tipleri" +msgstr "Dosya Türleri" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Dosya belirteci bir soket değil" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." -msgstr "Dosyada alınabilecek bir veri yok." +msgstr "Dosyada içe aktarılabilecek bir veri yok." #: ../../locales/../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "Dosya Düzenleme" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "File exists" msgstr "Dosya var" @@ -3874,7 +4104,7 @@ msgid "File exists action" msgstr "Dosya Var İşlemi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Dosya değiştirildi" @@ -3882,65 +4112,69 @@ msgid "File lists" msgstr "Dosya Listeleri" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:105 +#: ../../locales/../src/engine/storj/resolve.cpp:176 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:630 +#: ../../locales/../src/interface/FileZilla.cpp:720 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Dosya bulunamadı" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:723 +#: ../../locales/../src/interface/search.cpp:728 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Dosya arama" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" -msgstr "Kullanıcı dosya aktarımını durdurdu" +msgstr "Kullanıcı dosyayı aktarmaktan vazgeçti" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" -msgstr "Dosyanın %s/%s bölümü aktarılmışken kullanıcı işlemi durdurdu" +msgstr "%s/%s aktarılmışken kullanıcı dosyayı aktarmaktan vazgeçti" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Dosya aktarılamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" -msgstr "Dosyanın %s/%s kadarından sonrası aktarılamadı" +msgstr "%s boyutundaki dosya %s süreden sonra aktarılamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Dosya aktarımı atlandı" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Dosya aktarıldı" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" -msgstr "Dosya aktarıldı, %s/%s kadarı aktarıldı" +msgstr "%s boyutundaki dosya %s sürede aktarıldı" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1234 msgid "File transfers still in progress." msgstr "Dosya aktarımı henüz bitmedi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." -msgstr "Dosya ASCII veri tipiyle aktarılsa olurdu." +msgstr "Dosya ASCII veri türüyle aktarılsa olurdu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." -msgstr "Dosya ikili veri tipiyle aktarılsa olurdu." +msgstr "Dosya ikili veri türüyle aktarılsa olurdu." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:442 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" -msgstr "FileZilla Hatası" +msgstr "FileZilla Sorunu" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 msgid "" @@ -3949,73 +4183,77 @@ msgstr "" "FileZilla artık tüm ayarlarının doğru yapılıp yapılmadığını sınayabilir." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "Filezilla şu anda bir sunucuya bağlı." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1541 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "Dil değişikliğinin etkili olabilmesi için FileZilla yeniden başlatılmalı." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "FileZilla Güncellemeleri" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" -msgstr "Dosya listesi durum &çubukları" +msgstr "Dosya Listesi Durum Ç&ubukları" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:395 +#: ../../locales/../src/interface/search.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:32 msgid "Filename" msgstr "Dosya Adı" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "&Dosya adı süzgeçleri..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Dosya adı %s klasörü ve %s dosya adı için oluşturulamıyor" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1627 msgid "Filename invalid" msgstr "Dosya adı geçersiz" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 msgid "Filename unchanged" msgstr "Dosya adı değiştirilmedi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Dosya Adı:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Dosya adlarında şu karakterler bulunamaz: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "Dosya adlarında şu karakterler bulunamaz: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Şu an düzenlenen dosyalar" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Bir süzgeç kuralına uyan dosyalar klasör listelerinden kaldırılır." + +#: ../../locales/../src/engine/storj/resolve.cpp:313 +msgid "Files not found" +msgstr "Dosyalar bulunamadı" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:396 +#: ../../locales/../src/interface/search.cpp:156 msgid "Filesize" msgstr "Boyut" @@ -4023,66 +4261,70 @@ msgid "Filesize format" msgstr "Dosya Boyutu Biçimi" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:397 +#: ../../locales/../src/interface/search.cpp:157 msgid "Filetype" -msgstr "Tip" +msgstr "Tür" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" -msgstr "Dosya Tipi İlişkileri" +msgstr "Dosya Türü İlişkileri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" -msgstr "Süzgecin uygulanacağı:" +msgstr "Süzgeç şunlara uygulansın:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Dosya Adlarındaki Geçersiz Karakterler" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter name already exists" msgstr "Aynı adlı bir süzgeç var" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" -msgstr "Şunların tümüne uyan ögeler süzülsün" +msgstr "Aşağıdakilerin tümüne uyan ögeler süzülsün" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" -msgstr "Şunların herhangi birine uyan ögeler süzülsün" +msgstr "Aşağıdakilerin herhangi birine uyan ögeler süzülsün" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" -msgstr "Şunların hiçbirine uymayan ögeler süzülsün" +msgstr "Aşağıdakilerin hiçbirine uymayan ögeler süzülsün" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Aşağıdakilerin tümüne uymayan ögeler süzülsün" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" -msgstr "Aynı adlı bir süzme seti var" +msgstr "Aynı adlı bir süzgeç kümesi var" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Klasör listesi süzülsün" -#: ../../locales/../src/interface/filteredit.cpp:337 -#: ../../locales/../src/interface/filteredit.cpp:345 -#: ../../locales/../src/interface/filteredit.cpp:353 +#: ../../locales/../src/interface/filteredit.cpp:336 +#: ../../locales/../src/interface/filteredit.cpp:344 +#: ../../locales/../src/interface/filteredit.cpp:352 msgid "Filter validation failed" msgstr "Süzgeç doğrulanamadı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" -msgstr "Dosyaları a&ra" +msgstr "Dosyalar a&ransın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" -msgstr "&Klasörleri ara" +msgstr "&Klasörler aransın" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" @@ -4092,16 +4334,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Parmakizi (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Parmak İzi:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Parmak İzleri:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Güvenlik duvarı ve yöneltici ayar yardımcısı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4113,7 +4356,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Güvenilirlik açısından en az 10 kapılık bir aralık belirtilmeli." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:246 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4121,35 +4364,40 @@ "Bu oturum süresince varsayılan ayarlar kullanılacak ve yapılan değişiklikler " "kalıcı olmayacak." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "&UTF-8 kullanılsın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" -msgstr "&Gizli dosyalar görüntülensin" +msgstr "&Gizli Dosyalar Görüntülensin" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Force showing hidden files" -msgstr "Gizli dosyalar görüntülenir" +msgstr "Gizli dosyalar görüntülensin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Biçim Özellikleri:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" -"Biçim: Dosya tipini izleyerek tırnak içinde komutu ve ardından parametreleri " -"yazın." +"Biçim: Dosya türünü izleyecek şekilde tırnak içine komutu ve ardına " +"parametreleri yazın." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:687 #, c-format msgid "Found new %s %s\n" msgstr "Yeni %s %s bulundu\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "%s işlevi tamamlanamadı" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Ayrıntılı bilgiler" @@ -4157,84 +4405,92 @@ msgid "General" msgstr "Genel" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" -msgstr "Genel SOCKS sunucu hatası" +msgstr "Genel SOCKS sunucu sorunu" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Oluştur..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Genel Vekil Sunucu" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" -msgstr "Dış IP adresi şu İnternet adresinden alınsın:" +msgstr "Dış IP adresi şu adresten alınsın:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Yardım istiyorsanız" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" -msgstr "Verilen süzme seti adı zaten var, üzerine yazılsın mıi?" +msgstr "Aynı adlı bir süzgeç kümesi zaten var, üzerine yazılsın mı?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" -msgstr "Küresel yer imleri" +msgstr "Genel yer imleri" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" -msgstr "GnuTLS hatası %d" +msgstr "GnuTLS sorunu %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" -msgstr "GnuTLS hatası %d, %s içinde" +msgstr "GnuTLS sorunu %d, %s içinde" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" -msgstr "GnuTLS hatası %d, %s içinde: %s" +msgstr "GnuTLS sorunu %d, %s içinde: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" -msgstr "GnuTLS hatası %d: %s" +msgstr "GnuTLS sorunu %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Yeşil" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Grup izinleri" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "&Yüksek" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:23 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP üzerinden TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Karma:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Gizli" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:892 +#: ../../locales/../src/interface/queue.cpp:948 msgid "High" msgstr "Yüksek" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:894 +#: ../../locales/../src/interface/queue.cpp:950 msgid "Highest" msgstr "En Yüksek" @@ -4242,57 +4498,65 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "En büyük kapı numarası 1024 ila 65535 arasında olmalı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" -"Her iki tarafta da aynı anda süzgeç durumunu açıp kapamak için shift tuşuna " +"Her iki tarafta da aynı anda süzgeç durumunu açıp kapamak için Shift tuşuna " "basın." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" -msgstr "Giriş Sayfası:" +msgstr "Web Sayfası:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Sunucu çalışmıyor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Sunucu anahtarı parmak izi:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Sunucu anahtarı uyuşmazlığı" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Sunucu adı '[' ile başlıyor ama kapatma parantezi bulunamadı." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "Sunucuya ulaşılamıyor" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Sunucu:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Sunucu Anahtarı Algoritması:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Saat," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"A&na parolamı unuttum. Bu anahtar ile kaydedilmiş tüm parolalar silinsin." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (örnek: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "SOCKS4 vekil sunucuları IPv6 adreslerini desteklemez" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4301,10 +4565,10 @@ "Bir işlem sırasında, belirtilen sürede hiç veri gönderilip alınamazsa, " "bağlantı kapatılır ve FileZilla yeniden bağlanmayı dener." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" -"Hata bildiriyorsanız, günlükleri \"Ayrıntılı\" günlükleme düzeyinde gönderin." +"Bir hata bildirirken günlükleri \"Ayrıntılı\" günlükleme düzeyinde gönderin." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:139 msgid "" @@ -4326,7 +4590,7 @@ "Diğer yöntemlere başvurma seçeneğini etkinleştirerek, varsayılan aktarım " "kipinizi kabul etmeyen, hatalı ayarlanmış sunuculara da bağlanabilirsiniz." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4334,15 +4598,15 @@ "Sunucu anahtarının değişmesini beklemiyorsanız, sistem yöneticisi ile " "görüşün." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" -"Bu sorun devam ederse, Filezilla bir yöneltici ya da güvenlik duvarı " +"Bu sorun devam ederse, FileZilla bir yöneltici ya da güvenlik duvarı " "tarafından engelleniyor demektir." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4350,25 +4614,25 @@ "Bu sorun devam ederse, bağlantı bir yöneltici ya da güvenlik duvarı " "tarafından kesiliyor demektir." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " "a new file gets created." msgstr "" "Günlük dosyasının boyutu belirtilen sınıra gelirse dosya adının sonuna " -"\".1\" eklenerek (daha eski günlük dosyalarının üstüne yazılabilir) yeniden " +"\".1\" eklenerek (daha eski günlük dosyalarının üzerine yazılabilir) yeniden " "adlandırılır ve yeni bir dosya oluşturulur." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." msgstr "" -"Sembolik bağlantı bir klasörü gösteriyorsa Filezilla sembolik bağlantıyı ya " +"Sembolik bağlantı bir klasörü gösteriyorsa FileZilla sembolik bağlantıyı ya " "da bağlı klasörün içini silebilir." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4376,34 +4640,33 @@ "Bu sorun devam ederse, çözüm için yöneltici ya da güvenlik duvarı " "üreticinizle görüşün." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "Bu sorun devam ederse yöneltici üreticinizle görüşün." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " "timezone offset in the site manager." msgstr "" -"'Daha yeni ise üstüne yazılsın' seçeneğinin kullanılabilmesi için sistem " +"'Daha yeni ise üzerine yazılsın' seçeneğinin kullanılabilmesi için sistem " "saati sunucu saati ile aynı olmalıdır. Sistem ile sunucunun saat dilimleri " "farklı ise, Site Yöneticisi'nden saat dilimi farkını ayarlayın." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." msgstr "" -"Zaman damgasına göre karşılaştırma yapılırken, aradaki fark burada " -"belirtilen eşik değerini aşmıyorsa, farklı zaman damgasına sahip dosyalar " -"aynı kabul edilsin." +"Zamana göre karşılaştırma yapılırken, aradaki fark burada belirtilen eşik " +"değerini aşmıyorsa, farklı zamana sahip dosyalar aynı kabul edilir." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "" -"Değiştirilen dili ayarlarının etkin olması için FileZilla yeniden " +"Değiştirilen dil ayarlarının etkin olması için FileZilla yeniden " "başlatılmalıdır." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 @@ -4414,22 +4677,23 @@ "Sına'ya tıkladığınızda, probe.filezilla-project.org adresine bağlanılarak " "bazı basit sınamalar yapılır." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1256 msgid "If you close FileZilla, your changes will be lost." msgstr "" -"FileZilla yazılımını şimdi kapatırsanız, yaptığınız değişiklikler kaybolacak." +"FileZilla uygulamasını şimdi kapatırsanız, yaptığınız değişiklikler " +"kaybolacak." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." -msgstr "Hatalı yazılan tipler aktarım sırasında bozulabilir." +msgstr "Hatalı yazılan türler aktarım sırasında bozulabilir." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 msgid "If you get any errors, your configuration is not correct." -msgstr "Herhangi bir hata alıyorsanız ayarlarınız yanlış demektir." +msgstr "Herhangi bir hata iletisi görüyorsanız ayarlarınız yanlış demektir." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4437,7 +4701,7 @@ "Klasörleri listelemekte ya da dosya aktarımında sorun yaşıyorsanız, " "varsayılan aktarım kipini değiştirmeyi deneyin." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4471,7 +4735,7 @@ "Bir yöneltici kullanıyorsanız bu kapıların FileZilla çalışan bilgisayara " "yönlendirildiğinden emin olun." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4479,23 +4743,23 @@ "Yönelticiniz IP adresini değiştirmeye devam ediyorsa yönelticinizin " "üreticisiyle görüşün." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" -msgstr "Önceki sürümlerden veri al" +msgstr "Önceki sürüm verilerini içe aktar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" -msgstr "Alma ayarları" +msgstr "İçe aktarma ayarları" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" -msgstr "Veri alındı" +msgstr "Veriler içe aktarıldı" #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:49 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:56 msgid "Improperly quoted association." -msgstr "Düzgün olmayan şekilde tırnak içinde yazılmış ilişki." +msgstr "Düzgün olmayan şekilde tırnak içine yazılmış ilişki." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:266 msgid "" @@ -4514,7 +4778,7 @@ "bağlanma şansı olmadığından, varolan tüm kapıları yönlendirmeniz gerekir." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4531,19 +4795,11 @@ "ve bağlantı verilen bu kapıdan kurulur. Bunun için pek bir ayar yapılmasına " "gerek yoktur." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Kopuk zincir, üst sertifika kendiliğinden imzalanmış bir yetki sertifikası " -"değil" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Incorrect password" msgstr "Parola yanlış" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4551,21 +4807,21 @@ "Son FileZilla sürümüyle ilgili bilgiler alınamadı. Lütfen daha sonra yeniden " "deneyin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "TLS başlatılıyor..." -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 msgid "Insecure algorithm!" msgstr "Güvenliksiz algoritma!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Güvenliksiz sunucu, TLS üzerinden FTP desteklenmiyor." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:578 +#: ../../locales/../src/engine/server.cpp:602 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Etkileşimli" @@ -4573,76 +4829,95 @@ msgid "Interface" msgstr "Arayüz" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "İşaret tarafından kesildi" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:216 +#: ../../locales/../src/interface/queue.cpp:342 msgid "Interrupted by user" msgstr "Kullanıcı tarafından durduruldu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:36 +#: ../../locales/../src/engine/http/request.cpp:363 msgid "Invalid Content-Length" msgstr "İçerik-Uzunluk Geçersiz" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:260 msgid "Invalid HTTP Response" msgstr "HTTP Yanıtı Geçersiz" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" -msgstr "Geçilen argüman geçersiz" +msgstr "Aktarılan seçenek geçersiz" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:454 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." msgstr "" "Geçersiz karakter dizilimi alındı, UTF-8 devre dışı bırakılıyor. UTF-8 " -"karakter setini dayatmak için Site Yöneticisinde 'UTF-8 kullanılsın' " +"karakter kümesini dayatmak için Site Yöneticisinde 'UTF-8 kullanılsın' " "seçeneğini etkinleştirin." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Invalid chunk size" -msgstr "Yığın boyutu geçersiz" +msgstr "İri veri boyutu geçersiz" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Geçersiz veri alındı" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:34 +#: ../../locales/../src/interface/verifycertdialog.cpp:49 msgid "Invalid date" msgstr "Tarih geçersiz" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Dosya adı geçersiz" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Sunucu geçersiz. Parantezi kapattıktan sonra yalnızca iki nokta üstüste ve " "kapı yazılabilir." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Sunucu adı geçersiz: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Giriş geçersiz" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:317 +msgid "Invalid line" +msgstr "Satır geçersiz" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Yol geçersiz" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Yazılan kapı geçersiz. Kapı değeri 1 ile 65535 arasında olmalıdır." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4656,85 +4931,85 @@ "ftps:// TLS (örtülü) üzerinden FTP ve\n" "ftpes:// TLS (açıkta) üzerinde FTP." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Vekil sunucu geçersiz. Parantezi kapattıktan sonra yalnızca iki nokta " "üstüste ve bağlantı noktası yazılabilir." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Kurallı ifade geçersiz" + +#: ../../locales/../src/interface/search.cpp:728 msgid "Invalid regular expression in search conditions." msgstr "Arama ölçütlerindeki kurallı ifade geçersiz." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:269 msgid "Invalid response code" msgstr "Yanıt kodu geçersiz" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:723 #, c-format msgid "Invalid search conditions: %s" msgstr "Arama ölçütleri geçersiz: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Site yolu geçersiz" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Ölçütteki boyut geçersiz" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Kullanıcı adı geçersiz." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" -msgstr "ai_flags değeri geçersiz" +msgstr "Alınan ai_flags değeri geçersiz" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "İpucu değeri geçersiz" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Süzgeci Tersine Çevir" + +#: ../../locales/../src/interface/verifycertdialog.cpp:260 msgid "Jurisdiction country:" msgstr "Yetkili ülke:" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Jurisdiction locality:" msgstr "Yetkili yerleşim:" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:261 msgid "Jurisdiction state or province:" msgstr "Yetkili şehir:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Klasörler üstte görüntülensin" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:714 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " "some tests to check if the server supports this feature, the test may fail." msgstr "" "Bazı sunucuların bu özelliği desteklemeyebileceğini ve bu nedenle hatalı " -"listeleler görebileceğinizi unutmayın. Filezilla, sunucunun bu özelliği " +"listeleler görebileceğinizi unutmayın. FileZilla, sunucunun bu özelliği " "destekleyip desteklemediğini anlamak için bazı sınamalar yapsa da başarısız " "olabilir." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Anahtar Takası" @@ -4742,123 +5017,141 @@ msgid "Key exchange:" msgstr "Anahtar Takası:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:575 +#: ../../locales/../src/engine/server.cpp:600 msgid "Key file" msgstr "Anahtar dosyası" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Anahtar Belirteci:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "E&n düşük" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Dil" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1541 msgid "Language changed" msgstr "Dil değişti" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:291 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:158 msgid "Last modified" msgstr "Son Değişiklik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Yerleşim" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1803 +msgid "Leave empty to keep existing password." +msgstr "Varolan parolanın korunması için boş bırakın." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Eşzamanlı in&dirme:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Eşzamanlı &yükleme:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Yerel Kapı Sınırlandırması" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Günlük dosyası boyutunun sınırı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Sınır:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:427 msgid "Line length exceeded" msgstr "Satır uzunluğu aşıldı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" -msgstr "Bağlantılı" +msgstr "İlgili Bileşenler" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Dinleme soketi kapandı" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:374 msgid "Listing:" msgstr "Sıralama:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Kullanılabilecek e&n küçük kapı:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Yerel" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Kullanılan yerel adres" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Yerel bitim noktası kapatıldı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Yerel dosya" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Yerel dosya bulunamadı." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:401 +#: ../../locales/../src/interface/updater.cpp:494 #, c-format msgid "Local file is %s\n" msgstr "Yerel dosya %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Yerel dosya normal bir dosya değil bir klasör." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Yerel dosyanın geçerli bir adı yok." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:686 +#: ../../locales/../src/interface/search.cpp:692 +msgid "Local file search" +msgstr "Yerel dosyalarda arama" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" -msgstr "Yerel süzgeçler:" +msgstr "Yerel Süzgeçler:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Yerel yolun işlenişi:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" -msgstr "Yerel site:" +msgstr "Yerel Site:" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Locality:" msgstr "Yer:" @@ -4866,41 +5159,42 @@ msgid "Log file" msgstr "Günlük dosyası" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "Oturum açıldı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Günlük" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." msgstr "" "Giriş verisi ASCII olmayan karakterler içeriyor ve sunucu UTF-8 anlamıyor " -"olabilir. Vekil sunucu kullanıldığı için yerel karakter seti kullanılamıyor." +"olabilir. Vekil sunucu kullanıldığı için yerel karakter kümesi " +"kullanılamıyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." msgstr "" "Giriş verisi ASCII olmayan karakterler içeriyor ve sunucu UTF-8 anlamıyor " -"olabilir. Yerel karakter seti deneniyor." +"olabilir. Yerel karakter kümesi deneniyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" -"Oturum açma işlemleri eksiksiz yapıldı ama hala oturum açılamadı. " -"Vazgeçiliyor." +"Oturum açma işlemleri eksiksiz yapıldı ama hala oturum açılamadı, " +"vazgeçiliyor." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." msgstr "" -"Oturum açma tipi 'sorulsun' ya da 'etkileşimli' olmalıdır (tırnaklar " +"Oturum açma türü 'sorulsun' ya da 'etkileşimli' olmalıdır (tırnaklar " "olmadan)." #: ../../locales/../src/interface/cmdline.cpp:11 @@ -4909,16 +5203,16 @@ "Logontype, can only be used together with FTP URL. Argument has to be either " "'%s' or '%s'" msgstr "" -"Oturum açma tipi yalnız FTP İnternet adresi ile birlikte kullanılabilir. " -"Seçenek '%s' ya da '%s' olmalıdır." +"Oturum açma türü yalnız FTP adresi ile birlikte kullanılabilir. Seçenek " +"şunlardan biri olabilir: '%s' ya da '%s'" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:887 +#: ../../locales/../src/interface/queue.cpp:943 msgid "Low" msgstr "Düşük" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:885 +#: ../../locales/../src/interface/queue.cpp:941 msgid "Lowest" msgstr "En Düşük" @@ -4930,159 +5224,201 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Mor" + +#: ../../locales/../src/interface/xmlfunctions.cpp:39 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Dosyanın erişilebilir ve düzgün hazırlanmış bir XML belgesi olduğuna emin " "olun." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:414 +#: ../../locales/../src/engine/http/request.cpp:427 +#: ../../locales/../src/engine/http/request.cpp:437 +#: ../../locales/../src/engine/http/request.cpp:470 #, c-format msgid "Malformed chunk data: %s" -msgstr "Bozuk biçimli yığın: %s" +msgstr "İri veri biçimi bozuk: %s" + +#: ../../locales/../src/engine/http/request.cpp:36 +#, c-format +msgid "Malformed request header: %s" +msgstr "Bozuk biçimli istek üst bilgisi: %s" + +#: ../../locales/../src/engine/http/request.cpp:489 +#, c-format +msgid "Malformed response body: %s" +msgstr "Bozuk biçimli yanıt metni: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:230 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/engine/http/request.cpp:317 +#: ../../locales/../src/engine/http/request.cpp:355 +#: ../../locales/../src/engine/http/request.cpp:363 +#: ../../locales/../src/engine/http/request.cpp:420 #, c-format -msgid "Malformed header: %s" -msgstr "Bozuk biçimli başlık bilgisi: %s" +msgid "Malformed response header: %s" +msgstr "Bozuk biçimli yanıt üst bilgisi: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Uygunsuz yanıt, sunucu uygun satır sonu karakterleri göndermiyor" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:376 +msgid "" +"Malformed response: Server sent response body with a request verb or " +"response code that disallows a response body." +msgstr "" +"Yanıt biçimi hatalı: Sunucu yanıt gövdesini istek eylemi ile gönderdi ya da " +"yanıt kodu bir yanıt gövdesi bulunmasına izin vermiyor." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "El ile aktarım" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Ana &Parola:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Ana parola:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Aşağıdakilerin hepsine uyan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Aşağıdakilerin herhangi birine uyan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Aşağıdakilerin hiçbirine uymayan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Aşağıdakilerin hiçbirine uymayan" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Eşzamanlı ak&tarım:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" -msgstr "Bellek yerleşimi hatası" +msgstr "Bellek yerleşimi sorunu" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1856 msgid "Message log" -msgstr "Günlük kaydı" +msgstr "Günlük" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Günlük kayıtlarının konumu" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "İleti çok uzun" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Dakika" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "&Aşağı taşı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Y&ukarı taşı" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Bilgisayarım" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Belgelerim" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:769 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:772 msgid "My Sites" msgstr "Sitelerim" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "Yok" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Ad" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1261 msgid "Name already exists" msgstr "Bu ad daha önce verilmiş" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Yer imi adı zaten var." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Ad:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Doğal sıralama" -#: ../../locales/../src/interface/filteredit.cpp:345 +#: ../../locales/../src/interface/filteredit.cpp:344 msgid "Need to enter filter name" msgstr "Süzgeç adını yazmalısınız" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:686 +msgid "Need to enter valid local path" +msgstr "Geçerli bir yerel yol yazılmalıdır" + +#: ../../locales/../src/interface/search.cpp:713 msgid "Need to enter valid remote path" msgstr "Geçerli bir yol yazmalısınız" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1046 msgid "Need to specify a character encoding" msgstr "Karakter kodlaması belirtilmeli" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Nodename ya da servname belirtilmedi ya da bilinmiyor" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "Ağ sunucusunda istenen adres ailesine ait bir ağ adresi bulunamadı" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Ağa ulaşılamıyor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Hiçbir zaman" @@ -5092,39 +5428,39 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" -msgstr "&Sekme ekle" +msgstr "&Sekme Ekle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Yer İ&mi Ekle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2412 msgid "New bookmark" msgstr "Yeni yer imi" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1340 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1265 msgid "New directory" -msgstr "Klasör oluştur" +msgstr "Klasör Oluştur" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "%s sürümündeki yeni özellik ve geliştirmeler" @@ -5133,41 +5469,41 @@ msgid "New filter" msgstr "Yeni süzgeç" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:950 msgid "New folder" -msgstr "Klasör oluştur" +msgstr "Klasör Oluştur" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2385 msgid "New site" msgstr "Yeni site" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Aktarım kuyruğu bölümünün yanında" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:389 msgid "No" msgstr "Hayır" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Nodename için bir adres belirtilmemiş" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" -msgstr "Verilecek bir kategori seçilmemiş" +msgstr "Dışa aktarılacak bir veri seçilmemiş" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "No command given, aborting." -msgstr "Komut verilmedi, vazgeçiliyor." +msgstr "Herhangi bir komut verilmedi, vazgeçiliyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Dış IP adresi belirtilmemiş, varsayılan deneniyor." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Şu an düzenlenen bir dosya yok." @@ -5175,124 +5511,129 @@ msgid "No filter name given" msgstr "Süzgeç adı verilmemiş" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Sunucu belirtilmemiş. Lütfen sunucuyu yazın." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Hiç görsel yok" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Kuyrukta dosya yok!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." -msgstr "Süzme setine ad verilmemiş" +msgstr "Süzgeç kümesine ad verilmemiş." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" -msgstr "Bu dosya tipi ile ilişkili bir program bulunamadı" +msgstr "Bu dosya türü ile ilişkili bir program bulunamadı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" -"%s' uzantılı dosyaları düzenlemek için ilişkilendirilmiş bir yazılım yok." +"%s' uzantılı dosyaları düzenlemek için ilişkilendirilmiş bir uygulama yok." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Sunucuya giden yol bulunamadı" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:433 msgid "No search results" msgstr "Henüz bir sonuç yok" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Henüz kayıtlı bir site yok" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "Desteklenmeyen SOCKS5 kimlik denetimi kipi" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Kullanıcı adı yazılmadı." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:56 msgid "None" msgstr "Hiçbir şey" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Henüz seçilmemiş" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Ad çözümlenemedi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:569 +#: ../../locales/../src/engine/server.cpp:596 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:890 +#: ../../locales/../src/interface/queue.cpp:946 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "Tüm ögeler aktarım için kuyruğa yeniden eklenememiş olabilir." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Bağlı değil" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2054 msgid "Not connected to any server" -msgstr "Sunucuya bağlı değil" +msgstr "Herhangi bir sunucuya bağlı değil" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:613 msgid "Not connected to any server." -msgstr "Sunucuya bağlı değil." +msgstr "Herhangi bir sunucuya bağlı değil." #: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Bağlı değil." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Başlatılamadı, WSAStartup çağrılmalı" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Dikkat bu özellik yalnız FTP iletişim kuralı kullanılırken desteklenir." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Not: Kaybedilen bir anahtar öğrenilemez." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "" "Not: Bu özellik yalnız düz ve şifrelenmemiş bir FTP bağlantısı ile çalışır." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" -"Not: Soysal bir vekil sunucu kullanıldığında, FTP bağlantılarının pasif kip " -"ile yapılması gerekir." +"Not: Soysal bir vekil sunucu yalnız pasif kip FTP bağlantılarına izin verir." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/engine/http/request.cpp:420 +#, fuzzy +msgid "Null character in line" +msgstr "Dosya Adlarındaki Geçersiz Karakterler" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Ondalık basamak sayısı:" @@ -5300,42 +5641,42 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Yeniden deneme sayısı 0 ile 99 arasında olmak zorundadır." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "Dosyayı &aç" - #: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "Tamam" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" -msgstr "İşletim sistemi sürümü:" +msgstr "İşletim Sistemi Sürümü:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" @@ -5344,39 +5685,52 @@ msgstr "" "İzleyen sayfalarda aktarım ve -seçtiyseniz- başvuru kipleri ayarlanacak." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "Once" msgstr "Bir kez" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Günde bir" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Haftada bir" #: ../../locales/../src/interface/sitemanager_dialog.cpp:541 msgid "Only use plain FTP (insecure)" -msgstr "Yalnız düz FTp kullanılsın (düşük güvenlik)" +msgstr "Yalnız düz FTP kullanılsın (düşük güvenlik)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "&Dosya aç" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "Sistem dosya yöneticisinde açık dosya" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Site Yöneticisi'ni aç" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Site Yöneticisi'ni açar." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Site Yöneticisini açın. Site listesi için sağ tıklayın." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"FileZilla tarafından erişilebilen yerel klasörlerin erişim izinlerinin " +"ayarlanabileceği pencereyi açar." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "Dosyayı açar." @@ -5384,14 +5738,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "FileZilla ayarları penceresini açar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Olarak açılan:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1775 +#: ../../locales/../src/interface/LocalListView.cpp:1787 msgid "Opening failed" msgstr "Açılamadı" @@ -5403,139 +5757,147 @@ msgid "Opens the Site Manager" msgstr "Site Yöneticisi'ni açar" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Klasör listeleme süzgeci penceresini açar. Süzgeçleri açıp kapatmak için sağ " "tıklayın." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "İşletim Sistemi:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "İşlem zaten yürütülüyor" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "İşlem yürütülüyor" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "İşlem desteklenmiyor" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Ayarlar" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Turuncu" + +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Organization:" msgstr "Kurum:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Diğer SFTP Ayarları" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" -msgstr "Diğer sistem hatası" +msgstr "Diğer sistem sorunu" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Other:" msgstr "Diğer:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Bellek bitti" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Genel Açıklama" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" -msgstr "Kaynak daha yen&iyse üstüne yazılsın" +msgstr "Kaynak daha yen&i ise üzerine yazılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" -msgstr "Üzerine Yazılsın" +msgstr "Üzerine yazılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 -msgid "Overwrite file if size differs" -msgstr "Boyut farklı ise üstüne yazılsın" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +msgid "Overwrite file if size differs" +msgstr "Boyut farklı ise üzerine yazılsın" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" -msgstr "Boyut farklı ya da kaynak daha yeni ise üstüne yazılsın" +msgstr "Boyut farklı ya da kaynak daha yeni ise üzerine yazılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" -msgstr "Kaynak daha yeniyse üstüne yazılsın" +msgstr "Kaynak daha yeni ise üzerine yazılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" -msgstr "&Boyut farklı ise üstüne yazılsın" +msgstr "&Boyut farklı ise üzerine yazılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" -msgstr "Boyut farklı ya da kaynak daha yeni ise üstüne ya&zılsın" +msgstr "Boyut farklı ya da kaynak daha yeni ise üzerine ya&zılsın" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:245 #, c-format msgid "Own build type: %s\n" -msgstr "Kendi tipinizi oluşturun: %s\n" +msgstr "Kendi türünüzü oluşturun: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Sahip izinleri" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:160 msgid "Owner/Group" msgstr "Sahip/Grup" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "Sistem, akta&rım ve diğer işlemler sırasında askıya alınmasın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "&Vekil sunucu:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "PORT komutu yöneltici ya da güvenlik duvarı tarafından bozuldu." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Pa&sif (önerilen)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Parameter not a valid URL" -msgstr "Parametre geçerli bir İnternet adresi değil" +msgstr "Parametre geçerli bir adres değil" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:574 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Sürüm bilgisinin %d baytı işleniyor.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Parol&a:" @@ -5543,66 +5905,79 @@ msgid "Passive (recommended)" msgstr "Pasif (önerilen)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Pasif Kip" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Varsayılan aktarım kipi Pasif olarak seçildi." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Parola ya da şifreleme anahtarı ayarlanmamış" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Parola zorunlu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Parolalar" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:155 msgid "Path" msgstr "Yol" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:40 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "%s klasörü ve %s alt klasörü için yol oluşturulamıyor" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 msgid "Path not found:" msgstr "Yol bulunamadı:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Yollar" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Silinmesi bekleniyor" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "İzin" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Erişim reddedildi" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:159 msgid "Permissions" msgstr "İzinler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Platform:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Lütfen FileZilla ile kullanmak istediğiniz yerel klasörleri ekleyin." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5610,6 +5985,14 @@ "Lütfen https://filezilla-project.org/probe.php adresinden sunucunun " "çalıştığını denetleyin ve ayarlarınızı yeniden dikkatlice gözden geçirin." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:116 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Lütfen verilen izinleri denetleyin ve çalışacağınız eksik yerel klasörleri " +"pencereden yeniden ekleyin." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5618,13 +6001,13 @@ "Lütfen tüm güvenlik duvarı ve yönelticilerinizi, dışarı giden bağlantılarda " "FileZilla'nın keyfi kapıları kullanabileceği şekilde ayarlayın." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Lütfen yöneltici ayarlarından 'DMZ kipi' ya da 'Oyun kipi' ayarlarını " "devredışı bırakın." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5640,13 +6023,13 @@ msgid "Please enter a custom time format." msgstr "Lütfen özel bir saat biçimi yazın." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Lütfen 2010-07-18 gibi YYYY-AA-GG şeklinde bir tarih yazın." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5656,16 +6039,16 @@ msgid "Please enter a name for the new filter." msgstr "Yeni süzgeç için bir ad yazın." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Kopyalanmış süzgeç için bir ad yazın." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" -msgstr "\"%s\" süzme seti için yeni bir ad yazın" +msgstr "Şu süzgeç kümesi için yeni adı yazın: \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Bu süzgeç için bir ad yazın." @@ -5686,20 +6069,10 @@ "transfers." msgstr "Aynı anda 0 ile 10 arasında kaç aktarım yapılabileceğini yazın." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Lütfen bu sunucunun parolasını yazın:" -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Lütfen bir yol ve çalıştırılabilir bir dosya adı yazın.\n" -"Örneğin: Windows için c:\\yol\\dosya.exe ya da Unix için /yol/dosya.\n" -"Ayrıca isterseniz programa özel parametreleri de yazabilirsiniz." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5707,57 +6080,76 @@ "Lütfen 10 ile 9999 saniye arasında bir zaman aşımı süresi yazın. 0 zaman " "aşımını devre dışı bırakır." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" -msgstr "Bu süzme seti için eşsiz bir ad yazın" +msgstr "Bu süzgeç kümesine eşsiz bir ad yazın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Bu sunucu için kullanıcı adını yazın:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Geçerli bir kapı aralığı yazın." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" -msgstr "Dış adresinizin alınabileceği bir İnternet adresi yazın" +msgstr "Dış adresinizin alınabileceği bir adres yazın" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "0 %s/s değerinden büyük ya da eşit bir yükleme hızı sınırı yazın." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:625 +msgid "" +"Please enter raw FTP command.\n" +"Using raw ftp commands will clear the directory cache." +msgstr "" +"Lütfen standart bir FTP komutu yazın.\n" +"Standart FTP komutları kullanıldığında klasör ön belleği silinir." + +#: ../../locales/../src/interface/QueueView.cpp:1867 msgid "" -"Please enter raw FTP command.\n" -"Using raw ftp commands will clear the directory cache." +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." msgstr "" -"Lütfen standart FTP komutunu yazın.\n" -"Standart ftp komutları kullanmak klasör önbelleğini siler." +"Lütfen bir programın tam yolunu ve seçeneklerini yazın. Kuyruğun işlenmesi " +"tamamlandığında bu komut yürütülür.\n" +"Örneğin: Windows için c:\\yol\\dosya.exe ya da Unix için /yol/dosya.\n" +"Komut ve seçeneklerde boşluk karakteri varsa uygun şekilde tırnak içine " +"almalısınız." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:944 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1327 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1252 msgid "Please enter the name of the directory which should be created:" msgstr "Lütfen oluşturulacak klasörün adını yazın:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2668 msgid "Please enter the name of the file which should be created:" msgstr "Lütfen oluşturulacak dosyanın adını yazın:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Lütfen bu sunucu için bir kullanıcı adı ve parola yazın:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "Parola ayarlarını değiştirmek için geçerli ana parolanızı yazın." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Lütfen dış IP adresinizi yazın" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5767,6 +6159,11 @@ "bilmemeniz ya da dinamik olması durumunda, dış IP adresi bulucu seçeneğini " "kullanın." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "Bu sunucunun parola şifresinin çözülmesi için ana parolanızı yazın:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5775,7 +6172,7 @@ "Lütfen açıklamaları dikkatle inceleyin, hatalı ayarlar düzgün FTP " "bağlantıları yapılmasını engeller." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5783,19 +6180,19 @@ "Lütfen dışarı giden FileZilla bağlantılarına izin verildiğine ve adres " "bulucudaki adresin doğru yazıldığına emin olun." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Lütfen istenen yerel dosyaların sisteminize kurulmuş olduğuna emin olun." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " "manual port forwarding. Don't run your router in the so called 'DMZ mode' or " "'game mode'." msgstr "" -"Lütfen yönelticinizin son yazılım sürümünü kullandığına emin olun. Ayrıca " +"Lütfen yönelticinizin son yazılım sürümünü kullandığından emin olun. Ayrıca " "yönelticiniz düzgün şekilde ayarlanmış olmalıdır. El ile kapı yönlendirmesi " "yapmalı, yönelticinizde 'DMZ kipi' ya da 'Oyun kipi' seçeneklerini " "kullanmamalısınız." @@ -5812,16 +6209,15 @@ "kullanılıyor sanabilir. Bu şekilde bir güvenlik uyarısı alırsanız görmezden " "gelebilirsiniz." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:752 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." msgstr "" -"Zaman damgalarının korunması özelliğinin yalnızca FTP, FTPS ve FTPES " -"sunucularının MFMT komutunu desteklemesi durumunda geçerli olacağını " -"unutmayın." +"Zamanların korunması özelliğinin yalnızca FTP, FTPS ve FTPES sunucularının " +"MFMT komutunu desteklemesi durumunda kullanılabileceğini unutmayın." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5829,7 +6225,7 @@ "Kısa aralıklarla üstüste bağlanmaya çalışacağınız bazı sunucuların sizi " "yasaklayabileceğini unutmayın." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5838,13 +6234,21 @@ "Ağ ortamınızı değiştirir ya da çalıştığınız sunucular ile aniden sorunlar " "yaşamaya başlarsanız bu yardımcıyı yeniden çalıştırın." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Lütfen bu anahtarı güvenli bir yerde saklayın. Doğru anahtar olmadan " +"yüklediğiniz dosyalara erişilemez." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Lütfen bir işlem seçin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." -msgstr "Lütfen almak istediğiniz bilgileri seçin." +msgstr "Lütfen içe aktarmak istediğiniz bilgileri seçin." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 msgid "Please select the default transfer mode you would like to use." @@ -5862,18 +6266,18 @@ #: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." -msgstr "Lütfen seçili klasörlerin izinlerini belirleyin." +msgstr "Lütfen seçilmiş klasörlerin izinlerini belirleyin." #: ../../locales/../src/interface/chmoddialog.cpp:47 msgid "" "Please select the new attributes for the selected files and directories." -msgstr "Lütfen seçili klasör ve dosyaların izinlerini belirleyin." +msgstr "Lütfen seçilmiş klasör ve dosyaların izinlerini belirleyin." #: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." -msgstr "Lütfen seçili dosyaların izinlerini belirleyin." +msgstr "Lütfen seçilmiş dosyaların izinlerini belirleyin." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5886,39 +6290,39 @@ "ayarlanmış olmalıdır. El ile kapı yönlendirmesi yapmalı, yönelticinizde 'DMZ " "kipi' ya da 'Oyun kipi' seçeneklerini kullanmamalısınız. Kullandığınız " "iletişim kuralı, inceleme ya da iletişim kurallarına özgü 'düzeltme' " -"yazılımları varsa bunları devre dışı bırakmalısınız." +"yazılımları varsa bunları devre dışı bırakmalısınız" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "İleti gü&nlüğünün konumu:" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Postal code:" msgstr "Posta kodu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "İndirmeden önce yer &ayrılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Yer Ayırma" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2113 msgid "Predefined Sites" msgstr "Öntanımlı Siteler" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:751 msgid "Preserving file timestamps" -msgstr "Dosya zaman damgaları korunuyor" +msgstr "Dosya zamanları korunuyor" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Önizleme:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Önizleme" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Birincil bağlantı ve veri bağlantı sertifikaları uyuşmuyor." @@ -5930,15 +6334,15 @@ msgid "Print version information to stdout and exit" msgstr "Sürüm bilgisini konsola gönderip çık" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Klasörler öncelikli (varsayılan)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Priority" msgstr "Öncelik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5946,7 +6350,7 @@ "Gizlilik ilkesi: Sunucuya yalnızca FileZilla sürümünüz, işletim sisteminiz " "ve işlemci mimarinizin bilgileri iletilir." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Kişisel &Anahtarlar:" @@ -5954,86 +6358,86 @@ msgid "Pro&tocol:" msgstr "İle&tişim Kuralı:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Ve&kil sunucu parolası:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" -msgstr "&Kuyruktaki dosyaları aktar" +msgstr "&Kuyruktaki Dosyaları Aktar" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "İşlem dosyası tablosu doldu" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "%s %s içinde işlendi." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "İletişim kuralı desteklenmiyor" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" -msgstr "İletişim kuralı belirtilen soket tipi için desteklenmiyor" +msgstr "İletişim kuralı belirtilen soket türü için desteklenmiyor" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "İletişim Kuralı:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Vekil sunucu ka&pısı:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Vekil sunucu k&ullanıcı adı:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "Vekil sunucu oturumu açılamadı" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Vekil sunucu ile iletişim kurulamadı: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Vekil sunucu adı '[' ile başlıyor ama kapatma parantezi bulunamadı." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "Vekil sunucu yanıtı: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:520 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Vekil sunucu isteği başarısız oldu. Vekil sunucu yanıtı: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "Vekil sunucu isteği başarısız oldu: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" -"Vekil sunucu isteği başarısız oldu: CONNECT yanıtındaki adres tipi bilinmiyor" +"Vekil sunucu isteği başarısız oldu: CONNECT yanıtındaki adres türü bilinmiyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Vekil sunucu ayarlanmış ancak vekil sunucu adı ya da kapı geçersiz" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Genel Anahtar Kimlik Doğrulaması" @@ -6041,68 +6445,77 @@ msgid "Public key algorithm:" msgstr "Genel Anahtar Algoritması:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Genel izinler" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2773 msgid "Queue has been fully processed" -msgstr "Kuyruk tamamen işlendi" +msgstr "Kuyruktaki işlemler tamamlandı" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Aktarım Kuyruğu: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Aktarım Kuyruğu: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" -msgstr "Aktarım Kuyruğu: boş" +msgstr "Aktarım Kuyruğu: Boş" -#: ../../locales/../src/interface/QueueView.cpp:440 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "Kuyruktakiler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Kuyruğa Alınıyor:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "Sistem y&eniden başlatılsın" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Hızlı Arama:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Klasörler karşılaştırılırken hızlı arama açılamaz." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" +msgstr "Sistem Y&eniden Başlatılsın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" -msgstr "U&zak klasör ağacı" +msgstr "U&zak Klasör Ağacı" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "Burayı boşalt ve s&eçili dosyaları yeniden kuyruğa ekle" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "Raw FTP command" msgstr "Standart FTP komutu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "O&kuma" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "&Yenile" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Ye&niden Adlandır" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6110,20 +6523,20 @@ "Yardımcıyı yeniden çalıştırın ve ayarlarınızı dikkatle gözden geçirerek tüm " "yöneltici ve güvenlik duvarlarınızı uygun şekilde yapın." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Ok&uma" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" -msgstr "Salt-okunur" +msgstr "Salt Okunur" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/interface/Mainfrm.cpp:1116 msgid "Really cancel current operation?" msgstr "Yürürlükteki işlem iptal edilsin mi?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1421 +#: ../../locales/../src/interface/search.cpp:1235 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6131,74 +6544,80 @@ msgstr[0] "" "Gerçekten sunucudaki %d klasörü içindekilerle beraber silmek istiyor musunuz?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1418 +#: ../../locales/../src/interface/search.cpp:1232 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Gerçekten sunucudaki %d dosyayı silmek istiyor musunuz?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1426 +#: ../../locales/../src/interface/search.cpp:1240 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Gerçekten sunucudaki %s ve %s silinsin mi?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1070 msgid "Really delete all selected files and/or directories from the server?" msgstr "" -"Gerçekten sunucudaki seçili tüm dosya ve klasörleri silmek istiyor musunuz?" +"Gerçekten sunucuda seçilmiş tüm dosya ve klasörleri silmek istiyor musunuz?" #: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" -msgstr "Gerçekten seçili tüm dosya ve klasörleri silmek istiyor musunuz?" +msgstr "Gerçekten seçilmiş tüm dosya ve klasörleri silmek istiyor musunuz?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Reason" msgstr "Neden" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2766 msgid "Reboot now" msgstr "Yeniden başlat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Alt klasörlere de &uygulansın" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Sunucudan TLS uyarısı alındı: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3075 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Alınan klasör listesi EBCDIC olarak kodlanmış görünüyor." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2057 +#: ../../locales/../src/engine/directorylistingparser.cpp:2074 msgid "Received a line exceeding 10000 characters, aborting." -msgstr "10.000 karakterden uzun bir satır alındı, iptal ediliyor." +msgstr "10.000 karakterden uzun bir satır alındı, vazgeçiliyor." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "Alınan sertifika zinciri doğrulanamadı. Doğrulama durumu: %d." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Alınan veri bozuk" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:553 msgid "Received invalid character in version information" -msgstr "Sürüm bilgisinde geçersiz karakterler alındı." +msgstr "Sürüm bilgisinde geçersiz karakterler alındı" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Sunucudan bilinmeyen %d TLS uyarısı alındı" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:546 msgid "Received version information is too large" msgstr "Alınan sürüm bilgisi çok büyük" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6206,169 +6625,171 @@ "Bir sunucuya bağlı iken yeniden bağlanma bilgisi silinemez.\n" "Devam ederseniz bağlantınız kesilecek." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Yeniden Bağlanma Ayarları" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Son kullanılan sunucuya bağlanır" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Alt klasörlerdeki dosyalar da kuyruğa eklensin." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Alt klasörlerdeki izinler de değiştirilsin." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Alt klasörlerdeki dosya ve klasörler de silinsin." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Kırmızı" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Geçersiz ya da desteklenmeyen adrese yönlendirme: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Geçersiz ya da desteklenmeyen adrese yönlendirme: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Dosya ve klasör listelerini yeniler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" -msgstr "Parolalar hatırlansın" +msgstr "Parolalar hatırlansın mı?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Uzaktaki" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Uzaktaki sertifikaya güvenilmiyor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Remote file" msgstr "Uzak Dosya" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/search.cpp:713 msgid "Remote file search" msgstr "Uzak dosya arama" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" -msgstr "Uzaktaki süzgeçler:" +msgstr "Uzak Süzgeçler:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Uzaktaki yol" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the current site's servertype (%s)." msgstr "" -"Uzaktaki yola gidilemedi. Yolun doğru olduğundan ve geçerli sitenin sunucu " -"tipi (%s) tarafından desteklendiğine emin olun." +"Uzaktaki yola gidilemedi. Yolun doğru olduğuna ve geçerli sitenin sunucu " +"türü (%s) tarafından desteklendiğine emin olun." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1174 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " "supported by the servertype (%s) selected on the parent site." msgstr "" -"Uzaktaki yola gidilemedi. Bunun geçerli bir yol olduğundan ve kaynak " -"tarafında seçilmiş olan sunucu tipi (%s) tarafından desteklendiğine emin " -"olun." +"Uzaktaki yola gidilemedi. Bunun geçerli bir yol olduğuna ve kaynak tarafında " +"seçilmiş olan sunucu türü (%s) tarafından desteklendiğine emin olun." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1177 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "Uzaktaki yola gidilemedi. Bunun geçerli bir yol olduğundan emin olun." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Uzaktaki yola gidilemedi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Uzaktaki yolun işlenişi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Uzaktaki yol:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" -msgstr "Uzak site:" +msgstr "Uzak Site:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "Tümünü &sil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" -msgstr "&Seçilileri sil" +msgstr "&Seçilmişleri sil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:304 msgid "Rename file" -msgstr "Dosyayı yeniden adlandır" +msgstr "Dosyanın adı değiştirilsin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" -msgstr "Seçili klasörü yeniden adlandır" +msgstr "Seçilmiş klasörü yeniden adlandır" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" -msgstr "Seçili dosya ve klasörleri yeniden adlandır" +msgstr "Seçilmiş dosya ve klasörleri yeniden adlandır" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:595 #, c-format msgid "Renaming '%s' to '%s'" -msgstr "'%s' adı '%s' olarak değiştiriliyor" +msgstr "'%s' adı şu şekilde değiştiriliyor: '%s'" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Parola onayı:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Hataları ve isteklerinizi iletebilirsiniz" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "İstek gerçekleştirilemedi - istemcide identd çalışmıyor (ya da sunucu " "tarafından erişilemiyor)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "İstek gerçekleştirilemedi - istemcideki identd kullanıcı kodu dizgesini " "onaylayamadı" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "İstek gerçekleştirilemedi ya da reddedildi" @@ -6380,180 +6801,201 @@ msgid "Require implicit FTP over TLS" msgstr "TLS üzerinden örtülü FTP istensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" -msgstr "Bur&ayı boşaltın ve tümünü yeniden kuyruğa alın" +msgstr "Bur&ayı boşalt ve tümünü yeniden kuyruğa al" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Çözümlenen protokol bilinmiyor" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1081 #, c-format msgid "Resolving address of %s" msgstr "%s için adres çözümleniyor" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Kaynak geçici olarak kullanım dışında" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:357 msgid "Response:" msgstr "Yanıt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Sonuçlar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Dosya aktarımı sürdürülsün" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." msgstr "" "Sunucu ile istemcinin satır sonu karakteri farklı ise sorunlara yol açabilir." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:447 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "\"%s\" klasör listesi alınıyor..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:444 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Klasör listesi alınıyor..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "%s üzerinden dış IP adresi okunuyor" #: ../../locales/../src/interface/resources/xrc/menus.xrc:34 msgid "S&how files currently being edited..." -msgstr "Şu anda düzenlenen dosyaları &görüntüle..." +msgstr "Şu An Düzenlenen Dosyaları &Görüntüle..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "Başlangıçta Sit&e Yöneticisi görüntülensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Sistemi &kapat" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" +msgstr "Sistem &Kapatılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "&Durdur" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "Sistemi as&kıya al" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" +msgstr "Sistem As&kıya Alınsın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" -msgstr "Eş&zamanlı tarama" +msgstr "Eş&zamanlı Tarama" #: ../../locales/../src/interface/settings/settingsdialog.cpp:97 msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:606 +msgid "SFTP support" +msgstr "SFTP desteği" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 vekil sunucu şuraya bağlanacak: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 255 karakterden uzun kullanıcı adı ya da parolaları desteklemiyor." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Parolalar &bir ana parola ile korunarak kaydedilsin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Parolaları ka&ydet" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" -msgstr "Ayarlar kaydedilsin" +msgstr "Ayarlar kaydedilsin mi?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1006 msgid "Saving of password has been disabled by your system administrator." msgstr "Parola kaydı yönetici tarafından devre dışı bırakılmış." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009 msgid "Saving of passwords has been disabled by you." msgstr "Parola kaydını devre dışı bırakmışsınız." -#: ../../locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "Aktarım Kuyruğuna eklenecek dosyalar taranıyor" - -#: ../../locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" -msgstr "Yüklenecek dosyalar taranıyor" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Ölçek çarpanı:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Arama ö&lçütleri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "Arama &klasörü:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Alt klasörlerdeki dosyaları arar." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "Sunucuda dosya arayın" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Arama türü:" + +#: ../../locales/../src/interface/statusbar.cpp:514 msgid "Security information" msgstr "Güvenlik bilgileri" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "Ayrıca https://wiki.filezilla-project.org/Network_Configuration adresine " "bakın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" -msgstr "Sunucu &seçin" +msgstr "Sunucuyu &Seçin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Sayfa &seçin:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Tema Seçimi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Aktarılan hedef dosya zaten var ise yapılmasını istediğiniz işlemi seçin." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Varsayılan düzenleyiciyi seçin" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6561,7 +7003,7 @@ "Varsayılan 'Hedef Dosya Var' işlemini seçin. Bu seçim yalnız bu oturum için " "geçerli olur." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6569,182 +7011,186 @@ "Kuyruktaki seçilmiş dosyalar için varsayılan 'Hedef Dosya Var' işlemini " "seçin." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:78 msgid "Select file containing private key" msgstr "Kişisel anahtarın bulunduğu dosyayı seçin" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" -msgstr "Verilecek veriler için bir dosya seçin" +msgstr "Verilerin dışa aktarılacağı dosyayı seçin" + +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Süzgeçlerin dışa aktarılacağı dosyayı seçin" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1431 msgid "Select file for exported queue" -msgstr "Aktarılmış kuyruk için bir dosya seçin" +msgstr "Aktarım kuyruğunun dışa aktarılacağı dosyayı seçin" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" -msgstr "Ayarların verileceği dosyayı seçin" +msgstr "Ayarların dışa aktarılacağı dosyayı seçin" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2457 msgid "Select file for exported sites" -msgstr "Verilecek siteler için bir dosya seçin" +msgstr "Sitelerin dışa aktarılacağı dosyayı seçin" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" -msgstr "Ayarların alınacağı dosyayı seçin" +msgstr "Ayarların içe aktarılacağı dosyayı seçin" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Yüklenecek dosyayı seçin" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Dönüştürülmüş anahtar dosyasının adını seçin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Bu dosyaların nasıl açılacağını seçin." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:892 msgid "Select target download directory" msgstr "Hedef indirme klasörünü seçin" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Hedef dosya adını seçin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" -msgstr "Verilecek bilgileri seçin:" +msgstr "Dışa aktarılacak verileri seçin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Lütfen silmek istediğiniz özel verilerinizi seçin." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:851 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "%d klasörün içeriği aktarılmak üzere seçilmiş." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "%d klasör seçilmiş." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:849 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "%d dosya aktarım için seçilmiş." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" -msgstr[0] "Seçilmiş %d dosya toplam %s boyutunda." +msgstr[0] "Seçilmiş %d dosya toplam %s boyutunda" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Seçilmiş dosya %d. Toplam boyut: En az %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:855 #, c-format msgid "Selected %s and %s for transfer." msgstr "Aktarım için %s ve %s seçilmiş." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Seçilmiş %s ve %s. Toplam boyut: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Seçilmiş %s ve %s. Toplam boyut: En az %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Seçilmiş düzenleyici bulunamadı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Seçilmiş dosya zaten düzenleniyor" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119 msgid "Selected file is already loaded" msgstr "Seçilmiş dosya zaten yüklenmiş" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Seçilmiş dosya zaten açık" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Seçilmiş dosya şu anda düzenleniyor" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Seçilen süzgeç yalnız yerel dosyalar için çalışır." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." msgstr "" -"Seçtiğiniz küresel yer imi ile geçerli sunucu farklı sunucu tiplerini " +"Seçtiğiniz genel yer imi ile geçerli sunucu farklı sunucu türlerini " "kullanıyor.\n" "Bu sunucu için siteye özgü yer imlerini kullanın." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "" "Seçilen kapı genellikle başka bir iletişim kuralı tarafından kullanılır." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" -msgstr "FTP canlı-&tut komutları gönderilsin" +msgstr "FTP canlı &tutma komutları gönderilsin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "Sunucuya özel komut gönderin yoksa bir şey yapılamıyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" -msgstr "Canlı-tut komutu gönderiliyor" +msgstr "Canlı tutma komutu gönderiliyor" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:259 msgid "Serial number:" msgstr "Seri No:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" -msgstr "Sunucu &Tipi:" +msgstr "Sunucu &Türü:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Sunucu TLS bağlantısını düzgün bir şekilde kapatmadı" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Sunucu ASCII dışındaki karakterleri desteklemiyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:269 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Sunucu %d GB boyutundan büyük dosyaları sürdüremiyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:266 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6753,15 +7199,19 @@ "Sunucu %d GB boyutundan büyük dosyaları sürdüremiyor. Dosya boyutları " "eşleştiğinde aktarım bitirilsin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:528 msgid "Server does not support resume of files > 2GB." msgstr "Sunucu 2GB boyutundan büyük dosyaları sürdüremiyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:524 msgid "Server does not support resume of files > 4GB." msgstr "Sunucu 4GB boyutundan büyük dosyaları sürdüremiyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Sunucu Anahtarı" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:277 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6770,33 +7220,37 @@ "Sunucu %d GB boyutundan büyük dosyaların sürdüremiyor olabilir. Dosya " "boyutları eşleştiğinde aktarım bitirilsin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" "Sunucu bir hesaba gerek duyuyor olabilir. Site Yöneticisi'nde bir hesap " -"oluşturmayı deneyin." +"oluşturmayı deneyin" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:230 +msgid "Server not sending proper line endings" +msgstr "Sunucu uygun satır sonu karakterleri göndermiyor" + +#: ../../locales/../src/engine/ControlSocket.cpp:342 msgid "Server returned empty path." msgstr "Sunucu boş bir yol döndürdü." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:224 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "" -"Sunucu ek giriş soruları soruyor. Etkileşimli oturum açma tipini " +"Sunucu ek giriş soruları soruyor. Etkileşimli oturum açma türünü " "kullanmalısınız." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Sunucu yöneltilemeyen bir adresle pasif bir yanıt verdi. Pasif kip " "kullanılamadı." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6804,36 +7258,47 @@ "Sunucu yöneltilemeyen bir adresle pasif bir yanıt verdi. Bunun yerine sunucu " "adresi kullanılacak." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:489 +msgid "Server sent too much data." +msgstr "Sunucu çok fazla veri gönderdi." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Sunucu beklenmeyen bir yanıt verdi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Sunucu, TLS kuralları ile çelişen sıralanamamış bir sertifika zinciri " +"gönderdi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Sunucudan istemcinin MAC adresine:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Sunucudan istemciye şifre:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" -msgstr "Sunucu &Tipi:" +msgstr "Sunucu &Türü:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Server/Local file" -msgstr "Sunucu/Yerel dosya" +msgstr "Sunucu/Yerel Dosya" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Sunucu:" @@ -6841,49 +7306,50 @@ msgid "Session details" msgstr "Oturum Ayrıntıları" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "Önceliği &Belirle" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:589 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "'%s' izinleri '%s' olarak güncelleniyor" +msgid "Setting permissions of '%s' to '%s'" +msgstr "'%s' izinleri şu şekilde değiştiriliyor: '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "Soket olmadan SetSocketBufferSize çağrıldı" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Ayarlar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" -msgstr "Ayarlar klasörü:" +msgstr "Ayarlar Klasörü:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "Bildirim Bal&onu Görüntülensin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Ham klasö&r listesi görüntülensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." -msgstr "&Hoşgeldiniz penceresini görüntüle..." +msgstr "&Karşılama Penceresini Görüntüle..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2328 msgid "Show both directory trees and continue comparing?" -msgstr "Her iki klasör ağacı görüntülenerek karşılaştırmaya devam edilsin" +msgstr "Her iki klasör ağacı görüntülenerek karşılaştırmaya devam edilsin mi?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Ayrıntıları görüntüle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" -msgstr "Uyarlanmış tarih ve saat biçimleri ile ilgili ayrıntıları görüntüle" +msgstr "İsteğe göre uyarlamada kullanılabilecek tarih ve saat biçimleri" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "Kullanılabilecek TLS şifrelerini görüntüler" @@ -6891,7 +7357,7 @@ msgid "Shows this help dialog" msgstr "Bu yardım penceresini görüntüler" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2762 msgid "Shutdown now" msgstr "Şimdi kapat" @@ -6899,7 +7365,11 @@ msgid "Signature algorithm:" msgstr "İmza Algoritması:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Hesap Aç" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "&Site Yöneticisi kayıtları" @@ -6907,56 +7377,61 @@ msgid "Site Manager" msgstr "Site Yöneticisi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 msgid "Site Manager - Cannot remember password" msgstr "Site Yöneticisi - Parolalar hatırlanmıyor" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Site Yöneticisi - Oluşturulmuş anahtar" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:995 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1046 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1059 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1092 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1142 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1179 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 msgid "Site Manager - Invalid data" msgstr "Site Yöneticisi - Geçersiz veri" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:300 msgid "Site Manager already open" msgstr "Site Yöneticisi zaten açık" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Site bulunamadı." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Site yolu 0 ya da 1 ile başlamalı." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Site yolu bozuk." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Siteye özel yer imleri" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6966,11 +7441,11 @@ "kullanılabilir.\n" "Geçerli bağlantıyı Site Yöneticisine eklemek istiyor musunuz?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Size" msgstr "Boyut" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Boyut Biçimi" @@ -6978,55 +7453,60 @@ msgid "Size unknown" msgstr "Boyut bilinmiyor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" -msgstr "Dosyayı atla" +msgstr "Dosya atlansın" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1151 +#: ../../locales/../src/engine/ControlSocket.cpp:1168 +#: ../../locales/../src/engine/ControlSocket.cpp:1194 +#: ../../locales/../src/engine/ControlSocket.cpp:1272 #, c-format msgid "Skipping download of %s" msgstr "%s indirilmesi atlanıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Var olmayan anahtar dosyası atlanıyor: \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1154 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 +#: ../../locales/../src/engine/ControlSocket.cpp:1197 +#: ../../locales/../src/engine/ControlSocket.cpp:1275 #, c-format msgid "Skipping upload of %s" msgstr "%s yüklemesi atlanıyor" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Soket adresi adres aralığının dışında" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Soket zaten bağlı" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Soket kapatılmış" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Soket bağlı değil" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" -msgstr "Soket tipi bu adres ailesinde desteklenmiyor" +msgstr "Soket türü bu adres ailesinde desteklenmiyor" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Some files are still being edited or need to be uploaded." msgstr "Bazı dosyalar düzenlenmiş ve yüklenmeleri gerekli." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7034,31 +7514,31 @@ "Yönelticilerin arkasında çalışan, bazı hatalı ayarlanmış sunucular kendi " "yerel IP adresleri ile yanıt verebilir." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" -msgstr "Klasörleri sırala" +msgstr "Klasörler sıralamada arada görüntülensin" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:470 msgid "Sort order cannot be changed if comparing directories." -msgstr "Sıralama düzeni klasörler karşılaştırılırken değiştirilemez." +msgstr "Klasörler karşılaştırılırken sıralama düzeni değiştirilemez." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Sıralama" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Sırala&ma kipi:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Bırakma işleminin kaynak ve yolu benzer" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Kaynak ve hedef dosya aynı olmayabilir" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:150 msgid "Source and target of the drop operation are identical" msgstr "Bırakma işleminin kaynak ve hedefi aynı" @@ -7066,37 +7546,37 @@ msgid "Source file:" msgstr "Kaynak dosya:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Hız sınırları" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Hız Sınırları" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:591 msgid "Speed limits are disabled, click to change." msgstr "Hız sınırları devre dışı, değiştirmek için tıklayın." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:594 msgid "Speed limits are enabled, click to change." msgstr "Hız sınırları etkin, değiştirmek için tıklayın." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" -msgstr "Kararlı ve beta sürümler" +msgstr "Kararlı ve deneme sürümleri" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Yalnız kararlı sürümler" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" -msgstr "Kararlı, beta ve gecelik sürümler" +msgstr "Kararlı, deneme ve gecelik sürümler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Aktarım &hemen başlatılsın" @@ -7104,57 +7584,67 @@ msgid "Start with opened Site Manager" msgstr "Başlangıçta Site Yöneticisi açılsın" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:239 #, c-format msgid "Started update check on %s\n" msgstr "Güncelleme denetimi %s zamanında başlatıldı\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "%s indirilmesine başlanıyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "%s yüklemesine başlanıyor" #: ../../locales/../src/interface/cmdline.cpp:9 msgid "Starts the local site in the given path" -msgstr "Yerel site verilmiş yol ile başlatılır" +msgstr "Yerel site belirtilen yol ile başlatılır" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "State or province:" msgstr "Şehir:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Status" msgstr "Durum" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:298 +#: ../../locales/../src/interface/StatusView.cpp:381 msgid "Status:" msgstr "Durum:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" -msgstr "Durdur ve hepsini &sil" +msgstr "Durdur ve Tümünü &Sil" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" -msgstr "Alt klasör işlemini durdur" +msgstr "Alt Klasör İşlemini Durdur" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/engine/server.cpp:28 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Merkezi Olmayan Bulut Depolama" + +#: ../../locales/../src/interface/FileZilla.cpp:613 +msgid "Storj support" +msgstr "Storj desteği" + +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Street:" msgstr "Sokak:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" -msgstr "Sertifika Konusu" +msgstr "Sertifika Nesnesi" #: ../../locales/../src/interface/queueview_successful.cpp:12 msgid "Successful transfers" @@ -7164,11 +7654,11 @@ msgid "Summary of test results:" msgstr "Sınama sonuçları özeti:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2770 msgid "Suspend now" msgstr "Şimdi askya al" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7176,75 +7666,79 @@ "Dosya sembolik bağlantıları bu seçimden etkilenmez. Bu şekilde tüm sembolik " "bağlantılar herzaman silinir." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Eşzamanlı tarama" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Eşzamanlı tarama devre dışı." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Klasörler eşitleniyor." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" -msgstr "Sözdizimi hatası" +msgstr "Sözdizimi sorunu" #: ../../locales/../src/interface/cmdline.cpp:76 #: ../../locales/../src/interface/cmdline.cpp:82 #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2443 +#: ../../locales/../src/interface/Mainfrm.cpp:2488 msgid "Syntax error in command line" -msgstr "Komut satırında sözdizimi hatası" +msgstr "Komut satırında sözdizimi sorunu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Sistem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" -msgstr "Sistem ayrıntıları" +msgstr "Sistem Ayrıntıları" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Sistemde açılabilecek dosya sayısı sınırı aşıldı" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Sistemin ağ altsistemi bozuldu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" -msgstr "A&raç çubuğu" +msgstr "A&raç Çubuğu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:131 msgid "TLS connection established, sending HTTP request" msgstr "TLS bağlantısı kuruldu, HTTP isteği gönderiliyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." -msgstr "TSL bağlantısı kuruldu, hoş geldin iletisi bekleniyor..." +msgstr "TSL bağlantısı kuruldu, karşılama iletisi bekleniyor..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "TLS bağlantısı kuruldu." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL süresi doldu" @@ -7252,35 +7746,43 @@ msgid "Target file already exists" msgstr "Hedef dosya zaten var" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Hedef Dosya:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2686 msgid "Target filename already exists!" msgstr "Hedef dosya zaten var!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1639 msgid "Target filename already exists, really continue?" msgstr "Hedef dosya adı zaten var, devam edilsin mi?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Ad geçici olarak çözümlenemedi" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Deneme başarılı oldu" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Sınama sonuçları" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:281 msgid "Testing resume capabilities of server" -msgstr "Sunucunun aktarımı sürdürebilme yeteneği sınanıyor." +msgstr "Sunucunun aktarımı sürdürebilme yeteneği sınanıyor" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Şu a&nda aşağıdaki dosyalar düzenleniyor:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:782 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Dosyalar onarılmadan Site Yöneticisi kullanılamaz." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:299 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7290,37 +7792,45 @@ "Devam etmek istiyor musunuz? Devam ederseniz Site Yöneticisi'nde yapılan " "değişiklikler kaydedilemez." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." msgstr "" "Site Yöneticisi başka bir FileZilla 3 oturumunda açık.\n" -"Lütfen onu kapatın yoksa veri silinemez." +"Lütfen onu kapatın yoksa veriler silinemez." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Yazdığınız adres: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" -msgstr "ai_family üyesi desteklenmiyor" +msgstr "Belirtilen ai_family üyesi desteklenmiyor" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" -msgstr "ai_socktype üyesi desteklenmiyor" +msgstr "Belirtilen ai_socktype üyesi desteklenmiyor" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Yer imi eklenemedi." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Yer imleri silinemedi." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Sertifika için yanıt içinde bir OCSP durumunun bulunması gerekiyor ancak " +"OCSP durumu eksik." + +#: ../../locales/../src/interface/statusbar.cpp:475 msgid "The connection is encrypted. Click icon for details." msgstr "Bu bağlantı şifrelenmiş. Ayrıntılar için simgeye tıklayın." @@ -7342,34 +7852,39 @@ "İsteğe göre uyarlanmış saat biçimi geçersiz ya da desteklenmeyen biçim " "karakterleri içeriyor." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Veri bağlantısı kurulamadı: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Metin dosyaları için varsayılan düzenleyici bulunamadı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Metin dosyaları için varsayılan düzenleyici: '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Yazdığınız süzgeç adı zaten var, lütfen başka bir ad seçin." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Parola ile onayı aynı değil." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Dosya uzantısı '%s' zaten listede var" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:293 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 #, c-format msgid "" "The file %s already exists.\n" @@ -7378,8 +7893,8 @@ "%s adında bir dosya zaten var.\n" "Lütfen yeni bir ad yazın:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1779 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7388,9 +7903,9 @@ msgstr "" "'%s' dosyası açılamıyor:\n" "İlişkilendirilmiş (%s) programı bulunamadı.\n" -"Dosya tipi ilişkilendirmelerinizi denetleyin." +"Dosya türü ilişkilendirmelerinizi denetleyin." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7399,38 +7914,38 @@ "'%s' dosyasında bir SSH1 anahtarı bulunuyor. SSH1 iletişim kuralı " "kullanımdan kaldırıldı. FileZilla yalnız SSH2 anahtarılarını destekler." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "'%s' dosyası yüklenemedi ya da kişisel bir anahtar içermiyor." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:37 #, c-format msgid "The file '%s' could not be loaded." msgstr "'%s' dosyası yüklenemedi." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1775 #, c-format msgid "" "The file '%s' could not be opened:\n" "No program has been associated on your system with this file type." msgstr "" "'%s' dosyası açılamıyor:\n" -"Sisteminizde bu dosya tipi ile ilişkilendirilmiş bir program yok." +"Sisteminizde bu dosya türü ile ilişkilendirilmiş bir program yok." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1787 #, c-format msgid "" "The file '%s' could not be opened:\n" "The associated command failed" msgstr "" "'%s' dosyası açılamıyor:\n" -"İlişkilendirilmiş komut yürütülemedi." +"İlişkilendirilmiş komut yürütülemedi" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:789 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7442,7 +7957,7 @@ "olabilir.\n" "Devam etmek ister misiniz?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7455,7 +7970,7 @@ msgid "The file selected as default editor does not exist." msgstr "Varsayılan olarak seçilmiş düzenleyici bulunamadı." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7466,14 +7981,14 @@ "Seçtiğiniz dosyadaki Site Yöneticisi verisi önceki bir FileZilla sürümüne " "ait.\n" "Veri saklama biçimindeki farklılıklar nedeniyle yalnız sunucu, kapı, " -"kullanıcı adı ve parola bilgileri alınacak.\n" -"Almaya devam etmek istiyor musunuz?" +"kullanıcı adı ve parola bilgileri içe aktarılacak.\n" +"İçe aktarma işlemine devam etmek istiyor musunuz?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Dosya adı sütunu gizlenemez ya da kaldırılamaz." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Dosya adı sütunu gizlenemez." @@ -7487,19 +8002,19 @@ msgid "The following characters will be replaced: %s" msgstr "Değiştirilecek karakterler: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Şu anda aşağıdaki dosyalar düzenleniyor:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" -msgstr "Ücretsiz açık kaynak kodlu FTP çözümü" +msgstr "Açık kaynaklı FTP çözümü" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Oluşturulan şifreleme anahtarı:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." -msgstr "Küresel yer imleri kaydedilemedi." +msgstr "Genel yer imleri kaydedilemedi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7512,17 +8027,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Sınır 1 ile 2.000 MiB arasında olmalı" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "'%s' yerel klasörü oluşturulamadı." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "'%s' yerel klasörü bulunamadı." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7538,24 +8053,29 @@ msgstr "" "En küçük kapı değeri, en büyük kapı değerinden küçük ya da eşit olmalı." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Ana parola en az 8 karakter uzunluğunda olmalıdır." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Yeni sürüm indirilemedi, lütfen daha sonra yeniden deneyin." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Yeni sürüm İndirmeler klasörünüze kaydedilecek." -#: ../../locales/../src/interface/QueueView.cpp:1823 +#: ../../locales/../src/interface/QueueView.cpp:1560 msgid "The queue will not be saved." msgstr "Kuyruk kaydedilemedi." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "'%s' uzak klasörü bulunamadı." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7564,28 +8084,28 @@ "'%s' uzak klasörü (%s) eşleştirme kökünün altında değil.\n" "Eşzamanlı tarama devre dışı bırakılıp uzak klasör değiştirilsin mi?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." -msgstr "Seçilen kategoriler alındı." +msgstr "Seçilen veriler içe aktarıldı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" -msgstr "Seçilen dosyada şu kategoriler için alınabilecek veriler var:" +msgstr "Seçilen dosyada içe aktarılabilecek şu veriler var:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Seçilen dosya zaten düzenleniyor:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Seçilen dosya başka bir program tarafından açılmış durumda, lütfen önce onu " "kapatın." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7595,27 +8115,27 @@ "Bu işlem tehlikeli olabilir ve sisteminize zarar verebilir.\n" "Devam etmek istediğinize gerçekten emin misiniz?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Sunucu eklenemedi." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Sunucu anlaşılamayan bir yanıt verdi." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" -msgstr "Sunucu dosya adları için şu karakter seti kullanılsın:" +msgstr "Sunucu dosya adları kullanılacak karakter kümesi:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:21 msgid "" "The server's certificate is unknown. Please carefully examine the " "certificate to make sure the server can be trusted." msgstr "" -"Sunucu sertifikası tanınmıyor. Lütfen sunucunun güvenilir olup olmadığını " -"anlamak için sertifikayı dikkatle inceleyin." +"Sunucunun sertifikası bilinmiyor. Lütfen sertifikayı dikkatle inceleyerek " +"sunucunun güvenilir olup olmadığına karar verin." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7625,7 +8145,7 @@ "değiştirdi ya da siz kendisini bağlanmak istediğiniz sunucu gibi gösteren " "başka bir bilgisayara bağlanmaya çalışıyorsunuz." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7633,31 +8153,35 @@ "Sunucunun anahtarı bilinmiyor. Bu sunucunun, olmasını beklediğiniz " "bilgisayar olduğunun bir garantisi yok." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Sunucu adı sertifikadaki sunucu adı ile eşleşmiyor" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" -msgstr "ai_socktype için servname parametresi desteklenmiyor" +msgstr "Servname parametresi ai_socktype için desteklenmiyor" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." msgstr "" -"Ayarlar alındı. Bütün ayarların etkin olabilmesi için FileZilla yeniden " -"başlatılmalı." +"Ayarlar içe aktarıldı. Bütün ayarların etkin olabilmesi için FileZilla " +"yeniden başlatılmalı." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Belirtilen adres ailesi desteklenmiyor" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Belirtilen ağ adı artık kullanılmıyor" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2765 msgid "The system will soon reboot unless you click Cancel." msgstr "İptal düğmesine tıklamazsanız sistem yeniden başlatılacak." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2761 msgid "The system will soon shut down unless you click Cancel." msgstr "İptal düğmesine tıklamazsanız sistem birazdan kapanacak." @@ -7667,13 +8191,13 @@ "Please choose an action." msgstr "" "Hedef dosya zaten var.\n" -"Lütfen bir işlem seçin:" +"Lütfen bir işlem seçin." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Sınama başarısız oldu. Ayarları kaydetmek istediğinize emin misiniz?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:82 #, c-format msgid "The valid backup file %s could not be restored" msgstr "%s geçerli yedek dosyası geri yüklenemedi" @@ -7682,15 +8206,15 @@ msgid "Themes" msgstr "Temalar" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." -msgstr "Bu süzme seti silinemiyor." +msgstr "Bu süzgeç kümesi silinemiyor." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." -msgstr "Bu süzme seti yeniden adlandırılamaz." +msgstr "Bu süzgeç kümesi yeniden adlandırılamaz." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7713,44 +8237,42 @@ "Bu yardımcı, sisteminizdeki tüm güvenlik duvarı ve yönelticilerinizi uygun " "şekilde ayarlayıp sınamanıza yardım edecek." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1163 msgid "Time" msgstr "Saat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Saat Biçimi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Zaman &aşımı (saniye):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Timeout" msgstr "Zaman Aşımı" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Sunucunun saat dilimi farkı %d saniye." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Title:" msgstr "Başlık:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2309 +msgid "To compare directories quick search must be closed." +msgstr "Klasörleri karşılaştırmak için hızlı karşılaştırma kapatılmalı." + +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Klasörleri karşılaştırmak için her iki dosya listesi de hizalanmış olmalı." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2327 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Bunu yapabilmek için klasör ağaçlarının ikisi de görünmeli ya da gizlenmeli." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7758,7 +8280,7 @@ "FileZilla açık anahtar yetkilendirmesini kullanabilmek için kişisel " "anahtarınızı bilmek zorundadır." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7775,7 +8297,7 @@ "Yeşil: Dosya öbür taraftaki işaretlenmemiş dosyadan yeni\n" "Kırmızı: Dosya boyutları farklı" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7785,82 +8307,77 @@ "Etkinleştirildiğinde yerel klasör ağacında yapılan gezinmeler sunucu klasör " "ağacında da aynen yapılır." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Kuyruktaki aktarımları başlatır ya da durdurur" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Yerel klasör ağacını görüntüler ya da gizler" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "İleti günlüğünü görüntüler ya da gizler" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Uzak klasör ağacını görüntüler ya da gizler" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Aktarım kuyruğunu görüntüler ya da gizler" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:243 msgid "Too long header line" msgstr "Üst bilgi satırı çok uzun" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Çok fazla yönlendirme" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:367 msgid "Trace:" msgstr "Yol İzlensin:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Aktarılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Aktarım &yönü" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" -msgstr "Aktarım &tipi" +msgstr "Aktarım &Türü" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Aktarım Kipi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Aktarım Kuyruğu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Aktarım Ayarları" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Aktarım bağlantısı kesildi: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Aktarılan veri bozuldu." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:347 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Aktarılıyor" @@ -7868,27 +8385,27 @@ msgid "Transfers" msgstr "Aktarım" -#: ../../locales/../src/interface/QueueView.cpp:2929 +#: ../../locales/../src/interface/QueueView.cpp:2644 msgid "Transfers finished" msgstr "Aktarımlar tamamlandı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Uzantısı &olmayan dosyalar ASCII olarak kabul edilsin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" -msgstr "Şu dosya türleri ASCII &olarak algılansın:" +msgstr "ASCII &olarak algılanacak dosya türleri:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:385 msgid "Trust changed Hostkey:" msgstr "Değiştirilmiş sunucu anahtarına güvenilsin:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:382 msgid "Trust new Hostkey:" msgstr "Yeni sunucu anahtarına güvenilsin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Yeni anahtara güvenilerek bağlantı kurulsun mu?" @@ -7896,71 +8413,77 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Sertifikaya güvenilip bağlanmaya devam edilsin mi?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" -msgstr "Bu sunucuya güvenilip bağlantı kurulsun mu?" +msgstr "Bu sunucuya güvenilip bağlanmaya devam edilsin mi?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Yeniden dene" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" -msgstr "Tip" +msgstr "Tür" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" -msgstr "FTP Vekil Sunucu Tipi:" +msgstr "FTP Vekil Sunucu Türü:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" -msgstr "Genel Vekil Sunucu Tipi:" +msgstr "Genel Vekil Sunucu Türü:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "Yü&kle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Yü&kleme sınırı:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "Var&sa dosya ilişkilendirmeleri kullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" -msgstr "Geçerli dil için &sistem varsayılanları kullanılsın" +msgstr "Geçerli Dilin &Sistem Varsayılanları Kullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "KULLANICI@&SUNUCU" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "Atanmamış hata kodu %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Unit:" msgstr "Birim:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Bilinmeyen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" -"Bilinmeyen FTP vekil sunucu tipi yüzünden oturum açma işlemi sıralaması " +"FTP vekil sunucu türü bilinmediğinden oturum açma işlemi sıralaması " "yürütülemedi." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Bilinmeyen SOCKS iletişim kuralı sürümü: %d" @@ -7969,11 +8492,22 @@ msgid "Unknown certificate" msgstr "Bilinmeyen sertifika" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Bilinmeyen sorun %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Bilinmeyen sorun %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Bilinmeyen sunucu anahtarı" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7981,37 +8515,41 @@ msgstr "" "SOCKS Kullanıcı Adı/Parola iletişiminde bilinmeyen iletişim kuralı sürümü: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:283 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Bilinmeyen kök nesnesine rastlandı. Bu dosya FileZilla tarafından " "üretilmemiş gibi görünüyor." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:355 +msgid "Unknown transfer encoding" +msgstr "Aktarım kodlaması bilinmiyor" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" "Bu sorunlar çözülmeden aktif kip çalışmaz, yalnız pasif kip kullanılabilir." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "" "Bu sorun çözülmeden aktif kip çalışmaz, yalnız pasif kip kullanılabilir." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" -msgstr "Sertifika tipi desteklenmiyor" +msgstr "Sertifika türü desteklenmiyor" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Yönlendirme desteklenmiyor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Yük&le ve kapat" @@ -8020,79 +8558,88 @@ msgid "Updates" msgstr "Güncelleme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Yükleme" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Yüklenemedi" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:604 #, c-format msgid "Upload limit: %s/s" msgstr "Yükleme sınırı: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:607 msgid "Upload limit: none" msgstr "Yükleme sınırı: yok" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:918 +msgid "Upload search results" +msgstr "Yükleme arama sonuçları" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" -msgstr "Seçili klasörü yükle" +msgstr "Seçilmiş klasörü yükle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" -msgstr "Seçili dosya ve klasörleri yükle" +msgstr "Seçilmiş dosya ve klasörleri yükle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Bu dosya sunucuya geri yüklensin mi?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Bu dosya sunucuya yüklensin mi?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Yükleniyor" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Yükleniyor ve silinmesi bekleniyor" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Yüklenip kapatılıyor" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" -msgstr "Özel &karakter seti kullanılsın" +msgstr "Özel &karakter kümesi kullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Şu özel &düzenleyici kullanılsın:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Metin dosyaları için varsayılan &düzenleyici kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Eş&zamanlı tarama kullanılsın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Kurallı İfadeler Kullanılsın" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" -"Sunucu destekliyorsa UTF-8, desteklemiyorsa yerel karakter seti kullanılır." +"Sunucu destekliyorsa UTF-8, desteklemiyorsa yerel karakter kümesi kullanılır." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Varsayılanı işlem kullanılsın" @@ -8100,17 +8647,17 @@ msgid "Use explicit FTP over TLS if available" msgstr "Olabiliyorsa TLS üzerinden açıkta FTP kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Şu anda bağlı olan sunucu kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Site yöneticisindeki sunucu kullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" -msgstr "Geçerli dil için sistem &varsayılanları kullanılsın" +msgstr "Geçerli Dilin Sistem &Varsayılanları Kullanılsın" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8125,7 +8672,7 @@ msgstr "Yerine sunucunun dış IP adresi kullanılsın" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8143,21 +8690,22 @@ "kurar. Sunucuya yalnız hangi FileZilla hangi sürümünü kullandığınız bilgisi " "gönderilir." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Kullanıcı:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1074 msgid "Username cannot be a series of spaces" msgstr "Kullanıcı adı bir dizi boşluk olamaz" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" -"Yanlış karakter seti kullanımı dosya adlarının düzgün görüntülenmemesine yol " -"açabilir." +"Yanlış karakter kümesi kullanılması dosya adlarının düzgün " +"görüntülenmemesine yol açabilir." #: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" @@ -8171,51 +8719,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "Günlüğe wxWidgets kayıtları da yazılsın" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Sertifika doğrulanıyor..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Çok yüksek" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" -msgstr "Gizli dosyalar görüntülensin seçili, ama sunucu desteklemiyor" +msgstr "Gizli dosyaların görüntülenmesi istenmiş ancak sunucu desteklemiyor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Görüntülensin/Düzenlensin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Görüntülenecek sütunlar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "Y&azma" -#: ../../locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "Bekliyor" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:343 msgid "Waiting for browsing connection" msgstr "Tarama bağlantısı için bekliyor" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:344 msgid "Waiting for password" msgstr "Parola yazmanız bekleniyor" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Aktarımın iptal edilmesi bekleniyor" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." -msgstr "Yeniden denemek için bekleniyor..." +msgstr "Yeniden deneniyor..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Uyarı, yanlış IP adresinden yapılan veri bağlantısı yok sayılıyor." @@ -8233,23 +8777,23 @@ "\n" "Gerçekten gecelik yapımların denetlenmesini istiyor musunuz?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Dikkat: Olası güvenlik ihlali!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" -msgstr "FileZilla Yazılımına Hoş Geldiniz" +msgstr "FileZilla Uygulamasına Hoş Geldiniz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" -msgstr "Yenilikler:" +msgstr "Yenilikler" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Yenilikler:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8257,7 +8801,7 @@ "Parola hatırlamayı etkinleştirdiğinizde, FileZilla yeniden başlatıldığında, " "parolayı yeniden yazmanız gerekmeden bağlanabilirsiniz." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8265,36 +8809,52 @@ "Yerel işletim sistemi tarafından desteklenmeyen dosya adı karakterlerinin " "indirme sırasında değiştirilmesini sağlar." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "Z&aten bağlıyken yeni bir bağlantı başlatıldığında:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Geniş Ekran" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Parolalar hatırlansın mı?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Ya&zma" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Dış IP adresi yanlış" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:414 msgid "Wrong line endings" msgstr "Satır sonu yanlış" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Yazılan ana parola doğru olmadığından kaydedilmiş parolaların şifresi " +"çözülemedi." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "Yazılan ana parola doğru olmadığından bu ögenin şifresi çözülemedi." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Sarı" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:396 msgid "Yes" msgstr "Evet" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8302,32 +8862,40 @@ "Kullandığınız bilgisayar yalnız IPv6 kullanıyor gibi. Bu yardımcı, bu ortamı " "desteklemiyor." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Son FileZilla sürümünü kullanıyorsunuz." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." -msgstr "Bu pencereyi yardım menüsünden açabilirsiniz" +msgstr "İstediğinizde bu pencereyi yardım menüsünden açabilirsiniz." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Son sürümü FileZilla web sitesinden indirebilirsiniz:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "Varsayılan kapıyı kullanmak için Kapı alanını boş bırakın." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." -msgstr "Özgün izinleri korumak istediğiniz konuma X yazabilirsiniz." +msgstr "Değiştirmek istemediğiniz izinlerin yerine X yazabilirsiniz." + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Ana parola kullanıyorsanız tek başına parola ya da şifreleme anahtarını " +"değiştiremezsiniz." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." -msgstr "Ayarları FileZilla'nın kendi ayar klasöründen alamazsınız." +msgstr "Ayarlar FileZilla ayar klasöründen içe aktarılamaz." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:149 msgid "" @@ -8337,18 +8905,22 @@ "Geçersiz bir karakter yerine başka bir geçersiz karakter kullanamazsınız. " "Lütfen dosya adlarında geçerli olan bir karakter yazın." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Kök klasöre dosya yükleyemezsiniz." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:313 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" "Dosya için yeni bir ad yazmadınız. Onun yerine dosyanın üzerine yazmak ister " "misiniz?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "En az bir sembolik bağlantı seçmelisiniz." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1197 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8356,7 +8928,7 @@ "Düzenleme için 10 taneden fazla dosya seçtiniz. Bunu gerçekten yapmak " "istiyor musunuz?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1744 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8364,39 +8936,47 @@ "Açmak için 10 taneden fazla dosya ya da klasör seçtiniz. Bunu gerçekten " "yapmak istiyor musunuz?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 msgid "You have to enter a hostname." msgstr "Bir sunucu adı yazmalısınız." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1092 msgid "You have to enter a key file path" msgstr "Bir anahtar dosyası yolu yazmalısınız" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:904 msgid "You have to enter a local directory." msgstr "Yerel bir klasör yazmalısınız." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:918 +msgid "You have to enter a remote directory." +msgstr "Uzak bir klasör yazmalısınız." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Geçerli bir IPv4 adresi yazmalısınız." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "You have to enter a valid encryption key" +msgstr "Geçerli bir şifreleme anahtarı yazmalısınız" + +#: ../../locales/../src/interface/search.cpp:909 msgid "You have to enter a writable local directory." msgstr "Yazılabilir bir yerel klasör yazmalısınız." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 msgid "You have to enter an account name" msgstr "Bir hesap adı yazmalısınız" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1059 msgid "You have to specify a user name" msgstr "Bir kullanıcı adı yazmalısınız" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8404,15 +8984,19 @@ "Aktarılan veriyi değiştiren bir yönelticiniz ya da güvenlik duvarınız var " "gibi görünüyor." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Bir ana parola yazmalısınız." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." -msgstr "Yer imi için bir ad yazmalısınız" +msgstr "Yer imi için bir ad yazmalısınız." #: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 msgid "You need to enter a name for the log file." msgstr "Günlük dosyası için bir ad yazmalısınız." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Uygun şekilde düzenlenmiş bir komut yazmalısınız." @@ -8425,15 +9009,15 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "1 ile 65535 arasında bir vekil sunucu kapısı yazmalısınız" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "En az bir yol yazmalısınız, boş yer imleri desteklenmiyor." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8441,7 +9025,7 @@ "Bu yer iminde eşzamanlı taramayı etkinleştirmek için yerel ve uzak " "klasörleri yazmalısınız." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8449,23 +9033,31 @@ "Bu sitede eşzamanlı taramayı etkinleştirmek için yerel ve uzak klasörleri " "yazmalısınız." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Dosya indirmek ve yüklemek istediğiniz klasörlere FileZilla için erişim izni " +"vermelisiniz." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." -msgstr "Yerel bir dosya belirtmelisiniz" +msgstr "Yerel bir dosya belirtmelisiniz." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Uzaktaki bir dosyayı belirtmelisiniz." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Uzaktaki bir bağlantı yolunu belirtmelisiniz." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Bir sunucu belirtmelisiniz." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8473,66 +9065,66 @@ "Diğer sunuculara bağlanmakta bir sorununuz olmamalı. Dosya aktarımları " "düzgün çalışıyor olmalı." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2769 msgid "Your computer will suspend unless you click Cancel." msgstr "İptal düğmesine tıklamazsanız sistem askıya alınacak." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "şundan sonra olan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "şundan önce olan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "şununla başlayan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "bayt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "şunu içeren" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:243 msgid "custom" msgstr "özel" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "şunu içermeyen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "şuna eşit olmayan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "şununla biten" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "şuna eşit olan" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:545 +#: ../../locales/../src/interface/filelistctrl.cpp:563 #: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:608 msgid "file" msgstr "dosya" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8542,90 +9134,118 @@ "Lütfen bu çalıştırılabilir dosyanın FileZilla çalıştırılabilir dosyası ile " "aynı klasörde bulunduğundan emin olun." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp farklı bir FileZilla sürümüne ait" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" -msgstr "fzsftp başlatılamıyor" +msgstr "fzsftp başlatılamadı" + +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj farklı bir FileZilla sürümüne ait" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj başlatılamadı" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj başlatılamadı.\n" +"Lütfen bu çalıştırılabilir dosyanın FileZilla çalıştırılabilir dosyası ile " +"aynı klasörde bulunduğundan emin olun." -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers hiç bir sertifika bulamadı" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 işlenemedi" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "şundan büyük olan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "grup çalıştırabilir" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "grup okuyabilir" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "grup yazabilir" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "şuna eşit olan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" -msgstr "ayarlanmış" +msgstr "işaretlenmiş" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" -msgstr "ayarlanmamış" +msgstr "işaretlenmemiş" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "şundan küçük olan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "şu kurallı ifadeye uyan" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +msgid "new name" +msgstr "yeni ad" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "sahibi çalıştırabilir" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "sahibi okuyabilir" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "sahibi yazabilir" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "bilinmeyen" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" -msgstr "Herkes çalıştırabilir" +msgstr "herkes çalıştırabilir" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" -msgstr "Herkes okuyabilir" +msgstr "herkes okuyabilir" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" -msgstr "Herkes yazabilir" +msgstr "herkes yazabilir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" diff -Nru filezilla-3.15.0.2/locales/uk_UA.po filezilla-3.33.0/locales/uk_UA.po --- filezilla-3.15.0.2/locales/uk_UA.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/uk_UA.po 2018-04-27 13:04:09.000000000 +0000 @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: FileZilla\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-30 15:29+0100\n" -"PO-Revision-Date: 2016-01-24 12:24+0300\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-27 14:20+0200\n" +"PO-Revision-Date: 2018-04-08 21:22+0300\n" "Last-Translator: Igor Chomko \n" "Language-Team: Igor Chomko \n" "Language: uk_UA\n" @@ -21,18 +21,18 @@ "X-Poedit-Bookmarks: 948,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "%H:%M:%S минуло" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "%H:%M:%S залишилось" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -41,9 +41,9 @@ "%a - Обліковий запис (рядки, що містять його, будуть оминатися у випадку, " "якщо не використовується тип входу через Обліковий запис)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" @@ -51,9 +51,9 @@ msgstr[1] "%d каталоги" msgstr[2] "%d каталогів" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -61,11 +61,11 @@ msgstr[1] "%d каталоги зі своїм вмістом" msgstr[2] "%d каталогів зі своїм вмістом" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" @@ -73,7 +73,7 @@ msgstr[1] "%d файли" msgstr[2] "%d файлів" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" @@ -81,7 +81,7 @@ msgstr[1] "%d файли. Загальний розмір: %s" msgstr[2] "%d файлів. Загальний розмір: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" @@ -89,12 +89,7 @@ msgstr[1] "%d файли. Загальний розмір: Принаймні %s" msgstr[2] "%d файлів. Загальний розмір: Принаймні %s" -#: ../../locales/../src/interface/QueueView.cpp:2772 -#, c-format -msgid "%d files added to queue" -msgstr "%d файлів додано до черги" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -102,11 +97,11 @@ msgstr[1] "%d секунди" msgstr[2] "%d секунд" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Хост" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" @@ -114,7 +109,7 @@ msgstr[1] "%llu каталоги" msgstr[2] "%llu каталогів" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -122,47 +117,47 @@ msgstr[1] "%llu файли" msgstr[2] "%llu файлів" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Пароль" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? Б/с)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Дія сертифікату вичерпана!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Все ще не дійсний!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Користувач проксі" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s і %s. Загальний розмір: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s і %s. Загальний розмір: Принаймні %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -170,89 +165,98 @@ msgstr[1] "%s байти" msgstr[2] "%s байт" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"%s Неможливо знайти. Без цього компоненту FileZilla SFTP не працюватиме.\n" +"%s неможливо знайти. Без цього компоненту FileZilla %s не буде працювати.\n" "\n" -"Завантажте FileZilla повторно. Якщо ця проблема повториться, повідомте про " -"неполадку." +"Завантажте FileZilla повторно. Якщо проблема не зникає, надішліть звіт про " +"помилку." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"%s Неможливо знайти. Без цього компоненту FileZilla SFTP не працюватиме.\n" +"%s неможливо знайти. Без цього компоненту FileZilla %s не буде працювати.\n" "\n" "Можливі рішення:\n" "- Переконайтеся, що %s знаходиться у каталозі, який є у списку вашого ШЛЯХУ " "змінної середовища.\n" -"- Встановіть повний шлях до %s у змінній середовища FZ_FZSFTP." +"- Встановіть повний шлях до %s у %s змінної середовища." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s з %d бітами" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Ім'я хоста не збігається з сертифікатом" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Ім'я користувача" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Пароль проксі" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "&Завершити попереднє з'єднання і з'єднати у поточній вкладці" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "&About..." msgstr "&Про..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "&Обліковий запис:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "&Активний" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/menu_bar.cpp:154 msgid "&Add bookmark..." msgstr "&Додати закладку..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Додати каталог..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:10 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:56 msgid "&Add files to queue" msgstr "&Додати файли до черги" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Додати файл ключа..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:266 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "&Add to queue" msgstr "&Додати до черги" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "&Узгодити налаштування часового поясу за сервером:" @@ -260,76 +264,81 @@ msgid "&Always trust certificate in future sessions." msgstr "&У майбутніх сесіях завжди довіряти сертифікату." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "&Завжди довіряти цьому хосту,додати вказаний ключ у каше" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Завжди використовувати типовий редактор" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "&Завжди використовувати вибране для неасоційованих файлів" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Завжди виконувати цю дію" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Здійснювати запит в операційної системи щодо завнішньої ІР адреси" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:364 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 +#: ../../locales/../src/interface/menu_bar.cpp:118 msgid "&Auto" msgstr "&Автоматичний" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Автовизначення" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "&Колір тла:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:372 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 +#: ../../locales/../src/interface/menu_bar.cpp:120 msgid "&Binary" msgstr "&Бінарний" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "" "&Бінарні префікси з використанням символів SI. (наприклад, 1 КБ = 1024 байти)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/menu_bar.cpp:151 msgid "&Bookmarks" msgstr "&Закладки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Перегляд..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Стійкість пакету:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Скасувати" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Clear private data..." msgstr "&Очистити особисті дані..." @@ -337,176 +346,176 @@ msgid "&Close" msgstr "&Закрити" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:158 msgid "&Close FileZilla" msgstr "&Закрити FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:170 +msgid "&Close FileZilla once" +msgstr "&Закрити FileZilla один раз" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Configure speed limits..." msgstr "&Конфігурувати обмеження швидкості..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/menu_bar.cpp:129 msgid "&Configure..." msgstr "&Конфігурувати..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&З'єднати" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../locales/../src/interface/menu_bar.cpp:50 msgid "&Copy current connection to Site Manager..." msgstr "&Скопіювати діюче з'єднання до Сайт Менеджера..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "&Copy to clipboard" msgstr "&Скопіювати до буферу обміну" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:29 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:69 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&Create directory" msgstr "&Створити каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:404 msgid "&Create new tab" msgstr "&Створити нову вкладку" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:182 msgid "&Debug" msgstr "&Відлагодити" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "&Відлагодити інформацію в журналі повідомлень:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "&Типовий редактор:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/menu_bar.cpp:113 msgid "&Default file exists action..." msgstr "&Типова дія щодо існуючого файлу..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "&Затримка між невдалими спробами входу:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:41 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Видалити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Видалити символічне посилання" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "&Directory access permissions..." +msgstr "&Дозволи доступу до каталогу..." + +#: ../../locales/../src/interface/menu_bar.cpp:86 msgid "&Directory comparison" msgstr "&Порівняння каталогів" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Вимкнути синхронізований перегляд і продовжити змінювання локального " "каталогу" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" "&Вимкнути синхронізований перегляд і продовжити змінювання віддаленого " "каталогу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "" "&Проігнорувати локальний файл з подальшим його завантаженням та поновленям " "редагуванням" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/menu_bar.cpp:143 msgid "&Disconnect" msgstr "&Від'єднати" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "&Від'єднати від сервера" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Показувати миттєву швидкість передачі замість середньої швидкості" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Показати розмір в байтах" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "&Не пам'ятати паролів (рекомендовано)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Даний діалог більше не показувати." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "&Не використовувати зовнішню ІР адресу при локальному з'єднанні." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "&Подвійне клацання на файлах:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:51 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:261 msgid "&Download" msgstr "&Завантажити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "&Завантажити до:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "&Download..." msgstr "&Завантажити..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "&Завантаження:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:24 +#: ../../locales/../src/interface/menu_bar.cpp:68 msgid "&Edit" msgstr "&Редагувати" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "&Редагувати правила фільтрування..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/menu_bar.cpp:89 +#: ../../locales/../src/interface/menu_bar.cpp:128 msgid "&Enable" msgstr "&Розблокувати" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Увімкнути стиснення даних" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Увімкнути обмеження швидкості" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Кодування:" @@ -514,64 +523,76 @@ msgid "&Encryption:" msgstr "&Кодування:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:192 msgid "&Enter custom command..." msgstr "&Ввести настроювану команду..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "&Встановити з'єднання у новій вкладці" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Виконати" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Експортувати записи Сайт Менеджера" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:359 +#: ../../locales/../src/interface/menu_bar.cpp:57 msgid "&Export..." msgstr "&Експорт..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Повернутись до активного стану" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../locales/../src/interface/menu_bar.cpp:44 msgid "&File" msgstr "&Файл" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "&File Attributes..." msgstr "&Атрибути файлу..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "&File permissions..." msgstr "&Дозволи файла..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Файл:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "&Стан фільтру:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "&Налаштування фільтру:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "&Фільтри" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "&Фільтри:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Завершити редагування і видалити локальний файл" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Вирівняти локальні шляхи, відвантажити усі вміщені файли безпосередньо до " +"кінцевого каталогу" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -579,152 +600,161 @@ "&Вирівняти віддалені шляхи, завантажити усі вміщені файли прямо до кінцевого " "каталогу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "&Відстежити символічне посилання, видалити вміст кінцевого каталогу" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Отримати зовнішню ІР адресу з такого URL:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/menu_bar.cpp:172 msgid "&Getting help..." msgstr "&Отримання допомоги..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Глобальна закладка" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 використовує метод CONNECT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/menu_bar.cpp:162 msgid "&Help" msgstr "&Допомога" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:318 +#: ../../locales/../src/interface/menu_bar.cpp:94 msgid "&Hide identical files" msgstr "&Приховати подібні файли" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:123 msgid "&Highest" msgstr "&Найвищий" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "&Найвищий доступний порт:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "&Хост:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&Бінарні префікси ІЕС (наприклад,1 KiБ =1024 байт)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (приклад: 2007-09-15)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../locales/../src/interface/menu_bar.cpp:58 msgid "&Import..." msgstr "&Імпорт..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "&Зберегти асоціації типів файлів" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Встановити нову версію" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "" +"&Зберігати структуру локального шляху співвідносною кореневій папці пошуку" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "" "&Утримувати структуру віддаленого шляху відносно кореневої папки пошуку" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "&Файл ключа:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Розташування файлів та областей каталогів:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "&Обмежити локальні порти, що використовуються FileZillа" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Обмежити кількість одночасних з'єднань" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/menu_bar.cpp:103 msgid "&Local directory tree" msgstr "&Локальне дерево каталогів" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Локальний каталог:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "&Локальний пошук" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "&Увійти до файлу" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "&Тип входу:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "&Тип входження:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 msgid "&Low" msgstr "&Низький" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/menu_bar.cpp:156 msgid "&Manage bookmarks..." msgstr "&Керування закладками..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/menu_bar.cpp:133 msgid "&Manual transfer..." msgstr "&Ручна передача..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "&Максимальна кількість з'єднань:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "&Максимальна кількість спроб:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/menu_bar.cpp:102 msgid "&Message log" msgstr "&Журнал повідомлень" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "&Зменшити до трею" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "&Спосіб сортування імені:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "&Ім'я:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 +#: ../../locales/../src/interface/menu_bar.cpp:69 msgid "&Network configuration wizard..." msgstr "&Майстер налаштування мережі..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "&Новий" @@ -732,7 +762,7 @@ msgid "&New Site" msgstr "&Новий сайт" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "&Доступна нова версія!" @@ -740,154 +770,165 @@ msgid "&Next >" msgstr "&Далі>" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "&Ні" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:146 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "&Жодного" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Normal" msgstr "&Звичайний" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "&Числове значення:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "&ДОБРЕ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&ВІДКРИТИ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:20 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:335 msgid "&Open" msgstr "&Відкрити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Переписати" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Пасивний" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "&Пароль:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:166 msgid "&Play sound" msgstr "&Відтворити звук" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "&Порт:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/menu_bar.cpp:123 msgid "&Preserve timestamps of transferred files" msgstr "&Зберегти часові позначки переданих файлів" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Черга" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Швидке з'єднання" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/menu_bar.cpp:101 msgid "&Quickconnect bar" msgstr "&Панель швидкого з'єднання" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "&Історія Швидкого з'єднання" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "&Читати" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/menu_bar.cpp:141 msgid "&Reconnect" msgstr "&Відновити з'єднання" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "&Інформація повторного з'єднання" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 +#: ../../locales/../src/interface/menu_bar.cpp:80 msgid "&Refresh" msgstr "&Оновити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "&Пам'ятати головний пароль до завершення роботи FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "&Пам'ятати пароль до завершення роботи FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "&Пам'ятати паролі" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Віддалений каталог:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "&Віддалений шлях:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "&Віддалений пошук" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Забрати" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Вилучити ключ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:115 msgid "&Remove selected" msgstr "&Забрати вибране" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:89 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Перейменувати" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "&Перейменувати..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "&Перевідкрити локальний файл" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Замінити недійсні символи на:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/menu_bar.cpp:173 msgid "&Report a bug..." msgstr "&Повідомити про недолік..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:154 +msgid "&Request attention" +msgstr "&Прохання уваги" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "&Reset and requeue all" msgstr "&Скинути і поновити в черзі все" @@ -895,39 +936,39 @@ msgid "&Restart Wizard" msgstr "&Перезавантажити майстра" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Відновити" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:162 msgid "&Run command..." msgstr "&Команда на виконання..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Запустити майстра налаштувань..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Виконати перевірку оновлень..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&САЙТ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Зберегти як..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Пошук" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "&Search remote files..." msgstr "&Пошук віддалених файлів..." @@ -935,205 +976,219 @@ msgid "&Select Entry:" msgstr "&Обрати вхід:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Вибрати мову:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Вибрати стовпці для:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/menu_bar.cpp:136 msgid "&Server" msgstr "&Сервер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Налаштування" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "&Settings..." msgstr "&Налаштування..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Показати меню відлагодження" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 msgid "&Show detailed log" msgstr "&Показати деталізований журнал повідомлень" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Показати повідомлення" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Показати часові позначки в журналі повідомлень" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "&Записи в Сайт Менеджері" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "&Site Manager..." msgstr "&Сайт Менеджер..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "&Специфічна закладка сайту" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "&Оминути" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/menu_bar.cpp:126 msgid "&Speed limits" msgstr "&Обмеження швидкості" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "&Розпочати передачу негайно" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Обміняти локальні та віддалені панелі" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:211 msgid "&TLS Ciphers" msgstr "&Шифри TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "&Тест" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Тема:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/menu_bar.cpp:108 msgid "&Transfer" msgstr "&Передача" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "&Спосіб передачі:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/menu_bar.cpp:105 msgid "&Transfer queue" msgstr "&Почерговість передачі" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "&Трактувати файли з розширенням .dot як файли ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "&Довіряти цьому сертифікату з-поміж списку альтернативних імен хоста." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Відмінити редагування" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Обновити кешований ключ для даного хосту" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 msgid "&Upload" msgstr "&Відвантажити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "&Відвантажити до:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 +msgid "&Upload..." +msgstr "&Відвантажити..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "&Відвантаження:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Використати користувацьку програму" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "&Використовувати синхронізований перегляд" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Використати типовий системний редактор для текстових файлів" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "&Використовувати наступні ІР адреси:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Використати натомість зовнішню ІР адресу" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "&Використати розділювач тисячних" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Користувач:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "&Ім'я користувача:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Версія %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/menu_bar.cpp:78 msgid "&View" msgstr "&Вигляд" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:384 msgid "&View/Edit" msgstr "&Перегляд/Редагування" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "" "&Стежити за локально редагованими файлами та нагадувати про відвантаження " "модифікацій" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&При перевірці наявних оновлень, перевірити:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Писати" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "&Так" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "'%s'не існує або нема доступу." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "'%s' не є каталогом." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "'%s' не є підтримуваним протоколом." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "" "'Обліковий запис' за типом входження не підтримується вибраним протоколом" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1141,7 +1196,7 @@ "Типи входу 'Звичайний' і 'Обліковий запис' відсутні; використовуйте 'Запит " "паролю', натомість." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1149,7 +1204,7 @@ "Типи входу 'Нормальний' і 'Обліковий запис' відсутні. Ваш вхід було змінено " "на 'Запит паролю'." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1159,8 +1214,8 @@ "лінійкою клієнта для відправки аргументів даних 'лапок' на сервер. Можливо " "ви забажаєте ввести просту команду, не використовуючи 'лапок'." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" @@ -1168,50 +1223,50 @@ msgstr[1] "(%d фільтрованих об'єкти)" msgstr[2] "(%d фільтрованих об'єктів)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% завантажено)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 для безліміту)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 секунд)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 щоб вимкнути)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(сумісність програм встановлено до %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(приклад: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(приклад: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(в %s/s)" @@ -1220,13 +1275,13 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "--:--:-- залишилось" #: ../../locales/../src/interface/cmdline.cpp:88 msgid "-c cannot be used together with an FTP URL." -msgstr "-c не може використовуватись з FTP URL." +msgstr "-c не може використовуватись з адресою FTP." #: ../../locales/../src/interface/cmdline.cpp:97 msgid "-l can only be used together with an FTP URL." @@ -1238,33 +1293,33 @@ #: ../../locales/../src/interface/cmdline.cpp:82 msgid "-s cannot be used together with an FTP URL." -msgstr "-s не можна використовувати разом з FTP URL." +msgstr "-s не можна використовувати разом з адресою FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Жодного" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Попередження" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Інформація" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Детально" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32-бітна система" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - Відлагодити" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64-бітна система" @@ -1272,22 +1327,27 @@ msgid "< &Back" msgstr "< &Назад" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/menu_bar.cpp:160 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "Закладка з вказаним іменем вже існує. Введіть нове ім'я." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Сертифікат у ланцюгу було підписано з використанням незахищеного алгоритму" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Потрібно встановити типовий редактор." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Каталог неможливо перетягнути до одного з його підкаталогів." @@ -1301,20 +1361,22 @@ "сконфігуровані. В таких випадках вам необхідно використати активний режим. В " "активному режимі FileZilla відкриває порт і просить сервер про з'єднання." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Попередньо відкритий файл було змінено." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Файл з таким іменем знаходиться в процесі передачі." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." -msgstr "Файл з цим іменем знаходиться в процесі редагування" +msgstr "" +"Файл з таким іменем знаходиться у процесі редагування. Закрийте його і " +"повторіить спробу." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1328,11 +1390,20 @@ "Якщо ви не полагодите цієї проблеми,файли будуть відсутні у списках файлів.\n" "Більше попереджень упродовж цього з'єднання не буде." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Втрачений головний пароль відновленню не підлягає! Будь-ласка, ретельно " +"запам'ятайте його." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Доступна нова версія FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1341,7 +1412,7 @@ "неправильно налаштовані будуть ховати файли від користувача.Використовуйте " "дану опцію щоб змусити сервер показувати усі файли." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1349,7 +1420,7 @@ "Правильно налаштований сервер цього не вимагає. Якщо у вас виникла така " "потреба, контактуйте з адміністратором сервера." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1357,17 +1428,17 @@ "Виконується віддалений процес і синхронну навігацію увімкнено.\n" "Вимкнути синхронізовану навігацію і продовжити змінювати локальний каталог?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:368 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 +#: ../../locales/../src/interface/menu_bar.cpp:119 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "До&дати" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "До&зволити відновлення файлів ASCII" @@ -1379,51 +1450,53 @@ msgid "A&pply only to uploads" msgstr "За&стосувати лише для відвантажень" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "За&стосувати до всіх файлів та каталогів" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:252 msgid "A&utomatically remove successful transfers" msgstr "А&втоматично видалити успішну передачу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Про FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Над списками файлу" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Неможливо відновити доступ до деяких локальних каталогів:" + +#: ../../locales/../src/engine/server.cpp:614 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Обліковий запис" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 msgid "Action after queue &completion" msgstr "Дія після &завершення черги" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Дія над вибраним файлом:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Дія до виконання:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Дія:" @@ -1431,7 +1504,7 @@ msgid "Active mode" msgstr "Активний режим" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1439,7 +1512,7 @@ "FTP тест активного режиму показав збій. FileZilla не знає правильної " "завнішньої ІР адреси." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1447,7 +1520,7 @@ "Невдалий тест активного режиму FTP. FileZilla не знає правильної зовнішньої " "ІР адреси. До того ж, ваш маршрутизатор змінив адресу відправника." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1457,38 +1530,39 @@ "адресу,однак ваш маршрутизатор або файєрвол помилково змінили відправлену " "адресу." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "ІР активного режиму" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Лише додати файли до &черги" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:331 msgid "Add selected directory to the transfer queue" msgstr "Додати вибрану директорію до черги передачі" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 msgid "Add selected files and folders to the transfer queue" msgstr "Додати вибрані файли і папки до черги передачі" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Додати до черги" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:509 msgid "Address type not supported" msgstr "Тип адреси не підтримується" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Додатково" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1502,15 +1576,16 @@ "давати збої і навіть пошкодити вашу систему. Використовуйте бета версії і " "нічні збірки на власний ризик." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "Зав&жди виконувати цю дію" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Алгоритм:" -#: ../../locales/../src/interface/QueueView.cpp:2937 +#: ../../locales/../src/interface/QueueView.cpp:2663 msgid "All files have been successfully transferred" msgstr "Усі файли були успішно передані" @@ -1519,7 +1594,7 @@ msgstr "" "Усі порти в заданому діапазоні повинні знаходитись в межах від 1024 до 65535." -#: ../../locales/../src/interface/QueueView.cpp:2933 +#: ../../locales/../src/interface/QueueView.cpp:2659 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1527,7 +1602,7 @@ msgstr[1] "Усі передачі завершено. %d файли передати неможливо." msgstr[2] "Усі передачі завершено. %d файлів передати неможливо." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Дозволити &звернутися до іншого режиму передачі при виникненні збою" @@ -1535,18 +1610,18 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Дозволити звернутися до іншого режиму передачі при виникненні збою" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Існуюче з'єднання" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Альтернативне ім'я:" msgstr[1] "Альтернативні імена:" msgstr[2] "Альтернативних імен:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1554,7 +1629,7 @@ "Ви можете використати у якості альтернативи інструмент Pageant з PuTTY, щоб " "управляти своїми ключами. FileZilla розпізнає Pageant." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1562,7 +1637,7 @@ "Як альтернативу, ви можете використати свій системний агент SSH. Задля цього " "переконайтесь, що встановлено перемінну середовища SSH_AUTH_SOCK." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1570,7 +1645,7 @@ "В якості альтернативи, ви, також, можете завантажити останню версію " "FileZilla з веб сайту:" -#: ../../locales/../src/interface/QueueView.cpp:1902 +#: ../../locales/../src/interface/QueueView.cpp:1667 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1579,7 +1654,7 @@ "Помилка при завантаженні черги передачі з \"%s\".\n" "Деякі елементи черги неможливо відновити." -#: ../../locales/../src/interface/QueueView.cpp:1812 +#: ../../locales/../src/interface/QueueView.cpp:1559 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1588,7 +1663,11 @@ "Помилка збереження черги передачі до \"%s\".\n" "Деякі елементи черги неможливо зберегти." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "Видавець у ланцюжку сертифікатів не є центром сертифікації" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1596,85 +1675,84 @@ "Елемент, що перетягується, позначений схожим іменем з елементом, який вже " "існує на вказаній позиції." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Анонімний" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" "Виконується ще один віддалений процес, зараз зміна директорії неможлива." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "Внесення будь-яких змін в Сайт Менеджері не може бути збереженим." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Внесення будь-яких змін до фільтрів не може бути збережено." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Внесення будь-яких змін до фільтрів не будуть збережені." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "За&стосувати лише до каталогів" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Застосувати" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "Застосувати лише до &поточної черги" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Застосувати лише до &файлів" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Архів" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Аргумент переповнення буфера" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Як вкладка в панелі черги передачі" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Запит на виконання" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:605 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Запит на пароль" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." -msgstr "Запит операційної системи про порт" +msgstr "Запит операційної системи про порт." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" msgstr "Запит своєї операційної системи про зовнішню ІР адресу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Поставте питання у форумах FileZilla" @@ -1682,7 +1760,7 @@ msgid "Associated program not found:" msgstr "Допоміжної програми не знайдено:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Принаймні одна умова фільтрації не повна" @@ -1690,99 +1768,106 @@ msgid "At this point, all required information has been gathered." msgstr "На цьому етапі усю необхідну інформацію зібрано." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Атрибут" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Невдала автентифікація." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Автор:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Авто" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Автоматичне класифікування типу файлів" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Наявні розміри" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B <Символ елементу для байтів.Перекладати лише першу літеру>" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "Про&міжний проксі" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Неправильний дескриптор файлу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Базові інструкції користування" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Поведінка" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "В процесі редагування" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Увага! Сертифікат скасовано" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Бінарний" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Панель оголошень" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Синій" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:434 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Закладка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Закладка:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Закладки" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Перегляд..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Сегмента пам’яті не знайдено" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Дата створення:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Інформація по конструкції" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Бізнес категорія:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1793,97 +1878,112 @@ "для використання лише невеликого діапазону портів, вкажіть нижчий діапазон " "портів." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/menu_bar.cpp:138 msgid "C&ancel current operation" msgstr "Від&мінити дану операцію" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "C&lear all" msgstr "О&чистити усе" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:93 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:289 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:390 msgid "C&opy URL(s) to clipboard" msgstr "К&опіювати адресу(-и) до буферу обміну" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "C&opy URL(s) with password to clipboard" +msgstr "К&опіювати адресу(-и) URL з паролем до буферу обміну" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "На&строюваний" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "На&строювані асоціації типів файлів:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" -msgstr "Характеристики ЦП" +msgstr "Характеристики ЦП:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Обчислення зсуву часового поясу відносно сервера..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Не можу прочитати з файлу" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Не можу записати дані в файл." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:720 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Не можу записати дані в файл: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Скасувати" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Скасувати поточну операцію" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Скасовує поточну операцію" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "Нема доступу '%s', не встановлені носії або диск не готовий." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Неможливо додати сервер до Сайт Менеджера" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Неможливо призначити запитану адресу" -#: ../../locales/../src/interface/context_control.cpp:352 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Неможливо змінити каталог, виконується операція синхронізованого перегляду." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1891,7 +1991,7 @@ "Неможливо закрити вкладку під час роботи.\n" "Скасувати поточну операцію і закрити вкладку?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1902,22 +2002,23 @@ msgid "Cannot create new filter" msgstr "Неможливо створити новий фільтр" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Неможливо редагувати файл" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Редагування файлу неможливе; нема підключення до жодного серверу." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Неможливо редагувати файл, невідомий віддалений шлях." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1925,82 +2026,81 @@ "Неможливо встановити з'єднання з SFTP сервером. Виберіть,будь-ласка," "властивий протокол." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Неможливо завантажити панель Швидкого завантаження вихідного файлу" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Неможливо завантажити файл ключа" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Неможливо завантажити панель інструментів з вихідного файлу" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Неможливо запам'ятати пароль" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "Неможливо перейменувати компонент" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Неможливо перейменувати файл" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:136 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Неможливо зіставити ім'я хоста з адресою IPv4 для використання з проксі " "SOCKS4." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Неможливо зберегти налаштування фільтру" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Неможливо вибрати фільтр" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Неможливо встановити асоціацію типу файлу" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Неможливо показати діалог" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Перегляд / редагування обраного файлу неможливе" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Нечутливий до регістру" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Нечутливий до регістру" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Нечутливий до регістру (типово)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Чутливий до регістру" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Чутливий до регістру (типово)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Категорії, щоб очистити" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "Сертифікату і даних по з'єднанню ще немає." @@ -2012,36 +2112,40 @@ msgid "Certificate issuer" msgstr "Видавець сертифікату" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Невдала перевірка підпису сертифікату" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Виклик:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Змінити атрибути" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:298 msgid "Change the file permissions." msgstr "Змінити дозволи для файлу." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Зміна налаштувань файлу журналу вимагає перезавантаження FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Подача кодування символів" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Набір символів" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for &updates..." msgstr "Перевірити &оновлення..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Перевіряти &оновлення FileZilla автоматично:" @@ -2049,15 +2153,15 @@ msgid "Check for Updates" msgstr "Перевірити оновлення" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for newer versions of FileZilla" msgstr "Перевірити наявність новішої версії FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Перевірити невдалі оновлення" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2065,7 +2169,7 @@ "Перевірте свій обліковий запис. Введений пароль починається або закінчується " "пробілом." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2073,39 +2177,39 @@ "Перевірте свій обліковий запис. Введене ім'я користувача починається або " "закінчується пробілом." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Перевірка правильності зовнішньої ІР адреси" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Перевірка оновлень..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "Контрольна сума співпадає у файлі %s\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Контрольна сума не співпадає у файлі %s\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "Вибрати файл ключа" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Виберіть типовий локальний каталог" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Вибрати локальний каталог" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:670 msgid "Chunk data improperly terminated" msgstr "Частину даних завершено неправильно" @@ -2113,55 +2217,63 @@ msgid "Cipher:" msgstr "Шифр:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:408 +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Cl&ose tab" msgstr "За&крити вкладку" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Класичний" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "Clear &layout cache" msgstr "Очистити &каше формату" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +msgid "Clear auto&update data" +msgstr "Очистити авто&оновлені дані" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Очистити історію" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Очистити особисті дані" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Очистити панель Швидкого З'єднання" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "Щоб зберегти свою конфігурацію натисніть кнопку Завершити." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Клієнт для МАС сервера:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Клієнт для серверного шифру:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Закрити" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:411 msgid "Close &all other tabs" msgstr "Закрити &усі інші вкладки" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "Close FileZilla" msgstr "Закрити FileZilla" @@ -2169,104 +2281,109 @@ msgid "Close all running instances of FileZilla" msgstr "Закрити всі діючі екземпляри FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Закрити швидкий пошук і продовжити порівняння?" + +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Closes current tab" msgstr "Закриває поточну вкладку" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Ко&ментарі:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Властивості стовпців" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Встановлення стовпців" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Команда та її параметри мають бути правильно залапковані." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Невдала команда" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:506 msgid "Command not supported" msgstr "Команда не підтримується" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Команда не підтримується даним протоколом" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Команда:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Коментар" -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Спільне ім'я:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Зв'язок блокується маршрутизатором або файєрволом" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/menu_bar.cpp:92 msgid "Compare &modification time" msgstr "Порівняти &час модифікації" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/menu_bar.cpp:91 msgid "Compare file&size" msgstr "Порівняти розмір &файлу" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Порівняння &порогової величини (в хвилинах):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "" "Порівняння порогової величини повинно бути у проміжку поміж 0 та 1440 хвилин." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Зібрано для:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Зібрано на:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Зібрано з:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Ознаки компілятора:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Стиснуто" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Поточні передачі" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Умови чутливі до ре&гістру" @@ -2282,41 +2399,42 @@ msgid "Configure port range" msgstr "Конфігурувати діапазон портів" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Конфігурування FileZilla та вашої мережі" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Підтвердити видалення" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Необхідне підтвердження" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Вітаємо, Ваша конфігурація виглядає працездатною." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Під'єднати налаштування обхідного проксі" -#: ../../locales/../src/interface/netconfwizard.cpp:216 +#: ../../locales/../src/interface/netconfwizard.cpp:220 #, c-format msgid "Connect failed: %s" msgstr "Невдале з'єднання: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "З'єднати в поточній вкладці" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "З'єднати в новій вкладці" @@ -2324,25 +2442,26 @@ msgid "Connect to specified Site Manager site" msgstr "Під'єднати до сайту вказаного Сайт Менеджером" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Під'єднання" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Під'єднання до %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Під'єднання до %s через проксі %s" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Під'єднання до %s..." @@ -2351,86 +2470,90 @@ msgid "Connection" msgstr "Під'єднання" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "З'єднання перервано" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Невдала спроба під'єднання" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:208 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Невдала спроба під'єднання з \"%s\", роблю спробу за наступною адресою." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Невдала спроба під'єднання з \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Спробу під'єднання перервано користувачем" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Час спроби з'єднання вичерпано" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "З'єднання завершено" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:305 +#: ../../locales/../src/engine/http/request.cpp:318 +#: ../../locales/../src/engine/http/request.cpp:329 +#: ../../locales/../src/engine/http/request.cpp:340 msgid "Connection closed by server" msgstr "З'єднання завершено сервером" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "З'єднання встановлено, ініціюється TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "З'єднання встановлено, надсилається запит HTTP" -#: ../../locales/../src/interface/netconfwizard.cpp:333 +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." msgstr "З'єднання встановлено, очікуємо на запрошення." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "З'єднання встановлено, очікуємо на вітальне повідомлення..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "З'єднання втрачено" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "Connection not allowed by ruleset" msgstr "З'єднання не дозволено встановленими правилами" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:500 msgid "Connection refused" msgstr "У з'єднанні відмовлено" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "У з'єднанні відмовлено сервером" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "З'єднання скинуте сервером" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "З'єднання скинуто вузлом кешування" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" @@ -2438,100 +2561,138 @@ msgstr[1] "Час очікування вичерпано після %d секунд бездіяльності" msgstr[2] "Час очікування вичерпано після %d секунд бездіяльності" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Час з 'єднання вичерпано." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "З'єднання з сервером втрачено." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "З'єднання з проксі встановлено, обмінюємось вітаннями..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "З'єднання з сервером закрилось дочасно." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "З'єднання з тестовим сервером невдале." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Конвертувати файл ключа" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Копія (%d) з %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "Копія з %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:98 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:294 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Копіювати адреси URL вибраних елементів до буферу обміну разом з паролем." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:94 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 msgid "Copy the URLs of the selected items to clipboard." msgstr "Копіювати адреси вибраних елементів до буферу обміну." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Неможливо прийняти з'єднання: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Неможливо отримати доступ до шляху %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Неможливо додати сертифікат до тимчасового списку довіри" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "Неможливо додати з'єднання до Сайт Менеджера" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Неможливо завершити операцію" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Неможливо під'єднатися до серверу" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Неможливо під'єднатися до сервера: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Неможливо сконвертувати команду до серверного кодування" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Неможливо сконвертувати приватний ключ" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Неможливо скопіювати адреси" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Неможливо скопіювати сертифікат" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Неможливо скопіювати дані" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Неможливо створити CFURL із шляху %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Не вдалося створити ідентифікатор URI для цієї передачі." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Неможливо створити локальний файл %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Неможливо створити реєстраційний об’єкт-взаємовиключення: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Неможливо створити безпечну закладку з адреси URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2541,11 +2702,11 @@ "Або неправильно встановлено розширення оболонки, або ви не помістили файли у " "вікно Провідника." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Неможливо встановити з'єднання з сервером" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2557,11 +2718,16 @@ "командної лінійки '--datadir ' або, встановивши змінну " "середовища FZ_DATADIR ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Неможливо згенерувати настроювану послідовність входу." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Неможливо згенерувати ключ" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2569,7 +2735,7 @@ "Неможливо отримати виразного імені сертифікату видавця, невдале " "gnutls_x509_get_issuer_dn" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2577,41 +2743,36 @@ "Неможливо отримати виразне ім'я предмету сертифіката, невдала функція " "gnutls_x509_get_dn" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Неможливо отримати повний віддалений шлях." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Неможливо отримати власний шлях з CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Неможливо отримати шлях з адреси URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Неможливо отримати відповідь від fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "Неможливо отримати тимчасовий каталог для завантаження файлів." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Неможливо імпортувати сертифікати вузла, невдалий імпорт сертифіката " -"gnutls_x509" - -#: ../../locales/../src/interface/FileZilla.cpp:108 +#: ../../locales/../src/interface/FileZilla.cpp:96 #, c-format msgid "Could not initialize Winsock (%d): %s" msgstr "Неможливо запустити гніздо Windows (%d): %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Неможливо ініціалізувати структуру для сертифікатів вузла, невдала " -"ініціалізація сертифіката gnutls_x509" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2622,15 +2783,21 @@ "доступ.\n" "Будь-які зміни, зроблені в Сайт Менеджері, не будуть збережені." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Неможливо завантажити файл ключа" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Неможливо завантажити приватний ключ" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2641,7 +2808,7 @@ "'%s'.\n" "Вимкнути синхронізований перегляд та продовжити змінювати віддалений каталог?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2652,7 +2819,7 @@ "'%s'.\n" "Синхронізований перегляд вимкнуто." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2663,72 +2830,112 @@ "'%s'.\n" "Синхронізований перегляд вимкнуто." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Неможливо отримати розмір '%s'" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Неможливо відкрити '%s'" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Неможливо відкрити буфер обміну" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Неможливо відкрити файл журналу: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Аналіз віддаленого шляху неможливий." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Неможливо визначити адресу сервера :" -#: ../../locales/../src/interface/netconfwizard.cpp:977 +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Неможливо читати з '%s'" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." msgstr "Неможливо читати з гнізда даних." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:382 #, c-format msgid "Could not read from socket: %s" msgstr "Неможливо читати з гнізда проксі: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Читання елементу сервера неможливе." -#: ../../locales/../src/interface/netconfwizard.cpp:344 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." msgstr "Неможливо отримати дані сервера." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Неможливо знайти початковий номер %s у файлі" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Неможливо відновити доступ до каталогу" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Неможливо добитися зміщення %d у файлі" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Неможливо знайти початок файлу" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Неможливо знайти кінець файлу" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Неможливо надіслати команду до fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Неможливо надіслати команду до fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Неможливо відсортувати сертифікати кінцевого користувача" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "Неможливо створити процес IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Неможливо розпочати обмін вітаннями з проксі: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Неможливо розпочати передачу" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2737,17 +2944,17 @@ "Неможливо записати \"%s\", будь-які зміни в Сайт Менеджері не можуть бути " "збереженими: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Неможливо записати \"%s\", дану закладку додати неможливо: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Неможливо записати \"%s\"; глобальні закладки зберегти неможливо: %s" -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1590 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2756,119 +2963,121 @@ "Неможливо записати \"%s\". Чергу зберегти неможливо.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Неможливо записати \"%s\"; обрані сайти експортувати неможливо : %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Неможливо писати \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Неможливо записати файл ключа: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Неможливо записати в локальний файл" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Неможливо записати у файл журналу: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:237 #, c-format msgid "Could not write to socket: %s" msgstr "Неможливо записати в сокет: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Країна:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:77 msgid "Crea&te new file" msgstr "Створи&ти новий файл" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "Створити &відсутній локальний каталог і увійти до нього" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "Створити &відсутній віддалений каталог і увійти до нього" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 msgid "Create a new subdirectory in the current directory" msgstr "Створити новий підкаталог в поточному каталозі" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:345 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Створити новий підкаталог в поточному каталозі і змінити в ньому" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 msgid "Create a new, empty file in the current directory" msgstr "Створити новий, порожній файл в поточному каталозі" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:33 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:73 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:344 msgid "Create director&y and enter it" msgstr "Створити катало&г і увійти до нього" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Створити каталог" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "Створити порожній файл" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Створення каталогу" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Створення каталогу '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Критична помилка" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Критична помилка:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Критична помилка передачі файлу" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Критична помилка передачі файлу після передачі %s до %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2877,99 +3086,104 @@ "Поточний віддалений каталог (%s) не під коренем синхронізації (%s).\n" "Синхронізовану навігацію відімкнено." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Поточний тип передачі встановлено в ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Тип поточної передачі встановлено за параметром автовизначення." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Тип поточної передачі встановлено за бінарним параметром." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Крива:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "Нас&троюваний" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Встановлено настроюваний фільтр" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Настроюваний сервер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Блакитний" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Т&ип Даних" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "" "Де&сятиричні префікси, що використовують SI символи (наприклад 1 KБ = 1000 " "байт)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "Ти&повий" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:85 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:387 msgid "D&elete" msgstr "Ви&далити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "П&орівняння каталогів" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Вим&кнути все" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "Н&е зберігати паролі" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Дія по&двійного клацання на каталогах:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "Д&ублювати" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:58 msgid "DOS-like with virtual paths" msgstr "DOS- подібний з віртуальними шляхами" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Небезпечний тип файлу" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Дані" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Сокет даних закрився дуже рано." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Дата" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Форматування даних" @@ -2985,15 +3199,15 @@ msgid "Debug" msgstr "Відлагодження" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Налаштування відлагодження" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Типовий &локальний каталог:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:50 msgid "Default (Autodetect)" msgstr "Типово (Атовизначення)" @@ -3001,17 +3215,17 @@ msgid "Default editor not properly quoted." msgstr "Типовий редактор неправильно взятий в лапки." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Типова дія щодо існуючого файлу" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Типовий віддалений ка&талог:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -3019,7 +3233,7 @@ "Типовий віддалений шлях не піддається аналізу. Переконайтесь, що це дійсний " "абсолютний шлях для обраного типу сервера." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Типова мова системи" @@ -3027,12 +3241,12 @@ msgid "Default transfer mode:" msgstr "Типовий режим передач:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Типовий тип передачі:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Типова: http://ip.filezilla-project.org/ip.php" @@ -3043,7 +3257,7 @@ "Затримка між невдалими спробами з'єднання повинна бути у проміжку між 1 та " "999 секундами." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3061,75 +3275,85 @@ "Затримка з'єднання на %d секунд пов'язана з попередньо невдалою спробою " "з'єднання..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "Видалити введені дані з Сайт Менеджера" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:282 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Delete selected directory" msgstr "Видалити обраний каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:42 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 msgid "Delete selected files and directories" msgstr "Видалити обрані файли і каталоги" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Видалення \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Видалення %u файлів з \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Видалення символічного посилання" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Робочий стіл" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Подробиці" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Подробиці стосовно нового ключа:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "Виявлено наявність новішої версії FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "Ка&талоги" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Direction" msgstr "Напрямок" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Каталоги:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Каталог" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Дозволи доступу до каталогу" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:302 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "Порівняння каталогів" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Невдале порівняння каталогів" @@ -3137,123 +3361,122 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "Каталога, що містить файл журналу не існує, або ім'я файлу недійсне." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/menu_bar.cpp:83 +msgid "Directory listing &filters..." +msgstr "&Фільтри списку каталога..." + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Список каталогів припинено користувачем" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "Невдалий список каталогів" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Фільтри списку каталогів" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" -msgstr "Вдалий список каталогів \"%s\"" +msgstr "Список каталогу \"%s\" вдалий" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Вдалий список каталогів" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "Вимк&нути все" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Вимкнути синхронізований перегляд і продовжити зміни у віддаленому каталозі?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" "Заблокувати дану опцію ще раз, якщо вміст каталогу перестане бути видимим." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Від'єднати від сервера" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:238 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Від'єднано від сервера" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Від'єднано від сервера: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Від'єднати від попереднього сервера" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Від'єднати від поточного видимого сервера" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "Display about dialog" msgstr "Показати вікно діалогу Про" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "Не &використовувати типовий редактор" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Нічого &не робити" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Повторіть дію з &усіма обраними файлами, що уже редагуються" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Ви дійсно бажаєте закрити FileZilla?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Ви дійсно бажаєте видалити усі записи в Сайт Менеджері та чергу передачі?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Ви дійсно бажаєте видалити усі записи в Сайт Менеджері?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Ви дійсно бажаєте видалити вибраний запис?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Ви дійсно бажаєте видалити чергу передач?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Ви дійсно бажаєте надіслати '%s' до сервера?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Бажаєте повторно відкрити цей файл?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Документація" @@ -3261,49 +3484,49 @@ msgid "Don't use external IP address on &local connections." msgstr "Не використовувати зовнішню ІР адресу при &локальних з'єднаннях." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "" "Дот файли є файлами чиї імена розпочинаються з розширенням знака крапки, " "наприклад: .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Дія при подвійному клацанні" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Завантажити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "Обмеження &завантаження:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "Обмеження завантаження: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Обмеження завантаження: жодного" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Завантажити результати пошуку" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "Download selected directory" msgstr "Завантажити обраний каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:53 msgid "Download selected files and directories" msgstr "Завантажити обрані файли і каталоги" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3312,24 +3535,24 @@ "Швидкість завантаження: %s/s\n" "Швидкість відвантаження: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Завантаження" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Завантаження %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Завантаження оновлення..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:90 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 +#: ../../locales/../src/interface/QueueView.cpp:88 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3337,11 +3560,11 @@ "Функцію Перетягнути&Скинути між різними елементами у FileZilla ще не " "реалізовано." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:103 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "Функцію Перетягнути&Скинути між різними серверами у FileZillа ще не " @@ -3351,66 +3574,66 @@ msgid "Dupl&icate" msgstr "Дубл&ювати" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "Уві&мкнути все" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:15 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 msgid "E&nter directory" msgstr "В&вести каталог" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Ви&конати" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "E&xit" msgstr "Ви&йти" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:187 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 msgid "E&xport..." msgstr "Е&кспорт..." -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "Ел. пошта:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Кожен фільтр потребує щонайменше однієї умови." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Редагувати фільтри" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:25 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "" "Редагувати файл з відконфігурованим редактором і відвантажити зміни на " "сервер." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "Редагування каталогів не підтримується" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Невдале редагування" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Редагування результатів пошуку" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Ел. пошта:" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "Empty command" msgstr "Порожня команда" @@ -3418,7 +3641,7 @@ msgid "Empty command." msgstr "Порожня команда." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "Порожній список каталогів" @@ -3430,13 +3653,13 @@ msgid "Empty file extension." msgstr "Порожні розширення файлу." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Порожні імена фільтрів не дозволяються." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Порожнє іім'я" @@ -3444,81 +3667,97 @@ msgid "Empty quoted string." msgstr "Порожній залапкований рядок." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "Уві&мкнути все" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Увімкнути &фільтрування недійсних символів" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Кодовано" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Кодування" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "&Ключ шифрування:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "&Ключ шифрування:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Подробиці кодування" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Завершити порівняння та змінити порядок сортування?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Закінчити порівняння та відкрити швидкий пошук?" + +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Enter &custom command..." msgstr "Ввести &настроювану команду ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Введіть 0 для необмеженої швидкості." -#: ../../locales/../src/interface/QueueView.cpp:2103 +#: ../../locales/../src/interface/QueueView.cpp:1878 msgid "Enter command" msgstr "Ввести команду" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Ввести настроювану команду" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Ввести каталог" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Ввести ім'я файлу" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Введіть головний пароль" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Ввести ім`я для набору фільтру" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Ввести нове ім'я для встановленого фільтру" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Ввести пароль" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:62 msgid "Enter selected directory" msgstr "Ввести обраний каталог" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3526,12 +3765,11 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Введіть адресу сервера.\n" -"Задля уточнення протоколу сервера, встановіть ідентифікатор протоколу хоста. " -"Якщо протоколу не вказано, тоді буде використовуватись типовий протокол " -"(ftp://).\n" -"Ви, також, можете ввести повні адреси URL у формі протоколу://user:pass@host:" -"port тут і тоді значення в інших полях буде переписано.\n" +"Введіть адресу сервера. Задля уточнення протоколу сервера, додайте перед " +"адресою хоста ідентифікатор протоколу. Якщо протоколу не вказано, тоді буде " +"використовуватись типовий протокол (ftp://). Ви також можете ввести повні " +"адреси URL у формі - протокол://user:pass@host:port тут, після цього " +"значення в інших полях будуть переписані.\n" "\n" "Підтримуваними протоколами є:\n" "- ftp:// для звичайних FTP з вибірковим шифруванням\n" @@ -3539,7 +3777,7 @@ "- ftps:// для FTP через TLS (неявні)\n" "- ftpes:// для FTP через TLS (явні)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3548,118 +3786,135 @@ "Введіть пароль для файлу '%s'.\n" "Конвертований файл буде захищений тим самим паролем." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Введіть порт через який сервер слухає.\n" -"Типовим для FTP є 21, типовим для SFTP є 22." +"Введіть порт через який сервер слухає. Типовим для FTP є 21, типовим для " +"SFTP є 22." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Ввести ім'я користувача" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Ввести ім'я користувача і пароль" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Помилка" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Помилка експорту налаштувань" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Помилка імпорту" -#: ../../locales/../src/interface/QueueView.cpp:1903 +#: ../../locales/../src/interface/QueueView.cpp:1668 msgid "Error loading queue" msgstr "Помилка завантаження черги" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1824 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1571 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Помилка завантаження файлу xml" -#: ../../locales/../src/interface/QueueView.cpp:1813 +#: ../../locales/../src/interface/QueueView.cpp:1560 msgid "Error saving queue" msgstr "Помилка збереження черги" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Помилка запуску програми" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1842 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1591 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Помилка запису файлу xml" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Помилка:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Зразок: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Приклади" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Вико&нати" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "У виконуваному файлі відсутня інформація про версію, неможливо перевірити " "оновлення." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Провідник" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Експортувати &фільтри" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Експорт &Черги" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Експорт &Установок" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Експорт налаштувань" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "І&м'я фільтру:" @@ -3667,28 +3922,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - Протокол Передачі Файлів" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Протокол Передачі Файлів з вибірковим шифруванням" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Протокол Незахищеної Передачі Файлів" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Двигун FTP не ініціалізується, неможливо з'єднатись" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Перевірка наявності з'єднання підключення надсилання FTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "Проксі FTP" @@ -3705,227 +3959,234 @@ "Для передачі даних FTP використовує вторинне з'єднання. Такі додаткові " "з'єднання можна встановити двома шляхами." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP: Типи файлів" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - FTP над явною TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP по неявній TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" -msgstr "Невдала зміна каталогу" +msgstr "Помилка зміни каталогу" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" -msgstr "Невдала зміна мови" +msgstr "Помилка зміни мови" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Помилка конвертації команди у 8-бітний набір символів" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" -msgstr "Невдале копіювання або переміщення сайтів" +msgstr "Помилка копіювання або переміщення сайтів" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" -msgstr "Невдале створення резервної копії файлу xml" +msgstr "Помилка створення резервної копії файлу xml" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Невдале створення сокету слухання, аварійне завершення" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Помилка створення сокету слухання в порту %d, аварійне завершення." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" -msgstr "Невдале створення сокету слухання для передачі в активному режимі" +msgstr "Помилка створення сокету слухання для передачі в активному режимі" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Не вдалося розшифрувати пароль сервера." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" -msgstr "Невдале отримання шляху до папки 'Мої документи'" +msgstr "Помилка отримання шляху до 'Мої документи' теки" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" -msgstr "Невдале отримання шляху до Робочого столу" +msgstr "Помилка отримання шляху до Робочого столу" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" -"Невдале отримання адреси вузла кешування контрольного з'єднання, з'єднання " +"Помилка отримання адреси вузла кешування контрольного з'єднання, з'єднання " "завершено." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "" -"Невдале отримання адреси вузла кешування даних з'єднання, з'єднання " +"Помилка отримання адреси вузла кешування даних з'єднання, з'єднання " "завершено." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" -msgstr "Невдала ініціалізація двигуна FTP" +msgstr "Помилка ініціалізації двигуна FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." -msgstr "Невдала ініціалізація TLS." +msgstr "Помилка ініціалізації TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" -msgstr "Невдала ініціалізація мережі" +msgstr "Помилка ініціалізація мережі" #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" -msgstr "Невдале завантаження панелей, недійсні файли ресурсів?" +msgstr "Помилка завантаження панелей, недійсні файли ресурсів?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" -msgstr "Невдале завантаження приватного ключа: %s" +msgstr "Помилка завантаження приватного ключа: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" -msgstr "Невдале відкривання \"%s\" для додавання/запису" +msgstr "Помилка відкривання \"%s\" для додавання/запису" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" -msgstr "Невдале відкриття \"%s\" для читання" +msgstr "Помилка відкривання \"%s\" для читання" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" -msgstr "Невдале відкриття \"%s\"для запису" +msgstr "Помилка відкривання \"%s\"для запису" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." -msgstr "Невдалий аналіз зворотньої адреси." +msgstr "Помилка аналізу зворотньої адреси." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" -msgstr "Невдале отримання даних" +msgstr "Помилка отримання даних" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" -msgstr "Невдалий видобуток списку каталогу" +msgstr "Помилка видобутку списку каталогу" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Невдале отримання зовнішньої ІР адреси, аварійне завершення" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Невдале отримання зовнішньої ІР адреси, аварійне завершення." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "Невдале отримання зовнішньої ІР адреси, використовуючи локальну адресу" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Невдале отримання локальної ІР адреси." +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Невдале отримання локальної ІР адреси, аварійне завершення." -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Невдале отримання локальної ІР адреси. Аварійне завершення" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Невдале отримання локальної ІР адреси." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." -msgstr "Невдале отримання зовнішньої ІР адреси." +msgstr "Помилка отримання зовнішньої ІР адреси." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." -msgstr "Невдале надилання команди." +msgstr "Помилка надсилання команди." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" -"Невдале встановлення мови на %s (%s), використовується типова мова системи" +"Помилка встановлення мови на %s (%s), використовується типова мова системи" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" -"Невдале встановлення мови на %s (%s), використовується типова мова системи " +"Помилка встановлення мови на %s (%s), використовується типова мова системи " "(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" -"Невдале встановлення мови на %s (%s), використовується типова мова системи." +"Помилка встановлення мови на %s (%s), використовується типова мова системи." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" -msgstr "Невдале встановлення мови на %s, використовується типова мова системи" +msgstr "Помилка встановлення мови на %s, використовується типова мова системи" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" -"Невдале встановлення мови на %s, використовується типова мова системи (%s, " +"Помилка встановлення мови на %s, використовується типова мова системи (%s, " "%s)." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." -msgstr "Невдале встановлення мови на %s, використовується типова мова системи." +msgstr "Помилка встановлення мови на %s, використовується типова мова системи." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" -msgstr "Невдала перевірка налаштувань" +msgstr "Помилка перевірки налаштувань" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" -msgstr "Невдала перевірка сертифікату вузла кешування" +msgstr "Помилка перевірки сертифікату вузла кешування" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" -msgstr "Невдалий запис у файл %s" +msgstr "Помилка запису у файл %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" -msgstr "Невдалий запис файлу xml" +msgstr "Помилка запису файлу xml" #: ../../locales/../src/interface/queueview_failed.cpp:16 msgid "Failed transfers" -msgstr "Невдалі передачі" +msgstr "Помилка передач" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 msgid "Fall back to active mode" -msgstr "Повернутись до активного режиму" +msgstr "Повернутися до активного режиму" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "Фай&л:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "Фай&ли" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Файл" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Типи файлів" - -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Дескриптор файлу не сокет" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "У файлі відсутні будь-які дані для імпорту." @@ -3933,7 +4194,7 @@ msgid "File editing" msgstr "Редагування файлу" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "Файл існує" @@ -3941,7 +4202,7 @@ msgid "File exists action" msgstr "Дія стосовно існуючого файлу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Файл змінився" @@ -3949,63 +4210,67 @@ msgid "File lists" msgstr "Списки файлів" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Файл не знайдено" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Пошук файлу" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Передача файлу зупинена користувачем" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Передачу файлів зупинено користувачем після передачі %s в %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Невдала передача файлу" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Невдала передача файлу після передачі %s в %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Передачу пропущено" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Файл передано успішно" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Файл передано успішно, передано %s до %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Передачі файлів усе ще виконуються." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Файл пропонує свою передачу через тип даних ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Файл пропонує свою передачу через бінарний тип даних." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Помилка FilеZilla" @@ -4017,62 +4282,58 @@ "FileZilla тепер може перевірити вашу конфігурацію, щоб переконатися у її " "правильностії." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla уже підключено до сервера." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "FileZilla потребує перезавантаження для того, щоб зміни у виборі мови набули " "чинності." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Оновлення FilеZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/menu_bar.cpp:98 msgid "Filelist status &bars" msgstr "Секції статусу списку &файлів" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Ім'я файлу" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Фільтри &імені файлу..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Для каталогу %s та імені файлу %s неможливо створити ім'я файлу" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "Ім'я файлу не дійсне" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Ім'я файлу не змінено" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Ім'я файлу:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "" "Імена файлів не можуть вміщувати будь-які з наступних сиволів: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" @@ -4080,14 +4341,22 @@ "Імена файлів не можуть вміщувати будь-які з наступних символів: / \\ : * ? " "\" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Файли зараз редагуються" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Файли, що співпадають з фільтром вилучаються із списків каталогу." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Файлів не знайдено" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Розмір файлу" @@ -4095,50 +4364,54 @@ msgid "Filesize format" msgstr "Формат розміру файлу" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Тип файлу" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Асоціації типу файла" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Фільтр застосовується до:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Фільтрувати недійсні символи в іменах файлів" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Ім'я фільтру вже існує" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Фільтрувати елементи, що співпадають з усіма такими" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Фільтрувати елементи, що співпадають з будь-яким з таких" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Фільтрувати елементи, які не співпадають з жодним з наступних" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Фільтрувати елементи, що співпадають не з усіма такими" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Встановлений фільтр вже існує" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Фільтрувати списки каталогів" @@ -4148,11 +4421,11 @@ msgid "Filter validation failed" msgstr "Відмова перевірки достовірності фільтру" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Знайти &файли" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Знайти ка&талоги" @@ -4164,16 +4437,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Ключ шифру (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" -msgstr "Ключ шифру:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" +msgstr "Відбитки пальців:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Майстер конфігурування файєрволу та маршрутизатора" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4185,7 +4459,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Задля надійності вам необхідно вказати діапазон щонайменше 10 портів." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4193,35 +4467,40 @@ "Для цього сеансу будуть використані типові налаштування. Будь-які зміни в " "налаштуваннях не будуть збереженими." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Примусове &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/menu_bar.cpp:148 msgid "Force showing &hidden files" msgstr "Примусити показ &прихованих файлів" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Примусити показ прихованих файлів" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Специфікації формату:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Формат: Розширення, після якого ідуть правильно залапковані команда і " "аргументи." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Знайдено новий %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Помилка функції %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Інша документація" @@ -4229,11 +4508,15 @@ msgid "General" msgstr "Загальні" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "General SOCKS server failure" msgstr "Помилка сервера загальних SOCKS" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Генерувати..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Універсальне проксі" @@ -4242,71 +4525,75 @@ msgid "Get external IP address from the following URL:" msgstr "Отримати зовнішню ІР адресу з наступного URL:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Отримання допомоги" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Ім'я встановленого фільтру вже існує, переписати встановлений фільтр?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Глобальні закладки" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Помилка GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Помилка GnuTLS %d в %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Помилка GnuTLS %d в %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Помилка GnuTLS %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Зелений" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Дозволи для груп" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 msgid "H&igh" msgstr "Ви&сокий" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP через TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Хешований:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Прихований" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:1002 +#: ../../locales/../src/interface/queue.cpp:1064 msgid "High" msgstr "Високий" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:1004 +#: ../../locales/../src/interface/queue.cpp:1066 msgid "Highest" msgstr "Найвищий" @@ -4314,56 +4601,65 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Найвищий наявний порт повинен стояти під номером поміж 1024 та 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Утримуйте клавішу shift, щоб перемикнути стан фільтру з обох боків одночасно." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Домашня сторінка:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Хост недосяжний" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Головний ключ шифрування хосту:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Ключ хоста не співпадає" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Хост стартує з '[', однак заключної дужки не знайдено." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Host unreachable" msgstr "Хост недосяжний" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Хост:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Алгоритм ключа хоста:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Години," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "" +"Я &забув свій головний пароль. Видалити усі паролі, збережені за допомогою " +"цього ключа." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (приклад: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:115 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Адреси IPv6 не підтримуються через проксі SOCKS4" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4373,7 +4669,7 @@ "часу від вказаного, тоді з'єднання буде припинено і FileZilla намагатиметься " "підключитися повторно." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Якщо з'явиться повідомлення про дефект, тоді для журналів встановіть рівень " @@ -4401,7 +4697,7 @@ "неправильно сконфігурованих серверів, що не сприймають обраний спосіб " "передачі." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4409,7 +4705,7 @@ "Якщо змін в ключі хоста не очікувалось, сконтактуйтесь з адміністратором " "сервера." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4417,7 +4713,7 @@ "Якщо дана проблема не зникає, - це означає, що якийсь маршрутизатор та/або " "файєрвол продовжує блокувати роботу FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4425,7 +4721,7 @@ "Якщо дана проблема не зникає, - це означає, що якийсь маршрутизатор та/або " "файєрвол перешкоджає з'єднанню." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4435,7 +4731,7 @@ "додавання \".1\" в кінець імені файлу (з можливістю переписування старіших " "файлів журналу) і створюється новий файл." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4443,7 +4739,7 @@ "Якщо символічне посилання вказує на каталог, FileZilla може як видалити " "символічне посилання, так і вилучити вміст пов'язаного каталогу." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4451,14 +4747,14 @@ "Якщо дана проблема не зникає, тоді зверніться до виробника вашого " "маршрутизатора або файєрволу у пошуку рішення." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Якщо дана проблема не зникає, тоді зверніться до виробника вашого " "маршрутизатора." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4467,7 +4763,7 @@ "При використанні 'переписати, якщо новіший', необхідно синхронізувати ваш " "системний час з серверним." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4476,7 +4772,7 @@ "як одинакові, при умові, що різниця їхньої позначки часу не перевищує його " "граничного значення." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "При зміні мови необхідно перезавантажити FileZilla." @@ -4488,11 +4784,11 @@ "Якщо ви натисните кнопку тест, FileZilla з'єднається з probe.filezilla-" "project.org і виконає кілька простих тестів." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Якщо ви закриєте FileZilla,ваші зміни будуть втрачені." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4506,7 +4802,7 @@ "При виникненні будь-якої помилки, майте на увазі, що ваша конфігурація " "неправильна." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4514,7 +4810,7 @@ "Якщо у вас виникають проблеми з отриманням списку каталогів або передачею " "файлів, спробуйте змінити типовий спосіб передачі." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4549,7 +4845,7 @@ "Якщо ви користуєтесь маршрутизатором, переконайтесь, що усі ці порти " "скеровані до пристрою на якому встановлена ваша копія FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4557,16 +4853,16 @@ "Якщо ваш маршрутизатор постійно змінює ІР адреси,зверніться до вашого " "виробника маршрутизатора." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Імпортувати дані зі старої версії" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Імпортувати установки" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Імпорт успішний" @@ -4593,7 +4889,7 @@ "системою." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4610,18 +4906,11 @@ "FileZilla запитує у сервера порт і під'єднується до нього.Це не вимагає " "великого конфігурування." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Неповний ланцюг, топ сертифікат не є самопідписаним сертифікатом авторизації" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Неправильний пароль" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." @@ -4629,21 +4918,21 @@ "Неможливо отримати інформацію про останню версію FileZilla. Спробуйте " "пізніше." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Ініціалазація TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:111 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "Вразливий алгоритм!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Незахищений сервер, він не підтримує FTP через TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:611 +#: ../../locales/../src/engine/server.cpp:635 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Інтерактивний" @@ -4651,29 +4940,29 @@ msgid "Interface" msgstr "Інтерфейс" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Перервано сигналом" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Перервано користувачем" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:161 +#: ../../locales/../src/engine/http/request.cpp:584 msgid "Invalid Content-Length" msgstr "Недійсна довжина вмісту" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:490 msgid "Invalid HTTP Response" msgstr "Недійсний відгук HTTP" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Пройшов недійсний аргумент" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4681,45 +4970,69 @@ "Отримано недійсну послідовність знаків, вимкнення UTF-8. В Сайт Менеджері " "виберіть опцію UTF-8, щоб примусити UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:705 msgid "Invalid chunk size" msgstr "Недійсний розмір чанку" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Отримано недійсні дані" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Недійсні дані" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Недійсне ім'я файлу" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Неприпустимий геш: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Недійсний хост. Після закриваючої дужки може слідувати лише кома і порт." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Недійсне ім'я хосту: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Недійсне введення" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:518 +msgid "Invalid line" +msgstr "Неприпустимий рядок" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Недійсний шлях" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "" "Недійсний заданий порт. Значення порту повинно становити від 1 до 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4733,73 +5046,73 @@ "ftps:// для FTP через TLS (неявний) і\n" "ftpes://для FTP через TLS (явний)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Недійсний проксі, після закриваючої дужки може слідувати лише кома і порт." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Недійсний сталий вираз" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Недійсний звичайний вираз в умовах пошуку." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:499 msgid "Invalid response code" msgstr "Недійсний код відгуку" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Недійсні умови пошуку: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Недійсний шлях до сайту" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Недійсний розмір в умовах" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Подано недійсне ім'я користувача." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Неправильне значення ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Недійсне значення підказки" -#: ../../locales/../src/interface/verifycertdialog.cpp:256 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Обернути фільтр" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Країна юрисдикції:" -#: ../../locales/../src/interface/verifycertdialog.cpp:258 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Розташування юрисдикції:" -#: ../../locales/../src/interface/verifycertdialog.cpp:257 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Штат або провінція юрисдикції:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Каталоги тримати зверху" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4810,7 +5123,7 @@ "деякі тести з метою перевірки серверної підтримки даного елементу, тест може " "бути невдалим." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Обмін ключами" @@ -4818,123 +5131,146 @@ msgid "Key exchange:" msgstr "Обмін ключами:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:608 +#: ../../locales/../src/engine/server.cpp:633 msgid "Key file" msgstr "Файл ключа" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Ідентифікатор ключа:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 msgid "L&owest" msgstr "Най&нижчий" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Мова" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Зміна мови" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Востаннє модифіковано" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Формат" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Залишити порожнім, щоб зберегти існуючі паролі." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Обмеження для одночасних &завантажень:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Обмеження для одночасних &відвантажень:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Обмежити локальні порти" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Обмежити розмір файлу журналу" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Обмежити:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:659 msgid "Line length exceeded" msgstr "Перевищено довжину лінійки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Пов'язано з" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Сокет слухання закрито" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Список:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Най&нижчий доступний порт:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Локальний" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Використовується локальна адреса" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Локальну кінцеву точку закрито" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Локальний файл" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Локальний файл не існує." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Локальним файлом є %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Локальний файл є каталогом, а не просто звичайним файлом." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Локальний файл має недійсне ім'я." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Пошук локального файлу" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Локальні фільтри:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Обробка локального шляху:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Локальний сайт:" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "Локальний розмір '%s' не співпадає з очікуваним розміром: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Розташування:" @@ -4942,16 +5278,16 @@ msgid "Log file" msgstr "Файл журналу" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +#: ../../locales/../src/engine/ftp/logon.cpp:416 msgid "Logged in" msgstr "Вхід виконано" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Вхід" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4960,7 +5296,7 @@ "UTF-8. Неможливо повернутись до локальних набору символів через використання " "проксі." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4968,10 +5304,10 @@ "Дані входу містять не - ASCII знаки і, можливо, сервер не сприймає кодування " "UTF-8. Спроба використати локальний набір символів." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" -"Послідовність входу виконана повністю, проте входу не відбулось. Аварійне " +"Послідовність входу виконана повністю, проте входу не відбулось, аварійне " "завершення." #: ../../locales/../src/interface/cmdline.cpp:103 @@ -4986,15 +5322,15 @@ "'%s' or '%s'" msgstr "" "Тип входу може бути використаним лише через адресу FTP. Аргумент повинен " -"бути, або '%s', або '%s" +"бути або '%s' або '%s'" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:997 +#: ../../locales/../src/interface/queue.cpp:1059 msgid "Low" msgstr "Низький" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:995 +#: ../../locales/../src/interface/queue.cpp:1057 msgid "Lowest" msgstr "Найнижчий" @@ -5006,127 +5342,160 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Малиновий" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Переконайтесь, що цей файл є доступним і правильно оформленим документом XML." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:646 +#: ../../locales/../src/engine/http/request.cpp:652 +#: ../../locales/../src/engine/http/request.cpp:659 +#: ../../locales/../src/engine/http/request.cpp:670 +#: ../../locales/../src/engine/http/request.cpp:705 #, c-format msgid "Malformed chunk data: %s" msgstr "Погано сформовані дані чанку: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:161 #, c-format -msgid "Malformed header: %s" -msgstr "Погано сформований заголовок: %s" +msgid "Malformed request header: %s" +msgstr "Неправильний формат запиту заголовків: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Спотворена відповідь, сервер не надсилає правильних закінчень лінійки" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:459 +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:518 +#: ../../locales/../src/engine/http/request.cpp:574 +#: ../../locales/../src/engine/http/request.cpp:584 +#, c-format +msgid "Malformed response header: %s" +msgstr "Неправильний формат заголовка відповіді : %s" + +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +#, c-format +msgid "Malformed response: %s" +msgstr "Неправильний формат відповіді: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Ручна передача" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Головний &Пароль:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Головний пароль:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Звірити все з наступного" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Зіставити все з наступного" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Не зіставляти все з наступного" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Звірити не усе з наступного" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Максимум одночасних &передач:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Помилка виділення пам'яті" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Журнал повідомлень" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Розташування журналу повідомлень" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Повідомлення занадто велике" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Хвилини" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Перемістити &вниз" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Перемістити &вверх" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Мій Комп'ютер" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Мої Документи" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "Мої Сайти" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "N/a" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Ім'я" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "Ім'я вже існує" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Ім'я закладки вже існує." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Ім'я:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Звичайне сортування" @@ -5134,30 +5503,34 @@ msgid "Need to enter filter name" msgstr "Потрібно ввести ім'я фільтру" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Потрібно ввести дійсний локальний шлях" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Потрібно ввести дійсний віддалений шлях" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "Потрібно вказати спосіб кодування знаків" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Не вказано параметрів, ані nodename, ані servname, або невідомі" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "Хост мережі немає адреси мережі у запитуваній родині адрес" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Мережа недосяжна" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Ніколи" @@ -5165,41 +5538,41 @@ msgid "New &Folder" msgstr "Нова &Папка" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "New &tab" msgstr "Нова &вкладка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Нова Заклад&ка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Нова закладка" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Нова директорія" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Нові функції та вдосконалення в %s" @@ -5208,42 +5581,42 @@ msgid "New filter" msgstr "Новий фільтр" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Нова папка" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Новий сайт" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Наступне за чергою передачі" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "Ні" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Відсутня адреса асоційована з nodename" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "Не обрано категорії для експортування" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "No command given, aborting." msgstr "Відсутня команда, аварійне завершення." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "" "Не встановлено зовнішньої IP адреси, робиться спроба за типовою адресою." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Ніякі файли зараз не редагуються." @@ -5251,96 +5624,92 @@ msgid "No filter name given" msgstr "Не задано імені фільтру" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Не вказаний хост, введіть ім'я хоста." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Відсутні зображення" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Чергу файлів вичерпано повністю!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Не задано імені встановленого фільтру." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Жодна програма не асоціюються з даним типом файлу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Жодна програма не асоціюється з редагуванням файлів з розширенням '%s'." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Нема шляху до хоста" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Нема результатів пошуку" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Сайти відсутні" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:466 msgid "No supported SOCKS5 auth method" msgstr "Непідтримуваний метод автентифікації для SOCKS5" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Не задано імені користувача." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Жодного" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Нічого не вибрано" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Невиправна помилка в визначенні імен" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:602 +#: ../../locales/../src/engine/server.cpp:629 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:1062 msgid "Normal" msgstr "Звичайний" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:309 +#: ../../locales/../src/interface/queueview_failed.cpp:334 msgid "Not all items could be requeued for transfer." msgstr "Не всі елементи можна повторно поставити в чергу для передачі." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Не з'єднано" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Нема під'єднання до жодного серверу" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Нема під'єднання до жодного серверу." @@ -5348,26 +5717,35 @@ msgid "Not connected." msgstr "Не з'єднано." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Не ініціалізовано, потрібно викликати WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Зауважте, що даний елемент підтримується лише при використанні протоколу FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Примітка: Втрачений ключ відновити неможливо." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Примітка:Це працює лише чистим,не кодованими FTP з'єднаннями." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Примітка: Використання загального проксі форсує пасивний режим при " "з'єднаннях FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:652 +msgid "Null character in line" +msgstr "Символ з Null-значенням у рядку" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Кількість десяткових розташувань:" @@ -5375,40 +5753,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Кількість повторів повинна знаходитись у проміжку між 0 та 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "Від&крити файл" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:396 +msgid "O&pen" +msgstr "Від&крити" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "Добре" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "Версія ОС:" @@ -5420,169 +5802,192 @@ "На наступних сторінках буде сконфігуровано обраний режим передач і режим " "нейтралізації неполадок, у випадку його увімкнення." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Один раз" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Раз в день" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Раз в тиждень" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "Використовувати лише простий FTP (незахищений)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "Ві&дкрити файл" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "Open directory in system's file manager" msgstr "Відкрити каталог у системному менеджері файлів" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Відкрити Сайт Менеджер" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Відкрити Сайт Менеджер." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "" "Відкрити Сайт Менеджер. Клацніть правою мишкою, щоб отримати список сайтів." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Відкрити діалогове вікно дозволів доступу до каталогу, щоб настроїти ті " +"локальні каталоги до яких FileZilla має доступ." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 msgid "Open the file." msgstr "Відкрити цей файл." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "Open the settings dialog of FileZilla" msgstr "Відкрити діалог налаштувань FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Відкрито як:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Невдале відкриття" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "Opens a new tab" msgstr "Відкриває нову вкладку" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "Opens the Site Manager" msgstr "Відкриває Сайт Менеджер" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Відкрити каталог діалогу фільтру. Клацніть правою мишкою, щоб перемикнути " "фільтри." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Операційна система:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Дія вже виконується" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Дія виконується" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Дія не підтримується" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Параметри" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Оранжевий" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Організація:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Інші налаштування SFTP" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Помилка іншої системи" -#: ../../locales/../src/interface/verifycertdialog.cpp:266 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Інше:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Пам'ять вичерпано" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Переглянути" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Переписати &якщо джерело новіше" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Переписати файл" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Переписати файл, якщо розмір відрізняється" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Переписати файл, якщо розмір відрізняється, або вихідний файл новіший" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Переписати файл, якщо вихідний файл новіший" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Переписати, якщо розмір &відрізняється" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Переписати, якщо роз&мір відрізняється або джерело новіше" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Власний тип збірки: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Дозволи власника" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Власник/Група" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5590,31 +5995,31 @@ "За&боронити системі перехід до сплячого режиму під-час передач та інших " "операцій" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Хост про&ксі:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Команда ПОРТА заблокована маршрутизатором або файєрволом." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Па&сивний (рекомендовано)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Значення параметру - це недійсна URL адреса" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Аналіз %d байт інформації версії.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Па&роль:" @@ -5622,66 +6027,81 @@ msgid "Passive (recommended)" msgstr "Пасивний (рекомендовано)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Пасивний режим" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Пасивний режим було встановлено як типовий режим передачі." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Пароль або ключ шифрування не встановлено" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Вимагається пароль" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Паролі" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Шлях" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Для каталогу %s та підкаталогу %s шлях створити неможливо" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Шляху не знайдено:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Шляхи" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Вилучення очікування" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Дозвіл" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Не дозволено" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Дозволи" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Платформа:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "" +"Додайте ті локальні каталоги, які бажаєте використати за допомогою FileZilla." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5689,6 +6109,14 @@ "Перевірте https://filezilla-project.org/probe.php чи сервер працює і ще раз " "уважно перевірте свої налаштування." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"У діалоговому вікні, що слідує, перевірте надані дозволи і додайте повторно " +"будь-які відсутні локальні каталоги з якими ви працюєте." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5697,13 +6125,13 @@ "Сконфігуруйте усі файєрволи та маршрутизатори так, щоб дати змогу FileZillа " "встановити вихідний зв'язок по довільному порту." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Заблокуйте у своєму маршрутизаторі такі налаштування, як 'режим DMZ ', або " "'Ігровий режим '." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5719,13 +6147,13 @@ msgid "Please enter a custom time format." msgstr "Введіть настроюваний формат часу." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Введіть дату у форматі YYYY-MM-DD, як, наприклад, 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "" @@ -5735,16 +6163,16 @@ msgid "Please enter a name for the new filter." msgstr "Введіть ім'я для нового фільтру." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Введіть нове ім'я для скопійованого фільтру." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Введіть нове ім'я для налаштувань фільтру \"%s\"" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Введіть нове ім'я для фільтру." @@ -5767,21 +6195,10 @@ "transfers." msgstr "Введіть число між 0 і 10 для позначення кількості одночасних передач." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Введіть пароль для даного серверу:" -#: ../../locales/../src/interface/QueueView.cpp:2103 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Введіть шлях і виконуваний файл.\n" -"Зразок: c:\\somePath\\file.exe під управлінням MS Windows або /somePath/file " -"під управлінням Unix.\n" -"Також ви можете вибірково вказати аргументи програми." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5789,31 +6206,31 @@ "Будь-ласка, введіть час очікування в проміжку між 10 і 9999 секунд або 0 для " "вимкнення часу очікування." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Введіть унікальне ім'я для цих установок фільтру" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Введіть ім'я користувача для цього сервера:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Введіть дійсний діапазан портів." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "" "Будь-ласка, введіть адресу URL звідки можна отримати вашу зовнішню адресу" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" "Введіть значення обмеження швидкості відвантаження більшим або рівним 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5821,27 +6238,49 @@ "Введіть пряму FTP команду.\n" "Використання прямих ftp команд очистить каше каталогу." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1878 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Введіть повний шлях програми та її аргументів. Дану команду буде виконано " +"після завершення обробки черги.\n" +"Зразок: c:\\somePath\\file.exe під управлінням ОС МС Windows або /somePath/" +"file під управлінням ОС Unix.\n" +"При наявності пробілів, команди та їхні аргументи повинні бути правильно " +"відтворені ." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Введіть ім'я каталогу, який необхідно створити:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "Введіть ім'я файлу, який необхідно створити:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Введіть ім'я користувача і пароль для даного серверу:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Введіть, будь-ласка, свій поточний головний пароль, щоб змінити параметри " +"паролю." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Введіть свою зовнішню ІР адресу" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5851,6 +6290,13 @@ "У випадку, якщо ваша адреса динамічна, або у вас нема зовнішньої адреси, " "скористайтеся опцією засобу зовнішнього вирішення." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "" +"Введіть, будь-ласка, свій головний пароль для розшифрування паролю даного " +"серверу:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5859,7 +6305,7 @@ "Виконуйте ретельно усі інструкції, оскільки неправильне конфігурування стане " "на перешкоді успішним з'єднанням FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5868,13 +6314,13 @@ "а також, переконайтесь, що ви надрукували адресу засобу розпізнавання адрес " "правильно." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Переконайтесь, що запитуваний регіональний параметр встановлено у вашу " "систему." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5899,7 +6345,7 @@ "що використовується троянами або іншими шкідливими програмами. Це може " "викликати хибну тривогу, яку ви можете безпечно скасувати." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5908,7 +6354,7 @@ "FTPS та FTPES сервери спрацьовують лише у випадку, якщо вони підтримують " "команду MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5917,7 +6363,7 @@ "намагаєтесь або занадто часто перепід'єднатись, або через занадто короткі " "проміжки часу." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5926,11 +6372,19 @@ "Якщо ви змінили середовище своєї мережі, або у випадку, якщо ви зіткнулися з " "проблемами на тих серверах, що раніше працювали - запустіть цього майстра." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Збережіть цей ключ у безпечному місці. Без правильного ключа завантажені " +"файлі стають недоступними." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Оберіть дію:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Виберіть категорії, які ви бажаєте імпортувати." @@ -5961,7 +6415,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Виберіть нові атрибути для обраних файлів." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5976,37 +6430,37 @@ "'режимі DMZ' або 'ігровому режимі'.Такі речі, як протокол інспекцій чи " "протокол специфічних 'полагоджень' повинні бути відключеними" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "Розташуванн&я журналу повідомлень:" -#: ../../locales/../src/interface/verifycertdialog.cpp:251 -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Поштовий індекс:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "Попередньо &виділити місце перед завантаженням" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Попереднє виділення" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Попередньо вказані Сайти" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Збереження файлу часових позначок" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Попередній перегляд:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Перегляд" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Первинне з'єднання та сертифікати передачі даних не співпадають." @@ -6018,15 +6472,15 @@ msgid "Print version information to stdout and exit" msgstr "Надрукувати інформацію версії на обраний принтер і вийти" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Визначення пріоритетних каталогів (типових)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Priority" msgstr "Пріоритет" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -6034,7 +6488,7 @@ "Політика конфіденційності: На сервер буде передано лише версію FileZilla та " "архітектуру ЦП." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Приватні &ключі:" @@ -6042,31 +6496,31 @@ msgid "Pro&tocol:" msgstr "Про&токол:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Пароль про&ксі:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:107 +#: ../../locales/../src/interface/menu_bar.cpp:111 msgid "Process &Queue" msgstr "Опрацювати &Чергу" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Переповнення таблиці обробки файлу" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Опрацьовано %s в %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Протокол не підтримується" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "На даному типові сокету протокол не підтримується" @@ -6074,53 +6528,53 @@ msgid "Protocol:" msgstr "Протокол:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Порт &проксі:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Користувач &проксі:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:475 msgid "Proxy authentication failed" msgstr "Невдала автентифікація проксі" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Невдалий обмін вітаннями з проксі: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Хост проксі стартує з дужки '[', однак закриваючої дужки не знайдено." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:329 #, c-format msgid "Proxy reply: %s" msgstr "Відповідь проксі: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Невдалий запит проксі. Відповісти з проксі: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:386 #, c-format msgid "Proxy request failed: %s" msgstr "Невдалий запит проксі: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:540 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Невдалий запит проксі: Невідомий тип адреси у відповіді CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" -msgstr "Проксі встановлено, однак хост проксі або порт не дійсні." +msgstr "Проксі встановлено, однак хост проксі або порт не дійсні" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Ключ публічної автентифікації" @@ -6128,68 +6582,77 @@ msgid "Public key algorithm:" msgstr "Алгоритм публічного ключа:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Публічні дозволи" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2784 msgid "Queue has been fully processed" msgstr "Черга опрацьована не повністю" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Черга: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Черга: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Черга: пусто" -#: ../../locales/../src/interface/QueueView.cpp:440 +#: ../../locales/../src/interface/QueueView.cpp:207 msgid "Queued files" msgstr "Файли в черзі" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Система черги:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" -msgstr "Пере&завантажити систему" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Швидкий пошук:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "При порівнянні каталогів швидкий пошук відкрити неможливо." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +msgid "R&eboot system once" +msgstr "Пере&завантажити систему відразу" + +#: ../../locales/../src/interface/menu_bar.cpp:104 msgid "R&emote directory tree" msgstr "Від&далене дерево каталогів" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:248 msgid "R&eset and requeue selected files" msgstr "С&кинути і поновити чергу обраних файлів" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Проста команда FTP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Чи&тати" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:37 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:81 msgid "Re&fresh" msgstr "Он&овити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Пере&йменувати" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6197,20 +6660,24 @@ "Перезапустіть майстра налаштування мережі і ретельно перевірте свої " "налаштування та сконфігуруйте усі маршрутизатори і файєрволи." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Чи&тати" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Лише читати" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "Помилка читання з локального файлу" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Дійсно скасувати дану операцію?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6219,8 +6686,8 @@ msgstr[1] "Дійсно видалити %d каталоги з усім їхнім вмістом з сервера?" msgstr[2] "Дійсно видалити %d каталогів з усім їхнім вмістом з сервера?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" @@ -6228,13 +6695,13 @@ msgstr[1] "Дійсно видалити %d файли з сервера?" msgstr[2] "Дійсно видалити %d файлів з сервера?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Дійсно видалити %s і %s з сервера?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "Дійсно видалити усі вибрані файли та/або каталоги з сервера?" @@ -6242,52 +6709,59 @@ msgid "Really delete all selected files and/or directories from your computer?" msgstr "Дійсно видалити усі вибрані файли та/або каталоги з вашого комп'ютера?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Reason" msgstr "Причина" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2777 msgid "Reboot now" msgstr "Перезавантажити зараз" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "Про&ектувати в підкаталоги" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Отримано оповіщення TLS з сервера: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Отримано перелік файлів каталогу і схоже він закодований EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Отримано рядок, що перевищує 10000 символів, аварійне завершення." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Отриманий ланцюжок сертифікатів неможливо перевірити. Стан перевірки %d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Отримані дані заблоковано" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "Отримано неприпустимий символ в інформації версії" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Від сервера отримано невідоме повідомлення TLS %d" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "Отримана інформація версії завелика" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6295,77 +6769,75 @@ "Перепід'єднана інформація не може бути очищена підчас з'єднання з сервером.\n" "У випадку продовження,ваш зв'язок буде перервано." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Налаштування перепід'єднання" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Перепід'єднати до останнього використаного серверу" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Рекурсивне додавання файлів до черги." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Рекурсивна зміна дозволів." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Рекурсивне видалення файлів і каталогів." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Червоний" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Перенаправлення до недійсної, або непідтримуваної адреси URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Перенаправлення до недійсної, або непідтримуваної адреси: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Оновити списки файлу та папки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Пам'ятати паролі?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Віддалений" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Не довіряти віддаленому сертифікату." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Remote file" msgstr "Віддалений файл" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Пошук віддаленого файлу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Віддалені фільтри:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Віддалений шлях" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6374,7 +6846,7 @@ "Віддалений шлях не піддається аналізу. Переконайтесь, що це дійсний " "абсолютний шлях і він підтримується поточним типом серверу сайту (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6384,129 +6856,133 @@ "абсолютний шлях, обраний на батьківському сайті, і він підтримується типом " "серверу (%s)." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" "Віддалений шлях не піддається аналізу. Переконайтесь, що це дійсний " "абсолютний шлях." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "ВІддалений шлях неможливо проаналізувати." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Обробка віддаленого шляху:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Віддалений шлях:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Віддалений сайт:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Remove &all" msgstr "Видалити &все" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 msgid "Remove &selected" msgstr "Видалити &обране" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Перейменувати файл" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "Rename selected directory" msgstr "Перейменувати обраний каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:46 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:90 msgid "Rename selected files and directories" msgstr "Перейменувати обрані файли і каталоги" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Перейменування '%s' в '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Повторіть пароль:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Повідомлення про запити помилок і характеристик" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:377 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Невдалий запит - клієнт не виконує ідентифікації (або не досягається з " "сервера)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:380 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Невдалий запит - ідентифікація клієнта не підтверджує рядок ID користувача" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:374 msgid "Request rejected or failed" msgstr "Запит відхилено або невдалий" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "Потрібне явне FTP через TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "Потрібне неявне FTP через TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:241 msgid "Reset and requeue &all" msgstr "Скинути і поновити чергу &всіх" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Закритий протокол невідомий" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Приймається рішення стосовно адреси для %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Ресурс тимчасово недоступний" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Відповідь:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Результати:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Відновити передачу файлу" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6514,44 +6990,46 @@ "Поновлення файлів ASCII може створити проблеми, якщо сервер використовує " "інший формат завершення лінійки, ніж клієнт." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Видобування списку каталогів з \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Видобування списку каталогів..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Видобування зовнішньої ІР адреси з %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../locales/../src/interface/menu_bar.cpp:61 msgid "S&how files currently being edited..." msgstr "По&казати файли, що зараз редагуються..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "П&оказувати Сайт Менеджер при запуску" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Ви&мкнення системи" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 +msgid "S&hutdown system once" +msgstr "Ви&мкнути систему відразу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "С&топ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "П&ризупинення системи" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:182 +msgid "S&uspend system once" +msgstr "П&ризупинити систему відразу" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/menu_bar.cpp:97 msgid "S&ynchronized browsing" msgstr "С&инхронізована навігація" @@ -6559,91 +7037,111 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Підтримка SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:141 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Проксі SOCKS4 буде з'єднано з: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:168 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "" +"SOCKS5 не підтримує імен користувачів або паролів довших, аніж 25 символів." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Збе&регти паролі, захищені головним паролем" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Збе&регти паролі" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Зберегти налаштування?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "Збереження паролів вимкнуто вашим системним адміністратором." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "Збереження паролів вимкнуто вами." -#: ../../locales/../src/interface/QueueView.cpp:1704 -msgid "Scanning for files to add to queue" -msgstr "Сканування файлів, що додаються до черги" - -#: ../../locales/../src/interface/QueueView.cpp:1706 -msgid "Scanning for files to upload" -msgstr "Сканування файлів до відвантаження" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Коефіцієнт масштабування:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "&Умови пошуку:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" -msgstr "Пшук в &каталозі:" +msgstr "Пошук у &каталозі:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Рекурсивний пошук файлів." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "Search server for files" msgstr "Пошук файлів на сервері" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Тип пошуку:" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Інформація безпеки" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "Дивіться також: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "Обр&ати сервер" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Обрати &сторінку:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Обрати тему" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Обрати типову дію для випадку, якщо пошукуваний файл передачі вже існує." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Обрати типовий редактор" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6651,7 +7149,7 @@ "Обрати типову дію стосовно існуючого файлу, якщо кінцевий файл вже існує. " "Цей вибір дійсний лише для даного з'єднання." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6659,61 +7157,65 @@ "Обрати типову дію стосовно існуючого файлу лише для поточно обраних файлів у " "черзі." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Обрати файл, що містить приватний ключ" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Обрати файл для експортованих даних" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Обрати файл для експортованих фільтрів" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1566 msgid "Select file for exported queue" msgstr "Обрати файл для експортованої черги" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Обрати файл для експортованих налаштувань" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "Обрати файл для експортованих сайтів" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Обрати файл для імпорту налаштувань з" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Обрати файл для відвантаження" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Обрати ім'я файлу для конвертованого файлу ключа" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Обрати спосіб, щоб відкрити ці файли." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Обрати кінцевий каталог завантаження" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Обрати ім'я кінцевого файлу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Обрати категорії для експорту:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Оберіть свої приватні дані для видалення." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6721,7 +7223,7 @@ msgstr[1] "Обрано %d каталоги з їхнім вмістом для передачі." msgstr[2] "Обрано %d каталогів з їхнім вмістом для передачі." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." @@ -6729,7 +7231,7 @@ msgstr[1] "Обрано %d каталоги." msgstr[2] "Обрано %d каталогів." -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6737,7 +7239,7 @@ msgstr[1] "Обрано %d файли для передачі." msgstr[2] "Обрано %d файлів для передачі." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" @@ -6745,7 +7247,7 @@ msgstr[1] "Обрано %d файли. Загальний розмір: %s" msgstr[2] "Обрано %d файлів. Загальний розмір: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" @@ -6753,49 +7255,49 @@ msgstr[1] "Обрано %d файли. Загальний розмір: Принаймні %s" msgstr[2] "Обрано %d файлів. Загальний розмір: Принаймні %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Обрано %s і %s для передачі." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Обраний %s і %s. Загальний розмір: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Обраний %s і %s. Загальний розмір: Принаймні %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Обраного редактора не існує." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Обраний файл уже редагується" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Обраний файл уже завантажений" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Обраний файл уже відкрито" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Обраний файл усе ще редагується" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Обраний фільтр працює лише з локальними файлами." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:434 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6804,47 +7306,47 @@ "сервера.\n" "Використовуйте закладки, типові для сайту цього сервера." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Обраний порт зазвичай використовується іншим протоколом." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "" "Надіслати FTP команди &перевірки наявності з'єднання підключення надсилання" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Send custom command to the server otherwise not available" msgstr "Надіслати настроювану команду на сервер" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Надсилання команди keep-alive" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:255 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Серійний номер:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "&Тип сервера:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Сервер неправильно завершив з'єднання TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Сервер не підтримує символи, які не належать до набору ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Сервер не підтримує відновлення файлів > %d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6853,15 +7355,19 @@ "Сервер не підтримує відновлення файлів > %d Гб. Завершення передачі, " "оскільки розміри файлів співпадають." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Сервер не підтримує відновлення файлів > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Сервер не підтримує відновлення файлів > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Ключ хоста сервера" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6870,7 +7376,7 @@ "Сервер може не підтримувати відновлення файлів > %d Гб. Завершення передачі, " "оскільки розміри файлів співпадають." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6878,11 +7384,25 @@ "Сервер може вимагати обліковий запис. Спробуйте уточнити обліковий запис, " "використовуючи Сайт Менеджер" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:459 +msgid "Server not sending proper line endings" +msgstr "Сервер не надсилає правильні закінчення рядка" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "Сервер запитав непідтримуваний алгоритм дайджест-автентифікації: %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "Сервер запитав непідтримувану якість захисту: %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "Сервер повернув порожній шлях." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6890,13 +7410,17 @@ "Сервер надіслав додаткову підказку входу. Вам потрібно скористатися " "інтерактивним типом входу." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/http/request.cpp:309 +msgid "Server sent data even before request headers were sent" +msgstr "Сервер надіслав дані перед надсиланням заголовків запиту" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Сервер надіслав пасивну відповідь з ІP-адресою без підтримки маршрутизації. " "Невдалий пасивний режим." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6904,36 +7428,50 @@ "Сервер надіслав пасивну відповідь з ІP-адресою без підтримки маршрутизації. " "Натомість використовується адреса сервера." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +msgid "Server sent too much data." +msgstr "Сервер надіслав занадто багато даних." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Сервер надіслав неочікувану відповідь." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "" +"Сервер надіслав несортований ланцюжок сертифікатів з порушенням специфікації " +"TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Сервер до клієнта MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Сервер до клієнтських символів:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "Тип &сервера:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Server/Local file" msgstr "Сервер/Локальний файл" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Сервер:" @@ -6941,49 +7479,54 @@ msgid "Session details" msgstr "Подробиці з'єднання" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:121 msgid "Set &Priority" msgstr "Встановити &пріоритет" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "Встановити дозволи '%s' до '%s'" +msgid "Setting permissions of '%s' to '%s'" +msgstr "Встановлення дозволів '%s' для '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:793 -msgid "SetSocketBufferSize called without socket" -msgstr "Встановлений розмір буферу сокета викликав без сокета" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Налаштування" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "Каталог налаштувань:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:150 +msgid "Sh&ow notification bubble" +msgstr "По&казати сповіщення" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Показати список &простих каталогів" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/menu_bar.cpp:171 msgid "Show &welcome dialog..." msgstr "Показати діалог &привітання..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Показати обидва дерева каталогів і продовжити порівняння?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Показати подробиці" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "Показати подробиці форматів настроюваних дати і часу" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:399 +msgid "Show in file &manager" +msgstr "Показати у файловому &менеджері" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:212 msgid "Shows available TLS ciphers" msgstr "Показати наявні шифри TLS" @@ -6991,7 +7534,7 @@ msgid "Shows this help dialog" msgstr "Показує цей діалог допомоги" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2773 msgid "Shutdown now" msgstr "Вимкнути негайно" @@ -6999,7 +7542,11 @@ msgid "Signature algorithm:" msgstr "Алгоритм підпису:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Реєстрація" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Введені дані &в Сайт Менеджер" @@ -7007,56 +7554,61 @@ msgid "Site Manager" msgstr "Сайт Менеджер" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "Сайт Менеджер - Неможливо запам'ятати пароль" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Сайт Менеджер - Згенерований ключ" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "Сайт Менеджер - Недійсні дані" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Сайт Менеджер вже відкрито" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Сайту не існує." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Шлях сайту повинен розпочинатися з 0 або 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Неправильно вказаний шлях до сайту." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Типові закладки" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -7065,11 +7617,11 @@ "Для збереження типових закладок використовуйте Сайт Менеджер.\n" "Додати поточне з'єднання до Сайт Менеджера?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Size" msgstr "Розмір" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Форматування розміру" @@ -7077,87 +7629,92 @@ msgid "Size unknown" msgstr "Розмір невідомий" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Пропустити файл" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Оминаємо завантаження %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Пропуск неіснуючого файлу ключа \"%s\"" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Оминаємо відвантаження %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Адреса сокету поза адресним простором" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Сокет уже з'єднано" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Сокет було вимкнуто" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Сокет не з'єднано" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Тип сокету не підтримується родиною адрес" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "Деякі файли усе ще редагуються або потребують оновлення." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." msgstr "" -"Деякі, неправильно сконфігуровані, віддалені сервери позаду свого " -"маршрутизатора, при відповіді, можуть видати свою локальну ІР адресу" +"Деякі неправильно сконфігуровані віддалені сервери позаду свого " +"маршрутизатора при відповіді можуть видати свою локальну ІР адресу." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Сортувати каталоги у тексті" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "Послідовність сортування неможливо змінити при порівнянні каталогів." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Сортування" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Спосіб &сортування:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Джерело і шлях операції drop ідентичні" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Вихідний і кінцевий файл не можуть бути одинаковими" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "Вихідна і кінцева операції drop ідентичні" @@ -7165,37 +7722,37 @@ msgid "Source file:" msgstr "Вихідний файл:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Обмеження швидкості" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Обмеження швидкості" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "Обмеження швидкості вимкнуто, клацніть, щоб змінити." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "Обмеження швидкості увімкнуто, клацніть, щоб змінити." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Стабільна і бета версії" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Лише стабільні версії" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Стабільна, бета і нічні версії" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Розпочати передачу &негайно" @@ -7203,19 +7760,21 @@ msgid "Start with opened Site Manager" msgstr "Розпочати з відкритим Сайт Менеджером" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Розпочато перевірку оновлення на %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Розпочинаємо завантаження %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Розпочинаємо відвантаження %s" @@ -7224,30 +7783,38 @@ msgid "Starts the local site in the given path" msgstr "Запускає локальний сайт за вказаним шляхом" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Штат, або провінція:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Status" msgstr "Статус" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Статус:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:111 msgid "Stop and remove &all" msgstr "Зупинити і вилучити &все" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Зупинити рекурсивну операцію" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Децентралізоване Хмарне Сховище" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Підтримка Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Вулиця:" @@ -7263,11 +7830,11 @@ msgid "Summary of test results:" msgstr "Підсумок результатів тесту:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2781 msgid "Suspend now" msgstr "Призупинити зараз" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7275,29 +7842,33 @@ "Даний вибір не зачіпає символічне посилання на файли, такі символічні " "посилання завжди видаляються." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Синхронізована навігація" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Синхронізовану навігацію вимкнуто." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Снинхронізація каталогів." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Помилка синтаксису" @@ -7306,44 +7877,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Помилка синтаксису у командній лінійці" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Система" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Подробиці системи" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Перевищено обмеження для відкритих файлів" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Невдала підсистема мережі системи" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/menu_bar.cpp:100 msgid "T&oolbar" msgstr "П&анель інструментів" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "З'єднання TLS встановлено, надсилається запит HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "З'єднання встановлено, очікуємо на вітальне повідомлення..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "З'єднання TLS встановлено." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:503 msgid "TTL expired" msgstr "Термін TTL вичерпано" @@ -7351,35 +7922,43 @@ msgid "Target file already exists" msgstr "Кінцевий файл уже існує" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Кінцевий файл:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "Ім'я кінцевого файлу вже існує!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "Ім'я кінцевого файлу вже існує, продовжувати далі?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "Тимчасова помилка у визначенні імені" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Успішне завершення тесту" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Результати тестування" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" -msgstr "Спроможність сервера до відновлення тестування." +msgstr "Спроможність сервера до відновлення тестування" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Наст&упні файли зараз редагуються:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Перед використанням Сайт Менеджера відновіть ЦП." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7389,7 +7968,7 @@ "Бажаєте продовжити? Будь-які зміни проведені в цьому Сайт Менеджері, в " "такому випадку, не будуть збереженими." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7397,29 +7976,37 @@ "Цей Сайт Менеджер відкритий в іншій версії FileZilla 3.\n" "Закрийте його, інакше ці дані неможливо буде видалити." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Введена вами адреса була: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Член параметру ai_family не підтримується" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Член параметру ai_socktype не підтримується" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Додати закладку неможливо." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Очистити закладки неможливо." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Сертифікат вимагає, щоб у своїй відповіді сервер включив статус OCSP, проте " +"статус OCSP відсутній." + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "З'єднання шифроване. Натисніть на іконку задля отримання подробиць." @@ -7441,34 +8028,39 @@ "Формат настроюваного часу недійсний, або містить непідтримувані визначники " "формату." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Передачу даних не вдається установити: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Неможливо знайти типового редактора текстових файлів." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Типовим редактором текстових файлів є '%s'." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "Введене ім'я фільтру вже існує, оберіть інше ім'я." +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Введені паролі не співпадають." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Розширення '%s' таки існує в цьому списку" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7477,8 +8069,9 @@ "Файл %s вже існує.\n" "Введіть нове ім'я:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7489,7 +8082,7 @@ "Неможливо знайти асоційовану програму (%s).\n" "Перевірте тип файлу асоціації." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7498,18 +8091,19 @@ "Файл '%s' містить ключ SSH1. Протокол SSH1 був вилучений. FileZilla " "підтримує лише ключі SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Файл '%s' неможливо завантажити, або він не містить приватного ключа." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Файл '%s' неможливо завантажити." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7518,8 +8112,9 @@ "Файл '%s' неможливо відкрити:\n" "У вашій системі жодна програма не асоціюється з даним типом файлів." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7528,8 +8123,8 @@ "Файл '%s' неможливо відкрити:\n" "Помилкова асоційована команда" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7540,7 +8135,7 @@ "Завантаження файлів новіших версій може спричинити втрату даних.\n" "Бажаєте продовжити?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7553,7 +8148,7 @@ msgid "The file selected as default editor does not exist." msgstr "Обраного файлу, як редактора по замовчувнню не існує." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7561,17 +8156,17 @@ "password will be imported.\n" "Continue with the import?" msgstr "" -"Обраний вами файл вміщує дані Сайт Менеджера згідно попередньої версії " +"Обраний вами файл містить дані Сайт Менеджера згідно попередньої версії " "FileZilla.\n" "У відповідності до різниці у форматі накопичення лише хост, порт, ім'я " "користувача і пароль будуть імпортованими.\n" "Продовжити імпорт?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Стовпець імен файлів не можна ані приховати, ані перемістити." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Стовпець імен файлів неможливо приховати." @@ -7585,19 +8180,19 @@ msgid "The following characters will be replaced: %s" msgstr "Дані символи буде замінено на: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Дані файли зараз редагуються:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Безкоштовне рішення FTP з відкритим вихідним кодом" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Згенерований ключ шифрування:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Глобальні закладки зберегти було неможливо." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7611,17 +8206,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Обмеження повинно бути у проміжку поміж 1 та 2000 MiB" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Неможливо створити локальний каталог '%s'." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Локального каталогу '%s' не існує." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7638,24 +8233,29 @@ "Найнижчий наявний порт повинен бути меншим або рівним найвищому наявному " "порту." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Довжина головного паролю повинна становити щонайменше 8 символів." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Нову версію завантажити було неможливо, спробуйте пізніше." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Нову версію було збережено у вашому каталозі завантажень." -#: ../../locales/../src/interface/QueueView.cpp:1823 +#: ../../locales/../src/interface/QueueView.cpp:1570 msgid "The queue will not be saved." msgstr "Чергу не буде збережено." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Віддаленого каталогу '%s' не існує." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7664,27 +8264,27 @@ "Віддалений каталог '%s' знаходиться поза межами вузла синхронізації (%s).\n" "Вимкнути синхронізовану навігацію і змінити віддалений каталог?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Обрані категорії імпортовано." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "" "Обраний файл вміщує дані, що придатні для імпорту в наступних категоріях:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Обраний файл уже знаходиться в процесі редагування:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "Обраний файл усе ще відкритий у сторонній програмі. Закрийте її." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7694,15 +8294,15 @@ "Це може становити небезпеку і пошкодити вашу систему.\n" "Ви дійсно бажаєте продовжити?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Додати сервер неможливо." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Сервер надіслав неочікувану, або неопізнану відповідь." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "" "Сервер використовує наступне кодування набору символів для імен файлів:" @@ -7715,7 +8315,7 @@ "Невідомий сертифікат сервера. Для того щоб довіряти серверу ретельно " "перевірте сертифікат." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7725,7 +8325,7 @@ "адміністратор змінив ключ хоста, або ви, насправді, намагаєтесь з'єднатись з " "іншим комп'ютером, який прикидається сервером." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7733,11 +8333,15 @@ "Ключ хоста сервера невідомий. У вас немає гарантії того, що даний сервер " "являє собою той комп'ютер, який ви мали на увазі." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Ім'я хоста сервера не збігається з іменем хоста сертифіката" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "Параметр servname не підтримується для ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7745,20 +8349,20 @@ "Налаштування імпортовано. Для того щоб усі налаштування вступили в дію, " "необхідно перезавантажити FileZilla." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Вказана родина адрес не підтримується" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Вказана мережа більше недоступна" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "The system will soon reboot unless you click Cancel." msgstr "" "Система незабаром перезавантажиться; для відміни натисніть кнопку Скасувати." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "The system will soon shut down unless you click Cancel." msgstr "Система незабаром вимкнеться; для відміни натисніть кнопку Скасувати." @@ -7770,28 +8374,28 @@ "Кінцевий файл вже існує.\n" "Оберіть дію." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Тест не досяг успіху. Ви дійсно бажаєте зберегти налаштування?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" -msgstr "Дійсний файл резервної копії '%s' неможливо відновити." +msgstr "Дійсний файл резервної копії '%s' неможливо відновити" #: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Теми" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Встановлений фільтр неможливо перемістити." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Встановлений фільтр не може бути переіменованим." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7815,45 +8419,43 @@ "Цей майстер допоможе вам правильно сконфігурувати будь-який ваш " "маршрутизатор чи файєрвол та перевірити їхню конфігурацію." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Time" msgstr "Час" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Форматування часу" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Час &очікування в секундах:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Час вичерпано" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Зсув часового поясу за сервером становить %d секунд." - -#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Назва:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Для того, щоб порівняти каталоги необхідно закрити швидкий пошук." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Для того, щоб порівняти каталоги, обидва списки файлів необхідно вирівняти." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Для того, щоб це зробити, необхідно, щоб обидва дерева каталогів були або " "показані, або приховані." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7861,7 +8463,7 @@ "Для підтримки автентифікації публічного ключа FileZilla повинен знати який " "приватний ключ використовувати." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7878,7 +8480,7 @@ "Зелений: Файл новіший від непозначеного файлу з іншого боку\n" "Червоний: Різниця в розмірі файлів" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7888,82 +8490,77 @@ "Якщо увімкнено, тоді переміщення по локальній ієрархії також буде змінювати " "каталог на сервері і навпаки." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Переключити обробку черги передачі" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Переключити відображення локального дерева каталогу" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Переключити відображення журналу повідомлень" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Переключити відображення віддаленого дерева каталогу" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Переключити відображення черги передачі" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:472 msgid "Too long header line" msgstr "Занадто довга лінійка заголовку" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Занадто багато перенаправлень" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Відстежити:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "Передача" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Напрямок &передачі" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/menu_bar.cpp:116 msgid "Transfer &type" msgstr "Тип &передачі" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Спосіб Передачі" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Черга передачі" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Налаштування передачі" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Під'єднання перервано: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Передані дані пошкоджено." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Передача" @@ -7971,27 +8568,27 @@ msgid "Transfers" msgstr "Передачі" -#: ../../locales/../src/interface/QueueView.cpp:2929 +#: ../../locales/../src/interface/QueueView.cpp:2655 msgid "Transfers finished" msgstr "Передачі завершено" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Трактувати файли &без розширення як файли ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Трактувати &наступні типи файлів, як файли ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "Довіряти зміненому ключеві хоста:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "Довіряти новому ключеві хоста:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Довіряти новому ключеві і продовжити з'єднання?" @@ -7999,70 +8596,76 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Довіряти цьому сертифікату і продовжити з'єднання?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Довіряти цьому хосту і продовжити з'єднання?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Повторити спробу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Тип" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Тип проксі FTP:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Тип загального проксі:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "Від&вантажити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Обмеження від&вантаження:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "При наявності, ви&користовувати асоціації типів файлів" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "В&икористати типові параметри системи для даної мови" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "КОРИСТУВАЧ@&ХОСТ" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:383 +#: ../../locales/../src/engine/proxy.cpp:512 #, c-format msgid "Unassigned error code %d" msgstr "Неініціалізоаний код помилки %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Модуль:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Невідомо" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Невідомий тип FTP проксі, неможливо згенерувати послідовність логінування." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:434 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Невідома версія протоколу SOCKS: %d" @@ -8071,11 +8674,22 @@ msgid "Unknown certificate" msgstr "Невідомий сертифікат" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Невідома помилка %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Невідома помилка %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Невідомий ключ хоста" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:442 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8083,14 +8697,18 @@ msgstr "" "Невідома версія протоколу обміну автентифікації SOCKS Користувач / Пароль: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" "Невідомий елемент вузла; не схоже, щоб даний файл був згенерованим FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:574 +msgid "Unknown transfer encoding" +msgstr "Невідоме кодування передачі" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8098,7 +8716,7 @@ "Якщо ці проблеми не будуть усунуті, активний режим FTP не працюватиме і " "необхідно використати пасивний режим." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8106,15 +8724,15 @@ "Якщо ця проблема не буде усунута, активний режим FTP не працюватиме і " "необхідно використати пасивний режим." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Непідтримуваний тип сертифікату" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Непідтримуване перескерування" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Від&вантажити і не редагувати" @@ -8123,96 +8741,105 @@ msgid "Updates" msgstr "Оновлення" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Відвантаження" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Невдале відвантаження" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "Обмеження відвантаження: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Обмеження відвантаження: жодного" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Відвантажити результати пошуку" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:326 msgid "Upload selected directory" msgstr "Відвантажити обрану директорію" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "Upload selected files and directories" msgstr "Відвантажити обрані файли і директорії" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Відвантажити даний файл назад на сервер?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Відвантажити даний файл на сервер?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Відвантаження" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Відвантаження та очікування видалення" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Відвантаження і відсутність редагування" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Використати &настроюваний набір шрифтів" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Використати &настроюваний редактор:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "Використати &типовий редактор для текстових файлів" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Використати &синхронізовану навігацію" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Використати сталі вирази" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Використати UTF-8 за умови його підтримки сервером, також використати " "локальний набір шрифтів." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Використати типову дію" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "Використовувати явне FTP через TLS, якщо доступно" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Використати сервер, що поточно під'єднаний до" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Використати сервер з Сайт Менеджера" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "Використати &типові параметри системи для даної мови" @@ -8229,7 +8856,7 @@ msgstr "Використати натомість зовнішню ІР адресу сервера" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8247,16 +8874,17 @@ "використовуєте активний режим вперше. На сервер передається лише версія " "FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Користувач:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "Ім'я користувача не може складатися з серії пробілів" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8275,51 +8903,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "Багатошарові журнали повідомлень від wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Перевірка сертифікату..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Дуже високий" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "Переглянути прихований набір опцій,проте не підтримуваних сервером" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Переглянути/Редагувати" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Видимі стовпці" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "Пи&сати" -#: ../../locales/../src/interface/QueueView.cpp:1665 -msgid "Waiting" -msgstr "Очікування" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Очікування на перегляд зв'язку" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Очікування на пароль" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Очікування на скасування передачі" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Очікування на повторну спробу..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Попередження,ігнорування з'єднання даних з неправильної ІР." @@ -8338,23 +8962,23 @@ "\n" "Ви дійсно бажаєте перевірити нічні збірки?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Попередження:Потенційна загроза безпеці!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Ласкаво просимо до FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Що нового" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Що нового:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8363,7 +8987,7 @@ "перепід'єднатися без потреби повторного введення паролю після перезапуску " "FileZilla." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8371,36 +8995,54 @@ "Якщо увімкнено, тоді символи, які не підтримуються локальною операційною " "системою в іменах файлів, при завантаженні таких файлів, замінюються." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "При запуску нового з'єднання під-час уже встановленого з'єднання:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Широкий екран" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Бажаєте, щоб FileZilla запам'ятовувала паролі?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "Пи&сати" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Неправильна зовнішня ІР адреса" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:646 msgid "Wrong line endings" msgstr "Неправильні закінчення лінійки" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Введено неправильний головний пароль, який не можна використати для " +"дешифрування збережених паролів." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Введено неправильний головний пароль, який не можна використати для " +"дешифрування цього елементу." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Жовтий" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Так" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8408,25 +9050,25 @@ "Схоже, що ви користуєтесь винятково хостом IPv6. Даний майстер не підтримує " "такого середовища." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Ви користуєтесь останньою версією FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Даний діалог завжди можна відкрити через меню допомоги." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Ви можете завантажити останню версію з веб сайту FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "" "Для того, щоб використати типовий порт, поле порта можна залишити порожнім." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8434,7 +9076,15 @@ "Ви можете використати значок x у будь-якій позиції, щоб зберегти дозвіл, " "яким володіють оригінальні файли." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Не можна окремо змінювати пароль і ключ шифрування за допомогою головного " +"пароля." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Ви не можете імпортувати власні налаштування каталогу FileZilla." @@ -8443,73 +9093,90 @@ "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." msgstr "" -"Не можна замінювати недійсний символ недійсним символом. Вставте дозволений " -"символ в іменах файлів." +"Не можна замінювати недійсний символ недійсним символом. Вставте символ, " +"дозволений в іменах файлів." + +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Неможливо відвантажити файли до кореневого каталогу." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "" -"Ви не ввели нове ім'я для цього файлу.Чи переписати цей файл натомість?" +"Ви не ввели нове ім'я для цього файлу. Бажаєте переписати цей файл натомість?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Ви обрали принаймні одне символічне посилання." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" -"Ви обрали більше, ніж 10 файлів для редагування; дійсно бажаєте продовжити?" +"Ви обрали більше, ніж 10 файлів для редагування. Дійсно бажаєте продовжити?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "" -"Ви обрали більше, ніж 10 файлів або каталогів для відкриття; дійсно бажаєте " -"продовжити?" +"Ви обрали більше, ніж 10 файлів або каталогів для відкривання дійсно. Дійсно " +"бажаєте продовжити?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." -msgstr "Необхідно ввести ім'я хосту." +msgstr "Необхідно ввести ім'я хоста." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" msgstr "Необхідно ввести шлях файла ключа" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Необхідно ввести локальний каталог." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Необхідно ввести віддалений каталог." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Необхідно ввести дійсну IPv4 адресу." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Необхідно ввести дійсний ключ шифрування" + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Необхідно ввести локальний каталог, придатний для запису." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "Необхідно ввести ім'я облікового запису" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "Необхідно вказати ім'я користувача" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "Схоже ваш маршрутизатор або файєрвол помилково змінили передані дані." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Потрібно ввести головний пароль." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Потрібно ввести ім'я для закладки." @@ -8517,7 +9184,7 @@ msgid "You need to enter a name for the log file." msgstr "Потрібно ввести ім'я для файлу журналу." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Потрібно ввести правильно залапковану команду." @@ -8530,16 +9197,16 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Потрібно ввести порт проксі в межах від 1 до 65535" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "" "Потрібно ввести принаймні один шлях; порожні закладки не підтримуються." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8547,7 +9214,7 @@ "Щоб увімкнути синхронізовану навігацію для цієї закладки, необхідно ввести " "як локальний, так і віддалений шляхи." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8555,23 +9222,31 @@ "Щоб увімкнути синхронізовану навігацію для цього сайту, необхідно ввести як " "локальний, так і віддалений шляхи." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Необхідно надати програмі FileZilla доступ до каталогів завантаження або " +"відвантаження файлів." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Потрібно вказати локальний файл." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Потрібно вказати віддалений файл." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Потрібно вказати віддалений шлях." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Потрібно визначити сервер." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8579,66 +9254,66 @@ "У вас не повинно виникнути проблем у з'єднанні з іншими серверами. Передачі " "файлів повинні працювати правильно." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2780 msgid "Your computer will suspend unless you click Cancel." msgstr "Ваш комп'ютер призупиниться, якщо не натиснути Скасувати." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "після" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "перед" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "починається з" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "байти" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "вміщує" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "додатково" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "не містить" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "не дорівнює" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "завершується з" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "дорівнює" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "файл" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-файл блокування" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8648,103 +9323,211 @@ "Переконайтесь, що він знаходиться у тому ж каталозі, що і головний " "виконуючий файл FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" -msgstr "fzsftp належить до іншої версії FileZilla." +msgstr "fzsftp належить до іншої версії FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "функцію fzsftp неможливо запустити" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj належить до іншої версії FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj неможливо запустити" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj неможливо запустити.\n" +"Переконайтесь, що даний виконуваний файл знаходиться у тому ж каталозі, що і " +"головний виконуваний файл FileZilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "функція gnutls_certificate_get_peers не повернула сертифікатів" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "невдале gnutls_pem_base64_encode2" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "більше, ніж" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "групове виконання" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "групове читання" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "груповий запис" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "є рівним з" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "встановлено" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "не встановлено" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "менше, ніж" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "співпадає з regex" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "нове ім'я" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "виконуване власником" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "читається власником" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "записується власником" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "невідомо" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "глобальне виконання" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "глобальне читання" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "глобальний запис" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxВіджети:" +#~ msgid "" +#~ "Malformed response: Server sent response body with a request verb or " +#~ "response code that disallows a response body." +#~ msgstr "" +#~ "Неправильний формат відповіді: сервер надіслав тіло відповіді з запитом " +#~ "дієслова або код відповіді, який не дозволяє тіло відповіді." + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "&Не пам'ятати паролів (рекомендовано)" + +#~ msgid "&Remember passwords" +#~ msgstr "&Пам'ятати паролі" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "Set permissions of '%s' to '%s'" +#~ msgstr "Встановити дозволи '%s' до '%s'" + +#~ msgid "Bucket ID not found" +#~ msgstr "Коду сегмента пам’яті не знайдено" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "Зсув часового поясу за сервером становить %d секунд." + +#~ msgid "Host key fingerprint:" +#~ msgstr "Головний ключ шифрування хосту:" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Неможливо завантажити панель Швидкого завантаження вихідного файлу" + +#~ msgid "Available sizes" +#~ msgstr "Наявні розміри" + +#~ msgid "Preview:" +#~ msgstr "Попередній перегляд:" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "Встановлений розмір буферу сокета викликав без сокета" + +#~ msgid "Filename &filters..." +#~ msgstr "Фільтри &імені файлу..." + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Неможливо імпортувати сертифікати вузла, невдалий імпорт сертифіката " +#~ "gnutls_x509" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Неможливо ініціалізувати структуру для сертифікатів вузла, невдала " +#~ "ініціалізація сертифіката gnutls_x509" + +#~ msgid "%d files added to queue" +#~ msgstr "%d файлів додано до черги" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Сканування файлів, що додаються до черги" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Сканування файлів до відвантаження" + +#~ msgid "Waiting" +#~ msgstr "Очікування" + +#~ msgid "&Disconnect from server" +#~ msgstr "&Від'єднати від сервера" + +#~ msgid "&Show message" +#~ msgstr "&Показати повідомлення" + +#~ msgid "Do ¬hing" +#~ msgstr "Нічого &не робити" + +#~ msgid "No more files in the queue!" +#~ msgstr "Чергу файлів вичерпано повністю!" + #~ msgid "Empty dirs to visit" #~ msgstr "Порожні каталоги для відвідин" #~ msgid "Connected" #~ msgstr "З'єднано" -#~ msgid "Deleting directories" -#~ msgstr "Видалення каталогів" - #~ msgid "Deleting multiple unrelated directories is not yet supported" #~ msgstr "Комплексне видалення непов'язаних каталогів не підтримується" @@ -8900,9 +9683,6 @@ #~ msgid "Failed to parse trusted root cert." #~ msgstr "Невдалий аналіз довіреного кореневого сертифікату" -#~ msgid "Root certificate is not trusted" -#~ msgstr "Ненадійний кореневий сертифікат" - #~ msgid "FTPES - FTP over explicit TLS/SSL" #~ msgstr "FTPES - FTP через визначений TLS/SSL" diff -Nru filezilla-3.15.0.2/locales/vi_VN.po filezilla-3.33.0/locales/vi_VN.po --- filezilla-3.15.0.2/locales/vi_VN.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/vi_VN.po 2018-04-27 13:04:09.000000000 +0000 @@ -1,15 +1,15 @@ # FileZilla translation for Vietnamese. # Bản dịch tiếng Việt dành cho FileZilla. -# Copyright (C) 2004-2015 Tim Kosse . +# Copyright (C) 2004-2017 Tim Kosse . # This file is distributed under the same license as the FileZilla package. -# Trần Ngọc Quân , 2008-2014, 2015. -# +# Trần Ngọc Quân , 2008-2014, 2015, 2016, 2017, 2018. +# msgid "" msgstr "" -"Project-Id-Version: filezilla 3.14.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-13 13:13+0100\n" -"PO-Revision-Date: 2015-12-31 07:19+0700\n" +"Project-Id-Version: filezilla 3.31.0\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-04-27 14:20+0200\n" +"PO-Revision-Date: 2018-04-07 14:06+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi_VN\n" @@ -22,18 +22,18 @@ "X-Generator: Gtranslator 2.91.7\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "Đã được %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "Còn %H:%M:%S" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " @@ -42,202 +42,206 @@ "%a - Tài khoản (Các dòng chứa nó sẽ bị bỏ qua nếu không dùng kiểu đăng nhập " "bằng Tài khoản)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d thư mục" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d thư mục cùng với nội dung của chúng" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d tập tin" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d tập tin. Tổng kích thước: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d tập tin. Tổng kích thước: Ít nhất %s" -#: ../../locales/../src/interface/QueueView.cpp:2778 -#, c-format -msgid "%d files added to queue" -msgstr "%d tập tin được thêm vào hàng đợi" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d giây" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - Máy chủ" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu thư mục" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu tập tin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - Mật khẩu" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Chứng nhận đã hết hạn!" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Vẫn chưa hợp lệ!" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - Tài khoản máy chủ ủy nhiệm" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s và %s. Kích thước tổng cộng: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s và %s. Kích thước tổng cộng: Ít nhất %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s byte" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"Không tìm thấy %s. Không có thành phần này của FileZilla, SFTP sẽ không thể " +"Không tìm thấy %s. Không có thành phần này của FileZilla, %s sẽ không thể " "hoạt động.\n" "\n" "Làm ơn tải lại FileZilla. Nếu vấn đề không được giải quyết, hãy báo lỗi tới " "chúng tôi." -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"Không tìm thấy %s. Không có thành phần này của FileZilla, SFTP sẽ không hoạt " +"Không tìm thấy %s. Không có thành phần này của FileZilla, %s sẽ không hoạt " "động.\n" "\n" "Cách giải quyết có thể là:\n" -"- Đảm bảo rằng %s đang ở trong danh sách thư mục tại đường dẫn với biến môi " -"trường.\n" -"- Đặt đường dẫn đầy đủ của %s trong biến môi trường FZ_FZSFTP." +"- Đảm bảo rằng %s đang ở trong danh sách thư mục tại biến môi trường PATH " +"của bạn.\n" +"- Đặt đường dẫn đầy đủ của %s trong biến môi trường %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s với %d bít" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - Tên máy của máy chủ không khớp với tên trong chứng nhận" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - Tài khoản" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - Mật khẩu máy chủ ủy nhiệm" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "&Bãi bỏ kết nối trước đó và kết nối vào tab hiện hành." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "&About..." msgstr "&Giới thiệu…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "Tà&i khoản:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" -msgstr "Kích &hoạt" +msgstr "&Tích cực" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/menu_bar.cpp:154 msgid "&Add bookmark..." msgstr "&Thêm đánh dấu…" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "&Thêm thư mục…" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:10 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:56 msgid "&Add files to queue" msgstr "&Thêm tập tin vào hàng đợi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." msgstr "&Thêm tập tin khóa…" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:266 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "&Add to queue" msgstr "&Thêm vào hàng đợi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "Chỉnh sửa độ &lệch với múi giờ máy chủ:" @@ -245,76 +249,81 @@ msgid "&Always trust certificate in future sessions." msgstr "&Luôn tin giấy phép trong những lần làm việc sau." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "&Luôn tin máy chủ này, thêm khóa này vào bộ nhớ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "&Luôn dùng trình soạn thảo mặc định" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "" "&Luôn dùng chương trình đã chọn cho các tập tin chưa có ứng dụng tiếp nhận" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "&Luôn dùng hành động này" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "&Lấy địa chỉ IP từ hệ điều hành của bạn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:364 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 +#: ../../locales/../src/interface/menu_bar.cpp:118 msgid "&Auto" msgstr "&Tự động" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "&Tự dò tìm" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "Mà&u nền:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:372 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 +#: ../../locales/../src/interface/menu_bar.cpp:120 msgid "&Binary" msgstr "Nhị &phân" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "Tiền tố &nhị phân dùng ký hiệu hệ SI. (ví dụ 1 KB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/menu_bar.cpp:151 msgid "&Bookmarks" msgstr "&Dấu trang" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "&Duyệt…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "&Khoảng chấp nhận:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "&Thôi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Clear private data..." msgstr "&Xóa các dữ liệu riêng…" @@ -322,172 +331,172 @@ msgid "&Close" msgstr "Đó&ng" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:158 msgid "&Close FileZilla" msgstr "Đón&g FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:170 +msgid "&Close FileZilla once" +msgstr "Đón&g FileZilla một lần" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Configure speed limits..." msgstr "Đặt giới hạn tố&c độ…" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/menu_bar.cpp:129 msgid "&Configure..." msgstr "&Cấu hình…" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "&Kết nối" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../locales/../src/interface/menu_bar.cpp:50 msgid "&Copy current connection to Site Manager..." msgstr "&Chép kết nối hiện tại vào Quản lý địa chỉ…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "&Copy to clipboard" msgstr "&Chép vào clipboard" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:29 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:69 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&Create directory" msgstr "Tạo thư mụ&c" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:404 msgid "&Create new tab" msgstr "&Tạo tab mới" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:182 msgid "&Debug" msgstr "&Gỡ lỗi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "&Gỡ lỗi bằng sổ nhật ký:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "Trình soạn thảo &mặc định:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/menu_bar.cpp:113 msgid "&Default file exists action..." msgstr "Hành động &mặc định khi tập tin đã có sẵn…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "Thời gian &nghỉ giữa các lần đăng nhập sai:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:41 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Xóa bỏ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "&Xóa liên kết mềm" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "&Directory access permissions..." +msgstr "Quyền truy cập thư &mục…" + +#: ../../locales/../src/interface/menu_bar.cpp:86 msgid "&Directory comparison" msgstr "So sánh &thư mục" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "Tắt &duyệt đồng bộ và tiếp tục thay đổi thư mục nội bộ" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "Tắt &duyệt đồng bộ và tiếp tục thay đổi thư mục máy chủ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "" "&Loại bỏ tập tin trên máy nội bộ sau đó tải và biên tập một tập tin một lần " "nữa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/menu_bar.cpp:143 msgid "&Disconnect" msgstr "&Ngắt kết nối" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "Máy chủ &ngắt kết nối" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Hiển thị tốc độ truyền hiện tại thay vì tốc độ trung bình" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "&Hiển thị kích thước tính theo byte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "&Không lưu mật khẩu (nên dùng)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "&Không hiển thị hộp thoại này lần sau nữa." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "&Không dùng địa chỉ IP mạng cho kết nối nội bộ." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "Hành động khi bấm đú&p chuột vào tập tin:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:51 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:261 msgid "&Download" msgstr "Tải &xuống" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "Tải &xuống:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "&Download..." msgstr "Tải &xuống…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "Tải &xuống:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:24 +#: ../../locales/../src/interface/menu_bar.cpp:68 msgid "&Edit" -msgstr "&Biên tập" +msgstr "&Sửa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "Chỉnh &sửa qui tắc lọc…" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/menu_bar.cpp:89 +#: ../../locales/../src/interface/menu_bar.cpp:128 msgid "&Enable" msgstr "&Bật" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "&Cho phép nén" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "&Bật giới hạn tốc độ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "&Bộ mã:" @@ -495,64 +504,76 @@ msgid "&Encryption:" msgstr "&Mã hóa:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:192 msgid "&Enter custom command..." msgstr "&Nhập vào dòng lệnh của bạn…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "&Thiết lập kết nối trong một tab mới" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "&Thực hiện" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "&Xuất ra các đề mục từ Quản lý địa chỉ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:359 +#: ../../locales/../src/interface/menu_bar.cpp:57 msgid "&Export..." msgstr "&Xuất ra…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "&Quay lại chế độ tích cực" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../locales/../src/interface/menu_bar.cpp:44 msgid "&File" msgstr "&Chính" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "&File Attributes..." msgstr "&Thuộc tính tập tin…" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "&File permissions..." msgstr "&Quyền truy cập tập tin…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "&Tập tin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "Điều kiện &lọc:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "Đặt bộ &lọc:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "Bộ &lọc" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "Bộ &lọc:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "&Hoàn tất biên tập và xóa tập tin trên máy nội bộ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "" +"&Làm phẳng đường dẫn máy nội bộ, tải lên tất cả các tập tin chứa bên trong " +"vào thư mục đích" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -560,151 +581,159 @@ "&Làm phẳng đường dẫn máy mạng, tải tất cả các tập tin chứa bên trong vào thư " "mục đích" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "&Theo liên kết mềm, xóa nội dung thư mục đích" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "&Lấy địa chỉ IP từ URL sau đây:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/menu_bar.cpp:172 msgid "&Getting help..." msgstr "&Tìm trợ giúp…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "&Dấu trang toàn cục" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 dùng phương thức CONNECT" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/menu_bar.cpp:162 msgid "&Help" msgstr "&Trợ giúp" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:318 +#: ../../locales/../src/interface/menu_bar.cpp:94 msgid "&Hide identical files" msgstr "Ẩ&n các tập tin đồng nhất" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:123 msgid "&Highest" msgstr "Cao n&hất" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "Cổng cao n&hất có thể:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "Máy c&hủ:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "Tiền tố nhị phân theo chuẩn &IEC (ví dụ 1 KiB = 1024 byte)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "Tiêu chuẩn &ISO 8601 (ví dụ: 2007-09-15)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../locales/../src/interface/menu_bar.cpp:58 msgid "&Import..." msgstr "&Nhập vào…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" -msgstr "Kế thừa các kiểu tập t&in của hệ thống" +msgstr "Kế thừa các ràng buộc xử lý k&iểu tập tin từ hệ thống" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" msgstr "&Cài đặt phiên bản mới" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "&Giữ cấu trúc đường dẫn máy nội bộ tương đối để tìm kiếm thư mục gốc" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "&Giữ cấu trúc đường dẫn máy mạng tương đối để tìm kiếm thư mục gốc" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "Tập tin &khóa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "&Cách bố trí bảng chứa tập tin và thư mục:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "Giới hạn cổng trên máy nội bộ dùng bởi FileZi&lla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "&Giới hạn kết nối đồng thời" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/menu_bar.cpp:103 msgid "&Local directory tree" msgstr "&Cây thư mục trên máy nội bộ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "&Thư mục máy nội bộ:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "Tìm kiếm nội &bộ" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "Ghi nhật &ký vào tập tin" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "Kiểu đăng &nhập:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "Kiểu đăng &nhập:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 msgid "&Low" msgstr "Mức thấ&p" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/menu_bar.cpp:156 msgid "&Manage bookmarks..." msgstr "&Quản lý dấu trang…" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/menu_bar.cpp:133 msgid "&Manual transfer..." msgstr "Truyền thủ &công…" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "Số kết nối &tối đa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "Số lần thử lại &tối đa:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/menu_bar.cpp:102 msgid "&Message log" msgstr "&Nhật ký" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "Thu n&hỏ đặt ở trên khay đồng hồ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "Tê&n chế độ xắp xếp:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "Tê&n:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 +#: ../../locales/../src/interface/menu_bar.cpp:69 msgid "&Network configuration wizard..." msgstr "Giúp đỡ kết &nối trực quan…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "Tạo &mới" @@ -712,7 +741,7 @@ msgid "&New Site" msgstr "Địa chỉ &mới" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "Đã có bả&n mới!" @@ -720,154 +749,165 @@ msgid "&Next >" msgstr "&Tiếp theo >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "Khô&ng" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:146 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "Khô&ng" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Normal" msgstr "Bì&nh thường" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "Giá trị bằ&ng số:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "Đồn&g ý" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "&MỞ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:20 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:335 msgid "&Open" msgstr "&Mở" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "&Ghi đè" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "&Thụ động" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "Mật khẩ&u:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:166 msgid "&Play sound" msgstr "&Mở một đoạn âm thanh" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "Cổn&g:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/menu_bar.cpp:123 msgid "&Preserve timestamps of transferred files" msgstr "Lưu &giữ dấu thời gian của tập tin đã truyền" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "&Hàng đợi" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "&Kết nối nhanh" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/menu_bar.cpp:101 msgid "&Quickconnect bar" msgstr "&Thanh kết nối nhanh" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "Lịch sử &kết nối nhanh" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "Đọ&c" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/menu_bar.cpp:141 msgid "&Reconnect" msgstr "Kết nối &lại" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "Thông tin kết nối &lại" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 +#: ../../locales/../src/interface/menu_bar.cpp:80 msgid "&Refresh" msgstr "&Làm tươi lại" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "N&hớ mật khẩu chính cho đến khi FileZilla được đóng lại" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "N&hớ mật khẩu cho đến khi FileZilla được đóng lại" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "Nhớ mật khẩ&u?" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "&Thư mục máy mạng:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "Đường &dẫn máy mạng:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "Tìm kiếm trên máy &mạng" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "&Xóa bỏ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "&Xóa bỏ khóa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:115 msgid "&Remove selected" msgstr "&Xóa mục đã chọn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:89 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:353 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "Đổi tê&n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "Đổi tê&n…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "Mở &lại tập tin trên máy nội bộ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "&Thay thế ký tự không hợp lệ bằng:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/menu_bar.cpp:173 msgid "&Report a bug..." msgstr "&Báo cáo lỗi…" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:154 +msgid "&Request attention" +msgstr "&Yêu cầu chú ý" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "&Reset and requeue all" msgstr "Đặt &và xếp lại toàn bộ hàng đợi" @@ -875,39 +915,39 @@ msgid "&Restart Wizard" msgstr "&Khởi động lại thuật sĩ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "&Phục hồi lại" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:162 msgid "&Run command..." msgstr "&Thực hiện lệnh…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "&Chạy cấu hình thuật sĩ bây giờ…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "&Chạy kiểm tra cập nhật bây giờ…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "&ĐỊA CHỈ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "&Ghi lại bằng tên mới…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "&Tìm kiếm" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "&Search remote files..." msgstr "&Tìm kiếm tập tin từ máy mạng…" @@ -915,203 +955,217 @@ msgid "&Select Entry:" msgstr "&Chọn mục tin:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "&Chọn ngôn ngữ:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "&Chọn các cột sẽ hiển thị:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/menu_bar.cpp:136 msgid "&Server" msgstr "&Máy chủ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "&Cài đặt" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "&Settings..." msgstr "&Cài đặt…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "&Hiển thị trình đơn gỡ rối" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 msgid "&Show detailed log" msgstr "&Hiển thị chi tiết nhật ký" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "&Hiển thị thông điệp" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "&Hiển thị dấu thời gian trong nhật ký thông tin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "Các &mục Danh bạ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "&Site Manager..." msgstr "&Quản lý Địa chỉ…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "&Gắn với trang mạng" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "Bỏ &qua" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/menu_bar.cpp:126 msgid "&Speed limits" msgstr "&Giới hạn tốc độ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "Bắt đầu truyền ngay &lập tức" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "&Hoán đổi cửa sổ điều khiển máy trên máy nội bộ và máy mạng" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:211 msgid "&TLS Ciphers" msgstr "Kiểu mã hóa &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "Kiểm &tra" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "&Kiểu dáng cửa sổ:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/menu_bar.cpp:108 msgid "&Transfer" msgstr "&Truyền" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "Chế độ &truyền:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/menu_bar.cpp:105 msgid "&Transfer queue" msgstr "Hàng đợi &truyền" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "" "Xử lý do&tfiles (tên tập tin bắt đầu với dấu chấm) như là tập tin ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "&Tin giấy phép này trên máy mạng thay thế đã liệt kê." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "&Không biên tập" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "&Cập nhật bộ nhớ đệm khóa cho máy chủ này" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 msgid "&Upload" msgstr "Tải &lên" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "Tải &lên:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 +msgid "&Upload..." +msgstr "Tải &lên…" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "Tải &lên:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "&Dùng chương trình riêng" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "Dùng d&uyệt đồng bộ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "&Dùng trình soạn thảo tập tin văn bản mặc định của hệ thống." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "Dùng địa chỉ IP sa&u đây:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "&Dùng địa chỉ IP máy chủ để thay thế" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "Dùng dấ&u ngăn cách mỗi nghìn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "&Tài khoản:" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "Tên tài kh&oản:" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "&Phiên bản %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/menu_bar.cpp:78 msgid "&View" -msgstr "&Trình bày" +msgstr "&Xem" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:384 msgid "&View/Edit" -msgstr "&Trình bày/Biên tập" +msgstr "&Xem/Sửa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "&Theo dõi các tập tin đã được biên tập và nhắc tải lên khi bị sửa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "&Khi kiểm tra cập nhật phiên bản mới, kiểm tra mỗi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "&Ghi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "Đồn&g ý" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "“%s” chưa tạo ra hoặc không thể truy nhập." -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "“%s” không phải một thư mục." -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "“%s” không phải một giao thức được hỗ trợ." + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "Kiểu “tài khoản” đăng nhập không được hỗ trợ bởi giao thức đã chọn" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1119,7 +1173,7 @@ "Kiểu đăng nhập “Thông thường” và “ Tài khoản” không sẵn sàng, đang dùng “Hỏi " "mật khẩu” để thay thế." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1127,7 +1181,7 @@ "Kiểu đăng nhập “Thông thường” và “ Tài khoản” không sẵn sàng. Mục này được " "thay đổi thành “Hỏi mật khẩu”." -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1137,57 +1191,57 @@ "đối số sau dấu nháy kép tới máy chủ. Bạn có thể muốn nhập lệnh thô mà không " "cần dấu trích dẫn “ngoặc kép”." -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(lọc ra %d đối tượng)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(đã tải về %u%%)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 nghĩa là không giới hạn)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 giây)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 là tắt)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(app-compat được đặt thành %d.%d)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(ví dụ: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(ví dụ: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(trong %s/s)" @@ -1196,7 +1250,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "còn --:--:--" @@ -1216,31 +1270,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s không thể dùng cùng nhau với một địa chỉ FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - Không" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - Cảnh báo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - Thông tin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - Chi tiết" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "Hệ thống 32-bít" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 – Gỡ lỗi" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "Hệ thống 64-bít" @@ -1248,23 +1302,28 @@ msgid "< &Back" msgstr "< &Quay lại" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/menu_bar.cpp:160 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" "Dấu trang nhập vào đã có từ trước rồi. Xin hãy nhập một cái tên chưa dùng." +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "" +"Giấy chứng nhận trong chuỗi xích đã được ký bằng một thuật toán không an toàn" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "Một trình soạn thảo mặc định phải được đặt." -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Một thư mục không thể kéo thả vào trong thư mục con của chính nó." @@ -1278,20 +1337,20 @@ "bạn có thể phải dùng chế độ tích cực. Trong chế độ tích cực, FileZilla mở " "một cổng và yêu cầu máy chủ kết nối với nó." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "Tập tin mở trước đó đã bị thay đổi." -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "Tập tin với tên đó đang truyền đi." -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "Tập tin đó vẫn đang bị biên tập. Làm ơn đóng nó lại và thử lại." -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1306,11 +1365,20 @@ "sách.\n" "Không có thêm thông tin cảnh báo sẽ hiển thị trong lần làm việc này." -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "" +"Việc mất mật khẩu chính là không thể lấy lại được! Vui lòng nhớ thật kỹ mật " +"khẩu của mình." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "Đã có phiên bản FileZilla mới hơn:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1319,7 +1387,7 @@ "máy chủ giấu thông tin từ người dùng. Dùng tùy chọn này để hiển thị tất cả " "các tập tin." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1327,7 +1395,7 @@ "Một máy chủ đúng qui cách không yêu cầu điều này. Hỏi người quản trị máy chủ " "này nếu bạn cần điều đó." -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1335,17 +1403,17 @@ "Một thao tác đang thực hiện và chức năng duyệt đồng bộ đang được bật.\n" "Bạn có muốn tắt chức năng duyệt đồng bộ và tiếp tục đổi thư mục?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:368 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 +#: ../../locales/../src/interface/menu_bar.cpp:119 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "&Thêm" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "&Cho phép phục hồi tập tin ASCII" @@ -1357,51 +1425,53 @@ msgid "A&pply only to uploads" msgstr "Chỉ chấ&p nhận tải lên" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "Chấ&p nhận tất cả các tập tin và thư mục" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:252 msgid "A&utomatically remove successful transfers" msgstr "Tự độn&g xóa các chuyển tác thành công" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "Giới thiệu về FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "Trên danh sách tập tin" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "Truy cập vào một số thư mục nội bộ có thể không thể phục hồi lại:" + +#: ../../locales/../src/engine/server.cpp:614 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "Tài khoản" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 msgid "Action after queue &completion" msgstr "Thao tá&c sau khi hàng đợi hoàn thành" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "Thao tác trên tập tin đã chọn:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "Hành động thực hiện:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "Thực hiện:" @@ -1409,7 +1479,7 @@ msgid "Active mode" msgstr "Chế độ tích cực" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1417,7 +1487,7 @@ "Kiểm tra chế độ FTP tích cực gặp lỗi. FileZilla không biết địa chỉ IP chính " "xác." -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1426,7 +1496,7 @@ "xác. Thêm vào đó, bộ định tuyến router của bạn đã chỉnh sửa địa chỉ truyền " "đi." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1436,38 +1506,39 @@ "nhưng bộ định tuyến router hay tường lửa firewall đã chỉnh sửa sai địa chỉ " "truyền đi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "Kích hoạt ở chế độ IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "Chỉ thêm tập tin vào &hàng đợi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:331 msgid "Add selected directory to the transfer queue" msgstr "Đặt thư mục đã chọn vào hàng đợi truyền" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 msgid "Add selected files and folders to the transfer queue" msgstr "Đặt tập tin và thư mục đã chọn vào hàng đợi truyền" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "Thêm vào hàng đợi" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:509 msgid "Address type not supported" msgstr "Kiểu địa chỉ không được hỗ trợ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "Cao cấp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1481,15 +1552,16 @@ "thể không làm việc như mong muốn và có thể làm hỏng cả hệ thống của bạn. Bạn " "phải tự chịu trách nhiệm khi dùng bản thử nghiệm và bản biên dịch hàng ngày." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "&Luôn dùng hành động này" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "Thuật toán:" -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2663 msgid "All files have been successfully transferred" msgstr "Tất cả các tập tin được truyền đi thành công" @@ -1497,14 +1569,14 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Tất cả các cổng phải nằm giữa 1024 và 65535." -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2659 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "" "Tất cả các việc truyền đã hoàn thành. %d tập tin không thể truyền được" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "Cho phép &quay lại chế độ cũ khi truyền thất bại" @@ -1512,16 +1584,16 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Cho phép quay lại chế độ cũ khi truyền thất bại" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "Đã có kết nối sẵn dùng" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Tên thay thế:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1529,7 +1601,7 @@ "Bạn có thể lựa chọn công cụ Pageant từ PuTTY để quản lý các khóa, FileZilla " "có thể dùng Pageant." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1537,7 +1609,7 @@ "Bạn có thể lựa chọn là dùng SSH của hệ thống. Để làm được như vậy, xin chắc " "chắn rằng biến môi trường SSH_AUTH_SOCK phải được đặt." -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" @@ -1545,7 +1617,7 @@ "Thay vì thế, bạn cũng có thể tải phiên bản mới nhất về từ trang thông tin " "điện tử của FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1908 +#: ../../locales/../src/interface/QueueView.cpp:1667 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1554,7 +1626,7 @@ "Đã xảy ra lỗi khi tải lên hàng đợi từ \"%s\".\n" "Một số phần tử hàng đợi có lẽ không phục hồi được." -#: ../../locales/../src/interface/QueueView.cpp:1818 +#: ../../locales/../src/interface/QueueView.cpp:1559 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1563,79 +1635,84 @@ "Đã xảy ra lỗi khi ghi lại hàng đợi thành \"%s\".\n" "Một số phần tử hàng đợi có lẽ không được ghi lại." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "" +"Một người phát hành trong chuỗi móc xích không phải là người có quyền chứng " +"nhận" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "Một mục cùng tên với mục kéo thả đã sẵn có trong vị trí đích." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "Nặc danh" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "Thao tác khác đang tiến hành, không thể thay đổi thư mục vào lúc này." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "" "Bất kỳ thay đổi nào tạo tại Quản Lý Địa Chỉ cũng không thể được ghi lại." -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "Bất kỳ thay đổi nào tới bộ lọc cũng không thể được ghi lại." -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "Bất kỳ thay đổi nào tới các bộ lọc sẽ không được ghi lại." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "Chỉ á&p dụng cho các thư mục" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "Áp dụng" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "&Chỉ áp dụng cho hàng đợi hiện hành" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "Chỉ áp dụng cho các tập &tin" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "Kho lưu" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "Bộ đệm tham số bị tràn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "Như một tab trong bảng điều khiển của hàng đợi truyền" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "Hỏi thao tác" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:605 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "Hỏi mật khẩu" @@ -1647,7 +1724,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Lấy địa chỉ IP từ hệ điều hành của bạn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "Hỏi tại diễn đàn FileZilla" @@ -1655,7 +1732,7 @@ msgid "Associated program not found:" msgstr "Chương trình thành phần không tìm thấy:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "Có ít nhất một bộ lọc chưa hoàn thiện" @@ -1663,99 +1740,106 @@ msgid "At this point, all required information has been gathered." msgstr "Tại điểm này, tất cả các thông tin yêu cầu đã được thu thập." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "Thuộc tính" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "Không đúng thẩm quyền." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "Tác giả:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "Tự động" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "Tự động phân loại kiểu tập tin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "Kích thước cho phép" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B " -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "Bằng cách dùng chủ ủ&y nhiệm" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "Bộ mô tả tập tin sai" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "Cách dùng cơ bản" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "Cách xử lý" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "Đang được sửa chữa" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "Cẩn thận! Giấy chứng nhận đã bị thu hồi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "Nhị phân" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "Bảng đen" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "Xanh dương" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:434 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "Dấu trang" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "Dấu trang:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "Dấu trang" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "Duyệt…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Bucket không tìm thấy" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "Ngày biên dịch:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "Thông tin biên dịch" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "Phạm trù được làm:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1765,97 +1849,113 @@ "tích cực. Nếu bạn muốn giới hạn FileZilla chỉ dùng một vùng cổng nhỏ, xin " "hãy nhập vào vùng cổng bên dưới." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/menu_bar.cpp:138 msgid "C&ancel current operation" msgstr "&Hủy công việc hiện hành" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "C&lear all" msgstr "&Xóa tất cả" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:93 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:289 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:390 msgid "C&opy URL(s) to clipboard" msgstr "Sa&o chép URL vào clipboard" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "C&opy URL(s) with password to clipboard" +msgstr "Sa&o chép URL cùng với mật khẩu vào clipboard" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "&Người dùng" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "Ràng buộc xử lý kiể&u tập tin với ứng dụng cụ thể:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "Tính năng CPU:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "Đang tính toán múi giờ của máy chủ dịch vụ…" -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "Không thể đọc từ tập tin" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "Không thể ghi dữ liệu vào tập tin." -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "Không thể ghi dữ liệu vào tập tin: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "Thôi" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "Hủy lệnh hiện hành" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "Hủy công việc hiện hành" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "Không thể truy cập “%s”,không có đĩa hay ổ đĩa không sẵn sàng." -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "Không thể thêm địa chỉ máy chủ vào Danh bạ" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "Không thể gán địa chỉ đã yêu cầu" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "" +"Không thể đổi thư mục, ở đây đã sẵn có thao tác duyệt đồng bộ đang được thực " +"hiện." + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1863,7 +1963,7 @@ "Không thể đóng tab khi nó đang làm việc.\n" "Hủy thao tác hiện hành và đóng tab lại?" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1875,22 +1975,23 @@ msgid "Cannot create new filter" msgstr "Không thể tạo bộ lọc mới" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "Không thể sửa tập tin" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "Không thể sửa tập tin, không kết nối tới máy chủ nào." -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "Không sửa tập tin được vì không tìm thấy địa chỉ máy chủ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1898,82 +1999,81 @@ "Không thể thiết lập kết nối FTP tới máy chủ SFTP. Làm ơn chọn giao thức một " "cách đúng đắn." -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "Không thể tải thanh công cụ Kết Nối Nhanh từ tập tin nguồn" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "Không thể tải tập tin khóa" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "Không thể tải thanh công cụ từ tập tin nguồn" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "Không thể lưu mật khẩu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "Không thể đổi tên đề mục" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "Không thể đổi tên tập tin" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:136 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Không thể phân giải tên máy chủ sang địa chỉ IPv4 để dùng cho máy chủ ủy " "nhiệm SOCKS4." -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "Không thể ghi lại bộ lọc" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "Không thể chọn bộ lọc" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "Không thể đặt ứng dụng ràng buộc xử lý tập tin" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "Không thể hiển thị hộp thoại" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "Không thể xem/sửa tập tin đã chọn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "Không phân biệt HOA/thường" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "Không phân biệt HOA/thường" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "Không phân biệt HOA/thường (mặc định)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "Phân biệt HOA/thường" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "Phân biệt HOA/thường (mặc định)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "Thể loại muốn xóa" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "Dữ liệu chứng nhận và phiên làm việc vẫn chưa có giá trị." @@ -1985,36 +2085,40 @@ msgid "Certificate issuer" msgstr "Người chứng thực" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "Gặp lỗi khi thẩm tra chữ ký chứng nhận" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "Việc khó khăn:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "Thay đổi thuộc tính tập tin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:298 msgid "Change the file permissions." msgstr "Thay đổi quyền truy cập tập tin." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Sửa tập tin nhật ký cần phải khởi động lại FileZilla" -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "Dạng ký tự mã hóa" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "Tên bảng mã" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for &updates..." msgstr "Kiểm tra phiên bản &mới…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "Kiểm tra &cập nhật FileZilla tự động:" @@ -2022,15 +2126,15 @@ msgid "Check for Updates" msgstr "Kiểm tra phiên bản mới" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/menu_bar.cpp:167 msgid "Check for newer versions of FileZilla" msgstr "Kiểm tra phiên bản mới hơn của FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "Kiểm tra phiên bản mới gặp lỗi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2038,7 +2142,7 @@ "Kiểm tra các giấy ủy nhiệm đăng nhập của bạn. Mật khẩu đã nhập vào bắt đầu " "hoặc kết thúc bằng ký tự khoảng trắng." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2046,39 +2150,39 @@ "Kiểm tra các giấy ủy nhiệm đăng nhập của bạn. Tài khoản đã nhập vào bắt đầu " "hoặc kết thúc bằng ký tự khoảng trắng." -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "Kiểm tra địa chỉ IP" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." msgstr "Đang kiểm tra phiên bản mới…" -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "Tổng kiểm trên tập tin %s khớp\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Tổng kiểm trên tập tin %s không khớp\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "Chọn tập tin khóa" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "Chọn thư mục nội bộ mặc định" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "Chọn thư mục nội bộ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:670 msgid "Chunk data improperly terminated" msgstr "Tổng kiểm tra dữ liệu tận cùng không đúng" @@ -2086,55 +2190,63 @@ msgid "Cipher:" msgstr "Kiểu mã hóa:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:408 +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Cl&ose tab" msgstr "Đón&g tab lại" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "Cổ điển" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "Clear &layout cache" msgstr "Xóa bộ đệm &giao diện" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +msgid "Clear auto&update data" +msgstr "Xóa dữ liệu lư&u phần cập nhật" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "Xóa lịch sử lệnh" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "Xóa dữ liệu lưu trong máy" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "Xóa thanh công cụ kết nối nhanh" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." -msgstr "Bấm vào nút Hoàn tất để ghi lại thông tin cấu hình." +msgstr "Bấm vào nút \"Hoàn tất\" để ghi lại thông tin cấu hình." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "Máy khách kết nối tới máy chủ MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "Kiểu mã hóa từ máy khách tới máy chủ:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "Đóng" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:411 msgid "Close &all other tabs" msgstr "Đóng tất cả các t&ab khác" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "Close FileZilla" msgstr "Đóng FileZilla" @@ -2142,103 +2254,108 @@ msgid "Close all running instances of FileZilla" msgstr "Đóng tất cả các ứng dụng FileZilla đang chạy" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "Đóng tìm kiếm nhanh và tiếp tục so sánh?" + +#: ../../locales/../src/interface/menu_bar.cpp:55 msgid "Closes current tab" msgstr "Đóng tab hiện hành lại" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "Chú thíc&h:" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "Các tính chất của cột" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "Cài đặt cột" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "Lệnh và tham số phải được trích dẫn đúng." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "Lệnh gặp lỗi" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:506 msgid "Command not supported" msgstr "Lệnh không được hỗ trợ" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "Lệnh không được hỗ trợ bởi giao thức này" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "Lệnh:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "Chú thích" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "Tên thông thường:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "Kết nối hỏng vì bộ định tuyến router hay tường lửa firewall" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/menu_bar.cpp:92 msgid "Compare &modification time" msgstr "So sánh thời gia&n chỉnh sửa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/menu_bar.cpp:91 msgid "Compare file&size" msgstr "&So sánh kích thước tập tin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "Ngưỡng so sánh (&tính bằng phút):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "Ngưỡng so sánh phải giữa 0 và 1440 phút." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "Biên dịch cho:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "Biên dịch trên:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "Biên dịch với:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "Biên dịch với các cờ:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "Đã nén" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "Truyền đồng thời" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "Điều kiện thì phân biệt HO&A/thường" @@ -2254,41 +2371,42 @@ msgid "Configure port range" msgstr "Cấu hình vùng cổng" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "Cấu hình FileZilla và mạng của bạn" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "Xác nhận khi xóa" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "Xác nhận cần thiết" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "Xin chúc mừng, việc cấu hình của bạn có vẻ hoạt động tốt." -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "Kết nối thông qua cài đặt chủ ủy nhiệm" -#: ../../locales/../src/interface/netconfwizard.cpp:216 -#, fuzzy, c-format +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format msgid "Connect failed: %s" -msgstr "Gặp lỗi khi yêu cầu máy chủ ủy nhiệm: %s" +msgstr "Gặp lỗi khi kết nối: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "Kết nối vào tab hiện tại" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "Kết nối vào tab mới" @@ -2296,29 +2414,26 @@ msgid "Connect to specified Site Manager site" msgstr "Kết nối tới địa chỉ danh nghĩa trong Danh bạ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 -msgid "Connected" -msgstr "Đã kết nối" - -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "Đang kết nối" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối tới %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Đang kết nối tới %s thông qua máy chủ ủy nhiệm %s" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:236 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "Đang kết nối tới %s…" @@ -2327,186 +2442,228 @@ msgid "Connection" msgstr "Kết nối" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "Kết nối bị bãi bỏ" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "Cố gắng kết nối gặp lỗi" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:208 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Cố gắng kết nối với \"%s\" gặp lỗi, đang thử địa chỉ tiếp theo." -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Cố gắng kết nối với \"%s\" gặp lỗi." -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "Cố gắng kết nối bị ngắt bởi người dùng" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "Kết nối bị lỗi quá thời gian" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "Kết nối đã đóng" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:305 +#: ../../locales/../src/engine/http/request.cpp:318 +#: ../../locales/../src/engine/http/request.cpp:329 +#: ../../locales/../src/engine/http/request.cpp:340 msgid "Connection closed by server" msgstr "Kết nối đã đóng bởi máy chủ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "Kết nối đã thiết lập, đang khởi tạo TLS…" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "Kết nối đã thiết lập, đang gửi yêu cầu HTTP" -#: ../../locales/../src/interface/netconfwizard.cpp:333 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." -msgstr "Kết nối đã thiết lập, đang đợi thông điệp từ máy chủ…" +msgstr "Kết nối đã thiết lập, đang đợi lời chào mừng từ máy chủ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "Kết nối đã thiết lập, đang đợi thông điệp từ máy chủ…" -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "Mất kết nối" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:491 msgid "Connection not allowed by ruleset" msgstr "Kết nối không cho phép bởi qui tắc đã đặt" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:500 msgid "Connection refused" msgstr "Kết nối đã bị từ chối" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "Kết nối đã bị từ chối bởi máy chủ" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "Kết nối đã bị đặt lại bởi mạng" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "Kết nối đã bị đặt lại bởi máy ngang hàng" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "Kết nối sẽ chấm dứt nếu sau %d giây không có hoạt động gì" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "Kết nối bị lỗi quá thời gian." -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "Mất kết nối tới máy chủ dịch vụ." -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:219 msgid "Connection with proxy established, performing handshake..." msgstr "" "Kết nối với máy chủ ủy nhiệm đã thiết lập, đang thi hành kết nối bắt tay…" -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "Kết nối tới máy chủ bị đóng lại nhanh chóng." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "Kết nối với máy chủ thử nghiệm gặp lỗi." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "Chuyển đổi tập tin khóa" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "Sao chép (%d) trên %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "Bản sao của %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:98 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:294 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "" +"Sao chép địa chỉ URL của mục đã chọn vào bộ nhớ clipboard, bao gồm cả mật " +"khẩu." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:94 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 msgid "Copy the URLs of the selected items to clipboard." msgstr "Sao chép địa chỉ URL của mục đã chọn vào bộ nhớ clipboard." -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "Không thể chấp nhận kết nối: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "Không thể truy cập đường dẫn %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "Không thể thêm giấy chứng nhận vào danh sách đáng tin tạm thời" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" -msgstr "Không thể thêm kết nối này vào danh bạ." +msgstr "Không thể thêm kết nối này vào bộ quản danh bạ." -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "Không thể hoàn tất thao tác" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "Không thể kết nối tới máy chủ" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "Không thể kết nối tới máy chủ: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "Không thể chuyển đổi lệnh tới máy chủ mã hóa" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "Không thể chuyển đổi khóa riêng" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "Không thể sao chép URL" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "Không thể sao chép giấy chứng nhận" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "Không thể sao chép dữ liệu" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "Không thể tạo CFURL từ đường dẫn %s" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "Không thể tạo URL cho bộ truyền này." + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "Không thể tạo tập tin nội bộ %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "Không thể tạo mutex nhật ký: %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +msgid "Could not create security-scoped bookmark from URL:" +msgstr "Không thể tạo đánh dấu security-scoped từ URL:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2516,11 +2673,11 @@ "Có thể là phần mở rộng không được đặt đúng đắn hay là bạn đã không thả các " "tập tin vào trong cửa sổ chương trình Explorer." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "Không thể thiết lập kết nối tới máy chủ" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2531,11 +2688,16 @@ "Bạn có thể đặt thư mục chứa dữ liệu cho FileZilla dùng dòng lệnh tùy chọn “--" "datadir ” hay bằng cách đặt biến môi trường FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "Không thể tạo ra đăng nhập liên tiếp." -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "Không thể tạo khóa" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2543,7 +2705,7 @@ "Không thể lấy tên được ghi trong giấy phép đã xuất ra, " "gnutls_x509_get_issuer_dn gặp lỗi" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2551,40 +2713,36 @@ "Không thể lấy tên được ghi trong nội dung giấy phép, gnutls_x509_get_dn gặp " "lỗi" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "Không thể lấy đường dẫn đầy đủ." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "Không thể nhận đường dẫn tự nhiên từ CFURL" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "Không thể lấy đường dẫn từ URL" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "Không thể nhận trả lời từ fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "Không thể nhận thư mục tạm thời từ tập tin tải về vào." -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "" -"Không thể nhập giấy chứng nhận ngang hàng, gnutls_x509_crt_import gặp lỗi" - -#: ../../locales/../src/interface/FileZilla.cpp:108 -#, fuzzy, c-format +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format msgid "Could not initialize Winsock (%d): %s" -msgstr "Không thể ghi vào gói mạng: %s" +msgstr "Không thể khởi tạo Winsock (%d): %s" -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "" -"Không thể khởi tạo cấu trúc cho giấy chứng nhận ngang hàng, " -"gnutls_x509_crt_init gặp lỗi" - -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2594,15 +2752,21 @@ "Không thể tải \"%s\", xin chắc chắn rằng tập tin hợp lệ và có thể truy cập.\n" "Bất kỳ thay đổi nào trong Danh bạ sẽ không được lưu lại." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "Không thể tải tập tin khóa" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "Không thể tải khóa riêng tập tin" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2612,7 +2776,7 @@ "Không có thư mục nội bộ tương đương với thư mục máy chủ “%s”.\n" "Bạn có muốn tắt chức năng duyệt đồng bộ và tiếp tục chuyển sang thư mục khác?" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2622,7 +2786,7 @@ "Không có thư mục nội bộ tương đương với thư mục máy chủ “%s”.\n" "Chức năng duyệt đồng bộ đã bị tắt." -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2632,74 +2796,112 @@ "Không có thư mục máy chủ tương đương với thư mục nội bộ “%s”.\n" "Chức năng duyệt đồng bộ đã bị tắt." -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "Không thể lấy cỡ của “%s”" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "Không thể mở “%s”" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "Không mở được clipboard" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "Không mở được tập tin nhật ký: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "Không thể phân tích cú pháp đường dẫn máy chủ." -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "Không rõ cú pháp địa chỉ máy chủ:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 -#, fuzzy +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "Không thể đọc từ “%s”" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." -msgstr "Không thể đọc gói mạng: %s" +msgstr "Không thể đọc từ ổ cắm mạng dữ liệu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:382 #, c-format msgid "Could not read from socket: %s" msgstr "Không thể đọc gói mạng: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "Không đọc mục tin máy chủ." -#: ../../locales/../src/interface/netconfwizard.cpp:344 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." -msgstr "Không thể kết nối tới máy chủ" +msgstr "Không thể nhận dữ liệu từ máy chủ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "Không thể tìm được vị trí %s trong tập tin" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "Không thể phục hồi truy cập thư mục" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "Không thể di chuyển đầu đọc đến vị trí %d trong tập tin" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "Không thể chuyển đến đầu tập tin" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "Không thể chuyển đến cuối tập tin" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "Không thể gửi lệnh tới fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "Không thể gửi lệnh tới fzstorj." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "Không thể sắp xếp giấy chứng nhận ngang hàng" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "Không thể sản sinh tuyến trình vào ra (IO)" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Không thể bắt đầu truyền bắt tay tới máy chủ ủy nhiệm: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "Không thể bắt đầu truyền" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2707,17 +2909,17 @@ msgstr "" "Không thể ghi vào \"%s\", bất kỳ thay đổi Danh bạ không thể lưu lại: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "Không thể ghi \"%s\", dấu trang không thể ghi thêm: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Không thể ghi \"%s\", dấu sách toàn cục sẽ không được ghi lại: %s" -#: ../../locales/../src/interface/QueueView.cpp:1847 +#: ../../locales/../src/interface/QueueView.cpp:1590 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2726,119 +2928,121 @@ "Không thể ghi vào \"%s\", hàng đợi không thể ghi lại.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "Không thể ghi \"%s\", các địa chỉ đã chọn không thể xuất ra: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "Không thể ghi \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "Không thể ghi tập tin khóa: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "Không thể ghi vào tập tin nội bộ" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "Không thể ghi vào tập tin nhật ký: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:237 #, c-format msgid "Could not write to socket: %s" msgstr "Không thể ghi vào gói mạng: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "Quốc gia:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:77 msgid "Crea&te new file" msgstr "&Tạo tập tin mới" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "Tạo thư &mục nội bộ còn thiếu và vào nó" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "Tạo thư &mục trên máy phục vụ còn thiếu và vào nó" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 msgid "Create a new subdirectory in the current directory" msgstr "Tạo thư mục mới cho thư mục hiện hành" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:345 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Tạo thư mục mới cho thư mục hiện hành rồi chuyển vào đó" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 msgid "Create a new, empty file in the current directory" msgstr "Tạo tập tin mới, trống rỗng trong thư mục hiện hành" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:33 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:73 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:344 msgid "Create director&y and enter it" msgstr "Tạo thư &mục mới và vào nó" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "Tạo thư mục mới" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "Tạo tập tin trống rỗng" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "Đang tạo thư mục mới" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "Đang tạo thư mục “%s”…" -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "Giới hạn sai" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "Giới hạn sai:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "Lỗi đạt tới tới hạn tập tin" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "Lỗi tới hạn tập tin sau khi truyền đi %s trong %s" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2847,97 +3051,102 @@ "Thư mục máy chủ hiện tại (%s) không nằm dưới gốc đồng bộ hóa (%s).\n" "Chức năng duyệt đồng bộ đã bị tắt." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "Kiểu truyền hiện tại được đặt thành ASCII." -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "Kiểu truyền hiện tại được đặt chế độ dò tìm tự động." -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "Kiểu truyền hiện tại được đặt là nhị phân." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "Đường cong:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "T&ùy chọn của bạn" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "Đặt bộ lọc của bạn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "Máy chủ tự chọn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "Xanh ngọc" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "Kiể&u dữ liệu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Tiền tố thập phân dùng ký hiệu SI (ví dụ 1 KB = 1000 byt&es)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "Mặ&c định" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:85 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:387 msgid "D&elete" msgstr "&Xóa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" msgstr "So sánh t&hư mục" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "Tắt tất &cả" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "&Không lưu mật khẩu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "Hành động khi kích đúp chuột trên thư &mục:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "&Nhân bản" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:58 msgid "DOS-like with virtual paths" msgstr "Tương tự DOS với kiểu đường dẫn ảo" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "Kiểu tập tin nguy hiểm" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "Dữ liệu" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "Gói tin truyền đi bị đóng quá sớm." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "Ngày tháng" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "Định dạng ngày tháng" @@ -2953,15 +3162,15 @@ msgid "Debug" msgstr "Gỡ lỗi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "Cài đặt gỡ lỗi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "Thư mục mặc định trên máy nội &bộ:" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:50 msgid "Default (Autodetect)" msgstr "Mặc định (Tự dò tìm)" @@ -2969,17 +3178,17 @@ msgid "Default editor not properly quoted." msgstr "Trình biên dịch mặc định không trích dẫn đúng đắn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "Hành động mặc định với tập tin đã có sẵn" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "Thư mục mặc định trên máy &mạng:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." @@ -2987,7 +3196,7 @@ "Không thể phân tích đường dẫn máy mạng mặc định. Hãy chắc chắn là nó hợp lệ " "và được hỗ trợ bởi kiểu máy chủ." -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "Ngôn ngữ hệ thống mặc định" @@ -2995,12 +3204,12 @@ msgid "Default transfer mode:" msgstr "Chế độ truyền mặc định:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "Kiểu truyền mặc định:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "Mặc định: http://ip.filezilla-project.org/ip.php" @@ -3009,7 +3218,7 @@ "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "Thời gian trễ giữa các lần kết nối hỏng phải nằm giữa 1 và 999 giây." -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3019,75 +3228,85 @@ "attempt..." msgstr[0] "Làm trễ kết nối %d giây bởi vì cố gắng kết nối lần trước thất bại…" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "&Xóa đề mục trong Danh bạ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:282 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Delete selected directory" msgstr "Xóa thư mục đã chọn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:42 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 msgid "Delete selected files and directories" msgstr "Xóa thư mục và tập tin đã chọn" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "Đang xóa \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Đang xóa bỏ %u tập tin từ “%s”" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "Xóa liên kết mềm" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "Thư mục Desktop" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "Chi tiết" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "Chi tiết khóa mới:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "Tìm thấy phiên bản mới hơn của FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "Các &thư mục" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Direction" msgstr "Hướng" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "Các thư mục:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "Thư mục" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "Các quyền truy cập thư mục" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:302 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" msgstr "So sánh thư mục" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" msgstr "Việc so sánh thư mục gặp lỗi" @@ -3096,123 +3315,122 @@ msgstr "" "Thư mục chứ tập tin nhật ký không sẵn có hoặc tên tập tin không hợp lệ." -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/menu_bar.cpp:83 +msgid "Directory listing &filters..." +msgstr "Bộ &lọc danh sách thư mục…" + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "Liệt kê thư mục được bãi bỏ bởi người dùng" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "Liệt kê thư mục gặp lỗi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "Bộ lọc danh sách thư mục" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Lấy danh sách thư mục \"%s\" thành công" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "Lấy danh sách thư mục thành công" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "&Tắt tất cả" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "Bạn có muốn tắt chức năng duyệt đồng bộ và tiếp tục thay đổi thư mục?" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "" "Tắt tùy chọn này nếu bạn không thể nhìn thấy nội dung thư mục chính xác." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "Ngắt kết nối khỏi máy chủ" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:238 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "Đã ngắt kết nối khỏi máy chủ" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "Ngắt kết nối từ máy chủ: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "Đã ngắt kết nối từ máy chủ dịch vụ trước đó" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "Đã ngắt kết nối từ máy chủ dịch vụ hiện hành" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/menu_bar.cpp:176 msgid "Display about dialog" msgstr "Hiển thị hộp thoại giới thiệu về ứng dụng" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "&Không dùng trình soạn thảo mặc định" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "Khô&ng làm gì cả" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "Thực hiện như vậy với tất &cả các tập tin đã chọn đang được sửa" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "Bạn có thật sự muốn thoát khỏi FileZilla không?" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" "Bạn có thật sự muốn xóa tất cả các đề mục của Danh bạ và hàng đợi truyền " "không?" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "Bạn có thật sự muốn xóa tất cả các đề mục của Danh bạ không?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "Bạn có thật sự muốn xóa tất cả các đề mục đã chọn không?" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "Bạn có thật sự muốn xóa tất cả hàng đợi truyền đã chọn không?" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Bạn có thật sự muốn gửi “%s” lên máy chủ không?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "Bạn có thật sự muốn mở lại tập tin này không?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "Tài liệu" @@ -3220,47 +3438,47 @@ msgid "Don't use external IP address on &local connections." msgstr "Không dùng địa chỉ IP mạng cho kết nối nội &bộ." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "Dotfiles là tên tập tin bắt đầu bằng dấu chấm, ví dụ .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "Hành động khi kích đúp chuột" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "Tải về" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "&Giới hạn tải xuống:" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "Giới hạn tải xuống: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "Giới hạn tải xuống: không" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "Tải về kết quả tìm kiếm" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "Download selected directory" msgstr "Tải về thư mục đã chọn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:53 msgid "Download selected files and directories" msgstr "Tải về các tập tin và thư mục đã chọn" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3269,35 +3487,35 @@ "Tốc độ tải xuống: %s/s\n" "Tốc độ tải lên: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "Đang tải về" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "Đang tải về %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." msgstr "Đang tải bản cập nhật về…" -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 #: ../../locales/../src/interface/QueueView.cpp:88 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" "&Kéo thả giữa các cửa sổ của FileZilla hiện tại chưa thể thực hiện được." -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:101 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "&Kéo thả giữa các cửa sổ máy chủ hiện tại chưa thể thực hiện được được." @@ -3306,64 +3524,64 @@ msgid "Dupl&icate" msgstr "Nhân &bản" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "&Bật tất cả" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:15 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 msgid "E&nter directory" msgstr "Mở thư &mục" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "Th&i hành" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 +#: ../../locales/../src/interface/menu_bar.cpp:64 msgid "E&xit" msgstr "Thoát r&a" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:187 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 msgid "E&xport..." msgstr "&Xuất ra…" -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "Thư điện tử:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "Mỗi bộ lọc cần ít nhất một điều kiện." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "Sửa các bộ lọc" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:25 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "Biên tập tập tin với bộ biên tập cấu hình và tải thay đổi lên máy chủ." -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "Chưa hỗ trợ các thư mục sửa" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "Việc sửa gặp lỗi" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "Kết quả tìm kiếm những thứ sửa" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "Thư điện tử:" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "Empty command" msgstr "Lệnh rỗng" @@ -3371,7 +3589,7 @@ msgid "Empty command." msgstr "Lệnh rỗng." -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "Danh sách thư mục rỗng" @@ -3379,23 +3597,17 @@ msgid "Empty directory." msgstr "Thư mục rỗng." -#: ../../locales/../src/interface/recursive_operation.cpp:377 -#: ../../locales/../src/interface/recursive_operation.cpp:412 -#, fuzzy -msgid "Empty dirs to visit" -msgstr "Danh sách thư mục rỗng" - #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Tập tin không có đuôi mở rộng." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "Tên bộ lọc rỗng là không được phép." -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "Chưa có tên" @@ -3403,81 +3615,97 @@ msgid "Empty quoted string." msgstr "Mẩu tin trích dẫn rỗng." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "&Bật tất cả" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "Cho phép &lọc ký tự không hợp lệ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "Đã mã hóa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "Mã hóa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "Khóa &Mã hóa:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "Khóa &Mã hóa:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "Thông tin chi tiết mã hóa" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "Kết thúc so sánh và thay đổi thứ tự sắp xếp?" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "Kết thúc so sánh và mở tìm kiếm nhanh?" + +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Enter &custom command..." msgstr "Nhập vào &lệnh tùy ý…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "Nhập 0 để không giới hạn tốc độ" -#: ../../locales/../src/interface/QueueView.cpp:2109 +#: ../../locales/../src/interface/QueueView.cpp:1878 msgid "Enter command" msgstr "Nhập lệnh vào" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "Nhập vào lệnh của bạn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "Mở thư mục" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "Nhập tên bộ lọc" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "Nhập mật khẩu chính" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "Nhập tên bộ lọc muốn đặt" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "Nhập tên mới bộ lọc muốn đặt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "Nhập mật khẩu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:62 msgid "Enter selected directory" msgstr "Vào thư mục đã chọn" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3485,10 +3713,9 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Nhập địa chỉ của máy chủ.\n" -"Ghi rõ giao thức máy chủ, phần đầu tên máy chủ định nghĩa giao thức. Nếu " -"không ghi rõ, giao thức mặc định(ftp://) sẽ được dùng.\n" -"Bạn cũng có thể nhập định dạng đầy đủ URLs theo dạng giao_thức: //user:" +"Nhập địa chỉ của máy chủ. Ghi rõ giao thức máy chủ, phần đầu tên máy chủ " +"định nghĩa giao thức. Nếu không ghi rõ, giao thức mặc định(ftp://) sẽ được " +"dùng. Bạn cũng có thể nhập định dạng đầy đủ URLs theo dạng giao_thức: //user:" "pass@host:port tại đây giá trị trong các trường khác sẽ bị viết đè lên sau " "đó.\n" "\n" @@ -3498,7 +3725,7 @@ "- ftps:// cho giao thức FTP thông qua TLS (ngầm)\n" "- ftpes://cho giao thức FTP thông qua TLS (tường minh)." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3507,118 +3734,135 @@ "Nhập vào mật khẩu cho tập tin “%s”.\n" "Tập tin đã chuyển đổi sẽ không được bảo vệ bằng mật khẩu." -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." msgstr "" -"Nhập vào giá trị cổng cho máy chủ dùng.\n" -"Mặc định cho giao thức FTP là 21, mặc định cho giao thức SFPT là 22." +"Nhập vào giá trị cổng cho máy chủ dùng. Mặc định cho giao thức FTP là 21, " +"mặc định cho giao thức SFPT là 22." + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "Nhập tên tài khoản" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "Nhập tên và mật khẩu" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "Lỗi" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "Lỗi xuất cài đặt" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "Lỗi nhập vào" -#: ../../locales/../src/interface/QueueView.cpp:1909 +#: ../../locales/../src/interface/QueueView.cpp:1668 msgid "Error loading queue" msgstr "Lỗi khi tải hàng đợi" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1830 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1571 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "Lỗi tải tập tin xml" -#: ../../locales/../src/interface/QueueView.cpp:1819 +#: ../../locales/../src/interface/QueueView.cpp:1560 msgid "Error saving queue" msgstr "Lỗi ghi lại hàng đợi" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "Lỗi khởi động chương trình" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1848 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1591 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "Lỗi ghi tập tin xml" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "Lỗi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Ví dụ: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "Ví dụ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "Thực th&i" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Chương trình thực thi không chứa thông tin về phiên bản, không thể kiểm tra " "để cập nhật." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "Chương trình duyệt tập tin Explorer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "Xuất bộ &lọc" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "Xuất ra &hàng đợi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "Xuất thôn&g tin cài đặt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "Xuất cài đặt ra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "Tên bộ &lọc:" @@ -3626,28 +3870,27 @@ msgid "FTP" msgstr "Giao thức FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - Giao Thức Truyền Tập tin" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - Giao Thức Truyền Tập tin có mã hóa" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Giao Thức Truyền Tập tin Không An Toàn" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "Bộ máy FTP không thể khởi tạo, không thể kết nối" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "Duy trì FTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "Máy chủ FTP ủy nhiệm" @@ -3664,147 +3907,158 @@ "Giao thức FTP dùng kết nối thứ cấp cho việc truyền dữ liệu. Các kết nối thêm " "này có thể được thiết lập bằng hai cách." -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +msgid "FTP: File Types" +msgstr "FTP: Kiểu tập tin" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "Giao thức FTPES - FTP thông qua TLS" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "Giao thức FTPES - FTP ngầm thông qua TLS" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "Đổi thư mục gặp lỗi" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "Đổi ngôn ngữ gặp lỗi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "Gặp lỗi khi chuyển đổi lệnh sang bộ mã 8 bít" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "Sao chép hay di chuyển địa chỉ gặp lỗi" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "Tạo bản sao lưu dự phòng tập tin xml gặp lỗi" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "Gặp lỗi khi tạo socket để lắng nghe, đang bỏ qua" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "Gặp lỗi khi tạo ổ cắm mạng để lắng nghe trên cổng %d, đang bỏ qua." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "Tạo socket để nghe cho chế độ truyền tích cực gặp lỗi" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "Gặp lỗi khi gải mã mật khẩu máy chủ." + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "Lấy đường dẫn thư mục “My Documents” gặp lỗi" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "Gặp lỗi khi lấy đường dẫn desktop" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Lấy địa chỉ tương ứng của kết nối điều khiển gặp lỗi, kết nối đã đóng lại." -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "Gặp lỗi khi lấy địa chỉ của kết nối dữ liệu, kết nối đã đóng lại." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "Khởi tạo bộ máy FTP gặp lỗi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "Gặp lỗi khi khởi tạo TLS." -#: ../../locales/../src/interface/FileZilla.cpp:109 -#, fuzzy +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" -msgstr "Khởi tạo bộ máy FTP gặp lỗi." +msgstr "Gặp lỗi khi khởi tạo mạng" #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Tải bảng điều khiển gặp lỗi, tập tin tài nguyên không hợp lệ?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "Lỗi tải khóa riêng: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Mở \"%s\" để nối / ghi gặp lỗi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Mở \"%s\" để đọc tập tin gặp lỗi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Mở \"%s\" để ghi tập tin gặp lỗi" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "Phân tích đường dẫn trả về gặp lỗi." -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "Nhận dữ liệu dữ liệu gặp lỗi" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "Phục hồi danh sách thư mục gặp lỗi" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "Phục hồi địa chỉ IP gặp lỗi, đang bỏ qua" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" -msgstr "Phục hồi địa chỉ IP gặp lỗi, dùng địa chỉ nội bộ" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "Phục hồi địa chỉ IP nội bộ gặp lỗi." - -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "Phục hồi địa chỉ IP nội bộ gặp lỗi. Bãi bỏ." +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "Gặp lỗi khi lấy địa chỉ IP bên ngoài, đang bỏ qua." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" +msgstr "Gặp lỗi khi lấy địa chỉ IP bên ngoài, dùng địa chỉ nội bộ" + +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "Gặp lỗi khi lấy địa chỉ IP nội bộ, nên bãi bỏ." + +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "Gặp lỗi khi lấy địa chỉ IP nội bộ." -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "Phục hồi địa chỉ IP trên mạng gặp lỗi." -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Gửi lệnh đi gặp lỗi." -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "Gặp lỗi khi đặt ngôn ngữ thành %s(%s), dùng ngôn ngữ hệ thống mặc định" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3812,43 +4066,42 @@ "Gặp lỗi khi đặt ngôn ngữ thành %s(%s), dùng ngôn ngữ hệ thống (%s, %s) mặc " "định." -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" "Gặp lỗi khi đặt ngôn ngữ thành %s(%s), dùng ngôn ngữ hệ thống mặc định." -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "Gặp lỗi khi đặt ngôn ngữ thành %s, dùng ngôn ngữ hệ thống mặc định" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" "Gặp lỗi khi đặt ngôn ngữ thành %s, dùng ngôn ngữ hệ thống (%s, %s) mặc định." -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "Gặp lỗi khi đặt ngôn ngữ thành %s, dùng ngôn ngữ hệ thống mặc định." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "Gặp lỗi khi cài đặt xác nhận" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "Xác nhận dữ liệu giấy phép ngang hàng gặp lỗi" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "Ghi tập tin %s gặp lỗi" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "Ghi tập tin xml gặp lỗi" @@ -3860,27 +4113,23 @@ msgid "Fall back to active mode" msgstr "Trở về chế độ tích cực" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "&Tập tin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "&Tập tin" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "Tập tin" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "Kiểu tập tin" - -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "Bộ mô tả tập tin không phải là một ổ cắm" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "Tập tin không chứa bất kỳ một dữ liệu có thể nhập vào." @@ -3888,7 +4137,7 @@ msgid "File editing" msgstr "Chỉnh sửa tập tin" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "Tập tin đã có sẵn" @@ -3896,7 +4145,7 @@ msgid "File exists action" msgstr "Hành động khi tập tin đã có sẵn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "Tập tin đã thay đổi" @@ -3904,63 +4153,67 @@ msgid "File lists" msgstr "Danh sách các tập tin" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Tập tin không tìm thấy" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "Tìm kiếm tập tin" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "Việc truyền bị hủy bởi người dùng" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "Tập tin truyền đi bị bãi bỏ bởi người dùng sau khi truyền %s trong %s" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "Tập tin được truyền đi không thành công" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Tập tin truyền đi gặp lỗi sau khi truyền %s trong %s" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "Các lần truyền bị bỏ qua" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "Tập tin được truyền đi thành công" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Tập tin được truyền đi thành công, đã truyền %s trong %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "Tập tin truyền đi vẫn đang trong tiến trình." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "Tập tin được truyền với dạng dữ liệu kiểu ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "Tập tin được truyền với dạng dữ liệu kiểu nhị phân." -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "Lỗi của FileZilla" @@ -3971,72 +4224,76 @@ msgstr "" "FileZilla bây giờ kiểm tra cấu hình để chắc chắn là mọi sự cấu hình là đúng." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla đã sẵn sàng kết nối tới máy chủ." -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "FileZilla cần phải khởi động lại để thay đổi ngôn ngữ có tác dụng." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "Cập nhật FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/menu_bar.cpp:98 msgid "Filelist status &bars" msgstr "Danh sách tập tin trên t&hanh trạng thái" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "Tên tập tin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "Tên tệ&p tin của bộ lọc…" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "Tên tập tin không thể xây dựng từ thư mục %s và tên tập tin %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "Tên tập tin không hợp lệ" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "Tên tập tin không thể thay đổi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "Tên tập tin:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Tên tập tin không thể chứa các ký tự sau đây: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "Tên tập tin không thể chứa các ký tự sau đây: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "Tập tin hiện tại đang được chỉnh sửa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "Các tập tin khớp với quy tắc lọc sẽ không được liệt kê thư mục." + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "Tập tin không tìm thấy" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "Kích thước tập tin" @@ -4044,50 +4301,54 @@ msgid "Filesize format" msgstr "Định dạng kích thước tập tin" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "Kiểu tập tin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "Ràng buộc kiểu tập tin với ứng dụng" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "Ứng dụng bộ lọc này cho:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "Lọc các ký tự không hợp lệ trong tập tin." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Tên bộ lọc đã sẵn có rồi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "Lọc ra các ký tự tương ứng với tất cả những ký tự sau đây" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "Lọc ra những ký tự tương ứng với bất kỳ những ký tự sau đây" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "Lọc ra những ký tự không khớp với những cái như sau đây" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "Lọc ra các ký tự khớp không phải tất cả những ký tự sau đây" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "Bộ lọc này đã có rồi" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "Bộ lọc các danh sách tập tin" @@ -4097,11 +4358,11 @@ msgid "Filter validation failed" msgstr "Bộ lọc không hợp lệ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "Tìm các tậ&p tin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "Tìm các t&hư mục" @@ -4113,16 +4374,17 @@ msgid "Fingerprint (SHA-256):" msgstr "Dấu vân tay (SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" msgstr "Dấu vân tay:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "Cấu hình tường lửa firewall và bộ định tuyến router trực quan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4134,7 +4396,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "Để chắc chắn hơn bạn có thể ghi rõ một vùng ít nhất là 10 cổng." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4142,35 +4404,40 @@ "Với phiên làm việc này các cài đặt mặc định sẽ được dùng. Bất kỳ thay đổi " "nào tới các cài đặt sẽ không được ghi lại." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "Buộc dùng bộ mã &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/menu_bar.cpp:148 msgid "Force showing &hidden files" msgstr "&Hiển thị tập tin ẩn" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "Hiển thị các tập tin ẩn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "Định dạng đặc biệt:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "" "Định dạng: Phần mở rộng đi theo bởi lệnh và các đối số trong dấu ngoặc kép " "một cách đúng đắn." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" msgstr "Tìm thấy %s %s mới\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "Hàm chức năng %s bị lỗi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "Nhiều tài liệu khác" @@ -4178,11 +4445,15 @@ msgid "General" msgstr "Chung" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:488 msgid "General SOCKS server failure" msgstr "GÓI MẠNG máy chủ chung gặp lỗi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "Chung…" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "Máy chủ ủy nhiệm chung" @@ -4191,73 +4462,77 @@ msgid "Get external IP address from the following URL:" msgstr "Lấy địa chỉ IP từ URL sau đây:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "Tìm trợ giúp" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" "Đặt tên bộ lọc trùng với bộ lọc đã tạo ra từ trước, bạn có muốn ghi đè lên " "không?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "Dấu trang toàn cục" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "Lỗi GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "Lỗi GnuTLS %d trong %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Lỗi GnuTLS %d trong %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "Lỗi GnuTLS %d : %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "Xanh lá" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "Quyền của nhóm" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 msgid "H&igh" msgstr "C&ao" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP thông qua TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "Băm:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "Ẩn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 -#: ../../locales/../src/interface/queue.cpp:998 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:1002 +#: ../../locales/../src/interface/queue.cpp:1064 msgid "High" msgstr "Cao" -#: ../../locales/../src/interface/queue.cpp:913 -#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:1004 +#: ../../locales/../src/interface/queue.cpp:1066 msgid "Highest" msgstr "Cao nhất" @@ -4265,56 +4540,63 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "Địa chỉ cổng cao nhất có thể phải là số từ 1024 đến 65535." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" "Giữ phím shift để giữ trạng thái bộ lọc trên đồng thời cả hai khía cạnh." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "Trang chủ:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "Máy chủ bị ngừng hoạt động" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "Dấu vân tay máy chủ:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "Khóa máy chủ không khớp" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "Máy chủ bắt đầu với “[” nhưng không đóng bằng dấu ngoặc." -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:497 msgid "Host unreachable" msgstr "Máy không thể tiếp cận" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "Máy chủ:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "Thuật toán trao đổi khóa:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "Giờ," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "Tôi đã &quên mật khẩu chính. Xóa mọi mật khẩu đã lưu với khóa này." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (ví dụ: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:115 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Địa chỉ IPv6 không hỗ trợ với máy chủ ủy nhiệm SOCKS4" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4324,7 +4606,7 @@ "thời gian được định sẵn, kết nối sẽ bị đóng lại và FileZilla sẽ thử kết nối " "lại." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "" "Nếu báo cáo các lỗi, xin hãy cung cấp nhật ký thông tin ở mức đầy đủ " @@ -4350,7 +4632,7 @@ "Nếu tùy chọn dự trữ được đặt, bạn sẽ có thể kết nối đến máy chủ cấu hình " "sai, cái mà đã từ chối chế độ truyền đã chọn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4358,7 +4640,7 @@ "Nếu khóa trao đổi không đúng như bạn mong đợi, xin hãy liên hệ với người " "quản trị máy chủ." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4366,7 +4648,7 @@ "Nếu vẫn đề này vẫn tiếp tục, một vài bộ định tuyến router (và)hay tường lửa " "firewall đã khóa FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4374,7 +4656,7 @@ "Nếu vẫn đề này vẫn tiếp tục, một vài bộ định tuyến router (và)hay tường lửa " "firewall ngắt kết nối." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4384,7 +4666,7 @@ "tên tập tin (có thể ghi đè lên những nhật ký cũ hơn) và một tập tin mới được " "tạo." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4392,7 +4674,7 @@ "Nếu liên kết mềm trỏ đến một thư mục, FileZilla có thể hoặc xóa liên kết mềm " "hoặc gỡ bỏ nội dung của thư mục được liên kết tới." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4400,14 +4682,14 @@ "Nếu vẫn đề này vẫn gặp trở ngại, xin hãy liên hệ với nhà sản xuất bộ định " "tuyến router hay tường lửa firewall để có cách giải quyết." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Nếu vấn đề này vẫn tiếp tục xảy ra, xin hãy hỏi nhà sản xuất bộ định tuyến " "router của bạn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4417,7 +4699,7 @@ "bộ hóa với máy chủ. Nếu thời gian khác (ví dụ khác múi thời gian), chỉ rõ " "khoảng cách múi giờ trong Danh bạ." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." @@ -4425,7 +4707,7 @@ "Nếu bạn dùng dấu thời gian cho sự so sánh cơ bản, việc tính toán hai tập tin " "bằng nhau nếu dấu thời gian sai lệch của chúng không vượt quá ngưỡng này." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "Nếu bạn thay đổi ngôn ngữ, bạn phải khởi động lại FileZilla." @@ -4437,11 +4719,11 @@ "Nếu bạn chon thử kiểm tra, FileZilla sẽ kết nối tới probe.filezilla-project." "org và sẽ thi hành vài kiểm tra đơn giản." -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "Nếu bạn đóng FileZilla, những thay đổi của bạn sẽ mất." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4453,7 +4735,7 @@ msgid "If you get any errors, your configuration is not correct." msgstr "Nếu bạn gặp bất kỳ lỗi nào,tập tin cấu hình của bạn đã không đúng." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." @@ -4461,7 +4743,7 @@ "Nếu bạn có vấn đề về lấy danh sách thư mục hoặc truyền các tập tin, hãy thử " "chuyển chế độ truyền mặc định." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4497,23 +4779,23 @@ "Nếu bạn có dùng bộ định tuyến router, hãy chắc chắn rằng tất cả các cổng " "chuyển đến máy đang dùng FileZilla được bật." -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "" "Nếu bộ định tuyến router đổi địa chỉ IP, xin hãy liên hệ với nhà sản xuất nó." -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "Nhập dữ liệu từ phiên bản cũ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "Nhập các cài đặt" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "Nhập thành công" @@ -4540,7 +4822,7 @@ "của bạn đã chọn." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4558,40 +4840,32 @@ "hỏi máy chủ cổng kết nối và kết nối tới cổng đó. Không nhiều cấu hình phải " "làm việc cho điều này." -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "" -"Móc xích không hoàn thành được, phàn đầu giấy chứng nhận không tự định nghĩa " -"quyền chứng nhận quyền" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "Mật khẩu sai" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." msgstr "" "Không thể lấy về thông tin về phiên bản FileZilla mới nhất. Hãy thử lại sau." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "Đang khởi tạo TLS…" -#: ../../locales/../src/interface/verifycertdialog.cpp:107 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "Thuật không an toàn!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "Máy chủ không an toàn, không hỗ trợ FTP thông qua TLS." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:611 +#: ../../locales/../src/engine/server.cpp:635 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "Tính tương tác" @@ -4599,29 +4873,29 @@ msgid "Interface" msgstr "Giao diện" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "Bị ngắt bởi tín hiệu" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "Bị ngắt bởi người dùng" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:161 +#: ../../locales/../src/engine/http/request.cpp:584 msgid "Invalid Content-Length" msgstr "Độ dài của nội dung không hợp lệ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:490 msgid "Invalid HTTP Response" msgstr "Trả lời HTTP không hợp lệ" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "Đối số đã chuyển qua không hợp lệ" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4629,45 +4903,69 @@ "Chuỗi ký tự liên tiếp nhận được không hợp lệ, UTF-8 bị đình chỉ. Chọn tùy " "chọn UTF-8 trong Danh bạ để bắt buộc UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:705 msgid "Invalid chunk size" msgstr "Tổng kiểm tra kích thước không đúng" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "Dữ liệu nhận về không hợp lệ" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "Ngày tháng không hợp lệ" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "Tên không hợp lệ" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "Mã băm không hợp lệ: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" "Máy chủ không hợp lệ, sau khi đóng dấu ngoặc đơn chỉ có một dấu hai chấm và " "cổng theo sau." -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "Tên máy không hợp lệ: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "Nguồn vào không hợp lệ" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:518 +msgid "Invalid line" +msgstr "Dòng không hợp lệ" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "Đường dẫn không hợp lệ" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "Giá trị cổng sai. Cổng phải có giá trị từ 1 đến 65535." -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4681,74 +4979,74 @@ "ftps:// cho giao thức FTP thông qua TLS (ngầm) và\n" "ftpes://cho giao thức FTP thông qua TLS (rõ ràng)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Máy chủ không hợp lệ, sau khi đóng dấu ngoặc đơn chỉ có một dấu hai chấm và " "số hiệu cổng theo sau." -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "Biểu thức chính quy không hợp lệ" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "Biểu thức chính quy trong điều kiện tìm kiếm không hợp lệ." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:499 msgid "Invalid response code" msgstr "Mã đáp ứng sai" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "Điều kiện tìm kiếm không hợp lệ: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "Đường dẫn địa chỉ không hợp lệ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "Kích thước không hợp lệ trong điều kiện" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "Tên người dùng đã cho không hợp lệ." -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "Giá trị không hợp lệ cho ai_flags" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "Giá trị cần gợi ý không hợp lệ" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "Đảo ngược bộ lọc" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "Khu vực của quốc gia:" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "Khu vực của vùng:" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "Khu vực của bang hay tỉnh:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "Giữ thư mục ở trên cao nhất" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4759,7 +5057,7 @@ "hiện một số lần thử để kiểm tra xem máy chủ hỗ trợ đặc tính này hay không, " "việc thử có thể thất bại." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "Trao đổi khóa" @@ -4767,123 +5065,146 @@ msgid "Key exchange:" msgstr "Trao đổi khóa:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:608 +#: ../../locales/../src/engine/server.cpp:633 msgid "Key file" msgstr "Tập tin khóa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "Định danh khóa:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 msgid "L&owest" msgstr "Thấp &nhất" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "Ngôn ngữ" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "Ngôn ngữ đã thay đổi" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "Lần sửa cuối" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "Bố trí" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "Để trống nếu muốn giữ lại mật khẩu có sẵn." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "Giới hạn tải xuốn&g đồng thời:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "Giới hạn tải &lên đồng thời:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "Giới hạn các cổng nội bộ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "Giới hạn kích thước của tập tin nhật ký" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "Giới hạn:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:659 msgid "Line length exceeded" msgstr "Vượt quá độ dài dòng" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "Dùng các thư viện:" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "Gói mạng để nghe bị đóng lại" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "Danh sách:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "Cổn&g thấp nhất có thể:" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "Máy nội bộ" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "Địa chỉ cục bộ được dùng" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "Điểm cuối nội bộ đã bị đóng lại" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "Tập tin nội bộ" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "Tập tin nội bộ không tồn tại." -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "Tập tin nội bộ là %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "Tập tin nội bộ là một thư mục thay thế của một tập tin thông thường." -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "Tên tập tin nội bộ không hợp lệ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "Tìm kiếm tập tin trên máy nội bộ" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "Bộ lọc nội bộ:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "Xử lý đường dẫn máy nội bộ" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "Địa chỉ máy nội bộ:" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "Cỡ nội bộ của “%s” không khớp với cỡ mong chờ: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "Vị trí:" @@ -4891,12 +5212,16 @@ msgid "Log file" msgstr "Tập tin nhật ký" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "Đã đăng nhập" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Đăng nhập" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4905,7 +5230,7 @@ "thể không nhận dạng được bộ mã UTF-8. Không thể quay lại dùng bộ ký tự nội " "bộ từ khi dùng máy chủ ủy nhiệm." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4913,10 +5238,11 @@ "Dữ liệu đăng nhập chứa các ký tự không nằm trong bộ mã ASCII và máy chủ có " "thể không nhận dạng được bộ mã UTF-8. Thử dùng bộ ký tự nội bộ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." msgstr "" -"Chuỗi đăng nhập thực hiện đầy đủ tuy thế vẫn chưa đăng nhập được. Bãi bỏ." +"Chuỗi đăng nhập thực hiện đầy đủ tuy thế vẫn chưa đăng nhập được, đang bãi " +"bỏ." #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -4933,13 +5259,13 @@ "Kiểu đăng nhập, có thể chỉ dùng cùng với địa chỉ FTP. Tham số phải là “%s” " "hay “%s”" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:997 +#: ../../locales/../src/interface/queue.cpp:1059 msgid "Low" msgstr "Thấp" -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:995 +#: ../../locales/../src/interface/queue.cpp:1057 msgid "Lowest" msgstr "Thấp nhất" @@ -4951,128 +5277,161 @@ msgid "MAC:" msgstr "Máy MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "Đỏ tươi" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" "Hãy chắc chắn rằng tập tin có thể được phép truy cập và hợp chuẩn tài liệu " "dạng XML." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:646 +#: ../../locales/../src/engine/http/request.cpp:652 +#: ../../locales/../src/engine/http/request.cpp:659 +#: ../../locales/../src/engine/http/request.cpp:670 +#: ../../locales/../src/engine/http/request.cpp:705 #, c-format msgid "Malformed chunk data: %s" -msgstr "Mẩu dữ liệu sai lệch: %s" +msgstr "Mẩu dữ liệu sai dạng: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:161 #, c-format -msgid "Malformed header: %s" -msgstr "Phần đầu sai lệch: %s" +msgid "Malformed request header: %s" +msgstr "Phần đầu yêu cầu sai dạng: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "Phần trả lời sai dạng, máy chủ không gửi ký tự xuống dòng thích hợp" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:459 +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:518 +#: ../../locales/../src/engine/http/request.cpp:574 +#: ../../locales/../src/engine/http/request.cpp:584 +#, c-format +msgid "Malformed response header: %s" +msgstr "Phần đầu trả về sai dạng: %s" + +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +#, c-format +msgid "Malformed response: %s" +msgstr "Phần đáp ứng sai dạng: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "Truyền thủ công" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "Mật khẩ&u chính:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "Mật khẩu chính:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "Tương ứng với tất cả cái như sau" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "Tương ứng với tất cả cái như sau" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" msgstr "Không tương ứng với tất cả cái như sau" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "Khớp không phải tất cả cái như sau" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "Tối đa số truyền đi đồng &thời:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "Gặp lỗi nghiêm trọng khi phân bổ bộ nhớ" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "Nhật ký thông tin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "Vị trí của nhật ký thông báo" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "Thông điệp quá lớn" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "Phút" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "Di chuyển x&uống" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "Di chuyển &lên" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "Thư mục My Computer" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "Thư mục My Documents" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "Thư mục My Sites" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "Không định nghĩa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "Tên" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "Tên đã có rồi" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "Tên dấu trang đã sẵn có." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "Tên:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "Xếp tự nhiên" @@ -5080,30 +5439,34 @@ msgid "Need to enter filter name" msgstr "Phải nhập tên bộ lọc" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "Phải nhập đường dẫn máy nội bộ hợp lệ" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "Phải nhập đường dẫn máy mạng hợp lệ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "Cần chỉ rõ bộ mã ký tự" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "Không có tên nút, cũng không cung cấp tên máy chủ, hoặc không biết" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "Mạng máy chủ không có địa chỉ mạng nào trong họ địa chỉ đã yêu cầu" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "Mạng máy tính không kết nối tới" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "Không bao giờ" @@ -5111,41 +5474,41 @@ msgid "New &Folder" msgstr "Thư &mục mới" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "New &tab" msgstr "&Tab mới" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Tạo &mới" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "Tạo dấu trang mới" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "Thư &mục mới" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "Các đặc tính mới các sự cải tiến trong phiên bản %s" @@ -5154,41 +5517,41 @@ msgid "New filter" msgstr "Bộ lọc mới" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "Thư mục mới" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "Tạo địa chỉ mới" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "Hàng đợi truyền tiếp theo" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "Không" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "Chưa có địa chỉ tổ hợp với tên nốt này" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" -msgstr "Không có category để xuất ra được chọn" +msgstr "Không có thể loại nào để xuất ra được chọn" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1884 msgid "No command given, aborting." msgstr "Không có lệnh nào được đưa ra nên bãi bỏ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "Không có địa chỉ IP trên Internet được đặt, đang thử mặc định." -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "Không có tập tin nào hiện thời đang được biên tập." @@ -5196,97 +5559,93 @@ msgid "No filter name given" msgstr "Tên bộ lọc không được chỉ rõ" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "Không có máy chủ được chỉ rõ, hãy nhập tên máy chủ." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "Không có ảnh nào có thể dùng được" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "Không thể thêm tập tin vào hàng đợi nữa!" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "Không có tên cho bộ lọc nhận được." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "Chưa có chương trình nào ràng buộc xử lý kiểu tập tin này" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" "Chưa có chương trình nào được ràng buộc chỉnh sửa tập tin với phần mở rộng " "“%s”." -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "Không có bộ định tuyến đến máy" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "Không tìm thấy" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "Chưa có địa chỉ nào có thể dùng" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:466 msgid "No supported SOCKS5 auth method" msgstr "Không hỗ trợ phương thức xác minh SOCKS5" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "Không có tên người dùng này." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "Không" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "Chưa có gì được chọn" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "Gặp lỗi nghiêm trọng không thể phục hồi trong phân giải tên" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 -#: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:602 +#: ../../locales/../src/engine/server.cpp:629 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:1000 +#: ../../locales/../src/interface/queue.cpp:1062 msgid "Normal" msgstr "Bình thường" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:309 +#: ../../locales/../src/interface/queueview_failed.cpp:334 msgid "Not all items could be requeued for transfer." msgstr "Không phải tất cả các mục tin đều có thể yêu cầu truyền." -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "Chưa được kết nối" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "Không kết nối tới bất kỳ máy chủ nào" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "Không có bất kỳ kết nối tới máy chủ." @@ -5294,24 +5653,33 @@ msgid "Not connected." msgstr "Chưa được kết nối." -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "Chưa được khởi tạo, cần gọi WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Chú ý rằng đặc tính này chỉ hỗ trợ dùng giao thức FTP." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "Chú ý: Một khi mã khóa bị mất nó không thể lấy lại được." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Chú ý: Nó chỉ hoạt động với kết nối FTP thông thường, không bị mã hóa." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "" "Chú ý: Dùng máy chủ ủy nhiệm chung áp đặt kết nối FTP trong chế độ thụ động." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:465 +#: ../../locales/../src/engine/http/request.cpp:652 +msgid "Null character in line" +msgstr "Lọc các ký tự null trong dòng" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "Số chữ số thập phân:" @@ -5319,40 +5687,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Số lần thử lại phải nằm giữa 0 và 99." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "&Mở tập tin" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:396 +msgid "O&pen" +msgstr "&Mở" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "Đồng ý" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "Phiên bản HDH:" @@ -5364,168 +5736,191 @@ "Trong trang tiếp theo đây, chế độ truyền được chọn sẽ được cấu hình, cũng " "tốt cho việc quay lại chế độ dự phòng nếu nó được bật." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "Một lần" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "Ngày một lần" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "Tuần một lần" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "Chỉ dùng FTP thường (không an toàn)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "&Mở tập tin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 msgid "Open directory in system's file manager" msgstr "Mở thư mục trong bộ quản lý tập tin hệ thống" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "Mở Quản lý địa chỉ" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "Mở sổ địa chỉ." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "Mở Quản lý địa chỉ. Bấm chuột phải để liệt kê các địa chỉ." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/menu_bar.cpp:74 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "" +"Mở hộp thoại phân quyền truy cập thư mục để cấu hình các thư mục nội bộ mà " +"FileZilla có quyền truy cập đến đó." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 msgid "Open the file." msgstr "Mở tập tin." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 +#: ../../locales/../src/interface/menu_bar.cpp:72 msgid "Open the settings dialog of FileZilla" msgstr "Mở hộp thoại cài đặt của FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "Mở như là:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "Mở bị lỗi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 +#: ../../locales/../src/interface/menu_bar.cpp:53 msgid "Opens a new tab" msgstr "Mở một tab mới" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 +#: ../../locales/../src/interface/menu_bar.cpp:49 msgid "Opens the Site Manager" msgstr "Mở Danh bạ" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" "Mở hộp thoại danh sách bộ lọc thư mục. Bấm chuột phải để bật hoặc tắt các bộ " "lọc." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "Hệ điều hành:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "Thao tác đã có sẵn trong tiến trình xử lý" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "Thao tác đang được xử lý" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "Thao tác không được hỗ trợ" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "Các tùy chọn" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "Cam" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "Tổ chức:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "Các tùy chọn SFTP khác" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "Lỗi hệ thống khác" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "Cái khác:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "Hết bộ nhớ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "Tổng quan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "Ghi đè nếu có nguồn mớ&i hơn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "Ghi đè" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "Ghi đè nếu kích thước khác biệt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "Ghi đè nếu mới hơn hay kích thước khác biệt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "Ghi đè nếu có nguồn mới hơn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "Ghi đè nếu kích thước &khác biệt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "Ghi đè nếu nguồn mới hơn hay &kích thước khác biệt" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "Kiểu biên dịch chủ thể: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "Quyền sở hữu" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "Người sở hữu/Nhóm" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" @@ -5533,31 +5928,31 @@ "Hệ thống trở ngại từ việc đi vào t&rạng thái nghỉ trong suốt quá trình " "truyền và các tác vụ khác" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "Máy chủ ủy thá&c proxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "Lệnh PORT hỏng bởi bộ định tuyến router hoặc tường lửa firewall." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "Thụ độn&g (nên dùng)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "Tham số không hợp chuẩn URL" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Đang phân tích %d byte của thông tin phiên bản.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "Mật &khẩu:" @@ -5565,66 +5960,80 @@ msgid "Passive (recommended)" msgstr "Thụ động (nên dùng)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "Chế độ thụ động" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "Chế độ thụ động được đặt là chế độ truyền mặc định." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "Mật khẩu hay khóa mã hóa chưa được đặt" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "Yêu cầu mật khẩu" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "Mật khẩu" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "Đường dẫn" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "Đường dẫn không thể xây dựng từ thư mục %s và thư mục con %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "Không tìm thấy đường dẫn:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "Đường dẫn" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "Loại bỏ lệnh còn chờ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "Quyền" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "Không đủ thẩm quyền" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "Các quyền" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "Nền tảng:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "Vui lòng thêm các thư mục nội bộ mà bạn muốn dùng FileZilla với." + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5632,6 +6041,14 @@ "Xin kiểm tra tại http://filezilla-project.org/probe.php máy chủ này phải " "chạy được và cẩn thận kiểm tra lại cài đặt của bạn." +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "" +"Vui lòng kiểu tra các quyền đã cấp và thêm lại bất kỳ thư mục nội bộ còn " +"thiếu nào mà bạn đang làm việc với trong hộp thoại mà đi theo." + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5640,13 +6057,13 @@ "Xin hãy cấu hình tường lửa firewall và bộ định tuyến router để FileZilla có " "thể thiết lập kết nối ra ngoài tới các cổng chuyên dùng." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Xin hãy tắt các cài đặt giống như là như chế độ “DMZ” hay “Game” trong bộ " "định tuyến router của bạn." -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5662,13 +6079,13 @@ msgid "Please enter a custom time format." msgstr "Đề nghị nhập định dạng thời gian." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "Xin nhập ngày tháng theo định dạng YYYY-MM-DD ví dụ như 2010-07-18." #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "Hãy nhập giá trị giới hạn tải về lớn hơn hoặc bằng 0 %s/s." @@ -5677,16 +6094,16 @@ msgid "Please enter a name for the new filter." msgstr "Đề nghị nhập tên cho bộ lọc mới." -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "Đề nghị nhập tên mới cho bộ lọc sao chép." -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Đề nghị nhập tên mới cho bộ lọc \"%s\"." -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "Đề nghị nhập tên mới cho bộ lọc." @@ -5707,21 +6124,10 @@ "transfers." msgstr "Hãy nhập một số từ 0 đến 10 cho số kết nối truyền hiện hành." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "Nhập mật khẩu cho máy chủ này:" -#: ../../locales/../src/interface/QueueView.cpp:2109 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"Xin hãy nhập đường dẫn và chương trình thực thi để chạy.\n" -"Ví dụ c:\\một\\số\\đường\\dẫn\\tập_tin.exe nếu chạy trên MS Windows hay /một/" -"số/đường/dẫn/tập_tin nếu dưới Unix.\n" -"Bạn cũng có thể ghi rõ các đối số tùy chọn." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." @@ -5729,30 +6135,30 @@ "Hãy nhập thời gian chờ tối đa từ 10 đến 9999 giây hoặc giá trị 0 để bỏ chức " "năng này." -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "Hãy đặt tên duy nhất cho bộ lọc này" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "Xin nhập tên người dùng cho máy chủ này:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "Hãy nhập vùng giá trị cổng hợp lệ." -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "" "Xin hãy nhập địa chỉ URL nơi mà nhận được địa chỉ Internet của bạn từ đó" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "Hãy nhập giới hạn tốc độ tải lên có giá trị lớn hơn hoặc bằng 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5760,27 +6166,49 @@ "Xin nhập dòng lệnh thô của giao thức FTP.\n" "Dùng dòng lệnh thô sẽ xóa bộ đệm dữ liệu thư mục." -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1878 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"Xin hãy nhập vào đường dẫn chương trình thực thi dạng đầy đủ và các tham số " +"dành cho nó. Lệnh này sẽ thực thi khi hàng đợi được xử lý xong.\n" +"Ví dụ c:\\một_số_đường_dẫn\\tập_tin.exe nếu chạy trên MS Windows hay /" +"một_số_đường_dẫn/tập_tin nếu dưới Unix.\n" +"Bạn gần như chắc chắn là trích dẫn lệnh và tham số dành cho nó nếu chúng có " +"chứa khoảng trắng." + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "Xin hãy nhập tên của thư mục sẽ được tạo ra:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "Xin hãy nhập tên của tập tin mà bạn muốn tạo:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "Nhập tên mật khẩu cho máy chủ này:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "" +"Vui lòng nhập mật khẩu chính của bạn để có thể thay đổi các cài đặt về mật " +"khẩu." + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "Nhập địa chỉ IP trên Internet của bạn" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5790,6 +6218,11 @@ "trình thuật sĩ này. Trong trường hợp bạn có một địa chỉ động hay bạn không " "biết địa chỉ, dùng tùy chọn thiết bị phân tích từ bên ngoài." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "Nhập tên mật khẩu chính của bạn để giải mã mật khẩu cho máy chủ này:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " @@ -5798,7 +6231,7 @@ "Xin hãy đặt các chỉ lệnh một cách cẩn thận, sự cấu hình sai sẽ ngăn cản kết " "nối FTP thành công." -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5806,13 +6239,13 @@ "Xin chắc chắn là FileZilla cho phép thiết lập kết nối ra ngoài và cũng chắn " "chắn là bạn gõ địa chỉ chính xác." -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Xin chắc chắn là miền địa phương đã yêu cầu đã được cài đặt trong hệ thống " "của bạn." -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5836,7 +6269,7 @@ "cho rằng nó chỉ dùng bởi trojans hay malware. Điều này có thể kích hoạt một " "cảnh báo sai bạn có thể loại bỏ một cách an toàn." -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5844,7 +6277,7 @@ "Xin chú ý là lưu trữ dấu thời gian trong việc tải lên máy chủ FTP, FTPS và " "FTPES chỉ hoạt động nếu chúng hỗ trợ lệnh MFMT." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." @@ -5852,7 +6285,7 @@ "Xin chú ý là một số máy chủ có thể cấm bạn nếu bạn thử kết nối đi kết nối " "lại quá nhiều lần hay trong khoảng thời gian quá ngắn." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5862,11 +6295,19 @@ "môi trường mạng làm việc hay trong trường hợp bạn bất ngờ bắt gặp sự cố với " "máy chủ mà nó trước đó đã hoạt động." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "" +"Vui lòng lưu khóa này ở một vị trí an toàn. Không có tập tin khóa khớp với " +"khóa bạn tải lên thì không thể truy cập được nữa." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "Hãy chọn tác động:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "Chọn những thể loại bạn muốn nhập vào." @@ -5897,7 +6338,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Xin hãy chọn các thuộc tính mới cho tập tin đã chọn." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5911,37 +6352,37 @@ "chế độ “DMZ” hay “game”. Những điều giống như kiểm duyệt nghi thức hay " "“fixups” phải bị tắt đi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "&Vị trí của nhật ký:" -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "Mã bưu điện:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "&Cấp phát chỗ trống trước khi tải về" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "Cấp phát trước" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "Giới hạn trước các địa chỉ" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "Lưu giữ dấu thời gian của tập tin" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "Xem trước:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "Xem thử" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "Kết nối gốc và xác nhận dữ liệu kết nối không khớp nhau." @@ -5954,15 +6395,15 @@ msgid "Print version information to stdout and exit" msgstr "In thông tin về phiên bản ra stdout rồi thoát" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "Thư mục ưu tiên (mặc định)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Priority" msgstr "Quyền ưu tiên" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5970,7 +6411,7 @@ "Chính sách riêng tư: Chỉ phiên bản của FileZilla, hệ điều hành bạn đang dùng " "và cả kiến trúc CPU sẽ chuyển tới cho máy chủ." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "Khóa &riêng:" @@ -5978,31 +6419,31 @@ msgid "Pro&tocol:" msgstr "Giao &thức:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "Mật &khẩu máy chủ ủy nhiệm:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:107 +#: ../../locales/../src/interface/menu_bar.cpp:111 msgid "Process &Queue" msgstr "Xử lý &hàng đợi" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "Bản tập tin xử lý bị tràn" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "Đã xử lý %s trong %s." -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "Giao thức không được hỗ trợ" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "Giao thức không hỗ trợ trên kiểu ổ cắm đã cho" @@ -6010,55 +6451,55 @@ msgid "Protocol:" msgstr "Giao thức:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "Cổng máy chủ ủ&y nhiệm:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "Tài khoả&n máy chủ ủy nhiệm:" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:475 msgid "Proxy authentication failed" msgstr "Sự xác thực máy chủ ủy nhiệm bị lỗi." -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "Kết nối bắt tay với máy chủ ủy nhiệm bị lỗi: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Máy chủ bắt đầu với “[” nhưng không tìm thấy dấu ngoặc đóng." -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:329 #, c-format msgid "Proxy reply: %s" msgstr "Máy chủ ủy nhiệm trả lời: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "Gặp lỗi khi yêu cầu máy chủ ủy nhiệm. Trả lời từ máy ủy nhiệm: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:386 #, c-format msgid "Proxy request failed: %s" msgstr "Gặp lỗi khi yêu cầu máy chủ ủy nhiệm: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:540 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Gặp lỗi khi yêu cầu máy chủ ủy nhiệm: Không rõ kiểu địa chỉ trong trả lời " "CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "Máy chủ ủy nhiệm được đặt nhưng máy chủ hay cổng hợp lệ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "Xác thực Khóa Công" @@ -6066,68 +6507,77 @@ msgid "Public key algorithm:" msgstr "Thuật toán Khóa Công:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "Cho phép tất cả mọi người" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2784 msgid "Queue has been fully processed" msgstr "Hàng đợi đã đầy" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "Hàng đợi: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "Hàng đợi: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "Hàng đợi: rỗng" -#: ../../locales/../src/interface/QueueView.cpp:438 +#: ../../locales/../src/interface/QueueView.cpp:207 msgid "Queued files" msgstr "Hàng đợi các tập tin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "Đang đợi:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "Tìm nhanh:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "Không thể mở tìm kiếm nhanh nếu đang so sánh các thư mục." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +msgid "R&eboot system once" msgstr "&Khởi động lại hệ thống" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/menu_bar.cpp:104 msgid "R&emote directory tree" msgstr "Cây thư mụ&c máy mạng" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:248 msgid "R&eset and requeue selected files" msgstr "Đặt và xếp &lại hàng đợi với các tập tin đã chọn" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "Lệnh FTP thô" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "Đọ&c" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:37 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:81 msgid "Re&fresh" msgstr "Làm &tươi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "Đổi tê&n" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6135,20 +6585,24 @@ "Chạy lại phần cấu hình trực quan và cẩn thận kiểm tra các cài đặt và cấu " "hình tất cả các bộ định tuyến và tường lửa cho phù hợp." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "Đọ&c" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "Chỉ đọc" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "Gặp lỗi khi đọc từ tập tin nội bộ" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "Bạn có thực sự muốn hủy hoạt động hiện hành không?" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6156,20 +6610,20 @@ msgstr[0] "" "Bạn có thực sự muốn xóa %d thư mục và nội dung của nó từ máy chủ không?" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "Bạn có thực sự muốn xóa %d tập tin từ máy chủ không?" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Bạn có thực sự muốn xóa %s và %s từ máy chủ không?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "" "Bạn có thực sự muốn xóa tất cả tập tin và/hoặc thư mục đã chọn từ máy chủ " @@ -6181,52 +6635,60 @@ "Bạn có thực sự muốn xóa tất cả tập tin và/hoặc thư mục đã chọn từ máy tính " "của mình không?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Reason" msgstr "Lý do" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2777 msgid "Reboot now" msgstr "Khởi động lại ngay" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" -msgstr "Rec&urse vào thư mục con" +msgstr "Đệ q&uy vào các thư mục con" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Nhận được cảnh báo TLS từ máy phục vụ: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3165 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "Đã nhận về danh sách thư mục mà nó có vẻ được mã hóa trong EBCDIC." -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2130 +#: ../../locales/../src/engine/directorylistingparser.cpp:2147 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Nhận được vượt quá 10000 ký tự một dòng, đang bãi bỏ." -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "" +"Không thể xác minh chuỗi móc xích chứng nhận đã nhận. Tình trạng thẩm tra là " +"%d." + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "Xác nhận dữ liệu bị hỏng" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "Có ký tự không hợp lệ trong thông tin về phiên bản" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Nhận được cảnh báo TLS chưa biết %d từ máy chủ" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "Thông tin về phiên bản nhận được là quá dài" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6234,77 +6696,75 @@ "Thông tin về kết nối lại không thể đầy đủ khi kết nối tới máy chủ.\n" "Nếu bạn tiếp tục, kết nối của bạn sẽ bị đóng lại." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "Các cài đặt về kết nối lại" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "Kết nối lại với máy chủ kết nối cuối cùng" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "Thêm tập tin vào hàng đợi một cách đệ quy." -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "Thay đổi quyền một cách đệ quy." -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "Xóa tập tin và thư mục một cách đệ quy." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "Đỏ" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Đổi hướng tới địa chỉ URI không hợp lệ hoặc không được hỗ trợ: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Đổi hướng tới địa chỉ không hợp lệ hoặc không được hỗ trợ: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "Làm mới lại danh sách tập tin và thư mục" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "Nhớ mật khẩu?" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "Máy trên mạng" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "Thông tin xác nhận máy mạng không tin cậy." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Remote file" msgstr "Tập tin máy mạng" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "Tìm kiếm tập tin máy mạng" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "Bộ lọc máy mạng:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "Đường dẫn máy mạng" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6313,7 +6773,7 @@ "Không thể phân tích đường dẫn máy mạng. Hãy chắc chắn là nó hợp lệ và được " "hỗ trợ bởi kiểu máy chủ (%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6322,128 +6782,132 @@ "Không thể phân tích đường dẫn máy mạng. Hãy chắc chắn là nó hợp lệ và được " "hỗ trợ bởi kiểu máy chủ (%s) được chọn bởi trang mẹ." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "Không thể phân tích đường dẫn máy mạng. Hãy chắc chắn là nó hợp lệ." -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "Đường dẫn máy mạng không thể phân tách được." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "Đường dẫn máy mạng đang xử lý:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "Đường dẫn máy mạng:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "Địa chỉ máy mạng:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Remove &all" msgstr "L&oại bỏ tất cả" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 msgid "Remove &selected" msgstr "Loại bỏ phần đã &chọn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "Đổi tên tập tin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "Rename selected directory" msgstr "Đổi tên thư mục đã chọn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:46 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:90 msgid "Rename selected files and directories" msgstr "Đổi tên tập tin và thư mục đã chọn" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Đổi tên từ “%s” thành “%s”" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "Lặp lại mật khẩu:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "Cách báo cáo lỗi và yêu cầu các đặc tính mới" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:377 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Yêu cầu gặp lỗi - máy khách không chạy “identd” (hoặc là không thể kết nối " "từ máy chủ)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:380 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Yêu cầu gặp lỗi - “identd” của máy khách không thể xác nhận chuỗi định danh " "(ID) tài khoản" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:374 msgid "Request rejected or failed" msgstr "Yêu cầu bị từ chối hay gặp lỗi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "Yêu cầu FTP thông qua TLS tường minh" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "Yêu cầu FTP thông qua TLS ngầm định" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:241 msgid "Reset and requeue &all" msgstr "Đặt và xếp lại toàn &bộ hàng đợi" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "Giao thức phân giải chưa biết" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "Phân giải địa chỉ IP của %s" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "Tài nguyên tạm thời không sẵn sàng" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "Trả về:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "Kết quả:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "Phục hồi lại việc truyền" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." @@ -6451,44 +6915,46 @@ "Phục hồi tập tin ASCII có thể là nguyên nhân của sự cố nếu máy chủ dùng kiểu " "xuống dòng khác với máy khách." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Đang nhận danh sách của thư mục \"%s\"…" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "Đang nhận danh sách thư mục…" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "Nhận địa chỉ IP từ %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 +#: ../../locales/../src/interface/menu_bar.cpp:61 msgid "S&how files currently being edited..." msgstr "&Hiển thị tập tin đang sửa…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "Mở cửa sổ quản lý dan&h bạ khi khởi động" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" -msgstr "Tắt &hệ thống" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 +msgid "S&hutdown system once" +msgstr "Tắt &hệ thống một lần" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "&Dừng lại" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" -msgstr "Ngừng &hệ thống" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:182 +msgid "S&uspend system once" +msgstr "Ngừng &hệ thống một lần" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/menu_bar.cpp:97 msgid "S&ynchronized browsing" msgstr "&Duyệt đồng bộ" @@ -6496,91 +6962,110 @@ msgid "SFTP" msgstr "Giao thức SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "Hỗ trợ SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:141 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Máy chủ ủy nhiệm SOCKS4 sẽ kết nối đến: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:168 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "SOCKS5 không hỗ trợ tài khoản và mật khẩu dài hơn 255 ký tự." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "Lư&u các mật khẩu được bảo vệ bằng mật khẩu chính" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "Lư&u các mật khẩu" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "Lưu lại các cài đặt không?" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "Việc lưu mật khẩu đã được tắt bởi người quản trị hệ thống." -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "Việc lưu mật khẩu đã được tắt bởi chính bạn." -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "Quét toàn bộ các tập tin để thêm vào hàng đợi" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "Quét toàn bộ các tập tin để tải lên" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "Hệ số tỷ lệ giãn:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "Điều &kiện tìm kiếm:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "&Thư mục tìm kiếm:" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "Tìm kiếm đệ qui tập tin." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/menu_bar.cpp:146 msgid "Search server for files" msgstr "Tìm kiếm tập tin trên máy chủ" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "Kiểu tìm:" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "Thông tin an ninh" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Xem thêm: http://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "&Chọn máy chủ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "Chọn thể &loại:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "Chọn phong cách" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "" "Chọn hành động thực thi mặc định nếu tập tin đích của việc truyền tập tin đã " "sẵn có từ trước." -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Chọn trình soạn thảo mặc định" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." @@ -6588,7 +7073,7 @@ "Chọn hành động mặc định với tập tin đích đã sẵn có nếu tập tin đích đã tồn " "tại. Lựa chọn này hợp lệ chỉ cho phiên làm việc hiện hành." -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." @@ -6596,133 +7081,137 @@ "Chọn hành động mặc định với tập tin đích đã sẵn có chỉ dành cho các tập tin " "hiện hành đã chọn trong hàng đợi." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "Chọn tập tin có chứa khóa riêng" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "Chọn tập tin cho dữ liệu xuất ra" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "Chọn tập tin để xuất bộ lọc ra" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1566 msgid "Select file for exported queue" msgstr "Chọn tập tin cho hàng đợi xuất ra" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "Chọn tập tin để xuất ra thông tin cài đặt" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "Chọn tập tin cho địa chỉ xuất ra" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "Chọn tập tin để nhập thông tin cài đặt" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "Chọn tập tin để tải lên" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "Chọn tập tin để chuyển đổi tập tin khóa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "Chọn cách mở tập tin." -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "Chọn thư mục đích để tải về" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "Chọn tên tập tin đích" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "Chọn những thể loại cần xuất thông tin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "Chọn thông tin riêng tư bạn muốn xóa." -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "Chọn %d thư mục cùng nội dung của nó để truyền." -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "Đã chọn %d thư mục" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "Đã chọn %d tập tin để truyền." -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "Đã chọn %d tập tin. Kích thước tổng cộng là: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "Đã chọn %d tập tin. Kích thước tổng cộng ít nhất là: %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "Đã chọn %s và %s để truyền." -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "Chọn %s và %s. Kích thước tổng cộng: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "Đã chọn %s và %s. Kích thước tổng cộng ít nhất là: %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "Trình soạn thảo bạn chọn không sẵn có." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "Tập tin bạn chọn đang bị biên tập" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "Tập tin đã chọn đã được tải" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "Tập tin đã chọn đã được mở" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "Tập tin đã chọn vẫn còn bị chỉnh sửa" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "Chọn bộ lọc chỉ làm việc cho tập tin nội bộ." -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:434 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6730,46 +7219,46 @@ "Dấu trang toàn cục bạn chọn và máy chủ hiện tại không cùng kiểu.\n" "Hãy dùng dấu trang gắn với trang mạng cho máy chủ này." -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "Chọn cổng thường dùng bởi các giao thức khác." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "Gửi các &lệnh duy trì FTP" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/menu_bar.cpp:147 msgid "Send custom command to the server otherwise not available" msgstr "Gửi lệnh từ người dùng đến máy chủ nếu không thì không có hiệu lực" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "Đang gửi lệnh duy trì" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "Số sê-ri:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "&Kiểu máy chủ:" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "Máy chủ không tắt kết nối TLS một cách đúng đắn" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "Máy chủ không hỗ trợ các ký tự không phải ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Máy chủ không hỗ trợ phục hồi tập tin >%d GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6778,15 +7267,19 @@ "Máy chủ không hỗ trợ phục hồi tập tin > %d GB. Kết thúc truyền khi kích " "thước tập tin tương ứng." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "Máy chủ không hỗ trợ phục hồi tập tin >2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "Máy chủ không hỗ trợ phục hồi tập tin >4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "Khóa gốc máy phục vụ" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6795,7 +7288,7 @@ "Máy chủ có thể không hỗ trợ phục hồi tập tin > %d GB. Kết thúc truyền từ lúc " "kích thước tập tin tương ứng." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6803,24 +7296,43 @@ "Máy chủ có thể yêu cầu tài khoản dùng. Thử ghi rõ một tài khoản dùng trong " "Danh bạ" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:459 +msgid "Server not sending proper line endings" +msgstr "Máy chủ không gửi ký tự xuống dòng thích hợp" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" +"Máy phục vụ đã yêu cầu thuật toán xác thực tóm lược không được hỗ trợ: %s" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "Máy phục vụ đã yêu cầu chất-lượng-bảo-vệ không được hỗ trợ: %s" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "Máy chủ trả về đường dẫn rỗng." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "" "Máy chủ gửi một lời nhắc đăng nhập. Bạn cần dùng đăng nhập kiểu tương tác." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/http/request.cpp:309 +msgid "Server sent data even before request headers were sent" +msgstr "Máy phục vụ gửi dữ liệu trước cả khi phần đầu yêu cầu được gửi" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Máy chủ gửi trả lời thụ động với địa chỉ không đầy đủ. Chế độ thụ động bị " "lỗi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6828,36 +7340,48 @@ "Máy chủ gửi trả lời thụ động với địa chỉ không đầy đủ. Dùng địa chỉ máy chủ " "để thay thế." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:406 +#: ../../locales/../src/engine/http/request.cpp:420 +#: ../../locales/../src/engine/http/request.cpp:438 +#: ../../locales/../src/engine/http/request.cpp:783 +msgid "Server sent too much data." +msgstr "Máy phục vụ gửi quá nhiều dữ liệu." + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "Máy chủ gửi trả lời không hợp lệ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "Máy phục vụ gửi chuỗi chứng nhận chưa sắp xếp là vi phạm đặc tả TLS" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "Máy chủ tới máy khách MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "Kiểu mã hóa từ máy chủ tới máy khách:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "&Kiểu máy chủ:" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Server/Local file" msgstr "Tập tin Máy chủ/Máy nội bộ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "Máy chủ:" @@ -6865,50 +7389,55 @@ msgid "Session details" msgstr "Thông tin chi tiết phiên làm việc" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:121 msgid "Set &Priority" msgstr "T&hiết lập quyền ưu tiên" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" +msgid "Setting permissions of '%s' to '%s'" msgstr "Thiết lập quyền hạn từ “%s” thành “%s”" -#: ../../locales/../src/engine/transfersocket.cpp:791 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize được gọi mà không có gói mạng nào" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "Cài đặt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" -msgstr "Cài đặt thư mục:" +msgstr "Thư mục lưu cài đặt:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:150 +msgid "Sh&ow notification bubble" +msgstr "&Hiển thị nổi thông báo" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "Hiển thị danh sách thư mục &thô" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/menu_bar.cpp:171 msgid "Show &welcome dialog..." msgstr "Hiển thị hộp thoại &chào mừng…" -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" msgstr "Hiển thị cả cây thư mục và tiếp tục so sánh?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "Hiển thị chi tiết" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "" "Hiển thị thông tin chi tiết về định dạng ngày tháng và thời gian tùy chỉnh" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:399 +msgid "Show in file &manager" +msgstr "Hiển thị trong bộ &quản lý tập tin" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:212 msgid "Shows available TLS ciphers" msgstr "Hiển thị các kiểu mã hóa TLS sẵn dùng" @@ -6916,7 +7445,7 @@ msgid "Shows this help dialog" msgstr "Hiển thị hộp thoại trợ giúp" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2773 msgid "Shutdown now" msgstr "Tắt ngay bây giờ" @@ -6924,7 +7453,11 @@ msgid "Signature algorithm:" msgstr "Thuật toán ký:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "Đăng ký" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "Các đề &mục Danh bạ" @@ -6932,56 +7465,61 @@ msgid "Site Manager" msgstr "Danh bạ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "Quản lý địa chỉ - Không thể lưu mật khẩu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "Quản lý địa chỉ - Khóa đã tạo" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" -msgstr "Quản lý Địa chỉ - Dữ liệu không hợp lệ" +msgstr "Quản lý địa chỉ - Dữ liệu không hợp lệ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "Danh bạ đã mở" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "Địa chỉ không tồn tại." -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "Đường dẫn địa chỉ phải bắt đầu với 0 hoặc 1." -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "Địa chỉ trang mạng không hợp lệ." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "Dấu trang gắn với trang mạng" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6990,11 +7528,11 @@ "Dấu trang gắn với trang mạng yêu cầu máy chủ phải được lưu trong danh bạ.\n" "Thêm kết nối hiện tại vào danh bạ?" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Size" msgstr "Kích thước" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "Định dạng kích thước" @@ -7002,55 +7540,60 @@ msgid "Size unknown" msgstr "Không biết kích thước" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "Bỏ qua tập tin" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "Giữ nguyên tải xuống của %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "Đang bỏ qua tập tin khóa không tồn tại “%s”" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "Giữ nguyên tải lên của %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "Địa chỉ ổ cắm mạng nằm ngoài không gian địa chỉ" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "Ổ cắm đã sẵn được kết nối" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "Ổ cắm bị tắt" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "Ổ cắm chưa được kết nối" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "Kiểu ổ cắm không hỗ trợ họ địa chỉ" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "Có một vài tập tin vẫn đang sửa hay cần phải tải lên." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." @@ -7058,31 +7601,31 @@ "Một vài máy chủ cấu hình sai là ở sau bộ định tuyến router, có thể trả lời " "với địa chỉ IP nội bộ của chúng." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "Xắp xếp thư mục trực tiếp" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "Thứ tự xắp xếp không thể thay đổi nếu đang so sánh các thư mục." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "Sắp xếp" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "Chế độ &xắp xếp:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "Nguồn và đường dẫn của lệnh “thả” là trùng nhau" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "Tập tin nguồn và đường dẫn của nó không thể giống nhau" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "Nguồn và đích của lệnh “thả” là trùng nhau" @@ -7090,37 +7633,37 @@ msgid "Source file:" msgstr "Tập tin nguồn:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "Các giới hạn tốc độ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "Giới hạn tốc độ" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "Giới hạn tốc độ đã bị tắt đi, bấm vào để thay đổi." -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "Giới hạn tốc độ đã được bật, bấm vào để thay đổi." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "Cả bản thử nghiệm và ổn định" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "Chỉ bản ổn định" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "Cả bản ổn định, thử nghiệm và biên dịch hàng ngày" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "Bắt đầu truyền ngay lậ&p tức" @@ -7128,19 +7671,21 @@ msgid "Start with opened Site Manager" msgstr "Bắt đầu bằng việc mở Danh bạ" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "Tự động kiểm tra cập nhật phiên bản mới vào %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "Bắt đầu tải về %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "Bắt đầu tải lên %s" @@ -7149,30 +7694,38 @@ msgid "Starts the local site in the given path" msgstr "Bắt đầu địa chỉ trong đường dẫn đã cho" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "Bang hoặc tỉnh:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Status" msgstr "Tình trạng" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "Tình trạng:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:111 msgid "Stop and remove &all" msgstr "Dừng và xóa tất &cả" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "Dừng thao tác đệ quy" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - Kho lưu trữ trên mây phân tán" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "Hỗ trợ Storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "Tên đường phố:" @@ -7188,11 +7741,11 @@ msgid "Summary of test results:" msgstr "Tổng hợp kết quả kiểm tra:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2781 msgid "Suspend now" msgstr "Ngừng ngay bây giờ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7200,29 +7753,33 @@ "Liên kết mềm tới các tập tin không bị tác động bởi việc chọn này, như vậy " "liên kết mềm luôn bị xóa." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "Duyệt đồng bộ" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "Chức năng duyệt đồng bộ đã bị khóa." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "Đang đồng bộ hóa các thư mục." + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "Cấu trúc sai" @@ -7231,44 +7788,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "Cấu trúc dòng lệnh sai" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "Hệ thống" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "Chi tiết hệ thống" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "Đã chạm đến giới hạn số lượng tập tin mở của hệ thống" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "Hệ thống mạng con hệ thống bị lỗi" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/menu_bar.cpp:100 msgid "T&oolbar" msgstr "Thanh côn&g cụ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "Kết nối TLS đã được thiết lập, đang gửi yêu cầu HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "Kết nối TLS đã được thiết lập, xin chờ thông tin từ máy chủ…" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "Kết nối TLS đã được thiết lập." -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:503 msgid "TTL expired" msgstr "TTL đã hết hiệu lực" @@ -7276,35 +7833,43 @@ msgid "Target file already exists" msgstr "Tập tin đích đã sẵn có từ trước" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "Tập tin đích:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "Tập tin đích đã có sẵn từ trước!" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "Tên tập tin đích đã tạo rồi, có tiếp tục nữa không?" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" -msgstr "Tiến trình phân giải quyết bị lỗi tạm thời" +msgstr "Tiến trình phân giải tên bị lỗi tạm thời" + +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "Việc kiểm tra đã hoàn tất thành công" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Kết quả kiểm tra" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "Kiểm tra khả năng phục hồi của máy chủ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "Các tập tin sa&u đây hiện tại đang được sửa:" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Quản lý địa chỉ không thể được dùng trừ phi tập tin được sửa chữa." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7314,7 +7879,7 @@ "Bạn có muốn tiếp tục không? Bất kỳ thay đổi trong Danh bạ sẽ không được ghi " "lại sau đó." -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7322,29 +7887,37 @@ "Danh bạ được mở trong cửa sổ khác của FileZilla 3.\n" "Xin hãy đóng nó lại nếu không dữ liệu không thể bị xóa." -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "Địa chỉ bạn đã nhập vào là: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "Thành viên ai_family không được hỗ trợ" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "Thành viên ai_socktype không được hỗ trợ" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "Dấu trang không thể đặt thêm." -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "Các dấu trang không thể xóa được." -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "" +"Giấy chứng nhận yêu cầu máy phục vụ bao gồm một thiếu trạng thái OCSP trong " +"phần đáp ứng của nó, nhưng còn thiếu trạng thái OCSP." + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "Kết nối bị mã hóa. Bấm vào biểu tượng để xem chi tiết." @@ -7366,35 +7939,40 @@ "Định dạng thời gian tùy chỉnh là không hợp lệ hoặc nó chứa các đặc tả định " "dạng không được hỗ trợ." -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Không thể thiết lập kết nối dữ liệu: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "Không tìm thấy trình soạn thảo mặc định cho tập tin văn bản." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "Trình soạn thảo mặc định cho tập tin văn bản là “%s”." #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "" "Tên bộ lọc nhập vào đã sẵn có từ trước rồi, xin hãy chọn một cái tên khác" +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "Các mật khẩu đã nhập không giống nhau." + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Phần mở rộng “%s” đã được sẵn có từ trước trong danh sách" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7403,8 +7981,9 @@ "Tập tin %s sẵn có trước rồi.\n" "Xin hãy nhập một cái tên mới:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7415,7 +7994,7 @@ "Không tìm thấy chương trình ràng buộc (%s).\n" "Xin kiểm tra lại cấu hình ràng buộc xử lý kiểu tập tin." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7424,18 +8003,19 @@ "Tập tin “%s” chứa khóa SSH1. Giao thức SSH1 đã lỗi thời, FileZilla chỉ hỗ " "trợ các khóa SSH2." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "Tập tin “%s” không thể tải được hoặc không chứa khóa riêng." -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "Tập tin “%s” không thể tải lên được." -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7444,8 +8024,9 @@ "Tập tin “%s” không thể mở được:\n" "Không có chương trình ràng xử lý kiểu tập tin này trong hệ điều hành của bạn." -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7454,8 +8035,8 @@ "Tập tin “%s” không thể mở được:\n" "Lệnh ràng buộc xử lý gặp lỗi" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7467,7 +8048,7 @@ "liệu.\n" "Bạn có thực sự muốn tiếp tục không?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7480,7 +8061,7 @@ msgid "The file selected as default editor does not exist." msgstr "Tập tin bạn chọn làm trình soạn thảo mặc định không tồn tại." -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7494,11 +8075,11 @@ "dùng và mật khẩu sẽ được nhập vào.\n" "Bạn có muốn tiếp tục nhập vào không?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "Cột ghi tên tập tin có thể không bị ẩn cũng không bị di chuyển." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "Cột ghi tên tập tin có thể không bị ẩn." @@ -7512,19 +8093,19 @@ msgid "The following characters will be replaced: %s" msgstr "Các ký tự sau đây sẽ bị thay thế: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "Các tập tin sau đây hiện tại đang bị biên tập:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "Giải pháp FTP nguồn mở miễn phí" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "Khóa mã hóa đã tạo là:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "Dấu trang toàn cục không thể ghi lại được." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7538,17 +8119,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Giới hạn phải nằm trong khoản từ 1 dến 2000 MiB" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "Không thể tạo thư mục nội bộ “%s”." -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "Thư mục nội bộ “%s” không sẵn có." -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7564,24 +8145,29 @@ msgstr "" "Giá trị cổng thấp nhất có thể phải nhỏ hơn hoặc bằng giá trị cổng cao nhất." -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "Mật khẩu chính cần dài ít nhất là 8 ký tự." + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "Không thể tải phiên bản mới về, vui lòng thử lại sau." -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "Phiên bản mới nhất đã được lưu lại tại thư mục Tải về của bạn." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1570 msgid "The queue will not be saved." msgstr "Hàng đợi sẽ không được ghi lại." -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Thư mục “%s” trên máy phục vụ không sẵn có." -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7590,27 +8176,27 @@ "Thư mục máy chủ “%s” không ở đưới gốc đồng bộ hóa (%s).\n" "Tắt chức năng duyệt đồng bộ và tiếp tục thay đổi thư mục không?" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "Các thể loại được chọn đã được nhập vào." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "Tập tin đã chọn chứa dữ liệu có thể nhập vào cho thể loại sau đây:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "Tập tin đã chọn đang sửa:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "" "Tập tin đã chọn vẫn đang mở ở chương trình khác, xin hãy đóng chúng lại." -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7620,15 +8206,15 @@ "Nó có thể rất nguy hiểm và phá hủy hệ thống của bạn.\n" "Bạn có thực sự muốn tiếp tục không?" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "Máy chủ không thể được đặt thêm." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "Máy chủ gửi trả lời không như mong đợi hay trả lời được công nhận." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "Máy chủ dùng bộ mã ký tự sau đây cho tên tập tin:" @@ -7640,7 +8226,7 @@ "Giấy chứng nhận của máy chủ không được nhận ra. Xin hãy cẩn thận kiểm tra để " "chắc chắn là máy chủ có thể tin cậy." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7650,7 +8236,7 @@ "nếu không phải là người quản trị thay đổi thì là do bạn trên thực tế đang " "thử kết nối tới một máy tính ngụy tạo là máy chủ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." @@ -7658,11 +8244,15 @@ "Không hiểu khóa của máy chủ. Bạn không được đảm bảo rằng máy chủ đó là máy " "tính bạn nghĩ." -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "Tên máy của máy chủ không khớp với tên máy trong chứng nhận" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "Tham số servname không được hỗ trọ cho ai_socktype" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7670,19 +8260,19 @@ "Các cài đặt đã được nhập vào. Bạn phải khởi động lại FileZilla để các cài " "đặt có hiệu lực." -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "Họ địa chỉ đã cho không được hỗ trợ" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "Tên mạng đã chỉ định không còn được sử dụng nữa" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "The system will soon reboot unless you click Cancel." msgstr "Hệ thống sẽ khởi động lại trừ khi bạn bấm vào Thôi." -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "The system will soon shut down unless you click Cancel." msgstr "Hệ thống sẽ tắt ngay trừ khi bạn bấm vào Thôi." @@ -7694,12 +8284,12 @@ "Tập tin đích đã sẵn có từ trước.\n" "Xin hãy chọn một hành động." -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "" "Kiểm tra không thành công. Bạn có thật sự muốn ghi lại các cài đặt không?" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "Không thể phục hồi tập tin sao lưu dự phòng “%s”" @@ -7708,15 +8298,15 @@ msgid "Themes" msgstr "Kiểu dáng" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "Bộ lọc này không thể xóa." -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "Không thể đổi tên bộ lọc này." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7739,42 +8329,40 @@ "Chương trình thuật sĩ sẽ giúp bạn cấu hình một cách đúng đắn tất cả các bộ " "định tuyến router và tường lửa firewall bạn có và kiểm tra cấu hình của bạn." -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1280 msgid "Time" msgstr "Thời gian" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "Định dạng thời gian" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "Số giâ&y chờ tối đa:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "Quá giờ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "Khoảng chênh múi giờ của của máy chủ dịch vụ là %d giây." - -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "Tựa đề:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "Muốn so sánh các thư mục, cần đóng tìm kiếm nhanh." + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." msgstr "So sánh các thư mục, tất cả các danh sách tập tin phải được sắp xếp." -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "Làm điều này, các cây thư mục cần phải hiển thị tất cả hay ẩn tất cả." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7782,7 +8370,7 @@ "Để hỗ trợ khả năng xác thực khóa công, FileZilla cần phải biết khóa riêng để " "dùng." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7798,7 +8386,7 @@ "Màu xanh lục: Tập tin mới hơn tập tin đã đánh dấu ở bên kia\n" "Màu đỏ: Kích thước khác nhau" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7808,82 +8396,77 @@ "Nếu được bật, thay đổi thư mục nội bộ hiện hành cũng làm thay đổi thư mục " "máy chủ hiện hành tương ứng và ngược lại." -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "Bật tắt quá trình của hàng đợi truyền" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "Bật tắt việc hiển thị của cây thư mục máy nội bộ" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "Bật tắt việc hiển thị của nhật ký thông điệp" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "Bật tắt việc hiển thị của cây thư mục máy mạng" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "Bật tắt việc hiển thị của hàng đợi truyền" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:472 msgid "Too long header line" msgstr "Đầu đề quá dài" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "Quá nhiều lần gửi lại" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "Dấu vết:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "&Truyền" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "Hướng tru&yền" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/menu_bar.cpp:116 msgid "Transfer &type" msgstr "Kiểu &truyền" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "Chế độ truyền" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "Hàng đợi &Truyền" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "Cài đặt chế độ truyền" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Kết nối truyền bị ngắt: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "Dữ liệu truyền đi bị hư hỏng." -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "Đang truyền" @@ -7891,28 +8474,27 @@ msgid "Transfers" msgstr "Truyền" -#: ../../locales/../src/interface/QueueView.cpp:2944 -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2655 msgid "Transfers finished" msgstr "Việc truyền đã hoàn thành" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "Coi các tập tin không có phần mở &rộng như tập tin ASCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "Coi các tập tin &sau đây như tập tin ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "Khóa đã thay đổi đáng tin cậy:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "Tin khóa mới:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "Tin khóa mới này và dùng để kết nối?" @@ -7920,71 +8502,77 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Tin giấy phép này và dùng để kết nối?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "Tín nhiệm máy chủ này và dùng để kết nối?" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "Thử lại" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "Kiểu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "Kiểu máy chủ FTP ủy nhiệm:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "Kiểu máy chủ ủy nhiệm chung:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "Tải &lên" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "Giới hạn tải &lên:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "&Dùng ràng buộc xử lý kiểu tập tin nếu được" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "&Dùng trình soạn thảo tập tin văn bản mặc định cho ngôn ngữ hiện tại" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "TÀIK&HOẢN@MÁYCHỦ" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:383 +#: ../../locales/../src/engine/proxy.cpp:512 #, c-format msgid "Unassigned error code %d" msgstr "Mã lỗi sai không xác định %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "Đơn vị:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "Không rõ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Không rõ máy chủ ủy nhiệm cho giao thức FTP, không thể tạo đăng nhập liên " "tiếp." -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:434 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Không rõ phiên bản giao thức SOCKS: %d" @@ -7993,11 +8581,22 @@ msgid "Unknown certificate" msgstr "Không rõ giấy phép" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "Lỗi chưa biết %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "Lỗi chưa biết %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "Không rõ khóa máy chủ" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:442 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8006,13 +8605,17 @@ "Không rõ phiên bản của giao thức SOCKS Tài khoản/Mật khẩu Thỏa thuận xác " "thực phụ: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "Không hiểu nút gốc, tập tin không được tạo ra bởi FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:574 +msgid "Unknown transfer encoding" +msgstr "Không hiểu bộ mã bộ truyền" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8020,7 +8623,7 @@ "Trừ khi những vấn đề này được sửa, nếu không chế độ truyền tích cực sẽ không " "làm việc và chế độ thụ động sẽ được dùng." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8028,15 +8631,15 @@ "Trừ khi vấn đề này được sửa, nếu không chế độ truyền tích cực sẽ không làm " "việc và chế độ thụ động sẽ được dùng." -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "Kiểu giấy chứng nhận không được hỗ trợ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "Gửi lại một lần nữa không được hỗ trợ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "Tải &lên và không biên tập" @@ -8045,94 +8648,103 @@ msgid "Updates" msgstr "Cập nhật" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "Tải lên" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "Tải lên gặp lỗi" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "Giới hạn tải lên: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "Giới hạn tải lên: không" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "Tải lên kết quả tìm kiếm" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:326 msgid "Upload selected directory" msgstr "Tải lên thư mục đã chọn" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "Upload selected files and directories" msgstr "Tải lên các thư mục và tập tin đã chọn" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "Tải lên tập tin này lại cho máy chủ không?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "Bạn muốn tải tập tin lên máy chủ phải không?" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "Đang tải lên" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "Đang tải lên và đang chờ bị bỏ đi" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "Đang tải lên và không biên tập" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "Bộ mã ký tự người &dùng" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "Dùng trình soạn thảo &riêng:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "&Dùng trình soạn thảo mặc định cho tập tin văn bản." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "Dùng &duyệt đồng bộ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "Dùng biểu thức chính quy" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "Dùng UTF-8 nếu máy chủ có hỗ trợ, nếu không dùng bộ mã ký tự nội bộ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "Dùng hành động mặc định" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "Dùng FTP thông qua TLS tường minh nếu được" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "Máy chủ hiện hành đang kết nối với" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "Dùng máy chủ từ Danh bạ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "&Dùng hệ thống mặc định cho ngôn ngữ hiện tại" @@ -8149,7 +8761,7 @@ msgstr "Dùng địa chỉ IP máy chủ trên mạng để thay thế" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -8166,16 +8778,17 @@ "cực cho lần đầu tiên. Chỉ phiên bản FileZilla bạn đang dùng sẽ được truyền " "lên máy chủ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "Tài khoản:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "Tên người dùng không thể là một chuỗi khoảng trắng" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8194,51 +8807,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "Nhật ký thông tin đầy đủ từ wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "Đang xác minh giấy phép…" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "Rất cao" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "Hiển thị tùy chọn ẩn, nhưng không được hỗ trợ bởi máy chủ" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "Trình bày / Sửa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "Hiển thị cột" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "&Ghi" -#: ../../locales/../src/interface/QueueView.cpp:1671 -msgid "Waiting" -msgstr "Đang chờ" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "Đang chờ trình duyệt kết nối" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "Đang chờ mật khẩu" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "Việc chờ truyền bị hủy" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "Đang thử lại xin chờ…" -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "Cảnh báo, đang bỏ qua dữ liệu kết nối từ một địa chỉ IP sai." @@ -8256,23 +8865,23 @@ "\n" "Bạn có thực sự muốn kiểm tra bản trong ngày không?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "Cảnh báo: Lỗ thủng an ninh tiềm tàng!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "Chào các bạn đến với FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "Các điểm mới" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "Các điểm mới:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8280,7 +8889,7 @@ "khi bạn cho FileZilla ghi nhớ mật khẩu, bạn có thể kết nối lại mà không cần " "nhập lại mật khẩu nữa sau khi bạn khởi động lại FileZilla." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." @@ -8288,36 +8897,54 @@ "Khi được phép, các ký tự mà không được hỗ trợ bởi hệ điều hành trong tập tin " "sẽ bị thay thế nếu tải xuống như một tập tin." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" -msgstr "Khi bắt đầu một kết nối mới trong khi đã kết nối sẵn:" +msgstr "Khi &bắt đầu một kết nối mới trong khi đã có kết nối rồi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "Màn hình rộng" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "Bạn có muốn FileZilla ghi nhớ mật khẩu?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "&Ghi" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "Sai địa chỉ IP" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:646 msgid "Wrong line endings" msgstr "Xuống dòng sai" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "" +"Đã nhập vào sai mật khẩu chính, nó không thể được dùng để giải mã các mật " +"khẩu đã lưu." + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "" +"Đã nhập vào sai mật khẩu chính, nó không thể được dùng để giải mã mục tin " +"này." + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "Vàng" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "Đồng ý" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8325,24 +8952,24 @@ "Bạn dùng máy chủ chỉ hỗ trợ IPv6. Chương trình thuật sĩ này không hỗ trợ môi " "trường này." -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "Bạn dang dùng bản FileZilla mới nhất." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "Bạn có thể thường xuyên mở hộp thoại này thông qua trình đơn trợ giúp." -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "Bạn có thể tải bản mới nhất về từ trang web của FileZilla:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "Bạn có thể để ô ghi cổng rỗng để dùng giá trị cổng mặc định." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." @@ -8350,7 +8977,15 @@ "Bạn có thể dùng dấu x tại bất kỳ vị trí nào để giữ nguyên quyền truy cập của " "tập tin gốc." -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "" +"Bạn không thể thay đổi mật khẩu và khóa mã hóa từng cái một nếu sử dụng một " +"mật khẩu chính." + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "Không thể nhập các cài đặt từ thư mục cài đặt của chính FileZilla." @@ -8362,62 +8997,75 @@ "Bạn không thể thay thế ký tự không hợp lệ bằng một ký tự không hợp lệ khác. " "Xin hãy nhập vào ký tự mà nó được phép trong tập tin." -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "Bạn không thể tải lên các tập tin vào thư mục root." + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "Bạn đã không nhập tên mới cho tập tin. Ghi đè lên tập tin thay thế?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "Bạn phải chọn ít nhất một liên kết mềm." -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" "Bạn đã chọn hơn 10 tập tin để biên tập, bạn có thực sự muốn tiếp tục không?" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "" "Bạn đã chọn hơn 10 tập tin hay thư mục, bạn có thực sự muốn tiếp tục không?" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." msgstr "Bạn phải nhập tên máy chủ." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" msgstr "Bạn phải nhập vào một đường dẫn đến tập tin khóa" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "Bạn phải nhập thư mục máy nội bộ." -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "Bạn phải nhập thư mục máy mạng." + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "Bạn phải nhập một địa chỉ IPv4 hợp lệ." -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "Bạn phải nhập vào một khóa mã hóa hợp lệ." + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "Bạn phải nhập thư mục được phép ghi." -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "Bạn phải nhập tài khoản của bạn" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "Bạn phải ghi rõ tên tài khoản người dùng" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8425,7 +9073,11 @@ "Bạn có khả năng có một bộ định tuyến router hay tường lửa firewall mà nó " "chỉnh sửa dữ liệu truyền đi." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "Bạn cần nhập vào một mật khẩu chính." + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "Bạn cần nhập tên dấu trang." @@ -8433,7 +9085,7 @@ msgid "You need to enter a name for the log file." msgstr "Bạn cần nhập tên tập tin nhật ký." -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "Bạn cần nhập lệnh được đóng mở ngoặc chính xác." @@ -8447,15 +9099,15 @@ msgstr "" "Bạn cần nhập giá trị cổng máy chủ ủy nhiệm trong khoảng từ 1 tới 65535." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "Bạn cần nhập ít nhất một đường dẫn, dấu trang rỗng không được hỗ trợ." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8463,7 +9115,7 @@ "Bạn cần phải nhập vào cả đường dẫn máy nội bộ và máy mạng để bật chế độ " "duyệt đồng bộ cho dấu trang này." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." @@ -8471,23 +9123,31 @@ "Bạn cần phải nhập vào cả đường dẫn máy nội bộ và máy mạng để bật chế độ " "duyệt đồng bộ cho địa chỉ này." -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "" +"Bạn cần phải cấp quyền cho FileZilla truy cập vào các thư mục mà bạn muốn " +"tải các tập tin về đó hoặc là tải các tập tin từ đó." + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "Bạn phải chỉ ra tập tin nội bộ." -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "Bạn phải chỉ ra tập tin máy mạng." -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "Bạn phải chỉ ra đường dẫn máy chủ." -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "Bạn phải chỉ ra một máy chủ." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8495,66 +9155,66 @@ "Bạn có thể không có vấn đề với việc kết nối tới các máy chủ khác, việc " "truyền tập tin có thể làm việc một cách đúng đắn." -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2780 msgid "Your computer will suspend unless you click Cancel." msgstr "Máy tính của bạn sẽ ngừng trừ khi bạn bấm vào Thôi." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "sau" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "trước" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" -msgstr "bắt đầu với" +msgstr "bắt đầu bằng" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "byte" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "có chứa" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "Tùy chỉnh" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "không chứa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" -msgstr "không bằng nhau" +msgstr "không bằng" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" -msgstr "kết thúc với" +msgstr "kết thúc bằng" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" -msgstr "bằng nhau" +msgstr "bằng" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "tập tin" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8564,96 +9224,197 @@ "Xin chắc chắn là tập tin thi hành sẵn có trong cùng thư mục với tập tin thi " "hành chính của FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp thuộc về một phiên bản khác của FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "không thể khởi động fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj thuộc về một phiên bản khác của FileZilla" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "không thể khởi động fzstorj" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"không thể khởi động fzstorj.\n" +"Xin chắc chắn là tập tin thi hành sẵn có trong cùng thư mục với tập tin thi " +"hành chính của FileZilla." + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers không trả về chứng nhận nào cả." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 gặp lỗi" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "lớn hơn" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "nhóm có thể thực thi" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "nhóm được phép đọc" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "nhóm được phép ghi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "http://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "bằng với" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "được đặt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" -msgstr "chưa được đặt" +msgstr "chưa đặt" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "ít hơn" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "khớp với biểu thức chính quy" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "tên mới" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" -msgstr "người được chạy chương trình" +msgstr "người sở hữu được thực thi" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" -msgstr "người được phép đọc" +msgstr "người sở hữu được phép đọc" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" -msgstr "người được phép ghi" +msgstr "người sở hữu được phép ghi" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:63 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "không rõ" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "ai cũng được phép thực thi" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "ai cũng được phép đọc" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "ai cũng được phép ghi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" -#~ msgid "Deleting directories" -#~ msgstr "Đang xóa các thư mục" +#~ msgid "" +#~ "Malformed response: Server sent response body with a request verb or " +#~ "response code that disallows a response body." +#~ msgstr "" +#~ "Đáp ứng trả về sai dạng: Máy chủ gửi phần thân với một động từ yêu cầu " +#~ "hoặc một mã đáp ứng cái mà không cho phép ở phần thân đáp ứng." + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "&Không lưu mật khẩu (nên dùng)" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "Khoảng chênh múi giờ của của máy chủ dịch vụ là %d giây." + +#~ msgid "Host key fingerprint:" +#~ msgstr "Dấu vân tay máy chủ:" + +#~ msgid "Available sizes" +#~ msgstr "Kích thước cho phép" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "Không thể tải thanh công cụ Kết Nối Nhanh từ tập tin nguồn" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize được gọi mà không có gói mạng nào" + +#~ msgid "Filename &filters..." +#~ msgstr "Các &bộ lọc tên tập tin…" + +#~ msgid "Could not add trust" +#~ msgstr "Không thể thêm tin cậy" + +#~ msgid "%d files added to queue" +#~ msgstr "%d tập tin được thêm vào hàng đợi" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "" +#~ "Không thể nhập giấy chứng nhận ngang hàng, gnutls_x509_crt_import gặp lỗi" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "" +#~ "Không thể khởi tạo cấu trúc cho giấy chứng nhận ngang hàng, " +#~ "gnutls_x509_crt_init gặp lỗi" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "Quét toàn bộ các tập tin để thêm vào hàng đợi" + +#~ msgid "Scanning for files to upload" +#~ msgstr "Quét toàn bộ các tập tin để tải lên" + +#~ msgid "Waiting" +#~ msgstr "Đang chờ" + +#~ msgid "&Disconnect from server" +#~ msgstr "Máy chủ &ngắt kết nối" + +#~ msgid "&Show message" +#~ msgstr "&Hiển thị thông điệp" + +#~ msgid "Do ¬hing" +#~ msgstr "Khô&ng làm gì cả" + +#~ msgid "No more files in the queue!" +#~ msgstr "Không thể thêm tập tin vào hàng đợi nữa!" + +#~ msgid "Connected" +#~ msgstr "Đã kết nối" #~ msgid "Deleting multiple unrelated directories is not yet supported" #~ msgstr "Việc bội xóa không liên quan đến thư mục vẫn chưa được hỗ trợ" @@ -8798,9 +9559,6 @@ #~ msgid "Failed to parse trusted root cert." #~ msgstr "Phân tích xác thực giấy phép gốc gặp lỗi." -#~ msgid "Root certificate is not trusted" -#~ msgstr "Thông tin xác nhận không được xác nhận." - #~ msgid "Cannot load file, not a valid XML file." #~ msgstr "Không thể tải tập tin, tập tin XML không hợp lệ." diff -Nru filezilla-3.15.0.2/locales/zh_CN.po filezilla-3.33.0/locales/zh_CN.po --- filezilla-3.15.0.2/locales/zh_CN.po 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/locales/zh_CN.po 2018-03-29 08:59:00.000000000 +0000 @@ -3,13 +3,13 @@ # Wylmer Wang , 2011, 2012, 2013, 2014. # Jeff Bai , 2014. # Sun Junwen , 2010, 2015. -# +# msgid "" msgstr "" "Project-Id-Version: FileZilla 3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-13 13:13+0100\n" -"PO-Revision-Date: 2016-01-02 20:32+0800\n" +"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n" +"POT-Creation-Date: 2018-03-23 15:52+0100\n" +"PO-Revision-Date: 2018-03-03 18:58+0800\n" "Last-Translator: Sun Junwen \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -18,219 +18,223 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.4\n" +"X-Generator: Poedit 1.8.11\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:56 -#: ../../locales/../src/interface/statuslinectrl.cpp:200 +#: ../../locales/../src/interface/statuslinectrl.cpp:59 +#: ../../locales/../src/interface/statuslinectrl.cpp:212 msgid "%H:%M:%S elapsed" msgstr "已耗时 %H:%M:%S" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting -#: ../../locales/../src/interface/statuslinectrl.cpp:61 -#: ../../locales/../src/interface/statuslinectrl.cpp:206 +#: ../../locales/../src/interface/statuslinectrl.cpp:64 +#: ../../locales/../src/interface/statuslinectrl.cpp:218 msgid "%H:%M:%S left" msgstr "剩余 %H:%M:%S" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:524 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:525 #, c-format msgid "" "%a - Account (Lines containing this will be omitted if not using Account " "logontype)" msgstr "%a - 帐号 (如果不是使用帐号登录的方式，该行就会被忽略)" -#: ../../locales/../src/interface/filelist_statusbar.cpp:47 -#: ../../locales/../src/interface/filelist_statusbar.cpp:57 -#: ../../locales/../src/interface/filelist_statusbar.cpp:67 +#: ../../locales/../src/interface/filelist_statusbar.cpp:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:76 #, c-format msgid "%d directory" msgid_plural "%d directories" msgstr[0] "%d 个目录" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:484 -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/RemoteListView.cpp:1431 +#: ../../locales/../src/interface/search.cpp:876 +#: ../../locales/../src/interface/search.cpp:1263 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" msgstr[0] "%d 个目录及其内容" -#: ../../locales/../src/interface/filelist_statusbar.cpp:46 -#: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1385 -#: ../../locales/../src/interface/search.cpp:483 -#: ../../locales/../src/interface/search.cpp:742 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:75 +#: ../../locales/../src/interface/RemoteListView.cpp:1430 +#: ../../locales/../src/interface/search.cpp:875 +#: ../../locales/../src/interface/search.cpp:1262 #, c-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d 个文件" -#: ../../locales/../src/interface/filelist_statusbar.cpp:63 +#: ../../locales/../src/interface/filelist_statusbar.cpp:71 #, c-format msgid "%d file. Total size: %s" msgid_plural "%d files. Total size: %s" msgstr[0] "%d 个文件。大小总共: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:61 +#: ../../locales/../src/interface/filelist_statusbar.cpp:68 #, c-format msgid "%d file. Total size: At least %s" msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d 个文件。大小总共: 至少 %s" -#: ../../locales/../src/interface/QueueView.cpp:2778 -#, c-format -msgid "%d files added to queue" -msgstr "%d 个文件已加入队列" - -#: ../../locales/../src/engine/ControlSocket.cpp:105 +#: ../../locales/../src/engine/ControlSocket.cpp:77 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:502 msgid "%h - Host" msgstr "%h - 主机" -#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#: ../../locales/../src/interface/recursive_operation_status.cpp:120 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu 个目录" -#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#: ../../locales/../src/interface/recursive_operation_status.cpp:119 #, c-format msgid "%llu file" msgid_plural "%llu files" msgstr[0] "%llu 个文件" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:518 #, c-format msgid "%p - Password" msgstr "%p - 密码" -#: ../../locales/../src/interface/statuslinectrl.cpp:161 +#: ../../locales/../src/interface/statuslinectrl.cpp:170 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/秒)" -#: ../../locales/../src/interface/statuslinectrl.cpp:164 +#: ../../locales/../src/interface/statuslinectrl.cpp:173 #, c-format msgid "%s (? B/s)" msgstr "%s (? B/秒)" -#: ../../locales/../src/interface/verifycertdialog.cpp:46 +#: ../../locales/../src/interface/verifycertdialog.cpp:229 #, c-format msgid "%s - Certificate expired!" msgstr "%s - 证书已过期！" -#: ../../locales/../src/interface/verifycertdialog.cpp:32 +#: ../../locales/../src/interface/verifycertdialog.cpp:214 #, c-format msgid "%s - Not yet valid!" msgstr "%s - 尚未生效！" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:533 #, c-format msgid "%s - Proxy user" msgstr "%s - 代理服务器用户" -#: ../../locales/../src/interface/filelist_statusbar.cpp:72 +#: ../../locales/../src/interface/filelist_statusbar.cpp:82 #, c-format msgid "%s and %s. Total size: %s" msgstr "%s 和 %s。大小总计: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:70 +#: ../../locales/../src/interface/filelist_statusbar.cpp:79 #, c-format msgid "%s and %s. Total size: At least %s" msgstr "%s 和 %s。大小总计: 至少 %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:66 +#: ../../locales/../src/engine/sizeformatting_base.cpp:72 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s 字节" -#: ../../locales/../src/interface/FileZilla.cpp:617 +#: ../../locales/../src/interface/FileZilla.cpp:639 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Please download FileZilla again. If this problem persists, please submit a " "bug report." msgstr "" -"未找到 %s。缺少该 FileZilla 组件，SFTP 无法工作。\n" +"无法找到 %s。缺少该 FileZilla 组件，%s 无法工作。\n" "\n" "请重新下载 FileZilla。如果该问题仍然存在，请提交一份问题报告。" -#: ../../locales/../src/interface/FileZilla.cpp:702 +#: ../../locales/../src/interface/FileZilla.cpp:729 #, c-format msgid "" -"%s could not be found. Without this component of FileZilla, SFTP will not " +"%s could not be found. Without this component of FileZilla, %s will not " "work.\n" "\n" "Possible solutions:\n" "- Make sure %s is in a directory listed in your PATH environment variable.\n" -"- Set the full path to %s in the FZ_FZSFTP environment variable." +"- Set the full path to %s in the %s environment variable." msgstr "" -"未找到 %s。缺少该 FileZilla 组件，SFTP 无法工作。\n" +"无法找到 %s。缺少该 FileZilla 组件，%s 无法工作。\n" "\n" "可能的解决方法:\n" -"- 确保 %s 目录已列在您的 PATH 环境变量中。\n" -"- 在 FZ_FZSFTP 环境变量中设置到 %s 的完整路径。" +"- 确保 %s 路径已列在您的环境变量 PATH 中。\n" +"- 将 %s 的完整路径设置在环境变量 %s 中。" -#: ../../locales/../src/interface/verifycertdialog.cpp:63 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 #, c-format msgid "%s with %d bits" msgstr "%s，有 %d 位" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#: ../../locales/../src/interface/verifycertdialog.cpp:353 +#, c-format +msgid "%s:%d - Hostname does not match certificate" +msgstr "%s:%d - 服务器主机名与证书不匹配" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:510 #, c-format msgid "%u - Username" msgstr "%u - 用户名" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:541 msgid "%w - Proxy password" msgstr "%w - 代理服务器密码" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3869 msgid "&Abort previous connection and connect in current tab" msgstr "放弃之前的连接并在当前标签中连接(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:237 msgid "&About..." msgstr "关于(&A)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2729 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:227 msgid "&Account:" msgstr "帐号(&A):" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:80 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:208 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:209 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:512 msgid "&Active" msgstr "主动(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Add bookmark..." msgstr "添加书签(&A)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4207 +msgid "&Add directory..." +msgstr "添加目录(&A)…" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:249 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:295 msgid "&Add files to queue" msgstr "添加文件到队列(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:646 msgid "&Add key file..." -msgstr "添加密钥文件(&A)…" +msgstr "添加密钥文件(&A)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:505 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 msgid "&Add to queue" msgstr "添加到队列(&A)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "&Adjust server timezone offset:" msgstr "调整服务器时区(&A):" @@ -238,71 +242,76 @@ msgid "&Always trust certificate in future sessions." msgstr "在以后的会话中始终信任该证书(&A)。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1087 msgid "&Always trust this host, add this key to the cache" msgstr "总是信任该主机，并将该密钥加入缓存(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2038 msgid "&Always use default editor" msgstr "总是使用默认编辑器(&A)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 msgid "&Always use selection for unassociated files" msgstr "对所有未关联文件总使用该选择(&A)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:184 msgid "&Always use this action" msgstr "总是使用该操作(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:342 msgid "&Ask your operating system for the external IP address" msgstr "向您的操作系统查询外部 IP 地址(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1055 msgid "&Auto" msgstr "自动(&A)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:574 msgid "&Autodetect" msgstr "自动检测(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:312 +msgid "&Background color:" +msgstr "背景颜色(&B)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:152 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1070 msgid "&Binary" msgstr "二进制(&B)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1701 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)" msgstr "使用 SI 式二进制前缀。(例如 1 KB = 1024 bytes)(&B)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:208 msgid "&Bookmarks" msgstr "书签(&B)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3406 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2010 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:401 msgid "&Browse..." msgstr "浏览(&B)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:956 msgid "&Burst tolerance:" msgstr "允许峰值(&B):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:494 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4098 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:34 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:35 msgid "&Cancel" msgstr "取消(&C)" @@ -312,21 +321,25 @@ #: ../../locales/../src/interface/resources/xrc/update.xrc:28 msgid "&Close" -msgstr "关闭 (&C)" +msgstr "关闭(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Close FileZilla" msgstr "关闭 FileZilla(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:409 +msgid "&Close FileZilla once" +msgstr "关闭 FileZilla(&C)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:663 msgid "&Configure speed limits..." msgstr "设置速度限制(&C)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:167 msgid "&Configure..." msgstr "配置(&C)..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:653 msgid "&Connect" msgstr "连接(&C)" @@ -334,150 +347,146 @@ msgid "&Copy current connection to Site Manager..." msgstr "添加当前连接到站点管理器(&C)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:985 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:439 msgid "&Copy to clipboard" msgstr "复制到剪贴板(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:579 msgid "&Create directory" msgstr "创建目录(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:643 msgid "&Create new tab" msgstr "创建新标签(&C)" -#: ../../locales/../src/interface/menu_bar.cpp:72 +#: ../../locales/../src/interface/menu_bar.cpp:70 msgid "&Debug" msgstr "调试(&D)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2314 msgid "&Debug information in message log:" msgstr "消息记录中的调试信息(&D):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1980 msgid "&Default editor:" msgstr "默认编辑器(&D):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:139 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:357 msgid "&Default file exists action..." msgstr "对已存在文件的默认操作(&D)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:156 msgid "&Delay between failed login attempts:" msgstr "登陆重试延时(&D):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3078 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:588 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "删除(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3598 msgid "&Delete symlink" msgstr "删除符号链接(&D)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:58 +msgid "&Directory access permissions..." +msgstr "目录访问权限(&D)..." + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:74 msgid "&Directory comparison" -msgstr "目录比较(&D)" +msgstr "目录对比(&D)" -#: ../../locales/../src/interface/state.cpp:887 +#: ../../locales/../src/interface/state.cpp:1030 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "停止同步浏览并且继续修改本地目录(&D)？" -#: ../../locales/../src/interface/state.cpp:960 +#: ../../locales/../src/interface/state.cpp:1108 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "停止同步浏览并且继续修改远程目录(&D)？" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2025 msgid "&Discard local file then download and edit file anew" msgstr "放弃本地文件，重新下载并编辑(&D)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:189 msgid "&Disconnect" msgstr "断开连接(&D)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "从服务器断开(&D)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1473 msgid "&Display momentary transfer speed instead of average speed" msgstr "显示实时传输速度而非平均速度(&D)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1688 msgid "&Display size in bytes" msgstr "以字节为单位显示(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 -msgid "&Do not remember passwords (recommended)" -msgstr "不要保存密码(推荐)(&D)" - #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." msgstr "不再显示此对话框(&D)。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:390 msgid "&Don't use external IP address on local connections." msgstr "本地连接不使用外部 IP 地址(&D)。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1895 msgid "&Double-click action on files:" msgstr "双击文件操作(&D):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:290 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:500 msgid "&Download" msgstr "下载(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3392 msgid "&Download to:" msgstr "下载到(&D):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:617 msgid "&Download..." msgstr "下载(&D)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1180 msgid "&Downloads:" msgstr "下载(&D):" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:263 msgid "&Edit" msgstr "编辑(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1367 msgid "&Edit filter rules..." msgstr "编辑过滤器规则(&E)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:72 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:159 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:76 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:543 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:659 msgid "&Enable" msgstr "启用(&E)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:688 msgid "&Enable compression" msgstr "启用压缩(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:897 msgid "&Enable speed limits" msgstr "启用速度限制(&E)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:599 msgid "&Encoding:" msgstr "编码(&E):" @@ -485,28 +494,28 @@ msgid "&Encryption:" msgstr "加密(&E):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "&Enter custom command..." msgstr "输入自定义命令(&E)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3862 msgid "&Establish connection in a new tab" msgstr "在新标签中建立连接(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:606 msgid "&Execute" msgstr "执行(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1776 msgid "&Export Site Manager entries" msgstr "导出站点管理器记录(&E)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:598 msgid "&Export..." msgstr "导出(&E)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:427 msgid "&Fall back to active mode" msgstr "退回到主动模式(&F)" @@ -514,88 +523,98 @@ msgid "&File" msgstr "文件(&F)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 msgid "&File Attributes..." msgstr "文件属性(&F)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:340 msgid "&File permissions..." msgstr "文件权限(&F)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2490 msgid "&File:" msgstr "文件(&F):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1487 msgid "&Filter conditions:" msgstr "过滤器条件(&F):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1248 msgid "&Filter sets:" msgstr "过滤器集合(&F):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1851 +msgid "&Filters" +msgstr "过滤器(&F)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 msgid "&Filters:" msgstr "过滤器(&F):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1964 msgid "&Finish editing and delete local file" msgstr "结束编辑并删除本地文件(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3523 +msgid "" +"&Flatten local paths, upload all contained files directly into target " +"directory" +msgstr "展开本地路径，将所有包含的文件上传到目标目录(&F)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3428 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "展开远程路径，将所有包含的文件下载到目标目录(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3605 msgid "&Follow symlink, delete target directory contents" msgstr "跟踪符号链接，删除目标目录内容(&F)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:368 msgid "&Get external IP address from the following URL:" msgstr "从以下 URL 得到外部 IP 地址(&G):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:230 msgid "&Getting help..." msgstr "获得帮助(&G)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "&Global bookmark" msgstr "全局书签(&G)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:725 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 使用 CONNECT 方式" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:220 msgid "&Help" msgstr "帮助(&H)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:91 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Hide identical files" msgstr "隐藏相同的文件(&H)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Highest" msgstr "最高(&H)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:306 msgid "&Highest available port:" msgstr "最高可用端口(&H):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2395 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:26 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:94 +#: ../../locales/../src/interface/quickconnectbar.cpp:47 msgid "&Host:" msgstr "主机(&H):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1696 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "&IEC 式二进制前缀 (例如 1 KiB = 1024 bytes)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1582 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (示例: 2007-09-15)" @@ -603,88 +622,96 @@ msgid "&Import..." msgstr "导入(&I)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2071 msgid "&Inherit system's filetype associations" msgstr "继承系统的文件类型关联(&I)" -#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +#: ../../locales/../src/interface/resources/xrc/update.xrc:114 msgid "&Install new version" -msgstr "安装新版 (&I)" +msgstr "安装新版(&I)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3516 +msgid "&Keep local path structure relative to search root" +msgstr "保持本地目录路径相对于搜索的根目录(&K)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3421 msgid "&Keep remote path structure relative to search root" msgstr "保持远程目录路径相对于搜索的根目录(&K)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:239 msgid "&Key file:" msgstr "密钥文件(&K):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1352 msgid "&Layout of file and directory panes:" msgstr "文件和目录面板布局(&L):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:269 msgid "&Limit local ports used by FileZilla" msgstr "限制 FilaZila 使用的本地端口(&L)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "&Limit number of simultaneous connections" msgstr "限制并发连接数(&L)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "&Local directory tree" msgstr "本地目录树(&L)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2896 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2986 msgid "&Local directory:" msgstr "本地目录(&L):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3252 +msgid "&Local search" +msgstr "本地搜索(&L)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2202 msgid "&Log to file" msgstr "日志文件(&L)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:184 msgid "&Logon Type:" msgstr "登录类型(&L):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2692 msgid "&Logontype:" msgstr "登录类型(&L):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:374 msgid "&Low" msgstr "低(&L)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:214 msgid "&Manage bookmarks..." msgstr "管理书签(&M)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:173 msgid "&Manual transfer..." msgstr "手动传输(&M)..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:538 msgid "&Maximum number of connections:" msgstr "最大连接数(&M):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:138 msgid "&Maximum number of retries:" msgstr "最大重试次数(&M):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Message log" msgstr "消息日志(&M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1425 msgid "&Minimize to tray" msgstr "最小化到托盘(&M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 msgid "&Name sorting mode:" msgstr "名称排序方式(&N):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2869 msgid "&Name:" msgstr "名字(&N):" @@ -692,7 +719,7 @@ msgid "&Network configuration wizard..." msgstr "网络配置向导(&N)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 msgid "&New" msgstr "新建(&N)" @@ -700,7 +727,7 @@ msgid "&New Site" msgstr "新站点(&N)" -#: ../../locales/../src/interface/Mainfrm.cpp:1665 +#: ../../locales/../src/interface/Mainfrm.cpp:1763 msgid "&New version available!" msgstr "有新版本！(&N)" @@ -708,154 +735,165 @@ msgid "&Next >" msgstr "下一步(&N) >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2100 msgid "&No" msgstr "否(&N)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:459 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:720 msgid "&None" msgstr "无(&N)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "&Normal" msgstr "正常(&N)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:692 msgid "&Numeric value:" msgstr "数字值(&N):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:661 msgid "&OK" msgstr "确定(&O)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:474 msgid "&OPEN" msgstr "打开(&O)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:574 msgid "&Open" msgstr "打开(&O)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:128 msgid "&Overwrite" msgstr "覆盖(&O)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:519 msgid "&Passive" msgstr "被动(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:334 msgid "&Password:" msgstr "密码(&P):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "&Play sound" msgstr "播放声音(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2408 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2650 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 +#: ../../locales/../src/interface/quickconnectbar.cpp:60 msgid "&Port:" msgstr "端口(&P):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:157 msgid "&Preserve timestamps of transferred files" msgstr "保留传输文件的时间戳(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1845 msgid "&Queue" msgstr "队列(&Q)" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 +#: ../../locales/../src/interface/quickconnectbar.cpp:68 msgid "&Quickconnect" msgstr "快速连接(&Q)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Quickconnect bar" msgstr "快速连接工具栏(&Q)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1709 msgid "&Quickconnect history" msgstr "快速连接栏历史(&Q)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:594 msgid "&Read" msgstr "读取(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Reconnect" msgstr "重新连接(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "&Reconnect information" msgstr "重新连接信息(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:65 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:654 msgid "&Refresh" msgstr "刷新(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:475 +msgid "&Remember master password until FileZilla is closed" +msgstr "在 FileZilla 关闭前记住主密码(&R)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:367 msgid "&Remember password until FileZilla is closed" msgstr "在 FileZilla 关闭前记住密码(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 -msgid "&Remember passwords" -msgstr "记住密码(&R)" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2923 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 msgid "&Remote directory:" msgstr "远程目录(&R):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2526 msgid "&Remote path:" msgstr "远程路径(&R):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3259 +msgid "&Remote search" +msgstr "远程搜索(&R)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1118 msgid "&Remove" msgstr "移除(&R)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:651 msgid "&Remove key" msgstr "移除密钥(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4212 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Remove selected" msgstr "移除选定(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:280 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3072 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:284 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:592 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "重命名(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1266 msgid "&Rename..." msgstr "重命名(&R)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2018 msgid "&Reopen local file" msgstr "重新打开本地文件(&R)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1000 msgid "&Replace invalid characters with:" msgstr "将无效字符替换为(&R):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&Report a bug..." msgstr "报告问题(&R)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +msgid "&Request attention" +msgstr "请求用户注意(&R)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:462 msgid "&Reset and requeue all" msgstr "重置并将所有文件重新加入队列(&R)" @@ -863,39 +901,39 @@ msgid "&Restart Wizard" msgstr "重新开始向导(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:158 msgid "&Resume" msgstr "续传(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "&Run command..." msgstr "运行命令(&R)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:77 msgid "&Run configuration wizard now..." msgstr "运行配置向导(&R)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2164 msgid "&Run update check now..." msgstr "检查更新(&R)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:469 msgid "&SITE" msgstr "站点(&S)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:735 msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1260 msgid "&Save as..." msgstr "保存为(&S)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3267 msgid "&Search" msgstr "搜索(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:194 msgid "&Search remote files..." msgstr "搜索远程文件(&S)..." @@ -903,20 +941,20 @@ msgid "&Select Entry:" msgstr "选择项(&S):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1947 msgid "&Select language:" msgstr "选择语言(&S):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 msgid "&Select the columns that should be displayed:" msgstr "设置要显示的栏目(&S):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:178 msgid "&Server" msgstr "服务器(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1839 msgid "&Settings" msgstr "设置(&S)" @@ -924,23 +962,19 @@ msgid "&Settings..." msgstr "设置(&S)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2303 msgid "&Show debug menu" msgstr "显示调试菜单(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:435 msgid "&Show detailed log" msgstr "显示详细日志(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "显示消息(&S)" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 msgid "&Show timestamps in message log" msgstr "在消息日志中显示时间戳(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1722 msgid "&Site Manager entries" msgstr "站点管理器条目(&S)" @@ -948,169 +982,188 @@ msgid "&Site Manager..." msgstr "站点管理器(&S)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2850 msgid "&Site-specific bookmark" msgstr "特定站点书签(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:174 msgid "&Skip" msgstr "跳过(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Speed limits" msgstr "速度限制(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3534 msgid "&Start transfer immediately" msgstr "立即开始传输(&S)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1373 msgid "&Swap local and remote panes" msgstr "交换本地面板和远程面板(&S)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 msgid "&TLS Ciphers" msgstr "&TLS 密码" -#: ../../locales/../src/interface/netconfwizard.cpp:227 +#: ../../locales/../src/interface/netconfwizard.cpp:232 msgid "&Test" msgstr "测试(&T)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1500 msgid "&Theme:" msgstr "主题(&T):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:131 msgid "&Transfer" msgstr "传输(&T)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:495 msgid "&Transfer mode:" msgstr "传输模式(&T):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1728 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:126 msgid "&Transfer queue" msgstr "传输队列(&T)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1142 msgid "&Treat dotfiles as ASCII files" msgstr "把点文件作为 ASCII 文件对待(&T)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:247 +#, fuzzy +msgid "&Trust this certificate on the listed alternative hostnames." +msgstr "信任该证书所列的主机备用名(&T)。" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2140 msgid "&Unedit" msgstr "放弃修改(&U)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1208 msgid "&Update cached key for this host" msgstr "更新该主机的缓存密钥(&U)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:244 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 msgid "&Upload" msgstr "上传(&U)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3493 +msgid "&Upload to:" +msgstr "上传至(&U):" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:620 +msgid "&Upload..." +msgstr "上传(&U)..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1625 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1201 msgid "&Uploads:" msgstr "上传(&U):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 msgid "&Use custom program" msgstr "使用自定义程序(&U)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 msgid "&Use synchronized browsing" msgstr "使用同步浏览(&U)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Use system's default editor for text files" msgstr "使用系统默认文本编辑器处理文本文件(&U)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:348 msgid "&Use the following IP address:" msgstr "使用以下 IP 地址(&U):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:421 msgid "&Use the server's external IP address instead" msgstr "使用服务器的外部 IP 地址来代替(&U)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1711 msgid "&Use thousands separator" msgstr "使用千位分隔符(&U)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:329 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:198 msgid "&User:" msgstr "用户(&U):" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 +#: ../../locales/../src/interface/quickconnectbar.cpp:52 msgid "&Username:" msgstr "用户名(&U):" -#: ../../locales/../src/interface/Mainfrm.cpp:1659 +#: ../../locales/../src/interface/Mainfrm.cpp:1757 #, c-format msgid "&Version %s" msgstr "版本 %s (&V)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:63 msgid "&View" msgstr "查看(&V)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:304 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 msgid "&View/Edit" msgstr "查看/编辑(&V)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "监视本地编辑的文件并且提示上传修改(&W)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2140 msgid "&When checking for updates, check for:" msgstr "在检查更新时，检查(&W):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:600 msgid "&Write" msgstr "写入(&W)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1971 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2094 msgid "&Yes" msgstr "是(&Y)" -#: ../../locales/../src/engine/local_path.cpp:444 -#: ../../locales/../src/engine/local_path.cpp:490 +#: ../../locales/../src/engine/local_path.cpp:461 +#: ../../locales/../src/engine/local_path.cpp:513 #, c-format msgid "'%s' does not exist or cannot be accessed." msgstr "“%s”不存在或者无法访问。" -#: ../../locales/../src/engine/local_path.cpp:459 #: ../../locales/../src/engine/local_path.cpp:479 -#: ../../locales/../src/engine/local_path.cpp:485 +#: ../../locales/../src/engine/local_path.cpp:500 +#: ../../locales/../src/engine/local_path.cpp:507 #, c-format msgid "'%s' is not a directory." msgstr "“%s”不是目录。" -#: ../../locales/../src/interface/manual_transfer.cpp:427 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/engine/engineprivate.cpp:543 +#, c-format +msgid "'%s' is not a supported protocol." +msgstr "不支持“%s”协议。" + +#: ../../locales/../src/interface/manual_transfer.cpp:419 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 msgid "'Account' logontype not supported by selected protocol" msgstr "选定的协议不支持“帐号”登录类型" -#: ../../locales/../src/interface/manual_transfer.cpp:441 +#: ../../locales/../src/interface/manual_transfer.cpp:435 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." msgstr "“正常”和“帐户”登录类型不可用。请使用“询问密码”。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1021 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." msgstr "“正常”和“帐户”登录类型不可用。您的登录入口已更改为“询问密码”。" -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1119,57 +1172,57 @@ "“quote”通常是本地命令行端向服务器端发送跟在“quote”之后的参数的命令。您也许是" "想输入不以“quote”开头的原始命令。" -#: ../../locales/../src/interface/filelist_statusbar.cpp:76 -#: ../../locales/../src/interface/filelist_statusbar.cpp:83 +#: ../../locales/../src/interface/filelist_statusbar.cpp:87 +#: ../../locales/../src/interface/filelist_statusbar.cpp:94 #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" msgstr[0] "(%d 个对象被滤除)" -#: ../../locales/../src/interface/update_dialog.cpp:254 +#: ../../locales/../src/interface/update_dialog.cpp:313 #, c-format msgid "(%u%% downloaded)" msgstr "(%u%% 已下载)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:859 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:880 msgid "(0 for no limit)" msgstr "(0 代表不限制)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:150 msgid "(0-99)" msgstr "(0-99)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:168 msgid "(0-999 seconds)" msgstr "(0-999 秒)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:838 msgid "(1-10)" msgstr "(1-10)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:110 msgid "(10-9999, 0 to disable)" msgstr "(10-9999，0 表示禁用)" -#: ../../locales/../src/interface/aboutdialog.cpp:85 -#: ../../locales/../src/interface/aboutdialog.cpp:174 +#: ../../locales/../src/interface/aboutdialog.cpp:94 +#: ../../locales/../src/interface/aboutdialog.cpp:194 #, c-format msgid "(app-compat is set to %d.%d)" msgstr "(已设置为与 %d.%d 版本兼容)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1649 msgid "(example: %H:%M)" msgstr "(示例: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1600 msgid "(example: %Y-%m-%d)" msgstr "(示例: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:919 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:944 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 #, c-format msgid "(in %s/s)" msgstr "(以 %s/s)" @@ -1178,7 +1231,7 @@ msgid "-" msgstr "-" -#: ../../locales/../src/interface/statuslinectrl.cpp:209 +#: ../../locales/../src/interface/statuslinectrl.cpp:221 msgid "--:--:-- left" msgstr "剩下 --:--:--" @@ -1198,31 +1251,31 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s 不能与 FTP URL 一起使用。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2324 msgid "0 - None" msgstr "0 - 无" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2325 msgid "1 - Warning" msgstr "1 - 警告" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2326 msgid "2 - Info" msgstr "2 - 信息" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2327 msgid "3 - Verbose" msgstr "3 - 详细" -#: ../../locales/../src/interface/aboutdialog.cpp:98 +#: ../../locales/../src/interface/aboutdialog.cpp:108 msgid "32-bit system" msgstr "32位系统" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2328 msgid "4 - Debug" msgstr "4 - 调试" -#: ../../locales/../src/interface/aboutdialog.cpp:96 +#: ../../locales/../src/interface/aboutdialog.cpp:105 msgid "64-bit system" msgstr "64位系统" @@ -1230,22 +1283,26 @@ msgid "< &Back" msgstr "< 上一步(&B)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "该名称的书签已经存在。请输入一个未使用的名字。" +#: ../../locales/../src/engine/tlssocket_impl.cpp:1283 +msgid "A certificate in the chain was signed using an insecure algorithm" +msgstr "证书链中某张证书的签名使用了不安全的算法" + #: ../../locales/../src/interface/settings/optionspage_edit.cpp:95 msgid "A default editor needs to be set." msgstr "需要设置默认编辑器。" -#: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:167 +#: ../../locales/../src/interface/RemoteTreeView.cpp:123 +#: ../../locales/../src/interface/state.cpp:852 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "目录无法被拖入其子目录中。" @@ -1258,20 +1315,20 @@ "有一些服务器不允许被动模式或者配置错误。这样的情况下您必须使用主动模式。在主" "动模式下，FileZilla 打开一个端口并且请求服务器来连接。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1890 msgid "A file previously opened has been changed." msgstr "之前打开的文件被修改。" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "A file with that name is already being transferred." msgstr "该名称的文件已在进行传输。" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "" "A file with that name is still being edited. Please close it and try again." msgstr "该名称的文件仍在编辑，请将其关闭后再试一次。" -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1284,11 +1341,18 @@ "除非解决了这个问题，不然文件在文件列表中可能会不显示。\n" "本次会话将不再显示该警告。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4079 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1330 +msgid "" +"A lost master password cannot be recovered! Please thorougly memorize your " +"password." +msgstr "主密码一旦丢失无法恢复！请牢记您的密码。" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:55 msgid "A new version of FileZilla is available:" msgstr "有新版的 FileZilla 可用:" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../locales/../src/interface/Mainfrm.cpp:711 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1296,13 +1360,13 @@ "一个正常的服务器总是会显示所有文件，但有些配置不恰当的服务器会把文件隐藏起" "来。通过这个选项强制服务器显示所有文件。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:246 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." msgstr "正常的服务器是不需要这项的，如果您需要的话请联系服务器管理员。" -#: ../../locales/../src/interface/state.cpp:258 +#: ../../locales/../src/interface/state.cpp:284 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1310,17 +1374,17 @@ "一个远程操作正在进行并且同步浏览是启用的。\n" "关闭同步浏览并且继续修改本地目录？" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:148 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1063 msgid "A&SCII" msgstr "A&SCII" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1111 msgid "A&dd" msgstr "添加(&D)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1248 msgid "A&llow resume of ASCII files" msgstr "允许续传 ASCII 文件(&L)" @@ -1332,51 +1396,53 @@ msgid "A&pply only to uploads" msgstr "只对上传起作用(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:726 msgid "A&pply to all files and directories" msgstr "应用到所有文件和目录(&P)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:491 msgid "A&utomatically remove successful transfers" msgstr "自动移除成功的传输(&U)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2781 msgid "ASCII" msgstr "ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:767 msgid "About FileZilla" msgstr "关于 FileZilla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1400 msgid "Above the file lists" msgstr "在文件列表上面" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:155 -#: ../../locales/../src/interface/manual_transfer.cpp:188 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/manual_transfer.cpp:541 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:119 +msgid "Access to some local directories could not be restored:" +msgstr "无法恢复访问某些本地目录:" + +#: ../../locales/../src/engine/server.cpp:616 +#: ../../locales/../src/engine/server.cpp:639 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:149 +#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/manual_transfer.cpp:536 msgid "Account" msgstr "帐号" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:383 msgid "Action after queue &completion" msgstr "队列完成后执行动作(&C)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2133 msgid "Action on selected file:" msgstr "所选文件的动作:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2013 msgid "Action to perform:" msgstr "执行动作:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:123 msgid "Action:" msgstr "动作:" @@ -1384,13 +1450,13 @@ msgid "Active mode" msgstr "主动模式" -#: ../../locales/../src/interface/netconfwizard.cpp:614 +#: ../../locales/../src/interface/netconfwizard.cpp:627 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "主动模式 FTP 测试失败。FileZilla 不知道正确的外部 IP 地址。" -#: ../../locales/../src/interface/netconfwizard.cpp:601 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1398,7 +1464,7 @@ "主动模式 FTP 测试失败。FileZilla 不知道正确的外部 IP 地址。除此之外，您的路由" "器已经修改了发送地址。" -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:602 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1407,38 +1473,39 @@ "主动模式 FTP 测试失败。FileZilla 知道正确的外部 IP 地址，但是您的路由器或防火" "墙错误地修改了发送地址。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:399 msgid "Active mode IP" msgstr "主动模式 IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3541 msgid "Add files to &queue only" msgstr "只添加文件到队列(&Q)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:570 msgid "Add selected directory to the transfer queue" msgstr "添加选中的文件夹到传输队列" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:247 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:293 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Add selected files and folders to the transfer queue" msgstr "添加选中的文件和文件夹到传输队列" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1903 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1923 msgid "Add to queue" msgstr "添加到队列" -#: ../../locales/../src/engine/proxy.cpp:528 +#: ../../locales/../src/engine/proxy.cpp:513 msgid "Address type not supported" msgstr "不支持该地址类型" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:347 msgid "Advanced" msgstr "高级" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2075 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2155 msgid "" "Advice: Unless you want to test new features, please keep using stable " "versions only. Beta versions and nightly builds are development versions " @@ -1450,15 +1517,16 @@ "开发版本。每日编译版的 FileZilla 可能工作不正常，甚至破坏您的系统。使用 Beta " "版和每日编译版的风险由您自己承担。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3879 msgid "Al&ways perform this action" msgstr "总是进行该操作(&W)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2258 msgid "Algorithm:" msgstr "算法:" -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2658 msgid "All files have been successfully transferred" msgstr "所有文件都已经成功传输" @@ -1466,13 +1534,13 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "所有指定的端口范围必须在 1024 和 65535 之间。" -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2654 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." msgstr[0] "所有传输都已经结束。%d 个文件无法传输。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:214 msgid "Allow &fall back to other transfer mode on failure" msgstr "失败后允许退回到其他传输模式(&F)" @@ -1480,23 +1548,23 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "失败后允许退回到其他传输模式" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3839 msgid "Already connected" msgstr "已连接" -#: ../../locales/../src/interface/verifycertdialog.cpp:84 +#: ../../locales/../src/interface/verifycertdialog.cpp:270 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "别名:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:660 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:661 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." msgstr "" "另外您能使用 PuTTY 内的 Pageant 工具去管理您的密钥。FileZilla 同样也会认可。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:665 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:666 msgid "" "Alternatively you can use your system's SSH agent. To do so, make sure the " "SSH_AUTH_SOCK environment variable is set." @@ -1504,13 +1572,13 @@ "另外您也可以使用系统内的 SSH 代理。如果要这样做，需要确认是否已经设置了 " "SSH_AUTH_SOCK 环境变量。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:129 +#: ../../locales/../src/interface/resources/xrc/update.xrc:156 msgid "" "Alternatively, you can also download the latest version from the FileZilla " "website:" msgstr "或者，从 FileZilla 网站下载最新的版本:" -#: ../../locales/../src/interface/QueueView.cpp:1908 +#: ../../locales/../src/interface/QueueView.cpp:1662 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1519,7 +1587,7 @@ "在从“%s”加载传输队列时发生了一个错误。\n" "队列中的一些项可能没有恢复。" -#: ../../locales/../src/interface/QueueView.cpp:1818 +#: ../../locales/../src/interface/QueueView.cpp:1555 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1528,78 +1596,81 @@ "在保存传输队列到“%s”时发生了一个错误。\n" "队列中的一些项可能没有保存。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1287 +msgid "An issuer in the certificate chain is not a certificate authority" +msgstr "证书链中某张证书的颁发者不可信" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "目标位置已存在与所拖拽项目同名的文件。" -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:191 -#: ../../locales/../src/interface/manual_transfer.cpp:207 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 +#: ../../locales/../src/engine/server.cpp:641 +#: ../../locales/../src/interface/manual_transfer.cpp:147 +#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/interface/manual_transfer.cpp:203 +#: ../../locales/../src/interface/manual_transfer.cpp:534 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1737 msgid "Anonymous" msgstr "匿名" -#: ../../locales/../src/interface/state.cpp:937 +#: ../../locales/../src/interface/state.cpp:1084 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "另一个远程操作正在进行，现在无法更改目录。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:854 msgid "Any changes made in the Site Manager could not be saved." msgstr "站点管理器的任何更改都无法保存。" -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:1004 msgid "Any changes made to the filters could not be saved." msgstr "过滤器的任何更改都无法保存。" -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:912 msgid "Any changes made to the filters will not be saved." msgstr "过滤器的任何更改都无法保存。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:740 msgid "App&ly to directories only" msgstr "只应用到目录(&L)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 msgid "Apply" msgstr "应用" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:207 msgid "Apply to ¤t queue only" msgstr "只应用到当前队列(&C)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:733 msgid "Apply to &files only" msgstr "只应用到文件(&F)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77 msgid "Archive" msgstr "归档" -#: ../../locales/../src/engine/socket.cpp:1081 +#: ../../locales/../src/engine/socket.cpp:1107 msgid "Argument buffer overflow" msgstr "参数缓冲区溢出" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1402 msgid "As tab in the transfer queue pane" msgstr "作为传输队列面板中的标签" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1428 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1186 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1381 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1633 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1450 msgid "Ask for action" msgstr "询问操作" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:182 +#: ../../locales/../src/engine/server.cpp:607 +#: ../../locales/../src/engine/server.cpp:633 +#: ../../locales/../src/interface/manual_transfer.cpp:179 msgid "Ask for password" msgstr "询问密码" @@ -1611,7 +1682,7 @@ msgid "Ask your operating system for the external IP address" msgstr "向您的操作系统询问外部 IP 地址" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3740 msgid "Asking questions in the FileZilla forums" msgstr "在 FileZilla 论坛里提问" @@ -1619,7 +1690,7 @@ msgid "Associated program not found:" msgstr "找不到关联的程序:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:511 msgid "At least one filter condition is incomplete" msgstr "至少有一个过滤条件不完整" @@ -1627,99 +1698,106 @@ msgid "At this point, all required information has been gathered." msgstr "至此，所有必须的信息都已经收集成功。" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 msgid "Attribute" msgstr "属性" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:209 msgid "Authentication failed." msgstr "认证失败。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1509 msgid "Author:" msgstr "作者:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 msgid "Auto" msgstr "自动" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1081 msgid "Automatic file type classification" msgstr "自动对文件进行分类" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 -msgid "Available sizes" -msgstr "可用大小" - -#: ../../locales/../src/engine/sizeformatting_base.cpp:154 -#: ../../locales/../src/engine/sizeformatting_base.cpp:213 +#: ../../locales/../src/engine/sizeformatting_base.cpp:166 +#: ../../locales/../src/engine/sizeformatting_base.cpp:233 msgid "B " msgstr "B <字节单位符号。只传送第一个字母>" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 msgid "B&ypass proxy" msgstr "绕过代理(&Y)" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Bad file descriptor" msgstr "错误的文件描述符" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3777 msgid "Basic usage instructions" msgstr "基本使用说明" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1419 msgid "Behaviour" msgstr "行为" -#: ../../locales/../src/interface/edithandler.cpp:1114 -#: ../../locales/../src/interface/edithandler.cpp:1142 +#: ../../locales/../src/interface/edithandler.cpp:1166 +#: ../../locales/../src/interface/edithandler.cpp:1194 msgid "Being edited" msgstr "正在编辑" -#: ../../locales/../src/engine/tlssocket.cpp:1113 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1273 msgid "Beware! Certificate has been revoked" msgstr "注意！证书已被撤销" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2786 msgid "Binary" msgstr "二进制" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1362 msgid "Blackboard" msgstr "黑板" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 -#: ../../locales/../src/interface/menu_bar.cpp:304 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 +#: ../../locales/../src/interface/sitemanager.cpp:20 +msgid "Blue" +msgstr "蓝色" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:271 +#: ../../locales/../src/interface/menu_bar.cpp:321 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:399 msgid "Bookmark" msgstr "书签" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3049 msgid "Bookmark:" msgstr "书签:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3038 msgid "Bookmarks" msgstr "书签" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:258 msgid "Browse..." msgstr "浏览..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 +#: ../../locales/../src/engine/storj/resolve.cpp:70 +#: ../../locales/../src/engine/storj/resolve.cpp:158 +#: ../../locales/../src/engine/storj/resolve.cpp:226 +#: ../../locales/../src/engine/storj/resolve.cpp:299 +msgid "Bucket not found" +msgstr "Bucket 未找到" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Build date:" msgstr "编译日期:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:828 msgid "Build information" msgstr "编译信息" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:433 msgid "Business category:" msgstr "业务类型:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:284 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:285 msgid "" "By default uses any available local port to establish transfers in active " "mode. If you want to limit FileZilla to use only a small range of ports, " @@ -1728,97 +1806,111 @@ "默认情况下使用任何可用的本地端口来进行主动模式传输。如果您想限制 FileZilla 只" "使用一个小范围内的端口，请在下面填入端口范围。" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:180 msgid "C&ancel current operation" msgstr "取消当前操作(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 msgid "C&lear all" msgstr "全部清除(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:629 msgid "C&opy URL(s) to clipboard" msgstr "复制 URL 到剪贴板(&O)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:336 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:532 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:632 +msgid "C&opy URL(s) with password to clipboard" +msgstr "将 URL 和密码一起复制到到剪贴板(&O)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1587 msgid "C&ustom" msgstr "自定义(&U)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2076 msgid "C&ustom filetype associations:" msgstr "自定义文件格式关联(&U):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:955 msgid "CPU features:" msgstr "CPU 特性:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../locales/../src/engine/ftp/list.cpp:123 msgid "Calculating timezone offset of server..." msgstr "计算服务器时差..." -#: ../../locales/../src/engine/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:690 msgid "Can't read from file" msgstr "无法读取文件" -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:667 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:744 msgid "Can't write data to file." msgstr "无法将数据写入文件。" -#: ../../locales/../src/engine/transfersocket.cpp:652 -#: ../../locales/../src/engine/transfersocket.cpp:718 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:670 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:747 #, c-format msgid "Can't write data to file: %s" msgstr "无法将数据写入文件: %s" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:269 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:245 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:572 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:914 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1185 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1365 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1472 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1596 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1655 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:565 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1106 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1387 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1570 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2812 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2965 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3463 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3628 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3897 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4160 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:668 msgid "Cancel" msgstr "取消" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancel current operation" msgstr "取消当前操作" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 +#: ../../locales/../src/interface/toolbar.cpp:45 msgid "Cancels the current operation" msgstr "取消当前操作" -#: ../../locales/../src/engine/local_path.cpp:454 +#: ../../locales/../src/engine/local_path.cpp:473 #, c-format msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "无法访问“%s”，没有媒介插入或者驱动器未准备好。" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Cannot add server to Site Manager" msgstr "无法添加服务器到站点管理器" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1124 msgid "Cannot assign requested address" msgstr "无法分配请求的地址" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/state.cpp:263 +msgid "" +"Cannot change directory, there already is a synchronized browsing operation " +"in progress." +msgstr "无法修改目录，当前有一个同步浏览操作正在进行。" + +#: ../../locales/../src/interface/context_control.cpp:360 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1826,111 +1918,111 @@ "不能关闭工作中的标签。\n" "取消当前操作并关闭标签？" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" -msgstr "无法比较目录，本地与远程目录使用了不同的过滤器" +msgstr "无法对比目录，本地与远程目录使用了不同的过滤器" #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "无法创建新过滤器" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1705 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1674 +#: ../../locales/../src/interface/LocalListView.cpp:1837 +#: ../../locales/../src/interface/search.cpp:1210 +#: ../../locales/../src/interface/search.cpp:1528 msgid "Cannot edit file" msgstr "无法编辑文件" -#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1713 msgid "Cannot edit file, not connected to any server." msgstr "无法编辑文件，没有连接到任何服务器。" -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Cannot edit file, remote path unknown." msgstr "无法编辑文件，未知远程路径。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:140 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." msgstr "无法和 SFTP 服务器建立 FTP 连接，请选择合适的协议。" -#: ../../locales/../src/interface/quickconnectbar.cpp:36 -#: ../../locales/../src/interface/quickconnectbar.cpp:54 -msgid "Cannot load Quickconnect bar from resource file" -msgstr "无法从资源文件导入快速连接栏" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Cannot load key file" msgstr "无法加载密钥文件" -#: ../../locales/../src/interface/Mainfrm.cpp:994 +#: ../../locales/../src/interface/Mainfrm.cpp:1077 msgid "Cannot load toolbar from resource file" msgstr "无法从资源文件导入工具栏" -#: ../../locales/../src/interface/manual_transfer.cpp:445 +#: ../../locales/../src/interface/manual_transfer.cpp:439 msgid "Cannot remember password" msgstr "无法记住密码" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Cannot rename entry" msgstr "无法重命名记录" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Cannot rename file" msgstr "无法重命名文件" -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/proxy.cpp:139 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "无法将主机名解析为 IPv4 地址以用于 SOCKS4 代理。" -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "Cannot save filterset" msgstr "无法保存过滤器集合" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Cannot select filter" msgstr "无法选择过滤器" -#: ../../locales/../src/interface/edithandler.cpp:1472 -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/edithandler.cpp:1524 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "Cannot set file association" msgstr "无法设置文件格式关联" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "Cannot show dialog" msgstr "无法显示对话框" -#: ../../locales/../src/interface/edithandler.cpp:1644 +#: ../../locales/../src/interface/edithandler.cpp:1696 msgid "Cannot view/edit selected file" msgstr "无法查看/编辑所选的文件" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../locales/../src/interface/list_search_panel.cpp:184 +msgid "Case Insensitive" +msgstr "不分大小写" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1831 msgid "Case insensitive" msgstr "不分大小写" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1830 msgid "Case insensitive (default)" msgstr "不分大小写(默认)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "Case sensitive" msgstr "区分大小写" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1833 msgid "Case sensitive (default)" msgstr "区分大小写(默认)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1702 msgid "Categories to clear" msgstr "需要清除的分类" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Certificate and session data are not available yet." msgstr "证书和会话数据目前不可用。" @@ -1942,36 +2034,40 @@ msgid "Certificate issuer" msgstr "证书颁发者" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1279 +msgid "Certificate signature verification failed" +msgstr "证书签名验证失败" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:306 msgid "Challenge:" msgstr "需要确认:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:575 msgid "Change file attributes" msgstr "改变文件属性" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:341 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 msgid "Change the file permissions." msgstr "改变文件权限。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2275 msgid "Changing logfile settings requires restart of FileZilla." msgstr "修改日志文件设置需要重启 FileZilla。" -#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:605 msgid "Character encoding issue" msgstr "字符编码问题" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:561 msgid "Charset" msgstr "字符集" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:222 msgid "Check for &updates..." msgstr "检查更新(&U)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "Check for FileZilla &updates automatically:" msgstr "自动检查 FileZilla 更新(&U):" @@ -1979,59 +2075,59 @@ msgid "Check for Updates" msgstr "检查更新" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Check for newer versions of FileZilla" msgstr "检查新版的 FileZilla" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Check for updates failed" msgstr "检查更新失败" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftp/logon.cpp:283 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "请检查您的登录凭据。输入的密码开头或末尾有空格。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftp/logon.cpp:279 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." msgstr "请检查您的登录凭据。输入的用户名开头或末尾有空格。" -#: ../../locales/../src/interface/netconfwizard.cpp:761 +#: ../../locales/../src/interface/netconfwizard.cpp:780 msgid "Checking for correct external IP address" msgstr "检查正确的外部 IP 地址" -#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +#: ../../locales/../src/interface/resources/xrc/update.xrc:191 msgid "Checking for updates..." -msgstr "正在检查更新......" +msgstr "正在检查更新..." -#: ../../locales/../src/interface/updater.cpp:716 +#: ../../locales/../src/interface/updater.cpp:780 #, c-format msgid "Checksum match on file %s\n" msgstr "文件 %s 的校验值匹配\n" -#: ../../locales/../src/interface/updater.cpp:712 +#: ../../locales/../src/interface/updater.cpp:776 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "文件 %s 的校验值不匹配\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1623 msgid "Choose a key file" msgstr "选择密钥文件" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1661 msgid "Choose the default local directory" msgstr "选择默认的本地目录" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:386 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2576 msgid "Choose the local directory" msgstr "选择本地目录" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/http/request.cpp:667 msgid "Chunk data improperly terminated" msgstr "块数据错误中止" @@ -2040,54 +2136,62 @@ msgstr "密码:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:647 msgid "Cl&ose tab" msgstr "关闭标签(&O)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1359 msgid "Classic" msgstr "经典" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:447 msgid "Clear &layout cache" msgstr "清空布局缓存(&L)" -#: ../../locales/../src/interface/quickconnectbar.cpp:150 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:454 +msgid "Clear auto&update data" +msgstr "清除自动更新数据(&U)" + +#: ../../locales/../src/interface/quickconnectbar.cpp:197 msgid "Clear history" msgstr "清除历史记录" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1485 -#: ../../locales/../src/interface/clearprivatedata.cpp:34 -#: ../../locales/../src/interface/clearprivatedata.cpp:40 -#: ../../locales/../src/interface/clearprivatedata.cpp:46 -#: ../../locales/../src/interface/clearprivatedata.cpp:77 -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1690 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "Clear private data" msgstr "清除个人信息" -#: ../../locales/../src/interface/quickconnectbar.cpp:149 +#: ../../locales/../src/interface/quickconnectbar.cpp:196 msgid "Clear quickconnect bar" msgstr "清除快速连接栏" -#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "Click on Finish to save your configuration." msgstr "点击完成，保存您的配置。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2304 msgid "Client to server MAC:" msgstr "本地至服务器 MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2294 msgid "Client to server cipher:" msgstr "本地至服务器密码:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/list_search_panel.cpp:61 +msgid "Close" +msgstr "关闭" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:650 msgid "Close &all other tabs" msgstr "关闭所有其它的标签(&A)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1135 -#: ../../locales/../src/interface/Mainfrm.cpp:1156 +#: ../../locales/../src/interface/Mainfrm.cpp:1230 +#: ../../locales/../src/interface/Mainfrm.cpp:1251 msgid "Close FileZilla" msgstr "关闭 FileZilla" @@ -2095,103 +2199,108 @@ msgid "Close all running instances of FileZilla" msgstr "关闭所有运行的 FileZilla 实例" +#: ../../locales/../src/interface/Mainfrm.cpp:2308 +msgid "Close quick search and continue comparing?" +msgstr "关闭快速搜索，继续对比？" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "关闭当前标签" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 msgid "Co&mments:" msgstr "注释(&M):" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "Column properties" msgstr "栏目属性" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Column setup" msgstr "栏目设置" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2020 msgid "Command and its arguments should be properly quoted." msgstr "命令与其参数需要正确的引号包裹。" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Command failed" msgstr "命令执行失败" -#: ../../locales/../src/engine/proxy.cpp:525 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Command not supported" msgstr "不支持该命令" -#: ../../locales/../src/engine/engineprivate.cpp:212 +#: ../../locales/../src/engine/engineprivate.cpp:224 msgid "Command not supported by this protocol" msgstr "命令不被该协议支持" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:287 +#: ../../locales/../src/interface/StatusView.cpp:351 msgid "Command:" msgstr "命令:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:36 msgid "Comment" msgstr "注释" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:431 msgid "Common name:" msgstr "公用名:" -#: ../../locales/../src/interface/netconfwizard.cpp:439 -#: ../../locales/../src/interface/netconfwizard.cpp:452 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:462 msgid "Communication tainted by router or firewall" msgstr "通讯已受路由器或防火墙影响" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:86 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:552 msgid "Compare &modification time" msgstr "比较修改时间(&M)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Compare file&size" msgstr "比较文件大小(&S)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1864 msgid "Comparison &threshold (in minutes):" msgstr "对比差异值(分钟)(&T):" -#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:40 msgid "Comparison threshold needs to be between 0 and 1440 minutes." msgstr "对比值必须在 0 和 1440 分钟之间。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 msgid "Compiled for:" msgstr "编译目标:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:843 msgid "Compiled on:" msgstr "编译平台:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:859 msgid "Compiled with:" msgstr "编译器:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:867 msgid "Compiler flags:" msgstr "编译参数:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78 msgid "Compressed" msgstr "已压缩" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:814 msgid "Concurrent transfers" msgstr "并发传输" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3333 msgid "Conditions are c&ase sensitive" msgstr "条件是区分大小写的(&A)" @@ -2207,41 +2316,42 @@ msgid "Configure port range" msgstr "配置端口范围" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3783 msgid "Configuring FileZilla and your network" msgstr "配置 FileZilla 和您的网络" -#: ../../locales/../src/interface/search.cpp:747 +#: ../../locales/../src/interface/search.cpp:1267 msgid "Confirm deletion" msgstr "确认删除" -#: ../../locales/../src/interface/edithandler.cpp:1586 +#: ../../locales/../src/interface/edithandler.cpp:1638 #: ../../locales/../src/interface/file_utils.h:45 -#: ../../locales/../src/interface/LocalListView.cpp:1669 -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 -#: ../../locales/../src/interface/search.cpp:708 +#: ../../locales/../src/interface/LocalListView.cpp:1799 +#: ../../locales/../src/interface/RemoteListView.cpp:1435 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 +#: ../../locales/../src/interface/search.cpp:1222 +#: ../../locales/../src/interface/search.cpp:1488 msgid "Confirmation needed" msgstr "需要确认" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:589 msgid "Congratulations, your configuration seems to be working." msgstr "祝贺您，您的配置看起来能正常运作。" -#: ../../locales/../src/interface/quickconnectbar.cpp:148 +#: ../../locales/../src/interface/quickconnectbar.cpp:194 msgid "Connect bypassing proxy settings" msgstr "绕过代理设置连接" -#: ../../locales/../src/interface/netconfwizard.cpp:216 -#, fuzzy, c-format +#: ../../locales/../src/interface/netconfwizard.cpp:220 +#, c-format msgid "Connect failed: %s" -msgstr "代理请求失败: %s" +msgstr "连接失败: %s" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 msgid "Connect in current tab" msgstr "在当前标签中连接" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Connect in new tab" msgstr "在新标签中连接" @@ -2249,29 +2359,26 @@ msgid "Connect to specified Site Manager site" msgstr "连接至指定的“站点管理器”站点" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 -msgid "Connected" -msgstr "已连接" - -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:353 msgid "Connecting" msgstr "正在连接" -#: ../../locales/../src/interface/netconfwizard.cpp:210 -#: ../../locales/../src/interface/statuslinectrl.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:214 +#: ../../locales/../src/interface/statuslinectrl.cpp:256 #, c-format msgid "Connecting to %s" msgstr "连接到 %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1051 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#: ../../locales/../src/engine/ControlSocket.cpp:1063 +#: ../../locales/../src/engine/ftp/logon.cpp:96 #, c-format msgid "Connecting to %s through %s proxy" msgstr "连接到 %s，通过代理 %s" -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/proxy.cpp:266 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../locales/../src/engine/ControlSocket.cpp:995 +#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:43 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:42 #, c-format msgid "Connecting to %s..." msgstr "正在连接 %s..." @@ -2280,185 +2387,226 @@ msgid "Connection" msgstr "连接" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Connection aborted" msgstr "连接中止" -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:354 msgid "Connection attempt failed" msgstr "连接尝试失败" -#: ../../locales/../src/engine/ControlSocket.cpp:923 -#: ../../locales/../src/engine/proxy.cpp:240 +#: ../../locales/../src/engine/ControlSocket.cpp:957 +#: ../../locales/../src/engine/proxy.cpp:212 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "尝试连接“%s”失败，正在尝试下一个地址。" -#: ../../locales/../src/engine/ControlSocket.cpp:928 +#: ../../locales/../src/engine/ControlSocket.cpp:963 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "尝试连接“%s”失败。" -#: ../../locales/../src/engine/ControlSocket.cpp:185 -#: ../../locales/../src/engine/engineprivate.cpp:681 +#: ../../locales/../src/engine/ControlSocket.cpp:175 +#: ../../locales/../src/engine/engineprivate.cpp:688 msgid "Connection attempt interrupted by user" msgstr "尝试连接被用户终止" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1078 msgid "Connection attempt timed out" msgstr "连接尝试超时" -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:562 msgid "Connection closed" msgstr "连接关闭" -#: ../../locales/../src/engine/ControlSocket.cpp:1018 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 +#: ../../locales/../src/engine/ControlSocket.cpp:1041 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:75 +#: ../../locales/../src/engine/http/request.cpp:303 +#: ../../locales/../src/engine/http/request.cpp:316 +#: ../../locales/../src/engine/http/request.cpp:327 +#: ../../locales/../src/engine/http/request.cpp:338 msgid "Connection closed by server" msgstr "连接被服务器关闭" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:185 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:201 msgid "Connection established, initializing TLS..." msgstr "连接已建立，正在初始化 TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:224 msgid "Connection established, sending HTTP request" msgstr "连接已建立，正在发送 HTTP 请求" -#: ../../locales/../src/interface/netconfwizard.cpp:333 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:343 msgid "Connection established, waiting for welcome message." -msgstr "连接建立，等待欢迎消息..." +msgstr "连接建立，等待欢迎消息。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:215 msgid "Connection established, waiting for welcome message..." msgstr "连接建立，等待欢迎消息..." -#: ../../locales/../src/interface/netconfwizard.cpp:350 +#: ../../locales/../src/interface/netconfwizard.cpp:360 msgid "Connection lost" msgstr "连接丢失" -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Connection not allowed by ruleset" msgstr "规则设定不允许该连接" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:504 msgid "Connection refused" msgstr "连接被拒绝" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Connection refused by server" msgstr "连接被服务器拒绝" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Connection reset by network" msgstr "连接被网络复位" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Connection reset by peer" msgstr "连接被对方复位" -#: ../../locales/../src/engine/ControlSocket.cpp:560 +#: ../../locales/../src/engine/ControlSocket.cpp:516 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" msgstr[0] "%d 秒后无活动，连接超时" -#: ../../locales/../src/interface/netconfwizard.cpp:1054 +#: ../../locales/../src/interface/netconfwizard.cpp:1079 msgid "Connection timed out." msgstr "连接超时。" -#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:724 msgid "Connection to server lost." msgstr "与服务器的连接丢失。" -#: ../../locales/../src/engine/proxy.cpp:249 +#: ../../locales/../src/engine/proxy.cpp:223 msgid "Connection with proxy established, performing handshake..." msgstr "与代理连接建立，进行握手..." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:582 msgid "Connection with server got closed prematurely." msgstr "服务器过早地关闭了连接。" -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:573 msgid "Connection with the test server failed." msgstr "测试服务器的连接失败。" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:88 msgid "Convert key file" msgstr "转换密钥文件" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:676 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2136 #, c-format msgid "Copy (%d) of %s" msgstr "复制 (%d) / %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:655 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115 #, c-format msgid "Copy of %s" msgstr "复制 %s" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:337 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:533 +msgid "Copy the URLs of the selected items to clipboard, including password." +msgstr "复制选中项的 URL 和密码到剪贴板。" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:529 msgid "Copy the URLs of the selected items to clipboard." msgstr "复制选中项的 URL 到剪贴板。" -#: ../../locales/../src/engine/transfersocket.cpp:180 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:179 #, c-format msgid "Could not accept connection: %s" msgstr "无法接受连接: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:102 +#, c-format +msgid "Could not access path %s" +msgstr "无法访问路径 %s" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1348 +msgid "Could not add certificate to temporary trust list" +msgstr "无法将证书加入临时信任列表" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 msgid "Could not add connection to Site Manager" msgstr "无法添加当前连接到站点管理器" -#: ../../locales/../src/interface/state.cpp:750 +#: ../../locales/../src/interface/state.cpp:868 msgid "Could not complete operation" msgstr "完成操作" -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:178 msgid "Could not connect to server" msgstr "无法连接到服务器" -#: ../../locales/../src/engine/ControlSocket.cpp:1089 +#: ../../locales/../src/engine/ControlSocket.cpp:1096 #, c-format msgid "Could not connect to server: %s" msgstr "无法连接到服务器: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:76 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:97 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:342 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:261 msgid "Could not convert command to server encoding" msgstr "无法将命令转换成服务器的编码" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 msgid "Could not convert private key" msgstr "无法转换私钥" -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not copy URLs" msgstr "无法复制 URL" -#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1330 +msgid "Could not copy certificate" +msgstr "无法复制证书" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 msgid "Could not copy data" msgstr "无法复制数据" -#: ../../locales/../src/interface/updater.cpp:459 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:167 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:210 +#, c-format +msgid "Could not create CFURL from path %s" +msgstr "无法从路径 %s 生成 CFURL" + +#: ../../locales/../src/engine/http/filetransfer.cpp:30 +msgid "Could not create URI for this transfer." +msgstr "无法基于此次传输生成 URI。" + +#: ../../locales/../src/interface/updater.cpp:511 #, c-format msgid "Could not create local file %s\n" msgstr "无法创建本地文件 %s\n" -#: ../../locales/../src/engine/logging.cpp:173 +#: ../../locales/../src/engine/logging.cpp:179 #, c-format msgid "Could not create logging mutex: %s" msgstr "无法创建日志锁 (logging mutex): %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2183 -#: ../../locales/../src/interface/RemoteTreeView.cpp:851 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:176 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:219 +#, fuzzy +msgid "Could not create security-scoped bookmark from URL:" +msgstr "无法从 URL 创建安全书签:" + +#: ../../locales/../src/interface/RemoteListView.cpp:2258 +#: ../../locales/../src/interface/RemoteTreeView.cpp:881 msgid "" "Could not determine the target of the Drag&Drop operation.\n" "Either the shell extension is not installed properly or you didn't drop the " @@ -2467,11 +2615,11 @@ "无法确定拖放操作的目标。\n" "这是由于 shell 扩展未正确安装，或者您没有把文件拖拽到文件浏览器窗口。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:236 msgid "Could not establish connection to server" msgstr "无法建立到服务器的连接" -#: ../../locales/../src/interface/FileZilla.cpp:428 +#: ../../locales/../src/interface/FileZilla.cpp:451 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2482,53 +2630,57 @@ "您可以通过从命令行用“ --datadir <路径>”参数启动，或者设置 FZ_DATADIR 环境变量" "来设置 FileZilla的数据目录。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 +#: ../../locales/../src/engine/ftp/logon.cpp:748 msgid "Could not generate custom login sequence." msgstr "无法生成自定义登录过程。" -#: ../../locales/../src/engine/tlssocket.cpp:958 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Could not generate key" +msgstr "无法生成密钥" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1070 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "无法获得明确的证书颁发者名称，gnutls_x509_get_issuer_dn 失败" -#: ../../locales/../src/engine/tlssocket.cpp:935 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1046 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "无法获得明确的证书主题名称，gnutls_x509_get_dn 失败" -#: ../../locales/../src/interface/state.cpp:923 +#: ../../locales/../src/interface/state.cpp:1069 msgid "Could not get full remote path." msgstr "无法得到完整的远程路径。" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:96 +msgid "Could not get native path from CFURL" +msgstr "无法从 CFURL 获得原始路径" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:182 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:225 +msgid "Could not get path from URL" +msgstr "无法从 URL 获得路径" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:232 +#: ../../locales/../src/interface/storj_key_interface.cpp:117 msgid "Could not get reply from fzputtygen." msgstr "无法得到 fzputtygen 的回应。" -#: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:696 +#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/search.cpp:1210 msgid "Could not get temporary directory to download file into." msgstr "找不到放置下载文件所需的临时目录。" -#: ../../locales/../src/engine/tlssocket.cpp:881 -msgid "Could not import peer certificates, gnutls_x509_crt_import failed" -msgstr "无法导入对等认证，gnutls_x509_crt_import 失败" - -#: ../../locales/../src/interface/FileZilla.cpp:108 -#, fuzzy, c-format +#: ../../locales/../src/interface/FileZilla.cpp:96 +#, c-format msgid "Could not initialize Winsock (%d): %s" -msgstr "无法写入套接字: %s" - -#: ../../locales/../src/engine/tlssocket.cpp:876 -msgid "" -"Could not initialize structure for peer certificates, gnutls_x509_crt_init " -"failed" -msgstr "无法初始化对等证书结构，gnutls_x509_crt_init 失败" +msgstr "无法初始化 Winsock (%d): %s" -#: ../../locales/../src/interface/import.cpp:105 -#: ../../locales/../src/interface/import.cpp:292 +#: ../../locales/../src/interface/import.cpp:117 +#: ../../locales/../src/interface/import.cpp:308 #, c-format msgid "" "Could not load \"%s\", please make sure the file is valid and can be " @@ -2538,15 +2690,21 @@ "无法加载“%s”，请确认文件有效并且有权访问。\n" "站点管理器的任何更改都无法保存。" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:38 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:65 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:71 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:78 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:144 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:149 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:157 msgid "Could not load key file" msgstr "无法加载密钥文件" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Could not load private key" msgstr "无法加载私钥" -#: ../../locales/../src/interface/state.cpp:945 +#: ../../locales/../src/interface/state.cpp:1092 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2556,7 +2714,7 @@ "无法获得远程目录“%s”对应的本地目录。\n" "关闭同步浏览并且继续修改本地目录？" -#: ../../locales/../src/interface/state.cpp:362 +#: ../../locales/../src/interface/state.cpp:401 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2566,7 +2724,7 @@ "无法获得远程目录“%s”对应的本地目录。\n" "同步浏览已经被禁用。" -#: ../../locales/../src/interface/state.cpp:267 +#: ../../locales/../src/interface/state.cpp:294 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2576,91 +2734,129 @@ "无法获得远程目录“%s”对应的本地目录。\n" "同步浏览已经被禁用。" -#: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2522 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 +#: ../../locales/../src/interface/updater.cpp:741 +#, c-format +msgid "Could not obtain size of '%s'" +msgstr "无法获取“%s”的大小" + +#: ../../locales/../src/interface/updater.cpp:755 +#, c-format +msgid "Could not open '%s'" +msgstr "无法打开“%s”" + +#: ../../locales/../src/interface/aboutdialog.cpp:220 +#: ../../locales/../src/interface/RemoteListView.cpp:2613 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1419 msgid "Could not open clipboard" msgstr "无法打开剪贴板" -#: ../../locales/../src/engine/logging.cpp:106 -#: ../../locales/../src/engine/logging.cpp:186 -#: ../../locales/../src/engine/logging.cpp:218 +#: ../../locales/../src/engine/logging.cpp:108 +#: ../../locales/../src/engine/logging.cpp:192 +#: ../../locales/../src/engine/logging.cpp:236 +#: ../../locales/../src/engine/logging.cpp:274 +#: ../../locales/../src/engine/logging.cpp:300 #, c-format msgid "Could not open log file: %s" msgstr "无法打开日志文件: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 msgid "Could not parse remote path." msgstr "无法解析远程路径。" -#: ../../locales/../src/interface/quickconnectbar.cpp:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:114 msgid "Could not parse server address:" msgstr "无法解析服务器地址:" -#: ../../locales/../src/interface/netconfwizard.cpp:977 -#, fuzzy +#: ../../locales/../src/interface/updater.cpp:764 +#, c-format +msgid "Could not read from '%s'" +msgstr "无法读取“%s”" + +#: ../../locales/../src/interface/netconfwizard.cpp:1002 msgid "Could not read from data socket." -msgstr "无法读取套接字: %s" +msgstr "无法读取数据套接字。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:64 +#: ../../locales/../src/engine/http/request.cpp:380 #, c-format msgid "Could not read from socket: %s" msgstr "无法读取套接字: %s" -#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:556 msgid "Could not read server item." msgstr "无法读取服务器项。" -#: ../../locales/../src/interface/netconfwizard.cpp:344 -#, fuzzy +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Could not receive data from server." -msgstr "无法连接到服务器" +msgstr "无法从服务器接收数据。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 -#, c-format -msgid "Could not seek to offset %s within file" -msgstr "无法找到文件中的 %s 偏移" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:122 +msgid "Could not restore directory access" +msgstr "无法恢复访问目录" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:132 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:74 +#, c-format +msgid "Could not seek to offset %d within file" +msgstr "无法找到文件中的 %d 偏移" + +#: ../../locales/../src/engine/http/filetransfer.cpp:115 +#: ../../locales/../src/engine/http/filetransfer.cpp:174 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:71 +msgid "Could not seek to the beginning of the file" +msgstr "无法搜索到文件头" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:90 +#: ../../locales/../src/engine/http/filetransfer.cpp:98 msgid "Could not seek to the end of the file" msgstr "无法搜索到文件尾" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:210 msgid "Could not send command to fzputtygen." msgstr "无法将命令发送到 fzputtygen。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 +#: ../../locales/../src/interface/storj_key_interface.cpp:95 +msgid "Could not send command to fzstorj." +msgstr "无法将命令发送到 fzstorj。" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1256 +msgid "Could not sort peer certificates" +msgstr "无法排序对等证书" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:202 msgid "Could not spawn IO thread" msgstr "无法生成 IO 线程" -#: ../../locales/../src/engine/ControlSocket.cpp:1065 +#: ../../locales/../src/engine/ControlSocket.cpp:1077 #, c-format msgid "Could not start proxy handshake: %s" msgstr "无法开始代理握手: %s" -#: ../../locales/../src/interface/queue.cpp:338 +#: ../../locales/../src/interface/queue.cpp:359 msgid "Could not start transfer" msgstr "无法启动传输" -#: ../../locales/../src/interface/sitemanager.cpp:610 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:829 +#: ../../locales/../src/interface/sitemanager.cpp:633 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:875 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " "%s" msgstr "无法写入“%s”，站点管理器的任何更改都无法保存: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:882 #, c-format msgid "Could not write \"%s\", the bookmark could not be added: %s" msgstr "无法写入“%s”，不能添加该书签: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 #, c-format msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "无法写入“%s”，不能添加该全局书签: %s" -#: ../../locales/../src/interface/QueueView.cpp:1847 +#: ../../locales/../src/interface/QueueView.cpp:1586 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2669,119 +2865,121 @@ "无法写入“%s”，不能保存队列。\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 +#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:815 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2554 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "无法写入“%s”，不能导出所选择的站点: %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:146 +#: ../../locales/../src/interface/xmlfunctions.cpp:151 #, c-format msgid "Could not write \"%s\":" msgstr "无法写入“%s”:" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:137 #, c-format msgid "Could not write key file: %s" msgstr "无法写入密钥文件: %s" -#: ../../locales/../src/interface/queue.cpp:337 +#: ../../locales/../src/interface/queue.cpp:358 msgid "Could not write to local file" msgstr "无法写入本地文件" -#: ../../locales/../src/engine/logging.cpp:230 -#: ../../locales/../src/engine/logging.cpp:297 +#: ../../locales/../src/engine/logging.cpp:249 +#: ../../locales/../src/engine/logging.cpp:317 #, c-format msgid "Could not write to log file: %s" msgstr "无法写入日志文件: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:883 -#: ../../locales/../src/engine/ControlSocket.cpp:987 +#: ../../locales/../src/engine/ControlSocket.cpp:918 +#: ../../locales/../src/engine/ControlSocket.cpp:1013 +#: ../../locales/../src/engine/http/request.cpp:235 #, c-format msgid "Could not write to socket: %s" msgstr "无法写入套接字: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:436 msgid "Country:" msgstr "国家:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Crea&te new file" msgstr "创建新文件(&T)" -#: ../../locales/../src/interface/state.cpp:959 +#: ../../locales/../src/interface/state.cpp:1107 msgid "Create &missing local directory and enter it" msgstr "创建缺失的本地目录并进入该目录(&M)" -#: ../../locales/../src/interface/state.cpp:886 +#: ../../locales/../src/interface/state.cpp:1029 msgid "Create &missing remote directory and enter it" msgstr "创建缺失的远程目录并进入该目录(&M)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:265 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:305 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:580 msgid "Create a new subdirectory in the current directory" msgstr "在当前目录创建一个新的子目录" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:269 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:309 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:584 msgid "Create a new subdirectory in the current directory and change into it" msgstr "在当前目录创建一个新的子目录并进入该目录" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:317 msgid "Create a new, empty file in the current directory" msgstr "在当前目录创建一个新的空文件" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:268 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:308 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:583 msgid "Create director&y and enter it" msgstr "创建目录并进入(&Y)" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Create directory" msgstr "创建目录" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Create empty file" msgstr "创建空文件" -#: ../../locales/../src/interface/queue.cpp:340 +#: ../../locales/../src/interface/queue.cpp:361 msgid "Creating directory" msgstr "正在创建目录" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:600 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:106 #, c-format msgid "Creating directory '%s'..." msgstr "正在创建目录“%s”..." -#: ../../locales/../src/engine/ControlSocket.cpp:180 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error" msgstr "严重错误" -#: ../../locales/../src/engine/ControlSocket.cpp:171 +#: ../../locales/../src/engine/ControlSocket.cpp:161 msgid "Critical error:" msgstr "严重错误:" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:112 msgid "Critical file transfer error" msgstr "严重文件传输错误" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:92 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "传输了 %s (用时 %s) 后出现严重文件传输错误" -#: ../../locales/../src/interface/state.cpp:353 +#: ../../locales/../src/interface/state.cpp:392 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2790,97 +2988,102 @@ "当前目录“%s”不在同步根目录(%s)下面。\n" "关闭同步浏览并且继续修改本地目录？" -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:402 msgid "Current transfer type is set to ASCII." msgstr "当前的传送类型被设置到 ASCII 模式。" -#: ../../locales/../src/interface/statusbar.cpp:401 +#: ../../locales/../src/interface/statusbar.cpp:410 msgid "Current transfer type is set to automatic detection." msgstr "当前的传送类型为自动检测。" -#: ../../locales/../src/interface/statusbar.cpp:397 +#: ../../locales/../src/interface/statusbar.cpp:406 msgid "Current transfer type is set to binary." msgstr "当前的传送类型被设置为二进制模式。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2222 msgid "Curve:" msgstr "" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:479 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1636 msgid "Cus&tom" msgstr "自定义(&T)" -#: ../../locales/../src/interface/filter.cpp:101 +#: ../../locales/../src/interface/filter.cpp:109 msgid "Custom filter set" msgstr "自定义过滤器集合" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2630 msgid "Custom server" msgstr "自定义服务器" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 +#: ../../locales/../src/interface/sitemanager.cpp:22 +msgid "Cyan" +msgstr "青色" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2750 msgid "D&ata type" msgstr "数据类型(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1706 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "使用 SI 式十进制前缀 (例如 1 KB = 1000 bytes)(&E)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "D&efault" msgstr "默认(&E)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:324 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:626 msgid "D&elete" msgstr "删除(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2946 msgid "D&irectory comparison" -msgstr "目录比较(&D)" +msgstr "目录对比(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1302 msgid "D&isable all" msgstr "全部禁用(&I)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4035 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "D&o not save passwords" msgstr "不要保存密码(&O)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1912 msgid "D&ouble-click action on directories:" msgstr "双击目录操作(&O):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3084 msgid "D&uplicate" msgstr "复制(&U)" -#: ../../locales/../src/engine/server.cpp:34 +#: ../../locales/../src/engine/server.cpp:56 msgid "DOS-like with virtual paths" msgstr "带虚拟路径的 DOS 式" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "Dangerous filetype" msgstr "危险的文件格式" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:37 msgid "Data" msgstr "数据" -#: ../../locales/../src/interface/netconfwizard.cpp:971 -#: ../../locales/../src/interface/netconfwizard.cpp:1036 +#: ../../locales/../src/interface/netconfwizard.cpp:996 +#: ../../locales/../src/interface/netconfwizard.cpp:1061 msgid "Data socket closed too early." msgstr "数据套接字过早关闭。" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121 msgid "Date" msgstr "日期" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1570 msgid "Date formatting" msgstr "日期格式" @@ -2896,15 +3099,15 @@ msgid "Debug" msgstr "调试" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2296 msgid "Debugging settings" msgstr "调试设置" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:385 msgid "Default &local directory:" msgstr "默认本地目录(&L):" -#: ../../locales/../src/engine/server.cpp:26 +#: ../../locales/../src/engine/server.cpp:48 msgid "Default (Autodetect)" msgstr "默认 (自动检测)" @@ -2912,24 +3115,24 @@ msgid "Default editor not properly quoted." msgstr "没有正确引用默认编辑器。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1377 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1652 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1227 msgid "Default file exists action" msgstr "文件存在时的默认操作" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:410 msgid "Default r&emote directory:" msgstr "默认远程目录(&E):" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 msgid "" "Default remote path cannot be parsed. Make sure it is a valid absolute path " "for the selected server type." msgstr "" "默认远程路经无法解析。请确认是否有效绝对路径，并且被所选择的服务器类型支持。" -#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 msgid "Default system language" msgstr "系统默认语言" @@ -2937,12 +3140,12 @@ msgid "Default transfer mode:" msgstr "默认传输模式:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1051 msgid "Default transfer type:" msgstr "默认传输类型:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:380 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:381 msgid "Default: http://ip.filezilla-project.org/ip.php" msgstr "默认: http://ip.filezilla-project.org/ip.php" @@ -2951,7 +3154,7 @@ "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "在失败的登陆请求之间的延迟必须在 1 和 999 秒之间。" -#: ../../locales/../src/engine/engineprivate.cpp:522 +#: ../../locales/../src/engine/engineprivate.cpp:516 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2961,196 +3164,206 @@ "attempt..." msgstr[0] "由于上一次尝试连接失败，将推迟连接 %d 秒..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1305 msgid "Delete Site Manager entry" msgstr "清除站点管理器记录" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:521 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:589 msgid "Delete selected directory" msgstr "删除所选的目录" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Delete selected files and directories" msgstr "删除选定的文件和目录" -#: ../../locales/../src/engine/engineprivate.cpp:365 +#: ../../locales/../src/engine/engineprivate.cpp:392 #, c-format msgid "Deleting \"%s\"" msgstr "正在删除“%s”" -#: ../../locales/../src/engine/engineprivate.cpp:368 +#: ../../locales/../src/engine/engineprivate.cpp:395 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "正在从“%2$s”删除 %1$u 个文件" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3576 msgid "Deleting symbolic link" msgstr "正在删除符号链接" -#: ../../locales/../src/interface/LocalTreeView.cpp:955 +#: ../../locales/../src/interface/LocalTreeView.cpp:986 msgid "Desktop" msgstr "桌面" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1033 msgid "Details" msgstr "详细资料" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1154 msgid "Details for new key:" msgstr "新密钥的详细资料:" -#: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:799 msgid "Detected newer version of FileZilla" msgstr "有新版的 FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1539 msgid "Dire&ctories" msgstr "目录(&C)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Direction" msgstr "方向" -#: ../../locales/../src/interface/filelistctrl.cpp:271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4193 +msgid "Directories:" +msgstr "目录:" + +#: ../../locales/../src/interface/filelistctrl.cpp:273 msgid "Directory" msgstr "目录" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:524 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:465 -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4236 +msgid "Directory access permissions" +msgstr "目录访问权限" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3025 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:541 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1850 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:429 +#: ../../locales/../src/interface/filelistctrl.cpp:477 +#: ../../locales/../src/interface/Mainfrm.cpp:2306 +#: ../../locales/../src/interface/Mainfrm.cpp:2323 +#: ../../locales/../src/interface/toolbar.cpp:51 +#: ../../locales/../src/interface/view.cpp:109 msgid "Directory comparison" -msgstr "比较目录" +msgstr "目录对比" -#: ../../locales/../src/interface/listingcomparison.cpp:71 +#: ../../locales/../src/interface/listingcomparison.cpp:74 msgid "Directory comparison failed" -msgstr "比较目录失败" +msgstr "目录对比失败" #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71 msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "保存日志文件的目录不存在或文件名无效。" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 +#, fuzzy +msgid "Directory listing &filters..." +msgstr "目录列表过滤器" + +#: ../../locales/../src/engine/ControlSocket.cpp:183 msgid "Directory listing aborted by user" msgstr "目录列表被用户终止" -#: ../../locales/../src/interface/RemoteListView.cpp:2013 +#: ../../locales/../src/interface/RemoteListView.cpp:2090 msgid "Directory listing failed" msgstr "目录列表失败" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1237 msgid "Directory listing filters" msgstr "目录列表过滤器" -#: ../../locales/../src/engine/ControlSocket.cpp:199 +#: ../../locales/../src/engine/ControlSocket.cpp:193 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "列出“%s”的目录成功" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing successful" msgstr "列出目录成功" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1337 msgid "Disa&ble all" msgstr "全部禁用(&B)" -#: ../../locales/../src/interface/state.cpp:952 +#: ../../locales/../src/interface/state.cpp:1100 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "关闭同步浏览并且继续修改本地目录？" -#: ../../locales/../src/interface/Mainfrm.cpp:650 +#: ../../locales/../src/interface/Mainfrm.cpp:713 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." msgstr "如果您无法再看见文件时请停用此选项。" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnect from server" msgstr "从服务器断开" -#: ../../locales/../src/engine/ControlSocket.cpp:81 -#: ../../locales/../src/engine/ControlSocket.cpp:884 -#: ../../locales/../src/engine/ControlSocket.cpp:989 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:213 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/engine/ControlSocket.cpp:52 +#: ../../locales/../src/engine/ControlSocket.cpp:919 +#: ../../locales/../src/engine/ControlSocket.cpp:1015 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:66 +#: ../../locales/../src/engine/http/request.cpp:236 +#: ../../locales/../src/interface/queue.cpp:352 msgid "Disconnected from server" msgstr "已从服务器断开" -#: ../../locales/../src/engine/ControlSocket.cpp:1020 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 +#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:299 #, c-format msgid "Disconnected from server: %s" msgstr "已从服务器断开: %s" -#: ../../locales/../src/interface/queue.cpp:330 -#: ../../locales/../src/interface/statuslinectrl.cpp:237 +#: ../../locales/../src/interface/queue.cpp:351 +#: ../../locales/../src/interface/statuslinectrl.cpp:250 msgid "Disconnecting from previous server" msgstr "正在从上一个服务器断开连接" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 +#: ../../locales/../src/interface/toolbar.cpp:46 msgid "Disconnects from the currently visible server" msgstr "断开当前可见的服务器" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:238 msgid "Display about dialog" msgstr "显示关于对话框" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1985 msgid "Do ¬ use default editor" msgstr "不使用默认编辑器(&N)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "什么都不做(&N)" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2087 msgid "Do the same with &all selected files already being edited" msgstr "对所有正在编辑的选中文件执行相同操作(&A):" -#: ../../locales/../src/interface/Mainfrm.cpp:1138 -#: ../../locales/../src/interface/Mainfrm.cpp:1160 +#: ../../locales/../src/interface/Mainfrm.cpp:1233 +#: ../../locales/../src/interface/Mainfrm.cpp:1255 msgid "Do you really want to close FileZilla?" msgstr "您真的要关闭 FileZilla？" -#: ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../locales/../src/interface/clearprivatedata.cpp:35 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "您真的想删除所有站点管理器里的记录和传输队列？" -#: ../../locales/../src/interface/clearprivatedata.cpp:46 +#: ../../locales/../src/interface/clearprivatedata.cpp:47 msgid "Do you really want to delete all Site Manager entries?" msgstr "您真的想删除所有站点管理器里的记录？" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1307 msgid "Do you really want to delete selected entry?" msgstr "您真的想删除所选的记录？" -#: ../../locales/../src/interface/clearprivatedata.cpp:40 +#: ../../locales/../src/interface/clearprivatedata.cpp:41 msgid "Do you really want to delete the transfer queue?" msgstr "您真的想删除传输队列？" -#: ../../locales/../src/interface/Mainfrm.cpp:589 +#: ../../locales/../src/interface/Mainfrm.cpp:641 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "您真的想发送“%s”给服务器吗?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2080 msgid "Do you want to reopen this file?" msgstr "您真的要重新打开这个文件吗？" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3765 msgid "Documentation" msgstr "文档" @@ -3158,47 +3371,47 @@ msgid "Don't use external IP address on &local connections." msgstr "本地连接不使用外部 IP 地址(&L)。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1148 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "文件名是以一个点开始的，例如: .htaccess" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1888 msgid "Double-click action" msgstr "双击操作" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2459 msgid "Download" msgstr "下载" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3932 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:906 msgid "Download &limit:" msgstr "下载限制(&L):" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:599 #, c-format msgid "Download limit: %s/s" msgstr "下载限制: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:583 +#: ../../locales/../src/interface/statusbar.cpp:602 msgid "Download limit: none" msgstr "下载限制: 无" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 -#: ../../locales/../src/interface/search.cpp:524 -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3380 +#: ../../locales/../src/interface/search.cpp:927 +#: ../../locales/../src/interface/search.cpp:932 msgid "Download search results" msgstr "下载搜索结果" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:502 msgid "Download selected directory" msgstr "下载选定的目录" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:292 msgid "Download selected files and directories" msgstr "下载选定的文件和目录" -#: ../../locales/../src/interface/Mainfrm.cpp:966 +#: ../../locales/../src/interface/Mainfrm.cpp:1049 #, c-format msgid "" "Download speed: %s/s\n" @@ -3207,34 +3420,34 @@ "下载速度: %s/s\n" "上传速度: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1151 msgid "Downloading" msgstr "正在下载" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:236 #, c-format msgid "Downloading %s" msgstr "正在下载 %s" -#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +#: ../../locales/../src/interface/resources/xrc/update.xrc:86 msgid "Downloading update..." -msgstr "正在下载更新......" +msgstr "正在下载更新..." -#: ../../locales/../src/interface/LocalListView.cpp:105 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 +#: ../../locales/../src/interface/LocalListView.cpp:114 +#: ../../locales/../src/interface/LocalTreeView.cpp:121 #: ../../locales/../src/interface/QueueView.cpp:88 -#: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:89 +#: ../../locales/../src/interface/RemoteListView.cpp:115 +#: ../../locales/../src/interface/RemoteTreeView.cpp:98 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "在不同的 FileZilla 的实例间拖放还未被实现。" -#: ../../locales/../src/interface/LocalListView.cpp:111 -#: ../../locales/../src/interface/LocalTreeView.cpp:116 -#: ../../locales/../src/interface/QueueView.cpp:101 -#: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:95 +#: ../../locales/../src/interface/LocalListView.cpp:119 +#: ../../locales/../src/interface/LocalTreeView.cpp:126 +#: ../../locales/../src/interface/QueueView.cpp:102 +#: ../../locales/../src/interface/RemoteListView.cpp:120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:103 msgid "Drag&drop between different servers has not been implemented yet." msgstr "在不同服务器之间拖放还未实现。" @@ -3242,16 +3455,16 @@ msgid "Dupl&icate" msgstr "复制(&I)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1295 msgid "E&nable all" msgstr "全部启用(&N)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:254 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 msgid "E&nter directory" msgstr "进入目录(&N)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:640 msgid "E&xecute" msgstr "执行(&X)" @@ -3259,47 +3472,47 @@ msgid "E&xit" msgstr "退出(&X)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:415 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:482 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:426 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:495 msgid "E&xport..." -msgstr "导出(&X)…" +msgstr "导出(&X)..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:442 msgid "E-Mail:" msgstr "电子邮件:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:489 msgid "Each filter needs at least one condition." msgstr "每个过滤器至少要有一个条件。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1578 msgid "Edit filters" msgstr "编辑过滤器" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:264 msgid "" "Edit the file with the configured editor and upload changes to the server." msgstr "使用设置的编辑器编辑文件并上传修改后的文件到服务器。" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing directories is not supported" msgstr "不支持编辑目录。" -#: ../../locales/../src/interface/LocalListView.cpp:1587 -#: ../../locales/../src/interface/LocalListView.cpp:1596 +#: ../../locales/../src/interface/LocalListView.cpp:1713 +#: ../../locales/../src/interface/LocalListView.cpp:1722 msgid "Editing failed" msgstr "编辑失败" -#: ../../locales/../src/interface/search.cpp:684 +#: ../../locales/../src/interface/search.cpp:1198 msgid "Editing search results" msgstr "编辑搜索结果" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "Email:" msgstr "电子邮件:" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "Empty command" msgstr "空命令" @@ -3307,7 +3520,7 @@ msgid "Empty command." msgstr "空命令。" -#: ../../locales/../src/interface/RemoteListView.cpp:2015 +#: ../../locales/../src/interface/RemoteListView.cpp:2092 msgid "Empty directory listing" msgstr "空目录列表" @@ -3315,23 +3528,17 @@ msgid "Empty directory." msgstr "空目录。" -#: ../../locales/../src/interface/recursive_operation.cpp:377 -#: ../../locales/../src/interface/recursive_operation.cpp:412 -#, fuzzy -msgid "Empty dirs to visit" -msgstr "空目录列表" - #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "空文件扩展名。" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty filter names are not allowed." msgstr "过滤器名称不能为空。" -#: ../../locales/../src/interface/filteredit.cpp:208 -#: ../../locales/../src/interface/filteredit.cpp:250 +#: ../../locales/../src/interface/filteredit.cpp:207 +#: ../../locales/../src/interface/filteredit.cpp:249 msgid "Empty name" msgstr "空名称" @@ -3339,81 +3546,97 @@ msgid "Empty quoted string." msgstr "空的引用字串。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1330 msgid "En&able all" msgstr "全部启用(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:987 msgid "Enable invalid character &filtering" msgstr "启用无效字符过滤(&F)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79 msgid "Encrypted" msgstr "已加密" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2287 msgid "Encryption" msgstr "加密" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:269 +msgid "Encryption &Key:" +msgstr "加密密钥(&K):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:347 +msgid "Encryption &key:" +msgstr "加密密钥(&K):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2197 msgid "Encryption details" msgstr "加密细节" -#: ../../locales/../src/interface/filelistctrl.cpp:467 +#: ../../locales/../src/interface/filelistctrl.cpp:479 msgid "End comparison and change sorting order?" msgstr "结束对比并改变排序？" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 +#: ../../locales/../src/interface/view.cpp:111 +msgid "End comparison and open quick search?" +msgstr "结束对比并打开快速搜索？" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Enter &custom command..." msgstr "输入自定义命令(&C)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3973 msgid "Enter 0 for unlimited speed." msgstr "输入 0 表示无速度限制。" -#: ../../locales/../src/interface/QueueView.cpp:2109 +#: ../../locales/../src/interface/QueueView.cpp:1873 msgid "Enter command" msgstr "输入命令" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "Enter custom command" msgstr "输入自定义命令" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1921 msgid "Enter directory" msgstr "进入目录" #: ../../locales/../src/interface/filteredit.cpp:136 -#: ../../locales/../src/interface/filteredit.cpp:196 -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:195 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Enter filter name" msgstr "输入过滤器名称" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:505 +msgid "Enter master password" +msgstr "输入主密码" + +#: ../../locales/../src/interface/filter.cpp:238 msgid "Enter name for filterset" msgstr "输入过滤器集合名称" -#: ../../locales/../src/interface/filter.cpp:392 +#: ../../locales/../src/interface/filter.cpp:302 msgid "Enter new name for filterset" msgstr "输入过滤器集合新名称" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:247 msgid "Enter password" msgstr "输入密码" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:301 msgid "Enter selected directory" msgstr "进入所选的目录" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 +#: ../../locales/../src/interface/quickconnectbar.cpp:49 msgid "" -"Enter the address of the server.\n" -"To specify the server protocol, prepend the host with the protocol " -"identifier. If no protocol is specified, the default protocol (ftp://) will " -"be used.\n" -"You can also enter complete URLs in the form protocol://user:pass@host:port " -"here, the values in the other fields will be overwritten then.\n" +"Enter the address of the server. To specify the server protocol, prepend the " +"host with the protocol identifier. If no protocol is specified, the default " +"protocol (ftp://) will be used. You can also enter complete URLs in the form " +"protocol://user:pass@host:port here, the values in the other fields will be " +"overwritten then.\n" "\n" "Supported protocols are:\n" "- ftp:// for normal FTP with optional encryption\n" @@ -3421,11 +3644,9 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"输入服务器地址。\n" -"要指定服务器的协议类型，在前面加上主机协议标示符。如果没有指定协议，会使用默" -"认协议(ftp://)。\n" -"您也可以输入完整的 URL 地址，使用如下格式 protocol://user:pass@host:port，这" -"样其他相应字段的值会被覆盖。\n" +"输入服务器地址。要指定服务器的协议类型，在前面加上主机协议标示符。如果没有指" +"定协议，会使用默认协议(ftp://)。您也可以输入完整的 URL 地址，使用如下格式 " +"protocol://user:pass@host:port，这样其他相应字段的值会被覆盖。\n" "\n" "支持的协议有:\n" "- ftp:// 普通 FTP，可加密\n" @@ -3433,7 +3654,7 @@ "- ftps:// FTP over TLS (隐式)\n" "- ftpes:// FTP over TLS (显式)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:93 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3442,116 +3663,131 @@ "为文件“%s”输入密码。\n" "请注意转换后的文件仍使用该密码。" -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 +#: ../../locales/../src/interface/quickconnectbar.cpp:62 msgid "" -"Enter the port on which the server listens.\n" -"The default for FTP is 21, the default for SFTP is 22." -msgstr "" -"输入服务器监听的端口。\n" -"FTP 的默认值是 21，SFTP 的默认值是 22。" +"Enter the port on which the server listens. The default for FTP is 21, the " +"default for SFTP is 22." +msgstr "输入服务器的监听端口。FTP 的默认值是 21，SFTP 的默认值是 22。" + +#: ../../locales/../src/interface/loginmanager.cpp:167 +msgid "Enter username" +msgstr "输入用户名" -#: ../../locales/../src/interface/loginmanager.cpp:65 +#: ../../locales/../src/interface/loginmanager.cpp:176 msgid "Enter username and password" msgstr "输入用户名和密码" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:121 +msgid "Error" +msgstr "错误" + +#: ../../locales/../src/interface/export.cpp:30 msgid "Error exporting settings" msgstr "导出设置错误" -#: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:29 +#: ../../locales/../src/interface/import.cpp:107 msgid "Error importing" msgstr "导入出错" -#: ../../locales/../src/interface/QueueView.cpp:1909 +#: ../../locales/../src/interface/QueueView.cpp:1663 msgid "Error loading queue" msgstr "加载队列出错" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:164 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:286 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:695 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:214 -#: ../../locales/../src/interface/filter.cpp:971 -#: ../../locales/../src/interface/import.cpp:106 -#: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1830 -#: ../../locales/../src/interface/search.cpp:802 -#: ../../locales/../src/interface/search.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:517 -#: ../../locales/../src/interface/sitemanager.cpp:567 -#: ../../locales/../src/interface/sitemanager.cpp:666 -#: ../../locales/../src/interface/sitemanager.cpp:743 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:939 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:174 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:296 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:788 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/filter.cpp:913 +#: ../../locales/../src/interface/filter.cpp:1005 +#: ../../locales/../src/interface/import.cpp:118 +#: ../../locales/../src/interface/import.cpp:309 +#: ../../locales/../src/interface/Options.cpp:255 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:65 +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:136 +#: ../../locales/../src/interface/QueueView.cpp:1567 +#: ../../locales/../src/interface/search.cpp:1350 +#: ../../locales/../src/interface/search.cpp:1370 +#: ../../locales/../src/interface/sitemanager.cpp:91 +#: ../../locales/../src/interface/sitemanager.cpp:525 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:694 +#: ../../locales/../src/interface/sitemanager.cpp:782 +#: ../../locales/../src/interface/sitemanager.cpp:884 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:855 +#: ../../locales/../src/interface/wrapengine.cpp:935 msgid "Error loading xml file" msgstr "导入 XML 文件出错" -#: ../../locales/../src/interface/QueueView.cpp:1819 +#: ../../locales/../src/interface/QueueView.cpp:1556 msgid "Error saving queue" msgstr "保存队列出错" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 msgid "Error starting program" msgstr "启动程序出错" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:318 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1848 -#: ../../locales/../src/interface/sitemanager.cpp:611 -#: ../../locales/../src/interface/sitemanager.cpp:721 -#: ../../locales/../src/interface/sitemanager.cpp:775 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 -#: ../../locales/../src/interface/xmlfunctions.cpp:147 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:332 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:883 +#: ../../locales/../src/interface/QueueView.cpp:1587 +#: ../../locales/../src/interface/sitemanager.cpp:634 +#: ../../locales/../src/interface/sitemanager.cpp:759 +#: ../../locales/../src/interface/sitemanager.cpp:816 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:876 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2555 +#: ../../locales/../src/interface/xmlfunctions.cpp:152 msgid "Error writing xml file" msgstr "写入 XML 文件出错" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:281 -#: ../../locales/../src/interface/StatusView.cpp:335 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:285 +#: ../../locales/../src/interface/StatusView.cpp:347 msgid "Error:" msgstr "错误:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2093 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" -msgstr "示例: png “c:\\program files\\viewer\\viewer.exe”-open" +msgstr "示例: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1743 msgid "Examples" msgstr "示例" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:674 msgid "Exe&cute" msgstr "执行(&C)" -#: ../../locales/../src/interface/update_dialog.cpp:57 +#: ../../locales/../src/interface/update_dialog.cpp:59 msgid "Executable contains no version info, cannot check for updates." msgstr "程序未包含版本信息，无法检查更新。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1360 msgid "Explorer" msgstr "浏览器" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1792 +msgid "Export &Filters" +msgstr "导出过滤器(&F)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 msgid "Export &Queue" msgstr "导出队列(&Q)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 msgid "Export &Settings" msgstr "导出设置(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1763 msgid "Export settings" msgstr "导出设置" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1471 msgid "F&ilter name:" msgstr "过滤器名(&I):" @@ -3559,28 +3795,27 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 msgid "FTP - File Transfer Protocol" msgstr "FTP - 文件传输协议" -#: ../../locales/../src/engine/server.cpp:15 +#: ../../locales/../src/engine/server.cpp:21 msgid "FTP - File Transfer Protocol with optional encryption" msgstr "FTP - 可选加密的文件传输协议" -#: ../../locales/../src/engine/server.cpp:21 +#: ../../locales/../src/engine/server.cpp:27 msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - 不安全的文件传输协议" -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FTP Engine not initialized, can't connect" msgstr "FTP 引擎没有初始化，无法连接" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:233 msgid "FTP Keep-alive" msgstr "FTP Keep-alive" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:445 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:446 #: ../../locales/../src/interface/settings/settingsdialog.cpp:96 msgid "FTP Proxy" msgstr "FTP 代理服务器" @@ -3595,186 +3830,197 @@ "connections can be established in two ways." msgstr "FTP 使用另一些连接来传输数据。这些额外的连接有两种方法来建立。" -#: ../../locales/../src/engine/server.cpp:20 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 +#, fuzzy +msgid "FTP: File Types" +msgstr "文件类型" + +#: ../../locales/../src/engine/server.cpp:26 msgid "FTPES - FTP over explicit TLS" msgstr "FTPES - 通过显式 TLS 的 FTP" -#: ../../locales/../src/engine/server.cpp:19 +#: ../../locales/../src/engine/server.cpp:25 msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - 通过隐式 TLS 的 FTP" -#: ../../locales/../src/interface/LocalListView.cpp:530 -#: ../../locales/../src/interface/LocalListView.cpp:606 -#: ../../locales/../src/interface/LocalListView.cpp:891 -#: ../../locales/../src/interface/LocalListView.cpp:1783 -#: ../../locales/../src/interface/LocalTreeView.cpp:843 -#: ../../locales/../src/interface/LocalTreeView.cpp:1096 -#: ../../locales/../src/interface/viewheader.cpp:504 +#: ../../locales/../src/interface/LocalListView.cpp:545 +#: ../../locales/../src/interface/LocalListView.cpp:618 +#: ../../locales/../src/interface/LocalListView.cpp:941 +#: ../../locales/../src/interface/LocalListView.cpp:1921 +#: ../../locales/../src/interface/LocalTreeView.cpp:871 +#: ../../locales/../src/interface/LocalTreeView.cpp:1154 +#: ../../locales/../src/interface/viewheader.cpp:499 msgid "Failed to change directory" msgstr "改变目录失败" -#: ../../locales/../src/interface/FileZilla.cpp:158 -#: ../../locales/../src/interface/FileZilla.cpp:173 -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:150 +#: ../../locales/../src/interface/FileZilla.cpp:165 +#: ../../locales/../src/interface/FileZilla.cpp:168 msgid "Failed to change language" msgstr "切换语言失败" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:308 +msgid "Failed to convert command to 8 bit charset" +msgstr "转换命令到 8 bit 编码失败" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2335 msgid "Failed to copy or move sites" msgstr "无法复制或移动站点" -#: ../../locales/../src/interface/xmlfunctions.cpp:350 +#: ../../locales/../src/interface/xmlfunctions.cpp:238 msgid "Failed to create backup copy of xml file" msgstr "创建 XML 文件的备件副本失败" -#: ../../locales/../src/interface/netconfwizard.cpp:792 -msgid "Failed to create listen socket, aborting" -msgstr "创建监听套接字失败，正在中止" +#: ../../locales/../src/interface/netconfwizard.cpp:812 +#, c-format +msgid "Failed to create listen socket on port %d, aborting." +msgstr "在端口 %d 创建监听套接字失败，中止操作。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:217 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:220 msgid "Failed to create listening socket for active mode transfer" msgstr "为主动模式传输创建监听套接字失败" -#: ../../locales/../src/interface/LocalTreeView.cpp:621 +#: ../../locales/../src/interface/loginmanager.cpp:113 +msgid "Failed to decrypt server password." +msgstr "无法解密服务器密码。" + +#: ../../locales/../src/interface/LocalTreeView.cpp:647 msgid "Failed to get 'My Documents' path" msgstr "无法获取“我的文档”路径" -#: ../../locales/../src/interface/LocalTreeView.cpp:609 +#: ../../locales/../src/interface/LocalTreeView.cpp:635 msgid "Failed to get desktop path" msgstr "无法获取桌面路径" -#: ../../locales/../src/interface/netconfwizard.cpp:944 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of control connection, connection closed." msgstr "无法获取控制连接的对等地址，连接已关闭。" -#: ../../locales/../src/interface/netconfwizard.cpp:951 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Failed to get peer address of data connection, connection closed." msgstr "无法获取数据连接的对等地址，连接已关闭。" -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:87 msgid "Failed to initialize FTP engine" msgstr "FTP 引擎初始化失败" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:193 +#: ../../locales/../src/engine/ftp/logon.cpp:257 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:208 msgid "Failed to initialize TLS." msgstr "TLS 初始化失败。" -#: ../../locales/../src/interface/FileZilla.cpp:109 -#, fuzzy +#: ../../locales/../src/interface/FileZilla.cpp:97 msgid "Failed to initialize networking" -msgstr "FTP 引擎初始化失败" +msgstr "网络初始化失败" #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "导入面板失败，无效资源文件？" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, c-format msgid "Failed to load private key: %s" msgstr "加载私钥: %s 失败" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:81 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "打开“%s”追加/写入失败" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:141 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "打开“%s”读取失败" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:107 +#: ../../locales/../src/engine/http/filetransfer.cpp:91 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "打开“%s”写入失败" -#: ../../locales/../src/engine/ControlSocket.cpp:347 +#: ../../locales/../src/engine/ControlSocket.cpp:350 msgid "Failed to parse returned path." msgstr "无法解析返回的路径。" -#: ../../locales/../src/interface/netconfwizard.cpp:1003 +#: ../../locales/../src/interface/netconfwizard.cpp:1028 msgid "Failed to receive data" msgstr "接收数据失败" -#: ../../locales/../src/engine/ControlSocket.cpp:193 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Failed to retrieve directory listing" msgstr "读取目录列表失败" -#: ../../locales/../src/interface/netconfwizard.cpp:721 -msgid "Failed to retrieve external ip address, aborting" -msgstr "无法获取外部 IP 地址，中止" +#: ../../locales/../src/interface/netconfwizard.cpp:737 +msgid "Failed to retrieve external IP address, aborting." +msgstr "无法获取外部 IP 地址，中止操作。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 -msgid "Failed to retrieve external ip address, using local address" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:671 +msgid "Failed to retrieve external IP address, using local address" msgstr "无法获取外部 IP 地址，使用本地地址。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 -msgid "Failed to retrieve local ip address." -msgstr "无法获取本地 IP 地址。" +#: ../../locales/../src/interface/netconfwizard.cpp:712 +msgid "Failed to retrieve local IP address, aborting." +msgstr "无法获取本地 IP 地址，中止操作。" -#: ../../locales/../src/interface/netconfwizard.cpp:697 -msgid "Failed to retrieve local ip address. Aborting" -msgstr "无法获取本地 IP 地址。中止" +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:689 +msgid "Failed to retrieve local IP address." +msgstr "无法获取本地 IP 地址。" -#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "Failed to retrieve the external IP address." msgstr "无法获取外部 IP 地址。" -#: ../../locales/../src/interface/netconfwizard.cpp:313 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "发送命令失败。" -#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:165 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "无法将语言设置为 %s (%s)，将使用系统默认语言。" -#: ../../locales/../src/interface/FileZilla.cpp:151 +#: ../../locales/../src/interface/FileZilla.cpp:142 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "无法将语言设置为 %s (%s)，将使用系统默认语言 (%s，%s)。" -#: ../../locales/../src/interface/FileZilla.cpp:140 +#: ../../locales/../src/interface/FileZilla.cpp:129 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "无法将语言设置为 %s (%s)，将使用系统默认语言。" -#: ../../locales/../src/interface/FileZilla.cpp:175 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 +#: ../../locales/../src/interface/FileZilla.cpp:168 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "无法将语言设置为 %s，将使用默认系统语言" -#: ../../locales/../src/interface/FileZilla.cpp:147 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "无法将语言设置为 %s，将使用系统默认语言(%s，%s)。" -#: ../../locales/../src/interface/FileZilla.cpp:137 +#: ../../locales/../src/interface/FileZilla.cpp:125 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "无法将语言设置为 %s，将使用系统默认语言。" -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:212 msgid "Failed to validate settings" msgstr "校验设置失败" -#: ../../locales/../src/engine/tlssocket.cpp:1107 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1358 msgid "Failed to verify peer certificate" msgstr "验证对等证书失败" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 +#: ../../locales/../src/engine/http/filetransfer.cpp:211 #, c-format msgid "Failed to write to file %s" msgstr "写入 %s 文件失败" -#: ../../locales/../src/interface/xmlfunctions.cpp:363 +#: ../../locales/../src/interface/xmlfunctions.cpp:281 msgid "Failed to write xml file" msgstr "写入 xml 文件错误" @@ -3786,27 +4032,23 @@ msgid "Fall back to active mode" msgstr "退回主动模式" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2538 msgid "Fil&e:" msgstr "文件(&E):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1534 msgid "Fil&es" msgstr "文件(&E)" -#: ../../locales/../src/interface/filelistctrl.cpp:270 +#: ../../locales/../src/interface/filelistctrl.cpp:272 msgid "File" msgstr "文件" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 -msgid "File Types" -msgstr "文件类型" - -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "File descriptor not a socket" msgstr "文件描述符不是套接字" -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:107 msgid "File does not contain any importable data." msgstr "文件中不包含任何可导入的数据。" @@ -3814,7 +4056,7 @@ msgid "File editing" msgstr "文件编辑" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "File exists" msgstr "文件已存在" @@ -3822,7 +4064,7 @@ msgid "File exists action" msgstr "对已存在文件的操作" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1885 msgid "File has changed" msgstr "文件已改变" @@ -3830,63 +4072,67 @@ msgid "File lists" msgstr "文件列表" -#: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:618 -#: ../../locales/../src/interface/FileZilla.cpp:703 +#: ../../locales/../src/engine/storj/resolve.cpp:113 +#: ../../locales/../src/engine/storj/resolve.cpp:184 +#: ../../locales/../src/interface/edithandler.cpp:1602 +#: ../../locales/../src/interface/FileZilla.cpp:640 +#: ../../locales/../src/interface/FileZilla.cpp:730 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "文件未找到" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3376 +#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "File search" msgstr "文件搜索" -#: ../../locales/../src/engine/ControlSocket.cpp:127 +#: ../../locales/../src/engine/ControlSocket.cpp:101 msgid "File transfer aborted by user" msgstr "传输被用户终止" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:89 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "传输了 %s (用时%s)后用户中止了文件传输" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:115 msgid "File transfer failed" msgstr "文件传输失败" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:95 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "传输了 %s (用时%s)后文件传输失败" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:108 msgid "File transfer skipped" msgstr "文件传输被跳过" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:105 msgid "File transfer successful" msgstr "文件传输成功" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:86 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "文件传输成功，传输了 %s (用时%s)" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1232 msgid "File transfers still in progress." msgstr "文件传输仍在进行。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2769 msgid "File would transfer with ASCII data type." msgstr "文件将以 ASCII 的数据类型传送。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2774 msgid "File would transfer with binary data type." msgstr "文件将以二进制的数据类型传送。" -#: ../../locales/../src/interface/FileZilla.cpp:429 -#: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:204 +#: ../../locales/../src/interface/FileZilla.cpp:452 +#: ../../locales/../src/interface/quickconnectbar.cpp:99 msgid "FileZilla Error" msgstr "FileZilla 错误" @@ -3896,72 +4142,76 @@ "properly." msgstr "FileZilla 现在可以测试您的配置以确保所有配置正常。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3857 msgid "FileZilla is already connected to a server." msgstr "FileZilla 已经连接了一台服务器。" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "改变语言需要重启 FileZilla 才会生效。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2181 msgid "FileZilla updates" msgstr "FileZilla 更新" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:101 msgid "Filelist status &bars" msgstr "文件列表状态栏(&B)" -#: ../../locales/../src/interface/edithandler.cpp:1084 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:108 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101 +#: ../../locales/../src/interface/LocalListView.cpp:287 +#: ../../locales/../src/interface/RemoteListView.cpp:398 +#: ../../locales/../src/interface/search.cpp:159 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Filename" msgstr "文件名" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 -msgid "Filename &filters..." -msgstr "文件名过滤器(&F)..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2975 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../locales/../src/engine/ftp/delete.cpp:31 +#: ../../locales/../src/engine/sftp/delete.cpp:18 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "无法为目录 %s 和文件名 %s 构造文件名" -#: ../../locales/../src/interface/RemoteListView.cpp:1582 +#: ../../locales/../src/interface/RemoteListView.cpp:1633 msgid "Filename invalid" msgstr "文件名无效" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "Filename unchanged" msgstr "文件名没有改变" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2213 msgid "Filename:" msgstr "文件名:" -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "文件名不能包含以下任何字符: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:290 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "文件名不能包含以下任何字符: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2193 msgid "Files currently being edited" msgstr "正在编辑的文件" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:110 +#: ../../locales/../src/interface/toolbar.cpp:50 +msgid "Files matching a filter rule are removed from directory listings." +msgstr "匹配过滤器的文件已从目录列表中移除。" + +#: ../../locales/../src/engine/storj/resolve.cpp:321 +msgid "Files not found" +msgstr "文件未找到" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 +#: ../../locales/../src/interface/LocalListView.cpp:288 +#: ../../locales/../src/interface/RemoteListView.cpp:399 +#: ../../locales/../src/interface/search.cpp:161 msgid "Filesize" msgstr "文件大小" @@ -3969,50 +4219,54 @@ msgid "Filesize format" msgstr "文件大小格式" -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:111 +#: ../../locales/../src/interface/LocalListView.cpp:289 +#: ../../locales/../src/interface/RemoteListView.cpp:400 +#: ../../locales/../src/interface/search.cpp:162 msgid "Filetype" msgstr "文件类型" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2025 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2105 #: ../../locales/../src/interface/settings/settingsdialog.cpp:109 msgid "Filetype associations" msgstr "文件格式关联" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1527 msgid "Filter applies to:" msgstr "过滤器应用范围:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:981 msgid "Filter invalid characters in filenames" msgstr "过滤器的文件名称有无效字符" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 #: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "过滤器名已经存在" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1494 msgid "Filter out items matching all of the following" msgstr "滤除匹配以下所有条件的项目" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1495 msgid "Filter out items matching any of the following" msgstr "滤除匹配以下任一条件的项目" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 msgid "Filter out items matching none of the following" msgstr "滤除不匹配以下任一条件的项目" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Filter out items matching not all of the following" +msgstr "滤除不匹配以下所有条件的项目" + +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Filter set already exists" msgstr "过滤器集合已经存在" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "Filter the directory listings" msgstr "过滤目录列表" @@ -4022,11 +4276,11 @@ msgid "Filter validation failed" msgstr "过滤器核对失败" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3338 msgid "Find &files" msgstr "查找文件(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3343 msgid "Find d&irectories" msgstr "查找目录(&I)" @@ -4038,16 +4292,17 @@ msgid "Fingerprint (SHA-256):" msgstr "指纹(SHA-256):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 -msgid "Fingerprint:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1060 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2268 +msgid "Fingerprints:" msgstr "指纹:" -#: ../../locales/../src/interface/netconfwizard.cpp:55 +#: ../../locales/../src/interface/netconfwizard.cpp:54 msgid "Firewall and router configuration wizard" msgstr "防火墙和路由器配置向导" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:71 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -4057,39 +4312,44 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "您至少需要指定 10 个端口才能保证可靠性。" -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:254 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." msgstr "当前会话将使用默认设置，并且任何设置的修改都不会被保存。" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:587 msgid "Force &UTF-8" msgstr "强制 &UTF-8" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:203 msgid "Force showing &hidden files" msgstr "强制显示隐藏文件(&H)" -#: ../../locales/../src/interface/Mainfrm.cpp:645 +#: ../../locales/../src/interface/Mainfrm.cpp:708 msgid "Force showing hidden files" msgstr "强制显示隐藏文件" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:494 msgid "Format specifications:" msgstr "格式规定:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2088 msgid "Format: Extension followed by properly quoted command and arguments." msgstr "格式: 扩展名后跟随正确的指令和参数。" #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:647 +#: ../../locales/../src/interface/updater.cpp:709 #, c-format msgid "Found new %s %s\n" -msgstr "发现了新的 %s %s\n" +msgstr "发现了新的版本 %s %s\n" + +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:50 +#, c-format +msgid "Function %s failed" +msgstr "函数 %s 失败" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3789 msgid "Further documentation" msgstr "更多文档" @@ -4097,11 +4357,15 @@ msgid "General" msgstr "常规" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:492 msgid "General SOCKS server failure" msgstr "常规 SOCKS 服务器故障" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:706 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:288 +msgid "Generate..." +msgstr "生成..." + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:707 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" msgstr "通用代理" @@ -4110,70 +4374,74 @@ msgid "Get external IP address from the following URL:" msgstr "从以下 URL 得到外部 IP 地址:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3728 msgid "Getting help" msgstr "获得帮助" -#: ../../locales/../src/interface/filter.cpp:354 -#: ../../locales/../src/interface/filter.cpp:410 +#: ../../locales/../src/interface/filter.cpp:261 +#: ../../locales/../src/interface/filter.cpp:321 msgid "Given filterset name already exists, overwrite filter set?" msgstr "给定的过滤器集合名已经存在，是否覆盖过滤器集合？" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:258 msgid "Global bookmarks" msgstr "全局书签" -#: ../../locales/../src/engine/tlssocket.cpp:212 +#: ../../locales/../src/engine/tlssocket_impl.cpp:315 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS 错误 %d" -#: ../../locales/../src/engine/tlssocket.cpp:214 +#: ../../locales/../src/engine/tlssocket_impl.cpp:318 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS 错误 %d，位于 %s" -#: ../../locales/../src/engine/tlssocket.cpp:208 +#: ../../locales/../src/engine/tlssocket_impl.cpp:310 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS 错误 %d，位于 %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:206 +#: ../../locales/../src/engine/tlssocket_impl.cpp:307 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS 错误 %d: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:898 msgid "GnuTLS:" msgstr "GnuTLS:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 +#: ../../locales/../src/interface/sitemanager.cpp:19 +msgid "Green" +msgstr "绿色" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Group permissions" msgstr "组权限" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "H&igh" msgstr "高(&I)" -#: ../../locales/../src/engine/server.cpp:18 +#: ../../locales/../src/engine/server.cpp:24 msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - 通过 TLS 的 HTTP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2232 msgid "Hash:" msgstr "散列值:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80 msgid "Hidden" msgstr "隐藏" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/queue.cpp:936 #: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "高" -#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:938 #: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "最高" @@ -4182,55 +4450,62 @@ msgid "Highest available port has to be a number between 1024 and 65535." msgstr "最高的可用端口号必须在 1024 到 65535 之间。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1353 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "按住 shift 键来同时开/关两边的过滤器状态。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 msgid "Homepage:" msgstr "主页:" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Host is down" msgstr "主机已关闭" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 -msgid "Host key fingerprint:" -msgstr "主机密钥指纹:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1116 msgid "Host key mismatch" msgstr "主机密钥不匹配" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/interface/serverdata.cpp:103 msgid "Host starts with '[' but no closing bracket found." msgstr "主机名以“[”开始，但没有结束符“]”。" -#: ../../locales/../src/engine/proxy.cpp:516 +#: ../../locales/../src/engine/proxy.cpp:501 msgid "Host unreachable" msgstr "无法连接主机" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:290 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:858 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:969 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:284 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:420 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1040 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1161 msgid "Host:" msgstr "主机:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1050 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1171 +msgid "Hostkey algorithm:" +msgstr "主机密匙算法:" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 msgid "Hours," msgstr "小时，" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:550 +msgid "" +"I &forgot my master password. Delete all passwords stored with this key." +msgstr "我确实忘记了主密码。删除保存在该主密码下的所有密码。(&F)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (示例: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:153 +#: ../../locales/../src/engine/proxy.cpp:118 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "SOCKS4 代理不支持 IPv6 地址" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:117 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:118 msgid "" "If no data is sent or received during an operation for longer than the " "specified time, the connection will be closed and FileZilla will try to " @@ -4239,7 +4514,7 @@ "如果一次操作中，在指定的时间长度内没有发出或收到数据，连接将被关闭，" "FileZilla 会尝试重新连接。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2345 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "如果要报告问题，请提供“详细”等级的日志文件。" @@ -4260,25 +4535,25 @@ "misconfigured servers which reject the selected transfer mode." msgstr "如果启用了退回选项，您将能连接到因错误配置而拒绝选定传输模式的站点。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 msgid "" "If the host key change was not expected, please contact the server " "administrator." msgstr "如果主机密钥的更换有异，请联系服务器管理员。" -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "如果这个问题仍然存在，则是某些路由器和/或防火墙一直在阻止 FileZilla。" -#: ../../locales/../src/interface/netconfwizard.cpp:572 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." msgstr "如果这个问题仍然存在，则是某些路由器和/或防火墙仍在打断该连接。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2268 msgid "" "If the size of the logfile reaches the limit, it gets renamed by adding " "\".1\" to the end of the filename (possibly overwriting older logfiles) and " @@ -4287,7 +4562,7 @@ "如果日志文件的体积达到限制，它将以文件名末尾将加上“.1”的方式重命名(有可能覆盖" "旧的日志文件)，之后新的文件将会被创建。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3588 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." @@ -4295,18 +4570,18 @@ "如果符号链接指向一个目录，FileZilla 可以删除符号链接或者删除所指向的目录内" "容。" -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "如果这个问题仍然存在，请联系您的路由器或防火墙的制造商。" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "If this problem stays, please contact your router manufacturer." msgstr "如果这个问题仍然存在，请联系您的路由器制造商。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1456 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1239 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1661 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1240 msgid "" "If using 'overwrite if newer', your system time has to be synchronized with " "the server. If the time differs (e.g. different timezone), specify a " @@ -4315,13 +4590,13 @@ "要是选择“如果较新就覆盖”，您的系统时间需要与服务器同步。若时间不同 (例如不同" "的时区)，请在站点管理器中选择一个时区。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1777 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1857 msgid "" "If using timestamp based comparison, consider two files equal if their " "timestamp difference does not exceed this threshold." msgstr "如果使用时间戳方式比较，只要两个文件的时间差异不超过限定值便视为相同。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1962 msgid "If you change the language, you need to restart FileZilla." msgstr "如果改变了语言，您需要重启 FileZilla。" @@ -4333,11 +4608,11 @@ "如果您点击了测试，FileZilla 会连接到 probe.filezilla-project.org 并且进行一些" "简单测试。" -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1254 msgid "If you close FileZilla, your changes will be lost." msgstr "如果关闭 FileZilla，您所做的改变将会丢失。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1128 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." @@ -4347,13 +4622,13 @@ msgid "If you get any errors, your configuration is not correct." msgstr "如果遇到了错误，说明您的配置不正确。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:218 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:219 msgid "" "If you have problems to retrieve directory listings or to transfer files, " "try to change the default transfer mode." msgstr "如果您在取得目录列表或传输文件的时候碰到问题，请试着改变默认传输模式。" -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4383,22 +4658,22 @@ msgstr "" "如果您使用了路由器，确保所有的端口都已被转发到您运行 FileZilla 的机器上。" -#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." msgstr "如果您的路由器总是变换 IP 地址，请联系您的路由器制造商。" -#: ../../locales/../src/interface/import.cpp:87 +#: ../../locales/../src/interface/import.cpp:99 msgid "Import data from older version" msgstr "从旧版中导入数据" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1820 msgid "Import settings" msgstr "导入设置" -#: ../../locales/../src/interface/import.cpp:73 -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:81 +#: ../../locales/../src/interface/import.cpp:88 msgid "Import successful" msgstr "导入成功" @@ -4424,7 +4699,7 @@ "哪个端口。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:168 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:336 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:337 msgid "" "In order to use active mode, FileZilla needs to know your external IP " "address." @@ -4439,37 +4714,31 @@ "在被动模式下(推荐大多数用户使用)，FileZilla 请求服务器给出一个端口，然后连接" "到那个端口去。不需要太多的配置。" -#: ../../locales/../src/engine/tlssocket.cpp:1119 -msgid "" -"Incomplete chain, top certificate is not self-signed certificate authority " -"certificate" -msgstr "不完整的认证链，顶级证书不是自签发证书授权证书" - -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/interface/queue.cpp:349 msgid "Incorrect password" msgstr "密码错误" -#: ../../locales/../src/interface/resources/xrc/update.xrc:192 +#: ../../locales/../src/interface/resources/xrc/update.xrc:221 msgid "" "Information about the latest version of FileZilla could not be retrieved. " "Please try again later." msgstr "无法获取最新版本 FileZilla 的信息。请稍后重试。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 +#: ../../locales/../src/engine/ftp/logon.cpp:248 msgid "Initializing TLS..." msgstr "初始化 TLS 中..." -#: ../../locales/../src/interface/verifycertdialog.cpp:107 +#: ../../locales/../src/interface/verifycertdialog.cpp:297 msgid "Insecure algorithm!" msgstr "不安全的算法！" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/engine/ftp/logon.cpp:233 msgid "Insecure server, it does not support FTP over TLS." msgstr "不安全的服务器，不支持 FTP over TLS。" -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:185 +#: ../../locales/../src/engine/server.cpp:613 +#: ../../locales/../src/engine/server.cpp:637 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Interactive" msgstr "交互式" @@ -4477,71 +4746,95 @@ msgid "Interface" msgstr "界面" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Interrupted by signal" msgstr "被信号量中断" -#: ../../locales/../src/engine/ControlSocket.cpp:220 -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/engine/ControlSocket.cpp:213 +#: ../../locales/../src/interface/queue.cpp:355 msgid "Interrupted by user" msgstr "用户终止" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 +#: ../../locales/../src/engine/http/request.cpp:581 msgid "Invalid Content-Length" msgstr "无效的 Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 +#: ../../locales/../src/engine/http/request.cpp:488 msgid "Invalid HTTP Response" msgstr "无效的 HTTP 响应" -#: ../../locales/../src/engine/socket.cpp:1036 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Invalid argument passed" msgstr "传递了无效参数" -#: ../../locales/../src/engine/ControlSocket.cpp:456 -#: ../../locales/../src/engine/ControlSocket.cpp:512 +#: ../../locales/../src/engine/ControlSocket.cpp:459 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." msgstr "收到无效字节，将禁用 UTF-8 编码。请在站点管理器中强制选择 UTF-8 编码。" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:702 msgid "Invalid chunk size" msgstr "无效的块大小" -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 -#: ../../locales/../src/interface/netconfwizard.cpp:380 -#: ../../locales/../src/interface/netconfwizard.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:373 +#: ../../locales/../src/interface/netconfwizard.cpp:382 +#: ../../locales/../src/interface/netconfwizard.cpp:390 +#: ../../locales/../src/interface/netconfwizard.cpp:407 msgid "Invalid data received" msgstr "收到无效数据" -#: ../../locales/../src/interface/verifycertdialog.cpp:41 -#: ../../locales/../src/interface/verifycertdialog.cpp:55 +#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Invalid date" msgstr "无效数据" -#: ../../locales/../src/interface/file_utils.cpp:293 -#: ../../locales/../src/interface/file_utils.cpp:318 +#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:315 msgid "Invalid filename" msgstr "无效文件名" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/interface/updater.cpp:704 +#, c-format +msgid "Invalid hash: %s\n" +msgstr "无效的散列值: %s\n" + +#: ../../locales/../src/interface/serverdata.cpp:108 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "无效主机名，在闭合括号之后只能是冒号加端口号。" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/engine/http/filetransfer.cpp:160 +#, c-format +msgid "Invalid hostname: %s" +msgstr "无效的主机名: %s" + +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/loginmanager.cpp:108 +#: ../../locales/../src/interface/loginmanager.cpp:113 +#: ../../locales/../src/interface/loginmanager.cpp:207 +#: ../../locales/../src/interface/loginmanager.cpp:309 msgid "Invalid input" msgstr "无效输入" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/http/request.cpp:516 +msgid "Invalid line" +msgstr "无效的行" + +#: ../../locales/../src/engine/storj/list.cpp:21 +#: ../../locales/../src/engine/storj/mkd.cpp:22 +#: ../../locales/../src/engine/storj/rmd.cpp:24 +msgid "Invalid path" +msgstr "无效的路径" + +#: ../../locales/../src/interface/serverdata.cpp:13 +#: ../../locales/../src/interface/serverdata.cpp:136 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "给定的端口无效，端口号必须是一个 1 到 65535 间的值。" -#: ../../locales/../src/engine/server.cpp:91 -#: ../../locales/../src/interface/quickconnectbar.cpp:121 +#: ../../locales/../src/interface/quickconnectbar.cpp:160 +#: ../../locales/../src/interface/serverdata.cpp:40 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4555,72 +4848,72 @@ "ftps:// 通过 TLS 传输的 FTP (隐式)以及\n" "ftpes:// 通过 TLS 传输的 FTP (显式)。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftp/logon.cpp:70 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "无效代理主机名，在闭合括号之后只允许是跟冒号加端口号。" -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:522 +msgid "Invalid regular expression" +msgstr "无效的正则表达式" + +#: ../../locales/../src/interface/search.cpp:744 msgid "Invalid regular expression in search conditions." msgstr "无效的搜索条件正则表达式。" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 +#: ../../locales/../src/engine/http/request.cpp:497 msgid "Invalid response code" msgstr "无效的响应码" -#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:739 #, c-format msgid "Invalid search conditions: %s" msgstr "无效的搜索条件: %s" -#: ../../locales/../src/interface/sitemanager.cpp:411 -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:468 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:754 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:794 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Invalid site path" msgstr "无效的站点路径" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:537 msgid "Invalid size in condition" msgstr "条件中的大小无效" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/interface/serverdata.cpp:79 msgid "Invalid username given." msgstr "无效的用户名。" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Invalid value for ai_flags" msgstr "ai_flags 的值无效" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Invalid value for hints" msgstr "提示的值无效" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/list_search_panel.cpp:187 +msgid "Invert Filter" +msgstr "反转过滤器" + +#: ../../locales/../src/interface/verifycertdialog.cpp:444 msgid "Jurisdiction country:" msgstr "司法管辖国家:" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:446 msgid "Jurisdiction locality:" msgstr "司法管辖地区:" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:445 msgid "Jurisdiction state or province:" msgstr "司法管辖州或省:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1814 msgid "Keep directories on top" msgstr "保持目录在上方" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:712 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4630,7 +4923,7 @@ "的列表。虽然 FileZilla 会先执行一些测试看看服务器是否支持这个功能，但这些测试" "也可能会失败。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2205 msgid "Key exchange" msgstr "密钥交换" @@ -4638,123 +4931,146 @@ msgid "Key exchange:" msgstr "密钥交换:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 +#: ../../locales/../src/engine/server.cpp:610 +#: ../../locales/../src/engine/server.cpp:635 msgid "Key file" msgstr "密钥文件" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:519 +msgid "Key identifier:" +msgstr "密钥标识:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:378 msgid "L&owest" msgstr "最低(&O)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1943 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" msgstr "语言" -#: ../../locales/../src/interface/Mainfrm.cpp:1442 +#: ../../locales/../src/interface/Mainfrm.cpp:1539 msgid "Language changed" msgstr "语言已经更改" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:112 +#: ../../locales/../src/interface/LocalListView.cpp:290 +#: ../../locales/../src/interface/RemoteListView.cpp:401 +#: ../../locales/../src/interface/search.cpp:163 msgid "Last modified" msgstr "最近修改" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1344 msgid "Layout" msgstr "布局" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 +#. @translator: Keep this string as short as possible +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:67 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1831 +msgid "Leave empty to keep existing password." +msgstr "不输入以保持现有密码不变。" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:844 msgid "Limit for concurrent &downloads:" msgstr "同时下载限制(&D):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:865 msgid "Limit for concurrent &uploads:" msgstr "同时上传限制(&U):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:265 msgid "Limit local ports" msgstr "限制本地端口" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2237 msgid "Limit size of logfile" msgstr "限制日志文件大小" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "Limit:" msgstr "限制:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/http/request.cpp:656 msgid "Line length exceeded" msgstr "行长度已超出" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:918 msgid "Linked against" msgstr "链接库" -#: ../../locales/../src/interface/netconfwizard.cpp:264 -#: ../../locales/../src/interface/netconfwizard.cpp:270 +#: ../../locales/../src/interface/netconfwizard.cpp:274 +#: ../../locales/../src/interface/netconfwizard.cpp:280 msgid "Listen socket closed" msgstr "监听套接字已关闭" -#: ../../locales/../src/engine/logging.cpp:118 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:120 +#: ../../locales/../src/interface/StatusView.cpp:296 +#: ../../locales/../src/interface/StatusView.cpp:375 msgid "Listing:" msgstr "列表:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:295 msgid "Lo&west available port:" msgstr "最低可用端口(&W):" -#: ../../locales/../src/interface/edithandler.cpp:1132 -#: ../../locales/../src/interface/edithandler.cpp:1368 +#: ../../locales/../src/interface/edithandler.cpp:1184 +#: ../../locales/../src/interface/edithandler.cpp:1420 msgid "Local" msgstr "本地" -#: ../../locales/../src/engine/socket.cpp:1033 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Local address in use" msgstr "本地地址正在使用中" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Local endpoint has been closed" msgstr "本地端点 (endpoint) 已关闭" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2482 msgid "Local file" msgstr "本地文件" -#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:304 msgid "Local file does not exist." msgstr "本地文件不存在。" -#: ../../locales/../src/interface/updater.cpp:371 -#: ../../locales/../src/interface/updater.cpp:463 +#: ../../locales/../src/interface/updater.cpp:422 +#: ../../locales/../src/interface/updater.cpp:515 #, c-format msgid "Local file is %s\n" msgstr "本地文件为 %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:300 msgid "Local file is a directory instead of a regular file." msgstr "本地文件是一个目录而不是一个普通文件。" -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Local file is not a valid filename." msgstr "本地文件不是一个有效的文件名。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 +#: ../../locales/../src/interface/search.cpp:702 +#: ../../locales/../src/interface/search.cpp:708 +msgid "Local file search" +msgstr "本地文件搜索" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1281 msgid "Local filters:" msgstr "本地过滤器:" -#: ../../locales/../src/interface/viewheader.cpp:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3511 +msgid "Local path handling:" +msgstr "本地路径处理:" + +#: ../../locales/../src/interface/viewheader.cpp:337 msgid "Local site:" msgstr "本地站点:" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/updater.cpp:745 +#, c-format +msgid "Local size of '%s' does not match expected size: %d != %d" +msgstr "“%s”的本地大小与期望的大小不匹配: %d != %d" + +#: ../../locales/../src/interface/verifycertdialog.cpp:438 msgid "Locality:" msgstr "地点:" @@ -4762,12 +5078,16 @@ msgid "Log file" msgstr "日志文件" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/engine/ftp/logon.cpp:416 +msgid "Logged in" +msgstr "已登录" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2191 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "日志" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftp/logon.cpp:302 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4775,16 +5095,16 @@ "登录数据包含非 ASCII 字符而且服务器可能无法识别 UTF-8。所以无法退回使用本地编" "码。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/ftp/logon.cpp:309 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." msgstr "" "登录数据包含非 ASCII 字符而且服务器可能无法识别 UTF-8。尝试使用本地编码。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 -msgid "Login sequence fully executed yet not logged in. Aborting." -msgstr "登录过程已完全执行，但依然无法登录。正在终止。" +#: ../../locales/../src/engine/ftp/logon.cpp:336 +msgid "Login sequence fully executed yet not logged in, aborting." +msgstr "登录过程已完全执行，但依然无法登录，中止操作。" #: ../../locales/../src/interface/cmdline.cpp:103 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)." @@ -4797,12 +5117,12 @@ "'%s' or '%s'" msgstr "登录类型只能和 FTP URL 一起使用。参数必须是“%s”或“%s”" -#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:931 #: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "低" -#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:929 #: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "最低" @@ -4815,126 +5135,159 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:44 +#: ../../locales/../src/interface/sitemanager.cpp:23 +msgid "Magenta" +msgstr "洋红" + +#: ../../locales/../src/interface/xmlfunctions.cpp:40 msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "确认该文件可以被存取而且是一个格式正确的 XML 文档。" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 +#: ../../locales/../src/engine/http/request.cpp:643 +#: ../../locales/../src/engine/http/request.cpp:649 +#: ../../locales/../src/engine/http/request.cpp:656 +#: ../../locales/../src/engine/http/request.cpp:667 +#: ../../locales/../src/engine/http/request.cpp:702 #, c-format msgid "Malformed chunk data: %s" msgstr "错误的块数据: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/http/request.cpp:159 #, c-format -msgid "Malformed header: %s" -msgstr "错误的头: %s" +msgid "Malformed request header: %s" +msgstr "错误的请求头: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 -msgid "Malformed reply, server not sending proper line endings" -msgstr "错误的回应，服务器没有发送正确的行结尾" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:297 -#: ../../locales/../src/interface/manual_transfer.cpp:303 -#: ../../locales/../src/interface/manual_transfer.cpp:309 -#: ../../locales/../src/interface/manual_transfer.cpp:313 -#: ../../locales/../src/interface/manual_transfer.cpp:320 -#: ../../locales/../src/interface/manual_transfer.cpp:326 -#: ../../locales/../src/interface/manual_transfer.cpp:332 -#: ../../locales/../src/interface/manual_transfer.cpp:350 +#: ../../locales/../src/engine/http/request.cpp:457 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:516 +#: ../../locales/../src/engine/http/request.cpp:571 +#: ../../locales/../src/engine/http/request.cpp:581 +#, c-format +msgid "Malformed response header: %s" +msgstr "错误的响应头: %s" + +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:780 +#, fuzzy, c-format +msgid "Malformed response: %s" +msgstr "错误的响应数据: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2824 +#: ../../locales/../src/interface/manual_transfer.cpp:288 +#: ../../locales/../src/interface/manual_transfer.cpp:294 +#: ../../locales/../src/interface/manual_transfer.cpp:300 +#: ../../locales/../src/interface/manual_transfer.cpp:304 +#: ../../locales/../src/interface/manual_transfer.cpp:311 +#: ../../locales/../src/interface/manual_transfer.cpp:317 +#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/manual_transfer.cpp:344 msgid "Manual transfer" msgstr "手动传输" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:530 +msgid "Master &Password:" +msgstr "主密码(&P):" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4051 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1302 +msgid "Master password:" +msgstr "主密码:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3299 msgid "Match all of the following" msgstr "匹配以下所有" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "Match any of the following" msgstr "匹配以下任意一个" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3301 msgid "Match none of the following" -msgstr "不匹配以下内容" +msgstr "不匹配以下任何内容" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3302 +msgid "Match not all of the following" +msgstr "不匹配以下所有内容" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:823 msgid "Maximum simultaneous &transfers:" msgstr "最大并发传输(&T):" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "Memory allocation failure" msgstr "分配内存失败" -#: ../../locales/../src/interface/Mainfrm.cpp:388 -#: ../../locales/../src/interface/Mainfrm.cpp:1752 +#: ../../locales/../src/interface/Mainfrm.cpp:435 +#: ../../locales/../src/interface/Mainfrm.cpp:1854 msgid "Message log" msgstr "消息日志" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Message log position" msgstr "消息日志位置" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Message too large" msgstr "消息过长" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2257 msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 msgid "Minutes" msgstr "分钟" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2397 msgid "Move &down" msgstr "下移(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2391 msgid "Move &up" msgstr "上移(&U)" -#: ../../locales/../src/interface/LocalTreeView.cpp:974 +#: ../../locales/../src/interface/LocalTreeView.cpp:1005 msgid "My Computer" msgstr "我的电脑" -#: ../../locales/../src/interface/LocalTreeView.cpp:964 +#: ../../locales/../src/interface/LocalTreeView.cpp:995 msgid "My Documents" msgstr "我的文档" -#: ../../locales/../src/interface/sitemanager.cpp:271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:342 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:778 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:781 msgid "My Sites" msgstr "我的站点" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:197 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:200 msgid "N/a" msgstr "不可用" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2862 msgid "Name" msgstr "名字" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:732 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1270 msgid "Name already exists" msgstr "名称已经存在" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 msgid "Name of bookmark already exists." msgstr "该名称的书签已经存在。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:276 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:412 msgid "Name:" msgstr "名字:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1834 msgid "Natural sort" msgstr "自然排序" @@ -4942,30 +5295,34 @@ msgid "Need to enter filter name" msgstr "需要输入过滤器名" -#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:702 +msgid "Need to enter valid local path" +msgstr "需要输入正确的本地路径" + +#: ../../locales/../src/interface/search.cpp:729 msgid "Need to enter valid remote path" msgstr "需要输入正确的远程路径" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 msgid "Need to specify a character encoding" msgstr "需要指定字符编码" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1105 msgid "Neither nodename nor servname provided, or not known" msgstr "未提供，或不知道节点名或服务名" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1092 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "在请求的地址集中，网络主机没有任何网络地址" -#: ../../locales/../src/engine/proxy.cpp:513 -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "Network unreachable" msgstr "无法连接网络" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2128 msgid "Never" msgstr "从不" @@ -4977,37 +5334,37 @@ msgid "New &tab" msgstr "新标签(&T)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3067 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "新建书签(&M)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2585 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2827 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:73 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:535 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:555 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:695 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:111 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:573 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:579 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:600 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:853 +#: ../../locales/../src/interface/sitemanager.cpp:725 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2493 msgid "New bookmark" msgstr "新建书签" -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 +#: ../../locales/../src/interface/LocalTreeView.cpp:1185 +#: ../../locales/../src/interface/RemoteListView.cpp:1346 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1280 msgid "New directory" msgstr "创建目录" -#: ../../locales/../src/interface/welcome_dialog.cpp:51 +#: ../../locales/../src/interface/welcome_dialog.cpp:65 #, c-format msgid "New features and improvements in %s" msgstr "%s 中的新功能和改进" @@ -5016,41 +5373,41 @@ msgid "New filter" msgstr "新过滤器" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:959 msgid "New folder" msgstr "新文件夹" -#: ../../locales/../src/interface/sitemanager.cpp:585 -#: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 +#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:619 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2466 msgid "New site" msgstr "新站点" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1401 msgid "Next to the transfer queue" msgstr "在传输队列旁边" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:399 msgid "No" msgstr "否" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "No address associated with nodename" msgstr "节点名称没有关联地址" -#: ../../locales/../src/interface/export.cpp:26 +#: ../../locales/../src/interface/export.cpp:30 msgid "No category to export selected" msgstr "没有选定要导出的分类目录" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:1879 msgid "No command given, aborting." -msgstr "没有给出命令，中止。" +msgstr "没有给出命令，中止操作。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:644 msgid "No external IP address set, trying default." msgstr "没有设定外部 IP 地址，尝试使用默认值。" -#: ../../locales/../src/interface/edithandler.cpp:1073 +#: ../../locales/../src/interface/edithandler.cpp:1125 msgid "No files are currently being edited." msgstr "没有正在编辑的文件。" @@ -5058,95 +5415,91 @@ msgid "No filter name given" msgstr "没有给过滤器指定名称" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/interface/serverdata.cpp:27 +#: ../../locales/../src/interface/serverdata.cpp:122 +#: ../../locales/../src/interface/serverdata.cpp:143 msgid "No host given, please enter a host." msgstr "没有给出主机，请输入一个主机。" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:94 msgid "No images available" msgstr "没有图像可用" -#: ../../locales/../src/interface/QueueView.cpp:2974 -msgid "No more files in the queue!" -msgstr "队列里已没有文件！" - -#: ../../locales/../src/interface/filter.cpp:340 -#: ../../locales/../src/interface/filter.cpp:404 +#: ../../locales/../src/interface/filter.cpp:245 +#: ../../locales/../src/interface/filter.cpp:315 msgid "No name for the filterset given." msgstr "没有给过滤器集合指定名称。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3234 msgid "No program associated with filetype" msgstr "文件格式没有关联程序" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "扩展名为“%s”的文件没有关联程序。" -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "No route to host" msgstr "无法连通主机" -#: ../../locales/../src/interface/search.cpp:255 +#: ../../locales/../src/interface/search.cpp:444 msgid "No search results" msgstr "没有搜索结果" -#: ../../locales/../src/interface/sitemanager.cpp:280 +#: ../../locales/../src/interface/sitemanager.cpp:352 msgid "No sites available" msgstr "没有站点可用" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:470 msgid "No supported SOCKS5 auth method" msgstr "不支持 SOCKS5 认证方式" -#: ../../locales/../src/interface/loginmanager.cpp:101 +#: ../../locales/../src/interface/loginmanager.cpp:207 msgid "No username given." msgstr "未指定用户名。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1924 +#: ../../locales/../src/interface/sitemanager.cpp:17 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "None" msgstr "无" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 msgid "None selected yet" msgstr "尚未选择项目" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "Nonrecoverable failure in name resolution" msgstr "名字解析中有无法恢复的错误" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:179 -#: ../../locales/../src/interface/manual_transfer.cpp:540 -#: ../../locales/../src/interface/queue.cpp:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:963 +#: ../../locales/../src/engine/server.cpp:604 +#: ../../locales/../src/engine/server.cpp:631 +#: ../../locales/../src/interface/manual_transfer.cpp:148 +#: ../../locales/../src/interface/manual_transfer.cpp:176 +#: ../../locales/../src/interface/manual_transfer.cpp:535 +#: ../../locales/../src/interface/queue.cpp:934 #: ../../locales/../src/interface/queue.cpp:996 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 msgid "Normal" msgstr "正常" -#: ../../locales/../src/interface/queueview_failed.cpp:312 -#: ../../locales/../src/interface/queueview_failed.cpp:337 +#: ../../locales/../src/interface/queueview_failed.cpp:310 +#: ../../locales/../src/interface/queueview_failed.cpp:335 msgid "Not all items could be requeued for transfer." msgstr "并非所有项目都可被重新列队以传输。" -#: ../../locales/../src/interface/state.cpp:180 -#: ../../locales/../src/interface/state.cpp:483 +#: ../../locales/../src/interface/state.cpp:211 +#: ../../locales/../src/interface/state.cpp:1311 msgid "Not connected" msgstr "未连接" -#: ../../locales/../src/interface/RemoteListView.cpp:2011 +#: ../../locales/../src/interface/RemoteListView.cpp:2088 msgid "Not connected to any server" msgstr "没有连接到任何服务器" -#: ../../locales/../src/interface/Mainfrm.cpp:561 +#: ../../locales/../src/interface/Mainfrm.cpp:611 msgid "Not connected to any server." msgstr "没有连接到任何服务器。" @@ -5154,23 +5507,32 @@ msgid "Not connected." msgstr "未连接。" -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1120 msgid "Not initialized, need to call WSAStartup" msgstr "尚未初始化，需要调用 WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../locales/../src/interface/Mainfrm.cpp:710 msgid "Note that this feature is only supported using the FTP protocol." msgstr "注意这个功能只支持使用 FTP 协议。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:27 +msgid "Note: A lost key cannot be recovered." +msgstr "请注意: 密钥丢失将无法恢复。" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:596 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "注意: 只适用于未加密的 FTP 连接。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:795 msgid "Note: Using a generic proxy forces passive mode on FTP connections." msgstr "注意: 使用代理将强制使用被动模式进行 FTP 连接。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 +#: ../../locales/../src/engine/http/request.cpp:463 +#: ../../locales/../src/engine/http/request.cpp:649 +msgid "Null character in line" +msgstr "行中有空字符" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1718 msgid "Number of decimal places:" msgstr "小数位数:" @@ -5178,40 +5540,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "重试的次数必须在 0 和 99 之间。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 -msgid "O&pen file" -msgstr "打开文件(&P)" - -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:263 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:239 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:566 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:812 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1178 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1359 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1466 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1590 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1649 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1823 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1960 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:635 +msgid "O&pen" +msgstr "打开(&P)" + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:268 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:559 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1564 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1742 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1865 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2039 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2806 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2959 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3552 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4226 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:27 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:28 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:37 msgid "OK" msgstr "确定" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:939 msgid "OS version:" msgstr "操作系统版本:" @@ -5221,39 +5587,50 @@ "well as the fallback mode if enabled." msgstr "在接下来的几个页面里将要设置选择的传输模式以及退回模式(如果启用)。" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:409 msgid "Once" msgstr "一次" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2129 msgid "Once a day" msgstr "每天一次" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2130 msgid "Once a week" msgstr "每周一次" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:550 msgid "Only use plain FTP (insecure)" msgstr "只使用普通 FTP (不安全)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2161 +msgid "Op&en file" +msgstr "打开文件(&E)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 msgid "Open directory in system's file manager" msgstr "在系统的文件管理器中打开目录" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 +#: ../../locales/../src/interface/toolbar.cpp:31 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager" msgstr "打开站点管理器" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 +#: ../../locales/../src/interface/toolbar.cpp:31 msgid "Open the Site Manager." msgstr "打开站点管理器。" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 +#: ../../locales/../src/interface/toolbar.cpp:33 msgid "Open the Site Manager. Right-click for a list of sites." msgstr "打开站点管理器。右击查看站点列表。" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 +msgid "" +"Open the directory access permissions dialog to configure the local " +"directories FileZilla has access to." +msgstr "打开目录访问权限对话框调整 FileZilla 的本地目录权限。" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "Open the file." msgstr "打开文件。" @@ -5261,14 +5638,16 @@ msgid "Open the settings dialog of FileZilla" msgstr "打开 FileZilla 的设置对话框" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1912 msgid "Opened as:" msgstr "打开为:" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1523 +#: ../../locales/../src/interface/search.cpp:1536 msgid "Opening failed" msgstr "打开失败" @@ -5280,137 +5659,145 @@ msgid "Opens the Site Manager" msgstr "打开站点管理器" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 +#: ../../locales/../src/interface/toolbar.cpp:50 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "打开目录列表过滤器对话框。右击开/关过滤器。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:931 msgid "Operating System:" msgstr "操作系统:" -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation already in progress" msgstr "操作已经在进行" -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Operation in progress" msgstr "操作正在进行" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Operation not supported" msgstr "不支持该操作" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/list_search_panel.cpp:55 +msgid "Options" +msgstr "选项" + +#: ../../locales/../src/interface/sitemanager.cpp:24 +msgid "Orange" +msgstr "橙色" + +#: ../../locales/../src/interface/verifycertdialog.cpp:432 msgid "Organization:" msgstr "组织:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:681 msgid "Other SFTP options" msgstr "其他 SFTP 选项" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1115 msgid "Other system error" msgstr "其他系统错误" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:454 msgid "Other:" msgstr "其他:" -#: ../../locales/../src/engine/socket.cpp:1039 -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Out of memory" msgstr "内存不足" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:64 msgid "Overview" msgstr "概述" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:136 msgid "Overwrite &if source newer" msgstr "如果较新则覆盖(&I)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1187 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1611 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1634 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 msgid "Overwrite file" msgstr "覆盖文件" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1408 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1431 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1613 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1636 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 msgid "Overwrite file if size differs" msgstr "如果大小不同则覆盖文件" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1409 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1190 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1637 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 msgid "Overwrite file if size differs or source file is newer" msgstr "如果大小不同或源文件较新则覆盖文件" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1407 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1430 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1188 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1189 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1210 msgid "Overwrite file if source file newer" msgstr "如果源文件较新则覆盖文件" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite if &different size" msgstr "如果大小不同则覆盖(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:149 msgid "Overwrite if different si&ze or source newer" msgstr "如果大小不同或源文件较新则覆盖(&Z)" -#: ../../locales/../src/interface/updater.cpp:219 +#: ../../locales/../src/interface/updater.cpp:259 #, c-format msgid "Own build type: %s\n" msgstr "自己的构建类型: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:587 msgid "Owner permissions" msgstr "所有者权限" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:114 +#: ../../locales/../src/interface/RemoteListView.cpp:403 +#: ../../locales/../src/interface/search.cpp:165 msgid "Owner/Group" msgstr "所有者/组" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1430 msgid "" "P&revent system from entering idle sleep during transfers and other " "operations" msgstr "当传输或其它操作时，阻止系统进入空闲睡眠(&R)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:556 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:743 msgid "P&roxy host:" msgstr "代理主机(&R):" -#: ../../locales/../src/interface/netconfwizard.cpp:497 +#: ../../locales/../src/interface/netconfwizard.cpp:507 msgid "PORT command tainted by router or firewall." msgstr "PORT 命令已受路由器或防火墙影响。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:203 msgid "Pa&ssive (recommended)" msgstr "被动 (推荐)(&S)" -#: ../../locales/../src/interface/Mainfrm.cpp:2322 +#: ../../locales/../src/interface/Mainfrm.cpp:2484 msgid "Parameter not a valid URL" msgstr "参数不是有效的 URL" -#: ../../locales/../src/interface/updater.cpp:543 +#: ../../locales/../src/interface/updater.cpp:595 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "解析版本信息的 %d 个字节。\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 -#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2714 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:210 +#: ../../locales/../src/interface/quickconnectbar.cpp:56 msgid "Pass&word:" msgstr "密码(&W):" @@ -5418,66 +5805,80 @@ msgid "Passive (recommended)" msgstr "被动 (推荐)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:409 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:410 #: ../../locales/../src/interface/settings/settingsdialog.cpp:95 msgid "Passive mode" msgstr "被动模式" -#: ../../locales/../src/interface/netconfwizard.cpp:597 #: ../../locales/../src/interface/netconfwizard.cpp:610 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../locales/../src/interface/netconfwizard.cpp:634 msgid "Passive mode has been set as default transfer mode." msgstr "被动模式已经被设为默认传输模式。" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 +#: ../../locales/../src/engine/storj/connect.cpp:82 +#: ../../locales/../src/engine/storj/connect.cpp:93 +msgid "Password or encryption key is not set" +msgstr "未设置密码或加密密钥" + +#: ../../locales/../src/interface/fzputtygen_interface.cpp:95 msgid "Password required" msgstr "要求提供密码" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:109 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1271 +msgid "Passwords" +msgstr "密码" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/search.cpp:160 msgid "Path" msgstr "路径" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3058 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../locales/../src/engine/ftp/rmd.cpp:28 +#: ../../locales/../src/engine/ftp/rmd.cpp:44 +#: ../../locales/../src/engine/sftp/rmd.cpp:16 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "无法为目录 %s 和子目录 %s 构造路径" -#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2439 msgid "Path not found:" msgstr "路径未找到:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2889 msgid "Paths" msgstr "路径" -#: ../../locales/../src/interface/edithandler.cpp:1111 -#: ../../locales/../src/interface/edithandler.cpp:1248 -#: ../../locales/../src/interface/edithandler.cpp:1338 -#: ../../locales/../src/interface/edithandler.cpp:1348 +#: ../../locales/../src/interface/edithandler.cpp:1163 +#: ../../locales/../src/interface/edithandler.cpp:1300 +#: ../../locales/../src/interface/edithandler.cpp:1390 +#: ../../locales/../src/interface/edithandler.cpp:1400 msgid "Pending removal" msgstr "等待移除" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 msgid "Permission" msgstr "权限" -#: ../../locales/../src/engine/socket.cpp:1032 -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "Permission denied" msgstr "权限不足" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:113 +#: ../../locales/../src/interface/RemoteListView.cpp:402 +#: ../../locales/../src/interface/search.cpp:164 msgid "Permissions" msgstr "权限" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:947 msgid "Platform:" msgstr "平台:" -#: ../../locales/../src/interface/netconfwizard.cpp:562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4185 +msgid "Please add the local directories you want to use FileZilla with." +msgstr "请添加 FileZilla 本地目录。" + +#: ../../locales/../src/interface/netconfwizard.cpp:574 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5485,6 +5886,12 @@ "请检查 https://filezilla-project.org/probe.php 服务器是否在运行，并再一次仔细" "检查您的设置。" +#: ../../locales/../src/interface/osx_sandbox_userdirs.cpp:121 +msgid "" +"Please check the granted permissions and re-add any missing local " +"directories you are working with in the dialog that follows." +msgstr "请确认目录权限的授予情况，并将缺失的目录重新加入对话框。" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:123 msgid "" "Please configure any firewalls and routers so that FileZilla can establish " @@ -5492,11 +5899,11 @@ msgstr "" "请配置使用了的任何防火墙或路由器，让 FileZilla 可以通过任意端口建立外部连接。" -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "请禁用路由器中类似于“DMZ 模式”或“Game 模式”的设置。" -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5510,13 +5917,13 @@ msgid "Please enter a custom time format." msgstr "请输入自定义时间格式。" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:713 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:551 msgid "" "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18." msgstr "请以格式 YYYY-MM-DD 输入一个日期，例如 2010-07-18。" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:123 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 #, c-format msgid "Please enter a download speed limit greater or equal to 0 %s/s." msgstr "请输入大于等于 0 %s/s 的下载速度限制。" @@ -5525,16 +5932,16 @@ msgid "Please enter a name for the new filter." msgstr "请为新过滤器命名。" -#: ../../locales/../src/interface/filteredit.cpp:243 +#: ../../locales/../src/interface/filteredit.cpp:242 msgid "Please enter a new name for the copied filter." msgstr "请为复制的过滤器输入新名称。" -#: ../../locales/../src/interface/filter.cpp:390 +#: ../../locales/../src/interface/filter.cpp:300 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "请为过滤器“%s”输入新名称。" -#: ../../locales/../src/interface/filteredit.cpp:196 +#: ../../locales/../src/interface/filteredit.cpp:195 msgid "Please enter a new name for the filter." msgstr "请为该过滤器输入新名称。" @@ -5555,49 +5962,38 @@ "transfers." msgstr "请输入 1 到 10 之间的数字来设置并发传输任务数。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:252 msgid "Please enter a password for this server:" msgstr "请为该服务器输入密码:" -#: ../../locales/../src/interface/QueueView.cpp:2109 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"请输入要执行的路径和程序。\n" -"例如 MS Windows 下的 c:\\somePath\\file.exe 或者是 Unix 下的 /somePath/" -"file。\n" -"您也可以指定一些程序参数。" - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "请输入介于 10 和 9999 之间的超时秒数，或输入 0 禁用超时。" -#: ../../locales/../src/interface/filter.cpp:334 +#: ../../locales/../src/interface/filter.cpp:238 msgid "Please enter a unique name for this filter set" msgstr "请为该过滤器集合输入一个唯一的名称" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:259 msgid "Please enter a username for this server:" msgstr "请为该服务器输入用户名:" -#: ../../locales/../src/interface/netconfwizard.cpp:187 +#: ../../locales/../src/interface/netconfwizard.cpp:185 msgid "Please enter a valid portrange." msgstr "请输入有效的端口范围。" -#: ../../locales/../src/interface/netconfwizard.cpp:168 +#: ../../locales/../src/interface/netconfwizard.cpp:166 msgid "Please enter an URL where to get your external address from" msgstr "请输入您用以获取外部地址的 URL" #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:130 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 #, c-format msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "请输入大于等于 0 %s/s 的上传速度限制。" -#: ../../locales/../src/interface/Mainfrm.cpp:572 +#: ../../locales/../src/interface/Mainfrm.cpp:623 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5605,27 +6001,44 @@ "请输入原始 FTP 命令。\n" "使用原始的 ftp 命令将会清空目录缓存。" -#: ../../locales/../src/interface/LocalListView.cpp:902 -#: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 +#: ../../locales/../src/interface/QueueView.cpp:1873 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"请输入完整的程序路径和命令行参数。命令将会在队列中逐个执行。\n" +"例如 MS Windows 的 c:\\somePath\\file.exe 或 Unix 的 /somePath/file。\n" +"如果路径或参数中有空格，请使用双引号。" + +#: ../../locales/../src/interface/LocalListView.cpp:954 +#: ../../locales/../src/interface/LocalTreeView.cpp:1181 +#: ../../locales/../src/interface/RemoteListView.cpp:1333 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1267 msgid "Please enter the name of the directory which should be created:" msgstr "请输入将要创建的目录名:" -#: ../../locales/../src/interface/RemoteListView.cpp:2609 +#: ../../locales/../src/interface/RemoteListView.cpp:2702 msgid "Please enter the name of the file which should be created:" msgstr "请输入将要创建的文件名:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:266 msgid "Please enter username and password for this server:" msgstr "请为该服务器输入用户名和密码:" -#: ../../locales/../src/interface/netconfwizard.cpp:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:510 +msgid "" +"Please enter your current master password to change the password settings." +msgstr "请输入您的主密码以更改密码设置。" + +#: ../../locales/../src/interface/netconfwizard.cpp:150 msgid "Please enter your external IP address" msgstr "请输入您的外部 IP 地址" -#: ../../locales/../src/interface/netconfwizard.cpp:602 #: ../../locales/../src/interface/netconfwizard.cpp:615 +#: ../../locales/../src/interface/netconfwizard.cpp:628 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5634,23 +6047,28 @@ "请在本向导的主动模式页输入您的外部 IP 地址。如果是动态地址或者您不知道外部地" "址，请使用外部解析器选项。" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 +msgid "" +"Please enter your master password to decrypt the password for this server:" +msgstr "请输入您的主密码，以解密该服务器的密码:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." msgstr "请认真按照提示进行，因为错误的配置将会阻止 FTP 连接。" -#: ../../locales/../src/interface/netconfwizard.cpp:626 +#: ../../locales/../src/interface/netconfwizard.cpp:639 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." msgstr "请确保 FileZilla 被允许建立向外的连接并且输入了正确的已解析地址。" -#: ../../locales/../src/interface/FileZilla.cpp:157 +#: ../../locales/../src/interface/FileZilla.cpp:149 msgid "Please make sure the requested locale is installed on your system." msgstr "请确认要求的区域配置已安装在系统里。" -#: ../../locales/../src/interface/netconfwizard.cpp:603 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5671,7 +6089,7 @@ "墙认为只有木马或其它有害软件才会用到的端口。这可能会引发一个错误的警告，您可" "以安全地忽略掉。" -#: ../../locales/../src/interface/Mainfrm.cpp:687 +#: ../../locales/../src/interface/Mainfrm.cpp:750 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5679,13 +6097,13 @@ "请注意保留时间戳只针对支持 MFMT 命令的 FTP，FTPS 和 FTPES 服务器上(不包含 " "SFTP)。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:179 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:180 msgid "" "Please note that some servers might ban you if you try to reconnect too " "often or in too short intervals." msgstr "请注意如果您过于频繁的尝试连接，或者间隔过短，某些服务器会阻止您。" -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5694,11 +6112,17 @@ "当网络环境发生改变，或者突然发生之前能用的服务器无法连接的问题，请再次运行本" "向导。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:22 +msgid "" +"Please save this key in a secure location. Without the correct key your " +"uploaded files cannot be accessed." +msgstr "请将该密钥保存在安全的地方。没有正确的密钥将无法访问您上传的文件。" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3593 msgid "Please select an action:" msgstr "请选择一个动作:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1858 msgid "Please select the categories you would like to import." msgstr "请选择您想要导入的分类。" @@ -5729,7 +6153,7 @@ msgid "Please select the new attributes for the selected files." msgstr "请为选定的文件选择新的属性。" -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:603 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5741,37 +6165,37 @@ "确配置。您必须要用手动设定端口转发。不要让您的路由器运行在所谓的“DMZ 模" "式”或“Game 模式”下。还要停用类似协议检查或协议修正之类的选项" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 msgid "Positio&n of the message log:" msgstr "消息日志的位置(&N):" -#: ../../locales/../src/interface/verifycertdialog.cpp:247 -#: ../../locales/../src/interface/verifycertdialog.cpp:248 +#: ../../locales/../src/interface/verifycertdialog.cpp:439 +#: ../../locales/../src/interface/verifycertdialog.cpp:440 msgid "Postal code:" msgstr "邮编:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1032 msgid "Pre&allocate space before downloading" msgstr "下载前预分配空间(&A)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1028 msgid "Preallocation" msgstr "预分配" -#: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 +#: ../../locales/../src/interface/sitemanager.cpp:341 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2194 msgid "Predefined Sites" msgstr "预定义的站点" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../locales/../src/interface/Mainfrm.cpp:749 msgid "Preserving file timestamps" msgstr "保留文件时间戳" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 -msgid "Preview:" -msgstr "预览:" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 +msgid "Preview" +msgstr "预览" -#: ../../locales/../src/engine/tlssocket.cpp:1136 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1388 msgid "Primary connection and data connection certificates don't match." msgstr "主连接和数据连接的证书不匹配。" @@ -5783,15 +6207,15 @@ msgid "Print version information to stdout and exit" msgstr "打印版本信息至标准输出(stdout)并退出" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 msgid "Prioritize directories (default)" msgstr "目录优先(默认)" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Priority" msgstr "优先级" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2089 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2169 msgid "" "Privacy policy: Only your version of FileZilla, your used operating system " "and your CPU architecture will be submitted to the server." @@ -5799,7 +6223,7 @@ "隐私策略: 只有您所使用的 FileZilla 版本、操作系统及 CPU 架构会被发送到服务" "器。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:630 msgid "Private &keys:" msgstr "私钥(&K):" @@ -5807,31 +6231,31 @@ msgid "Pro&tocol:" msgstr "协议(&T):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:579 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:776 msgid "Pro&xy password:" msgstr "代理密码(&X):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:133 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "Process &Queue" msgstr "处理队列(&Q)" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Process file table overflow" msgstr "进程文件表溢出" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#: ../../locales/../src/interface/recursive_operation_status.cpp:122 #, c-format msgid "Processed %s in %s." msgstr "已处理 %s 个文件， %s 个目录。" -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Protocol not supported" msgstr "不支持该协议" -#: ../../locales/../src/engine/socket.cpp:1096 +#: ../../locales/../src/engine/socket.cpp:1122 msgid "Protocol not supported on given socket type" msgstr "指定的套接字类型不支持该协议" @@ -5839,53 +6263,53 @@ msgid "Protocol:" msgstr "协议:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:753 msgid "Proxy &port:" msgstr "代理端口(&P):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:569 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:766 msgid "Proxy &user:" msgstr "代理用户(&U):" -#: ../../locales/../src/engine/proxy.cpp:494 +#: ../../locales/../src/engine/proxy.cpp:479 msgid "Proxy authentication failed" msgstr "代理认证失败" -#: ../../locales/../src/engine/transfersocket.cpp:105 -#: ../../locales/../src/engine/transfersocket.cpp:117 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:103 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:115 #, c-format msgid "Proxy handshake failed: %s" msgstr "代理握手失败: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 +#: ../../locales/../src/engine/ftp/logon.cpp:65 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "代理主机以“[”开始，但没有闭合括号。" -#: ../../locales/../src/engine/proxy.cpp:352 +#: ../../locales/../src/engine/proxy.cpp:333 #, c-format msgid "Proxy reply: %s" msgstr "代理回复: %s" -#: ../../locales/../src/engine/proxy.cpp:535 +#: ../../locales/../src/engine/proxy.cpp:520 #, c-format msgid "Proxy request failed. Reply from proxy: %s" msgstr "代理请求失败。代理服务器返回: %s" -#: ../../locales/../src/engine/proxy.cpp:407 +#: ../../locales/../src/engine/proxy.cpp:390 #, c-format msgid "Proxy request failed: %s" msgstr "代理请求失败: %s" -#: ../../locales/../src/engine/proxy.cpp:559 +#: ../../locales/../src/engine/proxy.cpp:544 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "代理请求失败: CONNECT 回复了未知的地址类型" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftp/logon.cpp:92 msgid "Proxy set but proxy host or port invalid" msgstr "已设定代理服务器，但代理地址或端口设置无效" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:617 msgid "Public Key Authentication" msgstr "公钥认证" @@ -5893,107 +6317,120 @@ msgid "Public key algorithm:" msgstr "公钥算法:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:655 msgid "Public permissions" msgstr "公共权限" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:2779 msgid "Queue has been fully processed" msgstr "队列已全部处理" -#: ../../locales/../src/interface/statusbar.cpp:429 +#: ../../locales/../src/interface/statusbar.cpp:439 #, c-format msgid "Queue: %s MiB" msgstr "队列: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:366 +#: ../../locales/../src/interface/statusbar.cpp:374 #, c-format msgid "Queue: %s%s" msgstr "队列: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:362 -#: ../../locales/../src/interface/statusbar.cpp:420 +#: ../../locales/../src/interface/statusbar.cpp:370 +#: ../../locales/../src/interface/statusbar.cpp:430 msgid "Queue: empty" msgstr "队列: 空" -#: ../../locales/../src/interface/QueueView.cpp:438 +#: ../../locales/../src/interface/QueueView.cpp:204 msgid "Queued files" msgstr "列队的文件" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3529 msgid "Queueing:" msgstr "列队中:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/list_search_panel.cpp:42 +msgid "Quick Search:" +msgstr "快速搜索:" + +#: ../../locales/../src/interface/view.cpp:110 +msgid "Quick search cannot be opened if comparing directories." +msgstr "快速搜索无法在目录对比时使用。" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:413 +msgid "R&eboot system once" msgstr "重启系统(&E)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "R&emote directory tree" msgstr "远程目录(&E)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:469 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "R&eset and requeue selected files" msgstr "重置并重新请求所选的文件(&E)" -#: ../../locales/../src/interface/Mainfrm.cpp:586 +#: ../../locales/../src/interface/Mainfrm.cpp:638 msgid "Raw FTP command" msgstr "原始 FTP 命令" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:628 msgid "Re&ad" msgstr "读取(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:276 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:320 msgid "Re&fresh" msgstr "刷新(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:166 msgid "Re&name" msgstr "重命名(&N)" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." msgstr "重新执行向导，仔细检查您的设置并正确配置所有路由器和防火墙。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:662 msgid "Rea&d" msgstr "读取(&D)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81 msgid "Read-only" msgstr "只读" -#: ../../locales/../src/interface/Mainfrm.cpp:1023 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:44 +msgid "Reading from local file failed" +msgstr "" + +#: ../../locales/../src/interface/Mainfrm.cpp:1114 msgid "Really cancel current operation?" msgstr "真的要取消当前操作吗？" -#: ../../locales/../src/interface/RemoteListView.cpp:1382 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1427 +#: ../../locales/../src/interface/search.cpp:1259 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" "Really delete %d directories with their contents from the server?" msgstr[0] "确实要从服务器上删除 %d 个目录及其内容吗？" -#: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:738 +#: ../../locales/../src/interface/RemoteListView.cpp:1424 +#: ../../locales/../src/interface/search.cpp:1256 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "确实要从服务器上删除 %d 个文件吗？" -#: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:744 +#: ../../locales/../src/interface/RemoteListView.cpp:1432 +#: ../../locales/../src/interface/search.cpp:1264 #, c-format msgid "Really delete %s and %s from the server?" msgstr "确实要从服务器上删除 %s 和 %s 吗？" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1085 msgid "Really delete all selected files and/or directories from the server?" msgstr "真的要从服务器上删除所有选定的文件和/或目录吗？" @@ -6001,52 +6438,58 @@ msgid "Really delete all selected files and/or directories from your computer?" msgstr "真的要从您的计算机上删除所有选定的文件和/或目录吗？" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Reason" msgstr "原因" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:2772 msgid "Reboot now" msgstr "马上重启" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "Rec&urse into subdirectories" msgstr "递归处理子目录(&U)" -#: ../../locales/../src/engine/tlssocket.cpp:225 +#: ../../locales/../src/engine/tlssocket_impl.cpp:329 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "收到服务器的 TLS 警告: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2957 +#: ../../locales/../src/engine/directorylistingparser.cpp:3078 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "收到了一个疑似使用 EBCDIC 编码的目录列表。" -#: ../../locales/../src/engine/directorylistingparser.cpp:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2008 +#: ../../locales/../src/engine/directorylistingparser.cpp:2060 +#: ../../locales/../src/engine/directorylistingparser.cpp:2077 msgid "Received a line exceeding 10000 characters, aborting." -msgstr "接收到超过 1000 个字符的行，中止。" +msgstr "接收到超过 1000 个字符的行，中止操作。" -#: ../../locales/../src/interface/netconfwizard.cpp:989 -#: ../../locales/../src/interface/netconfwizard.cpp:997 -#: ../../locales/../src/interface/netconfwizard.cpp:1018 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1301 +#, c-format +msgid "" +"Received certificate chain could not be verified. Verification status is %d." +msgstr "无法验证收到的证书链。验证状态为 %d。" + +#: ../../locales/../src/interface/netconfwizard.cpp:1014 +#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1043 msgid "Received data tainted" msgstr "已收到的数据被损坏" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:574 msgid "Received invalid character in version information" msgstr "在版本信息中收到了无效字符" -#: ../../locales/../src/engine/tlssocket.cpp:228 +#: ../../locales/../src/engine/tlssocket_impl.cpp:332 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "收到了服务器的未知 TLS 警告 %d" -#: ../../locales/../src/interface/updater.cpp:515 +#: ../../locales/../src/interface/updater.cpp:567 msgid "Received version information is too large" msgstr "接收的版本信息过长" -#: ../../locales/../src/interface/clearprivatedata.cpp:77 +#: ../../locales/../src/interface/clearprivatedata.cpp:74 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" "If you continue, your connection will be disconnected." @@ -6054,77 +6497,75 @@ "连接到服务器时无法清除重新连接信息。\n" "如果您要继续，您的连接将会断开。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:185 msgid "Reconnection settings" msgstr "重连设置" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 +#: ../../locales/../src/interface/toolbar.cpp:47 msgid "Reconnects to the last used server" msgstr "重新连接上一次使用过的服务器" -#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +#: ../../locales/../src/interface/recursive_operation_status.cpp:100 msgid "Recursively adding files to queue." msgstr "递归添加文件到队列。" -#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +#: ../../locales/../src/interface/recursive_operation_status.cpp:106 msgid "Recursively changing permissions." msgstr "递归修改权限。" -#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +#: ../../locales/../src/interface/recursive_operation_status.cpp:103 msgid "Recursively deleting files and directories." msgstr "递归删除文件和文件夹。" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 +#: ../../locales/../src/interface/sitemanager.cpp:18 +msgid "Red" +msgstr "红色" + +#: ../../locales/../src/engine/http/filetransfer.cpp:147 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "重定向 URI 无效或不被支持: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 +#: ../../locales/../src/engine/http/filetransfer.cpp:153 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "重定向地址无效或未被支持: %s" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 +#: ../../locales/../src/interface/toolbar.cpp:43 msgid "Refresh the file and folder lists" msgstr "刷新文件和文件夹列表" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4112 msgid "Remember passwords?" msgstr "记住密码？" -#: ../../locales/../src/interface/edithandler.cpp:1095 +#: ../../locales/../src/interface/edithandler.cpp:1147 msgid "Remote" msgstr "远程" -#: ../../locales/../src/engine/tlssocket.cpp:854 +#: ../../locales/../src/engine/tlssocket_impl.cpp:972 msgid "Remote certificate not trusted." msgstr "远程证书不被信任。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Remote file" msgstr "远程文件" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 -#: ../../locales/../src/interface/search.cpp:386 -#: ../../locales/../src/interface/search.cpp:391 -#: ../../locales/../src/interface/search.cpp:400 -#: ../../locales/../src/interface/search.cpp:405 +#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/search.cpp:729 msgid "Remote file search" msgstr "远程文件搜索" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1316 msgid "Remote filters:" msgstr "远程过滤器:" -#: ../../locales/../src/interface/edithandler.cpp:1086 +#: ../../locales/../src/interface/edithandler.cpp:1138 msgid "Remote path" msgstr "远程路径" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:414 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:442 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6133,7 +6574,7 @@ "默认远程路经无法解析。请确认是否是有效的绝对路径并且被当前站点的服务器模式" "(%s)支持。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1115 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1183 #, c-format msgid "" "Remote path cannot be parsed. Make sure it is a valid absolute path and is " @@ -6142,142 +6583,148 @@ "远程路径无法解析。请确认是否是有效的绝对路径并且被父站点选择的服务器模式(%s)" "支持。" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:416 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:445 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:450 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1186 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "远程路经无法解析。请确认是否是有效的绝对路径。" -#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:323 msgid "Remote path could not be parsed." msgstr "无法解析远程路经。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Remote path handling:" msgstr "远程路径处理:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1932 msgid "Remote path:" msgstr "远程路径:" -#: ../../locales/../src/interface/viewheader.cpp:530 +#: ../../locales/../src/interface/viewheader.cpp:529 msgid "Remote site:" msgstr "远程站点:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:459 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:477 msgid "Remove &all" msgstr "删除所有(&A)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:484 msgid "Remove &selected" msgstr "删除选定(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1411 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1434 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1616 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1639 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:326 msgid "Rename file" msgstr "重命名文件" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:593 msgid "Rename selected directory" msgstr "重命令选定的文件夹" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:285 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:329 msgid "Rename selected files and directories" msgstr "重命令选定的文件和文件夹" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:611 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:605 #, c-format msgid "Renaming '%s' to '%s'" msgstr "“%s”改名为“%s”" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4063 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1314 +msgid "Repeat password:" +msgstr "再次输入密码:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3746 msgid "Reporting bugs and feature requests" msgstr "报告错误以及请求功能" -#: ../../locales/../src/engine/proxy.cpp:398 +#: ../../locales/../src/engine/proxy.cpp:381 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "请求失败 - 客户端未运行 identd (或从服务器端无法连通)" -#: ../../locales/../src/engine/proxy.cpp:401 +#: ../../locales/../src/engine/proxy.cpp:384 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "请求失败 - 客户端的 identd 无法确认用户标识字符串" -#: ../../locales/../src/engine/proxy.cpp:395 +#: ../../locales/../src/engine/proxy.cpp:378 msgid "Request rejected or failed" msgstr "请求被拒或失败" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:548 msgid "Require explicit FTP over TLS" msgstr "要求显式的 FTP over TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:549 msgid "Require implicit FTP over TLS" msgstr "要求隐式的 FTP over TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 msgid "Reset and requeue &all" msgstr "重置并重新请求所有(&A)" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Resolved protocol is unknown" msgstr "解析的协议为未知协议" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 +#: ../../locales/../src/engine/ControlSocket.cpp:1086 #, c-format msgid "Resolving address of %s" msgstr "正在解析 %s 的地址" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Resource temporarily unavailable" msgstr "资源暂不可用" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:346 +#: ../../locales/../src/engine/logging.cpp:115 +#: ../../locales/../src/interface/netconfwizard.cpp:421 +#: ../../locales/../src/interface/StatusView.cpp:290 +#: ../../locales/../src/interface/StatusView.cpp:358 msgid "Response:" msgstr "响应:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 msgid "Results:" msgstr "结果:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1410 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1433 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1191 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1615 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1638 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1213 msgid "Resume file transfer" msgstr "继续文件传输" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1252 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1253 msgid "" "Resuming ASCII files can cause problems if server uses a different line " "ending format than the client." msgstr "如果服务器使用不同格式的行结尾，继续传输 ASCII 格式文件可能导致问题。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:67 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "读取“%s”的目录列表..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:335 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:454 +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:64 msgid "Retrieving directory listing..." msgstr "读取目录列表..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 -#: ../../locales/../src/interface/netconfwizard.cpp:710 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:659 +#: ../../locales/../src/interface/netconfwizard.cpp:725 #, c-format msgid "Retrieving external IP address from %s" msgstr "从 %s 得到外部 IP 地址" @@ -6286,23 +6733,23 @@ msgid "S&how files currently being edited..." msgstr "显示正在被编辑的文件(&H)..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1435 msgid "S&how the Site Manager on startup" msgstr "启动时显示站点管理器(&H)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +msgid "S&hutdown system once" msgstr "关闭系统(&H)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3286 msgid "S&top" msgstr "停止(&T)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +msgid "S&uspend system once" msgstr "挂起系统(&U)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:96 msgid "S&ynchronized browsing" msgstr "同步浏览(&Y)" @@ -6310,227 +6757,250 @@ msgid "SFTP" msgstr "SFTP" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +#: ../../locales/../src/interface/FileZilla.cpp:616 +msgid "SFTP support" +msgstr "支持 SFTP" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:730 msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:177 +#: ../../locales/../src/engine/proxy.cpp:144 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 代理将连接到: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:724 +#: ../../locales/../src/engine/proxy.cpp:172 +msgid "" +"SOCKS5 does not support usernames or passwords longer than 255 characters." +msgstr "SOCKS5 不支持用户名或密码长度超过 255 个字符。" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:906 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4040 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1291 +msgid "Sa&ve passwords protected by a master password" +msgstr "保存主密码保护的密码(&V)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1281 +msgid "Sav&e passwords" +msgstr "保存密码(&E)" + +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "Save settings?" msgstr "保存设置吗？" -#: ../../locales/../src/interface/manual_transfer.cpp:437 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 +#: ../../locales/../src/interface/manual_transfer.cpp:429 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1015 msgid "Saving of password has been disabled by your system administrator." msgstr "您的系统管理员禁止了保存密码。" -#: ../../locales/../src/interface/manual_transfer.cpp:439 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 +#: ../../locales/../src/interface/manual_transfer.cpp:432 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 msgid "Saving of passwords has been disabled by you." msgstr "您禁止了保存密码。" -#: ../../locales/../src/interface/QueueView.cpp:1710 -msgid "Scanning for files to add to queue" -msgstr "正在检查加入到队列中的文件" - -#: ../../locales/../src/interface/QueueView.cpp:1712 -msgid "Scanning for files to upload" -msgstr "正在检查要上传的文件" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1531 +msgid "Scale factor:" +msgstr "放大倍数:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3292 msgid "Search &conditions:" msgstr "搜索条件(&C):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3274 msgid "Search &directory:" msgstr "搜索目录(&D):" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 +#: ../../locales/../src/interface/toolbar.cpp:53 msgid "Search for files recursively." msgstr "递归搜索文件。" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Search server for files" msgstr "在服务器上搜索文件" -#: ../../locales/../src/interface/statusbar.cpp:502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3243 +msgid "Search type:" +msgstr "搜索类型:" + +#: ../../locales/../src/interface/statusbar.cpp:516 msgid "Security information" msgstr "安全信息" -#: ../../locales/../src/interface/netconfwizard.cpp:573 -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "参见: https://wiki.filezilla-project.org/Network_Configuration" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2605 msgid "Sele&ct server" msgstr "选择服务器(&C)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:13 msgid "Select &page:" msgstr "选择页面(&P):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1493 msgid "Select Theme" msgstr "选择主题" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1168 msgid "" "Select default action to perform if target file of a transfer already exists." msgstr "请选择目标文件存在时的默认操作。" -#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/edithandler.cpp:1583 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "选择默认编辑器" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 msgid "" "Select default file exists action if the target file already exists. This " "selection is valid only for the current session." msgstr "请选择目标文件存在时的默认操作，该操作仅适用于当前会话。" -#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16 +#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:13 msgid "" "Select default file exists action only for the currently selected files in " "the queue." msgstr "请选择仅针对队列中已选择文件的默认文件存在操作。" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:81 msgid "Select file containing private key" msgstr "选包含私钥的文件" -#: ../../locales/../src/interface/export.cpp:38 +#: ../../locales/../src/interface/export.cpp:48 msgid "Select file for exported data" msgstr "选择用于导出数据的文件" -#: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1495 +#: ../../locales/../src/interface/export.cpp:45 +msgid "Select file for exported filters" +msgstr "选择用于导出过滤器的文件" + +#: ../../locales/../src/interface/export.cpp:39 +#: ../../locales/../src/interface/queue.cpp:1500 msgid "Select file for exported queue" msgstr "选择用于导出列队的文件" -#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/export.cpp:42 msgid "Select file for exported settings" msgstr "选择需要导出设定的文件" -#: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 +#: ../../locales/../src/interface/export.cpp:36 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2538 msgid "Select file for exported sites" msgstr "选择用于导出站点的文件" -#: ../../locales/../src/interface/import.cpp:16 +#: ../../locales/../src/interface/import.cpp:17 msgid "Select file to import settings from" msgstr "选择需要导入设定的文件" -#: ../../locales/../src/interface/manual_transfer.cpp:242 +#: ../../locales/../src/interface/manual_transfer.cpp:239 msgid "Select file to upload" msgstr "选择要上传的文件" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:115 msgid "Select filename for converted key file" msgstr "为转换的密钥文件输入文件名" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3156 msgid "Select how these files should be opened." msgstr "选择如何打开这些文件。" -#: ../../locales/../src/interface/search.cpp:513 +#: ../../locales/../src/interface/search.cpp:915 msgid "Select target download directory" msgstr "选择下载目标文件夹。" -#: ../../locales/../src/interface/manual_transfer.cpp:238 +#: ../../locales/../src/interface/manual_transfer.cpp:235 msgid "Select target filename" msgstr "选择目标文件名" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1771 msgid "Select the categories to export:" msgstr "选择要导出的分类:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1697 msgid "Select the private data you would like to delete." msgstr "请选择您要删除的个人信息。" -#: ../../locales/../src/interface/search.cpp:481 +#: ../../locales/../src/interface/search.cpp:872 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." msgstr[0] "选择了 %d 个目录及其内容进行传输。" -#: ../../locales/../src/interface/filelist_statusbar.cpp:37 +#: ../../locales/../src/interface/filelist_statusbar.cpp:38 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." msgstr[0] "选择了 %d 个文件夹。" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:869 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." msgstr[0] "选择了 %d 个文件进行传输。" -#: ../../locales/../src/interface/filelist_statusbar.cpp:43 +#: ../../locales/../src/interface/filelist_statusbar.cpp:46 #, c-format msgid "Selected %d file. Total size: %s" msgid_plural "Selected %d files. Total size: %s" msgstr[0] "选择了 %d 个文件。大小总共: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:41 +#: ../../locales/../src/interface/filelist_statusbar.cpp:43 #, c-format msgid "Selected %d file. Total size: At least %s" msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "选择了 %d 个文件。大小总共: 至少 %s" -#: ../../locales/../src/interface/search.cpp:485 +#: ../../locales/../src/interface/search.cpp:877 #, c-format msgid "Selected %s and %s for transfer." msgstr "选择了 %s 和 %s 进行传输。" -#: ../../locales/../src/interface/filelist_statusbar.cpp:52 +#: ../../locales/../src/interface/filelist_statusbar.cpp:57 #, c-format msgid "Selected %s and %s. Total size: %s" msgstr "选择了 %s 和 %s。大小总共: %s" -#: ../../locales/../src/interface/filelist_statusbar.cpp:50 +#: ../../locales/../src/interface/filelist_statusbar.cpp:54 #, c-format msgid "Selected %s and %s. Total size: At least %s" msgstr "选择了 %s 和 %s。大小总共: 至少 %s" -#: ../../locales/../src/interface/edithandler.cpp:1476 -#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/edithandler.cpp:1528 +#: ../../locales/../src/interface/edithandler.cpp:1602 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "Selected editor does not exist." msgstr "所选的编辑器不存在。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2058 msgid "Selected file already being edited" msgstr "已在编辑所选的文件。" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:126 msgid "Selected file is already loaded" msgstr "所选的文件已经加载。" -#: ../../locales/../src/interface/edithandler.cpp:1648 +#: ../../locales/../src/interface/edithandler.cpp:1700 msgid "Selected file is already opened" msgstr "所选的文件已打开" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "Selected file is still being edited" msgstr "所选文件已在编辑" -#: ../../locales/../src/interface/filter.cpp:304 +#: ../../locales/../src/interface/filter.cpp:206 msgid "Selected filter only works for local files." msgstr "选择的过滤器只针对本地文件。" -#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/menu_bar.cpp:321 msgid "" "Selected global bookmark and current server use a different server type.\n" "Use site-specific bookmarks for this server." @@ -6538,123 +7008,157 @@ "所选择的全局书签和当前服务器使用了不同的服务器类型。\n" "为该服务器使用站点特定书签。" -#: ../../locales/../src/engine/engineprivate.cpp:291 +#: ../../locales/../src/engine/engineprivate.cpp:307 msgid "Selected port usually in use by a different protocol." msgstr "选择的端口通常是被其他协议使用。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:241 msgid "Send FTP &keep-alive commands" msgstr "发出 FTP 保持连接指令(&K)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:200 msgid "Send custom command to the server otherwise not available" msgstr "发送自定义命令到服务器，如果可用的话" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:781 msgid "Sending keep-alive command" msgstr "发出保持连接指令" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:443 msgid "Serial number:" msgstr "序列号:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:356 msgid "Server &Type:" msgstr "服务器类型(&T):" -#: ../../locales/../src/engine/tlssocket.cpp:743 +#: ../../locales/../src/engine/tlssocket_impl.cpp:858 msgid "Server did not properly shut down TLS connection" msgstr "服务器没有正常的关闭 TLS 连接" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 +#: ../../locales/../src/engine/ftp/logon.cpp:396 +#: ../../locales/../src/engine/ftp/logon.cpp:456 msgid "Server does not support non-ASCII characters." msgstr "服务器不支持非 ASCII 字符。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:270 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "服务器不支持续传大于 %d GB 的文件。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:267 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "服务器不支持续传大于 %d GB 的文件。当文件大小吻合时传输终止。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:529 msgid "Server does not support resume of files > 2GB." msgstr "服务器不支持续传大于 2 GB 的文件。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:525 msgid "Server does not support resume of files > 4GB." msgstr "服务器不支持续传大于 4 GB 的文件。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2251 +msgid "Server host key" +msgstr "服务器主机密匙" + +#: ../../locales/../src/engine/ftp/filetransfer.cpp:278 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "服务器也许不支持续传大于 %d GB 的文件。当文件大小吻合时传输终止。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/ftp/logon.cpp:338 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "服务器可能需要帐号。请尝试在站点管理器里指定一个帐号" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/http/request.cpp:457 +msgid "Server not sending proper line endings" +msgstr "服务器没有发送正确的行结尾" + +#: ../../locales/../src/engine/http/digest.cpp:279 +#, c-format +msgid "Server requested unsupported digest authentication algorithm: %s" +msgstr "" + +#: ../../locales/../src/engine/http/digest.cpp:287 +#, c-format +msgid "Server requested unsupported quality-of-protection: %s" +msgstr "" + +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Server returned empty path." msgstr "服务器发送了空路径。" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:212 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "服务器传送了一个附加的登录提示。您需要使用交互式的登录方式。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 +#: ../../locales/../src/engine/http/request.cpp:307 +msgid "Server sent data even before request headers were sent" +msgstr "" + +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:347 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "服务器发回了不可路由的地址。被动模式失败。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftp/rawtransfer.cpp:342 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." msgstr "服务器发回了不可路由的地址。使用服务器地址代替。" -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:424 -#: ../../locales/../src/interface/netconfwizard.cpp:459 -#: ../../locales/../src/interface/netconfwizard.cpp:468 -#: ../../locales/../src/interface/netconfwizard.cpp:480 -#: ../../locales/../src/interface/netconfwizard.cpp:503 -#: ../../locales/../src/interface/netconfwizard.cpp:510 -#: ../../locales/../src/interface/netconfwizard.cpp:519 -#: ../../locales/../src/interface/netconfwizard.cpp:530 +#: ../../locales/../src/engine/http/request.cpp:404 +#: ../../locales/../src/engine/http/request.cpp:418 +#: ../../locales/../src/engine/http/request.cpp:436 +#: ../../locales/../src/engine/http/request.cpp:780 +msgid "Server sent too much data." +msgstr "服务器发送了过多的数据。" + +#: ../../locales/../src/interface/netconfwizard.cpp:428 +#: ../../locales/../src/interface/netconfwizard.cpp:434 +#: ../../locales/../src/interface/netconfwizard.cpp:469 +#: ../../locales/../src/interface/netconfwizard.cpp:478 +#: ../../locales/../src/interface/netconfwizard.cpp:490 +#: ../../locales/../src/interface/netconfwizard.cpp:513 +#: ../../locales/../src/interface/netconfwizard.cpp:520 +#: ../../locales/../src/interface/netconfwizard.cpp:529 +#: ../../locales/../src/interface/netconfwizard.cpp:540 msgid "Server sent unexpected reply." msgstr "服务器发送了意外的回应。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1249 +msgid "" +"Server sent unsorted certificate chain in violation of the TLS specifications" +msgstr "服务器发送了不符合 TLS 规范的未排序证书链" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 msgid "Server to client MAC:" msgstr "服务器至本地 MAC:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2314 msgid "Server to client cipher:" msgstr "服务器至本地密码:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2668 msgid "Server&type:" msgstr "服务器类型(&T):" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Server/Local file" msgstr "服务器/本地文件" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2591 msgid "Server:" msgstr "服务器:" @@ -6662,49 +7166,54 @@ msgid "Session details" msgstr "会话细节" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:360 msgid "Set &Priority" msgstr "设定优先级(&P)" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:599 #, c-format -msgid "Set permissions of '%s' to '%s'" -msgstr "修改“%s”的权限为“%s”" +msgid "Setting permissions of '%s' to '%s'" +msgstr "正在将“%s”的权限修改为“%s”" -#: ../../locales/../src/engine/transfersocket.cpp:791 -msgid "SetSocketBufferSize called without socket" -msgstr "SetSocketBufferSize 未带套接字调用" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:4 msgid "Settings" msgstr "设置" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:963 msgid "Settings directory:" msgstr "设置文件目录:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 +msgid "Sh&ow notification bubble" +msgstr "显示气泡通知(&O)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2353 msgid "Show &raw directory listing" msgstr "显示目录列表(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:227 msgid "Show &welcome dialog..." msgstr "显示欢迎对话框(&W)..." -#: ../../locales/../src/interface/Mainfrm.cpp:2170 +#: ../../locales/../src/interface/Mainfrm.cpp:2326 msgid "Show both directory trees and continue comparing?" -msgstr "要显示两边的目录树并进行比较吗？" +msgstr "要显示两边的目录树并进行对比吗？" -#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +#: ../../locales/../src/interface/resources/xrc/update.xrc:147 +#: ../../locales/../src/interface/resources/xrc/update.xrc:239 msgid "Show details" msgstr "显示细节" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1668 msgid "Show details about custom date and time formats" msgstr "显示有关自定义日期时间格式的详细信息" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:638 +msgid "Show in file &manager" +msgstr "在文件管理器中打开(&M)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 msgid "Shows available TLS ciphers" msgstr "显示可用的 TLS 密码" @@ -6712,7 +7221,7 @@ msgid "Shows this help dialog" msgstr "显示这个帮助对话框" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:2768 msgid "Shutdown now" msgstr "马上关闭系统" @@ -6720,7 +7229,11 @@ msgid "Signature algorithm:" msgstr "签名算法:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:159 +msgid "Signup" +msgstr "注册" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1833 msgid "Site &Manager entries" msgstr "站点管理器(&M)" @@ -6728,56 +7241,61 @@ msgid "Site Manager" msgstr "站点管理器" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1025 msgid "Site Manager - Cannot remember password" msgstr "站点管理器 - 无法记住密码" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:999 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1118 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:51 +msgid "Site Manager - Generated key" +msgstr "站点管理器 - 生成的密钥" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1004 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1055 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1151 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1188 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "Site Manager - Invalid data" msgstr "站点管理器 - 无效数据" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:303 msgid "Site Manager already open" msgstr "站点管理器已经打开" -#: ../../locales/../src/interface/sitemanager.cpp:428 -#: ../../locales/../src/interface/sitemanager.cpp:442 -#: ../../locales/../src/interface/sitemanager.cpp:454 -#: ../../locales/../src/interface/sitemanager.cpp:509 -#: ../../locales/../src/interface/sitemanager.cpp:683 -#: ../../locales/../src/interface/sitemanager.cpp:760 +#: ../../locales/../src/interface/sitemanager.cpp:489 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:531 +#: ../../locales/../src/interface/sitemanager.cpp:543 +#: ../../locales/../src/interface/sitemanager.cpp:712 +#: ../../locales/../src/interface/sitemanager.cpp:800 msgid "Site does not exist." msgstr "站点不存在。" -#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:500 msgid "Site path has to begin with 0 or 1." msgstr "站点路径必须以 0 或 1 开始。" -#: ../../locales/../src/interface/sitemanager.cpp:448 -#: ../../locales/../src/interface/sitemanager.cpp:527 -#: ../../locales/../src/interface/sitemanager.cpp:677 -#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:537 +#: ../../locales/../src/interface/sitemanager.cpp:706 +#: ../../locales/../src/interface/sitemanager.cpp:794 msgid "Site path is malformed." msgstr "站点路径格式错误。" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:262 msgid "Site-specific bookmarks" msgstr "特定站点书签" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:91 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:524 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:97 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:567 msgid "" "Site-specific bookmarks require the server to be stored in the Site " "Manager.\n" @@ -6786,11 +7304,11 @@ "站点特定书签需要将服务器保存在站点管理器中。\n" "将当前连接加入站点管理器码？" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Size" msgstr "大小" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1682 msgid "Size formatting" msgstr "文件大小格式" @@ -6798,85 +7316,90 @@ msgid "Size unknown" msgstr "大小未知" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1435 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1193 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1640 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1194 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1215 msgid "Skip file" msgstr "跳过文件" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1171 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1173 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1277 #, c-format msgid "Skipping download of %s" msgstr "跳过下载 %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1158 -#: ../../locales/../src/engine/ControlSocket.cpp:1174 -#: ../../locales/../src/engine/ControlSocket.cpp:1199 -#: ../../locales/../src/engine/ControlSocket.cpp:1259 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:70 +#, c-format +msgid "Skipping non-existing key file \"%s\"" +msgstr "跳过不存在的密匙文件“%s”" + +#: ../../locales/../src/engine/ControlSocket.cpp:1159 +#: ../../locales/../src/engine/ControlSocket.cpp:1176 +#: ../../locales/../src/engine/ControlSocket.cpp:1202 +#: ../../locales/../src/engine/ControlSocket.cpp:1280 #, c-format msgid "Skipping upload of %s" msgstr "跳过上传 %s" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Socket address outside address space" msgstr "套接字地址超出了地址空间范围" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Socket already connected" msgstr "套接字已连接" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Socket has been shut down" msgstr "套接字已关闭" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "Socket not connected" msgstr "套接字未连接" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1123 msgid "Socket type not supported for address family" msgstr "地址集不支持此套接字类型" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1253 msgid "Some files are still being edited or need to be uploaded." msgstr "部分文件正被编辑或者需要上传。" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:147 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:415 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:416 msgid "" "Some misconfigured remote servers which are behind a router, may reply with " "their local IP address." msgstr "一些处于路由器后面的远程服务器使用了错误的配置，可能会返回其本地地址。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "Sort directories inline" msgstr "在原位置排序目录列表" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:478 msgid "Sort order cannot be changed if comparing directories." msgstr "对比目录时不能改变目录排序。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1799 msgid "Sorting" msgstr "正在排序" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1806 msgid "Sorting &mode:" msgstr "排序模式(&M):" -#: ../../locales/../src/interface/RemoteTreeView.cpp:102 +#: ../../locales/../src/interface/RemoteTreeView.cpp:110 msgid "Source and path of the drop operation are identical" msgstr "拖放操作的来源和路径相同" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:127 msgid "Source and target file may not be the same" msgstr "来源和目标文件不能相同" -#: ../../locales/../src/interface/RemoteListView.cpp:141 +#: ../../locales/../src/interface/RemoteListView.cpp:153 msgid "Source and target of the drop operation are identical" msgstr "拖放操作的来源和目标相同" @@ -6884,37 +7407,37 @@ msgid "Source file:" msgstr "源文件:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:54 -#: ../../locales/../src/interface/speedlimits_dialog.cpp:62 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4008 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:64 +#: ../../locales/../src/interface/speedlimits_dialog.cpp:72 msgid "Speed Limits" msgstr "速度限制" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:893 msgid "Speed limits" msgstr "速度限制" -#: ../../locales/../src/interface/statusbar.cpp:575 +#: ../../locales/../src/interface/statusbar.cpp:593 msgid "Speed limits are disabled, click to change." msgstr "速度限制已禁用，点击修改。" -#: ../../locales/../src/interface/statusbar.cpp:578 +#: ../../locales/../src/interface/statusbar.cpp:596 msgid "Speed limits are enabled, click to change." msgstr "速度限制已启用，点击修改。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2147 msgid "Stable and beta versions" msgstr "稳定版和 Beta 版" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 msgid "Stable versions only" msgstr "仅稳定版" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2148 msgid "Stable, beta and nightly versions" msgstr "稳定，Beta 及每日编译版 (Nightly)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2799 msgid "Start transfer &immediately" msgstr "立即开始传输(&I)" @@ -6922,19 +7445,21 @@ msgid "Start with opened Site Manager" msgstr "启动时打开站点管理器" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:253 #, c-format msgid "Started update check on %s\n" msgstr "于 %s 上启动了检查更新\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:36 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:35 +#: ../../locales/../src/engine/storj/file_transfer.cpp:41 #, c-format msgid "Starting download of %s" msgstr "开始下载 %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:39 +#: ../../locales/../src/engine/sftp/filetransfer.cpp:38 +#: ../../locales/../src/engine/storj/file_transfer.cpp:44 #, c-format msgid "Starting upload of %s" msgstr "开始上传 %s" @@ -6943,30 +7468,38 @@ msgid "Starts the local site in the given path" msgstr "启动给定路径下的本地站点" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:437 msgid "State or province:" msgstr "州或省:" -#: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Status" msgstr "状态" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:295 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:299 +#: ../../locales/../src/interface/StatusView.cpp:382 msgid "Status:" msgstr "状态:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:350 msgid "Stop and remove &all" msgstr "停止并删除所有(&A)" -#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +#: ../../locales/../src/interface/recursive_operation_status.cpp:43 msgid "Stop recursive operation" msgstr "停止递归操作" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/engine/server.cpp:29 +msgid "Storj - Decentralized Cloud Storage" +msgstr "Storj - 去中心化的云端存储" + +#: ../../locales/../src/interface/FileZilla.cpp:623 +msgid "Storj support" +msgstr "支持 storj" + +#: ../../locales/../src/interface/verifycertdialog.cpp:441 msgid "Street:" msgstr "街道:" @@ -6982,39 +7515,43 @@ msgid "Summary of test results:" msgstr "测试结果总结:" -#: ../../locales/../src/interface/QueueView.cpp:3051 +#: ../../locales/../src/interface/QueueView.cpp:2776 msgid "Suspend now" msgstr "马上暂停" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3610 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." msgstr "指向文件的符号链接不受该选择的影响，这种符号链接总是被删除。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:239 -#: ../../locales/../src/interface/state.cpp:253 -#: ../../locales/../src/interface/state.cpp:259 -#: ../../locales/../src/interface/state.cpp:269 -#: ../../locales/../src/interface/state.cpp:356 -#: ../../locales/../src/interface/state.cpp:364 -#: ../../locales/../src/interface/state.cpp:372 -#: ../../locales/../src/interface/state.cpp:924 -#: ../../locales/../src/interface/state.cpp:932 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:947 -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4115 +#: ../../locales/../src/interface/state.cpp:263 +#: ../../locales/../src/interface/state.cpp:278 +#: ../../locales/../src/interface/state.cpp:285 +#: ../../locales/../src/interface/state.cpp:296 +#: ../../locales/../src/interface/state.cpp:395 +#: ../../locales/../src/interface/state.cpp:403 +#: ../../locales/../src/interface/state.cpp:411 +#: ../../locales/../src/interface/state.cpp:1070 +#: ../../locales/../src/interface/state.cpp:1078 +#: ../../locales/../src/interface/state.cpp:1085 +#: ../../locales/../src/interface/state.cpp:1094 +#: ../../locales/../src/interface/state.cpp:1121 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "Synchronized browsing" msgstr "同步浏览" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:410 msgid "Synchronized browsing has been disabled." msgstr "同步浏览已经被关闭。" -#: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:122 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +msgid "Synchronizing directories." +msgstr "正在同步目录。" + +#: ../../locales/../src/interface/quickconnectbar.cpp:117 +#: ../../locales/../src/interface/quickconnectbar.cpp:161 msgid "Syntax error" msgstr "语法错误" @@ -7023,44 +7560,44 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2282 -#: ../../locales/../src/interface/Mainfrm.cpp:2324 +#: ../../locales/../src/interface/Mainfrm.cpp:2441 +#: ../../locales/../src/interface/Mainfrm.cpp:2486 msgid "Syntax error in command line" msgstr "命令行语法错误" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82 msgid "System" msgstr "系统" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:975 msgid "System details" msgstr "系统信息" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "System limit of open files exceeded" msgstr "达到了系统打开文件数限制" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1121 msgid "System's network subsystem has failed" msgstr "系统的网络子系统出错" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:102 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "T&oolbar" msgstr "工具栏(&O)" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 +#: ../../locales/../src/engine/http/httpcontrolsocket.cpp:219 msgid "TLS connection established, sending HTTP request" msgstr "TLS 连接已建立，正在发送 HTTP 请求" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:206 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS 连接建立，等待欢迎消息..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 +#: ../../locales/../src/engine/ftp/ftpcontrolsocket.cpp:210 msgid "TLS connection established." msgstr "TLS 连接已建立。" -#: ../../locales/../src/engine/proxy.cpp:522 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "TTL expired" msgstr "TTL 超时" @@ -7068,35 +7605,43 @@ msgid "Target file already exists" msgstr "目标文件已经存在" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:65 msgid "Target file:" msgstr "目标文件:" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 +#: ../../locales/../src/interface/RemoteListView.cpp:2720 msgid "Target filename already exists!" msgstr "目标文件名已经存在！" -#: ../../locales/../src/interface/RemoteListView.cpp:1596 +#: ../../locales/../src/interface/RemoteListView.cpp:1645 msgid "Target filename already exists, really continue?" msgstr "目标文件名已经存在，是否继续？" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Temporary failure in name resolution" msgstr "名字解析中临时出错" +#: ../../locales/../src/interface/netconfwizard.cpp:588 +msgid "Test finished successfully" +msgstr "测试成功" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "测试结果" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 +#: ../../locales/../src/engine/ftp/filetransfer.cpp:282 msgid "Testing resume capabilities of server" msgstr "正在检测服务器能否续传" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +msgid "The &following files are currently being edited:" +msgstr "以下文件已被编辑(&F):" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:791 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "需要修复文件，否则无法打开站点管理器。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:328 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:302 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Do you want to continue? Any changes made in the Site Manager won't be saved " @@ -7105,7 +7650,7 @@ "站点管理器已经在另一个 FileZilla 3 实例中打开。\n" "您想继续吗？站点管理器的任何更改都无法保存。" -#: ../../locales/../src/interface/clearprivatedata.cpp:103 +#: ../../locales/../src/interface/clearprivatedata.cpp:98 msgid "" "The Site Manager is opened in another instance of FileZilla 3.\n" "Please close it or the data cannot be deleted." @@ -7113,29 +7658,35 @@ "站点管理器已经在另一个 FileZilla 3 中打开。\n" "请将其关闭，否则数据将无法删除。" -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:640 #, c-format msgid "The address you entered was: %s" msgstr "您输入的地址是: %s" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1100 msgid "The ai_family member is not supported" msgstr "不支持 ai_family 成员" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1113 msgid "The ai_socktype member is not supported" msgstr "不支持 ai_socktype 成员" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:665 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:840 +#: ../../locales/../src/interface/sitemanager.cpp:693 msgid "The bookmark could not be added." msgstr "无法添加该书签。" -#: ../../locales/../src/interface/sitemanager.cpp:742 +#: ../../locales/../src/interface/sitemanager.cpp:781 msgid "The bookmarks could not be cleared." msgstr "无法清除该书签。" -#: ../../locales/../src/interface/statusbar.cpp:464 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1296 +msgid "" +"The certificate requires the server to include an OCSP status in its " +"response, but the OCSP status is missing." +msgstr "该证书要求服务器在响应中包含 OCSP 状态，但是未收到。" + +#: ../../locales/../src/interface/statusbar.cpp:476 msgid "The connection is encrypted. Click icon for details." msgstr "该连接是加密的。点击图标显示细节。" @@ -7153,34 +7704,39 @@ "The custom time format is invalid or contains unsupported format specifiers." msgstr "自定义时间格式无效或包含不支持的格式限定符。" -#: ../../locales/../src/engine/transfersocket.cpp:141 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "无法建立数据连接: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 -#: ../../locales/../src/interface/edithandler.cpp:1511 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/edithandler.cpp:1563 msgid "The default editor for text files could not be found." msgstr "默认的文本文件编辑器不存在。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3167 #, c-format msgid "The default editor for text files is '%s'." msgstr "默认的文本文件编辑器是“%s”。" #: ../../locales/../src/interface/filteredit.cpp:149 -#: ../../locales/../src/interface/filteredit.cpp:217 -#: ../../locales/../src/interface/filteredit.cpp:256 +#: ../../locales/../src/interface/filteredit.cpp:216 +#: ../../locales/../src/interface/filteredit.cpp:255 msgid "The entered filter name already exists, please choose a different name." msgstr "您输入的过滤器名称已经存在，请另选一个名称。" +#: ../../locales/../src/interface/asksavepassworddialog.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:205 +msgid "The entered passwords are not the same." +msgstr "输入的密码不同。" + #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "扩展名“%s”已经在列表里了" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:283 -#: ../../locales/../src/interface/asyncrequestqueue.cpp:289 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:315 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:323 #, c-format msgid "" "The file %s already exists.\n" @@ -7189,8 +7745,9 @@ "文件 %s 已经存在。\n" "请输入一个新的名字:" -#: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1704 +#: ../../locales/../src/interface/edithandler.cpp:1673 +#: ../../locales/../src/interface/LocalListView.cpp:1836 +#: ../../locales/../src/interface/search.cpp:1527 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7201,7 +7758,7 @@ "关联的程序(%s)没有找到。\n" "请检查您操作系统的文件关联。" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:54 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:33 #, c-format msgid "" "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " @@ -7209,18 +7766,19 @@ msgstr "" "文件“%s”包含 SSH1 密钥。SSH1 协议已经过时，FileZilla 仅支持 SSH2 协议的密钥。" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:57 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:36 #, c-format msgid "The file '%s' could not be loaded or does not contain a private key." msgstr "文件“%s”无法加载或者不含私钥。" -#: ../../locales/../src/interface/xmlfunctions.cpp:42 +#: ../../locales/../src/interface/xmlfunctions.cpp:38 #, c-format msgid "The file '%s' could not be loaded." msgstr "文件“%s”无法加载。" -#: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/edithandler.cpp:1668 +#: ../../locales/../src/interface/LocalListView.cpp:1832 +#: ../../locales/../src/interface/search.cpp:1523 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7229,8 +7787,9 @@ "无法打开文件“%s”:\n" "系统中没有设置此类型文件关联的程序。" -#: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1712 +#: ../../locales/../src/interface/edithandler.cpp:1785 +#: ../../locales/../src/interface/LocalListView.cpp:1845 +#: ../../locales/../src/interface/search.cpp:1536 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7239,8 +7798,8 @@ "无法打开文件“%s”:\n" "关联的程序打开失败" -#: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 +#: ../../locales/../src/interface/import.cpp:65 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:798 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7251,7 +7810,7 @@ "打开新版本的文件可能会导致数据丢失。\n" "您想继续吗？" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:87 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7264,7 +7823,7 @@ msgid "The file selected as default editor does not exist." msgstr "作为默认编辑器的文件不存在。" -#: ../../locales/../src/interface/import.cpp:86 +#: ../../locales/../src/interface/import.cpp:98 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7276,11 +7835,11 @@ "由于储存格式上的不同，只有主机地址、端口、使用者名称与密码能导入。\n" "要继续导入吗？" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:745 msgid "The filename column can neither be hidden nor moved." msgstr "不能隐藏或移动文件名栏。" -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:795 msgid "The filename column cannot be hidden." msgstr "不能隐藏文件名栏。" @@ -7294,19 +7853,19 @@ msgid "The following characters will be replaced: %s" msgstr "以下字符将被替换: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 -msgid "The following files are currently being edited:" -msgstr "正在编辑以下文件:" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3665 msgid "The free open source FTP solution" msgstr "免费且开源的 FTP 解决方案" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 +#: ../../locales/../src/interface/resources/xrc/storj.xrc:10 +msgid "The generated encryption key is:" +msgstr "生成的加密密钥:" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:295 msgid "The global bookmarks could not be saved." msgstr "无法保存该全局书签。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2260 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2340 msgid "" "The higher the debug level, the more information will be displayed in the " "message log. Displaying debug information has a negative impact on " @@ -7318,17 +7877,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "限制必须在 1 到 2000 MiB 之间。" -#: ../../locales/../src/interface/state.cpp:973 +#: ../../locales/../src/interface/state.cpp:1121 #, c-format msgid "The local directory '%s' could not be created." msgstr "无法创建本地目录“%s”。" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:1106 #, c-format msgid "The local directory '%s' does not exist." msgstr "本地目录“%s”不存在。" -#: ../../locales/../src/interface/state.cpp:250 +#: ../../locales/../src/interface/state.cpp:275 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7343,24 +7902,29 @@ "port." msgstr "最低的可用端口必须小于或等于最高的。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +#: ../../locales/../src/interface/asksavepassworddialog.cpp:46 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:214 +msgid "The master password needs to be at least 8 characters long." +msgstr "主密码至少需要 8 个字符。" + +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 msgid "The new version could not be downloaded, please retry later." msgstr "无法下载新版本，请稍后重试。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:104 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "The new version has been saved in your Downloads directory." msgstr "新版本已经被保存在您的 下载 文件夹。" -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1566 msgid "The queue will not be saved." msgstr "队列将不会被保存。" -#: ../../locales/../src/interface/state.cpp:885 +#: ../../locales/../src/interface/state.cpp:1028 #, c-format msgid "The remote directory '%s' does not exist." msgstr "远程目录“%s”不存在。" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:1075 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7369,26 +7933,26 @@ "远程目录“%s”不在同步根目录 (%s) 下面。\n" "关闭同步浏览并且继续修改本地目录？" -#: ../../locales/../src/interface/import.cpp:76 +#: ../../locales/../src/interface/import.cpp:88 msgid "The selected categories have been imported." msgstr "已导入所选的分类。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1828 msgid "" "The selected file contains importable data for the following categories:" msgstr "所选的文件可导入以下分类:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1998 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2065 msgid "The selected file is already being edited:" msgstr "所选的文件正在被编辑:" -#: ../../locales/../src/interface/edithandler.cpp:1720 +#: ../../locales/../src/interface/edithandler.cpp:1772 msgid "" "The selected file is still opened in some other program, please close it." msgstr "所选文件仍被其它程序打开，请关闭它。" -#: ../../locales/../src/interface/edithandler.cpp:1626 +#: ../../locales/../src/interface/edithandler.cpp:1678 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7398,15 +7962,15 @@ "这很危险，可能会破坏您的系统。\n" "您真的要继续吗？" -#: ../../locales/../src/interface/sitemanager.cpp:566 +#: ../../locales/../src/interface/sitemanager.cpp:584 msgid "The server could not be added." msgstr "无法添加该服务器。" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "The server sent an unexpected or unrecognized reply." msgstr "服务器发送了意外的或不可识别的回应。" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:569 msgid "The server uses following charset encoding for filenames:" msgstr "服务器使用以下的字符集编码来处理文件名:" @@ -7416,7 +7980,7 @@ "certificate to make sure the server can be trusted." msgstr "服务器的证书未知。请小心验证证书以确信该服务器可信任。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:950 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1142 msgid "" "The server's host key does not match the key that has been cached. This " "means that either the administrator has changed the host key, or you are " @@ -7425,35 +7989,39 @@ "该服务器的主机密匙与缓存的密钥不符。这意味着管理员更改了主机密钥或者您正在尝" "试连接到伪装成该服务器的另一台计算机。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:844 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1026 msgid "" "The server's host key is unknown. You have no guarantee that the server is " "the computer you think it is." msgstr "该服务器的主机密匙是未知的。不能保证该服务器就是您所认定的那台计算机。" -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1291 +msgid "The server's hostname does not match the certificate's hostname" +msgstr "服务器的主机名与证书的主机名不匹配" + +#: ../../locales/../src/engine/socket.cpp:1112 msgid "The servname parameter is not supported for ai_socktype" msgstr "ai_socktype 不支持 servname 参数" -#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:81 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." msgstr "已导入设置，您需要重新启动 FileZilla 使所有设置生效。" -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "The specified address family is not supported" msgstr "不支持指定的地址集" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1125 msgid "The specified network name is no longer available" msgstr "指定的网络名称已不可用" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:2771 msgid "The system will soon reboot unless you click Cancel." msgstr "除非您按下取消，否则系统将会马上重启。" -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:2767 msgid "The system will soon shut down unless you click Cancel." msgstr "除非您按下取消，否则系统将会马上关闭。" @@ -7465,11 +8033,11 @@ "目标文件已经存在。\n" "请选择处理方法。" -#: ../../locales/../src/interface/netconfwizard.cpp:846 +#: ../../locales/../src/interface/netconfwizard.cpp:867 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "测试不成功。您真的要保存配置吗？" -#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#: ../../locales/../src/interface/xmlfunctions.cpp:83 #, c-format msgid "The valid backup file %s could not be restored" msgstr "无法恢复有效的备份文件 %s" @@ -7478,15 +8046,15 @@ msgid "Themes" msgstr "主题" -#: ../../locales/../src/interface/filter.cpp:444 +#: ../../locales/../src/interface/filter.cpp:358 msgid "This filter set cannot be removed." msgstr "无法删除该过滤器集合。" -#: ../../locales/../src/interface/filter.cpp:384 +#: ../../locales/../src/interface/filter.cpp:294 msgid "This filter set cannot be renamed." msgstr "无法重命名该过滤器集合。" -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7504,48 +8072,46 @@ "you have and tests your configuration." msgstr "本向导会帮助您正确地配置任何您使用的路由器和防火墙，并且测试您的配置。" -#: ../../locales/../src/interface/queue.cpp:1210 +#: ../../locales/../src/interface/queue.cpp:1214 msgid "Time" msgstr "时间" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 msgid "Time formatting" msgstr "时间格式" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:97 msgid "Time&out in seconds:" msgstr "超时秒数(&O):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:126 +#: ../../locales/../src/interface/queue.cpp:350 msgid "Timeout" msgstr "超时" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 -#, c-format -msgid "Timezone offset of server is %d seconds." -msgstr "服务器时差为 %d 秒。" - -#: ../../locales/../src/interface/verifycertdialog.cpp:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:435 msgid "Title:" msgstr "标题:" -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2307 +msgid "To compare directories quick search must be closed." +msgstr "对比目录必须关闭快速搜索。" + +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "To compare directories, both file lists have to be aligned." -msgstr "两边的文件列表必须排列整齐才能比较目录。" +msgstr "两边的文件列表必须排列整齐才能对比目录。" -#: ../../locales/../src/interface/Mainfrm.cpp:2169 +#: ../../locales/../src/interface/Mainfrm.cpp:2325 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "两边的目录树必须同时显示或隐藏才能执行此动作。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:624 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." msgstr "为了支持进行公钥认证，FileZilla 需要知道所使用的私钥。" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 +#: ../../locales/../src/interface/toolbar.cpp:51 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7554,14 +8120,14 @@ "Green: File is newer than the unmarked file on other side\n" "Red: File sizes different" msgstr "" -"开/关目录比较。右击改变比较模式。\n" +"开/关目录对比。右击改变对比模式。\n" "\n" "颜色:\n" "黄: 文件只在一边存在\n" "绿: 文件比另一边未标记的文件新\n" "红: 文件大小不同" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 +#: ../../locales/../src/interface/toolbar.cpp:52 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7570,82 +8136,77 @@ "启用/停止同步浏览。\n" "如果启用，导航本地目录时将相应的修改服务器目录，反之亦然。" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 +#: ../../locales/../src/interface/toolbar.cpp:44 msgid "Toggles processing of the transfer queue" msgstr "开/关传输队列处理" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 +#: ../../locales/../src/interface/toolbar.cpp:38 msgid "Toggles the display of the local directory tree" msgstr "开/关本地目录树显示" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:16 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:18 +#: ../../locales/../src/interface/toolbar.cpp:37 msgid "Toggles the display of the message log" msgstr "开/关消息记录显示" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:28 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:30 +#: ../../locales/../src/interface/toolbar.cpp:39 msgid "Toggles the display of the remote directory tree" msgstr "开/关远程目录树显示" -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:34 -#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:36 +#: ../../locales/../src/interface/toolbar.cpp:40 msgid "Toggles the display of the transfer queue" msgstr "开/关传输队列显示" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 +#: ../../locales/../src/engine/http/request.cpp:470 msgid "Too long header line" msgstr "标题行太长" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 +#: ../../locales/../src/engine/http/filetransfer.cpp:132 msgid "Too many redirects" msgstr "太多重定向" -#: ../../locales/../src/engine/logging.cpp:114 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:116 +#: ../../locales/../src/interface/StatusView.cpp:293 +#: ../../locales/../src/interface/StatusView.cpp:368 msgid "Trace:" msgstr "追踪:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1922 msgid "Transfer" msgstr "传输" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2455 msgid "Transfer &direction" msgstr "传输目录(&D)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:142 msgid "Transfer &type" msgstr "传输类型(&T)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:197 msgid "Transfer Mode" msgstr "传输模式" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1480 msgid "Transfer Queue" msgstr "传输队列" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:489 msgid "Transfer Settings" msgstr "传输设置" -#: ../../locales/../src/engine/transfersocket.cpp:448 -#: ../../locales/../src/engine/transfersocket.cpp:470 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:453 +#: ../../locales/../src/engine/ftp/transfersocket.cpp:475 #, c-format msgid "Transfer connection interrupted: %s" msgstr "传输连接被打断: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:630 +#: ../../locales/../src/interface/netconfwizard.cpp:643 msgid "Transferred data got tainted." msgstr "已传输的数据被损坏。" -#: ../../locales/../src/interface/queue.cpp:339 -#: ../../locales/../src/interface/statuslinectrl.cpp:246 +#: ../../locales/../src/interface/queue.cpp:360 +#: ../../locales/../src/interface/statuslinectrl.cpp:259 msgid "Transferring" msgstr "正在传输" @@ -7653,28 +8214,27 @@ msgid "Transfers" msgstr "传输" -#: ../../locales/../src/interface/QueueView.cpp:2944 -#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2650 msgid "Transfers finished" msgstr "传输完成" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1136 msgid "Treat files &without extension as ASCII file" msgstr "把没有扩展名的文件作为 ASCII 格式文件对待(&W)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1088 msgid "Treat the &following filetypes as ASCII files:" msgstr "把以下的文件类型作为 ASCII 格式文件对待(&F):" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:395 msgid "Trust changed Hostkey:" msgstr "信任改变后的主机密钥:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:392 msgid "Trust new Hostkey:" msgstr "信任新的主机密钥:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 msgid "Trust the new key and carry on connecting?" msgstr "信任该新密钥并继续连接？" @@ -7682,69 +8242,75 @@ msgid "Trust this certificate and carry on connecting?" msgstr "信任该证书并继续连接?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1080 msgid "Trust this host and carry on connecting?" msgstr "信任该主机并继续连接？" -#: ../../locales/../src/interface/resources/xrc/update.xrc:122 -#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +#: ../../locales/../src/interface/resources/xrc/update.xrc:139 +#: ../../locales/../src/interface/resources/xrc/update.xrc:226 msgid "Try again" msgstr "重试" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/edithandler.cpp:1137 msgid "Type" msgstr "类型" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:454 msgid "Type of FTP Proxy:" msgstr "FTP 代理服务器类型:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:715 msgid "Type of generic proxy:" msgstr "代理服务器类型:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2146 msgid "U&pload" msgstr "上传(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:931 msgid "U&pload limit:" msgstr "上传限制(&P):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2032 msgid "U&se filetype associations if available" msgstr "可以的话使用文件格式关联(&S)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1625 msgid "U&se system defaults for current language" msgstr "为当前语言使用系统默认设置(&S)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:464 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:404 -#: ../../locales/../src/engine/proxy.cpp:531 +#: ../../locales/../src/engine/proxy.cpp:387 +#: ../../locales/../src/engine/proxy.cpp:516 #, c-format msgid "Unassigned error code %d" msgstr "未知错误代码 %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:434 msgid "Unit:" msgstr "单位:" -#: ../../locales/../src/interface/edithandler.cpp:1117 -#: ../../locales/../src/interface/edithandler.cpp:1145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1065 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1176 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2273 +#: ../../locales/../src/interface/edithandler.cpp:1169 +#: ../../locales/../src/interface/edithandler.cpp:1197 msgid "Unknown" msgstr "未知" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftp/logon.cpp:753 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "未知 FTP 代理服务器类型，无法生成登录过程。" -#: ../../locales/../src/engine/proxy.cpp:452 +#: ../../locales/../src/engine/proxy.cpp:438 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "未知 SOCKS 协议版本: %d" @@ -7753,44 +8319,59 @@ msgid "Unknown certificate" msgstr "未知证书" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 +#: ../../locales/../src/engine/misc.cpp:71 +#: ../../locales/../src/engine/misc.cpp:84 +#, c-format +msgid "Unknown error %d" +msgstr "未知错误 %d" + +#: ../../locales/../src/engine/misc.cpp:48 +#, c-format +msgid "Unknown error %u" +msgstr "未知错误 %u" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1007 msgid "Unknown host key" msgstr "未定义的快捷键" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:446 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " "subnegotiation: %d" msgstr "未知的 SOCKS 用户名/密码认证会话协议版本: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:304 +#: ../../locales/../src/interface/xmlfunctions.cpp:191 msgid "" "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "未知的根元素，该文件似乎不是由 FileZilla 生成的。" -#: ../../locales/../src/interface/netconfwizard.cpp:605 -#: ../../locales/../src/interface/netconfwizard.cpp:616 +#: ../../locales/../src/engine/http/request.cpp:571 +msgid "Unknown transfer encoding" +msgstr "未知的传输编码方式" + +#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "除非问题被修复，主动模式 FTP 不会工作，只能使用被动模式。" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "除非问题被修复，主动模式 FTP 不会工作，只能使用被动模式。" -#: ../../locales/../src/engine/tlssocket.cpp:1098 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1316 msgid "Unsupported certificate type" msgstr "不支持的证书类型" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 +#: ../../locales/../src/engine/http/filetransfer.cpp:137 msgid "Unsupported redirect" msgstr "不支持的重定向" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2152 msgid "Up&load and unedit" msgstr "上传并放弃修改(&L)" @@ -7799,94 +8380,103 @@ msgid "Updates" msgstr "更新" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2469 msgid "Upload" msgstr "上传" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1160 msgid "Upload failed" msgstr "上传失败" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:606 #, c-format msgid "Upload limit: %s/s" msgstr "上传限制: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:588 +#: ../../locales/../src/interface/statusbar.cpp:609 msgid "Upload limit: none" msgstr "上传限制: 无" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3481 +#: ../../locales/../src/interface/search.cpp:941 +msgid "Upload search results" +msgstr "上传搜索结果" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:565 msgid "Upload selected directory" msgstr "上传选定的目录" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:246 msgid "Upload selected files and directories" msgstr "上传选定的文件和目录" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1957 msgid "Upload this file back to the server?" msgstr "上传该文件回服务器？" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1952 msgid "Upload this file to the server?" msgstr "上传该文件到服务器？" -#: ../../locales/../src/interface/edithandler.cpp:1102 -#: ../../locales/../src/interface/edithandler.cpp:1136 -#: ../../locales/../src/interface/edithandler.cpp:1292 +#: ../../locales/../src/interface/edithandler.cpp:1154 +#: ../../locales/../src/interface/edithandler.cpp:1188 +#: ../../locales/../src/interface/edithandler.cpp:1344 msgid "Uploading" msgstr "正在上传" -#: ../../locales/../src/interface/edithandler.cpp:1105 -#: ../../locales/../src/interface/edithandler.cpp:1294 +#: ../../locales/../src/interface/edithandler.cpp:1157 +#: ../../locales/../src/interface/edithandler.cpp:1346 msgid "Uploading and pending removal" msgstr "正在上传和等待移除" -#: ../../locales/../src/interface/edithandler.cpp:1139 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Uploading and unediting" msgstr "正上传并放弃修改" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:592 msgid "Use &custom charset" msgstr "使用自定义的字符集(&C)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "Use &custom editor:" msgstr "使用自定义编辑器(&C):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3161 msgid "Use &default editor for text files" msgstr "使用默认的文本编辑器(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Use &synchronized browsing" msgstr "使用同步浏览(&S)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 +#: ../../locales/../src/interface/list_search_panel.cpp:186 +msgid "Use Regular Expressions" +msgstr "使用正则表达式" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:580 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "如果服务器支持就使用 UTF-8，否则使用本地编码。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1609 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1632 msgid "Use default action" msgstr "使用默认动作" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:547 msgid "Use explicit FTP over TLS if available" msgstr "如果可用，使用显式的 FTP over TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2574 msgid "Use server currently connected to" msgstr "使用当前连接到的服务器" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2580 msgid "Use server from site manager" msgstr "使用从站点管理器选择的服务器" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1576 msgid "Use system &defaults for current language" msgstr "为当前语言使用系统默认设置(&D)" @@ -7903,7 +8493,7 @@ msgstr "使用服务器的外部地址来代替" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:207 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:358 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:359 msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" @@ -7918,16 +8508,17 @@ "如果您有动态 IP 地址，请使用这个选项。使用主动模式时，FileZilla 会在每次会话" "中会联系一次以上服务器。只有您使用的 FileZilla 的版本号会被提交到服务器。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:292 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:428 msgid "User:" msgstr "用户:" -#: ../../locales/../src/interface/manual_transfer.cpp:495 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 +#: ../../locales/../src/interface/manual_transfer.cpp:491 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1083 msgid "Username cannot be a series of spaces" msgstr "用户名不能是一系列的空格" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:620 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "使用错误的字符集可能导致文件名显示不正确。" @@ -7944,51 +8535,47 @@ msgid "Verbose log messages from wxWidgets" msgstr "来自 wxWidgets 的详细日志消息" -#: ../../locales/../src/engine/tlssocket.cpp:1148 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1401 msgid "Verifying certificate..." msgstr "正在验证证书..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:965 msgid "Very high" msgstr "非常高" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 +#: ../../locales/../src/engine/ftp/list.cpp:109 msgid "View hidden option set, but unsupported by server" msgstr "已经设置了显示隐藏的选项，但是服务器端并未支持" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1904 msgid "View/Edit" msgstr "查看/编辑" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2371 msgid "Visible columns" msgstr "可见栏目" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:634 msgid "W&rite" msgstr "写入(&R)" -#: ../../locales/../src/interface/QueueView.cpp:1671 -msgid "Waiting" -msgstr "等待" - -#: ../../locales/../src/interface/queue.cpp:335 +#: ../../locales/../src/interface/queue.cpp:356 msgid "Waiting for browsing connection" msgstr "等待浏览连接" -#: ../../locales/../src/interface/queue.cpp:336 +#: ../../locales/../src/interface/queue.cpp:357 msgid "Waiting for password" msgstr "等待密码" -#: ../../locales/../src/interface/statuslinectrl.cpp:240 +#: ../../locales/../src/interface/statuslinectrl.cpp:253 msgid "Waiting for transfer to be cancelled" msgstr "等待传输取消" -#: ../../locales/../src/engine/engineprivate.cpp:229 +#: ../../locales/../src/engine/engineprivate.cpp:242 msgid "Waiting to retry..." msgstr "正在等待重试..." -#: ../../locales/../src/interface/netconfwizard.cpp:958 +#: ../../locales/../src/interface/netconfwizard.cpp:983 msgid "Warning, ignoring data connection from wrong IP." msgstr "警告，忽略从错误 IP 接入的数据。" @@ -8006,94 +8593,114 @@ "\n" "您真的要检查每日编译版吗？" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Warning: Potential security breach!" msgstr "警告: 潜在的安全隐患！" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3836 msgid "Welcome to FileZilla" msgstr "欢迎使用 FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "What's new" msgstr "更新" -#: ../../locales/../src/interface/resources/xrc/update.xrc:61 +#: ../../locales/../src/interface/resources/xrc/update.xrc:66 msgid "What's new:" msgstr "更新:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4023 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." msgstr "" "若让 FileZilla 记住密码，在重启 FileZilla 进行连接时就无须重新输入您的密码。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:992 msgid "" "When enabled, characters that are not supported by the local operating " "system in filenames are replaced if downloading such a file." msgstr "启用后，下载这种文件时，文件名中本地操作系统不支持的字符将被替换。" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1444 msgid "When st&arting a new connection while already connected:" msgstr "已连接服务器的情况下，需要创建一个新的连接(&A):" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 msgid "Widescreen" msgstr "宽屏" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4018 msgid "Would you like FileZilla to remember passwords?" msgstr "您想让 FileZilla 记住密码吗？" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:668 msgid "Wr&ite" msgstr "写入(&I)" -#: ../../locales/../src/interface/netconfwizard.cpp:445 -#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:461 msgid "Wrong external IP address" msgstr "错误的外部 IP 地址" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/http/request.cpp:643 msgid "Wrong line endings" msgstr "错误的行结尾" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../locales/../src/interface/loginmanager.cpp:309 +msgid "" +"Wrong master password entered, it cannot be used to decrypt the stored " +"passwords." +msgstr "输入了错误的主密码，无法解密保存的密码。" + +#: ../../locales/../src/interface/loginmanager.cpp:108 +msgid "Wrong master password entered, it cannot be used to decrypt this item." +msgstr "输入了错误的主密码，无法解密该项。" + +#: ../../locales/../src/interface/sitemanager.cpp:21 +msgid "Yellow" +msgstr "黄色" + +#: ../../locales/../src/engine/sftp/sftpcontrolsocket.cpp:406 msgid "Yes" msgstr "是" -#: ../../locales/../src/interface/netconfwizard.cpp:766 +#: ../../locales/../src/interface/netconfwizard.cpp:786 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." msgstr "您似乎正在使用纯 IPv6 主机。此向导不支持这种环境。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +#: ../../locales/../src/interface/resources/xrc/update.xrc:270 msgid "You are using the latest version of FileZilla." msgstr "您使用的是最新版本的 FileZilla。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3806 msgid "You can always open this dialog again through the help menu." msgstr "您总是可以在帮助菜单中再次打开这个对话框。" -#: ../../locales/../src/interface/resources/xrc/update.xrc:139 -#: ../../locales/../src/interface/resources/xrc/update.xrc:217 +#: ../../locales/../src/interface/resources/xrc/update.xrc:166 +#: ../../locales/../src/interface/resources/xrc/update.xrc:246 msgid "You can download the latest version from the FileZilla website:" msgstr "您可以从 FileZilla 网站下载最新版本:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/interface/serverdata.cpp:15 msgid "You can leave the port field empty to use the default port." msgstr "您可以不填写端口而使用默认端口。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:524 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:709 msgid "" "You can use an x at any position to keep the permission the original files " "have." msgstr "您可以在任何地方使用 x 来保持原先文件的权限。" -#: ../../locales/../src/interface/import.cpp:28 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1126 +msgid "" +"You cannot change password and encryption key individually if using a master " +"password." +msgstr "使用主密码时，您不能单独修改密码或加密密钥。" + +#: ../../locales/../src/interface/import.cpp:29 msgid "You cannot import settings from FileZilla's own settings directory." msgstr "您无法从 FileZilla 本身的设置目录中导入设置。" @@ -8104,66 +8711,83 @@ msgstr "" "您不能用另一个无效字符替换无效字符。请输入一个可以在文件名中使用的字符。" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 +#: ../../locales/../src/engine/storj/file_transfer.cpp:34 +msgid "You cannot upload files into the root directory." +msgstr "您无法将文件上传到根目录。" + +#: ../../locales/../src/interface/asyncrequestqueue.cpp:336 msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "您没有输入该文件的新的名字。要覆盖这个文件吗？" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3583 msgid "You have selected at least one symbolic link." msgstr "您选择了至少一个符号链接。" -#: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:709 +#: ../../locales/../src/interface/edithandler.cpp:1639 +#: ../../locales/../src/interface/search.cpp:1223 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "您选择编辑超过 10 个文件，真的要继续吗？" -#: ../../locales/../src/interface/LocalListView.cpp:1670 +#: ../../locales/../src/interface/LocalListView.cpp:1800 +#: ../../locales/../src/interface/search.cpp:1489 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "您选择打开超过 10 个文件或目录，真的要继续吗？" -#: ../../locales/../src/interface/manual_transfer.cpp:415 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 +#: ../../locales/../src/interface/manual_transfer.cpp:407 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:991 msgid "You have to enter a hostname." msgstr "请输入一个主机名称。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1101 msgid "You have to enter a key file path" msgstr "请输入一个密钥文件路径。" -#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:927 msgid "You have to enter a local directory." msgstr "请输入一个本地目录。" -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/search.cpp:941 +msgid "You have to enter a remote directory." +msgstr "请输入一个远程目录。" + +#: ../../locales/../src/interface/netconfwizard.cpp:156 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 msgid "You have to enter a valid IPv4 address." msgstr "请输入正确的 IPv4 地址。" -#: ../../locales/../src/interface/search.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1135 +msgid "You have to enter a valid encryption key" +msgstr "请输入一个正确的加密密钥。" + +#: ../../locales/../src/interface/search.cpp:932 msgid "You have to enter a writable local directory." msgstr "请输入一个可写入的本地目录。" -#: ../../locales/../src/interface/manual_transfer.cpp:506 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 +#: ../../locales/../src/interface/manual_transfer.cpp:502 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1093 msgid "You have to enter an account name" msgstr "请输入账户名称" -#: ../../locales/../src/interface/manual_transfer.cpp:480 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 +#: ../../locales/../src/interface/manual_transfer.cpp:476 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1068 msgid "You have to specify a user name" msgstr "请输入一个用户名。" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:644 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." msgstr "您的防火墙或路由器似乎错误地更改了传输的数据。" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 +#: ../../locales/../src/interface/settings/optionspage_interface.cpp:210 +msgid "You need to enter a master password." +msgstr "请输入一个主密码。" + +#: ../../locales/../src/interface/bookmarks_dialog.cpp:60 msgid "You need to enter a name for the bookmark." msgstr "请为该书签命名。" @@ -8171,7 +8795,7 @@ msgid "You need to enter a name for the log file." msgstr "请为日志文件输入文件名。" -#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1524 msgid "You need to enter a properly quoted command." msgstr "请输入一个合适的引用命令。" @@ -8184,206 +8808,329 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "请输入一个代理服务器端口 (从 1 到 65535)" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:75 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:79 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:460 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 msgid "You need to enter at least one path, empty bookmarks are not supported." msgstr "您至少要输入一个路径，不支持空书签。" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:81 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1134 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:85 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:466 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1204 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." msgstr "您需要输入本地和远程路径来为这个书签启用同步浏览。" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1160 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this site." msgstr "您需要输入本地和远程路径来为这个站点启用同步浏览。" -#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:4180 +msgid "" +"You need to grant FileZilla access to the directories you want to download " +"files into or to upload files from." +msgstr "您需要授予 FileZilla 访问下载目录和上传目录的权限。" + +#: ../../locales/../src/interface/manual_transfer.cpp:294 msgid "You need to specify a local file." msgstr "您需要指定一个本地文件。" -#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:311 msgid "You need to specify a remote file." msgstr "您需要指定一个远程文件。" -#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:317 msgid "You need to specify a remote path." msgstr "您需要指定一个远程路经。" -#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:288 msgid "You need to specify a server." msgstr "您需要指定一个服务器。" -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "连接到其它服务应该没有问题，文件传输也能正常工作了。" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:2775 msgid "Your computer will suspend unless you click Cancel." msgstr "如果不按下 取消，系统将会马上挂起。" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 msgid "after" msgstr "之后" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "before" msgstr "之前" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:64 msgid "begins with" msgstr "开始于" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:138 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:284 msgid "bytes" msgstr "字节" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:62 msgid "contains" msgstr "包含" -#: ../../locales/../src/interface/updater.cpp:217 +#: ../../locales/../src/interface/updater.cpp:257 msgid "custom" msgstr "自定义" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67 msgid "does not contain" msgstr "不包含" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96 msgid "does not equal" msgstr "不相等" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:65 msgid "ends with" msgstr "结束于" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "equals" msgstr "相等" -#: ../../locales/../src/interface/filelistctrl.cpp:531 -#: ../../locales/../src/interface/filelistctrl.cpp:550 -#: ../../locales/../src/interface/filelistctrl.cpp:577 -#: ../../locales/../src/interface/filelistctrl.cpp:593 +#: ../../locales/../src/interface/filelistctrl.cpp:557 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:605 +#: ../../locales/../src/interface/filelistctrl.cpp:620 msgid "file" msgstr "文件" -#: ../../locales/../src/interface/edithandler.cpp:98 +#: ../../locales/../src/interface/edithandler.cpp:101 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:192 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " "FileZilla executable." msgstr "" "fzputtygen 无法启动。\n" -"请确认其执行程序和 FileZilla 执行程序在相同的目录内。" +"请确认该执行程序和 FileZilla 执行程序在相同的目录内。" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +#: ../../locales/../src/engine/sftp/connect.cpp:101 msgid "fzsftp belongs to a different version of FileZilla" -msgstr "fzsftp 是其他 FileZilla 版本里的命令" +msgstr "fzsftp 与当前 FileZilla 版本不匹配" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 +#: ../../locales/../src/engine/sftp/connect.cpp:143 msgid "fzsftp could not be started" msgstr "fzsftp 无法启动" -#: ../../locales/../src/engine/tlssocket.cpp:1127 +#: ../../locales/../src/engine/storj/connect.cpp:119 +msgid "fzstorj belongs to a different version of FileZilla" +msgstr "fzstorj 与当前 FileZilla 版本不匹配" + +#: ../../locales/../src/engine/storj/storjcontrolsocket.cpp:337 +msgid "fzstorj could not be started" +msgstr "fzstorj 无法启动" + +#: ../../locales/../src/interface/storj_key_interface.cpp:62 +#: ../../locales/../src/interface/storj_key_interface.cpp:77 +msgid "" +"fzstorj could not be started.\n" +"Please make sure this executable exists in the same directory as the main " +"FileZilla executable." +msgstr "" +"fzstorj 无法启动。\n" +"请确认该执行程序和 FileZilla 执行程序在相同的目录内。" + +#: ../../locales/../src/engine/tlssocket_impl.cpp:1212 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers 没有返回证书" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1224 +msgid "gnutls_pem_base64_encode2 failed" +msgstr "gnutls_pem_base64_encode2 失败" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69 msgid "greater than" msgstr "大于" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89 msgid "group executable" msgstr "组可执行" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87 msgid "group readable" msgstr "组可读" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88 msgid "group writeable" msgstr "组可写" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1670 msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "https://wiki.filezilla-project.org/Date_and_Time_formatting" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:63 msgid "is equal to" msgstr "等于" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74 msgid "is set" msgstr "已设置" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75 msgid "is unset" msgstr "未设置" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72 msgid "less than" msgstr "小于" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66 msgid "matches regex" msgstr "匹配正则表达式 (regex)" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:318 +msgid "new name" +msgstr "新名称" + +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86 msgid "owner executable" msgstr "所有者可执行" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84 msgid "owner readable" msgstr "所有者可读" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85 msgid "owner writeable" msgstr "所有者可写" -#: ../../locales/../src/engine/proxy.cpp:96 -#: ../../locales/../src/engine/tlssocket.cpp:1191 -#: ../../locales/../src/engine/tlssocket.cpp:1202 -#: ../../locales/../src/engine/tlssocket.cpp:1217 -#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 +#: ../../locales/../src/engine/proxy.cpp:64 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1454 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1470 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1486 +#: ../../locales/../src/engine/tlssocket_impl.cpp:1502 +#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:43 msgid "unknown" msgstr "未知" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "world executable" msgstr "全体可执行" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "world readable" msgstr "全体可读" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "world writeable" msgstr "全体可写" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:890 msgid "wxWidgets:" msgstr "wxWidgets:" -#~ msgid "Deleting directories" -#~ msgstr "正在删除目录" +#~ msgid "" +#~ "Malformed response: Server sent response body with a request verb or " +#~ "response code that disallows a response body." +#~ msgstr "" +#~ "错误的响应: 服务器发送的响应数据带有请求指令或者响应数据对当前的请求无效。" + +#~ msgid "&Do not remember passwords (recommended)" +#~ msgstr "不要保存密码(推荐)(&D)" + +#~ msgid "&Remember passwords" +#~ msgstr "记住密码(&R)" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" + +#~ msgid "Set permissions of '%s' to '%s'" +#~ msgstr "修改“%s”的权限为“%s”" + +#, fuzzy +#~ msgid "Bucket ID not found" +#~ msgstr "文件未找到" + +#~ msgid "Timezone offset of server is %d seconds." +#~ msgstr "服务器时差为 %d 秒。" + +#~ msgid "Available sizes" +#~ msgstr "可用大小" + +#~ msgid "Cannot load Quickconnect bar from resource file" +#~ msgstr "无法从资源文件导入快速连接栏" + +#~ msgid "Could not add trust" +#~ msgstr "无法添加到信任列表" + +#~ msgid "Filename &filters..." +#~ msgstr "文件名过滤器(&F)..." + +#~ msgid "Host key fingerprint:" +#~ msgstr "主机密钥指纹:" + +#~ msgid "SetSocketBufferSize called without socket" +#~ msgstr "SetSocketBufferSize 未带套接字调用" + +#~ msgid "Could not import peer certificates, gnutls_x509_crt_import failed" +#~ msgstr "无法导入对等认证，gnutls_x509_crt_import 失败" + +#~ msgid "" +#~ "Could not initialize structure for peer certificates, " +#~ "gnutls_x509_crt_init failed" +#~ msgstr "无法初始化对等证书结构，gnutls_x509_crt_init 失败" + +#~ msgid "Package" +#~ msgstr "数据包" + +#, fuzzy +#~ msgid "Updated" +#~ msgstr "更新" + +#~ msgid "%d files added to queue" +#~ msgstr "%d 个文件已加入队列" + +#~ msgid "Scanning for files to add to queue" +#~ msgstr "正在检查加入到队列中的文件" + +#~ msgid "Scanning for files to upload" +#~ msgstr "正在检查要上传的文件" + +#~ msgid "Waiting" +#~ msgstr "等待" + +#~ msgid "&Disconnect from server" +#~ msgstr "从服务器断开(&D)" + +#~ msgid "&Show message" +#~ msgstr "显示消息(&S)" + +#~ msgid "Do ¬hing" +#~ msgstr "什么都不做(&N)" + +#~ msgid "No more files in the queue!" +#~ msgstr "队列里已没有文件！" + +#~ msgid "Connected" +#~ msgstr "已连接" + +#, fuzzy +#~ msgid "Empty dirs to visit" +#~ msgstr "空目录列表" #~ msgid "Deleting multiple unrelated directories is not yet supported" #~ msgstr "目前不支持删除多个不相关的目录。" @@ -8518,9 +9265,6 @@ #~ msgid "Failed to parse trusted root cert." #~ msgstr "解析认证的根证书失败。" -#~ msgid "Root certificate is not trusted" -#~ msgstr "根证书不被信任" - #~ msgid "Cannot load file, not a valid XML file." #~ msgstr "无法加载文件，这不是有效的 XML 文件。" @@ -8601,9 +9345,6 @@ #~ msgid "Log of update check:" #~ msgstr "更新检查日志:" -#~ msgid "Package" -#~ msgstr "数据包" - #~ msgid "" #~ "Please check https://filezilla-project.org/ for the most recent version " #~ "of FileZilla." diff -Nru filezilla-3.15.0.2/locales/zh_TW.po filezilla-3.33.0/locales/zh_TW.po --- filezilla-3.15.0.2/locales/zh_TW.po 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/locales/zh_TW.po 2017-09-19 21:36:39.000000000 +0000 @@ -1,17 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-09 15:59+0200\n" -"PO-Revision-Date: 2014-03-25 03:16+0800\n" -"Last-Translator: Kene Lin \n" +"POT-Creation-Date: 2016-03-16 09:06+0100\n" +"PO-Revision-Date: 2016-03-03 01:53+0800\n" +"Last-Translator: Hulen(破滅刃) \n" "Language-Team: milo \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.7\n" +"X-Generator: Poedit 1.8.7\n" #. @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting #: ../../locales/../src/interface/statuslinectrl.cpp:56 @@ -40,9 +45,9 @@ msgid_plural "%d directories" msgstr[0] "%d 個目錄" -#: ../../locales/../src/interface/RemoteListView.cpp:1390 -#: ../../locales/../src/interface/search.cpp:478 -#: ../../locales/../src/interface/search.cpp:764 +#: ../../locales/../src/interface/RemoteListView.cpp:1386 +#: ../../locales/../src/interface/search.cpp:484 +#: ../../locales/../src/interface/search.cpp:743 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -50,9 +55,9 @@ #: ../../locales/../src/interface/filelist_statusbar.cpp:46 #: ../../locales/../src/interface/filelist_statusbar.cpp:66 -#: ../../locales/../src/interface/RemoteListView.cpp:1389 -#: ../../locales/../src/interface/search.cpp:477 -#: ../../locales/../src/interface/search.cpp:763 +#: ../../locales/../src/interface/RemoteListView.cpp:1385 +#: ../../locales/../src/interface/search.cpp:483 +#: ../../locales/../src/interface/search.cpp:742 #, c-format msgid "%d file" msgid_plural "%d files" @@ -70,12 +75,12 @@ msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d 個檔案. 總共大小: 至少 %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 +#: ../../locales/../src/interface/QueueView.cpp:2764 #, c-format msgid "%d files added to queue" msgstr "%d 個檔案加入佇列" -#: ../../locales/../src/engine/ControlSocket.cpp:103 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -86,16 +91,16 @@ msgstr "%h - 主機" #: ../../locales/../src/interface/recursive_operation_status.cpp:108 -#, fuzzy, c-format +#, c-format msgid "%llu directory" msgid_plural "%llu directories" -msgstr[0] "%d 個目錄" +msgstr[0] "%llu 個目錄" #: ../../locales/../src/interface/recursive_operation_status.cpp:107 -#, fuzzy, c-format +#, c-format msgid "%llu file" msgid_plural "%llu files" -msgstr[0] "%d 個檔案" +msgstr[0] "%llu 個檔案" #: ../../locales/../src/interface/resources/xrc/settings.xrc:517 #, c-format @@ -105,14 +110,14 @@ #: ../../locales/../src/interface/statuslinectrl.cpp:161 #, c-format msgid "%s (%s/s)" -msgstr "%s (%s/s)" +msgstr "%s (%s/秒)" #: ../../locales/../src/interface/statuslinectrl.cpp:164 #, c-format msgid "%s (? B/s)" -msgstr "%s (? B/s)" +msgstr "%s (? B/秒)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - 憑證已逾期!" @@ -143,7 +148,7 @@ msgid_plural "%s bytes" msgstr[0] "%s Byte" -#: ../../locales/../src/interface/FileZilla.cpp:595 +#: ../../locales/../src/interface/FileZilla.cpp:617 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -156,7 +161,7 @@ "\n" "請再次下載 FileZilla. 如果這個問題依舊持續, 請回報此錯誤." -#: ../../locales/../src/interface/FileZilla.cpp:680 +#: ../../locales/../src/interface/FileZilla.cpp:702 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -172,10 +177,10 @@ "- 確認 %s 在 PATH 環境變數內所列的目錄內.\n" "- 在 FZ_FZSFTP 環境變數內設定 %s 的完整路徑." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" -msgstr "%s with %d bits" +msgstr "%s, 有 %d 位元" #: ../../locales/../src/interface/resources/xrc/settings.xrc:509 #, c-format @@ -186,10 +191,9 @@ msgid "%w - Proxy password" msgstr "%w - Proxy 密碼" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" -msgstr "中止先前的連線, 並在目前的頁籤連線" +msgstr "中止先前的連線, 並在目前的頁籤連線(&A)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&About..." @@ -216,7 +220,6 @@ msgstr "加入檔案到佇列(&A)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -#, fuzzy msgid "&Add key file..." msgstr "加入金鑰檔案(&A)..." @@ -231,7 +234,7 @@ #: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." -msgstr "總是信任未來連線的憑證(&A)" +msgstr "總是信任未來連線的憑證(&A)." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 msgid "&Always trust this host, add this key to the cache" @@ -241,7 +244,7 @@ msgid "&Always use default editor" msgstr "總是使用預設編輯器(&A)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "總是對所有無檔案關聯的檔案使用這個選項(&A)" @@ -279,9 +282,9 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2260 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2669 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2749 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2944 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2756 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2951 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3136 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1930 #: ../../locales/../src/interface/resources/xrc/settings.xrc:2145 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 @@ -294,8 +297,8 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:379 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1025 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3620 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3676 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3683 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:40 #: ../../locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -309,7 +312,7 @@ msgid "&Close" msgstr "關閉(&C)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 msgid "&Close FileZilla" msgstr "關閉 FileZilla (&C)" @@ -368,14 +371,14 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1069 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1238 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2829 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2836 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 #: ../../locales/../src/interface/resources/xrc/menus.xrc:571 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "刪除(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "刪除軟連結(&D)" @@ -383,17 +386,15 @@ msgid "&Directory comparison" msgstr "目錄比對(&D)" -#: ../../locales/../src/interface/state.cpp:893 -#, fuzzy +#: ../../locales/../src/interface/state.cpp:895 msgid "" "&Disable synchronized browsing and continue changing the local directory" -msgstr "要停用同步瀏覽並繼續變更遠端目錄?" +msgstr "要停用同步瀏覽並繼續變更本地目錄(&D)" -#: ../../locales/../src/interface/state.cpp:966 -#, fuzzy +#: ../../locales/../src/interface/state.cpp:968 msgid "" "&Disable synchronized browsing and continue changing the remote directory" -msgstr "要停用同步瀏覽並繼續變更遠端目錄?" +msgstr "要停用同步瀏覽並繼續變更遠端目錄(&D)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1809 msgid "&Discard local file then download and edit file anew" @@ -403,10 +404,6 @@ msgid "&Disconnect" msgstr "中斷連線(&D)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 -msgid "&Disconnect from server" -msgstr "從伺服器離線(&D)" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "顯示瞬間傳輸速率而非平均速率(&D)" @@ -415,10 +412,9 @@ msgid "&Display size in bytes" msgstr "以 byte 單位顯示大小(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" -msgstr "不記憶密碼(&O)" +msgstr "不要記憶密碼 (推薦)(&D)" #: ../../locales/../src/interface/conditionaldialog.cpp:25 msgid "&Don't show this dialog again." @@ -437,9 +433,9 @@ msgid "&Download" msgstr "下載(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" -msgstr "下載到(&D)" +msgstr "下載到(&D):" #: ../../locales/../src/interface/resources/xrc/menus.xrc:600 msgid "&Download..." @@ -468,9 +464,9 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:687 msgid "&Enable compression" -msgstr "" +msgstr "啟用壓縮(&E)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3548 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "啟用速度限制(&E)" @@ -487,10 +483,9 @@ msgid "&Enter custom command..." msgstr "輸入自訂指令(&E)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" -msgstr "於新頁籤建立連線" +msgstr "在新頁籤建立連線(&E)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:421 msgid "&Execute" @@ -541,13 +536,13 @@ msgid "&Finish editing and delete local file" msgstr "結束編輯並且刪除本地檔案(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "扁平化遠端路徑, 直接下載所有包含的檔案到目的目錄(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "依循軟連結, 刪除目的目錄內容(&F)" @@ -610,14 +605,13 @@ msgid "&Install new version" msgstr "安裝新版本(&I)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3144 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 msgid "&Keep remote path structure relative to search root" msgstr "保持相對於搜尋根目錄的遠端路徑架構(&K)" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 -#, fuzzy msgid "&Key file:" -msgstr "開啟檔案(&P)" +msgstr "金鑰檔案(&K):" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" @@ -636,7 +630,7 @@ msgstr "本地樹狀目錄(&L)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2737 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "本地目錄(&L):" @@ -681,9 +675,8 @@ msgstr "最小化到系統列(&M)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 -#, fuzzy msgid "&Name sorting mode:" -msgstr "排序模式(&M):" +msgstr "名稱排序模式(&N):" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" @@ -701,11 +694,11 @@ msgid "&New Site" msgstr "新增站台(&N)" -#: ../../locales/../src/interface/Mainfrm.cpp:1687 +#: ../../locales/../src/interface/Mainfrm.cpp:1656 msgid "&New version available!" msgstr "有新版本(&N)!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "下一步(&N) >" @@ -714,6 +707,7 @@ msgid "&No" msgstr "否(&N)" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 #: ../../locales/../src/interface/resources/xrc/settings.xrc:458 #: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" @@ -728,7 +722,7 @@ msgstr "數值(&N):" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2878 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2885 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 msgid "&OK" msgstr "確認(&O)" @@ -754,7 +748,7 @@ msgid "&Password:" msgstr "密碼(&P):" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "&Play sound" msgstr "播放音效(&P)" @@ -781,9 +775,8 @@ msgstr "快速連線列(&Q)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 -#, fuzzy msgid "&Quickconnect history" -msgstr "清除快速連線列裡的歷程(&Q)" +msgstr "快速連線列歷史記錄(&Q)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Read" @@ -794,9 +787,8 @@ msgstr "重新連線(&R)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 -#, fuzzy msgid "&Reconnect information" -msgstr "清除重新連線資訊(&R)" +msgstr "重新連線資訊(&R)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 #: ../../locales/../src/interface/resources/xrc/menus.xrc:622 @@ -807,12 +799,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "記憶密碼直到 FileZilla 關閉(&R)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "記憶密碼(&R)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "遠端目錄(&R):" @@ -833,7 +825,7 @@ msgstr "移除所選項目(&R)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2823 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2830 #: ../../locales/../src/interface/resources/xrc/menus.xrc:280 #: ../../locales/../src/interface/resources/xrc/menus.xrc:324 #: ../../locales/../src/interface/resources/xrc/menus.xrc:511 @@ -858,6 +850,10 @@ msgid "&Report a bug..." msgstr "回報錯誤(&R)..." +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +msgid "&Request attention" +msgstr "請注意(&R)" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:449 msgid "&Reset and requeue all" msgstr "重設與重排所有檔案(&R)" @@ -870,7 +866,7 @@ msgid "&Resume" msgstr "續傳(&R)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Run command..." msgstr "執行指令(&E)..." @@ -894,7 +890,7 @@ msgid "&Save as..." msgstr "儲存為(&S)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "搜尋(&S)" @@ -932,22 +928,16 @@ msgstr "顯示偵錯選單(&S)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:424 -#, fuzzy msgid "&Show detailed log" -msgstr "顯示細節" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 -msgid "&Show message" -msgstr "顯示訊息(&S)" +msgstr "顯示詳細日誌(&S)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 msgid "&Show timestamps in message log" msgstr "顯示訊息記錄中的時間戳記(&S)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 -#, fuzzy msgid "&Site Manager entries" -msgstr "站台管理員欄位(&M)" +msgstr "站台管理員項目(&S)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." @@ -965,7 +955,7 @@ msgid "&Speed limits" msgstr "速度限制(&S)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "立即啟動傳輸(&S)" @@ -977,7 +967,7 @@ msgid "&TLS Ciphers" msgstr "TLS Cipher (&T)" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:234 msgid "&Test" msgstr "測試(&T)" @@ -1020,7 +1010,7 @@ msgid "&Uploads:" msgstr "上傳(&U):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "使用自訂程式(&U)" @@ -1054,7 +1044,7 @@ msgid "&Username:" msgstr "使用者名稱(&U):" -#: ../../locales/../src/interface/Mainfrm.cpp:1681 +#: ../../locales/../src/interface/Mainfrm.cpp:1650 #, c-format msgid "&Version %s" msgstr "版本 %s (&V)" @@ -1098,12 +1088,12 @@ msgid "'%s' is not a directory." msgstr "\"%s\" 並不是目錄." -#: ../../locales/../src/interface/manual_transfer.cpp:426 +#: ../../locales/../src/interface/manual_transfer.cpp:427 #: ../../locales/../src/interface/sitemanager_dialog.cpp:967 msgid "'Account' logontype not supported by selected protocol" msgstr "所選的協定不支援 \"帳號 (Account)\" 登入型式" -#: ../../locales/../src/interface/manual_transfer.cpp:440 +#: ../../locales/../src/interface/manual_transfer.cpp:441 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1115,7 +1105,7 @@ "changed to 'Ask for password'." msgstr "\"一般\" 與 \"帳號\" 的登入型式不能用. 您的欄位已更改為 \"詢問密碼\"." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../locales/../src/interface/Mainfrm.cpp:583 msgid "" "'quote' is usually a local command used by commandline clients to send the " "arguments following 'quote' to the server. You might want to enter the raw " @@ -1134,7 +1124,7 @@ #: ../../locales/../src/interface/update_dialog.cpp:254 #, c-format msgid "(%u%% downloaded)" -msgstr "" +msgstr "(%u%% 已下載)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:858 #: ../../locales/../src/interface/resources/xrc/settings.xrc:879 @@ -1154,9 +1144,8 @@ msgstr "(1-10)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:109 -#, fuzzy msgid "(10-9999, 0 to disable)" -msgstr "(5-9999, 0 則停用)" +msgstr "(10-9999, 0 則停用)" #: ../../locales/../src/interface/aboutdialog.cpp:85 #: ../../locales/../src/interface/aboutdialog.cpp:174 @@ -1172,8 +1161,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(例: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3584 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3574 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3591 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1221,7 +1210,6 @@ msgstr "3 - 詳述" #: ../../locales/../src/interface/aboutdialog.cpp:98 -#, fuzzy msgid "32-bit system" msgstr "32 位元系統" @@ -1230,11 +1218,10 @@ msgstr "4 - 偵錯" #: ../../locales/../src/interface/aboutdialog.cpp:96 -#, fuzzy msgid "64-bit system" msgstr "64 位元系統" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< 上一步(&B)" @@ -1253,7 +1240,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:744 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "目錄不能拖曳到其子目錄下." @@ -1279,7 +1266,7 @@ "A file with that name is still being edited. Please close it and try again." msgstr "該名稱之檔案依舊在編輯. 請關閉再試試看." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1296,7 +1283,7 @@ msgid "A new version of FileZilla is available:" msgstr "有新版的 FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../locales/../src/interface/Mainfrm.cpp:643 msgid "" "A proper server always shows all files, but some broken servers hide files " "from the user. Use this option to force the server to show all files." @@ -1310,7 +1297,7 @@ "you need this." msgstr "正常的伺服器是不需要這個的. 如果您需要那請聯絡伺服器管理者." -#: ../../locales/../src/interface/state.cpp:257 +#: ../../locales/../src/interface/state.cpp:258 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1360,13 +1347,13 @@ msgid "Above the file lists" msgstr "在檔案列表的上方" -#: ../../locales/../src/engine/server.cpp:862 -#: ../../locales/../src/engine/server.cpp:883 -#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/engine/server.cpp:863 +#: ../../locales/../src/engine/server.cpp:884 #: ../../locales/../src/interface/manual_transfer.cpp:154 -#: ../../locales/../src/interface/manual_transfer.cpp:187 -#: ../../locales/../src/interface/manual_transfer.cpp:539 +#: ../../locales/../src/interface/manual_transfer.cpp:155 +#: ../../locales/../src/interface/manual_transfer.cpp:188 #: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/manual_transfer.cpp:541 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 msgid "Account" @@ -1392,13 +1379,13 @@ msgid "Active mode" msgstr "主動模式" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:629 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "FTP 主動模式測試失敗. FileZilla 不知道正確的外部 IP Address." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:616 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address. In addition to that, your router has modified the sent address." @@ -1406,7 +1393,7 @@ "FTP 主動模式測試失敗. FileZilla 不知道正確的外部 IP Address. 除此之外, 您的路" "由器修改了傳送位址." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1419,7 +1406,7 @@ msgid "Active mode IP" msgstr "主動模式 IP Address" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "只加入檔案到佇列(&Q)" @@ -1438,7 +1425,7 @@ msgid "Add to queue" msgstr "加入到佇列" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:529 msgid "Address type not supported" msgstr "位址型態未支援" @@ -1458,16 +1445,15 @@ "建版都是用以測試的版本. 每日組建版的 FileZilla 可能不會如預期運作, 甚至也可能" "會損害您的系統. 使用 Beta 測試版與每日組建版請您自行承擔風險." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" -msgstr "總是使用這個動作(&A)" +msgstr "總是使用這個動作(&W)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 msgid "Algorithm:" msgstr "演算法:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2927 msgid "All files have been successfully transferred" msgstr "所有檔案都已成功傳輸" @@ -1475,7 +1461,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "所有範圍內的連接埠號碼都必須在 1024 到 65535 之間." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../locales/../src/interface/QueueView.cpp:2923 #, c-format msgid "All transfers have finished. %d file could not be transferred." msgid_plural "All transfers have finished. %d files could not be transferred." @@ -1489,15 +1475,14 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "失敗時允許回復到其他傳輸模式" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "已連線" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 -#, fuzzy +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" -msgstr[0] "篩選器名稱(&I):" +msgstr[0] "別名:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:660 msgid "" @@ -1521,7 +1506,7 @@ "website:" msgstr "做為替代, 您也可以從 FileZilla 網站下載最新版:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1899 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1530,7 +1515,7 @@ "從 \"%s\" 載入傳輸佇列時發生錯誤.\n" "部分佇列項目可能無法還原." -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1809 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1539,23 +1524,23 @@ "儲存傳輸佇列到 \"%s\" 時發生錯誤.\n" "部分佇列項目可能無法儲存." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "" "An item with the same name as the dragged item already exists at the target " "location." msgstr "目標位置已存在與拖曳來源相同名稱的項目." -#: ../../locales/../src/engine/server.cpp:885 -#: ../../locales/../src/interface/manual_transfer.cpp:152 -#: ../../locales/../src/interface/manual_transfer.cpp:190 -#: ../../locales/../src/interface/manual_transfer.cpp:206 -#: ../../locales/../src/interface/manual_transfer.cpp:538 +#: ../../locales/../src/engine/server.cpp:886 +#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/interface/manual_transfer.cpp:207 +#: ../../locales/../src/interface/manual_transfer.cpp:539 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 msgid "Anonymous" msgstr "匿名" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:945 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "另一個遠端操作已在處理中, 現在無法變更目錄." @@ -1564,11 +1549,11 @@ msgid "Any changes made in the Site Manager could not be saved." msgstr "站台管理員裡的任何變更都無法儲存." -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:213 msgid "Any changes made to the filters could not be saved." msgstr "篩選器裡的任何變更都無法儲存." -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "篩選器裡的任何變更都不會儲存." @@ -1592,9 +1577,9 @@ msgid "Archive" msgstr "封存" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Argument buffer overflow" -msgstr "" +msgstr "參數緩沖區溢位" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 msgid "As tab in the transfer queue pane" @@ -1608,9 +1593,9 @@ msgid "Ask for action" msgstr "詢問動作" -#: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:857 +#: ../../locales/../src/engine/server.cpp:878 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "詢問密碼" @@ -1622,7 +1607,7 @@ msgid "Ask your operating system for the external IP address" msgstr "對您的作業系統詢問外部 IP Address" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "於 FileZilla 論壇上詢問" @@ -1642,7 +1627,7 @@ msgid "Attribute" msgstr "檔案屬性" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:661 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "認證失敗." @@ -1671,11 +1656,11 @@ msgid "B&ypass proxy" msgstr "略過 Proxy (&Y)" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Bad file descriptor" -msgstr "" +msgstr "錯誤的檔案描述" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "基本使用指引" @@ -1688,7 +1673,7 @@ msgid "Being edited" msgstr "正在編輯" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "請小心! 憑證可能已註銷" @@ -1706,18 +1691,17 @@ msgid "Bookmark" msgstr "書籤" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "書籤:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "書籤" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 -#, fuzzy msgid "Browse..." -msgstr "瀏覽(&B)..." +msgstr "瀏覽..." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" @@ -1727,7 +1711,7 @@ msgid "Build information" msgstr "組建資訊" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "業務範疇:" @@ -1763,24 +1747,24 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 msgid "CPU features:" -msgstr "" +msgstr "CPU 功能:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1566 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "計算伺服器的時區偏移量..." -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "無法讀取檔案" -#: ../../locales/../src/engine/transfersocket.cpp:648 -#: ../../locales/../src/engine/transfersocket.cpp:714 +#: ../../locales/../src/engine/transfersocket.cpp:650 +#: ../../locales/../src/engine/transfersocket.cpp:718 msgid "Can't write data to file." msgstr "無法寫入檔案." -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:652 +#: ../../locales/../src/engine/transfersocket.cpp:720 #, c-format msgid "Can't write data to file: %s" msgstr "無法寫入檔案: %s" @@ -1798,13 +1782,13 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1829 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2570 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2716 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2884 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2974 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3738 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2723 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2891 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3525 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3745 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:604 msgid "Cancel" msgstr "取消" @@ -1822,15 +1806,15 @@ msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "無法存取 \"%s\", 裝置未插入或是磁碟機尚未備妥." -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:556 msgid "Cannot add server to Site Manager" msgstr "無法新增伺服器到站台管理員" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "Cannot assign requested address" -msgstr "" +msgstr "無法分配請求的位址" -#: ../../locales/../src/interface/context_control.cpp:349 +#: ../../locales/../src/interface/context_control.cpp:352 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1850,20 +1834,20 @@ #: ../../locales/../src/interface/edithandler.cpp:1574 #: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1700 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/LocalListView.cpp:1705 +#: ../../locales/../src/interface/search.cpp:696 msgid "Cannot edit file" msgstr "無法編輯檔案" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 msgid "Cannot edit file, not connected to any server." msgstr "無法編輯檔案, 未連線到任何伺服器." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "無法編輯檔案, 未知的遠端路徑." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:336 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1875,15 +1859,14 @@ msgstr "無法從資源檔裡載入快速連線列" #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 -#, fuzzy msgid "Cannot load key file" msgstr "無法載入金鑰檔案" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:989 msgid "Cannot load toolbar from resource file" msgstr "無法從資源檔裡載入工具列" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "無法記憶密碼" @@ -1892,20 +1875,20 @@ msgid "Cannot rename entry" msgstr "無法更名欄位" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "無法更名檔案" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:173 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "無法解析用於 SOCKS4 Proxy 的主機名稱為 IPv4 位址." -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "無法儲存篩選集" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "無法選取篩選器" @@ -1924,29 +1907,24 @@ msgstr "無法檢視/編輯所選的檔案" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 -#, fuzzy msgid "Case insensitive" -msgstr "篩選條件是有分大小寫的(&A)" +msgstr "不區分大小寫" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 -#, fuzzy msgid "Case insensitive (default)" -msgstr "使用系統預設值(&S)" +msgstr "不區分大小寫 (預設)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 -#, fuzzy msgid "Case sensitive" -msgstr "篩選條件是有分大小寫的(&A)" +msgstr "區分大小寫" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 -#, fuzzy msgid "Case sensitive (default)" -msgstr "使用系統預設值(&S)" +msgstr "區分大小寫 (預設)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 -#, fuzzy msgid "Categories to clear" -msgstr "分類目錄" +msgstr "需要清除的分類" #: ../../locales/../src/interface/statusbar.cpp:502 msgid "Certificate and session data are not available yet." @@ -1977,7 +1955,7 @@ msgid "Changing logfile settings requires restart of FileZilla." msgstr "變更記錄檔案的設定必須重新啟動 FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "字元編碼議題" @@ -2005,19 +1983,19 @@ msgid "Check for updates failed" msgstr "檢查更新失敗" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." -msgstr "" +msgstr "請檢查您的登錄認證. 輸入的密碼開頭或末尾有空格." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." -msgstr "" +msgstr "請檢查您的登錄認證. 輸入的使用者名稱開頭或末尾有空格." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:778 msgid "Checking for correct external IP address" msgstr "正在檢查正確的外部 IP Address" @@ -2025,20 +2003,19 @@ msgid "Checking for updates..." msgstr "正在檢查更新..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "加總校驗值與檔案 %s 相符\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "加總校驗值與檔案 %s 不符\n" #: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 -#, fuzzy msgid "Choose a key file" -msgstr "轉換金鑰檔案" +msgstr "選擇金鑰檔案" #: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 msgid "Choose the default local directory" @@ -2046,17 +2023,17 @@ #: ../../locales/../src/interface/bookmarks_dialog.cpp:124 #: ../../locales/../src/interface/bookmarks_dialog.cpp:364 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2242 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 msgid "Choose the local directory" msgstr "選擇本地目錄" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "區塊資料不正確終止" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" -msgstr "Cipher:" +msgstr "密碼:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 #: ../../locales/../src/interface/resources/xrc/menus.xrc:615 @@ -2088,7 +2065,7 @@ msgid "Clear quickconnect bar" msgstr "清除快速連線列" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:595 msgid "Click on Finish to save your configuration." msgstr "按 Finish 來儲存您的組態." @@ -2105,8 +2082,8 @@ msgstr "關閉其它所有頁籤(&A)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../locales/../src/interface/Mainfrm.cpp:1125 -#: ../../locales/../src/interface/Mainfrm.cpp:1146 +#: ../../locales/../src/interface/Mainfrm.cpp:1126 +#: ../../locales/../src/interface/Mainfrm.cpp:1147 msgid "Close FileZilla" msgstr "關閉 FileZilla" @@ -2122,7 +2099,7 @@ msgid "Co&mments:" msgstr "註解(&M):" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:747 msgid "Column properties" msgstr "欄位屬性" @@ -2134,13 +2111,13 @@ msgid "Command and its arguments should be properly quoted." msgstr "指令與其引數需要正確引用." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Command failed" msgstr "指令失敗" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:526 msgid "Command not supported" msgstr "指令未支援" @@ -2148,9 +2125,9 @@ msgid "Command not supported by this protocol" msgstr "通訊協定不支援此指令" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:280 -#: ../../locales/../src/interface/StatusView.cpp:336 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:283 +#: ../../locales/../src/interface/StatusView.cpp:339 msgid "Command:" msgstr "指令:" @@ -2158,12 +2135,12 @@ msgid "Comment" msgstr "註解" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "憑證名稱:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:451 +#: ../../locales/../src/interface/netconfwizard.cpp:464 msgid "Communication tainted by router or firewall" msgstr "通訊已被路由器或防火牆影響" @@ -2210,7 +2187,7 @@ msgstr "並行傳輸" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 msgid "Conditions are c&ase sensitive" msgstr "篩選條件是有分大小寫的(&A)" @@ -2226,24 +2203,24 @@ msgid "Configure port range" msgstr "配置連接埠範圍" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "配置 FileZilla 與您的網路" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "確認刪除" -#: ../../locales/../src/engine/local_filesys.cpp:129 #: ../../locales/../src/interface/edithandler.cpp:1586 -#: ../../locales/../src/interface/LocalListView.cpp:1664 -#: ../../locales/../src/interface/RemoteListView.cpp:1394 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/file_utils.h:45 +#: ../../locales/../src/interface/LocalListView.cpp:1669 +#: ../../locales/../src/interface/RemoteListView.cpp:1390 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/search.cpp:708 msgid "Confirmation needed" msgstr "需要確認" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "Congratulations, your configuration seems to be working." msgstr "恭喜, 您的組態似乎已可正常運作." @@ -2251,169 +2228,166 @@ msgid "Connect bypassing proxy settings" msgstr "連線略過 Proxy 設定" +#: ../../locales/../src/interface/netconfwizard.cpp:222 +#, c-format +msgid "Connect failed: %s" +msgstr "連線失敗: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 -#, fuzzy msgid "Connect in current tab" -msgstr "關閉目前的頁籤" +msgstr "在目前的頁籤連線" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 -#, fuzzy msgid "Connect in new tab" -msgstr "連線逾時" +msgstr "在新頁籤建立連線" #: ../../locales/../src/interface/cmdline.cpp:8 msgid "Connect to specified Site Manager site" msgstr "連線到指定的站台管理員站台" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "已連線" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "連線中" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:216 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "正在連線到 %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 -#, fuzzy, c-format +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247 +#, c-format msgid "Connecting to %s through %s proxy" -msgstr "正經由 Proxy 連線到 %s" +msgstr "正在連線到 %s, 經由 %s Proxy" -#: ../../locales/../src/engine/ControlSocket.cpp:956 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:369 +#: ../../locales/../src/engine/ControlSocket.cpp:959 +#: ../../locales/../src/engine/proxy.cpp:267 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." -msgstr "正在連線到 %s ..." +msgstr "正在連線到 %s..." #: ../../locales/../src/interface/settings/settingsdialog.cpp:92 msgid "Connection" msgstr "連線" -#: ../../locales/../src/engine/socket.cpp:1073 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Connection aborted" -msgstr "關閉連線" +msgstr "中止連線" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "嘗試連線失敗" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:241 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "以 \"%s\" 嘗試連線失敗, 試下一個 IP Address." -#: ../../locales/../src/engine/ControlSocket.cpp:925 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "以 \"%s\" 嘗試連線失敗." -#: ../../locales/../src/engine/ControlSocket.cpp:183 +#: ../../locales/../src/engine/ControlSocket.cpp:185 #: ../../locales/../src/engine/engineprivate.cpp:681 msgid "Connection attempt interrupted by user" msgstr "被使用者中斷嘗試連線" -#: ../../locales/../src/engine/socket.cpp:1066 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Connection attempt timed out" -msgstr "連線逾時" +msgstr "連線嘗試逾時" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:564 msgid "Connection closed" msgstr "關閉連線" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:215 msgid "Connection closed by server" msgstr "由伺服器關閉連線" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:380 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "連線已建立, 正在初始 TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "連線已建立, 正在傳送 HTTP 請求" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/interface/netconfwizard.cpp:345 +msgid "Connection established, waiting for welcome message." +msgstr "連線已建立, 正在等候歡迎訊息." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "Connection established, waiting for welcome message..." msgstr "連線已建立, 正在等候歡迎訊息..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:362 msgid "Connection lost" msgstr "失去連線" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:511 msgid "Connection not allowed by ruleset" msgstr "規則集不允許連線" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:520 msgid "Connection refused" msgstr "連線被拒" -#: ../../locales/../src/engine/socket.cpp:1060 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Connection refused by server" -msgstr "由伺服器關閉連線" +msgstr "連線被伺服器拒絕" -#: ../../locales/../src/engine/socket.cpp:1069 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Connection reset by network" -msgstr "由伺服器關閉連線" +msgstr "連線被網路重設" -#: ../../locales/../src/engine/socket.cpp:1074 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Connection reset by peer" -msgstr "由伺服器關閉連線" +msgstr "連線被對方重設" -#: ../../locales/../src/engine/ControlSocket.cpp:557 +#: ../../locales/../src/engine/ControlSocket.cpp:560 #, c-format msgid "Connection timed out after %d second of inactivity" msgid_plural "Connection timed out after %d seconds of inactivity" -msgstr[0] "" +msgstr[0] "%d 秒後無動作, 連線逾時" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1072 msgid "Connection timed out." msgstr "連線逾時." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "失去與伺服器的連線." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:250 msgid "Connection with proxy established, performing handshake..." msgstr "Proxy 連線已建立, 正在處理交握..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "Connection with server got closed prematurely." msgstr "與伺服器的連線過早關閉." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:575 msgid "Connection with the test server failed." msgstr "與測試伺服器的連線失敗." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 -#, fuzzy +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "轉換金鑰檔案" #: ../../locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 #, c-format msgid "Copy (%d) of %s" msgstr "複製 (%d) - %s" #: ../../locales/../src/interface/bookmarks_dialog.cpp:605 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1829 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 #, c-format msgid "Copy of %s" msgstr "複製 - %s" @@ -2421,9 +2395,9 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 #: ../../locales/../src/interface/resources/xrc/menus.xrc:516 msgid "Copy the URLs of the selected items to clipboard." -msgstr "複製所選項目的網址到剪貼簿" +msgstr "複製所選項目的網址到剪貼簿." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "無法允許連線: %s" @@ -2433,30 +2407,30 @@ msgid "Could not add connection to Site Manager" msgstr "無法新增連線到站台管理員" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:758 msgid "Could not complete operation" msgstr "無法完成操作" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "無法連線到伺服器" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "無法連線到伺服器: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "無法轉換指令成伺服器編碼" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 msgid "Could not convert private key" msgstr "無法轉換私鑰" -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/RemoteListView.cpp:2522 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 msgid "Could not copy URLs" msgstr "無法複製網址" @@ -2464,17 +2438,17 @@ msgid "Could not copy data" msgstr "無法複製資料" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "無法建立本地檔案 %s\n" -#: ../../locales/../src/engine/logging.cpp:165 -#, fuzzy, c-format +#: ../../locales/../src/engine/logging.cpp:173 +#, c-format msgid "Could not create logging mutex: %s" -msgstr "無法建立本地檔案 %s\n" +msgstr "無法建立日誌鎖 (logging mutex): %s" -#: ../../locales/../src/interface/RemoteListView.cpp:2193 +#: ../../locales/../src/interface/RemoteListView.cpp:2183 #: ../../locales/../src/interface/RemoteTreeView.cpp:851 msgid "" "Could not determine the target of the Drag&Drop operation.\n" @@ -2484,11 +2458,11 @@ "無法確認拖曳動作的目標.\n" "不是 Shell Extension 沒有正確安裝好就是您沒有拖曳檔案到 Explorer 視窗." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4096 msgid "Could not establish connection to server" msgstr "無法建立與伺服器的連線" -#: ../../locales/../src/interface/FileZilla.cpp:406 +#: ../../locales/../src/interface/FileZilla.cpp:428 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2499,41 +2473,46 @@ "您可以使用指令選項 \"--datadir \" 或是設定 FZ_DATADIR 環境變數來" "指定 FileZilla 的資料目錄." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:676 msgid "Could not generate custom login sequence." msgstr "無法產生自訂的登入程序." -#: ../../locales/../src/engine/tlssocket.cpp:930 +#: ../../locales/../src/engine/tlssocket.cpp:958 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "無法取得憑證發行者的辨別名稱, gnutls_x509_get_issuer_dn 失敗" -#: ../../locales/../src/engine/tlssocket.cpp:907 +#: ../../locales/../src/engine/tlssocket.cpp:935 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "無法取得憑證物件的辨別名稱, gnutls_x509_get_dn 失敗" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:931 msgid "Could not get full remote path." msgstr "無法取得完整的遠端路徑." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Could not get reply from fzputtygen." msgstr "無法從 fzputtygen 取得回應." #: ../../locales/../src/interface/edithandler.cpp:1574 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/search.cpp:696 msgid "Could not get temporary directory to download file into." msgstr "無法取得放置下載檔案用的暫存目錄." -#: ../../locales/../src/engine/tlssocket.cpp:853 +#: ../../locales/../src/engine/tlssocket.cpp:881 msgid "Could not import peer certificates, gnutls_x509_crt_import failed" msgstr "無法匯入同儕憑證, gnutls_x509_crt_import 失敗" -#: ../../locales/../src/engine/tlssocket.cpp:848 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "無法初始化 Winsock (%d): %s" + +#: ../../locales/../src/engine/tlssocket.cpp:876 msgid "" "Could not initialize structure for peer certificates, gnutls_x509_crt_init " "failed" @@ -2551,15 +2530,14 @@ "對帳台管理員的任何變更都不會儲存." #: ../../locales/../src/interface/fzputtygen_interface.cpp:59 -#, fuzzy msgid "Could not load key file" msgstr "無法載入金鑰檔案" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "無法載入私鑰" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:953 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2569,7 +2547,7 @@ "無法取得對應遠端目錄 \"%s\" 的本地目錄.\n" "要停用同步瀏覽並繼續變更遠端目錄?" -#: ../../locales/../src/interface/state.cpp:361 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2579,7 +2557,7 @@ "無法取得對應遠端目錄 \"%s\" 的本地目錄.\n" "同步瀏覽已停用." -#: ../../locales/../src/interface/state.cpp:266 +#: ../../locales/../src/interface/state.cpp:267 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2590,14 +2568,14 @@ "同步瀏覽已停用." #: ../../locales/../src/interface/aboutdialog.cpp:198 -#: ../../locales/../src/interface/RemoteListView.cpp:2532 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../locales/../src/interface/RemoteListView.cpp:2522 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 msgid "Could not open clipboard" msgstr "無法開啟剪貼簿" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:177 -#: ../../locales/../src/engine/logging.cpp:208 +#: ../../locales/../src/engine/logging.cpp:106 +#: ../../locales/../src/engine/logging.cpp:186 +#: ../../locales/../src/engine/logging.cpp:218 #, c-format msgid "Could not open log file: %s" msgstr "無法開啟記錄檔案: %s" @@ -2610,42 +2588,50 @@ msgid "Could not parse server address:" msgstr "無法解析伺服器位址:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:995 +msgid "Could not read from data socket." +msgstr "無法讀取資料 Socket." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:206 #, c-format msgid "Could not read from socket: %s" -msgstr "無法從 Socket 讀取: %s" +msgstr "無法讀取 Socket: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "無法讀取伺服器項目." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2589 +#: ../../locales/../src/interface/netconfwizard.cpp:356 +msgid "Could not receive data from server." +msgstr "無法從伺服器接收資料." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2591 #, c-format msgid "Could not seek to offset %s within file" msgstr "無法在檔案中尋找到偏移量 %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2500 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2498 msgid "Could not seek to the end of the file" msgstr "無法找尋到檔案結尾" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "無法傳送指令給 fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2619 msgid "Could not spawn IO thread" msgstr "無法產生 I/O 執行緒" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "無法啟動 Proxy 交握: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "無法啟動傳輸" -#: ../../locales/../src/interface/sitemanager.cpp:608 +#: ../../locales/../src/interface/sitemanager.cpp:610 #: ../../locales/../src/interface/sitemanager_dialog.cpp:829 #, c-format msgid "" @@ -2663,7 +2649,7 @@ msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "無法寫入 \"%s\", 無法儲存全域書籤: %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1838 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2672,40 +2658,40 @@ "無法寫入 \"%s\", 無法儲存佇列.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:718 -#: ../../locales/../src/interface/sitemanager.cpp:772 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../../locales/../src/interface/sitemanager.cpp:720 +#: ../../locales/../src/interface/sitemanager.cpp:774 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "無法寫入 \"%s\", 無法匯出所選的站台: %s" #: ../../locales/../src/interface/xmlfunctions.cpp:146 -#, fuzzy, c-format +#, c-format msgid "Could not write \"%s\":" -msgstr "無法寫入 \"%s\": %s" +msgstr "無法寫入 \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 -#, fuzzy, c-format +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 +#, c-format msgid "Could not write key file: %s" msgstr "無法寫入金鑰檔案: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "無法寫入本地檔案" -#: ../../locales/../src/engine/logging.cpp:215 -#: ../../locales/../src/engine/logging.cpp:280 +#: ../../locales/../src/engine/logging.cpp:230 +#: ../../locales/../src/engine/logging.cpp:297 #, c-format msgid "Could not write to log file: %s" msgstr "無法寫入記錄檔案: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:880 -#: ../../locales/../src/engine/ControlSocket.cpp:984 +#: ../../locales/../src/engine/ControlSocket.cpp:883 +#: ../../locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "無法寫入 Socket: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "國家:" @@ -2713,15 +2699,13 @@ msgid "Crea&te new file" msgstr "建立新檔案(&T)" -#: ../../locales/../src/interface/state.cpp:965 -#, fuzzy +#: ../../locales/../src/interface/state.cpp:967 msgid "Create &missing local directory and enter it" -msgstr "新增目錄" +msgstr "建立遺失的本地目錄並進入該目錄(&M)" -#: ../../locales/../src/interface/state.cpp:892 -#, fuzzy +#: ../../locales/../src/interface/state.cpp:894 msgid "Create &missing remote directory and enter it" -msgstr "新增目錄" +msgstr "建立遺失的遠端目錄並進入該目錄(&M)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:265 #: ../../locales/../src/interface/resources/xrc/menus.xrc:305 @@ -2734,9 +2718,8 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:309 #: ../../locales/../src/interface/resources/xrc/menus.xrc:503 #: ../../locales/../src/interface/resources/xrc/menus.xrc:567 -#, fuzzy msgid "Create a new subdirectory in the current directory and change into it" -msgstr "在現行目錄下建立子新的目錄" +msgstr "在現行目錄下建立子的新目錄並進入該目錄" #: ../../locales/../src/interface/resources/xrc/menus.xrc:313 msgid "Create a new, empty file in the current directory" @@ -2746,50 +2729,48 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:308 #: ../../locales/../src/interface/resources/xrc/menus.xrc:502 #: ../../locales/../src/interface/resources/xrc/menus.xrc:566 -#, fuzzy msgid "Create director&y and enter it" -msgstr "新增目錄" +msgstr "建立目錄並進入(&Y)" -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/LocalListView.cpp:902 +#: ../../locales/../src/interface/LocalTreeView.cpp:1120 +#: ../../locales/../src/interface/RemoteListView.cpp:1293 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 msgid "Create directory" msgstr "新增目錄" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "建立空檔案" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "新增目錄中" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3164 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1931 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "新增目錄 \"%s\"..." -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "嚴重錯誤" -#: ../../locales/../src/engine/ControlSocket.cpp:169 -#, fuzzy +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" -msgstr "嚴重錯誤" +msgstr "嚴重錯誤:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "嚴重檔案傳輸錯誤" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:120 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "於 %s (全部 %s) 之後發生嚴重檔案傳輸錯誤" -#: ../../locales/../src/interface/state.cpp:352 +#: ../../locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2812,14 +2793,14 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 msgid "Curve:" -msgstr "" +msgstr "曲線:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "Cus&tom" msgstr "自訂(&T)" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "自訂篩選集" @@ -2846,6 +2827,10 @@ msgid "D&elete" msgstr "刪除(&E)" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "目錄比對(&I)" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "全部關閉(&I)" @@ -2859,7 +2844,7 @@ msgstr "對目錄的雙擊動作(&O):" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "D&uplicate" msgstr "複製(&U)" @@ -2875,8 +2860,8 @@ msgid "Data" msgstr "資料" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Data socket closed too early." msgstr "Data Socket 過早關閉." @@ -2979,28 +2964,20 @@ msgstr "刪除所選的檔案與目錄" #: ../../locales/../src/engine/engineprivate.cpp:365 -#, fuzzy, c-format +#, c-format msgid "Deleting \"%s\"" -msgstr "正在刪除目錄" +msgstr "正在刪除 \"%s\"" #: ../../locales/../src/engine/engineprivate.cpp:368 -#, fuzzy, c-format +#, c-format msgid "Deleting %u files from \"%s\"" -msgstr "正在刪除目錄" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "正在刪除目錄" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "尚未支援刪除多個不相關的目錄" +msgstr "正在刪除 %u 個檔案, 從 \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "正在刪除軟連結" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "桌面" @@ -3015,15 +2992,14 @@ #: ../../locales/../src/interface/import.cpp:58 #: ../../locales/../src/interface/sitemanager_dialog.cpp:758 -#, fuzzy msgid "Detected newer version of FileZilla" -msgstr "檢查新版的 FileZilla" +msgstr "有新版的 FileZilla" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 msgid "Dire&ctories" msgstr "目錄(&C)" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "方向" @@ -3031,13 +3007,13 @@ msgid "Directory" msgstr "目錄" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2776 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2783 #: ../../locales/../src/interface/resources/xrc/menus.xrc:524 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1770 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:365 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:76 -#: ../../locales/../src/interface/filelistctrl.cpp:463 -#: ../../locales/../src/interface/Mainfrm.cpp:2200 +#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/Mainfrm.cpp:2158 msgid "Directory comparison" msgstr "目錄比對" @@ -3049,11 +3025,11 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "包含記錄檔案的目錄不存在或是檔案名稱無效." -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "使用者中止目錄列表" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "目錄列表失敗" @@ -3061,12 +3037,12 @@ msgid "Directory listing filters" msgstr "目錄列表篩選器" -#: ../../locales/../src/engine/ControlSocket.cpp:197 -#, fuzzy, c-format +#: ../../locales/../src/engine/ControlSocket.cpp:199 +#, c-format msgid "Directory listing of \"%s\" successful" -msgstr "成功取得目錄列表" +msgstr "成功取得 \"%s\" 的目錄" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "成功取得目錄列表" @@ -3074,12 +3050,12 @@ msgid "Disa&ble all" msgstr "全部停用(&B)" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "要停用同步瀏覽並繼續變更遠端目錄?" -#: ../../locales/../src/interface/Mainfrm.cpp:640 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3089,23 +3065,23 @@ msgid "Disconnect from server" msgstr "從伺服器離線" -#: ../../locales/../src/engine/ControlSocket.cpp:79 -#: ../../locales/../src/engine/ControlSocket.cpp:881 -#: ../../locales/../src/engine/ControlSocket.cpp:986 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:879 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:881 -#: ../../locales/../src/interface/queue.cpp:325 +#: ../../locales/../src/engine/ControlSocket.cpp:81 +#: ../../locales/../src/engine/ControlSocket.cpp:884 +#: ../../locales/../src/engine/ControlSocket.cpp:989 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "已從伺服器離線" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 +#: ../../locales/../src/engine/ControlSocket.cpp:1020 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 #, c-format msgid "Disconnected from server: %s" msgstr "已從伺服器離線: %s" -#: ../../locales/../src/interface/queue.cpp:324 +#: ../../locales/../src/interface/queue.cpp:330 #: ../../locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "正在從先前伺服器離線" @@ -3122,18 +3098,13 @@ msgid "Do ¬ use default editor" msgstr "不使用預設編輯器(&N)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 -msgid "Do ¬hing" -msgstr "什麼都不做(&N)" - #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1816 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1871 -#, fuzzy msgid "Do the same with &all selected files already being edited" -msgstr "已在編輯所選的檔案:" +msgstr "對所有正在編輯的選取檔案執行相同操作(&A)" -#: ../../locales/../src/interface/Mainfrm.cpp:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1129 +#: ../../locales/../src/interface/Mainfrm.cpp:1151 msgid "Do you really want to close FileZilla?" msgstr "您真的要關閉 FileZilla?" @@ -3154,17 +3125,16 @@ msgid "Do you really want to delete the transfer queue?" msgstr "您真的要刪除傳輸佇列?" -#: ../../locales/../src/interface/Mainfrm.cpp:579 +#: ../../locales/../src/interface/Mainfrm.cpp:584 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "您真的要傳送 \"%s\" 到伺服器?" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 -#, fuzzy msgid "Do you want to reopen this file?" -msgstr "您真的要關閉 FileZilla?" +msgstr "您真的要重新開啟這個檔案嗎?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "文件" @@ -3184,7 +3154,7 @@ msgid "Download" msgstr "下載" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "下載限制(&L):" @@ -3198,9 +3168,9 @@ msgid "Download limit: none" msgstr "下載限制: 無" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3103 -#: ../../locales/../src/interface/search.cpp:518 -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 +#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:529 msgid "Download search results" msgstr "下載搜尋結果" @@ -3212,7 +3182,7 @@ msgid "Download selected files and directories" msgstr "下載所選的檔案與目錄" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../../locales/../src/interface/Mainfrm.cpp:961 #, c-format msgid "" "Download speed: %s/s\n" @@ -3225,26 +3195,18 @@ msgid "Downloading" msgstr "正在下載" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "正在下載 %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "尚未支援下載多個不相關的目錄" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "正在下載搜尋結果" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "正在下載更新..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:109 -#: ../../locales/../src/interface/QueueView.cpp:87 +#: ../../locales/../src/interface/LocalListView.cpp:105 +#: ../../locales/../src/interface/LocalTreeView.cpp:110 +#: ../../locales/../src/interface/QueueView.cpp:90 #: ../../locales/../src/interface/RemoteListView.cpp:102 #: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" @@ -3252,9 +3214,9 @@ "yet." msgstr "尚未實作在不同 FileZilla 程式實體間的拖曳功能." -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:115 -#: ../../locales/../src/interface/QueueView.cpp:100 +#: ../../locales/../src/interface/LocalListView.cpp:111 +#: ../../locales/../src/interface/LocalTreeView.cpp:116 +#: ../../locales/../src/interface/QueueView.cpp:103 #: ../../locales/../src/interface/RemoteListView.cpp:108 #: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." @@ -3284,11 +3246,10 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:415 #: ../../locales/../src/interface/resources/xrc/menus.xrc:459 #: ../../locales/../src/interface/resources/xrc/menus.xrc:482 -#, fuzzy msgid "E&xport..." -msgstr "匯出(&E)..." +msgstr "匯出(&X)..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "電子郵件:" @@ -3305,26 +3266,24 @@ "Edit the file with the configured editor and upload changes to the server." msgstr "使用組態好的編輯器編輯檔案並上傳變更回伺服器." -#: ../../locales/../src/interface/search.cpp:700 -#, fuzzy +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" -msgstr "尚未支援刪除多個不相關的目錄" +msgstr "不支援編輯目錄" -#: ../../locales/../src/interface/LocalListView.cpp:1582 -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Editing failed" msgstr "編輯失敗" -#: ../../locales/../src/interface/search.cpp:700 -#, fuzzy +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" -msgstr "正在下載搜尋結果" +msgstr "編輯搜尋結果" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Email:" msgstr "電子郵件:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2104 msgid "Empty command" msgstr "空的指令" @@ -3332,7 +3291,7 @@ msgid "Empty command." msgstr "空的指令." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "空目錄列表" @@ -3378,7 +3337,7 @@ msgid "Encryption details" msgstr "加密細節" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "End comparison and change sorting order?" msgstr "結束比對並變更排序?" @@ -3386,15 +3345,15 @@ msgid "Enter &custom command..." msgstr "輸入自訂指令(&C)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "輸入 0 則不設速限." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2098 msgid "Enter command" msgstr "輸入指令" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:567 msgid "Enter custom command" msgstr "輸入自訂指令" @@ -3408,11 +3367,11 @@ msgid "Enter filter name" msgstr "輸入篩選器名稱" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "輸入篩選集的名稱" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "輸入篩選集的新名稱" @@ -3426,7 +3385,6 @@ msgstr "進入所選的目錄" #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 -#, fuzzy msgid "" "Enter the address of the server.\n" "To specify the server protocol, prepend the host with the protocol " @@ -3448,19 +3406,19 @@ "它欄位的資料則會被此格式覆寫.\n" "\n" "支援的協定有:\n" -"- ftp:// 給一般的 FTP 用\n" -"- sftp:// 給 SSH 檔案傳輸協定用\n" -"- ftps:// 給透過 (隱含式) TLS 的 FTP 用\n" -"- ftpes:// 給透過 (外顯式) TLS 的 FTP 用" +"- ftp:// 用於一般的 FTP, 可加密\n" +"- sftp:// 用於 SSH 檔案傳輸協定,\n" +"- ftps:// 用於透過 (隱含式) TLS 的 FTP 以及\n" +"- ftpes:// 用於透過 (外顯式) TLS 的 FTP" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 -#, fuzzy, c-format +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 +#, c-format msgid "" "Enter the password for the file '%s'.\n" "The converted file will be protected with the same password." msgstr "" "輸入檔案 \"%s\" 的密碼.\n" -"請記得轉換後的檔案將沒有密碼保護." +"請記得轉換後的檔案將繼續使用該密碼保護." #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" @@ -3483,7 +3441,7 @@ msgid "Error importing" msgstr "匯入錯誤" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1900 msgid "Error loading queue" msgstr "載入佇列錯誤" @@ -3492,50 +3450,50 @@ #: ../../locales/../src/interface/bookmarks_dialog.cpp:695 #: ../../locales/../src/interface/bookmarks_dialog.cpp:732 #: ../../locales/../src/interface/bookmarks_dialog.cpp:778 -#: ../../locales/../src/interface/filter.cpp:213 -#: ../../locales/../src/interface/filter.cpp:970 +#: ../../locales/../src/interface/filter.cpp:214 +#: ../../locales/../src/interface/filter.cpp:971 #: ../../locales/../src/interface/import.cpp:106 #: ../../locales/../src/interface/import.cpp:293 -#: ../../locales/../src/interface/Options.cpp:243 -#: ../../locales/../src/interface/QueueView.cpp:1833 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 +#: ../../locales/../src/interface/Options.cpp:245 +#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/search.cpp:802 +#: ../../locales/../src/interface/search.cpp:821 #: ../../locales/../src/interface/sitemanager.cpp:16 -#: ../../locales/../src/interface/sitemanager.cpp:434 -#: ../../locales/../src/interface/sitemanager.cpp:515 -#: ../../locales/../src/interface/sitemanager.cpp:565 -#: ../../locales/../src/interface/sitemanager.cpp:664 -#: ../../locales/../src/interface/sitemanager.cpp:741 +#: ../../locales/../src/interface/sitemanager.cpp:436 +#: ../../locales/../src/interface/sitemanager.cpp:517 +#: ../../locales/../src/interface/sitemanager.cpp:567 +#: ../../locales/../src/interface/sitemanager.cpp:666 +#: ../../locales/../src/interface/sitemanager.cpp:743 #: ../../locales/../src/interface/sitemanager_dialog.cpp:751 #: ../../locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../locales/../src/interface/wrapengine.cpp:938 +#: ../../locales/../src/interface/wrapengine.cpp:933 msgid "Error loading xml file" msgstr "載入 XML 檔案錯誤" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1810 msgid "Error saving queue" msgstr "儲存佇列錯誤" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "Error starting program" msgstr "啟動程式錯誤" #: ../../locales/../src/interface/bookmarks_dialog.cpp:318 #: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1851 -#: ../../locales/../src/interface/sitemanager.cpp:609 -#: ../../locales/../src/interface/sitemanager.cpp:719 -#: ../../locales/../src/interface/sitemanager.cpp:773 +#: ../../locales/../src/interface/QueueView.cpp:1839 +#: ../../locales/../src/interface/sitemanager.cpp:611 +#: ../../locales/../src/interface/sitemanager.cpp:721 +#: ../../locales/../src/interface/sitemanager.cpp:775 #: ../../locales/../src/interface/sitemanager_dialog.cpp:830 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "寫入 XML 檔案錯誤" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:278 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/interface/StatusView.cpp:281 +#: ../../locales/../src/interface/StatusView.cpp:335 msgid "Error:" msgstr "錯誤:" @@ -3616,33 +3574,31 @@ msgstr "FTP 使用第二個連線來提供資料傳輸. 這些額外的連線可由兩種方法建立." #: ../../locales/../src/engine/server.cpp:20 -#, fuzzy msgid "FTPES - FTP over explicit TLS" -msgstr "FTPES - 透過外顯式 TLS/SSL 的 FTP" +msgstr "FTPES - 透過外顯式 TLS 的 FTP" #: ../../locales/../src/engine/server.cpp:19 -#, fuzzy msgid "FTPS - FTP over implicit TLS" -msgstr "FTPS - 透過隱含式 TLS/SSL 的 FTP" +msgstr "FTPS - 透過隱含式 TLS 的 FTP" -#: ../../locales/../src/interface/LocalListView.cpp:525 -#: ../../locales/../src/interface/LocalListView.cpp:601 -#: ../../locales/../src/interface/LocalListView.cpp:886 -#: ../../locales/../src/interface/LocalListView.cpp:1778 -#: ../../locales/../src/interface/LocalTreeView.cpp:846 -#: ../../locales/../src/interface/LocalTreeView.cpp:1099 +#: ../../locales/../src/interface/LocalListView.cpp:530 +#: ../../locales/../src/interface/LocalListView.cpp:606 +#: ../../locales/../src/interface/LocalListView.cpp:891 +#: ../../locales/../src/interface/LocalListView.cpp:1783 +#: ../../locales/../src/interface/LocalTreeView.cpp:843 +#: ../../locales/../src/interface/LocalTreeView.cpp:1096 #: ../../locales/../src/interface/viewheader.cpp:504 msgid "Failed to change directory" msgstr "無法變更目錄" -#: ../../locales/../src/interface/FileZilla.cpp:137 -#: ../../locales/../src/interface/FileZilla.cpp:152 -#: ../../locales/../src/interface/FileZilla.cpp:154 +#: ../../locales/../src/interface/FileZilla.cpp:158 +#: ../../locales/../src/interface/FileZilla.cpp:173 +#: ../../locales/../src/interface/FileZilla.cpp:175 #: ../../locales/../src/interface/settings/optionspage_language.cpp:51 msgid "Failed to change language" msgstr "無法變更語系" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "無法複製或移動站台" @@ -3650,143 +3606,147 @@ msgid "Failed to create backup copy of xml file" msgstr "無法建立 XML 檔案備份" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../locales/../src/interface/netconfwizard.cpp:809 msgid "Failed to create listen socket, aborting" msgstr "無法建立 Listen Socket, 正在中止." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4068 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4072 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4075 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4079 msgid "Failed to create listening socket for active mode transfer" msgstr "無法以主動傳輸模式建立 Socket" -#: ../../locales/../src/interface/LocalTreeView.cpp:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "無法取得 \"我的文件\" 路徑" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "無法取得桌面路徑" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:962 msgid "Failed to get peer address of control connection, connection closed." msgstr "無法取得 Peer Address 的控制連線, 連線關閉." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:969 msgid "Failed to get peer address of data connection, connection closed." msgstr "無法取得 Peer Address 的資料連線, 連線關閉." -#: ../../locales/../src/interface/context_control.cpp:80 +#: ../../locales/../src/interface/context_control.cpp:82 msgid "Failed to initialize FTP engine" msgstr "無法初始 FTP 引擎" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:388 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "無法初始 TLS." +#: ../../locales/../src/interface/FileZilla.cpp:109 +msgid "Failed to initialize networking" +msgstr "網路初始化失敗" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "無法載入面板選單, 是資源檔無效?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "無法載入私鑰: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2488 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "無法接續/寫入 \"%s\"" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2554 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "無法讀取 \"%s\"" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2522 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "無法寫入 \"%s\"" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "無法解析回傳路徑." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1021 msgid "Failed to receive data" msgstr "無法收到資料" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "無法取得目錄列表" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../locales/../src/interface/netconfwizard.cpp:738 msgid "Failed to retrieve external ip address, aborting" msgstr "無法取得外部 IP Address. 正在中止" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3777 msgid "Failed to retrieve external ip address, using local address" msgstr "無法取得外部 IP Address, 使用本地 IP Address" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3800 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3796 msgid "Failed to retrieve local ip address." msgstr "無法取得本地 IP Address." -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../locales/../src/interface/netconfwizard.cpp:714 msgid "Failed to retrieve local ip address. Aborting" msgstr "無法取得本地 IP Address. 正在中止" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:640 msgid "Failed to retrieve the external IP address." msgstr "無法取得外部 IP Address." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:325 msgid "Failed to send command." msgstr "無法傳送指令." -#: ../../locales/../src/interface/FileZilla.cpp:152 +#: ../../locales/../src/interface/FileZilla.cpp:173 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "無法設定語系為 %s (%s), 使用預設的系統語系." -#: ../../locales/../src/interface/FileZilla.cpp:130 +#: ../../locales/../src/interface/FileZilla.cpp:151 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "無法設定語系為 %s (%s), 使用預設的系統語系 (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:119 +#: ../../locales/../src/interface/FileZilla.cpp:140 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "無法設定語系為 %s (%s), 使用預設的系統語系." -#: ../../locales/../src/interface/FileZilla.cpp:154 +#: ../../locales/../src/interface/FileZilla.cpp:175 #: ../../locales/../src/interface/settings/optionspage_language.cpp:51 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "無法設定語系為 %s, 使用預設的系統語系" -#: ../../locales/../src/interface/FileZilla.cpp:126 +#: ../../locales/../src/interface/FileZilla.cpp:147 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "無法設定語系為 %s, 使用預設的系統語系 (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:116 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "無法設定語系為 %s, 使用預設的系統語系." -#: ../../locales/../src/interface/settings/optionspage.cpp:215 +#: ../../locales/../src/interface/settings/optionspage.cpp:206 msgid "Failed to validate settings" msgstr "無法確認設定有效" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "無法驗證同儕憑證" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "無法寫入檔案 %s" @@ -3819,9 +3779,9 @@ msgid "File Types" msgstr "檔案類別" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "File descriptor not a socket" -msgstr "" +msgstr "檔案描述不是 socket" #: ../../locales/../src/interface/import.cpp:95 msgid "File does not contain any importable data." @@ -3831,7 +3791,7 @@ msgid "File editing" msgstr "檔案編輯" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "檔案存在" @@ -3848,8 +3808,8 @@ msgstr "檔案列表" #: ../../locales/../src/interface/edithandler.cpp:1550 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/FileZilla.cpp:618 +#: ../../locales/../src/interface/FileZilla.cpp:703 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "找不到檔案" @@ -3858,38 +3818,38 @@ msgid "File search" msgstr "檔案搜尋" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "檔案傳輸被使用者中止" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:118 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "於 %s (全部 %s) 之後使用者中止檔案傳輸" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "檔案傳輸失敗" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "於 %s (全部 %s) 之後檔案傳輸失敗" -#: ../../locales/../src/engine/ControlSocket.cpp:130 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "檔案傳輸省略" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "檔案傳輸成功" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "檔案傳輸成功, 已傳輸 %s (全部 %s)" -#: ../../locales/../src/interface/Mainfrm.cpp:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1128 msgid "File transfers still in progress." msgstr "仍在處理檔案傳輸." @@ -3901,7 +3861,7 @@ msgid "File would transfer with binary data type." msgstr "檔案會以二進位資料型態傳輸." -#: ../../locales/../src/interface/FileZilla.cpp:407 +#: ../../locales/../src/interface/FileZilla.cpp:429 #: ../../locales/../src/interface/quickconnectbar.cpp:66 #: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" @@ -3913,11 +3873,11 @@ "properly." msgstr "FileZilla 現在可以測試您的組態以確認是否都已配置正確." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3478 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 msgid "FileZilla is already connected to a server." msgstr "FileZilla 已連線到伺服器." -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1433 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "變更語系需要重新啟動 FileZilla." @@ -3931,7 +3891,7 @@ #: ../../locales/../src/interface/edithandler.cpp:1084 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:274 +#: ../../locales/../src/interface/LocalListView.cpp:276 #: ../../locales/../src/interface/RemoteListView.cpp:373 #: ../../locales/../src/interface/search.cpp:108 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 @@ -3942,13 +3902,13 @@ msgid "Filename &filters..." msgstr "檔名篩選器(&F)..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2173 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2970 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2174 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "目錄 %s 下無法建構檔名 %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "檔名無效" @@ -3976,7 +3936,7 @@ msgstr "檔案正在編輯" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:275 +#: ../../locales/../src/interface/LocalListView.cpp:277 #: ../../locales/../src/interface/RemoteListView.cpp:374 #: ../../locales/../src/interface/search.cpp:110 msgid "Filesize" @@ -3986,7 +3946,7 @@ msgid "Filesize format" msgstr "檔案大小格式" -#: ../../locales/../src/interface/LocalListView.cpp:276 +#: ../../locales/../src/interface/LocalListView.cpp:278 #: ../../locales/../src/interface/RemoteListView.cpp:375 #: ../../locales/../src/interface/search.cpp:111 msgid "Filetype" @@ -4024,8 +3984,8 @@ msgid "Filter out items matching none of the following" msgstr "篩選掉不符合以下任何的項目" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Filter set already exists" msgstr "篩選集名稱已經存在" @@ -4039,31 +3999,28 @@ msgid "Filter validation failed" msgstr "篩選器確認失敗" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" -msgstr "%d 個檔案" +msgstr "尋找檔案(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" -msgstr "正在刪除目錄" +msgstr "尋找目錄(&I)" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" msgstr "數位指紋 (SHA-1):" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 -#, fuzzy msgid "Fingerprint (SHA-256):" -msgstr "數位指紋 (SHA-1):" +msgstr "數位指紋 (SHA-256):" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:868 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:979 msgid "Fingerprint:" msgstr "數位指紋:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:56 msgid "Firewall and router configuration wizard" msgstr "防火牆與路由器組態精靈" @@ -4077,7 +4034,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "為了可靠性您必須指定最少十個的連接埠範圍." -#: ../../locales/../src/interface/Options.cpp:242 +#: ../../locales/../src/interface/Options.cpp:244 msgid "" "For this session the default settings will be used. Any changes to the " "settings will not be saved." @@ -4091,7 +4048,7 @@ msgid "Force showing &hidden files" msgstr "強制顯示隱藏檔案(&H)" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:640 msgid "Force showing hidden files" msgstr "強制顯示隱藏檔案" @@ -4104,12 +4061,12 @@ msgstr "格式: 副檔名後接正確引用的指令和引數." #. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n -#: ../../locales/../src/interface/updater.cpp:646 +#: ../../locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" -msgstr "" +msgstr "發現了新的 %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "進一步的文件" @@ -4117,7 +4074,7 @@ msgid "General" msgstr "一般設定" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:508 msgid "General SOCKS server failure" msgstr "一般 SOCKS 伺服器失敗" @@ -4130,12 +4087,12 @@ msgid "Get external IP address from the following URL:" msgstr "從下列網址取得外部 IP Address:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "取得協助" -#: ../../locales/../src/interface/filter.cpp:353 -#: ../../locales/../src/interface/filter.cpp:409 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Given filterset name already exists, overwrite filter set?" msgstr "指定的篩選集名稱已經存在, 要複寫嗎?" @@ -4143,25 +4100,25 @@ msgid "Global bookmarks" msgstr "全域書籤" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" -msgstr "" +msgstr "GnuTLS 錯誤 %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" -msgstr "" +msgstr "GnuTLS 錯誤 %d 位於 %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" -msgstr "" +msgstr "GnuTLS 錯誤 %d 位於 %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" -msgstr "" +msgstr "GnuTLS 錯誤 %d: %s" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "GnuTLS:" @@ -4181,24 +4138,24 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 msgid "Hash:" -msgstr "Hash:" +msgstr "雜湊:" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:108 msgid "Hidden" msgstr "隱藏" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:904 -#: ../../locales/../src/interface/queue.cpp:991 +#: ../../locales/../src/interface/queue.cpp:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "高" -#: ../../locales/../src/interface/queue.cpp:906 -#: ../../locales/../src/interface/queue.cpp:993 +#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "最高" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "最高可用連接埠必須在 1024 到 65535 之間." @@ -4211,9 +4168,9 @@ msgid "Homepage:" msgstr "首頁:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Host is down" -msgstr "" +msgstr "主機已關閉" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 msgid "Host key fingerprint:" @@ -4223,11 +4180,11 @@ msgid "Host key mismatch" msgstr "主機金鑰不吻合" -#: ../../locales/../src/engine/server.cpp:157 +#: ../../locales/../src/engine/server.cpp:158 msgid "Host starts with '[' but no closing bracket found." msgstr "主機以 '[' 起始, 卻沒有找到對應的結束括弧." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:517 msgid "Host unreachable" msgstr "連不上主機" @@ -4246,7 +4203,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "ISO 8601 (例: 15:47) (&S)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:154 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "SOCKS4 Proxy 不支援 IPv6 位址" @@ -4284,13 +4241,13 @@ "administrator." msgstr "如果主機金鑰並非預期, 請聯絡該伺服器管理者." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "如果問題依舊持續, 則某些路由器或防火牆持續阻擋 FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4305,20 +4262,20 @@ "如果記錄檔案的大小已達上限, 就會在檔名的最後加上 \".1\" (這可能會覆寫舊的記錄" "檔) 並建立新的記錄檔案." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 msgid "" "If the symlink points to a directory, FileZilla can either delete the " "symbolic link or remove the contents of the linked directory." msgstr "" "如果軟連結是指向目錄, FileZilla 可以選擇刪除該軟連結或是被連結目錄的內容." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:648 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "如果問題依舊持續, 請聯絡您的路由器或防火牆製造商以解決問題." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:606 msgid "If this problem stays, please contact your router manufacturer." msgstr "如果問題依舊持續, 請聯絡您的路由器製造商." @@ -4340,9 +4297,8 @@ "如果使用時間戳記式的比對, 那只要兩個檔案的時間戳記差異不超過門檻就視為相同." #: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 -#, fuzzy msgid "If you change the language, you need to restart FileZilla." -msgstr "如果您變更了語系, 您應重新啟動 FileZilla." +msgstr "如果您變更了語系, 您需要重新啟動 FileZilla." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" @@ -4352,7 +4308,7 @@ "如果您按了測試, FileZilla 將會連線到 probe.filezilla-project.org 做些簡單的測" "試." -#: ../../locales/../src/interface/Mainfrm.cpp:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1150 msgid "If you close FileZilla, your changes will be lost." msgstr "如果關閉 FileZilla, 您所做的變更將會遺失." @@ -4372,7 +4328,7 @@ "try to change the default transfer mode." msgstr "如果在取得目錄列表或傳輸檔案時有問題, 您可以嘗試切換到預設傳輸模式." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "" "If you keep having problems with a specific server, the server itself or a " "remote router or firewall might be misconfigured. In this case try to toggle " @@ -4400,7 +4356,7 @@ "you're running FileZilla on." msgstr "如果您有用路由器, 請確定所有 FileZlla 使用的連接埠都可轉送." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:619 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4456,7 +4412,7 @@ "在被動模式 (建議大部分使用者使用) 下, FileZilla 會對伺服器要求一個連接埠以供" "連線. 無須額外的設定." -#: ../../locales/../src/engine/tlssocket.cpp:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4464,7 +4420,7 @@ "不完整的憑證鍊, 最上層的憑證並非是自我簽署的憑證中心 (Certificate Authority) " "憑證" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "不正確的密碼" @@ -4474,17 +4430,21 @@ "Please try again later." msgstr "無法取得 FileZilla 的最新版資訊. 請稍候再試." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:741 msgid "Initializing TLS..." msgstr "正在初始 TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 +msgid "Insecure algorithm!" +msgstr "不安全的演算法!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:725 msgid "Insecure server, it does not support FTP over TLS." msgstr "不安全的伺服器, 它不支援透過 TLS 的 FTP." -#: ../../locales/../src/engine/server.cpp:860 -#: ../../locales/../src/engine/server.cpp:881 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:861 +#: ../../locales/../src/engine/server.cpp:882 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "交談式" @@ -4492,31 +4452,29 @@ msgid "Interface" msgstr "介面" -#: ../../locales/../src/engine/socket.cpp:1062 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1038 msgid "Interrupted by signal" -msgstr "被使用者中斷" +msgstr "被信號量中斷" -#: ../../locales/../src/engine/ControlSocket.cpp:218 -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "被使用者中斷" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "無效的 Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "無效的 HTTP 回應" -#: ../../locales/../src/engine/socket.cpp:1050 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1026 msgid "Invalid argument passed" -msgstr "無效的回應碼" +msgstr "傳遞了無效參數" -#: ../../locales/../src/engine/ControlSocket.cpp:453 -#: ../../locales/../src/engine/ControlSocket.cpp:509 +#: ../../locales/../src/engine/ControlSocket.cpp:456 +#: ../../locales/../src/engine/ControlSocket.cpp:512 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4524,18 +4482,19 @@ "收到無效的字元序, 正在停用 UTF-8. 欲強制使用 UTF-8 請在站台管理員內選擇 " "UTF-8 選項." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "無效的區塊大小" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../locales/../src/interface/netconfwizard.cpp:375 +#: ../../locales/../src/interface/netconfwizard.cpp:384 +#: ../../locales/../src/interface/netconfwizard.cpp:392 +#: ../../locales/../src/interface/netconfwizard.cpp:409 msgid "Invalid data received" msgstr "收到無效的資料" -#: ../../locales/../src/interface/verifycertdialog.cpp:40 -#: ../../locales/../src/interface/verifycertdialog.cpp:53 +#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:55 msgid "Invalid date" msgstr "無效的日期" @@ -4544,7 +4503,7 @@ msgid "Invalid filename" msgstr "無效的檔名" -#: ../../locales/../src/engine/server.cpp:162 +#: ../../locales/../src/engine/server.cpp:163 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "無效的主機, 在結尾括弧後只能接冒號和連接埠號碼." @@ -4552,15 +4511,14 @@ msgid "Invalid input" msgstr "無效的輸入" -#: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:180 -#: ../../locales/../src/engine/server.cpp:190 +#: ../../locales/../src/engine/server.cpp:64 +#: ../../locales/../src/engine/server.cpp:181 +#: ../../locales/../src/engine/server.cpp:191 msgid "Invalid port given. The port has to be a value from 1 to 65535." msgstr "無效的連接埠. 連接埠應介於 1 到 65535 之間." -#: ../../locales/../src/engine/server.cpp:91 +#: ../../locales/../src/engine/server.cpp:92 #: ../../locales/../src/interface/quickconnectbar.cpp:121 -#, fuzzy msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4569,41 +4527,41 @@ "ftpes:// for FTP over TLS (explicit)." msgstr "" "指定了無效的協定. 有效的協定有:\n" -"ftp:// 給一般的 FTP 用,\n" -"sftp:// 給 SSH 檔案傳輸協定用,\n" -"ftps:// 給透過 (隱含式) TLS 的 FTP 用, 以及\n" -"ftpes:// 給透過 (外顯式) TLS 的 FTP 用." +"ftp:// 用於一般的 FTP, 可加密\n" +"sftp:// 用於 SSH 檔案傳輸協定,\n" +"ftps:// 用於透過 (隱含式) TLS 的 FTP 以及\n" +"ftpes:// 用於透過 (外顯式) TLS 的 FTP." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4219 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "無效的 Proxy 主機, 在結尾括弧後只能接冒號和連接埠號碼." -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "搜尋條件裡的無效正規表示法" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "無效的回應碼" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "無效的搜尋條件: %s" -#: ../../locales/../src/interface/sitemanager.cpp:409 -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:466 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:752 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:411 +#: ../../locales/../src/interface/sitemanager.cpp:428 +#: ../../locales/../src/interface/sitemanager.cpp:442 +#: ../../locales/../src/interface/sitemanager.cpp:448 +#: ../../locales/../src/interface/sitemanager.cpp:454 +#: ../../locales/../src/interface/sitemanager.cpp:468 +#: ../../locales/../src/interface/sitemanager.cpp:509 +#: ../../locales/../src/interface/sitemanager.cpp:527 +#: ../../locales/../src/interface/sitemanager.cpp:677 +#: ../../locales/../src/interface/sitemanager.cpp:683 +#: ../../locales/../src/interface/sitemanager.cpp:754 +#: ../../locales/../src/interface/sitemanager.cpp:760 msgid "Invalid site path" msgstr "無效的站台路徑" @@ -4611,28 +4569,27 @@ msgid "Invalid size in condition" msgstr "無效的檔案篩選大小" -#: ../../locales/../src/engine/server.cpp:132 +#: ../../locales/../src/engine/server.cpp:133 msgid "Invalid username given." msgstr "無效的使用者名稱." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Invalid value for ai_flags" -msgstr "" +msgstr "ai_flags 的值無效" -#: ../../locales/../src/engine/socket.cpp:1085 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Invalid value for hints" -msgstr "無效的輸入" +msgstr "提示的值無效" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "管轄國家:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "管轄地區:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "管轄州郡省份:" @@ -4640,7 +4597,7 @@ msgid "Keep directories on top" msgstr "保持目錄在最上方" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../locales/../src/interface/Mainfrm.cpp:644 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4658,13 +4615,12 @@ msgid "Key exchange:" msgstr "金鑰交換:" -#: ../../locales/../src/engine/server.cpp:858 -#: ../../locales/../src/engine/server.cpp:879 +#: ../../locales/../src/engine/server.cpp:859 +#: ../../locales/../src/engine/server.cpp:880 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1311 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1312 -#, fuzzy msgid "Key file" -msgstr "%d 個檔案" +msgstr "金鑰檔案" #: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "L&owest" @@ -4675,11 +4631,11 @@ msgid "Language" msgstr "語系" -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1433 msgid "Language changed" msgstr "語系已變更" -#: ../../locales/../src/interface/LocalListView.cpp:277 +#: ../../locales/../src/interface/LocalListView.cpp:279 #: ../../locales/../src/interface/RemoteListView.cpp:376 #: ../../locales/../src/interface/search.cpp:112 msgid "Last modified" @@ -4709,7 +4665,7 @@ msgid "Limit:" msgstr "限制:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "超過單行長度" @@ -4717,13 +4673,14 @@ msgid "Linked against" msgstr "連結的函式庫" +#: ../../locales/../src/interface/netconfwizard.cpp:276 #: ../../locales/../src/interface/netconfwizard.cpp:282 msgid "Listen socket closed" msgstr "Listen Socket 關閉" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:289 -#: ../../locales/../src/interface/StatusView.cpp:360 +#: ../../locales/../src/engine/logging.cpp:118 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" msgstr "列表:" @@ -4736,34 +4693,33 @@ msgid "Local" msgstr "本地端" -#: ../../locales/../src/engine/socket.cpp:1047 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1023 msgid "Local address in use" -msgstr "正在解析 %s 的 IP Address" +msgstr "本地位址正在使用中" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Local endpoint has been closed" -msgstr "" +msgstr "本地端點 (endpoint) 已關閉" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 msgid "Local file" msgstr "本地檔案" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "本地檔案不存在." -#: ../../locales/../src/interface/updater.cpp:370 -#: ../../locales/../src/interface/updater.cpp:462 +#: ../../locales/../src/interface/updater.cpp:371 +#: ../../locales/../src/interface/updater.cpp:463 #, c-format msgid "Local file is %s\n" msgstr "本地檔案為 %s\n" -#: ../../locales/../src/interface/manual_transfer.cpp:308 +#: ../../locales/../src/interface/manual_transfer.cpp:309 msgid "Local file is a directory instead of a regular file." msgstr "本地檔案是個目錄而非尋常的檔案." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "本地檔案並未使用有效的檔名." @@ -4775,7 +4731,7 @@ msgid "Local site:" msgstr "本地站台:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "城市名:" @@ -4783,12 +4739,16 @@ msgid "Log file" msgstr "記錄檔案" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:904 +msgid "Logged in" +msgstr "記錄" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "記錄" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:799 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4796,13 +4756,13 @@ "登入資料包含非 ASCII 字元且伺服器可能不認得 UTF-8. 因為使用 Proxy, 所以無法回" "復成本地字集." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:806 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." msgstr "登入資料包含非 ASCII 字元且伺服器可能不認得 UTF-8. 嘗試使用本地字集." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:833 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "登入程序已完全執行, 但仍未登入. 正在中止." @@ -4818,17 +4778,17 @@ msgstr "" "登入型式僅能與 FTP 網址一起使用. 引數必須是 \"%s\" 或是 \"%s\" 兩者之一" -#: ../../locales/../src/interface/queue.cpp:899 -#: ../../locales/../src/interface/queue.cpp:986 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "低" -#: ../../locales/../src/interface/queue.cpp:897 -#: ../../locales/../src/interface/queue.cpp:984 +#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "最低" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "最低的可用連接埠介於 1024 到 65535 之間." @@ -4840,44 +4800,44 @@ msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "請確認可以找到檔案並且內容為滿足格式的 XML 文件." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 #, c-format msgid "Malformed chunk data: %s" msgstr "格式有誤的區塊資料: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "格式有誤的標頭: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 msgid "Malformed reply, server not sending proper line endings" msgstr "格式有誤的回應, 伺服器未傳送正確的換行格式" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../locales/../src/interface/manual_transfer.cpp:296 -#: ../../locales/../src/interface/manual_transfer.cpp:302 -#: ../../locales/../src/interface/manual_transfer.cpp:308 -#: ../../locales/../src/interface/manual_transfer.cpp:312 -#: ../../locales/../src/interface/manual_transfer.cpp:319 -#: ../../locales/../src/interface/manual_transfer.cpp:325 -#: ../../locales/../src/interface/manual_transfer.cpp:331 -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:297 +#: ../../locales/../src/interface/manual_transfer.cpp:303 +#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:313 +#: ../../locales/../src/interface/manual_transfer.cpp:320 +#: ../../locales/../src/interface/manual_transfer.cpp:326 +#: ../../locales/../src/interface/manual_transfer.cpp:332 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Manual transfer" msgstr "手動傳輸" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "比對以下所有項目" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "符合以下任何項目" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "不符合以下任何項目" @@ -4885,13 +4845,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "最大同時傳輸數目(&T):" -#: ../../locales/../src/engine/socket.cpp:1089 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1065 msgid "Memory allocation failure" -msgstr "篩選器確認失敗" +msgstr "分配記憶體失敗" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/Mainfrm.cpp:383 +#: ../../locales/../src/interface/Mainfrm.cpp:1743 msgid "Message log" msgstr "訊息記錄" @@ -4899,10 +4858,9 @@ msgid "Message log position" msgstr "訊息記錄位置" -#: ../../locales/../src/engine/socket.cpp:1072 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Message too large" -msgstr "訊息記錄" +msgstr "訊息太長" #: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 msgid "MiB" @@ -4920,15 +4878,15 @@ msgid "Move &up" msgstr "上移(&U)" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "我的電腦" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "我的文件" -#: ../../locales/../src/interface/sitemanager.cpp:269 +#: ../../locales/../src/interface/sitemanager.cpp:271 #: ../../locales/../src/interface/sitemanager_dialog.cpp:739 #: ../../locales/../src/interface/sitemanager_dialog.cpp:741 msgid "My Sites" @@ -4937,7 +4895,7 @@ #: ../../locales/../src/interface/settings/optionspage_themes.cpp:161 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:164 msgid "N/a" -msgstr "N/a" +msgstr "不可用" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" @@ -4949,7 +4907,7 @@ msgstr "名稱已存在" #: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 +#: ../../locales/../src/interface/sitemanager.cpp:695 msgid "Name of bookmark already exists." msgstr "書籤名稱已存在" @@ -4959,13 +4917,13 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 msgid "Natural sort" -msgstr "" +msgstr "自然排序" #: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" msgstr "需要輸入篩選器名稱" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "需要輸入有效的遠端路徑" @@ -4973,18 +4931,18 @@ msgid "Need to specify a character encoding" msgstr "需要指定字元編碼" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Neither nodename nor servname provided, or not known" -msgstr "" +msgstr "未提供, 或不知道節點名稱或服務名稱" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "" "Network host does not have any network addresses in the requested address " "family" -msgstr "" +msgstr "在請求的位址家族中, 網路主機沒有任何網路位址" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:514 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Network unreachable" msgstr "連不上網路" @@ -5000,7 +4958,7 @@ msgid "New &tab" msgstr "新頁籤(&T)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2818 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "新增書籤(&M)" @@ -5019,14 +4977,14 @@ #: ../../locales/../src/interface/bookmarks_dialog.cpp:535 #: ../../locales/../src/interface/bookmarks_dialog.cpp:555 #: ../../locales/../src/interface/bookmarks_dialog.cpp:790 -#: ../../locales/../src/interface/sitemanager.cpp:693 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2180 +#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 msgid "New bookmark" msgstr "新書籤" -#: ../../locales/../src/interface/LocalTreeView.cpp:1126 -#: ../../locales/../src/interface/RemoteListView.cpp:1310 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 +#: ../../locales/../src/interface/LocalTreeView.cpp:1123 +#: ../../locales/../src/interface/RemoteListView.cpp:1306 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 msgid "New directory" msgstr "新目錄" @@ -5043,9 +5001,9 @@ msgid "New folder" msgstr "新資料夾" -#: ../../locales/../src/interface/sitemanager.cpp:583 -#: ../../locales/../src/interface/sitemanager.cpp:595 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:597 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 msgid "New site" msgstr "新站台" @@ -5053,24 +5011,23 @@ msgid "Next to the transfer queue" msgstr "在傳輸佇列的旁邊" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "否" -#: ../../locales/../src/engine/socket.cpp:1091 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1067 msgid "No address associated with nodename" -msgstr "沒有程式關聯到檔案類型" +msgstr "節點名稱沒有關聯位址" #: ../../locales/../src/interface/export.cpp:26 msgid "No category to export selected" msgstr "沒有選定要匯出的分類目錄" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2104 msgid "No command given, aborting." msgstr "沒有給定指令, 正在中止." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3751 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3749 msgid "No external IP address set, trying default." msgstr "沒有外部 IP Address, 正在嘗試使用預設值." @@ -5082,9 +5039,9 @@ msgid "No filter name given" msgstr "沒有給定篩選器的名稱" -#: ../../locales/../src/engine/server.cpp:77 -#: ../../locales/../src/engine/server.cpp:174 -#: ../../locales/../src/engine/server.cpp:199 +#: ../../locales/../src/engine/server.cpp:78 +#: ../../locales/../src/engine/server.cpp:175 +#: ../../locales/../src/engine/server.cpp:200 msgid "No host given, please enter a host." msgstr "未填入主機, 請輸入主機名稱." @@ -5092,37 +5049,33 @@ msgid "No images available" msgstr "沒有可用的圖示" -#: ../../locales/../src/interface/QueueView.cpp:2977 -msgid "No more files in the queue!" -msgstr "佇列裡已無檔案!" - -#: ../../locales/../src/interface/filter.cpp:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "No name for the filterset given." msgstr "沒有給定篩選集的名稱." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "沒有程式關聯到檔案類型" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "沒有程式關聯到編輯副檔名為 \"%s\" 的檔案." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "No route to host" -msgstr "" +msgstr "無法連通主機" #: ../../locales/../src/interface/search.cpp:255 msgid "No search results" msgstr "沒有搜尋結果" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "沒有可用的站台" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:485 msgid "No supported SOCKS5 auth method" msgstr "沒有支援的 SOCKS5 認證方法" @@ -5132,7 +5085,7 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1825 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1844 -#: ../../locales/../src/interface/verifycertdialog.cpp:59 +#: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "無" @@ -5140,38 +5093,37 @@ msgid "None selected yet" msgstr "尚未選取" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Nonrecoverable failure in name resolution" -msgstr "" +msgstr "名稱解析中有無法復原的錯誤" #: ../../locales/../src/interface/resources/xrc/settings.xrc:962 -#: ../../locales/../src/engine/server.cpp:854 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:153 -#: ../../locales/../src/interface/manual_transfer.cpp:178 -#: ../../locales/../src/interface/manual_transfer.cpp:539 -#: ../../locales/../src/interface/queue.cpp:902 -#: ../../locales/../src/interface/queue.cpp:989 +#: ../../locales/../src/engine/server.cpp:855 +#: ../../locales/../src/engine/server.cpp:876 +#: ../../locales/../src/interface/manual_transfer.cpp:154 +#: ../../locales/../src/interface/manual_transfer.cpp:179 +#: ../../locales/../src/interface/manual_transfer.cpp:540 +#: ../../locales/../src/interface/queue.cpp:909 +#: ../../locales/../src/interface/queue.cpp:996 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 msgid "Normal" msgstr "一般" #: ../../locales/../src/interface/queueview_failed.cpp:312 #: ../../locales/../src/interface/queueview_failed.cpp:337 -#, fuzzy msgid "Not all items could be requeued for transfer." -msgstr "並非所有項目皆可要求檢視/編輯." +msgstr "並非所有項目都可被重新佇列以傳輸." -#: ../../locales/../src/interface/state.cpp:179 -#: ../../locales/../src/interface/state.cpp:482 +#: ../../locales/../src/interface/state.cpp:180 +#: ../../locales/../src/interface/state.cpp:483 msgid "Not connected" msgstr "未連線" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "未連線到任何伺服器" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:556 msgid "Not connected to any server." msgstr "未連線到任何伺服器." @@ -5179,11 +5131,11 @@ msgid "Not connected." msgstr "未連線." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Not initialized, need to call WSAStartup" -msgstr "" +msgstr "尚未初始化, 需要呼叫 WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../../locales/../src/interface/Mainfrm.cpp:642 msgid "Note that this feature is only supported using the FTP protocol." msgstr "請注意這個功能只在使用 FTP 協定時才支援." @@ -5224,22 +5176,21 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2106 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2181 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2564 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2710 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2968 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3180 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3249 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3445 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3614 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3670 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2717 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3187 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3256 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3452 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3621 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3677 #: ../../locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" msgstr "確認" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -#, fuzzy msgid "OS version:" -msgstr "版本:" +msgstr "作業系統版本:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" @@ -5247,7 +5198,7 @@ "well as the fallback mode if enabled." msgstr "在接下來的幾個頁面裡將要設定所選的傳輸模式以及回復模式 (如果有啟用)." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:849 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "一次" @@ -5293,8 +5244,8 @@ #: ../../locales/../src/interface/edithandler.cpp:1616 #: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1695 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/LocalListView.cpp:1712 msgid "Opening failed" msgstr "開啟失敗" @@ -5312,44 +5263,41 @@ msgstr "開啟目錄列表篩選器對話框. 按右鍵切換篩選器." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 -#, fuzzy msgid "Operating System:" -msgstr "作業系統" +msgstr "作業系統:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "Operation already in progress" -msgstr "" +msgstr "操作已經在進行" -#: ../../locales/../src/engine/socket.cpp:1049 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1025 msgid "Operation in progress" -msgstr "仍在處理檔案傳輸." +msgstr "操作正在進行" -#: ../../locales/../src/engine/socket.cpp:1070 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Operation not supported" -msgstr "指令未支援" +msgstr "不支援該操作" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "組織:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:680 msgid "Other SFTP options" -msgstr "" +msgstr "其他 SFTP 選項" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Other system error" -msgstr "" +msgstr "其他系統錯誤" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "其它:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1029 +#: ../../locales/../src/engine/socket.cpp:1030 msgid "Out of memory" -msgstr "" +msgstr "記憶體不足" #: ../../locales/../src/interface/resources/xrc/settings.xrc:63 msgid "Overview" @@ -5395,10 +5343,10 @@ msgid "Overwrite if different si&ze or source newer" msgstr "如果大小不同或來源較新就覆寫(&Z)" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" -msgstr "" +msgstr "自己的建置類型: %s\n" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 msgid "Owner permissions" @@ -5420,22 +5368,22 @@ msgid "P&roxy host:" msgstr "Proxy 主機 (&R):" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:509 msgid "PORT command tainted by router or firewall." msgstr "PORT 指令已被路由器或防火牆影響." #: ../../locales/../src/interface/resources/xrc/settings.xrc:202 msgid "Pa&ssive (recommended)" -msgstr "被動模式(推薦)(&S)" +msgstr "被動模式 (推薦)(&S)" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2313 msgid "Parameter not a valid URL" msgstr "參數不是有效的網址" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" -msgstr "" +msgstr "解析版本資訊的 %d 個位元組.\n" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2472 #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 @@ -5452,13 +5400,13 @@ msgid "Passive mode" msgstr "被動模式" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:625 +#: ../../locales/../src/interface/netconfwizard.cpp:636 msgid "Passive mode has been set as default transfer mode." msgstr "被動模式已設定為預設傳輸模式." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "需要密碼" @@ -5467,13 +5415,13 @@ msgid "Path" msgstr "檔案路徑" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2219 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3053 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2220 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "目錄 %s 下無法建構子目錄路徑 %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2313 +#: ../../locales/../src/interface/Mainfrm.cpp:2271 msgid "Path not found:" msgstr "找不到路徑:" @@ -5492,11 +5440,10 @@ msgid "Permission" msgstr "權限" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1022 +#: ../../locales/../src/engine/socket.cpp:1031 msgid "Permission denied" -msgstr "權限" +msgstr "權限被拒" #: ../../locales/../src/interface/RemoteListView.cpp:377 #: ../../locales/../src/interface/search.cpp:113 @@ -5507,7 +5454,7 @@ msgid "Platform:" msgstr "平台:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5521,11 +5468,11 @@ "outgoing connection to arbitrary ports." msgstr "請配置防火牆或路由器讓 FileZilla 可以建立任意連接埠的向外連線." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:647 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "請在您的路由器上關閉類似 \"DMZ mode\" 或是 \"game mode\" 之類的設定." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5558,7 +5505,7 @@ msgid "Please enter a new name for the copied filter." msgstr "請輸入欲複製篩選器的新名稱." -#: ../../locales/../src/interface/filter.cpp:389 +#: ../../locales/../src/interface/filter.cpp:390 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "請輸入篩選集 \"%s\" 的新名稱" @@ -5588,24 +5535,12 @@ msgid "Please enter a password for this server:" msgstr "請輸入此伺服器的密碼:" -#: ../../locales/../src/interface/QueueView.cpp:2112 -msgid "" -"Please enter a path and executable to run.\n" -"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" -"You can also optionally specify program arguments." -msgstr "" -"請輸入要執行的路徑與執行檔.\n" -"就像 MS Windows 下的 c:\\somePath\\file.exe 或是 Unix 下的 /somePath/file 這" -"樣.\n" -"您也可以指定一些程式參數." - #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46 -#, fuzzy msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." -msgstr "請輸入 5 到 9999 秒之間的逾時時間, 或是輸入 0 停用逾時時間." +msgstr "請輸入 10 到 9999 秒之間的逾時時間, 或是輸入 0 停用逾時時間." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "請輸入這篩選集的唯一名稱:" @@ -5613,11 +5548,11 @@ msgid "Please enter a username for this server:" msgstr "請輸入此伺服器的使用者名稱:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "請輸入有效的連接埠範圍." -#: ../../locales/../src/interface/netconfwizard.cpp:176 +#: ../../locales/../src/interface/netconfwizard.cpp:168 msgid "Please enter an URL where to get your external address from" msgstr "請輸入可以取得外部 IP Address 的網址." @@ -5627,7 +5562,7 @@ msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "請輸入大於等於 0 %s/s 的上傳速度限制." -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:567 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5635,14 +5570,27 @@ "請直接輸入 FTP 指令.\n" "使用直接的 FTP 指令會清除目錄快取." -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../locales/../src/interface/QueueView.cpp:2098 +msgid "" +"Please enter the complete path of a program and its arguments. This command " +"will be executed when the queue has finished processing.\n" +"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n" +"You need to properly quote commands and their arguments if they contain " +"spaces." +msgstr "" +"請輸入要執行的路徑與執行檔.\n" +"就像 MS Windows 下的 c:\\somePath\\file.exe 或是 Unix 下的 /somePath/file 這" +"樣.\n" +"您也可以指定一些程式參數." + +#: ../../locales/../src/interface/LocalListView.cpp:902 +#: ../../locales/../src/interface/LocalTreeView.cpp:1120 +#: ../../locales/../src/interface/RemoteListView.cpp:1293 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 msgid "Please enter the name of the directory which should be created:" msgstr "請輸入欲建立的目錄名稱:" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "請輸入欲建立的檔案名稱:" @@ -5650,12 +5598,12 @@ msgid "Please enter username and password for this server:" msgstr "請輸入此伺服器的使用者名稱與密碼:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "請輸入您的外部 IP Address" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "" "Please enter your external IP address on the active mode page of this " "wizard. In case you have a dynamic address or don't know your external " @@ -5670,7 +5618,7 @@ "prevent successful FTP connections." msgstr "錯誤的組態會阻礙 FTP 連線成功, 所以請仔細地跟著指令操作." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:641 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5678,11 +5626,11 @@ "請確認已允許 FileZilla 建立對外連線以及確認您已正確鍵入位址解析器的 IP " "Address." -#: ../../locales/../src/interface/FileZilla.cpp:136 +#: ../../locales/../src/interface/FileZilla.cpp:157 msgid "Please make sure the requested locale is installed on your system." msgstr "請確認要求的語系地域 (Locale) 有安裝進您的系統裡." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../locales/../src/interface/netconfwizard.cpp:618 msgid "" "Please make sure your router is using the latest available firmware. " "Furthermore, your router has to be configured properly. You will have to use " @@ -5704,7 +5652,7 @@ "火牆認為是只有特洛依木馬或是其他惡意軟體所使用的連接埠. 這可能會引發錯誤的警" "告, 但您可以放心地略過." -#: ../../locales/../src/interface/Mainfrm.cpp:677 +#: ../../locales/../src/interface/Mainfrm.cpp:682 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5719,7 +5667,7 @@ msgstr "" "請留意若您重新連線過於頻繁或是在太短的時間間隔內, 部份伺服器可能會擋掉您." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../locales/../src/interface/netconfwizard.cpp:594 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5728,7 +5676,7 @@ "在變更網路環境後, 或是假如先前正確運作的伺服器突然發生問題時, 請您應再次執行" "精靈." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "請選擇動作:" @@ -5763,7 +5711,7 @@ msgid "Please select the new attributes for the selected files." msgstr "請為選取的檔案選擇新屬性." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:605 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5776,30 +5724,28 @@ "\"game mode\" 下執行您的路由器. 得停用像是協定檢查或是特定協定修正之類的東西" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 -#, fuzzy msgid "Positio&n of the message log:" -msgstr "訊息記錄的顯示位置(&P)" +msgstr "訊息日誌的位置(&N):" -#: ../../locales/../src/interface/verifycertdialog.cpp:223 -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Postal code:" msgstr "郵遞區號:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 msgid "Pre&allocate space before downloading" -msgstr "" +msgstr "在下載之前預先分配空間(&A)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 -#, fuzzy msgid "Preallocation" -msgstr "方向" +msgstr "預先分配" -#: ../../locales/../src/interface/sitemanager.cpp:268 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../../locales/../src/interface/sitemanager.cpp:270 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "預先定義的站台" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:681 msgid "Preserving file timestamps" msgstr "保留檔案時間戳記" @@ -5807,7 +5753,7 @@ msgid "Preview:" msgstr "預覽:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "主要連線與資料連線的憑證未相符." @@ -5823,7 +5769,7 @@ msgid "Prioritize directories (default)" msgstr "目錄優先(預設)" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "優先權" @@ -5853,24 +5799,23 @@ msgid "Process &Queue" msgstr "處理佇列(&Q)" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1027 msgid "Process file table overflow" -msgstr "" +msgstr "處理程序檔案表溢位" #. @translator: Example: Processed 5 files in 1 directory #: ../../locales/../src/interface/recursive_operation_status.cpp:110 #, c-format msgid "Processed %s in %s." -msgstr "" +msgstr "已處理 %s 個檔案, %s 個目錄." -#: ../../locales/../src/engine/socket.cpp:1056 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1032 msgid "Protocol not supported" -msgstr "指令未支援" +msgstr "不支援該協定" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "Protocol not supported on given socket type" -msgstr "" +msgstr "指定的 Socket 類型不支援該協定" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" @@ -5885,36 +5830,40 @@ msgid "Proxy &user:" msgstr "Proxy 使用者 (&U):" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:495 msgid "Proxy authentication failed" msgstr "Proxy 認證失敗" -#: ../../locales/../src/engine/transfersocket.cpp:103 -#: ../../locales/../src/engine/transfersocket.cpp:115 +#: ../../locales/../src/engine/transfersocket.cpp:105 +#: ../../locales/../src/engine/transfersocket.cpp:117 #, c-format msgid "Proxy handshake failed: %s" msgstr "Proxy 交握失敗: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4213 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Proxy 主機以 \"[\" 起始, 卻沒有找到對應的結束括弧." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:353 #, c-format msgid "Proxy reply: %s" msgstr "Proxy 回應: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:536 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Proxy 請求失敗。Proxy 回傳: %s" + +#: ../../locales/../src/engine/proxy.cpp:408 #, c-format msgid "Proxy request failed: %s" msgstr "Proxy 請求失敗: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:560 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Proxy 請求失敗: CONNECT 的回應裡有未知的位址型態" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4242 msgid "Proxy set but proxy host or port invalid" msgstr "已設定 Proxy, 但 Proxy 主機或是連接埠的設定無效" @@ -5930,7 +5879,7 @@ msgid "Public permissions" msgstr "公開權限" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3038 msgid "Queue has been fully processed" msgstr "佇列已處理完成" @@ -5949,16 +5898,16 @@ msgid "Queue: empty" msgstr "佇列: 空" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:441 msgid "Queued files" msgstr "等候的檔案" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "等候:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 -msgid "R&eboot system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:402 +msgid "R&eboot system once" msgstr "重新啟動系統(&E)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 @@ -5970,7 +5919,7 @@ msgid "R&eset and requeue selected files" msgstr "重設與重排所選的檔案(&E)" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:581 msgid "Raw FTP command" msgstr "直接的 FTP 指令" @@ -5987,7 +5936,7 @@ msgid "Re&name" msgstr "更名(&N)" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:600 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6001,44 +5950,44 @@ msgid "Read-only" msgstr "唯讀" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1018 msgid "Really cancel current operation?" msgstr "真的要取消當前的操作?" -#: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:761 +#: ../../locales/../src/interface/RemoteListView.cpp:1382 +#: ../../locales/../src/interface/search.cpp:740 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" "Really delete %d directories with their contents from the server?" msgstr[0] "真的要從伺服器刪除 %d 個目錄與其內容嗎?" -#: ../../locales/../src/interface/RemoteListView.cpp:1384 -#: ../../locales/../src/interface/search.cpp:759 +#: ../../locales/../src/interface/RemoteListView.cpp:1380 +#: ../../locales/../src/interface/search.cpp:738 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" msgstr[0] "真的要從伺服器刪除 %d 個檔案嗎?" -#: ../../locales/../src/interface/RemoteListView.cpp:1391 -#: ../../locales/../src/interface/search.cpp:765 +#: ../../locales/../src/interface/RemoteListView.cpp:1387 +#: ../../locales/../src/interface/search.cpp:744 #, c-format msgid "Really delete %s and %s from the server?" msgstr "真的要從伺服器刪除 %s 與 %s 嗎?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 msgid "Really delete all selected files and/or directories from the server?" msgstr "真的要從伺服器刪除所有選擇的檔案/目錄?" -#: ../../locales/../src/engine/local_filesys.cpp:129 +#: ../../locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "真的要從您的電腦刪除所有選擇的檔案/目錄?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "原因" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3031 msgid "Reboot now" msgstr "立即重開機" @@ -6046,40 +5995,38 @@ msgid "Rec&urse into subdirectories" msgstr "包含子目錄(&U)" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" -msgstr "" +msgstr "收到伺服器的 TLS 警告: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2965 +#: ../../locales/../src/engine/directorylistingparser.cpp:2957 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "已取得目錄清單, 該清單似乎是以 EBCDIC 編碼而成." -#: ../../locales/../src/engine/directorylistingparser.cpp:1993 -#: ../../locales/../src/engine/directorylistingparser.cpp:2007 +#: ../../locales/../src/engine/directorylistingparser.cpp:1992 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 msgid "Received a line exceeding 10000 characters, aborting." msgstr "單行接收超過 10000 字元, 正在中止." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 +#: ../../locales/../src/interface/netconfwizard.cpp:1007 #: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Received data tainted" msgstr "收到的資料遭受影響." -#: ../../locales/../src/interface/updater.cpp:521 -#, fuzzy +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" -msgstr "以特定字元取代無效字元, 特定字元為(&R):" +msgstr "在版本資訊中收到了無效字元" -#: ../../locales/../src/engine/tlssocket.cpp:200 -#, fuzzy, c-format +#: ../../locales/../src/engine/tlssocket.cpp:228 +#, c-format msgid "Received unknown TLS alert %d from the server" -msgstr "真的要從伺服器刪除 %d 個檔案嗎?" +msgstr "收到了伺服器的未知 TLS 警告 %d" -#: ../../locales/../src/interface/updater.cpp:514 -#, fuzzy +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" -msgstr "將版本資訊列印到標準輸出 (stdout) 並離開" +msgstr "接收的版本資訊過長" #: ../../locales/../src/interface/clearprivatedata.cpp:77 msgid "" @@ -6099,26 +6046,24 @@ msgstr "重新連線到先前的伺服器" #: ../../locales/../src/interface/recursive_operation_status.cpp:92 -#, fuzzy msgid "Recursively adding files to queue." -msgstr "加入檔案到佇列(&A)" +msgstr "遞歸加入檔案到佇列。" #: ../../locales/../src/interface/recursive_operation_status.cpp:98 msgid "Recursively changing permissions." -msgstr "" +msgstr "遞歸修改權限." #: ../../locales/../src/interface/recursive_operation_status.cpp:95 -#, fuzzy msgid "Recursively deleting files and directories." -msgstr "更名所選的檔案和目錄" +msgstr "遞歸刪除檔案和資料夾。" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "重導至無效或不支援的 URI: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:656 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "重導至無效或不支援的位址: %s" @@ -6128,7 +6073,7 @@ msgid "Refresh the file and folder lists" msgstr "重新整理檔案與資料夾列表" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "記憶密碼?" @@ -6136,20 +6081,20 @@ msgid "Remote" msgstr "遠端" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "遠端憑證未被信任." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "遠端檔案" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3099 -#: ../../locales/../src/interface/search.cpp:383 -#: ../../locales/../src/interface/search.cpp:388 -#: ../../locales/../src/interface/search.cpp:397 -#: ../../locales/../src/interface/search.cpp:402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3106 +#: ../../locales/../src/interface/search.cpp:386 +#: ../../locales/../src/interface/search.cpp:391 +#: ../../locales/../src/interface/search.cpp:400 +#: ../../locales/../src/interface/search.cpp:405 msgid "Remote file search" msgstr "遠端檔案搜尋" @@ -6185,11 +6130,11 @@ msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "無法解析遠端路徑. 請確定這是有效的絕對路徑." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "遠端路徑無法解析." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "遠端路徑處理:" @@ -6229,26 +6174,26 @@ msgid "Rename selected files and directories" msgstr "更名所選的檔案和目錄" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2418 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3392 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "\"%s\" 更名為 \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "回報臭蟲與功能請求" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:399 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "請求失敗 - 客戶端未執行 identd (或是未能由伺服器端連上)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:402 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "請求失敗 - 客戶端 identd 無法確認使用者 ID 字串" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:396 msgid "Request rejected or failed" msgstr "請求被拒或失敗" @@ -6264,28 +6209,28 @@ msgid "Reset and requeue &all" msgstr "重設與重排所有檔案(&A)" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Resolved protocol is unknown" -msgstr "" +msgstr "解析的協定為未知協定" -#: ../../locales/../src/engine/ControlSocket.cpp:1079 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:457 +#: ../../locales/../src/engine/ControlSocket.cpp:1082 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 #, c-format msgid "Resolving address of %s" msgstr "正在解析 %s 的 IP Address" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Resource temporarily unavailable" -msgstr "" +msgstr "資源暫時不可用" -#: ../../locales/../src/engine/logging.cpp:112 -#: ../../locales/../src/interface/netconfwizard.cpp:410 -#: ../../locales/../src/interface/StatusView.cpp:283 -#: ../../locales/../src/interface/StatusView.cpp:343 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/netconfwizard.cpp:423 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "回應:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "結果:" @@ -6302,19 +6247,19 @@ "ending format than the client." msgstr "如果伺服器使用和客戶端不同的換行格式時, 續傳文字檔案可能會造成問題." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:928 -#, fuzzy, c-format +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1268 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 +#, c-format msgid "Retrieving directory listing of \"%s\"..." -msgstr "正在取得目錄列表..." +msgstr "正在取得 \"%s\" 的目錄列表..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1267 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:925 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1265 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "正在取得目錄列表..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3766 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3764 +#: ../../locales/../src/interface/netconfwizard.cpp:727 #, c-format msgid "Retrieving external IP address from %s" msgstr "正從 %s 取得外部 IP Address" @@ -6327,16 +6272,16 @@ msgid "S&how the Site Manager on startup" msgstr "啟動時顯示站台管理員(&H)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 -msgid "S&hutdown system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:406 +msgid "S&hutdown system once" msgstr "系統關機(&H)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "停止(&T)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 -msgid "S&uspend system" +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 +msgid "S&uspend system once" msgstr "系統待機(&U)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 @@ -6351,7 +6296,7 @@ msgid "SOC&KS 4" msgstr "SOCKS 4 (&K)" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:178 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 Proxy 會連線到: %s" @@ -6360,33 +6305,33 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:863 msgid "Save settings?" msgstr "儲存設定?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 +#: ../../locales/../src/interface/manual_transfer.cpp:437 #: ../../locales/../src/interface/sitemanager_dialog.cpp:978 msgid "Saving of password has been disabled by your system administrator." msgstr "儲存密碼的功能已被您的系統管理員停用." -#: ../../locales/../src/interface/manual_transfer.cpp:438 +#: ../../locales/../src/interface/manual_transfer.cpp:439 #: ../../locales/../src/interface/sitemanager_dialog.cpp:980 msgid "Saving of passwords has been disabled by you." msgstr "儲存密碼的功能已被您停用." -#: ../../locales/../src/interface/QueueView.cpp:1710 +#: ../../locales/../src/interface/QueueView.cpp:1701 msgid "Scanning for files to add to queue" msgstr "正在掃描欲加入佇列的檔案" -#: ../../locales/../src/interface/QueueView.cpp:1712 +#: ../../locales/../src/interface/QueueView.cpp:1703 msgid "Scanning for files to upload" msgstr "正在掃描欲上傳的檔案" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "搜尋條件(&C):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "搜尋目錄(&D):" @@ -6402,8 +6347,8 @@ msgid "Security information" msgstr "安全資訊" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:601 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "也請見: https://wiki.filezilla-project.org/Network_Configuration" @@ -6450,7 +6395,7 @@ msgstr "選擇用以匯出資料的檔案" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1488 +#: ../../locales/../src/interface/queue.cpp:1494 msgid "Select file for exported queue" msgstr "選擇用以匯出佇列的檔案" @@ -6459,7 +6404,7 @@ msgstr "選擇用以匯出設定的檔案" #: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2208 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 msgid "Select file for exported sites" msgstr "選擇用以匯出站台的檔案" @@ -6467,24 +6412,23 @@ msgid "Select file to import settings from" msgstr "選擇用以匯入設定的檔案" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "選擇用以上傳的檔案" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 -#, fuzzy +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" -msgstr "選擇轉換後金鑰檔案名稱" +msgstr "選擇轉換後的金鑰檔案名稱" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2907 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 msgid "Select how these files should be opened." msgstr "選擇該如何開啟這些檔案." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "選擇目標下載目錄" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "選擇目標檔案名稱" @@ -6496,7 +6440,7 @@ msgid "Select the private data you would like to delete." msgstr "請選擇您要刪除的私人資料." -#: ../../locales/../src/interface/search.cpp:475 +#: ../../locales/../src/interface/search.cpp:481 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6508,7 +6452,7 @@ msgid_plural "Selected %d directories." msgstr[0] "選取 %d 個目錄." -#: ../../locales/../src/interface/search.cpp:473 +#: ../../locales/../src/interface/search.cpp:479 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6526,7 +6470,7 @@ msgid_plural "Selected %d files. Total size: At least %s" msgstr[0] "選取 %d 個檔案. 總共大小: 至少 %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "選擇傳輸 %s 與 %s." @@ -6564,7 +6508,7 @@ msgid "Selected file is still being edited" msgstr "仍在編輯所選的檔案." -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "所選的篩選器只能處理本地檔案." @@ -6588,12 +6532,12 @@ msgid "Send custom command to the server otherwise not available" msgstr "送出自訂的命令到伺服器否則就不可用" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4318 msgid "Sending keep-alive command" msgstr "送出維持連線指令" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "憑證序號:" @@ -6601,78 +6545,78 @@ msgid "Server &Type:" msgstr "伺服器種類(&T):" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket.cpp:743 msgid "Server did not properly shut down TLS connection" msgstr "伺服器未正確結束 TLS 連線" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:886 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:939 msgid "Server does not support non-ASCII characters." msgstr "伺服器不支援非 ASCII 字元." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4147 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4154 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "伺服器不支援大於 %d GB 的檔案續傳." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4143 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4150 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "伺服器不支援大於 %d GB 的檔案續傳. 自從檔案大小吻合後即停止傳輸." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2424 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2422 msgid "Server does not support resume of files > 2GB." msgstr "伺服器不支援大於 2GB 的檔案續傳." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2420 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2418 msgid "Server does not support resume of files > 4GB." msgstr "伺服器不支援大於 4GB 的檔案續傳." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4165 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " "sizes match." msgstr "伺服器可能不支援大於 %d GB 的檔案續傳. 自從檔案大小吻合後即停止傳輸." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "伺服器可能需要帳號 (Account). 請嘗試用站台管理員指定帳號" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "伺服器回傳了空的路徑." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:664 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "伺服器傳送了額外的登入提示. 您需要使用交談式登入型態." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3713 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "伺服器以無法路由的 IP Address 送出了被動式回應. 被動模式失敗." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3710 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." msgstr "" "伺服器以無法路由的 IP Address 送出了被動式回應. 改為使用伺服器 IP Address." -#: ../../locales/../src/interface/netconfwizard.cpp:418 -#: ../../locales/../src/interface/netconfwizard.cpp:425 -#: ../../locales/../src/interface/netconfwizard.cpp:464 -#: ../../locales/../src/interface/netconfwizard.cpp:473 -#: ../../locales/../src/interface/netconfwizard.cpp:485 -#: ../../locales/../src/interface/netconfwizard.cpp:509 -#: ../../locales/../src/interface/netconfwizard.cpp:516 -#: ../../locales/../src/interface/netconfwizard.cpp:525 -#: ../../locales/../src/interface/netconfwizard.cpp:536 +#: ../../locales/../src/interface/netconfwizard.cpp:430 +#: ../../locales/../src/interface/netconfwizard.cpp:436 +#: ../../locales/../src/interface/netconfwizard.cpp:471 +#: ../../locales/../src/interface/netconfwizard.cpp:480 +#: ../../locales/../src/interface/netconfwizard.cpp:492 +#: ../../locales/../src/interface/netconfwizard.cpp:515 +#: ../../locales/../src/interface/netconfwizard.cpp:522 +#: ../../locales/../src/interface/netconfwizard.cpp:531 +#: ../../locales/../src/interface/netconfwizard.cpp:542 msgid "Server sent unexpected reply." msgstr "伺服器送出了非預期的回應." @@ -6688,7 +6632,7 @@ msgid "Server&type:" msgstr "伺服器種類(&T):" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "伺服器/本地檔案" @@ -6705,13 +6649,13 @@ msgid "Set &Priority" msgstr "設定優先權(&P)" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2297 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3540 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "修改 \"%s\" 權限為 \"%s\"" -#: ../../locales/../src/engine/transfersocket.cpp:789 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "呼叫 SetSocketBufferSize 時未有 socket" @@ -6720,9 +6664,12 @@ msgstr "設定" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 -#, fuzzy msgid "Settings directory:" -msgstr "新增目錄中" +msgstr "設定檔案目錄:" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 +msgid "Sh&ow notification bubble" +msgstr "顯示通知氣泡(&O)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" @@ -6732,7 +6679,7 @@ msgid "Show &welcome dialog..." msgstr "顯示歡迎對話框(&W)..." -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2161 msgid "Show both directory trees and continue comparing?" msgstr "顯示兩端的樹狀目錄然後並進行比對?" @@ -6742,7 +6689,7 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 msgid "Show details about custom date and time formats" -msgstr "" +msgstr "顯示有關自訂日期時間格式的詳細資訊" #: ../../locales/../src/interface/resources/xrc/menus.xrc:441 msgid "Shows available TLS ciphers" @@ -6752,7 +6699,7 @@ msgid "Shows this help dialog" msgstr "顯示此說明" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3027 msgid "Shutdown now" msgstr "立即關機" @@ -6792,23 +6739,23 @@ msgid "Site Manager already open" msgstr "已開啟站台管理員" -#: ../../locales/../src/interface/sitemanager.cpp:426 -#: ../../locales/../src/interface/sitemanager.cpp:440 -#: ../../locales/../src/interface/sitemanager.cpp:452 -#: ../../locales/../src/interface/sitemanager.cpp:507 -#: ../../locales/../src/interface/sitemanager.cpp:681 -#: ../../locales/../src/interface/sitemanager.cpp:758 +#: ../../locales/../src/interface/sitemanager.cpp:428 +#: ../../locales/../src/interface/sitemanager.cpp:442 +#: ../../locales/../src/interface/sitemanager.cpp:454 +#: ../../locales/../src/interface/sitemanager.cpp:509 +#: ../../locales/../src/interface/sitemanager.cpp:683 +#: ../../locales/../src/interface/sitemanager.cpp:760 msgid "Site does not exist." msgstr "站台不存在." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:411 msgid "Site path has to begin with 0 or 1." msgstr "站台路徑必須以 0 或 1 開始." -#: ../../locales/../src/interface/sitemanager.cpp:446 -#: ../../locales/../src/interface/sitemanager.cpp:525 -#: ../../locales/../src/interface/sitemanager.cpp:675 -#: ../../locales/../src/interface/sitemanager.cpp:752 +#: ../../locales/../src/interface/sitemanager.cpp:448 +#: ../../locales/../src/interface/sitemanager.cpp:527 +#: ../../locales/../src/interface/sitemanager.cpp:677 +#: ../../locales/../src/interface/sitemanager.cpp:754 msgid "Site path is malformed." msgstr "站台路徑的格式有誤." @@ -6826,7 +6773,7 @@ "站台書籤需要將伺服器存進站台管理員.\n" "要將目前的連線加進站台管理員?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "大小" @@ -6845,45 +6792,43 @@ msgid "Skip file" msgstr "略過檔案" -#: ../../locales/../src/engine/ControlSocket.cpp:1150 -#: ../../locales/../src/engine/ControlSocket.cpp:1167 -#: ../../locales/../src/engine/ControlSocket.cpp:1191 -#: ../../locales/../src/engine/ControlSocket.cpp:1251 +#: ../../locales/../src/engine/ControlSocket.cpp:1154 +#: ../../locales/../src/engine/ControlSocket.cpp:1171 +#: ../../locales/../src/engine/ControlSocket.cpp:1195 +#: ../../locales/../src/engine/ControlSocket.cpp:1255 #, c-format msgid "Skipping download of %s" msgstr "略過 %s 的下載" -#: ../../locales/../src/engine/ControlSocket.cpp:1154 -#: ../../locales/../src/engine/ControlSocket.cpp:1170 -#: ../../locales/../src/engine/ControlSocket.cpp:1195 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 +#: ../../locales/../src/engine/ControlSocket.cpp:1158 +#: ../../locales/../src/engine/ControlSocket.cpp:1174 +#: ../../locales/../src/engine/ControlSocket.cpp:1199 +#: ../../locales/../src/engine/ControlSocket.cpp:1259 #, c-format msgid "Skipping upload of %s" msgstr "略過 %s 的上傳" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Socket address outside address space" -msgstr "" +msgstr "Socket 位址超出了位址空間範圍" -#: ../../locales/../src/engine/socket.cpp:1063 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1039 msgid "Socket already connected" -msgstr "已連線" +msgstr "Socket 已連線" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket has been shut down" -msgstr "" +msgstr "Socket 已關閉" -#: ../../locales/../src/engine/socket.cpp:1068 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Socket not connected" -msgstr "未連線" +msgstr "Socket 未連線" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "Socket type not supported for address family" -msgstr "" +msgstr "位址家族不支援此 Socket 類型" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1149 msgid "Some files are still being edited or need to be uploaded." msgstr "部分檔案依然被編輯或是需要上傳." @@ -6900,7 +6845,7 @@ msgid "Sort directories inline" msgstr "一併排序目錄" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:465 msgid "Sort order cannot be changed if comparing directories." msgstr "比對目錄時不能變更目錄排序." @@ -6916,7 +6861,7 @@ msgid "Source and path of the drop operation are identical" msgstr "來源和拖曳的路徑相同" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "來源和目標檔案不能相同" @@ -6928,7 +6873,7 @@ msgid "Source file:" msgstr "來源檔案:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3632 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3639 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 msgid "Speed Limits" @@ -6966,19 +6911,19 @@ msgid "Start with opened Site Manager" msgstr "啟動時開啟站台管理員" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "於 %s 啟動更新檢查\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2144 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1562 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2142 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "開始 %s 的下載" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1565 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2145 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "開始 %s 的上傳" @@ -6987,18 +6932,18 @@ msgid "Starts the local site in the given path" msgstr "啟動時將給定路徑視為本地目錄" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "州郡省份:" #: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Status" msgstr "狀態" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:292 -#: ../../locales/../src/interface/StatusView.cpp:367 +#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "狀態:" @@ -7007,11 +6952,10 @@ msgstr "停止且全部移除(&A)" #: ../../locales/../src/interface/recursive_operation_status.cpp:40 -#, fuzzy msgid "Stop recursive operation" -msgstr "安全資訊" +msgstr "停止遞歸操作" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "街:" @@ -7027,34 +6971,34 @@ msgid "Summary of test results:" msgstr "測試結果摘要:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3035 msgid "Suspend now" msgstr "立即待機" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." msgstr "指向檔案的軟連結則不受選擇影響, 這類軟連結則總是會刪除." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3693 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:82 -#: ../../locales/../src/interface/state.cpp:238 -#: ../../locales/../src/interface/state.cpp:252 -#: ../../locales/../src/interface/state.cpp:258 -#: ../../locales/../src/interface/state.cpp:268 -#: ../../locales/../src/interface/state.cpp:355 -#: ../../locales/../src/interface/state.cpp:363 -#: ../../locales/../src/interface/state.cpp:371 -#: ../../locales/../src/interface/state.cpp:930 -#: ../../locales/../src/interface/state.cpp:938 -#: ../../locales/../src/interface/state.cpp:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:239 +#: ../../locales/../src/interface/state.cpp:253 +#: ../../locales/../src/interface/state.cpp:259 +#: ../../locales/../src/interface/state.cpp:269 +#: ../../locales/../src/interface/state.cpp:356 +#: ../../locales/../src/interface/state.cpp:364 +#: ../../locales/../src/interface/state.cpp:372 +#: ../../locales/../src/interface/state.cpp:932 +#: ../../locales/../src/interface/state.cpp:940 +#: ../../locales/../src/interface/state.cpp:946 +#: ../../locales/../src/interface/state.cpp:955 +#: ../../locales/../src/interface/state.cpp:981 msgid "Synchronized browsing" msgstr "同步瀏覽" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "同步瀏覽已停用." @@ -7068,8 +7012,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 +#: ../../locales/../src/interface/Mainfrm.cpp:2273 #: ../../locales/../src/interface/Mainfrm.cpp:2315 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 msgid "Syntax error in command line" msgstr "命令列模式的語法錯誤" @@ -7078,38 +7022,34 @@ msgstr "系統" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 -#, fuzzy msgid "System details" -msgstr "顯示細節" +msgstr "系統資訊" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1028 msgid "System limit of open files exceeded" -msgstr "" +msgstr "達到了系統開啟檔案數限制" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "System's network subsystem has failed" -msgstr "" +msgstr "系統的網路子系統發生錯誤" #: ../../locales/../src/interface/resources/xrc/menus.xrc:102 msgid "T&oolbar" msgstr "工具列(&O)" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 -#, fuzzy +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" -msgstr "TLS/SSL 連線已建立, 正在傳送 HTTP 請求" +msgstr "TLS 連線已建立, 正在傳送 HTTP 請求" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 -#, fuzzy +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:400 msgid "TLS connection established, waiting for welcome message..." -msgstr "TLS/SSL 連線已建立, 正在等候歡迎訊息..." +msgstr "TLS 連線已建立, 正在等候歡迎訊息..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 -#, fuzzy +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403 msgid "TLS connection established." -msgstr "TLS/SSL 連線已建立." +msgstr "TLS 連線已建立." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:523 msgid "TTL expired" msgstr "TTL 逾期" @@ -7121,29 +7061,33 @@ msgid "Target file:" msgstr "目的檔案:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "目標檔名已經存在!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "目標檔名已經存在, 確定要繼續?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Temporary failure in name resolution" -msgstr "" +msgstr "名稱解析中臨時發生錯誤" + +#: ../../locales/../src/interface/netconfwizard.cpp:590 +msgid "Test finished successfully" +msgstr "測試完成成功" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "測試結果" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4171 msgid "Testing resume capabilities of server" msgstr "測試伺服器的續傳相容性" #: ../../locales/../src/interface/sitemanager_dialog.cpp:750 msgid "The Site Manager cannot be used unless the file gets repaired." -msgstr "" +msgstr "需要修復檔案, 否則無法開啟站台管理員." #: ../../locales/../src/interface/sitemanager_dialog.cpp:328 msgid "" @@ -7162,26 +7106,25 @@ "另一個 FileZilla 3 程式已啟動站台管理員.\n" "請將其關閉, 否則資料都不會被刪除." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:642 #, c-format msgid "The address you entered was: %s" msgstr "您輸入的 IP Address 是: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "The ai_family member is not supported" -msgstr "" +msgstr "不支援 ai_family 成員" -#: ../../locales/../src/engine/socket.cpp:1101 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1077 msgid "The ai_socktype member is not supported" -msgstr "位址型態未支援" +msgstr "不支援 ai_socktype 成員" #: ../../locales/../src/interface/bookmarks_dialog.cpp:777 -#: ../../locales/../src/interface/sitemanager.cpp:663 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "無法加入書籤." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "無法清除書籤." @@ -7192,7 +7135,7 @@ #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 msgid "" "The custom date format is invalid or contains unsupported format specifiers." -msgstr "" +msgstr "自訂資料格式無效或包含不支援的格式限定字元." #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." @@ -7201,19 +7144,19 @@ #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 msgid "" "The custom time format is invalid or contains unsupported format specifiers." -msgstr "" +msgstr "自訂時間格式無效或包含不支援的格式限定字元." -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../locales/../src/engine/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "無法建立資料連線: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 #: ../../locales/../src/interface/edithandler.cpp:1511 msgid "The default editor for text files could not be found." msgstr "無法找到文字檔案的預設的編輯器." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2918 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "文字檔案的預設編輯器是 '%s'." @@ -7224,7 +7167,7 @@ msgid "The entered filter name already exists, please choose a different name." msgstr "輸入的篩選器名稱已經存在, 請選擇不同的名稱." -#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "副檔名 \"%s\" 已存在於列表裡" @@ -7240,7 +7183,7 @@ "請輸入新的名稱:" #: ../../locales/../src/interface/edithandler.cpp:1621 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../../locales/../src/interface/LocalListView.cpp:1704 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7257,6 +7200,8 @@ "The file '%s' contains an SSH1 key. The SSH1 protocol has been deprecated, " "FileZilla only supports SSH2 keys." msgstr "" +"檔案「%s」包含 SSH1 金鑰. SSH1 協定已經過時, FileZilla 僅支援 SSH2 協定的金" +"鑰." #: ../../locales/../src/interface/fzputtygen_interface.cpp:57 #, c-format @@ -7269,7 +7214,7 @@ msgstr "無法載入檔案 '%s'." #: ../../locales/../src/interface/edithandler.cpp:1616 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/LocalListView.cpp:1700 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7279,7 +7224,7 @@ "您的系統裡沒有程式關聯到這個檔案類型." #: ../../locales/../src/interface/edithandler.cpp:1733 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/LocalListView.cpp:1712 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7296,8 +7241,11 @@ "Loading files created by newer versions can result in loss of data.\n" "Do you want to continue?" msgstr "" +"該檔案「%s」是由較新版本的 FileZilla 建立的.\n" +"開啟新版本的檔案可能會導致資料遺失.\n" +"您想繼續嗎?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7322,11 +7270,11 @@ "由於儲存格式上的不同, 只有主機位址, 連接埠, 使用者名稱與密碼能匯入.\n" "要繼續匯入嗎?" -#: ../../locales/../src/interface/listctrlex.cpp:756 +#: ../../locales/../src/interface/listctrlex.cpp:747 msgid "The filename column can neither be hidden nor moved." msgstr "不能隱藏或移動檔名欄位." -#: ../../locales/../src/interface/listctrlex.cpp:809 +#: ../../locales/../src/interface/listctrlex.cpp:800 msgid "The filename column cannot be hidden." msgstr "不能隱藏檔名欄位." @@ -7344,7 +7292,7 @@ msgid "The following files are currently being edited:" msgstr "正在編輯以下檔案:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "自由且開放原始碼的 FTP 解決方案" @@ -7364,17 +7312,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "限制範圍必須在 1 到 2000 MiB 之間" -#: ../../locales/../src/interface/state.cpp:979 -#, fuzzy, c-format +#: ../../locales/../src/interface/state.cpp:981 +#, c-format msgid "The local directory '%s' could not be created." -msgstr "無法載入檔案 '%s'." +msgstr "無法建立本地目錄 '%s'." -#: ../../locales/../src/interface/state.cpp:964 -#, fuzzy, c-format +#: ../../locales/../src/interface/state.cpp:966 +#, c-format msgid "The local directory '%s' does not exist." -msgstr "所選的編輯器不存在." +msgstr "本地目錄 '%s' 不存在。" -#: ../../locales/../src/interface/state.cpp:249 +#: ../../locales/../src/interface/state.cpp:250 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7383,7 +7331,7 @@ "本地目錄 \"%s\" 並不在同步根目錄 (%s) 之下.\n" "要停用同步瀏覽並繼續變更本地目錄?" -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:78 msgid "" "The lowest available port has to be less or equal than the highest available " "port." @@ -7397,16 +7345,16 @@ msgid "The new version has been saved in your Downloads directory." msgstr "新版本已經儲存在您的 Downloads 目錄內." -#: ../../locales/../src/interface/QueueView.cpp:1832 +#: ../../locales/../src/interface/QueueView.cpp:1820 msgid "The queue will not be saved." msgstr "不會儲存佇列." -#: ../../locales/../src/interface/state.cpp:891 -#, fuzzy, c-format +#: ../../locales/../src/interface/state.cpp:893 +#, c-format msgid "The remote directory '%s' does not exist." -msgstr "所選的編輯器不存在." +msgstr "遠端目錄 '%s' 不存在。" -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:937 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7435,7 +7383,6 @@ msgstr "所選的檔案仍舊被其它程式開啟, 請關閉它." #: ../../locales/../src/interface/edithandler.cpp:1626 -#, fuzzy msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7445,11 +7392,11 @@ "這可能會危害到您的系統.\n" "確定要繼續?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "無法加入伺服器." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "The server sent an unexpected or unrecognized reply." msgstr "伺服器送出了非預期或未認可的回應." @@ -7478,9 +7425,9 @@ "the computer you think it is." msgstr "此伺服器的主機金鑰不明. 您無法保證這台機器是您想的那台." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1076 msgid "The servname parameter is not supported for ai_socktype" -msgstr "" +msgstr "ai_socktype 不支援 servname 參數" #: ../../locales/../src/interface/import.cpp:73 msgid "" @@ -7488,20 +7435,19 @@ "settings to have effect." msgstr "已匯入設定. 您得重新啟動 FileZilla 才能使用新設定." -#: ../../locales/../src/engine/socket.cpp:1048 -#, fuzzy +#: ../../locales/../src/engine/socket.cpp:1024 msgid "The specified address family is not supported" -msgstr "位址型態未支援" +msgstr "不支援指定的位址家族" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "The specified network name is no longer available" -msgstr "" +msgstr "指定的網路名稱已不可用" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3030 msgid "The system will soon reboot unless you click Cancel." msgstr "除非您按下 Cancel, 否則系統即將會重開機." -#: ../../locales/../src/interface/QueueView.cpp:3045 +#: ../../locales/../src/interface/QueueView.cpp:3026 msgid "The system will soon shut down unless you click Cancel." msgstr "除非您按下 Cancel, 否則系統即將會關機." @@ -7513,28 +7459,28 @@ "目標檔案已存在.\n" "請選擇動作." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:863 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "測試未成功. 您真的要儲存設定嗎?" #: ../../locales/../src/interface/xmlfunctions.cpp:78 -#, fuzzy, c-format +#, c-format msgid "The valid backup file %s could not be restored" -msgstr "無法載入檔案 '%s'." +msgstr "無法還原有效的備份檔案 %s" #: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "佈景主題" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "此篩選集無法移除." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "此篩選集無法更名." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7553,7 +7499,7 @@ "you have and tests your configuration." msgstr "這個精靈將會幫助您正確地配置您的路由器與防火牆並且測試您的組態." -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "時間" @@ -7566,25 +7512,25 @@ msgstr "多少秒內逾時:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "逾時時間" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1036 -#, fuzzy, c-format +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1617 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 +#, c-format msgid "Timezone offset of server is %d seconds." -msgstr "計算伺服器的時區偏移量..." +msgstr "伺服器時差為 %d 秒." -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "標題:" -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/Mainfrm.cpp:2159 msgid "To compare directories, both file lists have to be aligned." msgstr "兩端的檔案列表必須排列整齊才能進行目錄比對." -#: ../../locales/../src/interface/Mainfrm.cpp:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2160 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "兩端的樹狀目錄必須同時顯示或隱藏才能執行此動作." @@ -7644,17 +7590,17 @@ msgid "Toggles the display of the transfer queue" msgstr "切換顯示傳輸佇列" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "過長的 header line" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "過多的重導" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:286 -#: ../../locales/../src/interface/StatusView.cpp:353 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:356 msgid "Trace:" msgstr "歷程:" @@ -7683,17 +7629,17 @@ msgid "Transfer Settings" msgstr "傳輸設定" -#: ../../locales/../src/engine/transfersocket.cpp:446 -#: ../../locales/../src/engine/transfersocket.cpp:468 +#: ../../locales/../src/engine/transfersocket.cpp:448 +#: ../../locales/../src/engine/transfersocket.cpp:470 #, c-format msgid "Transfer connection interrupted: %s" msgstr "傳輸連線中斷: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:645 msgid "Transferred data got tainted." msgstr "傳輸的資料遭受影響." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "正在傳輸" @@ -7702,8 +7648,7 @@ msgid "Transfers" msgstr "傳輸" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2919 msgid "Transfers finished" msgstr "傳輸完成" @@ -7715,11 +7660,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "將以下的檔案類型視作文字類檔案(&F):" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "信任已改變的主機金鑰:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "信任新的主機金鑰:" @@ -7757,7 +7702,7 @@ msgid "U&pload" msgstr "上傳(&P)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3573 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "上傳限制(&P)" @@ -7767,20 +7712,20 @@ msgstr "允許的話使用檔案類型關聯(&S)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "使用系統預設值(&S)" +msgid "U&se system defaults for current language" +msgstr "為目前語言使用系統預設設定(&S)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "USER@HOST (&H)" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:405 +#: ../../locales/../src/engine/proxy.cpp:532 #, c-format msgid "Unassigned error code %d" msgstr "未指定的錯誤碼 %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "單位:" @@ -7789,11 +7734,11 @@ msgid "Unknown" msgstr "未知" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "未知的 FTP Proxy 類型, 無法產生登入程序." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:453 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "未知的 SOCKS 協定版本: %d" @@ -7806,7 +7751,7 @@ msgid "Unknown host key" msgstr "未知的主機金鑰" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:461 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7818,24 +7763,24 @@ "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "未知的根元素, 該檔案似乎不是由 FileZilla 產生的." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "除非這些問題解決了, 否則 FTP 主動模式不會運作並且會轉為使用被動模式." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:607 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." msgstr "除非這個問題解決了, 否則 FTP 主動模式不會運作並且會轉為使用被動模式." -#: ../../locales/../src/engine/tlssocket.cpp:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "未支援的憑證類型" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "未支援的重導" @@ -7905,12 +7850,12 @@ msgid "Use &custom editor:" msgstr "使用自訂編輯器(&C):" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "使用文字檔案的預設編輯器(&D)" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "使用同步瀏覽(&S)" @@ -7936,8 +7881,8 @@ msgstr "使用站台管理員裡的伺服器" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "使用系統預設值(&D)" +msgid "Use system &defaults for current language" +msgstr "為目前語言使用系統預設設定(&D)" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -7970,7 +7915,7 @@ msgid "User:" msgstr "使用者:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 +#: ../../locales/../src/interface/manual_transfer.cpp:495 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 msgid "Username cannot be a series of spaces" msgstr "使用者名稱不能是一串空白" @@ -7992,7 +7937,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "wxWidgiets 的詳細訊息記錄" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "正在驗證憑證..." @@ -8000,7 +7945,7 @@ msgid "Very high" msgstr "非常高" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1387 msgid "View hidden option set, but unsupported by server" msgstr "已經設定了顯示隱藏的選項, 但是伺服器端並未支援" @@ -8016,15 +7961,15 @@ msgid "W&rite" msgstr "寫入(&R)" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1662 msgid "Waiting" msgstr "正在等待" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "正在等待瀏覽連線" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "正在等待密碼" @@ -8036,7 +7981,7 @@ msgid "Waiting to retry..." msgstr "正在等待重試..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:976 msgid "Warning, ignoring data connection from wrong IP." msgstr "警告, 忽略來自錯誤 IP Address 的資料連線." @@ -8058,11 +8003,11 @@ msgid "Warning: Potential security breach!" msgstr "警告: 可能有潛藏的安全性漏洞!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "歡迎使用 FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "最新消息" @@ -8070,7 +8015,7 @@ msgid "What's new:" msgstr "最新消息:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3647 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3654 msgid "" "When allowing FileZilla to remember passwords, you can reconnnect without " "having to re-enter a password after restarting FileZilla." @@ -8086,13 +8031,13 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 msgid "When st&arting a new connection while already connected:" -msgstr "" +msgstr "在已連線伺服器的情況下, 需要建立一個新的連線時(&A):" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 msgid "Widescreen" msgstr "寬螢幕" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3642 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 msgid "Would you like FileZilla to remember passwords?" msgstr "您想讓 FileZilla 記憶密碼嗎?" @@ -8100,20 +8045,20 @@ msgid "Wr&ite" msgstr "寫入(&I)" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:463 msgid "Wrong external IP address" msgstr "錯誤的外部 IP Address" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "錯誤的換行格式" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:847 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "是" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:783 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8123,7 +8068,7 @@ msgid "You are using the latest version of FileZilla." msgstr "您正在使用最新版的 FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 msgid "You can always open this dialog again through the help menu." msgstr "您總是能透過工具列說明選單開啟這個對話框." @@ -8132,7 +8077,7 @@ msgid "You can download the latest version from the FileZilla website:" msgstr "您可以從 FileZilla 網站下載最新版:" -#: ../../locales/../src/engine/server.cpp:65 +#: ../../locales/../src/engine/server.cpp:66 msgid "You can leave the port field empty to use the default port." msgstr "您可以不輸入連接埠欄位來使用預設的連接埠." @@ -8156,57 +8101,56 @@ msgid "You did not enter a new name for the file. Overwrite the file instead?" msgstr "您未為這個檔案輸入新的檔名. 是想要覆蓋這個檔案嗎?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 msgid "You have selected at least one symbolic link." msgstr "您已選擇至少一個軟連結." #: ../../locales/../src/interface/edithandler.cpp:1587 -#: ../../locales/../src/interface/search.cpp:725 +#: ../../locales/../src/interface/search.cpp:709 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "您已選擇要編輯十個以上的檔案, 是否真要繼續?" -#: ../../locales/../src/interface/LocalListView.cpp:1665 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" msgstr "您已選擇要開啟十個以上的檔案或目錄, 是否真要繼續?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 +#: ../../locales/../src/interface/manual_transfer.cpp:415 #: ../../locales/../src/interface/sitemanager_dialog.cpp:954 msgid "You have to enter a hostname." msgstr "您必須輸入主機名稱." #: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 -#, fuzzy msgid "You have to enter a key file path" -msgstr "您必須輸入本地目錄." +msgstr "您必須輸入一個金鑰檔案路徑" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "您必須輸入本地目錄." -#: ../../locales/../src/interface/netconfwizard.cpp:164 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "您必須輸入有效的 IP Address." +#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +msgid "You have to enter a valid IPv4 address." +msgstr "您必須輸入有效的 IPv4 位址." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 msgid "You have to enter a writable local directory." msgstr "您必須輸入可寫入的本地目錄." -#: ../../locales/../src/interface/manual_transfer.cpp:505 +#: ../../locales/../src/interface/manual_transfer.cpp:506 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 msgid "You have to enter an account name" msgstr "您必須輸入帳號名稱." -#: ../../locales/../src/interface/manual_transfer.cpp:479 +#: ../../locales/../src/interface/manual_transfer.cpp:480 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 msgid "You have to specify a user name" msgstr "您必須指定使用者名稱" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:646 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8253,30 +8197,29 @@ "browsing for this site." msgstr "您必須輸入本地與遠端路徑以啟用此站台的同步瀏覽." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "您必須指定一個本地檔案." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "您必須指定一個遠端檔案." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "您必須指定一個遠端路徑." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "您必須指定一台伺服器" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "您應沒任何連到其他伺服器的問題. 檔案傳輸應該正確運作." -#: ../../locales/../src/interface/QueueView.cpp:3053 -#, fuzzy +#: ../../locales/../src/interface/QueueView.cpp:3034 msgid "Your computer will suspend unless you click Cancel." msgstr "除非您按下 Cancel, 否則系統即將會待機." @@ -8295,16 +8238,15 @@ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:176 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:432 msgid "bytes" -msgstr "bytes" +msgstr "位元組" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "contains" msgstr "包含" -#: ../../locales/../src/interface/updater.cpp:216 -#, fuzzy +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" -msgstr "自訂(&U)" +msgstr "自訂" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "does not contain" @@ -8324,19 +8266,19 @@ msgid "equals" msgstr "等於" -#: ../../locales/../src/interface/filelistctrl.cpp:529 -#: ../../locales/../src/interface/filelistctrl.cpp:548 -#: ../../locales/../src/interface/filelistctrl.cpp:575 -#: ../../locales/../src/interface/filelistctrl.cpp:591 +#: ../../locales/../src/interface/filelistctrl.cpp:530 +#: ../../locales/../src/interface/filelistctrl.cpp:549 +#: ../../locales/../src/interface/filelistctrl.cpp:576 +#: ../../locales/../src/interface/filelistctrl.cpp:592 msgid "file" msgstr "檔案" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lockfile" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:202 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8345,16 +8287,15 @@ "無法啟動 fzputtygen.\n" "請確定該執行檔和 FileZilla 主程式存在同一目錄下." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:466 -#, fuzzy +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" -msgstr "您正在使用最新版的 FileZilla." +msgstr "fzsftp 是其他 FileZilla 版本裡的命令" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1489 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "無法啟動 fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1044 +#: ../../locales/../src/engine/tlssocket.cpp:1127 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers 沒有回傳任何憑證" @@ -8375,7 +8316,6 @@ msgstr "群組可寫入" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1590 -#, fuzzy msgid "https://wiki.filezilla-project.org/Date_and_Time_formatting" msgstr "" "更多資訊請參閱 https://wiki.filezilla-project.org/Date_and_Time_formatting" @@ -8412,10 +8352,10 @@ msgid "owner writeable" msgstr "擁有人可寫入" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1105 -#: ../../locales/../src/engine/tlssocket.cpp:1116 -#: ../../locales/../src/engine/tlssocket.cpp:1131 +#: ../../locales/../src/engine/proxy.cpp:97 +#: ../../locales/../src/engine/tlssocket.cpp:1191 +#: ../../locales/../src/engine/tlssocket.cpp:1202 +#: ../../locales/../src/engine/tlssocket.cpp:1217 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:38 msgid "unknown" msgstr "未知" @@ -8435,313 +8375,3 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 msgid "wxWidgets:" msgstr "wxWidgets:" - -#, fuzzy -#~ msgid "" -#~ "The file '%s' is not in a format supported by FileZilla.\n" -#~ "The file is also password protected. Password protected key files are not " -#~ "supported by FileZilla yet.\n" -#~ "Would you like to convert it into a supported, unprotected format?" -#~ msgstr "" -#~ "檔案 \"%s\" 並非為 FileZilla 支援的格式.\n" -#~ "該檔案也有使用密碼保護. FileZilla 尚未支援有密碼保護的金鑰檔案.\n" -#~ "您想將其轉換成有支援且無保護的格式嗎?" - -#, fuzzy -#~ msgid "" -#~ "The file '%s' is password protected. Password protected key files are not " -#~ "supported by FileZilla yet.\n" -#~ "Would you like to convert it into an unprotected file?" -#~ msgstr "" -#~ "檔案 \"%s\" 有使用密碼保護. FileZilla 尚未支援有密碼保護的金鑰檔案.\n" -#~ "您想將其轉換成無保護的格式嗎?" - -#~ msgid "The XML document is not well-formed: %s" -#~ msgstr "此 XML 文件並未滿足格式: %s" - -#~ msgid "" -#~ "Unknown error opening the file. Make sure the file can be accessed and is " -#~ "a well-formed XML document." -#~ msgstr "" -#~ "未知的開啟檔案錯誤. 請確認可以找到檔案並且內容為滿足格式的 XML 文件." - -#~ msgid "Using proxy %s" -#~ msgstr "使用 Proxy %s" - -#~ msgid "" -#~ "Any changes made in the Site Manager will not be saved unless you repair " -#~ "the file." -#~ msgstr "除非您修復檔案, 否則站台管理員裡的任何變更都不會儲存." - -#~ msgid "Cannot compare directories, not connected to a server." -#~ msgstr "無法比對目錄, 未連線到伺服器." - -#~ msgid "Clear &Site Manager entries" -#~ msgstr "清除站台管理員裡的欄位(&S)" - -#~ msgid "Clear &transfer queue" -#~ msgstr "清除傳輸佇列(&T)" - -#~ msgid "Operating system problem detected" -#~ msgstr "偵測到作業系統問題" - -#~ msgid "" -#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -#~ "seconds." -#~ msgstr "時區偏移量: 伺服器: %d 秒. 本地端: %d 秒. 相差: %d 秒." - -#~ msgid "" -#~ "Warning!\n" -#~ "\n" -#~ "A bug in Windows causes problems with FileZilla\n" -#~ "\n" -#~ "The bug occurs if you have\n" -#~ "- Windows Server 2003 or XP 64\n" -#~ "- Windows Firewall enabled\n" -#~ "- Application Layer Gateway service enabled\n" -#~ "See http://support.microsoft.com/kb/931130 for background information.\n" -#~ "\n" -#~ "Unless you either disable Windows Firewall or the Application Layer " -#~ "Gateway service,\n" -#~ "FileZilla will timeout on big transfers." -#~ msgstr "" -#~ "警告!\n" -#~ "\n" -#~ "Windows 上的一個錯誤導至 FileZilla 的問題.\n" -#~ "\n" -#~ "這個錯誤發生在您使用\n" -#~ "- Windows Server 2003 或 XP 64\n" -#~ "- 啟用 Windows 防火牆\n" -#~ "- 啟用應用程式層閘道服務時\n" -#~ "請見 http://support.microsoft.com/kb/931130 了解相關的背景資訊.\n" -#~ "\n" -#~ "除非您停用 Windows 防火牆或是應用程式層閘道服務,\n" -#~ "否則 FileZilla 在大型傳輸時將會逾時." - -#~ msgid "&Crash" -#~ msgstr "毀壞(&C)" - -#~ msgid "Certificate details" -#~ msgstr "憑證細節" - -#~ msgid "Connection timed out" -#~ msgstr "連線逾時" - -#~ msgid "" -#~ "Crashes FileZilla instantly. Only used to debug the exception handler" -#~ msgstr "立即弄當 FileZilla. 只用於檢測例外處理機制" - -#~ msgid "" -#~ "A file with that name is already being edited. Do you want to reopen '%s'?" -#~ msgstr "該名稱之檔案已被編輯. 您要重新開啟 \"%s\" 嗎?" - -#~ msgid "Fingerprint (MD5):" -#~ msgstr "數位指紋 (MD5):" - -#~ msgid "Benchmark string coalescer" -#~ msgstr "量測 String Coalescer 效能" - -#~ msgid "Clear string coalescer" -#~ msgstr "清除 String Coalescer" - -#~ msgid "Cannot load file, not a valid XML file." -#~ msgstr "無法載入檔案, 這不是個有效的 XML 檔案." - -#~ msgid "Failed to parse trusted root cert." -#~ msgstr "無法解析信任的根憑證." - -#~ msgid "" -#~ "Filename may not contain any of the following characters: / \\ : * ? \" < " -#~ "> |" -#~ msgstr "檔名不能包含以下任何字元: / \\ : * ? \" < > |" - -#~ msgid "Root certificate is not trusted" -#~ msgstr "根憑證不被信任" - -#~ msgid "Use plain FTP" -#~ msgstr "使用純粹的 FTP" - -#~ msgid "%s bytes" -#~ msgstr "%s bytes" - -#~ msgid "%s bytes (%s/s)" -#~ msgstr "%s bytes (%s/s)" - -#~ msgid "&Check for beta versions of FileZilla" -#~ msgstr "檢查 Beta 測試版本的 FileZilla(&C)" - -#~ msgid "&Finish" -#~ msgstr "結束(&F)" - -#~ msgid ", %H:%M:%S left" -#~ msgstr ", 剩餘時間 %H:%M:%S" - -#~ msgid ", --:--:-- left" -#~ msgstr ", 剩餘時間 --:--:--" - -#~ msgid "- Broken router and/or firewall" -#~ msgstr "- 有問題的路由器或是防火牆" - -#~ msgid "- File corrupted on mirror" -#~ msgstr "- 映射站台的檔案損毀" - -#~ msgid "- Malware on your system" -#~ msgstr "- 您的系統上有惡意軟體" - -#~ msgid "Advanced options:" -#~ msgstr "進階選項:" - -#~ msgid "" -#~ "Alternatively, visit https://filezilla-project.org/ to download the most " -#~ "recent version." -#~ msgstr "也可以拜訪 https://filezilla-project.org/ 下載最近的版本." - -#~ msgid "C&heck for nightly builds of FileZilla" -#~ msgstr "檢查每日組建版的 FileZilla (&H)" - -#~ msgid "Click on next to download the new version." -#~ msgstr "按 Next 下載新版本." - -#~ msgid "Connecting to server" -#~ msgstr "正在連線到伺服器" - -#~ msgid "" -#~ "Do you really want to check for beta versions?\n" -#~ "Unless you want to test new features, keep using stable versions." -#~ msgstr "" -#~ "您想檢查測試版嗎? 除非您想測試新功能,\n" -#~ "否則還是繼續使用穩定版本會比較好." - -#~ msgid "Error, file name cannot be parsed." -#~ msgstr "錯誤, 無法解析檔案名稱." - -#~ msgid "Error, local file exists but cannot be removed" -#~ msgstr "錯誤, 本地檔案存在但無法移除" - -#~ msgid "Every month" -#~ msgstr "一個月一次" - -#~ msgid "Every two weeks" -#~ msgstr "兩週一次" - -#~ msgid "Executable" -#~ msgstr "可執行檔" - -#~ msgid "Failed to check for newer version of FileZilla." -#~ msgstr "無法檢查新版的 FileZilla." - -#~ msgid "" -#~ "In case you prefer automatic updates, you can enable automatic update " -#~ "checks in the settings dialog." -#~ msgstr "如果您較喜歡自動更新, 您可以在設定對話框內啟用自動更新檢查." - -#~ msgid "Log of update check:" -#~ msgstr "更新檢查日誌:" - -#~ msgid "Package" -#~ msgstr "套件" - -#~ msgid "" -#~ "Please check https://filezilla-project.org/ for the most recent version " -#~ "of FileZilla." -#~ msgstr "請到 https://filezilla-project.org/ 檢查最近版本的 FileZilla." - -#~ msgid "" -#~ "Please check the package manager of your system for an updated package or " -#~ "visit https://filezilla-project.org/ to download the source code of " -#~ "FileZilla." -#~ msgstr "" -#~ "請檢查您系統的套件管理程式來更新套件, 或是拜訪 https://filezilla-project." -#~ "org 下載 FileZilla 的原始碼." - -#~ msgid "" -#~ "Please retry downloading the update. Possible reasons if the problem " -#~ "persists (listed in order of decreasing probability):" -#~ msgstr "" -#~ "請重新嘗試下載更新. 如果此問題依舊持續, 可能的問題有 (依可能性遞減排列):" - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ for more information about " -#~ "FileZilla." -#~ msgstr "" -#~ "請拜訪 https://filezilla-project.org/ 以獲得更多關於 FileZilla 的資訊." - -#~ msgid "" -#~ "Please visit https://filezilla-project.org/ to download the most recent " -#~ "version." -#~ msgstr "請到 https://filezilla-project.org/ 下載最近的版本." - -#~ msgid "Resolving hostname" -#~ msgstr "正在解析主機名稱" - -#~ msgid "Select download location for package" -#~ msgstr "選擇套件的下載位置" - -#~ msgid "" -#~ "The most recent version has been downloaded. Click on Finish to close " -#~ "FileZilla and to start the installation." -#~ msgstr "已經下載了最近的版本. 請按 Finish 來關閉 FileZilla 啟動安裝程式." - -#~ msgid "" -#~ "The most recent version has been downloaded. Please install it the same " -#~ "way you installed this version." -#~ msgstr "已經下載了最近的版本. 請以相同的方式安裝此板本.." - -#~ msgid "Update wizard" -#~ msgstr "更新精靈" - -#~ msgid "Using this wizard you can check for available updates to FileZilla." -#~ msgstr "使用這個精靈您可以檢查 FileZilla 可用的更新." - -#~ msgid "" -#~ "You are already using the most recent version of FileZilla. Please check " -#~ "again in future." -#~ msgstr "您已在使用最近版本的 FileZilla. 請於未來再次檢查." - -#~ msgid "%s (%d.%d KB/s)" -#~ msgstr "%s (%d.%d KB/s)" - -#~ msgid "%s (%d.%d MB/s)" -#~ msgstr "%s (%d.%d MB/s)" - -#~ msgid "%s bytes (%d.%d KB/s)" -#~ msgstr "%s bytes (%d.%d KB/s)" - -#~ msgid "%s bytes (%d.%d MB/s)" -#~ msgstr "%s bytes (%d.%d MB/s)" - -#~ msgid "&Copy" -#~ msgstr "複製(&C)" - -#~ msgid "&Enable automatic update check" -#~ msgstr "啟用自動更新檢查(&E)" - -#~ msgid "&Number of days between update checks:" -#~ msgstr "更新檢查間隔日數(&N):" - -#~ msgid "(At least 7 days)" -#~ msgstr "(最少 7 日)" - -#~ msgid "Check for &beta versions and release candidates" -#~ msgstr "檢查 Beta 測試版本與正式候選版本的 FileZilla(&B)" - -#~ msgid "Cop&y" -#~ msgstr "複製(&Y)" - -#~ msgid "Please enter an update interval of at least 7 days" -#~ msgstr "請輸入最少 7 日的更新間隔:" - -#~ msgid "Privacy policy:" -#~ msgstr "隱私權政策:" - -#~ msgid "&Remember this and all future passwords" -#~ msgstr "記憶此次與往後所有的密碼(&R)" - -#~ msgid "Wrong opState: %d" -#~ msgstr "錯誤的 opState: %d" - -#~ msgid "Duplicate filter name" -#~ msgstr "重複的篩選器名稱" - -#~ msgid "Serial Number:" -#~ msgstr "憑證序號:" diff -Nru filezilla-3.15.0.2/m4/ax_append_flag.m4 filezilla-3.33.0/m4/ax_append_flag.m4 --- filezilla-3.15.0.2/m4/ax_append_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/m4/ax_append_flag.m4 2016-10-02 20:40:01.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) +# +# DESCRIPTION +# +# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space +# added in between. +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains +# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly +# FLAG. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AC_DEFUN([AX_APPEND_FLAG], +[dnl +AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) +AS_VAR_SET_IF(FLAGS,[ + AS_CASE([" AS_VAR_GET(FLAGS) "], + [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], + [ + AS_VAR_APPEND(FLAGS,[" $1"]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) + ], + [ + AS_VAR_SET(FLAGS,[$1]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) +AS_VAR_POPDEF([FLAGS])dnl +])dnl AX_APPEND_FLAG diff -Nru filezilla-3.15.0.2/m4/ax_check_compile_flag.m4 filezilla-3.33.0/m4/ax_check_compile_flag.m4 --- filezilla-3.15.0.2/m4/ax_check_compile_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/m4/ax_check_compile_flag.m4 2016-10-02 19:14:21.000000000 +0000 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff -Nru filezilla-3.15.0.2/m4/ax_check_define.m4 filezilla-3.33.0/m4/ax_check_define.m4 --- filezilla-3.15.0.2/m4/ax_check_define.m4 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/m4/ax_check_define.m4 2017-09-26 03:30:03.000000000 +0000 @@ -53,6 +53,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ #ifdef $1 int ok; + (void)ok; #else choke me #endif @@ -68,6 +69,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <$1>]], [[ #ifdef $2 int ok; + (void) ok; #else choke me #endif diff -Nru filezilla-3.15.0.2/m4/check_atomic.m4 filezilla-3.33.0/m4/check_atomic.m4 --- filezilla-3.15.0.2/m4/check_atomic.m4 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/m4/check_atomic.m4 2016-09-28 08:57:50.000000000 +0000 @@ -1,6 +1,13 @@ # Some versions of gcc/libstdc++ require linking with -latomic if # using the C++ atomic library. +# Copyright (c) 2015-2016 Tim Kosse + +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + m4_define([_CHECK_ATOMIC_testbody], [[ #include #include diff -Nru filezilla-3.15.0.2/m4/check_clock_gettime.m4 filezilla-3.33.0/m4/check_clock_gettime.m4 --- filezilla-3.15.0.2/m4/check_clock_gettime.m4 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/m4/check_clock_gettime.m4 2016-10-03 09:10:01.000000000 +0000 @@ -0,0 +1,25 @@ +# Checks whether clock_gettime is available. +# Defines HAVE_CLOCK_GETTIME if it is. +# +# CHECK_CLOCK_GETTIME([ACTION-SUCCESS], [ACTION-FAILURE]) + +AC_DEFUN([CHECK_CLOCK_GETTIME], +[ + AC_MSG_CHECKING([for clock_gettime]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + ]], [[ + (void)clock_gettime; + return 0; + ]]) + ], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [clock_gettime can be used]) + m4_default([$1], :) + ], [ + AC_MSG_RESULT([no]) + m4_default([$2], :) + ]) + ]) +]) diff -Nru filezilla-3.15.0.2/m4/check_thread_local.m4 filezilla-3.33.0/m4/check_thread_local.m4 --- filezilla-3.15.0.2/m4/check_thread_local.m4 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/m4/check_thread_local.m4 2017-03-11 04:30:03.000000000 +0000 @@ -10,13 +10,14 @@ AC_LANG_PROGRAM([[ ]], [[ thread_local static int foo = 0; + (void)foo; return 0; ]]) ], [ AC_MSG_RESULT([yes]) ], [ - AC_DEFINE([HAVE_NO_THREAD_LOCAL], [1], [Define if thread_local isn't supported]) AC_MSG_RESULT([no]) + AC_MSG_ERROR([Compiler support for the thread_local keyword is required.]) ]) AC_LANG_POP(C++) diff -Nru filezilla-3.15.0.2/m4/cppunit.m4 filezilla-3.33.0/m4/cppunit.m4 --- filezilla-3.15.0.2/m4/cppunit.m4 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/m4/cppunit.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -dnl -dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl -AC_DEFUN([AM_PATH_CPPUNIT], -[ - -AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)], - cppunit_config_prefix="$withval", cppunit_config_prefix="") -AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)], - cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="") - - if test x$cppunit_config_exec_prefix != x ; then - cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config - fi - fi - if test x$cppunit_config_prefix != x ; then - cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config - fi - fi - - AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no) - cppunit_version_min=$1 - - AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min) - no_cppunit="" - if test "$CPPUNIT_CONFIG" = "no" ; then - AC_MSG_RESULT(no) - no_cppunit=yes - else - CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags` - CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs` - cppunit_version=`$CPPUNIT_CONFIG --version` - - cppunit_major_version=`echo $cppunit_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - cppunit_minor_version=`echo $cppunit_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - cppunit_micro_version=`echo $cppunit_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - cppunit_major_min=`echo $cppunit_version_min | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - if test "x${cppunit_major_min}" = "x" ; then - cppunit_major_min=0 - fi - - cppunit_minor_min=`echo $cppunit_version_min | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - if test "x${cppunit_minor_min}" = "x" ; then - cppunit_minor_min=0 - fi - - cppunit_micro_min=`echo $cppunit_version_min | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x${cppunit_micro_min}" = "x" ; then - cppunit_micro_min=0 - fi - - cppunit_version_proper=`expr \ - $cppunit_major_version \> $cppunit_major_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \> $cppunit_minor_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \= $cppunit_minor_min \& \ - $cppunit_micro_version \>= $cppunit_micro_min ` - - if test "$cppunit_version_proper" = "1" ; then - AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version]) - else - AC_MSG_RESULT(no) - no_cppunit=yes - fi - fi - - if test "x$no_cppunit" = x ; then - ifelse([$2], , :, [$2]) - else - CPPUNIT_CFLAGS="" - CPPUNIT_LIBS="" - ifelse([$3], , :, [$3]) - fi - - AC_SUBST(CPPUNIT_CFLAGS) - AC_SUBST(CPPUNIT_LIBS) -]) diff -Nru filezilla-3.15.0.2/m4/d-type.m4 filezilla-3.33.0/m4/d-type.m4 --- filezilla-3.15.0.2/m4/d-type.m4 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/m4/d-type.m4 2016-09-29 03:30:03.000000000 +0000 @@ -18,7 +18,7 @@ #include #include ]], - [[struct dirent dp; dp.d_type = 0;]])], + [[struct dirent dp; dp.d_type = 0;(void)dp;]])], [gl_cv_struct_dirent_d_type=yes], [gl_cv_struct_dirent_d_type=no]) ] diff -Nru filezilla-3.15.0.2/m4/fz_check_pugixml.m4 filezilla-3.33.0/m4/fz_check_pugixml.m4 --- filezilla-3.15.0.2/m4/fz_check_pugixml.m4 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/m4/fz_check_pugixml.m4 2016-09-28 10:33:59.000000000 +0000 @@ -19,9 +19,10 @@ fi ]) - if test "x$with_pugixml" != "xbuiltin"; then - AC_LANG_PUSH(C++) + AC_LANG_PUSH(C++) + + if test "x$with_pugixml" != "xbuiltin"; then dnl Check pugixml.hpp header AC_CHECK_HEADER( @@ -35,6 +36,9 @@ fi ]) + fi + + if test "x$with_pugixml" != "xbuiltin"; then dnl Check for shared library dnl Oddity: in AC_CHECK_HEADER I can leave the true case empty, but not in AC_HAVE_LIBRARY AC_HAVE_LIBRARY(pugixml, @@ -46,7 +50,9 @@ with_pugixml=builtin fi ]) + fi + if test "x$with_pugixml" != "xbuiltin"; then dnl Check for at least version 1.5 AC_MSG_CHECKING([for pugixml >= 1.5]) AC_COMPILE_IFELSE([ @@ -59,9 +65,15 @@ AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) - AC_MSG_ERROR([pugixml system library is too old, you need at least version 1.5]) + if test "x$with_pugixml" = "xsystem"; then + AC_MSG_ERROR([pugixml system library is too old, you need at least version 1.5]) + else + with_pugixml=builtin + fi ]) + fi + if test "x$with_pugixml" != "xbuiltin"; then AC_MSG_CHECKING([whether pugixml has been compiled with long long support]) old_libs="$LIBS" LIBS="$LIBS -lpugixml" @@ -79,18 +91,24 @@ AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) - AC_MSG_ERROR([pugixml system library has been compiled without long long support]) + if test "x$with_pugixml" = "xsystem"; then + AC_MSG_ERROR([pugixml system library has been compiled without long long support]) + else + with_pugixml=builtin + fi ]) LIBS="$old_libs" + fi - AC_LANG_POP - + AC_LANG_POP + + if test "x$with_pugixml" != "xbuiltin"; then AC_MSG_NOTICE([Using system pugixml]) AC_DEFINE(HAVE_LIBPUGIXML, 1, [Define to 1 if your system has the `pugixml' library (-lpugixml).]) PUGIXML_LIBS="-lpugixml" else AC_MSG_NOTICE([Using builtin pugixml]) - PUGIXML_LIBS="../pugixml/libpugixml.a" + PUGIXML_LIBS="\$(top_builddir)/src/pugixml/libpugixml.a" fi AC_SUBST(PUGIXML_LIBS) diff -Nru filezilla-3.15.0.2/m4/icopyhookw.m4 filezilla-3.33.0/m4/icopyhookw.m4 --- filezilla-3.15.0.2/m4/icopyhookw.m4 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/m4/icopyhookw.m4 2016-09-28 10:33:59.000000000 +0000 @@ -10,7 +10,8 @@ #include #include ]], [[ - ICopyHookW* foo; + ICopyHookW* foo; + (void)foo; return 0; ]]) ], [ diff -Nru filezilla-3.15.0.2/m4/libtool.m4 filezilla-3.33.0/m4/libtool.m4 --- filezilla-3.15.0.2/m4/libtool.m4 2016-02-10 19:38:46.000000000 +0000 +++ filezilla-3.33.0/m4/libtool.m4 2018-05-07 08:45:20.000000000 +0000 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,30 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Generated automatically by $as_me ($PACKAGE) $VERSION # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +746,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +780,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +797,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +995,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1013,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1031,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1053,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1063,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1108,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1150,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1168,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1188,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1217,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1246,17 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1266,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1281,33 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1336,46 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1333,10 +1394,10 @@ ;; esac ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1355,10 +1416,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1376,19 +1437,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1396,7 +1458,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1405,7 +1467,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1421,7 +1483,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1440,11 +1502,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1452,7 +1514,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1483,7 +1545,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1519,7 +1581,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1546,7 +1608,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1568,7 +1630,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1587,10 +1649,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1611,7 +1673,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1651,7 +1713,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1702,22 +1764,22 @@ *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1733,7 +1795,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1761,7 +1823,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1808,9 +1870,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1836,7 +1898,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1857,7 +1919,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1867,44 +1929,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1913,21 +1983,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1937,7 +2007,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1947,9 +2017,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2041,8 +2111,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2052,8 +2122,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2080,8 +2150,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2093,15 +2163,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2115,12 +2185,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2144,7 +2214,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2162,6 +2232,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2172,17 +2283,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2198,28 +2310,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2233,7 +2352,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2242,7 +2361,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2259,14 +2378,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2274,41 +2396,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2318,18 +2490,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2337,8 +2509,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2350,7 +2522,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2359,8 +2531,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2376,17 +2548,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2395,8 +2567,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2423,7 +2595,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2436,8 +2608,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2450,7 +2622,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2463,8 +2635,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2477,8 +2649,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2496,12 +2668,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2531,10 +2704,10 @@ need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2552,14 +2725,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2567,8 +2741,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2577,8 +2751,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2591,8 +2765,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2603,7 +2777,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2611,8 +2785,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2631,8 +2805,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2641,13 +2815,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2672,7 +2866,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -2704,12 +2903,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2719,7 +2918,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2728,58 +2927,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2790,8 +2999,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2801,11 +3010,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2813,8 +3022,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2835,24 +3044,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2870,7 +3079,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2878,8 +3087,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2888,20 +3097,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2934,39 +3153,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2989,11 +3210,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3011,7 +3232,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3038,16 +3259,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3061,7 +3282,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3072,37 +3293,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3188,13 +3446,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3221,8 +3479,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3318,8 +3575,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3372,6 +3629,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3412,33 +3672,38 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3449,21 +3714,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3471,8 +3736,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3518,8 +3783,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3531,7 +3796,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3558,13 +3823,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3576,11 +3856,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3599,7 +3879,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3651,7 +3931,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3684,14 +3964,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3709,21 +4019,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3763,11 +4076,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3793,7 +4106,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3813,9 +4126,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3836,7 +4149,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3863,12 +4176,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3884,17 +4201,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3905,8 +4223,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3922,6 +4240,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3971,7 +4294,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4012,14 +4335,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4056,7 +4379,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4201,17 +4524,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4222,8 +4546,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4240,6 +4564,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4310,7 +4639,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4318,11 +4647,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4338,7 +4686,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4349,7 +4697,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4374,6 +4722,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4471,7 +4825,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4500,7 +4854,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4566,17 +4920,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4625,9 +4983,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4643,7 +5001,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4651,7 +5009,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; linux* | k*bsd*-gnu | gnu*) @@ -4664,7 +5022,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4686,24 +5044,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4716,7 +5074,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4735,7 +5093,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4751,7 +5109,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4761,7 +5119,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4769,61 +5127,89 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4834,42 +5220,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4883,8 +5274,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4902,8 +5293,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4915,7 +5306,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4930,9 +5321,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4949,15 +5340,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4973,7 +5364,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4981,34 +5372,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5027,13 +5441,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5052,62 +5474,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5116,7 +5556,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5146,16 +5586,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5164,18 +5605,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5184,7 +5625,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5234,33 +5675,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5268,25 +5709,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5294,14 +5735,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5312,7 +5753,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5323,16 +5764,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5345,21 +5786,32 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5374,7 +5826,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5382,27 +5834,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5413,33 +5857,53 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5450,24 +5914,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5477,11 +5941,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5491,10 +5955,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5543,43 +6007,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5594,17 +6058,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5621,7 +6085,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5701,12 +6165,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5747,10 +6211,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5790,18 +6254,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5809,8 +6273,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5818,13 +6286,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5832,14 +6300,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5881,7 +6349,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5923,35 +6391,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5987,18 +6455,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6008,6 +6488,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6026,13 +6513,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6050,64 +6545,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6117,7 +6632,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6145,57 +6660,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6206,6 +6722,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6241,14 +6785,14 @@ ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6260,7 +6804,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6269,11 +6813,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6283,15 +6827,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6317,13 +6861,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6334,20 +6878,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6362,22 +6906,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6386,17 +6930,17 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; @@ -6409,8 +6953,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6419,10 +6963,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6436,59 +6980,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6502,18 +7046,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6521,10 +7065,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6582,22 +7126,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6613,9 +7152,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6633,17 +7172,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6658,21 +7197,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6718,9 +7257,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6728,7 +7267,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6745,30 +7284,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6776,11 +7315,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6789,52 +7328,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6865,10 +7404,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6895,7 +7434,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6917,13 +7456,14 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7007,13 +7547,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7029,16 +7569,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7046,9 +7586,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7063,15 +7603,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7102,51 +7642,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7155,7 +7650,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7175,10 +7670,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7215,7 +7710,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7237,7 +7732,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7251,21 +7746,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7273,11 +7772,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7294,9 +7793,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7306,11 +7805,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7347,7 +7846,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7369,7 +7868,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7385,21 +7884,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7407,11 +7910,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7431,7 +7934,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7441,7 +7944,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7475,7 +7978,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7512,7 +8015,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7546,7 +8049,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7583,7 +8086,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7599,7 +8102,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7609,7 +8112,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7638,7 +8141,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7749,7 +8252,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7766,9 +8269,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7792,27 +8295,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7836,102 +8319,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff -Nru filezilla-3.15.0.2/m4/lt~obsolete.m4 filezilla-3.33.0/m4/lt~obsolete.m4 --- filezilla-3.15.0.2/m4/lt~obsolete.m4 2016-02-10 19:38:46.000000000 +0000 +++ filezilla-3.33.0/m4/lt~obsolete.m4 2018-05-07 08:45:21.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru filezilla-3.15.0.2/m4/ltoptions.m4 filezilla-3.33.0/m4/ltoptions.m4 --- filezilla-3.15.0.2/m4/ltoptions.m4 2016-02-10 19:38:46.000000000 +0000 +++ filezilla-3.33.0/m4/ltoptions.m4 2018-05-07 08:45:20.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -Nru filezilla-3.15.0.2/m4/ltsugar.m4 filezilla-3.33.0/m4/ltsugar.m4 --- filezilla-3.15.0.2/m4/ltsugar.m4 2016-02-10 19:38:46.000000000 +0000 +++ filezilla-3.33.0/m4/ltsugar.m4 2018-05-07 08:45:20.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -Nru filezilla-3.15.0.2/m4/ltversion.m4 filezilla-3.33.0/m4/ltversion.m4 --- filezilla-3.15.0.2/m4/ltversion.m4 2016-02-10 19:38:46.000000000 +0000 +++ filezilla-3.33.0/m4/ltversion.m4 2018-05-07 08:45:21.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru filezilla-3.15.0.2/m4/pkg.m4 filezilla-3.33.0/m4/pkg.m4 --- filezilla-3.15.0.2/m4/pkg.m4 2016-02-05 08:54:45.000000000 +0000 +++ filezilla-3.33.0/m4/pkg.m4 2017-06-08 03:30:03.000000000 +0000 @@ -1,6 +1,6 @@ -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -41,7 +41,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -142,7 +142,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -152,11 +152,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -173,7 +173,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full diff -Nru filezilla-3.15.0.2/Makefile.in filezilla-3.33.0/Makefile.in --- filezilla-3.15.0.2/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/Makefile.in 2018-05-07 08:45:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,26 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(top_srcdir)/src/fzshellext/version.rc.in $(dist_man1_MANS) \ - $(dist_man5_MANS) $(dist_docs_DATA) $(dist_noinst_DATA) \ - COPYING config/compile config/config.guess config/config.sub \ - config/depcomp config/install-sh config/missing \ - config/ltmain.sh $(top_srcdir)/config/compile \ - $(top_srcdir)/config/config.guess \ - $(top_srcdir)/config/config.sub \ - $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ - $(top_srcdir)/config/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -110,6 +111,9 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(dist_docs_DATA) $(dist_noinst_DATA) \ + $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -206,6 +210,16 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = . src locales data tests +am__DIST_COMMON = $(dist_man1_MANS) $(dist_man5_MANS) \ + $(srcdir)/Makefile.in $(top_srcdir)/config/compile \ + $(top_srcdir)/config/config.guess \ + $(top_srcdir)/config/config.sub \ + $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ + $(top_srcdir)/config/missing \ + $(top_srcdir)/src/fzshellext/version.rc.in AUTHORS COPYING \ + ChangeLog INSTALL NEWS README config/compile \ + config/config.guess config/config.sub config/depcomp \ + config/install-sh config/ltmain.sh config/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -258,11 +272,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -286,6 +300,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -306,16 +322,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -367,6 +391,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -406,6 +431,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -450,7 +476,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -770,15 +795,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -814,17 +839,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1010,6 +1035,8 @@ uninstall-am uninstall-dist_docsDATA uninstall-man \ uninstall-man1 uninstall-man5 +.PRECIOUS: Makefile + @LOCALES_ONLY_FALSE@@MACAPPBUNDLE_TRUE@clean-local: @LOCALES_ONLY_FALSE@@MACAPPBUNDLE_TRUE@ rm -rf FileZilla.app diff -Nru filezilla-3.15.0.2/NEWS filezilla-3.33.0/NEWS --- filezilla-3.15.0.2/NEWS 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/NEWS 2018-05-07 08:22:57.000000000 +0000 @@ -10,9 +10,377 @@ *nix: Unix (e.g BSD) and Unix-like systems (e.g. Linux) OS X: Apple Mac OS X +3.33.0 (2018-05-07) + +- MSW: Microsoft broke the ICopyHook interface in Windows 1803. Until Microsoft fixes the bug in Windows, drag & drop from FileZilla into Explorer will not work on Windows 1803. + +3.33.0-rc1 (2018-04-27) + ++ The contents of the transfer queue can now be sorted ++ SFTP: Support key files encrypted with aes256-ctr, e.g. as created by OpenSSH 7.6 and later +- SFTP: Fix preserve timestamps menu option + +3.32.0 (2018-04-02) + ++ Further SFTP performance improvements + +3.32.0-rc1 (2018-03-23) + ++ The Site Manager no longer shows controls not applicable to the selected protocol ++ Dynamically disable menu items if the used protocal does not support the corresponding functionality ++ Speed up listing large directories over SFTP +- Fix state of case sensitivity checkbox in the filter edit dialog if no filter has been selected + +3.31.0 (2018-02-23) + +- Building and running FileZilla now depends on libfilezilla >= 0.12.1 (https://lib.filezilla-project.org/) + +3.31.0-rc1 (2018-02-16) + ++ Allow trusting all subject alternative names (SAN) in a certificate if the current hostname matches the certificate +- OS X: Fix file lists becoming inresponsive when a file rename edit box is discarded by clicking to the right of the last column in the file list +- Fix rare crash during directory removal +- Fix rare crash in the transfer queue + +3.30.0 (2018-01-08) + +- Add additional logging if autoupdate mechanism fails + +3.30.0-rc1 (2017-12-29) + ++ In the search dialog local files can now be deleted or opened ++ The root node in the remote directory tree is now expanded by default +- Fix uploading from search dialog +- Fix formatting of filename in rename dialog +- MSW: Fix installer crash if an update installation is started with the updated version having been installed + +3.29.0 (2017-11-06) + +- Fix activity indicators not working after the update check has been run + +3.29.0-rc1 (2017-10-30) + ++ Added new quick search filter to file lists, accessed through Ctrl+F ++ FTP over TLS: Mismatched hostnames are now highlighted in red in the certificate verification dialog ++ Filters using regular expressions can now be case-insensitive +- Explicitly wait for the settings to be written to disk before removing the backup file to prevent loss of data in case of system crashes + +3.28.0 (2017-09-29) + ++ *nix: Official Linux binaries are now built for Debian 9 (Stretch) +- Do not disable password saving settings if fzdefaults.xml contains a kiosk mode setting of 0. + +3.28.0-rc1 (2017-09-22) + ++ Add "Close once" as queue completion action +- Fixed crash if FileZilla is forced to close, e.g. when the system is shutting down, while there are open dialogs +- If the transfer queue asks for a password and the password dialog is canceled the queue processing is now stopped +- OS X, *nix: Improve detection of invalid character encodings in local filenames +- Fix potential crash expanding directory tree items while changing selections + +3.27.1 (2017-08-14) + +! Change client identification string if connecting with SFTP due to OpenSSH disregarding the supported ciphers announced by the client, resulting in less secure algorithms being chosen by OpenSSH. +- MSW: Improve handling of NTFS reparse points +- MSW: If running the installer with /S, previous versions where not uninstalled prior to the new version being installed +- MSW: The installer can be run with /quiet for a semi-silent installation +- OS X, *nix: Potential fix for a rare crash if changing local directories while the local directory list is being updated and vice versa. + +3.27.0.1 (2017-07-19) + +- MSW: Add misssing file to .zip binary package +- MSW: Fix toolchain issues breaking the shell extension + +3.27.0 (2017-07-19) + +- SFTP components have been updated and are now based on PuTTY 0.70 + +3.27.0-rc1 (2017-07-11) + ++ Support for the Storj decentralized cloud storage provider +- MSW: Fix display of file type of directories if the directory name contains a dot +- Fix assertion if entering an invalid protocol prefix into the host field on the quickconnect bar or in the site manager +- Improve error message if TLS certificate verification fails due to a missing stapled OCSP resonse +- Building and running FileZilla now depends on libfilezilla >= 0.10.0 (https://lib.filezilla-project.org/) + +3.26.2 (2017-06-12) + +- Fixed crash if using master passwords and decrypting very long passwords + +3.26.1 (2017-06-02) + +- Fixed crash if changing password settings and the Site Manager contains subdirectories +- *nix: Fixed saving of sites having more than one site-specific bookmark + +3.26.0 (2017-06-01) + +- When changing or removing the master password, update protected credentials of server items in the transfer queue +- Fix display of remember checkbox when showing the password entry dialog for sites that have no username set and are using the "Ask" logon type +- Some icons were missing in the Windows .zip binary archive + +3.26.0-rc1 (2017-05-25) + ++ Passwords can now be stored encrypted, protected with a master password ++ Building and running FileZilla now depends on libfilezilla >= 0.9.2 (https://lib.filezilla-project.org/). ++ Building and running FileZilla now depends on wxWidgets >= 3.0.3 + +3.25.2 (2017-04-30) + +- SFTP components have been updated and are now based on PuTTY 0.69 +- Fixed potential stall during the final listing operation when finishing a queue which contained uploads + +3.25.2-rc1 (2017-04-23) + +- Fix crash if filters.xml has become corrupted +- Fix FTP proxy support +- Fix sending of FTP keep-alive commands +- MSW: Windows Vista is no longer supported +- MSW: File and directory icons now also appear on systems that have no Windows directory + +3.25.1 (2017-03-20) + +- OS X: Fixed a crash if connecting to old servers not supporting UTF-8 +- Fixed timeout detection + +3.25.0 (2017-03-13) + ++ OS X: The minimum required OS X version is now 10.9 +- OS X: Disable App Nap during transfers and other operations +- OS X: Downloaded updates are now stored in the Downloads directory +- OS X: Fix initial toolbar state on startup if it was hidden when FileZilla was last closed +- Fix reconnect delay logic which broke in 3.25.0-beta1 +- Fix piecewise creation of remote paths using FTP which broke in 3.25.0-beta1 + +3.25.0-rc1 (2017-03-04) + +- Fix encryption selection for FTP in the Site Manager which broke in 3.25.0-beta1 +- Small changes to error message texts + +3.25.0-beta1 (2017-02-24) + ++ Major refactoring of the FileZilla internals. +- Scale width of fields in the status line control on high-DPI displays +- Fix duplicate mnemonic in "Files currently being edited" dialog. + +3.24.1 (2017-02-21) + +- Fixed rendering icons in the remote directory tree when DPI scaling is enabled on Windows Vista and some Windows 7 machines +- SFTP components have been updated and are now based on PuTTY 0.68 +- Updated builtin pugixml to version 1.8 + +3.24.0 (2017-01-13) + +- Fixed a possible crash if sending FTP commands fails during a directory listing operation +- *nix: Fixed a scrolling issue in the message log if wxWidgets is built against GTK3 + +3.24.0-rc1 (2017-01-06) + ++ The context menu for remote file search results now has a "Copy URL(s) to clipboard" item ++ Alt+number can now be used to switch between tabs in addition to Ctrl+number ++ SFTP hostkey fingerprints are now also shown as base64 encoded SHA256 hashes to match the new format displayed by OpenSSH +- Errors at the end of SFTP transfers now correctly result in transfer failures instead +- Cancelling synchronized browsing questions no longer prevents further directory changes +- Fix display issues for the filter conditions dialog +- Fix deleting multiple extensions on the filetype page in the settings +- OS X: Do not open dialogs while already processing an event, e.g. while a context menu is open + +3.23.0.2 (2016-12-06) + +- Key file paths entered in the Site Manager are now saved to corresponding server entries in the transfer queue +- MSW: Work around a bug in wxWidgets causing bad icons in the remote directory tree due to wxImageList::GetBitmap errorneously stripping the alpha channel from images +- Allow relative paths and environment variables in the "Cache directory" setting. + +3.23.0.1 (2016-12-05) + +- Work around a bug in wxWidgets that has been causing a virtually infinite loop when deleting toolbar buttons + +3.23.0 (2016-12-05) + +- Speed up icon scaling and cache scaled icons for faster subsequent loading. The cache directory can be changed through fzdefaults.xml using the "Cache directory" setting +- OS X: Fixed icon display on high-DPI displays in a few more dialogs +- Loading a corrupted layout.xml or search.xml no longer shows an error message, these files are now silently overwritten +- MSW: Fixed a regression where UNC paths where not handled correctly as config location in fzdefaults.xml + +3.23.0-rc1 (2016-11-28) + ++ New high-resolution icons ++ Improvements to the sizing of icons and other user interface elements on high-DPI displays. For technical reasons, existing theme settings have been reverted to their default values. They can be changed again in the settings dialog. ++ Make use of the Unix.ownername and Unix.groupname facts for MLSD if available +- The bookmarks menu updates again after changing global bookmarks +- Adding a site to the Site Manager as part of adding a site-specific bookmark no longer fails if sitemanager.xml does not yet exist +- Strip byte order marks at the beginning of directory listings +- Add an option to filezilla.xml to control cache ttl + +3.22.2.2 (2016-11-01) + +- Fixed trimming of FEAT response lines leading to incorrectly detected server features + +3.22.2.1 (2016-11-01) + +- OS X: Rebuilt to work around a nasty bug in XCode: Even when linking with -Wl,-no-weak-imports it links against functions not available on older OS X versions +- Fixed a crash on exotic servers only implementing factless MLST/MLSD + +3.22.2 (2016-11-01) + +- Tuned appearance of progress bar in transfer queue + +3.22.2-rc2 (2016-10-28) + +- SFTP: Renaming a file or directory where the new name already refers to a directory no longer moves the file into this directory. +- Fix regression from -rc1 with custom ports in the quickconnect bar +- Fix regression from -rc1 parsing the EPSV reply + +3.22.2-rc1 (2016-10-25) + ++ Building and running FileZilla now depends on libfilezilla >= 0.8.0 (https://lib.filezilla-project.org/). +- Non-existing key files are no longer silently dropped from the SFTP page in the settings dialog +- Further abbreviate log output if transferring files using SFTP +- Generic proxy usernames and passwords containing non-ASCII characters are again handled correctly +- Fixed an assertion if Ctrl+A is pressed in an empty file list +- *nix: Fixed color of status message in the message log +- *nix, OS X: Fixed an assertion adding files to the queue after having selected a large range of items +- *nix, OS X: Fixed an assertion due to a timing issue when renaming local files + +3.22.1 (2016-10-03) + +- OS X: Work around a nasty bug in XCode where programs explicitly compiled for older versions of OS X were silently pulling in features exclusive to the new version, resulting in crashes at runtime +- Fixed a potential crash when using SFTP + +3.22.0 (2016-10-01) + +- Bookmarks with the "Directory comparison" checkbox set now work correctly +- MSW: Fix background clearing issue on the size format settings page +- MSW: Toggling the log timestamp option no longer results in wrong log colors +- Fix for premature queue completion action + +3.22.0-rc1 (2016-09-24) + ++ Directory listing filters can now be exported and imported ++ Added the "not all" filter match type to filter out all items not matching all conditions ++ Added the "not all" search match type to search for all items not matching all conditions ++ Building and running FileZilla now depends on libfilezilla >= 0.7.0 (https://lib.filezilla-project.org/). ++ Building and running FileZilla now depends on GnuTLS >= 3.4.15 +- Speed up creation of socket and file i/o threads through the use of a thread pool +- Replace invalid characters in filenames when calculating the local filename for editing remote files +- The updater can now handle HTTPS servers that redirect to other HTTPS servers +- SFTP: Try password based login if a password-protected keyfile is rejected by the server instead of failing the login +- MSW: The shell extension now supports long paths on Windows 10 + +3.21.0 (2016-08-23) + +! Fixed a string format vulnerability introduced in 3.20.0-rc1 when listing directories using SFTP ++ SFTP: Added support for AES-GCM ciphers as implemented in OpenSSH ++ OS X: Ctrl+Tab and Ctrl+Shift+Tab can now be used to switch forward and backward between opened tabs +- Reduced time between TCP keepalive packets to 15 minutes on supporting platforms +- Fixed saving of directory listing filters with an attribute condition + +3.20.1 (2016-08-03) + +- Fixed rename file exists action on downloads +- Fixed possible crash if disabling log abbreviation +- Official binaries now link against a patched version of GnuTLS so that a better error message can be printed on broken servers that send malformed certificate chains + +3.20.0 (2016-07-27) + ++ Display error message if entering a non-existing path on local file search ++ Building and running FileZilla now depends on libfilezilla >= 0.6.1 (https://lib.filezilla-project.org/). + +3.20.0-rc1 (2016-07-20) + ++ Added compatibility for filenames with leading or trailing whitespace if using SFTP ++ Building and running FileZilla now depends on libfilezilla >= 0.6.0 (https://lib.filezilla-project.org/). ++ Building and running FileZilla now depends on GnuTLS 3.4.0 or higher +- Fixed regression introduced in 3.19.0-rc1, reconnecting again uses the last used remote directory instead of the initial default remote directory +- Fixed crash if creating a new site via the bookmarks dialog +- Queuing remote directories for transfer no longer exits comparison mode +- Fixed a rare crash using FTP over TLS if the control connection fails at the same time the data connection gets established +- Entering invalid regular expressions in filter and search conditions now shows an error message +- Fixed title of search dialog +- Stricter certificate chain validation to supplement the Tofu model +- *nix: Fix initial size of Site Manager dialog with some GTK versions + +3.19.0 (2016-06-27) + ++ Building FileZilla now depends on libfilezilla >= 0.5.3 (https://lib.filezilla-project.org/). +- Fixed context menu in search dialog if not connected to server +- OS X, *nix: Fix displayed text in file list status bar if selecting a single item in the file list out of multiple already selected items + +3.19.0-rc1 (2016-06-20) + ++ In the Site Manager a background colour for sites can now be selected ++ Open tabs can be re-arranged using drag&drop +- Fixed copying URLs of multiple selected files to clipboard +- Setting remote file timestamps did not take timezone offsets configured through the Site Manager into account + +3.18.0 (2016-05-27) + +- Small fixes to local file search +- Fixed a regression introduced in 3.18.0-rc1 when formatting hostnames for display + +3.18.0-rc1 (2016-05-20) + ++ The search functionality can now also be used to search local files ++ Reduced CPU consumption of adding files to the list of search results ++ Opening the remote context menu while holding shift allows copying URLs to clipboard that include the password ++ Added an option to the configuration file through which initiating drag&drop can be disallowed ++ Reduced memory footprint of some data structures ++ Building FileZilla now depends on libfilezilla >= 0.5.2 (https://lib.filezilla-project.org/). +- The remote file list context menu no longer shows inapplicable entries while files are being added to queue +- Fix date validation in filter and search conditions + +3.17.0.1 (2016-05-09) + +! MSW: Quoted the path to the uninstaller when executed from the installer to prevent an attacker from tricking the installer into running some other program instead +- SFTP: Fixed resuming SFTP transfers +- MSW: Loading the system default locale no longer fails on systems that have any English locale installed, yet do not have the US-English locale installed +- Fixed crash if update dialog is opened at the very same moment FileZilla is being closed. + +3.17.0 (2016-04-22) + +- *nix: Removed a label on the filter dialog that doesn't apply to *nix builds +- Fix compilation if Nettle is installed in a custom location +- Fix potential issues with destruction order when closing FileZilla + +3.17.0-rc1 (2016-04-15) + ++ Recursively queuing local files for upload now displays the progress below the local file list ++ MSW: Use dynamic TCP send buffer sizes to improve upload speeds on high-latency connections ++ SFTP: Use hardware-accelerated AES on x86_64 CPUs if available by using the AES implementation from Nettle instead of PuTTY ++ Building FileZilla now depends on the Nettle library, version 3.1 or later ++ Building FileZilla now depends on libfilezilla >= 0.5.0 (https://lib.filezilla-project.org/). +- MSW: The installer now warns if it detects old versions of FileZilla outside of the installation directory +- Improve compatibility with directory listings where midnight is represented as 24:00:00 of the prior day +- SFTP: Failed downloads due to write failures, e.g. due to a full disk, no longer show up as successful +- SFTP: Fix transfer failures if multiple transfers try to list the same directory +- SFTP: Updated PuTTY components +- FTP over TLS: Debug logs now contain additional information about the TLS handshake + + +3.16.1 (2016-03-16) + +! MSW: Updated installer to NSIS 3.0b3 to prevent DLL hijacking +- MSW: Fix string conversion functions of MinGW runtime libraries +- Updated PuTTY components +- Updated translations +- Official binaries now link against GnuTLS 3.4.10 +- Official binaries now link against SQLite 3.11.1 + +3.16.0 (2016-02-29) + +- Small fix for remembering queue completion actions + +3.16.0-rc1 (2016-02-21) + ++ Make notification bubble on queue completion configurable though the queue's context menu ++ Selected queue completion action is now remembered, excluding the system shutdown/sleep actions. ++ Added new servertype to the Site Manager for servers using MS-DOS style paths with forward slashes as separators ++ Building FileZilla now depends on libfilezilla >= 0.4.0 (https://lib.filezilla-project.org/). +- Fixes for network configuration wizard leading to incorrect test result +- MSW: Installer now removes leftover files from improperly uninstalled previous versions + 3.15.0.2 (2016-02-10) -- MSW: Binaries are now also signed using a SHA256 signature and certificate. +- MSW: Binaries are now also signed using a SHA-256 signature and certificate. - OS X: Move location of COPYING file containing the GPL to a different location in the bundle. On some systems OS X cannot verify the bundle with the file at the old location - Restore focused item if changing directory listing sort order - Fix restoring the column widths of the failed transfers tab in the queue when starting FileZilla @@ -24,7 +392,7 @@ 3.15.0 (2016-01-30) -+ MSW: Display notification bubble if FileZilla isn't in the forgeground and all active transfers have finished. ++ MSW: Display notification bubble if FileZilla isn't in the foreground and all active transfers have finished. 3.15.0-rc1 (2016-01-23) @@ -49,7 +417,7 @@ 3.14.1 (2015-10-16) + For third-party builds, add configure flag to allow using system ciphers for FTP over TLS. Display a warning if an insecure cipher is negotiated as result of using system ciphers. -- Fixed loading of the directory comparison flag for bookmakrs in the Site Manager +- Fixed loading of the directory comparison flag for bookmarks in the Site Manager - Changing the interface layout and icon theme no longer results in an inconsistent UI state - Some SFTP servers send additional information on errors. This information is now shown in the message log - If the local file cannot be opened on SFTP transfers FileZilla no longer automatically retries @@ -292,7 +660,7 @@ 3.10.0-beta1 (2014-12-03) + FTP over TLS is now used by default if the server supports it. Use of plain FTP can be enforced for a server in the Site Manager -+ Connection handling and transferring files has been moved into its own thread to improve GUI responsivenes ++ Connection handling and transferring files has been moved into its own thread to improve GUI responsiveness + The message log now only shows abbreviated logs unless an error occurs + Added option to pre-allocate disk space when downloading files + Files editing can now be started from the search dialog @@ -314,7 +682,7 @@ 3.9.0.4 (2014-09-06) - MSW: Fixed crash if starting file rename in an unusual way -- OS X: Fixed a bug im wxWidgets so that a right-click after a left-click no longer counts as double-click +- OS X: Fixed a bug in wxWidgets so that a right-click after a left-click no longer counts as double-click - OS X: Fixed pasting of passwords into the "Enter password" dialog - OS X: Fixed context menu site manager tree not working - *nix, OS X: Fixed context menu of search dialog not working diff -Nru filezilla-3.15.0.2/README filezilla-3.33.0/README --- filezilla-3.15.0.2/README 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/README 2018-01-03 04:30:05.000000000 +0000 @@ -1,7 +1,7 @@ FileZilla Client ---------------- - Copyright (C) 2004-2016 Tim Kosse + Copyright (C) 2004-2018 Tim Kosse https://filezilla-project.org/ Overview @@ -41,7 +41,7 @@ ----------------- FileZilla has been tested on the following platforms: -- Windows Vista, 7, 8.1 (9x/ME/NT4/2000/XP are not supported) +- Windows 7, 8.1 and 10 (9x/ME/NT4/2000/XP are not supported) - Several major Linux distributions - FreeBSD and other BSD variants - Mac OS X diff -Nru filezilla-3.15.0.2/src/dbus/desktop_notification.cpp filezilla-3.33.0/src/dbus/desktop_notification.cpp --- filezilla-3.15.0.2/src/dbus/desktop_notification.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/dbus/desktop_notification.cpp 2016-06-24 14:19:09.000000000 +0000 @@ -31,7 +31,7 @@ wxString body; wxString category; }; - std::list m_notifications; + std::list<_notification> m_notifications; bool HandleReply(wxDBusMessage& msg); bool HandleSignal(wxDBusMessage& msg); @@ -77,7 +77,7 @@ if (m_state == error) return; - struct _notification notification; + _notification notification; notification.summary = summary; notification.body = body; notification.category = category; @@ -97,7 +97,7 @@ m_state = busy; - struct _notification notification = m_notifications.front(); + _notification notification = m_notifications.front(); m_notifications.pop_front(); wxDBusMethodCall *call = new wxDBusMethodCall( diff -Nru filezilla-3.15.0.2/src/dbus/Makefile.in filezilla-3.33.0/src/dbus/Makefile.in --- filezilla-3.15.0.2/src/dbus/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/dbus/Makefile.in 2018-05-07 08:45:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,16 +92,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/dbus -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -103,6 +114,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -187,6 +200,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -198,11 +212,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -226,6 +240,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -246,16 +262,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -307,6 +331,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -346,6 +371,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -393,7 +419,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/dbus/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/dbus/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -747,6 +772,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru filezilla-3.15.0.2/src/dbus/power_management_inhibitor.cpp filezilla-3.33.0/src/dbus/power_management_inhibitor.cpp --- filezilla-3.15.0.2/src/dbus/power_management_inhibitor.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/dbus/power_management_inhibitor.cpp 2016-06-24 14:19:09.000000000 +0000 @@ -27,9 +27,9 @@ bool HandleReply(wxDBusMessage& msg); bool HandleSignal(wxDBusMessage& msg); - enum _state m_state; + _state m_state; - enum _state m_intended_state; + _state m_intended_state; unsigned int m_cookie; bool m_use_gsm; diff -Nru filezilla-3.15.0.2/src/dbus/session_manager.cpp filezilla-3.33.0/src/dbus/session_manager.cpp --- filezilla-3.15.0.2/src/dbus/session_manager.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/dbus/session_manager.cpp 2016-06-24 14:19:09.000000000 +0000 @@ -35,8 +35,7 @@ bool HandleReply(wxDBusMessage& msg); bool HandleSignal(wxDBusMessage& msg); - enum state m_state; - + state m_state; char* m_client_object_path; unsigned int m_serial; diff -Nru filezilla-3.15.0.2/src/Dependencies.props.example filezilla-3.33.0/src/Dependencies.props.example --- filezilla-3.15.0.2/src/Dependencies.props.example 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/Dependencies.props.example 2017-02-23 19:24:50.000000000 +0000 @@ -9,8 +9,8 @@ x:\xample\libfilezilla\lib x:\xample\wxwidgets\include;x:\xample\wxwidgets\include\msvc x:\xample\wxwidgets\lib\vc_lib - x:\xample\gnutls-3.1.10-win\include - x:\xample\gnutls-3.1.10-win\bin + x:\xample\gnutls-3.4.9-win32\include + x:\xample\gnutls-3.4.9-win32\bin x:\xample\sqlite-amalgamation-3080200 x:\xample\sqlite-amalgamation-3080200 @@ -18,8 +18,8 @@ - $(libfilezilla_include);$(wxwidgets_include);$(gnutls_include);$(sqlite3_include);$(IncludePath) - $(libfilezilla_lib);$(wxwidgets_lib);$(gnutls_lib);$(sqlite3_lib);$(LibraryPath) + $(libfilezilla_include);$(gnutls_include);$(sqlite3_include);$(IncludePath) + $(libfilezilla_lib);$(gnutls_lib);$(sqlite3_lib);$(LibraryPath) diff -Nru filezilla-3.15.0.2/src/engine/backend.cpp filezilla-3.33.0/src/engine/backend.cpp --- filezilla-3.15.0.2/src/engine/backend.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/backend.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -4,27 +4,28 @@ #include "socket.h" #include -CBackend::CBackend(fz::event_handler* pEvtHandler) : m_pEvtHandler(pEvtHandler) +CBackend::CBackend(fz::event_handler* pEvtHandler) + : m_pEvtHandler(pEvtHandler) { } CBackend::~CBackend() { - RemoveSocketEvents(m_pEvtHandler, this); + remove_socket_events(m_pEvtHandler, this); } -CSocketBackend::CSocketBackend(fz::event_handler* pEvtHandler, CSocket & socket, CRateLimiter& rateLimiter) +CSocketBackend::CSocketBackend(fz::event_handler* pEvtHandler, fz::socket & socket, CRateLimiter& rateLimiter) : CBackend(pEvtHandler) , socket_(socket) , m_rateLimiter(rateLimiter) { - socket_.SetEventHandler(pEvtHandler); + socket_.set_event_handler(pEvtHandler); m_rateLimiter.AddObject(this); } CSocketBackend::~CSocketBackend() { - socket_.SetEventHandler(0); + socket_.set_event_handler(nullptr); m_rateLimiter.RemoveObject(this); } @@ -36,13 +37,15 @@ error = EAGAIN; return -1; } - else if (max > 0 && max < len) - len = max; + else if (max > 0 && max < len) { + len = static_cast(max); + } - int written = socket_.Write(buffer, len, error); + int written = socket_.write(buffer, len, error); - if (written > 0 && max != -1) + if (written > 0 && max != -1) { UpdateUsage(CRateLimiter::outbound, written); + } return written; } @@ -55,26 +58,30 @@ error = EAGAIN; return -1; } - else if (max > 0 && max < len) - len = max; + else if (max > 0 && max < len) { + len = static_cast(max); + } - int read = socket_.Read(buffer, len, error); + int read = socket_.read(buffer, len, error); - if (read > 0 && max != -1) + if (read > 0 && max != -1) { UpdateUsage(CRateLimiter::inbound, read); + } return read; } int CSocketBackend::Peek(void *buffer, unsigned int len, int& error) { - return socket_.Peek(buffer, len, error); + return socket_.peek(buffer, len, error); } void CSocketBackend::OnRateAvailable(CRateLimiter::rate_direction direction) { - if (direction == CRateLimiter::outbound) - m_pEvtHandler->send_event(this, SocketEventType::write, 0); - else - m_pEvtHandler->send_event(this, SocketEventType::read, 0); + if (direction == CRateLimiter::outbound) { + m_pEvtHandler->send_event(this, fz::socket_event_flag::write, 0); + } + else { + m_pEvtHandler->send_event(this, fz::socket_event_flag::read, 0); + } } diff -Nru filezilla-3.15.0.2/src/engine/backend.h filezilla-3.33.0/src/engine/backend.h --- filezilla-3.15.0.2/src/engine/backend.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/backend.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,13 +1,13 @@ -#ifndef __BACKEND_H__ -#define __BACKEND_H__ +#ifndef FILEZILLA_ENGINE_BACKEND_HEADER +#define FILEZILLA_ENGINE_BACKEND_HEADER #include "ratelimiter.h" #include "socket.h" -class CBackend : public CRateLimiterObject, public CSocketEventSource +class CBackend : public CRateLimiterObject, public fz::socket_event_source { public: - CBackend(fz::event_handler* pEvtHandler); + explicit CBackend(fz::event_handler* pEvtHandler); virtual ~CBackend(); CBackend(CBackend const&) = delete; @@ -23,22 +23,25 @@ fz::event_handler* const m_pEvtHandler; }; +namespace fz { class CSocket; +} + class CSocketBackend final : public CBackend { public: - CSocketBackend(fz::event_handler* pEvtHandler, CSocket & socket, CRateLimiter& rateLimiter); + CSocketBackend(fz::event_handler* pEvtHandler, fz::socket & socket, CRateLimiter& rateLimiter); virtual ~CSocketBackend(); // Backend definitions - virtual int Read(void *buffer, unsigned int size, int& error); - virtual int Peek(void *buffer, unsigned int size, int& error); - virtual int Write(const void *buffer, unsigned int size, int& error); + virtual int Read(void *buffer, unsigned int size, int& error) override; + virtual int Peek(void *buffer, unsigned int size, int& error) override; + virtual int Write(const void *buffer, unsigned int size, int& error) override; protected: - virtual void OnRateAvailable(CRateLimiter::rate_direction direction); + virtual void OnRateAvailable(CRateLimiter::rate_direction direction) override; - CSocket &socket_; + fz::socket &socket_; CRateLimiter& m_rateLimiter; }; -#endif //__BACKEND_H__ +#endif diff -Nru filezilla-3.15.0.2/src/engine/commands.cpp filezilla-3.33.0/src/engine/commands.cpp --- filezilla-3.15.0.2/src/engine/commands.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/commands.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,22 +1,26 @@ #include -CConnectCommand::CConnectCommand(CServer const& server, bool retry_connecting /*=true*/) - : m_Server(server) - , m_retry_connecting(retry_connecting) +CConnectCommand::CConnectCommand(CServer const& server, Credentials const& credentials, bool retry_connecting) + : server_(server) + , credentials_(credentials) + , retry_connecting_(retry_connecting) { } -CServer const& CConnectCommand::GetServer() const +bool CConnectCommand::valid() const { - return m_Server; + if (!server_ || server_.GetUser().empty()) { + return false; + } + return true; } -CListCommand::CListCommand(int flags /*=0*/) +CListCommand::CListCommand(int flags) : m_flags(flags) { } -CListCommand::CListCommand(CServerPath path, wxString subDir, int flags) +CListCommand::CListCommand(CServerPath path, std::wstring const& subDir, int flags) : m_path(path), m_subDir(subDir), m_flags(flags) { } @@ -26,7 +30,7 @@ return m_path; } -wxString CListCommand::GetSubDir() const +std::wstring CListCommand::GetSubDir() const { return m_subDir; } @@ -47,16 +51,16 @@ return true; } -CFileTransferCommand::CFileTransferCommand(const wxString &localFile, const CServerPath& remotePath, - const wxString &remoteFile, bool download, - const CFileTransferCommand::t_transferSettings& transferSettings) +CFileTransferCommand::CFileTransferCommand(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const& transferSettings) : m_localFile(localFile), m_remotePath(remotePath), m_remoteFile(remoteFile) , m_download(download) , m_transferSettings(transferSettings) { } -wxString CFileTransferCommand::GetLocalFile() const +std::wstring CFileTransferCommand::GetLocalFile() const { return m_localFile; } @@ -66,7 +70,7 @@ return m_remotePath; } -wxString CFileTransferCommand::GetRemoteFile() const +std::wstring CFileTransferCommand::GetRemoteFile() const { return m_remoteFile; } @@ -76,22 +80,22 @@ return m_download; } -CRawCommand::CRawCommand(const wxString &command) +CRawCommand::CRawCommand(std::wstring const& command) { m_command = command; } -wxString CRawCommand::GetCommand() const +std::wstring CRawCommand::GetCommand() const { return m_command; } -CDeleteCommand::CDeleteCommand(const CServerPath& path, std::deque&& files) +CDeleteCommand::CDeleteCommand(const CServerPath& path, std::deque&& files) : m_path(path), m_files(files) { } -CRemoveDirCommand::CRemoveDirCommand(const CServerPath& path, const wxString& subDir) +CRemoveDirCommand::CRemoveDirCommand(const CServerPath& path, std::wstring const& subDir) : m_path(path), m_subDir(subDir) { } @@ -111,8 +115,8 @@ return !GetPath().empty() && GetPath().HasParent(); } -CRenameCommand::CRenameCommand(const CServerPath& fromPath, const wxString& fromFile, - const CServerPath& toPath, const wxString& toFile) +CRenameCommand::CRenameCommand(CServerPath const& fromPath, std::wstring const& fromFile, + CServerPath const& toPath, std::wstring const& toFile) : m_fromPath(fromPath) , m_toPath(toPath) , m_fromFile(fromFile) @@ -124,7 +128,7 @@ return !GetFromPath().empty() && !GetToPath().empty() && !GetFromFile().empty() && !GetToFile().empty(); } -CChmodCommand::CChmodCommand(const CServerPath& path, const wxString& file, const wxString& permission) +CChmodCommand::CChmodCommand(CServerPath const& path, std::wstring const& file, std::wstring const& permission) : m_path(path) , m_file(file) , m_permission(permission) diff -Nru filezilla-3.15.0.2/src/engine/ControlSocket.cpp filezilla-3.33.0/src/engine/ControlSocket.cpp --- filezilla-3.15.0.2/src/engine/ControlSocket.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/ControlSocket.cpp 2018-05-07 08:20:55.000000000 +0000 @@ -12,10 +12,11 @@ #include #include -#include -#include +#include + +#ifndef FZ_WINDOWS + #include -#ifndef __WXMSW__ #define mutex mutex_override // Sadly on some platforms system headers include conflicting names #include #undef mutex @@ -32,38 +33,11 @@ std::list CControlSocket::m_lockInfoList; -COpData::COpData(Command op_Id) - : opId(op_Id) -{ - opState = 0; - - pNextOpData = 0; - - waitForAsyncRequest = false; - - holdsLock = false; -} - -COpData::~COpData() -{ - delete pNextOpData; -} - CControlSocket::CControlSocket(CFileZillaEnginePrivate & engine) : CLogging(engine) , event_handler(engine.event_loop_) , engine_(engine) { - m_pCurOpData = 0; - m_nOpState = 0; - m_pCurrentServer = 0; - - m_pCSConv = 0; - m_useUTF8 = false; - - m_closed = false; - - m_invalidateCurrentPath = false; } CControlSocket::~CControlSocket() @@ -71,9 +45,6 @@ remove_handler(); DoClose(); - - delete m_pCSConv; - m_pCSConv = 0; } int CControlSocket::Disconnect() @@ -86,143 +57,163 @@ Command CControlSocket::GetCurrentCommandId() const { - if (m_pCurOpData) - return m_pCurOpData->opId; + if (!operations_.empty()) { + return operations_.back()->opId; + } return engine_.GetCurrentCommandId(); } void CControlSocket::LogTransferResultMessage(int nErrorCode, CFileTransferOpData *pData) { - bool tmp; + bool tmp{}; CTransferStatus const status = engine_.transfer_status_.Get(tmp); if (!status.empty() && (nErrorCode == FZ_REPLY_OK || status.madeProgress)) { int elapsed = static_cast((fz::datetime::now() - status.started).get_seconds()); - if (elapsed <= 0) + if (elapsed <= 0) { elapsed = 1; - wxString time = wxString::Format( - wxPLURAL("%d second", "%d seconds", elapsed), - elapsed); + } + std::wstring time = fz::sprintf(fztranslate("%d second", "%d seconds", elapsed), elapsed); int64_t transferred = status.currentOffset - status.startOffset; - wxString size = CSizeFormatBase::Format(&engine_.GetOptions(), transferred, true); + std::wstring size = CSizeFormatBase::Format(&engine_.GetOptions(), transferred, true); MessageType msgType = MessageType::Error; - wxString msg; + std::wstring msg; if (nErrorCode == FZ_REPLY_OK) { msgType = MessageType::Status; msg = _("File transfer successful, transferred %s in %s"); } - else if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) + else if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { msg = _("File transfer aborted by user after transferring %s in %s"); - else if ((nErrorCode & FZ_REPLY_CRITICALERROR) == FZ_REPLY_CRITICALERROR) + } + else if ((nErrorCode & FZ_REPLY_CRITICALERROR) == FZ_REPLY_CRITICALERROR) { msg = _("Critical file transfer error after transferring %s in %s"); - else + } + else { msg = _("File transfer failed after transferring %s in %s"); + } LogMessage(msgType, msg, size, time); } else { - if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) + if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { LogMessage(MessageType::Error, _("File transfer aborted by user")); + } else if (nErrorCode == FZ_REPLY_OK) { - if (pData->transferInitiated) + if (pData->transferInitiated_) { LogMessage(MessageType::Status, _("File transfer successful")); - else + } + else { LogMessage(MessageType::Status, _("File transfer skipped")); + } } - else if ((nErrorCode & FZ_REPLY_CRITICALERROR) == FZ_REPLY_CRITICALERROR) + else if ((nErrorCode & FZ_REPLY_CRITICALERROR) == FZ_REPLY_CRITICALERROR) { LogMessage(MessageType::Error, _("Critical file transfer error")); - else + } + else { LogMessage(MessageType::Error, _("File transfer failed")); + } } } +void CControlSocket::Push(std::unique_ptr && operation) +{ + operations_.emplace_back(std::move(operation)); +} + int CControlSocket::ResetOperation(int nErrorCode) { - LogMessage(MessageType::Debug_Verbose, _T("CControlSocket::ResetOperation(%d)"), nErrorCode); + LogMessage(MessageType::Debug_Verbose, L"CControlSocket::ResetOperation(%d)", nErrorCode); if (nErrorCode & FZ_REPLY_WOULDBLOCK) { - LogMessage(MessageType::Debug_Warning, _T("ResetOperation with FZ_REPLY_WOULDBLOCK in nErrorCode (%d)"), nErrorCode); + LogMessage(MessageType::Debug_Warning, L"ResetOperation with FZ_REPLY_WOULDBLOCK in nErrorCode (%d)", nErrorCode); } - if (m_pCurOpData && m_pCurOpData->holdsLock) - UnlockCache(); + std::unique_ptr oldOperation; + if (!operations_.empty()) { + if (operations_.back()->holdsLock_) { + ReleaseLock(); + } + oldOperation = std::move(operations_.back()); + operations_.pop_back(); - if (m_pCurOpData && m_pCurOpData->pNextOpData) { - COpData *pNext = m_pCurOpData->pNextOpData; - m_pCurOpData->pNextOpData = 0; - delete m_pCurOpData; - m_pCurOpData = pNext; + nErrorCode = oldOperation->Reset(nErrorCode); + } + if (!operations_.empty()) { + int ret; if (nErrorCode == FZ_REPLY_OK || nErrorCode == FZ_REPLY_ERROR || nErrorCode == FZ_REPLY_CRITICALERROR) { - return ParseSubcommandResult(nErrorCode); + ret = ParseSubcommandResult(nErrorCode, *oldOperation); + } + else { + ret = ResetOperation(nErrorCode); } - else - return ResetOperation(nErrorCode); + return ret; } - wxString prefix; + std::wstring prefix; if ((nErrorCode & FZ_REPLY_CRITICALERROR) == FZ_REPLY_CRITICALERROR && - (!m_pCurOpData || m_pCurOpData->opId != Command::transfer)) + (!oldOperation || oldOperation->opId != Command::transfer)) { - prefix = _("Critical error:") + _T(" "); + prefix = _("Critical error:") + L" "; } - if (m_pCurOpData) { - const Command commandId = m_pCurOpData->opId; + if (oldOperation) { + const Command commandId = oldOperation->opId; switch (commandId) { case Command::none: - if( !prefix.empty() ) { + if (!prefix.empty()) { LogMessage(MessageType::Error, _("Critical error")); } break; case Command::connect: - if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) + if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { LogMessage(MessageType::Error, prefix + _("Connection attempt interrupted by user")); - else if (nErrorCode != FZ_REPLY_OK) + } + else if (nErrorCode != FZ_REPLY_OK) { LogMessage(MessageType::Error, prefix + _("Could not connect to server")); + } break; case Command::list: - if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) + if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { LogMessage(MessageType::Error, prefix + _("Directory listing aborted by user")); - else if (nErrorCode != FZ_REPLY_OK) + } + else if (nErrorCode != FZ_REPLY_OK) { LogMessage(MessageType::Error, prefix + _("Failed to retrieve directory listing")); + } else { - if (m_CurrentPath.empty()) { + if (currentPath_.empty()) { LogMessage(MessageType::Status, _("Directory listing successful")); } else { - LogMessage(MessageType::Status, _("Directory listing of \"%s\" successful"), m_CurrentPath.GetPath()); + LogMessage(MessageType::Status, _("Directory listing of \"%s\" successful"), currentPath_.GetPath()); } } break; case Command::transfer: { - CFileTransferOpData *pData = static_cast(m_pCurOpData); - if (!pData->download && pData->transferInitiated) { - if (!m_pCurrentServer) - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurrentServer is 0")); + auto & data = static_cast(*oldOperation); + if (!data.download_ && data.transferInitiated_) { + if (!currentServer_) { + LogMessage(MessageType::Debug_Warning, L"currentServer_ is empty"); + } else { - bool updated = engine_.GetDirectoryCache().UpdateFile(*m_pCurrentServer, pData->remotePath, pData->remoteFile, true, CDirectoryCache::file, (nErrorCode == FZ_REPLY_OK) ? pData->localFileSize : -1); - if (updated) - engine_.SendDirectoryListingNotification(pData->remotePath, false, true, false); + UpdateCache(data, data.remotePath_, data.remoteFile_, (nErrorCode == FZ_REPLY_OK) ? data.localFileSize_ : -1); } } - LogTransferResultMessage(nErrorCode, pData); + LogTransferResultMessage(nErrorCode, &data); } break; default: - if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) + if ((nErrorCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { LogMessage(MessageType::Error, prefix + _("Interrupted by user")); + } break; } - - delete m_pCurOpData; - m_pCurOpData = 0; } engine_.transfer_status_.Reset(); @@ -230,18 +221,26 @@ SetWait(false); if (m_invalidateCurrentPath) { - m_CurrentPath.clear(); + currentPath_.clear(); m_invalidateCurrentPath = false; } return engine_.ResetOperation(nErrorCode); } -int CControlSocket::DoClose(int nErrorCode /*=FZ_REPLY_DISCONNECTED*/) +void CControlSocket::UpdateCache(COpData const &, CServerPath const& serverPath, std::wstring const& remoteFile, int64_t fileSize) { - LogMessage(MessageType::Debug_Debug, _T("CControlSocket::DoClose(%d)"), nErrorCode); + bool updated = engine_.GetDirectoryCache().UpdateFile(currentServer_, serverPath, remoteFile, true, CDirectoryCache::file, fileSize); + if (updated) { + SendDirectoryListingNotification(serverPath, false, false); + } +} + +int CControlSocket::DoClose(int nErrorCode) +{ + LogMessage(MessageType::Debug_Debug, L"CControlSocket::DoClose(%d)", nErrorCode); if (m_closed) { - wxASSERT(!m_pCurOpData); + assert(operations_.empty()); return nErrorCode; } @@ -249,44 +248,43 @@ nErrorCode = ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED | nErrorCode); - delete m_pCurrentServer; - m_pCurrentServer = 0; + currentServer_.clear(); return nErrorCode; } -wxString CControlSocket::ConvertDomainName(wxString const& domain) +std::wstring CControlSocket::ConvertDomainName(std::wstring const& domain) { -#ifdef __WXMSW__ - int len = IdnToAscii(IDN_ALLOW_UNASSIGNED, domain.wc_str(), domain.size() + 1, 0, 0); +#ifdef FZ_WINDOWS + int len = IdnToAscii(IDN_ALLOW_UNASSIGNED, domain.c_str(), domain.size() + 1, nullptr, 0); if (!len) { - LogMessage(MessageType::Debug_Warning, _T("Could not convert domain name")); + LogMessage(MessageType::Debug_Warning, L"Could not convert domain name"); return domain; } wchar_t* output = new wchar_t[len]; - int res = IdnToAscii(IDN_ALLOW_UNASSIGNED, domain.wc_str(), domain.size() + 1, output, len); + int res = IdnToAscii(IDN_ALLOW_UNASSIGNED, domain.c_str(), domain.size() + 1, output, len); if (!res) { delete [] output; - LogMessage(MessageType::Debug_Warning, _T("Could not convert domain name")); + LogMessage(MessageType::Debug_Warning, L"Could not convert domain name"); return domain; } - wxString ret(output); + std::wstring ret(output); delete [] output; return ret; #elif defined(AI_IDN) return domain; #else - wxScopedCharBuffer const utf8 = domain.utf8_str(); + std::string const utf8 = fz::to_utf8(domain); char *output = 0; - if (idna_to_ascii_8z(utf8, &output, IDNA_ALLOW_UNASSIGNED)) { - LogMessage(MessageType::Debug_Warning, _T("Could not convert domain name")); + if (idna_to_ascii_8z(utf8.c_str(), &output, IDNA_ALLOW_UNASSIGNED)) { + LogMessage(MessageType::Debug_Warning, L"Could not convert domain name"); return domain; } - wxString result = wxConvCurrent->cMB2WX(output); + std::wstring result = fz::to_wstring(std::string(output)); idn_free(output); return result; #endif @@ -294,61 +292,67 @@ void CControlSocket::Cancel() { - if (GetCurrentCommandId() != Command::none) - { - if (GetCurrentCommandId() == Command::connect) + if (GetCurrentCommandId() != Command::none) { + if (GetCurrentCommandId() == Command::connect) { DoClose(FZ_REPLY_CANCELED); - else + } + else { ResetOperation(FZ_REPLY_CANCELED); + } } } -const CServer* CControlSocket::GetCurrentServer() const +CServer const& CControlSocket::GetCurrentServer() const { - return m_pCurrentServer; + return currentServer_; } -bool CControlSocket::ParsePwdReply(wxString reply, bool unquoted /*=false*/, const CServerPath& defaultPath /*=CServerPath()*/) +bool CControlSocket::ParsePwdReply(std::wstring reply, bool unquoted, CServerPath const& defaultPath) { - if (!unquoted) - { - int pos1 = reply.Find('"'); - int pos2 = reply.Find('"', true); - if (pos1 == -1 || pos1 >= pos2) { - pos1 = reply.Find('\''); - pos2 = reply.Find('\'', true); - - if (pos1 != -1 && pos1 < pos2) - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Broken server sending single-quoted path instead of double-quoted path.")); - } - if (pos1 == -1 || pos1 >= pos2) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Broken server, no quoted path found in pwd reply, trying first token as path")); - pos1 = reply.Find(' '); - if (pos1 != -1) { - reply = reply.Mid(pos1 + 1); - pos2 = reply.Find(' '); - if (pos2 != -1) - reply = reply.Left(pos2); + if (!unquoted) { + size_t pos1 = reply.find('"'); + size_t pos2 = reply.rfind('"'); + // Due to searching the same character, pos1 is npos iff pos2 is npos + + if (pos1 == std::wstring::npos || pos1 >= pos2) { + pos1 = reply.find('\''); + pos2 = reply.rfind('\''); + + if (pos1 != std::wstring::npos && pos1 < pos2) { + LogMessage(MessageType::Debug_Info, L"Broken server sending single-quoted path instead of double-quoted path."); } - else + } + if (pos1 == std::wstring::npos || pos1 >= pos2) { + LogMessage(MessageType::Debug_Info, L"Broken server, no quoted path found in pwd reply, trying first token as path"); + pos1 = reply.find(' '); + if (pos1 != std::wstring::npos) { + reply = reply.substr(pos1 + 1); + pos2 = reply.find(' '); + if (pos2 != std::wstring::npos) + reply = reply.substr(0, pos2); + } + else { reply.clear(); + } } else { - reply = reply.Mid(pos1 + 1, pos2 - pos1 - 1); - reply.Replace(_T("\"\""), _T("\"")); + reply = reply.substr(pos1 + 1, pos2 - pos1 - 1); + fz::replace_substrings(reply, L"\"\"", L"\""); } } - m_CurrentPath.SetType(m_pCurrentServer->GetType()); - if (reply.empty() || !m_CurrentPath.SetPath(reply)) { - if (reply.empty()) + currentPath_.SetType(currentServer_.GetType()); + if (reply.empty() || !currentPath_.SetPath(reply)) { + if (reply.empty()) { LogMessage(MessageType::Error, _("Server returned empty path.")); - else + } + else { LogMessage(MessageType::Error, _("Failed to parse returned path.")); + } if (!defaultPath.empty()) { - LogMessage(MessageType::Debug_Warning, _T("Assuming path is '%s'."), defaultPath.GetPath()); - m_CurrentPath = defaultPath; + LogMessage(MessageType::Debug_Warning, L"Assuming path is '%s'.", defaultPath.GetPath()); + currentPath_ = defaultPath; return true; } return false; @@ -359,68 +363,69 @@ int CControlSocket::CheckOverwriteFile() { - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; + LogMessage(MessageType::Debug_Debug, L"CControlSocket::CheckOverwriteFile()"); + if (operations_.empty() || operations_.back()->opId != Command::transfer) { + LogMessage(MessageType::Debug_Info, L"CheckOverwriteFile called without active transfer."); + return FZ_REPLY_INTERNALERROR; } - CFileTransferOpData *pData = static_cast(m_pCurOpData); + auto & data = static_cast(*operations_.back()); - if (pData->download) - { - if (!wxFile::Exists(pData->localFile)) + if (data.download_) { + if (fz::local_filesys::get_file_type(fz::to_native(data.localFile_), true) != fz::local_filesys::file) { return FZ_REPLY_OK; + } } CDirentry entry; bool dirDidExist; bool matchedCase; CServerPath remotePath; - if (pData->tryAbsolutePath || m_CurrentPath.empty()) - remotePath = pData->remotePath; - else - remotePath = m_CurrentPath; - bool found = engine_.GetDirectoryCache().LookupFile(entry, *m_pCurrentServer, remotePath, pData->remoteFile, dirDidExist, matchedCase); + if (data.tryAbsolutePath_ || currentPath_.empty()) { + remotePath = data.remotePath_; + } + else { + remotePath = currentPath_; + } + bool found = engine_.GetDirectoryCache().LookupFile(entry, currentServer_, remotePath, data.remoteFile_, dirDidExist, matchedCase); // Ignore entries with wrong case if (found && !matchedCase) found = false; - if (!pData->download) { - if (!found && pData->remoteFileSize < 0 && !pData->fileTime.empty()) + if (!data.download_) { + if (!found && data.remoteFileSize_ < 0 && data.fileTime_.empty()) { return FZ_REPLY_OK; + } } CFileExistsNotification *pNotification = new CFileExistsNotification; - pNotification->download = pData->download; - pNotification->localFile = pData->localFile; - pNotification->remoteFile = pData->remoteFile; - pNotification->remotePath = pData->remotePath; - pNotification->localSize = pData->localFileSize; - pNotification->remoteSize = pData->remoteFileSize; - pNotification->ascii = !pData->transferSettings.binary; + pNotification->download = data.download_; + pNotification->localFile = data.localFile_; + pNotification->remoteFile = data.remoteFile_; + pNotification->remotePath = data.remotePath_; + pNotification->localSize = data.localFileSize_; + pNotification->remoteSize = data.remoteFileSize_; + pNotification->remoteTime = data.fileTime_; + pNotification->ascii = !data.transferSettings_.binary; - if (pData->download && pNotification->localSize >= 0) + if (data.download_ && pNotification->localSize >= 0) { pNotification->canResume = true; - else if (!pData->download && pNotification->remoteSize >= 0) + } + else if (!data.download_ && pNotification->remoteSize >= 0) { pNotification->canResume = true; - else + } + else { pNotification->canResume = false; + } - pNotification->localTime = fz::local_filesys::get_modification_time(fz::to_native(pData->localFile)); - - if (pData->fileTime.empty()) - pNotification->remoteTime = pData->fileTime; + pNotification->localTime = fz::local_filesys::get_modification_time(fz::to_native(data.localFile_)); if (found) { - if (!pData->fileTime.empty()) { - if (entry.has_date()) { - pNotification->remoteTime = entry.time; - pData->fileTime = entry.time; - } + if (pNotification->remoteTime.empty() && entry.has_date()) { + pNotification->remoteTime = entry.time; + data.fileTime_ = entry.time; } } @@ -429,122 +434,73 @@ return FZ_REPLY_WOULDBLOCK; } -CFileTransferOpData::CFileTransferOpData(bool is_download, const wxString& local_file, const wxString& remote_file, const CServerPath& remote_path) : - COpData(Command::transfer), - localFile(local_file), remoteFile(remote_file), remotePath(remote_path), - download(is_download) +CFileTransferOpData::CFileTransferOpData(bool is_download, std::wstring const& local_file, std::wstring const& remote_file, CServerPath const& remote_path) + : COpData(Command::transfer) + , localFile_(local_file), remoteFile_(remote_file), remotePath_(remote_path) + , download_(is_download) { } -CFileTransferOpData::~CFileTransferOpData() +std::wstring CControlSocket::ConvToLocal(char const* buffer, size_t len) { -} + std::wstring ret; + + if (!len) { + return ret; + } -wxString CControlSocket::ConvToLocal(const char* buffer, size_t len) -{ - size_t outLen{}; if (m_useUTF8) { - wxChar* out = ConvToLocalBuffer(buffer, wxConvUTF8, len, outLen); - if (out) { - wxString str(out, outLen - 1); - delete [] out; - return str; + ret = fz::to_wstring_from_utf8(buffer, len); + if (!ret.empty()) { + return ret; } - - // Fall back to local charset on error - if (m_pCurrentServer->GetEncodingType() != ENCODING_UTF8) { + + if (currentServer_.GetEncodingType() != ENCODING_UTF8) { LogMessage(MessageType::Status, _("Invalid character sequence received, disabling UTF-8. Select UTF-8 option in site manager to force UTF-8.")); m_useUTF8 = false; } } - if (m_pCSConv) { - wxChar* out = ConvToLocalBuffer(buffer, *m_pCSConv, len, outLen); - if (out) { - wxString str(out, outLen - 1); - delete [] out; - return str; - } - } - - wxCSConv conv(_T("ISO-8859-1")); - wxString str = conv.cMB2WX(buffer); - if (str.empty()) - str = wxConvCurrent->cMB2WX(buffer); - - return str; -} - -wxChar* CControlSocket::ConvToLocalBuffer(const char* buffer, wxMBConv& conv, size_t len, size_t& outlen) -{ - wxASSERT(buffer && len > 0 && !buffer[len - 1]); - outlen = conv.ToWChar(0, 0, buffer, len); - if (!outlen || outlen == wxCONV_FAILED) - return 0; - - wchar_t* unicode = new wchar_t[outlen]; - conv.ToWChar(unicode, outlen, buffer, len); - return unicode; -} - -wxChar* CControlSocket::ConvToLocalBuffer(const char* buffer, size_t len, size_t& outlen) -{ - if (m_useUTF8) { -#ifdef __WXMSW__ - // wxConvUTF8 is generic and slow. - // Use the highly optimized MultiByteToWideChar on Windows - // This helps when processing large directory listings. - int outlen2 = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, buffer, len, 0, 0); - if (outlen2 > 0) { - wxChar* out = new wxChar[outlen2]; - MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, buffer, len, out, outlen2); - outlen = static_cast(outlen2); - return out; - } -#else - wxChar* res = ConvToLocalBuffer(buffer, wxConvUTF8, len, outlen); - if (res && *res) - return res; -#endif - - // Fall back to local charset on error - if (m_pCurrentServer->GetEncodingType() != ENCODING_UTF8) { - LogMessage(MessageType::Status, _("Invalid character sequence received, disabling UTF-8. Select UTF-8 option in site manager to force UTF-8.")); - m_useUTF8 = false; + if (currentServer_.GetEncodingType() == ENCODING_CUSTOM) { + ret = engine_.GetEncodingConverter().toLocal(currentServer_.GetCustomEncoding(), buffer, len); + if (!ret.empty()) { + return ret; } } - if (m_pCSConv) { - wxChar* res = ConvToLocalBuffer(buffer, *m_pCSConv, len, outlen); - if (res && *res) - return res; +#ifdef FZ_WINDOWS + // Only for Windows as other platforms should be UTF-8 anyhow. + ret = fz::to_wstring(std::string(buffer, len)); + if (!ret.empty()) { + return ret; } +#endif - // Fallback: Conversion using current locale - wxChar* res = ConvToLocalBuffer(buffer, *wxConvCurrent, len, outlen); + // Treat it as ISO8859-1 + ret.assign(reinterpret_cast(buffer), reinterpret_cast(buffer + len)); - return res; + return ret; } -wxCharBuffer CControlSocket::ConvToServer(const wxString& str, bool force_utf8 /*=false*/) +std::string CControlSocket::ConvToServer(std::wstring const& str, bool force_utf8) { + std::string ret; if (m_useUTF8 || force_utf8) { - wxCharBuffer const buffer = str.utf8_str(); - if (buffer || force_utf8) - return buffer; + ret = fz::to_utf8(str); + if (!ret.empty() || force_utf8) { + return ret; + } } - if (m_pCSConv) { - wxCharBuffer const buffer = str.mb_str(*m_pCSConv); - if (buffer) - return buffer; + if (currentServer_.GetEncodingType() == ENCODING_CUSTOM) { + ret = engine_.GetEncodingConverter().toServer(currentServer_.GetCustomEncoding(), str.c_str(), str.size()); + if (!ret.empty()) { + return ret; + } } - wxCharBuffer buffer = str.mb_str(*wxConvCurrent); - if (!buffer) - buffer = str.To8BitData(); - - return buffer; + ret = fz::to_string(str); + return ret; } void CControlSocket::OnTimer(fz::timer_id) @@ -555,9 +511,9 @@ if (timeout > 0) { fz::duration elapsed = fz::monotonic_clock::now() - m_lastActivity; - if ((!m_pCurOpData || !m_pCurOpData->waitForAsyncRequest) && !IsWaitingForLock()) { + if ((operations_.empty() || !operations_.back()->waitForAsyncRequest) && !IsWaitingForLock()) { if (elapsed > fz::duration::from_seconds(timeout)) { - LogMessage(MessageType::Error, wxPLURAL("Connection timed out after %d second of inactivity", "Connection timed out after %d seconds of inactivity", timeout), timeout); + LogMessage(MessageType::Error, fztranslate("Connection timed out after %d second of inactivity", "Connection timed out after %d seconds of inactivity", timeout), timeout); DoClose(FZ_REPLY_TIMEOUT); return; } @@ -578,14 +534,16 @@ void CControlSocket::SetWait(bool wait) { if (wait) { - if (m_timer) + if (m_timer) { return; + } m_lastActivity = fz::monotonic_clock::now(); int timeout = engine_.GetOptions().GetOptionVal(OPTION_TIMEOUT); - if (!timeout) + if (!timeout) { return; + } m_timer = add_timer(fz::duration::from_milliseconds(timeout * 1000 + 100), true); // Add a bit of slack } @@ -597,34 +555,90 @@ int CControlSocket::SendNextCommand() { - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; + LogMessage(MessageType::Debug_Verbose, L"CControlSocket::SendNextCommand()"); + if (operations_.empty()) { + LogMessage(MessageType::Debug_Warning, L"SendNextCommand called without active operation"); + ResetOperation(FZ_REPLY_ERROR); + return FZ_REPLY_ERROR; + } + + while (!operations_.empty()) { + auto & data = *operations_.back(); + if (data.waitForAsyncRequest) { + LogMessage(MessageType::Debug_Info, L"Waiting for async request, ignoring SendNextCommand..."); + return FZ_REPLY_WOULDBLOCK; + } + + if (!CanSendNextCommand()) { + SetWait(true); + return FZ_REPLY_WOULDBLOCK; + } + + int res = data.Send(); + if (res != FZ_REPLY_CONTINUE) { + if (res == FZ_REPLY_OK) { + return ResetOperation(res); + } + else if (res & FZ_REPLY_DISCONNECTED) { + return DoClose(res); + } + else if (res & FZ_REPLY_ERROR) { + return ResetOperation(res); + } + else if (res == FZ_REPLY_WOULDBLOCK) { + return FZ_REPLY_WOULDBLOCK; + } + else if (res != FZ_REPLY_CONTINUE) { + LogMessage(MessageType::Debug_Warning, L"Unknown result %d returned by COpData::Send()", res); + return ResetOperation(FZ_REPLY_INTERNALERROR); + } + } + } + + return FZ_REPLY_OK; } -int CControlSocket::ParseSubcommandResult(int) +int CControlSocket::ParseSubcommandResult(int prevResult, COpData const& opData) { - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; + LogMessage(MessageType::Debug_Verbose, L"CControlSocket::ParseSubcommandResult(%d)", prevResult); + if (operations_.empty()) { + LogMessage(MessageType::Debug_Warning, L"ParseSubcommandResult called without active operation"); + ResetOperation(FZ_REPLY_ERROR); + return FZ_REPLY_ERROR; + } + + auto & data = *operations_.back(); + int res = data.SubcommandResult(prevResult, opData); + if (res == FZ_REPLY_WOULDBLOCK) { + return FZ_REPLY_WOULDBLOCK; + } + else if (res == FZ_REPLY_CONTINUE) { + return SendNextCommand(); + } + else { + return ResetOperation(res); + } } const std::list::iterator CControlSocket::GetLockStatus() { std::list::iterator iter; - for (iter = m_lockInfoList.begin(); iter != m_lockInfoList.end(); ++iter) - if (iter->pControlSocket == this) + for (iter = m_lockInfoList.begin(); iter != m_lockInfoList.end(); ++iter) { + if (iter->pControlSocket == this) { break; + } + } return iter; } -bool CControlSocket::TryLockCache(enum locking_reason reason, const CServerPath& directory) +bool CControlSocket::TryLock(locking_reason reason, CServerPath const& directory) { - wxASSERT(m_pCurrentServer); - wxASSERT(m_pCurOpData); + assert(currentServer_); + assert(!operations_.empty()); std::list::iterator own = GetLockStatus(); - if (own == m_lockInfoList.end()) - { + if (own == m_lockInfoList.end()) { t_lockInfo info; info.directory = directory; info.pControlSocket = this; @@ -634,34 +648,33 @@ m_lockInfoList.push_back(info); own = --m_lockInfoList.end(); } - else - { - if (own->lockcount) - { - if (!m_pCurOpData->holdsLock) - { - m_pCurOpData->holdsLock = true; + else { + if (own->lockcount) { + if (!operations_.back()->holdsLock_) { + operations_.back()->holdsLock_ = true; own->lockcount++; } return true; } - wxASSERT(own->waiting); - wxASSERT(own->reason == reason); + assert(own->waiting); + assert(own->reason == reason); } // Needs to be set in any case so that ResetOperation // unlocks or cancels the lock wait - m_pCurOpData->holdsLock = true; + operations_.back()->holdsLock_ = true; // Try to find other instance holding the lock - for (std::list::const_iterator iter = m_lockInfoList.begin(); iter != own; ++iter) - { - if (*m_pCurrentServer != *iter->pControlSocket->m_pCurrentServer) + for (auto iter = m_lockInfoList.cbegin(); iter != own; ++iter) { + if (currentServer_ != iter->pControlSocket->currentServer_) { continue; - if (directory != iter->directory) + } + if (directory != iter->directory) { continue; - if (reason != iter->reason) + } + if (reason != iter->reason) { continue; + } // Some other instance is holding the lock return false; @@ -672,23 +685,26 @@ return true; } -bool CControlSocket::IsLocked(enum locking_reason reason, const CServerPath& directory) +bool CControlSocket::IsLocked(locking_reason reason, CServerPath const& directory) { - wxASSERT(m_pCurrentServer); + assert(currentServer_); std::list::iterator own = GetLockStatus(); - if (own != m_lockInfoList.end()) + if (own != m_lockInfoList.end()) { return true; + } // Try to find other instance holding the lock - for (std::list::const_iterator iter = m_lockInfoList.begin(); iter != own; ++iter) - { - if (*m_pCurrentServer != *iter->pControlSocket->m_pCurrentServer) + for (auto iter = m_lockInfoList.cbegin(); iter != own; ++iter) { + if (currentServer_ != iter->pControlSocket->currentServer_) { continue; - if (directory != iter->directory) + } + if (directory != iter->directory) { continue; - if (reason != iter->reason) + } + if (reason != iter->reason) { continue; + } // Some instance is holding the lock return true; @@ -697,49 +713,54 @@ return false; } -void CControlSocket::UnlockCache() +void CControlSocket::ReleaseLock() { - if (!m_pCurOpData || !m_pCurOpData->holdsLock) + if (operations_.empty() || !operations_.back()->holdsLock_) { return; - m_pCurOpData->holdsLock = false; + } + operations_.back()->holdsLock_ = false; std::list::iterator iter = GetLockStatus(); - if (iter == m_lockInfoList.end()) + if (iter == m_lockInfoList.end()) { return; + } - wxASSERT(!iter->waiting || iter->lockcount == 0); - if (!iter->waiting) - { + assert(!iter->waiting || iter->lockcount == 0); + if (!iter->waiting) { iter->lockcount--; - wxASSERT(iter->lockcount >= 0); - if (iter->lockcount) + assert(iter->lockcount >= 0); + if (iter->lockcount) { return; + } } CServerPath directory = iter->directory; - enum locking_reason reason = iter->reason; + locking_reason reason = iter->reason; m_lockInfoList.erase(iter); // Find other instance waiting for the lock - if (!m_pCurrentServer) { - LogMessage(MessageType::Debug_Warning, _T("UnlockCache called with !m_pCurrentServer")); + if (!currentServer_) { + LogMessage(MessageType::Debug_Warning, L"ReleaseLock called with !currentServer_"); return; } for (auto & lockInfo : m_lockInfoList) { - if (!lockInfo.pControlSocket->m_pCurrentServer){ - LogMessage(MessageType::Debug_Warning, _T("UnlockCache found other instance with !m_pCurrentServer")); + if (!lockInfo.pControlSocket->currentServer_) { + LogMessage(MessageType::Debug_Warning, L"ReleaseLock found other instance with !currentServer_"); continue; } - if (*m_pCurrentServer != *lockInfo.pControlSocket->m_pCurrentServer) + if (currentServer_ != lockInfo.pControlSocket->currentServer_) { continue; + } - if (lockInfo.directory != directory) + if (lockInfo.directory != directory) { continue; + } - if (lockInfo.reason != reason) + if (lockInfo.reason != reason) { continue; + } // Send notification lockInfo.pControlSocket->send_event(); @@ -747,31 +768,36 @@ } } -enum CControlSocket::locking_reason CControlSocket::ObtainLockFromEvent() +locking_reason CControlSocket::ObtainLockFromEvent() { - if (!m_pCurOpData) - return lock_unknown; + if (operations_.empty()) { + return locking_reason::unknown; + } std::list::iterator own = GetLockStatus(); - if (own == m_lockInfoList.end()) - return lock_unknown; + if (own == m_lockInfoList.end()) { + return locking_reason::unknown; + } - if (!own->waiting) - return lock_unknown; + if (!own->waiting) { + return locking_reason::unknown; + } - for (std::list::const_iterator iter = m_lockInfoList.begin(); iter != own; ++iter) - { - if (*m_pCurrentServer != *iter->pControlSocket->m_pCurrentServer) + for (auto iter = m_lockInfoList.cbegin(); iter != own; ++iter) { + if (currentServer_ != iter->pControlSocket->currentServer_) { continue; + } - if (iter->directory != own->directory) + if (iter->directory != own->directory) { continue; + } - if (iter->reason != own->reason) + if (iter->reason != own->reason) { continue; + } // Another instance comes before us - return lock_unknown; + return locking_reason::unknown; } own->waiting = false; @@ -782,44 +808,48 @@ void CControlSocket::OnObtainLock() { - if (ObtainLockFromEvent() == lock_unknown) + if (ObtainLockFromEvent() == locking_reason::unknown) { return; + } SendNextCommand(); - UnlockCache(); + ReleaseLock(); } bool CControlSocket::IsWaitingForLock() { std::list::iterator own = GetLockStatus(); - if (own == m_lockInfoList.end()) + if (own == m_lockInfoList.end()) { return false; + } return own->waiting == true; } void CControlSocket::InvalidateCurrentWorkingDir(const CServerPath& path) { - wxASSERT(!path.empty()); - if (m_CurrentPath.empty()) + assert(!path.empty()); + if (currentPath_.empty()) { return; + } - if (m_CurrentPath == path || path.IsParentOf(m_CurrentPath, false)) - { - if (m_pCurOpData) + if (currentPath_ == path || path.IsParentOf(currentPath_, false)) { + if (!operations_.empty()) { m_invalidateCurrentPath = true; - else - m_CurrentPath.clear(); + } + else { + currentPath_.clear(); + } } } fz::duration CControlSocket::GetTimezoneOffset() const { fz::duration ret; - if (m_pCurrentServer) { + if (currentServer_) { int seconds = 0; - if (CServerCapabilities::GetCapability(*m_pCurrentServer, timezone_offset, &seconds) == yes) { + if (CServerCapabilities::GetCapability(currentServer_, timezone_offset, &seconds) == yes) { ret = fz::duration::from_seconds(seconds); } } @@ -828,12 +858,14 @@ void CControlSocket::SendAsyncRequest(CAsyncRequestNotification* pNotification) { - wxASSERT(pNotification); + assert(pNotification); + assert(!operations_.empty()); pNotification->requestNumber = engine_.GetNextAsyncRequestNumber(); - if (m_pCurOpData) - m_pCurOpData->waitForAsyncRequest = true; + if (!operations_.empty()) { + operations_.back()->waitForAsyncRequest = true; + } engine_.AddNotification(pNotification); } @@ -844,66 +876,68 @@ CRealControlSocket::CRealControlSocket(CFileZillaEnginePrivate & engine) : CControlSocket(engine) { - m_pSocket = new CSocket(this); + socket_ = new fz::socket(engine.GetThreadPool(), this); - m_pBackend = new CSocketBackend(this, *m_pSocket, engine_.GetRateLimiter()); - m_pProxyBackend = 0; - - m_pSendBuffer = 0; - m_nSendBufferLen = 0; + m_pBackend = new CSocketBackend(this, *socket_, engine_.GetRateLimiter()); } CRealControlSocket::~CRealControlSocket() { - m_pSocket->Close(); - if (m_pProxyBackend && m_pProxyBackend != m_pBackend) + if (socket_) { + socket_->close(); + } + if (m_pProxyBackend && m_pProxyBackend != m_pBackend) { delete m_pProxyBackend; + } delete m_pBackend; - m_pBackend = 0; + m_pBackend = nullptr; + + delete socket_; +} - delete m_pSocket; +bool CRealControlSocket::Connected() const +{ + return socket_ ? (socket_->get_state() == fz::socket::connected) : false; } -bool CRealControlSocket::Send(const char *buffer, int len) +int CRealControlSocket::Send(unsigned char const* buffer, unsigned int len) { + if (!m_pBackend) { + LogMessage(MessageType::Debug_Warning, L"Called internal CRealControlSocket::Send without m_pBackend"); + return FZ_REPLY_INTERNALERROR; + } + SetWait(true); - if (m_pSendBuffer) { - char *tmp = m_pSendBuffer; - m_pSendBuffer = new char[m_nSendBufferLen + len]; - memcpy(m_pSendBuffer, tmp, m_nSendBufferLen); - memcpy(m_pSendBuffer + m_nSendBufferLen, buffer, len); - m_nSendBufferLen += len; - delete [] tmp; + if (sendBuffer_) { + sendBuffer_.append(buffer, len); } else { int error; int written = m_pBackend->Write(buffer, len, error); if (written < 0) { if (error != EAGAIN) { - LogMessage(MessageType::Error, _("Could not write to socket: %s"), CSocket::GetErrorDescription(error)); + LogMessage(MessageType::Error, _("Could not write to socket: %s"), fz::socket::error_description(error)); LogMessage(MessageType::Error, _("Disconnected from server")); - DoClose(); - return false; + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; } written = 0; } - if (written) + if (written) { SetActive(CFileZillaEngine::send); + } - if (written < len) { - m_nSendBufferLen = len - written; - m_pSendBuffer = new char[m_nSendBufferLen]; - memcpy(m_pSendBuffer, buffer, len - written); + if (static_cast(written) < len) { + sendBuffer_.append(buffer + written, len - written); } } - return true; + return FZ_REPLY_WOULDBLOCK; } void CRealControlSocket::operator()(fz::event_base const& ev) { - if (!fz::dispatch(ev, this, + if (!fz::dispatch(ev, this, &CRealControlSocket::OnSocketEvent, &CRealControlSocket::OnHostAddress)) { @@ -911,50 +945,53 @@ } } -void CRealControlSocket::OnSocketEvent(CSocketEventSource*, SocketEventType t, int error) +void CRealControlSocket::OnSocketEvent(fz::socket_event_source*, fz::socket_event_flag t, int error) { - if (!m_pBackend) + if (!m_pBackend) { return; + } switch (t) { - case SocketEventType::connection_next: - if (error) - LogMessage(MessageType::Status, _("Connection attempt failed with \"%s\", trying next address."), CSocket::GetErrorDescription(error)); + case fz::socket_event_flag::connection_next: + if (error) { + LogMessage(MessageType::Status, _("Connection attempt failed with \"%s\", trying next address."), fz::socket::error_description(error)); + } SetAlive(); break; - case SocketEventType::connection: + case fz::socket_event_flag::connection: if (error) { - LogMessage(MessageType::Status, _("Connection attempt failed with \"%s\"."), CSocket::GetErrorDescription(error)); + LogMessage(MessageType::Status, _("Connection attempt failed with \"%s\"."), fz::socket::error_description(error)); OnClose(error); } else { if (m_pProxyBackend && !m_pProxyBackend->Detached()) { m_pProxyBackend->Detach(); - m_pBackend = new CSocketBackend(this, *m_pSocket, engine_.GetRateLimiter()); + m_pBackend = new CSocketBackend(this, *socket_, engine_.GetRateLimiter()); } OnConnect(); } break; - case SocketEventType::read: + case fz::socket_event_flag::read: OnReceive(); break; - case SocketEventType::write: + case fz::socket_event_flag::write: OnSend(); break; - case SocketEventType::close: + case fz::socket_event_flag::close: OnClose(error); break; default: - LogMessage(MessageType::Debug_Warning, _T("Unhandled socket event %d"), t); + LogMessage(MessageType::Debug_Warning, L"Unhandled socket event %d", t); break; } } -void CRealControlSocket::OnHostAddress(CSocketEventSource*, wxString const& address) +void CRealControlSocket::OnHostAddress(fz::socket_event_source*, std::string const& address) { - if (!m_pBackend) + if (!m_pBackend) { return; + } LogMessage(MessageType::Status, _("Connecting to %s..."), address); } @@ -967,135 +1004,106 @@ { } -void CRealControlSocket::OnSend() +int CRealControlSocket::OnSend() { - if (m_pSendBuffer) - { - if (!m_nSendBufferLen) - { - delete [] m_pSendBuffer; - m_pSendBuffer = 0; - return; - } - + while (sendBuffer_) { int error; - int written = m_pBackend->Write(m_pSendBuffer, m_nSendBufferLen, error); - if (written < 0) - { - if (error != EAGAIN) - { - LogMessage(MessageType::Error, _("Could not write to socket: %s"), CSocket::GetErrorDescription(error)); - if (GetCurrentCommandId() != Command::connect) + int written = m_pBackend->Write(sendBuffer_.get(), sendBuffer_.size(), error); + if (written < 0) { + if (error != EAGAIN) { + LogMessage(MessageType::Error, _("Could not write to socket: %s"), fz::socket::error_description(error)); + if (GetCurrentCommandId() != Command::connect) { LogMessage(MessageType::Error, _("Disconnected from server")); + } DoClose(); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; } - return; + return FZ_REPLY_WOULDBLOCK; } if (written) { SetActive(CFileZillaEngine::send); - } - if (written == m_nSendBufferLen) { - m_nSendBufferLen = 0; - delete [] m_pSendBuffer; - m_pSendBuffer = 0; - } - else { - memmove(m_pSendBuffer, m_pSendBuffer + written, m_nSendBufferLen - written); - m_nSendBufferLen -= written; + sendBuffer_.consume(static_cast(written)); } } + + return FZ_REPLY_CONTINUE; } void CRealControlSocket::OnClose(int error) { - LogMessage(MessageType::Debug_Verbose, _T("CRealControlSocket::OnClose(%d)"), error); + LogMessage(MessageType::Debug_Verbose, L"CRealControlSocket::OnClose(%d)", error); - if (GetCurrentCommandId() != Command::connect) - { - if (!error) - LogMessage(MessageType::Error, _("Connection closed by server")); - else - LogMessage(MessageType::Error, _("Disconnected from server: %s"), CSocket::GetErrorDescription(error)); + auto cmd = GetCurrentCommandId(); + if (cmd != Command::connect) { + auto messageType = (cmd == Command::none) ? MessageType::Status : MessageType::Error; + if (!error) { + LogMessage(messageType, _("Connection closed by server")); + } + else { + LogMessage(messageType, _("Disconnected from server: %s"), fz::socket::error_description(error)); + } } DoClose(); } -int CRealControlSocket::Connect(const CServer &server) +int CRealControlSocket::DoConnect(std::wstring const& host, unsigned int port) { SetWait(true); - if (server.GetEncodingType() == ENCODING_CUSTOM) - { - LogMessage(MessageType::Debug_Info, _T("Using custom encoding: %s"), server.GetCustomEncoding()); - m_pCSConv = new wxCSConv(server.GetCustomEncoding()); + if (currentServer_.GetEncodingType() == ENCODING_CUSTOM) { + LogMessage(MessageType::Debug_Info, L"Using custom encoding: %s", currentServer_.GetCustomEncoding()); } - delete m_pCurrentServer; - m_pCurrentServer = new CServer(server); - - // International domain names - m_pCurrentServer->SetHost(ConvertDomainName(server.GetHost()), server.GetPort()); - - return ContinueConnect(); -} - -int CRealControlSocket::ContinueConnect() -{ - wxString host; - unsigned int port = 0; + std::wstring real_host; + unsigned int real_port = 0; const int proxy_type = engine_.GetOptions().GetOptionVal(OPTION_PROXY_TYPE); - if (proxy_type > CProxySocket::unknown && proxy_type < CProxySocket::proxytype_count && !m_pCurrentServer->GetBypassProxy()) { - LogMessage(MessageType::Status, _("Connecting to %s through %s proxy"), m_pCurrentServer->FormatHost(), CProxySocket::Name(static_cast(proxy_type))); + if (proxy_type > CProxySocket::unknown && proxy_type < CProxySocket::proxytype_count && !currentServer_.GetBypassProxy()) { + LogMessage(MessageType::Status, _("Connecting to %s through %s proxy"), currentServer_.Format(ServerFormat::with_optional_port), CProxySocket::Name(static_cast(proxy_type))); - host = engine_.GetOptions().GetOption(OPTION_PROXY_HOST); - port = engine_.GetOptions().GetOptionVal(OPTION_PROXY_PORT); + real_host = engine_.GetOptions().GetOption(OPTION_PROXY_HOST); + real_port = engine_.GetOptions().GetOptionVal(OPTION_PROXY_PORT); delete m_pBackend; - m_pProxyBackend = new CProxySocket(this, m_pSocket, this); + m_pProxyBackend = new CProxySocket(this, socket_, this); m_pBackend = m_pProxyBackend; - int res = m_pProxyBackend->Handshake((enum CProxySocket::ProxyType)proxy_type, - m_pCurrentServer->GetHost(), m_pCurrentServer->GetPort(), + int res = m_pProxyBackend->Handshake(static_cast(proxy_type), + ConvertDomainName(host), port, engine_.GetOptions().GetOption(OPTION_PROXY_USER), engine_.GetOptions().GetOption(OPTION_PROXY_PASS)); if (res != EINPROGRESS) { - LogMessage(MessageType::Error, _("Could not start proxy handshake: %s"), CSocket::GetErrorDescription(res)); - DoClose(); - return FZ_REPLY_ERROR; + LogMessage(MessageType::Error, _("Could not start proxy handshake: %s"), fz::socket::error_description(res)); + return FZ_REPLY_DISCONNECTED | FZ_REPLY_ERROR; } } else { - if (m_pCurOpData && m_pCurOpData->opId == Command::connect) { - CConnectOpData* pData(static_cast(m_pCurOpData)); - host = ConvertDomainName(pData->host); - port = pData->port; - } - if (host.empty()) { - host = m_pCurrentServer->GetHost(); - port = m_pCurrentServer->GetPort(); - } + real_host = host; + real_port = port; } - if (fz::get_address_type(host.ToStdWstring()) == fz::address_type::unknown) { - LogMessage(MessageType::Status, _("Resolving address of %s"), host); + if (fz::get_address_type(host) == fz::address_type::unknown) { + LogMessage(MessageType::Status, _("Resolving address of %s"), real_host); } - int res = m_pSocket->Connect(host, port); + m_closed = false; + + real_host = ConvertDomainName(real_host); + int res = socket_->connect(fz::to_native(real_host), real_port); // Treat success same as EINPROGRESS, we wait for connect notification in any case if (res && res != EINPROGRESS) { - LogMessage(MessageType::Error, _("Could not connect to server: %s"), CSocket::GetErrorDescription(res)); - DoClose(); - return FZ_REPLY_ERROR; + LogMessage(MessageType::Error, _("Could not connect to server: %s"), fz::socket::error_description(res)); + return FZ_REPLY_DISCONNECTED | FZ_REPLY_ERROR; } return FZ_REPLY_WOULDBLOCK; } -int CRealControlSocket::DoClose(int nErrorCode /*=FZ_REPLY_DISCONNECTED*/) +int CRealControlSocket::DoClose(int nErrorCode) { + LogMessage(MessageType::Debug_Debug, L"CRealControlSocket::DoClose(%d)", nErrorCode); ResetSocket(); return CControlSocket::DoClose(nErrorCode); @@ -1103,36 +1111,30 @@ void CRealControlSocket::ResetSocket() { - m_pSocket->Close(); + socket_->close(); - if (m_pSendBuffer) - { - delete [] m_pSendBuffer; - m_pSendBuffer = 0; - m_nSendBufferLen = 0; - } + sendBuffer_.clear(); - if (m_pProxyBackend) - { - if (m_pProxyBackend != m_pBackend) + if (m_pProxyBackend) { + if (m_pProxyBackend != m_pBackend) { delete m_pProxyBackend; - m_pProxyBackend = 0; + } + m_pProxyBackend = nullptr; } delete m_pBackend; - m_pBackend = 0; + m_pBackend = nullptr; } bool CControlSocket::SetFileExistsAction(CFileExistsNotification *pFileExistsNotification) { - wxASSERT(pFileExistsNotification); + assert(pFileExistsNotification); - if (!m_pCurOpData || m_pCurOpData->opId != Command::transfer) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("No or invalid operation in progress, ignoring request reply %f"), pFileExistsNotification->GetRequestID()); + if (operations_.empty() || operations_.back()->opId != Command::transfer) { + LogMessage(MessageType::Debug_Info, L"SetFileExistsAction: No or invalid operation in progress, ignoring request reply %f", pFileExistsNotification->GetRequestID()); return false; } - CFileTransferOpData *pData = static_cast(m_pCurOpData); + auto & data = static_cast(*operations_.back()); switch (pFileExistsNotification->overwriteAction) { @@ -1140,128 +1142,148 @@ SendNextCommand(); break; case CFileExistsNotification::overwriteNewer: - if (!pFileExistsNotification->localTime.empty() || !pFileExistsNotification->remoteTime.empty()) + if (pFileExistsNotification->localTime.empty() || pFileExistsNotification->remoteTime.empty()) { SendNextCommand(); - else if (pFileExistsNotification->download && pFileExistsNotification->localTime.earlier_than(pFileExistsNotification->remoteTime)) + } + else if (pFileExistsNotification->download && pFileExistsNotification->localTime.earlier_than(pFileExistsNotification->remoteTime)) { SendNextCommand(); - else if (!pFileExistsNotification->download && pFileExistsNotification->localTime.later_than(pFileExistsNotification->remoteTime)) + } + else if (!pFileExistsNotification->download && pFileExistsNotification->localTime.later_than(pFileExistsNotification->remoteTime)) { SendNextCommand(); - else - { - if (pData->download) - { - wxString filename = pData->remotePath.FormatFilename(pData->remoteFile); + } + else { + if (data.download_) { + std::wstring filename = data.remotePath_.FormatFilename(data.remoteFile_); LogMessage(MessageType::Status, _("Skipping download of %s"), filename); } - else - { - LogMessage(MessageType::Status, _("Skipping upload of %s"), pData->localFile); + else { + LogMessage(MessageType::Status, _("Skipping upload of %s"), data.localFile_); } ResetOperation(FZ_REPLY_OK); } break; case CFileExistsNotification::overwriteSize: - /* First compare flags both size known but different, one size known and the other not (obviously they are different). - Second compare flags the remaining case in which we need to send command : both size unknown */ - if ((pFileExistsNotification->localSize != pFileExistsNotification->remoteSize) || (pFileExistsNotification->localSize < 0)) + // First compare flags both size known but different, one size known and the other not (obviously they are different). + // Second compare flags the remaining case in which we need to send command : both size unknown + if ((pFileExistsNotification->localSize != pFileExistsNotification->remoteSize) || (pFileExistsNotification->localSize < 0)) { SendNextCommand(); + } else { - if (pData->download) { - wxString filename = pData->remotePath.FormatFilename(pData->remoteFile); + if (data.download_) { + std::wstring filename = data.remotePath_.FormatFilename(data.remoteFile_); LogMessage(MessageType::Status, _("Skipping download of %s"), filename); } else { - LogMessage(MessageType::Status, _("Skipping upload of %s"), pData->localFile); + LogMessage(MessageType::Status, _("Skipping upload of %s"), data.localFile_); } ResetOperation(FZ_REPLY_OK); } break; case CFileExistsNotification::overwriteSizeOrNewer: - if (!pFileExistsNotification->localTime.empty() || !pFileExistsNotification->remoteTime.empty()) + if (pFileExistsNotification->localTime.empty() || pFileExistsNotification->remoteTime.empty()) { SendNextCommand(); - /* First compare flags both size known but different, one size known and the other not (obviously they are different). - Second compare flags the remaining case in which we need to send command : both size unknown */ - else if ((pFileExistsNotification->localSize != pFileExistsNotification->remoteSize) || (pFileExistsNotification->localSize < 0)) + } + // First compare flags both size known but different, one size known and the other not (obviously they are different). + // Second compare flags the remaining case in which we need to send command : both size unknown + else if ((pFileExistsNotification->localSize != pFileExistsNotification->remoteSize) || (pFileExistsNotification->localSize < 0)) { SendNextCommand(); - else if (pFileExistsNotification->download && pFileExistsNotification->localTime.earlier_than(pFileExistsNotification->remoteTime)) + } + else if (pFileExistsNotification->download && pFileExistsNotification->localTime.earlier_than(pFileExistsNotification->remoteTime)) { SendNextCommand(); - else if (!pFileExistsNotification->download && pFileExistsNotification->localTime.later_than(pFileExistsNotification->remoteTime)) + } + else if (!pFileExistsNotification->download && pFileExistsNotification->localTime.later_than(pFileExistsNotification->remoteTime)) { SendNextCommand(); - else - { - if (pData->download) - { - wxString filename = pData->remotePath.FormatFilename(pData->remoteFile); + } + else { + if (data.download_) { + auto const filename = data.remotePath_.FormatFilename(data.remoteFile_); LogMessage(MessageType::Status, _("Skipping download of %s"), filename); } - else - { - LogMessage(MessageType::Status, _("Skipping upload of %s"), pData->localFile); + else { + LogMessage(MessageType::Status, _("Skipping upload of %s"), data.localFile_); } ResetOperation(FZ_REPLY_OK); } break; case CFileExistsNotification::resume: - if (pData->download && pData->localFileSize >= 0) - pData->resume = true; - else if (!pData->download && pData->remoteFileSize >= 0) - pData->resume = true; + if (data.download_ && data.localFileSize_ >= 0) { + data.resume_ = true; + } + else if (!data.download_ && data.remoteFileSize_ >= 0) { + data.resume_ = true; + } SendNextCommand(); break; case CFileExistsNotification::rename: - if (pData->download) { - wxFileName fn = pData->localFile; - fn.SetFullName(pFileExistsNotification->newName); - pData->localFile = fn.GetFullPath(); + if (data.download_) { + { + std::wstring tmp; + CLocalPath l(data.localFile_, &tmp); + if (l.empty() || tmp.empty()) { + ResetOperation(FZ_REPLY_INTERNALERROR); + return false; + } + if (!l.ChangePath(pFileExistsNotification->newName)) { + ResetOperation(FZ_REPLY_INTERNALERROR); + return false; + } + if (!l.HasParent() || !l.MakeParent(&tmp)) { + ResetOperation(FZ_REPLY_INTERNALERROR); + return false; + } + + data.localFile_ = l.GetPath() + tmp; + } int64_t size; bool isLink; - if (fz::local_filesys::get_file_info(fz::to_native(pData->localFile), isLink, &size, 0, 0) == fz::local_filesys::file) - pData->localFileSize = size; - else - pData->localFileSize = -1; + if (fz::local_filesys::get_file_info(fz::to_native(data.localFile_), isLink, &size, nullptr, nullptr) == fz::local_filesys::file) { + data.localFileSize_ = size; + } + else { + data.localFileSize_ = -1; + } - if (CheckOverwriteFile() == FZ_REPLY_OK) + if (CheckOverwriteFile() == FZ_REPLY_OK) { SendNextCommand(); + } } else { - pData->remoteFile = pFileExistsNotification->newName; + data.remoteFile_ = pFileExistsNotification->newName; + data.fileTime_ = fz::datetime(); + data.remoteFileSize_ = -1; CDirentry entry; bool dir_did_exist; bool matched_case; - if (engine_.GetDirectoryCache().LookupFile(entry, *m_pCurrentServer, pData->tryAbsolutePath ? pData->remotePath : m_CurrentPath, pData->remoteFile, dir_did_exist, matched_case) && + if (engine_.GetDirectoryCache().LookupFile(entry, currentServer_, data.tryAbsolutePath_ ? data.remotePath_ : currentPath_, data.remoteFile_, dir_did_exist, matched_case) && matched_case) { - pData->remoteFileSize = entry.size; - if (entry.has_date()) - pData->fileTime = entry.time; + data.remoteFileSize_ = entry.size; + if (entry.has_date()) { + data.fileTime_ = entry.time; + } - if (CheckOverwriteFile() != FZ_REPLY_OK) + if (CheckOverwriteFile() != FZ_REPLY_OK) { break; - } - else { - pData->fileTime = fz::datetime(); - pData->remoteFileSize = -1; + } } SendNextCommand(); } break; case CFileExistsNotification::skip: - if (pData->download) - { - wxString filename = pData->remotePath.FormatFilename(pData->remoteFile); + if (data.download_) { + std::wstring filename = data.remotePath_.FormatFilename(data.remoteFile_); LogMessage(MessageType::Status, _("Skipping download of %s"), filename); } - else - { - LogMessage(MessageType::Status, _("Skipping upload of %s"), pData->localFile); + else { + LogMessage(MessageType::Status, _("Skipping upload of %s"), data.localFile_); } ResetOperation(FZ_REPLY_OK); break; default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown file exists action: %d"), pFileExistsNotification->overwriteAction); + LogMessage(MessageType::Debug_Warning, L"Unknown file exists action: %d", pFileExistsNotification->overwriteAction); ResetOperation(FZ_REPLY_INTERNALERROR); return false; } @@ -1269,89 +1291,58 @@ return true; } -void CControlSocket::CreateLocalDir(const wxString &local_file) +void CControlSocket::CreateLocalDir(std::wstring const& local_file) { - wxString file; + std::wstring file; CLocalPath local_path(local_file, &file); - if (local_path.empty() || !local_path.HasParent()) + if (local_path.empty() || !local_path.HasParent()) { return; - - // Only go back as far as needed. On comparison, wxWidgets' - // wxFileName::Mkdir always starts at the root. - std::vector segments; - while (!local_path.Exists() && local_path.HasParent()) { - wxString segment; - local_path.MakeParent(&segment); - segments.push_back(segment); } CLocalPath last_successful; - for (auto iter = segments.rbegin(); iter != segments.rend(); ++iter) { - local_path.AddSegment(*iter); + local_path.Create(&last_successful); -#ifdef __WXMSW__ - BOOL res = CreateDirectory(local_path.GetPath().wc_str(), 0); - if (!res && GetLastError() != ERROR_ALREADY_EXISTS) - break; -#else - const wxCharBuffer s = local_path.GetPath().fn_str(); - - int res = mkdir(s, 0777); - if (res && errno != EEXIST) - break; -#endif - last_successful = local_path; + if (!last_successful.empty()) { + // Send out notification + CLocalDirCreatedNotification *n = new CLocalDirCreatedNotification; + n->dir = last_successful; + engine_.AddNotification(n); } - - if (last_successful.empty()) - return; - - // Send out notification - CLocalDirCreatedNotification *n = new CLocalDirCreatedNotification; - n->dir = last_successful; - engine_.AddNotification(n); -} - -int CControlSocket::List(CServerPath, wxString, int) -{ - return FZ_REPLY_NOTSUPPORTED; } -int CControlSocket::FileTransfer(const wxString, const CServerPath &, - const wxString &, bool, - const CFileTransferCommand::t_transferSettings&) +void CControlSocket::List(CServerPath const&, std::wstring const&, int) { - return FZ_REPLY_NOTSUPPORTED; + Push(std::make_unique()); } -int CControlSocket::RawCommand(const wxString&) +void CControlSocket::RawCommand(std::wstring const&) { - return FZ_REPLY_NOTSUPPORTED; + Push(std::make_unique()); } -int CControlSocket::Delete(const CServerPath&, std::deque&&) +void CControlSocket::Delete(CServerPath const&, std::deque&&) { - return FZ_REPLY_NOTSUPPORTED; + Push(std::make_unique()); } -int CControlSocket::RemoveDir(const CServerPath&, const wxString&) +void CControlSocket::RemoveDir(CServerPath const&, std::wstring const&) { - return FZ_REPLY_NOTSUPPORTED; + Push(std::make_unique()); } -int CControlSocket::Mkdir(const CServerPath&) +void CControlSocket::Mkdir(CServerPath const&) { - return FZ_REPLY_NOTSUPPORTED; + Push(std::make_unique()); } -int CControlSocket::Rename(const CRenameCommand&) +void CControlSocket::Rename(CRenameCommand const&) { - return FZ_REPLY_NOTSUPPORTED; + Push(std::make_unique()); } -int CControlSocket::Chmod(const CChmodCommand&) +void CControlSocket::Chmod(CChmodCommand const&) { - return FZ_REPLY_NOTSUPPORTED; + Push(std::make_unique()); } void CControlSocket::operator()(fz::event_base const& ev) @@ -1366,3 +1357,12 @@ SetAlive(); engine_.SetActive(direction); } + +void CControlSocket::SendDirectoryListingNotification(CServerPath const& path, bool onList, bool failed) +{ + if (!currentServer_) { + return; + } + + engine_.AddNotification(new CDirectoryListingNotification(path, !onList, failed)); +} diff -Nru filezilla-3.15.0.2/src/engine/ControlSocket.h filezilla-3.33.0/src/engine/ControlSocket.h --- filezilla-3.15.0.2/src/engine/ControlSocket.h 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/ControlSocket.h 2018-05-07 08:20:55.000000000 +0000 @@ -1,66 +1,124 @@ -#ifndef __CONTROLSOCKET_H__ -#define __CONTROLSOCKET_H__ +#ifndef FILEZILLA_ENGINE_CONTROLSOCKET_HEADER +#define FILEZILLA_ENGINE_CONTROLSOCKET_HEADER #include "socket.h" #include "logging_private.h" -#include "backend.h" + +#include class COpData { public: - COpData(Command op_Id); - virtual ~COpData(); + explicit COpData(Command op_Id) + : opId(op_Id) + {} + + virtual ~COpData() = default; COpData(COpData const&) = delete; COpData& operator=(COpData const&) = delete; - int opState; + // Functions here must return one of '4' values: + // - FZ_REPLY_OK, operation succeeded + // - FZ_REPLY_ERROR (possibly with flags) + // - FZ_REPLY_WOULDBLOCK, waiting on some exvent + // - FZ_REPLY_CONTINUE, caller should issue the next command + + virtual int Send() = 0; + virtual int ParseResponse() = 0; + + virtual int SubcommandResult(int, COpData const&) { return FZ_REPLY_INTERNALERROR; } + + // Called just prior to destructing the operation. Do not push a new operation here. + virtual int Reset(int result) { return result; } + + int opState{}; Command const opId; - bool waitForAsyncRequest; - bool holdsLock; + bool waitForAsyncRequest{}; + bool holdsLock_{}; +}; + +template +class CProtocolOpData +{ +public: + CProtocolOpData(T & controlSocket) + : controlSocket_(controlSocket) + , engine_(controlSocket.engine_) + , currentServer_(controlSocket.currentServer_) + , currentPath_(controlSocket.currentPath_) + { + } + + virtual ~CProtocolOpData() = default; + + template + void LogMessage(Args&& ...args) const { + controlSocket_.LogMessage(std::forward(args)...); + } - COpData *pNextOpData; + T & controlSocket_; + CFileZillaEnginePrivate & engine_; + CServer & currentServer_; + CServerPath& currentPath_; +}; + +class CNotSupportedOpData : public COpData +{ +public: + CNotSupportedOpData() + : COpData(Command::none) + {} + + virtual int Send() { return FZ_REPLY_NOTSUPPORTED; } + virtual int ParseResponse() { return FZ_REPLY_INTERNALERROR; } }; class CConnectOpData : public COpData { public: - CConnectOpData() + CConnectOpData(CServer const& server) : COpData(Command::connect) - , port(0) + , server_(server) { } - wxString host; - unsigned int port; + // What to connect the socket to, + // can be different from server_ if using + // a proxy + std::wstring host_; + unsigned int port_{}; + + // Target server + CServer server_; }; class CFileTransferOpData : public COpData { public: - CFileTransferOpData(bool is_download, const wxString& local_file, const wxString& remote_file, const CServerPath& remote_path); - virtual ~CFileTransferOpData(); + CFileTransferOpData(bool is_download, std::wstring const& local_file, std::wstring const& remote_file, CServerPath const& remote_path); + // Transfer data - wxString localFile, remoteFile; - CServerPath remotePath; - const bool download; - - fz::datetime fileTime; - int64_t localFileSize{-1}; - int64_t remoteFileSize{-1}; + std::wstring localFile_, remoteFile_; + CServerPath remotePath_; + bool const download_; + + fz::datetime fileTime_; + int64_t localFileSize_{-1}; + int64_t remoteFileSize_{-1}; - bool tryAbsolutePath{}; - bool resume{}; + bool tryAbsolutePath_{}; + bool resume_{}; - CFileTransferCommand::t_transferSettings transferSettings; + CFileTransferCommand::t_transferSettings transferSettings_; // Set to true when sending the command which // starts the actual transfer - bool transferInitiated{}; + bool transferInitiated_{}; }; -class CMkdirOpData final : public COpData +class CMkdirOpData : public COpData { public: CMkdirOpData() @@ -68,10 +126,10 @@ { } - CServerPath path; - CServerPath currentPath; - CServerPath commonParent; - std::vector segments; + CServerPath path_; + CServerPath currentMkdPath_; + CServerPath commonParent_; + std::vector segments_; }; class CChangeDirOpData : public COpData @@ -80,20 +138,14 @@ CChangeDirOpData() : COpData(Command::cwd) { - tryMkdOnFail = false; - link_discovery = false; - } - - virtual ~CChangeDirOpData() - { } - CServerPath path; - wxString subDir; - bool tryMkdOnFail; - CServerPath target; + CServerPath path_; + std::wstring subDir_; + bool tryMkdOnFail_{}; + CServerPath target_; - bool link_discovery; + bool link_discovery_{}; }; enum class TransferEndReason @@ -110,6 +162,16 @@ failed_resumetest }; +enum class locking_reason +{ + unknown = -1, + list, + mkdir, + + private1 +}; + +class CBackend; class CTransferStatus; class CControlSocket: public CLogging, public fz::event_handler { @@ -120,38 +182,39 @@ CControlSocket(CControlSocket const&) = delete; CControlSocket& operator=(CControlSocket const&) = delete; - virtual int Connect(const CServer &server) = 0; virtual int Disconnect(); + virtual void Cancel(); - virtual int List(CServerPath path = CServerPath(), wxString subDir = wxString(), int flags = 0); - virtual int FileTransfer(const wxString localFile, const CServerPath &remotePath, - const wxString &remoteFile, bool download, - const CFileTransferCommand::t_transferSettings& transferSettings); - virtual int RawCommand(const wxString& command = wxString()); - virtual int Delete(const CServerPath& path, std::deque&& files); - virtual int RemoveDir(const CServerPath& path = CServerPath(), const wxString& subDir = wxString()); - virtual int Mkdir(const CServerPath& path); - virtual int Rename(const CRenameCommand& command); - virtual int Chmod(const CChmodCommand& command); - virtual bool Connected() = 0; + + // Implicit FZ_REPLY_CONTINUE + virtual void Connect(CServer const& server, Credentials const& credentials) = 0; + virtual void List(CServerPath const& path = CServerPath(), std::wstring const& subDir = std::wstring(), int flags = 0); + + virtual void FileTransfer(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const& transferSettings) = 0; + virtual void RawCommand(std::wstring const& command = std::wstring()); + virtual void Delete(CServerPath const& path, std::deque&& files); + virtual void RemoveDir(CServerPath const& path = CServerPath(), std::wstring const& subDir = std::wstring()); + virtual void Mkdir(CServerPath const& path); + virtual void Rename(CRenameCommand const& command); + virtual void Chmod(CChmodCommand const& command); + + virtual bool Connected() const = 0; // If m_pCurrentOpData is zero, this function returns the current command // from the engine. Command GetCurrentCommandId() const; - virtual void TransferEnd() {} - void SendAsyncRequest(CAsyncRequestNotification* pNotification); virtual bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification) = 0; bool SetFileExistsAction(CFileExistsNotification *pFileExistsNotification); - const CServer* GetCurrentServer() const; + CServer const& GetCurrentServer() const; // Conversion function which convert between local and server charset. - wxString ConvToLocal(const char* buffer, size_t len); - wxChar* ConvToLocalBuffer(const char* buffer, size_t len, size_t& outlen); - wxChar* ConvToLocalBuffer(const char* buffer, wxMBConv& conv, size_t len, size_t& outlen); - wxCharBuffer ConvToServer(const wxString& str, bool force_utf8 = false); + std::wstring ConvToLocal(char const* buffer, size_t len); + std::string ConvToServer(std::wstring const&, bool force_utf8 = false); void SetActive(CFileZillaEngine::_direction direction); @@ -170,38 +233,42 @@ // Only called from the engine, see there for description void InvalidateCurrentWorkingDir(const CServerPath& path); + virtual bool CanSendNextCommand() const { return true; } + int SendNextCommand(); + protected: + void SendDirectoryListingNotification(CServerPath const& path, bool onList, bool failed); + fz::duration GetTimezoneOffset() const; - virtual int DoClose(int nErrorCode = FZ_REPLY_DISCONNECTED); - bool m_closed; + virtual int DoClose(int nErrorCode = FZ_REPLY_DISCONNECTED | FZ_REPLY_ERROR); + bool m_closed{}; virtual int ResetOperation(int nErrorCode); - - virtual int SendNextCommand(); + virtual void UpdateCache(COpData const& data, CServerPath const& serverPath, std::wstring const& remoteFile, int64_t fileSize); void LogTransferResultMessage(int nErrorCode, CFileTransferOpData *pData); // Called by ResetOperation if there's a queued operation - virtual int ParseSubcommandResult(int prevResult); + int ParseSubcommandResult(int prevResult, COpData const& previousOperation); - wxString ConvertDomainName(wxString const& domain); + std::wstring ConvertDomainName(std::wstring const& domain); int CheckOverwriteFile(); - void CreateLocalDir(const wxString &local_file); + void CreateLocalDir(std::wstring const& local_file); + + bool ParsePwdReply(std::wstring reply, bool unquoted = false, const CServerPath& defaultPath = CServerPath()); - bool ParsePwdReply(wxString reply, bool unquoted = false, const CServerPath& defaultPath = CServerPath()); + void Push(std::unique_ptr && pNewOpData); - COpData *m_pCurOpData; - int m_nOpState; + std::vector> operations_; CFileZillaEnginePrivate & engine_; - CServer *m_pCurrentServer; + CServer currentServer_; - CServerPath m_CurrentPath; + CServerPath currentPath_; - wxCSConv *m_pCSConv; - bool m_useUTF8; + bool m_useUTF8{}; // Timeout data fz::timer_id m_timer{}; @@ -211,30 +278,23 @@ // Begin cache locking stuff // ------------------------- - enum locking_reason - { - lock_unknown = -1, - lock_list, - lock_mkdir - }; - // Tries to obtain lock. Returns true on success. // On failure, caller has to pass control. // SendNextCommand will be called once the lock gets available // and engine could obtain it. // Lock is recursive. Lock counter increases on suboperations. - bool TryLockCache(enum locking_reason reason, const CServerPath& directory); - bool IsLocked(enum locking_reason reason, const CServerPath& directory); + bool TryLock(locking_reason reason, CServerPath const& directory); + bool IsLocked(locking_reason reason, CServerPath const& directory); // Unlocks the cache. Can be called if not holding the lock // Doesn't need reason as one engine can at most hold one lock - void UnlockCache(); + void ReleaseLock(); - // Called from the fzOBTAINLOCK event. + // Called from the obtain_lock_event_type event. // Returns reason != unknown iff engine is the first waiting engine // and obtains the lock. // On failure, the engine was not waiting for a lock. - enum locking_reason ObtainLockFromEvent(); + locking_reason ObtainLockFromEvent(); bool IsWaitingForLock(); @@ -242,7 +302,7 @@ { CControlSocket* pControlSocket; CServerPath directory; - enum locking_reason reason; + locking_reason reason; bool waiting; int lockcount; }; @@ -254,7 +314,7 @@ // End cache locking stuff // ----------------------- - bool m_invalidateCurrentPath; + bool m_invalidateCurrentPath{}; virtual void operator()(fz::event_base const& ev); @@ -269,33 +329,34 @@ CRealControlSocket(CFileZillaEnginePrivate & engine); virtual ~CRealControlSocket(); - virtual int Connect(const CServer &server); - virtual int ContinueConnect(); + int DoConnect(std::wstring const& host, unsigned int port); - virtual bool Connected() { return m_pSocket->GetState() == CSocket::connected; } + virtual bool Connected() const override; protected: - virtual int DoClose(int nErrorCode = FZ_REPLY_DISCONNECTED); - void ResetSocket(); + virtual int DoClose(int nErrorCode = FZ_REPLY_DISCONNECTED | FZ_REPLY_ERROR) override; + virtual void ResetSocket(); - virtual void operator()(fz::event_base const& ev); - void OnSocketEvent(CSocketEventSource* source, SocketEventType t, int error); - void OnHostAddress(CSocketEventSource* source, wxString const& address); + virtual void operator()(fz::event_base const& ev) override; + void OnSocketEvent(fz::socket_event_source* source, fz::socket_event_flag t, int error); + void OnHostAddress(fz::socket_event_source* source, std::string const& address); virtual void OnConnect(); virtual void OnReceive(); - void OnSend(); + virtual int OnSend(); virtual void OnClose(int error); - bool Send(const char *buffer, int len); + int Send(unsigned char const* buffer, unsigned int len); + int Send(char const* buffer, unsigned int len) { + return Send(reinterpret_cast(buffer), len); + } - CSocket* m_pSocket; + fz::socket* socket_; CBackend* m_pBackend; - CProxySocket* m_pProxyBackend; + CProxySocket* m_pProxyBackend{}; - char *m_pSendBuffer; - int m_nSendBufferLen; + fz::buffer sendBuffer_; }; #endif diff -Nru filezilla-3.15.0.2/src/engine/directorycache.cpp filezilla-3.33.0/src/engine/directorycache.cpp --- filezilla-3.15.0.2/src/engine/directorycache.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/directorycache.cpp 2018-02-05 21:28:24.000000000 +0000 @@ -1,15 +1,17 @@ #include #include "directorycache.h" +#include + CDirectoryCache::CDirectoryCache() { } CDirectoryCache::~CDirectoryCache() { - for( auto & serverEntry : m_serverList ) { - for (auto & cacheEntry : serverEntry.cacheList ) { -#ifdef __WXDEBUG__ + for (auto & serverEntry : m_serverList) { + for (auto & cacheEntry : serverEntry.cacheList) { +#ifndef NDEBUG m_totalFileCount -= cacheEntry.listing.GetCount(); #endif tLruList::iterator* lruIt = (tLruList::iterator*)cacheEntry.lruIt; @@ -19,17 +21,17 @@ } } } -#ifdef __WXDEBUG__ - wxASSERT(m_totalFileCount == 0); +#ifndef NDEBUG + assert(m_totalFileCount == 0); #endif } -void CDirectoryCache::Store(const CDirectoryListing &listing, const CServer &server) +void CDirectoryCache::Store(CDirectoryListing const& listing, CServer const& server) { fz::scoped_lock lock(mutex_); tServerIter sit = CreateServerEntry(server); - wxASSERT(sit != m_serverList.end()); + assert(sit != m_serverList.end()); m_totalFileCount += listing.GetCount(); @@ -52,13 +54,14 @@ Prune(); } -bool CDirectoryCache::Lookup(CDirectoryListing &listing, const CServer &server, const CServerPath &path, bool allowUnsureEntries, bool& is_outdated) +bool CDirectoryCache::Lookup(CDirectoryListing &listing, CServer const& server, const CServerPath &path, bool allowUnsureEntries, bool& is_outdated) { fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); - if (sit == m_serverList.end()) + if (sit == m_serverList.end()) { return false; + } tCacheIter iter; if (Lookup(iter, sit, path, allowUnsureEntries, is_outdated)) { @@ -69,9 +72,9 @@ return false; } -bool CDirectoryCache::Lookup(tCacheIter &cacheIter, tServerIter &sit, const CServerPath &path, bool allowUnsureEntries, bool& is_outdated) +bool CDirectoryCache::Lookup(tCacheIter &cacheIter, tServerIter &sit, CServerPath const& path, bool allowUnsureEntries, bool& is_outdated) { - static CCacheEntry dummy; + CCacheEntry dummy; dummy.listing.path = path; cacheIter = sit->cacheList.lower_bound(dummy); @@ -81,10 +84,11 @@ if (entry.listing.path == path) { UpdateLru(sit, cacheIter); - if (!allowUnsureEntries && entry.listing.get_unsure_flags()) + if (!allowUnsureEntries && entry.listing.get_unsure_flags()) { return false; + } - is_outdated = (fz::monotonic_clock::now() - entry.listing.m_firstListTime).get_seconds() > CACHE_TIMEOUT; + is_outdated = (fz::monotonic_clock::now() - entry.listing.m_firstListTime) > ttl_; return true; } } @@ -92,13 +96,14 @@ return false; } -bool CDirectoryCache::DoesExist(const CServer &server, const CServerPath &path, int &hasUnsureEntries, bool &is_outdated) +bool CDirectoryCache::DoesExist(CServer const& server, CServerPath const& path, int &hasUnsureEntries, bool &is_outdated) { fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); - if (sit == m_serverList.end()) + if (sit == m_serverList.end()) { return false; + } tCacheIter iter; if (Lookup(iter, sit, path, true, is_outdated)) { @@ -109,7 +114,7 @@ return false; } -bool CDirectoryCache::LookupFile(CDirentry &entry, const CServer &server, const CServerPath &path, const wxString& file, bool &dirDidExist, bool &matchedCase) +bool CDirectoryCache::LookupFile(CDirentry &entry, CServer const& server, CServerPath const& path, std::wstring const& filename, bool &dirDidExist, bool &matchedCase) { fz::scoped_lock lock(mutex_); @@ -130,13 +135,13 @@ const CCacheEntry &cacheEntry = *iter; const CDirectoryListing &listing = cacheEntry.listing; - int i = listing.FindFile_CmpCase(file); + int i = listing.FindFile_CmpCase(filename); if (i >= 0) { entry = listing[i]; matchedCase = true; return true; } - i = listing.FindFile_CmpNoCase(file); + i = listing.FindFile_CmpNoCase(filename); if (i >= 0) { entry = listing[i]; matchedCase = false; @@ -146,26 +151,29 @@ return false; } -bool CDirectoryCache::InvalidateFile(const CServer &server, const CServerPath &path, const wxString& filename, bool *wasDir /*=false*/) +bool CDirectoryCache::InvalidateFile(CServer const& server, CServerPath const& path, std::wstring const& filename, bool *wasDir) { fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); - if (sit == m_serverList.end()) + if (sit == m_serverList.end()) { return false; + } for (tCacheIter iter = sit->cacheList.begin(); iter != sit->cacheList.end(); ++iter) { auto & entry = const_cast(*iter); - if (path.CmpNoCase(entry.listing.path)) + if (path.CmpNoCase(entry.listing.path)) { continue; + } UpdateLru(sit, iter); for (unsigned int i = 0; i < entry.listing.GetCount(); i++) { - if (!filename.CmpNoCase(((const CCacheEntry&)entry).listing[i].name)) { - if (wasDir) + if (!fz::stricmp(filename, entry.listing[i].name)) { + if (wasDir) { *wasDir = entry.listing[i].is_dir(); - entry.listing[i].flags |= CDirentry::flag_unsure; + } + entry.listing.get(i).flags |= CDirentry::flag_unsure; } } entry.listing.m_flags |= CDirectoryListing::unsure_unknown; @@ -175,28 +183,30 @@ return true; } -bool CDirectoryCache::UpdateFile(const CServer &server, const CServerPath &path, const wxString& filename, bool mayCreate, enum Filetype type /*=file*/, int64_t size /*=-1*/) +bool CDirectoryCache::UpdateFile(CServer const& server, CServerPath const& path, std::wstring const& filename, bool mayCreate, Filetype type, int64_t size) { fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); - if (sit == m_serverList.end()) + if (sit == m_serverList.end()) { return false; + } bool updated = false; for (tCacheIter iter = sit->cacheList.begin(); iter != sit->cacheList.end(); ++iter) { auto & entry = const_cast(*iter); - if (path.CmpNoCase(entry.listing.path)) + if (path.CmpNoCase(entry.listing.path)) { continue; + } UpdateLru(sit, iter); bool matchCase = false; unsigned int i; for (i = 0; i < entry.listing.GetCount(); ++i) { - if (!filename.CmpNoCase(entry.listing[i].name)) { - entry.listing[i].flags |= CDirentry::flag_unsure; + if (!fz::stricmp(filename, entry.listing[i].name)) { + entry.listing.get(i).flags |= CDirentry::flag_unsure; if (entry.listing[i].name == filename) { matchCase = true; break; @@ -205,23 +215,26 @@ } if (matchCase) { - enum Filetype old_type = entry.listing[i].is_dir() ? dir : file; - if (type != old_type) + Filetype old_type = entry.listing[i].is_dir() ? dir : file; + if (type != old_type) { entry.listing.m_flags |= CDirectoryListing::unsure_invalid; - else if (type == dir) + } + else if (type == dir) { entry.listing.m_flags |= CDirectoryListing::unsure_dir_changed; - else + } + else { entry.listing.m_flags |= CDirectoryListing::unsure_file_changed; + } } else if (type != unknown && mayCreate) { - const unsigned int count = entry.listing.GetCount(); - entry.listing.SetCount(count + 1); - CDirentry& direntry = entry.listing[count]; + CDirentry direntry; direntry.name = filename; - if (type == dir) + if (type == dir) { direntry.flags = CDirentry::flag_dir | CDirentry::flag_unsure; - else + } + else { direntry.flags = CDirentry::flag_unsure; + } direntry.size = size; switch (type) { case dir: @@ -234,11 +247,13 @@ entry.listing.m_flags |= CDirectoryListing::unsure_invalid; break; } + entry.listing.Append(std::move(direntry)); ++m_totalFileCount; } - else + else { entry.listing.m_flags |= CDirectoryListing::unsure_unknown; + } entry.modificationTime = fz::monotonic_clock::now(); updated = true; @@ -247,41 +262,47 @@ return updated; } -bool CDirectoryCache::RemoveFile(const CServer &server, const CServerPath &path, const wxString& filename) +bool CDirectoryCache::RemoveFile(CServer const& server, CServerPath const& path, std::wstring const& filename) { fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); - if (sit == m_serverList.end()) + if (sit == m_serverList.end()) { return false; + } for (tCacheIter iter = sit->cacheList.begin(); iter != sit->cacheList.end(); ++iter) { auto & entry = const_cast(*iter); - if (path.CmpNoCase(entry.listing.path)) + if (path.CmpNoCase(entry.listing.path)) { continue; + } UpdateLru(sit, iter); bool matchCase = false; for (unsigned int i = 0; i < entry.listing.GetCount(); ++i) { - if (entry.listing[i].name == filename) + if (entry.listing[i].name == filename) { matchCase = true; + } } if (matchCase) { unsigned int i; - for (i = 0; i < entry.listing.GetCount(); i++) - if (entry.listing[i].name == filename) + for (i = 0; i < entry.listing.GetCount(); ++i) { + if (entry.listing[i].name == filename) { break; - wxASSERT(i != entry.listing.GetCount()); + } + } + assert(i != entry.listing.GetCount()); entry.listing.RemoveEntry(i); // This does set m_hasUnsureEntries --m_totalFileCount; } else { for (unsigned int i = 0; i < entry.listing.GetCount(); ++i) { - if (!filename.CmpNoCase(entry.listing[i].name)) - entry.listing[i].flags |= CDirentry::flag_unsure; + if (!fz::stricmp(filename, entry.listing[i].name)) { + entry.listing.get(i).flags |= CDirentry::flag_unsure; + } } entry.listing.m_flags |= CDirectoryListing::unsure_invalid; } @@ -291,20 +312,18 @@ return true; } -void CDirectoryCache::InvalidateServer(const CServer& server) +void CDirectoryCache::InvalidateServer(CServer const& server) { fz::scoped_lock lock(mutex_); - for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) - { - if (iter->server != server) + for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) { + if (iter->server != server) { continue; + } - for (tCacheIter cit = iter->cacheList.begin(); cit != iter->cacheList.end(); ++cit) - { + for (tCacheIter cit = iter->cacheList.begin(); cit != iter->cacheList.end(); ++cit) { tLruList::iterator* lruIt = (tLruList::iterator*)cit->lruIt; - if (lruIt) - { + if (lruIt) { m_leastRecentlyUsedList.erase(*lruIt); delete lruIt; } @@ -317,13 +336,14 @@ } } -bool CDirectoryCache::GetChangeTime(fz::monotonic_clock& time, const CServer &server, const CServerPath &path) +bool CDirectoryCache::GetChangeTime(fz::monotonic_clock& time, CServer const& server, CServerPath const& path) { fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); - if (sit == m_serverList.end()) + if (sit == m_serverList.end()) { return false; + } tCacheIter iter; bool unused; @@ -335,7 +355,7 @@ return false; } -void CDirectoryCache::RemoveDir(const CServer& server, const CServerPath& path, const wxString& filename, const CServerPath&) +void CDirectoryCache::RemoveDir(CServer const& server, CServerPath const& path, std::wstring const& filename, CServerPath const&) { fz::scoped_lock lock(mutex_); @@ -343,12 +363,14 @@ // Perhaps just throw away the complete cache? tServerIter sit = GetServerEntry(server); - if (sit == m_serverList.end()) + if (sit == m_serverList.end()) { return; + } CServerPath absolutePath = path; - if (!absolutePath.AddSegment(filename)) + if (!absolutePath.AddSegment(filename)) { absolutePath.clear(); + } for (tCacheIter iter = sit->cacheList.begin(); iter != sit->cacheList.end(); ) { auto & entry = const_cast(*iter); @@ -370,40 +392,37 @@ RemoveFile(server, path, filename); } -void CDirectoryCache::Rename(const CServer& server, const CServerPath& pathFrom, const wxString& fileFrom, const CServerPath& pathTo, const wxString& fileTo) +void CDirectoryCache::Rename(CServer const& server, CServerPath const& pathFrom, std::wstring const& fileFrom, CServerPath const& pathTo, std::wstring const& fileTo) { fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); - if (sit == m_serverList.end()) + if (sit == m_serverList.end()) { return; + } tCacheIter iter; bool is_outdated = false; bool found = Lookup(iter, sit, pathFrom, true, is_outdated); if (found) { auto & listing = const_cast(iter->listing); - if (pathFrom == pathTo) - { + if (pathFrom == pathTo) { RemoveFile(server, pathFrom, fileTo); unsigned int i; - for (i = 0; i < listing.GetCount(); i++) - { - if (listing[i].name == fileFrom) + for (i = 0; i < listing.GetCount(); ++i) { + if (listing[i].name == fileFrom) { break; + } } - if (i != listing.GetCount()) - { - if (listing[i].is_dir()) - { + if (i != listing.GetCount()) { + if (listing[i].is_dir()) { RemoveDir(server, pathFrom, fileFrom, CServerPath()); RemoveDir(server, pathFrom, fileTo, CServerPath()); UpdateFile(server, pathFrom, fileTo, true, dir); } - else - { - listing[i].name = fileTo; - listing[i].flags |= CDirentry::flag_unsure; + else { + listing.get(i).name = fileTo; + listing.get(i).flags |= CDirentry::flag_unsure; listing.m_flags |= CDirectoryListing::unsure_unknown; listing.ClearFindMap(); } @@ -412,9 +431,10 @@ } else { unsigned int i; - for (i = 0; i < listing.GetCount(); i++) { - if (listing[i].name == fileFrom) + for (i = 0; i < listing.GetCount(); ++i) { + if (listing[i].name == fileFrom) { break; + } } if (i != listing.GetCount()) { if (listing[i].is_dir()) { @@ -434,23 +454,25 @@ InvalidateServer(server); } -CDirectoryCache::tServerIter CDirectoryCache::CreateServerEntry(const CServer& server) +CDirectoryCache::tServerIter CDirectoryCache::CreateServerEntry(CServer const& server) { for (tServerIter iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) { - if (iter->server == server) + if (iter->server == server) { return iter; + } } m_serverList.emplace_back(server); return --m_serverList.end(); } -CDirectoryCache::tServerIter CDirectoryCache::GetServerEntry(const CServer& server) +CDirectoryCache::tServerIter CDirectoryCache::GetServerEntry(CServer const& server) { tServerIter iter; for (iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) { - if (iter->server == server) + if (iter->server == server) { break; + } } return iter; @@ -482,9 +504,23 @@ m_totalFileCount -= pos.second->listing.GetCount(); pos.first->cacheList.erase(pos.second); - if (pos.first->cacheList.empty()) + if (pos.first->cacheList.empty()) { m_serverList.erase(pos.first); + } m_leastRecentlyUsedList.pop_front(); } } + +void CDirectoryCache::SetTtl(fz::duration const& ttl) +{ + if (ttl < fz::duration::from_seconds(30)) { + ttl_ = fz::duration::from_seconds(30); + } + else if (ttl > fz::duration::from_days(1)) { + ttl_ = fz::duration::from_days(1); + } + else { + ttl_ = ttl; + } +} diff -Nru filezilla-3.15.0.2/src/engine/directorycache.h filezilla-3.33.0/src/engine/directorycache.h --- filezilla-3.15.0.2/src/engine/directorycache.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/directorycache.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __DIRECTORYCACHE_H__ -#define __DIRECTORYCACHE_H__ +#ifndef FILEZILLA_ENGINE_DIRECTORYCACHE_HEADER +#define FILEZILLA_ENGINE_DIRECTORYCACHE_HEADER /* This class is the directory cache used to store retrieved directory listings @@ -18,8 +18,6 @@ #include -const int CACHE_TIMEOUT = 900; // In seconds - class CDirectoryCache final { public: @@ -36,17 +34,19 @@ CDirectoryCache(CDirectoryCache const&) = delete; CDirectoryCache& operator=(CDirectoryCache const&) = delete; - void Store(const CDirectoryListing &listing, const CServer &server); - bool GetChangeTime(fz::monotonic_clock& time, const CServer &server, const CServerPath &path); - bool Lookup(CDirectoryListing &listing, const CServer &server, const CServerPath &path, bool allowUnsureEntries, bool& is_outdated); - bool DoesExist(const CServer &server, const CServerPath &path, int &hasUnsureEntries, bool &is_outdated); - bool LookupFile(CDirentry &entry, const CServer &server, const CServerPath &path, const wxString& file, bool &dirDidExist, bool &matchedCase); - bool InvalidateFile(const CServer &server, const CServerPath &path, const wxString& filename, bool *wasDir = 0); - bool UpdateFile(const CServer &server, const CServerPath &path, const wxString& filename, bool mayCreate, enum Filetype type = file, int64_t size = -1); - bool RemoveFile(const CServer &server, const CServerPath &path, const wxString& filename); - void InvalidateServer(const CServer& server); - void RemoveDir(const CServer& server, const CServerPath& path, const wxString& filename, const CServerPath& target); - void Rename(const CServer& server, const CServerPath& pathFrom, const wxString& fileFrom, const CServerPath& pathTo, const wxString& fileTo); + void Store(CDirectoryListing const& listing, CServer const& server); + bool GetChangeTime(fz::monotonic_clock& time, CServer const& server, CServerPath const& path); + bool Lookup(CDirectoryListing &listing, CServer const&server, CServerPath const& path, bool allowUnsureEntries, bool& is_outdated); + bool DoesExist(CServer const& server, CServerPath const& path, int &hasUnsureEntries, bool &is_outdated); + bool LookupFile(CDirentry &entry, CServer const& server, CServerPath const& path, std::wstring const& filename, bool &dirDidExist, bool &matchedCase); + bool InvalidateFile(CServer const& server, CServerPath const& path, std::wstring const& filename, bool *wasDir = nullptr); + bool UpdateFile(CServer const& server, CServerPath const& path, std::wstring const& filename, bool mayCreate, Filetype type = file, int64_t size = -1); + bool RemoveFile(CServer const& server, CServerPath const& path, std::wstring const& filename); + void InvalidateServer(CServer const& server); + void RemoveDir(CServer const& server, CServerPath const& path, std::wstring const& filename, CServerPath const& target); + void Rename(CServer const& server, CServerPath const& pathFrom, std::wstring const& fileFrom, CServerPath const& pathTo, std::wstring const& fileTo); + + void SetTtl(fz::duration const& ttl); protected: @@ -95,7 +95,7 @@ typedef std::set::iterator tCacheIter; typedef std::set::const_iterator tCacheConstIter; - bool Lookup(tCacheIter &cacheIter, tServerIter &sit, const CServerPath &path, bool allowUnsureEntries, bool& is_outdated); + bool Lookup(tCacheIter &cacheIter, tServerIter &sit, CServerPath const& path, bool allowUnsureEntries, bool& is_outdated); fz::mutex mutex_; @@ -110,6 +110,8 @@ tLruList m_leastRecentlyUsedList; int64_t m_totalFileCount{}; + + fz::duration ttl_{fz::duration::from_seconds(600)}; }; #endif diff -Nru filezilla-3.15.0.2/src/engine/directorylisting.cpp filezilla-3.33.0/src/engine/directorylisting.cpp --- filezilla-3.15.0.2/src/engine/directorylisting.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/directorylisting.cpp 2017-12-17 12:14:41.000000000 +0000 @@ -1,101 +1,84 @@ #include -wxString CDirentry::dump() const +#include + +#include + +std::wstring CDirentry::dump() const { - wxString str = wxString::Format(_T("name=%s\nsize=%lld\npermissions=%s\nownerGroup=%s\ndir=%d\nlink=%d\ntarget=%s\nunsure=%d\n"), - name, static_cast(size), *permissions, *ownerGroup, flags & flag_dir, flags & flag_link, + std::wstring str = fz::sprintf(L"name=%s\nsize=%d\npermissions=%s\nownerGroup=%s\ndir=%d\nlink=%d\ntarget=%s\nunsure=%d\n", + name, size, *permissions, *ownerGroup, flags & flag_dir, flags & flag_link, target ? *target : std::wstring(), flags & flag_unsure); - if( has_date() ) { - str += _T("date=") + time.format(_T("%Y-%m-%d"), fz::datetime::local) + _T("\n"); + if (has_date()) { + str += L"date=" + time.format(L"%Y-%m-%d", fz::datetime::local) + L"\n"; } - if( has_time() ) { - str += _T("time=") + time.format(_T("%H-%M-%S"), fz::datetime::local) + _T("\n"); + if (has_time()) { + str += L"time=" + time.format(L"%H-%M-%S", fz::datetime::local) + L"\n"; } return str; } bool CDirentry::operator==(const CDirentry &op) const { - if (name != op.name) + if (name != op.name) { return false; + } - if (size != op.size) + if (size != op.size) { return false; + } - if (permissions != op.permissions) + if (permissions != op.permissions) { return false; + } - if (ownerGroup != op.ownerGroup) + if (ownerGroup != op.ownerGroup) { return false; + } - if (flags != op.flags) + if (flags != op.flags) { return false; + } - if( has_date() ) { - if (time != op.time) + if (has_date()) { + if (time != op.time) { return false; + } } return true; } -void CDirectoryListing::SetCount(unsigned int count) -{ - if (count == m_entryCount) - return; - - const unsigned int old_count = m_entryCount; - - if (!count) - { - m_entryCount = 0; - return; - } - - if (count < old_count) - { - m_searchmap_case.clear(); - m_searchmap_nocase.clear(); - } - - m_entries.Get().resize(count); - - m_entryCount = count; -} - const CDirentry& CDirectoryListing::operator[](unsigned int index) const { - // Commented out, too heavy speed penalty - // wxASSERT(index < m_entryCount); return *(*m_entries)[index]; } -CDirentry& CDirectoryListing::operator[](unsigned int index) +CDirentry& CDirectoryListing::get(unsigned int index) { // Commented out, too heavy speed penalty - // wxASSERT(index < m_entryCount); - return m_entries.Get()[index].Get(); + // assert(index < m_entryCount); + return m_entries.get()[index].get(); } -void CDirectoryListing::Assign(std::deque> &entries) +void CDirectoryListing::Assign(std::vector> && entries) { - m_entryCount = entries.size(); - - std::vector >& own_entries = m_entries.Get(); - own_entries.clear(); - own_entries.reserve(m_entryCount); + std::vector> & own_entries = m_entries.get(); + own_entries = std::move(entries); m_flags &= ~(listing_has_dirs | listing_has_perms | listing_has_usergroup); - for (auto & entry : entries) { - if (entry->is_dir()) + for (auto const& entry : own_entries) { + if (entry->is_dir()) { m_flags |= listing_has_dirs; - if (!entry->permissions->empty()) + } + if (!entry->permissions->empty()) { m_flags |= listing_has_perms; - if (!entry->ownerGroup->empty()) + } + if (!entry->ownerGroup->empty()) { m_flags |= listing_has_usergroup; - own_entries.emplace_back(std::move(entry)); + } } m_searchmap_case.clear(); @@ -104,95 +87,106 @@ bool CDirectoryListing::RemoveEntry(unsigned int index) { - if (index >= GetCount()) + if (index >= GetCount()) { return false; + } m_searchmap_case.clear(); m_searchmap_nocase.clear(); - std::vector >& entries = m_entries.Get(); - std::vector >::iterator iter = entries.begin() + index; - if ((*iter)->is_dir()) + std::vector >& entries = m_entries.get(); + std::vector >::iterator iter = entries.begin() + index; + if ((*iter)->is_dir()) { m_flags |= CDirectoryListing::unsure_dir_removed; - else + } + else { m_flags |= CDirectoryListing::unsure_file_removed; + } entries.erase(iter); - --m_entryCount; - return true; } void CDirectoryListing::GetFilenames(std::vector &names) const { names.reserve(GetCount()); - for (unsigned int i = 0; i < GetCount(); ++i) + for (unsigned int i = 0; i < GetCount(); ++i) { names.push_back((*m_entries)[i]->name); + } } -int CDirectoryListing::FindFile_CmpCase(const wxString& name) const +int CDirectoryListing::FindFile_CmpCase(std::wstring const& name) const { - if (!m_entryCount) + if (!m_entries || m_entries->empty()) { return -1; + } - if (!m_searchmap_case) - m_searchmap_case.Get(); + if (!m_searchmap_case) { + m_searchmap_case.get(); + } // Search map - auto iter = m_searchmap_case->find(to_wstring(name)); - if (iter != m_searchmap_case->end()) + auto iter = m_searchmap_case->find(name); + if (iter != m_searchmap_case->end()) { return iter->second; + } unsigned int i = m_searchmap_case->size(); - if (i == m_entryCount) + if (i == m_entries->size()) { return -1; + } - auto & searchmap_case = m_searchmap_case.Get(); + auto & searchmap_case = m_searchmap_case.get(); // Build map if not yet complete - std::vector >::const_iterator entry_iter = m_entries->begin() + i; + std::vector >::const_iterator entry_iter = m_entries->begin() + i; for (; entry_iter != m_entries->end(); ++entry_iter, ++i) { std::wstring const& entry_name = (*entry_iter)->name; searchmap_case.insert(std::pair(entry_name, i)); - if (entry_name == name) + if (entry_name == name) { return i; + } } // Map is complete, item not in it return -1; } -int CDirectoryListing::FindFile_CmpNoCase(wxString name) const +int CDirectoryListing::FindFile_CmpNoCase(std::wstring const& name) const { - if (!m_entryCount) + if (!m_entries || m_entries->empty()) { return -1; + } - if (!m_searchmap_nocase) - m_searchmap_nocase.Get(); + if (!m_searchmap_nocase) { + m_searchmap_nocase.get(); + } - name.MakeLower(); + std::wstring lwr = fz::str_tolower(name); // Search map - auto iter = m_searchmap_nocase->find(to_wstring(name)); - if (iter != m_searchmap_nocase->end()) + auto iter = m_searchmap_nocase->find(lwr); + if (iter != m_searchmap_nocase->end()) { return iter->second; + } unsigned int i = m_searchmap_nocase->size(); - if (i == m_entryCount) + if (i == m_entries->size()) { return -1; + } - auto& searchmap_nocase = m_searchmap_nocase.Get(); + auto& searchmap_nocase = m_searchmap_nocase.get(); // Build map if not yet complete - std::vector >::const_iterator entry_iter = m_entries->begin() + i; + std::vector >::const_iterator entry_iter = m_entries->begin() + i; for (; entry_iter != m_entries->end(); ++entry_iter, ++i) { - wxString entry_name = (*entry_iter)->name; - entry_name.MakeLower(); - searchmap_nocase.insert(std::pair(to_wstring(entry_name), i)); + std::wstring entry_lrw = fz::str_tolower((*entry_iter)->name); + searchmap_nocase.insert(std::pair(entry_lrw, i)); - if (entry_name == name) + if (entry_lrw == lwr) { return i; + } } // Map is complete, item not in it @@ -201,9 +195,49 @@ void CDirectoryListing::ClearFindMap() { - if (!m_searchmap_case) + if (!m_searchmap_case) { return; + } m_searchmap_case.clear(); m_searchmap_nocase.clear(); } + +void CDirectoryListing::Append(CDirentry&& entry) +{ + m_entries.get().emplace_back(entry); +} + +bool CheckInclusion(const CDirectoryListing& listing1, const CDirectoryListing& listing2) +{ + // Check if listing2 is contained within listing1 + + if (listing2.GetCount() > listing1.GetCount()) { + return false; + } + + std::vector names1, names2; + listing1.GetFilenames(names1); + listing2.GetFilenames(names2); + std::sort(names1.begin(), names1.end()); + std::sort(names2.begin(), names2.end()); + + std::vector::const_iterator iter1, iter2; + iter1 = names1.cbegin(); + iter2 = names2.cbegin(); + while (iter2 != names2.cbegin()) { + if (iter1 == names1.cend()) { + return false; + } + + if (*iter1 != *iter2) { + ++iter1; + continue; + } + + ++iter1; + ++iter2; + } + + return true; +} diff -Nru filezilla-3.15.0.2/src/engine/directorylistingparser.cpp filezilla-3.33.0/src/engine/directorylistingparser.cpp --- filezilla-3.15.0.2/src/engine/directorylistingparser.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/directorylistingparser.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -2,9 +2,13 @@ #include "directorylistingparser.h" #include "ControlSocket.h" +#include + #include #include +#include + std::map CDirectoryListingParser::m_MonthNamesMap; //#define LISTDEBUG_MVS @@ -19,7 +23,7 @@ namespace { struct ObjectCache { - CRefcountObject const& get(std::wstring const& v) + fz::shared_value const& get(std::wstring const& v) { auto it = std::lower_bound(cache.begin(), cache.end(), v); @@ -32,7 +36,7 @@ // Vector coupled with binary search and sorted insertion is fastest // alternative as we expect a relatively low amount of inserts. // Note that we cannot use set, as it it cannot search based on a different type. - std::vector> cache; + std::vector> cache; }; @@ -42,6 +46,15 @@ class CToken final { protected: + enum flags : unsigned char { + numeric_left = 0x01, + non_numeric_left = 0x02, + numeric_right = 0x04, + non_numeric_right = 0x08, + numeric = 0x10, + non_numeric = 0x20 + }; + enum TokenInformation { Unknown, @@ -68,11 +81,14 @@ return m_pToken; } - unsigned int GetLength() const - { + unsigned size() const { return m_len; } + explicit operator bool() const { return m_len != 0; } + + wchar_t operator[](unsigned int i) const { return m_pToken[i]; } + std::wstring GetString() const { if (!m_pToken || !m_len) { @@ -89,23 +105,22 @@ { case decimal: default: - if (m_numeric == Unknown) - { - m_numeric = Yes; - for (unsigned int i = 0; i < m_len; ++i) - if (m_pToken[i] < '0' || m_pToken[i] > '9') - { - m_numeric = No; + if (!(flags_ & (numeric | non_numeric))) { + flags_ |= numeric; + for (unsigned int i = 0; i < m_len; ++i) { + if (m_pToken[i] < '0' || m_pToken[i] > '9') { + flags_ ^= numeric | non_numeric; break; } + } } - return m_numeric == Yes; + return flags_ & numeric; case hex: - for (unsigned int i = 0; i < m_len; ++i) - { - const char c = m_pToken[i]; - if ((c < '0' || c > '9') && (c < 'A' || c > 'F') && (c < 'a' || c > 'f')) + for (unsigned int i = 0; i < m_len; ++i) { + auto const c = m_pToken[i]; + if ((c < '0' || c > '9') && (c < 'A' || c > 'F') && (c < 'a' || c > 'f')) { return false; + } } return true; } @@ -113,47 +128,51 @@ bool IsNumeric(unsigned int start, unsigned int len) { - for (unsigned int i = start; i < std::min(start + len, m_len); ++i) - if (m_pToken[i] < '0' || m_pToken[i] > '9') + for (unsigned int i = start; i < std::min(start + len, m_len); ++i) { + if (m_pToken[i] < '0' || m_pToken[i] > '9') { return false; + } + } return true; } bool IsLeftNumeric() { - if (m_leftNumeric == Unknown) { - if (m_len < 2) - m_leftNumeric = No; - else if (m_pToken[0] < '0' || m_pToken[0] > '9') - m_leftNumeric = No; - else - m_leftNumeric = Yes; + if (!(flags_ & (numeric_left | non_numeric_left))) { + if (m_len < 2 || m_pToken[0] < '0' || m_pToken[0] > '9') { + flags_ |= non_numeric_left; + } + else { + flags_ |= numeric_left; + } } - return m_leftNumeric == Yes; + return flags_ & numeric_left; } bool IsRightNumeric() { - if (m_rightNumeric == Unknown) { - if (m_len < 2) - m_rightNumeric = No; - else if (m_pToken[m_len - 1] < '0' || m_pToken[m_len - 1] > '9') - m_rightNumeric = No; - else - m_rightNumeric = Yes; + if (!(flags_ & (numeric_right | non_numeric_right))) { + if (m_len < 2 || m_pToken[m_len - 1] < '0' || m_pToken[m_len - 1] > '9') { + flags_ |= non_numeric_right; + } + else { + flags_ |= numeric_right; + } } - return m_rightNumeric == Yes; + return flags_ & numeric_right; } int Find(const wchar_t* chr, int start = 0) const { - if (!chr) + if (!chr) { return -1; + } for (unsigned int i = start; i < m_len; ++i) { for (int c = 0; chr[c]; ++c) { - if (m_pToken[i] == chr[c]) + if (m_pToken[i] == chr[c]) { return i; + } } } return -1; @@ -161,34 +180,41 @@ int Find(wchar_t chr, int start = 0) const { - if (!m_pToken) + if (!m_pToken) { return -1; + } - for (unsigned int i = start; i < m_len; ++i) - if (m_pToken[i] == chr) + for (unsigned int i = start; i < m_len; ++i) { + if (m_pToken[i] == chr) { return i; + } + } return -1; } int64_t GetNumber(unsigned int start, int len) { - if (len == -1) + if (len == -1) { len = m_len - start; - if (len < 1) + } + if (len < 1) { return -1; + } - if (start + static_cast(len) > m_len) + if (start + static_cast(len) > m_len) { return -1; + } - if (m_pToken[start] < '0' || m_pToken[start] > '9') + if (m_pToken[start] < '0' || m_pToken[start] > '9') { return -1; + } int64_t number = 0; - for (unsigned int i = start; i < (start + len); ++i) - { - if (m_pToken[i] < '0' || m_pToken[i] > '9') + for (unsigned int i = start; i < (start + len); ++i) { + if (m_pToken[i] < '0' || m_pToken[i] > '9') { break; + } number *= 10; number += m_pToken[i] - '0'; } @@ -204,8 +230,9 @@ if (IsNumeric() || IsLeftNumeric()) { m_number = 0; for (unsigned int i = 0; i < m_len; ++i) { - if (m_pToken[i] < '0' || m_pToken[i] > '9') + if (m_pToken[i] < '0' || m_pToken[i] > '9') { break; + } m_number *= 10; m_number += m_pToken[i] - '0'; } @@ -213,10 +240,10 @@ else if (IsRightNumeric()) { m_number = 0; int start = m_len - 1; - while (m_pToken[start - 1] >= '0' && m_pToken[start - 1] <= '9') + while (m_pToken[start - 1] >= '0' && m_pToken[start - 1] <= '9') { --start; - for (unsigned int i = start; i < m_len; ++i) - { + } + for (unsigned int i = start; i < m_len; ++i) { m_number *= 10; m_number += m_pToken[i] - '0'; } @@ -240,357 +267,339 @@ number *= 16; number += c - 'A' + 10; } - else + else { return -1; + } } return number; } } } - wchar_t operator[](unsigned int n) const - { - if (n >= m_len) - return 0; - - return m_pToken[n]; - } - protected: + int64_t m_number{-1}; + wchar_t const* m_pToken{}; + unsigned int m_len{}; - TokenInformation m_numeric{Unknown}; - TokenInformation m_leftNumeric{Unknown}; - TokenInformation m_rightNumeric{Unknown}; - int64_t m_number{-1}; + unsigned char flags_{}; }; -class CLine +class CLine final { public: - CLine(wchar_t* p, int len = -1, int trailing_whitespace = 0) + CLine(std::wstring && line, int trailing_whitespace = -1) + : trailing_whitespace_(trailing_whitespace) + , line_(line) { - m_pLine = p; - if (len >= 0) - m_len = len; - else - m_len = fz::strlen(p); - - m_parsePos = 0; - m_Tokens.reserve(10); m_LineEndTokens.reserve(10); - m_trailing_whitespace = trailing_whitespace; + while (m_parsePos < line_.size() && (line_[m_parsePos] == ' ' || line_[m_parsePos] == '\t')) { + ++m_parsePos; + } } ~CLine() { - delete [] m_pLine; - - std::vector::iterator iter; - for (iter = m_Tokens.begin(); iter != m_Tokens.end(); ++iter) - delete *iter; - for (iter = m_LineEndTokens.begin(); iter != m_LineEndTokens.end(); ++iter) - delete *iter; } - bool GetToken(unsigned int n, CToken &token, bool toEnd = false, bool include_whitespace = false) + CToken GetToken(unsigned int n) { - n += offset_; - if (!toEnd) { - if (m_Tokens.size() > n) { - token = *(m_Tokens[n]); - return true; - } + if (m_Tokens.size() > n) { + return m_Tokens[n]; + } - int start = m_parsePos; - while (m_parsePos < m_len) { - if (m_pLine[m_parsePos] == ' ' || m_pLine[m_parsePos] == '\t') { - CToken *pToken = new CToken(m_pLine + start, m_parsePos - start); - m_Tokens.push_back(pToken); - - while (m_parsePos < m_len && (m_pLine[m_parsePos] == ' ' || m_pLine[m_parsePos] == '\t')) - ++m_parsePos; - - if (m_Tokens.size() > n) { - token = *(m_Tokens[n]); - return true; - } + size_t start = m_parsePos; + while (m_parsePos < line_.size()) { + if (line_[m_parsePos] == ' ' || line_[m_parsePos] == '\t') { + m_Tokens.emplace_back(line_.c_str() + start, m_parsePos - start); + + while (m_parsePos < line_.size() && (line_[m_parsePos] == ' ' || line_[m_parsePos] == '\t')) + ++m_parsePos; - start = m_parsePos; + if (m_Tokens.size() > n) { + return m_Tokens[n]; } - ++m_parsePos; + + start = m_parsePos; } - if (m_parsePos != start) { - CToken *pToken = new CToken(m_pLine + start, m_parsePos - start); - m_Tokens.push_back(pToken); + ++m_parsePos; + } + if (m_parsePos != start) { + m_Tokens.emplace_back(line_.c_str() + start, m_parsePos - start); + } + + if (m_Tokens.size() > n) { + return m_Tokens[n]; + } + + return CToken(); + } + + CToken GetEndToken(unsigned int n, bool include_whitespace = false) + { + if (include_whitespace) { + int prev = n; + if (prev) { + --prev; } - if (m_Tokens.size() > n) { - token = *(m_Tokens[n]); - return true; + CToken ref = GetToken(prev); + if (!ref) { + return ref; } + wchar_t const* p = ref.GetToken() + ref.size() + 1; - return false; + auto const newLen = line_.size() - (p - line_.c_str()); + if (newLen <= 0) { + return CToken(); + } + return CToken(p, newLen); } - else { - if (include_whitespace) { - int prev = n - offset_; - if (prev) - --prev; - CToken ref; - if (!GetToken(prev, ref)) - return false; - wchar_t const* p = ref.GetToken() + ref.GetLength() + 1; + if (m_LineEndTokens.size() > n) { + return m_LineEndTokens[n]; + } - auto const newLen = m_len - (p - m_pLine); - if (newLen <= 0) { - return false; - } - token = CToken(p, newLen); - return true; + if (m_Tokens.size() <= n) { + if (!GetToken(n)) { + return CToken(); } + } - if (m_LineEndTokens.size() > n) { - token = *(m_LineEndTokens[n]); - return true; + if (trailing_whitespace_ == -1) { + trailing_whitespace_ = 0; + size_t i = line_.size() - 1; + while (i < line_.size() && (line_[i] == ' ' || line_[i] == '\t')) { + --i; + ++trailing_whitespace_; } + } - if (m_Tokens.size() <= n) - if (!GetToken(n - offset_, token)) - return false; - - for (unsigned int i = static_cast(m_LineEndTokens.size()); i <= n; ++i) { - const CToken *refToken = m_Tokens[i]; - const wchar_t* p = refToken->GetToken(); - auto const newLen = m_len - (p - m_pLine) - m_trailing_whitespace; - if (newLen <= 0) { - return false; - } - CToken *pToken = new CToken(p, newLen); - m_LineEndTokens.push_back(pToken); + for (unsigned int i = static_cast(m_LineEndTokens.size()); i <= n; ++i) { + CToken const& refToken = m_Tokens[i]; + const wchar_t* p = refToken.GetToken(); + auto const newLen = line_.size() - (p - line_.c_str()) - trailing_whitespace_; + if (newLen <= 0) { + return CToken(); } - token = *(m_LineEndTokens[n]); - return true; + m_LineEndTokens.emplace_back(p, newLen); } - }; + return m_LineEndTokens[n]; + } - CLine *Concat(const CLine *pLine) const + bool GetToken(unsigned int n, CToken & token, bool to_end = false, bool include_whitespace = false) { - int newLen = m_len + pLine->m_len + 1; - wchar_t* p = new wchar_t[newLen]; - memcpy(p, m_pLine, m_len * sizeof(wchar_t)); - p[m_len] = ' '; - memcpy(p + m_len + 1, pLine->m_pLine, pLine->m_len * sizeof(wchar_t)); - - return new CLine(p, m_len + pLine->m_len + 1, pLine->m_trailing_whitespace); + if (to_end) { + token = GetEndToken(n, include_whitespace); + } + else { + token = GetToken(n); + } + return token.operator bool(); } - void SetTokenOffset(unsigned int offset) + CLine *Concat(CLine const* pLine) const { - offset_ = offset; + std::wstring n; + n.reserve(line_.size() + pLine->line_.size() + 1); + n = line_; + n += ' '; + n += pLine->line_; + return new CLine(std::move(n), pLine->trailing_whitespace_); } protected: - std::vector m_Tokens; - std::vector m_LineEndTokens; - int m_parsePos; - int m_len; - int m_trailing_whitespace; - wchar_t* m_pLine; - unsigned int offset_{}; + std::vector m_Tokens; + std::vector m_LineEndTokens; + size_t m_parsePos{}; + int trailing_whitespace_; + std::wstring const line_; }; -CDirectoryListingParser::CDirectoryListingParser(CControlSocket* pControlSocket, const CServer& server, listingEncoding::type encoding, bool sftp_mode) +CDirectoryListingParser::CDirectoryListingParser(CControlSocket* pControlSocket, const CServer& server, listingEncoding::type encoding) : m_pControlSocket(pControlSocket) - , m_currentOffset(0) - , m_totalData() - , m_prevLine(0) , m_server(server) - , m_fileListOnly(true) - , m_maybeMultilineVms(false) , m_listingEncoding(encoding) - , sftp_mode_(sftp_mode) { if (m_MonthNamesMap.empty()) { //Fill the month names map //English month names - m_MonthNamesMap[_T("jan")] = 1; - m_MonthNamesMap[_T("feb")] = 2; - m_MonthNamesMap[_T("mar")] = 3; - m_MonthNamesMap[_T("apr")] = 4; - m_MonthNamesMap[_T("may")] = 5; - m_MonthNamesMap[_T("jun")] = 6; - m_MonthNamesMap[_T("june")] = 6; - m_MonthNamesMap[_T("jul")] = 7; - m_MonthNamesMap[_T("july")] = 7; - m_MonthNamesMap[_T("aug")] = 8; - m_MonthNamesMap[_T("sep")] = 9; - m_MonthNamesMap[_T("sept")] = 9; - m_MonthNamesMap[_T("oct")] = 10; - m_MonthNamesMap[_T("nov")] = 11; - m_MonthNamesMap[_T("dec")] = 12; + m_MonthNamesMap[L"jan"] = 1; + m_MonthNamesMap[L"feb"] = 2; + m_MonthNamesMap[L"mar"] = 3; + m_MonthNamesMap[L"apr"] = 4; + m_MonthNamesMap[L"may"] = 5; + m_MonthNamesMap[L"jun"] = 6; + m_MonthNamesMap[L"june"] = 6; + m_MonthNamesMap[L"jul"] = 7; + m_MonthNamesMap[L"july"] = 7; + m_MonthNamesMap[L"aug"] = 8; + m_MonthNamesMap[L"sep"] = 9; + m_MonthNamesMap[L"sept"] = 9; + m_MonthNamesMap[L"oct"] = 10; + m_MonthNamesMap[L"nov"] = 11; + m_MonthNamesMap[L"dec"] = 12; //Numerical values for the month - m_MonthNamesMap[_T("1")] = 1; - m_MonthNamesMap[_T("01")] = 1; - m_MonthNamesMap[_T("2")] = 2; - m_MonthNamesMap[_T("02")] = 2; - m_MonthNamesMap[_T("3")] = 3; - m_MonthNamesMap[_T("03")] = 3; - m_MonthNamesMap[_T("4")] = 4; - m_MonthNamesMap[_T("04")] = 4; - m_MonthNamesMap[_T("5")] = 5; - m_MonthNamesMap[_T("05")] = 5; - m_MonthNamesMap[_T("6")] = 6; - m_MonthNamesMap[_T("06")] = 6; - m_MonthNamesMap[_T("7")] = 7; - m_MonthNamesMap[_T("07")] = 7; - m_MonthNamesMap[_T("8")] = 8; - m_MonthNamesMap[_T("08")] = 8; - m_MonthNamesMap[_T("9")] = 9; - m_MonthNamesMap[_T("09")] = 9; - m_MonthNamesMap[_T("10")] = 10; - m_MonthNamesMap[_T("11")] = 11; - m_MonthNamesMap[_T("12")] = 12; + m_MonthNamesMap[L"1"] = 1; + m_MonthNamesMap[L"01"] = 1; + m_MonthNamesMap[L"2"] = 2; + m_MonthNamesMap[L"02"] = 2; + m_MonthNamesMap[L"3"] = 3; + m_MonthNamesMap[L"03"] = 3; + m_MonthNamesMap[L"4"] = 4; + m_MonthNamesMap[L"04"] = 4; + m_MonthNamesMap[L"5"] = 5; + m_MonthNamesMap[L"05"] = 5; + m_MonthNamesMap[L"6"] = 6; + m_MonthNamesMap[L"06"] = 6; + m_MonthNamesMap[L"7"] = 7; + m_MonthNamesMap[L"07"] = 7; + m_MonthNamesMap[L"8"] = 8; + m_MonthNamesMap[L"08"] = 8; + m_MonthNamesMap[L"9"] = 9; + m_MonthNamesMap[L"09"] = 9; + m_MonthNamesMap[L"10"] = 10; + m_MonthNamesMap[L"11"] = 11; + m_MonthNamesMap[L"12"] = 12; //German month names - m_MonthNamesMap[_T("mrz")] = 3; - m_MonthNamesMap[_T("m\xe4r")] = 3; - m_MonthNamesMap[_T("m\xe4rz")] = 3; - m_MonthNamesMap[_T("mai")] = 5; - m_MonthNamesMap[_T("juni")] = 6; - m_MonthNamesMap[_T("juli")] = 7; - m_MonthNamesMap[_T("okt")] = 10; - m_MonthNamesMap[_T("dez")] = 12; + m_MonthNamesMap[L"mrz"] = 3; + m_MonthNamesMap[L"m\xe4r"] = 3; + m_MonthNamesMap[L"m\xe4rz"] = 3; + m_MonthNamesMap[L"mai"] = 5; + m_MonthNamesMap[L"juni"] = 6; + m_MonthNamesMap[L"juli"] = 7; + m_MonthNamesMap[L"okt"] = 10; + m_MonthNamesMap[L"dez"] = 12; //Austrian month names - m_MonthNamesMap[_T("j\xe4n")] = 1; + m_MonthNamesMap[L"j\xe4n"] = 1; //French month names - m_MonthNamesMap[_T("janv")] = 1; - m_MonthNamesMap[_T("f\xe9") _T("b")] = 1; - m_MonthNamesMap[_T("f\xe9v")] = 2; - m_MonthNamesMap[_T("fev")] = 2; - m_MonthNamesMap[_T("f\xe9vr")] = 2; - m_MonthNamesMap[_T("fevr")] = 2; - m_MonthNamesMap[_T("mars")] = 3; - m_MonthNamesMap[_T("mrs")] = 3; - m_MonthNamesMap[_T("avr")] = 4; - m_MonthNamesMap[_T("avril")] = 4; - m_MonthNamesMap[_T("juin")] = 6; - m_MonthNamesMap[_T("juil")] = 7; - m_MonthNamesMap[_T("jui")] = 7; - m_MonthNamesMap[_T("ao\xfb")] = 8; - m_MonthNamesMap[_T("ao\xfbt")] = 8; - m_MonthNamesMap[_T("aout")] = 8; - m_MonthNamesMap[_T("d\xe9") _T("c")] = 12; - m_MonthNamesMap[_T("dec")] = 12; + m_MonthNamesMap[L"janv"] = 1; + m_MonthNamesMap[L"f\xe9" L"b"] = 1; + m_MonthNamesMap[L"f\xe9v"] = 2; + m_MonthNamesMap[L"fev"] = 2; + m_MonthNamesMap[L"f\xe9vr"] = 2; + m_MonthNamesMap[L"fevr"] = 2; + m_MonthNamesMap[L"mars"] = 3; + m_MonthNamesMap[L"mrs"] = 3; + m_MonthNamesMap[L"avr"] = 4; + m_MonthNamesMap[L"avril"] = 4; + m_MonthNamesMap[L"juin"] = 6; + m_MonthNamesMap[L"juil"] = 7; + m_MonthNamesMap[L"jui"] = 7; + m_MonthNamesMap[L"ao\xfb"] = 8; + m_MonthNamesMap[L"ao\xfbt"] = 8; + m_MonthNamesMap[L"aout"] = 8; + m_MonthNamesMap[L"d\xe9" L"c"] = 12; + m_MonthNamesMap[L"dec"] = 12; //Italian month names - m_MonthNamesMap[_T("gen")] = 1; - m_MonthNamesMap[_T("mag")] = 5; - m_MonthNamesMap[_T("giu")] = 6; - m_MonthNamesMap[_T("lug")] = 7; - m_MonthNamesMap[_T("ago")] = 8; - m_MonthNamesMap[_T("set")] = 9; - m_MonthNamesMap[_T("ott")] = 10; - m_MonthNamesMap[_T("dic")] = 12; + m_MonthNamesMap[L"gen"] = 1; + m_MonthNamesMap[L"mag"] = 5; + m_MonthNamesMap[L"giu"] = 6; + m_MonthNamesMap[L"lug"] = 7; + m_MonthNamesMap[L"ago"] = 8; + m_MonthNamesMap[L"set"] = 9; + m_MonthNamesMap[L"ott"] = 10; + m_MonthNamesMap[L"dic"] = 12; //Spanish month names - m_MonthNamesMap[_T("ene")] = 1; - m_MonthNamesMap[_T("fbro")] = 2; - m_MonthNamesMap[_T("mzo")] = 3; - m_MonthNamesMap[_T("ab")] = 4; - m_MonthNamesMap[_T("abr")] = 4; - m_MonthNamesMap[_T("agto")] = 8; - m_MonthNamesMap[_T("sbre")] = 9; - m_MonthNamesMap[_T("obre")] = 9; - m_MonthNamesMap[_T("nbre")] = 9; - m_MonthNamesMap[_T("dbre")] = 9; + m_MonthNamesMap[L"ene"] = 1; + m_MonthNamesMap[L"fbro"] = 2; + m_MonthNamesMap[L"mzo"] = 3; + m_MonthNamesMap[L"ab"] = 4; + m_MonthNamesMap[L"abr"] = 4; + m_MonthNamesMap[L"agto"] = 8; + m_MonthNamesMap[L"sbre"] = 9; + m_MonthNamesMap[L"obre"] = 9; + m_MonthNamesMap[L"nbre"] = 9; + m_MonthNamesMap[L"dbre"] = 9; //Polish month names - m_MonthNamesMap[_T("sty")] = 1; - m_MonthNamesMap[_T("lut")] = 2; - m_MonthNamesMap[_T("kwi")] = 4; - m_MonthNamesMap[_T("maj")] = 5; - m_MonthNamesMap[_T("cze")] = 6; - m_MonthNamesMap[_T("lip")] = 7; - m_MonthNamesMap[_T("sie")] = 8; - m_MonthNamesMap[_T("wrz")] = 9; - m_MonthNamesMap[_T("pa\x9f")] = 10; - m_MonthNamesMap[_T("pa\xbc")] = 10; // ISO-8859-2 - m_MonthNamesMap[_T("paz")] = 10; // ASCII - m_MonthNamesMap[_T("pa\xc5\xba")] = 10; // UTF-8 - m_MonthNamesMap[_T("pa\x017a")] = 10; // some servers send this - m_MonthNamesMap[_T("lis")] = 11; - m_MonthNamesMap[_T("gru")] = 12; + m_MonthNamesMap[L"sty"] = 1; + m_MonthNamesMap[L"lut"] = 2; + m_MonthNamesMap[L"kwi"] = 4; + m_MonthNamesMap[L"maj"] = 5; + m_MonthNamesMap[L"cze"] = 6; + m_MonthNamesMap[L"lip"] = 7; + m_MonthNamesMap[L"sie"] = 8; + m_MonthNamesMap[L"wrz"] = 9; + m_MonthNamesMap[L"pa\x9f"] = 10; + m_MonthNamesMap[L"pa\xbc"] = 10; // ISO-8859-2 + m_MonthNamesMap[L"paz"] = 10; // ASCII + m_MonthNamesMap[L"pa\xc5\xba"] = 10; // UTF-8 + m_MonthNamesMap[L"pa\x017a"] = 10; // some servers send this + m_MonthNamesMap[L"lis"] = 11; + m_MonthNamesMap[L"gru"] = 12; //Russian month names - m_MonthNamesMap[_T("\xff\xed\xe2")] = 1; - m_MonthNamesMap[_T("\xf4\xe5\xe2")] = 2; - m_MonthNamesMap[_T("\xec\xe0\xf0")] = 3; - m_MonthNamesMap[_T("\xe0\xef\xf0")] = 4; - m_MonthNamesMap[_T("\xec\xe0\xe9")] = 5; - m_MonthNamesMap[_T("\xe8\xfe\xed")] = 6; - m_MonthNamesMap[_T("\xe8\xfe\xeb")] = 7; - m_MonthNamesMap[_T("\xe0\xe2\xe3")] = 8; - m_MonthNamesMap[_T("\xf1\xe5\xed")] = 9; - m_MonthNamesMap[_T("\xee\xea\xf2")] = 10; - m_MonthNamesMap[_T("\xed\xee\xff")] = 11; - m_MonthNamesMap[_T("\xe4\xe5\xea")] = 12; + m_MonthNamesMap[L"\xff\xed\xe2"] = 1; + m_MonthNamesMap[L"\xf4\xe5\xe2"] = 2; + m_MonthNamesMap[L"\xec\xe0\xf0"] = 3; + m_MonthNamesMap[L"\xe0\xef\xf0"] = 4; + m_MonthNamesMap[L"\xec\xe0\xe9"] = 5; + m_MonthNamesMap[L"\xe8\xfe\xed"] = 6; + m_MonthNamesMap[L"\xe8\xfe\xeb"] = 7; + m_MonthNamesMap[L"\xe0\xe2\xe3"] = 8; + m_MonthNamesMap[L"\xf1\xe5\xed"] = 9; + m_MonthNamesMap[L"\xee\xea\xf2"] = 10; + m_MonthNamesMap[L"\xed\xee\xff"] = 11; + m_MonthNamesMap[L"\xe4\xe5\xea"] = 12; //Dutch month names - m_MonthNamesMap[_T("mrt")] = 3; - m_MonthNamesMap[_T("mei")] = 5; + m_MonthNamesMap[L"mrt"] = 3; + m_MonthNamesMap[L"mei"] = 5; //Portuguese month names - m_MonthNamesMap[_T("out")] = 10; + m_MonthNamesMap[L"out"] = 10; //Finnish month names - m_MonthNamesMap[_T("tammi")] = 1; - m_MonthNamesMap[_T("helmi")] = 2; - m_MonthNamesMap[_T("maalis")] = 3; - m_MonthNamesMap[_T("huhti")] = 4; - m_MonthNamesMap[_T("touko")] = 5; - m_MonthNamesMap[_T("kes\xe4")] = 6; - m_MonthNamesMap[_T("hein\xe4")] = 7; - m_MonthNamesMap[_T("elo")] = 8; - m_MonthNamesMap[_T("syys")] = 9; - m_MonthNamesMap[_T("loka")] = 10; - m_MonthNamesMap[_T("marras")] = 11; - m_MonthNamesMap[_T("joulu")] = 12; + m_MonthNamesMap[L"tammi"] = 1; + m_MonthNamesMap[L"helmi"] = 2; + m_MonthNamesMap[L"maalis"] = 3; + m_MonthNamesMap[L"huhti"] = 4; + m_MonthNamesMap[L"touko"] = 5; + m_MonthNamesMap[L"kes\xe4"] = 6; + m_MonthNamesMap[L"hein\xe4"] = 7; + m_MonthNamesMap[L"elo"] = 8; + m_MonthNamesMap[L"syys"] = 9; + m_MonthNamesMap[L"loka"] = 10; + m_MonthNamesMap[L"marras"] = 11; + m_MonthNamesMap[L"joulu"] = 12; //Slovenian month names - m_MonthNamesMap[_T("avg")] = 8; + m_MonthNamesMap[L"avg"] = 8; //Icelandic - m_MonthNamesMap[_T("ma\x00ed")] = 5; - m_MonthNamesMap[_T("j\x00fan")] = 6; - m_MonthNamesMap[_T("j\x00fal")] = 7; - m_MonthNamesMap[_T("\x00e1g")] = 8; - m_MonthNamesMap[_T("n\x00f3v")] = 11; - m_MonthNamesMap[_T("des")] = 12; + m_MonthNamesMap[L"ma\x00ed"] = 5; + m_MonthNamesMap[L"j\x00fan"] = 6; + m_MonthNamesMap[L"j\x00fal"] = 7; + m_MonthNamesMap[L"\x00e1g"] = 8; + m_MonthNamesMap[L"n\x00f3v"] = 11; + m_MonthNamesMap[L"des"] = 12; //Lithuanian - m_MonthNamesMap[_T("sau")] = 1; - m_MonthNamesMap[_T("vas")] = 2; - m_MonthNamesMap[_T("kov")] = 3; - m_MonthNamesMap[_T("bal")] = 4; - m_MonthNamesMap[_T("geg")] = 5; - m_MonthNamesMap[_T("bir")] = 6; - m_MonthNamesMap[_T("lie")] = 7; - m_MonthNamesMap[_T("rgp")] = 8; - m_MonthNamesMap[_T("rgs")] = 9; - m_MonthNamesMap[_T("spa")] = 10; - m_MonthNamesMap[_T("lap")] = 11; - m_MonthNamesMap[_T("grd")] = 12; + m_MonthNamesMap[L"sau"] = 1; + m_MonthNamesMap[L"vas"] = 2; + m_MonthNamesMap[L"kov"] = 3; + m_MonthNamesMap[L"bal"] = 4; + m_MonthNamesMap[L"geg"] = 5; + m_MonthNamesMap[L"bir"] = 6; + m_MonthNamesMap[L"lie"] = 7; + m_MonthNamesMap[L"rgp"] = 8; + m_MonthNamesMap[L"rgs"] = 9; + m_MonthNamesMap[L"spa"] = 10; + m_MonthNamesMap[L"lap"] = 11; + m_MonthNamesMap[L"grd"] = 12; // Hungarian - m_MonthNamesMap[_T("szept")] = 9; + m_MonthNamesMap[L"szept"] = 9; //There are more languages and thus month //names, but as long as nobody reports a @@ -602,36 +611,39 @@ std::map combo; for (auto iter = m_MonthNamesMap.begin(); iter != m_MonthNamesMap.end(); ++iter) { // January could be 1 or 0, depends how the server counts - combo[wxString::Format(_T("%s%02d"), iter->first, iter->second).ToStdWstring()] = iter->second; - combo[wxString::Format(_T("%s%02d"), iter->first, iter->second - 1).ToStdWstring()] = iter->second; - if (iter->second < 10) - combo[wxString::Format(_T("%s%d"), iter->first, iter->second).ToStdWstring()] = iter->second; - else - combo[wxString::Format(_T("%s%d"), iter->first, iter->second % 10).ToStdWstring()] = iter->second; - if (iter->second <= 10) - combo[wxString::Format(_T("%s%d"), iter->first, iter->second - 1).ToStdWstring()] = iter->second; - else - combo[wxString::Format(_T("%s%d"), iter->first, (iter->second - 1) % 10).ToStdWstring()] = iter->second; + combo[fz::sprintf(L"%s%02d", iter->first, iter->second)] = iter->second; + combo[fz::sprintf(L"%s%02d", iter->first, iter->second - 1)] = iter->second; + if (iter->second < 10) { + combo[fz::sprintf(L"%s%d", iter->first, iter->second)] = iter->second; + } + else { + combo[fz::sprintf(L"%s%d", iter->first, iter->second % 10)] = iter->second; + } + if (iter->second <= 10) { + combo[fz::sprintf(L"%s%d", iter->first, iter->second - 1)] = iter->second; + } + else { + combo[fz::sprintf(L"%s%d", iter->first, (iter->second - 1) % 10)] = iter->second; + } } m_MonthNamesMap.insert(combo.begin(), combo.end()); - m_MonthNamesMap[_T("1")] = 1; - m_MonthNamesMap[_T("2")] = 2; - m_MonthNamesMap[_T("3")] = 3; - m_MonthNamesMap[_T("4")] = 4; - m_MonthNamesMap[_T("5")] = 5; - m_MonthNamesMap[_T("6")] = 6; - m_MonthNamesMap[_T("7")] = 7; - m_MonthNamesMap[_T("8")] = 8; - m_MonthNamesMap[_T("9")] = 9; - m_MonthNamesMap[_T("10")] = 10; - m_MonthNamesMap[_T("11")] = 11; - m_MonthNamesMap[_T("12")] = 12; + m_MonthNamesMap[L"1"] = 1; + m_MonthNamesMap[L"2"] = 2; + m_MonthNamesMap[L"3"] = 3; + m_MonthNamesMap[L"4"] = 4; + m_MonthNamesMap[L"5"] = 5; + m_MonthNamesMap[L"6"] = 6; + m_MonthNamesMap[L"7"] = 7; + m_MonthNamesMap[L"8"] = 8; + m_MonthNamesMap[L"9"] = 9; + m_MonthNamesMap[L"10"] = 10; + m_MonthNamesMap[L"11"] = 11; + m_MonthNamesMap[L"12"] = 12; } #ifdef LISTDEBUG - for (unsigned int i = 0; data[i][0]; ++i) - { + for (unsigned int i = 0; data[i][0]; ++i) { unsigned int len = (unsigned int)strlen(data[i]); char *pData = new char[len + 3]; strcpy(pData, data[i]); @@ -643,8 +655,9 @@ CDirectoryListingParser::~CDirectoryListingParser() { - for (auto iter = m_DataList.begin(); iter != m_DataList.end(); ++iter) + for (auto iter = m_DataList.begin(); iter != m_DataList.end(); ++iter) { delete [] iter->p; + } delete m_prevLine; } @@ -666,21 +679,19 @@ if (res) { delete pLine; - m_prevLine = 0; + m_prevLine = nullptr; } - else + else { m_prevLine = pLine; - } - else if (!sftp_mode_) { - m_prevLine = pLine; + } } else { - delete pLine; + m_prevLine = pLine; } } else { delete m_prevLine; - m_prevLine = 0; + m_prevLine = nullptr; delete pLine; } pLine = GetLine(partial, error); @@ -695,106 +706,118 @@ listing.path = path; listing.m_firstListTime = fz::monotonic_clock::now(); - if (!ParseData(false)){ + if (!ParseData(false)) { listing.m_flags |= CDirectoryListing::listing_failed; return listing; } if (!m_fileList.empty()) { - wxASSERT(m_entryList.empty()); + assert(entries_.empty()); - listing.SetCount(m_fileList.size()); - unsigned int i = 0; + entries_.reserve(m_fileList.size()); for (auto const& file : m_fileList) { CDirentry entry; entry.name = file; entry.flags = 0; entry.size = -1; - listing[i++] = entry; + entries_.emplace_back(std::move(entry)); } } - else { - listing.Assign(m_entryList); - } + + listing.Assign(std::move(entries_)); return listing; } -bool CDirectoryListingParser::ParseLine(CLine &line, const enum ServerType serverType, bool concatenated) +bool CDirectoryListingParser::ParseLine(CLine &line, ServerType const serverType, bool concatenated, CDirentry const* override) { - CRefcountObject refEntry; - CDirentry & entry = refEntry.Get(); + fz::shared_value refEntry; + CDirentry & entry = refEntry.get(); bool res; int ires; - if (sftp_mode_) { - line.SetTokenOffset(1); - } - if (serverType == ZVM) { res = ParseAsZVM(line, entry); - if (res) + if (res) { goto done; + } } else if (serverType == HPNONSTOP) { res = ParseAsHPNonstop(line, entry); - if (res) + if (res) { goto done; + } } ires = ParseAsMlsd(line, entry); - if (ires == 1) + if (ires == 1) { goto done; - else if (ires == 2) + } + else if (ires == 2) { goto skip; + } res = ParseAsUnix(line, entry, true); // Common 'ls -l' - if (res) + if (res) { goto done; + } res = ParseAsDos(line, entry); - if (res) + if (res) { goto done; + } res = ParseAsEplf(line, entry); - if (res) + if (res) { goto done; + } res = ParseAsVms(line, entry); - if (res) + if (res) { goto done; + } res = ParseOther(line, entry); - if (res) + if (res) { goto done; + } res = ParseAsIbm(line, entry); - if (res) + if (res) { goto done; + } res = ParseAsWfFtp(line, entry); - if (res) + if (res) { goto done; + } res = ParseAsIBM_MVS(line, entry); - if (res) + if (res) { goto done; + } res = ParseAsIBM_MVS_PDS(line, entry); - if (res) + if (res) { goto done; + } res = ParseAsOS9(line, entry); - if (res) + if (res) { goto done; + } #ifndef LISTDEBUG_MVS if (serverType == MVS) #endif //LISTDEBUG_MVS { res = ParseAsIBM_MVS_Migrated(line, entry); - if (res) + if (res) { goto done; + } res = ParseAsIBM_MVS_PDS2(line, entry); - if (res) + if (res) { goto done; + } res = ParseAsIBM_MVS_Tape(line, entry); - if (res) + if (res) { goto done; + } } res = ParseAsUnix(line, entry, false); // 'ls -l' but without the date/time - if (res) + if (res) { goto done; + } // Some servers just send a list of filenames. If a line could not be parsed, // check if it's a filename. If that's the case, store it for later, else clear @@ -803,31 +826,46 @@ // contained a space, assume it's a raw filelisting. if (!concatenated) { - CToken token; - if (!line.GetToken(0, token, true) || token.Find(' ') != -1) { + CToken token = line.GetEndToken(0); + if (!token || token.Find(' ') != -1) { m_maybeMultilineVms = false; m_fileList.clear(); m_fileListOnly = false; } else { m_maybeMultilineVms = token.Find(';') != -1; - if (m_fileListOnly) + if (m_fileListOnly) { m_fileList.emplace_back(token.GetString()); + } } } - else + else { m_maybeMultilineVms = false; + } - return false; + if (!override || override->name.empty()) { + return false; + } done: + if (override) { + // If SFTP is uses we already have precise data for some fields + if (!override->name.empty()) { + entry.name = override->name; + } + if (!override->time.empty()) { + entry.time = override->time; + } + } + m_maybeMultilineVms = false; m_fileList.clear(); m_fileListOnly = false; // Don't add . or .. - if (entry.name == _T(".") || entry.name == _T("..")) + if (entry.name == L"." || entry.name == L"..") { return true; + } if (serverType == VMS && entry.is_dir()) { // Trim version information from directories @@ -836,21 +874,6 @@ entry.name = entry.name.substr(0, pos); } - if (sftp_mode_) { - line.SetTokenOffset(0); - - CToken t; - if (line.GetToken(0, t)) { - int64_t seconds = t.GetNumber(); - if (seconds > 0 && seconds <= 0xffffffffll) { - fz::datetime time(static_cast(seconds), fz::datetime::seconds); - if (time.empty()) { - entry.time = time; - } - } - } - } - { auto const timezoneOffset = m_server.GetTimezoneOffset(); if (timezoneOffset) { @@ -858,7 +881,7 @@ } } - m_entryList.emplace_back(std::move(refEntry)); + entries_.emplace_back(std::move(refEntry)); skip: m_maybeMultilineVms = false; @@ -871,11 +894,12 @@ bool CDirectoryListingParser::ParseAsUnix(CLine &line, CDirentry &entry, bool expect_date) { int index = 0; - CToken token; - if (!line.GetToken(index, token)) + CToken permissionToken = line.GetToken(index); + if (!permissionToken) { return false; + } - wchar_t chr = token[0]; + wchar_t chr = permissionToken[0]; if (chr != 'b' && chr != 'c' && chr != 'd' && @@ -883,35 +907,44 @@ chr != 'p' && chr != 's' && chr != '-') + { return false; + } - std::wstring permissions = token.GetString(); + std::wstring permissions = permissionToken.GetString(); entry.flags = 0; - if (chr == 'd' || chr == 'l') + if (chr == 'd' || chr == 'l') { entry.flags |= CDirentry::flag_dir; + } - if (chr == 'l') + if (chr == 'l') { entry.flags |= CDirentry::flag_link; + } // Check for netware servers, which split the permissions into two parts bool netware = false; - if (token.GetLength() == 1) { - if (!line.GetToken(++index, token)) + if (permissionToken.size() == 1) { + CToken cont_perm = line.GetToken(++index); + if (!cont_perm) { return false; - permissions += _T(" ") + token.GetString(); + } + permissions += L" " + cont_perm.GetString(); netware = true; } int numOwnerGroup = 3; if (!netware) { // Filter out link count, we don't need it - if (!line.GetToken(++index, token)) + CToken linkCount = line.GetToken(++index); + if (!linkCount) { return false; + } - if (!token.IsNumeric()) + if (!linkCount.IsNumeric()) { --index; + } } // Repeat until numOwnerGroup is 0 since not all servers send every possible field @@ -922,33 +955,41 @@ std::wstring ownerGroup; for (int i = 0; i < numOwnerGroup; ++i) { - if (!line.GetToken(++index, token)) + CToken ownerGroupToken = line.GetToken(++index); + if (!ownerGroupToken) { return false; - if (i) - ownerGroup += _T(" "); - ownerGroup += token.GetString(); + } + if (i) { + ownerGroup += L" "; + } + ownerGroup += ownerGroupToken.GetString(); } - if (!line.GetToken(++index, token)) + + CToken sizeToken = line.GetToken(++index); + if (!sizeToken) { return false; + } // Check for concatenated groupname and size fields - if (!ParseComplexFileSize(token, entry.size)) { - if (!token.IsRightNumeric()) + if (!ParseComplexFileSize(sizeToken, entry.size)) { + if (!sizeToken.IsRightNumeric()) { continue; - entry.size = token.GetNumber(); - } + } + entry.size = sizeToken.GetNumber(); - // Append missing group to ownerGroup - if (!token.IsNumeric() && token.IsRightNumeric()) { - if (!ownerGroup.empty()) - ownerGroup += _T(" "); + // Append missing group to ownerGroup + if (!ownerGroup.empty()) { + ownerGroup += L" "; + } - std::wstring const group = token.GetString(); + std::wstring const group = sizeToken.GetString(); int i; for (i = group.size() - 1; i >= 0 && group[i] >= '0' && group[i] <= '9'; - --i) {} + --i) + { + } ownerGroup += group.substr(0, i + 1); } @@ -960,22 +1001,26 @@ } // Get the filename - if (!line.GetToken(++index, token, 1)) + CToken nameToken = line.GetEndToken(++index); + if (!nameToken) { continue; + } - entry.name = token.GetString(); + entry.name = nameToken.GetString(); // Filter out special chars at the end of the filenames - chr = token[token.GetLength() - 1]; + chr = nameToken[nameToken.size() - 1]; if (chr == '/' || chr == '|' || chr == '*') + { entry.name.pop_back(); + } if (entry.is_link()) { size_t pos; - if ((pos = entry.name.find(_T(" -> "))) != std::wstring::npos) { - entry.target = CSparseOptional(entry.name.substr(pos + 4)); + if ((pos = entry.name.find(L" -> ")) != std::wstring::npos) { + entry.target = fz::sparse_optional(entry.name.substr(pos + 4)); entry.name = entry.name.substr(0, pos); } } @@ -996,12 +1041,11 @@ bool mayHaveTime = true; bool bHasYearAndTime = false; - CToken token; - // Get the month date field - CToken dateMonth; - if (!line.GetToken(++index, token)) + CToken token = line.GetToken(++index); + if (!token) { return false; + } int year = -1; int month = -1; @@ -1009,31 +1053,38 @@ long hour = -1; long minute = -1; + CToken dateMonth; + // Some servers use the following date formats: // 26-05 2002, 2002-10-14, 01-jun-99 or 2004.07.15 // slashes instead of dashes are also possible - int pos = token.Find(_T("-/.")); + int pos = token.Find(L"-/."); if (pos != -1) { - int pos2 = token.Find(_T("-/."), pos + 1); + int pos2 = token.Find(L"-/.", pos + 1); if (pos2 == -1) { if (token[pos] != '.') { // something like 26-05 2002 - day = token.GetNumber(pos + 1, token.GetLength() - pos - 1); - if (day < 1 || day > 31) + day = token.GetNumber(pos + 1, token.size() - pos - 1); + if (day < 1 || day > 31) { return false; + } dateMonth = CToken(token.GetToken(), pos); } - else + else { dateMonth = token; + } } - else if (token[pos] != token[pos2]) + else if (token[pos] != token[pos2]) { return false; + } else { - if (!ParseShortDate(token, entry)) + if (!ParseShortDate(token, entry)) { return false; + } - if (token[pos] == '.') + if (token[pos] == '.') { return true; + } tm t = entry.time.get_tm(fz::datetime::utc); year = t.tm_year + 1900; @@ -1048,59 +1099,73 @@ // 2) 2005 13 3 // assume first one. year = token.GetNumber(); - if (!line.GetToken(++index, dateMonth)) + dateMonth = line.GetToken(++index); + if (!dateMonth) { return false; + } mayHaveTime = false; } - else + else { dateMonth = token; + } } else { - if (token.IsLeftNumeric() && (unsigned int)token[token.GetLength() - 1] > 127 && + if (token.IsLeftNumeric() && (unsigned int)token[token.size() - 1] > 127 && token.GetNumber() > 1000) { - if (token.GetNumber() > 10000) + if (token.GetNumber() > 10000) { return false; + } // Asian date format: 2005xxx 5xx 20xxx with some non-ascii characters following year = token.GetNumber(); - if (!line.GetToken(++index, dateMonth)) + + dateMonth = line.GetToken(++index); + if (!dateMonth) { return false; + } mayHaveTime = false; } - else + else { dateMonth = token; + } } if (day < 1) { // Get day field - if (!line.GetToken(++index, token)) + CToken dayToken = line.GetToken(++index); + if (!dayToken) { return false; + } int dateDay; // Check for non-numeric day - if (!token.IsNumeric() && !token.IsLeftNumeric()) { + if (!dayToken.IsNumeric() && !dayToken.IsLeftNumeric()) { int offset = 0; - if (dateMonth.GetString().back() == '.') + if (dateMonth.GetString().back() == '.') { ++offset; - if (!dateMonth.IsNumeric(0, dateMonth.GetLength() - offset)) + } + if (!dateMonth.IsNumeric(0, dateMonth.size() - offset)) { return false; - dateDay = dateMonth.GetNumber(0, dateMonth.GetLength() - offset); - dateMonth = token; + } + dateDay = dateMonth.GetNumber(0, dateMonth.size() - offset); + dateMonth = dayToken; } - else if( token.GetLength() == 5 && token[2] == ':' && token.IsRightNumeric() ) { + else if (dayToken.size() == 5 && dayToken[2] == ':' && dayToken.IsRightNumeric() ) { // This is a time. We consumed too much already. return false; } else { - dateDay = token.GetNumber(); - if (token[token.GetLength() - 1] == ',') + dateDay = dayToken.GetNumber(); + if (dayToken[dayToken.size() - 1] == ',') { bHasYearAndTime = true; + } } - if (dateDay < 1 || dateDay > 31) + if (dateDay < 1 || dateDay > 31) { return false; + } day = dateDay; } @@ -1111,42 +1176,51 @@ // suffix at the end of the monthname. Filter it out. int i; for (i = strMonth.size() - 1; i > 0; --i) { - if (strMonth[i] >= '0' && strMonth[i] <= '9') + if (strMonth[i] >= '0' && strMonth[i] <= '9') { break; + } } strMonth = strMonth.substr(0, i + 1); } // Check month name - while (!strMonth.empty() && (strMonth.back() == ',' || strMonth.back() == '.')) + while (!strMonth.empty() && (strMonth.back() == ',' || strMonth.back() == '.')) { strMonth.pop_back(); - if (!GetMonthFromName(strMonth, month)) + } + if (!GetMonthFromName(strMonth, month)) { return false; + } } // Get time/year field - if (!line.GetToken(++index, token)) + CToken timeOrYearToken = line.GetToken(++index); + if (!timeOrYearToken) { return false; + } - pos = token.Find(_T(":.-")); + pos = timeOrYearToken.Find(L":.-"); if (pos != -1 && mayHaveTime) { // token is a time - if (!pos || static_cast(pos) == (token.GetLength() - 1)) + if (!pos || static_cast(pos) == (timeOrYearToken.size() - 1)) { return false; + } - wxString str = token.GetString(); - if (!str.Left(pos).ToLong(&hour)) - return false; - if (!str.Mid(pos + 1).ToLong(&minute)) - return false; + std::wstring str = timeOrYearToken.GetString(); + hour = fz::to_integral(str.substr(0, pos), -1); + minute = fz::to_integral(str.substr(pos + 1), -1); - if (hour < 0 || hour > 23) - return false; - if (minute < 0 || minute > 59) + if (hour < 0 || hour > 23) { + // Allow alternate midnight representation + if (hour != 24 || minute != 0) { + return false; + } + } + else if (minute < 0 || minute > 59) { return false; + } // Some servers use times only for files newer than 6 months - if( year <= 0 ) { - wxASSERT( month != -1 && day != -1 ); + if (year <= 0) { + assert(month != -1 && day != -1); tm const t = fz::datetime::now().get_tm(fz::datetime::utc); year = t.tm_year + 1900; int const currentDayOfYear = t.tm_mday + 31 * t.tm_mon; @@ -1158,50 +1232,62 @@ // Problem: Servers which do send the time but not the year even // one day away from getting 1 year old. This is far more uncommon // however. - if ((currentDayOfYear + 1) < fileDayOfYear) + if ((currentDayOfYear + 1) < fileDayOfYear) { year -= 1; + } } } else if (year <= 0) { // token is a year - if (!token.IsNumeric() && !token.IsLeftNumeric()) + if (!timeOrYearToken.IsNumeric() && !timeOrYearToken.IsLeftNumeric()) { return false; + } - year = token.GetNumber(); + year = timeOrYearToken.GetNumber(); - if (year > 3000) + if (year > 3000) { return false; - if (year < 1000) + } + if (year < 1000) { year += 1900; + } if (bHasYearAndTime) { - if (!line.GetToken(++index, token)) + CToken timeToken = line.GetToken(++index); + if (!timeToken) { return false; + } - if (token.Find(':') == 2 && token.GetLength() == 5 && token.IsLeftNumeric() && token.IsRightNumeric()) { - pos = token.Find(':'); + if (timeToken.Find(':') == 2 && timeToken.size() == 5 && timeToken.IsLeftNumeric() && timeToken.IsRightNumeric()) { + pos = timeToken.Find(':'); // token is a time - if (!pos || static_cast(pos) == (token.GetLength() - 1)) + if (!pos || static_cast(pos) == (timeToken.size() - 1)) { return false; + } - wxString str = token.GetString(); + std::wstring str = timeToken.GetString(); - if (!str.Left(pos).ToLong(&hour)) - return false; - if (!str.Mid(pos + 1).ToLong(&minute)) - return false; + hour = fz::to_integral(str.substr(0, pos), -1); + minute = fz::to_integral(str.substr(pos + 1), -1); - if (hour < 0 || hour > 23) - return false; - if (minute < 0 || minute > 59) + if (hour < 0 || hour > 23) { + // Allow alternate midnight representation + if (hour != 24 || minute != 0) { + return false; + } + } + else if (minute < 0 || minute > 59) { return false; + } } - else + else { --index; + } } } - else + else { --index; + } if (!entry.time.set(fz::datetime::utc, year, month, day, hour, minute)) { return false; @@ -1210,10 +1296,11 @@ return true; } -bool CDirectoryListingParser::ParseShortDate(CToken &token, CDirentry &entry, bool saneFieldOrder /*=false*/) +bool CDirectoryListingParser::ParseShortDate(CToken &token, CDirentry &entry, bool saneFieldOrder) { - if (token.GetLength() < 1) + if (token.size() < 1) { return false; + } bool gotYear = false; bool gotMonth = false; @@ -1224,53 +1311,61 @@ int month = 0; int day = 0; - int pos = token.Find(_T("-./")); - if (pos < 1) + int pos = token.Find(L"-./"); + if (pos < 1) { return false; + } if (!token.IsNumeric(0, pos)) { // Seems to be monthname-dd-yy // Check month name std::wstring const dateMonth = token.GetString().substr(0, pos); - if (!GetMonthFromName(dateMonth, month)) + if (!GetMonthFromName(dateMonth, month)) { return false; + } gotMonth = true; gotMonthName = true; } else if (pos == 4) { // Seems to be yyyy-mm-dd year = token.GetNumber(0, pos); - if (year < 1900 || year > 3000) + if (year < 1900 || year > 3000) { return false; + } gotYear = true; } else if (pos <= 2) { int64_t value = token.GetNumber(0, pos); if (token[pos] == '.') { // Maybe dd.mm.yyyy - if (value < 1 || value > 31) + if (value < 1 || value > 31) { return false; + } day = value; gotDay = true; } else { if (saneFieldOrder) { year = value; - if (year < 50) + if (year < 50) { year += 2000; - else + } + else { year += 1900; + } gotYear = true; } else { // Detect mm-dd-yyyy or mm/dd/yyyy and // dd-mm-yyyy or dd/mm/yyyy - if (value < 1) + if (value < 1) { return false; + } if (value > 12) { - if (value > 31) + if (value > 31) { return false; + } day = value; gotDay = true; @@ -1282,23 +1377,28 @@ } } } - else + else { return false; + } - int pos2 = token.Find(_T("-./"), pos + 1); - if (pos2 == -1 || (pos2 - pos) == 1) + int pos2 = token.Find(L"-./", pos + 1); + if (pos2 == -1 || (pos2 - pos) == 1) { return false; - if (static_cast(pos2) == (token.GetLength() - 1)) + } + if (static_cast(pos2) == (token.size() - 1)) { return false; + } // If we already got the month and the second field is not numeric, // change old month into day and use new token as month if (!token.IsNumeric(pos + 1, pos2 - pos - 1) && gotMonth) { - if (gotMonthName) + if (gotMonthName) { return false; + } - if (gotDay) + if (gotDay) { return false; + } gotDay = true; gotMonth = false; @@ -1309,43 +1409,49 @@ // Month field in yyyy-mm-dd or dd-mm-yyyy // Check month name std::wstring dateMonth = token.GetString().substr(pos + 1, pos2 - pos - 1); - if (!GetMonthFromName(dateMonth, month)) + if (!GetMonthFromName(dateMonth, month)) { return false; + } gotMonth = true; } else { int64_t value = token.GetNumber(pos + 1, pos2 - pos - 1); // Day field in mm-dd-yyyy - if (value < 1 || value > 31) + if (value < 1 || value > 31) { return false; + } day = value; gotDay = true; } - int64_t value = token.GetNumber(pos2 + 1, token.GetLength() - pos2 - 1); + int64_t value = token.GetNumber(pos2 + 1, token.size() - pos2 - 1); if (gotYear) { // Day field in yyy-mm-dd - if (value <= 0 || value > 31) + if (value <= 0 || value > 31) { return false; + } day = value; gotDay = true; } else { - if (value < 0 || value > 9999) + if (value < 0 || value > 9999) { return false; + } - if (value < 50) + if (value < 50) { value += 2000; - else if (value < 1000) + } + else if (value < 1000) { value += 1900; + } year = value; gotYear = true; } - wxASSERT(gotYear); - wxASSERT(gotMonth); - wxASSERT(gotDay); + assert(gotYear); + assert(gotMonth); + assert(gotDay); if (!entry.time.set(fz::datetime::utc, year, month, day)) { return false; @@ -1360,52 +1466,60 @@ CToken token; // Get first token, has to be a valid date - if (!line.GetToken(index, token)) + if (!line.GetToken(index, token)) { return false; + } entry.flags = 0; - if (!ParseShortDate(token, entry)) + if (!ParseShortDate(token, entry)) { return false; + } // Extract time - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } - if (!ParseTime(token, entry)) + if (!ParseTime(token, entry)) { return false; + } // If next token is , entry is a directory // else, it should be the filesize. if (!line.GetToken(++index, token)) return false; - if (token.GetString() == _T("")) { + if (token.GetString() == L"") { entry.flags |= CDirentry::flag_dir; entry.size = -1; } else if (token.IsNumeric() || token.IsLeftNumeric()) { // Convert size, filter out separators int64_t size = 0; - int len = token.GetLength(); + int len = token.size(); for (int i = 0; i < len; ++i) { - char chr = token[i]; - if (chr == ',' || chr == '.') + auto const chr = token[i]; + if (chr == ',' || chr == '.') { continue; - if (chr < '0' || chr > '9') + } + if (chr < '0' || chr > '9') { return false; + } size *= 10; size += chr - '0'; } entry.size = size; } - else + else { return false; + } // Extract filename - if (!line.GetToken(++index, token, true)) + if (!line.GetToken(++index, token, true)) { return false; + } entry.name = token.GetString(); entry.target.clear(); @@ -1422,11 +1536,11 @@ return false; int pos = token.Find(':'); - if (pos < 1 || static_cast(pos) >= (token.GetLength() - 1)) + if (pos < 1 || static_cast(pos) >= (token.size() - 1)) return false; int64_t hour = token.GetNumber(0, pos); - if (hour < 0 || hour > 23) + if (hour < 0 || hour > 24) return false; // See if we got seconds @@ -1454,7 +1568,7 @@ // Convert to 24h format if (!token.IsRightNumeric()) { - if (token[token.GetLength() - 2] == 'P') { + if (token[token.size() - 2] == 'P') { if (hour < 12) hour += 12; } @@ -1476,7 +1590,7 @@ return false; int pos = token.Find('\t'); - if (pos == -1 || static_cast(pos) == (token.GetLength() - 1)) + if (pos == -1 || static_cast(pos) == (token.size() - 1)) return false; entry.name = token.GetString().substr(pos + 1); @@ -1490,30 +1604,36 @@ while (fact < pos) { int separator = token.Find(',', fact); int len; - if (separator == -1) + if (separator == -1) { len = pos - fact; - else + } + else { len = separator - fact; + } if (!len) { ++fact; continue; } - char type = token[fact]; + auto const type = token[fact]; - if (type == '/') + if (type == '/') { entry.flags |= CDirentry::flag_dir; - else if (type == 's') + } + else if (type == 's') { entry.size = token.GetNumber(fact + 1, len - 1); + } else if (type == 'm') { int64_t number = token.GetNumber(fact + 1, len - 1); - if (number < 0) + if (number < 0) { return false; + } entry.time = fz::datetime(static_cast(number), fz::datetime::seconds); } - else if (type == 'u' && len > 2 && token[fact + 1] == 'p') + else if (type == 'u' && len > 2 && token[fact + 1] == 'p') { permissions = token.GetString().substr(fact + 2, len - 2); + } fact += len + 1; } @@ -1557,9 +1677,9 @@ entry.flags = 0; - if (pos > 4 && token.GetString().substr(pos - 4, 4) == _T(".DIR")) { + if (pos > 4 && token.GetString().substr(pos - 4, 4) == L".DIR") { entry.flags |= CDirentry::flag_dir; - if (token.GetString().substr(pos) == _T(";1")) + if (token.GetString().substr(pos) == L";1") entry.name = token.GetString().substr(0, pos - 4); else entry.name = token.GetString().substr(0, pos - 4) + token.GetString().substr(pos); @@ -1579,7 +1699,7 @@ // This field can either be the filesize, a username (at least that's what I think) enclosed in [] or a date. if (!token.IsNumeric() && !token.IsLeftNumeric()) { // Must be username - const int len = token.GetLength(); + const int len = token.size(); if (len < 3 || token[0] != '[' || token[len - 1] != ']') return false; ownerGroup = token.GetString().substr(1, len - 2); @@ -1630,7 +1750,7 @@ return true; if (!ParseTime(token, entry)) { - int len = token.GetLength(); + int len = token.size(); if (token[0] == '[' && token[len - 1] != ']') return false; if (token[0] == '(' && token[len - 1] != ')') @@ -1665,20 +1785,20 @@ // Owner / group and permissions while (line.GetToken(++index, token)) { - const int len = token.GetLength(); + const int len = token.size(); if (len > 2 && token[0] == '(' && token[len - 1] == ')') { if (!permissions.empty()) - permissions += _T(" "); + permissions += L" "; permissions += token.GetString().substr(1, len - 2); } else if (len > 2 && token[0] == '[' && token[len - 1] == ']') { if (!ownerGroup.empty()) - ownerGroup += _T(" "); + ownerGroup += L" "; ownerGroup += token.GetString().substr(1, len - 2); } else { if (!ownerGroup.empty()) - ownerGroup += _T(" "); + ownerGroup += L" "; ownerGroup += token.GetString(); } } @@ -1730,7 +1850,7 @@ return false; entry.name = token.GetString(); - if (token[token.GetLength() - 1] == '/') { + if (token[token.size() - 1] == '/') { entry.name.pop_back(); entry.flags |= CDirentry::flag_dir; } @@ -1748,54 +1868,64 @@ int index = 0; CToken firstToken; - if (!line.GetToken(index, firstToken)) + if (!line.GetToken(index, firstToken)) { return false; + } - if (!firstToken.IsNumeric()) + if (!firstToken.IsNumeric()) { return false; + } // Possible formats: Numerical unix, VShell or OS/2 CToken token; - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } entry.flags = 0; // If token is a number, than it's the numerical Unix style format, // else it's the VShell, OS/2 or nortel.VxWorks format if (token.IsNumeric()) { - if (firstToken.GetLength() >= 2 && firstToken[1] == '4') + if (firstToken.size() >= 2 && firstToken[1] == '4') { entry.flags |= CDirentry::flag_dir; + } std::wstring ownerGroup = token.GetString(); - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } - ownerGroup += _T(" ") + token.GetString(); + ownerGroup += L" " + token.GetString(); // Get size - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } - if (!token.IsNumeric()) + if (!token.IsNumeric()) { return false; + } entry.size = token.GetNumber(); // Get date/time - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } int64_t number = token.GetNumber(); - if (number < 0) + if (number < 0) { return false; + } entry.time = fz::datetime(static_cast(number), fz::datetime::seconds); // Get filename - if (!line.GetToken(++index, token, true)) + if (!line.GetToken(++index, token, true)) { return false; + } entry.name = token.GetString(); entry.target.clear(); @@ -1805,8 +1935,9 @@ } else { // Possible conflict with multiline VMS listings - if (m_maybeMultilineVms) + if (m_maybeMultilineVms) { return false; + } // VShell, OS/2 or nortel.VxWorks style format entry.size = firstToken.GetNumber(); @@ -1818,84 +1949,102 @@ // OS/2 or nortel.VxWorks int skippedCount = 0; do { - if (token.GetString() == _T("DIR")) + if (token.GetString() == L"DIR") { entry.flags |= CDirentry::flag_dir; - else if (token.Find(_T("-/.")) != -1) + } + else if (token.Find(L"-/.") != -1) { break; + } ++skippedCount; - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } } while (true); - if (!ParseShortDate(token, entry)) + if (!ParseShortDate(token, entry)) { return false; + } // Get time - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } - if (!ParseTime(token, entry)) + if (!ParseTime(token, entry)) { return false; + } // Get filename - if (!line.GetToken(++index, token, true)) + if (!line.GetToken(++index, token, true)) { return false; + } entry.name = token.GetString(); if (entry.name.size() >= 5) { std::wstring type = fz::str_tolower_ascii(entry.name.substr(entry.name.size() - 5)); - if (!skippedCount && type == _T("")) { + if (!skippedCount && type == L"") { entry.flags |= CDirentry::flag_dir; entry.name = entry.name.substr(0, entry.name.size() - 5); - while (!entry.name.empty() && entry.name.back() == ' ') + while (!entry.name.empty() && entry.name.back() == ' ') { entry.name.pop_back(); + } } } } else { // Get day - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } - if (!token.IsNumeric() && !token.IsLeftNumeric()) + if (!token.IsNumeric() && !token.IsLeftNumeric()) { return false; + } int64_t day = token.GetNumber(); - if (day < 0 || day > 31) + if (day < 0 || day > 31) { return false; + } // Get Year - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } - if (!token.IsNumeric()) + if (!token.IsNumeric()) { return false; + } int64_t year = token.GetNumber(); - if (year < 50) + if (year < 50) { year += 2000; - else if (year < 1000) + } + else if (year < 1000) { year += 1900; + } if (!entry.time.set(fz::datetime::utc, year, month, day)) { return false; } // Get time - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; + } - if (!ParseTime(token, entry)) + if (!ParseTime(token, entry)) { return false; + } // Get filename - if (!line.GetToken(++index, token, 1)) + if (!line.GetToken(++index, token, 1)) { return false; + } entry.name = token.GetString(); - char chr = token[token.GetLength() - 1]; + auto const chr = token[token.size() - 1]; if (chr == '/' || chr == '\\') { entry.flags |= CDirentry::flag_dir; entry.name.pop_back(); @@ -1912,48 +2061,43 @@ bool CDirectoryListingParser::AddData(char *pData, int len) { - ConvertEncoding( pData, len ); + ConvertEncoding(pData, len); m_DataList.emplace_back(pData, len); m_totalData += len; - if (m_totalData < 512) + if (m_totalData < 512) { return true; + } return ParseData(true); } -bool CDirectoryListingParser::AddLine(wchar_t const* pLine) +bool CDirectoryListingParser::AddLine(std::wstring && line, std::wstring && name, fz::datetime const& time) { - if (m_pControlSocket) - m_pControlSocket->LogMessageRaw(MessageType::RawList, pLine); - - while (*pLine == ' ' || *pLine == '\t') - ++pLine; - - if (!*pLine) - return false; - - const int len = fz::strlen(pLine); - - wchar_t* p = new wchar_t[len + 1]; - - wcscpy(p, pLine); - - CLine line(p, len); + if (m_pControlSocket) { + m_pControlSocket->LogMessageRaw(MessageType::RawList, line); + } - ParseLine(line, m_server.GetType(), false); + CDirentry override; + override.name = std::move(name); + override.time = time; + CLine l(std::move(line)); + ParseLine(l, m_server.GetType(), true, &override); return true; } -CLine *CDirectoryListingParser::GetLine(bool breakAtEnd /*=false*/, bool &error) +CLine *CDirectoryListingParser::GetLine(bool breakAtEnd, bool &error) { while (!m_DataList.empty()) { // Trim empty lines and spaces auto iter = m_DataList.begin(); int len = iter->len; - while (iter->p[m_currentOffset] == '\r' || iter->p[m_currentOffset] == '\n' || iter->p[m_currentOffset] == ' ' || iter->p[m_currentOffset] == '\t' || !iter->p[m_currentOffset]) { + while (iter->p[m_currentOffset] == '\r' || iter->p[m_currentOffset] == '\n' + || iter->p[m_currentOffset] == ' ' || iter->p[m_currentOffset] == '\t' + || !iter->p[m_currentOffset]) + { ++m_currentOffset; if (m_currentOffset >= len) { delete [] iter->p; @@ -1961,7 +2105,7 @@ m_currentOffset = 0; if (iter == m_DataList.end()) { m_DataList.clear(); - return 0; + return nullptr; } len = iter->len; } @@ -1973,14 +2117,8 @@ int startpos = m_currentOffset; int reslen = 0; - int emptylen = 0; - int currentOffset = m_currentOffset; while (iter->p[currentOffset] != '\n' && iter->p[currentOffset] != '\r' && iter->p[currentOffset]) { - if (iter->p[currentOffset] == ' ' || iter->p[currentOffset] == '\t') - ++emptylen; - else - emptylen = 0; ++reslen; ++currentOffset; @@ -1992,10 +2130,11 @@ m_pControlSocket->LogMessage(MessageType::Error, _("Received a line exceeding 10000 characters, aborting.")); } error = true; - return 0; + return nullptr; + } + if (breakAtEnd) { + return nullptr; } - if (breakAtEnd) - return 0; break; } len = iter->len; @@ -2008,14 +2147,14 @@ m_pControlSocket->LogMessage(MessageType::Error, _("Received a line exceeding 10000 characters, aborting.")); } error = true; - return 0; + return nullptr; } m_currentOffset = currentOffset; // Reslen is now the length of the line, including any terminating whitespace - int const buflen = reslen + 1; - char *res = new char[buflen]; - res[reslen] = 0; + int const buflen = reslen; + char *res = new char[buflen + 1]; + res[buflen] = 0; int respos = 0; @@ -2023,8 +2162,9 @@ auto i = m_DataList.begin(); while (i != iter && reslen) { int copylen = i->len - startpos; - if (copylen > reslen) + if (copylen > reslen) { copylen = reslen; + } memcpy(&res[respos], &i->p[startpos], copylen); reslen -= copylen; respos += i->len - startpos; @@ -2032,52 +2172,54 @@ delete [] i->p; ++i; - } - ; + }; + // Copy last chunk if (iter != m_DataList.end() && reslen) { int copylen = m_currentOffset-startpos; - if (copylen > reslen) + if (copylen > reslen) { copylen = reslen; + } memcpy(&res[respos], &iter->p[startpos], copylen); if (reslen >= iter->len) { delete [] iter->p; m_DataList.erase(m_DataList.begin(), ++iter); } - else + else { m_DataList.erase(m_DataList.begin(), iter); + } } - else + else { m_DataList.erase(m_DataList.begin(), iter); + } - size_t lineLength{}; - wchar_t* buffer; + std::wstring buffer; if (m_pControlSocket) { - buffer = m_pControlSocket->ConvToLocalBuffer(res, buflen, lineLength); + buffer = m_pControlSocket->ConvToLocal(res, buflen); m_pControlSocket->LogMessageRaw(MessageType::RawList, buffer); } else { - wxString str(res, wxConvUTF8); - if (str.empty()) { - str = wxString(res, wxConvLocal); - if (str.empty()) - str = wxString(res, wxConvISO8859_1); - } - lineLength = str.Len() + 1; - buffer = new wchar_t[str.Len() + 1]; - wcscpy(buffer, str.c_str()); + buffer = fz::to_wstring_from_utf8(res); + if (buffer.empty()) { + buffer = fz::to_wstring(res); + if (buffer.empty()) { + buffer = std::wstring(res, res + strlen(res)); + } + } } delete [] res; - if (!buffer) { - // Line contained no usable data, start over - continue; + // Strip BOM + if (buffer[0] == 0xfeff) { + buffer = buffer.substr(1); } - return new CLine(buffer, lineLength - 1, emptylen); + if (!buffer.empty()) { + return new CLine(std::move(buffer)); + } } - return 0; + return nullptr; } bool CDirectoryListingParser::ParseAsWfFtp(CLine &line, CDirentry &entry) @@ -2148,10 +2290,10 @@ return false; entry.flags = 0; - if (token.GetString() != _T("**NONE**") && !ParseShortDate(token, entry)) { + if (token.GetString() != L"**NONE**" && !ParseShortDate(token, entry)) { // Perhaps of the following type: // TSO004 3390 VSAM FOO.BAR - if (token.GetString() != _T("VSAM")) + if (token.GetString() != L"VSAM") return false; if (!line.GetToken(index++, token)) @@ -2174,12 +2316,12 @@ if (!token.IsNumeric()) return false; - int prevLen = token.GetLength(); + int prevLen = token.size(); // used if (!line.GetToken(index++, token)) return false; - if (token.IsNumeric() || token.GetString() == _T("????") || token.GetString() == _T("++++") ) { + if (token.IsNumeric() || token.GetString() == L"????" || token.GetString() == L"++++" ) { // recfm if (!line.GetToken(index++, token)) return false; @@ -2207,7 +2349,7 @@ if (!line.GetToken(index++, token)) return false; - if (token.GetString() == _T("PO") || token.GetString() == _T("PO-E")) + if (token.GetString() == L"PO" || token.GetString() == L"PO-E") { entry.flags |= CDirentry::flag_dir; entry.size = -1; @@ -2302,7 +2444,7 @@ return false; std::wstring s = fz::str_tolower_ascii(token.GetString()); - if (s != _T("migrated")) + if (s != L"migrated") return false; if (!line.GetToken(++index, token)) @@ -2325,8 +2467,9 @@ { int index = 0; CToken token; - if (!line.GetToken(index, token)) + if (!line.GetToken(index, token)) { return false; + } entry.name = token.GetString(); @@ -2335,53 +2478,64 @@ entry.permissions = entry.ownerGroup; entry.size = -1; - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return true; + } entry.size = token.GetNumber(CToken::hex); - if (entry.size == -1) + if (entry.size == -1) { return false; + } // Unused hexadecimal token - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; - if (!token.IsNumeric(CToken::hex)) + } + if (!token.IsNumeric(CToken::hex)) { return false; + } // Unused numeric token - if (!line.GetToken(++index, token)) + if (!line.GetToken(++index, token)) { return false; - if (!token.IsNumeric()) + } + if (!token.IsNumeric()) { return false; + } int start = ++index; while (line.GetToken(index, token)) { ++index; } - if ((index - start < 2)) + if ((index - start < 2)) { return false; + } --index; if (!line.GetToken(index, token)) { return false; } - if (!token.IsNumeric() && (token.GetString() != _T("ANY"))) + if (!token.IsNumeric() && (token.GetString() != L"ANY")) { return false; + } if (!line.GetToken(index - 1, token)) { return false; } - if (!token.IsNumeric() && (token.GetString() != _T("ANY"))) + if (!token.IsNumeric() && (token.GetString() != L"ANY")) { return false; + } for (int i = start; i < index - 1; ++i) { if (!line.GetToken(i, token)) { return false; } - int len = token.GetLength(); - for (int j = 0; j < len; ++j) - if (token[j] < 'A' || token[j] > 'Z') + int len = token.size(); + for (int j = 0; j < len; ++j) { + if (token[j] < 'A' || token[j] > 'Z') { return false; + } + } } return true; @@ -2393,20 +2547,24 @@ CToken token; // volume - if (!line.GetToken(index++, token)) + if (!line.GetToken(index++, token)) { return false; + } // unit - if (!line.GetToken(index++, token)) + if (!line.GetToken(index++, token)) { return false; + } std::wstring s = fz::str_tolower_ascii(token.GetString()); - if (s != _T("tape")) + if (s != L"tape") { return false; + } // dsname - if (!line.GetToken(index++, token)) + if (!line.GetToken(index++, token)) { return false; + } entry.name = token.GetString(); entry.flags = 0; @@ -2414,8 +2572,9 @@ entry.permissions = objcache.get(std::wstring()); entry.size = -1; - if (line.GetToken(index++, token)) + if (line.GetToken(index++, token)) { return false; + } return true; } @@ -2424,56 +2583,57 @@ { if (token.IsNumeric()) { size = token.GetNumber(); - if (blocksize != -1) + if (blocksize != -1) { size *= blocksize; + } return true; } - int len = token.GetLength(); + int len = token.size(); - char last = token[len - 1]; - if (last == 'B' || last == 'b') - { - if (len == 1) + auto last = token[len - 1]; + if (last == 'B' || last == 'b') { + if (len == 1) { return false; + } - char c = token[--len - 1]; - if (c < '0' || c > '9') - { + auto const c = token[--len - 1]; + if (c < '0' || c > '9') { --len; last = c; } - else + else { last = 0; + } } - else if (last >= '0' && last <= '9') + else if (last >= '0' && last <= '9') { last = 0; - else - { - if (--len == 0) + } + else { + if (--len == 0) { return false; + } } size = 0; int dot = -1; - for (int i = 0; i < len; ++i) - { - char c = token[i]; - if (c >= '0' && c <= '9') - { + for (int i = 0; i < len; ++i) { + auto const c = token[i]; + if (c >= '0' && c <= '9') { size *= 10; size += c - '0'; } - else if (c == '.') - { - if (dot != -1) + else if (c == '.') { + if (dot != -1) { return false; + } dot = len - i - 1; } - else + else { return false; + } } switch (last) { @@ -2498,14 +2658,16 @@ case 'B': break; case 0: - if (blocksize != -1) + if (blocksize != -1) { size *= blocksize; + } break; default: return false; } - while (dot-- > 0) + while (dot-- > 0) { size /= 10; + } return true; } @@ -2516,19 +2678,22 @@ // Parsing is done strict, abort on slightest error. - CToken token; - - if (!line.GetToken(0, token)) + CToken token = line.GetToken(0); + if (!token) { return 0; + } std::wstring const facts = token.GetString(); - if (facts.empty()) + if (facts.empty()) { return 0; + } entry.flags = 0; entry.size = -1; + entry.time.clear(); + entry.target.clear(); - std::wstring owner, group, uid, gid; + std::wstring owner, ownername, group, groupname, user, uid, gid; std::wstring ownerGroup; std::wstring permissions; @@ -2543,90 +2708,129 @@ } auto const pos = facts.find('=', start); - if (pos == std::wstring::npos || pos < start + 1 || pos > delim) + if (pos == std::wstring::npos || pos < start + 1 || pos > delim) { return 0; + } std::wstring factname = fz::str_tolower_ascii(facts.substr(start, pos - start)); std::wstring value = facts.substr(pos + 1, delim - pos - 1); - if (factname == _T("type")) { + if (factname == L"type") { auto colonPos = value.find(':'); std::wstring valuePrefix; - if (colonPos == std::wstring::npos) + if (colonPos == std::wstring::npos) { valuePrefix = fz::str_tolower_ascii(value); - else + } + else { valuePrefix = fz::str_tolower_ascii(value.substr(0, colonPos)); + } - if (valuePrefix == _T("dir") && colonPos == std::wstring::npos) + if (valuePrefix == L"dir" && colonPos == std::wstring::npos) { entry.flags |= CDirentry::flag_dir; - else if (valuePrefix == _T("os.unix=slink") || valuePrefix == _T("os.unix=symlink")) { + } + else if (valuePrefix == L"os.unix=slink" || valuePrefix == L"os.unix=symlink") { entry.flags |= CDirentry::flag_dir | CDirentry::flag_link; - if (colonPos != std::wstring::npos) - entry.target = CSparseOptional(value.substr(colonPos)); + if (colonPos != std::wstring::npos) { + entry.target = fz::sparse_optional(value.substr(colonPos)); + } } - else if ((valuePrefix == _T("cdir") || valuePrefix == _T("pdir")) && colonPos == std::wstring::npos) { + else if ((valuePrefix == L"cdir" || valuePrefix == L"pdir") && colonPos == std::wstring::npos) { // Current and parent directory, don't parse it return 2; } } - else if (factname == _T("size")) { + else if (factname == L"size") { entry.size = 0; for (unsigned int i = 0; i < value.size(); ++i) { - if (value[i] < '0' || value[i] > '9') + if (value[i] < '0' || value[i] > '9') { return 0; + } entry.size *= 10; entry.size += value[i] - '0'; } } - else if (factname == _T("modify") || - (!entry.has_date() && factname == _T("create"))) + else if (factname == L"modify" || + (!entry.has_date() && factname == L"create")) { entry.time = fz::datetime(value, fz::datetime::utc); - if (!entry.time.empty()) { + if (entry.time.empty()) { return 0; } } - else if (factname == _T("perm")) { + else if (factname == L"perm") { if (!value.empty()) { - if (!permissions.empty()) - permissions = value + _T(" (") + permissions + _T(")"); - else + if (!permissions.empty()) { + permissions = value + L" (" + permissions + L")"; + } + else { permissions = value; + } } } - else if (factname == _T("unix.mode")) { - if (!permissions.empty()) - permissions = permissions + _T(" (") + value + _T(")"); - else + else if (factname == L"unix.mode") { + if (!permissions.empty()) { + permissions = permissions + L" (" + value + L")"; + } + else { permissions = value; + } } - else if (factname == _T("unix.owner") || factname == _T("unix.user")) + else if (factname == L"unix.owner") { owner = value; - else if (factname == _T("unix.group")) + } + else if (factname == L"unix.ownername") { + ownername = value; + } + else if (factname == L"unix.group") { group = value; - else if (factname == _T("unix.uid")) + } + else if (factname == L"unix.groupname") { + groupname = value; + } + else if (factname == L"unix.user") { + user = value; + } + else if (factname == L"unix.uid") { uid = value; - else if (factname == _T("unix.gid")) + } + else if (factname == L"unix.gid") { gid = value; + } start = delim + 1; } // The order of the facts is undefined, so assemble ownerGroup in correct // order - if (!owner.empty()) - ownerGroup += owner; - else if (!uid.empty()) - ownerGroup += uid; - if (!group.empty()) - ownerGroup += _T(" ") + group; - else if (!gid.empty()) - ownerGroup += _T(" ") + gid; + if (!ownername.empty()) { + ownerGroup = ownername; + } + else if (!owner.empty()) { + ownerGroup = owner; + } + else if (!user.empty()) { + ownerGroup = user; + } + else if (!uid.empty()) { + ownerGroup = uid; + } - if (!line.GetToken(1, token, true, true)) + if (!groupname.empty()) { + ownerGroup += L" " + groupname; + } + else if (!group.empty()) { + ownerGroup += L" " + group; + } + else if (!gid.empty()) { + ownerGroup += L" " + gid; + } + + CToken nameToken = line.GetEndToken(1, true); + if (!nameToken) { return 0; + } - entry.name = token.GetString(); + entry.name = nameToken.GetString(); entry.ownerGroup = objcache.get(ownerGroup); entry.permissions = objcache.get(permissions); @@ -2644,13 +2848,13 @@ // Make sure it's number.number int pos = ownerGroupToken.Find('.'); - if (pos == -1 || !pos || pos == ((int)ownerGroupToken.GetLength() - 1)) + if (pos == -1 || !pos || pos == ((int)ownerGroupToken.size() - 1)) return false; if (!ownerGroupToken.IsNumeric(0, pos)) return false; - if (!ownerGroupToken.IsNumeric(pos + 1, ownerGroupToken.GetLength() - pos - 1)) + if (!ownerGroupToken.IsNumeric(pos + 1, ownerGroupToken.size() - pos - 1)) return false; entry.flags = 0; @@ -2701,14 +2905,15 @@ void CDirectoryListingParser::Reset() { - for (auto iter = m_DataList.begin(); iter != m_DataList.end(); ++iter) - delete [] iter->p; + for (auto & item : m_DataList) { + delete [] item.p; + } m_DataList.clear(); delete m_prevLine; - m_prevLine = 0; + m_prevLine = nullptr; - m_entryList.clear(); + entries_.clear(); m_fileList.clear(); m_currentOffset = 0; m_fileListOnly = true; @@ -2729,13 +2934,13 @@ // Get filename extension if (!line.GetToken(++index, token)) return false; - entry.name += _T(".") + token.GetString(); + entry.name += L"." + token.GetString(); // File format. Unused if (!line.GetToken(++index, token)) return false; std::wstring format = token.GetString(); - if (format != _T("V") && format != _T("F")) + if (format != L"V" && format != L"F") return false; // Record length @@ -2840,11 +3045,11 @@ return false; std::wstring ownerGroup = token.GetString(); - if (token[token.GetLength() - 1] == ',') { + if (token[token.size() - 1] == ',') { // Owner, part 2 if (!line.GetToken(++index, token)) return false; - ownerGroup += _T(" ") + token.GetString(); + ownerGroup += L" " + token.GetString(); } // Permissions @@ -2874,7 +3079,7 @@ return true; } -char ebcdic_table[256] = { +char const ebcdic_table[256] = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 0 ' ', ' ', ' ', ' ', ' ', '\n', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '\n', // 1 ' ', ' ', ' ', ' ', ' ', '\n', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 2 @@ -2895,8 +3100,9 @@ void CDirectoryListingParser::ConvertEncoding(char *pData, int len) { - if (m_listingEncoding != listingEncoding::ebcdic) + if (m_listingEncoding != listingEncoding::ebcdic) { return; + } for (int i = 0; i < len; ++i) { pData[i] = ebcdic_table[static_cast(pData[i])]; @@ -2905,16 +3111,18 @@ void CDirectoryListingParser::DeduceEncoding() { - if (m_listingEncoding != listingEncoding::unknown) + if (m_listingEncoding != listingEncoding::unknown) { return; + } int count[256]; memset(&count, 0, sizeof(int)*256); for (auto const& data : m_DataList) { - for (int i = 0; i < data.len; ++i) + for (int i = 0; i < data.len; ++i) { ++count[static_cast(data.p[i])]; + } } int count_normal = 0; @@ -2957,9 +3165,11 @@ m_pControlSocket->LogMessage(MessageType::Status, _("Received a directory listing which appears to be encoded in EBCDIC.")); } m_listingEncoding = listingEncoding::ebcdic; - for (auto it = m_DataList.begin(); it != m_DataList.end(); ++it) - ConvertEncoding(it->p, it->len); + for (auto & data : m_DataList) { + ConvertEncoding(data.p, data.len); + } } - else + else { m_listingEncoding = listingEncoding::normal; + } } diff -Nru filezilla-3.15.0.2/src/engine/directorylistingparser.h filezilla-3.33.0/src/engine/directorylistingparser.h --- filezilla-3.15.0.2/src/engine/directorylistingparser.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/directorylistingparser.h 2017-12-17 12:14:41.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __DIRECTORYLISTINGPARSER_H__ -#define __DIRECTORYLISTINGPARSER_H__ +#ifndef FILEZILLA_ENGINE_DIRECTORYLISTINGPARSER_HEADER +#define FILEZILLA_ENGINE_DIRECTORYLISTINGPARSER_HEADER /* This class is responsible for parsing the directory listings returned by * the server. @@ -50,7 +50,7 @@ class CDirectoryListingParser final { public: - CDirectoryListingParser(CControlSocket* pControlSocket, const CServer& server, listingEncoding::type encoding = listingEncoding::unknown, bool sftp_mode = false); + CDirectoryListingParser(CControlSocket* pControlSocket, const CServer& server, listingEncoding::type encoding = listingEncoding::unknown); ~CDirectoryListingParser(); CDirectoryListingParser(CDirectoryListingParser const&) = delete; @@ -59,7 +59,7 @@ CDirectoryListing Parse(const CServerPath &path); bool AddData(char *pData, int len); - bool AddLine(const wchar_t* pLine); + bool AddLine(std::wstring && line, std::wstring && name, fz::datetime const& time); void Reset(); @@ -72,7 +72,7 @@ bool ParseData(bool partial); - bool ParseLine(CLine &line, const enum ServerType serverType, bool concatenated); + bool ParseLine(CLine &line, ServerType const serverType, bool concatenated, CDirentry const* override = nullptr); bool ParseAsUnix(CLine &line, CDirentry &entry, bool expect_date); bool ParseAsDos(CLine &line, CDirentry &entry); @@ -125,26 +125,24 @@ int len; }; - int m_currentOffset; + int m_currentOffset{}; std::deque m_DataList; - std::deque> m_entryList; - int64_t m_totalData; + std::vector> entries_; + int64_t m_totalData{}; - CLine *m_prevLine; + CLine *m_prevLine{}; CServer m_server; - bool m_fileListOnly; - std::vector m_fileList; + bool m_fileListOnly{true}; + std::vector m_fileList; - bool m_maybeMultilineVms; + bool m_maybeMultilineVms{}; fz::duration m_timezoneOffset; listingEncoding::type m_listingEncoding; - - bool sftp_mode_{}; }; #endif diff -Nru filezilla-3.15.0.2/src/engine/engine_context.cpp filezilla-3.33.0/src/engine/engine_context.cpp --- filezilla-3.15.0.2/src/engine/engine_context.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/engine_context.cpp 2017-03-11 04:30:03.000000000 +0000 @@ -5,9 +5,9 @@ #include "logging_private.h" #include "pathcache.h" #include "ratelimiter.h" -#include "socket.h" #include +#include namespace { struct logging_options_changed_event_type; @@ -50,6 +50,8 @@ , optionChangeHandler_(options, loop_) { CLogging::UpdateLogLevel(options); + + directory_cache_.SetTtl(fz::duration::from_seconds(options.GetOptionVal(OPTION_CACHE_TTL))); } ~Impl() @@ -57,6 +59,7 @@ optionChangeHandler_.remove_handler(); } + fz::thread_pool pool_; fz::event_loop loop_; CRateLimiter limiter_; CDirectoryCache directory_cache_; @@ -64,8 +67,9 @@ CLoggingOptionsChanged optionChangeHandler_; }; -CFileZillaEngineContext::CFileZillaEngineContext(COptionsBase & options) +CFileZillaEngineContext::CFileZillaEngineContext(COptionsBase & options, CustomEncodingConverterBase const& customEncodingConverter) : options_(options) +, customEncodingConverter_(customEncodingConverter) , impl_(new Impl(options)) { } @@ -74,9 +78,9 @@ { } -COptionsBase& CFileZillaEngineContext::GetOptions() +fz::thread_pool& CFileZillaEngineContext::GetThreadPool() { - return options_; + return impl_->pool_; } fz::event_loop& CFileZillaEngineContext::GetEventLoop() diff -Nru filezilla-3.15.0.2/src/engine/engineprivate.cpp filezilla-3.33.0/src/engine/engineprivate.cpp --- filezilla-3.15.0.2/src/engine/engineprivate.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/engineprivate.cpp 2017-11-02 04:30:04.000000000 +0000 @@ -2,39 +2,48 @@ #include "ControlSocket.h" #include "directorycache.h" #include "engineprivate.h" -#include "ftpcontrolsocket.h" -#include "httpcontrolsocket.h" +#include "ftp/ftpcontrolsocket.h" +#include "http/httpcontrolsocket.h" #include "logging_private.h" #include "pathcache.h" #include "ratelimiter.h" -#include "sftpcontrolsocket.h" +#include "sftp/sftpcontrolsocket.h" +#if ENABLE_STORJ +#include "storj/storjcontrolsocket.h" +#endif #include #include -fz::mutex CFileZillaEnginePrivate::mutex_; +fz::mutex CFileZillaEnginePrivate::global_mutex_{false}; std::vector CFileZillaEnginePrivate::m_engineList; std::atomic_int CFileZillaEnginePrivate::m_activeStatus[2] = {{0}, {0}}; std::list CFileZillaEnginePrivate::m_failedLogins; -CFileZillaEnginePrivate::CFileZillaEnginePrivate(CFileZillaEngineContext& context, CFileZillaEngine& parent) +namespace { +unsigned int get_next_engine_id() +{ + static std::atomic next_{}; + return ++next_; +} +} + +CFileZillaEnginePrivate::CFileZillaEnginePrivate(CFileZillaEngineContext& context, CFileZillaEngine& parent, EngineNotificationHandler& notificationHandler) : event_handler(context.GetEventLoop()) , transfer_status_(*this) + , notification_handler_(notificationHandler) + , m_engine_id(get_next_engine_id()) , m_options(context.GetOptions()) , m_rateLimiter(context.GetRateLimiter()) , directory_cache_(context.GetDirectoryCache()) , path_cache_(context.GetPathCache()) , parent_(parent) + , thread_pool_(context.GetThreadPool()) + , encoding_converter_(context.GetCustomEncodingConverter()) { m_engineList.push_back(this); - { - fz::scoped_lock lock(mutex_); - static int id = 0; - m_engine_id = ++id; - } - m_pLogging = new CLogging(*this); { @@ -61,7 +70,7 @@ remove_handler(); m_maySendNotificationEvent = false; - m_pControlSocket.reset(); + controlSocket_.reset(); m_pCurrentCommand.reset(); // Delete notification list @@ -79,9 +88,6 @@ } delete m_pLogging; - - if (m_engineList.empty()) - CSocket::Cleanup(true); } void CFileZillaEnginePrivate::OnEngineEvent(EngineNotificationType type) @@ -91,9 +97,6 @@ case engineCancel: DoCancel(); break; - case engineTransferEnd: - if (m_pControlSocket) - m_pControlSocket->TransferEnd(); default: break; } @@ -102,16 +105,18 @@ bool CFileZillaEnginePrivate::IsBusy() const { fz::scoped_lock lock(mutex_); - return m_pCurrentCommand != 0; + return m_pCurrentCommand != nullptr; } bool CFileZillaEnginePrivate::IsConnected() const { fz::scoped_lock lock(mutex_); - if (!m_pControlSocket) + if (!controlSocket_) { return false; + } - return m_pControlSocket->Connected(); + // FIXME: This is unsafe! + return controlSocket_->Connected(); } const CCommand *CFileZillaEnginePrivate::GetCurrentCommand() const @@ -123,25 +128,29 @@ Command CFileZillaEnginePrivate::GetCurrentCommandId() const { fz::scoped_lock lock(mutex_); - if (!m_pCurrentCommand) + if (!m_pCurrentCommand) { return Command::none; - else - return GetCurrentCommand()->GetId(); + } + else { + return m_pCurrentCommand->GetId(); + } } -void CFileZillaEnginePrivate::AddNotification(CNotification *pNotification) +void CFileZillaEnginePrivate::AddNotification(fz::scoped_lock& lock, CNotification *pNotification) { - { - fz::scoped_lock lock(notification_mutex_); - m_NotificationList.push_back(pNotification); + m_NotificationList.push_back(pNotification); - if (!m_maySendNotificationEvent || !m_pEventHandler) { - return; - } + if (m_maySendNotificationEvent) { m_maySendNotificationEvent = false; + lock.unlock(); + notification_handler_.OnEngineEvent(&parent_); } +} - m_pEventHandler->QueueEvent(new wxFzEvent(&parent_)); +void CFileZillaEnginePrivate::AddNotification(CNotification *pNotification) +{ + fz::scoped_lock lock(notification_mutex_); + AddNotification(lock, pNotification); } void CFileZillaEnginePrivate::AddLogNotification(CLogmsgNotification *pNotification) @@ -150,15 +159,17 @@ if (pNotification->msgType == MessageType::Error) { queue_logs_ = false; - SendQueuedLogs(); - AddNotification(pNotification); + + m_NotificationList.insert(m_NotificationList.end(), queued_logs_.begin(), queued_logs_.end()); + queued_logs_.clear(); + AddNotification(lock, pNotification); } else if (pNotification->msgType == MessageType::Status) { - ClearQueuedLogs(false); - AddNotification(pNotification); + ClearQueuedLogs(lock, false); + AddNotification(lock, pNotification); } else if (!queue_logs_) { - AddNotification(pNotification); + AddNotification(lock, pNotification); } else { queued_logs_.push_back(pNotification); @@ -176,19 +187,17 @@ queue_logs_ = ShouldQueueLogsFromOptions(); } - if (!m_maySendNotificationEvent || !m_pEventHandler || m_NotificationList.empty()) { + if (!m_maySendNotificationEvent || m_NotificationList.empty()) { return; } m_maySendNotificationEvent = false; } - m_pEventHandler->QueueEvent(new wxFzEvent(&parent_)); + notification_handler_.OnEngineEvent(&parent_); } -void CFileZillaEnginePrivate::ClearQueuedLogs(bool reset_flag) +void CFileZillaEnginePrivate::ClearQueuedLogs(fz::scoped_lock&, bool reset_flag) { - fz::scoped_lock lock(notification_mutex_); - for (auto msg : queued_logs_) { delete msg; } @@ -199,13 +208,16 @@ } } +void CFileZillaEnginePrivate::ClearQueuedLogs(bool reset_flag) +{ + fz::scoped_lock lock(notification_mutex_); + ClearQueuedLogs(lock, reset_flag); +} + int CFileZillaEnginePrivate::ResetOperation(int nErrorCode) { fz::scoped_lock lock(mutex_); - m_pLogging->LogMessage(MessageType::Debug_Debug, _T("CFileZillaEnginePrivate::ResetOperation(%d)"), nErrorCode); - - if (nErrorCode & FZ_REPLY_DISCONNECTED) - m_lastListDir.clear(); + m_pLogging->LogMessage(MessageType::Debug_Debug, L"CFileZillaEnginePrivate::ResetOperation(%d)", nErrorCode); if (m_pCurrentCommand) { if ((nErrorCode & FZ_REPLY_NOTSUPPORTED) == FZ_REPLY_NOTSUPPORTED) { @@ -223,12 +235,13 @@ if ((nErrorCode & FZ_REPLY_CRITICALERROR) != FZ_REPLY_CRITICALERROR) { ++m_retryCount; if (m_retryCount < m_options.GetOptionVal(OPTION_RECONNECTCOUNT) && connectCommand.RetryConnecting()) { - unsigned int delay = GetRemainingReconnectDelay(connectCommand.GetServer()); - if (!delay) - delay = 1; + fz::duration delay = GetRemainingReconnectDelay(connectCommand.GetServer()); + if (!delay) { + delay = fz::duration::from_seconds(1); + } m_pLogging->LogMessage(MessageType::Status, _("Waiting to retry...")); stop_timer(m_retryTimer); - m_retryTimer = add_timer(fz::duration::from_milliseconds(delay), true); + m_retryTimer = add_timer(delay, true); return FZ_REPLY_WOULDBLOCK; } } @@ -241,8 +254,9 @@ notification->commandId = m_pCurrentCommand->GetId(); AddNotification(notification); } - else + else { m_nControlSocketError |= nErrorCode; + } m_pCurrentCommand.reset(); } @@ -272,23 +286,26 @@ } // Command handlers -int CFileZillaEnginePrivate::Connect(const CConnectCommand &command) +int CFileZillaEnginePrivate::Connect(CConnectCommand const& command) { - if (IsConnected()) + if (IsConnected()) { return FZ_REPLY_ALREADYCONNECTED; + } m_retryCount = 0; // Need to delete before setting m_pCurrentCommand. // The destructor can call CFileZillaEnginePrivate::ResetOperation // which would delete m_pCurrentCommand - m_pControlSocket.reset(); + controlSocket_.reset(); m_nControlSocketError = 0; - if (command.GetServer().GetPort() != CServer::GetDefaultPort(command.GetServer().GetProtocol())) { - ServerProtocol protocol = CServer::GetProtocolFromPort(command.GetServer().GetPort(), true); - if (protocol != UNKNOWN && protocol != command.GetServer().GetProtocol()) + auto const& server = command.GetServer(); + if (server.GetPort() != CServer::GetDefaultPort(server.GetProtocol())) { + ServerProtocol protocol = CServer::GetProtocolFromPort(server.GetPort(), true); + if (protocol != UNKNOWN && protocol != server.GetProtocol()) { m_pLogging->LogMessage(MessageType::Status, _("Selected port usually in use by a different protocol.")); + } } return ContinueConnect(); @@ -297,37 +314,43 @@ int CFileZillaEnginePrivate::Disconnect(CDisconnectCommand const&) { int res = FZ_REPLY_OK; - if (m_pControlSocket) { - res = m_pControlSocket->Disconnect(); - m_pControlSocket.reset(); + if (controlSocket_) { + res = controlSocket_->Disconnect(); + controlSocket_.reset(); } return res; } -int CFileZillaEnginePrivate::List(const CListCommand &command) +int CFileZillaEnginePrivate::List(CListCommand const& command) { int flags = command.GetFlags(); bool const refresh = (command.GetFlags() & LIST_FLAG_REFRESH) != 0; bool const avoid = (command.GetFlags() & LIST_FLAG_AVOID) != 0; if (!refresh && !command.GetPath().empty()) { - const CServer* pServer = m_pControlSocket->GetCurrentServer(); - if (pServer) { - CServerPath path(path_cache_.Lookup(*pServer, command.GetPath(), command.GetSubDir())); - if (path.empty() && command.GetSubDir().empty()) - path = command.GetPath(); + CServer const& server = controlSocket_->GetCurrentServer(); + if (server) { + CServerPath path(path_cache_.Lookup(server, command.GetPath(), command.GetSubDir())); + if (path.empty()) { + if (command.GetSubDir().empty()) { + path = command.GetPath(); + } + else if (server.GetProtocol() == STORJ) { + path = command.GetPath(); + path.ChangePath(command.GetSubDir()); + } + } if (!path.empty()) { CDirectoryListing *pListing = new CDirectoryListing; bool is_outdated = false; - bool found = directory_cache_.Lookup(*pListing, *pServer, path, true, is_outdated); + bool found = directory_cache_.Lookup(*pListing, server, path, true, is_outdated); if (found && !is_outdated) { - if (pListing->get_unsure_flags()) + if (pListing->get_unsure_flags()) { flags |= LIST_FLAG_REFRESH; + } else { if (!avoid) { - m_lastListDir = pListing->path; - m_lastListTime = fz::monotonic_clock::now(); CDirectoryListingNotification *pNotification = new CDirectoryListingNotification(pListing->path); AddNotification(pNotification); } @@ -335,28 +358,32 @@ return FZ_REPLY_OK; } } - if (is_outdated) + if (is_outdated) { flags |= LIST_FLAG_REFRESH; + } delete pListing; } } } - return m_pControlSocket->List(command.GetPath(), command.GetSubDir(), flags); + controlSocket_->List(command.GetPath(), command.GetSubDir(), flags); + return FZ_REPLY_CONTINUE; } -int CFileZillaEnginePrivate::FileTransfer(const CFileTransferCommand &command) +int CFileZillaEnginePrivate::FileTransfer(CFileTransferCommand const& command) { - return m_pControlSocket->FileTransfer(command.GetLocalFile(), command.GetRemotePath(), command.GetRemoteFile(), command.Download(), command.GetTransferSettings()); + controlSocket_->FileTransfer(command.GetLocalFile(), command.GetRemotePath(), command.GetRemoteFile(), command.Download(), command.GetTransferSettings()); + return FZ_REPLY_CONTINUE; } -int CFileZillaEnginePrivate::RawCommand(const CRawCommand& command) +int CFileZillaEnginePrivate::RawCommand(CRawCommand const& command) { { fz::scoped_lock lock(notification_mutex_); queue_logs_ = false; } - return m_pControlSocket->RawCommand(command.GetCommand()); + controlSocket_->RawCommand(command.GetCommand()); + return FZ_REPLY_CONTINUE; } int CFileZillaEnginePrivate::Delete(CDeleteCommand& command) @@ -367,86 +394,40 @@ else { m_pLogging->LogMessage(MessageType::Status, _("Deleting %u files from \"%s\""), static_cast(command.GetFiles().size()), command.GetPath().GetPath()); } - return m_pControlSocket->Delete(command.GetPath(), command.ExtractFiles()); + controlSocket_->Delete(command.GetPath(), command.ExtractFiles()); + return FZ_REPLY_CONTINUE; } -int CFileZillaEnginePrivate::RemoveDir(const CRemoveDirCommand& command) +int CFileZillaEnginePrivate::RemoveDir(CRemoveDirCommand const& command) { - return m_pControlSocket->RemoveDir(command.GetPath(), command.GetSubDir()); + controlSocket_->RemoveDir(command.GetPath(), command.GetSubDir()); + return FZ_REPLY_CONTINUE; } -int CFileZillaEnginePrivate::Mkdir(const CMkdirCommand& command) +int CFileZillaEnginePrivate::Mkdir(CMkdirCommand const& command) { - return m_pControlSocket->Mkdir(command.GetPath()); + controlSocket_->Mkdir(command.GetPath()); + return FZ_REPLY_CONTINUE; } -int CFileZillaEnginePrivate::Rename(const CRenameCommand& command) +int CFileZillaEnginePrivate::Rename(CRenameCommand const& command) { - return m_pControlSocket->Rename(command); + controlSocket_->Rename(command); + return FZ_REPLY_CONTINUE; } -int CFileZillaEnginePrivate::Chmod(const CChmodCommand& command) +int CFileZillaEnginePrivate::Chmod(CChmodCommand const& command) { - return m_pControlSocket->Chmod(command); -} - -void CFileZillaEnginePrivate::SendDirectoryListingNotification(const CServerPath& path, bool onList, bool modified, bool failed) -{ - fz::scoped_lock lock(mutex_); - - wxASSERT(m_pControlSocket); - - const CServer* const pOwnServer = m_pControlSocket->GetCurrentServer(); - wxASSERT(pOwnServer); - - m_lastListDir = path; - - if (failed) { - AddNotification(new CDirectoryListingNotification(path, false, true)); - m_lastListTime = fz::monotonic_clock::now(); - - // On failed messages, we don't notify other engines - return; - } - - fz::monotonic_clock changeTime; - if (!directory_cache_.GetChangeTime(changeTime, *pOwnServer, path)) - return; - - AddNotification(new CDirectoryListingNotification(path, !onList)); - m_lastListTime = changeTime; - - if (!modified) - return; - - // Iterate over the other engine, send notification if last listing - // directory is the same - for (auto & engine : m_engineList) { - if (!engine->m_pControlSocket || engine->m_pControlSocket == m_pControlSocket) { - continue; - } - - CServer const* const pServer = engine->m_pControlSocket->GetCurrentServer(); - if (!pServer || *pServer != *pOwnServer) - continue; - - if (engine->m_lastListDir != path) - continue; - - if (engine->m_lastListTime && changeTime <= engine->m_lastListTime) - continue; - - engine->m_lastListTime = changeTime; - engine->AddNotification(new CDirectoryListingNotification(path, true)); - } + controlSocket_->Chmod(command); + return FZ_REPLY_CONTINUE; } void CFileZillaEnginePrivate::RegisterFailedLoginAttempt(const CServer& server, bool critical) { - fz::scoped_lock lock(mutex_); + fz::scoped_lock lock(global_mutex_); std::list::iterator iter = m_failedLogins.begin(); while (iter != m_failedLogins.end()) { - fz::duration const span = fz::datetime::now() - iter->time; + fz::duration const span = fz::monotonic_clock::now() - iter->time; if (span.get_seconds() >= m_options.GetOptionVal(OPTION_RECONNECTDELAY) || iter->server == server || (!critical && (iter->server.GetHost() == server.GetHost() && iter->server.GetPort() == server.GetPort()))) { @@ -454,41 +435,45 @@ ++iter; m_failedLogins.erase(prev); } - else + else { ++iter; + } } t_failedLogins failure; failure.server = server; - failure.time = fz::datetime::now(); + failure.time = fz::monotonic_clock::now(); failure.critical = critical; m_failedLogins.push_back(failure); } -unsigned int CFileZillaEnginePrivate::GetRemainingReconnectDelay(const CServer& server) +fz::duration CFileZillaEnginePrivate::GetRemainingReconnectDelay(CServer const& server) { - fz::scoped_lock lock(mutex_); + fz::scoped_lock lock(global_mutex_); std::list::iterator iter = m_failedLogins.begin(); while (iter != m_failedLogins.end()) { - fz::duration const span = fz::datetime::now() - iter->time; - const int delay = m_options.GetOptionVal(OPTION_RECONNECTDELAY); - if (span.get_seconds() >= delay) { + fz::duration const span = fz::monotonic_clock::now() - iter->time; + fz::duration const delay = fz::duration::from_seconds(m_options.GetOptionVal(OPTION_RECONNECTDELAY)); + if (span >= delay) { std::list::iterator prev = iter; ++iter; m_failedLogins.erase(prev); } - else if (!iter->critical && iter->server.GetHost() == server.GetHost() && iter->server.GetPort() == server.GetPort()) - return delay * 1000 - span.get_milliseconds(); - else if (iter->server == server) - return delay * 1000 - span.get_milliseconds(); - else + else if (!iter->critical && iter->server.GetHost() == server.GetHost() && iter->server.GetPort() == server.GetPort()) { + return delay - span; + } + else if (iter->server == server) { + return delay - span; + } + else { ++iter; + } } - return 0; + return fz::duration(); } -void CFileZillaEnginePrivate::OnTimer(int) +void CFileZillaEnginePrivate::OnTimer(fz::timer_id) { if (!m_retryTimer) { return; @@ -496,14 +481,23 @@ m_retryTimer = 0; if (!m_pCurrentCommand || m_pCurrentCommand->GetId() != Command::connect) { - wxFAIL_MSG(_T("CFileZillaEnginePrivate::OnTimer called without pending Command::connect")); + m_pLogging->LogMessage(MessageType::Debug_Warning, L"CFileZillaEnginePrivate::OnTimer called without pending Command::connect"); return; } - wxASSERT(!IsConnected()); - m_pControlSocket.reset(); + controlSocket_.reset(); - ContinueConnect(); + int res = ContinueConnect(); + res |= m_nControlSocketError; + m_nControlSocketError = 0; + + if (res == FZ_REPLY_CONTINUE) { + assert(controlSocket_); + controlSocket_->SendNextCommand(); + } + else if (res != FZ_REPLY_WOULDBLOCK) { + ResetOperation(res); + } } int CFileZillaEnginePrivate::ContinueConnect() @@ -511,17 +505,17 @@ fz::scoped_lock lock(mutex_); if (!m_pCurrentCommand || m_pCurrentCommand->GetId() != Command::connect) { - m_pLogging->LogMessage(MessageType::Debug_Warning, _T("CFileZillaEnginePrivate::ContinueConnect called without pending Command::connect")); + m_pLogging->LogMessage(MessageType::Debug_Warning, L"CFileZillaEnginePrivate::ContinueConnect called without pending Command::connect"); return ResetOperation(FZ_REPLY_INTERNALERROR); } const CConnectCommand *pConnectCommand = static_cast(m_pCurrentCommand.get()); const CServer& server = pConnectCommand->GetServer(); - unsigned int delay = GetRemainingReconnectDelay(server); + fz::duration const& delay = GetRemainingReconnectDelay(server); if (delay) { - m_pLogging->LogMessage(MessageType::Status, wxPLURAL("Delaying connection for %d second due to previously failed connection attempt...", "Delaying connection for %d seconds due to previously failed connection attempt...", (delay + 999) / 1000), (delay + 999) / 1000); + m_pLogging->LogMessage(MessageType::Status, fztranslate("Delaying connection for %d second due to previously failed connection attempt...", "Delaying connection for %d seconds due to previously failed connection attempt...", (delay.get_milliseconds() + 999) / 1000), (delay.get_milliseconds() + 999) / 1000); stop_timer(m_retryTimer); - m_retryTimer = add_timer(fz::duration::from_milliseconds(delay), true); + m_retryTimer = add_timer(delay, true); return FZ_REPLY_WOULDBLOCK; } @@ -531,47 +525,52 @@ case FTPS: case FTPES: case INSECURE_FTP: - m_pControlSocket = std::make_unique(*this); + controlSocket_ = std::make_unique(*this); break; case SFTP: - m_pControlSocket = std::make_unique(*this); + controlSocket_ = std::make_unique(*this); break; case HTTP: case HTTPS: - m_pControlSocket = std::make_unique(*this); + controlSocket_ = std::make_unique(*this); break; +#if ENABLE_STORJ + case STORJ: + controlSocket_ = std::make_unique(*this); + break; +#endif default: - m_pLogging->LogMessage(MessageType::Debug_Warning, _T("Not a valid protocol: %d"), server.GetProtocol()); + m_pLogging->LogMessage(MessageType::Error, _("'%s' is not a supported protocol."), CServer::GetProtocolName(server.GetProtocol())); return FZ_REPLY_SYNTAXERROR|FZ_REPLY_DISCONNECTED; } - int res = m_pControlSocket->Connect(server); - if (m_retryTimer) - return FZ_REPLY_WOULDBLOCK; - - return res; + controlSocket_->Connect(server, pConnectCommand->GetCredentials()); + return FZ_REPLY_CONTINUE; } void CFileZillaEnginePrivate::InvalidateCurrentWorkingDirs(const CServerPath& path) { fz::scoped_lock lock(mutex_); - wxASSERT(m_pControlSocket); - const CServer* const pOwnServer = m_pControlSocket->GetCurrentServer(); - wxASSERT(pOwnServer); + assert(controlSocket_); + CServer const& ownServer = controlSocket_->GetCurrentServer(); + assert(ownServer); for (auto & engine : m_engineList) { - if (engine == this) + if (!engine || engine == this) { continue; + } - if (!engine->m_pControlSocket) + if (!engine->controlSocket_) { continue; + } - const CServer* const pServer = engine->m_pControlSocket->GetCurrentServer(); - if (!pServer || *pServer != *pOwnServer) + CServer const& server = engine->controlSocket_->GetCurrentServer(); + if (server != ownServer) { continue; + } - engine->m_pControlSocket->InvalidateCurrentWorkingDir(path); + engine->controlSocket_->InvalidateCurrentWorkingDir(path); } } @@ -598,7 +597,7 @@ else if (command.GetId() != Command::connect && command.GetId() != Command::disconnect && !IsConnected()) { return FZ_REPLY_NOTCONNECTED; } - else if (command.GetId() == Command::connect && m_pControlSocket) { + else if (command.GetId() == Command::connect && controlSocket_) { return FZ_REPLY_ALREADYCONNECTED; } return FZ_REPLY_OK; @@ -651,27 +650,35 @@ } } - if (id != Command::disconnect) + if (id != Command::disconnect) { res |= m_nControlSocketError; - else if (res & FZ_REPLY_DISCONNECTED) + } + else if (res & FZ_REPLY_DISCONNECTED) { res = FZ_REPLY_OK; + } m_nControlSocketError = 0; - if (res != FZ_REPLY_WOULDBLOCK) + if (res == FZ_REPLY_CONTINUE) { + assert(controlSocket_); + controlSocket_->SendNextCommand(); + } + else if (res != FZ_REPLY_WOULDBLOCK) { ResetOperation(res); + } } } void CFileZillaEnginePrivate::DoCancel() { fz::scoped_lock lock(mutex_); - if (!IsBusy()) + if (!IsBusy()) { return; + } if (m_retryTimer) { - wxASSERT(m_pCurrentCommand && m_pCurrentCommand->GetId() == Command::connect); + assert(m_pCurrentCommand && m_pCurrentCommand->GetId() == Command::connect); - m_pControlSocket.reset(); + controlSocket_.reset(); m_pCurrentCommand.reset(); @@ -687,19 +694,23 @@ ClearQueuedLogs(true); } else { - if (m_pControlSocket) - m_pControlSocket->Cancel(); - else + if (controlSocket_) { + controlSocket_->Cancel(); + } + else { ResetOperation(FZ_REPLY_CANCELED); + } } } bool CFileZillaEnginePrivate::CheckAsyncRequestReplyPreconditions(std::unique_ptr const& reply) { - if (!reply) + if (!reply) { return false; - if (!IsBusy()) + } + if (!IsBusy()) { return false; + } bool match; { @@ -707,7 +718,7 @@ match = reply->requestNumber == m_asyncRequestCounter; } - return match && m_pControlSocket; + return match && controlSocket_; } void CFileZillaEnginePrivate::OnSetAsyncRequestReplyEvent(std::unique_ptr const& reply) @@ -717,15 +728,8 @@ return; } - m_pControlSocket->SetAlive(); - m_pControlSocket->SetAsyncRequestReply(reply.get()); -} - -int CFileZillaEnginePrivate::Init(wxEvtHandler *pEventHandler) -{ - fz::scoped_lock lock(mutex_); - m_pEventHandler = pEventHandler; - return FZ_REPLY_OK; + controlSocket_->SetAlive(); + controlSocket_->SetAsyncRequestReply(reply.get()); } int CFileZillaEnginePrivate::Execute(const CCommand &command) @@ -749,7 +753,7 @@ if (m_NotificationList.empty()) { m_maySendNotificationEvent = true; - return 0; + return nullptr; } std::unique_ptr pNotification(m_NotificationList.front()); m_NotificationList.pop_front(); @@ -771,11 +775,13 @@ bool CFileZillaEnginePrivate::IsPendingAsyncRequestReply(std::unique_ptr const& pNotification) { - if (!pNotification) + if (!pNotification) { return false; + } - if (!IsBusy()) + if (!IsBusy()) { return false; + } fz::scoped_lock lock(notification_mutex_); return pNotification->requestNumber == m_asyncRequestCounter; @@ -811,14 +817,16 @@ // TODO: Possible optimization: Atomically get current server. The cache has its own mutex. fz::scoped_lock lock(mutex_); - if (!IsConnected()) + if (!IsConnected()) { return FZ_REPLY_ERROR; + } - wxASSERT(m_pControlSocket->GetCurrentServer()); + assert(controlSocket_->GetCurrentServer()); bool is_outdated = false; - if (!directory_cache_.Lookup(listing, *m_pControlSocket->GetCurrentServer(), path, true, is_outdated)) + if (!directory_cache_.Lookup(listing, controlSocket_->GetCurrentServer(), path, true, is_outdated)) { return FZ_REPLY_ERROR; + } return FZ_REPLY_OK; } @@ -826,8 +834,9 @@ int CFileZillaEnginePrivate::Cancel() { fz::scoped_lock lock(mutex_); - if (!IsBusy()) + if (!IsBusy()) { return FZ_REPLY_OK; + } send_event(engineCancel); return FZ_REPLY_WOULDBLOCK; @@ -836,11 +845,12 @@ void CFileZillaEnginePrivate::OnOptionsChanged(changed_options_t const&) { bool queue_logs = ShouldQueueLogsFromOptions(); - fz::scoped_lock lock(notification_mutex_); - queue_logs_ = queue_logs; - - if (!queue_logs_) { - SendQueuedLogs(); + if (queue_logs) { + fz::scoped_lock lock(notification_mutex_); + queue_logs_ = true; + } + else { + SendQueuedLogs(true); } } @@ -861,11 +871,12 @@ engine_.AddNotification(new CTransferStatusNotification()); } -void CTransferStatusManager::Init(wxFileOffset totalSize, wxFileOffset startOffset, bool list) +void CTransferStatusManager::Init(int64_t totalSize, int64_t startOffset, bool list) { fz::scoped_lock lock(mutex_); - if (startOffset < 0) + if (startOffset < 0) { startOffset = 0; + } status_ = CTransferStatus(totalSize, startOffset, list); currentOffset_ = 0; @@ -874,8 +885,9 @@ void CTransferStatusManager::SetStartTime() { fz::scoped_lock lock(mutex_); - if (!status_) + if (!status_) { return; + } status_.started = fz::datetime::now(); } @@ -883,15 +895,16 @@ void CTransferStatusManager::SetMadeProgress() { fz::scoped_lock lock(mutex_); - if (!status_) + if (!status_) { return; + } status_.madeProgress = true; } -void CTransferStatusManager::Update(wxFileOffset transferredBytes) +void CTransferStatusManager::Update(int64_t transferredBytes) { - CNotification* notification = 0; + CNotification* notification = nullptr; { int64_t oldOffset = currentOffset_.fetch_add(transferredBytes); diff -Nru filezilla-3.15.0.2/src/engine/engineprivate.h filezilla-3.33.0/src/engine/engineprivate.h --- filezilla-3.15.0.2/src/engine/engineprivate.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/engineprivate.h 2018-03-29 08:58:59.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __FILEZILLAENGINEPRIVATE_H__ -#define __FILEZILLAENGINEPRIVATE_H__ +#ifndef FILEZILLA_ENGINEPRIVATE_HEADER +#define FILEZILLA_ENGINEPRIVATE_HEADER #include #include @@ -19,7 +19,6 @@ enum EngineNotificationType { engineCancel, - engineTransferEnd }; struct filezilla_engine_event_type; @@ -35,11 +34,11 @@ bool empty(); - void Init(wxFileOffset totalSize, wxFileOffset startOffset, bool list); + void Init(int64_t totalSize, int64_t startOffset, bool list); void Reset(); void SetStartTime(); void SetMadeProgress(); - void Update(wxFileOffset transferredBytes); + void Update(int64_t transferredBytes); CTransferStatus Get(bool &changed); @@ -56,11 +55,9 @@ class CFileZillaEnginePrivate final : public fz::event_handler, COptionChangeEventHandler { public: - CFileZillaEnginePrivate(CFileZillaEngineContext& engine_context, CFileZillaEngine& parent); + CFileZillaEnginePrivate(CFileZillaEngineContext& engine_context, CFileZillaEngine& parent, EngineNotificationHandler& notificationHandler); virtual ~CFileZillaEnginePrivate(); - int Init(wxEvtHandler *pEventHandler); - int Execute(CCommand const& command); int Cancel(); int ResetOperation(int nErrorCode); @@ -83,6 +80,7 @@ void SetActive(int direction); // Add new pending notification + void AddNotification(fz::scoped_lock& lock, CNotification *pNotification); // note: Unlocks the mutex! void AddNotification(CNotification *pNotification); void AddLogNotification(CLogmsgNotification *pNotification); std::unique_ptr GetNextNotification(); @@ -91,8 +89,7 @@ CRateLimiter& GetRateLimiter() { return m_rateLimiter; } CDirectoryCache& GetDirectoryCache() { return directory_cache_; } CPathCache& GetPathCache() { return path_cache_; } - - void SendDirectoryListingNotification(const CServerPath& path, bool onList, bool modified, bool failed); + fz::thread_pool& GetThreadPool() { return thread_pool_; } // If deleting or renaming a directory, it could be possible that another // engine's CControlSocket instance still has that directory as @@ -103,14 +100,17 @@ // directory. void InvalidateCurrentWorkingDirs(const CServerPath& path); - int GetEngineId() const {return m_engine_id; } + unsigned int GetEngineId() const {return m_engine_id; } CTransferStatusManager transfer_status_; + + CustomEncodingConverterBase const& GetEncodingConverter() const { return encoding_converter_; } protected: virtual void OnOptionsChanged(changed_options_t const& options); void SendQueuedLogs(bool reset_flag = false); void ClearQueuedLogs(bool reset_flag); + void ClearQueuedLogs(fz::scoped_lock& lock, bool reset_flag); bool ShouldQueueLogsFromOptions() const; int CheckCommandPreconditions(CCommand const& command, bool checkBusy); @@ -120,16 +120,16 @@ void OnSetAsyncRequestReplyEvent(std::unique_ptr const& reply); // Command handlers, only called by CFileZillaEngine::Command - int Connect(const CConnectCommand &command); - int Disconnect(const CDisconnectCommand &command); - int List(const CListCommand &command); - int FileTransfer(const CFileTransferCommand &command); - int RawCommand(const CRawCommand& command); + int Connect(CConnectCommand const& command); + int Disconnect(CDisconnectCommand const& command); + int List(CListCommand const&command); + int FileTransfer(CFileTransferCommand const& command); + int RawCommand(CRawCommand const& command); int Delete(CDeleteCommand& command); - int RemoveDir(const CRemoveDirCommand& command); - int Mkdir(const CMkdirCommand& command); - int Rename(const CRenameCommand& command); - int Chmod(const CChmodCommand& command); + int RemoveDir(CRemoveDirCommand const& command); + int Mkdir(CMkdirCommand const& command); + int Rename(CRenameCommand const& command); + int Chmod(CChmodCommand const& command); void DoCancel(); @@ -137,35 +137,33 @@ void operator()(fz::event_base const& ev); void OnEngineEvent(EngineNotificationType type); - void OnTimer(int timer_id); + void OnTimer(fz::timer_id); void OnCommandEvent(); - // General mutex for operations on the engine // Todo: More fine-grained locking, a global mutex isn't nice - static fz::mutex mutex_; + static fz::mutex global_mutex_; + + // General mutex for operations on this engine + mutable fz::mutex mutex_; // Used to synchronize access to the notification list - fz::mutex notification_mutex_; + fz::mutex notification_mutex_{false}; - wxEvtHandler *m_pEventHandler{}; + EngineNotificationHandler& notification_handler_; - int m_engine_id; + unsigned int const m_engine_id; static std::vector m_engineList; // Indicicates if data has been received/sent and whether to send any notifications static std::atomic_int m_activeStatus[2]; - // Remember last path used in a dirlisting. - CServerPath m_lastListDir; - fz::monotonic_clock m_lastListTime; - - std::unique_ptr m_pControlSocket; + std::unique_ptr controlSocket_; std::unique_ptr m_pCurrentCommand; // Protect access to these three with notification_mutex_ - std::list m_NotificationList; + std::deque m_NotificationList; bool m_maySendNotificationEvent{true}; unsigned int m_asyncRequestCounter{}; @@ -181,13 +179,13 @@ void RegisterFailedLoginAttempt(const CServer& server, bool critical); - // Get the amount of time to wait till next reconnection attempt in milliseconds - unsigned int GetRemainingReconnectDelay(const CServer& server); + // Get the amount of time to wait till next reconnection attempt + fz::duration GetRemainingReconnectDelay(CServer const& server); struct t_failedLogins final { CServer server; - fz::datetime time; + fz::monotonic_clock time; bool critical{}; }; static std::list m_failedLogins; @@ -201,7 +199,11 @@ CFileZillaEngine& parent_; bool queue_logs_{true}; - std::deque queued_logs_; + std::vector queued_logs_; + + fz::thread_pool & thread_pool_; + + CustomEncodingConverterBase const& encoding_converter_; }; struct command_event_type{}; @@ -210,4 +212,4 @@ struct async_request_reply_event_type{}; typedef fz::simple_event> CAsyncRequestReplyEvent; -#endif //__FILEZILLAENGINEPRIVATE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/engine/engine.vcxproj filezilla-3.33.0/src/engine/engine.vcxproj --- filezilla-3.15.0.2/src/engine/engine.vcxproj 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/engine.vcxproj 2018-03-29 08:58:59.000000000 +0000 @@ -1,5 +1,5 @@  - + Debug @@ -14,12 +14,12 @@ {AAD2642D-D07A-4415-BB32-D678D89D546F} engine Win32Proj - 8.1 + 10.0.15063.0 StaticLibrary - v140 + v141 Unicode @@ -31,6 +31,7 @@ + <_ProjectFileVersion>11.0.50727.1 @@ -40,10 +41,10 @@ - /MP -Zm200 %(AdditionalOptions) + /MP -Zm200 /permissive- %(AdditionalOptions) Disabled .;../include/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;ENGINE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;ENGINE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -51,6 +52,8 @@ filezilla.h Level3 EditAndContinue + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) @@ -61,7 +64,7 @@ Default true .;../include/;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) true MultiThreadedDLL Use @@ -69,6 +72,8 @@ $(IntDir)filezilla.pch Level3 ProgramDatabase + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) @@ -84,13 +89,28 @@ Create - - + + + + + + + + + + + + + + + + + + - @@ -102,17 +122,36 @@ - + + + + + + + + + + + + + + + + + + + + - + + - @@ -123,8 +162,25 @@ - - + + + + + + + + + + + + + + + + + + + @@ -134,6 +190,7 @@ + @@ -141,11 +198,32 @@ - + + + + + + + + + + + + + + + + + + + + + + - + diff -Nru filezilla-3.15.0.2/src/engine/externalipresolver.cpp filezilla-3.33.0/src/engine/externalipresolver.cpp --- filezilla-3.15.0.2/src/engine/externalipresolver.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/externalipresolver.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -3,18 +3,20 @@ #include "socket.h" #include "misc.h" +#include #include -#include +#include namespace { fz::mutex s_sync; -wxString ip; +std::string ip; bool checked = false; } -CExternalIPResolver::CExternalIPResolver(event_handler & handler) - : event_handler(handler.event_loop_) +CExternalIPResolver::CExternalIPResolver(fz::thread_pool & pool, fz::event_handler & handler) + : fz::event_handler(handler.event_loop_) + , thread_pool_(pool) , m_handler(&handler) { ResetHttpData(true); @@ -24,16 +26,14 @@ { remove_handler(); - delete [] m_pSendBuffer; - m_pSendBuffer = 0; delete [] m_pRecvBuffer; - m_pRecvBuffer = 0; + m_pRecvBuffer = nullptr; - delete m_pSocket; - m_pSocket = 0; + delete socket_; + socket_ = nullptr; } -void CExternalIPResolver::GetExternalIP(const wxString& address, CSocket::address_family protocol, bool force /*=false*/) +void CExternalIPResolver::GetExternalIP(std::wstring const& address, fz::address_type protocol, bool force) { { fz::scoped_lock l(s_sync); @@ -50,67 +50,73 @@ m_address = address; m_protocol = protocol; - wxString host; - int pos; - if ((pos = address.Find(_T("://"))) != -1) - host = address.Mid(pos + 3); - else + std::wstring host; + size_t pos = address.find(L"://"); + if (pos != std::wstring::npos) { + host = address.substr(pos + 3); + } + else { host = address; + } - if ((pos = host.Find(_T("/"))) != -1) - host = host.Left(pos); - - wxString hostWithPort = host; + pos = host.find('/'); + if (pos != std::wstring::npos) { + host = host.substr(0, pos); + } - if ((pos = host.Find(':', true)) != -1) { - wxString port = host.Mid(pos + 1); - if (!port.ToULong(&m_port) || m_port < 1 || m_port > 65535) + std::wstring hostWithPort = host; + pos = host.rfind(':'); + if (pos != std::wstring::npos) { + std::wstring port = host.substr(pos + 1); + m_port = fz::to_integral(port); + if (m_port < 1 || m_port > 65535) { m_port = 80; - host = host.Left(pos); + } + host = host.substr(0, pos); } - else + else { m_port = 80; + } if (host.empty()) { m_done = true; return; } - m_pSocket = new CSocket(this); + socket_ = new fz::socket(thread_pool_, this); - int res = m_pSocket->Connect(host, m_port, protocol); + int res = socket_->connect(fz::to_native(host), m_port, protocol); if (res && res != EINPROGRESS) { Close(false); return; } - wxString buffer = wxString::Format(_T("GET %s HTTP/1.1\r\nHost: %s\r\nUser-Agent: %s\r\nConnection: close\r\n\r\n"), address, hostWithPort, wxString(PACKAGE_STRING, wxConvLocal)); - m_pSendBuffer = new char[strlen(buffer.mb_str()) + 1]; - strcpy(m_pSendBuffer, buffer.mb_str()); + m_sendBuffer = fz::sprintf("GET %s HTTP/1.1\r\nHost: %s\r\nUser-Agent: %s\r\nConnection: close\r\n\r\n", fz::to_utf8(address), fz::to_utf8(hostWithPort), fz::replaced_substrings(PACKAGE_STRING, " ", "/")); } void CExternalIPResolver::operator()(fz::event_base const& ev) { - fz::dispatch(ev, this, &CExternalIPResolver::OnSocketEvent); + fz::dispatch(ev, this, &CExternalIPResolver::OnSocketEvent); } -void CExternalIPResolver::OnSocketEvent(CSocketEventSource*, SocketEventType t, int error) +void CExternalIPResolver::OnSocketEvent(fz::socket_event_source*, fz::socket_event_flag t, int error) { - if (!m_pSocket) + if (!socket_) { return; + } switch (t) { - case SocketEventType::read: + case fz::socket_event_flag::read: OnReceive(); break; - case SocketEventType::connection: + case fz::socket_event_flag::connection: OnConnect(error); break; - case SocketEventType::close: + case fz::socket_event_flag::close: OnClose(); break; - case SocketEventType::write: + case fz::socket_event_flag::write: OnSend(); break; default: @@ -129,8 +135,9 @@ { if (m_data.empty()) Close(false); - else - OnData(0, 0); + else { + OnData(nullptr, 0); + } } void CExternalIPResolver::OnReceive() @@ -140,13 +147,14 @@ m_recvBufferPos = 0; } - if (m_pSendBuffer) + if (!m_sendBuffer.empty()) { return; + } - while (m_pSocket) { + while (socket_) { unsigned int len = m_recvBufferLen - m_recvBufferPos; int error; - int read = m_pSocket->Read(m_pRecvBuffer + m_recvBufferPos, len, error); + int read = socket_->read(m_pRecvBuffer + m_recvBufferPos, len, error); if (read == -1) { if (error != EAGAIN) Close(false); @@ -179,13 +187,13 @@ void CExternalIPResolver::OnSend() { - while (m_pSendBuffer) { - unsigned int len = strlen(m_pSendBuffer + m_sendBufferPos); + while (!m_sendBuffer.empty()) { int error; - int written = m_pSocket->Write(m_pSendBuffer + m_sendBufferPos, len, error); + int written = socket_->write(m_sendBuffer.c_str(), m_sendBuffer.size(), error); if (written == -1) { - if (error != EAGAIN) + if (error != EAGAIN) { Close(false); + } return; } @@ -194,30 +202,26 @@ return; } - if (written == (int)len) { - delete [] m_pSendBuffer; - m_pSendBuffer = 0; - + m_sendBuffer = m_sendBuffer.substr(written); + if (m_sendBuffer.empty()) { OnReceive(); } - else - m_sendBufferPos += written; } } void CExternalIPResolver::Close(bool successful) { - delete [] m_pSendBuffer; - m_pSendBuffer = 0; + m_sendBuffer.clear(); delete [] m_pRecvBuffer; - m_pRecvBuffer = 0; + m_pRecvBuffer = nullptr; - delete m_pSocket; - m_pSocket = 0; + delete socket_; + socket_ = nullptr; - if (m_done) + if (m_done) { return; + } m_done = true; @@ -231,7 +235,7 @@ if (m_handler) { m_handler->send_event(); - m_handler = 0; + m_handler = nullptr; } } @@ -265,7 +269,7 @@ m_pRecvBuffer[i] = 0; if (!m_responseCode) { - m_responseString = wxString(m_pRecvBuffer, wxConvLocal); + m_responseString = m_pRecvBuffer; if (m_recvBufferPos < 16 || memcmp(m_pRecvBuffer, "HTTP/1.", 7)) { // Invalid HTTP Status-Line Close(false); @@ -301,13 +305,13 @@ // Redirect if neccessary if (m_responseCode >= 300) { - delete m_pSocket; - m_pSocket = 0; + delete socket_; + socket_ = nullptr; delete [] m_pRecvBuffer; - m_pRecvBuffer = 0; + m_pRecvBuffer = nullptr; - wxString location = m_location; + std::wstring location = m_location; ResetHttpData(false); @@ -328,23 +332,26 @@ return; } if (m_recvBufferPos > 12 && !memcmp(m_pRecvBuffer, "Location: ", 10)) { - m_location = wxString(m_pRecvBuffer + 10, wxConvLocal); + m_location = fz::to_wstring_from_utf8(m_pRecvBuffer + 10); } else if (m_recvBufferPos > 21 && !memcmp(m_pRecvBuffer, "Transfer-Encoding: ", 19)) { if (!strcmp(m_pRecvBuffer + 19, "chunked")) m_transferEncoding = chunked; - else if (!strcmp(m_pRecvBuffer + 19, "identity")) + else if (!strcmp(m_pRecvBuffer + 19, "identity")) { m_transferEncoding = identity; - else + } + else { m_transferEncoding = unknown; + } } } memmove(m_pRecvBuffer, m_pRecvBuffer + i + 2, m_recvBufferPos - i - 2); m_recvBufferPos -= i + 2; - if (!m_recvBufferPos) + if (!m_recvBufferPos) { break; + } } } @@ -361,24 +368,25 @@ } } - if (i) - m_data += wxString(buffer, wxConvLocal, i); + if (i) { + m_data.append(buffer, i); + } - if (i == len) + if (i == len) { return; + } } - if (m_protocol == CSocket::ipv6) { + if (m_protocol == fz::address_type::ipv6) { if (!m_data.empty() && m_data[0] == '[') { - if (m_data.Last() != ']') { + if (m_data.back() != ']') { Close(false); return; } - m_data.RemoveLast(); - m_data = m_data.Mid(1); + m_data = m_data.substr(1, m_data.size() - 2); } - if (fz::get_ipv6_long_form(m_data.ToStdWstring()).empty()) { + if (fz::get_ipv6_long_form(m_data).empty()) { Close(false); return; } @@ -387,21 +395,20 @@ ip = m_data; } else { - // Validate ip address - wxString digit = _T("0*[0-9]{1,3}"); - const wxChar* dot = _T("\\."); - wxString exp = _T("(^|[^\\.[:digit:]])(") + digit + dot + digit + dot + digit + dot + digit + _T(")([^\\.[:digit:]]|$)"); - wxRegEx regex; - regex.Compile(exp); - - if (!regex.Matches(m_data)) { + std::string const digit = "0*[0-9]{1,3}"; + char const* const dot = "\\."; + std::string const exp = "(^|[^\\.[:digit:]])(" + digit + dot + digit + dot + digit + dot + digit + ")([^\\.[:digit:]]|$)"; + + std::regex const regex(exp); + std::smatch m; + if (!std::regex_search(m_data, m, regex)) { Close(false); return; } fz::scoped_lock l(s_sync); - ip = regex.GetMatch(m_data, 2); + ip = m[2]; } Close(true); @@ -413,8 +420,9 @@ m_location.clear(); m_responseCode = 0; m_responseString.clear(); - if (resetRedirectCount) + if (resetRedirectCount) { m_redirectCount = 0; + } m_transferEncoding = unknown; @@ -535,7 +543,7 @@ return !ip.empty(); } -wxString CExternalIPResolver::GetIP() const +std::string CExternalIPResolver::GetIP() const { fz::scoped_lock l(s_sync); return ip; diff -Nru filezilla-3.15.0.2/src/engine/FileZillaEngine.cpp filezilla-3.33.0/src/engine/FileZillaEngine.cpp --- filezilla-3.15.0.2/src/engine/FileZillaEngine.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/FileZillaEngine.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,14 +1,10 @@ -// FileZillaEngine.cpp: Implementierung der Klasse CFileZillaEngine. -// -////////////////////////////////////////////////////////////////////// - #include #include "ControlSocket.h" #include "directorycache.h" #include "engineprivate.h" -CFileZillaEngine::CFileZillaEngine(CFileZillaEngineContext& engine_context) - : impl_(new CFileZillaEnginePrivate(engine_context, *this)) +CFileZillaEngine::CFileZillaEngine(CFileZillaEngineContext& engine_context, EngineNotificationHandler& notificationHandler) + : impl_(new CFileZillaEnginePrivate(engine_context, *this, notificationHandler)) { } @@ -17,11 +13,6 @@ delete impl_; } -int CFileZillaEngine::Init(wxEvtHandler *pEventHandler) -{ - return impl_->Init(pEventHandler); -} - int CFileZillaEngine::Execute(const CCommand &command) { return impl_->Execute(command); @@ -42,7 +33,7 @@ return impl_->IsPendingAsyncRequestReply(pNotification); } -bool CFileZillaEngine::IsActive(enum CFileZillaEngine::_direction direction) +bool CFileZillaEngine::IsActive(CFileZillaEngine::_direction direction) { return CFileZillaEnginePrivate::IsActive(direction); } diff -Nru filezilla-3.15.0.2/src/engine/filezilla.h filezilla-3.33.0/src/engine/filezilla.h --- filezilla-3.15.0.2/src/engine/filezilla.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/filezilla.h 2017-02-11 13:27:28.000000000 +0000 @@ -1 +1,8 @@ #include "libfilezilla_engine.h" + +#ifdef _ +#undef _ +#endif +#define _(x) fz::translate(x) + + diff -Nru filezilla-3.15.0.2/src/engine/ftp/chmod.cpp filezilla-3.33.0/src/engine/ftp/chmod.cpp --- filezilla-3.15.0.2/src/engine/ftp/chmod.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/chmod.cpp 2017-02-27 04:30:02.000000000 +0000 @@ -0,0 +1,58 @@ +#include + +#include "chmod.h" +#include "directorycache.h" + +enum chmodStates +{ + chmod_init, + chmod_waitcwd, + chmod_chmod +}; + +int CFtpChmodOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpChmodOpData::Send() in state %d", opState); + + if (opState == chmod_init) { + controlSocket_.ChangeDir(command_.GetPath()); + opState = chmod_waitcwd; + return FZ_REPLY_CONTINUE; + } + else if (opState == chmod_chmod) { + return controlSocket_.SendCommand(L"SITE CHMOD " + command_.GetPermission() + L" " + command_.GetPath().FormatFilename(command_.GetFile(), !useAbsolute_)); + } + + return FZ_REPLY_INTERNALERROR; +} + +int CFtpChmodOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpChmodOpData::ParseResponse() in state %d", opState); + + int code = controlSocket_.GetReplyCode(); + if (code != 2 && code != 3) { + return FZ_REPLY_ERROR; + } + + engine_.GetDirectoryCache().UpdateFile(currentServer_, command_.GetPath(), command_.GetFile(), false, CDirectoryCache::unknown); + + return FZ_REPLY_OK; +} + +int CFtpChmodOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpChmodOpData::SubcommandResult() in state %d", opState); + + if (opState == chmod_waitcwd) { + if (prevResult != FZ_REPLY_OK) { + useAbsolute_ = true; + } + + opState = chmod_chmod; + return FZ_REPLY_CONTINUE; + } + else { + return FZ_REPLY_INTERNALERROR; + } +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/chmod.h filezilla-3.33.0/src/engine/ftp/chmod.h --- filezilla-3.15.0.2/src/engine/ftp/chmod.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/chmod.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef FILEZILLA_ENGINE_FTP_CHMOD_HEADER +#define FILEZILLA_ENGINE_FTP_CHMOD_HEADER + +#include "ftpcontrolsocket.h" + +class CFtpChmodOpData final : public COpData, public CFtpOpData +{ +public: + CFtpChmodOpData(CFtpControlSocket & controlSocket, CChmodCommand const& command) + : COpData(Command::chmod) + , CFtpOpData(controlSocket) + , command_(command) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const&) override; + + CChmodCommand command_; + bool useAbsolute_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/cwd.cpp filezilla-3.33.0/src/engine/ftp/cwd.cpp --- filezilla-3.15.0.2/src/engine/ftp/cwd.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/cwd.cpp 2018-05-07 08:20:55.000000000 +0000 @@ -0,0 +1,259 @@ +#include + +#include "cwd.h" +#include "../pathcache.h" + +enum cwdStates +{ + cwd_init = 0, + cwd_pwd, + cwd_cwd, + cwd_pwd_cwd, + cwd_cwd_subdir, + cwd_pwd_subdir +}; + +int CFtpChangeDirOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpChangeDirOpData::Send() in state %d", opState); + + std::wstring cmd; + switch (opState) + { + case cwd_init: + if (path_.GetType() == DEFAULT) { + path_.SetType(currentServer_.GetType()); + } + + if (path_.empty()) { + if (currentPath_.empty()) { + opState = cwd_pwd; + } + else { + return FZ_REPLY_OK; + } + } + else { + if (!subDir_.empty()) { + // Check if the target is in cache already + target_ = engine_.GetPathCache().Lookup(currentServer_, path_, subDir_); + if (!target_.empty()) { + if (currentPath_ == target_) { + return FZ_REPLY_OK; + } + + path_ = target_; + subDir_.clear(); + opState = cwd_cwd; + } + else { + // Target unknown, check for the parent's target + target_ = engine_.GetPathCache().Lookup(currentServer_, path_, L""); + if (currentPath_ == path_ || (!target_.empty() && target_ == currentPath_)) { + target_.clear(); + opState = cwd_cwd_subdir; + } + else { + opState = cwd_cwd; + } + } + } + else { + target_ = engine_.GetPathCache().Lookup(currentServer_, path_, L""); + if (currentPath_ == path_ || (!target_.empty() && target_ == currentPath_)) { + return FZ_REPLY_OK; + } + opState = cwd_cwd; + } + } + return FZ_REPLY_CONTINUE; + case cwd_pwd: + case cwd_pwd_cwd: + case cwd_pwd_subdir: + cmd = L"PWD"; + break; + case cwd_cwd: + if (tryMkdOnFail_ && !holdsLock_) { + if (controlSocket_.IsLocked(locking_reason::mkdir, path_)) { + // Some other engine is already creating this directory or + // performing an action that will lead to its creation + tryMkdOnFail_ = false; + } + if (!controlSocket_.TryLock(locking_reason::mkdir, path_)) { + return FZ_REPLY_WOULDBLOCK; + } + } + cmd = L"CWD " + path_.GetPath(); + currentPath_.clear(); + break; + case cwd_cwd_subdir: + if (subDir_.empty()) { + return FZ_REPLY_INTERNALERROR; + } + else if (subDir_ == L".." && !tried_cdup_) { + cmd = L"CDUP"; + } + else { + cmd = L"CWD " + path_.FormatSubdir(subDir_); + } + currentPath_.clear(); + break; + } + + if (!cmd.empty()) { + return controlSocket_.SendCommand(cmd); + } + + return FZ_REPLY_WOULDBLOCK; +} + + +int CFtpChangeDirOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpChangeDirOpData::ParseResponse() in state %d", opState); + + std::wstring const& response = controlSocket_.m_Response; + int code = controlSocket_.GetReplyCode(); + + bool error = false; + switch (opState) + { + case cwd_pwd: + if (code != 2 && code != 3) { + error = true; + } + else if (controlSocket_.ParsePwdReply(response)) { + return FZ_REPLY_OK; + } + else { + error = true; + } + break; + case cwd_cwd: + if (code != 2 && code != 3) { + // Create remote directory if part of a file upload + if (tryMkdOnFail_) { + tryMkdOnFail_ = false; + + controlSocket_.Mkdir(path_); + return FZ_REPLY_CONTINUE; + } + else { + error = true; + } + } + else { + if (target_.empty()) { + opState = cwd_pwd_cwd; + } + else { + currentPath_ = target_; + if (subDir_.empty()) { + return FZ_REPLY_OK; + } + + target_.clear(); + opState = cwd_cwd_subdir; + } + } + break; + case cwd_pwd_cwd: + if (code != 2 && code != 3) { + LogMessage(MessageType::Debug_Warning, L"PWD failed, assuming path is '%s'.", path_.GetPath()); + currentPath_ = path_; + + if (target_.empty()) { + engine_.GetPathCache().Store(currentServer_, currentPath_, path_); + } + + if (subDir_.empty()) { + return FZ_REPLY_OK; + } + else { + opState = cwd_cwd_subdir; + } + } + else if (controlSocket_.ParsePwdReply(response, false, path_)) { + if (target_.empty()) { + engine_.GetPathCache().Store(currentServer_, currentPath_, path_); + } + if (subDir_.empty()) { + return FZ_REPLY_OK; + } + else { + opState = cwd_cwd_subdir; + } + } + else { + error = true; + } + break; + case cwd_cwd_subdir: + if (code != 2 && code != 3) { + if (subDir_ == L".." && !tried_cdup_ && response.substr(0, 2) == L"50") { + // CDUP command not implemented, try again using CWD .. + tried_cdup_ = true; + } + else if (link_discovery_) { + LogMessage(MessageType::Debug_Info, L"Symlink does not link to a directory, probably a file"); + return FZ_REPLY_LINKNOTDIR; + } + else { + error = true; + } + } + else { + opState = cwd_pwd_subdir; + } + break; + case cwd_pwd_subdir: + { + CServerPath assumedPath(path_); + if (subDir_ == L"..") { + if (!assumedPath.HasParent()) { + assumedPath.clear(); + } + else { + assumedPath = assumedPath.GetParent(); + } + } + else { + assumedPath.AddSegment(subDir_); + } + + if (code != 2 && code != 3) { + if (!assumedPath.empty()) { + LogMessage(MessageType::Debug_Warning, L"PWD failed, assuming path is '%s'.", assumedPath.GetPath()); + currentPath_ = assumedPath; + + if (target_.empty()) { + engine_.GetPathCache().Store(currentServer_, currentPath_, path_, subDir_); + } + + return FZ_REPLY_OK; + } + else { + LogMessage(MessageType::Debug_Warning, L"PWD failed, unable to guess current path."); + error = true; + } + } + else if (controlSocket_.ParsePwdReply(response, false, assumedPath)) { + if (target_.empty()) { + engine_.GetPathCache().Store(currentServer_, currentPath_, path_, subDir_); + } + + return FZ_REPLY_OK; + } + else { + error = true; + } + } + break; + } + + if (error) { + return FZ_REPLY_ERROR; + } + + return FZ_REPLY_CONTINUE; +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/cwd.h filezilla-3.33.0/src/engine/ftp/cwd.h --- filezilla-3.15.0.2/src/engine/ftp/cwd.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/cwd.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,25 @@ +#ifndef FILEZILLA_ENGINE_FTP_CWD_HEADER +#define FILEZILLA_ENGINE_FTP_CWD_HEADER + +#include "ftpcontrolsocket.h" + +class CFtpChangeDirOpData final : public CChangeDirOpData, public CFtpOpData +{ +public: + CFtpChangeDirOpData(CFtpControlSocket & controlSocket) + : CFtpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + + virtual int SubcommandResult(int, COpData const&) override + { + LogMessage(MessageType::Debug_Verbose, L"CFtpChangeDirOpData::SubcommandResult()"); + return FZ_REPLY_CONTINUE; + } + + bool tried_cdup_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/delete.cpp filezilla-3.33.0/src/engine/ftp/delete.cpp --- filezilla-3.15.0.2/src/engine/ftp/delete.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/delete.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,104 @@ +#include + +#include "delete.h" +#include "../directorycache.h" + +enum rmdStates +{ + del_init, + del_waitcwd, + del_del +}; + +int CFtpDeleteOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpDeleteOpData::Send() in state %d", opState); + + if (opState == del_init) { + controlSocket_.ChangeDir(path_); + opState = del_waitcwd; + return FZ_REPLY_CONTINUE; + } + else if (opState == del_del) { + std::wstring const& file = files_.front(); + if (file.empty()) { + LogMessage(MessageType::Debug_Info, L"Empty filename"); + return FZ_REPLY_INTERNALERROR; + } + + std::wstring filename = path_.FormatFilename(file, omitPath_); + if (filename.empty()) { + LogMessage(MessageType::Error, _("Filename cannot be constructed for directory %s and filename %s"), path_.GetPath(), file); + return FZ_REPLY_ERROR; + } + + engine_.GetDirectoryCache().InvalidateFile(currentServer_, path_, file); + + return controlSocket_.SendCommand(L"DELE " + filename); + } + + LogMessage(MessageType::Debug_Warning, L"Unkown op state %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CFtpDeleteOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpDeleteOpData::ParseResponse() in state %d", opState); + + int code = controlSocket_.GetReplyCode(); + if (code != 2 && code != 3) { + deleteFailed_ = true; + } + else { + std::wstring const& file = files_.front(); + + engine_.GetDirectoryCache().RemoveFile(currentServer_, path_, file); + + auto now = fz::monotonic_clock::now(); + if (time_ && (now - time_).get_seconds() >= 1) { + controlSocket_.SendDirectoryListingNotification(path_, false, false); + time_ = now; + needSendListing_ = false; + } + else { + needSendListing_ = true; + } + } + + files_.pop_front(); + + if (!files_.empty()) { + return FZ_REPLY_CONTINUE; + } + + return deleteFailed_ ? FZ_REPLY_ERROR : FZ_REPLY_OK; +} + +int CFtpDeleteOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpDeleteOpData::SubcommandResult() in state %d", opState); + + if (opState == del_waitcwd) { + opState = del_del; + + if (prevResult != FZ_REPLY_OK) { + omitPath_ = false; + } + + time_ = fz::monotonic_clock::now(); + return FZ_REPLY_CONTINUE; + } + else { + return FZ_REPLY_INTERNALERROR; + } +} + +int CFtpDeleteOpData::Reset(int result) +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpDeleteOpData::Reset(%d) in state %d", result, opState); + + if (needSendListing_ && !(result & FZ_REPLY_DISCONNECTED)) { + controlSocket_.SendDirectoryListingNotification(path_, false, false); + } + return result; +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/delete.h filezilla-3.33.0/src/engine/ftp/delete.h --- filezilla-3.15.0.2/src/engine/ftp/delete.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/delete.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,35 @@ +#ifndef FILEZILLA_ENGINE_FTP_DELETE_HEADER +#define FILEZILLA_ENGINE_FTP_DELETE_HEADER + +#include "ftpcontrolsocket.h" + +#include "serverpath.h" + +class CFtpDeleteOpData final : public COpData, public CFtpOpData +{ +public: + CFtpDeleteOpData(CFtpControlSocket & controlSocket) + : COpData(Command::del) + , CFtpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const&) override; + virtual int Reset(int result) override; + + CServerPath path_; + std::deque files_; + bool omitPath_{}; + + // Set to fz::monotonic_clock::now initially and after + // sending an updated listing to the UI. + fz::monotonic_clock time_; + + bool needSendListing_{}; + + // Set to true if deletion of at least one file failed + bool deleteFailed_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/filetransfer.cpp filezilla-3.33.0/src/engine/ftp/filetransfer.cpp --- filezilla-3.15.0.2/src/engine/ftp/filetransfer.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/filetransfer.cpp 2017-12-31 04:30:05.000000000 +0000 @@ -0,0 +1,547 @@ +#include + +#include "directorycache.h" +#include "filetransfer.h" +#include "servercapabilities.h" +#include "transfersocket.h" + +#include +#include + +CFtpFileTransferOpData::CFtpFileTransferOpData(CFtpControlSocket& controlSocket, bool is_download, std::wstring const& local_file, std::wstring const& remote_file, CServerPath const& remote_path) + : CFileTransferOpData(is_download, local_file, remote_file, remote_path) + , CFtpOpData(controlSocket) +{ +} + +int CFtpFileTransferOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpFileTransferOpData::Send() in state %d", opState); + + std::wstring cmd; + switch (opState) + { + case filetransfer_init: + if (localFile_.empty()) { + if (!download_) { + return FZ_REPLY_CRITICALERROR | FZ_REPLY_NOTSUPPORTED; + } + else { + return FZ_REPLY_SYNTAXERROR; + } + } + + if (download_) { + std::wstring filename = remotePath_.FormatFilename(remoteFile_); + LogMessage(MessageType::Status, _("Starting download of %s"), filename); + } + else { + LogMessage(MessageType::Status, _("Starting upload of %s"), localFile_); + } + + int64_t size; + bool isLink; + if (fz::local_filesys::get_file_info(fz::to_native(localFile_), isLink, &size, nullptr, nullptr) == fz::local_filesys::file) { + localFileSize_ = size; + } + + opState = filetransfer_waitcwd; + + if (remotePath_.GetType() == DEFAULT) { + remotePath_.SetType(currentServer_.GetType()); + } + + controlSocket_.ChangeDir(remotePath_); + return FZ_REPLY_CONTINUE; + case filetransfer_size: + cmd = L"SIZE "; + cmd += remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_); + break; + case filetransfer_mdtm: + cmd = L"MDTM "; + cmd += remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_); + break; + case filetransfer_resumetest: + case filetransfer_transfer: + if (controlSocket_.m_pTransferSocket) { + LogMessage(MessageType::Debug_Verbose, L"m_pTransferSocket != 0"); + controlSocket_.m_pTransferSocket.reset(); + } + + { + auto pFile = std::make_unique(); + if (download_) { + int64_t startOffset = 0; + + // Potentially racy + bool didExist = fz::local_filesys::get_file_type(fz::to_native(localFile_)) != fz::local_filesys::unknown; + + if (resume_) { + if (!pFile->open(fz::to_native(localFile_), fz::file::writing, fz::file::existing)) { + LogMessage(MessageType::Error, _("Failed to open \"%s\" for appending/writing"), localFile_); + return FZ_REPLY_ERROR; + } + + fileDidExist_ = didExist; + + startOffset = pFile->seek(0, fz::file::end); + + if (startOffset == -1) { + LogMessage(MessageType::Error, _("Could not seek to the end of the file")); + return FZ_REPLY_ERROR; + } + localFileSize_ = startOffset; + + // Check resume capabilities + if (opState == filetransfer_resumetest) { + int res = TestResumeCapability(); + if (res != FZ_REPLY_CONTINUE || opState != filetransfer_resumetest) { + return res; + } + } + } + else { + controlSocket_.CreateLocalDir(localFile_); + + if (!pFile->open(fz::to_native(localFile_), fz::file::writing, fz::file::empty)) { + LogMessage(MessageType::Error, _("Failed to open \"%s\" for writing"), localFile_); + return FZ_REPLY_ERROR; + } + + fileDidExist_ = didExist; + localFileSize_ = 0; + } + + resumeOffset = resume_ ? localFileSize_ : 0; + + engine_.transfer_status_.Init(remoteFileSize_, startOffset, false); + + if (engine_.GetOptions().GetOptionVal(OPTION_PREALLOCATE_SPACE)) { + // Try to preallocate the file in order to reduce fragmentation + int64_t sizeToPreallocate = remoteFileSize_ - startOffset; + if (sizeToPreallocate > 0) { + LogMessage(MessageType::Debug_Info, L"Preallocating %d bytes for the file \"%s\"", sizeToPreallocate, localFile_); + auto oldPos = pFile->seek(0, fz::file::current); + if (oldPos >= 0) { + if (pFile->seek(sizeToPreallocate, fz::file::end) == remoteFileSize_) { + if (!pFile->truncate()) { + LogMessage(MessageType::Debug_Warning, L"Could not preallocate the file"); + } + } + if (pFile->seek(oldPos, fz::file::begin) != oldPos) { + LogMessage(MessageType::Error, _("Could not seek to offset %d within file"), oldPos); + return FZ_REPLY_ERROR; + } + } + } + } + } + else { + if (!pFile->open(fz::to_native(localFile_), fz::file::reading)) { + LogMessage(MessageType::Error, _("Failed to open \"%s\" for reading"), localFile_); + return FZ_REPLY_ERROR; + } + + int64_t startOffset; + if (resume_) { + if (remoteFileSize_ > 0) { + startOffset = remoteFileSize_; + + if (localFileSize_ < 0) { + auto s = pFile->size(); + if (s >= 0) { + localFileSize_ = s; + } + } + + if (startOffset == localFileSize_ && binary) { + LogMessage(MessageType::Debug_Info, L"No need to resume, remote file size matches local file size."); + + if (engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && + CServerCapabilities::GetCapability(currentServer_, mfmt_command) == yes) + { + fz::datetime mtime = fz::local_filesys::get_modification_time(fz::to_native(localFile_)); + if (!mtime.empty()) { + fileTime_ = mtime; + opState = filetransfer_mfmt; + return FZ_REPLY_CONTINUE; + } + } + return FZ_REPLY_OK; + } + + if (pFile->seek(startOffset, fz::file::begin) == -1) { + LogMessage(MessageType::Error, _("Could not seek to offset %d within file"), startOffset); + return FZ_REPLY_ERROR; + } + } + else { + startOffset = 0; + } + } + else { + startOffset = 0; + } + + if (CServerCapabilities::GetCapability(currentServer_, rest_stream) == yes) { + // Use REST + STOR if resuming + resumeOffset = startOffset; + } + else { + // Play it safe, use APPE if resuming + resumeOffset = 0; + } + + auto len = pFile->size(); + engine_.transfer_status_.Init(len, startOffset, false); + } + ioThread_ = std::make_unique(); + if (!ioThread_->Create(engine_.GetThreadPool(), std::move(pFile), !download_, binary)) { + // CIOThread will delete pFile + ioThread_.reset(); + LogMessage(MessageType::Error, _("Could not spawn IO thread")); + return FZ_REPLY_ERROR; + } + } + + controlSocket_.m_pTransferSocket = std::make_unique(engine_, controlSocket_, download_ ? TransferMode::download : TransferMode::upload); + controlSocket_.m_pTransferSocket->m_binaryMode = transferSettings_.binary; + controlSocket_.m_pTransferSocket->SetIOThread(ioThread_.get()); + + if (download_) { + cmd = L"RETR "; + } + else if (resume_) { + if (CServerCapabilities::GetCapability(currentServer_, rest_stream) == yes) { + cmd = L"STOR "; // In this case REST gets sent since resume offset was set earlier + } + else { + assert(resumeOffset == 0); + cmd = L"APPE "; + } + } + else { + cmd = L"STOR "; + } + cmd += remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_); + + opState = filetransfer_waittransfer; + controlSocket_.Transfer(cmd, this); + return FZ_REPLY_CONTINUE; + case filetransfer_mfmt: + { + cmd = L"MFMT "; + fz::datetime t = fileTime_; + t -= fz::duration::from_minutes(currentServer_.GetTimezoneOffset()); + cmd += t.format(L"%Y%m%d%H%M%S ", fz::datetime::utc); + cmd += remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_); + + break; + } + default: + LogMessage(MessageType::Debug_Warning, L"Unhandled opState: %d", opState); + return FZ_REPLY_ERROR; + } + + if (!cmd.empty()) { + return controlSocket_.SendCommand(cmd); + } + + return FZ_REPLY_WOULDBLOCK; +} + +int CFtpFileTransferOpData::TestResumeCapability() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpFileTransferOpData::TestResumeCapability()"); + + if (!download_) { + return FZ_REPLY_CONTINUE; + } + + for (int i = 0; i < 2; ++i) { + if (localFileSize_ >= (1ll << (i ? 31 : 32))) { + switch (CServerCapabilities::GetCapability(currentServer_, i ? resume2GBbug : resume4GBbug)) + { + case yes: + if (remoteFileSize_ == localFileSize_) { + LogMessage(MessageType::Debug_Info, _("Server does not support resume of files > %d GB. End transfer since file sizes match."), i ? 2 : 4); + return FZ_REPLY_OK; + } + LogMessage(MessageType::Error, _("Server does not support resume of files > %d GB."), i ? 2 : 4); + return FZ_REPLY_CRITICALERROR; + case unknown: + if (remoteFileSize_ < localFileSize_) { + // Don't perform test + break; + } + if (remoteFileSize_ == localFileSize_) { + LogMessage(MessageType::Debug_Info, _("Server may not support resume of files > %d GB. End transfer since file sizes match."), i ? 2 : 4); + return FZ_REPLY_OK; + } + else if (remoteFileSize_ > localFileSize_) { + LogMessage(MessageType::Status, _("Testing resume capabilities of server")); + + opState = filetransfer_waitresumetest; + resumeOffset = remoteFileSize_ - 1; + + controlSocket_.m_pTransferSocket = std::make_unique(engine_, controlSocket_, TransferMode::resumetest); + + controlSocket_.Transfer(L"RETR " + remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_), this); + return FZ_REPLY_CONTINUE; + } + break; + case no: + break; + } + } + } + + return FZ_REPLY_CONTINUE; +} + +int CFtpFileTransferOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpFileTransferOpData::ParseResponse() in state %d", opState); + + int code = controlSocket_.GetReplyCode(); + auto const& response = controlSocket_.m_Response; + + switch (opState) + { + case filetransfer_size: + if (code != 2 && code != 3) { + if (CServerCapabilities::GetCapability(currentServer_, size_command) == yes || + fz::str_tolower_ascii(response.substr(4)) == L"file not found" || + (fz::str_tolower_ascii(remotePath_.FormatFilename(remoteFile_)).find(L"file not found") == std::wstring::npos && + fz::str_tolower_ascii(response).find(L"file not found") != std::wstring::npos)) + { + // Server supports SIZE command but command failed. Most likely MDTM will fail as well, so + // skip it. + opState = filetransfer_resumetest; + + int res = controlSocket_.CheckOverwriteFile(); + if (res != FZ_REPLY_OK) { + return res; + } + } + else { + opState = filetransfer_mdtm; + } + } + else { + opState = filetransfer_mdtm; + if (response.substr(0, 4) == L"213 " && response.size() > 4) { + if (CServerCapabilities::GetCapability(currentServer_, size_command) == unknown) { + CServerCapabilities::SetCapability(currentServer_, size_command, yes); + } + std::wstring str = response.substr(4); + int64_t size = 0; + for (auto c : str) { + if (c < '0' || c > '9') { + break; + } + + size *= 10; + size += c - '0'; + } + remoteFileSize_ = size; + } + else { + LogMessage(MessageType::Debug_Info, L"Invalid SIZE reply"); + } + } + break; + case filetransfer_mdtm: + opState = filetransfer_resumetest; + if (response.substr(0, 4) == L"213 " && response.size() > 16) { + fileTime_ = fz::datetime(response.substr(4), fz::datetime::utc); + if (!fileTime_.empty()) { + fileTime_ += fz::duration::from_minutes(currentServer_.GetTimezoneOffset()); + } + } + + { + int res = controlSocket_.CheckOverwriteFile(); + if (res != FZ_REPLY_OK) { + return res; + } + } + + break; + case filetransfer_mfmt: + return FZ_REPLY_OK; + default: + LogMessage(MessageType::Debug_Warning, L"Unknown op state"); + return FZ_REPLY_INTERNALERROR; + } + + return FZ_REPLY_CONTINUE; +} + +int CFtpFileTransferOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpFileTransferOpData::SubcommandResult() in state %d", opState); + + if (opState == filetransfer_waitcwd) { + if (prevResult == FZ_REPLY_OK) { + CDirentry entry; + bool dirDidExist; + bool matchedCase; + bool found = engine_.GetDirectoryCache().LookupFile(entry, currentServer_, tryAbsolutePath_ ? remotePath_ : currentPath_, remoteFile_, dirDidExist, matchedCase); + if (!found) { + if (!dirDidExist) { + opState = filetransfer_waitlist; + } + else if (download_ && engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && CServerCapabilities::GetCapability(currentServer_, mdtm_command) == yes) { + opState = filetransfer_mdtm; + } + else { + opState = filetransfer_resumetest; + } + } + else { + if (entry.is_unsure()) { + opState = filetransfer_waitlist; + } + else { + if (matchedCase) { + remoteFileSize_ = entry.size; + if (entry.has_date()) { + fileTime_ = entry.time; + } + + if (download_ && + !entry.has_time() && + engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && + CServerCapabilities::GetCapability(currentServer_, mdtm_command) == yes) + { + opState = filetransfer_mdtm; + } + else { + opState = filetransfer_resumetest; + } + } + else { + opState = filetransfer_size; + } + } + } + if (opState == filetransfer_waitlist) { + controlSocket_.List(CServerPath(), L"", LIST_FLAG_REFRESH); + return FZ_REPLY_CONTINUE; + } + else if (opState == filetransfer_resumetest) { + int res = controlSocket_.CheckOverwriteFile(); + if (res != FZ_REPLY_OK) { + return res; + } + } + } + else { + tryAbsolutePath_ = true; + opState = filetransfer_size; + } + } + else if (opState == filetransfer_waitlist) { + if (prevResult == FZ_REPLY_OK) { + CDirentry entry; + bool dirDidExist; + bool matchedCase; + bool found = engine_.GetDirectoryCache().LookupFile(entry, currentServer_, tryAbsolutePath_ ? remotePath_ : currentPath_, remoteFile_, dirDidExist, matchedCase); + if (!found) { + if (!dirDidExist) { + opState = filetransfer_size; + } + else if (download_ && + engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && + CServerCapabilities::GetCapability(currentServer_, mdtm_command) == yes) + { + opState = filetransfer_mdtm; + } + else { + opState = filetransfer_resumetest; + } + } + else { + if (matchedCase && !entry.is_unsure()) { + remoteFileSize_ = entry.size; + if (entry.has_date()) { + fileTime_ = entry.time; + } + + if (download_ && + !entry.has_time() && + engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && + CServerCapabilities::GetCapability(currentServer_, mdtm_command) == yes) + { + opState = filetransfer_mdtm; + } + else { + opState = filetransfer_resumetest; + } + } + else { + opState = filetransfer_size; + } + } + + if (opState == filetransfer_resumetest) { + int res = controlSocket_.CheckOverwriteFile(); + if (res != FZ_REPLY_OK) { + return res; + } + } + } + else { + opState = filetransfer_size; + } + } + else if (opState == filetransfer_waittransfer) { + if (prevResult == FZ_REPLY_OK && engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) { + if (!download_ && + CServerCapabilities::GetCapability(currentServer_, mfmt_command) == yes) + { + fz::datetime mtime = fz::local_filesys::get_modification_time(fz::to_native(localFile_)); + if (!mtime.empty()) { + fileTime_ = mtime; + opState = filetransfer_mfmt; + return FZ_REPLY_CONTINUE; + } + } + else if (download_ && !fileTime_.empty()) { + ioThread_.reset(); + if (!fz::local_filesys::set_modification_time(fz::to_native(localFile_), fileTime_)) { + LogMessage(MessageType::Debug_Warning, L"Could not set modification time"); + } + } + } + return prevResult; + } + else if (opState == filetransfer_waitresumetest) { + if (prevResult != FZ_REPLY_OK) { + if (transferEndReason == TransferEndReason::failed_resumetest) { + if (localFileSize_ > (1ll << 32)) { + CServerCapabilities::SetCapability(currentServer_, resume4GBbug, yes); + LogMessage(MessageType::Error, _("Server does not support resume of files > 4GB.")); + } + else { + CServerCapabilities::SetCapability(currentServer_, resume2GBbug, yes); + LogMessage(MessageType::Error, _("Server does not support resume of files > 2GB.")); + } + + prevResult |= FZ_REPLY_CRITICALERROR; + } + return prevResult; + } + if (localFileSize_ > (1ll << 32)) { + CServerCapabilities::SetCapability(currentServer_, resume4GBbug, no); + } + else { + CServerCapabilities::SetCapability(currentServer_, resume2GBbug, no); + } + + opState = filetransfer_transfer; + } + + return FZ_REPLY_CONTINUE; +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/filetransfer.h filezilla-3.33.0/src/engine/ftp/filetransfer.h --- filezilla-3.15.0.2/src/engine/ftp/filetransfer.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/filetransfer.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef FILEZILLA_ENGINE_FTP_FILETRANSFER_HEADER +#define FILEZILLA_ENGINE_FTP_FILETRANSFER_HEADER + +#include "ftpcontrolsocket.h" + +#include "iothread.h" + +enum filetransferStates +{ + filetransfer_init = 0, + filetransfer_waitcwd, + filetransfer_waitlist, + filetransfer_size, + filetransfer_mdtm, + filetransfer_resumetest, + filetransfer_transfer, + filetransfer_waittransfer, + filetransfer_waitresumetest, + filetransfer_mfmt +}; + +class CFtpFileTransferOpData final : public CFileTransferOpData, public CFtpTransferOpData, public CFtpOpData +{ +public: + CFtpFileTransferOpData(CFtpControlSocket& controlSocket, bool is_download, std::wstring const& local_file, std::wstring const& remote_file, CServerPath const& remote_path); + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const&) override; + + int TestResumeCapability(); + + std::unique_ptr ioThread_; + bool fileDidExist_{true}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/ftpcontrolsocket.cpp filezilla-3.33.0/src/engine/ftp/ftpcontrolsocket.cpp --- filezilla-3.15.0.2/src/engine/ftp/ftpcontrolsocket.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/ftpcontrolsocket.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -0,0 +1,847 @@ +#include + +#include "cwd.h" +#include "chmod.h" +#include "delete.h" +#include "directorycache.h" +#include "directorylistingparser.h" +#include "engineprivate.h" +#include "externalipresolver.h" +#include "filetransfer.h" +#include "ftpcontrolsocket.h" +#include "iothread.h" +#include "list.h" +#include "logon.h" +#include "mkd.h" +#include "pathcache.h" +#include "proxy.h" +#include "rawcommand.h" +#include "rawtransfer.h" +#include "rename.h" +#include "rmd.h" +#include "servercapabilities.h" +#include "tlssocket.h" +#include "transfersocket.h" + +#include +#include +#include +#include + +#include + +CFtpControlSocket::CFtpControlSocket(CFileZillaEnginePrivate & engine) + : CRealControlSocket(engine) +{ + // Enable TCP_NODELAY, speeds things up a bit. + socket_->set_flags(fz::socket::flag_nodelay | fz::socket::flag_keepalive); + + // Enable SO_KEEPALIVE, lots of clueless users have broken routers and + // firewalls which terminate the control connection on long transfers. + int v = engine_.GetOptions().GetOptionVal(OPTION_TCP_KEEPALIVE_INTERVAL); + if (v >= 1 && v < 10000) { + socket_->set_keepalive_interval(fz::duration::from_minutes(v)); + } +} + +CFtpControlSocket::~CFtpControlSocket() +{ + remove_handler(); + + DoClose(); +} + +void CFtpControlSocket::OnReceive() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpControlSocket::OnReceive()"); + + for (;;) { + int error; + int read = m_pBackend->Read(m_receiveBuffer + m_bufferLen, RECVBUFFERSIZE - m_bufferLen, error); + + if (read < 0) { + if (error != EAGAIN) { + LogMessage(MessageType::Error, _("Could not read from socket: %s"), fz::socket::error_description(error)); + if (GetCurrentCommandId() != Command::connect) { + LogMessage(MessageType::Error, _("Disconnected from server")); + } + DoClose(); + } + return; + } + + if (!read) { + auto messageType = (GetCurrentCommandId() == Command::none) ? MessageType::Status : MessageType::Error; + LogMessage(messageType, _("Connection closed by server")); + DoClose(); + return; + } + + SetActive(CFileZillaEngine::recv); + + char* start = m_receiveBuffer; + m_bufferLen += read; + + for (int i = start - m_receiveBuffer; i < m_bufferLen; ++i) { + char const& p = m_receiveBuffer[i]; + if (p == '\r' || + p == '\n' || + p == 0) + { + int len = i - (start - m_receiveBuffer); + if (!len) { + ++start; + continue; + } + + std::wstring line = ConvToLocal(start, i - (start - m_receiveBuffer)); + start = m_receiveBuffer + i + 1; + + ParseLine(line); + + // Abort if connection got closed + if (!currentServer_) { + return; + } + } + } + memmove(m_receiveBuffer, start, m_bufferLen - (start - m_receiveBuffer)); + m_bufferLen -= (start -m_receiveBuffer); + if (m_bufferLen > MAXLINELEN) { + m_bufferLen = MAXLINELEN; + } + } +} + +void CFtpControlSocket::ParseLine(std::wstring line) +{ + m_rtt.Stop(); + LogMessageRaw(MessageType::Response, line); + SetAlive(); + + if (!operations_.empty() && operations_.back()->opId == Command::connect) { + auto & data = static_cast(*operations_.back()); + if (data.waitChallenge) { + std::wstring& challenge = data.challenge; + if (!challenge.empty()) +#ifdef FZ_WINDOWS + challenge += L"\r\n"; +#else + challenge += L"\n"; +#endif + challenge += line; + } + else if (data.opState == LOGON_FEAT) { + data.ParseFeat(line); + } + else if (data.opState == LOGON_WELCOME) { + if (!data.gotFirstWelcomeLine) { + if (fz::str_tolower_ascii(line).substr(0, 3) == L"ssh") { + LogMessage(MessageType::Error, _("Cannot establish FTP connection to an SFTP server. Please select proper protocol.")); + DoClose(FZ_REPLY_CRITICALERROR); + return; + } + data.gotFirstWelcomeLine = true; + } + } + } + //Check for multi-line responses + if (line.size() > 3) { + if (!m_MultilineResponseCode.empty()) { + if (line.substr(0, 4) == m_MultilineResponseCode) { + // end of multi-line found + m_MultilineResponseCode.clear(); + m_Response = line; + ParseResponse(); + m_Response.clear(); + m_MultilineResponseLines.clear(); + } + else { + m_MultilineResponseLines.push_back(line); + } + } + // start of new multi-line + else if (line[3] == '-') { + // DDD is the end of a multi-line response + m_MultilineResponseCode = line.substr(0, 3) + L" "; + m_MultilineResponseLines.push_back(line); + } + else { + m_Response = line; + ParseResponse(); + m_Response.clear(); + } + } +} + +void CFtpControlSocket::OnConnect() +{ + m_lastTypeBinary = -1; + + SetAlive(); + + if (currentServer_.GetProtocol() == FTPS) { + if (!m_pTlsSocket) { + LogMessage(MessageType::Status, _("Connection established, initializing TLS...")); + + assert(!m_pTlsSocket); + delete m_pBackend; + m_pTlsSocket = new CTlsSocket(this, *socket_, this); + m_pBackend = m_pTlsSocket; + + if (!m_pTlsSocket->Init()) { + LogMessage(MessageType::Error, _("Failed to initialize TLS.")); + DoClose(); + return; + } + + int res = m_pTlsSocket->Handshake(); + if (res == FZ_REPLY_ERROR) { + DoClose(); + } + + return; + } + else { + LogMessage(MessageType::Status, _("TLS connection established, waiting for welcome message...")); + } + } + else if ((currentServer_.GetProtocol() == FTPES || currentServer_.GetProtocol() == FTP) && m_pTlsSocket) { + LogMessage(MessageType::Status, _("TLS connection established.")); + SendNextCommand(); + return; + } + else { + LogMessage(MessageType::Status, _("Connection established, waiting for welcome message...")); + } + m_pendingReplies = 1; + m_repliesToSkip = 0; +} + +void CFtpControlSocket::ParseResponse() +{ + if (m_Response.empty()) { + LogMessage(MessageType::Debug_Warning, L"No reply in ParseResponse"); + return; + } + + if (m_Response[0] != '1') { + if (m_pendingReplies > 0) { + m_pendingReplies--; + } + else { + LogMessage(MessageType::Debug_Warning, L"Unexpected reply, no reply was pending."); + return; + } + } + + if (m_repliesToSkip) { + LogMessage(MessageType::Debug_Info, L"Skipping reply after cancelled operation or keepalive command."); + if (m_Response[0] != '1') { + --m_repliesToSkip; + } + + if (!m_repliesToSkip) { + SetWait(false); + if (operations_.empty()) { + StartKeepaliveTimer(); + } + else if (!m_pendingReplies) { + SendNextCommand(); + } + } + + return; + } + + if (operations_.empty()) { + LogMessage(MessageType::Debug_Info, L"Skipping reply without active operation."); + return; + } + + int res = operations_.back()->ParseResponse(); + if (res == FZ_REPLY_OK) { + ResetOperation(FZ_REPLY_OK); + } + else if (res == FZ_REPLY_CONTINUE) { + SendNextCommand(); + } + else if (res & FZ_REPLY_DISCONNECTED) { + DoClose(res); + } + else if (res & FZ_REPLY_ERROR) { + if (operations_.back()->opId == Command::connect) { + DoClose(res | FZ_REPLY_DISCONNECTED); + } + else { + ResetOperation(res); + } + } +} + +int CFtpControlSocket::GetReplyCode() const +{ + if (m_Response.empty()) { + return 0; + } + else if (m_Response[0] < '0' || m_Response[0] > '9') { + return 0; + } + else { + return m_Response[0] - '0'; + } +} + +int CFtpControlSocket::SendCommand(std::wstring const& str, bool maskArgs, bool measureRTT) +{ + size_t pos; + if (maskArgs && (pos = str.find(' ')) != std::wstring::npos) { + std::wstring stars(str.size() - pos - 1, '*'); + LogMessageRaw(MessageType::Command, str.substr(0, pos + 1) + stars); + } + else { + LogMessageRaw(MessageType::Command, str); + } + + std::string buffer = ConvToServer(str); + if (buffer.empty()) { + LogMessage(MessageType::Error, _("Failed to convert command to 8 bit charset")); + return FZ_REPLY_ERROR; + } + buffer += "\r\n"; + bool res = CRealControlSocket::Send(buffer.c_str(), buffer.size()); + if (res) { + ++m_pendingReplies; + } + + if (measureRTT) { + m_rtt.Start(); + } + + return res ? FZ_REPLY_WOULDBLOCK : FZ_REPLY_ERROR; +} + +void CFtpControlSocket::List(CServerPath const& path, std::wstring const& subDir, int flags) +{ + CServerPath newPath = currentPath_; + if (!path.empty()) { + newPath = path; + } + if (!newPath.ChangePath(subDir)) { + newPath.clear(); + } + + if (newPath.empty()) { + LogMessage(MessageType::Status, _("Retrieving directory listing...")); + } + else { + LogMessage(MessageType::Status, _("Retrieving directory listing of \"%s\"..."), newPath.GetPath()); + } + + Push(std::make_unique(*this, path, subDir, flags, operations_.empty())); +} + +int CFtpControlSocket::ResetOperation(int nErrorCode) +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpControlSocket::ResetOperation(%d)", nErrorCode); + + m_pTransferSocket.reset(); + m_pIPResolver.reset(); + + m_repliesToSkip = m_pendingReplies; + + if (!operations_.empty() && operations_.back()->opId == Command::transfer) { + auto & data = static_cast(*operations_.back()); + if (data.tranferCommandSent) { + if (data.transferEndReason == TransferEndReason::transfer_failure_critical) { + nErrorCode |= FZ_REPLY_CRITICALERROR | FZ_REPLY_WRITEFAILED; + } + if (data.transferEndReason != TransferEndReason::transfer_command_failure_immediate || GetReplyCode() != 5) { + data.transferInitiated_ = true; + } + else { + if (nErrorCode == FZ_REPLY_ERROR) { + nErrorCode |= FZ_REPLY_CRITICALERROR; + } + } + } + if (nErrorCode != FZ_REPLY_OK && data.download_ && !data.fileDidExist_) { + data.ioThread_.reset(); + int64_t size; + bool isLink; + if (fz::local_filesys::get_file_info(fz::to_native(data.localFile_), isLink, &size, nullptr, nullptr) == fz::local_filesys::file && size == 0) { + // Download failed and a new local file was created before, but + // nothing has been written to it. Remove it again, so we don't + // leave a bunch of empty files all over the place. + LogMessage(MessageType::Debug_Verbose, L"Deleting empty file"); + fz::remove_file(fz::to_native(data.localFile_)); + } + } + } + + if (!operations_.empty() && operations_.back()->opId == PrivCommand::rawtransfer && + nErrorCode != FZ_REPLY_OK) + { + auto & data = static_cast(*operations_.back()); + if (data.pOldData->transferEndReason == TransferEndReason::successful) { + if ((nErrorCode & FZ_REPLY_TIMEOUT) == FZ_REPLY_TIMEOUT) { + data.pOldData->transferEndReason = TransferEndReason::timeout; + } + else if (!data.pOldData->tranferCommandSent) { + data.pOldData->transferEndReason = TransferEndReason::pre_transfer_command_failure; + } + else { + data.pOldData->transferEndReason = TransferEndReason::failure; + } + } + } + + m_lastCommandCompletionTime = fz::monotonic_clock::now(); + if (!operations_.empty() && !(nErrorCode & FZ_REPLY_DISCONNECTED)) { + StartKeepaliveTimer(); + } + else { + stop_timer(m_idleTimer); + m_idleTimer = 0; + } + + return CControlSocket::ResetOperation(nErrorCode); +} + +bool CFtpControlSocket::CanSendNextCommand() const +{ + if (m_repliesToSkip) { + LogMessage(MessageType::Status, L"Waiting for replies to skip before sending next command..."); + return false; + } + + return true; +} + +void CFtpControlSocket::ChangeDir(CServerPath const& path, std::wstring const& subDir, bool link_discovery) +{ + auto pData = std::make_unique(*this); + pData->path_ = path; + pData->subDir_ = subDir; + pData->link_discovery_ = link_discovery; + + if (!operations_.empty() && operations_.back()->opId == Command::transfer && + !static_cast(*operations_.back()).download_) + { + pData->tryMkdOnFail_ = true; + assert(subDir.empty()); + } + + Push(std::move(pData)); +} + +void CFtpControlSocket::FileTransfer(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const& transferSettings) +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpControlSocket::FileTransfer()"); + + auto pData = std::make_unique(*this, download, localFile, remoteFile, remotePath); + pData->transferSettings_ = transferSettings; + pData->binary = transferSettings.binary; + Push(std::move(pData)); +} + +void CFtpControlSocket::TransferEnd() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpControlSocket::TransferEnd()"); + + // If m_pTransferSocket is zero, the message was sent by the previous command. + // We can safely ignore it. + // It does not cause problems, since before creating the next transfer socket, other + // messages which were added to the queue later than this one will be processed first. + if (operations_.empty() || !m_pTransferSocket || operations_.back()->opId != PrivCommand::rawtransfer) { + LogMessage(MessageType::Debug_Verbose, L"Call to TransferEnd at unusual time, ignoring"); + return; + } + + TransferEndReason reason = m_pTransferSocket->GetTransferEndreason(); + if (reason == TransferEndReason::none) { + LogMessage(MessageType::Debug_Info, L"Call to TransferEnd at unusual time"); + return; + } + + if (reason == TransferEndReason::successful) { + SetAlive(); + } + + auto & data = static_cast(*operations_.back()); + if (data.pOldData->transferEndReason == TransferEndReason::successful) { + data.pOldData->transferEndReason = reason; + } + + switch (data.opState) + { + case rawtransfer_transfer: + data.opState = rawtransfer_waittransferpre; + break; + case rawtransfer_waitfinish: + data.opState = rawtransfer_waittransfer; + break; + case rawtransfer_waitsocket: + ResetOperation((reason == TransferEndReason::successful) ? FZ_REPLY_OK : FZ_REPLY_ERROR); + break; + default: + LogMessage(MessageType::Debug_Info, L"TransferEnd at unusual op state %d, ignoring", data.opState); + break; + } +} + +bool CFtpControlSocket::SetAsyncRequestReply(CAsyncRequestNotification *pNotification) +{ + if (operations_.empty() || !operations_.back()->waitForAsyncRequest) { + LogMessage(MessageType::Debug_Info, L"Not waiting for request reply, ignoring request reply %d", pNotification->GetRequestID()); + return false; + } + operations_.back()->waitForAsyncRequest = false; + + const RequestId requestId = pNotification->GetRequestID(); + switch (requestId) + { + case reqId_fileexists: + { + if (operations_.empty() || operations_.back()->opId != Command::transfer) { + LogMessage(MessageType::Debug_Info, L"No or invalid operation in progress, ignoring request reply %d", pNotification->GetRequestID()); + return false; + } + + CFileExistsNotification *pFileExistsNotification = static_cast(pNotification); + return SetFileExistsAction(pFileExistsNotification); + } + break; + case reqId_interactiveLogin: + { + if (operations_.empty() || operations_.back()->opId != Command::connect) { + LogMessage(MessageType::Debug_Info, L"No or invalid operation in progress, ignoring request reply %d", pNotification->GetRequestID()); + return false; + } + + auto & data = static_cast(*operations_.back()); + + CInteractiveLoginNotification *pInteractiveLoginNotification = static_cast(pNotification); + if (!pInteractiveLoginNotification->passwordSet) { + ResetOperation(FZ_REPLY_CANCELED); + return false; + } + data.credentials_.SetPass(pInteractiveLoginNotification->credentials.GetPass()); + SendNextCommand(); + } + break; + case reqId_certificate: + { + if (!m_pTlsSocket || m_pTlsSocket->GetState() != CTlsSocket::TlsState::verifycert) { + LogMessage(MessageType::Debug_Info, L"No or invalid operation in progress, ignoring request reply %d", pNotification->GetRequestID()); + return false; + } + + CCertificateNotification* pCertificateNotification = static_cast(pNotification); + m_pTlsSocket->TrustCurrentCert(pCertificateNotification->m_trusted); + + if (!pCertificateNotification->m_trusted) { + DoClose(FZ_REPLY_CRITICALERROR); + return false; + } + + if (!operations_.empty() && operations_.back()->opId == Command::connect && + operations_.back()->opState == LOGON_AUTH_WAIT) + { + operations_.back()->opState = LOGON_LOGON; + } + } + break; + default: + LogMessage(MessageType::Debug_Warning, L"Unknown request %d", pNotification->GetRequestID()); + ResetOperation(FZ_REPLY_INTERNALERROR); + return false; + } + + return true; +} + +void CFtpControlSocket::RawCommand(std::wstring const& command) +{ + assert(!command.empty()); + Push(std::make_unique(*this, command)); +} + +void CFtpControlSocket::Delete(CServerPath const& path, std::deque&& files) +{ + auto pData = std::make_unique(*this); + pData->path_ = path; + pData->files_ = std::move(files); + pData->omitPath_ = true; + + Push(std::move(pData)); +} + +void CFtpControlSocket::RemoveDir(CServerPath const& path, std::wstring const& subDir) +{ + auto pData = std::make_unique(*this); + pData->path_ = path; + pData->subDir_ = subDir; + pData->omitPath_ = true; + pData->fullPath_ = path; + Push(std::move(pData)); +} + +void CFtpControlSocket::Mkdir(CServerPath const& path) +{ + /* Directory creation works like this: First find a parent directory into + * which we can CWD, then create the subdirs one by one. If either part + * fails, try MKD with the full path directly. + */ + + if (operations_.empty() && !path.empty()) { + LogMessage(MessageType::Status, _("Creating directory '%s'..."), path.GetPath()); + } + + auto pData = std::make_unique(*this); + pData->path_ = path; + + Push(std::move(pData)); +} + +void CFtpControlSocket::Rename(CRenameCommand const& command) +{ + LogMessage(MessageType::Status, _("Renaming '%s' to '%s'"), command.GetFromPath().FormatFilename(command.GetFromFile()), command.GetToPath().FormatFilename(command.GetToFile())); + + Push(std::make_unique(*this, command)); +} + +void CFtpControlSocket::Chmod(CChmodCommand const& command) +{ + LogMessage(MessageType::Status, _("Setting permissions of '%s' to '%s'"), command.GetPath().FormatFilename(command.GetFile()), command.GetPermission()); + + Push(std::make_unique(*this, command)); +} + +int CFtpControlSocket::GetExternalIPAddress(std::string& address) +{ + // Local IP should work. Only a complete moron would use IPv6 + // and NAT at the same time. + if (socket_->address_family() != fz::address_type::ipv6) { + int mode = engine_.GetOptions().GetOptionVal(OPTION_EXTERNALIPMODE); + + if (mode) { + if (engine_.GetOptions().GetOptionVal(OPTION_NOEXTERNALONLOCAL) && + !fz::is_routable_address(socket_->peer_ip())) + // Skip next block, use local address + goto getLocalIP; + } + + if (mode == 1) { + std::wstring ip = engine_.GetOptions().GetOption(OPTION_EXTERNALIP); + if (!ip.empty()) { + address = fz::to_string(ip); + return FZ_REPLY_OK; + } + + LogMessage(MessageType::Debug_Warning, _("No external IP address set, trying default.")); + } + else if (mode == 2) { + if (!m_pIPResolver) { + std::string localAddress = socket_->local_ip(true); + + if (!localAddress.empty() && localAddress == fz::to_string(engine_.GetOptions().GetOption(OPTION_LASTRESOLVEDIP))) { + LogMessage(MessageType::Debug_Verbose, L"Using cached external IP address"); + + address = localAddress; + return FZ_REPLY_OK; + } + + std::wstring resolverAddress = engine_.GetOptions().GetOption(OPTION_EXTERNALIPRESOLVER); + + LogMessage(MessageType::Debug_Info, _("Retrieving external IP address from %s"), resolverAddress); + + m_pIPResolver = std::make_unique(engine_.GetThreadPool(), *this); + m_pIPResolver->GetExternalIP(resolverAddress, fz::address_type::ipv4); + if (!m_pIPResolver->Done()) { + LogMessage(MessageType::Debug_Verbose, L"Waiting for resolver thread"); + return FZ_REPLY_WOULDBLOCK; + } + } + if (!m_pIPResolver->Successful()) { + m_pIPResolver.reset(); + + LogMessage(MessageType::Debug_Warning, _("Failed to retrieve external IP address, using local address")); + } + else { + LogMessage(MessageType::Debug_Info, L"Got external IP address"); + address = m_pIPResolver->GetIP(); + + engine_.GetOptions().SetOption(OPTION_LASTRESOLVEDIP, fz::to_wstring(address)); + + m_pIPResolver.reset(); + + return FZ_REPLY_OK; + } + } + } + +getLocalIP: + address = socket_->local_ip(true); + if (address.empty()) { + LogMessage(MessageType::Error, _("Failed to retrieve local IP address."), 1); + return FZ_REPLY_ERROR; + } + + return FZ_REPLY_OK; +} + +void CFtpControlSocket::OnExternalIPAddress() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpControlSocket::OnExternalIPAddress()"); + if (!m_pIPResolver) { + LogMessage(MessageType::Debug_Info, L"Ignoring event"); + return; + } + + SendNextCommand(); +} + +void CFtpControlSocket::Transfer(std::wstring const& cmd, CFtpTransferOpData* oldData) +{ + assert(oldData); + oldData->tranferCommandSent = false; + + auto pData = std::make_unique(*this); + + pData->cmd_ = cmd; + pData->pOldData = oldData; + pData->pOldData->transferEndReason = TransferEndReason::successful; + + if (m_pProxyBackend) { + // Only passive suported + // Theoretically could use reverse proxy ability in SOCKS5, but + // it is too fragile to set up with all those broken routers and + // firewalls sabotaging connections. Regular active mode is hard + // enough already + pData->bPasv = true; + pData->bTriedActive = true; + } + else { + switch (currentServer_.GetPasvMode()) + { + case MODE_PASSIVE: + pData->bPasv = true; + break; + case MODE_ACTIVE: + pData->bPasv = false; + break; + default: + pData->bPasv = engine_.GetOptions().GetOptionVal(OPTION_USEPASV) != 0; + break; + } + } + + if ((pData->pOldData->binary && m_lastTypeBinary == 1) || + (!pData->pOldData->binary && m_lastTypeBinary == 0)) + { + pData->opState = rawtransfer_port_pasv; + } + else { + pData->opState = rawtransfer_type; + } + + Push(std::move(pData)); +} + +void CFtpControlSocket::Connect(CServer const& server, Credentials const& credentials) +{ + if (!operations_.empty()) { + LogMessage(MessageType::Debug_Warning, L"CFtpControlSocket::Connect(): deleting stale operations"); + operations_.clear(); + } + + currentServer_ = server; + + Push(std::make_unique(*this, credentials)); +} + +void CFtpControlSocket::OnTimer(fz::timer_id id) +{ + if (id != m_idleTimer) { + CControlSocket::OnTimer(id); + return; + } + + if (!operations_.empty()) { + return; + } + + if (m_pendingReplies || m_repliesToSkip) { + return; + } + + LogMessage(MessageType::Status, _("Sending keep-alive command")); + + std::wstring cmd; + auto i = fz::random_number(0, 2); + if (!i) { + cmd = L"NOOP"; + } + else if (i == 1) { + if (m_lastTypeBinary) { + cmd = L"TYPE I"; + } + else { + cmd = L"TYPE A"; + } + } + else { + cmd = L"PWD"; + } + + int res = SendCommand(cmd); + if (res == FZ_REPLY_WOULDBLOCK) { + ++m_repliesToSkip; + } + else { + DoClose(res); + } +} + +void CFtpControlSocket::StartKeepaliveTimer() +{ + if (!engine_.GetOptions().GetOptionVal(OPTION_FTP_SENDKEEPALIVE)) { + return; + } + + if (m_repliesToSkip || m_pendingReplies) { + return; + } + + if (!m_lastCommandCompletionTime) { + return; + } + + fz::duration const span = fz::monotonic_clock::now() - m_lastCommandCompletionTime; + if (span.get_minutes() >= 30) { + return; + } + + stop_timer(m_idleTimer); + m_idleTimer = add_timer(fz::duration::from_seconds(30), true); +} + +void CFtpControlSocket::operator()(fz::event_base const& ev) +{ + if (fz::dispatch(ev, this, &CFtpControlSocket::OnTimer)) { + return; + } + + if (fz::dispatch(ev, this, &CFtpControlSocket::OnExternalIPAddress)) { + return; + } + + if (fz::dispatch(ev, this, &CFtpControlSocket::TransferEnd)) { + return; + } + + CRealControlSocket::operator()(ev); +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/ftpcontrolsocket.h filezilla-3.33.0/src/engine/ftp/ftpcontrolsocket.h --- filezilla-3.15.0.2/src/engine/ftp/ftpcontrolsocket.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/ftpcontrolsocket.h 2017-09-19 21:36:39.000000000 +0000 @@ -0,0 +1,145 @@ +#ifndef FILEZILLA_ENGINE_FTP_FTPCONTROLSOCKET_HEADER +#define FILEZILLA_ENGINE_FTP_FTPCONTROLSOCKET_HEADER + +#include "logging_private.h" +#include "ControlSocket.h" +#include "externalipresolver.h" +#include "rtt.h" + +#include + +namespace PrivCommand { +auto const cwd = Command::private1; +auto const rawtransfer = Command::private2; +} + +#define RECVBUFFERSIZE 4096 +#define MAXLINELEN 2000 + +class CTransferSocket; +class CFtpTransferOpData; +class CFtpRawTransferOpData; +class CTlsSocket; + +struct filezilla_engine_ftp_transfer_end_event; +typedef fz::simple_event TransferEndEvent; + +class CFtpControlSocket final : public CRealControlSocket +{ + friend class CTransferSocket; +public: + CFtpControlSocket(CFileZillaEnginePrivate & engine); + virtual ~CFtpControlSocket(); + + virtual bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification) override; + +protected: + + virtual int ResetOperation(int nErrorCode) override; + + // Implicit FZ_REPLY_CONTINUE + virtual void Connect(CServer const& server, Credentials const& credentials) override; + virtual void List(CServerPath const& path = CServerPath(), std::wstring const& subDir = std::wstring(), int flags = 0) override; + void ChangeDir(CServerPath const& path = CServerPath(), std::wstring const& subDir = std::wstring(), bool link_discovery = false); + virtual void FileTransfer(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const& transferSettings) override; + virtual void RawCommand(std::wstring const& command) override; + virtual void Delete(CServerPath const& path, std::deque&& files) override; + virtual void RemoveDir(CServerPath const& path, std::wstring const& subDir) override; + virtual void Mkdir(CServerPath const& path) override; + virtual void Rename(CRenameCommand const& command) override; + virtual void Chmod(CChmodCommand const& command) override; + void Transfer(std::wstring const& cmd, CFtpTransferOpData* oldData); + + + void TransferEnd(); + + virtual void OnConnect() override; + virtual void OnReceive() override; + + int SendCommand(std::wstring const& str, bool maskArgs = false, bool measureRTT = true); + + // Parse the latest reply line from the server + void ParseLine(std::wstring line); + + // Parse the actual response and delegate it to the handlers. + // It's the last line in a multi-line response. + void ParseResponse(); + + virtual bool CanSendNextCommand() const override; + + int GetReplyCode() const; + + int GetExternalIPAddress(std::string& address); + + void StartKeepaliveTimer(); + + std::wstring m_Response; + std::wstring m_MultilineResponseCode; + std::vector m_MultilineResponseLines; + + std::unique_ptr m_pTransferSocket; + + // Some servers keep track of the offset specified by REST between sessions + // So we always sent a REST 0 for a normal transfer following a restarted one + bool m_sentRestartOffset{}; + + char m_receiveBuffer[RECVBUFFERSIZE]; + int m_bufferLen{}; + int m_repliesToSkip{}; // Set to the amount of pending replies if cancelling an action + + int m_pendingReplies{1}; + + std::unique_ptr m_pIPResolver; + + CTlsSocket* m_pTlsSocket{}; + bool m_protectDataChannel{}; + + int m_lastTypeBinary{-1}; + + // Used by keepalive code so that we're not using keep alive + // till the end of time. Stop after a couple of minutes. + fz::monotonic_clock m_lastCommandCompletionTime; + + fz::timer_id m_idleTimer{}; + + CLatencyMeasurement m_rtt; + + virtual void operator()(fz::event_base const& ev) override; + + void OnExternalIPAddress(); + void OnTimer(fz::timer_id id); + + std::unique_ptr m_pasvReplyRegex; // Have it as class member to avoid recompiling the regex on each transfer or listing + + friend class CProtocolOpData; + friend class CFtpChangeDirOpData; + friend class CFtpChmodOpData; + friend class CFtpDeleteOpData; + friend class CFtpFileTransferOpData; + friend class CFtpListOpData; + friend class CFtpLogonOpData; + friend class CFtpMkdirOpData; + friend class CFtpRawCommandOpData; + friend class CFtpRawTransferOpData; + friend class CFtpRemoveDirOpData; + friend class CFtpRenameOpData; +}; + +typedef CProtocolOpData CFtpOpData; + +class CFtpTransferOpData +{ +public: + CFtpTransferOpData() = default; + virtual ~CFtpTransferOpData() = default; + + TransferEndReason transferEndReason{TransferEndReason::successful}; + bool tranferCommandSent{}; + + int64_t resumeOffset{}; + bool binary{true}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/list.cpp filezilla-3.33.0/src/engine/ftp/list.cpp --- filezilla-3.15.0.2/src/engine/ftp/list.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/list.cpp 2018-05-07 08:20:55.000000000 +0000 @@ -0,0 +1,372 @@ +#include + +#include "../directorycache.h" +#include "../servercapabilities.h" +#include "list.h" +#include "transfersocket.h" + +namespace { +// Some servers are broken. Instead of an empty listing, some MVS servers +// for example they return "550 no members found" +// Other servers return "550 No files found." +bool IsMisleadingListResponse(std::wstring const& response) +{ + // Some servers are broken. Instead of an empty listing, some MVS servers + // for example they return "550 no members found" + // Other servers return "550 No files found." + + if (!fz::stricmp(response, L"550 No members found.")) { + return true; + } + + if (!fz::stricmp(response, L"550 No data sets found.")) { + return true; + } + + if (fz::str_tolower_ascii(response) == L"550 no files found.") { + return true; + } + + return false; +} +} + +CFtpListOpData::CFtpListOpData(CFtpControlSocket & controlSocket, CServerPath const& path, std::wstring const& subDir, int flags, bool topLevel) + : COpData(Command::list) + , CFtpOpData(controlSocket) + , path_(path) + , subDir_(subDir) + , flags_(flags) + , topLevel_(topLevel) +{ + if (path_.GetType() == DEFAULT) { + path_.SetType(currentServer_.GetType()); + } + refresh_ = (flags & LIST_FLAG_REFRESH) != 0; + fallback_to_current_ = !path.empty() && (flags & LIST_FLAG_FALLBACK_CURRENT) != 0; +} + +int CFtpListOpData::Send() +{ + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"CFtpListOpData::ListSend() in state %d", opState); + + if (opState == list_init) { + controlSocket_.ChangeDir(path_, subDir_, (flags_ & LIST_FLAG_LINK)); + opState = list_waitcwd; + return FZ_REPLY_CONTINUE; + } + if (opState == list_waitlock) { + assert(subDir_.empty()); // We did do ChangeDir before trying to lock + + // Check if we can use already existing listing + CDirectoryListing listing; + bool is_outdated = false; + bool found = engine_.GetDirectoryCache().Lookup(listing, currentServer_, currentPath_, false, is_outdated); + if (found && !is_outdated && + (!refresh_ || (holdsLock_ && listing.m_firstListTime >= time_before_locking_))) + { + controlSocket_.SendDirectoryListingNotification(currentPath_, topLevel_, false); + return FZ_REPLY_OK; + } + + if (!holdsLock_) { + if (!controlSocket_.TryLock(locking_reason::list, currentPath_)) { + time_before_locking_ = fz::monotonic_clock::now(); + return FZ_REPLY_WOULDBLOCK; + } + } + + controlSocket_.m_pTransferSocket.reset(); + controlSocket_.m_pTransferSocket = std::make_unique(engine_, controlSocket_, TransferMode::list); + + // Assume that a server supporting UTF-8 does not send EBCDIC listings. + listingEncoding::type encoding = listingEncoding::unknown; + if (CServerCapabilities::GetCapability(currentServer_, utf8_command) == yes) { + encoding = listingEncoding::normal; + } + + listing_parser_ = std::make_unique(&controlSocket_, currentServer_, encoding); + + listing_parser_->SetTimezoneOffset(controlSocket_.GetTimezoneOffset()); + controlSocket_.m_pTransferSocket->m_pDirectoryListingParser = listing_parser_.get(); + + engine_.transfer_status_.Init(-1, 0, true); + + opState = list_waittransfer; + if (CServerCapabilities::GetCapability(currentServer_, mlsd_command) == yes) { + controlSocket_.Transfer(L"MLSD", this); + } + else { + if (engine_.GetOptions().GetOptionVal(OPTION_VIEW_HIDDEN_FILES)) { + capabilities cap = CServerCapabilities::GetCapability(currentServer_, list_hidden_support); + if (cap == unknown) { + viewHiddenCheck_ = true; + } + else if (cap == yes) { + viewHidden_ = true; + } + else { + LogMessage(MessageType::Debug_Info, _("View hidden option set, but unsupported by server")); + } + } + + if (viewHidden_) { + controlSocket_.Transfer(L"LIST -a", this); + } + else { + controlSocket_.Transfer(L"LIST", this); + } + } + return FZ_REPLY_CONTINUE; + } + if (opState == list_mdtm) { + LogMessage(MessageType::Status, _("Calculating timezone offset of server...")); + std::wstring cmd = L"MDTM " + currentPath_.FormatFilename(directoryListing_[mdtm_index_].name, true); + return controlSocket_.SendCommand(cmd); + } + + LogMessage(MessageType::Debug_Warning, L"invalid opstate %d", opState); + return FZ_REPLY_INTERNALERROR; +} + + +int CFtpListOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpListOpData::ParseResponse() in state %d", opState); + + if (opState != list_mdtm) { + LogMessage(MessageType::Debug_Warning, "CFtpListOpData::ParseResponse should never be called if opState != list_mdtm"); + return FZ_REPLY_INTERNALERROR; + } + + std::wstring const& response = controlSocket_.m_Response; + + // First condition prevents problems with concurrent MDTM + if (CServerCapabilities::GetCapability(currentServer_, timezone_offset) == unknown && + response.substr(0, 4) == L"213 " && response.size() > 16) + { + fz::datetime date(response.substr(4), fz::datetime::utc); + if (!date.empty()) { + assert(directoryListing_[mdtm_index_].has_date()); + fz::datetime listTime = directoryListing_[mdtm_index_].time; + listTime -= fz::duration::from_minutes(currentServer_.GetTimezoneOffset()); + + int serveroffset = static_cast((date - listTime).get_seconds()); + if (!directoryListing_[mdtm_index_].has_seconds()) { + // Round offset to full minutes + if (serveroffset < 0) { + serveroffset -= 59; + } + serveroffset -= serveroffset % 60; + } + + LogMessage(MessageType::Status, L"Timezone offset of server is %d seconds.", -serveroffset); + + fz::duration span = fz::duration::from_seconds(serveroffset); + const int count = directoryListing_.GetCount(); + for (int i = 0; i < count; ++i) { + CDirentry& entry = directoryListing_.get(i); + entry.time += span; + } + + // TODO: Correct cached listings + + CServerCapabilities::SetCapability(currentServer_, timezone_offset, yes, serveroffset); + } + else { + CServerCapabilities::SetCapability(currentServer_, mdtm_command, no); + CServerCapabilities::SetCapability(currentServer_, timezone_offset, no); + } + } + else { + CServerCapabilities::SetCapability(currentServer_, timezone_offset, no); + } + + engine_.GetDirectoryCache().Store(directoryListing_, currentServer_); + + controlSocket_.SendDirectoryListingNotification(currentPath_, topLevel_, false); + + return FZ_REPLY_OK; +} + + +int CFtpListOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpListOpData::SubcommandResult() in state %d", opState); + + if (opState == list_waitcwd) { + if (prevResult != FZ_REPLY_OK) { + if ((prevResult & FZ_REPLY_LINKNOTDIR) == FZ_REPLY_LINKNOTDIR) { + return prevResult; + } + + if (fallback_to_current_) { + // List current directory instead + fallback_to_current_ = false; + path_.clear(); + subDir_.clear(); + controlSocket_.ChangeDir(); + return FZ_REPLY_CONTINUE; + } + else { + return prevResult; + } + } + path_ = currentPath_; + subDir_.clear(); + opState = list_waitlock; + return FZ_REPLY_CONTINUE; + } + else if (opState == list_waittransfer) { + if (prevResult == FZ_REPLY_OK) { + CDirectoryListing listing = listing_parser_->Parse(currentPath_); + + if (viewHiddenCheck_) { + if (!viewHidden_) { + // Repeat with LIST -a + viewHidden_ = true; + directoryListing_ = listing; + + // Reset status + transferEndReason = TransferEndReason::successful; + tranferCommandSent = false; + controlSocket_.m_pTransferSocket.reset(); + controlSocket_.m_pTransferSocket = std::make_unique(engine_, controlSocket_, TransferMode::list); + listing_parser_->Reset(); + controlSocket_.m_pTransferSocket->m_pDirectoryListingParser = listing_parser_.get(); + + controlSocket_.Transfer(L"LIST -a", this); + return FZ_REPLY_CONTINUE; + } + else { + if (CheckInclusion(listing, directoryListing_)) { + LogMessage(MessageType::Debug_Info, L"Server seems to support LIST -a"); + CServerCapabilities::SetCapability(currentServer_, list_hidden_support, yes); + } + else { + LogMessage(MessageType::Debug_Info, L"Server does not seem to support LIST -a"); + CServerCapabilities::SetCapability(currentServer_, list_hidden_support, no); + listing = directoryListing_; + } + } + } + + controlSocket_.SetAlive(); + + int res = CheckTimezoneDetection(listing); + if (res != FZ_REPLY_OK) { + return res; + } + + engine_.GetDirectoryCache().Store(listing, currentServer_); + + controlSocket_.SendDirectoryListingNotification(currentPath_, topLevel_, false); + + return FZ_REPLY_OK; + } + else { + if (tranferCommandSent && IsMisleadingListResponse(controlSocket_.m_Response)) { + CDirectoryListing listing; + listing.path = currentPath_; + listing.m_firstListTime = fz::monotonic_clock::now(); + + if (viewHiddenCheck_) { + if (viewHidden_) { + if (directoryListing_.GetCount()) { + // Less files with LIST -a + // Not supported + LogMessage(MessageType::Debug_Info, L"Server does not seem to support LIST -a"); + CServerCapabilities::SetCapability(currentServer_, list_hidden_support, no); + listing = directoryListing_; + } + else { + LogMessage(MessageType::Debug_Info, L"Server seems to support LIST -a"); + CServerCapabilities::SetCapability(currentServer_, list_hidden_support, yes); + } + } + else { + // Reset status + transferEndReason = TransferEndReason::successful; + tranferCommandSent = false; + controlSocket_.m_pTransferSocket.reset(); + controlSocket_.m_pTransferSocket = std::make_unique(engine_, controlSocket_, TransferMode::list); + listing_parser_->Reset(); + controlSocket_.m_pTransferSocket->m_pDirectoryListingParser = listing_parser_.get(); + + // Repeat with LIST -a + viewHidden_ = true; + directoryListing_ = listing; + controlSocket_.Transfer(L"LIST -a", this); + return FZ_REPLY_CONTINUE; + } + } + + int res = CheckTimezoneDetection(listing); + if (res != FZ_REPLY_OK) { + return res; + } + + engine_.GetDirectoryCache().Store(listing, currentServer_); + + controlSocket_.SendDirectoryListingNotification(currentPath_, topLevel_, false); + + return FZ_REPLY_OK; + } + else { + if (viewHiddenCheck_) { + // If server does not support LIST -a, the server might reject this command + // straight away. In this case, back to the previously retrieved listing. + // On other failures like timeouts and such, return an error + if (viewHidden_ && + transferEndReason == TransferEndReason::transfer_command_failure_immediate) + { + CServerCapabilities::SetCapability(currentServer_, list_hidden_support, no); + + int res = CheckTimezoneDetection(directoryListing_); + if (res != FZ_REPLY_OK) { + return res; + } + + engine_.GetDirectoryCache().Store(directoryListing_, currentServer_); + + controlSocket_.SendDirectoryListingNotification(currentPath_, topLevel_, false); + + return FZ_REPLY_OK; + } + } + + if (prevResult & FZ_REPLY_ERROR) { + controlSocket_.SendDirectoryListingNotification(currentPath_, topLevel_, true); + } + } + + return FZ_REPLY_ERROR; + } + } + else { + LogMessage(MessageType::Debug_Warning, L"Wrong opState: %d", opState); + return FZ_REPLY_INTERNALERROR; + } +} + +int CFtpListOpData::CheckTimezoneDetection(CDirectoryListing& listing) +{ + if (CServerCapabilities::GetCapability(currentServer_, timezone_offset) == unknown) { + if (CServerCapabilities::GetCapability(currentServer_, mdtm_command) != yes) { + CServerCapabilities::SetCapability(currentServer_, timezone_offset, no); + } + else { + const int count = listing.GetCount(); + for (int i = 0; i < count; ++i) { + if (!listing[i].is_dir() && listing[i].has_time()) { + opState = list_mdtm; + directoryListing_ = listing; + mdtm_index_ = i; + return FZ_REPLY_CONTINUE; + } + } + } + } + + return FZ_REPLY_OK; +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/list.h filezilla-3.33.0/src/engine/ftp/list.h --- filezilla-3.15.0.2/src/engine/ftp/list.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/list.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,55 @@ +#ifndef FILEZILLA_ENGINE_FTP_LIST_HEADER +#define FILEZILLA_ENGINE_FTP_LIST_HEADER + +#include "directorylistingparser.h" +#include "ftpcontrolsocket.h" + +class CDirectoryListingParser; + +enum listStates +{ + list_init, + list_waitcwd, + list_waitlock, + list_waittransfer, + list_mdtm +}; + +class CFtpListOpData final : public COpData, public CFtpOpData, public CFtpTransferOpData +{ +public: + CFtpListOpData(CFtpControlSocket & controlSocket, CServerPath const& path, std::wstring const& subDir, int flags, bool topLevel); + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + +private: + int CheckTimezoneDetection(CDirectoryListing& listing); + + CServerPath path_; + std::wstring subDir_; + bool fallback_to_current_{}; + + std::unique_ptr listing_parser_; + + CDirectoryListing directoryListing_; + + int flags_{}; + + // Set to true to get a directory listing even if a cache + // lookup can be made after finding out true remote directory + bool refresh_{}; + + bool viewHiddenCheck_{}; + bool viewHidden_{}; // Uses LIST -a command + + // Listing index for list_mdtm + int mdtm_index_{}; + + fz::monotonic_clock time_before_locking_; + + bool topLevel_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/logon.cpp filezilla-3.33.0/src/engine/ftp/logon.cpp --- filezilla-3.15.0.2/src/engine/ftp/logon.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/logon.cpp 2017-06-02 20:38:13.000000000 +0000 @@ -0,0 +1,834 @@ +#include + +#include "logon.h" +#include "../proxy.h" +#include "../servercapabilities.h" +#include "../tlssocket.h" + +CFtpLogonOpData::CFtpLogonOpData(CFtpControlSocket& controlSocket, Credentials const& credentials) + : COpData(Command::connect) + , CFtpOpData(controlSocket) + , credentials_(credentials) +{ + for (int i = 0; i < LOGON_DONE; ++i) { + neededCommands[i] = 1; + } + + if (currentServer_.GetProtocol() != FTPES && currentServer_.GetProtocol() != FTP) { + neededCommands[LOGON_AUTH_TLS] = 0; + neededCommands[LOGON_AUTH_SSL] = 0; + neededCommands[LOGON_AUTH_WAIT] = 0; + if (currentServer_.GetProtocol() != FTPS) { + neededCommands[LOGON_PBSZ] = 0; + neededCommands[LOGON_PROT] = 0; + } + } + if (currentServer_.GetPostLoginCommands().empty()) { + neededCommands[LOGON_CUSTOMCOMMANDS] = 0; + } + + const CharsetEncoding encoding = currentServer_.GetEncodingType(); + if (encoding == ENCODING_AUTO && CServerCapabilities::GetCapability(currentServer_, utf8_command) != no) { + controlSocket_.m_useUTF8 = true; + } + else if (encoding == ENCODING_UTF8) { + controlSocket_.m_useUTF8 = true; + } +} + +int CFtpLogonOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpLogonOpData::Send() in state %d", opState); + + switch (opState) + { + case LOGON_CONNECT: + { + // Do not use FTP proxy if generic proxy is set + int const generic_proxy_type = engine_.GetOptions().GetOptionVal(OPTION_PROXY_TYPE); + if ((generic_proxy_type <= CProxySocket::unknown || generic_proxy_type >= CProxySocket::proxytype_count) && !currentServer_.GetBypassProxy()) { + ftp_proxy_type_ = engine_.GetOptions().GetOptionVal(OPTION_FTP_PROXY_TYPE); + } + + if (!PrepareLoginSequence()) { + return FZ_REPLY_INTERNALERROR; + } + + if (ftp_proxy_type_) { + host_ = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_HOST); + + size_t pos = -1; + if (!host_.empty() && host_[0] == '[') { + // Probably IPv6 address + pos = host_.find(']'); + if (pos == std::wstring::npos) { + LogMessage(MessageType::Error, _("Proxy host starts with '[' but no closing bracket found.")); + return FZ_REPLY_DISCONNECTED | FZ_REPLY_CRITICALERROR; + } + if (host_.size() > (pos + 1) && host_[pos + 1]) { + if (host_[pos + 1] != ':') { + LogMessage(MessageType::Error, _("Invalid proxy host, after closing bracket only colon and port may follow.")); + return FZ_REPLY_DISCONNECTED | FZ_REPLY_CRITICALERROR; + } + ++pos; + } + else { + pos = std::wstring::npos; + } + } + else { + pos = host_.find(':'); + } + + if (pos != std::wstring::npos) { + port_ = fz::to_integral(host_.substr(pos + 1)); + host_ = host_.substr(0, pos); + } + else { + port_ = 21; + } + + if (host_.empty() || port_ < 1 || port_ > 65535) { + LogMessage(MessageType::Error, _("Proxy set but proxy host or port invalid")); + return FZ_REPLY_DISCONNECTED | FZ_REPLY_CRITICALERROR; + } + + LogMessage(MessageType::Status, _("Connecting to %s through %s proxy"), currentServer_.Format(ServerFormat::with_optional_port, credentials_), L"FTP"); // @translator: Connecting to ftp.example.com through SOCKS5 proxy + } + else { + host_ = currentServer_.GetHost(); + port_ = currentServer_.GetPort(); + } + + opState = LOGON_WELCOME; + return controlSocket_.DoConnect(host_, port_); + } + case LOGON_AUTH_WAIT: + LogMessage(MessageType::Debug_Info, L"LogonSend() called during LOGON_AUTH_WAIT, ignoring"); + return FZ_REPLY_WOULDBLOCK; + case LOGON_AUTH_TLS: + return controlSocket_.SendCommand(L"AUTH TLS", false, false); + case LOGON_AUTH_SSL: + return controlSocket_.SendCommand(L"AUTH SSL", false, false); + case LOGON_SYST: + return controlSocket_.SendCommand(L"SYST"); + case LOGON_LOGON: + { + t_loginCommand cmd = loginSequence.front(); + switch (cmd.type) + { + case loginCommandType::user: + if (credentials_.logonType_ == LogonType::interactive) { + waitChallenge = true; + challenge.clear(); + } + + if (cmd.command.empty()) { + return controlSocket_.SendCommand(L"USER " + currentServer_.GetUser()); + } + else { + return controlSocket_.SendCommand(cmd.command); + } + case loginCommandType::pass: + if (!challenge.empty()) { + CInteractiveLoginNotification *pNotification = new CInteractiveLoginNotification(CInteractiveLoginNotification::interactive, challenge, false); + pNotification->server = currentServer_; + pNotification->credentials = credentials_; + challenge.clear(); + + controlSocket_.SendAsyncRequest(pNotification); + + return FZ_REPLY_WOULDBLOCK; + } + + if (cmd.command.empty()) { + return controlSocket_.SendCommand(L"PASS " + credentials_.GetPass(), true); + } + else { + std::wstring c = cmd.command; + std::wstring pass = credentials_.GetPass(); + fz::replace_substrings(pass, L"%", L"%%"); + fz::replace_substrings(c, L"%p", pass); + fz::replace_substrings(c, L"%%", L"%"); + return controlSocket_.SendCommand(c, true); + } + break; + case loginCommandType::account: + if (cmd.command.empty()) { + return controlSocket_.SendCommand(L"ACCT " + credentials_.account_); + } + else { + return controlSocket_.SendCommand(cmd.command); + } + break; + case loginCommandType::other: + assert(!cmd.command.empty()); + return controlSocket_.SendCommand(cmd.command, cmd.hide_arguments); + default: + return FZ_REPLY_INTERNALERROR; + } + } + break; + case LOGON_FEAT: + return controlSocket_.SendCommand(L"FEAT"); + case LOGON_CLNT: + // Some servers refuse to enable UTF8 if client does not send CLNT command + // to fix compatibility with Internet Explorer, but in the process breaking + // compatibility with other clients. + // Rather than forcing MS to fix Internet Explorer, letting other clients + // suffer is a questionable decision in my opinion. + return controlSocket_.SendCommand(L"CLNT FileZilla"); + case LOGON_OPTSUTF8: + // Handle servers that disobey RFC 2640 by having UTF8 in their FEAT + // response but do not use UTF8 unless OPTS UTF8 ON gets send. + // However these servers obey a conflicting ietf draft: + // http://www.ietf.org/proceedings/02nov/I-D/draft-ietf-ftpext-utf-8-option-00.txt + // Example servers are, amongst others, G6 FTP Server and RaidenFTPd. + return controlSocket_.SendCommand(L"OPTS UTF8 ON"); + case LOGON_PBSZ: + return controlSocket_.SendCommand(L"PBSZ 0"); + case LOGON_PROT: + return controlSocket_.SendCommand(L"PROT P"); + case LOGON_CUSTOMCOMMANDS: + if (customCommandIndex >= currentServer_.GetPostLoginCommands().size()) { + LogMessage(MessageType::Debug_Warning, L"pData->customCommandIndex >= m_pCurrentServer->GetPostLoginCommands().size()"); + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED; + } + return controlSocket_.SendCommand(currentServer_.GetPostLoginCommands()[customCommandIndex]); + case LOGON_OPTSMLST: + { + std::wstring args; + CServerCapabilities::GetCapability(currentServer_, opst_mlst_command, &args); + return controlSocket_.SendCommand(L"OPTS MLST " + args); + } + break; + default: + LogMessage(MessageType::Debug_Warning, L"unknown op state: %d", opState); + break; + } + + return FZ_REPLY_INTERNALERROR; +} + +int CFtpLogonOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpLogonOpData::ParseResponse() in state %d", opState); + + int code = controlSocket_.GetReplyCode(); + std::wstring const& response = controlSocket_.m_Response; + + if (opState == LOGON_WELCOME) { + if (code != 2 && code != 3) { + return FZ_REPLY_DISCONNECTED | (code == 5 ? FZ_REPLY_CRITICALERROR : FZ_REPLY_ERROR); + } + } + else if (opState == LOGON_AUTH_TLS || + opState == LOGON_AUTH_SSL) + { + if (code != 2 && code != 3) { + CServerCapabilities::SetCapability(currentServer_, (opState == LOGON_AUTH_TLS) ? auth_tls_command : auth_ssl_command, no); + if (opState == LOGON_AUTH_SSL) { + if (currentServer_.GetProtocol() == FTP) { + // For now. In future make TLS mandatory unless explicitly requested INSECURE_FTP as protocol + LogMessage(MessageType::Status, _("Insecure server, it does not support FTP over TLS.")); + neededCommands[LOGON_PBSZ] = 0; + neededCommands[LOGON_PROT] = 0; + + opState = LOGON_LOGON; + return FZ_REPLY_CONTINUE; + } + else { + return FZ_REPLY_DISCONNECTED | (code == 5 ? FZ_REPLY_CRITICALERROR : FZ_REPLY_ERROR); + } + } + } + else { + CServerCapabilities::SetCapability(currentServer_, (opState == LOGON_AUTH_TLS) ? auth_tls_command : auth_ssl_command, yes); + + LogMessage(MessageType::Status, _("Initializing TLS...")); + + assert(!controlSocket_.m_pTlsSocket); + delete controlSocket_.m_pBackend; + + controlSocket_.m_pTlsSocket = new CTlsSocket(&controlSocket_, *controlSocket_.socket_, &controlSocket_); + controlSocket_.m_pBackend = controlSocket_.m_pTlsSocket; + + if (!controlSocket_.m_pTlsSocket->Init()) { + LogMessage(MessageType::Error, _("Failed to initialize TLS.")); + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED; + } + + int res = controlSocket_.m_pTlsSocket->Handshake(); + if (res & FZ_REPLY_ERROR) { + return res | FZ_REPLY_DISCONNECTED; + } + + neededCommands[LOGON_AUTH_SSL] = 0; + opState = LOGON_AUTH_WAIT; + + return FZ_REPLY_WOULDBLOCK; + } + } + else if (opState == LOGON_LOGON) { + t_loginCommand cmd = loginSequence.front(); + + if (code != 2 && code != 3) { + if (cmd.type == loginCommandType::user || cmd.type == loginCommandType::pass) { + auto const user = currentServer_.GetUser(); + if (!user.empty() && (user.front() == ' ' || user.back() == ' ')) { + LogMessage(MessageType::Status, _("Check your login credentials. The entered username starts or ends with a space character.")); + } + auto const pw = credentials_.GetPass(); + if (!pw.empty() && (pw.front() == ' ' || pw.back() == ' ')) { + LogMessage(MessageType::Status, _("Check your login credentials. The entered password starts or ends with a space character.")); + } + } + + if (currentServer_.GetEncodingType() == ENCODING_AUTO && controlSocket_.m_useUTF8) { + // Fall back to local charset for the case that the server might not + // support UTF8 and the login data contains non-ascii characters. + bool asciiOnly = true; + if (!fz::str_is_ascii(currentServer_.GetUser())) { + asciiOnly = false; + } + if (!fz::str_is_ascii(credentials_.GetPass())) { + asciiOnly = false; + } + if (!fz::str_is_ascii(credentials_.account_)) { + asciiOnly = false; + } + if (!asciiOnly) { + if (ftp_proxy_type_) { + LogMessage(MessageType::Status, _("Login data contains non-ASCII characters and server might not be UTF-8 aware. Cannot fall back to local charset since using proxy.")); + int error = FZ_REPLY_DISCONNECTED | FZ_REPLY_ERROR; + if (cmd.type == loginCommandType::pass && code == 5) { + error |= FZ_REPLY_PASSWORDFAILED; + } + return error; + } + LogMessage(MessageType::Status, _("Login data contains non-ASCII characters and server might not be UTF-8 aware. Trying local charset.")); + controlSocket_.m_useUTF8 = false; + if (!PrepareLoginSequence()) { + int error = FZ_REPLY_DISCONNECTED | FZ_REPLY_ERROR; + if (cmd.type == loginCommandType::pass && code == 5) { + error |= FZ_REPLY_PASSWORDFAILED; + } + return error; + } + return FZ_REPLY_CONTINUE; + } + } + + int error = FZ_REPLY_DISCONNECTED | FZ_REPLY_ERROR; + if (cmd.type == loginCommandType::pass && code == 5) { + error |= FZ_REPLY_CRITICALERROR | FZ_REPLY_PASSWORDFAILED; + } + return error; + } + + loginSequence.pop_front(); + if (code == 2) { + while (!loginSequence.empty() && loginSequence.front().optional) { + loginSequence.pop_front(); + } + } + else if (code == 3 && loginSequence.empty()) { + LogMessage(MessageType::Error, _("Login sequence fully executed yet not logged in, aborting.")); + if (cmd.type == loginCommandType::pass && credentials_.account_.empty()) { + LogMessage(MessageType::Error, _("Server might require an account. Try specifying an account using the Site Manager")); + } + return FZ_REPLY_CRITICALERROR | FZ_REPLY_DISCONNECTED; + } + + if (!loginSequence.empty()) { + waitChallenge = false; + + return FZ_REPLY_CONTINUE; + } + } + else if (opState == LOGON_SYST) { + if (code == 2) { + CServerCapabilities::SetCapability(currentServer_, syst_command, yes, response.substr(4)); + } + else { + CServerCapabilities::SetCapability(currentServer_, syst_command, no); + } + + if (currentServer_.GetType() == DEFAULT && code == 2) { + if (response.size() > 7 && response.substr(3, 4) == L" MVS") { + currentServer_.SetType(MVS); + } + else if (response.size() > 12 && fz::str_toupper_ascii(response.substr(3, 9)) == L" NONSTOP ") { + currentServer_.SetType(HPNONSTOP); + } + + if (!controlSocket_.m_MultilineResponseLines.empty() && fz::str_tolower_ascii(controlSocket_.m_MultilineResponseLines.front().substr(4, 4)) == L"z/vm") { + CServerCapabilities::SetCapability(currentServer_, syst_command, yes, controlSocket_.m_MultilineResponseLines.front().substr(4) + L" " + response.substr(4)); + currentServer_.SetType(ZVM); + } + } + + if (response.find(L"FileZilla") != std::wstring::npos) { + neededCommands[LOGON_CLNT] = 0; + neededCommands[LOGON_OPTSUTF8] = 0; + } + } + else if (opState == LOGON_FEAT) { + if (code == 2) { + CServerCapabilities::SetCapability(currentServer_, feat_command, yes); + if (CServerCapabilities::GetCapability(currentServer_, utf8_command) != yes) { + CServerCapabilities::SetCapability(currentServer_, utf8_command, no); + } + if (CServerCapabilities::GetCapability(currentServer_, clnt_command) != yes) { + CServerCapabilities::SetCapability(currentServer_, clnt_command, no); + } + } + else { + CServerCapabilities::SetCapability(currentServer_, feat_command, no); + } + + if (CServerCapabilities::GetCapability(currentServer_, tvfs_support) != yes) { + CServerCapabilities::SetCapability(currentServer_, tvfs_support, no); + } + + const CharsetEncoding encoding = currentServer_.GetEncodingType(); + if (encoding == ENCODING_AUTO && CServerCapabilities::GetCapability(currentServer_, utf8_command) != yes) { + LogMessage(MessageType::Status, _("Server does not support non-ASCII characters.")); + controlSocket_.m_useUTF8 = false; + } + } + else if (opState == LOGON_PROT) { + if (code == 2 || code == 3) { + controlSocket_.m_protectDataChannel = true; + } + } + else if (opState == LOGON_CUSTOMCOMMANDS) { + ++customCommandIndex; + if (customCommandIndex < currentServer_.GetPostLoginCommands().size()) { + return FZ_REPLY_CONTINUE; + } + } + + for (;;) { + ++opState; + + if (opState == LOGON_DONE) { + LogMessage(MessageType::Status, _("Logged in")); + LogMessage(MessageType::Debug_Info, L"Measured latency of %d ms", controlSocket_.m_rtt.GetLatency()); + return FZ_REPLY_OK; + } + + if (!neededCommands[opState]) { + continue; + } + else if (opState == LOGON_SYST) { + std::wstring system; + capabilities cap = CServerCapabilities::GetCapability(currentServer_, syst_command, &system); + if (cap == unknown) { + break; + } + else if (cap == yes) { + if (currentServer_.GetType() == DEFAULT) { + if (system.substr(0, 3) == L"MVS") { + currentServer_.SetType(MVS); + } + else if (fz::str_toupper_ascii(system.substr(0, 4)) == L"Z/VM") { + currentServer_.SetType(ZVM); + } + else if (fz::str_toupper_ascii(system.substr(0, 8)) == L"NONSTOP ") { + currentServer_.SetType(HPNONSTOP); + } + } + + if (system.find(L"FileZilla") != std::wstring::npos) { + neededCommands[LOGON_CLNT] = 0; + neededCommands[LOGON_OPTSUTF8] = 0; + } + } + } + else if (opState == LOGON_FEAT) { + capabilities cap = CServerCapabilities::GetCapability(currentServer_, feat_command); + if (cap == unknown) { + break; + } + const CharsetEncoding encoding = currentServer_.GetEncodingType(); + if (encoding == ENCODING_AUTO && CServerCapabilities::GetCapability(currentServer_, utf8_command) != yes) { + LogMessage(MessageType::Status, _("Server does not support non-ASCII characters.")); + controlSocket_.m_useUTF8 = false; + } + } + else if (opState == LOGON_CLNT) { + if (!controlSocket_.m_useUTF8) { + continue; + } + + if (CServerCapabilities::GetCapability(currentServer_, clnt_command) == yes) { + break; + } + } + else if (opState == LOGON_OPTSUTF8) { + if (!controlSocket_.m_useUTF8) { + continue; + } + + if (CServerCapabilities::GetCapability(currentServer_, utf8_command) == yes) { + break; + } + } + else if (opState == LOGON_OPTSMLST) { + std::wstring facts; + if (CServerCapabilities::GetCapability(currentServer_, mlsd_command, &facts) != yes) { + continue; + } + capabilities cap = CServerCapabilities::GetCapability(currentServer_, opst_mlst_command); + if (cap == unknown) { + facts = fz::str_tolower_ascii(facts); + + bool had_unset = false; + std::wstring opts_facts; + + // Create a list of all facts understood by both FZ and the server. + // Check if there's any supported fact not enabled by default, should that + // be the case we need to send OPTS MLST + while (!facts.empty()) { + size_t delim = facts.find(';'); + if (delim == std::wstring::npos) { + break; + } + + if (!delim) { + facts = facts.substr(1); + continue; + } + + bool enabled; + std::wstring fact; + + if (facts[delim - 1] == '*') { + if (delim == 1) { + facts = facts.substr(delim + 1); + continue; + } + enabled = true; + fact = facts.substr(0, delim - 1); + } + else { + enabled = false; + fact = facts.substr(0, delim); + } + facts = facts.substr(delim + 1); + + if (fact == L"type" || + fact == L"size" || + fact == L"modify" || + fact == L"perm" || + fact == L"unix.mode" || + fact == L"unix.owner" || + fact == L"unix.ownername" || + fact == L"unix.group" || + fact == L"unix.groupname" || + fact == L"unix.user" || + fact == L"unix.uid" || + fact == L"unix.gid" || + fact == L"x.hidden") + { + had_unset |= !enabled; + opts_facts += fact + L";"; + } + } + + if (had_unset) { + CServerCapabilities::SetCapability(currentServer_, opst_mlst_command, yes, opts_facts); + break; + } + else { + CServerCapabilities::SetCapability(currentServer_, opst_mlst_command, no); + } + } + else if (cap == yes) { + break; + } + } + else { + break; + } + } + + return FZ_REPLY_CONTINUE; +} + +bool CFtpLogonOpData::PrepareLoginSequence() +{ + loginSequence.clear(); + + if (!ftp_proxy_type_) { + // User + t_loginCommand cmd = {false, false, loginCommandType::user, L""}; + loginSequence.push_back(cmd); + + // Password + cmd.optional = true; + cmd.hide_arguments = true; + cmd.type = loginCommandType::pass; + loginSequence.push_back(cmd); + + // Optional account + if (!credentials_.account_.empty()) { + cmd.hide_arguments = false; + cmd.type = loginCommandType::account; + loginSequence.push_back(cmd); + } + } + else if (ftp_proxy_type_ == 1) { + std::wstring const proxyUser = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_USER); + if (!proxyUser.empty()) { + // Proxy logon (if credendials are set) + t_loginCommand cmd = {false, false, loginCommandType::other, L"USER " + proxyUser}; + loginSequence.push_back(cmd); + cmd.optional = true; + cmd.hide_arguments = true; + cmd.command = L"PASS " + engine_.GetOptions().GetOption(OPTION_FTP_PROXY_PASS); + loginSequence.push_back(cmd); + } + // User@host + t_loginCommand cmd = {false, false, loginCommandType::user, fz::sprintf(L"USER %s@%s", currentServer_.GetUser(), currentServer_.Format(ServerFormat::with_optional_port, credentials_))}; + loginSequence.push_back(cmd); + + // Password + cmd.optional = true; + cmd.hide_arguments = true; + cmd.type = loginCommandType::pass; + cmd.command = L""; + loginSequence.push_back(cmd); + + // Optional account + if (!credentials_.account_.empty()) { + cmd.hide_arguments = false; + cmd.type = loginCommandType::account; + loginSequence.push_back(cmd); + } + } + else if (ftp_proxy_type_ == 2 || ftp_proxy_type_ == 3) { + std::wstring const proxyUser = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_USER); + if (!proxyUser.empty()) { + // Proxy logon (if credendials are set) + t_loginCommand cmd = {false, false, loginCommandType::other, L"USER " + proxyUser}; + loginSequence.push_back(cmd); + cmd.optional = true; + cmd.hide_arguments = true; + cmd.command = L"PASS " + engine_.GetOptions().GetOption(OPTION_FTP_PROXY_PASS); + loginSequence.push_back(cmd); + } + + // Site or Open + t_loginCommand cmd = {false, false, loginCommandType::user, L""}; + if (ftp_proxy_type_ == 2) { + cmd.command = L"SITE " + currentServer_.Format(ServerFormat::with_optional_port, credentials_); + } + else { + cmd.command = L"OPEN " + currentServer_.Format(ServerFormat::with_optional_port, credentials_); + } + loginSequence.push_back(cmd); + + // User + cmd.type = loginCommandType::user; + cmd.command = L""; + loginSequence.push_back(cmd); + + // Password + cmd.optional = true; + cmd.hide_arguments = true; + cmd.type = loginCommandType::pass; + loginSequence.push_back(cmd); + + // Optional account + if (!credentials_.account_.empty()) { + cmd.hide_arguments = false; + cmd.type = loginCommandType::account; + loginSequence.push_back(cmd); + } + } + else if (ftp_proxy_type_ == 4) { + std::wstring proxyUser = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_USER); + std::wstring proxyPass = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_PASS); + std::wstring host = currentServer_.Format(ServerFormat::with_optional_port, credentials_); + std::wstring user = currentServer_.GetUser(); + std::wstring account = credentials_.account_; + fz::replace_substrings(proxyUser, L"%", L"%%"); + fz::replace_substrings(proxyPass, L"%", L"%%"); + fz::replace_substrings(host, L"%", L"%%"); + fz::replace_substrings(user, L"%", L"%%"); + fz::replace_substrings(account, L"%", L"%%"); + + std::wstring const loginSequenceStr = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_CUSTOMLOGINSEQUENCE); + std::vector const tokens = fz::strtok(loginSequenceStr, L"\r\n"); + + for (auto token : tokens) { + bool isHost = false; + bool isUser = false; + bool password = false; + bool isProxyUser = false; + bool isProxyPass = false; + if (token.find(L"%h") != token.npos) { + isHost = true; + } + if (token.find(L"%u") != token.npos) { + isUser = true; + } + if (token.find(L"%p") != token.npos) { + password = true; + } + if (token.find(L"%s") != token.npos) { + isProxyUser = true; + } + if (token.find(L"%w") != token.npos) { + isProxyPass = true; + } + + // Skip account if empty + bool isAccount = false; + if (token.find(L"%a") != token.npos) { + if (account.empty()) { + continue; + } + else { + isAccount = true; + } + } + + if (isProxyUser && !isHost && !isUser && proxyUser.empty()) { + continue; + } + if (isProxyPass && !isHost && !isUser && proxyUser.empty()) { + continue; + } + + fz::replace_substrings(token, L"%s", proxyUser); + fz::replace_substrings(token, L"%w", proxyPass); + fz::replace_substrings(token, L"%h", host); + fz::replace_substrings(token, L"%u", user); + fz::replace_substrings(token, L"%a", account); + // Pass will be replaced before sending to cope with interactve login + + if (!password) { + fz::replace_substrings(token, L"%%", L"%"); + } + + t_loginCommand cmd; + if (password || isProxyPass) { + cmd.hide_arguments = true; + } + else { + cmd.hide_arguments = false; + } + + if (isUser && !password && !isAccount) { + cmd.optional = false; + cmd.type = loginCommandType::user; + } + else if (password && !isUser && !isAccount) { + cmd.optional = true; + cmd.type = loginCommandType::pass; + } + else if (isAccount && !isUser && !password) { + cmd.optional = true; + cmd.type = loginCommandType::account; + } + else { + cmd.optional = false; + cmd.type = loginCommandType::other; + } + + cmd.command = token; + + loginSequence.push_back(cmd); + } + + if (loginSequence.empty()) { + LogMessage(MessageType::Error, _("Could not generate custom login sequence.")); + return false; + } + } + else { + LogMessage(MessageType::Error, _("Unknown FTP proxy type, cannot generate login sequence.")); + return false; + } + + return true; +} + +namespace { +bool HasFeature(std::wstring const& line, std::wstring const& feature) +{ + if (line == feature) { + return true; + } + return line.size() > feature.size() && line.substr(0, feature.size()) == feature && line[feature.size()] == ' '; +} +} + +void CFtpLogonOpData::ParseFeat(std::wstring line) +{ + fz::trim(line); + std::wstring up = fz::str_toupper_ascii(line); + + if (HasFeature(up, L"UTF8")) { + CServerCapabilities::SetCapability(currentServer_, utf8_command, yes); + } + else if (HasFeature(up, L"CLNT")) { + CServerCapabilities::SetCapability(currentServer_, clnt_command, yes); + } + else if (HasFeature(up, L"MLSD")) { + std::wstring facts; + // FEAT output for MLST overrides MLSD + if (CServerCapabilities::GetCapability(currentServer_, mlsd_command, &facts) != yes || facts.empty()) { + if (line.size() > 5) { + facts = line.substr(5); + } + else { + facts.clear(); + } + } + CServerCapabilities::SetCapability(currentServer_, mlsd_command, yes, facts); + + // MLST/MLSD specs require use of UTC + CServerCapabilities::SetCapability(currentServer_, timezone_offset, no); + } + else if (HasFeature(up, L"MLST")) { + std::wstring facts; + if (line.size() > 5) { + facts = line.substr(5); + } + // FEAT output for MLST overrides MLSD + if (facts.empty()) { + if (CServerCapabilities::GetCapability(currentServer_, mlsd_command, &facts) != yes) { + facts.clear(); + } + } + CServerCapabilities::SetCapability(currentServer_, mlsd_command, yes, facts); + + // MLST/MLSD specs require use of UTC + CServerCapabilities::SetCapability(currentServer_, timezone_offset, no); + } + else if (HasFeature(up, L"MODE Z")) { + CServerCapabilities::SetCapability(currentServer_, mode_z_support, yes); + } + else if (HasFeature(up, L"MFMT")) { + CServerCapabilities::SetCapability(currentServer_, mfmt_command, yes); + } + else if (HasFeature(up, L"MDTM")) { + CServerCapabilities::SetCapability(currentServer_, mdtm_command, yes); + } + else if (HasFeature(up, L"SIZE")) { + CServerCapabilities::SetCapability(currentServer_, size_command, yes); + } + else if (HasFeature(up, L"TVFS")) { + CServerCapabilities::SetCapability(currentServer_, tvfs_support, yes); + } + else if (HasFeature(up, L"REST STREAM")) { + CServerCapabilities::SetCapability(currentServer_, rest_stream, yes); + } + else if (HasFeature(up, L"EPSV")) { + CServerCapabilities::SetCapability(currentServer_, epsv_command, yes); + } +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/logon.h filezilla-3.33.0/src/engine/ftp/logon.h --- filezilla-3.15.0.2/src/engine/ftp/logon.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/logon.h 2017-06-02 20:38:13.000000000 +0000 @@ -0,0 +1,76 @@ +#ifndef FILEZILLA_ENGINE_FTP_LOGON_HEADER +#define FILEZILLA_ENGINE_FTP_LOGON_HEADER + +#include "ftpcontrolsocket.h" + +enum loginStates +{ + LOGON_CONNECT, + LOGON_WELCOME, + LOGON_AUTH_TLS, + LOGON_AUTH_SSL, + LOGON_AUTH_WAIT, + LOGON_LOGON, + LOGON_SYST, + LOGON_FEAT, + LOGON_CLNT, + LOGON_OPTSUTF8, + LOGON_PBSZ, + LOGON_PROT, + LOGON_OPTSMLST, + LOGON_CUSTOMCOMMANDS, + LOGON_DONE +}; + + +enum class loginCommandType +{ + user, + pass, + account, + other +}; + +struct t_loginCommand +{ + bool optional; + bool hide_arguments; + loginCommandType type; + + std::wstring command; +}; + + +class CFtpLogonOpData final : public COpData, public CFtpOpData +{ +public: + CFtpLogonOpData(CFtpControlSocket& controlSocket, Credentials const& credentials); + + virtual int Send() override; + virtual int ParseResponse() override; + + void ParseFeat(std::wstring line); + + std::wstring challenge; // Used for interactive logons + bool waitChallenge{}; + bool waitForAsyncRequest{}; + bool gotFirstWelcomeLine{}; + Credentials credentials_; + +private: + + bool PrepareLoginSequence(); + + std::wstring host_; + unsigned int port_{}; + + unsigned int customCommandIndex{}; + + int neededCommands[LOGON_DONE]; + + std::deque loginSequence; + + int ftp_proxy_type_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/mkd.cpp filezilla-3.33.0/src/engine/ftp/mkd.cpp --- filezilla-3.15.0.2/src/engine/ftp/mkd.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/mkd.cpp 2018-05-07 08:20:55.000000000 +0000 @@ -0,0 +1,171 @@ +#include + +#include "directorycache.h" +#include "mkd.h" + +enum mkdStates +{ + mkd_init = 0, + mkd_findparent, + mkd_mkdsub, + mkd_cwdsub, + mkd_tryfull +}; + +int CFtpMkdirOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpMkdirOpData::Send() in state %d", opState); + + if (!holdsLock_) { + if (!controlSocket_.TryLock(locking_reason::mkdir, path_)) { + return FZ_REPLY_WOULDBLOCK; + } + } + + switch (opState) + { + case mkd_init: + if (!currentPath_.empty()) { + // Unless the server is broken, a directory already exists if current directory is a subdir of it. + if (currentPath_ == path_ || currentPath_.IsSubdirOf(path_, false)) { + return FZ_REPLY_OK; + } + + if (currentPath_.IsParentOf(path_, false)) { + commonParent_ = currentPath_; + } + else { + commonParent_ = path_.GetCommonParent(currentPath_); + } + } + + if (!path_.HasParent()) { + opState = mkd_tryfull; + } + else { + currentMkdPath_ = path_.GetParent(); + segments_.push_back(path_.GetLastSegment()); + + if (currentMkdPath_ == currentPath_) { + opState = mkd_mkdsub; + } + else { + opState = mkd_findparent; + } + } + return FZ_REPLY_CONTINUE; + case mkd_findparent: + case mkd_cwdsub: + currentPath_.clear(); + return controlSocket_.SendCommand(L"CWD " + currentMkdPath_.GetPath()); + case mkd_mkdsub: + return controlSocket_.SendCommand(L"MKD " + segments_.back()); + case mkd_tryfull: + return controlSocket_.SendCommand(L"MKD " + path_.GetPath()); + default: + LogMessage(MessageType::Debug_Warning, L"unknown op state: %d", opState); + break; + } + + return FZ_REPLY_INTERNALERROR; +} + +int CFtpMkdirOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpMkdirOpData::ParseResonse() in state %d", opState); + + int code = controlSocket_.GetReplyCode(); + switch (opState) { + case mkd_findparent: + if (code == 2 || code == 3) { + currentPath_ = currentMkdPath_; + opState = mkd_mkdsub; + } + else if (currentMkdPath_ == commonParent_) { + opState = mkd_tryfull; + } + else if (currentMkdPath_.HasParent()) { + CServerPath const parent = currentMkdPath_.GetParent(); + segments_.push_back(currentMkdPath_.GetLastSegment()); + currentMkdPath_ = parent; + } + else { + opState = mkd_tryfull; + } + return FZ_REPLY_CONTINUE; + case mkd_mkdsub: + if (code != 2 && code != 3) { + // Don't fall back to using the full path if the error message + // is "already exists". + // Case 1: Full response a known "already exists" message. + // Case 2: Substrng of response contains "already exists". path may not + // contain this substring as the path might be returned in the reply. + // Case 3: Substrng of response contains "file exists". path may not + // contain this substring as the path might be returned in the reply. + std::wstring const response = fz::str_tolower_ascii(controlSocket_.m_Response.substr(4)); + std::wstring const p = fz::str_tolower_ascii(path_.GetPath()); + if (response != L"directory already exists" && + (p.find(L"already exists") != std::wstring::npos || + response.find(L"already exists") == std::wstring::npos) && + (p.find(L"file exists") != std::wstring::npos || + response.find(L"file exists") == std::wstring::npos) + ) + { + opState = mkd_tryfull; + break; + } + } + + { + if (segments_.empty()) { + LogMessage(MessageType::Debug_Warning, L" segments is empty"); + return FZ_REPLY_INTERNALERROR; + } + + // If entry did exist and is a file instead of a directory, report failure. + int result = FZ_REPLY_OK; + if (code != 2 && code != 3) { + CDirentry entry; + bool tmp; + if (engine_.GetDirectoryCache().LookupFile(entry, currentServer_, currentMkdPath_, segments_.back(), tmp, tmp) && !entry.is_dir()) { + result = FZ_REPLY_ERROR; + } + } + + engine_.GetDirectoryCache().UpdateFile(currentServer_, currentMkdPath_, segments_.back(), true, CDirectoryCache::dir); + controlSocket_.SendDirectoryListingNotification(currentMkdPath_, false, false); + + currentMkdPath_.AddSegment(segments_.back()); + segments_.pop_back(); + + if (segments_.empty() || result != FZ_REPLY_OK) { + return result; + } + else { + opState = mkd_cwdsub; + } + } + return FZ_REPLY_CONTINUE; + case mkd_cwdsub: + if (code == 2 || code == 3) { + currentPath_ = currentMkdPath_; + opState = mkd_mkdsub; + } + else { + opState = mkd_tryfull; + } + return FZ_REPLY_CONTINUE; + case mkd_tryfull: + if (code != 2 && code != 3) { + return FZ_REPLY_ERROR; + } + else { + return FZ_REPLY_OK; + } + break; + default: + LogMessage(MessageType::Debug_Warning, L"unknown op state: %d", opState); + } + + return FZ_REPLY_INTERNALERROR; +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/mkd.h filezilla-3.33.0/src/engine/ftp/mkd.h --- filezilla-3.15.0.2/src/engine/ftp/mkd.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/mkd.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef FILEZILLA_ENGINE_FTP_MKD_HEADER +#define FILEZILLA_ENGINE_FTP_MKD_HEADER + +#include "ftpcontrolsocket.h" + +class CFtpMkdirOpData final : public CMkdirOpData, public CFtpOpData +{ +public: + CFtpMkdirOpData(CFtpControlSocket & controlSocket) + : CFtpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/rawcommand.cpp filezilla-3.33.0/src/engine/ftp/rawcommand.cpp --- filezilla-3.15.0.2/src/engine/ftp/rawcommand.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/rawcommand.cpp 2017-02-27 04:30:02.000000000 +0000 @@ -0,0 +1,31 @@ +#include + +#include "rawcommand.h" +#include "../directorycache.h" +#include "../pathcache.h" + +int CFtpRawCommandOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRawCommandOpData::Send() in state %d", opState); + + engine_.GetDirectoryCache().InvalidateServer(currentServer_); + engine_.GetPathCache().InvalidateServer(currentServer_); + currentPath_.clear(); + + controlSocket_.m_lastTypeBinary = -1; + + return controlSocket_.SendCommand(command_, false, false); +} + +int CFtpRawCommandOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRawCommandOpData::ParseResponse() in state %d", opState); + + int code = controlSocket_.GetReplyCode(); + if (code == 2 || code == 3) { + return FZ_REPLY_OK; + } + else { + return FZ_REPLY_ERROR; + } +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/rawcommand.h filezilla-3.33.0/src/engine/ftp/rawcommand.h --- filezilla-3.15.0.2/src/engine/ftp/rawcommand.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/rawcommand.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,22 @@ +#ifndef FILEZILLA_ENGINE_FTP_RAWCOMMAND_HEADER +#define FILEZILLA_ENGINE_FTP_RAWCOMMAND_HEADER + +#include "ftpcontrolsocket.h" + +class CFtpRawCommandOpData final : public COpData, public CFtpOpData +{ +public: + CFtpRawCommandOpData(CFtpControlSocket & controlSocket, std::wstring const& command) + : COpData(Command::raw) + , CFtpOpData(controlSocket) + , command_(command) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + +private: + std::wstring const command_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/rawtransfer.cpp filezilla-3.33.0/src/engine/ftp/rawtransfer.cpp --- filezilla-3.15.0.2/src/engine/ftp/rawtransfer.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/rawtransfer.cpp 2017-04-28 09:58:49.000000000 +0000 @@ -0,0 +1,379 @@ +#include + +#include "rawtransfer.h" +#include "servercapabilities.h" +#include "transfersocket.h" + +#include + +int CFtpRawTransferOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRawTransferOpData::ParseResponse() in state %d", opState); + + if (opState == rawtransfer_init) { + return FZ_REPLY_ERROR; + } + + int const code = controlSocket_.GetReplyCode(); + + bool error = false; + switch (opState) + { + case rawtransfer_type: + if (code != 2 && code != 3) { + error = true; + } + else { + opState = rawtransfer_port_pasv; + controlSocket_.m_lastTypeBinary = pOldData->binary ? 1 : 0; + } + break; + case rawtransfer_port_pasv: + if (code != 2 && code != 3) { + if (!engine_.GetOptions().GetOptionVal(OPTION_ALLOW_TRANSFERMODEFALLBACK)) { + error = true; + break; + } + + if (bTriedPasv) { + if (bTriedActive) { + error = true; + } + else { + bPasv = false; + } + } + else { + bPasv = true; + } + break; + } + if (bPasv) { + bool parsed; + if (GetPassiveCommand() == L"EPSV") { + parsed = ParseEpsvResponse(); + } + else { + parsed = ParsePasvResponse(); + } + if (!parsed) { + if (!engine_.GetOptions().GetOptionVal(OPTION_ALLOW_TRANSFERMODEFALLBACK)) { + error = true; + break; + } + + if (!bTriedActive) { + bPasv = false; + } + else { + error = true; + } + break; + } + } + if (pOldData->resumeOffset > 0 || controlSocket_.m_sentRestartOffset) { + opState = rawtransfer_rest; + } + else { + opState = rawtransfer_transfer; + } + break; + case rawtransfer_rest: + if (pOldData->resumeOffset <= 0) { + controlSocket_.m_sentRestartOffset = false; + } + if (pOldData->resumeOffset > 0 && code != 2 && code != 3) { + error = true; + } + else { + opState = rawtransfer_transfer; + } + break; + case rawtransfer_transfer: + if (code == 1) { + opState = rawtransfer_waitfinish; + } + else if (code == 2 || code == 3) { + // A few broken servers omit the 1yz reply. + opState = rawtransfer_waitsocket; + } + else { + if (pOldData->transferEndReason == TransferEndReason::successful) { + pOldData->transferEndReason = TransferEndReason::transfer_command_failure_immediate; + } + error = true; + } + break; + case rawtransfer_waittransferpre: + if (code == 1) { + opState = rawtransfer_waittransfer; + } + else if (code == 2 || code == 3) { + // A few broken servers omit the 1yz reply. + if (pOldData->transferEndReason != TransferEndReason::successful) { + error = true; + break; + } + + return FZ_REPLY_OK; + } + else { + if (pOldData->transferEndReason == TransferEndReason::successful) { + pOldData->transferEndReason = TransferEndReason::transfer_command_failure_immediate; + } + error = true; + } + break; + case rawtransfer_waitfinish: + if (code != 2 && code != 3) { + if (pOldData->transferEndReason == TransferEndReason::successful) { + pOldData->transferEndReason = TransferEndReason::transfer_command_failure; + } + error = true; + } + else { + opState = rawtransfer_waitsocket; + } + break; + case rawtransfer_waittransfer: + if (code != 2 && code != 3) { + if (pOldData->transferEndReason == TransferEndReason::successful) { + pOldData->transferEndReason = TransferEndReason::transfer_command_failure; + } + error = true; + } + else { + if (pOldData->transferEndReason != TransferEndReason::successful) { + error = true; + break; + } + + return FZ_REPLY_OK; + } + break; + case rawtransfer_waitsocket: + LogMessage(MessageType::Debug_Warning, L"Extra reply received during rawtransfer_waitsocket."); + error = true; + break; + default: + LogMessage(MessageType::Debug_Warning, L"Unknown op state"); + error = true; + } + if (error) { + return FZ_REPLY_ERROR; + } + + return FZ_REPLY_CONTINUE; +} + +int CFtpRawTransferOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRawTransferOpData::Send() in state %d", opState); + + if (!controlSocket_.m_pTransferSocket) { + LogMessage(MessageType::Debug_Info, L"Empty m_pTransferSocket"); + return FZ_REPLY_INTERNALERROR; + } + + std::wstring cmd; + bool measureRTT = false; + switch (opState) + { + case rawtransfer_type: + controlSocket_.m_lastTypeBinary = -1; + if (pOldData->binary) { + cmd = L"TYPE I"; + } + else { + cmd = L"TYPE A"; + } + measureRTT = true; + break; + case rawtransfer_port_pasv: + if (bPasv) { + cmd = GetPassiveCommand(); + } + else { + std::string address; + int res = controlSocket_.GetExternalIPAddress(address); + if (res == FZ_REPLY_WOULDBLOCK) { + return res; + } + else if (res == FZ_REPLY_OK) { + std::wstring portArgument = controlSocket_.m_pTransferSocket->SetupActiveTransfer(address); + if (!portArgument.empty()) { + bTriedActive = true; + if (controlSocket_.socket_->address_family() == fz::address_type::ipv6) { + cmd = L"EPRT " + portArgument; + } + else { + cmd = L"PORT " + portArgument; + } + break; + } + } + + if (!engine_.GetOptions().GetOptionVal(OPTION_ALLOW_TRANSFERMODEFALLBACK) || bTriedPasv) { + LogMessage(MessageType::Error, _("Failed to create listening socket for active mode transfer")); + return FZ_REPLY_ERROR; + } + LogMessage(MessageType::Debug_Warning, _("Failed to create listening socket for active mode transfer")); + bTriedActive = true; + bPasv = true; + cmd = GetPassiveCommand(); + } + break; + case rawtransfer_rest: + cmd = L"REST " + std::to_wstring(pOldData->resumeOffset); + if (pOldData->resumeOffset > 0) { + controlSocket_.m_sentRestartOffset = true; + } + measureRTT = true; + break; + case rawtransfer_transfer: + if (bPasv) { + if (!controlSocket_.m_pTransferSocket->SetupPassiveTransfer(host_, port_)) { + LogMessage(MessageType::Error, _("Could not establish connection to server")); + return FZ_REPLY_ERROR; + } + } + + cmd = cmd_; + pOldData->tranferCommandSent = true; + + engine_.transfer_status_.SetStartTime(); + controlSocket_.m_pTransferSocket->SetActive(); + break; + case rawtransfer_waitfinish: + case rawtransfer_waittransferpre: + case rawtransfer_waittransfer: + case rawtransfer_waitsocket: + break; + default: + LogMessage(MessageType::Debug_Warning, L"invalid opstate"); + return FZ_REPLY_INTERNALERROR; + } + if (!cmd.empty()) { + return controlSocket_.SendCommand(cmd, false, measureRTT); + } + + return FZ_REPLY_WOULDBLOCK; +} + +bool CFtpRawTransferOpData::ParseEpsvResponse() +{ + size_t pos = controlSocket_.m_Response.find(L"(|||"); + if (pos == std::wstring::npos) { + return false; + } + + size_t pos2 = controlSocket_.m_Response.find(L"|)", pos + 4); + if (pos2 == std::wstring::npos || pos2 == pos + 4) { + return false; + } + + std::wstring number = controlSocket_.m_Response.substr(pos + 4, pos2 - pos - 4); + auto port = fz::to_integral(number); + + if (port == 0 || port > 65535) { + return false; + } + + port_ = port; + + if (controlSocket_.m_pProxyBackend) { + host_ = currentServer_.GetHost(); + } + else { + host_ = fz::to_wstring(controlSocket_.socket_->peer_ip()); + } + return true; +} + +bool CFtpRawTransferOpData::ParsePasvResponse() +{ + // Validate ip address + if (!controlSocket_.m_pasvReplyRegex) { + std::wstring digit = L"0*[0-9]{1,3}"; + wchar_t const* const dot = L","; + std::wstring exp = L"( |\\()(" + digit + dot + digit + dot + digit + dot + digit + dot + digit + dot + digit + L")( |\\)|$)"; + controlSocket_.m_pasvReplyRegex = std::make_unique(exp); + } + + std::wsmatch m; + if (!std::regex_search(controlSocket_.m_Response, m, *controlSocket_.m_pasvReplyRegex)) { + return false; + } + + host_ = m[2].str(); + + size_t i = host_.rfind(','); + if (i == std::wstring::npos) { + return false; + } + auto number = fz::to_integral(host_.substr(i + 1)); + if (number > 255) { + return false; + } + + port_ = number; //get ls byte of server socket + host_ = host_.substr(0, i); + i = host_.rfind(','); + if (i == std::string::npos) { + return false; + } + number = fz::to_integral(host_.substr(i + 1)); + if (number > 255) { + return false; + } + + port_ += 256 * number; //add ms byte of server socket + host_ = host_.substr(0, i); + fz::replace_substrings(host_, L",", L"."); + + if (controlSocket_.m_pProxyBackend) { + // We do not have any information about the proxy's inner workings + return true; + } + + std::wstring const peerIP = fz::to_wstring(controlSocket_.socket_->peer_ip()); + if (!fz::is_routable_address(host_) && fz::is_routable_address(peerIP)) { + if (engine_.GetOptions().GetOptionVal(OPTION_PASVREPLYFALLBACKMODE) != 1 || bTriedActive) { + LogMessage(MessageType::Status, _("Server sent passive reply with unroutable address. Using server address instead.")); + LogMessage(MessageType::Debug_Info, L" Reply: %s, peer: %s", host_, peerIP); + host_ = peerIP; + } + else { + LogMessage(MessageType::Status, _("Server sent passive reply with unroutable address. Passive mode failed.")); + LogMessage(MessageType::Debug_Info, L" Reply: %s, peer: %s", host_, peerIP); + return false; + } + } + else if (engine_.GetOptions().GetOptionVal(OPTION_PASVREPLYFALLBACKMODE) == 2) { + // Always use server address + host_ = peerIP; + } + + return true; +} + +std::wstring CFtpRawTransferOpData::GetPassiveCommand() +{ + std::wstring ret = L"PASV"; + + assert(bPasv); + bTriedPasv = true; + + if (controlSocket_.m_pProxyBackend) { + // We don't actually know the address family the other end of the proxy uses to reach the server. Hence prefer EPSV + // if the server supports it. + if (CServerCapabilities::GetCapability(currentServer_, epsv_command) == yes) { + ret = L"EPSV"; + } + } + else if (controlSocket_.socket_->address_family() == fz::address_type::ipv6) { + // EPSV is mandatory for IPv6, don't check capabilities + ret = L"EPSV"; + } + return ret; +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/rawtransfer.h filezilla-3.33.0/src/engine/ftp/rawtransfer.h --- filezilla-3.15.0.2/src/engine/ftp/rawtransfer.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/rawtransfer.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef FILEZILLA_ENGINE_FTP_RAWTRANSFER_HEADER +#define FILEZILLA_ENGINE_FTP_RAWTRANSFER_HEADER + +#include "ftpcontrolsocket.h" + +enum rawtransferStates +{ + rawtransfer_init = 0, + rawtransfer_type, + rawtransfer_port_pasv, + rawtransfer_rest, + rawtransfer_transfer, + rawtransfer_waitfinish, + rawtransfer_waittransferpre, + rawtransfer_waittransfer, + rawtransfer_waitsocket +}; + +class CFtpRawTransferOpData final : public COpData, public CFtpOpData +{ +public: + CFtpRawTransferOpData(CFtpControlSocket& controlSocket) + : COpData(PrivCommand::rawtransfer) + , CFtpOpData(controlSocket) + { + } + + virtual int Send() override; + virtual int ParseResponse() override; + + std::wstring GetPassiveCommand(); + bool ParsePasvResponse(); + bool ParseEpsvResponse(); + + std::wstring cmd_; + + CFtpTransferOpData* pOldData{}; + + bool bPasv{true}; + bool bTriedPasv{}; + bool bTriedActive{}; + + std::wstring host_; + int port_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/rename.cpp filezilla-3.33.0/src/engine/ftp/rename.cpp --- filezilla-3.15.0.2/src/engine/ftp/rename.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/rename.cpp 2017-02-27 04:30:02.000000000 +0000 @@ -0,0 +1,95 @@ +#include + +#include "rename.h" +#include "../directorycache.h" +#include "../pathcache.h" + +enum renameStates +{ + rename_init, + rename_waitcwd, + rename_rnfrom, + rename_rnto +}; + +int CFtpRenameOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRenameOpData::Send() in state %d", opState); + + switch (opState) + { + case rename_init: + controlSocket_.ChangeDir(command_.GetFromPath()); + opState = rename_waitcwd; + return FZ_REPLY_CONTINUE; + case rename_rnfrom: + return controlSocket_.SendCommand(L"RNFR " + command_.GetFromPath().FormatFilename(command_.GetFromFile(), !useAbsolute_)); + case rename_rnto: + { + engine_.GetDirectoryCache().InvalidateFile(currentServer_, command_.GetFromPath(), command_.GetFromFile()); + engine_.GetDirectoryCache().InvalidateFile(currentServer_, command_.GetToPath(), command_.GetToFile()); + + CServerPath path(engine_.GetPathCache().Lookup(currentServer_, command_.GetFromPath(), command_.GetFromFile())); + if (path.empty()) { + path = command_.GetFromPath(); + path.AddSegment(command_.GetFromFile()); + } + engine_.InvalidateCurrentWorkingDirs(path); + + engine_.GetPathCache().InvalidatePath(currentServer_, command_.GetFromPath(), command_.GetFromFile()); + engine_.GetPathCache().InvalidatePath(currentServer_, command_.GetToPath(), command_.GetToFile()); + + return controlSocket_.SendCommand(L"RNTO " + command_.GetToPath().FormatFilename(command_.GetToFile(), !useAbsolute_ && command_.GetFromPath() == command_.GetToPath())); + } + default: + LogMessage(MessageType::Debug_Warning, L"unknown op state: %d", opState); + break; + } + + return FZ_REPLY_INTERNALERROR; +} + +int CFtpRenameOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRenameOpData::ParseResponse() in state %d", opState); + + int code = controlSocket_.GetReplyCode(); + if (code != 2 && code != 3) { + return FZ_REPLY_ERROR; + } + + if (opState == rename_rnfrom) { + opState = rename_rnto; + } + else { + const CServerPath& fromPath = command_.GetFromPath(); + const CServerPath& toPath = command_.GetToPath(); + engine_.GetDirectoryCache().Rename(currentServer_, fromPath, command_.GetFromFile(), toPath, command_.GetToFile()); + + controlSocket_.SendDirectoryListingNotification(fromPath, false, false); + if (fromPath != toPath) { + controlSocket_.SendDirectoryListingNotification(toPath, false, false); + } + + return FZ_REPLY_OK; + } + + return FZ_REPLY_CONTINUE; +} + +int CFtpRenameOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRenameOpData::SubcommandResult() in state %d", opState); + + if (opState == rename_waitcwd) { + if (prevResult != FZ_REPLY_OK) { + useAbsolute_ = true; + } + + opState = rename_rnfrom; + return FZ_REPLY_CONTINUE; + } + else { + return FZ_REPLY_INTERNALERROR; + } +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/rename.h filezilla-3.33.0/src/engine/ftp/rename.h --- filezilla-3.15.0.2/src/engine/ftp/rename.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/rename.h 2017-02-25 04:30:02.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef FILEZILLA_ENGINE_FTP_RENAME_HEADER +#define FILEZILLA_ENGINE_FTP_RENAME_HEADER + +#include "ftpcontrolsocket.h" + +class CFtpRenameOpData final : public COpData, public CFtpOpData +{ +public: + CFtpRenameOpData(CFtpControlSocket & controlSocket, CRenameCommand const& command) + : COpData(Command::rename) + , CFtpOpData(controlSocket) + , command_(command) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const&) override; + + CRenameCommand const command_; + bool useAbsolute_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/rmd.cpp filezilla-3.33.0/src/engine/ftp/rmd.cpp --- filezilla-3.15.0.2/src/engine/ftp/rmd.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/rmd.cpp 2018-01-08 12:51:51.000000000 +0000 @@ -0,0 +1,88 @@ +#include + +#include "rmd.h" +#include "../directorycache.h" +#include "../pathcache.h" + +enum rmdStates +{ + rmd_init, + rmd_waitcwd, + rmd_rmd +}; + +int CFtpRemoveDirOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRemoveDirOpData::Send() in state %d", opState); + + if (opState == rmd_init) { + controlSocket_.ChangeDir(path_); + opState = rmd_waitcwd; + return FZ_REPLY_CONTINUE; + } + else if (opState == rmd_rmd) { + CServerPath path(engine_.GetPathCache().Lookup(currentServer_, path_, subDir_)); + if (path.empty()) { + path = path_; + if (!path.AddSegment(subDir_)) { + LogMessage(MessageType::Error, _("Path cannot be constructed for directory %s and subdir %s"), path_.GetPath(), subDir_); + return FZ_REPLY_ERROR; + } + } + + engine_.GetDirectoryCache().InvalidateFile(currentServer_, path_, subDir_); + + engine_.GetPathCache().InvalidatePath(currentServer_, path_, subDir_); + + engine_.InvalidateCurrentWorkingDirs(path); + + if (omitPath_) { + return controlSocket_.SendCommand(L"RMD " + subDir_); + } + else { + if (!fullPath_.AddSegment(subDir_)) { + LogMessage(MessageType::Error, _("Path cannot be constructed for directory %s and subdir %s"), path_.GetPath(), subDir_); + return FZ_REPLY_ERROR; + } + + return controlSocket_.SendCommand(L"RMD " + fullPath_.GetPath()); + } + } + + LogMessage(MessageType::Debug_Warning, L"Unkown op state %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CFtpRemoveDirOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRemoveDirOpData::ParseResponse() in state %d", opState); + + int code = controlSocket_.GetReplyCode(); + if (code != 2 && code != 3) { + return FZ_REPLY_ERROR; + } + + engine_.GetDirectoryCache().RemoveDir(currentServer_, path_, subDir_, engine_.GetPathCache().Lookup(currentServer_, path_, subDir_)); + controlSocket_.SendDirectoryListingNotification(path_, false, false); + + return FZ_REPLY_OK; +} + +int CFtpRemoveDirOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CFtpRemoveDirOpData::SubcommandResult() in state %d", opState); + + if (opState == rmd_waitcwd) { + if (prevResult != FZ_REPLY_OK) { + omitPath_ = false; + } + else { + path_ = currentPath_; + } + opState = rmd_rmd; + return FZ_REPLY_CONTINUE; + } + else { + return FZ_REPLY_INTERNALERROR; + } +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/rmd.h filezilla-3.33.0/src/engine/ftp/rmd.h --- filezilla-3.15.0.2/src/engine/ftp/rmd.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/rmd.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,25 @@ +#ifndef FILEZILLA_ENGINE_FTP_RMD_HEADER +#define FILEZILLA_ENGINE_FTP_RMD_HEADER + +#include "ftpcontrolsocket.h" +#include "serverpath.h" + +class CFtpRemoveDirOpData final : public COpData, public CFtpOpData +{ +public: + CFtpRemoveDirOpData(CFtpControlSocket & controlSocket) + : COpData(Command::removedir) + , CFtpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const&) override; + + CServerPath path_; + CServerPath fullPath_; + std::wstring subDir_; + bool omitPath_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftp/transfersocket.cpp filezilla-3.33.0/src/engine/ftp/transfersocket.cpp --- filezilla-3.15.0.2/src/engine/ftp/transfersocket.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/transfersocket.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -0,0 +1,856 @@ +#include +#include "directorylistingparser.h" +#include "engineprivate.h" +#include "ftp/ftpcontrolsocket.h" +#include "iothread.h" +#include "optionsbase.h" +#include "tlssocket.h" +#include "transfersocket.h" +#include "proxy.h" +#include "servercapabilities.h" + +#include + +CTransferSocket::CTransferSocket(CFileZillaEnginePrivate & engine, CFtpControlSocket & controlSocket, TransferMode transferMode) +: fz::event_handler(controlSocket.event_loop_) +, engine_(engine) +, controlSocket_(controlSocket) +, m_transferMode(transferMode) +{ +} + +CTransferSocket::~CTransferSocket() +{ + remove_handler(); + if (m_transferEndReason == TransferEndReason::none) { + m_transferEndReason = TransferEndReason::successful; + } + ResetSocket(); + + if (m_transferMode == TransferMode::upload || m_transferMode == TransferMode::download) { + if (ioThread_) { + if (m_transferMode == TransferMode::download) { + FinalizeWrite(); + } + ioThread_->SetEventHandler(nullptr); + } + } +} + +void CTransferSocket::ResetSocket() +{ + delete m_pProxyBackend; + if (m_pBackend == m_pTlsSocket) { + m_pBackend = nullptr; + } + delete m_pTlsSocket; + delete m_pBackend; + socketServer_.reset(); + socket_.reset(); + m_pProxyBackend = nullptr; + m_pTlsSocket = nullptr; + m_pBackend = nullptr; +} + +std::wstring CTransferSocket::SetupActiveTransfer(std::string const& ip) +{ + ResetSocket(); + socketServer_ = CreateSocketServer(); + + if (!socketServer_) { + controlSocket_.LogMessage(MessageType::Debug_Warning, L"CreateSocketServer failed"); + return std::wstring(); + } + + int error; + int port = socketServer_->local_port(error); + if (port == -1) { + ResetSocket(); + + controlSocket_.LogMessage(MessageType::Debug_Warning, L"GetLocalPort failed: %s", fz::socket::error_description(error)); + return std::wstring(); + } + + if (engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS)) { + port += static_cast(engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS_OFFSET)); + if (port <= 0 || port >= 65536) { + controlSocket_.LogMessage(MessageType::Debug_Warning, L"Port outside valid range"); + return std::wstring(); + } + } + + std::wstring portArguments; + if (socketServer_->address_family() == fz::address_type::ipv6) { + portArguments = fz::sprintf(L"|2|%s|%d|", ip, port); + } + else { + portArguments = fz::to_wstring(ip); + fz::replace_substrings(portArguments, L".", L","); + portArguments += fz::sprintf(L",%d,%d", port / 256, port % 256); + } + + return portArguments; +} + +void CTransferSocket::OnSocketEvent(fz::socket_event_source*, fz::socket_event_flag t, int error) +{ + if (m_pProxyBackend) { + switch (t) + { + case fz::socket_event_flag::connection: + { + if (error) { + controlSocket_.LogMessage(MessageType::Error, _("Proxy handshake failed: %s"), fz::socket::error_description(error)); + TransferEnd(TransferEndReason::failure); + } + else { + delete m_pProxyBackend; + m_pProxyBackend = nullptr; + OnConnect(); + } + } + return; + case fz::socket_event_flag::close: + { + controlSocket_.LogMessage(MessageType::Error, _("Proxy handshake failed: %s"), fz::socket::error_description(error)); + TransferEnd(TransferEndReason::failure); + } + return; + default: + // Uninteresting + break; + } + return; + } + + if (socketServer_) { + if (t == fz::socket_event_flag::connection) { + OnAccept(error); + } + else { + controlSocket_.LogMessage(MessageType::Debug_Info, L"Unhandled socket event %d from listening socket", t); + } + return; + } + + switch (t) + { + case fz::socket_event_flag::connection: + if (error) { + if (m_transferEndReason == TransferEndReason::none) { + controlSocket_.LogMessage(MessageType::Error, _("The data connection could not be established: %s"), fz::socket::error_description(error)); + TransferEnd(TransferEndReason::transfer_failure); + } + } + else + OnConnect(); + break; + case fz::socket_event_flag::read: + OnReceive(); + break; + case fz::socket_event_flag::write: + OnSend(); + break; + case fz::socket_event_flag::close: + OnClose(error); + break; + default: + // Uninteresting + break; + } +} + +void CTransferSocket::OnAccept(int error) +{ + controlSocket_.SetAlive(); + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"CTransferSocket::OnAccept(%d)", error); + + if (!socketServer_) { + controlSocket_.LogMessage(MessageType::Debug_Warning, L"No socket server in OnAccept", error); + return; + } + + socket_.reset(socketServer_->accept(error)); + if (!socket_) { + if (error == EAGAIN) { + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"No pending connection"); + } + else { + controlSocket_.LogMessage(MessageType::Status, _("Could not accept connection: %s"), fz::socket::error_description(error)); + TransferEnd(TransferEndReason::transfer_failure); + } + return; + } + socketServer_.reset(); + + OnConnect(); +} + +void CTransferSocket::OnConnect() +{ + controlSocket_.SetAlive(); + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"CTransferSocket::OnConnect"); + + if (!socket_) { + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"CTransferSocket::OnConnect called without socket"); + return; + } + + if (!m_pBackend) { + if (!InitBackend()) { + TransferEnd(TransferEndReason::transfer_failure); + return; + } + } + else if (m_pTlsSocket) { + // Re-enable Nagle algorithm + socket_->set_flags(socket_->flags() & (~fz::socket::flag_nodelay)); + if (CServerCapabilities::GetCapability(controlSocket_.currentServer_, tls_resume) == unknown) { + CServerCapabilities::SetCapability(controlSocket_.currentServer_, tls_resume, m_pTlsSocket->ResumedSession() ? yes : no); + } + } + + if (m_bActive) { + TriggerPostponedEvents(); + } +} + +void CTransferSocket::OnReceive() +{ + controlSocket_.LogMessage(MessageType::Debug_Debug, L"CTransferSocket::OnReceive(), m_transferMode=%d", m_transferMode); + + if (!m_pBackend) { + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"Postponing receive, m_pBackend was false."); + m_postponedReceive = true; + return; + } + + if (!m_bActive) { + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"Postponing receive, m_bActive was false."); + m_postponedReceive = true; + return; + } + + if (m_transferMode == TransferMode::list) { + for (;;) { + char *pBuffer = new char[4096]; + int error; + int numread = m_pBackend->Read(pBuffer, 4096, error); + if (numread < 0) { + delete [] pBuffer; + if (error != EAGAIN) { + controlSocket_.LogMessage(MessageType::Error, L"Could not read from transfer socket: %s", fz::socket::error_description(error)); + TransferEnd(TransferEndReason::transfer_failure); + } + else if (m_onCloseCalled && !m_pBackend->IsWaiting(CRateLimiter::inbound)) { + TransferEnd(TransferEndReason::successful); + } + return; + } + + if (numread > 0) { + if (!m_pDirectoryListingParser->AddData(pBuffer, numread)) { + TransferEnd(TransferEndReason::transfer_failure); + return; + } + + controlSocket_.SetActive(CFileZillaEngine::recv); + if (!m_madeProgress) { + m_madeProgress = 2; + engine_.transfer_status_.SetMadeProgress(); + } + engine_.transfer_status_.Update(numread); + } + else { + delete [] pBuffer; + TransferEnd(TransferEndReason::successful); + return; + } + } + } + else if (m_transferMode == TransferMode::download) { + int error; + int numread; + + // Only do a certain number of iterations in one go to keep the event loop going. + // Otherwise this behaves like a livelock on very large files written to a very fast + // SSD downloaded from a very fast server. + for (int i = 0; i < 100; ++i) { + if (!CheckGetNextWriteBuffer()) { + return; + } + + numread = m_pBackend->Read(m_pTransferBuffer, m_transferBufferLen, error); + if (numread <= 0) { + break; + } + + controlSocket_.SetActive(CFileZillaEngine::recv); + if (!m_madeProgress) { + m_madeProgress = 2; + engine_.transfer_status_.SetMadeProgress(); + } + engine_.transfer_status_.Update(numread); + + m_pTransferBuffer += numread; + m_transferBufferLen -= numread; + } + + if (numread < 0) { + if (error != EAGAIN) { + controlSocket_.LogMessage(MessageType::Error, L"Could not read from transfer socket: %s", fz::socket::error_description(error)); + TransferEnd(TransferEndReason::transfer_failure); + } + else if (m_onCloseCalled && !m_pBackend->IsWaiting(CRateLimiter::inbound)) { + FinalizeWrite(); + } + } + else if (!numread) { + FinalizeWrite(); + } + else { + send_event(m_pBackend, fz::socket_event_flag::read, 0); + } + } + else if (m_transferMode == TransferMode::resumetest) { + for (;;) { + char buffer[2]; + int error; + int numread = m_pBackend->Read(buffer, 2, error); + if (numread < 0) { + if (error != EAGAIN) { + controlSocket_.LogMessage(MessageType::Error, L"Could not read from transfer socket: %s", fz::socket::error_description(error)); + TransferEnd(TransferEndReason::transfer_failure); + } + else if (m_onCloseCalled && !m_pBackend->IsWaiting(CRateLimiter::inbound)) { + if (m_transferBufferLen == 1) { + TransferEnd(TransferEndReason::successful); + } + else { + controlSocket_.LogMessage(MessageType::Debug_Warning, L"Server incorrectly sent %d bytes", m_transferBufferLen); + TransferEnd(TransferEndReason::failed_resumetest); + } + } + return; + } + + if (!numread) { + if (m_transferBufferLen == 1) { + TransferEnd(TransferEndReason::successful); + } + else { + controlSocket_.LogMessage(MessageType::Debug_Warning, L"Server incorrectly sent %d bytes", m_transferBufferLen); + TransferEnd(TransferEndReason::failed_resumetest); + } + return; + } + m_transferBufferLen += numread; + + if (m_transferBufferLen > 1) { + controlSocket_.LogMessage(MessageType::Debug_Warning, L"Server incorrectly sent %d bytes", m_transferBufferLen); + TransferEnd(TransferEndReason::failed_resumetest); + return; + } + } + } +} + +void CTransferSocket::OnSend() +{ + if (!m_pBackend) { + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"OnSend called without backend. Ignoring event."); + return; + } + + if (!m_bActive) { + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"Postponing send"); + m_postponedSend = true; + return; + } + + if (m_transferMode != TransferMode::upload) { + return; + } + + int error; + int written; + + // Only do a certain number of iterations in one go to keep the event loop going. + // Otherwise this behaves like a livelock on very large files read from a very fast + // SSD uploaded to a very fast server. + for (int i = 0; i < 100; ++i) { + if (!CheckGetNextReadBuffer()) { + return; + } + + written = m_pBackend->Write(m_pTransferBuffer, m_transferBufferLen, error); + if (written <= 0) { + break; + } + + controlSocket_.SetActive(CFileZillaEngine::send); + if (m_madeProgress == 1) { + controlSocket_.LogMessage(MessageType::Debug_Debug, L"Made progress in CTransferSocket::OnSend()"); + m_madeProgress = 2; + engine_.transfer_status_.SetMadeProgress(); + } + engine_.transfer_status_.Update(written); + + m_pTransferBuffer += written; + m_transferBufferLen -= written; + } + + if (written < 0) { + if (error == EAGAIN) { + if (!m_madeProgress) { + controlSocket_.LogMessage(MessageType::Debug_Debug, L"First EAGAIN in CTransferSocket::OnSend()"); + m_madeProgress = 1; + engine_.transfer_status_.SetMadeProgress(); + } + } + else { + controlSocket_.LogMessage(MessageType::Error, L"Could not write to transfer socket: %s", fz::socket::error_description(error)); + TransferEnd(TransferEndReason::transfer_failure); + } + } + else if (written > 0) { + send_event(m_pBackend, fz::socket_event_flag::write, 0); + } +} + +void CTransferSocket::OnClose(int error) +{ + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"CTransferSocket::OnClose(%d)", error); + m_onCloseCalled = true; + + if (m_transferEndReason != TransferEndReason::none) { + return; + } + + if (!m_pBackend) { + if (!InitBackend()) { + TransferEnd(TransferEndReason::transfer_failure); + return; + } + } + + if (m_transferMode == TransferMode::upload) { + if (m_shutdown && m_pTlsSocket) { + if (m_pTlsSocket->Shutdown() != 0) { + TransferEnd(TransferEndReason::transfer_failure); + } + else { + TransferEnd(TransferEndReason::successful); + } + } + else { + TransferEnd(TransferEndReason::transfer_failure); + } + return; + } + + if (error) { + controlSocket_.LogMessage(MessageType::Error, _("Transfer connection interrupted: %s"), fz::socket::error_description(error)); + TransferEnd(TransferEndReason::transfer_failure); + return; + } + + char buffer[100]; + int numread = m_pBackend->Peek(&buffer, 100, error); + if (numread > 0) { +#ifndef FZ_WINDOWS + controlSocket_.LogMessage(MessageType::Debug_Warning, L"Peek isn't supposed to return data after close notification"); +#endif + + // MSDN says this: + // FD_CLOSE being posted after all data is read from a socket. + // An application should check for remaining data upon receipt + // of FD_CLOSE to avoid any possibility of losing data. + // First half is actually plain wrong. + OnReceive(); + + return; + } + else if (numread < 0 && error != EAGAIN) { + controlSocket_.LogMessage(MessageType::Error, _("Transfer connection interrupted: %s"), fz::socket::error_description(error)); + TransferEnd(TransferEndReason::transfer_failure); + return; + } + + if (m_transferMode == TransferMode::resumetest) { + if (m_transferBufferLen != 1) { + TransferEnd(TransferEndReason::failed_resumetest); + return; + } + } + if (m_transferMode == TransferMode::download) { + FinalizeWrite(); + } + else { + TransferEnd(TransferEndReason::successful); + } +} + +bool CTransferSocket::SetupPassiveTransfer(std::wstring const& host, int port) +{ + std::string ip; + + ResetSocket(); + + socket_ = std::make_unique(engine_.GetThreadPool(), this); + + if (controlSocket_.m_pProxyBackend) { + m_pProxyBackend = new CProxySocket(this, socket_.get(), &controlSocket_); + + int res = m_pProxyBackend->Handshake(controlSocket_.m_pProxyBackend->GetProxyType(), + host, port, + controlSocket_.m_pProxyBackend->GetUser(), controlSocket_.m_pProxyBackend->GetPass()); + + if (res != EINPROGRESS) { + ResetSocket(); + return false; + } + int error; + ip = controlSocket_.socket_->peer_ip(); + port = controlSocket_.socket_->remote_port(error); + if (ip.empty() || port < 1) { + controlSocket_.LogMessage(MessageType::Debug_Warning, L"Could not get peer address of control connection."); + ResetSocket(); + return false; + } + } + else { + ip = fz::to_utf8(host); + } + + SetSocketBufferSizes(*socket_); + + // Try to bind the source IP of the data connection to the same IP as the control connection. + // We can do so either if + // 1) the destination IP of the data connection matches peer IP of the control connection or + // 2) we are using a proxy. + // + // In case destination IPs of control and data connection are different, do not bind to the + // same source. + + std::string bindAddress; + if (m_pProxyBackend) { + bindAddress = controlSocket_.socket_->local_ip(); + controlSocket_.LogMessage(MessageType::Debug_Info, L"Binding data connection source IP to control connection source IP %s", bindAddress); + } + else { + if (controlSocket_.socket_->peer_ip(true) == ip || controlSocket_.socket_->peer_ip(false) == ip) { + bindAddress = controlSocket_.socket_->local_ip(); + controlSocket_.LogMessage(MessageType::Debug_Info, L"Binding data connection source IP to control connection source IP %s", bindAddress); + } + else { + controlSocket_.LogMessage(MessageType::Debug_Warning, L"Destination IP of data connection does not match peer IP of control connection. Not binding source address of data connection."); + } + } + + int res = socket_->connect(fz::to_native(ip), port, fz::address_type::unknown, bindAddress); + if (res && res != EINPROGRESS) { + ResetSocket(); + return false; + } + + return true; +} + +void CTransferSocket::SetActive() +{ + if (m_transferEndReason != TransferEndReason::none) { + return; + } + if (m_transferMode == TransferMode::download || m_transferMode == TransferMode::upload) { + if (ioThread_) { + ioThread_->SetEventHandler(this); + } + } + + m_bActive = true; + if (!socket_) { + return; + } + + if (socket_->get_state() == fz::socket::connected || socket_->get_state() == fz::socket::closing) { + TriggerPostponedEvents(); + } +} + +void CTransferSocket::TransferEnd(TransferEndReason reason) +{ + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"CTransferSocket::TransferEnd(%d)", reason); + + if (m_transferEndReason != TransferEndReason::none) { + return; + } + m_transferEndReason = reason; + + ResetSocket(); + + controlSocket_.send_event(); +} + +std::unique_ptr CTransferSocket::CreateSocketServer(int port) +{ + auto socket = std::make_unique(engine_.GetThreadPool(), this); + int res = socket->listen(controlSocket_.socket_->address_family(), port); + if (res) { + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"Could not listen on port %d: %s", port, fz::socket::error_description(res)); + socket.reset(); + } + else { + SetSocketBufferSizes(*socket); + } + + return socket; +} + +std::unique_ptr CTransferSocket::CreateSocketServer() +{ + if (!engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS)) { + // Ask the systen for a port + return CreateSocketServer(0); + } + + // Try out all ports in the port range. + // Upon first call, we try to use a random port fist, after that + // increase the port step by step + + // Windows only: I think there's a bug in the socket implementation of + // Windows: Even if using SO_REUSEADDR, using the same local address + // twice will fail unless there are a couple of minutes between the + // connection attempts. This may cause problems if transferring lots of + // files with a narrow port range. + + static int start = 0; + + int low = engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS_LOW); + int high = engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS_HIGH); + if (low > high) { + low = high; + } + + if (start < low || start > high) { + start = static_cast(fz::random_number(low, high)); + assert(start >= low && start <= high); + } + + std::unique_ptr server; + + int count = high - low + 1; + while (count--) { + server = CreateSocketServer(start++); + if (server) { + break; + } + if (start > high) { + start = low; + } + } + + return server; +} + +bool CTransferSocket::CheckGetNextWriteBuffer() +{ + if (!m_transferBufferLen) { + int res = ioThread_->GetNextWriteBuffer(&m_pTransferBuffer); + + if (res == IO_Again) { + return false; + } + else if (res == IO_Error) { + std::wstring error = ioThread_->GetError(); + if (error.empty()) { + controlSocket_.LogMessage(MessageType::Error, _("Can't write data to file.")); + } + else { + controlSocket_.LogMessage(MessageType::Error, _("Can't write data to file: %s"), error); + } + TransferEnd(TransferEndReason::transfer_failure_critical); + return false; + } + + m_transferBufferLen = BUFFERSIZE; + } + + return true; +} + +bool CTransferSocket::CheckGetNextReadBuffer() +{ + if (!m_transferBufferLen) { + int res = ioThread_->GetNextReadBuffer(&m_pTransferBuffer); + if (res == IO_Again) { + return false; + } + else if (res == IO_Error) { + controlSocket_.LogMessage(MessageType::Error, _("Can't read from file")); + TransferEnd(TransferEndReason::transfer_failure); + return false; + } + else if (res == IO_Success) { + if (m_pTlsSocket) { + m_shutdown = true; + + int error = m_pTlsSocket->Shutdown(); + if (error != 0) { + if (error != EAGAIN) { + TransferEnd(TransferEndReason::transfer_failure); + } + return false; + } + } + TransferEnd(TransferEndReason::successful); + return false; + } + m_transferBufferLen = res; + } + + return true; +} + +void CTransferSocket::OnIOThreadEvent() +{ + if (!m_bActive || m_transferEndReason != TransferEndReason::none) { + return; + } + + if (m_transferMode == TransferMode::download) { + OnReceive(); + } + else if (m_transferMode == TransferMode::upload) { + OnSend(); + } +} + +void CTransferSocket::FinalizeWrite() +{ + bool res = ioThread_->Finalize(BUFFERSIZE - m_transferBufferLen); + m_transferBufferLen = BUFFERSIZE; + + if (m_transferEndReason != TransferEndReason::none) { + return; + } + + if (res) { + TransferEnd(TransferEndReason::successful); + } + else { + std::wstring error = ioThread_->GetError(); + if (error.empty()) { + controlSocket_.LogMessage(MessageType::Error, _("Can't write data to file.")); + } + else { + controlSocket_.LogMessage(MessageType::Error, _("Can't write data to file: %s"), error); + } + TransferEnd(TransferEndReason::transfer_failure_critical); + } +} + +bool CTransferSocket::InitTls(const CTlsSocket* pPrimaryTlsSocket) +{ + // Disable Nagle's algorithm during TLS handshake + socket_->set_flags(socket_->flags() | fz::socket::flag_nodelay); + + assert(!m_pBackend); + m_pTlsSocket = new CTlsSocket(this, *socket_, &controlSocket_); + + if (!m_pTlsSocket->Init()) { + delete m_pTlsSocket; + m_pTlsSocket = nullptr; + return false; + } + + bool try_resume = CServerCapabilities::GetCapability(controlSocket_.currentServer_, tls_resume) != no; + + int res = m_pTlsSocket->Handshake(pPrimaryTlsSocket, try_resume); + if (res && res != FZ_REPLY_WOULDBLOCK) { + delete m_pTlsSocket; + m_pTlsSocket = nullptr; + return false; + } + + m_pBackend = m_pTlsSocket; + + return true; +} + +void CTransferSocket::TriggerPostponedEvents() +{ + assert(m_bActive); + + if (m_postponedReceive) { + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"Executing postponed receive"); + m_postponedReceive = false; + OnReceive(); + if (m_transferEndReason != TransferEndReason::none) { + return; + } + } + if (m_postponedSend) { + controlSocket_.LogMessage(MessageType::Debug_Verbose, L"Executing postponed send"); + m_postponedSend = false; + OnSend(); + if (m_transferEndReason != TransferEndReason::none) { + return; + } + } + if (m_onCloseCalled) { + OnClose(0); + } +} + +bool CTransferSocket::InitBackend() +{ + if (m_pBackend) { + return true; + } + +#ifdef FZ_WINDOWS + // For send buffer tuning + add_timer(fz::duration::from_seconds(1), false); +#endif + + if (controlSocket_.m_protectDataChannel) { + if (!InitTls(controlSocket_.m_pTlsSocket)) { + return false; + } + } + else { + m_pBackend = new CSocketBackend(this, *socket_, engine_.GetRateLimiter()); + } + + return true; +} + +void CTransferSocket::SetSocketBufferSizes(fz::socket& socket) +{ + const int size_read = engine_.GetOptions().GetOptionVal(OPTION_SOCKET_BUFFERSIZE_RECV); +#if FZ_WINDOWS + const int size_write = -1; +#else + const int size_write = engine_.GetOptions().GetOptionVal(OPTION_SOCKET_BUFFERSIZE_SEND); +#endif + socket.set_buffer_sizes(size_read, size_write); +} + +void CTransferSocket::operator()(fz::event_base const& ev) +{ + fz::dispatch(ev, this, + &CTransferSocket::OnSocketEvent, + &CTransferSocket::OnIOThreadEvent, + &CTransferSocket::OnTimer); +} + +void CTransferSocket::OnTimer(fz::timer_id) +{ + if (socket_ && socket_->get_state() == fz::socket::connected) { + int const ideal_send_buffer = socket_->ideal_send_buffer_size(); + if (ideal_send_buffer != -1) { + socket_->set_buffer_sizes(-1, ideal_send_buffer); + } + } +} diff -Nru filezilla-3.15.0.2/src/engine/ftp/transfersocket.h filezilla-3.33.0/src/engine/ftp/transfersocket.h --- filezilla-3.15.0.2/src/engine/ftp/transfersocket.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftp/transfersocket.h 2017-09-19 21:36:39.000000000 +0000 @@ -0,0 +1,110 @@ +#ifndef FILEZILLA_ENGINE_FTP_TRANSFERSOCKET_HEADER +#define FILEZILLA_ENGINE_FTP_TRANSFERSOCKET_HEADER + +#include "iothread.h" +#include "backend.h" +#include "ControlSocket.h" + +class CFileZillaEnginePrivate; +class CFtpControlSocket; +class CDirectoryListingParser; + +enum class TransferMode +{ + list, + upload, + download, + resumetest +}; + +class CIOThread; +class CTlsSocket; +class CTransferSocket final : public fz::event_handler +{ +public: + CTransferSocket(CFileZillaEnginePrivate & engine, CFtpControlSocket & controlSocket, TransferMode transferMode); + virtual ~CTransferSocket(); + + std::wstring SetupActiveTransfer(std::string const& ip); + bool SetupPassiveTransfer(std::wstring const& host, int port); + + void SetActive(); + + CDirectoryListingParser *m_pDirectoryListingParser{}; + + bool m_binaryMode{true}; + + TransferEndReason GetTransferEndreason() const { return m_transferEndReason; } + + void SetIOThread(CIOThread* ioThread) { ioThread_ = ioThread; } + +protected: + bool CheckGetNextWriteBuffer(); + bool CheckGetNextReadBuffer(); + void FinalizeWrite(); + + void TransferEnd(TransferEndReason reason); + + bool InitBackend(); + bool InitTls(const CTlsSocket* pPrimaryTlsSocket); + + void ResetSocket(); + + void OnSocketEvent(fz::socket_event_source* source, fz::socket_event_flag t, int error); + void OnConnect(); + void OnAccept(int error); + void OnReceive(); + void OnSend(); + void OnClose(int error); + void OnTimer(fz::timer_id); + + // Create a socket server + std::unique_ptr CreateSocketServer(); + std::unique_ptr CreateSocketServer(int port); + + void SetSocketBufferSizes(fz::socket & socket); + + virtual void operator()(fz::event_base const& ev); + void OnIOThreadEvent(); + + std::unique_ptr socket_{}; + + // Will be set only while creating active mode connections + std::unique_ptr socketServer_; + + CFileZillaEnginePrivate & engine_; + CFtpControlSocket & controlSocket_; + + bool m_bActive{}; + TransferEndReason m_transferEndReason{TransferEndReason::none}; + + TransferMode const m_transferMode; + + char *m_pTransferBuffer{}; + int m_transferBufferLen{}; + + // Set to true if OnClose got called + // We now have to read all available data in the socket, ignoring any + // speed limits + bool m_onCloseCalled{}; + + bool m_postponedReceive{}; + bool m_postponedSend{}; + void TriggerPostponedEvents(); + + CBackend* m_pBackend{}; + + CProxySocket* m_pProxyBackend{}; + + CTlsSocket* m_pTlsSocket{}; + bool m_shutdown{}; + + // Needed for the madeProgress field in CTransferStatus + // Initially 0, 2 if made progress + // On uploads, 1 after first WSAE_WOULDBLOCK + int m_madeProgress{}; + + CIOThread* ioThread_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/ftpcontrolsocket.cpp filezilla-3.33.0/src/engine/ftpcontrolsocket.cpp --- filezilla-3.15.0.2/src/engine/ftpcontrolsocket.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftpcontrolsocket.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,4440 +0,0 @@ -#include - -#include "directorycache.h" -#include "directorylistingparser.h" -#include "engineprivate.h" -#include "externalipresolver.h" -#include "ftpcontrolsocket.h" -#include "iothread.h" -#include "pathcache.h" -#include "servercapabilities.h" -#include "tlssocket.h" -#include "transfersocket.h" -#include "proxy.h" - -#include -#include -#include -#include - -#include -#include -#include - -#include - -#define LOGON_WELCOME 0 -#define LOGON_AUTH_TLS 1 -#define LOGON_AUTH_SSL 2 -#define LOGON_AUTH_WAIT 3 -#define LOGON_LOGON 4 -#define LOGON_SYST 5 -#define LOGON_FEAT 6 -#define LOGON_CLNT 7 -#define LOGON_OPTSUTF8 8 -#define LOGON_PBSZ 9 -#define LOGON_PROT 10 -#define LOGON_OPTSMLST 11 -#define LOGON_CUSTOMCOMMANDS 12 -#define LOGON_DONE 13 - -CRawTransferOpData::CRawTransferOpData() - : COpData(Command::rawtransfer) - , pOldData() - , bPasv(true) - , bTriedPasv() - , bTriedActive() - , port() -{ -} - -CFtpFileTransferOpData::CFtpFileTransferOpData(bool is_download, const wxString& local_file, const wxString& remote_file, const CServerPath& remote_path) - : CFileTransferOpData(is_download, local_file, remote_file, remote_path) -{ -} - -CFtpFileTransferOpData::~CFtpFileTransferOpData() -{ - if (pIOThread) { - CIOThread *pThread = pIOThread; - pIOThread = 0; - pThread->Destroy(); - delete pThread; - } -} - -enum filetransferStates -{ - filetransfer_init = 0, - filetransfer_waitcwd, - filetransfer_waitlist, - filetransfer_size, - filetransfer_mdtm, - filetransfer_resumetest, - filetransfer_transfer, - filetransfer_waittransfer, - filetransfer_waitresumetest, - filetransfer_mfmt -}; - -enum rawtransferStates -{ - rawtransfer_init = 0, - rawtransfer_type, - rawtransfer_port_pasv, - rawtransfer_rest, - rawtransfer_transfer, - rawtransfer_waitfinish, - rawtransfer_waittransferpre, - rawtransfer_waittransfer, - rawtransfer_waitsocket -}; - -enum class loginCommandType -{ - user, - pass, - account, - other -}; - -struct t_loginCommand -{ - bool optional; - bool hide_arguments; - loginCommandType type; - - wxString command; -}; - -class CFtpLogonOpData : public CConnectOpData -{ -public: - CFtpLogonOpData() - { - waitChallenge = false; - gotPassword = false; - waitForAsyncRequest = false; - gotFirstWelcomeLine = false; - ftp_proxy_type = 0; - - customCommandIndex = 0; - - for (int i = 0; i < LOGON_DONE; ++i) - neededCommands[i] = 1; - } - - virtual ~CFtpLogonOpData() - { - } - - wxString challenge; // Used for interactive logons - bool waitChallenge; - bool waitForAsyncRequest; - bool gotPassword; - bool gotFirstWelcomeLine; - - unsigned int customCommandIndex; - - int neededCommands[LOGON_DONE]; - - std::deque loginSequence; - - int ftp_proxy_type; -}; - -class CFtpDeleteOpData final : public COpData -{ -public: - CFtpDeleteOpData() - : COpData(Command::del) - { - } - - virtual ~CFtpDeleteOpData() {} - - CServerPath path; - std::deque files; - bool omitPath{}; - - // Set to fz::datetime::Now initially and after - // sending an updated listing to the UI. - fz::datetime m_time; - - bool m_needSendListing{}; - - // Set to true if deletion of at least one file failed - bool m_deleteFailed{}; -}; - -CFtpControlSocket::CFtpControlSocket(CFileZillaEnginePrivate & engine) - : CRealControlSocket(engine) -{ - m_pIPResolver = 0; - m_pTransferSocket = 0; - m_sentRestartOffset = false; - m_bufferLen = 0; - m_repliesToSkip = 0; - m_pendingReplies = 1; - m_pTlsSocket = 0; - m_protectDataChannel = false; - m_lastTypeBinary = -1; - - // Enable TCP_NODELAY, speeds things up a bit. - // Enable SO_KEEPALIVE, lots of clueless users have broken routers and - // firewalls which terminate the control connection on long transfers. - m_pSocket->SetFlags(CSocket::flag_nodelay | CSocket::flag_keepalive); - - // The GUI and file operations can easily block our thread. But the socket has an - // internal thread. Register read callback to get timely update to rtt. - m_pSocket->SetSynchronousReadCallback(&m_rtt); -} - -CFtpControlSocket::~CFtpControlSocket() -{ - remove_handler(); - m_pSocket->SetSynchronousReadCallback(0); - - DoClose(); -} - -void CFtpControlSocket::OnReceive() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::OnReceive()")); - - for (;;) { - int error; - int read = m_pBackend->Read(m_receiveBuffer + m_bufferLen, RECVBUFFERSIZE - m_bufferLen, error); - - if (read < 0) { - if (error != EAGAIN) { - LogMessage(MessageType::Error, _("Could not read from socket: %s"), CSocket::GetErrorDescription(error)); - if (GetCurrentCommandId() != Command::connect) - LogMessage(MessageType::Error, _("Disconnected from server")); - DoClose(); - } - return; - } - - if (!read) { - LogMessage(MessageType::Error, _("Connection closed by server")); - DoClose(); - return; - } - - SetActive(CFileZillaEngine::recv); - - char* start = m_receiveBuffer; - m_bufferLen += read; - - for (int i = start - m_receiveBuffer; i < m_bufferLen; ++i) { - char& p = m_receiveBuffer[i]; - if (p == '\r' || - p == '\n' || - p == 0) - { - int len = i - (start - m_receiveBuffer); - if (!len) - { - ++start; - continue; - } - - p = 0; - wxString line = ConvToLocal(start, i + 1 - (start - m_receiveBuffer)); - start = m_receiveBuffer + i + 1; - - ParseLine(line); - - // Abort if connection got closed - if (!m_pCurrentServer) - return; - } - } - memmove(m_receiveBuffer, start, m_bufferLen - (start - m_receiveBuffer)); - m_bufferLen -= (start -m_receiveBuffer); - if (m_bufferLen > MAXLINELEN) - m_bufferLen = MAXLINELEN; - } -} - -namespace { -bool HasFeature(wxString const& line, wxString const& feature) -{ - return line == feature || line.StartsWith(feature + _T(" ")); -} -} - -void CFtpControlSocket::ParseFeat(wxString line) -{ - line.Trim(false); - wxString up = line.Upper(); - - if (HasFeature(up, _T("UTF8"))) - CServerCapabilities::SetCapability(*m_pCurrentServer, utf8_command, yes); - else if (HasFeature(up, _T("CLNT"))) - CServerCapabilities::SetCapability(*m_pCurrentServer, clnt_command, yes); - else if (HasFeature(up, _T("MLSD"))) { - wxString facts; - // FEAT output for MLST overrides MLSD - if (CServerCapabilities::GetCapability(*m_pCurrentServer, mlsd_command, &facts) != yes || facts.empty()) { - facts = line.Mid(5); - } - CServerCapabilities::SetCapability(*m_pCurrentServer, mlsd_command, yes, facts); - - // MLST/MLSD specs require use of UTC - CServerCapabilities::SetCapability(*m_pCurrentServer, timezone_offset, no); - } - else if (HasFeature(up, _T("MLST"))) { - wxString facts = line.Mid(5); - // FEAT output for MLST overrides MLSD - if (facts.empty()) { - if (CServerCapabilities::GetCapability(*m_pCurrentServer, mlsd_command, &facts) != yes) { - facts.clear(); - } - } - CServerCapabilities::SetCapability(*m_pCurrentServer, mlsd_command, yes, facts); - - // MLST/MLSD specs require use of UTC - CServerCapabilities::SetCapability(*m_pCurrentServer, timezone_offset, no); - } - else if (HasFeature(up, _T("MODE Z"))) - CServerCapabilities::SetCapability(*m_pCurrentServer, mode_z_support, yes); - else if (HasFeature(up, _T("MFMT"))) - CServerCapabilities::SetCapability(*m_pCurrentServer, mfmt_command, yes); - else if (HasFeature(up, _T("MDTM"))) - CServerCapabilities::SetCapability(*m_pCurrentServer, mdtm_command, yes); - else if (HasFeature(up, _T("SIZE"))) - CServerCapabilities::SetCapability(*m_pCurrentServer, size_command, yes); - else if (HasFeature(up, _T("TVFS"))) - CServerCapabilities::SetCapability(*m_pCurrentServer, tvfs_support, yes); - else if (HasFeature(up, _T("REST STREAM"))) - CServerCapabilities::SetCapability(*m_pCurrentServer, rest_stream, yes); - else if (HasFeature(up, _T("EPSV"))) - CServerCapabilities::SetCapability(*m_pCurrentServer, epsv_command, yes); -} - -void CFtpControlSocket::ParseLine(wxString line) -{ - m_rtt.Stop(); - LogMessageRaw(MessageType::Response, line); - SetAlive(); - - if (m_pCurOpData && m_pCurOpData->opId == Command::connect) { - CFtpLogonOpData* pData = static_cast(m_pCurOpData); - if (pData->waitChallenge) { - wxString& challenge = pData->challenge; - if (!challenge.empty()) -#ifdef __WXMSW__ - challenge += _T("\r\n"); -#else - challenge += _T("\n"); -#endif - challenge += line; - } - else if (pData->opState == LOGON_FEAT) { - ParseFeat(line); - } - else if (pData->opState == LOGON_WELCOME) { - if (!pData->gotFirstWelcomeLine) { - if (line.Upper().Left(3) == _T("SSH")) { - LogMessage(MessageType::Error, _("Cannot establish FTP connection to an SFTP server. Please select proper protocol.")); - DoClose(FZ_REPLY_CRITICALERROR); - return; - } - pData->gotFirstWelcomeLine = true; - } - } - } - //Check for multi-line responses - if (line.Len() > 3) { - if (!m_MultilineResponseCode.empty()) { - if (line.Left(4) == m_MultilineResponseCode) { - // end of multi-line found - m_MultilineResponseCode.clear(); - m_Response = line; - ParseResponse(); - m_Response = _T(""); - m_MultilineResponseLines.clear(); - } - else - m_MultilineResponseLines.push_back(line); - } - // start of new multi-line - else if (line.GetChar(3) == '-') { - // DDD is the end of a multi-line response - m_MultilineResponseCode = line.Left(3) + _T(" "); - m_MultilineResponseLines.push_back(line); - } - else { - m_Response = line; - ParseResponse(); - m_Response = _T(""); - } - } -} - -void CFtpControlSocket::OnConnect() -{ - m_lastTypeBinary = -1; - - SetAlive(); - - if (m_pCurrentServer->GetProtocol() == FTPS) { - if (!m_pTlsSocket) { - LogMessage(MessageType::Status, _("Connection established, initializing TLS...")); - - wxASSERT(!m_pTlsSocket); - delete m_pBackend; - m_pTlsSocket = new CTlsSocket(this, *m_pSocket, this); - m_pBackend = m_pTlsSocket; - - if (!m_pTlsSocket->Init()) { - LogMessage(MessageType::Error, _("Failed to initialize TLS.")); - DoClose(); - return; - } - - int res = m_pTlsSocket->Handshake(); - if (res == FZ_REPLY_ERROR) - DoClose(); - - return; - } - else - LogMessage(MessageType::Status, _("TLS connection established, waiting for welcome message...")); - } - else if ((m_pCurrentServer->GetProtocol() == FTPES || m_pCurrentServer->GetProtocol() == FTP) && m_pTlsSocket) { - LogMessage(MessageType::Status, _("TLS connection established.")); - SendNextCommand(); - return; - } - else - LogMessage(MessageType::Status, _("Connection established, waiting for welcome message...")); - m_pendingReplies = 1; - m_repliesToSkip = 0; - Logon(); -} - -void CFtpControlSocket::ParseResponse() -{ - if( m_Response.empty() ) { - LogMessage(MessageType::Debug_Warning, _T("No reply in ParseResponse")); - return; - } - - if (m_Response[0] != '1') { - if (m_pendingReplies > 0) - m_pendingReplies--; - else { - LogMessage(MessageType::Debug_Warning, _T("Unexpected reply, no reply was pending.")); - return; - } - } - - if (m_repliesToSkip) - { - LogMessage(MessageType::Debug_Info, _T("Skipping reply after cancelled operation or keepalive command.")); - if (m_Response[0] != '1') - m_repliesToSkip--; - - if (!m_repliesToSkip) - { - SetWait(false); - if (!m_pCurOpData) - StartKeepaliveTimer(); - else if (!m_pendingReplies) - SendNextCommand(); - } - - return; - } - - Command commandId = GetCurrentCommandId(); - switch (commandId) - { - case Command::connect: - LogonParseResponse(); - break; - case Command::list: - ListParseResponse(); - break; - case Command::cwd: - ChangeDirParseResponse(); - break; - case Command::transfer: - FileTransferParseResponse(); - break; - case Command::raw: - RawCommandParseResponse(); - break; - case Command::del: - DeleteParseResponse(); - break; - case Command::removedir: - RemoveDirParseResponse(); - break; - case Command::mkdir: - MkdirParseResponse(); - break; - case Command::rename: - RenameParseResponse(); - break; - case Command::chmod: - ChmodParseResponse(); - break; - case Command::rawtransfer: - TransferParseResponse(); - break; - case Command::none: - LogMessage(MessageType::Debug_Verbose, _T("Out-of-order reply, ignoring.")); - break; - default: - LogMessage(MessageType::Debug_Warning, _T("No action for parsing replies to command %d"), (int)commandId); - ResetOperation(FZ_REPLY_INTERNALERROR); - break; - } -} - -bool CFtpControlSocket::GetLoginSequence(const CServer& server) -{ - CFtpLogonOpData *pData = static_cast(m_pCurOpData); - pData->loginSequence.clear(); - - if (!pData->ftp_proxy_type) { - // User - t_loginCommand cmd = {false, false, loginCommandType::user, _T("")}; - pData->loginSequence.push_back(cmd); - - // Password - cmd.optional = true; - cmd.hide_arguments = true; - cmd.type = loginCommandType::pass; - pData->loginSequence.push_back(cmd); - - // Optional account - if (!server.GetAccount().empty()) { - cmd.hide_arguments = false; - cmd.type = loginCommandType::account; - pData->loginSequence.push_back(cmd); - } - } - else if (pData->ftp_proxy_type == 1) { - const wxString& proxyUser = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_USER); - if (!proxyUser.empty()) { - // Proxy logon (if credendials are set) - t_loginCommand cmd = {false, false, loginCommandType::other, _T("USER ") + proxyUser}; - pData->loginSequence.push_back(cmd); - cmd.optional = true; - cmd.hide_arguments = true; - cmd.command = _T("PASS ") + engine_.GetOptions().GetOption(OPTION_FTP_PROXY_PASS); - pData->loginSequence.push_back(cmd); - } - // User@host - t_loginCommand cmd = {false, false, loginCommandType::user, wxString::Format(_T("USER %s@%s"), server.GetUser(), server.FormatHost())}; - pData->loginSequence.push_back(cmd); - - // Password - cmd.optional = true; - cmd.hide_arguments = true; - cmd.type = loginCommandType::pass; - cmd.command = _T(""); - pData->loginSequence.push_back(cmd); - - // Optional account - if (!server.GetAccount().empty()) { - cmd.hide_arguments = false; - cmd.type = loginCommandType::account; - pData->loginSequence.push_back(cmd); - } - } - else if (pData->ftp_proxy_type == 2 || pData->ftp_proxy_type == 3) { - const wxString& proxyUser = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_USER); - if (!proxyUser.empty()) { - // Proxy logon (if credendials are set) - t_loginCommand cmd = {false, false, loginCommandType::other, _T("USER ") + proxyUser}; - pData->loginSequence.push_back(cmd); - cmd.optional = true; - cmd.hide_arguments = true; - cmd.command = _T("PASS ") + engine_.GetOptions().GetOption(OPTION_FTP_PROXY_PASS); - pData->loginSequence.push_back(cmd); - } - - // Site or Open - t_loginCommand cmd = {false, false, loginCommandType::user, _T("")}; - if (pData->ftp_proxy_type == 2) - cmd.command = _T("SITE ") + server.FormatHost(); - else - cmd.command = _T("OPEN ") + server.FormatHost(); - pData->loginSequence.push_back(cmd); - - // User - cmd.type = loginCommandType::user; - cmd.command = _T(""); - pData->loginSequence.push_back(cmd); - - // Password - cmd.optional = true; - cmd.hide_arguments = true; - cmd.type = loginCommandType::pass; - pData->loginSequence.push_back(cmd); - - // Optional account - if (!server.GetAccount().empty()) { - cmd.hide_arguments = false; - cmd.type = loginCommandType::account; - pData->loginSequence.push_back(cmd); - } - } - else if (pData->ftp_proxy_type == 4) { - wxString proxyUser = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_USER); - wxString proxyPass = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_PASS); - wxString host = server.FormatHost(); - wxString user = server.GetUser(); - wxString account = server.GetAccount(); - proxyUser.Replace(_T("%"), _T("%%")); - proxyPass.Replace(_T("%"), _T("%%")); - host.Replace(_T("%"), _T("%%")); - user.Replace(_T("%"), _T("%%")); - account.Replace(_T("%"), _T("%%")); - - wxString loginSequence = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_CUSTOMLOGINSEQUENCE); - wxStringTokenizer tokens(loginSequence, _T("\n"), wxTOKEN_STRTOK); - - while (tokens.HasMoreTokens()) { - wxString token = tokens.GetNextToken(); - token.Trim(true); - token.Trim(false); - - if (token.empty()) - continue; - - bool isHost = false; - bool isUser = false; - bool password = false; - bool isProxyUser = false; - bool isProxyPass = false; - if (token.Find(_T("%h")) != -1) - isHost = true; - if (token.Find(_T("%u")) != -1) - isUser = true; - if (token.Find(_T("%p")) != -1) - password = true; - if (token.Find(_T("%s")) != -1) - isProxyUser = true; - if (token.Find(_T("%w")) != -1) - isProxyPass = true; - - // Skip account if empty - bool isAccount = false; - if (token.Find(_T("%a")) != -1) { - if (account.empty()) - continue; - else - isAccount = true; - } - - if (isProxyUser && !isHost && !isUser && proxyUser.empty()) - continue; - if (isProxyPass && !isHost && !isUser && proxyUser.empty()) - continue; - - token.Replace(_T("%s"), proxyUser); - token.Replace(_T("%w"), proxyPass); - token.Replace(_T("%h"), host); - token.Replace(_T("%u"), user); - token.Replace(_T("%a"), account); - // Pass will be replaced before sending to cope with interactve login - - if (!password) - token.Replace(_T("%%"), _T("%")); - - t_loginCommand cmd; - if (password || isProxyPass) - cmd.hide_arguments = true; - else - cmd.hide_arguments = false; - - if (isUser && !password && !isAccount) { - cmd.optional = false; - cmd.type = loginCommandType::user; - } - else if (password && !isUser && !isAccount) { - cmd.optional = true; - cmd.type = loginCommandType::pass; - } - else if (isAccount && !isUser && !password) { - cmd.optional = true; - cmd.type = loginCommandType::account; - } - else { - cmd.optional = false; - cmd.type = loginCommandType::other; - } - - cmd.command = token; - - pData->loginSequence.push_back(cmd); - } - - if (pData->loginSequence.empty()) { - LogMessage(MessageType::Error, _("Could not generate custom login sequence.")); - return false; - } - } - else { - LogMessage(MessageType::Error, _("Unknown FTP proxy type, cannot generate login sequence.")); - return false; - } - - return true; -} - -int CFtpControlSocket::Logon() -{ - const enum CharsetEncoding encoding = m_pCurrentServer->GetEncodingType(); - if (encoding == ENCODING_AUTO && CServerCapabilities::GetCapability(*m_pCurrentServer, utf8_command) != no) - m_useUTF8 = true; - else if (encoding == ENCODING_UTF8) - m_useUTF8 = true; - - return FZ_REPLY_WOULDBLOCK; -} - -int CFtpControlSocket::LogonParseResponse() -{ - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("LogonParseResponse without m_pCurOpData called")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_INTERNALERROR; - } - - CFtpLogonOpData *pData = static_cast(m_pCurOpData); - - int code = GetReplyCode(); - - if (pData->opState == LOGON_WELCOME) { - if (code != 2 && code != 3) { - DoClose(code == 5 ? FZ_REPLY_CRITICALERROR : 0); - return FZ_REPLY_DISCONNECTED; - } - } - else if (pData->opState == LOGON_AUTH_TLS || - pData->opState == LOGON_AUTH_SSL) - { - if (code != 2 && code != 3) { - CServerCapabilities::SetCapability(*m_pCurrentServer, (pData->opState == LOGON_AUTH_TLS) ? auth_tls_command : auth_ssl_command, no); - if (pData->opState == LOGON_AUTH_SSL) { - if (m_pCurrentServer->GetProtocol() == FTP) { - // For now. In future make TLS mandatory unless explicitly requested INSECURE_FTP as protocol - LogMessage(MessageType::Status, _("Insecure server, it does not support FTP over TLS.")); - pData->neededCommands[LOGON_PBSZ] = 0; - pData->neededCommands[LOGON_PROT] = 0; - - pData->opState = LOGON_LOGON; - return SendNextCommand(); - } - else { - DoClose(code == 5 ? FZ_REPLY_CRITICALERROR : 0); - return FZ_REPLY_DISCONNECTED; - } - } - } - else { - CServerCapabilities::SetCapability(*m_pCurrentServer, (pData->opState == LOGON_AUTH_TLS) ? auth_tls_command : auth_ssl_command, yes); - - LogMessage(MessageType::Status, _("Initializing TLS...")); - - wxASSERT(!m_pTlsSocket); - delete m_pBackend; - - m_pTlsSocket = new CTlsSocket(this, *m_pSocket, this); - m_pBackend = m_pTlsSocket; - - if (!m_pTlsSocket->Init()) { - LogMessage(MessageType::Error, _("Failed to initialize TLS.")); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - int res = m_pTlsSocket->Handshake(); - if (res == FZ_REPLY_ERROR) { - DoClose(); - return FZ_REPLY_ERROR; - } - - pData->neededCommands[LOGON_AUTH_SSL] = 0; - pData->opState = LOGON_AUTH_WAIT; - - if (res == FZ_REPLY_WOULDBLOCK) - return FZ_REPLY_WOULDBLOCK; - } - } - else if (pData->opState == LOGON_LOGON) { - t_loginCommand cmd = pData->loginSequence.front(); - - if (code != 2 && code != 3) { - if( cmd.type == loginCommandType::user || cmd.type == loginCommandType::pass ) { - wxString const user = m_pCurrentServer->GetUser(); - if( user.StartsWith(_T(" ")) || user.EndsWith(_T(" ")) ) { - LogMessage(MessageType::Status, _("Check your login credentials. The entered username starts or ends with a space character.")); - } - wxString const pw = m_pCurrentServer->GetPass(); - if( pw.StartsWith(_T(" ")) || pw.EndsWith(_T(" ")) ) { - LogMessage(MessageType::Status, _("Check your login credentials. The entered password starts or ends with a space character.")); - } - } - - if (m_pCurrentServer->GetEncodingType() == ENCODING_AUTO && m_useUTF8) - { - // Fall back to local charset for the case that the server might not - // support UTF8 and the login data contains non-ascii characters. - bool asciiOnly = true; - for (unsigned int i = 0; i < m_pCurrentServer->GetUser().Length(); ++i) - if ((unsigned int)m_pCurrentServer->GetUser()[i] > 127) - asciiOnly = false; - for (unsigned int i = 0; i < m_pCurrentServer->GetPass().Length(); ++i) - if ((unsigned int)m_pCurrentServer->GetPass()[i] > 127) - asciiOnly = false; - for (unsigned int i = 0; i < m_pCurrentServer->GetAccount().Length(); ++i) - if ((unsigned int)m_pCurrentServer->GetAccount()[i] > 127) - asciiOnly = false; - if (!asciiOnly) { - if (pData->ftp_proxy_type) { - LogMessage(MessageType::Status, _("Login data contains non-ASCII characters and server might not be UTF-8 aware. Cannot fall back to local charset since using proxy.")); - int error = FZ_REPLY_DISCONNECTED; - if (cmd.type == loginCommandType::pass && code == 5) - error |= FZ_REPLY_PASSWORDFAILED; - DoClose(error); - return FZ_REPLY_ERROR; - } - LogMessage(MessageType::Status, _("Login data contains non-ASCII characters and server might not be UTF-8 aware. Trying local charset.")); - m_useUTF8 = false; - if (!GetLoginSequence(*m_pCurrentServer)) - { - int error = FZ_REPLY_DISCONNECTED; - if (cmd.type == loginCommandType::pass && code == 5) - error |= FZ_REPLY_PASSWORDFAILED; - DoClose(error); - return FZ_REPLY_ERROR; - } - return SendNextCommand(); - } - } - - int error = FZ_REPLY_DISCONNECTED; - if (cmd.type == loginCommandType::pass && code == 5) - error |= FZ_REPLY_CRITICALERROR | FZ_REPLY_PASSWORDFAILED; - DoClose(error); - return FZ_REPLY_ERROR; - } - - pData->loginSequence.pop_front(); - if (code == 2) { - while (!pData->loginSequence.empty() && pData->loginSequence.front().optional) - pData->loginSequence.pop_front(); - } - else if (code == 3 && pData->loginSequence.empty()) { - LogMessage(MessageType::Error, _("Login sequence fully executed yet not logged in. Aborting.")); - if (cmd.type == loginCommandType::pass && m_pCurrentServer->GetAccount().empty()) - LogMessage(MessageType::Error, _("Server might require an account. Try specifying an account using the Site Manager")); - DoClose(FZ_REPLY_CRITICALERROR); - return FZ_REPLY_ERROR; - } - - if (!pData->loginSequence.empty()) { - pData->waitChallenge = false; - - return SendNextCommand(); - } - } - else if (pData->opState == LOGON_SYST) { - if (code == 2) - CServerCapabilities::SetCapability(*GetCurrentServer(), syst_command, yes, m_Response.Mid(4)); - else - CServerCapabilities::SetCapability(*GetCurrentServer(), syst_command, no); - - if (m_pCurrentServer->GetType() == DEFAULT && code == 2) { - if (m_Response.Length() > 7 && m_Response.Mid(3, 4) == _T(" MVS")) - m_pCurrentServer->SetType(MVS); - else if (m_Response.Len() > 12 && m_Response.Mid(3, 9).Upper() == _T(" NONSTOP ")) - m_pCurrentServer->SetType(HPNONSTOP); - - if (!m_MultilineResponseLines.empty() && m_MultilineResponseLines.front().Mid(4, 4).Upper() == _T("Z/VM")) { - CServerCapabilities::SetCapability(*GetCurrentServer(), syst_command, yes, m_MultilineResponseLines.front().Mid(4) + _T(" ") + m_Response.Mid(4)); - m_pCurrentServer->SetType(ZVM); - } - } - - if (m_Response.Find(_T("FileZilla")) != -1) { - pData->neededCommands[LOGON_CLNT] = 0; - pData->neededCommands[LOGON_OPTSUTF8] = 0; - } - } - else if (pData->opState == LOGON_FEAT) { - if (code == 2) { - CServerCapabilities::SetCapability(*GetCurrentServer(), feat_command, yes); - if (CServerCapabilities::GetCapability(*m_pCurrentServer, utf8_command) != yes) - CServerCapabilities::SetCapability(*m_pCurrentServer, utf8_command, no); - if (CServerCapabilities::GetCapability(*m_pCurrentServer, clnt_command) != yes) - CServerCapabilities::SetCapability(*m_pCurrentServer, clnt_command, no); - } - else - CServerCapabilities::SetCapability(*GetCurrentServer(), feat_command, no); - - if (CServerCapabilities::GetCapability(*m_pCurrentServer, tvfs_support) != yes) - CServerCapabilities::SetCapability(*m_pCurrentServer, tvfs_support, no); - - const enum CharsetEncoding encoding = m_pCurrentServer->GetEncodingType(); - if (encoding == ENCODING_AUTO && CServerCapabilities::GetCapability(*m_pCurrentServer, utf8_command) != yes) - { - LogMessage(MessageType::Status, _("Server does not support non-ASCII characters.")); - m_useUTF8 = false; - } - } - else if (pData->opState == LOGON_PROT) { - if (code == 2 || code == 3) - m_protectDataChannel = true; - } - else if (pData->opState == LOGON_CUSTOMCOMMANDS) { - ++pData->customCommandIndex; - if (pData->customCommandIndex < m_pCurrentServer->GetPostLoginCommands().size()) - return SendNextCommand(); - } - - for (;;) { - ++pData->opState; - - if (pData->opState == LOGON_DONE) { - LogMessage(MessageType::Status, _("Logged in")); - ResetOperation(FZ_REPLY_OK); - LogMessage(MessageType::Debug_Info, _T("Measured latency of %d ms"), m_rtt.GetLatency()); - return true; - } - - if (!pData->neededCommands[pData->opState]) - continue; - else if (pData->opState == LOGON_SYST) { - wxString system; - enum capabilities cap = CServerCapabilities::GetCapability(*GetCurrentServer(), syst_command, &system); - if (cap == unknown) - break; - else if (cap == yes) { - if (m_pCurrentServer->GetType() == DEFAULT) { - if (system.Left(3) == _T("MVS")) - m_pCurrentServer->SetType(MVS); - else if (system.Left(4).Upper() == _T("Z/VM")) - m_pCurrentServer->SetType(ZVM); - else if (system.Left(8).Upper() == _T("NONSTOP ")) - m_pCurrentServer->SetType(HPNONSTOP); - } - - if (system.Find(_T("FileZilla")) != -1) { - pData->neededCommands[LOGON_CLNT] = 0; - pData->neededCommands[LOGON_OPTSUTF8] = 0; - } - } - } - else if (pData->opState == LOGON_FEAT) { - enum capabilities cap = CServerCapabilities::GetCapability(*GetCurrentServer(), feat_command); - if (cap == unknown) - break; - const enum CharsetEncoding encoding = m_pCurrentServer->GetEncodingType(); - if (encoding == ENCODING_AUTO && CServerCapabilities::GetCapability(*m_pCurrentServer, utf8_command) != yes) { - LogMessage(MessageType::Status, _("Server does not support non-ASCII characters.")); - m_useUTF8 = false; - } - } - else if (pData->opState == LOGON_CLNT) { - if (!m_useUTF8) - continue; - - if (CServerCapabilities::GetCapability(*GetCurrentServer(), clnt_command) == yes) - break; - } - else if (pData->opState == LOGON_OPTSUTF8) { - if (!m_useUTF8) - continue; - - if (CServerCapabilities::GetCapability(*GetCurrentServer(), utf8_command) == yes) - break; - } - else if (pData->opState == LOGON_OPTSMLST) { - wxString facts; - if (CServerCapabilities::GetCapability(*GetCurrentServer(), mlsd_command, &facts) != yes) - continue; - capabilities cap = CServerCapabilities::GetCapability(*GetCurrentServer(), opst_mlst_command); - if (cap == unknown) { - facts = fz::str_tolower_ascii(facts); - - bool had_unset = false; - wxString opts_facts; - - // Create a list of all facts understood by both FZ and the server. - // Check if there's any supported fact not enabled by default, should that - // be the case we need to send OPTS MLST - while (!facts.empty()) { - int delim = facts.Find(';'); - if (delim == -1) - break; - - if (!delim) { - facts = facts.Mid(1); - continue; - } - - bool enabled; - wxString fact; - - if (facts[delim - 1] == '*') { - if (delim == 1) { - facts = facts.Mid(delim + 1); - continue; - } - enabled = true; - fact = facts.Left(delim - 1); - } - else { - enabled = false; - fact = facts.Left(delim); - } - facts = facts.Mid(delim + 1); - - if (fact == _T("type") || - fact == _T("size") || - fact == _T("modify") || - fact == _T("perm") || - fact == _T("unix.mode") || - fact == _T("unix.owner") || - fact == _T("unix.user") || - fact == _T("unix.group") || - fact == _T("unix.uid") || - fact == _T("unix.gid") || - fact == _T("x.hidden")) - { - had_unset |= !enabled; - opts_facts += fact + _T(";"); - } - } - - if (had_unset) { - CServerCapabilities::SetCapability(*GetCurrentServer(), opst_mlst_command, yes, opts_facts); - break; - } - else - CServerCapabilities::SetCapability(*GetCurrentServer(), opst_mlst_command, no); - } - else if (cap == yes) - break; - } - else - break; - } - - return SendNextCommand(); -} - -int CFtpControlSocket::LogonSend() -{ - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("LogonParseResponse without m_pCurOpData called")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_INTERNALERROR; - } - - CFtpLogonOpData *pData = static_cast(m_pCurOpData); - - bool res; - switch (pData->opState) - { - case LOGON_AUTH_WAIT: - res = FZ_REPLY_WOULDBLOCK; - LogMessage(MessageType::Debug_Info, _T("LogonSend() called during LOGON_AUTH_WAIT, ignoring")); - break; - case LOGON_AUTH_TLS: - res = SendCommand(_T("AUTH TLS"), false, false); - break; - case LOGON_AUTH_SSL: - res = SendCommand(_T("AUTH SSL"), false, false); - break; - case LOGON_SYST: - res = SendCommand(_T("SYST")); - break; - case LOGON_LOGON: - { - t_loginCommand cmd = pData->loginSequence.front(); - switch (cmd.type) - { - case loginCommandType::user: - if (m_pCurrentServer->GetLogonType() == INTERACTIVE) { - pData->waitChallenge = true; - pData->challenge = _T(""); - } - - if (cmd.command.empty()) - res = SendCommand(_T("USER ") + m_pCurrentServer->GetUser()); - else - res = SendCommand(cmd.command); - break; - case loginCommandType::pass: - if (!pData->challenge.empty()) { - CInteractiveLoginNotification *pNotification = new CInteractiveLoginNotification(CInteractiveLoginNotification::interactive, pData->challenge, false); - pNotification->server = *m_pCurrentServer; - pData->challenge = _T(""); - - SendAsyncRequest(pNotification); - - return FZ_REPLY_WOULDBLOCK; - } - - if (cmd.command.empty()) - res = SendCommand(_T("PASS ") + m_pCurrentServer->GetPass(), true); - else { - wxString c = cmd.command; - wxString pass = m_pCurrentServer->GetPass(); - pass.Replace(_T("%"), _T("%%")); - c.Replace(_T("%p"), pass); - c.Replace(_T("%%"), _T("%")); - res = SendCommand(c, true); - } - break; - case loginCommandType::account: - if (cmd.command.empty()) - res = SendCommand(_T("ACCT ") + m_pCurrentServer->GetAccount()); - else - res = SendCommand(cmd.command); - break; - case loginCommandType::other: - wxASSERT(!cmd.command.empty()); - res = SendCommand(cmd.command, cmd.hide_arguments); - break; - default: - res = false; - break; - } - } - break; - case LOGON_FEAT: - res = SendCommand(_T("FEAT")); - break; - case LOGON_CLNT: - // Some servers refuse to enable UTF8 if client does not send CLNT command - // to fix compatibility with Internet Explorer, but in the process breaking - // compatibility with other clients. - // Rather than forcing MS to fix Internet Explorer, letting other clients - // suffer is a questionable decision in my opinion. - res = SendCommand(_T("CLNT FileZilla")); - break; - case LOGON_OPTSUTF8: - // Handle servers that disobey RFC 2640 by having UTF8 in their FEAT - // response but do not use UTF8 unless OPTS UTF8 ON gets send. - // However these servers obey a conflicting ietf draft: - // http://www.ietf.org/proceedings/02nov/I-D/draft-ietf-ftpext-utf-8-option-00.txt - // Example servers are, amongst others, G6 FTP Server and RaidenFTPd. - res = SendCommand(_T("OPTS UTF8 ON")); - break; - case LOGON_PBSZ: - res = SendCommand(_T("PBSZ 0")); - break; - case LOGON_PROT: - res = SendCommand(_T("PROT P")); - break; - case LOGON_CUSTOMCOMMANDS: - if (pData->customCommandIndex >= m_pCurrentServer->GetPostLoginCommands().size()) - { - LogMessage(MessageType::Debug_Warning, _T("pData->customCommandIndex >= m_pCurrentServer->GetPostLoginCommands().size()")); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - res = SendCommand(m_pCurrentServer->GetPostLoginCommands()[pData->customCommandIndex]); - break; - case LOGON_OPTSMLST: - { - wxString args; - CServerCapabilities::GetCapability(*GetCurrentServer(), opst_mlst_command, &args); - res = SendCommand(_T("OPTS MLST " + args)); - } - break; - default: - return FZ_REPLY_ERROR; - } - - if (!res) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -int CFtpControlSocket::GetReplyCode() const -{ - if (m_Response.empty()) { - return 0; - } - else if (m_Response[0] < '0' || m_Response[0] > '9') { - return 0; - } - else { - return m_Response[0] - '0'; - } -} - -bool CFtpControlSocket::SendCommand(wxString const& str, bool maskArgs, bool measureRTT) -{ - int pos; - if (maskArgs && (pos = str.Find(_T(" "))) != -1) - { - wxString stars('*', str.Length() - pos - 1); - LogMessageRaw(MessageType::Command, str.Left(pos + 1) + stars); - } - else - LogMessageRaw(MessageType::Command, str); - - wxCharBuffer buffer = ConvToServer(str + _T("\r\n")); - if (!buffer) - { - LogMessage(MessageType::Error, _T("Failed to convert command to 8 bit charset")); - return false; - } - unsigned int len = (unsigned int)strlen(buffer); - bool res = CRealControlSocket::Send(buffer, len); - if (res) - ++m_pendingReplies; - - if (measureRTT) - m_rtt.Start(); - - return res; -} - -class CFtpListOpData : public COpData, public CFtpTransferOpData -{ -public: - CFtpListOpData() - : COpData(Command::list) - , fallback_to_current() - , m_pDirectoryListingParser() - , refresh() - , viewHiddenCheck() - , viewHidden() - , mdtm_index() - { - } - - virtual ~CFtpListOpData() - { - delete m_pDirectoryListingParser; - } - - CServerPath path; - wxString subDir; - bool fallback_to_current; - - CDirectoryListingParser* m_pDirectoryListingParser; - - CDirectoryListing directoryListing; - - // Set to true to get a directory listing even if a cache - // lookup can be made after finding out true remote directory - bool refresh; - - bool viewHiddenCheck; - bool viewHidden; // Uses LIST -a command - - // Listing index for list_mdtm - int mdtm_index; - - fz::monotonic_clock m_time_before_locking; -}; - -enum listStates -{ - list_init = 0, - list_waitcwd, - list_waitlock, - list_waittransfer, - list_mdtm -}; - -int CFtpControlSocket::List(CServerPath path /*=CServerPath()*/, wxString subDir /*=_T("")*/, int flags /*=0*/) -{ - CServerPath newPath = m_CurrentPath; - if (!path.empty()) { - newPath = path; - } - if (!newPath.ChangePath(subDir)) { - newPath.clear(); - } - - if (newPath.empty()) { - LogMessage(MessageType::Status, _("Retrieving directory listing...")); - } - else { - LogMessage(MessageType::Status, _("Retrieving directory listing of \"%s\"..."), newPath.GetPath()); - } - - if (m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("List called from other command")); - } - CFtpListOpData *pData = new CFtpListOpData; - pData->pNextOpData = m_pCurOpData; - m_pCurOpData = pData; - - pData->opState = list_waitcwd; - - if (path.GetType() == DEFAULT) - path.SetType(m_pCurrentServer->GetType()); - pData->path = path; - pData->subDir = subDir; - pData->refresh = (flags & LIST_FLAG_REFRESH) != 0; - pData->fallback_to_current = !path.empty() && (flags & LIST_FLAG_FALLBACK_CURRENT) != 0; - - int res = ChangeDir(path, subDir, (flags & LIST_FLAG_LINK) != 0); - if (res != FZ_REPLY_OK) - return res; - - return ParseSubcommandResult(FZ_REPLY_OK); -} - -int CFtpControlSocket::ListSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::ListSubcommandResult()")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpListOpData *pData = static_cast(m_pCurOpData); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - if (pData->opState == list_waitcwd) { - if (prevResult != FZ_REPLY_OK) { - if (prevResult & FZ_REPLY_LINKNOTDIR) { - ResetOperation(prevResult); - return FZ_REPLY_ERROR; - } - - if (pData->fallback_to_current) { - // List current directory instead - pData->fallback_to_current = false; - pData->path.clear(); - pData->subDir = _T(""); - int res = ChangeDir(); - if (res != FZ_REPLY_OK) - return res; - } - else { - ResetOperation(prevResult); - return FZ_REPLY_ERROR; - } - } - if (pData->path.empty()) { - pData->path = m_CurrentPath; - wxASSERT(pData->subDir.empty()); - wxASSERT(!pData->path.empty()); - } - - if (!pData->refresh) { - wxASSERT(!pData->pNextOpData); - - // Do a cache lookup now that we know the correct directory - int hasUnsureEntries; - bool is_outdated = false; - bool found = engine_.GetDirectoryCache().DoesExist(*m_pCurrentServer, m_CurrentPath, hasUnsureEntries, is_outdated); - if (found) { - // We're done if listing is recent and has no outdated entries - if (!is_outdated && !hasUnsureEntries) { - engine_.SendDirectoryListingNotification(m_CurrentPath, true, false, false); - - ResetOperation(FZ_REPLY_OK); - - return FZ_REPLY_OK; - } - } - } - - if (!pData->holdsLock) { - if (!TryLockCache(lock_list, m_CurrentPath)) { - pData->opState = list_waitlock; - pData->m_time_before_locking = fz::monotonic_clock::now(); - return FZ_REPLY_WOULDBLOCK; - } - } - - delete m_pTransferSocket; - m_pTransferSocket = new CTransferSocket(engine_, *this, TransferMode::list); - - // Assume that a server supporting UTF-8 does not send EBCDIC listings. - listingEncoding::type encoding = listingEncoding::unknown; - if (CServerCapabilities::GetCapability(*m_pCurrentServer, utf8_command) == yes) - encoding = listingEncoding::normal; - - pData->m_pDirectoryListingParser = new CDirectoryListingParser(this, *m_pCurrentServer, encoding); - - pData->m_pDirectoryListingParser->SetTimezoneOffset(GetTimezoneOffset()); - m_pTransferSocket->m_pDirectoryListingParser = pData->m_pDirectoryListingParser; - - engine_.transfer_status_.Init(-1, 0, true); - - pData->opState = list_waittransfer; - if (CServerCapabilities::GetCapability(*m_pCurrentServer, mlsd_command) == yes) - return Transfer(_T("MLSD"), pData); - else { - if (engine_.GetOptions().GetOptionVal(OPTION_VIEW_HIDDEN_FILES)) { - enum capabilities cap = CServerCapabilities::GetCapability(*m_pCurrentServer, list_hidden_support); - if (cap == unknown) - pData->viewHiddenCheck = true; - else if (cap == yes) - pData->viewHidden = true; - else - LogMessage(MessageType::Debug_Info, _("View hidden option set, but unsupported by server")); - } - - if (pData->viewHidden) - return Transfer(_T("LIST -a"), pData); - else - return Transfer(_T("LIST"), pData); - } - } - else if (pData->opState == list_waittransfer) { - if (prevResult == FZ_REPLY_OK) { - CDirectoryListing listing = pData->m_pDirectoryListingParser->Parse(m_CurrentPath); - - if (pData->viewHiddenCheck) { - if (!pData->viewHidden) { - // Repeat with LIST -a - pData->viewHidden = true; - pData->directoryListing = listing; - - // Reset status - pData->transferEndReason = TransferEndReason::successful; - pData->tranferCommandSent = false; - delete m_pTransferSocket; - m_pTransferSocket = new CTransferSocket(engine_, *this, TransferMode::list); - pData->m_pDirectoryListingParser->Reset(); - m_pTransferSocket->m_pDirectoryListingParser = pData->m_pDirectoryListingParser; - - return Transfer(_T("LIST -a"), pData); - } - else { - if (CheckInclusion(listing, pData->directoryListing)) { - LogMessage(MessageType::Debug_Info, _T("Server seems to support LIST -a")); - CServerCapabilities::SetCapability(*m_pCurrentServer, list_hidden_support, yes); - } - else { - LogMessage(MessageType::Debug_Info, _T("Server does not seem to support LIST -a")); - CServerCapabilities::SetCapability(*m_pCurrentServer, list_hidden_support, no); - listing = pData->directoryListing; - } - } - } - - SetAlive(); - - int res = ListCheckTimezoneDetection(listing); - if (res != FZ_REPLY_OK) - return res; - - engine_.GetDirectoryCache().Store(listing, *m_pCurrentServer); - - engine_.SendDirectoryListingNotification(m_CurrentPath, !pData->pNextOpData, true, false); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else { - if (pData->tranferCommandSent && IsMisleadingListResponse()) { - CDirectoryListing listing; - listing.path = m_CurrentPath; - listing.m_firstListTime = fz::monotonic_clock::now(); - - if (pData->viewHiddenCheck) { - if (pData->viewHidden) { - if (pData->directoryListing.GetCount()) { - // Less files with LIST -a - // Not supported - LogMessage(MessageType::Debug_Info, _T("Server does not seem to support LIST -a")); - CServerCapabilities::SetCapability(*m_pCurrentServer, list_hidden_support, no); - listing = pData->directoryListing; - } - else { - LogMessage(MessageType::Debug_Info, _T("Server seems to support LIST -a")); - CServerCapabilities::SetCapability(*m_pCurrentServer, list_hidden_support, yes); - } - } - else { - // Reset status - pData->transferEndReason = TransferEndReason::successful; - pData->tranferCommandSent = false; - delete m_pTransferSocket; - m_pTransferSocket = new CTransferSocket(engine_, *this, TransferMode::list); - pData->m_pDirectoryListingParser->Reset(); - m_pTransferSocket->m_pDirectoryListingParser = pData->m_pDirectoryListingParser; - - // Repeat with LIST -a - pData->viewHidden = true; - pData->directoryListing = listing; - return Transfer(_T("LIST -a"), pData); - } - } - - int res = ListCheckTimezoneDetection(listing); - if (res != FZ_REPLY_OK) - return res; - - engine_.GetDirectoryCache().Store(listing, *m_pCurrentServer); - - engine_.SendDirectoryListingNotification(m_CurrentPath, !pData->pNextOpData, true, false); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else { - if (pData->viewHiddenCheck) { - // If server does not support LIST -a, the server might reject this command - // straight away. In this case, back to the previously retrieved listing. - // On other failures like timeouts and such, return an error - if (pData->viewHidden && - pData->transferEndReason == TransferEndReason::transfer_command_failure_immediate) - { - CServerCapabilities::SetCapability(*m_pCurrentServer, list_hidden_support, no); - - int res = ListCheckTimezoneDetection(pData->directoryListing); - if (res != FZ_REPLY_OK) - return res; - - engine_.GetDirectoryCache().Store(pData->directoryListing, *m_pCurrentServer); - - engine_.SendDirectoryListingNotification(m_CurrentPath, !pData->pNextOpData, true, false); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - } - - if (prevResult & FZ_REPLY_ERROR) - engine_.SendDirectoryListingNotification(m_CurrentPath, !pData->pNextOpData, true, true); - } - - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - } - else { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Wrong opState: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } -} - -int CFtpControlSocket::ListSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::ListSend()")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpListOpData *pData = static_cast(m_pCurOpData); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - if (pData->opState == list_waitlock) { - if (!pData->holdsLock) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Not holding the lock as expected")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - // Check if we can use already existing listing - CDirectoryListing listing; - bool is_outdated = false; - wxASSERT(pData->subDir.empty()); // Did do ChangeDir before trying to lock - bool found = engine_.GetDirectoryCache().Lookup(listing, *m_pCurrentServer, pData->path, true, is_outdated); - if (found && !is_outdated && !listing.get_unsure_flags() && - listing.m_firstListTime >= pData->m_time_before_locking) - { - engine_.SendDirectoryListingNotification(listing.path, !pData->pNextOpData, false, false); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - - pData->opState = list_waitcwd; - - return ListSubcommandResult(FZ_REPLY_OK); - } - if (pData->opState == list_mdtm) { - LogMessage(MessageType::Status, _("Calculating timezone offset of server...")); - wxString cmd = _T("MDTM ") + m_CurrentPath.FormatFilename(pData->directoryListing[pData->mdtm_index].name, true); - if (!SendCommand(cmd)) - return FZ_REPLY_ERROR; - else - return FZ_REPLY_WOULDBLOCK; - } - - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("invalid opstate")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; -} - -int CFtpControlSocket::ListParseResponse() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::ListParseResponse()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpListOpData *pData = static_cast(m_pCurOpData); - - if (pData->opState != list_mdtm) { - LogMessage(MessageType::Debug_Warning, _T("ListParseResponse should never be called if opState != list_mdtm")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - - // First condition prevents problems with concurrent MDTM - if (CServerCapabilities::GetCapability(*m_pCurrentServer, timezone_offset) == unknown && - m_Response.Left(4) == _T("213 ") && m_Response.Length() > 16) - { - fz::datetime date(m_Response.Mid(4).ToStdWstring(), fz::datetime::utc); - if (date.empty()) { - wxASSERT(pData->directoryListing[pData->mdtm_index].has_date()); - fz::datetime listTime = pData->directoryListing[pData->mdtm_index].time; - listTime -= fz::duration::from_minutes(m_pCurrentServer->GetTimezoneOffset()); - - int serveroffset = static_cast((date - listTime).get_seconds()); - if (!pData->directoryListing[pData->mdtm_index].has_seconds()) { - // Round offset to full minutes - if (serveroffset < 0) - serveroffset -= 59; - serveroffset -= serveroffset % 60; - } - - LogMessage(MessageType::Status, _("Timezone offset of server is %d seconds."), -serveroffset); - - fz::duration span = fz::duration::from_seconds(serveroffset); - const int count = pData->directoryListing.GetCount(); - for (int i = 0; i < count; ++i) { - CDirentry& entry = pData->directoryListing[i]; - entry.time += span; - } - - // TODO: Correct cached listings - - CServerCapabilities::SetCapability(*m_pCurrentServer, timezone_offset, yes, serveroffset); - } - else { - CServerCapabilities::SetCapability(*m_pCurrentServer, mdtm_command, no); - CServerCapabilities::SetCapability(*m_pCurrentServer, timezone_offset, no); - } - } - else - CServerCapabilities::SetCapability(*m_pCurrentServer, timezone_offset, no); - - engine_.GetDirectoryCache().Store(pData->directoryListing, *m_pCurrentServer); - - engine_.SendDirectoryListingNotification(m_CurrentPath, !pData->pNextOpData, true, false); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; -} - -int CFtpControlSocket::ListCheckTimezoneDetection(CDirectoryListing& listing) -{ - wxASSERT(m_pCurOpData); - - CFtpListOpData *pData = static_cast(m_pCurOpData); - - if (CServerCapabilities::GetCapability(*m_pCurrentServer, timezone_offset) == unknown) - { - if (CServerCapabilities::GetCapability(*m_pCurrentServer, mdtm_command) != yes) - CServerCapabilities::SetCapability(*m_pCurrentServer, timezone_offset, no); - else - { - const int count = listing.GetCount(); - for (int i = 0; i < count; ++i) { - if (!listing[i].is_dir() && listing[i].has_time()) { - pData->opState = list_mdtm; - pData->directoryListing = listing; - pData->mdtm_index = i; - return SendNextCommand(); - } - } - } - } - - return FZ_REPLY_OK; -} - -int CFtpControlSocket::ResetOperation(int nErrorCode) -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::ResetOperation(%d)"), nErrorCode); - - CTransferSocket* pTransferSocket = m_pTransferSocket; - m_pTransferSocket = 0; - delete pTransferSocket; - delete m_pIPResolver; - m_pIPResolver = 0; - - m_repliesToSkip = m_pendingReplies; - - if (m_pCurOpData && m_pCurOpData->opId == Command::transfer) { - CFtpFileTransferOpData *pData = static_cast(m_pCurOpData); - if (pData->tranferCommandSent) { - if (pData->transferEndReason == TransferEndReason::transfer_failure_critical) - nErrorCode |= FZ_REPLY_CRITICALERROR | FZ_REPLY_WRITEFAILED; - if (pData->transferEndReason != TransferEndReason::transfer_command_failure_immediate || GetReplyCode() != 5) - pData->transferInitiated = true; - else { - if (nErrorCode == FZ_REPLY_ERROR) - nErrorCode |= FZ_REPLY_CRITICALERROR; - } - } - if (nErrorCode != FZ_REPLY_OK && pData->download && !pData->fileDidExist) { - delete pData->pIOThread; - pData->pIOThread = 0; - int64_t size; - bool isLink; - if (fz::local_filesys::get_file_info(fz::to_native(pData->localFile), isLink, &size, 0, 0) == fz::local_filesys::file && size == 0) { - // Download failed and a new local file was created before, but - // nothing has been written to it. Remove it again, so we don't - // leave a bunch of empty files all over the place. - LogMessage(MessageType::Debug_Verbose, _T("Deleting empty file")); - wxRemoveFile(pData->localFile); - } - } - } - if (m_pCurOpData && m_pCurOpData->opId == Command::del && !(nErrorCode & FZ_REPLY_DISCONNECTED)) { - CFtpDeleteOpData *pData = static_cast(m_pCurOpData); - if (pData->m_needSendListing) - engine_.SendDirectoryListingNotification(pData->path, false, true, false); - } - - if (m_pCurOpData && m_pCurOpData->opId == Command::rawtransfer && - nErrorCode != FZ_REPLY_OK) - { - CRawTransferOpData *pData = static_cast(m_pCurOpData); - if (pData->pOldData->transferEndReason == TransferEndReason::successful) - { - if ((nErrorCode & FZ_REPLY_TIMEOUT) == FZ_REPLY_TIMEOUT) - pData->pOldData->transferEndReason = TransferEndReason::timeout; - else if (!pData->pOldData->tranferCommandSent) - pData->pOldData->transferEndReason = TransferEndReason::pre_transfer_command_failure; - else - pData->pOldData->transferEndReason = TransferEndReason::failure; - } - } - - m_lastCommandCompletionTime = fz::monotonic_clock::now(); - if (m_pCurOpData && !(nErrorCode & FZ_REPLY_DISCONNECTED)) - StartKeepaliveTimer(); - else { - stop_timer(m_idleTimer); - m_idleTimer = 0; - } - - return CControlSocket::ResetOperation(nErrorCode); -} - -int CFtpControlSocket::SendNextCommand() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::SendNextCommand()")); - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("SendNextCommand called without active operation")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (m_pCurOpData->waitForAsyncRequest) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Waiting for async request, ignoring SendNextCommand...")); - return FZ_REPLY_WOULDBLOCK; - } - - if (m_repliesToSkip) - { - LogMessage(MessageType::Status, _T("Waiting for replies to skip before sending next command...")); - SetWait(true); - return FZ_REPLY_WOULDBLOCK; - } - - switch (m_pCurOpData->opId) - { - case Command::list: - return ListSend(); - case Command::connect: - return LogonSend(); - case Command::cwd: - return ChangeDirSend(); - case Command::transfer: - return FileTransferSend(); - case Command::mkdir: - return MkdirSend(); - case Command::rename: - return RenameSend(); - case Command::chmod: - return ChmodSend(); - case Command::rawtransfer: - return TransferSend(); - case Command::raw: - return RawCommandSend(); - case Command::del: - return DeleteSend(); - case Command::removedir: - return RemoveDirSend(); - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown opID (%d) in SendNextCommand"), m_pCurOpData->opId); - ResetOperation(FZ_REPLY_INTERNALERROR); - break; - } - - return FZ_REPLY_ERROR; -} - -class CFtpChangeDirOpData : public CChangeDirOpData -{ -public: - CFtpChangeDirOpData() - { - tried_cdup = false; - } - - virtual ~CFtpChangeDirOpData() - { - } - - bool tried_cdup; -}; - -enum cwdStates -{ - cwd_init = 0, - cwd_pwd, - cwd_cwd, - cwd_pwd_cwd, - cwd_cwd_subdir, - cwd_pwd_subdir -}; - -int CFtpControlSocket::ChangeDir(CServerPath path /*=CServerPath()*/, wxString subDir /*=_T("")*/, bool link_discovery /*=false*/) -{ - enum cwdStates state = cwd_init; - - if (path.GetType() == DEFAULT) - path.SetType(m_pCurrentServer->GetType()); - - CServerPath target; - if (path.empty()) - { - if (m_CurrentPath.empty()) - state = cwd_pwd; - else - return FZ_REPLY_OK; - } - else - { - if (!subDir.empty()) - { - // Check if the target is in cache already - target = engine_.GetPathCache().Lookup(*m_pCurrentServer, path, subDir); - if (!target.empty()) - { - if (m_CurrentPath == target) - return FZ_REPLY_OK; - - path = target; - subDir = _T(""); - state = cwd_cwd; - } - else - { - // Target unknown, check for the parent's target - target = engine_.GetPathCache().Lookup(*m_pCurrentServer, path, _T("")); - if (m_CurrentPath == path || (!target.empty() && target == m_CurrentPath)) { - target.clear(); - state = cwd_cwd_subdir; - } - else - state = cwd_cwd; - } - } - else { - target = engine_.GetPathCache().Lookup(*m_pCurrentServer, path, _T("")); - if (m_CurrentPath == path || (!target.empty() && target == m_CurrentPath)) - return FZ_REPLY_OK; - state = cwd_cwd; - } - } - - CFtpChangeDirOpData *pData = new CFtpChangeDirOpData; - pData->pNextOpData = m_pCurOpData; - pData->opState = state; - pData->path = path; - pData->subDir = subDir; - pData->target = target; - pData->link_discovery = link_discovery; - - if (pData->pNextOpData && pData->pNextOpData->opId == Command::transfer && - !static_cast(pData->pNextOpData)->download) - { - pData->tryMkdOnFail = true; - wxASSERT(subDir.empty()); - } - - - m_pCurOpData = pData; - - return SendNextCommand(); -} - -int CFtpControlSocket::ChangeDirParseResponse() -{ - if (!m_pCurOpData) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - CFtpChangeDirOpData *pData = static_cast(m_pCurOpData); - - int code = GetReplyCode(); - bool error = false; - switch (pData->opState) - { - case cwd_pwd: - if (code != 2 && code != 3) - error = true; - else if (ParsePwdReply(m_Response)) - { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else - error = true; - break; - case cwd_cwd: - if (code != 2 && code != 3) - { - // Create remote directory if part of a file upload - if (pData->tryMkdOnFail) - { - pData->tryMkdOnFail = false; - int res = Mkdir(pData->path); - if (res != FZ_REPLY_OK) - return res; - } - else - error = true; - } - else - { - if (pData->target.empty()) - pData->opState = cwd_pwd_cwd; - else - { - m_CurrentPath = pData->target; - if (pData->subDir.empty()) - { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - - pData->target.clear(); - pData->opState = cwd_cwd_subdir; - } - } - break; - case cwd_pwd_cwd: - if (code != 2 && code != 3) - { - LogMessage(MessageType::Debug_Warning, _T("PWD failed, assuming path is '%s'."), pData->path.GetPath()); - m_CurrentPath = pData->path; - - if (pData->target.empty()) - engine_.GetPathCache().Store(*m_pCurrentServer, m_CurrentPath, pData->path); - - if (pData->subDir.empty()) - { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else - pData->opState = cwd_cwd_subdir; - } - else if (ParsePwdReply(m_Response, false, pData->path)) - { - if (pData->target.empty()) - { - engine_.GetPathCache().Store(*m_pCurrentServer, m_CurrentPath, pData->path); - } - if (pData->subDir.empty()) - { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else - pData->opState = cwd_cwd_subdir; - } - else - error = true; - break; - case cwd_cwd_subdir: - if (code != 2 && code != 3) - { - if (pData->subDir == _T("..") && !pData->tried_cdup && m_Response.Left(2) == _T("50")) - { - // CDUP command not implemented, try again using CWD .. - pData->tried_cdup = true; - } - else if (pData->link_discovery) - { - LogMessage(MessageType::Debug_Info, _T("Symlink does not link to a directory, probably a file")); - ResetOperation(FZ_REPLY_LINKNOTDIR); - return FZ_REPLY_ERROR; - } - else - error = true; - } - else - pData->opState = cwd_pwd_subdir; - break; - case cwd_pwd_subdir: - { - CServerPath assumedPath(pData->path); - if (pData->subDir == _T("..")) - { - if (!assumedPath.HasParent()) - assumedPath.clear(); - else - assumedPath = assumedPath.GetParent(); - } - else - assumedPath.AddSegment(pData->subDir); - - if (code != 2 && code != 3) - { - if (!assumedPath.empty()) - { - LogMessage(MessageType::Debug_Warning, _T("PWD failed, assuming path is '%s'."), assumedPath.GetPath()); - m_CurrentPath = assumedPath; - - if (pData->target.empty()) - { - engine_.GetPathCache().Store(*m_pCurrentServer, m_CurrentPath, pData->path, pData->subDir); - } - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else - { - LogMessage(MessageType::Debug_Warning, _T("PWD failed, unable to guess current path.")); - error = true; - } - } - else if (ParsePwdReply(m_Response, false, assumedPath)) - { - if (pData->target.empty()) - { - engine_.GetPathCache().Store(*m_pCurrentServer, m_CurrentPath, pData->path, pData->subDir); - } - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else - error = true; - } - break; - } - - if (error) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return SendNextCommand(); -} - -int CFtpControlSocket::ChangeDirSubcommandResult(int WXUNUSED(prevResult)) -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::ChangeDirSubcommandResult()")); - - return SendNextCommand(); -} - -int CFtpControlSocket::ChangeDirSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::ChangeDirSend()")); - - if (!m_pCurOpData) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - CFtpChangeDirOpData *pData = static_cast(m_pCurOpData); - - wxString cmd; - switch (pData->opState) - { - case cwd_pwd: - case cwd_pwd_cwd: - case cwd_pwd_subdir: - cmd = _T("PWD"); - break; - case cwd_cwd: - if (pData->tryMkdOnFail && !pData->holdsLock) - { - if (IsLocked(lock_mkdir, pData->path)) - { - // Some other engine is already creating this directory or - // performing an action that will lead to its creation - pData->tryMkdOnFail = false; - } - if (!TryLockCache(lock_mkdir, pData->path)) - return FZ_REPLY_WOULDBLOCK; - } - cmd = _T("CWD ") + pData->path.GetPath(); - m_CurrentPath.clear(); - break; - case cwd_cwd_subdir: - if (pData->subDir.empty()) - { - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - else if (pData->subDir == _T("..") && !pData->tried_cdup) - cmd = _T("CDUP"); - else - cmd = _T("CWD ") + pData->path.FormatSubdir(pData->subDir); - m_CurrentPath.clear(); - break; - } - - if (!cmd.empty()) - if (!SendCommand(cmd)) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -int CFtpControlSocket::FileTransfer(const wxString localFile, const CServerPath &remotePath, - const wxString &remoteFile, bool download, - const CFileTransferCommand::t_transferSettings& transferSettings) -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::FileTransfer()")); - - if (localFile.empty()) { - if (!download) - ResetOperation(FZ_REPLY_CRITICALERROR | FZ_REPLY_NOTSUPPORTED); - else - ResetOperation(FZ_REPLY_SYNTAXERROR); - return FZ_REPLY_ERROR; - } - - if (download) { - wxString filename = remotePath.FormatFilename(remoteFile); - LogMessage(MessageType::Status, _("Starting download of %s"), filename); - } - else { - LogMessage(MessageType::Status, _("Starting upload of %s"), localFile); - } - if (m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("deleting nonzero pData")); - delete m_pCurOpData; - } - - CFtpFileTransferOpData *pData = new CFtpFileTransferOpData(download, localFile, remoteFile, remotePath); - m_pCurOpData = pData; - - pData->transferSettings = transferSettings; - pData->binary = transferSettings.binary; - - int64_t size; - bool isLink; - if (fz::local_filesys::get_file_info(fz::to_native(pData->localFile), isLink, &size, 0, 0) == fz::local_filesys::file) - pData->localFileSize = size; - - pData->opState = filetransfer_waitcwd; - - if (pData->remotePath.GetType() == DEFAULT) - pData->remotePath.SetType(m_pCurrentServer->GetType()); - - int res = ChangeDir(pData->remotePath); - if (res != FZ_REPLY_OK) - return res; - - return ParseSubcommandResult(FZ_REPLY_OK); -} - -int CFtpControlSocket::FileTransferParseResponse() -{ - LogMessage(MessageType::Debug_Verbose, _T("FileTransferParseResponse()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpFileTransferOpData *pData = static_cast(m_pCurOpData); - if (pData->opState == filetransfer_init) - return FZ_REPLY_ERROR; - - int code = GetReplyCode(); - bool error = false; - switch (pData->opState) - { - case filetransfer_size: - if (code != 2 && code != 3) - { - if (CServerCapabilities::GetCapability(*m_pCurrentServer, size_command) == yes || - !m_Response.Mid(4).CmpNoCase(_T("file not found")) || - (pData->remotePath.FormatFilename(pData->remoteFile).Lower().Find(_T("file not found")) == -1 && - m_Response.Lower().Find(_T("file not found")) != -1)) - { - // Server supports SIZE command but command failed. Most likely MDTM will fail as well, so - // skip it. - pData->opState = filetransfer_resumetest; - - int res = CheckOverwriteFile(); - if (res != FZ_REPLY_OK) - return res; - } - else - pData->opState = filetransfer_mdtm; - } - else - { - pData->opState = filetransfer_mdtm; - if (m_Response.Left(4) == _T("213 ") && m_Response.Length() > 4) - { - if (CServerCapabilities::GetCapability(*m_pCurrentServer, size_command) == unknown) - CServerCapabilities::SetCapability(*m_pCurrentServer, size_command, yes); - wxString str = m_Response.Mid(4); - wxFileOffset size = 0; - const wxChar *buf = str.c_str(); - while (*buf) - { - if (*buf < '0' || *buf > '9') - break; - - size *= 10; - size += *buf - '0'; - ++buf; - } - pData->remoteFileSize = size; - } - else - LogMessage(MessageType::Debug_Info, _T("Invalid SIZE reply")); - } - break; - case filetransfer_mdtm: - pData->opState = filetransfer_resumetest; - if (m_Response.Left(4) == _T("213 ") && m_Response.Length() > 16) { - pData->fileTime = fz::datetime(m_Response.Mid(4).ToStdWstring(), fz::datetime::utc); - if (pData->fileTime.empty()) { - pData->fileTime += fz::duration::from_minutes(m_pCurrentServer->GetTimezoneOffset()); - } - } - - { - int res = CheckOverwriteFile(); - if (res != FZ_REPLY_OK) - return res; - } - - break; - case filetransfer_mfmt: - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown op state")); - error = true; - break; - } - - if (error) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return SendNextCommand(); -} - -int CFtpControlSocket::FileTransferSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("FileTransferSubcommandResult()")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpFileTransferOpData *pData = static_cast(m_pCurOpData); - - if (pData->opState == filetransfer_waitcwd) { - if (prevResult == FZ_REPLY_OK) { - CDirentry entry; - bool dirDidExist; - bool matchedCase; - bool found = engine_.GetDirectoryCache().LookupFile(entry, *m_pCurrentServer, pData->tryAbsolutePath ? pData->remotePath : m_CurrentPath, pData->remoteFile, dirDidExist, matchedCase); - if (!found) { - if (!dirDidExist) - pData->opState = filetransfer_waitlist; - else if (pData->download && - engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && - CServerCapabilities::GetCapability(*m_pCurrentServer, mdtm_command) == yes) - { - pData->opState = filetransfer_mdtm; - } - else - pData->opState = filetransfer_resumetest; - } - else { - if (entry.is_unsure()) - pData->opState = filetransfer_waitlist; - else { - if (matchedCase) { - pData->remoteFileSize = entry.size; - if (entry.has_date()) - pData->fileTime = entry.time; - - if (pData->download && - !entry.has_time() && - engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && - CServerCapabilities::GetCapability(*m_pCurrentServer, mdtm_command) == yes) - { - pData->opState = filetransfer_mdtm; - } - else - pData->opState = filetransfer_resumetest; - } - else - pData->opState = filetransfer_size; - } - } - if (pData->opState == filetransfer_waitlist) { - int res = List(CServerPath(), _T(""), LIST_FLAG_REFRESH); - if (res != FZ_REPLY_OK) - return res; - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - else if (pData->opState == filetransfer_resumetest) { - int res = CheckOverwriteFile(); - if (res != FZ_REPLY_OK) - return res; - } - } - else { - pData->tryAbsolutePath = true; - pData->opState = filetransfer_size; - } - } - else if (pData->opState == filetransfer_waitlist) { - if (prevResult == FZ_REPLY_OK) { - CDirentry entry; - bool dirDidExist; - bool matchedCase; - bool found = engine_.GetDirectoryCache().LookupFile(entry, *m_pCurrentServer, pData->tryAbsolutePath ? pData->remotePath : m_CurrentPath, pData->remoteFile, dirDidExist, matchedCase); - if (!found) { - if (!dirDidExist) - pData->opState = filetransfer_size; - else if (pData->download && - engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && - CServerCapabilities::GetCapability(*m_pCurrentServer, mdtm_command) == yes) - { - pData->opState = filetransfer_mdtm; - } - else - pData->opState = filetransfer_resumetest; - } - else { - if (matchedCase && !entry.is_unsure()) { - pData->remoteFileSize = entry.size; - if (entry.has_date()) - pData->fileTime = entry.time; - - if (pData->download && - !entry.has_time() && - engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && - CServerCapabilities::GetCapability(*m_pCurrentServer, mdtm_command) == yes) - { - pData->opState = filetransfer_mdtm; - } - else - pData->opState = filetransfer_resumetest; - } - else - pData->opState = filetransfer_size; - } - - if (pData->opState == filetransfer_resumetest) { - int res = CheckOverwriteFile(); - if (res != FZ_REPLY_OK) - return res; - } - } - else - pData->opState = filetransfer_size; - } - else if (pData->opState == filetransfer_waittransfer) { - if (prevResult == FZ_REPLY_OK && engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) { - if (!pData->download && - CServerCapabilities::GetCapability(*m_pCurrentServer, mfmt_command) == yes) - { - fz::datetime mtime = fz::local_filesys::get_modification_time(fz::to_native(pData->localFile)); - if (mtime.empty()) { - pData->fileTime = mtime; - pData->opState = filetransfer_mfmt; - return SendNextCommand(); - } - } - else if (pData->download && pData->fileTime.empty()) { - delete pData->pIOThread; - pData->pIOThread = 0; - if (!fz::local_filesys::set_modification_time(fz::to_native(pData->localFile), pData->fileTime)) - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Could not set modification time")); - } - } - ResetOperation(prevResult); - return prevResult; - } - else if (pData->opState == filetransfer_waitresumetest) { - if (prevResult != FZ_REPLY_OK) { - if (pData->transferEndReason == TransferEndReason::failed_resumetest) { - if (pData->localFileSize > ((wxFileOffset)1 << 32)) { - CServerCapabilities::SetCapability(*m_pCurrentServer, resume4GBbug, yes); - LogMessage(MessageType::Error, _("Server does not support resume of files > 4GB.")); - } - else { - CServerCapabilities::SetCapability(*m_pCurrentServer, resume2GBbug, yes); - LogMessage(MessageType::Error, _("Server does not support resume of files > 2GB.")); - } - - ResetOperation(prevResult | FZ_REPLY_CRITICALERROR); - return FZ_REPLY_ERROR; - } - else - ResetOperation(prevResult); - return prevResult; - } - if (pData->localFileSize > ((wxFileOffset)1 << 32)) - CServerCapabilities::SetCapability(*m_pCurrentServer, resume4GBbug, no); - else - CServerCapabilities::SetCapability(*m_pCurrentServer, resume2GBbug, no); - - pData->opState = filetransfer_transfer; - } - - return SendNextCommand(); -} - -int CFtpControlSocket::FileTransferSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("FileTransferSend()")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpFileTransferOpData *pData = static_cast(m_pCurOpData); - - wxString cmd; - switch (pData->opState) - { - case filetransfer_size: - cmd = _T("SIZE "); - cmd += pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath); - break; - case filetransfer_mdtm: - cmd = _T("MDTM "); - cmd += pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath); - break; - case filetransfer_resumetest: - case filetransfer_transfer: - if (m_pTransferSocket) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Verbose, _T("m_pTransferSocket != 0")); - delete m_pTransferSocket; - m_pTransferSocket = 0; - } - - { - auto pFile = std::make_unique(); - if (pData->download) { - // Be quiet - wxLogNull nullLog; - - wxFileOffset startOffset = 0; - - // Potentially racy - bool didExist = wxFile::Exists(pData->localFile); - - if (pData->resume) { - if (!pFile->open(fz::to_native(pData->localFile), fz::file::writing, fz::file::existing)) { - LogMessage(MessageType::Error, _("Failed to open \"%s\" for appending/writing"), pData->localFile); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - pData->fileDidExist = didExist; - - startOffset = pFile->seek(0, fz::file::end); - - if (startOffset == wxInvalidOffset) { - LogMessage(MessageType::Error, _("Could not seek to the end of the file")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - pData->localFileSize = startOffset; - - // Check resume capabilities - if (pData->opState == filetransfer_resumetest) { - int res = FileTransferTestResumeCapability(); - if ((res & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { - // Server does not support resume but remote and local filesizes are equal - return FZ_REPLY_OK; - } - if (res != FZ_REPLY_OK) { - return res; - } - } - } - else { - CreateLocalDir(pData->localFile); - - if (!pFile->open(fz::to_native(pData->localFile), fz::file::writing, fz::file::empty)) { - LogMessage(MessageType::Error, _("Failed to open \"%s\" for writing"), pData->localFile); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - pData->fileDidExist = didExist; - pData->localFileSize = 0; - } - - if (pData->resume) - pData->resumeOffset = pData->localFileSize; - else - pData->resumeOffset = 0; - - engine_.transfer_status_.Init(pData->remoteFileSize, startOffset, false); - - if (engine_.GetOptions().GetOptionVal(OPTION_PREALLOCATE_SPACE)) { - // Try to preallocate the file in order to reduce fragmentation - int64_t sizeToPreallocate = pData->remoteFileSize - startOffset; - if (sizeToPreallocate > 0) { - LogMessage(MessageType::Debug_Info, _T("Preallocating %") + wxString(wxFileOffsetFmtSpec) + _T("d bytes for the file \"%s\""), sizeToPreallocate, pData->localFile); - auto oldPos = pFile->seek(0, fz::file::current); - if (oldPos >= 0) { - if (pFile->seek(sizeToPreallocate, fz::file::end) == pData->remoteFileSize) { - if (!pFile->truncate()) - LogMessage(MessageType::Debug_Warning, _T("Could not preallocate the file")); - } - pFile->seek(oldPos, fz::file::begin); - } - } - } - } - else { - if (!pFile->open(fz::to_native(pData->localFile), fz::file::reading)) { - LogMessage(MessageType::Error, _("Failed to open \"%s\" for reading"), pData->localFile); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - wxFileOffset startOffset; - if (pData->resume) { - if (pData->remoteFileSize > 0) { - startOffset = pData->remoteFileSize; - - if (pData->localFileSize < 0) { - auto s = pFile->size(); - if (s >= 0) { - pData->localFileSize = s; - } - } - - if (startOffset == pData->localFileSize && pData->binary) { - LogMessage(MessageType::Debug_Info, _T("No need to resume, remote file size matches local file size.")); - - if (engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && - CServerCapabilities::GetCapability(*m_pCurrentServer, mfmt_command) == yes) - { - fz::datetime mtime = fz::local_filesys::get_modification_time(fz::to_native(pData->localFile)); - if (mtime.empty()) { - pData->fileTime = mtime; - pData->opState = filetransfer_mfmt; - return SendNextCommand(); - } - } - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - - // Assume native 64 bit type exists - if (pFile->seek(startOffset, fz::file::begin) == wxInvalidOffset) { - wxString const s = std::to_wstring(startOffset); - LogMessage(MessageType::Error, _("Could not seek to offset %s within file"), s); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - } - else - startOffset = 0; - } - else - startOffset = 0; - - if (CServerCapabilities::GetCapability(*m_pCurrentServer, rest_stream) == yes) { - // Use REST + STOR if resuming - pData->resumeOffset = startOffset; - } - else { - // Play it safe, use APPE if resuming - pData->resumeOffset = 0; - } - - auto len = pFile->size(); - engine_.transfer_status_.Init(len, startOffset, false); - } - pData->pIOThread = new CIOThread; - if (!pData->pIOThread->Create(std::move(pFile), !pData->download, pData->binary)) { - // CIOThread will delete pFile - delete pData->pIOThread; - pData->pIOThread = 0; - LogMessage(MessageType::Error, _("Could not spawn IO thread")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - } - - m_pTransferSocket = new CTransferSocket(engine_, *this, pData->download ? TransferMode::download : TransferMode::upload); - m_pTransferSocket->m_binaryMode = pData->transferSettings.binary; - m_pTransferSocket->SetIOThread(pData->pIOThread); - - if (pData->download) - cmd = _T("RETR "); - else if (pData->resume) { - if (CServerCapabilities::GetCapability(*m_pCurrentServer, rest_stream) == yes) - cmd = _T("STOR "); // In this case REST gets sent since resume offset was set earlier - else { - wxASSERT(pData->resumeOffset == 0); - cmd = _T("APPE "); - } - } - else - cmd = _T("STOR "); - cmd += pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath); - - pData->opState = filetransfer_waittransfer; - return Transfer(cmd, pData); - case filetransfer_mfmt: - { - cmd = _T("MFMT "); - cmd += pData->fileTime.format(_T("%Y%m%d%H%M%S "), fz::datetime::utc); - cmd += pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath); - - break; - } - default: - LogMessage(MessageType::Debug_Warning, _T("Unhandled opState: %d"), pData->opState); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (!cmd.empty()) - if (!SendCommand(cmd)) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -void CFtpControlSocket::TransferEnd() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::TransferEnd()")); - - // If m_pTransferSocket is zero, the message was sent by the previous command. - // We can safely ignore it. - // It does not cause problems, since before creating the next transfer socket, other - // messages which were added to the queue later than this one will be processed first. - if (!m_pCurOpData || !m_pTransferSocket || GetCurrentCommandId() != Command::rawtransfer) - { - LogMessage(MessageType::Debug_Verbose, _T("Call to TransferEnd at unusual time, ignoring")); - return; - } - - TransferEndReason reason = m_pTransferSocket->GetTransferEndreason(); - if (reason == TransferEndReason::none) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Call to TransferEnd at unusual time")); - return; - } - - if (reason == TransferEndReason::successful) - SetAlive(); - - CRawTransferOpData *pData = static_cast(m_pCurOpData); - if (pData->pOldData->transferEndReason == TransferEndReason::successful) - pData->pOldData->transferEndReason = reason; - - switch (m_pCurOpData->opState) - { - case rawtransfer_transfer: - pData->opState = rawtransfer_waittransferpre; - break; - case rawtransfer_waitfinish: - pData->opState = rawtransfer_waittransfer; - break; - case rawtransfer_waitsocket: - ResetOperation((reason == TransferEndReason::successful) ? FZ_REPLY_OK : FZ_REPLY_ERROR); - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("TransferEnd at unusual op state, ignoring")); - break; - } -} - -bool CFtpControlSocket::SetAsyncRequestReply(CAsyncRequestNotification *pNotification) -{ - if (m_pCurOpData) - { - if (!m_pCurOpData->waitForAsyncRequest) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Not waiting for request reply, ignoring request reply %d"), pNotification->GetRequestID()); - return false; - } - m_pCurOpData->waitForAsyncRequest = false; - } - - const enum RequestId requestId = pNotification->GetRequestID(); - switch (requestId) - { - case reqId_fileexists: - { - if (!m_pCurOpData || m_pCurOpData->opId != Command::transfer) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("No or invalid operation in progress, ignoring request reply %f"), pNotification->GetRequestID()); - return false; - } - - CFtpFileTransferOpData *pData = static_cast(m_pCurOpData); - - CFileExistsNotification *pFileExistsNotification = static_cast(pNotification); - switch (pFileExistsNotification->overwriteAction) - { - case CFileExistsNotification::rename: - if (pData->download) { - wxFileName fn = pData->localFile; - fn.SetFullName(pFileExistsNotification->newName); - pData->localFile = fn.GetFullPath(); - - int64_t size; - bool isLink; - if (fz::local_filesys::get_file_info(fz::to_native(pData->localFile), isLink, &size, 0, 0) == fz::local_filesys::file) - pData->localFileSize = size; - else - pData->localFileSize = -1; - - if (CheckOverwriteFile() == FZ_REPLY_OK) - SendNextCommand(); - } - else { - pData->remoteFile = pFileExistsNotification->newName; - pData->remoteFileSize = -1; - pData->fileTime = fz::datetime(); - - CDirentry entry; - bool dir_did_exist; - bool matched_case; - if (!engine_.GetDirectoryCache().LookupFile(entry, *m_pCurrentServer, pData->tryAbsolutePath ? pData->remotePath : m_CurrentPath, pData->remoteFile, dir_did_exist, matched_case) || - !matched_case) - { - if (engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && - CServerCapabilities::GetCapability(*m_pCurrentServer, mdtm_command) == yes) - { - pData->opState = filetransfer_mdtm; - } - } - else // found and matched case - { - pData->remoteFileSize = entry.size; - if (entry.has_date()) - pData->fileTime = entry.time; - - if (pData->download && - !entry.has_time() && - engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && - CServerCapabilities::GetCapability(*m_pCurrentServer, mdtm_command) == yes) - { - pData->opState = filetransfer_mdtm; - } - else { - if (CheckOverwriteFile() != FZ_REPLY_OK) - break; - } - } - SendNextCommand(); - } - break; - default: - return SetFileExistsAction(pFileExistsNotification); - } - } - break; - case reqId_interactiveLogin: - { - if (!m_pCurOpData || m_pCurOpData->opId != Command::connect) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("No or invalid operation in progress, ignoring request reply %d"), pNotification->GetRequestID()); - return false; - } - - CFtpLogonOpData* pData = static_cast(m_pCurOpData); - - CInteractiveLoginNotification *pInteractiveLoginNotification = static_cast(pNotification); - if (!pInteractiveLoginNotification->passwordSet) - { - ResetOperation(FZ_REPLY_CANCELED); - return false; - } - m_pCurrentServer->SetUser(m_pCurrentServer->GetUser(), pInteractiveLoginNotification->server.GetPass()); - pData->gotPassword = true; - SendNextCommand(); - } - break; - case reqId_certificate: - { - if (!m_pTlsSocket || m_pTlsSocket->GetState() != CTlsSocket::TlsState::verifycert) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("No or invalid operation in progress, ignoring request reply %d"), pNotification->GetRequestID()); - return false; - } - - CCertificateNotification* pCertificateNotification = static_cast(pNotification); - m_pTlsSocket->TrustCurrentCert(pCertificateNotification->m_trusted); - - if (!pCertificateNotification->m_trusted) { - DoClose(FZ_REPLY_CRITICALERROR); - return false; - } - - if (m_pCurOpData && m_pCurOpData->opId == Command::connect && - m_pCurOpData->opState == LOGON_AUTH_WAIT) - { - m_pCurOpData->opState = LOGON_LOGON; - } - } - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown request %d"), pNotification->GetRequestID()); - ResetOperation(FZ_REPLY_INTERNALERROR); - return false; - } - - return true; -} - -class CRawCommandOpData : public COpData -{ -public: - CRawCommandOpData(const wxString& command) - : COpData(Command::raw) - { - m_command = command; - } - - wxString m_command; -}; - -int CFtpControlSocket::RawCommand(const wxString& command) -{ - wxASSERT(!command.empty()); - - m_pCurOpData = new CRawCommandOpData(command); - - return SendNextCommand(); -} - -int CFtpControlSocket::RawCommandSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::RawCommandSend")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - engine_.GetDirectoryCache().InvalidateServer(*m_pCurrentServer); - engine_.GetPathCache().InvalidateServer(*m_pCurrentServer); - m_CurrentPath.clear(); - - m_lastTypeBinary = -1; - - CRawCommandOpData *pData = static_cast(m_pCurOpData); - - if (!SendCommand(pData->m_command, false, false)) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -int CFtpControlSocket::RawCommandParseResponse() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::RawCommandParseResponse")); - - int code = GetReplyCode(); - if (code == 2 || code == 3) - { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } -} - -int CFtpControlSocket::Delete(const CServerPath& path, std::deque&& files) -{ - wxASSERT(!m_pCurOpData); - CFtpDeleteOpData *pData = new CFtpDeleteOpData(); - m_pCurOpData = pData; - pData->path = path; - pData->files = files; - pData->omitPath = true; - - int res = ChangeDir(pData->path); - if (res != FZ_REPLY_OK) - return res; - - // CFileZillaEnginePrivate should have checked this already - wxASSERT(!files.empty()); - - return SendNextCommand(); -} - -int CFtpControlSocket::DeleteSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::DeleteSubcommandResult()")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpDeleteOpData *pData = static_cast(m_pCurOpData); - - if (prevResult != FZ_REPLY_OK) - pData->omitPath = false; - - return SendNextCommand(); -} - -int CFtpControlSocket::DeleteSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::DeleteSend")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - CFtpDeleteOpData *pData = static_cast(m_pCurOpData); - - const wxString& file = pData->files.front(); - if (file.empty()) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty filename")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - wxString filename = pData->path.FormatFilename(file, pData->omitPath); - if (filename.empty()) { - LogMessage(MessageType::Error, _("Filename cannot be constructed for directory %s and filename %s"), pData->path.GetPath(), file); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (!pData->m_time.empty()) - pData->m_time = fz::datetime::now(); - - engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, pData->path, file); - - if (!SendCommand(_T("DELE ") + filename)) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -int CFtpControlSocket::DeleteParseResponse() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::DeleteParseResponse()")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpDeleteOpData *pData = static_cast(m_pCurOpData); - - int code = GetReplyCode(); - if (code != 2 && code != 3) - pData->m_deleteFailed = true; - else { - const wxString& file = pData->files.front(); - - engine_.GetDirectoryCache().RemoveFile(*m_pCurrentServer, pData->path, file); - - fz::datetime now = fz::datetime::now(); - if (now.empty() && pData->m_time.empty() && (now - pData->m_time).get_seconds() >= 1) { - engine_.SendDirectoryListingNotification(pData->path, false, true, false); - pData->m_time = now; - pData->m_needSendListing = false; - } - else - pData->m_needSendListing = true; - } - - pData->files.pop_front(); - - if (!pData->files.empty()) - return SendNextCommand(); - - return ResetOperation(pData->m_deleteFailed ? FZ_REPLY_ERROR : FZ_REPLY_OK); -} - -class CFtpRemoveDirOpData : public COpData -{ -public: - CFtpRemoveDirOpData() - : COpData(Command::removedir) - , omitPath() - { - } - - virtual ~CFtpRemoveDirOpData() {} - - CServerPath path; - CServerPath fullPath; - wxString subDir; - bool omitPath; -}; - -int CFtpControlSocket::RemoveDir(const CServerPath& path, const wxString& subDir) -{ - wxASSERT(!m_pCurOpData); - CFtpRemoveDirOpData *pData = new CFtpRemoveDirOpData(); - m_pCurOpData = pData; - pData->path = path; - pData->subDir = subDir; - pData->omitPath = true; - pData->fullPath = path; - - if (!pData->fullPath.AddSegment(subDir)) - { - LogMessage(MessageType::Error, _("Path cannot be constructed for directory %s and subdir %s"), path.GetPath(), subDir); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - int res = ChangeDir(pData->path); - if (res != FZ_REPLY_OK) - return res; - - return SendNextCommand(); -} - -int CFtpControlSocket::RemoveDirSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::RemoveDirSubcommandResult()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpRemoveDirOpData *pData = static_cast(m_pCurOpData); - - if (prevResult != FZ_REPLY_OK) - pData->omitPath = false; - else - pData->path = m_CurrentPath; - - return SendNextCommand(); -} - -int CFtpControlSocket::RemoveDirSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::RemoveDirSend()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpRemoveDirOpData *pData = static_cast(m_pCurOpData); - - engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, pData->path, pData->subDir); - - CServerPath path(engine_.GetPathCache().Lookup(*m_pCurrentServer, pData->path, pData->subDir)); - if (path.empty()) - { - path = pData->path; - path.AddSegment(pData->subDir); - } - engine_.InvalidateCurrentWorkingDirs(path); - - engine_.GetPathCache().InvalidatePath(*m_pCurrentServer, pData->path, pData->subDir); - - if (pData->omitPath) - { - if (!SendCommand(_T("RMD ") + pData->subDir)) - return FZ_REPLY_ERROR; - } - else - if (!SendCommand(_T("RMD ") + pData->fullPath.GetPath())) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -int CFtpControlSocket::RemoveDirParseResponse() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::RemoveDirParseResponse()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpRemoveDirOpData *pData = static_cast(m_pCurOpData); - - int code = GetReplyCode(); - if (code != 2 && code != 3) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - engine_.GetDirectoryCache().RemoveDir(*m_pCurrentServer, pData->path, pData->subDir, engine_.GetPathCache().Lookup(*m_pCurrentServer, pData->path, pData->subDir)); - engine_.SendDirectoryListingNotification(pData->path, false, true, false); - - return ResetOperation(FZ_REPLY_OK); -} - -enum mkdStates -{ - mkd_init = 0, - mkd_findparent, - mkd_mkdsub, - mkd_cwdsub, - mkd_tryfull -}; - -int CFtpControlSocket::Mkdir(const CServerPath& path) -{ - /* Directory creation works like this: First find a parent directory into - * which we can CWD, then create the subdirs one by one. If either part - * fails, try MKD with the full path directly. - */ - - if (!m_pCurOpData) - LogMessage(MessageType::Status, _("Creating directory '%s'..."), path.GetPath()); - - CMkdirOpData *pData = new CMkdirOpData; - pData->path = path; - - if (!m_CurrentPath.empty()) { - // Unless the server is broken, a directory already exists if current directory is a subdir of it. - if (m_CurrentPath == path || m_CurrentPath.IsSubdirOf(path, false)) { - delete pData; - return FZ_REPLY_OK; - } - - if (m_CurrentPath.IsParentOf(path, false)) - pData->commonParent = m_CurrentPath; - else - pData->commonParent = path.GetCommonParent(m_CurrentPath); - } - - if (!path.HasParent()) - pData->opState = mkd_tryfull; - else { - pData->currentPath = path.GetParent(); - pData->segments.push_back(path.GetLastSegment()); - - if (pData->currentPath == m_CurrentPath) - pData->opState = mkd_mkdsub; - else - pData->opState = mkd_findparent; - } - - pData->pNextOpData = m_pCurOpData; - m_pCurOpData = pData; - - return SendNextCommand(); -} - -int CFtpControlSocket::MkdirParseResponse() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::MkdirParseResonse")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CMkdirOpData *pData = static_cast(m_pCurOpData); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - int code = GetReplyCode(); - bool error = false; - switch (pData->opState) { - case mkd_findparent: - if (code == 2 || code == 3) { - m_CurrentPath = pData->currentPath; - pData->opState = mkd_mkdsub; - } - else if (pData->currentPath == pData->commonParent) - pData->opState = mkd_tryfull; - else if (pData->currentPath.HasParent()) { - const CServerPath& parent = pData->currentPath.GetParent(); - pData->segments.push_back(pData->currentPath.GetLastSegment()); - pData->currentPath = parent; - } - else - pData->opState = mkd_tryfull; - break; - case mkd_mkdsub: - if (code != 2 && code != 3) { - // Don't fall back to using the full path if the error message - // is "already exists". - // Case 1: Full response a known "already exists" message. - // Case 2: Substrng of response contains "already exists". pData->path may not - // contain this substring as the path might be returned in the reply. - // Case 3: Substrng of response contains "file exists". pData->path may not - // contain this substring as the path might be returned in the reply. - const wxString response = m_Response.Mid(4).Lower(); - const wxString path = pData->path.GetPath().Lower(); - if (response != _T("directory already exists") && - (path.Find(_T("already exists")) != -1 || - response.Find(_T("already exists")) == -1) && - (path.Find(_T("file exists")) != -1 || - response.Find(_T("file exists")) == -1) - ) - { - pData->opState = mkd_tryfull; - break; - } - } - - { - if (pData->segments.empty()) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T(" pData->segments is empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - // If entry did exist and is a file instead of a directory, report failure. - int result = FZ_REPLY_OK; - if (code != 2 && code != 3) { - CDirentry entry; - bool tmp; - if (engine_.GetDirectoryCache().LookupFile(entry, *m_pCurrentServer, pData->currentPath, pData->segments.back(), tmp, tmp) && !entry.is_dir()) { - result = FZ_REPLY_ERROR; - } - } - - engine_.GetDirectoryCache().UpdateFile(*m_pCurrentServer, pData->currentPath, pData->segments.back(), true, CDirectoryCache::dir); - engine_.SendDirectoryListingNotification(pData->currentPath, false, true, false); - - pData->currentPath.AddSegment(pData->segments.back()); - pData->segments.pop_back(); - - if (pData->segments.empty() || result != FZ_REPLY_OK) { - ResetOperation(result); - return result; - } - else - pData->opState = mkd_cwdsub; - } - break; - case mkd_cwdsub: - if (code == 2 || code == 3) { - m_CurrentPath = pData->currentPath; - pData->opState = mkd_mkdsub; - } - else - pData->opState = mkd_tryfull; - break; - case mkd_tryfull: - if (code != 2 && code != 3) - error = true; - else { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("unknown op state: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (error) { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return SendNextCommand(); -} - -int CFtpControlSocket::MkdirSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::MkdirSend")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CMkdirOpData *pData = static_cast(m_pCurOpData); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - if (!pData->holdsLock) { - if (!TryLockCache(lock_mkdir, pData->path)) - return FZ_REPLY_WOULDBLOCK; - } - - bool res; - switch (pData->opState) - { - case mkd_findparent: - case mkd_cwdsub: - m_CurrentPath.clear(); - res = SendCommand(_T("CWD ") + pData->currentPath.GetPath()); - break; - case mkd_mkdsub: - res = SendCommand(_T("MKD ") + pData->segments.back()); - break; - case mkd_tryfull: - res = SendCommand(_T("MKD ") + pData->path.GetPath()); - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("unknown op state: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!res) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -class CFtpRenameOpData : public COpData -{ -public: - CFtpRenameOpData(const CRenameCommand& command) - : COpData(Command::rename), m_cmd(command) - { - m_useAbsolute = false; - } - - virtual ~CFtpRenameOpData() {} - - CRenameCommand m_cmd; - bool m_useAbsolute; -}; - -enum renameStates -{ - rename_init = 0, - rename_rnfrom, - rename_rnto -}; - -int CFtpControlSocket::Rename(const CRenameCommand& command) -{ - if (m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData not empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - LogMessage(MessageType::Status, _("Renaming '%s' to '%s'"), command.GetFromPath().FormatFilename(command.GetFromFile()), command.GetToPath().FormatFilename(command.GetToFile())); - - CFtpRenameOpData *pData = new CFtpRenameOpData(command); - pData->opState = rename_rnfrom; - m_pCurOpData = pData; - - int res = ChangeDir(command.GetFromPath()); - if (res != FZ_REPLY_OK) - return res; - - return SendNextCommand(); -} - -int CFtpControlSocket::RenameParseResponse() -{ - CFtpRenameOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - int code = GetReplyCode(); - if (code != 2 && code != 3) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (pData->opState == rename_rnfrom) - pData->opState = rename_rnto; - else - { - const CServerPath& fromPath = pData->m_cmd.GetFromPath(); - const CServerPath& toPath = pData->m_cmd.GetToPath(); - engine_.GetDirectoryCache().Rename(*m_pCurrentServer, fromPath, pData->m_cmd.GetFromFile(), toPath, pData->m_cmd.GetToFile()); - - engine_.SendDirectoryListingNotification(fromPath, false, true, false); - if (fromPath != toPath) - engine_.SendDirectoryListingNotification(toPath, false, true, false); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - - return SendNextCommand(); -} - -int CFtpControlSocket::RenameSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::RenameSubcommandResult()")); - - CFtpRenameOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (prevResult != FZ_REPLY_OK) - pData->m_useAbsolute = true; - - return SendNextCommand(); -} - -int CFtpControlSocket::RenameSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::RenameSend()")); - - CFtpRenameOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - bool res; - switch (pData->opState) - { - case rename_rnfrom: - res = SendCommand(_T("RNFR ") + pData->m_cmd.GetFromPath().FormatFilename(pData->m_cmd.GetFromFile(), !pData->m_useAbsolute)); - break; - case rename_rnto: - { - engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, pData->m_cmd.GetFromPath(), pData->m_cmd.GetFromFile()); - engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, pData->m_cmd.GetToPath(), pData->m_cmd.GetToFile()); - - CServerPath path(engine_.GetPathCache().Lookup(*m_pCurrentServer, pData->m_cmd.GetFromPath(), pData->m_cmd.GetFromFile())); - if (path.empty()) { - path = pData->m_cmd.GetFromPath(); - path.AddSegment(pData->m_cmd.GetFromFile()); - } - engine_.InvalidateCurrentWorkingDirs(path); - - engine_.GetPathCache().InvalidatePath(*m_pCurrentServer, pData->m_cmd.GetFromPath(), pData->m_cmd.GetFromFile()); - engine_.GetPathCache().InvalidatePath(*m_pCurrentServer, pData->m_cmd.GetToPath(), pData->m_cmd.GetToFile()); - - res = SendCommand(_T("RNTO ") + pData->m_cmd.GetToPath().FormatFilename(pData->m_cmd.GetToFile(), !pData->m_useAbsolute && pData->m_cmd.GetFromPath() == pData->m_cmd.GetToPath())); - break; - } - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("unknown op state: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!res) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return FZ_REPLY_WOULDBLOCK; -} - -class CFtpChmodOpData : public COpData -{ -public: - CFtpChmodOpData(const CChmodCommand& command) - : COpData(Command::chmod), m_cmd(command) - { - m_useAbsolute = false; - } - - virtual ~CFtpChmodOpData() {} - - CChmodCommand m_cmd; - bool m_useAbsolute; -}; - -enum chmodStates -{ - chmod_init = 0, - chmod_chmod -}; - -int CFtpControlSocket::Chmod(const CChmodCommand& command) -{ - if (m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData not empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - LogMessage(MessageType::Status, _("Set permissions of '%s' to '%s'"), command.GetPath().FormatFilename(command.GetFile()), command.GetPermission()); - - CFtpChmodOpData *pData = new CFtpChmodOpData(command); - pData->opState = chmod_chmod; - m_pCurOpData = pData; - - int res = ChangeDir(command.GetPath()); - if (res != FZ_REPLY_OK) - return res; - - return SendNextCommand(); -} - -int CFtpControlSocket::ChmodParseResponse() -{ - CFtpChmodOpData *pData = static_cast(m_pCurOpData); - if (!pData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - int code = GetReplyCode(); - if (code != 2 && code != 3) { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - engine_.GetDirectoryCache().UpdateFile(*m_pCurrentServer, pData->m_cmd.GetPath(), pData->m_cmd.GetFile(), false, CDirectoryCache::unknown); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; -} - -int CFtpControlSocket::ChmodSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::ChmodSubcommandResult()")); - - CFtpChmodOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (prevResult != FZ_REPLY_OK) - pData->m_useAbsolute = true; - - return SendNextCommand(); -} - -int CFtpControlSocket::ChmodSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::ChmodSend()")); - - CFtpChmodOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - bool res; - switch (pData->opState) - { - case chmod_chmod: - res = SendCommand(_T("SITE CHMOD ") + pData->m_cmd.GetPermission() + _T(" ") + pData->m_cmd.GetPath().FormatFilename(pData->m_cmd.GetFile(), !pData->m_useAbsolute)); - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("unknown op state: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!res) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return FZ_REPLY_WOULDBLOCK; -} - -bool CFtpControlSocket::IsMisleadingListResponse() const -{ - // Some servers are broken. Instead of an empty listing, some MVS servers - // for example they return "550 no members found" - // Other servers return "550 No files found." - - if (!m_Response.CmpNoCase(_T("550 No members found."))) - return true; - - if (!m_Response.CmpNoCase(_T("550 No data sets found."))) - return true; - - if (!m_Response.CmpNoCase(_T("550 No files found."))) - return true; - - return false; -} - -bool CFtpControlSocket::ParseEpsvResponse(CRawTransferOpData* pData) -{ - int pos = m_Response.Find(_T("(|||")); - if (pos == -1) - return false; - - int pos2 = m_Response.Mid(pos + 4).Find(_T("|)")); - if (pos2 <= 0) - return false; - - wxString number = m_Response.Mid(pos + 4, pos2); - unsigned long port; - if (!number.ToULong(&port)) - return false; - - if (port == 0 || port > 65535) - return false; - - pData->port = port; - - if (m_pProxyBackend) { - pData->host = m_pCurrentServer->GetHost(); - } - else { - pData->host = m_pSocket->GetPeerIP(); - } - return true; -} - -bool CFtpControlSocket::ParsePasvResponse(CRawTransferOpData* pData) -{ - // Validate ip address - if (!m_pasvReplyRegex.IsValid()) { - wxString digit = _T("0*[0-9]{1,3}"); - const wxChar* dot = _T(","); - wxString exp = _T("( |\\()(") + digit + dot + digit + dot + digit + dot + digit + dot + digit + dot + digit + _T(")( |\\)|$)"); - m_pasvReplyRegex.Compile(exp); - } - - if (!m_pasvReplyRegex.Matches(m_Response)) - return false; - - pData->host = m_pasvReplyRegex.GetMatch(m_Response, 2); - - int i = pData->host.Find(',', true); - long number = 0; - if (i == -1 || !pData->host.Mid(i + 1).ToLong(&number)) - return false; - - pData->port = number; //get ls byte of server socket - pData->host = pData->host.Left(i); - i = pData->host.Find(',', true); - if (i == -1 || !pData->host.Mid(i + 1).ToLong(&number)) - return false; - - pData->port += 256 * number; //add ms byte of server socket - pData->host = pData-> host.Left(i); - pData->host.Replace(_T(","), _T(".")); - - if (m_pProxyBackend) { - // We do not have any information about the proxy's inner workings - return true; - } - - const wxString peerIP = m_pSocket->GetPeerIP(); - if (!fz::is_routable_address(pData->host.ToStdWstring()) && fz::is_routable_address(peerIP.ToStdWstring())) { - if (engine_.GetOptions().GetOptionVal(OPTION_PASVREPLYFALLBACKMODE) != 1 || pData->bTriedActive) { - LogMessage(MessageType::Status, _("Server sent passive reply with unroutable address. Using server address instead.")); - LogMessage(MessageType::Debug_Info, _T(" Reply: %s, peer: %s"), pData->host, peerIP); - pData->host = peerIP; - } - else { - LogMessage(MessageType::Status, _("Server sent passive reply with unroutable address. Passive mode failed.")); - LogMessage(MessageType::Debug_Info, _T(" Reply: %s, peer: %s"), pData->host, peerIP); - return false; - } - } - else if (engine_.GetOptions().GetOptionVal(OPTION_PASVREPLYFALLBACKMODE) == 2) { - // Always use server address - pData->host = peerIP; - } - - return true; -} - -int CFtpControlSocket::GetExternalIPAddress(wxString& address) -{ - // Local IP should work. Only a complete moron would use IPv6 - // and NAT at the same time. - if (m_pSocket->GetAddressFamily() != CSocket::ipv6) - { - int mode = engine_.GetOptions().GetOptionVal(OPTION_EXTERNALIPMODE); - - if (mode) - { - if (engine_.GetOptions().GetOptionVal(OPTION_NOEXTERNALONLOCAL) && - !fz::is_routable_address(m_pSocket->GetPeerIP().ToStdWstring())) - // Skip next block, use local address - goto getLocalIP; - } - - if (mode == 1) - { - wxString ip = engine_.GetOptions().GetOption(OPTION_EXTERNALIP); - if (!ip.empty()) - { - address = ip; - return FZ_REPLY_OK; - } - - LogMessage(MessageType::Debug_Warning, _("No external IP address set, trying default.")); - } - else if (mode == 2) { - if (!m_pIPResolver) { - const wxString& localAddress = m_pSocket->GetLocalIP(true); - - if (!localAddress.empty() && localAddress == engine_.GetOptions().GetOption(OPTION_LASTRESOLVEDIP)) { - LogMessage(MessageType::Debug_Verbose, _T("Using cached external IP address")); - - address = localAddress; - return FZ_REPLY_OK; - } - - wxString resolverAddress = engine_.GetOptions().GetOption(OPTION_EXTERNALIPRESOLVER); - - LogMessage(MessageType::Debug_Info, _("Retrieving external IP address from %s"), resolverAddress); - - m_pIPResolver = new CExternalIPResolver(*this); - m_pIPResolver->GetExternalIP(resolverAddress, CSocket::ipv4); - if (!m_pIPResolver->Done()) { - LogMessage(MessageType::Debug_Verbose, _T("Waiting for resolver thread")); - return FZ_REPLY_WOULDBLOCK; - } - } - if (!m_pIPResolver->Successful()) { - delete m_pIPResolver; - m_pIPResolver = 0; - - LogMessage(MessageType::Debug_Warning, _("Failed to retrieve external ip address, using local address")); - } - else { - LogMessage(MessageType::Debug_Info, _T("Got external IP address")); - address = m_pIPResolver->GetIP(); - - engine_.GetOptions().SetOption(OPTION_LASTRESOLVEDIP, address); - - delete m_pIPResolver; - m_pIPResolver = 0; - - return FZ_REPLY_OK; - } - } - } - -getLocalIP: - - address = m_pSocket->GetLocalIP(true); - if (address.empty()) - { - LogMessage(MessageType::Error, _("Failed to retrieve local ip address."), 1); - return FZ_REPLY_ERROR; - } - - return FZ_REPLY_OK; -} - -void CFtpControlSocket::OnExternalIPAddress() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::OnExternalIPAddress()")); - if (!m_pIPResolver) { - LogMessage(MessageType::Debug_Info, _T("Ignoring event")); - return; - } - - SendNextCommand(); -} - -int CFtpControlSocket::Transfer(const wxString& cmd, CFtpTransferOpData* oldData) -{ - wxASSERT(oldData); - oldData->tranferCommandSent = false; - - CRawTransferOpData *pData = new CRawTransferOpData; - pData->pNextOpData = m_pCurOpData; - m_pCurOpData = pData; - - pData->cmd = cmd; - pData->pOldData = oldData; - pData->pOldData->transferEndReason = TransferEndReason::successful; - - if (m_pProxyBackend) - { - // Only passive suported - // Theoretically could use reverse proxy ability in SOCKS5, but - // it is too fragile to set up with all those broken routers and - // firewalls sabotaging connections. Regular active mode is hard - // enough already - pData->bPasv = true; - pData->bTriedActive = true; - } - else - { - switch (m_pCurrentServer->GetPasvMode()) - { - case MODE_PASSIVE: - pData->bPasv = true; - break; - case MODE_ACTIVE: - pData->bPasv = false; - break; - default: - pData->bPasv = engine_.GetOptions().GetOptionVal(OPTION_USEPASV) != 0; - break; - } - } - - if ((pData->pOldData->binary && m_lastTypeBinary == 1) || - (!pData->pOldData->binary && m_lastTypeBinary == 0)) - pData->opState = rawtransfer_port_pasv; - else - pData->opState = rawtransfer_type; - - return SendNextCommand(); -} - -int CFtpControlSocket::TransferParseResponse() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::TransferParseResponse()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CRawTransferOpData *pData = static_cast(m_pCurOpData); - if (pData->opState == rawtransfer_init) - return FZ_REPLY_ERROR; - - int code = GetReplyCode(); - - LogMessage(MessageType::Debug_Debug, _T(" code = %d"), code); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - bool error = false; - switch (pData->opState) - { - case rawtransfer_type: - if (code != 2 && code != 3) - error = true; - else - { - pData->opState = rawtransfer_port_pasv; - m_lastTypeBinary = pData->pOldData->binary ? 1 : 0; - } - break; - case rawtransfer_port_pasv: - if (code != 2 && code != 3) - { - if (!engine_.GetOptions().GetOptionVal(OPTION_ALLOW_TRANSFERMODEFALLBACK)) - { - error = true; - break; - } - - if (pData->bTriedPasv) - if (pData->bTriedActive) - error = true; - else - pData->bPasv = false; - else - pData->bPasv = true; - break; - } - if (pData->bPasv) { - bool parsed; - if (GetPassiveCommand(*pData) == _T("EPSV")) - parsed = ParseEpsvResponse(pData); - else - parsed = ParsePasvResponse(pData); - if (!parsed) { - if (!engine_.GetOptions().GetOptionVal(OPTION_ALLOW_TRANSFERMODEFALLBACK)) { - error = true; - break; - } - - if (!pData->bTriedActive) - pData->bPasv = false; - else - error = true; - break; - } - } - if (pData->pOldData->resumeOffset > 0 || m_sentRestartOffset) - pData->opState = rawtransfer_rest; - else - pData->opState = rawtransfer_transfer; - break; - case rawtransfer_rest: - if (pData->pOldData->resumeOffset <= 0) - m_sentRestartOffset = false; - if (pData->pOldData->resumeOffset > 0 && code != 2 && code != 3) - error = true; - else - pData->opState = rawtransfer_transfer; - break; - case rawtransfer_transfer: - if (code == 1) { - pData->opState = rawtransfer_waitfinish; - } - else if (code == 2 || code == 3) { - // A few broken servers omit the 1yz reply. - pData->opState = rawtransfer_waitsocket; - } - else { - if (pData->pOldData->transferEndReason == TransferEndReason::successful) - pData->pOldData->transferEndReason = TransferEndReason::transfer_command_failure_immediate; - error = true; - } - break; - case rawtransfer_waittransferpre: - if (code == 1) { - pData->opState = rawtransfer_waittransfer; - } - else if (code == 2 || code == 3) { - // A few broken servers omit the 1yz reply. - if (pData->pOldData->transferEndReason != TransferEndReason::successful) { - error = true; - break; - } - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else { - if (pData->pOldData->transferEndReason == TransferEndReason::successful) - pData->pOldData->transferEndReason = TransferEndReason::transfer_command_failure_immediate; - error = true; - } - break; - case rawtransfer_waitfinish: - if (code != 2 && code != 3) { - if (pData->pOldData->transferEndReason == TransferEndReason::successful) - pData->pOldData->transferEndReason = TransferEndReason::transfer_command_failure; - error = true; - } - else - pData->opState = rawtransfer_waitsocket; - break; - case rawtransfer_waittransfer: - if (code != 2 && code != 3) { - if (pData->pOldData->transferEndReason == TransferEndReason::successful) - pData->pOldData->transferEndReason = TransferEndReason::transfer_command_failure; - error = true; - } - else { - if (pData->pOldData->transferEndReason != TransferEndReason::successful) { - error = true; - break; - } - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - break; - case rawtransfer_waitsocket: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Extra reply received during rawtransfer_waitsocket.")); - error = true; - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown op state")); - error = true; - } - if (error) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return SendNextCommand(); -} - -int CFtpControlSocket::TransferSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::TransferSend()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!m_pTransferSocket) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pTransferSocket")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CRawTransferOpData *pData = static_cast(m_pCurOpData); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - wxString cmd; - bool measureRTT = false; - switch (pData->opState) - { - case rawtransfer_type: - m_lastTypeBinary = -1; - if (pData->pOldData->binary) - cmd = _T("TYPE I"); - else - cmd = _T("TYPE A"); - measureRTT = true; - break; - case rawtransfer_port_pasv: - if (pData->bPasv) { - cmd = GetPassiveCommand(*pData); - } - else { - wxString address; - int res = GetExternalIPAddress(address); - if (res == FZ_REPLY_WOULDBLOCK) - return res; - else if (res == FZ_REPLY_OK) - { - wxString portArgument = m_pTransferSocket->SetupActiveTransfer(address); - if (!portArgument.empty()) - { - pData->bTriedActive = true; - if (m_pSocket->GetAddressFamily() == CSocket::ipv6) - cmd = _T("EPRT " + portArgument); - else - cmd = _T("PORT " + portArgument); - break; - } - } - - if (!engine_.GetOptions().GetOptionVal(OPTION_ALLOW_TRANSFERMODEFALLBACK) || pData->bTriedPasv) - { - LogMessage(MessageType::Error, _("Failed to create listening socket for active mode transfer")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - LogMessage(MessageType::Debug_Warning, _("Failed to create listening socket for active mode transfer")); - pData->bTriedActive = true; - pData->bPasv = true; - cmd = GetPassiveCommand(*pData); - } - break; - case rawtransfer_rest: - cmd = _T("REST ") + std::to_wstring(pData->pOldData->resumeOffset); - if (pData->pOldData->resumeOffset > 0) - m_sentRestartOffset = true; - measureRTT = true; - break; - case rawtransfer_transfer: - if (pData->bPasv) - { - if (!m_pTransferSocket->SetupPassiveTransfer(pData->host, pData->port)) - { - LogMessage(MessageType::Error, _("Could not establish connection to server")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - } - - cmd = pData->cmd; - pData->pOldData->tranferCommandSent = true; - - engine_.transfer_status_.SetStartTime(); - m_pTransferSocket->SetActive(); - break; - case rawtransfer_waitfinish: - case rawtransfer_waittransferpre: - case rawtransfer_waittransfer: - case rawtransfer_waitsocket: - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("invalid opstate")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - if (!cmd.empty()) - if (!SendCommand(cmd, false, measureRTT)) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -int CFtpControlSocket::FileTransferTestResumeCapability() -{ - LogMessage(MessageType::Debug_Verbose, _T("FileTransferTestResumeCapability()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CFtpFileTransferOpData *pData = static_cast(m_pCurOpData); - - if (!pData->download) - return FZ_REPLY_OK; - - for (int i = 0; i < 2; ++i) - { - if (pData->localFileSize >= ((wxFileOffset)1 << (i ? 31 : 32))) - { - switch (CServerCapabilities::GetCapability(*GetCurrentServer(), i ? resume2GBbug : resume4GBbug)) - { - case yes: - if (pData->remoteFileSize == pData->localFileSize) - { - LogMessage(MessageType::Debug_Info, _("Server does not support resume of files > %d GB. End transfer since file sizes match."), i ? 2 : 4); - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_CANCELED; - } - LogMessage(MessageType::Error, _("Server does not support resume of files > %d GB."), i ? 2 : 4); - ResetOperation(FZ_REPLY_CRITICALERROR); - return FZ_REPLY_ERROR; - case unknown: - if (pData->remoteFileSize < pData->localFileSize) - { - // Don't perform test - break; - } - if (pData->remoteFileSize == pData->localFileSize) - { - LogMessage(MessageType::Debug_Info, _("Server may not support resume of files > %d GB. End transfer since file sizes match."), i ? 2 : 4); - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_CANCELED; - } - else if (pData->remoteFileSize > pData->localFileSize) - { - LogMessage(MessageType::Status, _("Testing resume capabilities of server")); - - pData->opState = filetransfer_waitresumetest; - pData->resumeOffset = pData->remoteFileSize - 1; - - m_pTransferSocket = new CTransferSocket(engine_, *this, TransferMode::resumetest); - - return Transfer(_T("RETR ") + pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath), pData); - } - break; - case no: - break; - } - } - } - - return FZ_REPLY_OK; -} - -int CFtpControlSocket::Connect(const CServer &server) -{ - if (m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("deleting nonzero pData")); - delete m_pCurOpData; - } - - CFtpLogonOpData* pData = new CFtpLogonOpData; - m_pCurOpData = pData; - - // Do not use FTP proxy if generic proxy is set - int generic_proxy_type = engine_.GetOptions().GetOptionVal(OPTION_PROXY_TYPE); - if ((generic_proxy_type <= CProxySocket::unknown || generic_proxy_type >= CProxySocket::proxytype_count) && - (pData->ftp_proxy_type = engine_.GetOptions().GetOptionVal(OPTION_FTP_PROXY_TYPE)) && !server.GetBypassProxy()) - { - pData->host = engine_.GetOptions().GetOption(OPTION_FTP_PROXY_HOST); - - int pos = -1; - if (!pData->host.empty() && pData->host[0] == '[') { - // Probably IPv6 address - pos = pData->host.Find(']'); - if (pos < 0) { - LogMessage(MessageType::Error, _("Proxy host starts with '[' but no closing bracket found.")); - DoClose(FZ_REPLY_CRITICALERROR); - return FZ_REPLY_ERROR; - } - if (pData->host.size() > static_cast(pos + 1) && pData->host[pos + 1]) { - if (pData->host[pos + 1] != ':') { - LogMessage(MessageType::Error, _("Invalid proxy host, after closing bracket only colon and port may follow.")); - DoClose(FZ_REPLY_CRITICALERROR); - return FZ_REPLY_ERROR; - } - ++pos; - } - else - pos = -1; - } - else - pos = pData->host.Find(':'); - - if (pos != -1) { - unsigned long port = 0; - if (!pData->host.Mid(pos + 1).ToULong(&port)) - port = 0; - pData->host = pData->host.Left(pos); - pData->port = port; - } - else - pData->port = 21; - - if (pData->host.empty() || pData->port < 1 || pData->port > 65535) { - LogMessage(MessageType::Error, _("Proxy set but proxy host or port invalid")); - DoClose(FZ_REPLY_CRITICALERROR); - return FZ_REPLY_ERROR; - } - - LogMessage(MessageType::Status, _("Connecting to %s through %s proxy"), server.FormatHost(), _T("FTP")); // @translator: Connecting to ftp.example.com through SOCKS5 proxy - } - else { - pData->ftp_proxy_type = 0; - pData->host = server.GetHost(); - pData->port = server.GetPort(); - } - - if (server.GetProtocol() != FTPES && server.GetProtocol() != FTP) { - pData->neededCommands[LOGON_AUTH_TLS] = 0; - pData->neededCommands[LOGON_AUTH_SSL] = 0; - pData->neededCommands[LOGON_AUTH_WAIT] = 0; - if (server.GetProtocol() != FTPS) { - pData->neededCommands[LOGON_PBSZ] = 0; - pData->neededCommands[LOGON_PROT] = 0; - } - } - if (server.GetPostLoginCommands().empty()) - pData->neededCommands[LOGON_CUSTOMCOMMANDS] = 0; - - if (!GetLoginSequence(server)) - return DoClose(FZ_REPLY_INTERNALERROR); - - return CRealControlSocket::Connect(server); -} - -bool CFtpControlSocket::CheckInclusion(const CDirectoryListing& listing1, const CDirectoryListing& listing2) -{ - // Check if listing2 is contained within listing1 - - if (listing2.GetCount() > listing1.GetCount()) - return false; - - std::vector names1, names2; - listing1.GetFilenames(names1); - listing2.GetFilenames(names2); - std::sort(names1.begin(), names1.end()); - std::sort(names2.begin(), names2.end()); - - std::vector::const_iterator iter1, iter2; - iter1 = names1.cbegin(); - iter2 = names2.cbegin(); - while (iter2 != names2.cbegin()) { - if (iter1 == names1.cend()) - return false; - - if (*iter1 != *iter2) { - ++iter1; - continue; - } - - ++iter1; - ++iter2; - } - - return true; -} - -void CFtpControlSocket::OnTimer(fz::timer_id id) -{ - if (id != m_idleTimer) { - CControlSocket::OnTimer(id); - return; - } - - if (m_pCurOpData) - return; - - if (m_pendingReplies || m_repliesToSkip) - return; - - LogMessage(MessageType::Status, _("Sending keep-alive command")); - - wxString cmd; - int i = fz::random_number(0, 2); - if (!i) - cmd = _T("NOOP"); - else if (i == 1) - { - if (m_lastTypeBinary) - cmd = _T("TYPE I"); - else - cmd = _T("TYPE A"); - } - else - cmd = _T("PWD"); - - if (!SendCommand(cmd)) - return; - ++m_repliesToSkip; -} - -void CFtpControlSocket::StartKeepaliveTimer() -{ - if (!engine_.GetOptions().GetOptionVal(OPTION_FTP_SENDKEEPALIVE)) - return; - - if (m_repliesToSkip || m_pendingReplies) - return; - - if (!m_lastCommandCompletionTime) - return; - - fz::duration const span = fz::monotonic_clock::now() - m_lastCommandCompletionTime; - if (span.get_minutes() >= 30) { - return; - } - - stop_timer(m_idleTimer); - m_idleTimer = add_timer(fz::duration::from_seconds(30), true); -} - -int CFtpControlSocket::ParseSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CFtpControlSocket::ParseSubcommandResult(%d)"), prevResult); - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("ParseSubcommandResult called without active operation")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - switch (m_pCurOpData->opId) - { - case Command::cwd: - return ChangeDirSubcommandResult(prevResult); - case Command::list: - return ListSubcommandResult(prevResult); - case Command::transfer: - return FileTransferSubcommandResult(prevResult); - case Command::del: - return DeleteSubcommandResult(prevResult); - case Command::removedir: - return RemoveDirSubcommandResult(prevResult); - case Command::rename: - return RenameSubcommandResult(prevResult); - case Command::chmod: - return ChmodSubcommandResult(prevResult); - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown opID (%d) in ParseSubcommandResult"), m_pCurOpData->opId); - ResetOperation(FZ_REPLY_INTERNALERROR); - break; - } - - return FZ_REPLY_ERROR; -} - -void CFtpControlSocket::operator()(fz::event_base const& ev) -{ - if (fz::dispatch(ev, this, &CFtpControlSocket::OnTimer)) { - return; - } - - if (fz::dispatch(ev, this, &CFtpControlSocket::OnExternalIPAddress)) { - return; - } - - CRealControlSocket::operator()(ev); -} - -wxString CFtpControlSocket::GetPassiveCommand(CRawTransferOpData& data) -{ - wxString ret = _T("PASV"); - - wxASSERT(data.bPasv); - data.bTriedPasv = true; - - if (m_pProxyBackend) { - // We don't actually know the address family the other end of the proxy uses to reach the server. Hence prefer EPSV - // if the server supports it. - if (CServerCapabilities::GetCapability(*m_pCurrentServer, epsv_command) == yes) { - ret = _T("EPSV"); - } - } - else if (m_pSocket->GetAddressFamily() == CSocket::ipv6) { - // EPSV is mandatory for IPv6, don't check capabilities - ret = _T("EPSV"); - } - return ret; -} diff -Nru filezilla-3.15.0.2/src/engine/ftpcontrolsocket.h filezilla-3.33.0/src/engine/ftpcontrolsocket.h --- filezilla-3.15.0.2/src/engine/ftpcontrolsocket.h 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/ftpcontrolsocket.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,206 +0,0 @@ -#ifndef __FTPCONTROLSOCKET_H__ -#define __FTPCONTROLSOCKET_H__ - -#include "logging_private.h" -#include "ControlSocket.h" -#include "externalipresolver.h" -#include "rtt.h" - -#include - -#define RECVBUFFERSIZE 4096 -#define MAXLINELEN 2000 - -class CTransferSocket; -class CFtpTransferOpData; -class CRawTransferOpData; -class CTlsSocket; - -class CFtpControlSocket final : public CRealControlSocket -{ - friend class CTransferSocket; -public: - CFtpControlSocket(CFileZillaEnginePrivate & engine); - virtual ~CFtpControlSocket(); - virtual void TransferEnd(); - - virtual bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification); - -protected: - - virtual int ResetOperation(int nErrorCode); - - virtual int Connect(const CServer &server); - virtual int List(CServerPath path = CServerPath(), wxString subDir = _T(""), int flags = 0); - int ListParseResponse(); - int ListSubcommandResult(int prevResult); - int ListSend(); - int ListCheckTimezoneDetection(CDirectoryListing& listing); - - int ChangeDir(CServerPath path = CServerPath(), wxString subDir = _T(""), bool link_discovery = false); - int ChangeDirParseResponse(); - int ChangeDirSubcommandResult(int prevResult); - int ChangeDirSend(); - - virtual int FileTransfer(const wxString localFile, const CServerPath &remotePath, - const wxString &remoteFile, bool download, - const CFileTransferCommand::t_transferSettings& transferSettings); - int FileTransferParseResponse(); - int FileTransferSubcommandResult(int prevResult); - int FileTransferSend(); - int FileTransferTestResumeCapability(); - - virtual int RawCommand(const wxString& command); - int RawCommandSend(); - int RawCommandParseResponse(); - - virtual int Delete(const CServerPath& path, std::deque&& files); - int DeleteSubcommandResult(int prevResult); - int DeleteSend(); - int DeleteParseResponse(); - - virtual int RemoveDir(const CServerPath& path, const wxString& subDir); - int RemoveDirSubcommandResult(int prevResult); - int RemoveDirSend(); - int RemoveDirParseResponse(); - - virtual int Mkdir(const CServerPath& path); - virtual int MkdirParseResponse(); - virtual int MkdirSend(); - - virtual int Rename(const CRenameCommand& command); - virtual int RenameParseResponse(); - virtual int RenameSubcommandResult(int prevResult); - virtual int RenameSend(); - - virtual int Chmod(const CChmodCommand& command); - virtual int ChmodParseResponse(); - virtual int ChmodSubcommandResult(int prevResult); - virtual int ChmodSend(); - - virtual int Transfer(const wxString& cmd, CFtpTransferOpData* oldData); - virtual int TransferParseResponse(); - virtual int TransferSend(); - - virtual void OnConnect(); - virtual void OnReceive(); - - bool SendCommand(wxString const& str, bool maskArgs = false, bool measureRTT = true); - - // Parse the latest reply line from the server - void ParseLine(wxString line); - - // Parse the actual response and delegate it to the handlers. - // It's the last line in a multi-line response. - void ParseResponse(); - - void ParseFeat(wxString line); - - virtual int SendNextCommand(); - virtual int ParseSubcommandResult(int prevResult); - - int GetReplyCode() const; - - int Logon(); - int LogonParseResponse(); - int LogonSend(); - - wxString GetPassiveCommand(CRawTransferOpData& data); - bool ParsePasvResponse(CRawTransferOpData* pData); - bool ParseEpsvResponse(CRawTransferOpData* pData); - - // Some servers are broken. Instead of an empty listing, some MVS servers - // for example they return "550 no members found" - // Other servers return "550 No files found." - bool IsMisleadingListResponse() const; - - int GetExternalIPAddress(wxString& address); - - // Checks if listing2 is a subset of listing1. Compares only filenames. - bool CheckInclusion(const CDirectoryListing& listing1, const CDirectoryListing& listing2); - - void StartKeepaliveTimer(); - - bool GetLoginSequence(const CServer& server); - - wxString m_Response; - wxString m_MultilineResponseCode; - std::vector m_MultilineResponseLines; - - CTransferSocket *m_pTransferSocket; - - // Some servers keep track of the offset specified by REST between sessions - // So we always sent a REST 0 for a normal transfer following a restarted one - bool m_sentRestartOffset; - - char m_receiveBuffer[RECVBUFFERSIZE]; - int m_bufferLen; - int m_repliesToSkip; // Set to the amount of pending replies if cancelling an action - - int m_pendingReplies; - - CExternalIPResolver* m_pIPResolver; - - CTlsSocket* m_pTlsSocket; - bool m_protectDataChannel; - - int m_lastTypeBinary; - - // Used by keepalive code so that we're not using keep alive - // till the end of time. Stop after a couple of minutes. - fz::monotonic_clock m_lastCommandCompletionTime; - - fz::timer_id m_idleTimer{}; - - CLatencyMeasurement m_rtt; - - virtual void operator()(fz::event_base const& ev); - - void OnExternalIPAddress(); - void OnTimer(fz::timer_id id); - - wxRegEx m_pasvReplyRegex; // Have it as class member to avoid recompiling the regex on each transfer or listing -}; - -class CIOThread; - -class CFtpTransferOpData -{ -public: - CFtpTransferOpData() = default; - virtual ~CFtpTransferOpData() {} - - TransferEndReason transferEndReason{TransferEndReason::successful}; - bool tranferCommandSent{}; - - int64_t resumeOffset{}; - bool binary{true}; -}; - -class CFtpFileTransferOpData final : public CFileTransferOpData, public CFtpTransferOpData -{ -public: - CFtpFileTransferOpData(bool is_download, const wxString& local_file, const wxString& remote_file, const CServerPath& remote_path); - virtual ~CFtpFileTransferOpData(); - - CIOThread *pIOThread{}; - bool fileDidExist{true}; -}; - -class CRawTransferOpData final : public COpData -{ -public: - CRawTransferOpData(); - wxString cmd; - - CFtpTransferOpData* pOldData; - - bool bPasv; - bool bTriedPasv; - bool bTriedActive; - - wxString host; - int port; -}; - -#endif diff -Nru filezilla-3.15.0.2/src/engine/http/connect.h filezilla-3.33.0/src/engine/http/connect.h --- filezilla-3.15.0.2/src/engine/http/connect.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/connect.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,21 @@ +#ifndef FILEZILLA_ENGINE_HTTP_CONNECT_HEADER +#define FILEZILLA_ENGINE_HTTP_CONNECT_HEADER + +#include "httpcontrolsocket.h" + +// Connect is special for HTTP: It is done on a per-command basis, so we need +// to establish a connection before each command. +// The general connect of the control socket is a NOOP. +class CHttpConnectOpData final : public COpData, public CHttpOpData +{ +public: + CHttpConnectOpData(CHttpControlSocket & controlSocket) + : COpData(Command::connect) + , CHttpOpData(controlSocket) + {} + + virtual int Send() override { return FZ_REPLY_OK; } + virtual int ParseResponse() override { return FZ_REPLY_INTERNALERROR; } +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/http/digest.cpp filezilla-3.33.0/src/engine/http/digest.cpp --- filezilla-3.15.0.2/src/engine/http/digest.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/digest.cpp 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,316 @@ +#include + +#include "digest.h" +#include "logging_private.h" + +#include +#include +#include +#include + +#include +#include + +namespace { +void skipwscomma(char const*& p) +{ + while (*p && (*p == ' ' || *p == ',')) { + ++p; + } +} + +std::string unquote(char const* p, char const* end) { + + if (end - p > 2 && *p == '"') { + std::string ret; + + ++p; + --end; + + ret.reserve(end - p); + + bool escaped = false; + while (p != end) { + if (escaped) { + ret.push_back(*p); + escaped = false; + } + else if (*p == '\\') { + escaped = true; + } + else { + ret.push_back(*p); + } + ++p; + } + return ret; + } + else { + return std::string(p, end); + } +} + + +char const* getNext(char const*&p, char const*& sep) +{ + sep = 0; + + skipwscomma(p); + + if (!*p) { + return nullptr; + } + + char const* start = p; + ++p; + + while (*p) { + if (*p == '=') { + sep = p; + ++p; + if (*p == '"') { + // quoted-string part of auth-param + ++p; + bool escaped = false; + while (*p) { + if (*p == '"') { + if (!escaped) { + ++p; + if (*p && *p != ',' && *p != ' ') { + return nullptr; + } + return start; + } + } + else { + if (escaped) { + escaped = false; + } + else if (*p == '\\') { + escaped = true; + } + } + ++p; + } + + return nullptr; + } + else { + // token86 or token + bool t86 = true; + while (*p && *p != ',' && *p != ' ') { + if (*p != '=') { + t86 = false; + } + ++p; + } + if (t86) { + sep = nullptr; + } + return start; + } + } + else if (*p == ' ' || *p == ',') { + // token86, or next scheme. Caller decides + return start; + } + ++p; + } + + // token86, or next scheme. Caller decides + return start; +} +} + +HttpAuthChallenges ParseAuthChallenges(std::string const& header) +{ + // See RFC 7235 how to parse this terrible header. + + HttpAuthChallenges ret; + + char const* p = header.c_str(); + char const* next_scheme = 0; + while (*p) { + + char const* scheme_start; + if (next_scheme) { + scheme_start = next_scheme; + next_scheme = 0; + } + else { + // Extract the scheme + skipwscomma(p); + scheme_start = p; + while (*p && *p != ' ') { + ++p; + } + + if (!*p || scheme_start == p) { + return ret; + } + } + auto const scheme_end = p; + + // Now extract auth params + + HttpAuthParams params; + + while (*p) { + char const* sep = 0; + auto start = getNext(p, sep); + if (!start) { + break; + } + + if (!sep) { + if (params.empty()) { + // token86 + params[""] = std::string(start, p); + } + else { + // It's the next scheme + next_scheme = start; + } + break; + } + else { + params[std::string(start, sep)] = unquote(sep + 1, p); + } + } + + if (params.empty()) { + return ret; + } + + ret[std::string(scheme_start, scheme_end)] = params; + } + + return ret; +} + +namespace { +std::string quote(std::string const& in) +{ + return "\"" + fz::replaced_substrings(fz::replaced_substrings(in, "\\", "\\\\"), "\"", "\\\"") + "\""; +} + +std::string md5(std::string const& in) +{ + std::string md5; + md5.resize(16); + + md5_ctx ctx_md5; + nettle_md5_init(&ctx_md5); + nettle_md5_update(&ctx_md5, in.size(), reinterpret_cast(in.c_str())); + nettle_md5_digest(&ctx_md5, md5.size(), reinterpret_cast(&md5[0])); + + return fz::hex_encode(md5); +} + +std::string sha256(std::string const& in) +{ + std::string sha256; + sha256.resize(32); + + sha256_ctx ctx_sha256; + nettle_sha256_init(&ctx_sha256); + nettle_sha256_update(&ctx_sha256, in.size(), reinterpret_cast(in.c_str())); + nettle_sha256_digest(&ctx_sha256, sha256.size(), reinterpret_cast(&sha256[0])); + + return fz::hex_encode(sha256); +} + +template +typename T::mapped_type get(T const& t, K && key) +{ + auto it = t.find(std::forward(key)); + if (it != t.cend()) { + return it->second; + } + return typename T::mapped_type(); +} +} + +std::string BuildDigestAuthorization(HttpAuthParams const& params, unsigned int & nonceCounter, std::string const& verb, fz::uri const& uri, std::string const& user, Credentials const& credentials, CLogging & logger) +{ + // See RFC 7616 + + std::string auth = "Digest username="; + + auth += quote(user); + + std::string const opaque = get(params, "opaque"); + std::string const nonce = get(params, "nonce"); + std::string const realm = get(params, "realm"); + + auth += ", realm=" + quote(realm); + auth += ", nonce=" + quote(nonce); + + if (!opaque.empty()) { + auth += ", opaque=" + quote(opaque); + } + auth += ", uri=" + quote(uri.to_string()); + + std::string fullAlgorithm = get(params, "algorithm"); + if (fullAlgorithm.empty()) { + fullAlgorithm = "MD5"; + } + auth += ", algorithm=" + fullAlgorithm; + + unsigned int nc = nonceCounter++; + auth += ", nc=" + fz::sprintf("%x", nc); + + + bool sess = false; + auto algo = fz::str_toupper_ascii(fullAlgorithm); + if (algo.size() > 5 && algo.substr(algo.size() - 5) == "-sess") { + sess = true; + algo = algo.substr(0, algo.size() - 5); + } + + std::string (*h)(std::string const&) = 0; + if (algo == "MD5") { + h = &md5; + } + else if (algo == "SHA-256") { + h = &sha256; + } + else { + logger.LogMessage(MessageType::Error, _("Server requested unsupported digest authentication algorithm: %s"), fullAlgorithm); + return std::string(); + } + + bool qop = false; + auto qops = fz::strtok(get(params, "qop"), ","); + if (!qops.empty()) { + if (std::find(qops.cbegin(), qops.cend(), "auth") == qops.cend()) { + logger.LogMessage(MessageType::Error, _("Server requested unsupported quality-of-protection: %s"), get(params, "qop")); + return std::string(); + } + qop = true; + } + + auto bytes = fz::random_bytes(16); + std::string const cnonce = fz::base64_encode(std::string(bytes.cbegin(), bytes.cend())); + auth += ", cnonce=" + quote(cnonce); + + std::string a1 = h(user + ":" + realm + ":" + fz::to_utf8(credentials.GetPass())); + std::string ha2 = h(verb + ":" + uri.to_string()); + + std::string response; + if (sess) { + a1 = h(a1 + ":" + nonce + ":" + cnonce); + } + + if (qop) { + auth += ", qop=auth"; + response = h(a1 + ":" + nonce + ":" + fz::sprintf("%x", nc) + ":" + cnonce + ":auth:" + ha2); + } + else { + response = h(a1 + ":" + nonce + ":" + ha2); + } + + auth += ", response=" + quote(response); + + return auth; +} diff -Nru filezilla-3.15.0.2/src/engine/http/digest.h filezilla-3.33.0/src/engine/http/digest.h --- filezilla-3.15.0.2/src/engine/http/digest.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/digest.h 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,20 @@ +#ifndef FILEZILLA_ENGINE_HTTP_DIGEST_HEADER +#define FILEZILLA_ENGINE_HTTP_DIGEST_HEADER + +#include "httpheaders.h" + +class CLogging; + +namespace fz { +class uri; +} + + +typedef HttpHeaders HttpAuthParams; +typedef std::map HttpAuthChallenges; + +HttpAuthChallenges ParseAuthChallenges(std::string const& header); + +std::string BuildDigestAuthorization(HttpAuthParams const& params, unsigned int & nonceCounter, std::string const& verb, fz::uri const& uri, std::string const& user, Credentials const& credentials, CLogging & logger); + +#endif diff -Nru filezilla-3.15.0.2/src/engine/http/filetransfer.cpp filezilla-3.33.0/src/engine/http/filetransfer.cpp --- filezilla-3.15.0.2/src/engine/http/filetransfer.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/filetransfer.cpp 2018-04-02 19:05:52.000000000 +0000 @@ -0,0 +1,229 @@ +#include + +#include "filetransfer.h" + +#include + +#include + +enum filetransferStates +{ + filetransfer_init = 0, + filetransfer_waitfileexists, + filetransfer_transfer, + filetransfer_waittransfer +}; + +int CHttpFileTransferOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpFileTransferOpData::Send() in state %d", opState); + + switch (opState) { + case filetransfer_init: + if (!download_) { + return FZ_REPLY_NOTSUPPORTED; + } + + // TODO: Ordinarily we need to percent-encode the filename. With the current API we then however would not be able to pass the query part of the URL + rr_.request_.uri_ = fz::uri(fz::to_utf8(currentServer_.Format(ServerFormat::url)) + fz::to_utf8(remotePath_.FormatFilename(remoteFile_))); + if (rr_.request_.uri_.empty()) { + LogMessage(MessageType::Error, _("Could not create URI for this transfer.")); + return FZ_REPLY_ERROR; + } + + rr_.request_.verb_ = "GET"; + + opState = filetransfer_waitfileexists; + if (!localFile_.empty()) { + localFileSize_ = fz::local_filesys::get_size(fz::to_native(localFile_)); + + int res = controlSocket_.CheckOverwriteFile(); + if (res != FZ_REPLY_OK) { + return res; + } + } + return FZ_REPLY_CONTINUE; + case filetransfer_waitfileexists: + if (!localFile_.empty()) { + int res = OpenFile(); + if (res != FZ_REPLY_OK) { + return res; + } + } + opState = filetransfer_transfer; + return FZ_REPLY_CONTINUE; + case filetransfer_transfer: + if (resume_) { + rr_.request_.headers_["Range"] = fz::sprintf("bytes=%d-", localFileSize_); + } + + rr_.response_ = HttpResponse(); + rr_.response_.on_header_ = [this](auto const&) { return this->OnHeader(); }; + rr_.response_.on_data_ = [this](auto data, auto len) { return this->OnData(data, len); }; + + opState = filetransfer_waittransfer; + controlSocket_.Request(make_simple_rr(&rr_)); + return FZ_REPLY_CONTINUE; + default: + break; + } + + return FZ_REPLY_INTERNALERROR; +} + +int CHttpFileTransferOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpFileTransferOpData::ParseResponse() in state %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CHttpFileTransferOpData::OpenFile() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpFileTransferOpData::OpenFile"); + file_.close(); + + controlSocket_.CreateLocalDir(localFile_); + + if (!file_.open(fz::to_native(localFile_), + download_ ? fz::file::writing : fz::file::reading, + fz::file::existing)) + { + LogMessage(MessageType::Error, _("Failed to open \"%s\" for writing"), localFile_); + return FZ_REPLY_ERROR; + } + + assert(download_); + int64_t end = file_.seek(0, fz::file::end); + if (end < 0) { + LogMessage(MessageType::Error, _("Could not seek to the end of the file")); + return FZ_REPLY_ERROR; + } + if (!end) { + resume_ = false; + } + localFileSize_ = fz::local_filesys::get_size(fz::to_native(localFile_)); + return FZ_REPLY_OK; +} + +int CHttpFileTransferOpData::OnHeader() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpFileTransferOpData::OnHeader"); + + if (rr_.response_.code_ == 416 && resume_) { + assert(file_.opened()); + if (file_.seek(0, fz::file::begin) != 0) { + LogMessage(MessageType::Error, _("Could not seek to the beginning of the file")); + return FZ_REPLY_ERROR; + } + resume_ = false; + + opState = filetransfer_transfer; + return FZ_REPLY_ERROR; + } + + if (rr_.response_.code_ < 200 || rr_.response_.code_ >= 400) { + return FZ_REPLY_ERROR; + } + + // Handle any redirects + if (rr_.response_.code_ >= 300) { + + if (++redirectCount_ >= 6) { + LogMessage(MessageType::Error, _("Too many redirects")); + return FZ_REPLY_ERROR; + } + + if (rr_.response_.code_ == 305) { + LogMessage(MessageType::Error, _("Unsupported redirect")); + return FZ_REPLY_ERROR; + } + + fz::uri location = fz::uri(rr_.response_.get_header("Location")); + if (!location.empty()) { + location.resolve(rr_.request_.uri_); + } + + if (location.scheme_.empty() || location.host_.empty() || !location.is_absolute()) { + LogMessage(MessageType::Error, _("Redirection to invalid or unsupported URI: %s"), location.to_string()); + return FZ_REPLY_ERROR; + } + + ServerProtocol protocol = CServer::GetProtocolFromPrefix(fz::to_wstring_from_utf8(location.scheme_)); + if (protocol != HTTP && protocol != HTTPS) { + LogMessage(MessageType::Error, _("Redirection to invalid or unsupported address: %s"), location.to_string()); + return FZ_REPLY_ERROR; + } + + // International domain names + std::wstring host = fz::to_wstring_from_utf8(location.host_); + if (host.empty()) { + LogMessage(MessageType::Error, _("Invalid hostname: %s"), location.to_string()); + return FZ_REPLY_ERROR; + } + + rr_.request_.uri_ = location; + + opState = filetransfer_transfer; + return FZ_REPLY_OK; + } + + // Check if the server disallowed resume + if (resume_ && rr_.response_.code_ != 206) { + assert(file_.opened()); + if (file_.seek(0, fz::file::begin) != 0) { + LogMessage(MessageType::Error, _("Could not seek to the beginning of the file")); + return FZ_REPLY_ERROR; + } + resume_ = false; + } + + int64_t totalSize = fz::to_integral(rr_.response_.get_header("Content-Length"), -1); + if (totalSize == -1) { + if (remoteFileSize_ != -1) { + totalSize = remoteFileSize_; + } + } + + if (engine_.transfer_status_.empty()) { + engine_.transfer_status_.Init(totalSize, resume_ ? localFileSize_ : 0, false); + engine_.transfer_status_.SetStartTime(); + } + + return FZ_REPLY_CONTINUE; +} + +int CHttpFileTransferOpData::OnData(unsigned char const* data, unsigned int len) +{ + if (opState != filetransfer_waittransfer) { + return FZ_REPLY_INTERNALERROR; + } + + if (localFile_.empty()) { + char* q = new char[len]; + memcpy(q, data, len); + engine_.AddNotification(new CDataNotification(q, len)); + } + else { + assert(file_.opened()); + + auto write = static_cast(len); + if (file_.write(data, write) != write) { + LogMessage(MessageType::Error, _("Failed to write to file %s"), localFile_); + return FZ_REPLY_ERROR; + } + } + + engine_.transfer_status_.Update(len); + + return FZ_REPLY_CONTINUE; +} + +int CHttpFileTransferOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpFileTransferOpData::SubcommandResult() in state %d", opState); + + if (opState == filetransfer_transfer) { + return FZ_REPLY_CONTINUE; + } + return prevResult; +} diff -Nru filezilla-3.15.0.2/src/engine/http/filetransfer.h filezilla-3.33.0/src/engine/http/filetransfer.h --- filezilla-3.15.0.2/src/engine/http/filetransfer.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/filetransfer.h 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef FILEZILLA_ENGINE_HTTP_FILETRANSFER_HEADER +#define FILEZILLA_ENGINE_HTTP_FILETRANSFER_HEADER + +#include "httpcontrolsocket.h" + +class CServerPath; + +class CHttpFileTransferOpData final : public CFileTransferOpData, public CHttpOpData +{ +public: + CHttpFileTransferOpData(CHttpControlSocket & controlSocket, bool is_download, std::wstring const& local_file, std::wstring const& remote_file, CServerPath const& remote_path) + : CFileTransferOpData(is_download, local_file, remote_file, remote_path) + , CHttpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + +private: + int OpenFile(); + + int OnHeader(); + int OnData(unsigned char const* data, unsigned int len); + + HttpRequestResponse rr_; + fz::file file_; + + int redirectCount_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/http/httpcontrolsocket.cpp filezilla-3.33.0/src/engine/http/httpcontrolsocket.cpp --- filezilla-3.15.0.2/src/engine/http/httpcontrolsocket.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/httpcontrolsocket.cpp 2018-04-27 11:26:14.000000000 +0000 @@ -0,0 +1,353 @@ +#include + +#include "connect.h" +#include "ControlSocket.h" +#include "engineprivate.h" +#include "filetransfer.h" +#include "httpcontrolsocket.h" +#include "internalconnect.h" +#include "request.h" +#include "tlssocket.h" + +#include +#include +#include +#include + +#include + +int simple_body::data_request(unsigned char* data, unsigned int & len) +{ + len = std::min(static_cast(len), body_.size() - written_); + memcpy(data, body_.c_str() + written_, len); + written_ += len; + return FZ_REPLY_CONTINUE; +} + + +file_body::file_body(fz::file & file, uint64_t start, uint64_t size, CLogging & logger) + : file_(file) + , start_(start) + , size_(size) + , logger_(logger) +{ +} + +int file_body::data_request(unsigned char* data, unsigned int & len) +{ + assert(size_ >= written_); + assert(len > 0); + len = static_cast(std::min(static_cast(len), size_ - written_)); + auto bytes_read = file_.read(data, len); + if (bytes_read < 0) { + len = 0; + logger_.LogMessage(MessageType::Error, _("Reading from local file failed")); + return FZ_REPLY_ERROR; + } + else if (bytes_read == 0) { + len = 0; + return FZ_REPLY_ERROR; + } + + if (progress_callback_) { + progress_callback_(bytes_read); + } + + len = static_cast(bytes_read); + written_ += len; + return FZ_REPLY_CONTINUE; +} + +int file_body::rewind() +{ + if (progress_callback_) { + progress_callback_(-static_cast(written_)); + } + written_ = 0; + + int64_t s = static_cast(start_); + if (file_.seek(s, fz::file::begin) != s) { + if (!start_) { + logger_.LogMessage(MessageType::Error, _("Could not seek to the beginning of the file")); + } + else { + logger_.LogMessage(MessageType::Error, _("Could not seek to offset %d within file"), start_); + } + return FZ_REPLY_ERROR; + } + + return FZ_REPLY_CONTINUE; +} + + +int HttpRequest::reset() +{ + flags_ = 0; + + if (body_) { + int res = body_->rewind(); + if (res != FZ_REPLY_CONTINUE) { + return res; + } + } + return FZ_REPLY_CONTINUE; +} + +int HttpResponse::reset() +{ + flags_ = 0; + code_ = 0; + headers_.clear(); + + return FZ_REPLY_CONTINUE; +} + +CHttpControlSocket::CHttpControlSocket(CFileZillaEnginePrivate & engine) + : CRealControlSocket(engine) +{ +} + +CHttpControlSocket::~CHttpControlSocket() +{ + remove_handler(); + DoClose(); +} + +bool CHttpControlSocket::SetAsyncRequestReply(CAsyncRequestNotification *pNotification) +{ + if (operations_.empty() || !operations_.back()->waitForAsyncRequest) { + LogMessage(MessageType::Debug_Info, L"Not waiting for request reply, ignoring request reply %d", pNotification->GetRequestID()); + } + + operations_.back()->waitForAsyncRequest = false; + + switch (pNotification->GetRequestID()) + { + case reqId_fileexists: + { + if (operations_.back()->opId != Command::transfer) { + LogMessage(MessageType::Debug_Info, L"No or invalid operation in progress, ignoring request reply %f", pNotification->GetRequestID()); + return false; + } + + CFileExistsNotification *pFileExistsNotification = static_cast(pNotification); + return SetFileExistsAction(pFileExistsNotification); + } + break; + case reqId_certificate: + { + if (!m_pTlsSocket || m_pTlsSocket->GetState() != CTlsSocket::TlsState::verifycert) { + LogMessage(MessageType::Debug_Info, L"No or invalid operation in progress, ignoring request reply %d", pNotification->GetRequestID()); + return false; + } + + CCertificateNotification* pCertificateNotification = static_cast(pNotification); + m_pTlsSocket->TrustCurrentCert(pCertificateNotification->m_trusted); + } + break; + default: + LogMessage(MessageType::Debug_Warning, L"Unknown request %d", pNotification->GetRequestID()); + ResetOperation(FZ_REPLY_INTERNALERROR); + return false; + } + + return true; +} + + +void CHttpControlSocket::OnReceive() +{ + if (operations_.empty() || operations_.back()->opId != PrivCommand::http_request) { + uint8_t buffer; + int error{}; + int read = m_pBackend->Read(&buffer, 1, error); + if (!read) { + LogMessage(MessageType::Debug_Warning, L"Idle socket got closed"); + ResetSocket(); + } + else if (read == -1) { + if (error != EAGAIN) { + LogMessage(MessageType::Debug_Warning, L"OnReceive called while not processing http request. Reading fails with error %d, closing socket.", error); + ResetSocket(); + } + } + else if (read) { + LogMessage(MessageType::Debug_Warning, L"Server sent data while not in an active HTTP request, closing socket."); + ResetSocket(); + } + return; + } + + int res = static_cast(*operations_.back()).OnReceive(); + if (res == FZ_REPLY_CONTINUE) { + SendNextCommand(); + } + else if (res != FZ_REPLY_WOULDBLOCK) { + ResetOperation(res); + } +} + +void CHttpControlSocket::OnConnect() +{ + if (operations_.empty() || operations_.back()->opId != PrivCommand::http_connect) { + LogMessage(MessageType::Debug_Warning, L"Discarding stale OnConnect"); + return; + } + + auto & data = static_cast(*operations_.back()); + + if (data.tls_) { + if (!m_pTlsSocket) { + LogMessage(MessageType::Status, _("Connection established, initializing TLS...")); + + delete m_pBackend; + m_pTlsSocket = new CTlsSocket(this, *socket_, this); + m_pBackend = m_pTlsSocket; + + if (!m_pTlsSocket->Init()) { + LogMessage(MessageType::Error, _("Failed to initialize TLS.")); + DoClose(); + return; + } + + int res = m_pTlsSocket->Handshake(); + if (res == FZ_REPLY_ERROR) { + DoClose(); + } + } + else { + LogMessage(MessageType::Status, _("TLS connection established, sending HTTP request")); + ResetOperation(FZ_REPLY_OK); + } + } + else { + LogMessage(MessageType::Status, _("Connection established, sending HTTP request")); + ResetOperation(FZ_REPLY_OK); + } +} + +void CHttpControlSocket::FileTransfer(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpControlSocket::FileTransfer()"); + + if (download) { + LogMessage(MessageType::Status, _("Downloading %s"), remotePath.FormatFilename(remoteFile)); + } + + Push(std::make_unique(*this, download, localFile, remoteFile, remotePath)); +} + +void CHttpControlSocket::Request(std::shared_ptr const& request) +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpControlSocket::Request()"); + + auto op = dynamic_cast(operations_.empty() ? nullptr : operations_.back().get()); + if (op) { + op->AddRequest(request); + } + else { + Push(std::make_unique(*this, request)); + } +} + +void CHttpControlSocket::Request(std::deque> && requests) +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpControlSocket::Request()"); + Push(std::make_unique(*this, std::move(requests))); +} + +int CHttpControlSocket::InternalConnect(std::wstring const& host, unsigned short port, bool tls, bool allowDisconnect) +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpControlSocket::InternalConnect()"); + + if (!Connected()) { + return FZ_REPLY_INTERNALERROR; + } + + if (m_pBackend) { + if (host == connected_host_ && port == connected_port_ && tls == connected_tls_) { + LogMessage(MessageType::Debug_Verbose, L"Reusing an existing connection"); + return FZ_REPLY_OK; + } + if (!allowDisconnect) { + return FZ_REPLY_WOULDBLOCK; + } + } + + ResetSocket(); + connected_host_ = host; + connected_port_ = port; + connected_tls_ = tls; + Push(std::make_unique(*this, ConvertDomainName(host), port, tls)); + + return FZ_REPLY_CONTINUE; +} + +void CHttpControlSocket::OnClose(int error) +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpControlSocket::OnClose(%d)", error); + + if (operations_.empty() || (operations_.back()->opId != PrivCommand::http_connect && operations_.back()->opId != PrivCommand::http_request)) { + LogMessage(MessageType::Debug_Warning, L"Idle socket got closed"); + ResetSocket(); + return; + } + + if (error) { + LogMessage(MessageType::Error, _("Disconnected from server: %s"), fz::socket::error_description(error)); + ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); + return; + } + + if (!operations_.empty() && operations_.back()->opId == PrivCommand::http_request) { + auto & data = static_cast(*operations_.back()); + int res = data.OnClose(); + if (res == FZ_REPLY_CONTINUE) { + SendNextCommand(); + } + else { + ResetOperation(res); + } + } + else { + ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); + } +} + +void CHttpControlSocket::ResetSocket() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpControlSocket::ResetSocket()"); + if (m_pTlsSocket) { + if (m_pTlsSocket != m_pBackend) { + delete m_pTlsSocket; + } + m_pTlsSocket = nullptr; + } + + CRealControlSocket::ResetSocket(); +} + +int CHttpControlSocket::Disconnect() +{ + DoClose(); + return FZ_REPLY_OK; +} + +void CHttpControlSocket::Connect(CServer const& server, Credentials const&) +{ + currentServer_ = server; + Push(std::make_unique(*this)); +} + +int CHttpControlSocket::OnSend() +{ + int res = CRealControlSocket::OnSend(); + if (res == FZ_REPLY_CONTINUE) { + if (!operations_.empty() && operations_.back()->opId == PrivCommand::http_request && (operations_.back()->opState & request_send_mask)) { + return SendNextCommand(); + } + } + return res; +} diff -Nru filezilla-3.15.0.2/src/engine/http/httpcontrolsocket.h filezilla-3.33.0/src/engine/http/httpcontrolsocket.h --- filezilla-3.15.0.2/src/engine/http/httpcontrolsocket.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/httpcontrolsocket.h 2018-04-02 18:37:18.000000000 +0000 @@ -0,0 +1,278 @@ +#ifndef FILEZILLA_ENGINE_HTTP_HTTPCONTROLSOCKET_HEADER +#define FILEZILLA_ENGINE_HTTP_HTTPCONTROLSOCKET_HEADER + +#include "ControlSocket.h" +#include "httpheaders.h" + +#include +#include + +namespace PrivCommand { +auto const http_request = Command::private1; +auto const http_connect = Command::private2; +} + +class request_body +{ +public: + virtual ~request_body() = default; + + virtual uint64_t size() const = 0; + + // data_request must write up to len bytes into the provided buffer, + // and update len with the amount written. + // Must return FZ_REPLY_CONTINUE or FZ_REPLY_ERROR + virtual int data_request(unsigned char* data, unsigned int & len) = 0; + + // reset() must return FZ_REPLY_CONTINUE or FZ_REPLY_ERROR + virtual int rewind() = 0; +}; + +class simple_body final : public request_body +{ +public: + simple_body() = default; + explicit simple_body(std::string const& body) + : body_(body) + {} + + void set(std::string const& body) + { + body_ = body; + written_ = 0; + } + + virtual int data_request(unsigned char* data, unsigned int & len) override; + + virtual int rewind() override + { + written_ = 0; + return FZ_REPLY_CONTINUE; + } + + virtual uint64_t size() const override { return body_.size(); } + +private: + size_t written_{}; + std::string body_; +}; + + +class file_body final : public request_body +{ +public: + file_body(fz::file & file, uint64_t start, uint64_t size, CLogging & logger); + + virtual uint64_t size() const override { return size_; } + + virtual int data_request(unsigned char* data, unsigned int & len) override; + + virtual int rewind() override; + + std::function progress_callback_; + +private: + fz::file & file_; + uint64_t start_{}; + uint64_t written_{}; + uint64_t size_{}; + + CLogging & logger_; +}; + +#define HEADER_NAME_CONTENT_LENGTH "Content-Length" +#define HEADER_NAME_CONTENT_TYPE "Content-Type" +class WithHeaders +{ +public: + virtual ~WithHeaders() = default; + + int64_t get_content_length() const + { + int64_t result = 0; + auto value = get_header(HEADER_NAME_CONTENT_LENGTH); + if (!value.empty()) { + result = fz::to_integral(value); + } + return result; + } + + void set_content_length(int64_t length) + { + headers_[HEADER_NAME_CONTENT_LENGTH] = fz::to_string(length); + } + + void set_content_type(std::string const& content_type) + { + headers_[HEADER_NAME_CONTENT_TYPE] = content_type; + } + + std::string get_header(std::string const& key) const + { + auto it = headers_.find(key); + if (it != headers_.end()) { + return it->second; + } + return std::string(); + } + + bool keep_alive() const + { + return fz::str_tolower_ascii(get_header("Connection")) != "close"; + } + + HttpHeaders headers_; +}; + +class HttpRequest : public WithHeaders +{ +public: + fz::uri uri_; + std::string verb_; + + enum flags { + flag_sent_header = 0x01, + flag_sent_body = 0x02 + }; + int flags_{}; + + std::unique_ptr body_; + + virtual int reset(); +}; + +class HttpResponse; +class HttpRequestResponseInterface +{ +public: + virtual ~HttpRequestResponseInterface() = default; + + virtual HttpRequest & request() = 0; + virtual HttpResponse & response() = 0; +}; + +class HttpResponse : public WithHeaders +{ +public: + virtual ~HttpResponse() {}; + unsigned int code_{}; + + enum flags { + flag_got_code = 0x01, + flag_got_header = 0x02, + flag_got_body = 0x04, + flag_no_body = 0x08, // e.g. on HEAD requests, or 204/304 responses + flag_ignore_body = 0x10 // If set, on_data_ isn't called + }; + int flags_{}; + + bool got_code() const { return flags_ & flag_got_code; } + bool got_header() const { return flags_ & flag_got_header; } + bool got_body() const { return flags_ & flag_got_body; } + bool no_body() const { return flags_ & flag_no_body; } + + // Called once the complete header has been received. + // Return one of: + // FZ_REPLY_CONTINUE: All is well + // FZ_REPLY_OK: We're not interested in the request body, but continue + // FZ_REPLY_ERROR: Abort connection + std::function const&)> on_header_; + + // Is only called after the on_header_ callback. + // Callback must return FZ_REPLY_CONTINUE or FZ_REPLY_ERROR + std::function on_data_; + + bool success() const { + return code_ >= 200 && code_ < 300; + } + + bool code_prohobits_body() const { + return (code_ >= 100 && code_ < 200) || code_ == 304 || code_ == 204; + } + + virtual int reset(); +}; + +template +class ProtocolRequestResponse : public HttpRequestResponseInterface +{ +public: + virtual HttpRequest & request() override final { + return request_; + } + + virtual HttpResponse & response() override final { + return response_; + } + + Request request_; + Response response_; +}; + +typedef ProtocolRequestResponse HttpRequestResponse; + +template void null_deleter(T *) {} + +template +std::shared_ptr make_simple_rr(T * rr) +{ + return std::shared_ptr(rr, &null_deleter); +} + +class CTlsSocket; +class CHttpControlSocket : public CRealControlSocket +{ +public: + CHttpControlSocket(CFileZillaEnginePrivate & engine); + virtual ~CHttpControlSocket(); + + virtual bool Connected() const override { return static_cast(currentServer_); } +protected: + virtual void Connect(CServer const& server, Credentials const& credentials) override; + virtual void FileTransfer(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const& transferSettings) override; + + void Request(std::shared_ptr const& request); + void Request(std::deque> && requests); + + template + void RequestMany(T && requests) + { + std::deque> rrs; + for (auto const& request : requests) { + rrs.push_back(request); + } + Request(std::move(rrs)); + } + + // FZ_REPLY_OK: Re-using existing connection + // FZ_REPLY_WOULDBLOCK: Cannot perform action right now (!allowDisconnect) + // FZ_REPLY_CONTINUE: Connection operation pusehd to stack + int InternalConnect(std::wstring const& host, unsigned short port, bool tls, bool allowDisconnect); + virtual int Disconnect() override; + + virtual bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification) override; + + CTlsSocket* m_pTlsSocket{}; + + virtual void OnConnect() override; + virtual void OnClose(int error) override; + virtual void OnReceive() override; + virtual int OnSend() override; + + virtual void ResetSocket() override; + + friend class CProtocolOpData; + friend class CHttpFileTransferOpData; + friend class CHttpInternalConnectOpData; + friend class CHttpRequestOpData; +private: + std::wstring connected_host_; + unsigned short connected_port_{}; + bool connected_tls_{}; +}; + +typedef CProtocolOpData CHttpOpData; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/http/internalconnect.cpp filezilla-3.33.0/src/engine/http/internalconnect.cpp --- filezilla-3.15.0.2/src/engine/http/internalconnect.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/internalconnect.cpp 2017-04-26 03:30:04.000000000 +0000 @@ -0,0 +1,19 @@ +#include + +#include "internalconnect.h" + +#include "backend.h" + +int CHttpInternalConnectOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpInternalConnectOpData::Send() in state %d", opState); + + if (!port_) { + port_ = tls_ ? 443 : 80; + } + + delete controlSocket_.m_pBackend; + controlSocket_.m_pBackend = new CSocketBackend(&controlSocket_, *controlSocket_.socket_, engine_.GetRateLimiter()); + + return controlSocket_.DoConnect(host_, port_); +} diff -Nru filezilla-3.15.0.2/src/engine/http/internalconnect.h filezilla-3.33.0/src/engine/http/internalconnect.h --- filezilla-3.15.0.2/src/engine/http/internalconnect.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/internalconnect.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,28 @@ +#ifndef FILEZILLA_ENGINE_HTTP_INTERNALCONNECT_HEADER +#define FILEZILLA_ENGINE_HTTP_INTERNALCONNECT_HEADER + +#include "httpcontrolsocket.h" + +// Connect is special for HTTP: It is done on a per-command basis, so we need +// to establish a connection before each command. +// The general connect of the control socket is a NOOP. +class CHttpInternalConnectOpData final : public COpData, public CHttpOpData +{ +public: + CHttpInternalConnectOpData(CHttpControlSocket & controlSocket, std::wstring const& host, unsigned short port, bool tls) + : COpData(PrivCommand::http_connect) + , CHttpOpData(controlSocket) + , host_(host) + , port_(port) + , tls_(tls) + {} + + virtual int Send() override; + virtual int ParseResponse() override { return FZ_REPLY_INTERNALERROR; } + + std::wstring host_; + unsigned short port_; + bool tls_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/http/request.cpp filezilla-3.33.0/src/engine/http/request.cpp --- filezilla-3.15.0.2/src/engine/http/request.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/request.cpp 2018-04-27 11:26:14.000000000 +0000 @@ -0,0 +1,819 @@ +#include + +#include "request.h" + +#include + +#include "backend.h" + +#include + + +CHttpRequestOpData::CHttpRequestOpData(CHttpControlSocket & controlSocket, std::shared_ptr const& request) + : COpData(PrivCommand::http_request) + , CHttpOpData(controlSocket) +{ + opState = request_init | request_reading; + + request->request().flags_ = 0; + request->response().flags_ = 0; + + requests_.emplace_back(request); +} + +CHttpRequestOpData::CHttpRequestOpData(CHttpControlSocket & controlSocket, std::deque> && requests) + : COpData(PrivCommand::http_request) + , CHttpOpData(controlSocket) + , requests_(requests) +{ + for (auto & rr : requests_) { + rr->request().flags_ = 0; + rr->response().flags_ = 0; + } + opState = request_init | request_reading; +} + +void CHttpRequestOpData::AddRequest(std::shared_ptr const& rr) +{ + if (!(opState & request_send_mask)) { + bool wait = false; + if (!requests_.empty()) { + if (!requests_.back() && !read_state_.keep_alive_) { + wait = true; + } + else if (requests_.back() && !(requests_.back()->request().keep_alive() || requests_.back()->response().keep_alive())) { + wait = true; + } + } + if (wait) { + opState |= request_send_wait_for_read; + } + else { + opState |= request_init; + if (controlSocket_.m_pBackend) { + controlSocket_.send_event(controlSocket_.m_pBackend, fz::socket_event_flag::write, 0); + } + } + } + rr->request().flags_ = 0; + rr->response().flags_ = 0; + requests_.push_back(rr); +} + +int CHttpRequestOpData::Send() +{ + LogMessage(MessageType::Debug_Debug, L"CHttpRequestOpData::Send() in state %d", opState); + + if (opState & request_init) { + if (send_pos_ >= requests_.size()) { + opState &= ~request_init; + return FZ_REPLY_CONTINUE; + } + + auto & rr = *requests_[send_pos_]; + auto & req = rr.request(); + + int res = req.reset(); + if (res != FZ_REPLY_CONTINUE) { + return res; + } + + res = rr.response().reset(); + if (res != FZ_REPLY_CONTINUE) { + return res; + } + + if (req.verb_.empty()) { + LogMessage(MessageType::Debug_Warning, L"No request verb"); + return FZ_REPLY_INTERNALERROR; + } + std::string host_header = req.uri_.host_; + if (req.uri_.port_ != 0) { + host_header += ':'; + host_header += fz::to_string(req.uri_.port_); + } + req.headers_["Host"] = host_header; + auto pos = req.headers_.find("Connection"); + if (pos == req.headers_.end()) { + // TODO: consider making keep-alive the default + req.headers_["Connection"] = "close"; + } + req.headers_["User-Agent"] = fz::replaced_substrings(PACKAGE_STRING, " ", "/"); + + opState &= ~request_init; + opState |= request_wait_connect; + return FZ_REPLY_CONTINUE; + } + + if (opState & request_send_wait_for_read) { + if (send_pos_ > 0) { + return FZ_REPLY_WOULDBLOCK; + } + + opState &= ~request_send_wait_for_read; + opState |= request_init; + + return FZ_REPLY_CONTINUE; + } + + if (opState & request_wait_connect) { + if (send_pos_ >= requests_.size()) { + LogMessage(MessageType::Debug_Warning, L"Bad state: opState & request_wait_connect yet send_pos_ >= requests_.size()"); + return FZ_REPLY_INTERNALERROR; + } + + auto & rr = *requests_[send_pos_]; + auto & req = rr.request(); + + auto const& uri = req.uri_; + int res = controlSocket_.InternalConnect(fz::to_wstring_from_utf8(uri.host_), uri.port_, uri.scheme_ == "https", !send_pos_); + if (res == FZ_REPLY_OK) { + opState &= ~request_wait_connect; + opState |= request_send; + res = FZ_REPLY_CONTINUE; + } + return res; + } + + if (opState & request_send) { + if (send_pos_ >= requests_.size()) { + opState &= ~request_send; + } + else { + auto & req = requests_[send_pos_]->request(); + if (!(req.flags_ & HttpRequest::flag_sent_header)) { + if (req.body_) { + req.set_content_length(req.body_->size()); + } + else { + if (req.verb_ == "GET" || req.verb_ == "HEAD" || req.verb_ == "OPTIONS") { + req.headers_.erase("Content-Length"); + } + else { + req.set_content_length(0); + } + } + + auto const cl = req.get_header("Content-Length"); + if (!cl.empty()) { + int64_t requestContentLength = fz::to_integral(cl, -1); + if (requestContentLength < 0) { + LogMessage(MessageType::Error, _("Malformed request header: %s"), _("Invalid Content-Length")); + return FZ_REPLY_INTERNALERROR; + } + dataToSend_ = static_cast(requestContentLength); + } + + // Assemble request and headers + std::string command = fz::sprintf("%s %s HTTP/1.1", req.verb_, req.uri_.get_request()); + LogMessage(MessageType::Command, "%s", command); + command += "\r\n"; + + for (auto const& header : req.headers_) { + std::string line = fz::sprintf("%s: %s", header.first, header.second); + if (header.first == "Authorization") { + LogMessage(MessageType::Command, "%s: %s", header.first, std::string(header.second.size(), '*')); + } + else { + LogMessage(MessageType::Command, "%s", line); + } + command += line + "\r\n"; + } + + command += "\r\n"; + + req.flags_ |= HttpRequest::flag_sent_header; + if (!req.body_) { + LogMessage(MessageType::Debug_Info, "Finished sending request header. Request has no body"); + opState &= ~request_send; + ++send_pos_; + if (send_pos_ < requests_.size()) { + if (!req.keep_alive()) { + opState |= request_send_wait_for_read; + LogMessage(MessageType::Debug_Info, L"Request did not ask for keep-alive. Waiting for response to finish before sending next request a new connection."); + } + else { + opState |= request_init; + } + } + } + else { + LogMessage(MessageType::Debug_Info, "Finish sending request header."); + } + + auto result = controlSocket_.Send(command.c_str(), command.size()); + if (result == FZ_REPLY_WOULDBLOCK && !controlSocket_.sendBuffer_) { + result = FZ_REPLY_CONTINUE; + } + + return result; + } + else { + int const chunkSize = 65536; + + while (dataToSend_ || controlSocket_.sendBuffer_) { + if (!controlSocket_.sendBuffer_) { + unsigned int len = chunkSize; + if (chunkSize > dataToSend_) { + len = static_cast(dataToSend_); + } + int res = req.body_->data_request(controlSocket_.sendBuffer_.get(len), len); + if (res != FZ_REPLY_CONTINUE) { + return res; + } + if (len > dataToSend_) { + LogMessage(MessageType::Debug_Warning, L"req.body_ returned too much data"); + return FZ_REPLY_INTERNALERROR; + } + + controlSocket_.sendBuffer_.add(len); + dataToSend_ -= len; + } + + int error; + int written = controlSocket_.m_pBackend->Write(controlSocket_.sendBuffer_.get(), controlSocket_.sendBuffer_.size(), error); + if (written < 0) { + if (error != EAGAIN) { + LogMessage(MessageType::Error, _("Could not write to socket: %s"), fz::socket::error_description(error)); + LogMessage(MessageType::Error, _("Disconnected from server")); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + return FZ_REPLY_WOULDBLOCK; + } + + if (written) { + controlSocket_.SetActive(CFileZillaEngine::send); + + controlSocket_.sendBuffer_.consume(static_cast(written)); + } + } + + LogMessage(MessageType::Debug_Info, "Finished sending request body"); + + req.flags_ |= HttpRequest::flag_sent_body; + + opState &= ~request_send; + ++send_pos_; + + if (send_pos_ < requests_.size()) { + if (!req.keep_alive()) { + opState |= request_send_wait_for_read; + LogMessage(MessageType::Debug_Info, L"Request did not ask for keep-alive. Waiting for response to finish before sending next request a new connection."); + } + else { + opState |= request_init; + } + } + return FZ_REPLY_CONTINUE; + } + } + } + + if (opState & request_reading) { + return FZ_REPLY_WOULDBLOCK; + } + + return FZ_REPLY_INTERNALERROR; +} + +int CHttpRequestOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpRequestOpData::ParseResponse() in state %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CHttpRequestOpData::SubcommandResult(int, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpRequestOpData::SubcommandResult() in state %d", opState); + + if (opState & request_wait_connect) { + opState &= ~request_wait_connect; + opState |= request_send; + } + + return FZ_REPLY_CONTINUE; +} + +int CHttpRequestOpData::ParseReceiveBuffer(bool eof) +{ + auto & shared_response = requests_.front(); + if (shared_response) { + auto & request = shared_response->request(); + if (!(request.flags_ & HttpRequest::flag_sent_header)) { + if (eof) { + LogMessage(MessageType::Debug_Verbose, L"Socket closed before request got sent"); + LogMessage(MessageType::Error, _("Connection closed by server")); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + else if (!recv_buffer_.empty()) { + LogMessage(MessageType::Error, _("Server sent data even before request headers were sent")); + return FZ_REPLY_ERROR; + } + } + auto & response = shared_response->response(); + + if (!response.got_header()) { + if (eof) { + LogMessage(MessageType::Debug_Verbose, L"Socket closed before headers got received"); + LogMessage(MessageType::Error, _("Connection closed by server")); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + + return ParseHeader(); + } + } + + if (read_state_.transfer_encoding_ == chunked) { + if (eof) { + LogMessage(MessageType::Debug_Verbose, L"Socket closed, chunk incomplete"); + LogMessage(MessageType::Error, _("Connection closed by server")); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + return ParseChunkedData(); + } + else { + if (eof) { + assert(recv_buffer_.empty()); + + if (read_state_.responseContentLength_ != -1 && read_state_.receivedData_ != read_state_.responseContentLength_) { + LogMessage(MessageType::Debug_Verbose, L"Socket closed, content length not reached"); + LogMessage(MessageType::Error, _("Connection closed by server")); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + else { + if (shared_response) { + shared_response->response().flags_ |= HttpResponse::flag_got_body; + } + return FZ_REPLY_OK; + } + } + else { + size_t size = recv_buffer_.size(); + if (!size) { + return FZ_REPLY_WOULDBLOCK; + } + + if (read_state_.responseContentLength_ != -1 && read_state_.receivedData_ + static_cast(size) > read_state_.responseContentLength_) { + size = static_cast(read_state_.responseContentLength_ - read_state_.receivedData_); + } + + int res = ProcessData(recv_buffer_.get(), size); + recv_buffer_.consume(size); + return res; + } + } + + return FZ_REPLY_INTERNALERROR; +} + +int CHttpRequestOpData::OnReceive() +{ + while (controlSocket_.socket_) { + const fz::socket::socket_state state = controlSocket_.socket_->get_state(); + if (state != fz::socket::connected && state != fz::socket::closing) { + return FZ_REPLY_WOULDBLOCK; + } + + int error; + size_t const recv_size = 1024 * 64; + int read = controlSocket_.m_pBackend->Read(recv_buffer_.get(recv_size), recv_size, error); + if (read <= -1) { + if (error != EAGAIN) { + LogMessage(MessageType::Error, _("Could not read from socket: %s"), fz::socket::error_description(error)); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + return FZ_REPLY_WOULDBLOCK; + } + recv_buffer_.add(static_cast(read)); + + controlSocket_.SetActive(CFileZillaEngine::recv); + + while (!requests_.empty()) { + assert(!requests_.empty()); + int res = ParseReceiveBuffer(read == 0); + if (res == FZ_REPLY_WOULDBLOCK) { + break; + } + + if (res == FZ_REPLY_OK) { + LogMessage(MessageType::Debug_Info, L"Finished a response"); + requests_.pop_front(); + --send_pos_; + + bool keep_alive = read_state_.keep_alive_; + if (!keep_alive) { + if (!recv_buffer_.empty()) { + LogMessage(MessageType::Error, _("Malformed response: %s"), _("Server sent too much data.")); + return FZ_REPLY_ERROR; + } + + controlSocket_.ResetSocket(); + } + + read_state_ = read_state(); + + if (requests_.empty()) { + LogMessage(MessageType::Debug_Info, L"Done reading last response"); + opState &= ~request_reading; + + if (!recv_buffer_.empty()) { + LogMessage(MessageType::Error, _("Malformed response: %s"), _("Server sent too much data.")); + return FZ_REPLY_ERROR; + } + return FZ_REPLY_OK; + } + + if (!keep_alive) { + send_pos_ = 0; + opState = request_init | request_reading; + return FZ_REPLY_CONTINUE; + } + } + else if (res != FZ_REPLY_CONTINUE) { + return res; + } + } + + if (requests_.empty() && !recv_buffer_.empty()) { + LogMessage(MessageType::Error, _("Malformed response: %s"), _("Server sent too much data.")); + return FZ_REPLY_ERROR; + } + } + + return FZ_REPLY_WOULDBLOCK; +} + +int CHttpRequestOpData::ParseHeader() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpRequestOpData::ParseHeader()"); + + // Parse the HTTP header. + // We do just the neccessary parsing and silently ignore most header fields + // The calling operation is responsible for things like redirect parsing. + for (;;) { + // Find line ending + size_t i = 0; + for (i = 0; (i + 1) < recv_buffer_.size(); ++i) { + if (recv_buffer_[i] == '\r') { + if (recv_buffer_[i + 1] != '\n') { + LogMessage(MessageType::Error, _("Malformed response header: %s"), _("Server not sending proper line endings")); + return FZ_REPLY_ERROR; + } + break; + } + if (!recv_buffer_[i]) { + LogMessage(MessageType::Error, _("Malformed response header: %s"), _("Null character in line")); + return FZ_REPLY_ERROR; + } + } + if ((i + 1) >= recv_buffer_.size()) { + size_t const max_line_size = 8192; + if (recv_buffer_.size() >= max_line_size) { + LogMessage(MessageType::Error, _("Too long header line")); + return FZ_REPLY_ERROR; + } + return FZ_REPLY_WOULDBLOCK; + } + + std::wstring wline = fz::to_wstring_from_utf8(reinterpret_cast(recv_buffer_.get()), i); + if (wline.empty()) { + wline = fz::to_wstring(std::string(recv_buffer_.get(), recv_buffer_.get() + i)); + } + if (!wline.empty()) { + controlSocket_.LogMessageRaw(MessageType::Response, wline); + } + + auto & response = requests_.front()->response(); + if (!response.got_code()) { + if (recv_buffer_.size() < 15 || memcmp(recv_buffer_.get(), "HTTP/1.", 7)) { + // Invalid HTTP Status-Line + LogMessage(MessageType::Error, _("Invalid HTTP Response")); + return FZ_REPLY_ERROR; + } + + if (recv_buffer_[9] < '1' || recv_buffer_[9] > '5' || + recv_buffer_[10] < '0' || recv_buffer_[10] > '9' || + recv_buffer_[11] < '0' || recv_buffer_[11] > '9') + { + // Invalid response code + LogMessage(MessageType::Error, _("Invalid response code")); + return FZ_REPLY_ERROR; + } + + response.code_ = (recv_buffer_[9] - '0') * 100 + (recv_buffer_[10] - '0') * 10 + recv_buffer_[11] - '0'; + response.flags_ |= HttpResponse::flag_got_code; + } + else { + if (!i) { + recv_buffer_.consume(2); + + // End of header + return ProcessCompleteHeader(); + } + + std::string line(recv_buffer_.get(), recv_buffer_.get() + i); + + auto delim_pos = line.find(':'); + if (delim_pos == std::string::npos || !delim_pos) { + LogMessage(MessageType::Error, _("Malformed response header: %s"), _("Invalid line")); + return FZ_REPLY_ERROR; + } + + std::string value; + auto value_start = line.find_first_not_of(" \t", delim_pos + 1); + if (value_start != std::string::npos) { + int value_stop = line.find_last_not_of(" \t"); // Cannot fail + value = line.substr(value_start, value_stop - value_start + 1); + } + + auto & header = response.headers_[line.substr(0, delim_pos)]; + if (header.empty()) { + header = value; + } + else if (!value.empty()) { + header += ", " + value; + } + } + + recv_buffer_.consume(i + 2); + + if (recv_buffer_.empty()) { + break; + } + } + + return FZ_REPLY_WOULDBLOCK; +} + +int CHttpRequestOpData::ProcessCompleteHeader() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpRequestOpData::ParseHeader()"); + + auto & srr = requests_.front(); + auto & request = srr->request(); + auto & response = srr->response(); + if (response.code_ == 100) { + // 100 Continue header. Ignore it and start over. + response.reset(); + return FZ_REPLY_CONTINUE; + } + + response.flags_ |= HttpResponse::flag_got_header; + if (request.verb_ == "HEAD" || response.code_prohobits_body()) { + response.flags_ |= HttpResponse::flag_no_body; + } + + auto const te = fz::str_tolower_ascii(response.get_header("Transfer-Encoding")); + if (te == "chunked") { + read_state_.transfer_encoding_ = chunked; + } + else if (te.empty() || te == "identity") { + read_state_.transfer_encoding_ = identity; + } + else { + LogMessage(MessageType::Error, _("Malformed response header: %s"), _("Unknown transfer encoding")); + return FZ_REPLY_ERROR; + } + + + int64_t length{-1}; + auto const cl = response.get_header("Content-Length"); + if (!cl.empty()) { + length = fz::to_integral(cl, -1); + if (length < 0) { + LogMessage(MessageType::Error, _("Malformed response header: %s"), _("Invalid Content-Length")); + return FZ_REPLY_ERROR; + } + } + + if (response.no_body()) { + read_state_.responseContentLength_ = 0; + } + else { + read_state_.responseContentLength_ = length; + } + + read_state_.keep_alive_ = response.keep_alive() && request.keep_alive(); + + int res = FZ_REPLY_CONTINUE; + if (response.on_header_) { + res = response.on_header_(srr); + + if (res != FZ_REPLY_CONTINUE) { + response.flags_ |= HttpResponse::flag_ignore_body; + if (res == FZ_REPLY_OK) { + // Clear the pointer, we no longer need the request to finish, all needed information is in read_state_ + srr.reset(); + res = FZ_REPLY_CONTINUE; + } + } + } + + if (res == FZ_REPLY_CONTINUE) { + if (!read_state_.responseContentLength_) { + res = FZ_REPLY_OK; + } + } + + return res; +} + +int CHttpRequestOpData::ParseChunkedData() +{ + while (!recv_buffer_.empty()) { + if (read_state_.chunk_data_.size != 0) { + size_t dataLen = recv_buffer_.size(); + if (read_state_.chunk_data_.size < recv_buffer_.size()) { + dataLen = static_cast(read_state_.chunk_data_.size); + } + int res = ProcessData(recv_buffer_.get(), dataLen); + if (res != FZ_REPLY_CONTINUE) { + return res; + } + recv_buffer_.consume(dataLen); + read_state_.chunk_data_.size -= dataLen; + + if (read_state_.chunk_data_.size == 0) { + read_state_.chunk_data_.terminateChunk = true; + } + } + + // Find line ending + size_t i = 0; + for (i = 0; (i + 1) < recv_buffer_.size(); ++i) { + if (recv_buffer_[i] == '\r') { + if (recv_buffer_[i + 1] != '\n') { + LogMessage(MessageType::Error, _("Malformed chunk data: %s"), _("Wrong line endings")); + return FZ_REPLY_ERROR; + } + break; + } + if (!recv_buffer_[i]) { + LogMessage(MessageType::Error, _("Malformed chunk data: %s"), _("Null character in line")); + return FZ_REPLY_ERROR; + } + } + if ((i + 1) >= recv_buffer_.size()) { + size_t const max_line_size = 8192; + if (recv_buffer_.size() >= max_line_size) { + LogMessage(MessageType::Error, _("Malformed chunk data: %s"), _("Line length exceeded")); + return FZ_REPLY_ERROR; + } + break; + } + + if (read_state_.chunk_data_.terminateChunk) { + if (i) { + // The chunk data has to end with CRLF. If i is nonzero, + // it didn't end with just CRLF. + LogMessage(MessageType::Debug_Debug, L"%u characters preceeding line-ending with value %s", i, fz::hex_encode(std::string(recv_buffer_.get(), recv_buffer_.get() + recv_buffer_.size()))); + LogMessage(MessageType::Error, _("Malformed chunk data: %s"), _("Chunk data improperly terminated")); + return FZ_REPLY_ERROR; + } + read_state_.chunk_data_.terminateChunk = false; + } + else if (read_state_.chunk_data_.getTrailer) { + if (!i) { + // We're done + recv_buffer_.consume(2); + + auto & response = requests_.front(); + if (response) { + response->response().flags_ |= HttpResponse::flag_got_body; + } + return FZ_REPLY_OK; + } + + // Ignore the trailer + } + else { + // Read chunk size + unsigned char const* end = recv_buffer_.get() + i; + for (unsigned char* q = recv_buffer_.get(); q != end && *q != ';' && *q != ' '; ++q) { + read_state_.chunk_data_.size *= 16; + if (*q >= '0' && *q <= '9') { + read_state_.chunk_data_.size += *q - '0'; + } + else if (*q >= 'A' && *q <= 'F') { + read_state_.chunk_data_.size += *q - 'A' + 10; + } + else if (*q >= 'a' && *q <= 'f') { + read_state_.chunk_data_.size += *q - 'a' + 10; + } + else { + // Invalid size + LogMessage(MessageType::Error, _("Malformed chunk data: %s"), _("Invalid chunk size")); + return FZ_REPLY_ERROR; + } + } + if (!read_state_.chunk_data_.size) { + read_state_.chunk_data_.getTrailer = true; + } + } + + recv_buffer_.consume(i + 2); + } + + return FZ_REPLY_WOULDBLOCK; +} + +int CHttpRequestOpData::ProcessData(unsigned char* data, unsigned int len) +{ + read_state_.receivedData_ += len; + + int res = FZ_REPLY_CONTINUE; + + auto & shared_response = requests_.front(); + if (shared_response) { + auto & response = shared_response->response(); + if (response.on_data_ && !(response.flags_ & HttpResponse::flag_ignore_body)) { + res = response.on_data_(data, len); + } + } + + if (res == FZ_REPLY_CONTINUE && read_state_.receivedData_ == read_state_.responseContentLength_) { + if (shared_response) { + shared_response->response().flags_ |= HttpResponse::flag_got_body; + } + res = FZ_REPLY_OK; + } + + return res; +} + +int CHttpRequestOpData::OnClose() +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpRequestOpData::OnClose()"); + + if (send_pos_ < requests_.size()) { + LogMessage(MessageType::Debug_Verbose, L"Socket closed before all data got sent"); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + + if (!requests_.empty()) { + + auto & response = requests_.front(); + if (response && !response->response().got_header()) { + LogMessage(MessageType::Debug_Verbose, L"Socket closed before headers got received"); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + + if (read_state_.transfer_encoding_ == chunked) { + if (!read_state_.chunk_data_.getTrailer) { + LogMessage(MessageType::Debug_Verbose, L"Socket closed, chunk incomplete"); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + } + else { + if (read_state_.responseContentLength_ != -1 && read_state_.receivedData_ != read_state_.responseContentLength_) { + LogMessage(MessageType::Debug_Verbose, L"Socket closed, content length not reached"); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + } + + if (response) { + response->response().flags_ |= HttpResponse::flag_got_body; + } + requests_.pop_front(); + --send_pos_; + read_state_ = read_state(); + + if (!requests_.empty()) { + if (!recv_buffer_.empty()) { + LogMessage(MessageType::Error, _("Malformed response: %s"), _("Server sent too much data.")); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + + LogMessage(MessageType::Debug_Verbose, L"Socket closed before responses got fully received. Re-issuing"); + send_pos_ = 0; + opState = request_init | request_reading; + controlSocket_.ResetSocket(); + return FZ_REPLY_CONTINUE; + } + } + + return FZ_REPLY_OK; +} + +int CHttpRequestOpData::Reset(int result) +{ + LogMessage(MessageType::Debug_Verbose, L"CHttpRequestOpData::Reset(%d) in state %d", result, opState); + + if (result != FZ_REPLY_OK) { + controlSocket_.ResetSocket(); + } + else if (opState != request_done) { + controlSocket_.ResetSocket(); + } + else if (!recv_buffer_.empty()) { + LogMessage(MessageType::Debug_Verbose, L"Closing connection, the receive buffer isn't empty but at %d", recv_buffer_.size()); + controlSocket_.ResetSocket(); + } + else { + if (controlSocket_.m_pBackend) { + controlSocket_.send_event(controlSocket_.m_pBackend, fz::socket_event_flag::read, 0); + } + } + + return result; +} diff -Nru filezilla-3.15.0.2/src/engine/http/request.h filezilla-3.33.0/src/engine/http/request.h --- filezilla-3.15.0.2/src/engine/http/request.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/http/request.h 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,80 @@ +#ifndef FILEZILLA_ENGINE_HTTP_REQUEST_HEADER +#define FILEZILLA_ENGINE_HTTP_REQUEST_HEADER + +#include "httpcontrolsocket.h" + +#include + +class CServerPath; + +enum requestStates +{ + request_done = 0, + + request_init = 1, + request_wait_connect = 2, + request_send = 4, + request_send_wait_for_read = 8, + request_reading = 16, + + request_send_mask = 0xf +}; + +class CHttpRequestOpData final : public COpData, public CHttpOpData +{ +public: + CHttpRequestOpData(CHttpControlSocket & controlSocket, std::shared_ptr const& request); + CHttpRequestOpData(CHttpControlSocket & controlSocket, std::deque> && requests); + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + virtual int Reset(int result) override; + + void AddRequest(std::shared_ptr const& rr); + + int OnReceive(); + int OnClose(); + +private: + int ParseReceiveBuffer(bool eof); + int ParseHeader(); + int ProcessCompleteHeader(); + int ParseChunkedData(); + int ProcessData(unsigned char* data, unsigned int len); + + std::deque> requests_; + + size_t send_pos_{}; + + + enum transferEncodings + { + identity, + chunked, + unknown + }; + + fz::buffer recv_buffer_; + struct read_state + { + transferEncodings transfer_encoding_{unknown}; + + struct t_chunkData + { + bool getTrailer{}; + bool terminateChunk{}; + uint64_t size{}; + } chunk_data_; + + int64_t responseContentLength_{-1}; + int64_t receivedData_{}; + + bool keep_alive_{}; + }; + read_state read_state_; + + uint64_t dataToSend_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/httpcontrolsocket.cpp filezilla-3.33.0/src/engine/httpcontrolsocket.cpp --- filezilla-3.15.0.2/src/engine/httpcontrolsocket.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/httpcontrolsocket.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,1018 +0,0 @@ -#include - -#include "ControlSocket.h" -#include "engineprivate.h" -#include "httpcontrolsocket.h" -#include "tlssocket.h" - -#include -#include - -#include - -#define FZ_REPLY_REDIRECTED FZ_REPLY_ALREADYCONNECTED - -// Connect is special for HTTP: It is done on a per-command basis, so we need -// to establish a connection before each command. -class CHttpConnectOpData : public CConnectOpData -{ -public: - CHttpConnectOpData() - : tls(false) - { - } - - virtual ~CHttpConnectOpData() - { - } - - bool tls; -}; - -class CHttpOpData -{ -public: - CHttpOpData(COpData* pOpData) - : m_pOpData(pOpData) - { - } - - virtual ~CHttpOpData() = default; - - bool m_gotHeader{}; - int m_responseCode{-1}; - wxString m_responseString; - wxURI m_newLocation; - int m_redirectionCount{}; - - int64_t m_totalSize{-1}; - int64_t m_receivedData{}; - - COpData* m_pOpData; - - enum transferEncodings - { - identity, - chunked, - unknown - }; - transferEncodings m_transferEncoding{unknown}; - - struct t_chunkData - { - bool getTrailer{}; - bool terminateChunk{}; - int64_t size{}; - } m_chunkData; -}; - -class CHttpFileTransferOpData : public CFileTransferOpData, public CHttpOpData -{ -public: - CHttpFileTransferOpData(bool is_download, const wxString& local_file, const wxString& remote_file, const CServerPath& remote_path) - : CFileTransferOpData(is_download, local_file, remote_file, remote_path), CHttpOpData(this) - { - pFile = 0; - } - - virtual ~CHttpFileTransferOpData() - { - delete pFile; - } - - wxFile* pFile; -}; - -CHttpControlSocket::CHttpControlSocket(CFileZillaEnginePrivate & engine) - : CRealControlSocket(engine) -{ - m_pRecvBuffer = 0; - m_recvBufferPos = 0; - m_pTlsSocket = 0; - m_pHttpOpData = 0; -} - -CHttpControlSocket::~CHttpControlSocket() -{ - remove_handler(); - DoClose(); - delete [] m_pRecvBuffer; -} - -int CHttpControlSocket::SendNextCommand() -{ - LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::SendNextCommand()")); - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("SendNextCommand called without active operation")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (m_pCurOpData->waitForAsyncRequest) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Waiting for async request, ignoring SendNextCommand")); - return FZ_REPLY_WOULDBLOCK; - } - - switch (m_pCurOpData->opId) - { - case Command::transfer: - return FileTransferSend(); - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown opID (%d) in SendNextCommand"), m_pCurOpData->opId); - ResetOperation(FZ_REPLY_INTERNALERROR); - break; - } - - return FZ_REPLY_ERROR; -} - - -int CHttpControlSocket::ContinueConnect() -{ - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Verbose, _T("CHttpControlSocket::ContinueConnect() &engine_=%p"), &engine_); - if (GetCurrentCommandId() != Command::connect || - !m_pCurrentServer) - { - LogMessage(MessageType::Debug_Warning, _T("Invalid context for call to ContinueConnect(), cmd=%d, m_pCurrentServer=%p"), GetCurrentCommandId(), m_pCurrentServer); - return DoClose(FZ_REPLY_INTERNALERROR); - } - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; -} - -bool CHttpControlSocket::SetAsyncRequestReply(CAsyncRequestNotification *pNotification) -{ - if (m_pCurOpData) - { - if (!m_pCurOpData->waitForAsyncRequest) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Not waiting for request reply, ignoring request reply %d"), pNotification->GetRequestID()); - return false; - } - m_pCurOpData->waitForAsyncRequest = false; - } - - switch (pNotification->GetRequestID()) - { - case reqId_fileexists: - { - if (!m_pCurOpData || m_pCurOpData->opId != Command::transfer) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("No or invalid operation in progress, ignoring request reply %f"), pNotification->GetRequestID()); - return false; - } - - CFileExistsNotification *pFileExistsNotification = static_cast(pNotification); - return SetFileExistsAction(pFileExistsNotification); - } - break; - case reqId_certificate: - { - if (!m_pTlsSocket || m_pTlsSocket->GetState() != CTlsSocket::TlsState::verifycert) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("No or invalid operation in progress, ignoring request reply %d"), pNotification->GetRequestID()); - return false; - } - - CCertificateNotification* pCertificateNotification = static_cast(pNotification); - m_pTlsSocket->TrustCurrentCert(pCertificateNotification->m_trusted); - } - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown request %d"), pNotification->GetRequestID()); - ResetOperation(FZ_REPLY_INTERNALERROR); - return false; - } - - return true; -} - -void CHttpControlSocket::OnReceive() -{ - DoReceive(); -} - -int CHttpControlSocket::DoReceive() -{ - do - { - const enum CSocket::SocketState state = m_pSocket->GetState(); - if (state != CSocket::connected && state != CSocket::closing) - return 0; - - if (!m_pRecvBuffer) - { - m_pRecvBuffer = new char[m_recvBufferLen]; - m_recvBufferPos = 0; - } - - unsigned int len = m_recvBufferLen - m_recvBufferPos; - int error; - int read = m_pBackend->Read(m_pRecvBuffer + m_recvBufferPos, len, error); - if (read == -1) - { - if (error != EAGAIN) - { - ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); - } - return 0; - } - - SetActive(CFileZillaEngine::recv); - - if (!m_pCurOpData || m_pCurOpData->opId == Command::connect) { - // Just ignore all further data - m_recvBufferPos = 0; - return 0; - } - - m_recvBufferPos += read; - - if (!m_pHttpOpData->m_gotHeader) { - if (!read) - { - ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); - return 0; - } - - int res = ParseHeader(m_pHttpOpData); - if ((res & FZ_REPLY_REDIRECTED) == FZ_REPLY_REDIRECTED) - return FZ_REPLY_REDIRECTED; - if (res != FZ_REPLY_WOULDBLOCK) - return 0; - } - else if (m_pHttpOpData->m_transferEncoding == CHttpOpData::chunked) - { - if (!read) - { - ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); - return 0; - } - OnChunkedData(m_pHttpOpData); - } - else - { - if (!read) - { - wxASSERT(!m_recvBufferPos); - ProcessData(0, 0); - return 0; - } - else - { - m_pHttpOpData->m_receivedData += m_recvBufferPos; - ProcessData(m_pRecvBuffer, m_recvBufferPos); - m_recvBufferPos = 0; - } - } - } - while (m_pSocket); - - return 0; -} - -void CHttpControlSocket::OnConnect() -{ - wxASSERT(GetCurrentCommandId() == Command::connect); - - CHttpConnectOpData *pData = static_cast(m_pCurOpData); - - if (pData->tls) { - if (!m_pTlsSocket) { - LogMessage(MessageType::Status, _("Connection established, initializing TLS...")); - - delete m_pBackend; - m_pTlsSocket = new CTlsSocket(this, *m_pSocket, this); - m_pBackend = m_pTlsSocket; - - if (!m_pTlsSocket->Init()) { - LogMessage(MessageType::Error, _("Failed to initialize TLS.")); - DoClose(); - return; - } - - int res = m_pTlsSocket->Handshake(); - if (res == FZ_REPLY_ERROR) - DoClose(); - } - else { - LogMessage(MessageType::Status, _("TLS connection established, sending HTTP request")); - ResetOperation(FZ_REPLY_OK); - } - - return; - } - else - { - LogMessage(MessageType::Status, _("Connection established, sending HTTP request")); - ResetOperation(FZ_REPLY_OK); - } -} - -enum filetransferStates -{ - filetransfer_init = 0, - filetransfer_waitfileexists, - filetransfer_transfer -}; - -int CHttpControlSocket::FileTransfer(const wxString localFile, const CServerPath &remotePath, - const wxString &remoteFile, bool download, - const CFileTransferCommand::t_transferSettings&) -{ - LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::FileTransfer()")); - - LogMessage(MessageType::Status, _("Downloading %s"), remotePath.FormatFilename(remoteFile)); - - if (!download) - { - ResetOperation(FZ_REPLY_CRITICALERROR | FZ_REPLY_NOTSUPPORTED); - return FZ_REPLY_ERROR; - } - - if (m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("deleting nonzero pData")); - delete m_pCurOpData; - } - - CHttpFileTransferOpData *pData = new CHttpFileTransferOpData(download, localFile, remoteFile, remotePath); - m_pCurOpData = pData; - m_pHttpOpData = pData; - - m_current_uri = wxURI(m_pCurrentServer->FormatServer() + pData->remotePath.FormatFilename(pData->remoteFile)); - - if (!localFile.empty()) { - pData->localFileSize = fz::local_filesys::get_size(fz::to_native(pData->localFile)); - - pData->opState = filetransfer_waitfileexists; - int res = CheckOverwriteFile(); - if (res != FZ_REPLY_OK) - return res; - - pData->opState = filetransfer_transfer; - - res = OpenFile(pData); - if( res != FZ_REPLY_OK ) - return res; - } - else - pData->opState = filetransfer_transfer; - - int res = InternalConnect(m_pCurrentServer->GetHost(), m_pCurrentServer->GetPort(), m_pCurrentServer->GetProtocol() == HTTPS); - if (res != FZ_REPLY_OK) - return res; - - return FileTransferSend(); -} - -int CHttpControlSocket::FileTransferSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::FileTransferSubcommandResult(%d)"), prevResult); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (prevResult != FZ_REPLY_OK) - { - ResetOperation(prevResult); - return FZ_REPLY_ERROR; - } - - return FileTransferSend(); -} - -int CHttpControlSocket::FileTransferSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::FileTransferSend()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if( !m_current_uri.HasScheme() || !m_current_uri.HasServer() || !m_current_uri.HasPath() ) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Invalid URI: %s"), m_current_uri.BuildURI()); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CHttpFileTransferOpData *pData = static_cast(m_pCurOpData); - - if (pData->opState == filetransfer_waitfileexists) - { - pData->opState = filetransfer_transfer; - - int res = OpenFile(pData); - if( res != FZ_REPLY_OK) - return res; - - res = InternalConnect(m_pCurrentServer->GetHost(), m_pCurrentServer->GetPort(), m_pCurrentServer->GetProtocol() == HTTPS); - if (res != FZ_REPLY_OK) - return res; - } - - wxString location = m_current_uri.GetPath(); - if( m_current_uri.HasQuery() ) { - location += _T("?") + m_current_uri.GetQuery(); - } - wxString action = wxString::Format(_T("GET %s HTTP/1.1"), location ); - LogMessageRaw(MessageType::Command, action); - - wxString hostWithPort = m_current_uri.GetServer(); - if( m_current_uri.HasPort() ) { - hostWithPort += _T(":") + m_current_uri.GetPort(); - } - wxString command = wxString::Format(_T("%s\r\nHost: %s\r\nUser-Agent: %s\r\nConnection: close\r\n"), action, hostWithPort, wxString(PACKAGE_STRING, wxConvLocal)); - if( pData->resume ) { - command += wxString::Format(_T("Range: bytes=%") + wxString(wxFileOffsetFmtSpec) + _T("d-\r\n"), pData->localFileSize); - } - command += _T("\r\n"); - - const wxWX2MBbuf str = command.mb_str(); - if (!Send(str, strlen(str))) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -int CHttpControlSocket::InternalConnect(wxString host, unsigned short port, bool tls) -{ - LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::InternalConnect()")); - - CHttpConnectOpData* pData = new CHttpConnectOpData; - pData->pNextOpData = m_pCurOpData; - m_pCurOpData = pData; - pData->port = port; - pData->tls = tls; - - if (fz::get_address_type(host.ToStdWstring()) == fz::address_type::unknown) { - LogMessage(MessageType::Status, _("Resolving address of %s"), host); - } - - pData->host = host; - return DoInternalConnect(); -} - -int CHttpControlSocket::DoInternalConnect() -{ - LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::DoInternalConnect()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CHttpConnectOpData *pData = static_cast(m_pCurOpData); - - delete m_pBackend; - m_pBackend = new CSocketBackend(this, *m_pSocket, engine_.GetRateLimiter()); - - int res = m_pSocket->Connect(pData->host, pData->port); - if (!res) - return FZ_REPLY_OK; - - if (res && res != EINPROGRESS) - return ResetOperation(FZ_REPLY_ERROR); - - return FZ_REPLY_WOULDBLOCK; -} - -int CHttpControlSocket::FileTransferParseResponse(char* p, unsigned int len) -{ - LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::FileTransferParseResponse(%p, %d)"), p, len); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CHttpFileTransferOpData *pData = static_cast(m_pCurOpData); - - if (!p) { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - - if (engine_.transfer_status_.empty()) { - engine_.transfer_status_.Init(pData->m_totalSize, 0, false); - engine_.transfer_status_.SetStartTime(); - } - - if (pData->localFile.empty()) { - char* q = new char[len]; - memcpy(q, p, len); - engine_.AddNotification(new CDataNotification(q, len)); - } - else { - wxASSERT(pData->pFile); - - if (pData->pFile->Write(p, len) != len) { - LogMessage(MessageType::Error, _("Failed to write to file %s"), pData->localFile); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - } - - engine_.transfer_status_.Update(len); - - return FZ_REPLY_WOULDBLOCK; -} - -int CHttpControlSocket::ParseHeader(CHttpOpData* pData) -{ - // Parse the HTTP header. - // We do just the neccessary parsing and silently ignore most header fields - // Redirects are supported though if the server sends the Location field. - - for (;;) { - // Find line ending - unsigned int i = 0; - for (i = 0; (i + 1) < m_recvBufferPos; i++) - { - if (m_pRecvBuffer[i] == '\r') - { - if (m_pRecvBuffer[i + 1] != '\n') - { - LogMessage(MessageType::Error, _("Malformed reply, server not sending proper line endings")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - break; - } - } - if ((i + 1) >= m_recvBufferPos) - { - if (m_recvBufferPos == m_recvBufferLen) - { - // We don't support header lines larger than 4096 - LogMessage(MessageType::Error, _("Too long header line")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - return FZ_REPLY_WOULDBLOCK; - } - - m_pRecvBuffer[i] = 0; - wxString const line = wxString(m_pRecvBuffer, wxConvLocal); - if (!line.empty()) - LogMessageRaw(MessageType::Response, line); - - if (pData->m_responseCode == -1) - { - pData->m_responseString = line; - if (m_recvBufferPos < 16 || memcmp(m_pRecvBuffer, "HTTP/1.", 7)) - { - // Invalid HTTP Status-Line - LogMessage(MessageType::Error, _("Invalid HTTP Response")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (m_pRecvBuffer[9] < '1' || m_pRecvBuffer[9] > '5' || - m_pRecvBuffer[10] < '0' || m_pRecvBuffer[10] > '9' || - m_pRecvBuffer[11] < '0' || m_pRecvBuffer[11] > '9') - { - // Invalid response code - LogMessage(MessageType::Error, _("Invalid response code")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - pData->m_responseCode = (m_pRecvBuffer[9] - '0') * 100 + (m_pRecvBuffer[10] - '0') * 10 + m_pRecvBuffer[11] - '0'; - - if( pData->m_responseCode == 416 ) { - CHttpFileTransferOpData* pTransfer = static_cast(pData->m_pOpData); - if( pTransfer->resume ) { - // Sad, the server does not like our attempt to resume. - // Get full file instead. - pTransfer->resume = false; - int res = OpenFile(pTransfer); - if( res != FZ_REPLY_OK ) { - return res; - } - pData->m_newLocation = m_current_uri; - pData->m_responseCode = 300; - } - } - - if (pData->m_responseCode >= 400) - { - // Failed request - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (pData->m_responseCode == 305) - { - // Unsupported redirect - LogMessage(MessageType::Error, _("Unsupported redirect")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - } - else - { - if (!i) - { - // End of header, data from now on - - // Redirect if neccessary - if (pData->m_responseCode >= 300) - { - if (pData->m_redirectionCount++ == 6) { - LogMessage(MessageType::Error, _("Too many redirects")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - ResetSocket(); - ResetHttpData(pData); - - if( !pData->m_newLocation.HasScheme() || !pData->m_newLocation.HasServer() || !pData->m_newLocation.HasPath() ) { - LogMessage(MessageType::Error, _("Redirection to invalid or unsupported URI: %s"), m_current_uri.BuildURI()); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - enum ServerProtocol protocol = CServer::GetProtocolFromPrefix(pData->m_newLocation.GetScheme()); - if( protocol != HTTP && protocol != HTTPS ) { - LogMessage(MessageType::Error, _("Redirection to invalid or unsupported address: %s"), pData->m_newLocation.BuildURI()); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - long port = CServer::GetDefaultPort(protocol); - if( pData->m_newLocation.HasPort() && (!pData->m_newLocation.GetPort().ToLong(&port) || port < 1 || port > 65535) ) { - LogMessage(MessageType::Error, _("Redirection to invalid or unsupported address: %s"), pData->m_newLocation.BuildURI()); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - m_current_uri = pData->m_newLocation; - - // International domain names - wxString host = ConvertDomainName(m_current_uri.GetServer()); - - int res = InternalConnect(host, static_cast(port), protocol == HTTPS); - if (res == FZ_REPLY_WOULDBLOCK) - res |= FZ_REPLY_REDIRECTED; - return res; - } - - if( pData->m_pOpData && pData->m_pOpData->opId == Command::transfer) { - CHttpFileTransferOpData* pTransfer = static_cast(pData->m_pOpData); - if( pTransfer->resume && pData->m_responseCode != 206 ) { - pTransfer->resume = false; - int res = OpenFile(pTransfer); - if( res != FZ_REPLY_OK ) { - return res; - } - } - } - - pData->m_gotHeader = true; - - memmove(m_pRecvBuffer, m_pRecvBuffer + 2, m_recvBufferPos - 2); - m_recvBufferPos -= 2; - - if (m_recvBufferPos) - { - int res; - if (pData->m_transferEncoding == pData->chunked) - res = OnChunkedData(pData); - else - { - pData->m_receivedData += m_recvBufferPos; - res = ProcessData(m_pRecvBuffer, m_recvBufferPos); - m_recvBufferPos = 0; - } - return res; - } - - return FZ_REPLY_WOULDBLOCK; - } - if (m_recvBufferPos > 12 && !memcmp(m_pRecvBuffer, "Location: ", 10)) - { - pData->m_newLocation = wxURI(wxString(m_pRecvBuffer + 10, wxConvLocal)); - pData->m_newLocation.Resolve(m_current_uri); - } - else if (m_recvBufferPos > 21 && !memcmp(m_pRecvBuffer, "Transfer-Encoding: ", 19)) - { - if (!strcmp(m_pRecvBuffer + 19, "chunked")) - pData->m_transferEncoding = CHttpOpData::chunked; - else if (!strcmp(m_pRecvBuffer + 19, "identity")) - pData->m_transferEncoding = CHttpOpData::identity; - else - pData->m_transferEncoding = CHttpOpData::unknown; - } - else if (i > 16 && !memcmp(m_pRecvBuffer, "Content-Length: ", 16)) - { - pData->m_totalSize = 0; - char* p = m_pRecvBuffer + 16; - while (*p) - { - if (*p < '0' || *p > '9') - { - LogMessage(MessageType::Error, _("Malformed header: %s"), _("Invalid Content-Length")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - pData->m_totalSize = pData->m_totalSize * 10 + *p++ - '0'; - } - } - } - - memmove(m_pRecvBuffer, m_pRecvBuffer + i + 2, m_recvBufferPos - i - 2); - m_recvBufferPos -= i + 2; - - if (!m_recvBufferPos) - break; - } - - return FZ_REPLY_WOULDBLOCK; -} - -int CHttpControlSocket::OnChunkedData(CHttpOpData* pData) -{ - char* p = m_pRecvBuffer; - unsigned int len = m_recvBufferPos; - - for (;;) - { - if (pData->m_chunkData.size != 0) - { - unsigned int dataLen = len; - if (pData->m_chunkData.size < len) - dataLen = static_cast(pData->m_chunkData.size); - pData->m_receivedData += dataLen; - int res = ProcessData(p, dataLen); - if (res != FZ_REPLY_WOULDBLOCK) - return res; - - pData->m_chunkData.size -= dataLen; - p += dataLen; - len -= dataLen; - - if (pData->m_chunkData.size == 0) - pData->m_chunkData.terminateChunk = true; - - if (!len) - break; - } - - // Find line ending - unsigned int i = 0; - for (i = 0; (i + 1) < len; i++) - { - if (p[i] == '\r') - { - if (p[i + 1] != '\n') - { - LogMessage(MessageType::Error, _("Malformed chunk data: %s"), _("Wrong line endings")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - break; - } - } - if ((i + 1) >= len) - { - if (len == m_recvBufferLen) - { - // We don't support lines larger than 4096 - LogMessage(MessageType::Error, _("Malformed chunk data: %s"), _("Line length exceeded")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - break; - } - - p[i] = 0; - - if (pData->m_chunkData.terminateChunk) - { - if (i) - { - // The chunk data has to end with CRLF. If i is nonzero, - // it didn't end with just CRLF. - LogMessage(MessageType::Error, _("Malformed chunk data: %s"), _("Chunk data improperly terminated")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - pData->m_chunkData.terminateChunk = false; - } - else if (pData->m_chunkData.getTrailer) - { - if (!i) - { - // We're done - return ProcessData(0, 0); - } - - // Ignore the trailer - } - else - { - // Read chunk size - for( char* q = p; *q && *q != ';' && *q != ' '; ++q ) { - pData->m_chunkData.size *= 16; - if (*q >= '0' && *q <= '9') { - pData->m_chunkData.size += *q - '0'; - } - else if (*q >= 'A' && *q <= 'F') { - pData->m_chunkData.size += *q - 'A' + 10; - } - else if (*q >= 'a' && *q <= 'f') { - pData->m_chunkData.size += *q - 'a' + 10; - } - else { - // Invalid size - LogMessage(MessageType::Error, _("Malformed chunk data: %s"), _("Invalid chunk size")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - } - if (pData->m_chunkData.size == 0) - pData->m_chunkData.getTrailer = true; - } - - p += i + 2; - len -= i + 2; - - if (!len) - break; - } - - if (p != m_pRecvBuffer) - { - memmove(m_pRecvBuffer, p, len); - m_recvBufferPos = len; - } - - return FZ_REPLY_WOULDBLOCK; -} - -int CHttpControlSocket::ResetOperation(int nErrorCode) -{ - if (m_pCurOpData && m_pCurOpData->opId == Command::transfer) - { - CHttpFileTransferOpData *pData = static_cast(m_pCurOpData); - delete pData->pFile; - pData->pFile = 0; - } - - if (!m_pCurOpData || !m_pCurOpData->pNextOpData) - { - if (m_pBackend) - { - if (nErrorCode == FZ_REPLY_OK) - LogMessage(MessageType::Status, _("Disconnected from server")); - else - LogMessage(MessageType::Error, _("Disconnected from server")); - } - ResetSocket(); - m_pHttpOpData = 0; - } - - return CControlSocket::ResetOperation(nErrorCode); -} - -void CHttpControlSocket::OnClose(int error) -{ - LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::OnClose(%d)"), error); - - if (error) { - LogMessage(MessageType::Error, _("Disconnected from server: %s"), CSocket::GetErrorDescription(error)); - ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); - return; - } - - // HTTP socket isn't connected outside operations - if (!m_pCurOpData) - return; - - if (m_pCurOpData->pNextOpData) { - ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); - return; - } - - if (!m_pHttpOpData->m_gotHeader) { - ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); - return; - } - - if (m_pHttpOpData->m_transferEncoding == CHttpOpData::chunked) { - if (!m_pHttpOpData->m_chunkData.getTrailer) { - ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); - return; - } - } - else { - if (m_pHttpOpData->m_totalSize != -1 && m_pHttpOpData->m_receivedData != m_pHttpOpData->m_totalSize) { - ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED); - return; - } - } - - ProcessData(0, 0); -} - -void CHttpControlSocket::ResetHttpData(CHttpOpData* pData) -{ - wxASSERT(pData); - - delete [] m_pRecvBuffer; - m_pRecvBuffer = 0; - - pData->m_gotHeader = false; - pData->m_responseCode = -1; - pData->m_transferEncoding = CHttpOpData::unknown; - - pData->m_chunkData.getTrailer = false; - pData->m_chunkData.size = 0; - pData->m_chunkData.terminateChunk = false; - - pData->m_totalSize = -1; - pData->m_receivedData = 0; -} - -int CHttpControlSocket::ProcessData(char* p, int len) -{ - int res; - Command commandId = GetCurrentCommandId(); - switch (commandId) - { - case Command::transfer: - res = FileTransferParseResponse(p, len); - break; - default: - LogMessage(MessageType::Debug_Warning, _T("No action for parsing data for command %d"), (int)commandId); - ResetOperation(FZ_REPLY_INTERNALERROR); - res = FZ_REPLY_ERROR; - break; - } - - wxASSERT(p || !m_pCurOpData); - - return res; -} - -int CHttpControlSocket::ParseSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::SendNextCommand(%d)"), prevResult); - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("SendNextCommand called without active operation")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - switch (m_pCurOpData->opId) - { - case Command::transfer: - return FileTransferSubcommandResult(prevResult); - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown opID (%d) in SendNextCommand"), m_pCurOpData->opId); - ResetOperation(FZ_REPLY_INTERNALERROR); - break; - } - - return FZ_REPLY_ERROR; -} - -int CHttpControlSocket::Disconnect() -{ - DoClose(); - return FZ_REPLY_OK; -} - -int CHttpControlSocket::OpenFile(CHttpFileTransferOpData* pData) -{ - delete pData->pFile; - pData->pFile = new wxFile(); - CreateLocalDir(pData->localFile); - - if (!pData->pFile->Open(pData->localFile, pData->resume ? wxFile::write_append : wxFile::write)) { - LogMessage(MessageType::Error, _("Failed to open \"%s\" for writing"), pData->localFile); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - wxFileOffset end = pData->pFile->SeekEnd(); - if (!end) { - pData->resume = false; - } - pData->localFileSize = fz::local_filesys::get_size(fz::to_native(pData->localFile)); - return FZ_REPLY_OK; -} diff -Nru filezilla-3.15.0.2/src/engine/httpcontrolsocket.h filezilla-3.33.0/src/engine/httpcontrolsocket.h --- filezilla-3.15.0.2/src/engine/httpcontrolsocket.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/httpcontrolsocket.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -#ifndef __HTTPCONTROLSOCKET_H__ -#define __HTTPCONTROLSOCKET_H__ - -#include - -class CHttpOpData; -class CTlsSocket; -class CHttpFileTransferOpData; -class CHttpControlSocket final : public CRealControlSocket -{ -public: - CHttpControlSocket(CFileZillaEnginePrivate & engine); - virtual ~CHttpControlSocket(); - -protected: - virtual int ContinueConnect(); - virtual bool Connected() { return m_pCurrentServer != 0; } - - virtual bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification); - virtual int SendNextCommand(); - virtual int ParseSubcommandResult(int prevResult); - - virtual int FileTransfer(const wxString localFile, const CServerPath &remotePath, - const wxString &remoteFile, bool download, - const CFileTransferCommand::t_transferSettings& transferSettings); - virtual int FileTransferSend(); - virtual int FileTransferParseResponse(char* p, unsigned int len); - virtual int FileTransferSubcommandResult(int prevResult); - - int InternalConnect(wxString host, unsigned short port, bool tls); - int DoInternalConnect(); - - virtual void OnConnect(); - virtual void OnClose(int error); - virtual void OnReceive(); - int DoReceive(); - - virtual int Disconnect(); - - virtual int ResetOperation(int nErrorCode); - - virtual void ResetHttpData(CHttpOpData* pData); - - int OpenFile( CHttpFileTransferOpData* pData); - - int ParseHeader(CHttpOpData* pData); - int OnChunkedData(CHttpOpData* pData); - - int ProcessData(char* p, int len); - - char* m_pRecvBuffer; - unsigned int m_recvBufferPos; - static const unsigned int m_recvBufferLen = 4096; - - CHttpOpData* m_pHttpOpData; - - CTlsSocket* m_pTlsSocket; - - wxURI m_current_uri; -}; - -#endif //__HTTPCONTROLSOCKET_H__ diff -Nru filezilla-3.15.0.2/src/engine/iothread.cpp filezilla-3.33.0/src/engine/iothread.cpp --- filezilla-3.15.0.2/src/engine/iothread.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/iothread.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -4,7 +4,7 @@ #include -#include +#include CIOThread::CIOThread() { @@ -17,6 +17,8 @@ CIOThread::~CIOThread() { + Destroy(); + Close(); delete [] m_buffers[0]; @@ -27,16 +29,17 @@ if (m_pFile) { // The file might have been preallocated and the transfer stopped before being completed // so always truncate the file to the actually written size before closing it. - if (!m_read) + if (!m_read) { m_pFile->truncate(); + } m_pFile.reset(); } } -bool CIOThread::Create(std::unique_ptr && pFile, bool read, bool binary) +bool CIOThread::Create(fz::thread_pool& pool, std::unique_ptr && pFile, bool read, bool binary) { - wxASSERT(pFile); + assert(pFile); Close(); @@ -56,24 +59,27 @@ #ifdef SIMULATE_IO size_ = m_pFile->size(); #endif - + m_running = true; - - if (!run()) { + + thread_ = pool.spawn([this]() { entry(); }); + if (!thread_) { m_running = false; return false; } - + return true; } void CIOThread::entry() { if (m_read) { + fz::scoped_lock l(m_mutex); while (m_running) { - auto len = ReadFromFile(m_buffers[m_curThreadBuf], BUFFERSIZE); - fz::scoped_lock l(m_mutex); + l.unlock(); + auto len = ReadFromFile(m_buffers[m_curThreadBuf], BUFFERSIZE); + l.lock(); if (m_appWaiting) { if (!m_evtHandler) { @@ -84,13 +90,13 @@ m_evtHandler->send_event(); } - if (len == -1) { + if (len <= -1) { m_error = true; m_running = false; break; } - m_bufferLens[m_curThreadBuf] = len; + m_bufferLens[m_curThreadBuf] = static_cast(len); if (!len) { m_running = false; @@ -99,12 +105,14 @@ ++m_curThreadBuf %= BUFFERCOUNT; if (m_curThreadBuf == m_curAppBuf) { - if (!m_running) + if (!m_running) { break; + } m_threadWaiting = true; - if (m_running) + if (m_running) { m_condition.wait(l); + } } } } @@ -147,8 +155,9 @@ m_evtHandler->send_event(); } - if (m_error) + if (m_error) { break; + } ++m_curThreadBuf %= BUFFERCOUNT; } @@ -159,8 +168,9 @@ { fz::scoped_lock l(m_mutex); - if (m_error) + if (m_error) { return IO_Error; + } if (m_curAppBuf == -1) { m_curAppBuf = 0; @@ -187,27 +197,32 @@ bool CIOThread::Finalize(int len) { - wxASSERT(m_pFile); + assert(m_pFile); Destroy(); - if (m_curAppBuf == -1) + if (m_curAppBuf == -1) { return true; + } - if (m_error) + if (m_error) { return false; + } - if (!len) + if (!len) { return true; + } - if (!WriteToFile(m_buffers[m_curAppBuf], len)) + if (!WriteToFile(m_buffers[m_curAppBuf], len)) { return false; + } -#ifndef __WXMSW__ +#ifndef FZ_WINDOWS if (!m_binary && m_wasCarriageReturn) { const char CR = '\r'; - if (m_pFile->write(&CR, 1) != 1) + if (m_pFile->write(&CR, 1) != 1) { return false; + } } #endif @@ -218,17 +233,19 @@ int CIOThread::GetNextReadBuffer(char** pBuffer) { - wxASSERT(m_read); + assert(m_read); int newBuf = (m_curAppBuf + 1) % BUFFERCOUNT; fz::scoped_lock l(m_mutex); if (newBuf == m_curThreadBuf) { - if (m_error) + if (m_error) { return IO_Error; - else if (!m_running) + } + else if (!m_running) { return IO_Success; + } else { m_appWaiting = true; return IO_Again; @@ -259,7 +276,7 @@ } } - join(); + thread_.join(); } int64_t CIOThread::ReadFromFile(char* pBuffer, int64_t maxLen) @@ -275,12 +292,14 @@ // In binary mode, no conversion has to be done. // Also, under Windows the native newline format is already identical // to the newline format of the FTP protocol -#ifndef __WXMSW__ +#ifndef FZ_WINDOWS if (m_binary) #endif + { return m_pFile->read(pBuffer, maxLen); + } -#ifndef __WXMSW__ +#ifndef FZ_WINDOWS // In the worst case, length will doubled: If reading // only LFs from the file @@ -288,8 +307,9 @@ char* r = pBuffer + readLen; auto len = m_pFile->read(r, readLen); - if (!len || len <= -1) + if (!len || len <= -1) { return len; + } const char* const end = r + len; char* w = pBuffer; @@ -298,14 +318,17 @@ while (r != end) { char c = *r++; if (c == '\n') { - if (!m_wasCarriageReturn) + if (!m_wasCarriageReturn) { *w++ = '\r'; + } m_wasCarriageReturn = false; } - else if (c == '\r') + else if (c == '\r') { m_wasCarriageReturn = true; - else + } + else { m_wasCarriageReturn = false; + } *w++ = c; } @@ -322,11 +345,11 @@ // In binary mode, no conversion has to be done. // Also, under Windows the native newline format is already identical // to the newline format of the FTP protocol -#ifndef __WXMSW__ +#ifndef FZ_WINDOWS if (m_binary) { #endif return DoWrite(pBuffer, len); -#ifndef __WXMSW__ +#ifndef FZ_WINDOWS } else { @@ -336,8 +359,9 @@ if (m_wasCarriageReturn && len && *pBuffer != '\n' && *pBuffer != '\r') { m_wasCarriageReturn = false; const char CR = '\r'; - if (!DoWrite(&CR, 1)) + if (!DoWrite(&CR, 1)) { return false; + } } // Skip forward to end of buffer or first CR @@ -382,9 +406,9 @@ return true; } - int code = wxSysErrorCode(); + auto err = GetSystemErrorCode(); - const wxString error = wxSysErrorMsg(code); + std::wstring const error = fz::to_wstring(GetSystemErrorDescription(err)); fz::scoped_lock locker(m_mutex); m_error_description = error; @@ -392,7 +416,7 @@ return false; } -wxString CIOThread::GetError() +std::wstring CIOThread::GetError() { fz::scoped_lock locker(m_mutex); return m_error_description; diff -Nru filezilla-3.15.0.2/src/engine/iothread.h filezilla-3.33.0/src/engine/iothread.h --- filezilla-3.15.0.2/src/engine/iothread.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/iothread.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,10 +1,11 @@ -#ifndef __IOTHREAD_H__ -#define __IOTHREAD_H__ +#ifndef FILEZILLA_ENGINE_IOTHREAD_HEADER +#define FILEZILLA_ENGINE_IOTHREAD_HEADER #include +#include -#define BUFFERCOUNT 5 -#define BUFFERSIZE 128*1024 +#define BUFFERCOUNT 8 +#define BUFFERSIZE 256*1024 // Does not actually read from or write to file // Useful for benchmarks to avoid IO bottleneck @@ -25,14 +26,14 @@ class file; } -class CIOThread final : protected fz::thread +class CIOThread final { public: CIOThread(); - virtual ~CIOThread(); + ~CIOThread(); - bool Create(std::unique_ptr && pFile, bool read, bool binary); - virtual void Destroy(); // Only call that might be blocking + bool Create(fz::thread_pool& pool, std::unique_ptr && pFile, bool read, bool binary); + void Destroy(); // Only call that might be blocking // Call before first call to one of the GetNext*Buffer functions // This handler will receive the CIOThreadEvent events. The events @@ -55,12 +56,12 @@ bool Finalize(int len); - wxString GetError(); + std::wstring GetError(); private: void Close(); - virtual void entry(); + void entry(); int64_t ReadFromFile(char* pBuffer, int64_t maxLen); bool WriteToFile(char* pBuffer, int64_t len); @@ -75,7 +76,7 @@ char* m_buffers[BUFFERCOUNT]; unsigned int m_bufferLens[BUFFERCOUNT]; - fz::mutex m_mutex; + fz::mutex m_mutex{false}; fz::condition m_condition; int m_curAppBuf{}; @@ -88,11 +89,13 @@ bool m_wasCarriageReturn{}; - wxString m_error_description; + std::wstring m_error_description; #ifdef SIMULATE_IO int64_t size_{}; #endif + + fz::async_task thread_; }; -#endif //__IOTHREAD_H__ +#endif diff -Nru filezilla-3.15.0.2/src/engine/local_path.cpp filezilla-3.33.0/src/engine/local_path.cpp --- filezilla-3.15.0.2/src/engine/local_path.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/local_path.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,81 +1,95 @@ #include #include "local_path.h" -#ifndef __WXMSW__ + +#include + +#ifndef FZ_WINDOWS #include +#include #endif #include -#ifdef __WXMSW__ -const wxChar CLocalPath::path_separator = '\\'; +#include + +#ifdef FZ_WINDOWS +wchar_t const CLocalPath::path_separator = '\\'; #else -const wxChar CLocalPath::path_separator = '/'; +wchar_t const CLocalPath::path_separator = '/'; #endif -CLocalPath::CLocalPath(const wxString& path, wxString* file /*=0*/) +CLocalPath::CLocalPath(std::wstring const& path, std::wstring* file) { SetPath(path, file); } -bool CLocalPath::SetPath(const wxString& path, wxString* file /*=0*/) +bool CLocalPath::SetPath(std::wstring const& path, std::wstring* file) { // This function ensures that the path is in canonical form on success. - if (path.empty()) { m_path.clear(); return false; } - std::deque segments; // List to store the beginnings of segments +#ifdef FZ_WINDOWS + if (path == L"\\") { + m_path.get() = path; + if (file) { + file->clear(); + } + return true; + } +#endif + + std::deque segments; // List to store the beginnings of segments - const wxChar* in = path.c_str(); + wchar_t const* in = path.c_str(); { - wxStringBuffer start(m_path.Get(), path.Len() + 2); - wxChar* out = start; + std::wstring & path_out = m_path.get(); + path_out.resize(path.size() + 1); + wchar_t * const start = &(path_out[0]); + wchar_t * out = start; -#ifdef __WXMSW__ - if (path == _T("\\")) - { - *out++ = '\\'; - *out++ = 0; - if (file) - file->clear(); - return true; - } +#ifdef FZ_WINDOWS if (*in == '\\') { // possibly UNC - in++; if (*in++ != '\\') { - *start = 0; + path_out.clear(); return false; } if (*in == '?') { // Could be \\?\c:\foo\bar - // or \\?\UNC\server\sharee + // or \\?\UNC\server\share // or something else we do not support. if (*(++in) != '\\') { + path_out.clear(); return false; } in++; - if (((*in >= 'a' && *in <= 'z') || (*in >= 'A' || *in <= 'Z')) && *(in+1) == ':') { + if (((*in >= 'a' && *in <= 'z') || (*in >= 'A' && *in <= 'Z')) && *(in+1) == ':') { // It's \\?\c:\foo\bar goto parse_regular; } - if (fz::strlen(in) < 5 || wxStrnicmp(in, _T("UNC\\"), 4)) { + wchar_t const* in_end = in + path.size(); + if (in_end - in < 5 || fz::stricmp(std::wstring(in, in_end), L"UNC\\")) { + path_out.clear(); return false; } in += 4; + + // It's \\?\UNC\server\share + // ^we are here } + *out++ = '\\'; *out++ = '\\'; // UNC path - while (*in) - { + while (*in) { if (*in == '/' || *in == '\\') break; *out++ = *in++; @@ -84,39 +98,37 @@ if (out - start <= 3) { // not a valid UNC path - *start = 0; + path_out.clear(); return false; } segments.push_back(out); } - else if ((*in >= 'a' && *in <= 'z') || (*in >= 'A' || *in <= 'Z')) - { + else if ((*in >= 'a' && *in <= 'z') || (*in >= 'A' && *in <= 'Z')) { parse_regular: // Regular path *out++ = *in++; if (*in++ != ':') { - *start = 0; + path_out.clear(); return false; } *out++ = ':'; if (*in != '/' && *in != '\\' && *in) { - *start = 0; + path_out.clear(); return false; } *out++ = path_separator; segments.push_back(out); } else { - *start = 0; + path_out.clear(); return false; } #else - if (*in++ != '/') - { + if (*in++ != '/') { // SetPath only accepts absolute paths - *start = 0; + path_out.clear(); return false; } @@ -131,37 +143,33 @@ dotdot, segment }; - enum _last last = separator; + _last last = separator; - while (*in) - { + while (*in) { if (*in == '/' - #ifdef __WXMSW__ + #ifdef FZ_WINDOWS || *in == '\\' #endif ) { in++; - if (last == separator) - { + if (last == separator) { // /foo//bar is equal to /foo/bar continue; } - else if (last == dot) - { + else if (last == dot) { // /foo/./bar is equal to /foo/bar last = separator; out = segments.back(); continue; } - else if (last == dotdot) - { + else if (last == dotdot) { last = separator; // Go two segments back if possible - if (segments.size() > 1) + if (segments.size() > 1) { segments.pop_back(); - wxASSERT(!segments.empty()); + } out = segments.back(); continue; } @@ -172,41 +180,43 @@ last = separator; continue; } - else if (*in == '.') - { - if (last == separator) + else if (*in == '.') { + if (last == separator) { last = dot; - else if (last == dot) + } + else if (last == dot) { last = dotdot; - else if (last == dotdot) + } + else if (last == dotdot) { last = segment; + } } - else + else { last = segment; + } *out++ = *in++; } - if (last == dot) + if (last == dot) { out = segments.back(); - else if (last == dotdot) - { - if (segments.size() > 1) + } + else if (last == dotdot) { + if (segments.size() > 1) { segments.pop_back(); + } out = segments.back(); } - else if (last == segment) - { - if (file) - { - *out = 0; + else if (last == segment) { + if (file) { + *file = std::wstring(segments.back(), out); out = segments.back(); - *file = out; } - else + else { *out++ = path_separator; + } } - *out = 0; + path_out.resize(out - start); } return true; @@ -224,19 +234,22 @@ bool CLocalPath::IsWriteable() const { - if (m_path->empty()) + if (m_path->empty()) { return false; + } -#ifdef __WXMSW__ - if (m_path == _T("\\")) +#ifdef FZ_WINDOWS + if (m_path == L"\\") { // List of drives not writeable return false; + } - if (m_path->Left(2) == _T("\\\\")) { - int pos = m_path->Mid(2).Find('\\'); - if (pos == -1 || pos + 3 == (int)m_path->Len()) + if (m_path->substr(0, 2) == L"\\\\") { + auto pos = m_path->find('\\', 2); + if (pos == std::wstring::npos || pos + 3 >= m_path->size()) { // List of shares on a computer not writeable return false; + } } #endif @@ -245,7 +258,7 @@ bool CLocalPath::HasParent() const { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS // C:\f\ has parent // C:\ does not // \\x\y\ shortest UNC @@ -254,7 +267,7 @@ #else const int min = 0; #endif - for (int i = (int)m_path->Len() - 2; i >= min; --i) { + for (int i = static_cast(m_path->size()) - 2; i >= min; --i) { if ((*m_path)[i] == path_separator) return true; } @@ -264,23 +277,26 @@ bool CLocalPath::HasLogicalParent() const { -#ifdef __WXMSW__ - if (m_path->Len() == 3 && (*m_path)[0] != '\\') // Drive root +#ifdef FZ_WINDOWS + if (m_path->size() == 3 && (*m_path)[0] != '\\') { + // Drive root return true; + } #endif return HasParent(); } -CLocalPath CLocalPath::GetParent(wxString* last_segment /*=0*/) const +CLocalPath CLocalPath::GetParent(std::wstring* last_segment) const { CLocalPath parent; -#ifdef __WXMSW__ - if (m_path->Len() == 3 && (*m_path)[0] != '\\') // Drive root - { - if (last_segment) +#ifdef FZ_WINDOWS + if (m_path->size() == 3 && (*m_path)[0] != '\\') { + // Drive root + if (last_segment) { last_segment->clear(); - return CLocalPath(_T("\\")); + } + return CLocalPath(L"\\"); } // C:\f\ has parent @@ -291,27 +307,26 @@ #else const int min = 0; #endif - for (int i = (int)m_path->Len() - 2; i >= min; --i) { + for (int i = (int)m_path->size() - 2; i >= min; --i) { if ((*m_path)[i] == path_separator) { if (last_segment) { - *last_segment = m_path->Mid(i + 1); - last_segment->RemoveLast(); + *last_segment = m_path->substr(i + 1, m_path->size() - i - 2); } - return CLocalPath(m_path->Left(i + 1)); + return CLocalPath(m_path->substr(0, i + 1)); } } return CLocalPath(); } -bool CLocalPath::MakeParent(wxString* last_segment /*=0*/) +bool CLocalPath::MakeParent(std::wstring* last_segment) { - wxString& path = m_path.Get(); + std::wstring& path = m_path.get(); -#ifdef __WXMSW__ - if (path.Len() == 3 && path[0] != '\\') // Drive root - { - path = _T("\\"); +#ifdef FZ_WINDOWS + if (path.size() == 3 && path[0] != '\\') { + // Drive root + path = L"\\"; return true; } @@ -323,13 +338,12 @@ #else const int min = 0; #endif - for (int i = (int)path.Len() - 2; i >= min; --i) { + for (int i = (int)path.size() - 2; i >= min; --i) { if (path[i] == path_separator) { if (last_segment) { - *last_segment = path.Mid(i + 1); - last_segment->RemoveLast(); + *last_segment = path.substr(i + 1, path.size() - i - 2); } - path = path.Left(i + 1); + path = path.substr(0, i + 1); return true; } } @@ -337,14 +351,14 @@ return false; } -void CLocalPath::AddSegment(const wxString& segment) +void CLocalPath::AddSegment(std::wstring const& segment) { - wxString& path = m_path.Get(); + std::wstring& path = m_path.get(); - wxASSERT(!path.empty()); - wxASSERT(segment.Find(_T("/")) == -1); -#ifdef __WXMSW__ - wxASSERT(segment.Find(_T("\\")) == -1); + assert(!path.empty()); + assert(segment.find(L"/") == std::wstring::npos); +#ifdef FZ_WINDOWS + assert(segment.find(L"\\") == std::wstring::npos); #endif if (!segment.empty()) { @@ -353,66 +367,65 @@ } } -bool CLocalPath::ChangePath(const wxString& new_path) +bool CLocalPath::ChangePath(std::wstring const& new_path) { - if (new_path.empty()) + if (new_path.empty()) { return false; + } - wxString& path = m_path.Get(); - -#ifdef __WXMSW__ - if (new_path == _T("\\") || new_path == _T("/")) { - path = _T("\\"); +#ifdef FZ_WINDOWS + if (new_path == L"\\" || new_path == L"/") { + m_path.get() = L"\\"; return true; } - if (new_path.Len() >= 2 && new_path[0] == '\\' && new_path[1] == '\\') { + if (new_path.size() >= 2 && new_path[0] == '\\' && new_path[1] == '\\') { // Absolute UNC return SetPath(new_path); } - if (new_path.Len() >= 2 && new_path[0] && new_path[1] == ':') { + if (new_path.size() >= 2 && new_path[0] && new_path[1] == ':') { // Absolute new_path return SetPath(new_path); } // Relative new_path - if (path.empty()) + if (m_path->empty()) { return false; + } - if (new_path.Len() >= 2 && (new_path[0] == '\\' || new_path[0] == '/') && path[1] == ':') { + if (new_path.size() >= 2 && (new_path[0] == '\\' || new_path[0] == '/') && m_path->size() > 2 && (*m_path)[1] == ':') { // Relative to drive root - return SetPath(path.Left(2) + new_path); + return SetPath(m_path->substr(0, 2) + new_path); } else { // Relative to current directory - return SetPath(path + new_path); + return SetPath(*m_path + new_path); } #else if (!new_path.empty() && new_path[0] == path_separator) { // Absolute new_path return SetPath(new_path); } - else - { + else { // Relative new_path - - if (path.empty()) + if (m_path->empty()) { return false; + } - return SetPath(path + new_path); + return SetPath(*m_path + new_path); } #endif } -bool CLocalPath::Exists(wxString *error /*=0*/) const +bool CLocalPath::Exists(std::wstring *error) const { - wxASSERT(!m_path->empty()); - if (m_path->empty()) + assert(!m_path->empty()); + if (m_path->empty()) { return false; + } -#ifdef __WXMSW__ - if (m_path == _T("\\")) - { +#ifdef FZ_WINDOWS + if (m_path == L"\\") { // List of drives always exists return true; } @@ -423,71 +436,82 @@ size_t pos; // Search for backslash separating server from share - for (pos = 3; pos < m_path->Len(); pos++) - if ((*m_path)[pos] == '\\') + for (pos = 3; pos < m_path->size(); ++pos) { + if ((*m_path)[pos] == '\\') { break; - pos++; - if (pos >= m_path->Len()) { + } + } + ++pos; + if (pos >= m_path->size()) { // Partial UNC path return true; } } - wxString path = *m_path; - if (path.Len() > 3) - path.RemoveLast(); - DWORD ret = ::GetFileAttributes(path.wc_str()); + std::wstring path = *m_path; + if (path.size() > 3) { + path.resize(path.size() - 1); + } + DWORD ret = ::GetFileAttributes(path.c_str()); if (ret == INVALID_FILE_ATTRIBUTES) { - if (!error) + if (!error) { return false; + } - error->Printf(_("'%s' does not exist or cannot be accessed."), path); + *error = fz::sprintf(_("'%s' does not exist or cannot be accessed."), path); - if ((*m_path)[0] == '\\') + if ((*m_path)[0] == '\\') { return false; + } // Check for removable drive, display a more specific error message in that case - if (::GetLastError() != ERROR_NOT_READY) + if (::GetLastError() != ERROR_NOT_READY) { return false; - int type = GetDriveType(m_path->Left(3).wc_str()); - if (type == DRIVE_REMOVABLE || type == DRIVE_CDROM) - error->Printf(_("Cannot access '%s', no media inserted or drive not ready."), path); + } + int type = GetDriveType(m_path->substr(0, 3).c_str()); + if (type == DRIVE_REMOVABLE || type == DRIVE_CDROM) { + *error = fz::sprintf(_("Cannot access '%s', no media inserted or drive not ready."), path); + } return false; } else if (!(ret & FILE_ATTRIBUTE_DIRECTORY)) { - if (error) - error->Printf(_("'%s' is not a directory."), path); + if (error) { + *error = fz::sprintf(_("'%s' is not a directory."), path); + } return false; } return true; #else - wxString path = *m_path; - if (path.Len() > 1) - path.RemoveLast(); - - const wxCharBuffer s = path.fn_str(); + std::string path = fz::to_string(*m_path); + if (path.size() > 1) { + path.pop_back(); + } struct stat buf; - int result = stat(s, &buf); + int result = stat(path.c_str(), &buf); if (!result) { - if (S_ISDIR(buf.st_mode)) + if (S_ISDIR(buf.st_mode)) { return true; + } - if (error) - error->Printf(_("'%s' is not a directory."), path); + if (error) { + *error = fz::sprintf(_("'%s' is not a directory."), *m_path); + } return false; } else if (result == ENOTDIR) { - if (error) - error->Printf(_("'%s' is not a directory."), path); + if (error) { + *error = fz::sprintf(_("'%s' is not a directory."), *m_path); + } return false; } else { - if (error) - error->Printf(_("'%s' does not exist or cannot be accessed."), path); + if (error) { + *error = fz::sprintf(_("'%s' does not exist or cannot be accessed."), *m_path); + } return false; } #endif @@ -495,8 +519,8 @@ bool CLocalPath::operator==(const CLocalPath& op) const { -#ifdef __WXMSW__ - return m_path->CmpNoCase(*op.m_path) == 0; +#ifdef FZ_WINDOWS + return m_path.is_same(op.m_path) || fz::stricmp(*m_path, *op.m_path) == 0; #else return m_path == op.m_path; #endif @@ -504,27 +528,40 @@ bool CLocalPath::operator!=(const CLocalPath& op) const { -#ifdef __WXMSW__ - return m_path->CmpNoCase(*op.m_path) != 0; +#ifdef FZ_WINDOWS + return !m_path.is_same(op.m_path) && fz::stricmp(*m_path, *op.m_path) != 0; #else return m_path != op.m_path; #endif } +bool CLocalPath::operator<(CLocalPath const& op) const +{ +#ifdef FZ_WINDOWS + return !m_path.is_same(op.m_path) && fz::stricmp(*m_path, *op.m_path) < 0; +#else + return m_path < op.m_path; +#endif +} + bool CLocalPath::IsParentOf(const CLocalPath &path) const { - if (empty() || path.empty()) + if (empty() || path.empty()) { return false; + } - if (path.m_path->Len() < m_path->Len()) + if (path.m_path->size() < m_path->size()) { return false; + } -#ifdef __WXMSW__ - if (m_path->CmpNoCase(path.m_path->Left(m_path->Len()))) +#ifdef FZ_WINDOWS + if (fz::stricmp(*m_path, path.m_path->substr(0, m_path->size()))) { return false; + } #else - if (*m_path != path.m_path->Left(m_path->Len())) + if (*m_path != path.m_path->substr(0, m_path->size())) { return false; + } #endif return true; @@ -532,28 +569,32 @@ bool CLocalPath::IsSubdirOf(const CLocalPath &path) const { - if (empty() || path.empty()) + if (empty() || path.empty()) { return false; + } - if (path.m_path->Len() > m_path->Len()) + if (path.m_path->size() > m_path->size()) { return false; + } -#ifdef __WXMSW__ - if (path.m_path->CmpNoCase(m_path->Left(path.m_path->Len()))) +#ifdef FZ_WINDOWS + if (fz::stricmp(*path.m_path, m_path->substr(0, path.m_path->size()))) { return false; + } #else - if (*path.m_path != m_path->Left(path.m_path->Len())) + if (*path.m_path != m_path->substr(0, path.m_path->size())) { return false; + } #endif return true; } -wxString CLocalPath::GetLastSegment() const +std::wstring CLocalPath::GetLastSegment() const { - wxASSERT(HasParent()); + assert(HasParent()); -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS // C:\f\ has parent // C:\ does not // \\x\y\ shortest UNC @@ -562,13 +603,54 @@ #else const int min = 0; #endif - for (int i = (int)m_path->Len() - 2; i >= min; i--) { + for (int i = (int)m_path->size() - 2; i >= min; i--) { if ((*m_path)[i] == path_separator) { - wxString last = m_path->Mid(i + 1); - last.RemoveLast(); - return last; + return m_path->substr(i + 1, m_path->size() - i - 2); + } + } + + return std::wstring(); +} + +bool CLocalPath::Create(CLocalPath *last_successful) +{ + CLocalPath local_path(*this); + + // Only go back as far as needed. + std::vector segments; + while (!local_path.Exists() && local_path.HasParent()) { + std::wstring segment; + local_path.MakeParent(&segment); + segments.emplace_back(std::move(segment)); + } + + bool ret = true; + for (auto iter = segments.rbegin(); iter != segments.rend(); ++iter) { + local_path.AddSegment(*iter); + + #ifdef FZ_WINDOWS + BOOL res = CreateDirectory(local_path.GetPath().c_str(), nullptr); + if (!res && GetLastError() != ERROR_ALREADY_EXISTS) { + ret = false; + break; + } + #else + fz::native_string s = fz::to_native(local_path.GetPath()); + if (s.empty()) { + ret = false; + break; + } + + int res = mkdir(s.c_str(), 0777); + if (res && errno != EEXIST) { + ret = false; + break; + } + #endif + if (last_successful) { + *last_successful = local_path; } } - return wxString(); + return ret; } diff -Nru filezilla-3.15.0.2/src/engine/logging.cpp filezilla-3.33.0/src/engine/logging.cpp --- filezilla-3.15.0.2/src/engine/logging.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/logging.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -2,23 +2,24 @@ #include "logging_private.h" -#ifdef __WXMSW__ -#include -#endif -#include - #include +#ifndef FZ_WINDOWS +#include +#include +#include +#endif + bool CLogging::m_logfile_initialized = false; -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS HANDLE CLogging::m_log_fd = INVALID_HANDLE_VALUE; #else int CLogging::m_log_fd = -1; #endif -wxString CLogging::m_prefixes[static_cast(MessageType::count)]; +std::string CLogging::m_prefixes[static_cast(MessageType::count)]; unsigned int CLogging::m_pid; int CLogging::m_max_size; -wxString CLogging::m_file; +fz::native_string CLogging::m_file; int CLogging::m_refcount = 0; fz::mutex CLogging::mutex_(false); @@ -39,7 +40,7 @@ m_refcount--; if (!m_refcount) { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS if (m_log_fd != INVALID_HANDLE_VALUE) { CloseHandle(m_log_fd); m_log_fd = INVALID_HANDLE_VALUE; @@ -90,34 +91,39 @@ m_logfile_initialized = true; - m_file = engine_.GetOptions().GetOption(OPTION_LOGGING_FILE); + m_file = fz::to_native(engine_.GetOptions().GetOption(OPTION_LOGGING_FILE)); if (m_file.empty()) return false; -#ifdef __WXMSW__ - m_log_fd = CreateFile(m_file.wc_str(), FILE_APPEND_DATA, FILE_SHARE_DELETE | FILE_SHARE_WRITE | FILE_SHARE_READ, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (m_log_fd == INVALID_HANDLE_VALUE) +#ifdef FZ_WINDOWS + m_log_fd = CreateFile(m_file.c_str(), FILE_APPEND_DATA, FILE_SHARE_DELETE | FILE_SHARE_WRITE | FILE_SHARE_READ, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); + if (m_log_fd == INVALID_HANDLE_VALUE) { + DWORD err = GetLastError(); #else - m_log_fd = open(m_file.fn_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644); - if (m_log_fd == -1) + m_log_fd = open(m_file.c_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644); + if (m_log_fd == -1) { + int err = errno; #endif - { l.unlock(); //Avoid recursion - LogMessage(MessageType::Error, _("Could not open log file: %s"), wxSysErrorMsg()); + LogMessage(MessageType::Error, _("Could not open log file: %s"), GetSystemErrorDescription(err)); return false; } - m_prefixes[static_cast(MessageType::Status)] = _("Status:"); - m_prefixes[static_cast(MessageType::Error)] = _("Error:"); - m_prefixes[static_cast(MessageType::Command)] = _("Command:"); - m_prefixes[static_cast(MessageType::Response)] = _("Response:"); - m_prefixes[static_cast(MessageType::Debug_Warning)] = _("Trace:"); + m_prefixes[static_cast(MessageType::Status)] = fz::to_utf8(_("Status:")); + m_prefixes[static_cast(MessageType::Error)] = fz::to_utf8(_("Error:")); + m_prefixes[static_cast(MessageType::Command)] = fz::to_utf8(_("Command:")); + m_prefixes[static_cast(MessageType::Response)] = fz::to_utf8(_("Response:")); + m_prefixes[static_cast(MessageType::Debug_Warning)] = fz::to_utf8(_("Trace:")); m_prefixes[static_cast(MessageType::Debug_Info)] = m_prefixes[static_cast(MessageType::Debug_Warning)]; m_prefixes[static_cast(MessageType::Debug_Verbose)] = m_prefixes[static_cast(MessageType::Debug_Warning)]; m_prefixes[static_cast(MessageType::Debug_Debug)] = m_prefixes[static_cast(MessageType::Debug_Warning)]; - m_prefixes[static_cast(MessageType::RawList)] = _("Listing:"); + m_prefixes[static_cast(MessageType::RawList)] = fz::to_utf8(_("Listing:")); - m_pid = wxGetProcessId(); +#if FZ_WINDOWS + m_pid = static_cast(GetCurrentProcessId()); +#else + m_pid = static_cast(getpid()); +#endif m_max_size = engine_.GetOptions().GetOptionVal(OPTION_LOGGING_FILE_SIZELIMIT); if (m_max_size < 0) @@ -129,7 +135,7 @@ return true; } -void CLogging::LogToFile(MessageType nMessageType, const wxString& msg) const +void CLogging::LogToFile(MessageType nMessageType, std::wstring const& msg) const { fz::scoped_lock l(mutex_); @@ -138,166 +144,179 @@ return; } } -#ifdef __WXMSW__ - if (m_log_fd == INVALID_HANDLE_VALUE) +#ifdef FZ_WINDOWS + if (m_log_fd == INVALID_HANDLE_VALUE) { return; + } #else - if (m_log_fd == -1) + if (m_log_fd == -1) { return; + } #endif fz::datetime now = fz::datetime::now(); - wxString out(wxString::Format(_T("%s %u %d %s %s") -#ifdef __WXMSW__ - _T("\r\n"), + std::string const out = fz::sprintf("%s %u %u %s %s" +#ifdef FZ_WINDOWS + "\r\n", #else - _T("\n"), + "\n", #endif - now.format(_T("%Y-%m-%d %H:%M:%S"), fz::datetime::local), m_pid, engine_.GetEngineId(), m_prefixes[static_cast(nMessageType)], msg)); + now.format("%Y-%m-%d %H:%M:%S", fz::datetime::local), m_pid, engine_.GetEngineId(), m_prefixes[static_cast(nMessageType)], fz::to_utf8(msg)); - const wxWX2MBbuf utf8 = out.mb_str(wxConvUTF8); - if (utf8) { -#ifdef __WXMSW__ - if (m_max_size) { - LARGE_INTEGER size; - if (!GetFileSizeEx(m_log_fd, &size) || size.QuadPart > m_max_size) { - CloseHandle(m_log_fd); - m_log_fd = INVALID_HANDLE_VALUE; - - // m_log_fd might no longer be the original file. - // Recheck on a new handle. Proteced with a mutex against other processes - HANDLE hMutex = ::CreateMutex(0, true, _T("FileZilla 3 Logrotate Mutex")); - if (!hMutex) { - wxString error = wxSysErrorMsg(); - l.unlock(); - LogMessage(MessageType::Error, _("Could not create logging mutex: %s"), error); - return; - } +#ifdef FZ_WINDOWS + if (m_max_size) { + LARGE_INTEGER size; + if (!GetFileSizeEx(m_log_fd, &size) || size.QuadPart > m_max_size) { + CloseHandle(m_log_fd); + m_log_fd = INVALID_HANDLE_VALUE; - HANDLE hFile = CreateFile(m_file.wc_str(), FILE_APPEND_DATA, FILE_SHARE_DELETE | FILE_SHARE_WRITE | FILE_SHARE_READ, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (hFile == INVALID_HANDLE_VALUE) { - wxString error = wxSysErrorMsg(); - - // Oh dear.. - ReleaseMutex(hMutex); - CloseHandle(hMutex); - - l.unlock(); // Avoid recursion - LogMessage(MessageType::Error, _("Could not open log file: %s"), error); - return; - } + // m_log_fd might no longer be the original file. + // Recheck on a new handle. Proteced with a mutex against other processes + HANDLE hMutex = ::CreateMutexW(nullptr, true, L"FileZilla 3 Logrotate Mutex"); + if (!hMutex) { + DWORD err = GetLastError(); + l.unlock(); + LogMessage(MessageType::Error, _("Could not create logging mutex: %s"), GetSystemErrorDescription(err)); + return; + } + + HANDLE hFile = CreateFileW(m_file.c_str(), FILE_APPEND_DATA, FILE_SHARE_DELETE | FILE_SHARE_WRITE | FILE_SHARE_READ, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); + if (hFile == INVALID_HANDLE_VALUE) { + DWORD err = GetLastError(); + + // Oh dear.. + ReleaseMutex(hMutex); + CloseHandle(hMutex); + + l.unlock(); // Avoid recursion + LogMessage(MessageType::Error, _("Could not open log file: %s"), GetSystemErrorDescription(err)); + return; + } - wxString error; - if (GetFileSizeEx(hFile, &size) && size.QuadPart > m_max_size) { - CloseHandle(hFile); - - // MoveFileEx can fail if trying to access a deleted file for which another process still has - // a handle. Move it far away first. - // Todo: Handle the case in which logdir and tmpdir are on different volumes. - // (Why is everthing so needlessly complex on MSW?) - wxString tmp = wxFileName::CreateTempFileName(_T("fz3")); - MoveFileEx((m_file + _T(".1")).wc_str(), tmp.wc_str(), MOVEFILE_REPLACE_EXISTING); - DeleteFile(tmp.wc_str()); - MoveFileEx(m_file.wc_str(), (m_file + _T(".1")).wc_str(), MOVEFILE_REPLACE_EXISTING); - m_log_fd = CreateFile(m_file.wc_str(), FILE_APPEND_DATA, FILE_SHARE_DELETE | FILE_SHARE_WRITE | FILE_SHARE_READ, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (m_log_fd == INVALID_HANDLE_VALUE) { - // If this function would return bool, I'd return FILE_NOT_FOUND here. - error = wxSysErrorMsg(); + DWORD err{}; + if (GetFileSizeEx(hFile, &size) && size.QuadPart > m_max_size) { + CloseHandle(hFile); + + // MoveFileEx can fail if trying to access a deleted file for which another process still has + // a handle. Move it far away first. + // Todo: Handle the case in which logdir and tmpdir are on different volumes. + // (Why is everthing so needlessly complex on MSW?) + + wchar_t tempDir[MAX_PATH + 1]; + DWORD res = GetTempPath(MAX_PATH, tempDir); + if (res && res <= MAX_PATH) { + tempDir[MAX_PATH] = 0; + + wchar_t tempFile[MAX_PATH + 1]; + res = GetTempFileNameW(tempDir, L"fz3", 0, tempFile); + if (res) { + tempFile[MAX_PATH] = 0; + MoveFileExW((m_file + L".1").c_str(), tempFile, MOVEFILE_REPLACE_EXISTING); + DeleteFileW(tempFile); } } - else - m_log_fd = hFile; - - if (hMutex) { - ReleaseMutex(hMutex); - CloseHandle(hMutex); + MoveFileExW(m_file.c_str(), (m_file + L".1").c_str(), MOVEFILE_REPLACE_EXISTING); + m_log_fd = CreateFileW(m_file.c_str(), FILE_APPEND_DATA, FILE_SHARE_DELETE | FILE_SHARE_WRITE | FILE_SHARE_READ, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); + if (m_log_fd == INVALID_HANDLE_VALUE) { + // If this function would return bool, I'd return FILE_NOT_FOUND here. + err = GetLastError(); } + } + else { + m_log_fd = hFile; + } - if (!error.empty()) { - l.unlock(); // Avoid recursion - LogMessage(MessageType::Error, _("Could not open log file: %s"), error); - return; - } + if (hMutex) { + ReleaseMutex(hMutex); + CloseHandle(hMutex); + } + + if (err) { + l.unlock(); // Avoid recursion + LogMessage(MessageType::Error, _("Could not open log file: %s"), GetSystemErrorDescription(err)); + return; } } - DWORD len = (DWORD)strlen((const char*)utf8); - DWORD written; - BOOL res = WriteFile(m_log_fd, (const char*)utf8, len, &written, 0); - if (!res || written != len) { - CloseHandle(m_log_fd); - m_log_fd = INVALID_HANDLE_VALUE; - l.unlock(); // Avoid recursion - LogMessage(MessageType::Error, _("Could not write to log file: %s"), wxSysErrorMsg()); - } + } + DWORD len = out.size(); + DWORD written; + BOOL res = WriteFile(m_log_fd, out.c_str(), len, &written, nullptr); + if (!res || written != len) { + DWORD err = GetLastError(); + CloseHandle(m_log_fd); + m_log_fd = INVALID_HANDLE_VALUE; + l.unlock(); // Avoid recursion + LogMessage(MessageType::Error, _("Could not write to log file: %s"), GetSystemErrorDescription(err)); + } #else - if (m_max_size) { - struct stat buf; - int rc = fstat(m_log_fd, &buf); - while (!rc && buf.st_size > m_max_size) { - struct flock lock = {}; - lock.l_type = F_WRLCK; - lock.l_whence = SEEK_SET; - lock.l_start = 0; - lock.l_len = 1; - - int rc; - - // Retry through signals - while ((rc = fcntl(m_log_fd, F_SETLKW, &lock)) == -1 && errno == EINTR); - - // Ignore any other failures - int fd = open(m_file.fn_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644); - if (fd == -1) { - wxString error = wxSysErrorMsg(); - - close(m_log_fd); - m_log_fd = -1; - - l.unlock(); // Avoid recursion - LogMessage(MessageType::Error, error); - return; - } - struct stat buf2; - rc = fstat(fd, &buf2); + if (m_max_size) { + struct stat buf; + int rc = fstat(m_log_fd, &buf); + while (!rc && buf.st_size > m_max_size) { + struct flock lock = {}; + lock.l_type = F_WRLCK; + lock.l_whence = SEEK_SET; + lock.l_start = 0; + lock.l_len = 1; + + // Retry through signals + while ((rc = fcntl(m_log_fd, F_SETLKW, &lock)) == -1 && errno == EINTR); + + // Ignore any other failures + int fd = open(m_file.c_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644); + if (fd == -1) { + int err = errno; - // Different files - if (!rc && buf.st_ino != buf2.st_ino) { - close(m_log_fd); // Releases the lock - m_log_fd = fd; - buf = buf2; - continue; - } - - // The file is indeed the log file and we are holding a lock on it. - - // Rename it - rc = rename(m_file.fn_str(), (m_file + _T(".1")).fn_str()); close(m_log_fd); - close(fd); + m_log_fd = -1; - // Get the new file - m_log_fd = open(m_file.fn_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644); - if (m_log_fd == -1) { - l.unlock(); // Avoid recursion - LogMessage(MessageType::Error, wxSysErrorMsg()); - return; - } + l.unlock(); // Avoid recursion + LogMessage(MessageType::Error, _("Could not open log file: %s"), GetSystemErrorDescription(err)); + return; + } + struct stat buf2; + rc = fstat(fd, &buf2); - if (!rc) // Rename didn't fail - rc = fstat(m_log_fd, &buf); + // Different files + if (!rc && buf.st_ino != buf2.st_ino) { + close(m_log_fd); // Releases the lock + m_log_fd = fd; + buf = buf2; + continue; } - } - size_t len = strlen((const char*)utf8); - size_t written = write(m_log_fd, (const char*)utf8, len); - if (written != len) { + + // The file is indeed the log file and we are holding a lock on it. + + // Rename it + rc = rename(m_file.c_str(), (m_file + ".1").c_str()); close(m_log_fd); - m_log_fd = -1; + close(fd); + + // Get the new file + m_log_fd = open(m_file.c_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644); + if (m_log_fd == -1) { + int err = errno; + l.unlock(); // Avoid recursion + LogMessage(MessageType::Error, _("Could not open log file: %s"), GetSystemErrorDescription(err)); + return; + } - l.unlock(); // Avoid recursion - LogMessage(MessageType::Error, _("Could not write to log file: %s"), wxSysErrorMsg()); + if (!rc) { + // Rename didn't fail + rc = fstat(m_log_fd, &buf); + } } -#endif } + size_t written = write(m_log_fd, out.c_str(), out.size()); + if (written != out.size()) { + int err = errno; + close(m_log_fd); + m_log_fd = -1; + + l.unlock(); // Avoid recursion + LogMessage(MessageType::Error, _("Could not write to log file: %s"), GetSystemErrorDescription(err)); + } +#endif } void CLogging::UpdateLogLevel(COptionsBase & options) diff -Nru filezilla-3.15.0.2/src/engine/logging_private.h filezilla-3.33.0/src/engine/logging_private.h --- filezilla-3.15.0.2/src/engine/logging_private.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/logging_private.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,8 @@ -#ifndef __LOGGING_PRIVATE_H__ -#define __LOGGING_PRIVATE_H__ +#ifndef FILEZILLA_ENGINE_LOGGIN_PRIVATE_HEADER +#define FILEZILLA_ENGINE_LOGGIN_PRIVATE_HEADER #include "engineprivate.h" +#include #include #include @@ -17,12 +18,12 @@ template void LogMessage(MessageType nMessageType, String&& msgFormat, Args&& ...args) const { - if( !ShouldLog(nMessageType) ) { + if (!ShouldLog(nMessageType)) { return; } CLogmsgNotification *notification = new CLogmsgNotification(nMessageType); - notification->msg.Printf(std::forward(msgFormat), std::forward(args)...); + notification->msg = fz::to_wstring(fz::sprintf(std::forward(msgFormat), std::forward(args)...)); LogToFile(nMessageType, notification->msg); engine_.AddLogNotification(notification); @@ -31,42 +32,16 @@ template void LogMessageRaw(MessageType nMessageType, String&& msg) const { - if( !ShouldLog(nMessageType) ) { + if (!ShouldLog(nMessageType)) { return; } - CLogmsgNotification *notification = new CLogmsgNotification(nMessageType, std::forward(msg)); + CLogmsgNotification *notification = new CLogmsgNotification(nMessageType, fz::to_wstring(std::forward(msg))); LogToFile(nMessageType, notification->msg); engine_.AddLogNotification(notification); } - - template - void LogMessage(String&& sourceFile, int nSourceLine, void *pInstance, MessageType nMessageType - , String2&& msgFormat, Args&& ...args) const - { - if( !ShouldLog(nMessageType) ) { - return; - } - - wxString source(sourceFile); - int pos = source.Find('\\', true); - if (pos != -1) - source = source.Mid(pos+1); - - pos = source.Find('/', true); - if (pos != -1) - source = source.Mid(pos+1); - - wxString text = wxString::Format(std::forward(msgFormat), std::forward(args)...); - - CLogmsgNotification *notification = new CLogmsgNotification(nMessageType); - notification->msg.Printf(_T("%s(%d): %s caller=%p"), source, nSourceLine, text, pInstance); - - LogToFile(nMessageType, notification->msg); - engine_.AddLogNotification(notification); - } - + bool ShouldLog(MessageType nMessageType) const; // Only affects calling thread @@ -76,27 +51,23 @@ CFileZillaEnginePrivate & engine_; bool InitLogFile(fz::scoped_lock& l) const; - void LogToFile(MessageType nMessageType, const wxString& msg) const; + void LogToFile(MessageType nMessageType, std::wstring const& msg) const; static bool m_logfile_initialized; -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS static HANDLE m_log_fd; #else static int m_log_fd; #endif - static wxString m_prefixes[static_cast(MessageType::count)]; + static std::string m_prefixes[static_cast(MessageType::count)]; static unsigned int m_pid; static int m_max_size; - static wxString m_file; + static fz::native_string m_file; static int m_refcount; static fz::mutex mutex_; -#if HAVE_NO_THREAD_LOCAL - // Fixme: Get rid of this once OS X's clang supports it. - #define thread_local __thread -#endif static thread_local int debug_level_; static thread_local int raw_listing_; }; diff -Nru filezilla-3.15.0.2/src/engine/Makefile.am filezilla-3.33.0/src/engine/Makefile.am --- filezilla-3.15.0.2/src/engine/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/Makefile.am 2018-03-29 08:58:59.000000000 +0000 @@ -1,10 +1,10 @@ +AUTOMAKE_OPTIONS = subdir-objects + noinst_LIBRARIES = libengine.a libengine_a_CPPFLAGS = -I$(srcdir)/../include libengine_a_CPPFLAGS += $(LIBFILEZILLA_CFLAGS) -libengine_a_CPPFLAGS += $(LIBGNUTLS_CFLAGS) $(WX_CPPFLAGS) -libengine_a_CXXFLAGS = $(WX_CXXFLAGS_ONLY) -libengine_a_CFLAGS = $(WX_CFLAGS_ONLY) +libengine_a_CPPFLAGS += $(LIBGNUTLS_CFLAGS) libengine_a_SOURCES = \ backend.cpp \ @@ -17,26 +17,53 @@ engineprivate.cpp \ externalipresolver.cpp \ FileZillaEngine.cpp \ - ftpcontrolsocket.cpp \ - httpcontrolsocket.cpp \ + ftp/chmod.cpp \ + ftp/cwd.cpp \ + ftp/delete.cpp \ + ftp/filetransfer.cpp \ + ftp/ftpcontrolsocket.cpp \ + ftp/list.cpp \ + ftp/logon.cpp \ + ftp/mkd.cpp \ + ftp/rawcommand.cpp \ + ftp/rawtransfer.cpp \ + ftp/rename.cpp \ + ftp/rmd.cpp \ + ftp/transfersocket.cpp \ + http/digest.cpp \ + http/filetransfer.cpp \ + http/httpcontrolsocket.cpp \ + http/internalconnect.cpp \ + http/request.cpp \ iothread.cpp \ local_path.cpp \ logging.cpp \ misc.cpp \ - msgbox.cpp \ notification.cpp \ option_change_event_handler.cpp \ pathcache.cpp \ proxy.cpp \ ratelimiter.cpp \ rtt.cpp \ - server.cpp serverpath.cpp\ + server.cpp \ + serverpath.cpp\ servercapabilities.cpp \ - sftpcontrolsocket.cpp \ + sftp/chmod.cpp \ + sftp/connect.cpp \ + sftp/cwd.cpp \ + sftp/delete.cpp \ + sftp/filetransfer.cpp \ + sftp/input_thread.cpp \ + sftp/list.cpp \ + sftp/mkd.cpp \ + sftp/rename.cpp \ + sftp/rmd.cpp \ + sftp/sftpcontrolsocket.cpp \ sizeformatting_base.cpp \ socket.cpp \ tlssocket.cpp \ - transfersocket.cpp + tlssocket_impl.cpp \ + xmlutils.cpp noinst_HEADERS = backend.h \ ControlSocket.h \ @@ -44,8 +71,25 @@ directorylistingparser.h \ engineprivate.h \ filezilla.h \ - ftpcontrolsocket.h \ - httpcontrolsocket.h \ + ftp/chmod.h \ + ftp/cwd.h \ + ftp/delete.h \ + ftp/filetransfer.h \ + ftp/ftpcontrolsocket.h \ + ftp/list.h \ + ftp/logon.h \ + ftp/mkd.h \ + ftp/rename.h \ + ftp/rawcommand.h \ + ftp/rawtransfer.h \ + ftp/rmd.h \ + ftp/transfersocket.h \ + http/connect.h \ + http/digest.h \ + http/filetransfer.h \ + http/httpcontrolsocket.h \ + http/internalconnect.h \ + http/request.h \ iothread.h \ logging_private.h \ pathcache.h \ @@ -53,9 +97,45 @@ ratelimiter.h \ rtt.h \ servercapabilities.h \ - sftpcontrolsocket.h \ + sftp/chmod.h \ + sftp/connect.h \ + sftp/cwd.h \ + sftp/delete.h \ + sftp/event.h \ + sftp/filetransfer.h \ + sftp/input_thread.h \ + sftp/list.h \ + sftp/mkd.h \ + sftp/rename.h \ + sftp/rmd.h \ + sftp/sftpcontrolsocket.h \ tlssocket.h \ - transfersocket.h + tlssocket_impl.h + +if ENABLE_STORJ +libengine_a_SOURCES += \ + storj/connect.cpp \ + storj/delete.cpp \ + storj/file_transfer.cpp \ + storj/input_thread.cpp \ + storj/list.cpp \ + storj/mkd.cpp \ + storj/resolve.cpp \ + storj/rmd.cpp \ + storj/storjcontrolsocket.cpp + +noinst_HEADERS += \ + storj/connect.h \ + storj/delete.h \ + storj/event.h \ + storj/file_transfer.h \ + storj/input_thread.h \ + storj/list.h \ + storj/mkd.h \ + storj/resolve.h \ + storj/rmd.h \ + storj/storjcontrolsocket.h +endif dist_noinst_DATA = engine.vcxproj @@ -68,8 +148,8 @@ include ./$(DEPDIR)/filezilla.Po filezilla.h.gch: filezilla.h - if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/filezilla.Tpo" -c -o $@ $<; \ + then mv -f "$(DEPDIR)/filezilla.Tpo" "$(DEPDIR)/filezilla.Po"; else rm -f "$(DEPDIR)/filezilla.Tpo"; exit 1; fi endif diff -Nru filezilla-3.15.0.2/src/engine/Makefile.in filezilla-3.33.0/src/engine/Makefile.in --- filezilla-3.15.0.2/src/engine/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/engine/Makefile.in 2018-05-07 08:45:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,18 +90,41 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_STORJ_TRUE@am__append_1 = \ +@ENABLE_STORJ_TRUE@ storj/connect.cpp \ +@ENABLE_STORJ_TRUE@ storj/delete.cpp \ +@ENABLE_STORJ_TRUE@ storj/file_transfer.cpp \ +@ENABLE_STORJ_TRUE@ storj/input_thread.cpp \ +@ENABLE_STORJ_TRUE@ storj/list.cpp \ +@ENABLE_STORJ_TRUE@ storj/mkd.cpp \ +@ENABLE_STORJ_TRUE@ storj/resolve.cpp \ +@ENABLE_STORJ_TRUE@ storj/rmd.cpp \ +@ENABLE_STORJ_TRUE@ storj/storjcontrolsocket.cpp + +@ENABLE_STORJ_TRUE@am__append_2 = \ +@ENABLE_STORJ_TRUE@ storj/connect.h \ +@ENABLE_STORJ_TRUE@ storj/delete.h \ +@ENABLE_STORJ_TRUE@ storj/event.h \ +@ENABLE_STORJ_TRUE@ storj/file_transfer.h \ +@ENABLE_STORJ_TRUE@ storj/input_thread.h \ +@ENABLE_STORJ_TRUE@ storj/list.h \ +@ENABLE_STORJ_TRUE@ storj/mkd.h \ +@ENABLE_STORJ_TRUE@ storj/resolve.h \ +@ENABLE_STORJ_TRUE@ storj/rmd.h \ +@ENABLE_STORJ_TRUE@ storj/storjcontrolsocket.h + subdir = src/engine -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(dist_noinst_DATA) \ - $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -103,6 +136,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(am__noinst_HEADERS_DIST) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -115,6 +150,39 @@ am__v_AR_1 = libengine_a_AR = $(AR) $(ARFLAGS) libengine_a_LIBADD = +am__libengine_a_SOURCES_DIST = backend.cpp commands.cpp \ + ControlSocket.cpp directorycache.cpp directorylisting.cpp \ + directorylistingparser.cpp engine_context.cpp \ + engineprivate.cpp externalipresolver.cpp FileZillaEngine.cpp \ + ftp/chmod.cpp ftp/cwd.cpp ftp/delete.cpp ftp/filetransfer.cpp \ + ftp/ftpcontrolsocket.cpp ftp/list.cpp ftp/logon.cpp \ + ftp/mkd.cpp ftp/rawcommand.cpp ftp/rawtransfer.cpp \ + ftp/rename.cpp ftp/rmd.cpp ftp/transfersocket.cpp \ + http/digest.cpp http/filetransfer.cpp \ + http/httpcontrolsocket.cpp http/internalconnect.cpp \ + http/request.cpp iothread.cpp local_path.cpp logging.cpp \ + misc.cpp notification.cpp option_change_event_handler.cpp \ + pathcache.cpp proxy.cpp ratelimiter.cpp rtt.cpp server.cpp \ + serverpath.cpp servercapabilities.cpp sftp/chmod.cpp \ + sftp/connect.cpp sftp/cwd.cpp sftp/delete.cpp \ + sftp/filetransfer.cpp sftp/input_thread.cpp sftp/list.cpp \ + sftp/mkd.cpp sftp/rename.cpp sftp/rmd.cpp \ + sftp/sftpcontrolsocket.cpp sizeformatting_base.cpp socket.cpp \ + tlssocket.cpp tlssocket_impl.cpp xmlutils.cpp \ + storj/connect.cpp storj/delete.cpp storj/file_transfer.cpp \ + storj/input_thread.cpp storj/list.cpp storj/mkd.cpp \ + storj/resolve.cpp storj/rmd.cpp storj/storjcontrolsocket.cpp +am__dirstamp = $(am__leading_dot)dirstamp +@ENABLE_STORJ_TRUE@am__objects_1 = \ +@ENABLE_STORJ_TRUE@ storj/libengine_a-connect.$(OBJEXT) \ +@ENABLE_STORJ_TRUE@ storj/libengine_a-delete.$(OBJEXT) \ +@ENABLE_STORJ_TRUE@ storj/libengine_a-file_transfer.$(OBJEXT) \ +@ENABLE_STORJ_TRUE@ storj/libengine_a-input_thread.$(OBJEXT) \ +@ENABLE_STORJ_TRUE@ storj/libengine_a-list.$(OBJEXT) \ +@ENABLE_STORJ_TRUE@ storj/libengine_a-mkd.$(OBJEXT) \ +@ENABLE_STORJ_TRUE@ storj/libengine_a-resolve.$(OBJEXT) \ +@ENABLE_STORJ_TRUE@ storj/libengine_a-rmd.$(OBJEXT) \ +@ENABLE_STORJ_TRUE@ storj/libengine_a-storjcontrolsocket.$(OBJEXT) am_libengine_a_OBJECTS = libengine_a-backend.$(OBJEXT) \ libengine_a-commands.$(OBJEXT) \ libengine_a-ControlSocket.$(OBJEXT) \ @@ -125,21 +193,43 @@ libengine_a-engineprivate.$(OBJEXT) \ libengine_a-externalipresolver.$(OBJEXT) \ libengine_a-FileZillaEngine.$(OBJEXT) \ - libengine_a-ftpcontrolsocket.$(OBJEXT) \ - libengine_a-httpcontrolsocket.$(OBJEXT) \ + ftp/libengine_a-chmod.$(OBJEXT) ftp/libengine_a-cwd.$(OBJEXT) \ + ftp/libengine_a-delete.$(OBJEXT) \ + ftp/libengine_a-filetransfer.$(OBJEXT) \ + ftp/libengine_a-ftpcontrolsocket.$(OBJEXT) \ + ftp/libengine_a-list.$(OBJEXT) ftp/libengine_a-logon.$(OBJEXT) \ + ftp/libengine_a-mkd.$(OBJEXT) \ + ftp/libengine_a-rawcommand.$(OBJEXT) \ + ftp/libengine_a-rawtransfer.$(OBJEXT) \ + ftp/libengine_a-rename.$(OBJEXT) ftp/libengine_a-rmd.$(OBJEXT) \ + ftp/libengine_a-transfersocket.$(OBJEXT) \ + http/libengine_a-digest.$(OBJEXT) \ + http/libengine_a-filetransfer.$(OBJEXT) \ + http/libengine_a-httpcontrolsocket.$(OBJEXT) \ + http/libengine_a-internalconnect.$(OBJEXT) \ + http/libengine_a-request.$(OBJEXT) \ libengine_a-iothread.$(OBJEXT) \ libengine_a-local_path.$(OBJEXT) libengine_a-logging.$(OBJEXT) \ - libengine_a-misc.$(OBJEXT) libengine_a-msgbox.$(OBJEXT) \ - libengine_a-notification.$(OBJEXT) \ + libengine_a-misc.$(OBJEXT) libengine_a-notification.$(OBJEXT) \ libengine_a-option_change_event_handler.$(OBJEXT) \ libengine_a-pathcache.$(OBJEXT) libengine_a-proxy.$(OBJEXT) \ libengine_a-ratelimiter.$(OBJEXT) libengine_a-rtt.$(OBJEXT) \ libengine_a-server.$(OBJEXT) libengine_a-serverpath.$(OBJEXT) \ libengine_a-servercapabilities.$(OBJEXT) \ - libengine_a-sftpcontrolsocket.$(OBJEXT) \ + sftp/libengine_a-chmod.$(OBJEXT) \ + sftp/libengine_a-connect.$(OBJEXT) \ + sftp/libengine_a-cwd.$(OBJEXT) \ + sftp/libengine_a-delete.$(OBJEXT) \ + sftp/libengine_a-filetransfer.$(OBJEXT) \ + sftp/libengine_a-input_thread.$(OBJEXT) \ + sftp/libengine_a-list.$(OBJEXT) sftp/libengine_a-mkd.$(OBJEXT) \ + sftp/libengine_a-rename.$(OBJEXT) \ + sftp/libengine_a-rmd.$(OBJEXT) \ + sftp/libengine_a-sftpcontrolsocket.$(OBJEXT) \ libengine_a-sizeformatting_base.$(OBJEXT) \ libengine_a-socket.$(OBJEXT) libengine_a-tlssocket.$(OBJEXT) \ - libengine_a-transfersocket.$(OBJEXT) + libengine_a-tlssocket_impl.$(OBJEXT) \ + libengine_a-xmlutils.$(OBJEXT) $(am__objects_1) libengine_a_OBJECTS = $(am_libengine_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -180,13 +270,30 @@ am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = SOURCES = $(libengine_a_SOURCES) -DIST_SOURCES = $(libengine_a_SOURCES) +DIST_SOURCES = $(am__libengine_a_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(dist_noinst_DATA) +am__noinst_HEADERS_DIST = backend.h ControlSocket.h directorycache.h \ + directorylistingparser.h engineprivate.h filezilla.h \ + ftp/chmod.h ftp/cwd.h ftp/delete.h ftp/filetransfer.h \ + ftp/ftpcontrolsocket.h ftp/list.h ftp/logon.h ftp/mkd.h \ + ftp/rename.h ftp/rawcommand.h ftp/rawtransfer.h ftp/rmd.h \ + ftp/transfersocket.h http/connect.h http/digest.h \ + http/filetransfer.h http/httpcontrolsocket.h \ + http/internalconnect.h http/request.h iothread.h \ + logging_private.h pathcache.h proxy.h ratelimiter.h rtt.h \ + servercapabilities.h sftp/chmod.h sftp/connect.h sftp/cwd.h \ + sftp/delete.h sftp/event.h sftp/filetransfer.h \ + sftp/input_thread.h sftp/list.h sftp/mkd.h sftp/rename.h \ + sftp/rmd.h sftp/sftpcontrolsocket.h tlssocket.h \ + tlssocket_impl.h storj/connect.h storj/delete.h storj/event.h \ + storj/file_transfer.h storj/input_thread.h storj/list.h \ + storj/mkd.h storj/resolve.h storj/rmd.h \ + storj/storjcontrolsocket.h HEADERS = $(noinst_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, @@ -207,6 +314,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -218,11 +326,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -246,6 +354,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -266,16 +376,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -327,6 +445,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -366,6 +485,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -377,62 +497,43 @@ top_srcdir = @top_srcdir@ xdgopen = @xdgopen@ xgettext = @xgettext@ +AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = libengine.a libengine_a_CPPFLAGS = -I$(srcdir)/../include $(LIBFILEZILLA_CFLAGS) \ - $(LIBGNUTLS_CFLAGS) $(WX_CPPFLAGS) -libengine_a_CXXFLAGS = $(WX_CXXFLAGS_ONLY) -libengine_a_CFLAGS = $(WX_CFLAGS_ONLY) -libengine_a_SOURCES = \ - backend.cpp \ - commands.cpp \ - ControlSocket.cpp \ - directorycache.cpp \ - directorylisting.cpp \ - directorylistingparser.cpp \ - engine_context.cpp \ - engineprivate.cpp \ - externalipresolver.cpp \ - FileZillaEngine.cpp \ - ftpcontrolsocket.cpp \ - httpcontrolsocket.cpp \ - iothread.cpp \ - local_path.cpp \ - logging.cpp \ - misc.cpp \ - msgbox.cpp \ - notification.cpp \ - option_change_event_handler.cpp \ - pathcache.cpp \ - proxy.cpp \ - ratelimiter.cpp \ - rtt.cpp \ - server.cpp serverpath.cpp\ - servercapabilities.cpp \ - sftpcontrolsocket.cpp \ - sizeformatting_base.cpp \ - socket.cpp \ - tlssocket.cpp \ - transfersocket.cpp - -noinst_HEADERS = backend.h \ - ControlSocket.h \ - directorycache.h \ - directorylistingparser.h \ - engineprivate.h \ - filezilla.h \ - ftpcontrolsocket.h \ - httpcontrolsocket.h \ - iothread.h \ - logging_private.h \ - pathcache.h \ - proxy.h \ - ratelimiter.h \ - rtt.h \ - servercapabilities.h \ - sftpcontrolsocket.h \ - tlssocket.h \ - transfersocket.h - + $(LIBGNUTLS_CFLAGS) +libengine_a_SOURCES = backend.cpp commands.cpp ControlSocket.cpp \ + directorycache.cpp directorylisting.cpp \ + directorylistingparser.cpp engine_context.cpp \ + engineprivate.cpp externalipresolver.cpp FileZillaEngine.cpp \ + ftp/chmod.cpp ftp/cwd.cpp ftp/delete.cpp ftp/filetransfer.cpp \ + ftp/ftpcontrolsocket.cpp ftp/list.cpp ftp/logon.cpp \ + ftp/mkd.cpp ftp/rawcommand.cpp ftp/rawtransfer.cpp \ + ftp/rename.cpp ftp/rmd.cpp ftp/transfersocket.cpp \ + http/digest.cpp http/filetransfer.cpp \ + http/httpcontrolsocket.cpp http/internalconnect.cpp \ + http/request.cpp iothread.cpp local_path.cpp logging.cpp \ + misc.cpp notification.cpp option_change_event_handler.cpp \ + pathcache.cpp proxy.cpp ratelimiter.cpp rtt.cpp server.cpp \ + serverpath.cpp servercapabilities.cpp sftp/chmod.cpp \ + sftp/connect.cpp sftp/cwd.cpp sftp/delete.cpp \ + sftp/filetransfer.cpp sftp/input_thread.cpp sftp/list.cpp \ + sftp/mkd.cpp sftp/rename.cpp sftp/rmd.cpp \ + sftp/sftpcontrolsocket.cpp sizeformatting_base.cpp socket.cpp \ + tlssocket.cpp tlssocket_impl.cpp xmlutils.cpp $(am__append_1) +noinst_HEADERS = backend.h ControlSocket.h directorycache.h \ + directorylistingparser.h engineprivate.h filezilla.h \ + ftp/chmod.h ftp/cwd.h ftp/delete.h ftp/filetransfer.h \ + ftp/ftpcontrolsocket.h ftp/list.h ftp/logon.h ftp/mkd.h \ + ftp/rename.h ftp/rawcommand.h ftp/rawtransfer.h ftp/rmd.h \ + ftp/transfersocket.h http/connect.h http/digest.h \ + http/filetransfer.h http/httpcontrolsocket.h \ + http/internalconnect.h http/request.h iothread.h \ + logging_private.h pathcache.h proxy.h ratelimiter.h rtt.h \ + servercapabilities.h sftp/chmod.h sftp/connect.h sftp/cwd.h \ + sftp/delete.h sftp/event.h sftp/filetransfer.h \ + sftp/input_thread.h sftp/list.h sftp/mkd.h sftp/rename.h \ + sftp/rmd.h sftp/sftpcontrolsocket.h tlssocket.h \ + tlssocket_impl.h $(am__append_2) dist_noinst_DATA = engine.vcxproj CLEANFILES = filezilla.h.gch @ENABLE_PRECOMP_TRUE@BUILT_SOURCES = filezilla.h.gch @@ -453,7 +554,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/engine/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/engine/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -474,6 +574,106 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +ftp/$(am__dirstamp): + @$(MKDIR_P) ftp + @: > ftp/$(am__dirstamp) +ftp/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) ftp/$(DEPDIR) + @: > ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-chmod.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-cwd.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-delete.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-filetransfer.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-ftpcontrolsocket.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-list.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-logon.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-mkd.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-rawcommand.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-rawtransfer.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-rename.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-rmd.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +ftp/libengine_a-transfersocket.$(OBJEXT): ftp/$(am__dirstamp) \ + ftp/$(DEPDIR)/$(am__dirstamp) +http/$(am__dirstamp): + @$(MKDIR_P) http + @: > http/$(am__dirstamp) +http/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) http/$(DEPDIR) + @: > http/$(DEPDIR)/$(am__dirstamp) +http/libengine_a-digest.$(OBJEXT): http/$(am__dirstamp) \ + http/$(DEPDIR)/$(am__dirstamp) +http/libengine_a-filetransfer.$(OBJEXT): http/$(am__dirstamp) \ + http/$(DEPDIR)/$(am__dirstamp) +http/libengine_a-httpcontrolsocket.$(OBJEXT): http/$(am__dirstamp) \ + http/$(DEPDIR)/$(am__dirstamp) +http/libengine_a-internalconnect.$(OBJEXT): http/$(am__dirstamp) \ + http/$(DEPDIR)/$(am__dirstamp) +http/libengine_a-request.$(OBJEXT): http/$(am__dirstamp) \ + http/$(DEPDIR)/$(am__dirstamp) +sftp/$(am__dirstamp): + @$(MKDIR_P) sftp + @: > sftp/$(am__dirstamp) +sftp/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) sftp/$(DEPDIR) + @: > sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-chmod.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-connect.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-cwd.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-delete.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-filetransfer.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-input_thread.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-list.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-mkd.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-rename.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-rmd.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +sftp/libengine_a-sftpcontrolsocket.$(OBJEXT): sftp/$(am__dirstamp) \ + sftp/$(DEPDIR)/$(am__dirstamp) +storj/$(am__dirstamp): + @$(MKDIR_P) storj + @: > storj/$(am__dirstamp) +storj/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) storj/$(DEPDIR) + @: > storj/$(DEPDIR)/$(am__dirstamp) +storj/libengine_a-connect.$(OBJEXT): storj/$(am__dirstamp) \ + storj/$(DEPDIR)/$(am__dirstamp) +storj/libengine_a-delete.$(OBJEXT): storj/$(am__dirstamp) \ + storj/$(DEPDIR)/$(am__dirstamp) +storj/libengine_a-file_transfer.$(OBJEXT): storj/$(am__dirstamp) \ + storj/$(DEPDIR)/$(am__dirstamp) +storj/libengine_a-input_thread.$(OBJEXT): storj/$(am__dirstamp) \ + storj/$(DEPDIR)/$(am__dirstamp) +storj/libengine_a-list.$(OBJEXT): storj/$(am__dirstamp) \ + storj/$(DEPDIR)/$(am__dirstamp) +storj/libengine_a-mkd.$(OBJEXT): storj/$(am__dirstamp) \ + storj/$(DEPDIR)/$(am__dirstamp) +storj/libengine_a-resolve.$(OBJEXT): storj/$(am__dirstamp) \ + storj/$(DEPDIR)/$(am__dirstamp) +storj/libengine_a-rmd.$(OBJEXT): storj/$(am__dirstamp) \ + storj/$(DEPDIR)/$(am__dirstamp) +storj/libengine_a-storjcontrolsocket.$(OBJEXT): storj/$(am__dirstamp) \ + storj/$(DEPDIR)/$(am__dirstamp) libengine.a: $(libengine_a_OBJECTS) $(libengine_a_DEPENDENCIES) $(EXTRA_libengine_a_DEPENDENCIES) $(AM_V_at)-rm -f libengine.a @@ -482,6 +682,10 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f ftp/*.$(OBJEXT) + -rm -f http/*.$(OBJEXT) + -rm -f sftp/*.$(OBJEXT) + -rm -f storj/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -496,13 +700,10 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-engine_context.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-engineprivate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-externalipresolver.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-ftpcontrolsocket.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-httpcontrolsocket.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-iothread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-local_path.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-logging.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-misc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-msgbox.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-notification.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-option_change_event_handler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-pathcache.Po@am__quote@ @@ -512,466 +713,997 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-server.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-servercapabilities.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-serverpath.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-sftpcontrolsocket.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-sizeformatting_base.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-socket.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-tlssocket.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-transfersocket.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-tlssocket_impl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-xmlutils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-chmod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-cwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-delete.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-filetransfer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-ftpcontrolsocket.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-logon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-mkd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-rawcommand.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-rawtransfer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-rename.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-rmd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ftp/$(DEPDIR)/libengine_a-transfersocket.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@http/$(DEPDIR)/libengine_a-digest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@http/$(DEPDIR)/libengine_a-filetransfer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@http/$(DEPDIR)/libengine_a-httpcontrolsocket.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@http/$(DEPDIR)/libengine_a-internalconnect.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@http/$(DEPDIR)/libengine_a-request.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-chmod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-connect.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-cwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-delete.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-filetransfer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-input_thread.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-mkd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-rename.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-rmd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sftp/$(DEPDIR)/libengine_a-sftpcontrolsocket.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@storj/$(DEPDIR)/libengine_a-connect.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@storj/$(DEPDIR)/libengine_a-delete.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@storj/$(DEPDIR)/libengine_a-file_transfer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@storj/$(DEPDIR)/libengine_a-input_thread.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@storj/$(DEPDIR)/libengine_a-list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@storj/$(DEPDIR)/libengine_a-mkd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@storj/$(DEPDIR)/libengine_a-resolve.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@storj/$(DEPDIR)/libengine_a-rmd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@storj/$(DEPDIR)/libengine_a-storjcontrolsocket.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< libengine_a-backend.o: backend.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-backend.o -MD -MP -MF $(DEPDIR)/libengine_a-backend.Tpo -c -o libengine_a-backend.o `test -f 'backend.cpp' || echo '$(srcdir)/'`backend.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-backend.o -MD -MP -MF $(DEPDIR)/libengine_a-backend.Tpo -c -o libengine_a-backend.o `test -f 'backend.cpp' || echo '$(srcdir)/'`backend.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-backend.Tpo $(DEPDIR)/libengine_a-backend.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='backend.cpp' object='libengine_a-backend.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-backend.o `test -f 'backend.cpp' || echo '$(srcdir)/'`backend.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-backend.o `test -f 'backend.cpp' || echo '$(srcdir)/'`backend.cpp libengine_a-backend.obj: backend.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-backend.obj -MD -MP -MF $(DEPDIR)/libengine_a-backend.Tpo -c -o libengine_a-backend.obj `if test -f 'backend.cpp'; then $(CYGPATH_W) 'backend.cpp'; else $(CYGPATH_W) '$(srcdir)/backend.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-backend.obj -MD -MP -MF $(DEPDIR)/libengine_a-backend.Tpo -c -o libengine_a-backend.obj `if test -f 'backend.cpp'; then $(CYGPATH_W) 'backend.cpp'; else $(CYGPATH_W) '$(srcdir)/backend.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-backend.Tpo $(DEPDIR)/libengine_a-backend.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='backend.cpp' object='libengine_a-backend.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-backend.obj `if test -f 'backend.cpp'; then $(CYGPATH_W) 'backend.cpp'; else $(CYGPATH_W) '$(srcdir)/backend.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-backend.obj `if test -f 'backend.cpp'; then $(CYGPATH_W) 'backend.cpp'; else $(CYGPATH_W) '$(srcdir)/backend.cpp'; fi` libengine_a-commands.o: commands.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-commands.o -MD -MP -MF $(DEPDIR)/libengine_a-commands.Tpo -c -o libengine_a-commands.o `test -f 'commands.cpp' || echo '$(srcdir)/'`commands.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-commands.o -MD -MP -MF $(DEPDIR)/libengine_a-commands.Tpo -c -o libengine_a-commands.o `test -f 'commands.cpp' || echo '$(srcdir)/'`commands.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-commands.Tpo $(DEPDIR)/libengine_a-commands.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='commands.cpp' object='libengine_a-commands.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-commands.o `test -f 'commands.cpp' || echo '$(srcdir)/'`commands.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-commands.o `test -f 'commands.cpp' || echo '$(srcdir)/'`commands.cpp libengine_a-commands.obj: commands.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-commands.obj -MD -MP -MF $(DEPDIR)/libengine_a-commands.Tpo -c -o libengine_a-commands.obj `if test -f 'commands.cpp'; then $(CYGPATH_W) 'commands.cpp'; else $(CYGPATH_W) '$(srcdir)/commands.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-commands.obj -MD -MP -MF $(DEPDIR)/libengine_a-commands.Tpo -c -o libengine_a-commands.obj `if test -f 'commands.cpp'; then $(CYGPATH_W) 'commands.cpp'; else $(CYGPATH_W) '$(srcdir)/commands.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-commands.Tpo $(DEPDIR)/libengine_a-commands.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='commands.cpp' object='libengine_a-commands.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-commands.obj `if test -f 'commands.cpp'; then $(CYGPATH_W) 'commands.cpp'; else $(CYGPATH_W) '$(srcdir)/commands.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-commands.obj `if test -f 'commands.cpp'; then $(CYGPATH_W) 'commands.cpp'; else $(CYGPATH_W) '$(srcdir)/commands.cpp'; fi` libengine_a-ControlSocket.o: ControlSocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ControlSocket.o -MD -MP -MF $(DEPDIR)/libengine_a-ControlSocket.Tpo -c -o libengine_a-ControlSocket.o `test -f 'ControlSocket.cpp' || echo '$(srcdir)/'`ControlSocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ControlSocket.o -MD -MP -MF $(DEPDIR)/libengine_a-ControlSocket.Tpo -c -o libengine_a-ControlSocket.o `test -f 'ControlSocket.cpp' || echo '$(srcdir)/'`ControlSocket.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-ControlSocket.Tpo $(DEPDIR)/libengine_a-ControlSocket.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ControlSocket.cpp' object='libengine_a-ControlSocket.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ControlSocket.o `test -f 'ControlSocket.cpp' || echo '$(srcdir)/'`ControlSocket.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ControlSocket.o `test -f 'ControlSocket.cpp' || echo '$(srcdir)/'`ControlSocket.cpp libengine_a-ControlSocket.obj: ControlSocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ControlSocket.obj -MD -MP -MF $(DEPDIR)/libengine_a-ControlSocket.Tpo -c -o libengine_a-ControlSocket.obj `if test -f 'ControlSocket.cpp'; then $(CYGPATH_W) 'ControlSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ControlSocket.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ControlSocket.obj -MD -MP -MF $(DEPDIR)/libengine_a-ControlSocket.Tpo -c -o libengine_a-ControlSocket.obj `if test -f 'ControlSocket.cpp'; then $(CYGPATH_W) 'ControlSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ControlSocket.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-ControlSocket.Tpo $(DEPDIR)/libengine_a-ControlSocket.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ControlSocket.cpp' object='libengine_a-ControlSocket.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ControlSocket.obj `if test -f 'ControlSocket.cpp'; then $(CYGPATH_W) 'ControlSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ControlSocket.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ControlSocket.obj `if test -f 'ControlSocket.cpp'; then $(CYGPATH_W) 'ControlSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ControlSocket.cpp'; fi` libengine_a-directorycache.o: directorycache.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorycache.o -MD -MP -MF $(DEPDIR)/libengine_a-directorycache.Tpo -c -o libengine_a-directorycache.o `test -f 'directorycache.cpp' || echo '$(srcdir)/'`directorycache.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorycache.o -MD -MP -MF $(DEPDIR)/libengine_a-directorycache.Tpo -c -o libengine_a-directorycache.o `test -f 'directorycache.cpp' || echo '$(srcdir)/'`directorycache.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-directorycache.Tpo $(DEPDIR)/libengine_a-directorycache.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='directorycache.cpp' object='libengine_a-directorycache.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorycache.o `test -f 'directorycache.cpp' || echo '$(srcdir)/'`directorycache.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorycache.o `test -f 'directorycache.cpp' || echo '$(srcdir)/'`directorycache.cpp libengine_a-directorycache.obj: directorycache.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorycache.obj -MD -MP -MF $(DEPDIR)/libengine_a-directorycache.Tpo -c -o libengine_a-directorycache.obj `if test -f 'directorycache.cpp'; then $(CYGPATH_W) 'directorycache.cpp'; else $(CYGPATH_W) '$(srcdir)/directorycache.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorycache.obj -MD -MP -MF $(DEPDIR)/libengine_a-directorycache.Tpo -c -o libengine_a-directorycache.obj `if test -f 'directorycache.cpp'; then $(CYGPATH_W) 'directorycache.cpp'; else $(CYGPATH_W) '$(srcdir)/directorycache.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-directorycache.Tpo $(DEPDIR)/libengine_a-directorycache.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='directorycache.cpp' object='libengine_a-directorycache.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorycache.obj `if test -f 'directorycache.cpp'; then $(CYGPATH_W) 'directorycache.cpp'; else $(CYGPATH_W) '$(srcdir)/directorycache.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorycache.obj `if test -f 'directorycache.cpp'; then $(CYGPATH_W) 'directorycache.cpp'; else $(CYGPATH_W) '$(srcdir)/directorycache.cpp'; fi` libengine_a-directorylisting.o: directorylisting.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorylisting.o -MD -MP -MF $(DEPDIR)/libengine_a-directorylisting.Tpo -c -o libengine_a-directorylisting.o `test -f 'directorylisting.cpp' || echo '$(srcdir)/'`directorylisting.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorylisting.o -MD -MP -MF $(DEPDIR)/libengine_a-directorylisting.Tpo -c -o libengine_a-directorylisting.o `test -f 'directorylisting.cpp' || echo '$(srcdir)/'`directorylisting.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-directorylisting.Tpo $(DEPDIR)/libengine_a-directorylisting.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='directorylisting.cpp' object='libengine_a-directorylisting.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorylisting.o `test -f 'directorylisting.cpp' || echo '$(srcdir)/'`directorylisting.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorylisting.o `test -f 'directorylisting.cpp' || echo '$(srcdir)/'`directorylisting.cpp libengine_a-directorylisting.obj: directorylisting.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorylisting.obj -MD -MP -MF $(DEPDIR)/libengine_a-directorylisting.Tpo -c -o libengine_a-directorylisting.obj `if test -f 'directorylisting.cpp'; then $(CYGPATH_W) 'directorylisting.cpp'; else $(CYGPATH_W) '$(srcdir)/directorylisting.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorylisting.obj -MD -MP -MF $(DEPDIR)/libengine_a-directorylisting.Tpo -c -o libengine_a-directorylisting.obj `if test -f 'directorylisting.cpp'; then $(CYGPATH_W) 'directorylisting.cpp'; else $(CYGPATH_W) '$(srcdir)/directorylisting.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-directorylisting.Tpo $(DEPDIR)/libengine_a-directorylisting.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='directorylisting.cpp' object='libengine_a-directorylisting.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorylisting.obj `if test -f 'directorylisting.cpp'; then $(CYGPATH_W) 'directorylisting.cpp'; else $(CYGPATH_W) '$(srcdir)/directorylisting.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorylisting.obj `if test -f 'directorylisting.cpp'; then $(CYGPATH_W) 'directorylisting.cpp'; else $(CYGPATH_W) '$(srcdir)/directorylisting.cpp'; fi` libengine_a-directorylistingparser.o: directorylistingparser.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorylistingparser.o -MD -MP -MF $(DEPDIR)/libengine_a-directorylistingparser.Tpo -c -o libengine_a-directorylistingparser.o `test -f 'directorylistingparser.cpp' || echo '$(srcdir)/'`directorylistingparser.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorylistingparser.o -MD -MP -MF $(DEPDIR)/libengine_a-directorylistingparser.Tpo -c -o libengine_a-directorylistingparser.o `test -f 'directorylistingparser.cpp' || echo '$(srcdir)/'`directorylistingparser.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-directorylistingparser.Tpo $(DEPDIR)/libengine_a-directorylistingparser.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='directorylistingparser.cpp' object='libengine_a-directorylistingparser.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorylistingparser.o `test -f 'directorylistingparser.cpp' || echo '$(srcdir)/'`directorylistingparser.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorylistingparser.o `test -f 'directorylistingparser.cpp' || echo '$(srcdir)/'`directorylistingparser.cpp libengine_a-directorylistingparser.obj: directorylistingparser.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorylistingparser.obj -MD -MP -MF $(DEPDIR)/libengine_a-directorylistingparser.Tpo -c -o libengine_a-directorylistingparser.obj `if test -f 'directorylistingparser.cpp'; then $(CYGPATH_W) 'directorylistingparser.cpp'; else $(CYGPATH_W) '$(srcdir)/directorylistingparser.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-directorylistingparser.obj -MD -MP -MF $(DEPDIR)/libengine_a-directorylistingparser.Tpo -c -o libengine_a-directorylistingparser.obj `if test -f 'directorylistingparser.cpp'; then $(CYGPATH_W) 'directorylistingparser.cpp'; else $(CYGPATH_W) '$(srcdir)/directorylistingparser.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-directorylistingparser.Tpo $(DEPDIR)/libengine_a-directorylistingparser.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='directorylistingparser.cpp' object='libengine_a-directorylistingparser.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorylistingparser.obj `if test -f 'directorylistingparser.cpp'; then $(CYGPATH_W) 'directorylistingparser.cpp'; else $(CYGPATH_W) '$(srcdir)/directorylistingparser.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-directorylistingparser.obj `if test -f 'directorylistingparser.cpp'; then $(CYGPATH_W) 'directorylistingparser.cpp'; else $(CYGPATH_W) '$(srcdir)/directorylistingparser.cpp'; fi` libengine_a-engine_context.o: engine_context.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-engine_context.o -MD -MP -MF $(DEPDIR)/libengine_a-engine_context.Tpo -c -o libengine_a-engine_context.o `test -f 'engine_context.cpp' || echo '$(srcdir)/'`engine_context.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-engine_context.o -MD -MP -MF $(DEPDIR)/libengine_a-engine_context.Tpo -c -o libengine_a-engine_context.o `test -f 'engine_context.cpp' || echo '$(srcdir)/'`engine_context.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-engine_context.Tpo $(DEPDIR)/libengine_a-engine_context.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='engine_context.cpp' object='libengine_a-engine_context.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-engine_context.o `test -f 'engine_context.cpp' || echo '$(srcdir)/'`engine_context.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-engine_context.o `test -f 'engine_context.cpp' || echo '$(srcdir)/'`engine_context.cpp libengine_a-engine_context.obj: engine_context.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-engine_context.obj -MD -MP -MF $(DEPDIR)/libengine_a-engine_context.Tpo -c -o libengine_a-engine_context.obj `if test -f 'engine_context.cpp'; then $(CYGPATH_W) 'engine_context.cpp'; else $(CYGPATH_W) '$(srcdir)/engine_context.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-engine_context.obj -MD -MP -MF $(DEPDIR)/libengine_a-engine_context.Tpo -c -o libengine_a-engine_context.obj `if test -f 'engine_context.cpp'; then $(CYGPATH_W) 'engine_context.cpp'; else $(CYGPATH_W) '$(srcdir)/engine_context.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-engine_context.Tpo $(DEPDIR)/libengine_a-engine_context.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='engine_context.cpp' object='libengine_a-engine_context.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-engine_context.obj `if test -f 'engine_context.cpp'; then $(CYGPATH_W) 'engine_context.cpp'; else $(CYGPATH_W) '$(srcdir)/engine_context.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-engine_context.obj `if test -f 'engine_context.cpp'; then $(CYGPATH_W) 'engine_context.cpp'; else $(CYGPATH_W) '$(srcdir)/engine_context.cpp'; fi` libengine_a-engineprivate.o: engineprivate.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-engineprivate.o -MD -MP -MF $(DEPDIR)/libengine_a-engineprivate.Tpo -c -o libengine_a-engineprivate.o `test -f 'engineprivate.cpp' || echo '$(srcdir)/'`engineprivate.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-engineprivate.o -MD -MP -MF $(DEPDIR)/libengine_a-engineprivate.Tpo -c -o libengine_a-engineprivate.o `test -f 'engineprivate.cpp' || echo '$(srcdir)/'`engineprivate.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-engineprivate.Tpo $(DEPDIR)/libengine_a-engineprivate.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='engineprivate.cpp' object='libengine_a-engineprivate.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-engineprivate.o `test -f 'engineprivate.cpp' || echo '$(srcdir)/'`engineprivate.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-engineprivate.o `test -f 'engineprivate.cpp' || echo '$(srcdir)/'`engineprivate.cpp libengine_a-engineprivate.obj: engineprivate.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-engineprivate.obj -MD -MP -MF $(DEPDIR)/libengine_a-engineprivate.Tpo -c -o libengine_a-engineprivate.obj `if test -f 'engineprivate.cpp'; then $(CYGPATH_W) 'engineprivate.cpp'; else $(CYGPATH_W) '$(srcdir)/engineprivate.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-engineprivate.obj -MD -MP -MF $(DEPDIR)/libengine_a-engineprivate.Tpo -c -o libengine_a-engineprivate.obj `if test -f 'engineprivate.cpp'; then $(CYGPATH_W) 'engineprivate.cpp'; else $(CYGPATH_W) '$(srcdir)/engineprivate.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-engineprivate.Tpo $(DEPDIR)/libengine_a-engineprivate.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='engineprivate.cpp' object='libengine_a-engineprivate.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-engineprivate.obj `if test -f 'engineprivate.cpp'; then $(CYGPATH_W) 'engineprivate.cpp'; else $(CYGPATH_W) '$(srcdir)/engineprivate.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-engineprivate.obj `if test -f 'engineprivate.cpp'; then $(CYGPATH_W) 'engineprivate.cpp'; else $(CYGPATH_W) '$(srcdir)/engineprivate.cpp'; fi` libengine_a-externalipresolver.o: externalipresolver.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-externalipresolver.o -MD -MP -MF $(DEPDIR)/libengine_a-externalipresolver.Tpo -c -o libengine_a-externalipresolver.o `test -f 'externalipresolver.cpp' || echo '$(srcdir)/'`externalipresolver.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-externalipresolver.o -MD -MP -MF $(DEPDIR)/libengine_a-externalipresolver.Tpo -c -o libengine_a-externalipresolver.o `test -f 'externalipresolver.cpp' || echo '$(srcdir)/'`externalipresolver.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-externalipresolver.Tpo $(DEPDIR)/libengine_a-externalipresolver.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='externalipresolver.cpp' object='libengine_a-externalipresolver.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-externalipresolver.o `test -f 'externalipresolver.cpp' || echo '$(srcdir)/'`externalipresolver.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-externalipresolver.o `test -f 'externalipresolver.cpp' || echo '$(srcdir)/'`externalipresolver.cpp libengine_a-externalipresolver.obj: externalipresolver.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-externalipresolver.obj -MD -MP -MF $(DEPDIR)/libengine_a-externalipresolver.Tpo -c -o libengine_a-externalipresolver.obj `if test -f 'externalipresolver.cpp'; then $(CYGPATH_W) 'externalipresolver.cpp'; else $(CYGPATH_W) '$(srcdir)/externalipresolver.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-externalipresolver.obj -MD -MP -MF $(DEPDIR)/libengine_a-externalipresolver.Tpo -c -o libengine_a-externalipresolver.obj `if test -f 'externalipresolver.cpp'; then $(CYGPATH_W) 'externalipresolver.cpp'; else $(CYGPATH_W) '$(srcdir)/externalipresolver.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-externalipresolver.Tpo $(DEPDIR)/libengine_a-externalipresolver.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='externalipresolver.cpp' object='libengine_a-externalipresolver.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-externalipresolver.obj `if test -f 'externalipresolver.cpp'; then $(CYGPATH_W) 'externalipresolver.cpp'; else $(CYGPATH_W) '$(srcdir)/externalipresolver.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-externalipresolver.obj `if test -f 'externalipresolver.cpp'; then $(CYGPATH_W) 'externalipresolver.cpp'; else $(CYGPATH_W) '$(srcdir)/externalipresolver.cpp'; fi` libengine_a-FileZillaEngine.o: FileZillaEngine.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-FileZillaEngine.o -MD -MP -MF $(DEPDIR)/libengine_a-FileZillaEngine.Tpo -c -o libengine_a-FileZillaEngine.o `test -f 'FileZillaEngine.cpp' || echo '$(srcdir)/'`FileZillaEngine.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-FileZillaEngine.o -MD -MP -MF $(DEPDIR)/libengine_a-FileZillaEngine.Tpo -c -o libengine_a-FileZillaEngine.o `test -f 'FileZillaEngine.cpp' || echo '$(srcdir)/'`FileZillaEngine.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-FileZillaEngine.Tpo $(DEPDIR)/libengine_a-FileZillaEngine.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='FileZillaEngine.cpp' object='libengine_a-FileZillaEngine.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-FileZillaEngine.o `test -f 'FileZillaEngine.cpp' || echo '$(srcdir)/'`FileZillaEngine.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-FileZillaEngine.o `test -f 'FileZillaEngine.cpp' || echo '$(srcdir)/'`FileZillaEngine.cpp libengine_a-FileZillaEngine.obj: FileZillaEngine.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-FileZillaEngine.obj -MD -MP -MF $(DEPDIR)/libengine_a-FileZillaEngine.Tpo -c -o libengine_a-FileZillaEngine.obj `if test -f 'FileZillaEngine.cpp'; then $(CYGPATH_W) 'FileZillaEngine.cpp'; else $(CYGPATH_W) '$(srcdir)/FileZillaEngine.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-FileZillaEngine.obj -MD -MP -MF $(DEPDIR)/libengine_a-FileZillaEngine.Tpo -c -o libengine_a-FileZillaEngine.obj `if test -f 'FileZillaEngine.cpp'; then $(CYGPATH_W) 'FileZillaEngine.cpp'; else $(CYGPATH_W) '$(srcdir)/FileZillaEngine.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-FileZillaEngine.Tpo $(DEPDIR)/libengine_a-FileZillaEngine.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='FileZillaEngine.cpp' object='libengine_a-FileZillaEngine.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-FileZillaEngine.obj `if test -f 'FileZillaEngine.cpp'; then $(CYGPATH_W) 'FileZillaEngine.cpp'; else $(CYGPATH_W) '$(srcdir)/FileZillaEngine.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-FileZillaEngine.obj `if test -f 'FileZillaEngine.cpp'; then $(CYGPATH_W) 'FileZillaEngine.cpp'; else $(CYGPATH_W) '$(srcdir)/FileZillaEngine.cpp'; fi` + +ftp/libengine_a-chmod.o: ftp/chmod.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-chmod.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-chmod.Tpo -c -o ftp/libengine_a-chmod.o `test -f 'ftp/chmod.cpp' || echo '$(srcdir)/'`ftp/chmod.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-chmod.Tpo ftp/$(DEPDIR)/libengine_a-chmod.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/chmod.cpp' object='ftp/libengine_a-chmod.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-chmod.o `test -f 'ftp/chmod.cpp' || echo '$(srcdir)/'`ftp/chmod.cpp + +ftp/libengine_a-chmod.obj: ftp/chmod.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-chmod.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-chmod.Tpo -c -o ftp/libengine_a-chmod.obj `if test -f 'ftp/chmod.cpp'; then $(CYGPATH_W) 'ftp/chmod.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/chmod.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-chmod.Tpo ftp/$(DEPDIR)/libengine_a-chmod.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/chmod.cpp' object='ftp/libengine_a-chmod.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-chmod.obj `if test -f 'ftp/chmod.cpp'; then $(CYGPATH_W) 'ftp/chmod.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/chmod.cpp'; fi` + +ftp/libengine_a-cwd.o: ftp/cwd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-cwd.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-cwd.Tpo -c -o ftp/libengine_a-cwd.o `test -f 'ftp/cwd.cpp' || echo '$(srcdir)/'`ftp/cwd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-cwd.Tpo ftp/$(DEPDIR)/libengine_a-cwd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/cwd.cpp' object='ftp/libengine_a-cwd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-cwd.o `test -f 'ftp/cwd.cpp' || echo '$(srcdir)/'`ftp/cwd.cpp + +ftp/libengine_a-cwd.obj: ftp/cwd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-cwd.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-cwd.Tpo -c -o ftp/libengine_a-cwd.obj `if test -f 'ftp/cwd.cpp'; then $(CYGPATH_W) 'ftp/cwd.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/cwd.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-cwd.Tpo ftp/$(DEPDIR)/libengine_a-cwd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/cwd.cpp' object='ftp/libengine_a-cwd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-cwd.obj `if test -f 'ftp/cwd.cpp'; then $(CYGPATH_W) 'ftp/cwd.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/cwd.cpp'; fi` + +ftp/libengine_a-delete.o: ftp/delete.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-delete.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-delete.Tpo -c -o ftp/libengine_a-delete.o `test -f 'ftp/delete.cpp' || echo '$(srcdir)/'`ftp/delete.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-delete.Tpo ftp/$(DEPDIR)/libengine_a-delete.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/delete.cpp' object='ftp/libengine_a-delete.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-delete.o `test -f 'ftp/delete.cpp' || echo '$(srcdir)/'`ftp/delete.cpp + +ftp/libengine_a-delete.obj: ftp/delete.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-delete.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-delete.Tpo -c -o ftp/libengine_a-delete.obj `if test -f 'ftp/delete.cpp'; then $(CYGPATH_W) 'ftp/delete.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/delete.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-delete.Tpo ftp/$(DEPDIR)/libengine_a-delete.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/delete.cpp' object='ftp/libengine_a-delete.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-delete.obj `if test -f 'ftp/delete.cpp'; then $(CYGPATH_W) 'ftp/delete.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/delete.cpp'; fi` + +ftp/libengine_a-filetransfer.o: ftp/filetransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-filetransfer.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-filetransfer.Tpo -c -o ftp/libengine_a-filetransfer.o `test -f 'ftp/filetransfer.cpp' || echo '$(srcdir)/'`ftp/filetransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-filetransfer.Tpo ftp/$(DEPDIR)/libengine_a-filetransfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/filetransfer.cpp' object='ftp/libengine_a-filetransfer.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-filetransfer.o `test -f 'ftp/filetransfer.cpp' || echo '$(srcdir)/'`ftp/filetransfer.cpp + +ftp/libengine_a-filetransfer.obj: ftp/filetransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-filetransfer.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-filetransfer.Tpo -c -o ftp/libengine_a-filetransfer.obj `if test -f 'ftp/filetransfer.cpp'; then $(CYGPATH_W) 'ftp/filetransfer.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/filetransfer.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-filetransfer.Tpo ftp/$(DEPDIR)/libengine_a-filetransfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/filetransfer.cpp' object='ftp/libengine_a-filetransfer.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-filetransfer.obj `if test -f 'ftp/filetransfer.cpp'; then $(CYGPATH_W) 'ftp/filetransfer.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/filetransfer.cpp'; fi` + +ftp/libengine_a-ftpcontrolsocket.o: ftp/ftpcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-ftpcontrolsocket.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-ftpcontrolsocket.Tpo -c -o ftp/libengine_a-ftpcontrolsocket.o `test -f 'ftp/ftpcontrolsocket.cpp' || echo '$(srcdir)/'`ftp/ftpcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-ftpcontrolsocket.Tpo ftp/$(DEPDIR)/libengine_a-ftpcontrolsocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/ftpcontrolsocket.cpp' object='ftp/libengine_a-ftpcontrolsocket.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-ftpcontrolsocket.o `test -f 'ftp/ftpcontrolsocket.cpp' || echo '$(srcdir)/'`ftp/ftpcontrolsocket.cpp + +ftp/libengine_a-ftpcontrolsocket.obj: ftp/ftpcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-ftpcontrolsocket.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-ftpcontrolsocket.Tpo -c -o ftp/libengine_a-ftpcontrolsocket.obj `if test -f 'ftp/ftpcontrolsocket.cpp'; then $(CYGPATH_W) 'ftp/ftpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/ftpcontrolsocket.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-ftpcontrolsocket.Tpo ftp/$(DEPDIR)/libengine_a-ftpcontrolsocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/ftpcontrolsocket.cpp' object='ftp/libengine_a-ftpcontrolsocket.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-ftpcontrolsocket.obj `if test -f 'ftp/ftpcontrolsocket.cpp'; then $(CYGPATH_W) 'ftp/ftpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/ftpcontrolsocket.cpp'; fi` + +ftp/libengine_a-list.o: ftp/list.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-list.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-list.Tpo -c -o ftp/libengine_a-list.o `test -f 'ftp/list.cpp' || echo '$(srcdir)/'`ftp/list.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-list.Tpo ftp/$(DEPDIR)/libengine_a-list.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/list.cpp' object='ftp/libengine_a-list.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-list.o `test -f 'ftp/list.cpp' || echo '$(srcdir)/'`ftp/list.cpp + +ftp/libengine_a-list.obj: ftp/list.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-list.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-list.Tpo -c -o ftp/libengine_a-list.obj `if test -f 'ftp/list.cpp'; then $(CYGPATH_W) 'ftp/list.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/list.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-list.Tpo ftp/$(DEPDIR)/libengine_a-list.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/list.cpp' object='ftp/libengine_a-list.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-list.obj `if test -f 'ftp/list.cpp'; then $(CYGPATH_W) 'ftp/list.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/list.cpp'; fi` + +ftp/libengine_a-logon.o: ftp/logon.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-logon.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-logon.Tpo -c -o ftp/libengine_a-logon.o `test -f 'ftp/logon.cpp' || echo '$(srcdir)/'`ftp/logon.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-logon.Tpo ftp/$(DEPDIR)/libengine_a-logon.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/logon.cpp' object='ftp/libengine_a-logon.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-logon.o `test -f 'ftp/logon.cpp' || echo '$(srcdir)/'`ftp/logon.cpp + +ftp/libengine_a-logon.obj: ftp/logon.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-logon.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-logon.Tpo -c -o ftp/libengine_a-logon.obj `if test -f 'ftp/logon.cpp'; then $(CYGPATH_W) 'ftp/logon.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/logon.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-logon.Tpo ftp/$(DEPDIR)/libengine_a-logon.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/logon.cpp' object='ftp/libengine_a-logon.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-logon.obj `if test -f 'ftp/logon.cpp'; then $(CYGPATH_W) 'ftp/logon.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/logon.cpp'; fi` + +ftp/libengine_a-mkd.o: ftp/mkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-mkd.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-mkd.Tpo -c -o ftp/libengine_a-mkd.o `test -f 'ftp/mkd.cpp' || echo '$(srcdir)/'`ftp/mkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-mkd.Tpo ftp/$(DEPDIR)/libengine_a-mkd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/mkd.cpp' object='ftp/libengine_a-mkd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-mkd.o `test -f 'ftp/mkd.cpp' || echo '$(srcdir)/'`ftp/mkd.cpp + +ftp/libengine_a-mkd.obj: ftp/mkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-mkd.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-mkd.Tpo -c -o ftp/libengine_a-mkd.obj `if test -f 'ftp/mkd.cpp'; then $(CYGPATH_W) 'ftp/mkd.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/mkd.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-mkd.Tpo ftp/$(DEPDIR)/libengine_a-mkd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/mkd.cpp' object='ftp/libengine_a-mkd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-mkd.obj `if test -f 'ftp/mkd.cpp'; then $(CYGPATH_W) 'ftp/mkd.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/mkd.cpp'; fi` + +ftp/libengine_a-rawcommand.o: ftp/rawcommand.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-rawcommand.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-rawcommand.Tpo -c -o ftp/libengine_a-rawcommand.o `test -f 'ftp/rawcommand.cpp' || echo '$(srcdir)/'`ftp/rawcommand.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-rawcommand.Tpo ftp/$(DEPDIR)/libengine_a-rawcommand.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/rawcommand.cpp' object='ftp/libengine_a-rawcommand.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-rawcommand.o `test -f 'ftp/rawcommand.cpp' || echo '$(srcdir)/'`ftp/rawcommand.cpp -libengine_a-ftpcontrolsocket.o: ftpcontrolsocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ftpcontrolsocket.o -MD -MP -MF $(DEPDIR)/libengine_a-ftpcontrolsocket.Tpo -c -o libengine_a-ftpcontrolsocket.o `test -f 'ftpcontrolsocket.cpp' || echo '$(srcdir)/'`ftpcontrolsocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-ftpcontrolsocket.Tpo $(DEPDIR)/libengine_a-ftpcontrolsocket.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftpcontrolsocket.cpp' object='libengine_a-ftpcontrolsocket.o' libtool=no @AMDEPBACKSLASH@ +ftp/libengine_a-rawcommand.obj: ftp/rawcommand.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-rawcommand.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-rawcommand.Tpo -c -o ftp/libengine_a-rawcommand.obj `if test -f 'ftp/rawcommand.cpp'; then $(CYGPATH_W) 'ftp/rawcommand.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/rawcommand.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-rawcommand.Tpo ftp/$(DEPDIR)/libengine_a-rawcommand.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/rawcommand.cpp' object='ftp/libengine_a-rawcommand.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ftpcontrolsocket.o `test -f 'ftpcontrolsocket.cpp' || echo '$(srcdir)/'`ftpcontrolsocket.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-rawcommand.obj `if test -f 'ftp/rawcommand.cpp'; then $(CYGPATH_W) 'ftp/rawcommand.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/rawcommand.cpp'; fi` -libengine_a-ftpcontrolsocket.obj: ftpcontrolsocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ftpcontrolsocket.obj -MD -MP -MF $(DEPDIR)/libengine_a-ftpcontrolsocket.Tpo -c -o libengine_a-ftpcontrolsocket.obj `if test -f 'ftpcontrolsocket.cpp'; then $(CYGPATH_W) 'ftpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ftpcontrolsocket.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-ftpcontrolsocket.Tpo $(DEPDIR)/libengine_a-ftpcontrolsocket.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftpcontrolsocket.cpp' object='libengine_a-ftpcontrolsocket.obj' libtool=no @AMDEPBACKSLASH@ +ftp/libengine_a-rawtransfer.o: ftp/rawtransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-rawtransfer.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-rawtransfer.Tpo -c -o ftp/libengine_a-rawtransfer.o `test -f 'ftp/rawtransfer.cpp' || echo '$(srcdir)/'`ftp/rawtransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-rawtransfer.Tpo ftp/$(DEPDIR)/libengine_a-rawtransfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/rawtransfer.cpp' object='ftp/libengine_a-rawtransfer.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ftpcontrolsocket.obj `if test -f 'ftpcontrolsocket.cpp'; then $(CYGPATH_W) 'ftpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ftpcontrolsocket.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-rawtransfer.o `test -f 'ftp/rawtransfer.cpp' || echo '$(srcdir)/'`ftp/rawtransfer.cpp -libengine_a-httpcontrolsocket.o: httpcontrolsocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-httpcontrolsocket.o -MD -MP -MF $(DEPDIR)/libengine_a-httpcontrolsocket.Tpo -c -o libengine_a-httpcontrolsocket.o `test -f 'httpcontrolsocket.cpp' || echo '$(srcdir)/'`httpcontrolsocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-httpcontrolsocket.Tpo $(DEPDIR)/libengine_a-httpcontrolsocket.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='httpcontrolsocket.cpp' object='libengine_a-httpcontrolsocket.o' libtool=no @AMDEPBACKSLASH@ +ftp/libengine_a-rawtransfer.obj: ftp/rawtransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-rawtransfer.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-rawtransfer.Tpo -c -o ftp/libengine_a-rawtransfer.obj `if test -f 'ftp/rawtransfer.cpp'; then $(CYGPATH_W) 'ftp/rawtransfer.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/rawtransfer.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-rawtransfer.Tpo ftp/$(DEPDIR)/libengine_a-rawtransfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/rawtransfer.cpp' object='ftp/libengine_a-rawtransfer.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-httpcontrolsocket.o `test -f 'httpcontrolsocket.cpp' || echo '$(srcdir)/'`httpcontrolsocket.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-rawtransfer.obj `if test -f 'ftp/rawtransfer.cpp'; then $(CYGPATH_W) 'ftp/rawtransfer.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/rawtransfer.cpp'; fi` -libengine_a-httpcontrolsocket.obj: httpcontrolsocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-httpcontrolsocket.obj -MD -MP -MF $(DEPDIR)/libengine_a-httpcontrolsocket.Tpo -c -o libengine_a-httpcontrolsocket.obj `if test -f 'httpcontrolsocket.cpp'; then $(CYGPATH_W) 'httpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/httpcontrolsocket.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-httpcontrolsocket.Tpo $(DEPDIR)/libengine_a-httpcontrolsocket.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='httpcontrolsocket.cpp' object='libengine_a-httpcontrolsocket.obj' libtool=no @AMDEPBACKSLASH@ +ftp/libengine_a-rename.o: ftp/rename.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-rename.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-rename.Tpo -c -o ftp/libengine_a-rename.o `test -f 'ftp/rename.cpp' || echo '$(srcdir)/'`ftp/rename.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-rename.Tpo ftp/$(DEPDIR)/libengine_a-rename.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/rename.cpp' object='ftp/libengine_a-rename.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-httpcontrolsocket.obj `if test -f 'httpcontrolsocket.cpp'; then $(CYGPATH_W) 'httpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/httpcontrolsocket.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-rename.o `test -f 'ftp/rename.cpp' || echo '$(srcdir)/'`ftp/rename.cpp + +ftp/libengine_a-rename.obj: ftp/rename.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-rename.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-rename.Tpo -c -o ftp/libengine_a-rename.obj `if test -f 'ftp/rename.cpp'; then $(CYGPATH_W) 'ftp/rename.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/rename.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-rename.Tpo ftp/$(DEPDIR)/libengine_a-rename.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/rename.cpp' object='ftp/libengine_a-rename.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-rename.obj `if test -f 'ftp/rename.cpp'; then $(CYGPATH_W) 'ftp/rename.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/rename.cpp'; fi` + +ftp/libengine_a-rmd.o: ftp/rmd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-rmd.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-rmd.Tpo -c -o ftp/libengine_a-rmd.o `test -f 'ftp/rmd.cpp' || echo '$(srcdir)/'`ftp/rmd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-rmd.Tpo ftp/$(DEPDIR)/libengine_a-rmd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/rmd.cpp' object='ftp/libengine_a-rmd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-rmd.o `test -f 'ftp/rmd.cpp' || echo '$(srcdir)/'`ftp/rmd.cpp + +ftp/libengine_a-rmd.obj: ftp/rmd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-rmd.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-rmd.Tpo -c -o ftp/libengine_a-rmd.obj `if test -f 'ftp/rmd.cpp'; then $(CYGPATH_W) 'ftp/rmd.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/rmd.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-rmd.Tpo ftp/$(DEPDIR)/libengine_a-rmd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/rmd.cpp' object='ftp/libengine_a-rmd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-rmd.obj `if test -f 'ftp/rmd.cpp'; then $(CYGPATH_W) 'ftp/rmd.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/rmd.cpp'; fi` + +ftp/libengine_a-transfersocket.o: ftp/transfersocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-transfersocket.o -MD -MP -MF ftp/$(DEPDIR)/libengine_a-transfersocket.Tpo -c -o ftp/libengine_a-transfersocket.o `test -f 'ftp/transfersocket.cpp' || echo '$(srcdir)/'`ftp/transfersocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-transfersocket.Tpo ftp/$(DEPDIR)/libengine_a-transfersocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/transfersocket.cpp' object='ftp/libengine_a-transfersocket.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-transfersocket.o `test -f 'ftp/transfersocket.cpp' || echo '$(srcdir)/'`ftp/transfersocket.cpp + +ftp/libengine_a-transfersocket.obj: ftp/transfersocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftp/libengine_a-transfersocket.obj -MD -MP -MF ftp/$(DEPDIR)/libengine_a-transfersocket.Tpo -c -o ftp/libengine_a-transfersocket.obj `if test -f 'ftp/transfersocket.cpp'; then $(CYGPATH_W) 'ftp/transfersocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/transfersocket.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ftp/$(DEPDIR)/libengine_a-transfersocket.Tpo ftp/$(DEPDIR)/libengine_a-transfersocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ftp/transfersocket.cpp' object='ftp/libengine_a-transfersocket.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftp/libengine_a-transfersocket.obj `if test -f 'ftp/transfersocket.cpp'; then $(CYGPATH_W) 'ftp/transfersocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ftp/transfersocket.cpp'; fi` + +http/libengine_a-digest.o: http/digest.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-digest.o -MD -MP -MF http/$(DEPDIR)/libengine_a-digest.Tpo -c -o http/libengine_a-digest.o `test -f 'http/digest.cpp' || echo '$(srcdir)/'`http/digest.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-digest.Tpo http/$(DEPDIR)/libengine_a-digest.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/digest.cpp' object='http/libengine_a-digest.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-digest.o `test -f 'http/digest.cpp' || echo '$(srcdir)/'`http/digest.cpp + +http/libengine_a-digest.obj: http/digest.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-digest.obj -MD -MP -MF http/$(DEPDIR)/libengine_a-digest.Tpo -c -o http/libengine_a-digest.obj `if test -f 'http/digest.cpp'; then $(CYGPATH_W) 'http/digest.cpp'; else $(CYGPATH_W) '$(srcdir)/http/digest.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-digest.Tpo http/$(DEPDIR)/libengine_a-digest.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/digest.cpp' object='http/libengine_a-digest.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-digest.obj `if test -f 'http/digest.cpp'; then $(CYGPATH_W) 'http/digest.cpp'; else $(CYGPATH_W) '$(srcdir)/http/digest.cpp'; fi` + +http/libengine_a-filetransfer.o: http/filetransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-filetransfer.o -MD -MP -MF http/$(DEPDIR)/libengine_a-filetransfer.Tpo -c -o http/libengine_a-filetransfer.o `test -f 'http/filetransfer.cpp' || echo '$(srcdir)/'`http/filetransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-filetransfer.Tpo http/$(DEPDIR)/libengine_a-filetransfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/filetransfer.cpp' object='http/libengine_a-filetransfer.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-filetransfer.o `test -f 'http/filetransfer.cpp' || echo '$(srcdir)/'`http/filetransfer.cpp + +http/libengine_a-filetransfer.obj: http/filetransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-filetransfer.obj -MD -MP -MF http/$(DEPDIR)/libengine_a-filetransfer.Tpo -c -o http/libengine_a-filetransfer.obj `if test -f 'http/filetransfer.cpp'; then $(CYGPATH_W) 'http/filetransfer.cpp'; else $(CYGPATH_W) '$(srcdir)/http/filetransfer.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-filetransfer.Tpo http/$(DEPDIR)/libengine_a-filetransfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/filetransfer.cpp' object='http/libengine_a-filetransfer.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-filetransfer.obj `if test -f 'http/filetransfer.cpp'; then $(CYGPATH_W) 'http/filetransfer.cpp'; else $(CYGPATH_W) '$(srcdir)/http/filetransfer.cpp'; fi` + +http/libengine_a-httpcontrolsocket.o: http/httpcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-httpcontrolsocket.o -MD -MP -MF http/$(DEPDIR)/libengine_a-httpcontrolsocket.Tpo -c -o http/libengine_a-httpcontrolsocket.o `test -f 'http/httpcontrolsocket.cpp' || echo '$(srcdir)/'`http/httpcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-httpcontrolsocket.Tpo http/$(DEPDIR)/libengine_a-httpcontrolsocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/httpcontrolsocket.cpp' object='http/libengine_a-httpcontrolsocket.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-httpcontrolsocket.o `test -f 'http/httpcontrolsocket.cpp' || echo '$(srcdir)/'`http/httpcontrolsocket.cpp + +http/libengine_a-httpcontrolsocket.obj: http/httpcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-httpcontrolsocket.obj -MD -MP -MF http/$(DEPDIR)/libengine_a-httpcontrolsocket.Tpo -c -o http/libengine_a-httpcontrolsocket.obj `if test -f 'http/httpcontrolsocket.cpp'; then $(CYGPATH_W) 'http/httpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/http/httpcontrolsocket.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-httpcontrolsocket.Tpo http/$(DEPDIR)/libengine_a-httpcontrolsocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/httpcontrolsocket.cpp' object='http/libengine_a-httpcontrolsocket.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-httpcontrolsocket.obj `if test -f 'http/httpcontrolsocket.cpp'; then $(CYGPATH_W) 'http/httpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/http/httpcontrolsocket.cpp'; fi` + +http/libengine_a-internalconnect.o: http/internalconnect.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-internalconnect.o -MD -MP -MF http/$(DEPDIR)/libengine_a-internalconnect.Tpo -c -o http/libengine_a-internalconnect.o `test -f 'http/internalconnect.cpp' || echo '$(srcdir)/'`http/internalconnect.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-internalconnect.Tpo http/$(DEPDIR)/libengine_a-internalconnect.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/internalconnect.cpp' object='http/libengine_a-internalconnect.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-internalconnect.o `test -f 'http/internalconnect.cpp' || echo '$(srcdir)/'`http/internalconnect.cpp + +http/libengine_a-internalconnect.obj: http/internalconnect.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-internalconnect.obj -MD -MP -MF http/$(DEPDIR)/libengine_a-internalconnect.Tpo -c -o http/libengine_a-internalconnect.obj `if test -f 'http/internalconnect.cpp'; then $(CYGPATH_W) 'http/internalconnect.cpp'; else $(CYGPATH_W) '$(srcdir)/http/internalconnect.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-internalconnect.Tpo http/$(DEPDIR)/libengine_a-internalconnect.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/internalconnect.cpp' object='http/libengine_a-internalconnect.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-internalconnect.obj `if test -f 'http/internalconnect.cpp'; then $(CYGPATH_W) 'http/internalconnect.cpp'; else $(CYGPATH_W) '$(srcdir)/http/internalconnect.cpp'; fi` + +http/libengine_a-request.o: http/request.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-request.o -MD -MP -MF http/$(DEPDIR)/libengine_a-request.Tpo -c -o http/libengine_a-request.o `test -f 'http/request.cpp' || echo '$(srcdir)/'`http/request.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-request.Tpo http/$(DEPDIR)/libengine_a-request.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/request.cpp' object='http/libengine_a-request.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-request.o `test -f 'http/request.cpp' || echo '$(srcdir)/'`http/request.cpp + +http/libengine_a-request.obj: http/request.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT http/libengine_a-request.obj -MD -MP -MF http/$(DEPDIR)/libengine_a-request.Tpo -c -o http/libengine_a-request.obj `if test -f 'http/request.cpp'; then $(CYGPATH_W) 'http/request.cpp'; else $(CYGPATH_W) '$(srcdir)/http/request.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) http/$(DEPDIR)/libengine_a-request.Tpo http/$(DEPDIR)/libengine_a-request.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='http/request.cpp' object='http/libengine_a-request.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o http/libengine_a-request.obj `if test -f 'http/request.cpp'; then $(CYGPATH_W) 'http/request.cpp'; else $(CYGPATH_W) '$(srcdir)/http/request.cpp'; fi` libengine_a-iothread.o: iothread.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-iothread.o -MD -MP -MF $(DEPDIR)/libengine_a-iothread.Tpo -c -o libengine_a-iothread.o `test -f 'iothread.cpp' || echo '$(srcdir)/'`iothread.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-iothread.o -MD -MP -MF $(DEPDIR)/libengine_a-iothread.Tpo -c -o libengine_a-iothread.o `test -f 'iothread.cpp' || echo '$(srcdir)/'`iothread.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-iothread.Tpo $(DEPDIR)/libengine_a-iothread.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='iothread.cpp' object='libengine_a-iothread.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-iothread.o `test -f 'iothread.cpp' || echo '$(srcdir)/'`iothread.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-iothread.o `test -f 'iothread.cpp' || echo '$(srcdir)/'`iothread.cpp libengine_a-iothread.obj: iothread.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-iothread.obj -MD -MP -MF $(DEPDIR)/libengine_a-iothread.Tpo -c -o libengine_a-iothread.obj `if test -f 'iothread.cpp'; then $(CYGPATH_W) 'iothread.cpp'; else $(CYGPATH_W) '$(srcdir)/iothread.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-iothread.obj -MD -MP -MF $(DEPDIR)/libengine_a-iothread.Tpo -c -o libengine_a-iothread.obj `if test -f 'iothread.cpp'; then $(CYGPATH_W) 'iothread.cpp'; else $(CYGPATH_W) '$(srcdir)/iothread.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-iothread.Tpo $(DEPDIR)/libengine_a-iothread.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='iothread.cpp' object='libengine_a-iothread.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-iothread.obj `if test -f 'iothread.cpp'; then $(CYGPATH_W) 'iothread.cpp'; else $(CYGPATH_W) '$(srcdir)/iothread.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-iothread.obj `if test -f 'iothread.cpp'; then $(CYGPATH_W) 'iothread.cpp'; else $(CYGPATH_W) '$(srcdir)/iothread.cpp'; fi` libengine_a-local_path.o: local_path.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-local_path.o -MD -MP -MF $(DEPDIR)/libengine_a-local_path.Tpo -c -o libengine_a-local_path.o `test -f 'local_path.cpp' || echo '$(srcdir)/'`local_path.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-local_path.o -MD -MP -MF $(DEPDIR)/libengine_a-local_path.Tpo -c -o libengine_a-local_path.o `test -f 'local_path.cpp' || echo '$(srcdir)/'`local_path.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-local_path.Tpo $(DEPDIR)/libengine_a-local_path.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='local_path.cpp' object='libengine_a-local_path.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-local_path.o `test -f 'local_path.cpp' || echo '$(srcdir)/'`local_path.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-local_path.o `test -f 'local_path.cpp' || echo '$(srcdir)/'`local_path.cpp libengine_a-local_path.obj: local_path.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-local_path.obj -MD -MP -MF $(DEPDIR)/libengine_a-local_path.Tpo -c -o libengine_a-local_path.obj `if test -f 'local_path.cpp'; then $(CYGPATH_W) 'local_path.cpp'; else $(CYGPATH_W) '$(srcdir)/local_path.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-local_path.obj -MD -MP -MF $(DEPDIR)/libengine_a-local_path.Tpo -c -o libengine_a-local_path.obj `if test -f 'local_path.cpp'; then $(CYGPATH_W) 'local_path.cpp'; else $(CYGPATH_W) '$(srcdir)/local_path.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-local_path.Tpo $(DEPDIR)/libengine_a-local_path.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='local_path.cpp' object='libengine_a-local_path.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-local_path.obj `if test -f 'local_path.cpp'; then $(CYGPATH_W) 'local_path.cpp'; else $(CYGPATH_W) '$(srcdir)/local_path.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-local_path.obj `if test -f 'local_path.cpp'; then $(CYGPATH_W) 'local_path.cpp'; else $(CYGPATH_W) '$(srcdir)/local_path.cpp'; fi` libengine_a-logging.o: logging.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-logging.o -MD -MP -MF $(DEPDIR)/libengine_a-logging.Tpo -c -o libengine_a-logging.o `test -f 'logging.cpp' || echo '$(srcdir)/'`logging.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-logging.o -MD -MP -MF $(DEPDIR)/libengine_a-logging.Tpo -c -o libengine_a-logging.o `test -f 'logging.cpp' || echo '$(srcdir)/'`logging.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-logging.Tpo $(DEPDIR)/libengine_a-logging.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='logging.cpp' object='libengine_a-logging.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-logging.o `test -f 'logging.cpp' || echo '$(srcdir)/'`logging.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-logging.o `test -f 'logging.cpp' || echo '$(srcdir)/'`logging.cpp libengine_a-logging.obj: logging.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-logging.obj -MD -MP -MF $(DEPDIR)/libengine_a-logging.Tpo -c -o libengine_a-logging.obj `if test -f 'logging.cpp'; then $(CYGPATH_W) 'logging.cpp'; else $(CYGPATH_W) '$(srcdir)/logging.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-logging.obj -MD -MP -MF $(DEPDIR)/libengine_a-logging.Tpo -c -o libengine_a-logging.obj `if test -f 'logging.cpp'; then $(CYGPATH_W) 'logging.cpp'; else $(CYGPATH_W) '$(srcdir)/logging.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-logging.Tpo $(DEPDIR)/libengine_a-logging.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='logging.cpp' object='libengine_a-logging.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-logging.obj `if test -f 'logging.cpp'; then $(CYGPATH_W) 'logging.cpp'; else $(CYGPATH_W) '$(srcdir)/logging.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-logging.obj `if test -f 'logging.cpp'; then $(CYGPATH_W) 'logging.cpp'; else $(CYGPATH_W) '$(srcdir)/logging.cpp'; fi` libengine_a-misc.o: misc.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-misc.o -MD -MP -MF $(DEPDIR)/libengine_a-misc.Tpo -c -o libengine_a-misc.o `test -f 'misc.cpp' || echo '$(srcdir)/'`misc.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-misc.o -MD -MP -MF $(DEPDIR)/libengine_a-misc.Tpo -c -o libengine_a-misc.o `test -f 'misc.cpp' || echo '$(srcdir)/'`misc.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-misc.Tpo $(DEPDIR)/libengine_a-misc.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='misc.cpp' object='libengine_a-misc.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-misc.o `test -f 'misc.cpp' || echo '$(srcdir)/'`misc.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-misc.o `test -f 'misc.cpp' || echo '$(srcdir)/'`misc.cpp libengine_a-misc.obj: misc.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-misc.obj -MD -MP -MF $(DEPDIR)/libengine_a-misc.Tpo -c -o libengine_a-misc.obj `if test -f 'misc.cpp'; then $(CYGPATH_W) 'misc.cpp'; else $(CYGPATH_W) '$(srcdir)/misc.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-misc.obj -MD -MP -MF $(DEPDIR)/libengine_a-misc.Tpo -c -o libengine_a-misc.obj `if test -f 'misc.cpp'; then $(CYGPATH_W) 'misc.cpp'; else $(CYGPATH_W) '$(srcdir)/misc.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-misc.Tpo $(DEPDIR)/libengine_a-misc.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='misc.cpp' object='libengine_a-misc.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-misc.obj `if test -f 'misc.cpp'; then $(CYGPATH_W) 'misc.cpp'; else $(CYGPATH_W) '$(srcdir)/misc.cpp'; fi` - -libengine_a-msgbox.o: msgbox.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-msgbox.o -MD -MP -MF $(DEPDIR)/libengine_a-msgbox.Tpo -c -o libengine_a-msgbox.o `test -f 'msgbox.cpp' || echo '$(srcdir)/'`msgbox.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-msgbox.Tpo $(DEPDIR)/libengine_a-msgbox.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='msgbox.cpp' object='libengine_a-msgbox.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-msgbox.o `test -f 'msgbox.cpp' || echo '$(srcdir)/'`msgbox.cpp - -libengine_a-msgbox.obj: msgbox.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-msgbox.obj -MD -MP -MF $(DEPDIR)/libengine_a-msgbox.Tpo -c -o libengine_a-msgbox.obj `if test -f 'msgbox.cpp'; then $(CYGPATH_W) 'msgbox.cpp'; else $(CYGPATH_W) '$(srcdir)/msgbox.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-msgbox.Tpo $(DEPDIR)/libengine_a-msgbox.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='msgbox.cpp' object='libengine_a-msgbox.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-msgbox.obj `if test -f 'msgbox.cpp'; then $(CYGPATH_W) 'msgbox.cpp'; else $(CYGPATH_W) '$(srcdir)/msgbox.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-misc.obj `if test -f 'misc.cpp'; then $(CYGPATH_W) 'misc.cpp'; else $(CYGPATH_W) '$(srcdir)/misc.cpp'; fi` libengine_a-notification.o: notification.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-notification.o -MD -MP -MF $(DEPDIR)/libengine_a-notification.Tpo -c -o libengine_a-notification.o `test -f 'notification.cpp' || echo '$(srcdir)/'`notification.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-notification.o -MD -MP -MF $(DEPDIR)/libengine_a-notification.Tpo -c -o libengine_a-notification.o `test -f 'notification.cpp' || echo '$(srcdir)/'`notification.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-notification.Tpo $(DEPDIR)/libengine_a-notification.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='notification.cpp' object='libengine_a-notification.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-notification.o `test -f 'notification.cpp' || echo '$(srcdir)/'`notification.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-notification.o `test -f 'notification.cpp' || echo '$(srcdir)/'`notification.cpp libengine_a-notification.obj: notification.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-notification.obj -MD -MP -MF $(DEPDIR)/libengine_a-notification.Tpo -c -o libengine_a-notification.obj `if test -f 'notification.cpp'; then $(CYGPATH_W) 'notification.cpp'; else $(CYGPATH_W) '$(srcdir)/notification.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-notification.obj -MD -MP -MF $(DEPDIR)/libengine_a-notification.Tpo -c -o libengine_a-notification.obj `if test -f 'notification.cpp'; then $(CYGPATH_W) 'notification.cpp'; else $(CYGPATH_W) '$(srcdir)/notification.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-notification.Tpo $(DEPDIR)/libengine_a-notification.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='notification.cpp' object='libengine_a-notification.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-notification.obj `if test -f 'notification.cpp'; then $(CYGPATH_W) 'notification.cpp'; else $(CYGPATH_W) '$(srcdir)/notification.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-notification.obj `if test -f 'notification.cpp'; then $(CYGPATH_W) 'notification.cpp'; else $(CYGPATH_W) '$(srcdir)/notification.cpp'; fi` libengine_a-option_change_event_handler.o: option_change_event_handler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-option_change_event_handler.o -MD -MP -MF $(DEPDIR)/libengine_a-option_change_event_handler.Tpo -c -o libengine_a-option_change_event_handler.o `test -f 'option_change_event_handler.cpp' || echo '$(srcdir)/'`option_change_event_handler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-option_change_event_handler.o -MD -MP -MF $(DEPDIR)/libengine_a-option_change_event_handler.Tpo -c -o libengine_a-option_change_event_handler.o `test -f 'option_change_event_handler.cpp' || echo '$(srcdir)/'`option_change_event_handler.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-option_change_event_handler.Tpo $(DEPDIR)/libengine_a-option_change_event_handler.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='option_change_event_handler.cpp' object='libengine_a-option_change_event_handler.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-option_change_event_handler.o `test -f 'option_change_event_handler.cpp' || echo '$(srcdir)/'`option_change_event_handler.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-option_change_event_handler.o `test -f 'option_change_event_handler.cpp' || echo '$(srcdir)/'`option_change_event_handler.cpp libengine_a-option_change_event_handler.obj: option_change_event_handler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-option_change_event_handler.obj -MD -MP -MF $(DEPDIR)/libengine_a-option_change_event_handler.Tpo -c -o libengine_a-option_change_event_handler.obj `if test -f 'option_change_event_handler.cpp'; then $(CYGPATH_W) 'option_change_event_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/option_change_event_handler.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-option_change_event_handler.obj -MD -MP -MF $(DEPDIR)/libengine_a-option_change_event_handler.Tpo -c -o libengine_a-option_change_event_handler.obj `if test -f 'option_change_event_handler.cpp'; then $(CYGPATH_W) 'option_change_event_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/option_change_event_handler.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-option_change_event_handler.Tpo $(DEPDIR)/libengine_a-option_change_event_handler.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='option_change_event_handler.cpp' object='libengine_a-option_change_event_handler.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-option_change_event_handler.obj `if test -f 'option_change_event_handler.cpp'; then $(CYGPATH_W) 'option_change_event_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/option_change_event_handler.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-option_change_event_handler.obj `if test -f 'option_change_event_handler.cpp'; then $(CYGPATH_W) 'option_change_event_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/option_change_event_handler.cpp'; fi` libengine_a-pathcache.o: pathcache.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-pathcache.o -MD -MP -MF $(DEPDIR)/libengine_a-pathcache.Tpo -c -o libengine_a-pathcache.o `test -f 'pathcache.cpp' || echo '$(srcdir)/'`pathcache.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-pathcache.o -MD -MP -MF $(DEPDIR)/libengine_a-pathcache.Tpo -c -o libengine_a-pathcache.o `test -f 'pathcache.cpp' || echo '$(srcdir)/'`pathcache.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-pathcache.Tpo $(DEPDIR)/libengine_a-pathcache.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pathcache.cpp' object='libengine_a-pathcache.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-pathcache.o `test -f 'pathcache.cpp' || echo '$(srcdir)/'`pathcache.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-pathcache.o `test -f 'pathcache.cpp' || echo '$(srcdir)/'`pathcache.cpp libengine_a-pathcache.obj: pathcache.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-pathcache.obj -MD -MP -MF $(DEPDIR)/libengine_a-pathcache.Tpo -c -o libengine_a-pathcache.obj `if test -f 'pathcache.cpp'; then $(CYGPATH_W) 'pathcache.cpp'; else $(CYGPATH_W) '$(srcdir)/pathcache.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-pathcache.obj -MD -MP -MF $(DEPDIR)/libengine_a-pathcache.Tpo -c -o libengine_a-pathcache.obj `if test -f 'pathcache.cpp'; then $(CYGPATH_W) 'pathcache.cpp'; else $(CYGPATH_W) '$(srcdir)/pathcache.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-pathcache.Tpo $(DEPDIR)/libengine_a-pathcache.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pathcache.cpp' object='libengine_a-pathcache.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-pathcache.obj `if test -f 'pathcache.cpp'; then $(CYGPATH_W) 'pathcache.cpp'; else $(CYGPATH_W) '$(srcdir)/pathcache.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-pathcache.obj `if test -f 'pathcache.cpp'; then $(CYGPATH_W) 'pathcache.cpp'; else $(CYGPATH_W) '$(srcdir)/pathcache.cpp'; fi` libengine_a-proxy.o: proxy.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-proxy.o -MD -MP -MF $(DEPDIR)/libengine_a-proxy.Tpo -c -o libengine_a-proxy.o `test -f 'proxy.cpp' || echo '$(srcdir)/'`proxy.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-proxy.o -MD -MP -MF $(DEPDIR)/libengine_a-proxy.Tpo -c -o libengine_a-proxy.o `test -f 'proxy.cpp' || echo '$(srcdir)/'`proxy.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-proxy.Tpo $(DEPDIR)/libengine_a-proxy.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='proxy.cpp' object='libengine_a-proxy.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-proxy.o `test -f 'proxy.cpp' || echo '$(srcdir)/'`proxy.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-proxy.o `test -f 'proxy.cpp' || echo '$(srcdir)/'`proxy.cpp libengine_a-proxy.obj: proxy.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-proxy.obj -MD -MP -MF $(DEPDIR)/libengine_a-proxy.Tpo -c -o libengine_a-proxy.obj `if test -f 'proxy.cpp'; then $(CYGPATH_W) 'proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/proxy.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-proxy.obj -MD -MP -MF $(DEPDIR)/libengine_a-proxy.Tpo -c -o libengine_a-proxy.obj `if test -f 'proxy.cpp'; then $(CYGPATH_W) 'proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/proxy.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-proxy.Tpo $(DEPDIR)/libengine_a-proxy.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='proxy.cpp' object='libengine_a-proxy.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-proxy.obj `if test -f 'proxy.cpp'; then $(CYGPATH_W) 'proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/proxy.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-proxy.obj `if test -f 'proxy.cpp'; then $(CYGPATH_W) 'proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/proxy.cpp'; fi` libengine_a-ratelimiter.o: ratelimiter.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ratelimiter.o -MD -MP -MF $(DEPDIR)/libengine_a-ratelimiter.Tpo -c -o libengine_a-ratelimiter.o `test -f 'ratelimiter.cpp' || echo '$(srcdir)/'`ratelimiter.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ratelimiter.o -MD -MP -MF $(DEPDIR)/libengine_a-ratelimiter.Tpo -c -o libengine_a-ratelimiter.o `test -f 'ratelimiter.cpp' || echo '$(srcdir)/'`ratelimiter.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-ratelimiter.Tpo $(DEPDIR)/libengine_a-ratelimiter.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ratelimiter.cpp' object='libengine_a-ratelimiter.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ratelimiter.o `test -f 'ratelimiter.cpp' || echo '$(srcdir)/'`ratelimiter.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ratelimiter.o `test -f 'ratelimiter.cpp' || echo '$(srcdir)/'`ratelimiter.cpp libengine_a-ratelimiter.obj: ratelimiter.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ratelimiter.obj -MD -MP -MF $(DEPDIR)/libengine_a-ratelimiter.Tpo -c -o libengine_a-ratelimiter.obj `if test -f 'ratelimiter.cpp'; then $(CYGPATH_W) 'ratelimiter.cpp'; else $(CYGPATH_W) '$(srcdir)/ratelimiter.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-ratelimiter.obj -MD -MP -MF $(DEPDIR)/libengine_a-ratelimiter.Tpo -c -o libengine_a-ratelimiter.obj `if test -f 'ratelimiter.cpp'; then $(CYGPATH_W) 'ratelimiter.cpp'; else $(CYGPATH_W) '$(srcdir)/ratelimiter.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-ratelimiter.Tpo $(DEPDIR)/libengine_a-ratelimiter.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ratelimiter.cpp' object='libengine_a-ratelimiter.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ratelimiter.obj `if test -f 'ratelimiter.cpp'; then $(CYGPATH_W) 'ratelimiter.cpp'; else $(CYGPATH_W) '$(srcdir)/ratelimiter.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ratelimiter.obj `if test -f 'ratelimiter.cpp'; then $(CYGPATH_W) 'ratelimiter.cpp'; else $(CYGPATH_W) '$(srcdir)/ratelimiter.cpp'; fi` libengine_a-rtt.o: rtt.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-rtt.o -MD -MP -MF $(DEPDIR)/libengine_a-rtt.Tpo -c -o libengine_a-rtt.o `test -f 'rtt.cpp' || echo '$(srcdir)/'`rtt.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-rtt.o -MD -MP -MF $(DEPDIR)/libengine_a-rtt.Tpo -c -o libengine_a-rtt.o `test -f 'rtt.cpp' || echo '$(srcdir)/'`rtt.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-rtt.Tpo $(DEPDIR)/libengine_a-rtt.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='rtt.cpp' object='libengine_a-rtt.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-rtt.o `test -f 'rtt.cpp' || echo '$(srcdir)/'`rtt.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-rtt.o `test -f 'rtt.cpp' || echo '$(srcdir)/'`rtt.cpp libengine_a-rtt.obj: rtt.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-rtt.obj -MD -MP -MF $(DEPDIR)/libengine_a-rtt.Tpo -c -o libengine_a-rtt.obj `if test -f 'rtt.cpp'; then $(CYGPATH_W) 'rtt.cpp'; else $(CYGPATH_W) '$(srcdir)/rtt.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-rtt.obj -MD -MP -MF $(DEPDIR)/libengine_a-rtt.Tpo -c -o libengine_a-rtt.obj `if test -f 'rtt.cpp'; then $(CYGPATH_W) 'rtt.cpp'; else $(CYGPATH_W) '$(srcdir)/rtt.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-rtt.Tpo $(DEPDIR)/libengine_a-rtt.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='rtt.cpp' object='libengine_a-rtt.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-rtt.obj `if test -f 'rtt.cpp'; then $(CYGPATH_W) 'rtt.cpp'; else $(CYGPATH_W) '$(srcdir)/rtt.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-rtt.obj `if test -f 'rtt.cpp'; then $(CYGPATH_W) 'rtt.cpp'; else $(CYGPATH_W) '$(srcdir)/rtt.cpp'; fi` libengine_a-server.o: server.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-server.o -MD -MP -MF $(DEPDIR)/libengine_a-server.Tpo -c -o libengine_a-server.o `test -f 'server.cpp' || echo '$(srcdir)/'`server.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-server.o -MD -MP -MF $(DEPDIR)/libengine_a-server.Tpo -c -o libengine_a-server.o `test -f 'server.cpp' || echo '$(srcdir)/'`server.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-server.Tpo $(DEPDIR)/libengine_a-server.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='server.cpp' object='libengine_a-server.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-server.o `test -f 'server.cpp' || echo '$(srcdir)/'`server.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-server.o `test -f 'server.cpp' || echo '$(srcdir)/'`server.cpp libengine_a-server.obj: server.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-server.obj -MD -MP -MF $(DEPDIR)/libengine_a-server.Tpo -c -o libengine_a-server.obj `if test -f 'server.cpp'; then $(CYGPATH_W) 'server.cpp'; else $(CYGPATH_W) '$(srcdir)/server.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-server.obj -MD -MP -MF $(DEPDIR)/libengine_a-server.Tpo -c -o libengine_a-server.obj `if test -f 'server.cpp'; then $(CYGPATH_W) 'server.cpp'; else $(CYGPATH_W) '$(srcdir)/server.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-server.Tpo $(DEPDIR)/libengine_a-server.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='server.cpp' object='libengine_a-server.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-server.obj `if test -f 'server.cpp'; then $(CYGPATH_W) 'server.cpp'; else $(CYGPATH_W) '$(srcdir)/server.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-server.obj `if test -f 'server.cpp'; then $(CYGPATH_W) 'server.cpp'; else $(CYGPATH_W) '$(srcdir)/server.cpp'; fi` libengine_a-serverpath.o: serverpath.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-serverpath.o -MD -MP -MF $(DEPDIR)/libengine_a-serverpath.Tpo -c -o libengine_a-serverpath.o `test -f 'serverpath.cpp' || echo '$(srcdir)/'`serverpath.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-serverpath.o -MD -MP -MF $(DEPDIR)/libengine_a-serverpath.Tpo -c -o libengine_a-serverpath.o `test -f 'serverpath.cpp' || echo '$(srcdir)/'`serverpath.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-serverpath.Tpo $(DEPDIR)/libengine_a-serverpath.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='serverpath.cpp' object='libengine_a-serverpath.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-serverpath.o `test -f 'serverpath.cpp' || echo '$(srcdir)/'`serverpath.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-serverpath.o `test -f 'serverpath.cpp' || echo '$(srcdir)/'`serverpath.cpp libengine_a-serverpath.obj: serverpath.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-serverpath.obj -MD -MP -MF $(DEPDIR)/libengine_a-serverpath.Tpo -c -o libengine_a-serverpath.obj `if test -f 'serverpath.cpp'; then $(CYGPATH_W) 'serverpath.cpp'; else $(CYGPATH_W) '$(srcdir)/serverpath.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-serverpath.obj -MD -MP -MF $(DEPDIR)/libengine_a-serverpath.Tpo -c -o libengine_a-serverpath.obj `if test -f 'serverpath.cpp'; then $(CYGPATH_W) 'serverpath.cpp'; else $(CYGPATH_W) '$(srcdir)/serverpath.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-serverpath.Tpo $(DEPDIR)/libengine_a-serverpath.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='serverpath.cpp' object='libengine_a-serverpath.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-serverpath.obj `if test -f 'serverpath.cpp'; then $(CYGPATH_W) 'serverpath.cpp'; else $(CYGPATH_W) '$(srcdir)/serverpath.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-serverpath.obj `if test -f 'serverpath.cpp'; then $(CYGPATH_W) 'serverpath.cpp'; else $(CYGPATH_W) '$(srcdir)/serverpath.cpp'; fi` libengine_a-servercapabilities.o: servercapabilities.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-servercapabilities.o -MD -MP -MF $(DEPDIR)/libengine_a-servercapabilities.Tpo -c -o libengine_a-servercapabilities.o `test -f 'servercapabilities.cpp' || echo '$(srcdir)/'`servercapabilities.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-servercapabilities.o -MD -MP -MF $(DEPDIR)/libengine_a-servercapabilities.Tpo -c -o libengine_a-servercapabilities.o `test -f 'servercapabilities.cpp' || echo '$(srcdir)/'`servercapabilities.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-servercapabilities.Tpo $(DEPDIR)/libengine_a-servercapabilities.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='servercapabilities.cpp' object='libengine_a-servercapabilities.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-servercapabilities.o `test -f 'servercapabilities.cpp' || echo '$(srcdir)/'`servercapabilities.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-servercapabilities.o `test -f 'servercapabilities.cpp' || echo '$(srcdir)/'`servercapabilities.cpp libengine_a-servercapabilities.obj: servercapabilities.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-servercapabilities.obj -MD -MP -MF $(DEPDIR)/libengine_a-servercapabilities.Tpo -c -o libengine_a-servercapabilities.obj `if test -f 'servercapabilities.cpp'; then $(CYGPATH_W) 'servercapabilities.cpp'; else $(CYGPATH_W) '$(srcdir)/servercapabilities.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-servercapabilities.obj -MD -MP -MF $(DEPDIR)/libengine_a-servercapabilities.Tpo -c -o libengine_a-servercapabilities.obj `if test -f 'servercapabilities.cpp'; then $(CYGPATH_W) 'servercapabilities.cpp'; else $(CYGPATH_W) '$(srcdir)/servercapabilities.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-servercapabilities.Tpo $(DEPDIR)/libengine_a-servercapabilities.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='servercapabilities.cpp' object='libengine_a-servercapabilities.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-servercapabilities.obj `if test -f 'servercapabilities.cpp'; then $(CYGPATH_W) 'servercapabilities.cpp'; else $(CYGPATH_W) '$(srcdir)/servercapabilities.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-servercapabilities.obj `if test -f 'servercapabilities.cpp'; then $(CYGPATH_W) 'servercapabilities.cpp'; else $(CYGPATH_W) '$(srcdir)/servercapabilities.cpp'; fi` -libengine_a-sftpcontrolsocket.o: sftpcontrolsocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-sftpcontrolsocket.o -MD -MP -MF $(DEPDIR)/libengine_a-sftpcontrolsocket.Tpo -c -o libengine_a-sftpcontrolsocket.o `test -f 'sftpcontrolsocket.cpp' || echo '$(srcdir)/'`sftpcontrolsocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-sftpcontrolsocket.Tpo $(DEPDIR)/libengine_a-sftpcontrolsocket.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftpcontrolsocket.cpp' object='libengine_a-sftpcontrolsocket.o' libtool=no @AMDEPBACKSLASH@ +sftp/libengine_a-chmod.o: sftp/chmod.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-chmod.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-chmod.Tpo -c -o sftp/libengine_a-chmod.o `test -f 'sftp/chmod.cpp' || echo '$(srcdir)/'`sftp/chmod.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-chmod.Tpo sftp/$(DEPDIR)/libengine_a-chmod.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/chmod.cpp' object='sftp/libengine_a-chmod.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-sftpcontrolsocket.o `test -f 'sftpcontrolsocket.cpp' || echo '$(srcdir)/'`sftpcontrolsocket.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-chmod.o `test -f 'sftp/chmod.cpp' || echo '$(srcdir)/'`sftp/chmod.cpp -libengine_a-sftpcontrolsocket.obj: sftpcontrolsocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-sftpcontrolsocket.obj -MD -MP -MF $(DEPDIR)/libengine_a-sftpcontrolsocket.Tpo -c -o libengine_a-sftpcontrolsocket.obj `if test -f 'sftpcontrolsocket.cpp'; then $(CYGPATH_W) 'sftpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/sftpcontrolsocket.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-sftpcontrolsocket.Tpo $(DEPDIR)/libengine_a-sftpcontrolsocket.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftpcontrolsocket.cpp' object='libengine_a-sftpcontrolsocket.obj' libtool=no @AMDEPBACKSLASH@ +sftp/libengine_a-chmod.obj: sftp/chmod.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-chmod.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-chmod.Tpo -c -o sftp/libengine_a-chmod.obj `if test -f 'sftp/chmod.cpp'; then $(CYGPATH_W) 'sftp/chmod.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/chmod.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-chmod.Tpo sftp/$(DEPDIR)/libengine_a-chmod.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/chmod.cpp' object='sftp/libengine_a-chmod.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-sftpcontrolsocket.obj `if test -f 'sftpcontrolsocket.cpp'; then $(CYGPATH_W) 'sftpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/sftpcontrolsocket.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-chmod.obj `if test -f 'sftp/chmod.cpp'; then $(CYGPATH_W) 'sftp/chmod.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/chmod.cpp'; fi` + +sftp/libengine_a-connect.o: sftp/connect.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-connect.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-connect.Tpo -c -o sftp/libengine_a-connect.o `test -f 'sftp/connect.cpp' || echo '$(srcdir)/'`sftp/connect.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-connect.Tpo sftp/$(DEPDIR)/libengine_a-connect.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/connect.cpp' object='sftp/libengine_a-connect.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-connect.o `test -f 'sftp/connect.cpp' || echo '$(srcdir)/'`sftp/connect.cpp + +sftp/libengine_a-connect.obj: sftp/connect.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-connect.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-connect.Tpo -c -o sftp/libengine_a-connect.obj `if test -f 'sftp/connect.cpp'; then $(CYGPATH_W) 'sftp/connect.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/connect.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-connect.Tpo sftp/$(DEPDIR)/libengine_a-connect.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/connect.cpp' object='sftp/libengine_a-connect.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-connect.obj `if test -f 'sftp/connect.cpp'; then $(CYGPATH_W) 'sftp/connect.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/connect.cpp'; fi` + +sftp/libengine_a-cwd.o: sftp/cwd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-cwd.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-cwd.Tpo -c -o sftp/libengine_a-cwd.o `test -f 'sftp/cwd.cpp' || echo '$(srcdir)/'`sftp/cwd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-cwd.Tpo sftp/$(DEPDIR)/libengine_a-cwd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/cwd.cpp' object='sftp/libengine_a-cwd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-cwd.o `test -f 'sftp/cwd.cpp' || echo '$(srcdir)/'`sftp/cwd.cpp + +sftp/libengine_a-cwd.obj: sftp/cwd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-cwd.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-cwd.Tpo -c -o sftp/libengine_a-cwd.obj `if test -f 'sftp/cwd.cpp'; then $(CYGPATH_W) 'sftp/cwd.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/cwd.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-cwd.Tpo sftp/$(DEPDIR)/libengine_a-cwd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/cwd.cpp' object='sftp/libengine_a-cwd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-cwd.obj `if test -f 'sftp/cwd.cpp'; then $(CYGPATH_W) 'sftp/cwd.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/cwd.cpp'; fi` + +sftp/libengine_a-delete.o: sftp/delete.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-delete.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-delete.Tpo -c -o sftp/libengine_a-delete.o `test -f 'sftp/delete.cpp' || echo '$(srcdir)/'`sftp/delete.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-delete.Tpo sftp/$(DEPDIR)/libengine_a-delete.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/delete.cpp' object='sftp/libengine_a-delete.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-delete.o `test -f 'sftp/delete.cpp' || echo '$(srcdir)/'`sftp/delete.cpp + +sftp/libengine_a-delete.obj: sftp/delete.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-delete.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-delete.Tpo -c -o sftp/libengine_a-delete.obj `if test -f 'sftp/delete.cpp'; then $(CYGPATH_W) 'sftp/delete.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/delete.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-delete.Tpo sftp/$(DEPDIR)/libengine_a-delete.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/delete.cpp' object='sftp/libengine_a-delete.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-delete.obj `if test -f 'sftp/delete.cpp'; then $(CYGPATH_W) 'sftp/delete.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/delete.cpp'; fi` + +sftp/libengine_a-filetransfer.o: sftp/filetransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-filetransfer.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-filetransfer.Tpo -c -o sftp/libengine_a-filetransfer.o `test -f 'sftp/filetransfer.cpp' || echo '$(srcdir)/'`sftp/filetransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-filetransfer.Tpo sftp/$(DEPDIR)/libengine_a-filetransfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/filetransfer.cpp' object='sftp/libengine_a-filetransfer.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-filetransfer.o `test -f 'sftp/filetransfer.cpp' || echo '$(srcdir)/'`sftp/filetransfer.cpp + +sftp/libengine_a-filetransfer.obj: sftp/filetransfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-filetransfer.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-filetransfer.Tpo -c -o sftp/libengine_a-filetransfer.obj `if test -f 'sftp/filetransfer.cpp'; then $(CYGPATH_W) 'sftp/filetransfer.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/filetransfer.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-filetransfer.Tpo sftp/$(DEPDIR)/libengine_a-filetransfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/filetransfer.cpp' object='sftp/libengine_a-filetransfer.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-filetransfer.obj `if test -f 'sftp/filetransfer.cpp'; then $(CYGPATH_W) 'sftp/filetransfer.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/filetransfer.cpp'; fi` + +sftp/libengine_a-input_thread.o: sftp/input_thread.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-input_thread.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-input_thread.Tpo -c -o sftp/libengine_a-input_thread.o `test -f 'sftp/input_thread.cpp' || echo '$(srcdir)/'`sftp/input_thread.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-input_thread.Tpo sftp/$(DEPDIR)/libengine_a-input_thread.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/input_thread.cpp' object='sftp/libengine_a-input_thread.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-input_thread.o `test -f 'sftp/input_thread.cpp' || echo '$(srcdir)/'`sftp/input_thread.cpp + +sftp/libengine_a-input_thread.obj: sftp/input_thread.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-input_thread.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-input_thread.Tpo -c -o sftp/libengine_a-input_thread.obj `if test -f 'sftp/input_thread.cpp'; then $(CYGPATH_W) 'sftp/input_thread.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/input_thread.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-input_thread.Tpo sftp/$(DEPDIR)/libengine_a-input_thread.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/input_thread.cpp' object='sftp/libengine_a-input_thread.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-input_thread.obj `if test -f 'sftp/input_thread.cpp'; then $(CYGPATH_W) 'sftp/input_thread.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/input_thread.cpp'; fi` + +sftp/libengine_a-list.o: sftp/list.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-list.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-list.Tpo -c -o sftp/libengine_a-list.o `test -f 'sftp/list.cpp' || echo '$(srcdir)/'`sftp/list.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-list.Tpo sftp/$(DEPDIR)/libengine_a-list.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/list.cpp' object='sftp/libengine_a-list.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-list.o `test -f 'sftp/list.cpp' || echo '$(srcdir)/'`sftp/list.cpp + +sftp/libengine_a-list.obj: sftp/list.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-list.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-list.Tpo -c -o sftp/libengine_a-list.obj `if test -f 'sftp/list.cpp'; then $(CYGPATH_W) 'sftp/list.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/list.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-list.Tpo sftp/$(DEPDIR)/libengine_a-list.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/list.cpp' object='sftp/libengine_a-list.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-list.obj `if test -f 'sftp/list.cpp'; then $(CYGPATH_W) 'sftp/list.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/list.cpp'; fi` + +sftp/libengine_a-mkd.o: sftp/mkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-mkd.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-mkd.Tpo -c -o sftp/libengine_a-mkd.o `test -f 'sftp/mkd.cpp' || echo '$(srcdir)/'`sftp/mkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-mkd.Tpo sftp/$(DEPDIR)/libengine_a-mkd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/mkd.cpp' object='sftp/libengine_a-mkd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-mkd.o `test -f 'sftp/mkd.cpp' || echo '$(srcdir)/'`sftp/mkd.cpp + +sftp/libengine_a-mkd.obj: sftp/mkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-mkd.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-mkd.Tpo -c -o sftp/libengine_a-mkd.obj `if test -f 'sftp/mkd.cpp'; then $(CYGPATH_W) 'sftp/mkd.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/mkd.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-mkd.Tpo sftp/$(DEPDIR)/libengine_a-mkd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/mkd.cpp' object='sftp/libengine_a-mkd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-mkd.obj `if test -f 'sftp/mkd.cpp'; then $(CYGPATH_W) 'sftp/mkd.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/mkd.cpp'; fi` + +sftp/libengine_a-rename.o: sftp/rename.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-rename.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-rename.Tpo -c -o sftp/libengine_a-rename.o `test -f 'sftp/rename.cpp' || echo '$(srcdir)/'`sftp/rename.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-rename.Tpo sftp/$(DEPDIR)/libengine_a-rename.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/rename.cpp' object='sftp/libengine_a-rename.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-rename.o `test -f 'sftp/rename.cpp' || echo '$(srcdir)/'`sftp/rename.cpp + +sftp/libengine_a-rename.obj: sftp/rename.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-rename.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-rename.Tpo -c -o sftp/libengine_a-rename.obj `if test -f 'sftp/rename.cpp'; then $(CYGPATH_W) 'sftp/rename.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/rename.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-rename.Tpo sftp/$(DEPDIR)/libengine_a-rename.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/rename.cpp' object='sftp/libengine_a-rename.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-rename.obj `if test -f 'sftp/rename.cpp'; then $(CYGPATH_W) 'sftp/rename.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/rename.cpp'; fi` + +sftp/libengine_a-rmd.o: sftp/rmd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-rmd.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-rmd.Tpo -c -o sftp/libengine_a-rmd.o `test -f 'sftp/rmd.cpp' || echo '$(srcdir)/'`sftp/rmd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-rmd.Tpo sftp/$(DEPDIR)/libengine_a-rmd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/rmd.cpp' object='sftp/libengine_a-rmd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-rmd.o `test -f 'sftp/rmd.cpp' || echo '$(srcdir)/'`sftp/rmd.cpp + +sftp/libengine_a-rmd.obj: sftp/rmd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-rmd.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-rmd.Tpo -c -o sftp/libengine_a-rmd.obj `if test -f 'sftp/rmd.cpp'; then $(CYGPATH_W) 'sftp/rmd.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/rmd.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-rmd.Tpo sftp/$(DEPDIR)/libengine_a-rmd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/rmd.cpp' object='sftp/libengine_a-rmd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-rmd.obj `if test -f 'sftp/rmd.cpp'; then $(CYGPATH_W) 'sftp/rmd.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/rmd.cpp'; fi` + +sftp/libengine_a-sftpcontrolsocket.o: sftp/sftpcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-sftpcontrolsocket.o -MD -MP -MF sftp/$(DEPDIR)/libengine_a-sftpcontrolsocket.Tpo -c -o sftp/libengine_a-sftpcontrolsocket.o `test -f 'sftp/sftpcontrolsocket.cpp' || echo '$(srcdir)/'`sftp/sftpcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-sftpcontrolsocket.Tpo sftp/$(DEPDIR)/libengine_a-sftpcontrolsocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/sftpcontrolsocket.cpp' object='sftp/libengine_a-sftpcontrolsocket.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-sftpcontrolsocket.o `test -f 'sftp/sftpcontrolsocket.cpp' || echo '$(srcdir)/'`sftp/sftpcontrolsocket.cpp + +sftp/libengine_a-sftpcontrolsocket.obj: sftp/sftpcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sftp/libengine_a-sftpcontrolsocket.obj -MD -MP -MF sftp/$(DEPDIR)/libengine_a-sftpcontrolsocket.Tpo -c -o sftp/libengine_a-sftpcontrolsocket.obj `if test -f 'sftp/sftpcontrolsocket.cpp'; then $(CYGPATH_W) 'sftp/sftpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/sftpcontrolsocket.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sftp/$(DEPDIR)/libengine_a-sftpcontrolsocket.Tpo sftp/$(DEPDIR)/libengine_a-sftpcontrolsocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sftp/sftpcontrolsocket.cpp' object='sftp/libengine_a-sftpcontrolsocket.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sftp/libengine_a-sftpcontrolsocket.obj `if test -f 'sftp/sftpcontrolsocket.cpp'; then $(CYGPATH_W) 'sftp/sftpcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/sftp/sftpcontrolsocket.cpp'; fi` libengine_a-sizeformatting_base.o: sizeformatting_base.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-sizeformatting_base.o -MD -MP -MF $(DEPDIR)/libengine_a-sizeformatting_base.Tpo -c -o libengine_a-sizeformatting_base.o `test -f 'sizeformatting_base.cpp' || echo '$(srcdir)/'`sizeformatting_base.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-sizeformatting_base.o -MD -MP -MF $(DEPDIR)/libengine_a-sizeformatting_base.Tpo -c -o libengine_a-sizeformatting_base.o `test -f 'sizeformatting_base.cpp' || echo '$(srcdir)/'`sizeformatting_base.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-sizeformatting_base.Tpo $(DEPDIR)/libengine_a-sizeformatting_base.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sizeformatting_base.cpp' object='libengine_a-sizeformatting_base.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-sizeformatting_base.o `test -f 'sizeformatting_base.cpp' || echo '$(srcdir)/'`sizeformatting_base.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-sizeformatting_base.o `test -f 'sizeformatting_base.cpp' || echo '$(srcdir)/'`sizeformatting_base.cpp libengine_a-sizeformatting_base.obj: sizeformatting_base.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-sizeformatting_base.obj -MD -MP -MF $(DEPDIR)/libengine_a-sizeformatting_base.Tpo -c -o libengine_a-sizeformatting_base.obj `if test -f 'sizeformatting_base.cpp'; then $(CYGPATH_W) 'sizeformatting_base.cpp'; else $(CYGPATH_W) '$(srcdir)/sizeformatting_base.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-sizeformatting_base.obj -MD -MP -MF $(DEPDIR)/libengine_a-sizeformatting_base.Tpo -c -o libengine_a-sizeformatting_base.obj `if test -f 'sizeformatting_base.cpp'; then $(CYGPATH_W) 'sizeformatting_base.cpp'; else $(CYGPATH_W) '$(srcdir)/sizeformatting_base.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-sizeformatting_base.Tpo $(DEPDIR)/libengine_a-sizeformatting_base.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sizeformatting_base.cpp' object='libengine_a-sizeformatting_base.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-sizeformatting_base.obj `if test -f 'sizeformatting_base.cpp'; then $(CYGPATH_W) 'sizeformatting_base.cpp'; else $(CYGPATH_W) '$(srcdir)/sizeformatting_base.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-sizeformatting_base.obj `if test -f 'sizeformatting_base.cpp'; then $(CYGPATH_W) 'sizeformatting_base.cpp'; else $(CYGPATH_W) '$(srcdir)/sizeformatting_base.cpp'; fi` libengine_a-socket.o: socket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-socket.o -MD -MP -MF $(DEPDIR)/libengine_a-socket.Tpo -c -o libengine_a-socket.o `test -f 'socket.cpp' || echo '$(srcdir)/'`socket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-socket.o -MD -MP -MF $(DEPDIR)/libengine_a-socket.Tpo -c -o libengine_a-socket.o `test -f 'socket.cpp' || echo '$(srcdir)/'`socket.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-socket.Tpo $(DEPDIR)/libengine_a-socket.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='socket.cpp' object='libengine_a-socket.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-socket.o `test -f 'socket.cpp' || echo '$(srcdir)/'`socket.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-socket.o `test -f 'socket.cpp' || echo '$(srcdir)/'`socket.cpp libengine_a-socket.obj: socket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-socket.obj -MD -MP -MF $(DEPDIR)/libengine_a-socket.Tpo -c -o libengine_a-socket.obj `if test -f 'socket.cpp'; then $(CYGPATH_W) 'socket.cpp'; else $(CYGPATH_W) '$(srcdir)/socket.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-socket.obj -MD -MP -MF $(DEPDIR)/libengine_a-socket.Tpo -c -o libengine_a-socket.obj `if test -f 'socket.cpp'; then $(CYGPATH_W) 'socket.cpp'; else $(CYGPATH_W) '$(srcdir)/socket.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-socket.Tpo $(DEPDIR)/libengine_a-socket.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='socket.cpp' object='libengine_a-socket.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-socket.obj `if test -f 'socket.cpp'; then $(CYGPATH_W) 'socket.cpp'; else $(CYGPATH_W) '$(srcdir)/socket.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-socket.obj `if test -f 'socket.cpp'; then $(CYGPATH_W) 'socket.cpp'; else $(CYGPATH_W) '$(srcdir)/socket.cpp'; fi` libengine_a-tlssocket.o: tlssocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-tlssocket.o -MD -MP -MF $(DEPDIR)/libengine_a-tlssocket.Tpo -c -o libengine_a-tlssocket.o `test -f 'tlssocket.cpp' || echo '$(srcdir)/'`tlssocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-tlssocket.o -MD -MP -MF $(DEPDIR)/libengine_a-tlssocket.Tpo -c -o libengine_a-tlssocket.o `test -f 'tlssocket.cpp' || echo '$(srcdir)/'`tlssocket.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-tlssocket.Tpo $(DEPDIR)/libengine_a-tlssocket.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tlssocket.cpp' object='libengine_a-tlssocket.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-tlssocket.o `test -f 'tlssocket.cpp' || echo '$(srcdir)/'`tlssocket.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-tlssocket.o `test -f 'tlssocket.cpp' || echo '$(srcdir)/'`tlssocket.cpp libengine_a-tlssocket.obj: tlssocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-tlssocket.obj -MD -MP -MF $(DEPDIR)/libengine_a-tlssocket.Tpo -c -o libengine_a-tlssocket.obj `if test -f 'tlssocket.cpp'; then $(CYGPATH_W) 'tlssocket.cpp'; else $(CYGPATH_W) '$(srcdir)/tlssocket.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-tlssocket.obj -MD -MP -MF $(DEPDIR)/libengine_a-tlssocket.Tpo -c -o libengine_a-tlssocket.obj `if test -f 'tlssocket.cpp'; then $(CYGPATH_W) 'tlssocket.cpp'; else $(CYGPATH_W) '$(srcdir)/tlssocket.cpp'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-tlssocket.Tpo $(DEPDIR)/libengine_a-tlssocket.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tlssocket.cpp' object='libengine_a-tlssocket.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-tlssocket.obj `if test -f 'tlssocket.cpp'; then $(CYGPATH_W) 'tlssocket.cpp'; else $(CYGPATH_W) '$(srcdir)/tlssocket.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-tlssocket.obj `if test -f 'tlssocket.cpp'; then $(CYGPATH_W) 'tlssocket.cpp'; else $(CYGPATH_W) '$(srcdir)/tlssocket.cpp'; fi` + +libengine_a-tlssocket_impl.o: tlssocket_impl.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-tlssocket_impl.o -MD -MP -MF $(DEPDIR)/libengine_a-tlssocket_impl.Tpo -c -o libengine_a-tlssocket_impl.o `test -f 'tlssocket_impl.cpp' || echo '$(srcdir)/'`tlssocket_impl.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-tlssocket_impl.Tpo $(DEPDIR)/libengine_a-tlssocket_impl.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tlssocket_impl.cpp' object='libengine_a-tlssocket_impl.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-tlssocket_impl.o `test -f 'tlssocket_impl.cpp' || echo '$(srcdir)/'`tlssocket_impl.cpp + +libengine_a-tlssocket_impl.obj: tlssocket_impl.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-tlssocket_impl.obj -MD -MP -MF $(DEPDIR)/libengine_a-tlssocket_impl.Tpo -c -o libengine_a-tlssocket_impl.obj `if test -f 'tlssocket_impl.cpp'; then $(CYGPATH_W) 'tlssocket_impl.cpp'; else $(CYGPATH_W) '$(srcdir)/tlssocket_impl.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-tlssocket_impl.Tpo $(DEPDIR)/libengine_a-tlssocket_impl.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tlssocket_impl.cpp' object='libengine_a-tlssocket_impl.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-tlssocket_impl.obj `if test -f 'tlssocket_impl.cpp'; then $(CYGPATH_W) 'tlssocket_impl.cpp'; else $(CYGPATH_W) '$(srcdir)/tlssocket_impl.cpp'; fi` -libengine_a-transfersocket.o: transfersocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-transfersocket.o -MD -MP -MF $(DEPDIR)/libengine_a-transfersocket.Tpo -c -o libengine_a-transfersocket.o `test -f 'transfersocket.cpp' || echo '$(srcdir)/'`transfersocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-transfersocket.Tpo $(DEPDIR)/libengine_a-transfersocket.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='transfersocket.cpp' object='libengine_a-transfersocket.o' libtool=no @AMDEPBACKSLASH@ +libengine_a-xmlutils.o: xmlutils.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-xmlutils.o -MD -MP -MF $(DEPDIR)/libengine_a-xmlutils.Tpo -c -o libengine_a-xmlutils.o `test -f 'xmlutils.cpp' || echo '$(srcdir)/'`xmlutils.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-xmlutils.Tpo $(DEPDIR)/libengine_a-xmlutils.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xmlutils.cpp' object='libengine_a-xmlutils.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-transfersocket.o `test -f 'transfersocket.cpp' || echo '$(srcdir)/'`transfersocket.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-xmlutils.o `test -f 'xmlutils.cpp' || echo '$(srcdir)/'`xmlutils.cpp -libengine_a-transfersocket.obj: transfersocket.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-transfersocket.obj -MD -MP -MF $(DEPDIR)/libengine_a-transfersocket.Tpo -c -o libengine_a-transfersocket.obj `if test -f 'transfersocket.cpp'; then $(CYGPATH_W) 'transfersocket.cpp'; else $(CYGPATH_W) '$(srcdir)/transfersocket.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-transfersocket.Tpo $(DEPDIR)/libengine_a-transfersocket.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='transfersocket.cpp' object='libengine_a-transfersocket.obj' libtool=no @AMDEPBACKSLASH@ +libengine_a-xmlutils.obj: xmlutils.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-xmlutils.obj -MD -MP -MF $(DEPDIR)/libengine_a-xmlutils.Tpo -c -o libengine_a-xmlutils.obj `if test -f 'xmlutils.cpp'; then $(CYGPATH_W) 'xmlutils.cpp'; else $(CYGPATH_W) '$(srcdir)/xmlutils.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-xmlutils.Tpo $(DEPDIR)/libengine_a-xmlutils.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xmlutils.cpp' object='libengine_a-xmlutils.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-transfersocket.obj `if test -f 'transfersocket.cpp'; then $(CYGPATH_W) 'transfersocket.cpp'; else $(CYGPATH_W) '$(srcdir)/transfersocket.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-xmlutils.obj `if test -f 'xmlutils.cpp'; then $(CYGPATH_W) 'xmlutils.cpp'; else $(CYGPATH_W) '$(srcdir)/xmlutils.cpp'; fi` + +storj/libengine_a-connect.o: storj/connect.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-connect.o -MD -MP -MF storj/$(DEPDIR)/libengine_a-connect.Tpo -c -o storj/libengine_a-connect.o `test -f 'storj/connect.cpp' || echo '$(srcdir)/'`storj/connect.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-connect.Tpo storj/$(DEPDIR)/libengine_a-connect.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/connect.cpp' object='storj/libengine_a-connect.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-connect.o `test -f 'storj/connect.cpp' || echo '$(srcdir)/'`storj/connect.cpp + +storj/libengine_a-connect.obj: storj/connect.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-connect.obj -MD -MP -MF storj/$(DEPDIR)/libengine_a-connect.Tpo -c -o storj/libengine_a-connect.obj `if test -f 'storj/connect.cpp'; then $(CYGPATH_W) 'storj/connect.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/connect.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-connect.Tpo storj/$(DEPDIR)/libengine_a-connect.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/connect.cpp' object='storj/libengine_a-connect.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-connect.obj `if test -f 'storj/connect.cpp'; then $(CYGPATH_W) 'storj/connect.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/connect.cpp'; fi` + +storj/libengine_a-delete.o: storj/delete.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-delete.o -MD -MP -MF storj/$(DEPDIR)/libengine_a-delete.Tpo -c -o storj/libengine_a-delete.o `test -f 'storj/delete.cpp' || echo '$(srcdir)/'`storj/delete.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-delete.Tpo storj/$(DEPDIR)/libengine_a-delete.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/delete.cpp' object='storj/libengine_a-delete.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-delete.o `test -f 'storj/delete.cpp' || echo '$(srcdir)/'`storj/delete.cpp + +storj/libengine_a-delete.obj: storj/delete.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-delete.obj -MD -MP -MF storj/$(DEPDIR)/libengine_a-delete.Tpo -c -o storj/libengine_a-delete.obj `if test -f 'storj/delete.cpp'; then $(CYGPATH_W) 'storj/delete.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/delete.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-delete.Tpo storj/$(DEPDIR)/libengine_a-delete.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/delete.cpp' object='storj/libengine_a-delete.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-delete.obj `if test -f 'storj/delete.cpp'; then $(CYGPATH_W) 'storj/delete.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/delete.cpp'; fi` + +storj/libengine_a-file_transfer.o: storj/file_transfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-file_transfer.o -MD -MP -MF storj/$(DEPDIR)/libengine_a-file_transfer.Tpo -c -o storj/libengine_a-file_transfer.o `test -f 'storj/file_transfer.cpp' || echo '$(srcdir)/'`storj/file_transfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-file_transfer.Tpo storj/$(DEPDIR)/libengine_a-file_transfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/file_transfer.cpp' object='storj/libengine_a-file_transfer.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-file_transfer.o `test -f 'storj/file_transfer.cpp' || echo '$(srcdir)/'`storj/file_transfer.cpp + +storj/libengine_a-file_transfer.obj: storj/file_transfer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-file_transfer.obj -MD -MP -MF storj/$(DEPDIR)/libengine_a-file_transfer.Tpo -c -o storj/libengine_a-file_transfer.obj `if test -f 'storj/file_transfer.cpp'; then $(CYGPATH_W) 'storj/file_transfer.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/file_transfer.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-file_transfer.Tpo storj/$(DEPDIR)/libengine_a-file_transfer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/file_transfer.cpp' object='storj/libengine_a-file_transfer.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-file_transfer.obj `if test -f 'storj/file_transfer.cpp'; then $(CYGPATH_W) 'storj/file_transfer.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/file_transfer.cpp'; fi` + +storj/libengine_a-input_thread.o: storj/input_thread.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-input_thread.o -MD -MP -MF storj/$(DEPDIR)/libengine_a-input_thread.Tpo -c -o storj/libengine_a-input_thread.o `test -f 'storj/input_thread.cpp' || echo '$(srcdir)/'`storj/input_thread.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-input_thread.Tpo storj/$(DEPDIR)/libengine_a-input_thread.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/input_thread.cpp' object='storj/libengine_a-input_thread.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-input_thread.o `test -f 'storj/input_thread.cpp' || echo '$(srcdir)/'`storj/input_thread.cpp + +storj/libengine_a-input_thread.obj: storj/input_thread.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-input_thread.obj -MD -MP -MF storj/$(DEPDIR)/libengine_a-input_thread.Tpo -c -o storj/libengine_a-input_thread.obj `if test -f 'storj/input_thread.cpp'; then $(CYGPATH_W) 'storj/input_thread.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/input_thread.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-input_thread.Tpo storj/$(DEPDIR)/libengine_a-input_thread.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/input_thread.cpp' object='storj/libengine_a-input_thread.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-input_thread.obj `if test -f 'storj/input_thread.cpp'; then $(CYGPATH_W) 'storj/input_thread.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/input_thread.cpp'; fi` + +storj/libengine_a-list.o: storj/list.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-list.o -MD -MP -MF storj/$(DEPDIR)/libengine_a-list.Tpo -c -o storj/libengine_a-list.o `test -f 'storj/list.cpp' || echo '$(srcdir)/'`storj/list.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-list.Tpo storj/$(DEPDIR)/libengine_a-list.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/list.cpp' object='storj/libengine_a-list.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-list.o `test -f 'storj/list.cpp' || echo '$(srcdir)/'`storj/list.cpp + +storj/libengine_a-list.obj: storj/list.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-list.obj -MD -MP -MF storj/$(DEPDIR)/libengine_a-list.Tpo -c -o storj/libengine_a-list.obj `if test -f 'storj/list.cpp'; then $(CYGPATH_W) 'storj/list.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/list.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-list.Tpo storj/$(DEPDIR)/libengine_a-list.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/list.cpp' object='storj/libengine_a-list.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-list.obj `if test -f 'storj/list.cpp'; then $(CYGPATH_W) 'storj/list.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/list.cpp'; fi` + +storj/libengine_a-mkd.o: storj/mkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-mkd.o -MD -MP -MF storj/$(DEPDIR)/libengine_a-mkd.Tpo -c -o storj/libengine_a-mkd.o `test -f 'storj/mkd.cpp' || echo '$(srcdir)/'`storj/mkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-mkd.Tpo storj/$(DEPDIR)/libengine_a-mkd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/mkd.cpp' object='storj/libengine_a-mkd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-mkd.o `test -f 'storj/mkd.cpp' || echo '$(srcdir)/'`storj/mkd.cpp + +storj/libengine_a-mkd.obj: storj/mkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-mkd.obj -MD -MP -MF storj/$(DEPDIR)/libengine_a-mkd.Tpo -c -o storj/libengine_a-mkd.obj `if test -f 'storj/mkd.cpp'; then $(CYGPATH_W) 'storj/mkd.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/mkd.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-mkd.Tpo storj/$(DEPDIR)/libengine_a-mkd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/mkd.cpp' object='storj/libengine_a-mkd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-mkd.obj `if test -f 'storj/mkd.cpp'; then $(CYGPATH_W) 'storj/mkd.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/mkd.cpp'; fi` + +storj/libengine_a-resolve.o: storj/resolve.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-resolve.o -MD -MP -MF storj/$(DEPDIR)/libengine_a-resolve.Tpo -c -o storj/libengine_a-resolve.o `test -f 'storj/resolve.cpp' || echo '$(srcdir)/'`storj/resolve.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-resolve.Tpo storj/$(DEPDIR)/libengine_a-resolve.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/resolve.cpp' object='storj/libengine_a-resolve.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-resolve.o `test -f 'storj/resolve.cpp' || echo '$(srcdir)/'`storj/resolve.cpp + +storj/libengine_a-resolve.obj: storj/resolve.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-resolve.obj -MD -MP -MF storj/$(DEPDIR)/libengine_a-resolve.Tpo -c -o storj/libengine_a-resolve.obj `if test -f 'storj/resolve.cpp'; then $(CYGPATH_W) 'storj/resolve.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/resolve.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-resolve.Tpo storj/$(DEPDIR)/libengine_a-resolve.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/resolve.cpp' object='storj/libengine_a-resolve.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-resolve.obj `if test -f 'storj/resolve.cpp'; then $(CYGPATH_W) 'storj/resolve.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/resolve.cpp'; fi` + +storj/libengine_a-rmd.o: storj/rmd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-rmd.o -MD -MP -MF storj/$(DEPDIR)/libengine_a-rmd.Tpo -c -o storj/libengine_a-rmd.o `test -f 'storj/rmd.cpp' || echo '$(srcdir)/'`storj/rmd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-rmd.Tpo storj/$(DEPDIR)/libengine_a-rmd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/rmd.cpp' object='storj/libengine_a-rmd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-rmd.o `test -f 'storj/rmd.cpp' || echo '$(srcdir)/'`storj/rmd.cpp + +storj/libengine_a-rmd.obj: storj/rmd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-rmd.obj -MD -MP -MF storj/$(DEPDIR)/libengine_a-rmd.Tpo -c -o storj/libengine_a-rmd.obj `if test -f 'storj/rmd.cpp'; then $(CYGPATH_W) 'storj/rmd.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/rmd.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-rmd.Tpo storj/$(DEPDIR)/libengine_a-rmd.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/rmd.cpp' object='storj/libengine_a-rmd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-rmd.obj `if test -f 'storj/rmd.cpp'; then $(CYGPATH_W) 'storj/rmd.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/rmd.cpp'; fi` + +storj/libengine_a-storjcontrolsocket.o: storj/storjcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-storjcontrolsocket.o -MD -MP -MF storj/$(DEPDIR)/libengine_a-storjcontrolsocket.Tpo -c -o storj/libengine_a-storjcontrolsocket.o `test -f 'storj/storjcontrolsocket.cpp' || echo '$(srcdir)/'`storj/storjcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-storjcontrolsocket.Tpo storj/$(DEPDIR)/libengine_a-storjcontrolsocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/storjcontrolsocket.cpp' object='storj/libengine_a-storjcontrolsocket.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-storjcontrolsocket.o `test -f 'storj/storjcontrolsocket.cpp' || echo '$(srcdir)/'`storj/storjcontrolsocket.cpp + +storj/libengine_a-storjcontrolsocket.obj: storj/storjcontrolsocket.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT storj/libengine_a-storjcontrolsocket.obj -MD -MP -MF storj/$(DEPDIR)/libengine_a-storjcontrolsocket.Tpo -c -o storj/libengine_a-storjcontrolsocket.obj `if test -f 'storj/storjcontrolsocket.cpp'; then $(CYGPATH_W) 'storj/storjcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/storjcontrolsocket.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) storj/$(DEPDIR)/libengine_a-storjcontrolsocket.Tpo storj/$(DEPDIR)/libengine_a-storjcontrolsocket.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj/storjcontrolsocket.cpp' object='storj/libengine_a-storjcontrolsocket.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o storj/libengine_a-storjcontrolsocket.obj `if test -f 'storj/storjcontrolsocket.cpp'; then $(CYGPATH_W) 'storj/storjcontrolsocket.cpp'; else $(CYGPATH_W) '$(srcdir)/storj/storjcontrolsocket.cpp'; fi` mostlyclean-libtool: -rm -f *.lo @@ -1094,6 +1826,14 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f ftp/$(DEPDIR)/$(am__dirstamp) + -rm -f ftp/$(am__dirstamp) + -rm -f http/$(DEPDIR)/$(am__dirstamp) + -rm -f http/$(am__dirstamp) + -rm -f sftp/$(DEPDIR)/$(am__dirstamp) + -rm -f sftp/$(am__dirstamp) + -rm -f storj/$(DEPDIR)/$(am__dirstamp) + -rm -f storj/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1105,7 +1845,7 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -rf ./$(DEPDIR) ftp/$(DEPDIR) http/$(DEPDIR) sftp/$(DEPDIR) storj/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1151,7 +1891,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -rf ./$(DEPDIR) ftp/$(DEPDIR) http/$(DEPDIR) sftp/$(DEPDIR) storj/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1186,12 +1926,14 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + @ENABLE_PRECOMP_TRUE@include ./$(DEPDIR)/filezilla.Po @ENABLE_PRECOMP_TRUE@filezilla.h.gch: filezilla.h -@ENABLE_PRECOMP_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@ENABLE_PRECOMP_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@ENABLE_PRECOMP_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/filezilla.Tpo" -c -o $@ $<; \ +@ENABLE_PRECOMP_TRUE@ then mv -f "$(DEPDIR)/filezilla.Tpo" "$(DEPDIR)/filezilla.Po"; else rm -f "$(DEPDIR)/filezilla.Tpo"; exit 1; fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru filezilla-3.15.0.2/src/engine/misc.cpp filezilla-3.33.0/src/engine/misc.cpp --- filezilla-3.15.0.2/src/engine/misc.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/misc.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,85 +1,143 @@ #include -#include -#include -#include -#include +#include "tlssocket.h" +#include #include -#include "tlssocket.h" +#include +#include +#include -wxString GetDependencyVersion(dependency::type d) +#include + +std::wstring GetDependencyVersion(lib_dependency d) { switch (d) { - case dependency::wxwidgets: - return wxVERSION_NUM_DOT_STRING_T; - case dependency::gnutls: - { - const char* v = gnutls_check_version(0); - if (!v || !*v) - return _T("unknown"); - - return wxString(v, wxConvLibc); - } - case dependency::sqlite: - return wxString::FromUTF8(sqlite3_libversion()); + case lib_dependency::gnutls: + return CTlsSocket::GetGnutlsVersion(); default: - return wxString(); + return std::wstring(); } } -wxString GetDependencyName(dependency::type d) +std::wstring GetDependencyName(lib_dependency d) { switch (d) { - case dependency::wxwidgets: - return _T("wxWidgets"); - case dependency::gnutls: - return _T("GnuTLS"); - case dependency::sqlite: - return _T("SQLite"); + case lib_dependency::gnutls: + return L"GnuTLS"; default: - return wxString(); + return std::wstring(); } } -wxString ListTlsCiphers(const wxString& priority) +std::string ListTlsCiphers(std::string const& priority) { return CTlsSocket::ListTlsCiphers(priority); } -#ifdef __WXMSW__ -bool IsAtLeast(int major, int minor = 0) +#if FZ_WINDOWS +DWORD GetSystemErrorCode() { - OSVERSIONINFOEX vi = { 0 }; - vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - vi.dwMajorVersion = major; - vi.dwMinorVersion = minor; - vi.dwPlatformId = VER_PLATFORM_WIN32_NT; - - DWORDLONG mask = 0; - VER_SET_CONDITION(mask, VER_MAJORVERSION, VER_GREATER_EQUAL); - VER_SET_CONDITION(mask, VER_MINORVERSION, VER_GREATER_EQUAL); - VER_SET_CONDITION(mask, VER_PLATFORMID, VER_EQUAL); - return VerifyVersionInfo(&vi, VER_MAJORVERSION | VER_MINORVERSION | VER_PLATFORMID, mask) != 0; + return GetLastError(); } -#endif -bool GetRealOsVersion(int& major, int& minor) +std::wstring GetSystemErrorDescription(DWORD err) { -#ifndef __WXMSW__ - return wxGetOsVersion(&major, &minor) != wxOS_UNKNOWN; + wchar_t* buf{}; + if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, nullptr, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), reinterpret_cast(&buf), 0, nullptr) || !buf) { + return fz::sprintf(_("Unknown error %u"), err); + } + std::wstring ret = buf; + LocalFree(buf); + + return ret; +} #else - major = 4; - minor = 0; - while (IsAtLeast(++major, minor)) - { - } - --major; - while (IsAtLeast(major, ++minor)) - { +int GetSystemErrorCode() +{ + return errno; +} + +namespace { +inline std::string ProcessStrerrorResult(int ret, char* buf, int err) +{ + // For XSI strerror_r + std::string s; + if (!ret) { + buf[999] = 0; + s = buf; + } + else { + s = fz::to_string(fz::sprintf(_("Unknown error %d"), err)); + } + return s; +} + +inline std::string ProcessStrerrorResult(char* ret, char*, int err) +{ + // For GNU strerror_r + std::string s; + if (ret) { + s = ret; + } + else { + s = fz::to_string(fz::sprintf(_("Unknown error %d"), err)); } - --minor; + return s; +} +} - return true; +std::string GetSystemErrorDescription(int err) +{ + char buf[1000]; + auto ret = strerror_r(err, buf, 1000); + return ProcessStrerrorResult(ret, buf, err); +} #endif + +namespace fz { + +namespace { +std::wstring default_translator(char const* const t) +{ + return fz::to_wstring(t); +} + +std::wstring default_translator_pf(char const* const singular, char const* const plural, int64_t n) +{ + return fz::to_wstring((n == 1) ? singular : plural); +} + +std::wstring(*translator)(char const* const) = default_translator; +std::wstring(*translator_pf)(char const* const singular, char const* const plural, int64_t n) = default_translator_pf; +} + +void set_translators( + std::wstring(*s)(char const* const t), + std::wstring(*pf)(char const* const singular, char const* const plural, int64_t n) +) +{ + translator = s ? s : default_translator; + translator_pf = pf ? pf : default_translator_pf; +} + +std::wstring translate(char const * const t) +{ + return translator(t); +} + +std::wstring translate(char const * const singular, char const * const plural, int64_t n) +{ + return translator_pf(singular, plural, n); +} + +std::wstring str_tolower(std::wstring const& source) +{ + std::wstring ret; + for (auto const& c : source) { + ret.push_back(std::towlower(c)); + } + return ret; +} + } diff -Nru filezilla-3.15.0.2/src/engine/msgbox.cpp filezilla-3.33.0/src/engine/msgbox.cpp --- filezilla-3.15.0.2/src/engine/msgbox.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/msgbox.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -#include - -#include "msgbox.h" - -namespace { -int openMessageBoxes = 0; -} - -bool IsShowingMessageBox() -{ - return openMessageBoxes != 0; -} - -int wxMessageBoxEx(const wxString& message, const wxString& caption - , long style, wxWindow *parent - , int x, int y) -{ - ++openMessageBoxes; - int ret = wxMessageBox(message, caption, style, parent, x, y); - --openMessageBoxes; - - return ret; -} diff -Nru filezilla-3.15.0.2/src/engine/notification.cpp filezilla-3.33.0/src/engine/notification.cpp --- filezilla-3.15.0.2/src/engine/notification.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/notification.cpp 2018-02-05 21:28:24.000000000 +0000 @@ -1,48 +1,23 @@ #include -wxDEFINE_EVENT(fzEVT_NOTIFICATION, wxFzEvent); - -wxFzEvent::wxFzEvent() - : wxEvent(wxID_ANY, fzEVT_NOTIFICATION) - , engine_() -{ -} - -wxFzEvent::wxFzEvent(CFileZillaEngine const* engine) - : wxEvent(wxID_ANY, fzEVT_NOTIFICATION) - , engine_(engine) -{ -} - -wxFzEvent::wxFzEvent(int id) - : wxEvent(id, fzEVT_NOTIFICATION) - , engine_() -{ -} - -wxEvent *wxFzEvent::Clone() const -{ - return new wxFzEvent(*this); -} - CDirectoryListingNotification::CDirectoryListingNotification(const CServerPath& path, const bool modified /*=false*/, const bool failed /*=false*/) : m_modified(modified), m_failed(failed), m_path(path) { } -enum RequestId CFileExistsNotification::GetRequestID() const +RequestId CFileExistsNotification::GetRequestID() const { return reqId_fileexists; } -CInteractiveLoginNotification::CInteractiveLoginNotification(type t, const wxString& challenge, bool repeated) +CInteractiveLoginNotification::CInteractiveLoginNotification(type t, std::wstring const& challenge, bool repeated) : m_challenge(challenge) , m_type(t) , m_repeated(repeated) { } -enum RequestId CInteractiveLoginNotification::GetRequestID() const +RequestId CInteractiveLoginNotification::GetRequestID() const { return reqId_interactiveLogin; } @@ -62,17 +37,20 @@ return status_; } -CHostKeyNotification::CHostKeyNotification(wxString host, int port, wxString fingerprint, bool changed /*=false*/) - : m_host(host), m_port(port), m_fingerprint(fingerprint), m_changed(changed) +CHostKeyNotification::CHostKeyNotification(std::wstring const& host, int port, CSftpEncryptionDetails const& details, bool changed) + : CSftpEncryptionDetails(details) + , m_host(host) + , m_port(port) + , m_changed(changed) { } -enum RequestId CHostKeyNotification::GetRequestID() const +RequestId CHostKeyNotification::GetRequestID() const { return m_changed ? reqId_hostkeyChanged : reqId_hostkey; } -wxString CHostKeyNotification::GetHost() const +std::wstring CHostKeyNotification::GetHost() const { return m_host; } @@ -82,11 +60,6 @@ return m_port; } -wxString CHostKeyNotification::GetFingerprint() const -{ - return m_fingerprint; -} - CDataNotification::CDataNotification(char* pData, int len) : m_pData(pData), m_len(len) { @@ -101,24 +74,24 @@ { len = m_len; char* pData = m_pData; - m_pData = 0; + m_pData = nullptr; return pData; } CCertificate::CCertificate( - unsigned char const* rawData, unsigned int len, + std::vector const& rawData, fz::datetime const& activationTime, fz::datetime const& expirationTime, - wxString const& serial, - wxString const& pkalgoname, unsigned int bits, - wxString const& signalgoname, - wxString const& fingerprint_sha256, - wxString const& fingerprint_sha1, - wxString const& issuer, - wxString const& subject, - std::vector const& altSubjectNames) + std::wstring const& serial, + std::wstring const& pkalgoname, unsigned int bits, + std::wstring const& signalgoname, + std::wstring const& fingerprint_sha256, + std::wstring const& fingerprint_sha1, + std::wstring const& issuer, + std::wstring const& subject, + std::vector const& altSubjectNames) : m_activationTime(activationTime) , m_expirationTime(expirationTime) - , m_len(len) + , m_rawData(rawData) , m_serial(serial) , m_pkalgoname(pkalgoname) , m_pkalgobits(bits) @@ -129,104 +102,50 @@ , m_subject(subject) , m_altSubjectNames(altSubjectNames) { - wxASSERT(len); - if (len) { - m_rawData = new unsigned char[len]; - memcpy(m_rawData, rawData, len); - } -} - -CCertificate::CCertificate(const CCertificate &op) -{ - if (op.m_rawData) { - wxASSERT(op.m_len); - if (op.m_len) { - m_rawData = new unsigned char[op.m_len]; - memcpy(m_rawData, op.m_rawData, op.m_len); - } - else - m_rawData = 0; - } - else - m_rawData = 0; - m_len = op.m_len; - - m_activationTime = op.m_activationTime; - m_expirationTime = op.m_expirationTime; - - m_serial = op.m_serial; - m_pkalgoname = op.m_pkalgoname; - m_pkalgobits = op.m_pkalgobits; - - m_signalgoname = op.m_signalgoname; - - m_fingerprint_sha256 = op.m_fingerprint_sha256; - m_fingerprint_sha1 = op.m_fingerprint_sha1; - - m_issuer = op.m_issuer; - m_subject = op.m_subject; - m_altSubjectNames = op.m_altSubjectNames; -} - -CCertificate::~CCertificate() -{ - delete [] m_rawData; } -CCertificate& CCertificate::operator=(const CCertificate &op) +CCertificate::CCertificate( + std::vector && rawData, + fz::datetime const& activationTime, fz::datetime const& expirationTime, + std::wstring const& serial, + std::wstring const& pkalgoname, unsigned int bits, + std::wstring const& signalgoname, + std::wstring const& fingerprint_sha256, + std::wstring const& fingerprint_sha1, + std::wstring const& issuer, + std::wstring const& subject, + std::vector && altSubjectNames) + : m_activationTime(activationTime) + , m_expirationTime(expirationTime) + , m_rawData(rawData) + , m_serial(serial) + , m_pkalgoname(pkalgoname) + , m_pkalgobits(bits) + , m_signalgoname(signalgoname) + , m_fingerprint_sha256(fingerprint_sha256) + , m_fingerprint_sha1(fingerprint_sha1) + , m_issuer(issuer) + , m_subject(subject) + , m_altSubjectNames(altSubjectNames) { - if (&op == this) - return *this; - - delete [] m_rawData; - if (op.m_rawData) { - wxASSERT(op.m_len); - if (op.m_len) { - m_rawData = new unsigned char[op.m_len]; - memcpy(m_rawData, op.m_rawData, op.m_len); - } - else - m_rawData = 0; - } - else - m_rawData = 0; - m_len = op.m_len; - - m_activationTime = op.m_activationTime; - m_expirationTime = op.m_expirationTime; - - m_serial = op.m_serial; - m_pkalgoname = op.m_pkalgoname; - m_pkalgobits = op.m_pkalgobits; - - m_signalgoname = op.m_signalgoname; - - m_fingerprint_sha256 = op.m_fingerprint_sha256; - m_fingerprint_sha1 = op.m_fingerprint_sha1; - - m_issuer = op.m_issuer; - m_subject = op.m_subject; - m_altSubjectNames = op.m_altSubjectNames; - - return *this; } -CCertificateNotification::CCertificateNotification(const wxString& host, unsigned int port, - const wxString& protocol, - const wxString& keyExchange, - const wxString& sessionCipher, - const wxString& sessionMac, +CCertificateNotification::CCertificateNotification(std::wstring const& host, unsigned int port, + std::wstring const& protocol, + std::wstring const& keyExchange, + std::wstring const& sessionCipher, + std::wstring const& sessionMac, int algorithmWarnings, - const std::vector &certificates) - : m_protocol(protocol) + std::vector && certificates, + bool hostnameMismatch) + : m_host(host) + , m_port(port) + , m_protocol(protocol) , m_keyExchange(keyExchange) + , m_sessionCipher(sessionCipher) + , m_sessionMac(sessionMac) , m_algorithmWarnings(algorithmWarnings) + , m_certificates(certificates) + , hostnameMismatch_(hostnameMismatch) { - m_host = host; - m_port = port; - - m_sessionCipher = sessionCipher; - m_sessionMac = sessionMac; - - m_certificates = certificates; } diff -Nru filezilla-3.15.0.2/src/engine/option_change_event_handler.cpp filezilla-3.33.0/src/engine/option_change_event_handler.cpp --- filezilla-3.15.0.2/src/engine/option_change_event_handler.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/option_change_event_handler.cpp 2017-02-21 22:01:27.000000000 +0000 @@ -6,10 +6,6 @@ std::vector COptionChangeEventHandler::m_handlers; std::size_t COptionChangeEventHandler::notify_index_ = 0; -COptionChangeEventHandler::COptionChangeEventHandler() -{ -} - COptionChangeEventHandler::~COptionChangeEventHandler() { UnregisterAllOptions(); @@ -27,8 +23,9 @@ void COptionChangeEventHandler::RegisterOption(int option) { - if (option < 0 ) + if (option < 0) { return; + } if (m_handled_options.none()) { m_handlers.push_back(this); diff -Nru filezilla-3.15.0.2/src/engine/pathcache.cpp filezilla-3.33.0/src/engine/pathcache.cpp --- filezilla-3.15.0.2/src/engine/pathcache.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/pathcache.cpp 2017-09-29 10:24:50.000000000 +0000 @@ -1,6 +1,8 @@ #include #include "pathcache.h" +#include + CPathCache::CPathCache() { } @@ -9,15 +11,16 @@ { } -void CPathCache::Store(CServer const& server, CServerPath const& target, CServerPath const& source, wxString const& subdir) +void CPathCache::Store(CServer const& server, CServerPath const& target, CServerPath const& source, std::wstring const& subdir) { fz::scoped_lock lock(mutex_); - wxASSERT(!target.empty() && !source.empty()); + assert(!target.empty() && !source.empty()); tCacheIterator iter = m_cache.find(server); - if (iter == m_cache.cend()) + if (iter == m_cache.cend()) { iter = m_cache.emplace(std::make_pair(server, tServerCache())).first; + } tServerCache &serverCache = iter->second; CSourcePath sourcePath; @@ -28,33 +31,39 @@ serverCache[sourcePath] = target; } -CServerPath CPathCache::Lookup(CServer const& server, CServerPath const& source, wxString const& subdir) +CServerPath CPathCache::Lookup(CServer const& server, CServerPath const& source, std::wstring const& subdir) { fz::scoped_lock lock(mutex_); const tCacheConstIterator iter = m_cache.find(server); - if (iter == m_cache.end()) + if (iter == m_cache.end()) { return CServerPath(); + } CServerPath result = Lookup(iter->second, source, subdir); - if (result.empty()) +#ifndef NDEBUG + if (result.empty()) { m_misses++; - else + } + else { m_hits++; + } +#endif return result; } -CServerPath CPathCache::Lookup(tServerCache const& serverCache, CServerPath const& source, wxString const& subdir) +CServerPath CPathCache::Lookup(tServerCache const& serverCache, CServerPath const& source, std::wstring const& subdir) { CSourcePath sourcePath; sourcePath.source = source; sourcePath.subdir = subdir; tServerCacheConstIterator serverIter = serverCache.find(sourcePath); - if (serverIter == serverCache.end()) + if (serverIter == serverCache.end()) { return CServerPath(); + } return serverIter->second; } @@ -64,13 +73,14 @@ fz::scoped_lock lock(mutex_); tCacheIterator iter = m_cache.find(server); - if (iter == m_cache.end()) + if (iter == m_cache.end()) { return; + } m_cache.erase(iter); } -void CPathCache::InvalidatePath(CServer const& server, CServerPath const& path, wxString const& subdir) +void CPathCache::InvalidatePath(CServer const& server, CServerPath const& path, std::wstring const& subdir) { fz::scoped_lock lock(mutex_); @@ -80,7 +90,7 @@ } } -void CPathCache::InvalidatePath(tServerCache & serverCache, CServerPath const& path, wxString const& subdir) +void CPathCache::InvalidatePath(tServerCache & serverCache, CServerPath const& path, std::wstring const& subdir) { CSourcePath sourcePath; @@ -96,19 +106,23 @@ if (target.empty() && !subdir.empty()) { target = path; - if (!target.AddSegment(subdir)) + if (!target.AddSegment(subdir)) { return; + } } if (!target.empty()) { // Unfortunately O(n), don't know of a faster way. for (serverIter = serverCache.begin(); serverIter != serverCache.end(); ) { - if (serverIter->second == target || target.IsParentOf(serverIter->second, false)) + if (serverIter->second == target || target.IsParentOf(serverIter->second, false)) { serverCache.erase(serverIter++); - else if (serverIter->first.source == target || target.IsParentOf(serverIter->first.source, false)) + } + else if (serverIter->first.source == target || target.IsParentOf(serverIter->first.source, false)) { serverCache.erase(serverIter++); - else + } + else { ++serverIter; + } } } } diff -Nru filezilla-3.15.0.2/src/engine/pathcache.h filezilla-3.33.0/src/engine/pathcache.h --- filezilla-3.15.0.2/src/engine/pathcache.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/pathcache.h 2017-09-29 10:24:50.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __PATHCACHE_H__ -#define __PATHCACHE_H__ +#ifndef FILEZILLA_ENGINE_PATHCACHE_HEADER +#define FILEZILLA_ENGINE_PATHCACHE_HEADER #include @@ -13,15 +13,15 @@ CPathCache& operator=(CPathCache const&) = delete; // The source argument should be a canonicalized path already if subdir is non-empty - void Store(CServer const& server, CServerPath const& target, CServerPath const& source, wxString const& subdir = wxString()); + void Store(CServer const& server, CServerPath const& target, CServerPath const& source, std::wstring const& subdir = std::wstring()); // The source argument should be a canonicalized path already if subdir is non-empty happen - CServerPath Lookup(CServer const& server, CServerPath const& source, wxString const& subdir = wxString()); + CServerPath Lookup(CServer const& server, CServerPath const& source, std::wstring const& subdir = std::wstring()); void InvalidateServer(CServer const& server); // Invalidate path - void InvalidatePath(CServer const& server, CServerPath const& path, wxString const& subdir = wxString()); + void InvalidatePath(CServer const& server, CServerPath const& path, std::wstring const& subdir = std::wstring()); void Clear(); @@ -30,7 +30,7 @@ { public: CServerPath source; - wxString subdir; + std::wstring subdir; bool operator<(CSourcePath const& op) const { @@ -48,12 +48,13 @@ typedef tCache::iterator tCacheIterator; typedef tCache::const_iterator tCacheConstIterator; - CServerPath Lookup(tServerCache const& serverCache, CServerPath const& source, wxString const& subdir); - void InvalidatePath(tServerCache & serverCache, CServerPath const& path, wxString const& subdir = wxString()); + CServerPath Lookup(tServerCache const& serverCache, CServerPath const& source, std::wstring const& subdir); + void InvalidatePath(tServerCache & serverCache, CServerPath const& path, std::wstring const& subdir = std::wstring()); +#ifndef NDEBUG int m_hits{}; int m_misses{}; - +#endif }; -#endif //__PATHCACHE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/engine/proxy.cpp filezilla-3.33.0/src/engine/proxy.cpp --- filezilla-3.15.0.2/src/engine/proxy.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/proxy.cpp 2018-04-25 03:30:06.000000000 +0000 @@ -1,4 +1,3 @@ -#include #include #ifdef FZ_WINDOWS #include @@ -6,6 +5,7 @@ #include #else #include + #include #endif #include #include "engineprivate.h" @@ -14,9 +14,9 @@ #include -#ifndef FZ_WINDOWS -#include -#endif +#include + +#include enum handshake_state { @@ -31,89 +31,55 @@ socks4_handshake }; -CProxySocket::CProxySocket(fz::event_handler* pEvtHandler, CSocket* pSocket, CControlSocket* pOwner) +CProxySocket::CProxySocket(fz::event_handler* pEvtHandler, fz::socket* pSocket, CControlSocket* pOwner) : fz::event_handler(pOwner->event_loop_) , CBackend(pEvtHandler) - , m_pSocket(pSocket) + , socket_(pSocket) , m_pOwner(pOwner) { - m_pSocket->SetEventHandler(this); + socket_->set_event_handler(this); } CProxySocket::~CProxySocket() { remove_handler(); - if (m_pSocket) - m_pSocket->SetEventHandler(0); - delete [] m_pSendBuffer; - delete [] m_pRecvBuffer; -} - -namespace { -wxString base64encode(const wxString& str) -{ - // Code shamelessly taken from wxWidgets and adopted to encode UTF-8 strings. - // wxWidget's http class encodes string from arbitrary encoding into base64, - // could as well encode /dev/random - static char const*const base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - wxString buf; - - const wxWX2MBbuf utf8 = str.mb_str(wxConvUTF8); - const char* from = utf8; - - size_t len = strlen(from); - while (len >= 3) { // encode full blocks first - buf << wxString::Format(wxT("%c%c"), base64[(from[0] >> 2) & 0x3f], base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)]); - buf << wxString::Format(wxT("%c%c"), base64[((from[1] << 2) & 0x3c) | ((from[2] >> 6) & 0x3)], base64[from[2] & 0x3f]); - from += 3; - len -= 3; - } - if (len > 0) { // pad the remaining characters - buf << wxString::Format(wxT("%c"), base64[(from[0] >> 2) & 0x3f]); - if (len == 1) { - buf << wxString::Format(wxT("%c="), base64[(from[0] << 4) & 0x30]); - } - else { - buf << wxString::Format(wxT("%c%c"), base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)], base64[(from[1] << 2) & 0x3c]); - } - buf << wxString::Format(wxT("=")); + if (socket_) { + socket_->set_event_handler(nullptr); } - - return buf; -} + delete [] m_pRecvBuffer; } -wxString CProxySocket::Name(ProxyType t) +std::wstring CProxySocket::Name(ProxyType t) { switch (t) { case HTTP: - return _T("HTTP"); + return L"HTTP"; case SOCKS4: - return _T("SOCKS4"); + return L"SOCKS4"; case SOCKS5: - return _T("SOCKS5"); + return L"SOCKS5"; default: return _("unknown"); } } -int CProxySocket::Handshake(CProxySocket::ProxyType type, const wxString& host, unsigned int port, const wxString& user, const wxString& pass) +int CProxySocket::Handshake(CProxySocket::ProxyType type, std::wstring const& host, unsigned int port, std::wstring const& user, std::wstring const& pass) { - if (type == CProxySocket::unknown || host.empty() || port < 1 || port > 65535) + if (type == CProxySocket::unknown || host.empty() || port < 1 || port > 65535) { return EINVAL; + } - if (m_proxyState != noconn) + if (m_proxyState != noconn) { return EALREADY; + } - const wxWX2MBbuf host_raw = host.mb_str(wxConvUTF8); - - if (type != HTTP && type != SOCKS5 && type != SOCKS4) + if (type != HTTP && type != SOCKS5 && type != SOCKS4) { return EPROTONOSUPPORT; + } - m_user = user; - m_pass = pass; + m_user = fz::to_utf8(user); + m_pass = fz::to_utf8(pass); m_host = host; m_port = port; m_proxyType = type; @@ -123,49 +89,45 @@ if (type == HTTP) { m_handshakeState = http_wait; - wxWX2MBbuf challenge{}; - int challenge_len{}; + std::string auth; if (!user.empty()) { - challenge = base64encode(user + _T(":") + pass).mb_str(wxConvUTF8); - challenge_len = strlen(challenge); + auth = "Proxy-Authorization: Basic "; + auth += fz::base64_encode(m_user + ":" + m_pass); + auth += "\r\n"; } // Bit oversized, but be on the safe side - m_pSendBuffer = new char[70 + strlen(host_raw) * 2 + 2*5 + challenge_len + 23]; - - if (!challenge || !challenge_len) { - m_sendBufferLen = sprintf(m_pSendBuffer, "CONNECT %s:%u HTTP/1.1\r\nHost: %s:%u\r\nUser-Agent: FileZilla\r\n\r\n", - (const char*)host_raw, port, - (const char*)host_raw, port); - } - else { - m_sendBufferLen = sprintf(m_pSendBuffer, "CONNECT %s:%u HTTP/1.1\r\nHost: %s:%u\r\nProxy-Authorization: Basic %s\r\nUser-Agent: FileZilla\r\n\r\n", - (const char*)host_raw, port, - (const char*)host_raw, port, - (const char*)challenge); - } + std::string host_raw = fz::to_utf8(host); + sendBuffer_.append(fz::sprintf("CONNECT %s:%u HTTP/1.1\r\nHost: %s:%u\r\n%sUser-Agent: %s\r\n\r\n", + host_raw, port, + host_raw, port, + auth, + fz::replaced_substrings(PACKAGE_STRING, " ", "/"))); m_pRecvBuffer = new char[4096]; m_recvBufferLen = 4096; m_recvBufferPos = 0; } else if (type == SOCKS4) { - wxString ip = m_host; - if (!fz::get_ipv6_long_form(m_host.ToStdWstring()).empty()) { + std::string ip; + auto const addressType = fz::get_address_type(m_host); + if (addressType == fz::address_type::ipv6) { m_pOwner->LogMessage(MessageType::Error, _("IPv6 addresses are not supported with SOCKS4 proxy")); return EINVAL; } - - if (fz::get_address_type(m_host.ToStdWstring()) == fz::address_type::unknown) { + else if (addressType == fz::address_type::ipv4) { + ip = fz::to_string(m_host); + } + else { addrinfo hints{}; hints.ai_family = AF_INET; hints.ai_socktype = SOCK_STREAM; addrinfo * result{}; - int res = getaddrinfo(host.ToStdString().c_str(), 0, &hints, &result); + int res = getaddrinfo(fz::to_string(m_host).c_str(), nullptr, &hints, &result); if (!res && result) { if (result->ai_family == AF_INET) { - ip = CSocket::AddressToString(result->ai_addr, result->ai_addrlen, false); + ip = fz::socket::address_to_string(result->ai_addr, result->ai_addrlen, false); } freeaddrinfo(result); } @@ -178,43 +140,47 @@ m_pOwner->LogMessage(MessageType::Status, _("SOCKS4 proxy will connect to: %s"), ip); - m_pSendBuffer = new char[9]; - m_pSendBuffer[0] = 4; // Protocol version - m_pSendBuffer[1] = 1; // Stream mode - m_pSendBuffer[2] = (m_port >> 8) & 0xFF; // Port in network order - m_pSendBuffer[3] = m_port & 0xFF; - unsigned char *buf = (unsigned char*)m_pSendBuffer + 4; + unsigned char* out = sendBuffer_.get(9); + out[0] = 4; // Protocol version + out[1] = 1; // Stream mode + out[2] = (m_port >> 8) & 0xFF; // Port in network order + out[3] = m_port & 0xFF; int i = 0; - memset(buf, 0, 4); - for (const wxChar* p = ip.c_str(); *p && i < 4; p++) { - const wxChar& c = *p; + memset(out + 4, 0, 5); + for (auto p = ip.c_str(); *p && i < 4; ++p) { + auto const& c = *p; if (c == '.') { - i++; + ++i; continue; } - buf[i] *= 10; - buf[i] += c - '0'; + out[i + 4] *= 10; + out[i + 4] += c - '0'; } - m_pSendBuffer[8] = 0; - m_sendBufferLen = 9; + sendBuffer_.add(9); + m_pRecvBuffer = new char[8]; m_recvBufferLen = 8; m_recvBufferPos = 0; m_handshakeState = socks4_handshake; } else { - m_pSendBuffer = new char[4]; - m_pSendBuffer[0] = 5; // Protocol version + if (m_user.size() > 255 || m_pass.size() > 255) { + m_pOwner->LogMessage(MessageType::Status, _("SOCKS5 does not support usernames or passwords longer than 255 characters.")); + return EINVAL; + } + + unsigned char* out = sendBuffer_.get(4); + out[0] = 5; // Protocol version if (!user.empty()) { - m_pSendBuffer[1] = 2; // # auth methods supported - m_pSendBuffer[2] = 0; // Method: No auth - m_pSendBuffer[3] = 2; // Method: Username and password - m_sendBufferLen = 4; + out[1] = 2; // # auth methods supported + out[2] = 0; // Method: No auth + out[3] = 2; // Method: Username and password + sendBuffer_.add(4); } else { - m_pSendBuffer[1] = 1; // # auth methods supported - m_pSendBuffer[2] = 0; // Method: No auth - m_sendBufferLen = 3; + out[1] = 1; // # auth methods supported + out[2] = 0; // Method: No auth + sendBuffer_.add(3); } m_pRecvBuffer = new char[1024]; @@ -229,60 +195,64 @@ void CProxySocket::operator()(fz::event_base const& ev) { - fz::dispatch(ev, this, + fz::dispatch(ev, this, &CProxySocket::OnSocketEvent, &CProxySocket::OnHostAddress); } -void CProxySocket::OnSocketEvent(CSocketEventSource*, SocketEventType t, int error) +void CProxySocket::OnSocketEvent(socket_event_source*, fz::socket_event_flag t, int error) { switch (t) { - case SocketEventType::connection_next: - if (error) - m_pOwner->LogMessage(MessageType::Status, _("Connection attempt failed with \"%s\", trying next address."), CSocket::GetErrorDescription(error)); + case fz::socket_event_flag::connection_next: + if (error) { + m_pOwner->LogMessage(MessageType::Status, _("Connection attempt failed with \"%s\", trying next address."), fz::socket::error_description(error)); + } break; - case SocketEventType::connection: + case fz::socket_event_flag::connection: if (error) { - if (m_proxyState == handshake) + if (m_proxyState == handshake) { m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::connection, error); + } + m_pEvtHandler->send_event(this, fz::socket_event_flag::connection, error); } else { m_pOwner->LogMessage(MessageType::Status, _("Connection with proxy established, performing handshake...")); } break; - case SocketEventType::read: + case fz::socket_event_flag::read: OnReceive(); break; - case SocketEventType::write: + case fz::socket_event_flag::write: OnSend(); break; - case SocketEventType::close: + case fz::socket_event_flag::close: OnReceive(); break; } } -void CProxySocket::OnHostAddress(CSocketEventSource*, wxString const& address) +void CProxySocket::OnHostAddress(socket_event_source*, std::string const& address) { m_pOwner->LogMessage(MessageType::Status, _("Connecting to %s..."), address); } void CProxySocket::Detach() { - if (!m_pSocket) + if (!socket_) { return; + } - m_pSocket->SetEventHandler(0); - m_pSocket = 0; + socket_->set_event_handler(nullptr); + socket_ = nullptr; } void CProxySocket::OnReceive() { m_can_read = true; - if (m_proxyState != handshake) + if (m_proxyState != handshake) { return; + } switch (m_handshakeState) { @@ -290,31 +260,34 @@ for (;;) { int error; int do_read = m_recvBufferLen - m_recvBufferPos - 1; - char* end = 0; + char* end = nullptr; for (int i = 0; i < 2; ++i) { int read; - if (!i) - read = m_pSocket->Peek(m_pRecvBuffer + m_recvBufferPos, do_read, error); - else - read = m_pSocket->Read(m_pRecvBuffer + m_recvBufferPos, do_read, error); + if (!i) { + read = socket_->peek(m_pRecvBuffer + m_recvBufferPos, do_read, error); + } + else { + read = socket_->read(m_pRecvBuffer + m_recvBufferPos, do_read, error); + } if (read == -1) { if (error != EAGAIN) { m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, error); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, error); } - else + else { m_can_read = false; + } return; } if (!read) { m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } - if (m_pSendBuffer) { + if (sendBuffer_) { m_proxyState = noconn; - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Incoming data before request fully sent")); - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pOwner->LogMessage(MessageType::Debug_Warning, L"Incoming data before request fully sent"); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } @@ -325,73 +298,77 @@ if (!end) { if (m_recvBufferPos + read + 1 == m_recvBufferLen) { m_proxyState = noconn; - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Incoming header too large")); - m_pEvtHandler->send_event(this, SocketEventType::close, ENOMEM); + m_pOwner->LogMessage(MessageType::Debug_Warning, L"Incoming header too large"); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ENOMEM); return; } do_read = read; } - else + else { do_read = end - m_pRecvBuffer + 4 - m_recvBufferPos; + } } else { if (read != do_read) { m_proxyState = noconn; - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Could not read what got peeked")); - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pOwner->LogMessage(MessageType::Debug_Warning, "Could not read what got peeked"); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } m_recvBufferPos += read; } } - if (!end) + if (!end) { continue; + } end = strchr(m_pRecvBuffer, '\r'); // Never fails as old value of end exists and starts with CR, we just look for an earlier case. *end = 0; - wxString reply(m_pRecvBuffer, wxConvUTF8); + std::wstring const reply = fz::to_wstring_from_utf8(m_pRecvBuffer); m_pOwner->LogMessage(MessageType::Response, _("Proxy reply: %s"), reply); - if (reply.Left(10) != _T("HTTP/1.1 2") && reply.Left(10) != _T("HTTP/1.0 2")) { + if (reply.substr(0, 10) != L"HTTP/1.1 2" && reply.substr(0, 10) != L"HTTP/1.0 2") { m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNRESET); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNRESET); return; } m_proxyState = conn; - m_pEvtHandler->send_event(this, SocketEventType::connection, 0); + m_pEvtHandler->send_event(this, fz::socket_event_flag::connection, 0); return; } case socks4_handshake: while (m_recvBufferLen && m_can_read && m_proxyState == handshake) { int read_error; - int read = m_pSocket->Read(m_pRecvBuffer + m_recvBufferPos, m_recvBufferLen, read_error); + int read = socket_->read(m_pRecvBuffer + m_recvBufferPos, m_recvBufferLen, read_error); if (read == -1) { if (read_error != EAGAIN) { m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, read_error); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, read_error); } - else + else { m_can_read = false; + } return; } if (!read) { m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } m_recvBufferPos += read; m_recvBufferLen -= read; - if (m_recvBufferLen) + if (m_recvBufferLen) { continue; + } m_recvBufferPos = 0; if (m_pRecvBuffer[1] != 0x5A) { - wxString error; + std::wstring error; switch (m_pRecvBuffer[1]) { case 0x5B: error = _("Request rejected or failed"); @@ -403,16 +380,16 @@ error = _("Request failed - client's identd could not confirm the user ID string"); break; default: - error.Printf(_("Unassigned error code %d"), (int)(unsigned char) m_pRecvBuffer[1]); + error = fz::sprintf(_("Unassigned error code %d"), (int)(unsigned char)m_pRecvBuffer[1]); break; } m_pOwner->LogMessage(MessageType::Error, _("Proxy request failed: %s"), error); m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } m_proxyState = conn; - m_pEvtHandler->send_event(this, SocketEventType::connection, 0); + m_pEvtHandler->send_event(this, fz::socket_event_flag::connection, 0); } return; case socks5_method: @@ -420,30 +397,33 @@ case socks5_request: case socks5_request_addrtype: case socks5_request_address: - if (m_pSendBuffer) + if (sendBuffer_) { return; + } while (m_recvBufferLen && m_can_read && m_proxyState == handshake) { int error; - int read = m_pSocket->Read(m_pRecvBuffer + m_recvBufferPos, m_recvBufferLen, error); + int read = socket_->read(m_pRecvBuffer + m_recvBufferPos, m_recvBufferLen, error); if (read == -1) { if (error != EAGAIN) { m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, error); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, error); } - else + else { m_can_read = false; + } return; } if (!read) { m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } m_recvBufferPos += read; m_recvBufferLen -= read; - if (m_recvBufferLen) + if (m_recvBufferLen) { continue; + } m_recvBufferPos = 0; @@ -453,7 +433,7 @@ if (m_pRecvBuffer[0] != 5) { m_pOwner->LogMessage(MessageType::Error, _("Unknown SOCKS protocol version: %d"), (int)m_pRecvBuffer[0]); m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } break; @@ -461,7 +441,7 @@ if (m_pRecvBuffer[0] != 1) { m_pOwner->LogMessage(MessageType::Error, _("Unknown protocol version of SOCKS Username/Password Authentication subnegotiation: %d"), (int)m_pRecvBuffer[0]); m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } break; @@ -485,24 +465,23 @@ default: m_pOwner->LogMessage(MessageType::Error, _("No supported SOCKS5 auth method")); m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } } break; case socks5_auth: - if (m_pRecvBuffer[1] != 0) - { + if (m_pRecvBuffer[1] != 0) { m_pOwner->LogMessage(MessageType::Error, _("Proxy authentication failed")); m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } m_handshakeState = socks5_request; break; case socks5_request: if (m_pRecvBuffer[1]) { - wxString errorMsg; + std::wstring errorMsg; switch (m_pRecvBuffer[1]) { case 1: @@ -530,13 +509,13 @@ errorMsg = _("Address type not supported"); break; default: - errorMsg.Printf(_("Unassigned error code %d"), (int)(unsigned char)m_pRecvBuffer[1]); + errorMsg = fz::sprintf(_("Unassigned error code %d"), (int)(unsigned char)m_pRecvBuffer[1]); break; } m_pOwner->LogMessage(MessageType::Error, _("Proxy request failed. Reply from proxy: %s"), errorMsg); m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } m_handshakeState = socks5_request_addrtype; @@ -560,7 +539,7 @@ default: m_pOwner->LogMessage(MessageType::Error, _("Proxy request failed: Unknown address type in CONNECT reply")); m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } m_handshakeState = socks5_request_address; @@ -569,11 +548,11 @@ { // We're done m_proxyState = conn; - m_pEvtHandler->send_event(this, SocketEventType::connection, 0); + m_pEvtHandler->send_event(this, fz::socket_event_flag::connection, 0); return; } default: - wxFAIL; + assert(false); break; } @@ -581,73 +560,68 @@ { case socks5_auth: { - const wxWX2MBbuf user = m_user.mb_str(wxConvUTF8); - const wxWX2MBbuf pass = m_pass.mb_str(wxConvUTF8); - - const int userlen = strlen(user); - const int passlen = strlen(pass); - m_sendBufferLen = userlen + passlen + 3; - m_pSendBuffer = new char[m_sendBufferLen]; - m_pSendBuffer[0] = 1; - m_pSendBuffer[1] = userlen; - memcpy(m_pSendBuffer + 2, (const char*)user, userlen); - m_pSendBuffer[userlen + 2] = passlen; - memcpy(m_pSendBuffer + userlen + 3, (const char*)pass, passlen); + auto ulen = static_cast(std::min(m_user.size(), size_t(255))); + auto plen = static_cast(std::min(m_pass.size(), size_t(255))); + unsigned char* out = sendBuffer_.get(ulen + plen + 3); + out[0] = 1; + out[1] = ulen; + memcpy(out + 2, m_user.c_str(), ulen); + out[ulen + 2] = plen; + memcpy(out + ulen + 3, m_pass.c_str(), plen); + sendBuffer_.add(ulen + plen + 3); m_recvBufferLen = 2; } break; case socks5_request: { - const wxWX2MBbuf host = m_host.mb_str(wxConvUTF8); - const int hostlen = strlen(host); - int addrlen = wxMax(hostlen, 16); - - m_pSendBuffer = new char[7 + addrlen]; - m_pSendBuffer[0] = 5; - m_pSendBuffer[1] = 1; // CONNECT - m_pSendBuffer[2] = 0; // Reserved + std::string host = fz::to_utf8(m_host); + size_t addrlen = std::max(host.size(), size_t(16)); - auto type = fz::get_address_type(m_host.ToStdWstring()); + unsigned char * out = sendBuffer_.get(7 + addrlen); + out[0] = 5; + out[1] = 1; // CONNECT + out[2] = 0; // Reserved + + auto const type = fz::get_address_type(host); if (type == fz::address_type::ipv6) { - auto ipv6 = fz::get_ipv6_long_form(m_host.ToStdWstring()); + auto ipv6 = fz::get_ipv6_long_form(host); addrlen = 16; - for (int i = 0; i < 16; ++i) { - m_pSendBuffer[4 + i] = (fz::hex_char_to_int(ipv6[i * 2 + i / 2]) << 4) + fz::hex_char_to_int(ipv6[i * 2 + 1 + i / 2]); + for (auto i = 0; i < 16; ++i) { + out[4 + i] = (fz::hex_char_to_int(ipv6[i * 2 + i / 2]) << 4) + fz::hex_char_to_int(ipv6[i * 2 + 1 + i / 2]); } - m_pSendBuffer[3] = 4; // IPv6 + out[3] = 4; // IPv6 } else if (type == fz::address_type::ipv4) { - unsigned char *buf = (unsigned char*)m_pSendBuffer + 4; int i = 0; - memset(buf, 0, 4); - for (const wxChar* p = m_host.c_str(); *p && i < 4; ++p) { - const wxChar& c = *p; - if (c == '.') - { - i++; + memset(out + 4, 0, 4); + for (auto p = host.c_str(); *p && i < 4; ++p) { + auto const& c = *p; + if (c == '.') { + ++i; continue; } - buf[i] *= 10; - buf[i] += c - '0'; + out[i + 4] *= 10; + out[i + 4] += c - '0'; } addrlen = 4; - m_pSendBuffer[3] = 1; // IPv4 + out[3] = 1; // IPv4 } else { - m_pSendBuffer[3] = 3; // Domain name - m_pSendBuffer[4] = hostlen; - memcpy(m_pSendBuffer + 5, (const char*)host, hostlen); - addrlen = hostlen + 1; - } + out[3] = 3; // Domain name + auto hlen = static_cast(std::min(host.size(), size_t(255))); + out[4] = hlen; + memcpy(out + 5, host.c_str(), hlen); + addrlen = hlen + 1; + } - m_pSendBuffer[addrlen + 4] = (m_port >> 8) & 0xFF; // Port in network order - m_pSendBuffer[addrlen + 5] = m_port & 0xFF; + out[addrlen + 4] = (m_port >> 8) & 0xFF; // Port in network order + out[addrlen + 5] = m_port & 0xFF; - m_sendBufferLen = 6 + addrlen; + sendBuffer_.add(6 + addrlen); m_recvBufferLen = 2; } break; @@ -656,17 +630,18 @@ // Nothing to send, we simply need to wait for more data break; default: - wxFAIL; + assert(false); break; } - if (m_pSendBuffer && m_can_write) + if (sendBuffer_ && m_can_write) { OnSend(); + } } break; default: m_proxyState = noconn; - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Unhandled handshake state %d"), m_handshakeState); - m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); + m_pOwner->LogMessage(MessageType::Debug_Warning, L"Unhandled handshake state %d", m_handshakeState); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, ECONNABORTED); return; } } @@ -674,33 +649,32 @@ void CProxySocket::OnSend() { m_can_write = true; - if (m_proxyState != handshake || !m_pSendBuffer) + if (m_proxyState != handshake || !sendBuffer_) { return; + } for (;;) { int error; - int written = m_pSocket->Write(m_pSendBuffer, m_sendBufferLen, error); + int written = socket_->write(sendBuffer_.get(), sendBuffer_.size(), error); if (written == -1) { if (error != EAGAIN) { m_proxyState = noconn; - m_pEvtHandler->send_event(this, SocketEventType::close, error); + m_pEvtHandler->send_event(this, fz::socket_event_flag::close, error); } - else + else { m_can_write = false; + } return; } - if (written == m_sendBufferLen) { - delete [] m_pSendBuffer; - m_pSendBuffer = 0; - - if (m_can_read) + sendBuffer_.consume(written); + if (sendBuffer_.empty()) { + if (m_can_read) { OnReceive(); + } return; } - memmove(m_pSendBuffer, m_pSendBuffer + written, m_sendBufferLen - written); - m_sendBufferLen -= written; } } @@ -721,3 +695,13 @@ error = EAGAIN; return -1; } + +std::wstring CProxySocket::GetUser() const +{ + return fz::to_wstring_from_utf8(m_user); +} + +std::wstring CProxySocket::GetPass() const +{ + return fz::to_wstring_from_utf8(m_pass); +} diff -Nru filezilla-3.15.0.2/src/engine/proxy.h filezilla-3.33.0/src/engine/proxy.h --- filezilla-3.15.0.2/src/engine/proxy.h 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/proxy.h 2018-04-25 03:30:06.000000000 +0000 @@ -1,14 +1,16 @@ -#ifndef __PROXY_H__ -#define __PROXY_H__ +#ifndef FILEZILLA_ENGINE_PROXY_HEADER +#define FILEZILLA_ENGINE_PROXY_HEADER #include "backend.h" #include "socket.h" +#include + class CControlSocket; class CProxySocket final : protected fz::event_handler, public CBackend { public: - CProxySocket(event_handler* pEvtHandler, CSocket* pSocket, CControlSocket* pOwner); + CProxySocket(event_handler* pEvtHandler, fz::socket* pSocket, CControlSocket* pOwner); virtual ~CProxySocket(); enum ProxyState { @@ -25,50 +27,49 @@ proxytype_count }; - static wxString Name(ProxyType t); + static std::wstring Name(ProxyType t); - int Handshake(ProxyType type, const wxString& host, unsigned int port, const wxString& user, const wxString& pass); + int Handshake(ProxyType type, std::wstring const& host, unsigned int port, std::wstring const& user, std::wstring const& pass); ProxyState GetState() const { return m_proxyState; } // Past the initial handshake, proxies are transparent. // Class users should detach socket and use a normal socket backend instead. - virtual void OnRateAvailable(CRateLimiter::rate_direction) {}; - virtual int Read(void *buffer, unsigned int size, int& error); - virtual int Peek(void *buffer, unsigned int size, int& error); - virtual int Write(const void *buffer, unsigned int size, int& error); + virtual void OnRateAvailable(CRateLimiter::rate_direction) override {}; + virtual int Read(void *buffer, unsigned int size, int& error) override; + virtual int Peek(void *buffer, unsigned int size, int& error) override; + virtual int Write(const void *buffer, unsigned int size, int& error) override; void Detach(); - bool Detached() const { return m_pSocket == 0; } + bool Detached() const { return socket_ == nullptr; } ProxyType GetProxyType() const { return m_proxyType; } - wxString GetUser() const { return m_user; } - wxString GetPass() const { return m_pass; } + std::wstring GetUser() const; + std::wstring GetPass() const; protected: - CSocket* m_pSocket; + fz::socket* socket_; CControlSocket* m_pOwner; ProxyType m_proxyType{unknown}; - wxString m_host; + std::wstring m_host; int m_port{}; - wxString m_user; - wxString m_pass; + std::string m_user; + std::string m_pass; ProxyState m_proxyState{noconn}; int m_handshakeState{}; - char* m_pSendBuffer{}; - int m_sendBufferLen{}; + fz::buffer sendBuffer_; char* m_pRecvBuffer{}; int m_recvBufferPos{}; int m_recvBufferLen{}; - virtual void operator()(fz::event_base const& ev); - void OnSocketEvent(CSocketEventSource* source, SocketEventType t, int error); - void OnHostAddress(CSocketEventSource* source, wxString const& address); + virtual void operator()(fz::event_base const& ev) override; + void OnSocketEvent(socket_event_source* source, fz::socket_event_flag t, int error); + void OnHostAddress(socket_event_source* source, std::string const& address); void OnReceive(); void OnSend(); @@ -77,4 +78,4 @@ bool m_can_read{}; }; -#endif //__PROXY_H__ +#endif diff -Nru filezilla-3.15.0.2/src/engine/ratelimiter.cpp filezilla-3.33.0/src/engine/ratelimiter.cpp --- filezilla-3.15.0.2/src/engine/ratelimiter.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/ratelimiter.cpp 2017-09-22 08:42:14.000000000 +0000 @@ -3,6 +3,8 @@ #include +#include + static int const tickDelay = 250; CRateLimiter::CRateLimiter(fz::event_loop& loop, COptionsBase& options) @@ -57,8 +59,9 @@ pObject->m_bytesAvailable[i] = tokens; - if (!m_timer) + if (!m_timer) { m_timer = add_timer(fz::duration::from_milliseconds(tickDelay), false); + } } else { pObject->m_bytesAvailable[i] = -1; @@ -79,8 +82,9 @@ int64_t limit = GetLimit(static_cast(i)); int64_t tokens = limit / (1000 / tickDelay); tokens /= m_objectList.size(); - if ((*iter)->m_bytesAvailable[i] < tokens) + if ((*iter)->m_bytesAvailable[i] < tokens) { m_tokenDebt[i] += tokens - (*iter)->m_bytesAvailable[i]; + } } m_objectList.erase(iter); break; @@ -106,14 +110,16 @@ for (int i = 0; i < 2; ++i) { m_tokenDebt[i] = 0; - if (m_objectList.empty()) + if (m_objectList.empty()) { continue; + } if (limits[i] == 0) { for (auto iter = m_objectList.begin(); iter != m_objectList.end(); ++iter) { (*iter)->m_bytesAvailable[i] = -1; - if ((*iter)->m_waiting[i]) + if ((*iter)->m_waiting[i]) { m_wakeupList[i].push_back(*iter); + } } continue; } @@ -124,16 +130,17 @@ // Get amount of tokens for each object int64_t tokensPerObject = tokens / m_objectList.size(); - if (tokensPerObject == 0) + if (tokensPerObject == 0) { tokensPerObject = 1; + } tokens = 0; // This list will hold all objects which didn't reach maxTokens - std::list unsaturatedObjects; + std::vector unsaturatedObjects; for (auto iter = m_objectList.begin(); iter != m_objectList.end(); ++iter) { if ((*iter)->m_bytesAvailable[i] == -1) { - wxASSERT(!(*iter)->m_waiting[i]); + assert(!(*iter)->m_waiting[i]); (*iter)->m_bytesAvailable[i] = tokensPerObject; unsaturatedObjects.push_back(*iter); } @@ -144,11 +151,13 @@ tokens += (*iter)->m_bytesAvailable[i] - maxTokens; (*iter)->m_bytesAvailable[i] = maxTokens; } - else + else { unsaturatedObjects.push_back(*iter); + } - if ((*iter)->m_waiting[i]) + if ((*iter)->m_waiting[i]) { m_wakeupList[i].push_back(*iter); + } } } @@ -156,11 +165,12 @@ // assign to the unsaturated sources while (tokens != 0 && !unsaturatedObjects.empty()) { tokensPerObject = tokens / unsaturatedObjects.size(); - if (tokensPerObject == 0) + if (tokensPerObject == 0) { break; + } tokens = 0; - std::list objects; + std::vector objects; objects.swap(unsaturatedObjects); for (auto iter = objects.begin(); iter != objects.end(); ++iter) { @@ -169,8 +179,9 @@ tokens += (*iter)->m_bytesAvailable[i] - maxTokens; (*iter)->m_bytesAvailable[i] = maxTokens; } - else + else { unsaturatedObjects.push_back(*iter); + } } } } @@ -191,10 +202,11 @@ while (!m_wakeupList[i].empty()) { CRateLimiterObject* pObject = m_wakeupList[i].front(); m_wakeupList[i].pop_front(); - if (!pObject->m_waiting[i]) + if (!pObject->m_waiting[i]) { continue; + } - wxASSERT(pObject->m_bytesAvailable[i] != 0); + assert(pObject->m_bytesAvailable[i] != 0); pObject->m_waiting[i] = false; l.unlock(); // Do not hold while executing callback @@ -235,8 +247,9 @@ { fz::scoped_lock lock(sync_); if (GetLimit(inbound) > 0 || GetLimit(outbound) > 0) { - if (!m_timer) + if (!m_timer) { m_timer = add_timer(fz::duration::from_milliseconds(tickDelay), false); + } } } @@ -255,16 +268,18 @@ void CRateLimiterObject::UpdateUsage(CRateLimiter::rate_direction direction, int usedBytes) { - wxASSERT(usedBytes <= m_bytesAvailable[direction]); - if (usedBytes > m_bytesAvailable[direction]) + assert(usedBytes <= m_bytesAvailable[direction]); + if (usedBytes > m_bytesAvailable[direction]) { m_bytesAvailable[direction] = 0; - else + } + else { m_bytesAvailable[direction] -= usedBytes; + } } void CRateLimiterObject::Wait(CRateLimiter::rate_direction direction) { - wxASSERT(m_bytesAvailable[direction] == 0); + assert(m_bytesAvailable[direction] == 0); m_waiting[direction] = true; } diff -Nru filezilla-3.15.0.2/src/engine/ratelimiter.h filezilla-3.33.0/src/engine/ratelimiter.h --- filezilla-3.15.0.2/src/engine/ratelimiter.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/ratelimiter.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __RATELIMITER_H__ -#define __RATELIMITER_H__ +#ifndef FILEZILLA_ENGINE_RATELIMITER_HEADER +#define FILEZILLA_ENGINE_RATELIMITER_HEADER #include @@ -45,7 +45,7 @@ void OnTimer(fz::timer_id id); void OnRateChanged(); - fz::mutex sync_; + fz::mutex sync_{false}; }; struct ratelimit_changed_event_type{}; @@ -57,7 +57,7 @@ public: CRateLimiterObject(); - virtual ~CRateLimiterObject() {} + virtual ~CRateLimiterObject() = default; int64_t GetAvailableBytes(CRateLimiter::rate_direction direction) const { return m_bytesAvailable[direction]; } bool IsWaiting(CRateLimiter::rate_direction direction) const; @@ -73,4 +73,4 @@ int64_t m_bytesAvailable[2]; }; -#endif //__RATELIMITER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/engine/rtt.cpp filezilla-3.33.0/src/engine/rtt.cpp --- filezilla-3.15.0.2/src/engine/rtt.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/rtt.cpp 2017-02-27 04:30:03.000000000 +0000 @@ -1,15 +1,12 @@ #include #include "rtt.h" -CLatencyMeasurement::CLatencyMeasurement() -{ -} - int CLatencyMeasurement::GetLatency() const { fz::scoped_lock lock(m_sync); - if (!m_measurements) + if (!m_measurements) { return -1; + } return static_cast(m_summed_latency / m_measurements); } @@ -17,8 +14,9 @@ bool CLatencyMeasurement::Start() { fz::scoped_lock lock(m_sync); - if (m_start) + if (m_start) { return false; + } m_start = fz::monotonic_clock::now(); @@ -28,14 +26,16 @@ bool CLatencyMeasurement::Stop() { fz::scoped_lock lock(m_sync); - if (!m_start) + if (!m_start) { return false; + } fz::duration const diff = fz::monotonic_clock::now() - m_start; m_start = fz::monotonic_clock(); - if (diff.get_milliseconds() < 0) + if (diff.get_milliseconds() < 0) { return false; + } m_summed_latency += diff.get_milliseconds(); ++m_measurements; @@ -50,8 +50,3 @@ m_measurements = 0; m_start = fz::monotonic_clock(); } - -void CLatencyMeasurement::cb() -{ - Stop(); -} diff -Nru filezilla-3.15.0.2/src/engine/rtt.h filezilla-3.33.0/src/engine/rtt.h --- filezilla-3.15.0.2/src/engine/rtt.h 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/rtt.h 2017-04-18 12:42:56.000000000 +0000 @@ -1,18 +1,17 @@ #ifndef FZ_RTT_HEADER #define FZ_RTT_HEADER -#include "socket.h" +#include +#include -class CLatencyMeasurement final : public CCallback +class CLatencyMeasurement final { public: - CLatencyMeasurement(); - // Returns false if measurement cannot be started due to // a measurement already running bool Start(); - // Returns fals if there was no measurement running + // Returns false if there was no measurement running bool Stop(); // In ms, returns -1 if no data is available. @@ -20,15 +19,13 @@ void Reset(); - virtual void cb(); - protected: fz::monotonic_clock m_start; int64_t m_summed_latency{}; int m_measurements{}; - mutable fz::mutex m_sync; + mutable fz::mutex m_sync{false}; }; #endif diff -Nru filezilla-3.15.0.2/src/engine/servercapabilities.cpp filezilla-3.33.0/src/engine/servercapabilities.cpp --- filezilla-3.15.0.2/src/engine/servercapabilities.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/servercapabilities.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,34 +1,40 @@ #include #include "servercapabilities.h" +#include + std::map CServerCapabilities::m_serverMap; -enum capabilities CCapabilities::GetCapability(enum capabilityNames name, wxString* pOption /*=0*/) const +capabilities CCapabilities::GetCapability(capabilityNames name, std::wstring* pOption) const { - const std::map::const_iterator iter = m_capabilityMap.find(name); - if (iter == m_capabilityMap.end()) + const std::map::const_iterator iter = m_capabilityMap.find(name); + if (iter == m_capabilityMap.end()) { return unknown; + } - if (iter->second.cap == yes && pOption) + if (iter->second.cap == yes && pOption) { *pOption = iter->second.option; + } return iter->second.cap; } -enum capabilities CCapabilities::GetCapability(enum capabilityNames name, int* pOption) const +capabilities CCapabilities::GetCapability(capabilityNames name, int* pOption) const { - const std::map::const_iterator iter = m_capabilityMap.find(name); - if (iter == m_capabilityMap.end()) + const std::map::const_iterator iter = m_capabilityMap.find(name); + if (iter == m_capabilityMap.end()) { return unknown; + } - if (iter->second.cap == yes && pOption) + if (iter->second.cap == yes && pOption) { *pOption = iter->second.number; + } return iter->second.cap; } -void CCapabilities::SetCapability(enum capabilityNames name, enum capabilities cap, const wxString& option) +void CCapabilities::SetCapability(capabilityNames name, capabilities cap, std::wstring const& option) { - wxASSERT(cap == yes || option.empty()); - struct CCapabilities::t_cap tcap; + assert(cap == yes || option.empty()); + CCapabilities::t_cap tcap; tcap.cap = cap; tcap.option = option; tcap.number = 0; @@ -36,39 +42,40 @@ m_capabilityMap[name] = tcap; } -void CCapabilities::SetCapability(enum capabilityNames name, enum capabilities cap, int option) +void CCapabilities::SetCapability(capabilityNames name, capabilities cap, int option) { - wxASSERT(cap == yes || option == 0); - struct CCapabilities::t_cap tcap; + assert(cap == yes || option == 0); + CCapabilities::t_cap tcap; tcap.cap = cap; tcap.number = option; m_capabilityMap[name] = tcap; } -enum capabilities CServerCapabilities::GetCapability(const CServer& server, enum capabilityNames name, wxString* pOption /*=0*/) +capabilities CServerCapabilities::GetCapability(const CServer& server, capabilityNames name, std::wstring* pOption) { const std::map::const_iterator iter = m_serverMap.find(server); - if (iter == m_serverMap.end()) + if (iter == m_serverMap.end()) { return unknown; + } return iter->second.GetCapability(name, pOption); } -enum capabilities CServerCapabilities::GetCapability(const CServer& server, enum capabilityNames name, int* pOption) +capabilities CServerCapabilities::GetCapability(const CServer& server, capabilityNames name, int* pOption) { const std::map::const_iterator iter = m_serverMap.find(server); - if (iter == m_serverMap.end()) + if (iter == m_serverMap.end()) { return unknown; + } return iter->second.GetCapability(name, pOption); } -void CServerCapabilities::SetCapability(const CServer& server, enum capabilityNames name, enum capabilities cap, const wxString& option /*=_T("")*/) +void CServerCapabilities::SetCapability(const CServer& server, capabilityNames name, capabilities cap, std::wstring const& option) { const std::map::iterator iter = m_serverMap.find(server); - if (iter == m_serverMap.end()) - { + if (iter == m_serverMap.end()) { CCapabilities capabilities; capabilities.SetCapability(name, cap, option); m_serverMap[server] = capabilities; @@ -78,11 +85,10 @@ iter->second.SetCapability(name, cap, option); } -void CServerCapabilities::SetCapability(const CServer& server, enum capabilityNames name, enum capabilities cap, int option) +void CServerCapabilities::SetCapability(const CServer& server, capabilityNames name, capabilities cap, int option) { const std::map::iterator iter = m_serverMap.find(server); - if (iter == m_serverMap.end()) - { + if (iter == m_serverMap.end()) { CCapabilities capabilities; capabilities.SetCapability(name, cap, option); m_serverMap[server] = capabilities; diff -Nru filezilla-3.15.0.2/src/engine/servercapabilities.h filezilla-3.33.0/src/engine/servercapabilities.h --- filezilla-3.15.0.2/src/engine/servercapabilities.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/servercapabilities.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __SERVERCAPABILITIES_H__ -#define __SERVERCAPABILITIES_H__ +#ifndef FILEZILLA_ENGINE_SERVERCAPABILITIES_HEADER +#define FILEZILLA_ENGINE_SERVERCAPABILITIES_HEADER enum capabilities { @@ -47,33 +47,33 @@ class CCapabilities final { public: - enum capabilities GetCapability(enum capabilityNames name, wxString* pOption = 0) const; - enum capabilities GetCapability(enum capabilityNames name, int* pOption) const; - void SetCapability(enum capabilityNames name, enum capabilities cap, const wxString& option = _T("")); - void SetCapability(enum capabilityNames name, enum capabilities cap, int option); + capabilities GetCapability(capabilityNames name, std::wstring* pOption = nullptr) const; + capabilities GetCapability(capabilityNames name, int* pOption) const; + void SetCapability(capabilityNames name, capabilities cap, std::wstring const& option = std::wstring()); + void SetCapability(capabilityNames name, capabilities cap, int option); protected: struct t_cap { - enum capabilities cap; - wxString option; + capabilities cap; + std::wstring option; int number; }; - std::map m_capabilityMap; + std::map m_capabilityMap; }; class CServerCapabilities final { public: // If return value isn't 'yes', pOptions remains unchanged - static enum capabilities GetCapability(const CServer& server, enum capabilityNames name, wxString* pOption = 0); - static enum capabilities GetCapability(const CServer& server, enum capabilityNames name, int* option); + static capabilities GetCapability(const CServer& server, capabilityNames name, std::wstring* pOption = nullptr); + static capabilities GetCapability(const CServer& server, capabilityNames name, int* option); - static void SetCapability(const CServer& server, enum capabilityNames name, enum capabilities cap, const wxString& option = _T("")); - static void SetCapability(const CServer& server, enum capabilityNames name, enum capabilities cap, int option); + static void SetCapability(const CServer& server, capabilityNames name, capabilities cap, std::wstring const& option = std::wstring()); + static void SetCapability(const CServer& server, capabilityNames name, capabilities cap, int option); protected: static std::map m_serverMap; }; -#endif //__SERVERCAPABILITIES_H__ +#endif diff -Nru filezilla-3.15.0.2/src/engine/server.cpp filezilla-3.33.0/src/engine/server.cpp --- filezilla-3.15.0.2/src/engine/server.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/server.cpp 2018-05-06 03:30:05.000000000 +0000 @@ -1,232 +1,73 @@ #include +#include +#include + +#include + struct t_protocolInfo { - const ServerProtocol protocol; - const wxString prefix; + ServerProtocol const protocol; + std::wstring const prefix; bool alwaysShowPrefix; unsigned int defaultPort; - const bool translateable; - const wxChar* const name; - bool supportsPostlogin; + bool const translateable; + char const* const name; + std::wstring const alternative_prefix; }; static const t_protocolInfo protocolInfos[] = { - { FTP, _T("ftp"), false, 21, true, TRANSLATE_T("FTP - File Transfer Protocol with optional encryption"), true }, - { SFTP, _T("sftp"), true, 22, false, _T("SFTP - SSH File Transfer Protocol"), false }, - { HTTP, _T("http"), true, 80, false, _T("HTTP - Hypertext Transfer Protocol"), false }, - { HTTPS, _T("https"), true, 443, true, TRANSLATE_T("HTTPS - HTTP over TLS"), false }, - { FTPS, _T("ftps"), true, 990, true, TRANSLATE_T("FTPS - FTP over implicit TLS"), true }, - { FTPES, _T("ftpes"), true, 21, true, TRANSLATE_T("FTPES - FTP over explicit TLS"), true }, - { INSECURE_FTP, _T("ftp"), false, 21, true, TRANSLATE_T("FTP - Insecure File Transfer Protocol"), true }, - { UNKNOWN, _T(""), false, 21, false, _T(""), false } + { FTP, L"ftp", false, 21, true, fztranslate_mark("FTP - File Transfer Protocol with optional encryption"), L"" }, + { SFTP, L"sftp", true, 22, false, "SFTP - SSH File Transfer Protocol", L"" }, + { HTTP, L"http", true, 80, false, "HTTP - Hypertext Transfer Protocol", L"" }, + { HTTPS, L"https", true, 443, true, fztranslate_mark("HTTPS - HTTP over TLS"), L"" }, + { FTPS, L"ftps", true, 990, true, fztranslate_mark("FTPS - FTP over implicit TLS"), L"" }, + { FTPES, L"ftpes", true, 21, true, fztranslate_mark("FTPES - FTP over explicit TLS"), L"" }, + { INSECURE_FTP, L"ftp", false, 21, true, fztranslate_mark("FTP - Insecure File Transfer Protocol"), L"" }, + { S3, L"s3", true, 443, false, "S3 - Amazon Simple Storage Service", L"" }, + { STORJ, L"storj", true, 443, true, fztranslate_mark("Storj - Decentralized Cloud Storage"), L"" }, + { WEBDAV, L"webdav", true, 443, true, "WebDAV", L"https" }, + { AZURE_FILE, L"azfile", true, 443, false, "Microsoft Azure File Storage Service", L"https" }, + { AZURE_BLOB, L"azblob", true, 443, false, "Microsoft Azure Blob Storage Service", L"https" }, + { SWIFT, L"swift", true, 443, false, "OpenStack Swift", L"https" }, + { GOOGLE, L"google", true, 443, false, "Google Cloud Storage", L"https" }, + { UNKNOWN, L"", false, 21, false, "", L"" } }; -static const wxString typeNames[SERVERTYPE_MAX] = { - TRANSLATE_T("Default (Autodetect)"), - _T("Unix"), - _T("VMS"), - _T("DOS"), - _T("MVS, OS/390, z/OS"), - _T("VxWorks"), - _T("z/VM"), - _T("HP NonStop"), - TRANSLATE_T("DOS-like with virtual paths"), - _T("Cygwin") +static std::vector const defaultProtocols = { + FTP, + SFTP, + FTPS, + FTPES, + INSECURE_FTP, +#if ENABLE_STORJ + STORJ, +#endif +}; + +static char const* const typeNames[SERVERTYPE_MAX] = { + fztranslate_mark("Default (Autodetect)"), + "Unix", + "VMS", + "DOS with backslash separators", + "MVS, OS/390, z/OS", + "VxWorks", + "z/VM", + "HP NonStop", + fztranslate_mark("DOS-like with virtual paths"), + "Cygwin", + "DOS with forward-slash separators", }; static const t_protocolInfo& GetProtocolInfo(ServerProtocol protocol) { unsigned int i = 0; - for ( ; protocolInfos[i].protocol != UNKNOWN; ++i) - { - if (protocolInfos[i].protocol == protocol) + for ( ; protocolInfos[i].protocol != UNKNOWN; ++i) { + if (protocolInfos[i].protocol == protocol) { break; - } - return protocolInfos[i]; -} - -CServer::CServer() -{ - Initialize(); -} - -bool CServer::ParseUrl(wxString host, wxString port, wxString user, wxString pass, wxString &error, CServerPath &path) -{ - unsigned long nPort = 0; - if (!port.empty()) - { - port.Trim(false); - port.Trim(true); - if (port.size() > 5 || !port.ToULong(&nPort) || !nPort || nPort > 65535) - { - error = _("Invalid port given. The port has to be a value from 1 to 65535."); - error += _T("\n"); - error += _("You can leave the port field empty to use the default port."); - return false; - } - } - return ParseUrl(host, nPort, user, pass, error, path); -} - -bool CServer::ParseUrl(wxString host, unsigned int port, wxString user, wxString pass, wxString &error, CServerPath &path) -{ - m_type = DEFAULT; - - if (host.empty()) { - error = _("No host given, please enter a host."); - return false; - } - - int pos = host.Find(_T("://")); - if (pos != -1) { - wxString protocol = host.Left(pos).Lower(); - host = host.Mid(pos + 3); - if (protocol.Left(3) == _T("fz_")) - protocol = protocol.Mid(3); - m_protocol = GetProtocolFromPrefix(protocol.Lower()); - if (m_protocol == UNKNOWN) - { - // TODO: http:// once WebDAV is officially supported - error = _("Invalid protocol specified. Valid protocols are:\nftp:// for normal FTP with optional encryption,\nsftp:// for SSH file transfer protocol,\nftps:// for FTP over TLS (implicit) and\nftpes:// for FTP over TLS (explicit)."); - return false; - } - } - - pos = host.Find('@'); - if (pos != -1) { - // Check if it's something like - // user@name:password@host:port/path - // => If there are multiple at signs, username/port ends at last at before - // the first slash. (Since host and port never contain any at sign) - - int slash = host.Mid(pos + 1).Find('/'); - if (slash != -1) - slash += pos + 1; - - int next_at = host.Mid(pos + 1).Find('@'); - while (next_at != -1) { - next_at += pos + 1; - if (slash != -1 && next_at > slash) - break; - - pos = next_at; - next_at = host.Mid(pos + 1).Find('@'); - } - - user = host.Left(pos); - host = host.Mid(pos + 1); - - // Extract password (if any) from username - pos = user.Find(':'); - if (pos != -1) { - pass = user.Mid(pos + 1); - user = user.Left(pos); - } - - // Remove leading and trailing whitespace - user.Trim(true); - user.Trim(false); - - if (user.empty()) { - error = _("Invalid username given."); - return false; - } - } - else { - // Remove leading and trailing whitespace - user.Trim(true); - user.Trim(false); - - if (user.empty() && m_logonType != ASK && m_logonType != INTERACTIVE) { - user = _T("anonymous"); - pass = _T("anonymous@example.com"); } } - - pos = host.Find('/'); - if (pos != -1) { - path = CServerPath(host.Mid(pos)); - host = host.Left(pos); - } - - if (!host.empty() && host[0] == '[') { - // Probably IPv6 address - pos = host.Find(']'); - if (pos == -1) { - error = _("Host starts with '[' but no closing bracket found."); - return false; - } - if (pos + 1 < static_cast(host.Len()) ) { - if (host[pos + 1] != ':') { - error = _("Invalid host, after closing bracket only colon and port may follow."); - return false; - } - ++pos; - } - else - pos = -1; - } - else - pos = host.Find(':'); - if (pos != -1) { - if (!pos) { - error = _("No host given, please enter a host."); - return false; - } - - long tmp; - if (!host.Mid(pos + 1).ToLong(&tmp) || tmp < 1 || tmp > 65535) { - error = _("Invalid port given. The port has to be a value from 1 to 65535."); - return false; - } - port = tmp; - host = host.Left(pos); - } - else { - if (!port) - port = GetDefaultPort(m_protocol); - else if (port > 65535) { - error = _("Invalid port given. The port has to be a value from 1 to 65535."); - return false; - } - } - - host.Trim(true); - host.Trim(false); - - if (host.empty()) { - error = _("No host given, please enter a host."); - return false; - } - - m_host = host; - - if (m_host[0] == '[') { - m_host.RemoveLast(); - m_host = m_host.Mid(1); - } - - m_port = port; - m_user = user; - m_pass = pass; - m_account.clear(); - if (m_logonType != ASK && m_logonType != INTERACTIVE) { - if (m_user.empty()) - m_logonType = ANONYMOUS; - else if (m_user == _T("anonymous")) - if (m_pass.empty() || m_pass == _T("anonymous@example.com")) - m_logonType = ANONYMOUS; - else - m_logonType = NORMAL; - else - m_logonType = NORMAL; - } - - if (m_protocol == UNKNOWN) - m_protocol = GetProtocolFromPort(port); - - return true; + return protocolInfos[i]; } ServerProtocol CServer::GetProtocol() const @@ -239,7 +80,7 @@ return m_type; } -wxString CServer::GetHost() const +std::wstring CServer::GetHost() const { return m_host; } @@ -249,49 +90,18 @@ return m_port; } -wxString CServer::GetUser() const +std::wstring CServer::GetUser() const { - if (m_logonType == ANONYMOUS) - return _T("anonymous"); - return m_user; } -wxString CServer::GetPass() const -{ - if (m_logonType == ANONYMOUS) - return _T("anon@localhost"); - - return m_pass; -} - -wxString CServer::GetAccount() const -{ - if (m_logonType != ACCOUNT) - return wxString(); - - return m_account; -} - -wxString CServer::GetKeyFile() const -{ - if (m_logonType != KEY) - return wxString(); - - return m_keyFile; -} - CServer& CServer::operator=(const CServer &op) { m_protocol = op.m_protocol; m_type = op.m_type; m_host = op.m_host; m_port = op.m_port; - m_logonType = op.m_logonType; m_user = op.m_user; - m_pass = op.m_pass; - m_account = op.m_account; - m_keyFile = op.m_keyFile; m_timezoneOffset = op.m_timezoneOffset; m_pasvMode = op.m_pasvMode; m_maximumMultipleConnections = op.m_maximumMultipleConnections; @@ -306,54 +116,41 @@ bool CServer::operator==(const CServer &op) const { - if (m_protocol != op.m_protocol) + if (m_protocol != op.m_protocol) { return false; - else if (m_type != op.m_type) + } + else if (m_type != op.m_type) { return false; - else if (m_host != op.m_host) + } + else if (m_host != op.m_host) { return false; - else if (m_port != op.m_port) + } + else if (m_port != op.m_port) { return false; - else if (m_logonType != op.m_logonType) + } + if (m_user != op.m_user) { return false; - else if (m_logonType != ANONYMOUS) - { - if (m_user != op.m_user) - return false; - - if (m_logonType == NORMAL) - { - if (m_pass != op.m_pass) - return false; - } - else if (m_logonType == ACCOUNT) - { - if (m_pass != op.m_pass) - return false; - if (m_account != op.m_account) - return false; - } - else if (m_logonType == KEY) - { - if (m_keyFile != op.m_keyFile) - return false; - } } - if (m_timezoneOffset != op.m_timezoneOffset) + if (m_timezoneOffset != op.m_timezoneOffset) { return false; - else if (m_pasvMode != op.m_pasvMode) + } + else if (m_pasvMode != op.m_pasvMode) { return false; - else if (m_encodingType != op.m_encodingType) + } + else if (m_encodingType != op.m_encodingType) { return false; - else if (m_encodingType == ENCODING_CUSTOM) - { - if (m_customEncoding != op.m_customEncoding) + } + else if (m_encodingType == ENCODING_CUSTOM) { + if (m_customEncoding != op.m_customEncoding) { return false; + } } - if (m_postLoginCommands != op.m_postLoginCommands) + if (m_postLoginCommands != op.m_postLoginCommands) { return false; - if (m_bypassProxy != op.m_bypassProxy) + } + if (m_bypassProxy != op.m_bypassProxy) { return false; + } // Do not compare number of allowed multiple connections @@ -362,89 +159,77 @@ bool CServer::operator<(const CServer &op) const { - if (m_protocol < op.m_protocol) + if (m_protocol < op.m_protocol) { return true; - else if (m_protocol > op.m_protocol) + } + else if (m_protocol > op.m_protocol) { return false; + } - if (m_type < op.m_type) + if (m_type < op.m_type) { return true; - else if (m_type > op.m_type) + } + else if (m_type > op.m_type) { return false; + } - int cmp = m_host.Cmp(op.m_host); - if (cmp < 0) + int cmp = m_host.compare(op.m_host); + if (cmp < 0) { return true; - else if (cmp > 0) + } + else if (cmp > 0) { return false; + } - if (m_port < op.m_port) + if (m_port < op.m_port) { return true; - else if (m_port > op.m_port) + } + else if (m_port > op.m_port) { return false; + } - if (m_logonType < op.m_logonType) + cmp = m_user.compare(op.m_user); + if (cmp < 0) { return true; - else if (m_logonType > op.m_logonType) + } + else if (cmp > 0) { return false; - - if (m_logonType != ANONYMOUS) - { - cmp = m_user.Cmp(op.m_user); - if (cmp < 0) - return true; - else if (cmp > 0) - return false; - - if (m_logonType == NORMAL) - { - cmp = m_pass.Cmp(op.m_pass); - if (cmp < 0) - return true; - else if (cmp > 0) - return false; - } - else if (m_logonType == ACCOUNT) - { - cmp = m_pass.Cmp(op.m_pass); - if (cmp < 0) - return true; - else if (cmp > 0) - return false; - - cmp = m_account.Cmp(op.m_account); - if (cmp < 0) - return true; - else if (cmp > 0) - return false; - } } - if (m_timezoneOffset < op.m_timezoneOffset) + if (m_timezoneOffset < op.m_timezoneOffset) { return true; - else if (m_timezoneOffset > op.m_timezoneOffset) + } + else if (m_timezoneOffset > op.m_timezoneOffset) { return false; + } - if (m_pasvMode < op.m_pasvMode) + if (m_pasvMode < op.m_pasvMode) { return true; - else if (m_pasvMode > op.m_pasvMode) + } + else if (m_pasvMode > op.m_pasvMode) { return false; + } - if (m_encodingType < op.m_encodingType) + if (m_encodingType < op.m_encodingType) { return true; - else if (m_encodingType > op.m_encodingType) + } + else if (m_encodingType > op.m_encodingType) { return false; + } - if (m_encodingType == ENCODING_CUSTOM) - { - if (m_customEncoding < op.m_customEncoding) + if (m_encodingType == ENCODING_CUSTOM) { + if (m_customEncoding < op.m_customEncoding) { return true; - else if (m_customEncoding > op.m_customEncoding) + } + else if (m_customEncoding > op.m_customEncoding) { return false; + } } - if (m_bypassProxy < op.m_bypassProxy) + if (m_bypassProxy < op.m_bypassProxy) { return true; - else if (m_bypassProxy > op.m_bypassProxy) + } + else if (m_bypassProxy > op.m_bypassProxy) { return false; + } // Do not compare number of allowed multiple connections @@ -456,64 +241,8 @@ return !(*this == op); } -bool CServer::EqualsNoPass(const CServer &op) const -{ - if (m_protocol != op.m_protocol) - return false; - else if (m_type != op.m_type) - return false; - else if (m_host != op.m_host) - return false; - else if (m_port != op.m_port) - return false; - else if ((m_logonType == ANONYMOUS) != (op.m_logonType == ANONYMOUS)) - return false; - else if ((m_logonType == ACCOUNT) != (op.m_logonType == ACCOUNT)) - return false; - else if (m_logonType != ANONYMOUS) - { - if (m_user != op.m_user) - return false; - if (m_logonType == ACCOUNT) - if (m_account != op.m_account) - return false; - } - if (m_timezoneOffset != op.m_timezoneOffset) - return false; - else if (m_pasvMode != op.m_pasvMode) - return false; - else if (m_encodingType != op.m_encodingType) - return false; - else if (m_encodingType == ENCODING_CUSTOM) { - if (m_customEncoding != op.m_customEncoding) - return false; - } - if (m_postLoginCommands != op.m_postLoginCommands) - return false; - if (m_bypassProxy != op.m_bypassProxy) - return false; - - // Do not compare number of allowed multiple connections - - return true; -} - -CServer::CServer(ServerProtocol protocol, ServerType type, wxString host, unsigned int port, wxString user, wxString pass, wxString account) -{ - Initialize(); - m_protocol = protocol; - m_type = type; - m_host = host; - m_port = port; - m_logonType = NORMAL; - m_user = user; - m_pass = pass; - m_account = account; -} - -CServer::CServer(ServerProtocol protocol, ServerType type, wxString host, unsigned int port) +CServer::CServer(ServerProtocol protocol, ServerType type, std::wstring const& host, unsigned int port) { - Initialize(); m_protocol = protocol; m_type = type; m_host = host; @@ -525,86 +254,47 @@ m_type = type; } -LogonType CServer::GetLogonType() const -{ - return m_logonType; -} - -void CServer::SetLogonType(LogonType logonType) -{ - wxASSERT(logonType != LOGONTYPE_MAX); - m_logonType = logonType; -} - void CServer::SetProtocol(ServerProtocol serverProtocol) { - wxASSERT(serverProtocol != UNKNOWN); + assert(serverProtocol != UNKNOWN); - if (!GetProtocolInfo(serverProtocol).supportsPostlogin) + if (!ProtocolHasFeature(serverProtocol, ProtocolFeature::PostLoginCommands)) { m_postLoginCommands.clear(); + } m_protocol = serverProtocol; } -bool CServer::SetHost(wxString host, unsigned int port) +bool CServer::SetHost(std::wstring const& host, unsigned int port) { - if (host.empty()) + if (host.empty()) { return false; + } - if (port < 1 || port > 65535) + if (port < 1 || port > 65535) { return false; + } m_host = host; m_port = port; - if (m_protocol == UNKNOWN) + if (m_protocol == UNKNOWN) { m_protocol = GetProtocolFromPort(m_port); - - return true; -} - -bool CServer::SetUser(const wxString& user, const wxString& pass) -{ - if (m_logonType == ANONYMOUS) - return true; - - if (user.empty()) { - if (m_logonType != ASK && m_logonType != INTERACTIVE) - return false; - m_pass.clear(); } - else - m_pass = pass; - - m_user = user; return true; } -bool CServer::SetAccount(const wxString& account) +void CServer::SetUser(std::wstring const& user) { - if (m_logonType != ACCOUNT) - return false; - - m_account = account; - - return true; -} - -bool CServer::SetKeyFile(const wxString& keyFile) -{ - if (m_logonType != KEY) - return false; - - m_keyFile = keyFile; - - return true; + m_user = user; } bool CServer::SetTimezoneOffset(int minutes) { - if (minutes > (60 * 24) || minutes < (-60 * 24)) + if (minutes > (60 * 24) || minutes < (-60 * 24)) { return false; + } m_timezoneOffset = minutes; @@ -636,63 +326,80 @@ return m_maximumMultipleConnections; } -wxString CServer::FormatHost(bool always_omit_port /*=false*/) const +std::wstring CServer::Format(ServerFormat formatType) const +{ + return Format(formatType, Credentials()); +} + +std::wstring CServer::Format(ServerFormat formatType, Credentials const& credentials) const { - wxString host = m_host; + std::wstring server = m_host; - if (host.Find(':') != -1) - host = _T("[") + host + _T("]"); + t_protocolInfo const& info = GetProtocolInfo(m_protocol); - if (!always_omit_port) - { - if (m_port != GetDefaultPort(m_protocol)) - host += wxString::Format(_T(":%d"), m_port); + if (server.find(':') != std::wstring::npos) { + server = L"[" + server + L"]"; } - return host; -} + if (formatType == ServerFormat::host_only) { + return server; + } -wxString CServer::FormatServer(const bool always_include_prefix /*=false*/) const -{ - wxString server = FormatHost(); + if (m_port != GetDefaultPort(m_protocol)) { + server += fz::sprintf(L":%d", m_port); + } - if (m_logonType != ANONYMOUS) - server = GetUser() + _T("@") + server; + if (formatType == ServerFormat::with_optional_port) { + return server; + } - const t_protocolInfo& info = GetProtocolInfo(m_protocol); - if (!info.prefix.empty()) - { - if (always_include_prefix || info.alwaysShowPrefix) - server = info.prefix + _T("://") + server; - else if (m_port != info.defaultPort) - server = info.prefix + _T("://") + server; + auto user = GetUser(); + if (user != L"anonymous" || credentials.logonType_ != LogonType::anonymous) { + // For now, only escape if formatting for URL. + // Open question: Do we need some form of escapement for presentation within the GUI, + // that deals e.g. with whitespace but does not touch Unicode characters? + if (formatType == ServerFormat::url || formatType == ServerFormat::url_with_password) { + user = fz::percent_encode_w(user); + } + if (!user.empty()) { + if (formatType == ServerFormat::url_with_password) { + auto pass = credentials.GetPass(); + if (!pass.empty()) { + if (formatType == ServerFormat::url || formatType == ServerFormat::url_with_password) { + pass = fz::percent_encode_w(pass); + } + server = user + L":" + pass + L"@" + server; + } + } + else { + server = fz::percent_encode_w(user) + L"@" + server; + } + } + } + + if (formatType == ServerFormat::with_user_and_optional_port) { + if (!info.alwaysShowPrefix && m_port == info.defaultPort) { + return server; + } + } + + if (!info.prefix.empty()) { + server = info.prefix + L"://" + server; } return server; } -void CServer::Initialize() +void CServer::clear() { - m_protocol = UNKNOWN; - m_type = DEFAULT; - m_host.clear(); - m_port = 21; - m_logonType = ANONYMOUS; - m_user.clear(); - m_pass.clear(); - m_account.clear(); - m_timezoneOffset = 0; - m_pasvMode = MODE_DEFAULT; - m_maximumMultipleConnections = 0; - m_encodingType = ENCODING_AUTO; - m_customEncoding.clear(); - m_bypassProxy = false; + *this = CServer(); } -bool CServer::SetEncodingType(CharsetEncoding type, const wxString& encoding) +bool CServer::SetEncodingType(CharsetEncoding type, std::wstring const& encoding) { - if (type == ENCODING_CUSTOM && encoding.empty()) + if (type == ENCODING_CUSTOM && encoding.empty()) { return false; + } m_encodingType = type; m_customEncoding = encoding; @@ -700,10 +407,11 @@ return true; } -bool CServer::SetCustomEncoding(const wxString& encoding) +bool CServer::SetCustomEncoding(std::wstring const& encoding) { - if (encoding.empty()) + if (encoding.empty()) { return false; + } m_encodingType = ENCODING_CUSTOM; m_customEncoding = encoding; @@ -716,7 +424,7 @@ return m_encodingType; } -wxString CServer::GetCustomEncoding() const +std::wstring CServer::GetCustomEncoding() const { return m_customEncoding; } @@ -728,52 +436,55 @@ return info.defaultPort; } -ServerProtocol CServer::GetProtocolFromPort(unsigned int port, bool defaultOnly /*=false*/) +ServerProtocol CServer::GetProtocolFromPort(unsigned int port, bool defaultOnly) { - for (unsigned int i = 0; protocolInfos[i].protocol != UNKNOWN; ++i) - { - if (protocolInfos[i].defaultPort == port) + for (unsigned int i = 0; protocolInfos[i].protocol != UNKNOWN; ++i) { + if (protocolInfos[i].defaultPort == port) { return protocolInfos[i].protocol; + } } - if (defaultOnly) + if (defaultOnly) { return UNKNOWN; + } // Else default to FTP return FTP; } -wxString CServer::GetProtocolName(ServerProtocol protocol) +std::wstring CServer::GetProtocolName(ServerProtocol protocol) { - const t_protocolInfo *protocolInfo = protocolInfos; - while (protocolInfo->protocol != UNKNOWN) - { - if (protocolInfo->protocol != protocol) - { + t_protocolInfo const* protocolInfo = protocolInfos; + while (protocolInfo->protocol != UNKNOWN) { + if (protocolInfo->protocol != protocol) { ++protocolInfo; continue; } - if (protocolInfo->translateable) - return wxGetTranslation(protocolInfo->name); - else - return protocolInfo->name; + if (protocolInfo->translateable) { + return fz::translate(protocolInfo->name); + } + else { + return fz::to_wstring(protocolInfo->name); + } } - return wxString(); + return std::wstring(); } -ServerProtocol CServer::GetProtocolFromName(const wxString& name) +ServerProtocol CServer::GetProtocolFromName(std::wstring const& name) { const t_protocolInfo *protocolInfo = protocolInfos; while (protocolInfo->protocol != UNKNOWN) { if (protocolInfo->translateable) { - if (wxGetTranslation(protocolInfo->name) == name) + if (fz::translate(protocolInfo->name) == name) { return protocolInfo->protocol; + } } else { - if (protocolInfo->name == name) + if (fz::to_wstring(protocolInfo->name) == name) { return protocolInfo->protocol; + } } ++protocolInfo; } @@ -781,9 +492,9 @@ return UNKNOWN; } -bool CServer::SetPostLoginCommands(const std::vector& postLoginCommands) +bool CServer::SetPostLoginCommands(const std::vector& postLoginCommands) { - if (!SupportsPostLoginCommands(m_protocol)) { + if (!ProtocolHasFeature(m_protocol, ProtocolFeature::PostLoginCommands)) { m_postLoginCommands.clear(); return false; } @@ -792,96 +503,155 @@ return true; } -bool CServer::SupportsPostLoginCommands(ServerProtocol const protocol) +ServerProtocol CServer::GetProtocolFromPrefix(std::wstring const& prefix, ServerProtocol const hint) { - return protocol == FTP || protocol == FTPS || protocol == FTPES || protocol == INSECURE_FTP; -} + std::wstring const lower = fz::str_tolower_ascii(prefix); + + if (hint != UNKNOWN && !lower.empty()) { + auto const& info = GetProtocolInfo(hint); + if (info.prefix == lower || info.alternative_prefix == lower) { + return hint; + } + } -ServerProtocol CServer::GetProtocolFromPrefix(const wxString& prefix) -{ for (unsigned int i = 0; protocolInfos[i].protocol != UNKNOWN; ++i) { - if (!protocolInfos[i].prefix.CmpNoCase(prefix)) + if (protocolInfos[i].prefix == lower) { return protocolInfos[i].protocol; + } } return UNKNOWN; } -wxString CServer::GetPrefixFromProtocol(const ServerProtocol protocol) +std::wstring CServer::GetPrefixFromProtocol(ServerProtocol const protocol) { const t_protocolInfo& info = GetProtocolInfo(protocol); return info.prefix; } +std::vector const& CServer::GetDefaultProtocols() +{ + return defaultProtocols; +} + void CServer::SetBypassProxy(bool val) { - m_bypassProxy = val; + m_bypassProxy = val; } bool CServer::GetBypassProxy() const { - return m_bypassProxy; + return m_bypassProxy; } -bool CServer::ProtocolHasDataTypeConcept(const ServerProtocol protocol) +bool CServer::ProtocolHasFeature(ServerProtocol const protocol, ProtocolFeature const feature) { - if (protocol == FTP || protocol == FTPS || protocol == FTPES || protocol == INSECURE_FTP) - return true; - + switch (feature) { + case ProtocolFeature::DataTypeConcept: + case ProtocolFeature::TransferMode: + case ProtocolFeature::EnterCommand: + case ProtocolFeature::PostLoginCommands: + if (protocol == FTP || protocol == FTPS || protocol == FTPES || protocol == INSECURE_FTP) { + return true; + } + break; + case ProtocolFeature::Charset: + if (protocol == FTP || protocol == FTPS || protocol == FTPES || protocol == INSECURE_FTP || + protocol == STORJ || protocol == SFTP) { + return true; + } + break; + case ProtocolFeature::PreserveTimestamp: + case ProtocolFeature::ServerType: + if (protocol == FTP || protocol == FTPS || protocol == FTPES || protocol == INSECURE_FTP || + protocol == SFTP) { + return true; + } + break; + case ProtocolFeature::DirectoryRename: + if (protocol != AZURE_BLOB && protocol != AZURE_FILE) { + return true; + } + break; + } return false; } -wxString CServer::GetNameFromServerType(ServerType type) +std::wstring CServer::GetNameFromServerType(ServerType type) { - wxASSERT(type != SERVERTYPE_MAX); - return wxGetTranslation(typeNames[type]); + assert(type != SERVERTYPE_MAX); + return fz::translate(typeNames[type]); } -ServerType CServer::GetServerTypeFromName(const wxString& name) +ServerType CServer::GetServerTypeFromName(std::wstring const& name) { for (int i = 0; i < SERVERTYPE_MAX; ++i) { ServerType type = static_cast(i); - if (name == CServer::GetNameFromServerType(type)) + if (name == CServer::GetNameFromServerType(type)) { return type; + } } return DEFAULT; } -LogonType CServer::GetLogonTypeFromName(const wxString& name) +LogonType GetLogonTypeFromName(std::wstring const& name) { - if (name == _("Normal")) - return NORMAL; - else if (name == _("Ask for password")) - return ASK; - else if (name == _("Key file")) - return KEY; - else if (name == _("Interactive")) - return INTERACTIVE; - else if (name == _("Account")) - return ACCOUNT; - else - return ANONYMOUS; + if (name == _("Normal")) { + return LogonType::normal; + } + else if (name == _("Ask for password")) { + return LogonType::ask; + } + else if (name == _("Key file")) { + return LogonType::key; + } + else if (name == _("Interactive")) { + return LogonType::interactive; + } + else if (name == _("Account")) { + return LogonType::account; + } + else { + return LogonType::anonymous; + } } -wxString CServer::GetNameFromLogonType(LogonType type) +std::wstring GetNameFromLogonType(LogonType type) { - wxASSERT(type != LOGONTYPE_MAX); + assert(type != LogonType::count); switch (type) { - case NORMAL: + case LogonType::normal: return _("Normal"); - case ASK: + case LogonType::ask: return _("Ask for password"); - case KEY: + case LogonType::key: return _("Key file"); - case INTERACTIVE: + case LogonType::interactive: return _("Interactive"); - case ACCOUNT: + case LogonType::account: return _("Account"); default: return _("Anonymous"); } } + +void Credentials::SetPass(std::wstring const& password) +{ + if (logonType_ != LogonType::anonymous) { + password_ = password; + } +} + +std::wstring Credentials::GetPass() const +{ + if (logonType_ == LogonType::anonymous) { + return L"anonymous@example.com"; + } + else { + return password_; + } +} diff -Nru filezilla-3.15.0.2/src/engine/serverpath.cpp filezilla-3.33.0/src/engine/serverpath.cpp --- filezilla-3.15.0.2/src/engine/serverpath.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/serverpath.cpp 2017-12-17 12:14:41.000000000 +0000 @@ -1,41 +1,44 @@ #include #include "serverpath.h" -#define FTP_MVS_DOUBLE_QUOTE (wxChar)0xDC +#define FTP_MVS_DOUBLE_QUOTE (wchar_t)0xDC struct CServerTypeTraits { - const wxChar* separators; + wchar_t const* separators; bool has_root; // Root = simply separator nothing else - wxChar left_enclosure; // Example: VMS paths: [FOO.BAR] - wxChar right_enclosure; + wchar_t left_enclosure; // Example: VMS paths: [FOO.BAR] + wchar_t right_enclosure; bool filename_inside_enclosure; // MVS int prefixmode; //0 = normal prefix, 1 = suffix - wxChar separatorEscape; + wchar_t separatorEscape; bool has_dots; // Special meaning for .. (parent) and . (self) bool separator_after_prefix; }; static const CServerTypeTraits traits[SERVERTYPE_MAX] = { - { _T("/"), true, 0, 0, false, 0, 0, true, false }, // Failsafe - { _T("/"), true, 0, 0, false, 0, 0, true, false }, - { _T("."), false, '[', ']', false, 0, '^', false, false }, - { _T("\\/"), false, 0, 0, false, 0, 0, true, false }, - { _T("."), false, '\'', '\'', true, 1, 0, false, false }, - { _T("/"), true, 0, 0, false, 0, 0, true, false }, - { _T("/"), true, 0, 0, false, 0, 0, true, false }, // Same as Unix - { _T("."), false, 0, 0, false, 0, 0, false, false }, - { _T("\\"), true, 0, 0, false, 0, 0, true, false }, - { _T("/"), true, 0, 0, false, 0, 0, true, true } // Cygwin is like Unix but has optional prefix of form "//server" + { L"/", true, 0, 0, false, 0, 0, true, false }, // Failsafe + { L"/", true, 0, 0, false, 0, 0, true, false }, + { L".", false, '[', ']', false, 0, '^', false, false }, + { L"\\/", false, 0, 0, false, 0, 0, true, false }, // DOS with backslashes + { L".", false, '\'', '\'', true, 1, 0, false, false }, + { L"/", true, 0, 0, false, 0, 0, true, false }, + { L"/", true, 0, 0, false, 0, 0, true, false }, // Same as Unix + { L".", false, 0, 0, false, 0, 0, false, false }, + { L"\\", true, 0, 0, false, 0, 0, true, false }, + { L"/", true, 0, 0, false, 0, 0, true, true }, // Cygwin is like Unix but has optional prefix of form "//server" + { L"/\\", false, 0, 0, false, 0, 0, true, false } // DOS with forwardslashes }; -bool CServerPathData::operator==(const CServerPathData& cmp) const +bool CServerPathData::operator==(CServerPathData const& cmp) const { - if (m_prefix != cmp.m_prefix) + if (m_prefix != cmp.m_prefix) { return false; + } - if (m_segments != cmp.m_segments) + if (m_segments != cmp.m_segments) { return false; + } return true; } @@ -45,18 +48,20 @@ { } -CServerPath::CServerPath(CServerPath const& path, wxString subdir) +CServerPath::CServerPath(CServerPath const& path, std::wstring subdir) : m_type(path.m_type) , m_data(path.m_data) { - if (subdir.empty()) + if (subdir.empty()) { return; + } - if (!ChangePath(subdir)) + if (!ChangePath(subdir)) { clear(); + } } -CServerPath::CServerPath(wxString const& path, ServerType type /*=DEFAULT*/) +CServerPath::CServerPath(std::wstring const& path, ServerType type) : m_type(type) { SetPath(path); @@ -67,156 +72,200 @@ m_data.clear(); } -bool CServerPath::SetPath(wxString newPath) +bool CServerPath::SetPath(std::wstring newPath) { return SetPath(newPath, false); } -bool CServerPath::SetPath(wxString &newPath, bool isFile) +bool CServerPath::SetPath(std::wstring &newPath, bool isFile) { - wxString path = newPath; - wxString file; + std::wstring path = newPath; - if (path.empty()) + if (path.empty()) { return false; + } if (m_type == DEFAULT) { - int pos1 = path.Find(_T(":[")); - if (pos1 != -1) { - int pos2 = path.Find(']', true); - if (pos2 != -1 && static_cast(pos2) == (path.Length() - 1) && !isFile) + size_t pos1 = path.find(L":["); + if (pos1 != std::wstring::npos) { + size_t pos2 = path.rfind(']'); + if (pos2 != std::string::npos && pos2 == (path.size() - 1) && !isFile) { m_type = VMS; - else if (isFile && pos2 > pos1) + } + else if (isFile && pos2 > pos1) { m_type = VMS; + } } - else if (path.Length() >= 3 && - ((path.c_str()[0] >= 'A' && path.c_str()[0] <= 'Z') || (path.c_str()[0] >= 'a' && path.c_str()[0] <= 'z')) && - path.c_str()[1] == ':' && (path.c_str()[2] == '\\' || path.c_str()[2] == '/')) - m_type = DOS; - else if (path.c_str()[0] == FTP_MVS_DOUBLE_QUOTE && path.Last() == FTP_MVS_DOUBLE_QUOTE) - m_type = MVS; - else if (path[0] == ':' && (pos1 = path.Mid(1).Find(':')) > 0) + else if (path.size() >= 3 && + ((path[0] >= 'A' && path[0] <= 'Z') || (path[0] >= 'a' && path[0] <= 'z')) && + path[1] == ':' && (path[2] == '\\' || path[2] == '/')) { - int slash = path.Find('/'); - if (slash == -1 || slash > pos1) + m_type = DOS; + } + else if (path[0] == FTP_MVS_DOUBLE_QUOTE && path.back() == FTP_MVS_DOUBLE_QUOTE) { + m_type = MVS; + } + else if (path[0] == ':' && (pos1 = path.find(':'), 2) != std::wstring::npos) { + size_t slash = path.find('/'); + if (slash == std::wstring::npos || slash > pos1) { m_type = VXWORKS; + } } - else if (path[0] == '\\') + else if (path[0] == '\\') { m_type = DOS_VIRTUAL; + } - if (m_type == DEFAULT) + if (m_type == DEFAULT) { m_type = UNIX; + } } m_data.clear(); - if (!ChangePath(path, isFile)) + if (!ChangePath(path, isFile)) { return false; + } - if (isFile) + if (isFile) { newPath = path; + } return true; } -wxString CServerPath::GetPath() const +std::wstring CServerPath::GetPath() const { - if (empty()) - return wxString(); + if (empty()) { + return std::wstring(); + } - wxString path; + std::wstring path; - if (!traits[m_type].prefixmode && m_data->m_prefix) + if (!traits[m_type].prefixmode && m_data->m_prefix) { path = *m_data->m_prefix; + } - if (traits[m_type].left_enclosure != 0) + if (traits[m_type].left_enclosure != 0) { path += traits[m_type].left_enclosure; - if (m_data->m_segments.empty() && (!traits[m_type].has_root || !m_data->m_prefix || traits[m_type].separator_after_prefix)) + } + if (m_data->m_segments.empty() && (!traits[m_type].has_root || !m_data->m_prefix || traits[m_type].separator_after_prefix)) { path += traits[m_type].separators[0]; + } - for (tConstSegmentIter iter = m_data->m_segments.begin(); iter != m_data->m_segments.end(); ++iter) { - const wxString& segment = *iter; - if (iter != m_data->m_segments.begin()) + for (auto iter = m_data->m_segments.cbegin(); iter != m_data->m_segments.cend(); ++iter) { + std::wstring const& segment = *iter; + if (iter != m_data->m_segments.cbegin()) { path += traits[m_type].separators[0]; + } else if (traits[m_type].has_root) { - if (!m_data->m_prefix || traits[m_type].separator_after_prefix) + if (!m_data->m_prefix || traits[m_type].separator_after_prefix) { path += traits[m_type].separators[0]; + } } if (traits[m_type].separatorEscape) { - wxString tmp = segment; + std::wstring tmp = segment; EscapeSeparators(m_type, tmp); path += tmp; } - else + else { path += segment; + } } - if (traits[m_type].prefixmode && m_data->m_prefix) + if (traits[m_type].prefixmode && m_data->m_prefix) { path += *m_data->m_prefix; + } - if (traits[m_type].right_enclosure != 0) + if (traits[m_type].right_enclosure != 0) { path += traits[m_type].right_enclosure; + } // DOS is strange. // C: is current working dir on drive C, C:\ the drive root. - if (m_type == DOS && m_data->m_segments.size() == 1) + if ((m_type == DOS || m_type == DOS_FWD_SLASHES) && m_data->m_segments.size() == 1) { path += traits[m_type].separators[0]; + } return path; } bool CServerPath::HasParent() const { - if (empty()) + if (empty()) { return false; + } - if (!traits[m_type].has_root) + if (!traits[m_type].has_root) { return m_data->m_segments.size() > 1; + } return !m_data->m_segments.empty(); } CServerPath CServerPath::GetParent() const { - if (empty() || !HasParent()) - return CServerPath(); - CServerPath parent(*this); - CServerPathData& parent_data = parent.m_data.Get(); + parent.MakeParent(); + return parent; +} + +CServerPath& CServerPath::MakeParent() +{ + if (empty() || !HasParent()) { + clear(); + } + else { + CServerPathData& data = m_data.get(); + data.m_segments.pop_back(); - parent_data.m_segments.pop_back(); + if (m_type == MVS) { + data.m_prefix = fz::sparse_optional(L"."); + } + } - if (m_type == MVS) - parent_data.m_prefix = CSparseOptional(_T(".")); + return *this; +} - return parent; +std::wstring CServerPath::GetFirstSegment() const +{ + if (empty() || !HasParent()) { + return std::wstring(); + } + + if (!m_data->m_segments.empty()) { + return m_data->m_segments.front(); + } + else { + return std::wstring(); + } } -wxString CServerPath::GetLastSegment() const +std::wstring CServerPath::GetLastSegment() const { - if (empty() || !HasParent()) - return wxString(); + if (empty() || !HasParent()) { + return std::wstring(); + } - if (!m_data->m_segments.empty()) + if (!m_data->m_segments.empty()) { return m_data->m_segments.back(); - else - return wxString(); + } + else { + return std::wstring(); + } } // libc sprintf can be so slow at times... -wxChar* fast_sprint_number(wxChar* s, size_t n) +wchar_t* fast_sprint_number(wchar_t* s, size_t n) { - wxChar tmp[20]; // Long enough for 2^64-1 + wchar_t tmp[20]; // Long enough for 2^64-1 - wxChar* c = tmp; - do - { + wchar_t* c = tmp; + do { *(c++) = n % 10 + '0'; n /= 10; } while( n > 0 ); - do - { + do { *(s++) = *(--c); } while (c != tmp); @@ -225,10 +274,11 @@ #define tstrcpy wcscpy -wxString CServerPath::GetSafePath() const +std::wstring CServerPath::GetSafePath() const { - if (empty()) - return wxString(); + if (empty()) { + return std::wstring(); + } #define INTLENGTH 20 // 2^64 - 1 @@ -236,40 +286,39 @@ + INTLENGTH; // Max length of prefix len += m_data->m_prefix ? m_data->m_prefix->size() : 0; - for( auto const& segment : m_data->m_segments ) { + for (auto const& segment : m_data->m_segments) { len += segment.size() + 2 + INTLENGTH; } - wxString safepath; - { - wxStringBuffer start(safepath, len); - wxChar* t = start; + std::wstring safepath; + safepath.resize(len); + wchar_t * const start = &safepath[0]; + wchar_t * t = &safepath[0]; + + t = fast_sprint_number(t, m_type); + *(t++) = ' '; + t = fast_sprint_number(t, m_data->m_prefix ? m_data->m_prefix->size() : 0); - t = fast_sprint_number(t, m_type); + if (m_data->m_prefix) { *(t++) = ' '; - t = fast_sprint_number(t, m_data->m_prefix ? m_data->m_prefix->size() : 0); - - if (m_data->m_prefix) { - *(t++) = ' '; - tstrcpy(t, m_data->m_prefix->c_str()); - t += m_data->m_prefix->size(); - } + tstrcpy(t, m_data->m_prefix->c_str()); + t += m_data->m_prefix->size(); + } - for( auto const& segment : m_data->m_segments ) { - *(t++) = ' '; - t = fast_sprint_number(t, segment.size()); - *(t++) = ' '; - tstrcpy(t, segment.c_str()); - t += segment.size(); - } - *t = 0; + for (auto const& segment : m_data->m_segments) { + *(t++) = ' '; + t = fast_sprint_number(t, segment.size()); + *(t++) = ' '; + tstrcpy(t, segment.c_str()); + t += segment.size(); } - safepath.Shrink(); + safepath.resize(t - start); + safepath.shrink_to_fit(); return safepath; } -bool CServerPath::SetSafePath(const wxString& path) +bool CServerPath::SetSafePath(std::wstring const& path) { bool const ret = DoSetSafePath(path); if (!ret) { @@ -279,9 +328,9 @@ return ret; } -bool CServerPath::DoSetSafePath(const wxString& path) +bool CServerPath::DoSetSafePath(std::wstring const& path) { - CServerPathData& data = m_data.Get(); + CServerPathData& data = m_data.get(); data.m_prefix.clear(); data.m_segments.clear(); @@ -289,34 +338,33 @@ // Before the optimization this function was responsible for // most CPU cycles used during loading of transfer queues // from file - const int len = (int)path.Len(); - wxCharTypeBuffer buf(len + 1); - wxChar* begin = buf.data(); + wchar_t const* const begin = path.c_str(); + wchar_t const* const end = begin + path.size(); - memcpy(begin, (const wxChar*)path.c_str(), (len + 1) * sizeof(wxChar)); - wxChar* p = begin; + wchar_t const* p = begin; int type = 0; - do - { - if (*p < '0' || *p > '9') + do { + if (*p < '0' || *p > '9') { return false; + } type *= 10; type += *p - '0'; - if (type >= SERVERTYPE_MAX) + if (type >= SERVERTYPE_MAX) { return false; + } ++p; } while (*p != ' '); - m_type = (ServerType)type; + m_type = static_cast(type); ++p; int prefix_len = 0; - do - { - if (*p < '0' || *p > '9') + do { + if (*p < '0' || *p > '9') { return false; + } prefix_len *= 10; prefix_len += *p - '0'; @@ -327,8 +375,9 @@ while (*p && *p != ' '); if (!*p) { - if (prefix_len != 0) + if (prefix_len != 0) { return false; + } else { // Is root directory, like / on unix like systems. return true; @@ -337,43 +386,39 @@ ++p; - if (len - (p - begin) < prefix_len) + if (prefix_len > end - p) { return false; - if (prefix_len) - { - *(p + prefix_len) = 0; - if( *p ) { - data.m_prefix = CSparseOptional(p); - } - + } + if (prefix_len) { + data.m_prefix = fz::sparse_optional(new std::wstring(p, p + prefix_len)); p += prefix_len + 1; } - while (len > (p - begin)) - { + while (p < end) { int segment_len = 0; - do - { - if (*p < '0' || *p > '9') + do { + if (*p < '0' || *p > '9') { return false; + } segment_len *= 10; segment_len += *p - '0'; - if (segment_len > 32767) // Should be sane enough + if (segment_len > 32767) { // Should be sane enough return false; + } ++p; } while (*p != ' '); - if (!segment_len) + if (!segment_len) { return false; + } ++p; - if (len - (p - begin) < segment_len) + if (segment_len > end - p) { return false; - *(p + segment_len) = 0; - wxString s(p); - data.m_segments.push_back(s); + } + data.m_segments.emplace_back(p, p + segment_len); p += segment_len + 1; } @@ -383,8 +428,9 @@ bool CServerPath::SetType(ServerType type) { - if (!empty() && m_type != DEFAULT) + if (!empty() && m_type != DEFAULT) { return false; + } m_type = type; @@ -398,14 +444,17 @@ bool CServerPath::IsSubdirOf(const CServerPath &path, bool cmpNoCase) const { - if (empty() || path.empty()) + if (empty() || path.empty()) { return false; + } - if (m_type != path.m_type) + if (m_type != path.m_type) { return false; + } - if (!HasParent()) + if (!HasParent()) { return false; + } if (traits[m_type].prefixmode != 1) { if (cmpNoCase ) { @@ -415,7 +464,7 @@ else if( !m_data->m_prefix && path.m_data->m_prefix ) { return false; } - else if( m_data->m_prefix && path.m_data->m_prefix && m_data->m_prefix->CmpNoCase(*path.m_data->m_prefix) ) { + else if( m_data->m_prefix && path.m_data->m_prefix && fz::stricmp(*m_data->m_prefix, *path.m_data->m_prefix) ) { return false; } } @@ -431,14 +480,17 @@ tConstSegmentIter iter1 = m_data->m_segments.begin(); tConstSegmentIter iter2 = path.m_data->m_segments.begin(); while (iter1 != m_data->m_segments.end()) { - if (iter2 == path.m_data->m_segments.end()) + if (iter2 == path.m_data->m_segments.end()) { return true; + } if (cmpNoCase) { - if (iter1->CmpNoCase(*iter2)) + if (fz::stricmp(*iter1, *iter2)) { return false; + } } - else if (*iter1 != *iter2) + else if (*iter1 != *iter2) { return false; + } ++iter1; ++iter2; @@ -452,13 +504,13 @@ return path.IsSubdirOf(*this, cmpNoCase); } -bool CServerPath::ChangePath(wxString subdir) +bool CServerPath::ChangePath(std::wstring const& subdir) { - wxString subdir2 = subdir; + std::wstring subdir2 = subdir; return ChangePath(subdir2, false); } -bool CServerPath::ChangePath(wxString &subdir, bool isFile) +bool CServerPath::ChangePath(std::wstring &subdir, bool isFile) { bool ret = DoChangePath(subdir, isFile); if (!ret) { @@ -468,256 +520,296 @@ return ret; } -bool CServerPath::DoChangePath(wxString &subdir, bool isFile) +bool CServerPath::DoChangePath(std::wstring &subdir, bool isFile) { - wxString dir = subdir; - wxString file; + std::wstring dir = subdir; + std::wstring file; if (dir.empty()) { - if (empty() || isFile) + if (empty() || isFile) { return false; - else + } + else { return true; + } } bool const was_empty = empty(); - CServerPathData& data = m_data.Get(); + CServerPathData& data = m_data.get(); switch (m_type) { case VMS: { - int pos1 = dir.Find(traits[m_type].left_enclosure); - if (pos1 == -1) - { - int pos2 = dir.Find(traits[m_type].right_enclosure, true); - if (pos2 != -1) + size_t pos1 = dir.find(traits[m_type].left_enclosure); + if (pos1 == std::wstring::npos) { + size_t pos2 = dir.rfind(traits[m_type].right_enclosure); + if (pos2 != std::wstring::npos) { return false; + } - if (isFile) - { - if (was_empty) + if (isFile) { + if (was_empty) { return false; + } file = dir; break; } } - else - { - int pos2 = dir.Find(traits[m_type].right_enclosure, true); - if (pos2 == -1 || pos2 <= pos1 + 1) + else { + size_t pos2 = dir.rfind(traits[m_type].right_enclosure); + if (pos2 == std::wstring::npos || pos2 <= pos1 + 1) { return false; + } - bool enclosure_is_last = static_cast(pos2) == (dir.Length() - 1); - if (isFile == enclosure_is_last) + bool enclosure_is_last = pos2 == (dir.size() - 1); + if (isFile == enclosure_is_last) { return false; + } + + if (isFile) { + file = dir.substr(pos2 + 1); + } + dir = dir.substr(0, pos2); - if (isFile) - file = dir.Mid(pos2 + 1); - dir = dir.Left(pos2); - - if (pos1) - data.m_prefix = CSparseOptional(dir.Left(pos1)); - dir = dir.Mid(pos1 + 1); + if (pos1) { + data.m_prefix = fz::sparse_optional(dir.substr(0, pos1)); + } + dir = dir.substr(pos1 + 1); data.m_segments.clear(); } - if (!Segmentize(dir, data.m_segments)) + if (!Segmentize(dir, data.m_segments)) { return false; - if (data.m_segments.empty() && was_empty) + } + if (data.m_segments.empty() && was_empty) { return false; + } } break; case DOS: + case DOS_FWD_SLASHES: { - bool is_relative = false; - int sep = dir.find_first_of(traits[m_type].separators); - if (sep == -1) - sep = dir.Len(); - int colon = dir.Find(':'); - if (colon > 0 && colon == sep - 1) - is_relative = true; + bool is_absolute = false; + size_t sep = dir.find_first_of(traits[m_type].separators); + if (sep == std::wstring::npos) { + sep = dir.size(); + } + size_t colon = dir.find(':'); + if (colon != std::wstring::npos && colon > 0 && colon == sep - 1) { + is_absolute = true; + } - if (is_relative) + if (is_absolute) { data.m_segments.clear(); - else if (wxString(traits[m_type].separators).Contains(dir[0])) - { - if (data.m_segments.empty()) + } + else if (IsSeparator(dir[0])) { + // Drive-relative path + if (data.m_segments.empty()) { return false; - wxString first = data.m_segments.front(); + } + std::wstring first = data.m_segments.front(); data.m_segments.clear(); data.m_segments.push_back(first); - dir = dir.Mid(1); + dir = dir.substr(1); } + // else: Any other relative path - if (isFile && !ExtractFile(dir, file)) + if (isFile && !ExtractFile(dir, file)) { return false; + } - if (!Segmentize(dir, data.m_segments)) + if (!Segmentize(dir, data.m_segments)) { return false; - if (data.m_segments.empty() && was_empty) + } + if (data.m_segments.empty() && was_empty) { return false; + } } break; case MVS: { // Remove the double quoation some servers send in PWD reply - int i = 0; - wxChar c = dir.c_str()[i]; - while (c == FTP_MVS_DOUBLE_QUOTE) - c = dir.c_str()[++i]; - dir.Remove(0, i); + size_t i = 0; + wchar_t c = dir[i]; + while (c == FTP_MVS_DOUBLE_QUOTE) { + c = dir[++i]; + } + dir.erase(0, i); while (!dir.empty()) { - c = dir.Last(); - if (c != FTP_MVS_DOUBLE_QUOTE) + c = dir.back(); + if (c != FTP_MVS_DOUBLE_QUOTE) { break; - else - dir.RemoveLast(); + } + else { + dir.pop_back(); + } } } - if (dir.empty()) + if (dir.empty()) { return false; + } - if (dir.c_str()[0] == traits[m_type].left_enclosure) { - if (dir.Last() != traits[m_type].right_enclosure) + if (dir[0] == traits[m_type].left_enclosure) { + if (dir.back() != traits[m_type].right_enclosure) { return false; + } - dir.RemoveLast(); - dir = dir.Mid(1); + dir = dir.substr(1, dir.size() - 2); data.m_segments.clear(); } - else if (dir.Last() == traits[m_type].right_enclosure) + else if (dir.back() == traits[m_type].right_enclosure) { return false; - else if (was_empty) + } + else if (was_empty) { return false; + } - if (!dir.empty() && dir.Last() == ')') { + if (!dir.empty() && dir.back() == ')') { // Partitioned dataset member - if (!isFile) + if (!isFile) { return false; + } - int pos = dir.Find('('); - if (pos == -1) + size_t pos = dir.find('('); + if (pos == std::wstring::npos) { return false; - dir.RemoveLast(); - file = dir.Mid(pos + 1); - dir = dir.Left(pos); + } + dir.pop_back(); + file = dir.substr(pos + 1); + dir = dir.substr(0, pos); - if (!was_empty && !data.m_prefix && !dir.empty()) + if (!was_empty && !data.m_prefix && !dir.empty()) { return false; + } data.m_prefix.clear(); } else { - if (!was_empty && !data.m_prefix) - { - if (dir.Find('.') != -1 || !isFile) + if (!was_empty && !data.m_prefix) { + if (dir.find('.') != std::wstring::npos || !isFile) { return false; + } } if (isFile) { - if (!ExtractFile(dir, file)) + if (!ExtractFile(dir, file)) { return false; - data.m_prefix = CSparseOptional(_T(".")); + } + data.m_prefix = fz::sparse_optional(L"."); + } + else if (!dir.empty() && dir.back() == '.') { + data.m_prefix = fz::sparse_optional(L"."); } - else if (!dir.empty() && dir.Last() == '.') - data.m_prefix = CSparseOptional(_T(".")); - else + else { data.m_prefix.clear(); + } } - if (!Segmentize(dir, data.m_segments)) + if (!Segmentize(dir, data.m_segments)) { return false; + } break; case HPNONSTOP: - if (dir[0] == '\\') + if (dir[0] == '\\') { data.m_segments.clear(); + } - if (isFile && !ExtractFile(dir, file)) + if (isFile && !ExtractFile(dir, file)) { return false; + } - if (!Segmentize(dir, data.m_segments)) + if (!Segmentize(dir, data.m_segments)) { return false; - if (data.m_segments.empty() && was_empty) + } + if (data.m_segments.empty() && was_empty) { return false; + } break; case VXWORKS: { - if (dir[0] != ':') - { - if (was_empty) + if (dir[0] != ':') { + if (was_empty) { return false; + } } - else - { - int colon2; - if ((colon2 = dir.Mid(1).Find(':')) < 1) + else { + size_t colon2 = dir.find(':', 1); + if (colon2 == std::wstring::npos || colon2 == 1) { return false; - data.m_prefix = CSparseOptional(dir.Left(colon2 + 2)); - dir = dir.Mid(colon2 + 2); + } + data.m_prefix = fz::sparse_optional(dir.substr(0, colon2 + 1)); + dir = dir.substr(colon2 + 1); data.m_segments.clear(); } - if (isFile && !ExtractFile(dir, file)) + if (isFile && !ExtractFile(dir, file)) { return false; + } - if (!Segmentize(dir, data.m_segments)) + if (!Segmentize(dir, data.m_segments)) { return false; + } } break; case CYGWIN: { - if (wxString(traits[m_type].separators).Contains(dir[0])) - { + if (IsSeparator(dir[0])) { data.m_segments.clear(); data.m_prefix.clear(); } - else if (was_empty) + else if (was_empty) { return false; - if (dir.Left(2) == _T("//")) - { - data.m_prefix = CSparseOptional(traits[m_type].separators[0]); - dir = dir.Mid(1); + } + if (dir[0] == '/' && dir[1] == '/') { + data.m_prefix = fz::sparse_optional(std::wstring(1, traits[m_type].separators[0])); + dir = dir.substr(1); } - if (isFile && !ExtractFile(dir, file)) + if (isFile && !ExtractFile(dir, file)) { return false; + } - if (!Segmentize(dir, data.m_segments)) + if (!Segmentize(dir, data.m_segments)) { return false; + } } break; default: { - if (wxString(traits[m_type].separators).Contains(dir[0])) + if (IsSeparator(dir[0])) { data.m_segments.clear(); - else if (was_empty) + } + else if (was_empty) { return false; + } - if (isFile && !ExtractFile(dir, file)) + if (isFile && !ExtractFile(dir, file)) { return false; + } - if (!Segmentize(dir, data.m_segments)) + if (!Segmentize(dir, data.m_segments)) { return false; + } } break; } - if (!traits[m_type].has_root && data.m_segments.empty()) + if (!traits[m_type].has_root && data.m_segments.empty()) { return false; + } - if (isFile) - { - if (traits[m_type].has_dots) - { - if (file == _T("..") || file == _T(".")) + if (isFile) { + if (traits[m_type].has_dots) { + if (file == L".." || file == L".") { return false; + } } subdir = file; } @@ -727,12 +819,15 @@ bool CServerPath::operator==(const CServerPath &op) const { - if (empty() != op.empty()) + if (empty() != op.empty()) { return false; - else if (m_type != op.m_type) + } + else if (m_type != op.m_type) { return false; - else if (m_data != op.m_data) + } + else if (m_data != op.m_data) { return false; + } return true; } @@ -745,78 +840,87 @@ bool CServerPath::operator<(const CServerPath &op) const { if (empty()) { - if (!op.empty()) - return false; + return !op.empty(); + } + else if (op.empty()) { + return false; } - else if (op.empty()) - return true; - if( m_data->m_prefix || op.m_data->m_prefix ) { - if( m_data->m_prefix < op.m_data->m_prefix ) { + if (m_data->m_prefix || op.m_data->m_prefix) { + if (m_data->m_prefix < op.m_data->m_prefix) { return true; } - else if( op.m_data->m_prefix < m_data->m_prefix ) { + else if (op.m_data->m_prefix < m_data->m_prefix) { return false; } } - if (m_type > op.m_type) + if (m_type > op.m_type) { return false; - else if (m_type < op.m_type) + } + else if (m_type < op.m_type) { return true; + } tConstSegmentIter iter1, iter2; for (iter1 = m_data->m_segments.begin(), iter2 = op.m_data->m_segments.begin(); iter1 != m_data->m_segments.end(); ++iter1, ++iter2) { - if (iter2 == op.m_data->m_segments.end()) + if (iter2 == op.m_data->m_segments.end()) { return false; + } - const int cmp = iter1->Cmp(*iter2); - if (cmp < 0) + const int cmp = std::wcscmp(iter1->c_str(), iter2->c_str()); + if (cmp < 0) { return true; - if (cmp > 0) + } + if (cmp > 0) { return false; + } } return iter2 != op.m_data->m_segments.end(); } -wxString CServerPath::FormatFilename(const wxString &filename, bool omitPath /*=false*/) const +std::wstring CServerPath::FormatFilename(std::wstring const& filename, bool omitPath) const { - if (empty()) + if (empty() || filename.empty()) { return filename; + } - if (filename.empty()) - return wxString(); - - if (omitPath && (!traits[m_type].prefixmode || (m_data->m_prefix && *m_data->m_prefix == _T(".")))) + if (omitPath && (!traits[m_type].prefixmode || (m_data->m_prefix && *m_data->m_prefix == L"."))) { return filename; + } - wxString result = GetPath(); - if (traits[m_type].left_enclosure && traits[m_type].filename_inside_enclosure) - result.RemoveLast(); + std::wstring result = GetPath(); + if (traits[m_type].left_enclosure && traits[m_type].filename_inside_enclosure) { + result.pop_back(); + } - switch (m_type) - { + switch (m_type) { case VXWORKS: - if (!result.empty() && !wxString(traits[m_type].separators).Contains(result.Last()) && !m_data->m_segments.empty()) + if (!result.empty() && !IsSeparator(result.back()) && !m_data->m_segments.empty()) { result += traits[m_type].separators[0]; + } break; case VMS: case MVS: break; default: - if (!result.empty() && !wxString(traits[m_type].separators).Contains(result.Last())) + if (!result.empty() && !IsSeparator(result.back())) { result += traits[m_type].separators[0]; + } break; } - if (traits[m_type].prefixmode == 1 && !m_data->m_prefix) - result += _T("(") + filename + _T(")"); - else + if (traits[m_type].prefixmode == 1 && !m_data->m_prefix) { + result += L"(" + filename + L")"; + } + else { result += filename; + } - if (traits[m_type].left_enclosure && traits[m_type].filename_inside_enclosure) + if (traits[m_type].left_enclosure && traits[m_type].filename_inside_enclosure) { result += traits[m_type].right_enclosure; + } return result; } @@ -838,32 +942,36 @@ tConstSegmentIter iter = m_data->m_segments.begin(); tConstSegmentIter iter2 = op.m_data->m_segments.begin(); while (iter != m_data->m_segments.end()) { - int res = iter++->CmpNoCase(*iter2++); - if (res) + int res = fz::stricmp(*(iter++), *(iter2++)); + if (res) { return res; + } } return 0; } -bool CServerPath::AddSegment(const wxString& segment) +bool CServerPath::AddSegment(std::wstring const& segment) { - if (empty()) + if (empty()) { return false; + } // TODO: Check for invalid characters - m_data.Get().m_segments.push_back(segment); + m_data.get().m_segments.push_back(segment); return true; } CServerPath CServerPath::GetCommonParent(const CServerPath& path) const { - if (*this == path) + if (*this == path) { return *this; + } - if (empty() || path.empty()) + if (empty() || path.empty()) { return CServerPath(); + } if (m_type != path.m_type || (!traits[m_type].prefixmode && m_data->m_prefix != path.m_data->m_prefix)) @@ -871,33 +979,37 @@ return CServerPath(); } - if (!HasParent()) - { - if (path.IsSubdirOf(*this, false)) + if (!HasParent()) { + if (path.IsSubdirOf(*this, false)) { return *this; - else + } + else { return CServerPath(); + } } - else if (!path.HasParent()) - { - if (IsSubdirOf(path, false)) + else if (!path.HasParent()) { + if (IsSubdirOf(path, false)) { return path; - else + } + else { return CServerPath(); + } } CServerPath parent; parent.m_type = m_type; - CServerPathData& parentData = parent.m_data.Get(); + CServerPathData& parentData = parent.m_data.get(); tConstSegmentIter last = m_data->m_segments.end(); tConstSegmentIter last2 = path.m_data->m_segments.end(); if (traits[m_type].prefixmode == 1) { - if (!m_data->m_prefix) + if (!m_data->m_prefix) { --last; - if (!path.m_data->m_prefix) + } + if (!path.m_data->m_prefix) { --last2; + } parentData.m_prefix = GetParent().m_data->m_prefix; } else @@ -907,10 +1019,12 @@ tConstSegmentIter iter2 = path.m_data->m_segments.begin(); while (iter != last && iter2 != last2) { if (*iter != *iter2) { - if (!traits[m_type].has_root && parentData.m_segments.empty()) + if (!traits[m_type].has_root && parentData.m_segments.empty()) { return CServerPath(); - else + } + else { return parent; + } } parentData.m_segments.push_back(*iter); @@ -922,49 +1036,51 @@ return parent; } -wxString CServerPath::FormatSubdir(const wxString &subdir) const +std::wstring CServerPath::FormatSubdir(std::wstring const& subdir) const { - if (!traits[m_type].separatorEscape) + if (!traits[m_type].separatorEscape) { return subdir; + } - wxString res = subdir; + std::wstring res = subdir; EscapeSeparators(m_type, res); return res; } -bool CServerPath::SegmentizeAddSegment(wxString & segment, tSegmentList& segments, bool& append) +bool CServerPath::SegmentizeAddSegment(std::wstring & segment, tSegmentList& segments, bool& append) { if (traits[m_type].has_dots) { - if (segment == _T(".")) + if (segment == L".") { return true; - else if (segment == _T("..")) { - if (segments.empty()) - return false; - else { + } + else if (segment == L"..") { + if (!segments.empty()) { segments.pop_back(); - return true; } + return true; } } bool append_next = false; - if (!segment.empty() && traits[m_type].separatorEscape && segment.Last() == traits[m_type].separatorEscape) { + if (!segment.empty() && traits[m_type].separatorEscape && segment.back() == traits[m_type].separatorEscape) { append_next = true; segment[segment.size() - 1] = traits[m_type].separators[0]; } - if (append) + if (append) { segments.back() += segment; - else + } + else { segments.push_back(std::move(segment)); + } append = append_next; return true; } -bool CServerPath::Segmentize(wxString const& str, tSegmentList& segments) +bool CServerPath::Segmentize(std::wstring const& str, tSegmentList& segments) { bool append = false; size_t start = 0; @@ -980,7 +1096,7 @@ continue; } - wxString segment = str.substr(start, pos - start); + std::wstring segment = str.substr(start, pos - start); start = pos + 1; if (!SegmentizeAddSegment(segment, segments, append)) { @@ -989,7 +1105,7 @@ } if (start < str.size()) { - wxString segment = str.substr(start); + std::wstring segment = str.substr(start); if (!SegmentizeAddSegment(segment, segments, append)) { return false; } @@ -1001,33 +1117,46 @@ return true; } -bool CServerPath::ExtractFile(wxString& dir, wxString& file) +bool CServerPath::ExtractFile(std::wstring& dir, std::wstring& file) { - int pos = dir.find_last_of(traits[m_type].separators); - if (pos == (int)dir.Length() - 1) + size_t pos = dir.find_last_of(traits[m_type].separators); + if (pos != std::wstring::npos && pos == dir.size() - 1) { return false; + } - if (pos == -1) { + if (pos == std::wstring::npos) { file = dir; dir.clear(); return true; } - file = dir.Mid(pos + 1); - dir = dir.Left(pos + 1); + file = dir.substr(pos + 1); + dir = dir.substr(0, pos + 1); return true; } -void CServerPath::EscapeSeparators(ServerType type, wxString& subdir) +void CServerPath::EscapeSeparators(ServerType type, std::wstring& subdir) { if (traits[type].separatorEscape) { - for (const wxChar* p = traits[type].separators; *p; ++p) - subdir.Replace((wxString)*p, (wxString)traits[type].separatorEscape + traits[type].separators[0]); + for (wchar_t const* p = traits[type].separators; *p; ++p) { + fz::replace_substrings(subdir, std::wstring(1, *p), std::wstring(1, traits[type].separatorEscape) + traits[type].separators[0]); + } } } size_t CServerPath::SegmentCount() const { return empty() ? 0 : m_data->m_segments.size(); -} \ No newline at end of file +} + +bool CServerPath::IsSeparator(wchar_t c) const +{ + for (wchar_t const* ref = traits[m_type].separators; *ref; ++ref) { + if (*ref == c) { + return true; + } + } + + return false; +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/chmod.cpp filezilla-3.33.0/src/engine/sftp/chmod.cpp --- filezilla-3.15.0.2/src/engine/sftp/chmod.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/chmod.cpp 2017-02-27 04:30:03.000000000 +0000 @@ -0,0 +1,56 @@ +#include + +#include "chmod.h" +#include "directorycache.h" + +enum chmodStates +{ + chmod_init, + chmod_waitcwd, + chmod_chmod +}; + +int CSftpChmodOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpChmodOpData::Send() in state %d", opState); + + if (opState == chmod_init) { + controlSocket_.ChangeDir(command_.GetPath()); + opState = chmod_waitcwd; + return FZ_REPLY_CONTINUE; + } + else if (opState == chmod_chmod) { + engine_.GetDirectoryCache().UpdateFile(currentServer_, command_.GetPath(), command_.GetFile(), false, CDirectoryCache::unknown); + + std::wstring quotedFilename = controlSocket_.QuoteFilename(command_.GetPath().FormatFilename(command_.GetFile(), !useAbsolute_)); + + return controlSocket_.SendCommand(L"chmod " + command_.GetPermission() + L" " + controlSocket_.WildcardEscape(quotedFilename), + L"chmod " + command_.GetPermission() + L" " + quotedFilename); + } + + return FZ_REPLY_INTERNALERROR; +} + +int CSftpChmodOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpChmodOpData::ParseResponse() in state %d", opState); + + return controlSocket_.result_; +} + +int CSftpChmodOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpChmodOpData::SubcommandResult() in state %d", opState); + + if (opState == chmod_waitcwd) { + if (prevResult != FZ_REPLY_OK) { + useAbsolute_ = true; + } + + opState = chmod_chmod; + return FZ_REPLY_CONTINUE; + } + else { + return FZ_REPLY_INTERNALERROR; + } +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/chmod.h filezilla-3.33.0/src/engine/sftp/chmod.h --- filezilla-3.15.0.2/src/engine/sftp/chmod.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/chmod.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,24 @@ +#ifndef FILEZILLA_ENGINE_SFTP_CHMOD_HEADER +#define FILEZILLA_ENGINE_SFTP_CHMOD_HEADER + +#include "sftpcontrolsocket.h" + +class CSftpChmodOpData final : public COpData, public CSftpOpData +{ +public: + CSftpChmodOpData(CSftpControlSocket & controlSocket, CChmodCommand const& command) + : COpData(Command::chmod) + , CSftpOpData(controlSocket) + , command_(command) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int, COpData const&) override; + +private: + CChmodCommand command_; + bool useAbsolute_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/connect.cpp filezilla-3.33.0/src/engine/sftp/connect.cpp --- filezilla-3.15.0.2/src/engine/sftp/connect.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/connect.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,149 @@ +#include + +#include "connect.h" +#include "event.h" +#include "input_thread.h" +#include "proxy.h" + +#include + +int CSftpConnectOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpConnectOpData::Send() in state %d", opState); + + switch (opState) + { + case connect_init: + { + auto executable = fz::to_native(engine_.GetOptions().GetOption(OPTION_FZSFTP_EXECUTABLE)); + if (executable.empty()) { + executable = fzT("fzsftp"); + } + LogMessage(MessageType::Debug_Verbose, L"Going to execute %s", executable); + + std::vector args = { fzT("-v") }; + if (engine_.GetOptions().GetOptionVal(OPTION_SFTP_COMPRESSION)) { + args.push_back(fzT("-C")); + } + if (!controlSocket_.process_->spawn(executable, args)) { + LogMessage(MessageType::Debug_Warning, L"Could not create process"); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED;; + } + + controlSocket_.input_thread_ = std::make_unique(controlSocket_, *controlSocket_.process_); + if (!controlSocket_.input_thread_->spawn(engine_.GetThreadPool())) { + LogMessage(MessageType::Debug_Warning, L"Thread creation failed"); + controlSocket_.input_thread_.reset(); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED;; + } + } + return FZ_REPLY_WOULDBLOCK; + case connect_proxy: + { + int type; + switch (engine_.GetOptions().GetOptionVal(OPTION_PROXY_TYPE)) + { + case CProxySocket::HTTP: + type = 1; + break; + case CProxySocket::SOCKS5: + type = 2; + break; + case CProxySocket::SOCKS4: + type = 3; + break; + default: + LogMessage(MessageType::Debug_Warning, L"Unsupported proxy type"); + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED; + } + + std::wstring cmd = fz::sprintf(L"proxy %d \"%s\" %d", type, + engine_.GetOptions().GetOption(OPTION_PROXY_HOST), + engine_.GetOptions().GetOptionVal(OPTION_PROXY_PORT)); + std::wstring user = engine_.GetOptions().GetOption(OPTION_PROXY_USER); + if (!user.empty()) { + cmd += L" \"" + user + L"\""; + } + + std::wstring show = cmd; + std::wstring pass = engine_.GetOptions().GetOption(OPTION_PROXY_PASS); + if (!pass.empty()) { + cmd += L" \"" + pass + L"\""; + show += L" \"" + std::wstring(pass.size(), '*') + L"\""; + } + return controlSocket_.SendCommand(cmd, show); + } + break; + case connect_keys: + return controlSocket_.SendCommand(L"keyfile \"" + *(keyfile_++) + L"\""); + case connect_open: + return controlSocket_.SendCommand(fz::sprintf(L"open \"%s@%s\" %d", currentServer_.GetUser(), controlSocket_.ConvertDomainName(currentServer_.GetHost()), currentServer_.GetPort())); + default: + LogMessage(MessageType::Debug_Warning, L"Unknown op state: %d", opState); + break; + } + + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED; +} + +int CSftpConnectOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpConnectOpData::ParseResponse() in state %d", opState); + + if (controlSocket_.result_ != FZ_REPLY_OK) { + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + + switch (opState) + { + case connect_init: + if (controlSocket_.response_ != fz::sprintf(L"fzSftp started, protocol_version=%d", FZSFTP_PROTOCOL_VERSION)) { + LogMessage(MessageType::Error, _("fzsftp belongs to a different version of FileZilla")); + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED;; + } + if (engine_.GetOptions().GetOptionVal(OPTION_PROXY_TYPE) && !currentServer_.GetBypassProxy()) { + opState = connect_proxy; + } + else if (keyfile_ != keyfiles_.cend()) { + opState = connect_keys; + } + else { + opState = connect_open; + } + break; + case connect_proxy: + if (keyfile_ != keyfiles_.cend()) { + opState = connect_keys; + } + else { + opState = connect_open; + } + break; + case connect_keys: + if (keyfile_ == keyfiles_.cend()) { + opState = connect_open; + } + break; + case connect_open: + engine_.AddNotification(new CSftpEncryptionNotification(controlSocket_.m_sftpEncryptionDetails)); + return FZ_REPLY_OK; + default: + LogMessage(MessageType::Debug_Warning, L"Unknown op state: %d", opState); + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED; + } + + return FZ_REPLY_CONTINUE; +} + +int CSftpConnectOpData::Reset(int result) +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpConnectOpData::Reset(%d) in state %d", result, opState); + + if (opState == connect_init && (result & FZ_REPLY_CANCELED) != FZ_REPLY_CANCELED) { + LogMessage(MessageType::Error, _("fzsftp could not be started")); + } + if (criticalFailure) { + result |= FZ_REPLY_CRITICALERROR; + } + return result; +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/connect.h filezilla-3.33.0/src/engine/sftp/connect.h --- filezilla-3.15.0.2/src/engine/sftp/connect.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/connect.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef FILEZILLA_ENGINE_SFTP_CONNECT_HEADER +#define FILEZILLA_ENGINE_SFTP_CONNECT_HEADER + +#include "sftpcontrolsocket.h" + +enum connectStates +{ + connect_init, + connect_proxy, + connect_keys, + connect_open +}; + +class CSftpConnectOpData final : public COpData, public CSftpOpData +{ +public: + CSftpConnectOpData(CSftpControlSocket & controlSocket, Credentials const& credentials) + : COpData(Command::connect) + , CSftpOpData(controlSocket) + , credentials_(credentials) + , keyfile_(keyfiles_.cend()) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int Reset(int result) override; + + std::wstring lastChallenge; + CInteractiveLoginNotification::type lastChallengeType{ CInteractiveLoginNotification::interactive }; + bool criticalFailure{}; + + Credentials credentials_; + + std::vector keyfiles_; + std::vector::const_iterator keyfile_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/cwd.cpp filezilla-3.33.0/src/engine/sftp/cwd.cpp --- filezilla-3.15.0.2/src/engine/sftp/cwd.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/cwd.cpp 2018-05-07 08:20:55.000000000 +0000 @@ -0,0 +1,169 @@ +#include + +#include "cwd.h" +#include "pathcache.h" + +enum cwdStates +{ + cwd_init = 0, + cwd_pwd, + cwd_cwd, + cwd_cwd_subdir +}; + +int CSftpChangeDirOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpChangeDirOpData::Send() in state %d", opState); + + std::wstring cmd; + switch (opState) + { + case cwd_init: + if (path_.GetType() == DEFAULT) { + path_.SetType(currentServer_.GetType()); + } + + if (path_.empty()) { + if (currentPath_.empty()) { + opState = cwd_pwd; + } + else { + return FZ_REPLY_OK; + } + } + else { + if (!subDir_.empty()) { + // Check if the target is in cache already + target_ = engine_.GetPathCache().Lookup(currentServer_, path_, subDir_); + if (!target_.empty()) { + if (currentPath_ == target_) { + return FZ_REPLY_OK; + } + + path_ = target_; + subDir_.clear(); + opState = cwd_cwd; + } + else { + // Target unknown, check for the parent's target + target_ = engine_.GetPathCache().Lookup(currentServer_, path_, L""); + if (currentPath_ == path_ || (!target_.empty() && target_ == currentPath_)) { + target_.clear(); + opState = cwd_cwd_subdir; + } + else { + opState = cwd_cwd; + } + } + } + else { + target_ = engine_.GetPathCache().Lookup(currentServer_, path_, L""); + if (currentPath_ == path_ || (!target_.empty() && target_ == currentPath_)) { + return FZ_REPLY_OK; + } + opState = cwd_cwd; + } + } + return FZ_REPLY_CONTINUE; + case cwd_pwd: + cmd = L"pwd"; + break; + case cwd_cwd: + if (tryMkdOnFail_ && !holdsLock_) { + if (controlSocket_.IsLocked(locking_reason::mkdir, path_)) { + // Some other engine is already creating this directory or + // performing an action that will lead to its creation + tryMkdOnFail_ = false; + } + if (!controlSocket_.TryLock(locking_reason::mkdir, path_)) { + return FZ_REPLY_WOULDBLOCK; + } + } + cmd = L"cd " + controlSocket_.QuoteFilename(path_.GetPath()); + currentPath_.clear(); + break; + case cwd_cwd_subdir: + if (subDir_.empty()) { + return FZ_REPLY_INTERNALERROR; + } + else { + cmd = L"cd " + controlSocket_.QuoteFilename(subDir_); + } + currentPath_.clear(); + break; + } + + if (!cmd.empty()) { + return controlSocket_.SendCommand(cmd); + } + + return FZ_REPLY_WOULDBLOCK; +} + +int CSftpChangeDirOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpChangeDirOpData::ParseResponse() in state %d", opState); + + bool const successful = controlSocket_.result_ == FZ_REPLY_OK; + switch (opState) + { + case cwd_pwd: + if (!successful || controlSocket_.response_.empty()) { + return FZ_REPLY_ERROR; + } + + if (!controlSocket_.ParsePwdReply(controlSocket_.response_)) { + return FZ_REPLY_ERROR; + } + + return FZ_REPLY_OK; + case cwd_cwd: + if (!successful) { + // Create remote directory if part of a file upload + if (tryMkdOnFail_) { + tryMkdOnFail_ = false; + controlSocket_.Mkdir(path_); + return FZ_REPLY_CONTINUE; + } + else { + return FZ_REPLY_ERROR; + } + } + else if (controlSocket_.response_.empty()) { + return FZ_REPLY_ERROR; + } + else if (controlSocket_.ParsePwdReply(controlSocket_.response_)) { + engine_.GetPathCache().Store(currentServer_, currentPath_, path_); + + if (subDir_.empty()) { + return FZ_REPLY_OK; + } + + target_.clear(); + opState = cwd_cwd_subdir; + return FZ_REPLY_CONTINUE; + } + return FZ_REPLY_ERROR; + case cwd_cwd_subdir: + if (!successful || controlSocket_.response_.empty()) { + if (link_discovery_) { + LogMessage(MessageType::Debug_Info, L"Symlink does not link to a directory, probably a file"); + return FZ_REPLY_LINKNOTDIR; + } + else { + return FZ_REPLY_ERROR; + } + } + else if (controlSocket_.ParsePwdReply(controlSocket_.response_)) { + engine_.GetPathCache().Store(currentServer_, currentPath_, path_, subDir_); + + return FZ_REPLY_OK; + } + return FZ_REPLY_ERROR; + default: + LogMessage(MessageType::Debug_Warning, L"Unknown opState %d", opState); + break; + } + + return FZ_REPLY_INTERNALERROR; +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/cwd.h filezilla-3.33.0/src/engine/sftp/cwd.h --- filezilla-3.15.0.2/src/engine/sftp/cwd.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/cwd.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef FILEZILLA_ENGINE_SFTP_CWD_HEADER +#define FILEZILLA_ENGINE_SFTP_CWD_HEADER + +#include "sftpcontrolsocket.h" + +class CSftpChangeDirOpData final : public CChangeDirOpData, public CSftpOpData +{ +public: + CSftpChangeDirOpData(CSftpControlSocket & controlSocket) + : CSftpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + + virtual int SubcommandResult(int, COpData const&) override + { + LogMessage(MessageType::Debug_Verbose, L"CSftpChangeDirOpData::SubcommandResult()"); + return FZ_REPLY_CONTINUE; + } +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/delete.cpp filezilla-3.33.0/src/engine/sftp/delete.cpp --- filezilla-3.15.0.2/src/engine/sftp/delete.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/delete.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,77 @@ +#include + +#include "delete.h" +#include "directorycache.h" + +int CSftpDeleteOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpDeleteOpData::Send() in state %d", opState); + + std::wstring const& file = files_.front(); + if (file.empty()) { + LogMessage(MessageType::Debug_Info, L"Empty filename"); + return FZ_REPLY_INTERNALERROR; + } + + std::wstring filename = path_.FormatFilename(file); + if (filename.empty()) { + LogMessage(MessageType::Error, _("Filename cannot be constructed for directory %s and filename %s"), path_.GetPath(), file); + return FZ_REPLY_ERROR; + } + + if (time_.empty()) { + time_ = fz::datetime::now(); + } + + engine_.GetDirectoryCache().InvalidateFile(currentServer_, path_, file); + + return controlSocket_.SendCommand(L"rm " + controlSocket_.WildcardEscape(controlSocket_.QuoteFilename(filename)), L"rm " + controlSocket_.QuoteFilename(filename)); +} + +int CSftpDeleteOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpDeleteOpData::ParseResponse() in state %d", opState); + + if (controlSocket_.result_ != FZ_REPLY_OK) { + deleteFailed_ = true; + } + else { + std::wstring const& file = files_.front(); + + engine_.GetDirectoryCache().RemoveFile(currentServer_, path_, file); + + auto const now = fz::datetime::now(); + if (!time_.empty() && (now - time_).get_seconds() >= 1) { + controlSocket_.SendDirectoryListingNotification(path_, false, false); + time_ = now; + needSendListing_ = false; + } + else { + needSendListing_ = true; + } + } + + files_.pop_front(); + + if (!files_.empty()) { + return FZ_REPLY_CONTINUE; + } + + return deleteFailed_ ? FZ_REPLY_ERROR : FZ_REPLY_OK; +} + +int CSftpDeleteOpData::SubcommandResult(int, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpDeleteOpData::SubcommandResult() in state %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CSftpDeleteOpData::Reset(int result) +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpDeleteOpData::Reset(%d) in state %d", result, opState); + + if (needSendListing_ && !(result & FZ_REPLY_DISCONNECTED)) { + controlSocket_.SendDirectoryListingNotification(path_, false, false); + } + return result; +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/delete.h filezilla-3.33.0/src/engine/sftp/delete.h --- filezilla-3.15.0.2/src/engine/sftp/delete.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/delete.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef FILEZILLA_ENGINE_SFTP_DELETE_HEADER +#define FILEZILLA_ENGINE_SFTP_DELETE_HEADER + +#include "sftpcontrolsocket.h" + +class CSftpDeleteOpData final : public COpData, public CSftpOpData +{ +public: + CSftpDeleteOpData(CSftpControlSocket & controlSocket) + : COpData(Command::del) + , CSftpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const&) override; + virtual int Reset(int result) override; + + CServerPath path_; + std::deque files_; + + // Set to fz::datetime::Now initially and after + // sending an updated listing to the UI. + fz::datetime time_; + + bool needSendListing_{}; + + // Set to true if deletion of at least one file failed + bool deleteFailed_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/event.h filezilla-3.33.0/src/engine/sftp/event.h --- filezilla-3.15.0.2/src/engine/sftp/event.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/event.h 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,60 @@ +#ifndef FILEZILLA_ENGINE_SFTP_EVENT_HEADER +#define FILEZILLA_ENGINE_SFTP_EVENT_HEADER + +#define FZSFTP_PROTOCOL_VERSION 8 + +enum class sftpEvent { + Unknown = -1, + Reply = 0, + Done, + Error, + Verbose, + Info, + Status, + Recv, + Send, + Listentry, + AskHostkey, + AskHostkeyChanged, + AskHostkeyBetteralg, + AskPassword, + Transfer, + RequestPreamble, + RequestInstruction, + UsedQuotaRecv, + UsedQuotaSend, + KexAlgorithm, + KexHash, + KexCurve, + CipherClientToServer, + CipherServerToClient, + MacClientToServer, + MacServerToClient, + Hostkey, + + count +}; + +struct sftp_message +{ + sftpEvent type; + mutable std::wstring text[2]; +}; + +struct sftp_event_type; +typedef fz::simple_event CSftpEvent; + +struct sftp_list_message +{ + mutable std::wstring text; + mutable std::wstring name; + uint64_t mtime; +}; + +struct sftp_list_event_type; +typedef fz::simple_event CSftpListEvent; + +struct terminate_event_type; +typedef fz::simple_event CTerminateEvent; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/filetransfer.cpp filezilla-3.33.0/src/engine/sftp/filetransfer.cpp --- filezilla-3.15.0.2/src/engine/sftp/filetransfer.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/filetransfer.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -0,0 +1,317 @@ +#include + +#include "directorycache.h" +#include "filetransfer.h" + +#include + +enum filetransferStates +{ + filetransfer_init = 0, + filetransfer_waitcwd, + filetransfer_waitlist, + filetransfer_mtime, + filetransfer_transfer, + filetransfer_chmtime +}; + +int CSftpFileTransferOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpFileTransferOpData::Send() in state %d", opState); + + if (opState == filetransfer_init) { + + if (localFile_.empty()) { + if (!download_) { + return FZ_REPLY_CRITICALERROR | FZ_REPLY_NOTSUPPORTED; + } + else { + return FZ_REPLY_SYNTAXERROR; + } + } + + if (download_) { + std::wstring filename = remotePath_.FormatFilename(remoteFile_); + LogMessage(MessageType::Status, _("Starting download of %s"), filename); + } + else { + LogMessage(MessageType::Status, _("Starting upload of %s"), localFile_); + } + + int64_t size; + bool isLink; + if (fz::local_filesys::get_file_info(fz::to_native(localFile_), isLink, &size, nullptr, nullptr) == fz::local_filesys::file) { + localFileSize_ = size; + } + + opState = filetransfer_waitcwd; + + if (remotePath_.GetType() == DEFAULT) { + remotePath_.SetType(currentServer_.GetType()); + } + + controlSocket_.ChangeDir(remotePath_); + return FZ_REPLY_CONTINUE; + } + else if (opState == filetransfer_transfer) { + // Bit convoluted, but we need to guarantee that local filenames are passed as UTF-8 to fzsftp, + // whereas we need to use server encoding for remote filenames. + std::string cmd; + std::wstring logstr; + if (resume_) { + cmd = "re"; + logstr = L"re"; + } + if (download_) { + if (!resume_) { + controlSocket_.CreateLocalDir(localFile_); + } + + engine_.transfer_status_.Init(remoteFileSize_, resume_ ? localFileSize_ : 0, false); + cmd += "get "; + logstr += L"get "; + + std::string remoteFile = controlSocket_.ConvToServer(controlSocket_.QuoteFilename(remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_))); + if (remoteFile.empty()) { + LogMessage(MessageType::Error, _("Could not convert command to server encoding")); + return FZ_REPLY_ERROR; + } + cmd += remoteFile + " "; + logstr += controlSocket_.QuoteFilename(remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_)) + L" "; + + std::wstring localFile = controlSocket_.QuoteFilename(localFile_); + cmd += fz::to_utf8(localFile); + logstr += localFile; + } + else { + engine_.transfer_status_.Init(localFileSize_, resume_ ? remoteFileSize_ : 0, false); + cmd += "put "; + logstr += L"put "; + + std::wstring localFile = controlSocket_.QuoteFilename(localFile_); + cmd += fz::to_utf8(localFile) + " "; + logstr += localFile + L" "; + + std::string remoteFile = controlSocket_.ConvToServer(controlSocket_.QuoteFilename(remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_))); + if (remoteFile.empty()) { + LogMessage(MessageType::Error, _("Could not convert command to server encoding")); + return FZ_REPLY_ERROR; + } + cmd += remoteFile; + logstr += controlSocket_.QuoteFilename(remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_)); + } + engine_.transfer_status_.SetStartTime(); + transferInitiated_ = true; + controlSocket_.SetWait(true); + + controlSocket_.LogMessageRaw(MessageType::Command, logstr); + return controlSocket_.AddToStream(cmd + "\r\n"); + } + else if (opState == filetransfer_mtime) { + std::wstring quotedFilename = controlSocket_.QuoteFilename(remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_)); + return controlSocket_.SendCommand(L"mtime " + controlSocket_.WildcardEscape(quotedFilename), L"mtime " + quotedFilename); + } + else if (opState == filetransfer_chmtime) { + assert(!fileTime_.empty()); + if (download_) { + LogMessage(MessageType::Debug_Info, L" filetransfer_chmtime during download"); + return FZ_REPLY_INTERNALERROR; + } + + std::wstring quotedFilename = controlSocket_.QuoteFilename(remotePath_.FormatFilename(remoteFile_, !tryAbsolutePath_)); + + fz::datetime t = fileTime_; + t -= fz::duration::from_minutes(currentServer_.GetTimezoneOffset()); + + // Y2K38 + time_t ticks = t.get_time_t(); + std::wstring seconds = fz::sprintf(L"%d", ticks); + return controlSocket_.SendCommand(L"chmtime " + seconds + L" " + controlSocket_.WildcardEscape(quotedFilename), L"chmtime " + seconds + L" " + quotedFilename); + } + + return FZ_REPLY_INTERNALERROR; +} + +int CSftpFileTransferOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpFileTransferOpData::ParseResponse() in state %d", opState); + + if (opState == filetransfer_transfer) { + if (controlSocket_.result_ == FZ_REPLY_OK && engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) { + if (download_) { + if (!fileTime_.empty()) { + if (!fz::local_filesys::set_modification_time(fz::to_native(localFile_), fileTime_)) + LogMessage(MessageType::Debug_Warning, L"Could not set modification time"); + } + } + else { + fileTime_ = fz::local_filesys::get_modification_time(fz::to_native(localFile_)); + if (!fileTime_.empty()) { + opState = filetransfer_chmtime; + return FZ_REPLY_CONTINUE; + } + } + } + return controlSocket_.result_; + } + else if (opState == filetransfer_mtime) { + if (controlSocket_.result_ == FZ_REPLY_OK && !controlSocket_.response_.empty()) { + time_t seconds = 0; + bool parsed = true; + for (auto const& c : controlSocket_.response_) { + if (c < '0' || c > '9') { + parsed = false; + break; + } + seconds *= 10; + seconds += c - '0'; + } + if (parsed) { + fz::datetime fileTime = fz::datetime(seconds, fz::datetime::seconds); + if (!fileTime.empty()) { + fileTime_ = fileTime; + fileTime_ += fz::duration::from_minutes(currentServer_.GetTimezoneOffset()); + } + } + } + opState = filetransfer_transfer; + int res = controlSocket_.CheckOverwriteFile(); + if (res != FZ_REPLY_OK) { + return res; + } + + return FZ_REPLY_CONTINUE; + } + else if (opState == filetransfer_chmtime) { + if (download_) { + LogMessage(MessageType::Debug_Info, L" filetransfer_chmtime during download"); + return FZ_REPLY_INTERNALERROR; + } + return FZ_REPLY_OK; + } + else { + LogMessage(MessageType::Debug_Info, L" Called at improper time: opState == %d", opState); + } + + return FZ_REPLY_INTERNALERROR; +} + +int CSftpFileTransferOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpFileTransferOpData::SubcommandResult() in state %d", opState); + + if (opState == filetransfer_waitcwd) { + if (prevResult == FZ_REPLY_OK) { + CDirentry entry; + bool dirDidExist; + bool matchedCase; + bool found = engine_.GetDirectoryCache().LookupFile(entry, currentServer_, tryAbsolutePath_ ? remotePath_ : currentPath_, remoteFile_, dirDidExist, matchedCase); + if (!found) { + if (!dirDidExist) { + opState = filetransfer_waitlist; + } + else if (download_ && engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) { + opState = filetransfer_mtime; + } + else { + opState = filetransfer_transfer; + } + } + else { + if (entry.is_unsure()) { + opState = filetransfer_waitlist; + } + else { + if (matchedCase) { + remoteFileSize_ = entry.size; + if (entry.has_date()) { + fileTime_ = entry.time; + } + + if (download_ && !entry.has_time() && + engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) + { + opState = filetransfer_mtime; + } + else { + opState = filetransfer_transfer; + } + } + else { + opState = filetransfer_mtime; + } + } + } + if (opState == filetransfer_waitlist) { + controlSocket_.List(CServerPath(), L"", LIST_FLAG_REFRESH); + return FZ_REPLY_CONTINUE; + } + else if (opState == filetransfer_transfer) { + int res = controlSocket_.CheckOverwriteFile(); + if (res != FZ_REPLY_OK) { + return res; + } + } + } + else { + tryAbsolutePath_ = true; + opState = filetransfer_mtime; + } + } + else if (opState == filetransfer_waitlist) { + if (prevResult == FZ_REPLY_OK) { + CDirentry entry; + bool dirDidExist; + bool matchedCase; + bool found = engine_.GetDirectoryCache().LookupFile(entry, currentServer_, tryAbsolutePath_ ? remotePath_ : currentPath_, remoteFile_, dirDidExist, matchedCase); + if (!found) { + if (!dirDidExist) { + opState = filetransfer_mtime; + } + else if (download_ && + engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) + { + opState = filetransfer_mtime; + } + else { + opState = filetransfer_transfer; + } + } + else { + if (matchedCase && !entry.is_unsure()) { + remoteFileSize_ = entry.size; + if (entry.has_date()) { + fileTime_ = entry.time; + } + + if (download_ && !entry.has_time() && + engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) + { + opState = filetransfer_mtime; + } + else { + opState = filetransfer_transfer; + } + } + else { + opState = filetransfer_mtime; + } + } + if (opState == filetransfer_transfer) { + int res = controlSocket_.CheckOverwriteFile(); + if (res != FZ_REPLY_OK) { + return res; + } + } + } + else { + opState = filetransfer_mtime; + } + } + else { + LogMessage(MessageType::Debug_Warning, L" Unknown opState (%d)", opState); + return FZ_REPLY_INTERNALERROR; + } + + return FZ_REPLY_CONTINUE; +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/filetransfer.h filezilla-3.33.0/src/engine/sftp/filetransfer.h --- filezilla-3.15.0.2/src/engine/sftp/filetransfer.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/filetransfer.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef FILEZILLA_ENGINE_SFTP_FILETRANSFER_HEADER +#define FILEZILLA_ENGINE_SFTP_FILETRANSFER_HEADER + +#include "sftpcontrolsocket.h" + +class CSftpFileTransferOpData final : public CFileTransferOpData, public CSftpOpData +{ +public: + CSftpFileTransferOpData(CSftpControlSocket & controlSocket, bool is_download, std::wstring const& local_file, std::wstring const& remote_file, CServerPath const& remote_path) + : CFileTransferOpData(is_download, local_file, remote_file, remote_path) + , CSftpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int, COpData const&) override; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/input_thread.cpp filezilla-3.33.0/src/engine/sftp/input_thread.cpp --- filezilla-3.15.0.2/src/engine/sftp/input_thread.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/input_thread.cpp 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,226 @@ +#include + +#include "event.h" +#include "input_thread.h" +#include "sftpcontrolsocket.h" + +#include + +CSftpInputThread::CSftpInputThread(CSftpControlSocket& owner, fz::process& proc) + : process_(proc) + , owner_(owner) +{ +} + +CSftpInputThread::~CSftpInputThread() +{ + thread_.join(); +} + +bool CSftpInputThread::spawn(fz::thread_pool & pool) +{ + if (!thread_) { + thread_ = pool.spawn([this]() { entry(); }); + } + return thread_.operator bool(); +} + +uint64_t CSftpInputThread::ReadUInt(std::wstring &error) +{ + uint64_t ret{}; + + while (true) { + if (!readFromProcess(error, true)) { + return 0; + } + + auto const* p = recv_buffer_.get(); + size_t i; + for (i = 0; i < recv_buffer_.size(); ++i) { + unsigned char const c = p[i]; + if (c == '\n') { + recv_buffer_.consume(i + 1); + return ret; + } + if (c == '\r') { + continue; + } + + if (c < '0' || c > '9') { + error = L"Unexpected character"; + return 0; + } + ret *= 10; + ret += c - '0'; + + } + recv_buffer_.clear(); + } + + return 0; +} + +std::wstring CSftpInputThread::ReadLine(std::wstring &error) +{ + int len = 0; + const int buffersize = 4096; + char buffer[buffersize]; + + while (true) { + if (!readFromProcess(error, true)) { + return std::wstring(); + } + + auto const* p = recv_buffer_.get(); + size_t i; + for (i = 0; i < recv_buffer_.size(); ++i) { + unsigned char const c = p[i]; + + if (c == '\n') { + recv_buffer_.consume(i + 1); + + while (len && buffer[len - 1] == '\r') { + --len; + } + + std::wstring const line = owner_.ConvToLocal(buffer, len); + if (len && line.empty()) { + error = L"Failed to convert reply to local character set."; + } + + return line; + } + + if (len >= buffersize - 1) { + // Cap string length + continue; + } + + buffer[len++] = c; + } + recv_buffer_.clear(); + } + + return std::wstring(); +} + +bool CSftpInputThread::readFromProcess(std::wstring & error, bool eof_is_error) +{ + if (recv_buffer_.empty()) { + int read = process_.read(reinterpret_cast(recv_buffer_.get(1024)), 1024); + if (read > 0) { + recv_buffer_.add(read); + } + else { + if (!read) { + if (eof_is_error) { + error = L"Unexpected EOF."; + } + } + else { + error = L"Unknown error reading from process"; + } + return false; + } + } + + return true; +} + +void CSftpInputThread::processEvent(sftpEvent eventType, std::wstring & error) +{ + int lines{}; + switch (eventType) + { + case sftpEvent::count: + case sftpEvent::Unknown: + error = fz::sprintf(L"Unknown eventType"); + return; + case sftpEvent::Recv: + case sftpEvent::Send: + case sftpEvent::UsedQuotaRecv: + case sftpEvent::UsedQuotaSend: + break; + case sftpEvent::Reply: + case sftpEvent::Done: + case sftpEvent::Error: + case sftpEvent::Verbose: + case sftpEvent::Info: + case sftpEvent::Status: + case sftpEvent::Transfer: + case sftpEvent::AskPassword: + case sftpEvent::RequestPreamble: + case sftpEvent::RequestInstruction: + case sftpEvent::KexAlgorithm: + case sftpEvent::KexHash: + case sftpEvent::KexCurve: + case sftpEvent::CipherClientToServer: + case sftpEvent::CipherServerToClient: + case sftpEvent::MacClientToServer: + case sftpEvent::MacServerToClient: + case sftpEvent::Hostkey: + lines = 1; + break; + case sftpEvent::AskHostkey: + case sftpEvent::AskHostkeyChanged: + case sftpEvent::AskHostkeyBetteralg: + lines = 2; + break; + case sftpEvent::Listentry: + { + auto msg = new CSftpListEvent; + auto & message = std::get<0>(msg->v_); + message.text = ReadLine(error); + message.mtime = ReadUInt(error); + message.name = ReadLine(error); + + if (error.empty()) { + owner_.send_event(msg); + } + else { + delete msg; + } + } + return; + }; + + auto msg = new CSftpEvent; + auto & message = std::get<0>(msg->v_); + message.type = eventType; + for (int i = 0; i < lines && error.empty(); ++i) { + message.text[i] = ReadLine(error); + } + + if (!error.empty()) { + delete msg; + return; + } + + owner_.send_event(msg); +} + +void CSftpInputThread::entry() +{ + std::wstring error; + while (error.empty()) { + if (!readFromProcess(error, false)) { + break; + } + + unsigned char readType = *recv_buffer_.get(); + recv_buffer_.consume(1); + + readType -= '0'; + + if (readType >= static_cast(sftpEvent::count)) { + error = fz::sprintf(L"Unknown eventType %d", readType); + break; + } + + sftpEvent eventType = static_cast(readType); + + processEvent(eventType, error); + } + + owner_.send_event(error); +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/input_thread.h filezilla-3.33.0/src/engine/sftp/input_thread.h --- filezilla-3.15.0.2/src/engine/sftp/input_thread.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/input_thread.h 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,39 @@ +#ifndef FILEZILLA_ENGINE_SFTP_INPUTTHREAD_HEADER +#define FILEZILLA_ENGINE_SFTP_INPUTTHREAD_HEADER + +class CSftpControlSocket; + +#include +#include + +namespace fz { +class process; +} + +class CSftpInputThread final +{ +public: + CSftpInputThread(CSftpControlSocket & owner, fz::process& proc); + ~CSftpInputThread(); + + bool spawn(fz::thread_pool & pool); + +protected: + + bool readFromProcess(std::wstring & error, bool eof_is_error); + std::wstring ReadLine(std::wstring & error); + uint64_t ReadUInt(std::wstring & error); + + void entry(); + + void processEvent(sftpEvent eventType, std::wstring & error); + + fz::process& process_; + CSftpControlSocket& owner_; + + fz::async_task thread_; + + fz::buffer recv_buffer_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/list.cpp filezilla-3.33.0/src/engine/sftp/list.cpp --- filezilla-3.15.0.2/src/engine/sftp/list.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/list.cpp 2018-05-07 08:20:55.000000000 +0000 @@ -0,0 +1,141 @@ +#include + +#include "directorycache.h" +#include "list.h" + +enum listStates +{ + list_init = 0, + list_waitcwd, + list_waitlock, + list_list +}; + +int CSftpListOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpListOpData::Send() in state %d", opState); + + if (opState == list_init) { + if (!currentServer_) { + LogMessage(MessageType::Debug_Warning, L"currenServer_ is empty"); + return FZ_REPLY_INTERNALERROR; + } + + if (path_.GetType() == DEFAULT) { + path_.SetType(currentServer_.GetType()); + } + refresh_ = (flags_ & LIST_FLAG_REFRESH) != 0; + fallback_to_current_ = !path_.empty() && (flags_ & LIST_FLAG_FALLBACK_CURRENT) != 0; + + controlSocket_.ChangeDir(path_, subDir_, (flags_ & LIST_FLAG_LINK) != 0); + opState = list_waitcwd; + return FZ_REPLY_CONTINUE; + } + else if (opState == list_waitlock) { + assert(subDir_.empty()); // We did do ChangeDir before trying to lock + + // Check if we can use already existing listing + CDirectoryListing listing; + bool is_outdated = false; + bool found = engine_.GetDirectoryCache().Lookup(listing, currentServer_, path_, false, is_outdated); + if (found && !is_outdated && + (!refresh_ || (holdsLock_ && listing.m_firstListTime >= time_before_locking_))) + { + controlSocket_.SendDirectoryListingNotification(listing.path, topLevel_, false); + return FZ_REPLY_OK; + } + + if (!holdsLock_) { + if (!controlSocket_.TryLock(locking_reason::list, currentPath_)) { + time_before_locking_ = fz::monotonic_clock::now(); + return FZ_REPLY_WOULDBLOCK; + } + } + + opState = list_list; + return FZ_REPLY_CONTINUE; + } + else if (opState == list_list) { + listing_parser_ = std::make_unique(&controlSocket_, currentServer_, listingEncoding::unknown); + return controlSocket_.SendCommand(L"ls"); + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CSftpControlSocket::ListSend()"); + return FZ_REPLY_INTERNALERROR; +} + +int CSftpListOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpListOpData::ParseResponse() in state %d", opState); + + if (opState == list_list) { + if (controlSocket_.result_ != FZ_REPLY_OK) { + return FZ_REPLY_ERROR; + } + + if (!listing_parser_) { + LogMessage(MessageType::Debug_Warning, L"listing_parser_ is empty"); + return FZ_REPLY_INTERNALERROR; + } + + directoryListing_ = listing_parser_->Parse(currentPath_); + engine_.GetDirectoryCache().Store(directoryListing_, currentServer_); + controlSocket_.SendDirectoryListingNotification(currentPath_, topLevel_, false); + + return FZ_REPLY_OK; + } + + LogMessage(MessageType::Debug_Warning, L"ListParseResponse called at improper time: %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CSftpListOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpListOpData::SubcommandResult() in state %d", opState); + + if (opState != list_waitcwd) { + return FZ_REPLY_INTERNALERROR; + } + + if (prevResult != FZ_REPLY_OK) { + if (fallback_to_current_) { + // List current directory instead + fallback_to_current_ = false; + path_.clear(); + subDir_.clear(); + controlSocket_.ChangeDir(); + return FZ_REPLY_CONTINUE; + } + else { + return prevResult; + } + } + + path_ = currentPath_; + subDir_.clear(); + opState = list_waitlock; + return FZ_REPLY_CONTINUE; +} + +int CSftpListOpData::ParseEntry(std::wstring && entry, uint64_t mtime, std::wstring && name) +{ + if (opState != list_list) { + controlSocket_.LogMessageRaw(MessageType::RawList, entry); + LogMessage(MessageType::Debug_Warning, L"ListParseResponse called at improper time: %d", opState); + return FZ_REPLY_INTERNALERROR; + } + + if (!listing_parser_) { + controlSocket_.LogMessageRaw(MessageType::RawList, entry); + LogMessage(MessageType::Debug_Warning, L"listing_parser_ is null"); + return FZ_REPLY_INTERNALERROR; + } + + fz::datetime time; + if (mtime) { + time = fz::datetime(static_cast(mtime), fz::datetime::seconds); + } + listing_parser_->AddLine(std::move(entry), std::move(name), time); + + return FZ_REPLY_WOULDBLOCK; +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/list.h filezilla-3.33.0/src/engine/sftp/list.h --- filezilla-3.15.0.2/src/engine/sftp/list.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/list.h 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef FILEZILLA_ENGINE_SFTP_LIST_HEADER +#define FILEZILLA_ENGINE_SFTP_LIST_HEADER + +#include "directorylistingparser.h" +#include "sftpcontrolsocket.h" + +class CSftpListOpData final : public COpData, public CSftpOpData +{ +public: + CSftpListOpData(CSftpControlSocket & controlSocket, CServerPath const& path, std::wstring const& subDir, int flags, bool topLevel) + : COpData(Command::list) + , CSftpOpData(controlSocket) + , path_(path) + , subDir_(subDir) + , flags_(flags) + , topLevel_(topLevel) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + + int ParseEntry(std::wstring && entry, uint64_t mtime, std::wstring && name); + +private: + std::unique_ptr listing_parser_; + + CServerPath path_; + std::wstring subDir_; + + int flags_{}; + + // Set to true to get a directory listing even if a cache + // lookup can be made after finding out true remote directory + bool refresh_{}; + bool fallback_to_current_{}; + + CDirectoryListing directoryListing_; + + fz::monotonic_clock time_before_locking_; + + bool topLevel_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/mkd.cpp filezilla-3.33.0/src/engine/sftp/mkd.cpp --- filezilla-3.15.0.2/src/engine/sftp/mkd.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/mkd.cpp 2018-05-07 08:20:55.000000000 +0000 @@ -0,0 +1,134 @@ +#include + +#include "directorycache.h" +#include "mkd.h" + +enum mkdStates +{ + mkd_init = 0, + mkd_findparent, + mkd_mkdsub, + mkd_cwdsub, + mkd_tryfull +}; + +int CSftpMkdirOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpMkdirOpData::Send() in state %d", opState); + + if (!holdsLock_) { + if (!controlSocket_.TryLock(locking_reason::mkdir, path_)) { + return FZ_REPLY_WOULDBLOCK; + } + } + + switch (opState) + { + case mkd_init: + if (!currentPath_.empty()) { + // Unless the server is broken, a directory already exists if current directory is a subdir of it. + if (currentPath_ == path_ || currentPath_.IsSubdirOf(path_, false)) { + return FZ_REPLY_OK; + } + + if (currentPath_.IsParentOf(path_, false)) { + commonParent_ = currentPath_; + } + else { + commonParent_ = path_.GetCommonParent(currentPath_); + } + } + + if (!path_.HasParent()) { + opState = mkd_tryfull; + } + else { + currentMkdPath_ = path_.GetParent(); + segments_.push_back(path_.GetLastSegment()); + + if (currentMkdPath_ == currentPath_) { + opState = mkd_mkdsub; + } + else { + opState = mkd_findparent; + } + } + return FZ_REPLY_CONTINUE; + case mkd_findparent: + case mkd_cwdsub: + currentPath_.clear(); + return controlSocket_.SendCommand(L"cd " + controlSocket_.QuoteFilename(currentMkdPath_.GetPath())); + case mkd_mkdsub: + return controlSocket_.SendCommand(L"mkdir " + controlSocket_.QuoteFilename(segments_.back())); + case mkd_tryfull: + return controlSocket_.SendCommand(L"mkdir " + controlSocket_.QuoteFilename(path_.GetPath())); + default: + LogMessage(MessageType::Debug_Warning, L"unknown op state: %d", opState); + } + + return FZ_REPLY_INTERNALERROR; +} + +int CSftpMkdirOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpMkdirOpData::ParseResponse() in state %d", opState); + + bool successful = controlSocket_.result_ == FZ_REPLY_OK; + switch (opState) + { + case mkd_findparent: + if (successful) { + currentPath_ = currentMkdPath_; + opState = mkd_mkdsub; + } + else if (currentMkdPath_ == commonParent_) { + opState = mkd_tryfull; + } + else if (currentMkdPath_.HasParent()) { + segments_.push_back(currentMkdPath_.GetLastSegment()); + currentMkdPath_ = currentMkdPath_.GetParent(); + } + else { + opState = mkd_tryfull; + } + return FZ_REPLY_CONTINUE; + case mkd_mkdsub: + if (successful) { + if (segments_.empty()) { + LogMessage(MessageType::Debug_Warning, L" segments_ is empty"); + return FZ_REPLY_INTERNALERROR; + } + engine_.GetDirectoryCache().UpdateFile(currentServer_, currentMkdPath_, segments_.back(), true, CDirectoryCache::dir); + controlSocket_.SendDirectoryListingNotification(currentMkdPath_, false, false); + + currentMkdPath_.AddSegment(segments_.back()); + segments_.pop_back(); + + if (segments_.empty()) { + return FZ_REPLY_OK; + } + else { + opState = mkd_cwdsub; + } + } + else { + opState = mkd_tryfull; + } + return FZ_REPLY_CONTINUE; + case mkd_cwdsub: + if (successful) { + currentPath_ = currentMkdPath_; + opState = mkd_mkdsub; + } + else { + opState = mkd_tryfull; + } + return FZ_REPLY_CONTINUE; + case mkd_tryfull: + return successful ? FZ_REPLY_OK : FZ_REPLY_ERROR; + default: + LogMessage(MessageType::Debug_Warning, L"unknown op state: %d", opState); + } + + return FZ_REPLY_INTERNALERROR; +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/mkd.h filezilla-3.33.0/src/engine/sftp/mkd.h --- filezilla-3.15.0.2/src/engine/sftp/mkd.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/mkd.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef FILEZILLA_ENGINE_SFTP_MKD_HEADER +#define FILEZILLA_ENGINE_SFTP_MKD_HEADER + +#include "sftpcontrolsocket.h" + +class CSftpMkdirOpData final : public CMkdirOpData, public CSftpOpData +{ +public: + CSftpMkdirOpData(CSftpControlSocket & controlSocket) + : CSftpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/rename.cpp filezilla-3.33.0/src/engine/sftp/rename.cpp --- filezilla-3.15.0.2/src/engine/sftp/rename.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/rename.cpp 2017-02-27 04:30:03.000000000 +0000 @@ -0,0 +1,87 @@ +#include + +#include "directorycache.h" +#include "pathcache.h" +#include "rename.h" + +enum renameStates +{ + rename_init, + rename_waitcwd, + rename_rename +}; + +int CSftpRenameOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpRenameOpData::Send() in state %d", opState); + + switch (opState) + { + case rename_init: + controlSocket_.ChangeDir(command_.GetFromPath()); + opState = rename_waitcwd; + return FZ_REPLY_CONTINUE; + case rename_rename: + { + bool wasDir = false; + engine_.GetDirectoryCache().InvalidateFile(currentServer_, command_.GetFromPath(), command_.GetFromFile(), &wasDir); + engine_.GetDirectoryCache().InvalidateFile(currentServer_, command_.GetToPath(), command_.GetToFile()); + + std::wstring fromQuoted = controlSocket_.QuoteFilename(command_.GetFromPath().FormatFilename(command_.GetFromFile(), !useAbsolute_)); + std::wstring toQuoted = controlSocket_.QuoteFilename(command_.GetToPath().FormatFilename(command_.GetToFile(), !useAbsolute_ && command_.GetFromPath() == command_.GetToPath())); + + engine_.GetPathCache().InvalidatePath(currentServer_, command_.GetFromPath(), command_.GetFromFile()); + engine_.GetPathCache().InvalidatePath(currentServer_, command_.GetToPath(), command_.GetToFile()); + + if (wasDir) { + // Need to invalidate current working directories + CServerPath path = engine_.GetPathCache().Lookup(currentServer_, command_.GetFromPath(), command_.GetFromFile()); + if (path.empty()) { + path = command_.GetFromPath(); + path.AddSegment(command_.GetFromFile()); + } + engine_.InvalidateCurrentWorkingDirs(path); + } + + return controlSocket_.SendCommand(L"mv " + controlSocket_.WildcardEscape(fromQuoted) + L" " + toQuoted, L"mv " + fromQuoted + L" " + toQuoted); + } + default: + LogMessage(MessageType::Debug_Warning, L"unknown op state: %d", opState); + break; + } + + return FZ_REPLY_INTERNALERROR; +} + +int CSftpRenameOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpRenameOpData::ParseResponse() in state %d", opState); + + if (controlSocket_.result_ != FZ_REPLY_OK) { + return controlSocket_.result_; + } + + const CServerPath& fromPath = command_.GetFromPath(); + const CServerPath& toPath = command_.GetToPath(); + + engine_.GetDirectoryCache().Rename(currentServer_, fromPath, command_.GetFromFile(), toPath, command_.GetToFile()); + + controlSocket_.SendDirectoryListingNotification(fromPath, false, false); + if (fromPath != toPath) { + controlSocket_.SendDirectoryListingNotification(toPath, false, false); + } + + return FZ_REPLY_OK; +} + +int CSftpRenameOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpRenameOpData::SubcommandResult() in state %d", opState); + + if (prevResult != FZ_REPLY_OK) { + useAbsolute_ = true; + } + + opState = rename_rename; + return FZ_REPLY_CONTINUE; +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/rename.h filezilla-3.33.0/src/engine/sftp/rename.h --- filezilla-3.15.0.2/src/engine/sftp/rename.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/rename.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef FILEZILLA_ENGINE_SFTP_RENAME_HEADER +#define FILEZILLA_ENGINE_SFTP_RENAME_HEADER + +#include "sftpcontrolsocket.h" + +class CSftpRenameOpData final : public COpData, public CSftpOpData +{ +public: + CSftpRenameOpData(CSftpControlSocket & controlSocket, CRenameCommand const& command) + : COpData(Command::rename) + , CSftpOpData(controlSocket) + , command_(command) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int, COpData const&) override; + + CRenameCommand command_; + bool useAbsolute_{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/rmd.cpp filezilla-3.33.0/src/engine/sftp/rmd.cpp --- filezilla-3.15.0.2/src/engine/sftp/rmd.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/rmd.cpp 2017-02-27 04:30:03.000000000 +0000 @@ -0,0 +1,47 @@ +#include + +#include "directorycache.h" +#include "pathcache.h" +#include "rmd.h" + +int CSftpRemoveDirOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpRemoveDirOpData::Send() in state %d", opState); + + CServerPath fullPath = engine_.GetPathCache().Lookup(currentServer_, path_, subDir_); + if (fullPath.empty()) { + fullPath = path_; + + if (!fullPath.AddSegment(subDir_)) { + LogMessage(MessageType::Error, _("Path cannot be constructed for directory %s and subdir %s"), path_.GetPath(), subDir_); + return FZ_REPLY_ERROR; + } + } + + engine_.GetDirectoryCache().InvalidateFile(currentServer_, path_, subDir_); + + engine_.GetPathCache().InvalidatePath(currentServer_, path_, subDir_); + + engine_.InvalidateCurrentWorkingDirs(fullPath); + std::wstring quotedFilename = controlSocket_.QuoteFilename(fullPath.GetPath()); + return controlSocket_.SendCommand(L"rmdir " + controlSocket_.WildcardEscape(quotedFilename), L"rmdir " + quotedFilename); +} + +int CSftpRemoveDirOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpRemoveDirOpData::ParseResponse() in state %d", opState); + + if (controlSocket_.result_ != FZ_REPLY_OK) { + return controlSocket_.result_; + } + + if (path_.empty()) { + LogMessage(MessageType::Debug_Info, L"Empty pData->path"); + return FZ_REPLY_INTERNALERROR; + } + + engine_.GetDirectoryCache().RemoveDir(currentServer_, path_, subDir_, engine_.GetPathCache().Lookup(currentServer_, path_, subDir_)); + controlSocket_.SendDirectoryListingNotification(path_, false, false); + + return FZ_REPLY_OK; +} \ No newline at end of file diff -Nru filezilla-3.15.0.2/src/engine/sftp/rmd.h filezilla-3.33.0/src/engine/sftp/rmd.h --- filezilla-3.15.0.2/src/engine/sftp/rmd.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/rmd.h 2017-02-21 22:01:27.000000000 +0000 @@ -0,0 +1,21 @@ +#ifndef FILEZILLA_ENGINE_SFTP_RMD_HEADER +#define FILEZILLA_ENGINE_SFTP_RMD_HEADER + +#include "sftpcontrolsocket.h" + +class CSftpRemoveDirOpData final : public COpData, public CSftpOpData +{ +public: + CSftpRemoveDirOpData(CSftpControlSocket & controlSocket) + : COpData(Command::removedir) + , CSftpOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + + CServerPath path_; + std::wstring subDir_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftp/sftpcontrolsocket.cpp filezilla-3.33.0/src/engine/sftp/sftpcontrolsocket.cpp --- filezilla-3.15.0.2/src/engine/sftp/sftpcontrolsocket.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/sftpcontrolsocket.cpp 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,671 @@ +#include + +#include "chmod.h" +#include "connect.h" +#include "cwd.h" +#include "delete.h" +#include "directorycache.h" +#include "directorylistingparser.h" +#include "engineprivate.h" +#include "event.h" +#include "filetransfer.h" +#include "list.h" +#include "input_thread.h" +#include "mkd.h" +#include "pathcache.h" +#include "proxy.h" +#include "rename.h" +#include "rmd.h" +#include "servercapabilities.h" +#include "sftpcontrolsocket.h" + +#include +#include +#include + +#include +#include + +CSftpControlSocket::CSftpControlSocket(CFileZillaEnginePrivate & engine) + : CControlSocket(engine) +{ + m_useUTF8 = true; +} + +CSftpControlSocket::~CSftpControlSocket() +{ + remove_handler(); + DoClose(); +} + +void CSftpControlSocket::Connect(CServer const& server, Credentials const& credentials) +{ + LogMessage(MessageType::Status, _("Connecting to %s..."), server.Format(ServerFormat::with_optional_port, credentials)); + SetWait(true); + + m_sftpEncryptionDetails = CSftpEncryptionNotification(); + + if (server.GetEncodingType() == ENCODING_CUSTOM) { + LogMessage(MessageType::Debug_Info, L"Using custom encoding: %s", server.GetCustomEncoding()); + m_useUTF8 = false; + } + else { + m_useUTF8 = true; + } + + currentServer_ = server; + + auto pData = std::make_unique(*this, credentials); + if (!credentials.keyFile_.empty()) { + pData->keyfiles_ = fz::strtok(credentials.keyFile_, L"\r\n"); + } + else { + pData->keyfiles_ = fz::strtok(engine_.GetOptions().GetOption(OPTION_SFTP_KEYFILES), L"\r\n"); + } + + pData->keyfiles_.erase( + std::remove_if(pData->keyfiles_.begin(), pData->keyfiles_.end(), + [this](std::wstring const& keyfile) { + if (fz::local_filesys::get_file_type(fz::to_native(keyfile), true) != fz::local_filesys::file) { + LogMessage(MessageType::Status, _("Skipping non-existing key file \"%s\""), keyfile); + return true; + } + return false; + }), pData->keyfiles_.end()); + + pData->keyfile_ = pData->keyfiles_.cbegin(); + + process_ = std::make_unique(); + + engine_.GetRateLimiter().AddObject(this); + Push(std::move(pData)); +} + +void CSftpControlSocket::OnSftpEvent(sftp_message const& message) +{ + if (!currentServer_) { + return; + } + + if (!input_thread_) { + return; + } + + switch (message.type) + { + case sftpEvent::Reply: + LogMessageRaw(MessageType::Response, message.text[0]); + ProcessReply(FZ_REPLY_OK, message.text[0]); + break; + case sftpEvent::Done: + { + int result; + if (message.text[0] == L"1") { + result = FZ_REPLY_OK; + } + else if (message.text[0] == L"2") { + result = FZ_REPLY_CRITICALERROR; + } + else { + result = FZ_REPLY_ERROR; + } + ProcessReply(result, std::wstring()); + } + break; + case sftpEvent::Error: + LogMessageRaw(MessageType::Error, message.text[0]); + break; + case sftpEvent::Verbose: + LogMessageRaw(MessageType::Debug_Info, message.text[0]); + break; + case sftpEvent::Info: + LogMessageRaw(MessageType::Command, message.text[0]); // Not exactly the right message type, but it's a silent one. + break; + case sftpEvent::Status: + LogMessageRaw(MessageType::Status, message.text[0]); + break; + case sftpEvent::Recv: + SetActive(CFileZillaEngine::recv); + break; + case sftpEvent::Send: + SetActive(CFileZillaEngine::send); + break; + case sftpEvent::Transfer: + { + auto value = fz::to_integral(message.text[0]); + + bool tmp; + CTransferStatus status = engine_.transfer_status_.Get(tmp); + if (!status.empty() && !status.madeProgress) { + if (!operations_.empty() && operations_.back()->opId == Command::transfer) { + auto & data = static_cast(*operations_.back()); + if (data.download_) { + if (value > 0) { + engine_.transfer_status_.SetMadeProgress(); + } + } + else { + if (status.currentOffset > status.startOffset + 65565) { + engine_.transfer_status_.SetMadeProgress(); + } + } + } + } + + engine_.transfer_status_.Update(value); + } + break; + case sftpEvent::AskHostkey: + case sftpEvent::AskHostkeyChanged: + { + auto port = fz::to_integral(message.text[1]); + if (port <= 0 || port > 65535) { + DoClose(FZ_REPLY_INTERNALERROR); + break; + } + SendAsyncRequest(new CHostKeyNotification(message.text[0], port, m_sftpEncryptionDetails, message.type == sftpEvent::AskHostkeyChanged)); + } + break; + case sftpEvent::AskHostkeyBetteralg: + LogMessage(MessageType::Error, L"Got sftpReqHostkeyBetteralg when we shouldn't have. Aborting connection."); + DoClose(FZ_REPLY_INTERNALERROR); + break; + case sftpEvent::AskPassword: + if (operations_.empty() || operations_.back()->opId != Command::connect) { + LogMessage(MessageType::Debug_Warning, L"sftpReqPassword outside connect operation, ignoring."); + break; + } + else { + auto & data = static_cast(*operations_.back()); + + std::wstring const challengeIdentifier = m_requestPreamble + L"\n" + m_requestInstruction + L"\n" + message.text[0]; + + CInteractiveLoginNotification::type t = CInteractiveLoginNotification::interactive; + if (data.credentials_.logonType_ == LogonType::interactive || m_requestPreamble == L"SSH key passphrase") { + if (m_requestPreamble == L"SSH key passphrase") { + t = CInteractiveLoginNotification::keyfile; + } + + std::wstring challenge; + if (!m_requestPreamble.empty() && t != CInteractiveLoginNotification::keyfile) { + challenge += m_requestPreamble + L"\n"; + } + if (!m_requestInstruction.empty()) { + challenge += m_requestInstruction + L"\n"; + } + if (message.text[0] != L"Password:") { + challenge += message.text[0]; + } + CInteractiveLoginNotification *pNotification = new CInteractiveLoginNotification(t, challenge, data.lastChallenge == challengeIdentifier); + pNotification->server = currentServer_; + pNotification->credentials = data.credentials_; + + SendAsyncRequest(pNotification); + } + else { + if (!data.lastChallenge.empty() && data.lastChallengeType != CInteractiveLoginNotification::keyfile) { + // Check for same challenge. Will most likely fail as well, so abort early. + if (data.lastChallenge == challengeIdentifier) { + LogMessage(MessageType::Error, _("Authentication failed.")); + } + else { + LogMessage(MessageType::Error, _("Server sent an additional login prompt. You need to use the interactive login type.")); + } + DoClose(FZ_REPLY_CRITICALERROR | FZ_REPLY_PASSWORDFAILED); + return; + } + + std::wstring const pass = data.credentials_.GetPass(); + std::wstring show = L"Pass: "; + show.append(pass.size(), '*'); + SendCommand(pass, show); + } + data.lastChallenge = challengeIdentifier; + data.lastChallengeType = t; + } + break; + case sftpEvent::RequestPreamble: + m_requestPreamble = message.text[0]; + break; + case sftpEvent::RequestInstruction: + m_requestInstruction = message.text[0]; + break; + case sftpEvent::UsedQuotaRecv: + OnQuotaRequest(CRateLimiter::inbound); + break; + case sftpEvent::UsedQuotaSend: + OnQuotaRequest(CRateLimiter::outbound); + break; + case sftpEvent::KexAlgorithm: + m_sftpEncryptionDetails.kexAlgorithm = message.text[0]; + break; + case sftpEvent::KexHash: + m_sftpEncryptionDetails.kexHash = message.text[0]; + break; + case sftpEvent::KexCurve: + m_sftpEncryptionDetails.kexCurve = message.text[0]; + break; + case sftpEvent::CipherClientToServer: + m_sftpEncryptionDetails.cipherClientToServer = message.text[0]; + break; + case sftpEvent::CipherServerToClient: + m_sftpEncryptionDetails.cipherServerToClient = message.text[0]; + break; + case sftpEvent::MacClientToServer: + m_sftpEncryptionDetails.macClientToServer = message.text[0]; + break; + case sftpEvent::MacServerToClient: + m_sftpEncryptionDetails.macServerToClient = message.text[0]; + break; + case sftpEvent::Hostkey: + { + auto tokens = fz::strtok(message.text[0], ' '); + if (!tokens.empty()) { + m_sftpEncryptionDetails.hostKeyFingerprintSHA256 = tokens.back(); + tokens.pop_back(); + } + if (!tokens.empty()) { + m_sftpEncryptionDetails.hostKeyFingerprintMD5 = tokens.back(); + tokens.pop_back(); + } + for (auto const& token : tokens) { + if (!m_sftpEncryptionDetails.hostKeyAlgorithm.empty()) { + m_sftpEncryptionDetails.hostKeyAlgorithm += ' '; + } + m_sftpEncryptionDetails.hostKeyAlgorithm += token; + } + } + break; + default: + LogMessage(MessageType::Debug_Warning, L"Message type %d not handled", message.type); + break; + } +} + +void CSftpControlSocket::OnSftpListEvent(sftp_list_message const& message) +{ + if (!currentServer_) { + return; + } + + if (!input_thread_) { + return; + } + + if (operations_.empty() || operations_.back()->opId != Command::list) { + LogMessage(MessageType::Debug_Warning, L"sftpEvent::Listentry outside list operation, ignoring."); + return; + } + else { + int res = static_cast(*operations_.back()).ParseEntry(std::move(message.text), message.mtime, std::move(message.name)); + if (res != FZ_REPLY_WOULDBLOCK) { + ResetOperation(res); + } + } +} + +void CSftpControlSocket::OnTerminate(std::wstring const& error) +{ + if (!error.empty()) { + LogMessageRaw(MessageType::Error, error); + } + else { + LogMessageRaw(MessageType::Debug_Info, L"CSftpControlSocket::OnTerminate without error"); + } + if (process_) { + DoClose(); + } +} + +int CSftpControlSocket::SendCommand(std::wstring const& cmd, std::wstring const& show) +{ + SetWait(true); + + LogMessageRaw(MessageType::Command, show.empty() ? cmd : show); + + // Check for newlines in command + // a command like "ls\nrm foo/bar" is dangerous + if (cmd.find('\n') != std::wstring::npos || + cmd.find('\r') != std::wstring::npos) + { + LogMessage(MessageType::Debug_Warning, L"Command containing newline characters, aborting."); + return FZ_REPLY_INTERNALERROR; + } + + return AddToStream(cmd + L"\n"); +} + +int CSftpControlSocket::AddToStream(std::wstring const& cmd) +{ + std::string const str = ConvToServer(cmd); + if (str.empty()) { + LogMessage(MessageType::Error, _("Could not convert command to server encoding")); + return FZ_REPLY_ERROR; + } + + return AddToStream(str); +} + +int CSftpControlSocket::AddToStream(std::string const& cmd) +{ + if (!process_) { + return FZ_REPLY_INTERNALERROR; + } + + if (!process_->write(cmd)) { + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + + return FZ_REPLY_WOULDBLOCK; +} + +bool CSftpControlSocket::SetAsyncRequestReply(CAsyncRequestNotification *pNotification) +{ + if (operations_.empty() || !operations_.back()->waitForAsyncRequest) { + LogMessage(MessageType::Debug_Info, L"Not waiting for request reply, ignoring request reply %d", pNotification->GetRequestID()); + return false; + } + + operations_.back()->waitForAsyncRequest = false; + + RequestId const requestId = pNotification->GetRequestID(); + switch(requestId) + { + case reqId_fileexists: + { + auto *pFileExistsNotification = static_cast(pNotification); + return SetFileExistsAction(pFileExistsNotification); + } + case reqId_hostkey: + case reqId_hostkeyChanged: + { + if (GetCurrentCommandId() != Command::connect || + !currentServer_) + { + LogMessage(MessageType::Debug_Info, L"SetAsyncRequestReply called to wrong time"); + return false; + } + + auto *pHostKeyNotification = static_cast(pNotification); + std::wstring show; + if (requestId == reqId_hostkey) { + show = _("Trust new Hostkey:"); + } + else { + show = _("Trust changed Hostkey:"); + } + show += ' '; + if (!pHostKeyNotification->m_trust) { + SendCommand(std::wstring(), show + _("No")); + if (operations_.back()->opId == Command::connect) { + auto &data = static_cast(*operations_.back()); + data.criticalFailure = true; + } + } + else if (pHostKeyNotification->m_alwaysTrust) { + SendCommand(L"y", show + _("Yes")); + } + else { + SendCommand(L"n", show + _("Once")); + } + } + break; + case reqId_interactiveLogin: + { + if (operations_.empty() || operations_.back()->opId != Command::connect) { + LogMessage(MessageType::Debug_Info, L"No or invalid operation in progress, ignoring request reply %d", pNotification->GetRequestID()); + return false; + } + + auto & data = static_cast(*operations_.back()); + + auto *pInteractiveLoginNotification = static_cast(pNotification); + + if (!pInteractiveLoginNotification->passwordSet) { + DoClose(FZ_REPLY_CANCELED); + return false; + } + std::wstring const& pass = pInteractiveLoginNotification->credentials.GetPass(); + data.credentials_.SetPass(pass); + std::wstring show = L"Pass: "; + show.append(pass.size(), '*'); + SendCommand(pass, show); + } + break; + default: + LogMessage(MessageType::Debug_Warning, L"Unknown async request reply id: %d", requestId); + return false; + } + + return true; +} + +void CSftpControlSocket::List(CServerPath const& path, std::wstring const& subDir, int flags) +{ + CServerPath newPath = currentPath_; + if (!path.empty()) { + newPath = path; + } + if (!newPath.ChangePath(subDir)) { + newPath.clear(); + } + + if (newPath.empty()) { + LogMessage(MessageType::Status, _("Retrieving directory listing...")); + } + else { + LogMessage(MessageType::Status, _("Retrieving directory listing of \"%s\"..."), newPath.GetPath()); + } + + Push(std::make_unique(*this, path, subDir, flags, operations_.empty())); +} + +void CSftpControlSocket::ChangeDir(CServerPath const& path, std::wstring const& subDir, bool link_discovery) +{ + auto pData = std::make_unique(*this); + pData->path_ = path; + pData->subDir_ = subDir; + pData->link_discovery_ = link_discovery; + + if (!operations_.empty() && operations_.back()->opId == Command::transfer && + !static_cast(*operations_.back()).download_) + { + pData->tryMkdOnFail_ = true; + assert(subDir.empty()); + } + + Push(std::move(pData)); +} + +void CSftpControlSocket::ProcessReply(int result, std::wstring const& reply) +{ + result_ = result; + response_ = reply; + + if (operations_.empty()) { + LogMessage(MessageType::Debug_Info, L"Skipping reply without active operation."); + return; + } + + auto & data = *operations_.back(); + int res = data.ParseResponse(); + if (res == FZ_REPLY_OK) { + ResetOperation(FZ_REPLY_OK); + } + else if (res == FZ_REPLY_CONTINUE) { + SendNextCommand(); + } + else if (res & FZ_REPLY_DISCONNECTED) { + DoClose(res); + } + else if (res & FZ_REPLY_ERROR) { + if (data.opId == Command::connect) { + DoClose(res | FZ_REPLY_DISCONNECTED); + } + else { + ResetOperation(res); + } + } +} +void CSftpControlSocket::FileTransfer(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const& transferSettings) +{ + auto pData = std::make_unique(*this, download, localFile, remoteFile, remotePath); + pData->transferSettings_ = transferSettings; + Push(std::move(pData)); +} + +int CSftpControlSocket::DoClose(int nErrorCode) +{ + engine_.GetRateLimiter().RemoveObject(this); + + if (process_) { + process_->kill(); + } + + if (input_thread_) { + input_thread_.reset(); + + auto threadEventsFilter = [&](fz::event_loop::Events::value_type const& ev) -> bool { + if (ev.first != this) { + return false; + } + else if (ev.second->derived_type() == CSftpEvent::type() || ev.second->derived_type() == CTerminateEvent::type()) { + return true; + } + return false; + }; + + event_loop_.filter_events(threadEventsFilter); + } + process_.reset(); + return CControlSocket::DoClose(nErrorCode); +} + +void CSftpControlSocket::Cancel() +{ + if (GetCurrentCommandId() != Command::none) { + DoClose(FZ_REPLY_CANCELED); + } +} + +void CSftpControlSocket::Mkdir(CServerPath const& path) +{ + /* Directory creation works like this: First find a parent directory into + * which we can CWD, then create the subdirs one by one. If either part + * fails, try MKD with the full path directly. + */ + + if (operations_.empty()) { + LogMessage(MessageType::Status, _("Creating directory '%s'..."), path.GetPath()); + } + + auto pData = std::make_unique(*this); + pData->path_ = path; + Push(std::move(pData)); +} + +std::wstring CSftpControlSocket::QuoteFilename(std::wstring const& filename) +{ + return L"\"" + fz::replaced_substrings(filename, L"\"", L"\"\"") + L"\""; +} + +void CSftpControlSocket::Delete(const CServerPath& path, std::deque&& files) +{ + // CFileZillaEnginePrivate should have checked this already + assert(!files.empty()); + + LogMessage(MessageType::Debug_Verbose, L"CSftpControlSocket::Delete"); + + auto pData = std::make_unique(*this); + pData->path_ = path; + pData->files_ = std::move(files); + Push(std::move(pData)); +} + +void CSftpControlSocket::RemoveDir(CServerPath const& path, std::wstring const& subDir) +{ + LogMessage(MessageType::Debug_Verbose, L"CSftpControlSocket::RemoveDir"); + + auto pData = std::make_unique(*this); + pData->path_ = path; + pData->subDir_ = subDir; + Push(std::move(pData)); +} + +void CSftpControlSocket::Chmod(CChmodCommand const& command) +{ + LogMessage(MessageType::Status, _("Setting permissions of '%s' to '%s'"), command.GetPath().FormatFilename(command.GetFile()), command.GetPermission()); + Push(std::make_unique(*this, command)); +} + +void CSftpControlSocket::Rename(CRenameCommand const& command) +{ + LogMessage(MessageType::Status, _("Renaming '%s' to '%s'"), command.GetFromPath().FormatFilename(command.GetFromFile()), command.GetToPath().FormatFilename(command.GetToFile())); + Push(std::make_unique(*this, command)); +} + +std::wstring CSftpControlSocket::WildcardEscape(std::wstring const& file) +{ + std::wstring ret; + // see src/putty/wildcard.c + + ret.reserve(file.size()); + for (size_t i = 0; i < file.size(); ++i) { + auto const& c = file[i]; + switch (c) + { + case '[': + case ']': + case '*': + case '?': + case '\\': + ret.push_back('\\'); + break; + default: + break; + } + ret.push_back(c); + } + return ret; +} + +void CSftpControlSocket::OnRateAvailable(CRateLimiter::rate_direction direction) +{ + OnQuotaRequest(direction); +} + +void CSftpControlSocket::OnQuotaRequest(CRateLimiter::rate_direction direction) +{ + int64_t bytes = GetAvailableBytes(direction); + if (bytes > 0) { + int b; + if (bytes > std::numeric_limits::max()) { + b = std::numeric_limits::max(); + } + else { + b = static_cast(bytes); + } + AddToStream(fz::sprintf(L"-%d%d,%d\n", direction, b, engine_.GetOptions().GetOptionVal(OPTION_SPEEDLIMIT_INBOUND + static_cast(direction)))); + UpdateUsage(direction, b); + } + else if (bytes == 0) { + Wait(direction); + } + else if (bytes < 0) { + AddToStream(fz::sprintf(L"-%d-\n", direction)); + } +} + +void CSftpControlSocket::operator()(fz::event_base const& ev) +{ + if (fz::dispatch(ev, this, + &CSftpControlSocket::OnSftpEvent, + &CSftpControlSocket::OnSftpListEvent, + &CSftpControlSocket::OnTerminate)) { + return; + } + + CControlSocket::operator()(ev); +} diff -Nru filezilla-3.15.0.2/src/engine/sftp/sftpcontrolsocket.h filezilla-3.33.0/src/engine/sftp/sftpcontrolsocket.h --- filezilla-3.15.0.2/src/engine/sftp/sftpcontrolsocket.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftp/sftpcontrolsocket.h 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,88 @@ +#ifndef FILEZILLA_ENGINE_SFTP_SFTPCONTROLSOCKET_HEADER +#define FILEZILLA_ENGINE_SFTP_SFTPCONTROLSOCKET_HEADER + +#include "ControlSocket.h" + +#include "backend.h" + +namespace fz { +class process; +} + +class CSftpInputThread; +struct sftp_message; +struct sftp_list_message; + +class CSftpControlSocket final : public CControlSocket, public CRateLimiterObject +{ +public: + CSftpControlSocket(CFileZillaEnginePrivate & engine); + virtual ~CSftpControlSocket(); + + virtual void Connect(CServer const& server, Credentials const& credentials) override; + virtual void List(CServerPath const& path = CServerPath(), std::wstring const& subDir = std::wstring(), int flags = 0) override; + void ChangeDir(CServerPath const& path = CServerPath(), std::wstring const& subDir = std::wstring(), bool link_discovery = false); + virtual void FileTransfer(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const& transferSettings) override; + virtual void Delete(CServerPath const& path, std::deque&& files) override; + virtual void RemoveDir(CServerPath const& path = CServerPath(), std::wstring const& subDir = std::wstring()) override; + virtual void Mkdir(CServerPath const& path) override; + virtual void Rename(CRenameCommand const& command) override; + virtual void Chmod(CChmodCommand const& command) override; + virtual void Cancel() override; + + virtual bool Connected() const override { return input_thread_.operator bool(); } + + virtual bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification) override; + +protected: + // Replaces filename"with"quotes with + // "filename""with""quotes" + std::wstring QuoteFilename(std::wstring const& filename); + + virtual int DoClose(int nErrorCode = FZ_REPLY_DISCONNECTED | FZ_REPLY_ERROR) override; + + void ProcessReply(int result, std::wstring const& reply); + + int SendCommand(std::wstring const& cmd, std::wstring const& show = std::wstring()); + int AddToStream(std::wstring const& cmd); + int AddToStream(std::string const& cmd); + + virtual void OnRateAvailable(CRateLimiter::rate_direction direction) override; + void OnQuotaRequest(CRateLimiter::rate_direction direction); + + // see src/putty/wildcard.c + std::wstring WildcardEscape(std::wstring const& file); + + std::unique_ptr process_; + std::unique_ptr input_thread_; + + virtual void operator()(fz::event_base const& ev) override; + void OnSftpEvent(sftp_message const& message); + void OnSftpListEvent(sftp_list_message const& message); + void OnTerminate(std::wstring const& error); + + std::wstring m_requestPreamble; + std::wstring m_requestInstruction; + + CSftpEncryptionNotification m_sftpEncryptionDetails; + + int result_{}; + std::wstring response_; + + friend class CProtocolOpData; + friend class CSftpChangeDirOpData; + friend class CSftpChmodOpData; + friend class CSftpConnectOpData; + friend class CSftpDeleteOpData; + friend class CSftpFileTransferOpData; + friend class CSftpListOpData; + friend class CSftpMkdirOpData; + friend class CSftpRemoveDirOpData; + friend class CSftpRenameOpData; +}; + +typedef CProtocolOpData CSftpOpData; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/sftpcontrolsocket.cpp filezilla-3.33.0/src/engine/sftpcontrolsocket.cpp --- filezilla-3.15.0.2/src/engine/sftpcontrolsocket.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftpcontrolsocket.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,2651 +0,0 @@ -#include - -#include "directorycache.h" -#include "directorylistingparser.h" -#include "engineprivate.h" -#include "pathcache.h" -#include "proxy.h" -#include "servercapabilities.h" -#include "sftpcontrolsocket.h" - -#include -#include -#include - -#include -#include -#include -#include - -#define FZSFTP_PROTOCOL_VERSION 4 - -struct sftp_event_type; -typedef fz::simple_event CSftpEvent; - -struct terminate_event_type; -typedef fz::simple_event CTerminateEvent; - -class CSftpFileTransferOpData : public CFileTransferOpData -{ -public: - CSftpFileTransferOpData(bool is_download, const wxString& local_file, const wxString& remote_file, const CServerPath& remote_path) - : CFileTransferOpData(is_download, local_file, remote_file, remote_path) - { - } -}; - -enum filetransferStates -{ - filetransfer_init = 0, - filetransfer_waitcwd, - filetransfer_waitlist, - filetransfer_mtime, - filetransfer_transfer, - filetransfer_chmtime -}; - -struct sftp_message -{ - sftpEvent type; - wxString text; - union - { - sftpRequestTypes reqType; - int value; - }; -}; - -class CSftpInputThread final : public fz::thread -{ -public: - CSftpInputThread(CSftpControlSocket* pOwner, fz::process& proc) - : process_(proc) - , m_pOwner(pOwner) - { - } - - virtual ~CSftpInputThread() - { - join(); - - fz::scoped_lock l(m_sync); - for (auto & msg : m_sftpMessages) { - delete msg; - } - } - - void GetMessages(std::vector& messages) - { - fz::scoped_lock l(m_sync); - messages.swap(m_sftpMessages); - } - -protected: - - void SendMessage(sftp_message* message) - { - bool sendEvent; - - { - fz::scoped_lock l(m_sync); - sendEvent = m_sftpMessages.empty(); - m_sftpMessages.push_back(message); - } - - if (sendEvent) - m_pOwner->send_event(); - } - - int ReadNumber(bool &error) - { - int number = 0; - - while(true) { - char c; - int read = process_.read(&c, 1); - if (read != 1) { - if (!read) - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Unexpected EOF.")); - else - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Uknown input stream error")); - error = true; - return 0; - } - - if (c == '\n') - break; - else if (c >= '0' && c <= '9') { - number *= 10; - number += c - '0'; - } - } - return number; - } - - wxString ReadLine(bool &error) - { - int len = 0; - const int buffersize = 4096; - char buffer[buffersize]; - - while(true) { - char c; - int read = process_.read(&c, 1); - if (read != 1) { - if (!read) - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Unexpected EOF.")); - else - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Uknown input stream error")); - error = true; - return wxString(); - } - - if (c == '\n') - break; - - if (len == buffersize - 1) { - // Cap string length - continue; - } - - buffer[len++] = c; - } - - while (len && buffer[len - 1] == '\r') - --len; - - buffer[len] = 0; - - const wxString line = m_pOwner->ConvToLocal(buffer, len + 1); - if (len && line.empty()) { - m_pOwner->LogMessage(MessageType::Error, _T("Failed to convert reply to local character set.")); - error = true; - } - - return line; - } - - virtual void entry() - { - bool error = false; - while (!error) { - char readType = 0; - int read = process_.read(&readType, 1); - if (read != 1) - break; - - readType -= '0'; - - sftpEvent eventType = sftpEvent::Unknown; - if( readType >= 0 && readType <= static_cast(sftpEvent::max) ) { - eventType = static_cast(readType); - } - - switch(eventType) - { - case sftpEvent::Reply: - case sftpEvent::Listentry: - case sftpEvent::RequestPreamble: - case sftpEvent::RequestInstruction: - case sftpEvent::Done: - case sftpEvent::Error: - case sftpEvent::Verbose: - case sftpEvent::Status: - case sftpEvent::KexAlgorithm: - case sftpEvent::KexHash: - case sftpEvent::KexCurve: - case sftpEvent::CipherClientToServer: - case sftpEvent::CipherServerToClient: - case sftpEvent::MacClientToServer: - case sftpEvent::MacServerToClient: - case sftpEvent::Hostkey: - { - sftp_message* message = new sftp_message; - message->type = eventType; - message->text = ReadLine(error); - if (error) { - delete message; - goto loopexit; - } - SendMessage(message); - } - break; - case sftpEvent::Request: - { - const wxString& line = ReadLine(error); - if (error || line.empty()) - goto loopexit; - int requestType = line[0] - '0'; - if (requestType == sftpReqHostkey || requestType == sftpReqHostkeyChanged) { - const wxString& strPort = ReadLine(error); - if (error) - goto loopexit; - long port = 0; - if (!strPort.ToLong(&port)) - goto loopexit; - const wxString& fingerprint = ReadLine(error); - if (error) - goto loopexit; - - m_pOwner->SendAsyncRequest(new CHostKeyNotification(line.Mid(1), port, fingerprint, requestType == sftpReqHostkeyChanged)); - } - else if (requestType == sftpReqPassword) - { - sftp_message* message = new sftp_message; - message->type = eventType; - message->reqType = sftpReqPassword; - message->text = line.Mid(1); - SendMessage(message); - } - } - break; - case sftpEvent::Recv: - case sftpEvent::Send: - case sftpEvent::UsedQuotaRecv: - case sftpEvent::UsedQuotaSend: - { - sftp_message* message = new sftp_message; - message->type = eventType; - SendMessage(message); - } - break; - case sftpEvent::Transfer: - { - sftp_message* message = new sftp_message; - message->type = eventType; - message->value = ReadNumber(error); - if (error) { - delete message; - goto loopexit; - } - if (!message->value) - delete message; - else - SendMessage(message); - } - break; - default: - { - char tmp[2]; - tmp[0] = static_cast(eventType) + '0'; - tmp[1] = 0; - m_pOwner->LogMessage(MessageType::Debug_Info, _T("Unknown eventType: %s"), tmp); - } - break; - } - } -loopexit: - - m_pOwner->send_event(); - } - - fz::process& process_; - CSftpControlSocket* m_pOwner; - - std::vector m_sftpMessages; - fz::mutex m_sync; -}; - -class CSftpDeleteOpData final : public COpData -{ -public: - CSftpDeleteOpData() - : COpData(Command::del) - { - } - - virtual ~CSftpDeleteOpData() {} - - CServerPath path; - std::deque files; - - // Set to fz::datetime::Now initially and after - // sending an updated listing to the UI. - fz::datetime m_time; - - bool m_needSendListing{}; - - // Set to true if deletion of at least one file failed - bool m_deleteFailed{}; -}; - -CSftpControlSocket::CSftpControlSocket(CFileZillaEnginePrivate & engine) - : CControlSocket(engine) -{ - m_useUTF8 = true; -} - -CSftpControlSocket::~CSftpControlSocket() -{ - remove_handler(); - DoClose(); -} - -enum connectStates -{ - connect_init, - connect_proxy, - connect_keys, - connect_open -}; - -class CSftpConnectOpData : public COpData -{ -public: - CSftpConnectOpData() - : COpData(Command::connect) - { - criticalFailure = false; - pKeyFiles = 0; - } - - virtual ~CSftpConnectOpData() - { - delete pKeyFiles; - } - - wxString lastChallenge; - bool criticalFailure; - - wxStringTokenizer* pKeyFiles; -}; - -int CSftpControlSocket::Connect(const CServer &server) -{ - LogMessage(MessageType::Status, _("Connecting to %s..."), server.FormatHost()); - SetWait(true); - - m_sftpEncryptionDetails = CSftpEncryptionNotification(); - - delete m_pCSConv; - if (server.GetEncodingType() == ENCODING_CUSTOM) { - LogMessage(MessageType::Debug_Info, _T("Using custom encoding: %s"), server.GetCustomEncoding()); - m_pCSConv = new wxCSConv(server.GetCustomEncoding()); - m_useUTF8 = false; - } - else { - m_pCSConv = 0; - m_useUTF8 = true; - } - - delete m_pCurrentServer; - m_pCurrentServer = new CServer(server); - - if (CServerCapabilities::GetCapability(*m_pCurrentServer, timezone_offset) == unknown) { - CServerCapabilities::SetCapability(*m_pCurrentServer, timezone_offset, yes, 0); - } - - CSftpConnectOpData* pData = new CSftpConnectOpData; - m_pCurOpData = pData; - - pData->opState = connect_init; - - wxStringTokenizer* pTokenizer; - if (m_pCurrentServer->GetLogonType() == KEY) - pTokenizer = new wxStringTokenizer(m_pCurrentServer->GetKeyFile() + _T("\n"), _T("\n"), wxTOKEN_DEFAULT); - else - pTokenizer = new wxStringTokenizer(engine_.GetOptions().GetOption(OPTION_SFTP_KEYFILES), _T("\n"), wxTOKEN_DEFAULT); - - if (!pTokenizer->HasMoreTokens()) - delete pTokenizer; - else - pData->pKeyFiles = pTokenizer; - - m_pProcess = new fz::process(); - - engine_.GetRateLimiter().AddObject(this); - - auto executable = fz::to_native(engine_.GetOptions().GetOption(OPTION_FZSFTP_EXECUTABLE)); - if (executable.empty()) - executable = fzT("fzsftp"); - LogMessage(MessageType::Debug_Verbose, _T("Going to execute %s"), executable); - - std::vector args = {fzT("-v")}; - if (engine_.GetOptions().GetOptionVal(OPTION_SFTP_COMPRESSION)) { - args.push_back(fzT("-C")); - } - if (!m_pProcess->spawn(executable, args)) { - LogMessage(MessageType::Debug_Warning, _T("Could not create process: %s"), wxSysErrorMsg()); - DoClose(); - return FZ_REPLY_ERROR; - } - - m_pInputThread = new CSftpInputThread(this, *m_pProcess); - if (!m_pInputThread->run()) { - LogMessage(MessageType::Debug_Warning, _T("Thread creation failed")); - delete m_pInputThread; - m_pInputThread = 0; - DoClose(); - return FZ_REPLY_ERROR; - } - - return FZ_REPLY_WOULDBLOCK; -} - -int CSftpControlSocket::ConnectParseResponse(bool successful, const wxString& reply) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ConnectParseResponse(%s)"), reply); - - if (!successful) { - DoClose(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpConnectOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData of wrong type")); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - switch (pData->opState) - { - case connect_init: - if (reply != wxString::Format(_T("fzSftp started, protocol_version=%d"), FZSFTP_PROTOCOL_VERSION)) { - LogMessage(MessageType::Error, _("fzsftp belongs to a different version of FileZilla")); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - if (engine_.GetOptions().GetOptionVal(OPTION_PROXY_TYPE) && !m_pCurrentServer->GetBypassProxy()) - pData->opState = connect_proxy; - else if (pData->pKeyFiles) - pData->opState = connect_keys; - else - pData->opState = connect_open; - break; - case connect_proxy: - if (pData->pKeyFiles) - pData->opState = connect_keys; - else - pData->opState = connect_open; - break; - case connect_keys: - wxASSERT(pData->pKeyFiles); - if (!pData->pKeyFiles->HasMoreTokens()) - pData->opState = connect_open; - break; - case connect_open: - engine_.AddNotification(new CSftpEncryptionNotification(m_sftpEncryptionDetails)); - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown op state: %d"), pData->opState); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - return SendNextCommand(); -} - -int CSftpControlSocket::ConnectSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ConnectSend()")); - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpConnectOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData of wrong type")); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - bool res; - switch (pData->opState) - { - case connect_proxy: - { - int type; - switch (engine_.GetOptions().GetOptionVal(OPTION_PROXY_TYPE)) - { - case CProxySocket::HTTP: - type = 1; - break; - case CProxySocket::SOCKS5: - type = 2; - break; - case CProxySocket::SOCKS4: - type = 3; - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unsupported proxy type")); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - wxString cmd = wxString::Format(_T("proxy %d \"%s\" %d"), type, - engine_.GetOptions().GetOption(OPTION_PROXY_HOST), - engine_.GetOptions().GetOptionVal(OPTION_PROXY_PORT)); - wxString user = engine_.GetOptions().GetOption(OPTION_PROXY_USER); - if (!user.empty()) - cmd += _T(" \"") + user + _T("\""); - - wxString show = cmd; - - wxString pass = engine_.GetOptions().GetOption(OPTION_PROXY_PASS); - if (!pass.empty()) - { - cmd += _T(" \"") + pass + _T("\""); - show += _T(" \"") + wxString('*', pass.Len()) + _T("\""); - } - res = SendCommand(cmd, show); - } - break; - case connect_keys: - res = SendCommand(_T("keyfile \"") + pData->pKeyFiles->GetNextToken() + _T("\"")); - break; - case connect_open: - res = SendCommand(wxString::Format(_T("open \"%s@%s\" %d"), m_pCurrentServer->GetUser(), m_pCurrentServer->GetHost(), m_pCurrentServer->GetPort())); - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown op state: %d"), pData->opState); - DoClose(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (res) - return FZ_REPLY_WOULDBLOCK; - else - return FZ_REPLY_ERROR; -} - -void CSftpControlSocket::OnSftpEvent() -{ - if (!m_pCurrentServer) - return; - - if (!m_pInputThread) - return; - - std::vector messages; - m_pInputThread->GetMessages(messages); - for (auto iter = messages.begin(); iter != messages.end(); ++iter) { - if (!m_pInputThread) { - delete *iter; - continue; - } - - sftp_message* message = *iter; - - switch (message->type) - { - case sftpEvent::Reply: - LogMessageRaw(MessageType::Response, message->text); - ProcessReply(FZ_REPLY_OK, message->text); - break; - case sftpEvent::Status: - LogMessageRaw(MessageType::Status, message->text); - break; - case sftpEvent::Error: - LogMessageRaw(MessageType::Error, message->text); - break; - case sftpEvent::Verbose: - LogMessageRaw(MessageType::Debug_Info, message->text); - break; - case sftpEvent::Done: - { - int result; - if (message->text == _T("1")) { - result = FZ_REPLY_OK; - } - else if (message->text == _T("2")) { - result = FZ_REPLY_CRITICALERROR; - } - else { - result = FZ_REPLY_ERROR; - } - ProcessReply(result); - break; - } - case sftpEvent::RequestPreamble: - m_requestPreamble = message->text; - break; - case sftpEvent::RequestInstruction: - m_requestInstruction = message->text; - break; - case sftpEvent::Request: - switch(message->reqType) - { - case sftpReqPassword: - if (!m_pCurOpData || m_pCurOpData->opId != Command::connect) { - LogMessage(MessageType::Debug_Warning, _T("sftpReqPassword outside connect operation, ignoring.")); - break; - } - else { - CSftpConnectOpData *pData = static_cast(m_pCurOpData); - - wxString const challengeIdentifier = m_requestPreamble + _T("\n") + m_requestInstruction + _T("\n") + message->text; - - if (m_pCurrentServer->GetLogonType() == INTERACTIVE || m_requestPreamble == _T("SSH key passphrase")) { - CInteractiveLoginNotification::type t = CInteractiveLoginNotification::interactive; - if (m_requestPreamble == _T("SSH key passphrase")) { - t = CInteractiveLoginNotification::keyfile; - } - - wxString challenge; - if (!m_requestPreamble.empty() && t != CInteractiveLoginNotification::keyfile) - challenge += m_requestPreamble + _T("\n"); - if (!m_requestInstruction.empty()) - challenge += m_requestInstruction + _T("\n"); - if (message->text != _T("Password:")) - challenge += message->text; - CInteractiveLoginNotification *pNotification = new CInteractiveLoginNotification(t, challenge, pData->lastChallenge == challengeIdentifier); - pNotification->server = *m_pCurrentServer; - - pData->lastChallenge = challengeIdentifier; - - SendAsyncRequest(pNotification); - } - else { - const wxString newChallenge = m_requestPreamble + _T("\n") + m_requestInstruction + message->text; - - if (!pData->lastChallenge.empty()) { - // Check for same challenge. Will most likely fail as well, so abort early. - if (pData->lastChallenge == challengeIdentifier) { - LogMessage(MessageType::Error, _("Authentication failed.")); - } - else { - LogMessage(MessageType::Error, _("Server sent an additional login prompt. You need to use the interactive login type.")); - } - DoClose(FZ_REPLY_CRITICALERROR | FZ_REPLY_PASSWORDFAILED); - - for (;iter != messages.end(); ++iter) - delete *iter; - return; - } - - pData->lastChallenge = challengeIdentifier; - - const wxString pass = m_pCurrentServer->GetPass(); - wxString show = _T("Pass: "); - show.Append('*', pass.Length()); - SendCommand(pass, show); - } - } - break; - default: - wxFAIL_MSG(_T("given notification codes should have been handled by thread")); - break; - } - break; - case sftpEvent::Listentry: - ListParseEntry(message->text); - break; - case sftpEvent::Transfer: - { - bool tmp; - CTransferStatus status = engine_.transfer_status_.Get(tmp); - if (!status.empty() && !status.madeProgress) { - if (m_pCurOpData && m_pCurOpData->opId == Command::transfer) { - CSftpFileTransferOpData *pData = static_cast(m_pCurOpData); - if (pData->download) { - if (message->value > 0) - engine_.transfer_status_.SetMadeProgress(); - } - else - { - if (status.currentOffset > status.startOffset + 65565) - engine_.transfer_status_.SetMadeProgress(); - } - } - } - - engine_.transfer_status_.Update(message->value); - } - break; - case sftpEvent::Recv: - SetActive(CFileZillaEngine::recv); - break; - case sftpEvent::Send: - SetActive(CFileZillaEngine::send); - break; - case sftpEvent::UsedQuotaRecv: - OnQuotaRequest(CRateLimiter::inbound); - break; - case sftpEvent::UsedQuotaSend: - OnQuotaRequest(CRateLimiter::outbound); - break; - case sftpEvent::KexAlgorithm: - m_sftpEncryptionDetails.kexAlgorithm = message->text; - break; - case sftpEvent::KexHash: - m_sftpEncryptionDetails.kexHash = message->text; - break; - case sftpEvent::KexCurve: - m_sftpEncryptionDetails.kexCurve = message->text; - break; - case sftpEvent::CipherClientToServer: - m_sftpEncryptionDetails.cipherClientToServer = message->text; - break; - case sftpEvent::CipherServerToClient: - m_sftpEncryptionDetails.cipherServerToClient = message->text; - break; - case sftpEvent::MacClientToServer: - m_sftpEncryptionDetails.macClientToServer = message->text; - break; - case sftpEvent::MacServerToClient: - m_sftpEncryptionDetails.macServerToClient = message->text; - break; - case sftpEvent::Hostkey: - m_sftpEncryptionDetails.hostKey = message->text; - break; - default: - wxFAIL_MSG(_T("given notification codes not handled")); - break; - } - delete message; - } -} - -void CSftpControlSocket::OnTerminate() -{ - if (m_pProcess) { - DoClose(); - } -} - -bool CSftpControlSocket::SendCommand(wxString const& cmd, const wxString& show) -{ - SetWait(true); - - if (!show.empty()) - LogMessageRaw(MessageType::Command, show); - else - LogMessageRaw(MessageType::Command, cmd); - - // Check for newlines in command - // a command like "ls\nrm foo/bar" is dangerous - if (cmd.Find('\n') != -1 || - cmd.Find('\r') != -1) - { - LogMessage(MessageType::Debug_Warning, _T("Command containing newline characters, aborting")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return false; - } - - return AddToStream(cmd + _T("\n")); -} - -bool CSftpControlSocket::AddToStream(const wxString& cmd, bool force_utf8 /*=false*/) -{ - if (!m_pProcess) - return false; - - wxCharBuffer const str = ConvToServer(cmd, force_utf8); - if (!str) { - LogMessage(MessageType::Error, _("Could not convert command to server encoding")); - return false; - } - - unsigned int len = strlen(str); - return m_pProcess->write(str, len); -} - -bool CSftpControlSocket::SetAsyncRequestReply(CAsyncRequestNotification *pNotification) -{ - if (m_pCurOpData) - { - if (!m_pCurOpData->waitForAsyncRequest) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Not waiting for request reply, ignoring request reply %d"), pNotification->GetRequestID()); - return false; - } - m_pCurOpData->waitForAsyncRequest = false; - } - - RequestId const requestId = pNotification->GetRequestID(); - switch(requestId) - { - case reqId_fileexists: - { - CFileExistsNotification *pFileExistsNotification = static_cast(pNotification); - return SetFileExistsAction(pFileExistsNotification); - } - case reqId_hostkey: - case reqId_hostkeyChanged: - { - if (GetCurrentCommandId() != Command::connect || - !m_pCurrentServer) - { - LogMessage(MessageType::Debug_Info, _T("SetAsyncRequestReply called to wrong time")); - return false; - } - - CHostKeyNotification *pHostKeyNotification = static_cast(pNotification); - wxString show; - if (requestId == reqId_hostkey) - show = _("Trust new Hostkey:"); - else - show = _("Trust changed Hostkey:"); - show += ' '; - if (!pHostKeyNotification->m_trust) - { - SendCommand(_T(""), show + _("No")); - if (m_pCurOpData && m_pCurOpData->opId == Command::connect) - { - CSftpConnectOpData *pData = static_cast(m_pCurOpData); - pData->criticalFailure = true; - } - } - else if (pHostKeyNotification->m_alwaysTrust) - SendCommand(_T("y"), show + _("Yes")); - else - SendCommand(_T("n"), show + _("Once")); - } - break; - case reqId_interactiveLogin: - { - CInteractiveLoginNotification *pInteractiveLoginNotification = static_cast(pNotification); - - if (!pInteractiveLoginNotification->passwordSet) { - DoClose(FZ_REPLY_CANCELED); - return false; - } - const wxString pass = pInteractiveLoginNotification->server.GetPass(); - m_pCurrentServer->SetUser(m_pCurrentServer->GetUser(), pass); - wxString show = _T("Pass: "); - show.Append('*', pass.Length()); - SendCommand(pass, show); - } - break; - default: - LogMessage(MessageType::Debug_Warning, _T("Unknown async request reply id: %d"), requestId); - return false; - } - - return true; -} - -class CSftpListOpData final : public COpData -{ -public: - CSftpListOpData() - : COpData(Command::list) - , pParser() - , refresh() - , fallback_to_current() - , mtime_index() - { - } - - virtual ~CSftpListOpData() - { - delete pParser; - } - - CDirectoryListingParser* pParser; - - CServerPath path; - wxString subDir; - - // Set to true to get a directory listing even if a cache - // lookup can be made after finding out true remote directory - bool refresh; - bool fallback_to_current; - - CDirectoryListing directoryListing; - int mtime_index; -}; - -enum listStates -{ - list_init = 0, - list_waitcwd, - list_list, - list_mtime -}; - -int CSftpControlSocket::List(CServerPath path /*=CServerPath()*/, wxString subDir /*=_T("")*/, int flags /*=0*/) -{ - CServerPath newPath = m_CurrentPath; - if (!path.empty()) { - newPath = path; - } - if (!newPath.ChangePath(subDir)) { - newPath.clear(); - } - - if (newPath.empty()) { - LogMessage(MessageType::Status, _("Retrieving directory listing...")); - } - else { - LogMessage(MessageType::Status, _("Retrieving directory listing of \"%s\"..."), newPath.GetPath()); - } - - if (m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("List called from other command")); - } - - if (!m_pCurrentServer) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurrenServer == 0")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpListOpData *pData = new CSftpListOpData; - pData->pNextOpData = m_pCurOpData; - m_pCurOpData = pData; - - pData->opState = list_waitcwd; - - if (path.GetType() == DEFAULT) - path.SetType(m_pCurrentServer->GetType()); - pData->path = path; - pData->subDir = subDir; - pData->refresh = (flags & LIST_FLAG_REFRESH) != 0; - pData->fallback_to_current = !path.empty() && (flags & LIST_FLAG_FALLBACK_CURRENT) != 0; - - int res = ChangeDir(path, subDir, (flags & LIST_FLAG_LINK) != 0); - if (res != FZ_REPLY_OK) - return res; - - return ParseSubcommandResult(FZ_REPLY_OK); -} - -int CSftpControlSocket::ListParseResponse(bool successful, const wxString& reply) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ListParseResponse(%s)"), reply); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpListOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData of wrong type")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (pData->opState == list_list) - { - if (!successful) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (!pData->pParser) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("pData->pParser is 0")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - pData->directoryListing = pData->pParser->Parse(m_CurrentPath); - - int res = ListCheckTimezoneDetection(); - if (res != FZ_REPLY_OK) - return res; - - engine_.GetDirectoryCache().Store(pData->directoryListing, *m_pCurrentServer); - - engine_.SendDirectoryListingNotification(m_CurrentPath, !pData->pNextOpData, true, false); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else if (pData->opState == list_mtime) { - if (successful && !reply.empty()) { - time_t seconds = 0; - bool parsed = true; - for (unsigned int i = 0; i < reply.Len(); ++i) { - wxChar c = reply[i]; - if (c < '0' || c > '9') { - parsed = false; - break; - } - seconds *= 10; - seconds += c - '0'; - } - if (parsed) { - fz::datetime date(seconds, fz::datetime::seconds); - if (date.empty()) { - wxASSERT(pData->directoryListing[pData->mtime_index].has_date()); - fz::datetime listTime = pData->directoryListing[pData->mtime_index].time; - listTime -= fz::duration::from_minutes(m_pCurrentServer->GetTimezoneOffset()); - - int serveroffset = static_cast((date - listTime).get_seconds()); - if (!pData->directoryListing[pData->mtime_index].has_seconds()) { - // Round offset to full minutes - if (serveroffset < 0) - serveroffset -= 59; - serveroffset -= serveroffset % 60; - } - - LogMessage(MessageType::Status, _("Timezone offset of server is %d seconds."), -serveroffset); - - fz::duration span = fz::duration::from_seconds(serveroffset); - const int count = pData->directoryListing.GetCount(); - for (int i = 0; i < count; ++i) { - CDirentry& entry = pData->directoryListing[i]; - entry.time += span; - } - - // TODO: Correct cached listings - - CServerCapabilities::SetCapability(*m_pCurrentServer, timezone_offset, yes, serveroffset); - } - } - } - - engine_.GetDirectoryCache().Store(pData->directoryListing, *m_pCurrentServer); - - engine_.SendDirectoryListingNotification(m_CurrentPath, !pData->pNextOpData, true, false); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("ListParseResponse called at inproper time: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; -} - -int CSftpControlSocket::ListParseEntry(const wxString& entry) -{ - if (!m_pCurOpData) { - LogMessageRaw(MessageType::RawList, entry); - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (m_pCurOpData->opId != Command::list) { - LogMessageRaw(MessageType::RawList, entry); - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Listentry received, but current operation is not Command::list")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpListOpData *pData = static_cast(m_pCurOpData); - if (!pData) { - LogMessageRaw(MessageType::RawList, entry); - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData of wrong type")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (pData->opState != list_list) { - LogMessageRaw(MessageType::RawList, entry); - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("ListParseResponse called at inproper time: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!pData->pParser) - { - LogMessageRaw(MessageType::RawList, entry); - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("pData->pParser is 0")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_INTERNALERROR; - } - - if (entry.Find('\r') != -1 || entry.Find('\n') != -1) - { - LogMessageRaw(MessageType::RawList, entry); - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Listing entry contains \\r at pos %d and \\n at pos %d. Please contect FileZilla team."), entry.Find('\r'), entry.Find('\n')); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_INTERNALERROR; - } - - pData->pParser->AddLine(entry.c_str()); - - return FZ_REPLY_WOULDBLOCK; -} - -int CSftpControlSocket::ListSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ListSubcommandResult()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpListOpData *pData = static_cast(m_pCurOpData); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - if (pData->opState != list_waitcwd) - { - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (prevResult != FZ_REPLY_OK) - { - if (pData->fallback_to_current) - { - // List current directory instead - pData->fallback_to_current = false; - pData->path.clear(); - pData->subDir = _T(""); - int res = ChangeDir(); - if (res != FZ_REPLY_OK) - return res; - } - else - { - ResetOperation(prevResult); - return FZ_REPLY_ERROR; - } - } - - if (pData->path.empty()) - pData->path = m_CurrentPath; - - if (!pData->refresh) - { - wxASSERT(!pData->pNextOpData); - - // Do a cache lookup now that we know the correct directory - - int hasUnsureEntries; - bool is_outdated = false; - bool found = engine_.GetDirectoryCache().DoesExist(*m_pCurrentServer, m_CurrentPath, hasUnsureEntries, is_outdated); - if (found) - { - // We're done if listins is recent and has no outdated entries - if (!is_outdated && !hasUnsureEntries) - { - engine_.SendDirectoryListingNotification(m_CurrentPath, true, false, false); - - ResetOperation(FZ_REPLY_OK); - - return FZ_REPLY_OK; - } - } - } - - if (!pData->holdsLock) - { - if (!TryLockCache(lock_list, m_CurrentPath)) - return FZ_REPLY_WOULDBLOCK; - } - - pData->opState = list_list; - - return SendNextCommand(); -} - -int CSftpControlSocket::ListSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ListSend()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpListOpData *pData = static_cast(m_pCurOpData); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - if (pData->opState == list_list) { - pData->pParser = new CDirectoryListingParser(this, *m_pCurrentServer, listingEncoding::unknown, true); - pData->pParser->SetTimezoneOffset(GetTimezoneOffset()); - if (!SendCommand(_T("ls"))) - return FZ_REPLY_ERROR; - return FZ_REPLY_WOULDBLOCK; - } - else if (pData->opState == list_mtime) { - LogMessage(MessageType::Status, _("Calculating timezone offset of server...")); - const wxString& name = pData->directoryListing[pData->mtime_index].name; - wxString quotedFilename = QuoteFilename(pData->directoryListing.path.FormatFilename(name, true)); - if (!SendCommand(_T("mtime ") + WildcardEscape(quotedFilename), - _T("mtime ") + quotedFilename)) - return FZ_REPLY_ERROR; - return FZ_REPLY_WOULDBLOCK; - } - - LogMessage(MessageType::Debug_Warning, _T("Unknown opStatein CSftpControlSocket::ListSend")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; -} - -class CSftpChangeDirOpData : public CChangeDirOpData -{ -}; - -enum cwdStates -{ - cwd_init = 0, - cwd_pwd, - cwd_cwd, - cwd_cwd_subdir -}; - -int CSftpControlSocket::ChangeDir(CServerPath path /*=CServerPath()*/, wxString subDir /*=_T("")*/, bool link_discovery /*=false*/) -{ - cwdStates state = cwd_init; - - if (path.GetType() == DEFAULT) - path.SetType(m_pCurrentServer->GetType()); - - CServerPath target; - if (path.empty()) { - if (m_CurrentPath.empty()) - state = cwd_pwd; - else - return FZ_REPLY_OK; - } - else { - if (!subDir.empty()) { - // Check if the target is in cache already - target = engine_.GetPathCache().Lookup(*m_pCurrentServer, path, subDir); - if (!target.empty()) { - if (m_CurrentPath == target) - return FZ_REPLY_OK; - - path = target; - subDir = _T(""); - state = cwd_cwd; - } - else { - // Target unknown, check for the parent's target - target = engine_.GetPathCache().Lookup(*m_pCurrentServer, path, _T("")); - if (m_CurrentPath == path || (!target.empty() && target == m_CurrentPath)) { - target.clear(); - state = cwd_cwd_subdir; - } - else - state = cwd_cwd; - } - } - else { - target = engine_.GetPathCache().Lookup(*m_pCurrentServer, path, _T("")); - if (m_CurrentPath == path || (!target.empty() && target == m_CurrentPath)) - return FZ_REPLY_OK; - state = cwd_cwd; - } - } - - CSftpChangeDirOpData *pData = new CSftpChangeDirOpData; - pData->pNextOpData = m_pCurOpData; - pData->opState = state; - pData->path = path; - pData->subDir = subDir; - pData->target = target; - pData->link_discovery = link_discovery; - - if (pData->pNextOpData && pData->pNextOpData->opId == Command::transfer && - !static_cast(pData->pNextOpData)->download) - { - pData->tryMkdOnFail = true; - wxASSERT(subDir.empty()); - } - - m_pCurOpData = pData; - - return SendNextCommand(); -} - -int CSftpControlSocket::ChangeDirParseResponse(bool successful, const wxString& reply) -{ - if (!m_pCurOpData) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - CSftpChangeDirOpData *pData = static_cast(m_pCurOpData); - - bool error = false; - switch (pData->opState) - { - case cwd_pwd: - if (!successful || reply.empty()) - error = true; - if (ParsePwdReply(reply)) - { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else - error = true; - break; - case cwd_cwd: - if (!successful) - { - // Create remote directory if part of a file upload - if (pData->tryMkdOnFail) - { - pData->tryMkdOnFail = false; - int res = Mkdir(pData->path); - if (res != FZ_REPLY_OK) - return res; - } - else - error = true; - } - else if (reply.empty()) - error = true; - else if (ParsePwdReply(reply)) { - engine_.GetPathCache().Store(*m_pCurrentServer, m_CurrentPath, pData->path); - - if (pData->subDir.empty()) { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - - pData->target.clear(); - pData->opState = cwd_cwd_subdir; - } - else - error = true; - break; - case cwd_cwd_subdir: - if (!successful || reply.empty()) - { - if (pData->link_discovery) - { - LogMessage(MessageType::Debug_Info, _T("Symlink does not link to a directory, probably a file")); - ResetOperation(FZ_REPLY_LINKNOTDIR); - return FZ_REPLY_ERROR; - } - else - error = true; - } - else if (ParsePwdReply(reply)) { - engine_.GetPathCache().Store(*m_pCurrentServer, m_CurrentPath, pData->path, pData->subDir); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else - error = true; - break; - default: - error = true; - break; - } - - if (error) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return SendNextCommand(); -} - -int CSftpControlSocket::ChangeDirSubcommandResult(int WXUNUSED(prevResult)) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ChangeDirSubcommandResult()")); - - return SendNextCommand(); -} - -int CSftpControlSocket::ChangeDirSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ChangeDirSend()")); - - if (!m_pCurOpData) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - CSftpChangeDirOpData *pData = static_cast(m_pCurOpData); - - wxString cmd; - switch (pData->opState) - { - case cwd_pwd: - cmd = _T("pwd"); - break; - case cwd_cwd: - if (pData->tryMkdOnFail && !pData->holdsLock) - { - if (IsLocked(lock_mkdir, pData->path)) - { - // Some other engine is already creating this directory or - // performing an action that will lead to its creation - pData->tryMkdOnFail = false; - } - if (!TryLockCache(lock_mkdir, pData->path)) - return FZ_REPLY_WOULDBLOCK; - } - cmd = _T("cd ") + QuoteFilename(pData->path.GetPath()); - m_CurrentPath.clear(); - break; - case cwd_cwd_subdir: - if (pData->subDir.empty()) - { - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - else - cmd = _T("cd ") + QuoteFilename(pData->subDir); - m_CurrentPath.clear(); - break; - } - - if (!cmd.empty()) - if (!SendCommand(cmd)) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -void CSftpControlSocket::ProcessReply(int result, const wxString& reply /*=_T("")*/) -{ - Command commandId = GetCurrentCommandId(); - switch (commandId) - { - case Command::connect: - ConnectParseResponse(result == FZ_REPLY_OK, reply); - break; - case Command::list: - ListParseResponse(result == FZ_REPLY_OK, reply); - break; - case Command::transfer: - FileTransferParseResponse(result, reply); - break; - case Command::cwd: - ChangeDirParseResponse(result == FZ_REPLY_OK, reply); - break; - case Command::mkdir: - MkdirParseResponse(result == FZ_REPLY_OK, reply); - break; - case Command::del: - DeleteParseResponse(result == FZ_REPLY_OK, reply); - break; - case Command::removedir: - RemoveDirParseResponse(result == FZ_REPLY_OK, reply); - break; - case Command::chmod: - ChmodParseResponse(result == FZ_REPLY_OK, reply); - break; - case Command::rename: - RenameParseResponse(result == FZ_REPLY_OK, reply); - break; - default: - LogMessage(MessageType::Debug_Warning, _T("No action for parsing replies to command %d"), (int)commandId); - ResetOperation(FZ_REPLY_INTERNALERROR); - break; - } -} - -int CSftpControlSocket::ResetOperation(int nErrorCode) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ResetOperation(%d)"), nErrorCode); - - if (m_pCurOpData && m_pCurOpData->opId == Command::connect) - { - CSftpConnectOpData *pData = static_cast(m_pCurOpData); - if (pData->opState == connect_init && (nErrorCode & FZ_REPLY_CANCELED) != FZ_REPLY_CANCELED) - LogMessage(MessageType::Error, _("fzsftp could not be started")); - if (pData->criticalFailure) - nErrorCode |= FZ_REPLY_CRITICALERROR; - } - if (m_pCurOpData && m_pCurOpData->opId == Command::del && !(nErrorCode & FZ_REPLY_DISCONNECTED)) - { - CSftpDeleteOpData *pData = static_cast(m_pCurOpData); - if (pData->m_needSendListing) - engine_.SendDirectoryListingNotification(pData->path, false, true, false); - } - - return CControlSocket::ResetOperation(nErrorCode); -} - -int CSftpControlSocket::SendNextCommand() -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::SendNextCommand()")); - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("SendNextCommand called without active operation")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (m_pCurOpData->waitForAsyncRequest) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Waiting for async request, ignoring SendNextCommand")); - return FZ_REPLY_WOULDBLOCK; - } - - switch (m_pCurOpData->opId) - { - case Command::connect: - return ConnectSend(); - case Command::list: - return ListSend(); - case Command::transfer: - return FileTransferSend(); - case Command::cwd: - return ChangeDirSend(); - case Command::mkdir: - return MkdirSend(); - case Command::rename: - return RenameSend(); - case Command::chmod: - return ChmodSend(); - case Command::del: - return DeleteSend(); - default: - LogMessage(MessageType::Debug_Warning, __TFILE__, __LINE__, _T("Unknown opID (%d) in SendNextCommand"), m_pCurOpData->opId); - ResetOperation(FZ_REPLY_INTERNALERROR); - break; - } - - return FZ_REPLY_ERROR; -} - -int CSftpControlSocket::FileTransfer(const wxString localFile, const CServerPath &remotePath, - const wxString &remoteFile, bool download, - const CFileTransferCommand::t_transferSettings& transferSettings) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::FileTransfer(...)")); - - if (localFile.empty()) { - if (!download) - ResetOperation(FZ_REPLY_CRITICALERROR | FZ_REPLY_NOTSUPPORTED); - else - ResetOperation(FZ_REPLY_SYNTAXERROR); - return FZ_REPLY_ERROR; - } - - if (download) { - wxString filename = remotePath.FormatFilename(remoteFile); - LogMessage(MessageType::Status, _("Starting download of %s"), filename); - } - else { - LogMessage(MessageType::Status, _("Starting upload of %s"), localFile); - } - if (m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("deleting nonzero pData")); - delete m_pCurOpData; - } - - CSftpFileTransferOpData *pData = new CSftpFileTransferOpData(download, localFile, remoteFile, remotePath); - m_pCurOpData = pData; - - pData->transferSettings = transferSettings; - - int64_t size; - bool isLink; - if (fz::local_filesys::get_file_info(fz::to_native(pData->localFile), isLink, &size, 0, 0) == fz::local_filesys::file) - pData->localFileSize = size; - - pData->opState = filetransfer_waitcwd; - - if (pData->remotePath.GetType() == DEFAULT) - pData->remotePath.SetType(m_pCurrentServer->GetType()); - - int res = ChangeDir(pData->remotePath); - if (res != FZ_REPLY_OK) - return res; - - return ParseSubcommandResult(FZ_REPLY_OK); -} - -int CSftpControlSocket::FileTransferSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::FileTransferSubcommandResult()")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpFileTransferOpData *pData = static_cast(m_pCurOpData); - - if (pData->opState == filetransfer_waitcwd) { - if (prevResult == FZ_REPLY_OK) { - CDirentry entry; - bool dirDidExist; - bool matchedCase; - bool found = engine_.GetDirectoryCache().LookupFile(entry, *m_pCurrentServer, pData->tryAbsolutePath ? pData->remotePath : m_CurrentPath, pData->remoteFile, dirDidExist, matchedCase); - if (!found) { - if (!dirDidExist) - pData->opState = filetransfer_waitlist; - else if (pData->download && - engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) - { - pData->opState = filetransfer_mtime; - } - else - pData->opState = filetransfer_transfer; - } - else { - if (entry.is_unsure()) - pData->opState = filetransfer_waitlist; - else { - if (matchedCase) { - pData->remoteFileSize = entry.size; - if (entry.has_date()) - pData->fileTime = entry.time; - - if (pData->download && !entry.has_time() && - engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) - { - pData->opState = filetransfer_mtime; - } - else - pData->opState = filetransfer_transfer; - } - else - pData->opState = filetransfer_mtime; - } - } - if (pData->opState == filetransfer_waitlist) { - int res = List(CServerPath(), _T(""), LIST_FLAG_REFRESH); - if (res != FZ_REPLY_OK) - return res; - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - else if (pData->opState == filetransfer_transfer) { - int res = CheckOverwriteFile(); - if (res != FZ_REPLY_OK) - return res; - } - } - else { - pData->tryAbsolutePath = true; - pData->opState = filetransfer_mtime; - } - } - else if (pData->opState == filetransfer_waitlist) { - if (prevResult == FZ_REPLY_OK) { - CDirentry entry; - bool dirDidExist; - bool matchedCase; - bool found = engine_.GetDirectoryCache().LookupFile(entry, *m_pCurrentServer, pData->tryAbsolutePath ? pData->remotePath : m_CurrentPath, pData->remoteFile, dirDidExist, matchedCase); - if (!found) { - if (!dirDidExist) - pData->opState = filetransfer_mtime; - else if (pData->download && - engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) - { - pData->opState = filetransfer_mtime; - } - else - pData->opState = filetransfer_transfer; - } - else { - if (matchedCase && !entry.is_unsure()) { - pData->remoteFileSize = entry.size; - if (!entry.has_date()) - pData->fileTime = entry.time; - - if (pData->download && !entry.has_time() && - engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) - { - pData->opState = filetransfer_mtime; - } - else - pData->opState = filetransfer_transfer; - } - else - pData->opState = filetransfer_mtime; - } - if (pData->opState == filetransfer_transfer) { - int res = CheckOverwriteFile(); - if (res != FZ_REPLY_OK) - return res; - } - } - else - pData->opState = filetransfer_mtime; - } - else { - LogMessage(MessageType::Debug_Warning, _T(" Unknown opState (%d)"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - return SendNextCommand(); -} - -int CSftpControlSocket::FileTransferSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("FileTransferSend()")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpFileTransferOpData *pData = static_cast(m_pCurOpData); - - if (pData->opState == filetransfer_transfer) - { - wxString cmd; - if (pData->resume) - cmd = _T("re"); - if (pData->download) - { - if (!pData->resume) - CreateLocalDir(pData->localFile); - - engine_.transfer_status_.Init(pData->remoteFileSize, pData->resume ? pData->localFileSize : 0, false); - cmd += _T("get "); - cmd += QuoteFilename(pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath)) + _T(" "); - - wxString localFile = QuoteFilename(pData->localFile); - wxString logstr = cmd; - logstr += localFile; - LogMessageRaw(MessageType::Command, logstr); - - if (!AddToStream(cmd) || !AddToStream(localFile + _T("\n"), true)) { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - } - else { - engine_.transfer_status_.Init(pData->localFileSize, pData->resume ? pData->remoteFileSize : 0, false); - cmd += _T("put "); - - wxString logstr = cmd; - wxString localFile = QuoteFilename(pData->localFile) + _T(" "); - wxString remoteFile = QuoteFilename(pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath)); - - logstr += localFile; - logstr += remoteFile; - LogMessageRaw(MessageType::Command, logstr); - - if (!AddToStream(cmd) || !AddToStream(localFile, true) || - !AddToStream(remoteFile + _T("\n"))) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - } - engine_.transfer_status_.SetStartTime(); - - pData->transferInitiated = true; - } - else if (pData->opState == filetransfer_mtime) - { - wxString quotedFilename = QuoteFilename(pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath)); - if (!SendCommand(_T("mtime ") + WildcardEscape(quotedFilename), - _T("mtime ") + quotedFilename)) - return FZ_REPLY_ERROR; - } - else if (pData->opState == filetransfer_chmtime) - { - wxASSERT(pData->fileTime.empty()); - if (pData->download) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T(" filetransfer_chmtime during download")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - wxString quotedFilename = QuoteFilename(pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath)); - // Y2K38 - time_t ticks = pData->fileTime.get_time_t(); - wxString seconds = wxString::Format(_T("%d"), (int)ticks); - if (!SendCommand(_T("chmtime ") + seconds + _T(" ") + WildcardEscape(quotedFilename), - _T("chmtime ") + seconds + _T(" ") + quotedFilename)) - return FZ_REPLY_ERROR; - } - - return FZ_REPLY_WOULDBLOCK; -} - -int CSftpControlSocket::FileTransferParseResponse(int result, const wxString& reply) -{ - LogMessage(MessageType::Debug_Verbose, _T("FileTransferParseResponse(%d)"), result); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpFileTransferOpData *pData = static_cast(m_pCurOpData); - - if (pData->opState == filetransfer_transfer) { - if (result != FZ_REPLY_OK) { - ResetOperation(result); - return FZ_REPLY_ERROR; - } - - if (engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) { - if (pData->download) { - if (pData->fileTime.empty()) { - if (!fz::local_filesys::set_modification_time(fz::to_native(pData->localFile), pData->fileTime)) - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Could not set modification time")); - } - } - else { - pData->fileTime = fz::local_filesys::get_modification_time(fz::to_native(pData->localFile)); - if (pData->fileTime.empty()) { - pData->opState = filetransfer_chmtime; - return SendNextCommand(); - } - } - } - } - else if (pData->opState == filetransfer_mtime) { - if (result == FZ_REPLY_OK && !reply.empty()) { - time_t seconds = 0; - bool parsed = true; - for (unsigned int i = 0; i < reply.Len(); ++i) { - wxChar c = reply[i]; - if (c < '0' || c > '9') { - parsed = false; - break; - } - seconds *= 10; - seconds += c - '0'; - } - if (parsed) { - fz::datetime fileTime = fz::datetime(seconds, fz::datetime::seconds); - if (fileTime.empty()) { - pData->fileTime = fileTime; - pData->fileTime += fz::duration::from_minutes(m_pCurrentServer->GetTimezoneOffset()); - } - } - } - pData->opState = filetransfer_transfer; - int res = CheckOverwriteFile(); - if (res != FZ_REPLY_OK) - return res; - - return SendNextCommand(); - } - else if (pData->opState == filetransfer_chmtime) { - if (pData->download) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T(" filetransfer_chmtime during download")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - } - else { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T(" Called at improper time: opState == %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; -} - -int CSftpControlSocket::DoClose(int nErrorCode /*=FZ_REPLY_DISCONNECTED*/) -{ - engine_.GetRateLimiter().RemoveObject(this); - - if (m_pProcess) { - m_pProcess->kill(); - } - - if (m_pInputThread) { - auto thread = m_pInputThread; - m_pInputThread = 0; - delete thread; - } - if (m_pProcess) { - delete m_pProcess; - m_pProcess = 0; - } - return CControlSocket::DoClose(nErrorCode); -} - -void CSftpControlSocket::Cancel() -{ - if (GetCurrentCommandId() != Command::none) { - DoClose(FZ_REPLY_CANCELED); - } -} - -enum mkdStates -{ - mkd_init = 0, - mkd_findparent, - mkd_mkdsub, - mkd_cwdsub, - mkd_tryfull -}; - -int CSftpControlSocket::Mkdir(const CServerPath& path) -{ - /* Directory creation works like this: First find a parent directory into - * which we can CWD, then create the subdirs one by one. If either part - * fails, try MKD with the full path directly. - */ - - if (!m_pCurOpData) - LogMessage(MessageType::Status, _("Creating directory '%s'..."), path.GetPath()); - - CMkdirOpData *pData = new CMkdirOpData; - pData->path = path; - - if (!m_CurrentPath.empty()) { - // Unless the server is broken, a directory already exists if current directory is a subdir of it. - if (m_CurrentPath == path || m_CurrentPath.IsSubdirOf(path, false)) { - delete pData; - return FZ_REPLY_OK; - } - - if (m_CurrentPath.IsParentOf(path, false)) - pData->commonParent = m_CurrentPath; - else - pData->commonParent = path.GetCommonParent(m_CurrentPath); - } - - if (!path.HasParent()) - pData->opState = mkd_tryfull; - else { - pData->currentPath = path.GetParent(); - pData->segments.push_back(path.GetLastSegment()); - - if (pData->currentPath == m_CurrentPath) - pData->opState = mkd_mkdsub; - else - pData->opState = mkd_findparent; - } - - pData->pNextOpData = m_pCurOpData; - m_pCurOpData = pData; - - return SendNextCommand(); -} - -int CSftpControlSocket::MkdirParseResponse(bool successful, const wxString&) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::MkdirParseResonse")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CMkdirOpData *pData = static_cast(m_pCurOpData); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - bool error = false; - switch (pData->opState) - { - case mkd_findparent: - if (successful) { - m_CurrentPath = pData->currentPath; - pData->opState = mkd_mkdsub; - } - else if (pData->currentPath == pData->commonParent) - pData->opState = mkd_tryfull; - else if (pData->currentPath.HasParent()) { - pData->segments.push_back(pData->currentPath.GetLastSegment()); - pData->currentPath = pData->currentPath.GetParent(); - } - else - pData->opState = mkd_tryfull; - break; - case mkd_mkdsub: - if (successful) { - if (pData->segments.empty()) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T(" pData->segments is empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - engine_.GetDirectoryCache().UpdateFile(*m_pCurrentServer, pData->currentPath, pData->segments.back(), true, CDirectoryCache::dir); - engine_.SendDirectoryListingNotification(pData->currentPath, false, true, false); - - pData->currentPath.AddSegment(pData->segments.back()); - pData->segments.pop_back(); - - if (pData->segments.empty()) { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - else - pData->opState = mkd_cwdsub; - } - else - pData->opState = mkd_tryfull; - break; - case mkd_cwdsub: - if (successful) { - m_CurrentPath = pData->currentPath; - pData->opState = mkd_mkdsub; - } - else - pData->opState = mkd_tryfull; - break; - case mkd_tryfull: - if (!successful) - error = true; - else { - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; - } - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("unknown op state: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (error) { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return MkdirSend(); -} - -int CSftpControlSocket::MkdirSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::MkdirSend")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CMkdirOpData *pData = static_cast(m_pCurOpData); - LogMessage(MessageType::Debug_Debug, _T(" state = %d"), pData->opState); - - if (!pData->holdsLock) { - if (!TryLockCache(lock_mkdir, pData->path)) - return FZ_REPLY_WOULDBLOCK; - } - - bool res; - switch (pData->opState) - { - case mkd_findparent: - case mkd_cwdsub: - m_CurrentPath.clear(); - res = SendCommand(_T("cd ") + QuoteFilename(pData->currentPath.GetPath())); - break; - case mkd_mkdsub: - res = SendCommand(_T("mkdir ") + QuoteFilename(pData->segments.back())); - break; - case mkd_tryfull: - res = SendCommand(_T("mkdir ") + QuoteFilename(pData->path.GetPath())); - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("unknown op state: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!res) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -wxString CSftpControlSocket::QuoteFilename(wxString filename) -{ - filename.Replace(_T("\""), _T("\"\"")); - return _T("\"") + filename + _T("\""); -} - -int CSftpControlSocket::Delete(const CServerPath& path, std::deque&& files) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::Delete")); - wxASSERT(!m_pCurOpData); - CSftpDeleteOpData *pData = new CSftpDeleteOpData(); - m_pCurOpData = pData; - pData->path = path; - pData->files = files; - - // CFileZillaEnginePrivate should have checked this already - wxASSERT(!files.empty()); - - return SendNextCommand(); -} - -int CSftpControlSocket::DeleteParseResponse(bool successful, const wxString&) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::DeleteParseResponse")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - CSftpDeleteOpData *pData = static_cast(m_pCurOpData); - - if (!successful) - pData->m_deleteFailed = true; - else { - const wxString& file = pData->files.front(); - - engine_.GetDirectoryCache().RemoveFile(*m_pCurrentServer, pData->path, file); - - auto const now = fz::datetime::now(); - if (now.empty() && pData->m_time.empty() && (now - pData->m_time).get_seconds() >= 1) { - engine_.SendDirectoryListingNotification(pData->path, false, true, false); - pData->m_time = now; - pData->m_needSendListing = false; - } - else - pData->m_needSendListing = true; - } - - pData->files.pop_front(); - - if (!pData->files.empty()) - return SendNextCommand(); - - return ResetOperation(pData->m_deleteFailed ? FZ_REPLY_ERROR : FZ_REPLY_OK); -} - -int CSftpControlSocket::DeleteSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::DeleteSend")); - - if (!m_pCurOpData) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - CSftpDeleteOpData *pData = static_cast(m_pCurOpData); - - const wxString& file = pData->files.front(); - if (file.empty()) { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty filename")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - wxString filename = pData->path.FormatFilename(file); - if (filename.empty()) { - LogMessage(MessageType::Error, _("Filename cannot be constructed for directory %s and filename %s"), pData->path.GetPath(), file); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - if (!pData->m_time.empty()) - pData->m_time = fz::datetime::now(); - - engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, pData->path, file); - - if (!SendCommand(_T("rm ") + WildcardEscape(QuoteFilename(filename)), - _T("rm ") + QuoteFilename(filename))) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -class CSftpRemoveDirOpData : public COpData -{ -public: - CSftpRemoveDirOpData() - : COpData(Command::removedir) - { - } - - virtual ~CSftpRemoveDirOpData() {} - - CServerPath path; - wxString subDir; -}; - -int CSftpControlSocket::RemoveDir(const CServerPath& path /*=CServerPath()*/, const wxString& subDir /*=_T("")*/) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::RemoveDir")); - - wxASSERT(!m_pCurOpData); - CSftpRemoveDirOpData *pData = new CSftpRemoveDirOpData(); - m_pCurOpData = pData; - pData->path = path; - pData->subDir = subDir; - - CServerPath fullPath = engine_.GetPathCache().Lookup(*m_pCurrentServer, pData->path, pData->subDir); - if (fullPath.empty()) { - fullPath = pData->path; - - if (!fullPath.AddSegment(subDir)) { - LogMessage(MessageType::Error, _("Path cannot be constructed for directory %s and subdir %s"), path.GetPath(), subDir); - return FZ_REPLY_ERROR; - } - } - - engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, path, subDir); - - engine_.GetPathCache().InvalidatePath(*m_pCurrentServer, pData->path, pData->subDir); - - engine_.InvalidateCurrentWorkingDirs(fullPath); - if (!SendCommand(_T("rmdir ") + WildcardEscape(QuoteFilename(fullPath.GetPath())), - _T("rmdir ") + QuoteFilename(fullPath.GetPath()))) - return FZ_REPLY_ERROR; - - return FZ_REPLY_WOULDBLOCK; -} - -int CSftpControlSocket::RemoveDirParseResponse(bool successful, const wxString&) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::RemoveDirParseResponse")); - - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty m_pCurOpData")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!successful) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - CSftpRemoveDirOpData *pData = static_cast(m_pCurOpData); - if (pData->path.empty()) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T("Empty pData->path")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - engine_.GetDirectoryCache().RemoveDir(*m_pCurrentServer, pData->path, pData->subDir, engine_.GetPathCache().Lookup(*m_pCurrentServer, pData->path, pData->subDir)); - engine_.SendDirectoryListingNotification(pData->path, false, true, false); - - return ResetOperation(FZ_REPLY_OK); -} - -class CSftpChmodOpData : public COpData -{ -public: - CSftpChmodOpData(const CChmodCommand& command) - : COpData(Command::chmod), m_cmd(command) - { - m_useAbsolute = false; - } - - virtual ~CSftpChmodOpData() {} - - CChmodCommand m_cmd; - bool m_useAbsolute; -}; - -enum chmodStates -{ - chmod_init = 0, - chmod_chmod -}; - -int CSftpControlSocket::Chmod(const CChmodCommand& command) -{ - if (m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData not empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - LogMessage(MessageType::Status, _("Set permissions of '%s' to '%s'"), command.GetPath().FormatFilename(command.GetFile()), command.GetPermission()); - - CSftpChmodOpData *pData = new CSftpChmodOpData(command); - pData->opState = chmod_chmod; - m_pCurOpData = pData; - - int res = ChangeDir(command.GetPath()); - if (res != FZ_REPLY_OK) - return res; - - return SendNextCommand(); -} - -int CSftpControlSocket::ChmodParseResponse(bool successful, const wxString&) -{ - CSftpChmodOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!successful) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; -} - -int CSftpControlSocket::ChmodSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ChmodSend()")); - - CSftpChmodOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (prevResult != FZ_REPLY_OK) - pData->m_useAbsolute = true; - - return SendNextCommand(); -} - -int CSftpControlSocket::ChmodSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ChmodSend()")); - - CSftpChmodOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - bool res; - switch (pData->opState) - { - case chmod_chmod: - { - engine_.GetDirectoryCache().UpdateFile(*m_pCurrentServer, pData->m_cmd.GetPath(), pData->m_cmd.GetFile(), false, CDirectoryCache::unknown); - - wxString quotedFilename = QuoteFilename(pData->m_cmd.GetPath().FormatFilename(pData->m_cmd.GetFile(), !pData->m_useAbsolute)); - - res = SendCommand(_T("chmod ") + pData->m_cmd.GetPermission() + _T(" ") + WildcardEscape(quotedFilename), - _T("chmod ") + pData->m_cmd.GetPermission() + _T(" ") + quotedFilename); - } - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("unknown op state: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!res) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return FZ_REPLY_WOULDBLOCK; -} - -class CSftpRenameOpData : public COpData -{ -public: - CSftpRenameOpData(const CRenameCommand& command) - : COpData(Command::rename), m_cmd(command) - { - m_useAbsolute = false; - } - - virtual ~CSftpRenameOpData() {} - - CRenameCommand m_cmd; - bool m_useAbsolute; -}; - -enum renameStates -{ - rename_init = 0, - rename_rename -}; - -int CSftpControlSocket::Rename(const CRenameCommand& command) -{ - if (m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData not empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - LogMessage(MessageType::Status, _("Renaming '%s' to '%s'"), command.GetFromPath().FormatFilename(command.GetFromFile()), command.GetToPath().FormatFilename(command.GetToFile())); - - CSftpRenameOpData *pData = new CSftpRenameOpData(command); - pData->opState = rename_rename; - m_pCurOpData = pData; - - int res = ChangeDir(command.GetFromPath()); - if (res != FZ_REPLY_OK) - return res; - - return SendNextCommand(); -} - -int CSftpControlSocket::RenameParseResponse(bool successful, const wxString&) -{ - CSftpRenameOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!successful) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - const CServerPath& fromPath = pData->m_cmd.GetFromPath(); - const CServerPath& toPath = pData->m_cmd.GetToPath(); - - engine_.GetDirectoryCache().Rename(*m_pCurrentServer, fromPath, pData->m_cmd.GetFromFile(), toPath, pData->m_cmd.GetToFile()); - - engine_.SendDirectoryListingNotification(fromPath, false, true, false); - if (fromPath != toPath) - engine_.SendDirectoryListingNotification(toPath, false, true, false); - - ResetOperation(FZ_REPLY_OK); - return FZ_REPLY_OK; -} - -int CSftpControlSocket::RenameSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::RenameSubcommandResult()")); - - CSftpRenameOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (prevResult != FZ_REPLY_OK) - pData->m_useAbsolute = true; - - return SendNextCommand(); -} - -int CSftpControlSocket::RenameSend() -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::RenameSend()")); - - CSftpRenameOpData *pData = static_cast(m_pCurOpData); - if (!pData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("m_pCurOpData empty")); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - bool res; - switch (pData->opState) - { - case rename_rename: - { - bool wasDir = false; - engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, pData->m_cmd.GetFromPath(), pData->m_cmd.GetFromFile(), &wasDir); - engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, pData->m_cmd.GetToPath(), pData->m_cmd.GetToFile()); - - wxString fromQuoted = QuoteFilename(pData->m_cmd.GetFromPath().FormatFilename(pData->m_cmd.GetFromFile(), !pData->m_useAbsolute)); - wxString toQuoted = QuoteFilename(pData->m_cmd.GetToPath().FormatFilename(pData->m_cmd.GetToFile(), !pData->m_useAbsolute && pData->m_cmd.GetFromPath() == pData->m_cmd.GetToPath())); - - engine_.GetPathCache().InvalidatePath(*m_pCurrentServer, pData->m_cmd.GetFromPath(), pData->m_cmd.GetFromFile()); - engine_.GetPathCache().InvalidatePath(*m_pCurrentServer, pData->m_cmd.GetToPath(), pData->m_cmd.GetToFile()); - - if (wasDir) - { - // Need to invalidate current working directories - CServerPath path = engine_.GetPathCache().Lookup(*m_pCurrentServer, pData->m_cmd.GetFromPath(), pData->m_cmd.GetFromFile()); - if (path.empty()) - { - path = pData->m_cmd.GetFromPath(); - path.AddSegment(pData->m_cmd.GetFromFile()); - } - engine_.InvalidateCurrentWorkingDirs(path); - } - - res = SendCommand(_T("mv ") + WildcardEscape(fromQuoted) + _T(" ") + toQuoted, - _T("mv ") + fromQuoted + _T(" ") + toQuoted); - } - break; - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("unknown op state: %d"), pData->opState); - ResetOperation(FZ_REPLY_INTERNALERROR); - return FZ_REPLY_ERROR; - } - - if (!res) - { - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - return FZ_REPLY_WOULDBLOCK; -} - -wxString CSftpControlSocket::WildcardEscape(const wxString& file) -{ - // see src/putty/wildcard.c - - wxString escapedFile; - escapedFile.Alloc(file.Len()); - for (unsigned int i = 0; i < file.Len(); ++i) - { - const wxChar& c = file[i]; - switch (c) - { - case '[': - case ']': - case '*': - case '?': - case '\\': - escapedFile.Append('\\'); - break; - default: - break; - } - escapedFile.Append(c); - } - return escapedFile; -} - -void CSftpControlSocket::OnRateAvailable(CRateLimiter::rate_direction direction) -{ - OnQuotaRequest(direction); -} - -void CSftpControlSocket::OnQuotaRequest(CRateLimiter::rate_direction direction) -{ - int64_t bytes = GetAvailableBytes(direction); - if (bytes > 0) { - int b; - if (bytes > INT_MAX) - b = INT_MAX; - else - b = bytes; - AddToStream(wxString::Format(_T("-%d%d,%d\n"), (int)direction, b, engine_.GetOptions().GetOptionVal(OPTION_SPEEDLIMIT_INBOUND + static_cast(direction)))); - UpdateUsage(direction, b); - } - else if (bytes == 0) - Wait(direction); - else if (bytes < 0) - AddToStream(wxString::Format(_T("-%d-\n"), (int)direction)); -} - - -int CSftpControlSocket::ParseSubcommandResult(int prevResult) -{ - LogMessage(MessageType::Debug_Verbose, _T("CSftpControlSocket::ParseSubcommandResult(%d)"), prevResult); - if (!m_pCurOpData) - { - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("ParseSubcommandResult called without active operation")); - ResetOperation(FZ_REPLY_ERROR); - return FZ_REPLY_ERROR; - } - - switch (m_pCurOpData->opId) - { - case Command::cwd: - return ChangeDirSubcommandResult(prevResult); - case Command::list: - return ListSubcommandResult(prevResult); - case Command::transfer: - return FileTransferSubcommandResult(prevResult); - case Command::rename: - return RenameSubcommandResult(prevResult); - case Command::chmod: - return ChmodSubcommandResult(prevResult); - default: - LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("Unknown opID (%d) in ParseSubcommandResult"), m_pCurOpData->opId); - ResetOperation(FZ_REPLY_INTERNALERROR); - break; - } - - return FZ_REPLY_ERROR; -} - -int CSftpControlSocket::ListCheckTimezoneDetection() -{ - wxASSERT(m_pCurOpData); - - CSftpListOpData *pData = static_cast(m_pCurOpData); - - if (CServerCapabilities::GetCapability(*m_pCurrentServer, timezone_offset) == unknown) { - const int count = pData->directoryListing.GetCount(); - for (int i = 0; i < count; ++i) { - if (!pData->directoryListing[i].has_time()) - continue; - - if (pData->directoryListing[i].is_link()) - continue; - - pData->opState = list_mtime; - pData->mtime_index = i; - return SendNextCommand(); - } - } - - return FZ_REPLY_OK; -} - -void CSftpControlSocket::operator()(fz::event_base const& ev) -{ - if (fz::dispatch(ev, this, - &CSftpControlSocket::OnSftpEvent, - &CSftpControlSocket::OnTerminate)) { - return; - } - - CControlSocket::operator()(ev); -} diff -Nru filezilla-3.15.0.2/src/engine/sftpcontrolsocket.h filezilla-3.33.0/src/engine/sftpcontrolsocket.h --- filezilla-3.15.0.2/src/engine/sftpcontrolsocket.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/sftpcontrolsocket.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,141 +0,0 @@ -#ifndef __SFTPCONTROLSOCKET_H__ -#define __SFTPCONTROLSOCKET_H__ - -#include "ControlSocket.h" - -enum class sftpEvent { - Unknown = -1, - Reply = 0, - Done, - Error, - Verbose, - Status, - Recv, - Send, - Close, - Request, - Listentry, - Transfer, - RequestPreamble, - RequestInstruction, - UsedQuotaRecv, - UsedQuotaSend, - KexAlgorithm, - KexHash, - KexCurve, - CipherClientToServer, - CipherServerToClient, - MacClientToServer, - MacServerToClient, - Hostkey, - - max = Hostkey -}; - -enum sftpRequestTypes -{ - sftpReqPassword, - sftpReqHostkey, - sftpReqHostkeyChanged, - sftpReqUnknown -}; - -namespace fz { -class process; -} - -class CSftpInputThread; - -class CSftpControlSocket final : public CControlSocket, public CRateLimiterObject -{ -public: - CSftpControlSocket(CFileZillaEnginePrivate & engine); - virtual ~CSftpControlSocket(); - - virtual int Connect(const CServer &server); - - virtual int List(CServerPath path = CServerPath(), wxString subDir = _T(""), int flags = 0); - virtual int Delete(const CServerPath& path, std::deque&& files); - virtual int RemoveDir(const CServerPath& path = CServerPath(), const wxString& subDir = _T("")); - virtual int Mkdir(const CServerPath& path); - virtual int Rename(const CRenameCommand& command); - virtual int Chmod(const CChmodCommand& command); - virtual void Cancel(); - - virtual bool Connected() { return m_pInputThread != 0; } - - virtual bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification); - -protected: - // Replaces filename"with"quotes with - // "filename""with""quotes" - wxString QuoteFilename(wxString filename); - - virtual int DoClose(int nErrorCode = FZ_REPLY_DISCONNECTED); - - virtual int ResetOperation(int nErrorCode); - virtual int SendNextCommand(); - virtual int ParseSubcommandResult(int prevResult); - - void ProcessReply(int result, const wxString& reply = _T("")); - - int ConnectParseResponse(bool successful, const wxString& reply); - int ConnectSend(); - - virtual int FileTransfer(const wxString localFile, const CServerPath &remotePath, - const wxString &remoteFile, bool download, - const CFileTransferCommand::t_transferSettings& transferSettings); - int FileTransferSubcommandResult(int prevResult); - int FileTransferSend(); - int FileTransferParseResponse(int result, const wxString& reply); - - int ListSubcommandResult(int prevResult); - int ListSend(); - int ListParseResponse(bool successful, const wxString& reply); - int ListParseEntry(const wxString& entry); - int ListCheckTimezoneDetection(); - - int ChangeDir(CServerPath path = CServerPath(), wxString subDir = _T(""), bool link_discovery = false); - int ChangeDirParseResponse(bool successful, const wxString& reply); - int ChangeDirSubcommandResult(int prevResult); - int ChangeDirSend(); - - int MkdirParseResponse(bool successful, const wxString& reply); - int MkdirSend(); - - int DeleteParseResponse(bool successful, const wxString& reply); - int DeleteSend(); - - int RemoveDirParseResponse(bool successful, const wxString& reply); - - int ChmodParseResponse(bool successful, const wxString& reply); - int ChmodSubcommandResult(int prevResult); - int ChmodSend(); - - int RenameParseResponse(bool successful, const wxString& reply); - int RenameSubcommandResult(int prevResult); - int RenameSend(); - - bool SendCommand(wxString const& cmd, const wxString& show = wxString()); - bool AddToStream(const wxString& cmd, bool force_utf8 = false); - - virtual void OnRateAvailable(CRateLimiter::rate_direction direction); - void OnQuotaRequest(CRateLimiter::rate_direction direction); - - // see src/putty/wildcard.c - wxString WildcardEscape(const wxString& file); - - fz::process* m_pProcess{}; - CSftpInputThread* m_pInputThread{}; - - virtual void operator()(fz::event_base const& ev); - void OnSftpEvent(); - void OnTerminate(); - - wxString m_requestPreamble; - wxString m_requestInstruction; - - CSftpEncryptionNotification m_sftpEncryptionDetails; -}; - -#endif //__SFTPCONTROLSOCKET_H__ diff -Nru filezilla-3.15.0.2/src/engine/sizeformatting_base.cpp filezilla-3.33.0/src/engine/sizeformatting_base.cpp --- filezilla-3.15.0.2/src/engine/sizeformatting_base.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/sizeformatting_base.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,18 +1,23 @@ #include #include "sizeformatting_base.h" #include "optionsbase.h" -#ifndef __WXMSW__ +#ifndef FZ_WINDOWS #include #endif +#include + +#include +#include + namespace { -const wxChar prefix[] = { ' ', 'K', 'M', 'G', 'T', 'P', 'E' }; +wchar_t const prefix[] = { ' ', 'K', 'M', 'G', 'T', 'P', 'E' }; -wxString ToString(int64_t n, wxChar const* const sepBegin = 0, wxChar const* const sepEnd = 0) +std::wstring ToString(int64_t n, wchar_t const* const sepBegin = nullptr, wchar_t const* const sepEnd = nullptr) { - wxString ret; + std::wstring ret; if (!n) { - ret = _T("0"); + ret = L"0"; } else { bool neg = false; @@ -21,9 +26,9 @@ neg = true; } - wxChar buf[60]; - wxChar * const end = &buf[sizeof(buf) / sizeof(wxChar) - 1]; - wxChar * p = end; + wchar_t buf[60]; + wchar_t * const end = &buf[sizeof(buf) / sizeof(wchar_t) - 1]; + wchar_t * p = end; int d = 0; while (n != 0) { @@ -31,8 +36,8 @@ n /= 10; if (sepBegin && !(++d % 3) && n != 0) { - wxChar *q = p - (sepEnd - sepBegin); - for (wxChar const* s = sepBegin; s != sepEnd; ++s) { + wchar_t *q = p - (sepEnd - sepBegin); + for (wchar_t const* s = sepBegin; s != sepEnd; ++s) { *q++ = *s; } p -= sepEnd - sepBegin; @@ -49,31 +54,34 @@ } } -wxString CSizeFormatBase::Format(COptionsBase* pOptions, int64_t size, bool add_bytes_suffix, CSizeFormatBase::_format format, bool thousands_separator, int num_decimal_places) +std::wstring CSizeFormatBase::Format(COptionsBase* pOptions, int64_t size, bool add_bytes_suffix, CSizeFormatBase::_format format, bool thousands_separator, int num_decimal_places) { - wxASSERT(format != formats_count); - wxASSERT(size >= 0); - if( size < 0 ) { + assert(format != formats_count); + assert(size >= 0); + if (size < 0) { size = 0; } if (format == bytes) { - wxString result = FormatNumber(pOptions, size, &thousands_separator); + std::wstring result = FormatNumber(pOptions, size, &thousands_separator); - if (!add_bytes_suffix) + if (!add_bytes_suffix) { return result; + } else { - return wxString::Format(wxPLURAL_LL("%s byte", "%s bytes", size), result); + return fz::sprintf(fztranslate("%s byte", "%s bytes", size), result); } } - wxString places; + std::wstring places; int divider; - if (format == si1000) + if (format == si1000) { divider = 1000; - else + } + else { divider = 1024; + } // Exponent (2^(10p) or 10^(3p) depending on option int p = 0; @@ -83,15 +91,17 @@ bool clipped = false; while (r > divider && p < 6) { int64_t const rr = r / divider; - if (remainder != 0) + if (remainder != 0) { clipped = true; + } remainder = static_cast(r - rr * divider); r = rr; ++p; } if (!num_decimal_places) { - if (remainder != 0 || clipped) + if (remainder != 0 || clipped) { ++r; + } } else if (p) { // Don't add decimal places on exact bytes if (format != si1000) { @@ -123,94 +133,104 @@ } if (num_decimal_places != 3) { - if (remainder % divider) + if (remainder % divider) { clipped = true; + } remainder /= divider; } - if (clipped) + if (clipped) { remainder++; + } if (remainder > max) { r++; remainder = 0; } - wxChar fmt[] = _T("%00d"); + wchar_t fmt[] = L"%00d"; fmt[2] = '0' + num_decimal_places; - places.Printf(fmt, remainder); + places = fz::sprintf(fmt, remainder); } - wxString result = ToString(r, 0, 0); + std::wstring result = ToString(r, nullptr, nullptr); if (!places.empty()) { - const wxString& sep = GetRadixSeparator(); + std::wstring const& sep = GetRadixSeparator(); result += sep; result += places; } result += ' '; - static wxChar byte_unit = 0; + static wchar_t byte_unit = 0; if (!byte_unit) { - wxString t = _("B "); + std::wstring t = _("B "); // @translator: Only translate first letter. byte_unit = t[0]; } - if (!p) + if (!p) { return result + byte_unit; + } result += prefix[p]; - if (format == iec) + if (format == iec) { result += 'i'; + } result += byte_unit; return result; } -wxString CSizeFormatBase::Format(COptionsBase* pOptions, int64_t size, bool add_bytes_suffix /*=false*/) +std::wstring CSizeFormatBase::Format(COptionsBase* pOptions, int64_t size, bool add_bytes_suffix) { - const _format format = _format(pOptions->GetOptionVal(OPTION_SIZE_FORMAT)); - const bool thousands_separator = pOptions->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0; - const int num_decimal_places = pOptions->GetOptionVal(OPTION_SIZE_DECIMALPLACES); + _format const format = _format(pOptions->GetOptionVal(OPTION_SIZE_FORMAT)); + bool const thousands_separator = pOptions->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0; + int const num_decimal_places = pOptions->GetOptionVal(OPTION_SIZE_DECIMALPLACES); return Format(pOptions, size, add_bytes_suffix, format, thousands_separator, num_decimal_places); } -wxString CSizeFormatBase::FormatUnit(COptionsBase* pOptions, int64_t size, CSizeFormatBase::_unit unit, int base /*=1024*/) +std::wstring CSizeFormatBase::FormatUnit(COptionsBase* pOptions, int64_t size, CSizeFormatBase::_unit unit, int base) { _format format = _format(pOptions->GetOptionVal(OPTION_SIZE_FORMAT)); - if (base == 1000) + if (base == 1000) { format = si1000; - else if (format != si1024) + } + else if (format != si1024) { format = iec; - return wxString::Format(_T("%s %s"), FormatNumber(pOptions, size), GetUnit(pOptions, unit, format)); + } + return FormatNumber(pOptions, size) + L" " + GetUnit(pOptions, unit, format); } -wxString CSizeFormatBase::GetUnitWithBase(COptionsBase* pOptions, _unit unit, int base) +std::wstring CSizeFormatBase::GetUnitWithBase(COptionsBase* pOptions, _unit unit, int base) { _format format = _format(pOptions->GetOptionVal(OPTION_SIZE_FORMAT)); - if (base == 1000) + if (base == 1000) { format = si1000; - else if (format != si1024) + } + else if (format != si1024) { format = iec; + } return GetUnit(pOptions, unit, format); } -wxString CSizeFormatBase::GetUnit(COptionsBase* pOptions, _unit unit, CSizeFormatBase::_format format /*=formats_count*/) +std::wstring CSizeFormatBase::GetUnit(COptionsBase* pOptions, _unit unit, CSizeFormatBase::_format format) { - wxString ret; - if (unit != byte) + std::wstring ret; + if (unit != byte) { ret = prefix[unit]; + } - if (format == formats_count) + if (format == formats_count) { format = _format(pOptions->GetOptionVal(OPTION_SIZE_FORMAT)); - if (format == iec || format == bytes) + } + if (format == iec || format == bytes) { ret += 'i'; + } - static wxChar byte_unit = 0; - if (!byte_unit) - { - wxString t = _("B "); + static wchar_t byte_unit = 0; + if (!byte_unit) { + std::wstring t = _("B "); // @translator: Only translate first letter. byte_unit = t[0]; } @@ -219,70 +239,72 @@ return ret; } -const wxString& CSizeFormatBase::GetThousandsSeparator() +namespace { +std::wstring DoGetThousandsSeparator() { - static wxString sep; - static bool separator_initialized = false; - if (!separator_initialized) - { - separator_initialized = true; -#ifdef __WXMSW__ - wxChar tmp[5]; - int count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, tmp, 5); - if (count) - sep = tmp; + std::wstring sep; +#ifdef FZ_WINDOWS + wchar_t tmp[5]; + int count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, tmp, 5); + if (count) { + sep = tmp; + } #else - char* chr = nl_langinfo(THOUSEP); - if (chr && *chr) - { - sep = wxString(chr, wxConvLibc); - } + char* chr = nl_langinfo(THOUSEP); + if (chr && *chr) { + sep = fz::to_wstring(chr); + } #endif - if (sep.size() > 5) { - sep = sep.Left(5); - } + if (sep.size() > 5) { + sep = sep.substr(0, 5); } - return sep; } -const wxString& CSizeFormatBase::GetRadixSeparator() +std::wstring DoGetRadixSeparator() { - static wxString sep; - static bool separator_initialized = false; - if (!separator_initialized) - { - separator_initialized = true; - -#ifdef __WXMSW__ - wxChar tmp[5]; - int count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, tmp, 5); - if (!count) - sep = _T("."); - else - { - tmp[4] = 0; - sep = tmp; - } + std::wstring sep; +#ifdef FZ_WINDOWS + wchar_t tmp[5]; + int count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, tmp, 5); + if (!count) { + sep = L"."; + } + else { + tmp[4] = 0; + sep = tmp; + } #else - char* chr = nl_langinfo(RADIXCHAR); - if (!chr || !*chr) - sep = _T("."); - else - { - sep = wxString(chr, wxConvLibc); - } -#endif + char* chr = nl_langinfo(RADIXCHAR); + if (!chr || !*chr) { + sep = L"."; } + else { + sep = fz::to_wstring(chr); + } +#endif + + return sep; +} +} +std::wstring const& CSizeFormatBase::GetThousandsSeparator() +{ + static std::wstring const sep = DoGetThousandsSeparator(); + return sep; +} + +std::wstring const& CSizeFormatBase::GetRadixSeparator() +{ + static std::wstring const sep = DoGetRadixSeparator(); return sep; } -wxString CSizeFormatBase::FormatNumber(COptionsBase* pOptions, int64_t size, bool* thousands_separator /*=0*/) +std::wstring CSizeFormatBase::FormatNumber(COptionsBase* pOptions, int64_t size, bool* thousands_separator) { - wxString sep; - wxChar const* sepBegin = 0; - wxChar const* sepEnd = 0; + std::wstring sep; + wchar_t const* sepBegin = nullptr; + wchar_t const* sepEnd = nullptr; if ((!thousands_separator || *thousands_separator) && pOptions->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0) { sep = GetThousandsSeparator(); diff -Nru filezilla-3.15.0.2/src/engine/socket.cpp filezilla-3.33.0/src/engine/socket.cpp --- filezilla-3.15.0.2/src/engine/socket.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/socket.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,12 +1,14 @@ -#include #include #ifdef FZ_WINDOWS #include #include #include + #include #endif #include +#include #include +#include #include "socket.h" #ifndef FZ_WINDOWS #define mutex mutex_override // Sadly on some platforms system headers include conflicting names @@ -14,6 +16,7 @@ #include #include #include + #include #include #include #include @@ -23,6 +26,8 @@ #undef mutex #endif +#include + // Fixups needed on FreeBSD #if !defined(EAI_ADDRFAMILY) && defined(EAI_FAMILY) #define EAI_ADDRFAMILY EAI_FAMILY @@ -32,16 +37,6 @@ #define AI_NUMERICSERV 0 #endif -// Union for strict aliasing-safe casting between -// the different address types -union sockaddr_u -{ - struct sockaddr_storage storage; - struct sockaddr sockaddr; - struct sockaddr_in in4; - struct sockaddr_in6 in6; -}; - #define WAIT_CONNECT 0x01 #define WAIT_READ 0x02 #define WAIT_WRITE 0x04 @@ -49,67 +44,96 @@ #define WAIT_CLOSE 0x10 #define WAIT_EVENTCOUNT 5 -class CSocketThread; +namespace fz { namespace { -static std::vector waiting_socket_threads; -static fz::mutex waiting_socket_threads_mutex{ false }; +// Union for strict aliasing-safe casting between +// the different address types +union sockaddr_u +{ + sockaddr_storage storage; + sockaddr sockaddr_; + sockaddr_in in4; + sockaddr_in6 in6; +}; } -void RemoveSocketEvents(fz::event_handler * handler, CSocketEventSource const* const source) +void remove_socket_events(event_handler * handler, socket_event_source const* const source) { - auto socketEventFilter = [&](fz::event_loop::Events::value_type const& ev) -> bool { + auto socket_event_filter = [&](event_loop::Events::value_type const& ev) -> bool { if (ev.first != handler) { return false; } - else if (ev.second->derived_type() == CSocketEvent::type()) { - return std::get<0>(static_cast(*ev.second).v_) == source; + else if (ev.second->derived_type() == socket_event::type()) { + return std::get<0>(static_cast(*ev.second).v_) == source; } - else if (ev.second->derived_type() == CHostAddressEvent::type()) { - return std::get<0>(static_cast(*ev.second).v_) == source; + else if (ev.second->derived_type() == hostaddress_event::type()) { + return std::get<0>(static_cast(*ev.second).v_) == source; } return false; }; - handler->event_loop_.filter_events(socketEventFilter); + handler->event_loop_.filter_events(socket_event_filter); } -void ChangeSocketEventHandler(fz::event_handler * oldHandler, fz::event_handler * newHandler, CSocketEventSource const* const source) +void change_socket_event_handler(event_handler * old_handler, event_handler * new_handler, socket_event_source const* const source) { - if (!oldHandler) + if (!old_handler) { return; - if (oldHandler == newHandler) { + } + + if (old_handler == new_handler) { return; } - if (!newHandler) { - RemoveSocketEvents(oldHandler, source); + if (!new_handler) { + remove_socket_events(old_handler, source); } else { - auto socketEventFilter = [&](fz::event_loop::Events::value_type & ev) -> bool { - if (ev.first == oldHandler) { - if (ev.second->derived_type() == CSocketEvent::type()) { - if (std::get<0>(static_cast(*ev.second).v_) == source) { - ev.first = newHandler; + auto socket_event_filter = [&](event_loop::Events::value_type & ev) -> bool { + if (ev.first == old_handler) { + if (ev.second->derived_type() == socket_event::type()) { + if (std::get<0>(static_cast(*ev.second).v_) == source) { + ev.first = new_handler; } } - else if (ev.second->derived_type() == CHostAddressEvent::type()) { - if (std::get<0>(static_cast(*ev.second).v_) == source) { - ev.first = newHandler; + else if (ev.second->derived_type() == hostaddress_event::type()) { + if (std::get<0>(static_cast(*ev.second).v_) == source) { + ev.first = new_handler; } } } return false; }; - oldHandler->event_loop_.filter_events(socketEventFilter); + old_handler->event_loop_.filter_events(socket_event_filter); } } namespace { +bool has_pending_event(event_handler * handler, socket_event_source const* const source, socket_event_flag event) +{ + bool ret = false; + + auto socket_event_filter = [&](event_loop::Events::value_type const& ev) -> bool { + if (ev.first == handler && ev.second->derived_type() == socket_event::type()) { + auto const& socket_ev = static_cast(*ev.second).v_; + if (std::get<0>(socket_ev) == source && std::get<1>(socket_ev) == event) { + ret = true; + } + } + return false; + }; + + handler->event_loop_.filter_events(socket_event_filter); + + return ret; +} + #ifdef FZ_WINDOWS -static int ConvertMSWErrorCode(int error) +static int convert_msw_error_code(int error) { + // Takes an MSW socket error and converts it into an equivalent POSIX error code. switch (error) { case WSAECONNREFUSED: @@ -157,182 +181,159 @@ } } -int GetLastSocketError() +int last_socket_error() { - return ConvertMSWErrorCode(WSAGetLastError()); + return convert_msw_error_code(WSAGetLastError()); } #else -inline int GetLastSocketError() { return errno; } -#endif - -#ifdef ERRORCODETEST -class CErrorCodeTest -{ -public: - CErrorCodeTest() - { - int errors[] = { - 0 - }; - for (int i = 0; errors[i]; ++i) { -#ifdef FZ_WINDOWS - int code = ConvertMSWErrorCode(errors[i]); -#else - int code = errors[i]; -#endif - if (CSocket::GetErrorDescription(code).Len() < 15) - wxMessageBoxEx(CSocket::GetErrorDescription(code)); - } - - } -}; +inline int last_socket_error() { return errno; } #endif } -class CSocketThread final : protected fz::thread +class socket_thread final { - friend class CSocket; + friend class socket; public: - CSocketThread() - : m_sync(false) + socket_thread() + : mutex_(false) { #ifdef FZ_WINDOWS - m_sync_event = WSA_INVALID_EVENT; + sync_event_ = WSA_INVALID_EVENT; #else - m_pipe[0] = -1; - m_pipe[1] = -1; + pipe_[0] = -1; + pipe_[1] = -1; #endif for (int i = 0; i < WAIT_EVENTCOUNT; ++i) { - m_triggered_errors[i] = 0; + triggered_errors_[i] = 0; } } - virtual ~CSocketThread() + ~socket_thread() { - join(); + thread_.join(); #ifdef FZ_WINDOWS - if (m_sync_event != WSA_INVALID_EVENT) - WSACloseEvent(m_sync_event); + if (sync_event_ != WSA_INVALID_EVENT) { + WSACloseEvent(sync_event_); + } #else - if (m_pipe[0] != -1) - close(m_pipe[0]); - if (m_pipe[1] != -1) - close(m_pipe[1]); + if (pipe_[0] != -1) { + close(pipe_[0]); + } + if (pipe_[1] != -1) { + close(pipe_[1]); + } #endif } - void SetSocket(CSocket* pSocket) + void set_socket(socket* pSocket) { - fz::scoped_lock l(m_sync); - SetSocket(pSocket, l); + scoped_lock l(mutex_); + set_socket(pSocket, l); } - void SetSocket(CSocket* pSocket, fz::scoped_lock const&) + void set_socket(socket* pSocket, scoped_lock const&) { - m_pSocket = pSocket; + socket_ = pSocket; - m_host.clear(); - m_port.clear(); + host_.clear(); + port_.clear(); - m_waiting = 0; + waiting_ = 0; } - int Connect(wxString const& bind) + int connect(std::string const& bind) { - wxASSERT(m_pSocket); + assert(socket_); + if (!socket_) { + return EINVAL; + } - auto const hostBuf = m_pSocket->m_host.mb_str(); - auto const bindBuf = bind.mb_str(); - if (!hostBuf || !bindBuf) { - m_bind.clear(); - m_host.clear(); - m_port.clear(); + host_ = to_utf8(socket_->host_); + if (host_.empty()) { return EINVAL; } - m_host = hostBuf; - m_bind = bindBuf; - // Connect method of CSocket ensures port is in range - char tmp[7]; - sprintf(tmp, "%u", m_pSocket->m_port); - tmp[5] = 0; - m_port = tmp; + bind_ = bind; - Start(); + // Connect method of socket ensures port is in range + port_ = sprintf("%u", socket_->port_); + + start(); return 0; } - int Start() + int start() { - if (m_started) { - fz::scoped_lock l(m_sync); - wxASSERT(m_threadwait); - m_waiting = 0; - WakeupThread(l); + if (started_) { + scoped_lock l(mutex_); + assert(threadwait_); + waiting_ = 0; + wakeup_thread(l); return 0; } - m_started = true; + started_ = true; #ifdef FZ_WINDOWS - if (m_sync_event == WSA_INVALID_EVENT) - m_sync_event = WSACreateEvent(); - if (m_sync_event == WSA_INVALID_EVENT) + if (sync_event_ == WSA_INVALID_EVENT) { + sync_event_ = WSACreateEvent(); + } + if (sync_event_ == WSA_INVALID_EVENT) { return 1; + } #else - if (m_pipe[0] == -1) { - if (pipe(m_pipe)) + if (pipe_[0] == -1) { + if (pipe(pipe_)) { return errno; + } } #endif - if (!run()) { - return 1; - } + thread_ = socket_->thread_pool_.spawn([this]() { entry(); }); - return 0; + return thread_ ? 0 : 1; } // Cancels select or idle wait - void WakeupThread() + void wakeup_thread() { - fz::scoped_lock l(m_sync); - WakeupThread(l); + scoped_lock l(mutex_); + wakeup_thread(l); } - void WakeupThread(fz::scoped_lock & l) + void wakeup_thread(scoped_lock & l) { - if (!m_started || m_finished) { + if (!started_ || finished_) { return; } - if (m_threadwait) { - m_threadwait = false; - m_condition.signal(l); + if (threadwait_) { + threadwait_ = false; + condition_.signal(l); return; } #ifdef FZ_WINDOWS - WSASetEvent(m_sync_event); + WSASetEvent(sync_event_); #else char tmp = 0; int ret; do { - ret = write(m_pipe[1], &tmp, 1); + ret = write(pipe_[1], &tmp, 1); } while (ret == -1 && errno == EINTR); #endif } protected: - static int CreateSocketFd(addrinfo const& addr) + static int create_socket_fd(addrinfo const& addr) { int fd; #if defined(SOCK_CLOEXEC) && !defined(FZ_WINDOWS) - fd = socket(addr.ai_family, addr.ai_socktype | SOCK_CLOEXEC, addr.ai_protocol); + fd = ::socket(addr.ai_family, addr.ai_socktype | SOCK_CLOEXEC, addr.ai_protocol); if (fd == -1 && errno == EINVAL) #endif { - fd = socket(addr.ai_family, addr.ai_socktype, addr.ai_protocol); + fd = ::socket(addr.ai_family, addr.ai_socktype, addr.ai_protocol); } if (fd != -1) { @@ -341,13 +342,13 @@ const int value = 1; setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &value, sizeof(int)); #endif - CSocket::SetNonblocking(fd); + socket::set_nonblocking(fd); } return fd; } - static void CloseSocketFd(int& fd) + static void close_socket_fd(int& fd) { if (fd != -1) { #ifdef FZ_WINDOWS @@ -359,37 +360,39 @@ } } - int TryConnectHost(addrinfo & addr, sockaddr_u const& bindAddr, fz::scoped_lock & l) + int try_connect_host(addrinfo & addr, sockaddr_u const& bindAddr, scoped_lock & l) { - if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->send_event(m_pSocket, CSocket::AddressToString(addr.ai_addr, addr.ai_addrlen)); + if (socket_->evt_handler_) { + socket_->evt_handler_->send_event(socket_, socket::address_to_string(addr.ai_addr, addr.ai_addrlen)); } - int fd = CreateSocketFd(addr); + int fd = create_socket_fd(addr); if (fd == -1) { - if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->send_event(m_pSocket, addr.ai_next ? SocketEventType::connection_next : SocketEventType::connection, GetLastSocketError()); + if (socket_->evt_handler_) { + socket_->evt_handler_->send_event(socket_, addr.ai_next ? socket_event_flag::connection_next : socket_event_flag::connection, last_socket_error()); } return 0; } - if (bindAddr.sockaddr.sa_family != AF_UNSPEC && bindAddr.sockaddr.sa_family == addr.ai_family) { - (void)bind(fd, &bindAddr.sockaddr, sizeof(bindAddr)); + if (bindAddr.sockaddr_.sa_family != AF_UNSPEC && bindAddr.sockaddr_.sa_family == addr.ai_family) { + (void)bind(fd, &bindAddr.sockaddr_, sizeof(bindAddr)); } - CSocket::DoSetFlags(fd, m_pSocket->m_flags, m_pSocket->m_flags); - CSocket::DoSetBufferSizes(fd, m_pSocket->m_buffer_sizes[0], m_pSocket->m_buffer_sizes[1]); + socket::do_set_flags(fd, socket_->flags_, socket_->flags_, socket_->keepalive_interval_); + socket::do_set_buffer_sizes(fd, socket_->buffer_sizes_[0], socket_->buffer_sizes_[1]); - int res = connect(fd, addr.ai_addr, addr.ai_addrlen); + int res = ::connect(fd, addr.ai_addr, addr.ai_addrlen); if (res == -1) { #ifdef FZ_WINDOWS // Map to POSIX error codes int error = WSAGetLastError(); - if (error == WSAEWOULDBLOCK) + if (error == WSAEWOULDBLOCK) { res = EINPROGRESS; - else - res = GetLastSocketError(); + } + else { + res = last_socket_error(); + } #else res = errno; #endif @@ -397,44 +400,46 @@ if (res == EINPROGRESS) { - m_pSocket->m_fd = fd; + socket_->fd_ = fd; bool wait_successful; do { - wait_successful = DoWait(WAIT_CONNECT, l); - if ((m_triggered & WAIT_CONNECT)) + wait_successful = do_wait(WAIT_CONNECT, l); + if ((triggered_ & WAIT_CONNECT)) { break; + } } while (wait_successful); if (!wait_successful) { - CloseSocketFd(fd); - if (m_pSocket) - m_pSocket->m_fd = -1; + close_socket_fd(fd); + if (socket_) { + socket_->fd_ = -1; + } return -1; } - m_triggered &= ~WAIT_CONNECT; + triggered_ &= ~WAIT_CONNECT; - res = m_triggered_errors[0]; + res = triggered_errors_[0]; } if (res) { - if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->send_event(m_pSocket, addr.ai_next ? SocketEventType::connection_next : SocketEventType::connection, res); + if (socket_->evt_handler_) { + socket_->evt_handler_->send_event(socket_, addr.ai_next ? socket_event_flag::connection_next : socket_event_flag::connection, res); } - CloseSocketFd(fd); - m_pSocket->m_fd = -1; + close_socket_fd(fd); + socket_->fd_ = -1; } else { - m_pSocket->m_fd = fd; - m_pSocket->m_state = CSocket::connected; + socket_->fd_ = fd; + socket_->state_ = socket::connected; - if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::connection, 0); + if (socket_->evt_handler_) { + socket_->evt_handler_->send_event(socket_, socket_event_flag::connection, 0); } // We're now interested in all the other nice events - m_waiting |= WAIT_READ | WAIT_WRITE; + waiting_ |= WAIT_READ | WAIT_WRITE; return 1; } @@ -443,17 +448,17 @@ } // Only call while locked - bool DoConnect(fz::scoped_lock & l) + bool do_connect(scoped_lock & l) { - if (m_host.empty() || m_port.empty()) { - m_pSocket->m_state = CSocket::closed; + if (host_.empty() || port_.empty()) { + socket_->state_ = socket::closed; return false; } std::string host, port, bind; - std::swap(host, m_host); - std::swap(port, m_port); - std::swap(bind, m_bind); + std::swap(host, host_); + std::swap(port, port_); + std::swap(bind, bind_); sockaddr_u bindAddr{}; @@ -463,7 +468,7 @@ bind_hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV | AI_PASSIVE; bind_hints.ai_socktype = SOCK_STREAM; addrinfo *bindAddressList{}; - int res = getaddrinfo(bind.empty() ? 0 : bind.c_str(), "0", &bind_hints, &bindAddressList); + int res = getaddrinfo(bind.empty() ? nullptr : bind.c_str(), "0", &bind_hints, &bindAddressList); if (!res && bindAddressList) { if (bindAddressList->ai_addr) { memcpy(&bindAddr.storage, bindAddressList->ai_addr, bindAddressList->ai_addrlen); @@ -473,7 +478,7 @@ } addrinfo hints{}; - hints.ai_family = m_pSocket->m_family; + hints.ai_family = socket_->family_; l.unlock(); @@ -487,43 +492,47 @@ l.lock(); - if (ShouldQuit()) { - if (!res && addressList) + if (should_quit()) { + if (!res && addressList) { freeaddrinfo(addressList); - if (m_pSocket) - m_pSocket->m_state = CSocket::closed; + } + if (socket_) { + socket_->state_ = socket::closed; + } return false; } - // If state isn't connecting, Close() was called. - // If m_pHost is set, Close() was called and Connect() + // If state isn't connecting, close() was called. + // If host_ is set, close() was called and connect() // afterwards, state is back at connecting. // In either case, we need to abort this connection attempt. - if (m_pSocket->m_state != CSocket::connecting || !m_host.empty()) { - if (!res && addressList) + if (socket_->state_ != socket::connecting || !host_.empty()) { + if (!res && addressList) { freeaddrinfo(addressList); + } return false; } if (res) { #ifdef FZ_WINDOWS - res = ConvertMSWErrorCode(res); + res = convert_msw_error_code(res); #endif - if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::connection, res); + if (socket_->evt_handler_) { + socket_->evt_handler_->send_event(socket_, socket_event_flag::connection, res); } - m_pSocket->m_state = CSocket::closed; + socket_->state_ = socket::closed; return false; } for (addrinfo *addr = addressList; addr; addr = addr->ai_next) { - res = TryConnectHost(*addr, bindAddr, l); + res = try_connect_host(*addr, bindAddr, l); if (res == -1) { freeaddrinfo(addressList); - if (m_pSocket) - m_pSocket->m_state = CSocket::closed; + if (socket_) { + socket_->state_ = socket::closed; + } return false; } else if (res) { @@ -533,198 +542,207 @@ } freeaddrinfo(addressList); - if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::connection, ECONNABORTED); + if (socket_->evt_handler_) { + socket_->evt_handler_->send_event(socket_, socket_event_flag::connection, ECONNABORTED); } - m_pSocket->m_state = CSocket::closed; + socket_->state_ = socket::closed; return false; } - bool ShouldQuit() const + bool should_quit() const { - return m_quit || !m_pSocket; + return quit_ || !socket_; } // Call only while locked - bool DoWait(int wait, fz::scoped_lock & l) + bool do_wait(int wait, scoped_lock & l) { - m_waiting |= wait; + waiting_ |= wait; for (;;) { #ifdef FZ_WINDOWS int wait_events = FD_CLOSE; - if (m_waiting & WAIT_CONNECT) + if (waiting_ & WAIT_CONNECT) { wait_events |= FD_CONNECT; - if (m_waiting & WAIT_READ) + } + if (waiting_ & WAIT_READ) { wait_events |= FD_READ; - if (m_waiting & WAIT_WRITE) + } + if (waiting_ & WAIT_WRITE) { wait_events |= FD_WRITE; - if (m_waiting & WAIT_ACCEPT) + } + if (waiting_ & WAIT_ACCEPT) { wait_events |= FD_ACCEPT; - if (m_waiting & WAIT_CLOSE) + } + if (waiting_ & WAIT_CLOSE) { wait_events |= FD_CLOSE; - WSAEventSelect(m_pSocket->m_fd, m_sync_event, wait_events); + } + WSAEventSelect(socket_->fd_, sync_event_, wait_events); l.unlock(); - WSAWaitForMultipleEvents(1, &m_sync_event, false, WSA_INFINITE, false); + WSAWaitForMultipleEvents(1, &sync_event_, false, WSA_INFINITE, false); l.lock(); - if (ShouldQuit()) { + if (should_quit()) { return false; } WSANETWORKEVENTS events; - int res = WSAEnumNetworkEvents(m_pSocket->m_fd, m_sync_event, &events); + int res = WSAEnumNetworkEvents(socket_->fd_, sync_event_, &events); if (res) { - res = GetLastSocketError(); + res = last_socket_error(); return false; } - if (m_waiting & WAIT_CONNECT) { + if (waiting_ & WAIT_CONNECT) { if (events.lNetworkEvents & FD_CONNECT) { - m_triggered |= WAIT_CONNECT; - m_triggered_errors[0] = ConvertMSWErrorCode(events.iErrorCode[FD_CONNECT_BIT]); - m_waiting &= ~WAIT_CONNECT; + triggered_ |= WAIT_CONNECT; + triggered_errors_[0] = convert_msw_error_code(events.iErrorCode[FD_CONNECT_BIT]); + waiting_ &= ~WAIT_CONNECT; } } - if (m_waiting & WAIT_READ) { + if (waiting_ & WAIT_READ) { if (events.lNetworkEvents & FD_READ) { - m_triggered |= WAIT_READ; - m_triggered_errors[1] = ConvertMSWErrorCode(events.iErrorCode[FD_READ_BIT]); - m_waiting &= ~WAIT_READ; + triggered_ |= WAIT_READ; + triggered_errors_[1] = convert_msw_error_code(events.iErrorCode[FD_READ_BIT]); + waiting_ &= ~WAIT_READ; } } - if (m_waiting & WAIT_WRITE) { + if (waiting_ & WAIT_WRITE) { if (events.lNetworkEvents & FD_WRITE) { - m_triggered |= WAIT_WRITE; - m_triggered_errors[2] = ConvertMSWErrorCode(events.iErrorCode[FD_WRITE_BIT]); - m_waiting &= ~WAIT_WRITE; + triggered_ |= WAIT_WRITE; + triggered_errors_[2] = convert_msw_error_code(events.iErrorCode[FD_WRITE_BIT]); + waiting_ &= ~WAIT_WRITE; } } - if (m_waiting & WAIT_ACCEPT) { + if (waiting_ & WAIT_ACCEPT) { if (events.lNetworkEvents & FD_ACCEPT) { - m_triggered |= WAIT_ACCEPT; - m_triggered_errors[3] = ConvertMSWErrorCode(events.iErrorCode[FD_ACCEPT_BIT]); - m_waiting &= ~WAIT_ACCEPT; + triggered_ |= WAIT_ACCEPT; + triggered_errors_[3] = convert_msw_error_code(events.iErrorCode[FD_ACCEPT_BIT]); + waiting_ &= ~WAIT_ACCEPT; } } - if (m_waiting & WAIT_CLOSE) { + if (waiting_ & WAIT_CLOSE) { if (events.lNetworkEvents & FD_CLOSE) { - m_triggered |= WAIT_CLOSE; - m_triggered_errors[4] = ConvertMSWErrorCode(events.iErrorCode[FD_CLOSE_BIT]); - m_waiting &= ~WAIT_CLOSE; + triggered_ |= WAIT_CLOSE; + triggered_errors_[4] = convert_msw_error_code(events.iErrorCode[FD_CLOSE_BIT]); + waiting_ &= ~WAIT_CLOSE; } } - if (m_triggered || !m_waiting) + if (triggered_ || !waiting_) { return true; + } #else fd_set readfds; fd_set writefds; FD_ZERO(&readfds); FD_ZERO(&writefds); - FD_SET(m_pipe[0], &readfds); - if (!(m_waiting & WAIT_CONNECT)) - FD_SET(m_pSocket->m_fd, &readfds); + FD_SET(pipe_[0], &readfds); + if (!(waiting_ & WAIT_CONNECT)) { + FD_SET(socket_->fd_, &readfds); + } - if (m_waiting & (WAIT_WRITE | WAIT_CONNECT)) - FD_SET(m_pSocket->m_fd, &writefds); + if (waiting_ & (WAIT_WRITE | WAIT_CONNECT)) { + FD_SET(socket_->fd_, &writefds); + } - int max = wxMax(m_pipe[0], m_pSocket->m_fd) + 1; + int maxfd = std::max(pipe_[0], socket_->fd_) + 1; l.unlock(); - int res = select(max, &readfds, &writefds, 0, 0); + int res = select(maxfd, &readfds, &writefds, nullptr, nullptr); l.lock(); - if (res > 0 && FD_ISSET(m_pipe[0], &readfds)) { + if (res > 0 && FD_ISSET(pipe_[0], &readfds)) { char buffer[100]; - int damn_spurious_warning = read(m_pipe[0], buffer, 100); + int damn_spurious_warning = read(pipe_[0], buffer, 100); (void)damn_spurious_warning; // We do not care about return value and this is definitely correct! } - if (m_quit || !m_pSocket || m_pSocket->m_fd == -1) { + if (quit_ || !socket_ || socket_->fd_ == -1) { return false; } - if (!res) + if (!res) { continue; + } if (res == -1) { res = errno; - //printf("select failed: %s\n", (const char *)CSocket::GetErrorDescription(res).mb_str()); - //fflush(stdout); - if (res == EINTR) + if (res == EINTR) { continue; + } return false; } - if (m_waiting & WAIT_CONNECT) { - if (FD_ISSET(m_pSocket->m_fd, &writefds)) { + if (waiting_ & WAIT_CONNECT) { + if (FD_ISSET(socket_->fd_, &writefds)) { int error; socklen_t len = sizeof(error); - int res = getsockopt(m_pSocket->m_fd, SOL_SOCKET, SO_ERROR, &error, &len); - if (res) + int getsockopt_res = getsockopt(socket_->fd_, SOL_SOCKET, SO_ERROR, &error, &len); + if (getsockopt_res) { error = errno; - m_triggered |= WAIT_CONNECT; - m_triggered_errors[0] = error; - m_waiting &= ~WAIT_CONNECT; + } + triggered_ |= WAIT_CONNECT; + triggered_errors_[0] = error; + waiting_ &= ~WAIT_CONNECT; } } - else if (m_waiting & WAIT_ACCEPT) { - if (FD_ISSET(m_pSocket->m_fd, &readfds)) { - m_triggered |= WAIT_ACCEPT; - m_waiting &= ~WAIT_ACCEPT; + else if (waiting_ & WAIT_ACCEPT) { + if (FD_ISSET(socket_->fd_, &readfds)) { + triggered_ |= WAIT_ACCEPT; + waiting_ &= ~WAIT_ACCEPT; } } - else if (m_waiting & WAIT_READ) { - if (FD_ISSET(m_pSocket->m_fd, &readfds)) { - m_triggered |= WAIT_READ; - m_waiting &= ~WAIT_READ; + else if (waiting_ & WAIT_READ) { + if (FD_ISSET(socket_->fd_, &readfds)) { + triggered_ |= WAIT_READ; + waiting_ &= ~WAIT_READ; } } - if (m_waiting & WAIT_WRITE) { - if (FD_ISSET(m_pSocket->m_fd, &writefds)) { - m_triggered |= WAIT_WRITE; - m_waiting &= ~WAIT_WRITE; + if (waiting_ & WAIT_WRITE) { + if (FD_ISSET(socket_->fd_, &writefds)) { + triggered_ |= WAIT_WRITE; + waiting_ &= ~WAIT_WRITE; } } - if (m_triggered || !m_waiting) + if (triggered_ || !waiting_) { return true; + } #endif } } - void SendEvents() + void send_events() { - if (!m_pSocket || !m_pSocket->m_pEvtHandler) + if (!socket_ || !socket_->evt_handler_) { return; - if (m_triggered & WAIT_READ) { - if (m_pSocket->m_synchronous_read_cb) - m_pSocket->m_synchronous_read_cb->cb(); - m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::read, m_triggered_errors[1]); - m_triggered &= ~WAIT_READ; } - if (m_triggered & WAIT_WRITE) { - m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::write, m_triggered_errors[2]); - m_triggered &= ~WAIT_WRITE; + if (triggered_ & WAIT_READ) { + socket_->evt_handler_->send_event(socket_, socket_event_flag::read, triggered_errors_[1]); + triggered_ &= ~WAIT_READ; + } + if (triggered_ & WAIT_WRITE) { + socket_->evt_handler_->send_event(socket_, socket_event_flag::write, triggered_errors_[2]); + triggered_ &= ~WAIT_WRITE; } - if (m_triggered & WAIT_ACCEPT) { - m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::connection, m_triggered_errors[3]); - m_triggered &= ~WAIT_ACCEPT; + if (triggered_ & WAIT_ACCEPT) { + socket_->evt_handler_->send_event(socket_, socket_event_flag::connection, triggered_errors_[3]); + triggered_ &= ~WAIT_ACCEPT; } - if (m_triggered & WAIT_CLOSE) { - SendCloseEvent(); + if (triggered_ & WAIT_CLOSE) { + send_close_event(); } } - void SendCloseEvent() + void send_close_event() { - if( !m_pSocket || !m_pSocket->m_pEvtHandler ) { + if (!socket_ || !socket_->evt_handler_) { return; } @@ -735,505 +753,498 @@ // of FD_CLOSE to avoid any possibility of losing data. // First half is actually plain wrong. char buf; - if( !m_triggered_errors[4] && recv( m_pSocket->m_fd, &buf, 1, MSG_PEEK ) > 0) { - if( !(m_waiting & WAIT_READ) ) { + if (!triggered_errors_[4] && recv( socket_->fd_, &buf, 1, MSG_PEEK ) > 0) { + if (!(waiting_ & WAIT_READ)) { return; } - m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::read, 0); + socket_->evt_handler_->send_event(socket_, socket_event_flag::read, 0); } else #endif { - m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::close, m_triggered_errors[4]); - m_triggered &= ~WAIT_CLOSE; + socket_->evt_handler_->send_event(socket_, socket_event_flag::close, triggered_errors_[4]); + triggered_ &= ~WAIT_CLOSE; } } // Call only while locked - bool IdleLoop(fz::scoped_lock & l) + bool idle_loop(scoped_lock & l) { - if (m_quit) + if (quit_) { return false; - while (!m_pSocket || (!m_waiting && m_host.empty())) { - m_threadwait = true; - m_condition.wait(l); + } + while (!socket_ || (!waiting_ && host_.empty())) { + threadwait_ = true; + condition_.wait(l); - if (m_quit) + if (quit_) { return false; + } } return true; } - virtual void entry() + void entry() { - fz::scoped_lock l(m_sync); + scoped_lock l(mutex_); for (;;) { - if (!IdleLoop(l)) { - m_finished = true; - return; + if (!idle_loop(l)) { + break; } - if (m_pSocket->m_state == CSocket::listening) { - while (IdleLoop(l)) { - if (m_pSocket->m_fd == -1) { - m_waiting = 0; + if (socket_->state_ == socket::listening) { + while (idle_loop(l)) { + if (socket_->fd_ == -1) { + waiting_ = 0; break; } - if (!DoWait(0, l)) + if (!do_wait(0, l)) { break; - SendEvents(); + } + send_events(); } } else { - if (m_pSocket->m_state == CSocket::connecting) { - if (!DoConnect(l)) + if (socket_->state_ == socket::connecting) { + if (!do_connect(l)) { continue; + } } #ifdef FZ_WINDOWS - m_waiting |= WAIT_CLOSE; + waiting_ |= WAIT_CLOSE; int wait_close = WAIT_CLOSE; #endif - while (IdleLoop(l)) { - if (m_pSocket->m_fd == -1) { - m_waiting = 0; + while (idle_loop(l)) { + if (socket_->fd_ == -1) { + waiting_ = 0; break; } - bool res = DoWait(0, l); + bool res = do_wait(0, l); - if (m_triggered & WAIT_CLOSE && m_pSocket) { - m_pSocket->m_state = CSocket::closing; + if (triggered_ & WAIT_CLOSE && socket_) { + socket_->state_ = socket::closing; #ifdef FZ_WINDOWS wait_close = 0; #endif } - if (!res) + if (!res) { break; + } - SendEvents(); + send_events(); #ifdef FZ_WINDOWS - m_waiting |= wait_close; + waiting_ |= wait_close; #endif } } } - m_finished = true; + if (thread_) { + finished_ = true; + } + else { + l.unlock(); + delete this; + } return; } - CSocket* m_pSocket{}; + socket* socket_{}; - std::string m_host; - std::string m_port; - std::string m_bind; + std::string host_; + std::string port_; + std::string bind_; #ifdef FZ_WINDOWS // We wait on this using WSAWaitForMultipleEvents - WSAEVENT m_sync_event; + WSAEVENT sync_event_; #else // A pipe is used to unblock select - int m_pipe[2]; + int pipe_[2]; #endif - fz::mutex m_sync; - fz::condition m_condition; + mutex mutex_; + condition condition_; - bool m_started{}; - bool m_quit{}; - bool m_finished{}; + bool started_{}; + bool quit_{}; + bool finished_{}; // The socket events we are waiting for - int m_waiting{}; + int waiting_{}; // The triggered socket events - int m_triggered{}; - int m_triggered_errors[WAIT_EVENTCOUNT]; + int triggered_{}; + int triggered_errors_[WAIT_EVENTCOUNT]; // Thread waits for instructions - bool m_threadwait{}; + bool threadwait_{}; + + async_task thread_; }; -CSocket::CSocket(fz::event_handler* pEvtHandler) - : m_pEvtHandler(pEvtHandler) +socket::socket(thread_pool & pool, event_handler* evt_handler) + : thread_pool_(pool) + , evt_handler_(evt_handler) + , keepalive_interval_(duration::from_hours(2)) { -#ifdef ERRORCODETEST - CErrorCodeTest test; -#endif - m_fd = -1; - m_state = none; - m_pSocketThread = 0; - m_flags = 0; + family_ = AF_UNSPEC; - m_port = 0; - m_family = AF_UNSPEC; - - m_buffer_sizes[0] = -1; - m_buffer_sizes[1] = -1; + buffer_sizes_[0] = -1; + buffer_sizes_[1] = -1; } -CSocket::~CSocket() +socket::~socket() { - if (m_state != none) - Close(); + if (state_ != none) { + close(); + } - DetachThread(); + if (socket_thread_) { + scoped_lock l(socket_thread_->mutex_); + detach_thread(l); + } } -void CSocket::DetachThread() +void socket::detach_thread(scoped_lock & l) { - if (!m_pSocketThread) + if (!socket_thread_) { return; + } - fz::scoped_lock l(m_pSocketThread->m_sync); - m_pSocketThread->SetSocket(0, l); - if (m_pSocketThread->m_finished) { - m_pSocketThread->WakeupThread(l); + socket_thread_->set_socket(nullptr, l); + if (socket_thread_->finished_) { + socket_thread_->wakeup_thread(l); l.unlock(); - delete m_pSocketThread; + delete socket_thread_; + socket_thread_ = nullptr; } else { - if (!m_pSocketThread->m_started) { + if (!socket_thread_->started_) { + auto thread = socket_thread_; + socket_thread_ = nullptr; l.unlock(); - delete m_pSocketThread; + delete thread; } else { - m_pSocketThread->m_quit = true; - m_pSocketThread->WakeupThread(l); - l.unlock(); - - fz::scoped_lock wl(waiting_socket_threads_mutex); - waiting_socket_threads.push_back(m_pSocketThread); + socket_thread_->quit_ = true; + socket_thread_->thread_.detach(); + socket_thread_->wakeup_thread(l); + socket_thread_ = nullptr; } } - m_pSocketThread = 0; - - Cleanup(false); } -int CSocket::Connect(wxString const& host, unsigned int port, address_family family, wxString const& bind) +int socket::connect(native_string const& host, unsigned int port, address_type family, std::string const& bind) { - if (m_state != none) + if (state_ != none) { return EISCONN; + } + + if (port < 1 || port > 65535) { + return EINVAL; + } - if (port < 1 || port > 65535) + if (host.empty()) { return EINVAL; + } + + int af{}; switch (family) { - case unspec: - m_family = AF_UNSPEC; + case address_type::unknown: + af = AF_UNSPEC; break; - case ipv4: - m_family = AF_INET; + case address_type::ipv4: + af = AF_INET; break; - case ipv6: - m_family = AF_INET6; + case address_type::ipv6: + af = AF_INET6; break; default: return EINVAL; } - if (m_pSocketThread && m_pSocketThread->m_started) { - fz::scoped_lock l(m_pSocketThread->m_sync); - if (!m_pSocketThread->m_threadwait) { - m_pSocketThread->WakeupThread(l); - l.unlock(); - // Wait a small amount of time - wxMilliSleep(100); - - l.lock(); - if (!m_pSocketThread->m_threadwait) { - // Inside a blocking call, e.g. getaddrinfo - l.unlock(); - DetachThread(); - } + if (socket_thread_ && socket_thread_->started_) { + scoped_lock l(socket_thread_->mutex_); + if (!socket_thread_->threadwait_) { + // Possibly inside a blocking call, e.g. getaddrinfo. + // Detach the thread so that we can continue. + detach_thread(l); } } - if (!m_pSocketThread) { - m_pSocketThread = new CSocketThread(); - m_pSocketThread->SetSocket(this); + if (!socket_thread_) { + socket_thread_ = new socket_thread(); + socket_thread_->set_socket(this); } - m_state = connecting; + family_ = af; + state_ = connecting; - m_host = host; - m_port = port; - int res = m_pSocketThread->Connect(bind); + host_ = host; + port_ = port; + int res = socket_thread_->connect(bind); if (res) { - m_state = none; - delete m_pSocketThread; - m_pSocketThread = 0; + state_ = none; + delete socket_thread_; + socket_thread_ = nullptr; return res; } return EINPROGRESS; } -void CSocket::SetEventHandler(fz::event_handler* pEvtHandler) +void socket::set_event_handler(event_handler* pEvtHandler) { - if (m_pSocketThread) { - fz::scoped_lock l(m_pSocketThread->m_sync); + if (socket_thread_) { + scoped_lock l(socket_thread_->mutex_); - if (m_pEvtHandler == pEvtHandler) { + if (evt_handler_ == pEvtHandler) { return; } - ChangeSocketEventHandler(m_pEvtHandler, pEvtHandler, this); + change_socket_event_handler(evt_handler_, pEvtHandler, this); - m_pEvtHandler = pEvtHandler; + evt_handler_ = pEvtHandler; - if (pEvtHandler && m_state == connected) { + if (pEvtHandler && state_ == connected) { #ifdef FZ_WINDOWS // If a graceful shutdown is going on in background already, // no further events are recorded. Send out events we're not // waiting for (i.e. they got triggered already) manually. - if (!(m_pSocketThread->m_waiting & WAIT_WRITE)) { - pEvtHandler->send_event(this, SocketEventType::write, 0); + if (!(socket_thread_->waiting_ & WAIT_WRITE)) { + pEvtHandler->send_event(this, socket_event_flag::write, 0); } - pEvtHandler->send_event(this, SocketEventType::read, 0); - if (m_pSocketThread->m_waiting & WAIT_READ) { - m_pSocketThread->m_waiting &= ~WAIT_READ; - m_pSocketThread->WakeupThread(l); + pEvtHandler->send_event(this, socket_event_flag::read, 0); + if (socket_thread_->waiting_ & WAIT_READ) { + socket_thread_->waiting_ &= ~WAIT_READ; + socket_thread_->wakeup_thread(l); } #else - m_pSocketThread->m_waiting |= WAIT_READ | WAIT_WRITE; - m_pSocketThread->WakeupThread(l); + socket_thread_->waiting_ |= WAIT_READ | WAIT_WRITE; + socket_thread_->wakeup_thread(l); #endif } - else if (pEvtHandler && m_state == closing) { - if (!(m_pSocketThread->m_triggered & WAIT_READ)) { - m_pSocketThread->m_waiting |= WAIT_READ; + else if (pEvtHandler && state_ == closing) { + if (!(socket_thread_->triggered_ & WAIT_READ)) { + socket_thread_->waiting_ |= WAIT_READ; } - m_pSocketThread->SendEvents(); + socket_thread_->send_events(); } } else { - ChangeSocketEventHandler(m_pEvtHandler, pEvtHandler, this); - m_pEvtHandler = pEvtHandler; + change_socket_event_handler(evt_handler_, pEvtHandler, this); + evt_handler_ = pEvtHandler; } } -#define ERRORDECL(c, desc) { c, _T(#c), desc }, +#define ERRORDECL(c, desc) { c, #c, desc }, struct Error_table { int code; - const wxChar* const name; - const wxChar* const description; + char const* const name; + char const* const description; }; static Error_table const error_table[] = { - ERRORDECL(EACCES, TRANSLATE_T("Permission denied")) - ERRORDECL(EADDRINUSE, TRANSLATE_T("Local address in use")) - ERRORDECL(EAFNOSUPPORT, TRANSLATE_T("The specified address family is not supported")) - ERRORDECL(EINPROGRESS, TRANSLATE_T("Operation in progress")) - ERRORDECL(EINVAL, TRANSLATE_T("Invalid argument passed")) - ERRORDECL(EMFILE, TRANSLATE_T("Process file table overflow")) - ERRORDECL(ENFILE, TRANSLATE_T("System limit of open files exceeded")) - ERRORDECL(ENOBUFS, TRANSLATE_T("Out of memory")) - ERRORDECL(ENOMEM, TRANSLATE_T("Out of memory")) - ERRORDECL(EPERM, TRANSLATE_T("Permission denied")) - ERRORDECL(EPROTONOSUPPORT, TRANSLATE_T("Protocol not supported")) - ERRORDECL(EAGAIN, TRANSLATE_T("Resource temporarily unavailable")) - ERRORDECL(EALREADY, TRANSLATE_T("Operation already in progress")) - ERRORDECL(EBADF, TRANSLATE_T("Bad file descriptor")) - ERRORDECL(ECONNREFUSED, TRANSLATE_T("Connection refused by server")) - ERRORDECL(EFAULT, TRANSLATE_T("Socket address outside address space")) - ERRORDECL(EINTR, TRANSLATE_T("Interrupted by signal")) - ERRORDECL(EISCONN, TRANSLATE_T("Socket already connected")) - ERRORDECL(ENETUNREACH, TRANSLATE_T("Network unreachable")) - ERRORDECL(ENOTSOCK, TRANSLATE_T("File descriptor not a socket")) - ERRORDECL(ETIMEDOUT, TRANSLATE_T("Connection attempt timed out")) - ERRORDECL(EHOSTUNREACH, TRANSLATE_T("No route to host")) - ERRORDECL(ENOTCONN, TRANSLATE_T("Socket not connected")) - ERRORDECL(ENETRESET, TRANSLATE_T("Connection reset by network")) - ERRORDECL(EOPNOTSUPP, TRANSLATE_T("Operation not supported")) - ERRORDECL(ESHUTDOWN, TRANSLATE_T("Socket has been shut down")) - ERRORDECL(EMSGSIZE, TRANSLATE_T("Message too large")) - ERRORDECL(ECONNABORTED, TRANSLATE_T("Connection aborted")) - ERRORDECL(ECONNRESET, TRANSLATE_T("Connection reset by peer")) - ERRORDECL(EPIPE, TRANSLATE_T("Local endpoint has been closed")) - ERRORDECL(EHOSTDOWN, TRANSLATE_T("Host is down")) + ERRORDECL(EACCES, fztranslate_mark("Permission denied")) + ERRORDECL(EADDRINUSE, fztranslate_mark("Local address in use")) + ERRORDECL(EAFNOSUPPORT, fztranslate_mark("The specified address family is not supported")) + ERRORDECL(EINPROGRESS, fztranslate_mark("Operation in progress")) + ERRORDECL(EINVAL, fztranslate_mark("Invalid argument passed")) + ERRORDECL(EMFILE, fztranslate_mark("Process file table overflow")) + ERRORDECL(ENFILE, fztranslate_mark("System limit of open files exceeded")) + ERRORDECL(ENOBUFS, fztranslate_mark("Out of memory")) + ERRORDECL(ENOMEM, fztranslate_mark("Out of memory")) + ERRORDECL(EPERM, fztranslate_mark("Permission denied")) + ERRORDECL(EPROTONOSUPPORT, fztranslate_mark("Protocol not supported")) + ERRORDECL(EAGAIN, fztranslate_mark("Resource temporarily unavailable")) + ERRORDECL(EALREADY, fztranslate_mark("Operation already in progress")) + ERRORDECL(EBADF, fztranslate_mark("Bad file descriptor")) + ERRORDECL(ECONNREFUSED, fztranslate_mark("Connection refused by server")) + ERRORDECL(EFAULT, fztranslate_mark("Socket address outside address space")) + ERRORDECL(EINTR, fztranslate_mark("Interrupted by signal")) + ERRORDECL(EISCONN, fztranslate_mark("Socket already connected")) + ERRORDECL(ENETUNREACH, fztranslate_mark("Network unreachable")) + ERRORDECL(ENOTSOCK, fztranslate_mark("File descriptor not a socket")) + ERRORDECL(ETIMEDOUT, fztranslate_mark("Connection attempt timed out")) + ERRORDECL(EHOSTUNREACH, fztranslate_mark("No route to host")) + ERRORDECL(ENOTCONN, fztranslate_mark("Socket not connected")) + ERRORDECL(ENETRESET, fztranslate_mark("Connection reset by network")) + ERRORDECL(EOPNOTSUPP, fztranslate_mark("Operation not supported")) + ERRORDECL(ESHUTDOWN, fztranslate_mark("Socket has been shut down")) + ERRORDECL(EMSGSIZE, fztranslate_mark("Message too large")) + ERRORDECL(ECONNABORTED, fztranslate_mark("Connection aborted")) + ERRORDECL(ECONNRESET, fztranslate_mark("Connection reset by peer")) + ERRORDECL(EPIPE, fztranslate_mark("Local endpoint has been closed")) + ERRORDECL(EHOSTDOWN, fztranslate_mark("Host is down")) // Getaddrinfo related #ifdef EAI_ADDRFAMILY - ERRORDECL(EAI_ADDRFAMILY, TRANSLATE_T("Network host does not have any network addresses in the requested address family")) + ERRORDECL(EAI_ADDRFAMILY, fztranslate_mark("Network host does not have any network addresses in the requested address family")) #endif - ERRORDECL(EAI_AGAIN, TRANSLATE_T("Temporary failure in name resolution")) - ERRORDECL(EAI_BADFLAGS, TRANSLATE_T("Invalid value for ai_flags")) + ERRORDECL(EAI_AGAIN, fztranslate_mark("Temporary failure in name resolution")) + ERRORDECL(EAI_BADFLAGS, fztranslate_mark("Invalid value for ai_flags")) #ifdef EAI_BADHINTS - ERRORDECL(EAI_BADHINTS, TRANSLATE_T("Invalid value for hints")) + ERRORDECL(EAI_BADHINTS, fztranslate_mark("Invalid value for hints")) #endif - ERRORDECL(EAI_FAIL, TRANSLATE_T("Nonrecoverable failure in name resolution")) - ERRORDECL(EAI_FAMILY, TRANSLATE_T("The ai_family member is not supported")) - ERRORDECL(EAI_MEMORY, TRANSLATE_T("Memory allocation failure")) + ERRORDECL(EAI_FAIL, fztranslate_mark("Nonrecoverable failure in name resolution")) + ERRORDECL(EAI_FAMILY, fztranslate_mark("The ai_family member is not supported")) + ERRORDECL(EAI_MEMORY, fztranslate_mark("Memory allocation failure")) #ifdef EAI_NODATA - ERRORDECL(EAI_NODATA, TRANSLATE_T("No address associated with nodename")) + ERRORDECL(EAI_NODATA, fztranslate_mark("No address associated with nodename")) #endif - ERRORDECL(EAI_NONAME, TRANSLATE_T("Neither nodename nor servname provided, or not known")) + ERRORDECL(EAI_NONAME, fztranslate_mark("Neither nodename nor servname provided, or not known")) #ifdef EAI_OVERFLOW - ERRORDECL(EAI_OVERFLOW, TRANSLATE_T("Argument buffer overflow")) + ERRORDECL(EAI_OVERFLOW, fztranslate_mark("Argument buffer overflow")) #endif #ifdef EAI_PROTOCOL - ERRORDECL(EAI_PROTOCOL, TRANSLATE_T("Resolved protocol is unknown")) + ERRORDECL(EAI_PROTOCOL, fztranslate_mark("Resolved protocol is unknown")) #endif - ERRORDECL(EAI_SERVICE, TRANSLATE_T("The servname parameter is not supported for ai_socktype")) - ERRORDECL(EAI_SOCKTYPE, TRANSLATE_T("The ai_socktype member is not supported")) + ERRORDECL(EAI_SERVICE, fztranslate_mark("The servname parameter is not supported for ai_socktype")) + ERRORDECL(EAI_SOCKTYPE, fztranslate_mark("The ai_socktype member is not supported")) #ifdef EAI_SYSTEM - ERRORDECL(EAI_SYSTEM, TRANSLATE_T("Other system error")) + ERRORDECL(EAI_SYSTEM, fztranslate_mark("Other system error")) #endif // Codes that have no POSIX equivalence #ifdef FZ_WINDOWS - ERRORDECL(WSANOTINITIALISED, TRANSLATE_T("Not initialized, need to call WSAStartup")) - ERRORDECL(WSAENETDOWN, TRANSLATE_T("System's network subsystem has failed")) - ERRORDECL(WSAEPROTOTYPE, TRANSLATE_T("Protocol not supported on given socket type")) - ERRORDECL(WSAESOCKTNOSUPPORT, TRANSLATE_T("Socket type not supported for address family")) - ERRORDECL(WSAEADDRNOTAVAIL, TRANSLATE_T("Cannot assign requested address")) - ERRORDECL(ERROR_NETNAME_DELETED, TRANSLATE_T("The specified network name is no longer available")) + ERRORDECL(WSANOTINITIALISED, fztranslate_mark("Not initialized, need to call WSAStartup")) + ERRORDECL(WSAENETDOWN, fztranslate_mark("System's network subsystem has failed")) + ERRORDECL(WSAEPROTOTYPE, fztranslate_mark("Protocol not supported on given socket type")) + ERRORDECL(WSAESOCKTNOSUPPORT, fztranslate_mark("Socket type not supported for address family")) + ERRORDECL(WSAEADDRNOTAVAIL, fztranslate_mark("Cannot assign requested address")) + ERRORDECL(ERROR_NETNAME_DELETED, fztranslate_mark("The specified network name is no longer available")) #endif - { 0, 0, 0 } + { 0, nullptr, nullptr } }; -wxString CSocket::GetErrorString(int error) +std::string socket::error_string(int error) { - for (int i = 0; error_table[i].code; ++i) - { - if (error != error_table[i].code) + for (int i = 0; error_table[i].code; ++i) { + if (error != error_table[i].code) { continue; + } return error_table[i].name; } - return wxString::Format(_T("%d"), error); + return sprintf("%d", error); } -wxString CSocket::GetErrorDescription(int error) +native_string socket::error_description(int error) { - for (int i = 0; error_table[i].code; ++i) - { - if (error != error_table[i].code) + for (int i = 0; error_table[i].code; ++i) { + if (error != error_table[i].code) { continue; + } - return wxString(error_table[i].name) + _T(" - ") + wxGetTranslation(error_table[i].description); + return to_native(to_native(std::string(error_table[i].name)) + fzT(" - ") + to_native(translate(error_table[i].description))); } - return wxString::Format(_T("%d"), error); + return sprintf(fzT("%d"), error); } -int CSocket::Close() +int socket::close() { - if (m_pSocketThread) { - fz::scoped_lock l(m_pSocketThread->m_sync); - int fd = m_fd; - m_fd = -1; + if (socket_thread_) { + scoped_lock l(socket_thread_->mutex_); + int fd = fd_; + fd_ = -1; - m_pSocketThread->m_host.clear(); - m_pSocketThread->m_port.clear(); + socket_thread_->host_.clear(); + socket_thread_->port_.clear(); - m_pSocketThread->WakeupThread(l); + socket_thread_->wakeup_thread(l); - CSocketThread::CloseSocketFd(fd); - m_state = none; + socket_thread::close_socket_fd(fd); + state_ = none; - m_pSocketThread->m_triggered = 0; + socket_thread_->triggered_ = 0; for (int i = 0; i < WAIT_EVENTCOUNT; ++i) { - m_pSocketThread->m_triggered_errors[i] = 0; + socket_thread_->triggered_errors_[i] = 0; } - if (m_pEvtHandler) { - RemoveSocketEvents(m_pEvtHandler, this); - m_pEvtHandler = 0; + if (evt_handler_) { + remove_socket_events(evt_handler_, this); + evt_handler_ = nullptr; } } else { - int fd = m_fd; - m_fd = -1; - CSocketThread::CloseSocketFd(fd); - m_state = none; - - if (m_pEvtHandler) { - RemoveSocketEvents(m_pEvtHandler, this); - m_pEvtHandler = 0; + int fd = fd_; + fd_ = -1; + socket_thread::close_socket_fd(fd); + state_ = none; + + if (evt_handler_) { + remove_socket_events(evt_handler_, this); + evt_handler_ = nullptr; } } return 0; } -CSocket::SocketState CSocket::GetState() +socket::socket_state socket::get_state() { - SocketState state; - if (m_pSocketThread) - m_pSocketThread->m_sync.lock(); - state = m_state; - if (m_pSocketThread) - m_pSocketThread->m_sync.unlock(); + socket_state state; + if (socket_thread_) { + socket_thread_->mutex_.lock(); + } + state = state_; + if (socket_thread_) { + socket_thread_->mutex_.unlock(); + } return state; } -void CSocket::Cleanup(bool force) +int socket::read(void* buffer, unsigned int size, int& error) { - fz::scoped_lock wl(waiting_socket_threads_mutex); - auto iter = waiting_socket_threads.begin(); - for (; iter != waiting_socket_threads.end(); ++iter) { - CSocketThread *const pThread = *iter; - - if (!force) { - fz::scoped_lock l(pThread->m_sync); - if (!pThread->m_finished) { - break; - } - } - - delete pThread; - } - waiting_socket_threads.erase(waiting_socket_threads.begin(), iter); -} - -int CSocket::Read(void* buffer, unsigned int size, int& error) -{ - int res = recv(m_fd, (char*)buffer, size, 0); + int res = recv(fd_, (char*)buffer, size, 0); if (res == -1) { - error = GetLastSocketError(); + error = last_socket_error(); if (error == EAGAIN) { - if (m_pSocketThread) { - fz::scoped_lock l(m_pSocketThread->m_sync); - if (!(m_pSocketThread->m_waiting & WAIT_READ)) { - m_pSocketThread->m_waiting |= WAIT_READ; - m_pSocketThread->WakeupThread(l); + if (socket_thread_) { + scoped_lock l(socket_thread_->mutex_); + if (!(socket_thread_->waiting_ & WAIT_READ)) { + socket_thread_->waiting_ |= WAIT_READ; + socket_thread_->wakeup_thread(l); } } } } - else + else { error = 0; + } return res; } -int CSocket::Peek(void* buffer, unsigned int size, int& error) +int socket::peek(void* buffer, unsigned int size, int& error) { - int res = recv(m_fd, (char*)buffer, size, MSG_PEEK); + int res = recv(fd_, (char*)buffer, size, MSG_PEEK); if (res == -1) { - error = GetLastSocketError(); + error = last_socket_error(); } - else + else { error = 0; + } return res; } -int CSocket::Write(const void* buffer, unsigned int size, int& error) +int socket::write(const void* buffer, unsigned int size, int& error) { #ifdef MSG_NOSIGNAL const int flags = MSG_NOSIGNAL; @@ -1242,15 +1253,15 @@ #if !defined(SO_NOSIGPIPE) && !defined(FZ_WINDOWS) // Some systems have neither. Need to block signal - struct sigaction old_action; - struct sigaction action = {}; + sigaction old_action; + sigaction action = {}; action.sa_handler = SIG_IGN; int signal_set = sigaction(SIGPIPE, &action, &old_action); #endif #endif - int res = send(m_fd, (const char*)buffer, size, flags); + int res = send(fd_, (const char*)buffer, size, flags); #if !defined(MSG_NOSIGNAL) && !defined(SO_NOSIGPIPE) && !defined(FZ_WINDOWS) // Restore previous signal handler @@ -1259,13 +1270,13 @@ #endif if (res == -1) { - error = GetLastSocketError(); + error = last_socket_error(); if (error == EAGAIN) { - if (m_pSocketThread) { - fz::scoped_lock l (m_pSocketThread->m_sync); - if (!(m_pSocketThread->m_waiting & WAIT_WRITE)) { - m_pSocketThread->m_waiting |= WAIT_WRITE; - m_pSocketThread->WakeupThread(l); + if (socket_thread_) { + scoped_lock l (socket_thread_->mutex_); + if (!(socket_thread_->waiting_ & WAIT_WRITE)) { + socket_thread_->waiting_ |= WAIT_WRITE; + socket_thread_->wakeup_thread(l); } } } @@ -1276,40 +1287,45 @@ return res; } -wxString CSocket::AddressToString(const struct sockaddr* addr, int addr_len, bool with_port /*=true*/, bool strip_zone_index/*=false*/) +std::string socket::address_to_string(sockaddr const* addr, int addr_len, bool with_port, bool strip_zone_index) { char hostbuf[NI_MAXHOST]; char portbuf[NI_MAXSERV]; int res = getnameinfo(addr, addr_len, hostbuf, NI_MAXHOST, portbuf, NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV); - if (res) // Should never fail - return wxString(); + if (res) { // Should never fail + return std::string(); + } - wxString host = wxString(hostbuf, wxConvLibc); - wxString port = wxString(portbuf, wxConvLibc); + std::string host = hostbuf; + std::string port = portbuf; // IPv6 uses colons as separator, need to enclose address // to avoid ambiguity if also showing port if (addr->sa_family == AF_INET6) { if (strip_zone_index) { - int pos = host.Find('%'); - if (pos != -1) - host.Truncate(pos); + auto pos = host.find('%'); + if (pos != std::string::npos) { + host = host.substr(0, pos); + } + } + if (with_port) { + host = "[" + host + "]"; } - if (with_port) - host = _T("[") + host + _T("]"); } - if (with_port) - return host + _T(":") + port; - else + if (with_port) { + return host + ":" + port; + } + else { return host; + } } -wxString CSocket::AddressToString(char const* buf, int buf_len) +std::string socket::address_to_string(char const* buf, int buf_len) { if (buf_len != 4 && buf_len != 16) { - return wxString(); + return std::string(); } sockaddr_u addr; @@ -1322,77 +1338,81 @@ addr.in4.sin_family = AF_INET; } - - return AddressToString(&addr.sockaddr, sizeof(addr), false, true); + return address_to_string(&addr.sockaddr_, sizeof(addr), false, true); } -wxString CSocket::GetLocalIP(bool strip_zone_index /*=false*/) const +std::string socket::local_ip(bool strip_zone_index) const { - struct sockaddr_storage addr; + sockaddr_storage addr; socklen_t addr_len = sizeof(addr); - int res = getsockname(m_fd, (sockaddr*)&addr, &addr_len); - if (res) - return wxString(); + int res = getsockname(fd_, (sockaddr*)&addr, &addr_len); + if (res) { + return std::string(); + } - return AddressToString((sockaddr *)&addr, addr_len, false, strip_zone_index); + return address_to_string((sockaddr *)&addr, addr_len, false, strip_zone_index); } -wxString CSocket::GetPeerIP(bool strip_zone_index /*=false*/) const +std::string socket::peer_ip(bool strip_zone_index) const { - struct sockaddr_storage addr; + sockaddr_storage addr; socklen_t addr_len = sizeof(addr); - int res = getpeername(m_fd, (sockaddr*)&addr, &addr_len); - if (res) - return wxString(); + int res = getpeername(fd_, (sockaddr*)&addr, &addr_len); + if (res) { + return std::string(); + } - return AddressToString((sockaddr *)&addr, addr_len, false, strip_zone_index); + return address_to_string((sockaddr *)&addr, addr_len, false, strip_zone_index); } -CSocket::address_family CSocket::GetAddressFamily() const +address_type socket::address_family() const { sockaddr_u addr; socklen_t addr_len = sizeof(addr); - int res = getsockname(m_fd, &addr.sockaddr, &addr_len); - if (res) - return unspec; + int res = getsockname(fd_, &addr.sockaddr_, &addr_len); + if (res) { + return address_type::unknown; + } - switch (addr.sockaddr.sa_family) + switch (addr.sockaddr_.sa_family) { case AF_INET: - return ipv4; + return address_type::ipv4; case AF_INET6: - return ipv6; + return address_type::ipv6; default: - return unspec; + return address_type::unknown; } } -int CSocket::Listen(address_family family, int port) +int socket::listen(address_type family, int port) { - if (m_state != none) + if (state_ != none) { return EALREADY; + } - if (port < 0 || port > 65535) + if (port < 0 || port > 65535) { return EINVAL; + } switch (family) { - case unspec: - m_family = AF_UNSPEC; + case address_type::unknown: + family_ = AF_UNSPEC; break; - case ipv4: - m_family = AF_INET; + case address_type::ipv4: + family_ = AF_INET; break; - case ipv6: - m_family = AF_INET6; + case address_type::ipv6: + family_ = AF_INET6; break; default: return EINVAL; } { - struct addrinfo hints = {}; - hints.ai_family = m_family; + addrinfo hints = {}; + hints.ai_family = family_; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE; #ifdef AI_NUMERICSERV @@ -1400,113 +1420,119 @@ hints.ai_flags |= AI_NUMERICSERV; #endif - char portstring[6]; - sprintf(portstring, "%d", port); + std::string portstring = sprintf("%d", port); - struct addrinfo* addressList = 0; - int res = getaddrinfo(0, portstring, &hints, &addressList); + addrinfo* addressList = nullptr; + int res = getaddrinfo(nullptr, portstring.c_str(), &hints, &addressList); if (res) { #ifdef FZ_WINDOWS - return ConvertMSWErrorCode(res); + return convert_msw_error_code(res); #else return res; #endif } - for (struct addrinfo* addr = addressList; addr; addr = addr->ai_next) { - m_fd = CSocketThread::CreateSocketFd(*addr); - res = GetLastSocketError(); + for (addrinfo* addr = addressList; addr; addr = addr->ai_next) { + fd_ = socket_thread::create_socket_fd(*addr); + res = last_socket_error(); - if (m_fd == -1) + if (fd_ == -1) { continue; + } - res = bind(m_fd, addr->ai_addr, addr->ai_addrlen); - if (!res) + res = bind(fd_, addr->ai_addr, addr->ai_addrlen); + if (!res) { break; + } - res = GetLastSocketError(); - CSocketThread::CloseSocketFd(m_fd); + res = last_socket_error(); + socket_thread::close_socket_fd(fd_); } freeaddrinfo(addressList); - if (m_fd == -1) + if (fd_ == -1) { return res; + } } - int res = listen(m_fd, 1); + int res = ::listen(fd_, 1); if (res) { - res = GetLastSocketError(); - CSocketThread::CloseSocketFd(m_fd); - m_fd = -1; + res = last_socket_error(); + socket_thread::close_socket_fd(fd_); + fd_ = -1; return res; } - m_state = listening; + state_ = listening; - m_pSocketThread = new CSocketThread(); - m_pSocketThread->SetSocket(this); + socket_thread_ = new socket_thread(); + socket_thread_->set_socket(this); - m_pSocketThread->m_waiting = WAIT_ACCEPT; + socket_thread_->waiting_ = WAIT_ACCEPT; - m_pSocketThread->Start(); + socket_thread_->start(); return 0; } -int CSocket::GetLocalPort(int& error) +int socket::local_port(int& error) { sockaddr_u addr; socklen_t addr_len = sizeof(addr); - error = getsockname(m_fd, &addr.sockaddr, &addr_len); + error = getsockname(fd_, &addr.sockaddr_, &addr_len); if (error) { #ifdef FZ_WINDOWS - error = ConvertMSWErrorCode(error); + error = convert_msw_error_code(error); #endif return -1; } - if (addr.storage.ss_family == AF_INET) + if (addr.storage.ss_family == AF_INET) { return ntohs(addr.in4.sin_port); - else if (addr.storage.ss_family == AF_INET6) + } + else if (addr.storage.ss_family == AF_INET6) { return ntohs(addr.in6.sin6_port); + } error = EINVAL; return -1; } -int CSocket::GetRemotePort(int& error) +int socket::remote_port(int& error) { sockaddr_u addr; socklen_t addr_len = sizeof(addr); - error = getpeername(m_fd, &addr.sockaddr, &addr_len); - if (error) - { + error = getpeername(fd_, &addr.sockaddr_, &addr_len); + if (error) { #ifdef FZ_WINDOWS - error = ConvertMSWErrorCode(error); + error = convert_msw_error_code(error); #endif return -1; } - if (addr.storage.ss_family == AF_INET) + if (addr.storage.ss_family == AF_INET) { return ntohs(addr.in4.sin_port); - else if (addr.storage.ss_family == AF_INET6) + } + else if (addr.storage.ss_family == AF_INET6) { return ntohs(addr.in6.sin6_port); + } error = EINVAL; return -1; } -CSocket* CSocket::Accept(int &error) +socket* socket::accept(int &error) { - if (m_pSocketThread) { - fz::scoped_lock l(m_pSocketThread->m_sync); - m_pSocketThread->m_waiting |= WAIT_ACCEPT; - m_pSocketThread->WakeupThread(l); + if (socket_thread_) { + scoped_lock l(socket_thread_->mutex_); + socket_thread_->waiting_ |= WAIT_ACCEPT; + socket_thread_->wakeup_thread(l); } - int fd = accept(m_fd, 0, 0); + // TODO: accept4 for SOCK_CLOEXEC + int fd = ::accept(fd_, nullptr, nullptr); if (fd == -1) { - error = GetLastSocketError(); - return 0; + error = last_socket_error(); + return nullptr; } #if defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL) @@ -1515,127 +1541,227 @@ setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &value, sizeof(int)); #endif - SetNonblocking(fd); + set_nonblocking(fd); - DoSetBufferSizes(fd, m_buffer_sizes[0], m_buffer_sizes[1]); + do_set_buffer_sizes(fd, buffer_sizes_[0], buffer_sizes_[1]); - CSocket* pSocket = new CSocket(0); - pSocket->m_state = connected; - pSocket->m_fd = fd; - pSocket->m_pSocketThread = new CSocketThread(); - pSocket->m_pSocketThread->SetSocket(pSocket); - pSocket->m_pSocketThread->m_waiting = WAIT_READ | WAIT_WRITE; - pSocket->m_pSocketThread->Start(); + socket* pSocket = new socket(thread_pool_, nullptr); + pSocket->state_ = connected; + pSocket->fd_ = fd; + pSocket->socket_thread_ = new socket_thread(); + pSocket->socket_thread_->set_socket(pSocket); + pSocket->socket_thread_->waiting_ = WAIT_READ | WAIT_WRITE; + pSocket->socket_thread_->start(); return pSocket; } -int CSocket::SetNonblocking(int fd) +int socket::set_nonblocking(int fd) { // Set socket to non-blocking. #ifdef FZ_WINDOWS unsigned long nonblock = 1; int res = ioctlsocket(fd, FIONBIO, &nonblock); - if (!res) + if (!res) { return 0; - else - return ConvertMSWErrorCode(WSAGetLastError()); + } + else { + return convert_msw_error_code(WSAGetLastError()); + } #else int flags = fcntl(fd, F_GETFL); - if (flags == -1) + if (flags == -1) { return errno; + } int res = fcntl(fd, F_SETFL, flags | O_NONBLOCK); - if (res == -1) + if (res == -1) { return errno; + } return 0; #endif } -void CSocket::SetFlags(int flags) +void socket::set_flags(int flags) { - if (m_pSocketThread) - m_pSocketThread->m_sync.lock(); + if (socket_thread_) { + socket_thread_->mutex_.lock(); + } - if (m_fd != -1) - DoSetFlags(m_fd, flags, flags ^ m_flags); - m_flags = flags; + if (fd_ != -1) { + do_set_flags(fd_, flags, flags ^ flags_, keepalive_interval_); + } + flags_ = flags; - if (m_pSocketThread) - m_pSocketThread->m_sync.unlock(); + if (socket_thread_) { + socket_thread_->mutex_.unlock(); + } } -int CSocket::DoSetFlags(int fd, int flags, int flags_mask) +int socket::do_set_flags(int fd, int flags, int flags_mask, duration const& keepalive_interval) { if (flags_mask & flag_nodelay) { const int value = (flags & flag_nodelay) ? 1 : 0; int res = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (const char*)&value, sizeof(value)); if (res != 0) { - return GetLastSocketError(); + return last_socket_error(); } } if (flags_mask & flag_keepalive) { +#if FZ_WINDOWS + tcp_keepalive v{}; + v.onoff = (flags & flag_keepalive) ? 1 : 0; + v.keepalivetime = static_cast(keepalive_interval.get_milliseconds()); + v.keepaliveinterval = 1000; + DWORD tmp{}; + int res = WSAIoctl(fd, SIO_KEEPALIVE_VALS, &v, sizeof(v), nullptr, 0, &tmp, nullptr, nullptr); + if (res != 0) { + return last_socket_error(); + } +#else const int value = (flags & flag_keepalive) ? 1 : 0; int res = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (const char*)&value, sizeof(value)); if (res != 0) { - return GetLastSocketError(); + return last_socket_error(); } +#ifdef TCP_KEEPIDLE + int const idle = keepalive_interval.get_seconds(); + res = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (const char*)&idle, sizeof(idle)); + if (res != 0) { + return last_socket_error(); + } +#endif +#endif } return 0; } -int CSocket::SetBufferSizes(int size_read, int size_write) +int socket::set_buffer_sizes(int size_receive, int size_send) { int ret = 0; - if (m_pSocketThread) - m_pSocketThread->m_sync.lock(); + if (socket_thread_) { + socket_thread_->mutex_.lock(); + } - m_buffer_sizes[0] = size_read; - m_buffer_sizes[1] = size_write; + buffer_sizes_[0] = size_receive; + buffer_sizes_[1] = size_send; - if (m_fd != -1) - ret = DoSetBufferSizes(m_fd, size_read, size_write); + if (fd_ != -1) { + ret = do_set_buffer_sizes(fd_, size_receive, size_send); + } - if (m_pSocketThread) - m_pSocketThread->m_sync.unlock(); + if (socket_thread_) { + socket_thread_->mutex_.unlock(); + } return ret; } -int CSocket::DoSetBufferSizes(int fd, int size_read, int size_write) +int socket::ideal_send_buffer_size() { - int ret = 0; + int size = -1; + +#ifdef FZ_WINDOWS + if (socket_thread_) { + socket_thread_->mutex_.lock(); + } + if (fd_ != -1) { + // MSDN says this: + // "Dynamic send buffering for TCP was added on Windows 7 and Windows + // Server 2008 R2.By default, dynamic send buffering for TCP is + // enabled unless an application sets the SO_SNDBUF socket option on + // the stream socket" + // + // Guess what: It doesn't do it by itself. Programs need to + // periodically and manually update SO_SNDBUF based on what + // SIO_IDEAL_SEND_BACKLOG_QUERY returns. +#ifndef SIO_IDEAL_SEND_BACKLOG_QUERY +#define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b +#endif + ULONG v{}; + DWORD outlen{}; + if (!WSAIoctl(fd_, SIO_IDEAL_SEND_BACKLOG_QUERY, nullptr, 0, &v, sizeof(v), &outlen, nullptr, nullptr)) { + size = v; + } + } + + if (socket_thread_) { + socket_thread_->mutex_.unlock(); + } +#endif + + return size; +} + + +int socket::do_set_buffer_sizes(int fd, int size_read, int size_write) +{ + int ret = 0; if (size_read != -1) { int res = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (const char*)&size_read, sizeof(size_read)); if (res != 0) { - ret = GetLastSocketError(); + ret = last_socket_error(); } } if (size_write != -1) { int res = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (const char*)&size_write, sizeof(size_write)); if (res != 0) { - ret = GetLastSocketError(); + ret = last_socket_error(); } } return ret; } -void CSocket::SetSynchronousReadCallback(CCallback* cb) +native_string socket::peer_host() const { - if (m_pSocketThread) - m_pSocketThread->m_sync.lock(); + return host_; +} - m_synchronous_read_cb = cb; +void socket::set_keepalive_interval(duration const& d) +{ + if (d < duration::from_minutes(1)) { + return; + } + + if (socket_thread_) { + socket_thread_->mutex_.lock(); + } - if (m_pSocketThread) - m_pSocketThread->m_sync.unlock(); + keepalive_interval_ = d; + if (fd_ != -1) { + do_set_flags(fd_, flags_, flag_keepalive, keepalive_interval_); + } + + if (socket_thread_) { + socket_thread_->mutex_.unlock(); + } } -wxString CSocket::GetPeerHost() const +void socket::retrigger(socket_event_flag event) { - return m_host; + if (!socket_thread_) { + return; + } + + if (event != socket_event_flag::read && event != socket_event_flag::write) { + return; + } + + fz::scoped_lock l(socket_thread_->mutex_); + + if (has_pending_event(evt_handler_, this, event)) { + return; + } + + int const wait_flag = (event == socket_event_flag::read) ? WAIT_READ : WAIT_WRITE; + if (!(socket_thread_->waiting_ & wait_flag)) { + socket_thread_->waiting_ |= wait_flag; + socket_thread_->wakeup_thread(l); + } +} + } diff -Nru filezilla-3.15.0.2/src/engine/storj/connect.cpp filezilla-3.33.0/src/engine/storj/connect.cpp --- filezilla-3.15.0.2/src/engine/storj/connect.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/connect.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,147 @@ +#include + +#include "connect.h" +#include "event.h" +#include "input_thread.h" +#include "proxy.h" + +#include +#include + +int CStorjConnectOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjConnectOpData::Send() in state %d", opState); + + switch (opState) + { + case connect_init: + { + auto executable = fz::to_native(engine_.GetOptions().GetOption(OPTION_FZSTORJ_EXECUTABLE)); + if (executable.empty()) { + executable = fzT("fzstorj"); + } + LogMessage(MessageType::Debug_Verbose, L"Going to execute %s", executable); + + std::vector args; + if (!controlSocket_.process_->spawn(executable, args)) { + LogMessage(MessageType::Debug_Warning, L"Could not create process"); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED;; + } + + controlSocket_.input_thread_ = std::make_unique(controlSocket_, *controlSocket_.process_); + if (!controlSocket_.input_thread_->spawn(engine_.GetThreadPool())) { + LogMessage(MessageType::Debug_Warning, L"Thread creation failed"); + controlSocket_.input_thread_.reset(); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED;; + } + } + return FZ_REPLY_WOULDBLOCK; + case connect_timeout: + return controlSocket_.SendCommand(fz::sprintf(L"timeout %d", engine_.GetOptions().GetOptionVal(OPTION_TIMEOUT))); + case connect_proxy: + { + fz::uri proxy_uri; + switch (engine_.GetOptions().GetOptionVal(OPTION_PROXY_TYPE)) + { + case 0: + opState = connect_host; + return FZ_REPLY_CONTINUE; + case CProxySocket::HTTP: + proxy_uri.scheme_ = "http"; + break; + case CProxySocket::SOCKS5: + proxy_uri.scheme_ = "socks5h"; + break; + case CProxySocket::SOCKS4: + proxy_uri.scheme_ = "socks4a"; + break; + default: + LogMessage(MessageType::Debug_Warning, L"Unsupported proxy type"); + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED; + } + + proxy_uri.host_ = fz::to_utf8(engine_.GetOptions().GetOption(OPTION_PROXY_HOST)); + proxy_uri.port_ = engine_.GetOptions().GetOptionVal(OPTION_PROXY_PORT); + proxy_uri.user_ = fz::to_utf8(engine_.GetOptions().GetOption(OPTION_PROXY_USER)); + proxy_uri.pass_ = fz::to_utf8(engine_.GetOptions().GetOption(OPTION_PROXY_PASS)); + + auto cmd = L"proxy " + fz::to_wstring(proxy_uri.to_string()); + proxy_uri.pass_.clear(); + auto show = L"proxy " + fz::to_wstring(proxy_uri.to_string()); + return controlSocket_.SendCommand(cmd, show); + } + case connect_host: + return controlSocket_.SendCommand(fz::sprintf(L"host %s", currentServer_.Format(ServerFormat::with_optional_port))); + case connect_user: + return controlSocket_.SendCommand(fz::sprintf(L"user %s", currentServer_.GetUser())); + case connect_pass: + { + std::wstring pass = credentials_.GetPass(); + size_t pos = pass.rfind('|'); + if (pos == std::wstring::npos) { + LogMessage(MessageType::Error, _("Password or encryption key is not set")); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + pass = pass.substr(0, pos); + return controlSocket_.SendCommand(fz::sprintf(L"pass %s", pass), fz::sprintf(L"pass %s", std::wstring(pass.size(), '*'))); + } + case connect_key: + { + std::wstring key = credentials_.GetPass(); + size_t pos = key.rfind('|'); + if (pos == std::wstring::npos) { + LogMessage(MessageType::Error, _("Password or encryption key is not set")); + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + key = key.substr(pos + 1); + return controlSocket_.SendCommand(fz::sprintf(L"key %s", key), fz::sprintf(L"key %s", std::wstring(key.size(), '*'))); + } + default: + LogMessage(MessageType::Debug_Warning, L"Unknown op state: %d", opState); + break; + } + + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED; +} + +int CStorjConnectOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjConnectOpData::ParseResponse() in state %d", opState); + + if (controlSocket_.result_ != FZ_REPLY_OK) { + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + + switch (opState) + { + case connect_init: + if (controlSocket_.response_ != fz::sprintf(L"fzStorj started, protocol_version=%d", FZSTORJ_PROTOCOL_VERSION)) { + LogMessage(MessageType::Error, _("fzstorj belongs to a different version of FileZilla")); + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED; + } + opState = connect_timeout; + break; + case connect_timeout: + opState = connect_host; + break; + case connect_proxy: + opState = connect_host; + break; + case connect_host: + opState = connect_user; + break; + case connect_user: + opState = connect_pass; + break; + case connect_pass: + opState = connect_key; + break; + case connect_key: + return FZ_REPLY_OK; + default: + LogMessage(MessageType::Debug_Warning, L"Unknown op state: %d", opState); + return FZ_REPLY_INTERNALERROR | FZ_REPLY_DISCONNECTED; + } + + return FZ_REPLY_CONTINUE; +} diff -Nru filezilla-3.15.0.2/src/engine/storj/connect.h filezilla-3.33.0/src/engine/storj/connect.h --- filezilla-3.15.0.2/src/engine/storj/connect.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/connect.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,33 @@ +#ifndef FILEZILLA_ENGINE_STORJ_CONNECT_HEADER +#define FILEZILLA_ENGINE_STORJ_CONNECT_HEADER + +#include "storjcontrolsocket.h" + +enum connectStates +{ + connect_init, + connect_timeout, + connect_proxy, + connect_host, + connect_user, + connect_pass, + connect_key +}; + +class CStorjConnectOpData final : public COpData, public CStorjOpData +{ +public: + CStorjConnectOpData(CStorjControlSocket & controlSocket, Credentials const& credentials) + : COpData(Command::connect) + , CStorjOpData(controlSocket) + , credentials_(credentials) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + +private: + Credentials const credentials_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/storj/delete.cpp filezilla-3.33.0/src/engine/storj/delete.cpp --- filezilla-3.15.0.2/src/engine/storj/delete.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/delete.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,102 @@ +#include + +#include "directorycache.h" +#include "delete.h" + +enum DeleteStates +{ + delete_init, + delete_resolve, + delete_delete +}; + +int CStorjDeleteOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjDeleteOpData::Send() in state %d", opState); + + switch (opState) { + case delete_init: + if (files_.empty()) { + return FZ_REPLY_CRITICALERROR; + } + + opState = delete_resolve; + return FZ_REPLY_CONTINUE; + case delete_resolve: + opState = delete_resolve; + controlSocket_.Resolve(path_, files_, bucket_, fileIds_); + return FZ_REPLY_CONTINUE; + case delete_delete: + if (files_.empty()) { + return FZ_REPLY_OK; + } + + std::wstring const& file = files_.front(); + std::wstring const& id = fileIds_.front(); + if (id.empty()) { + files_.pop_front(); + fileIds_.pop_front(); + return FZ_REPLY_CONTINUE; + } + + if (time_.empty()) { + time_ = fz::datetime::now(); + } + + engine_.GetDirectoryCache().InvalidateFile(currentServer_, path_, file); + + return controlSocket_.SendCommand(L"rm " + bucket_ + L" " + id); + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjDeleteOpData::FileTransferSend()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjDeleteOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjDeleteOpData::ParseResponse() in state %d", opState); + + if (controlSocket_.result_ != FZ_REPLY_OK) { + deleteFailed_ = true; + } + else { + std::wstring const& file = files_.front(); + + engine_.GetDirectoryCache().RemoveFile(currentServer_, path_, file); + + auto const now = fz::datetime::now(); + if (!time_.empty() && (now - time_).get_seconds() >= 1) { + controlSocket_.SendDirectoryListingNotification(path_, false, false); + time_ = now; + needSendListing_ = false; + } + else { + needSendListing_ = true; + } + } + + files_.pop_front(); + fileIds_.pop_front(); + + if (!files_.empty()) { + return FZ_REPLY_CONTINUE; + } + + return deleteFailed_ ? FZ_REPLY_ERROR : FZ_REPLY_OK; +} + +int CStorjDeleteOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjDeleteOpData::SubcommandResult() in state %d", opState); + + if (prevResult != FZ_REPLY_OK) { + return prevResult; + } + + if (files_.size() != fileIds_.size()) { + return FZ_REPLY_INTERNALERROR; + } + + opState = delete_delete; + return FZ_REPLY_CONTINUE; +} diff -Nru filezilla-3.15.0.2/src/engine/storj/delete.h filezilla-3.33.0/src/engine/storj/delete.h --- filezilla-3.15.0.2/src/engine/storj/delete.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/delete.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef FILEZILLA_ENGINE_STORJ_DELETE_HEADER +#define FILEZILLA_ENGINE_STORJ_DELETE_HEADER + +#include "storjcontrolsocket.h" + +class CStorjDeleteOpData final : public COpData, public CStorjOpData +{ +public: + CStorjDeleteOpData(CStorjControlSocket & controlSocket, CServerPath const& path, std::deque && files) + : COpData(Command::del) + , CStorjOpData(controlSocket) + , path_(path) + , files_(files) + { + } + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + + CServerPath path_; + std::deque files_; + std::deque fileIds_; + + // Set to fz::datetime::Now initially and after + // sending an updated listing to the UI. + fz::datetime time_; + + bool needSendListing_{}; + + // Set to true if deletion of at least one file failed + bool deleteFailed_{}; + + std::wstring bucket_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/storj/event.h filezilla-3.33.0/src/engine/storj/event.h --- filezilla-3.15.0.2/src/engine/storj/event.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/event.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,18 @@ +#ifndef FILEZILLA_ENGINE_STORJ_EVENT_HEADER +#define FILEZILLA_ENGINE_STORJ_EVENT_HEADER + +#include "../storj/events.hpp" + +struct storj_message +{ + storjEvent type; + mutable std::wstring text[4]; +}; + +struct storj_event_type; +typedef fz::simple_event CStorjEvent; + +struct storj_terminate_event_type; +typedef fz::simple_event StorjTerminateEvent; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/storj/file_transfer.cpp filezilla-3.33.0/src/engine/storj/file_transfer.cpp --- filezilla-3.15.0.2/src/engine/storj/file_transfer.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/file_transfer.cpp 2017-12-14 04:30:03.000000000 +0000 @@ -0,0 +1,162 @@ +#include + +#include "directorycache.h" +#include "file_transfer.h" + +#include + +enum FileTransferStates +{ + filetransfer_init, + filetransfer_resolve, + filetransfer_waitfileexists, + filetransfer_delete, + filetransfer_transfer +}; + +int CStorjFileTransferOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjFileTransferOpData::Send() in state %d", opState); + + switch (opState) { + case filetransfer_init: + if (localFile_.empty()) { + if (!download_) { + return FZ_REPLY_CRITICALERROR | FZ_REPLY_NOTSUPPORTED; + } + else { + return FZ_REPLY_SYNTAXERROR; + } + } + + if (!remotePath_.SegmentCount()) { + if (!download_) { + LogMessage(MessageType::Error, _("You cannot upload files into the root directory.")); + } + return FZ_REPLY_CRITICALERROR | FZ_REPLY_NOTSUPPORTED; + } + + if (download_) { + std::wstring filename = remotePath_.FormatFilename(remoteFile_); + LogMessage(MessageType::Status, _("Starting download of %s"), filename); + } + else { + LogMessage(MessageType::Status, _("Starting upload of %s"), localFile_); + } + + int64_t size; + bool isLink; + if (fz::local_filesys::get_file_info(fz::to_native(localFile_), isLink, &size, 0, 0) == fz::local_filesys::file) { + localFileSize_ = size; + } + + opState = filetransfer_resolve; + + if (remotePath_.GetType() == DEFAULT) { + remotePath_.SetType(currentServer_.GetType()); + } + + controlSocket_.Resolve(remotePath_, remoteFile_, bucket_, &fileId_, !download_); + return FZ_REPLY_CONTINUE; + case filetransfer_waitfileexists: + if (!download_ && !fileId_.empty()) { + controlSocket_.Delete(remotePath_, std::deque{remoteFile_}); + opState = filetransfer_delete; + } + else { + opState = filetransfer_transfer; + } + return FZ_REPLY_CONTINUE; + case filetransfer_transfer: + + if (!resume_) { + controlSocket_.CreateLocalDir(localFile_); + } + + if (download_) { + engine_.transfer_status_.Init(remoteFileSize_, 0, false); + } + else { + engine_.transfer_status_.Init(localFileSize_, 0, false); + } + + engine_.transfer_status_.SetStartTime(); + transferInitiated_ = true; + if (download_) { + return controlSocket_.SendCommand(L"get " + bucket_ + L" " + fileId_ + L" " + controlSocket_.QuoteFilename(localFile_)); + } + else { + std::wstring path = remotePath_.GetPath(); + auto pos = path.find('/', 1); + if (pos == std::string::npos) { + path.clear(); + } + else { + path = path.substr(pos + 1) + L"/"; + } + return controlSocket_.SendCommand(L"put " + bucket_ + L" " + controlSocket_.QuoteFilename(localFile_) + L" " + controlSocket_.QuoteFilename(path + remoteFile_)); + } + + + return FZ_REPLY_WOULDBLOCK; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjFileTransferOpData::FileTransferSend()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjFileTransferOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjFileTransferOpData::ParseResponse() in state %d", opState); + + if (opState == filetransfer_transfer) { + return controlSocket_.result_; + } + + LogMessage(MessageType::Debug_Warning, L"FileTransferParseResponse called at improper time: %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjFileTransferOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjFileTransferOpData::SubcommandResult() in state %d", opState); + + switch (opState) { + case filetransfer_resolve: + + if (prevResult != FZ_REPLY_OK) { + return prevResult; + } + else { + // Get remote file info + CDirentry entry; + bool dirDidExist; + bool matchedCase; + bool found = engine_.GetDirectoryCache().LookupFile(entry, currentServer_, remotePath_, remoteFile_, dirDidExist, matchedCase); + if (found) { + if (matchedCase && !entry.is_unsure()) { + remoteFileSize_ = entry.size; + if (entry.has_date()) { + fileTime_ = entry.time; + } + } + } + + int res = controlSocket_.CheckOverwriteFile(); + if (res != FZ_REPLY_OK) { + opState = filetransfer_waitfileexists; + return res; + } + + opState = filetransfer_transfer; + } + return FZ_REPLY_CONTINUE; + case filetransfer_delete: + opState = filetransfer_transfer; + return FZ_REPLY_CONTINUE; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjFileTransferOpData::SubcommandResult()"); + return FZ_REPLY_INTERNALERROR; +} + diff -Nru filezilla-3.15.0.2/src/engine/storj/file_transfer.h filezilla-3.33.0/src/engine/storj/file_transfer.h --- filezilla-3.15.0.2/src/engine/storj/file_transfer.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/file_transfer.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,24 @@ +#ifndef FILEZILLA_ENGINE_STORJ_FILETRANSFER_HEADER +#define FILEZILLA_ENGINE_STORJ_FILETRANSFER_HEADER + +#include "storjcontrolsocket.h" + +class CStorjFileTransferOpData final : public CFileTransferOpData, public CStorjOpData +{ +public: + CStorjFileTransferOpData(CStorjControlSocket & controlSocket, bool is_download, std::wstring const& local_file, std::wstring const& remote_file, CServerPath const& remote_path) + : CFileTransferOpData(is_download, local_file, remote_file, remote_path) + , CStorjOpData(controlSocket) + { + } + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + +private: + std::wstring bucket_; + std::wstring fileId_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/storj/input_thread.cpp filezilla-3.33.0/src/engine/storj/input_thread.cpp --- filezilla-3.15.0.2/src/engine/storj/input_thread.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/input_thread.cpp 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,163 @@ +#include + +#include "event.h" +#include "input_thread.h" +#include "storjcontrolsocket.h" + +#include + +CStorjInputThread::CStorjInputThread(CStorjControlSocket& owner, fz::process& proc) + : process_(proc) + , owner_(owner) +{ +} + +CStorjInputThread::~CStorjInputThread() +{ + thread_.join(); +} + +bool CStorjInputThread::spawn(fz::thread_pool & pool) +{ + if (!thread_) { + thread_ = pool.spawn([this]() { entry(); }); + } + return thread_.operator bool(); +} + +std::wstring CStorjInputThread::ReadLine(std::wstring &error) +{ + int len = 0; + const int buffersize = 4096; + char buffer[buffersize]; + + while (true) { + if (!readFromProcess(error, true)) { + return std::wstring(); + } + + auto const* p = recv_buffer_.get(); + size_t i; + for (i = 0; i < recv_buffer_.size(); ++i) { + unsigned char const c = p[i]; + + if (c == '\n') { + recv_buffer_.consume(i + 1); + + while (len && buffer[len - 1] == '\r') { + --len; + } + + std::wstring const line = owner_.ConvToLocal(buffer, len); + if (len && line.empty()) { + error = L"Failed to convert reply to local character set."; + } + + return line; + } + + if (len == buffersize - 1) { + // Cap string length + continue; + } + + buffer[len++] = c; + } + recv_buffer_.clear(); + } + + return std::wstring(); +} + +bool CStorjInputThread::readFromProcess(std::wstring & error, bool eof_is_error) +{ + if (recv_buffer_.empty()) { + int read = process_.read(reinterpret_cast(recv_buffer_.get(1024)), 1024); + if (read > 0) { + recv_buffer_.add(read); + } + else { + if (!read) { + if (eof_is_error) { + error = L"Unexpected EOF."; + } + } + else { + error = L"Unknown error reading from process"; + } + return false; + } + } + + return true; +} + +void CStorjInputThread::processEvent(storjEvent eventType, std::wstring &error) +{ + int lines{}; + switch (eventType) + { + case storjEvent::count: + case storjEvent::Unknown: + error = fz::sprintf(L"Unknown eventType"); + break; + case storjEvent::Done: + case storjEvent::Recv: + case storjEvent::Send: + case storjEvent::UsedQuotaRecv: + case storjEvent::UsedQuotaSend: + break; + case storjEvent::Reply: + case storjEvent::Error: + case storjEvent::ErrorMsg: + case storjEvent::Verbose: + case storjEvent::Info: + case storjEvent::Status: + case storjEvent::Transfer: + lines = 1; + break; + case storjEvent::Listentry: + lines = 4; + break; + }; + + auto msg = new CStorjEvent; + auto & message = std::get<0>(msg->v_); + message.type = eventType; + for (int i = 0; i < lines && error.empty(); ++i) { + message.text[i] = ReadLine(error); + } + + if (!error.empty()) { + delete msg; + return; + } + + owner_.send_event(msg); +} + +void CStorjInputThread::entry() +{ + std::wstring error; + while (error.empty()) { + if (!readFromProcess(error, false)) { + break; + } + + unsigned char readType = *recv_buffer_.get(); + recv_buffer_.consume(1); + + readType -= '0'; + + if (readType >= static_cast(storjEvent::count) ) { + error = fz::sprintf(L"Unknown eventType %d", readType); + break; + } + + storjEvent eventType = static_cast(readType); + + processEvent(eventType, error); + } + + owner_.send_event(error); +} diff -Nru filezilla-3.15.0.2/src/engine/storj/input_thread.h filezilla-3.33.0/src/engine/storj/input_thread.h --- filezilla-3.15.0.2/src/engine/storj/input_thread.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/input_thread.h 2018-03-29 08:58:59.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef FILEZILLA_ENGINE_STORJ_INPUT_THREAD_HEADER +#define FILEZILLA_ENGINE_STORJ_INPUT_THREAD_HEADER + +class CStorjControlSocket; + +#include +#include + +namespace fz { +class process; +} + +class CStorjInputThread final +{ +public: + CStorjInputThread(CStorjControlSocket & owner, fz::process& proc); + ~CStorjInputThread(); + + bool spawn(fz::thread_pool & pool); + +protected: + + bool readFromProcess(std::wstring & error, bool eof_is_error); + std::wstring ReadLine(std::wstring &error); + + void entry(); + + void processEvent(storjEvent eventType, std::wstring & error); + + fz::process& process_; + CStorjControlSocket& owner_; + + fz::async_task thread_; + + fz::buffer recv_buffer_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/storj/list.cpp filezilla-3.33.0/src/engine/storj/list.cpp --- filezilla-3.15.0.2/src/engine/storj/list.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/list.cpp 2018-05-07 08:20:55.000000000 +0000 @@ -0,0 +1,176 @@ +#include + +#include "directorycache.h" +#include "list.h" + +enum listStates +{ + list_init = 0, + list_waitresolve, + list_waitlock, + list_list +}; + +int CStorjListOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjListOpData::Send() in state %d", opState); + + switch (opState) { + case list_init: + if (!subDir_.empty()) { + LogMessage(MessageType::Error, _("Invalid path")); + return FZ_REPLY_ERROR; + } + + if (path_.empty()) { + path_ = CServerPath(L"/"); + } + + currentPath_ = path_; + + if (!currentServer_) { + LogMessage(MessageType::Debug_Warning, L"CStorjControlSocket::List called with m_pCurrenServer == 0"); + return FZ_REPLY_INTERNALERROR; + } + + if (currentPath_.GetType() != ServerType::UNIX) { + LogMessage(MessageType::Debug_Warning, L"CStorControlSocket::List called with incompatible server type %d in path", currentPath_.GetType()); + return FZ_REPLY_INTERNALERROR; + } + + opState = list_waitresolve; + controlSocket_.Resolve(path_, std::wstring(), bucket_); + return FZ_REPLY_CONTINUE; + case list_waitlock: + if (!holdsLock_) { + LogMessage(MessageType::Debug_Warning, L"Not holding the lock as expected"); + return FZ_REPLY_INTERNALERROR; + } + + { + // Check if we can use already existing listing + CDirectoryListing listing; + bool is_outdated = false; + bool found = engine_.GetDirectoryCache().Lookup(listing, currentServer_, path_, false, is_outdated); + if (found && !is_outdated && + listing.m_firstListTime >= time_before_locking_) + { + controlSocket_.SendDirectoryListingNotification(listing.path, topLevel_, false); + return FZ_REPLY_OK; + } + } + opState = list_list; + return FZ_REPLY_CONTINUE; + case list_list: + if (bucket_.empty()) { + return controlSocket_.SendCommand(L"list-buckets"); + } + else { + std::wstring path = path_.GetPath(); + auto pos = path.find('/', 1); + if (pos == std::string::npos) { + path.clear(); + } + else { + path = controlSocket_.QuoteFilename(path.substr(pos + 1) + L"/"); + } + + return controlSocket_.SendCommand(L"list " + bucket_ + L" " + path); + } + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjListOpData::ListSend()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjListOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjListOpData::ParseResponse() in state %d", opState); + + if (opState == list_list) { + if (controlSocket_.result_ != FZ_REPLY_OK) { + return controlSocket_.result_; + } + CDirectoryListing listing; + listing.path = path_; + listing.m_firstListTime = fz::monotonic_clock::now(); + listing.Assign(std::move(entries_)); + + engine_.GetDirectoryCache().Store(listing, currentServer_); + controlSocket_.SendDirectoryListingNotification(listing.path, topLevel_, false); + + currentPath_ = path_; + return FZ_REPLY_OK; + } + + LogMessage(MessageType::Debug_Warning, L"ListParseResponse called at improper time: %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjListOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjListOpData::SubcommandResult() in state %d", opState); + + if (prevResult != FZ_REPLY_OK) { + return prevResult; + } + + switch (opState) { + case list_waitresolve: + opState = list_waitlock; + if (!controlSocket_.TryLock(locking_reason::list, path_)) { + time_before_locking_ = fz::monotonic_clock::now(); + return FZ_REPLY_WOULDBLOCK; + } + + opState = list_list; + return FZ_REPLY_CONTINUE; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjListOpData::SubcommandResult()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjListOpData::ParseEntry(std::wstring && name, std::wstring const& size, std::wstring && id, std::wstring const& created) +{ + if (opState != list_list) { + LogMessage(MessageType::Debug_Warning, L"ListParseResponse called at improper time: %d", opState); + return FZ_REPLY_INTERNALERROR; + } + + if (name == L".") { + pathId_ = id; + return FZ_REPLY_WOULDBLOCK; + } + + CDirentry entry; + entry.name = name; + entry.ownerGroup.get() = id; + if (bucket_.empty()) { + entry.flags = CDirentry::flag_dir; + } + else { + if (!entry.name.empty() && entry.name.back() == '/') { + entry.flags = CDirentry::flag_dir; + entry.name.pop_back(); + } + else { + entry.flags = 0; + } + } + + if (entry.is_dir()) { + entry.size = -1; + } + else { + entry.size = fz::to_integral(size, -1); + } + + entry.time.set(created, fz::datetime::utc); + + if (!entry.name.empty()) { + entries_.emplace_back(std::move(entry)); + } + + return FZ_REPLY_WOULDBLOCK; +} diff -Nru filezilla-3.15.0.2/src/engine/storj/list.h filezilla-3.33.0/src/engine/storj/list.h --- filezilla-3.15.0.2/src/engine/storj/list.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/list.h 2017-12-17 12:14:40.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef FILEZILLA_ENGINE_STORJ_LIST_HEADER +#define FILEZILLA_ENGINE_STORJ_LIST_HEADER + +#include "storjcontrolsocket.h" + +class CStorjListOpData final : public COpData, public CStorjOpData +{ +public: + CStorjListOpData(CStorjControlSocket & controlSocket, CServerPath const& path, std::wstring const& subDir, int, bool topLevel) + : COpData(Command::list) + , CStorjOpData(controlSocket) + , path_(path) + , subDir_(subDir) + , topLevel_(topLevel) + { + } + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + + int ParseEntry(std::wstring && name, std::wstring const& size, std::wstring && id, std::wstring const& created); + + std::wstring GetPathId() const { return pathId_; } + +private: + CServerPath path_; + std::wstring subDir_; + + std::vector> entries_; + + fz::monotonic_clock time_before_locking_; + + bool topLevel_{}; + + std::wstring bucket_; + std::wstring pathId_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/storj/mkd.cpp filezilla-3.33.0/src/engine/storj/mkd.cpp --- filezilla-3.15.0.2/src/engine/storj/mkd.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/mkd.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,99 @@ +#include + +#include "directorycache.h" +#include "mkd.h" + +enum mkdStates +{ + mkd_init = 0, + mkd_mkbucket, + mkd_resolve, + mkd_put +}; + + +int CStorjMkdirOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjMkdirOpData::Send() in state %d", opState); + + switch (opState) { + case mkd_init: + if (path_.SegmentCount() < 1) { + LogMessage(MessageType::Error, _("Invalid path")); + return FZ_REPLY_CRITICALERROR; + } + opState = mkd_mkbucket; + return FZ_REPLY_CONTINUE; + case mkd_mkbucket: + return controlSocket_.SendCommand(L"mkbucket " + controlSocket_.QuoteFilename(path_.GetFirstSegment())); + case mkd_put: + { + std::wstring path = path_.GetPath(); + auto pos = path.find('/', 1); + if (pos == std::string::npos) { + return FZ_REPLY_INTERNALERROR; + } + else { + path = path.substr(pos + 1) + L"/"; + } + return controlSocket_.SendCommand(L"put " + bucket_ + L" \"null\" " + controlSocket_.QuoteFilename(path)); + } + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjMkdirOpData::Send()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjMkdirOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjMkdirOpData::ParseResponse() in state %d", opState); + + switch (opState) { + case mkd_mkbucket: + if (controlSocket_.result_ == FZ_REPLY_OK) { + engine_.GetDirectoryCache().UpdateFile(currentServer_, CServerPath(L"/"), path_.GetFirstSegment(), true, CDirectoryCache::dir); + controlSocket_.SendDirectoryListingNotification(CServerPath(L"/"), false, false); + } + + if (path_.SegmentCount() > 1) { + opState = mkd_resolve; + controlSocket_.Resolve(path_, std::wstring(), bucket_, 0); + return FZ_REPLY_CONTINUE; + } + else { + return controlSocket_.result_; + } + case mkd_put: + if (controlSocket_.result_ == FZ_REPLY_OK) { + CServerPath path = path_; + while (path.SegmentCount() > 1) { + CServerPath parent = path.GetParent(); + engine_.GetDirectoryCache().UpdateFile(currentServer_, parent, path.GetLastSegment(), true, CDirectoryCache::dir); + controlSocket_.SendDirectoryListingNotification(parent, false, false); + path = parent; + } + } + return controlSocket_.result_; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjMkdirOpData::ParseResponse()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjMkdirOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjMkdirOpData::SubcommandResult() in state %d", opState); + + if (prevResult != FZ_REPLY_OK) { + return prevResult; + } + + switch (opState) { + case mkd_resolve: + opState = mkd_put; + return FZ_REPLY_CONTINUE; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjMkdirOpData::SubcommandResult()"); + return FZ_REPLY_INTERNALERROR; +} diff -Nru filezilla-3.15.0.2/src/engine/storj/mkd.h filezilla-3.33.0/src/engine/storj/mkd.h --- filezilla-3.15.0.2/src/engine/storj/mkd.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/mkd.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,20 @@ +#ifndef FILEZILLA_ENGINE_STORJ_MKD_HEADER +#define FILEZILLA_ENGINE_STORJ_MKD_HEADER + +#include "storjcontrolsocket.h" + +class CStorjMkdirOpData final : public CMkdirOpData, public CStorjOpData +{ +public: + CStorjMkdirOpData(CStorjControlSocket & controlSocket) + : CStorjOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + + std::wstring bucket_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/storj/resolve.cpp filezilla-3.33.0/src/engine/storj/resolve.cpp --- filezilla-3.15.0.2/src/engine/storj/resolve.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/resolve.cpp 2017-11-06 18:46:28.000000000 +0000 @@ -0,0 +1,327 @@ +#include + +#include "directorycache.h" +#include "resolve.h" + +enum resolveStates +{ + resolve_init = 0, + resolve_waitlistbuckets, + resolve_id, + resolve_waitlist +}; + +namespace { +std::wstring ExtractId(std::wstring const& metaData) +{ + std::wstring ret; + + auto begin = metaData.find(L"id:"); + if (begin != std::wstring::npos) { + auto end = metaData.find(' ', begin); + if (end == std::wstring::npos) { + ret = metaData.substr(begin + 3); + } + else { + ret = metaData.substr(begin + 3, end - begin - 3); + } + } + return ret; +} +} + +int CStorjResolveOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjResolveOpData::Send() in state %d", opState); + + switch (opState) { + case resolve_init: + bucket_.clear(); + if (fileId_) { + fileId_->clear(); + } + + if (path_.empty()) { + return FZ_REPLY_INTERNALERROR; + } + else if (!path_.SegmentCount()) { + // It's the root, nothing to resolve here. + + if (fileId_ || !file_.empty()) { + return FZ_REPLY_INTERNALERROR; + } + + return FZ_REPLY_OK; + } + else { + CDirectoryListing buckets; + + bool outdated{}; + bool found = engine_.GetDirectoryCache().Lookup(buckets, currentServer_, CServerPath(L"/"), false, outdated); + if (found && !outdated) { + int pos = buckets.FindFile_CmpCase(path_.GetFirstSegment()); + if (pos != -1) { + bucket_ = ExtractId(*buckets[pos].ownerGroup); + LogMessage(MessageType::Debug_Info, L"Directory is in bucket %s", bucket_); + opState = resolve_id; + return FZ_REPLY_CONTINUE; + } + else { + LogMessage(MessageType::Error, _("Bucket not found")); + return FZ_REPLY_ERROR; + } + } + + opState = resolve_waitlistbuckets; + controlSocket_.List(CServerPath(L"/"), std::wstring(), 0); + + return FZ_REPLY_CONTINUE; + } + break; + case resolve_id: + if (!fileId_) { + return FZ_REPLY_OK; + } + else { + if (file_.empty()) { + return FZ_REPLY_INTERNALERROR; + } + CDirectoryListing listing; + + bool outdated{}; + bool found = engine_.GetDirectoryCache().Lookup(listing, currentServer_, path_, ignore_missing_file_, outdated); + if (found && !outdated) { + int pos = listing.FindFile_CmpCase(file_); + if (pos != -1) { + *fileId_ = ExtractId(*listing[pos].ownerGroup); + if (!fileId_->empty()) { + LogMessage(MessageType::Debug_Info, L"File %s has id %s", path_.FormatFilename(file_), *fileId_); + return FZ_REPLY_OK; + } + else { + // Must refresh listing + opState = resolve_waitlist; + controlSocket_.List(path_, std::wstring(), 0); + return FZ_REPLY_CONTINUE; + } + } + + if (ignore_missing_file_) { + return FZ_REPLY_OK; + } + + LogMessage(MessageType::Error, _("File not found")); + return FZ_REPLY_ERROR; + } + + opState = resolve_waitlist; + controlSocket_.List(path_, std::wstring(), 0); + return FZ_REPLY_CONTINUE; + } + break; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjResolveOpData::ResolveSend()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjResolveOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjResolveOpData::ParseResponse() in state %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjResolveOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjResolveOpData::SubcommandResult() in state %d", opState); + + switch (opState) { + case resolve_waitlistbuckets: + if (prevResult != FZ_REPLY_OK) { + return prevResult; + } + else { + CDirectoryListing buckets; + + bool outdated{}; + bool found = engine_.GetDirectoryCache().Lookup(buckets, currentServer_, CServerPath(L"/"), false, outdated); + if (found && !outdated) { + int pos = buckets.FindFile_CmpCase(path_.GetFirstSegment()); + if (pos != -1) { + bucket_ = ExtractId(*buckets[pos].ownerGroup); + LogMessage(MessageType::Debug_Info, L"Directory is in bucket %s", bucket_); + opState = resolve_id; + return FZ_REPLY_CONTINUE; + } + } + } + LogMessage(MessageType::Error, _("Bucket not found")); + return FZ_REPLY_ERROR; + case resolve_waitlist: + if (prevResult != FZ_REPLY_OK) { + if (ignore_missing_file_) { + return FZ_REPLY_OK; + } + return prevResult; + } + else { + CDirectoryListing listing; + + bool outdated{}; + bool found = engine_.GetDirectoryCache().Lookup(listing, currentServer_, path_, false, outdated); + if (found && !outdated) { + int pos = listing.FindFile_CmpCase(file_); + if (pos != -1) { + *fileId_ = ExtractId(*listing[pos].ownerGroup); + LogMessage(MessageType::Debug_Info, L"File %s has id %s", path_.FormatFilename(file_), *fileId_); + return FZ_REPLY_OK; + } + if (ignore_missing_file_) { + return FZ_REPLY_OK; + } + } + } + LogMessage(MessageType::Error, _("File not found")); + return FZ_REPLY_ERROR; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjResolveOpData::SubcommandResult()"); + return FZ_REPLY_INTERNALERROR; +} + + + + + +int CStorjResolveManyOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjResolveManyOpData::Send() in state %d", opState); + + switch (opState) { + case resolve_init: + bucket_.clear(); + fileIds_.clear(); + + if (path_.empty() || files_.empty()) { + return FZ_REPLY_INTERNALERROR; + } + else if (!path_.SegmentCount()) { + // It's the root, nothing to resolve here. + return FZ_REPLY_INTERNALERROR; + } + else { + CDirectoryListing buckets; + + bool outdated{}; + bool found = engine_.GetDirectoryCache().Lookup(buckets, currentServer_, CServerPath(L"/"), false, outdated); + if (found && !outdated) { + int pos = buckets.FindFile_CmpCase(path_.GetFirstSegment()); + if (pos != -1) { + bucket_ = ExtractId(*buckets[pos].ownerGroup); + LogMessage(MessageType::Debug_Info, L"Directory is in bucket %s", bucket_); + opState = resolve_id; + return FZ_REPLY_CONTINUE; + } + else { + LogMessage(MessageType::Error, _("Bucket not found")); + return FZ_REPLY_ERROR; + } + } + + opState = resolve_waitlistbuckets; + controlSocket_.List(CServerPath(L"/"), std::wstring(), 0); + + return FZ_REPLY_CONTINUE; + } + break; + case resolve_id: + { + CDirectoryListing listing; + + bool outdated{}; + bool found = engine_.GetDirectoryCache().Lookup(listing, currentServer_, path_, false, outdated); + if (found && !outdated) { + for (auto const& file : files_ ) { + int pos = listing.FindFile_CmpCase(file); + if (pos != -1) { + LogMessage(MessageType::Debug_Info, L"File %s has id %s", path_.FormatFilename(file), *listing[pos].ownerGroup); + fileIds_.emplace_back(ExtractId(*listing[pos].ownerGroup)); + } + else { + fileIds_.emplace_back(); + } + } + return FZ_REPLY_OK; + } + + opState = resolve_waitlist; + controlSocket_.List(path_, std::wstring(), 0); + return FZ_REPLY_CONTINUE; + } + break; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjResolveManyOpData::ResolveSend()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjResolveManyOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjResolveManyOpData::ParseResponse() in state %d", opState); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjResolveManyOpData::SubcommandResult(int prevResult, COpData const&) +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjResolveManyOpData::SubcommandResult() in state %d", opState); + + if (prevResult != FZ_REPLY_OK) { + return prevResult; + } + + switch (opState) { + case resolve_waitlistbuckets: + { + CDirectoryListing buckets; + + bool outdated{}; + bool found = engine_.GetDirectoryCache().Lookup(buckets, currentServer_, CServerPath(L"/"), false, outdated); + if (found && !outdated) { + int pos = buckets.FindFile_CmpCase(path_.GetFirstSegment()); + if (pos != -1) { + bucket_ = ExtractId(*buckets[pos].ownerGroup); + LogMessage(MessageType::Debug_Info, L"Directory is in bucket %s", bucket_); + opState = resolve_id; + return FZ_REPLY_CONTINUE; + } + } + } + LogMessage(MessageType::Error, _("Bucket not found")); + return FZ_REPLY_ERROR; + case resolve_waitlist: + { + CDirectoryListing listing; + + bool outdated{}; + bool found = engine_.GetDirectoryCache().Lookup(listing, currentServer_, path_, false, outdated); + if (found && !outdated) { + for (auto const& file : files_ ) { + int pos = listing.FindFile_CmpCase(file); + if (pos != -1) { + LogMessage(MessageType::Debug_Info, L"File %s has id %s", path_.FormatFilename(file), *listing[pos].ownerGroup); + fileIds_.emplace_back(ExtractId(*listing[pos].ownerGroup)); + } + else { + fileIds_.emplace_back(); + } + } + return FZ_REPLY_OK; + } + } + LogMessage(MessageType::Error, _("Files not found")); + return FZ_REPLY_ERROR; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjResolveManyOpData::SubcommandResult()"); + return FZ_REPLY_INTERNALERROR; +} diff -Nru filezilla-3.15.0.2/src/engine/storj/resolve.h filezilla-3.33.0/src/engine/storj/resolve.h --- filezilla-3.15.0.2/src/engine/storj/resolve.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/resolve.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,59 @@ +#ifndef FILEZILLA_ENGINE_STORJ_RESOLVE_HEADER +#define FILEZILLA_ENGINE_STORJ_RESOLVE_HEADER + +#include "storjcontrolsocket.h" + +class CStorjResolveOpData final : public COpData, public CStorjOpData +{ +public: + CStorjResolveOpData(CStorjControlSocket & controlSocket, CServerPath const& path, std::wstring const& file, std::wstring & bucket, std::wstring * fileId, bool ignore_missing_file) + : COpData(PrivCommand::resolve) + , CStorjOpData(controlSocket) + , path_(path) + , file_(file) + , bucket_(bucket) + , fileId_(fileId) + , ignore_missing_file_(ignore_missing_file) + { + } + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + +private: + CServerPath const path_; + std::wstring const file_; + + std::wstring & bucket_; + std::wstring * const fileId_; + bool ignore_missing_file_{}; +}; + +class CStorjResolveManyOpData final : public COpData, public CStorjOpData +{ +public: + CStorjResolveManyOpData(CStorjControlSocket & controlSocket, CServerPath const& path, std::deque const& files, std::wstring & bucket, std::deque & fileIds) + : COpData(PrivCommand::resolve) + , CStorjOpData(controlSocket) + , path_(path) + , files_(files) + , bucket_(bucket) + , fileIds_(fileIds) + { + } + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + +private: + CServerPath const path_; + std::deque const files_; + + std::wstring & bucket_; + std::deque & fileIds_; +}; + + +#endif diff -Nru filezilla-3.15.0.2/src/engine/storj/rmd.cpp filezilla-3.33.0/src/engine/storj/rmd.cpp --- filezilla-3.15.0.2/src/engine/storj/rmd.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/rmd.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,105 @@ +#include + +#include "directorycache.h" +#include "list.h" +#include "rmd.h" + +enum mkdStates +{ + rmd_init = 0, + rmd_resolve, + rmd_rmbucket, + rmd_list, + rmd_rmdir +}; + + +int CStorjRemoveDirOpData::Send() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjRemoveDirOpData::Send() in state %d", opState); + + switch (opState) { + case rmd_init: + if (path_.SegmentCount() < 1) { + LogMessage(MessageType::Error, _("Invalid path")); + return FZ_REPLY_CRITICALERROR; + } + controlSocket_.Resolve(path_, std::wstring(), bucket_); + opState = rmd_resolve; + return FZ_REPLY_CONTINUE; + case rmd_rmbucket: + engine_.GetDirectoryCache().InvalidateFile(currentServer_, CServerPath(L"/"), path_.GetFirstSegment()); + + engine_.InvalidateCurrentWorkingDirs(path_); + + return controlSocket_.SendCommand(L"rmbucket " + bucket_); + case rmd_rmdir: + assert(!pathId_.empty()); + engine_.GetDirectoryCache().InvalidateFile(currentServer_, path_.GetParent(), path_.GetLastSegment()); + return controlSocket_.SendCommand(L"rm " + bucket_ + L" " + pathId_); + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjRemoveDirOpData::Send()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjRemoveDirOpData::ParseResponse() +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjRemoveDirOpData::ParseResponse() in state %d", opState); + + + switch (opState) { + case rmd_rmbucket: + if (controlSocket_.result_ == FZ_REPLY_OK) { + engine_.GetDirectoryCache().RemoveDir(currentServer_, CServerPath(L"/"), path_.GetFirstSegment(), CServerPath()); + controlSocket_.SendDirectoryListingNotification(CServerPath(L"/"), false, false); + } + + return controlSocket_.result_; + case rmd_rmdir: + if (controlSocket_.result_ == FZ_REPLY_OK) { + engine_.GetDirectoryCache().RemoveDir(currentServer_, path_.GetParent(), path_.GetLastSegment(), CServerPath()); + controlSocket_.SendDirectoryListingNotification(path_.GetParent(), false, false); + } + return controlSocket_.result_; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjRemoveDirOpData::ParseResponse()"); + return FZ_REPLY_INTERNALERROR; +} + +int CStorjRemoveDirOpData::SubcommandResult(int prevResult, COpData const& previousOperation) +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjRemoveDirOpData::SubcommandResult() in state %d", opState); + + switch (opState) { + case rmd_resolve: + if (prevResult != FZ_REPLY_OK) { + return prevResult; + } + + if (path_.SegmentCount() == 1) { + opState = rmd_rmbucket; + } + else { + controlSocket_.List(path_, std::wstring(), LIST_FLAG_REFRESH); + opState = rmd_list; + } + return FZ_REPLY_CONTINUE; + case rmd_list: + if (prevResult != FZ_REPLY_OK) { + return prevResult; + } + + auto const& listData = static_cast(previousOperation); + pathId_ = listData.GetPathId(); + if (pathId_.empty()) { + return FZ_REPLY_ERROR; + } + opState = rmd_rmdir; + return FZ_REPLY_CONTINUE; + } + + LogMessage(MessageType::Debug_Warning, L"Unknown opState in CStorjRemoveDirOpData::SubcommandResult()"); + return FZ_REPLY_INTERNALERROR; +} diff -Nru filezilla-3.15.0.2/src/engine/storj/rmd.h filezilla-3.33.0/src/engine/storj/rmd.h --- filezilla-3.15.0.2/src/engine/storj/rmd.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/rmd.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,24 @@ +#ifndef FILEZILLA_ENGINE_STORJ_RMD_HEADER +#define FILEZILLA_ENGINE_STORJ_RMD_HEADER + +#include "storjcontrolsocket.h" + +class CStorjRemoveDirOpData final : public COpData, public CStorjOpData +{ +public: + CStorjRemoveDirOpData(CStorjControlSocket & controlSocket) + : COpData(Command::removedir) + , CStorjOpData(controlSocket) + {} + + virtual int Send() override; + virtual int ParseResponse() override; + virtual int SubcommandResult(int prevResult, COpData const& previousOperation) override; + + CServerPath path_; + + std::wstring bucket_; + std::wstring pathId_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/storj/storjcontrolsocket.cpp filezilla-3.33.0/src/engine/storj/storjcontrolsocket.cpp --- filezilla-3.15.0.2/src/engine/storj/storjcontrolsocket.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/storjcontrolsocket.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,425 @@ +#include + +#include "connect.h" +#include "delete.h" +#include "event.h" +#include "input_thread.h" +#include "directorycache.h" +#include "directorylistingparser.h" +#include "engineprivate.h" +#include "file_transfer.h" +#include "list.h" +#include "mkd.h" +#include "pathcache.h" +#include "proxy.h" +#include "resolve.h" +#include "rmd.h" +#include "servercapabilities.h" +#include "storjcontrolsocket.h" + +#include +#include +#include +#include + +#include +#include + +CStorjControlSocket::CStorjControlSocket(CFileZillaEnginePrivate & engine) + : CControlSocket(engine) +{ + m_useUTF8 = true; +} + +CStorjControlSocket::~CStorjControlSocket() +{ + remove_handler(); + DoClose(); +} + +void CStorjControlSocket::Connect(CServer const &server, Credentials const& credentials) +{ + LogMessage(MessageType::Status, _("Connecting to %s..."), server.Format(ServerFormat::with_optional_port)); + SetWait(true); + + currentServer_ = server; + + process_ = std::make_unique(); + + engine_.GetRateLimiter().AddObject(this); + Push(std::make_unique(*this, credentials)); +} + +void CStorjControlSocket::List(CServerPath const& path, std::wstring const& subDir, int flags) +{ + CServerPath newPath = currentPath_; + if (!path.empty()) { + newPath = path; + } + if (!newPath.ChangePath(subDir)) { + newPath.clear(); + } + + if (newPath.empty()) { + LogMessage(MessageType::Status, _("Retrieving directory listing...")); + } + else { + LogMessage(MessageType::Status, _("Retrieving directory listing of \"%s\"..."), newPath.GetPath()); + } + + Push(std::make_unique(*this, newPath, std::wstring(), flags, operations_.empty())); +} + +void CStorjControlSocket::FileTransfer(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const& transferSettings) +{ + auto pData = std::make_unique(*this, download, localFile, remoteFile, remotePath); + pData->transferSettings_ = transferSettings; + Push(std::move(pData)); +} + + +void CStorjControlSocket::Delete(CServerPath const& path, std::deque&& files) +{ + // CFileZillaEnginePrivate should have checked this already + assert(!files.empty()); + + LogMessage(MessageType::Debug_Verbose, L"CStorjControlSocket::Delete"); + + Push(std::make_unique(*this, path, std::move(files))); +} + +void CStorjControlSocket::Resolve(CServerPath const& path, std::wstring const& file, std::wstring & bucket, std::wstring * fileId, bool ignore_missing_file) +{ + Push(std::make_unique(*this, path, file, bucket, fileId, ignore_missing_file)); +} + +void CStorjControlSocket::Resolve(CServerPath const& path, std::deque const& files, std::wstring & bucket, std::deque & fileIds) +{ + Push(std::make_unique(*this, path, files, bucket, fileIds)); +} + +void CStorjControlSocket::Mkdir(CServerPath const& path) +{ + if (operations_.empty()) { + LogMessage(MessageType::Status, _("Creating directory '%s'..."), path.GetPath()); + } + + auto pData = std::make_unique(*this); + pData->path_ = path; + Push(std::move(pData)); +} + +void CStorjControlSocket::RemoveDir(CServerPath const& path, std::wstring const& subDir) +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjControlSocket::RemoveDir"); + + auto pData = std::make_unique(*this); + pData->path_ = path; + if (!subDir.empty()) { + pData->path_.ChangePath(subDir); + } + Push(std::move(pData)); +} + +void CStorjControlSocket::OnStorjEvent(storj_message const& message) +{ + if (!currentServer_) { + return; + } + + if (!input_thread_) { + return; + } + + switch (message.type) + { + case storjEvent::Reply: + LogMessageRaw(MessageType::Response, message.text[0]); + ProcessReply(FZ_REPLY_OK, message.text[0]); + break; + case storjEvent::Done: + ProcessReply(FZ_REPLY_OK, std::wstring()); + break; + case storjEvent::Error: + LogMessageRaw(MessageType::Error, message.text[0]); + ProcessReply(FZ_REPLY_ERROR, message.text[0]); + break; + case storjEvent::ErrorMsg: + LogMessageRaw(MessageType::Error, message.text[0]); + break; + case storjEvent::Verbose: + LogMessageRaw(MessageType::Debug_Info, message.text[0]); + break; + case storjEvent::Info: + LogMessageRaw(MessageType::Command, message.text[0]); // Not exactly the right message type, but it's a silent one. + break; + case storjEvent::Status: + LogMessageRaw(MessageType::Status, message.text[0]); + break; + case storjEvent::Recv: + SetActive(CFileZillaEngine::recv); + break; + case storjEvent::Send: + SetActive(CFileZillaEngine::send); + break; + case storjEvent::Listentry: + if (operations_.empty() || operations_.back()->opId != Command::list) { + LogMessage(MessageType::Debug_Warning, L"storjEvent::Listentry outside list operation, ignoring."); + break; + } + else { + int res = static_cast(*operations_.back()).ParseEntry(std::move(message.text[0]), message.text[1], std::move(message.text[2]), message.text[3]); + if (res != FZ_REPLY_WOULDBLOCK) { + ResetOperation(res); + } + } + break; + case storjEvent::UsedQuotaRecv: + OnQuotaRequest(CRateLimiter::inbound); + break; + case storjEvent::UsedQuotaSend: + OnQuotaRequest(CRateLimiter::outbound); + break; + case storjEvent::Transfer: + { + auto value = fz::to_integral(message.text[0]); + + if (!operations_.empty() && operations_.back()->opId == Command::transfer) { + auto & data = static_cast(*operations_.back()); + + SetActive(data.download_ ? CFileZillaEngine::recv : CFileZillaEngine::send); + + bool tmp; + CTransferStatus status = engine_.transfer_status_.Get(tmp); + if (!status.empty() && !status.madeProgress) { + if (data.download_) { + if (value > 0) { + engine_.transfer_status_.SetMadeProgress(); + } + } + else { + if (status.currentOffset > status.startOffset + 65565) { + engine_.transfer_status_.SetMadeProgress(); + } + } + } + } + + engine_.transfer_status_.Update(value); + } + break; + default: + LogMessage(MessageType::Debug_Warning, L"Message type %d not handled", message.type); + break; + } +} + +void CStorjControlSocket::OnTerminate(std::wstring const& error) +{ + if (!error.empty()) { + LogMessageRaw(MessageType::Error, error); + } + else { + LogMessageRaw(MessageType::Debug_Info, L"CStorjControlSocket::OnTerminate without error"); + } + if (process_) { + DoClose(); + } +} + +int CStorjControlSocket::SendCommand(std::wstring const& cmd, std::wstring const& show) +{ + if (cmd.substr(0, 4) != L"get " && cmd.substr(0, 4) != L"put ") { + SetWait(true); + } + + LogMessageRaw(MessageType::Command, show.empty() ? cmd : show); + + // Check for newlines in command + // a command like "ls\nrm foo/bar" is dangerous + if (cmd.find('\n') != std::wstring::npos || + cmd.find('\r') != std::wstring::npos) + { + LogMessage(MessageType::Debug_Warning, L"Command containing newline characters, aborting."); + return FZ_REPLY_INTERNALERROR; + } + + return AddToStream(cmd + L"\n"); +} + +int CStorjControlSocket::AddToStream(std::wstring const& cmd) +{ + if (!process_) { + ResetOperation(FZ_REPLY_INTERNALERROR); + return false; + } + + std::string const str = ConvToServer(cmd, true); + if (str.empty()) { + LogMessage(MessageType::Error, _("Could not convert command to server encoding")); + return FZ_REPLY_ERROR; + } + + if (!process_->write(str)) { + return FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED; + } + + return FZ_REPLY_WOULDBLOCK; +} + +bool CStorjControlSocket::SetAsyncRequestReply(CAsyncRequestNotification *pNotification) +{ + if (operations_.empty() || !operations_.back()->waitForAsyncRequest) { + LogMessage(MessageType::Debug_Info, L"Not waiting for request reply, ignoring request reply %d", pNotification->GetRequestID()); + return false; + } + + operations_.back()->waitForAsyncRequest = false; + + RequestId const requestId = pNotification->GetRequestID(); + switch(requestId) + { + case reqId_fileexists: + { + CFileExistsNotification *pFileExistsNotification = static_cast(pNotification); + return SetFileExistsAction(pFileExistsNotification); + } + default: + LogMessage(MessageType::Debug_Warning, L"Unknown async request reply id: %d", requestId); + return false; + } + + return true; +} + +void CStorjControlSocket::ProcessReply(int result, std::wstring const& reply) +{ + result_ = result; + response_ = reply; + + SetWait(false); + + if (operations_.empty()) { + LogMessage(MessageType::Debug_Info, L"Skipping reply without active operation."); + return; + } + + auto & data = *operations_.back(); + int res = data.ParseResponse(); + if (res == FZ_REPLY_OK) { + ResetOperation(FZ_REPLY_OK); + } + else if (res == FZ_REPLY_CONTINUE) { + SendNextCommand(); + } + else if (res & FZ_REPLY_DISCONNECTED) { + DoClose(res); + } + else if (res & FZ_REPLY_ERROR) { + if (data.opId == Command::connect) { + DoClose(res | FZ_REPLY_DISCONNECTED); + } + else { + ResetOperation(res); + } + } +} + +int CStorjControlSocket::ResetOperation(int nErrorCode) +{ + LogMessage(MessageType::Debug_Verbose, L"CStorjControlSocket::ResetOperation(%d)", nErrorCode); + + if (!operations_.empty() && operations_.back()->opId == Command::connect) { + auto &data = static_cast(*operations_.back()); + if (data.opState == connect_init && nErrorCode & FZ_REPLY_ERROR && (nErrorCode & FZ_REPLY_CANCELED) != FZ_REPLY_CANCELED) { + LogMessage(MessageType::Error, _("fzstorj could not be started")); + } + } + if (!operations_.empty() && operations_.back()->opId == Command::del && !(nErrorCode & FZ_REPLY_DISCONNECTED)) { + auto &data = static_cast(*operations_.back()); + if (data.needSendListing_) { + SendDirectoryListingNotification(data.path_, false, false); + } + } + + return CControlSocket::ResetOperation(nErrorCode); +} + +int CStorjControlSocket::DoClose(int nErrorCode) +{ + engine_.GetRateLimiter().RemoveObject(this); + + if (process_) { + process_->kill(); + } + + if (input_thread_) { + input_thread_.reset(); + + auto threadEventsFilter = [&](fz::event_loop::Events::value_type const& ev) -> bool { + if (ev.first != this) { + return false; + } + else if (ev.second->derived_type() == CStorjEvent::type() || ev.second->derived_type() == StorjTerminateEvent::type()) { + return true; + } + return false; + }; + + event_loop_.filter_events(threadEventsFilter); + } + process_.reset(); + return CControlSocket::DoClose(nErrorCode); +} + +void CStorjControlSocket::Cancel() +{ + if (GetCurrentCommandId() != Command::none) { + DoClose(FZ_REPLY_CANCELED); + } +} + +void CStorjControlSocket::OnRateAvailable(CRateLimiter::rate_direction direction) +{ + //OnQuotaRequest(direction); +} + +void CStorjControlSocket::OnQuotaRequest(CRateLimiter::rate_direction direction) +{ + /*int64_t bytes = GetAvailableBytes(direction); + if (bytes > 0) { + int b; + if (bytes > INT_MAX) { + b = INT_MAX; + } + else { + b = bytes; + } + AddToStream(fz::sprintf(L"-%d%d,%d\n", direction, b, engine_.GetOptions().GetOptionVal(OPTION_SPEEDLIMIT_INBOUND + static_cast(direction)))); + UpdateUsage(direction, b); + } + else if (bytes == 0) { + Wait(direction); + } + else if (bytes < 0) { + AddToStream(fz::sprintf(L"-%d-\n", direction)); + }*/ +} + +void CStorjControlSocket::operator()(fz::event_base const& ev) +{ + if (fz::dispatch(ev, this, + &CStorjControlSocket::OnStorjEvent, + &CStorjControlSocket::OnTerminate)) { + return; + } + + CControlSocket::operator()(ev); +} + +std::wstring CStorjControlSocket::QuoteFilename(std::wstring const& filename) +{ + return L"\"" + fz::replaced_substrings(filename, L"\"", L"\"\"") + L"\""; +} diff -Nru filezilla-3.15.0.2/src/engine/storj/storjcontrolsocket.h filezilla-3.33.0/src/engine/storj/storjcontrolsocket.h --- filezilla-3.15.0.2/src/engine/storj/storjcontrolsocket.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/storj/storjcontrolsocket.h 2017-09-29 10:24:50.000000000 +0000 @@ -0,0 +1,83 @@ +#ifndef FILEZILLA_ENGINE_STORJCONTROLSOCKET_HEADER +#define FILEZILLA_ENGINE_STORJCONTROLSOCKET_HEADER + +#include "ControlSocket.h" + +#include "backend.h" + +namespace fz { +class process; +} + +namespace PrivCommand { +auto const resolve = Command::private1; +} + +class CStorjInputThread; + +struct storj_message; +class CStorjControlSocket final : public CControlSocket, public CRateLimiterObject +{ +public: + CStorjControlSocket(CFileZillaEnginePrivate & engine); + virtual ~CStorjControlSocket(); + + virtual void Connect(CServer const &server, Credentials const& credentials) override; + + virtual void List(CServerPath const& path = CServerPath(), std::wstring const& subDir = std::wstring(), int flags = 0) override; + virtual void FileTransfer(std::wstring const& localFile, CServerPath const& remotePath, + std::wstring const& remoteFile, bool download, + CFileTransferCommand::t_transferSettings const& transferSettings) override; + void Resolve(CServerPath const& path, std::wstring const& file, std::wstring & bucket, std::wstring * fileId = 0, bool ignore_missing_file = false); + void Resolve(CServerPath const& path, std::deque const& files, std::wstring & bucket, std::deque & fileIds); + virtual void Delete(CServerPath const& path, std::deque&& files) override; + virtual void Mkdir(const CServerPath& path) override; + virtual void RemoveDir(CServerPath const& path = CServerPath(), std::wstring const& subDir = std::wstring()) override; + /*virtual void Rename(const CRenameCommand& command) override;*/ + virtual void Cancel() override; + + virtual bool Connected() const override { return input_thread_.operator bool(); } + + virtual bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification) override; + +protected: + // Replaces filename"with"quotes with + // "filename""with""quotes" + std::wstring QuoteFilename(std::wstring const& filename); + + virtual int DoClose(int nErrorCode = FZ_REPLY_DISCONNECTED) override; + + virtual int ResetOperation(int nErrorCode) override; + + void ProcessReply(int result, std::wstring const& reply); + + int SendCommand(std::wstring const& cmd, std::wstring const& show = std::wstring()); + int AddToStream(std::wstring const& cmd); + + virtual void OnRateAvailable(CRateLimiter::rate_direction direction) override; + void OnQuotaRequest(CRateLimiter::rate_direction direction); + + std::unique_ptr process_; + std::unique_ptr input_thread_; + + virtual void operator()(fz::event_base const& ev) override; + void OnStorjEvent(storj_message const& message); + void OnTerminate(std::wstring const& error); + + int result_{}; + std::wstring response_; + + friend class CProtocolOpData; + friend class CStorjConnectOpData; + friend class CStorjDeleteOpData; + friend class CStorjFileTransferOpData; + friend class CStorjListOpData; + friend class CStorjMkdirOpData; + friend class CStorjRemoveDirOpData; + friend class CStorjResolveOpData; + friend class CStorjResolveManyOpData; +}; + +typedef CProtocolOpData CStorjOpData; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/tlssocket.cpp filezilla-3.33.0/src/engine/tlssocket.cpp --- filezilla-3.15.0.2/src/engine/tlssocket.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/tlssocket.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,1286 +1,117 @@ #include -#include "engineprivate.h" -#include "tlssocket.h" -#include "ControlSocket.h" - -#include - -#include -#if FZ_USE_GNUTLS_SYSTEM_CIPHERS -char const ciphers[] = "@SYSTEM"; -#else -char const ciphers[] = "SECURE256:+SECURE128:-ARCFOUR-128:-3DES-CBC:-MD5:+SIGN-ALL:-SIGN-RSA-MD5:+CTYPE-X509:-CTYPE-OPENPGP:-VERS-SSL3.0"; -#endif - -#define TLSDEBUG 0 -#if TLSDEBUG -// This is quite ugly -CControlSocket* pLoggingControlSocket; -void log_func(int level, const char* msg) -{ - if (!msg || !pLoggingControlSocket) - return; - wxString s(msg, wxConvLocal); - s.Trim(); - pLoggingControlSocket->LogMessage(MessageType::Debug_Debug, _T("tls: %d %s"), level, s); -} -#endif +#include "ControlSocket.h" +#include "tlssocket.h" +#include "tlssocket_impl.h" -CTlsSocket::CTlsSocket(event_handler* pEvtHandler, CSocket& socket, CControlSocket* pOwner) +CTlsSocket::CTlsSocket(fz::event_handler* pEvtHandler, fz::socket& pSocket, CControlSocket* pOwner) : event_handler(pOwner->event_loop_) , CBackend(pEvtHandler) - , m_pOwner(pOwner) - , m_socket(socket) { - m_pSocketBackend = new CSocketBackend(this, m_socket, m_pOwner->GetEngine().GetRateLimiter()); - - m_implicitTrustedCert.data = 0; - m_implicitTrustedCert.size = 0; + impl_ = std::make_unique(*this, pSocket, pOwner); } CTlsSocket::~CTlsSocket() { remove_handler(); - - Uninit(); - delete m_pSocketBackend; } bool CTlsSocket::Init() { - // This function initializes GnuTLS - m_initialized = true; - int res = gnutls_global_init(); - if (res) { - LogError(res, _T("gnutls_global_init")); - Uninit(); - return false; - } - -#if TLSDEBUG - if (!pLoggingControlSocket) { - pLoggingControlSocket = m_pOwner; - gnutls_global_set_log_function(log_func); - gnutls_global_set_log_level(99); - } -#endif - res = gnutls_certificate_allocate_credentials(&m_certCredentials); - if (res < 0) { - LogError(res, _T("gnutls_certificate_allocate_credentials")); - Uninit(); - return false; - } - - if (!InitSession()) - return false; - - m_shutdown_requested = false; - - // At this point, we can start shaking hands. - - return true; -} - -bool CTlsSocket::SetClientCertificate(fz::native_string const& keyfile, fz::native_string const& certs, fz::native_string const& password) -{ - if (!m_certCredentials) { - return false; - } - - int res = gnutls_certificate_set_x509_key_file2(m_certCredentials, fz::to_string(certs).c_str(), - fz::to_string(keyfile).c_str(), GNUTLS_X509_FMT_PEM, password.empty() ? 0 : fz::to_utf8(password).c_str(), 0); - if (res < 0) { - LogError(res, _T("gnutls_certificate_set_x509_key_file2")); - Uninit(); - return false; - } - - return true; -} - -bool CTlsSocket::InitSession() -{ - if (!m_certCredentials) { - Uninit(); - return false; - } - - int res = gnutls_init(&m_session, GNUTLS_CLIENT); - if (res) { - LogError(res, _T("gnutls_init")); - Uninit(); - return false; - } - - // Even though the name gnutls_db_set_cache_expiration - // implies expiration of some cache, it also governs - // the actual session lifetime, independend whether the - // session is cached or not. - gnutls_db_set_cache_expiration(m_session, 100000000); - - res = gnutls_priority_set_direct(m_session, ciphers, 0); - if (res) { - LogError(res, _T("gnutls_priority_set_direct")); - Uninit(); - return false; - } - - gnutls_dh_set_prime_bits(m_session, 1024); - - gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, m_certCredentials); - - // Setup transport functions - gnutls_transport_set_push_function(m_session, PushFunction); - gnutls_transport_set_pull_function(m_session, PullFunction); - gnutls_transport_set_ptr(m_session, (gnutls_transport_ptr_t)this); - - return true; + return impl_->Init(); } void CTlsSocket::Uninit() { - UninitSession(); - - if (m_certCredentials) { - gnutls_certificate_free_credentials(m_certCredentials); - m_certCredentials = 0; - } - - if (m_initialized) { - m_initialized = false; - gnutls_global_deinit(); - } - - m_tlsState = TlsState::noconn; - - delete [] m_peekData; - m_peekData = 0; - m_peekDataLen = 0; - - delete [] m_implicitTrustedCert.data; - m_implicitTrustedCert.data = 0; - -#if TLSDEBUG - if (pLoggingControlSocket == m_pOwner) - pLoggingControlSocket = 0; -#endif -} - - -void CTlsSocket::UninitSession() -{ - if (m_session) { - gnutls_deinit(m_session); - m_session = 0; - } -} - - -void CTlsSocket::LogError(int code, const wxString& function, MessageType logLevel) -{ - if (code == GNUTLS_E_WARNING_ALERT_RECEIVED || code == GNUTLS_E_FATAL_ALERT_RECEIVED) { - PrintAlert(logLevel); - } - else if (code == GNUTLS_E_PULL_ERROR) { - if (function.empty()) { - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("GnuTLS could not read from socket: %s"), CSocket::GetErrorDescription(m_socket_error)); - } - else { - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("GnuTLS could not read from socket in %s: %s"), function, CSocket::GetErrorDescription(m_socket_error)); - } - } - else if (code == GNUTLS_E_PUSH_ERROR) { - if (function.empty()) { - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("GnuTLS could not write to socket: %s"), CSocket::GetErrorDescription(m_socket_error)); - } - else { - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("GnuTLS could not write to socket in %s: %s"), function, CSocket::GetErrorDescription(m_socket_error)); - } - } - else { - const char* error = gnutls_strerror(code); - if (error) { - wxString str(error, wxConvLocal); - if (function.empty()) - m_pOwner->LogMessage(logLevel, _("GnuTLS error %d: %s"), code, str); - else - m_pOwner->LogMessage(logLevel, _("GnuTLS error %d in %s: %s"), code, function, str); - } - else { - if (function.empty()) - m_pOwner->LogMessage(logLevel, _("GnuTLS error %d"), code); - else - m_pOwner->LogMessage(logLevel, _("GnuTLS error %d in %s"), code, function); - } - } -} - -void CTlsSocket::PrintAlert(MessageType logLevel) -{ - gnutls_alert_description_t last_alert = gnutls_alert_get(m_session); - const char* alert = gnutls_alert_get_name(last_alert); - if (alert) { - wxString str(alert, wxConvLocal); - m_pOwner->LogMessage(logLevel, _("Received TLS alert from the server: %s (%d)"), str, last_alert); - } - else - m_pOwner->LogMessage(logLevel, _("Received unknown TLS alert %d from the server"), last_alert); -} - -ssize_t CTlsSocket::PushFunction(gnutls_transport_ptr_t ptr, const void* data, size_t len) -{ - return ((CTlsSocket*)ptr)->PushFunction(data, len); -} - -ssize_t CTlsSocket::PullFunction(gnutls_transport_ptr_t ptr, void* data, size_t len) -{ - return ((CTlsSocket*)ptr)->PullFunction(data, len); -} - -ssize_t CTlsSocket::PushFunction(const void* data, size_t len) -{ -#if TLSDEBUG - m_pOwner->LogMessage(MessageType::Debug_Debug, _T("CTlsSocket::PushFunction(%d)"), len); -#endif - if (!m_canWriteToSocket) { - gnutls_transport_set_errno(m_session, EAGAIN); - return -1; - } - - if (!m_pSocketBackend) { - gnutls_transport_set_errno(m_session, 0); - return -1; - } - - int error; - int written = m_pSocketBackend->Write(data, len, error); - - if (written < 0) { - m_canWriteToSocket = false; - if (error == EAGAIN) { - m_socket_error = error; - } - gnutls_transport_set_errno(m_session, error); -#if TLSDEBUG - m_pOwner->LogMessage(MessageType::Debug_Debug, _T(" returning -1 due to %d"), error); -#endif - return -1; - } - -#if TLSDEBUG - m_pOwner->LogMessage(MessageType::Debug_Debug, _T(" returning %d"), written); -#endif - - return written; -} - -ssize_t CTlsSocket::PullFunction(void* data, size_t len) -{ -#if TLSDEBUG - m_pOwner->LogMessage(MessageType::Debug_Debug, _T("CTlsSocket::PullFunction(%d)"), (int)len); -#endif - if (!m_pSocketBackend) { - gnutls_transport_set_errno(m_session, 0); - return -1; - } - - if (m_socketClosed) - return 0; - - if (!m_canReadFromSocket) { - gnutls_transport_set_errno(m_session, EAGAIN); - return -1; - } - - int error; - int read = m_pSocketBackend->Read(data, len, error); - if (read < 0) { - m_canReadFromSocket = false; - if (error == EAGAIN) { - if (m_canCheckCloseSocket && !m_pSocketBackend->IsWaiting(CRateLimiter::inbound)) { - send_event(m_pSocketBackend, SocketEventType::close, 0); - } - } - else { - m_socket_error = error; - } - gnutls_transport_set_errno(m_session, error); -#if TLSDEBUG - m_pOwner->LogMessage(MessageType::Debug_Debug, _T(" returning -1 due to %d"), error); -#endif - return -1; - } - - if (m_canCheckCloseSocket) { - send_event(m_pSocketBackend, SocketEventType::close, 0); - } - - if (!read) { - m_socket_eof = true; - } - -#if TLSDEBUG - m_pOwner->LogMessage(MessageType::Debug_Debug, _T(" returning %d"), read); -#endif - - return read; + return impl_->Uninit(); } -void CTlsSocket::operator()(fz::event_base const& ev) +int CTlsSocket::Handshake(CTlsSocket const* pPrimarySocket, bool try_resume) { - fz::dispatch(ev, this, &CTlsSocket::OnSocketEvent); + return impl_->Handshake(pPrimarySocket ? pPrimarySocket->impl_.get() : nullptr, try_resume); } -void CTlsSocket::OnSocketEvent(CSocketEventSource*, SocketEventType t, int error) +int CTlsSocket::Read(void *buffer, unsigned int size, int& error) { - if (!m_session) - return; - - switch (t) - { - case SocketEventType::read: - OnRead(); - break; - case SocketEventType::write: - OnSend(); - break; - case SocketEventType::close: - { - m_canCheckCloseSocket = true; - char tmp[100]; - int peeked = m_pSocketBackend->Peek(&tmp, 100, error); - if (peeked >= 0) { - if (peeked > 0) - m_pOwner->LogMessage(MessageType::Debug_Verbose, _T("CTlsSocket::OnSocketEvent(): pending data, postponing close event")); - else { - m_socket_eof = true; - m_socketClosed = true; - } - OnRead(); - - if (peeked) - return; - } - - m_pOwner->LogMessage(MessageType::Debug_Info, _T("CTlsSocket::OnSocketEvent(): close event received")); - - //Uninit(); - m_pEvtHandler->send_event(this, SocketEventType::close, 0); - } - break; - default: - break; - } -} - -void CTlsSocket::OnRead() -{ - m_pOwner->LogMessage(MessageType::Debug_Debug, _T("CTlsSocket::OnRead()")); - - m_canReadFromSocket = true; - - if (!m_session) - return; - - const int direction = gnutls_record_get_direction(m_session); - if (direction && !m_lastReadFailed) { - m_pOwner->LogMessage(MessageType::Debug_Debug, _T("CTlsSocket::Postponing read")); - return; - } - - if (m_tlsState == TlsState::handshake) - ContinueHandshake(); - if (m_tlsState == TlsState::closing) - ContinueShutdown(); - else if (m_tlsState == TlsState::conn) { - CheckResumeFailedReadWrite(); - TriggerEvents(); - } -} - -void CTlsSocket::OnSend() -{ - m_pOwner->LogMessage(MessageType::Debug_Debug, _T("CTlsSocket::OnSend()")); - - m_canWriteToSocket = true; - - if (!m_session) - return; - - const int direction = gnutls_record_get_direction(m_session); - if (!direction && !m_lastWriteFailed) - return; - - if (m_tlsState == TlsState::handshake) - ContinueHandshake(); - else if (m_tlsState == TlsState::closing) - ContinueShutdown(); - else if (m_tlsState == TlsState::conn) { - CheckResumeFailedReadWrite(); - TriggerEvents(); - } -} - -bool CTlsSocket::CopySessionData(const CTlsSocket* pPrimarySocket) -{ - gnutls_datum_t d; - int res = gnutls_session_get_data2(pPrimarySocket->m_session, &d); - if (res) { - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("gnutls_session_get_data2 on primary socket failed: %d"), res); - return true; - } - - // Set session data - res = gnutls_session_set_data(m_session, d.data, d.size ); - gnutls_free(d.data); - if (res) { - m_pOwner->LogMessage(MessageType::Debug_Info, _T("gnutls_session_set_data failed: %d. Going to reinitialize session."), res); - UninitSession(); - if (!InitSession()) - return false; - } - else - m_pOwner->LogMessage(MessageType::Debug_Info, _T("Trying to resume existing TLS session.")); - - return true; + return impl_->Read(buffer, size, error); } -bool CTlsSocket::ResumedSession() const +int CTlsSocket::Peek(void *buffer, unsigned int size, int& error) { - return gnutls_session_is_resumed(m_session) != 0; + return impl_->Peek(buffer, size, error); } -int CTlsSocket::Handshake(const CTlsSocket* pPrimarySocket, bool try_resume) +int CTlsSocket::Write(const void *buffer, unsigned int size, int& error) { - m_pOwner->LogMessage(MessageType::Debug_Verbose, _T("CTlsSocket::Handshake()")); - wxASSERT(m_session); - - m_tlsState = TlsState::handshake; - - wxString hostname; - - if (pPrimarySocket) { - // Implicitly trust certificate of primary socket - unsigned int cert_list_size; - const gnutls_datum_t* const cert_list = gnutls_certificate_get_peers(pPrimarySocket->m_session, &cert_list_size); - if (cert_list && cert_list_size) { - delete [] m_implicitTrustedCert.data; - m_implicitTrustedCert.data = new unsigned char[cert_list[0].size]; - memcpy(m_implicitTrustedCert.data, cert_list[0].data, cert_list[0].size); - m_implicitTrustedCert.size = cert_list[0].size; - } - - if (try_resume) { - if (!CopySessionData(pPrimarySocket)) - return FZ_REPLY_ERROR; - } - - hostname = pPrimarySocket->m_socket.GetPeerHost(); - } - else { - hostname = m_socket.GetPeerHost(); - } - - if (!hostname.empty() && fz::get_address_type(hostname.ToStdWstring()) == fz::address_type::unknown) { - const wxWX2MBbuf utf8 = hostname.mb_str(wxConvUTF8); - if (utf8) { - int res = gnutls_server_name_set( m_session, GNUTLS_NAME_DNS, utf8, strlen(utf8) ); - if (res) { - LogError(res, _T("gnutls_server_name_set"), MessageType::Debug_Warning ); - } - } - } - - return ContinueHandshake(); -} - -int CTlsSocket::ContinueHandshake() -{ - m_pOwner->LogMessage(MessageType::Debug_Verbose, _T("CTlsSocket::ContinueHandshake()")); - wxASSERT(m_session); - wxASSERT(m_tlsState == TlsState::handshake); - - int res = gnutls_handshake(m_session); - while (res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED) { - if (!(gnutls_record_get_direction(m_session) ? m_canWriteToSocket : m_canReadFromSocket)) { - break; - } - res = gnutls_handshake(m_session); - } - if (!res) { - m_pOwner->LogMessage(MessageType::Debug_Info, _T("TLS Handshake successful")); - - if (ResumedSession()) - m_pOwner->LogMessage(MessageType::Debug_Info, _T("TLS Session resumed")); - - const wxString protocol = GetProtocolName(); - const wxString keyExchange = GetKeyExchange(); - const wxString cipherName = GetCipherName(); - const wxString macName = GetMacName(); - - m_pOwner->LogMessage(MessageType::Debug_Info, _T("Protocol: %s, Key exchange: %s, Cipher: %s, MAC: %s"), protocol, keyExchange, cipherName, macName); - - res = VerifyCertificate(); - if (res != FZ_REPLY_OK) - return res; - - if (m_shutdown_requested) { - int error = Shutdown(); - if (!error || error != EAGAIN) { - m_pEvtHandler->send_event(this, SocketEventType::close, 0); - } - } - - return FZ_REPLY_OK; - } - else if (res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED) - return FZ_REPLY_WOULDBLOCK; - - Failure(res, true); - - return FZ_REPLY_ERROR; -} - -int CTlsSocket::Read(void *buffer, unsigned int len, int& error) -{ - if (m_tlsState == TlsState::handshake || m_tlsState == TlsState::verifycert) { - error = EAGAIN; - return -1; - } - else if (m_tlsState != TlsState::conn) { - error = ENOTCONN; - return -1; - } - else if (m_lastReadFailed) { - error = EAGAIN; - return -1; - } - - if (m_peekDataLen) { - unsigned int min = wxMin(len, m_peekDataLen); - memcpy(buffer, m_peekData, min); - - if (min == m_peekDataLen) { - m_peekDataLen = 0; - delete [] m_peekData; - m_peekData = 0; - } - else { - memmove(m_peekData, m_peekData + min, m_peekDataLen - min); - m_peekDataLen -= min; - } - - TriggerEvents(); - - error = 0; - return min; - } - - int res = DoCallGnutlsRecordRecv(buffer, len); - if (res >= 0) { - if (res > 0) - TriggerEvents(); - else { - // Peer did already initiate a shutdown, reply to it - gnutls_bye(m_session, GNUTLS_SHUT_WR); - // Note: Theoretically this could return a write error. - // But we ignore it, since it is perfectly valid for peer - // to close the connection after sending its shutdown - // notification. - } - - error = 0; - return res; - } - - if (res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) { - error = EAGAIN; - m_lastReadFailed = true; - } - else { - Failure(res, false, _T("gnutls_record_recv")); - error = m_socket_error; - } - - return -1; -} - -int CTlsSocket::Write(const void *buffer, unsigned int len, int& error) -{ - if (m_tlsState == TlsState::handshake || m_tlsState == TlsState::verifycert) { - error = EAGAIN; - return -1; - } - else if (m_tlsState != TlsState::conn) { - error = ENOTCONN; - return -1; - } - - if (m_lastWriteFailed) { - error = EAGAIN; - return -1; - } - - if (m_writeSkip >= len) { - m_writeSkip -= len; - return len; - } - - len -= m_writeSkip; - buffer = (char*)buffer + m_writeSkip; - - int res = gnutls_record_send(m_session, buffer, len); - - while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket) - res = gnutls_record_send(m_session, 0, 0); - - if (res >= 0) { - error = 0; - int written = res + m_writeSkip; - m_writeSkip = 0; - - TriggerEvents(); - return written; - } - - if (res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) { - if (m_writeSkip) { - error = 0; - int written = m_writeSkip; - m_writeSkip = 0; - return written; - } - else { - error = EAGAIN; - m_lastWriteFailed = true; - return -1; - } - } - else { - Failure(res, false, _T("gnutls_record_send")); - error = m_socket_error; - return -1; - } -} - -void CTlsSocket::TriggerEvents() -{ - if (m_tlsState != TlsState::conn) - return; - - if (m_canTriggerRead) { - m_pEvtHandler->send_event(this, SocketEventType::read, 0); - m_canTriggerRead = false; - } - - if (m_canTriggerWrite) { - m_pEvtHandler->send_event(this, SocketEventType::write, 0); - m_canTriggerWrite = false; - } -} - -void CTlsSocket::CheckResumeFailedReadWrite() -{ - if (m_lastWriteFailed) { - int res = GNUTLS_E_AGAIN; - while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket) - res = gnutls_record_send(m_session, 0, 0); - - if (res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) - return; - - if (res < 0) { - Failure(res, true); - return; - } - - m_writeSkip += res; - m_lastWriteFailed = false; - m_canTriggerWrite = true; - } - if (m_lastReadFailed) { - wxASSERT(!m_peekData); - - m_peekDataLen = 65536; - m_peekData = new char[m_peekDataLen]; - - int res = DoCallGnutlsRecordRecv(m_peekData, m_peekDataLen); - if (res < 0) { - m_peekDataLen = 0; - delete [] m_peekData; - m_peekData = 0; - if (res != GNUTLS_E_INTERRUPTED && res != GNUTLS_E_AGAIN) - Failure(res, true); - return; - } - - if (!res) { - m_peekDataLen = 0; - delete [] m_peekData; - m_peekData = 0; - } - else - m_peekDataLen = res; - - m_lastReadFailed = false; - m_canTriggerRead = true; - } -} - -void CTlsSocket::Failure(int code, bool send_close, const wxString& function) -{ - m_pOwner->LogMessage(MessageType::Debug_Debug, _T("CTlsSocket::Failure(%d)"), code); - if (code) { - LogError(code, function); - if (m_socket_eof) { - if (code == GNUTLS_E_UNEXPECTED_PACKET_LENGTH -#ifdef GNUTLS_E_PREMATURE_TERMINATION - || code == GNUTLS_E_PREMATURE_TERMINATION -#endif - ) - { - m_pOwner->LogMessage(MessageType::Status, _("Server did not properly shut down TLS connection")); - } - } - } - Uninit(); - - if (send_close) { - m_pEvtHandler->send_event(this, SocketEventType::close, m_socket_error); - } -} - -int CTlsSocket::Peek(void *buffer, unsigned int len, int& error) -{ - if (m_peekData) { - int min = wxMin(len, m_peekDataLen); - memcpy(buffer, m_peekData, min); - - error = 0; - return min; - } - - int read = Read(buffer, len, error); - if (read <= 0) - return read; - - m_peekDataLen = read; - m_peekData = new char[m_peekDataLen]; - memcpy(m_peekData, buffer, m_peekDataLen); - - return read; + return impl_->Write(buffer, size, error); } int CTlsSocket::Shutdown() { - m_pOwner->LogMessage(MessageType::Debug_Verbose, _T("CTlsSocket::Shutdown()")); - - if (m_tlsState == TlsState::closed) - return 0; - - if (m_tlsState == TlsState::closing) - return EAGAIN; - - if (m_tlsState == TlsState::handshake || m_tlsState == TlsState::verifycert) { - // Shutdown during handshake is not a good idea. - m_pOwner->LogMessage(MessageType::Debug_Verbose, _T("Shutdown during handshake, postponing")); - m_shutdown_requested = true; - return EAGAIN; - } - - if (m_tlsState != TlsState::conn) - return ECONNABORTED; - - m_tlsState = TlsState::closing; - - int res = gnutls_bye(m_session, GNUTLS_SHUT_WR); - while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket) - res = gnutls_bye(m_session, GNUTLS_SHUT_WR); - if (!res) { - m_tlsState = TlsState::closed; - return 0; - } - - if (res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) - return EAGAIN; + return impl_->Shutdown(); +} - Failure(res, false); - return m_socket_error; +void CTlsSocket::TrustCurrentCert(bool trusted) +{ + return impl_->TrustCurrentCert(trusted); } -void CTlsSocket::ContinueShutdown() +CTlsSocket::TlsState CTlsSocket::GetState() const { - m_pOwner->LogMessage(MessageType::Debug_Verbose, _T("CTlsSocket::ContinueShutdown()")); + return impl_->GetState(); +} - int res = gnutls_bye(m_session, GNUTLS_SHUT_WR); - while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket) - res = gnutls_bye(m_session, GNUTLS_SHUT_WR); - if (!res) { - m_tlsState = TlsState::closed; +std::wstring CTlsSocket::GetProtocolName() +{ + return impl_->GetProtocolName(); +} - m_pEvtHandler->send_event(this, SocketEventType::close, 0); +std::wstring CTlsSocket::GetKeyExchange() +{ + return impl_->GetKeyExchange(); +} - return; - } +std::wstring CTlsSocket::GetCipherName() +{ + return impl_->GetCipherName(); +} - if (res != GNUTLS_E_INTERRUPTED && res != GNUTLS_E_AGAIN) - Failure(res, true); +std::wstring CTlsSocket::GetMacName() +{ + return impl_->GetMacName(); } -void CTlsSocket::TrustCurrentCert(bool trusted) +int CTlsSocket::GetAlgorithmWarnings() { - if (m_tlsState != TlsState::verifycert) { - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("TrustCurrentCert called at wrong time.")); - return; - } - - if (trusted) { - m_tlsState = TlsState::conn; - - if (m_lastWriteFailed) - m_lastWriteFailed = false; - CheckResumeFailedReadWrite(); - - if (m_tlsState == TlsState::conn) { - m_pEvtHandler->send_event(this, SocketEventType::connection, 0); - } - - TriggerEvents(); - - return; - } - - m_pOwner->LogMessage(MessageType::Error, _("Remote certificate not trusted.")); - Failure(0, true); -} - -static wxString bin2hex(const unsigned char* in, size_t size) -{ - wxString str; - for (size_t i = 0; i < size; i++) - { - if (i) - str += _T(":"); - str += wxString::Format(_T("%.2x"), (int)in[i]); - } - - return str; -} - - -bool CTlsSocket::ExtractCert(gnutls_datum_t const* datum, CCertificate& out) -{ - gnutls_x509_crt_t cert; - if (gnutls_x509_crt_init(&cert)) { - m_pOwner->LogMessage(MessageType::Error, _("Could not initialize structure for peer certificates, gnutls_x509_crt_init failed")); - return false; - } - - if (gnutls_x509_crt_import(cert, datum, GNUTLS_X509_FMT_DER)) { - m_pOwner->LogMessage(MessageType::Error, _("Could not import peer certificates, gnutls_x509_crt_import failed")); - gnutls_x509_crt_deinit(cert); - return false; - } - - fz::datetime expirationTime(gnutls_x509_crt_get_expiration_time(cert), fz::datetime::seconds); - fz::datetime activationTime(gnutls_x509_crt_get_activation_time(cert), fz::datetime::seconds); - - // Get the serial number of the certificate - unsigned char buffer[40]; - size_t size = sizeof(buffer); - int res = gnutls_x509_crt_get_serial(cert, buffer, &size); - if( res != 0 ) { - size = 0; - } - - wxString serial = bin2hex(buffer, size); - - unsigned int pkBits; - int pkAlgo = gnutls_x509_crt_get_pk_algorithm(cert, &pkBits); - wxString pkAlgoName; - if (pkAlgo >= 0) { - const char* pAlgo = gnutls_pk_algorithm_get_name((gnutls_pk_algorithm_t)pkAlgo); - if (pAlgo) - pkAlgoName = wxString(pAlgo, wxConvUTF8); - } - - int signAlgo = gnutls_x509_crt_get_signature_algorithm(cert); - wxString signAlgoName; - if (signAlgo >= 0) { - const char* pAlgo = gnutls_sign_algorithm_get_name((gnutls_sign_algorithm_t)signAlgo); - if (pAlgo) - signAlgoName = wxString(pAlgo, wxConvUTF8); - } - - wxString subject, issuer; - - size = 0; - res = gnutls_x509_crt_get_dn(cert, 0, &size); - if (size) { - char* dn = new char[size + 1]; - dn[size] = 0; - if (!(res = gnutls_x509_crt_get_dn(cert, dn, &size))) - { - dn[size] = 0; - subject = wxString(dn, wxConvUTF8); - } - else - LogError(res, _T("gnutls_x509_crt_get_dn")); - delete [] dn; - } - else - LogError(res, _T("gnutls_x509_crt_get_dn")); - if (subject.empty()) { - m_pOwner->LogMessage(MessageType::Error, _("Could not get distinguished name of certificate subject, gnutls_x509_get_dn failed")); - gnutls_x509_crt_deinit(cert); - return false; - } - - std::vector alt_subject_names = GetCertSubjectAltNames(cert); - - size = 0; - res = gnutls_x509_crt_get_issuer_dn(cert, 0, &size); - if (size) { - char* dn = new char[++size + 1]; - dn[size] = 0; - if (!(res = gnutls_x509_crt_get_issuer_dn(cert, dn, &size))) { - dn[size] = 0; - issuer = wxString(dn, wxConvUTF8); - } - else - LogError(res, _T("gnutls_x509_crt_get_issuer_dn")); - delete [] dn; - } - else - LogError(res, _T("gnutls_x509_crt_get_issuer_dn")); - if (issuer.empty() ) { - m_pOwner->LogMessage(MessageType::Error, _("Could not get distinguished name of certificate issuer, gnutls_x509_get_issuer_dn failed")); - gnutls_x509_crt_deinit(cert); - return false; - } - - wxString fingerprint_sha256; - wxString fingerprint_sha1; - - unsigned char digest[100]; - size = sizeof(digest) - 1; - if (!gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA256, digest, &size)) { - digest[size] = 0; - fingerprint_sha256 = bin2hex(digest, size); - } - size = sizeof(digest) - 1; - if (!gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA1, digest, &size)) { - digest[size] = 0; - fingerprint_sha1 = bin2hex(digest, size); - } - - gnutls_x509_crt_deinit(cert); - - out = CCertificate( - datum->data, datum->size, - activationTime, expirationTime, - serial, - pkAlgoName, pkBits, - signAlgoName, - fingerprint_sha256, - fingerprint_sha1, - issuer, - subject, - alt_subject_names); - - return true; -} - - -std::vector CTlsSocket::GetCertSubjectAltNames(gnutls_x509_crt_t cert) -{ - std::vector ret; - - char san[4096]; - for (unsigned int i = 0; i < 10000; ++i) { // I assume this is a sane limit - size_t san_size = sizeof(san) - 1; - int const type_or_error = gnutls_x509_crt_get_subject_alt_name(cert, i, san, &san_size, 0); - if (type_or_error == GNUTLS_E_SHORT_MEMORY_BUFFER) { - continue; - } - else if (type_or_error < 0) { - break; - } - - if (type_or_error == GNUTLS_SAN_DNSNAME || type_or_error == GNUTLS_SAN_RFC822NAME) { - wxString dns = wxString(san, wxConvUTF8); - if (!dns.empty()) { - ret.push_back(dns); - } - } - else if (type_or_error == GNUTLS_SAN_IPADDRESS) { - wxString ip = CSocket::AddressToString(san, san_size); - if (!ip.empty()) { - ret.push_back(ip); - } - } - } + return impl_->GetAlgorithmWarnings(); +} - return ret; +bool CTlsSocket::ResumedSession() const +{ + return impl_->ResumedSession(); } -bool CTlsSocket::CertificateIsBlacklisted(std::vector const&) +std::string CTlsSocket::ListTlsCiphers(std::string const& priority) { - return false; + return CTlsSocketImpl::ListTlsCiphers(priority); } +bool CTlsSocket::SetClientCertificate(fz::native_string const& keyfile, fz::native_string const& certs, fz::native_string const& password) +{ + return impl_->SetClientCertificate(keyfile, certs, password); +} -int CTlsSocket::GetAlgorithmWarnings() +void CTlsSocket::operator()(fz::event_base const& ev) { - int algorithmWarnings{}; + return impl_->operator()(ev); +} - switch (gnutls_protocol_get_version(m_session)) - { - case GNUTLS_SSL3: - case GNUTLS_VERSION_UNKNOWN: - algorithmWarnings |= CCertificateNotification::tlsver; - break; - default: - break; - } - - switch (gnutls_cipher_get(m_session)) { - case GNUTLS_CIPHER_UNKNOWN: - case GNUTLS_CIPHER_NULL: - case GNUTLS_CIPHER_ARCFOUR_128: - case GNUTLS_CIPHER_3DES_CBC: - case GNUTLS_CIPHER_ARCFOUR_40: - case GNUTLS_CIPHER_RC2_40_CBC: - case GNUTLS_CIPHER_DES_CBC: - algorithmWarnings |= CCertificateNotification::cipher; - break; - default: - break; - } - - switch (gnutls_mac_get(m_session)) { - case GNUTLS_MAC_UNKNOWN: - case GNUTLS_MAC_NULL: - case GNUTLS_MAC_MD5: - case GNUTLS_MAC_MD2: - case GNUTLS_MAC_UMAC_96: - algorithmWarnings |= CCertificateNotification::mac; - break; - default: - break; - } - - switch (gnutls_kx_get(m_session)) { - case GNUTLS_KX_UNKNOWN: - case GNUTLS_KX_ANON_DH: - case GNUTLS_KX_RSA_EXPORT: - case GNUTLS_KX_ANON_ECDH: - algorithmWarnings |= CCertificateNotification::kex; - default: - break; - } - - return algorithmWarnings; -} - - -int CTlsSocket::VerifyCertificate() -{ - if (m_tlsState != TlsState::handshake) { - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("VerifyCertificate called at wrong time")); - return FZ_REPLY_ERROR; - } - - m_tlsState = TlsState::verifycert; - - if (gnutls_certificate_type_get(m_session) != GNUTLS_CRT_X509) { - m_pOwner->LogMessage(MessageType::Error, _("Unsupported certificate type")); - Failure(0, true); - return FZ_REPLY_ERROR; - } - - unsigned int status = 0; - int const verifyResult = gnutls_certificate_verify_peers2(m_session, &status); - if (verifyResult < 0) { - m_pOwner->LogMessage(MessageType::Debug_Warning, _T("gnutls_certificate_verify_peers2 returned %d with status %u"), verifyResult, status); - m_pOwner->LogMessage(MessageType::Error, _("Failed to verify peer certificate")); - Failure(0, true); - return FZ_REPLY_ERROR; - } - - if (status & GNUTLS_CERT_REVOKED) { - m_pOwner->LogMessage(MessageType::Error, _("Beware! Certificate has been revoked")); - Failure(0, true); - return FZ_REPLY_ERROR; - } - - if (status & GNUTLS_CERT_SIGNER_NOT_CA) { - m_pOwner->LogMessage(MessageType::Error, _("Incomplete chain, top certificate is not self-signed certificate authority certificate")); - Failure(0, true); - return FZ_REPLY_ERROR; - } - - unsigned int cert_list_size; - const gnutls_datum_t* cert_list = gnutls_certificate_get_peers(m_session, &cert_list_size); - if (!cert_list || !cert_list_size) { - m_pOwner->LogMessage(MessageType::Error, _("gnutls_certificate_get_peers returned no certificates")); - Failure(0, true); - return FZ_REPLY_ERROR; - } - - if (m_implicitTrustedCert.data) { - if (m_implicitTrustedCert.size != cert_list[0].size || - memcmp(m_implicitTrustedCert.data, cert_list[0].data, cert_list[0].size)) - { - m_pOwner->LogMessage(MessageType::Error, _("Primary connection and data connection certificates don't match.")); - Failure(0, true); - return FZ_REPLY_ERROR; - } - - TrustCurrentCert(true); - - if (m_tlsState != TlsState::conn) - return FZ_REPLY_ERROR; - return FZ_REPLY_OK; - } - - m_pOwner->LogMessage(MessageType::Status, _("Verifying certificate...")); - - std::vector certificates; - for (unsigned int i = 0; i < cert_list_size; ++i) { - CCertificate cert; - if (ExtractCert(cert_list, cert)) - certificates.push_back(cert); - else { - Failure(0, true); - return FZ_REPLY_ERROR; - } - - ++cert_list; - } - - if (CertificateIsBlacklisted(certificates)) { - Failure(0, true); - return FZ_REPLY_ERROR; - } - - int const algorithmWarnings = GetAlgorithmWarnings(); - - CCertificateNotification *pNotification = new CCertificateNotification( - m_pOwner->GetCurrentServer()->GetHost(), - m_pOwner->GetCurrentServer()->GetPort(), - GetProtocolName(), - GetKeyExchange(), - GetCipherName(), - GetMacName(), - algorithmWarnings, - certificates); - - m_pOwner->SendAsyncRequest(pNotification); - - return FZ_REPLY_WOULDBLOCK; -} - -void CTlsSocket::OnRateAvailable(CRateLimiter::rate_direction) -{ -} - -wxString CTlsSocket::GetProtocolName() -{ - wxString protocol = _("unknown"); - - const char* s = gnutls_protocol_get_name( gnutls_protocol_get_version( m_session ) ); - if (s && *s) - protocol = wxString(s, wxConvUTF8); - - return protocol; -} - -wxString CTlsSocket::GetKeyExchange() -{ - wxString keyExchange = _("unknown"); - - const char* s = gnutls_kx_get_name( gnutls_kx_get( m_session ) ); - if (s && *s) - keyExchange = wxString(s, wxConvUTF8); - - return keyExchange; -} - -wxString CTlsSocket::GetCipherName() -{ - const char* cipher = gnutls_cipher_get_name(gnutls_cipher_get(m_session)); - if (cipher && *cipher) - return wxString(cipher, wxConvUTF8); - else - return _("unknown"); -} - -wxString CTlsSocket::GetMacName() -{ - const char* mac = gnutls_mac_get_name(gnutls_mac_get(m_session)); - if (mac && *mac) - return wxString(mac, wxConvUTF8); - else - return _T("unknown"); -} - -wxString CTlsSocket::ListTlsCiphers(wxString priority) -{ - if (priority.empty()) - priority = wxString::FromUTF8(ciphers); - - wxString list = wxString::Format(_T("Ciphers for %s:\n"), priority); - - gnutls_priority_t pcache; - const char *err = 0; - int ret = gnutls_priority_init(&pcache, priority.mb_str(), &err); - if (ret < 0) { - list += wxString::Format(_T("gnutls_priority_init failed with code %d: %s"), ret, err ? wxString::FromUTF8(err) : _T("Unknown error")); - return list; - } - else { - for (size_t i = 0; ; i++) { - unsigned int idx; - ret = gnutls_priority_get_cipher_suite_index(pcache, i, &idx); - if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) - break; - if (ret == GNUTLS_E_UNKNOWN_CIPHER_SUITE) - continue; - - gnutls_protocol_t version; - unsigned char id[2]; - const char* name = gnutls_cipher_suite_info(idx, id, NULL, NULL, NULL, &version); - - if (name != 0) - { - list += wxString::Format( - _T("%-50s 0x%02x, 0x%02x %s\n"), - wxString::FromUTF8(name), - (unsigned char)id[0], - (unsigned char)id[1], - wxString::FromUTF8(gnutls_protocol_get_name(version))); - } - } - } - - return list; -} - -int CTlsSocket::DoCallGnutlsRecordRecv(void* data, size_t len) -{ - int res = gnutls_record_recv(m_session, data, len); - while( (res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED) && m_canReadFromSocket && !gnutls_record_get_direction(m_session)) { - // Spurious EAGAIN. Can happen if GnuTLS gets a partial - // record and the socket got closed. - // The unexpected close is being ignored in this case, unless - // gnutls_record_recv is being called again. - // Manually call gnutls_record_recv as in case of eof on the socket, - // we are not getting another receive event. - m_pOwner->LogMessage(MessageType::Debug_Verbose, _T("gnutls_record_recv returned spurious EAGAIN")); - res = gnutls_record_recv(m_session, data, len); - } +void CTlsSocket::OnRateAvailable(CRateLimiter::rate_direction direction) +{ + return impl_->OnRateAvailable(direction); +} - return res; +std::wstring CTlsSocket::GetGnutlsVersion() +{ + return CTlsSocketImpl::GetGnutlsVersion(); } diff -Nru filezilla-3.15.0.2/src/engine/tlssocket.h filezilla-3.33.0/src/engine/tlssocket.h --- filezilla-3.15.0.2/src/engine/tlssocket.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/engine/tlssocket.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,11 +1,10 @@ -#ifndef __TLSSOCKET_H__ -#define __TLSSOCKET_H__ +#ifndef FILEZILLA_ENGINE_TLSSOCKET_HEADER +#define FILEZILLA_ENGINE_TLSSOCKET_HEADER -#include #include "backend.h" -#include "socket.h" class CControlSocket; +class CTlsSocketImpl; class CTlsSocket final : protected fz::event_handler, public CBackend { public: @@ -19,115 +18,43 @@ closed }; - CTlsSocket(fz::event_handler* pEvtHandler, CSocket& pSocket, CControlSocket* pOwner); + CTlsSocket(fz::event_handler* pEvtHandler, fz::socket& pSocket, CControlSocket* pOwner); virtual ~CTlsSocket(); bool Init(); void Uninit(); - int Handshake(const CTlsSocket* pPrimarySocket = 0, bool try_resume = 0); + int Handshake(const CTlsSocket* pPrimarySocket = nullptr, bool try_resume = 0); - virtual int Read(void *buffer, unsigned int size, int& error); - virtual int Peek(void *buffer, unsigned int size, int& error); - virtual int Write(const void *buffer, unsigned int size, int& error); + virtual int Read(void *buffer, unsigned int size, int& error) override; + virtual int Peek(void *buffer, unsigned int size, int& error) override; + virtual int Write(const void *buffer, unsigned int size, int& error) override; int Shutdown(); void TrustCurrentCert(bool trusted); - TlsState GetState() const { return m_tlsState; } + TlsState GetState() const; - wxString GetProtocolName(); - wxString GetKeyExchange(); - wxString GetCipherName(); - wxString GetMacName(); + std::wstring GetProtocolName(); + std::wstring GetKeyExchange(); + std::wstring GetCipherName(); + std::wstring GetMacName(); int GetAlgorithmWarnings(); bool ResumedSession() const; - static wxString ListTlsCiphers(wxString priority); + static std::string ListTlsCiphers(std::string const& priority); bool SetClientCertificate(fz::native_string const& keyfile, fz::native_string const& certs, fz::native_string const& password); -protected: - bool InitSession(); - void UninitSession(); - bool CopySessionData(const CTlsSocket* pPrimarySocket); + static std::wstring GetGnutlsVersion(); +private: + virtual void operator()(fz::event_base const& ev) override; + virtual void OnRateAvailable(CRateLimiter::rate_direction direction) override; - virtual void OnRateAvailable(CRateLimiter::rate_direction direction); - - int ContinueHandshake(); - void ContinueShutdown(); - - int VerifyCertificate(); - bool CertificateIsBlacklisted(std::vector const& certificates); - - TlsState m_tlsState{TlsState::noconn}; - - CControlSocket* m_pOwner{}; - - bool m_initialized{}; - gnutls_session_t m_session{}; - - gnutls_certificate_credentials_t m_certCredentials{}; - - void LogError(int code, const wxString& function, MessageType logLegel = MessageType::Error); - void PrintAlert(MessageType logLevel); - - // Failure logs the error, uninits the session and sends a close event - void Failure(int code, bool send_close, const wxString& function = wxString()); - - static ssize_t PushFunction(gnutls_transport_ptr_t ptr, const void* data, size_t len); - static ssize_t PullFunction(gnutls_transport_ptr_t ptr, void* data, size_t len); - ssize_t PushFunction(const void* data, size_t len); - ssize_t PullFunction(void* data, size_t len); - - int DoCallGnutlsRecordRecv(void* data, size_t len); - - void TriggerEvents(); - - virtual void operator()(fz::event_base const& ev); - void OnSocketEvent(CSocketEventSource* source, SocketEventType t, int error); - - void OnRead(); - void OnSend(); - - bool ExtractCert(gnutls_datum_t const* datum, CCertificate& out); - std::vector GetCertSubjectAltNames(gnutls_x509_crt_t cert); - - bool m_canReadFromSocket{true}; - bool m_canWriteToSocket{true}; - bool m_canCheckCloseSocket{false}; - - bool m_canTriggerRead{false}; - bool m_canTriggerWrite{true}; - - bool m_socketClosed{}; - - CSocketBackend* m_pSocketBackend{}; - CSocket& m_socket; - - bool m_shutdown_requested{}; - - // Due to the strange gnutls_record_send semantics, call it again - // with 0 data and 0 length after GNUTLS_E_AGAIN and store the number - // of bytes written. These bytes get skipped on next write from the - // application. - // This avoids the rule to call it again with the -same- data after - // GNUTLS_E_AGAIN. - void CheckResumeFailedReadWrite(); - bool m_lastReadFailed{true}; - bool m_lastWriteFailed{false}; - unsigned int m_writeSkip{}; - - // Peek data - char* m_peekData{}; - unsigned int m_peekDataLen{}; - - gnutls_datum_t m_implicitTrustedCert; - - bool m_socket_eof{}; - int m_socket_error{ECONNABORTED}; // Set in the push and pull functions if reading/writing fails fatally + friend class CTlsSocketImpl; + std::unique_ptr impl_; }; -#endif //__TLSSOCKET_H__ +#endif diff -Nru filezilla-3.15.0.2/src/engine/tlssocket_impl.cpp filezilla-3.33.0/src/engine/tlssocket_impl.cpp --- filezilla-3.15.0.2/src/engine/tlssocket_impl.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/tlssocket_impl.cpp 2018-02-05 21:28:24.000000000 +0000 @@ -0,0 +1,1577 @@ +#include +#include "engineprivate.h" +#include "tlssocket.h" +#include "tlssocket_impl.h" +#include "ControlSocket.h" + +#include + +#include + +#include + +#include + +#if FZ_USE_GNUTLS_SYSTEM_CIPHERS +char const ciphers[] = "@SYSTEM"; +#else +char const ciphers[] = "SECURE256:+SECURE128:-ARCFOUR-128:-3DES-CBC:-MD5:+SIGN-ALL:-SIGN-RSA-MD5:+CTYPE-X509:-CTYPE-OPENPGP:-VERS-SSL3.0"; +#endif + +#define TLSDEBUG 0 +#if TLSDEBUG +// This is quite ugly +CControlSocket* pLoggingControlSocket; +void log_func(int level, const char* msg) +{ + if (!msg || !pLoggingControlSocket) { + return; + } + std::wstring s = fz::to_wstring(msg); + fz::trim(s); + pLoggingControlSocket->LogMessage(MessageType::Debug_Debug, L"tls: %d %s", level, s); +} +#endif + +class CTlsSocketCallbacks +{ +public: + static int handshake_hook_func(gnutls_session_t session, unsigned int htype, unsigned int post, unsigned int incoming) + { + if (!session) { + return 0; + } + auto* tls = reinterpret_cast(gnutls_session_get_ptr(session)); + if (!tls) { + return 0; + } + + char const* prefix; + if (incoming) { + if (post) { + prefix = "Processed"; + } + else { + prefix = "Received"; + } + } + else { + if (post) { + prefix = "Sent"; + } + else { + prefix = "About to send"; + } + } + + char const* name = gnutls_handshake_description_get_name(static_cast(htype)); + + tls->m_pOwner->LogMessage(MessageType::Debug_Debug, L"TLS handshake: %s %s", prefix, name); + + return 0; + } +}; + +namespace { +extern "C" int handshake_hook_func(gnutls_session_t session, unsigned int htype, unsigned int post, unsigned int incoming, gnutls_datum_t const*) +{ + return CTlsSocketCallbacks::handshake_hook_func(session, htype, post, incoming); +} + +struct cert_list_holder final +{ + cert_list_holder() = default; + ~cert_list_holder() { + for (unsigned int i = 0; i < certs_size; ++i) { + gnutls_x509_crt_deinit(certs[i]); + } + gnutls_free(certs); + } + + cert_list_holder(cert_list_holder const&) = delete; + cert_list_holder& operator=(cert_list_holder const&) = delete; + + gnutls_x509_crt_t * certs{}; + unsigned int certs_size{}; +}; + +struct datum_holder final : gnutls_datum_t +{ + datum_holder() { + data = nullptr; + } + + ~datum_holder() { + gnutls_free(data); + } + + datum_holder(datum_holder const&) = delete; + datum_holder& operator=(datum_holder const&) = delete; + +}; + +void clone_cert(gnutls_x509_crt_t in, gnutls_x509_crt_t &out) +{ + gnutls_x509_crt_deinit(out); + out = nullptr; + + if (in) { + datum_holder der; + if (gnutls_x509_crt_export2(in, GNUTLS_X509_FMT_DER, &der) == GNUTLS_E_SUCCESS) { + gnutls_x509_crt_init(&out); + if (gnutls_x509_crt_import(out, &der, GNUTLS_X509_FMT_DER) != GNUTLS_E_SUCCESS) { + gnutls_x509_crt_deinit(out); + out = nullptr; + } + } + } +} +} + +CTlsSocketImpl::CTlsSocketImpl(CTlsSocket& tlsSocket, fz::socket& socket, CControlSocket* pOwner) + : tlsSocket_(tlsSocket) + , m_pOwner(pOwner) + , m_socket(socket) + , socketBackend_(std::make_unique(static_cast(&tlsSocket_), m_socket, m_pOwner->GetEngine().GetRateLimiter())) +{ + m_implicitTrustedCert.data = nullptr; + m_implicitTrustedCert.size = 0; +} + +CTlsSocketImpl::~CTlsSocketImpl() +{ + Uninit(); +} + +bool CTlsSocketImpl::Init() +{ + // This function initializes GnuTLS + m_initialized = true; + int res = gnutls_global_init(); + if (res) { + LogError(res, L"gnutls_global_init"); + Uninit(); + return false; + } + +#if TLSDEBUG + if (!pLoggingControlSocket) { + pLoggingControlSocket = m_pOwner; + gnutls_global_set_log_function(log_func); + gnutls_global_set_log_level(99); + } +#endif + res = gnutls_certificate_allocate_credentials(&m_certCredentials); + if (res < 0) { + LogError(res, L"gnutls_certificate_allocate_credentials"); + Uninit(); + return false; + } + + // Disable time checks. We allow expired/not yet valid certificates, though only after explicit user confirmation + gnutls_certificate_set_verify_flags(m_certCredentials, gnutls_certificate_get_verify_flags(m_certCredentials) | GNUTLS_VERIFY_DISABLE_TIME_CHECKS | GNUTLS_VERIFY_DISABLE_TRUSTED_TIME_CHECKS); + + if (!InitSession()) { + return false; + } + + m_shutdown_requested = false; + + // At this point, we can start shaking hands. + + return true; +} + +bool CTlsSocketImpl::SetClientCertificate(fz::native_string const& keyfile, fz::native_string const& certs, fz::native_string const& password) +{ + if (!m_certCredentials) { + return false; + } + + int res = gnutls_certificate_set_x509_key_file2(m_certCredentials, fz::to_string(certs).c_str(), + fz::to_string(keyfile).c_str(), GNUTLS_X509_FMT_PEM, password.empty() ? nullptr : fz::to_utf8(password).c_str(), 0); + if (res < 0) { + LogError(res, L"gnutls_certificate_set_x509_key_file2"); + Uninit(); + return false; + } + + return true; +} + +bool CTlsSocketImpl::InitSession() +{ + if (!m_certCredentials) { + Uninit(); + return false; + } + + int res = gnutls_init(&m_session, GNUTLS_CLIENT); + if (res) { + LogError(res, L"gnutls_init"); + Uninit(); + return false; + } + + // For use in callbacks + gnutls_session_set_ptr(m_session, this); + + // Even though the name gnutls_db_set_cache_expiration + // implies expiration of some cache, it also governs + // the actual session lifetime, independend whether the + // session is cached or not. + gnutls_db_set_cache_expiration(m_session, 100000000); + + res = gnutls_priority_set_direct(m_session, ciphers, nullptr); + if (res) { + LogError(res, L"gnutls_priority_set_direct"); + Uninit(); + return false; + } + + gnutls_dh_set_prime_bits(m_session, 1024); + + gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, m_certCredentials); + + // Setup transport functions + gnutls_transport_set_push_function(m_session, PushFunction); + gnutls_transport_set_pull_function(m_session, PullFunction); + gnutls_transport_set_ptr(m_session, (gnutls_transport_ptr_t)this); + + return true; +} + +void CTlsSocketImpl::Uninit() +{ + UninitSession(); + + if (m_certCredentials) { + gnutls_certificate_free_credentials(m_certCredentials); + m_certCredentials = nullptr; + } + + if (m_initialized) { + m_initialized = false; + gnutls_global_deinit(); + } + + m_tlsState = CTlsSocket::TlsState::noconn; + + peekBuffer_.clear(); + + delete [] m_implicitTrustedCert.data; + m_implicitTrustedCert.data = nullptr; + +#if TLSDEBUG + if (pLoggingControlSocket == m_pOwner) { + pLoggingControlSocket = nullptr; + } +#endif +} + + +void CTlsSocketImpl::UninitSession() +{ + if (m_session) { + gnutls_deinit(m_session); + m_session = nullptr; + } +} + + +void CTlsSocketImpl::LogError(int code, std::wstring const& function, MessageType logLevel) +{ + if (code == GNUTLS_E_WARNING_ALERT_RECEIVED || code == GNUTLS_E_FATAL_ALERT_RECEIVED) { + PrintAlert(logLevel); + } + else if (code == GNUTLS_E_PULL_ERROR) { + if (function.empty()) { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"GnuTLS could not read from socket: %s", fz::socket::error_description(m_socket_error)); + } + else { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"GnuTLS could not read from socket in %s: %s", function, fz::socket::error_description(m_socket_error)); + } + } + else if (code == GNUTLS_E_PUSH_ERROR) { + if (function.empty()) { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"GnuTLS could not write to socket: %s", fz::socket::error_description(m_socket_error)); + } + else { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"GnuTLS could not write to socket in %s: %s", function, fz::socket::error_description(m_socket_error)); + } + } + else { + const char* error = gnutls_strerror(code); + if (error) { + if (function.empty()) { + m_pOwner->LogMessage(logLevel, _("GnuTLS error %d: %s"), code, error); + } + else { + m_pOwner->LogMessage(logLevel, _("GnuTLS error %d in %s: %s"), code, function, error); + } + } + else { + if (function.empty()) { + m_pOwner->LogMessage(logLevel, _("GnuTLS error %d"), code); + } + else { + m_pOwner->LogMessage(logLevel, _("GnuTLS error %d in %s"), code, function); + } + } + } +} + +void CTlsSocketImpl::PrintAlert(MessageType logLevel) +{ + gnutls_alert_description_t last_alert = gnutls_alert_get(m_session); + const char* alert = gnutls_alert_get_name(last_alert); + if (alert) { + m_pOwner->LogMessage(logLevel, _("Received TLS alert from the server: %s (%d)"), alert, last_alert); + } + else { + m_pOwner->LogMessage(logLevel, _("Received unknown TLS alert %d from the server"), last_alert); + } +} + +ssize_t CTlsSocketImpl::PushFunction(gnutls_transport_ptr_t ptr, const void* data, size_t len) +{ + return ((CTlsSocketImpl*)ptr)->PushFunction(data, len); +} + +ssize_t CTlsSocketImpl::PullFunction(gnutls_transport_ptr_t ptr, void* data, size_t len) +{ + return ((CTlsSocketImpl*)ptr)->PullFunction(data, len); +} + +ssize_t CTlsSocketImpl::PushFunction(const void* data, size_t len) +{ +#if TLSDEBUG + m_pOwner->LogMessage(MessageType::Debug_Debug, L"CTlsSocketImpl::PushFunction(%d)", len); +#endif + if (!m_canWriteToSocket) { + gnutls_transport_set_errno(m_session, EAGAIN); + return -1; + } + + int error; + int written = socketBackend_->Write(data, len, error); + + if (written < 0) { + m_canWriteToSocket = false; + if (error == EAGAIN) { + m_socket_error = error; + } + gnutls_transport_set_errno(m_session, error); +#if TLSDEBUG + m_pOwner->LogMessage(MessageType::Debug_Debug, L" returning -1 due to %d", error); +#endif + return -1; + } + +#if TLSDEBUG + m_pOwner->LogMessage(MessageType::Debug_Debug, L" returning %d", written); +#endif + + return written; +} + +ssize_t CTlsSocketImpl::PullFunction(void* data, size_t len) +{ +#if TLSDEBUG + m_pOwner->LogMessage(MessageType::Debug_Debug, L"CTlsSocketImpl::PullFunction(%d)", (int)len); +#endif + if (m_socketClosed) { + return 0; + } + + if (!m_canReadFromSocket) { + gnutls_transport_set_errno(m_session, EAGAIN); + return -1; + } + + int error; + int read = socketBackend_->Read(data, len, error); + if (read < 0) { + m_canReadFromSocket = false; + if (error == EAGAIN) { + if (m_canCheckCloseSocket && !socketBackend_->IsWaiting(CRateLimiter::inbound)) { + tlsSocket_.send_event(socketBackend_.get(), fz::socket_event_flag::close, 0); + } + } + else { + m_socket_error = error; + } + gnutls_transport_set_errno(m_session, error); +#if TLSDEBUG + m_pOwner->LogMessage(MessageType::Debug_Debug, L" returning -1 due to %d", error); +#endif + return -1; + } + + if (m_canCheckCloseSocket) { + tlsSocket_.send_event(socketBackend_.get(), fz::socket_event_flag::close, 0); + } + + if (!read) { + m_socket_eof = true; + } + +#if TLSDEBUG + m_pOwner->LogMessage(MessageType::Debug_Debug, L" returning %d", read); +#endif + + return read; +} + +void CTlsSocketImpl::operator()(fz::event_base const& ev) +{ + fz::dispatch(ev, this, &CTlsSocketImpl::OnSocketEvent); +} + +void CTlsSocketImpl::OnSocketEvent(fz::socket_event_source*, fz::socket_event_flag t, int error) +{ + if (!m_session) { + return; + } + + switch (t) + { + case fz::socket_event_flag::read: + OnRead(); + break; + case fz::socket_event_flag::write: + OnSend(); + break; + case fz::socket_event_flag::close: + { + m_canCheckCloseSocket = true; + char tmp[100]; + int peeked = socketBackend_->Peek(&tmp, 100, error); + if (peeked >= 0) { + if (peeked > 0) { + m_pOwner->LogMessage(MessageType::Debug_Verbose, L"CTlsSocketImpl::OnSocketEvent(): pending data, postponing close event"); + } + else { + m_socket_eof = true; + m_socketClosed = true; + } + OnRead(); + + if (peeked) { + return; + } + } + + m_pOwner->LogMessage(MessageType::Debug_Info, L"CTlsSocketImpl::OnSocketEvent(): close event received"); + + tlsSocket_.m_pEvtHandler->send_event(&tlsSocket_, fz::socket_event_flag::close, 0); + } + break; + default: + break; + } +} + +void CTlsSocketImpl::OnRead() +{ + m_pOwner->LogMessage(MessageType::Debug_Debug, L"CTlsSocketImpl::OnRead()"); + + m_canReadFromSocket = true; + + if (!m_session) { + return; + } + + const int direction = gnutls_record_get_direction(m_session); + if (direction && !m_lastReadFailed) { + m_pOwner->LogMessage(MessageType::Debug_Debug, L"CTlsSocketImpl::Postponing read"); + return; + } + + if (m_tlsState == CTlsSocket::TlsState::handshake) { + ContinueHandshake(); + } + if (m_tlsState == CTlsSocket::TlsState::closing) { + ContinueShutdown(); + } + else if (m_tlsState == CTlsSocket::TlsState::conn) { + CheckResumeFailedReadWrite(); + TriggerEvents(); + } +} + +void CTlsSocketImpl::OnSend() +{ + m_pOwner->LogMessage(MessageType::Debug_Debug, L"CTlsSocketImpl::OnSend()"); + + m_canWriteToSocket = true; + + if (!m_session) { + return; + } + + const int direction = gnutls_record_get_direction(m_session); + if (!direction && !m_lastWriteFailed) { + return; + } + + if (m_tlsState == CTlsSocket::TlsState::handshake) { + ContinueHandshake(); + } + else if (m_tlsState == CTlsSocket::TlsState::closing) { + ContinueShutdown(); + } + else if (m_tlsState == CTlsSocket::TlsState::conn) { + CheckResumeFailedReadWrite(); + TriggerEvents(); + } +} + +bool CTlsSocketImpl::CopySessionData(const CTlsSocketImpl* pPrimarySocket) +{ + datum_holder d; + int res = gnutls_session_get_data2(pPrimarySocket->m_session, &d); + if (res) { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"gnutls_session_get_data2 on primary socket failed: %d", res); + return true; + } + + // Set session data + res = gnutls_session_set_data(m_session, d.data, d.size ); + if (res) { + m_pOwner->LogMessage(MessageType::Debug_Info, L"gnutls_session_set_data failed: %d. Going to reinitialize session.", res); + UninitSession(); + if (!InitSession()) { + return false; + } + } + else { + m_pOwner->LogMessage(MessageType::Debug_Info, L"Trying to resume existing TLS session."); + } + + return true; +} + +bool CTlsSocketImpl::ResumedSession() const +{ + return gnutls_session_is_resumed(m_session) != 0; +} + +int CTlsSocketImpl::Handshake(const CTlsSocketImpl* pPrimarySocket, bool try_resume) +{ + m_pOwner->LogMessage(MessageType::Debug_Verbose, L"CTlsSocketImpl::Handshake()"); + if (!m_session) { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"Called CTlsSocketImpl::Handshake without session"); + return FZ_REPLY_ERROR; + } + + m_tlsState = CTlsSocket::TlsState::handshake; + + if (pPrimarySocket) { + if (!pPrimarySocket->m_session) { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"Primary socket has no session"); + return FZ_REPLY_ERROR; + } + + // Implicitly trust certificate of primary socket + unsigned int cert_list_size; + const gnutls_datum_t* const cert_list = gnutls_certificate_get_peers(pPrimarySocket->m_session, &cert_list_size); + if (cert_list && cert_list_size) { + delete [] m_implicitTrustedCert.data; + m_implicitTrustedCert.data = new unsigned char[cert_list[0].size]; + memcpy(m_implicitTrustedCert.data, cert_list[0].data, cert_list[0].size); + m_implicitTrustedCert.size = cert_list[0].size; + } + + if (try_resume) { + if (!CopySessionData(pPrimarySocket)) { + return FZ_REPLY_ERROR; + } + } + + hostname_ = pPrimarySocket->m_socket.peer_host(); + + int port, tmp; + port = m_socket.remote_port(tmp); + if (port <= 0) { + return FZ_REPLY_ERROR; + } + port_ = port; + } + else { + hostname_ = m_socket.peer_host(); + + int port, tmp; + port = m_socket.remote_port(tmp); + if (port <= 0) { + return FZ_REPLY_ERROR; + } + port_ = port; + } + + if (!hostname_.empty() && fz::get_address_type(hostname_) == fz::address_type::unknown) { + auto const utf8 = fz::to_utf8(hostname_); + if (!utf8.empty()) { + int res = gnutls_server_name_set(m_session, GNUTLS_NAME_DNS, utf8.c_str(), utf8.size()); + if (res) { + LogError(res, L"gnutls_server_name_set", MessageType::Debug_Warning); + } + } + } + + if (m_pOwner->ShouldLog(MessageType::Debug_Debug)) { + gnutls_handshake_set_hook_function(m_session, GNUTLS_HANDSHAKE_ANY, GNUTLS_HOOK_BOTH, &handshake_hook_func); + } + + return ContinueHandshake(); +} + +int CTlsSocketImpl::ContinueHandshake() +{ + m_pOwner->LogMessage(MessageType::Debug_Verbose, L"CTlsSocketImpl::ContinueHandshake()"); + assert(m_session); + assert(m_tlsState == CTlsSocket::TlsState::handshake); + + int res = gnutls_handshake(m_session); + while (res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED) { + if (!(gnutls_record_get_direction(m_session) ? m_canWriteToSocket : m_canReadFromSocket)) { + break; + } + res = gnutls_handshake(m_session); + } + if (!res) { + m_pOwner->LogMessage(MessageType::Debug_Info, L"TLS Handshake successful"); + + if (ResumedSession()) { + m_pOwner->LogMessage(MessageType::Debug_Info, L"TLS Session resumed"); + } + + std::wstring const protocol = GetProtocolName(); + std::wstring const keyExchange = GetKeyExchange(); + std::wstring const cipherName = GetCipherName(); + std::wstring const macName = GetMacName(); + + m_pOwner->LogMessage(MessageType::Debug_Info, L"Protocol: %s, Key exchange: %s, Cipher: %s, MAC: %s", protocol, keyExchange, cipherName, macName); + + res = VerifyCertificate(); + if (res != FZ_REPLY_OK) { + return res; + } + + if (m_shutdown_requested) { + int error = Shutdown(); + if (!error || error != EAGAIN) { + tlsSocket_.m_pEvtHandler->send_event(&tlsSocket_, fz::socket_event_flag::close, 0); + } + } + + return FZ_REPLY_OK; + } + else if (res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED) { + return FZ_REPLY_WOULDBLOCK; + } + + Failure(res, true); + + return FZ_REPLY_ERROR; +} + +int CTlsSocketImpl::Read(void *buffer, unsigned int len, int& error) +{ + if (m_tlsState == CTlsSocket::TlsState::handshake || m_tlsState == CTlsSocket::TlsState::verifycert) { + error = EAGAIN; + return -1; + } + else if (m_tlsState != CTlsSocket::TlsState::conn) { + error = ENOTCONN; + return -1; + } + else if (m_lastReadFailed) { + error = EAGAIN; + return -1; + } + + if (peekBuffer_) { + auto min = std::min(static_cast(len), peekBuffer_.size()); + memcpy(buffer, peekBuffer_.get(), min); + peekBuffer_.consume(min); + + TriggerEvents(); + + error = 0; + return min; + } + + int res = DoCallGnutlsRecordRecv(buffer, len); + if (res >= 0) { + if (res > 0) { + TriggerEvents(); + } + else { + // Peer did already initiate a shutdown, reply to it + gnutls_bye(m_session, GNUTLS_SHUT_WR); + // Note: Theoretically this could return a write error. + // But we ignore it, since it is perfectly valid for peer + // to close the connection after sending its shutdown + // notification. + } + + error = 0; + return res; + } + + if (res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) { + error = EAGAIN; + m_lastReadFailed = true; + } + else { + Failure(res, false, L"gnutls_record_recv"); + error = m_socket_error; + } + + return -1; +} + +int CTlsSocketImpl::Write(const void *buffer, unsigned int len, int& error) +{ + if (m_tlsState == CTlsSocket::TlsState::handshake || m_tlsState == CTlsSocket::TlsState::verifycert) { + error = EAGAIN; + return -1; + } + else if (m_tlsState != CTlsSocket::TlsState::conn) { + error = ENOTCONN; + return -1; + } + + if (m_lastWriteFailed) { + error = EAGAIN; + return -1; + } + + if (m_writeSkip >= len) { + m_writeSkip -= len; + return len; + } + + len -= m_writeSkip; + buffer = (char*)buffer + m_writeSkip; + + int res = gnutls_record_send(m_session, buffer, len); + + while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket) + res = gnutls_record_send(m_session, nullptr, 0); + + if (res >= 0) { + error = 0; + int written = res + m_writeSkip; + m_writeSkip = 0; + + TriggerEvents(); + return written; + } + + if (res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) { + if (m_writeSkip) { + error = 0; + int written = m_writeSkip; + m_writeSkip = 0; + return written; + } + else { + error = EAGAIN; + m_lastWriteFailed = true; + return -1; + } + } + else { + Failure(res, false, L"gnutls_record_send"); + error = m_socket_error; + return -1; + } +} + +void CTlsSocketImpl::TriggerEvents() +{ + if (m_tlsState != CTlsSocket::TlsState::conn) + return; + + if (m_canTriggerRead) { + tlsSocket_.m_pEvtHandler->send_event(&tlsSocket_, fz::socket_event_flag::read, 0); + m_canTriggerRead = false; + } + + if (m_canTriggerWrite) { + tlsSocket_.m_pEvtHandler->send_event(&tlsSocket_, fz::socket_event_flag::write, 0); + m_canTriggerWrite = false; + } +} + +void CTlsSocketImpl::CheckResumeFailedReadWrite() +{ + if (m_lastWriteFailed) { + int res = GNUTLS_E_AGAIN; + while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket) { + res = gnutls_record_send(m_session, nullptr, 0); + } + + if (res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) { + return; + } + + if (res < 0) { + Failure(res, true); + return; + } + + m_writeSkip += res; + m_lastWriteFailed = false; + m_canTriggerWrite = true; + } + if (m_lastReadFailed) { + int res = DoCallGnutlsRecordRecv(peekBuffer_.get(65536), 65536); + if (res < 0) { + if (res != GNUTLS_E_INTERRUPTED && res != GNUTLS_E_AGAIN) { + Failure(res, true); + } + return; + } + + peekBuffer_.add(static_cast(res)); + + m_lastReadFailed = false; + m_canTriggerRead = true; + } +} + +void CTlsSocketImpl::Failure(int code, bool send_close, std::wstring const& function) +{ + m_pOwner->LogMessage(MessageType::Debug_Debug, L"CTlsSocketImpl::Failure(%d)", code); + if (code) { + LogError(code, function); + if (m_socket_eof) { + if (code == GNUTLS_E_UNEXPECTED_PACKET_LENGTH +#ifdef GNUTLS_E_PREMATURE_TERMINATION + || code == GNUTLS_E_PREMATURE_TERMINATION +#endif + ) + { + m_pOwner->LogMessage(MessageType::Status, _("Server did not properly shut down TLS connection")); + } + } + } + Uninit(); + + if (send_close) { + tlsSocket_.m_pEvtHandler->send_event(&tlsSocket_, fz::socket_event_flag::close, m_socket_error); + } +} + +int CTlsSocketImpl::Peek(void *buffer, unsigned int len, int& error) +{ + if (peekBuffer_) { + auto min = std::min(static_cast(len), peekBuffer_.size()); + memcpy(buffer, peekBuffer_.get(), min); + + error = 0; + return min; + } + + int read = Read(peekBuffer_.get(len), len, error); + if (read <= 0) { + return read; + } + peekBuffer_.add(static_cast(read)); + memcpy(buffer, peekBuffer_.get(), static_cast(read)); + + return read; +} + +int CTlsSocketImpl::Shutdown() +{ + m_pOwner->LogMessage(MessageType::Debug_Verbose, L"CTlsSocketImpl::Shutdown()"); + + if (m_tlsState == CTlsSocket::TlsState::closed) + return 0; + + if (m_tlsState == CTlsSocket::TlsState::closing) + return EAGAIN; + + if (m_tlsState == CTlsSocket::TlsState::handshake || m_tlsState == CTlsSocket::TlsState::verifycert) { + // Shutdown during handshake is not a good idea. + m_pOwner->LogMessage(MessageType::Debug_Verbose, L"Shutdown during handshake, postponing"); + m_shutdown_requested = true; + return EAGAIN; + } + + if (m_tlsState != CTlsSocket::TlsState::conn) + return ECONNABORTED; + + m_tlsState = CTlsSocket::TlsState::closing; + + int res = gnutls_bye(m_session, GNUTLS_SHUT_WR); + while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket) { + res = gnutls_bye(m_session, GNUTLS_SHUT_WR); + } + if (!res) { + m_tlsState = CTlsSocket::TlsState::closed; + return 0; + } + + if (res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) { + return EAGAIN; + } + + Failure(res, false); + return m_socket_error; +} + +void CTlsSocketImpl::ContinueShutdown() +{ + m_pOwner->LogMessage(MessageType::Debug_Verbose, L"CTlsSocketImpl::ContinueShutdown()"); + + int res = gnutls_bye(m_session, GNUTLS_SHUT_WR); + while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket) { + res = gnutls_bye(m_session, GNUTLS_SHUT_WR); + } + if (!res) { + m_tlsState = CTlsSocket::TlsState::closed; + + tlsSocket_.m_pEvtHandler->send_event(&tlsSocket_, fz::socket_event_flag::close, 0); + + return; + } + + if (res != GNUTLS_E_INTERRUPTED && res != GNUTLS_E_AGAIN) { + Failure(res, true); + } +} + +void CTlsSocketImpl::TrustCurrentCert(bool trusted) +{ + if (m_tlsState != CTlsSocket::TlsState::verifycert) { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"TrustCurrentCert called at wrong time."); + return; + } + + if (trusted) { + m_tlsState = CTlsSocket::TlsState::conn; + + if (m_lastWriteFailed) + m_lastWriteFailed = false; + CheckResumeFailedReadWrite(); + + if (m_tlsState == CTlsSocket::TlsState::conn) { + tlsSocket_.m_pEvtHandler->send_event(&tlsSocket_, fz::socket_event_flag::connection, 0); + } + + TriggerEvents(); + + return; + } + + m_pOwner->LogMessage(MessageType::Error, _("Remote certificate not trusted.")); + Failure(0, true); +} + +static std::wstring bin2hex(const unsigned char* in, size_t size) +{ + std::wstring str; + str.reserve(size * 3); + for (size_t i = 0; i < size; ++i) { + if (i) { + str += ':'; + } + str += fz::int_to_hex_char(in[i] >> 4); + str += fz::int_to_hex_char(in[i] & 0xf); + } + + return str; +} + + +bool CTlsSocketImpl::ExtractCert(gnutls_x509_crt_t const& cert, CCertificate& out) +{ + fz::datetime expirationTime(gnutls_x509_crt_get_expiration_time(cert), fz::datetime::seconds); + fz::datetime activationTime(gnutls_x509_crt_get_activation_time(cert), fz::datetime::seconds); + + // Get the serial number of the certificate + unsigned char buffer[40]; + size_t size = sizeof(buffer); + int res = gnutls_x509_crt_get_serial(cert, buffer, &size); + if (res != 0) { + size = 0; + } + + std::wstring serial = bin2hex(buffer, size); + + unsigned int pkBits; + int pkAlgo = gnutls_x509_crt_get_pk_algorithm(cert, &pkBits); + std::wstring pkAlgoName; + if (pkAlgo >= 0) { + const char* pAlgo = gnutls_pk_algorithm_get_name((gnutls_pk_algorithm_t)pkAlgo); + if (pAlgo) { + pkAlgoName = fz::to_wstring_from_utf8(pAlgo); + } + } + + int signAlgo = gnutls_x509_crt_get_signature_algorithm(cert); + std::wstring signAlgoName; + if (signAlgo >= 0) { + const char* pAlgo = gnutls_sign_algorithm_get_name((gnutls_sign_algorithm_t)signAlgo); + if (pAlgo) { + signAlgoName = fz::to_wstring_from_utf8(pAlgo); + } + } + + std::wstring subject, issuer; + + size = 0; + res = gnutls_x509_crt_get_dn(cert, nullptr, &size); + if (size) { + char* dn = new char[size + 1]; + dn[size] = 0; + if (!(res = gnutls_x509_crt_get_dn(cert, dn, &size))) { + dn[size] = 0; + subject = fz::to_wstring_from_utf8(dn); + } + else { + LogError(res, L"gnutls_x509_crt_get_dn"); + } + delete [] dn; + } + else { + LogError(res, L"gnutls_x509_crt_get_dn"); + } + if (subject.empty()) { + m_pOwner->LogMessage(MessageType::Error, _("Could not get distinguished name of certificate subject, gnutls_x509_get_dn failed")); + return false; + } + + std::vector alt_subject_names = GetCertSubjectAltNames(cert); + + size = 0; + res = gnutls_x509_crt_get_issuer_dn(cert, nullptr, &size); + if (size) { + char* dn = new char[++size + 1]; + dn[size] = 0; + if (!(res = gnutls_x509_crt_get_issuer_dn(cert, dn, &size))) { + dn[size] = 0; + issuer = fz::to_wstring_from_utf8(dn); + } + else { + LogError(res, L"gnutls_x509_crt_get_issuer_dn"); + } + delete [] dn; + } + else { + LogError(res, L"gnutls_x509_crt_get_issuer_dn"); + } + if (issuer.empty() ) { + m_pOwner->LogMessage(MessageType::Error, _("Could not get distinguished name of certificate issuer, gnutls_x509_get_issuer_dn failed")); + return false; + } + + std::wstring fingerprint_sha256; + std::wstring fingerprint_sha1; + + unsigned char digest[100]; + size = sizeof(digest) - 1; + if (!gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA256, digest, &size)) { + digest[size] = 0; + fingerprint_sha256 = bin2hex(digest, size); + } + size = sizeof(digest) - 1; + if (!gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA1, digest, &size)) { + digest[size] = 0; + fingerprint_sha1 = bin2hex(digest, size); + } + + datum_holder der; + if (gnutls_x509_crt_export2(cert, GNUTLS_X509_FMT_DER, &der) != GNUTLS_E_SUCCESS || !der.data || !der.size) { + m_pOwner->LogMessage(MessageType::Error, L"gnutls_x509_crt_get_issuer_dn"); + return false; + } + std::vector data(der.data, der.data + der.size); + + out = CCertificate( + std::move(data), + activationTime, expirationTime, + serial, + pkAlgoName, pkBits, + signAlgoName, + fingerprint_sha256, + fingerprint_sha1, + issuer, + subject, + std::move(alt_subject_names)); + + return true; +} + + +std::vector CTlsSocketImpl::GetCertSubjectAltNames(gnutls_x509_crt_t cert) +{ + std::vector ret; + + char san[4096]; + for (unsigned int i = 0; i < 10000; ++i) { // I assume this is a sane limit + size_t san_size = sizeof(san) - 1; + int const type_or_error = gnutls_x509_crt_get_subject_alt_name(cert, i, san, &san_size, nullptr); + if (type_or_error == GNUTLS_E_SHORT_MEMORY_BUFFER) { + continue; + } + else if (type_or_error < 0) { + break; + } + + if (type_or_error == GNUTLS_SAN_DNSNAME || type_or_error == GNUTLS_SAN_RFC822NAME) { + std::wstring dns = fz::to_wstring_from_utf8(san); + if (!dns.empty()) { + ret.emplace_back(CCertificate::SubjectName{std::move(dns), type_or_error == GNUTLS_SAN_DNSNAME}); + } + } + else if (type_or_error == GNUTLS_SAN_IPADDRESS) { + std::wstring ip = fz::to_wstring(fz::socket::address_to_string(san, san_size)); + if (!ip.empty()) { + ret.emplace_back(CCertificate::SubjectName{std::move(ip), false}); + } + } + } + return ret; +} + +bool CTlsSocketImpl::CertificateIsBlacklisted(std::vector const&) +{ + return false; +} + + +int CTlsSocketImpl::GetAlgorithmWarnings() +{ + int algorithmWarnings{}; + + switch (gnutls_protocol_get_version(m_session)) + { + case GNUTLS_SSL3: + case GNUTLS_VERSION_UNKNOWN: + algorithmWarnings |= CCertificateNotification::tlsver; + break; + default: + break; + } + + switch (gnutls_cipher_get(m_session)) { + case GNUTLS_CIPHER_UNKNOWN: + case GNUTLS_CIPHER_NULL: + case GNUTLS_CIPHER_ARCFOUR_128: + case GNUTLS_CIPHER_3DES_CBC: + case GNUTLS_CIPHER_ARCFOUR_40: + case GNUTLS_CIPHER_RC2_40_CBC: + case GNUTLS_CIPHER_DES_CBC: + algorithmWarnings |= CCertificateNotification::cipher; + break; + default: + break; + } + + switch (gnutls_mac_get(m_session)) { + case GNUTLS_MAC_UNKNOWN: + case GNUTLS_MAC_NULL: + case GNUTLS_MAC_MD5: + case GNUTLS_MAC_MD2: + case GNUTLS_MAC_UMAC_96: + algorithmWarnings |= CCertificateNotification::mac; + break; + default: + break; + } + + switch (gnutls_kx_get(m_session)) { + case GNUTLS_KX_UNKNOWN: + case GNUTLS_KX_ANON_DH: + case GNUTLS_KX_RSA_EXPORT: + case GNUTLS_KX_ANON_ECDH: + algorithmWarnings |= CCertificateNotification::kex; + default: + break; + } + + return algorithmWarnings; +} + + +bool CTlsSocketImpl::GetSortedPeerCertificates(gnutls_x509_crt_t *& certs, unsigned int & certs_size) +{ + certs = nullptr; + certs_size = 0; + + // First get unsorted list of peer certificates in DER + unsigned int cert_list_size; + const gnutls_datum_t* cert_list = gnutls_certificate_get_peers(m_session, &cert_list_size); + if (!cert_list || !cert_list_size) { + m_pOwner->LogMessage(MessageType::Error, _("gnutls_certificate_get_peers returned no certificates")); + return false; + } + + // Convert them all to PEM + gnutls_datum_t *pem_cert_list = new gnutls_datum_t[cert_list_size]; + for (unsigned i = 0; i < cert_list_size; ++i) { + if (gnutls_pem_base64_encode2("CERTIFICATE", cert_list + i, pem_cert_list + i) != 0) { + for (unsigned int j = 0; j < i; ++j) { + gnutls_free(pem_cert_list[j].data); + } + delete [] pem_cert_list; + m_pOwner->LogMessage(MessageType::Error, _("gnutls_pem_base64_encode2 failed")); + return false; + } + } + + // Concatenate them + gnutls_datum_t concated_certs{}; + for (unsigned i = 0; i < cert_list_size; ++i) { + concated_certs.size += pem_cert_list[i].size; + } + concated_certs.data = new unsigned char[concated_certs.size]; + concated_certs.size = 0; + for (unsigned i = 0; i < cert_list_size; ++i) { + memcpy(concated_certs.data + concated_certs.size, pem_cert_list[i].data, pem_cert_list[i].size); + concated_certs.size += pem_cert_list[i].size; + } + + for (unsigned i = 0; i < cert_list_size; ++i) { + gnutls_free(pem_cert_list[i].data); + } + delete[] pem_cert_list; + + // And now import the certificates + int res = gnutls_x509_crt_list_import2(&certs, &certs_size, &concated_certs, GNUTLS_X509_FMT_PEM, GNUTLS_X509_CRT_LIST_FAIL_IF_UNSORTED); + if (res == GNUTLS_E_CERTIFICATE_LIST_UNSORTED) { + m_pOwner->LogMessage(MessageType::Error, _("Server sent unsorted certificate chain in violation of the TLS specifications")); + res = gnutls_x509_crt_list_import2(&certs, &certs_size, &concated_certs, GNUTLS_X509_FMT_PEM, GNUTLS_X509_CRT_LIST_SORT); + } + + delete[] concated_certs.data; + + if (res != GNUTLS_E_SUCCESS) { + m_pOwner->LogMessage(MessageType::Error, _("Could not sort peer certificates")); + return false; + } + + return true; +} + +void CTlsSocketImpl::PrintVerificationError(int status) +{ + gnutls_datum_t buffer{}; + gnutls_certificate_verification_status_print(status, GNUTLS_CRT_X509, &buffer, 0); + if (buffer.data) { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"Gnutls Verification status: %s", buffer.data); + gnutls_free(buffer.data); + } + + if (status & GNUTLS_CERT_REVOKED) { + m_pOwner->LogMessage(MessageType::Error, _("Beware! Certificate has been revoked")); + + // The remaining errors are no longer of interest + return; + } + if (status & GNUTLS_CERT_SIGNATURE_FAILURE) { + m_pOwner->LogMessage(MessageType::Error, _("Certificate signature verification failed")); + status &= ~GNUTLS_CERT_SIGNATURE_FAILURE; + } + if (status & GNUTLS_CERT_INSECURE_ALGORITHM) { + m_pOwner->LogMessage(MessageType::Error, _("A certificate in the chain was signed using an insecure algorithm")); + status &= ~GNUTLS_CERT_INSECURE_ALGORITHM; + } + if (status & GNUTLS_CERT_SIGNER_NOT_CA) { + m_pOwner->LogMessage(MessageType::Error, _("An issuer in the certificate chain is not a certificate authority")); + status &= ~GNUTLS_CERT_SIGNER_NOT_CA; + } + if (status & GNUTLS_CERT_UNEXPECTED_OWNER) { + m_pOwner->LogMessage(MessageType::Error, _("The server's hostname does not match the certificate's hostname")); + status &= ~GNUTLS_CERT_UNEXPECTED_OWNER; + } +#ifdef GNUTLS_CERT_MISSING_OCSP_STATUS + if (status & GNUTLS_CERT_MISSING_OCSP_STATUS) { + m_pOwner->LogMessage(MessageType::Error, _("The certificate requires the server to include an OCSP status in its response, but the OCSP status is missing.")); + status &= ~GNUTLS_CERT_MISSING_OCSP_STATUS; + } +#endif + if (status) { + m_pOwner->LogMessage(MessageType::Error, _("Received certificate chain could not be verified. Verification status is %d."), status); + } + +} + +int CTlsSocketImpl::VerifyCertificate() +{ + if (m_tlsState != CTlsSocket::TlsState::handshake) { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"VerifyCertificate called at wrong time"); + return FZ_REPLY_ERROR; + } + + m_tlsState = CTlsSocket::TlsState::verifycert; + + if (gnutls_certificate_type_get(m_session) != GNUTLS_CRT_X509) { + m_pOwner->LogMessage(MessageType::Error, _("Unsupported certificate type")); + Failure(0, true); + return FZ_REPLY_ERROR; + } + + cert_list_holder certs; + if (!GetSortedPeerCertificates(certs.certs, certs.certs_size)) { + Failure(0, true); + return FZ_REPLY_ERROR; + } + + gnutls_x509_crt_t root{}; + clone_cert(certs.certs[certs.certs_size - 1], root); + if (!root) { + m_pOwner->LogMessage(MessageType::Error, _("Could not copy certificate")); + Failure(0, true); + return FZ_REPLY_ERROR; + } + + // Our trust-model is user-guided TOFU on the host's certificate. + // + // Here we validate the certificate chain sent by the server on the assumption + // that it's signed by a trusted CA. + // + // For now, add the highest certificate from the chain to trust list. Otherweise + // gnutls_certificate_verify_peers2 always stops with GNUTLS_CERT_SIGNER_NOT_FOUND + // at the highest certificate in the chain. + // + // Actual trust decision is done later by the user. + gnutls_x509_trust_list_t tlist; + gnutls_certificate_get_trust_list(m_certCredentials, &tlist); + if (gnutls_x509_trust_list_add_cas(tlist, &root, 1, 0) != 1) { + m_pOwner->LogMessage(MessageType::Error, _("Could not add certificate to temporary trust list")); + Failure(0, true); + return FZ_REPLY_ERROR; + } + + unsigned int status = 0; + int const verifyResult = gnutls_certificate_verify_peers2(m_session, &status); + + if (verifyResult < 0) { + m_pOwner->LogMessage(MessageType::Debug_Warning, L"gnutls_certificate_verify_peers2 returned %d with status %u", verifyResult, status); + m_pOwner->LogMessage(MessageType::Error, _("Failed to verify peer certificate")); + Failure(0, true); + return FZ_REPLY_ERROR; + } + + if (status != 0) { + PrintVerificationError(status); + + Failure(0, true); + return FZ_REPLY_ERROR; + } + + bool hostnameMismatch = false; + if (!hostname_.empty() && fz::get_address_type(hostname_) == fz::address_type::unknown) { + if (!gnutls_x509_crt_check_hostname(certs.certs[0], fz::to_utf8(hostname_).c_str())) { + hostnameMismatch = true; + m_pOwner->LogMessage(MessageType::Debug_Warning, L"Hostname does not match certificate SANs"); + } + } + + datum_holder cert_der{}; + if (gnutls_x509_crt_export2(certs.certs[0], GNUTLS_X509_FMT_DER, &cert_der) != GNUTLS_E_SUCCESS) { + Failure(0, true); + return FZ_REPLY_ERROR; + } + + if (m_implicitTrustedCert.data) { + if (m_implicitTrustedCert.size != cert_der.size || + memcmp(m_implicitTrustedCert.data, cert_der.data, cert_der.size)) + { + m_pOwner->LogMessage(MessageType::Error, _("Primary connection and data connection certificates don't match.")); + Failure(0, true); + return FZ_REPLY_ERROR; + } + + TrustCurrentCert(true); + + if (m_tlsState != CTlsSocket::TlsState::conn) { + return FZ_REPLY_ERROR; + } + return FZ_REPLY_OK; + } + + m_pOwner->LogMessage(MessageType::Status, _("Verifying certificate...")); + + std::vector certificates; + certificates.reserve(certs.certs_size); + for (unsigned int i = 0; i < certs.certs_size; ++i) { + CCertificate cert; + if (ExtractCert(certs.certs[i], cert)) { + certificates.push_back(cert); + } + else { + Failure(0, true); + return FZ_REPLY_ERROR; + } + } + + if (CertificateIsBlacklisted(certificates)) { + Failure(0, true); + return FZ_REPLY_ERROR; + } + + int const algorithmWarnings = GetAlgorithmWarnings(); + + CCertificateNotification *pNotification = new CCertificateNotification( + fz::to_wstring(hostname_), + port_, + GetProtocolName(), + GetKeyExchange(), + GetCipherName(), + GetMacName(), + algorithmWarnings, + std::move(certificates), + hostnameMismatch); + + // Finally, ask user to verify the certificate chain + m_pOwner->SendAsyncRequest(pNotification); + + return FZ_REPLY_WOULDBLOCK; +} + +void CTlsSocketImpl::OnRateAvailable(CRateLimiter::rate_direction) +{ +} + +std::wstring CTlsSocketImpl::GetProtocolName() +{ + std::wstring ret; + + const char* s = gnutls_protocol_get_name( gnutls_protocol_get_version( m_session ) ); + if (s && *s) { + ret = fz::to_wstring_from_utf8(s); + } + + if (ret.empty()) { + ret = _("unknown"); + } + + return ret; +} + +std::wstring CTlsSocketImpl::GetKeyExchange() +{ + std::wstring ret; + + const char* s = gnutls_kx_get_name( gnutls_kx_get( m_session ) ); + if (s && *s) { + ret = fz::to_wstring_from_utf8(s); + } + + if (ret.empty()) { + ret = _("unknown"); + } + + return ret; +} + +std::wstring CTlsSocketImpl::GetCipherName() +{ + std::wstring ret; + + const char* cipher = gnutls_cipher_get_name(gnutls_cipher_get(m_session)); + if (cipher && *cipher) { + ret = fz::to_wstring_from_utf8(cipher); + } + + if (ret.empty()) { + ret = _("unknown"); + } + + return ret; +} + +std::wstring CTlsSocketImpl::GetMacName() +{ + std::wstring ret; + + const char* mac = gnutls_mac_get_name(gnutls_mac_get(m_session)); + if (mac && *mac) { + ret = fz::to_wstring_from_utf8(mac); + } + + if (ret.empty()) { + ret = _("unknown"); + } + + return ret; +} + +std::string CTlsSocketImpl::ListTlsCiphers(std::string priority) +{ + if (priority.empty()) { + priority = ciphers; + } + + auto list = fz::sprintf("Ciphers for %s:\n", priority); + + gnutls_priority_t pcache; + const char *err = nullptr; + int ret = gnutls_priority_init(&pcache, priority.c_str(), &err); + if (ret < 0) { + list += fz::sprintf("gnutls_priority_init failed with code %d: %s", ret, err ? err : "Unknown error"); + return list; + } + else { + for (size_t i = 0; ; ++i) { + unsigned int idx; + ret = gnutls_priority_get_cipher_suite_index(pcache, i, &idx); + if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { + break; + } + if (ret == GNUTLS_E_UNKNOWN_CIPHER_SUITE) { + continue; + } + + gnutls_protocol_t version; + unsigned char id[2]; + const char* name = gnutls_cipher_suite_info(idx, id, nullptr, nullptr, nullptr, &version); + + if (name != nullptr) { + list += fz::sprintf( + "%-50s 0x%02x, 0x%02x %s\n", + name, + (unsigned char)id[0], + (unsigned char)id[1], + gnutls_protocol_get_name(version)); + } + } + } + + return list; +} + +int CTlsSocketImpl::DoCallGnutlsRecordRecv(void* data, size_t len) +{ + int res = gnutls_record_recv(m_session, data, len); + while( (res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED) && m_canReadFromSocket && !gnutls_record_get_direction(m_session)) { + // Spurious EAGAIN. Can happen if GnuTLS gets a partial + // record and the socket got closed. + // The unexpected close is being ignored in this case, unless + // gnutls_record_recv is being called again. + // Manually call gnutls_record_recv as in case of eof on the socket, + // we are not getting another receive event. + m_pOwner->LogMessage(MessageType::Debug_Verbose, L"gnutls_record_recv returned spurious EAGAIN"); + res = gnutls_record_recv(m_session, data, len); + } + + return res; +} + +std::wstring CTlsSocketImpl::GetGnutlsVersion() +{ + const char* v = gnutls_check_version(nullptr); + if (!v || !*v) { + return L"unknown"; + } + + return fz::to_wstring(v); +} diff -Nru filezilla-3.15.0.2/src/engine/tlssocket_impl.h filezilla-3.33.0/src/engine/tlssocket_impl.h --- filezilla-3.15.0.2/src/engine/tlssocket_impl.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/tlssocket_impl.h 2018-02-05 21:28:24.000000000 +0000 @@ -0,0 +1,144 @@ +#ifndef FILEZILLA_ENGINE_TLSSOCKET_IMPL_HEADER +#define FILEZILLA_ENGINE_TLSSOCKET_IMPL_HEADER + +#if defined(_MSC_VER) +typedef std::make_signed_t ssize_t; +#endif + +#include +#include "backend.h" +#include "socket.h" + +#include + +class CControlSocket; +class CTlsSocket; +class CTlsSocketImpl final +{ +public: + CTlsSocketImpl(CTlsSocket& tlsSocket, fz::socket& pSocket, CControlSocket* pOwner); + ~CTlsSocketImpl(); + + bool Init(); + void Uninit(); + + int Handshake(const CTlsSocketImpl* pPrimarySocket = nullptr, bool try_resume = 0); + + int Read(void *buffer, unsigned int size, int& error); + int Peek(void *buffer, unsigned int size, int& error); + int Write(const void *buffer, unsigned int size, int& error); + + int Shutdown(); + + void TrustCurrentCert(bool trusted); + + CTlsSocket::TlsState GetState() const { return m_tlsState; } + + std::wstring GetProtocolName(); + std::wstring GetKeyExchange(); + std::wstring GetCipherName(); + std::wstring GetMacName(); + int GetAlgorithmWarnings(); + + bool ResumedSession() const; + + static std::string ListTlsCiphers(std::string priority); + + bool SetClientCertificate(fz::native_string const& keyfile, fz::native_string const& certs, fz::native_string const& password); + + static std::wstring GetGnutlsVersion(); + +protected: + + bool InitSession(); + void UninitSession(); + bool CopySessionData(CTlsSocketImpl const* pPrimarySocket); + + void OnRateAvailable(CRateLimiter::rate_direction direction); + + int ContinueHandshake(); + void ContinueShutdown(); + + int VerifyCertificate(); + bool CertificateIsBlacklisted(std::vector const& certificates); + + void LogError(int code, std::wstring const& function, MessageType logLegel = MessageType::Error); + void PrintAlert(MessageType logLevel); + + // Failure logs the error, uninits the session and sends a close event + void Failure(int code, bool send_close, std::wstring const& function = std::wstring()); + + static ssize_t PushFunction(gnutls_transport_ptr_t ptr, const void* data, size_t len); + static ssize_t PullFunction(gnutls_transport_ptr_t ptr, void* data, size_t len); + ssize_t PushFunction(const void* data, size_t len); + ssize_t PullFunction(void* data, size_t len); + + int DoCallGnutlsRecordRecv(void* data, size_t len); + + void TriggerEvents(); + + void operator()(fz::event_base const& ev); + void OnSocketEvent(fz::socket_event_source* source, fz::socket_event_flag t, int error); + + void OnRead(); + void OnSend(); + + bool GetSortedPeerCertificates(gnutls_x509_crt_t *& certs, unsigned int & certs_size); + + bool ExtractCert(gnutls_x509_crt_t const& cert, CCertificate& out); + std::vector GetCertSubjectAltNames(gnutls_x509_crt_t cert); + + void PrintVerificationError(int status); + + CTlsSocket& tlsSocket_; + + CTlsSocket::TlsState m_tlsState{ CTlsSocket::TlsState::noconn }; + + CControlSocket* m_pOwner{}; + + bool m_initialized{}; + gnutls_session_t m_session{}; + + gnutls_certificate_credentials_t m_certCredentials{}; + + bool m_canReadFromSocket{true}; + bool m_canWriteToSocket{true}; + bool m_canCheckCloseSocket{false}; + + bool m_canTriggerRead{false}; + bool m_canTriggerWrite{true}; + + bool m_socketClosed{}; + + fz::socket& m_socket; + std::unique_ptr socketBackend_; + + bool m_shutdown_requested{}; + + // Due to the strange gnutls_record_send semantics, call it again + // with 0 data and 0 length after GNUTLS_E_AGAIN and store the number + // of bytes written. These bytes get skipped on next write from the + // application. + // This avoids the rule to call it again with the -same- data after + // GNUTLS_E_AGAIN. + void CheckResumeFailedReadWrite(); + bool m_lastReadFailed{true}; + bool m_lastWriteFailed{false}; + unsigned int m_writeSkip{}; + + fz::buffer peekBuffer_; + + gnutls_datum_t m_implicitTrustedCert; + + bool m_socket_eof{}; + int m_socket_error{ECONNABORTED}; // Set in the push and pull functions if reading/writing fails fatally + + friend class CTlsSocket; + friend class CTlsSocketCallbacks; + + fz::native_string hostname_; + unsigned int port_{}; + +}; + +#endif diff -Nru filezilla-3.15.0.2/src/engine/transfersocket.cpp filezilla-3.33.0/src/engine/transfersocket.cpp --- filezilla-3.15.0.2/src/engine/transfersocket.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/transfersocket.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,805 +0,0 @@ -#include -#include "directorylistingparser.h" -#include "engineprivate.h" -#include "ftpcontrolsocket.h" -#include "iothread.h" -#include "optionsbase.h" -#include "tlssocket.h" -#include "transfersocket.h" -#include "proxy.h" -#include "servercapabilities.h" - -#include - -CTransferSocket::CTransferSocket(CFileZillaEnginePrivate & engine, CFtpControlSocket & controlSocket, TransferMode transferMode) -: fz::event_handler(controlSocket.event_loop_) -, engine_(engine) -, controlSocket_(controlSocket) -, m_transferMode(transferMode) -{ -} - -CTransferSocket::~CTransferSocket() -{ - remove_handler(); - if (m_transferEndReason == TransferEndReason::none) - m_transferEndReason = TransferEndReason::successful; - ResetSocket(); - - if (m_transferMode == TransferMode::upload || m_transferMode == TransferMode::download) { - if (ioThread_) { - if (m_transferMode == TransferMode::download) - FinalizeWrite(); - ioThread_->SetEventHandler(0); - } - } -} - -void CTransferSocket::ResetSocket() -{ - delete m_pProxyBackend; - if( m_pBackend == m_pTlsSocket ) { - m_pBackend = 0; - } - delete m_pTlsSocket; - delete m_pBackend; - delete m_pSocketServer; - delete m_pSocket; - m_pProxyBackend = 0; - m_pTlsSocket = 0; - m_pBackend = 0; - m_pSocketServer = 0; - m_pSocket = 0; - -} - -wxString CTransferSocket::SetupActiveTransfer(const wxString& ip) -{ - ResetSocket(); - m_pSocketServer = CreateSocketServer(); - - if (!m_pSocketServer) { - controlSocket_.LogMessage(MessageType::Debug_Warning, _T("CreateSocketServer failed")); - return wxString(); - } - - int error; - int port = m_pSocketServer->GetLocalPort(error); - if (port == -1) { - ResetSocket(); - - controlSocket_.LogMessage(MessageType::Debug_Warning, _T("GetLocalPort failed: %s"), CSocket::GetErrorDescription(error)); - return wxString(); - } - - if (engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS)) { - port += static_cast(engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS_OFFSET)); - if (port <= 0 || port >= 65536) { - controlSocket_.LogMessage(MessageType::Debug_Warning, _T("Port outside valid range")); - return wxString(); - } - } - - wxString portArguments; - if (m_pSocketServer->GetAddressFamily() == CSocket::ipv6) { - portArguments = wxString::Format(_T("|2|%s|%d|"), ip, port); - } - else { - portArguments = ip; - portArguments += wxString::Format(_T(",%d,%d"), port / 256, port % 256); - portArguments.Replace(_T("."), _T(",")); - } - - return portArguments; -} - -void CTransferSocket::OnSocketEvent(CSocketEventSource*, SocketEventType t, int error) -{ - if (m_pProxyBackend) - { - switch (t) - { - case SocketEventType::connection: - { - if (error) { - controlSocket_.LogMessage(MessageType::Error, _("Proxy handshake failed: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::failure); - } - else { - delete m_pProxyBackend; - m_pProxyBackend = 0; - OnConnect(); - } - } - return; - case SocketEventType::close: - { - controlSocket_.LogMessage(MessageType::Error, _("Proxy handshake failed: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::failure); - } - return; - default: - // Uninteresting - break; - } - return; - } - - if (m_pSocketServer) { - if (t == SocketEventType::connection) - OnAccept(error); - else - controlSocket_.LogMessage(MessageType::Debug_Info, _T("Unhandled socket event %d from listening socket"), t); - return; - } - - switch (t) - { - case SocketEventType::connection: - if (error) { - if (m_transferEndReason == TransferEndReason::none) { - controlSocket_.LogMessage(MessageType::Error, _("The data connection could not be established: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::transfer_failure); - } - } - else - OnConnect(); - break; - case SocketEventType::read: - OnReceive(); - break; - case SocketEventType::write: - OnSend(); - break; - case SocketEventType::close: - OnClose(error); - break; - default: - // Uninteresting - break; - } -} - -void CTransferSocket::OnAccept(int error) -{ - controlSocket_.SetAlive(); - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("CTransferSocket::OnAccept(%d)"), error); - - if (!m_pSocketServer) - { - controlSocket_.LogMessage(MessageType::Debug_Warning, _T("No socket server in OnAccept"), error); - return; - } - - m_pSocket = m_pSocketServer->Accept(error); - if (!m_pSocket) - { - if (error == EAGAIN) - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("No pending connection")); - else { - controlSocket_.LogMessage(MessageType::Status, _("Could not accept connection: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::transfer_failure); - } - return; - } - delete m_pSocketServer; - m_pSocketServer = 0; - - OnConnect(); -} - -void CTransferSocket::OnConnect() -{ - controlSocket_.SetAlive(); - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("CTransferSocket::OnConnect")); - - if (!m_pSocket) - { - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("CTransferSocket::OnConnect called without socket")); - return; - } - - if (!m_pBackend) - { - if (!InitBackend()) - { - TransferEnd(TransferEndReason::transfer_failure); - return; - } - } - else if (m_pTlsSocket) { - // Re-enable Nagle algorithm - m_pSocket->SetFlags(m_pSocket->GetFlags() & (~CSocket::flag_nodelay)); - if (CServerCapabilities::GetCapability(*controlSocket_.m_pCurrentServer, tls_resume) == unknown) { - CServerCapabilities::SetCapability(*controlSocket_.m_pCurrentServer, tls_resume, m_pTlsSocket->ResumedSession() ? yes : no); - } - } - - if (m_bActive) - TriggerPostponedEvents(); -} - -void CTransferSocket::OnReceive() -{ - controlSocket_.LogMessage(MessageType::Debug_Debug, _T("CTransferSocket::OnReceive(), m_transferMode=%d"), m_transferMode); - - if (!m_pBackend) { - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("Postponing receive, m_pBackend was false.")); - m_postponedReceive = true; - return; - } - - if (!m_bActive) { - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("Postponing receive, m_bActive was false.")); - m_postponedReceive = true; - return; - } - - if (m_transferMode == TransferMode::list) { - for (;;) { - char *pBuffer = new char[4096]; - int error; - int numread = m_pBackend->Read(pBuffer, 4096, error); - if (numread < 0) { - delete [] pBuffer; - if (error != EAGAIN) { - controlSocket_.LogMessage(MessageType::Error, _T("Could not read from transfer socket: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::transfer_failure); - } - else if (m_onCloseCalled && !m_pBackend->IsWaiting(CRateLimiter::inbound)) - TransferEnd(TransferEndReason::successful); - return; - } - - if (numread > 0) { - if (!m_pDirectoryListingParser->AddData(pBuffer, numread)) - { - TransferEnd(TransferEndReason::transfer_failure); - return; - } - - controlSocket_.SetActive(CFileZillaEngine::recv); - if (!m_madeProgress) { - m_madeProgress = 2; - engine_.transfer_status_.SetMadeProgress(); - } - engine_.transfer_status_.Update(numread); - } - else { - delete [] pBuffer; - TransferEnd(TransferEndReason::successful); - return; - } - } - } - else if (m_transferMode == TransferMode::download) { - int error; - int numread; - - // Only do a certain number of iterations in one go to keep the event loop going. - // Otherwise this behaves like a livelock on very large files written to a very fast - // SSD downloaded from a very fast server. - for (int i = 0; i < 100; ++i) { - if (!CheckGetNextWriteBuffer()) - return; - - numread = m_pBackend->Read(m_pTransferBuffer, m_transferBufferLen, error); - if (numread <= 0) { - break; - } - - controlSocket_.SetActive(CFileZillaEngine::recv); - if (!m_madeProgress) { - m_madeProgress = 2; - engine_.transfer_status_.SetMadeProgress(); - } - engine_.transfer_status_.Update(numread); - - m_pTransferBuffer += numread; - m_transferBufferLen -= numread; - } - - if (numread < 0) { - if (error != EAGAIN) { - controlSocket_.LogMessage(MessageType::Error, _T("Could not read from transfer socket: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::transfer_failure); - } - else if (m_onCloseCalled && !m_pBackend->IsWaiting(CRateLimiter::inbound)) { - FinalizeWrite(); - } - } - else if (!numread) { - FinalizeWrite(); - } - else { - send_event(m_pBackend, SocketEventType::read, 0); - } - } - else if (m_transferMode == TransferMode::resumetest) { - for (;;) { - char buffer[2]; - int error; - int numread = m_pBackend->Read(buffer, 2, error); - if (numread < 0) { - if (error != EAGAIN) { - controlSocket_.LogMessage(MessageType::Error, _T("Could not read from transfer socket: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::transfer_failure); - } - else if (m_onCloseCalled && !m_pBackend->IsWaiting(CRateLimiter::inbound)) { - if (m_transferBufferLen == 1) - TransferEnd(TransferEndReason::successful); - else - { - controlSocket_.LogMessage(MessageType::Debug_Warning, _T("Server incorrectly sent %d bytes"), m_transferBufferLen); - TransferEnd(TransferEndReason::failed_resumetest); - } - } - return; - } - - if (!numread) { - if (m_transferBufferLen == 1) - TransferEnd(TransferEndReason::successful); - else { - controlSocket_.LogMessage(MessageType::Debug_Warning, _T("Server incorrectly sent %d bytes"), m_transferBufferLen); - TransferEnd(TransferEndReason::failed_resumetest); - } - return; - } - m_transferBufferLen += numread; - - if (m_transferBufferLen > 1) { - controlSocket_.LogMessage(MessageType::Debug_Warning, _T("Server incorrectly sent %d bytes"), m_transferBufferLen); - TransferEnd(TransferEndReason::failed_resumetest); - return; - } - } - } -} - -void CTransferSocket::OnSend() -{ - if (!m_pBackend) { - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("OnSend called without backend. Ignoring event.")); - return; - } - - if (!m_bActive) { - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("Postponing send")); - m_postponedSend = true; - return; - } - - if (m_transferMode != TransferMode::upload) - return; - - int error; - int written; - - // Only do a certain number of iterations in one go to keep the event loop going. - // Otherwise this behaves like a livelock on very large files read from a very fast - // SSD uploaded to a very fast server. - for (int i = 0; i < 100; ++i) { - if (!CheckGetNextReadBuffer()) - return; - - written = m_pBackend->Write(m_pTransferBuffer, m_transferBufferLen, error); - if (written <= 0) - break; - - controlSocket_.SetActive(CFileZillaEngine::send); - if (m_madeProgress == 1) { - controlSocket_.LogMessage(MessageType::Debug_Debug, _T("Made progress in CTransferSocket::OnSend()")); - m_madeProgress = 2; - engine_.transfer_status_.SetMadeProgress(); - } - engine_.transfer_status_.Update(written); - - m_pTransferBuffer += written; - m_transferBufferLen -= written; - } - - if (written < 0) { - if (error == EAGAIN) { - if (!m_madeProgress) { - controlSocket_.LogMessage(MessageType::Debug_Debug, _T("First EAGAIN in CTransferSocket::OnSend()")); - m_madeProgress = 1; - engine_.transfer_status_.SetMadeProgress(); - } - } - else { - controlSocket_.LogMessage(MessageType::Error, _T("Could not write to transfer socket: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::transfer_failure); - } - } - else if (written > 0) { - send_event(m_pBackend, SocketEventType::write, 0); - } -} - -void CTransferSocket::OnClose(int error) -{ - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("CTransferSocket::OnClose(%d)"), error); - m_onCloseCalled = true; - - if (m_transferEndReason != TransferEndReason::none) - return; - - if (!m_pBackend) { - if (!InitBackend()) { - TransferEnd(TransferEndReason::transfer_failure); - return; - } - } - - if (m_transferMode == TransferMode::upload) { - if (m_shutdown && m_pTlsSocket) { - if (m_pTlsSocket->Shutdown() != 0) - TransferEnd(TransferEndReason::transfer_failure); - else - TransferEnd(TransferEndReason::successful); - } - else - TransferEnd(TransferEndReason::transfer_failure); - return; - } - - if (error) { - controlSocket_.LogMessage(MessageType::Error, _("Transfer connection interrupted: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::transfer_failure); - return; - } - - char buffer[100]; - int numread = m_pBackend->Peek(&buffer, 100, error); - if (numread > 0) { -#ifndef __WXMSW__ - wxFAIL_MSG(_T("Peek isn't supposed to return data after close notification")); -#endif - - // MSDN says this: - // FD_CLOSE being posted after all data is read from a socket. - // An application should check for remaining data upon receipt - // of FD_CLOSE to avoid any possibility of losing data. - // First half is actually plain wrong. - OnReceive(); - - return; - } - else if (numread < 0 && error != EAGAIN) { - controlSocket_.LogMessage(MessageType::Error, _("Transfer connection interrupted: %s"), CSocket::GetErrorDescription(error)); - TransferEnd(TransferEndReason::transfer_failure); - return; - } - - if (m_transferMode == TransferMode::resumetest) { - if (m_transferBufferLen != 1) { - TransferEnd(TransferEndReason::failed_resumetest); - return; - } - } - if (m_transferMode == TransferMode::download) { - FinalizeWrite(); - } - else { - TransferEnd(TransferEndReason::successful); - } -} - -bool CTransferSocket::SetupPassiveTransfer(wxString host, int port) -{ - ResetSocket(); - - m_pSocket = new CSocket(this); - - if (controlSocket_.m_pProxyBackend) { - m_pProxyBackend = new CProxySocket(this, m_pSocket, &controlSocket_); - - int res = m_pProxyBackend->Handshake(controlSocket_.m_pProxyBackend->GetProxyType(), - host, port, - controlSocket_.m_pProxyBackend->GetUser(), controlSocket_.m_pProxyBackend->GetPass()); - - if (res != EINPROGRESS) { - ResetSocket(); - return false; - } - int error; - host = controlSocket_.m_pSocket->GetPeerIP(); - port = controlSocket_.m_pSocket->GetRemotePort(error); - if (host.empty() || port < 1) { - controlSocket_.LogMessage(MessageType::Debug_Warning, _T("Could not get peer address of control connection.")); - ResetSocket(); - return false; - } - } - - SetSocketBufferSizes(m_pSocket); - - // Try to bind the source IP of the data connection to the same IP as the control connection. - // We can do so either if - // 1) the destination IP of the data connection matches peer IP of the control connection or - // 2) we are using a proxy. - // - // In case destination IPs of control and data connection are different, do not bind to the - // same source. - - wxString bindAddress; - if (m_pProxyBackend) { - bindAddress = controlSocket_.m_pSocket->GetLocalIP(); - controlSocket_.LogMessage(MessageType::Debug_Info, _T("Binding data connection source IP to control connection source IP %s"), bindAddress); - } - else { - if (controlSocket_.m_pSocket->GetPeerIP(true) == host || controlSocket_.m_pSocket->GetPeerIP(false) == host) { - bindAddress = controlSocket_.m_pSocket->GetLocalIP(); - controlSocket_.LogMessage(MessageType::Debug_Info, _T("Binding data connection source IP to control connection source IP %s"), bindAddress); - } - else { - controlSocket_.LogMessage(MessageType::Debug_Warning, _T("Destination IP of data connection does not match peer IP of control connection. Not binding source address of data connection.")); - } - } - - int res = m_pSocket->Connect(host, port, CSocket::unspec, bindAddress); - if (res && res != EINPROGRESS) { - ResetSocket(); - return false; - } - - return true; -} - -void CTransferSocket::SetActive() -{ - if (m_transferEndReason != TransferEndReason::none) - return; - if (m_transferMode == TransferMode::download || m_transferMode == TransferMode::upload) { - if (ioThread_) { - ioThread_->SetEventHandler(this); - } - } - - m_bActive = true; - if (!m_pSocket) - return; - - if (m_pSocket->GetState() == CSocket::connected || m_pSocket->GetState() == CSocket::closing) - TriggerPostponedEvents(); -} - -void CTransferSocket::TransferEnd(TransferEndReason reason) -{ - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("CTransferSocket::TransferEnd(%d)"), reason); - - if (m_transferEndReason != TransferEndReason::none) - return; - m_transferEndReason = reason; - - ResetSocket(); - - engine_.send_event(engineTransferEnd); -} - -CSocket* CTransferSocket::CreateSocketServer(int port) -{ - CSocket* pServer = new CSocket(this); - int res = pServer->Listen(controlSocket_.m_pSocket->GetAddressFamily(), port); - if (res) { - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("Could not listen on port %d: %s"), port, CSocket::GetErrorDescription(res)); - delete pServer; - return 0; - } - - SetSocketBufferSizes(pServer); - - return pServer; -} - -CSocket* CTransferSocket::CreateSocketServer() -{ - if (!engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS)) { - // Ask the systen for a port - CSocket* pServer = CreateSocketServer(0); - return pServer; - } - - // Try out all ports in the port range. - // Upon first call, we try to use a random port fist, after that - // increase the port step by step - - // Windows only: I think there's a bug in the socket implementation of - // Windows: Even if using SO_REUSEADDR, using the same local address - // twice will fail unless there are a couple of minutes between the - // connection attempts. This may cause problems if transferring lots of - // files with a narrow port range. - - static int start = 0; - - int low = engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS_LOW); - int high = engine_.GetOptions().GetOptionVal(OPTION_LIMITPORTS_HIGH); - if (low > high) - low = high; - - if (start < low || start > high) { - start = fz::random_number(low, high); - wxASSERT(start >= low && start <= high); - } - - CSocket* pServer = 0; - - int count = high - low + 1; - while (count--) { - pServer = CreateSocketServer(start++); - if (pServer) - break; - if (start > high) - start = low; - } - - return pServer; -} - -bool CTransferSocket::CheckGetNextWriteBuffer() -{ - if (!m_transferBufferLen) { - int res = ioThread_->GetNextWriteBuffer(&m_pTransferBuffer); - - if (res == IO_Again) - return false; - else if (res == IO_Error) { - wxString error = ioThread_->GetError(); - if (error.empty() ) - controlSocket_.LogMessage(MessageType::Error, _("Can't write data to file.")); - else - controlSocket_.LogMessage(MessageType::Error, _("Can't write data to file: %s"), error); - TransferEnd(TransferEndReason::transfer_failure_critical); - return false; - } - - m_transferBufferLen = BUFFERSIZE; - } - - return true; -} - -bool CTransferSocket::CheckGetNextReadBuffer() -{ - if (!m_transferBufferLen) { - int res = ioThread_->GetNextReadBuffer(&m_pTransferBuffer); - if (res == IO_Again) - return false; - else if (res == IO_Error) { - controlSocket_.LogMessage(MessageType::Error, _("Can't read from file")); - TransferEnd(TransferEndReason::transfer_failure); - return false; - } - else if (res == IO_Success) { - if (m_pTlsSocket) { - m_shutdown = true; - - int error = m_pTlsSocket->Shutdown(); - if (error != 0) { - if (error != EAGAIN) - TransferEnd(TransferEndReason::transfer_failure); - return false; - } - } - TransferEnd(TransferEndReason::successful); - return false; - } - m_transferBufferLen = res; - } - - return true; -} - -void CTransferSocket::OnIOThreadEvent() -{ - if (!m_bActive || m_transferEndReason != TransferEndReason::none) - return; - - if (m_transferMode == TransferMode::download) - OnReceive(); - else if (m_transferMode == TransferMode::upload) - OnSend(); -} - -void CTransferSocket::FinalizeWrite() -{ - bool res = ioThread_->Finalize(BUFFERSIZE - m_transferBufferLen); - m_transferBufferLen = BUFFERSIZE; - - if (m_transferEndReason != TransferEndReason::none) - return; - - if (res) - TransferEnd(TransferEndReason::successful); - else { - wxString error = ioThread_->GetError(); - if (error.empty()) - controlSocket_.LogMessage(MessageType::Error, _("Can't write data to file.")); - else - controlSocket_.LogMessage(MessageType::Error, _("Can't write data to file: %s"), error); - TransferEnd(TransferEndReason::transfer_failure_critical); - } -} - -bool CTransferSocket::InitTls(const CTlsSocket* pPrimaryTlsSocket) -{ - // Disable Nagle algorithm during TlS handshake - m_pSocket->SetFlags(m_pSocket->GetFlags() | CSocket::flag_nodelay); - - wxASSERT(!m_pBackend); - m_pTlsSocket = new CTlsSocket(this, *m_pSocket, &controlSocket_); - - if (!m_pTlsSocket->Init()) { - delete m_pTlsSocket; - m_pTlsSocket = 0; - return false; - } - - bool try_resume = CServerCapabilities::GetCapability(*controlSocket_.m_pCurrentServer, tls_resume) != no; - - int res = m_pTlsSocket->Handshake(pPrimaryTlsSocket, try_resume); - if (res && res != FZ_REPLY_WOULDBLOCK) - { - delete m_pTlsSocket; - m_pTlsSocket = 0; - return false; - } - - m_pBackend = m_pTlsSocket; - - return true; -} - -void CTransferSocket::TriggerPostponedEvents() -{ - wxASSERT(m_bActive); - - if (m_postponedReceive) { - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("Executing postponed receive")); - m_postponedReceive = false; - OnReceive(); - if (m_transferEndReason != TransferEndReason::none) - return; - } - if (m_postponedSend) { - controlSocket_.LogMessage(MessageType::Debug_Verbose, _T("Executing postponed send")); - m_postponedSend = false; - OnSend(); - if (m_transferEndReason != TransferEndReason::none) - return; - } - if (m_onCloseCalled) - OnClose(0); -} - -bool CTransferSocket::InitBackend() -{ - if (m_pBackend) - return true; - - if (controlSocket_.m_protectDataChannel) { - if (!InitTls(controlSocket_.m_pTlsSocket)) - return false; - } - else - m_pBackend = new CSocketBackend(this, *m_pSocket, engine_.GetRateLimiter()); - - return true; -} - -void CTransferSocket::SetSocketBufferSizes(CSocket* pSocket) -{ - wxCHECK_RET(pSocket, _("SetSocketBufferSize called without socket")); - - const int size_read = engine_.GetOptions().GetOptionVal(OPTION_SOCKET_BUFFERSIZE_RECV); - const int size_write = engine_.GetOptions().GetOptionVal(OPTION_SOCKET_BUFFERSIZE_SEND); - pSocket->SetBufferSizes(size_read, size_write); -} - -void CTransferSocket::operator()(fz::event_base const& ev) -{ - fz::dispatch(ev, this, - &CTransferSocket::OnSocketEvent, - &CTransferSocket::OnIOThreadEvent); -} diff -Nru filezilla-3.15.0.2/src/engine/transfersocket.h filezilla-3.33.0/src/engine/transfersocket.h --- filezilla-3.15.0.2/src/engine/transfersocket.h 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/engine/transfersocket.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -#ifndef __TRANSFERSOCKET_H__ -#define __TRANSFERSOCKET_H__ - -#include "iothread.h" -#include "backend.h" -#include "ControlSocket.h" - -class CFileZillaEnginePrivate; -class CFtpControlSocket; -class CDirectoryListingParser; - -enum class TransferMode -{ - list, - upload, - download, - resumetest -}; - -class CIOThread; -class CTlsSocket; -class CTransferSocket final : public fz::event_handler -{ -public: - CTransferSocket(CFileZillaEnginePrivate & engine, CFtpControlSocket & controlSocket, TransferMode transferMode); - virtual ~CTransferSocket(); - - wxString SetupActiveTransfer(const wxString& ip); - bool SetupPassiveTransfer(wxString host, int port); - - void SetActive(); - - CDirectoryListingParser *m_pDirectoryListingParser{}; - - bool m_binaryMode{true}; - - TransferEndReason GetTransferEndreason() const { return m_transferEndReason; } - - void SetIOThread(CIOThread* ioThread) { ioThread_ = ioThread; } - -protected: - bool CheckGetNextWriteBuffer(); - bool CheckGetNextReadBuffer(); - void FinalizeWrite(); - - void TransferEnd(TransferEndReason reason); - - bool InitBackend(); - bool InitTls(const CTlsSocket* pPrimaryTlsSocket); - - void ResetSocket(); - - void OnSocketEvent(CSocketEventSource* source, SocketEventType t, int error); - void OnConnect(); - void OnAccept(int error); - void OnReceive(); - void OnSend(); - void OnClose(int error); - - // Create a socket server - CSocket* CreateSocketServer(); - CSocket* CreateSocketServer(int port); - - void SetSocketBufferSizes(CSocket* pSocket); - - virtual void operator()(fz::event_base const& ev); - void OnIOThreadEvent(); - - CSocket *m_pSocket{}; - - // Will be set only while creating active mode connections - CSocket* m_pSocketServer{}; - - CFileZillaEnginePrivate & engine_; - CFtpControlSocket & controlSocket_; - - bool m_bActive{}; - TransferEndReason m_transferEndReason{TransferEndReason::none}; - - TransferMode const m_transferMode; - - char *m_pTransferBuffer{}; - int m_transferBufferLen{}; - - // Set to true if OnClose got called - // We now have to read all available data in the socket, ignoring any - // speed limits - bool m_onCloseCalled{}; - - bool m_postponedReceive{}; - bool m_postponedSend{}; - void TriggerPostponedEvents(); - - CBackend* m_pBackend{}; - - CProxySocket* m_pProxyBackend{}; - - CTlsSocket* m_pTlsSocket{}; - bool m_shutdown{}; - - // Needed for the madeProgress field in CTransferStatus - // Initially 0, 2 if made progress - // On uploads, 1 after first WSAE_WOULDBLOCK - int m_madeProgress{}; - - CIOThread* ioThread_{}; -}; - -#endif diff -Nru filezilla-3.15.0.2/src/engine/xmlutils.cpp filezilla-3.33.0/src/engine/xmlutils.cpp --- filezilla-3.15.0.2/src/engine/xmlutils.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/engine/xmlutils.cpp 2018-01-05 15:02:30.000000000 +0000 @@ -0,0 +1,154 @@ +#include +#include "xmlutils.h" + +#include +#include + +pugi::xml_node AddTextElement(pugi::xml_node node, const char* name, std::string const& value, bool overwrite) +{ + return AddTextElementUtf8(node, name, fz::to_utf8(value), overwrite); +} + +pugi::xml_node AddTextElement(pugi::xml_node node, const char* name, std::wstring const& value, bool overwrite) +{ + return AddTextElementUtf8(node, name, fz::to_utf8(value), overwrite); +} + +void AddTextElement(pugi::xml_node node, const char* name, int64_t value, bool overwrite) +{ + if (overwrite) { + node.remove_child(name); + } + auto child = node.append_child(name); + child.text().set(static_cast(value)); +} + +pugi::xml_node AddTextElementUtf8(pugi::xml_node node, const char* name, std::string const& value, bool overwrite) +{ + assert(node); + + if (overwrite) { + node.remove_child(name); + } + + auto element = node.append_child(name); + if (!value.empty()) { + element.text().set(value.c_str()); + } + + return element; +} + +void AddTextElement(pugi::xml_node node, std::string const& value) +{ + AddTextElementUtf8(node, fz::to_utf8(value)); +} + +void AddTextElement(pugi::xml_node node, std::wstring const& value) +{ + AddTextElementUtf8(node, fz::to_utf8(value)); +} + +void AddTextElement(pugi::xml_node node, int64_t value) +{ + assert(node); + node.text().set(static_cast(value)); +} + +void AddTextElementUtf8(pugi::xml_node node, std::string const& value) +{ + assert(node); + node.text().set(value.c_str()); +} + +std::wstring GetTextElement_Trimmed(pugi::xml_node node, const char* name) +{ + return fz::trimmed(GetTextElement(node, name)); +} + +std::wstring GetTextElement(pugi::xml_node node, const char* name) +{ + assert(node); + + return fz::to_wstring_from_utf8(node.child_value(name)); +} + +std::wstring GetTextElement_Trimmed(pugi::xml_node node) +{ + return fz::trimmed(GetTextElement(node)); +} + +std::wstring GetTextElement(pugi::xml_node node) +{ + assert(node); + return fz::to_wstring_from_utf8(node.child_value()); +} + +int64_t GetTextElementInt(pugi::xml_node node, const char* name, int defValue /*=0*/) +{ + assert(node); + return static_cast(node.child(name).text().as_llong(defValue)); +} + +bool GetTextElementBool(pugi::xml_node node, const char* name, bool defValue /*=false*/) +{ + assert(node); + return node.child(name).text().as_bool(defValue); +} + +void SetTextAttribute(pugi::xml_node node, char const* name, std::string const& value) +{ + SetTextAttributeUtf8(node, name, fz::to_utf8(value)); +} + +void SetTextAttribute(pugi::xml_node node, char const* name, std::wstring const& value) +{ + SetTextAttributeUtf8(node, name, fz::to_utf8(value)); +} + +void SetTextAttributeUtf8(pugi::xml_node node, char const* name, std::string const& utf8) +{ + assert(node); + auto attribute = node.attribute(name); + if (!attribute) { + attribute = node.append_attribute(name); + } + attribute.set_value(utf8.c_str()); +} + +std::wstring GetTextAttribute(pugi::xml_node node, char const* name) +{ + assert(node); + + const char* value = node.attribute(name).value(); + return fz::to_wstring_from_utf8(value); +} + +pugi::xml_node FindElementWithAttribute(pugi::xml_node node, const char* element, const char* attribute, const char* value) +{ + pugi::xml_node child = element ? node.child(element) : node.first_child(); + while (child) { + const char* nodeVal = child.attribute(attribute).value(); + if (nodeVal && !strcmp(value, nodeVal)) { + return child; + } + + child = element ? child.next_sibling(element) : child.next_sibling(); + } + + return child; +} + +int GetAttributeInt(pugi::xml_node node, const char* name) +{ + return node.attribute(name).as_int(); +} + +void SetAttributeInt(pugi::xml_node node, const char* name, int value) +{ + auto attribute = node.attribute(name); + if (!attribute) { + attribute = node.append_attribute(name); + } + attribute.set_value(value); +} diff -Nru filezilla-3.15.0.2/src/FileZilla.sln filezilla-3.33.0/src/FileZilla.sln --- filezilla-3.15.0.2/src/FileZilla.sln 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/FileZilla.sln 2017-09-19 21:36:39.000000000 +0000 @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcxproj", "{AAD2642D-D07A-4415-BB32-D678D89D546F}" EndProject diff -Nru filezilla-3.15.0.2/src/fzshellext/aclocal.m4 filezilla-3.33.0/src/fzshellext/aclocal.m4 --- filezilla-3.15.0.2/src/fzshellext/aclocal.m4 2016-02-10 19:38:47.000000000 +0000 +++ filezilla-3.33.0/src/fzshellext/aclocal.m4 2018-05-07 08:45:22.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +332,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -408,7 +408,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -498,8 +498,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -573,6 +573,9 @@ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -602,7 +605,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -613,7 +616,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -623,7 +626,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -644,7 +647,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -694,7 +697,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -733,7 +736,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -762,7 +765,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -809,7 +812,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -828,7 +831,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -909,7 +912,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -969,7 +972,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -997,7 +1000,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1016,7 +1019,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru filezilla-3.15.0.2/src/fzshellext/config.h.in filezilla-3.33.0/src/fzshellext/config.h.in --- filezilla-3.15.0.2/src/fzshellext/config.h.in 2016-02-10 19:38:48.000000000 +0000 +++ filezilla-3.33.0/src/fzshellext/config.h.in 2018-05-07 08:45:22.000000000 +0000 @@ -36,8 +36,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -Nru filezilla-3.15.0.2/src/fzshellext/configure filezilla-3.33.0/src/fzshellext/configure --- filezilla-3.15.0.2/src/fzshellext/configure 2016-02-10 19:38:48.000000000 +0000 +++ filezilla-3.33.0/src/fzshellext/configure 2018-05-07 08:45:22.000000000 +0000 @@ -643,13 +643,8 @@ WINDRES HAVE_CXX14 CXXCPP -am__fastdepCXX_FALSE -am__fastdepCXX_TRUE -CXXDEPMODE -ac_ct_CXX -CXXFLAGS -CXX CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -670,6 +665,13 @@ EGREP GREP SED +LIBTOOL +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +ac_ct_CXX +CXXFLAGS +CXX am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -687,7 +689,6 @@ LDFLAGS CFLAGS CC -LIBTOOL host_os host_vendor host_cpu @@ -742,6 +743,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -766,11 +768,12 @@ enable_option_checking enable_silent_rules enable_shellext +enable_dependency_tracking enable_shared enable_static with_pic enable_fast_install -enable_dependency_tracking +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -783,10 +786,11 @@ LDFLAGS LIBS CPPFLAGS -CPP CXX CXXFLAGS CCC +LT_SYS_LIBRARY_PATH +CPP CXXCPP' @@ -826,6 +830,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1078,6 +1083,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1215,7 +1229,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1368,6 +1382,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1409,14 +1424,14 @@ --enable-silent-rules less verbose build output (undo: "make V=1") --disable-silent-rules verbose build output (undo: "make V=0") --disable-shellext Disable shellextension - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] --enable-dependency-tracking do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) Optional Packages: @@ -1424,9 +1439,12 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). Some influential environment variables: CC C compiler command @@ -1436,9 +1454,11 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. + CPP C preprocessor CXXCPP C++ preprocessor Use these variables to override the choices made by `configure' or to help @@ -1560,6 +1580,44 @@ } # ac_fn_c_try_compile +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1783,44 +1841,6 @@ } # ac_fn_c_check_func -# ac_fn_cxx_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_compile - # ac_fn_cxx_try_cpp LINENO # ------------------------ # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -2378,7 +2398,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2570,7 +2590,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2898,8 +2918,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3039,297 +3059,141 @@ -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.4.2' -macro_revision='1.3337' - - - - - - - - +# Work around libtool bug, it strips -static-libgcc... +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -ltmain="$ac_aux_dir/ltmain.sh" + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi fi @@ -4043,6 +3907,69 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + depcc="$CC" am_compiler_list= @@ -4172,155 +4099,652 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" - - - - - - - - - +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - ac_cv_path_GREP=$GREP + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" + test -n "$ac_ct_CXX" && break +done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +else + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + 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". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + + +if echo "$LDFLAGS" | grep -e '\(^\|\s\)-static-libgcc\b' >/dev/null 2>&1; then + if ! echo "$CXX" | grep -e '\(^\|\s\)-static-libgcc\b' >/dev/null 2>&1; then + CXX="$CXX -static-libgcc" + fi + if ! echo "$CC" | grep -e '\(^\|\s\)-static-libgcc\b' >/dev/null 2>&1; then + CC="$CC -static-libgcc" + fi +fi +if echo "$LDFLAGS" | grep -e '\(^\|\s\)-static-libstdc++\($\|\s\)' >/dev/null 2>&1; then + if ! echo "$CXX" | grep -e '\(^\|\s\)-static-libstdc++\($\|\s\)' >/dev/null 2>&1; then + CXX="$CXX -static-libstdc++" + fi + if ! echo "$CC" | grep -e '\(^\|\s\)-static-libstdc++\($\|\s\)' >/dev/null 2>&1; then + CC="$CC -static-libstdc++" + fi +fi + + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.4.6' +macro_revision='2.4.6' + + + + + + + + + + + + + +ltmain=$ac_aux_dir/ltmain.sh + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case $ECHO in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" @@ -4473,19 +4897,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -4499,7 +4923,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -4510,7 +4934,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -4521,32 +4945,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -4589,33 +5013,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -4626,15 +5055,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -4740,9 +5169,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -4750,8 +5179,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -4802,7 +5231,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -4842,7 +5271,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -4893,22 +5322,22 @@ *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -4926,7 +5355,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -4944,30 +5373,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -5090,13 +5495,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -5224,13 +5629,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -5257,8 +5662,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5354,8 +5758,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -5408,6 +5812,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -5565,8 +5972,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -5578,7 +5985,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -5733,7 +6140,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -5741,7 +6148,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -5754,7 +6161,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -5971,7 +6378,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -6061,7 +6468,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -6094,14 +6501,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6119,21 +6556,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -6181,11 +6621,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -6211,7 +6651,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -6231,13 +6671,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -6258,7 +6698,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -6311,6 +6751,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -6323,9 +6773,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -6335,8 +6785,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -6348,18 +6798,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6368,24 +6899,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -6414,9 +6946,50 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6439,10 +7012,10 @@ ;; esac ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6461,10 +7034,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -6482,7 +7055,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -6522,13 +7095,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6540,7 +7114,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -6549,7 +7123,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -6565,7 +7139,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -6676,7 +7250,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -7179,7 +7753,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -7197,7 +7771,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7236,7 +7810,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -7265,7 +7839,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7278,32 +7852,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7311,6 +7885,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7594,6 +8203,17 @@ +func_stripname_cnf () +{ + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;; + esac +} # func_stripname_cnf + + + + # Set options @@ -7614,14 +8234,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7645,14 +8265,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7676,14 +8296,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7691,8 +8311,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -7708,14 +8326,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7729,11 +8347,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -7782,7 +8452,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -7821,7 +8491,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -7832,14 +8502,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -7848,15 +8518,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -7871,22 +8534,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -7909,13 +8572,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -7937,22 +8600,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -7975,13 +8638,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8002,7 +8665,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8064,7 +8727,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -8080,7 +8743,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8110,7 +8773,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -8128,17 +8791,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -8149,8 +8813,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -8166,6 +8830,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -8236,7 +8905,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -8244,10 +8913,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -8263,7 +8951,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -8274,7 +8962,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -8299,6 +8987,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -8396,7 +9090,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -8425,7 +9119,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -8457,7 +9151,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8487,7 +9181,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -8519,7 +9213,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -8538,13 +9232,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -8664,8 +9358,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -8677,9 +9371,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -8722,9 +9416,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -8739,7 +9433,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -8747,7 +9441,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; linux* | k*bsd*-gnu | gnu*) @@ -8760,7 +9454,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -8782,24 +9476,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -8812,7 +9506,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -8831,7 +9525,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -8847,7 +9541,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -8857,7 +9551,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8865,61 +9559,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -8930,42 +9652,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -8979,8 +9706,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -8998,8 +9725,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9011,7 +9738,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -9026,9 +9753,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9045,15 +9772,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -9069,7 +9796,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -9077,34 +9804,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -9123,13 +9873,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -9148,36 +9906,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi - link_all_deplibs=no + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9212,7 +9976,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9220,17 +9984,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9265,7 +10029,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9273,21 +10037,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -9296,7 +10072,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9326,16 +10102,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -9344,18 +10121,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -9364,7 +10141,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -9383,24 +10160,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -9442,33 +10219,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -9476,25 +10253,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -9506,7 +10283,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9525,14 +10302,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -9540,8 +10317,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -9552,7 +10329,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -9563,8 +10340,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -9574,8 +10351,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -9587,24 +10364,35 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + link_all_deplibs=no else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -9619,7 +10407,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -9627,27 +10415,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -9658,33 +10438,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -9695,24 +10495,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -9722,11 +10522,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -9736,10 +10536,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -9788,43 +10588,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -9839,10 +10639,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -9850,7 +10650,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -9876,7 +10676,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -10091,14 +10891,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -10114,28 +10914,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -10149,7 +10956,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -10158,7 +10965,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -10175,14 +10982,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -10190,41 +10999,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -10234,18 +11093,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -10253,8 +11112,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -10266,7 +11125,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -10275,8 +11134,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -10292,17 +11151,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -10311,8 +11170,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -10339,7 +11198,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -10352,8 +11211,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -10366,7 +11225,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -10379,8 +11238,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -10393,8 +11252,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -10412,12 +11271,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -10447,10 +11307,10 @@ need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -10468,14 +11328,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -10483,8 +11344,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -10493,8 +11354,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -10507,8 +11368,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10519,7 +11380,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -10527,8 +11388,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -10547,8 +11408,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -10557,13 +11418,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10607,7 +11488,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -10639,12 +11525,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -10654,7 +11540,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -10663,58 +11549,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -10725,8 +11621,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -10736,11 +11632,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -10748,8 +11644,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -10770,24 +11666,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -10805,7 +11701,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -10813,8 +11709,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -10824,20 +11720,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -10934,15 +11845,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -10957,12 +11868,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -10972,7 +11883,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -10982,23 +11893,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -11036,10 +11947,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -11047,10 +11958,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -11089,11 +12008,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -11132,7 +12051,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -11171,7 +12090,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -11210,7 +12129,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11231,21 +12150,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -11253,7 +12172,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11300,9 +12219,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11332,7 +12251,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11352,14 +12271,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11406,9 +12325,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11438,7 +12357,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11446,563 +12365,149 @@ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - - - - - - - - - - - - - - - - -striplib= -old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi - - - - - - - - - - - - - # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } - - - - -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - - - - - - - - - - - - - - - ac_config_commands="$ac_config_commands libtool" - - - - -# Only expand once: - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX + else : + # compilation failed + lt_cv_dlopen_self_static=no fi fi +rm -fr conftest* + - fi fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + ;; + esac -int -main () -{ -#ifndef __GNUC__ - choke me -#endif + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - cd .. - rm -rf conftest.dir + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - am_cv_CXX_dependencies_compiler_type=none +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + + + + + + # Report what library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; esac -} # func_stripname_cnf + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } + + + + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC=$lt_save_CC - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -12181,7 +12686,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -12242,46 +12747,39 @@ CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + func_cc_basename $compiler +cc_basename=$func_cc_basename_result if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' else lt_prog_compiler_no_builtin_flag_CXX= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -12295,7 +12793,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -12306,7 +12804,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -12317,32 +12815,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -12378,22 +12876,22 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec_CXX= fi @@ -12430,18 +12928,30 @@ ld_shlibs_CXX=no ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -12451,6 +12961,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -12469,13 +12986,21 @@ hardcode_direct_absolute_CXX=yes hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' + file_list_spec_CXX='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct_CXX=no + hardcode_direct_absolute_CXX=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -12493,36 +13018,44 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec_CXX='${wl}-bexpall' + export_dynamic_flag_spec_CXX='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' + # The "-G" linker flag allows undefined symbols. + no_undefined_flag_CXX='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -12557,7 +13090,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -12565,18 +13098,18 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -12611,7 +13144,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -12619,22 +13152,34 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag_CXX=' $wl-bernotok' + allow_undefined_flag_CXX=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec_CXX='$convenience' fi archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -12644,7 +13189,7 @@ allow_undefined_flag_CXX=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs_CXX=no fi @@ -12672,57 +13217,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' enable_shared_with_static_runtimes_CXX=yes # Don't use ranlib old_postinstall_cmds_CXX='chmod 644 $oldlib' postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + export_dynamic_flag_spec_CXX='$wl--export-all-symbols' allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi @@ -12736,27 +13282,27 @@ hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec_CXX='' fi link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + allow_undefined_flag_CXX=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + if test yes != "$lt_cv_apple_cc_single_mod"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi else @@ -12765,6 +13311,34 @@ ;; + os2*) + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_minus_L_CXX=yes + allow_undefined_flag_CXX=unsupported + shrext_cmds=.dll + archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes_CXX=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -12800,14 +13374,14 @@ ;; haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes ;; hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' hardcode_direct_CXX=yes hardcode_minus_L_CXX=yes # Not in the search PATH, # but as the default @@ -12819,7 +13393,7 @@ ld_shlibs_CXX=no ;; aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -12828,11 +13402,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -12842,15 +13416,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: case $host_cpu in hppa*64*|ia64*) ;; *) - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' ;; esac fi @@ -12876,13 +13450,13 @@ aCC*) case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -12893,20 +13467,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -12921,22 +13495,22 @@ interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -12945,17 +13519,17 @@ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: inherit_rpath_CXX=yes ;; @@ -12968,8 +13542,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -12978,10 +13552,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -12995,59 +13569,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -13061,18 +13635,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -13080,10 +13654,10 @@ *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on @@ -13141,22 +13715,17 @@ ld_shlibs_CXX=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct_CXX=yes hardcode_shlibpath_var_CXX=no hardcode_direct_absolute_CXX=yes archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='$wl-E' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -13172,9 +13741,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' hardcode_libdir_separator_CXX=: # Archives containing C++ object files must be created using @@ -13192,17 +13761,17 @@ cxx*) case $host in osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; esac @@ -13217,21 +13786,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: # Commands to make compiler produce verbose output that lists @@ -13277,9 +13846,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no @@ -13287,7 +13856,7 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; @@ -13304,30 +13873,30 @@ ;; gcx*) # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + no_undefined_flag_CXX=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -13335,11 +13904,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -13348,52 +13917,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' + no_undefined_flag_CXX='$wl-z,text' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' + no_undefined_flag_CXX='$wl-z,text' + allow_undefined_flag_CXX='$wl-z,nodefs' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R,$libdir' hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' + export_dynamic_flag_spec_CXX='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" + '"$old_archive_cmds_CXX" reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" + '"$reload_cmds_CXX" ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -13425,10 +13994,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no + test no = "$ld_shlibs_CXX" && can_build_shared=no - GCC_CXX="$GXX" - LD_CXX="$LD" + GCC_CXX=$GXX + LD_CXX=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -13472,13 +14041,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -13494,16 +14063,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" + compiler_lib_search_path_CXX=$prev$p else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -13511,9 +14080,9 @@ esac else if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" + postdeps_CXX=$prev$p else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" + postdeps_CXX="${postdeps_CXX} $prev$p" fi fi prev= @@ -13528,15 +14097,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" + predep_objects_CXX=$p else predep_objects_CXX="$predep_objects_CXX $p" fi else if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" + postdep_objects_CXX=$p else postdep_objects_CXX="$postdep_objects_CXX $p" fi @@ -13566,51 +14135,6 @@ postdep_objects_CXX= postdeps_CXX= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac @@ -13619,7 +14143,7 @@ esac compiler_lib_search_dirs_CXX= if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi @@ -13658,17 +14182,18 @@ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' fi + lt_prog_compiler_pic_CXX='-fPIC' ;; amigaos*) @@ -13679,8 +14204,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -13695,6 +14220,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static_CXX='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -13744,7 +14274,7 @@ case $host_os in aix[4-9]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' else @@ -13784,14 +14314,14 @@ case $cc_basename in CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then lt_prog_compiler_pic_CXX='+Z' fi ;; aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -13828,7 +14358,7 @@ lt_prog_compiler_pic_CXX='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' @@ -13973,7 +14503,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= ;; @@ -14005,7 +14535,7 @@ lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -14035,7 +14565,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -14061,7 +14591,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -14080,13 +14610,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then : else lt_prog_compiler_static_CXX= @@ -14200,8 +14730,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -14213,9 +14743,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -14232,17 +14762,21 @@ case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" + export_symbols_cmds_CXX=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -14265,7 +14799,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no +test no = "$ld_shlibs_CXX" && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -14282,7 +14816,7 @@ # Assume -lc should be added archive_cmds_need_lc_CXX=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds_CXX in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -14410,7 +14944,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -14427,14 +14961,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -14442,41 +14978,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -14486,18 +15072,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -14505,8 +15091,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -14518,7 +15104,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -14527,8 +15113,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -14544,16 +15130,16 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -14562,8 +15148,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -14590,7 +15176,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -14603,8 +15189,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -14617,7 +15203,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -14630,8 +15216,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -14643,8 +15229,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -14662,12 +15248,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -14697,10 +15284,10 @@ need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -14718,14 +15305,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -14733,8 +15321,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -14743,8 +15331,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -14757,8 +15345,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -14769,7 +15357,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -14777,8 +15365,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -14797,8 +15385,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -14807,13 +15395,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; + # This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -14857,7 +15465,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -14889,12 +15502,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -14904,7 +15517,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -14913,58 +15526,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -14975,8 +15598,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -14986,11 +15609,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -14998,8 +15621,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -15020,24 +15643,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -15055,7 +15678,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -15063,8 +15686,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -15074,20 +15697,32 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + @@ -15130,15 +15765,15 @@ hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then + test yes = "$hardcode_automatic_CXX"; then # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && + if test no != "$hardcode_direct_CXX" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" && + test no != "$hardcode_minus_L_CXX"; then # Linking always hardcodes the temporary library directory. hardcode_action_CXX=relink else @@ -15153,12 +15788,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then +if test relink = "$hardcode_action_CXX" || + test yes = "$inherit_rpath_CXX"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -15181,7 +15816,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -15191,6 +15826,28 @@ + + + + + + + + + + + + + ac_config_commands="$ac_config_commands libtool" + + + + +# Only expand once: + + + + if test "x$build_shellext" = "xyes"; then cat >confcache <<\_ACEOF @@ -15296,6 +15953,7 @@ # Weird compiler, trust it in blind faith matching=1 fi + if test "x$matching" = "x1"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -15944,7 +16602,8 @@ main () { - ICopyHookW* foo; + ICopyHookW* foo; + (void)foo; return 0; ; @@ -17017,6 +17676,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -17066,10 +17726,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -17134,7 +17797,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -17239,9 +17903,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -17307,7 +17974,7 @@ compiler_lib_search_path_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17334,7 +18001,8 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path \ reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ @@ -17348,7 +18016,7 @@ postlink_cmds_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17357,19 +18025,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -18080,55 +18745,52 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Generated automatically by $as_me ($PACKAGE) $VERSION # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="CXX " +available_tags='CXX ' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -18148,6 +18810,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -18265,18 +18930,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -18367,8 +19041,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -18461,13 +19138,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -18533,13 +19210,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -18548,7 +19284,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -18558,165 +19294,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -18803,13 +19380,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute_CXX diff -Nru filezilla-3.15.0.2/src/fzshellext/configure.ac filezilla-3.33.0/src/fzshellext/configure.ac --- filezilla-3.15.0.2/src/fzshellext/configure.ac 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/fzshellext/configure.ac 2017-07-19 16:07:36.000000000 +0000 @@ -9,6 +9,27 @@ AC_CANONICAL_HOST +# Work around libtool bug, it strips -static-libgcc... +AC_PROG_CC +AC_PROG_CXX +if echo "$LDFLAGS" | grep -e '\(^\|\s\)-static-libgcc\b' >/dev/null 2>&1; then + if ! echo "$CXX" | grep -e '\(^\|\s\)-static-libgcc\b' >/dev/null 2>&1; then + CXX="$CXX -static-libgcc" + fi + if ! echo "$CC" | grep -e '\(^\|\s\)-static-libgcc\b' >/dev/null 2>&1; then + CC="$CC -static-libgcc" + fi +fi +if echo "$LDFLAGS" | grep -e '\(^\|\s\)-static-libstdc++\($\|\s\)' >/dev/null 2>&1; then + if ! echo "$CXX" | grep -e '\(^\|\s\)-static-libstdc++\($\|\s\)' >/dev/null 2>&1; then + CXX="$CXX -static-libstdc++" + fi + if ! echo "$CC" | grep -e '\(^\|\s\)-static-libstdc++\($\|\s\)' >/dev/null 2>&1; then + CC="$CC -static-libstdc++" + fi +fi + + LT_INIT LT_LANG([C++]) @@ -32,6 +53,7 @@ # Weird compiler, trust it in blind faith matching=1 fi + if test "x$matching" = "x1"; then AC_MSG_RESULT([yes]) else diff -Nru filezilla-3.15.0.2/src/fzshellext/fzshellext.rc filezilla-3.33.0/src/fzshellext/fzshellext.rc --- filezilla-3.15.0.2/src/fzshellext/fzshellext.rc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/fzshellext/fzshellext.rc 2018-01-03 04:30:05.000000000 +0000 @@ -25,7 +25,7 @@ VALUE "FileDescription", "fzshellext Dynamic Link Library" VALUE "FileVersion", "3, 10, 2, 0" VALUE "InternalName", "fzshellext" - VALUE "LegalCopyright", "Copyright (C) 2006-2016" + VALUE "LegalCopyright", "Copyright (C) 2006-2018" VALUE "OriginalFilename", "fzshellext.dll" VALUE "ProductName", " fzshellext Dynamic Link Library" VALUE "ProductVersion", "3, 10, 2, 0" diff -Nru filezilla-3.15.0.2/src/fzshellext/Makefile.in filezilla-3.33.0/src/fzshellext/Makefile.in --- filezilla-3.15.0.2/src/fzshellext/Makefile.in 2016-02-10 19:38:48.000000000 +0000 +++ filezilla-3.33.0/src/fzshellext/Makefile.in 2018-05-07 08:45:22.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,19 +91,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(top_srcdir)/../../config/depcomp \ - $(dist_noinst_DATA) $(noinst_HEADERS) ../../config/compile \ - ../../config/config.guess ../../config/config.sub \ - ../../config/depcomp ../../config/install-sh \ - ../../config/missing ../../config/ltmain.sh \ - $(top_srcdir)/../../config/compile \ - $(top_srcdir)/../../config/config.guess \ - $(top_srcdir)/../../config/config.sub \ - $(top_srcdir)/../../config/install-sh \ - $(top_srcdir)/../../config/ltmain.sh \ - $(top_srcdir)/../../config/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/ax_check_link_flag.m4 \ $(top_srcdir)/../../m4/check_libc++.m4 \ @@ -107,6 +104,9 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(dist_noinst_DATA) $(noinst_HEADERS) \ + $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -218,6 +218,17 @@ CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/../../config/compile \ + $(top_srcdir)/../../config/config.guess \ + $(top_srcdir)/../../config/config.sub \ + $(top_srcdir)/../../config/depcomp \ + $(top_srcdir)/../../config/install-sh \ + $(top_srcdir)/../../config/ltmain.sh \ + $(top_srcdir)/../../config/missing ../../config/compile \ + ../../config/config.guess ../../config/config.sub \ + ../../config/depcomp ../../config/install-sh \ + ../../config/ltmain.sh ../../config/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -279,6 +290,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -349,6 +361,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -391,7 +404,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -623,15 +635,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -667,17 +679,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -864,6 +876,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES +.PRECIOUS: Makefile + @USE_RESOURCEFILE_TRUE@fzshellext.o: $(srcdir)/fzshellext.rc @USE_RESOURCEFILE_TRUE@ @if [ -f $@~ ]; then rm $@~; fi diff -Nru filezilla-3.15.0.2/src/fzshellext/shellext.cpp filezilla-3.33.0/src/fzshellext/shellext.cpp --- filezilla-3.15.0.2/src/fzshellext/shellext.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/fzshellext/shellext.cpp 2018-05-01 19:19:21.000000000 +0000 @@ -5,7 +5,6 @@ #define _UNICODE #endif - //--------------------------------------------------------------------------- #ifdef _MSC_VER #include @@ -52,17 +51,21 @@ #include #include +#include + //--------------------------------------------------------------------------- #ifdef DEBUG #define DEBUG_MSG(MSG) Debug(MSG) #define DEBUG_MSG_W(MSG) DebugW(MSG) #define DEBUG_LOG_VERSION(MSG) LogVersion(MSG) #define DEBUG_INIT(KEY) DebugInit(KEY) +#define DEBUG_MSG_PRINTF(FMT, ...) DebugPrintf(FMT, __VA_ARGS__) #else #define DEBUG_MSG(MSG) #define DEBUG_MSG_W(MSG) #define DEBUG_LOG_VERSION(MSG) #define DEBUG_INIT(KEY) +#define DEBUG_MSG_PRINTF(FMT, ...) #endif //--------------------------------------------------------------------------- @@ -110,6 +113,10 @@ } } +#ifdef __GNUC__ +extern "C" void __cxa_pure_virtual() {} +#endif + //--------------------------------------------------------------------------- class CShellExtClassFactory : public IClassFactory { @@ -127,7 +134,7 @@ STDMETHODIMP LockServer(BOOL); protected: - unsigned long FReferenceCounter; + unsigned long FReferenceCounter{}; }; //--------------------------------------------------------------------------- @@ -150,10 +157,10 @@ LPCTSTR SrcFile, DWORD SrcAttribs, LPCTSTR DestFile, DWORD DestAttribs); protected: - unsigned long FReferenceCounter; + unsigned long FReferenceCounter{}; LPDATAOBJECT FDataObj; HANDLE FMutex; - unsigned long FLastTicks; + unsigned long FLastTicks{}; }; //--------------------------------------------------------------------------- @@ -171,12 +178,14 @@ void Debug(const char* Message) { - if (!GLogOn) + if (!GLogOn) { return; + } unsigned long WaitResult = WaitForSingleObject(GLogMutex, 1000); - if (WaitResult == WAIT_TIMEOUT) + if (WaitResult == WAIT_TIMEOUT) { return; + } if (GLogHandle == NULL) { if (strlen(GLogFile) == 0) { @@ -210,8 +219,9 @@ void DebugW(const wchar_t* Message) { - if (!GLogOn) + if (!GLogOn) { return; + } int bytes = WideCharToMultiByte(CP_UTF8, 0, Message, -1, 0, 0, 0, 0); if (bytes <= 0) { @@ -221,21 +231,34 @@ char *buffer = new char[bytes + 1]; if (buffer) { int written = WideCharToMultiByte(CP_UTF8, 0, Message, -1, buffer, bytes, 0, 0); - if (!written) + if (!written) { DEBUG_MSG("WideCharToMultiByte failed"); + } else { buffer[written] = 0; Debug(buffer); } - delete[] buffer; + delete [] buffer; } } +template +void DebugPrintf(char const* fmt, Args&&... args) +{ + char buffer[100]; + for (unsigned int i = 0; i < 100; ++i) { + buffer[i] = 0; + } + snprintf(buffer, 99, fmt, std::forward(args)...); + Debug(buffer); +} + //--------------------------------------------------------------------------- void LogVersion(HINSTANCE HInstance) { - if (!GLogOn) + if (!GLogOn) { return; + } char FileName[MAX_PATH]; if (!GetModuleFileNameA(HInstance, FileName, sizeof(FileName))) { @@ -308,7 +331,6 @@ #ifdef DEBUG if (!GLogMutex) GLogMutex = CreateMutex(NULL, false, _T("FileZilla3DragDropExtLogMutex")); -#endif if (GRefThisDll != 0) { DEBUG_MSG("DllMain return: settings already loaded"); @@ -348,6 +370,10 @@ DEBUG_LOG_VERSION(HInstance); DEBUG_MSG("DllMain leave"); +#else + GEnabled = true; +#endif + } else if (Reason == DLL_PROCESS_DETACH) { DEBUG_MSG("DllMain detaching process"); @@ -597,8 +623,6 @@ { DEBUG_MSG("CShellExtClassFactory"); - FReferenceCounter = 0; - GRefThisDll++; } @@ -694,11 +718,9 @@ { DEBUG_MSG("CShellExt enter"); - FReferenceCounter = 0L; FDataObj = NULL; FMutex = CreateMutex(NULL, false, DRAG_EXT_MUTEX); - FLastTicks = 0; GRefThisDll++; @@ -799,7 +821,7 @@ } //--------------------------------------------------------------------------- -STDMETHODIMP_(UINT) CShellExt::CopyCallback(HWND Hwnd, UINT wFunc, UINT Flags, +STDMETHODIMP_(UINT) CShellExt::CopyCallback(HWND Hwnd, UINT wFunc, UINT wFlags, LPCTSTR SrcFile, DWORD SrcAttribs, LPCTSTR DestFile, DWORD DestAttribs) { UINT Result = IDYES; @@ -810,9 +832,7 @@ } if (wFunc != FO_COPY && wFunc != FO_MOVE) { - char buffer[100]; - sprintf(buffer, "CShellExt::CopyCallback return: wFunc is %u, NOT FO_COPY nor FO_MOVE", (unsigned int)wFunc); - DEBUG_MSG(buffer); + DEBUG_MSG_PRINTF("CShellExt::CopyCallback return: wFunc is %u, NOT FO_COPY nor FO_MOVE", static_cast(wFunc)); return Result; } else if (wFunc == FO_COPY) { @@ -822,6 +842,8 @@ DEBUG_MSG("CShellExt::CopyCallback: wFunc is FO_MOVE"); } + DEBUG_MSG_PRINTF("CShellExt::CopyCallback: wFlags is %u", static_cast(wFlags)); + unsigned long Ticks = GetTickCount(); if ((Ticks - FLastTicks) < 100 && FLastTicks <= Ticks) { DEBUG_MSG("CShellExt::CopyCallback return; interval NOT elapsed"); @@ -859,6 +881,8 @@ DEBUG_MSG("CShellExt::CopyCallback supported structure version"); if (data[1] == 1) { DEBUG_MSG("CShellExt::CopyCallback dragging"); + data[DRAG_EXT_MAPPING_LENGTH - 1] = 0; + data[DRAG_EXT_MAPPING_LENGTH - 2] = 0; wchar_t* file = reinterpret_cast(data + 2); DEBUG_MSG("Dragged file:"); @@ -866,12 +890,12 @@ if (_wcsicmp(file, SrcFile) == 0) { data[1] = 2; - if (_tcslen(DestFile) > MAX_PATH) { - DEBUG_MSG("CShellExt::CopyCallback length of DestFile exceeding MAX_PATH"); + if (_tcslen(DestFile) > DRAG_EXT_MAX_PATH) { + DEBUG_MSG("CShellExt::CopyCallback length of DestFile exceeding DRAG_EXT_MAX_PATH"); } else { - wcsncpy(file, DestFile, MAX_PATH); - file[MAX_PATH] = 0; + wcsncpy(file, DestFile, DRAG_EXT_MAX_PATH); + file[DRAG_EXT_MAX_PATH] = 0; DEBUG_MSG("CShellExt::CopyCallback destination written into buffer"); } Result = IDNO; diff -Nru filezilla-3.15.0.2/src/fzshellext/shellext.h filezilla-3.33.0/src/fzshellext/shellext.h --- filezilla-3.15.0.2/src/fzshellext/shellext.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/fzshellext/shellext.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __SHELLEXT_H__ -#define __SHELLEXT_H__ +#ifndef FILEZILLA_FZSHELLEXT_SHELLEXT_HEADER +#define FILEZILLA_FZSHELLEXT_SHELLEXT_HEADER // Shell extension to handle dragging of files from FileZilla 3 into Explorer. // Based on code from WinSCP (http://winscp.net/) @@ -24,10 +24,11 @@ // 1 - Awaiting reply from shell extension // 2 - shell extension has filled in the data // 3 - shell extension failed to fill in the data -// Filename: Given as wide character string. Zero-terminated. Capped to MAX_PATH wide-characters + terminating 0. +// Filename: Given as wide character string. Zero-terminated. Capped to 32766 wide-characters followed by the terminating 0. -const int DRAG_EXT_MAPPING_LENGTH = 1 + 1 + (MAX_PATH + 1) * 2 + 1; +int const DRAG_EXT_MAPPING_LENGTH = 65536; +int const DRAG_EXT_MAX_PATH = (DRAG_EXT_MAPPING_LENGTH - 4) / 2; -const int DRAG_EXT_VERSION = 1; +const int DRAG_EXT_VERSION = 2; -#endif //__SHELLEXT_H__ +#endif diff -Nru filezilla-3.15.0.2/src/fzshellext/version.rc.in filezilla-3.33.0/src/fzshellext/version.rc.in --- filezilla-3.15.0.2/src/fzshellext/version.rc.in 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/fzshellext/version.rc.in 2018-01-03 04:30:05.000000000 +0000 @@ -17,7 +17,7 @@ BEGIN VALUE "FileDescription", "fzshellext Dynamic Link Library" VALUE "InternalName", "fzshellext" - VALUE "LegalCopyright", "Copyright (C) 2006-2016" + VALUE "LegalCopyright", "Copyright (C) 2006-2018" VALUE "OriginalFilename", "fzshellext.dll" VALUE "ProductName", " fzshellext Dynamic Link Library" VALUE "Comments", "Version @PACKAGE_VERSION@" diff -Nru filezilla-3.15.0.2/src/include/commands.h filezilla-3.33.0/src/include/commands.h --- filezilla-3.15.0.2/src/include/commands.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/commands.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __COMMANDS_H__ -#define __COMMANDS_H__ +#ifndef FILEZILLA_ENGINE_COMMANDS_HEADER +#define FILEZILLA_ENGINE_COMMANDS_HEADER // See below for actual commands and their parameters @@ -21,7 +21,9 @@ // Only used internally cwd, - rawtransfer + private1, + private2, + private3 }; // Reply codes @@ -44,7 +46,9 @@ #define FZ_REPLY_TIMEOUT (0x0800 | FZ_REPLY_ERROR) #define FZ_REPLY_NOTSUPPORTED (0x1000 | FZ_REPLY_ERROR) // Will be returned if command not supported by that protocol #define FZ_REPLY_WRITEFAILED (0x2000 | FZ_REPLY_ERROR) // Happens if local file could not be written during transfer -#define FZ_REPLY_LINKNOTDIR (0x4000) +#define FZ_REPLY_LINKNOTDIR (0x4000 | FZ_REPLY_ERROR) + +#define FZ_REPLY_CONTINUE 0x8000 // Used internally // --------------- // // Actual commands // @@ -54,7 +58,7 @@ { public: CCommand() = default; - virtual ~CCommand() {}; // TODO: One GCC >= 4.8 is in Debian Stable (Jessie by then), make default and add testcase to configure. + virtual ~CCommand() = default; virtual Command GetId() const = 0; virtual CCommand *Clone() const = 0; @@ -90,13 +94,17 @@ class CConnectCommand final : public CCommandHelper { public: - explicit CConnectCommand(CServer const& server, bool retry_conncting = true); + explicit CConnectCommand(CServer const& server, Credentials const& credentials, bool retry_conncting = true); + + CServer const& GetServer() const { return server_; } + Credentials const& GetCredentials() const { return credentials_; } + bool RetryConnecting() const { return retry_connecting_; } - CServer const& GetServer() const; - bool RetryConnecting() const { return m_retry_connecting; } + virtual bool valid() const override; protected: - CServer const m_Server; - bool const m_retry_connecting; + CServer const server_; + Credentials const credentials_; + bool const retry_connecting_; }; typedef CBasicCommand CDisconnectCommand; @@ -126,10 +134,10 @@ // directories. public: explicit CListCommand(int flags = 0); - explicit CListCommand(CServerPath path, wxString subDir = wxString(), int flags = 0); + explicit CListCommand(CServerPath path, std::wstring const& subDir = std::wstring(), int flags = 0); CServerPath GetPath() const; - wxString GetSubDir() const; + std::wstring GetSubDir() const; int GetFlags() const { return m_flags; } @@ -137,7 +145,7 @@ protected: CServerPath const m_path; - wxString const m_subDir; + std::wstring const m_subDir; int const m_flags; }; @@ -147,29 +155,25 @@ class t_transferSettings final { public: - t_transferSettings() - : binary(true) - {} - - bool binary; + bool binary{true}; }; // For uploads, set download to false. // For downloads, localFile can be left empty if supported by protocol. // Check for nId_data notification. // FIXME: localFile empty iff protocol is HTTP. - CFileTransferCommand(wxString const& localFile, CServerPath const& remotePath, wxString const& remoteFile, bool download, t_transferSettings const& m_transferSettings); + CFileTransferCommand(std::wstring const& localFile, CServerPath const& remotePath, std::wstring const& remoteFile, bool download, t_transferSettings const& m_transferSettings); - wxString GetLocalFile() const; + std::wstring GetLocalFile() const; CServerPath GetRemotePath() const; - wxString GetRemoteFile() const; + std::wstring GetRemoteFile() const; bool Download() const; const t_transferSettings& GetTransferSettings() const { return m_transferSettings; } protected: - wxString const m_localFile; + std::wstring const m_localFile; CServerPath const m_remotePath; - wxString const m_remoteFile; + std::wstring const m_remoteFile; bool const m_download; t_transferSettings const m_transferSettings; }; @@ -177,29 +181,29 @@ class CRawCommand final : public CCommandHelper { public: - explicit CRawCommand(const wxString &command); + explicit CRawCommand(std::wstring const& command); - wxString GetCommand() const; + std::wstring GetCommand() const; bool valid() const { return !m_command.empty(); } protected: - wxString m_command; + std::wstring m_command; }; class CDeleteCommand final : public CCommandHelper { public: - CDeleteCommand(CServerPath const& path, std::deque && files); + CDeleteCommand(CServerPath const& path, std::deque && files); CServerPath GetPath() const { return m_path; } - const std::deque& GetFiles() const { return m_files; } - std::deque&& ExtractFiles() { return std::move(m_files); } + const std::deque& GetFiles() const { return m_files; } + std::deque&& ExtractFiles() { return std::move(m_files); } bool valid() const { return !GetPath().empty() && !GetFiles().empty(); } protected: CServerPath const m_path; - std::deque m_files; + std::deque m_files; }; class CRemoveDirCommand final : public CCommandHelper @@ -207,16 +211,16 @@ public: // Directories can either be given as absolute path or as // pair of an absolute path and the very last path segments. - CRemoveDirCommand(CServerPath const& path, wxString const& subdDir); + CRemoveDirCommand(CServerPath const& path, std::wstring const& subdDir); CServerPath GetPath() const { return m_path; } - wxString GetSubDir() const { return m_subDir; } + std::wstring GetSubDir() const { return m_subDir; } bool valid() const; protected: CServerPath const m_path; - wxString const m_subDir; + std::wstring const m_subDir; }; class CMkdirCommand final : public CCommandHelper @@ -235,21 +239,21 @@ class CRenameCommand final : public CCommandHelper { public: - CRenameCommand(CServerPath const& fromPath, wxString const& fromFile, - CServerPath const& toPath, wxString const& toFile); + CRenameCommand(CServerPath const& fromPath, std::wstring const& fromFile, + CServerPath const& toPath, std::wstring const& toFile); CServerPath GetFromPath() const { return m_fromPath; } CServerPath GetToPath() const { return m_toPath; } - wxString GetFromFile() const { return m_fromFile; } - wxString GetToFile() const { return m_toFile; } + std::wstring GetFromFile() const { return m_fromFile; } + std::wstring GetToFile() const { return m_toFile; } bool valid() const; protected: CServerPath const m_fromPath; CServerPath const m_toPath; - wxString const m_fromFile; - wxString const m_toFile; + std::wstring const m_fromFile; + std::wstring const m_toFile; }; class CChmodCommand final : public CCommandHelper @@ -258,18 +262,18 @@ // The permission string should be given in a format understandable by the server. // Most likely it's the defaut octal representation used by the unix chmod command, // i.e. chmod 755 foo.bar - CChmodCommand(const CServerPath& path, const wxString& file, const wxString& permission); + CChmodCommand(CServerPath const& path, std::wstring const& file, std::wstring const& permission); CServerPath GetPath() const { return m_path; } - wxString GetFile() const { return m_file; } - wxString GetPermission() const { return m_permission; } + std::wstring GetFile() const { return m_file; } + std::wstring GetPermission() const { return m_permission; } bool valid() const; protected: CServerPath const m_path; - wxString const m_file; - wxString const m_permission; + std::wstring const m_file; + std::wstring const m_permission; }; #endif diff -Nru filezilla-3.15.0.2/src/include/config.h.in filezilla-3.33.0/src/include/config.h.in --- filezilla-3.15.0.2/src/include/config.h.in 2016-02-10 19:38:50.000000000 +0000 +++ filezilla-3.33.0/src/include/config.h.in 2018-05-07 08:45:25.000000000 +0000 @@ -7,6 +7,9 @@ obtained using /proc/self/maps */ #undef ENABLE_BINRELOC +/* Define if building with Storj support. */ +#undef ENABLE_STORJ + /* Set to 1 to add support for automated update checks */ #undef FZ_AUTOUPDATECHECK @@ -16,7 +19,7 @@ /* Set to 1 to use ciphers defined in system policy. */ #undef FZ_USE_GNUTLS_SYSTEM_CIPHERS -/* Define to 1 if you have the `clock_gettime' function. */ +/* clock_gettime can be used */ #undef HAVE_CLOCK_GETTIME /* define if the compiler supports basic C++14 syntax */ @@ -72,9 +75,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define if thread_local isn't supported */ -#undef HAVE_NO_THREAD_LOCAL - /* Define to 1 if you have the `posix_fadvise' function. */ #undef HAVE_POSIX_FADVISE @@ -133,8 +133,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UTMPX_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ @@ -173,6 +172,9 @@ /* Host system under which the program will run. */ #undef USED_HOST +/* Define to 1 if the App Sandbox on OS X should be used. */ +#undef USE_MAC_SANDBOX + /* Version number of package */ #undef VERSION diff -Nru filezilla-3.15.0.2/src/include/directorylisting.h filezilla-3.33.0/src/include/directorylisting.h --- filezilla-3.15.0.2/src/include/directorylisting.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/directorylisting.h 2017-12-17 12:14:41.000000000 +0000 @@ -1,18 +1,19 @@ -#ifndef __DIRECTORYLISTING_H__ -#define __DIRECTORYLISTING_H__ +#ifndef FILEZILLA_ENGINE_DIRECTORYLISTING_HEADER +#define FILEZILLA_ENGINE_DIRECTORYLISTING_HEADER -#include "optional.h" +#include +#include #include -#include +#include class CDirentry { public: std::wstring name; int64_t size; - CRefcountObject permissions; - CRefcountObject ownerGroup; + fz::shared_value permissions; + fz::shared_value ownerGroup; enum _flags { @@ -39,29 +40,27 @@ inline bool has_date() const { - return time.empty();; + return !time.empty(); } inline bool has_time() const { - return time.empty() && time.get_accuracy() >= fz::datetime::hours; + return !time.empty() && time.get_accuracy() >= fz::datetime::hours; } inline bool has_seconds() const { - return time.empty() && time.get_accuracy() >= fz::datetime::seconds; + return !time.empty() && time.get_accuracy() >= fz::datetime::seconds; } - CSparseOptional target; // Set to linktarget it link is true + fz::sparse_optional target; // Set to linktarget it link is true fz::datetime time; - wxString dump() const; + std::wstring dump() const; bool operator==(const CDirentry &op) const; }; -#include "refcount.h" - class CDirectoryListing final { public: @@ -74,17 +73,18 @@ CDirectoryListing& operator=(CDirectoryListing const&) = default; CDirectoryListing& operator=(CDirectoryListing &&) noexcept = default; - const CDirentry& operator[](unsigned int index) const; + CDirentry const& operator[](unsigned int index) const; // Word of caution: You MUST NOT change the name of the returned // entry if you do not call ClearFindMap afterwards - CDirentry& operator[](unsigned int index); + CDirentry& get(unsigned int index); + + unsigned int GetCount() const { return m_entries ? m_entries->size() : 0; } - void SetCount(unsigned int count); - unsigned int GetCount() const { return m_entryCount; } + void Append(CDirentry&& entry); - int FindFile_CmpCase(const wxString& name) const; - int FindFile_CmpNoCase(wxString name) const; + int FindFile_CmpCase(std::wstring const& name) const; + int FindFile_CmpNoCase(std::wstring const& name) const; void ClearFindMap(); @@ -126,7 +126,7 @@ bool has_perms() const { return (m_flags & listing_has_perms) != 0; } bool has_usergroup() const { return (m_flags & listing_has_usergroup) != 0; } - void Assign(std::deque> & entries); + void Assign(std::vector> && entries); bool RemoveEntry(unsigned int index); @@ -134,12 +134,13 @@ protected: - CRefcountObject_Uninitialized > > m_entries; + fz::shared_optional > > m_entries; - mutable CRefcountObject_Uninitialized > m_searchmap_case; - mutable CRefcountObject_Uninitialized > m_searchmap_nocase; - - unsigned int m_entryCount{}; + mutable fz::shared_optional > m_searchmap_case; + mutable fz::shared_optional > m_searchmap_nocase; }; +// Checks if listing2 is a subset of listing1. Compares only filenames. +bool CheckInclusion(CDirectoryListing const& listing1, CDirectoryListing const& listing2); + #endif diff -Nru filezilla-3.15.0.2/src/include/engine_context.h filezilla-3.33.0/src/include/engine_context.h --- filezilla-3.15.0.2/src/include/engine_context.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/engine_context.h 2017-02-23 19:24:50.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef FILEZILLA_ENGINE_CONTEXT -#define FILEZILLA_ENGINE_CONTEXT +#ifndef FILEZILLA_ENGINE_CONTEXT_HEADER +#define FILEZILLA_ENGINE_CONTEXT_HEADER #include @@ -10,23 +10,37 @@ namespace fz { class event_loop; +class thread_pool; } + +class CustomEncodingConverterBase +{ +public: + virtual ~CustomEncodingConverterBase() = default; + + virtual std::wstring toLocal(std::wstring const& encoding, char const* buffer, size_t len) const = 0; + virtual std::string toServer(std::wstring const& encoding, wchar_t const* buffer, size_t len) const = 0; +}; + // There can be multiple engines, but there can be at most one context class CFileZillaEngineContext final { public: - CFileZillaEngineContext(COptionsBase & options); + CFileZillaEngineContext(COptionsBase & options, CustomEncodingConverterBase const& customEncodingConverter); ~CFileZillaEngineContext(); - COptionsBase& GetOptions(); + COptionsBase& GetOptions() { return options_; } + fz::thread_pool& GetThreadPool(); fz::event_loop& GetEventLoop(); CRateLimiter& GetRateLimiter(); CDirectoryCache& GetDirectoryCache(); CPathCache& GetPathCache(); + CustomEncodingConverterBase const& GetCustomEncodingConverter() { return customEncodingConverter_; } protected: COptionsBase& options_; + CustomEncodingConverterBase const& customEncodingConverter_; class Impl; std::unique_ptr impl_; diff -Nru filezilla-3.15.0.2/src/include/externalipresolver.h filezilla-3.33.0/src/include/externalipresolver.h --- filezilla-3.15.0.2/src/include/externalipresolver.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/externalipresolver.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __EXTERNALIPRESOLVER_H__ -#define __EXTERNALIPRESOLVER_H__ +#ifndef FILEZILLA_ENGINE_EXTERNALIPRESOLVER_HEADER +#define FILEZILLA_ENGINE_EXTERNALIPRESOLVER_HEADER #include "socket.h" @@ -9,7 +9,7 @@ class CExternalIPResolver final : public fz::event_handler { public: - CExternalIPResolver(fz::event_handler & handler); + CExternalIPResolver(fz::thread_pool & pool, fz::event_handler & handler); virtual ~CExternalIPResolver(); CExternalIPResolver(CExternalIPResolver const&) = delete; @@ -17,27 +17,28 @@ bool Done() const { return m_done; } bool Successful() const; - wxString GetIP() const; + std::string GetIP() const; - void GetExternalIP(const wxString& address, CSocket::address_family protocol, bool force = false); + void GetExternalIP(std::wstring const& resolver, fz::address_type protocol, bool force = false); protected: void Close(bool successful); - wxString m_address; - CSocket::address_family m_protocol{}; + std::wstring m_address; + fz::address_type m_protocol{}; unsigned long m_port{80}; + fz::thread_pool & thread_pool_; fz::event_handler * m_handler{}; bool m_done{}; - wxString m_data; + std::string m_data; - CSocket *m_pSocket{}; + fz::socket *socket_{}; virtual void operator()(fz::event_base const& ev); - void OnSocketEvent(CSocketEventSource* source, SocketEventType t, int error); + void OnSocketEvent(fz::socket_event_source* source, fz::socket_event_flag t, int error); void OnConnect(int error); void OnClose(); @@ -47,8 +48,7 @@ void OnChunkedData(); void OnSend(); - char* m_pSendBuffer{}; - unsigned int m_sendBufferPos{}; + std::string m_sendBuffer; char* m_pRecvBuffer{}; unsigned int m_recvBufferPos{}; @@ -59,12 +59,11 @@ void ResetHttpData(bool resetRedirectCount); bool m_gotHeader{}; int m_responseCode{}; - wxString m_responseString; - wxString m_location; + std::string m_responseString; + std::wstring m_location; int m_redirectCount{}; - enum transferEncodings - { + enum transferEncodings { identity, chunked, unknown @@ -72,8 +71,7 @@ transferEncodings m_transferEncoding; - struct t_chunkData - { + struct t_chunkData { bool getTrailer{}; bool terminateChunk{}; int64_t size{}; @@ -82,4 +80,4 @@ bool m_finished{}; }; -#endif //__EXTERNALIPRESOLVER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/include/FileZillaEngine.h filezilla-3.33.0/src/include/FileZillaEngine.h --- filezilla-3.15.0.2/src/include/FileZillaEngine.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/FileZillaEngine.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __FILEZILLAENGINE_H__ -#define __FILEZILLAENGINE_H__ +#ifndef FILEZILLA_ENGINE_ENGINE_HEADER +#define FILEZILLA_ENGINE_ENGINE_HEADER #include "commands.h" @@ -8,19 +8,12 @@ class CFileZillaEngine final { public: - CFileZillaEngine(CFileZillaEngineContext& engine_context); + CFileZillaEngine(CFileZillaEngineContext& engine_context, EngineNotificationHandler& notificationHandler); ~CFileZillaEngine(); CFileZillaEngine(CFileZillaEngine const&) = delete; CFileZillaEngine& operator=(CFileZillaEngine const&) = delete; - // Initialize the engine. Pass over the event handler that should receive notification - // events as defined in notification.h - int Init(wxEvtHandler *pEventHandler); - - // TODO: Init function with a function pointer for a callback function for - // notifications. Not all users of the engine use wxWidgets. - // Execute the given command. See commands.h for a list of the available // commands and reply codes. int Execute(CCommand const& command); diff -Nru filezilla-3.15.0.2/src/include/httpheaders.h filezilla-3.33.0/src/include/httpheaders.h --- filezilla-3.15.0.2/src/include/httpheaders.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/include/httpheaders.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,9 @@ +#ifndef FILEZILLA_INCLUDE_HTTPHEADERS_HEADER +#define FILEZILLA_INCLUDE_HTTPHEADERS_HEADER + +#include +#include + +typedef std::map HttpHeaders; + +#endif diff -Nru filezilla-3.15.0.2/src/include/libfilezilla_engine.h filezilla-3.33.0/src/include/libfilezilla_engine.h --- filezilla-3.15.0.2/src/include/libfilezilla_engine.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/libfilezilla_engine.h 2016-11-17 13:03:55.000000000 +0000 @@ -9,12 +9,14 @@ #define PACKAGE_STRING "FileZilla 3" #endif -#include +#include -// Include after defs.h so that __WXFOO__ is properly defined #include "setup.h" -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS +#ifndef UNICODE +#define UNICODE +#endif #ifndef NOMINMAX #define NOMINMAX #endif @@ -24,19 +26,10 @@ #include #endif -#include -#include -#include -#include - #include #include #include -#include - -#include - #include "optionsbase.h" #include "logging.h" #include "server.h" @@ -48,6 +41,4 @@ #include "misc.h" -#define TRANSLATE_T(str) _T(str) - #endif diff -Nru filezilla-3.15.0.2/src/include/local_path.h filezilla-3.33.0/src/include/local_path.h --- filezilla-3.15.0.2/src/include/local_path.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/local_path.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __LOCAL_PATH_H__ -#define __LOCAL_PATH_H__ +#ifndef FILEZILLA_ENGINE_LOCAL_PATH_HEADER +#define FILEZILLA_ENGINE_LOCAL_PATH_HEADER -#include "refcount.h" +#include // This class encapsulates local paths. // On Windows it uses the C:\foo\bar\ syntax and also supports @@ -21,35 +21,35 @@ // correct, empty() will return true. // If file is given and path not terminated by a separator, // the filename portion is returned in file. - explicit CLocalPath(const wxString& path, wxString* file = 0); - bool SetPath(const wxString& path, wxString* file = 0); + explicit CLocalPath(std::wstring const& path, std::wstring* file = nullptr); + bool SetPath(std::wstring const& path, std::wstring* file = nullptr); // Always terminated by a separator - const wxString& GetPath() const { return *m_path; } + std::wstring const& GetPath() const { return *m_path; } bool empty() const; void clear(); // On failure the path is undefined - bool ChangePath(const wxString& new_path); + bool ChangePath(std::wstring const& new_path); // Do not call with separators in the segment - void AddSegment(const wxString& segment); + void AddSegment(std::wstring const& segment); // HasParent() and HasLogicalParent() only return different values on // MSW: C:\ is the drive root but has \ as logical parent, the drive list. bool HasParent() const; bool HasLogicalParent() const; - CLocalPath GetParent(wxString* last_segment = 0) const; + CLocalPath GetParent(std::wstring* last_segment = nullptr) const; // If it fails, the path is undefined - bool MakeParent(wxString* last_segment = 0); + bool MakeParent(std::wstring* last_segment = nullptr); /* Calling GetLastSegment() only returns non-empty string if * HasParent() returns true */ - wxString GetLastSegment() const; + std::wstring GetLastSegment() const; bool IsSubdirOf(const CLocalPath &path) const; bool IsParentOf(const CLocalPath &path) const; @@ -61,15 +61,19 @@ bool IsWriteable() const; // Checks if the directory exists. - bool Exists(wxString *error = 0) const; + bool Exists(std::wstring *error = nullptr) const; - static const wxChar path_separator; + // Craetes direcory if it doesn't yet exist + bool Create(CLocalPath *last_successful = nullptr); - bool operator==(const CLocalPath& op) const; - bool operator!=(const CLocalPath& op) const; + static wchar_t const path_separator; + bool operator==(CLocalPath const& op) const; + bool operator!=(CLocalPath const& op) const; + + bool operator<(CLocalPath const& op) const; protected: - CRefcountObject m_path; + fz::shared_value m_path; }; -#endif //__LOCAL_PATH_H__ +#endif diff -Nru filezilla-3.15.0.2/src/include/logging.h filezilla-3.33.0/src/include/logging.h --- filezilla-3.15.0.2/src/include/logging.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/logging.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __LOGGING_H__ -#define __LOGGING_H__ +#ifndef FILEZILLA_ENGINE_LOGGING_HEADER +#define FILEZILLA_ENGINE_LOGGING_HEADER enum class MessageType { diff -Nru filezilla-3.15.0.2/src/include/Makefile.am filezilla-3.33.0/src/include/Makefile.am --- filezilla-3.15.0.2/src/include/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/Makefile.am 2018-03-29 08:59:00.000000000 +0000 @@ -6,19 +6,18 @@ engine_context.h \ externalipresolver.h \ FileZillaEngine.h \ + httpheaders.h \ libfilezilla_engine.h \ local_path.h \ logging.h \ misc.h \ - msgbox.h \ notification.h \ - optional.h \ optionsbase.h \ option_change_event_handler.h \ - refcount.h \ server.h \ serverpath.h \ setup.h \ sizeformatting_base.h \ - socket.h - + socket.h \ + xmlutils.h \ + xml_string_writer.h diff -Nru filezilla-3.15.0.2/src/include/Makefile.in filezilla-3.33.0/src/include/Makefile.in --- filezilla-3.15.0.2/src/include/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/include/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ # these are the headers for your project VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,16 +91,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/include -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/config.h.in $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -102,6 +113,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -146,6 +159,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -157,11 +171,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -185,6 +199,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -205,16 +221,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -266,6 +290,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -305,6 +330,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -322,21 +348,21 @@ engine_context.h \ externalipresolver.h \ FileZillaEngine.h \ + httpheaders.h \ libfilezilla_engine.h \ local_path.h \ logging.h \ misc.h \ - msgbox.h \ notification.h \ - optional.h \ optionsbase.h \ option_change_event_handler.h \ - refcount.h \ server.h \ serverpath.h \ setup.h \ sizeformatting_base.h \ - socket.h + socket.h \ + xmlutils.h \ + xml_string_writer.h all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -354,7 +380,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/include/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/include/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -591,6 +616,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru filezilla-3.15.0.2/src/include/misc.h filezilla-3.33.0/src/include/misc.h --- filezilla-3.15.0.2/src/include/misc.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/misc.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,29 +1,18 @@ -#ifndef __MISC_H__ -#define __MISC_H__ +#ifndef FILEZILLA_ENGINE_MISC_HEADER +#define FILEZILLA_ENGINE_MISC_HEADER -#include "socket.h" +#include -// Strongly typed enum would be nice, but we need to support older compilers still. -namespace dependency { -enum type { - wxwidgets, +enum class lib_dependency +{ gnutls, - sqlite, count }; -} -wxString GetDependencyName( dependency::type d ); -wxString GetDependencyVersion( dependency::type d ); +std::wstring GetDependencyName(lib_dependency d); +std::wstring GetDependencyVersion(lib_dependency d); -wxString ListTlsCiphers(const wxString& priority); - -// Microsoft, in its insane stupidity, has decided to make GetVersion(Ex) useless, starting with Windows 8.1, -// this function no longer returns the operating system version but instead some arbitrary and random value depending -// on the phase of the moon. -// This function instead returns the actual Windows version. On non-Windows systems, it's equivalent to -// wxGetOsVersion -bool GetRealOsVersion( int& major, int& minor ); +std::string ListTlsCiphers(std::string const& priority); template std::unique_ptr @@ -33,8 +22,30 @@ return std::unique_ptr(d); } -// wxGetTranslation does not support 64bit ints on 32bit systems. -#define wxPLURAL_LL(sing, plur, n) \ - wxGetTranslation((sing), (plur), (sizeof(unsigned int) < 8 && (n) > 1000000000) ? (1000000000 + (n) % 1000000000) : (n)) +#if FZ_WINDOWS +DWORD GetSystemErrorCode(); +fz::native_string GetSystemErrorDescription(DWORD err); +#else +int GetSystemErrorCode(); +fz::native_string GetSystemErrorDescription(int err); +#endif + +namespace fz { + +void set_translators( + std::wstring(*s)(char const* const t), + std::wstring(*pf)(char const* const singular, char const* const plural, int64_t n) +); + +std::wstring translate(char const* const source); +std::wstring translate(char const * const singular, char const * const plural, int64_t n); + +// Poor-man's tolower. Consider to eventually use libicu or similar +std::wstring str_tolower(std::wstring const& source); +} + +// Sadly xgettext cannot be used with namespaces +#define fztranslate fz::translate +#define fztranslate_mark -#endif //__MISC_H__ +#endif diff -Nru filezilla-3.15.0.2/src/include/msgbox.h filezilla-3.33.0/src/include/msgbox.h --- filezilla-3.15.0.2/src/include/msgbox.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/msgbox.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#ifndef FILEZILLA_MSGBOX_HEADER -#define FILEZILLA_MSGBOX_HEADER - -#include - -bool IsShowingMessageBox(); - -int wxMessageBoxEx(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr - , long style = wxOK | wxCENTRE, wxWindow *parent = NULL - , int x = wxDefaultCoord, int y = wxDefaultCoord); - -#endif \ No newline at end of file diff -Nru filezilla-3.15.0.2/src/include/notification.h filezilla-3.33.0/src/include/notification.h --- filezilla-3.15.0.2/src/include/notification.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/notification.h 2018-02-05 21:28:24.000000000 +0000 @@ -1,48 +1,37 @@ -#ifndef __NOTIFICATION_H__ -#define __NOTIFICATION_H__ +#ifndef FILEZILLA_ENGINE_NOTIFICATION_HEADER +#define FILEZILLA_ENGINE_NOTIFICATION_HEADER // Notification overview // --------------------- // To inform the application about what's happening, the engine sends -// some notifications to the application using events. -// For example the event table entry could look like this: -// EVT_FZ_NOTIFICATION(wxID_ANY, CMainFrame::OnEngineEvent) -// and the handler function has the following declaration: -// void OnEngineEvent(wxFzEvent& event); -// You can get the engine which sent the event by reading -// event.engine_ +// some notifications to the application. +// The handler needs to derive from EngineNotificationHandler and implement +// the OnEngineEvent method which takes the engine as parameter. // Whenever you get a notification event, // CFileZillaEngine::GetNextNotification has to be called until it returns 0, // or you will lose important notifications or your memory will fill with // pending notifications. +// +// Note: It may be called from a worker thread. // A special class of notifications are the asynchronous requests. These -// requests have to be answered. Once proessed, call +// requests have to be answered. Once processed, call // CFileZillaEngine::SetAsyncRequestReply to continue the current operation. #include "local_path.h" #include class CFileZillaEngine; -class wxFzEvent final : public wxEvent + +class EngineNotificationHandler { public: - wxFzEvent(); - - explicit wxFzEvent(int id); - explicit wxFzEvent(CFileZillaEngine const* engine); - - virtual wxEvent *Clone() const; + virtual ~EngineNotificationHandler() {} - CFileZillaEngine const* engine_; + virtual void OnEngineEvent(CFileZillaEngine* engine) = 0; }; -wxDECLARE_EVENT(fzEVT_NOTIFICATION, wxFzEvent); - -#define EVT_FZ_NOTIFICATION(id, func) \ - wx__DECLARE_EVT1(fzEVT_NOTIFICATION, id, &func) - enum NotificationId { nId_logmsg, // notification about new messages for the message log @@ -71,7 +60,7 @@ class CNotification { public: - virtual ~CNotification() {}; // TODO: One GCC >= 4.8 is in Debian Stable (Jessie by then), make default and add testcase to configure. + virtual ~CNotification() = default; virtual NotificationId GetID() const = 0; protected: @@ -106,7 +95,7 @@ { } - wxString msg; + std::wstring msg; MessageType msgType{MessageType::Status}; // Type of message, see logging.h for details }; @@ -140,7 +129,7 @@ class CAsyncRequestNotification : public CNotificationHelper { public: - virtual enum RequestId GetRequestID() const = 0; + virtual RequestId GetRequestID() const = 0; unsigned int requestNumber{}; // Do never change this protected: @@ -152,15 +141,15 @@ class CFileExistsNotification final : public CAsyncRequestNotification { public: - virtual enum RequestId GetRequestID() const; + virtual RequestId GetRequestID() const; bool download{}; - wxString localFile; + std::wstring localFile; int64_t localSize{-1}; fz::datetime localTime; - wxString remoteFile; + std::wstring remoteFile; CServerPath remotePath; int64_t remoteSize{-1}; fz::datetime remoteTime; @@ -190,7 +179,7 @@ // Set to new filename if overwriteAction is rename. Might trigger further // file exists notifications if new target file exists as well. - wxString newName; + std::wstring newName; }; class CInteractiveLoginNotification final : public CAsyncRequestNotification @@ -201,16 +190,16 @@ keyfile }; - CInteractiveLoginNotification(type t, const wxString& challenge, bool repeated); - virtual enum RequestId GetRequestID() const; + CInteractiveLoginNotification(type t, std::wstring const& challenge, bool repeated); + virtual RequestId GetRequestID() const; // Set to true if you have set a password bool passwordSet{}; - // Set password by calling server.SetUser CServer server; + Credentials credentials; - const wxString& GetChallenge() const { return m_challenge; } + std::wstring const& GetChallenge() const { return m_challenge; } type GetType() const { return m_type; } @@ -218,7 +207,7 @@ protected: // Password prompt string as given by the server - wxString const m_challenge; + std::wstring const m_challenge; type const m_type; @@ -240,7 +229,7 @@ { public: CTransferStatus() {} - CTransferStatus(wxFileOffset total, wxFileOffset start, bool l) + CTransferStatus(int64_t total, int64_t start, bool l) : totalSize(total) , startOffset(start) , currentOffset(start) @@ -248,9 +237,9 @@ {} fz::datetime started; - wxFileOffset totalSize{-1}; // Total size of the file to transfer, -1 if unknown - wxFileOffset startOffset{-1}; - wxFileOffset currentOffset{-1}; + int64_t totalSize{-1}; // Total size of the file to transfer, -1 if unknown + int64_t startOffset{-1}; + int64_t currentOffset{-1}; void clear() { startOffset = -1; } bool empty() const { return startOffset < 0; } @@ -259,7 +248,7 @@ // True on download notifications iff currentOffset != startOffset. // True on FTP upload notifications iff currentOffset != startOffset - // AND after the first accepted data after the first wxSOCKET_WOULDBLOCK. + // AND after the first accepted data after the first EWOULDBLOCK. // SFTP uploads: Set to true if currentOffset >= startOffset + 65536. bool madeProgress{}; @@ -278,17 +267,34 @@ CTransferStatus const status_; }; +class CSftpEncryptionDetails +{ +public: + virtual ~CSftpEncryptionDetails() = default; + + std::wstring hostKeyAlgorithm; + std::wstring hostKeyFingerprintMD5; + std::wstring hostKeyFingerprintSHA256; + std::wstring kexAlgorithm; + std::wstring kexHash; + std::wstring kexCurve; + std::wstring cipherClientToServer; + std::wstring cipherServerToClient; + std::wstring macClientToServer; + std::wstring macServerToClient; +}; + // Notification about new or changed hostkeys, only used by SSH/SFTP transfers. // GetRequestID() returns either reqId_hostkey or reqId_hostkeyChanged -class CHostKeyNotification final : public CAsyncRequestNotification +class CHostKeyNotification final : public CAsyncRequestNotification, public CSftpEncryptionDetails { public: - CHostKeyNotification(wxString host, int port, wxString fingerprint, bool changed = false); - virtual enum RequestId GetRequestID() const; + CHostKeyNotification(std::wstring const& host, int port, CSftpEncryptionDetails const& details, bool changed = false); + + virtual RequestId GetRequestID() const; - wxString GetHost() const; + std::wstring GetHost() const; int GetPort() const; - wxString GetFingerprint() const; // Set to true if you trust the server bool m_trust{}; @@ -299,9 +305,8 @@ protected: - const wxString m_host; + const std::wstring m_host; const int m_port; - const wxString m_fingerprint; const bool m_changed; }; @@ -321,88 +326,105 @@ class CCertificate final { public: + class SubjectName final + { + public: + std::wstring name; + bool isDns{}; + }; + CCertificate() = default; + CCertificate(CCertificate const& op) = default; + CCertificate( - unsigned char const* rawData, unsigned int len, + std::vector const& rawData, fz::datetime const& activationTime, fz::datetime const& expirationTime, - wxString const& serial, - wxString const& pkalgoname, unsigned int bits, - wxString const& signalgoname, - wxString const& fingerprint_sha256, - wxString const& fingerprint_sha1, - wxString const& issuer, - wxString const& subject, - std::vector const& altSubjectNames); + std::wstring const& serial, + std::wstring const& pkalgoname, unsigned int bits, + std::wstring const& signalgoname, + std::wstring const& fingerprint_sha256, + std::wstring const& fingerprint_sha1, + std::wstring const& issuer, + std::wstring const& subject, + std::vector const& altSubjectNames); - CCertificate(CCertificate const& op); - ~CCertificate(); + CCertificate( + std::vector && rawdata, + fz::datetime const& activationTime, fz::datetime const& expirationTime, + std::wstring const& serial, + std::wstring const& pkalgoname, unsigned int bits, + std::wstring const& signalgoname, + std::wstring const& fingerprint_sha256, + std::wstring const& fingerprint_sha1, + std::wstring const& issuer, + std::wstring const& subject, + std::vector && altSubjectNames); - const unsigned char* GetRawData(unsigned int& len) const { len = m_len; return m_rawData; } + + std::vector GetRawData() const { return m_rawData; } fz::datetime GetActivationTime() const { return m_activationTime; } fz::datetime GetExpirationTime() const { return m_expirationTime; } - const wxString& GetSerial() const { return m_serial; } - const wxString& GetPkAlgoName() const { return m_pkalgoname; } + std::wstring const& GetSerial() const { return m_serial; } + std::wstring const& GetPkAlgoName() const { return m_pkalgoname; } unsigned int GetPkAlgoBits() const { return m_pkalgobits; } - const wxString& GetSignatureAlgorithm() const { return m_signalgoname; } - - const wxString& GetFingerPrintSHA256() const { return m_fingerprint_sha256; } - const wxString& GetFingerPrintSHA1() const { return m_fingerprint_sha1; } + std::wstring const& GetSignatureAlgorithm() const { return m_signalgoname; } - const wxString& GetSubject() const { return m_subject; } - const wxString& GetIssuer() const { return m_issuer; } + std::wstring const& GetFingerPrintSHA256() const { return m_fingerprint_sha256; } + std::wstring const& GetFingerPrintSHA1() const { return m_fingerprint_sha1; } - CCertificate& operator=(CCertificate const& op); + std::wstring const& GetSubject() const { return m_subject; } + std::wstring const& GetIssuer() const { return m_issuer; } - std::vector const& GetAltSubjectNames() const { return m_altSubjectNames; } + std::vector const& GetAltSubjectNames() const { return m_altSubjectNames; } private: fz::datetime m_activationTime; fz::datetime m_expirationTime; - unsigned char* m_rawData{}; - unsigned int m_len{}; + std::vector m_rawData{}; - wxString m_serial; - wxString m_pkalgoname; + std::wstring m_serial; + std::wstring m_pkalgoname; unsigned int m_pkalgobits{}; - wxString m_signalgoname; + std::wstring m_signalgoname; - wxString m_fingerprint_sha256; - wxString m_fingerprint_sha1; + std::wstring m_fingerprint_sha256; + std::wstring m_fingerprint_sha1; - wxString m_issuer; - wxString m_subject; + std::wstring m_issuer; + std::wstring m_subject; - std::vector m_altSubjectNames; + std::vector m_altSubjectNames; }; class CCertificateNotification final : public CAsyncRequestNotification { public: - CCertificateNotification(const wxString& host, unsigned int port, - const wxString& protocol, - const wxString& keyExchange, - const wxString& sessionCipher, - const wxString& sessionMac, + CCertificateNotification(std::wstring const& host, unsigned int port, + std::wstring const& protocol, + std::wstring const& keyExchange, + std::wstring const& sessionCipher, + std::wstring const& sessionMac, int algorithmWarnings, - const std::vector &certificates); - virtual enum RequestId GetRequestID() const { return reqId_certificate; } + std::vector && certificates, + bool hostnameMismatch); + virtual RequestId GetRequestID() const { return reqId_certificate; } - const wxString& GetHost() const { return m_host; } + std::wstring const& GetHost() const { return m_host; } unsigned int GetPort() const { return m_port; } - const wxString& GetSessionCipher() const { return m_sessionCipher; } - const wxString& GetSessionMac() const { return m_sessionMac; } + std::wstring const& GetSessionCipher() const { return m_sessionCipher; } + std::wstring const& GetSessionMac() const { return m_sessionMac; } bool m_trusted{}; const std::vector GetCertificates() const { return m_certificates; } - const wxString& GetProtocol() const { return m_protocol; } - const wxString& GetKeyExchange() const { return m_keyExchange; } + std::wstring const& GetProtocol() const { return m_protocol; } + std::wstring const& GetKeyExchange() const { return m_keyExchange; } enum algorithm_warnings_t { @@ -414,33 +436,28 @@ int GetAlgorithmWarnings() const { return m_algorithmWarnings; } + bool MismatchedHostname() const { return hostnameMismatch_; } + private: - wxString m_host; + std::wstring m_host; unsigned int m_port{}; - wxString m_protocol; - wxString m_keyExchange; - wxString m_sessionCipher; - wxString m_sessionMac; + std::wstring m_protocol; + std::wstring m_keyExchange; + std::wstring m_sessionCipher; + std::wstring m_sessionMac; int m_algorithmWarnings{}; std::vector m_certificates; + + bool hostnameMismatch_{}; }; -class CSftpEncryptionNotification : public CNotificationHelper +class CSftpEncryptionNotification final : public CNotificationHelper, public CSftpEncryptionDetails { -public: - wxString hostKey; - wxString kexAlgorithm; - wxString kexHash; - wxString kexCurve; - wxString cipherClientToServer; - wxString cipherServerToClient; - wxString macClientToServer; - wxString macServerToClient; }; -class CLocalDirCreatedNotification : public CNotificationHelper +class CLocalDirCreatedNotification final : public CNotificationHelper { public: CLocalPath dir; diff -Nru filezilla-3.15.0.2/src/include/optional.h filezilla-3.33.0/src/include/optional.h --- filezilla-3.15.0.2/src/include/optional.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/optional.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -#ifndef FILEZILLA_OPTIONAL_HEADER -#define FILEZILLA_OPTIONAL_HEADER - -#include - -template class CSparseOptional final -{ - // This class does what std::optional would do, if we had it. - // Note that we do not perform "small object optimization" under the assumption - // that in most cases the optional is not set. -public: - CSparseOptional(); - explicit CSparseOptional(T const& v); - CSparseOptional(CSparseOptional const& v); - CSparseOptional(CSparseOptional && v) noexcept; - ~CSparseOptional(); - - void clear(); - - explicit operator bool() const { return v_ != 0; }; - - T& operator*() { return *v_; } - T const& operator*() const { return *v_; } - - T* operator->() { return v_; } - T const* operator->() const { return v_; } - - bool operator==(CSparseOptional const& cmp) const; - inline bool operator!=(CSparseOptional const& cmp) const { return !(*this == cmp); } - bool operator<(CSparseOptional const& cmp) const; - - CSparseOptional& operator=(CSparseOptional const& v); - CSparseOptional& operator=(CSparseOptional && v) noexcept; -protected: - T* v_; -}; - -template CSparseOptional::CSparseOptional() - : v_() -{ -} - -template CSparseOptional::CSparseOptional(T const& v) - : v_(new T(v)) -{ -} - -template CSparseOptional::CSparseOptional(CSparseOptional const& v) -{ - if( v ) { - v_ = new T(*v); - } - else { - v_ = 0; - } -} - -template CSparseOptional::CSparseOptional(CSparseOptional && v) noexcept -{ - v_ = v.v_; - v.v_ = 0; -} - -template CSparseOptional::~CSparseOptional() -{ - delete v_; -} - -template void CSparseOptional::clear() -{ - delete v_; - v_ = 0; -} - -template CSparseOptional& CSparseOptional::operator=(CSparseOptional const& v) -{ - if( this != &v ) { - delete v_; - if( v.v_ ) { - v_ = new T(*v.v_); - } - else { - v_ = 0; - } - } - - return *this; -} - -template CSparseOptional& CSparseOptional::operator=(CSparseOptional && v) noexcept -{ - if( this != &v ) { - delete v_; - v_ = v.v_; - v.v_ = 0; - } - - return *this; -} - -template bool CSparseOptional::operator==(CSparseOptional const& cmp) const -{ - if( !v_ && !cmp.v_ ) { - return true; - } - - if( !v_ || !cmp.v_ ) { - return false; - } - - return *v_ == *cmp.v_; -} - -template bool CSparseOptional::operator<(CSparseOptional const& cmp) const -{ - if( !v_ || !cmp.v_ ) { - return cmp.operator bool(); - } - - return *v_ < *cmp.v_; -} - -#endif diff -Nru filezilla-3.15.0.2/src/include/option_change_event_handler.h filezilla-3.33.0/src/include/option_change_event_handler.h --- filezilla-3.15.0.2/src/include/option_change_event_handler.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/option_change_event_handler.h 2017-04-23 03:30:02.000000000 +0000 @@ -1,8 +1,7 @@ -#ifndef __OPTION_CHANGE_EVENT_HANDLER_H__ -#define __OPTION_CHANGE_EVENT_HANDLER_H__ +#ifndef FILEZILLA_ENGINE_OPTION_CHANGE_EVENT_HANDLER_HEADER +#define FILEZILLA_ENGINE_OPTION_CHANGE_EVENT_HANDLER_HEADER #include -#include #include class COptions; @@ -18,7 +17,7 @@ friend class COptions; public: - COptionChangeEventHandler(); + COptionChangeEventHandler() = default; virtual ~COptionChangeEventHandler(); void RegisterOption(int option); @@ -40,4 +39,4 @@ static std::vector m_handlers; }; -#endif //__OPTION_CHANGE_EVENT_HANDLER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/include/optionsbase.h filezilla-3.33.0/src/include/optionsbase.h --- filezilla-3.15.0.2/src/include/optionsbase.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/optionsbase.h 2018-01-05 15:02:30.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __OPTIONSBASE_H__ -#define __OPTIONSBASE_H__ +#ifndef FILEZILLA_ENGINE_OPTIONSBASE_HEADER +#define FILEZILLA_ENGINE_OPTIONSBASE_HEADER // The engine of FileZilla 3 can be configured using a few settings. // In order to read and set the settings, the engine has to be passed @@ -7,6 +7,8 @@ // Since COptionsBase is virtual, the user of the engine has to create a // derived class which handles settings-reading and writing. +#include + enum engineOptions { OPTION_USEPASV, // Use passive mode unless overridden by @@ -31,6 +33,7 @@ OPTION_LOGGING_RAWLISTING, OPTION_FZSFTP_EXECUTABLE, // full path to fzsftp executable + OPTION_FZSTORJ_EXECUTABLE, OPTION_ALLOW_TRANSFERMODEFALLBACK, // If PORT fails, allow PASV and vice versa @@ -76,18 +79,28 @@ OPTION_SIZE_USETHOUSANDSEP, OPTION_SIZE_DECIMALPLACES, + OPTION_TCP_KEEPALIVE_INTERVAL, + + OPTION_CACHE_TTL, + OPTIONS_ENGINE_NUM }; +namespace pugi { +class xml_document; +} + class COptionsBase { public: inline virtual ~COptionsBase() {}; virtual int GetOptionVal(unsigned int nID) = 0; - virtual wxString GetOption(unsigned int nID) = 0; + virtual std::wstring GetOption(unsigned int nID) = 0; + virtual std::unique_ptr GetOptionXml(unsigned int nID) = 0; virtual bool SetOption(unsigned int nID, int value) = 0; - virtual bool SetOption(unsigned int nID, wxString const& value) = 0; + virtual bool SetOption(unsigned int nID, std::wstring const& value) = 0; + virtual bool SetOptionXml(unsigned int nID, std::unique_ptr const& value) = 0; }; #endif diff -Nru filezilla-3.15.0.2/src/include/refcount.h filezilla-3.33.0/src/include/refcount.h --- filezilla-3.15.0.2/src/include/refcount.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/refcount.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,208 +0,0 @@ -#ifndef __REFCOUNT_H__ -#define __REFCOUNT_H__ - -#include -#include - -// Template class to refcount objects with COW semantics. -// This class is thread-safe under the following assumptions: -// - The object stored in it must be thread-safe for reading -// - Any instance Get() is called on must never be used in -// different threads. -template class CRefcountObject final -{ -public: - CRefcountObject(); - CRefcountObject(CRefcountObject const& v) = default; - CRefcountObject(CRefcountObject && v) noexcept = default; - explicit CRefcountObject(const T& v); - - void clear(); - - T& Get(); - - const T& operator*() const; - const T* operator->() const; - - // Comparison operators are deep. If two intances point to - // different objects, those objects are compared - bool operator==(CRefcountObject const& cmp) const; - bool operator==(T const& cmp) const; - bool operator<(CRefcountObject const& cmp) const; - bool operator<(T const& cmp) const; - - inline bool operator!=(const CRefcountObject& cmp) const { return !(*this == cmp); } - - CRefcountObject& operator=(CRefcountObject const& v) = default; - CRefcountObject& operator=(CRefcountObject && v) noexcept = default; -protected: - std::shared_ptr data_; -}; - -template class CRefcountObject_Uninitialized final -{ - /* Almost same as CRefcountObject but does not allocate - an object initially. - You need to ensure to assign some data prior to calling - operator* or ->, otherwise you'll dereference the null-pointer. - */ -public: - CRefcountObject_Uninitialized() = default; - CRefcountObject_Uninitialized(CRefcountObject_Uninitialized const& v) = default; - CRefcountObject_Uninitialized(CRefcountObject_Uninitialized && v) noexcept = default; - explicit CRefcountObject_Uninitialized(T const& v); - - void clear(); - - T& Get(); - - const T& operator*() const; - const T* operator->() const; - - bool operator==(const CRefcountObject_Uninitialized& cmp) const; - inline bool operator!=(const CRefcountObject_Uninitialized& cmp) const { return !(*this == cmp); } - bool operator<(const CRefcountObject_Uninitialized& cmp) const; - - CRefcountObject_Uninitialized& operator=(CRefcountObject_Uninitialized const& v) = default; - CRefcountObject_Uninitialized& operator=(CRefcountObject_Uninitialized && v) noexcept = default; - - bool operator!() const { return !data_; } - explicit operator bool() const { return data_; } - - bool empty() const { return data_.get(); } -protected: - std::shared_ptr data_; -}; - -template bool CRefcountObject::operator==(CRefcountObject const& cmp) const -{ - if (data_ == cmp.data_) - return true; - - return *data_ == *cmp.data_; -} - -template bool CRefcountObject::operator==(T const& cmp) const -{ - return *data_ == cmp; -} - -template CRefcountObject::CRefcountObject() - : data_(std::make_shared()) -{ -} - -template CRefcountObject::CRefcountObject(const T& v) - : data_(std::make_shared(v)) -{ -} - -template T& CRefcountObject::Get() -{ - if (!data_.unique()) { - data_ = std::make_shared(*data_); - } - - return *data_.get(); -} - -template bool CRefcountObject::operator<(CRefcountObject const& cmp) const -{ - if (data_ == cmp.data_) - return false; - - return *data_.get() < *cmp.data_.get(); -} - -template bool CRefcountObject::operator<(T const& cmp) const -{ - if (!data_) { - return true; - } - return *data_.get() < cmp; -} - -template void CRefcountObject::clear() -{ - if (data_.unique()) { - *data_.get() = T(); - } - else { - data_ = std::make_shared(); - } -} - -template const T& CRefcountObject::operator*() const -{ - return *data_; -} - -template const T* CRefcountObject::operator->() const -{ - return data_.get(); -} - -// The same for the uninitialized version -template bool CRefcountObject_Uninitialized::operator==(const CRefcountObject_Uninitialized& cmp) const -{ - if (data_ == cmp.data_) - return true; - - if (!data_) { - return !cmp.data_; - } - else if (!cmp.data_) { - return false; - } - return *data_.get() == *cmp.data_.get(); -} - -template CRefcountObject_Uninitialized::CRefcountObject_Uninitialized(T const& v) - : data_(std::make_shared(v)) -{ -} - -template T& CRefcountObject_Uninitialized::Get() -{ - if (!data_) { - data_ = std::make_shared(); - } - else if (!data_.unique()) { - data_ = std::make_shared(*data_); - } - - return *data_.get(); -} - -template bool CRefcountObject_Uninitialized::operator<(const CRefcountObject_Uninitialized& cmp) const -{ - if (data_ == cmp.data_) { - return false; - } - else if (!data_) { - return cmp.data_; - } - else if (!cmp.data_) { - return false; - } - - return *data_.get() < *cmp.data_.get(); - -} - -template void CRefcountObject_Uninitialized::clear() -{ - data_.reset(); -} - -template const T& CRefcountObject_Uninitialized::operator*() const -{ - return *data_.get(); -} - -template const T* CRefcountObject_Uninitialized::operator->() const -{ - return data_.get(); -} - -#endif //__REFCOUNT_H__ diff -Nru filezilla-3.15.0.2/src/include/server.h filezilla-3.33.0/src/include/server.h --- filezilla-3.15.0.2/src/include/server.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/server.h 2018-04-27 11:26:14.000000000 +0000 @@ -1,10 +1,10 @@ -#ifndef __SERVER_H__ -#define __SERVER_H__ +#ifndef FILEZILLA_ENGINE_SERVER_HEADER +#define FILEZILLA_ENGINE_SERVER_HEADER enum ServerProtocol { // Never change any existing values or user's saved sites will become - // corrupted. + // corrupted UNKNOWN = -1, FTP, // FTP, attempts AUTH TLS SFTP, @@ -14,7 +14,20 @@ HTTPS, INSECURE_FTP, // Insecure, as the name suggests - MAX_VALUE = INSECURE_FTP + S3, // Amazon S3 or compatible + + STORJ, + + WEBDAV, + + AZURE_FILE, + AZURE_BLOB, + + SWIFT, + + GOOGLE, + + MAX_VALUE = GOOGLE }; enum ServerType @@ -22,29 +35,18 @@ DEFAULT, UNIX, VMS, - DOS, + DOS, // Backslashes as preferred separator MVS, VXWORKS, ZVM, HPNONSTOP, DOS_VIRTUAL, CYGWIN, + DOS_FWD_SLASHES, // Forwardslashes as preferred separator SERVERTYPE_MAX }; -enum LogonType -{ - ANONYMOUS, - NORMAL, - ASK, // ASK should not be sent to the engine, it's intended to be used by the interface - INTERACTIVE, - ACCOUNT, - KEY, - - LOGONTYPE_MAX -}; - enum PasvMode { MODE_DEFAULT, @@ -52,6 +54,15 @@ MODE_PASSIVE }; +enum class ServerFormat +{ + host_only, + with_optional_port, + with_user_and_optional_port, + url, + url_with_password +}; + enum CharsetEncoding { ENCODING_AUTO, @@ -59,117 +70,148 @@ ENCODING_CUSTOM }; +enum class ProtocolFeature +{ + DataTypeConcept, // Some protocol distinguish between ASCII and binary files for line-ending conversion. + TransferMode, + PreserveTimestamp, + Charset, + ServerType, + EnterCommand, + DirectoryRename, + PostLoginCommands +}; + +class Credentials; class CServerPath; class CServer final { public: // No error checking is done in the constructors - CServer(); - CServer(wxString host, unsigned int); - CServer(wxString host, unsigned int, wxString user, wxString pass = wxString()); - CServer(ServerProtocol protocol, ServerType type, wxString host, unsigned int); - CServer(ServerProtocol protocol, ServerType type, wxString host, unsigned int, wxString user, wxString pass = wxString(), wxString account = wxString()); + CServer() = default; + CServer(ServerProtocol protocol, ServerType type, std::wstring const& host, unsigned int); + + void clear(); void SetType(ServerType type); ServerProtocol GetProtocol() const; ServerType GetType() const; - wxString GetHost() const; + std::wstring GetHost() const; unsigned int GetPort() const; - LogonType GetLogonType() const; - wxString GetUser() const; - wxString GetPass() const; - wxString GetAccount() const; - wxString GetKeyFile() const; + std::wstring GetUser() const; int GetTimezoneOffset() const; PasvMode GetPasvMode() const; int MaximumMultipleConnections() const; bool GetBypassProxy() const; - // Return true if URL could be parsed correctly, false otherwise. - // If parsing fails, pError is filled with the reason and the CServer instance may be left an undefined state. - bool ParseUrl(wxString host, unsigned int port, wxString user, wxString pass, wxString &error, CServerPath &path); - bool ParseUrl(wxString host, wxString port, wxString user, wxString pass, wxString &error, CServerPath &path); - void SetProtocol(ServerProtocol serverProtocol); - bool SetHost(wxString Host, unsigned int port); + bool SetHost(std::wstring const& host, unsigned int port); - void SetLogonType(LogonType logonType); - bool SetUser(const wxString& user, const wxString& pass = wxString()); - bool SetAccount(const wxString& account); - bool SetKeyFile(const wxString& keyFile); + void SetUser(std::wstring const& user); CServer& operator=(const CServer &op); bool operator==(const CServer &op) const; bool operator<(const CServer &op) const; bool operator!=(const CServer &op) const; - bool EqualsNoPass(const CServer &op) const; bool SetTimezoneOffset(int minutes); void SetPasvMode(PasvMode pasvMode); void MaximumMultipleConnections(int maximum); - wxString FormatHost(bool always_omit_port = false) const; - wxString FormatServer(const bool always_include_prefix = false) const; + std::wstring Format(ServerFormat formatType) const; + std::wstring Format(ServerFormat formatType, Credentials const& credentials) const; - bool SetEncodingType(CharsetEncoding type, const wxString& encoding = wxString()); - bool SetCustomEncoding(const wxString& encoding); + bool SetEncodingType(CharsetEncoding type, std::wstring const& encoding = std::wstring()); + bool SetCustomEncoding(std::wstring const& encoding); CharsetEncoding GetEncodingType() const; - wxString GetCustomEncoding() const; + std::wstring GetCustomEncoding() const; static unsigned int GetDefaultPort(ServerProtocol protocol); static ServerProtocol GetProtocolFromPort(unsigned int port, bool defaultOnly = false); - static wxString GetProtocolName(ServerProtocol protocol); - static ServerProtocol GetProtocolFromName(const wxString& name); + static std::wstring GetProtocolName(ServerProtocol protocol); + static ServerProtocol GetProtocolFromName(std::wstring const& name); - static ServerProtocol GetProtocolFromPrefix(const wxString& prefix); - static wxString GetPrefixFromProtocol(const ServerProtocol protocol); + static ServerProtocol GetProtocolFromPrefix(std::wstring const& prefix, ServerProtocol const hint = UNKNOWN); + static std::wstring GetPrefixFromProtocol(ServerProtocol const protocol); + static std::vector const& GetDefaultProtocols(); - // Some protocol distinguish between ASCII and binary files for line-ending - // conversion. - static bool ProtocolHasDataTypeConcept(ServerProtocol const protocol); + static bool ProtocolHasFeature(ServerProtocol const protocol, ProtocolFeature const feature); // These commands will be executed after a successful login. - const std::vector& GetPostLoginCommands() const { return m_postLoginCommands; } - bool SetPostLoginCommands(const std::vector& postLoginCommands); - static bool SupportsPostLoginCommands(ServerProtocol const protocol); + std::vector const& GetPostLoginCommands() const { return m_postLoginCommands; } + bool SetPostLoginCommands(std::vector const& postLoginCommands); void SetBypassProxy(bool val); // Abstract server name. // Not compared in ==, < and related operators - void SetName(const wxString& name) { m_name = name; } - wxString GetName() const { return m_name; } + void SetName(std::wstring const& name) { m_name = name; } + std::wstring GetName() const { return m_name; } - static wxString GetNameFromServerType(ServerType type); - static ServerType GetServerTypeFromName(const wxString& name); + static std::wstring GetNameFromServerType(ServerType type); + static ServerType GetServerTypeFromName(std::wstring const& name); - static wxString GetNameFromLogonType(LogonType type); - static LogonType GetLogonTypeFromName(const wxString& name); + bool empty() const { return m_host.empty(); } + explicit operator bool() const { return !empty(); } protected: - void Initialize(); + ServerProtocol m_protocol{UNKNOWN}; + ServerType m_type{DEFAULT}; + std::wstring m_host; + unsigned int m_port{21}; + std::wstring m_user; + int m_timezoneOffset{}; + PasvMode m_pasvMode{MODE_DEFAULT}; + int m_maximumMultipleConnections{}; + CharsetEncoding m_encodingType{ENCODING_AUTO}; + std::wstring m_customEncoding; + std::wstring m_name; + + std::vector m_postLoginCommands; + bool m_bypassProxy{}; +}; + - ServerProtocol m_protocol; - ServerType m_type; - wxString m_host; - unsigned int m_port; - LogonType m_logonType; - wxString m_user; - wxString m_pass; - wxString m_account; - wxString m_keyFile; - int m_timezoneOffset; - PasvMode m_pasvMode; - int m_maximumMultipleConnections; - CharsetEncoding m_encodingType; - wxString m_customEncoding; - wxString m_name; +enum class LogonType +{ + anonymous, + normal, + ask, // ask should not be sent to the engine, it's intended to be used by the interface + interactive, + account, + key, - std::vector m_postLoginCommands; - bool m_bypassProxy; + count +}; +std::wstring GetNameFromLogonType(LogonType type); +LogonType GetLogonTypeFromName(std::wstring const& name); + + +class Credentials +{ +public: + virtual ~Credentials() = default; + + bool operator==(Credentials const& rhs) const { + return + logonType_ == rhs.logonType_ && + password_ == rhs.password_ && + account_ == rhs.account_ && + keyFile_ == rhs.keyFile_; + } + + void SetPass(std::wstring const& password); + std::wstring GetPass() const; + + LogonType logonType_{LogonType::anonymous}; + std::wstring account_; + std::wstring keyFile_; + +protected: + std::wstring password_; }; #endif diff -Nru filezilla-3.15.0.2/src/include/serverpath.h filezilla-3.33.0/src/include/serverpath.h --- filezilla-3.15.0.2/src/include/serverpath.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/serverpath.h 2017-12-17 12:14:41.000000000 +0000 @@ -1,16 +1,16 @@ -#ifndef __SERVERPATH_H__ -#define __SERVERPATH_H__ +#ifndef FILEZILLA_ENGINE_SERVERPATH_HEADER +#define FILEZILLA_ENGINE_SERVERPATH_HEADER -#include "optional.h" -#include "refcount.h" +#include +#include #include class CServerPathData final { public: - std::deque m_segments; - CSparseOptional m_prefix; + std::deque m_segments; + fz::sparse_optional m_prefix; bool operator==(const CServerPathData& cmp) const; }; @@ -19,8 +19,8 @@ { public: CServerPath(); - explicit CServerPath(wxString const& path, ServerType type = DEFAULT); - CServerPath(CServerPath const& path, wxString subdir); // Ignores parent on absolute subdir + explicit CServerPath(std::wstring const& path, ServerType type = DEFAULT); + CServerPath(CServerPath const& path, std::wstring subdir); // Ignores parent on absolute subdir CServerPath(CServerPath const& path) = default; CServerPath(CServerPath && path) noexcept = default; @@ -30,63 +30,67 @@ bool empty() const { return !m_data; } void clear(); - bool SetPath(wxString newPath); - bool SetPath(wxString &newPath, bool isFile); - bool SetSafePath(const wxString& path); + bool SetPath(std::wstring newPath); + bool SetPath(std::wstring& newPath, bool isFile); + bool SetSafePath(std::wstring const& path); // If ChangePath returns false, the object will be left // empty. - bool ChangePath(wxString subdir); - bool ChangePath(wxString &subdir, bool isFile); + bool ChangePath(std::wstring const& subdir); + bool ChangePath(std::wstring &subdir, bool isFile); - wxString GetPath() const; - wxString GetSafePath() const; + std::wstring GetPath() const; + std::wstring GetSafePath() const; bool HasParent() const; CServerPath GetParent() const; - wxString GetLastSegment() const; + CServerPath& MakeParent(); + std::wstring GetFirstSegment() const; + std::wstring GetLastSegment() const; - CServerPath GetCommonParent(const CServerPath& path) const; + CServerPath GetCommonParent(CServerPath const& path) const; bool SetType(ServerType type); ServerType GetType() const; - bool IsSubdirOf(const CServerPath &path, bool cmpNoCase) const; - bool IsParentOf(const CServerPath &path, bool cmpNoCase) const; + bool IsSubdirOf(CServerPath const& path, bool cmpNoCase) const; + bool IsParentOf(CServerPath const& path, bool cmpNoCase) const; - bool operator==(const CServerPath &op) const; - bool operator!=(const CServerPath &op) const; - bool operator<(const CServerPath &op) const; + bool operator==(CServerPath const& op) const; + bool operator!=(CServerPath const& op) const; + bool operator<(CServerPath const& op) const; - int CmpNoCase(const CServerPath &op) const; + int CmpNoCase(CServerPath const& op) const; // omitPath is just a hint. For example dataset member names on MVS servers // always use absolute filenames including the full path - wxString FormatFilename(const wxString &filename, bool omitPath = false) const; + std::wstring FormatFilename(std::wstring const& filename, bool omitPath = false) const; - // Returns identity on all but VMS. On VMS it esscapes dots - wxString FormatSubdir(const wxString &subdir) const; + // Returns identity on all but VMS. On VMS it escapes dots + std::wstring FormatSubdir(std::wstring const& subdir) const; - bool AddSegment(const wxString& segment); + bool AddSegment(std::wstring const& segment); size_t SegmentCount() const; private: - bool DoSetSafePath(const wxString& path); - bool DoChangePath(wxString &subdir, bool isFile); + bool IsSeparator(wchar_t c) const; + + bool DoSetSafePath(std::wstring const& path); + bool DoChangePath(std::wstring &subdir, bool isFile); ServerType m_type; - typedef std::deque tSegmentList; + typedef std::deque tSegmentList; typedef tSegmentList::iterator tSegmentIter; typedef tSegmentList::const_iterator tConstSegmentIter; - bool Segmentize(wxString const& str, tSegmentList& segments); - bool SegmentizeAddSegment(wxString & segment, tSegmentList& segments, bool& append); - bool ExtractFile(wxString& dir, wxString& file); + bool Segmentize(std::wstring const& str, tSegmentList& segments); + bool SegmentizeAddSegment(std::wstring & segment, tSegmentList& segments, bool& append); + bool ExtractFile(std::wstring& dir, std::wstring& file); - static void EscapeSeparators(ServerType type, wxString& subdir); + static void EscapeSeparators(ServerType type, std::wstring& subdir); - CRefcountObject_Uninitialized m_data; + fz::shared_optional m_data; }; #endif diff -Nru filezilla-3.15.0.2/src/include/setup.h filezilla-3.33.0/src/include/setup.h --- filezilla-3.15.0.2/src/include/setup.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/setup.h 2018-01-03 04:30:05.000000000 +0000 @@ -1,26 +1,10 @@ -#ifdef _MSC_VER - #ifdef _DEBUG - #include - #define DEBUG_NEW new(_NORMAL_BLOCK ,__FILE__, __LINE__) - #else - #define DEBUG_NEW new - #endif - - #if !wxUSE_PRINTF_POS_PARAMS - #error Please build wxWidgets with support for positional arguments. - #endif - -#else - #define DEBUG_NEW new -#endif - -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS // IE 7 or higher #ifndef _WIN32_IE - #define _WIN32_IE 0x0700 - #elif _WIN32_IE <= 0x0700 + #define _WIN32_IE 0x0900 + #elif _WIN32_IE <= 0x0900 #undef _WIN32_IE - #define _WIN32_IE 0x0700 + #define _WIN32_IE 0x0900 #endif // Windows Vista or higher diff -Nru filezilla-3.15.0.2/src/include/sizeformatting_base.h filezilla-3.33.0/src/include/sizeformatting_base.h --- filezilla-3.15.0.2/src/include/sizeformatting_base.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/include/sizeformatting_base.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __SIZEFORMATTING_BASE_H__ -#define __SIZEFORMATTING_BASE_H__ +#ifndef FILEZILLA_ENGINE_SIZEFORMATTING_BASE_HEADER +#define FILEZILLA_ENGINE_SIZEFORMATTING_BASE_HEADER class COptionsBase; class CSizeFormatBase @@ -28,17 +28,17 @@ exa }; - static wxString FormatNumber(COptionsBase* pOptions, int64_t size, bool* thousands_separator = 0); + static std::wstring FormatNumber(COptionsBase* pOptions, int64_t size, bool* thousands_separator = nullptr); - static wxString GetUnitWithBase(COptionsBase* pOptions, _unit unit, int base); - static wxString GetUnit(COptionsBase* pOptions, _unit unit, _format = formats_count); - static wxString FormatUnit(COptionsBase* pOptions, int64_t size, _unit unit, int base = 1024); + static std::wstring GetUnitWithBase(COptionsBase* pOptions, _unit unit, int base); + static std::wstring GetUnit(COptionsBase* pOptions, _unit unit, _format = formats_count); + static std::wstring FormatUnit(COptionsBase* pOptions, int64_t size, _unit unit, int base = 1024); - static wxString Format(COptionsBase* pOptions, int64_t size, bool add_bytes_suffix, _format format, bool thousands_separator, int num_decimal_places); - static wxString Format(COptionsBase* pOptions, int64_t size, bool add_bytes_suffix = false); + static std::wstring Format(COptionsBase* pOptions, int64_t size, bool add_bytes_suffix, _format format, bool thousands_separator, int num_decimal_places); + static std::wstring Format(COptionsBase* pOptions, int64_t size, bool add_bytes_suffix = false); - static const wxString& GetThousandsSeparator(); - static const wxString& GetRadixSeparator(); + static std::wstring const& GetThousandsSeparator(); + static std::wstring const& GetRadixSeparator(); }; -#endif //__SIZEFORMATTING_BASE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/include/socket.h filezilla-3.33.0/src/include/socket.h --- filezilla-3.15.0.2/src/include/socket.h 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/include/socket.h 2017-05-10 12:47:09.000000000 +0000 @@ -1,15 +1,18 @@ -#ifndef __SOCKET_H__ -#define __SOCKET_H__ +#ifndef FILEZILLA_ENGINE_SOCKET_HEADER +#define FILEZILLA_ENGINE_SOCKET_HEADER #include +#include #include -// IPv6 capable, non-blocking socket class for use with wxWidgets. -// Error codes are the same as used by the POSIX socket functions, -// see 'man 2 socket', 'man 2 connect', ... +/// \private +struct sockaddr; -enum class SocketEventType +namespace fz { +class thread_pool; + +enum class socket_event_flag { // This is a nonfatal condition. It // means there are additional addresses to try. @@ -21,39 +24,80 @@ close }; -class CSocketEventSource +/** + * \brief All classes sending socket events should derive from this. + * + * Allows implementing socket layers, e.g. for TLS. + * + * \sa fz::RemoveSocketEvents + * \sa fz::ChangeSocketEventHandler + */ +class socket_event_source { public: - virtual ~CSocketEventSource() {} + virtual ~socket_event_source() = default; }; +/// \private struct socket_event_type; -typedef fz::simple_event CSocketEvent; - -struct hostaddress_event_type; -typedef fz::simple_event CHostAddressEvent; -class CCallback -{ -public: - virtual void cb() {} -}; +/** + * All socket events are sent through this. + * + * \sa \ref fz::socket_event_flag + */ +typedef simple_event socket_event; -void RemoveSocketEvents(fz::event_handler * handler, CSocketEventSource const* const source); -void ChangeSocketEventHandler(fz::event_handler * oldHandler, fz::event_handler * newHandler, CSocketEventSource const* const source); +/// \private +struct hostaddress_event_type; -class CSocketThread; -class CSocket final : public CSocketEventSource +/** +* Whenever a hostname has been resolved to an IP address, this event is sent with the resolved IP address literal . +*/ +typedef simple_event hostaddress_event; + +/** + * \brief Remove all pendinmg socket events from source sent to handler. + * + * Useful e.g. if you want to destroy the handler but keep the source. + * This function is called, through change_socket_event_handler, by socket::set_event_handler(0) + */ +void remove_socket_events(event_handler * handler, socket_event_source const* const source); + +/** + * \brief Changes all pending socket events from source + * + * If newHandler is null, remove_socket_events is called. + * + * This function is called by socket::set_event_handler(). + * + * \example Possible use-cases: Handoff after proxy handshakes, or handoff to TLS classes in + case of STARTTLS mechanism + */ +void change_socket_event_handler(event_handler * old_handler, event_handler * new_handler, socket_event_source const* const source); + +/// \private +class socket_thread; + +/** + * \brief IPv6 capable, non-blocking socket class + * + * Uses and edge-triggered socket events. + * + * Error codes are the same as used by the POSIX socket functions, + * see 'man 2 socket', 'man 2 connect', ... + */ +class socket final : public socket_event_source { - friend class CSocketThread; + friend class socket_thread; public: - CSocket(fz::event_handler* pEvtHandler); - virtual ~CSocket(); + socket(thread_pool& pool, event_handler* evt_handler); + virtual ~socket(); - CSocket(CSocket const&) = delete; - CSocket& operator=(CSocket const&) = delete; + socket(socket const&) = delete; + socket& operator=(socket const&) = delete; - enum SocketState + enum socket_state { // How the socket is initially none, @@ -70,14 +114,7 @@ closing, closed }; - SocketState GetState(); - - enum address_family - { - unspec, // AF_UNSPEC - ipv4, // AF_INET - ipv6 // AF_INET6 - }; + socket_state get_state(); // Connects to the given host, given as name, IPv4 or IPv6 address. // Returns 0 on success, else an error code. Note: EINPROGRESS is @@ -86,84 +123,140 @@ // If host is a name that can be resolved, a hostaddress socket event gets sent. // Once connections got established, a connection event gets sent. If // connection could not be established, a close event gets sent. - int Connect(wxString const& host, unsigned int port, address_family family = unspec, wxString const& bind = wxString()); + int connect(native_string const& host, unsigned int port, address_type family = address_type::unknown, std::string const& bind = std::string()); // After receiving a send or receive event, you can call these functions // as long as their return value is positive. - int Read(void *buffer, unsigned int size, int& error); - int Peek(void *buffer, unsigned int size, int& error); - int Write(const void *buffer, unsigned int size, int& error); - - int Close(); - - // Returns empty string on error - wxString GetLocalIP(bool strip_zone_index = false) const; - wxString GetPeerIP(bool strip_zone_index = false) const; - - // Returns the hostname passed to Connect() - wxString GetPeerHost() const; - - // -1 on error - int GetLocalPort(int& error); - int GetRemotePort(int& error); - - // If connected, either ipv4 or ipv6, unspec otherwise - address_family GetAddressFamily() const; + int read(void *buffer, unsigned int size, int& error); + int peek(void *buffer, unsigned int size, int& error); + int write(const void *buffer, unsigned int size, int& error); + + int close(); + + /** + * \brief Returns local address of a connected socket + * + * \return empty string on error + */ + std::string local_ip(bool strip_zone_index = false) const; + + /** + * \brief Returns remote address of a connected socket + * + * \return empty string on error + */ + std::string peer_ip(bool strip_zone_index = false) const; + + /// Returns the hostname passed to Connect() + native_string peer_host() const; + + /** + * \brief Returns local port of a connected socket + * + * \return -1 on error + */ + int local_port(int& error); + + /** + * \brief Returns remote port of a connected socket + * + * \return -1 on error + */ + int remote_port(int& error); + + /// If connected, either ipv4 or ipv6, unknown otherwise + address_type address_family() const; + + /** + * \brief Gets a symbolic name for socket errors. + * + * \example error_string(EAGAIN) == "EAGAIN" + * + * \return name if the error code is known + * \return number as string if the error code is not known + */ + static std::string error_string(int error); + + /** + * \brief Gets a human-readable, translated description of the error + */ + static native_string error_description(int error); + + void set_event_handler(event_handler* pEvtHandler); - static wxString GetErrorString(int error); - static wxString GetErrorDescription(int error); + static std::string address_to_string(sockaddr const* addr, int addr_len, bool with_port = true, bool strip_zone_index = false); + static std::string address_to_string(char const* buf, int buf_len); - // Can only be called if the state is none - void SetEventHandler(fz::event_handler* pEvtHandler); - fz::event_handler* GetEventHandler() { return m_pEvtHandler; } + int listen(address_type family, int port = 0); + socket* accept(int& error); - static void Cleanup(bool force); - - static wxString AddressToString(const struct sockaddr* addr, int addr_len, bool with_port = true, bool strip_zone_index = false); - static wxString AddressToString(char const* buf, int buf_len); - - int Listen(address_family family, int port = 0); - CSocket* Accept(int& error); - - enum Flags + enum { + /// flag_nodelay disables Nagle's algorithm flag_nodelay = 0x01, + + /// flag_keepalive enables TCP keepalive. flag_keepalive = 0x02 }; - int GetFlags() const { return m_flags; } - void SetFlags(int flags); - - // If called on listen socket, sizes will be inherited by - // accepted sockets - int SetBufferSizes(int size_read, int size_write); - - void SetSynchronousReadCallback(CCallback* cb); - -protected: - static int DoSetFlags(int fd, int flags, int flags_mask); - static int DoSetBufferSizes(int fd, int size_read, int size_write); - static int SetNonblocking(int fd); - - void DetachThread(); + int flags() const { return flags_; } + void set_flags(int flags); - fz::event_handler* m_pEvtHandler; + /** + * \brief Sets socket buffer sizes. + * + * Internally this sets SO_RCVBUF and SO_SNDBUF on the socket. + * + * If called on listen socket, sizes will be inherited by accepted sockets. + */ + int set_buffer_sizes(int size_receive, int size_send); + + /** + * Sets the interval between TCP keepalive packets. + * + * Duration must not be smaller than 5 minutes. The default interval is 2 hours. + */ + void set_keepalive_interval(duration const& d); + + /** + * On a connected socket, gets the ideal send buffer size or + * -1 if it cannot be determined. + * + * Currently only implemented for Windows. + */ + int ideal_send_buffer_size(); + + /** + * Allows re-triggering the read and write events. + * Slow and cumbersome, use sparingly. + */ + void retrigger(socket_event_flag event); + +private: + static int do_set_flags(int fd, int flags, int flags_mask, duration const& keepalive_interval); + static int do_set_buffer_sizes(int fd, int size_read, int size_write); + static int set_nonblocking(int fd); + + // Note: Unlocks the lock. + void detach_thread(scoped_lock & l); + + thread_pool & thread_pool_; + event_handler* evt_handler_; + + int fd_{-1}; + + socket_state state_{none}; + + socket_thread* socket_thread_{}; + + native_string host_; + unsigned int port_{}; + int family_; - int m_fd; + int flags_{}; + duration keepalive_interval_; - SocketState m_state; - - CSocketThread* m_pSocketThread; - - wxString m_host; - unsigned int m_port; - int m_family; - - int m_flags; - - int m_buffer_sizes[2]; - - CCallback* m_synchronous_read_cb{}; + int buffer_sizes_[2]; }; #ifdef FZ_WINDOWS @@ -233,4 +326,6 @@ // Handle ERROR_NETNAME_DELETED=64 #endif //FZ_WINDOWS -#endif //__SOCKET_H__ +} + +#endif diff -Nru filezilla-3.15.0.2/src/include/xml_string_writer.h filezilla-3.33.0/src/include/xml_string_writer.h --- filezilla-3.15.0.2/src/include/xml_string_writer.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/include/xml_string_writer.h 2018-03-29 08:59:00.000000000 +0000 @@ -0,0 +1,22 @@ +#ifndef FILEZILLA_XML_STRING_WRITER_HEADER +#define FILEZILLA_XML_STRING_WRITER_HEADER + +#include "libfilezilla_engine.h" + +#ifdef HAVE_LIBPUGIXML +#include +#else +#include "../pugixml/pugixml.hpp" +#endif + +struct xml_string_writer : pugi::xml_writer +{ + std::string result_; + + virtual void write(const void* data, size_t size) override + { + result_.append(static_cast(data), size); + } +}; + +#endif diff -Nru filezilla-3.15.0.2/src/include/xmlutils.h filezilla-3.33.0/src/include/xmlutils.h --- filezilla-3.15.0.2/src/include/xmlutils.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/include/xmlutils.h 2018-01-05 15:02:30.000000000 +0000 @@ -0,0 +1,51 @@ +/* + * xmlutils.h declares some useful xml helper function + */ + +#ifndef FILEZILLA_XMLUTILS_HEADER +#define FILEZILLA_XMLUTILS_HEADER + +#include "libfilezilla_engine.h" + +#ifdef HAVE_LIBPUGIXML +#include +#else +#include "../pugixml/pugixml.hpp" +#endif + +void SetTextAttribute(pugi::xml_node node, char const* name, std::string const& value); +void SetTextAttribute(pugi::xml_node node, char const* name, std::wstring const& value); +void SetTextAttributeUtf8(pugi::xml_node node, char const* name, std::string const& utf8); +std::wstring GetTextAttribute(pugi::xml_node node, char const* name); + +int GetAttributeInt(pugi::xml_node node, char const* name); +void SetAttributeInt(pugi::xml_node node, char const* name, int value); + +pugi::xml_node FindElementWithAttribute(pugi::xml_node node, char const* element, char const* attribute, char const* value); + +// Add a new child element with the specified name and value to the xml document +pugi::xml_node AddTextElement(pugi::xml_node node, char const* name, std::string const& value, bool overwrite = false); +pugi::xml_node AddTextElement(pugi::xml_node node, char const* name, std::wstring const& value, bool overwrite = false); +void AddTextElement(pugi::xml_node node, char const* name, int64_t value, bool overwrite = false); +pugi::xml_node AddTextElementUtf8(pugi::xml_node node, char const* name, std::string const& value, bool overwrite = false); + +// Set the current element's text value +void AddTextElement(pugi::xml_node node, std::string const& value); +void AddTextElement(pugi::xml_node node, std::wstring const& value); +void AddTextElement(pugi::xml_node node, int64_t value); +void AddTextElementUtf8(pugi::xml_node node, std::string const& value); + +// Get string from named child element +std::wstring GetTextElement(pugi::xml_node node, const char* name); +std::wstring GetTextElement_Trimmed(pugi::xml_node node, const char* name); + +// Get string from current element +std::wstring GetTextElement(pugi::xml_node node); +std::wstring GetTextElement_Trimmed(pugi::xml_node node); + +// Get (64-bit) integer from named element +int64_t GetTextElementInt(pugi::xml_node node, const char* name, int defValue = 0); + +bool GetTextElementBool(pugi::xml_node node, const char* name, bool defValue = false); + +#endif diff -Nru filezilla-3.15.0.2/src/interface/aboutdialog.cpp filezilla-3.33.0/src/interface/aboutdialog.cpp --- filezilla-3.15.0.2/src/interface/aboutdialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/aboutdialog.cpp 2018-01-03 04:30:05.000000000 +0000 @@ -4,6 +4,7 @@ #include "buildinfo.h" #include "xrc_helper.h" #include "Options.h" +#include "themeprovider.h" #include @@ -17,17 +18,23 @@ bool CAboutDialog::Create(wxWindow* parent) { - if (!Load(parent, _T("ID_ABOUT"))) + if (!Load(parent, _T("ID_ABOUT"))) { return false; + } + + wxBitmap bmp = CThemeProvider::Get()->CreateBitmap("ART_FILEZILLA", wxString(), CThemeProvider::GetIconSize(iconSizeLarge)); + xrc_call(*this, "ID_FILEZILLA_LOGO", &wxStaticBitmap::SetBitmap, bmp); xrc_call(*this, "ID_URL", &wxHyperlinkCtrl::SetLabel, _T("https://filezilla-project.org/")); - xrc_call(*this, "ID_COPYRIGHT", &wxStaticText::SetLabel, _T("Copyright (C) 2004-2016 Tim Kosse")); + xrc_call(*this, "ID_COPYRIGHT", &wxStaticText::SetLabel, _T("Copyright (C) 2004-2018 Tim Kosse")); wxString version = CBuildInfo::GetVersion(); - if (CBuildInfo::GetBuildType() == _T("nightly")) + if (CBuildInfo::GetBuildType() == _T("nightly")) { version += _T("-nightly"); - if (!SetChildLabel(XRCID("ID_VERSION"), version)) + } + if (!SetChildLabel(XRCID("ID_VERSION"), version)) { return false; + } wxString const host = CBuildInfo::GetHostname(); if (host.empty()) { @@ -47,11 +54,13 @@ xrc_call(*this, "ID_BUILD", &wxStaticText::SetLabel, build); } - if (!SetChildLabel(XRCID("ID_BUILDDATE"), CBuildInfo::GetBuildDateString())) + if (!SetChildLabel(XRCID("ID_BUILDDATE"), CBuildInfo::GetBuildDateString())) { return false; + } - if (!SetChildLabel(XRCID("ID_COMPILEDWITH"), CBuildInfo::GetCompiler(), 200)) + if (!SetChildLabel(XRCID("ID_COMPILEDWITH"), CBuildInfo::GetCompiler(), 200)) { return false; + } wxString compilerFlags = CBuildInfo::GetCompilerFlags(); if (compilerFlags.empty()) { @@ -59,13 +68,13 @@ xrc_call(*this, "ID_CFLAGS_DESC", &wxStaticText::Hide); } else { - WrapText(this, compilerFlags, 250); + WrapText(this, compilerFlags, 300); xrc_call(*this, "ID_CFLAGS", &wxStaticText::SetLabel, compilerFlags); } - xrc_call(*this, "ID_VER_WX", &wxStaticText::SetLabel, GetDependencyVersion(dependency::wxwidgets)); - xrc_call(*this, "ID_VER_GNUTLS", &wxStaticText::SetLabel, GetDependencyVersion(dependency::gnutls)); - xrc_call(*this, "ID_VER_SQLITE", &wxStaticText::SetLabel, GetDependencyVersion(dependency::sqlite)); + xrc_call(*this, "ID_VER_WX", &wxStaticText::SetLabel, GetDependencyVersion(gui_lib_dependency::wxwidgets)); + xrc_call(*this, "ID_VER_GNUTLS", &wxStaticText::SetLabel, GetDependencyVersion(lib_dependency::gnutls)); + xrc_call(*this, "ID_VER_SQLITE", &wxStaticText::SetLabel, GetDependencyVersion(gui_lib_dependency::sqlite)); wxString const os = wxGetOsDescription(); if (os.empty()) { @@ -92,10 +101,12 @@ } #ifdef __WXMSW__ - if (::wxIsPlatform64Bit()) + if (::wxIsPlatform64Bit()) { xrc_call(*this, "ID_SYSTEM_PLATFORM", &wxStaticText::SetLabel, _("64-bit system")); - else + } + else { xrc_call(*this, "ID_SYSTEM_PLATFORM", &wxStaticText::SetLabel, _("32-bit system")); + } #else xrc_call(*this, "ID_SYSTEM_PLATFORM", &wxStaticText::Hide); xrc_call(*this, "ID_SYSTEM_PLATFORM_DESC", &wxStaticText::Hide); @@ -103,7 +114,7 @@ wxString cpuCaps = CBuildInfo::GetCPUCaps(' '); if (!cpuCaps.empty()) { - WrapText(this, cpuCaps, 250); + WrapText(this, cpuCaps, 300); xrc_call(*this, "ID_SYSTEM_CPU", &wxStaticText::SetLabel, cpuCaps); } else { @@ -130,46 +141,55 @@ text += _T("----------------\n\n"); text += _T("Version: ") + CBuildInfo::GetVersion(); - if (CBuildInfo::GetBuildType() == _T("nightly")) + if (CBuildInfo::GetBuildType() == _T("nightly")) { text += _T("-nightly"); + } text += '\n'; text += _T("\nBuild information:\n"); wxString host = CBuildInfo::GetHostname(); - if (!host.empty()) + if (!host.empty()) { text += _T(" Compiled for: ") + host + _T("\n"); + } wxString build = CBuildInfo::GetBuildSystem(); - if (!build.empty()) + if (!build.empty()) { text += _T(" Compiled on: ") + build + _T("\n"); + } text += _T(" Build date: ") + CBuildInfo::GetBuildDateString() + _T("\n"); text += _T(" Compiled with: ") + CBuildInfo::GetCompiler() + _T("\n"); wxString compilerFlags = CBuildInfo::GetCompilerFlags(); - if (!compilerFlags.empty()) + if (!compilerFlags.empty()) { text += _T(" Compiler flags: ") + compilerFlags + _T("\n"); + } text += _T("\nLinked against:\n"); - for (int i = 0; i < dependency::count; ++i) { + for (int i = 0; i < static_cast(gui_lib_dependency::count); ++i) { + text += wxString::Format(_T(" % -15s %s\n"), + GetDependencyName(gui_lib_dependency(i)) + _T(":"), + GetDependencyVersion(gui_lib_dependency(i))); + } + for (int i = 0; i < static_cast(lib_dependency::count); ++i) { text += wxString::Format(_T(" % -15s %s\n"), - GetDependencyName(dependency::type(i)) + _T(":"), - GetDependencyVersion(dependency::type(i))); + GetDependencyName(lib_dependency(i)) + _T(":"), + GetDependencyVersion(lib_dependency(i))); } text += _T("\nOperating system:\n"); wxString os = wxGetOsDescription(); - if (!os.empty()) + if (!os.empty()) { text += _T(" Name: ") + os + _T("\n"); + } int major, minor; if (GetRealOsVersion(major, minor)) { wxString version = wxString::Format(_T("%d.%d"), major, minor); int fakeMajor, fakeMinor; - if (wxGetOsVersion(&fakeMajor, &fakeMinor) != wxOS_UNKNOWN && (fakeMajor != major || fakeMinor != minor)) - { + if (wxGetOsVersion(&fakeMajor, &fakeMinor) != wxOS_UNKNOWN && (fakeMajor != major || fakeMinor != minor)) { version += _T(" "); version += wxString::Format(_("(app-compat is set to %d.%d)"), fakeMajor, fakeMinor); } @@ -177,10 +197,12 @@ } #ifdef __WXMSW__ - if (::wxIsPlatform64Bit()) + if (::wxIsPlatform64Bit()) { text += _T(" Platform: 64-bit system\n"); - else + } + else { text += _T(" Platform: 32-bit system\n"); + } #endif wxString cpuCaps = CBuildInfo::GetCPUCaps(' '); diff -Nru filezilla-3.15.0.2/src/interface/aboutdialog.h filezilla-3.33.0/src/interface/aboutdialog.h --- filezilla-3.15.0.2/src/interface/aboutdialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/aboutdialog.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,13 +1,12 @@ -#ifndef __ABOUTDIALOG_H__ -#define __ABOUTDIALOG_H__ +#ifndef FILEZILLA_INTERFACE_ABOUTDIALOG_HEADER +#define FILEZILLA_INTERFACE_ABOUTDIALOG_HEADER #include "dialogex.h" -class CAboutDialog : public wxDialogEx +class CAboutDialog final : public wxDialogEx { public: - CAboutDialog() {} - virtual ~CAboutDialog() {} + CAboutDialog() = default; bool Create(wxWindow* parent); @@ -18,4 +17,4 @@ void OnCopy(wxCommandEvent&); }; -#endif //__ABOUTDIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/asksavepassworddialog.cpp filezilla-3.33.0/src/interface/asksavepassworddialog.cpp --- filezilla-3.15.0.2/src/interface/asksavepassworddialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/asksavepassworddialog.cpp 2017-09-26 03:30:02.000000000 +0000 @@ -4,55 +4,86 @@ #include "filezillaapp.h" #include "xrc_helper.h" #include "sitemanager.h" - -BEGIN_EVENT_TABLE(CAskSavePasswordDialog, wxDialogEx) -EVT_RADIOBUTTON(XRCID("ID_REMEMBER_YES"), CAskSavePasswordDialog::OnRadioButtonChanged) -EVT_RADIOBUTTON(XRCID("ID_REMEMBER_NO"), CAskSavePasswordDialog::OnRadioButtonChanged) -END_EVENT_TABLE() +#include bool CAskSavePasswordDialog::Create(wxWindow*) { - if (!Load(0, _T("ID_ASK_SAVE_PASSWORD"))) { + if (!Load(nullptr, _T("ID_ASK_SAVE_PASSWORD"))) { return false; } - wxButton* ok = XRCCTRL(*this, "wxID_OK", wxButton); - if (ok) - ok->Enable(false); - wxGetApp().GetWrapEngine()->WrapRecursive(this, 2, ""); + auto onChange = [this](wxEvent const&) { + bool checked = xrc_call(*this, "ID_PASSWORDS_USEMASTERPASSWORD", &wxRadioButton::GetValue); + xrc_call(*this, "ID_MASTERPASSWORD", &wxControl::Enable, checked); + xrc_call(*this, "ID_MASTERPASSWORD_REPEAT", &wxControl::Enable, checked); + + }; + onChange(wxCommandEvent()); + + XRCCTRL(*this, "ID_PASSWORDS_SAVE", wxEvtHandler)->Bind(wxEVT_RADIOBUTTON, onChange); + XRCCTRL(*this, "ID_PASSWORDS_NOSAVE", wxEvtHandler)->Bind(wxEVT_RADIOBUTTON, onChange); + XRCCTRL(*this, "ID_PASSWORDS_USEMASTERPASSWORD", wxEvtHandler)->Bind(wxEVT_RADIOBUTTON, onChange); + + XRCCTRL(*this, "wxID_OK", wxButton)->Bind(wxEVT_BUTTON, &CAskSavePasswordDialog::OnOk, &*this); + return true; } +void CAskSavePasswordDialog::OnOk(wxCommandEvent& event) +{ + bool useMaster = xrc_call(*this, "ID_PASSWORDS_USEMASTERPASSWORD", &wxRadioButton::GetValue); + if (useMaster) { + wxString pw = xrc_call(*this, "ID_MASTERPASSWORD", &wxTextCtrl::GetValue); + wxString repeat = xrc_call(*this, "ID_MASTERPASSWORD_REPEAT", &wxTextCtrl::GetValue); + if (pw != repeat) { + wxMessageBox(_("The entered passwords are not the same."), _("Invalid input")); + return; + } + + if (pw.size() < 8) { + wxMessageBox(_("The master password needs to be at least 8 characters long."), _("Invalid input")); + return; + } + + auto priv = private_key::from_password(fz::to_utf8(pw), fz::random_bytes(private_key::salt_size)); + auto pub = priv.pubkey(); + if (!pub) { + wxMessageBox(_("Could not generate key"), _("Error")); + return; + } + else { + COptions::Get()->SetOption(OPTION_DEFAULT_KIOSKMODE, 0); + COptions::Get()->SetOption(OPTION_MASTERPASSWORDENCRYPTOR, fz::to_wstring_from_utf8(pub.to_base64())); + } + } + else { + bool save = xrc_call(*this, "ID_PASSWORDS_SAVE", &wxRadioButton::GetValue); + COptions::Get()->SetOption(OPTION_DEFAULT_KIOSKMODE, save ? 0 : 1); + COptions::Get()->SetOption(OPTION_MASTERPASSWORDENCRYPTOR, std::wstring()); + } + event.Skip(); +} bool CAskSavePasswordDialog::Run(wxWindow* parent) { bool ret = true; - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 0 && COptions::Get()->GetOptionVal(OPTION_PROMPTPASSWORDSAVE) != 0 && !CSiteManager::HasSites()) { + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 0 && COptions::Get()->GetOptionVal(OPTION_PROMPTPASSWORDSAVE) != 0 && + !CSiteManager::HasSites() && COptions::Get()->GetOption(OPTION_MASTERPASSWORDENCRYPTOR).empty()) + { CAskSavePasswordDialog dlg; if (dlg.Create(parent)) { ret = dlg.ShowModal() == wxID_OK; if (ret) { - if (xrc_call(dlg, "ID_REMEMBER_NO", &wxRadioButton::GetValue)) { - COptions::Get()->SetOption(OPTION_DEFAULT_KIOSKMODE, 1); - } COptions::Get()->SetOption(OPTION_PROMPTPASSWORDSAVE, 0); } } } - else + else { COptions::Get()->SetOption(OPTION_PROMPTPASSWORDSAVE, 0); + } return ret; } - -void CAskSavePasswordDialog::OnRadioButtonChanged(wxCommandEvent&) -{ - wxRadioButton* yes = XRCCTRL(*this, "ID_REMEMBER_NO", wxRadioButton); - wxRadioButton* no = XRCCTRL(*this, "ID_REMEMBER_YES", wxRadioButton); - wxButton* ok = XRCCTRL(*this, "wxID_OK", wxButton); - if (yes && no && ok) - ok->Enable(yes->GetValue() || no->GetValue()); -} diff -Nru filezilla-3.15.0.2/src/interface/asksavepassworddialog.h filezilla-3.33.0/src/interface/asksavepassworddialog.h --- filezilla-3.15.0.2/src/interface/asksavepassworddialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/asksavepassworddialog.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,17 +1,16 @@ -#ifndef __ASKSAVEPASSWORDDIALOG_H__ -#define __ASKSAVEPASSWORDDIALOG_H__ +#ifndef FILEZILLA_INTERFACE_ASKSAVEPASSWORDDIALOG_HEADER +#define FILEZILLA_INTERFACE_ASKSAVEPASSWORDDIALOG_HEADER #include "dialogex.h" -class CAskSavePasswordDialog : public wxDialogEx +class CAskSavePasswordDialog final : public wxDialogEx { public: static bool Run(wxWindow* parent); private: bool Create(wxWindow* parent); - DECLARE_EVENT_TABLE() - void OnRadioButtonChanged(wxCommandEvent& event); + void OnOk(wxCommandEvent& event); }; #endif diff -Nru filezilla-3.15.0.2/src/interface/asyncrequestqueue.cpp filezilla-3.33.0/src/interface/asyncrequestqueue.cpp --- filezilla-3.15.0.2/src/interface/asyncrequestqueue.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/asyncrequestqueue.cpp 2018-02-05 21:28:24.000000000 +0000 @@ -19,17 +19,15 @@ END_EVENT_TABLE() CAsyncRequestQueue::CAsyncRequestQueue(CMainFrame *pMainFrame) + : m_pMainFrame(pMainFrame) + , certStore_(std::make_unique()) + , verifyCertDlg_(std::make_unique(*certStore_)) { - m_pMainFrame = pMainFrame; - m_pQueueView = 0; - m_pVerifyCertDlg = new CVerifyCertDialog; - m_inside_request = false; m_timer.SetOwner(this); } CAsyncRequestQueue::~CAsyncRequestQueue() { - delete m_pVerifyCertDlg; } bool CAsyncRequestQueue::ProcessDefaults(CFileZillaEngine *pEngine, std::unique_ptr & pNotification) @@ -42,26 +40,31 @@ CFileExistsNotification *pFileExistsNotification = static_cast(pNotification.get()); // Get the action, go up the hierarchy till one is found - enum CFileExistsNotification::OverwriteAction action = pFileExistsNotification->overwriteAction; - if (action == CFileExistsNotification::unknown) + CFileExistsNotification::OverwriteAction action = pFileExistsNotification->overwriteAction; + if (action == CFileExistsNotification::unknown) { action = CDefaultFileExistsDlg::GetDefault(pFileExistsNotification->download); + } if (action == CFileExistsNotification::unknown) { int option = COptions::Get()->GetOptionVal(pFileExistsNotification->download ? OPTION_FILEEXISTS_DOWNLOAD : OPTION_FILEEXISTS_UPLOAD); - if (option < CFileExistsNotification::unknown || option >= CFileExistsNotification::ACTION_COUNT) + if (option < CFileExistsNotification::unknown || option >= CFileExistsNotification::ACTION_COUNT) { action = CFileExistsNotification::unknown; - else - action = (enum CFileExistsNotification::OverwriteAction)option; + } + else { + action = static_cast(option); + } } // Ask and rename options require user interaction - if (action == CFileExistsNotification::unknown || action == CFileExistsNotification::ask || action == CFileExistsNotification::rename) + if (action == CFileExistsNotification::unknown || action == CFileExistsNotification::ask || action == CFileExistsNotification::rename) { break; + } if (action == CFileExistsNotification::resume && pFileExistsNotification->ascii) { // Check if resuming ascii files is allowed - if (!COptions::Get()->GetOptionVal(OPTION_ASCIIRESUME)) + if (!COptions::Get()->GetOptionVal(OPTION_ASCIIRESUME)) { // Overwrite instead action = CFileExistsNotification::overwrite; + } } pFileExistsNotification->overwriteAction = action; @@ -75,8 +78,9 @@ { auto & hostKeyNotification = static_cast(*pNotification.get()); - if (!CVerifyHostkeyDialog::IsTrusted(hostKeyNotification)) + if (!CVerifyHostkeyDialog::IsTrusted(hostKeyNotification)) { break; + } hostKeyNotification.m_trust = true; hostKeyNotification.m_alwaysTrust = false; @@ -89,8 +93,9 @@ { auto & certNotification = static_cast(*pNotification.get()); - if (!m_pVerifyCertDlg->IsTrusted(certNotification)) + if (!certStore_->IsTrusted(certNotification)) { break; + } certNotification.m_trusted = true; pEngine->SetAsyncRequestReply(std::move(pNotification)); @@ -109,8 +114,9 @@ { ClearPending(pEngine); - if (ProcessDefaults(pEngine, pNotification)) + if (ProcessDefaults(pEngine, pNotification)) { return false; + } m_requestList.emplace_back(pEngine, std::move(pNotification)); @@ -123,8 +129,9 @@ bool CAsyncRequestQueue::ProcessNextRequest() { - if (m_requestList.empty()) + if (m_requestList.empty()) { return true; + } t_queueEntry &entry = m_requestList.front(); @@ -146,23 +153,30 @@ } bool canRemember = notification.GetType() == CInteractiveLoginNotification::keyfile; - if (CLoginManager::Get().GetPassword(notification.server, true, wxString(), notification.GetChallenge(), canRemember)) + ServerWithCredentials server(notification.server, notification.credentials); + if (CLoginManager::Get().GetPassword(server, true, std::wstring(), notification.GetChallenge(), canRemember)) { + notification.credentials = server.credentials; notification.passwordSet = true; + } else { // Retry with prompt - if (!CheckWindowState()) + if (!CheckWindowState()) { return false; + } - if (CLoginManager::Get().GetPassword(notification.server, false, wxString(), notification.GetChallenge(), canRemember)) + if (CLoginManager::Get().GetPassword(server, false, std::wstring(), notification.GetChallenge(), canRemember)) { + notification.credentials = server.credentials; notification.passwordSet = true; + } } entry.pEngine->SetAsyncRequestReply(std::move(entry.pNotification)); } else if (entry.pNotification->GetRequestID() == reqId_hostkey || entry.pNotification->GetRequestID() == reqId_hostkeyChanged) { - if (!CheckWindowState()) + if (!CheckWindowState()) { return false; + } auto & notification = static_cast(*entry.pNotification.get()); @@ -170,17 +184,19 @@ notification.m_trust = true; notification.m_alwaysTrust = false; } - else + else { CVerifyHostkeyDialog::ShowVerificationDialog(m_pMainFrame, notification); + } entry.pEngine->SetAsyncRequestReply(std::move(entry.pNotification)); } else if (entry.pNotification->GetRequestID() == reqId_certificate) { - if (!CheckWindowState()) + if (!CheckWindowState()) { return false; + } auto & notification = static_cast(*entry.pNotification.get()); - m_pVerifyCertDlg->ShowVerificationDialog(notification); + verifyCertDlg_->ShowVerificationDialog(notification); entry.pEngine->SetAsyncRequestReply(std::move(entry.pNotification)); } @@ -199,20 +215,24 @@ auto & notification = static_cast(*entry.pNotification.get()); // Get the action, go up the hierarchy till one is found - enum CFileExistsNotification::OverwriteAction action = notification.overwriteAction; - if (action == CFileExistsNotification::unknown) + CFileExistsNotification::OverwriteAction action = notification.overwriteAction; + if (action == CFileExistsNotification::unknown) { action = CDefaultFileExistsDlg::GetDefault(notification.download); + } if (action == CFileExistsNotification::unknown) { int option = COptions::Get()->GetOptionVal(notification.download ? OPTION_FILEEXISTS_DOWNLOAD : OPTION_FILEEXISTS_UPLOAD); - if (option <= CFileExistsNotification::unknown || option >= CFileExistsNotification::ACTION_COUNT) + if (option <= CFileExistsNotification::unknown || option >= CFileExistsNotification::ACTION_COUNT) { action = CFileExistsNotification::ask; - else - action = (enum CFileExistsNotification::OverwriteAction)option; + } + else { + action = static_cast(option); + } } if (action == CFileExistsNotification::ask) { - if (!CheckWindowState()) + if (!CheckWindowState()) { return false; + } CFileExistsDlg dlg(¬ification); dlg.Create(m_pMainFrame); @@ -224,68 +244,82 @@ bool directionOnly, queueOnly; if (dlg.Always(directionOnly, queueOnly)) { if (!queueOnly) { - if (notification.download || !directionOnly) + if (notification.download || !directionOnly) { CDefaultFileExistsDlg::SetDefault(true, action); + } - if (!notification.download || !directionOnly) + if (!notification.download || !directionOnly) { CDefaultFileExistsDlg::SetDefault(false, action); + } } else { // For the notifications already in the request queue, we have to set the queue action directly for (auto iter = ++m_requestList.begin(); iter != m_requestList.end(); ++iter) { - if (!iter->pNotification || iter->pNotification->GetRequestID() != reqId_fileexists) + if (!iter->pNotification || iter->pNotification->GetRequestID() != reqId_fileexists) { continue; + } auto & p = static_cast(*iter->pNotification.get()); - if (!directionOnly || notification.download == p.download) + if (!directionOnly || notification.download == p.download) { p.overwriteAction = CFileExistsNotification::OverwriteAction(action); + } } TransferDirection direction; if (directionOnly) { - if (notification.download) + if (notification.download) { direction = TransferDirection::download; - else + } + else { direction = TransferDirection::upload; + } } - else + else { direction = TransferDirection::both; + } - if (m_pQueueView) + if (m_pQueueView) { m_pQueueView->SetDefaultFileExistsAction(action, direction); + } } } } - else + else { action = CFileExistsNotification::skip; + } } - if (action == CFileExistsNotification::unknown || action == CFileExistsNotification::ask) + if (action == CFileExistsNotification::unknown || action == CFileExistsNotification::ask) { action = CFileExistsNotification::skip; + } if (action == CFileExistsNotification::resume && notification.ascii) { // Check if resuming ascii files is allowed - if (!COptions::Get()->GetOptionVal(OPTION_ASCIIRESUME)) + if (!COptions::Get()->GetOptionVal(OPTION_ASCIIRESUME)) { // Overwrite instead action = CFileExistsNotification::overwrite; + } } switch (action) { case CFileExistsNotification::rename: { - if (!CheckWindowState()) + if (!CheckWindowState()) { return false; + } wxString msg; - wxString defaultName; + std::wstring defaultName; if (notification.download) { msg.Printf(_("The file %s already exists.\nPlease enter a new name:"), notification.localFile); - wxFileName fn = notification.localFile; - defaultName = fn.GetFullName(); + CLocalPath fn(notification.localFile, &defaultName); + if (fn.empty() || defaultName.empty()) { + defaultName = _("new name"); + } } else { - wxString fullName = notification.remotePath.GetPath() + notification.remoteFile; + wxString fullName = notification.remotePath.FormatFilename(notification.remoteFile); msg.Printf(_("The file %s already exists.\nPlease enter a new name:"), fullName); defaultName = notification.remoteFile; } @@ -295,32 +329,38 @@ for (;;) { int res = dlg.ShowModal(); if (res == wxID_OK) { - if (dlg.GetValue().empty()) + if (dlg.GetValue().empty()) { continue; // Disallow empty names + } if (dlg.GetValue() == defaultName) { wxMessageDialog dlg2(m_pMainFrame, _("You did not enter a new name for the file. Overwrite the file instead?"), _("Filename unchanged"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION | wxCANCEL); int res2 = dlg2.ShowModal(); - if (res2 == wxID_CANCEL) + if (res2 == wxID_CANCEL) { notification.overwriteAction = CFileExistsNotification::skip; - else if (res2 == wxID_NO) + } + else if (res2 == wxID_NO) { continue; - else + } + else { notification.overwriteAction = CFileExistsNotification::skip; + } } else { notification.overwriteAction = CFileExistsNotification::rename; notification.newName = dlg.GetValue(); // If request got processed successfully, notify queue about filename change - if (entry.pEngine->SetAsyncRequestReply(std::move(entry.pNotification)) && m_pQueueView) + if (entry.pEngine->SetAsyncRequestReply(std::move(entry.pNotification)) && m_pQueueView) { m_pQueueView->RenameFileInTransfer(entry.pEngine, dlg.GetValue(), notification.download); + } return true; } } - else + else { notification.overwriteAction = CFileExistsNotification::skip; + } break; } } @@ -336,8 +376,9 @@ void CAsyncRequestQueue::ClearPending(const CFileZillaEngine *pEngine) { - if (m_requestList.empty()) + if (m_requestList.empty()) { return; + } // Remove older requests coming from the same engine, but never the first // entry in the list as that one displays a dialog at this moment. @@ -354,8 +395,9 @@ void CAsyncRequestQueue::RecheckDefaults() { - if (m_requestList.size() <= 1) + if (m_requestList.size() <= 1) { return; + } std::list::iterator cur, next; cur = ++m_requestList.begin(); @@ -363,8 +405,9 @@ next = cur; ++next; - if (ProcessDefaults(cur->pEngine, cur->pNotification)) + if (ProcessDefaults(cur->pEngine, cur->pNotification)) { m_requestList.erase(cur); + } cur = next; } } @@ -376,8 +419,9 @@ void CAsyncRequestQueue::OnProcessQueue(wxCommandEvent &) { - if (m_inside_request) + if (m_inside_request) { return; + } m_inside_request = true; bool success = ProcessNextRequest(); @@ -390,8 +434,9 @@ void CAsyncRequestQueue::TriggerProcessing() { - if (m_inside_request) + if (m_inside_request) { return; + } QueueEvent(new wxCommandEvent(fzEVT_PROCESSASYNCREQUESTQUEUE)); } @@ -416,10 +461,12 @@ } wxWindow* pFocus = m_pMainFrame->FindFocus(); - while (pFocus && pFocus != m_pMainFrame) + while (pFocus && pFocus != m_pMainFrame) { pFocus = pFocus->GetParent(); - if (!pFocus) + } + if (!pFocus) { m_pMainFrame->RequestUserAttention(); + } #endif return true; diff -Nru filezilla-3.15.0.2/src/interface/asyncrequestqueue.h filezilla-3.33.0/src/interface/asyncrequestqueue.h --- filezilla-3.15.0.2/src/interface/asyncrequestqueue.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/asyncrequestqueue.h 2018-02-05 21:28:24.000000000 +0000 @@ -1,13 +1,16 @@ -#ifndef __ASYNCREQUESTQUEUE_H__ -#define __ASYNCREQUESTQUEUE_H__ +#ifndef FILEZILLA_INTERFACE_ASYNCREQUESTQUEUE_HEADER +#define FILEZILLA_INTERFACE_ASYNCREQUESTQUEUE_HEADER #include +#include + +class CertStore; class CMainFrame; class CQueueView; class CVerifyCertDialog; -class CAsyncRequestQueue : public wxEvtHandler +class CAsyncRequestQueue final : public wxEvtHandler { public: CAsyncRequestQueue(CMainFrame *pMainFrame); @@ -27,9 +30,10 @@ // Request attention if needed bool CheckWindowState(); - CMainFrame *m_pMainFrame; - CQueueView *m_pQueueView; - CVerifyCertDialog *m_pVerifyCertDlg; + CMainFrame *m_pMainFrame{}; + CQueueView *m_pQueueView{}; + std::unique_ptr certStore_; + std::unique_ptr verifyCertDlg_; bool ProcessNextRequest(); bool ProcessDefaults(CFileZillaEngine *pEngine, std::unique_ptr & pNotification); @@ -54,9 +58,9 @@ void OnTimer(wxTimerEvent& event); // Reentrancy guard - bool m_inside_request; + bool m_inside_request{}; wxTimer m_timer; }; -#endif //__ASYNCREQUESTQUEUE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/aui_notebook_ex.cpp filezilla-3.33.0/src/interface/aui_notebook_ex.cpp --- filezilla-3.15.0.2/src/interface/aui_notebook_ex.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/aui_notebook_ex.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -2,6 +2,7 @@ #include #include "aui_notebook_ex.h" #include +#include #include @@ -59,6 +60,58 @@ return size; } + virtual void DrawTab(wxDC &dc, wxWindow *wnd, const wxAuiNotebookPage &page, const wxRect &rect, int close_button_state, wxRect *out_tab_rect, wxRect *out_button_rect, int *x_extent) + { + wxColour const tint = m_pNotebook->GetTabColour(page.window); + + if (tint.IsOk()) { + +#if !defined(__WXGTK__) || !defined(wxHAS_NATIVE_TABART) + wxColour const baseOrig = m_baseColour; + wxColour const activeOrig = m_activeColour; + + + wxColour const base( + wxColour::AlphaBlend(tint.Red(), baseOrig.Red(), tint.Alpha() / 255.0f), + wxColour::AlphaBlend(tint.Green(), baseOrig.Green(), tint.Alpha() / 255.0f), + wxColour::AlphaBlend(tint.Blue(), baseOrig.Blue(), tint.Alpha() / 255.0f)); + + wxColour const active( + wxColour::AlphaBlend(tint.Red(), activeOrig.Red(), tint.Alpha() / 255.0f), + wxColour::AlphaBlend(tint.Green(), activeOrig.Green(), tint.Alpha() / 255.0f), + wxColour::AlphaBlend(tint.Blue(), activeOrig.Blue(), tint.Alpha() / 255.0f)); + + m_baseColour = base; + m_activeColour = active; + + wxAuiDefaultTabArt::DrawTab(dc, wnd, page, rect, close_button_state, out_tab_rect, out_button_rect, x_extent); + + m_baseColour = baseOrig; + m_activeColour = baseOrig; +#else + wxRect tab_rect; + if (!out_tab_rect) { + out_tab_rect = &tab_rect; + } + + wxAuiDefaultTabArt::DrawTab(dc, wnd, page, rect, close_button_state, out_tab_rect, out_button_rect, x_extent); + + wxMemoryDC *mdc = dynamic_cast(&dc); + if (mdc) { + wxGraphicsContext *gc = wxGraphicsContext::Create(*mdc); + if (gc) { + gc->SetBrush(wxBrush(tint)); + gc->DrawRectangle(out_tab_rect->x, out_tab_rect->y, out_tab_rect->width, out_tab_rect->height); + delete gc; + } + } +#endif + } + else { + wxAuiDefaultTabArt::DrawTab(dc, wnd, page, rect, close_button_state, out_tab_rect, out_button_rect, x_extent); + } + } + protected: wxAuiNotebookEx* m_pNotebook; @@ -67,14 +120,17 @@ BEGIN_EVENT_TABLE(wxAuiNotebookEx, wxAuiNotebook) EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiNotebookEx::OnPageChanged) +EVT_AUINOTEBOOK_DRAG_MOTION(wxID_ANY, wxAuiNotebookEx::OnTabDragMotion) END_EVENT_TABLE() -wxAuiNotebookEx::wxAuiNotebookEx() +void wxAuiNotebookEx::OnTabDragMotion(wxAuiNotebookEvent& evt) { -} + wxAuiNotebook::OnTabDragMotion(evt); -wxAuiNotebookEx::~wxAuiNotebookEx() -{ + int active = m_tabs.GetActivePage(); + if (active != wxNOT_FOUND) { + m_curPage = active; + } } void wxAuiNotebookEx::RemoveExtraBorders() @@ -114,6 +170,14 @@ return true; } +void wxAuiNotebookEx::SetTabColour(size_t page, wxColour const& c) +{ + wxWindow* w = GetPage(page); + if (w) { + m_colourMap[w] = c; + } +} + void wxAuiNotebookEx::Highlight(size_t page, bool highlight /*=true*/) { if (GetSelection() == (int)page) @@ -185,3 +249,18 @@ return res; } + +bool wxAuiNotebookEx::RemovePage(size_t page) +{ + m_colourMap.erase(GetPage(page)); + return wxAuiNotebook::RemovePage(page); +} + +wxColour wxAuiNotebookEx::GetTabColour(wxWindow* page) +{ + auto const it = m_colourMap.find(page); + if (it != m_colourMap.end()) { + return it->second; + } + return wxColour(); +} diff -Nru filezilla-3.15.0.2/src/interface/aui_notebook_ex.h filezilla-3.33.0/src/interface/aui_notebook_ex.h --- filezilla-3.15.0.2/src/interface/aui_notebook_ex.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/aui_notebook_ex.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,33 +1,43 @@ -#ifndef __AUI_NOTEBOOK_EX_H__ -#define __AUI_NOTEBOOK_EX_H__ +#ifndef FILEZILLA_INTERFACE_AUI_NOTEBOOK_EX_HEADER +#define FILEZILLA_INTERFACE_AUI_NOTEBOOK_EX_HEADER #include +#include + class wxAuiTabArtEx; class wxAuiNotebookEx : public wxAuiNotebook { public: - wxAuiNotebookEx(); - virtual ~wxAuiNotebookEx(); + wxAuiNotebookEx() = default; void RemoveExtraBorders(); void SetExArtProvider(); // Basically identical to the AUI one, but not calling Update - bool SetPageText(size_t page_idx, const wxString& text); + virtual bool SetPageText(size_t page_idx, const wxString& text) final; void Highlight(size_t page, bool highlight = true); bool Highlighted(size_t page) const; void AdvanceTab(bool forward); - bool AddPage(wxWindow *page, const wxString &text, bool select = false, int imageId = -1); + virtual bool AddPage(wxWindow *page, const wxString &text, bool select = false, int imageId = -1) final; + + virtual bool RemovePage(size_t page) final; + + void SetTabColour(size_t page, wxColour const& c); + wxColour GetTabColour(wxWindow* page); + protected: std::vector m_highlighted; + std::map m_colourMap; + DECLARE_EVENT_TABLE() void OnPageChanged(wxAuiNotebookEvent& event); + void OnTabDragMotion(wxAuiNotebookEvent& evt); }; -#endif //__AUI_NOTEBOOK_EX_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/auto_ascii_files.cpp filezilla-3.33.0/src/interface/auto_ascii_files.cpp --- filezilla-3.15.0.2/src/interface/auto_ascii_files.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/auto_ascii_files.cpp 2016-10-06 14:53:29.000000000 +0000 @@ -38,19 +38,20 @@ } // Defined in RemoteListView.cpp -wxString StripVMSRevision(const wxString& name); +std::wstring StripVMSRevision(std::wstring const& name); -bool CAutoAsciiFiles::TransferLocalAsAscii(wxString local_file, enum ServerType server_type) +bool CAutoAsciiFiles::TransferLocalAsAscii(wxString const& local_file, ServerType server_type) { int pos = local_file.Find(fz::local_filesys::path_separator, true); - if (pos != -1) - local_file = local_file.Mid(pos + 1); // Identical implementation, only difference is for the local one to strip path. - return TransferRemoteAsAscii(local_file, server_type); + return TransferRemoteAsAscii( + (pos != -1) ? local_file.Mid(pos + 1) : local_file, + server_type + ); } -bool CAutoAsciiFiles::TransferRemoteAsAscii(wxString remote_file, enum ServerType server_type) +bool CAutoAsciiFiles::TransferRemoteAsAscii(wxString const& remote_file, ServerType server_type) { int mode = COptions::Get()->GetOptionVal(OPTION_ASCIIBINARY); if (mode == 1) @@ -58,26 +59,24 @@ else if (mode == 2) return false; - if (server_type == VMS) - remote_file = StripVMSRevision(remote_file); + if (server_type == VMS) { + return TransferRemoteAsAscii(StripVMSRevision(remote_file.ToStdWstring()), DEFAULT); + } if (!remote_file.empty() && remote_file[0] == '.') return COptions::Get()->GetOptionVal(OPTION_ASCIIDOTFILE) != 0; int pos = remote_file.Find('.', true); - if (pos == -1) + if (pos < 0 || static_cast(pos) + 1 == remote_file.size()) { return COptions::Get()->GetOptionVal(OPTION_ASCIINOEXT) != 0; - remote_file = remote_file.Mid(pos + 1); - - if (remote_file.empty()) - return false; + } + wxString ext = remote_file.Mid(pos + 1); for (auto const& ascii_ext : m_ascii_extensions) { - if (!remote_file.CmpNoCase(ascii_ext)) { + if (!ext.CmpNoCase(ascii_ext)) { return true; } } return false; } - diff -Nru filezilla-3.15.0.2/src/interface/auto_ascii_files.h filezilla-3.33.0/src/interface/auto_ascii_files.h --- filezilla-3.15.0.2/src/interface/auto_ascii_files.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/auto_ascii_files.h 2017-07-13 19:12:18.000000000 +0000 @@ -1,15 +1,16 @@ -#ifndef __AUTO_ASCII_FILES_H__ -#define __AUTO_ASCII_FILES_H__ +#ifndef FILEZILLA_INTERFACE_AUTO_ASCII_FILES_HEADER +#define FILEZILLA_INTERFACE_AUTO_ASCII_FILES_HEADER -class CAutoAsciiFiles +class CAutoAsciiFiles final { public: - static bool TransferLocalAsAscii(wxString local_file, enum ServerType server_type); - static bool TransferRemoteAsAscii(wxString remote_file, enum ServerType server_type); + static bool TransferLocalAsAscii(wxString const& local_file, ServerType server_type); + static bool TransferRemoteAsAscii(wxString const& remote_file, ServerType server_type); static void SettingsChanged(); protected: + static bool IsAsciiExtension(wxString const& ext); static std::vector m_ascii_extensions; }; -#endif //__AUTO_ASCII_FILES_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/bookmarks_dialog.cpp filezilla-3.33.0/src/interface/bookmarks_dialog.cpp --- filezilla-3.15.0.2/src/interface/bookmarks_dialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/bookmarks_dialog.cpp 2017-09-22 08:42:14.000000000 +0000 @@ -3,6 +3,7 @@ #include "filezillaapp.h" #include "sitemanager.h" #include "ipcmutex.h" +#include "state.h" #include "themeprovider.h" #include "xmlfunctions.h" #include "xrc_helper.h" @@ -25,7 +26,7 @@ EVT_TREE_END_LABEL_EDIT(XRCID("ID_TREE"), CBookmarksDialog::OnEndLabelEdit) END_EVENT_TABLE() -CNewBookmarkDialog::CNewBookmarkDialog(wxWindow* parent, wxString& site_path, const CServer* server) +CNewBookmarkDialog::CNewBookmarkDialog(wxWindow* parent, std::wstring& site_path, ServerWithCredentials const* server) : m_parent(parent) , m_site_path(site_path) , m_server(server) @@ -34,15 +35,18 @@ int CNewBookmarkDialog::Run(const wxString &local_path, const CServerPath &remote_path) { - if (!Load(m_parent, _T("ID_NEWBOOKMARK"))) + if (!Load(m_parent, _T("ID_NEWBOOKMARK"))) { return wxID_CANCEL; + } xrc_call(*this, "ID_LOCALPATH", &wxTextCtrl::ChangeValue, local_path); - if (!remote_path.empty()) + if (!remote_path.empty()) { xrc_call(*this, "ID_REMOTEPATH", &wxTextCtrl::ChangeValue, remote_path.GetPath()); + } - if (!m_server) + if (!m_server) { xrc_call(*this, "ID_TYPE_SITE", &wxRadioButton::Enable, false); + } return ShowModal(); } @@ -62,10 +66,10 @@ CServerPath remote_path; if (!remote_path_raw.empty()) { - if (!global && m_server) - remote_path.SetType(m_server->GetType()); - if (!remote_path.SetPath(remote_path_raw)) - { + if (!global && m_server) { + remote_path.SetType(m_server->server.GetType()); + } + if (!remote_path.SetPath(remote_path_raw.ToStdWstring())) { wxMessageBoxEx(_("Could not parse remote path."), _("New bookmark"), wxICON_EXCLAMATION); return; } @@ -85,11 +89,14 @@ bool const comparison = xrc_call(*this, "ID_COMPARISON", &wxCheckBox::GetValue); if (!global && m_server) { - std::list bookmarks; - - if (m_site_path.empty() || !CSiteManager::GetBookmarks(m_site_path, bookmarks)) { - if (wxMessageBoxEx(_("Site-specific bookmarks require the server to be stored in the Site Manager.\nAdd current connection to the site manager?"), _("New bookmark"), wxYES_NO | wxICON_QUESTION, this) != wxYES) + std::unique_ptr site; + if (!m_site_path.empty()) { + site = CSiteManager::GetSiteByPath(m_site_path).first; + } + if (!site) { + if (wxMessageBoxEx(_("Site-specific bookmarks require the server to be stored in the Site Manager.\nAdd current connection to the site manager?"), _("New bookmark"), wxYES_NO | wxICON_QUESTION, this) != wxYES) { return; + } m_site_path = CSiteManager::AddServer(*m_server); if (m_site_path.empty()) { @@ -98,10 +105,12 @@ return; } } - for (std::list::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); ++iter) { - if (*iter == name) { - wxMessageBoxEx(_("A bookmark with the entered name already exists. Please enter an unused name."), _("New bookmark"), wxICON_EXCLAMATION, this); - return; + else { + for (auto const& bookmark : site->m_bookmarks) { + if (bookmark.m_name == name) { + wxMessageBoxEx(_("A bookmark with the entered name already exists. Please enter an unused name."), _("New bookmark"), wxICON_EXCLAMATION, this); + return; + } } } @@ -110,8 +119,9 @@ EndModal(wxID_OK); } else { - if (!CBookmarksDialog::AddBookmark(name, local_path, remote_path, sync, comparison)) + if (!CBookmarksDialog::AddBookmark(name, local_path, remote_path, sync, comparison)) { return; + } EndModal(wxID_OK); } @@ -140,13 +150,13 @@ { } - wxString m_local_dir; + std::wstring m_local_dir; CServerPath m_remote_dir; bool m_sync{}; bool m_comparison{}; }; -CBookmarksDialog::CBookmarksDialog(wxWindow* parent, wxString& site_path, const CServer* server) +CBookmarksDialog::CBookmarksDialog(wxWindow* parent, std::wstring& site_path, ServerWithCredentials const* server) : m_parent(parent) , m_site_path(site_path) , m_server(server) @@ -169,27 +179,32 @@ for (auto bookmark = element.child("Bookmark"); bookmark; bookmark = bookmark.next_sibling("Bookmark")) { wxString name; wxString local_dir; - wxString remote_dir_raw; + std::wstring remote_dir_raw; CServerPath remote_dir; name = GetTextElement(bookmark, "Name"); - if (name.empty()) + if (name.empty()) { continue; + } local_dir = GetTextElement(bookmark, "LocalDir"); remote_dir_raw = GetTextElement(bookmark, "RemoteDir"); if (!remote_dir_raw.empty()) { - if (!remote_dir.SetSafePath(remote_dir_raw)) + if (!remote_dir.SetSafePath(remote_dir_raw)) { continue; + } } - if (local_dir.empty() && remote_dir.empty()) + if (local_dir.empty() && remote_dir.empty()) { continue; + } bool sync; - if (local_dir.empty() || remote_dir.empty()) + if (local_dir.empty() || remote_dir.empty()) { sync = false; - else + } + else { sync = GetTextElementBool(bookmark, "SyncBrowsing"); + } bool const comparison = GetTextElementBool(bookmark, "DirectoryComparison"); @@ -202,25 +217,18 @@ void CBookmarksDialog::LoadSiteSpecificBookmarks() { - if (m_site_path.empty()) + if (m_site_path.empty()) { return; + } - std::list bookmarks; - - if (!CSiteManager::GetBookmarks(m_site_path, bookmarks)) + auto const site = CSiteManager::GetSiteByPath(m_site_path).first; + if (!site) { return; + } - for (std::list::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); ++iter) { - wxString path = *iter; - path.Replace(_T("\\"), _T("\\\\")); - path.Replace(_T("/"), _T("\\/")); - path = m_site_path + _T("/") + path; - - std::unique_ptr data = CSiteManager::GetSiteByPath(path); - if (data) { - CBookmarkItemData* new_data = new CBookmarkItemData(data->m_localDir, data->m_remoteDir, data->m_sync, data->m_comparison); - m_pTree->AppendItem(m_bookmarks_site, *iter, 1, 1, new_data); - } + for (auto const& bookmark : site->m_bookmarks) { + CBookmarkItemData* new_data = new CBookmarkItemData(bookmark.m_localDir, bookmark.m_remoteDir, bookmark.m_sync, bookmark.m_comparison); + m_pTree->AppendItem(m_bookmarks_site, bookmark.m_name, 1, 1, new_data); } m_pTree->SortChildren(m_bookmarks_site); @@ -228,13 +236,15 @@ int CBookmarksDialog::Run() { - if (!Load(m_parent, _T("ID_BOOKMARKS"))) + if (!Load(m_parent, _T("ID_BOOKMARKS"))) { return wxID_CANCEL; + } // Now create the imagelist for the site tree m_pTree = XRCCTRL(*this, "ID_TREE", wxTreeCtrl); - if (!m_pTree) + if (!m_pTree) { return false; + } wxSize s = CThemeProvider::GetIconSize(iconSizeSmall); wxImageList* pImageList = new wxImageList(s.x, s.y); @@ -302,45 +312,55 @@ wxASSERT(data); auto bookmark = element.append_child("Bookmark"); - AddTextElement(bookmark, "Name", m_pTree->GetItemText(child)); - if (!data->m_local_dir.empty()) + AddTextElement(bookmark, "Name", m_pTree->GetItemText(child).ToStdWstring()); + if (!data->m_local_dir.empty()) { AddTextElement(bookmark, "LocalDir", data->m_local_dir); - if (!data->m_remote_dir.empty()) + } + if (!data->m_remote_dir.empty()) { AddTextElement(bookmark, "RemoteDir", data->m_remote_dir.GetSafePath()); - if (data->m_sync) - AddTextElementRaw(bookmark, "SyncBrowsing", "1"); - if (data->m_comparison) - AddTextElementRaw(bookmark, "DirectoryComparison", "1"); + } + if (data->m_sync) { + AddTextElementUtf8(bookmark, "SyncBrowsing", "1"); + } + if (data->m_comparison) { + AddTextElementUtf8(bookmark, "DirectoryComparison", "1"); + } } if (!file.Save(false)) { wxString msg = wxString::Format(_("Could not write \"%s\", the global bookmarks could no be saved: %s"), file.GetFileName(), file.GetError()); wxMessageBoxEx(msg, _("Error writing xml file"), wxICON_ERROR); } + + CContextManager::Get()->NotifyGlobalHandlers(STATECHANGE_GLOBALBOOKMARKS); } void CBookmarksDialog::SaveSiteSpecificBookmarks() { - if (m_site_path.empty()) + if (m_site_path.empty()) { return; + } - if (!CSiteManager::ClearBookmarks(m_site_path)) - return; + if (!CSiteManager::ClearBookmarks(m_site_path)) { + return; + } wxTreeItemIdValue cookie; for (wxTreeItemId child = m_pTree->GetFirstChild(m_bookmarks_site, cookie); child.IsOk(); child = m_pTree->GetNextChild(m_bookmarks_site, cookie)) { CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(child); wxASSERT(data); - if (!CSiteManager::AddBookmark(m_site_path, m_pTree->GetItemText(child), data->m_local_dir, data->m_remote_dir, data->m_sync, data->m_comparison)) + if (!CSiteManager::AddBookmark(m_site_path, m_pTree->GetItemText(child), data->m_local_dir, data->m_remote_dir, data->m_sync, data->m_comparison)) { return; + } } } void CBookmarksDialog::OnOK(wxCommandEvent&) { - if (!Verify()) + if (!Verify()) { return; + } UpdateBookmark(); SaveGlobalBookmarks(); @@ -352,12 +372,14 @@ void CBookmarksDialog::OnBrowse(wxCommandEvent&) { wxTreeItemId item = m_pTree->GetSelection(); - if (!item) + if (!item) { return; + } CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item); - if (!data) + if (!data) { return; + } wxTextCtrl *pText = XRCCTRL(*this, "ID_BOOKMARK_LOCALDIR", wxTextCtrl); @@ -369,8 +391,9 @@ void CBookmarksDialog::OnSelChanging(wxTreeEvent& event) { - if (m_is_deleting) + if (m_is_deleting) { return; + } if (!Verify()) { event.Veto(); @@ -388,36 +411,44 @@ bool CBookmarksDialog::Verify() { wxTreeItemId item = m_pTree->GetSelection(); - if (!item) + if (!item) { return true; + } CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item); - if (!data) + if (!data) { return true; + } - const CServer *server; - if (m_pTree->GetItemParent(item) == m_bookmarks_site) + ServerWithCredentials const* server; + if (m_pTree->GetItemParent(item) == m_bookmarks_site) { server = m_server; - else + } + else { server = 0; + } wxString const remotePathRaw = xrc_call(*this, "ID_BOOKMARK_REMOTEDIR", &wxTextCtrl::GetValue); if (!remotePathRaw.empty()) { CServerPath remotePath; - if (server) - remotePath.SetType(server->GetType()); - if (!remotePath.SetPath(remotePathRaw)) { + if (server) { + remotePath.SetType(server->server.GetType()); + } + if (!remotePath.SetPath(remotePathRaw.ToStdWstring())) { xrc_call(*this, "ID_BOOKMARK_REMOTEDIR", &wxTextCtrl::SetFocus); if (server) { wxString msg; - if (server->GetType() != DEFAULT) - msg = wxString::Format(_("Remote path cannot be parsed. Make sure it is a valid absolute path and is supported by the current site's servertype (%s)."), server->GetNameFromServerType(server->GetType())); - else + if (server->server.GetType() != DEFAULT) { + msg = wxString::Format(_("Remote path cannot be parsed. Make sure it is a valid absolute path and is supported by the current site's servertype (%s)."), CServer::GetNameFromServerType(server->server.GetType())); + } + else { msg = _("Remote path cannot be parsed. Make sure it is a valid absolute path."); + } wxMessageBoxEx(msg); } - else + else { wxMessageBoxEx(_("Remote path cannot be parsed. Make sure it is a valid absolute path.")); + } return false; } } @@ -442,24 +473,29 @@ void CBookmarksDialog::UpdateBookmark() { wxTreeItemId item = m_pTree->GetSelection(); - if (!item) + if (!item) { return; + } CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item); - if (!data) + if (!data) { return; + } - const CServer *server; - if (m_pTree->GetItemParent(item) == m_bookmarks_site) + ServerWithCredentials const* server; + if (m_pTree->GetItemParent(item) == m_bookmarks_site) { server = m_server; - else + } + else { server = 0; + } wxString const remotePathRaw = xrc_call(*this, "ID_BOOKMARK_REMOTEDIR", &wxTextCtrl::GetValue); if (!remotePathRaw.empty()) { - if (server) - data->m_remote_dir.SetType(server->GetType()); - data->m_remote_dir.SetPath(remotePathRaw); + if (server) { + data->m_remote_dir.SetType(server->server.GetType()); + } + data->m_remote_dir.SetPath(remotePathRaw.ToStdWstring()); } data->m_local_dir = xrc_call(*this, "ID_BOOKMARK_LOCALDIR", &wxTextCtrl::GetValue); @@ -506,23 +542,31 @@ void CBookmarksDialog::OnNewBookmark(wxCommandEvent&) { - if (!Verify()) + if (!Verify()) { return; + } UpdateBookmark(); wxTreeItemId item = m_pTree->GetSelection(); - if (!item) + if (!item) { item = m_bookmarks_global; + } - if (m_pTree->GetItemData(item)) + if (m_pTree->GetItemData(item)) { item = m_pTree->GetItemParent(item); + } if (item == m_bookmarks_site) { - std::list bookmarks; - if (m_site_path.empty() || !CSiteManager::GetBookmarks(m_site_path, bookmarks)) { - if (wxMessageBoxEx(_("Site-specific bookmarks require the server to be stored in the Site Manager.\nAdd current connection to the site manager?"), _("New bookmark"), wxYES_NO | wxICON_QUESTION, this) != wxYES) + std::unique_ptr site; + if (!m_site_path.empty()) { + site = CSiteManager::GetSiteByPath(m_site_path).first; + } + + if (!site) { + if (wxMessageBoxEx(_("Site-specific bookmarks require the server to be stored in the Site Manager.\nAdd current connection to the site manager?"), _("New bookmark"), wxYES_NO | wxICON_QUESTION, this) != wxYES) { return; + } m_site_path = CSiteManager::AddServer(*m_server); if (m_site_path.empty()) { @@ -549,8 +593,9 @@ child = m_pTree->GetNextChild(item, cookie); } - if (!found) + if (!found) { break; + } newName = _("New bookmark") + wxString::Format(_T(" %d"), index++); } @@ -564,8 +609,9 @@ void CBookmarksDialog::OnRename(wxCommandEvent&) { wxTreeItemId item = m_pTree->GetSelection(); - if (!item || item == m_bookmarks_global || item == m_bookmarks_site) + if (!item || item == m_bookmarks_global || item == m_bookmarks_site) { return; + } m_pTree->EditLabel(item); } @@ -573,8 +619,9 @@ void CBookmarksDialog::OnDelete(wxCommandEvent&) { wxTreeItemId item = m_pTree->GetSelection(); - if (!item || item == m_bookmarks_global || item == m_bookmarks_site) + if (!item || item == m_bookmarks_global || item == m_bookmarks_site) { return; + } wxTreeItemId parent = m_pTree->GetItemParent(item); @@ -587,15 +634,18 @@ void CBookmarksDialog::OnCopy(wxCommandEvent&) { wxTreeItemId item = m_pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return; + } - if (!Verify()) + if (!Verify()) { return; + } CBookmarkItemData* data = static_cast(m_pTree->GetItemData(item)); - if (!data) + if (!data) { return; + } UpdateBookmark(); @@ -619,8 +669,9 @@ child = m_pTree->GetNextChild(parent, cookie); } - if (!found) + if (!found) { break; + } newName = wxString::Format(_("Copy (%d) of %s"), index++, oldName); } @@ -651,8 +702,9 @@ void CBookmarksDialog::OnEndLabelEdit(wxTreeEvent& event) { - if (event.IsEditCancelled()) + if (event.IsEditCancelled()) { return; + } wxTreeItemId item = event.GetItem(); if (item != m_pTree->GetSelection()) { @@ -673,8 +725,9 @@ wxTreeItemIdValue cookie; for (wxTreeItemId child = m_pTree->GetFirstChild(parent, cookie); child.IsOk(); child = m_pTree->GetNextChild(parent, cookie)) { - if (child == item) + if (child == item) { continue; + } if (!name.CmpNoCase(m_pTree->GetItemText(child))) { wxMessageBoxEx(_("Name already exists"), _("Cannot rename entry"), wxICON_EXCLAMATION, this); event.Veto(); @@ -685,7 +738,7 @@ m_pTree->SortChildren(parent); } -bool CBookmarksDialog::GetBookmarks(std::list &bookmarks) +bool CBookmarksDialog::GetGlobalBookmarks(std::vector &bookmarks) { CInterProcessMutex mutex(MUTEX_GLOBALBOOKMARKS); @@ -700,21 +753,24 @@ for (auto bookmark = element.child("Bookmark"); bookmark; bookmark = bookmark.next_sibling("Bookmark")) { wxString name; wxString local_dir; - wxString remote_dir_raw; + std::wstring remote_dir_raw; CServerPath remote_dir; name = GetTextElement(bookmark, "Name"); - if (name.empty()) + if (name.empty()) { continue; + } local_dir = GetTextElement(bookmark, "LocalDir"); remote_dir_raw = GetTextElement(bookmark, "RemoteDir"); if (!remote_dir_raw.empty()) { - if (!remote_dir.SetSafePath(remote_dir_raw)) + if (!remote_dir.SetSafePath(remote_dir_raw)) { continue; + } } - if (local_dir.empty() && remote_dir.empty()) + if (local_dir.empty() && remote_dir.empty()) { continue; + } bookmarks.push_back(name); } @@ -735,24 +791,29 @@ } for (auto bookmark = element.child("Bookmark"); bookmark; bookmark = bookmark.next_sibling("Bookmark")) { - wxString remote_dir_raw; + std::wstring remote_dir_raw; - if (name != GetTextElement(bookmark, "Name")) + if (name != GetTextElement(bookmark, "Name")) { continue; + } local_dir = GetTextElement(bookmark, "LocalDir"); remote_dir_raw = GetTextElement(bookmark, "RemoteDir"); if (!remote_dir_raw.empty()) { - if (!remote_dir.SetSafePath(remote_dir_raw)) + if (!remote_dir.SetSafePath(remote_dir_raw)) { return false; + } } - if (local_dir.empty() && remote_dir_raw.empty()) + if (local_dir.empty() && remote_dir_raw.empty()) { return false; + } - if (local_dir.empty() || remote_dir_raw.empty()) + if (local_dir.empty() || remote_dir_raw.empty()) { sync = false; - else + } + else { sync = GetTextElementBool(bookmark, "SyncBrowsing", false); + } comparison = GetTextElementBool(bookmark, "DirectoryComparison", false); return true; @@ -764,10 +825,12 @@ bool CBookmarksDialog::AddBookmark(const wxString &name, const wxString &local_dir, const CServerPath &remote_dir, bool sync, bool comparison) { - if (local_dir.empty() && remote_dir.empty()) + if (local_dir.empty() && remote_dir.empty()) { return false; - if ((local_dir.empty() || remote_dir.empty()) && sync) + } + if ((local_dir.empty() || remote_dir.empty()) && sync) { return false; + } CInterProcessMutex mutex(MUTEX_GLOBALBOOKMARKS); @@ -790,23 +853,30 @@ wxMessageBoxEx(_("Name of bookmark already exists."), _("New bookmark"), wxICON_EXCLAMATION); return false; } - if (name < old_name && !insertBefore) + if (name < old_name && !insertBefore) { insertBefore = bookmark; + } } - if (insertBefore) + if (insertBefore) { bookmark = element.insert_child_before("Bookmark", insertBefore); - else + } + else { bookmark = element.append_child("Bookmark"); - AddTextElement(bookmark, "Name", name); - if (!local_dir.empty()) - AddTextElement(bookmark, "LocalDir", local_dir); - if (!remote_dir.empty()) + } + AddTextElement(bookmark, "Name", name.ToStdWstring()); + if (!local_dir.empty()) { + AddTextElement(bookmark, "LocalDir", local_dir.ToStdWstring()); + } + if (!remote_dir.empty()) { AddTextElement(bookmark, "RemoteDir", remote_dir.GetSafePath()); - if (sync) - AddTextElementRaw(bookmark, "SyncBrowsing", "1"); - if (comparison) - AddTextElementRaw(bookmark, "DirectoryComparison", "1"); + } + if (sync) { + AddTextElementUtf8(bookmark, "SyncBrowsing", "1"); + } + if (comparison) { + AddTextElementUtf8(bookmark, "DirectoryComparison", "1"); + } if (!file.Save(false)) { wxString msg = wxString::Format(_("Could not write \"%s\", the bookmark could not be added: %s"), file.GetFileName(), file.GetError()); @@ -814,5 +884,7 @@ return false; } + CContextManager::Get()->NotifyGlobalHandlers(STATECHANGE_GLOBALBOOKMARKS); + return true; } diff -Nru filezilla-3.15.0.2/src/interface/bookmarks_dialog.h filezilla-3.33.0/src/interface/bookmarks_dialog.h --- filezilla-3.15.0.2/src/interface/bookmarks_dialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/bookmarks_dialog.h 2017-09-22 08:42:14.000000000 +0000 @@ -1,20 +1,20 @@ -#ifndef __BOOKMARKS_DIALOG_H__ -#define __BOOKMARKS_DIALOG_H__ +#ifndef FILEZILLA_INTERFACE_BOOKMARKS_DIALOG_HEADER +#define FILEZILLA_INTERFACE_BOOKMARKS_DIALOG_HEADER #include "dialogex.h" +#include "serverdata.h" -class CNewBookmarkDialog : public wxDialogEx +class CNewBookmarkDialog final : public wxDialogEx { public: - CNewBookmarkDialog(wxWindow* parent, wxString& site_path, const CServer* server); - virtual ~CNewBookmarkDialog() {} + CNewBookmarkDialog(wxWindow* parent, std::wstring& site_path, ServerWithCredentials const* server); int Run(const wxString &local_path, const CServerPath &remote_path); protected: wxWindow* m_parent; - wxString &m_site_path; - const CServer* m_server; + std::wstring &m_site_path; + ServerWithCredentials const* m_server; DECLARE_EVENT_TABLE() void OnOK(wxCommandEvent&); @@ -24,12 +24,11 @@ class CBookmarksDialog final : public wxDialogEx { public: - CBookmarksDialog(wxWindow* parent, wxString& site_path, const CServer* server); - virtual ~CBookmarksDialog() {} + CBookmarksDialog(wxWindow* parent, std::wstring& site_path, ServerWithCredentials const* server); int Run(); - static bool GetBookmarks(std::list &bookmarks); + static bool GetGlobalBookmarks(std::vector &bookmarks); static bool GetBookmark(const wxString& name, wxString &local_dir, CServerPath &remote_dir, bool &sync, bool &comparison); static bool AddBookmark(const wxString& name, const wxString &local_dir, const CServerPath &remote_dir, bool sync, bool comparison); @@ -45,8 +44,8 @@ void SaveGlobalBookmarks(); wxWindow* m_parent; - wxString &m_site_path; - CServer const* m_server; + std::wstring &m_site_path; + ServerWithCredentials const* m_server; wxTreeCtrl *m_pTree{}; wxTreeItemId m_bookmarks_global; @@ -67,4 +66,4 @@ void OnEndLabelEdit(wxTreeEvent& event); }; -#endif //__BOOKMARKS_DIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/buildinfo.cpp filezilla-3.33.0/src/interface/buildinfo.cpp --- filezilla-3.15.0.2/src/interface/buildinfo.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/buildinfo.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,96 +1,133 @@ #include #include "buildinfo.h" -wxString CBuildInfo::GetVersion() +#include + +#include + +std::wstring GetDependencyVersion(gui_lib_dependency d) +{ + switch (d) { + case gui_lib_dependency::wxwidgets: + return wxVERSION_NUM_DOT_STRING_T; + case gui_lib_dependency::sqlite: + return fz::to_wstring_from_utf8(sqlite3_libversion()); + default: + return std::wstring(); + } +} + +std::wstring GetDependencyName(gui_lib_dependency d) +{ + switch (d) { + case gui_lib_dependency::wxwidgets: + return L"wxWidgets"; + case gui_lib_dependency::sqlite: + return L"SQLite"; + default: + return std::wstring(); + } +} + + +std::wstring CBuildInfo::GetVersion() { - return wxString(PACKAGE_VERSION, wxConvLocal); + return fz::to_wstring(PACKAGE_VERSION); } -wxString CBuildInfo::GetBuildDateString() +std::wstring CBuildInfo::GetBuildDateString() { // Get build date. Unfortunately it is in the ugly Mmm dd yyyy format. // Make a good yyyy-mm-dd out of it - wxString date(__DATE__, wxConvLocal); - while (date.Replace(_T(" "), _T(" "))); + std::wstring date = fz::to_wstring(__DATE__); + while (date.find(L" ") != std::wstring::npos) { + fz::replace_substrings(date, L" ", L" "); + } - const wxChar months[][4] = { _T("Jan"), _T("Feb"), _T("Mar"), - _T("Apr"), _T("May"), _T("Jun"), - _T("Jul"), _T("Aug"), _T("Sep"), - _T("Oct"), _T("Nov"), _T("Dec") }; + wchar_t const months[][4] = { L"Jan", L"Feb", L"Mar", + L"Apr", L"May", L"Jun", + L"Jul", L"Aug", L"Sep", + L"Oct", L"Nov", L"Dec" }; - int pos = date.Find(_T(" ")); - if (pos == -1) + size_t pos = date.find(' '); + if (pos == std::wstring::npos) { return date; + } - wxString month = date.Left(pos); - int i = 0; + std::wstring month = date.substr(0, pos); + size_t i = 0; for (i = 0; i < 12; ++i) { - if (months[i] == month) + if (months[i] == month) { break; + } } - if (i == 12) + if (i == 12) { return date; + } - wxString tmp = date.Mid(pos + 1); - pos = tmp.Find(_T(" ")); - if (pos == -1) + std::wstring tmp = date.substr(pos + 1); + pos = tmp.find(' '); + if (pos == std::wstring::npos) { return date; + } - long day; - if (!tmp.Left(pos).ToLong(&day)) + auto day = fz::to_integral(tmp.substr(0, pos)); + if (!day) { return date; + } - long year; - if (!tmp.Mid(pos + 1).ToLong(&year)) + auto year = fz::to_integral(tmp.substr(pos + 1)); + if (!year) { return date; + } - return wxString::Format(_T("%04d-%02d-%02d"), (int)year, i + 1, (int)day); + return fz::sprintf(L"%04d-%02d-%02d", year, i + 1, day); } -wxString CBuildInfo::GetBuildTimeString() +std::wstring CBuildInfo::GetBuildTimeString() { - return wxString(__TIME__, wxConvLocal); + return fz::to_wstring(__TIME__); } fz::datetime CBuildInfo::GetBuildDate() { - fz::datetime date(GetBuildDateString().ToStdWstring(), fz::datetime::utc); + fz::datetime date(GetBuildDateString(), fz::datetime::utc); return date; } -wxString CBuildInfo::GetCompiler() +std::wstring CBuildInfo::GetCompiler() { #ifdef USED_COMPILER - return wxString(USED_COMPILER, wxConvLocal); + return fz::to_wstring(USED_COMPILER); #elif defined __VISUALC__ int version = __VISUALC__; - return wxString::Format(_T("Visual C++ %d"), version); + return fz::sprintf(L"Visual C++ %d", version); #else - return _T("Unknown compiler"); + return L"Unknown compiler"; #endif } -wxString CBuildInfo::GetCompilerFlags() +std::wstring CBuildInfo::GetCompilerFlags() { #ifndef USED_CXXFLAGS - return wxString(); + return std::wstring(); #else - wxString flags(USED_CXXFLAGS, wxConvLocal); - return flags; + return fz::to_wstring(USED_CXXFLAGS); #endif } -wxString CBuildInfo::GetBuildType() +std::wstring CBuildInfo::GetBuildType() { #ifdef BUILDTYPE - wxString buildtype(BUILDTYPE, wxConvLocal); - if (buildtype == _T("official") || buildtype == _T("nightly")) + std::wstring buildtype = fz::to_wstring(BUILDTYPE); + if (buildtype == L"official" || buildtype == L"nightly") { return buildtype; + } #endif - return wxString(); + return std::wstring(); } -int64_t CBuildInfo::ConvertToVersionNumber(const wxChar* version) +int64_t CBuildInfo::ConvertToVersionNumber(wchar_t const* version) { // Crude conversion from version string into number for easy comparison // Supported version formats: @@ -113,8 +150,9 @@ // which in turn corresponds to the simple 64-bit number 2254026754228227 // And these can be compared easily - if (*version < '0' || *version > '9') + if (!version || *version < '0' || *version > '9') { return -1; + } int64_t v{}; int segment{}; @@ -140,39 +178,40 @@ v <<= (5 - shifts) * 10; // Make sure final releases have a higher version number than rc or beta releases - if ((v & 0x0FFFFF) == 0) + if ((v & 0x0FFFFF) == 0) { v |= 0x080000; + } return v; } -wxString CBuildInfo::GetHostname() +std::wstring CBuildInfo::GetHostname() { #ifndef USED_HOST - return wxString(); + return std::wstring(); #else - wxString flags(USED_HOST, wxConvLocal); - return flags; + return fz::to_wstring(USED_HOST); #endif } -wxString CBuildInfo::GetBuildSystem() +std::wstring CBuildInfo::GetBuildSystem() { #ifndef USED_BUILD - return wxString(); + return std::wstring(); #else - wxString flags(USED_BUILD, wxConvLocal); - return flags; + return fz::to_wstring(USED_BUILD); #endif } bool CBuildInfo::IsUnstable() { - if (GetVersion().Find(_T("beta")) != -1) + if (GetVersion().find(L"beta") != std::wstring::npos) { return true; + } - if (GetVersion().Find(_T("rc")) != -1) + if (GetVersion().find(L"rc") != std::wstring::npos) { return true; + } return false; } @@ -202,9 +241,9 @@ #endif #endif -wxString CBuildInfo::GetCPUCaps(char separator) +std::wstring CBuildInfo::GetCPUCaps(char separator) { - wxString ret; + std::wstring ret; #if HAVE_CPUID int reg[4]; @@ -213,21 +252,21 @@ int const max = reg[0]; // function (aka leave), subfunction (subleave), register, bit, description - std::tuple const caps[] = { - std::make_tuple(1, 0, 3, 25, _T("sse")), - std::make_tuple(1, 0, 3, 26, _T("sse2")), - std::make_tuple(1, 0, 2, 0, _T("sse3")), - std::make_tuple(1, 0, 2, 9, _T("ssse3")), - std::make_tuple(1, 0, 2, 19, _T("sse4.1")), - std::make_tuple(1, 0, 2, 20, _T("sse4.2")), - std::make_tuple(1, 0, 2, 28, _T("avx")), - std::make_tuple(7, 0, 1, 5, _T("avx2")), - std::make_tuple(1, 0, 2, 25, _T("aes")), - std::make_tuple(1, 0, 2, 1, _T("pclmulqdq")), - std::make_tuple(1, 0, 2, 30, _T("rdrnd")), - std::make_tuple(7, 0, 1, 3, _T("bmi2")), - std::make_tuple(7, 0, 1, 8, _T("bmi2")), - std::make_tuple(7, 0, 1, 19, _T("adx")) + std::tuple const caps[] = { + std::make_tuple(1, 0, 3, 25, L"sse"), + std::make_tuple(1, 0, 3, 26, L"sse2"), + std::make_tuple(1, 0, 2, 0, L"sse3"), + std::make_tuple(1, 0, 2, 9, L"ssse3"), + std::make_tuple(1, 0, 2, 19, L"sse4.1"), + std::make_tuple(1, 0, 2, 20, L"sse4.2"), + std::make_tuple(1, 0, 2, 28, L"avx"), + std::make_tuple(7, 0, 1, 5, L"avx2"), + std::make_tuple(1, 0, 2, 25, L"aes"), + std::make_tuple(1, 0, 2, 1, L"pclmulqdq"), + std::make_tuple(1, 0, 2, 30, L"rdrnd"), + std::make_tuple(7, 0, 1, 3, L"bmi2"), + std::make_tuple(7, 0, 1, 8, L"bmi2"), + std::make_tuple(7, 0, 1, 19, L"adx") }; for (auto const& cap : caps) { @@ -245,3 +284,42 @@ return ret; } + +#ifdef FZ_WINDOWS +namespace { +bool IsAtLeast(int major, int minor = 0) +{ + OSVERSIONINFOEX vi = { 0 }; + vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); + vi.dwMajorVersion = major; + vi.dwMinorVersion = minor; + vi.dwPlatformId = VER_PLATFORM_WIN32_NT; + + DWORDLONG mask = 0; + VER_SET_CONDITION(mask, VER_MAJORVERSION, VER_GREATER_EQUAL); + VER_SET_CONDITION(mask, VER_MINORVERSION, VER_GREATER_EQUAL); + VER_SET_CONDITION(mask, VER_PLATFORMID, VER_EQUAL); + return VerifyVersionInfo(&vi, VER_MAJORVERSION | VER_MINORVERSION | VER_PLATFORMID, mask) != 0; +} +} +#endif + +bool GetRealOsVersion(int& major, int& minor) +{ +#ifndef FZ_WINDOWS + return wxGetOsVersion(&major, &minor) != wxOS_UNKNOWN; +#else + major = 4; + minor = 0; + while (IsAtLeast(++major, minor)) + { + } + --major; + while (IsAtLeast(major, ++minor)) + { + } + --minor; + + return true; +#endif +} diff -Nru filezilla-3.15.0.2/src/interface/buildinfo.h filezilla-3.33.0/src/interface/buildinfo.h --- filezilla-3.15.0.2/src/interface/buildinfo.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/buildinfo.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,25 +1,44 @@ -#ifndef __BUILDINFO_H__ -#define __BUILDINFO_H__ +#ifndef FILEZILLA_BUILDINFO_HEADER +#define FILEZILLA_BUILDINFO_HEADER -class CBuildInfo +#include + +enum class gui_lib_dependency { -protected: - CBuildInfo() {} + wxwidgets, + sqlite, + count +}; +class CBuildInfo final +{ public: + CBuildInfo() = delete; - static wxString GetVersion(); - static int64_t ConvertToVersionNumber(const wxChar* version); - static wxString GetBuildDateString(); - static wxString GetBuildTimeString(); +public: + + static std::wstring GetVersion(); + static int64_t ConvertToVersionNumber(wchar_t const* version); + static std::wstring GetBuildDateString(); + static std::wstring GetBuildTimeString(); static fz::datetime GetBuildDate(); - static wxString GetBuildType(); - static wxString GetCompiler(); - static wxString GetCompilerFlags(); - static wxString GetHostname(); - static wxString GetBuildSystem(); + static std::wstring GetBuildType(); + static std::wstring GetCompiler(); + static std::wstring GetCompilerFlags(); + static std::wstring GetHostname(); + static std::wstring GetBuildSystem(); static bool IsUnstable(); // Returns true on beta or rc releases. - static wxString GetCPUCaps(char separator = ','); + static std::wstring GetCPUCaps(char separator = ','); }; -#endif //__BUILDINFO_H__ +std::wstring GetDependencyName(gui_lib_dependency d); +std::wstring GetDependencyVersion(gui_lib_dependency d); + +// Microsoft, in its insane stupidity, has decided to make GetVersion(Ex) useless, starting with Windows 8.1, +// this function no longer returns the operating system version but instead some arbitrary and random value depending +// on the phase of the moon. +// This function instead returns the actual Windows version. On non-Windows systems, it's equivalent to +// wxGetOsVersion +bool GetRealOsVersion(int& major, int& minor); + +#endif diff -Nru filezilla-3.15.0.2/src/interface/chmoddialog.cpp filezilla-3.33.0/src/interface/chmoddialog.cpp --- filezilla-3.15.0.2/src/interface/chmoddialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/chmoddialog.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -93,7 +93,7 @@ for (int i = 0; i < 9; ++i) { int id = wxXmlResource::GetXRCID(IDs[i]); - m_checkBoxes[i] = wxDynamicCast(FindWindow(id), wxCheckBox); + m_checkBoxes[i] = dynamic_cast(FindWindow(id)); if (!m_checkBoxes[i]) return false; diff -Nru filezilla-3.15.0.2/src/interface/chmoddialog.h filezilla-3.33.0/src/interface/chmoddialog.h --- filezilla-3.15.0.2/src/interface/chmoddialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/chmoddialog.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __CHMODDIALOG_H__ -#define __CHMODDIALOG_H__ +#ifndef FILEZILLA_INTERFACE_CHMODDIALOG_HEADER +#define FILEZILLA_INTERFACE_CHMODDIALOG_HEADER #include "dialogex.h" @@ -46,4 +46,4 @@ int m_applyType{}; }; -#endif //__CHMODDIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/clearprivatedata.cpp filezilla-3.33.0/src/interface/clearprivatedata.cpp --- filezilla-3.15.0.2/src/interface/clearprivatedata.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/clearprivatedata.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,14 +1,15 @@ #include #include "clearprivatedata.h" -#include "Mainfrm.h" -#include "recentserverlist.h" -#include "quickconnectbar.h" -#include "state.h" #include "commandqueue.h" -#include "Options.h" #include "ipcmutex.h" +#include "local_recursive_operation.h" +#include "Mainfrm.h" +#include "Options.h" #include "queue.h" -#include "recursive_operation.h" +#include "quickconnectbar.h" +#include "recentserverlist.h" +#include "remote_recursive_operation.h" +#include "state.h" BEGIN_EVENT_TABLE(CClearPrivateDataDialog, wxDialogEx) EVT_TIMER(wxID_ANY, CClearPrivateDataDialog::OnTimer) @@ -61,28 +62,24 @@ pCheck = XRCCTRL(*this, "ID_CLEARRECONNECT", wxCheckBox); - if (pCheck->GetValue()) - { + if (pCheck->GetValue()) { bool asked = false; const std::vector *states = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = states->begin(); iter != states->end(); ++iter) - { + for (std::vector::const_iterator iter = states->begin(); iter != states->end(); ++iter) { CState* pState = *iter; - if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) - { - if (!asked) - { + if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) { + if (!asked) { int res = wxMessageBoxEx(_("Reconnect information cannot be cleared while connected to a server.\nIf you continue, your connection will be disconnected."), _("Clear private data"), wxOK | wxCANCEL); if (res != wxOK) return; asked = true; } - pState->GetRecursiveOperationHandler()->StopRecursiveOperation(); - if (!pState->m_pCommandQueue->Cancel()) - { + pState->GetLocalRecursiveOperation()->StopRecursiveOperation(); + pState->GetRemoteRecursiveOperation()->StopRecursiveOperation(); + if (!pState->m_pCommandQueue->Cancel()) { m_timer.SetOwner(this); m_timer.Start(250, true); } @@ -95,21 +92,19 @@ ClearReconnect(); } - if (pSitemanagerCheck->GetValue()) - { + if (pSitemanagerCheck->GetValue()) { CInterProcessMutex sitemanagerMutex(MUTEX_SITEMANAGERGLOBAL, false); - while (sitemanagerMutex.TryLock() == 0) - { + while (sitemanagerMutex.TryLock() == 0) { int res = wxMessageBoxEx(_("The Site Manager is opened in another instance of FileZilla 3.\nPlease close it or the data cannot be deleted."), _("Clear private data"), wxOK | wxCANCEL); - if (res != wxYES) + if (res != wxYES) { return; + } } CInterProcessMutex mutex(MUTEX_SITEMANAGER); RemoveXmlFile(_T("sitemanager")); } - if (pQueueCheck->GetValue()) - { + if (pQueueCheck->GetValue()) { m_pMainFrame->GetQueue()->SetActive(false); m_pMainFrame->GetQueue()->RemoveAll(); @@ -122,21 +117,20 @@ { const std::vector *states = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = states->begin(); iter != states->end(); ++iter) - { + for (std::vector::const_iterator iter = states->begin(); iter != states->end(); ++iter) { CState* pState = *iter; - if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) - { - if (!pState->m_pCommandQueue->Cancel()) + if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) { + if (!pState->m_pCommandQueue->Cancel()) { return; + } pState->Disconnect(); } - if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) + if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) { return; - + } } m_timer.Stop(); @@ -146,23 +140,24 @@ void CClearPrivateDataDialog::Delete() { - if (m_timer.IsRunning()) + if (m_timer.IsRunning()) { return; + } Destroy(); } bool CClearPrivateDataDialog::ClearReconnect() { - COptions::Get()->SetLastServer(CServer()); - COptions::Get()->SetOption(OPTION_LASTSERVERPATH, _T("")); + COptions::Get()->SetLastServer(ServerWithCredentials()); + COptions::Get()->SetOption(OPTION_LASTSERVERPATH, std::wstring()); const std::vector *states = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = states->begin(); iter != states->end(); ++iter) - { + for (std::vector::const_iterator iter = states->begin(); iter != states->end(); ++iter) { CState* pState = *iter; - - pState->SetLastServer(CServer(), CServerPath()); + if (pState) { + pState->SetLastSite(Site(), CServerPath()); + } } return true; @@ -172,12 +167,14 @@ { { wxFileName fn(COptions::Get()->GetOption(OPTION_DEFAULT_SETTINGSDIR), name + _T(".xml")); - if (fn.FileExists()) + if (fn.FileExists()) { wxRemoveFile(fn.GetFullPath()); + } } { wxFileName fn(COptions::Get()->GetOption(OPTION_DEFAULT_SETTINGSDIR), name + _T("xml~")); - if (fn.FileExists()) + if (fn.FileExists()) { wxRemoveFile(fn.GetFullPath()); + } } } diff -Nru filezilla-3.15.0.2/src/interface/clearprivatedata.h filezilla-3.33.0/src/interface/clearprivatedata.h --- filezilla-3.15.0.2/src/interface/clearprivatedata.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/clearprivatedata.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,12 +1,12 @@ -#ifndef __CLEARPRIVATEDATA_H__ -#define __CLEARPRIVATEDATA_H__ +#ifndef FILEZILLA_INTERFACE_CLEARPRIVATEDATA_HEADER +#define FILEZILLA_INTERFACE_CLEARPRIVATEDATA_HEADER #include "dialogex.h" #include class CMainFrame; -class CClearPrivateDataDialog : public wxDialogEx +class CClearPrivateDataDialog final : public wxDialogEx { public: @@ -17,7 +17,7 @@ protected: CClearPrivateDataDialog(CMainFrame* pMainFrame); - ~CClearPrivateDataDialog() {} + virtual ~CClearPrivateDataDialog() = default; bool ClearReconnect(); @@ -31,5 +31,4 @@ void OnTimer(wxTimerEvent& event); }; -#endif //__CLEARPRIVATEDATA_H__ - +#endif diff -Nru filezilla-3.15.0.2/src/interface/cmdline.cpp filezilla-3.33.0/src/interface/cmdline.cpp --- filezilla-3.15.0.2/src/interface/cmdline.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/cmdline.cpp 2016-06-24 14:19:09.000000000 +0000 @@ -27,7 +27,7 @@ m_parser.SetSwitchChars(_T("-")); } -bool CCommandLine::HasSwitch(enum CCommandLine::t_switches s) const +bool CCommandLine::HasSwitch(CCommandLine::t_switches s) const { if (s == sitemanager) return m_parser.Found(_T("s")); @@ -43,7 +43,7 @@ return false; } -wxString CCommandLine::GetOption(enum CCommandLine::t_option option) const +wxString CCommandLine::GetOption(CCommandLine::t_option option) const { wxString value; switch (option) diff -Nru filezilla-3.15.0.2/src/interface/cmdline.h filezilla-3.33.0/src/interface/cmdline.h --- filezilla-3.15.0.2/src/interface/cmdline.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/cmdline.h 2017-07-13 19:12:18.000000000 +0000 @@ -1,9 +1,9 @@ -#ifndef __CMDLINE_H__ -#define __CMDLINE_H__ +#ifndef FILEZILLA_INTERFACE_CMDLINE_HEADER +#define FILEZILLA_INTERFACE_CMDLINE_HEADER #include -class CCommandLine +class CCommandLine final { public: enum t_switches @@ -25,12 +25,12 @@ bool Parse(); void DisplayUsage(); - bool HasSwitch(enum t_switches s) const; - wxString GetOption(enum t_option option) const; + bool HasSwitch(t_switches s) const; + wxString GetOption(t_option option) const; wxString GetParameter() const; protected: wxCmdLineParser m_parser; }; -#endif //__CMDLINE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/commandqueue.cpp filezilla-3.33.0/src/interface/commandqueue.cpp --- filezilla-3.15.0.2/src/interface/commandqueue.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/commandqueue.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -2,7 +2,7 @@ #include "commandqueue.h" #include "Mainfrm.h" #include "state.h" -#include "recursive_operation.h" +#include "remote_recursive_operation.h" #include "loginmanager.h" #include "queue.h" #include "RemoteListView.h" @@ -13,17 +13,10 @@ int CCommandQueue::m_requestIdCounter = 0; -CCommandQueue::CCommandQueue(CFileZillaEngine *pEngine, CMainFrame* pMainFrame, CState* pState) -{ - m_pEngine = pEngine; - m_pMainFrame = pMainFrame; - m_pState = pState; - m_exclusiveEngineRequest = false; - m_exclusiveEngineLock = false; - m_requestId = 0; -} - -CCommandQueue::~CCommandQueue() +CCommandQueue::CCommandQueue(CFileZillaEngine *pEngine, CMainFrame* pMainFrame, CState& state) + : m_pEngine(pEngine) + , m_pMainFrame(pMainFrame) + , m_state(state) { } @@ -36,7 +29,7 @@ if (origin == any) { return m_CommandList.empty(); } - + return std::find_if(m_CommandList.begin(), m_CommandList.end(), [origin](CommandInfo const& c) { return c.origin == origin; }) == m_CommandList.end(); } @@ -50,21 +43,24 @@ m_CommandList.emplace_back(origin, std::unique_ptr(pCommand)); if (m_CommandList.size() == 1) { - m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); + m_state.NotifyHandlers(STATECHANGE_REMOTE_IDLE); ProcessNextCommand(); } } void CCommandQueue::ProcessNextCommand() { - if (m_inside_commandqueue) + if (m_inside_commandqueue) { return; + } - if (m_exclusiveEngineLock) + if (m_exclusiveEngineLock) { return; + } - if (m_pEngine->IsBusy()) + if (m_pEngine->IsBusy()) { return; + } ++m_inside_commandqueue; @@ -75,7 +71,7 @@ // - Interface cannot obtain listing since not connected // - Yet getting operation successful // To keep things flowing, we need to advance the recursive operation. - m_pState->GetRecursiveOperationHandler()->NextOperation(); + m_state.GetRemoteRecursiveOperation()->NextOperation(); } while (!m_CommandList.empty()) { @@ -91,38 +87,44 @@ --m_inside_commandqueue; if (m_CommandList.empty()) { - if (m_exclusiveEngineRequest) + if (m_exclusiveEngineRequest) { GrantExclusiveEngineRequest(); - else - m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); + } + else { + m_state.NotifyHandlers(STATECHANGE_REMOTE_IDLE); + } - if (!m_pState->SuccessfulConnect()) - m_pState->SetServer(0); + if (!m_state.SuccessfulConnect()) { + m_state.SetSite(Site()); + } } } bool CCommandQueue::Cancel() { - if (m_exclusiveEngineLock) + if (m_exclusiveEngineLock) { return false; + } - if (m_CommandList.empty()) + if (m_CommandList.empty()) { return true; + } m_CommandList.erase(++m_CommandList.begin(), m_CommandList.end()); if (!m_pEngine) { m_CommandList.clear(); - m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); + m_state.NotifyHandlers(STATECHANGE_REMOTE_IDLE); return true; } int res = m_pEngine->Cancel(); - if (res == FZ_REPLY_WOULDBLOCK) + if (res == FZ_REPLY_WOULDBLOCK) { return false; + } else { m_CommandList.clear(); - m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); + m_state.NotifyHandlers(STATECHANGE_REMOTE_IDLE); return true; } } @@ -147,8 +149,9 @@ // Pending event, has no relevance during command execution return; } - if (nReplyCode & FZ_REPLY_PASSWORDFAILED) - CLoginManager::Get().CachedPasswordFailed(*m_pState->GetServer()); + if (nReplyCode & FZ_REPLY_PASSWORDFAILED) { + CLoginManager::Get().CachedPasswordFailed(m_state.GetServer().server); + } } if (m_CommandList.empty()) { @@ -173,9 +176,9 @@ if (reconnect) { // Try automatic reconnect - const CServer* pServer = m_pState->GetServer(); - if (pServer) { - m_CommandList.emplace_front(normal, std::make_unique(*pServer)); + ServerWithCredentials const& server = m_state.GetServer(); + if (server) { + m_CommandList.emplace_front(normal, std::make_unique(server.server, server.credentials)); ProcessNextCommand(); return; } @@ -187,22 +190,22 @@ auto const& commandInfo = m_CommandList.front(); if (commandInfo.command->GetId() == Command::list && nReplyCode != FZ_REPLY_OK) { - if (nReplyCode & FZ_REPLY_LINKNOTDIR) { + if ((nReplyCode & FZ_REPLY_LINKNOTDIR) == FZ_REPLY_LINKNOTDIR) { // Symbolic link does not point to a directory. Either points to file // or is completely invalid CListCommand* pListCommand = static_cast(commandInfo.command.get()); wxASSERT(pListCommand->GetFlags() & LIST_FLAG_LINK); - m_pState->LinkIsNotDir(pListCommand->GetPath(), pListCommand->GetSubDir()); + m_state.LinkIsNotDir(pListCommand->GetPath(), pListCommand->GetSubDir()); } else { if (commandInfo.origin == recursiveOperation) { // Let the recursive operation handler know if a LIST command failed, // so that it may issue the next command in recursive operations. - m_pState->GetRecursiveOperationHandler()->ListingFailed(nReplyCode); + m_state.GetRemoteRecursiveOperation()->ListingFailed(nReplyCode); } else { - m_pState->ListingFailed(nReplyCode); + m_state.ListingFailed(nReplyCode); } } m_CommandList.pop_front(); @@ -220,14 +223,15 @@ // If this was an automatic reconnect during a recursive // operation, stop the recursive operation - m_pState->GetRecursiveOperationHandler()->StopRecursiveOperation(); + m_state.GetRemoteRecursiveOperation()->StopRecursiveOperation(); } else if (commandInfo.command->GetId() == Command::connect && nReplyCode == FZ_REPLY_OK) { - m_pState->SetSuccessfulConnect(); + m_state.SetSuccessfulConnect(); m_CommandList.pop_front(); } - else + else { m_CommandList.pop_front(); + } --m_inside_commandqueue; @@ -238,25 +242,23 @@ { wxASSERT(!m_exclusiveEngineLock || !requestExclusive); - if (!m_exclusiveEngineRequest && requestExclusive) - { + if (!m_exclusiveEngineRequest && requestExclusive) { m_requestId = ++m_requestIdCounter; - if (m_requestId < 0) - { + if (m_requestId < 0) { m_requestIdCounter = 0; m_requestId = 0; } - if (m_CommandList.empty()) - { - m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); + if (m_CommandList.empty()) { + m_state.NotifyHandlers(STATECHANGE_REMOTE_IDLE); GrantExclusiveEngineRequest(); return; } } - if (!requestExclusive) + if (!requestExclusive) { m_exclusiveEngineLock = false; + } m_exclusiveEngineRequest = requestExclusive; - m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); + m_state.NotifyHandlers(STATECHANGE_REMOTE_IDLE); } void CCommandQueue::GrantExclusiveEngineRequest() @@ -272,11 +274,13 @@ CFileZillaEngine* CCommandQueue::GetEngineExclusive(int requestId) { - if (!m_exclusiveEngineLock) + if (!m_exclusiveEngineLock) { return 0; + } - if (requestId != m_requestId) + if (requestId != m_requestId) { return 0; + } return m_pEngine; } @@ -304,7 +308,7 @@ if (!listingNotification.GetPath().empty()) { pListing = std::make_shared(); if (listingNotification.Failed() || - m_pState->m_pEngine->CacheLookup(listingNotification.GetPath(), *pListing) != FZ_REPLY_OK) + m_state.m_pEngine->CacheLookup(listingNotification.GetPath(), *pListing) != FZ_REPLY_OK) { pListing = std::make_shared(); pListing->path = listingNotification.GetPath(); @@ -314,11 +318,15 @@ } if (listingIsRecursive) { - if (!listingNotification.Modified() && m_pState->GetRecursiveOperationHandler()->IsActive()) { - m_pState->NotifyHandlers(STATECHANGE_REMOTE_DIR_OTHER, wxString(), &pListing); + if (!listingNotification.Modified() && m_state.GetRemoteRecursiveOperation()->IsActive()) { + m_state.NotifyHandlers(STATECHANGE_REMOTE_DIR_OTHER, wxString(), &pListing); } } else { - m_pState->SetRemoteDir(pListing, listingNotification.Modified()); + m_state.SetRemoteDir(pListing, listingNotification.Modified()); + } + + if (pListing && !listingNotification.Failed() && m_state.GetServer()) { + CContextManager::Get()->ProcessDirectoryListing(m_state.GetServer().server, pListing, listingIsRecursive ? 0 : &m_state); } } diff -Nru filezilla-3.15.0.2/src/interface/commandqueue.h filezilla-3.33.0/src/interface/commandqueue.h --- filezilla-3.15.0.2/src/interface/commandqueue.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/commandqueue.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __COMMANDQUEUE_H__ -#define __COMMANDQUEUE_H__ +#ifndef FILEZILLA_INTERFACE_COMMANDQUEUE_HEADER +#define FILEZILLA_INTERFACE_COMMANDQUEUE_HEADER class CFileZillaEngine; class CNotification; @@ -8,18 +8,17 @@ DECLARE_EVENT_TYPE(fzEVT_GRANTEXCLUSIVEENGINEACCESS, -1) -class CCommandQueue +class CCommandQueue final { public: enum command_origin { any = -1, - normal, // Most user actions + normal, // Most user actions recursiveOperation }; - CCommandQueue(CFileZillaEngine *pEngine, CMainFrame* pMainFrame, CState* pState); - ~CCommandQueue(); + CCommandQueue(CFileZillaEngine *pEngine, CMainFrame* pMainFrame, CState& state); void ProcessCommand(CCommand *pCommand, command_origin origin = normal); void ProcessNextCommand(); @@ -43,10 +42,10 @@ CFileZillaEngine *m_pEngine; CMainFrame* m_pMainFrame; - CState* m_pState; - bool m_exclusiveEngineRequest; - bool m_exclusiveEngineLock; - int m_requestId; + CState& m_state; + bool m_exclusiveEngineRequest{}; + bool m_exclusiveEngineLock{}; + int m_requestId{}; static int m_requestIdCounter; // Used to make this class reentrance-safe @@ -68,5 +67,5 @@ bool m_quit{}; }; -#endif //__COMMANDQUEUE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/conditionaldialog.cpp filezilla-3.33.0/src/interface/conditionaldialog.cpp --- filezilla-3.15.0.2/src/interface/conditionaldialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/conditionaldialog.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -8,7 +8,7 @@ EVT_BUTTON(wxID_ANY, CConditionalDialog::OnButton) END_EVENT_TABLE() -CConditionalDialog::CConditionalDialog(wxWindow* parent, enum DialogType type, enum Modes mode, bool checked /*=false*/) +CConditionalDialog::CConditionalDialog(wxWindow* parent, DialogType type, Modes mode, bool checked /*=false*/) : wxDialog(parent, wxID_ANY, _T(""), wxDefaultPosition), m_type(type) { wxSizer* pVertSizer = new wxBoxSizer(wxVERTICAL); @@ -32,9 +32,9 @@ if (mode == ok) { pMainSizer->Prepend(new wxStaticBitmap(this, wxID_ANY, wxArtProvider::GetBitmap(wxART_INFORMATION)), 0, wxLEFT | wxBOTTOM | wxTOP, 10); - wxButton* ok = new wxButton(this, wxID_OK); - ok->SetDefault(); - buttons->AddButton(ok); + wxButton* ok_btn = new wxButton(this, wxID_OK); + ok_btn->SetDefault(); + buttons->AddButton(ok_btn); SetEscapeId(wxID_OK); } else { @@ -65,12 +65,12 @@ int id = ShowModal(); - if (wxDynamicCast(FindWindow(wxID_HIGHEST + 1), wxCheckBox)->GetValue()) - { + auto cb = dynamic_cast(FindWindow(wxID_HIGHEST + 1)); + if (cb && cb->GetValue()) { while (dialogs.Len() <= (unsigned int)m_type) dialogs += _T("0"); dialogs[m_type] = '1'; - COptions::Get()->SetOption(OPTION_ONETIME_DIALOGS, dialogs); + COptions::Get()->SetOption(OPTION_ONETIME_DIALOGS, dialogs.ToStdWstring()); } if (id == wxID_OK || id == wxID_YES) diff -Nru filezilla-3.15.0.2/src/interface/conditionaldialog.h filezilla-3.33.0/src/interface/conditionaldialog.h --- filezilla-3.15.0.2/src/interface/conditionaldialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/conditionaldialog.h 2017-10-25 17:12:23.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __CONDITIONALDIALOG_H__ -#define __CONDITIONALDIALOG_H__ +#ifndef FILEZILLA_INTERFACE_CONDITIONALDIALOG_HEADER +#define FILEZILLA_INTERFACE_CONDITIONALDIALOG_HEADER -class CConditionalDialog : public wxDialog +class CConditionalDialog final : public wxDialog { public: enum Modes @@ -20,17 +20,18 @@ confirm_preserve_timestamps, compare_treeviewmismatch, compare_changesorting, - many_selected_for_edit + many_selected_for_edit, + quick_search }; - CConditionalDialog(wxWindow* parent, enum DialogType type, enum Modes mode, bool checked = false); + CConditionalDialog(wxWindow* parent, DialogType type, Modes mode, bool checked = false); void AddText(const wxString &text); bool Run(); protected: - enum DialogType m_type; + DialogType m_type; wxSizer* m_pTextSizer; @@ -38,4 +39,4 @@ void OnButton(wxCommandEvent& event); }; -#endif //__CONDITIONALDIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/context_control.cpp filezilla-3.33.0/src/interface/context_control.cpp --- filezilla-3.15.0.2/src/interface/context_control.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/context_control.cpp 2017-10-25 17:12:23.000000000 +0000 @@ -3,12 +3,14 @@ #include "context_control.h" #include "filelist_statusbar.h" #include "filezillaapp.h" +#include "list_search_panel.h" +#include "local_recursive_operation.h" #include "LocalListView.h" #include "LocalTreeView.h" #include "Mainfrm.h" #include "Options.h" #include "queue.h" -#include "recursive_operation.h" +#include "remote_recursive_operation.h" #include "recursive_operation_status.h" #include "RemoteListView.h" #include "RemoteTreeView.h" @@ -31,8 +33,7 @@ END_EVENT_TABLE() CContextControl::CContextControl(CMainFrame& mainFrame) - : CStateEventHandler(0) - , m_mainFrame(mainFrame) + : m_mainFrame(mainFrame) { wxASSERT(!CContextManager::Get()->HandlerCount(STATECHANGE_CHANGEDCONTEXT)); CContextManager::Get()->RegisterHandler(this, STATECHANGE_CHANGEDCONTEXT, false); @@ -50,7 +51,7 @@ void CContextControl::CreateTab() { - wxGetApp().AddStartupProfileRecord(_T("CContextControl::CreateTab")); + wxGetApp().AddStartupProfileRecord("CContextControl::CreateTab"); { #ifdef __WXMSW__ @@ -63,17 +64,21 @@ // See if we can reuse an existing context for (size_t i = 0; i < m_context_controls.size(); i++) { - if (m_context_controls[i].tab_index != -1) + if (m_context_controls[i].used()) { continue; + } if (m_context_controls[i].pState->IsRemoteConnected() || !m_context_controls[i].pState->IsRemoteIdle()) + { continue; + } pState = m_context_controls[i].pState; m_context_controls.erase(m_context_controls.begin() + i); - if (m_current_context_controls > (int)i) - m_current_context_controls--; + if (m_current_context_controls > (int)i) { + --m_current_context_controls; + } break; } if (!pState) { @@ -84,18 +89,36 @@ } // Restore last server and path - CServer last_server; - CServerPath last_path; - if (COptions::Get()->GetLastServer(last_server) && last_path.SetSafePath(COptions::Get()->GetOption(OPTION_LASTSERVERPATH))) - pState->SetLastServer(last_server, last_path); + auto * current = GetCurrentControls(); + if (current) { + pState->SetLastSite(current->pState->GetLastSite(), current->pState->GetLastServerPath()); + } + else { + ServerWithCredentials last_server; + CServerPath last_path; + if (COptions::Get()->GetLastServer(last_server) && last_path.SetSafePath(COptions::Get()->GetOption(OPTION_LASTSERVERPATH))) { + std::wstring last_site_path = COptions::Get()->GetOption(OPTION_LAST_CONNECTED_SITE); + + std::unique_ptr site; + if (!last_site_path.empty()) { + site = CSiteManager::GetSiteByPath(last_site_path, false).first; + } + if (!site || site->server_ != last_server) { + site.reset(new Site); + site->server_ = last_server; + } + pState->SetLastSite(*site, last_path); + } + } - CreateContextControls(pState); + CreateContextControls(*pState); - pState->GetRecursiveOperationHandler()->SetQueue(m_mainFrame.GetQueue()); + pState->GetLocalRecursiveOperation()->SetQueue(m_mainFrame.GetQueue()); + pState->GetRemoteRecursiveOperation()->SetQueue(m_mainFrame.GetQueue()); - wxString const localDir = COptions::Get()->GetOption(OPTION_LASTLOCALDIR); + std::wstring const localDir = COptions::Get()->GetOption(OPTION_LASTLOCALDIR); if (!pState->SetLocalDir(localDir)) { - wxString const homeDir = wxGetHomeDir(); + std::wstring const homeDir = wxGetHomeDir().ToStdWstring(); if (!pState->SetLocalDir(homeDir)) { pState->SetLocalDir(_T("/")); } @@ -111,9 +134,9 @@ m_tabs->SetSelection(m_tabs->GetPageCount() - 1); } -void CContextControl::CreateContextControls(CState* pState) +void CContextControl::CreateContextControls(CState& state) { - wxGetApp().AddStartupProfileRecord(_T("CContextControl::CreateContextControls")); + wxGetApp().AddStartupProfileRecord("CContextControl::CreateContextControls"); wxWindow* parent = this; #ifdef __WXGTK__ @@ -128,7 +151,7 @@ m_tabs = new wxAuiNotebookEx(); wxSize splitter_size = m_context_controls[m_current_context_controls].pViewSplitter->GetSize(); - m_tabs->Create(this, wxID_ANY, initial_position, splitter_size, wxNO_BORDER | wxAUI_NB_SCROLL_BUTTONS | wxAUI_NB_WINDOWLIST_BUTTON | wxAUI_NB_CLOSE_ON_ALL_TABS); + m_tabs->Create(this, wxID_ANY, initial_position, splitter_size, wxNO_BORDER | wxAUI_NB_SCROLL_BUTTONS | wxAUI_NB_WINDOWLIST_BUTTON | wxAUI_NB_CLOSE_ON_ALL_TABS | wxAUI_NB_TAB_MOVE); m_tabs->SetExArtProvider(); m_tabs->SetSelectedFont(*wxNORMAL_FONT); m_tabs->SetMeasuringFont(*wxNORMAL_FONT); @@ -136,6 +159,7 @@ m_context_controls[m_current_context_controls].pViewSplitter->Reparent(m_tabs); m_tabs->AddPage(m_context_controls[m_current_context_controls].pViewSplitter, m_context_controls[m_current_context_controls].pState->GetTitle()); + m_tabs->SetTabColour(0, m_context_controls[m_current_context_controls].pState->GetSite().m_colour); ReplaceWindow(m_context_controls[m_current_context_controls].pViewSplitter, m_tabs); m_tabs->Connect(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler(CContextControl::OnTabChanged), 0, this); @@ -157,9 +181,9 @@ parent = m_tabs; } - struct CContextControl::_context_controls context_controls; + CContextControl::_context_controls context_controls; - context_controls.pState = pState; + context_controls.pState = &state; context_controls.pViewSplitter = new CSplitterWindowEx(parent, -1, initial_position, wxDefaultSize, wxSP_NOBORDER | wxSP_LIVE_UPDATE); context_controls.pViewSplitter->SetMinimumPaneSize(50, 100); context_controls.pViewSplitter->SetSashGravity(0.5); @@ -172,15 +196,15 @@ context_controls.pLocalTreeViewPanel = new CView(context_controls.pLocalSplitter); context_controls.pLocalListViewPanel = new CView(context_controls.pLocalSplitter); - context_controls.pLocalTreeView = new CLocalTreeView(context_controls.pLocalTreeViewPanel, -1, pState, m_mainFrame.GetQueue()); - context_controls.pLocalListView = new CLocalListView(context_controls.pLocalListViewPanel, pState, m_mainFrame.GetQueue()); + context_controls.pLocalTreeView = new CLocalTreeView(context_controls.pLocalTreeViewPanel, -1, state, m_mainFrame.GetQueue()); + context_controls.pLocalListView = new CLocalListView(context_controls.pLocalListViewPanel, state, m_mainFrame.GetQueue()); context_controls.pLocalTreeViewPanel->SetWindow(context_controls.pLocalTreeView); context_controls.pLocalListViewPanel->SetWindow(context_controls.pLocalListView); context_controls.pRemoteTreeViewPanel = new CView(context_controls.pRemoteSplitter); context_controls.pRemoteListViewPanel = new CView(context_controls.pRemoteSplitter); - context_controls.pRemoteTreeView = new CRemoteTreeView(context_controls.pRemoteTreeViewPanel, -1, pState, m_mainFrame.GetQueue()); - context_controls.pRemoteListView = new CRemoteListView(context_controls.pRemoteListViewPanel, pState, m_mainFrame.GetQueue()); + context_controls.pRemoteTreeView = new CRemoteTreeView(context_controls.pRemoteTreeViewPanel, -1, state, m_mainFrame.GetQueue()); + context_controls.pRemoteListView = new CRemoteListView(context_controls.pRemoteListViewPanel, state, m_mainFrame.GetQueue()); context_controls.pRemoteTreeViewPanel->SetWindow(context_controls.pRemoteTreeView); context_controls.pRemoteListViewPanel->SetWindow(context_controls.pRemoteListView); @@ -199,8 +223,17 @@ context_controls.pRemoteListViewPanel->SetStatusBar(pRemoteFilelistStatusBar); context_controls.pRemoteListView->SetFilelistStatusBar(pRemoteFilelistStatusBar); - auto recursiveStatus = new CRecursiveOperationStatus(context_controls.pRemoteListViewPanel, context_controls.pState); - context_controls.pRemoteListViewPanel->SetFooter(recursiveStatus); + auto localRecursiveStatus = new CRecursiveOperationStatus(context_controls.pLocalListViewPanel, state, true); + context_controls.pLocalListViewPanel->SetFooter(localRecursiveStatus); + + auto remoteRecursiveStatus = new CRecursiveOperationStatus(context_controls.pRemoteListViewPanel, state, false); + context_controls.pRemoteListViewPanel->SetFooter(remoteRecursiveStatus); + + context_controls.pLocalListSearchPanel = new CListSearchPanel(context_controls.pLocalListViewPanel, context_controls.pLocalListView, context_controls.pState, true); + context_controls.pLocalListViewPanel->SetSearchPanel(context_controls.pLocalListSearchPanel); + + context_controls.pRemoteListSearchPanel = new CListSearchPanel(context_controls.pRemoteListViewPanel, context_controls.pRemoteListView, context_controls.pState, false); + context_controls.pRemoteListViewPanel->SetSearchPanel(context_controls.pRemoteListSearchPanel); const int layout = COptions::Get()->GetOptionVal(OPTION_FILEPANE_LAYOUT); const int swap = COptions::Get()->GetOptionVal(OPTION_FILEPANE_SWAP); @@ -219,7 +252,7 @@ } if (COptions::Get()->GetOptionVal(OPTION_SHOW_TREE_LOCAL)) { - context_controls.pLocalViewHeader = new CLocalViewHeader(context_controls.pLocalTreeViewPanel, pState); + context_controls.pLocalViewHeader = new CLocalViewHeader(context_controls.pLocalTreeViewPanel, state); context_controls.pLocalTreeViewPanel->SetHeader(context_controls.pLocalViewHeader); if (layout == 3 && swap) context_controls.pLocalSplitter->SplitVertically(context_controls.pLocalListViewPanel, context_controls.pLocalTreeViewPanel); @@ -230,13 +263,13 @@ } else { context_controls.pLocalTreeViewPanel->Hide(); - context_controls.pLocalViewHeader = new CLocalViewHeader(context_controls.pLocalListViewPanel, pState); + context_controls.pLocalViewHeader = new CLocalViewHeader(context_controls.pLocalListViewPanel, state); context_controls.pLocalListViewPanel->SetHeader(context_controls.pLocalViewHeader); context_controls.pLocalSplitter->Initialize(context_controls.pLocalListViewPanel); } if (COptions::Get()->GetOptionVal(OPTION_SHOW_TREE_REMOTE)) { - context_controls.pRemoteViewHeader = new CRemoteViewHeader(context_controls.pRemoteTreeViewPanel, pState); + context_controls.pRemoteViewHeader = new CRemoteViewHeader(context_controls.pRemoteTreeViewPanel, state); context_controls.pRemoteTreeViewPanel->SetHeader(context_controls.pRemoteViewHeader); if (layout == 3 && !swap) context_controls.pRemoteSplitter->SplitVertically(context_controls.pRemoteListViewPanel, context_controls.pRemoteTreeViewPanel); @@ -247,7 +280,7 @@ } else { context_controls.pRemoteTreeViewPanel->Hide(); - context_controls.pRemoteViewHeader = new CRemoteViewHeader(context_controls.pRemoteListViewPanel, pState); + context_controls.pRemoteViewHeader = new CRemoteViewHeader(context_controls.pRemoteListViewPanel, state); context_controls.pRemoteListViewPanel->SetHeader(context_controls.pRemoteViewHeader); context_controls.pRemoteSplitter->Initialize(context_controls.pRemoteListViewPanel); } @@ -266,27 +299,12 @@ m_mainFrame.ConnectNavigationHandler(context_controls.pLocalViewHeader); m_mainFrame.ConnectNavigationHandler(context_controls.pRemoteViewHeader); - pState->GetComparisonManager()->SetListings(context_controls.pLocalListView, context_controls.pRemoteListView); + state.GetComparisonManager()->SetListings(context_controls.pLocalListView, context_controls.pRemoteListView); if (m_tabs) { - context_controls.tab_index = m_tabs->GetPageCount(); - m_tabs->AddPage(context_controls.pViewSplitter, pState->GetTitle()); - - // Copy reconnect and bookmark information - pState->SetLastServer( - m_context_controls[m_current_context_controls].pState->GetLastServer(), - m_context_controls[m_current_context_controls].pState->GetLastServerPath()); - - context_controls.site_bookmarks = m_context_controls[m_current_context_controls].site_bookmarks; + m_tabs->AddPage(context_controls.pViewSplitter, state.GetTitle()); } else { - context_controls.tab_index = 0; - context_controls.site_bookmarks = std::make_shared(); - - context_controls.site_bookmarks->path = COptions::Get()->GetOption(OPTION_LAST_CONNECTED_SITE); - CSiteManager::GetBookmarks(context_controls.site_bookmarks->path, - context_controls.site_bookmarks->bookmarks); - Initialize(context_controls.pViewSplitter); } @@ -295,22 +313,18 @@ void CContextControl::OnTabRefresh(wxCommandEvent&) { - if (m_right_clicked_tab == -1) + if (m_right_clicked_tab == -1) { return; + } - for (size_t j = 0; j < m_context_controls.size(); j++) - { - if (m_context_controls[j].tab_index != m_right_clicked_tab) - continue; - - m_context_controls[j].pState->RefreshLocal(); - m_context_controls[j].pState->RefreshRemote(); - - break; + auto * controls = GetControlsFromTabIndex(m_right_clicked_tab); + if (controls) { + controls->pState->RefreshLocal(); + controls->pState->RefreshRemote(); } } -struct CContextControl::_context_controls* CContextControl::GetCurrentControls() + CContextControl::_context_controls* CContextControl::GetCurrentControls() { if (m_current_context_controls == -1) return 0; @@ -318,11 +332,10 @@ return &m_context_controls[m_current_context_controls]; } -struct CContextControl::_context_controls* CContextControl::GetControlsFromState(CState* pState) +CContextControl::_context_controls* CContextControl::GetControlsFromState(CState* pState) { size_t i = 0; - for (i = 0; i < m_context_controls.size(); i++) - { + for (i = 0; i < m_context_controls.size(); ++i) { if (m_context_controls[i].pState == pState) return &m_context_controls[i]; } @@ -331,24 +344,19 @@ bool CContextControl::CloseTab(int tab) { - if (!m_tabs) - return false; - if (tab < 0) + if (!m_tabs) { return false; - - size_t i = 0; - for (i = 0; i < m_context_controls.size(); i++) - { - if (m_context_controls[i].tab_index == tab) - break; } - if (i == m_context_controls.size()) + if (tab < 0 || static_cast(tab) >= m_tabs->GetPageCount()) { return false; + } - CState* pState = m_context_controls[i].pState; - if (!pState->m_pCommandQueue->Idle()) - { + auto *const removeControls = GetControlsFromTabIndex(tab); + + CState *const pState = removeControls->pState; + + if (!pState->m_pCommandQueue->Idle()) { if (wxMessageBoxEx(_("Cannot close tab while busy.\nCancel current operation and close tab?"), _T("FileZilla"), wxYES_NO | wxICON_QUESTION) != wxYES) return false; } @@ -360,65 +368,47 @@ #endif pState->m_pCommandQueue->Cancel(); - pState->GetRecursiveOperationHandler()->StopRecursiveOperation(); + pState->GetLocalRecursiveOperation()->StopRecursiveOperation(); + pState->GetRemoteRecursiveOperation()->StopRecursiveOperation(); pState->GetComparisonManager()->SetListings(0, 0); - if (m_tabs->GetPageCount() == 2) - { + if (m_tabs->GetPageCount() == 2) { // Get rid again of tab bar m_tabs->Disconnect(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler(CContextControl::OnTabChanged), 0, this); int keep = tab ? 0 : 1; - m_tabs->RemovePage(keep); - size_t j; - for (j = 0; j < m_context_controls.size(); j++) - { - if (m_context_controls[j].tab_index != keep) - continue; + auto * keptControls = GetControlsFromTabIndex(keep); + m_tabs->RemovePage(keep); - break; - } + CContextManager::Get()->SetCurrentContext(keptControls->pState); - m_context_controls[j].pViewSplitter->Reparent(this); - ReplaceWindow(m_tabs, m_context_controls[j].pViewSplitter); - m_context_controls[j].pViewSplitter->Show(); - m_context_controls[j].tab_index = 0; + keptControls->pViewSplitter->Reparent(this); + ReplaceWindow(m_tabs, keptControls->pViewSplitter); + keptControls->pViewSplitter->Show(); wxAuiNotebookEx *tabs = m_tabs; m_tabs = 0; - m_context_controls[i].tab_index = -1; - m_context_controls[i].site_bookmarks.reset(); + removeControls->pViewSplitter = 0; - CContextManager::Get()->SetCurrentContext(m_context_controls[j].pState); + CContextManager::Get()->SetCurrentContext(keptControls->pState); tabs->Destroy(); } - else - { - if (pState == CContextManager::Get()->GetCurrentContext()) - { + else { + if (pState == CContextManager::Get()->GetCurrentContext()) { int newsel = tab + 1; - if (newsel >= (int)m_tabs->GetPageCount()) + if (newsel >= (int)m_tabs->GetPageCount()) { newsel = m_tabs->GetPageCount() - 2; - - for (size_t j = 0; j < m_context_controls.size(); j++) - { - if (m_context_controls[j].tab_index != newsel) - continue; - m_tabs->SetSelection(newsel); - CContextManager::Get()->SetCurrentContext(m_context_controls[j].pState); } + + m_tabs->SetSelection(newsel); + CContextManager::Get()->SetCurrentContext(GetControlsFromTabIndex(newsel)->pState); } - for (size_t j = 0; j < m_context_controls.size(); j++) - { - if (m_context_controls[j].tab_index > tab) - m_context_controls[j].tab_index--; - } - m_context_controls[i].tab_index = -1; - m_context_controls[i].site_bookmarks.reset(); + + removeControls->pViewSplitter = 0; m_tabs->DeletePage(tab); } @@ -470,14 +460,13 @@ void CContextControl::OnTabClosing_Deferred(wxCommandEvent& event) { int tab = event.GetId(); - if (tab < 0) - { + if (tab < 0) { tab++; int count = GetTabCount(); - for (int i = count - 1; i >= 0; i--) - { - if (i != -tab) + for (int i = count - 1; i >= 0; --i) { + if (i != -tab) { CloseTab(i); + } } } else @@ -488,17 +477,12 @@ void CContextControl::OnTabChanged(wxAuiNotebookEvent&) { int i = m_tabs->GetSelection(); - if (i < 0 || i >= (int)m_context_controls.size()) + auto * const controls = GetControlsFromTabIndex(i); + if (!controls) { return; - - for (size_t j = 0; j < m_context_controls.size(); j++) - { - if (m_context_controls[j].tab_index != i) - continue; - - CContextManager::Get()->SetCurrentContext(m_context_controls[j].pState); - break; } + + CContextManager::Get()->SetCurrentContext(controls->pState); } void CContextControl::OnTabClosing(wxAuiNotebookEvent& event) @@ -520,12 +504,26 @@ return m_tabs ? m_tabs->GetPageCount() : (m_context_controls.empty() ? 0 : 1); } -struct CContextControl::_context_controls* CContextControl::GetControlsFromTabIndex(int i) +CContextControl::_context_controls* CContextControl::GetControlsFromTabIndex(int i) { - for (size_t j = 0; j < m_context_controls.size(); j++) - { - if (m_context_controls[j].tab_index == i) - return &m_context_controls[j]; + if (!m_tabs) { + if (i == 0 && !m_context_controls.empty()) { + for (auto & controls : m_context_controls) { + if (controls.pViewSplitter != 0) { + return &controls; + } + } + } + return 0; + } + + wxWindow* page = m_tabs->GetPage(i); + if (page) { + for (auto & controls : m_context_controls) { + if (controls.pViewSplitter == page) { + return &controls; + } + } } return 0; @@ -533,19 +531,21 @@ bool CContextControl::SelectTab(int i) { - if (i < 0) + if (i < 0) { return false; + } - if (!m_tabs) - { - if (i != 0) + if (!m_tabs) { + if (i != 0) { return false; + } return true; } - if ((int)m_tabs->GetPageCount() <= i) + if ((int)m_tabs->GetPageCount() <= i) { return false; + } m_tabs->SetSelection(i); @@ -554,39 +554,42 @@ void CContextControl::AdvanceTab(bool forward) { - if (!m_tabs) + if (!m_tabs) { return; + } m_tabs->AdvanceTab(forward); } -void CContextControl::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*) +void CContextControl::OnStateChange(CState* pState, t_statechange_notifications notification, const wxString&, const void*) { - if (notification == STATECHANGE_CHANGEDCONTEXT) - { - if (!pState) - { + if (notification == STATECHANGE_CHANGEDCONTEXT) { + if (!pState) { m_current_context_controls = 0; return; } // Get current controls for new current context - for (m_current_context_controls = 0; m_current_context_controls < (int)m_context_controls.size(); m_current_context_controls++) - { + for (m_current_context_controls = 0; m_current_context_controls < (int)m_context_controls.size(); ++m_current_context_controls) { if (m_context_controls[m_current_context_controls].pState == pState) break; } if (m_current_context_controls == (int)m_context_controls.size()) m_current_context_controls = -1; } - else if (notification == STATECHANGE_SERVER) - { - if (!m_tabs) + else if (notification == STATECHANGE_SERVER) { + if (!m_tabs) { return; + } CContextControl::_context_controls* controls = GetControlsFromState(pState); - if (controls && controls->tab_index != -1) - m_tabs->SetPageText(controls->tab_index, controls->pState->GetTitle()); + if (controls && controls->used()) { + int i = m_tabs->GetPageIndex(controls->pViewSplitter); + if (i != wxNOT_FOUND) { + m_tabs->SetTabColour(i, controls->pState->GetSite().m_colour); + m_tabs->SetPageText(i, controls->pState->GetTitle()); + } + } } } diff -Nru filezilla-3.15.0.2/src/interface/context_control.h filezilla-3.33.0/src/interface/context_control.h --- filezilla-3.15.0.2/src/interface/context_control.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/context_control.h 2017-10-25 17:12:23.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __CONTEXT_CONTROL_H__ -#define __CONTEXT_CONTROL_H__ +#ifndef FILEZILLA_INTERFACE_CONTEXT_CONTROL_HEADER +#define FILEZILLA_INTERFACE_CONTEXT_CONTROL_HEADER #include #include "state.h" @@ -16,38 +16,34 @@ class CViewHeader; class CSplitterWindowEx; class CState; +class CListSearchPanel; -class CContextControl final : public wxSplitterWindow, public CStateEventHandler +class CContextControl final : public wxSplitterWindow, public CGlobalStateEventHandler { public: struct _context_controls { + bool used() const { return pViewSplitter != 0; } + // List of all windows and controls assorted with a context - CView* pLocalTreeViewPanel; - CView* pLocalListViewPanel; - CLocalTreeView* pLocalTreeView; - CLocalListView* pLocalListView; - CView* pRemoteTreeViewPanel; - CView* pRemoteListViewPanel; - CRemoteTreeView* pRemoteTreeView; - CRemoteListView* pRemoteListView; - CViewHeader* pLocalViewHeader; - CViewHeader* pRemoteViewHeader; - - CSplitterWindowEx* pViewSplitter; // Contains local and remote splitters - CSplitterWindowEx* pLocalSplitter; - CSplitterWindowEx* pRemoteSplitter; - - CState* pState; - - int tab_index; - - struct _site_bookmarks - { - wxString path; - std::list bookmarks; - }; - std::shared_ptr<_site_bookmarks> site_bookmarks; + CView* pLocalTreeViewPanel{}; + CView* pLocalListViewPanel{}; + CLocalTreeView* pLocalTreeView{}; + CLocalListView* pLocalListView{}; + CView* pRemoteTreeViewPanel{}; + CView* pRemoteListViewPanel{}; + CRemoteTreeView* pRemoteTreeView{}; + CRemoteListView* pRemoteListView{}; + CViewHeader* pLocalViewHeader{}; + CViewHeader* pRemoteViewHeader{}; + CListSearchPanel* pLocalListSearchPanel{}; + CListSearchPanel* pRemoteListSearchPanel{}; + + CSplitterWindowEx* pViewSplitter{}; // Contains local and remote splitters + CSplitterWindowEx* pLocalSplitter{}; + CSplitterWindowEx* pRemoteSplitter{}; + + CState* pState{}; }; CContextControl(CMainFrame& mainFrame); @@ -58,21 +54,21 @@ void CreateTab(); bool CloseTab(int tab); - struct _context_controls* GetCurrentControls(); - struct _context_controls* GetControlsFromState(CState* pState); + _context_controls* GetCurrentControls(); + _context_controls* GetControlsFromState(CState* pState); int GetCurrentTab() const; int GetTabCount() const; - struct _context_controls* GetControlsFromTabIndex(int i); + _context_controls* GetControlsFromTabIndex(int i); bool SelectTab(int i); void AdvanceTab(bool forward); protected: - void CreateContextControls(CState* pState); + void CreateContextControls(CState& state); - std::vector m_context_controls; + std::vector<_context_controls> m_context_controls; int m_current_context_controls{-1}; wxAuiNotebookEx* m_tabs{}; @@ -91,7 +87,7 @@ void OnTabContextCloseOthers(wxCommandEvent& event); void OnTabContextNew(wxCommandEvent&); - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*); + virtual void OnStateChange(CState* pState, t_statechange_notifications notification, const wxString&, const void*); }; -#endif //__CONTEX_CONTROL_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/customheightlistctrl.cpp filezilla-3.33.0/src/interface/customheightlistctrl.cpp --- filezilla-3.15.0.2/src/interface/customheightlistctrl.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/customheightlistctrl.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,20 +1,18 @@ #include #include "customheightlistctrl.h" +#include + +IMPLEMENT_DYNAMIC_CLASS(wxCustomHeightListCtrl, wxScrolledWindow) + BEGIN_EVENT_TABLE(wxCustomHeightListCtrl, wxScrolledWindow) EVT_MOUSE_EVENTS(wxCustomHeightListCtrl::OnMouseEvent) +EVT_SIZE(wxCustomHeightListCtrl::OnSize) END_EVENT_TABLE() -wxCustomHeightListCtrl::wxCustomHeightListCtrl(wxWindow* parent, wxWindowID id /*=-1*/, const wxPoint& pos /*=wxDefaultPosition*/, const wxSize& size /*=wxDefaultSize*/, long style /*=wxHSCROLL|wxVSCROLL*/, const wxString& name /*=_T("scrolledWindow")*/) +wxCustomHeightListCtrl::wxCustomHeightListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, style, name) { - m_lineHeight = 20; - m_lineCount = 0; - m_focusedLine = -1; - - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - - m_allow_selection = true; } void wxCustomHeightListCtrl::SetLineHeight(int height) @@ -23,25 +21,13 @@ int posx, posy; GetViewStart(&posx, &posy); - SetScrollbars(0, m_lineHeight, 0, m_lineCount, 0, posy); + SetScrollbars(0, m_lineHeight, 0, m_rows.size(), 0, posy); Refresh(); } -void wxCustomHeightListCtrl::SetLineCount(int count) +void wxCustomHeightListCtrl::AdjustView() { - if (count < m_lineCount) - { - std::set selectedLines = m_selectedLines; - m_selectedLines.clear(); - for (std::set::const_iterator iter = selectedLines.begin(); iter != selectedLines.end(); ++iter) - if (*iter < count) - m_selectedLines.insert(*iter); - } - m_lineCount = count; - if (m_focusedLine >= count) - m_focusedLine = -1; - int posx, posy; GetViewStart(&posx, &posy); @@ -52,18 +38,16 @@ GetViewStart(&old_view.x, &old_view.y); #endif - SetScrollbars(0, m_lineHeight, 0, m_lineCount, 0, posy); + SetScrollbars(0, m_lineHeight, 0, m_rows.size(), 0, posy); #ifdef __WXGTK__ wxPoint new_view; GetViewStart(&new_view.x, &new_view.y); int delta_y = m_lineHeight *(old_view.y - new_view.y); - if (delta_y) - { + if (delta_y) { wxWindowList::compatibility_iterator iter = GetChildren().GetFirst(); - while (iter) - { + while (iter) { wxWindow* child = iter->GetData(); wxPoint pos = child->GetPosition(); pos.y -= delta_y; @@ -73,8 +57,6 @@ } } #endif - - Refresh(); } void wxCustomHeightListCtrl::SetFocus() @@ -89,18 +71,18 @@ dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT))); dc.SetPen(*wxTRANSPARENT_PEN); - for (std::set::const_iterator iter = m_selectedLines.begin(); iter != m_selectedLines.end(); ++iter) - { - if (*iter == m_focusedLine) - dc.SetPen(wxPen(wxColour(0, 0, 0), 1, wxDOT)); - else + for (auto const& selected : m_selectedLines) { + if (selected == m_focusedLine) { + dc.SetPen(wxPen(wxColour(0, 0, 0), 1, wxPENSTYLE_DOT)); + } + else { dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle(0, m_lineHeight * *iter, size.GetWidth(), m_lineHeight); + } + dc.DrawRectangle(0, m_lineHeight * selected, size.GetWidth(), m_lineHeight); } - if (m_focusedLine != -1 && m_selectedLines.find(m_focusedLine) == m_selectedLines.end()) - { + if (m_focusedLine != npos && m_selectedLines.find(m_focusedLine) == m_selectedLines.end()) { dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW))); - dc.SetPen(wxPen(wxColour(0, 0, 0), 1, wxDOT)); + dc.SetPen(wxPen(wxColour(0, 0, 0), 1, wxPENSTYLE_DOT)); dc.DrawRectangle(0, m_lineHeight * m_focusedLine, size.GetWidth(), m_lineHeight); } } @@ -108,70 +90,56 @@ void wxCustomHeightListCtrl::OnMouseEvent(wxMouseEvent& event) { bool changed = false; - if (event.ButtonDown() && m_allow_selection) - { + if (event.ButtonDown() && m_allow_selection) { wxPoint pos = event.GetPosition(); int x, y; CalcUnscrolledPosition(pos.x, pos.y, &x, &y); - if (y > m_lineHeight * m_lineCount) - { - m_focusedLine = -1; + if (y < 0 || y > static_cast(m_lineHeight * m_rows.size())) { + m_focusedLine = npos; m_selectedLines.clear(); changed = true; } - else - { - int line = y / m_lineHeight; - if (event.ShiftDown()) - { - if (line < m_focusedLine) - { - for (int i = line; i <= m_focusedLine; i++) - { - if (m_selectedLines.find(i) == m_selectedLines.end()) - { - changed = true; - m_selectedLines.insert(i); - } + else { + size_t line = static_cast(y / m_lineHeight); + + if (event.ShiftDown()) { + if (m_focusedLine == npos) { + changed |= m_selectedLines.insert(line).second; + } + else if (line < m_focusedLine) { + for (size_t i = line; i <= m_focusedLine; ++i) { + changed |= m_selectedLines.insert(i).second; } } - else - { - for (int i = line; i >= m_focusedLine; i--) - { - if (m_selectedLines.find(i) == m_selectedLines.end()) - { - changed = true; - m_selectedLines.insert(i); - } + else { + for (size_t i = line; i >= m_focusedLine && i != npos; --i) { + changed |= m_selectedLines.insert(i).second; } } } - else if (event.ControlDown()) - { - if (m_selectedLines.find(line) == m_selectedLines.end()) + else if (event.ControlDown()) { + if (m_selectedLines.find(line) == m_selectedLines.end()) { m_selectedLines.insert(line); - else + } + else { m_selectedLines.erase(line); + } changed = true; } - else - { + else { m_selectedLines.clear(); m_selectedLines.insert(line); changed = true; } m_focusedLine = line; - } Refresh(); } event.Skip(); - if (changed) - { + if (changed) { wxCommandEvent evt(wxEVT_COMMAND_LISTBOX_SELECTED, GetId()); ProcessEvent(evt); } @@ -180,22 +148,33 @@ void wxCustomHeightListCtrl::ClearSelection() { m_selectedLines.clear(); - m_focusedLine = -1; + m_focusedLine = npos; + AdjustView(); Refresh(); } -std::set wxCustomHeightListCtrl::GetSelection() const +std::set wxCustomHeightListCtrl::GetSelection() const { return m_selectedLines; } -void wxCustomHeightListCtrl::SelectLine(int line) +size_t wxCustomHeightListCtrl::GetRowCount() const +{ + return m_rows.size(); +} + +void wxCustomHeightListCtrl::SelectLine(size_t line) { + if (!m_allow_selection) { + return; + } + m_selectedLines.clear(); m_focusedLine = line; - if (line != -1) + if (line != npos) { m_selectedLines.insert(line); + } Refresh(); } @@ -203,6 +182,99 @@ void wxCustomHeightListCtrl::AllowSelection(bool allow_selection) { m_allow_selection = allow_selection; - if (!allow_selection) + if (!allow_selection) { ClearSelection(); + } +} + +void wxCustomHeightListCtrl::InsertRow(wxSizer* sizer, size_t pos) +{ + assert(sizer); + assert(pos <= m_rows.size()); + m_rows.insert(m_rows.begin() + pos, sizer); + + sizer->SetContainingWindow(this); + + AdjustView(); + + int left = 0; + int top = 0; + CalcScrolledPosition(0, 0, &left, &top); + + int const width = GetClientSize().GetWidth(); + for (size_t i = pos; i < m_rows.size(); ++i) { + m_rows[i]->SetDimension(left, m_lineHeight * i + top, width, m_lineHeight); + } + + Refresh(); + +#ifdef __WXGTK__ + // Needed for Ubuntu's shitty overlay scrollbar, it changes the layout asynchronously... + CallAfter([this](){ + wxSizeEvent ev; + OnSize(ev); + }); +#endif +} + +void wxCustomHeightListCtrl::DeleteRow(wxSizer *row) +{ + auto it = std::find(m_rows.begin(), m_rows.end(), row); + if (it != m_rows.end()) { + DeleteRow(it - m_rows.begin()); + } +} + +void wxCustomHeightListCtrl::DeleteRow(size_t pos) +{ + assert(pos < m_rows.size()); + m_rows[pos]->SetContainingWindow(0); + m_rows.erase(m_rows.begin() + pos); + + std::set selectedLines; + m_selectedLines.swap(selectedLines); + for (auto const& selected : selectedLines) { + if (selected < m_rows.size()) { + m_selectedLines.insert(selected); + } + } + + AdjustView(); + + if (m_focusedLine >= m_rows.size()) { + m_focusedLine = npos; + } + + int left = 0; + int top = 0; + CalcScrolledPosition(0, 0, &left, &top); + + int const width = GetClientSize().GetWidth(); + + // Intentionally update all: if y position changes, by the time OnSize is called in + // response to AdjustView, internal state isn't quite correct + for (size_t i = 0; i < m_rows.size(); ++i) { + m_rows[i]->SetDimension(left, m_lineHeight * i + top, width, m_lineHeight); + } + + Refresh(); +} + +void wxCustomHeightListCtrl::ClearRows() +{ + m_rows.clear(); +} + +void wxCustomHeightListCtrl::OnSize(wxSizeEvent& event) +{ + event.Skip(); + + int const width = GetClientSize().GetWidth(); + + int left = 0; + int top = 0; + CalcScrolledPosition(0, 0, &left, &top); + for (size_t i = 0; i < m_rows.size(); ++i) { + m_rows[i]->SetDimension(left, m_lineHeight * i + top, width, m_lineHeight); + } } diff -Nru filezilla-3.15.0.2/src/interface/customheightlistctrl.h filezilla-3.33.0/src/interface/customheightlistctrl.h --- filezilla-3.15.0.2/src/interface/customheightlistctrl.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/customheightlistctrl.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,39 +1,57 @@ -#ifndef __CUSTOMHIGHTLISTCTRL_H__ -#define __CUSTOMHIGHTLISTCTRL_H__ +#ifndef FILEZILLA_INTERFACE_CUSTOM_HEIGHT_LISTCTRL_HEADER +#define FILEZILLA_INTERFACE_CUSTOM_HEIGHT_LISTCTRL_HEADER -#include #include -class wxCustomHeightListCtrl : public wxScrolledWindow +#include +#include + +class wxCustomHeightListCtrl final : public wxScrolledWindow { public: + wxCustomHeightListCtrl() = default; + wxCustomHeightListCtrl(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHSCROLL | wxVSCROLL, const wxString& name = _T("scrolledWindow")); void SetLineHeight(int height); - void SetLineCount(int count); virtual void SetFocus(); void ClearSelection(); - std::set GetSelection() const; - void SelectLine(int line); + std::set GetSelection() const; + size_t GetRowCount() const; + void SelectLine(size_t line); void AllowSelection(bool allow_selection); + void InsertRow(wxSizer* sizer, size_t pos); + void DeleteRow(size_t pos); + void DeleteRow(wxSizer *sizer); + void ClearRows(); + protected: + void AdjustView(); + virtual void OnDraw(wxDC& dc); DECLARE_EVENT_TABLE() void OnMouseEvent(wxMouseEvent& event); + void OnSize(wxSizeEvent& event); + + int m_lineHeight{20}; + + std::vector m_rows; + + std::set m_selectedLines; + + static size_t const npos{static_cast(-1)}; - int m_lineHeight; - int m_lineCount; + size_t m_focusedLine{npos}; - std::set m_selectedLines; - int m_focusedLine; + bool m_allow_selection{true}; - bool m_allow_selection; + DECLARE_DYNAMIC_CLASS(wxCustomHeightListCtrl) }; -#endif //__CUSTOMHIGHTLISTCTRL_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/defaultfileexistsdlg.cpp filezilla-3.33.0/src/interface/defaultfileexistsdlg.cpp --- filezilla-3.15.0.2/src/interface/defaultfileexistsdlg.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/defaultfileexistsdlg.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,98 +1,103 @@ #include #include "defaultfileexistsdlg.h" -enum CFileExistsNotification::OverwriteAction CDefaultFileExistsDlg::m_defaults[2] = {CFileExistsNotification::unknown, CFileExistsNotification::unknown}; - -CDefaultFileExistsDlg::CDefaultFileExistsDlg() -{ -} +CFileExistsNotification::OverwriteAction CDefaultFileExistsDlg::m_defaults[2] = {CFileExistsNotification::unknown, CFileExistsNotification::unknown}; bool CDefaultFileExistsDlg::Load(wxWindow *parent, bool fromQueue) { - if (!wxDialogEx::Load(parent, _T("ID_DEFAULTFILEEXISTSDLG"))) + if (!wxDialogEx::Load(parent, _T("ID_DEFAULTFILEEXISTSDLG"))) { return false; + } - if (fromQueue) + if (fromQueue) { XRCCTRL(*this, "ID_DESCRIPTION", wxStaticText)->SetLabel(_("Select default file exists action only for the currently selected files in the queue.")); - else + } + else { XRCCTRL(*this, "ID_DESCRIPTION", wxStaticText)->SetLabel(_("Select default file exists action if the target file already exists. This selection is valid only for the current session.")); + } WrapRecursive(this, 1.8, "DEFAULTFILEEXISTS"); GetSizer()->Fit(this); GetSizer()->SetSizeHints(this); - if (fromQueue) + if (fromQueue) { return true; + } SelectDefaults(&m_defaults[0], &m_defaults[1]); return true; } -void CDefaultFileExistsDlg::SelectDefaults(enum CFileExistsNotification::OverwriteAction* downloadAction, enum CFileExistsNotification::OverwriteAction* uploadAction) +void CDefaultFileExistsDlg::SelectDefaults(CFileExistsNotification::OverwriteAction* downloadAction, CFileExistsNotification::OverwriteAction* uploadAction) { - if (downloadAction) + if (downloadAction) { XRCCTRL(*this, "ID_DOWNLOAD_ACTION", wxChoice)->SetSelection(*downloadAction + 1); - if (uploadAction) + } + if (uploadAction) { XRCCTRL(*this, "ID_UPLOAD_ACTION", wxChoice)->SetSelection(*uploadAction + 1); + } } -enum CFileExistsNotification::OverwriteAction CDefaultFileExistsDlg::GetDefault(bool download) +CFileExistsNotification::OverwriteAction CDefaultFileExistsDlg::GetDefault(bool download) { return m_defaults[download ? 0 : 1]; } -bool CDefaultFileExistsDlg::Run(enum CFileExistsNotification::OverwriteAction *downloadAction, enum CFileExistsNotification::OverwriteAction *uploadAction) +bool CDefaultFileExistsDlg::Run(CFileExistsNotification::OverwriteAction *downloadAction, CFileExistsNotification::OverwriteAction *uploadAction) { SelectDefaults(downloadAction, uploadAction); // Remove one side of the dialog if not needed - if (!downloadAction && uploadAction) - { + if (!downloadAction && uploadAction) { XRCCTRL(*this, "ID_DOWNLOAD_ACTION_DESC", wxWindow)->Hide(); XRCCTRL(*this, "ID_DOWNLOAD_ACTION", wxWindow)->Hide(); } - else if (downloadAction && !uploadAction) - { + else if (downloadAction && !uploadAction) { XRCCTRL(*this, "ID_UPLOAD_ACTION_DESC", wxStaticText)->Hide(); XRCCTRL(*this, "ID_UPLOAD_ACTION", wxWindow)->Hide(); } Layout(); GetSizer()->Fit(this); - if (ShowModal() != wxID_OK) + if (ShowModal() != wxID_OK) { return false; + } - if (downloadAction || !uploadAction) - { + if (downloadAction || !uploadAction) { int dl = XRCCTRL(*this, "ID_DOWNLOAD_ACTION", wxChoice)->GetSelection(); - if (dl >= 0) - dl--; - enum CFileExistsNotification::OverwriteAction action = (enum CFileExistsNotification::OverwriteAction)dl; + if (dl >= 0) { + --dl; + } + CFileExistsNotification::OverwriteAction action = static_cast(dl); - if (downloadAction) + if (downloadAction) { *downloadAction = action; - else + } + else { m_defaults[0] = action; + } } - if (!downloadAction || uploadAction) - { + if (!downloadAction || uploadAction) { int ul = XRCCTRL(*this, "ID_UPLOAD_ACTION", wxChoice)->GetSelection(); - if (ul >= 0) - ul--; - enum CFileExistsNotification::OverwriteAction action = (enum CFileExistsNotification::OverwriteAction)ul; + if (ul >= 0) { + --ul; + } + CFileExistsNotification::OverwriteAction action = static_cast(ul); - if (uploadAction) + if (uploadAction) { *uploadAction = action; - else + } + else { m_defaults[1] = action; + } } return true; } -void CDefaultFileExistsDlg::SetDefault(bool download, enum CFileExistsNotification::OverwriteAction action) +void CDefaultFileExistsDlg::SetDefault(bool download, CFileExistsNotification::OverwriteAction action) { m_defaults[download ? 0 : 1] = action; } diff -Nru filezilla-3.15.0.2/src/interface/defaultfileexistsdlg.h filezilla-3.33.0/src/interface/defaultfileexistsdlg.h --- filezilla-3.15.0.2/src/interface/defaultfileexistsdlg.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/defaultfileexistsdlg.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,24 +1,22 @@ -#ifndef __DEFAULTFILEEXISTSDLG_H__ -#define __DEFAULTFILEEXISTSDLG_H__ +#ifndef FILEZILLA_INTERFACE_DEFAULTFILEEXISTSDLG_HEADER +#define FILEZILLA_INTERFACE_DEFAULTFILEEXISTSDLG_HEADER #include "dialogex.h" -class CDefaultFileExistsDlg : protected wxDialogEx +class CDefaultFileExistsDlg final : protected wxDialogEx { public: - CDefaultFileExistsDlg(); - bool Load(wxWindow *parent, bool fromQueue); - static enum CFileExistsNotification::OverwriteAction GetDefault(bool download); - static void SetDefault(bool download, enum CFileExistsNotification::OverwriteAction action); + static CFileExistsNotification::OverwriteAction GetDefault(bool download); + static void SetDefault(bool download, CFileExistsNotification::OverwriteAction action); - bool Run(enum CFileExistsNotification::OverwriteAction *downloadAction = 0, enum CFileExistsNotification::OverwriteAction *uploadAction = 0); + bool Run(CFileExistsNotification::OverwriteAction *downloadAction = 0, CFileExistsNotification::OverwriteAction *uploadAction = 0); protected: - void SelectDefaults(enum CFileExistsNotification::OverwriteAction* downloadAction, enum CFileExistsNotification::OverwriteAction* uploadAction); + void SelectDefaults(CFileExistsNotification::OverwriteAction* downloadAction, CFileExistsNotification::OverwriteAction* uploadAction); - static enum CFileExistsNotification::OverwriteAction m_defaults[2]; + static CFileExistsNotification::OverwriteAction m_defaults[2]; }; -#endif //__DEFAULTFILEEXISTSDLG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/dialogex.cpp filezilla-3.33.0/src/interface/dialogex.cpp --- filezilla-3.15.0.2/src/interface/dialogex.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/dialogex.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,6 +1,10 @@ #include #include "dialogex.h" -#include +#include "msgbox.h" + +#ifdef __WXMAC__ +#include "filezillaapp.h" +#endif BEGIN_EVENT_TABLE(wxDialogEx, wxDialog) EVT_CHAR_HOOK(wxDialogEx::OnChar) @@ -89,7 +93,7 @@ wxString wxDialogEx::GetChildLabel(int id) { - wxStaticText* pText = wxDynamicCast(FindWindow(id), wxStaticText); + auto pText = dynamic_cast(FindWindow(id)); if (!pText) return wxString(); @@ -146,6 +150,13 @@ return false; } #endif + +#ifdef __WXMAC__ + if (wxGetApp().MacGetCurrentEvent()) { + // We're inside an event handler for a native mac event, such as a popup menu + return false; + } +#endif return true; } diff -Nru filezilla-3.15.0.2/src/interface/dialogex.h filezilla-3.33.0/src/interface/dialogex.h --- filezilla-3.15.0.2/src/interface/dialogex.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/dialogex.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __DIALOGEX_H__ -#define __DIALOGEX_H__ +#ifndef FILEZILLA_INTERFACE_DIALOGEX_HEADER +#define FILEZILLA_INTERFACE_DIALOGEX_HEADER #include "wrapengine.h" @@ -31,4 +31,4 @@ static int m_shown_dialogs; }; -#endif //__DIALOGEX_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/dndobjects.cpp filezilla-3.33.0/src/interface/dndobjects.cpp --- filezilla-3.15.0.2/src/interface/dndobjects.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/dndobjects.cpp 2018-05-01 03:30:04.000000000 +0000 @@ -12,69 +12,78 @@ { m_shellExtension = 0; - CoCreateInstance(CLSID_ShellExtension, NULL, + int res = CoCreateInstance(CLSID_ShellExtension, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, IID_IUnknown, &m_shellExtension); + if (res != S_OK) { + m_shellExtension = 0; + } - if (m_shellExtension) + if (m_shellExtension) { m_hMutex = CreateMutex(0, false, _T("FileZilla3DragDropExtLogMutex")); - else + } + else { m_hMutex = 0; + } m_hMapping = 0; } CShellExtensionInterface::~CShellExtensionInterface() { - if (m_shellExtension) - { + if (m_shellExtension) { ((IUnknown*)m_shellExtension)->Release(); CoFreeUnusedLibraries(); } - if (m_hMapping) + if (m_hMapping) { CloseHandle(m_hMapping); + } - if (m_hMutex) + if (m_hMutex) { CloseHandle(m_hMutex); + } - if (!m_dragDirectory.empty()) - RemoveDirectory(m_dragDirectory.wc_str()); + if (!m_dragDirectory.empty()) { + RemoveDirectory(m_dragDirectory.c_str()); + } } wxString CShellExtensionInterface::InitDrag() { - if (!m_shellExtension) + if (!m_shellExtension) { return wxString(); + } - if (!m_hMutex) + if (!m_hMutex) { return wxString(); + } - if (!CreateDragDirectory()) + if (!CreateDragDirectory()) { return wxString(); + } m_hMapping = CreateFileMapping(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, DRAG_EXT_MAPPING_LENGTH, DRAG_EXT_MAPPING); - if (!m_hMapping) + if (!m_hMapping) { return wxString(); + } char* data = (char*)MapViewOfFile(m_hMapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, DRAG_EXT_MAPPING_LENGTH); - if (!data) - { + if (!data) { CloseHandle(m_hMapping); m_hMapping = 0; return wxString(); } DWORD result = WaitForSingleObject(m_hMutex, 250); - if (result != WAIT_OBJECT_0) - { + if (result != WAIT_OBJECT_0) { UnmapViewOfFile(data); return wxString(); } *data = DRAG_EXT_VERSION; data[1] = 1; - wcscpy((wchar_t*)(data + 2), m_dragDirectory.wc_str(wxConvLocal)); + wcscpy((wchar_t*)(data + 2), m_dragDirectory.c_str()); ReleaseMutex(m_hMutex); @@ -85,35 +94,36 @@ wxString CShellExtensionInterface::GetTarget() { - if (!m_shellExtension) + if (!m_shellExtension) { return wxString(); + } - if (!m_hMutex) + if (!m_hMutex) { return wxString(); + } - if (!m_hMapping) + if (!m_hMapping) { return wxString(); + } char* data = (char*)MapViewOfFile(m_hMapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, DRAG_EXT_MAPPING_LENGTH); - if (!data) - { + if (!data) { CloseHandle(m_hMapping); m_hMapping = 0; return wxString(); } DWORD result = WaitForSingleObject(m_hMutex, 250); - if (result != WAIT_OBJECT_0) - { + if (result != WAIT_OBJECT_0) { UnmapViewOfFile(data); return wxString(); } wxString target; const char reply = data[1]; - if (reply == 2) - { + if (reply == 2) { data[DRAG_EXT_MAPPING_LENGTH - 1] = 0; + data[DRAG_EXT_MAPPING_LENGTH - 2] = 0; target = (wchar_t*)(data + 2); } @@ -121,14 +131,17 @@ UnmapViewOfFile(data); - if (target.empty()) + if (target.empty()) { return target; + } - if (target.Last() == '\\') + if (target.Last() == '\\') { target.RemoveLast(); + } int pos = target.Find('\\', true); - if (pos < 1) + if (pos < 1) { return wxString(); + } target = target.Left(pos + 1); return target; @@ -146,12 +159,13 @@ wxFileName dirname(wxStandardPaths::Get().GetTempDir(), DRAG_EXT_DUMMY_DIR_PREFIX + std::to_wstring(value)); dirname.Normalize(); - wxString dir = dirname.GetFullPath(); + std::wstring dir = dirname.GetFullPath().ToStdWstring(); - if (dir.Len() > MAX_PATH) + if (dir.size() > DRAG_EXT_MAX_PATH) { return false; + } - if (CreateDirectory(dir.wc_str(), 0)) { + if (CreateDirectory(dir.c_str(), 0)) { m_dragDirectory = dir; return true; } @@ -170,22 +184,18 @@ return ret; } -//{7BB79969-2C7E-4107-996C-36DB90890AB2} +#endif -#endif //__WXMSW__ - -CRemoteDataObject::CRemoteDataObject(const CServer& server, const CServerPath& path) +CRemoteDataObject::CRemoteDataObject(ServerWithCredentials const& server, const CServerPath& path) : wxDataObjectSimple(wxDataFormat(_T("FileZilla3RemoteDataObject"))) - , m_server(server) + , server_(server) , m_path(path) - , m_didSendData() , m_processId(wxGetProcessId()) { } CRemoteDataObject::CRemoteDataObject() : wxDataObjectSimple(wxDataFormat(_T("FileZilla3RemoteDataObject"))) - , m_didSendData() , m_processId(wxGetProcessId()) { } @@ -224,65 +234,87 @@ AddTextElement(element, "ProcessId", m_processId); + AddTextElement(element, "Count", m_fileList.size()); + auto xServer = element.append_child("Server"); - SetServer(xServer, m_server); + SetServer(xServer, server_); AddTextElement(element, "Path", m_path.GetSafePath()); auto files = element.append_child("Files"); - for (std::list::const_iterator iter = m_fileList.begin(); iter != m_fileList.end(); ++iter) { + for (auto const& info : m_fileList) { auto file = files.append_child("File"); - AddTextElement(file, "Name", iter->name); - AddTextElement(file, "Dir", iter->dir ? 1 : 0); - AddTextElement(file, "Size", iter->size); - AddTextElement(file, "Link", iter->link ? 1 : 0); + AddTextElement(file, "Name", info.name); + AddTextElement(file, "Dir", info.dir ? 1 : 0); + AddTextElement(file, "Size", info.size); + AddTextElement(file, "Link", info.link ? 1 : 0); } } bool CRemoteDataObject::SetData(size_t len, const void* buf) { char* data = (char*)buf; - if (!len || data[len - 1] != 0) + if (!len || data[len - 1] != 0) { return false; + } - if (!m_xmlFile.ParseData(data)) + if (!m_xmlFile.ParseData(data)) { return false; + } auto element = m_xmlFile.GetElement(); - if (!element || !(element = element.child("RemoteDataObject"))) + if (!element || !(element = element.child("RemoteDataObject"))) { return false; + } m_processId = GetTextElementInt(element, "ProcessId", -1); - if (m_processId == -1) + if (m_processId == -1) { return false; + } + + int64_t count = GetTextElementInt(element, "Count", -1); + if (count > 0) { + try { + m_fileList.reserve(static_cast(count)); + } + catch(std::exception const&) { + return false; + } + } - auto server = element.child("Server"); - if (!server || !::GetServer(server, m_server)) + auto serverElement = element.child("Server"); + if (!serverElement || !::GetServer(serverElement, server_)) { return false; + } - wxString path = GetTextElement(element, "Path"); - if (path.empty() || !m_path.SetSafePath(path)) + std::wstring path = GetTextElement(element, "Path"); + if (path.empty() || !m_path.SetSafePath(path)) { return false; + } m_fileList.clear(); auto files = element.child("Files"); - if (!files) + if (!files) { return false; + } for (auto file = files.child("File"); file; file = file.next_sibling("File")) { t_fileInfo info; info.name = GetTextElement(file, "Name"); - if (info.name.empty()) + if (info.name.empty()) { return false; + } const int dir = GetTextElementInt(file, "Dir", -1); - if (dir == -1) + if (dir == -1) { return false; + } info.dir = dir == 1; info.size = GetTextElementInt(file, "Size", -2); - if (info.size <= -2) + if (info.size <= -2) { return false; + } info.link = GetTextElementBool(file, "Link", false); @@ -292,6 +324,11 @@ return true; } +void CRemoteDataObject::Reserve(size_t count) +{ + m_fileList.reserve(count); +} + void CRemoteDataObject::AddFile(const wxString& name, bool dir, int64_t size, bool link) { t_fileInfo info; diff -Nru filezilla-3.15.0.2/src/interface/dndobjects.h filezilla-3.33.0/src/interface/dndobjects.h --- filezilla-3.15.0.2/src/interface/dndobjects.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/dndobjects.h 2018-05-01 03:30:04.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __DNDOBJECTS_H__ -#define __DNDOBJECTS_H__ +#ifndef FILEZILLA_INTERFACE_DNDOBJECTS_HEADER +#define FILEZILLA_INTERFACE_DNDOBJECTS_HEADER #ifdef __WXMSW__ #define FZ3_USESHELLEXT 1 @@ -9,9 +9,11 @@ #include "xmlfunctions.h" +#include + #include -class wxRemoteDataFormat : public wxDataFormat +class wxRemoteDataFormat final : public wxDataFormat { public: wxRemoteDataFormat() @@ -20,10 +22,10 @@ } }; -class CRemoteDataObject : public wxDataObjectSimple +class CRemoteDataObject final : public wxDataObjectSimple { public: - CRemoteDataObject(const CServer& server, const CServerPath& path); + CRemoteDataObject(ServerWithCredentials const& server, const CServerPath& path); CRemoteDataObject(); virtual size_t GetDataSize() const; @@ -36,33 +38,34 @@ bool DidSendData() const { return m_didSendData; } - const CServer& GetServer() const { return m_server; } + ServerWithCredentials const& GetServer() const { return server_; } const CServerPath& GetServerPath() const { return m_path; } int GetProcessId() const { return m_processId; } struct t_fileInfo { - wxString name; - bool dir; + std::wstring name; int64_t size; + bool dir; bool link; }; - const std::list& GetFiles() const { return m_fileList; } + const std::vector& GetFiles() const { return m_fileList; } + void Reserve(size_t count); void AddFile(const wxString& name, bool dir, int64_t size, bool link); protected: - CServer m_server; + ServerWithCredentials server_; CServerPath m_path; mutable CXmlFile m_xmlFile; - bool m_didSendData; + bool m_didSendData{}; int m_processId; - std::list m_fileList; + std::vector m_fileList; mutable size_t m_expectedSize{}; }; @@ -71,11 +74,11 @@ // This class checks if the shell extension is installed and // communicates with it. -class CShellExtensionInterface +class CShellExtensionInterface final { public: CShellExtensionInterface(); - virtual ~CShellExtensionInterface(); + ~CShellExtensionInterface(); bool IsLoaded() const { return m_shellExtension != 0; } @@ -94,9 +97,9 @@ HANDLE m_hMutex; HANDLE m_hMapping; - wxString m_dragDirectory; + std::wstring m_dragDirectory; }; -#endif //__WXMSW__ +#endif -#endif //__DNDOBJECTS_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/dragdropmanager.h filezilla-3.33.0/src/interface/dragdropmanager.h --- filezilla-3.15.0.2/src/interface/dragdropmanager.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/dragdropmanager.h 2018-05-01 03:30:04.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __DRAGDROPMANAGER__ -#define __DRAGDROPMANAGER__ +#ifndef FILEZILLA_INTERFACE_DRAGDROPMANAGER_HEADER +#define FILEZILLA_INTERFACE_DRAGDROPMANAGER_HEADER // wxWidgets doesn't provide any means to check on the type of objects // while an object hasn't been dropped yet and is still being moved around @@ -8,7 +8,9 @@ // As such, keep track on the objects. -class CDragDropManager +#include "serverdata.h" + +class CDragDropManager final { public: static CDragDropManager* Get() { return m_pDragDropManager; } @@ -20,16 +22,15 @@ const wxWindow* pDropTarget; CLocalPath localParent; - std::list m_localFiles; - CServer server; + ServerWithCredentials server; CServerPath remoteParent; protected: CDragDropManager(); - virtual ~CDragDropManager() {} + virtual ~CDragDropManager() = default; static CDragDropManager* m_pDragDropManager; }; -#endif //__DRAGDROPMANAGER__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/drop_target_ex.cpp filezilla-3.33.0/src/interface/drop_target_ex.cpp --- filezilla-3.15.0.2/src/interface/drop_target_ex.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/drop_target_ex.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -7,7 +7,6 @@ template CScrollableDropTarget::CScrollableDropTarget(Control* pCtrl) : m_pCtrl(pCtrl) - , m_count() { m_timer.SetOwner(this); } diff -Nru filezilla-3.15.0.2/src/interface/drop_target_ex.h filezilla-3.33.0/src/interface/drop_target_ex.h --- filezilla-3.15.0.2/src/interface/drop_target_ex.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/drop_target_ex.h 2017-07-13 19:12:18.000000000 +0000 @@ -33,7 +33,7 @@ Control *m_pCtrl; wxTimer m_timer; - int m_count; + int m_count{}; DECLARE_EVENT_TABLE() }; diff -Nru filezilla-3.15.0.2/src/interface/edithandler.cpp filezilla-3.33.0/src/interface/edithandler.cpp --- filezilla-3.15.0.2/src/interface/edithandler.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/edithandler.cpp 2017-06-02 20:38:13.000000000 +0000 @@ -61,8 +61,9 @@ CEditHandler* CEditHandler::Create() { - if (!m_pEditHandler) + if (!m_pEditHandler) { m_pEditHandler = new CEditHandler(); + } return m_pEditHandler; } @@ -75,12 +76,14 @@ void CEditHandler::RemoveTemporaryFiles(wxString const& temp) { wxDir dir(temp); - if (!dir.IsOpened()) + if (!dir.IsOpened()) { return; + } wxString file; - if (!dir.GetFirst(&file, _T("fz3temp-*"), wxDIR_DIRS)) + if (!dir.GetFirst(&file, _T("fz3temp-*"), wxDIR_DIRS)) { return; + } wxChar const& sep = wxFileName::GetPathSeparator(); do { @@ -139,10 +142,11 @@ } -wxString CEditHandler::GetLocalDirectory() +std::wstring CEditHandler::GetLocalDirectory() { - if (!m_localDir.empty()) + if (!m_localDir.empty()) { return m_localDir; + } wxFileName tmpdir(wxFileName::GetTempDir(), _T("")); // Need to call GetLongPath on MSW, GetTempDir can return short path @@ -150,7 +154,7 @@ // length wxString dir = tmpdir.GetLongPath(); if (dir.empty() || !wxFileName::DirExists(dir)) - return wxString(); + return std::wstring(); if (dir.Last() != wxFileName::GetPathSeparator()) dir += wxFileName::GetPathSeparator(); @@ -161,14 +165,16 @@ // already has the correct permissions which get inherited. int i = 1; do { - wxString newDir = dir + wxString::Format(_T("fz3temp-%d"), i++); - if (wxFileName::FileExists(newDir) || wxFileName::DirExists(newDir)) + wxString newDir = dir + wxString::Format(_T("fz3temp-%d"), ++i); + if (wxFileName::FileExists(newDir) || wxFileName::DirExists(newDir)) { continue; + } - if (!wxMkdir(newDir, 0700)) - return wxString(); + if (!wxMkdir(newDir, 0700)) { + return std::wstring(); + } - m_localDir = newDir + wxFileName::GetPathSeparator(); + m_localDir = (newDir + wxFileName::GetPathSeparator()).ToStdWstring(); break; } while (true); @@ -179,17 +185,15 @@ RemoveTemporaryFiles(dir); #ifdef __WXMSW__ - m_lockfile_handle = ::CreateFile((m_localDir + _T("fz3temp-lockfile")).wc_str(), GENERIC_WRITE, 0, 0, CREATE_NEW, FILE_ATTRIBUTE_TEMPORARY, 0); - if (m_lockfile_handle == INVALID_HANDLE_VALUE) - { + m_lockfile_handle = ::CreateFile((m_localDir + L"fz3temp-lockfile").c_str(), GENERIC_WRITE, 0, 0, CREATE_NEW, FILE_ATTRIBUTE_TEMPORARY, 0); + if (m_lockfile_handle == INVALID_HANDLE_VALUE) { wxRmdir(m_localDir); - m_localDir = _T(""); + m_localDir.clear(); } #else - wxString file = m_localDir + _T("fz3temp-lockfile"); - m_lockfile_descriptor = open(file.mb_str(), O_CREAT | O_RDWR | O_CLOEXEC, 0600); - if (m_lockfile_descriptor >= 0) - { + auto file = fz::to_native(m_localDir) + "fz3temp-lockfile"; + m_lockfile_descriptor = open(file.c_str(), O_CREAT | O_RDWR | O_CLOEXEC, 0600); + if (m_lockfile_descriptor >= 0) { // Lock 1 byte region in the lockfile. struct flock f = {}; f.l_type = F_WRLCK; @@ -206,20 +210,24 @@ void CEditHandler::Release() { - if (m_timer.IsRunning()) + if (m_timer.IsRunning()) { m_timer.Stop(); - if (m_busyTimer.IsRunning()) + } + if (m_busyTimer.IsRunning()) { m_busyTimer.Stop(); + } if (!m_localDir.empty()) { #ifdef __WXMSW__ - if (m_lockfile_handle != INVALID_HANDLE_VALUE) + if (m_lockfile_handle != INVALID_HANDLE_VALUE) { CloseHandle(m_lockfile_handle); + } wxRemoveFile(m_localDir + _T("fz3temp-lockfile")); #else wxRemoveFile(m_localDir + _T("fz3temp-lockfile")); - if (m_lockfile_descriptor >= 0) + if (m_lockfile_descriptor >= 0) { close(m_lockfile_descriptor); + } #endif wxLogNull log; @@ -232,45 +240,51 @@ delete this; } -enum CEditHandler::fileState CEditHandler::GetFileState(const wxString& fileName) const +CEditHandler::fileState CEditHandler::GetFileState(wxString const& fileName) const { std::list::const_iterator iter = GetFile(fileName); - if (iter == m_fileDataList[local].end()) + if (iter == m_fileDataList[local].end()) { return unknown; + } return iter->state; } -enum CEditHandler::fileState CEditHandler::GetFileState(const wxString& fileName, const CServerPath& remotePath, const CServer& server) const +CEditHandler::fileState CEditHandler::GetFileState(wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server) const { std::list::const_iterator iter = GetFile(fileName, remotePath, server); - if (iter == m_fileDataList[remote].end()) + if (iter == m_fileDataList[remote].end()) { return unknown; + } return iter->state; } -int CEditHandler::GetFileCount(enum CEditHandler::fileType type, enum CEditHandler::fileState state, const CServer* pServer /*=0*/) const +int CEditHandler::GetFileCount(CEditHandler::fileType type, CEditHandler::fileState state, ServerWithCredentials const& server) const { int count = 0; if (state == unknown) { - wxASSERT(!pServer); - if (type != remote) + wxASSERT(!server); + if (type != remote) { count += m_fileDataList[local].size(); - if (type != local) + } + if (type != local) { count += m_fileDataList[remote].size(); + } } else { - auto f = [state, pServer](decltype(m_fileDataList[0]) & items) { - int count = 0; + auto f = [state, &server](decltype(m_fileDataList[0]) & items) { + int cnt = 0; for (auto const& data : items) { - if (data.state != state) + if (data.state != state) { continue; + } - if (!pServer || data.server == *pServer) - ++count; + if (!server || data.server == server) { + ++cnt; + } } - return count; + return cnt; }; if (type != remote) { count += f(m_fileDataList[local]); @@ -283,15 +297,17 @@ return count; } -bool CEditHandler::AddFile(enum CEditHandler::fileType type, wxString& fileName, const CServerPath& remotePath, const CServer& server) +bool CEditHandler::AddFile(CEditHandler::fileType type, std::wstring& fileName, CServerPath const& remotePath, ServerWithCredentials const& server) { wxASSERT(type != none); fileState state; - if (type == local) + if (type == local) { state = GetFileState(fileName); - else + } + else { state = GetFileState(fileName, remotePath, server); + } if (state != unknown) { wxFAIL_MSG(_T("File state not unknown")); return false; @@ -336,20 +352,20 @@ return true; } -bool CEditHandler::Remove(const wxString& fileName, const CServerPath& remotePath, const CServer& server) +bool CEditHandler::Remove(wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server) { std::list::iterator iter = GetFile(fileName, remotePath, server); - if (iter == m_fileDataList[remote].end()) + if (iter == m_fileDataList[remote].end()) { return true; + } wxASSERT(iter->state != download && iter->state != upload && iter->state != upload_and_remove); - if (iter->state == download || iter->state == upload || iter->state == upload_and_remove) + if (iter->state == download || iter->state == upload || iter->state == upload_and_remove) { return false; + } - if (wxFileName::FileExists(iter->file)) - { - if (!wxRemoveFile(iter->file)) - { + if (wxFileName::FileExists(iter->file)) { + if (!wxRemoveFile(iter->file)) { iter->state = removing; return false; } @@ -382,8 +398,9 @@ keep.clear(); for (auto iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); ++iter) { - if (force) + if (force) { continue; + } if (iter->state == upload || iter->state == upload_and_remove) { keep.push_back(*iter); @@ -395,12 +412,13 @@ return m_fileDataList[local].empty() && m_fileDataList[remote].empty(); } -bool CEditHandler::RemoveAll(enum fileState state, const CServer* pServer /*=0*/) +bool CEditHandler::RemoveAll(fileState state, ServerWithCredentials const& server) { // Others not implemented wxASSERT(state == upload_and_remove_failed); - if (state != upload_and_remove_failed) + if (state != upload_and_remove_failed) { return false; + } std::list keep; @@ -410,7 +428,7 @@ continue; } - if (pServer && iter->server != *pServer) { + if (server && iter->server != server) { keep.push_back(*iter); continue; } @@ -432,8 +450,9 @@ { std::list::iterator iter; for (iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); ++iter) { - if (iter->file == fileName) + if (iter->file == fileName) { break; + } } return iter; @@ -443,25 +462,29 @@ { std::list::const_iterator iter; for (iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); ++iter) { - if (iter->file == fileName) + if (iter->file == fileName) { break; + } } return iter; } -std::list::iterator CEditHandler::GetFile(const wxString& fileName, const CServerPath& remotePath, const CServer& server) +std::list::iterator CEditHandler::GetFile(wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server) { std::list::iterator iter; for (iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); ++iter) { - if (iter->name != fileName) + if (iter->name != fileName) { continue; + } - if (iter->server != server) + if (iter->server != server) { continue; + } - if (iter->remotePath != remotePath) + if (iter->remotePath != remotePath) { continue; + } return iter; } @@ -469,18 +492,21 @@ return iter; } -std::list::const_iterator CEditHandler::GetFile(const wxString& fileName, const CServerPath& remotePath, const CServer& server) const +std::list::const_iterator CEditHandler::GetFile(wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server) const { std::list::const_iterator iter; for (iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); ++iter) { - if (iter->name != fileName) + if (iter->name != fileName) { continue; + } - if (iter->server != server) + if (iter->server != server) { continue; + } - if (iter->remotePath != remotePath) + if (iter->remotePath != remotePath) { continue; + } return iter; } @@ -488,11 +514,12 @@ return iter; } -void CEditHandler::FinishTransfer(bool, const wxString& fileName) +void CEditHandler::FinishTransfer(bool, wxString const& fileName) { auto iter = GetFile(fileName); - if (iter == m_fileDataList[local].end()) + if (iter == m_fileDataList[local].end()) { return; + } wxASSERT(iter->state == upload || iter->state == upload_and_remove); @@ -502,10 +529,12 @@ m_fileDataList[local].erase(iter); break; case upload: - if (wxFileName::FileExists(fileName)) + if (wxFileName::FileExists(fileName)) { iter->state = edit; - else + } + else { m_fileDataList[local].erase(iter); + } break; default: return; @@ -514,11 +543,12 @@ SetTimerState(); } -void CEditHandler::FinishTransfer(bool successful, const wxString& fileName, const CServerPath& remotePath, const CServer& server) +void CEditHandler::FinishTransfer(bool successful, wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server) { auto iter = GetFile(fileName, remotePath, server); - if (iter == m_fileDataList[remote].end()) + if (iter == m_fileDataList[remote].end()) { return; + } wxASSERT(iter->state == download || iter->state == upload || iter->state == upload_and_remove); @@ -526,34 +556,43 @@ { case upload_and_remove: if (successful) { - if (wxFileName::FileExists(iter->file) && !wxRemoveFile(iter->file)) + if (wxFileName::FileExists(iter->file) && !wxRemoveFile(iter->file)) { iter->state = removing; - else + } + else { m_fileDataList[remote].erase(iter); + } } else { - if (!wxFileName::FileExists(iter->file)) + if (!wxFileName::FileExists(iter->file)) { m_fileDataList[remote].erase(iter); - else + } + else { iter->state = upload_and_remove_failed; + } } break; case upload: - if (wxFileName::FileExists(iter->file)) + if (wxFileName::FileExists(iter->file)) { iter->state = edit; - else + } + else { m_fileDataList[remote].erase(iter); + } break; case download: if (wxFileName::FileExists(iter->file)) { iter->state = edit; - if (StartEditing(remote, *iter)) + if (StartEditing(remote, *iter)) { break; + } } - if (wxFileName::FileExists(iter->file) && !wxRemoveFile(iter->file)) + if (wxFileName::FileExists(iter->file) && !wxRemoveFile(iter->file)) { iter->state = removing; - else + } + else { m_fileDataList[remote].erase(iter); + } break; default: return; @@ -562,25 +601,27 @@ SetTimerState(); } -bool CEditHandler::StartEditing(const wxString& file) +bool CEditHandler::StartEditing(wxString const& file) { auto iter = GetFile(file); - if (iter == m_fileDataList[local].end()) + if (iter == m_fileDataList[local].end()) { return false; + } return StartEditing(local, *iter); } -bool CEditHandler::StartEditing(const wxString& file, const CServerPath& remotePath, const CServer& server) +bool CEditHandler::StartEditing(wxString const& file, CServerPath const& remotePath, ServerWithCredentials const& server) { auto iter = GetFile(file, remotePath, server); - if (iter == m_fileDataList[remote].end()) + if (iter == m_fileDataList[remote].end()) { return false; + } return StartEditing(remote, *iter); } -bool CEditHandler::StartEditing(enum CEditHandler::fileType type, t_fileData& data) +bool CEditHandler::StartEditing(CEditHandler::fileType type, t_fileData& data) { wxASSERT(type != none); wxASSERT(data.state == edit); @@ -628,10 +669,10 @@ goto checkmodifications_loopbegin; } - if (!mtime.empty()) + if (mtime.empty()) continue; - if (iter->modificationTime.empty() && !iter->modificationTime.compare(mtime)) + if (!iter->modificationTime.empty() && !iter->modificationTime.compare(mtime)) continue; // File has changed, ask user what to do @@ -716,7 +757,8 @@ else dlg.SetChildLabel(XRCID("ID_OPENEDAS"), file); } - dlg.SetChildLabel(XRCID("ID_SERVER"), iter->server.FormatServer()); + + dlg.SetChildLabel(XRCID("ID_SERVER"), iter->server.Format(ServerFormat::with_user_and_optional_port)); dlg.SetChildLabel(XRCID("ID_REMOTEPATH"), iter->remotePath.GetPath()); dlg.GetSizer()->Fit(&dlg); @@ -728,7 +770,7 @@ return res; } -bool CEditHandler::UploadFile(const wxString& file, const CServerPath& remotePath, const CServer& server, bool unedit) +bool CEditHandler::UploadFile(wxString const& file, CServerPath const& remotePath, ServerWithCredentials const& server, bool unedit) { std::list::iterator iter = GetFile(file, remotePath, server); return UploadFile(remote, iter, unedit); @@ -740,16 +782,18 @@ return UploadFile(local, iter, unedit); } -bool CEditHandler::UploadFile(enum fileType type, std::list::iterator iter, bool unedit) +bool CEditHandler::UploadFile(fileType type, std::list::iterator iter, bool unedit) { wxCHECK(type != none, false); - if (iter == m_fileDataList[type].end()) + if (iter == m_fileDataList[type].end()) { return false; + } wxASSERT(iter->state == edit || iter->state == upload_and_remove_failed); - if (iter->state != edit && iter->state != upload_and_remove_failed) + if (iter->state != edit && iter->state != upload_and_remove_failed) { return false; + } iter->state = unedit ? upload_and_remove : upload; @@ -762,17 +806,17 @@ return false; } - if (!mtime.empty()) + if (mtime.empty()) { mtime = fz::datetime::now(); + } iter->modificationTime = mtime; wxASSERT(m_pQueue); - wxString file; + std::wstring file; CLocalPath localPath(iter->file, &file); - if (file.empty()) - { + if (file.empty()) { m_fileDataList[type].erase(iter); return false; } @@ -788,8 +832,9 @@ #ifdef __WXMSW__ // Don't check for changes if mouse is captured, // e.g. if user is dragging a file - if (GetCapture()) + if (GetCapture()) { return; + } #endif CheckForModifications(); @@ -799,16 +844,17 @@ { bool editing = GetFileCount(none, edit) != 0; - if (m_timer.IsRunning()) - { - if (!editing) + if (m_timer.IsRunning()) { + if (!editing) { m_timer.Stop(); + } } - else if (editing) + else if (editing) { m_timer.Start(15000); + } } -wxString CEditHandler::CanOpen(enum CEditHandler::fileType type, const wxString& fileName, bool &dangerous, bool &program_exists) +wxString CEditHandler::CanOpen(CEditHandler::fileType type, const wxString& fileName, bool &dangerous, bool &program_exists) { wxASSERT(type != none); @@ -886,12 +932,13 @@ wxFileName fn(file); wxString ext = fn.GetExt(); - if (ext.empty()) - { - if (fn.GetFullName()[0] == '.') + if (ext.empty()) { + if (fn.GetFullName()[0] == '.') { ext = _T("."); - else + } + else { ext = _T("/"); + } } wxString associations = COptions::Get()->GetOption(OPTION_EDIT_CUSTOMASSOCIATIONS) + _T("\n"); @@ -939,8 +986,9 @@ CheckForModifications(); } -wxString CEditHandler::GetTemporaryFile(wxString name) +std::wstring CEditHandler::GetTemporaryFile(std::wstring name) { + name = CQueueView::ReplaceInvalidCharacters(name); #ifdef __WXMSW__ // MAX_PATH - 1 is theoretical limit, we subtract another 4 to allow // editors which create temporary files @@ -948,44 +996,48 @@ #else int max = -1; #endif - if (max != -1) - { - name = TruncateFilename(m_localDir, name, max); - if (name.empty()) - return wxString(); + if (max != -1) { + name = TruncateFilename(m_localDir, name, max).ToStdWstring(); + if (name.empty()) { + return std::wstring(); + } } - wxString file = m_localDir + name; - if (!FilenameExists(file)) + std::wstring file = m_localDir + name; + if (!FilenameExists(file)) { return file; + } - if (max != -1) + if (max != -1) { max--; + } int cutoff = 1; int n = 1; - while (++n < 10000) // Just to give up eventually - { + while (++n < 10000) { // Just to give up eventually // Further reduce length if needed - if (max != -1 && n >= cutoff) - { + if (max != -1 && n >= cutoff) { cutoff *= 10; max--; name = TruncateFilename(m_localDir, name, max); - if (name.empty()) - return wxString(); + if (name.empty()) { + return std::wstring(); + } } - int pos = name.Find('.', true); - if (pos < 1) - file = m_localDir + name + wxString::Format(_T(" %d"), n); - else - file = m_localDir + name.Left(pos) + wxString::Format(_T(" %d"), n) + name.Mid(pos); + size_t pos = name.rfind('.'); + if (pos == std::wstring::npos || !pos) { + file = m_localDir + name + fz::sprintf(L" %d", n); + } + else { + file = m_localDir + name.substr(0, pos) + fz::sprintf(L" %d", n) + name.substr(pos); + } - if (!FilenameExists(file)) + if (!FilenameExists(file)) { return file; + } } - return wxString(); + return std::wstring(); } wxString CEditHandler::TruncateFilename(const wxString path, const wxString& name, int max) @@ -1016,8 +1068,9 @@ for (auto const& fileData : m_fileDataList[remote]) { // Always ignore case, we don't know which type of filesystem the user profile // is installed upon. - if (!fileData.file.CmpNoCase(file)) + if (!wxString(fileData.file).CmpNoCase(file)) { return true; + } } if (wxFileName::FileExists(file)) { @@ -1055,8 +1108,7 @@ CEditHandlerStatusDialog::~CEditHandlerStatusDialog() { - if (m_pWindowStateManager) - { + if (m_pWindowStateManager) { m_pWindowStateManager->Remember(OPTION_EDITSTATUSDIALOG_SIZE); delete m_pWindowStateManager; } @@ -1117,7 +1169,7 @@ pListCtrl->SetItem(i, COLUMN_STATUS, _("Unknown")); break; } - pListCtrl->SetItem(i, COLUMN_REMOTEPATH, iter->server.FormatServer() + iter->remotePath.GetPath()); + pListCtrl->SetItem(i, COLUMN_REMOTEPATH, iter->server.Format(ServerFormat::with_user_and_optional_port) + iter->remotePath.GetPath()); CEditHandler::t_fileData* pData = new CEditHandler::t_fileData(*iter); pListCtrl->SetItemPtrData(i, (wxUIntPtr)pData); } @@ -1145,7 +1197,7 @@ pListCtrl->SetItem(i, COLUMN_STATUS, _("Unknown")); break; } - pListCtrl->SetItem(i, COLUMN_REMOTEPATH, iter->server.FormatServer() + iter->remotePath.GetPath()); + pListCtrl->SetItem(i, COLUMN_REMOTEPATH, iter->server.Format(ServerFormat::with_user_and_optional_port) + iter->remotePath.GetPath()); CEditHandler::t_fileData* pData = new CEditHandler::t_fileData(*iter); pListCtrl->SetItemPtrData(i, (wxUIntPtr)pData); } @@ -1184,7 +1236,7 @@ int item = -1; while ((item = pListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { - enum CEditHandler::fileType type; + CEditHandler::fileType type; CEditHandler::t_fileData* pData = GetDataFromItem(item, type); if (pData->state == CEditHandler::edit) selectedEdited = true; @@ -1218,7 +1270,7 @@ int item = -1; while ((item = pListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { pListCtrl->SetItemState(item, 0, wxLIST_STATE_SELECTED); - enum CEditHandler::fileType type; + CEditHandler::fileType type; CEditHandler::t_fileData* pData = GetDataFromItem(item, type); if (pData->state != CEditHandler::edit && pData->state != CEditHandler::upload_and_remove_failed) { wxBell(); @@ -1231,7 +1283,7 @@ for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) { const int i = *iter; - enum CEditHandler::fileType type; + CEditHandler::fileType type; CEditHandler::t_fileData* pData = GetDataFromItem(i, type); if (type == CEditHandler::local) { @@ -1265,7 +1317,7 @@ while ((item = pListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { pListCtrl->SetItemState(item, 0, wxLIST_STATE_SELECTED); - enum CEditHandler::fileType type; + CEditHandler::fileType type; CEditHandler::t_fileData* pData = GetDataFromItem(item, type); if (pData->state != CEditHandler::edit && pData->state != CEditHandler::upload_and_remove_failed) { @@ -1278,7 +1330,7 @@ for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) { const int i = *iter; - enum CEditHandler::fileType type; + CEditHandler::fileType type; CEditHandler::t_fileData* pData = GetDataFromItem(i, type); bool unedit = event.GetId() == XRCID("ID_UPLOADANDUNEDIT") || pData->state == CEditHandler::upload_and_remove_failed; @@ -1312,7 +1364,7 @@ while ((item = pListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { pListCtrl->SetItemState(item, 0, wxLIST_STATE_SELECTED); - enum CEditHandler::fileType type; + CEditHandler::fileType type; CEditHandler::t_fileData* pData = GetDataFromItem(item, type); if (pData->state != CEditHandler::edit) { @@ -1325,7 +1377,7 @@ for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) { const int i = *iter; - enum CEditHandler::fileType type; + CEditHandler::fileType type; CEditHandler::t_fileData* pData = GetDataFromItem(i, type); if (type == CEditHandler::local) { @@ -1442,7 +1494,7 @@ void CNewAssociationDialog::SetCtrlState() { - wxRadioButton* pCustom = wxDynamicCast(FindWindow(XRCID("ID_USE_CUSTOM")), wxRadioButton); + wxRadioButton* pCustom = dynamic_cast(FindWindow(XRCID("ID_USE_CUSTOM"))); if (!pCustom) { // Return since it can get called before dialog got fully loaded return; @@ -1478,15 +1530,15 @@ } if (always) - COptions::Get()->SetOption(OPTION_EDIT_DEFAULTEDITOR, _T("2") + cmd); + COptions::Get()->SetOption(OPTION_EDIT_DEFAULTEDITOR, _T("2") + cmd.ToStdWstring()); else { wxString associations = COptions::Get()->GetOption(OPTION_EDIT_CUSTOMASSOCIATIONS); if (!associations.empty() && associations.Last() != '\n') associations += '\n'; if (m_ext.empty()) m_ext = _T("/"); - associations += m_ext + _T(" ") + cmd; - COptions::Get()->SetOption(OPTION_EDIT_CUSTOMASSOCIATIONS, associations); + associations += m_ext.ToStdWstring() + _T(" ") + cmd.ToStdWstring(); + COptions::Get()->SetOption(OPTION_EDIT_CUSTOMASSOCIATIONS, associations.ToStdWstring()); } } else { @@ -1519,7 +1571,7 @@ if (m_ext.empty()) m_ext = _T("/"); associations += m_ext + _T(" ") + cmd; - COptions::Get()->SetOption(OPTION_EDIT_CUSTOMASSOCIATIONS, associations); + COptions::Get()->SetOption(OPTION_EDIT_CUSTOMASSOCIATIONS, associations.ToStdWstring()); } } @@ -1557,7 +1609,7 @@ XRCCTRL(*this, "ID_CUSTOM", wxTextCtrl)->ChangeValue(editor); } -bool CEditHandler::Edit(CEditHandler::fileType type, wxString const fileName, CServerPath const& path, CServer const& server, int64_t size, wxWindow * parent) +bool CEditHandler::Edit(CEditHandler::fileType type, std::wstring const& fileName, CServerPath const& path, ServerWithCredentials const& server, int64_t size, wxWindow * parent) { std::vector data; FileData d{fileName, size}; @@ -1566,7 +1618,7 @@ return Edit(type, data, path, server, parent); } -bool CEditHandler::Edit(CEditHandler::fileType type, std::vector const& data, CServerPath const& path, CServer const& server, wxWindow * parent) +bool CEditHandler::Edit(CEditHandler::fileType type, std::vector const& data, CServerPath const& path, ServerWithCredentials const& server, wxWindow * parent) { if (type == CEditHandler::remote) { wxString const& localDir = GetLocalDirectory(); @@ -1601,7 +1653,7 @@ return success; } -bool CEditHandler::DoEdit(CEditHandler::fileType type, FileData const& file, CServerPath const& path, CServer const& server, wxWindow * parent, size_t fileCount, int & already_editing_action) +bool CEditHandler::DoEdit(CEditHandler::fileType type, FileData const& file, CServerPath const& path, ServerWithCredentials const& server, wxWindow * parent, size_t fileCount, int & already_editing_action) { bool dangerous = false; bool program_exists = false; @@ -1727,7 +1779,7 @@ break; } - wxString localFile = file.name; + std::wstring localFile = file.name; if (!AddFile(type, localFile, path, server)) { if( type == CEditHandler::local) { wxMessageBoxEx(wxString::Format(_("The file '%s' could not be opened:\nThe associated command failed"), file.name), _("Opening failed"), wxICON_EXCLAMATION); @@ -1740,10 +1792,10 @@ } if (type == CEditHandler::remote) { - wxString localFileName; + std::wstring localFileName; CLocalPath localPath(localFile, &localFileName); - m_pQueue->QueueFile(false, true, file.name, (localFileName != file.name) ? localFileName : wxString(), + m_pQueue->QueueFile(false, true, file.name, (localFileName != file.name) ? localFileName : std::wstring(), localPath, path, server, file.size, type, QueuePriority::high); m_pQueue->QueueFile_Finish(true); } diff -Nru filezilla-3.15.0.2/src/interface/edithandler.h filezilla-3.33.0/src/interface/edithandler.h --- filezilla-3.15.0.2/src/interface/edithandler.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/edithandler.h 2017-06-02 20:38:13.000000000 +0000 @@ -1,7 +1,8 @@ -#ifndef __EDITHANDLER_H__ -#define __EDITHANDLER_H__ +#ifndef FILEZILLA_INTERFACE_EDITHANDLER_HEADER +#define FILEZILLA_INTERFACE_EDITHANDLER_HEADER #include "dialogex.h" +#include "serverdata.h" #include @@ -16,7 +17,7 @@ } class CQueueView; -class CEditHandler : protected wxEvtHandler +class CEditHandler final : protected wxEvtHandler { public: enum fileState @@ -40,46 +41,46 @@ static CEditHandler* Create(); static CEditHandler* Get(); - wxString GetLocalDirectory(); + std::wstring GetLocalDirectory(); // This tries to deletes all temporary files. // If files are locked, they won't be removed though void Release(); - enum fileState GetFileState(const wxString& fileName) const; // Local files - enum fileState GetFileState(const wxString& fileName, const CServerPath& remotePath, const CServer& server) const; // Remote files + fileState GetFileState(wxString const& fileName) const; // Local files + fileState GetFileState(wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server) const; // Remote files // Returns the number of files in given state // pServer may be set only if state isn't unknown - int GetFileCount(enum fileType type, enum fileState state, const CServer* pServer = 0) const; + int GetFileCount(fileType type, fileState state, ServerWithCredentials const& server = ServerWithCredentials()) const; // Starts editing the given file, queues it if needed. For local files, fileName must include local path. // Can be used to edit files already being added, user is prompted for action. - bool Edit(CEditHandler::fileType type, wxString const fileName, CServerPath const& path, CServer const& server, int64_t size, wxWindow* parent); + bool Edit(CEditHandler::fileType type, std::wstring const& fileName, CServerPath const& path, ServerWithCredentials const& server, int64_t size, wxWindow* parent); class FileData final { public: FileData() = default; - FileData(wxString const& n, int64_t s) + FileData(std::wstring const& n, int64_t s) : name(n), size(s) {} - wxString name; + std::wstring name; int64_t size{}; }; - bool Edit(CEditHandler::fileType type, std::vector const& data, CServerPath const& path, CServer const& server, wxWindow* parent); + bool Edit(CEditHandler::fileType type, std::vector const& data, CServerPath const& path, ServerWithCredentials const& server, wxWindow* parent); // Adds the file that doesn't exist yet. (Has to be in unknown state) // The initial state will be download - bool AddFile(enum fileType type, wxString& fileName, const CServerPath& remotePath, const CServer& server); + bool AddFile(fileType type, std::wstring& fileName, CServerPath const& remotePath, ServerWithCredentials const& server); // Tries to unedit and remove file - bool Remove(const wxString& fileName); // Local files - bool Remove(const wxString& fileName, const CServerPath& remotePath, const CServer& server); // Remote files + bool Remove(wxString const& fileName); // Local files + bool Remove(wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server); // Remote files bool RemoveAll(bool force); - bool RemoveAll(enum fileState state, const CServer* pServer = 0); + bool RemoveAll(fileState state, ServerWithCredentials const& server = ServerWithCredentials()); - void FinishTransfer(bool successful, const wxString& fileName); - void FinishTransfer(bool successful, const wxString& fileName, const CServerPath& remotePath, const CServer& server); + void FinishTransfer(bool successful, wxString const& fileName); + void FinishTransfer(bool successful, wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server); void CheckForModifications(bool emitEvent = false); @@ -93,53 +94,52 @@ * The dangerous argument will be set to true on some filetypes, * e.g. executables. */ - wxString CanOpen(enum fileType type, const wxString& fileName, bool &dangerous, bool& program_exists); - bool StartEditing(const wxString& file); - bool StartEditing(const wxString& file, const CServerPath& remotePath, const CServer& server); + wxString CanOpen(fileType type, wxString const& fileName, bool &dangerous, bool& program_exists); + bool StartEditing(wxString const& file); + bool StartEditing(wxString const& file, CServerPath const& remotePath, ServerWithCredentials const& server); struct t_fileData { - wxString name; // The name of the file - wxString file; // The actual local filename + std::wstring name; // The name of the file + std::wstring file; // The actual local filename fileState state; fz::datetime modificationTime; CServerPath remotePath; - CServer server; + ServerWithCredentials server; }; - const std::list& GetFiles(enum fileType type) const { wxASSERT(type != none); return m_fileDataList[(type == local) ? 0 : 1]; } + const std::list& GetFiles(fileType type) const { wxASSERT(type != none); return m_fileDataList[(type == local) ? 0 : 1]; } - bool UploadFile(const wxString& file, bool unedit); - bool UploadFile(const wxString& file, const CServerPath& remotePath, const CServer& server, bool unedit); + bool UploadFile(wxString const& file, bool unedit); + bool UploadFile(wxString const& file, CServerPath const& remotePath, ServerWithCredentials const& server, bool unedit); // Returns command to open the file. If association is set but // program does not exist, program_exists is set to false. - wxString GetOpenCommand(const wxString& file, bool& program_exists); + wxString GetOpenCommand(wxString const& file, bool& program_exists); protected: - bool DoEdit(CEditHandler::fileType type, FileData const& file, CServerPath const& path, CServer const& server, wxWindow* parent, size_t fileCount, int & already_editing_action); + bool DoEdit(CEditHandler::fileType type, FileData const& file, CServerPath const& path, ServerWithCredentials const& server, wxWindow* parent, size_t fileCount, int & already_editing_action); CEditHandler(); - virtual ~CEditHandler() {} static CEditHandler* m_pEditHandler; - wxString m_localDir; + std::wstring m_localDir; - bool StartEditing(enum fileType type, t_fileData &data); + bool StartEditing(fileType type, t_fileData &data); - wxString GetCustomOpenCommand(const wxString& file, bool& program_exists); + wxString GetCustomOpenCommand(wxString const& file, bool& program_exists); void SetTimerState(); - bool UploadFile(enum fileType type, std::list::iterator iter, bool unedit); + bool UploadFile(fileType type, std::list::iterator iter, bool unedit); std::list m_fileDataList[2]; - std::list::iterator GetFile(const wxString& fileName); - std::list::const_iterator GetFile(const wxString& fileName) const; - std::list::iterator GetFile(const wxString& fileName, const CServerPath& remotePath, const CServer& server); - std::list::const_iterator GetFile(const wxString& fileName, const CServerPath& remotePath, const CServer& server) const; + std::list::iterator GetFile(wxString const& fileName); + std::list::const_iterator GetFile(wxString const& fileName) const; + std::list::iterator GetFile(wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server); + std::list::const_iterator GetFile(wxString const& fileName, CServerPath const& remotePath, ServerWithCredentials const& server) const; CQueueView* m_pQueue; @@ -149,9 +149,9 @@ void RemoveTemporaryFiles(wxString const& temp); void RemoveTemporaryFilesInSpecificDir(wxString const& temp); - wxString GetTemporaryFile(wxString name); - wxString TruncateFilename(const wxString path, const wxString& name, int max); - bool FilenameExists(const wxString& file); + std::wstring GetTemporaryFile(std::wstring name); + wxString TruncateFilename(wxString const path, wxString const& name, int max); + bool FilenameExists(wxString const& file); int DisplayChangeNotification(fileType type, std::list::const_iterator iter, bool& remove); @@ -167,7 +167,7 @@ }; class CWindowStateManager; -class CEditHandlerStatusDialog : protected wxDialogEx +class CEditHandlerStatusDialog final : protected wxDialogEx { public: CEditHandlerStatusDialog(wxWindow* parent); @@ -191,7 +191,7 @@ void OnEdit(wxCommandEvent& event); }; -class CNewAssociationDialog : protected wxDialogEx +class CNewAssociationDialog final : protected wxDialogEx { public: CNewAssociationDialog(wxWindow* parent); @@ -209,4 +209,4 @@ void OnBrowseEditor(wxCommandEvent& event); }; -#endif //__EDITHANDLER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/encoding_converter.cpp filezilla-3.33.0/src/interface/encoding_converter.cpp --- filezilla-3.15.0.2/src/interface/encoding_converter.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/encoding_converter.cpp 2017-02-23 19:15:18.000000000 +0000 @@ -0,0 +1,67 @@ +#include + +#include "encoding_converter.h" + +#include + +namespace { +thread_local std::map> converters_; +thread_local std::vector toServerBuffer_; +thread_local std::vector toLocalBuffer_; + +wxCSConv& GetConverter(std::wstring const& encoding) +{ + auto & conv_ = converters_[encoding]; + if (!conv_) { + conv_ = std::make_unique(encoding); + } + + return *conv_; +} +} + +CustomEncodingConverter const& CustomEncodingConverter::Get() +{ + static CustomEncodingConverter ret; + return ret; +} + +std::wstring CustomEncodingConverter::toLocal(std::wstring const& encoding, char const* buffer, size_t len) const +{ + std::wstring ret; + + auto & conv = GetConverter(encoding); + if (conv.IsOk()) { + + if (toLocalBuffer_.size() <= len) { + toLocalBuffer_.resize(len + 1); + } + + size_t written = conv.ToWChar(&toLocalBuffer_[0], toLocalBuffer_.size() - 1, buffer, len); + if (written != wxCONV_FAILED) { + ret.assign(&toLocalBuffer_[0], &toLocalBuffer_[written]); + } + } + return ret; +} + +std::string CustomEncodingConverter::toServer(std::wstring const& encoding, wchar_t const* buffer, size_t len) const +{ + std::string ret; + + auto & conv = GetConverter(encoding); + if (conv.IsOk()) { + + // We assume no encoding needs more than 4 characters per byte. + if (toServerBuffer_.size() <= len * 4) { + toServerBuffer_.resize(len * 4 + 1); + } + + // Pro-tip: Never ever look into the wxMBConv internals if you value your sanity. + size_t written = conv.FromWChar(&toServerBuffer_[0], toServerBuffer_.size() - 1, buffer, len); + if (written != wxCONV_FAILED) { + ret.assign(&toServerBuffer_[0], &toServerBuffer_[written]); + } + } + return ret; +} diff -Nru filezilla-3.15.0.2/src/interface/encoding_converter.h filezilla-3.33.0/src/interface/encoding_converter.h --- filezilla-3.15.0.2/src/interface/encoding_converter.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/encoding_converter.h 2017-02-23 19:15:18.000000000 +0000 @@ -0,0 +1,21 @@ +#ifndef FILEZILLA_INTERFACE_ENCODING_CONVERTER_HEADER +#define FILEZILLA_INTERFACE_ENCODING_CONVERTER_HEADER + +#include "engine_context.h" + +#include + +class CustomEncodingConverter final : public CustomEncodingConverterBase +{ +public: + + static CustomEncodingConverter const& Get(); + + virtual std::wstring toLocal(std::wstring const& encoding, char const* buffer, size_t len) const override; + virtual std::string toServer(std::wstring const& encoding, wchar_t const* buffer, size_t len) const override; + +private: + CustomEncodingConverter() = default; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/interface/export.cpp filezilla-3.33.0/src/interface/export.cpp --- filezilla-3.15.0.2/src/interface/export.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/export.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -4,6 +4,7 @@ #include "xmlfunctions.h" #include "ipcmutex.h" #include "queue.h" +#include "xrc_helper.h" CExportDialog::CExportDialog(wxWindow* parent, CQueueView* pQueueView) : m_parent(parent), m_pQueueView(pQueueView) @@ -12,39 +13,50 @@ void CExportDialog::Run() { - if (!Load(m_parent, _T("ID_EXPORT"))) + if (!Load(m_parent, _T("ID_EXPORT"))) { return; + } - if (ShowModal() != wxID_OK) + if (ShowModal() != wxID_OK) { return; + } - bool sitemanager = XRCCTRL(*this, "ID_SITEMANAGER", wxCheckBox)->GetValue(); - bool settings = XRCCTRL(*this, "ID_SETTINGS", wxCheckBox)->GetValue(); - bool queue = XRCCTRL(*this, "ID_QUEUE", wxCheckBox)->GetValue(); + bool sitemanager = xrc_call(*this, "ID_SITEMANAGER", &wxCheckBox::GetValue); + bool settings = xrc_call(*this, "ID_SETTINGS", &wxCheckBox::GetValue); + bool queue = xrc_call(*this, "ID_QUEUE", &wxCheckBox::GetValue); + bool filters = xrc_call(*this, "ID_FILTERS", &wxCheckBox::GetValue); - if (!sitemanager && !settings && !queue) { + if (!sitemanager && !settings && !queue && !filters) { wxMessageBoxEx(_("No category to export selected"), _("Error exporting settings"), wxICON_ERROR, m_parent); return; } wxString str; - if (sitemanager && !queue && !settings) + if (sitemanager && !queue && !settings && !filters) { str = _("Select file for exported sites"); - else if (!sitemanager && queue && !settings) + } + else if (!sitemanager && queue && !settings && !filters) { str = _("Select file for exported queue"); - else if (!sitemanager && !queue && settings) + } + else if (!sitemanager && !queue && settings && !filters) { str = _("Select file for exported settings"); - else + } + else if (!sitemanager && !queue && !settings && filters) { + str = _("Select file for exported filters"); + } + else { str = _("Select file for exported data"); + } wxFileDialog dlg(m_parent, str, wxString(), _T("FileZilla.xml"), _T("XML files (*.xml)|*.xml"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } - CXmlFile xml(dlg.GetPath()); + CXmlFile xml(dlg.GetPath().ToStdWstring()); auto exportRoot = xml.CreateEmpty(); @@ -55,8 +67,9 @@ auto document = file.Load(); if (document) { auto element = document.child("Servers"); - if (element) + if (element) { exportRoot.append_copy(element); + } } } if (settings) { @@ -65,8 +78,9 @@ auto document = file.Load(); if (document) { auto element = document.child("Settings"); - if (element) + if (element) { exportRoot.append_copy(element); + } } } @@ -74,5 +88,21 @@ m_pQueueView->WriteToFile(exportRoot); } + if (filters) { + CInterProcessMutex mutex(MUTEX_FILTERS); + CXmlFile file(wxGetApp().GetSettingsFile(_T("filters"))); + auto document = file.Load(); + if (document) { + auto element = document.child("Filters"); + if (element) { + exportRoot.append_copy(element); + } + element = document.child("Sets"); + if (element) { + exportRoot.append_copy(element); + } + } + } + xml.Save(true); } diff -Nru filezilla-3.15.0.2/src/interface/export.h filezilla-3.33.0/src/interface/export.h --- filezilla-3.15.0.2/src/interface/export.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/export.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,10 +1,10 @@ -#ifndef __EXPORT_H__ -#define __EXPORT_H__ +#ifndef FILEZILLA_INTERFACE_EXPORT_HEADER +#define FILEZILLA_INTERFACE_EXPORT_HEADER #include "dialogex.h" class CQueueView; -class CExportDialog : protected wxDialogEx +class CExportDialog final : protected wxDialogEx { public: CExportDialog(wxWindow* parent, CQueueView* pQueueView); @@ -16,4 +16,4 @@ const CQueueView* const m_pQueueView; }; -#endif //__EXPORT_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/fileexistsdlg.cpp filezilla-3.33.0/src/interface/fileexistsdlg.cpp --- filezilla-3.15.0.2/src/interface/fileexistsdlg.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/fileexistsdlg.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -47,7 +47,7 @@ } wxString timeStr = _("Date/time unknown"); - if (time.empty()) + if (!time.empty()) timeStr = CTimeFormat::Format(time); xrc_call(*this, left ? "ID_FILE1_NAME" : "ID_FILE2_NAME", &wxStaticText::SetLabel, name); @@ -77,13 +77,14 @@ void CFileExistsDlg::LoadIcon(int id, const wxString &file) { wxStaticBitmap *pStatBmp = static_cast(FindWindow(id)); - if (!pStatBmp) + if (!pStatBmp) { return; + } wxSize size = CThemeProvider::GetIconSize(iconSizeNormal); pStatBmp->SetInitialSize(size); pStatBmp->InvalidateBestSize(); - pStatBmp->SetBitmap(CThemeProvider::GetBitmap(_T("ART_FILE"), wxART_OTHER, size)); + pStatBmp->SetBitmap(CThemeProvider::Get()->CreateBitmap(_T("ART_FILE"), wxART_OTHER, size)); #ifdef __WXMSW__ SHFILEINFO fileinfo; @@ -188,7 +189,7 @@ EndModal(wxID_OK); } -enum CFileExistsNotification::OverwriteAction CFileExistsDlg::GetAction() const +CFileExistsNotification::OverwriteAction CFileExistsDlg::GetAction() const { return m_action; } diff -Nru filezilla-3.15.0.2/src/interface/fileexistsdlg.h filezilla-3.33.0/src/interface/fileexistsdlg.h --- filezilla-3.15.0.2/src/interface/fileexistsdlg.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/fileexistsdlg.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,9 +1,9 @@ -#ifndef __FILEEXISTSDLG_H__ -#define __FILEEXISTSDLG_H__ +#ifndef FILEZILLA_INTERFACE_FILEEXISTSDLG_HEADER +#define FILEZILLA_INTERFACE_FILEEXISTSDLG_HEADER #include "dialogex.h" -class CFileExistsDlg: public wxDialogEx +class CFileExistsDlg final : public wxDialogEx { DECLARE_EVENT_TABLE() @@ -14,7 +14,7 @@ /// Creation bool Create(wxWindow* parent); - enum CFileExistsNotification::OverwriteAction GetAction() const; + CFileExistsNotification::OverwriteAction GetAction() const; bool Always(bool &directionOnly, bool &queueOnly) const; protected: @@ -31,10 +31,10 @@ wxString GetPathEllipsis(wxString path, wxWindow *window); CFileExistsNotification *m_pNotification; - enum CFileExistsNotification::OverwriteAction m_action; + CFileExistsNotification::OverwriteAction m_action; bool m_always{}; bool m_directionOnly{}; bool m_queueOnly{}; }; -#endif //__FILEEXISTSDLG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/filelistctrl.cpp filezilla-3.33.0/src/interface/filelistctrl.cpp --- filezilla-3.15.0.2/src/interface/filelistctrl.cpp 2016-02-09 15:58:25.000000000 +0000 +++ filezilla-3.33.0/src/interface/filelistctrl.cpp 2017-11-13 04:30:03.000000000 +0000 @@ -8,6 +8,7 @@ #include "conditionaldialog.h" #include #include "filelist_statusbar.h" +#include "themeprovider.h" #if defined(__WXGTK__) && !defined(__WXGTK3__) #include #endif @@ -84,8 +85,9 @@ template bool CFileListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) { - if (!m_pFilelistStatusBar) + if (!m_pFilelistStatusBar) { return wxListCtrlEx::MSWOnNotify(idCtrl, lParam, result); + } *result = 0; @@ -93,31 +95,36 @@ if (pNmhdr->code == LVN_ODSTATECHANGED) { // A range of items got (de)selected - if (m_insideSetSelection) + if (m_insideSetSelection) { return true; + } - if (!m_pFilelistStatusBar) + if (!m_pFilelistStatusBar) { return true; + } - if (wxGetKeyState(WXK_CONTROL) && wxGetKeyState(WXK_SHIFT)) - { + if (wxGetKeyState(WXK_CONTROL) && wxGetKeyState(WXK_SHIFT)) { // The behavior of Ctrl+Shift+Click is highly erratic. // Even though it is very slow, we need to manually recount. m_pFilelistStatusBar->UnselectAll(); int item = -1; while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { - if (m_hasParent && !item) + if (m_hasParent && !item) { continue; + } const int index = m_indexMapping[item]; const CFileData& data = m_fileData[index]; - if (data.comparison_flags == fill) + if (data.comparison_flags == fill) { continue; + } - if (ItemIsDir(index)) + if (ItemIsDir(index)) { m_pFilelistStatusBar->SelectDirectory(); - else + } + else { m_pFilelistStatusBar->SelectFile(ItemGetSize(index)); + } } } else { @@ -125,31 +132,35 @@ wxASSERT(pNmOdStateChange->iFrom <= pNmOdStateChange->iTo); for (int i = pNmOdStateChange->iFrom; i <= pNmOdStateChange->iTo; ++i) { - if (m_hasParent && !i) + if (m_hasParent && !i) { continue; + } const int index = m_indexMapping[i]; const CFileData& data = m_fileData[index]; - if (data.comparison_flags == fill) + if (data.comparison_flags == fill) { continue; + } - if (ItemIsDir(index)) + if (ItemIsDir(index)) { m_pFilelistStatusBar->SelectDirectory(); - else + } + else { m_pFilelistStatusBar->SelectFile(ItemGetSize(index)); + } } } return true; } else if (pNmhdr->code == LVN_ITEMCHANGED) { - if (m_insideSetSelection) + if (m_insideSetSelection) { return true; + } NMLISTVIEW* pNmListView = (NMLISTVIEW*)lParam; // Item of -1 means change applied to all items - if (pNmListView->iItem == -1 && !(pNmListView->uNewState & LVIS_SELECTED)) - { + if (pNmListView->iItem == -1 && !(pNmListView->uNewState & LVIS_SELECTED)) { m_pFilelistStatusBar->UnselectAll(); } } @@ -173,14 +184,17 @@ } if (lvi.mask & LVIF_IMAGE) { - if (!lvi.iSubItem) + if (!lvi.iSubItem) { lvi.iImage = OnGetItemImage(item); - else + } + else { lvi.iImage = -1; + } } - if (!lvi.iSubItem) + if (!lvi.iSubItem) { lvi.state = INDEXTOOVERLAYMASK(GetOverlayIndex(lvi.iItem)); + } return true; } @@ -220,8 +234,9 @@ GdkEventButton* button_event = (GdkEventButton*)gdk_event; // 8 is back, 9 is forward. - if (button_event->button != 8 && button_event->button != 9) + if (button_event->button != 8 && button_event->button != 9) { return FALSE; + } proxy->OnNavigationEvent(button_event->button == 9); @@ -230,34 +245,21 @@ } #endif -template CFileListCtrl::CFileListCtrl(wxWindow* pParent, CState*, CQueueView* pQueue, bool border /*=false*/) -: wxListCtrlEx(pParent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxLC_VIRTUAL | wxLC_REPORT | wxLC_EDIT_LABELS | (border ? wxBORDER_SUNKEN : wxNO_BORDER)), - CComparableListing(this) +template CFileListCtrl::CFileListCtrl(wxWindow* pParent, CQueueView* pQueue, bool border) + : wxListCtrlEx(pParent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxLC_VIRTUAL | wxLC_REPORT | wxLC_EDIT_LABELS | (border ? wxBORDER_SUNKEN : wxNO_BORDER)) + , CComparableListing(this) + , m_pQueue(pQueue) { - CreateSystemImageList(16); - m_pQueue = pQueue; - - m_sortColumn = 0; - m_sortDirection = 0; - - m_hasParent = true; - - m_comparisonIndex = -1; + CreateSystemImageList(CThemeProvider::GetIconSize(iconSizeSmall).x); #ifndef __WXMSW__ m_dropHighlightAttribute.SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW)); #endif - m_pFilelistStatusBar = 0; - - m_insideSetSelection = false; #ifdef __WXMSW__ // Enable use of overlay images DWORD mask = ListView_GetCallbackMask((HWND)GetHandle()) | LVIS_OVERLAYMASK; ListView_SetCallbackMask((HWND)GetHandle(), mask); -#else - m_pending_focus_processing = 0; - m_focusItem = -1; #endif #if defined(__WXGTK__) && !defined(__WXGTK3__) @@ -267,8 +269,8 @@ g_signal_connect(widget, "button_release_event", G_CALLBACK(gtk_button_release_event), m_gtkEventCallbackProxy.get()); #endif - m_genericTypes[genericTypes::file] = _("File"); - m_genericTypes[genericTypes::directory] = _("Directory"); + m_genericTypes[genericTypes::file] = _("File").ToStdWstring(); + m_genericTypes[genericTypes::directory] = _("Directory").ToStdWstring(); SetBackgroundStyle(wxBG_STYLE_SYSTEM); #ifndef __WXMSW__ @@ -276,35 +278,40 @@ #endif } -template CFileListCtrl::~CFileListCtrl() -{ -} - template void CFileListCtrl::SortList(int column /*=-1*/, int direction /*=-1*/, bool updateSelections /*=true*/) { CancelLabelEdit(); if (column != -1) { - if (column != m_sortColumn) - { + if (column != m_sortColumn) { const int oldVisibleColumn = GetColumnVisibleIndex(m_sortColumn); - if (oldVisibleColumn != -1) + if (oldVisibleColumn != -1) { SetHeaderSortIconIndex(oldVisibleColumn, -1); + } + } + } + else { + if (m_sortColumn != -1) { + column = m_sortColumn; + } + else { + column = 0; } } - else - column = m_sortColumn; - if (direction == -1) + if (direction == -1) { direction = m_sortDirection; - - int newVisibleColumn = GetColumnVisibleIndex(column); - if (newVisibleColumn == -1) { - newVisibleColumn = 0; - column = 0; } - SetHeaderSortIconIndex(newVisibleColumn, direction); + + if (column != m_sortColumn || direction != m_sortDirection) { + int newVisibleColumn = GetColumnVisibleIndex(column); + if (newVisibleColumn == -1) { + newVisibleColumn = 0; + column = 0; + } + SetHeaderSortIconIndex(newVisibleColumn, direction); + } // Remember which files are selected bool *selected = 0; @@ -321,7 +328,7 @@ if (item != -1) { selected = new bool[m_fileData.size()]; memset(selected, 0, sizeof(bool) * m_fileData.size()); - + do { selected[m_indexMapping[item]] = 1; item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); @@ -329,8 +336,9 @@ } } focused_item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); - if (focused_item != -1) + if (focused_item != -1) { focused_index = m_indexMapping[focused_item]; + } } const int dirSortOption = COptions::Get()->GetOptionVal(OPTION_FILELIST_DIRSORT); @@ -342,8 +350,9 @@ m_sortDirection = direction; m_sortColumn = column; std::vector::iterator start = m_indexMapping.begin(); - if (m_hasParent) + if (m_hasParent) { ++start; + } std::reverse(start, m_indexMapping.end()); if (updateSelections) { @@ -364,11 +373,11 @@ } std::vector::iterator start = m_indexMapping.begin(); - if (m_hasParent) + if (m_hasParent) { ++start; - CSortComparisonObject object = GetSortComparisonObject(); - std::sort(start, m_indexMapping.end(), object); - object.Destroy(); + } + std::unique_ptr object = GetSortComparisonObject(); + std::sort(start, m_indexMapping.end(), SortPredicate(object)); if (updateSelections) { SortList_UpdateSelections(selected, focused_item, focused_index); @@ -389,15 +398,16 @@ } } } - + if (selections) { for (unsigned int i = m_hasParent ? 1 : 0; i < m_indexMapping.size(); ++i) { const int state = GetItemState(i, wxLIST_STATE_SELECTED); const bool selected = (state & wxLIST_STATE_SELECTED) != 0; int item = m_indexMapping[i]; - if (selections[item] != selected) + if (selections[item] != selected) { SetSelection(i, selections[item]); + } } } } @@ -406,7 +416,7 @@ { const int dirSortOption = COptions::Get()->GetOptionVal(OPTION_FILELIST_DIRSORT); - enum CFileListCtrlSortBase::DirSortMode dirSortMode; + CFileListCtrlSortBase::DirSortMode dirSortMode; switch (dirSortOption) { case 0: @@ -414,10 +424,12 @@ dirSortMode = CFileListCtrlSortBase::dirsort_ontop; break; case 1: - if (m_sortDirection) + if (m_sortDirection) { dirSortMode = CFileListCtrlSortBase::dirsort_onbottom; - else + } + else { dirSortMode = CFileListCtrlSortBase::dirsort_ontop; + } break; case 2: dirSortMode = CFileListCtrlSortBase::dirsort_inline; @@ -431,7 +443,7 @@ { const int nameSortOption = COptions::Get()->GetOptionVal(OPTION_FILELIST_NAMESORT); - enum CFileListCtrlSortBase::NameSortMode nameSortMode; + CFileListCtrlSortBase::NameSortMode nameSortMode; switch (nameSortOption) { case 0: @@ -452,8 +464,9 @@ template void CFileListCtrl::OnColumnClicked(wxListEvent &event) { int col = m_pVisibleColumnMapping[event.GetColumn()]; - if (col == -1) + if (col == -1) { return; + } if (IsComparing()) { #ifdef __WXMSW__ @@ -464,16 +477,19 @@ dlg.SetTitle(_("Directory comparison")); dlg.AddText(_("Sort order cannot be changed if comparing directories.")); dlg.AddText(_("End comparison and change sorting order?")); - if (!dlg.Run()) + if (!dlg.Run()) { return; + } ExitComparisonMode(); } int dir; - if (col == m_sortColumn) + if (col == m_sortColumn) { dir = m_sortDirection ? 0 : 1; - else + } + else { dir = m_sortDirection; + } SortList(col, dir); RefreshListOnly(false); @@ -486,112 +502,124 @@ wxString ret; int pos = file.Find('.', true); - if (pos > 0 && (static_cast(pos) + 1) < file.size()) // Does neither starts nor end with dot + if (pos > 0 && (static_cast(pos) + 1) < file.size()) { // Does neither starts nor end with dot ret = file.Mid(pos + 1); + } return ret; } } #endif -template wxString CFileListCtrl::GetType(wxString name, bool dir, const wxString& path /*=_T("")*/) +template std::wstring CFileListCtrl::GetType(std::wstring name, bool dir, std::wstring const& path) { #ifdef __WXMSW__ - wxString ext = GetExt(name); - ext.MakeLower(); - std::map::iterator typeIter = m_fileTypeMap.find(ext); - if (typeIter != m_fileTypeMap.end()) + wxString ext; + if (dir) { + if (!path.empty()) { + ext = '/'; + } + } + else { + ext = GetExt(name); + ext.MakeLower(); + } + auto typeIter = m_fileTypeMap.find(ext); + if (typeIter != m_fileTypeMap.end()) { return typeIter->second; + } wxString type; int flags = SHGFI_TYPENAME; - if (path.empty()) + if (path.empty()) { flags |= SHGFI_USEFILEATTRIBUTES; - else if (path == _T("\\")) + } + else if (path == _T("\\")) { name += _T("\\"); - else + } + else { name = path + name; + } SHFILEINFO shFinfo; memset(&shFinfo, 0, sizeof(SHFILEINFO)); - if (SHGetFileInfo(name.wc_str(), + if (SHGetFileInfo(name.c_str(), dir ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL, &shFinfo, sizeof(shFinfo), flags)) { - if (!*shFinfo.szTypeName) - { - if (!ext.empty()) - { + if (!*shFinfo.szTypeName) { + if (!ext.empty()) { type = ext; type.MakeUpper(); type += _T("-"); type += _("file"); } - else + else { type = m_genericTypes[genericTypes::file]; + } } - else - { + else { type = shFinfo.szTypeName; - if (!dir && !ext.empty()) - m_fileTypeMap[ext.MakeLower()] = type; + if (!ext.empty()) { + m_fileTypeMap[ext.MakeLower()] = type.ToStdWstring(); + } } } - else - { - if (!ext.empty()) - { + else { + if (!ext.empty()) { type = ext; type.MakeUpper(); type += _T("-"); type += _("file"); } - else + else { type = m_genericTypes[genericTypes::file]; + } } - return type; + return type.ToStdWstring(); #else (void)path; - if (dir) + if (dir) { return m_genericTypes[genericTypes::directory]; + } - int pos = name.Find('.', true); - if (pos < 1 || !name[pos + 1]) // Starts or ends with dot + size_t pos = name.rfind('.'); + if (pos == std::wstring::npos || pos < 1 || !name[pos + 1]) { // No dot or starts or ends with dot return m_genericTypes[genericTypes::file]; - wxString ext = name.Mid(pos + 1); + } + wxString ext = name.substr(pos + 1); wxString lower_ext = ext.Lower(); - std::map::iterator typeIter = m_fileTypeMap.find(lower_ext); - if (typeIter != m_fileTypeMap.end()) + auto typeIter = m_fileTypeMap.find(lower_ext); + if (typeIter != m_fileTypeMap.end()) { return typeIter->second; + } wxFileType *pType = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); - if (!pType) - { + if (!pType) { wxString desc = ext; desc += _T("-"); desc += _("file"); - m_fileTypeMap[ext] = desc; - return desc; + m_fileTypeMap[ext] = desc.ToStdWstring(); + return desc.ToStdWstring(); } wxString desc; - if (pType->GetDescription(&desc) && !desc.empty()) - { + if (pType->GetDescription(&desc) && !desc.empty()) { delete pType; - m_fileTypeMap[ext] = desc; - return desc; + m_fileTypeMap[ext] = desc.ToStdWstring(); + return desc.ToStdWstring(); } delete pType; desc = ext; desc += _T("-"); desc += _("file"); - m_fileTypeMap[lower_ext] = desc; - return desc; + m_fileTypeMap[lower_ext] = desc.ToStdWstring(); + return desc.ToStdWstring(); #endif } @@ -602,12 +630,14 @@ template void CFileListCtrl::OnPostScroll() { - if (!IsComparing()) + if (!IsComparing()) { return; + } CComparableListing* pOther = GetOther(); - if (!pOther) + if (!pOther) { return; + } pOther->ScrollTopItem(GetTopItem()); } @@ -623,8 +653,9 @@ m_indexMapping.clear(); m_indexMapping.swap(m_originalIndexMapping); - for (unsigned int i = 0; i < m_fileData.size() - 1; i++) + for (unsigned int i = 0; i < m_fileData.size() - 1; ++i) { m_fileData[i].comparison_flags = normal; + } SetItemCount(m_indexMapping.size()); @@ -650,17 +681,20 @@ { m_comparisonSelections.clear(); - if (GetItemCount() != (int)m_indexMapping.size()) + if (GetItemCount() != (int)m_indexMapping.size()) { return; + } int focus = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); if (focus != -1) { SetItemState(focus, 0, wxLIST_STATE_FOCUSED); int index = m_indexMapping[focus]; - if (m_fileData[index].comparison_flags == fill) + if (m_fileData[index].comparison_flags == fill) { focus = -1; - else + } + else { focus = index; + } } m_comparisonSelections.push_back(focus); @@ -670,11 +704,11 @@ #endif { int item = -1; - while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) - { + while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { int index = m_indexMapping[item]; - if (m_fileData[index].comparison_flags == fill) + if (m_fileData[index].comparison_flags == fill) { continue; + } m_comparisonSelections.push_back(index); } } @@ -682,41 +716,40 @@ template void CFileListCtrl::ComparisonRestoreSelections() { - if (m_comparisonSelections.empty()) + if (m_comparisonSelections.empty()) { return; + } int focus = m_comparisonSelections.front(); m_comparisonSelections.pop_front(); int item = -1; - if (!m_comparisonSelections.empty()) - { + if (!m_comparisonSelections.empty()) { item = m_comparisonSelections.front(); m_comparisonSelections.pop_front(); } - if (focus == -1) + if (focus == -1) { focus = item; + } - for (unsigned int i = 0; i < m_indexMapping.size(); i++) - { + for (unsigned int i = 0; i < m_indexMapping.size(); ++i) { int index = m_indexMapping[i]; - if (focus == index) - { + if (focus == index) { SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); focus = -1; } bool isSelected = GetItemState(i, wxLIST_STATE_SELECTED) == wxLIST_STATE_SELECTED; bool shouldSelected = item == index; - if (isSelected != shouldSelected) + if (isSelected != shouldSelected) { SetSelection(i, shouldSelected); + } - if (shouldSelected) - { - if (m_comparisonSelections.empty()) + if (shouldSelected) { + if (m_comparisonSelections.empty()) { item = -1; - else - { + } + else { item = m_comparisonSelections.front(); m_comparisonSelections.pop_front(); } @@ -732,97 +765,122 @@ template void CFileListCtrl::InitSort(int optionID) { wxString sortInfo = COptions::Get()->GetOption(optionID); - if( !sortInfo.empty() ) { + if (!sortInfo.empty()) { m_sortDirection = sortInfo[0] - '0'; } else { m_sortDirection = 0; } - if (m_sortDirection < 0 || m_sortDirection > 1) + if (m_sortDirection < 0 || m_sortDirection > 1) { m_sortDirection = 0; + } - if (sortInfo.Len() == 3) - { + if (sortInfo.Len() == 3) { m_sortColumn = sortInfo[2] - '0'; - if (GetColumnVisibleIndex(m_sortColumn) == -1) + if (GetColumnVisibleIndex(m_sortColumn) == -1) { m_sortColumn = 0; + } } - else + else { m_sortColumn = 0; + } + + SetHeaderSortIconIndex(GetColumnVisibleIndex(m_sortColumn), m_sortDirection); } template void CFileListCtrl::OnItemSelected(wxListEvent& event) { #ifndef __WXMSW__ // On MSW this is done in the subclassed window proc - if (m_insideSetSelection) + if (m_insideSetSelection) { return; - if (m_pending_focus_processing) + } + if (m_pending_focus_processing) { return; + } #endif const int item = event.GetIndex(); + if (item < 0 || item >= (int)m_indexMapping.size()) { + return; + } #ifndef __WXMSW__ - if (m_selections[item]) + if (m_selections[item]) { + // Need to re-do all selections + // Unfortunately the focus change event comes before the selection change event + // in the generic list ctrl if multiple items are already selected + // and selecting one of those a second time, causing all others to be deselected + UpdateSelections(0, GetItemCount() - 1); return; + } m_selections[item] = true; #endif - if (!m_pFilelistStatusBar) + if (!m_pFilelistStatusBar) { return; + } - if (item < 0 || item >= (int)m_indexMapping.size()) - return; - if (m_hasParent && !item) + if (m_hasParent && !item) { return; + } const int index = m_indexMapping[item]; const CFileData& data = m_fileData[index]; - if (data.comparison_flags == fill) + if (data.comparison_flags == fill) { return; + } - if (ItemIsDir(index)) + if (ItemIsDir(index)) { m_pFilelistStatusBar->SelectDirectory(); - else + } + else { m_pFilelistStatusBar->SelectFile(ItemGetSize(index)); + } } template void CFileListCtrl::OnItemDeselected(wxListEvent& event) { #ifndef __WXMSW__ // On MSW this is done in the subclassed window proc - if (m_insideSetSelection) + if (m_insideSetSelection) { return; + } #endif const int item = event.GetIndex(); + if (item < 0 || item >= (int)m_indexMapping.size()) { + return; + } #ifndef __WXMSW__ - if (!m_selections[item]) + if (!m_selections[item]) { return; + } m_selections[item] = false; #endif - if (!m_pFilelistStatusBar) - return; - - if (item < 0 || item >= (int)m_indexMapping.size()) + if (!m_pFilelistStatusBar) { return; + } - if (m_hasParent && !item) + if (m_hasParent && !item) { return; + } const int index = m_indexMapping[item]; const CFileData& data = m_fileData[index]; - if (data.comparison_flags == fill) + if (data.comparison_flags == fill) { return; + } - if (ItemIsDir(index)) + if (ItemIsDir(index)) { m_pFilelistStatusBar->UnselectDirectory(); - else + } + else { m_pFilelistStatusBar->UnselectFile(ItemGetSize(index)); + } } template void CFileListCtrl::SetSelection(int item, bool select) @@ -854,8 +912,9 @@ template void CFileListCtrl::SetItemCount(int count) { m_selections.resize(count, false); - if (m_focusItem >= count) + if (m_focusItem >= count) { m_focusItem = -1; + } wxListCtrlEx::SetItemCount(count); } @@ -865,74 +924,86 @@ int old_focus = event.GetInt(); int new_focus = (int)event.GetExtraLong(); - if (old_focus >= GetItemCount()) + if (old_focus >= GetItemCount()) { return; + } - if (old_focus != -1) - { + if (old_focus != -1) { bool selected = GetItemState(old_focus, wxLIST_STATE_SELECTED) == wxLIST_STATE_SELECTED; - if (!selected && m_selections[old_focus]) - { + if (!selected && m_selections[old_focus]) { // Need to deselect all - if (m_pFilelistStatusBar) + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->UnselectAll(); - for (unsigned int i = 0; i < m_selections.size(); i++) + } + for (unsigned int i = 0; i < m_selections.size(); ++i) { m_selections[i] = 0; + } } } int min; int max; - if (new_focus > old_focus) - { + if (new_focus > old_focus) { min = old_focus; max = new_focus; } - else - { + else { min = new_focus; max = old_focus; } - if (min == -1) + if (min == -1) { min++; - if (max == -1) + } + if (max == -1) { return; + } - if (max >= GetItemCount()) + if (max >= GetItemCount()) { return; + } - for (int i = min; i <= max; i++) - { + UpdateSelections(min, max); +} + +template void CFileListCtrl::UpdateSelections(int min, int max) +{ + for (int i = min; i <= max; ++i) { bool selected = GetItemState(i, wxLIST_STATE_SELECTED) == wxLIST_STATE_SELECTED; - if (selected == m_selections[i]) + if (selected == m_selections[i]) { continue; + } m_selections[i] = selected; - if (!m_pFilelistStatusBar) + if (!m_pFilelistStatusBar) { continue; + } - if (m_hasParent && !i) + if (m_hasParent && !i) { continue; + } const int index = m_indexMapping[i]; const CFileData& data = m_fileData[index]; - if (data.comparison_flags == fill) + if (data.comparison_flags == fill) { continue; + } - if (selected) - { - if (ItemIsDir(index)) + if (selected) { + if (ItemIsDir(index)) { m_pFilelistStatusBar->SelectDirectory(); - else + } + else { m_pFilelistStatusBar->SelectFile(ItemGetSize(index)); + } } - else - { - if (ItemIsDir(index)) + else { + if (ItemIsDir(index)) { m_pFilelistStatusBar->UnselectDirectory(); - else + } + else { m_pFilelistStatusBar->UnselectFile(ItemGetSize(index)); + } } } } @@ -949,22 +1020,26 @@ template void CFileListCtrl::OnProcessMouseEvent(wxCommandEvent&) { - if (m_pending_focus_processing) + if (m_pending_focus_processing) { return; + } - if (m_focusItem >= GetItemCount()) + if (m_focusItem >= GetItemCount()) { return; - if (m_focusItem == -1) + } + if (m_focusItem == -1) { return; + } bool selected = GetItemState(m_focusItem, wxLIST_STATE_SELECTED) == wxLIST_STATE_SELECTED; - if (!selected && m_selections[m_focusItem]) - { + if (!selected && m_selections[m_focusItem]) { // Need to deselect all - if (m_pFilelistStatusBar) + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->UnselectAll(); - for (unsigned int i = 0; i < m_selections.size(); i++) + } + for (unsigned int i = 0; i < m_selections.size(); ++i) { m_selections[i] = 0; + } } } #endif @@ -978,15 +1053,15 @@ #endif { int item = -1; - while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) - { + while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { SetSelection(item, false); } } int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); - if (item != -1) + if (item != -1) { SetItemState(item, 0, wxLIST_STATE_FOCUSED); + } } template void CFileListCtrl::OnKeyDown(wxKeyEvent& event) @@ -999,20 +1074,22 @@ const int code = event.GetKeyCode(); const int mods = event.GetModifiers(); - if (code == 'A' && (mods == wxMOD_CMD || mods == (wxMOD_CONTROL | wxMOD_META))) - { - for (unsigned int i = m_hasParent ? 1 : 0; i < m_indexMapping.size(); i++) - { + if (code == 'A' && (mods == wxMOD_CMD || mods == (wxMOD_CONTROL | wxMOD_META))) { + for (unsigned int i = m_hasParent ? 1 : 0; i < m_indexMapping.size(); ++i) { const CFileData& data = m_fileData[m_indexMapping[i]]; - if (data.comparison_flags != fill) + if (data.comparison_flags != fill) { SetSelection(i, true); - else + } + else { SetSelection(i, false); + } } - if (m_hasParent) + if (m_hasParent && GetItemCount()) { SetSelection(0, false); - if (m_pFilelistStatusBar) + } + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->SelectAll(); + } } else if (code == WXK_BACK || (code == WXK_UP && event.GetModifiers() == CursorModifierKey) || @@ -1021,6 +1098,32 @@ { OnNavigationEvent(false); } - else + else { event.Skip(); + } +} + +template void CFileListCtrl::UpdateSelections_ItemsAdded(std::vector const& added_indexes) +{ + if (added_indexes.empty()) { + return; + } + + auto added_index = added_indexes.cbegin(); + std::deque selected; + // This is O(n) in number of items. I think it's possible to make it O(n) in number of selections + for (unsigned int i = *added_index; i < m_indexMapping.size(); ++i) { + if (added_index != added_indexes.end() && i == static_cast(*added_index)) { + selected.push_front(false); + ++added_index; + } + bool is_selected = GetItemState(i, wxLIST_STATE_SELECTED) != 0; + selected.push_back(is_selected); + + bool should_selected = selected.front(); + selected.pop_front(); + if (is_selected != should_selected) { + SetSelection(i, should_selected); + } + } } diff -Nru filezilla-3.15.0.2/src/interface/filelistctrl.h filezilla-3.33.0/src/interface/filelistctrl.h --- filezilla-3.15.0.2/src/interface/filelistctrl.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filelistctrl.h 2017-12-09 04:30:04.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __FILELISTCTRL_H__ -#define __FILELISTCTRL_H__ +#ifndef FILEZILLA_INTERFACE_FILELISTCTRL_HEADER +#define FILEZILLA_INTERFACE_FILELISTCTRL_HEADER #include "listctrlex.h" #include "systemimagelist.h" @@ -10,7 +10,6 @@ class CQueueView; class CFileListCtrl_SortComparisonObject; -class CState; class CFilelistStatusBar; #if defined(__WXGTK__) && !defined(__WXGTK3__) class CGtkEventCallbackProxyBase; @@ -19,7 +18,7 @@ class CGenericFileData { public: - wxString fileType; + std::wstring fileType; int icon{-2}; // t_fileEntryFlags is defined in listingcomparison.h as it will be used for @@ -30,6 +29,10 @@ class CFileListCtrlSortBase { public: + CFileListCtrlSortBase() = default; + CFileListCtrlSortBase(CFileListCtrlSortBase const&) = delete; + CFileListCtrlSortBase& operator=(CFileListCtrlSortBase const&) = delete; + enum DirSortMode { dirsort_ontop, @@ -77,16 +80,18 @@ static int CmpNoCase(std::wstring const& str1, std::wstring const& str2) { int cmp = fz::stricmp(str1, str2); - if (cmp) + if (cmp) { return cmp; + } return str1.compare(str2); } static int CmpNoCase(wxString const& str1, wxString const& str2) { int cmp = str1.CmpNoCase(str2); - if (cmp) + if (cmp) { return cmp; + } return str1.Cmp(str2); } @@ -100,7 +105,7 @@ return CmpNatural(str1.c_str(), str2.c_str()); } - static int CmpNatural(wxChar const* p1, wxChar const* p2) + static int CmpNatural(wchar_t const* p1, wchar_t const* p2) { int res = 0; int zeroCount = 0; @@ -108,42 +113,56 @@ for (; *p1 && *p2; ++p1, ++p2) { int diff = static_cast(wxTolower(*p1)) - static_cast(wxTolower(*p2)); if (isNumber) { - if (res == 0) + if (res == 0) { res = diff; + } int nbDigits = (wxIsdigit(*p1) ? 1 : 0) + (wxIsdigit(*p2) ? 1 : 0); if (nbDigits == 0 && res == 0) { - if (zeroCount) + if (zeroCount) { break; + } isNumber = false; - } else if (nbDigits != 2) + } + else if (nbDigits != 2) { break; - } else if (wxIsdigit(*p1) && wxIsdigit(*p2)) { + } + } + else if (wxIsdigit(*p1) && wxIsdigit(*p2)) { zeroCount = 0; - for(; *p1 == '0' && *(p1+1) && wxIsdigit(*(p1+1)); ++p1) + for (; *p1 == '0' && *(p1 + 1) && wxIsdigit(*(p1 + 1)); ++p1) { zeroCount++; - for(; *p2 == '0' && *(p2+1) && wxIsdigit(*(p2+1)); ++p2) + } + for (; *p2 == '0' && *(p2 + 1) && wxIsdigit(*(p2 + 1)); ++p2) { zeroCount--; + } res = *p1 - *p2; isNumber = true; - } else if (diff) + } + else if (diff) { return diff; + } } - if (res == 0 && isNumber) + if (res == 0 && isNumber) { res = zeroCount; + } - if (!*p1 && !*p2) + if (!*p1 && !*p2) { return res; - if (!isNumber || res == 0) - return !*p1 ? -1 : 1; - if (*p1 && wxIsdigit(*p1)) + } + if (!isNumber || res == 0) { + return !*p1 ? -1 : 1; + } + if (*p1 && wxIsdigit(*p1)) { return 1; //more digits - if (*p2 && wxIsdigit(*p2)) + } + if (*p2 && wxIsdigit(*p2)) { return -1; //fewer digits + } return res; //same length, compare first different digit in the sequence } - typedef int (* CompareFunction)(const wxString&, const wxString&); + typedef int (* CompareFunction)(std::wstring const&, std::wstring const&); static CompareFunction GetCmpFunction(NameSortMode mode) { switch (mode) @@ -186,7 +205,7 @@ typedef Listing List; typedef typename Listing::value_type value_type; - CFileListCtrlSort(Listing const& listing, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode) + CFileListCtrlSort(Listing const& listing, DirSortMode dirSortMode, NameSortMode nameSortMode) : m_listing(listing), m_dirSortMode(dirSortMode), m_nameSortMode(nameSortMode) { } @@ -198,29 +217,37 @@ default: case dirsort_ontop: if (data1.is_dir()) { - if (!data2.is_dir()) + if (!data2.is_dir()) { return -1; - else + } + else { return 0; + } } else { - if (data2.is_dir()) + if (data2.is_dir()) { return 1; - else + } + else { return 0; + } } case dirsort_onbottom: if (data1.is_dir()) { - if (!data2.is_dir()) + if (!data2.is_dir()) { return 1; - else + } + else { return 0; + } } else { - if (data2.is_dir()) + if (data2.is_dir()) { return -1; - else + } + else { return 0; + } } case dirsort_inline: return 0; @@ -236,12 +263,15 @@ inline int CmpSize(const value_type &data1, const value_type &data2) const { int64_t const diff = data1.size - data2.size; - if (diff < 0) + if (diff < 0) { return -1; - else if (diff > 0) + } + else if (diff > 0) { return 1; - else + } + else { return 0; + } } inline int CmpStringNoCase(const wxString &data1, const wxString &data2) const @@ -251,10 +281,10 @@ inline int CmpTime(const value_type &data1, const value_type &data2) const { - if( data1.time < data2.time ) { + if (data1.time < data2.time) { return -1; } - else if( data1.time > data2.time ) { + else if (data1.time > data2.time) { return 1; } else { @@ -271,7 +301,7 @@ template class CFileListCtrl; -template class CReverseSort : public T +template class CReverseSort final : public T { public: CReverseSort(typename T::List const& listing, std::vector& fileData, CFileListCtrlSortBase::DirSortMode dirSortMode, CFileListCtrlSortBase::NameSortMode nameSortMode, CFileListCtrl* const pListView) @@ -345,10 +375,12 @@ DataEntry &type1 = m_fileData[a]; DataEntry &type2 = m_fileData[b]; - if (type1.fileType.empty()) + if (type1.fileType.empty()) { type1.fileType = m_pListView->GetType(data1.name, data1.is_dir()); - if (type2.fileType.empty()) + } + if (type2.fileType.empty()) { type2.fileType = m_pListView->GetType(data2.name, data2.is_dir()); + } CMP(CmpStringNoCase, type1.fileType, type2.fileType); @@ -441,12 +473,14 @@ typename Listing::value_type const& data1 = this->m_listing[a]; typename Listing::value_type const& data2 = this->m_listing[b]; - if (this->m_listing[a].path < m_fileData[b].path) + if (data1.path < data2.path) { return true; - if (this->m_listing[a].path != m_fileData[b].path) + } + if (data1.path != data2.path) { return false; + } - CMP_LESS(CmpName, static_cast(data1), static_cast(data2)); + CMP_LESS(CmpName, data1, data2); } std::vector& m_fileData; }; @@ -469,10 +503,12 @@ CMP(CmpDir, data1, data2); CMP(CmpName, data1, data2); - if (this->m_listing[a].path < m_fileData[b].path) + if (data1.path < data2.path) { return true; - if (this->m_listing[a].path != m_fileData[b].path) + } + if (data1.path != data2.path) { return false; + } CMP_LESS(CmpName, data1, data2); } @@ -490,29 +526,8 @@ { template friend class CFileListCtrlSortType; public: - CFileListCtrl(wxWindow* pParent, CState *pState, CQueueView *pQueue, bool border = false); - virtual ~CFileListCtrl(); - - class CSortComparisonObject : public std::binary_function - { - public: - CSortComparisonObject(CFileListCtrlSortBase* pObject) - : m_pObject(pObject) - { - } - - void Destroy() - { - delete m_pObject; - } - - inline bool operator()(int a, int b) - { - return m_pObject->operator ()(a, b); - } - protected: - CFileListCtrlSortBase* m_pObject; - }; + CFileListCtrl(wxWindow* pParent, CQueueView *pQueue, bool border = false); + virtual ~CFileListCtrl() = default; void SetFilelistStatusBar(CFilelistStatusBar* pFilelistStatusBar) { m_pFilelistStatusBar = pFilelistStatusBar; } CFilelistStatusBar* GetFilelistStatusBar() { return m_pFilelistStatusBar; } @@ -521,8 +536,10 @@ virtual void OnNavigationEvent(bool) {} + std::vector const& indexMapping() const { return m_indexMapping; } + protected: - CQueueView *m_pQueue; + CQueueView *m_pQueue{}; std::vector m_fileData; std::vector m_indexMapping; @@ -531,22 +548,22 @@ virtual bool ItemIsDir(int index) const = 0; virtual int64_t ItemGetSize(int index) const = 0; - std::map m_fileTypeMap; + std::map m_fileTypeMap; // The .. item - bool m_hasParent; + bool m_hasParent{true}; - int m_sortColumn; - int m_sortDirection; + int m_sortColumn{-1}; + int m_sortDirection{}; void InitSort(int optionID); // Has to be called after initializing columns void SortList(int column = -1, int direction = -1, bool updateSelections = true); - enum CFileListCtrlSortBase::DirSortMode GetDirSortMode(); - enum CFileListCtrlSortBase::NameSortMode GetNameSortMode(); - virtual CSortComparisonObject GetSortComparisonObject() = 0; + CFileListCtrlSortBase::DirSortMode GetDirSortMode(); + CFileListCtrlSortBase::NameSortMode GetNameSortMode(); + virtual std::unique_ptr GetSortComparisonObject() = 0; // An empty path denotes a virtual file - wxString GetType(wxString name, bool dir, const wxString& path = _T("")); + std::wstring GetType(std::wstring name, bool dir, std::wstring const& path = std::wstring()); // Comparison related virtual void ScrollTopItem(int item); @@ -554,7 +571,7 @@ virtual void OnExitComparisonMode(); virtual void CompareAddFile(t_fileEntryFlags flags); - int m_comparisonIndex; + int m_comparisonIndex{-1}; // Remembers which non-fill items are selected if enabling/disabling comparison. // Exploit fact that sort order doesn't change -> O(n) @@ -562,7 +579,10 @@ void ComparisonRestoreSelections(); std::deque m_comparisonSelections; - CFilelistStatusBar* m_pFilelistStatusBar; + CFilelistStatusBar* m_pFilelistStatusBar{}; + + // Indexes of the items added, sorted ascending. + void UpdateSelections_ItemsAdded(std::vector const& added_indexes); #ifndef __WXMSW__ // Generic wxListCtrl does not support wxLIST_STATE_DROPHILITED, emulate it @@ -580,25 +600,27 @@ #endif private: + void UpdateSelections(int min, int max); + void SortList_UpdateSelections(bool* selections, int focused_item, unsigned int focused_index); // If this is set to true, don't process selection changed events - bool m_insideSetSelection; + bool m_insideSetSelection{}; #ifdef __WXMSW__ virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); #else - int m_focusItem; + int m_focusItem{-1}; std::vector m_selections; - int m_pending_focus_processing; + int m_pending_focus_processing{}; #endif #if defined(__WXGTK__) && !defined(__WXGTK3__) std::unique_ptr m_gtkEventCallbackProxy; #endif - wxString m_genericTypes[2]; + std::wstring m_genericTypes[2]; DECLARE_EVENT_TABLE() void OnColumnClicked(wxListEvent &event); @@ -614,8 +636,24 @@ void OnKeyDown(wxKeyEvent& event); }; +class SortPredicate +{ +public: + SortPredicate() = delete; + SortPredicate(std::unique_ptr const& ref) + : p_(ref.get()) + {} + + inline bool operator()(int lhs, int rhs) { + return (*p_)(lhs, rhs); + } + +public: + CFileListCtrlSortBase const* p_; +}; + #ifdef FILELISTCTRL_INCLUDE_TEMPLATE_DEFINITION #include "filelistctrl.cpp" #endif -#endif //__FILELISTCTRL_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/filelist_statusbar.cpp filezilla-3.33.0/src/interface/filelist_statusbar.cpp --- filezilla-3.15.0.2/src/interface/filelist_statusbar.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filelist_statusbar.cpp 2016-07-21 18:14:43.000000000 +0000 @@ -17,8 +17,9 @@ UpdateText(); #ifdef __WXMSW__ - if (GetLayoutDirection() != wxLayout_RightToLeft) + if (GetLayoutDirection() != wxLayout_RightToLeft) { SetDoubleBuffered(true); + } #endif RegisterOption(OPTION_SIZE_FORMAT); @@ -33,43 +34,53 @@ text = m_offline_string; } else if (m_count_selected_files || m_count_selected_dirs) { - if (!m_count_selected_files) + if (!m_count_selected_files) { text = wxString::Format(wxPLURAL("Selected %d directory.", "Selected %d directories.", m_count_selected_dirs), m_count_selected_dirs); + } else if (!m_count_selected_dirs) { const wxString size = CSizeFormat::Format(m_total_selected_size, true); - if (m_unknown_selected_size) + if (m_unknown_selected_size) { text = wxString::Format(wxPLURAL("Selected %d file. Total size: At least %s", "Selected %d files. Total size: At least %s", m_count_selected_files), m_count_selected_files, size); - else + } + else { text = wxString::Format(wxPLURAL("Selected %d file. Total size: %s", "Selected %d files. Total size: %s", m_count_selected_files), m_count_selected_files, size); + } } else { const wxString files = wxString::Format(wxPLURAL("%d file", "%d files", m_count_selected_files), m_count_selected_files); const wxString dirs = wxString::Format(wxPLURAL("%d directory", "%d directories", m_count_selected_dirs), m_count_selected_dirs); const wxString size = CSizeFormat::Format(m_total_selected_size, true); - if (m_unknown_selected_size) + if (m_unknown_selected_size) { text = wxString::Format(_("Selected %s and %s. Total size: At least %s"), files, dirs, size); - else + } + else { text = wxString::Format(_("Selected %s and %s. Total size: %s"), files, dirs, size); + } } } else if (m_count_files || m_count_dirs) { - if (!m_count_files) + if (!m_count_files) { text = wxString::Format(wxPLURAL("%d directory", "%d directories", m_count_dirs), m_count_dirs); + } else if (!m_count_dirs) { const wxString size = CSizeFormat::Format(m_total_size, true); - if (m_unknown_size) + if (m_unknown_size) { text = wxString::Format(wxPLURAL("%d file. Total size: At least %s", "%d files. Total size: At least %s", m_count_files), m_count_files, size); - else + } + else { text = wxString::Format(wxPLURAL("%d file. Total size: %s", "%d files. Total size: %s", m_count_files), m_count_files, size); + } } else { const wxString files = wxString::Format(wxPLURAL("%d file", "%d files", m_count_files), m_count_files); const wxString dirs = wxString::Format(wxPLURAL("%d directory", "%d directories", m_count_dirs), m_count_dirs); const wxString size = CSizeFormat::Format(m_total_size, true); - if (m_unknown_size) + if (m_unknown_size) { text = wxString::Format(_("%s and %s. Total size: At least %s"), files, dirs, size); - else + } + else { text = wxString::Format(_("%s and %s. Total size: %s"), files, dirs, size); + } } if (m_hidden) { text += ' '; @@ -132,20 +143,33 @@ void CFilelistStatusBar::SelectFile(int64_t size) { ++m_count_selected_files; - if (size < 0) + if (size < 0) { ++m_unknown_selected_size; - else + } + else { m_total_selected_size += size; + } TriggerUpdateText(); } void CFilelistStatusBar::UnselectFile(int64_t size) { - --m_count_selected_files; - if (size < 0) - --m_unknown_selected_size; - else - m_total_selected_size -= size; + if (m_count_selected_files) { + --m_count_selected_files; + } + if (size < 0) { + if (m_unknown_selected_size) { + --m_unknown_selected_size; + } + } + else { + if (m_total_selected_size > size) { + m_total_selected_size -= size; + } + else { + m_total_selected_size = 0; + } + } TriggerUpdateText(); } @@ -157,7 +181,9 @@ void CFilelistStatusBar::UnselectDirectory() { - --m_count_selected_dirs; + if (m_count_selected_dirs) { + --m_count_selected_dirs; + } TriggerUpdateText(); } @@ -168,8 +194,9 @@ void CFilelistStatusBar::TriggerUpdateText() { - if (m_updateTimer.IsRunning()) + if (m_updateTimer.IsRunning()) { return; + } m_updateTimer.Start(1, true); } @@ -177,20 +204,33 @@ void CFilelistStatusBar::AddFile(int64_t size) { ++m_count_files; - if (size < 0) + if (size < 0) { ++m_unknown_size; - else + } + else { m_total_size += size; + } TriggerUpdateText(); } void CFilelistStatusBar::RemoveFile(int64_t size) { - --m_count_files; - if (size < 0) - --m_unknown_size; - else - m_total_size -= size; + if (m_count_files) { + --m_count_files; + } + if (size < 0) { + if (m_unknown_size) { + --m_unknown_size; + } + } + else { + if (m_total_size > size) { + m_total_size -= size; + } + else { + m_total_size = 0; + } + } TriggerUpdateText(); } @@ -202,7 +242,9 @@ void CFilelistStatusBar::RemoveDirectory() { - --m_count_dirs; + if (m_count_dirs) { + --m_count_dirs; + } TriggerUpdateText(); } diff -Nru filezilla-3.15.0.2/src/interface/filelist_statusbar.h filezilla-3.33.0/src/interface/filelist_statusbar.h --- filezilla-3.15.0.2/src/interface/filelist_statusbar.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filelist_statusbar.h 2017-07-16 10:29:48.000000000 +0000 @@ -1,8 +1,9 @@ -#ifndef __FILELIST_STATUSBAR_H__ -#define __FILELIST_STATUSBAR_H__ +#ifndef FILEZILLA_INTERFACE_FILELIST_STATUSBAR_HEADER +#define FILEZILLA_INTERFACE_FILELIST_STATUSBAR_HEADER #include +#include #include class CFilelistStatusBar final : public wxStatusBar, protected COptionChangeEventHandler @@ -56,4 +57,4 @@ void OnTimer(wxTimerEvent& event); }; -#endif //__FILELIST_STATUSBAR_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/file_utils.cpp filezilla-3.33.0/src/interface/file_utils.cpp --- filezilla-3.15.0.2/src/interface/file_utils.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/file_utils.cpp 2017-03-13 13:18:36.000000000 +0000 @@ -3,26 +3,22 @@ #include "file_utils.h" #include -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS #include // Used by GetDownloadDir #include #else #include #include -#endif //__WXMSW__ +#endif -wxString GetAsURL(const wxString& dir) +wxString GetAsURL(wxString const& dir) { // Cheap URL encode wxString encoded; - const wxWX2MBbuf utf8 = dir.mb_str(wxConvUTF8); - - if (!utf8) - return wxString(); + std::string utf8 = fz::to_utf8(dir.ToStdWstring()); - const char* p = utf8; - while (*p) - { + char const* p = utf8.c_str(); + while (*p) { // List of characters that don't need to be escaped taken // from the BNF grammar in RFC 1738 // Again attention seeking Windows wants special treatment... @@ -53,20 +49,21 @@ encoded += (wxChar)c; } #ifdef __WXMSW__ - else if (c == '\\') + else if (c == '\\') { encoded += '/'; + } #endif else encoded += wxString::Format(_T("%%%x"), (unsigned int)c); } #ifdef __WXMSW__ - if (encoded.Left(2) == _T("//")) - { + if (encoded.Left(2) == _T("//")) { // UNC path encoded = encoded.Mid(2); } - else + else { encoded = _T("/") + encoded; + } #endif return _T("file://") + encoded; } @@ -325,6 +322,8 @@ #ifdef __WXMSW__ extern "C" typedef HRESULT (WINAPI *tSHGetKnownFolderPath)(const GUID& rfid, DWORD dwFlags, HANDLE hToken, PWSTR *ppszPath); +#elif defined __WXMAC__ +extern "C" char const* GetDownloadDirImpl(); #else wxString ShellUnescape( wxString const& path ) { @@ -354,22 +353,29 @@ PWSTR path; HRESULT result = pSHGetKnownFolderPath(FOLDERID_Downloads, 0, 0, &path); if(result == S_OK) { - wxString dir = path; + std::wstring dir = path; CoTaskMemFree(path); return CLocalPath(dir); } } -#elif !defined(__WXMAC__) +#elif defined(__WXMAC__) + CLocalPath ret; + char const* url = GetDownloadDirImpl(); + ret.SetPath(fz::to_wstring_from_utf8(url)); + return ret; +#else // Code copied from wx, but for downloads directory. // Also, directory is now unescaped. { wxLogNull logNull; wxString homeDir = wxFileName::GetHomeDir(); wxString configPath; - if (wxGetenv(wxT("XDG_CONFIG_HOME"))) + if (wxGetenv(wxT("XDG_CONFIG_HOME"))) { configPath = wxGetenv(wxT("XDG_CONFIG_HOME")); - else + } + else { configPath = homeDir + wxT("/.config"); + } wxString dirsFile = configPath + wxT("/user-dirs.dirs"); if (wxFileExists(dirsFile)) { wxTextFile textFile; @@ -382,7 +388,7 @@ wxString value = line.AfterFirst(wxT('=')); value = ShellUnescape(value); if (!value.empty() && wxDirExists(value)) - return CLocalPath(value); + return CLocalPath(value.ToStdWstring()); else break; } @@ -391,5 +397,5 @@ } } #endif - return CLocalPath(wxStandardPaths::Get().GetDocumentsDir()); + return CLocalPath(wxStandardPaths::Get().GetDocumentsDir().ToStdWstring()); } diff -Nru filezilla-3.15.0.2/src/interface/file_utils.h filezilla-3.33.0/src/interface/file_utils.h --- filezilla-3.15.0.2/src/interface/file_utils.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/file_utils.h 2017-09-19 21:36:39.000000000 +0000 @@ -10,7 +10,7 @@ wxString GetSystemOpenCommand(wxString file, bool &program_exists); // Returns a file:// URL -wxString GetAsURL(const wxString& dir); +wxString GetAsURL(wxString const& dir); // Opens specified directory in local file manager, e.g. Explorer on Windows bool OpenInFileManager(const wxString& dir); @@ -19,7 +19,7 @@ CLocalPath GetDownloadDir(); -class gui_recursive_remove : public fz::recursive_remove +class gui_recursive_remove final : public fz::recursive_remove { public: gui_recursive_remove(wxWindow* parent) diff -Nru filezilla-3.15.0.2/src/interface/file_utils_osx.m filezilla-3.33.0/src/interface/file_utils_osx.m --- filezilla-3.15.0.2/src/interface/file_utils_osx.m 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/file_utils_osx.m 2017-11-06 17:00:19.000000000 +0000 @@ -0,0 +1,19 @@ +#include +#include + +#include + +char const* GetDownloadDirImpl() +{ + static char const* path = 0; + if (!path) { + NSURL* url = [[NSFileManager defaultManager] URLForDirectory:NSDownloadsDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:NO error:nil]; + if (url) { + path = strdup(url.path.UTF8String); + } + else { + path = ""; + } + } + return path; +} diff -Nru filezilla-3.15.0.2/src/interface/filezillaapp.h filezilla-3.33.0/src/interface/filezillaapp.h --- filezilla-3.15.0.2/src/interface/filezillaapp.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filezillaapp.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,10 +1,10 @@ -#ifndef __FILEZILLAAPP_H__ -#define __FILEZILLAAPP_H__ - -#include +#ifndef FILEZILLA_INTERFACE_FILEZILLAAPP_HEADER +#define FILEZILLA_INTERFACE_FILEZILLAAPP_HEADER #include "local_path.h" +#include + class CWrapEngine; class CCommandLine; class CFileZillaApp : public wxApp @@ -21,9 +21,12 @@ CLocalPath GetDefaultsDir() const { return m_defaultsDir; } CLocalPath GetLocalesDir() const { return m_localesDir; } - wxString GetSettingsFile(wxString const& name) const; + std::wstring GetSettingsFile(std::wstring const& name) const; void CheckExistsFzsftp(); +#if ENABLE_STORJ + void CheckExistsFzstorj(); +#endif void InitLocale(); bool SetLocale(int language); @@ -37,9 +40,11 @@ const CCommandLine* GetCommandLine() const { return m_pCommandLine.get(); } void ShowStartupProfile(); - void AddStartupProfileRecord(const wxString& msg); + void AddStartupProfileRecord(std::string const& msg); protected: + void CheckExistsTool(std::wstring const& tool, std::vector const& searchPaths, std::wstring const& env, int setting, wxString const& description); + bool InitDefaultsDir(); bool LoadResourceFiles(); bool LoadLocales(); @@ -55,22 +60,18 @@ virtual void OnFatalException(); #endif - CLocalPath GetDataDir(wxString fileToFind) const; + CLocalPath GetDataDir(std::wstring fileToFind) const; - // FileExists accepts full paths as parameter, - // with the addition that path segments may be obmitted - // with a wildcard (*). A matching directory will then be searched. - // Example: FileExists(_T("/home/*/.filezilla/filezilla.xml")); - bool FileExists(const wxString& file) const; + bool FileExists(std::wstring const& file) const; std::unique_ptr m_pWrapEngine; std::unique_ptr m_pCommandLine; - bool m_profilingActive; - std::list > m_startupProfile; + fz::monotonic_clock m_profile_start; + std::vector> m_startupProfile; }; DECLARE_APP(CFileZillaApp) -#endif //__FILEZILLAAPP_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/FileZilla.cpp filezilla-3.33.0/src/interface/FileZilla.cpp --- filezilla-3.15.0.2/src/interface/FileZilla.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/FileZilla.cpp 2017-11-17 04:30:03.000000000 +0000 @@ -7,38 +7,16 @@ #include "Options.h" #include "wrapengine.h" #include "buildinfo.h" -#include #include "cmdline.h" #include "welcome_dialog.h" -#include +#include "msgbox.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "xh_text_ex.h" -#include -#include -#include "xh_toolb_ex.h" +#include + +#include "wxfilesystem_blob_handler.h" +#include "xrc_helper.h" #ifdef __WXMSW__ #include #endif @@ -52,6 +30,10 @@ #include "locale_initializer.h" +#ifdef USE_MAC_SANDBOX +#include "osx_sandbox_userdirs.h" +#endif + #ifdef ENABLE_BINRELOC #define BR_PTHREADS 0 #include "prefix.h" @@ -63,10 +45,14 @@ IMPLEMENT_APP_NO_MAIN(CFileZillaApp) #endif //__WXGTK__ +#if !wxUSE_PRINTF_POS_PARAMS + #error Please build wxWidgets with support for positional arguments. +#endif + CFileZillaApp::CFileZillaApp() { - m_profilingActive = true; - AddStartupProfileRecord(_T("CFileZillaApp::CFileZillaApp()")); + m_profile_start = fz::monotonic_clock::now(); + AddStartupProfileRecord("CFileZillaApp::CFileZillaApp()"); } CFileZillaApp::~CFileZillaApp() @@ -87,14 +73,16 @@ if (!dll.Load(_T("shell32.dll"))) return; - if (!dll.HasSymbol(_T("SetCurrentProcessExplicitAppUserModelID"))) + if (!dll.HasSymbol(_T("SetCurrentProcessExplicitAppUserModelID"))) { return; + } t_SetCurrentProcessExplicitAppUserModelID pSetCurrentProcessExplicitAppUserModelID = (t_SetCurrentProcessExplicitAppUserModelID)dll.GetSymbol(_T("SetCurrentProcessExplicitAppUserModelID")); - if (!pSetCurrentProcessExplicitAppUserModelID) + if (!pSetCurrentProcessExplicitAppUserModelID) { return; + } pSetCurrentProcessExplicitAppUserModelID(_T("FileZilla.Client.AppID")); } @@ -133,24 +121,28 @@ wxLocale *loc = wxGetLocale(); const wxLanguageInfo* currentInfo = loc ? loc->GetLanguageInfo(loc->GetLanguage()) : 0; if (!loc || !currentInfo) { - if (!pInfo) + if (!pInfo) { error.Printf(_("Failed to set language to %s, using default system language."), language); - else + } + else { error.Printf(_("Failed to set language to %s (%s), using default system language."), pInfo->Description, language); + } } else { wxString currentName = currentInfo->CanonicalName; - if (!pInfo) + if (!pInfo) { error.Printf(_("Failed to set language to %s, using default system language (%s, %s)."), language, loc->GetLocale(), currentName); - else + } + else { error.Printf(_("Failed to set language to %s (%s), using default system language (%s, %s)."), pInfo->Description, language, loc->GetLocale(), currentName); + } } error += _T("\n"); @@ -161,28 +153,46 @@ } #else if (!pInfo || !SetLocale(pInfo->Language)) { - for( language = GetFallbackLocale(language); !language.empty(); language = GetFallbackLocale(language) ) { + for (language = GetFallbackLocale(language); !language.empty(); language = GetFallbackLocale(language)) { const wxLanguageInfo* fallbackInfo = wxLocale::FindLanguageInfo(language); - if( fallbackInfo && SetLocale(fallbackInfo->Language )) { - COptions::Get()->SetOption(OPTION_LANGUAGE, language); + if (fallbackInfo && SetLocale(fallbackInfo->Language)) { + COptions::Get()->SetOption(OPTION_LANGUAGE, language.ToStdWstring()); return; } } - COptions::Get()->SetOption(OPTION_LANGUAGE, wxString()); - if (pInfo && !pInfo->Description.empty()) + COptions::Get()->SetOption(OPTION_LANGUAGE, std::wstring()); + if (pInfo && !pInfo->Description.empty()) { wxMessageBoxEx(wxString::Format(_("Failed to set language to %s (%s), using default system language"), pInfo->Description, language), _("Failed to change language"), wxICON_EXCLAMATION); - else + } + else { wxMessageBoxEx(wxString::Format(_("Failed to set language to %s, using default system language"), language), _("Failed to change language"), wxICON_EXCLAMATION); + } } #endif } } +namespace { +std::wstring translator(char const* const t) +{ + return wxGetTranslation(t).ToStdWstring(); +} + +std::wstring translator_pf(char const* const singular, char const* const plural, int64_t n) +{ + // wxGetTranslation does not support 64bit ints on 32bit systems. + if (n < 0) { + n = -n; + } + return wxGetTranslation(singular, plural, (sizeof(unsigned int) < 8 && n > 1000000000) ? (1000000000 + n % 1000000000) : n).ToStdWstring(); +} +} + bool CFileZillaApp::OnInit() { - AddStartupProfileRecord(_T("CFileZillaApp::OnInit()")); + AddStartupProfileRecord("CFileZillaApp::OnInit()"); - srand( (unsigned)time( NULL ) ); + fz::set_translators(translator, translator_pf); #ifdef __WXMSW__ if (!InitWinsock()) { @@ -209,8 +219,9 @@ #endif int cmdline_result = ProcessCommandLine(); - if (!cmdline_result) + if (!cmdline_result) { return false; + } LoadLocales(); @@ -221,6 +232,16 @@ return false; } +#if USE_MAC_SANDBOX + // Set PUTTYDIR so that fzsftp uses the sandboxed home to put settings. + wxString home; + if (wxGetEnv(L"HOME", &home) && !home.empty()) { + if (home[home.size() - 1] != '/') { + home += '/'; + } + wxSetEnv("PUTTYDIR", home + L".config/putty"); + } +#endif InitDefaultsDir(); COptions::Init(); @@ -253,6 +274,9 @@ } CheckExistsFzsftp(); +#if ENABLE_STORJ + CheckExistsFzstorj(); +#endif // Turn off idle events, we don't need them wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED); @@ -267,12 +291,15 @@ m_pWrapEngine = std::make_unique(); m_pWrapEngine->LoadCache(); +#ifdef USE_MAC_SANDBOX + OSXSandboxUserdirs::Get().Load(); +#endif + CMainFrame *frame = new CMainFrame(); frame->Show(true); SetTopWindow(frame); - CWelcomeDialog *welcome_dialog = new CWelcomeDialog; - welcome_dialog->Run(frame, false, true); + CWelcomeDialog::RunDelayed(frame); frame->ProcessCommandLine(); frame->PostInitialize(); @@ -284,45 +311,34 @@ int CFileZillaApp::OnExit() { + CContextManager::Get()->NotifyGlobalHandlers(STATECHANGE_QUITNOW); + COptions::Get()->SaveIfNeeded(); #ifdef WITH_LIBDBUS CSessionManager::Uninit(); #endif + + if (GetMainLoop() && wxEventLoopBase::GetActive() != GetMainLoop()) { + // There's open dialogs and such and we just have to quit _NOW_. + // We cannot continue as wx proceeds to destroy all windows, which interacts + // badly with nested event loops, virtually always causing a crash. + // I very much prefer clean shutdown but it's impossible in this situation. Sad. + _exit(0); + } + #ifdef __WXMSW__ UninitWinsock(); #endif return wxApp::OnExit(); } -bool CFileZillaApp::FileExists(const wxString& file) const +bool CFileZillaApp::FileExists(std::wstring const& file) const { - int pos = file.Find('*'); - if (pos < 0) - return wxFileExists(file); - - wxASSERT(pos > 0); - wxASSERT(file[pos - 1] == '/'); - wxASSERT(file.size() > static_cast(pos + 1) && file[pos + 1] == '/'); - - wxLogNull nullLog; - wxDir dir(file.Left(pos)); - if (!dir.IsOpened()) - return false; - - wxString subDir; - bool found = dir.GetFirst(&subDir, _T(""), wxDIR_DIRS); - while (found) { - if (FileExists(file.Left(pos) + subDir + file.Mid(pos + 1))) - return true; - - found = dir.GetNext(&subDir); - } - - return false; + return fz::local_filesys::get_file_type(fz::to_native(file), true) == fz::local_filesys::file; } -CLocalPath CFileZillaApp::GetDataDir(wxString fileToFind) const +CLocalPath CFileZillaApp::GetDataDir(std::wstring fileToFind) const { /* * Finding the resources in all cases is a difficult task, @@ -336,9 +352,10 @@ */ #ifdef __WXMAC__ - CLocalPath path(wxStandardPaths::Get().GetDataDir()); - if (FileExists(path.GetPath() + fileToFind)) + CLocalPath path(wxStandardPaths::Get().GetDataDir().ToStdWstring()); + if (FileExists(path.GetPath() + fileToFind)) { return path; + } return CLocalPath(); #else @@ -390,27 +407,33 @@ // For each path, check for the resources wxPathList::const_iterator node; for (node = pathList.begin(); node != pathList.end(); ++node) { - wxString cur = CLocalPath(*node).GetPath(); - if (FileExists(cur + fileToFind)) + auto const cur = CLocalPath(node->ToStdWstring()).GetPath(); + if (FileExists(cur + fileToFind)) { return CLocalPath(cur); - if (FileExists(cur + _T("share/filezilla/") + fileToFind)) + } + if (FileExists(cur + _T("share/filezilla/") + fileToFind)) { return CLocalPath(cur + _T("/share/filezilla")); - if (FileExists(cur + _T("filezilla/") + fileToFind)) + } + if (FileExists(cur + _T("filezilla/") + fileToFind)) { return CLocalPath(cur + _T("filezilla")); + } } for (node = pathList.begin(); node != pathList.end(); ++node) { - wxString cur = CLocalPath(*node).GetPath(); - if (FileExists(cur + _T("../") + fileToFind)) + auto const cur = CLocalPath(node->ToStdWstring()).GetPath(); + if (FileExists(cur + _T("../") + fileToFind)) { return CLocalPath(cur + _T("/..")); - if (FileExists(cur + _T("../share/filezilla/") + fileToFind)) + } + if (FileExists(cur + _T("../share/filezilla/") + fileToFind)) { return CLocalPath(cur + _T("../share/filezilla")); + } } for (node = pathList.begin(); node != pathList.end(); ++node) { - wxString cur = CLocalPath(*node).GetPath(); - if (FileExists(cur + _T("../../") + fileToFind)) + auto const cur = CLocalPath(node->ToStdWstring()).GetPath(); + if (FileExists(cur + _T("../../") + fileToFind)) { return CLocalPath(cur + _T("../..")); + } } return CLocalPath(); @@ -419,8 +442,8 @@ bool CFileZillaApp::LoadResourceFiles() { - AddStartupProfileRecord(_T("CFileZillaApp::LoadResourceFiles")); - m_resourceDir = GetDataDir(_T("resources/theme.xml")); + AddStartupProfileRecord("CFileZillaApp::LoadResourceFiles"); + m_resourceDir = GetDataDir(_T("resources/defaultfilters.xml")); wxImage::AddHandler(new wxPNGHandler()); @@ -438,60 +461,32 @@ pResource->SetFlags(pResource->GetFlags() | wxXRC_NO_RELOADING); #endif - pResource->AddHandler(new wxMenuXmlHandler); - pResource->AddHandler(new wxMenuBarXmlHandler); - pResource->AddHandler(new wxDialogXmlHandler); - pResource->AddHandler(new wxPanelXmlHandler); - pResource->AddHandler(new wxSizerXmlHandler); - pResource->AddHandler(new wxButtonXmlHandler); - pResource->AddHandler(new wxBitmapButtonXmlHandler); - pResource->AddHandler(new wxStaticTextXmlHandler); - pResource->AddHandler(new wxStaticBoxXmlHandler); - pResource->AddHandler(new wxStaticBitmapXmlHandler); - pResource->AddHandler(new wxTreeCtrlXmlHandler); - pResource->AddHandler(new wxListCtrlXmlHandler); - pResource->AddHandler(new wxCheckListBoxXmlHandler); - pResource->AddHandler(new wxChoiceXmlHandler); - pResource->AddHandler(new wxGaugeXmlHandler); - pResource->AddHandler(new wxCheckBoxXmlHandler); - pResource->AddHandler(new wxSpinCtrlXmlHandler); - pResource->AddHandler(new wxRadioButtonXmlHandler); - pResource->AddHandler(new wxNotebookXmlHandler); - pResource->AddHandler(new wxTextCtrlXmlHandlerEx); - pResource->AddHandler(new wxListBoxXmlHandler); - pResource->AddHandler(new wxToolBarXmlHandlerEx); - pResource->AddHandler(new wxStaticLineXmlHandler); - pResource->AddHandler(new wxScrolledWindowXmlHandler); - pResource->AddHandler(new wxHyperlinkCtrlXmlHandler); - pResource->AddHandler(new wxAnimationCtrlXmlHandler); - pResource->AddHandler(new wxStdDialogButtonSizerXmlHandler); + InitHandlers(*pResource); - if (fz::local_filesys::get_file_type(fz::to_native(m_resourceDir.GetPath() + _T("xrc/resources.xrc"))) == fz::local_filesys::file) { - pResource->LoadFile(m_resourceDir.GetPath() + _T("xrc/resources.xrc")); - } - else { - fz::local_filesys fs; - wxString dir = m_resourceDir.GetPath() + _T("xrc/"); - bool found = fs.begin_find_files(fz::to_native(dir), false); - while (found) { - fz::native_string name; - found = fs.get_next_file(name); - if (name.size() <= 4 || name.substr(name.size() - 4) != fzT(".xrc")) { - continue; - } - pResource->LoadFile(dir + name); - } - } + fz::local_filesys fs; + std::wstring dir = m_resourceDir.GetPath() + L"xrc/"; + pResource->LoadFile(wxString(dir + L"certificate.xrc")); + pResource->LoadFile(wxString(dir + L"dialogs.xrc")); + pResource->LoadFile(wxString(dir + L"inputdialog.xrc")); + pResource->LoadFile(wxString(dir + L"menus.xrc")); + pResource->LoadFile(wxString(dir + L"netconfwizard.xrc")); + pResource->LoadFile(wxString(dir + L"settings.xrc")); + pResource->LoadFile(wxString(dir + L"sitemanager.xrc")); + pResource->LoadFile(wxString(dir + L"update.xrc")); + pResource->LoadFile(wxString(dir + L"storj.xrc")); + + // Useful for XRC files with embedded image data. + wxFileSystem::AddHandler(new wxFileSystemBlobHandler); return true; } bool CFileZillaApp::InitDefaultsDir() { - AddStartupProfileRecord(_T("InitDefaultsDir")); + AddStartupProfileRecord("InitDefaultsDir"); #ifdef __WXGTK__ m_defaultsDir = COptions::GetUnadjustedSettingsDir(); - if( m_defaultsDir.empty() || !wxFileName::FileExists(m_defaultsDir.GetPath() + _T("fzdefaults.xml"))) { + if (m_defaultsDir.empty() || !wxFileName::FileExists(m_defaultsDir.GetPath() + _T("fzdefaults.xml"))) { if (wxFileName::FileExists(_T("/etc/filezilla/fzdefaults.xml"))) { m_defaultsDir.SetPath(_T("/etc/filezilla")); } @@ -501,7 +496,7 @@ } #endif - if( m_defaultsDir.empty() ) { + if (m_defaultsDir.empty()) { m_defaultsDir = GetDataDir(_T("fzdefaults.xml")); } @@ -510,22 +505,23 @@ bool CFileZillaApp::LoadLocales() { - AddStartupProfileRecord(_T("CFileZillaApp::LoadLocales")); + AddStartupProfileRecord("CFileZillaApp::LoadLocales"); #ifndef __WXMAC__ - m_localesDir = GetDataDir(_T("../locale/*/filezilla.mo")); - if (m_localesDir.empty()) - m_localesDir = GetDataDir(_T("../locale/*/LC_MESSAGES/filezilla.mo")); + m_localesDir = GetDataDir(_T("../locale/de/filezilla.mo")); + if (m_localesDir.empty()) { + m_localesDir = GetDataDir(_T("../locale/de/LC_MESSAGES/filezilla.mo")); + } if (!m_localesDir.empty()) { m_localesDir.ChangePath( _T("../locale") ); } else { - m_localesDir = GetDataDir(_T("locales/*/filezilla.mo")); + m_localesDir = GetDataDir(_T("locales/de/filezilla.mo")); if (!m_localesDir.empty()) { m_localesDir.AddSegment(_T("locales")); } } #else - m_localesDir.SetPath(wxStandardPaths::Get().GetDataDir() + _T("/locales")); + m_localesDir.SetPath(wxStandardPaths::Get().GetDataDir().ToStdWstring() + _T("/locales")); #endif if (!m_localesDir.empty()) { @@ -543,21 +539,31 @@ auto pLocale = std::make_unique(); wxLogNull log; pLocale->Init(language); - if (!pLocale->IsOk() || !pLocale->AddCatalog(_T("filezilla"))) { + if (!pLocale->IsOk()) { return false; } - // Now unload old locale - // We unload new locale as well, else the internal locale chain in wxWidgets get's broken. - pLocale.reset(); - m_pLocale.reset(); - - // Finally load new one - pLocale = std::make_unique(); - pLocale->Init(language); - if (!pLocale->IsOk() || !pLocale->AddCatalog(_T("filezilla"))) { + // Load catalog. Only fail if a non-default language has been selected + if (!pLocale->AddCatalog(_T("filezilla")) && language != wxLANGUAGE_DEFAULT) { return false; } + + if (m_pLocale) { + // Now unload old locale + // We unload new locale as well, else the internal locale chain in wxWidgets get's broken. + pLocale.reset(); + m_pLocale.reset(); + + // Finally load new one + pLocale = std::make_unique(); + pLocale->Init(language); + if (!pLocale->IsOk()) { + return false; + } + else if (!pLocale->AddCatalog(_T("filezilla")) && language != wxLANGUAGE_DEFAULT) { + return false; + } + } m_pLocale = std::move(pLocale); return true; @@ -565,16 +571,18 @@ int CFileZillaApp::GetCurrentLanguage() const { - if (!m_pLocale) + if (!m_pLocale) { return wxLANGUAGE_ENGLISH; + } return m_pLocale->GetLanguage(); } wxString CFileZillaApp::GetCurrentLanguageCode() const { - if (!m_pLocale) + if (!m_pLocale) { return wxString(); + } return m_pLocale->GetCanonicalName(); } @@ -588,8 +596,9 @@ void CFileZillaApp::DisplayEncodingWarning() { static bool displayedEncodingWarning = false; - if (displayedEncodingWarning) + if (displayedEncodingWarning) { return; + } displayedEncodingWarning = true; @@ -603,36 +612,50 @@ void CFileZillaApp::CheckExistsFzsftp() { - AddStartupProfileRecord(_T("CFileZillaApp::CheckExistsFzstp")); - // Get the correct path to the fzsftp executable + AddStartupProfileRecord("FileZillaApp::CheckExistsFzsftp"); + CheckExistsTool(L"fzsftp", {L"/src/putty", L"/putty"}, L"FZ_FZSFTP", OPTION_FZSFTP_EXECUTABLE, _("SFTP support")); +} + +#if ENABLE_STORJ +void CFileZillaApp::CheckExistsFzstorj() +{ + AddStartupProfileRecord("FileZillaApp::CheckExistsFzstorj"); + CheckExistsTool(L"fzstorj", {L"/src/storj", L"/storj"}, L"FZ_FZSTORJ", OPTION_FZSTORJ_EXECUTABLE, _("Storj support")); +} +#endif + +void CFileZillaApp::CheckExistsTool(std::wstring const& tool, std::vector const& searchPaths, std::wstring const& env, int setting, wxString const& description) +{ + // Get the correct path to the specified tool #ifdef __WXMAC__ wxString executable = wxStandardPaths::Get().GetExecutablePath(); int pos = executable.Find('/', true); - if (pos != -1) + if (pos != -1) { executable = executable.Left(pos); - executable += _T("/fzsftp"); - if (!wxFileName::FileExists(executable)) - { - wxMessageBoxEx(wxString::Format(_("%s could not be found. Without this component of FileZilla, SFTP will not work.\n\nPlease download FileZilla again. If this problem persists, please submit a bug report."), executable), + } + executable += _T("/") + tool; + if (!wxFileName::FileExists(executable.ToStdWstring())) { + wxMessageBoxEx(wxString::Format(_("%s could not be found. Without this component of FileZilla, %s will not work.\n\nPlease download FileZilla again. If this problem persists, please submit a bug report."), executable, description), _("File not found"), wxICON_ERROR); executable.clear(); } #else - wxString program = _T("fzsftp"); + wxString program = tool; #ifdef __WXMSW__ program += _T(".exe"); #endif bool found = false; - // First check the FZ_FZSFTP environment variable + // First check the given environment variable wxString executable; - if (wxGetEnv(_T("FZ_FZSFTP"), &executable)) { - if (wxFileName::FileExists(executable)) + if (wxGetEnv(env, &executable)) { + if (wxFileName::FileExists(executable.ToStdWstring())) { found = true; + } } if (!found) { @@ -659,12 +682,14 @@ // Add a few paths relative to the current working directory pathList.Add(cwd + _T("/bin")); - pathList.Add(cwd + _T("/src/putty")); - pathList.Add(cwd + _T("/putty")); + for (auto const& path : searchPaths) { + pathList.Add(cwd + path); + } executable = pathList.FindAbsoluteValidPath(program); - if (!executable.empty()) + if (!executable.empty()) { found = true; + } } #ifdef __UNIX__ @@ -690,22 +715,24 @@ wxPathList pathList; pathList.AddEnvList(_T("PATH")); executable = pathList.FindAbsoluteValidPath(program); - if (!executable.empty()) + if (!executable.empty()) { found = true; + } } if (!found) { // Quote path if it contains spaces - if (executable.Find(_T(" ")) != -1 && executable[0] != '"' && executable[0] != '\'') + if (executable.Find(_T(" ")) != -1 && executable[0] != '"' && executable[0] != '\'') { executable = _T("\"") + executable + _T("\""); + } - wxMessageBoxEx(wxString::Format(_("%s could not be found. Without this component of FileZilla, SFTP will not work.\n\nPossible solutions:\n- Make sure %s is in a directory listed in your PATH environment variable.\n- Set the full path to %s in the FZ_FZSFTP environment variable."), program, program, program), + wxMessageBoxEx(wxString::Format(_("%s could not be found. Without this component of FileZilla, %s will not work.\n\nPossible solutions:\n- Make sure %s is in a directory listed in your PATH environment variable.\n- Set the full path to %s in the %s environment variable."), program, description, program, program, env), _("File not found"), wxICON_ERROR | wxOK); executable.clear(); } #endif - COptions::Get()->SetOption(OPTION_FZSFTP_EXECUTABLE, executable); + COptions::Get()->SetOption(setting, executable.ToStdWstring()); } #ifdef __WXMSW__ @@ -722,7 +749,7 @@ int CFileZillaApp::ProcessCommandLine() { - AddStartupProfileRecord(_T("CFileZillaApp::ProcessCommandLine")); + AddStartupProfileRecord("CFileZillaApp::ProcessCommandLine"); m_pCommandLine = std::make_unique(argc, argv); int res = m_pCommandLine->Parse() ? 1 : -1; @@ -736,8 +763,9 @@ if (m_pCommandLine->HasSwitch(CCommandLine::version)) { wxString out = wxString::Format(_T("FileZilla %s"), CBuildInfo::GetVersion()); - if (!CBuildInfo::GetBuildType().empty()) + if (!CBuildInfo::GetBuildType().empty()) { out += _T(" ") + CBuildInfo::GetBuildType() + _T(" build"); + } out += _T(", compiled on ") + CBuildInfo::GetBuildDateString(); printf("%s\n", (const char*)out.mb_str()); @@ -748,36 +776,35 @@ return res; } -void CFileZillaApp::AddStartupProfileRecord(const wxString& msg) +void CFileZillaApp::AddStartupProfileRecord(std::string const& msg) { - if (!m_profilingActive) + if (!m_profile_start) { return; + } - m_startupProfile.push_back(std::make_pair(wxDateTime::UNow(), msg)); + m_startupProfile.emplace_back(fz::monotonic_clock::now(), msg); } void CFileZillaApp::ShowStartupProfile() { - m_profilingActive = false; - - std::list > profile; - profile.swap(m_startupProfile); + if (m_profile_start && m_pCommandLine && m_pCommandLine->HasSwitch(CCommandLine::debug_startup)) { + wxString msg = _T("Profile:\n"); + for (auto const& p : m_startupProfile) { + auto const diff = p.first - m_profile_start; - if (m_pCommandLine && !m_pCommandLine->HasSwitch(CCommandLine::debug_startup)) - return; - - wxString msg = _T("Profile:\n"); - for (auto const& p : profile) { - msg += p.first.Format(_T("%Y-%m-%d %H:%M:%S %l")); - msg += _T(" "); - msg += p.second; - msg += _T("\n"); + msg += std::to_wstring(diff.get_milliseconds()); + msg += _T(" "); + msg += fz::to_wstring(p.second); + msg += _T("\n"); + } + wxMessageBoxEx(msg); } - wxMessageBoxEx(msg); + m_profile_start = fz::monotonic_clock(); + m_startupProfile.clear(); } -wxString CFileZillaApp::GetSettingsFile(wxString const& name) const +std::wstring CFileZillaApp::GetSettingsFile(std::wstring const& name) const { return COptions::Get()->GetOption(OPTION_DEFAULT_SETTINGSDIR) + name + _T(".xml"); } diff -Nru filezilla-3.15.0.2/src/interface/filezilla.h filezilla-3.33.0/src/interface/filezilla.h --- filezilla-3.15.0.2/src/interface/filezilla.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filezilla.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,8 +1,9 @@ -#ifndef __FILEZILLA_H__ -#define __FILEZILLA_H__ +#ifndef FILEZILLA_INTERFACE_FILEZILLA_HEADER +#define FILEZILLA_INTERFACE_FILEZILLA_HEADER #include -#include + +#include "msgbox.h" #ifndef PACKAGE_NAME #define PACKAGE_NAME "FileZilla" @@ -74,4 +75,6 @@ #include #include +#include + #endif diff -Nru filezilla-3.15.0.2/src/interface/filter_conditions_dialog.cpp filezilla-3.33.0/src/interface/filter_conditions_dialog.cpp --- filezilla-3.15.0.2/src/interface/filter_conditions_dialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filter_conditions_dialog.cpp 2017-01-09 16:00:55.000000000 +0000 @@ -10,7 +10,7 @@ static wxArrayString attributeSetTypes; static wxArrayString dateConditionTypes; -static wxChoice* CreateChoice(wxWindow* parent, wxPoint pos, const wxArrayString& items, wxSize const& size = wxDefaultSize) +static std::unique_ptr CreateChoice(wxWindow* parent, const wxArrayString& items, wxSize const& size = wxDefaultSize) { #ifdef __WXGTK__ // Really obscure bug in wxGTK: If creating in a single step, @@ -18,49 +18,26 @@ // even though it can still be selected and returns to looking // normal after hovering mouse over it. // This works around it nicely. - wxChoice *ret( new wxChoice ); - ret->Create(parent, wxID_ANY, pos, size); + auto ret = std::make_unique(); + ret->Create(parent, wxID_ANY, wxDefaultPosition, size); ret->Append(items); ret->InvalidateBestSize(); ret->SetInitialSize(); return ret; #else - return new wxChoice(parent, wxID_ANY, pos, size, items); + return std::make_unique(parent, wxID_ANY, wxDefaultPosition, size, items); #endif } CFilterControls::CFilterControls() { - pType = 0; - pCondition = 0; - pValue = 0; - pSet = 0; - pLabel = 0; - pRemove = 0; -} - -void CFilterControls::Reset() -{ - delete pType; - delete pCondition; - delete pValue; - delete pSet; - delete pLabel; - delete pRemove; - - pType = 0; - pCondition = 0; - pValue = 0; - pSet = 0; - pLabel = 0; - pRemove = 0; + sizer = std::make_unique(wxHORIZONTAL); } BEGIN_EVENT_TABLE(CFilterConditionsDialog, wxDialogEx) EVT_BUTTON(wxID_ANY, CFilterConditionsDialog::OnButton) EVT_CHOICE(wxID_ANY, CFilterConditionsDialog::OnFilterTypeChange) EVT_LISTBOX(wxID_ANY, CFilterConditionsDialog::OnConditionSelectionChange) -EVT_NAVIGATION_KEY(CFilterConditionsDialog::OnNavigationKeyEvent) END_EVENT_TABLE() CFilterConditionsDialog::CFilterConditionsDialog() @@ -68,25 +45,20 @@ m_choiceBoxHeight = 0; m_pListCtrl = 0; m_has_foreign_type = false; - m_pAdd = 0; m_button_size = wxSize(-1, -1); } -bool CFilterConditionsDialog::CreateListControl(int conditions /*=common*/) +bool CFilterConditionsDialog::CreateListControl(int conditions) { - wxScrolledWindow* wnd = XRCCTRL(*this, "ID_CONDITIONS", wxScrolledWindow); - if (!wnd) - return false; - - m_pListCtrl = new wxCustomHeightListCtrl(this, wxID_ANY, wxDefaultPosition, wnd->GetSize(), wxVSCROLL|wxSUNKEN_BORDER|wxTAB_TRAVERSAL); - if (!m_pListCtrl) + m_pListCtrl = XRCCTRL(*this, "ID_CONDITIONS", wxCustomHeightListCtrl); + if (!m_pListCtrl) { return false; + } m_pListCtrl->AllowSelection(false); - ReplaceControl(wnd, m_pListCtrl); + CalcMinListWidth(); - if (stringConditionTypes.empty()) - { + if (stringConditionTypes.empty()) { stringConditionTypes.Add(_("contains")); stringConditionTypes.Add(_("is equal to")); stringConditionTypes.Add(_("begins with")); @@ -125,43 +97,33 @@ dateConditionTypes.Add(_("after")); } - if (conditions & filter_name) - { + if (conditions & filter_name) { filterTypes.Add(_("Filename")); filter_type_map.push_back(filter_name); } - if (conditions & filter_size) - { + if (conditions & filter_size) { filterTypes.Add(_("Filesize")); filter_type_map.push_back(filter_size); } - if (conditions & filter_attributes) - { + if (conditions & filter_attributes) { filterTypes.Add(_("Attribute")); filter_type_map.push_back(filter_attributes); } - if (conditions & filter_permissions) - { + if (conditions & filter_permissions) { filterTypes.Add(_("Permission")); filter_type_map.push_back(filter_permissions); } - if (conditions & filter_path) - { + if (conditions & filter_path) { filterTypes.Add(_("Path")); filter_type_map.push_back(filter_path); } - if (conditions & filter_date) - { + if (conditions & filter_date) { filterTypes.Add(_("Date")); filter_type_map.push_back(filter_date); } SetFilterCtrlState(true); - m_pListCtrl->Connect(wxEVT_SIZE, wxSizeEventHandler(CFilterConditionsDialog::OnListSize), 0, this); - - m_pListCtrl->MoveAfterInTabOrder(XRCCTRL(*this, "ID_MATCHTYPE", wxChoice)); - return true; } @@ -199,8 +161,9 @@ t_filterType CFilterConditionsDialog::GetTypeFromTypeSelection(int selection) { - if (selection < 0 || selection > (int)filter_type_map.size()) + if (selection < 0 || selection >(int)filter_type_map.size()) { selection = 0; + } return filter_type_map[selection]; } @@ -214,154 +177,81 @@ } } - pChoice->SetSelection(0); + pChoice->SetSelection(0); } void CFilterConditionsDialog::OnMore() { - wxPoint pos = m_pAdd->GetPosition(); - pos.y += m_choiceBoxHeight + 6; - m_pAdd->SetPosition(pos); - CFilterCondition cond; m_currentFilter.filters.push_back(cond); - MakeControls(cond); + size_t newRowIndex = m_filterControls.size() - 1; - CFilterControls& controls = m_filterControls.back(); - m_pAdd->MoveAfterInTabOrder(controls.pSet ? (wxWindow*)controls.pSet : (wxWindow*)controls.pValue); + m_filterControls.insert(m_filterControls.begin() + newRowIndex, CFilterControls()); + MakeControls(cond, newRowIndex); - m_pListCtrl->SetLineCount(m_filterControls.size() + 1); - UpdateConditionsClientSize(); -} + CFilterControls& controls = m_filterControls[newRowIndex]; + if (m_filterControls.back().pRemove) { + m_filterControls.back().pRemove->MoveAfterInTabOrder(controls.pRemove.get()); + } -void CFilterConditionsDialog::OnRemove(int item) -{ - std::set selected; - selected.insert(item); - OnRemove(selected); - if (m_filterControls.empty()) - OnMore(); + m_pListCtrl->InsertRow(m_filterControls[newRowIndex].sizer.get(), newRowIndex); } -void CFilterConditionsDialog::OnRemove(const std::set &selected) +void CFilterConditionsDialog::OnRemove(size_t item) { - int delta_y = 0; - - m_pListCtrl->SetLineCount(m_filterControls.size() - selected.size() + 1); - - std::vector filterControls = m_filterControls; - m_filterControls.clear(); - - std::vector filters = m_currentFilter.filters; - m_currentFilter.filters.clear(); - - for (unsigned int i = 0; i < filterControls.size(); ++i) { - CFilterControls& controls = filterControls[i]; - if (selected.find(i) == selected.end()) { - m_filterControls.push_back(controls); - m_currentFilter.filters.push_back(filters[i]); - - // Reposition controls - wxPoint pos; - - pos = controls.pType->GetPosition(); - pos.y -= delta_y; - controls.pType->SetPosition(pos); - - pos = controls.pCondition->GetPosition(); - pos.y -= delta_y; - controls.pCondition->SetPosition(pos); - - if (controls.pValue) { - pos = controls.pValue->GetPosition(); - pos.y -= delta_y; - controls.pValue->SetPosition(pos); - } - if (controls.pSet) { - pos = controls.pSet->GetPosition(); - pos.y -= delta_y; - controls.pSet->SetPosition(pos); - } - if (controls.pLabel) { - pos = controls.pLabel->GetPosition(); - pos.y -= delta_y; - controls.pLabel->SetPosition(pos); - } - - pos = controls.pRemove->GetPosition(); - pos.y -= delta_y; - controls.pRemove->SetPosition(pos); - } - else { - controls.Reset(); - delta_y += m_choiceBoxHeight + 6; - } + if (item + 1 >= m_filterControls.size()) { + return; } - wxPoint pos = m_pAdd->GetPosition(); - pos.y -= delta_y; - m_pAdd->SetPosition(pos); + m_pListCtrl->DeleteRow(item); + m_filterControls.erase(m_filterControls.begin() + item); + m_currentFilter.filters.erase(m_currentFilter.filters.begin() + item); - m_pListCtrl->ClearSelection(); - UpdateConditionsClientSize(); - - SetFilterCtrlState(false); + if (m_currentFilter.filters.empty()) { + OnMore(); + } } void CFilterConditionsDialog::OnFilterTypeChange(wxCommandEvent& event) { - int item; - for (item = 0; item < (int)m_filterControls.size(); ++item) { - if (!m_filterControls[item].pType || m_filterControls[item].pType->GetId() != event.GetId()) - continue; - - break; + size_t item; + for (item = 0; item < m_filterControls.size(); ++item) { + if (m_filterControls[item].pType && m_filterControls[item].pType->GetId() == event.GetId()) { + break; + } } - if (item == (int)m_filterControls.size()) + if (item == m_filterControls.size()) { return; + } CFilterCondition& filter = m_currentFilter.filters[item]; t_filterType type = GetTypeFromTypeSelection(event.GetSelection()); - if (type == filter.type) + if (type == filter.type) { return; + } filter.type = type; - if (filter.type == filter_size && filter.condition > 3) + if (filter.type == filter_size && filter.condition > 3) { filter.condition = 0; - else if (filter.type == filter_date && filter.condition > 3) + } + else if (filter.type == filter_date && filter.condition > 3) { filter.condition = 0; - delete m_filterControls[item].pCondition; - m_filterControls[item].pCondition = 0; + } - MakeControls(filter, item); + UpdateControls(filter, item); } -void CFilterConditionsDialog::MakeControls(const CFilterCondition& condition, int i /*=-1*/) +void CFilterConditionsDialog::MakeControls(CFilterCondition const& condition, size_t i) { - wxRect client_size = m_pListCtrl->GetClientSize(); - - if (i == -1) { - i = m_filterControls.size(); - CFilterControls controls; - m_filterControls.push_back(controls); - } CFilterControls& controls = m_filterControls[i]; - // Get correct coordinates - int posy = i * (m_choiceBoxHeight + 6) + 3; - int posx = 0, x, y; - m_pListCtrl->CalcScrolledPosition(posx, posy, &x, &y); - posy = y; - - wxPoint pos = wxPoint(5, posy); - if (!controls.pType) - controls.pType = CreateChoice(m_pListCtrl, pos, filterTypes); - else - controls.pType->SetPosition(pos); - SetSelectionFromType(controls.pType, condition.type); - wxRect typeRect = controls.pType->GetSize(); + if (!controls.pType) { + controls.pType = CreateChoice(m_pListCtrl, wxArrayString()); + controls.pType->Set(filterTypes); + controls.sizer->Add(controls.pType.get(), 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 5); + } if (!m_choiceBoxHeight) { wxSize size = controls.pType->GetSize(); @@ -369,192 +259,116 @@ m_pListCtrl->SetLineHeight(m_choiceBoxHeight + 6); } - pos = wxPoint(10 + typeRect.GetWidth(), posy); if (!controls.pCondition) { - switch (condition.type) - { - case filter_name: - case filter_path: - controls.pCondition = CreateChoice(m_pListCtrl, pos, stringConditionTypes); - break; - case filter_size: - controls.pCondition = CreateChoice(m_pListCtrl, pos, sizeConditionTypes); - break; - case filter_attributes: - controls.pCondition = CreateChoice(m_pListCtrl, pos, attributeConditionTypes); - break; - case filter_permissions: - controls.pCondition = CreateChoice(m_pListCtrl, pos, permissionConditionTypes); - break; - case filter_date: - controls.pCondition = CreateChoice(m_pListCtrl, pos, dateConditionTypes); - break; - default: - wxFAIL_MSG(_T("Unhandled condition")); - return; - } - if (controls.pCondition && controls.pType) { - controls.pCondition->MoveAfterInTabOrder(controls.pType); - } + controls.pCondition = CreateChoice(m_pListCtrl, wxArrayString()); + controls.sizer->Add(controls.pCondition.get(), 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 5); } - else - controls.pCondition->SetPosition(pos); - controls.pCondition->Select(condition.condition); - wxRect conditionsRect = controls.pCondition->GetSize(); + if (!controls.pValue) { + controls.pValue = std::make_unique(); + controls.pValue->Create(m_pListCtrl, wxID_ANY, _T("")); + controls.pValue->Hide(); + controls.sizer->Add(controls.pValue.get(), 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 5); + } + + if (!controls.pSet) { + controls.pSet = CreateChoice(m_pListCtrl, wxArrayString()); + controls.pSet->Set(attributeSetTypes); + controls.pSet->Hide(); + controls.sizer->Add(controls.pSet.get(), 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 5); + } + + if (!controls.pLabel) { + controls.pLabel = std::make_unique(); + controls.pLabel->Hide(); + controls.pLabel->Create(m_pListCtrl, wxID_ANY, _("bytes"), wxDefaultPosition, m_size_label_size); + controls.sizer->Add(controls.pLabel.get(), 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 5); + } if (!controls.pRemove) { - controls.pRemove = new wxButton(m_pListCtrl, wxID_ANY, _T("-"), wxPoint(client_size.GetWidth() - 5 - m_button_size.x, posy), m_button_size, wxBU_EXACTFIT); + controls.pRemove = std::make_unique(m_pListCtrl, wxID_ANY, _T("-"), wxDefaultPosition, m_button_size, wxBU_EXACTFIT); if (m_button_size.x <= 0) { m_button_size.x = wxMax(m_choiceBoxHeight, controls.pRemove->GetSize().x); m_button_size.y = m_choiceBoxHeight; controls.pRemove->SetSize(m_button_size); - controls.pRemove->SetPosition(wxPoint(client_size.GetWidth() - 5 - m_button_size.x, posy)); } - controls.pRemove->MoveAfterInTabOrder(controls.pCondition); + controls.sizer->Add(controls.pRemove.get(), 0, wxALIGN_CENTER_VERTICAL | wxFIXED_MINSIZE | wxLEFT | wxRIGHT, 5); } - else - controls.pRemove->SetPosition(wxPoint(client_size.GetWidth() - 5 - m_button_size.x, posy)); - - posx = 15 + typeRect.GetWidth() + conditionsRect.GetWidth(); - int maxwidth = client_size.GetWidth() - posx - 10 - m_button_size.x; - if (condition.type == filter_name || condition.type == filter_size || condition.type == filter_path || condition.type == filter_date) { - delete controls.pSet; - controls.pSet = 0; - - if (condition.type == filter_size) { - // Label needs to be aligned - int size_posy = posy; - if (conditionsRect.GetHeight() > m_size_label_size.GetHeight()) - size_posy += (conditionsRect.GetHeight() - m_size_label_size.GetHeight()) / 2; - maxwidth -= m_size_label_size.GetWidth() + 5; - if (!controls.pLabel) - controls.pLabel = new wxStaticText(m_pListCtrl, wxID_ANY, _("bytes"), wxPoint(posx + maxwidth + 5, size_posy), m_size_label_size); - else { - controls.pLabel->SetPosition(wxPoint(posx + maxwidth + 5, size_posy)); - controls.pLabel->SetSize(m_size_label_size); - } - } - else { - delete controls.pLabel; - controls.pLabel = 0; - } - - pos = wxPoint(posx, posy); - wxSize size(maxwidth, -1); - if (!controls.pValue) { - controls.pValue = new wxTextCtrlEx(); - controls.pValue->Create(m_pListCtrl, wxID_ANY, _T(""), pos, size); - } - else { - controls.pValue->SetPosition(pos); - controls.pValue->SetSize(size); - } - controls.pValue->SetValue(condition.strValue); - - // Need to explicitely set min size, otherwise initial size becomes min size - controls.pValue->SetMinSize(wxSize(20, -1)); - controls.pValue->MoveBeforeInTabOrder(controls.pRemove); - } - else { - delete controls.pValue; - controls.pValue = 0; - delete controls.pLabel; - controls.pLabel = 0; - - pos = wxPoint(posx, posy); - wxSize size(maxwidth, -1); - if (!controls.pSet) - controls.pSet = CreateChoice(m_pListCtrl, pos, attributeSetTypes, size); - else { - controls.pSet->SetPosition(pos); - controls.pSet->SetSize(size); - } - controls.pSet->Select(condition.strValue != _T("0") ? 0 : 1); - - // Need to explicitely set min size, otherwise initial size becomes min size - controls.pSet->SetMinSize(wxSize(20, -1)); - controls.pSet->MoveBeforeInTabOrder(controls.pRemove); - } + UpdateControls(condition, i); } -void CFilterConditionsDialog::DestroyControls() +void CFilterConditionsDialog::UpdateControls(CFilterCondition const& condition, size_t i) { - for (unsigned int i = 0; i < m_filterControls.size(); ++i) { - CFilterControls& controls = m_filterControls[i]; - controls.Reset(); - } - m_filterControls.clear(); -} + CFilterControls& controls = m_filterControls[i]; -void CFilterConditionsDialog::UpdateConditionsClientSize() -{ - wxSize newSize = m_pListCtrl->GetClientSize(); + SetSelectionFromType(controls.pType.get(), condition.type); - if (m_lastListSize.GetWidth() == newSize.GetWidth()) + switch (condition.type) + { + case filter_name: + case filter_path: + controls.pCondition->Set(stringConditionTypes); + break; + case filter_size: + controls.pCondition->Set(sizeConditionTypes); + break; + case filter_attributes: + controls.pCondition->Set(attributeConditionTypes); + break; + case filter_permissions: + controls.pCondition->Set(permissionConditionTypes); + break; + case filter_date: + controls.pCondition->Set(dateConditionTypes); + break; + default: + wxFAIL_MSG(_T("Unhandled condition")); return; + } + controls.pCondition->Select(condition.condition); - int deltaX = newSize.GetWidth() - m_lastListSize.GetWidth(); - m_lastListSize = newSize; - - // Resize text fields - for (unsigned int i = 0; i < m_filterControls.size(); ++i) { - CFilterControls& controls = m_filterControls[i]; - if (!controls.pValue) - continue; - - wxSize size = controls.pValue->GetSize(); - size.SetWidth(size.GetWidth() + deltaX); - controls.pValue->SetSize(size); + controls.pValue->SetValue(condition.strValue); + controls.pSet->Select(condition.strValue != _T("0") ? 0 : 1); - wxPoint pos = controls.pRemove->GetPosition(); - pos.x += deltaX; - controls.pRemove->SetPosition(pos); + controls.pValue->Show(condition.type == filter_name || condition.type == filter_size || condition.type == filter_path || condition.type == filter_date); + controls.pSet->Show(!controls.pValue->IsShown()); + controls.pLabel->Show(condition.type == filter_size); - if (controls.pLabel) { - wxPoint labelPos = controls.pLabel->GetPosition(); - labelPos.x += deltaX; - controls.pLabel->SetPosition(labelPos); - } - } + controls.sizer->Layout(); +} - // Move add button - if (m_pAdd) { - wxPoint pos = m_pAdd->GetPosition(); - pos.x += deltaX; - m_pAdd->SetPosition(pos); - } +void CFilterConditionsDialog::DestroyControls() +{ + m_pListCtrl->ClearRows(); + m_filterControls.clear(); } -void CFilterConditionsDialog::EditFilter(const CFilter& filter) +void CFilterConditionsDialog::EditFilter(CFilter const& filter) { DestroyControls(); // Create new controls m_currentFilter = filter; - if (m_currentFilter.filters.empty()) + if (m_currentFilter.filters.empty()) { m_currentFilter.filters.push_back(CFilterCondition()); + } + m_filterControls.resize(m_currentFilter.filters.size() + 1); for (unsigned int i = 0; i < m_currentFilter.filters.size(); ++i) { const CFilterCondition& cond = m_currentFilter.filters[i]; - MakeControls(cond); + MakeControls(cond, i); + m_pListCtrl->InsertRow(m_filterControls[i].sizer.get(), i); } - // Get correct coordinates - wxSize client_size = m_pListCtrl->GetClientSize(); - wxPoint pos; - m_pListCtrl->CalcScrolledPosition(client_size.GetWidth() - 5 - m_button_size.x, (m_choiceBoxHeight + 6) * m_filterControls.size() + 3, &pos.x, &pos.y); - - if (!m_pAdd) - m_pAdd = new wxButton(m_pListCtrl, wxID_ANY, _T("+"), pos, m_button_size); - else - m_pAdd->SetPosition(pos); + CFilterControls & controls = m_filterControls.back(); + controls.pRemove = std::make_unique(m_pListCtrl, wxID_ANY, _T("+"), wxDefaultPosition, m_button_size); + controls.sizer->AddStretchSpacer(); + controls.sizer->Add(controls.pRemove.get(), 0, wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE|wxRIGHT, 5); - m_pListCtrl->SetLineCount(m_filterControls.size() + 1); - UpdateConditionsClientSize(); + m_pListCtrl->InsertRow(controls.sizer.get(), m_filterControls.size() - 1); XRCCTRL(*this, "ID_MATCHTYPE", wxChoice)->SetSelection(filter.matchType); @@ -563,12 +377,12 @@ CFilter CFilterConditionsDialog::GetFilter() { - wxASSERT(m_filterControls.size() == m_currentFilter.filters.size()); + wxASSERT(m_filterControls.size() >= m_currentFilter.filters.size()); CFilter filter; - for (unsigned int i = 0; i < m_currentFilter.filters.size(); ++i) { + for (size_t i = 0; i < m_currentFilter.filters.size(); ++i) { CFilterControls const& controls = m_filterControls[i]; - if (!controls.pType || !controls.pCondition || !controls.pValue) { + if (!controls.pType || !controls.pCondition) { continue; } CFilterCondition condition = m_currentFilter.filters[i]; @@ -580,14 +394,16 @@ { case filter_name: case filter_path: - if (controls.pValue->GetValue().empty()) + if (!controls.pValue || controls.pValue->GetValue().empty()) { continue; + } condition.strValue = controls.pValue->GetValue(); break; case filter_size: { - if (controls.pValue->GetValue().empty()) + if (!controls.pValue || controls.pValue->GetValue().empty()) { continue; + } condition.strValue = controls.pValue->GetValue(); unsigned long long tmp; condition.strValue.ToULongLong(&tmp); @@ -596,7 +412,10 @@ break; case filter_attributes: case filter_permissions: - if (controls.pSet->GetSelection()) { + if (!controls.pSet) { + continue; + } + else if (controls.pSet->GetSelection()) { condition.strValue = _T("0"); condition.value = 0; } @@ -606,12 +425,13 @@ } break; case filter_date: - if (controls.pValue->GetValue().empty()) + if (!controls.pValue || controls.pValue->GetValue().empty()) { continue; + } else { condition.strValue = controls.pValue->GetValue(); condition.date = fz::datetime(condition.strValue.ToStdWstring(), fz::datetime::local); - if (!condition.date.empty()) { + if (condition.date.empty()) { continue; } } @@ -634,6 +454,9 @@ case 2: filter.matchType = CFilter::none; break; + case 3: + filter.matchType = CFilter::not_all; + break; default: filter.matchType = CFilter::all; break; @@ -642,12 +465,10 @@ return filter; } -void CFilterConditionsDialog::ClearFilter(bool disable) +void CFilterConditionsDialog::ClearFilter() { DestroyControls(); - m_pListCtrl->SetLineCount(0); - - SetFilterCtrlState(disable); + SetFilterCtrlState(true); } void CFilterConditionsDialog::SetFilterCtrlState(bool disable) @@ -657,61 +478,77 @@ XRCCTRL(*this, "ID_MATCHTYPE", wxChoice)->Enable(!disable); } -bool CFilterConditionsDialog::ValidateFilter(wxString& error, bool allow_empty /*=false*/) +bool CFilterConditionsDialog::ValidateFilter(wxString& error, bool allow_empty) { - const unsigned int size = m_currentFilter.filters.size(); + size_t const size = m_currentFilter.filters.size(); if (!size) { - if (allow_empty) + if (allow_empty) { return true; + } error = _("Each filter needs at least one condition."); return false; } - wxASSERT(m_filterControls.size() == m_currentFilter.filters.size()); + wxASSERT(m_filterControls.size() >= m_currentFilter.filters.size()); for (unsigned int i = 0; i < size; ++i) { const CFilterControls& controls = m_filterControls[i]; - enum t_filterType type = GetTypeFromTypeSelection(controls.pType->GetSelection()); + t_filterType type = GetTypeFromTypeSelection(controls.pType->GetSelection()); + int condition = controls.pCondition ? controls.pCondition->GetSelection() : 0; if (!controls.pValue) { continue; } - if ((type == filter_name || type == filter_path) && (!controls.pValue || controls.pValue->GetValue().empty())) { - if (allow_empty) - continue; + if (type == filter_name || type == filter_path) { + if (!controls.pValue || controls.pValue->GetValue().empty()) { + if (allow_empty) { + continue; + } - m_pListCtrl->SelectLine(i); - controls.pValue->SetFocus(); - error = _("At least one filter condition is incomplete"); - SetFilterCtrlState(false); - return false; + m_pListCtrl->SelectLine(i); + controls.pValue->SetFocus(); + error = _("At least one filter condition is incomplete"); + return false; + } + + if (condition == 4) { + try { + std::wregex(controls.pValue->GetValue().ToStdWstring()); + } + catch (std::regex_error const&) { + m_pListCtrl->SelectLine(i); + controls.pValue->SetFocus(); + error = _("Invalid regular expression"); + return false; + } + } } else if (type == filter_size) { const wxString v = controls.pValue->GetValue(); - if (v.empty() && allow_empty) + if (v.empty() && allow_empty) { continue; + } long long number; if (!v.ToLongLong(&number) || number < 0) { m_pListCtrl->SelectLine(i); controls.pValue->SetFocus(); error = _("Invalid size in condition"); - SetFilterCtrlState(false); return false; } } else if (type == filter_date) { - const wxString d = controls.pValue->GetValue(); - if (d.empty() && allow_empty) + wxString const d = controls.pValue->GetValue(); + if (d.empty() && allow_empty) { continue; + } - wxDateTime date; - if (!date.ParseFormat(d, _T("%Y-%m-%d")) || !date.IsValid()) { + fz::datetime date(d.ToStdWstring(), fz::datetime::local); + if (date.empty()) { m_pListCtrl->SelectLine(i); controls.pValue->SetFocus(); error = _("Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."); - SetFilterCtrlState(false); return false; } } @@ -722,103 +559,23 @@ void CFilterConditionsDialog::OnConditionSelectionChange(wxCommandEvent& event) { - if (event.GetId() != m_pListCtrl->GetId()) + if (event.GetId() != m_pListCtrl->GetId()) { return; - - SetFilterCtrlState(false); + } } void CFilterConditionsDialog::OnButton(wxCommandEvent& event) { - if (event.GetId() == m_pAdd->GetId()) { - OnMore(); - return; - } - - for (int i = 0; i < (int)m_filterControls.size(); ++i) { + for (size_t i = 0; i < m_filterControls.size(); ++i) { if (m_filterControls[i].pRemove->GetId() == event.GetId()) { - OnRemove(i); - return; - } - } - event.Skip(); -} - -void CFilterConditionsDialog::OnListSize(wxSizeEvent& event) -{ - UpdateConditionsClientSize(); - event.Skip(); -} - -void CFilterConditionsDialog::OnNavigationKeyEvent(wxNavigationKeyEvent& event) -{ - wxWindow* source = FindFocus(); - if (!source) - { - event.Skip(); - return; - } - - wxWindow* target = 0; - - if (event.GetDirection()) { - for (int i = 0; i < (int)m_filterControls.size(); ++i) { - if (m_filterControls[i].pType == source) { - target = m_filterControls[i].pCondition; - break; - } - if (m_filterControls[i].pCondition == source) { - target = m_filterControls[i].pValue; - if (!target) - target = m_filterControls[i].pSet; - break; - } - if (m_filterControls[i].pSet == source || m_filterControls[i].pValue == source) { - target = m_filterControls[i].pRemove; - break; - } - if (m_filterControls[i].pRemove == source) { - int j = i + 1; - if (j == (int)m_filterControls.size()) - target = m_pAdd; - else - target = m_filterControls[j].pType; - break; + if (i + 1 == m_filterControls.size()) { + OnMore(); } - } - } - else { - if (source == m_pAdd) { - if (!m_filterControls.empty()) - target = m_filterControls[m_filterControls.size() - 1].pRemove; - } - else { - for (int i = 0; i < (int)m_filterControls.size(); ++i) { - if (m_filterControls[i].pType == source) { - if (i > 0) - target = m_filterControls[i - 1].pRemove; - break; - } - if (m_filterControls[i].pCondition == source) { - target = m_filterControls[i].pType; - break; - } - if (m_filterControls[i].pSet == source || m_filterControls[i].pValue == source) { - target = m_filterControls[i].pCondition; - break; - } - if (m_filterControls[i].pRemove == source) { - target = m_filterControls[i].pValue; - if (!target) - target = m_filterControls[i].pSet; - break; - } + else { + OnRemove(i); } + return; } } - - if (target) - target->SetFocus(); - else - event.Skip(); + event.Skip(); } diff -Nru filezilla-3.15.0.2/src/interface/filter_conditions_dialog.h filezilla-3.33.0/src/interface/filter_conditions_dialog.h --- filezilla-3.15.0.2/src/interface/filter_conditions_dialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filter_conditions_dialog.h 2016-11-03 16:52:04.000000000 +0000 @@ -1,23 +1,22 @@ -#ifndef __FILTER_CONDITIONS_DIALOG_H__ -#define __FILTER_CONDITIONS_DIALOG_H__ +#ifndef FILEZILLA_INTERFACE_CONDITIONS_DIALOG_HEADER +#define FILEZILLA_INTERFACE_CONDITIONS_DIALOG_HEADER #include "dialogex.h" #include "filter.h" #include -class CFilterControls +class CFilterControls final { public: CFilterControls(); - void Reset(); - - wxChoice* pType; - wxChoice* pCondition; - wxTextCtrl* pValue; - wxChoice* pSet; - wxStaticText* pLabel; - wxButton* pRemove; + std::unique_ptr sizer; + std::unique_ptr pType; + std::unique_ptr pCondition; + std::unique_ptr pValue; + std::unique_ptr pSet; + std::unique_ptr pLabel; + std::unique_ptr pRemove; }; class wxCustomHeightListCtrl; @@ -30,20 +29,21 @@ // has_foreign_type for attributes on *nix, permissions on MSW bool CreateListControl(int conditions); - void EditFilter(const CFilter& filter); + void EditFilter(CFilter const& filter); CFilter GetFilter(); - void ClearFilter(bool disable); + void ClearFilter(); bool ValidateFilter(wxString& error, bool allow_empty = false); private: void CalcMinListWidth(); - enum t_filterType GetTypeFromTypeSelection(int selection); - void SetSelectionFromType(wxChoice* pChoice, enum t_filterType); + t_filterType GetTypeFromTypeSelection(int selection); + void SetSelectionFromType(wxChoice* pChoice, t_filterType); + + void MakeControls(CFilterCondition const& condition, size_t i); + void UpdateControls(CFilterCondition const& condition, size_t i); - void MakeControls(const CFilterCondition& condition, int i = -1); void DestroyControls(); - void UpdateConditionsClientSize(); void SetFilterCtrlState(bool disable); @@ -60,21 +60,16 @@ wxArrayString filterTypes; std::vector filter_type_map; - wxButton* m_pAdd; wxSize m_button_size; wxSize m_size_label_size; void OnMore(); - void OnRemove(int item); - void OnRemove(const std::set &selected); - - void OnListSize(wxSizeEvent& event); + void OnRemove(size_t item); DECLARE_EVENT_TABLE() void OnButton(wxCommandEvent& event); void OnFilterTypeChange(wxCommandEvent& event); void OnConditionSelectionChange(wxCommandEvent& event); - void OnNavigationKeyEvent(wxNavigationKeyEvent& event); }; -#endif //__FILTER_CONDITIONS_DIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/filter.cpp filezilla-3.33.0/src/interface/filter.cpp --- filezilla-3.15.0.2/src/interface/filter.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filter.cpp 2017-10-25 17:12:23.000000000 +0000 @@ -11,7 +11,7 @@ #include -#include +#include bool CFilterManager::m_loaded = false; std::vector CFilterManager::m_globalFilters; @@ -36,6 +36,11 @@ EVT_BUTTON(XRCID("ID_REMOTE_DISABLEALL"), CFilterDialog::OnChangeAll) END_EVENT_TABLE() +namespace { +std::array matchTypeXmlNames = + { L"All", L"Any", L"None", L"Not all" }; +} + CFilterCondition::CFilterCondition() { type = filter_name; @@ -44,26 +49,30 @@ value = 0; } -CFilter::CFilter() +bool CFilterCondition::CompileRegex() { - matchType = all; - filterDirs = true; - filterFiles = true; - - // Filenames on Windows ignore case -#ifdef __WXMSW__ - matchCase = false; -#else - matchCase = true; -#endif + pRegEx.reset(); + if ((type == filter_name || type == filter_path) && condition == 4) { + try { + auto flags = std::regex_constants::ECMAScript; + if (!matchCase) { + flags |= std::regex_constants::icase; + } + pRegEx = std::make_shared(strValue.ToStdWstring(), flags); + } + catch (std::regex_error const&) { + return false; + } + } + return true; } -bool CFilter::HasConditionOfType(enum t_filterType type) const +bool CFilter::HasConditionOfType(t_filterType type) const { - for (std::vector::const_iterator iter = filters.begin(); iter != filters.end(); ++iter) - { - if (iter->type == type) + for (std::vector::const_iterator iter = filters.begin(); iter != filters.end(); ++iter) { + if (iter->type == type) { return true; + } } return false; @@ -75,9 +84,7 @@ } CFilterDialog::CFilterDialog() - : m_shiftClick() - , m_pMainFrame() - , m_filters(m_globalFilters) + : m_filters(m_globalFilters) , m_filterSets(m_globalFilterSets) , m_currentFilterSet(m_globalCurrentFilterSet) { @@ -87,8 +94,9 @@ { m_pMainFrame = parent; - if (!Load(parent, _T("ID_FILTER"))) + if (!Load(parent, _T("ID_FILTER"))) { return false; + } XRCCTRL(*this, "ID_LOCALFILTERS", wxCheckListBox)->Connect(wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(CFilterDialog::OnMouseEvent), 0, this); XRCCTRL(*this, "ID_LOCALFILTERS", wxCheckListBox)->Connect(wxID_ANY, wxEVT_KEY_DOWN, wxKeyEventHandler(CFilterDialog::OnKeyEvent), 0, this); @@ -100,8 +108,9 @@ wxChoice* pChoice = XRCCTRL(*this, "ID_SETS", wxChoice); wxString name = _("Custom filter set"); pChoice->Append(_T("<") + name + _T(">")); - for (unsigned int i = 1; i < m_filterSets.size(); i++) + for (size_t i = 1; i < m_filterSets.size(); ++i) { pChoice->Append(m_filterSets[i].name); + } pChoice->SetSelection(m_currentFilterSet); SetCtrlState(); @@ -118,6 +127,7 @@ m_globalCurrentFilterSet = m_currentFilterSet; SaveFilters(); + m_filters_disabled = false; CContextManager::Get()->NotifyAllHandlers(STATECHANGE_APPLYFILTER); @@ -134,11 +144,13 @@ void CFilterDialog::OnEdit(wxCommandEvent&) { CFilterEditDialog dlg; - if (!dlg.Create(this, m_filters, m_filterSets)) + if (!dlg.Create(this, m_filters, m_filterSets)) { return; + } - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } m_filters = dlg.GetFilters(); m_filterSets = dlg.GetFilterSets(); @@ -147,116 +159,6 @@ DisplayFilters(); } -void CFilterDialog::SaveFilter(pugi::xml_node& element, const CFilter& filter) -{ - AddTextElement(element, "Name", filter.name); - AddTextElement(element, "ApplyToFiles", filter.filterFiles ? _T("1") : _T("0")); - AddTextElement(element, "ApplyToDirs", filter.filterDirs ? _T("1") : _T("0")); - AddTextElement(element, "MatchType", (filter.matchType == CFilter::any) ? _T("Any") : ((filter.matchType == CFilter::none) ? _T("None") : _T("All"))); - AddTextElement(element, "MatchCase", filter.matchCase ? _T("1") : _T("0")); - - auto xConditions = element.append_child("Conditions"); - for (std::vector::const_iterator conditionIter = filter.filters.begin(); conditionIter != filter.filters.end(); ++conditionIter) { - const CFilterCondition& condition = *conditionIter; - - int type; - switch (condition.type) - { - case filter_name: - type = 0; - break; - case filter_size: - type = 1; - break; - case filter_attributes: - type = 2; - break; - case filter_permissions: - type = 3; - break; - case filter_path: - type = 4; - break; - case filter_date: - type = 5; - break; - default: - wxFAIL_MSG(_T("Unhandled filter type")); - continue; - } - - auto xCondition = xConditions.append_child("Condition"); - AddTextElement(xCondition, "Type", type); - - if (condition.type == filter_size) { - // Backwards compatibility sucks - int v = condition.condition; - if (v == 2) - v = 3; - else if (v > 2) - --v; - AddTextElement(xCondition, "Condition", v); - } - else - AddTextElement(xCondition, "Condition", condition.condition); - AddTextElement(xCondition, "Value", condition.strValue); - } -} - -void CFilterDialog::SaveFilters() -{ - CInterProcessMutex mutex(MUTEX_FILTERS); - - CXmlFile xml(wxGetApp().GetSettingsFile(_T("filters"))); - auto element = xml.Load(); - if (!element) { - wxString msg = xml.GetError() + _T("\n\n") + _("Any changes made to the filters could not be saved."); - wxMessageBoxEx(msg, _("Error loading xml file"), wxICON_ERROR); - - return; - } - - auto xFilters = element.child("Filters"); - while (xFilters) { - element.remove_child(xFilters); - xFilters = element.child("Filters"); - } - - xFilters = element.append_child("Filters"); - - for (auto const& filter : m_globalFilters) { - auto xFilter = xFilters.append_child("Filter"); - SaveFilter(xFilter, filter); - } - - auto xSets = element.child("Sets"); - while (xSets) { - element.remove_child(xSets); - xSets = element.child("Sets"); - } - - xSets = element.append_child("Sets"); - SetAttributeInt(xSets, "Current", m_currentFilterSet); - - for (auto const& set : m_globalFilterSets) { - auto xSet = xSets.append_child("Set"); - - if (!set.name.empty()) { - AddTextElement(xSet, "Name", set.name); - } - - for (unsigned int i = 0; i < set.local.size(); ++i) { - auto xItem = xSet.append_child("Item"); - AddTextElement(xItem, "Local", set.local[i] ? _T("1") : _T("0")); - AddTextElement(xItem, "Remote", set.remote[i] ? _T("1") : _T("0")); - } - } - - xml.Save(true); - - m_filters_disabled = false; -} - void CFilterDialog::DisplayFilters() { wxCheckListBox* pLocalFilters = XRCCTRL(*this, "ID_LOCALFILTERS", wxCheckListBox); @@ -308,11 +210,13 @@ if (m_shiftClick) { if (event.GetEventObject() == pLocal) { - if (!localOnly) + if (!localOnly) { pRemote->Check(item, pLocal->IsChecked(event.GetSelection())); + } } - else + else { pLocal->Check(item, pRemote->IsChecked(event.GetSelection())); + } } if (m_currentFilterSet) { @@ -332,8 +236,9 @@ { CInputDialog dlg; dlg.Create(this, _("Enter name for filterset"), _("Please enter a unique name for this filter set")); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } wxString name = dlg.GetValue(); if (name.empty()) { @@ -344,15 +249,18 @@ CFilterSet set; int old_pos = pChoice->GetSelection(); - if (old_pos > 0) + if (old_pos > 0) { set = m_filterSets[old_pos]; - else + } + else { set = m_filterSets[0]; + } int pos = pChoice->FindString(name); if (pos != wxNOT_FOUND) { - if (wxMessageBoxEx(_("Given filterset name already exists, overwrite filter set?"), _("Filter set already exists"), wxICON_QUESTION | wxYES_NO) != wxYES) + if (wxMessageBoxEx(_("Given filterset name already exists, overwrite filter set?"), _("Filter set already exists"), wxICON_QUESTION | wxYES_NO) != wxYES) { return; + } } if (pos == wxNOT_FOUND) { @@ -360,8 +268,9 @@ m_filterSets.push_back(set); pChoice->Append(name); } - else + else { m_filterSets[pos] = set; + } m_filterSets[pos].name = name; @@ -377,8 +286,9 @@ { wxChoice* pChoice = XRCCTRL(*this, "ID_SETS", wxChoice); int old_pos = pChoice->GetSelection(); - if (old_pos == -1) + if (old_pos == -1) { return; + } if (!old_pos) { wxMessageBoxEx(_("This filter set cannot be renamed.")); @@ -390,8 +300,9 @@ wxString msg = wxString::Format(_("Please enter a new name for the filter set \"%s\""), pChoice->GetStringSelection()); dlg.Create(this, _("Enter new name for filterset"), msg); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } wxString name = dlg.GetValue(); @@ -407,8 +318,9 @@ int pos = pChoice->FindString(name); if (pos != wxNOT_FOUND) { - if (wxMessageBoxEx(_("Given filterset name already exists, overwrite filter set?"), _("Filter set already exists"), wxICON_QUESTION | wxYES_NO) != wxYES) + if (wxMessageBoxEx(_("Given filterset name already exists, overwrite filter set?"), _("Filter set already exists"), wxICON_QUESTION | wxYES_NO) != wxYES) { return; + } } // Remove old entry @@ -422,8 +334,9 @@ m_filterSets.push_back(set); pChoice->Append(name); } - else + else { m_filterSets[pos] = set; + } m_filterSets[pos].name = name; @@ -437,8 +350,9 @@ { wxChoice* pChoice = XRCCTRL(*this, "ID_SETS", wxChoice); int pos = pChoice->GetSelection(); - if (pos == -1) + if (pos == -1) { return; + } if (!pos) { wxMessageBoxEx(_("This filter set cannot be removed.")); @@ -467,8 +381,9 @@ void CFilterDialog::OnChangeAll(wxCommandEvent& event) { bool check = true; - if (event.GetId() == XRCID("ID_LOCAL_DISABLEALL") || event.GetId() == XRCID("ID_REMOTE_DISABLEALL")) + if (event.GetId() == XRCID("ID_LOCAL_DISABLEALL") || event.GetId() == XRCID("ID_REMOTE_DISABLEALL")) { check = false; + } bool local; std::vector* pValues; @@ -515,36 +430,33 @@ CFilterManager::CFilterManager() { LoadFilters(); - - if (m_globalFilterSets.empty()) { - CFilterSet set; - set.local.resize(m_globalFilters.size(), false); - set.remote.resize(m_globalFilters.size(), false); - - m_globalFilterSets.push_back(set); - } } -bool CFilterManager::HasActiveFilters(bool ignore_disabled /*=false*/) +bool CFilterManager::HasActiveFilters(bool ignore_disabled) { - if (!m_loaded) + if (!m_loaded) { LoadFilters(); + } - if (m_globalFilterSets.empty()) + if (m_globalFilterSets.empty()) { return false; + } wxASSERT(m_globalCurrentFilterSet < m_globalFilterSets.size()); - if (m_filters_disabled && !ignore_disabled) + if (m_filters_disabled && !ignore_disabled) { return false; + } const CFilterSet& set = m_globalFilterSets[m_globalCurrentFilterSet]; for (unsigned int i = 0; i < m_globalFilters.size(); ++i) { - if (set.local[i]) + if (set.local[i]) { return true; + } - if (set.remote[i]) + if (set.remote[i]) { return true; + } } return false; @@ -552,58 +464,47 @@ bool CFilterManager::HasSameLocalAndRemoteFilters() const { - const CFilterSet& set = m_globalFilterSets[m_globalCurrentFilterSet]; - for (unsigned int i = 0; i < m_globalFilters.size(); i++) - { - if (set.local[i]) - { - if (!set.remote[i]) - return false; - } - else if (set.remote[i]) - return false; - } + CFilterSet const& set = m_globalFilterSets[m_globalCurrentFilterSet]; + return set.local == set.remote; return true; } -bool CFilterManager::FilenameFiltered(const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, fz::datetime const& date) const +bool CFilterManager::FilenameFiltered(std::wstring const& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, fz::datetime const& date) const { - if (m_filters_disabled) + if (m_filters_disabled) { return false; + } wxASSERT(m_globalCurrentFilterSet < m_globalFilterSets.size()); - const CFilterSet& set = m_globalFilterSets[m_globalCurrentFilterSet]; + CFilterSet const& set = m_globalFilterSets[m_globalCurrentFilterSet]; + auto const& active = local ? set.local : set.remote; // Check active filters for (unsigned int i = 0; i < m_globalFilters.size(); ++i) { - if (local) { - if (set.local[i]) - if (FilenameFilteredByFilter(m_globalFilters[i], name, path, dir, size, attributes, date)) - return true; - } - else { - if (set.remote[i]) - if (FilenameFilteredByFilter(m_globalFilters[i], name, path, dir, size, attributes, date)) - return true; + if (active[i]) { + if (FilenameFilteredByFilter(m_globalFilters[i], name, path, dir, size, attributes, date)) { + return true; + } } } return false; } -bool CFilterManager::FilenameFiltered(std::vector const& filters, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date) const +bool CFilterManager::FilenameFiltered(std::vector const& filters, std::wstring const& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date) const { for (auto const& filter : filters) { - if (FilenameFilteredByFilter(filter, name, path, dir, size, attributes, date)) + if (FilenameFilteredByFilter(filter, name, path, dir, size, attributes, date)) { return true; + } } return false; } -static bool StringMatch(const wxString& subject, const wxString& filter, int condition, bool matchCase, std::shared_ptr const& pRegEx) +static bool StringMatch(const wxString& subject, const wxString& filter, int condition, bool matchCase, std::shared_ptr const& pRegEx) { bool match = false; @@ -611,34 +512,40 @@ { case 0: if (matchCase) { - if (subject.Contains(filter)) + if (subject.Contains(filter)) { match = true; + } } else { - if (subject.Lower().Contains(filter.Lower())) + if (subject.Lower().Contains(filter.Lower())) { match = true; + } } break; case 1: if (matchCase) { - if (subject == filter) + if (subject == filter) { match = true; + } } else { - if (!subject.CmpNoCase(filter)) + if (!subject.CmpNoCase(filter)) { match = true; + } } break; case 2: { const wxString& left = subject.Left(filter.Len()); if (matchCase) { - if (left == filter) + if (left == filter) { match = true; + } } else { - if (!left.CmpNoCase(filter)) + if (!left.CmpNoCase(filter)) { match = true; + } } } break; @@ -646,28 +553,33 @@ { const wxString& right = subject.Right(filter.Len()); if (matchCase) { - if (right == filter) + if (right == filter) { match = true; + } } else { - if (!right.CmpNoCase(filter)) + if (!right.CmpNoCase(filter)) { match = true; + } } } break; case 4: wxASSERT(pRegEx); - if (pRegEx && pRegEx->Matches(subject)) + if (pRegEx && std::regex_search(subject.ToStdWstring(), *pRegEx)) { match = true; + } break; case 5: if (matchCase) { - if (!subject.Contains(filter)) + if (!subject.Contains(filter)) { match = true; + } } else { - if (!subject.Lower().Contains(filter.Lower())) + if (!subject.Lower().Contains(filter.Lower())) { match = true; + } } break; } @@ -675,17 +587,17 @@ return match; } -bool CFilterManager::FilenameFilteredByFilter(const CFilter& filter, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date) +bool CFilterManager::FilenameFilteredByFilter(CFilter const& filter, std::wstring const& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date) { - if (dir && !filter.filterDirs) + if (dir && !filter.filterDirs) { return false; - else if (!dir && !filter.filterFiles) + } + else if (!dir && !filter.filterFiles) { return false; + } - for (std::vector::const_iterator iter = filter.filters.begin(); iter != filter.filters.end(); ++iter) - { + for (auto const& condition : filter.filters) { bool match = false; - const CFilterCondition& condition = *iter; switch (condition.type) { @@ -696,25 +608,30 @@ match = StringMatch(path, condition.strValue, condition.condition, filter.matchCase, condition.pRegEx); break; case filter_size: - if (size == -1) + if (size == -1) { continue; + } switch (condition.condition) { case 0: - if (size > condition.value) + if (size > condition.value) { match = true; + } break; case 1: - if (size == condition.value) + if (size == condition.value) { match = true; + } break; case 2: - if (size != condition.value) + if (size != condition.value) { match = true; + } break; case 3: - if (size < condition.value) + if (size < condition.value) { match = true; + } break; } break; @@ -722,8 +639,9 @@ #ifndef __WXMSW__ continue; #else - if (!attributes) + if (!attributes) { continue; + } { int flag = 0; @@ -759,8 +677,9 @@ #ifdef __WXMSW__ continue; #else - if (attributes == -1) + if (attributes == -1) { continue; + } { int flag = 0; @@ -796,13 +715,14 @@ } int set = (flag & attributes) ? 1 : 0; - if (set == condition.value) + if (set == condition.value) { match = true; + } } #endif //__WXMSW__ break; case filter_date: - if (date.empty()) { + if (!date.empty()) { int cmp = date.compare( condition.date ); switch (condition.condition) { @@ -826,40 +746,53 @@ break; } if (match) { - if (filter.matchType == CFilter::any) + if (filter.matchType == CFilter::any) { return true; - else if (filter.matchType == CFilter::none) + } + else if (filter.matchType == CFilter::none) { return false; + } } else { - if (filter.matchType == CFilter::all) + if (filter.matchType == CFilter::all) { return false; + } + else if (filter.matchType == CFilter::not_all) { + return true; + } } } - if (filter.matchType != CFilter::any || filter.filters.empty()) + if (filter.matchType == CFilter::not_all) { + return false; + } + + if (filter.matchType != CFilter::any || filter.filters.empty()) { return true; + } return false; } +bool CFilterManager::CompileRegexes(std::vector& filters) +{ + bool ret = true; + for (auto & filter : filters) { + ret &= CompileRegexes(filter); + } + return ret; +} + bool CFilterManager::CompileRegexes(CFilter& filter) { - for (auto iter = filter.filters.begin(); iter != filter.filters.end(); ++iter) - { - CFilterCondition& condition = *iter; - if ((condition.type == filter_name || condition.type == filter_path) && condition.condition == 4) { - condition.pRegEx = std::make_shared(condition.strValue); - if (!condition.pRegEx->IsValid()) { - condition.pRegEx.reset(); - return false; - } + bool ret = true; + for (auto & condition : filter.filters) { + if (!condition.CompileRegex()) { + ret = false; } - else - condition.pRegEx.reset(); } - return true; + return ret; } bool CFilterManager::CompileRegexes() @@ -877,17 +810,18 @@ filter.filterDirs = GetTextElement(element, "ApplyToDirs") == _T("1"); wxString const matchType = GetTextElement(element, "MatchType"); - if (matchType == _T("Any")) - filter.matchType = CFilter::any; - else if (matchType == _T("None")) - filter.matchType = CFilter::none; - else - filter.matchType = CFilter::all; + filter.matchType = CFilter::all; + for (size_t i = 0; i < matchTypeXmlNames.size(); ++i) { + if (matchType == matchTypeXmlNames[i]) { + filter.matchType = static_cast(i); + } + } filter.matchCase = GetTextElement(element, "MatchCase") == _T("1"); auto xConditions = element.child("Conditions"); - if (!xConditions) + if (!xConditions) { return false; + } for (auto xCondition = xConditions.child("Condition"); xCondition; xCondition = xCondition.next_sibling("Condition")) { CFilterCondition condition; @@ -916,15 +850,18 @@ } condition.condition = GetTextElementInt(xCondition, "Condition", 0); if (condition.type == filter_size) { - if (condition.value == 3) + if (condition.value == 3) { condition.value = 2; - else if (condition.value >= 2) + } + else if (condition.value >= 2) { ++condition.value; + } } condition.strValue = GetTextElement(xCondition, "Value"); condition.matchCase = filter.matchCase; - if (condition.strValue.empty()) + if (condition.strValue.empty()) { continue; + } if (condition.type == filter_size) { unsigned long long tmp; @@ -932,14 +869,16 @@ condition.value = tmp; } else if (condition.type == filter_attributes || condition.type == filter_permissions) { - if (condition.strValue == _T("0")) + if (condition.strValue == _T("0")) { condition.value = 0; - else + } + else { condition.value = 1; + } } else if (condition.type == filter_date) { condition.date = fz::datetime(condition.strValue.ToStdWstring(), fz::datetime::local); - if (!condition.date.empty()) { + if (condition.date.empty()) { continue; } } @@ -952,74 +891,217 @@ void CFilterManager::LoadFilters() { - if (m_loaded) + if (m_loaded) { return; + } m_loaded = true; - CInterProcessMutex mutex(MUTEX_FILTERS); + CReentrantInterProcessMutexLocker mutex(MUTEX_FILTERS); - wxString file(wxGetApp().GetSettingsFile(_T("filters"))); + std::wstring file(wxGetApp().GetSettingsFile(_T("filters"))); if (fz::local_filesys::get_size(fz::to_native(file)) < 1) { file = wxGetApp().GetResourceDir().GetPath() + _T("defaultfilters.xml"); } CXmlFile xml(file); auto element = xml.Load(); + LoadFilters(element); + if (!element) { wxString msg = xml.GetError() + _T("\n\n") + _("Any changes made to the filters will not be saved."); wxMessageBoxEx(msg, _("Error loading xml file"), wxICON_ERROR); + } +} +void CFilterManager::Import(pugi::xml_node& element) +{ + if (!element) { return; } + m_globalFilters.clear(); + m_globalFilterSets.clear(); + m_globalCurrentFilterSet = 0; + m_filters_disabled = false; + + CReentrantInterProcessMutexLocker mutex(MUTEX_FILTERS); + + LoadFilters(element); + SaveFilters(); + + CContextManager::Get()->NotifyAllHandlers(STATECHANGE_APPLYFILTER); +} + +void CFilterManager::LoadFilters(pugi::xml_node& element) +{ auto xFilters = element.child("Filters"); - if (!xFilters) - return; + if (xFilters) { + + auto xFilter = xFilters.child("Filter"); + while (xFilter) { + CFilter filter; - auto xFilter = xFilters.child("Filter"); - while (xFilter) { - CFilter filter; + bool loaded = LoadFilter(xFilter, filter); + + if (loaded && !filter.name.empty() && !filter.filters.empty()) { + m_globalFilters.push_back(filter); + } + + xFilter = xFilter.next_sibling("Filter"); + } + + CompileRegexes(); + auto xSets = element.child("Sets"); + if (xSets) { + for (auto xSet = xSets.child("Set"); xSet; xSet = xSet.next_sibling("Set")) { + CFilterSet set; + auto xItem = xSet.child("Item"); + while (xItem) { + wxString local = GetTextElement(xItem, "Local"); + wxString remote = GetTextElement(xItem, "Remote"); + set.local.push_back(local == _T("1") ? true : false); + set.remote.push_back(remote == _T("1") ? true : false); + + xItem = xItem.next_sibling("Item"); + } + + if (!m_globalFilterSets.empty()) { + set.name = GetTextElement(xSet, "Name"); + if (set.name.empty()) { + continue; + } + } + + if (set.local.size() == m_globalFilters.size()) { + m_globalFilterSets.push_back(set); + } + } - bool loaded = LoadFilter(xFilter, filter); + int value = GetAttributeInt(xSets, "Current"); + if (value >= 0 && static_cast(value) < m_globalFilterSets.size()) { + m_globalCurrentFilterSet = value; + } + } + } - if (loaded && !filter.name.empty() && !filter.filters.empty()) - m_globalFilters.push_back(filter); + if (m_globalFilterSets.empty()) { + CFilterSet set; + set.local.resize(m_globalFilters.size(), false); + set.remote.resize(m_globalFilters.size(), false); - xFilter = xFilter.next_sibling("Filter"); + m_globalFilterSets.push_back(set); } +} - CompileRegexes(); +void CFilterManager::SaveFilters() +{ + CReentrantInterProcessMutexLocker mutex(MUTEX_FILTERS); + + CXmlFile xml(wxGetApp().GetSettingsFile(_T("filters"))); + auto element = xml.Load(); + if (!element) { + wxString msg = xml.GetError() + _T("\n\n") + _("Any changes made to the filters could not be saved."); + wxMessageBoxEx(msg, _("Error loading xml file"), wxICON_ERROR); - auto xSets = element.child("Sets"); - if (!xSets) return; + } - for (auto xSet = xSets.child("Set"); xSet; xSet = xSet.next_sibling("Set")) { - CFilterSet set; - auto xItem = xSet.child("Item"); - while (xItem) { - wxString local = GetTextElement(xItem, "Local"); - wxString remote = GetTextElement(xItem, "Remote"); - set.local.push_back(local == _T("1") ? true : false); - set.remote.push_back(remote == _T("1") ? true : false); - - xItem = xItem.next_sibling("Item"); - } + auto xFilters = element.child("Filters"); + while (xFilters) { + element.remove_child(xFilters); + xFilters = element.child("Filters"); + } - if (!m_globalFilterSets.empty()) { - set.name = GetTextElement(xSet, "Name"); - if (set.name.empty()) - continue; + xFilters = element.append_child("Filters"); + + for (auto const& filter : m_globalFilters) { + auto xFilter = xFilters.append_child("Filter"); + SaveFilter(xFilter, filter); + } + + auto xSets = element.child("Sets"); + while (xSets) { + element.remove_child(xSets); + xSets = element.child("Sets"); + } + + xSets = element.append_child("Sets"); + SetAttributeInt(xSets, "Current", m_globalCurrentFilterSet); + + for (auto const& set : m_globalFilterSets) { + auto xSet = xSets.append_child("Set"); + + if (!set.name.empty()) { + AddTextElement(xSet, "Name", set.name.ToStdWstring()); } - if (set.local.size() == m_globalFilters.size()) - m_globalFilterSets.push_back(set); + for (unsigned int i = 0; i < set.local.size(); ++i) { + auto xItem = xSet.append_child("Item"); + AddTextElement(xItem, "Local", set.local[i] ? _T("1") : _T("0")); + AddTextElement(xItem, "Remote", set.remote[i] ? _T("1") : _T("0")); + } } - int value = GetAttributeInt(xSets, "Current"); - if (value >= 0 && static_cast(value) < m_globalFilterSets.size()) { - m_globalCurrentFilterSet = value; + xml.Save(true); +} + +void CFilterManager::SaveFilter(pugi::xml_node& element, const CFilter& filter) +{ + AddTextElement(element, "Name", filter.name.ToStdWstring()); + AddTextElement(element, "ApplyToFiles", filter.filterFiles ? _T("1") : _T("0")); + AddTextElement(element, "ApplyToDirs", filter.filterDirs ? _T("1") : _T("0")); + AddTextElement(element, "MatchType", matchTypeXmlNames[filter.matchType]); + AddTextElement(element, "MatchCase", filter.matchCase ? _T("1") : _T("0")); + + auto xConditions = element.append_child("Conditions"); + for (std::vector::const_iterator conditionIter = filter.filters.begin(); conditionIter != filter.filters.end(); ++conditionIter) { + const CFilterCondition& condition = *conditionIter; + + int type; + switch (condition.type) + { + case filter_name: + type = 0; + break; + case filter_size: + type = 1; + break; + case filter_attributes: + type = 2; + break; + case filter_permissions: + type = 3; + break; + case filter_path: + type = 4; + break; + case filter_date: + type = 5; + break; + default: + wxFAIL_MSG(_T("Unhandled filter type")); + continue; + } + + auto xCondition = xConditions.append_child("Condition"); + AddTextElement(xCondition, "Type", type); + + if (condition.type == filter_size) { + // Backwards compatibility sucks + int v = condition.condition; + if (v == 2) { + v = 3; + } + else if (v > 2) { + --v; + } + AddTextElement(xCondition, "Condition", v); + } + else { + AddTextElement(xCondition, "Condition", condition.condition); + } + AddTextElement(xCondition, "Value", condition.strValue.ToStdWstring()); } } @@ -1030,28 +1112,28 @@ return; } - if (HasActiveFilters(true)) + if (HasActiveFilters(true)) { m_filters_disabled = true; + } } -std::vector CFilterManager::GetActiveFilters(bool local) +ActiveFilters CFilterManager::GetActiveFilters() { - std::vector filters; + ActiveFilters filters; - if (m_filters_disabled) + if (m_filters_disabled) { return filters; + } const CFilterSet& set = m_globalFilterSets[m_globalCurrentFilterSet]; // Check active filters for (unsigned int i = 0; i < m_globalFilters.size(); ++i) { - if (local) { - if (set.local[i]) - filters.push_back(m_globalFilters[i]); + if (set.local[i]) { + filters.first.push_back(m_globalFilters[i]); } - else { - if (set.remote[i]) - filters.push_back(m_globalFilters[i]); + if (set.remote[i]) { + filters.second.push_back(m_globalFilters[i]); } } diff -Nru filezilla-3.15.0.2/src/interface/filteredit.cpp filezilla-3.33.0/src/interface/filteredit.cpp --- filezilla-3.15.0.2/src/interface/filteredit.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filteredit.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -171,22 +171,21 @@ void CFilterEditDialog::OnDelete(wxCommandEvent&) { int item = m_pFilterListCtrl->GetSelection(); - if (item == -1) + if (item == -1) { return; + } m_currentSelection = -1; m_pFilterListCtrl->Delete(item); m_filters.erase(m_filters.begin() + item); // Remote filter from all filter sets - for (auto iter = m_filterSets.begin(); iter != m_filterSets.end(); ++iter) - { - CFilterSet& set = *iter; + for (auto & set : m_filterSets) { set.local.erase(set.local.begin() + item); set.remote.erase(set.remote.begin() + item); } - ClearFilter(true); + ClearFilter(); SetCtrlState(false); } @@ -312,6 +311,7 @@ void CFilterEditDialog::SetCtrlState(bool enabled) { + XRCCTRL(*this, "ID_CASE", wxCheckBox)->Enable(enabled); XRCCTRL(*this, "ID_FILES", wxCheckBox)->Enable(enabled); XRCCTRL(*this, "ID_DIRS", wxCheckBox)->Enable(enabled); } diff -Nru filezilla-3.15.0.2/src/interface/filteredit.h filezilla-3.33.0/src/interface/filteredit.h --- filezilla-3.15.0.2/src/interface/filteredit.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filteredit.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,12 +1,12 @@ -#ifndef __FILTEREDIT_H__ -#define __FILTEREDIT_H__ +#ifndef FILEZILLA_INTERFACE_FILTEREDIT_HEADER +#define FILEZILLA_INTERFACE_FILTEREDIT_HEADER #include "filter.h" #include "filter_conditions_dialog.h" class wxCustomHeightListCtrl; class CWindowStateManager; -class CFilterEditDialog : public CFilterConditionsDialog +class CFilterEditDialog final : public CFilterConditionsDialog { public: CFilterEditDialog(); @@ -44,4 +44,4 @@ CWindowStateManager* m_pWindowStateManager; }; -#endif //__FILTEREDIT_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/filter.h filezilla-3.33.0/src/interface/filter.h --- filezilla-3.15.0.2/src/interface/filter.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/filter.h 2017-10-25 17:12:23.000000000 +0000 @@ -1,10 +1,10 @@ -#ifndef __FILTER_H__ -#define __FILTER_H__ +#ifndef FILEZILLA_INTERFACE_FILTER_HEADER +#define FILEZILLA_INTERFACE_FILTER_HEADER #include "dialogex.h" -#include #include +#include enum t_filterType { @@ -29,14 +29,16 @@ public: CFilterCondition(); - enum t_filterType type; + bool CompileRegex(); + + t_filterType type; int condition; wxString strValue; // All other types int64_t value; // If type is size fz::datetime date; // If type is date bool matchCase; - std::shared_ptr pRegEx; + std::shared_ptr pRegEx; }; class CFilter @@ -46,21 +48,30 @@ { all, any, - none + none, + not_all }; - CFilter(); + bool empty() const { return filters.empty(); } + + explicit operator bool() const { return !filters.empty(); } wxString name; - bool filterFiles; - bool filterDirs; - enum t_matchType matchType; - bool matchCase; + bool filterFiles{true}; + bool filterDirs{true}; + t_matchType matchType{all}; + + // Filenames on Windows ignore case +#ifdef __WXMSW__ + bool matchCase{}; +#else + bool matchCase{true}; +#endif std::vector filters; - bool HasConditionOfType(enum t_filterType type) const; + bool HasConditionOfType(t_filterType type) const; bool IsLocalFilter() const; }; @@ -72,33 +83,41 @@ std::vector remote; }; +typedef std::pair, std::vector> ActiveFilters; + namespace pugi { class xml_node; } class CFilterManager { public: CFilterManager(); - virtual ~CFilterManager() {} + virtual ~CFilterManager() = default; // Note: Under non-windows, attributes are permissions - bool FilenameFiltered(const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, fz::datetime const& date) const; - bool FilenameFiltered(std::vector const& filters, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date) const; - static bool FilenameFilteredByFilter(const CFilter& filter, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date); + virtual bool FilenameFiltered(std::wstring const& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, fz::datetime const& date) const; + bool FilenameFiltered(std::vector const& filters, std::wstring const& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date) const; + static bool FilenameFilteredByFilter(CFilter const& filter, std::wstring const& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date); static bool HasActiveFilters(bool ignore_disabled = false); bool HasSameLocalAndRemoteFilters() const; static void ToggleFilters(); - std::vector GetActiveFilters(bool local); + ActiveFilters GetActiveFilters(); + static bool CompileRegexes(std::vector& filters); static bool CompileRegexes(CFilter& filter); + static void Import(pugi::xml_node& element); static bool LoadFilter(pugi::xml_node& element, CFilter& filter); + static void SaveFilter(pugi::xml_node& element, const CFilter& filter); protected: static bool CompileRegexes(); static void LoadFilters(); + static void LoadFilters(pugi::xml_node& element); + static void SaveFilters(); + static bool m_loaded; static std::vector m_globalFilters; @@ -110,20 +129,14 @@ }; class CMainFrame; -class CFilterDialog : public wxDialogEx, public CFilterManager +class CFilterDialog final : public wxDialogEx, public CFilterManager { public: CFilterDialog(); - virtual ~CFilterDialog() {} bool Create(CMainFrame* parent); - static void SaveFilter(pugi::xml_node& element, const CFilter& filter); - protected: - - void SaveFilters(); - void DisplayFilters(); void SetCtrlState(); @@ -142,13 +155,13 @@ void OnChangeAll(wxCommandEvent& event); - bool m_shiftClick; + bool m_shiftClick{}; - CMainFrame* m_pMainFrame; + CMainFrame* m_pMainFrame{}; std::vector m_filters; std::vector m_filterSets; unsigned int m_currentFilterSet; }; -#endif //__FILTER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/fzputtygen_interface.cpp filezilla-3.33.0/src/interface/fzputtygen_interface.cpp --- filezilla-3.15.0.2/src/interface/fzputtygen_interface.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/fzputtygen_interface.cpp 2017-01-09 16:00:55.000000000 +0000 @@ -4,6 +4,8 @@ #include "filezillaapp.h" #include "inputdialog.h" +#include + CFZPuttyGenInterface::CFZPuttyGenInterface(wxWindow* parent) : m_parent(parent) { @@ -11,43 +13,20 @@ CFZPuttyGenInterface::~CFZPuttyGenInterface() { - if (m_pProcess) - EndProcess(); -} - -void CFZPuttyGenInterface::EndProcess() -{ - m_pProcess->CloseOutput(); - m_pProcess->Detach(); - m_pProcess = 0; -} - -void CFZPuttyGenInterface::DeleteProcess() -{ - delete m_pProcess; - m_pProcess = 0; -} - -bool CFZPuttyGenInterface::IsProcessCreated() -{ - return m_pProcess != 0; -} - -bool CFZPuttyGenInterface::IsProcessStarted() -{ - return m_initialized; } -int CFZPuttyGenInterface::NeedsConversion(wxString keyFile, bool silent) +int CFZPuttyGenInterface::NeedsConversion(std::wstring const& keyFile, bool silent) { - if (!Send(_T("file " + keyFile))) + if (!Send(L"file " + keyFile)) { return -1; + } - wxString reply; + std::wstring reply; ReplyCode code = GetReply(reply); - if (code == failure) + if (code == failure) { return -1; - if (code == error || (reply != _T("ok") && reply != _T("convertible"))) { + } + if (code == error || (reply != L"ok" && reply != L"convertible")) { if (!silent) { wxString msg; if (reply == _T("incompatible")) { @@ -61,38 +40,42 @@ return -1; } - return reply == _T("convertible") ? 1 : 0; + return reply == L"convertible" ? 1 : 0; } int CFZPuttyGenInterface::IsKeyFileEncrypted() { - if (!Send(_T("encrypted"))) + if (!Send(L"encrypted")) { return -1; + } - wxString reply; + std::wstring reply; ReplyCode code = GetReply(reply); if (code != success) { - wxASSERT(code != error); + assert(code != error); return -1; } return reply == _T("1") ? 1 : 0; } -bool CFZPuttyGenInterface::LoadKeyFile(wxString& keyFile, bool silent, wxString& comment, wxString& data) +bool CFZPuttyGenInterface::LoadKeyFile(std::wstring& keyFile, bool silent, std::wstring& comment, std::wstring& data) { if (!LoadProcess(silent)) { + comment = _("Could not load key file"); return false; } int needs_conversion = NeedsConversion(keyFile, silent); if (needs_conversion < 0) { + comment = _("Could not load key file"); return false; } ReplyCode code; if (needs_conversion) { if (silent) { + comment = _("Could not load key file"); return false; } @@ -103,21 +86,25 @@ wxString msg = wxString::Format(_("The file '%s' is not in a format supported by FileZilla.\nWould you like to convert it into a supported format?"), keyFile); int res = wxMessageBoxEx(msg, _("Convert key file"), wxICON_QUESTION | wxYES_NO); - if (res != wxYES) + if (res != wxYES) { return false; + } msg = wxString::Format(_("Enter the password for the file '%s'.\nThe converted file will be protected with the same password."), keyFile); CInputDialog dlg; - if (!dlg.Create(m_parent, _("Password required"), msg)) + if (!dlg.Create(m_parent, _("Password required"), msg)) { return false; + } dlg.SetPasswordMode(true); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return false; - if (!Send(_T("password " + dlg.GetValue()))) + } + if (!Send(L"password " + dlg.GetValue().ToStdWstring())) { return false; - wxString reply; + } + std::wstring reply; code = GetReply(reply); if (code != success) { msg = wxString::Format(_("Failed to load private key: %s"), reply); @@ -126,12 +113,14 @@ } wxFileDialog fileDlg(m_parent, _("Select filename for converted key file"), wxString(), wxString(), _T("PuTTY private key files (*.ppk)|*.ppk"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT); - if (fileDlg.ShowModal() != wxID_OK) + if (fileDlg.ShowModal() != wxID_OK) { return false; + } - wxString newName = fileDlg.GetPath(); - if (newName.empty()) + std::wstring newName = fileDlg.GetPath().ToStdWstring(); + if (newName.empty()) { return false; + } if (newName == keyFile) { // Not actually a requirement by fzputtygen, but be on the safe side. We don't want the user to lose his keys. @@ -139,64 +128,65 @@ return false; } - Send(_T("write ") + newName); + Send(L"write " + newName); code = GetReply(reply); - if (code == failure) + if (code == failure) { return false; + } if (code != success) { wxMessageBoxEx(wxString::Format(_("Could not write key file: %s"), reply), _("Could not convert private key"), wxICON_EXCLAMATION); return false; } keyFile = newName; } - - if (!Send(_T("fingerprint"))) + + if (!Send(L"fingerprint")) { + comment = _("Could not load key file"); return false; + } code = GetReply(data); - if (code != success) + if (code != success) { + comment = _("Could not load key file"); + data.clear(); return false; + } - Send(_T("comment")); + Send(L"comment"); code = GetReply(comment); - if (code != success) + if (code != success) { + comment = _("Could not load key file"); + data.clear(); + comment.clear(); return false; + } return true; } bool CFZPuttyGenInterface::LoadProcess(bool silent) { - if (m_initialized) - return m_pProcess != 0; + if (m_initialized) { + return m_process != 0; + } + m_initialized = true; - wxString executable = COptions::Get()->GetOption(OPTION_FZSFTP_EXECUTABLE); - int pos = executable.Find(wxFileName::GetPathSeparator(), true); - if (pos == -1) { + std::wstring executable = COptions::Get()->GetOption(OPTION_FZSFTP_EXECUTABLE); + size_t pos = executable.rfind(wxFileName::GetPathSeparator()); + if (pos == std::wstring::npos) { if (!silent) { wxMessageBoxEx(_("fzputtygen could not be started.\nPlease make sure this executable exists in the same directory as the main FileZilla executable."), _("Error starting program"), wxICON_EXCLAMATION); } return false; } - else { - executable = executable.Left(pos + 1) + _T("fzputtygen"); -#ifdef __WXMSW__ - executable += _T(".exe"); -#endif - if (!executable.empty() && executable[0] == '"') - executable += '"'; - - if (executable.Find(' ') != -1 && executable[0] != '"') { - executable = '"' + executable + '"'; - } - } - m_pProcess = new wxProcess(m_parent); - m_pProcess->Redirect(); + executable = executable.substr(0, pos + 1) + L"fzputtygen"; +#ifdef FZ_WINDOWS + executable += L".exe"; +#endif - wxLogNull log; - if (!wxExecute(executable, wxEXEC_ASYNC, m_pProcess)) { - delete m_pProcess; - m_pProcess = 0; + m_process = std::make_unique(); + if (!m_process->spawn(fz::to_native(executable))) { + m_process.reset(); if (!silent) { wxMessageBoxEx(_("fzputtygen could not be started.\nPlease make sure this executable exists in the same directory as the main FileZilla executable."), _("Error starting program"), wxICON_EXCLAMATION); @@ -204,22 +194,19 @@ return false; } - m_initialized = true; return true; } -bool CFZPuttyGenInterface::Send(const wxString& cmd) +bool CFZPuttyGenInterface::Send(std::wstring const& cmd) { - if (!m_pProcess) + if (!m_process) { return false; + } - const wxWX2MBbuf buf = (cmd + _T("\n")).mb_str(wxConvUTF8); - const size_t len = strlen (buf); - - wxOutputStream* stream = m_pProcess->GetOutputStream(); - stream->Write((const char *) buf, len); + std::string utf8 = fz::to_utf8(cmd) + "\n"; + if (!m_process->write(utf8)) { + m_process.reset(); - if (stream->GetLastError() != wxSTREAM_NO_ERROR || stream->LastWrite() != len) { wxMessageBoxEx(_("Could not send command to fzputtygen."), _("Command failed"), wxICON_EXCLAMATION); return false; } @@ -227,60 +214,52 @@ return true; } -CFZPuttyGenInterface::ReplyCode CFZPuttyGenInterface::GetReply(wxString& reply) +CFZPuttyGenInterface::ReplyCode CFZPuttyGenInterface::GetReply(std::wstring & reply) { - if (!m_pProcess) - return failure; - wxInputStream *pStream = m_pProcess->GetInputStream(); - if (!pStream) { - wxMessageBoxEx(_("Could not get reply from fzputtygen."), _("Command failed"), wxICON_EXCLAMATION); + if (!m_process) { return failure; } char buffer[100]; - wxString input; + std::string input; for (;;) { - int pos = input.Find('\n'); - if (pos == wxNOT_FOUND) { - pStream->Read(buffer, 99); - int read; - if (pStream->Eof() || !(read = pStream->LastRead())) { + size_t pos = input.find_first_of("\r\n"); + if (pos == std::string::npos) { + int read = m_process->read(buffer, 100); + if (read <= 0) { wxMessageBoxEx(_("Could not get reply from fzputtygen."), _("Command failed"), wxICON_EXCLAMATION); + m_process.reset(); return failure; } - buffer[read] = 0; - - // Should only ever return ASCII strings so this is ok - input += wxString(buffer, wxConvUTF8); - pos = input.Find('\n'); - if (pos == wxNOT_FOUND) - continue; - } - - int pos2; - if (pos && input[pos - 1] == '\r') - pos2 = pos - 1; - else - pos2 = pos; - if (!pos2) { - input = input.Mid(pos + 1); + input.append(buffer, read); continue; } - if (input.empty()) { + + // Strip everything behind first linebreak. + if (!pos) { + input = input.substr(1); continue; } - wxChar c = input[0]; - reply = input.Mid(1, pos2 - 1); - input = input.Mid(pos + 1); + char c = input[0]; - if (c == '0' || c == '1') + reply = fz::to_wstring_from_utf8(input.substr(1, pos - 1)); + input = input.substr(pos + 1); + + if (c == '0' || c == '1') { return success; - else if (c == '2') + } + else if (c == '2') { return error; + } // Ignore others } } + +bool CFZPuttyGenInterface::ProcessFailed() const +{ + return m_initialized && !m_process; +} diff -Nru filezilla-3.15.0.2/src/interface/fzputtygen_interface.h filezilla-3.33.0/src/interface/fzputtygen_interface.h --- filezilla-3.15.0.2/src/interface/fzputtygen_interface.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/fzputtygen_interface.h 2016-10-04 15:54:48.000000000 +0000 @@ -1,28 +1,26 @@ #ifndef FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER #define FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER -#include +namespace fz { +class process; +} class CFZPuttyGenInterface final { public: CFZPuttyGenInterface(wxWindow* parent); virtual ~CFZPuttyGenInterface(); - bool LoadKeyFile(wxString& keyFile, bool silent, wxString& comment, wxString& data); - - void EndProcess(); - void DeleteProcess(); - bool IsProcessCreated(); - bool IsProcessStarted(); + bool LoadKeyFile(std::wstring& keyFile, bool silent, std::wstring& comment, std::wstring& data); + bool ProcessFailed() const; protected: // return -1 on error - int NeedsConversion(wxString keyFile, bool silent); + int NeedsConversion(std::wstring const& keyFile, bool silent); // return -1 on error int IsKeyFileEncrypted(); - wxProcess* m_pProcess{}; + std::unique_ptr m_process; bool m_initialized{}; wxWindow* m_parent; @@ -33,8 +31,8 @@ }; bool LoadProcess(bool silent); - bool Send(const wxString& cmd); - ReplyCode GetReply(wxString& reply); + bool Send(std::wstring const& cmd); + ReplyCode GetReply(std::wstring& reply); }; #endif /* FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER */ diff -Nru filezilla-3.15.0.2/src/interface/graphics.cpp filezilla-3.33.0/src/interface/graphics.cpp --- filezilla-3.15.0.2/src/interface/graphics.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/graphics.cpp 2016-11-26 16:41:50.000000000 +0000 @@ -0,0 +1,65 @@ +#include + +#include "graphics.h" + +CWindowTinter::CWindowTinter(wxWindow& wnd) + : m_wnd(wnd) +{ +} + +void CWindowTinter::SetBackgroundTint(wxColour const& tint) +{ + if (!m_originalColor.IsOk()) { + m_originalColor = m_wnd.GetBackgroundColour(); + } + + wxColour const newColour = AlphaComposite_Over(m_originalColor, tint); + if (newColour != m_wnd.GetBackgroundColour()) { + if (m_wnd.SetBackgroundColour(newColour)) { + m_wnd.Refresh(); + } + } +} + +void Overlay(wxBitmap& bg, wxBitmap const& fg) +{ + if (!bg.IsOk() || !fg.IsOk()) { + return; + } + + wxImage foreground = fg.ConvertToImage(); + if (!foreground.HasAlpha()) { + foreground.InitAlpha(); + } + + wxImage background = bg.ConvertToImage(); + if (!background.HasAlpha()) { + background.InitAlpha(); + } + + if (foreground.GetSize() != background.GetSize()) { + foreground.Rescale(background.GetSize().x, background.GetSize().y, wxIMAGE_QUALITY_HIGH); + } + + unsigned char* bg_data = background.GetData(); + unsigned char* bg_alpha = background.GetAlpha(); + unsigned char* fg_data = foreground.GetData(); + unsigned char* fg_alpha = foreground.GetAlpha(); + unsigned char* bg_end = bg_data + background.GetWidth() * background.GetHeight() * 3; + while (bg_data != bg_end) { + AlphaComposite_Over_Inplace( + *bg_data, *(bg_data + 1), *(bg_data + 2), *bg_alpha, + *fg_data, *(fg_data + 1), *(fg_data + 2), *fg_alpha); + bg_data += 3; + fg_data += 3; + ++bg_alpha; + ++fg_alpha; + } + +#ifdef __WXMAC__ + bg = wxBitmap(background, -1, bg.GetScaleFactor()); +#else + bg = wxBitmap(background, -1); +#endif +} + diff -Nru filezilla-3.15.0.2/src/interface/graphics.h filezilla-3.33.0/src/interface/graphics.h --- filezilla-3.15.0.2/src/interface/graphics.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/graphics.h 2016-11-26 16:41:50.000000000 +0000 @@ -0,0 +1,73 @@ +#ifndef FILEZILLA_GRAPHICS_HEADER +#define FILEZILLA_GRAPHICS_HEADER + +#include +#include + +static inline unsigned char AlphaComposite_Over_GetAlpha(unsigned char bg_alpha, unsigned char fg_alpha) +{ + return bg_alpha + fg_alpha - bg_alpha * fg_alpha / 255; +} + +// Do not call with zero new_alpha +static inline unsigned char AlphaComposite_Over(unsigned char bg, unsigned char bg_alpha, unsigned char fg, unsigned char fg_alpha, unsigned char new_alpha) +{ + return (bg * (255 - fg_alpha) * bg_alpha / 255 + fg * fg_alpha) / new_alpha; +} + +// Alpha compositing of a single pixel, b gets composited over a +// (well-known over operator), result stored in a. +// All RGB and A values have range from 0 to 255, RGB values aren't +// premultiplied by A. +// Safe for multiple compositions. +static inline void AlphaComposite_Over_Inplace( + unsigned char & bg_red, unsigned char & bg_green, unsigned char & bg_blue, unsigned char & bg_alpha, + unsigned char & fg_red, unsigned char & fg_green, unsigned char & fg_blue, unsigned char & fg_alpha) +{ + if (!fg_alpha) { + // Nothing to do. Also prevents zero new_alpha + return; + } + + unsigned char const new_alpha = AlphaComposite_Over_GetAlpha(bg_alpha, fg_alpha); + bg_red = AlphaComposite_Over(bg_red, bg_alpha, fg_red, fg_alpha, new_alpha); + bg_green = AlphaComposite_Over(bg_green, bg_alpha, fg_green, fg_alpha, new_alpha); + bg_blue = AlphaComposite_Over(bg_blue, bg_alpha, fg_blue, fg_alpha, new_alpha); + bg_alpha = new_alpha; +} + +static inline void AlphaComposite_Over_Inplace(wxAlphaPixelData::Iterator &bg, wxAlphaPixelData::Iterator &fg) +{ + AlphaComposite_Over_Inplace(bg.Red(), bg.Green(), bg.Blue(), bg.Alpha(), fg.Red(), fg.Green(), fg.Blue(), fg.Alpha()); +} + +static inline wxColour AlphaComposite_Over(wxColour const& bg, wxColour const& fg) { + if (!fg.IsOk() || !fg.Alpha()) { + // Nothing to do. Also prevents zero new_alpha + return bg; + } + + unsigned char const new_alpha = AlphaComposite_Over_GetAlpha(bg.Alpha(), fg.Alpha()); + return wxColour( + AlphaComposite_Over(bg.Red(), bg.Alpha(), fg.Red(), fg.Alpha(), new_alpha), + AlphaComposite_Over(bg.Green(), bg.Alpha(), fg.Green(), fg.Alpha(), new_alpha), + AlphaComposite_Over(bg.Blue(), bg.Alpha(), fg.Blue(), fg.Alpha(), new_alpha), + new_alpha + ); +} + +void Overlay(wxBitmap& bg, wxBitmap const& fg); + +class CWindowTinter final +{ +public: + CWindowTinter(wxWindow& wnd); + + void SetBackgroundTint(wxColour const& tint); + +private: + wxColour m_originalColor; + wxWindow& m_wnd; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/interface/import.cpp filezilla-3.33.0/src/interface/import.cpp --- filezilla-3.15.0.2/src/interface/import.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/import.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -5,6 +5,7 @@ #include "ipcmutex.h" #include "Options.h" #include "queue.h" +#include "xrc_helper.h" CImportDialog::CImportDialog(wxWindow* parent, CQueueView* pQueueView) : m_parent(parent), m_pQueueView(pQueueView) @@ -29,24 +30,31 @@ return; } - CXmlFile fz3(dlg.GetPath()); + CXmlFile fz3(dlg.GetPath().ToStdWstring()); auto fz3Root = fz3.Load(); if (fz3Root) { bool settings = fz3Root.child("Settings") != 0; bool queue = fz3Root.child("Queue") != 0; bool sites = fz3Root.child("Servers") != 0; + bool filters = fz3Root.child("Filters") != 0; - if (settings || queue || sites) { + if (settings || queue || sites || filters) { if (!Load(m_parent, _T("ID_IMPORT"))) { wxBell(); return; } - if (!queue) - XRCCTRL(*this, "ID_QUEUE", wxCheckBox)->Hide(); - if (!sites) - XRCCTRL(*this, "ID_SITEMANAGER", wxCheckBox)->Hide(); - if (!settings) - XRCCTRL(*this, "ID_SETTINGS", wxCheckBox)->Hide(); + if (!queue) { + xrc_call(*this, "ID_QUEUE", &wxCheckBox::Hide); + } + if (!sites) { + xrc_call(*this, "ID_SITEMANAGER", &wxCheckBox::Hide); + } + if (!settings) { + xrc_call(*this, "ID_SETTINGS", &wxCheckBox::Hide); + } + if (!filters) { + xrc_call(*this, "ID_FILTERS", &wxCheckBox::Hide); + } GetSizer()->Fit(this); if (ShowModal() != wxID_OK) { @@ -60,25 +68,29 @@ } } - if (queue && XRCCTRL(*this, "ID_QUEUE", wxCheckBox)->IsChecked()) { + if (queue && xrc_call(*this, "ID_QUEUE", &wxCheckBox::IsChecked)) { m_pQueueView->ImportQueue(fz3Root.child("Queue"), true); } - if (sites && XRCCTRL(*this, "ID_SITEMANAGER", wxCheckBox)->IsChecked()) { + if (sites && xrc_call(*this, "ID_SITEMANAGER", &wxCheckBox::IsChecked)) { ImportSites(fz3Root.child("Servers")); } - if (settings && XRCCTRL(*this, "ID_SETTINGS", wxCheckBox)->IsChecked()) { + if (settings && xrc_call(*this, "ID_SETTINGS", &wxCheckBox::IsChecked)) { COptions::Get()->Import(fz3Root.child("Settings")); wxMessageBoxEx(_("The settings have been imported. You have to restart FileZilla for all settings to have effect."), _("Import successful"), wxOK, this); } + if (filters && xrc_call(*this, "ID_FILTERS", &wxCheckBox::IsChecked)) { + CFilterManager::Import(fz3Root); + } + wxMessageBoxEx(_("The selected categories have been imported."), _("Import successful"), wxOK, this); return; } } - CXmlFile fz2(dlg.GetPath(), _T("FileZilla")); + CXmlFile fz2(dlg.GetPath().ToStdWstring(), "FileZilla"); auto fz2Root = fz2.Load(); if (fz2Root) { auto sites_fz2 = fz2Root.child("Sites"); @@ -118,25 +130,25 @@ return file.Save(true); } -wxString CImportDialog::DecodeLegacyPassword(wxString pass) +std::wstring CImportDialog::DecodeLegacyPassword(std::wstring const& pass) { - if( pass.size() % 3 ) { - return wxString(); + if (pass.size() % 3) { + return std::wstring(); } - wxString output; + std::wstring output; const char* key = "FILEZILLA1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int pos = (pass.Length() / 3) % strlen(key); - for (unsigned int i = 0; i < pass.Length(); i += 3) { + int pos = (pass.size() / 3) % strlen(key); + for (size_t i = 0; i < pass.size(); i += 3) { if (pass[i] < '0' || pass[i] > '9' || pass[i + 1] < '0' || pass[i + 1] > '9' || pass[i + 2] < '0' || pass[i + 2] > '9') - return wxString(); + return std::wstring(); int number = (pass[i] - '0') * 100 + (pass[i + 1] - '0') * 10 + (pass[i + 2] - '0'); - wxChar c = number ^ key[(i / 3 + pos) % strlen(key)]; + wchar_t c = number ^ key[(i / 3 + pos) % strlen(key)]; output += c; } @@ -146,36 +158,41 @@ bool CImportDialog::ImportLegacySites(pugi::xml_node sitesToImport, pugi::xml_node existingSites) { for (auto importFolder = sitesToImport.child("Folder"); importFolder; importFolder = importFolder.next_sibling("Folder")) { - wxString name = GetTextAttribute(importFolder, "Name"); - if (name.empty()) + std::wstring name = GetTextAttribute(importFolder, "Name"); + if (name.empty()) { continue; + } - wxString newName = name; + std::wstring newName = name; int i = 2; pugi::xml_node folder; while (!(folder = GetFolderWithName(existingSites, newName))) { - newName = wxString::Format(_T("%s %d"), name, i++); + newName = fz::sprintf(L"%s %d", name, i++); } ImportLegacySites(importFolder, folder); } for (auto importSite = sitesToImport.child("Site"); importSite; importSite = importSite.next_sibling("Site")) { - wxString name = GetTextAttribute(importSite, "Name"); - if (name.empty()) + std::wstring name = GetTextAttribute(importSite, "Name"); + if (name.empty()) { continue; + } - wxString host = GetTextAttribute(importSite, "Host"); - if (host.empty()) + std::wstring host = GetTextAttribute(importSite, "Host"); + if (host.empty()) { continue; + } int port = GetAttributeInt(importSite, "Port"); - if (port < 1 || port > 65535) + if (port < 1 || port > 65535) { continue; + } int serverType = GetAttributeInt(importSite, "ServerType"); - if (serverType < 0 || serverType > 4) + if (serverType < 0 || serverType > 4) { continue; + } int protocol; switch (serverType) @@ -199,24 +216,28 @@ bool dontSavePass = GetAttributeInt(importSite, "DontSavePass") == 1; int logontype = GetAttributeInt(importSite, "Logontype"); - if (logontype < 0 || logontype > 2) + if (logontype < 0 || logontype > 2) { continue; - if (logontype == 2) + } + if (logontype == 2) { logontype = 4; - if (logontype == 1 && dontSavePass) + } + if (logontype == 1 && dontSavePass) { logontype = 2; + } - wxString user = GetTextAttribute(importSite, "User"); - wxString pass = DecodeLegacyPassword(GetTextAttribute(importSite, "Pass")); - wxString account = GetTextAttribute(importSite, "Account"); - if (logontype && user.empty()) + std::wstring user = GetTextAttribute(importSite, "User"); + std::wstring pass = DecodeLegacyPassword(GetTextAttribute(importSite, "Pass")); + std::wstring account = GetTextAttribute(importSite, "Account"); + if (logontype && user.empty()) { continue; + } // Find free name - wxString newName = name; + std::wstring newName = name; int i = 2; while (HasEntryWithName(existingSites, newName)) { - newName = wxString::Format(_T("%s %d"), name, i++); + newName = fz::sprintf(L"%s %d", name, i++); } auto server = existingSites.append_child("Server"); @@ -234,46 +255,41 @@ return true; } -bool CImportDialog::HasEntryWithName(pugi::xml_node element, const wxString& name) +bool CImportDialog::HasEntryWithName(pugi::xml_node element, std::wstring const& name) { pugi::xml_node child; for (child = element.child("Server"); child; child = child.next_sibling("Server")) { - wxString childName = GetTextElement(child); - childName.Trim(true); - childName.Trim(false); - if (!name.CmpNoCase(childName)) + std::wstring childName = GetTextElement_Trimmed(child); + if (!fz::stricmp(name, childName)) { return true; + } } for (child = element.child("Folder"); child; child = child.next_sibling("Folder")) { - wxString childName = GetTextElement(child); - childName.Trim(true); - childName.Trim(false); - if (!name.CmpNoCase(childName)) + std::wstring childName = GetTextElement_Trimmed(child); + if (!fz::stricmp(name, childName)) { return true; + } } return false; } -pugi::xml_node CImportDialog::GetFolderWithName(pugi::xml_node element, const wxString& name) +pugi::xml_node CImportDialog::GetFolderWithName(pugi::xml_node element, std::wstring const& name) { pugi::xml_node child; for (child = element.child("Server"); child; child = child.next_sibling("Server")) { - wxString childName = GetTextElement(child); - childName.Trim(true); - childName.Trim(false); - if (!name.CmpNoCase(childName)) { + std::wstring childName = GetTextElement_Trimmed(child); + if (!fz::stricmp(name, childName)) { // We do not allow servers and directories to share the same name return pugi::xml_node(); } } for (child = element.child("Folder"); child; child = child.next_sibling("Folder")) { - wxString childName = GetTextElement(child); - childName.Trim(true); - childName.Trim(false); - if (!name.CmpNoCase(childName)) + std::wstring childName = GetTextElement_Trimmed(child); + if (!fz::stricmp(name, childName)) { return child; + } } child = element.append_child("Folder"); @@ -296,11 +312,13 @@ } auto currentSites = element.child("Servers"); - if (!currentSites) + if (!currentSites) { currentSites = element.append_child("Servers"); + } - if (!ImportSites(sites, currentSites)) + if (!ImportSites(sites, currentSites)) { return false; + } return file.Save(true); } @@ -308,34 +326,38 @@ bool CImportDialog::ImportSites(pugi::xml_node sitesToImport, pugi::xml_node existingSites) { for (auto importFolder = sitesToImport.child("Folder"); importFolder; importFolder = importFolder.next_sibling("Folder")) { - wxString name = GetTextElement_Trimmed(importFolder, "Name"); - if (name.empty()) + std::wstring name = GetTextElement_Trimmed(importFolder, "Name"); + if (name.empty()) { name = GetTextElement_Trimmed(importFolder); - if (name.empty()) + } + if (name.empty()) { continue; + } - wxString newName = name; + std::wstring newName = name; int i = 2; pugi::xml_node folder; while (!(folder = GetFolderWithName(existingSites, newName))) { - newName = wxString::Format(_T("%s %d"), name, i++); + newName = fz::sprintf(L"%s %d", name, i++); } ImportSites(importFolder, folder); } for (auto importSite = sitesToImport.child("Server"); importSite; importSite = importSite.next_sibling("Server")) { - wxString name = GetTextElement_Trimmed(importSite, "Name"); - if (name.empty()) + std::wstring name = GetTextElement_Trimmed(importSite, "Name"); + if (name.empty()) { name = GetTextElement_Trimmed(importSite); - if (name.empty()) + } + if (name.empty()) { continue; + } // Find free name - wxString newName = name; + std::wstring newName = name; int i = 2; while (HasEntryWithName(existingSites, newName)) { - newName = wxString::Format(_T("%s %d"), name, i++); + newName = fz::sprintf(L"%s %d", name, i++); } auto server = existingSites.append_copy(importSite); diff -Nru filezilla-3.15.0.2/src/interface/import.h filezilla-3.33.0/src/interface/import.h --- filezilla-3.15.0.2/src/interface/import.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/import.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,12 +1,12 @@ -#ifndef __IMPORT_H__ -#define __IMPORT_H__ +#ifndef FILEZILLA_INTERFACE_IMPORT_HEADER +#define FILEZILLA_INTERFACE_IMPORT_HEADER #include "dialogex.h" #include "xmlfunctions.h" class CQueueView; -class CImportDialog : public wxDialogEx +class CImportDialog final : public wxDialogEx { public: CImportDialog(wxWindow* parent, CQueueView* pQueueView); @@ -16,16 +16,16 @@ protected: // Import function for Site Manager - bool HasEntryWithName(pugi::xml_node element, wxString const& name); - pugi::xml_node GetFolderWithName(pugi::xml_node element, wxString const& name); + bool HasEntryWithName(pugi::xml_node element, std::wstring const& name); + pugi::xml_node GetFolderWithName(pugi::xml_node element, std::wstring const& name); bool ImportSites(pugi::xml_node sites); bool ImportSites(pugi::xml_node sitesToImport, pugi::xml_node existingSites); bool ImportLegacySites(pugi::xml_node sites); bool ImportLegacySites(pugi::xml_node sitesToImport, pugi::xml_node existingSites); - wxString DecodeLegacyPassword(wxString pass); + std::wstring DecodeLegacyPassword(std::wstring const& pass); wxWindow* const m_parent; CQueueView* m_pQueueView; }; -#endif //__IMPORT_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/inputdialog.h filezilla-3.33.0/src/interface/inputdialog.h --- filezilla-3.15.0.2/src/interface/inputdialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/inputdialog.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,9 +1,9 @@ -#ifndef __INPUTDIALOG_H__ -#define __INPUTDIALOG_H__ +#ifndef FILEZILLA_INTERFACE_INPUTDIALOG_HEADER +#define FILEZILLA_INTERFACE_INPUTDIALOG_HEADER #include "dialogex.h" -class CInputDialog : public wxDialogEx +class CInputDialog final : public wxDialogEx { public: CInputDialog(); @@ -29,4 +29,4 @@ wxTextCtrl* m_pTextCtrl; }; -#endif //__INPUTDIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/interface.vcxproj filezilla-3.33.0/src/interface/interface.vcxproj --- filezilla-3.15.0.2/src/interface/interface.vcxproj 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/interface.vcxproj 2018-03-29 08:59:00.000000000 +0000 @@ -1,5 +1,5 @@  - + Debug @@ -14,40 +14,41 @@ FileZilla {760BA430-BB7F-44AB-9542-F8705CAFF92B} FileZilla - 8.1 - 8.1 + 10.0.15063.0 Application - v140 false Unicode true + v141 Application - v140 + v141 false Unicode - - - - + <_ProjectFileVersion>11.0.50727.1 + + $(wxwidgets_include);$(IncludePath) + $(wxwidgets_lib);$(LibraryPath) + - $(Configuration)\ + ..\bin\ $(Configuration)\ true + FileZilla_dbg $(Configuration)\ @@ -56,10 +57,10 @@ - /MP -Zm200 %(AdditionalOptions) + /MP -Zm200 /permissive- %(AdditionalOptions) Disabled .;../include/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;PACKAGE_VERSION="3.8.0-rc3";USED_HOST="i686-w64-mingw32";%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -79,12 +80,11 @@ 0x0407 - libgnutls-28.lib;normaliz.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;..\engine\Debug\engine.lib;win32_static_debug\libfilezilla.lib;Netapi32.lib;Winmm.lib;Ws2_32.lib;mpr.lib;sqlite3.lib;powrprof.lib;%(AdditionalDependencies) + libnettle.dll.a;libhogweed-4-2.lib;libgnutls-30.lib;normaliz.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;..\engine\Debug\engine.lib;win32_static_debug\libfilezilla.lib;Netapi32.lib;Winmm.lib;Ws2_32.lib;mpr.lib;sqlite3.lib;powrprof.lib;%(AdditionalDependencies) true .\Debug/FileZilla_dbg.pdb - ..\bin\FileZilla_dbg.exe Windows - true + DebugFastLink true false @@ -101,7 +101,7 @@ true true .;../include/;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;PACKAGE_VERSION="3.0.1";USED_HOST="i586-pc-mingw32msvc";%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -121,7 +121,7 @@ 0x0407 - libgnutls-28.lib;normaliz.lib;wsock32.lib;odbc32.lib;odbccp32.lib;comctl32.lib;..\engine\Release\engine.lib;Win32_static_release\libfilezilla.lib;Netapi32.lib;Winmm.lib;Ws2_32.lib;mpr.lib;sqlite3.lib;powrprof.lib;%(AdditionalDependencies) + libnettle.dll.a;libhogweed-4-2.lib;libgnutls-30.lib;normaliz.lib;wsock32.lib;odbc32.lib;odbccp32.lib;comctl32.lib;..\engine\Release\engine.lib;Win32_static_release\libfilezilla.lib;Netapi32.lib;Winmm.lib;Ws2_32.lib;mpr.lib;sqlite3.lib;powrprof.lib;%(AdditionalDependencies) true true .\Release/FileZilla.pdb @@ -153,6 +153,7 @@ + @@ -168,22 +169,29 @@ + + + + + + + @@ -214,7 +222,7 @@ - + @@ -229,6 +237,7 @@ + @@ -245,9 +254,10 @@ + - + @@ -270,6 +280,7 @@ + @@ -280,22 +291,29 @@ + + + + + + + @@ -326,7 +344,7 @@ - + @@ -341,6 +359,7 @@ + @@ -357,6 +376,7 @@ + diff -Nru filezilla-3.15.0.2/src/interface/ipcmutex.cpp filezilla-3.33.0/src/interface/ipcmutex.cpp --- filezilla-3.15.0.2/src/interface/ipcmutex.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/ipcmutex.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -10,7 +10,7 @@ std::list CReentrantInterProcessMutexLocker::m_mutexes; -CInterProcessMutex::CInterProcessMutex(enum t_ipcMutexType mutexType, bool initialLock /*=true*/) +CInterProcessMutex::CInterProcessMutex(t_ipcMutexType mutexType, bool initialLock) { m_locked = false; #ifdef __WXMSW__ @@ -156,7 +156,7 @@ #endif } -CReentrantInterProcessMutexLocker::CReentrantInterProcessMutexLocker(enum t_ipcMutexType mutexType) +CReentrantInterProcessMutexLocker::CReentrantInterProcessMutexLocker(t_ipcMutexType mutexType) { m_type = mutexType; diff -Nru filezilla-3.15.0.2/src/interface/ipcmutex.h filezilla-3.33.0/src/interface/ipcmutex.h --- filezilla-3.15.0.2/src/interface/ipcmutex.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/ipcmutex.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __IPCMUTEX_H__ -#define __IPCMUTEX_H__ +#ifndef FILEZILLA_INTERFACE_IPCMUTEX_HEADER +#define FILEZILLA_INTERFACE_IPCMUTEX_HEADER /* * Unfortunately wxWidgets does not provide interprocess mutexes, so I've to @@ -27,14 +27,15 @@ MUTEX_TRUSTEDCERTS = 8, MUTEX_GLOBALBOOKMARKS = 9, MUTEX_SEARCHCONDITIONS = 10, + MUTEX_MAC_SANDBOX_USERDIRS = 11, // Only used if configured with --enable-mac-sandbox - MUTEX_LASTFREE = 11 + MUTEX_LASTFREE = 12 }; class CInterProcessMutex { public: - CInterProcessMutex(enum t_ipcMutexType mutexType, bool initialLock = true); + CInterProcessMutex(t_ipcMutexType mutexType, bool initialLock = true); ~CInterProcessMutex(); bool Lock(); @@ -43,7 +44,7 @@ bool IsLocked() const { return m_locked; } - enum t_ipcMutexType GetType() const { return m_type; } + t_ipcMutexType GetType() const { return m_type; } private: @@ -55,7 +56,7 @@ static int m_fd; static int m_instanceCount; #endif - enum t_ipcMutexType m_type; + t_ipcMutexType m_type; bool m_locked; }; @@ -63,7 +64,7 @@ class CReentrantInterProcessMutexLocker { public: - CReentrantInterProcessMutexLocker(enum t_ipcMutexType mutexType); + CReentrantInterProcessMutexLocker(t_ipcMutexType mutexType); ~CReentrantInterProcessMutexLocker(); protected: @@ -74,7 +75,7 @@ }; static std::list m_mutexes; - enum t_ipcMutexType m_type; + t_ipcMutexType m_type; }; -#endif //__IPCMUTEX_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/led.cpp filezilla-3.33.0/src/interface/led.cpp --- filezilla-3.15.0.2/src/interface/led.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/led.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -18,7 +18,7 @@ CLed::CLed(wxWindow *parent, unsigned int index) : m_index(index ? 1 : 0) { -#ifdef __WXGTK__ +#if defined(__WXGTK20__) && !defined(__WXGTK3__) SetBackgroundStyle(wxBG_STYLE_TRANSPARENT); #endif @@ -73,7 +73,7 @@ return; } - if (!CFileZillaEngine::IsActive((enum CFileZillaEngine::_direction)m_index)) { + if (!CFileZillaEngine::IsActive(static_cast(m_index))) { Unset(); m_timer.Stop(); } diff -Nru filezilla-3.15.0.2/src/interface/led.h filezilla-3.33.0/src/interface/led.h --- filezilla-3.15.0.2/src/interface/led.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/led.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __LED_H__ -#define __LED_H__ +#ifndef FILEZILLA_INTERFACE_LED_HEADER +#define FILEZILLA_INTERFACE_LED_HEADER #include #include @@ -31,4 +31,4 @@ void OnEnterWindow(wxMouseEvent& event); }; -#endif //__LED_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/listctrlex.cpp filezilla-3.33.0/src/interface/listctrlex.cpp --- filezilla-3.15.0.2/src/interface/listctrlex.cpp 2016-02-09 18:50:17.000000000 +0000 +++ filezilla-3.33.0/src/interface/listctrlex.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -130,7 +130,7 @@ else if (item >= GetItemCount()) { item = GetItemCount() - 1; } - + const int current = GetTopItem(); int delta = item - current; @@ -152,7 +152,7 @@ // Keyboard navigation within items fz::datetime now = fz::datetime::now(); - if (m_prefixSearch_lastKeyPress.empty()) { + if (!m_prefixSearch_lastKeyPress.empty()) { fz::duration span = now - m_prefixSearch_lastKeyPress; if (span.get_seconds() >= 1) { m_prefixSearch_prefix = _T(""); @@ -495,30 +495,30 @@ void wxListCtrlEx::SaveColumnSettings(int widthsOptionId, int visibilityOptionId, int sortOptionId) { - if (widthsOptionId != -1) + if (widthsOptionId != -1) { SaveColumnWidths(widthsOptionId); + } - if (visibilityOptionId != -1) - { - wxString visibleColumns; - for (unsigned int i = 0; i < m_columnInfo.size(); i++) - { - if (m_columnInfo[i].shown) - visibleColumns += _T("1"); - else - visibleColumns += _T("0"); + if (visibilityOptionId != -1) { + std::wstring visibleColumns; + for (unsigned int i = 0; i < m_columnInfo.size(); ++i) { + if (m_columnInfo[i].shown) { + visibleColumns += L"1"; + } + else { + visibleColumns += L"0"; + } } COptions::Get()->SetOption(visibilityOptionId, visibleColumns); } - if (sortOptionId != -1) - { - wxString order; - for (unsigned int i = 0; i < m_columnInfo.size(); i++) - { - if (i) - order += _T(","); - order += wxString::Format(_T("%d"), m_columnInfo[i].order); + if (sortOptionId != -1) { + std::wstring order; + for (unsigned int i = 0; i < m_columnInfo.size(); ++i) { + if (i) { + order += L","; + } + order += fz::to_wstring(m_columnInfo[i].order); } COptions::Get()->SetOption(sortOptionId, order); } @@ -577,7 +577,7 @@ } widths.RemoveLast(); - COptions::Get()->SetOption(optionId, widths); + COptions::Get()->SetOption(optionId, widths.ToStdWstring()); } @@ -657,10 +657,8 @@ void wxListCtrlEx::CreateVisibleColumnMapping() { int pos = 0; - for (unsigned int j = 0; j < m_columnInfo.size(); j++) - { - for (unsigned int i = 0; i < m_columnInfo.size(); i++) - { + for (unsigned int j = 0; j < m_columnInfo.size(); ++j) { + for (unsigned int i = 0; i < m_columnInfo.size(); ++i) { const t_columnInfo &column = m_columnInfo[i]; if (!column.shown) @@ -768,40 +766,38 @@ wxCheckListBox* pListBox = XRCCTRL(dlg, "ID_ACTIVE", wxCheckListBox); dlg.m_order = new int[m_columnInfo.size()]; - for (unsigned int j = 0; j < m_columnInfo.size(); j++) - { - for (unsigned int i = 0; i < m_columnInfo.size(); i++) - { - if (m_columnInfo[i].order != j) + for (unsigned int j = 0; j < m_columnInfo.size(); ++j) { + for (unsigned int i = 0; i < m_columnInfo.size(); ++i) { + if (m_columnInfo[i].order != j) { continue; + } dlg.m_order[j] = i; pListBox->Append(m_columnInfo[i].name); - if (m_columnInfo[i].shown) + if (m_columnInfo[i].shown) { pListBox->Check(j); + } } } wxASSERT(pListBox->GetCount() == m_columnInfo.size()); dlg.GetSizer()->Fit(&dlg); - if (dlg.ShowModal() != wxID_OK) - { + if (dlg.ShowModal() != wxID_OK) { delete [] dlg.m_order; return; } - for (unsigned int i = 0; i < m_columnInfo.size(); i++) - { + for (unsigned int i = 0; i < m_columnInfo.size(); ++i) { int col = dlg.m_order[i]; bool isChecked = pListBox->IsChecked(i); - if (!isChecked && !col) - { + if (!isChecked && !col) { isChecked = true; wxMessageBoxEx(_("The filename column cannot be hidden.")); } MoveColumn(col, i); - if (m_columnInfo[col].shown != isChecked) + if (m_columnInfo[col].shown != isChecked) { ShowColumn(col, isChecked); + } } delete [] dlg.m_order; @@ -812,13 +808,14 @@ int wxListCtrlEx::GetColumnVisibleIndex(int col) { - if (!m_pVisibleColumnMapping) + if (!m_pVisibleColumnMapping) { return -1; + } - for (int i = 0; i < GetColumnCount(); i++) - { - if (m_pVisibleColumnMapping[i] == (unsigned int)col) + for (int i = 0; i < GetColumnCount(); ++i) { + if (m_pVisibleColumnMapping[i] == (unsigned int)col) { return i; + } } return -1; @@ -826,8 +823,9 @@ int wxListCtrlEx::GetHeaderSortIconIndex(int col) { - if (col < 0 || col >= GetColumnCount()) + if (col < 0 || col >= GetColumnCount()) { return -1; + } #ifdef __WXMSW__ HWND hWnd = (HWND)GetHandle(); @@ -837,14 +835,16 @@ item.mask = HDI_IMAGE | HDI_FORMAT; SendMessage(header, HDM_GETITEM, col, (LPARAM)&item); - if (!(item.fmt & HDF_IMAGE)) + if (!(item.fmt & HDF_IMAGE)) { return -1; + } return item.iImage; #else wxListItem item; - if (!GetColumn(col, item)) + if (!GetColumn(col, item)) { return -1; + } return item.GetImage(); #endif @@ -852,113 +852,66 @@ void wxListCtrlEx::InitHeaderSortImageList() { -#ifdef __WXMSW__ - if (wxPlatformInfo::Get().GetOSMajorVersion() >= 6) - return; - - // Initialize imagelist for list header - m_pHeaderImageList = new wxImageListEx(8, 8, true, 3); - - wxBitmap bmp; - - bmp.LoadFile(wxGetApp().GetResourceDir().GetPath() + _T("up.png"), wxBITMAP_TYPE_PNG); - m_pHeaderImageList->Add(bmp); - bmp.LoadFile(wxGetApp().GetResourceDir().GetPath() + _T("down.png"), wxBITMAP_TYPE_PNG); - m_pHeaderImageList->Add(bmp); - - HWND hWnd = (HWND)GetHandle(); - if (!hWnd) - { - delete m_pHeaderImageList; - m_pHeaderImageList = 0; - return; - } - - HWND header = (HWND)SendMessage(hWnd, LVM_GETHEADER, 0, 0); - if (!header) - { - delete m_pHeaderImageList; - m_pHeaderImageList = 0; - return; - } - - TCHAR buffer[1000] = {0}; - HDITEM item; - item.mask = HDI_TEXT; - item.pszText = buffer; - item.cchTextMax = 999; - SendMessage(header, HDM_GETITEM, 0, (LPARAM)&item); - - SendMessage(header, HDM_SETIMAGELIST, 0, (LPARAM)m_pHeaderImageList->GetHandle()); - - m_header_icon_index.up = 0; - m_header_icon_index.down = 1; -#else - +#ifndef __WXMSW__ wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); wxString lightness; - if (colour.Red() + colour.Green() + colour.Blue() > 3 * 128) + if (colour.Red() + colour.Green() + colour.Blue() > 3 * 128) { lightness = _T("DARK"); - else + } + else { lightness = _T("LIGHT"); + } - wxBitmap bmp; - - bmp = wxArtProvider::GetBitmap(_T("ART_SORT_UP_") + lightness, wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); - m_header_icon_index.up = GetSystemImageList()->Add(bmp); - bmp = wxArtProvider::GetBitmap(_T("ART_SORT_DOWN_") + lightness, wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); - m_header_icon_index.down = GetSystemImageList()->Add(bmp); + auto * imageList = GetSystemImageList(); + if (imageList) { + wxBitmap bmp; + + bmp = wxArtProvider::GetBitmap(_T("ART_SORT_UP_") + lightness, wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); + m_header_icon_index.up = imageList->Add(bmp); + bmp = wxArtProvider::GetBitmap(_T("ART_SORT_DOWN_") + lightness, wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); + m_header_icon_index.down = imageList->Add(bmp); + } #endif } void wxListCtrlEx::SetHeaderSortIconIndex(int col, int icon) { - if (col < 0 || col >= GetColumnCount()) + if (col < 0 || col >= GetColumnCount()) { return; + } #ifdef __WXMSW__ HWND hWnd = (HWND)GetHandle(); HWND header = (HWND)SendMessage(hWnd, LVM_GETHEADER, 0, 0); - wxChar buffer[100]; - HDITEM item = {0}; - item.mask = HDI_TEXT | HDI_FORMAT; - item.pszText = buffer; - item.cchTextMax = 99; + HDITEM item = {}; + item.mask = HDI_FORMAT; SendMessage(header, HDM_GETITEM, col, (LPARAM)&item); - if (icon != -1) - { - if (wxPlatformInfo::Get().GetOSMajorVersion() >= 6) - { - item.fmt &= ~(HDF_IMAGE | HDF_BITMAP_ON_RIGHT | HDF_SORTUP | HDF_SORTDOWN); - item.iImage = -1; - if (icon) - item.fmt |= HDF_SORTDOWN; - else - item.fmt |= HDF_SORTUP; + if (icon != -1) { + item.fmt &= ~(HDF_IMAGE | HDF_BITMAP_ON_RIGHT | HDF_SORTUP | HDF_SORTDOWN); + item.iImage = -1; + if (icon) { + item.fmt |= HDF_SORTDOWN; } - else - { - item.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN); - item.fmt |= HDF_IMAGE | HDF_BITMAP_ON_RIGHT; - item.iImage = icon ? m_header_icon_index.down : m_header_icon_index.up; - item.mask |= HDI_IMAGE; + else { + item.fmt |= HDF_SORTUP; } } - else - { + else { item.fmt &= ~(HDF_IMAGE | HDF_BITMAP_ON_RIGHT | HDF_SORTUP | HDF_SORTDOWN); item.iImage = -1; } SendMessage(header, HDM_SETITEM, col, (LPARAM)&item); #else wxListItem item; - if (!GetColumn(col, item)) + if (!GetColumn(col, item)) { return; + } - if( icon != -1 ) + if (icon != -1) { icon = icon ? m_header_icon_index.down : m_header_icon_index.up; + } item.SetImage(icon); SetColumn(col, item); @@ -992,23 +945,23 @@ void wxListCtrlEx::OnBeginLabelEdit(wxListEvent& event) { #ifndef __WXMSW__ - if (m_editing) - { + if (m_editing) { event.Veto(); return; } #endif - if (m_blockedLabelEditing) - { + if (m_blockedLabelEditing) { event.Veto(); return; } - if (!OnBeginRename(event)) + if (!OnBeginRename(event)) { event.Veto(); + } #ifndef __WXMSW__ - else + else { m_editing = true; + } #endif } @@ -1016,35 +969,36 @@ { #ifdef __WXMAC__ int item = event.GetIndex(); - if (item != -1) - { + if (item != -1) { int to = item + 1; - if (to < GetItemCount()) - { + if (to < GetItemCount()) { int from = item; - if (from) + if (from) { from--; + } RefreshItems(from, to); } - else + else { RefreshListOnly(); + } } #endif #ifndef __WXMSW__ - if (!m_editing) - { + if (!m_editing) { event.Veto(); return; } m_editing = false; #endif - if (event.IsEditCancelled()) + if (event.IsEditCancelled()) { return; + } - if (!OnAcceptRename(event)) + if (!OnAcceptRename(event)) { event.Veto(); + } } bool wxListCtrlEx::OnBeginRename(const wxListEvent&) @@ -1059,16 +1013,15 @@ void wxListCtrlEx::SetLabelEditBlock(bool block) { - if (block) - { + if (block) { CancelLabelEdit(); ++m_blockedLabelEditing; } - else - { + else { wxASSERT(m_blockedLabelEditing); - if (m_blockedLabelEditing > 0) - m_blockedLabelEditing--; + if (m_blockedLabelEditing > 0) { + --m_blockedLabelEditing; + } } } @@ -1085,8 +1038,9 @@ void wxListCtrlEx::OnColumnDragging(wxListEvent& event) { - if (event.GetItem().GetWidth() < MIN_COLUMN_WIDTH) + if (event.GetItem().GetWidth() < MIN_COLUMN_WIDTH) { event.Veto(); + } } #ifdef __WXMSW__ @@ -1097,8 +1051,9 @@ NMHDR *nmhdr = (NMHDR *)lParam; HWND hwndHdr = ListView_GetHeader((HWND)GetHandle()); - if (nmhdr->hwndFrom != hwndHdr) + if (nmhdr->hwndFrom != hwndHdr) { return wxListCtrl::MSWOnNotify(idCtrl, lParam, result); + } HD_NOTIFY *nmHDR = (HD_NOTIFY *)nmhdr; @@ -1129,9 +1084,9 @@ return false; case HDN_DIVIDERDBLCLICK: { - wxListEvent event(wxEVT_LIST_COL_END_DRAG, GetId()); - event.SetEventObject(this); - AddPendingEvent(event); + auto event = new wxListEvent(wxEVT_LIST_COL_END_DRAG, GetId()); + event->SetEventObject(this); + QueueEvent(event); } break; } diff -Nru filezilla-3.15.0.2/src/interface/listctrlex.h filezilla-3.33.0/src/interface/listctrlex.h --- filezilla-3.15.0.2/src/interface/listctrlex.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/listctrlex.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __LISTCTRLEX_H__ -#define __LISTCTRLEX_H__ +#ifndef FILEZILLA_INTERFACE_LISTCTRLEX_HEADER +#define FILEZILLA_INTERFACE_LISTCTRLEX_HEADER #include "systemimagelist.h" #include @@ -90,7 +90,7 @@ protected: virtual void OnPostScroll(); - virtual void OnPreEmitPostScrollEvent(); + virtual void OnPreEmitPostScrollEvent() final; void EmitPostScrollEvent(); virtual wxString GetItemText(int, unsigned int) { return _T(""); } @@ -172,4 +172,4 @@ wxListCtrlEx& m_listCtrl; }; -#endif //__LISTCTRLEX_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/listingcomparison.cpp filezilla-3.33.0/src/interface/listingcomparison.cpp --- filezilla-3.15.0.2/src/interface/listingcomparison.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/listingcomparison.cpp 2016-10-01 03:30:03.000000000 +0000 @@ -47,11 +47,13 @@ void CComparableListing::RefreshComparison() { - if (!m_pComparisonManager) + if (!m_pComparisonManager) { return; + } - if (!IsComparing()) + if (!IsComparing()) { return; + } if (!CanStartComparison() || !GetOther() || !GetOther()->CanStartComparison()) { return; @@ -62,12 +64,13 @@ bool CComparisonManager::CompareListings() { - if (!m_pLeft || !m_pRight) + if (!m_pLeft || !m_pRight) { return false; + } CFilterManager filters; if (filters.HasActiveFilters() && !filters.HasSameLocalAndRemoteFilters()) { - m_pState->NotifyHandlers(STATECHANGE_COMPARISON); + m_state.NotifyHandlers(STATECHANGE_COMPARISON); wxMessageBoxEx(_("Cannot compare directories, different filters for local and remote directories are enabled"), _("Directory comparison failed"), wxICON_EXCLAMATION); return false; } @@ -76,7 +79,7 @@ m_pLeft->m_pComparisonManager = this; m_pRight->m_pComparisonManager = this; - m_pState->NotifyHandlers(STATECHANGE_COMPARISON); + m_state.NotifyHandlers(STATECHANGE_COMPARISON); wxString error; if (!m_pLeft->CanStartComparison() || !m_pRight->CanStartComparison()) { @@ -114,8 +117,8 @@ } } else { - if (!localDate.empty() || !remoteDate.empty()) { - if (!hide_identical || localDate.empty() || remoteDate.empty() || localFile == _T("..")) { + if (localDate.empty() || remoteDate.empty()) { + if (!hide_identical || !localDate.empty() || !remoteDate.empty() || localFile == _T("..")) { const CComparableListing::t_fileEntryFlags flag = CComparableListing::normal; m_pLeft->CompareAddFile(flag); m_pRight->CompareAddFile(flag); @@ -211,8 +214,8 @@ return 0; } -CComparisonManager::CComparisonManager(CState* pState) - : m_pState(pState) +CComparisonManager::CComparisonManager(CState& state) + : m_state(state) { } @@ -248,5 +251,5 @@ if (m_pRight) m_pRight->OnExitComparisonMode(); - m_pState->NotifyHandlers(STATECHANGE_COMPARISON); + m_state.NotifyHandlers(STATECHANGE_COMPARISON); } diff -Nru filezilla-3.15.0.2/src/interface/listingcomparison.h filezilla-3.33.0/src/interface/listingcomparison.h --- filezilla-3.15.0.2/src/interface/listingcomparison.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/listingcomparison.h 2017-12-09 04:30:04.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __LISTINGCOMPARISON_H__ -#define __LISTINGCOMPARISON_H__ +#ifndef FILEZILLA_INTERFACE_LISTINGCOMPARISON_HEADER +#define FILEZILLA_INTERFACE_LISTINGCOMPARISON_HEADER class CComparisonManager; class CComparableListing @@ -7,7 +7,7 @@ friend class CComparisonManager; public: CComparableListing(wxWindow* pParent); - virtual ~CComparableListing() {} + virtual ~CComparableListing() = default; enum t_fileEntryFlags { @@ -49,7 +49,7 @@ class CComparisonManager { public: - CComparisonManager(CState* pState); + CComparisonManager(CState& state); bool CompareListings(); bool IsComparing() const { return m_isComparing; } @@ -61,7 +61,7 @@ protected: int CompareFiles(const int dirSortMode, const wxString& local, const wxString& remote, bool localDir, bool remoteDir); - CState* m_pState; + CState& m_state; // Left/right, first/second, a/b, doesn't matter CComparableListing* m_pLeft{}; @@ -70,4 +70,4 @@ bool m_isComparing{}; }; -#endif //__LISTINGCOMPARISON_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/list_search_panel.cpp filezilla-3.33.0/src/interface/list_search_panel.cpp --- filezilla-3.15.0.2/src/interface/list_search_panel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/list_search_panel.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -0,0 +1,219 @@ +#include +#include "filezillaapp.h" + +#include "state.h" +#include "list_search_panel.h" + +#include "themeprovider.h" + +#include +#include + +wxWindowID const ID_SEARCH_TEXT = wxWindow::NewControlId(); +wxWindowID const ID_OPTIONS_MENU_BUTTON = wxWindow::NewControlId(); +wxWindowID const ID_CLOSE_BUTTON = wxWindow::NewControlId(); +wxWindowID const ID_CASE_INSENSITIVE = wxWindow::NewControlId(); +wxWindowID const ID_USE_REGEX = wxWindow::NewControlId(); +wxWindowID const ID_INVERT_FILTER = wxWindow::NewControlId(); + +BEGIN_EVENT_TABLE(CListSearchPanel, wxWindow) +EVT_PAINT(CListSearchPanel::OnPaint) +EVT_TEXT(ID_SEARCH_TEXT, CListSearchPanel::OnText) +EVT_BUTTON(ID_OPTIONS_MENU_BUTTON, CListSearchPanel::OnOptions) +EVT_BUTTON(ID_CLOSE_BUTTON, CListSearchPanel::OnClose) +EVT_MENU(ID_CASE_INSENSITIVE, CListSearchPanel::OnCaseInsensitive) +EVT_MENU(ID_USE_REGEX, CListSearchPanel::OnUseRegex) +EVT_MENU(ID_INVERT_FILTER, CListSearchPanel::OnInvertFilter) +END_EVENT_TABLE() + +CListSearchPanel::CListSearchPanel(wxWindow* parent, wxWindow* pListView, CState* pState, bool local) + : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) + , m_listView(pListView) + , m_pState(pState) + , m_local(local) +{ + Hide(); + SetBackgroundStyle(wxBG_STYLE_SYSTEM); + + // sizer + wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); + + // label + auto label = new wxStaticText(this, wxID_ANY, _("Quick Search:")); + sizer->Add(label, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5); + + // edit + m_textCtrl = new wxTextCtrl(this, ID_SEARCH_TEXT); + m_textCtrl->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CListSearchPanel::OnTextKeyDown), 0, this); + sizer->Add(m_textCtrl, 1, wxEXPAND | wxALL, 5); + int const editHeight = m_textCtrl->GetSize().GetHeight(); + + // options button + wxBitmap dropdownBmp(wxGetApp().GetResourceDir().GetPath() + _T("dropdown.png"), wxBITMAP_TYPE_PNG); + wxSize bs(editHeight, editHeight); + m_optionsButton = new wxBitmapButton(this, ID_OPTIONS_MENU_BUTTON, dropdownBmp, wxDefaultPosition, bs); + m_optionsButton->SetToolTip(_("Options")); + sizer->Add(m_optionsButton, 0, wxTOP | wxBOTTOM | wxRIGHT, 5); + + // close button + wxBitmap closeBmp = CThemeProvider::Get()->GetBitmap(L"ART_CLOSE", wxART_OTHER, CThemeProvider::GetIconSize(iconSizeTiny)); + auto closeButton = new wxBitmapButton(this, ID_CLOSE_BUTTON, closeBmp, wxDefaultPosition, bs); + closeButton->SetToolTip(_("Close")); + sizer->Add(closeButton, 0, wxTOP | wxBOTTOM | wxRIGHT, 5); + + SetSizerAndFit(sizer); +} + +bool CListSearchPanel::Show(bool show) +{ + bool ret = wxWindow::Show(show); + + wxSizeEvent evt; + GetParent()->ProcessWindowEvent(evt); + + if (show) { + m_textCtrl->SetFocus(); + } + + return ret; +} + +void CListSearchPanel::ApplyFilter() +{ + if (m_text.empty()) { + return; + } + + CFilter filter; + filter.filterFiles = true; + filter.filterDirs = true; + filter.matchType = m_invertFilter ? CFilter::all : CFilter::not_all; + filter.matchCase = !m_caseInsensitive; + + CFilterCondition condition; + condition.type = filter_name; + + condition.strValue = m_text; + condition.pRegEx.reset(); + condition.condition = 0; // "contains" + condition.matchCase = !m_caseInsensitive; + + if (m_useRegex) { + condition.condition = 4; // "matches regex" + + if (!condition.CompileRegex()) { + return; + } + } + + filter.filters.push_back(condition); + + CStateFilterManager& filterManager = m_pState->GetStateFilterManager(); + + if (m_local) { + filterManager.SetLocalFilter(filter); + } + else { + filterManager.SetRemoteFilter(filter); + } + + m_pState->NotifyHandlers(STATECHANGE_APPLYFILTER); +} + +void CListSearchPanel::ResetFilter() +{ + CStateFilterManager& filterManager = m_pState->GetStateFilterManager(); + + if (m_local) { + filterManager.SetLocalFilter(CFilter()); + } + else { + filterManager.SetRemoteFilter(CFilter()); + } + + m_pState->NotifyHandlers(STATECHANGE_APPLYFILTER); +} + +void CListSearchPanel::Close() +{ + Hide(); + + ResetFilter(); + + m_textCtrl->ChangeValue(wxString()); + + if (m_listView) { + m_listView->SetFocus(); + } +} + +void CListSearchPanel::OnClose(wxCommandEvent&) +{ + Close(); +} + +void CListSearchPanel::OnPaint(wxPaintEvent&) +{ + wxPaintDC dc(this); + + wxSize const s = GetClientSize(); + + dc.DrawLine(wxPoint(0, 0), wxPoint(s.GetWidth(), 0)); +} + +void CListSearchPanel::OnText(wxCommandEvent&) +{ + wxString text = m_textCtrl->GetValue(); + + if (text != m_text) { + m_text = text; + + if (text.IsEmpty()) { + ResetFilter(); + } + else { + ApplyFilter(); + } + } +} + +void CListSearchPanel::OnOptions(wxCommandEvent&) +{ + if (!m_optionsMenu) { + m_optionsMenu = new wxMenu; + wxMenuItem* item = m_optionsMenu->AppendCheckItem(ID_CASE_INSENSITIVE, _("Case Insensitive")); + item->Check(); + m_optionsMenu->AppendCheckItem(ID_USE_REGEX, _("Use Regular Expressions")); + m_optionsMenu->AppendCheckItem(ID_INVERT_FILTER, _("Invert Filter")); + } + + PopupMenu(m_optionsMenu, m_optionsButton->GetPosition()); +} + +void CListSearchPanel::OnCaseInsensitive(wxCommandEvent&) +{ + m_caseInsensitive = m_optionsMenu->IsChecked(ID_CASE_INSENSITIVE); + ApplyFilter(); +} + +void CListSearchPanel::OnUseRegex(wxCommandEvent&) +{ + m_useRegex = m_optionsMenu->IsChecked(ID_USE_REGEX); + ApplyFilter(); +} + +void CListSearchPanel::OnInvertFilter(wxCommandEvent&) +{ + m_invertFilter = m_optionsMenu->IsChecked(ID_INVERT_FILTER); + ApplyFilter(); +} + +void CListSearchPanel::OnTextKeyDown(wxKeyEvent& event) +{ + if (event.GetKeyCode() == WXK_ESCAPE) { + Close(); + return; + } + + event.Skip(); +} diff -Nru filezilla-3.15.0.2/src/interface/list_search_panel.h filezilla-3.33.0/src/interface/list_search_panel.h --- filezilla-3.15.0.2/src/interface/list_search_panel.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/list_search_panel.h 2017-10-25 17:12:23.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef FILEZILLA_INTERFACE_LIST_SEARCH_PANEL_HEADER +#define FILEZILLA_INTERFACE_LIST_SEARCH_PANEL_HEADER + +#include + +class wxBitmapButton; + +class CListSearchPanel final : public wxWindow +{ +public: + CListSearchPanel(wxWindow* pParent, wxWindow* pListView, CState* pState, bool local); + CListSearchPanel(CListSearchPanel const&) = delete; + + virtual bool Show(bool show); + void Close(); + +private: + wxDECLARE_EVENT_TABLE(); + void OnPaint(wxPaintEvent& ev); + void OnText(wxCommandEvent& ev); + void OnOptions(wxCommandEvent& ev); + void OnClose(wxCommandEvent& ev); + void OnCaseInsensitive(wxCommandEvent& ev); + void OnUseRegex(wxCommandEvent& ev); + void OnInvertFilter(wxCommandEvent& ev); + void OnTextKeyDown(wxKeyEvent& event); + + void ApplyFilter(); + void ResetFilter(); + + wxTextCtrl* m_textCtrl{}; + wxBitmapButton* m_optionsButton{}; + wxMenu* m_optionsMenu{}; + + wxWindow* m_listView{}; + CState* m_pState{}; + + bool m_local{}; // or remote + wxString m_text; + bool m_caseInsensitive{true}; + bool m_useRegex{}; + bool m_invertFilter{}; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/interface/locale_initializer.cpp filezilla-3.33.0/src/interface/locale_initializer.cpp --- filezilla-3.15.0.2/src/interface/locale_initializer.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/locale_initializer.cpp 2016-09-28 08:57:50.000000000 +0000 @@ -229,45 +229,16 @@ std::string CInitializer::ReadSettingsFromDefaults(std::string file) { std::string dir = CInitializer::GetSettingFromFile(file, "Config Location"); - - if (dir.empty()) - return ""; - - std::string result; - while (!dir.empty()) - { - std::string token; - int pos = dir.find('/'); - if (pos == -1) - token.swap(dir); - else - { - token = dir.substr(0, pos); - dir = dir.substr(pos + 1); - } - - if (!token.empty() && token[0] == '$') - { - if (token[1] == '$') - result += token.substr(1); - else if (token.size() > 1) - { - std::string value = mkstr(getenv(token.substr(1).c_str())); - result += value; - } - } - else - result += token; - - result += '/'; - } + auto result = ExpandPath(dir); struct stat buf; - if (stat(result.c_str(), &buf)) + if (stat(result.c_str(), &buf)) { return ""; + } - if (result[result.size() - 1] != '/') + if (result[result.size() - 1] != '/') { result += '/'; + } return result; } diff -Nru filezilla-3.15.0.2/src/interface/locale_initializer.h filezilla-3.33.0/src/interface/locale_initializer.h --- filezilla-3.15.0.2/src/interface/locale_initializer.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/locale_initializer.h 2016-11-30 04:30:02.000000000 +0000 @@ -1,4 +1,7 @@ -#ifndef __LOCALE_INITIALIZER_H__ +#ifndef FILEZILLA_LOCALE_INITIALIZER_HEADER +#define FILEZILLA_LOCALE_INITIALIZER_HEADER + +#include wxString GetFallbackLocale(wxString const& locale); @@ -29,4 +32,52 @@ #endif //__WXGTK__ -#endif //__LOCALE_INITIALIZER_H__ +template +String ExpandPath(String dir) +{ + if (dir.empty()) { + return dir; + } + + String result; + while (!dir.empty()) { + String token; +#ifdef FZ_WINDOWS + size_t pos = dir.find_first_of(fzS(typename String::value_type, "\\/")); +#else + size_t pos = dir.find('/'); +#endif + if (pos == String::npos) { + token.swap(dir); + } + else { + token = dir.substr(0, pos); + dir = dir.substr(pos + 1); + } + + if (token[0] == '$') { + if (token[1] == '$') { + result += token.substr(1); + } + else if (token.size() > 1) { + char* env = getenv(fz::to_string(token.substr(1)).c_str()); + if (env) { + result += fz::toString(env); + } + } + } + else { + result += token; + } + +#ifdef FZ_WINDOWS + result += '\\'; +#else + result += '/'; +#endif + } + + return result; +} + +#endif diff -Nru filezilla-3.15.0.2/src/interface/LocalListView.cpp filezilla-3.33.0/src/interface/LocalListView.cpp --- filezilla-3.15.0.2/src/interface/LocalListView.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/LocalListView.cpp 2018-05-01 03:30:04.000000000 +0000 @@ -2,6 +2,7 @@ #define FILELISTCTRL_INCLUDE_TEMPLATE_DEFINITION +#include "view.h" #include "LocalListView.h" #include "queue.h" #include "filezillaapp.h" @@ -16,17 +17,19 @@ #include #include "volume_enumerator.h" #endif -#include "edithandler.h" #include "dragdropmanager.h" #include "drop_target_ex.h" +#include "edithandler.h" #include "filelist_statusbar.h" +#include "graphics.h" +#include "local_recursive_operation.h" #include "sizeformatting.h" #include "timeformatting.h" #include #include -class CLocalListViewDropTarget : public CScrollableDropTarget +class CLocalListViewDropTarget final : public CScrollableDropTarget { public: CLocalListViewDropTarget(CLocalListView* pLocalListView) @@ -61,59 +64,65 @@ if (def == wxDragError || def == wxDragNone || def == wxDragCancel) + { return def; + } - if (m_pLocalListView->m_fileData.empty()) + if (m_pLocalListView->m_fileData.empty()) { return wxDragError; + } - if (def != wxDragCopy && def != wxDragMove) + if (def != wxDragCopy && def != wxDragMove) { return wxDragError; + } CDragDropManager* pDragDropManager = CDragDropManager::Get(); - if (pDragDropManager) + if (pDragDropManager) { pDragDropManager->pDropTarget = m_pLocalListView; + } - wxString subdir; + std::wstring subdir; int flags; int hit = m_pLocalListView->HitTest(wxPoint(x, y), flags, 0); - if (hit != -1 && (flags & wxLIST_HITTEST_ONITEM)) - { + if (hit != -1 && (flags & wxLIST_HITTEST_ONITEM)) { const CLocalFileData* const data = m_pLocalListView->GetData(hit); - if (data && data->dir) + if (data && data->dir) { subdir = data->name; + } } - CLocalPath dir = m_pLocalListView->m_pState->GetLocalDir(); - if (!subdir.empty()) - { - if (!dir.ChangePath(subdir)) + CLocalPath dir = m_pLocalListView->m_state.GetLocalDir(); + if (!subdir.empty()) { + if (!dir.ChangePath(subdir)) { return wxDragError; + } } - if (!dir.IsWriteable()) + if (!dir.IsWriteable()) { return wxDragError; + } - if (!GetData()) + if (!GetData()) { return wxDragError; + } - if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) - m_pLocalListView->m_pState->HandleDroppedFiles(m_pFileDataObject, dir, def == wxDragCopy); - else - { - if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) - { + if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) { + m_pLocalListView->m_state.HandleDroppedFiles(m_pFileDataObject, dir, def == wxDragCopy); + } + else { + if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) { wxMessageBoxEx(_("Drag&drop between different instances of FileZilla has not been implemented yet.")); return wxDragNone; } - if (!m_pLocalListView->m_pState->GetServer() || !m_pRemoteDataObject->GetServer().EqualsNoPass(*m_pLocalListView->m_pState->GetServer())) - { + if (!m_pLocalListView->m_state.GetServer() || m_pRemoteDataObject->GetServer().server != m_pLocalListView->m_state.GetServer().server) { wxMessageBoxEx(_("Drag&drop between different servers has not been implemented yet.")); return wxDragNone; } - if (!m_pLocalListView->m_pState->DownloadDroppedFiles(m_pRemoteDataObject, dir)) + if (!m_pLocalListView->m_state.DownloadDroppedFiles(m_pRemoteDataObject, dir)) { return wxDragNone; + } } return def; @@ -124,8 +133,9 @@ CScrollableDropTarget::OnDrop(x, y); ClearDropHighlight(); - if (m_pLocalListView->m_fileData.empty()) + if (m_pLocalListView->m_fileData.empty()) { return false; + } return true; } @@ -142,33 +152,33 @@ int flags; int hit = m_pLocalListView->HitTest(point, flags, 0); - if (!(flags & wxLIST_HITTEST_ONITEM)) + if (!(flags & wxLIST_HITTEST_ONITEM)) { hit = -1; + } - if (hit != -1) - { + if (hit != -1) { const CLocalFileData* const data = m_pLocalListView->GetData(hit); - if (!data || !data->dir) + if (!data || !data->dir) { hit = -1; - else - { + } + else { const CDragDropManager* pDragDropManager = CDragDropManager::Get(); - if (pDragDropManager && pDragDropManager->pDragSource == m_pLocalListView) - { - if (m_pLocalListView->GetItemState(hit, wxLIST_STATE_SELECTED)) + if (pDragDropManager && pDragDropManager->pDragSource == m_pLocalListView) { + if (m_pLocalListView->GetItemState(hit, wxLIST_STATE_SELECTED)) { hit = -1; - else + } + else { subDir = data->name; + } } - else + else { subDir = data->name; + } } } - if (hit != m_pLocalListView->m_dropTarget) - { + if (hit != m_pLocalListView->m_dropTarget) { ClearDropHighlight(); - if (hit != -1) - { + if (hit != -1) { m_pLocalListView->m_dropTarget = hit; #ifdef __WXMSW__ m_pLocalListView->SetItemState(hit, wxLIST_STATE_DROPHILITED, wxLIST_STATE_DROPHILITED); @@ -193,28 +203,29 @@ return def; } - if (m_pLocalListView->m_fileData.empty()) - { + if (m_pLocalListView->m_fileData.empty()) { ClearDropHighlight(); return wxDragNone; } - const wxString& subdir = DoDisplayDropHighlight(wxPoint(x, y)); + std::wstring const subdir = DoDisplayDropHighlight(wxPoint(x, y)).ToStdWstring(); - CLocalPath dir = m_pLocalListView->m_pState->GetLocalDir(); + CLocalPath dir = m_pLocalListView->m_state.GetLocalDir(); if (subdir.empty()) { const CDragDropManager* pDragDropManager = CDragDropManager::Get(); - if (pDragDropManager && pDragDropManager->localParent == m_pLocalListView->m_dir) + if (pDragDropManager && pDragDropManager->localParent == m_pLocalListView->m_dir) { return wxDragNone; + } } - else - { - if (!dir.ChangePath(subdir)) + else { + if (!dir.ChangePath(subdir)) { return wxDragNone; + } } - if (!dir.IsWriteable()) + if (!dir.IsWriteable()) { return wxDragNone; + } return def; } @@ -260,16 +271,16 @@ EVT_MENU(XRCID("ID_CONTEXT_REFRESH"), CLocalListView::OnMenuRefresh) END_EVENT_TABLE() -CLocalListView::CLocalListView(wxWindow* pParent, CState *pState, CQueueView *pQueue) - : CFileListCtrl(pParent, pState, pQueue), - CStateEventHandler(pState) -{ - wxGetApp().AddStartupProfileRecord(_T("CLocalListView::CLocalListView")); - m_pState->RegisterHandler(this, STATECHANGE_LOCAL_DIR); - m_pState->RegisterHandler(this, STATECHANGE_APPLYFILTER); - m_pState->RegisterHandler(this, STATECHANGE_LOCAL_REFRESH_FILE); - - m_dropTarget = -1; +CLocalListView::CLocalListView(CView* pParent, CState& state, CQueueView *pQueue) + : CFileListCtrl(pParent, pQueue), + CStateEventHandler(state), + m_parentView(pParent) +{ + wxGetApp().AddStartupProfileRecord("CLocalListView::CLocalListView"); + m_state.RegisterHandler(this, STATECHANGE_LOCAL_DIR); + m_state.RegisterHandler(this, STATECHANGE_APPLYFILTER); + m_state.RegisterHandler(this, STATECHANGE_LOCAL_REFRESH_FILE); + m_state.RegisterHandler(this, STATECHANGE_SERVER); const unsigned long widths[4] = { 120, 80, 100, 120 }; @@ -279,64 +290,64 @@ AddColumn(_("Last modified"), wxLIST_FORMAT_LEFT, widths[3]); LoadColumnSettings(OPTION_LOCALFILELIST_COLUMN_WIDTHS, OPTION_LOCALFILELIST_COLUMN_SHOWN, OPTION_LOCALFILELIST_COLUMN_ORDER); - InitSort(OPTION_LOCALFILELIST_SORTORDER); - SetImageList(GetSystemImageList(), wxIMAGE_LIST_SMALL); -#ifdef __WXMSW__ - m_pVolumeEnumeratorThread = 0; -#endif - InitHeaderSortImageList(); + InitSort(OPTION_LOCALFILELIST_SORTORDER); + SetDropTarget(new CLocalListViewDropTarget(this)); EnablePrefixSearch(true); + + m_windowTinter = std::make_unique(*GetMainWindow()); } CLocalListView::~CLocalListView() { wxString str = wxString::Format(_T("%d %d"), m_sortDirection, m_sortColumn); - COptions::Get()->SetOption(OPTION_LOCALFILELIST_SORTORDER, str); + COptions::Get()->SetOption(OPTION_LOCALFILELIST_SORTORDER, str.ToStdWstring()); #ifdef __WXMSW__ - delete m_pVolumeEnumeratorThread; + volumeEnumeratorThread_.reset(); #endif } bool CLocalListView::DisplayDir(CLocalPath const& dirname) { - + CancelLabelEdit(); wxString focused; std::list selectedNames; bool ensureVisible = false; - if (m_dir != dirname) - { + if (m_dir != dirname) { ResetSearchPrefix(); - if (IsComparing()) + if (IsComparing()) { ExitComparisonMode(); + } ClearSelection(); - focused = m_pState->GetPreviouslyVisitedLocalSubdir(); + focused = m_state.GetPreviouslyVisitedLocalSubdir(); ensureVisible = !focused.empty(); - if (focused.empty()) + if (focused.empty()) { focused = _T(".."); + } - if (GetItemCount()) + if (GetItemCount()) { EnsureVisible(0); + } m_dir = dirname; } - else - { + else { // Remember which items were selected selectedNames = RememberSelectedItems(focused); } - if (m_pFilelistStatusBar) + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->UnselectAll(); + } const int oldItemCount = m_indexMapping.size(); @@ -358,11 +369,11 @@ if (m_dir.GetPath() == _T("\\")) { DisplayDrives(); } - else if (m_dir.GetPath().Left(2) == _T("\\\\")) - { - int pos = m_dir.GetPath().Mid(2).Find('\\'); - if (pos != -1 && pos + 3 != (int)m_dir.GetPath().Len()) + else if (m_dir.GetPath().substr(0, 2) == _T("\\\\")) { + auto pos = m_dir.GetPath().find('\\', 2); + if (pos != std::wstring::npos && pos + 1 < m_dir.GetPath().size()) { goto regular_dir; + } // UNC path without shares DisplayShares(m_dir.GetPath()); @@ -373,7 +384,7 @@ #ifdef __WXMSW__ regular_dir: #endif - CFilterManager filter; + CStateFilterManager const& filter = m_state.GetStateFilterManager(); fz::local_filesys local_filesys; if (!local_filesys.begin_find_files(fz::to_native(m_dir.GetPath()), false)) { @@ -392,32 +403,37 @@ bool wasLink; fz::native_string name; while (local_filesys.get_next_file(name, wasLink, data.dir, &data.size, &data.time, &data.attributes)) { - if (name.empty()) { + data.name = fz::to_wstring(name); + if (name.empty() || data.name.empty()) { wxGetApp().DisplayEncodingWarning(); continue; } - data.name = name; m_fileData.push_back(data); if (!filter.FilenameFiltered(data.name, m_dir.GetPath(), data.dir, data.size, true, data.attributes, data.time)) { - if (data.dir) + if (data.dir) { totalDirCount++; + } else { - if (data.size != -1) + if (data.size != -1) { totalSize += data.size; - else + } + else { unknown_sizes++; + } totalFileCount++; } m_indexMapping.push_back(num); } - else + else { hidden++; + } num++; } - if (m_pFilelistStatusBar) + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->SetDirectoryContents(totalFileCount, totalDirCount, totalSize, unknown_sizes, hidden); + } } if (m_dropTarget != -1) { @@ -429,8 +445,9 @@ } const int count = m_indexMapping.size(); - if (oldItemCount != count) + if (oldItemCount != count) { SetItemCount(count); + } SortList(-1, -1, false); @@ -451,21 +468,23 @@ { CLocalListView *pThis = const_cast(this); CLocalFileData *data = pThis->GetData(item); - if (!data) + if (!data) { return -1; + } int &icon = data->icon; - if (icon == -2) - { + if (icon == -2) { wxString path = _T(""); - if (data->name != _T("..")) - { + if (data->name != _T("..")) { #ifdef __WXMSW__ - if (m_dir.GetPath() == _T("\\")) + if (m_dir.GetPath() == _T("\\")) { path = data->name + _T("\\"); + } else #endif + { path = m_dir.GetPath() + data->name; + } } icon = pThis->GetIconIndex(data->dir ? iconType::dir : iconType::file, path); @@ -479,21 +498,20 @@ bool back = false; int item = -1; - for (;;) - { + for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item == -1) { break; + } count++; - if (!item && m_hasParent) + if (!item && m_hasParent) { back = true; + } } - if (count > 1) - { - if (back) - { + if (count > 1) { + if (back) { wxBell(); return; } @@ -506,30 +524,29 @@ item = event.GetIndex(); CLocalFileData *data = GetData(item); - if (!data) + if (!data) { return; + } - if (data->dir) - { + if (data->dir) { const int action = COptions::Get()->GetOptionVal(OPTION_DOUBLECLICK_ACTION_DIRECTORY); - if (action == 3) - { + if (action == 3) { // No action wxBell(); return; } - if (!action || data->name == _T("..")) - { + if (!action || data->name == _T("..")) { // Enter action - wxString error; - if (!m_pState->SetLocalDir(data->name, &error)) - { - if (!error.empty()) + std::wstring error; + if (!m_state.SetLocalDir(data->name, &error)) { + if (!error.empty()) { wxMessageBoxEx(error, _("Failed to change directory"), wxICON_INFORMATION); - else + } + else { wxBell(); + } } return; } @@ -539,45 +556,40 @@ return; } - if (data->comparison_flags == fill) - { + if (data->comparison_flags == fill) { wxBell(); return; } const int action = COptions::Get()->GetOptionVal(OPTION_DOUBLECLICK_ACTION_FILE); - if (action == 3) - { + if (action == 3) { // No action wxBell(); return; } - if (action == 2) - { + if (action == 2) { // View / Edit action wxCommandEvent evt; OnMenuEdit(evt); return; } - const CServer* pServer = m_pState->GetServer(); - if (!pServer) - { + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { wxBell(); return; } - CServerPath path = m_pState->GetRemotePath(); - if (path.empty()) - { + CServerPath path = m_state.GetRemotePath(); + if (path.empty()) { wxBell(); return; } const bool queue_only = action == 1; - m_pQueue->QueueFile(queue_only, false, data->name, wxEmptyString, m_dir, path, *pServer, data->size); + m_pQueue->QueueFile(queue_only, false, data->name, wxEmptyString, m_dir, path, server, data->size); m_pQueue->QueueFile_Finish(true); } @@ -600,12 +612,14 @@ return; } - wxString error; - if (!m_pState->SetLocalDir(data->name, &error)) { - if (!error.empty()) + std::wstring error; + if (!m_state.SetLocalDir(data->name, &error)) { + if (!error.empty()) { wxMessageBoxEx(error, _("Failed to change directory"), wxICON_INFORMATION); - else + } + else { wxBell(); + } } } @@ -614,31 +628,33 @@ { int count = m_fileData.size(); - std::list drives = CVolumeDescriptionEnumeratorThread::GetDrives(); - for( std::list::const_iterator it = drives.begin(); it != drives.end(); ++it ) { + std::list drives = CVolumeDescriptionEnumeratorThread::GetDrives(); + for (auto it = drives.begin(); it != drives.end(); ++it) { wxString drive = *it; - if (drive.Right(1) == _T("\\")) + if (drive.Right(1) == _T("\\")) { drive.RemoveLast(); + } CLocalFileData data; data.name = drive; - data.label = CSparseOptional(data.name); + data.label = fz::sparse_optional(data.name); data.dir = true; data.size = -1; + data.icon = GetIconIndex(iconType::dir, _T(""), false); m_fileData.push_back(data); m_indexMapping.push_back(count); count++; } - if (m_pFilelistStatusBar) + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->SetDirectoryContents(0, drives.size(), 0, false, 0); + } - if (!m_pVolumeEnumeratorThread) { - m_pVolumeEnumeratorThread = new CVolumeDescriptionEnumeratorThread(this); - if (m_pVolumeEnumeratorThread->Failed()) { - delete m_pVolumeEnumeratorThread; - m_pVolumeEnumeratorThread = 0; + if (!volumeEnumeratorThread_) { + volumeEnumeratorThread_ = std::make_unique(this); + if (volumeEnumeratorThread_->Failed()) { + volumeEnumeratorThread_.reset(); } } } @@ -655,30 +671,31 @@ DWORD read, total; DWORD resume_handle = 0; - if (!computer.empty() && computer.Last() == '\\') + if (!computer.empty() && computer.Last() == '\\') { computer.RemoveLast(); + } int j = m_fileData.size(); int share_count = 0; int res = 0; - do - { + do { const wxWX2WCbuf buf = computer.wc_str(wxConvLocal); res = NetShareEnum((wchar_t*)(const wchar_t*)buf, 1, &si.pShareInfoBlob, MAX_PREFERRED_LENGTH, &read, &total, &resume_handle); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { break; + } SHARE_INFO_1* p = si.pShareInfo; - for (unsigned int i = 0; i < read; i++, p++) - { - if (p->shi1_type != STYPE_DISKTREE) + for (unsigned int i = 0; i < read; ++i, ++p) { + if (p->shi1_type != STYPE_DISKTREE) { continue; + } CLocalFileData data; data.name = p->shi1_netname; #ifdef __WXMSW__ - data.label = CSparseOptional(data.name); + data.label = fz::sparse_optional(data.name); #endif data.dir = true; data.size = -1; @@ -693,76 +710,85 @@ } while (res == ERROR_MORE_DATA); - if (m_pFilelistStatusBar) + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->SetDirectoryContents(0, share_count, 0, false, 0); + } } #endif //__WXMSW__ CLocalFileData* CLocalListView::GetData(unsigned int item) { - if (!IsItemValid(item)) + if (!IsItemValid(item)) { return 0; + } return &m_fileData[m_indexMapping[item]]; } bool CLocalListView::IsItemValid(unsigned int item) const { - if (item >= m_indexMapping.size()) + if (item >= m_indexMapping.size()) { return false; + } unsigned int index = m_indexMapping[item]; - if (index >= m_fileData.size()) + if (index >= m_fileData.size()) { return false; + } return true; } -CFileListCtrl::CSortComparisonObject CLocalListView::GetSortComparisonObject() +std::unique_ptr CLocalListView::GetSortComparisonObject() { CFileListCtrlSortBase::DirSortMode dirSortMode = GetDirSortMode(); CFileListCtrlSortBase::NameSortMode nameSortMode = GetNameSortMode(); - if (!m_sortDirection) - { - if (m_sortColumn == 1) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortSize, CLocalFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 2) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortType, CLocalFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 3) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortTime, CLocalFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortName, CLocalFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); + if (!m_sortDirection) { + if (m_sortColumn == 1) { + return std::make_unique, CLocalFileData>>(m_fileData, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 2) { + return std::make_unique, CLocalFileData>>(m_fileData, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 3) { + return std::make_unique, CLocalFileData>>(m_fileData, m_fileData, dirSortMode, nameSortMode, this); + } + else { + return std::make_unique, CLocalFileData>>(m_fileData, m_fileData, dirSortMode, nameSortMode, this); + } } - else - { - if (m_sortColumn == 1) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CLocalFileData>, CLocalFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 2) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CLocalFileData>, CLocalFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 3) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CLocalFileData>, CLocalFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CLocalFileData>, CLocalFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); + else { + if (m_sortColumn == 1) { + return std::make_unique, CLocalFileData>, CLocalFileData>>(m_fileData, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 2) { + return std::make_unique, CLocalFileData>, CLocalFileData>>(m_fileData, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 3) { + return std::make_unique, CLocalFileData>, CLocalFileData>>(m_fileData, m_fileData, dirSortMode, nameSortMode, this); + } + else { + return std::make_unique, CLocalFileData>, CLocalFileData>>(m_fileData, m_fileData, dirSortMode, nameSortMode, this); + } } } void CLocalListView::OnContextMenu(wxContextMenuEvent& event) { - if (GetEditControl()) - { + if (GetEditControl()) { event.Skip(); return; } wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_LOCALFILELIST")); - if (!pMenu) + if (!pMenu) { return; + } - const bool connected = m_pState->IsRemoteConnected(); - if (!connected) - { + const bool connected = m_state.IsRemoteConnected(); + if (!connected) { pMenu->Enable(XRCID("ID_EDIT"), COptions::Get()->GetOptionVal(OPTION_EDIT_TRACK_LOCAL) == 0); pMenu->Enable(XRCID("ID_UPLOAD"), false); pMenu->Enable(XRCID("ID_ADDTOQUEUE"), false); @@ -772,24 +798,23 @@ int count = 0; int fillCount = 0; bool selectedDir = false; - while (index != -1) - { - count++; + while (index != -1) { + ++count; const CLocalFileData* const data = GetData(index); - if (!data || (!index && m_hasParent)) - { + if (!data || (!index && m_hasParent)) { pMenu->Enable(XRCID("ID_OPEN"), false); pMenu->Enable(XRCID("ID_RENAME"), false); pMenu->Enable(XRCID("ID_EDIT"), false); } - if ((data && data->comparison_flags == fill) || (!index && m_hasParent)) + if ((data && data->comparison_flags == fill) || (!index && m_hasParent)) { fillCount++; - if (data && data->dir) + } + if (data && data->dir) { selectedDir = true; + } index = GetNextItem(index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); } - if (!count || fillCount == count) - { + if (!count || fillCount == count) { pMenu->Delete(XRCID("ID_ENTER")); pMenu->Enable(XRCID("ID_UPLOAD"), false); pMenu->Enable(XRCID("ID_ADDTOQUEUE"), false); @@ -797,19 +822,23 @@ pMenu->Enable(XRCID("ID_RENAME"), false); pMenu->Enable(XRCID("ID_EDIT"), false); } - else if (count > 1) - { + else if (count > 1) { pMenu->Delete(XRCID("ID_ENTER")); pMenu->Enable(XRCID("ID_RENAME"), false); } - else - { + else { // Exactly one item selected - if (!selectedDir) + if (!selectedDir) { pMenu->Delete(XRCID("ID_ENTER")); + } } - if (selectedDir) + if (selectedDir) { pMenu->Enable(XRCID("ID_EDIT"), false); + if (m_state.GetLocalRecursiveOperation() && m_state.GetLocalRecursiveOperation()->IsActive()) { + pMenu->Enable(XRCID("ID_UPLOAD"), false); + pMenu->Enable(XRCID("ID_ADDTOQUEUE"), false); + } + } PopupMenu(pMenu); delete pMenu; @@ -817,8 +846,8 @@ void CLocalListView::OnMenuUpload(wxCommandEvent& event) { - const CServer* pServer = m_pState->GetServer(); - if (!pServer) { + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { wxBell(); return; } @@ -827,43 +856,65 @@ bool queue_only = event.GetId() == XRCID("ID_ADDTOQUEUE"); + auto recursiveOperation = m_state.GetLocalRecursiveOperation(); + if (!recursiveOperation || recursiveOperation->IsActive()) { + wxBell(); + return; + } + + local_recursion_root root; + long item = -1; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (!item && m_hasParent) + if (!item && m_hasParent) { continue; - if (item == -1) + } + if (item == -1) { break; + } const CLocalFileData *data = GetData(item); - if (!data) + if (!data) { break; + } - if (data->comparison_flags == fill) + if (data->comparison_flags == fill) { continue; + } - CServerPath path = m_pState->GetRemotePath(); - if (path.empty()) { + CServerPath remotePath = m_state.GetRemotePath(); + if (remotePath.empty()) { wxBell(); break; } if (data->dir) { - if (!path.ChangePath(data->name)) { + CLocalPath localPath = m_dir; + if (!localPath.ChangePath(data->name)) { + continue; + } + if (!remotePath.ChangePath(data->name)) { continue; } - CLocalPath localPath(m_dir); - localPath.AddSegment(data->name); - m_pQueue->QueueFolder(event.GetId() == XRCID("ID_ADDTOQUEUE"), false, localPath, path, *pServer); + root.add_dir_to_visit(localPath, remotePath); } else { - m_pQueue->QueueFile(queue_only, false, data->name, wxEmptyString, m_dir, path, *pServer, data->size); + m_pQueue->QueueFile(queue_only, false, data->name, wxEmptyString, m_dir, remotePath, server, data->size); added = true; } } - if (added) + + if (added) { m_pQueue->QueueFile_Finish(!queue_only); + } + + if (!root.empty()) { + recursiveOperation->AddRecursionRoot(std::move(root)); + CFilterManager filter; + recursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_transfer, filter.GetActiveFilters(), !queue_only); + } } // Create a new Directory @@ -871,26 +922,27 @@ { wxString newdir = MenuMkdir(); if (!newdir.empty()) { - m_pState->RefreshLocal(); + m_state.RefreshLocal(); } } // Create a new Directory and enter the new Directory void CLocalListView::OnMenuMkdirChgDir(wxCommandEvent&) { - wxString newdir = MenuMkdir(); + std::wstring newdir = MenuMkdir().ToStdWstring(); if (newdir.empty()) { return; } // OnMenuEnter - wxString error; - if (!m_pState->SetLocalDir(newdir, &error)) - { - if (!error.empty()) + std::wstring error; + if (!m_state.SetLocalDir(newdir, &error)) { + if (!error.empty()) { wxMessageBoxEx(error, _("Failed to change directory"), wxICON_INFORMATION); - else + } + else { wxBell(); + } } } @@ -899,14 +951,15 @@ wxString CLocalListView::MenuMkdir() { CInputDialog dlg; - if (!dlg.Create(this, _("Create directory"), _("Please enter the name of the directory which should be created:"))) + if (!dlg.Create(this, _("Create directory"), _("Please enter the name of the directory which should be created:"))) { return wxString(); + } - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return wxString(); + } - if (dlg.GetValue().empty()) - { + if (dlg.GetValue().empty()) { wxBell(); return wxString(); } @@ -935,22 +988,25 @@ std::list pathsToDelete; long item = -1; while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { - if (!item && m_hasParent) + if (!item && m_hasParent) { continue; + } CLocalFileData *data = GetData(item); - if (!data) + if (!data) { continue; + } - if (data->comparison_flags == fill) + if (data->comparison_flags == fill) { continue; + } pathsToDelete.push_back(fz::to_native(m_dir.GetPath() + data->name)); } gui_recursive_remove rmd(this); rmd.remove(pathsToDelete); - m_pState->SetLocalDir(m_dir); + m_state.SetLocalDir(m_dir); } void CLocalListView::OnMenuRename(wxCommandEvent&) @@ -1015,21 +1071,30 @@ wxCommandEvent cmdEvent; OnMenuMkdir(cmdEvent); } - else + else if (code == 'F' && event.GetModifiers() == wxMOD_CONTROL) { + if (m_parentView) { + m_parentView->ShowSearchPanel(); + } + } + else { event.Skip(); + } } bool CLocalListView::OnBeginRename(const wxListEvent& event) { - if (!m_pState->GetLocalDir().IsWriteable()) + if (!m_state.GetLocalDir().IsWriteable()) { return false; + } - if (event.GetIndex() == 0 && m_hasParent) + if (event.GetIndex() == 0 && m_hasParent) { return false; + } const CLocalFileData * const data = GetData(event.GetIndex()); - if (!data || data->comparison_flags == fill) + if (!data || data->comparison_flags == fill) { return false; + } return true; } @@ -1037,55 +1102,64 @@ bool CLocalListView::OnAcceptRename(const wxListEvent& event) { const int index = event.GetIndex(); - if (!index && m_hasParent) + if (!index && m_hasParent) { return false; + } - if (event.GetLabel().empty()) + if (event.GetLabel().empty()) { return false; + } - if (!m_pState->GetLocalDir().IsWriteable()) + if (!m_state.GetLocalDir().IsWriteable()) { return false; + } CLocalFileData *const data = GetData(event.GetIndex()); - if (!data || data->comparison_flags == fill) + if (!data || data->comparison_flags == fill) { return false; + } wxString newname = event.GetLabel(); #ifdef __WXMSW__ newname = newname.Left(255); #endif - if (newname == data->name) + if (newname == data->name) { return false; + } - if (!RenameFile(this, m_dir.GetPath(), data->name, newname)) + if (!RenameFile(this, m_dir.GetPath(), data->name, newname)) { return false; + } data->name = newname; #ifdef __WXMSW__ data->label.clear(); #endif - m_pState->RefreshLocal(); + CallAfter([&](){m_state.RefreshLocal();}); return true; } void CLocalListView::ApplyCurrentFilter() { - CFilterManager filter; - - if (!filter.HasSameLocalAndRemoteFilters() && IsComparing()) + CStateFilterManager const& filter = m_state.GetStateFilterManager(); + + if (!filter.HasSameLocalAndRemoteFilters() && IsComparing()) { ExitComparisonMode(); + } unsigned int min = m_hasParent ? 1 : 0; - if (m_fileData.size() <= min) + if (m_fileData.size() <= min) { return; + } wxString focused; const std::list& selectedNames = RememberSelectedItems(focused); - if (m_pFilelistStatusBar) + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->UnselectAll(); + } int64_t totalSize{}; int unknown_sizes = 0; @@ -1094,24 +1168,29 @@ int hidden = 0; m_indexMapping.clear(); - if (m_hasParent) + if (m_hasParent) { m_indexMapping.push_back(0); + } for (unsigned int i = min; i < m_fileData.size(); ++i) { const CLocalFileData& data = m_fileData[i]; - if (data.comparison_flags == fill) + if (data.comparison_flags == fill) { continue; + } if (filter.FilenameFiltered(data.name, m_dir.GetPath(), data.dir, data.size, true, data.attributes, data.time)) { ++hidden; continue; } - if (data.dir) + if (data.dir) { ++totalDirCount; + } else { - if (data.size != -1) + if (data.size != -1) { totalSize += data.size; - else + } + else { ++unknown_sizes; + } ++totalFileCount; } @@ -1119,8 +1198,9 @@ } SetItemCount(m_indexMapping.size()); - if (m_pFilelistStatusBar) + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->SetDirectoryContents(totalFileCount, totalDirCount, totalSize, unknown_sizes, hidden); + } SortList(-1, -1, false); @@ -1131,8 +1211,9 @@ ReselectItems(selectedNames, focused); - if (!IsComparing()) + if (!IsComparing()) { RefreshListOnly(); + } } std::list CLocalListView::RememberSelectedItems(wxString& focused) @@ -1145,31 +1226,30 @@ #endif { int item = -1; - for (;;) - { + for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item < 0 || static_cast(item) >= m_indexMapping.size()) { break; + } const CLocalFileData &data = m_fileData[m_indexMapping[item]]; - if (data.comparison_flags != fill) - { - if (data.dir) + if (data.comparison_flags != fill) { + if (data.dir) { selectedNames.push_back(_T("d") + data.name); - else + } + else { selectedNames.push_back(_T("-") + data.name); + } } SetSelection(item, false); } } int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); - if (item != -1) - { + if (item >= 0 && static_cast(item) < m_indexMapping.size()) { const CLocalFileData &data = m_fileData[m_indexMapping[item]]; - if (data.comparison_flags != fill) + if (data.comparison_flags != fill) { focused = data.name; - - SetItemState(item, 0, wxLIST_STATE_FOCUSED); + } } return selectedNames; @@ -1177,21 +1257,24 @@ void CLocalListView::ReselectItems(const std::list& selectedNames, wxString focused, bool ensureVisible) { + if (!GetItemCount()) { + return; + } + // Reselect previous items if neccessary. // Sorting direction did not change. We just have to scan through items once - if (selectedNames.empty()) - { - if (focused.empty()) + if (selectedNames.empty()) { + if (focused.empty()) { return; - for (unsigned int i = 0; i < m_indexMapping.size(); i++) - { + } + for (unsigned int i = 0; i < m_indexMapping.size(); ++i) { const CLocalFileData &data = m_fileData[m_indexMapping[i]]; - if (data.name == focused) - { + if (data.name == focused) { SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); - if (ensureVisible) + if (ensureVisible) { EnsureVisible(i); + } return; } } @@ -1201,57 +1284,63 @@ int firstSelected = -1; int i = -1; - for (std::list::const_iterator iter = selectedNames.begin(); iter != selectedNames.end(); ++iter) - { - while (++i < (int)m_indexMapping.size()) - { + for (auto const& selectedName : selectedNames) { + while (++i < (int)m_indexMapping.size()) { const CLocalFileData &data = m_fileData[m_indexMapping[i]]; - if (data.name == focused) - { + if (data.name == focused) { SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); - if (ensureVisible) + if (ensureVisible) { EnsureVisible(i); - focused = _T(""); + } + focused.clear(); } - if (data.dir && *iter == (_T("d") + data.name)) - { - if (firstSelected == -1) + if (data.dir && selectedName == (_T("d") + data.name)) { + if (firstSelected == -1) { firstSelected = i; - if (m_pFilelistStatusBar) + } + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->SelectDirectory(); + } SetSelection(i, true); break; } - else if (*iter == (_T("-") + data.name)) - { - if (firstSelected == -1) + else if (selectedName == (_T("-") + data.name)) { + if (firstSelected == -1) { firstSelected = i; - if (m_pFilelistStatusBar) + } + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->SelectFile(data.size); + } SetSelection(i, true); break; } } - if (i == (int)m_indexMapping.size()) + if (i == (int)m_indexMapping.size()) { break; + } } - if (!focused.empty()) - { - if (firstSelected != -1) + if (!focused.empty()) { + if (firstSelected != -1) { SetItemState(firstSelected, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); - else + } + else { SetItemState(0, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + } } } -void CLocalListView::OnStateChange(CState*, enum t_statechange_notifications notification, const wxString& data, const void*) +void CLocalListView::OnStateChange(t_statechange_notifications notification, const wxString& data, const void*) { - if (notification == STATECHANGE_LOCAL_DIR) - DisplayDir(m_pState->GetLocalDir()); - else if (notification == STATECHANGE_APPLYFILTER) + if (notification == STATECHANGE_LOCAL_DIR) { + DisplayDir(m_state.GetLocalDir()); + } + else if (notification == STATECHANGE_APPLYFILTER) { ApplyCurrentFilter(); - else - { + } + else if (notification == STATECHANGE_SERVER) { + m_windowTinter->SetBackgroundTint(m_state.GetSite().m_colour); + } + else { wxASSERT(notification == STATECHANGE_LOCAL_REFRESH_FILE); RefreshFile(data); } @@ -1259,14 +1348,20 @@ void CLocalListView::OnBeginDrag(wxListEvent&) { + if (COptions::Get()->GetOptionVal(OPTION_DND_DISABLED) != 0) { + return; + } + long item = -1; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item == -1) { break; + } - if (!item && m_hasParent) + if (!item && m_hasParent) { return; + } } wxFileDataObject obj; @@ -1278,18 +1373,20 @@ item = -1; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item == -1) { break; + } CLocalFileData *data = GetData(item); - if (!data) + if (!data) { continue; + } - if (data->comparison_flags == fill) + if (data->comparison_flags == fill) { continue; + } wxString const name = m_dir.GetPath() + data->name; - pDragDropManager->m_localFiles.push_back(name); obj.AddFile(name); } @@ -1311,7 +1408,7 @@ if (!handled_internally && (res == wxDragCopy || res == wxDragMove)) { // We only need to refresh local side if the operation got handled // externally, the internal handlers do this for us already - m_pState->RefreshLocal(); + m_state.RefreshLocal(); } } @@ -1320,16 +1417,18 @@ CLocalFileData data; bool wasLink; - enum fz::local_filesys::type type = fz::local_filesys::get_file_info(fz::to_native(m_dir.GetPath() + file), wasLink, &data.size, &data.time, &data.attributes); - if (type == fz::local_filesys::unknown) + fz::local_filesys::type type = fz::local_filesys::get_file_info(fz::to_native(m_dir.GetPath() + file), wasLink, &data.size, &data.time, &data.attributes); + if (type == fz::local_filesys::unknown) { return; + } data.name = file; data.dir = type == fz::local_filesys::dir; - CFilterManager filter; - if (filter.FilenameFiltered(data.name, m_dir.GetPath(), data.dir, data.size, true, data.attributes, data.time)) + CStateFilterManager const& filter = m_state.GetStateFilterManager(); + if (filter.FilenameFiltered(data.name, m_dir.GetPath(), data.dir, data.size, true, data.attributes, data.time)) { return; + } CancelLabelEdit(); @@ -1337,8 +1436,9 @@ unsigned int i = 0; for (auto iter = m_fileData.begin(); iter != m_fileData.end(); ++iter, ++i) { const CLocalFileData& oldData = *iter; - if (oldData.name != file) + if (oldData.name != file) { continue; + } // Update file list status bar if (m_pFilelistStatusBar) { @@ -1350,31 +1450,41 @@ int item = -1; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item == -1) { break; - if (m_indexMapping[item] != i) + } + if (m_indexMapping[item] != i) { continue; + } - if (oldData.dir) + if (oldData.dir) { m_pFilelistStatusBar->UnselectDirectory(); - else + } + else { m_pFilelistStatusBar->UnselectFile(oldData.size); - if (data.dir) + } + if (data.dir) { m_pFilelistStatusBar->SelectDirectory(); - else + } + else { m_pFilelistStatusBar->SelectFile(data.size); + } break; } } - if (oldData.dir) + if (oldData.dir) { m_pFilelistStatusBar->RemoveDirectory(); - else + } + else { m_pFilelistStatusBar->RemoveFile(oldData.size); - if (data.dir) + } + if (data.dir) { m_pFilelistStatusBar->AddDirectory(); - else + } + else { m_pFilelistStatusBar->AddFile(data.size); + } } // Update the data @@ -1386,17 +1496,20 @@ RefreshComparison(); } else { - if (m_sortColumn) + if (m_sortColumn) { SortList(); + } RefreshListOnly(false); } return; } - if (data.dir) + if (data.dir) { m_pFilelistStatusBar->AddDirectory(); - else + } + else { m_pFilelistStatusBar->AddFile(data.size); + } wxString focused; std::list selectedNames; @@ -1414,11 +1527,11 @@ // Find correct position in index mapping std::vector::iterator start = m_indexMapping.begin(); - if (m_hasParent) + if (m_hasParent) { ++start; - CFileListCtrl::CSortComparisonObject compare = GetSortComparisonObject(); - std::vector::iterator insertPos = std::lower_bound(start, m_indexMapping.end(), index, compare); - compare.Destroy(); + } + std::unique_ptr compare = GetSortComparisonObject(); + std::vector::iterator insertPos = std::lower_bound(start, m_indexMapping.end(), index, SortPredicate(compare)); const int item = insertPos - m_indexMapping.begin(); m_indexMapping.insert(insertPos, index); @@ -1440,8 +1553,9 @@ } else { RefreshComparison(); - if (m_pFilelistStatusBar) + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->UnselectAll(); + } ReselectItems(selectedNames, focused); } } @@ -1451,12 +1565,14 @@ CLocalListView *pThis = const_cast(this); const CLocalFileData* const data = pThis->GetData((unsigned int)item); - if (!data) + if (!data) { return 0; + } #ifndef __WXMSW__ - if (item == m_dropTarget) + if (item == m_dropTarget) { return &pThis->m_dropHighlightAttribute; + } #endif switch (data->comparison_flags) @@ -1474,24 +1590,24 @@ void CLocalListView::StartComparison() { - if (m_sortDirection || m_sortColumn) - { + if (m_sortDirection || m_sortColumn != 0) { wxASSERT(m_originalIndexMapping.empty()); SortList(0, 0); } ComparisonRememberSelections(); - if (m_originalIndexMapping.empty()) + if (m_originalIndexMapping.empty()) { m_originalIndexMapping.swap(m_indexMapping); - else + } + else { m_indexMapping.clear(); + } m_comparisonIndex = -1; const CLocalFileData& last = m_fileData[m_fileData.size() - 1]; - if (last.comparison_flags != fill) - { + if (last.comparison_flags != fill) { CLocalFileData data; data.dir = false; data.icon = -1; @@ -1503,12 +1619,14 @@ bool CLocalListView::get_next_file(wxString& name, bool& dir, int64_t& size, fz::datetime& date) { - if (++m_comparisonIndex >= (int)m_originalIndexMapping.size()) + if (++m_comparisonIndex >= (int)m_originalIndexMapping.size()) { return false; + } const unsigned int index = m_originalIndexMapping[m_comparisonIndex]; - if (index >= m_fileData.size()) + if (index >= m_fileData.size()) { return false; + } const CLocalFileData& data = m_fileData[index]; @@ -1529,8 +1647,9 @@ RefreshListOnly(); CComparableListing* pOther = GetOther(); - if (!pOther) + if (!pOther) { return; + } pOther->ScrollTopItem(GetTopItem()); } @@ -1543,8 +1662,9 @@ wxString CLocalListView::GetItemText(int item, unsigned int column) { CLocalFileData *data = GetData(item); - if (!data) + if (!data) { return wxString(); + } if (!column) { #ifdef __WXMSW__ @@ -1554,20 +1674,25 @@ #endif } else if (column == 1) { - if (data->size < 0) + if (data->size < 0) { return wxString(); - else + } + else { return CSizeFormat::Format(data->size); + } } else if (column == 2) { - if (!item && m_hasParent) + if (!item && m_hasParent) { return wxString(); + } - if (data->comparison_flags == fill) + if (data->comparison_flags == fill) { return wxString(); + } - if (data->fileType.empty()) + if (data->fileType.empty()) { data->fileType = GetType(data->name, data->dir, m_dir.GetPath()); + } return data->fileType; } @@ -1579,19 +1704,19 @@ void CLocalListView::OnMenuEdit(wxCommandEvent&) { - CServer server; + ServerWithCredentials server; CServerPath path; - if (!m_pState->GetServer()) { + if (!m_state.GetServer()) { if (COptions::Get()->GetOptionVal(OPTION_EDIT_TRACK_LOCAL)) { wxMessageBoxEx(_("Cannot edit file, not connected to any server."), _("Editing failed"), wxICON_EXCLAMATION); return; } } else { - server = *m_pState->GetServer(); + server = m_state.GetServer(); - path = m_pState->GetRemotePath(); + path = m_state.GetRemotePath(); if (path.empty()) { wxMessageBoxEx(_("Cannot edit file, remote path unknown."), _("Editing failed"), wxICON_EXCLAMATION); return; @@ -1608,16 +1733,18 @@ } const CLocalFileData *data = GetData(item); - if (!data) + if (!data) { continue; + } if (data->dir) { wxBell(); return; } - if (data->comparison_flags == fill) + if (data->comparison_flags == fill) { continue; + } selected_item.push_back({m_dir.GetPath() + data->name, data->size}); } @@ -1644,11 +1771,13 @@ } const CLocalFileData *data = GetData(item); - if (!data) + if (!data) { continue; + } - if (data->comparison_flags == fill) + if (data->comparison_flags == fill) { continue; + } selected_item_list.push_back(*data); } @@ -1669,8 +1798,9 @@ dlg.SetTitle(_("Confirmation needed")); dlg.AddText(_("You have selected more than 10 files or directories to open, do you really want to continue?")); - if (!dlg.Run()) + if (!dlg.Run()) { return; + } } for (auto const& data : selected_item_list) { @@ -1692,9 +1822,10 @@ bool program_exists = false; wxString cmd = GetSystemOpenCommand(fn.GetFullPath(), program_exists); if (cmd.empty()) { - int pos = data.name.Find('.') == -1; - if (pos == -1 || (pos == 0 && data.name.Mid(1).Find('.') == -1)) + auto pos = data.name.find('.'); + if (pos == std::wstring::npos || (pos == 0 && data.name.find('.', 1) == std::wstring::npos)) { cmd = pEditHandler->GetOpenCommand(fn.GetFullPath(), program_exists); + } } if (cmd.empty()) { wxMessageBoxEx(wxString::Format(_("The file '%s' could not be opened:\nNo program has been associated on your system with this file type."), fn.GetFullPath()), _("Opening failed"), wxICON_EXCLAMATION); @@ -1706,8 +1837,9 @@ continue; } - if (wxExecute(cmd)) + if (wxExecute(cmd)) { continue; + } wxMessageBoxEx(wxString::Format(_("The file '%s' could not be opened:\nThe associated command failed"), fn.GetFullPath()), _("Opening failed"), wxICON_EXCLAMATION); } @@ -1727,33 +1859,41 @@ void CLocalListView::OnVolumesEnumerated(wxCommandEvent& event) { - if (!m_pVolumeEnumeratorThread) + if (!volumeEnumeratorThread_) { return; + } std::list volumeInfo; - volumeInfo = m_pVolumeEnumeratorThread->GetVolumes(); + volumeInfo = volumeEnumeratorThread_->GetVolumes(); if (event.GetEventType() == fzEVT_VOLUMESENUMERATED) { - delete m_pVolumeEnumeratorThread; - m_pVolumeEnumeratorThread = 0; + volumeEnumeratorThread_.reset(); } - if (m_dir.GetPath() != _T("\\")) + if (m_dir.GetPath() != _T("\\")) { return; + } for (std::list::const_iterator iter = volumeInfo.begin(); iter != volumeInfo.end(); ++iter) { - wxString drive = iter->volume; + std::wstring drive = iter->volume; unsigned int item, index; - for (item = 1; item < m_indexMapping.size(); ++item) { + for (item = m_hasParent ? 1 : 0; item < m_indexMapping.size(); ++item) { index = m_indexMapping[item]; - if (m_fileData[index].name == drive || m_fileData[index].name.Left(drive.Len() + 1) == drive + _T(" ")) + if (m_fileData[index].name == drive || m_fileData[index].name.substr(0, drive.size() + 1) == drive + _T(" ")) { break; + } } - if (item >= m_indexMapping.size()) + if (item >= m_indexMapping.size()) { continue; + } - m_fileData[index].label = CSparseOptional(drive + _T(" (") + iter->volumeName + _T(")")); + if (!iter->volumeName.empty()) { + m_fileData[index].label = fz::sparse_optional(drive + _T(" (") + iter->volumeName + _T(")")); + } + if (iter->icon != -1) { + m_fileData[index].icon = iter->icon; + } RefreshItem(item); } @@ -1763,26 +1903,25 @@ void CLocalListView::OnMenuRefresh(wxCommandEvent&) { - m_pState->RefreshLocal(); + m_state.RefreshLocal(); } void CLocalListView::OnNavigationEvent(bool forward) { - if (!forward) - { - if (!m_hasParent) - { + if (!forward) { + if (!m_hasParent) { wxBell(); return; } - wxString error; - if (!m_pState->SetLocalDir(_T(".."), &error)) - { - if (!error.empty()) + std::wstring error; + if (!m_state.SetLocalDir(_T(".."), &error)) { + if (!error.empty()) { wxMessageBoxEx(error, _("Failed to change directory"), wxICON_INFORMATION); - else + } + else { wxBell(); + } } } } diff -Nru filezilla-3.15.0.2/src/interface/LocalListView.h filezilla-3.33.0/src/interface/LocalListView.h --- filezilla-3.15.0.2/src/interface/LocalListView.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/LocalListView.h 2017-11-13 04:30:03.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __LOCALLISTVIEW_H__ -#define __LOCALLISTVIEW_H__ +#ifndef FILEZILLA_INTERFACE_LOCALLISTVIEW_HEADER +#define FILEZILLA_INTERFACE_LOCALLISTVIEW_HEADER #include "filelistctrl.h" #include "state.h" @@ -9,13 +9,15 @@ #ifdef __WXMSW__ class CVolumeDescriptionEnumeratorThread; #endif +class CView; +class CWindowTinter; class CLocalFileData final : public CGenericFileData { public: - wxString name; + std::wstring name; #ifdef __WXMSW__ - CSparseOptional label; + fz::sparse_optional label; #endif fz::datetime time; int64_t size; @@ -24,17 +26,17 @@ bool is_dir() const { return dir; } }; -class CLocalListView : public CFileListCtrl, CStateEventHandler +class CLocalListView final : public CFileListCtrl, CStateEventHandler { friend class CLocalListViewDropTarget; friend class CLocalListViewSortType; public: - CLocalListView(wxWindow* parent, CState *pState, CQueueView *pQueue); + CLocalListView(CView* parent, CState& state, CQueueView *pQueue); virtual ~CLocalListView(); protected: - void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void*); + void OnStateChange(t_statechange_notifications notification, const wxString& data, const void*); bool DisplayDir(CLocalPath const& dirname); void ApplyCurrentFilter(); @@ -73,7 +75,7 @@ bool IsItemValid(unsigned int item) const; CLocalFileData *GetData(unsigned int item); - virtual CSortComparisonObject GetSortComparisonObject(); + virtual std::unique_ptr GetSortComparisonObject() override; void RefreshFile(const wxString& file); @@ -84,10 +86,14 @@ CLocalPath m_dir; - int m_dropTarget; + int m_dropTarget{-1}; wxString MenuMkdir(); + std::unique_ptr m_windowTinter; + + CView *m_parentView{}; + // Event handlers DECLARE_EVENT_TABLE() void OnItemActivated(wxListEvent& event); @@ -102,11 +108,12 @@ void OnMenuOpen(wxCommandEvent& event); void OnMenuEdit(wxCommandEvent& event); void OnMenuEnter(wxCommandEvent& event); + void OnMenuRefresh(wxCommandEvent& event); + #ifdef __WXMSW__ void OnVolumesEnumerated(wxCommandEvent& event); - CVolumeDescriptionEnumeratorThread* m_pVolumeEnumeratorThread; + std::unique_ptr volumeEnumeratorThread_; #endif - void OnMenuRefresh(wxCommandEvent& event); }; #endif diff -Nru filezilla-3.15.0.2/src/interface/local_recursive_operation.cpp filezilla-3.33.0/src/interface/local_recursive_operation.cpp --- filezilla-3.15.0.2/src/interface/local_recursive_operation.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/local_recursive_operation.cpp 2017-06-02 20:38:13.000000000 +0000 @@ -0,0 +1,305 @@ +#include +#include "local_recursive_operation.h" + +#include + +#include "QueueView.h" + +BEGIN_EVENT_TABLE(CLocalRecursiveOperation, wxEvtHandler) +END_EVENT_TABLE() + +void local_recursion_root::add_dir_to_visit(CLocalPath const& localPath, CServerPath const& remotePath) +{ + new_dir dirToVisit; + dirToVisit.localPath = localPath; + dirToVisit.remotePath = remotePath; + m_dirsToVisit.push_back(dirToVisit); +} + + +CLocalRecursiveOperation::CLocalRecursiveOperation(CState& state) + : CRecursiveOperation(state) +{ +} + +CLocalRecursiveOperation::~CLocalRecursiveOperation() +{ + join(); +} + +void CLocalRecursiveOperation::AddRecursionRoot(local_recursion_root && root) +{ + if (!root.empty()) { + fz::scoped_lock l(mutex_); + recursion_roots_.push_back(std::forward(root)); + } +} + +void CLocalRecursiveOperation::StartRecursiveOperation(OperationMode mode, ActiveFilters const& filters, bool immediate) +{ + if (!DoStartRecursiveOperation(mode, filters, immediate)) { + StopRecursiveOperation(); + } +} + +bool CLocalRecursiveOperation::DoStartRecursiveOperation(OperationMode mode, ActiveFilters const& filters, bool immediate) +{ + if (!m_pQueue) { + return false; + } + + ServerWithCredentials const& server = m_state.GetServer(); + if (server) { + server_ = server; + } + else { + if (mode != OperationMode::recursive_list) { + return false; + } + + server_ = ServerWithCredentials(); + } + + { + fz::scoped_lock l(mutex_); + + wxCHECK_MSG(m_operationMode == recursive_none, false, _T("StartRecursiveOperation called with m_operationMode != recursive_none")); + + if (mode == recursive_chmod) { + return false; + } + + if (recursion_roots_.empty()) { + // Nothing to do in this case + return false; + } + + m_processedFiles = 0; + m_processedDirectories = 0; + + m_immediate = immediate; + m_operationMode = mode; + + m_filters = filters; + + if (!run()) { + m_operationMode = recursive_none; + return false; + } + } + + if ((mode == CRecursiveOperation::recursive_transfer || mode == CRecursiveOperation::recursive_transfer_flatten) && immediate) { + m_actionAfterBlocker = m_pQueue->GetActionAfterBlocker(); + } + + m_state.NotifyHandlers(STATECHANGE_LOCAL_RECURSION_STATUS); + + return true; +} + +void CLocalRecursiveOperation::StopRecursiveOperation() +{ + { + fz::scoped_lock l(mutex_); + if (m_operationMode == recursive_none) { + return; + } + + m_operationMode = recursive_none; + recursion_roots_.clear(); + + m_processedFiles = 0; + m_processedDirectories = 0; + + } + + join(); + m_listedDirectories.clear(); + + m_state.NotifyHandlers(STATECHANGE_LOCAL_RECURSION_STATUS); + + m_actionAfterBlocker.reset(); +} + +void CLocalRecursiveOperation::OnStateChange(t_statechange_notifications, const wxString&, const void*) +{ +} + +void CLocalRecursiveOperation::EnqueueEnumeratedListing(fz::scoped_lock& l, listing&& d) +{ + if (recursion_roots_.empty()) { + return; + } + + auto& root = recursion_roots_.front(); + + // Queue for recursion + for (auto const& entry : d.dirs) { + local_recursion_root::new_dir dir; + CLocalPath localSub = d.localPath; + localSub.AddSegment(entry.name); + + CServerPath remoteSub = d.remotePath; + if (!remoteSub.empty()) { + if (m_operationMode == recursive_transfer) { + // Non-flatten case + remoteSub.AddSegment(entry.name); + } + } + root.add_dir_to_visit(localSub, remoteSub); + } + + m_listedDirectories.emplace_back(std::move(d)); + + // Hand off to GUI thread + if (m_listedDirectories.size() == 1) { + l.unlock(); + CallAfter(&CLocalRecursiveOperation::OnListedDirectory); + l.lock(); + } +} + +void CLocalRecursiveOperation::entry() +{ + { + fz::scoped_lock l(mutex_); + + auto filters = m_filters.first; + + CFilterManager filterManager; + filterManager.CompileRegexes(filters); + + while (!recursion_roots_.empty()) { + listing d; + + { + auto& root = recursion_roots_.front(); + if (root.m_dirsToVisit.empty()) { + recursion_roots_.pop_front(); + continue; + } + + auto const& dir = root.m_dirsToVisit.front(); + d.localPath = dir.localPath; + d.remotePath = dir.remotePath; + + root.m_dirsToVisit.pop_front(); + } + + // Do the slow part without holding mutex + l.unlock(); + + bool sentPartial = false; + fz::local_filesys fs; + fz::native_string localPath = fz::to_native(d.localPath.GetPath()); + + if (fs.begin_find_files(localPath)) { + listing::entry entry; + bool isLink{}; + fz::native_string name; + bool isDir{}; + while (fs.get_next_file(name, isLink, isDir, &entry.size, &entry.time, &entry.attributes)) { + if (isLink) { + continue; + } + entry.name = fz::to_wstring(name); + + if (!filterManager.FilenameFiltered(filters, entry.name, d.localPath.GetPath(), isDir, entry.size, entry.attributes, entry.time)) { + if (isDir) { + d.dirs.emplace_back(std::move(entry)); + } + else { + d.files.emplace_back(std::move(entry)); + } + + // If having queued 5k items, hand off to main thread. + if (d.files.size() + d.dirs.size() >= 5000) { + sentPartial = true; + + listing next; + next.localPath = d.localPath; + next.remotePath = d.remotePath; + + l.lock(); + // Check for cancellation + if (recursion_roots_.empty()) { + l.unlock(); + break; + } + EnqueueEnumeratedListing(l, std::move(d)); + l.unlock(); + d = next; + } + } + } + } + + l.lock(); + // Check for cancellation + if (recursion_roots_.empty()) { + break; + } + if (!sentPartial || !d.files.empty() || !d.dirs.empty()) { + EnqueueEnumeratedListing(l, std::move(d)); + } + } + + listing d; + m_listedDirectories.emplace_back(std::move(d)); + } + + CallAfter(&CLocalRecursiveOperation::OnListedDirectory); +} + +void CLocalRecursiveOperation::OnListedDirectory() +{ + if (m_operationMode == recursive_none) { + return; + } + + bool const queue = m_operationMode == recursive_transfer || m_operationMode == recursive_transfer_flatten; + + listing d; + + bool stop = false; + int64_t processed = 0; + while (processed < 5000) { + { + fz::scoped_lock l(mutex_); + if (m_listedDirectories.empty()) { + break; + } + + d = std::move(m_listedDirectories.front()); + m_listedDirectories.pop_front(); + } + + if (d.localPath.empty()) { + stop = true; + } + else { + if (queue) { + m_pQueue->QueueFiles(!m_immediate, server_, d); + } + ++m_processedDirectories; + processed += d.files.size(); + m_state.NotifyHandlers(STATECHANGE_LOCAL_RECURSION_LISTING, wxString(), &d); + } + } + + if (queue) { + m_pQueue->QueueFile_Finish(m_immediate); + } + + m_processedFiles += processed; + if (stop) { + StopRecursiveOperation(); + } + else if (processed) { + m_state.NotifyHandlers(STATECHANGE_LOCAL_RECURSION_STATUS); + + if (processed >= 5000) { + CallAfter(&CLocalRecursiveOperation::OnListedDirectory); + } + } +} diff -Nru filezilla-3.15.0.2/src/interface/local_recursive_operation.h filezilla-3.33.0/src/interface/local_recursive_operation.h --- filezilla-3.15.0.2/src/interface/local_recursive_operation.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/local_recursive_operation.h 2017-06-02 20:38:13.000000000 +0000 @@ -0,0 +1,84 @@ +#ifndef FILEZILLA_LOCAL_RECURSIVE_OPERATION_HEADER +#define FILEZILLA_LOCAL_RECURSIVE_OPERATION_HEADER + +#include "recursive_operation.h" + +#include + +#include + +class local_recursion_root final +{ +public: + local_recursion_root() = default; + + void add_dir_to_visit(CLocalPath const& localPath, CServerPath const& remotePath = CServerPath()); + + bool empty() const { return m_dirsToVisit.empty(); } + +private: + friend class CLocalRecursiveOperation; + + class new_dir final + { + public: + CLocalPath localPath; + CServerPath remotePath; + }; + + std::set m_visitedDirs; + std::deque m_dirsToVisit; +}; + +class CLocalRecursiveOperation final : public CRecursiveOperation, private fz::thread, public wxEvtHandler +{ +public: + class listing final + { + public: + class entry + { + public: + std::wstring name; + int64_t size{}; + fz::datetime time; + int attributes{}; + }; + + std::vector files; + std::vector dirs; + CLocalPath localPath; + CServerPath remotePath; + }; + + CLocalRecursiveOperation(CState& state); + virtual ~CLocalRecursiveOperation(); + + void AddRecursionRoot(local_recursion_root && root); + void StartRecursiveOperation(OperationMode mode, ActiveFilters const& filters, bool immediate = true); + + virtual void StopRecursiveOperation(); + +protected: + bool DoStartRecursiveOperation(OperationMode mode, ActiveFilters const& filters, bool immediate); + + virtual void OnStateChange(t_statechange_notifications notification, const wxString&, const void* data2); + + virtual void entry(); + + void EnqueueEnumeratedListing(fz::scoped_lock& l, listing&& d); + + std::deque recursion_roots_; + + fz::mutex mutex_; + + std::deque m_listedDirectories; + + ServerWithCredentials server_; + + void OnListedDirectory(); + + DECLARE_EVENT_TABLE() +}; + +#endif diff -Nru filezilla-3.15.0.2/src/interface/LocalTreeView.cpp filezilla-3.33.0/src/interface/LocalTreeView.cpp --- filezilla-3.15.0.2/src/interface/LocalTreeView.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/LocalTreeView.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,15 +1,17 @@ #include -#include "LocalTreeView.h" -#include "queue.h" + +#include "dndobjects.h" +#include "dragdropmanager.h" +#include "drop_target_ex.h" #include "filezillaapp.h" #include "filter.h" #include "file_utils.h" -#include -#include "dndobjects.h" +#include "graphics.h" #include "inputdialog.h" -#include "dragdropmanager.h" -#include "drop_target_ex.h" +#include "LocalTreeView.h" #include "Options.h" +#include "queue.h" +#include "themeprovider.h" #include @@ -20,16 +22,20 @@ #include "volume_enumerator.h" #endif +#ifdef USE_MAC_SANDBOX +#include "osx_sandbox_userdirs.h" +#endif + #include class CTreeItemData : public wxTreeItemData { public: - CTreeItemData(const wxString& known_subdir) : m_known_subdir(known_subdir) {} - wxString m_known_subdir; + CTreeItemData(std::wstring const& known_subdir) : m_known_subdir(known_subdir) {} + std::wstring m_known_subdir; }; -class CLocalTreeViewDropTarget : public CScrollableDropTarget +class CLocalTreeViewDropTarget final : public CScrollableDropTarget { public: CLocalTreeViewDropTarget(CLocalTreeView* pLocalTreeView) @@ -58,8 +64,9 @@ const wxString& dir = m_pLocalTreeView->GetDirFromItem(item); #ifdef __WXMSW__ - if (dir == _T("/")) + if (dir == _T("/")) { return wxString(); + } #endif return dir; @@ -70,8 +77,9 @@ int flags = 0; wxTreeItemId hit = m_pLocalTreeView->HitTest(point, flags); - if (flags & (wxTREE_HITTEST_ABOVE | wxTREE_HITTEST_BELOW | wxTREE_HITTEST_NOWHERE | wxTREE_HITTEST_TOLEFT | wxTREE_HITTEST_TORIGHT)) + if (flags & (wxTREE_HITTEST_ABOVE | wxTREE_HITTEST_BELOW | wxTREE_HITTEST_NOWHERE | wxTREE_HITTEST_TOLEFT | wxTREE_HITTEST_TORIGHT)) { return wxTreeItemId(); + } return hit; } @@ -87,38 +95,41 @@ } wxTreeItemId hit = GetHit(wxPoint(x, y)); - if (!hit) + if (!hit) { return wxDragNone; + } - const CLocalPath path(GetDirFromItem(hit)); - if (path.empty() || !path.IsWriteable()) + const CLocalPath path(GetDirFromItem(hit).ToStdWstring()); + if (path.empty() || !path.IsWriteable()) { return wxDragNone; + } - if (!GetData()) + if (!GetData()) { return wxDragError; + } CDragDropManager* pDragDropManager = CDragDropManager::Get(); - if (pDragDropManager) + if (pDragDropManager) { pDragDropManager->pDropTarget = m_pLocalTreeView; + } - if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) - m_pLocalTreeView->m_pState->HandleDroppedFiles(m_pFileDataObject, path, def == wxDragCopy); - else - { - if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) - { + if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) { + m_pLocalTreeView->m_state.HandleDroppedFiles(m_pFileDataObject, path, def == wxDragCopy); + } + else { + if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) { wxMessageBoxEx(_("Drag&drop between different instances of FileZilla has not been implemented yet.")); return wxDragNone; } - if (!m_pLocalTreeView->m_pState->GetServer() || !m_pRemoteDataObject->GetServer().EqualsNoPass(*m_pLocalTreeView->m_pState->GetServer())) - { + if (!m_pLocalTreeView->m_state.GetServer() || m_pRemoteDataObject->GetServer().server != m_pLocalTreeView->m_state.GetServer().server) { wxMessageBoxEx(_("Drag&drop between different servers has not been implemented yet.")); return wxDragNone; } - if (!m_pLocalTreeView->m_pState->DownloadDroppedFiles(m_pRemoteDataObject, path)) + if (!m_pLocalTreeView->m_state.DownloadDroppedFiles(m_pRemoteDataObject, path)) { return wxDragNone; + } } return def; @@ -133,12 +144,14 @@ ClearDropHighlight(); wxTreeItemId hit = GetHit(wxPoint(x, y)); - if (!hit) + if (!hit) { return false; + } - const wxString dir = GetDirFromItem(hit); - if (dir.empty() || !CLocalPath(dir).IsWriteable()) + std::wstring const dir = GetDirFromItem(hit).ToStdWstring(); + if (dir.empty() || !CLocalPath(dir).IsWriteable()) { return false; + } return true; } @@ -210,8 +223,6 @@ wxDataObjectComposite* m_pDataObject; }; -IMPLEMENT_CLASS(CLocalTreeView, wxTreeCtrlEx) - BEGIN_EVENT_TABLE(CLocalTreeView, wxTreeCtrlEx) EVT_TREE_ITEM_EXPANDING(wxID_ANY, CLocalTreeView::OnItemExpanding) #ifdef __WXMSW__ @@ -236,19 +247,20 @@ EVT_MENU(XRCID("ID_OPEN"), CLocalTreeView::OnMenuOpen) END_EVENT_TABLE() -CLocalTreeView::CLocalTreeView(wxWindow* parent, wxWindowID id, CState *pState, CQueueView *pQueueView) +CLocalTreeView::CLocalTreeView(wxWindow* parent, wxWindowID id, CState& state, CQueueView *pQueueView) : wxTreeCtrlEx(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxTR_EDIT_LABELS | wxTR_LINES_AT_ROOT | wxTR_HAS_BUTTONS | wxNO_BORDER), - CSystemImageList(16), - CStateEventHandler(pState), + CSystemImageList(CThemeProvider::GetIconSize(iconSizeSmall).x), + CStateEventHandler(state), m_pQueueView(pQueueView) { - wxGetApp().AddStartupProfileRecord(_T("CLocalTreeView::CLocalTreeView")); + wxGetApp().AddStartupProfileRecord("CLocalTreeView::CLocalTreeView"); #ifdef __WXMAC__ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); #endif - pState->RegisterHandler(this, STATECHANGE_LOCAL_DIR); - pState->RegisterHandler(this, STATECHANGE_APPLYFILTER); + state.RegisterHandler(this, STATECHANGE_LOCAL_DIR); + state.RegisterHandler(this, STATECHANGE_APPLYFILTER); + state.RegisterHandler(this, STATECHANGE_SERVER); SetImageList(GetSystemImageList()); @@ -266,10 +278,19 @@ SetItemImage(root, GetIconIndex(iconType::dir), wxTreeItemIcon_Expanded); SetItemImage(root, GetIconIndex(iconType::opened_dir), wxTreeItemIcon_SelectedExpanded); +#if USE_MAC_SANDBOX + auto userDirs = OSXSandboxUserdirs::Get().GetDirs(); + for (auto const& dir : userDirs) { + SetDir(dir); + } +#endif + SetDir(_T("/")); #endif SetDropTarget(new CLocalTreeViewDropTarget(this)); + + m_windowTinter = std::make_unique(*this); } CLocalTreeView::~CLocalTreeView() @@ -279,16 +300,14 @@ #endif } -void CLocalTreeView::SetDir(wxString localDir) +void CLocalTreeView::SetDir(wxString const& localDir) { - if (m_currentDir == localDir) - { + if (m_currentDir == localDir) { RefreshListing(); return; } - if (localDir.Left(2) == _T("\\\\")) - { + if (localDir.Left(2) == _T("\\\\")) { // TODO: UNC path, don't display it yet m_currentDir = _T(""); SafeSelectItem(wxTreeItemId()); @@ -297,8 +316,7 @@ m_currentDir = localDir; #ifdef __WXMSW__ - if (localDir == _T("\\")) - { + if (localDir == _T("\\")) { SafeSelectItem(m_drives); return; } @@ -306,20 +324,19 @@ wxString subDirs = localDir; wxTreeItemId parent = GetNearestParent(subDirs); - if (!parent) - { + if (!parent) { SafeSelectItem(wxTreeItemId()); return; } - if (subDirs.empty()) - { + if (subDirs.empty()) { SafeSelectItem(parent); return; } wxTreeItemId item = MakeSubdirs(parent, localDir.Left(localDir.Length() - subDirs.Length()), subDirs); - if (!item) + if (!item) { return; + } SafeSelectItem(item); } @@ -398,9 +415,9 @@ bool CLocalTreeView::DisplayDrives(wxTreeItemId parent) { - wxGetApp().AddStartupProfileRecord(_T("CLocalTreeView::DisplayDrives")); + wxGetApp().AddStartupProfileRecord("CLocalTreeView::DisplayDrives"); - std::list drives = CVolumeDescriptionEnumeratorThread::GetDrives(); + std::list drives = CVolumeDescriptionEnumeratorThread::GetDrives(); m_pVolumeEnumeratorThread = new CVolumeDescriptionEnumeratorThread(this); if (m_pVolumeEnumeratorThread->Failed()) { @@ -408,25 +425,24 @@ m_pVolumeEnumeratorThread = 0; } - for( std::list::const_iterator it = drives.begin(); it != drives.end(); ++it ) { + for (auto it = drives.begin(); it != drives.end(); ++it) { wxString drive = *it; if (drive.Right(1) == _T("\\")) drive = drive.RemoveLast(); - wxGetApp().AddStartupProfileRecord(wxString::Format(_T("CLocalTreeView::DisplayDrives adding drive %s"), drive.c_str())); - wxTreeItemId item = AppendItem(parent, drive, GetIconIndex(iconType::dir, drive)); + wxTreeItemId item = AppendItem(parent, drive, GetIconIndex(iconType::dir, _T(""), false)); AppendItem(item, _T("")); - SortChildren(parent); } + SortChildren(parent); - wxGetApp().AddStartupProfileRecord(_T("CLocalTreeView::DisplayDrives adding drives done")); + wxGetApp().AddStartupProfileRecord("CLocalTreeView::DisplayDrives adding drives done"); return true; } #endif -void CLocalTreeView::DisplayDir(wxTreeItemId parent, const wxString& dirname, const wxString& knownSubdir /*=_T("")*/) +void CLocalTreeView::DisplayDir(wxTreeItemId parent, const wxString& dirname, std::wstring const& knownSubdir) { fz::local_filesys local_filesys; @@ -435,8 +451,9 @@ if (!local_filesys.begin_find_files(fz::to_native(dirname), true)) { if (!knownSubdir.empty()) { wxTreeItemId item = GetSubdir(parent, knownSubdir); - if (item != wxTreeItemId()) + if (item != wxTreeItemId()) { return; + } const wxString fullName = dirname + knownSubdir; item = AppendItem(parent, knownSubdir, GetIconIndex(iconType::dir, fullName), @@ -448,20 +465,19 @@ ); CheckSubdirStatus(item, fullName); } - else - { - m_setSelection = true; + else { + ++m_setSelection; DeleteChildren(parent); - m_setSelection = false; + --m_setSelection; } return; } } wxASSERT(parent); - m_setSelection = true; + ++m_setSelection; DeleteChildren(parent); - m_setSelection = false; + --m_setSelection; CFilterManager filter; @@ -475,26 +491,28 @@ fz::datetime date; while (local_filesys.get_next_file(file, wasLink, is_dir, 0, &date, &attributes)) { wxASSERT(is_dir); - if (file.empty()) { + std::wstring wfile = fz::to_wstring(file); + if (file.empty() || wfile.empty()) { wxGetApp().DisplayEncodingWarning(); continue; } - wxString file_wx = file; - wxString fullName = dirname + file_wx; + std::wstring fullName = dirname.ToStdWstring() + wfile; #ifdef __WXMSW__ - if (file_wx.CmpNoCase(knownSubdir)) + if (fz::stricmp(wfile, knownSubdir)) #else - if (file_wx != knownSubdir) + if (wfile != knownSubdir) #endif { - if (filter.FilenameFiltered(file_wx, dirname, true, size, true, attributes, date)) + if (filter.FilenameFiltered(wfile, dirname, true, size, true, attributes, date)) { continue; + } } - else + else { matchedKnown = true; + } - wxTreeItemId item = AppendItem(parent, file_wx, GetIconIndex(iconType::dir, fullName), + wxTreeItemId item = AppendItem(parent, wfile, GetIconIndex(iconType::dir, fullName), #ifdef __WXMSW__ -1 #else @@ -528,8 +546,9 @@ CFilterManager filter; fz::local_filesys local_filesys; - if (!local_filesys.begin_find_files(fz::to_native(dirname), true)) + if (!local_filesys.begin_find_files(fz::to_native(dirname), true)) { return wxString(); + } fz::native_string file; bool wasLink; @@ -539,16 +558,17 @@ fz::datetime date; while (local_filesys.get_next_file(file, wasLink, is_dir, 0, &date, &attributes)) { wxASSERT(is_dir); - if (file.empty()) { + std::wstring wfile = fz::to_wstring(file); + if (file.empty() || wfile.empty()) { wxGetApp().DisplayEncodingWarning(); continue; } - wxString file_wx = file; - if (filter.FilenameFiltered(file_wx, dirname, true, size, true, attributes, date)) + if (filter.FilenameFiltered(wfile, dirname, true, size, true, attributes, date)) { continue; + } - return file_wx; + return wfile; } return wxString(); @@ -558,10 +578,14 @@ { const wxString& separator = wxFileName::GetPathSeparator(); + wxString segment; while (!subDir.empty()) { int pos = subDir.Find(separator); - wxString segment; - if (pos == -1) { + if (!pos) { + subDir = subDir.Mid(1); + continue; + } + else if (pos == -1) { segment = subDir; subDir = _T(""); } @@ -570,7 +594,7 @@ subDir = subDir.Mid(pos + 1); } - DisplayDir(parent, dirname, segment); + DisplayDir(parent, dirname, segment.ToStdWstring()); wxTreeItemId item = GetSubdir(parent, segment); if (!item) @@ -591,8 +615,10 @@ wxTreeItemIdValue value; wxTreeItemId child = GetFirstChild(item, value); - if (child && GetItemText(child).empty()) + if (child && GetItemText(child).empty()) { + wxCHECK_RET(!m_setSelection, "OnItemExpanding called on an item with empty child during item selection of one of its children."); DisplayDir(item, GetDirFromItem(item)); + } } wxString CLocalTreeView::GetDirFromItem(wxTreeItemId item) @@ -698,10 +724,10 @@ } } #else - t_dir dir; - dir.dir = separator; - dir.item = GetRootItem(); - dirsToCheck.push_back(dir); + t_dir root_dir; + root_dir.dir = separator; + root_dir.item = GetRootItem(); + dirsToCheck.push_back(root_dir); #endif CFilterManager filter; @@ -726,7 +752,7 @@ } // Step 2: Enumerate subdirectories on disk and sort them - std::vector dirs; + std::vector dirs; fz::native_string file; static int64_t const size(-1); @@ -735,16 +761,17 @@ int attributes; fz::datetime date; while (local_filesys.get_next_file(file, was_link, is_dir, 0, &date, &attributes)) { - if (file.empty()) { + std::wstring wfile = fz::to_wstring(file); + if (file.empty() || wfile.empty()) { wxGetApp().DisplayEncodingWarning(); continue; } - wxString file_wx = file; - if (filter.FilenameFiltered(file_wx, dir.dir, true, size, true, attributes, date)) + if (filter.FilenameFiltered(wfile, dir.dir, true, size, true, attributes, date)) { continue; + } - dirs.push_back(file_wx); + dirs.emplace_back(std::move(wfile)); } auto const& sortFunc = CFileListCtrlSortBase::GetCmpFunction(m_nameSortMode); std::sort(dirs.begin(), dirs.end(), [&](auto const& lhs, auto const& rhs) { return sortFunc(lhs, rhs) < 0; }); @@ -832,27 +859,34 @@ } wxTreeItemId item = event.GetItem(); - if (!item) + if (!item) { return; + } - wxString dir = GetDirFromItem(item); + std::wstring dir = GetDirFromItem(item).ToStdWstring(); - wxString error; - if (!m_pState->SetLocalDir(dir, &error)) { - if (!error.empty()) + std::wstring error; + if (!m_state.SetLocalDir(dir, &error)) { + if (!error.empty()) { wxMessageBoxEx(error, _("Failed to change directory"), wxICON_INFORMATION); - else + } + else { wxBell(); - m_setSelection = true; + } + ++m_setSelection; SelectItem(event.GetOldItem()); - m_setSelection = false; + --m_setSelection; } } -void CLocalTreeView::OnStateChange(CState*, enum t_statechange_notifications notification, const wxString&, const void*) +void CLocalTreeView::OnStateChange(t_statechange_notifications notification, const wxString&, const void*) { - if (notification == STATECHANGE_LOCAL_DIR) - SetDir(m_pState->GetLocalDir().GetPath()); + if (notification == STATECHANGE_LOCAL_DIR) { + SetDir(m_state.GetLocalDir().GetPath()); + } + else if (notification == STATECHANGE_SERVER) { + m_windowTinter->SetBackgroundTint(m_state.GetSite().m_colour); + } else { wxASSERT(notification == STATECHANGE_APPLYFILTER); RefreshListing(); @@ -861,6 +895,10 @@ void CLocalTreeView::OnBeginDrag(wxTreeEvent& event) { + if (COptions::Get()->GetOptionVal(OPTION_DND_DISABLED) != 0) { + return; + } + wxTreeItemId item = event.GetItem(); if (!item) return; @@ -905,7 +943,7 @@ { // We only need to refresh local side if the operation got handled // externally, the internal handlers do this for us already - m_pState->RefreshLocal(); + m_state.RefreshLocal(); } } @@ -913,35 +951,28 @@ wxString CLocalTreeView::GetSpecialFolder(int folder, int &iconIndex, int &openIconIndex) { - LPITEMIDLIST list; - if (SHGetSpecialFolderLocation((HWND)GetHandle(), folder, &list) != S_OK) - return wxString(); - - SHFILEINFO shFinfo; - if (!SHGetFileInfo((LPCTSTR)list, 0, &shFinfo, sizeof(shFinfo), SHGFI_PIDL | SHGFI_ICON | SHGFI_SMALLICON)) - return wxString(); + wxString name; - DestroyIcon(shFinfo.hIcon); - iconIndex = shFinfo.iIcon; - - if (!SHGetFileInfo((LPCTSTR)list, 0, &shFinfo, sizeof(shFinfo), SHGFI_PIDL | SHGFI_ICON | SHGFI_SMALLICON | SHGFI_OPENICON | SHGFI_DISPLAYNAME)) - return wxString(); - - DestroyIcon(shFinfo.hIcon); - openIconIndex = shFinfo.iIcon; - - wxString name = shFinfo.szDisplayName; + LPITEMIDLIST list{}; + if (SHGetSpecialFolderLocation((HWND)GetHandle(), folder, &list) == S_OK) { + SHFILEINFO shFinfo{}; + if (SHGetFileInfo((LPCTSTR)list, 0, &shFinfo, sizeof(shFinfo), SHGFI_PIDL | SHGFI_ICON | SHGFI_SMALLICON) != 0) { + if (shFinfo.hIcon) { + DestroyIcon(shFinfo.hIcon); + } + iconIndex = shFinfo.iIcon; + } - LPMALLOC pMalloc; - SHGetMalloc(&pMalloc); + if (SHGetFileInfo((LPCTSTR)list, 0, &shFinfo, sizeof(shFinfo), SHGFI_PIDL | SHGFI_ICON | SHGFI_SMALLICON | SHGFI_OPENICON | SHGFI_DISPLAYNAME) != 0) { + if (shFinfo.hIcon) { + DestroyIcon(shFinfo.hIcon); + } + openIconIndex = shFinfo.iIcon; + name = shFinfo.szDisplayName; + } - if (pMalloc) - { - pMalloc->Free(list); - pMalloc->Release(); + CoTaskMemFree(list); } - else - wxLogLastError(wxT("SHGetMalloc")); return name; } @@ -986,30 +1017,33 @@ void CLocalTreeView::OnVolumesEnumerated(wxCommandEvent& event) { - if (!m_pVolumeEnumeratorThread) + if (!m_pVolumeEnumeratorThread) { return; + } std::list volumeInfo; volumeInfo = m_pVolumeEnumeratorThread->GetVolumes(); - if (event.GetEventType() == fzEVT_VOLUMESENUMERATED) - { + if (event.GetEventType() == fzEVT_VOLUMESENUMERATED) { delete m_pVolumeEnumeratorThread; m_pVolumeEnumeratorThread = 0; } - for (std::list::const_iterator iter = volumeInfo.begin(); iter != volumeInfo.end(); ++iter) - { + for (std::list::const_iterator iter = volumeInfo.begin(); iter != volumeInfo.end(); ++iter) { wxString drive = iter->volume; wxTreeItemIdValue tmp; wxTreeItemId item = GetFirstChild(m_drives, tmp); - while (item) - { + while (item) { wxString name = GetItemText(item); - if (name == drive || name.Left(drive.Len() + 1) == drive + _T(" ")) - { - SetItemText(item, drive + _T(" (") + iter->volumeName + _T(")")); + if (name == drive || name.Left(drive.Len() + 1) == drive + _T(" ")) { + + if (!iter->volumeName.empty()) { + SetItemText(item, drive + _T(" (") + iter->volumeName + _T(")")); + } + if (iter->icon != -1) { + SetItemImage(item, iter->icon); + } break; } item = GetNextChild(m_drives, tmp); @@ -1022,22 +1056,26 @@ void CLocalTreeView::OnContextMenu(wxTreeEvent& event) { m_contextMenuItem = event.GetItem(); - if (!m_contextMenuItem.IsOk()) + if (!m_contextMenuItem.IsOk()) { return; + } wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_LOCALTREE")); - if (!pMenu) + if (!pMenu) { return; + } - const CLocalPath path(GetDirFromItem(m_contextMenuItem)); + CLocalPath const path(GetDirFromItem(m_contextMenuItem).ToStdWstring()); const bool hasParent = path.HasParent(); const bool writeable = path.IsWriteable(); - const bool remoteConnected = m_pState->IsRemoteConnected() && !m_pState->GetRemotePath().empty(); + const bool remoteConnected = m_state.IsRemoteConnected() && !m_state.GetRemotePath().empty(); + + bool const idle = m_state.GetLocalRecursiveOperation() && !m_state.GetLocalRecursiveOperation()->IsActive(); - pMenu->Enable(XRCID("ID_UPLOAD"), hasParent && remoteConnected); - pMenu->Enable(XRCID("ID_ADDTOQUEUE"), hasParent && remoteConnected); + pMenu->Enable(XRCID("ID_UPLOAD"), hasParent && remoteConnected && idle); + pMenu->Enable(XRCID("ID_ADDTOQUEUE"), hasParent && remoteConnected && idle); pMenu->Enable(XRCID("ID_MKDIR"), writeable); pMenu->Enable(XRCID("ID_DELETE"), writeable && hasParent); pMenu->Enable(XRCID("ID_RENAME"), writeable && hasParent); @@ -1048,26 +1086,47 @@ void CLocalTreeView::OnMenuUpload(wxCommandEvent& event) { - if (!m_contextMenuItem.IsOk()) + auto recursiveOperation = m_state.GetLocalRecursiveOperation(); + if (recursiveOperation->IsActive()) { return; + } - CLocalPath path(GetDirFromItem(m_contextMenuItem)); + if (!m_contextMenuItem.IsOk()) { + return; + } - if (!path.HasParent()) + CLocalPath path(GetDirFromItem(m_contextMenuItem).ToStdWstring()); + + if (!path.HasParent()) { return; + } - if (!m_pState->IsRemoteConnected()) + if (!m_state.IsRemoteConnected()) { return; + } + + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { + return; + } - const CServer server = *m_pState->GetServer(); - CServerPath remotePath = m_pState->GetRemotePath(); - if (remotePath.empty()) + CServerPath remotePath = m_state.GetRemotePath(); + if (remotePath.empty()) { return; + } - if (!remotePath.ChangePath(GetItemText(m_contextMenuItem))) + if (!remotePath.ChangePath(GetItemText(m_contextMenuItem).ToStdWstring())) { return; + } + + local_recursion_root root; + root.add_dir_to_visit(path, remotePath); + recursiveOperation->AddRecursionRoot(std::move(root)); + + bool const queue_only = event.GetId() == XRCID("ID_ADDTOQUEUE"); - m_pQueueView->QueueFolder(event.GetId() == XRCID("ID_ADDTOQUEUE"), false, path, remotePath, server); + CFilterManager filter; + recursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_transfer, filter.GetActiveFilters(), !queue_only); } // Create a new Directory @@ -1076,26 +1135,27 @@ wxString newdir = MenuMkdir(); if (!newdir.empty()) { RefreshListing(); - m_pState->RefreshLocal(); + m_state.RefreshLocal(); } } // Create a new Directory and enter the new Directory void CLocalTreeView::OnMenuMkdirChgDir(wxCommandEvent&) { - wxString newdir = MenuMkdir(); + std::wstring newdir = MenuMkdir().ToStdWstring(); if (newdir.empty()) { return; } // OnMenuEnter - wxString error; - if (!m_pState->SetLocalDir(newdir, &error)) - { - if (!error.empty()) + std::wstring error; + if (!m_state.SetLocalDir(newdir, &error)) { + if (!error.empty()) { wxMessageBoxEx(error, _("Failed to change directory"), wxICON_INFORMATION); - else + } + else { wxBell(); + } } } @@ -1103,33 +1163,35 @@ // Returns the name of the new directory wxString CLocalTreeView::MenuMkdir() { - if (!m_contextMenuItem.IsOk()) + if (!m_contextMenuItem.IsOk()) { return wxString(); + } - wxString path = GetDirFromItem(m_contextMenuItem); - if (path.Last() != wxFileName::GetPathSeparator()) + std::wstring path = GetDirFromItem(m_contextMenuItem).ToStdWstring(); + if (!path.empty() && path.back() != wxFileName::GetPathSeparator()) { path += wxFileName::GetPathSeparator(); + } - if (!CLocalPath(path).IsWriteable()) - { + if (!CLocalPath(path).IsWriteable()) { wxBell(); return wxString(); } CInputDialog dlg; - if (!dlg.Create(this, _("Create directory"), _("Please enter the name of the directory which should be created:"))) + if (!dlg.Create(this, _("Create directory"), _("Please enter the name of the directory which should be created:"))) { return wxString(); + } wxString newName = _("New directory"); dlg.SetValue(path + newName); - dlg.SelectText(path.Len(), path.Len() + newName.Len()); + dlg.SelectText(path.size(), path.size() + newName.size()); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return wxString(); + } wxFileName fn(dlg.GetValue(), _T("")); - if (!fn.Normalize(wxPATH_NORM_ALL, path)) - { + if (!fn.Normalize(wxPATH_NORM_ALL, path)) { wxBell(); return wxString(); } @@ -1160,7 +1222,7 @@ } #endif - CLocalPath path(GetDirFromItem(m_contextMenuItem)); + CLocalPath path(GetDirFromItem(m_contextMenuItem).ToStdWstring()); if (!path.HasParent() || !path.IsWriteable()) { wxBell(); return; @@ -1171,39 +1233,47 @@ void CLocalTreeView::OnMenuDelete(wxCommandEvent&) { - if (!m_contextMenuItem.IsOk()) + if (!m_contextMenuItem.IsOk()) { return; + } - wxString path = GetDirFromItem(m_contextMenuItem); + std::wstring path = GetDirFromItem(m_contextMenuItem).ToStdWstring(); CLocalPath local_path(path); - if (!local_path.HasParent() || !local_path.IsWriteable()) + if (!local_path.HasParent() || !local_path.IsWriteable()) { return; + } gui_recursive_remove rmd(this); rmd.remove(fz::to_native(path)); wxTreeItemId item = GetSelection(); - while (item && item != m_contextMenuItem) + while (item && item != m_contextMenuItem) { item = GetItemParent(item); + } if (!item) { - if (GetItemParent(m_contextMenuItem) == GetSelection()) - m_pState->RefreshLocal(); - else + if (GetItemParent(m_contextMenuItem) == GetSelection()) { + m_state.RefreshLocal(); + } + else { RefreshListing(); + } return; } - if (!path.empty() && path.Last() == wxFileName::GetPathSeparator()) - path.RemoveLast(); - int pos = path.Find(wxFileName::GetPathSeparator(), true); - if (pos < 1) + if (!path.empty() && path.back() == wxFileName::GetPathSeparator()) { + path.pop_back(); + } + size_t pos = path.rfind(wxFileName::GetPathSeparator()); + if (pos == std::wstring::npos || !pos) { path = _T("/"); - else - path = path.Left(pos); + } + else { + path = path.substr(0, pos); + } - m_pState->SetLocalDir(path); + m_state.SetLocalDir(path); RefreshListing(); } @@ -1220,7 +1290,7 @@ } #endif - CLocalPath path(GetDirFromItem(item)); + CLocalPath path(GetDirFromItem(item).ToStdWstring()); if (!path.HasParent() || !path.IsWriteable()) { @@ -1247,7 +1317,7 @@ } #endif - wxString path = GetDirFromItem(item); + std::wstring path = GetDirFromItem(item).ToStdWstring(); CLocalPath local_path(path); if (!local_path.HasParent() || !local_path.IsWriteable()) { @@ -1256,16 +1326,17 @@ return; } - if (!path.empty() && path.Last() == wxFileName::GetPathSeparator()) - path.RemoveLast(); + if (!path.empty() && path.back() == wxFileName::GetPathSeparator()) { + path.pop_back(); + } - int pos = path.Find(wxFileName::GetPathSeparator(), true); - wxASSERT(pos != -1); + size_t pos = path.rfind(wxFileName::GetPathSeparator()); + wxASSERT(pos != std::wstring::npos); - wxString parent = path.Left(pos + 1); + std::wstring parent = path.substr(0, pos + 1); const wxString& oldName = GetItemText(item); - const wxString& newName = event.GetLabel(); + std::wstring const newName = event.GetLabel().ToStdWstring(); if (newName.empty()) { wxBell(); event.Veto(); @@ -1274,8 +1345,9 @@ wxASSERT(parent + oldName == path); - if (oldName == newName) + if (oldName == newName) { return; + } if (!RenameFile(this, parent, oldName, newName)) { event.Veto(); @@ -1295,15 +1367,15 @@ } if (item == currentSel) { - m_pState->SetLocalDir(parent + newName); + m_state.SetLocalDir(parent + newName); return; } - wxString sub; + std::wstring sub; wxTreeItemId tmp = currentSel; while (tmp != GetRootItem() && tmp != item) { - sub = wxFileName::GetPathSeparator() + GetItemText(tmp) + sub; + sub = (wxFileName::GetPathSeparator() + GetItemText(tmp) + sub).ToStdWstring(); tmp = GetItemParent(tmp); } @@ -1313,7 +1385,7 @@ } // Current selection below renamed item - m_pState->SetLocalDir(parent + newName + sub); + m_state.SetLocalDir(parent + newName + sub); } void CLocalTreeView::OnChar(wxKeyEvent& event) @@ -1354,19 +1426,22 @@ #endif if (child) { - if (!GetItemText(child).empty()) + if (!GetItemText(child).empty()) { return false; + } CTreeItemData* pData = (CTreeItemData*)GetItemData(child); if (pData) { bool wasLink; int attributes; - enum fz::local_filesys::type type; + fz::local_filesys::type type; fz::datetime date; - if (!path.empty() && path.Last() == fz::local_filesys::path_separator) + if (!path.empty() && path.Last() == fz::local_filesys::path_separator) { type = fz::local_filesys::get_file_info(fz::to_native(path + pData->m_known_subdir), wasLink, 0, &date, &attributes); - else + } + else { type = fz::local_filesys::get_file_info(fz::to_native(path + fz::local_filesys::path_separator + pData->m_known_subdir), wasLink, 0, &date, &attributes); + } if (type == fz::local_filesys::dir) { CFilterManager filter; if (!filter.FilenameFiltered(pData->m_known_subdir, path, true, size, true, attributes, date)) @@ -1378,7 +1453,7 @@ wxString sub = HasSubdir(path); if (!sub.empty()) { wxTreeItemId subItem = AppendItem(item, _T("")); - SetItemData(subItem, new CTreeItemData(sub)); + SetItemData(subItem, new CTreeItemData(sub.ToStdWstring())); } else if (child) Delete(child); @@ -1419,8 +1494,8 @@ mask <<= 1; } - if (GetSelection() == m_drives && m_pState) - m_pState->RefreshLocal(); + if (GetSelection() == m_drives) + m_state.RefreshLocal(); } } diff -Nru filezilla-3.15.0.2/src/interface/LocalTreeView.h filezilla-3.33.0/src/interface/LocalTreeView.h --- filezilla-3.15.0.2/src/interface/LocalTreeView.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/LocalTreeView.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __LOCALTREEVIEW_H__ -#define __LOCALTREEVIEW_H__ +#ifndef FILEZILLA_INTERFACE_LOCALTREEVIEW_HEADER +#define FILEZILLA_INTERFACE_LOCALTREEVIEW_HEADER #include #include "systemimagelist.h" @@ -7,19 +7,18 @@ #include "treectrlex.h" class CQueueView; +class CWindowTinter; #ifdef __WXMSW__ class CVolumeDescriptionEnumeratorThread; #endif -class CLocalTreeView : public wxTreeCtrlEx, CSystemImageList, CStateEventHandler, COptionChangeEventHandler +class CLocalTreeView final : public wxTreeCtrlEx, CSystemImageList, CStateEventHandler, COptionChangeEventHandler { - DECLARE_CLASS(CLocalTreeView) - friend class CLocalTreeViewDropTarget; public: - CLocalTreeView(wxWindow* parent, wxWindowID id, CState *pState, CQueueView *pQueueView); + CLocalTreeView(wxWindow* parent, wxWindowID id, CState& state, CQueueView *pQueueView); virtual ~CLocalTreeView(); #ifdef __WXMSW__ @@ -28,9 +27,9 @@ #endif protected: - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2); + virtual void OnStateChange(t_statechange_notifications notification, const wxString& data, const void* data2); - void SetDir(wxString localDir); + void SetDir(wxString const& localDir); void RefreshListing(); #ifdef __WXMSW__ @@ -49,7 +48,7 @@ wxTreeItemId GetNearestParent(wxString& localDir); wxTreeItemId GetSubdir(wxTreeItemId parent, const wxString& subDir); - void DisplayDir(wxTreeItemId parent, const wxString& dirname, const wxString& knownSubdir = _T("")); + void DisplayDir(wxTreeItemId parent, const wxString& dirname, std::wstring const& knownSubdir = std::wstring()); wxString HasSubdir(const wxString& dirname); wxTreeItemId MakeSubdirs(wxTreeItemId parent, wxString dirname, wxString subDir); wxString m_currentDir; @@ -92,6 +91,8 @@ wxTreeItemId m_contextMenuItem; wxTreeItemId m_dropHighlight; + + std::unique_ptr m_windowTinter; }; #endif diff -Nru filezilla-3.15.0.2/src/interface/loginmanager.cpp filezilla-3.33.0/src/interface/loginmanager.cpp --- filezilla-3.15.0.2/src/interface/loginmanager.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/loginmanager.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -3,12 +3,14 @@ #include "dialogex.h" #include "filezillaapp.h" +#include "Options.h" +#include "xrc_helper.h" #include CLoginManager CLoginManager::m_theLoginManager; -std::list::iterator CLoginManager::FindItem(CServer const& server, wxString const& challenge) +std::list::iterator CLoginManager::FindItem(CServer const& server, std::wstring const& challenge) { return std::find_if(m_passwordCache.begin(), m_passwordCache.end(), [&](t_passwordcache const& item) { @@ -17,25 +19,114 @@ ); } -bool CLoginManager::GetPassword(CServer &server, bool silent, wxString const& name, wxString const& challenge, bool canRemember) +bool CLoginManager::GetPassword(ServerWithCredentials &server, bool silent, std::wstring const& name) { - wxASSERT(server.GetLogonType() != ANONYMOUS); + if (server.credentials.logonType_ != LogonType::ask && !server.credentials.encrypted_ && (server.credentials.logonType_ != LogonType::interactive || !server.server.GetUser().empty())) { + return true; + } + + if (server.credentials.encrypted_) { + auto priv = decryptors_.find(server.credentials.encrypted_); + if (priv != decryptors_.end() && priv->second) { + return server.credentials.Unprotect(priv->second); + } + + if (!silent) { + return DisplayDialogForEncrypted(server, name); + } + } + else { + auto it = FindItem(server.server, std::wstring()); + if (it != m_passwordCache.end()) { + server.credentials.SetPass(it->password); + return true; + } + + if (!silent) { + return DisplayDialog(server, name, std::wstring(), true); + } + } + + return false; +} + +bool CLoginManager::GetPassword(ServerWithCredentials &server, bool silent, std::wstring const& name, std::wstring const& challenge, bool canRemember) +{ if (canRemember) { - auto it = FindItem(server, challenge); + auto it = FindItem(server.server, challenge); if (it != m_passwordCache.end()) { - server.SetUser(server.GetUser(), it->password); + server.credentials.SetPass(it->password); return true; } } - if (silent) + if (silent) { return false; + } return DisplayDialog(server, name, challenge, canRemember); } -bool CLoginManager::DisplayDialog(CServer &server, wxString const& name, wxString challenge, bool canRemember) +bool CLoginManager::DisplayDialogForEncrypted(ServerWithCredentials &server, std::wstring const& name) { + assert(server.credentials.encrypted_); + + wxDialogEx pwdDlg; + if (!pwdDlg.Load(wxGetApp().GetTopWindow(), _T("ID_ENTERMASTERPASSWORD"))) { + return false; + } + + if (name.empty()) { + pwdDlg.GetSizer()->Show(XRCCTRL(pwdDlg, "ID_NAMELABEL", wxStaticText), false, true); + pwdDlg.GetSizer()->Show(XRCCTRL(pwdDlg, "ID_NAME", wxStaticText), false, true); + } + else { + xrc_call(pwdDlg, "ID_NAME", &wxStaticText::SetLabel, name); + } + + XRCCTRL(pwdDlg, "ID_HOST", wxStaticText)->SetLabel(server.Format(ServerFormat::with_optional_port)); + + XRCCTRL(pwdDlg, "ID_OLD_USER", wxStaticText)->SetLabel(server.server.GetUser()); + + XRCCTRL(pwdDlg, "wxID_OK", wxButton)->SetId(wxID_OK); + XRCCTRL(pwdDlg, "wxID_CANCEL", wxButton)->SetId(wxID_CANCEL); + + xrc_call(pwdDlg, "ID_KEY_IDENTIFIER", &wxStaticText::SetLabel, server.credentials.encrypted_.to_base64().substr(0, 8)); + + pwdDlg.GetSizer()->Fit(&pwdDlg); + pwdDlg.GetSizer()->SetSizeHints(&pwdDlg); + + while (true) { + if (pwdDlg.ShowModal() != wxID_OK) { + return false; + } + + auto pass = fz::to_utf8(xrc_call(pwdDlg, "ID_PASSWORD", &wxTextCtrl::GetValue)); + auto key = private_key::from_password(pass, server.credentials.encrypted_.salt_); + + if (key.pubkey() != server.credentials.encrypted_) { + wxMessageBoxEx(_("Wrong master password entered, it cannot be used to decrypt this item."), _("Invalid input"), wxICON_EXCLAMATION); + continue; + } + + if (!server.credentials.Unprotect(key)) { + wxMessageBoxEx(_("Failed to decrypt server password."), _("Invalid input"), wxICON_EXCLAMATION); + continue; + } + + if (xrc_call(pwdDlg, "ID_REMEMBER", &wxCheckBox::IsChecked)) { + decryptors_[key.pubkey()] = key; + } + break; + } + + return true; +} + +bool CLoginManager::DisplayDialog(ServerWithCredentials &server, std::wstring const& name, std::wstring const& challenge, bool canRemember) +{ + assert(!server.credentials.encrypted_); + wxDialogEx pwdDlg; if (!pwdDlg.Load(wxGetApp().GetTopWindow(), _T("ID_ENTERPASSWORD"))) { return false; @@ -45,77 +136,106 @@ pwdDlg.GetSizer()->Show(XRCCTRL(pwdDlg, "ID_NAMELABEL", wxStaticText), false, true); pwdDlg.GetSizer()->Show(XRCCTRL(pwdDlg, "ID_NAME", wxStaticText), false, true); } - else - XRCCTRL(pwdDlg, "ID_NAME", wxStaticText)->SetLabel(name); + else { + xrc_call(pwdDlg, "ID_NAME", &wxStaticText::SetLabel, name); + } + if (challenge.empty()) { pwdDlg.GetSizer()->Show(XRCCTRL(pwdDlg, "ID_CHALLENGELABEL", wxStaticText), false, true); pwdDlg.GetSizer()->Show(XRCCTRL(pwdDlg, "ID_CHALLENGE", wxTextCtrl), false, true); + } else { -#ifdef __WXMSW__ - challenge.Replace(_T("\n"), _T("\r\n")); + wxString displayChallenge = challenge; + displayChallenge.Trim(true); + displayChallenge.Trim(false); +#ifdef FZ_WINDOWS + displayChallenge.Replace(_T("\n"), _T("\r\n")); #endif - XRCCTRL(pwdDlg, "ID_CHALLENGE", wxTextCtrl)->ChangeValue(challenge); + XRCCTRL(pwdDlg, "ID_CHALLENGE", wxTextCtrl)->ChangeValue(displayChallenge); pwdDlg.GetSizer()->Show(XRCCTRL(pwdDlg, "ID_REMEMBER", wxCheckBox), canRemember, true); XRCCTRL(pwdDlg, "ID_CHALLENGE", wxTextCtrl)->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); } - XRCCTRL(pwdDlg, "ID_HOST", wxStaticText)->SetLabel(server.FormatHost()); + XRCCTRL(pwdDlg, "ID_HOST", wxStaticText)->SetLabel(server.Format(ServerFormat::with_optional_port)); - if (server.GetUser().empty()) { - pwdDlg.SetTitle(_("Enter username and password")); + if (server.server.GetUser().empty()) { XRCCTRL(pwdDlg, "ID_OLD_USER_LABEL", wxStaticText)->Hide(); XRCCTRL(pwdDlg, "ID_OLD_USER", wxStaticText)->Hide(); XRCCTRL(pwdDlg, "ID_HEADER_PASS", wxStaticText)->Hide(); - if (server.GetLogonType() == INTERACTIVE) { + if (server.credentials.logonType_ == LogonType::interactive) { + pwdDlg.SetTitle(_("Enter username")); XRCCTRL(pwdDlg, "ID_PASSWORD_LABEL", wxStaticText)->Hide(); XRCCTRL(pwdDlg, "ID_PASSWORD", wxTextCtrl)->Hide(); - XRCCTRL(pwdDlg, "ID_REMEMBER", wxCheckBox)->Hide(); XRCCTRL(pwdDlg, "ID_HEADER_BOTH", wxStaticText)->Hide(); + + canRemember = false; + XRCCTRL(pwdDlg, "ID_REMEMBER", wxCheckBox)->Hide(); } - else + else { + pwdDlg.SetTitle(_("Enter username and password")); XRCCTRL(pwdDlg, "ID_HEADER_USER", wxStaticText)->Hide(); - + } XRCCTRL(pwdDlg, "ID_NEW_USER", wxTextCtrl)->SetFocus(); } else { - XRCCTRL(pwdDlg, "ID_OLD_USER", wxStaticText)->SetLabel(server.GetUser()); + XRCCTRL(pwdDlg, "ID_OLD_USER", wxStaticText)->SetLabel(server.server.GetUser()); XRCCTRL(pwdDlg, "ID_NEW_USER_LABEL", wxStaticText)->Hide(); XRCCTRL(pwdDlg, "ID_NEW_USER", wxTextCtrl)->Hide(); XRCCTRL(pwdDlg, "ID_HEADER_USER", wxStaticText)->Hide(); - XRCCTRL(pwdDlg, "ID_HEADER_BOTH", wxStaticText)->Hide(); + xrc_call(pwdDlg, "ID_HEADER_BOTH", &wxStaticText::Hide); + } + + if (server.server.GetProtocol() == STORJ) { + XRCCTRL(pwdDlg, "ID_ENCRYPTIONKEY_LABEL", wxStaticText)->Show(); + XRCCTRL(pwdDlg, "ID_ENCRYPTIONKEY", wxTextCtrl)->Show(); } + XRCCTRL(pwdDlg, "wxID_OK", wxButton)->SetId(wxID_OK); XRCCTRL(pwdDlg, "wxID_CANCEL", wxButton)->SetId(wxID_CANCEL); pwdDlg.GetSizer()->Fit(&pwdDlg); pwdDlg.GetSizer()->SetSizeHints(&pwdDlg); - wxString user; - while (user.empty()) { - if (pwdDlg.ShowModal() != wxID_OK) + while (true) { + if (pwdDlg.ShowModal() != wxID_OK) { return false; + } - if (server.GetUser().empty()) { - user = XRCCTRL(pwdDlg, "ID_NEW_USER", wxTextCtrl)->GetValue(); + if (server.server.GetUser().empty()) { + auto user = xrc_call(pwdDlg, "ID_NEW_USER", &wxTextCtrl::GetValue).ToStdWstring(); if (user.empty()) { wxMessageBoxEx(_("No username given."), _("Invalid input"), wxICON_EXCLAMATION); continue; } + server.server.SetUser(user); } - else - user = server.GetUser(); - } - server.SetUser(user, XRCCTRL(pwdDlg, "ID_PASSWORD", wxTextCtrl)->GetValue()); +/* FIXME? + if (server.server.GetProtocol() == STORJ) { + std::wstring encryptionKey = XRCCTRL(pwdDlg, "ID_ENCRYPTIONKEY", wxTextCtrl)->GetValue().ToStdWstring(); + if (encryptionKey.empty()) { + wxMessageBoxEx(_("No encryption key given."), _("Invalid input"), wxICON_EXCLAMATION); + continue; + } + } +*/ + std::wstring pass = xrc_call(pwdDlg, "ID_PASSWORD", &wxTextCtrl::GetValue).ToStdWstring(); + if (server.server.GetProtocol() == STORJ) { + std::wstring encryptionKey = xrc_call(pwdDlg, "ID_ENCRYPTIONKEY", &wxTextCtrl::GetValue).ToStdWstring(); + pass += L"|" + encryptionKey; + } + server.credentials.SetPass(pass); - if (canRemember) { - RememberPassword(server, challenge); + if (canRemember && xrc_call(pwdDlg, "ID_REMEMBER", &wxCheckBox::IsChecked)) { + RememberPassword(server, challenge); + } + break; } return true; } -void CLoginManager::CachedPasswordFailed(const CServer& server, wxString const& challenge) +void CLoginManager::CachedPasswordFailed(CServer const& server, std::wstring const& challenge) { auto it = FindItem(server, challenge); if (it != m_passwordCache.end()) { @@ -123,23 +243,89 @@ } } -void CLoginManager::RememberPassword(CServer & server, wxString const& challenge) +void CLoginManager::RememberPassword(ServerWithCredentials & server, std::wstring const& challenge) { - if (server.GetLogonType() == ANONYMOUS) { + if (server.credentials.logonType_ == LogonType::anonymous) { return; } - auto it = FindItem(server, challenge); + auto it = FindItem(server.server, challenge); if (it != m_passwordCache.end()) { - it->password = server.GetPass(); + it->password = server.credentials.GetPass(); } else { t_passwordcache entry; - entry.host = server.GetHost(); - entry.port = server.GetPort(); - entry.user = server.GetUser(); - entry.password = server.GetPass(); + entry.host = server.server.GetHost(); + entry.port = server.server.GetPort(); + entry.user = server.server.GetUser(); + entry.password = server.credentials.GetPass(); entry.challenge = challenge; m_passwordCache.push_back(entry); } } + +bool CLoginManager::AskDecryptor(public_key const& pub, bool allowForgotten, bool allowCancel) +{ + if (this == &CLoginManager::Get()) { + return false; + } + + if (!pub) { + return false; + } + + if (decryptors_.find(pub) != decryptors_.cend()) { + return true; + } + + wxDialogEx pwdDlg; + if (!pwdDlg.Load(wxGetApp().GetTopWindow(), _T("ID_ENTEROLDMASTERPASSWORD"))) { + return false; + } + xrc_call(pwdDlg, "ID_KEY_IDENTIFIER", &wxStaticText::SetLabel, pub.to_base64().substr(0, 8)); + + if (!allowForgotten) { + xrc_call(pwdDlg, "ID_FORGOT", &wxControl::Hide); + } + if (!allowCancel) { + wxASSERT(allowForgotten); + xrc_call(pwdDlg, "wxID_CANCEL", &wxControl::Disable); + } + + while (true) { + if (pwdDlg.ShowModal() != wxID_OK) { + if (allowCancel) { + return false; + } + continue; + } + + bool const forgot = xrc_call(pwdDlg, "ID_FORGOT", &wxCheckBox::GetValue); + if (!forgot) { + auto pass = fz::to_utf8(xrc_call(pwdDlg, "ID_PASSWORD", &wxTextCtrl::GetValue)); + auto key = private_key::from_password(pass, pub.salt_); + + if (key.pubkey() != pub) { + wxMessageBoxEx(_("Wrong master password entered, it cannot be used to decrypt the stored passwords."), _("Invalid input"), wxICON_EXCLAMATION); + continue; + } + decryptors_[pub] = key; + } + else { + decryptors_[pub] = private_key(); + } + break; + } + + return true; +} + +private_key CLoginManager::GetDecryptor(public_key const& pub) +{ + auto it = decryptors_.find(pub); + if (it != decryptors_.cend()) { + return it->second; + } + + return private_key(); +} diff -Nru filezilla-3.15.0.2/src/interface/loginmanager.h filezilla-3.33.0/src/interface/loginmanager.h --- filezilla-3.15.0.2/src/interface/loginmanager.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/loginmanager.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,9 @@ -#ifndef __LOGINMANAGER_H__ -#define __LOGINMANAGER_H__ +#ifndef FILEZILLA_INTERFACE_LOGINMANAGER_HEADER +#define FILEZILLA_INTERFACE_LOGINMANAGER_HEADER + +#include "serverdata.h" + +#include // The purpose of this class is to manage some aspects of the login // behaviour. These are: @@ -11,30 +15,37 @@ public: static CLoginManager& Get() { return m_theLoginManager; } - bool GetPassword(CServer& server, bool silent, wxString const& name = wxString(), wxString const& challenge = wxString(), bool canRemember = true); + bool GetPassword(ServerWithCredentials& server, bool silent, std::wstring const& name = std::wstring()); + bool GetPassword(ServerWithCredentials& server, bool silent, std::wstring const& name, std::wstring const& challenge, bool canRemember); + + void CachedPasswordFailed(CServer const& server, std::wstring const& challenge = std::wstring()); - void CachedPasswordFailed(const CServer& server, wxString const& challenge = wxString()); + void RememberPassword(ServerWithCredentials & server, std::wstring const& challenge = std::wstring()); - void RememberPassword(CServer & server, wxString const& challenge = wxString()); + bool AskDecryptor(public_key const& pub, bool allowForgotten, bool allowCancel); + private_key GetDecryptor(public_key const& pub); protected: - bool DisplayDialog(CServer& server, wxString const& name, wxString challenge, bool canRemember); + bool DisplayDialogForEncrypted(ServerWithCredentials& server, std::wstring const& name); + bool DisplayDialog(ServerWithCredentials& server, std::wstring const& name, std::wstring const& challenge, bool canRemember); static CLoginManager m_theLoginManager; // Session password cache for Ask-type servers struct t_passwordcache { - wxString host; + std::wstring host; unsigned int port; - wxString user; - wxString password; - wxString challenge; + std::wstring user; + std::wstring password; + std::wstring challenge; }; - - std::list::iterator FindItem(CServer const& server, wxString const& challenge); - + + std::list::iterator FindItem(CServer const& server, std::wstring const& challenge); + std::list m_passwordCache; + + std::map decryptors_; }; -#endif //__LOGINMANAGER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/Mainfrm.cpp filezilla-3.33.0/src/interface/Mainfrm.cpp --- filezilla-3.15.0.2/src/interface/Mainfrm.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/Mainfrm.cpp 2017-12-14 04:30:03.000000000 +0000 @@ -1,54 +1,59 @@ + #include #include "Mainfrm.h" +#include "aboutdialog.h" +#include "asyncrequestqueue.h" +#include "auto_ascii_files.h" +#include "bookmarks_dialog.h" +#include "buildinfo.h" +#include "clearprivatedata.h" +#include "cmdline.h" +#include "commandqueue.h" +#include "conditionaldialog.h" +#include "context_control.h" +#include "defaultfileexistsdlg.h" +#include "edithandler.h" +#include "encoding_converter.h" +#include "export.h" +#include "filelist_statusbar.h" +#include "filezillaapp.h" +#include "filter.h" +#include "import.h" +#include "inputdialog.h" +#include "led.h" +#include "list_search_panel.h" +#include "local_recursive_operation.h" #include "LocalListView.h" #include "LocalTreeView.h" +#include "loginmanager.h" +#include "manual_transfer.h" +#include "menu_bar.h" +#include "netconfwizard.h" +#include "Options.h" +#include "power_management.h" #include "queue.h" +#include "quickconnectbar.h" +#include "remote_recursive_operation.h" #include "RemoteListView.h" #include "RemoteTreeView.h" +#include "search.h" +#include "settings/settingsdialog.h" +#include "sitemanager_dialog.h" +#include "speedlimits_dialog.h" +#include "splitter.h" #include "StatusView.h" #include "state.h" -#include "Options.h" -#include "asyncrequestqueue.h" -#include "commandqueue.h" -#include "led.h" -#include "sitemanager_dialog.h" -#include "settings/settingsdialog.h" #include "themeprovider.h" -#include "filezillaapp.h" +#include "toolbar.h" +#include "update_dialog.h" +#include "updater.h" #include "view.h" #include "viewheader.h" -#include "aboutdialog.h" -#include "filter.h" -#include "netconfwizard.h" -#include "quickconnectbar.h" -#include "updater.h" -#include "update_dialog.h" -#include "defaultfileexistsdlg.h" -#include "loginmanager.h" -#include "conditionaldialog.h" -#include "clearprivatedata.h" -#include "export.h" -#include "import.h" -#include "recursive_operation.h" -#include -#include "edithandler.h" -#include "inputdialog.h" -#include "window_state_manager.h" -#include "cmdline.h" -#include "buildinfo.h" -#include "filelist_statusbar.h" -#include "manual_transfer.h" -#include "auto_ascii_files.h" -#include "splitter.h" -#include "bookmarks_dialog.h" -#include "search.h" -#include "power_management.h" #include "welcome_dialog.h" -#include "context_control.h" -#include "speedlimits_dialog.h" -#include "toolbar.h" -#include "menu_bar.h" +#include "window_state_manager.h" + +#include #ifdef __WXMSW__ #include @@ -117,7 +122,6 @@ BEGIN_EVENT_TABLE(CMainFrame, wxNavigationEnabled) EVT_SIZE(CMainFrame::OnSize) EVT_MENU(wxID_ANY, CMainFrame::OnMenuHandler) - EVT_FZ_NOTIFICATION(wxID_ANY, CMainFrame::OnEngineEvent) EVT_COMMAND(wxID_ANY, fzEVT_UPDATE_LED_TOOLTIP, CMainFrame::OnUpdateLedTooltip) EVT_TOOL(XRCID("ID_TOOLBAR_DISCONNECT"), CMainFrame::OnDisconnect) EVT_MENU(XRCID("ID_MENU_SERVER_DISCONNECT"), CMainFrame::OnDisconnect) @@ -181,11 +185,10 @@ EVT_MENU(XRCID("ID_MENU_FILE_CLOSETAB"), CMainFrame::OnMenuCloseTab) END_EVENT_TABLE() -class CMainFrameStateEventHandler : public CStateEventHandler +class CMainFrameStateEventHandler final : public CGlobalStateEventHandler { public: CMainFrameStateEventHandler(CMainFrame* pMainFrame) - : CStateEventHandler(0) { m_pMainFrame = pMainFrame; @@ -196,53 +199,50 @@ } protected: - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*) + virtual void OnStateChange(CState* pState, t_statechange_notifications notification, const wxString&, const void*) { - if (notification == STATECHANGE_CHANGEDCONTEXT) - { + if (notification == STATECHANGE_CHANGEDCONTEXT) { // Update window title - const CServer* pServer = pState ? pState->GetServer() : 0; - if (!pServer) + if (!pState || !pState->GetServer()) { m_pMainFrame->SetTitle(_T("FileZilla")); - else + } + else { m_pMainFrame->SetTitle(pState->GetTitle() + _T(" - FileZilla")); + } return; } - if (!pState) + if (!pState) { + return; + } + + if (!m_pMainFrame->m_pContextControl) { return; + } CContextControl::_context_controls* controls = m_pMainFrame->m_pContextControl->GetControlsFromState(pState); - if (!controls) + if (!controls) { return; + } - if (controls->tab_index == -1) - { - if (notification == STATECHANGE_REMOTE_IDLE || notification == STATECHANGE_SERVER) + if (!controls->used()) { + if (notification == STATECHANGE_REMOTE_IDLE || notification == STATECHANGE_SERVER) { pState->Disconnect(); + } return; } - if (notification == STATECHANGE_SERVER) - { - const CServer* pServer = pState->GetServer(); + if (notification == STATECHANGE_SERVER) { + ServerWithCredentials const& server = pState->GetServer(); - if (pState == CContextManager::Get()->GetCurrentContext()) - { - if (!pServer) + if (pState == CContextManager::Get()->GetCurrentContext()) { + if (!server) { m_pMainFrame->SetTitle(_T("FileZilla")); - else - { + } + else { m_pMainFrame->SetTitle(pState->GetTitle() + _T(" - FileZilla")); - if (pServer->GetName().empty()) - { - // Can only happen through quickconnect bar - CMenuBar* pMenuBar = wxDynamicCast(m_pMainFrame->GetMenuBar(), CMenuBar); - if (pMenuBar) - pMenuBar->ClearBookmarks(); - } } } @@ -253,13 +253,56 @@ CMainFrame* m_pMainFrame; }; + +/*#include "overlay.h" +#include + +namespace { +void ShowStorjOverlay(wxWindow* parent, wxWindow* anchor, wxPoint const& offset) +{ + auto p = new OverlayWindow(parent); + + auto box = new wxBoxSizer(wxVERTICAL); + auto sizer = new wxFlexGridSizer(1, wxSize(5, 5)); + box->Add(sizer, 0, wxALL, 7); + + p->SetSizer(box); + + auto title = new wxStaticText(p, -1, _("Did you know about this new FileZilla feature?")); + + wxFont f = title->GetFont(); + f.SetWeight(wxBOLD); + title->SetFont(f); + sizer->Add(title); + + sizer->AddSpacer(0); + + sizer->Add(new wxStaticText(p, -1, _("You can use FileZilla to store your files securely in the Storj decentralized cloud."))); + sizer->Add(new wxHyperlinkCtrl(p, -1, _("Click to learn more"), L"https://wiki.filezilla-project.org/Storj")); + + sizer->AddSpacer(10); + + //sizer->Add(new wxCheckBox(p, -1, L"Don't show this again"), 0, wxALIGN_RIGHT); + + auto dismiss = new wxButton(p, -1, L"Dismiss"); + dismiss->Bind(wxEVT_BUTTON, [p](wxCommandEvent&) { p->Destroy(); }); + sizer->Add(dismiss, 0, wxALIGN_RIGHT); + + wxGetApp().GetWrapEngine()->WrapRecursive(p, 3); + + box->Fit(p); + + p->SetAnchor(anchor, offset); +} +}*/ + CMainFrame::CMainFrame() - : m_engineContext(*COptions::Get()) + : m_engineContext(*COptions::Get(), CustomEncodingConverter::Get()) , m_comparisonToggleAcceleratorId(wxNewId()) { m_pActivityLed[0] = m_pActivityLed[1] = 0; - wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CMainFrame")); + wxGetApp().AddStartupProfileRecord("CMainFrame::CMainFrame"); wxRect screen_size = CWindowStateManager::GetScreenDimensions(); wxSize initial_size; @@ -307,14 +350,16 @@ m_closeEventTimer.SetOwner(this); if (CFilterManager::HasActiveFilters(true)) { - if (COptions::Get()->GetOptionVal(OPTION_FILTERTOGGLESTATE)) + if (COptions::Get()->GetOptionVal(OPTION_FILTERTOGGLESTATE)) { CFilterManager::ToggleFilters(); + } } CreateMenus(); CreateMainToolBar(); - if (COptions::Get()->GetOptionVal(OPTION_SHOW_QUICKCONNECT)) + if (COptions::Get()->GetOptionVal(OPTION_SHOW_QUICKCONNECT)) { CreateQuickconnectBar(); + } m_pAsyncRequestQueue = new CAsyncRequestQueue(this); @@ -341,10 +386,12 @@ m_pQueueLogSplitter->SetSashGravity(0.5); m_pQueuePane = new CQueue(m_pQueueLogSplitter, this, m_pAsyncRequestQueue); - if (message_log_position == 1) + if (message_log_position == 1) { m_pStatusView = new CStatusView(m_pQueueLogSplitter, -1); - else + } + else { m_pStatusView = new CStatusView(m_pTopSplitter, -1); + } m_pQueueView = m_pQueuePane->GetQueueView(); @@ -430,9 +477,8 @@ FixTabOrder(); - RegisterOption(OPTION_LANGUAGE); - RegisterOption(OPTION_THEME); - RegisterOption(OPTION_THEME_ICONSIZE); + RegisterOption(OPTION_ICONS_THEME); + RegisterOption(OPTION_ICONS_SCALE); RegisterOption(OPTION_MESSAGELOG_POSITION); RegisterOption(OPTION_FILEPANE_LAYOUT); RegisterOption(OPTION_FILEPANE_SWAP); @@ -446,6 +492,9 @@ delete m_pStateEventHandler; + delete m_pContextControl; + m_pContextControl = 0; + CContextManager::Get()->DestroyAllStates(); delete m_pAsyncRequestQueue; #if FZ_MANUALUPDATECHECK @@ -488,24 +537,25 @@ { wxFrame::OnSize(event); - if (!m_pBottomSplitter) + if (!m_pBottomSplitter) { return; + } HandleResize(); #ifdef __WXGTK__ - if (m_pWindowStateManager && m_pWindowStateManager->m_maximize_requested && IsMaximized()) - { + if (m_pWindowStateManager && m_pWindowStateManager->m_maximize_requested && IsMaximized()) { m_pWindowStateManager->m_maximize_requested = 0; - if (!RestoreSplitterPositions()) + if (!RestoreSplitterPositions()) { SetDefaultSplitterPositions(); + } } #endif } bool CMainFrame::CreateMenus() { - wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CreateMenus")); + wxGetApp().AddStartupProfileRecord("CMainFrame::CreateMenus"); CMenuBar* old = m_pMenuBar; m_pMenuBar = CMenuBar::Load(this); @@ -523,20 +573,17 @@ bool CMainFrame::CreateQuickconnectBar() { - wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CreateQuickconnectBar")); + wxGetApp().AddStartupProfileRecord("CMainFrame::CreateQuickconnectBar"); delete m_pQuickconnectBar; m_pQuickconnectBar = new CQuickconnectBar(); - if (!m_pQuickconnectBar->Create(this)) - { + if (!m_pQuickconnectBar->Create(this)) { delete m_pQuickconnectBar; m_pQuickconnectBar = 0; } - else - { + else { wxSize clientSize = GetClientSize(); - if (m_pTopSplitter) - { + if (m_pTopSplitter) { wxSize panelSize = m_pQuickconnectBar->GetSize(); m_pTopSplitter->SetSize(-1, panelSize.GetHeight(), -1, clientSize.GetHeight() - panelSize.GetHeight(), wxSIZE_USE_EXISTING); } @@ -555,23 +602,28 @@ OpenSiteManager(); } else if (event.GetId() == XRCID("ID_MENU_FILE_COPYSITEMANAGER")) { + ServerWithCredentials server; CState* pState = CContextManager::Get()->GetCurrentContext(); - const CServer* pServer = pState ? pState->GetServer() : 0; - if (!pServer) { + if (pState) { + server = pState->GetServer(); + } + if (!server) { wxMessageBoxEx(_("Not connected to any server."), _("Cannot add server to Site Manager"), wxICON_EXCLAMATION); return; } - OpenSiteManager(pServer); + OpenSiteManager(&server); } else if (event.GetId() == XRCID("ID_MENU_SERVER_CMD")) { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState || !pState->m_pCommandQueue || !pState->IsRemoteConnected() || !pState->IsRemoteIdle()) + if (!pState || !pState->m_pCommandQueue || !pState->IsRemoteConnected() || !pState->IsRemoteIdle()) { return; + } CInputDialog dlg; dlg.Create(this, _("Enter custom command"), _("Please enter raw FTP command.\nUsing raw ftp commands will clear the directory cache.")); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } pState = CContextManager::Get()->GetCurrentContext(); if (!pState || !pState->m_pCommandQueue || !pState->IsRemoteConnected() || !pState->IsRemoteIdle()) { @@ -597,7 +649,7 @@ wxBell(); return; } - pState->m_pCommandQueue->ProcessCommand(new CRawCommand(dlg.GetValue())); + pState->m_pCommandQueue->ProcessCommand(new CRawCommand(dlg.GetValue().ToStdWstring())); } else if (event.GetId() == XRCID("wxID_PREFERENCES")) { OnMenuEditSettings(event); @@ -612,12 +664,23 @@ CInputDialog dlg; dlg.Create(this, _T("Ciphers"), _T("Priority string:")); dlg.AllowEmpty(true); - if (dlg.ShowModal() == wxID_OK) - wxMessageBoxEx(ListTlsCiphers(dlg.GetValue()), _T("Ciphers")); + if (dlg.ShowModal() == wxID_OK) { + std::string ciphers = ListTlsCiphers(fz::to_string(dlg.GetValue().ToStdWstring())); + wxMessageBoxEx(fz::to_wstring(ciphers), _T("Ciphers")); + } } else if (event.GetId() == XRCID("ID_CLEARCACHE_LAYOUT")) { CWrapEngine::ClearCache(); } + else if (event.GetId() == XRCID("ID_CLEAR_UPDATER")) { +#if FZ_MANUALUPDATECHECK + if (m_pUpdater) { + COptions::Get()->SetOption(OPTION_UPDATECHECK_LASTDATE, std::wstring()); + COptions::Get()->SetOption(OPTION_UPDATECHECK_NEWVERSION, std::wstring()); + m_pUpdater->Init(); + } +#endif + } else if (event.GetId() == XRCID("ID_MENU_TRANSFER_FILEEXISTS")) { CDefaultFileExistsDlg dlg; if (!dlg.Load(this, false)) @@ -745,8 +808,9 @@ } } else if (event.GetId() == XRCID("ID_VIEW_QUICKCONNECT")) { - if (!m_pQuickconnectBar) + if (!m_pQuickconnectBar) { CreateQuickconnectBar(); + } else { m_pQuickconnectBar->Destroy(); m_pQuickconnectBar = 0; @@ -770,42 +834,37 @@ if (!pState) { return; } - CServer const* pServer = pState->GetServer(); + + Site const old_site = pState->GetSite(); + std::wstring sitePath = old_site.m_path; CContextControl::_context_controls* controls = m_pContextControl->GetCurrentControls(); - if (!controls) + if (!controls) { return; - if (!pServer && !controls->site_bookmarks->path.empty()) { - // Get server from site manager - std::unique_ptr data = CSiteManager::GetSiteByPath(controls->site_bookmarks->path); - if (data) { - server = data->m_server; - pServer = &server; - } - else { - controls->site_bookmarks->path.clear(); - controls->site_bookmarks->bookmarks.clear(); - if (m_pMenuBar) - m_pMenuBar->UpdateBookmarkMenu(); - } } // controls->last_bookmark_path can get modified if it's empty now int res; if (event.GetId() == XRCID("ID_BOOKMARK_ADD")) { - CNewBookmarkDialog dlg(this, controls->site_bookmarks->path, pServer); + CNewBookmarkDialog dlg(this, sitePath, old_site.server_ ? &old_site.server_ : 0); res = dlg.Run(pState->GetLocalDir().GetPath(), pState->GetRemotePath()); } else { - CBookmarksDialog dlg(this, controls->site_bookmarks->path, pServer); - + CBookmarksDialog dlg(this, sitePath, old_site.server_ ? &old_site.server_ : 0); res = dlg.Run(); } if (res == wxID_OK) { - controls->site_bookmarks->bookmarks.clear(); - CSiteManager::GetBookmarks(controls->site_bookmarks->path, controls->site_bookmarks->bookmarks); - if (m_pMenuBar) - m_pMenuBar->UpdateBookmarkMenu(); + if (!sitePath.empty()) { + std::unique_ptr site = CSiteManager::GetSiteByPath(sitePath, false).first; + if (site) { + for (int i = 0; i < m_pContextControl->GetTabCount(); ++i) { + CContextControl::_context_controls *tab_controls = m_pContextControl->GetControlsFromTabIndex(i); + if (tab_controls) { + tab_controls->pState->UpdateSite(old_site.m_path, *site); + } + } + } + } } } else if (event.GetId() == XRCID("ID_MENU_HELP_WELCOME")) { @@ -837,8 +896,9 @@ COptions::Get()->SetOption(OPTION_COMPARISONMODE, old_mode ? 0 : 1); CComparisonManager* pComparisonManager = pState->GetComparisonManager(); - if (pComparisonManager && pComparisonManager->IsComparing()) + if (pComparisonManager && pComparisonManager->IsComparing()) { pComparisonManager->CompareListings(); + } } else if (HandleKeyboardCommand(event, *this)) { return; @@ -859,42 +919,54 @@ return; } - std::unique_ptr pData = CSiteManager::GetSiteById(event.GetId()); + std::unique_ptr pData = CSiteManager::GetSiteById(event.GetId()); if (!pData) { event.Skip(); } else { - ConnectToSite(*pData); + ConnectToSite(*pData, pData->m_default_bookmark); } } } -void CMainFrame::OnEngineEvent(wxFzEvent &event) +void CMainFrame::OnEngineEvent(CFileZillaEngine* engine) +{ + CallAfter(&CMainFrame::DoOnEngineEvent, engine); +} + +void CMainFrame::DoOnEngineEvent(CFileZillaEngine* engine) { const std::vector *pStates = CContextManager::Get()->GetAllStates(); CState* pState = 0; for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) { - if ((*iter)->m_pEngine != event.engine_) + if ((*iter)->m_pEngine != engine) { continue; + } pState = *iter; break; } - if (!pState) + if (!pState) { return; + } std::unique_ptr pNotification = pState->m_pEngine->GetNextNotification(); while (pNotification) { switch (pNotification->GetID()) { case nId_logmsg: - m_pStatusView->AddToLog(static_cast(*pNotification.get())); - if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) == 2) + if (m_pStatusView) { + m_pStatusView->AddToLog(static_cast(*pNotification.get())); + } + if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) == 2 && m_pQueuePane) { m_pQueuePane->Highlight(3); + } break; case nId_operation: - pState->m_pCommandQueue->Finish(unique_static_cast(std::move(pNotification))); + if (pState->m_pCommandQueue) { + pState->m_pCommandQueue->Finish(unique_static_cast(std::move(pNotification))); + } if (m_bQuit) { Close(); return; @@ -903,18 +975,26 @@ case nId_listing: { auto const& listingNotification = static_cast(*pNotification.get()); - pState->m_pCommandQueue->ProcessDirectoryListing(listingNotification); + if (pState->m_pCommandQueue) { + pState->m_pCommandQueue->ProcessDirectoryListing(listingNotification); + } } break; case nId_asyncrequest: { auto pAsyncRequest = unique_static_cast(std::move(pNotification)); - if (pAsyncRequest->GetRequestID() == reqId_fileexists) - m_pQueueView->ProcessNotification(pState->m_pEngine, std::move(pAsyncRequest)); + if (pAsyncRequest->GetRequestID() == reqId_fileexists) { + if (m_pQueueView) { + m_pQueueView->ProcessNotification(pState->m_pEngine, std::move(pAsyncRequest)); + } + } else { - if (pAsyncRequest->GetRequestID() == reqId_certificate) + if (pAsyncRequest->GetRequestID() == reqId_certificate) { pState->SetSecurityInfo(static_cast(*pAsyncRequest)); - m_pAsyncRequestQueue->AddRequest(pState->m_pEngine, std::move(pAsyncRequest)); + } + if (m_pAsyncRequestQueue) { + m_pAsyncRequestQueue->AddRequest(pState->m_pEngine, std::move(pAsyncRequest)); + } } } break; @@ -925,7 +1005,9 @@ } break; case nId_transferstatus: - m_pQueueView->ProcessNotification(pState->m_pEngine, std::move(pNotification)); + if (m_pQueueView) { + m_pQueueView->ProcessNotification(pState->m_pEngine, std::move(pNotification)); + } break; case nId_sftp_encryption: { @@ -954,8 +1036,9 @@ wxFileOffset uploadSpeed = m_pQueueView ? m_pQueueView->GetCurrentUploadSpeed() : 0; CSizeFormat::_format format = static_cast(COptions::Get()->GetOptionVal(OPTION_SIZE_FORMAT)); - if (format == CSizeFormat::bytes) + if (format == CSizeFormat::bytes) { format = CSizeFormat::iec; + } const wxString downloadSpeedStr = CSizeFormat::Format(downloadSpeed, true, format, COptions::Get()->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0, @@ -971,12 +1054,12 @@ bool CMainFrame::CreateMainToolBar() { - wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CreateMainToolBar")); - if (m_pToolBar) - { + wxGetApp().AddStartupProfileRecord("CMainFrame::CreateMainToolBar"); + if (m_pToolBar) { #ifdef __WXMAC__ - if (m_pToolBar) + if (m_pToolBar) { COptions::Get()->SetOption(OPTION_TOOLBAR_HIDDEN, m_pToolBar->IsShown() ? 0 : 1); + } #endif SetToolBar(0); delete m_pToolBar; @@ -984,20 +1067,28 @@ } #ifndef __WXMAC__ - if (COptions::Get()->GetOptionVal(OPTION_TOOLBAR_HIDDEN) != 0) + if (COptions::Get()->GetOptionVal(OPTION_TOOLBAR_HIDDEN) != 0) { return true; + } #endif m_pToolBar = CToolBar::Load(this); - if (!m_pToolBar) - { + if (!m_pToolBar) { wxLogError(_("Cannot load toolbar from resource file")); return false; } SetToolBar(m_pToolBar); - if (m_pQuickconnectBar) +#ifdef __WXMAC__ + if (COptions::Get()->GetOptionVal(OPTION_TOOLBAR_HIDDEN) != 0) { + m_pToolBar->Show(false); + } +#endif + + + if (m_pQuickconnectBar) { m_pQuickconnectBar->Refresh(); + } return true; } @@ -1020,10 +1111,9 @@ if (!pState || pState->m_pCommandQueue->Idle()) return; - if (wxMessageBoxEx(_("Really cancel current operation?"), _T("FileZilla"), wxYES_NO | wxICON_QUESTION) == wxYES) - { + if (wxMessageBoxEx(_("Really cancel current operation?"), _T("FileZilla"), wxYES_NO | wxICON_QUESTION) == wxYES) { pState->m_pCommandQueue->Cancel(); - pState->GetRecursiveOperationHandler()->StopRecursiveOperation(); + pState->GetRemoteRecursiveOperation()->StopRecursiveOperation(); } } @@ -1050,8 +1140,7 @@ bool CMainFrame::CloseDialogsAndQuit(wxCloseEvent &event) { #ifndef __WXMAC__ - if (m_taskBarIcon) - { + if (m_taskBarIcon) { delete m_taskBarIcon; m_taskBarIcon = 0; m_closeEvent = event.GetEventType(); @@ -1066,24 +1155,31 @@ int size = wxTopLevelWindows.size(); static wxTopLevelWindow* pLast = 0; - if (wxTopLevelWindows.size()) - { + if (wxTopLevelWindows.size()) { wxWindowList::reverse_iterator iter = wxTopLevelWindows.rbegin(); wxTopLevelWindow* pTop = (wxTopLevelWindow*)(*iter); - while (pTop != this && (size != prev_size || pLast != pTop)) - { - wxDialog* pDialog = wxDynamicCast(pTop, wxDialog); - if (pDialog) + while (pTop != this && (size != prev_size || pLast != pTop)) { + if (!pTop) { + ++iter; + if (iter == wxTopLevelWindows.rend()) { + break; + } + pTop = (wxTopLevelWindow*)(*iter); + continue; + } + + wxDialog* pDialog = dynamic_cast(pTop); + if (pDialog) { pDialog->EndModal(wxID_CANCEL); - else - { + } + else { wxWindow* pParent = pTop->GetParent(); - if (m_pQueuePane && pParent == m_pQueuePane) - { + if (m_pQueuePane && pParent == m_pQueuePane) { // It's the AUI frame manager hint window. Ignore it ++iter; - if (iter == wxTopLevelWindows.rend()) + if (iter == wxTopLevelWindows.rend()) { break; + } pTop = (wxTopLevelWindow*)(*iter); continue; } @@ -1105,8 +1201,7 @@ // wxMessageBoxEx does not use wxTopLevelWindow, close it too bool dialog = false; EnumThreadWindows(GetCurrentThreadId(), FzEnumThreadWndProc, (LPARAM)&dialog); - if (dialog) - { + if (dialog) { m_closeEvent = event.GetEventType(); m_closeEventTimer.Start(1, true); @@ -1180,19 +1275,22 @@ RememberSplitterPositions(); #ifdef __WXMAC__ - if (m_pToolBar) + if (m_pToolBar) { COptions::Get()->SetOption(OPTION_TOOLBAR_HIDDEN, m_pToolBar->IsShown() ? 0 : 1); + } #endif m_bQuit = true; } Show(false); - if (!CloseDialogsAndQuit(event)) + if (!CloseDialogsAndQuit(event)) { return; + } // Getting deleted by wxWidgets - for (int i = 0; i < 2; i++) + for (int i = 0; i < 2; ++i) { m_pActivityLed[i] = 0; + } m_pStatusBar = 0; m_pMenuBar = 0; m_pToolBar = 0; @@ -1202,7 +1300,7 @@ m_pStateEventHandler = 0; if (m_pQueueView && !m_pQueueView->Quit()) { - if( event.CanVeto() ) { + if (event.CanVeto()) { event.Veto(); } return; @@ -1217,18 +1315,22 @@ bool res = true; const std::vector *pStates = CContextManager::Get()->GetAllStates(); for (CState* pState : *pStates) { - if( pState->GetRecursiveOperationHandler() ) { - pState->GetRecursiveOperationHandler()->StopRecursiveOperation(); + if (pState->GetLocalRecursiveOperation()) { + pState->GetLocalRecursiveOperation()->StopRecursiveOperation(); + } + if (pState->GetRemoteRecursiveOperation()) { + pState->GetRemoteRecursiveOperation()->StopRecursiveOperation(); } if (pState->m_pCommandQueue) { - if (!pState->m_pCommandQueue->Quit()) + if (!pState->m_pCommandQueue->Quit()) { res = false; + } } } if (!res) { - if( event.CanVeto() ) { + if (event.CanVeto()) { event.Veto(); } return; @@ -1236,9 +1338,10 @@ CContextControl::_context_controls* controls = m_pContextControl ? m_pContextControl->GetCurrentControls() : 0; if (controls) { - COptions::Get()->SetLastServer(controls->pState->GetLastServer()); + Site site = controls->pState->GetLastSite(); + COptions::Get()->SetLastServer(site.server_); COptions::Get()->SetOption(OPTION_LASTSERVERPATH, controls->pState->GetLastServerPath().GetSafePath()); - COptions::Get()->SetOption(OPTION_LAST_CONNECTED_SITE, controls->site_bookmarks ? controls->site_bookmarks->path : wxString()); + COptions::Get()->SetOption(OPTION_LAST_CONNECTED_SITE, site.m_path); } for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) { @@ -1262,21 +1365,19 @@ void CMainFrame::OnReconnect(wxCommandEvent &) { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return; + } - if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) + if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) { return; - - CServer server = pState->GetLastServer(); - - if (server.GetLogonType() == ASK) { - if (!CLoginManager::Get().GetPassword(server, false)) - return; } + Site site = pState->GetLastSite(); CServerPath path = pState->GetLastServerPath(); - ConnectToServer(server, path, true); + Bookmark bm; + bm.m_remoteDir = path; + ConnectToSite(site, bm); } void CMainFrame::OnRefresh(wxCommandEvent &) @@ -1291,8 +1392,7 @@ void CMainFrame::OnTimer(wxTimerEvent& event) { - if (event.GetId() == m_closeEventTimer.GetId()) - { + if (event.GetId() == m_closeEventTimer.GetId()) { if (m_closeEvent == 0) return; @@ -1309,82 +1409,76 @@ #endif } -void CMainFrame::OpenSiteManager(const CServer* pServer /*=0*/) +void CMainFrame::OpenSiteManager(ServerWithCredentials const* pServer) { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return; + } CSiteManagerDialog dlg; - std::set handled_paths; + std::set handled_paths; std::vector connected_sites; - if (pServer) - { + if (pServer) { CSiteManagerDialog::_connected_site connected_site; connected_site.server = *pServer; connected_sites.push_back(connected_site); } - for (int i = 0; i < m_pContextControl->GetTabCount(); i++) - { + for (int i = 0; i < m_pContextControl->GetTabCount(); ++i) { CContextControl::_context_controls *controls = m_pContextControl->GetControlsFromTabIndex(i); - if (!controls) + if (!controls) { continue; + } - const wxString& path = controls->site_bookmarks->path; - if (path.empty()) + Site const& site = controls->pState->GetSite(); + std::wstring const& path = site.m_path; + if (path.empty()) { continue; - if (handled_paths.find(path) != handled_paths.end()) + } + if (handled_paths.find(path) != handled_paths.end()) { continue; + } CSiteManagerDialog::_connected_site connected_site; connected_site.old_path = path; - connected_site.server = controls->pState->GetLastServer(); + connected_site.server = site.server_; connected_sites.push_back(connected_site); handled_paths.insert(path); } - if (!dlg.Create(this, &connected_sites, pServer)) + if (!dlg.Create(this, &connected_sites, pServer)) { return; + } int res = dlg.ShowModal(); - if (res == wxID_YES || res == wxID_OK) - { + if (res == wxID_YES || res == wxID_OK) { // Update bookmark paths - for (size_t j = 0; j < connected_sites.size(); j++) - { - for (int i = 0; i < m_pContextControl->GetTabCount(); i++) - { - CContextControl::_context_controls *controls = m_pContextControl->GetControlsFromTabIndex(i); - if (!controls) - continue; - - if (connected_sites[j].old_path != controls->site_bookmarks->path) - continue; - - controls->site_bookmarks->path = connected_sites[j].new_path; - - controls->site_bookmarks->bookmarks.clear(); - CSiteManager::GetBookmarks(controls->site_bookmarks->path, controls->site_bookmarks->bookmarks); - - break; + for (auto const& connected_site : connected_sites) { + std::unique_ptr site = CSiteManager::GetSiteByPath(connected_site.new_path, false).first; + if (site) { + for (int i = 0; i < m_pContextControl->GetTabCount(); ++i) { + CContextControl::_context_controls *controls = m_pContextControl->GetControlsFromTabIndex(i); + if (!controls) { + continue; + } + controls->pState->UpdateSite(connected_site.old_path, *site); + } } } } - if (res == wxID_YES) - { - CSiteManagerItemData_Site data; - if (!dlg.GetServer(data)) + if (res == wxID_YES) { + Site data; + Bookmark bookmark; + if (!dlg.GetServer(data, bookmark)) { return; + } - ConnectToSite(data); + ConnectToSite(data, bookmark); } - - if (m_pMenuBar) - m_pMenuBar->UpdateBookmarkMenu(); } void CMainFrame::OnSiteManager(wxCommandEvent& e) @@ -1404,21 +1498,24 @@ void CMainFrame::UpdateActivityLed(int direction) { - if (m_pActivityLed[direction]) + if (m_pActivityLed[direction]) { m_pActivityLed[direction]->Ping(); + } } void CMainFrame::OnProcessQueue(wxCommandEvent& event) { - if (m_pQueueView) + if (m_pQueueView) { m_pQueueView->SetActive(event.IsChecked()); + } } void CMainFrame::OnMenuEditSettings(wxCommandEvent&) { CSettingsDialog dlg(m_engineContext); - if (!dlg.Create(this)) + if (!dlg.Create(this)) { return; + } COptions* pOptions = COptions::Get(); @@ -1447,8 +1544,9 @@ void CMainFrame::OnToggleLogView(wxCommandEvent&) { - if (!m_pTopSplitter) + if (!m_pTopSplitter) { return; + } bool shown; @@ -1659,12 +1757,12 @@ wxString const name = wxString::Format(_("&Version %s"), v.version_); wxMenuItem* pItem = m_pMenuBar->FindItem(GetAvailableUpdateMenuId()); - if( !pItem ) { + if (!pItem) { wxMenu* pMenu = new wxMenu(); pMenu->Append(GetAvailableUpdateMenuId(), name); m_pMenuBar->Append(pMenu, _("&New version available!")); - if( !update_dialog_timer_.IsRunning() ) { + if (!update_dialog_timer_.IsRunning()) { update_dialog_timer_.Start(1, true); } } @@ -1676,12 +1774,16 @@ void CMainFrame::TriggerUpdateDialog() { - if( CUpdateDialog::IsRunning() ) { + if (m_bQuit) { return; } - if( !wxDialogEx::CanShowPopupDialog() ) { - update_dialog_timer_.Start( 1000, true ); + if (CUpdateDialog::IsRunning()) { + return; + } + + if (!wxDialogEx::CanShowPopupDialog()) { + update_dialog_timer_.Start(1000, true); return; } @@ -1758,7 +1860,7 @@ // Now the other panes for (int i = 0; i < m_pContextControl->GetTabCount(); i++) { - struct CContextControl::_context_controls *controls = m_pContextControl->GetControlsFromTabIndex(i); + CContextControl::_context_controls *controls = m_pContextControl->GetControlsFromTabIndex(i); if (!controls) continue; @@ -1883,40 +1985,76 @@ } } -bool CMainFrame::ConnectToSite(CSiteManagerItemData_Site & data, bool newTab) +bool CMainFrame::ConnectToSite(Site & data, Bookmark const& bookmark) { - if (data.m_server.GetLogonType() == ASK || - (data.m_server.GetLogonType() == INTERACTIVE && data.m_server.GetUser().empty())) - { - if (!CLoginManager::Get().GetPassword(data.m_server, false, data.m_server.GetName())) - return false; + // First check if we need to ask user for a password + if (!CLoginManager::Get().GetPassword(data.server_, false, data.server_.server.GetName())) { + return false; } - if (newTab) - m_pContextControl->CreateTab(); - - if (!ConnectToServer(data.m_server, data.m_remoteDir)) + // Check if current state is already connected and if needed ask whether to open in new tab + CState* pState = CContextManager::Get()->GetCurrentContext(); + if (!pState) { return false; + } - CState *pState = CContextManager::Get()->GetCurrentContext(); - if (pState) { - if (!data.m_localDir.empty()) { - bool set = pState->SetLocalDir(data.m_localDir, 0, false); + if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) { + int action = COptions::Get()->GetOptionVal(OPTION_ALREADYCONNECTED_CHOICE); + if (action < 2) { + wxDialogEx dlg; + if (!dlg.Load(this, _T("ID_ALREADYCONNECTED"))) { + return false; + } + + if (action != 0) { + XRCCTRL(dlg, "ID_OLDTAB", wxRadioButton)->SetValue(true); + } + else { + XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->SetValue(true); + } - if (set && data.m_sync) { - wxASSERT(!data.m_remoteDir.empty()); - pState->SetSyncBrowse(true, data.m_remoteDir); + if (dlg.ShowModal() != wxID_OK) { + return false; } + + if (XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->GetValue()) { + action = 0; + } + else { + action = 1; + } + + if (XRCCTRL(dlg, "ID_REMEMBER", wxCheckBox)->IsChecked()) { + action |= 2; + } + COptions::Get()->SetOption(OPTION_ALREADYCONNECTED_CHOICE, action); + } + + if (!(action & 1)) { + m_pContextControl->CreateTab(); + pState = CContextManager::Get()->GetCurrentContext(); } + } + + // Next tell the state to connect + if (!pState->Connect(data, bookmark.m_remoteDir, bookmark.m_comparison)) { + return false; + } + + // Apply comparison and sync browsing options + // FIXME: Move to state? + if (!bookmark.m_localDir.empty()) { + bool set = pState->SetLocalDir(bookmark.m_localDir.ToStdWstring(), 0, false); - if (data.m_comparison && pState->GetComparisonManager()) { - pState->GetComparisonManager()->CompareListings(); + if (set && bookmark.m_sync) { + wxASSERT(!bookmark.m_remoteDir.empty()); + pState->SetSyncBrowse(true, bookmark.m_remoteDir); } } - SetBookmarksFromPath(data.m_path); - if (m_pMenuBar) - m_pMenuBar->UpdateBookmarkMenu(); + if (bookmark.m_comparison && pState->GetComparisonManager()) { + pState->GetComparisonManager()->CompareListings(); + } return true; } @@ -1928,7 +2066,9 @@ CAutoAsciiFiles::SettingsChanged(); #if FZ_MANUALUPDATECHECK - m_pUpdater->Init(); + if (m_pUpdater) { + m_pUpdater->Init(); + } #endif } @@ -2048,7 +2188,7 @@ // m_lastQueueLogSplitterPos is a value between 0 and 1 posString += wxString::Format(_T("%d"), (int)(m_pQueueLogSplitter->GetRelativeSashPosition() * 1000000000)); - COptions::Get()->SetOption(OPTION_MAINWINDOW_SPLITTER_POSITION, posString); + COptions::Get()->SetOption(OPTION_MAINWINDOW_SPLITTER_POSITION, posString.ToStdWstring()); } bool CMainFrame::RestoreSplitterPositions() @@ -2145,20 +2285,36 @@ void CMainFrame::OnToolbarComparison(wxCommandEvent&) { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return; + } CComparisonManager* pComparisonManager = pState->GetComparisonManager(); - if (pComparisonManager->IsComparing()) - { + if (pComparisonManager->IsComparing()) { pComparisonManager->ExitComparisonMode(); return; } if (!COptions::Get()->GetOptionVal(OPTION_FILEPANE_LAYOUT)) { CContextControl::_context_controls* controls = m_pContextControl->GetCurrentControls(); - if (!controls) + if (!controls) { return; + } + + if (controls->pLocalListSearchPanel->IsShown() || controls->pRemoteListSearchPanel->IsShown()) { + CConditionalDialog dlg(this, CConditionalDialog::quick_search, CConditionalDialog::yesno); + dlg.SetTitle(_("Directory comparison")); + dlg.AddText(_("To compare directories quick search must be closed.")); + dlg.AddText(_("Close quick search and continue comparing?")); + if (!dlg.Run()) + return; + + if (controls->pLocalListSearchPanel->IsShown()) + controls->pLocalListSearchPanel->Close(); + + if (controls->pRemoteListSearchPanel->IsShown()) + controls->pRemoteListSearchPanel->Close(); + } if ((controls->pLocalSplitter->IsSplit() && !controls->pRemoteSplitter->IsSplit()) || (!controls->pLocalSplitter->IsSplit() && controls->pRemoteSplitter->IsSplit())) @@ -2239,44 +2395,47 @@ void CMainFrame::OnDropdownComparisonMode(wxCommandEvent& event) { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return; + } int old_mode = COptions::Get()->GetOptionVal(OPTION_COMPARISONMODE); int new_mode = (event.GetId() == XRCID("ID_COMPARE_SIZE")) ? 0 : 1; COptions::Get()->SetOption(OPTION_COMPARISONMODE, new_mode); CComparisonManager* pComparisonManager = pState->GetComparisonManager(); - if (old_mode != new_mode && pComparisonManager && pComparisonManager->IsComparing()) + if (old_mode != new_mode && pComparisonManager && pComparisonManager->IsComparing()) { pComparisonManager->CompareListings(); + } } void CMainFrame::OnDropdownComparisonHide(wxCommandEvent&) { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return; + } bool old_mode = COptions::Get()->GetOptionVal(OPTION_COMPARE_HIDEIDENTICAL) != 0; COptions::Get()->SetOption(OPTION_COMPARE_HIDEIDENTICAL, old_mode ? 0 : 1); CComparisonManager* pComparisonManager = pState->GetComparisonManager(); - if (pComparisonManager && pComparisonManager->IsComparing()) + if (pComparisonManager && pComparisonManager->IsComparing()) { pComparisonManager->CompareListings(); + } } void CMainFrame::ProcessCommandLine() { const CCommandLine* pCommandLine = wxGetApp().GetCommandLine(); - if (!pCommandLine) + if (!pCommandLine) { return; + } - wxString local; - if ((local = pCommandLine->GetOption(CCommandLine::local)) != _T("")) - { + std::wstring local; + if ((local = pCommandLine->GetOption(CCommandLine::local)) != _T("")) { - if (!wxDir::Exists(local)) - { + if (!wxDir::Exists(local)) { wxString str = _("Path not found:"); str += _T("\n") + local; wxMessageBoxEx(str, _("Syntax error in command line")); @@ -2284,13 +2443,14 @@ } CState *pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return; + } pState->SetLocalDir(local); } - wxString site; + std::wstring site; if (pCommandLine->HasSwitch(CCommandLine::sitemanager)) { if (COptions::Get()->GetOptionVal(OPTION_INTERFACE_SITEMANAGER_ON_STARTUP) == 0) { Show(); @@ -2298,48 +2458,47 @@ } } else if ((site = pCommandLine->GetOption(CCommandLine::site)) != _T("")) { - std::unique_ptr pData = CSiteManager::GetSiteByPath(site); + auto const data = CSiteManager::GetSiteByPath(site); - if (pData) { - ConnectToSite(*pData); + if (data.first) { + ConnectToSite(*data.first, data.second); } } - wxString param = pCommandLine->GetParameter(); + std::wstring param = pCommandLine->GetParameter().ToStdWstring(); if (!param.empty()) { - wxString error; + std::wstring error; - CServer server; + ServerWithCredentials server; wxString logontype = pCommandLine->GetOption(CCommandLine::logontype); - if (logontype == _T("ask")) - server.SetLogonType(ASK); - else if (logontype == _T("interactive")) - server.SetLogonType(INTERACTIVE); + if (logontype == _T("ask")) { + server.SetLogonType(LogonType::ask); + } + else if (logontype == _T("interactive")) { + server.SetLogonType(LogonType::interactive); + } CServerPath path; - if (!server.ParseUrl(param, 0, _T(""), _T(""), error, path)) { + if (!server.ParseUrl(param, 0, std::wstring(), std::wstring(), error, path)) { wxString str = _("Parameter not a valid URL"); str += _T("\n") + error; wxMessageBoxEx(error, _("Syntax error in command line")); } - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) && server.GetLogonType() == NORMAL) { - server.SetLogonType(ASK); + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) && server.credentials.logonType_ == LogonType::normal) { + server.SetLogonType(LogonType::ask); CLoginManager::Get().RememberPassword(server); } - else if (server.GetLogonType() == ASK || - (server.GetLogonType() == INTERACTIVE && server.GetUser().empty())) - { - if (!CLoginManager::Get().GetPassword(server, false)) - return; - } - - CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + else if (!CLoginManager::Get().GetPassword(server, false)) { return; + } - ConnectToServer(server, path); + Site site; + site.server_ = server; + Bookmark bm; + bm.m_remoteDir = path; + ConnectToSite(site, bm); } } @@ -2349,8 +2508,9 @@ CFilterManager::ToggleFilters(); - if (active == CFilterManager::HasActiveFilters()) + if (active == CFilterManager::HasActiveFilters()) { return; + } CContextManager::Get()->NotifyAllHandlers(STATECHANGE_APPLYFILTER); } @@ -2486,17 +2646,14 @@ void CMainFrame::OnSearch(wxCommandEvent&) { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) - return; - - if (!pState->IsRemoteConnected() || !pState->IsRemoteIdle()) { - wxBell(); + if (!pState) { return; } - CSearchDialog dlg(this, pState, m_pQueueView); - if (!dlg.Load()) + CSearchDialog dlg(this, *pState, m_pQueueView); + if (!dlg.Load()) { return; + } dlg.Run(); } @@ -2510,15 +2667,18 @@ #if FZ_MANUALUPDATECHECK // Need to do this after welcome screen to avoid simultaneous display of multiple dialogs - if( !m_pUpdater ) { + if (!m_pUpdater) { update_dialog_timer_.SetOwner(this); - m_pUpdater = new CUpdater(*this, m_engineContext); + m_pUpdater = new CUpdater(*this, m_engineContext, + [this](CActiveNotification const& notification) { + UpdateActivityLed(notification.GetDirection()); + } + ); m_pUpdater->Init(); } #endif - if (COptions::Get()->GetOptionVal(OPTION_INTERFACE_SITEMANAGER_ON_STARTUP) != 0) - { + if (COptions::Get()->GetOptionVal(OPTION_INTERFACE_SITEMANAGER_ON_STARTUP) != 0) { Show(); OpenSiteManager(); } @@ -2526,106 +2686,32 @@ void CMainFrame::OnMenuNewTab(wxCommandEvent&) { - if (m_pContextControl) + if (m_pContextControl) { m_pContextControl->CreateTab(); + } } void CMainFrame::OnMenuCloseTab(wxCommandEvent&) { - if (!m_pContextControl) - return; - - m_pContextControl->CloseTab(m_pContextControl->GetCurrentTab()); -} - -void CMainFrame::SetBookmarksFromPath(const wxString& path) -{ - if (!m_pContextControl) + if (!m_pContextControl) { return; - - std::shared_ptr site_bookmarks; - for (int i = 0; i < m_pContextControl->GetTabCount(); i++) { - if (i == m_pContextControl->GetCurrentTab()) - continue; - - CContextControl::_context_controls *controls = m_pContextControl->GetControlsFromTabIndex(i); - if (!controls || !controls->site_bookmarks || controls->site_bookmarks->path != path) - continue; - - site_bookmarks = controls->site_bookmarks; - site_bookmarks->bookmarks.clear(); - } - if (!site_bookmarks) { - site_bookmarks = std::make_shared(); - site_bookmarks->path = path; - } - - CContextControl::_context_controls *controls = m_pContextControl->GetCurrentControls(); - if (controls) { - controls->site_bookmarks = site_bookmarks; - CSiteManager::GetBookmarks(controls->site_bookmarks->path, controls->site_bookmarks->bookmarks); - } -} - -bool CMainFrame::ConnectToServer(const CServer &server, const CServerPath &path /*=CServerPath()*/, bool isReconnect /*=true*/) -{ - CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) - return false; - - if (pState->IsRemoteConnected() || !pState->IsRemoteIdle()) { - int action = COptions::Get()->GetOptionVal(OPTION_ALREADYCONNECTED_CHOICE); - if( action < 2 ) { - wxDialogEx dlg; - if (!dlg.Load(this, _T("ID_ALREADYCONNECTED"))) - return false; - - if (action != 0) - XRCCTRL(dlg, "ID_OLDTAB", wxRadioButton)->SetValue(true); - else - XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->SetValue(true); - - if (dlg.ShowModal() != wxID_OK) - return false; - - if (XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->GetValue()) { - action = 0; - } - else { - action = 1; - } - - if( XRCCTRL(dlg, "ID_REMEMBER", wxCheckBox)->IsChecked() ) { - action |= 2; - } - COptions::Get()->SetOption(OPTION_ALREADYCONNECTED_CHOICE, action); - } - - if( !(action & 1) ) { - m_pContextControl->CreateTab(); - pState = CContextManager::Get()->GetCurrentContext(); - } } - CContextControl::_context_controls* controls = m_pContextControl->GetControlsFromState(pState); - if (!isReconnect && controls) { - controls->site_bookmarks.reset(); - m_pMenuBar->ClearBookmarks(); - } - - return pState->Connect(server, path); + m_pContextControl->CloseTab(m_pContextControl->GetCurrentTab()); } void CMainFrame::OnToggleToolBar(wxCommandEvent& event) { COptions::Get()->SetOption(OPTION_TOOLBAR_HIDDEN, event.IsChecked() ? 0 : 1); #ifdef __WXMAC__ - if (m_pToolBar) - m_pToolBar->Show( event.IsChecked() ); + if (m_pToolBar) { + m_pToolBar->Show(event.IsChecked()); + } #else CreateMainToolBar(); - if (m_pToolBar) + if (m_pToolBar) { m_pToolBar->UpdateToolbarState(); + } HandleResize(); #endif } @@ -2650,6 +2736,7 @@ for (int i = 0; i < 10; i++) { tab_hotkey_ids[i] = wxNewId(); entries.emplace_back(wxACCEL_CMD, (int)'0' + i, tab_hotkey_ids[i]); + entries.emplace_back(wxACCEL_ALT, (int)'0' + i, tab_hotkey_ids[i]); } entries.emplace_back(wxACCEL_CMD | wxACCEL_SHIFT, 'O', m_comparisonToggleAcceleratorId); entries.emplace_back(wxACCEL_CMD | wxACCEL_SHIFT, 'I', XRCID("ID_MENU_VIEW_FILTERS")); @@ -2664,6 +2751,14 @@ for (auto const& command : keyboardCommands) { entries.emplace_back(wxACCEL_CMD, command.second.second, command.first); } + + // Ctrl+(Shift+)Tab to switch between tabs + int id = wxNewId(); + entries.emplace_back(wxACCEL_RAW_CTRL, '\t', id); + Bind(wxEVT_MENU, [this](wxEvent&) { if (m_pContextControl) { m_pContextControl->AdvanceTab(true); } }, id); + id = wxNewId(); + entries.emplace_back(wxACCEL_RAW_CTRL | wxACCEL_SHIFT, '\t', id); + Bind(wxEVT_MENU, [this](wxEvent&) { if (m_pContextControl) { m_pContextControl->AdvanceTab(false); } }, id); #endif wxAcceleratorTable accel(entries.size(), &entries[0]); SetAcceleratorTable(accel); @@ -2675,8 +2770,7 @@ UpdateLayout(); } - bool const language_changed = options.test(OPTION_LANGUAGE); - if (options.test(OPTION_THEME) || options.test(OPTION_THEME_ICONSIZE) || language_changed) { + if (options.test(OPTION_ICONS_THEME) || options.test(OPTION_ICONS_SCALE)) { CreateMainToolBar(); if (m_pToolBar) { m_pToolBar->UpdateToolbarState(); diff -Nru filezilla-3.15.0.2/src/interface/Mainfrm.h filezilla-3.33.0/src/interface/Mainfrm.h --- filezilla-3.15.0.2/src/interface/Mainfrm.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/Mainfrm.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,8 +1,10 @@ -#ifndef __MAINFRM_H__ -#define __MAINFRM_H__ +#ifndef FILEZILLA_INTERFACE_MAINFRM_HEADER +#define FILEZILLA_INTERFACE_MAINFRM_HEADER #include "statusbar.h" #include "engine_context.h" +#include "notification.h" +#include "serverdata.h" #include @@ -22,7 +24,7 @@ class CQueue; class CQueueView; class CQuickconnectBar; -class CSiteManagerItemData_Site; +class Site; class CSplitterWindowEx; class CStatusView; class CState; @@ -30,7 +32,7 @@ class CToolBar; class CWindowStateManager; -class CMainFrame final : public wxNavigationEnabled, private COptionChangeEventHandler +class CMainFrame final : public wxNavigationEnabled, private COptionChangeEventHandler, public EngineNotificationHandler #if FZ_MANUALUPDATECHECK , protected CUpdateHandler #endif @@ -61,11 +63,9 @@ void PostInitialize(); - bool ConnectToServer(const CServer& server, const CServerPath& path = CServerPath(), bool isReconnect = false); - CContextControl* GetContextControl() { return m_pContextControl; } - bool ConnectToSite(CSiteManagerItemData_Site & data, bool newTab = false); + bool ConnectToSite(Site & data, Bookmark const& bookmark); CFileZillaEngineContext& GetEngineContext() { return m_engineContext; } private: @@ -76,12 +76,10 @@ bool CreateMenus(); bool CreateQuickconnectBar(); bool CreateMainToolBar(); - void OpenSiteManager(const CServer* pServer = 0); + void OpenSiteManager(ServerWithCredentials const* pServer = 0); void FocusNextEnabled(std::list& windowOrder, std::list::iterator iter, bool skipFirst, bool forward); - void SetBookmarksFromPath(const wxString& path); - CStatusBar* m_pStatusBar{}; CMenuBar* m_pMenuBar{}; CToolBar* m_pToolBar{}; @@ -119,11 +117,13 @@ void OnOptionsChanged(changed_options_t const& options); + virtual void OnEngineEvent(CFileZillaEngine* engine); // Before thread jump + void DoOnEngineEvent(CFileZillaEngine* engine); // After thread jump + // Event handlers DECLARE_EVENT_TABLE() void OnSize(wxSizeEvent& event); void OnMenuHandler(wxCommandEvent& event); - void OnEngineEvent(wxFzEvent& event); void OnUpdateLedTooltip(wxCommandEvent&); void OnDisconnect(wxCommandEvent&); void OnCancel(wxCommandEvent&); diff -Nru filezilla-3.15.0.2/src/interface/Makefile.am filezilla-3.33.0/src/interface/Makefile.am --- filezilla-3.15.0.2/src/interface/Makefile.am 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/interface/Makefile.am 2017-10-25 17:12:23.000000000 +0000 @@ -30,6 +30,7 @@ dragdropmanager.cpp \ drop_target_ex.cpp \ edithandler.cpp \ + encoding_converter.cpp \ export.cpp \ fileexistsdlg.cpp \ filelistctrl.cpp \ @@ -40,12 +41,15 @@ filteredit.cpp \ file_utils.cpp \ fzputtygen_interface.cpp \ + graphics.cpp \ import.cpp \ inputdialog.cpp \ ipcmutex.cpp \ led.cpp \ listctrlex.cpp \ listingcomparison.cpp \ + list_search_panel.cpp \ + local_recursive_operation.cpp \ locale_initializer.cpp \ LocalListView.cpp \ LocalTreeView.cpp \ @@ -53,8 +57,10 @@ Mainfrm.cpp \ manual_transfer.cpp \ menu_bar.cpp \ + msgbox.cpp \ netconfwizard.cpp \ Options.cpp \ + password_crypto.cpp \ power_management.cpp \ queue.cpp \ queue_storage.cpp \ @@ -65,9 +71,11 @@ recentserverlist.cpp \ recursive_operation.cpp \ recursive_operation_status.cpp \ + remote_recursive_operation.cpp \ RemoteListView.cpp \ RemoteTreeView.cpp \ search.cpp \ + serverdata.cpp \ settings/optionspage.cpp \ settings/optionspage_connection.cpp \ settings/optionspage_connection_active.cpp \ @@ -117,9 +125,11 @@ welcome_dialog.cpp \ window_state_manager.cpp \ wrapengine.cpp \ + wxfilesystem_blob_handler.cpp \ xh_text_ex.cpp \ - xh_toolb_ex.cpp \ - xmlfunctions.cpp + xmlfunctions.cpp \ + xrc_helper.cpp + if USE_BINRELOC filezilla_SOURCES += prefix.cpp @@ -145,6 +155,7 @@ dragdropmanager.h \ drop_target_ex.h \ edithandler.h \ + encoding_converter.h \ export.h \ fileexistsdlg.h \ filelistctrl.h \ @@ -156,12 +167,15 @@ filteredit.h \ file_utils.h \ fzputtygen_interface.h \ + graphics.h \ import.h \ inputdialog.h \ ipcmutex.h \ led.h \ listctrlex.h \ listingcomparison.h \ + list_search_panel.h \ + local_recursive_operation.h \ locale_initializer.h \ LocalListView.h \ LocalTreeView.h \ @@ -169,8 +183,10 @@ Mainfrm.h \ manual_transfer.h \ menu_bar.h \ + msgbox.h \ netconfwizard.h \ Options.h \ + password_crypto.h \ power_management.h \ prefix.h \ queue.h \ @@ -182,9 +198,11 @@ recentserverlist.h \ recursive_operation.h \ recursive_operation_status.h \ + remote_recursive_operation.h \ RemoteListView.h \ RemoteTreeView.h \ search.h \ + serverdata.h \ settings/optionspage.h \ settings/optionspage_connection.h \ settings/optionspage_connection_active.h \ @@ -234,11 +252,21 @@ welcome_dialog.h \ window_state_manager.h \ wrapengine.h \ + wxfilesystem_blob_handler.h \ xh_text_ex.h \ - xh_toolb_ex.h \ xmlfunctions.h \ xrc_helper.h +if ENABLE_STORJ +filezilla_SOURCES += \ + overlay.cpp \ + storj_key_interface.cpp + +noinst_HEADERS += \ + overlay.h \ + storj_key_interface.h +endif + if USE_RESOURCEFILE RESOURCEFILE = resources/filezilla.o endif @@ -247,12 +275,14 @@ filezilla_CPPFLAGS = -I$(srcdir)/../include filezilla_CPPFLAGS += $(LIBFILEZILLA_CFLAGS) +filezilla_CPPFLAGS += $(NETTLE_CFLAGS) filezilla_CPPFLAGS += $(WX_CPPFLAGS) filezilla_CXXFLAGS = $(WX_CXXFLAGS_ONLY) filezilla_CFLAGS = $(WX_CFLAGS_ONLY) filezilla_LDFLAGS = ../engine/libengine.a $(LIBFILEZILLA_LIBS) filezilla_LDFLAGS += $(PUGIXML_LIBS) +filezilla_LDFLAGS += $(NETTLE_LIBS) $(HOGWEED_LIBS) filezilla_LDFLAGS += $(LIBGNUTLS_LIBS) if HAVE_DBUS @@ -288,6 +318,14 @@ if MACAPPBUNDLE noinst_DATA = $(top_builddir)/FileZilla.app/Contents/MacOS/filezilla$(EXEEXT) + +if USE_MAC_SANDBOX +filezilla_SOURCES += osx_sandbox_userdirs.cpp +noinst_HEADERS += osx_sandbox_userdirs.h +endif + +filezilla_SOURCES += file_utils_osx.m power_management_osx.m + endif $(top_builddir)/FileZilla.app/Contents/MacOS/filezilla$(EXEEXT): filezilla diff -Nru filezilla-3.15.0.2/src/interface/Makefile.in filezilla-3.33.0/src/interface/Makefile.in --- filezilla-3.15.0.2/src/interface/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,23 +92,34 @@ host_triplet = @host@ bin_PROGRAMS = filezilla$(EXEEXT) @USE_BINRELOC_TRUE@am__append_1 = prefix.cpp -@HAVE_DBUS_TRUE@am__append_2 = ../dbus/libfzdbus.a -@HAVE_DBUS_TRUE@am__append_3 = ../dbus/libfzdbus.a $(LIBDBUS_LIBS) -@MINGW_TRUE@am__append_4 = -lnormaliz -lole32 -luuid -lnetapi32 -lmpr -lpowrprof -lws2_32 -@MINGW_TRUE@am__append_5 = resources/filezilla.o -@HAVE_LIBPUGIXML_FALSE@am__append_6 = $(PUGIXML_LIBS) +@ENABLE_STORJ_TRUE@am__append_2 = \ +@ENABLE_STORJ_TRUE@ overlay.cpp \ +@ENABLE_STORJ_TRUE@ storj_key_interface.cpp + +@ENABLE_STORJ_TRUE@am__append_3 = \ +@ENABLE_STORJ_TRUE@ overlay.h \ +@ENABLE_STORJ_TRUE@ storj_key_interface.h + +@HAVE_DBUS_TRUE@am__append_4 = ../dbus/libfzdbus.a +@HAVE_DBUS_TRUE@am__append_5 = ../dbus/libfzdbus.a $(LIBDBUS_LIBS) +@MINGW_TRUE@am__append_6 = -lnormaliz -lole32 -luuid -lnetapi32 -lmpr -lpowrprof -lws2_32 +@MINGW_TRUE@am__append_7 = resources/filezilla.o +@HAVE_LIBPUGIXML_FALSE@am__append_8 = $(PUGIXML_LIBS) +@MACAPPBUNDLE_TRUE@@USE_MAC_SANDBOX_TRUE@am__append_9 = osx_sandbox_userdirs.cpp +@MACAPPBUNDLE_TRUE@@USE_MAC_SANDBOX_TRUE@am__append_10 = osx_sandbox_userdirs.h +@MACAPPBUNDLE_TRUE@am__append_11 = file_utils_osx.m power_management_osx.m subdir = src/interface -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(dist_noinst_DATA) \ - $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -110,6 +131,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(am__noinst_HEADERS_DIST) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -123,20 +146,23 @@ conditionaldialog.cpp context_control.cpp \ customheightlistctrl.cpp defaultfileexistsdlg.cpp dialogex.cpp \ dndobjects.cpp dragdropmanager.cpp drop_target_ex.cpp \ - edithandler.cpp export.cpp fileexistsdlg.cpp filelistctrl.cpp \ - filelist_statusbar.cpp FileZilla.cpp filter.cpp \ - filter_conditions_dialog.cpp filteredit.cpp file_utils.cpp \ - fzputtygen_interface.cpp import.cpp inputdialog.cpp \ - ipcmutex.cpp led.cpp listctrlex.cpp listingcomparison.cpp \ - locale_initializer.cpp LocalListView.cpp LocalTreeView.cpp \ - loginmanager.cpp Mainfrm.cpp manual_transfer.cpp menu_bar.cpp \ - netconfwizard.cpp Options.cpp power_management.cpp queue.cpp \ - queue_storage.cpp QueueView.cpp queueview_failed.cpp \ - queueview_successful.cpp quickconnectbar.cpp \ - recentserverlist.cpp recursive_operation.cpp \ - recursive_operation_status.cpp RemoteListView.cpp \ - RemoteTreeView.cpp search.cpp settings/optionspage.cpp \ - settings/optionspage_connection.cpp \ + edithandler.cpp encoding_converter.cpp export.cpp \ + fileexistsdlg.cpp filelistctrl.cpp filelist_statusbar.cpp \ + FileZilla.cpp filter.cpp filter_conditions_dialog.cpp \ + filteredit.cpp file_utils.cpp fzputtygen_interface.cpp \ + graphics.cpp import.cpp inputdialog.cpp ipcmutex.cpp led.cpp \ + listctrlex.cpp listingcomparison.cpp list_search_panel.cpp \ + local_recursive_operation.cpp locale_initializer.cpp \ + LocalListView.cpp LocalTreeView.cpp loginmanager.cpp \ + Mainfrm.cpp manual_transfer.cpp menu_bar.cpp msgbox.cpp \ + netconfwizard.cpp Options.cpp password_crypto.cpp \ + power_management.cpp queue.cpp queue_storage.cpp QueueView.cpp \ + queueview_failed.cpp queueview_successful.cpp \ + quickconnectbar.cpp recentserverlist.cpp \ + recursive_operation.cpp recursive_operation_status.cpp \ + remote_recursive_operation.cpp RemoteListView.cpp \ + RemoteTreeView.cpp search.cpp serverdata.cpp \ + settings/optionspage.cpp settings/optionspage_connection.cpp \ settings/optionspage_connection_active.cpp \ settings/optionspage_connection_ftp.cpp \ settings/optionspage_connection_passive.cpp \ @@ -164,10 +190,18 @@ toolbar.cpp treectrlex.cpp updater.cpp update_dialog.cpp \ verifycertdialog.cpp verifyhostkeydialog.cpp view.cpp \ viewheader.cpp volume_enumerator.cpp welcome_dialog.cpp \ - window_state_manager.cpp wrapengine.cpp xh_text_ex.cpp \ - xh_toolb_ex.cpp xmlfunctions.cpp prefix.cpp + window_state_manager.cpp wrapengine.cpp \ + wxfilesystem_blob_handler.cpp xh_text_ex.cpp xmlfunctions.cpp \ + xrc_helper.cpp prefix.cpp overlay.cpp storj_key_interface.cpp \ + osx_sandbox_userdirs.cpp file_utils_osx.m \ + power_management_osx.m am__dirstamp = $(am__leading_dot)dirstamp @USE_BINRELOC_TRUE@am__objects_1 = filezilla-prefix.$(OBJEXT) +@ENABLE_STORJ_TRUE@am__objects_2 = filezilla-overlay.$(OBJEXT) \ +@ENABLE_STORJ_TRUE@ filezilla-storj_key_interface.$(OBJEXT) +@MACAPPBUNDLE_TRUE@@USE_MAC_SANDBOX_TRUE@am__objects_3 = filezilla-osx_sandbox_userdirs.$(OBJEXT) +@MACAPPBUNDLE_TRUE@am__objects_4 = filezilla-file_utils_osx.$(OBJEXT) \ +@MACAPPBUNDLE_TRUE@ filezilla-power_management_osx.$(OBJEXT) am_filezilla_OBJECTS = filezilla-aboutdialog.$(OBJEXT) \ filezilla-asksavepassworddialog.$(OBJEXT) \ filezilla-asyncrequestqueue.$(OBJEXT) \ @@ -184,25 +218,29 @@ filezilla-dialogex.$(OBJEXT) filezilla-dndobjects.$(OBJEXT) \ filezilla-dragdropmanager.$(OBJEXT) \ filezilla-drop_target_ex.$(OBJEXT) \ - filezilla-edithandler.$(OBJEXT) filezilla-export.$(OBJEXT) \ - filezilla-fileexistsdlg.$(OBJEXT) \ + filezilla-edithandler.$(OBJEXT) \ + filezilla-encoding_converter.$(OBJEXT) \ + filezilla-export.$(OBJEXT) filezilla-fileexistsdlg.$(OBJEXT) \ filezilla-filelistctrl.$(OBJEXT) \ filezilla-filelist_statusbar.$(OBJEXT) \ filezilla-FileZilla.$(OBJEXT) filezilla-filter.$(OBJEXT) \ filezilla-filter_conditions_dialog.$(OBJEXT) \ filezilla-filteredit.$(OBJEXT) filezilla-file_utils.$(OBJEXT) \ filezilla-fzputtygen_interface.$(OBJEXT) \ - filezilla-import.$(OBJEXT) filezilla-inputdialog.$(OBJEXT) \ - filezilla-ipcmutex.$(OBJEXT) filezilla-led.$(OBJEXT) \ - filezilla-listctrlex.$(OBJEXT) \ + filezilla-graphics.$(OBJEXT) filezilla-import.$(OBJEXT) \ + filezilla-inputdialog.$(OBJEXT) filezilla-ipcmutex.$(OBJEXT) \ + filezilla-led.$(OBJEXT) filezilla-listctrlex.$(OBJEXT) \ filezilla-listingcomparison.$(OBJEXT) \ + filezilla-list_search_panel.$(OBJEXT) \ + filezilla-local_recursive_operation.$(OBJEXT) \ filezilla-locale_initializer.$(OBJEXT) \ filezilla-LocalListView.$(OBJEXT) \ filezilla-LocalTreeView.$(OBJEXT) \ filezilla-loginmanager.$(OBJEXT) filezilla-Mainfrm.$(OBJEXT) \ filezilla-manual_transfer.$(OBJEXT) \ - filezilla-menu_bar.$(OBJEXT) filezilla-netconfwizard.$(OBJEXT) \ - filezilla-Options.$(OBJEXT) \ + filezilla-menu_bar.$(OBJEXT) filezilla-msgbox.$(OBJEXT) \ + filezilla-netconfwizard.$(OBJEXT) filezilla-Options.$(OBJEXT) \ + filezilla-password_crypto.$(OBJEXT) \ filezilla-power_management.$(OBJEXT) filezilla-queue.$(OBJEXT) \ filezilla-queue_storage.$(OBJEXT) \ filezilla-QueueView.$(OBJEXT) \ @@ -212,8 +250,10 @@ filezilla-recentserverlist.$(OBJEXT) \ filezilla-recursive_operation.$(OBJEXT) \ filezilla-recursive_operation_status.$(OBJEXT) \ + filezilla-remote_recursive_operation.$(OBJEXT) \ filezilla-RemoteListView.$(OBJEXT) \ filezilla-RemoteTreeView.$(OBJEXT) filezilla-search.$(OBJEXT) \ + filezilla-serverdata.$(OBJEXT) \ settings/filezilla-optionspage.$(OBJEXT) \ settings/filezilla-optionspage_connection.$(OBJEXT) \ settings/filezilla-optionspage_connection_active.$(OBJEXT) \ @@ -258,9 +298,12 @@ filezilla-volume_enumerator.$(OBJEXT) \ filezilla-welcome_dialog.$(OBJEXT) \ filezilla-window_state_manager.$(OBJEXT) \ - filezilla-wrapengine.$(OBJEXT) filezilla-xh_text_ex.$(OBJEXT) \ - filezilla-xh_toolb_ex.$(OBJEXT) \ - filezilla-xmlfunctions.$(OBJEXT) $(am__objects_1) + filezilla-wrapengine.$(OBJEXT) \ + filezilla-wxfilesystem_blob_handler.$(OBJEXT) \ + filezilla-xh_text_ex.$(OBJEXT) \ + filezilla-xmlfunctions.$(OBJEXT) \ + filezilla-xrc_helper.$(OBJEXT) $(am__objects_1) \ + $(am__objects_2) $(am__objects_3) $(am__objects_4) filezilla_OBJECTS = $(am_filezilla_OBJECTS) filezilla_LDADD = $(LDADD) AM_V_lt = $(am__v_lt_@AM_V@) @@ -304,6 +347,42 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = +OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) +LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_OBJCFLAGS) $(OBJCFLAGS) +AM_V_OBJC = $(am__v_OBJC_@AM_V@) +am__v_OBJC_ = $(am__v_OBJC_@AM_DEFAULT_V@) +am__v_OBJC_0 = @echo " OBJC " $@; +am__v_OBJC_1 = +OBJCLD = $(OBJC) +OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_OBJCLD = $(am__v_OBJCLD_@AM_V@) +am__v_OBJCLD_ = $(am__v_OBJCLD_@AM_DEFAULT_V@) +am__v_OBJCLD_0 = @echo " OBJCLD " $@; +am__v_OBJCLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(filezilla_SOURCES) DIST_SOURCES = $(am__filezilla_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ @@ -320,6 +399,55 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(dist_noinst_DATA) $(noinst_DATA) +am__noinst_HEADERS_DIST = aboutdialog.h asksavepassworddialog.h \ + asyncrequestqueue.h aui_notebook_ex.h auto_ascii_files.h \ + bookmarks_dialog.h buildinfo.h chmoddialog.h \ + clearprivatedata.h cmdline.h commandqueue.h \ + conditionaldialog.h context_control.h customheightlistctrl.h \ + defaultfileexistsdlg.h dialogex.h dndobjects.h \ + dragdropmanager.h drop_target_ex.h edithandler.h \ + encoding_converter.h export.h fileexistsdlg.h filelistctrl.h \ + filelist_statusbar.h filezilla.h filezillaapp.h filter.h \ + filter_conditions_dialog.h filteredit.h file_utils.h \ + fzputtygen_interface.h graphics.h import.h inputdialog.h \ + ipcmutex.h led.h listctrlex.h listingcomparison.h \ + list_search_panel.h local_recursive_operation.h \ + locale_initializer.h LocalListView.h LocalTreeView.h \ + loginmanager.h Mainfrm.h manual_transfer.h menu_bar.h msgbox.h \ + netconfwizard.h Options.h password_crypto.h power_management.h \ + prefix.h queue.h queue_storage.h QueueView.h \ + queueview_failed.h queueview_successful.h quickconnectbar.h \ + recentserverlist.h recursive_operation.h \ + recursive_operation_status.h remote_recursive_operation.h \ + RemoteListView.h RemoteTreeView.h search.h serverdata.h \ + settings/optionspage.h settings/optionspage_connection.h \ + settings/optionspage_connection_active.h \ + settings/optionspage_connection_ftp.h \ + settings/optionspage_connection_passive.h \ + settings/optionspage_connection_sftp.h \ + settings/optionspage_dateformatting.h \ + settings/optionspage_debug.h settings/optionspage_edit.h \ + settings/optionspage_edit_associations.h \ + settings/optionspage_fileexists.h \ + settings/optionspage_filelists.h \ + settings/optionspage_filetype.h \ + settings/optionspage_ftpproxy.h \ + settings/optionspage_interface.h \ + settings/optionspage_language.h settings/optionspage_logging.h \ + settings/optionspage_proxy.h \ + settings/optionspage_sizeformatting.h \ + settings/optionspage_themes.h settings/optionspage_transfer.h \ + settings/optionspage_updatecheck.h settings/settingsdialog.h \ + sftp_crypt_info_dlg.h sitemanager.h sitemanager_dialog.h \ + sizeformatting.h speedlimits_dialog.h splitter.h state.h \ + statuslinectrl.h statusbar.h StatusView.h systemimagelist.h \ + textctrlex.h themeprovider.h timeformatting.h toolbar.h \ + treectrlex.h updater.h update_dialog.h verifycertdialog.h \ + verifyhostkeydialog.h view.h viewheader.h volume_enumerator.h \ + welcome_dialog.h window_state_manager.h wrapengine.h \ + wxfilesystem_blob_handler.h xh_text_ex.h xmlfunctions.h \ + xrc_helper.h overlay.h storj_key_interface.h \ + osx_sandbox_userdirs.h HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -349,6 +477,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -385,11 +514,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -413,6 +542,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -433,16 +564,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -494,6 +633,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -533,6 +673,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -560,20 +701,23 @@ conditionaldialog.cpp context_control.cpp \ customheightlistctrl.cpp defaultfileexistsdlg.cpp dialogex.cpp \ dndobjects.cpp dragdropmanager.cpp drop_target_ex.cpp \ - edithandler.cpp export.cpp fileexistsdlg.cpp filelistctrl.cpp \ - filelist_statusbar.cpp FileZilla.cpp filter.cpp \ - filter_conditions_dialog.cpp filteredit.cpp file_utils.cpp \ - fzputtygen_interface.cpp import.cpp inputdialog.cpp \ - ipcmutex.cpp led.cpp listctrlex.cpp listingcomparison.cpp \ - locale_initializer.cpp LocalListView.cpp LocalTreeView.cpp \ - loginmanager.cpp Mainfrm.cpp manual_transfer.cpp menu_bar.cpp \ - netconfwizard.cpp Options.cpp power_management.cpp queue.cpp \ - queue_storage.cpp QueueView.cpp queueview_failed.cpp \ - queueview_successful.cpp quickconnectbar.cpp \ - recentserverlist.cpp recursive_operation.cpp \ - recursive_operation_status.cpp RemoteListView.cpp \ - RemoteTreeView.cpp search.cpp settings/optionspage.cpp \ - settings/optionspage_connection.cpp \ + edithandler.cpp encoding_converter.cpp export.cpp \ + fileexistsdlg.cpp filelistctrl.cpp filelist_statusbar.cpp \ + FileZilla.cpp filter.cpp filter_conditions_dialog.cpp \ + filteredit.cpp file_utils.cpp fzputtygen_interface.cpp \ + graphics.cpp import.cpp inputdialog.cpp ipcmutex.cpp led.cpp \ + listctrlex.cpp listingcomparison.cpp list_search_panel.cpp \ + local_recursive_operation.cpp locale_initializer.cpp \ + LocalListView.cpp LocalTreeView.cpp loginmanager.cpp \ + Mainfrm.cpp manual_transfer.cpp menu_bar.cpp msgbox.cpp \ + netconfwizard.cpp Options.cpp password_crypto.cpp \ + power_management.cpp queue.cpp queue_storage.cpp QueueView.cpp \ + queueview_failed.cpp queueview_successful.cpp \ + quickconnectbar.cpp recentserverlist.cpp \ + recursive_operation.cpp recursive_operation_status.cpp \ + remote_recursive_operation.cpp RemoteListView.cpp \ + RemoteTreeView.cpp search.cpp serverdata.cpp \ + settings/optionspage.cpp settings/optionspage_connection.cpp \ settings/optionspage_connection_active.cpp \ settings/optionspage_connection_ftp.cpp \ settings/optionspage_connection_passive.cpp \ @@ -601,135 +745,72 @@ toolbar.cpp treectrlex.cpp updater.cpp update_dialog.cpp \ verifycertdialog.cpp verifyhostkeydialog.cpp view.cpp \ viewheader.cpp volume_enumerator.cpp welcome_dialog.cpp \ - window_state_manager.cpp wrapengine.cpp xh_text_ex.cpp \ - xh_toolb_ex.cpp xmlfunctions.cpp $(am__append_1) -noinst_HEADERS = aboutdialog.h \ - asksavepassworddialog.h \ - asyncrequestqueue.h \ - aui_notebook_ex.h \ - auto_ascii_files.h \ - bookmarks_dialog.h \ - buildinfo.h \ - chmoddialog.h \ - clearprivatedata.h \ - cmdline.h \ - commandqueue.h \ - conditionaldialog.h \ - context_control.h \ - customheightlistctrl.h \ - defaultfileexistsdlg.h \ - dialogex.h \ - dndobjects.h \ - dragdropmanager.h \ - drop_target_ex.h \ - edithandler.h \ - export.h \ - fileexistsdlg.h \ - filelistctrl.h \ - filelist_statusbar.h \ - filezilla.h \ - filezillaapp.h \ - filter.h \ - filter_conditions_dialog.h \ - filteredit.h \ - file_utils.h \ - fzputtygen_interface.h \ - import.h \ - inputdialog.h \ - ipcmutex.h \ - led.h \ - listctrlex.h \ - listingcomparison.h \ - locale_initializer.h \ - LocalListView.h \ - LocalTreeView.h \ - loginmanager.h \ - Mainfrm.h \ - manual_transfer.h \ - menu_bar.h \ - netconfwizard.h \ - Options.h \ - power_management.h \ - prefix.h \ - queue.h \ - queue_storage.h \ - QueueView.h \ - queueview_failed.h \ - queueview_successful.h \ - quickconnectbar.h \ - recentserverlist.h \ - recursive_operation.h \ - recursive_operation_status.h \ - RemoteListView.h \ - RemoteTreeView.h \ - search.h \ - settings/optionspage.h \ - settings/optionspage_connection.h \ - settings/optionspage_connection_active.h \ - settings/optionspage_connection_ftp.h \ - settings/optionspage_connection_passive.h \ - settings/optionspage_connection_sftp.h \ - settings/optionspage_dateformatting.h \ - settings/optionspage_debug.h \ - settings/optionspage_edit.h \ - settings/optionspage_edit_associations.h \ - settings/optionspage_fileexists.h \ - settings/optionspage_filelists.h \ - settings/optionspage_filetype.h \ - settings/optionspage_ftpproxy.h \ - settings/optionspage_interface.h \ - settings/optionspage_language.h \ - settings/optionspage_logging.h \ - settings/optionspage_proxy.h \ - settings/optionspage_sizeformatting.h \ - settings/optionspage_themes.h \ - settings/optionspage_transfer.h \ - settings/optionspage_updatecheck.h \ - settings/settingsdialog.h \ - sftp_crypt_info_dlg.h \ - sitemanager.h \ - sitemanager_dialog.h \ - sizeformatting.h \ - speedlimits_dialog.h \ - splitter.h \ - state.h \ - statuslinectrl.h \ - statusbar.h \ - StatusView.h \ - systemimagelist.h \ - textctrlex.h \ - themeprovider.h \ - timeformatting.h \ - toolbar.h \ - treectrlex.h \ - updater.h \ - update_dialog.h \ - verifycertdialog.h \ - verifyhostkeydialog.h \ - view.h \ - viewheader.h \ - volume_enumerator.h \ - welcome_dialog.h \ - window_state_manager.h \ - wrapengine.h \ - xh_text_ex.h \ - xh_toolb_ex.h \ - xmlfunctions.h \ - xrc_helper.h - + window_state_manager.cpp wrapengine.cpp \ + wxfilesystem_blob_handler.cpp xh_text_ex.cpp xmlfunctions.cpp \ + xrc_helper.cpp $(am__append_1) $(am__append_2) $(am__append_9) \ + $(am__append_11) +noinst_HEADERS = aboutdialog.h asksavepassworddialog.h \ + asyncrequestqueue.h aui_notebook_ex.h auto_ascii_files.h \ + bookmarks_dialog.h buildinfo.h chmoddialog.h \ + clearprivatedata.h cmdline.h commandqueue.h \ + conditionaldialog.h context_control.h customheightlistctrl.h \ + defaultfileexistsdlg.h dialogex.h dndobjects.h \ + dragdropmanager.h drop_target_ex.h edithandler.h \ + encoding_converter.h export.h fileexistsdlg.h filelistctrl.h \ + filelist_statusbar.h filezilla.h filezillaapp.h filter.h \ + filter_conditions_dialog.h filteredit.h file_utils.h \ + fzputtygen_interface.h graphics.h import.h inputdialog.h \ + ipcmutex.h led.h listctrlex.h listingcomparison.h \ + list_search_panel.h local_recursive_operation.h \ + locale_initializer.h LocalListView.h LocalTreeView.h \ + loginmanager.h Mainfrm.h manual_transfer.h menu_bar.h msgbox.h \ + netconfwizard.h Options.h password_crypto.h power_management.h \ + prefix.h queue.h queue_storage.h QueueView.h \ + queueview_failed.h queueview_successful.h quickconnectbar.h \ + recentserverlist.h recursive_operation.h \ + recursive_operation_status.h remote_recursive_operation.h \ + RemoteListView.h RemoteTreeView.h search.h serverdata.h \ + settings/optionspage.h settings/optionspage_connection.h \ + settings/optionspage_connection_active.h \ + settings/optionspage_connection_ftp.h \ + settings/optionspage_connection_passive.h \ + settings/optionspage_connection_sftp.h \ + settings/optionspage_dateformatting.h \ + settings/optionspage_debug.h settings/optionspage_edit.h \ + settings/optionspage_edit_associations.h \ + settings/optionspage_fileexists.h \ + settings/optionspage_filelists.h \ + settings/optionspage_filetype.h \ + settings/optionspage_ftpproxy.h \ + settings/optionspage_interface.h \ + settings/optionspage_language.h settings/optionspage_logging.h \ + settings/optionspage_proxy.h \ + settings/optionspage_sizeformatting.h \ + settings/optionspage_themes.h settings/optionspage_transfer.h \ + settings/optionspage_updatecheck.h settings/settingsdialog.h \ + sftp_crypt_info_dlg.h sitemanager.h sitemanager_dialog.h \ + sizeformatting.h speedlimits_dialog.h splitter.h state.h \ + statuslinectrl.h statusbar.h StatusView.h systemimagelist.h \ + textctrlex.h themeprovider.h timeformatting.h toolbar.h \ + treectrlex.h updater.h update_dialog.h verifycertdialog.h \ + verifyhostkeydialog.h view.h viewheader.h volume_enumerator.h \ + welcome_dialog.h window_state_manager.h wrapengine.h \ + wxfilesystem_blob_handler.h xh_text_ex.h xmlfunctions.h \ + xrc_helper.h $(am__append_3) $(am__append_10) @USE_RESOURCEFILE_TRUE@RESOURCEFILE = resources/filezilla.o -filezilla_DEPENDENCIES = ../engine/libengine.a $(am__append_2) \ - $(am__append_5) $(am__append_6) +filezilla_DEPENDENCIES = ../engine/libengine.a $(am__append_4) \ + $(am__append_7) $(am__append_8) # GTK+ libs, empty if not using wxGTK filezilla_CPPFLAGS = -I$(srcdir)/../include $(LIBFILEZILLA_CFLAGS) \ - $(WX_CPPFLAGS) $(LIBSQLITE3_CFLAGS) $(LIBGTK_CFLAGS) + $(NETTLE_CFLAGS) $(WX_CPPFLAGS) $(LIBSQLITE3_CFLAGS) \ + $(LIBGTK_CFLAGS) filezilla_CXXFLAGS = $(WX_CXXFLAGS_ONLY) filezilla_CFLAGS = $(WX_CFLAGS_ONLY) filezilla_LDFLAGS = ../engine/libengine.a $(LIBFILEZILLA_LIBS) \ - $(PUGIXML_LIBS) $(LIBGNUTLS_LIBS) $(am__append_3) $(WX_LIBS) \ - $(RESOURCEFILE) $(IDN_LIB) $(LIBSQLITE3_LIBS) $(am__append_4) \ - $(LIBGTK_LIBS) + $(PUGIXML_LIBS) $(NETTLE_LIBS) $(HOGWEED_LIBS) \ + $(LIBGNUTLS_LIBS) $(am__append_5) $(WX_LIBS) $(RESOURCEFILE) \ + $(IDN_LIB) $(LIBSQLITE3_LIBS) $(am__append_6) $(LIBGTK_LIBS) dist_noinst_DATA = interface.vcxproj @MACAPPBUNDLE_TRUE@noinst_DATA = $(top_builddir)/FileZilla.app/Contents/MacOS/filezilla$(EXEEXT) CLEANFILES = filezilla.h.gch @@ -738,7 +819,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj +.SUFFIXES: .cpp .lo .m .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -751,7 +832,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -911,8 +991,10 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-dragdropmanager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-drop_target_ex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-edithandler.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-encoding_converter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-export.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-file_utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-file_utils_osx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-fileexistsdlg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-filelist_statusbar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-filelistctrl.Po@am__quote@ @@ -920,18 +1002,26 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-filter_conditions_dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-filteredit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-fzputtygen_interface.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-graphics.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-import.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-inputdialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-ipcmutex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-led.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-list_search_panel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-listctrlex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-listingcomparison.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-local_recursive_operation.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-locale_initializer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-loginmanager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-manual_transfer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-menu_bar.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-msgbox.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-netconfwizard.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-osx_sandbox_userdirs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-overlay.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-password_crypto.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-power_management.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-power_management_osx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-prefix.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-queue.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-queue_storage.Po@am__quote@ @@ -941,7 +1031,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-recentserverlist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-recursive_operation.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-recursive_operation_status.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-remote_recursive_operation.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-search.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-serverdata.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-sftp_crypt_info_dlg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-sitemanager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-sitemanager_dialog.Po@am__quote@ @@ -951,6 +1043,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-state.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-statusbar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-statuslinectrl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-storj_key_interface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-systemimagelist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-textctrlex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-themeprovider.Po@am__quote@ @@ -967,9 +1060,10 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-welcome_dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-window_state_manager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-wrapengine.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-wxfilesystem_blob_handler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-xh_text_ex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-xh_toolb_ex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-xmlfunctions.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-xrc_helper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@settings/$(DEPDIR)/filezilla-optionspage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@settings/$(DEPDIR)/filezilla-optionspage_connection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@settings/$(DEPDIR)/filezilla-optionspage_connection_active.Po@am__quote@ @@ -1298,6 +1392,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-edithandler.obj `if test -f 'edithandler.cpp'; then $(CYGPATH_W) 'edithandler.cpp'; else $(CYGPATH_W) '$(srcdir)/edithandler.cpp'; fi` +filezilla-encoding_converter.o: encoding_converter.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-encoding_converter.o -MD -MP -MF $(DEPDIR)/filezilla-encoding_converter.Tpo -c -o filezilla-encoding_converter.o `test -f 'encoding_converter.cpp' || echo '$(srcdir)/'`encoding_converter.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-encoding_converter.Tpo $(DEPDIR)/filezilla-encoding_converter.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='encoding_converter.cpp' object='filezilla-encoding_converter.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-encoding_converter.o `test -f 'encoding_converter.cpp' || echo '$(srcdir)/'`encoding_converter.cpp + +filezilla-encoding_converter.obj: encoding_converter.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-encoding_converter.obj -MD -MP -MF $(DEPDIR)/filezilla-encoding_converter.Tpo -c -o filezilla-encoding_converter.obj `if test -f 'encoding_converter.cpp'; then $(CYGPATH_W) 'encoding_converter.cpp'; else $(CYGPATH_W) '$(srcdir)/encoding_converter.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-encoding_converter.Tpo $(DEPDIR)/filezilla-encoding_converter.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='encoding_converter.cpp' object='filezilla-encoding_converter.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-encoding_converter.obj `if test -f 'encoding_converter.cpp'; then $(CYGPATH_W) 'encoding_converter.cpp'; else $(CYGPATH_W) '$(srcdir)/encoding_converter.cpp'; fi` + filezilla-export.o: export.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-export.o -MD -MP -MF $(DEPDIR)/filezilla-export.Tpo -c -o filezilla-export.o `test -f 'export.cpp' || echo '$(srcdir)/'`export.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-export.Tpo $(DEPDIR)/filezilla-export.Po @@ -1438,6 +1546,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-fzputtygen_interface.obj `if test -f 'fzputtygen_interface.cpp'; then $(CYGPATH_W) 'fzputtygen_interface.cpp'; else $(CYGPATH_W) '$(srcdir)/fzputtygen_interface.cpp'; fi` +filezilla-graphics.o: graphics.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-graphics.o -MD -MP -MF $(DEPDIR)/filezilla-graphics.Tpo -c -o filezilla-graphics.o `test -f 'graphics.cpp' || echo '$(srcdir)/'`graphics.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-graphics.Tpo $(DEPDIR)/filezilla-graphics.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='graphics.cpp' object='filezilla-graphics.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-graphics.o `test -f 'graphics.cpp' || echo '$(srcdir)/'`graphics.cpp + +filezilla-graphics.obj: graphics.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-graphics.obj -MD -MP -MF $(DEPDIR)/filezilla-graphics.Tpo -c -o filezilla-graphics.obj `if test -f 'graphics.cpp'; then $(CYGPATH_W) 'graphics.cpp'; else $(CYGPATH_W) '$(srcdir)/graphics.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-graphics.Tpo $(DEPDIR)/filezilla-graphics.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='graphics.cpp' object='filezilla-graphics.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-graphics.obj `if test -f 'graphics.cpp'; then $(CYGPATH_W) 'graphics.cpp'; else $(CYGPATH_W) '$(srcdir)/graphics.cpp'; fi` + filezilla-import.o: import.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-import.o -MD -MP -MF $(DEPDIR)/filezilla-import.Tpo -c -o filezilla-import.o `test -f 'import.cpp' || echo '$(srcdir)/'`import.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-import.Tpo $(DEPDIR)/filezilla-import.Po @@ -1522,6 +1644,34 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-listingcomparison.obj `if test -f 'listingcomparison.cpp'; then $(CYGPATH_W) 'listingcomparison.cpp'; else $(CYGPATH_W) '$(srcdir)/listingcomparison.cpp'; fi` +filezilla-list_search_panel.o: list_search_panel.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-list_search_panel.o -MD -MP -MF $(DEPDIR)/filezilla-list_search_panel.Tpo -c -o filezilla-list_search_panel.o `test -f 'list_search_panel.cpp' || echo '$(srcdir)/'`list_search_panel.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-list_search_panel.Tpo $(DEPDIR)/filezilla-list_search_panel.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='list_search_panel.cpp' object='filezilla-list_search_panel.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-list_search_panel.o `test -f 'list_search_panel.cpp' || echo '$(srcdir)/'`list_search_panel.cpp + +filezilla-list_search_panel.obj: list_search_panel.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-list_search_panel.obj -MD -MP -MF $(DEPDIR)/filezilla-list_search_panel.Tpo -c -o filezilla-list_search_panel.obj `if test -f 'list_search_panel.cpp'; then $(CYGPATH_W) 'list_search_panel.cpp'; else $(CYGPATH_W) '$(srcdir)/list_search_panel.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-list_search_panel.Tpo $(DEPDIR)/filezilla-list_search_panel.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='list_search_panel.cpp' object='filezilla-list_search_panel.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-list_search_panel.obj `if test -f 'list_search_panel.cpp'; then $(CYGPATH_W) 'list_search_panel.cpp'; else $(CYGPATH_W) '$(srcdir)/list_search_panel.cpp'; fi` + +filezilla-local_recursive_operation.o: local_recursive_operation.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-local_recursive_operation.o -MD -MP -MF $(DEPDIR)/filezilla-local_recursive_operation.Tpo -c -o filezilla-local_recursive_operation.o `test -f 'local_recursive_operation.cpp' || echo '$(srcdir)/'`local_recursive_operation.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-local_recursive_operation.Tpo $(DEPDIR)/filezilla-local_recursive_operation.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='local_recursive_operation.cpp' object='filezilla-local_recursive_operation.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-local_recursive_operation.o `test -f 'local_recursive_operation.cpp' || echo '$(srcdir)/'`local_recursive_operation.cpp + +filezilla-local_recursive_operation.obj: local_recursive_operation.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-local_recursive_operation.obj -MD -MP -MF $(DEPDIR)/filezilla-local_recursive_operation.Tpo -c -o filezilla-local_recursive_operation.obj `if test -f 'local_recursive_operation.cpp'; then $(CYGPATH_W) 'local_recursive_operation.cpp'; else $(CYGPATH_W) '$(srcdir)/local_recursive_operation.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-local_recursive_operation.Tpo $(DEPDIR)/filezilla-local_recursive_operation.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='local_recursive_operation.cpp' object='filezilla-local_recursive_operation.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-local_recursive_operation.obj `if test -f 'local_recursive_operation.cpp'; then $(CYGPATH_W) 'local_recursive_operation.cpp'; else $(CYGPATH_W) '$(srcdir)/local_recursive_operation.cpp'; fi` + filezilla-locale_initializer.o: locale_initializer.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-locale_initializer.o -MD -MP -MF $(DEPDIR)/filezilla-locale_initializer.Tpo -c -o filezilla-locale_initializer.o `test -f 'locale_initializer.cpp' || echo '$(srcdir)/'`locale_initializer.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-locale_initializer.Tpo $(DEPDIR)/filezilla-locale_initializer.Po @@ -1620,6 +1770,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-menu_bar.obj `if test -f 'menu_bar.cpp'; then $(CYGPATH_W) 'menu_bar.cpp'; else $(CYGPATH_W) '$(srcdir)/menu_bar.cpp'; fi` +filezilla-msgbox.o: msgbox.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-msgbox.o -MD -MP -MF $(DEPDIR)/filezilla-msgbox.Tpo -c -o filezilla-msgbox.o `test -f 'msgbox.cpp' || echo '$(srcdir)/'`msgbox.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-msgbox.Tpo $(DEPDIR)/filezilla-msgbox.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='msgbox.cpp' object='filezilla-msgbox.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-msgbox.o `test -f 'msgbox.cpp' || echo '$(srcdir)/'`msgbox.cpp + +filezilla-msgbox.obj: msgbox.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-msgbox.obj -MD -MP -MF $(DEPDIR)/filezilla-msgbox.Tpo -c -o filezilla-msgbox.obj `if test -f 'msgbox.cpp'; then $(CYGPATH_W) 'msgbox.cpp'; else $(CYGPATH_W) '$(srcdir)/msgbox.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-msgbox.Tpo $(DEPDIR)/filezilla-msgbox.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='msgbox.cpp' object='filezilla-msgbox.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-msgbox.obj `if test -f 'msgbox.cpp'; then $(CYGPATH_W) 'msgbox.cpp'; else $(CYGPATH_W) '$(srcdir)/msgbox.cpp'; fi` + filezilla-netconfwizard.o: netconfwizard.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-netconfwizard.o -MD -MP -MF $(DEPDIR)/filezilla-netconfwizard.Tpo -c -o filezilla-netconfwizard.o `test -f 'netconfwizard.cpp' || echo '$(srcdir)/'`netconfwizard.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-netconfwizard.Tpo $(DEPDIR)/filezilla-netconfwizard.Po @@ -1648,6 +1812,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-Options.obj `if test -f 'Options.cpp'; then $(CYGPATH_W) 'Options.cpp'; else $(CYGPATH_W) '$(srcdir)/Options.cpp'; fi` +filezilla-password_crypto.o: password_crypto.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-password_crypto.o -MD -MP -MF $(DEPDIR)/filezilla-password_crypto.Tpo -c -o filezilla-password_crypto.o `test -f 'password_crypto.cpp' || echo '$(srcdir)/'`password_crypto.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-password_crypto.Tpo $(DEPDIR)/filezilla-password_crypto.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='password_crypto.cpp' object='filezilla-password_crypto.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-password_crypto.o `test -f 'password_crypto.cpp' || echo '$(srcdir)/'`password_crypto.cpp + +filezilla-password_crypto.obj: password_crypto.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-password_crypto.obj -MD -MP -MF $(DEPDIR)/filezilla-password_crypto.Tpo -c -o filezilla-password_crypto.obj `if test -f 'password_crypto.cpp'; then $(CYGPATH_W) 'password_crypto.cpp'; else $(CYGPATH_W) '$(srcdir)/password_crypto.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-password_crypto.Tpo $(DEPDIR)/filezilla-password_crypto.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='password_crypto.cpp' object='filezilla-password_crypto.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-password_crypto.obj `if test -f 'password_crypto.cpp'; then $(CYGPATH_W) 'password_crypto.cpp'; else $(CYGPATH_W) '$(srcdir)/password_crypto.cpp'; fi` + filezilla-power_management.o: power_management.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-power_management.o -MD -MP -MF $(DEPDIR)/filezilla-power_management.Tpo -c -o filezilla-power_management.o `test -f 'power_management.cpp' || echo '$(srcdir)/'`power_management.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-power_management.Tpo $(DEPDIR)/filezilla-power_management.Po @@ -1788,6 +1966,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-recursive_operation_status.obj `if test -f 'recursive_operation_status.cpp'; then $(CYGPATH_W) 'recursive_operation_status.cpp'; else $(CYGPATH_W) '$(srcdir)/recursive_operation_status.cpp'; fi` +filezilla-remote_recursive_operation.o: remote_recursive_operation.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-remote_recursive_operation.o -MD -MP -MF $(DEPDIR)/filezilla-remote_recursive_operation.Tpo -c -o filezilla-remote_recursive_operation.o `test -f 'remote_recursive_operation.cpp' || echo '$(srcdir)/'`remote_recursive_operation.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-remote_recursive_operation.Tpo $(DEPDIR)/filezilla-remote_recursive_operation.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='remote_recursive_operation.cpp' object='filezilla-remote_recursive_operation.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-remote_recursive_operation.o `test -f 'remote_recursive_operation.cpp' || echo '$(srcdir)/'`remote_recursive_operation.cpp + +filezilla-remote_recursive_operation.obj: remote_recursive_operation.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-remote_recursive_operation.obj -MD -MP -MF $(DEPDIR)/filezilla-remote_recursive_operation.Tpo -c -o filezilla-remote_recursive_operation.obj `if test -f 'remote_recursive_operation.cpp'; then $(CYGPATH_W) 'remote_recursive_operation.cpp'; else $(CYGPATH_W) '$(srcdir)/remote_recursive_operation.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-remote_recursive_operation.Tpo $(DEPDIR)/filezilla-remote_recursive_operation.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='remote_recursive_operation.cpp' object='filezilla-remote_recursive_operation.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-remote_recursive_operation.obj `if test -f 'remote_recursive_operation.cpp'; then $(CYGPATH_W) 'remote_recursive_operation.cpp'; else $(CYGPATH_W) '$(srcdir)/remote_recursive_operation.cpp'; fi` + filezilla-RemoteListView.o: RemoteListView.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-RemoteListView.o -MD -MP -MF $(DEPDIR)/filezilla-RemoteListView.Tpo -c -o filezilla-RemoteListView.o `test -f 'RemoteListView.cpp' || echo '$(srcdir)/'`RemoteListView.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-RemoteListView.Tpo $(DEPDIR)/filezilla-RemoteListView.Po @@ -1830,6 +2022,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-search.obj `if test -f 'search.cpp'; then $(CYGPATH_W) 'search.cpp'; else $(CYGPATH_W) '$(srcdir)/search.cpp'; fi` +filezilla-serverdata.o: serverdata.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-serverdata.o -MD -MP -MF $(DEPDIR)/filezilla-serverdata.Tpo -c -o filezilla-serverdata.o `test -f 'serverdata.cpp' || echo '$(srcdir)/'`serverdata.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-serverdata.Tpo $(DEPDIR)/filezilla-serverdata.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='serverdata.cpp' object='filezilla-serverdata.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-serverdata.o `test -f 'serverdata.cpp' || echo '$(srcdir)/'`serverdata.cpp + +filezilla-serverdata.obj: serverdata.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-serverdata.obj -MD -MP -MF $(DEPDIR)/filezilla-serverdata.Tpo -c -o filezilla-serverdata.obj `if test -f 'serverdata.cpp'; then $(CYGPATH_W) 'serverdata.cpp'; else $(CYGPATH_W) '$(srcdir)/serverdata.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-serverdata.Tpo $(DEPDIR)/filezilla-serverdata.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='serverdata.cpp' object='filezilla-serverdata.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-serverdata.obj `if test -f 'serverdata.cpp'; then $(CYGPATH_W) 'serverdata.cpp'; else $(CYGPATH_W) '$(srcdir)/serverdata.cpp'; fi` + settings/filezilla-optionspage.o: settings/optionspage.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT settings/filezilla-optionspage.o -MD -MP -MF settings/$(DEPDIR)/filezilla-optionspage.Tpo -c -o settings/filezilla-optionspage.o `test -f 'settings/optionspage.cpp' || echo '$(srcdir)/'`settings/optionspage.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) settings/$(DEPDIR)/filezilla-optionspage.Tpo settings/$(DEPDIR)/filezilla-optionspage.Po @@ -2516,6 +2722,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-wrapengine.obj `if test -f 'wrapengine.cpp'; then $(CYGPATH_W) 'wrapengine.cpp'; else $(CYGPATH_W) '$(srcdir)/wrapengine.cpp'; fi` +filezilla-wxfilesystem_blob_handler.o: wxfilesystem_blob_handler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-wxfilesystem_blob_handler.o -MD -MP -MF $(DEPDIR)/filezilla-wxfilesystem_blob_handler.Tpo -c -o filezilla-wxfilesystem_blob_handler.o `test -f 'wxfilesystem_blob_handler.cpp' || echo '$(srcdir)/'`wxfilesystem_blob_handler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-wxfilesystem_blob_handler.Tpo $(DEPDIR)/filezilla-wxfilesystem_blob_handler.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='wxfilesystem_blob_handler.cpp' object='filezilla-wxfilesystem_blob_handler.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-wxfilesystem_blob_handler.o `test -f 'wxfilesystem_blob_handler.cpp' || echo '$(srcdir)/'`wxfilesystem_blob_handler.cpp + +filezilla-wxfilesystem_blob_handler.obj: wxfilesystem_blob_handler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-wxfilesystem_blob_handler.obj -MD -MP -MF $(DEPDIR)/filezilla-wxfilesystem_blob_handler.Tpo -c -o filezilla-wxfilesystem_blob_handler.obj `if test -f 'wxfilesystem_blob_handler.cpp'; then $(CYGPATH_W) 'wxfilesystem_blob_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/wxfilesystem_blob_handler.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-wxfilesystem_blob_handler.Tpo $(DEPDIR)/filezilla-wxfilesystem_blob_handler.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='wxfilesystem_blob_handler.cpp' object='filezilla-wxfilesystem_blob_handler.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-wxfilesystem_blob_handler.obj `if test -f 'wxfilesystem_blob_handler.cpp'; then $(CYGPATH_W) 'wxfilesystem_blob_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/wxfilesystem_blob_handler.cpp'; fi` + filezilla-xh_text_ex.o: xh_text_ex.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-xh_text_ex.o -MD -MP -MF $(DEPDIR)/filezilla-xh_text_ex.Tpo -c -o filezilla-xh_text_ex.o `test -f 'xh_text_ex.cpp' || echo '$(srcdir)/'`xh_text_ex.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-xh_text_ex.Tpo $(DEPDIR)/filezilla-xh_text_ex.Po @@ -2530,20 +2750,6 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-xh_text_ex.obj `if test -f 'xh_text_ex.cpp'; then $(CYGPATH_W) 'xh_text_ex.cpp'; else $(CYGPATH_W) '$(srcdir)/xh_text_ex.cpp'; fi` -filezilla-xh_toolb_ex.o: xh_toolb_ex.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-xh_toolb_ex.o -MD -MP -MF $(DEPDIR)/filezilla-xh_toolb_ex.Tpo -c -o filezilla-xh_toolb_ex.o `test -f 'xh_toolb_ex.cpp' || echo '$(srcdir)/'`xh_toolb_ex.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-xh_toolb_ex.Tpo $(DEPDIR)/filezilla-xh_toolb_ex.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xh_toolb_ex.cpp' object='filezilla-xh_toolb_ex.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-xh_toolb_ex.o `test -f 'xh_toolb_ex.cpp' || echo '$(srcdir)/'`xh_toolb_ex.cpp - -filezilla-xh_toolb_ex.obj: xh_toolb_ex.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-xh_toolb_ex.obj -MD -MP -MF $(DEPDIR)/filezilla-xh_toolb_ex.Tpo -c -o filezilla-xh_toolb_ex.obj `if test -f 'xh_toolb_ex.cpp'; then $(CYGPATH_W) 'xh_toolb_ex.cpp'; else $(CYGPATH_W) '$(srcdir)/xh_toolb_ex.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-xh_toolb_ex.Tpo $(DEPDIR)/filezilla-xh_toolb_ex.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xh_toolb_ex.cpp' object='filezilla-xh_toolb_ex.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-xh_toolb_ex.obj `if test -f 'xh_toolb_ex.cpp'; then $(CYGPATH_W) 'xh_toolb_ex.cpp'; else $(CYGPATH_W) '$(srcdir)/xh_toolb_ex.cpp'; fi` - filezilla-xmlfunctions.o: xmlfunctions.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-xmlfunctions.o -MD -MP -MF $(DEPDIR)/filezilla-xmlfunctions.Tpo -c -o filezilla-xmlfunctions.o `test -f 'xmlfunctions.cpp' || echo '$(srcdir)/'`xmlfunctions.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-xmlfunctions.Tpo $(DEPDIR)/filezilla-xmlfunctions.Po @@ -2558,6 +2764,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-xmlfunctions.obj `if test -f 'xmlfunctions.cpp'; then $(CYGPATH_W) 'xmlfunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/xmlfunctions.cpp'; fi` +filezilla-xrc_helper.o: xrc_helper.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-xrc_helper.o -MD -MP -MF $(DEPDIR)/filezilla-xrc_helper.Tpo -c -o filezilla-xrc_helper.o `test -f 'xrc_helper.cpp' || echo '$(srcdir)/'`xrc_helper.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-xrc_helper.Tpo $(DEPDIR)/filezilla-xrc_helper.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xrc_helper.cpp' object='filezilla-xrc_helper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-xrc_helper.o `test -f 'xrc_helper.cpp' || echo '$(srcdir)/'`xrc_helper.cpp + +filezilla-xrc_helper.obj: xrc_helper.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-xrc_helper.obj -MD -MP -MF $(DEPDIR)/filezilla-xrc_helper.Tpo -c -o filezilla-xrc_helper.obj `if test -f 'xrc_helper.cpp'; then $(CYGPATH_W) 'xrc_helper.cpp'; else $(CYGPATH_W) '$(srcdir)/xrc_helper.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-xrc_helper.Tpo $(DEPDIR)/filezilla-xrc_helper.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xrc_helper.cpp' object='filezilla-xrc_helper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-xrc_helper.obj `if test -f 'xrc_helper.cpp'; then $(CYGPATH_W) 'xrc_helper.cpp'; else $(CYGPATH_W) '$(srcdir)/xrc_helper.cpp'; fi` + filezilla-prefix.o: prefix.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-prefix.o -MD -MP -MF $(DEPDIR)/filezilla-prefix.Tpo -c -o filezilla-prefix.o `test -f 'prefix.cpp' || echo '$(srcdir)/'`prefix.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-prefix.Tpo $(DEPDIR)/filezilla-prefix.Po @@ -2572,6 +2792,100 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-prefix.obj `if test -f 'prefix.cpp'; then $(CYGPATH_W) 'prefix.cpp'; else $(CYGPATH_W) '$(srcdir)/prefix.cpp'; fi` +filezilla-overlay.o: overlay.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-overlay.o -MD -MP -MF $(DEPDIR)/filezilla-overlay.Tpo -c -o filezilla-overlay.o `test -f 'overlay.cpp' || echo '$(srcdir)/'`overlay.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-overlay.Tpo $(DEPDIR)/filezilla-overlay.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='overlay.cpp' object='filezilla-overlay.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-overlay.o `test -f 'overlay.cpp' || echo '$(srcdir)/'`overlay.cpp + +filezilla-overlay.obj: overlay.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-overlay.obj -MD -MP -MF $(DEPDIR)/filezilla-overlay.Tpo -c -o filezilla-overlay.obj `if test -f 'overlay.cpp'; then $(CYGPATH_W) 'overlay.cpp'; else $(CYGPATH_W) '$(srcdir)/overlay.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-overlay.Tpo $(DEPDIR)/filezilla-overlay.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='overlay.cpp' object='filezilla-overlay.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-overlay.obj `if test -f 'overlay.cpp'; then $(CYGPATH_W) 'overlay.cpp'; else $(CYGPATH_W) '$(srcdir)/overlay.cpp'; fi` + +filezilla-storj_key_interface.o: storj_key_interface.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-storj_key_interface.o -MD -MP -MF $(DEPDIR)/filezilla-storj_key_interface.Tpo -c -o filezilla-storj_key_interface.o `test -f 'storj_key_interface.cpp' || echo '$(srcdir)/'`storj_key_interface.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-storj_key_interface.Tpo $(DEPDIR)/filezilla-storj_key_interface.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj_key_interface.cpp' object='filezilla-storj_key_interface.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-storj_key_interface.o `test -f 'storj_key_interface.cpp' || echo '$(srcdir)/'`storj_key_interface.cpp + +filezilla-storj_key_interface.obj: storj_key_interface.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-storj_key_interface.obj -MD -MP -MF $(DEPDIR)/filezilla-storj_key_interface.Tpo -c -o filezilla-storj_key_interface.obj `if test -f 'storj_key_interface.cpp'; then $(CYGPATH_W) 'storj_key_interface.cpp'; else $(CYGPATH_W) '$(srcdir)/storj_key_interface.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-storj_key_interface.Tpo $(DEPDIR)/filezilla-storj_key_interface.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='storj_key_interface.cpp' object='filezilla-storj_key_interface.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-storj_key_interface.obj `if test -f 'storj_key_interface.cpp'; then $(CYGPATH_W) 'storj_key_interface.cpp'; else $(CYGPATH_W) '$(srcdir)/storj_key_interface.cpp'; fi` + +filezilla-osx_sandbox_userdirs.o: osx_sandbox_userdirs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-osx_sandbox_userdirs.o -MD -MP -MF $(DEPDIR)/filezilla-osx_sandbox_userdirs.Tpo -c -o filezilla-osx_sandbox_userdirs.o `test -f 'osx_sandbox_userdirs.cpp' || echo '$(srcdir)/'`osx_sandbox_userdirs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-osx_sandbox_userdirs.Tpo $(DEPDIR)/filezilla-osx_sandbox_userdirs.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='osx_sandbox_userdirs.cpp' object='filezilla-osx_sandbox_userdirs.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-osx_sandbox_userdirs.o `test -f 'osx_sandbox_userdirs.cpp' || echo '$(srcdir)/'`osx_sandbox_userdirs.cpp + +filezilla-osx_sandbox_userdirs.obj: osx_sandbox_userdirs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-osx_sandbox_userdirs.obj -MD -MP -MF $(DEPDIR)/filezilla-osx_sandbox_userdirs.Tpo -c -o filezilla-osx_sandbox_userdirs.obj `if test -f 'osx_sandbox_userdirs.cpp'; then $(CYGPATH_W) 'osx_sandbox_userdirs.cpp'; else $(CYGPATH_W) '$(srcdir)/osx_sandbox_userdirs.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-osx_sandbox_userdirs.Tpo $(DEPDIR)/filezilla-osx_sandbox_userdirs.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='osx_sandbox_userdirs.cpp' object='filezilla-osx_sandbox_userdirs.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-osx_sandbox_userdirs.obj `if test -f 'osx_sandbox_userdirs.cpp'; then $(CYGPATH_W) 'osx_sandbox_userdirs.cpp'; else $(CYGPATH_W) '$(srcdir)/osx_sandbox_userdirs.cpp'; fi` + +.m.o: +@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepOBJC_TRUE@ $(OBJCCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepOBJC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ $< + +.m.obj: +@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepOBJC_TRUE@ $(OBJCCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepOBJC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.m.lo: +@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepOBJC_TRUE@ $(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepOBJC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $< + +filezilla-file_utils_osx.o: file_utils_osx.m +@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT filezilla-file_utils_osx.o -MD -MP -MF $(DEPDIR)/filezilla-file_utils_osx.Tpo -c -o filezilla-file_utils_osx.o `test -f 'file_utils_osx.m' || echo '$(srcdir)/'`file_utils_osx.m +@am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-file_utils_osx.Tpo $(DEPDIR)/filezilla-file_utils_osx.Po +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='file_utils_osx.m' object='filezilla-file_utils_osx.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o filezilla-file_utils_osx.o `test -f 'file_utils_osx.m' || echo '$(srcdir)/'`file_utils_osx.m + +filezilla-file_utils_osx.obj: file_utils_osx.m +@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT filezilla-file_utils_osx.obj -MD -MP -MF $(DEPDIR)/filezilla-file_utils_osx.Tpo -c -o filezilla-file_utils_osx.obj `if test -f 'file_utils_osx.m'; then $(CYGPATH_W) 'file_utils_osx.m'; else $(CYGPATH_W) '$(srcdir)/file_utils_osx.m'; fi` +@am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-file_utils_osx.Tpo $(DEPDIR)/filezilla-file_utils_osx.Po +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='file_utils_osx.m' object='filezilla-file_utils_osx.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o filezilla-file_utils_osx.obj `if test -f 'file_utils_osx.m'; then $(CYGPATH_W) 'file_utils_osx.m'; else $(CYGPATH_W) '$(srcdir)/file_utils_osx.m'; fi` + +filezilla-power_management_osx.o: power_management_osx.m +@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT filezilla-power_management_osx.o -MD -MP -MF $(DEPDIR)/filezilla-power_management_osx.Tpo -c -o filezilla-power_management_osx.o `test -f 'power_management_osx.m' || echo '$(srcdir)/'`power_management_osx.m +@am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-power_management_osx.Tpo $(DEPDIR)/filezilla-power_management_osx.Po +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='power_management_osx.m' object='filezilla-power_management_osx.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o filezilla-power_management_osx.o `test -f 'power_management_osx.m' || echo '$(srcdir)/'`power_management_osx.m + +filezilla-power_management_osx.obj: power_management_osx.m +@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT filezilla-power_management_osx.obj -MD -MP -MF $(DEPDIR)/filezilla-power_management_osx.Tpo -c -o filezilla-power_management_osx.obj `if test -f 'power_management_osx.m'; then $(CYGPATH_W) 'power_management_osx.m'; else $(CYGPATH_W) '$(srcdir)/power_management_osx.m'; fi` +@am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filezilla-power_management_osx.Tpo $(DEPDIR)/filezilla-power_management_osx.Po +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='power_management_osx.m' object='filezilla-power_management_osx.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o filezilla-power_management_osx.obj `if test -f 'power_management_osx.m'; then $(CYGPATH_W) 'power_management_osx.m'; else $(CYGPATH_W) '$(srcdir)/power_management_osx.m'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -2864,6 +3178,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-binPROGRAMS +.PRECIOUS: Makefile + $(top_builddir)/FileZilla.app/Contents/MacOS/filezilla$(EXEEXT): filezilla mkdir -p $(top_builddir)/FileZilla.app/Contents/MacOS diff -Nru filezilla-3.15.0.2/src/interface/manual_transfer.cpp filezilla-3.33.0/src/interface/manual_transfer.cpp --- filezilla-3.15.0.2/src/interface/manual_transfer.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/manual_transfer.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -27,23 +27,16 @@ CManualTransfer::CManualTransfer(CQueueView* pQueueView) : m_local_file_exists() - , m_pServer() - , m_pLastSite() , m_pState() , m_pQueueView(pQueueView) { } -CManualTransfer::~CManualTransfer() -{ - delete m_pServer; - delete m_pLastSite; -} - void CManualTransfer::Run(wxWindow* pParent, CState* pState) { - if (!Load(pParent, _T("ID_MANUALTRANSFER"))) + if (!Load(pParent, _T("ID_MANUALTRANSFER"))) { return; + } m_pState = pState; @@ -58,11 +51,12 @@ wxChoice* pChoice = XRCCTRL(*this, "ID_LOGONTYPE", wxChoice); wxASSERT(pChoice); - for (int i = 0; i < LOGONTYPE_MAX; ++i) - pChoice->Append(CServer::GetNameFromLogonType((enum LogonType)i)); + for (int i = 0; i < static_cast(LogonType::count); ++i) { + pChoice->Append(GetNameFromLogonType(static_cast(i))); + } - if (m_pState->GetServer()) { - m_pServer = new CServer(*m_pState->GetServer()); + server_ = m_pState->GetServer(); + if (server_) { XRCCTRL(*this, "ID_SERVER_CURRENT", wxRadioButton)->SetValue(true); DisplayServer(); } @@ -114,7 +108,7 @@ XRCCTRL(*this, "ID_TYPE_AUTO_ASCII", wxStaticText)->Hide(); XRCCTRL(*this, "ID_TYPE_AUTO_BINARY", wxStaticText)->Hide(); } - else if (CAutoAsciiFiles::TransferLocalAsAscii(remote_file, m_pServer ? m_pServer->GetType() : UNIX)) { + else if (CAutoAsciiFiles::TransferLocalAsAscii(remote_file, server_.server.GetType())) { XRCCTRL(*this, "ID_TYPE_AUTO_ASCII", wxStaticText)->Show(); XRCCTRL(*this, "ID_TYPE_AUTO_BINARY", wxStaticText)->Hide(); } @@ -129,7 +123,7 @@ XRCCTRL(*this, "ID_TYPE_AUTO_ASCII", wxStaticText)->Hide(); XRCCTRL(*this, "ID_TYPE_AUTO_BINARY", wxStaticText)->Hide(); } - else if (CAutoAsciiFiles::TransferLocalAsAscii(local_file, m_pServer ? m_pServer->GetType() : UNIX)) { + else if (CAutoAsciiFiles::TransferLocalAsAscii(local_file, server_.server.GetType())) { XRCCTRL(*this, "ID_TYPE_AUTO_ASCII", wxStaticText)->Show(); XRCCTRL(*this, "ID_TYPE_AUTO_BINARY", wxStaticText)->Hide(); } @@ -157,34 +151,37 @@ void CManualTransfer::DisplayServer() { - if (m_pServer) - { - XRCCTRL(*this, "ID_HOST", wxTextCtrl)->ChangeValue(m_pServer->FormatHost(true)); - unsigned int port = m_pServer->GetPort(); + if (server_) { + XRCCTRL(*this, "ID_HOST", wxTextCtrl)->ChangeValue(server_.Format(ServerFormat::host_only)); + unsigned int port = server_.server.GetPort(); - if (port != CServer::GetDefaultPort(m_pServer->GetProtocol())) + if (port != CServer::GetDefaultPort(server_.server.GetProtocol())) { XRCCTRL(*this, "ID_PORT", wxTextCtrl)->ChangeValue(wxString::Format(_T("%d"), port)); - else + } + else { XRCCTRL(*this, "ID_PORT", wxTextCtrl)->ChangeValue(_T("")); + } - const wxString& protocolName = CServer::GetProtocolName(m_pServer->GetProtocol()); - if (!protocolName.empty()) + const wxString& protocolName = CServer::GetProtocolName(server_.server.GetProtocol()); + if (!protocolName.empty()) { XRCCTRL(*this, "ID_PROTOCOL", wxChoice)->SetStringSelection(protocolName); - else + } + else { XRCCTRL(*this, "ID_PROTOCOL", wxChoice)->SetStringSelection(CServer::GetProtocolName(FTP)); + } - switch (m_pServer->GetLogonType()) + switch (server_.credentials.logonType_) { - case NORMAL: + case LogonType::normal: XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(_("Normal")); break; - case ASK: + case LogonType::ask: XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(_("Ask for password")); break; - case INTERACTIVE: + case LogonType::interactive: XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(_("Interactive")); break; - case ACCOUNT: + case LogonType::account: XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(_("Account")); break; default: @@ -192,12 +189,11 @@ break; } - XRCCTRL(*this, "ID_USER", wxTextCtrl)->ChangeValue(m_pServer->GetUser()); - XRCCTRL(*this, "ID_ACCOUNT", wxTextCtrl)->ChangeValue(m_pServer->GetAccount()); - XRCCTRL(*this, "ID_PASS", wxTextCtrl)->ChangeValue(m_pServer->GetPass()); + XRCCTRL(*this, "ID_USER", wxTextCtrl)->ChangeValue(server_.server.GetUser()); + XRCCTRL(*this, "ID_ACCOUNT", wxTextCtrl)->ChangeValue(server_.credentials.account_); + XRCCTRL(*this, "ID_PASS", wxTextCtrl)->ChangeValue(server_.credentials.GetPass()); } - else - { + else { XRCCTRL(*this, "ID_HOST", wxTextCtrl)->ChangeValue(_T("")); XRCCTRL(*this, "ID_PORT", wxTextCtrl)->ChangeValue(_T("")); XRCCTRL(*this, "ID_PROTOCOL", wxChoice)->SetStringSelection(CServer::GetProtocolName(FTP)); @@ -214,8 +210,9 @@ void CManualTransfer::OnLocalChanged(wxCommandEvent&) { - if (XRCCTRL(*this, "ID_DOWNLOAD", wxRadioButton)->GetValue()) + if (XRCCTRL(*this, "ID_DOWNLOAD", wxRadioButton)->GetValue()) { return; + } wxString file = XRCCTRL(*this, "ID_LOCALFILE", wxTextCtrl)->GetValue(); @@ -245,8 +242,9 @@ wxFileDialog dlg(this, title, _T(""), _T(""), _T("*.*"), flags); int res = dlg.ShowModal(); - if (res != wxID_OK) + if (res != wxID_OK) { return; + } // SetValue on purpose xrc_call(*this, "ID_LOCALFILE", &wxTextCtrl::SetValue, dlg.GetPath()); @@ -254,8 +252,9 @@ void CManualTransfer::OnDirection(wxCommandEvent& event) { - if (xrc_call(*this, "ID_DOWNLOAD", &wxRadioButton::GetValue)) + if (xrc_call(*this, "ID_DOWNLOAD", &wxRadioButton::GetValue)) { SetAutoAsciiState(); + } else { // Need to check for file existence OnLocalChanged(event); @@ -265,19 +264,10 @@ void CManualTransfer::OnServerTypeChanged(wxCommandEvent& event) { if (event.GetId() == XRCID("ID_SERVER_CURRENT")) { - delete m_pServer; - if (m_pState->GetServer()) - m_pServer = new CServer(*m_pState->GetServer()); - else - m_pServer = 0; + server_ = m_pState->GetServer(); } else if (event.GetId() == XRCID("ID_SERVER_SITE")) { - delete m_pServer; - if (m_pLastSite) - m_pServer = new CServer(*m_pLastSite); - else - m_pServer = 0; - + server_ = lastSite_; } xrc_call(*this, "ID_SERVER_SITE_SELECT", &wxButton::Enable, event.GetId() == XRCID("ID_SERVER_SITE")); DisplayServer(); @@ -286,19 +276,20 @@ void CManualTransfer::OnOK(wxCommandEvent&) { - if (!UpdateServer()) + if (!UpdateServer()) { return; + } bool download = xrc_call(*this, "ID_DOWNLOAD", &wxRadioButton::GetValue); bool start = xrc_call(*this, "ID_START", &wxCheckBox::GetValue); - if (!m_pServer) { + if (!server_) { wxMessageBoxEx(_("You need to specify a server."), _("Manual transfer"), wxICON_EXCLAMATION); return; } - wxString local_file = xrc_call(*this, "ID_LOCALFILE", &wxTextCtrl::GetValue); + std::wstring local_file = xrc_call(*this, "ID_LOCALFILE", &wxTextCtrl::GetValue).ToStdWstring(); if (local_file.empty()) { wxMessageBoxEx(_("You need to specify a local file."), _("Manual transfer"), wxICON_EXCLAMATION); return; @@ -314,20 +305,20 @@ return; } - wxString remote_file = xrc_call(*this, "ID_REMOTEFILE", &wxTextCtrl::GetValue); + std::wstring remote_file = xrc_call(*this, "ID_REMOTEFILE", &wxTextCtrl::GetValue).ToStdWstring(); if (remote_file.empty()) { wxMessageBoxEx(_("You need to specify a remote file."), _("Manual transfer"), wxICON_EXCLAMATION); return; } - wxString remote_path_str = xrc_call(*this, "ID_REMOTEPATH", &wxTextCtrl::GetValue); + std::wstring remote_path_str = xrc_call(*this, "ID_REMOTEPATH", &wxTextCtrl::GetValue).ToStdWstring(); if (remote_path_str.empty()) { wxMessageBoxEx(_("You need to specify a remote path."), _("Manual transfer"), wxICON_EXCLAMATION); return; } - CServerPath path(remote_path_str, m_pServer->GetType()); + CServerPath path(remote_path_str, server_.server.GetType()); if (path.empty()) { wxMessageBoxEx(_("Remote path could not be parsed."), _("Manual transfer"), wxICON_EXCLAMATION); return; @@ -336,14 +327,17 @@ int old_data_type = COptions::Get()->GetOptionVal(OPTION_ASCIIBINARY); // Set data type for the file to add - if (xrc_call(*this, "ID_TYPE_ASCII", &wxRadioButton::GetValue)) + if (xrc_call(*this, "ID_TYPE_ASCII", &wxRadioButton::GetValue)) { COptions::Get()->SetOption(OPTION_ASCIIBINARY, 1); - else if (xrc_call(*this, "ID_TYPE_BINARY", &wxRadioButton::GetValue)) + } + else if (xrc_call(*this, "ID_TYPE_BINARY", &wxRadioButton::GetValue)) { COptions::Get()->SetOption(OPTION_ASCIIBINARY, 2); - else + } + else { COptions::Get()->SetOption(OPTION_ASCIIBINARY, 0); + } - wxString name; + std::wstring name; CLocalPath localPath(local_file, &name); if (name.empty()) { @@ -353,8 +347,8 @@ m_pQueueView->QueueFile(!start, download, download ? remote_file : name, - (remote_file != name) ? (download ? name : remote_file) : wxString(), - localPath, path, *m_pServer, -1); + (remote_file != name) ? (download ? name : remote_file) : std::wstring(), + localPath, path, server_, -1); // Restore old data type COptions::Get()->SetOption(OPTION_ASCIIBINARY, old_data_type); @@ -366,62 +360,60 @@ bool CManualTransfer::UpdateServer() { - if (!xrc_call(*this, "ID_SERVER_CUSTOM", &wxRadioButton::GetValue)) + if (!xrc_call(*this, "ID_SERVER_CUSTOM", &wxRadioButton::GetValue)) { return true; + } - if (!VerifyServer()) + if (!VerifyServer()) { return false; - - CServer server; + } unsigned long port; if (!xrc_call(*this, "ID_PORT", &wxTextCtrl::GetValue).ToULong(&port)) { return false; } - wxString host = xrc_call(*this, "ID_HOST", &wxTextCtrl::GetValue); + server_ = ServerWithCredentials(); + + std::wstring host = xrc_call(*this, "ID_HOST", &wxTextCtrl::GetValue).ToStdWstring(); // SetHost does not accept URL syntax if (!host.empty() && host[0] == '[') { - host.RemoveLast(); - host = host.Mid(1); + host = host.substr(1, host.size() - 2); } - server.SetHost(host, port); - - const wxString& protocolName = xrc_call(*this, "ID_PROTOCOL", &wxChoice::GetStringSelection); - const enum ServerProtocol protocol = CServer::GetProtocolFromName(protocolName); - if (protocol != UNKNOWN) - server.SetProtocol(protocol); - else - server.SetProtocol(FTP); - - enum LogonType logon_type = CServer::GetLogonTypeFromName(xrc_call(*this, "ID_LOGONTYPE", &wxChoice::GetStringSelection)); - server.SetLogonType(logon_type); + server_.server.SetHost(host, port); - server.SetUser(xrc_call(*this, "ID_USER", &wxTextCtrl::GetValue), - xrc_call(*this, "ID_PASS", &wxTextCtrl::GetValue)); - server.SetAccount(xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::GetValue)); + std::wstring const protocolName = xrc_call(*this, "ID_PROTOCOL", &wxChoice::GetStringSelection).ToStdWstring(); + ServerProtocol const protocol = CServer::GetProtocolFromName(protocolName); + if (protocol != UNKNOWN) { + server_.server.SetProtocol(protocol); + } + else { + server_.server.SetProtocol(FTP); + } - delete m_pServer; - m_pServer = new CServer(server); + server_.SetLogonType(GetLogonTypeFromName(xrc_call(*this, "ID_LOGONTYPE", &wxChoice::GetStringSelection).ToStdWstring())); + server_.SetUser(xrc_call(*this, "ID_USER", &wxTextCtrl::GetValue).ToStdWstring()); + server_.credentials.SetPass(xrc_call(*this, "ID_PASS", &wxTextCtrl::GetValue).ToStdWstring()); + server_.credentials.account_ = xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::GetValue).ToStdWstring(); return true; } bool CManualTransfer::VerifyServer() { - const wxString& host = xrc_call(*this, "ID_HOST", &wxTextCtrl::GetValue); + std::wstring const host = xrc_call(*this, "ID_HOST", &wxTextCtrl::GetValue).ToStdWstring(); if (host.empty()) { xrc_call(*this, "ID_HOST", &wxTextCtrl::SetFocus); wxMessageBoxEx(_("You have to enter a hostname.")); return false; } - enum LogonType logon_type = CServer::GetLogonTypeFromName(xrc_call(*this, "ID_LOGONTYPE", &wxChoice::GetStringSelection)); + LogonType logon_type = GetLogonTypeFromName(xrc_call(*this, "ID_LOGONTYPE", &wxChoice::GetStringSelection).ToStdWstring()); - wxString protocolName = xrc_call(*this, "ID_PROTOCOL", &wxChoice::GetStringSelection); - enum ServerProtocol protocol = CServer::GetProtocolFromName(protocolName); + std::wstring protocolName = xrc_call(*this, "ID_PROTOCOL", &wxChoice::GetStringSelection).ToStdWstring(); + ServerProtocol protocol = CServer::GetProtocolFromName(protocolName); if (protocol == SFTP && - logon_type == ACCOUNT) + logon_type == LogonType::account) { xrc_call(*this, "ID_LOGONTYPE", &wxChoice::SetFocus); wxMessageBoxEx(_("'Account' logontype not supported by selected protocol")); @@ -429,51 +421,55 @@ } if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0 && - (logon_type == ACCOUNT || logon_type == NORMAL)) + (logon_type == LogonType::account || logon_type == LogonType::normal)) { xrc_call(*this, "ID_LOGONTYPE", &wxChoice::SetFocus); wxString msg; - if (COptions::Get()->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE)) + if (COptions::Get()->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE) && COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0) { msg = _("Saving of password has been disabled by your system administrator."); - else + } + else { msg = _("Saving of passwords has been disabled by you."); + } msg += _T("\n"); msg += _("'Normal' and 'Account' logontypes are not available, using 'Ask for password' instead."); - xrc_call(*this, "ID_LOGONTYPE", &wxChoice::SetStringSelection, CServer::GetNameFromLogonType(ASK)); + xrc_call(*this, "ID_LOGONTYPE", &wxChoice::SetStringSelection, GetNameFromLogonType(LogonType::ask)); xrc_call(*this, "ID_PASS", &wxTextCtrl::ChangeValue, _T("")); - logon_type = ASK; + logon_type = LogonType::ask; wxMessageBoxEx(msg, _("Cannot remember password"), wxICON_INFORMATION, this); } - CServer server; + ServerWithCredentials server; // Set selected type server.SetLogonType(logon_type); - if (protocol != UNKNOWN) - server.SetProtocol(protocol); + if (protocol != UNKNOWN) { + server.server.SetProtocol(protocol); + } CServerPath path; - wxString error; - if (!server.ParseUrl(host, xrc_call(*this, "ID_PORT", &wxTextCtrl::GetValue), wxString(), wxString(), error, path)) { + std::wstring error; + if (!server.ParseUrl(host, xrc_call(*this, "ID_PORT", &wxTextCtrl::GetValue).ToStdWstring(), std::wstring(), std::wstring(), error, path, protocol)) { xrc_call(*this, "ID_HOST", &wxTextCtrl::SetFocus); wxMessageBoxEx(error); return false; } - xrc_call(*this, "ID_HOST", &wxTextCtrl::ChangeValue, server.FormatHost(true)); - xrc_call(*this, "ID_PORT", &wxTextCtrl::ChangeValue, wxString::Format(_T("%d"), server.GetPort())); + xrc_call(*this, "ID_HOST", &wxTextCtrl::ChangeValue, server.Format(ServerFormat::host_only)); + xrc_call(*this, "ID_PORT", &wxTextCtrl::ChangeValue, wxString::Format(_T("%d"), server.server.GetPort())); - protocolName = CServer::GetProtocolName(server.GetProtocol()); - if (protocolName.empty()) + protocolName = CServer::GetProtocolName(server.server.GetProtocol()); + if (protocolName.empty()) { CServer::GetProtocolName(FTP); + } xrc_call(*this, "ID_PROTOCOL", &wxChoice::SetStringSelection, protocolName); // Require username for non-anonymous, non-ask logon type const wxString user = xrc_call(*this, "ID_USER", &wxTextCtrl::GetValue); - if (logon_type != ANONYMOUS && - logon_type != ASK && - logon_type != INTERACTIVE && + if (logon_type != LogonType::anonymous && + logon_type != LogonType::ask && + logon_type != LogonType::interactive && user.empty()) { xrc_call(*this, "ID_USER", &wxTextCtrl::SetFocus); @@ -499,7 +495,7 @@ } // Require account for account logon type - if (logon_type == ACCOUNT && + if (logon_type == LogonType::account && xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::GetValue).empty()) { xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::SetFocus); @@ -520,16 +516,15 @@ void CManualTransfer::OnSelectedSite(wxCommandEvent& event) { - std::unique_ptr pData = CSiteManager::GetSiteById(event.GetId()); - if (!pData) + std::unique_ptr pData = CSiteManager::GetSiteById(event.GetId()); + if (!pData) { return; + } - delete m_pServer; - m_pServer = new CServer(pData->m_server); - delete m_pLastSite; - m_pLastSite = new CServer(pData->m_server); + server_ = pData->server_; + lastSite_ = pData->server_; - xrc_call(*this, "ID_SERVER_SITE_SERVER", &wxStaticText::SetLabel, m_pServer->GetName()); + xrc_call(*this, "ID_SERVER_SITE_SERVER", &wxStaticText::SetLabel, server_.server.GetName()); DisplayServer(); } diff -Nru filezilla-3.15.0.2/src/interface/manual_transfer.h filezilla-3.33.0/src/interface/manual_transfer.h --- filezilla-3.15.0.2/src/interface/manual_transfer.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/manual_transfer.h 2017-06-02 20:38:13.000000000 +0000 @@ -1,15 +1,15 @@ -#ifndef __MANUAL_TRANSFER_H__ -#define __MANUAL_TRANSFER_H__ +#ifndef FILEZILLA_INTERFACE_MANUAL_TRANSFER_HEADER +#define FILEZILLA_INTERFACE_MANUAL_TRANSFER_HEADER #include "dialogex.h" +#include "serverdata.h" class CQueueView; class CState; -class CManualTransfer : public wxDialogEx +class CManualTransfer final : public wxDialogEx { public: CManualTransfer(CQueueView* pQueueView); - virtual ~CManualTransfer(); void Run(wxWindow* pParent, CState* pState); @@ -24,8 +24,8 @@ bool m_local_file_exists; - CServer *m_pServer; - CServer* m_pLastSite; + ServerWithCredentials server_; + ServerWithCredentials lastSite_; CState* m_pState; CQueueView* m_pQueueView; @@ -42,4 +42,4 @@ void OnLogontypeSelChanged(wxCommandEvent& event); }; -#endif //__MANUAL_TRANSFER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/menu_bar.cpp filezilla-3.33.0/src/interface/menu_bar.cpp --- filezilla-3.15.0.2/src/interface/menu_bar.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/menu_bar.cpp 2018-05-01 03:30:04.000000000 +0000 @@ -9,6 +9,10 @@ #include "sitemanager.h" #include "state.h" +#if USE_MAC_SANDBOX +#include "osx_sandbox_userdirs.h" +#endif + IMPLEMENT_DYNAMIC_CLASS(CMenuBar, wxMenuBar) BEGIN_EVENT_TABLE(CMenuBar, wxMenuBar) @@ -16,8 +20,7 @@ END_EVENT_TABLE() CMenuBar::CMenuBar() - : CStateEventHandler(0) - , m_pMainFrame() + : m_pMainFrame() { } @@ -34,42 +37,150 @@ CMenuBar* CMenuBar::Load(CMainFrame* pMainFrame) { - CMenuBar* menubar = wxDynamicCast(wxXmlResource::Get()->LoadMenuBar(_T("ID_MENUBAR")), CMenuBar); - if (!menubar) - return 0; - + CMenuBar* menubar = new CMenuBar(); menubar->m_pMainFrame = pMainFrame; + wxMenu* file = new wxMenu; + menubar->Append(file, _("&File")); -#if FZ_MANUALUPDATECHECK - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_DISABLEUPDATECHECK)) + wxAcceleratorEntry accel; + + accel.FromString(L"CTRL+S"); + file->Append(XRCID("ID_MENU_FILE_SITEMANAGER"), _("&Site Manager..."), _("Opens the Site Manager"))->SetAccel(&accel); + file->Append(XRCID("ID_MENU_FILE_COPYSITEMANAGER"), _("&Copy current connection to Site Manager...")); + file->AppendSeparator(); + accel.FromString(L"CTRL+T"); + file->Append(XRCID("ID_MENU_FILE_NEWTAB"), _("New &tab"), _("Opens a new tab"))->SetAccel(&accel); + accel.FromString(L"CTRL+W"); + file->Append(XRCID("ID_MENU_FILE_CLOSETAB"), _("Cl&ose tab"), _("Closes current tab"))->SetAccel(&accel); + file->AppendSeparator(); + file->Append(XRCID("ID_EXPORT"), _("&Export...")); + file->Append(XRCID("ID_IMPORT"), _("&Import...")); + file->AppendSeparator(); + accel.FromString(L"CTRL+E"); + file->Append(XRCID("ID_MENU_FILE_EDITED"), _("S&how files currently being edited..."))->SetAccel(&accel); + file->AppendSeparator(); + accel.FromString(L"CTRL+Q"); + file->Append(XRCID("wxID_EXIT"), _("E&xit"), _("Close FileZilla"))->SetAccel(&accel); + + + wxMenu* edit = new wxMenu; + menubar->Append(edit, _("&Edit")); + edit->Append(XRCID("ID_MENU_EDIT_NETCONFWIZARD"), _("&Network configuration wizard...")); + edit->Append(XRCID("ID_MENU_EDIT_CLEARPRIVATEDATA"), _("&Clear private data...")); + edit->AppendSeparator(); + edit->Append(XRCID("wxID_PREFERENCES"), _("&Settings..."), _("Open the settings dialog of FileZilla")); +#ifdef FZ_MAC + edit->Append(XRCID("ID_MENU_EDIT_SANDBOX_DIRECTORIES"), _("&Directory access permissions..."), _("Open the directory access permissions dialog to configure the local directories FileZilla has access to.")); #endif - { - wxMenu *helpMenu; - wxMenuItem* pUpdateItem = menubar->FindItem(XRCID("ID_CHECKFORUPDATES"), &helpMenu); - if (pUpdateItem) - { - // Get rid of separator - unsigned int count = helpMenu->GetMenuItemCount(); - for (unsigned int i = 0; i < count - 1; i++) - { - if (helpMenu->FindItemByPosition(i) == pUpdateItem) - { - helpMenu->Delete(helpMenu->FindItemByPosition(i + 1)); - break; - } - } + wxMenu* view = new wxMenu; + menubar->Append(view, _("&View")); + accel.FromString(L"F5"); + view->Append(XRCID("ID_REFRESH"), _("&Refresh"))->SetAccel(&accel); + view->AppendSeparator(); + accel.FromString(L"Ctrl+I"); + view->Append(XRCID("ID_MENU_VIEW_FILTERS"), _("Directory listing &filters..."))->SetAccel(&accel); + + wxMenu * comparison = new wxMenu; + view->AppendSubMenu(comparison, _("&Directory comparison")); + + accel.FromString(L"CTRL+O"); + comparison->Append(XRCID("ID_TOOLBAR_COMPARISON"), _("&Enable"), L"", wxITEM_CHECK)->SetAccel(&accel); + comparison->AppendSeparator(); + comparison->Append(XRCID("ID_COMPARE_SIZE"), _("Compare file&size"), L"", wxITEM_RADIO); + comparison->Append(XRCID("ID_COMPARE_DATE"), _("Compare &modification time"), L"", wxITEM_RADIO); + comparison->AppendSeparator(); + comparison->Append(XRCID("ID_COMPARE_HIDEIDENTICAL"), _("&Hide identical files"), L"", wxITEM_CHECK); + + accel.FromString(L"CTRL+Y"); + view->Append(XRCID("ID_TOOLBAR_SYNCHRONIZED_BROWSING"), _("S&ynchronized browsing"), L"", wxITEM_CHECK)->SetAccel(&accel); + view->Append(XRCID("ID_MENU_VIEW_FILELISTSTATUSBAR"), _("Filelist status &bars"), L"", wxITEM_CHECK); + view->AppendSeparator(); + view->Append(XRCID("ID_VIEW_TOOLBAR"), _("T&oolbar"), L"", wxITEM_CHECK); + view->Append(XRCID("ID_VIEW_QUICKCONNECT"), _("&Quickconnect bar"), L"", wxITEM_CHECK); + view->Append(XRCID("ID_VIEW_MESSAGELOG"), _("&Message log"), L"", wxITEM_CHECK); + view->Append(XRCID("ID_VIEW_LOCALTREE"), _("&Local directory tree"), L"", wxITEM_CHECK); + view->Append(XRCID("ID_VIEW_REMOTETREE"), _("R&emote directory tree"), L"", wxITEM_CHECK); + view->Append(XRCID("ID_VIEW_QUEUE"), _("&Transfer queue"), L"", wxITEM_CHECK); + + wxMenu * transfer = new wxMenu; + menubar->Append(transfer, _("&Transfer")); + + accel.FromString(L"CTRL+P"); + transfer->Append(XRCID("ID_MENU_TRANSFER_PROCESSQUEUE"), _("Process &Queue"), L"", wxITEM_CHECK)->SetAccel(&accel); + transfer->AppendSeparator(); + transfer->Append(XRCID("ID_MENU_TRANSFER_FILEEXISTS"), _("&Default file exists action...")); + + wxMenu * type = new wxMenu; + transfer->Append(XRCID("ID_MENU_TRANSFER_TYPE"), _("Transfer &type"), type); + + type->Append(XRCID("ID_MENU_TRANSFER_TYPE_AUTO"), _("&Auto"), L"", wxITEM_RADIO); + type->Append(XRCID("ID_MENU_TRANSFER_TYPE_ASCII"), _("A&SCII"), L"", wxITEM_RADIO); + type->Append(XRCID("ID_MENU_TRANSFER_TYPE_BINARY"), _("&Binary"), L"", wxITEM_RADIO); + accel.FromString(L"CTRL+U"); + + transfer->Append(XRCID("ID_MENU_TRANSFER_PRESERVETIMES"), _("&Preserve timestamps of transferred files"), L"", wxITEM_CHECK)->SetAccel(&accel); + + wxMenu * speed = new wxMenu; + transfer->AppendSubMenu(speed, _("&Speed limits")); + + speed->Append(XRCID("ID_MENU_TRANSFER_SPEEDLIMITS_ENABLE"), _("&Enable"), L"", wxITEM_CHECK); + speed->Append(XRCID("ID_MENU_TRANSFER_SPEEDLIMITS_CONFIGURE"), _("&Configure...")); + + transfer->AppendSeparator(); + accel.FromString(L"CTRL+M"); + transfer->Append(XRCID("ID_MENU_TRANSFER_MANUAL"), _("&Manual transfer..."))->SetAccel(&accel); + + wxMenu * server = new wxMenu; + menubar->Append(server, _("&Server")); + accel.FromString(L"CTRL+."); + server->Append(XRCID("ID_CANCEL"), _("C&ancel current operation"))->SetAccel(&accel); + server->AppendSeparator(); + accel.FromString(L"CTRL+R"); + server->Append(XRCID("ID_MENU_SERVER_RECONNECT"), _("&Reconnect"))->SetAccel(&accel); + accel.FromString(L"CTRL+D"); + server->Append(XRCID("ID_MENU_SERVER_DISCONNECT"), _("&Disconnect"))->SetAccel(&accel); + server->AppendSeparator(); + accel.FromString(L"F3"); + server->Append(XRCID("ID_MENU_SERVER_SEARCH"), _("&Search remote files..."), _("Search server for files"))->SetAccel(&accel); + server->Append(XRCID("ID_MENU_SERVER_CMD"), _("Enter &custom command..."), _("Send custom command to the server otherwise not available")); + server->Append(XRCID("ID_MENU_SERVER_VIEWHIDDEN"), _("Force showing &hidden files"), L"", wxITEM_CHECK); + + wxMenu * bookmarks = new wxMenu; + menubar->Append(bookmarks, _("&Bookmarks")); + + accel.FromString(L"CTRL+B"); + bookmarks->Append(XRCID("ID_BOOKMARK_ADD"), _("&Add bookmark..."))->SetAccel(&accel); + accel.FromString(L"CTRL+SHIFT+B"); + bookmarks->Append(XRCID("ID_BOOKMARK_MANAGE"), _("&Manage bookmarks..."))->SetAccel(&accel); + + wxMenu * help = new wxMenu; +#ifdef FZ_MAC + menubar->Append(help, _("?")); +#else + menubar->Append(help, _("&Help")); +#endif - helpMenu->Delete(pUpdateItem); - } +#if FZ_MANUALUPDATECHECK + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_DISABLEUPDATECHECK) == 0) { + help->Append(XRCID("ID_CHECKFORUPDATES"), _("Check for &updates..."), _("Check for newer versions of FileZilla")); + help->AppendSeparator(); } +#endif + help->Append(XRCID("ID_MENU_HELP_WELCOME"), _("Show &welcome dialog...")); + help->Append(XRCID("ID_MENU_HELP_GETTINGHELP"), _("&Getting help...")); + help->Append(XRCID("ID_MENU_HELP_BUGREPORT"), _("&Report a bug...")); - if (COptions::Get()->GetOptionVal(OPTION_DEBUG_MENU)) - { +#ifndef FZ_MAC + help->Append(XRCID("wxID_ABOUT"), _("&About..."), _("Display about dialog")); +#endif + + if (COptions::Get()->GetOptionVal(OPTION_DEBUG_MENU)) { wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_DEBUG")); - if (pMenu) + if (pMenu) { menubar->Append(pMenu, _("&Debug")); + } } menubar->UpdateBookmarkMenu(); @@ -77,10 +188,12 @@ menubar->Check(XRCID("ID_MENU_SERVER_VIEWHIDDEN"), COptions::Get()->GetOptionVal(OPTION_VIEW_HIDDEN_FILES) ? true : false); int mode = COptions::Get()->GetOptionVal(OPTION_COMPARISONMODE); - if (mode != 1) + if (mode != 1) { menubar->Check(XRCID("ID_COMPARE_SIZE"), true); - else + } + else { menubar->Check(XRCID("ID_COMPARE_DATE"), true); + } menubar->Check(XRCID("ID_COMPARE_HIDEIDENTICAL"), COptions::Get()->GetOptionVal(OPTION_COMPARE_HIDEIDENTICAL) != 0); menubar->Check(XRCID("ID_VIEW_QUICKCONNECT"), COptions::Get()->GetOptionVal(OPTION_SHOW_QUICKCONNECT) != 0); @@ -122,6 +235,8 @@ CContextManager::Get()->RegisterHandler(menubar, STATECHANGE_QUEUEPROCESSING, false); CContextManager::Get()->RegisterHandler(menubar, STATECHANGE_CHANGEDCONTEXT, false); + CContextManager::Get()->RegisterHandler(menubar, STATECHANGE_GLOBALBOOKMARKS, false); + menubar->RegisterOption(OPTION_ASCIIBINARY); menubar->RegisterOption(OPTION_PRESERVE_TIMESTAMPS); @@ -137,148 +252,164 @@ menubar->RegisterOption(OPTION_SPEEDLIMIT_INBOUND); menubar->RegisterOption(OPTION_SPEEDLIMIT_OUTBOUND); +#ifdef FZ_MAC + wxMenu* editMenu = nullptr; + wxMenuItem* dirsItem = menubar->FindItem(XRCID("ID_MENU_EDIT_SANDBOX_DIRECTORIES"), &editMenu); + if (editMenu && dirsItem) { +#if USE_MAC_SANDBOX + editMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, [pMainFrame](wxCommandEvent&) + { + OSXSandboxUserdirsDialog dlg; + dlg.Run(pMainFrame); + }, XRCID("ID_MENU_EDIT_SANDBOX_DIRECTORIES")); +#else + editMenu->Delete(dirsItem); +#endif + } +#endif + return menubar; } void CMenuBar::UpdateBookmarkMenu() { wxMenu* pMenu; - if (!FindItem(XRCID("ID_BOOKMARK_ADD"), &pMenu)) + if (!FindItem(XRCID("ID_BOOKMARK_ADD"), &pMenu)) { return; + } // Delete old bookmarks - for (std::map::const_iterator iter = m_bookmark_menu_id_map_global.begin(); iter != m_bookmark_menu_id_map_global.end(); ++iter) - { + for (std::map::const_iterator iter = m_bookmark_menu_id_map_global.begin(); iter != m_bookmark_menu_id_map_global.end(); ++iter) { pMenu->Delete(iter->first); } m_bookmark_menu_id_map_global.clear(); - for (std::map::const_iterator iter = m_bookmark_menu_id_map_site.begin(); iter != m_bookmark_menu_id_map_site.end(); ++iter) - { + for (std::map::const_iterator iter = m_bookmark_menu_id_map_site.begin(); iter != m_bookmark_menu_id_map_site.end(); ++iter) { pMenu->Delete(iter->first); } m_bookmark_menu_id_map_site.clear(); // Delete the separators - while (pMenu->GetMenuItemCount() > 2) - { + while (pMenu->GetMenuItemCount() > 2) { wxMenuItem* pSeparator = pMenu->FindItemByPosition(2); - if (pSeparator) + if (pSeparator) { pMenu->Delete(pSeparator); + } } auto ids = m_bookmark_menu_ids.begin(); // Insert global bookmarks - std::list global_bookmarks; - if (CBookmarksDialog::GetBookmarks(global_bookmarks) && !global_bookmarks.empty()) - { + std::vector global_bookmarks; + if (CBookmarksDialog::GetGlobalBookmarks(global_bookmarks) && !global_bookmarks.empty()) { pMenu->AppendSeparator(); - for (std::list::const_iterator iter = global_bookmarks.begin(); iter != global_bookmarks.end(); ++iter) - { + for (auto const& bookmark : global_bookmarks) { int id; - if (ids == m_bookmark_menu_ids.end()) - { + if (ids == m_bookmark_menu_ids.end()) { id = wxNewId(); m_bookmark_menu_ids.push_back(id); + ids = m_bookmark_menu_ids.end(); } - else - { + else { id = *ids; ++ids; } - wxString name(*iter); + wxString name(bookmark); name.Replace(_T("&"), _T("&&")); pMenu->Append(id, name); - m_bookmark_menu_id_map_global[id] = *iter; + m_bookmark_menu_id_map_global[id] = bookmark; } } // Insert site-specific bookmarks CContextControl* pContextControl = m_pMainFrame ? m_pMainFrame->GetContextControl() : 0; CContextControl::_context_controls* controls = pContextControl ? pContextControl->GetCurrentControls() : 0; - if (!controls) + CState* pState = controls ? controls->pState : 0; + if (!pState) { return; + } - if (!controls->site_bookmarks || controls->site_bookmarks->bookmarks.empty()) + Site site = pState->GetSite(); + if (!site.server_) { + site = pState->GetLastSite(); + } + if (site.m_bookmarks.empty()) { return; + } pMenu->AppendSeparator(); - for (std::list::const_iterator iter = controls->site_bookmarks->bookmarks.begin(); iter != controls->site_bookmarks->bookmarks.end(); ++iter) - { + for (auto const& bookmark : site.m_bookmarks) { int id; - if (ids == m_bookmark_menu_ids.end()) - { + if (ids == m_bookmark_menu_ids.end()) { id = wxNewId(); m_bookmark_menu_ids.push_back(id); + ids = m_bookmark_menu_ids.end(); } - else - { + else { id = *ids; ++ids; } - wxString name(*iter); + wxString name(bookmark.m_name); name.Replace(_T("&"), _T("&&")); pMenu->Append(id, name); - m_bookmark_menu_id_map_site[id] = *iter; + m_bookmark_menu_id_map_site[id] = bookmark.m_name; } } -void CMenuBar::ClearBookmarks() -{ - CContextControl* pContextControl = m_pMainFrame ? m_pMainFrame->GetContextControl() : 0; - CContextControl::_context_controls* controls = pContextControl ? pContextControl->GetCurrentControls() : 0; - - if (controls && !controls->site_bookmarks) - controls->site_bookmarks = std::make_shared(); - UpdateBookmarkMenu(); -} - void CMenuBar::OnMenuEvent(wxCommandEvent& event) { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return; + } std::map::const_iterator iter = m_bookmark_menu_id_map_site.find(event.GetId()); if (iter != m_bookmark_menu_id_map_site.end()) { // We hit a site-specific bookmark CContextControl* pContextControl = m_pMainFrame ? m_pMainFrame->GetContextControl() : 0; CContextControl::_context_controls* controls = pContextControl ? pContextControl->GetCurrentControls() : 0; - if (!controls) - return; - if (controls->site_bookmarks->path.empty()) + CState* pState = controls ? controls->pState : 0; + if (!pState) return; - wxString name = iter->second; - name.Replace(_T("\\"), _T("\\\\")); - name.Replace(_T("/"), _T("\\/")); - name = controls->site_bookmarks->path + _T("/") + name; + Site site = pState->GetSite(); + if (!site.server_) { + site = pState->GetLastSite(); + } - std::unique_ptr pData = CSiteManager::GetSiteByPath(name); - if (!pData) - return; - pState->SetSyncBrowse(false); - if (!pData->m_remoteDir.empty() && pState->IsRemoteIdle(true)) { - const CServer* pServer = pState->GetServer(); - if (!pServer || *pServer != pData->m_server) { - m_pMainFrame->ConnectToSite(*pData); - pData->m_localDir.clear(); // So not to set again below - } - else - pState->ChangeRemoteDir(pData->m_remoteDir); - } - if (!pData->m_localDir.empty()) { - bool set = pState->SetLocalDir(pData->m_localDir); + for (auto const& bookmark : site.m_bookmarks) { + if (bookmark.m_name == iter->second) { + + pState->SetSyncBrowse(false); + if (!bookmark.m_remoteDir.empty() && pState->IsRemoteIdle(true)) { + ServerWithCredentials const& server = pState->GetServer(); + if (!server || server != site.server_) { + m_pMainFrame->ConnectToSite(site, bookmark); + break; + } + else { + pState->ChangeRemoteDir(bookmark.m_remoteDir, std::wstring(), 0, false, bookmark.m_comparison); + } + } + if (!bookmark.m_localDir.empty()) { + bool set = pState->SetLocalDir(bookmark.m_localDir.ToStdWstring()); - if (set && pData->m_sync) { - wxASSERT(!pData->m_remoteDir.empty()); - pState->SetSyncBrowse(true, pData->m_remoteDir); + if (set && bookmark.m_sync) { + wxASSERT(!bookmark.m_remoteDir.empty()); + pState->SetSyncBrowse(true, bookmark.m_remoteDir); + } + } + + if (bookmark.m_comparison && pState->GetComparisonManager()) { + pState->GetComparisonManager()->CompareListings(); + } + + break; } } @@ -292,23 +423,24 @@ CServerPath remote_dir; bool sync; bool comparison; - if (!CBookmarksDialog::GetBookmark(iter2->second, local_dir, remote_dir, sync, comparison)) + if (!CBookmarksDialog::GetBookmark(iter2->second, local_dir, remote_dir, sync, comparison)) { return; + } pState->SetSyncBrowse(false); if (!remote_dir.empty() && pState->IsRemoteIdle(true)) { - const CServer* pServer = pState->GetServer(); - if (pServer) { + ServerWithCredentials const& server = pState->GetServer(); + if (server) { CServerPath current_remote_path = pState->GetRemotePath(); if (!current_remote_path.empty() && current_remote_path.GetType() != remote_dir.GetType()) { wxMessageBoxEx(_("Selected global bookmark and current server use a different server type.\nUse site-specific bookmarks for this server."), _("Bookmark"), wxICON_EXCLAMATION, this); return; } - pState->ChangeRemoteDir(remote_dir); + pState->ChangeRemoteDir(remote_dir, _T(""), 0, false, comparison); } } if (!local_dir.empty()) { - bool set = pState->SetLocalDir(local_dir); + bool set = pState->SetLocalDir(local_dir.ToStdWstring()); if (set && sync) { wxASSERT(!remote_dir.empty()); @@ -316,7 +448,7 @@ } } - if (comparison) { + if (comparison && pState->GetComparisonManager()) { pState->GetComparisonManager()->CompareListings(); } @@ -326,7 +458,7 @@ event.Skip(); } -void CMenuBar::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*) +void CMenuBar::OnStateChange(CState* pState, t_statechange_notifications notification, const wxString&, const void*) { switch (notification) { @@ -334,9 +466,13 @@ UpdateMenubarState(); UpdateBookmarkMenu(); break; + case STATECHANGE_GLOBALBOOKMARKS: + UpdateBookmarkMenu(); + break; case STATECHANGE_SERVER: case STATECHANGE_REMOTE_IDLE: UpdateMenubarState(); + UpdateBookmarkMenu(); break; case STATECHANGE_QUEUEPROCESSING: { @@ -436,49 +572,42 @@ void CMenuBar::UpdateMenubarState() { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return; + } - const CServer* const pServer = pState->GetServer(); + ServerWithCredentials const& server = pState->GetServer(); const bool idle = pState->IsRemoteIdle(); - Enable(XRCID("ID_MENU_SERVER_DISCONNECT"), pServer && idle); - Enable(XRCID("ID_CANCEL"), pServer && !idle); - Enable(XRCID("ID_MENU_SERVER_CMD"), pServer && idle); - Enable(XRCID("ID_MENU_FILE_COPYSITEMANAGER"), pServer != 0); - Enable(XRCID("ID_TOOLBAR_SYNCHRONIZED_BROWSING"), pServer != 0); - Enable(XRCID("ID_MENU_SERVER_SEARCH"), pServer && idle); + Enable(XRCID("ID_MENU_SERVER_DISCONNECT"), server && idle); + Enable(XRCID("ID_CANCEL"), server && !idle); + Enable(XRCID("ID_MENU_SERVER_CMD"), server && idle); + Enable(XRCID("ID_MENU_FILE_COPYSITEMANAGER"), server.operator bool()); + Enable(XRCID("ID_TOOLBAR_SYNCHRONIZED_BROWSING"), server.operator bool()); Check(XRCID("ID_TOOLBAR_COMPARISON"), pState->GetComparisonManager()->IsComparing()); Check(XRCID("ID_TOOLBAR_SYNCHRONIZED_BROWSING"), pState->GetSyncBrowse()); bool canReconnect; - if (pServer || !idle) + if (server || !idle) canReconnect = false; else { - CServer tmp; - canReconnect = !pState->GetLastServer().GetHost().empty(); + canReconnect = static_cast(pState->GetLastSite().server_); } Enable(XRCID("ID_MENU_SERVER_RECONNECT"), canReconnect); - wxMenuItem* pItem = FindItem(XRCID("ID_MENU_TRANSFER_TYPE")); - if (!pServer || CServer::ProtocolHasDataTypeConcept(pServer->GetProtocol())) { - pItem->Enable(true); - } - else - pItem->Enable(false); + Enable(XRCID("ID_MENU_TRANSFER_TYPE"), !server || CServer::ProtocolHasFeature(server.server.GetProtocol(), ProtocolFeature::DataTypeConcept)); + Enable(XRCID("ID_MENU_TRANSFER_PRESERVETIMES"), !server || CServer::ProtocolHasFeature(server.server.GetProtocol(), ProtocolFeature::PreserveTimestamp)); + Enable(XRCID("ID_MENU_SERVER_CMD"), !server || CServer::ProtocolHasFeature(server.server.GetProtocol(), ProtocolFeature::EnterCommand)); } bool CMenuBar::ShowItem(int id) { - for (auto menu_iter = m_hidden_items.begin(); menu_iter != m_hidden_items.end(); ++menu_iter) - { + for (auto menu_iter = m_hidden_items.begin(); menu_iter != m_hidden_items.end(); ++menu_iter) { int offset = 0; - for (auto iter = menu_iter->second.begin(); iter != menu_iter->second.end(); ++iter) - { - if (iter->second->GetId() != id) - { + for (auto iter = menu_iter->second.begin(); iter != menu_iter->second.end(); ++iter) { + if (iter->second->GetId() != id) { offset++; continue; } @@ -510,8 +639,7 @@ auto menu_iter = m_hidden_items.insert(std::make_pair(pMenu, std::map())).first; - for (auto iter = menu_iter->second.begin(); iter != menu_iter->second.end(); ++iter) - { + for (auto iter = menu_iter->second.begin(); iter != menu_iter->second.end(); ++iter) { if (iter->first > (int)pos) break; diff -Nru filezilla-3.15.0.2/src/interface/menu_bar.h filezilla-3.33.0/src/interface/menu_bar.h --- filezilla-3.15.0.2/src/interface/menu_bar.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/menu_bar.h 2018-05-01 03:30:04.000000000 +0000 @@ -1,11 +1,11 @@ -#ifndef __MENU_BAR_H__ -#define __MENU_BAR_H__ +#ifndef FILEZILLA_INTERFACE_MENU_BAR_HEADER +#define FILEZILLA_INTERFACE_MENU_BAR_HEADER #include #include "state.h" class CMainFrame; -class CMenuBar : public wxMenuBar, public CStateEventHandler, public COptionChangeEventHandler +class CMenuBar final : public wxMenuBar, public CGlobalStateEventHandler, public COptionChangeEventHandler { public: CMenuBar(); @@ -17,9 +17,8 @@ bool HideItem(int id); void UpdateBookmarkMenu(); - void ClearBookmarks(); - std::list m_bookmark_menu_ids; + std::vector m_bookmark_menu_ids; std::map m_bookmark_menu_id_map_global; std::map m_bookmark_menu_id_map_site; @@ -29,7 +28,7 @@ void UpdateSpeedLimitMenuItem(); - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2); + virtual void OnStateChange(CState* pState, t_statechange_notifications notification, const wxString& data, const void* data2); virtual void OnOptionsChanged(changed_options_t const& options); DECLARE_DYNAMIC_CLASS(CMenuBar) @@ -40,4 +39,4 @@ std::map > m_hidden_items; }; -#endif //__MENU_BAR_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/msgbox.cpp filezilla-3.33.0/src/interface/msgbox.cpp --- filezilla-3.15.0.2/src/interface/msgbox.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/msgbox.cpp 2016-11-08 16:14:00.000000000 +0000 @@ -0,0 +1,22 @@ +#include "filezilla.h" +#include "msgbox.h" + +namespace { +int openMessageBoxes = 0; +} + +bool IsShowingMessageBox() +{ + return openMessageBoxes != 0; +} + +int wxMessageBoxEx(const wxString& message, const wxString& caption + , long style, wxWindow *parent + , int x, int y) +{ + ++openMessageBoxes; + int ret = wxMessageBox(message, caption, style, parent, x, y); + --openMessageBoxes; + + return ret; +} diff -Nru filezilla-3.15.0.2/src/interface/msgbox.h filezilla-3.33.0/src/interface/msgbox.h --- filezilla-3.15.0.2/src/interface/msgbox.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/msgbox.h 2017-09-26 03:30:02.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef FILEZILLA_MSGBOX_HEADER +#define FILEZILLA_MSGBOX_HEADER + +#include + +bool IsShowingMessageBox(); + +int wxMessageBoxEx(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr + , long style = wxOK | wxCENTRE, wxWindow *parent = nullptr + , int x = wxDefaultCoord, int y = wxDefaultCoord); + +#endif diff -Nru filezilla-3.15.0.2/src/interface/netconfwizard.cpp filezilla-3.33.0/src/interface/netconfwizard.cpp --- filezilla-3.15.0.2/src/interface/netconfwizard.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/interface/netconfwizard.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -24,17 +24,15 @@ // Mark some strings used by wx as translatable #if 0 -TRANSLATE_T("&Next >"); -TRANSLATE_T("< &Back"); +fztranslate_mark("&Next >"); +fztranslate_mark("< &Back"); #endif CNetConfWizard::CNetConfWizard(wxWindow* parent, COptions* pOptions, CFileZillaEngineContext & engine_context) : fz::event_handler(engine_context.GetEventLoop()) + , engine_context_(engine_context) , m_parent(parent), m_pOptions(pOptions), m_pSocketServer(0) { - m_pIPResolver = 0; - m_pSendBuffer = 0; - m_timer.SetOwner(this); ResetTest(); @@ -48,6 +46,7 @@ delete m_pIPResolver; delete [] m_pSendBuffer; delete m_pSocketServer; + delete m_pDataSocket; } bool CNetConfWizard::Load() @@ -57,8 +56,7 @@ wxSize minPageSize = GetPageAreaSizer()->GetMinSize(); - for (int i = 1; i <= 7; i++) - { + for (int i = 1; i <= 7; ++i) { wxWizardPageSimple* page = new wxWizardPageSimple(); bool res = wxXmlResource::Get()->LoadPanel(page, this, wxString::Format(_T("NETCONF_PANEL%d"), i)); if (!res) @@ -192,8 +190,10 @@ } } else if (event.GetPage() == m_pages[5] && !event.GetDirection()) { - wxButton* pNext = wxDynamicCast(FindWindow(wxID_FORWARD), wxButton); - pNext->SetLabel(m_nextLabelText); + auto pNext = dynamic_cast(FindWindow(wxID_FORWARD)); + if (pNext) { + pNext->SetLabel(m_nextLabelText); + } } else if (event.GetPage() == m_pages[5] && event.GetDirection()) { if (m_testDidRun) @@ -201,19 +201,23 @@ m_testDidRun = true; - wxButton* pNext = wxDynamicCast(FindWindow(wxID_FORWARD), wxButton); - pNext->Disable(); - wxButton* pPrev = wxDynamicCast(FindWindow(wxID_BACKWARD), wxButton); - pPrev->Disable(); + auto pNext = dynamic_cast(FindWindow(wxID_FORWARD)); + if (pNext) { + pNext->Disable(); + } + auto pPrev = dynamic_cast(FindWindow(wxID_BACKWARD)); + if (pPrev) { + pPrev->Disable(); + } event.Veto(); PrintMessage(wxString::Format(_("Connecting to %s"), _T("probe.filezilla-project.org")), 0); - m_socket = new CSocket(this); + m_socket = new fz::socket(engine_context_.GetThreadPool(), this); m_recvBufferPos = 0; - int res = m_socket->Connect(_T("probe.filezilla-project.org"), 21); + int res = m_socket->connect(fzT("probe.filezilla-project.org"), 21); if (res && res != EINPROGRESS) { - PrintMessage(wxString::Format(_("Connect failed: %s"), CSocket::GetErrorDescription(res)), 1); + PrintMessage(wxString::Format(_("Connect failed: %s"), fz::socket::error_description(res)), 1); CloseSocket(); } } @@ -222,19 +226,25 @@ void CNetConfWizard::OnPageChanged(wxWizardEvent& event) { if (event.GetPage() == m_pages[5]) { - wxButton* pNext = wxDynamicCast(FindWindow(wxID_FORWARD), wxButton); - m_nextLabelText = pNext->GetLabel(); - pNext->SetLabel(_("&Test")); + auto pNext = dynamic_cast(FindWindow(wxID_FORWARD)); + if (pNext) { + m_nextLabelText = pNext->GetLabel(); + pNext->SetLabel(_("&Test")); + } } else if (event.GetPage() == m_pages[6]) { - wxButton* pPrev = wxDynamicCast(FindWindow(wxID_BACKWARD), wxButton); - pPrev->Disable(); - wxButton* pNext = wxDynamicCast(FindWindow(wxID_FORWARD), wxButton); - pNext->SetFocus(); + auto pPrev = dynamic_cast(FindWindow(wxID_BACKWARD)); + if (pPrev) { + pPrev->Disable(); + } + auto pNext = dynamic_cast(FindWindow(wxID_FORWARD)); + if (pNext) { + pNext->SetFocus(); + } } } -void CNetConfWizard::DoOnSocketEvent(CSocketEventSource* s, SocketEventType t, int error) +void CNetConfWizard::DoOnSocketEvent(fz::socket_event_source* s, fz::socket_event_flag t, int error) { if (s == m_socket) { if (error) { @@ -243,16 +253,16 @@ } switch (t) { - case SocketEventType::read: + case fz::socket_event_flag::read: OnReceive(); break; - case SocketEventType::write: + case fz::socket_event_flag::write: OnSend(); break; - case SocketEventType::close: + case fz::socket_event_flag::close: OnClose(); break; - case SocketEventType::connection: + case fz::socket_event_flag::connection: OnConnect(); break; default: @@ -266,11 +276,11 @@ return; } switch (t) { - case SocketEventType::close: + case fz::socket_event_flag::close: PrintMessage(_("Listen socket closed"), 1); CloseSocket(); break; - case SocketEventType::connection: + case fz::socket_event_flag::connection: OnAccept(); break; default: @@ -284,10 +294,10 @@ } switch (t) { - case SocketEventType::close: + case fz::socket_event_flag::close: OnDataClose(); break; - case SocketEventType::read: + case fz::socket_event_flag::read: OnDataReceive(); break; default: @@ -307,7 +317,7 @@ int error; int const len = strlen(m_pSendBuffer); - int const written = m_socket->Write(m_pSendBuffer, len, error); + int const written = m_socket->write(m_pSendBuffer, len, error); if (written < 0) { if (error != EAGAIN) { PrintMessage(_("Failed to send command."), 1); @@ -338,7 +348,7 @@ { while (true) { int error; - int const read = m_socket->Read(m_recvBuffer + m_recvBufferPos, NETCONFBUFFERSIZE - m_recvBufferPos, error); + int const read = m_socket->read(m_recvBuffer + m_recvBufferPos, NETCONFBUFFERSIZE - m_recvBufferPos, error); if (read < 0) { if (error != EAGAIN) { PrintMessage(_("Could not receive data from server."), 1); @@ -392,7 +402,7 @@ i = -1; } - if (m_recvBufferPos == 100) { + if (m_recvBufferPos == 200) { m_testResult = servererror; PrintMessage(_("Invalid data received"), 1); CloseSocket(); @@ -551,9 +561,11 @@ PrintMessage(_("Connection closed"), 0); - wxButton* pNext = wxDynamicCast(FindWindow(wxID_FORWARD), wxButton); - pNext->Enable(); - pNext->SetLabel(m_nextLabelText); + auto pNext = dynamic_cast(FindWindow(wxID_FORWARD)); + if (pNext) { + pNext->Enable(); + pNext->SetLabel(m_nextLabelText); + } wxString text[5]; if (!m_connectSuccessful) @@ -573,6 +585,7 @@ text[3] = _("See also: https://wiki.filezilla-project.org/Network_Configuration"); break; case successful: + PrintMessage(_("Test finished successfully"), 0); text[0] = _("Congratulations, your configuration seems to be working."); text[1] = _("You should have no problems connecting to other servers, file transfers should work properly."); text[2] = _("If you keep having problems with a specific server, the server itself or a remote router or firewall might be misconfigured. In this case try to toggle passive mode and contact the server administrator for help."); @@ -634,11 +647,13 @@ break; } } - for (unsigned int i = 0; i < 5; i++) - { + for (unsigned int i = 0; i < 5; ++i) { wxString name = wxString::Format(_T("ID_SUMMARY%d"), i + 1); int id = wxXmlResource::GetXRCID(name); - wxDynamicCast(FindWindowById(id, this), wxStaticText)->SetLabel(text[i]); + auto ctrl = dynamic_cast(FindWindowById(id, this)); + if (ctrl) { + ctrl->SetLabel(text[i]); + } } m_pages[6]->GetSizer()->Layout(); m_pages[6]->GetSizer()->Fit(m_pages[6]); @@ -692,9 +707,9 @@ int mode = XRCCTRL(*this, "ID_ACTIVEMODE1", wxRadioButton)->GetValue() ? 0 : (XRCCTRL(*this, "ID_ACTIVEMODE2", wxRadioButton)->GetValue() ? 1 : 2); if (!mode) { - ret = m_socket->GetLocalIP(); + ret = m_socket->local_ip(); if (ret.empty()) { - PrintMessage(_("Failed to retrieve local ip address. Aborting"), 1); + PrintMessage(_("Failed to retrieve local IP address, aborting."), 1); CloseSocket(); } } @@ -705,20 +720,21 @@ else if (mode == 2) { if (!m_pIPResolver) { wxTextCtrl* pResolver = XRCCTRL(*this, "ID_ACTIVERESOLVER", wxTextCtrl); - wxString address = pResolver->GetValue(); + std::wstring address = pResolver->GetValue().ToStdWstring(); PrintMessage(wxString::Format(_("Retrieving external IP address from %s"), address), 0); - m_pIPResolver = new CExternalIPResolver(*this); - m_pIPResolver->GetExternalIP(address, CSocket::ipv4, true); - if (!m_pIPResolver->Done()) + m_pIPResolver = new CExternalIPResolver(engine_context_.GetThreadPool(), *this); + m_pIPResolver->GetExternalIP(address, fz::address_type::ipv4, true); + if (!m_pIPResolver->Done()) { return wxString(); + } } if (m_pIPResolver->Successful()) { ret = m_pIPResolver->GetIP(); } else { - PrintMessage(_("Failed to retrieve external ip address, aborting"), 1); + PrintMessage(_("Failed to retrieve external IP address, aborting."), 1); m_testResult = externalfailed; CloseSocket(); @@ -732,14 +748,17 @@ void CNetConfWizard::OnExternalIPAddress2(wxCommandEvent&) { - if (!m_pIPResolver) + if (!m_pIPResolver) { return; + } - if (m_state != 3) + if (m_state != 3) { return; + } - if (!m_pIPResolver->Done()) + if (!m_pIPResolver->Done()) { return; + } SendNextCommand(); } @@ -760,8 +779,9 @@ { PrintMessage(_("Checking for correct external IP address"), 0); wxString ip = GetExternalIPAddress(); - if (ip.empty()) + if (ip.empty()) { return; + } if (!fz::get_ipv6_long_form(ip.ToStdWstring()).empty()) { PrintMessage(_("You appear to be using an IPv6-only host. This wizard does not support this environment."), 1); CloseSocket(); @@ -789,7 +809,7 @@ int port = CreateListenSocket(); if (!port) { - PrintMessage(_("Failed to create listen socket, aborting"), 1); + PrintMessage(wxString::Format(_("Failed to create listen socket on port %d, aborting."), port), 1); CloseSocket(); return; } @@ -825,8 +845,9 @@ void CNetConfWizard::ResetTest() { - if (m_timer.IsRunning()) + if (m_timer.IsRunning()) { m_timer.Stop(); + } m_state = 0; m_connectSuccessful = false; @@ -863,8 +884,8 @@ XRCCTRL(*this, "ID_ACTIVE_PORTMIN", wxTextCtrl)->GetValue().ToLong(&tmp); m_pOptions->SetOption(OPTION_LIMITPORTS_LOW, tmp); XRCCTRL(*this, "ID_ACTIVE_PORTMAX", wxTextCtrl)->GetValue().ToLong(&tmp); m_pOptions->SetOption(OPTION_LIMITPORTS_HIGH, tmp); - m_pOptions->SetOption(OPTION_EXTERNALIP, XRCCTRL(*this, "ID_ACTIVEIP", wxTextCtrl)->GetValue()); - m_pOptions->SetOption(OPTION_EXTERNALIPRESOLVER, XRCCTRL(*this, "ID_ACTIVERESOLVER", wxTextCtrl)->GetValue()); + m_pOptions->SetOption(OPTION_EXTERNALIP, XRCCTRL(*this, "ID_ACTIVEIP", wxTextCtrl)->GetValue().ToStdWstring()); + m_pOptions->SetOption(OPTION_EXTERNALIPRESOLVER, XRCCTRL(*this, "ID_ACTIVERESOLVER", wxTextCtrl)->GetValue().ToStdWstring()); m_pOptions->SetOption(OPTION_NOEXTERNALONLOCAL, XRCCTRL(*this, "ID_NOEXTERNALONLOCAL", wxCheckBox)->GetValue()); } @@ -900,8 +921,8 @@ int CNetConfWizard::CreateListenSocket(unsigned int port) { - m_pSocketServer = new CSocket(this); - int res = m_pSocketServer->Listen(CSocket::unspec, port); + m_pSocketServer = new fz::socket(engine_context_.GetThreadPool(), this); + int res = m_pSocketServer->listen(m_socket ? m_socket->address_family() : fz::address_type::unknown, port); if (res < 0) { delete m_pSocketServer; @@ -909,12 +930,13 @@ return 0; } - if (port) + if (port) { return port; + } // Get port number from socket int error; - res = m_pSocketServer->GetLocalPort(error); + res = m_pSocketServer->local_port(error); if (res <= 0) { delete m_pSocketServer; m_pSocketServer = 0; @@ -928,16 +950,19 @@ if (!m_socket || !m_pSocketServer) { return; } - if (m_pDataSocket) + if (m_pDataSocket) { return; + } int error; - m_pDataSocket = m_pSocketServer->Accept(error); - if (!m_pDataSocket) + m_pDataSocket = m_pSocketServer->accept(error); + if (!m_pDataSocket) { return; + } + m_pDataSocket->set_event_handler(this); - wxString peerAddr = m_socket->GetPeerHost(); - wxString dataPeerAddr = m_pDataSocket->GetPeerHost(); + std::string peerAddr = m_socket->peer_ip(); + std::string dataPeerAddr = m_pDataSocket->peer_ip(); if (peerAddr.empty()) { delete m_pDataSocket; m_pDataSocket = 0; @@ -966,7 +991,7 @@ { char buffer[100]; int error; - int const read = m_pDataSocket->Read(buffer, 99, error); + int const read = m_pDataSocket->read(buffer, 99, error); if (!read) { PrintMessage(_("Data socket closed too early."), 1); CloseSocket(); @@ -1057,7 +1082,7 @@ void CNetConfWizard::operator()(fz::event_base const& ev) { - fz::dispatch(ev, this + fz::dispatch(ev, this , &CNetConfWizard::OnSocketEvent , &CNetConfWizard::OnExternalIPAddress); } @@ -1067,7 +1092,7 @@ QueueEvent(new wxCommandEvent(fzEVT_ON_EXTERNAL_IP_ADDRESS)); } -void CNetConfWizard::OnSocketEvent(CSocketEventSource* s, SocketEventType t, int error) +void CNetConfWizard::OnSocketEvent(fz::socket_event_source* s, fz::socket_event_flag t, int error) { if (!s) { return; diff -Nru filezilla-3.15.0.2/src/interface/netconfwizard.h filezilla-3.33.0/src/interface/netconfwizard.h --- filezilla-3.15.0.2/src/interface/netconfwizard.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/netconfwizard.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __NETCONFWIZARD_H__ -#define __NETCONFWIZARD_H__ +#ifndef FILEZILLA_INTERFACES_NETCONFWIZARD_HEADER +#define FILEZILLA_INTERFACES_NETCONFWIZARD_HEADER #include #include "wrapengine.h" @@ -7,7 +7,7 @@ #include #include "socket.h" -#define NETCONFBUFFERSIZE 100 +#define NETCONFBUFFERSIZE 200 class COptions; @@ -26,8 +26,10 @@ void ResetTest(); - wxWindow* m_parent; - COptions* m_pOptions; + CFileZillaEngineContext & engine_context_; + + wxWindow* const m_parent; + COptions* const m_pOptions; std::vector m_pages; @@ -41,9 +43,9 @@ virtual void operator()(fz::event_base const& ev); void OnExternalIPAddress(); - void OnSocketEvent(CSocketEventSource*, SocketEventType t, int error); - - void DoOnSocketEvent(CSocketEventSource*, SocketEventType t, int error); + void OnSocketEvent(fz::socket_event_source*, fz::socket_event_flag t, int error); + + void DoOnSocketEvent(fz::socket_event_source*, fz::socket_event_flag t, int error); void OnReceive(); void ParseResponse(const char* line); @@ -67,7 +69,7 @@ wxString m_nextLabelText; // Test data - CSocket* m_socket{}; + fz::socket* m_socket{}; int m_state; char m_recvBuffer[NETCONFBUFFERSIZE]; @@ -87,18 +89,18 @@ datatainted } m_testResult; - CExternalIPResolver* m_pIPResolver; + CExternalIPResolver* m_pIPResolver{}; wxString m_externalIP; - CSocket* m_pSocketServer{}; - CSocket* m_pDataSocket{}; - int m_listenPort; - bool gotListReply; - int m_data; + fz::socket* m_pSocketServer{}; + fz::socket* m_pDataSocket{}; + int m_listenPort{}; + bool gotListReply{}; + int m_data{}; - char* m_pSendBuffer; + char* m_pSendBuffer{}; wxTimer m_timer; }; -#endif //__NETCONFWIZARD_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/Options.cpp filezilla-3.33.0/src/interface/Options.cpp --- filezilla-3.15.0.2/src/interface/Options.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/interface/Options.cpp 2018-04-27 11:26:14.000000000 +0000 @@ -1,15 +1,15 @@ #include #include "Options.h" #include "filezillaapp.h" -#include #include "ipcmutex.h" +#include "locale_initializer.h" #include #include "sizeformatting.h" #include #include -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS #include // Needed for MinGW: @@ -23,7 +23,8 @@ enum Type { string, - number + number, + xml }; enum Flags @@ -36,13 +37,13 @@ struct t_Option { - const char name[30]; + const char name[40]; const Type type; - const wxString defaultValue; // Default values are stored as string even for numerical options + const std::wstring defaultValue; // Default values are stored as string even for numerical options const Flags flags; // internal items won't get written to settings file nor loaded from there }; -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS //case insensitive #define DEFAULT_FILENAME_SORT _T("0") #else @@ -75,12 +76,13 @@ { "Logging Debug Level", number, _T("0"), normal }, { "Logging Raw Listing", number, _T("0"), normal }, { "fzsftp executable", string, _T(""), internal }, + { "fzstorj executable", string, _T(""), internal }, { "Allow transfermode fallback", number, _T("1"), normal }, { "Reconnect count", number, _T("2"), normal }, { "Reconnect delay", number, _T("5"), normal }, { "Enable speed limits", number, _T("0"), normal }, - { "Speedlimit inbound", number, _T("100"), normal }, - { "Speedlimit outbound", number, _T("20"), normal }, + { "Speedlimit inbound", number, _T("1000"), normal }, + { "Speedlimit outbound", number, _T("100"), normal }, { "Speedlimit burst tolerance", number, _T("0"), normal }, { "Preallocate space", number, _T("0"), normal }, { "View hidden files", number, _T("0"), normal }, @@ -107,6 +109,8 @@ { "Size format", number, _T("0"), normal }, { "Size thousands separator", number, _T("1"), normal }, { "Size decimal places", number, _T("1"), normal }, + { "TCP Keepalive Interval", number, _T("15"), normal }, + { "Cache TTL", number, _T("600"), normal }, // Interface settings { "Number of Transfers", number, _T("2"), normal }, @@ -114,7 +118,6 @@ { "Auto Ascii files", string, _T("am|asp|bat|c|cfm|cgi|conf|cpp|css|dhtml|diz|h|hpp|htm|html|in|inc|java|js|jsp|lua|m4|mak|md5|nfo|nsi|pas|patch|php|phtml|pl|po|py|qmail|sh|sha1|sha256|sha512|shtml|sql|svg|tcl|tpl|txt|vbs|xhtml|xml|xrc"), normal }, { "Auto Ascii no extension", number, _T("1"), normal }, { "Auto Ascii dotfiles", number, _T("1"), normal }, - { "Theme", string, _T("opencrystal/"), normal }, { "Language Code", string, _T(""), normal }, { "Last Server Path", string, _T(""), normal }, { "Concurrent download limit", number, _T("0"), normal }, @@ -122,6 +125,7 @@ { "Update Check", number, _T("1"), normal }, { "Update Check Interval", number, _T("7"), normal }, { "Last automatic update check", string, _T(""), normal }, + { "Last automatic update version", string, _T(""), normal }, { "Update Check New Version", string, _T(""), normal }, { "Update Check Check Beta", number, _T("0"), normal }, { "Show debug menu", number, _T("0"), normal }, @@ -129,6 +133,7 @@ { "File exists action upload", number, _T("0"), normal }, { "Allow ascii resume", number, _T("0"), normal }, { "Greeting version", string, _T(""), normal }, + { "Greeting resources", string, _T(""), normal }, { "Onetime Dialogs", string, _T(""), normal }, { "Show Tree Local", number, _T("1"), normal }, { "Show Tree Remote", number, _T("1"), normal }, @@ -156,7 +161,8 @@ { "Comparison mode", number, _T("1"), normal }, { "Comparison threshold", number, _T("1"), normal }, { "Site Manager position", string, _T(""), normal }, - { "Theme icon size", string, _T(""), normal }, + { "Icon theme", string, _T("default"), normal }, + { "Icon scale", number, _T("125"), normal }, { "Timestamp in message log", number, _T("0"), normal }, { "Sitemanager last selected", string, _T(""), normal }, { "Local filelist shown columns", string, _T(""), normal }, @@ -188,45 +194,50 @@ { "Toolbar hidden", number, _T("0"), normal }, { "Strip VMS revisions", number, _T("0"), normal }, { "Show Site Manager on startup", number, _T("0"), normal }, - { "Prompt password change", number, _T("0"), normal }, + { "Prompt password save", number, _T("0"), normal }, { "Persistent Choices", number, _T("0"), normal }, - { "Show notification bubbles", number, _T("1"), normal }, + { "Queue completion action", number, _T("1"), normal }, + { "Queue completion command", string, _T(""), normal }, + { "Drag and Drop disabled", number, _T("0"), normal }, + { "Disable update footer", number, _T("0"), normal }, + { "Master password encryptor", string, _T(""), normal }, // Default/internal options { "Config Location", string, _T(""), default_only }, { "Kiosk mode", number, _T("0"), default_priority }, - { "Disable update check", number, _T("0"), default_only } + { "Disable update check", number, _T("0"), default_only }, + { "Cache directory", string, _T(""), default_priority }, }; BEGIN_EVENT_TABLE(COptions, wxEvtHandler) EVT_TIMER(wxID_ANY, COptions::OnTimer) END_EVENT_TABLE() -t_OptionsCache& t_OptionsCache::operator=(wxString const& v) +t_OptionsCache& t_OptionsCache::operator=(std::wstring const& v) { strValue = v; - long l; - if (v.ToLong(&l)) { - numValue = l; - } - else { - numValue = 0; - } + numValue = fz::to_integral(v); return *this; } t_OptionsCache& t_OptionsCache::operator=(int v) { numValue = v; - strValue.Printf("%d", v); + strValue = fz::to_wstring(v); + return *this; +} + +t_OptionsCache& t_OptionsCache::operator=(std::unique_ptr const& v) +{ + xmlValue = std::make_unique(); + xmlValue->append_copy(v->first_child()); + return *this; } COptions::COptions() { m_theOptions = this; - m_pXmlFile = 0; - m_pLastServer = 0; SetDefaultValues(); @@ -238,15 +249,15 @@ CLocalPath const dir = InitSettingsDir(); CInterProcessMutex mutex(MUTEX_OPTIONS); - m_pXmlFile = new CXmlFile(dir.GetPath() + _T("filezilla.xml")); - if (!m_pXmlFile->Load()) { - wxString msg = m_pXmlFile->GetError() + _T("\n\n") + _("For this session the default settings will be used. Any changes to the settings will not be saved."); + xmlFile_ = std::make_unique(dir.GetPath() + _T("filezilla.xml")); + if (!xmlFile_->Load()) { + wxString msg = xmlFile_->GetError() + _T("\n\n") + _("For this session the default settings will be used. Any changes to the settings will not be saved."); wxMessageBoxEx(msg, _("Error loading xml file"), wxICON_ERROR); - delete m_pXmlFile; - m_pXmlFile = 0; + xmlFile_.reset(); } - else + else { CreateSettingsXmlElement(); + } LoadOptions(nameOptionMap); } @@ -255,8 +266,9 @@ { std::map ret; for (unsigned int i = 0; i < OPTIONS_NUM; ++i) { - if (options[i].flags != internal) + if (options[i].flags != internal) { ret.insert(std::make_pair(std::string(options[i].name), i)); + } } return ret; } @@ -264,58 +276,86 @@ COptions::~COptions() { COptionChangeEventHandler::UnregisterAllHandlers(); - - delete m_pLastServer; - delete m_pXmlFile; } int COptions::GetOptionVal(unsigned int nID) { - if (nID >= OPTIONS_NUM) + if (nID >= OPTIONS_NUM) { return 0; + } fz::scoped_lock l(m_sync_); return m_optionsCache[nID].numValue; } -wxString COptions::GetOption(unsigned int nID) +std::wstring COptions::GetOption(unsigned int nID) { - if (nID >= OPTIONS_NUM) - return wxString(); + if (nID >= OPTIONS_NUM) { + return std::wstring(); + } fz::scoped_lock l(m_sync_); return m_optionsCache[nID].strValue; } +std::unique_ptr COptions::GetOptionXml(unsigned int nID) +{ + if (nID >= OPTIONS_NUM) { + return nullptr; + } + + auto value = std::make_unique(); + value->append_copy(m_optionsCache[nID].xmlValue->first_child()); + + return std::move(value); +} + bool COptions::SetOption(unsigned int nID, int value) { - if (nID >= OPTIONS_NUM) + if (nID >= OPTIONS_NUM) { return false; + } - if (options[nID].type != number) + if (options[nID].type != number) { return false; + } ContinueSetOption(nID, value); return true; } -bool COptions::SetOption(unsigned int nID, wxString const& value) +bool COptions::SetOption(unsigned int nID, std::wstring const& value) { - if (nID >= OPTIONS_NUM) + if (nID >= OPTIONS_NUM) { return false; + } if (options[nID].type != string) { - long tmp; - if (!value.ToLong(&tmp)) - return false; - - return SetOption(nID, tmp); + return SetOption(nID, fz::to_integral(value)); } ContinueSetOption(nID, value); return true; } +bool COptions::SetOptionXml(unsigned int nID, std::unique_ptr const& value) +{ + if (nID >= OPTIONS_NUM) { + return false; + } + + if (options[nID].type != xml) { + return false; + } + + auto doc = std::make_unique(); + doc->append_copy(value->first_child()); + + ContinueSetOption(nID, doc); + + return true; +} + template void COptions::ContinueSetOption(unsigned int nID, T const& value) { @@ -331,14 +371,16 @@ } // Fixme: Setting options from other threads - if (!wxIsMainThread()) + if (!wxIsMainThread()) { return; + } if (options[nID].flags == normal || options[nID].flags == default_priority) { SetXmlValue(nID, validated); - if (!m_save_timer.IsRunning()) + if (!m_save_timer.IsRunning()) { m_save_timer.Start(15000, true); + } } if (changedOptions_.none()) { @@ -357,8 +399,9 @@ bool COptions::OptionFromFzDefaultsXml(unsigned int nID) { - if (nID >= OPTIONS_NUM) + if (nID >= OPTIONS_NUM) { return false; + } fz::scoped_lock l(m_sync_); return m_optionsCache[nID].from_default; @@ -366,10 +409,11 @@ pugi::xml_node COptions::CreateSettingsXmlElement() { - if (!m_pXmlFile) + if (!xmlFile_) { return pugi::xml_node(); + } - auto element = m_pXmlFile->GetElement(); + auto element = xmlFile_->GetElement(); if (!element) { return element; } @@ -384,6 +428,9 @@ if (options[i].type == string) { SetXmlValue(i, GetOption(i)); } + else if (options[i].type == xml) { + SetXmlValue(i, GetOptionXml(i)); + } else { SetXmlValue(i, GetOptionVal(i)); } @@ -394,35 +441,63 @@ void COptions::SetXmlValue(unsigned int nID, int value) { - SetXmlValue(nID, wxString::Format(_T("%d"), value)); + SetXmlValue(nID, fz::to_wstring(value)); } -void COptions::SetXmlValue(unsigned int nID, wxString const& value) +void COptions::SetXmlValue(unsigned int nID, std::wstring const& value) { - if (!m_pXmlFile) + if (!xmlFile_) { return; + } // No checks are made about the validity of the value, that's done in SetOption - - wxScopedCharBuffer utf8 = value.utf8_str(); - if (!utf8) - return; + std::string utf8 = fz::to_utf8(value); auto settings = CreateSettingsXmlElement(); if (settings) { pugi::xml_node setting; for (setting = settings.child("Setting"); setting; setting = setting.next_sibling("Setting")) { const char *attribute = setting.attribute("name").value(); - if (!attribute) + if (!attribute) { continue; - if (!strcmp(attribute, options[nID].name)) + } + if (!strcmp(attribute, options[nID].name)) { break; + } } if (!setting) { setting = settings.append_child("Setting"); SetTextAttribute(setting, "name", options[nID].name); } - setting.text() = utf8; + setting.text() = utf8.c_str(); + } +} + +void COptions::SetXmlValue(unsigned int nID, std::unique_ptr const& value) +{ + if (!xmlFile_) { + return; + } + + auto settings = CreateSettingsXmlElement(); + if (settings) { + pugi::xml_node setting; + for (setting = settings.child("Setting"); setting; setting = setting.next_sibling("Setting")) { + const char *attribute = setting.attribute("name").value(); + if (!attribute) { + continue; + } + if (!strcmp(attribute, options[nID].name)) { + break; + } + } + if (setting) { + settings.remove_child(setting); + } + setting = settings.append_child("Setting"); + SetTextAttribute(setting, "name", options[nID].name); + + setting.append_copy(value->first_child()); } } @@ -431,71 +506,87 @@ switch (nID) { case OPTION_UPDATECHECK_INTERVAL: - if (value < 1 || value > 7) + if (value < 1 || value > 7) { value = 7; + } break; case OPTION_LOGGING_DEBUGLEVEL: - if (value < 0 || value > 4) + if (value < 0 || value > 4) { value = 0; + } break; case OPTION_RECONNECTCOUNT: - if (value < 0 || value > 99) + if (value < 0 || value > 99) { value = 5; + } break; case OPTION_RECONNECTDELAY: - if (value < 0 || value > 999) + if (value < 0 || value > 999) { value = 5; + } break; case OPTION_FILEPANE_LAYOUT: - if (value < 0 || value > 3) + if (value < 0 || value > 3) { value = 0; + } break; case OPTION_SPEEDLIMIT_INBOUND: case OPTION_SPEEDLIMIT_OUTBOUND: - if (value < 0) + if (value < 0) { value = 0; + } break; case OPTION_SPEEDLIMIT_BURSTTOLERANCE: - if (value < 0 || value > 2) + if (value < 0 || value > 2) { value = 0; + } break; case OPTION_FILELIST_DIRSORT: case OPTION_FILELIST_NAMESORT: - if (value < 0 || value > 2) + if (value < 0 || value > 2) { value = 0; + } break; case OPTION_SOCKET_BUFFERSIZE_RECV: - if (value != -1 && (value < 4096 || value > 4096 * 1024)) + if (value != -1 && (value < 4096 || value > 4096 * 1024)) { value = -1; + } break; case OPTION_SOCKET_BUFFERSIZE_SEND: - if (value != -1 && (value < 4096 || value > 4096 * 1024)) + if (value != -1 && (value < 4096 || value > 4096 * 1024)) { value = 131072; + } break; case OPTION_COMPARISONMODE: - if (value < 0 || value > 0) + if (value < 0 || value > 0) { value = 1; + } break; case OPTION_COMPARISON_THRESHOLD: - if (value < 0 || value > 1440) + if (value < 0 || value > 1440) { value = 1; + } break; case OPTION_SIZE_DECIMALPLACES: - if (value < 0 || value > 3) + if (value < 0 || value > 3) { value = 0; + } break; case OPTION_MESSAGELOG_POSITION: - if (value < 0 || value > 2) + if (value < 0 || value > 2) { value = 0; + } break; case OPTION_DOUBLECLICK_ACTION_FILE: case OPTION_DOUBLECLICK_ACTION_DIRECTORY: - if (value < 0 || value > 3) + if (value < 0 || value > 3) { value = 0; + } break; case OPTION_SIZE_FORMAT: - if (value < 0 || value >= CSizeFormat::formats_count) + if (value < 0 || value >= CSizeFormat::formats_count) { value = 0; + } break; case OPTION_TIMEOUT: if (value <= 0) { @@ -508,86 +599,107 @@ value = 9999; } break; + case OPTION_CACHE_TTL: + if (value < 30) { + value = 30; + } + else if (value > 60*60*24) { + value = 60 * 60 * 24; + } + break; } return value; } -wxString COptions::Validate(unsigned int nID, wxString const& value) +std::wstring COptions::Validate(unsigned int nID, std::wstring const& value) { if (nID == OPTION_INVALID_CHAR_REPLACE) { - if (value.Len() > 1) + if (value.size() > 1) { return _T("_"); + } } return value; } -void COptions::SetServer(wxString path, const CServer& server) +std::unique_ptr COptions::Validate(unsigned int, std::unique_ptr const& value) +{ + auto res = std::make_unique(); + res->append_copy(value->first_child()); + + return res; +} + +void COptions::SetServer(std::wstring path, ServerWithCredentials const& server) { - if (!m_pXmlFile) + if (!xmlFile_) { return; + } - if (path.empty()) + if (path.empty()) { return; + } - auto element = m_pXmlFile->GetElement(); + auto element = xmlFile_->GetElement(); while (!path.empty()) { - wxString sub; - int pos = path.Find('/'); - if (pos != -1) { - sub = path.Left(pos); - path = path.Mid(pos + 1); + std::wstring sub; + size_t pos = path.find('/'); + if (pos != std::wstring::npos) { + sub = path.substr(0, pos); + path = path.substr(pos + 1); } else { sub = path; - path = _T(""); + path.clear(); } - wxScopedCharBuffer utf8 = sub.utf8_str(); - if (!utf8) - return; - auto newElement = element.child(utf8); - if (newElement) + + std::string utf8 = fz::to_utf8(sub); + auto newElement = element.child(utf8.c_str()); + if (newElement) { element = newElement; + } else { - element = element.append_child(utf8); + element = element.append_child(utf8.c_str()); } } ::SetServer(element, server); - if (GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) + if (GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { return; + } CInterProcessMutex mutex(MUTEX_OPTIONS); - m_pXmlFile->Save(true); + xmlFile_->Save(true); } -bool COptions::GetServer(wxString path, CServer& server) +bool COptions::GetServer(std::wstring path, ServerWithCredentials& server) { - if (path.empty()) + if (path.empty()) { return false; + } - if (!m_pXmlFile) + if (!xmlFile_) { return false; - auto element = m_pXmlFile->GetElement(); + } + auto element = xmlFile_->GetElement(); while (!path.empty()) { - wxString sub; - int pos = path.Find('/'); - if (pos != -1) { - sub = path.Left(pos); - path = path.Mid(pos + 1); + std::wstring sub; + size_t pos = path.find('/'); + if (pos != std::wstring::npos) { + sub = path.substr(0, pos); + path = path.substr(pos + 1); } else { sub = path; path = _T(""); } - wxScopedCharBuffer utf8 = sub.utf8_str(); - if (!utf8) - return false; - element = element.child(utf8); - if (!element) + std::string utf8 = fz::to_utf8(sub); + element = element.child(utf8.c_str()); + if (!element) { return false; + } } bool res = ::GetServer(element, server); @@ -595,27 +707,31 @@ return res; } -void COptions::SetLastServer(const CServer& server) +void COptions::SetLastServer(ServerWithCredentials const& server) { - if (!m_pLastServer) - m_pLastServer = new CServer(server); - else - *m_pLastServer = server; + if (!lastServer_) { + lastServer_ = std::make_unique(server); + } + else { + *lastServer_ = server; + } SetServer(_T("Settings/LastServer"), server); } -bool COptions::GetLastServer(CServer& server) +bool COptions::GetLastServer(ServerWithCredentials& server) { - if (!m_pLastServer) { + if (!lastServer_) { bool res = GetServer(_T("Settings/LastServer"), server); - if (res) - m_pLastServer = new CServer(server); + if (res) { + lastServer_ = std::make_unique(server); + } return res; } else { - server = *m_pLastServer; - if (server == CServer()) + server = *lastServer_; + if (!server) { return false; + } return true; } @@ -623,14 +739,16 @@ void COptions::Init() { - if (!m_theOptions) + if (!m_theOptions) { new COptions(); // It sets m_theOptions internally itself + } } void COptions::Destroy() { - if (!m_theOptions) + if (!m_theOptions) { return; + } delete m_theOptions; m_theOptions = 0; @@ -644,8 +762,9 @@ void COptions::Import(pugi::xml_node element) { LoadOptions(GetNameOptionMap(), element); - if (!m_save_timer.IsRunning()) + if (!m_save_timer.IsRunning()) { m_save_timer.Start(15000, true); + } } void COptions::LoadOptions(std::map const& nameOptionMap, pugi::xml_node settings) @@ -665,14 +784,16 @@ void COptions::LoadOptionFromElement(pugi::xml_node option, std::map const& nameOptionMap, bool allowDefault) { const char* name = option.attribute("name").value(); - if (!name) + if (!name) { return; + } auto const iter = nameOptionMap.find(name); if (iter != nameOptionMap.end()) { - if (!allowDefault && options[iter->second].flags == default_only) + if (!allowDefault && options[iter->second].flags == default_only) { return; - wxString value = GetTextElement(option); + } + std::wstring value = GetTextElement(option); if (options[iter->second].flags == default_priority) { if (allowDefault) { fz::scoped_lock l(m_sync_); @@ -680,43 +801,53 @@ } else { fz::scoped_lock l(m_sync_); - if (m_optionsCache[iter->second].from_default) + if (m_optionsCache[iter->second].from_default) { return; + } } } if (options[iter->second].type == number) { - long numValue = 0; - value.ToLong(&numValue); + int numValue = fz::to_integral(value); numValue = Validate(iter->second, numValue); fz::scoped_lock l(m_sync_); m_optionsCache[iter->second] = numValue; } - else { + else if (options[iter->second].type == string) { value = Validate(iter->second, value); fz::scoped_lock l(m_sync_); m_optionsCache[iter->second] = value; } + else { + fz::scoped_lock l(m_sync_); + if (!option.first_child().empty()) { + m_optionsCache[iter->second].xmlValue = std::make_unique(); + m_optionsCache[iter->second].xmlValue->append_copy(option.first_child()); + } + } } } void COptions::LoadGlobalDefaultOptions(std::map const& nameOptionMap) { CLocalPath const defaultsDir = wxGetApp().GetDefaultsDir(); - if (defaultsDir.empty()) + if (defaultsDir.empty()) { return; - + } CXmlFile file(defaultsDir.GetPath() + _T("fzdefaults.xml")); - if (!file.Load()) + if (!file.Load()) { return; + } auto element = file.GetElement(); - if (!element) + if (!element) { return; + } element = element.child("Settings"); - if (!element) + if (!element) { return; + } for (auto setting = element.child("Setting"); setting; setting = setting.next_sibling("Setting")) { LoadOptionFromElement(setting, nameOptionMap, true); @@ -730,38 +861,41 @@ void COptions::Save() { - if (GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) + if (GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { return; + } - if (!m_pXmlFile) + if (!xmlFile_) { return; + } CInterProcessMutex mutex(MUTEX_OPTIONS); - m_pXmlFile->Save(true); + xmlFile_->Save(true); } void COptions::SaveIfNeeded() { - if (!m_save_timer.IsRunning()) + if (!m_save_timer.IsRunning()) { return; + } m_save_timer.Stop(); Save(); } namespace { -#ifndef __WXMSW__ -wxString TryDirectory( wxString path, wxString const& suffix, bool check_exists ) +#ifndef FZ_WINDOWS +std::wstring TryDirectory(wxString path, wxString const& suffix, bool check_exists) { - if( !path.empty() && path[0] == '/' ) { - if( path[path.size() - 1] != '/' ) { + if (!path.empty() && path[0] == '/') { + if (path[path.size() - 1] != '/') { path += '/'; } path += suffix; - if( check_exists ) { - if( !wxFileName::DirExists(path) ) { + if (check_exists) { + if (!wxFileName::DirExists(path)) { path.clear(); } } @@ -769,80 +903,106 @@ else { path.clear(); } - return path; + return path.ToStdWstring(); } -#endif wxString GetEnv(wxString const& env) { wxString ret; - if( !wxGetEnv(env, &ret) ) { + if (!wxGetEnv(env, &ret)) { ret.clear(); } return ret; } +#endif } CLocalPath COptions::GetUnadjustedSettingsDir() { - wxFileName fn; -#ifdef __WXMSW__ - wxChar buffer[MAX_PATH * 2 + 1]; + CLocalPath ret; + +#ifdef FZ_WINDOWS + wchar_t buffer[MAX_PATH * 2 + 1]; if (SUCCEEDED(SHGetFolderPath(0, CSIDL_APPDATA, 0, SHGFP_TYPE_CURRENT, buffer))) { - fn = wxFileName(buffer, _T("")); - fn.AppendDir(_T("FileZilla")); + CLocalPath tmp(buffer); + if (!tmp.empty()) { + tmp.AddSegment(L"FileZilla"); + } + ret = tmp; } - else { + + if (ret.empty()) { // Fall back to directory where the executable is - if (GetModuleFileName(0, buffer, MAX_PATH * 2)) - fn = buffer; + DWORD c = GetModuleFileName(0, buffer, MAX_PATH * 2); + if (c && c < MAX_PATH * 2) { + std::wstring tmp; + ret.SetPath(buffer, &tmp); + } } #else - wxString cfg = TryDirectory(GetEnv(_T("XDG_CONFIG_HOME")), _T("filezilla/"), true); - if( cfg.empty() ) { + std::wstring cfg = TryDirectory(GetEnv(_T("XDG_CONFIG_HOME")), _T("filezilla/"), true); + if (cfg.empty()) { cfg = TryDirectory(wxGetHomeDir(), _T(".config/filezilla/"), true); } - if( cfg.empty() ) { + if (cfg.empty()) { cfg = TryDirectory(wxGetHomeDir(), _T(".filezilla/"), true); } - if( cfg.empty() ) { + if (cfg.empty()) { cfg = TryDirectory(GetEnv(_T("XDG_CONFIG_HOME")), _T("filezilla/"), false); } - if( cfg.empty() ) { + if (cfg.empty()) { cfg = TryDirectory(wxGetHomeDir(), _T(".config/filezilla/"), false); } - if( cfg.empty() ) { + if (cfg.empty()) { cfg = TryDirectory(wxGetHomeDir(), _T(".filezilla/"), false); } - fn = wxFileName(cfg, _T("")); + ret.SetPath(cfg); #endif - return CLocalPath(fn.GetPath()); + return ret; } -CLocalPath COptions::InitSettingsDir() +CLocalPath COptions::GetCacheDirectory() { - CLocalPath p; + CLocalPath ret; - wxString dir(GetOption(OPTION_DEFAULT_SETTINGSDIR)); + std::wstring dir(GetOption(OPTION_DEFAULT_CACHE_DIR)); if (!dir.empty()) { - wxStringTokenizer tokenizer(dir, _T("/\\"), wxTOKEN_RET_EMPTY_ALL); - dir = _T(""); - while (tokenizer.HasMoreTokens()) { - wxString token = tokenizer.GetNextToken(); - if (!token.empty() && token[0] == '$') { - if (token.size() > 1 && token[1] == '$') - token = token.Mid(1); - else { - token = GetEnv(token.Mid(1)); - } + dir = ExpandPath(dir); + ret.SetPath(wxGetApp().GetDefaultsDir().GetPath()); + if (!ret.ChangePath(dir)) { + ret.clear(); + } + } + else { +#ifdef FZ_WINDOWS + wchar_t buffer[MAX_PATH * 2 + 1]; + + if (SUCCEEDED(SHGetFolderPath(0, CSIDL_LOCAL_APPDATA, 0, SHGFP_TYPE_CURRENT, buffer))) { + ret.SetPath(buffer); + if (!ret.empty()) { + ret.AddSegment(L"FileZilla"); } - dir += token; - const wxChar delimiter = tokenizer.GetLastDelimiter(); - if (delimiter) - dir += delimiter; } +#else + std::wstring cfg = TryDirectory(GetEnv(_T("XDG_CACHE_HOME")), _T("filezilla/"), false); + if (cfg.empty()) { + cfg = TryDirectory(wxGetHomeDir(), _T(".cache/filezilla/"), false); + } + ret.SetPath(cfg); +#endif + } + + return ret; +} +CLocalPath COptions::InitSettingsDir() +{ + CLocalPath p; + + std::wstring dir = GetOption(OPTION_DEFAULT_SETTINGSDIR); + if (!dir.empty()) { + dir = ExpandPath(dir); p.SetPath(wxGetApp().GetDefaultsDir().GetPath()); p.ChangePath(dir); } @@ -850,8 +1010,9 @@ p = GetUnadjustedSettingsDir(); } - if (!p.empty() && !p.Exists()) - wxFileName::Mkdir( p.GetPath(), 0700, wxPATH_MKDIR_FULL ); + if (!p.empty() && !p.Exists()) { + wxFileName::Mkdir(p.GetPath(), 0700, wxPATH_MKDIR_FULL); + } SetOption(OPTION_DEFAULT_SETTINGSDIR, p.GetPath()); @@ -862,7 +1023,13 @@ { fz::scoped_lock l(m_sync_); for (int i = 0; i < OPTIONS_NUM; ++i) { - m_optionsCache[i] = options[i].defaultValue; m_optionsCache[i].from_default = false; + if (options[i].type == xml) { + m_optionsCache[i].xmlValue = std::make_unique(); + m_optionsCache[i].xmlValue->load_string(fz::to_string(options[i].defaultValue).c_str()); + } + else { + m_optionsCache[i] = options[i].defaultValue; + } } } diff -Nru filezilla-3.15.0.2/src/interface/Options.h filezilla-3.33.0/src/interface/Options.h --- filezilla-3.15.0.2/src/interface/Options.h 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/interface/Options.h 2018-01-05 15:02:30.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __OPTIONS_H__ -#define __OPTIONS_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONS_HEADER +#define FILEZILLA_INTERFACE_OPTIONS_HEADER #include "local_path.h" @@ -18,7 +18,6 @@ OPTION_ASCIIFILES, OPTION_ASCIINOEXT, OPTION_ASCIIDOTFILE, - OPTION_THEME, OPTION_LANGUAGE, OPTION_LASTSERVERPATH, OPTION_CONCURRENTDOWNLOADLIMIT, @@ -26,6 +25,7 @@ OPTION_UPDATECHECK, OPTION_UPDATECHECK_INTERVAL, OPTION_UPDATECHECK_LASTDATE, + OPTION_UPDATECHECK_LASTVERSION, OPTION_UPDATECHECK_NEWVERSION, OPTION_UPDATECHECK_CHECKBETA, OPTION_DEBUG_MENU, @@ -33,6 +33,7 @@ OPTION_FILEEXISTS_UPLOAD, OPTION_ASCIIRESUME, OPTION_GREETINGVERSION, + OPTION_GREETINGRESOURCES, OPTION_ONETIME_DIALOGS, OPTION_SHOW_TREE_LOCAL, OPTION_SHOW_TREE_REMOTE, @@ -60,7 +61,8 @@ OPTION_COMPARISONMODE, OPTION_COMPARISON_THRESHOLD, OPTION_SITEMANAGER_POSITION, - OPTION_THEME_ICONSIZE, + OPTION_ICONS_THEME, + OPTION_ICONS_SCALE, OPTION_MESSAGELOG_TIMESTAMP, OPTION_SITEMANAGER_LASTSELECTED, OPTION_LOCALFILELIST_COLUMN_SHOWN, @@ -94,12 +96,17 @@ OPTION_INTERFACE_SITEMANAGER_ON_STARTUP, OPTION_PROMPTPASSWORDSAVE, OPTION_PERSISTENT_CHOICES, - OPTION_SHOW_NOTIFICATION_BUBBLE, + OPTION_QUEUE_COMPLETION_ACTION, + OPTION_QUEUE_COMPLETION_COMMAND, + OPTION_DND_DISABLED, + OPTION_DISABLE_UPDATE_FOOTER, + OPTION_MASTERPASSWORDENCRYPTOR, // Default/internal options OPTION_DEFAULT_SETTINGSDIR, // guaranteed to be (back)slash-terminated OPTION_DEFAULT_KIOSKMODE, OPTION_DEFAULT_DISABLEUPDATECHECK, + OPTION_DEFAULT_CACHE_DIR, // Has to be last element OPTIONS_NUM @@ -107,30 +114,35 @@ struct t_OptionsCache { - bool operator==(wxString const& v) const { return strValue == v; } + bool operator==(std::wstring const& v) const { return strValue == v; } bool operator==(int v) const { return numValue == v; } - t_OptionsCache& operator=(wxString const& v); + bool operator==(std::unique_ptr const& v) const { return *xmlValue == *v; } + t_OptionsCache& operator=(std::wstring const& v); t_OptionsCache& operator=(int v); + t_OptionsCache& operator=(std::unique_ptr const& v); bool from_default; int numValue; - wxString strValue; + std::wstring strValue; + std::unique_ptr xmlValue; }; class CXmlFile; -class COptions : public wxEvtHandler, public COptionsBase +class COptions final : public wxEvtHandler, public COptionsBase { public: virtual int GetOptionVal(unsigned int nID); - virtual wxString GetOption(unsigned int nID); + virtual std::wstring GetOption(unsigned int nID); + virtual std::unique_ptr GetOptionXml(unsigned int nID); virtual bool SetOption(unsigned int nID, int value); - virtual bool SetOption(unsigned int nID, wxString const& value); + virtual bool SetOption(unsigned int nID, std::wstring const& value); + virtual bool SetOptionXml(unsigned int nID, std::unique_ptr const& value); bool OptionFromFzDefaultsXml(unsigned int nID); - void SetLastServer(const CServer& server); - bool GetLastServer(CServer& server); + void SetLastServer(const ServerWithCredentials& server); + bool GetLastServer(ServerWithCredentials& server); static COptions* Get(); static void Init(); @@ -141,21 +153,24 @@ void SaveIfNeeded(); static CLocalPath GetUnadjustedSettingsDir(); + CLocalPath GetCacheDirectory(); protected: COptions(); virtual ~COptions(); int Validate(unsigned int nID, int value); - wxString Validate(unsigned int nID, wxString const& value); + std::wstring Validate(unsigned int nID, std::wstring const& value); + std::unique_ptr Validate(unsigned int nID, std::unique_ptr const& value); template void ContinueSetOption(unsigned int nID, T const& value); void SetXmlValue(unsigned int nID, int value); - void SetXmlValue(unsigned int nID, wxString const& value); + void SetXmlValue(unsigned int nID, std::wstring const& value); + void SetXmlValue(unsigned int nID, std::unique_ptr const& value); // path is element path below document root, separated by slashes - void SetServer(wxString path, const CServer& server); - bool GetServer(wxString path, CServer& server); + void SetServer(std::wstring path, ServerWithCredentials const& server); + bool GetServer(std::wstring path, ServerWithCredentials& server); pugi::xml_node CreateSettingsXmlElement(); @@ -170,11 +185,11 @@ void NotifyChangedOptions(); - CXmlFile* m_pXmlFile; + std::unique_ptr xmlFile_; t_OptionsCache m_optionsCache[OPTIONS_NUM]; - CServer* m_pLastServer; + std::unique_ptr lastServer_; static COptions* m_theOptions; @@ -183,9 +198,9 @@ DECLARE_EVENT_TABLE() void OnTimer(wxTimerEvent& event); - fz::mutex m_sync_; + fz::mutex m_sync_{false}; changed_options_t changedOptions_; }; -#endif //__OPTIONS_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/osx_sandbox_userdirs.cpp filezilla-3.33.0/src/interface/osx_sandbox_userdirs.cpp --- filezilla-3.15.0.2/src/interface/osx_sandbox_userdirs.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/osx_sandbox_userdirs.cpp 2017-12-09 04:30:04.000000000 +0000 @@ -0,0 +1,315 @@ +#include +#include "osx_sandbox_userdirs.h" + +#include "filezillaapp.h" +#include "ipcmutex.h" +#include "xmlfunctions.h" +#include "xrc_helper.h" + +#include + +OSXSandboxUserdirs::OSXSandboxUserdirs() +{ +} + +OSXSandboxUserdirs::~OSXSandboxUserdirs() +{ + for (auto const& dir : userdirs_) { + CFURLStopAccessingSecurityScopedResource(dir.second.url.get()); + } +} + + +OSXSandboxUserdirs& OSXSandboxUserdirs::Get() +{ + static OSXSandboxUserdirs userDirs; + return userDirs; +} + + +namespace { +std::wstring GetPath(CFURLRef url) +{ + char buf[2048]; + if (!CFURLGetFileSystemRepresentation(url, true, reinterpret_cast(buf), sizeof(buf))) { + return std::wstring(); + } + + return fz::to_wstring(std::string(buf)); +} + +void append(wxString& error, CFErrorRef ref, wxString const& func) +{ + wxString s; + if (ref) { + wxCFStringRef sref(CFErrorCopyDescription(ref)); + s = sref.AsString(); + } + error += "\n"; + if (s.empty()) { + error += wxString::Format(_("Function %s failed"), func); + } + else { + error += s; + } +} +} + +void OSXSandboxUserdirs::Load() +{ + CInterProcessMutex mutex(MUTEX_MAC_SANDBOX_USERDIRS); + + CXmlFile file(wxGetApp().GetSettingsFile(L"osx_sandbox_userdirs")); + auto xml = file.Load(true); + if (!xml) { + wxMessageBoxEx(file.GetError(), _("Error loading xml file"), wxICON_ERROR); + return; + } + + wxString error; + for (auto xdir = xml.child("dir"); xdir; xdir = xdir.next_sibling("dir")) { + auto data = fz::hex_decode(std::string(xdir.child_value())); + if (data.empty()) { + continue; + } + + wxCFDataRef bookmark(data.data(), data.size()); + + Boolean stale = false; + CFErrorRef errorRef = 0; + wxCFRef url(CFURLCreateByResolvingBookmarkData(0, bookmark.get(), kCFURLBookmarkResolutionWithSecurityScope, 0, 0, &stale, &errorRef)); + if (!url) { + append(error, errorRef, L"CFURLCreateByResolvingBookmarkData"); + continue; + } + + if (stale) { + wxCFDataRef new_bookmark(CFURLCreateBookmarkData(0, url.get(), kCFURLBookmarkCreationWithSecurityScope, 0, 0, 0)); + if (new_bookmark) { + bookmark = new_bookmark; + } + } + + auto path = GetPath(url); + if (path.empty()) { + error += L"\n"; + error += _("Could not get native path from CFURL"); + continue; + } + + if (!CFURLStartAccessingSecurityScopedResource(url.get())) { + error += "\n"; + error += wxString::Format(_("Could not access path %s"), path); + continue; + } + + bool dir = xdir.attribute("dir").value() != std::string("false"); + if (dir && path.back() != '/') { + path += '/'; + } + + auto it = userdirs_.find(path); + if (it != userdirs_.end()) { + CFURLStopAccessingSecurityScopedResource(it->second.url.get()); + } + userdirs_[path] = Data{dir, bookmark, url}; + } + + if (!error.empty()) { + error = _("Access to some local directories could not be restored:") + _T("\n") + error; + error += L"\n\n"; + error += _("Please check the granted permissions and re-add any missing local directories you are working with in the dialog that follows."); + wxMessageBox(error, _("Could not restore directory access"), wxICON_EXCLAMATION); + OSXSandboxUserdirsDialog dlg; + dlg.Run(0); + } + + Save(); +} + + +bool OSXSandboxUserdirs::Save() +{ + CXmlFile file(wxGetApp().GetSettingsFile(L"osx_sandbox_userdirs")); + auto xml = file.Load(true); + if (!xml) { + wxMessageBoxEx(file.GetError(), _("Error loading xml file"), wxICON_ERROR); + return false; + } + + while (xml.remove_child("dir")) {} + + for (auto const& dir : userdirs_) { + std::vector data; + data.resize(dir.second.bookmark.GetLength()); + dir.second.bookmark.GetBytes(CFRangeMake(0, data.size()), data.data()); + + auto child = xml.append_child("dir"); + child.append_attribute("path") = fz::to_utf8(dir.first).c_str(); + child.append_attribute("dir") = dir.second.dir ? "true" : "false"; + child.text().set(fz::hex_encode(data).c_str()); + } + + return file.Save(true); +} + +bool OSXSandboxUserdirs::Add() +{ + wxDirDialog dlg(0, (L"Select local data directory"), L"TEST", wxDD_DEFAULT_STYLE|wxDD_DIR_MUST_EXIST); + if (dlg.ShowModal() != wxID_OK) { + return false; + } + + auto path = dlg.GetPath().ToStdWstring(); + wxCFStringRef pathref(path); + wxCFRef url(CFURLCreateWithFileSystemPath(0, pathref.get(), kCFURLPOSIXPathStyle, true)); + if (!url) { + wxMessageBox(wxString::Format(_("Could not create CFURL from path %s"), path)); + return false; + } + + CFErrorRef errorRef = 0; + wxCFDataRef bookmark(CFURLCreateBookmarkData(0, url.get(), kCFURLBookmarkCreationWithSecurityScope, 0, 0, &errorRef)); + if (!bookmark) { + wxString error; + append(error, errorRef, L"CFURLCreateBookmarkData"); + wxMessageBox(_("Could not create security-scoped bookmark from URL:") + error); + return false; + } + + std::wstring actualPath = GetPath(url.get()); + if (actualPath.empty()) { + wxMessageBox(_("Could not get path from URL")); + return false; + } + + if (actualPath.back() != '/') { + actualPath += '/'; + } + + auto it = userdirs_.find(actualPath); + if (it != userdirs_.end()) { + CFURLStopAccessingSecurityScopedResource(it->second.url.get()); + } + userdirs_[actualPath] = Data{true, bookmark, url}; + + CInterProcessMutex mutex(MUTEX_MAC_SANDBOX_USERDIRS); + + return Save(); +} + +bool OSXSandboxUserdirs::AddFile(std::wstring const& file) +{ + if (file.empty() || file.back() == '/') { + return false; + } + + wxCFStringRef pathref(file); + wxCFRef url(CFURLCreateWithFileSystemPath(0, pathref.get(), kCFURLPOSIXPathStyle, true)); + if (!url) { + wxMessageBox(wxString::Format(_("Could not create CFURL from path %s"), file)); + return false; + } + + CFErrorRef errorRef = 0; + wxCFDataRef bookmark(CFURLCreateBookmarkData(0, url.get(), kCFURLBookmarkCreationWithSecurityScope, 0, 0, &errorRef)); + if (!bookmark) { + wxString error; + append(error, errorRef, L"CFURLCreateBookmarkData"); + wxMessageBox(_("Could not create security-scoped bookmark from URL:") + error); + return false; + } + + std::wstring actualPath = GetPath(url.get()); + if (actualPath.empty()) { + wxMessageBox(_("Could not get path from URL")); + return false; + } + + auto it = userdirs_.find(actualPath); + if (it != userdirs_.end()) { + CFURLStopAccessingSecurityScopedResource(it->second.url.get()); + } + userdirs_[actualPath] = Data{false, bookmark, url}; + + CInterProcessMutex mutex(MUTEX_MAC_SANDBOX_USERDIRS); + + return Save(); +} + +std::vector OSXSandboxUserdirs::GetDirs() const +{ + std::vector ret; + ret.reserve(userdirs_.size()); + for (auto const& it : userdirs_) { + ret.push_back(it.first); + } + return ret; +} + +void OSXSandboxUserdirs::Remove(std::wstring const& dir) +{ + auto it = userdirs_.find(dir); + if (it != userdirs_.cend()) { + CFURLStopAccessingSecurityScopedResource(it->second.url.get()); + userdirs_.erase(it); + } + + CInterProcessMutex mutex(MUTEX_MAC_SANDBOX_USERDIRS); + + Save(); +} + +void OSXSandboxUserdirsDialog::Run(wxWindow* parent) +{ + if (!Load(parent, L"ID_OSX_SANDBOX_USERDIRS")) { + wxBell(); + return; + } + + WrapRecursive(this, GetSizer(), ConvertDialogToPixels(wxSize(250, -1)).x); + GetSizer()->Fit(this); + + + XRCCTRL(*this, "ID_ADD", wxButton)->Bind(wxEVT_BUTTON, &OSXSandboxUserdirsDialog::OnAdd, this); + XRCCTRL(*this, "ID_REMOVE", wxButton)->Bind(wxEVT_BUTTON, &OSXSandboxUserdirsDialog::OnRemove, this); + + DisplayCurrentDirs(); + + ShowModal(); +} + +void OSXSandboxUserdirsDialog::OnAdd(wxCommandEvent&) +{ + OSXSandboxUserdirs::Get().Add(); + DisplayCurrentDirs(); +} + +void OSXSandboxUserdirsDialog::OnRemove(wxCommandEvent&) +{ + int pos = xrc_call(*this, "ID_DIRS", &wxListBox::GetSelection); + if (pos != wxNOT_FOUND) { + wxString sel = xrc_call(*this, "ID_DIRS", &wxListBox::GetString, pos); + OSXSandboxUserdirs::Get().Remove(sel.ToStdWstring()); + DisplayCurrentDirs(); + } +} + +void OSXSandboxUserdirsDialog::DisplayCurrentDirs() +{ + auto dirs = OSXSandboxUserdirs::Get().GetDirs(); + + wxString sel; + int pos = xrc_call(*this, "ID_DIRS", &wxListBox::GetSelection); + if (pos != wxNOT_FOUND) { + sel = xrc_call(*this, "ID_DIRS", &wxListBox::GetString, pos); + } + + xrc_call(*this, "ID_DIRS", &wxListBox::Clear); + + for (auto const& dir : dirs) { + XRCCTRL(*this, "ID_DIRS", wxListBox)->Append(dir); + } + + XRCCTRL(*this, "ID_DIRS", wxListBox)->SetStringSelection(sel); +} diff -Nru filezilla-3.15.0.2/src/interface/osx_sandbox_userdirs.h filezilla-3.33.0/src/interface/osx_sandbox_userdirs.h --- filezilla-3.15.0.2/src/interface/osx_sandbox_userdirs.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/osx_sandbox_userdirs.h 2017-12-09 04:30:05.000000000 +0000 @@ -0,0 +1,57 @@ +#ifndef FILEZILLA_OSX_SANDBOX_USERDIRS +#define FILEZILLA_OSX_SANDBOX_USERDIRS + +#include "dialogex.h" + +#include +#include + +#include + +#include + +class OSXSandboxUserdirs final +{ +public: + static OSXSandboxUserdirs& Get(); + + // Prints error message internally + void Load(); + + bool Add(); + + bool AddFile(std::wstring const& file); + + void Remove(std::wstring const& dir); + + std::vector GetDirs() const; + +private: + OSXSandboxUserdirs(); + ~OSXSandboxUserdirs(); + + bool Save(); + + struct Data + { + bool dir{true}; + wxCFDataRef bookmark; + wxCFRef url; + }; + + std::map userdirs_; +}; + +class OSXSandboxUserdirsDialog final : public wxDialogEx +{ +public: + void Run(wxWindow* parent); + +private: + void DisplayCurrentDirs(); + + void OnAdd(wxCommandEvent&); + void OnRemove(wxCommandEvent&); +}; + +#endif diff -Nru filezilla-3.15.0.2/src/interface/overlay.cpp filezilla-3.33.0/src/interface/overlay.cpp --- filezilla-3.15.0.2/src/interface/overlay.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/overlay.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,66 @@ +#include +#include "overlay.h" + +void OverlayWindow::SetAnchor(wxWindow* anchor, wxPoint const& offset) +{ + anchor_ = anchor; + offset_ = offset; + + wxGetTopLevelParent(GetParent())->Bind(wxEVT_MOVE, &OverlayWindow::OnTLWMove, this); + anchor_->Bind(wxEVT_SIZE, &OverlayWindow::OnAnchorSize, this); + + wxGetTopLevelParent(GetParent())->Bind(wxEVT_SHOW, &OverlayWindow::OnTLWShow, this); + wxGetTopLevelParent(GetParent())->Bind(wxEVT_ACTIVATE, &OverlayWindow::OnTLWActivate, this); + + Reposition(); + UpdateShown(); +} + +void OverlayWindow::OnTLWMove(wxMoveEvent & evt) +{ + evt.Skip(); + + Reposition(); +} + +void OverlayWindow::UpdateShown() +{ + auto tlw = static_cast(wxGetTopLevelParent(GetParent())); + Show(tlw->IsShown() && tlw->IsActive()); +} + +void OverlayWindow::OnTLWShow(wxShowEvent & evt) +{ + evt.Skip(); + CallAfter([this]() { UpdateShown(); }); +} + +void OverlayWindow::OnTLWActivate(wxActivateEvent & evt) +{ + evt.Skip(); + CallAfter([this]() { UpdateShown(); }); +} + +void OverlayWindow::Reposition() +{ + auto rect = anchor_->GetScreenRect(); + + wxPoint pos = rect.GetTopLeft() + offset_; + + if (offset_.x < 0) { + pos.x += rect.width - GetSize().GetWidth(); + } + + if (offset_.y < 0) { + pos.y += rect.height - GetSize().GetHeight(); + } + + SetPosition(pos); +} + +void OverlayWindow::OnAnchorSize(wxSizeEvent & evt) +{ + evt.Skip(); + + Reposition(); +} diff -Nru filezilla-3.15.0.2/src/interface/overlay.h filezilla-3.33.0/src/interface/overlay.h --- filezilla-3.15.0.2/src/interface/overlay.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/overlay.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,28 @@ +#ifndef FILEZILLA_INTERFACE_OVERLAY_HEADER +#define FILEZILLA_INTERFACE_OVERLAY_HEADER + +#include + +class OverlayWindow : public wxPopupWindow +{ +public: + OverlayWindow(wxWindow* parent) + : wxPopupWindow(parent) + {} + + void SetAnchor(wxWindow* anchor, wxPoint const& offset); + +private: + void OnTLWMove(wxMoveEvent & evt); + void OnTLWShow(wxShowEvent & evt); + void OnTLWActivate(wxActivateEvent & evt); + void OnAnchorSize(wxSizeEvent & evt); + + void UpdateShown(); + void Reposition(); + + wxWindow* anchor_{}; + wxPoint offset_; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/interface/password_crypto.cpp filezilla-3.33.0/src/interface/password_crypto.cpp --- filezilla-3.15.0.2/src/interface/password_crypto.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/password_crypto.cpp 2017-06-02 20:38:13.000000000 +0000 @@ -0,0 +1,206 @@ +#include + +#include "password_crypto.h" + +#include + +#include + +#include +#include +#include +#include +#include + +std::string public_key::to_base64() const +{ + auto raw = std::string(key_.cbegin(), key_.cend()); + raw += std::string(salt_.cbegin(), salt_.cend()); + return fz::base64_encode(raw); +} + +public_key public_key::from_base64(std::string const& base64) +{ + public_key ret; + + auto raw = fz::base64_decode(base64); + if (raw.size() == key_size + salt_size) { + auto p = reinterpret_cast(&raw[0]); + ret.key_.assign(p, p + key_size); + ret.salt_.assign(p + key_size, p + key_size + salt_size); + } + + return ret; +} + +private_key private_key::generate() +{ + private_key ret; + + ret.key_ = fz::random_bytes(key_size); + ret.key_[0] &= 248; + ret.key_[31] &= 127; + ret.key_[31] |= 64; + + ret.salt_ = fz::random_bytes(salt_size); + + return ret; +} + +public_key private_key::pubkey() const +{ + public_key ret; + + if (*this) { + static const uint8_t nine[32]{ + 9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; + + ret.key_.resize(32); + nettle_curve25519_mul(&ret.key_[0], &key_[0], nine); + + ret.salt_ = salt_; + } + + return ret; +} + +private_key private_key::from_password(std::vector const& password, std::vector const& salt) +{ + private_key ret; + + if (!password.empty() && salt.size() == salt_size) { + + std::vector key; + key.resize(key_size); + nettle_pbkdf2_hmac_sha256(password.size(), &password[0], 100000, salt_size, &salt[0], 32, &key[0]); + key[0] &= 248; + key[31] &= 127; + key[31] |= 64; + + ret.key_ = std::move(key); + ret.salt_ = salt; + } + + return ret; +} + +std::vector private_key::shared_secret(public_key const& pub) const +{ + std::vector ret; + + if (*this && pub) { + ret.resize(32); + + nettle_curve25519_mul(&ret[0], &key_[0], &pub.key_[0]); + } + + return ret; +} + +namespace { +class sha256 final +{ +public: + sha256() + { + nettle_sha256_init(&ctx_); + } + + sha256(sha256 const&) = delete; + sha256& operator=(sha256 const&) = delete; + + operator std::vector() + { + std::vector ret; + ret.resize(32); + + nettle_sha256_digest(&ctx_, 32, &ret[0]); + + return ret; + } + + sha256& operator<<(uint8_t in) + { + nettle_sha256_update(&ctx_, 1, &in); + return *this; + } + + sha256& operator<<(std::vector in) + { + if (!in.empty()) { + nettle_sha256_update(&ctx_, in.size(), &in[0]); + } + return *this; + } + +private: + sha256_ctx ctx_; +}; + +} + +std::vector encrypt(std::vector const& plain, public_key const& pub) +{ + std::vector ret; + + private_key ephemeral = private_key::generate(); + public_key ephemeral_pub = ephemeral.pubkey(); + + if (pub && ephemeral && ephemeral_pub) { + // Generate shared secret from pub and ephemeral + std::vector secret = ephemeral.shared_secret(pub); + + // Derive AES2556 key and CTR nonce from shared secret + std::vector aes_key = sha256() << ephemeral_pub.salt_ << 0 << secret << ephemeral_pub.key_ << pub.key_ << pub.salt_; + std::vector ctr = sha256() << ephemeral_pub.salt_ << 1 << secret << ephemeral_pub.key_ << pub.key_ << pub.salt_; + + aes256_ctx ctx; + aes256_set_encrypt_key(&ctx, &aes_key[0]); + + // Encrypt plaintext with AES256-CTR + ret.resize(public_key::key_size + public_key::salt_size + plain.size()); + nettle_ctr_crypt(&ctx, reinterpret_cast(nettle_aes256_encrypt), 16, &ctr[0], plain.size(), &ret[public_key::key_size + public_key::salt_size], &plain[0]); + + // Return ephemeral_pub.key_||ephemeral_pub.salt_||ciphertext + memcpy(&ret[0], &ephemeral_pub.key_[0], public_key::key_size); + memcpy(&ret[public_key::key_size], &ephemeral_pub.salt_[0], public_key::salt_size); + } + + return ret; +} + +std::vector decrypt(std::vector const& cipher, private_key const& priv) +{ + std::vector ret; + + if (priv && cipher.size() > public_key::key_size + public_key::salt_size) { + // Extract ephemeral_pub from cipher + public_key ephemeral_pub; + ephemeral_pub.key_.resize(public_key::key_size); + ephemeral_pub.salt_.resize(public_key::salt_size); + memcpy(&ephemeral_pub.key_[0], &cipher[0], public_key::key_size); + memcpy(&ephemeral_pub.salt_[0], &cipher[public_key::key_size], public_key::salt_size); + + // Generate shared secret from ephemeral_pub and priv + std::vector secret = priv.shared_secret(ephemeral_pub); + + // Derive AES2556 key and CTR nonce from shared secret + public_key pub = priv.pubkey(); + std::vector aes_key = sha256() << ephemeral_pub.salt_ << 0 << secret << ephemeral_pub.key_ << pub.key_ << pub.salt_; + std::vector ctr = sha256() << ephemeral_pub.salt_ << 1 << secret << ephemeral_pub.key_ << pub.key_ << pub.salt_; + + aes256_ctx ctx; + aes256_set_encrypt_key(&ctx, &aes_key[0]); + + // Decrypt ciphertext with AES256-CTR + ret.resize(cipher.size() - (public_key::key_size + public_key::salt_size)); + nettle_ctr_crypt(&ctx, reinterpret_cast(nettle_aes256_encrypt), 16, &ctr[0], ret.size(), &ret[0], &cipher[public_key::key_size + public_key::salt_size]); + + // Return the plaintext + } + + return ret; +} diff -Nru filezilla-3.15.0.2/src/interface/password_crypto.h filezilla-3.33.0/src/interface/password_crypto.h --- filezilla-3.15.0.2/src/interface/password_crypto.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/password_crypto.h 2017-06-02 20:38:13.000000000 +0000 @@ -0,0 +1,96 @@ +#ifndef FILEZILLA_INSTALLER_PASSWORD_CRYPTO_HEADER +#define FILEZILLA_INSTALLER_PASSWORD_CRYPTO_HEADER + +#include +#include + +class public_key +{ +public: + // Very simple structure to represent a X25519 public key with associated salt. + + enum { + key_size = 32, + salt_size = 32 + }; + + explicit operator bool() const { + return key_.size() == key_size && salt_.size() == salt_size; + } + + bool operator==(public_key const& rhs) const { + return key_ == rhs.key_ && salt_ == rhs.salt_; + } + + bool operator!=(public_key const& rhs) const { + return !(*this == rhs); + } + + bool operator<(public_key const& rhs) const { + return key_ < rhs.key_ || (key_ == rhs.key_ && salt_ < rhs.salt_); + } + + std::string to_base64() const; + static public_key from_base64(std::string const& base64); + + std::vector key_; + std::vector salt_; +}; + +class private_key +{ +public: + // Very simple structure to represent a X25519 private key with associated salt. + // See RFC 7748 for the X22519 specs. + enum { + key_size = 32, + salt_size = 32 + }; + + private_key() = default; + private_key(private_key const&) = default; + + // Generates a random private key + static private_key generate(); + + // Generates a private key using PKBDF2-SHA256 from the given password + static private_key from_password(std::vector const& password, std::vector const& salt); + static private_key from_password(std::string const& password, std::vector const& salt) + { + return from_password(std::vector(password.begin(), password.end()), salt); + } + + explicit operator bool() const { + return key_.size() == key_size && salt_.size() == salt_size; + } + + std::vector const& salt() const { + return salt_; + } + + // Gets the public key corresponding to the private key + public_key pubkey() const; + + // Generates shared secret using Elliptic Curve Diffie-Hellman + std::vector shared_secret(public_key const& pub) const; + +private: + std::vector key_; + std::vector salt_; +}; + +// Encrypt the plaintext to the given public key. +std::vector encrypt(std::vector const& plain, public_key const& pub); +inline std::vector encrypt(std::string const& plain, public_key const& pub) +{ + return encrypt(std::vector(plain.begin(), plain.end()), pub); +} + +// Decrypt the ciphertext. The private key matching the public key the data was encrypted to must be used. +std::vector decrypt(std::vector const& chiper, private_key const& priv); +inline std::vector decrypt(std::string const& chiper, private_key const& priv) +{ + return decrypt(std::vector(chiper.begin(), chiper.end()), priv); +} + +#endif diff -Nru filezilla-3.15.0.2/src/interface/power_management.cpp filezilla-3.33.0/src/interface/power_management.cpp --- filezilla-3.15.0.2/src/interface/power_management.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/power_management.cpp 2017-03-13 04:30:03.000000000 +0000 @@ -6,19 +6,21 @@ #ifdef WITH_LIBDBUS #include "../dbus/power_management_inhibitor.h" #endif -#ifdef __WXMAC__ - // >= 10.5 Required for Power Management - #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - #include - #endif -#endif CPowerManagement* CPowerManagement::m_pPowerManagement = 0; +#ifdef __WXMAC__ +extern "C" { + void const* PowerManagmentImpl_SetBusy(); + void PowerManagmentImpl_SetIdle(void const* activity); +} +#endif + void CPowerManagement::Create(CMainFrame* pMainFrame) { - if (!m_pPowerManagement) + if (!m_pPowerManagement) { m_pPowerManagement = new CPowerManagement(pMainFrame); + } } void CPowerManagement::Destroy() @@ -28,7 +30,6 @@ } CPowerManagement::CPowerManagement(CMainFrame* pMainFrame) - : CStateEventHandler(0) { m_pMainFrame = pMainFrame; @@ -44,6 +45,7 @@ CPowerManagement::~CPowerManagement() { + DoSetIdle(); #ifdef WITH_LIBDBUS delete m_inhibitor; #endif @@ -51,7 +53,8 @@ void CPowerManagement::OnStateChange(CState*, t_statechange_notifications, wxString const&, void const*) { - if (m_pMainFrame->GetQueue()->IsActive()) { + auto const queue = m_pMainFrame->GetQueue(); + if (queue && queue->IsActive()) { DoSetBusy(); return; } @@ -69,11 +72,13 @@ void CPowerManagement::DoSetBusy() { - if (m_busy) + if (m_busy) { return; + } - if (!COptions::Get()->GetOptionVal(OPTION_PREVENT_IDLESLEEP)) + if (!COptions::Get()->GetOptionVal(OPTION_PREVENT_IDLESLEEP)) { return; + } m_busy = true; @@ -82,19 +87,16 @@ #elif defined(WITH_LIBDBUS) m_inhibitor->RequestBusy(); #elif defined(__WXMAC__) - // >= 10.5 Required for Power Management - #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - IOReturn success = IOPMAssertionCreate(kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, &m_assertionID); - if (success != kIOReturnSuccess) - m_busy = false; - #endif + activity_ = PowerManagmentImpl_SetBusy(); + m_busy = activity_ != 0; #endif } void CPowerManagement::DoSetIdle() { - if (!m_busy) + if (!m_busy) { return; + } m_busy = false; #ifdef __WXMSW__ @@ -102,10 +104,8 @@ #elif defined(WITH_LIBDBUS) m_inhibitor->RequestIdle(); #elif defined(__WXMAC__) - // >= 10.5 Required for Power Management - #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - IOPMAssertionRelease(m_assertionID); - #endif + PowerManagmentImpl_SetIdle(activity_); + activity_ = 0; #endif } @@ -114,7 +114,7 @@ #ifdef __WXMSW__ return true; #endif -#if defined(__WXMAC__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +#if defined(__WXMAC__) return true; #endif #ifdef WITH_LIBDBUS diff -Nru filezilla-3.15.0.2/src/interface/power_management.h filezilla-3.33.0/src/interface/power_management.h --- filezilla-3.15.0.2/src/interface/power_management.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/power_management.h 2017-03-13 04:30:03.000000000 +0000 @@ -1,23 +1,17 @@ -#ifndef __POWER_MANAGEMENT_H__ -#define __POWER_MANAGEMENT_H__ +#ifndef FILEZILLA_INTERFACE_POWER_MANAGEMENT_HEADER +#define FILEZILLA_INTERFACE_POWER_MANAGEMENT_HEADER // This simple class prevents the system from entering idle sleep // while FileZilla is busy #include "state.h" -#ifdef __WXMAC__ - // >= 10.5 Required for Power Management - #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - #include - #endif -#endif class CMainFrame; #ifdef WITH_LIBDBUS class CPowerManagementInhibitor; #endif -class CPowerManagement : protected CStateEventHandler +class CPowerManagement final : protected CGlobalStateEventHandler { public: static void Create(CMainFrame* pMainFrame); @@ -42,11 +36,8 @@ #ifdef WITH_LIBDBUS CPowerManagementInhibitor *m_inhibitor; #elif defined(__WXMAC__) - #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - // >= 10.5 Required for Power Management - IOPMAssertionID m_assertionID; - #endif + void const* activity_{}; #endif }; -#endif //__POWER_MANAGEMENT_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/power_management_osx.m filezilla-3.33.0/src/interface/power_management_osx.m --- filezilla-3.15.0.2/src/interface/power_management_osx.m 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/power_management_osx.m 2017-03-13 13:18:36.000000000 +0000 @@ -0,0 +1,18 @@ +#include + +void const* PowerManagmentImpl_SetBusy() +{ + NSActivityOptions opt = NSActivityUserInitiated | NSActivityIdleSystemSleepDisabled; + id activity = [[NSProcessInfo processInfo] beginActivityWithOptions:opt reason:@"Preventing idle sleep during transfers and other operations."]; + return CFBridgingRetain(activity); +} + +void PowerManagmentImpl_SetIdle(void* activity) +{ + if (activity) { + id activityId = CFBridgingRelease(activity); + [[NSProcessInfo processInfo] endActivity:activityId]; + } +} + + diff -Nru filezilla-3.15.0.2/src/interface/queue.cpp filezilla-3.33.0/src/interface/queue.cpp --- filezilla-3.15.0.2/src/interface/queue.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/queue.cpp 2018-04-27 11:26:14.000000000 +0000 @@ -14,14 +14,16 @@ CQueueItem::~CQueueItem() { - for (auto iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter) + for (auto iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter) { delete *iter; + } } void CQueueItem::SetPriority(QueuePriority priority) { - for (auto iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter) + for (auto iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter) { (*iter)->SetPriority(priority); + } } void CQueueItem::AddChild(CQueueItem* item) @@ -49,15 +51,17 @@ CQueueItem* CQueueItem::GetChild(unsigned int item, bool recursive) { if (!recursive) { - if (item + m_removed_at_front >= m_children.size()) + if (item + m_removed_at_front >= m_children.size()) { return 0; + } return *(m_children.begin() + item + m_removed_at_front); } std::vector::iterator iter = m_children.begin() + m_removed_at_front; for (; iter != m_children.end(); ++iter) { - if (!item) + if (!item) { return *iter; + } unsigned int count = (*iter)->GetChildrenCount(true); if (item > count) { @@ -96,18 +100,20 @@ if (*iter == pItem) { visibleOffspring -= 1; visibleOffspring -= pItem->GetChildrenCount(true); - if (destroy) + if (destroy) { delete pItem; + } if (iter - m_children.begin() - m_removed_at_front <= 10) { - m_removed_at_front++; + ++m_removed_at_front; unsigned int end = iter - m_children.begin(); - int c = 0; - for (int i = end; i >= m_removed_at_front; i--, c++) + for (int i = end; i >= m_removed_at_front; --i) { m_children[i] = m_children[i - 1]; + } } - else + else { m_children.erase(iter); + } deleted = true; return; @@ -121,13 +127,15 @@ delete *iter; if (iter - m_children.begin() - m_removed_at_front <= 10) { - m_removed_at_front++; + ++m_removed_at_front; unsigned int end = iter - m_children.begin(); - for (int i = end; i >= m_removed_at_front; i--) + for (int i = end; i >= m_removed_at_front; --i) { m_children[i] = m_children[i - 1]; + } } - else + else { m_children.erase(iter); + } } deleted = true; @@ -151,8 +159,9 @@ } } - if (!deleted) + if (!deleted) { return false; + } if (GetType() == QueueItemType::Server) { static_cast(this)->m_visibleOffspring = visibleOffspring; @@ -173,8 +182,9 @@ CQueueItem* CQueueItem::GetTopLevelItem() { - if (!m_parent) + if (!m_parent) { return this; + } CQueueItem* newParent = m_parent; CQueueItem* parent = 0; @@ -188,13 +198,13 @@ const CQueueItem* CQueueItem::GetTopLevelItem() const { - if (!m_parent) + if (!m_parent) { return this; + } const CQueueItem* newParent = m_parent; const CQueueItem* parent = 0; - while (newParent) - { + while (newParent) { parent = newParent; newParent = newParent->GetParent(); } @@ -205,14 +215,15 @@ int CQueueItem::GetItemIndex() const { const CQueueItem* pParent = GetParent(); - if (!pParent) + if (!pParent) { return 0; + } int index = 1; - for (std::vector::const_iterator iter = pParent->m_children.begin() + pParent->m_removed_at_front; iter != pParent->m_children.end(); ++iter) - { - if (*iter == this) + for (std::vector::const_iterator iter = pParent->m_children.begin() + pParent->m_removed_at_front; iter != pParent->m_children.end(); ++iter) { + if (*iter == this) { break; + } index += (*iter)->GetChildrenCount(true) + 1; } @@ -221,19 +232,21 @@ } CFileItem::CFileItem(CServerItem* parent, bool queued, bool download, - const wxString& sourceFile, const wxString& targetFile, - const CLocalPath& localPath, const CServerPath& remotePath, int64_t size) + std::wstring const& sourceFile, std::wstring const& targetFile, + CLocalPath const& localPath, CServerPath const& remotePath, int64_t size) : CQueueItem(parent) , m_sourceFile(sourceFile) - , m_targetFile(targetFile.empty() ? CSparseOptional() : CSparseOptional(to_wstring(targetFile))) + , m_targetFile(targetFile.empty() ? fz::sparse_optional() : fz::sparse_optional(targetFile)) , m_localPath(localPath) , m_remotePath(remotePath) , m_size(size) { - if (download) + if (download) { flags |= flag_download; - if (queued) + } + if (queued) { flags |= flag_queued; + } } CFileItem::~CFileItem() @@ -242,11 +255,11 @@ void CFileItem::SetPriority(QueuePriority priority) { - if (priority == m_priority) + if (priority == m_priority) { return; + } - if (m_parent) - { + if (m_parent) { CServerItem* parent = static_cast(m_parent); parent->SetChildPriority(this, m_priority, priority); } @@ -279,30 +292,36 @@ void CFileItem::SaveItem(pugi::xml_node& element) const { - if (m_edit != CEditHandler::none || !element) + if (m_edit != CEditHandler::none || !element) { return; + } auto file = element.append_child("File"); AddTextElement(file, "LocalFile", m_localPath.GetPath() + GetLocalFile()); AddTextElement(file, "RemoteFile", GetRemoteFile()); AddTextElement(file, "RemotePath", m_remotePath.GetSafePath()); - AddTextElementRaw(file, "Download", Download() ? "1" : "0"); - if (m_size != -1) + AddTextElementUtf8(file, "Download", Download() ? "1" : "0"); + if (m_size != -1) { AddTextElement(file, "Size", m_size); - if (m_errorCount) + } + if (m_errorCount) { AddTextElement(file, "ErrorCount", m_errorCount); - if (m_priority != QueuePriority::normal) + } + if (m_priority != QueuePriority::normal) { AddTextElement(file, "Priority", static_cast(m_priority)); - AddTextElementRaw(file, "DataType", Ascii() ? "0" : "1"); - if (m_defaultFileExistsAction != CFileExistsNotification::unknown) + } + AddTextElementUtf8(file, "DataType", Ascii() ? "0" : "1"); + if (m_defaultFileExistsAction != CFileExistsNotification::unknown) { AddTextElement(file, "OverwriteAction", m_defaultFileExistsAction); + } } bool CFileItem::TryRemoveAll() { - if (!IsActive()) + if (!IsActive()) { return true; + } set_pending_remove(true); return false; @@ -310,10 +329,12 @@ void CFileItem::SetTargetFile(wxString const& file) { - if (!file.empty() && file != m_sourceFile) - m_targetFile = CSparseOptional(to_wstring(file)); - else + if (!file.empty() && file != m_sourceFile) { + m_targetFile = fz::sparse_optional(to_wstring(file)); + } + else { m_targetFile.clear(); + } } void CFileItem::SetStatusMessage(CFileItem::Status status) @@ -340,16 +361,16 @@ _("Creating directory") }; - return statusTexts[m_status]; + return statusTexts[std::underlying_type_t(m_status)]; } -CFolderItem::CFolderItem(CServerItem* parent, bool queued, const CLocalPath& localPath) - : CFileItem(parent, queued, true, wxEmptyString, wxEmptyString, localPath, CServerPath(), -1) +CFolderItem::CFolderItem(CServerItem* parent, bool queued, CLocalPath const& localPath) + : CFileItem(parent, queued, true, std::wstring(), std::wstring(), localPath, CServerPath(), -1) { } -CFolderItem::CFolderItem(CServerItem* parent, bool queued, const CServerPath& remotePath, const wxString& remoteFile) - : CFileItem(parent, queued, false, _T(""), remoteFile, CLocalPath(), remotePath, -1) +CFolderItem::CFolderItem(CServerItem* parent, bool queued, CServerPath const& remotePath, std::wstring const& remoteFile) + : CFileItem(parent, queued, false, std::wstring(), remoteFile, CLocalPath(), remotePath, -1) { } @@ -357,26 +378,29 @@ { auto file = element.append_child("Folder"); - if (Download()) + if (Download()) { AddTextElement(file, "LocalFile", GetLocalPath().GetPath() + GetLocalFile()); + } else { AddTextElement(file, "RemoteFile", GetRemoteFile()); AddTextElement(file, "RemotePath", m_remotePath.GetSafePath()); } - AddTextElementRaw(file, "Download", Download() ? "1" : "0"); + AddTextElementUtf8(file, "Download", Download() ? "1" : "0"); } void CFolderItem::SetActive(const bool active) { - if (active) + if (active) { flags |= flag_active; - else + } + else { flags &= ~flag_active; + } } -CServerItem::CServerItem(const CServer& server) +CServerItem::CServerItem(ServerWithCredentials const& server) : m_activeCount(0) - , m_server(server) + , server_(server) { } @@ -384,14 +408,14 @@ { } -const CServer& CServerItem::GetServer() const +ServerWithCredentials const& CServerItem::GetServer() const { - return m_server; + return server_; } wxString CServerItem::GetName() const { - return m_server.FormatServer(); + return server_.Format(ServerFormat::with_user_and_optional_port); } void CServerItem::AddChild(CQueueItem* pItem) @@ -409,16 +433,18 @@ unsigned int CServerItem::GetChildrenCount(bool recursive) const { - if (!recursive) + if (!recursive) { return m_children.size() - m_removed_at_front; + } return m_visibleOffspring; } void CServerItem::AddFileItemToList(CFileItem* pItem) { - if (!pItem) + if (!pItem) { return; + } m_fileList[pItem->queued() ? 0 : 1][static_cast(pItem->GetPriority())].push_back(pItem); } @@ -451,17 +477,79 @@ CQueueItem *pItem = *iter; if (pItem->GetType() == QueueItemType::File) { CFileItem* pFileItem = ((CFileItem *)pItem); - if (direction == TransferDirection::upload && pFileItem->Download()) + if (direction == TransferDirection::upload && pFileItem->Download()) { continue; - else if (direction == TransferDirection::download && !pFileItem->Download()) + } + else if (direction == TransferDirection::download && !pFileItem->Download()) { continue; + } pFileItem->m_defaultFileExistsAction = action; } - else if (pItem->GetType() == QueueItemType::FolderScan) { - if (direction == TransferDirection::download) - continue; - ((CFolderScanItem *)pItem)->m_defaultFileExistsAction = action; - } + } +} + +void CServerItem::Sort(int col, bool reverse) +{ + auto const cmpLocalName = [](CFileItem const& l, CFileItem const& r) { + return std::tie(l.GetLocalPath(), l.GetLocalFile()) < std::tie(r.GetLocalPath(), r.GetLocalFile()); + }; + auto const cmpRemoteName = [](CFileItem const& l, CFileItem const& r) { + return std::tie(l.GetRemotePath(), l.GetRemoteFile()) < std::tie(r.GetRemotePath(), r.GetRemoteFile()); + }; + auto const cmpSize = [](CFileItem const& l, CFileItem const& r) { + return l.GetSize() < r.GetSize(); + }; + auto const cmpDirection = [](CFileItem const& l, CFileItem const& r) { + return l.Download() < r.Download(); + }; + auto const cmpStatus = [](CFileItem const& l, CFileItem const& r) { + return l.GetStatusMessage() < r.GetStatusMessage(); + }; + + bool (*cmp)(CFileItem const&, CFileItem const&); + switch (col) { + case 0: + cmp = cmpLocalName; + break; + case 1: + cmp = cmpDirection; + break; + case 2: + cmp = cmpRemoteName; + break; + case 3: + cmp = cmpSize; + break; + case 4: + cmp = cmpStatus; + break; + default: + return; + } + + std::function fn; + if (reverse) { + fn = [&cmp](CQueueItem * l, CQueueItem * r) { return cmp(static_cast(*r), static_cast(*l)); }; + } + else { + fn = [&cmp](CQueueItem * l, CQueueItem * r) { return cmp(static_cast(*l), static_cast(*r)); }; + } + + + std::stable_sort(m_children.begin() + m_removed_at_front, m_children.end(), fn); + + m_lookupCache.clear(); + m_maxCachedIndex = -1; + + // Rebuild m_fileList + for (size_t i = 0; i < static_cast(QueuePriority::count); ++i) { + m_fileList[0][i].clear(); + m_fileList[1][i].clear(); + } + + for (auto it = m_children.cbegin() + m_removed_at_front; it != m_children.cend(); ++it) { + CFileItem *pItem = static_cast(*it); + m_fileList[pItem->queued() ? 0 : 1][static_cast(pItem->GetPriority())].push_back(pItem); } } @@ -469,8 +557,9 @@ { std::vector::iterator iter; if (!recursive) { - if (item + m_removed_at_front >= m_children.size()) + if (item + m_removed_at_front >= m_children.size()) { return 0; + } iter = m_children.begin(); iter += item + m_removed_at_front; return *iter; @@ -481,10 +570,12 @@ iter = m_children.begin() + m_removed_at_front; iter += m_lookupCache[item].child; item -= m_lookupCache[item].index; - if (!item) + if (!item) { return *iter; - else + } + else { return (*iter)->GetChild(item - 1); + } } int index; @@ -503,8 +594,9 @@ } for (; iter != m_children.end(); ++iter, ++child) { - if (!item) + if (!item) { return *iter; + } unsigned int count = (*iter)->GetChildrenCount(true); if (item > count) { @@ -531,19 +623,22 @@ int i = 0; for (i = static_cast(QueuePriority::count) - 1; i >= 0; --i) { for (auto const& item : fileList[i]) { - if (item->IsActive()) + if (item->IsActive()) { continue; + } - if (direction == TransferDirection::both) + if (direction == TransferDirection::both) { return item; + } - if (direction == TransferDirection::download) - { - if (item->Download()) + if (direction == TransferDirection::download) { + if (item->Download()) { return item; + } } - else if (!item->Download()) + else if (!item->Download()) { return item; + } } } return 0; @@ -561,8 +656,9 @@ bool CServerItem::RemoveChild(CQueueItem* pItem, bool destroy, bool forward) { - if (!pItem) + if (!pItem) { return false; + } if (pItem->GetType() == QueueItemType::File || pItem->GetType() == QueueItemType::Folder) { CFileItem* pFileItem = static_cast(pItem); @@ -573,7 +669,7 @@ if (removed) { m_maxCachedIndex = -1; } - + wxASSERT(m_visibleOffspring >= static_cast(m_children.size()) - m_removed_at_front); wxASSERT(((m_children.size() - m_removed_at_front) != 0) == (m_visibleOffspring != 0)); @@ -588,8 +684,9 @@ for (auto iter = fileList.rbegin(); iter != fileList.rend(); ++iter) { CFileItem* item = *iter; wxASSERT(!item->queued()); - if (item->IsActive()) + if (item->IsActive()) { activeList.push_front(item); + } else { item->set_queued(true); m_fileList[0][i].push_front(item); @@ -601,13 +698,15 @@ void CServerItem::QueueImmediateFile(CFileItem* pItem) { - if (pItem->queued()) + if (pItem->queued()) { return; + } std::deque& fileList = m_fileList[1][static_cast(pItem->GetPriority())]; for (auto iter = fileList.begin(); iter != fileList.end(); ++iter) { - if (*iter != pItem) + if (*iter != pItem) { continue; + } pItem->set_queued(true); fileList.erase(iter); @@ -619,14 +718,15 @@ void CServerItem::SaveItem(pugi::xml_node& element) const { - auto server = element.append_child("Server"); - SetServer(server, m_server); + auto server_node = element.append_child("Server"); + SetServer(server_node, server_); - for (auto iter = m_children.cbegin() + m_removed_at_front; iter != m_children.cend(); ++iter) - (*iter)->SaveItem(server); + for (auto iter = m_children.cbegin() + m_removed_at_front; iter != m_children.cend(); ++iter) { + (*iter)->SaveItem(server_node); + } } -int64_t CServerItem::GetTotalSize(int& filesWithUnknownSize, int& queuedFiles, int& folderScanCount) const +int64_t CServerItem::GetTotalSize(int& filesWithUnknownSize, int& queuedFiles) const { int64_t totalSize = 0; for (int i = 0; i < static_cast(QueuePriority::count); ++i) { @@ -634,10 +734,12 @@ const std::deque& fileList = m_fileList[j][i]; for (auto const& item : fileList) { int64_t size = item->GetSize(); - if (size >= 0) + if (size >= 0) { totalSize += size; - else + } + else { filesWithUnknownSize++; + } } } } @@ -646,8 +748,6 @@ if ((*iter)->GetType() == QueueItemType::File || (*iter)->GetType() == QueueItemType::Folder) queuedFiles++; - else if ((*iter)->GetType() == QueueItemType::FolderScan) - folderScanCount++; } return totalSize; @@ -697,19 +797,23 @@ m_maxCachedIndex = -1; m_removed_at_front = 0; - for (int i = 0; i < 2; ++i) - for (int j = 0; j < static_cast(QueuePriority::count); j++) + for (int i = 0; i < 2; ++i) { + for (int j = 0; j < static_cast(QueuePriority::count); ++j) { m_fileList[i][j].clear(); + } + } } void CServerItem::SetPriority(QueuePriority priority) { std::vector::iterator iter; for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter) { - if ((*iter)->GetType() == QueueItemType::File) + if ((*iter)->GetType() == QueueItemType::File) { ((CFileItem*)(*iter))->SetPriorityRaw(priority); - else + } + else { (*iter)->SetPriority(priority); + } } for (int i = 0; i < 2; ++i) @@ -726,8 +830,9 @@ int i = pItem->queued() ? 0 : 1; for (auto iter = m_fileList[i][static_cast(oldPriority)].begin(); iter != m_fileList[i][static_cast(oldPriority)].end(); ++iter) { - if (*iter != pItem) + if (*iter != pItem) { continue; + } m_fileList[i][static_cast(oldPriority)].erase(iter); m_fileList[i][static_cast(newPriority)].push_back(pItem); @@ -737,24 +842,6 @@ wxFAIL; } -CFolderScanItem::CFolderScanItem(CServerItem* parent, bool queued, bool download, const CLocalPath& localPath, const CServerPath& remotePath) - : CQueueItem(parent) - , m_queued(queued) - , m_localPath(localPath) - , m_remotePath(remotePath) - , m_download(download) -{ -} - -bool CFolderScanItem::TryRemoveAll() -{ - if (!m_active) - return true; - - m_remove = true; - return false; -} - // -------------- // CQueueViewBase // -------------- @@ -774,24 +861,14 @@ , m_title(title) { m_pQueue = parent; - m_insertionStart = -1; - m_insertionCount = 0; - m_itemCount = 0; - m_allowBackgroundErase = true; - - m_fileCount = 0; - m_folderScanCount = 0; - m_fileCountChanged = false; - m_folderScanCountChanged = false; // Create and assign the image list for the queue wxSize s = CThemeProvider::GetIconSize(iconSizeSmall); wxImageList* pImageList = new wxImageList(s.x, s.y); - pImageList->Add(wxArtProvider::GetBitmap(_T("ART_SERVER"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall))); - pImageList->Add(wxArtProvider::GetBitmap(_T("ART_FILE"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall))); - pImageList->Add(wxArtProvider::GetBitmap(_T("ART_FOLDERCLOSED"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall))); - pImageList->Add(wxArtProvider::GetBitmap(_T("ART_FOLDER"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall))); + pImageList->Add(CThemeProvider::Get()->CreateBitmap(_T("ART_SERVER"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall))); + pImageList->Add(CThemeProvider::Get()->CreateBitmap(_T("ART_FILE"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall))); + pImageList->Add(CThemeProvider::Get()->CreateBitmap(_T("ART_FOLDER"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall))); AssignImageList(pImageList, wxIMAGE_LIST_SMALL); @@ -800,15 +877,17 @@ CQueueViewBase::~CQueueViewBase() { - for (std::vector::iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) - delete *iter; + for (auto server : m_serverList) { + delete server; + } } CQueueItem* CQueueViewBase::GetQueueItem(unsigned int item) const { for (auto iter = m_serverList.cbegin(); iter != m_serverList.cend(); ++iter) { - if (!item) + if (!item) { return *iter; + } unsigned int count = (*iter)->GetChildrenCount(true); if (item > count) { @@ -826,10 +905,10 @@ const CQueueItem* pTopLevelItem = item->GetTopLevelItem(); int index = 0; - for (std::vector::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) - { - if (pTopLevelItem == *iter) + for (std::vector::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) { + if (pTopLevelItem == *iter) { break; + } index += (*iter)->GetChildrenCount(true) + 1; } @@ -839,20 +918,23 @@ void CQueueViewBase::OnEraseBackground(wxEraseEvent& event) { - if (m_allowBackgroundErase) + if (m_allowBackgroundErase) { event.Skip(); + } } wxString CQueueViewBase::OnGetItemText(long item, long column) const { - if (column < 0 || static_cast(column) >= m_columns.size()) + if (column < 0 || static_cast(column) >= m_columns.size()) { return wxString(); + } CQueueViewBase* pThis = const_cast(this); CQueueItem* pItem = pThis->GetQueueItem(item); - if (!pItem) + if (!pItem) { return wxString(); + } return OnGetItemText(pItem, m_columns[column]); } @@ -864,8 +946,9 @@ case QueueItemType::Server: { CServerItem* pServerItem = static_cast(pItem); - if (!column) + if (!column) { return pServerItem->GetName(); + } } break; case QueueItemType::File: @@ -876,26 +959,34 @@ case colLocalName: return _T(" ") + pFileItem->GetLocalPath().GetPath() + pFileItem->GetLocalFile(); case colDirection: - if (pFileItem->Download()) - if (pFileItem->queued()) + if (pFileItem->Download()) { + if (pFileItem->queued()) { return _T("<--"); - else + } + else { return _T("<<--"); - else - if (pFileItem->queued()) + } + } + else { + if (pFileItem->queued()) { return _T("-->"); - else + } + else { return _T("-->>"); + } + } break; case colRemoteName: return pFileItem->GetRemotePath().FormatFilename(pFileItem->GetRemoteFile()); case colSize: { auto const& size = pFileItem->GetSize(); - if (size >= 0) + if (size >= 0) { return CSizeFormat::Format(size); - else + } + else { return _T("?"); + } } case colPriority: switch (pFileItem->GetPriority()) @@ -923,65 +1014,40 @@ } } break; - case QueueItemType::FolderScan: - { - CFolderScanItem* pFolderItem = static_cast(pItem); - switch (column) - { - case colLocalName: - return _T(" ") + pFolderItem->GetLocalPath().GetPath(); - case colDirection: - if (pFolderItem->Download()) - if (pFolderItem->queued()) - return _T("<--"); - else - return _T("<<--"); - else - if (pFolderItem->queued()) - return _T("-->"); - else - return _T("-->>"); - break; - case colRemoteName: - return pFolderItem->GetRemotePath().GetPath(); - case colTransferStatus: - case colErrorReason: - return pFolderItem->m_statusMessage; - case colTime: - return CTimeFormat::FormatDateTime(pItem->GetTime()); - default: - break; - } - } - break; case QueueItemType::Folder: { CFileItem* pFolderItem = static_cast(pItem); switch (column) { case colLocalName: - if (pFolderItem->Download()) + if (pFolderItem->Download()) { return _T(" ") + pFolderItem->GetLocalPath().GetPath() + pFolderItem->GetLocalFile(); + } break; case colDirection: if (pFolderItem->Download()) - if (pFolderItem->queued()) + if (pFolderItem->queued()) { return _T("<--"); - else + } + else { return _T("<<--"); + } else - if (pFolderItem->queued()) + if (pFolderItem->queued()) { return _T("-->"); - else + } + else { return _T("-->>"); + } break; case colRemoteName: - if (!pFolderItem->Download()) - { - if (pFolderItem->GetRemoteFile().empty()) + if (!pFolderItem->Download()) { + if (pFolderItem->GetRemoteFile().empty()) { return pFolderItem->GetRemotePath().GetPath(); - else + } + else { return pFolderItem->GetRemotePath().FormatFilename(pFolderItem->GetRemoteFile()); + } } break; case colPriority: @@ -1022,8 +1088,9 @@ CQueueViewBase* pThis = const_cast(this); CQueueItem* pItem = pThis->GetQueueItem(item); - if (!pItem) + if (!pItem) { return -1; + } switch (pItem->GetType()) { @@ -1031,9 +1098,8 @@ return 0; case QueueItemType::File: return 1; - case QueueItemType::FolderScan: case QueueItemType::Folder: - return 3; + return 2; default: return -1; } @@ -1050,20 +1116,18 @@ #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) const int selection_count = GetSelectedItemCount(); - if (!selection_count) + if (!selection_count) { return; + } #endif // Go through all items, keep record of the previous selected item int item = GetNextItem(added - 1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); int prevItem = -1; - while (item != -1) - { - if (prevItem != -1) - { - if (prevItem + 1 != item) - { + while (item != -1) { + if (prevItem != -1) { + if (prevItem + 1 != item) { // Previous selected item was not the direct predecessor // That means we have to select the successor of prevItem // and unselect current item @@ -1071,8 +1135,7 @@ SetItemState(item, 0, wxLIST_STATE_SELECTED); } } - else - { + else { // First selected item, no predecessor yet. We have to unselect SetItemState(item, 0, wxLIST_STATE_SELECTED); } @@ -1080,8 +1143,7 @@ item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); } - if (prevItem != -1 && prevItem < m_itemCount - 1) - { + if (prevItem != -1 && prevItem < m_itemCount - 1) { // Move the very last selected item SetItemState(prevItem + 1, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } @@ -1091,30 +1153,38 @@ void CQueueViewBase::UpdateSelections_ItemRangeAdded(int added, int count) { + wxASSERT(GetItemCount() == m_itemCount); #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) const int selection_count = GetSelectedItemCount(); - if (!selection_count) + if (!selection_count) { return; + } #endif std::deque itemsToSelect; // Go through all selected items int item = GetNextItem(added - 1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - while (item != -1) { // Select new items preceding to current one while (!itemsToSelect.empty() && itemsToSelect.front() < item) { SetItemState(itemsToSelect.front(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); itemsToSelect.pop_front(); } - if (itemsToSelect.empty()) - SetItemState(item, 0, wxLIST_STATE_SELECTED); - else if (itemsToSelect.front() == item) + if (itemsToSelect.front() == item) { itemsToSelect.pop_front(); + } + else { + SetItemState(item, 0, wxLIST_STATE_SELECTED); + } - itemsToSelect.push_back(item + count); + if (item + count < GetItemCount()) { + // On generic list controls, new items may be selected by default after + // increasing the item count: Internally it sometimes keeps track + // of only unselected items. + itemsToSelect.push_back(item + count); + } item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); } @@ -1128,8 +1198,9 @@ #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) const int selection_count = GetSelectedItemCount(); - if (!selection_count) + if (!selection_count) { return; + } #endif SetItemState(removed, 0, wxLIST_STATE_SELECTED); @@ -1137,12 +1208,9 @@ int item = GetNextItem(removed - 1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); int prevItem = -1; - while (item != -1) - { - if (prevItem != -1) - { - if (prevItem + 1 != item) - { + while (item != -1) { + if (prevItem != -1) { + if (prevItem + 1 != item) { // Previous selected item was not the direct predecessor // That means we have to select our predecessor and unselect // prevItem @@ -1150,8 +1218,7 @@ SetItemState(item - 1, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } } - else - { + else { // First selected item, no predecessor yet. We have to unselect SetItemState(item - 1, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } @@ -1159,8 +1226,7 @@ item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); } - if (prevItem != -1) - { + if (prevItem != -1) { SetItemState(prevItem, 0, wxLIST_STATE_SELECTED); } } @@ -1170,8 +1236,9 @@ #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) const int selection_count = GetSelectedItemCount(); - if (!selection_count) + if (!selection_count) { return; + } #endif SetItemState(removed, 0, wxLIST_STATE_SELECTED); @@ -1187,12 +1254,15 @@ itemsToUnselect.pop_front(); } - if (itemsToUnselect.empty()) + if (itemsToUnselect.empty()) { SetItemState(item - count, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - else if (itemsToUnselect.front() == item - count) + } + else if (itemsToUnselect.front() == item - count) { itemsToUnselect.pop_front(); - else + } + else { SetItemState(item - count, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + } itemsToUnselect.push_back(item); @@ -1213,7 +1283,7 @@ m_columns.push_back(id); } -void CQueueViewBase::CreateColumns(std::list const& extraColumns) +void CQueueViewBase::CreateColumns(std::vector const& extraColumns) { AddQueueColumn(colLocalName); AddQueueColumn(colDirection); @@ -1221,31 +1291,31 @@ AddQueueColumn(colSize); AddQueueColumn(colPriority); - for( std::list::const_iterator it = extraColumns.begin(); it != extraColumns.end(); ++it) - AddQueueColumn(*it); + for (auto id : extraColumns) { + AddQueueColumn(id); + } LoadColumnSettings(OPTION_QUEUE_COLUMN_WIDTHS, -1, -1); } -CServerItem* CQueueViewBase::GetServerItem(const CServer& server) +CServerItem* CQueueViewBase::GetServerItem(ServerWithCredentials const& server) { - for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) - { - if ((*iter)->GetServer() == server) + for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) { + if ((*iter)->GetServer() == server) { return *iter; + } } return NULL; } -CServerItem* CQueueViewBase::CreateServerItem(const CServer& server) +CServerItem* CQueueViewBase::CreateServerItem(ServerWithCredentials const& server) { CServerItem* pItem = GetServerItem(server); - if (!pItem) - { + if (!pItem) { pItem = new CServerItem(server); m_serverList.push_back(pItem); - m_itemCount++; + ++m_itemCount; wxASSERT(m_insertionStart == -1); wxASSERT(m_insertionCount == 0); @@ -1261,20 +1331,22 @@ { SaveSetItemCount(m_itemCount); - if (m_insertionStart != -1) - { + if (m_insertionStart != -1) { wxASSERT(m_insertionCount != 0); - if (m_insertionCount == 1) + if (m_insertionCount == 1) { UpdateSelections_ItemAdded(m_insertionStart); - else + } + else { UpdateSelections_ItemRangeAdded(m_insertionStart, m_insertionCount); + } m_insertionStart = -1; m_insertionCount = 0; } - if (m_fileCountChanged || m_folderScanCountChanged) + if (m_fileCountChanged) { DisplayNumberQueuedFiles(); + } } void CQueueViewBase::DisplayNumberQueuedFiles() @@ -1286,21 +1358,14 @@ wxString str; if (m_fileCount > 0) { - if (!m_folderScanCount) - str.Printf(m_title + _T(" (%d)"), m_fileCount); - else - str.Printf(m_title + _T(" (%d+)"), m_fileCount); + str.Printf(m_title + _T(" (%d)"), m_fileCount); } - else - { + else { str = m_title; - if (m_folderScanCount) - str += _T(" (0+)"); } m_pQueue->SetPageText(m_pageIndex, str); m_fileCountChanged = false; - m_folderScanCountChanged = false; m_filecount_delay_timer.Start(200, true); } @@ -1312,18 +1377,16 @@ pServerItem->AddChild(pItem); m_itemCount++; - if (m_insertionStart == -1) + if (m_insertionStart == -1) { + assert(!m_insertionCount); m_insertionStart = newIndex; - m_insertionCount++; + } + ++m_insertionCount; if (pItem->GetType() == QueueItemType::File || pItem->GetType() == QueueItemType::Folder) { m_fileCount++; m_fileCountChanged = true; } - else if (pItem->GetType() == QueueItemType::FolderScan) { - m_folderScanCount++; - m_folderScanCountChanged = true; - } } bool CQueueViewBase::RemoveItem(CQueueItem* pItem, bool destroy, bool updateItemCount, bool updateSelections, bool forward) @@ -1333,16 +1396,11 @@ m_fileCount--; m_fileCountChanged = true; } - else if (pItem->GetType() == QueueItemType::FolderScan) { - wxASSERT(m_folderScanCount > 0); - m_folderScanCount--; - m_folderScanCountChanged = true; - - } int index = 0; - if (updateSelections) + if (updateSelections) { index = GetItemIndex(pItem); + } CQueueItem* topLevelItem = pItem->GetTopLevelItem(); @@ -1355,44 +1413,50 @@ if (!topLevelItem->GetChild(0)) { std::vector::iterator iter; for (iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) { - if (*iter == topLevelItem) + if (*iter == topLevelItem) { break; + } } - if (iter != m_serverList.end()) + if (iter != m_serverList.end()) { m_serverList.erase(iter); + } UpdateSelections_ItemRangeRemoved(GetItemIndex(topLevelItem), count + 1); delete topLevelItem; m_itemCount -= count + 1; - if (updateItemCount) + if (updateItemCount) { SaveSetItemCount(m_itemCount); + } didRemoveParent = true; } else { count -= topLevelItem->GetChildrenCount(true); - if (updateSelections) + if (updateSelections) { UpdateSelections_ItemRangeRemoved(index, count); + } m_itemCount -= count; - if (updateItemCount) + if (updateItemCount) { SaveSetItemCount(m_itemCount); + } didRemoveParent = false; } if (updateItemCount) { - if (m_fileCountChanged || m_folderScanCountChanged) + if (m_fileCountChanged) { DisplayNumberQueuedFiles(); - if (oldCount > m_itemCount) - { + } + if (oldCount > m_itemCount) { bool eraseBackground = GetTopItem() + GetCountPerPage() + 1 >= m_itemCount; RefreshListOnly(eraseBackground); - if (eraseBackground) + if (eraseBackground) { Update(); + } } } @@ -1422,46 +1486,51 @@ } bool forward; - if (GetLayoutDirection() != wxLayout_RightToLeft) + if (GetLayoutDirection() != wxLayout_RightToLeft) { forward = code == WXK_RIGHT; - else + } + else { forward = code == WXK_LEFT; + } int selection = m_pQueue->GetSelection(); - if (selection > 0 && !forward) + if (selection > 0 && !forward) { selection--; - else if (selection < (int)m_pQueue->GetPageCount() - 1 && forward) + } + else if (selection < (int)m_pQueue->GetPageCount() - 1 && forward) { selection++; - else + } + else { return; + } m_pQueue->SetSelection(selection); } void CQueueViewBase::OnEndColumnDrag(wxListEvent&) { - for (unsigned int i = 0; i < m_pQueue->GetPageCount(); i++) - { + for (unsigned int i = 0; i < m_pQueue->GetPageCount(); ++i) { wxWindow *page = m_pQueue->GetPage(i); - wxListCtrl* queue_page = wxDynamicCast(page, wxListCtrl); - if (!queue_page || queue_page == this) + wxListCtrl* queue_page = dynamic_cast(page); + if (!queue_page || queue_page == this) { continue; + } - for (int col = 0; col < wxMin(GetColumnCount(), queue_page->GetColumnCount()); col++) + for (int col = 0; col < wxMin(GetColumnCount(), queue_page->GetColumnCount()); ++col) { queue_page->SetColumnWidth(col, GetColumnWidth(col)); + } } } void CQueueViewBase::OnTimer(wxTimerEvent& event) { - if (event.GetId() != m_filecount_delay_timer.GetId()) - { + if (event.GetId() != m_filecount_delay_timer.GetId()) { event.Skip(); return; } - if (m_fileCountChanged || m_folderScanCountChanged) { + if (m_fileCountChanged) { DisplayNumberQueuedFiles(); } } @@ -1470,13 +1539,14 @@ { const int code = event.GetKeyCode(); const int mods = event.GetModifiers(); - if (code == 'A' && (mods == wxMOD_CMD || mods == (wxMOD_CONTROL | wxMOD_META))) - { - for (unsigned int i = 0; i < (unsigned int)GetItemCount(); i++) + if (code == 'A' && (mods == wxMOD_CMD || mods == (wxMOD_CONTROL | wxMOD_META))) { + for (unsigned int i = 0; i < (unsigned int)GetItemCount(); ++i) { SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + } } - else + else { event.Skip(); + } } void CQueueViewBase::WriteToFile(pugi::xml_node element) const @@ -1486,8 +1556,9 @@ queue = element.append_child("Queue"); } - for (std::vector::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) + for (std::vector::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) { (*iter)->SaveItem(queue); + } } void CQueueViewBase::OnExport(wxCommandEvent&) @@ -1496,10 +1567,11 @@ _T("FileZilla.xml"), _T("XML files (*.xml)|*.xml"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } - CXmlFile xml(dlg.GetPath()); + CXmlFile xml(dlg.GetPath().ToStdWstring()); auto exportRoot = xml.CreateEmpty(); diff -Nru filezilla-3.15.0.2/src/interface/queue.h filezilla-3.33.0/src/interface/queue.h --- filezilla-3.15.0.2/src/interface/queue.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/queue.h 2018-04-27 11:26:14.000000000 +0000 @@ -1,12 +1,12 @@ -#ifndef __QUEUE_H__ -#define __QUEUE_H__ +#ifndef FILEZILLA_INTERFACE_QUEUE_HEADER +#define FILEZILLA_INTERFACE_QUEUE_HEADER #include "aui_notebook_ex.h" #include "listctrlex.h" #include "edithandler.h" -#include "optional.h" +#include -enum class QueuePriority : char { +enum class QueuePriority : unsigned char { lowest, low, normal, @@ -20,7 +20,6 @@ Server, File, Folder, - FolderScan, Status }; @@ -79,14 +78,15 @@ }; class CFileItem; -class CServerItem : public CQueueItem +class CServerItem final : public CQueueItem { public: - CServerItem(const CServer& server); + CServerItem(ServerWithCredentials const& server); virtual ~CServerItem(); virtual QueueItemType GetType() const { return QueueItemType::Server; } - const CServer& GetServer() const; + ServerWithCredentials const& GetServer() const; + ProtectedCredentials& GetCredentials() {return server_.credentials; } wxString GetName() const; virtual void AddChild(CQueueItem* pItem); @@ -98,7 +98,7 @@ virtual bool RemoveChild(CQueueItem* pItem, bool destroy = true, bool forward = true); // Removes a child item with is somewhere in the tree of children virtual bool TryRemoveAll(); - int64_t GetTotalSize(int& filesWithUnknownSize, int& queuedFiles, int& folderScanCount) const; + int64_t GetTotalSize(int& filesWithUnknownSize, int& queuedFiles) const; void QueueImmediateFiles(); void QueueImmediateFile(CFileItem* pItem); @@ -117,11 +117,13 @@ const std::vector& GetChildren() const { return m_children; } + void Sort(int col, bool reverse); + protected: void AddFileItemToList(CFileItem* pItem); void RemoveFileItemFromList(CFileItem* pItem, bool forward); - CServer m_server; + ServerWithCredentials server_; // array of item lists, sorted by priority. Used by scheduler to find // next file to transfer @@ -147,8 +149,8 @@ { public: CFileItem(CServerItem* parent, bool queued, bool download, - const wxString& sourceFile, const wxString& targetFile, - const CLocalPath& localPath, const CServerPath& remotePath, int64_t size); + std::wstring const& sourceFile, std::wstring const& targetFile, + CLocalPath const& localPath, CServerPath const& remotePath, int64_t size); virtual ~CFileItem(); @@ -159,7 +161,7 @@ std::wstring const& GetLocalFile() const { return !Download() ? GetSourceFile() : (m_targetFile ? *m_targetFile : m_sourceFile); } std::wstring const& GetRemoteFile() const { return Download() ? GetSourceFile() : (m_targetFile ? *m_targetFile : m_sourceFile); } std::wstring const& GetSourceFile() const { return m_sourceFile; } - CSparseOptional const& GetTargetFile() const { return m_targetFile; } + fz::sparse_optional const& GetTargetFile() const { return m_targetFile; } CLocalPath const& GetLocalPath() const { return m_localPath; } CServerPath const& GetRemotePath() const { return m_remotePath; } int64_t GetSize() const { return m_size; } @@ -169,19 +171,23 @@ inline bool queued() const { return (flags & flag_queued) != 0; } inline void set_queued(bool q) { - if (q) + if (q) { flags |= flag_queued; - else + } + else { flags &= ~flag_queued; + } } inline bool pending_remove() const { return (flags & flag_remove) != 0; } inline void set_pending_remove(bool remove) { - if (remove) + if (remove) { flags |= flag_remove; - else + } + else { flags &= ~flag_remove; + } } virtual QueueItemType GetType() const { return QueueItemType::File; } @@ -196,7 +202,7 @@ void SetTargetFile(wxString const& file); - enum Status : char { + enum class Status : unsigned char { none, incorrect_password, timeout, @@ -242,10 +248,12 @@ inline bool made_progress() const { return (flags & flag_made_progress) != 0; } inline void set_made_progress(bool made_progress) { - if (made_progress) + if (made_progress) { flags |= flag_made_progress; - else + } + else { flags &= ~flag_made_progress; + } } bool Ascii() const { return (flags & flag_ascii) != 0; } @@ -262,17 +270,17 @@ protected: std::wstring const m_sourceFile; - CSparseOptional m_targetFile; + fz::sparse_optional m_targetFile; CLocalPath const m_localPath; CServerPath const m_remotePath; int64_t m_size{}; }; -class CFolderItem : public CFileItem +class CFolderItem final : public CFileItem { public: - CFolderItem(CServerItem* parent, bool queued, const CLocalPath& localPath); - CFolderItem(CServerItem* parent, bool queued, const CServerPath& remotePath, const wxString& remoteFile); + CFolderItem(CServerItem* parent, bool queued, CLocalPath const& localPath); + CFolderItem(CServerItem* parent, bool queued, CServerPath const& remotePath, std::wstring const& remoteFile); virtual QueueItemType GetType() const { return QueueItemType::Folder; } @@ -283,47 +291,11 @@ virtual bool TryRemoveAll() { return true; } }; -class CFolderScanItem : public CQueueItem -{ -public: - CFolderScanItem(CServerItem* parent, bool queued, bool download, const CLocalPath& localPath, const CServerPath& remotePath); - virtual ~CFolderScanItem() {} - - virtual QueueItemType GetType() const { return QueueItemType::FolderScan; } - CLocalPath GetLocalPath() const { return m_localPath; } - CServerPath GetRemotePath() const { return m_remotePath; } - bool Download() const { return m_download; } - int GetCount() const { return m_count; } - virtual bool TryRemoveAll(); - - bool queued() const { return m_queued; } - void set_queued(bool q) { m_queued = q; } - - wxString m_statusMessage; - - volatile bool m_remove{}; - bool m_active{}; - - int m_count{}; - - CFileExistsNotification::OverwriteAction m_defaultFileExistsAction{CFileExistsNotification::unknown}; - - bool m_dir_is_empty{}; - CLocalPath m_current_local_path; - CServerPath m_current_remote_path; - -protected: - bool m_queued; - CLocalPath m_localPath; - CServerPath m_remotePath; - bool m_download; -}; - -class CStatusItem : public CQueueItem +class CStatusItem final : public CQueueItem { public: - CStatusItem() {} - virtual ~CStatusItem() {} + CStatusItem() = default; + virtual ~CStatusItem() = default; virtual QueueItemType GetType() const { return QueueItemType::Status; } @@ -351,7 +323,7 @@ virtual ~CQueueViewBase(); // Gets item for given server or creates new if it doesn't exist - CServerItem* CreateServerItem(const CServer& server); + CServerItem* CreateServerItem(ServerWithCredentials const& server); virtual void InsertItem(CServerItem* pServerItem, CQueueItem* pItem); virtual bool RemoveItem(CQueueItem* pItem, bool destroy, bool updateItemCount = true, bool updateSelections = true, bool forward = true); @@ -368,11 +340,11 @@ protected: - void CreateColumns(std::list const& extraColumns = std::list()); + void CreateColumns(std::vector const& extraColumns = std::vector()); void AddQueueColumn(ColumnId id); // Gets item for given server - CServerItem* GetServerItem(const CServer& server); + CServerItem* GetServerItem(ServerWithCredentials const& server); // Gets item with given index CQueueItem* GetQueueItem(unsigned int item) const; @@ -389,13 +361,11 @@ void DisplayNumberQueuedFiles(); // Position at which insertions start and number of insertions - int m_insertionStart; - unsigned int m_insertionCount; + int m_insertionStart{-1}; + unsigned int m_insertionCount{}; - int m_fileCount; - int m_folderScanCount; - bool m_fileCountChanged; - bool m_folderScanCountChanged; + int m_fileCount{}; + bool m_fileCountChanged{}; // Selection management. void UpdateSelections_ItemAdded(int added); @@ -403,8 +373,8 @@ void UpdateSelections_ItemRemoved(int removed); void UpdateSelections_ItemRangeRemoved(int removed, int count); - int m_itemCount; - bool m_allowBackgroundErase; + int m_itemCount{}; + bool m_allowBackgroundErase{true}; std::vector m_serverList; @@ -433,7 +403,7 @@ class CMainFrame; class CAsyncRequestQueue; -class CQueue : public wxAuiNotebookEx +class CQueue final : public wxAuiNotebookEx { public: CQueue(wxWindow* parent, CMainFrame* pMainFrame, CAsyncRequestQueue* pAsyncRequestQueue); @@ -446,11 +416,11 @@ virtual void SetFocus(); protected: - CQueueView* m_pQueueView; - CQueueViewFailed* m_pQueueView_Failed; - CQueueViewSuccessful* m_pQueueView_Successful; + CQueueView* m_pQueueView{}; + CQueueViewFailed* m_pQueueView_Failed{}; + CQueueViewSuccessful* m_pQueueView_Successful{}; }; #include "QueueView.h" -#endif //__QUEUE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/queue_storage.cpp filezilla-3.33.0/src/interface/queue_storage.cpp --- filezilla-3.15.0.2/src/interface/queue_storage.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/queue_storage.cpp 2018-04-25 03:30:06.000000000 +0000 @@ -4,7 +4,6 @@ #include "queue.h" #include -#include #include @@ -24,7 +23,7 @@ struct _column { - const wxChar* const name; + char const* const name; Column_type type; unsigned int flags; }; @@ -39,6 +38,7 @@ user, password, account, + keyfile, protocol, type, logontype, @@ -53,22 +53,23 @@ } _column server_table_columns[] = { - { _T("id"), Column_type::integer, not_null | autoincrement }, - { _T("host"), Column_type::text, not_null }, - { _T("port"), Column_type::integer, 0 }, - { _T("user"), Column_type::text, 0 }, - { _T("password"), Column_type::text, 0 }, - { _T("account"), Column_type::text, 0 }, - { _T("protocol"), Column_type::integer, 0 }, - { _T("type"), Column_type::integer, 0 }, - { _T("logontype"), Column_type::integer, 0 }, - { _T("timezone_offset"), Column_type::integer, 0 }, - { _T("transfer_mode"), Column_type::text, 0 }, - { _T("max_connections"), Column_type::integer, 0 }, - { _T("encoding"), Column_type::text, 0 }, - { _T("bypass_proxy"), Column_type::integer, 0 }, - { _T("post_login_commands"), Column_type::text, 0 }, - { _T("name"), Column_type::text, 0 } + { "id", Column_type::integer, not_null | autoincrement }, + { "host", Column_type::text, not_null }, + { "port", Column_type::integer, 0 }, + { "user", Column_type::text, 0 }, + { "password", Column_type::text, 0 }, + { "account", Column_type::text, 0 }, + { "keyfile", Column_type::text, 0 }, + { "protocol", Column_type::integer, 0 }, + { "type", Column_type::integer, 0 }, + { "logontype", Column_type::integer, 0 }, + { "timezone_offset", Column_type::integer, 0 }, + { "transfer_mode", Column_type::text, 0 }, + { "max_connections", Column_type::integer, 0 }, + { "encoding", Column_type::text, 0 }, + { "bypass_proxy", Column_type::integer, 0 }, + { "post_login_commands", Column_type::text, 0 }, + { "name", Column_type::text, 0 } }; namespace file_table_column_names @@ -91,18 +92,18 @@ } _column file_table_columns[] = { - { _T("id"), Column_type::integer, not_null | autoincrement }, - { _T("server"), Column_type::integer, not_null }, - { _T("source_file"), Column_type::text, 0 }, - { _T("target_file"), Column_type::text, 0 }, - { _T("local_path"), Column_type::integer, 0 }, - { _T("remote_path"), Column_type::integer, 0 }, - { _T("download"), Column_type::integer, not_null }, - { _T("size"), Column_type::integer, 0 }, - { _T("error_count"), Column_type::integer, 0 }, - { _T("priority"), Column_type::integer, 0 }, - { _T("ascii_file"), Column_type::integer, 0 }, - { _T("default_exists_action"), Column_type::integer, 0 } + { "id", Column_type::integer, not_null | autoincrement }, + { "server", Column_type::integer, not_null }, + { "source_file", Column_type::text, 0 }, + { "target_file", Column_type::text, 0 }, + { "local_path", Column_type::integer, 0 }, + { "remote_path", Column_type::integer, 0 }, + { "download", Column_type::integer, not_null }, + { "size", Column_type::integer, 0 }, + { "error_count", Column_type::integer, 0 }, + { "priority", Column_type::integer, 0 }, + { "ascii_file", Column_type::integer, 0 }, + { "default_exists_action", Column_type::integer, 0 } }; namespace path_table_column_names @@ -115,92 +116,71 @@ } _column path_table_columns[] = { - { _T("id"), Column_type::integer, not_null | autoincrement }, - { _T("path"), Column_type::text, not_null } -}; - -struct fast_equal -{ - bool operator()(wxString const& lhs, wxString const& rhs) const - { - return lhs == rhs; - } + { "id", Column_type::integer, not_null | autoincrement }, + { "path", Column_type::text, not_null } }; class CQueueStorage::Impl { public: - Impl() - : db_() - , insertServerQuery_() - , insertFileQuery_() - , insertLocalPathQuery_() - , insertRemotePathQuery_() - , selectServersQuery_() - , selectFilesQuery_() - , selectLocalPathQuery_() - , selectRemotePathQuery_() - { - } - - void CreateTables(); - wxString CreateColumnDefs(_column* columns, size_t count); + std::string CreateColumnDefs(_column const* columns, size_t count); bool PrepareStatements(); - sqlite3_stmt* PrepareStatement(const wxString& query); - sqlite3_stmt* PrepareInsertStatement(const wxString& name, const _column*, unsigned int count); + sqlite3_stmt* PrepareStatement(std::string const& query); + sqlite3_stmt* PrepareInsertStatement(std::string const& name, _column const*, unsigned int count); - bool SaveServer(const CServerItem& item); - bool SaveFile(const CFileItem& item); - bool SaveDirectory(const CFolderItem& item); + bool SaveServer(CServerItem const& item); + bool SaveFile(CFileItem const& item); + bool SaveDirectory(CFolderItem const& item); - int64_t SaveLocalPath(const CLocalPath& path); - int64_t SaveRemotePath(const CServerPath& path); + int64_t SaveLocalPath(CLocalPath const& path); + int64_t SaveRemotePath(CServerPath const& path); void ReadLocalPaths(); void ReadRemotePaths(); - const CLocalPath& GetLocalPath(int64_t id) const; - const CServerPath& GetRemotePath(int64_t id) const; + CLocalPath const& GetLocalPath(int64_t id) const; + CServerPath const& GetRemotePath(int64_t id) const; bool Bind(sqlite3_stmt* statement, int index, int value); bool Bind(sqlite3_stmt* statement, int index, int64_t value); - bool Bind(sqlite3_stmt* statement, int index, const wxString& value); + bool Bind(sqlite3_stmt* statement, int index, std::wstring const& value); bool Bind(sqlite3_stmt* statement, int index, const char* const value); bool BindNull(sqlite3_stmt* statement, int index); - wxString GetColumnText(sqlite3_stmt* statement, int index, bool shrink = true); + std::wstring GetColumnText(sqlite3_stmt* statement, int index); int64_t GetColumnInt64(sqlite3_stmt* statement, int index, int64_t def = 0); int GetColumnInt(sqlite3_stmt* statement, int index, int def = 0); - int64_t ParseServerFromRow(CServer& server); + int64_t ParseServerFromRow(ServerWithCredentials& server); int64_t ParseFileFromRow(CFileItem** pItem); bool MigrateSchema(); - sqlite3* db_; + bool BeginTransaction(); + bool EndTransaction(bool roolback); - sqlite3_stmt* insertServerQuery_; - sqlite3_stmt* insertFileQuery_; - sqlite3_stmt* insertLocalPathQuery_; - sqlite3_stmt* insertRemotePathQuery_; - - sqlite3_stmt* selectServersQuery_; - sqlite3_stmt* selectFilesQuery_; - sqlite3_stmt* selectLocalPathQuery_; - sqlite3_stmt* selectRemotePathQuery_; + void Close(); -#ifndef __WXMSW__ - wxMBConvUTF16 utf16_; -#endif + sqlite3* db_{}; + + sqlite3_stmt* insertServerQuery_{}; + sqlite3_stmt* insertFileQuery_{}; + sqlite3_stmt* insertLocalPathQuery_{}; + sqlite3_stmt* insertRemotePathQuery_{}; + + sqlite3_stmt* selectServersQuery_{}; + sqlite3_stmt* selectFilesQuery_{}; + sqlite3_stmt* selectLocalPathQuery_{}; + sqlite3_stmt* selectRemotePathQuery_{}; // Caches to speed up saving and loading void ClearCaches(); - std::unordered_map localPaths_; - std::unordered_map remotePaths_; // No need for fast_equal as GetSafePath returns unshared string anyhow + std::unordered_map localPaths_; + std::unordered_map remotePaths_; std::map reverseLocalPaths_; std::map reverseRemotePaths_; @@ -209,20 +189,20 @@ void CQueueStorage::Impl::ReadLocalPaths() { - if (!selectLocalPathQuery_) + if (!selectLocalPathQuery_) { return; + } int res; - do - { + do { res = sqlite3_step(selectLocalPathQuery_); - if (res == SQLITE_ROW) - { + if (res == SQLITE_ROW) { int64_t id = GetColumnInt64(selectLocalPathQuery_, path_table_column_names::id); - wxString localPathRaw = GetColumnText(selectLocalPathQuery_, path_table_column_names::path); + std::wstring localPathRaw = GetColumnText(selectLocalPathQuery_, path_table_column_names::path); CLocalPath localPath; - if (id > 0 && !localPathRaw.empty() && localPath.SetPath(localPathRaw)) + if (id > 0 && !localPathRaw.empty() && localPath.SetPath(localPathRaw)) { reverseLocalPaths_[id] = localPath; + } } } while (res == SQLITE_BUSY || res == SQLITE_ROW); @@ -233,20 +213,20 @@ void CQueueStorage::Impl::ReadRemotePaths() { - if (!selectRemotePathQuery_) + if (!selectRemotePathQuery_) { return; + } int res; - do - { + do { res = sqlite3_step(selectRemotePathQuery_); - if (res == SQLITE_ROW) - { + if (res == SQLITE_ROW) { int64_t id = GetColumnInt64(selectRemotePathQuery_, path_table_column_names::id); - wxString remotePathRaw = GetColumnText(selectRemotePathQuery_, path_table_column_names::path); + std::wstring remotePathRaw = GetColumnText(selectRemotePathQuery_, path_table_column_names::path); CServerPath remotePath; - if (id > 0 && !remotePathRaw.empty() && remotePath.SetSafePath(remotePathRaw)) + if (id > 0 && !remotePathRaw.empty() && remotePath.SetSafePath(remotePathRaw)) { reverseRemotePaths_[id] = remotePath; + } } } while (res == SQLITE_BUSY || res == SQLITE_ROW); @@ -258,8 +238,9 @@ const CLocalPath& CQueueStorage::Impl::GetLocalPath(int64_t id) const { std::map::const_iterator it = reverseLocalPaths_.find(id); - if (it != reverseLocalPaths_.end()) + if (it != reverseLocalPaths_.end()) { return it->second; + } static CLocalPath const empty{}; return empty; @@ -269,8 +250,9 @@ const CServerPath& CQueueStorage::Impl::GetRemotePath(int64_t id) const { std::map::const_iterator it = reverseRemotePaths_.find(id); - if (it != reverseRemotePaths_.end()) + if (it != reverseRemotePaths_.end()) { return it->second; + } static CServerPath const empty{}; return empty; @@ -280,8 +262,9 @@ static int int_callback(void* p, int n, char** v, char**) { int* i = static_cast(p); - if (!i || !n || !v || !*v) + if (!i || !n || !v || !*v) { return -1; + } *i = atoi(*v); return 0; @@ -290,15 +273,39 @@ bool CQueueStorage::Impl::MigrateSchema() { - int version = 0; + if (!db_) { + return false; + } - if (sqlite3_exec(db_, "PRAGMA user_version", int_callback, &version, 0) != SQLITE_OK) + if (!BeginTransaction()) { + Close(); return false; + } - if (version < 1) - return sqlite3_exec(db_, "PRAGMA user_version = 1", 0, 0, 0) == SQLITE_OK; + int version = 0; + bool ret = sqlite3_exec(db_, "PRAGMA user_version", int_callback, &version, 0) == SQLITE_OK; - return true; + if (ret) { + if (version > 3) { + ret = false; + } + else if (version > 0) { + // Do the schema changes + if (ret && version < 2) { + ret = sqlite3_exec(db_, "ALTER TABLE servers ADD COLUMN keyfile TEXT", int_callback, &version, 0) == SQLITE_OK; + } + } + if (ret && version != 3) { + ret = sqlite3_exec(db_, "PRAGMA user_version = 3", 0, 0, 0) == SQLITE_OK; + } + } + + EndTransaction(!ret); + if (!ret) { + Close(); + } + + return ret; } @@ -311,11 +318,12 @@ } -int64_t CQueueStorage::Impl::SaveLocalPath(const CLocalPath& path) +int64_t CQueueStorage::Impl::SaveLocalPath(CLocalPath const& path) { - std::unordered_map::const_iterator it = localPaths_.find(path.GetPath()); - if (it != localPaths_.end()) + auto it = localPaths_.find(path.GetPath()); + if (it != localPaths_.end()) { return it->second; + } Bind(insertLocalPathQuery_, path_table_column_names::path, path.GetPath()); @@ -326,8 +334,7 @@ sqlite3_reset(insertLocalPathQuery_); - if (res == SQLITE_DONE) - { + if (res == SQLITE_DONE) { int64_t id = sqlite3_last_insert_rowid(db_); localPaths_[path.GetPath()] = id; return id; @@ -337,12 +344,13 @@ } -int64_t CQueueStorage::Impl::SaveRemotePath(const CServerPath& path) +int64_t CQueueStorage::Impl::SaveRemotePath(CServerPath const& path) { - wxString const& safePath = path.GetSafePath(); - std::unordered_map::const_iterator it = remotePaths_.find(safePath); - if (it != remotePaths_.end()) + std::wstring const& safePath = path.GetSafePath(); + auto it = remotePaths_.find(safePath); + if (it != remotePaths_.end()) { return it->second; + } Bind(insertRemotePathQuery_, path_table_column_names::path, safePath); @@ -363,112 +371,120 @@ } -wxString CQueueStorage::Impl::CreateColumnDefs(_column* columns, size_t count) +std::string CQueueStorage::Impl::CreateColumnDefs(_column const* columns, size_t count) { - wxString query = _T("("); - for (unsigned int i = 0; i < count; ++i) { - if (i) - query += _T(", "); + std::string query = "("; + for (size_t i = 0; i < count; ++i) { + if (i) { + query += ", "; + } query += columns[i].name; - if (columns[i].type == Column_type::integer) - query += _T(" INTEGER"); - else - query += _T(" TEXT"); - - if (columns[i].flags & autoincrement) - query += _T(" PRIMARY KEY AUTOINCREMENT"); - if (columns[i].flags & not_null) - query += _T(" NOT NULL"); + if (columns[i].type == Column_type::integer) { + query += " INTEGER"; + } + else { + query += " TEXT"; + } + + if (columns[i].flags & autoincrement) { + query += " PRIMARY KEY AUTOINCREMENT"; + } + if (columns[i].flags & not_null) { + query += " NOT NULL"; + } } - query += _T(")"); + query += ")"; return query; } void CQueueStorage::Impl::CreateTables() { - if (!db_) + if (!db_) { return; + } { - wxString query( _T("CREATE TABLE IF NOT EXISTS servers ") ); + std::string query("CREATE TABLE IF NOT EXISTS servers "); query += CreateColumnDefs(server_table_columns, sizeof(server_table_columns) / sizeof(_column)); - if (sqlite3_exec(db_, query.ToUTF8(), 0, 0, 0) != SQLITE_OK) + if (sqlite3_exec(db_, query.c_str(), 0, 0, 0) != SQLITE_OK) { } } { - wxString query( _T("CREATE TABLE IF NOT EXISTS files ") ); + std::string query("CREATE TABLE IF NOT EXISTS files "); query += CreateColumnDefs(file_table_columns, sizeof(file_table_columns) / sizeof(_column)); - if (sqlite3_exec(db_, query.ToUTF8(), 0, 0, 0) != SQLITE_OK) + if (sqlite3_exec(db_, query.c_str(), 0, 0, 0) != SQLITE_OK) { } - query = _T("CREATE INDEX IF NOT EXISTS server_index ON files (server)"); - if (sqlite3_exec(db_, query.ToUTF8(), 0, 0, 0) != SQLITE_OK) + query = "CREATE INDEX IF NOT EXISTS server_index ON files (server)"; + if (sqlite3_exec(db_, query.c_str(), 0, 0, 0) != SQLITE_OK) { } } { - wxString query( _T("CREATE TABLE IF NOT EXISTS local_paths ") ); + std::string query("CREATE TABLE IF NOT EXISTS local_paths "); query += CreateColumnDefs(path_table_columns, sizeof(path_table_columns) / sizeof(_column)); - if (sqlite3_exec(db_, query.ToUTF8(), 0, 0, 0) != SQLITE_OK) + if (sqlite3_exec(db_, query.c_str(), 0, 0, 0) != SQLITE_OK) { } } { - wxString query( _T("CREATE TABLE IF NOT EXISTS remote_paths ") ); + std::string query("CREATE TABLE IF NOT EXISTS remote_paths "); query += CreateColumnDefs(path_table_columns, sizeof(path_table_columns) / sizeof(_column)); - if (sqlite3_exec(db_, query.ToUTF8(), 0, 0, 0) != SQLITE_OK) + if (sqlite3_exec(db_, query.c_str(), 0, 0, 0) != SQLITE_OK) { } } } -sqlite3_stmt* CQueueStorage::Impl::PrepareInsertStatement(const wxString& name, const _column* columns, unsigned int count) +sqlite3_stmt* CQueueStorage::Impl::PrepareInsertStatement(std::string const& name, _column const* columns, unsigned int count) { - if (!db_) + if (!db_) { return 0; + } - wxString query = _T("INSERT INTO ") + name + _T(" ("); - for (unsigned int i = 1; i < count; ++i) - { - if (i > 1) - query += _T(", "); + std::string query = "INSERT INTO " + name + " ("; + for (unsigned int i = 1; i < count; ++i) { + if (i > 1) { + query += ", "; + } query += columns[i].name; } - query += _T(") VALUES ("); - for (unsigned int i = 1; i < count; ++i) - { - if (i > 1) - query += _T(","); - query += wxString(_T(":")) + columns[i].name; + query += ") VALUES ("; + for (unsigned int i = 1; i < count; ++i) { + if (i > 1) { + query += ","; + } + query += ":"; + query += columns[i].name; } - query += _T(")"); + query += ")"; return PrepareStatement(query); } -sqlite3_stmt* CQueueStorage::Impl::PrepareStatement(const wxString& query) +sqlite3_stmt* CQueueStorage::Impl::PrepareStatement(std::string const& query) { sqlite3_stmt* ret = 0; int res; - do - { - res = sqlite3_prepare_v2(db_, query.ToUTF8(), -1, &ret, 0); + do { + res = sqlite3_prepare_v2(db_, query.c_str(), -1, &ret, 0); } while (res == SQLITE_BUSY); - if (res != SQLITE_OK) + if (res != SQLITE_OK) { ret = 0; + } return ret; } @@ -476,56 +492,62 @@ bool CQueueStorage::Impl::PrepareStatements() { - if (!db_) + if (!db_) { return false; + } - insertServerQuery_ = PrepareInsertStatement(_T("servers"), server_table_columns, sizeof(server_table_columns) / sizeof(_column)); - insertFileQuery_ = PrepareInsertStatement(_T("files"), file_table_columns, sizeof(file_table_columns) / sizeof(_column)); - insertLocalPathQuery_ = PrepareInsertStatement(_T("local_paths"), path_table_columns, sizeof(path_table_columns) / sizeof(_column)); - insertRemotePathQuery_ = PrepareInsertStatement(_T("remote_paths"), path_table_columns, sizeof(path_table_columns) / sizeof(_column)); - if (!insertServerQuery_ || !insertFileQuery_ || !insertLocalPathQuery_ || !insertRemotePathQuery_) + insertServerQuery_ = PrepareInsertStatement("servers", server_table_columns, sizeof(server_table_columns) / sizeof(_column)); + insertFileQuery_ = PrepareInsertStatement("files", file_table_columns, sizeof(file_table_columns) / sizeof(_column)); + insertLocalPathQuery_ = PrepareInsertStatement("local_paths", path_table_columns, sizeof(path_table_columns) / sizeof(_column)); + insertRemotePathQuery_ = PrepareInsertStatement("remote_paths", path_table_columns, sizeof(path_table_columns) / sizeof(_column)); + if (!insertServerQuery_ || !insertFileQuery_ || !insertLocalPathQuery_ || !insertRemotePathQuery_) { return false; + } { - wxString query = _T("SELECT "); - for (unsigned int i = 0; i < (sizeof(server_table_columns) / sizeof(_column)); ++i) - { - if (i > 0) - query += _T(", "); + std::string query = "SELECT "; + for (unsigned int i = 0; i < (sizeof(server_table_columns) / sizeof(_column)); ++i) { + if (i > 0) { + query += ", "; + } query += server_table_columns[i].name; } - query += _T(" FROM servers ORDER BY id ASC"); + query += " FROM servers ORDER BY id ASC"; - if (!(selectServersQuery_ = PrepareStatement(query))) + if (!(selectServersQuery_ = PrepareStatement(query))) { return false; + } } { - wxString query = _T("SELECT "); - for (unsigned int i = 0; i < (sizeof(file_table_columns) / sizeof(_column)); ++i) - { - if (i > 0) - query += _T(", "); + std::string query = "SELECT "; + for (unsigned int i = 0; i < (sizeof(file_table_columns) / sizeof(_column)); ++i) { + if (i > 0) { + query += ", "; + } query += file_table_columns[i].name; } - query += _T(" FROM files WHERE server=:server ORDER BY id ASC"); + query += " FROM files WHERE server=:server ORDER BY id ASC"; - if (!(selectFilesQuery_ = PrepareStatement(query))) + if (!(selectFilesQuery_ = PrepareStatement(query))) { return false; + } } { - wxString query = _T("SELECT id, path FROM local_paths"); - if (!(selectLocalPathQuery_ = PrepareStatement(query))) + std::string query = "SELECT id, path FROM local_paths"; + if (!(selectLocalPathQuery_ = PrepareStatement(query))) { return false; + } } { - wxString query = _T("SELECT id, path FROM remote_paths"); - if (!(selectRemotePathQuery_ = PrepareStatement(query))) + std::string query = "SELECT id, path FROM remote_paths"; + if (!(selectRemotePathQuery_ = PrepareStatement(query))) { return false; + } } return true; } @@ -543,25 +565,13 @@ return res == SQLITE_OK; } - -#ifndef __WXMSW__ -extern "C" { -static void custom_free(void* v) -{ - char* s = static_cast(v); - delete [] s; -} -} -#endif - -bool CQueueStorage::Impl::Bind(sqlite3_stmt* statement, int index, const wxString& value) +bool CQueueStorage::Impl::Bind(sqlite3_stmt* statement, int index, std::wstring const& value) { -#ifdef __WXMSW__ - return sqlite3_bind_text16(statement, index, value.wc_str(), value.length() * 2, SQLITE_TRANSIENT) == SQLITE_OK; +#ifdef FZ_WINDOWS + return sqlite3_bind_text16(statement, index, value.c_str(), value.size() * 2, SQLITE_TRANSIENT) == SQLITE_OK; #else - char* out = new char[value.size() * 2]; - size_t outlen = utf16_.FromWChar(out, value.size() * 2, value.c_str(), value.size()); - bool ret = sqlite3_bind_text16(statement, index, out, outlen, custom_free) == SQLITE_OK; + std::string utf8 = fz::to_utf8(value); + bool ret = sqlite3_bind_text(statement, index, utf8.c_str(), utf8.size(), SQLITE_TRANSIENT) == SQLITE_OK; return ret; #endif } @@ -579,51 +589,78 @@ } -bool CQueueStorage::Impl::SaveServer(const CServerItem& item) +bool CQueueStorage::Impl::SaveServer(CServerItem const& item) { bool kiosk_mode = COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0; - const CServer& server = item.GetServer(); + ServerWithCredentials const& server = item.GetServer(); + + Bind(insertServerQuery_, server_table_column_names::host, server.server.GetHost()); + Bind(insertServerQuery_, server_table_column_names::port, static_cast(server.server.GetPort())); + Bind(insertServerQuery_, server_table_column_names::protocol, static_cast(server.server.GetProtocol())); + Bind(insertServerQuery_, server_table_column_names::type, static_cast(server.server.GetType())); - Bind(insertServerQuery_, server_table_column_names::host, server.GetHost()); - Bind(insertServerQuery_, server_table_column_names::port, static_cast(server.GetPort())); - Bind(insertServerQuery_, server_table_column_names::protocol, static_cast(server.GetProtocol())); - Bind(insertServerQuery_, server_table_column_names::type, static_cast(server.GetType())); - - enum LogonType logonType = server.GetLogonType(); - if (server.GetLogonType() != ANONYMOUS) { - Bind(insertServerQuery_, server_table_column_names::user, server.GetUser()); + ProtectedCredentials credentials = server.credentials; + credentials.Protect(); - if (server.GetLogonType() == NORMAL || server.GetLogonType() == ACCOUNT) { + LogonType logonType = credentials.logonType_; + if (logonType != LogonType::anonymous) { + Bind(insertServerQuery_, server_table_column_names::user, server.server.GetUser()); + + if (logonType == LogonType::normal || logonType == LogonType::account) { if (kiosk_mode) { - logonType = ASK; + logonType = LogonType::ask; BindNull(insertServerQuery_, server_table_column_names::password); BindNull(insertServerQuery_, server_table_column_names::account); } else { - Bind(insertServerQuery_, server_table_column_names::password, server.GetPass()); + std::wstring pw; + if (credentials.encrypted_) { + pw = fz::to_wstring_from_utf8(credentials.encrypted_.to_base64()); + pw += ' '; + } + pw += credentials.GetPass(); + Bind(insertServerQuery_, server_table_column_names::password, pw); - if (server.GetLogonType() == ACCOUNT) - Bind(insertServerQuery_, server_table_column_names::account, server.GetAccount()); - else + if (credentials.account_.empty()) { BindNull(insertServerQuery_, server_table_column_names::account); + } + else { + Bind(insertServerQuery_, server_table_column_names::account, credentials.account_); + } } } else { BindNull(insertServerQuery_, server_table_column_names::password); BindNull(insertServerQuery_, server_table_column_names::account); } + + if (credentials.keyFile_.empty()) { + BindNull(insertServerQuery_, server_table_column_names::keyfile); + } + else { + Bind(insertServerQuery_, server_table_column_names::keyfile, credentials.keyFile_); + } } else { - BindNull(insertServerQuery_, server_table_column_names::user); - BindNull(insertServerQuery_, server_table_column_names::password); - BindNull(insertServerQuery_, server_table_column_names::account); + BindNull(insertServerQuery_, server_table_column_names::user); + BindNull(insertServerQuery_, server_table_column_names::password); + BindNull(insertServerQuery_, server_table_column_names::account); + BindNull(insertServerQuery_, server_table_column_names::keyfile); + } + + { + int64_t lt = static_cast(logonType); + if (credentials.encrypted_) { + static_assert(static_cast(LogonType::count) < (1ll << 62), "LogonType::count too big"); + lt |= 1ll << 62; + } + Bind(insertServerQuery_, server_table_column_names::logontype, lt); } - Bind(insertServerQuery_, server_table_column_names::logontype, static_cast(logonType)); - Bind(insertServerQuery_, server_table_column_names::timezone_offset, server.GetTimezoneOffset()); + Bind(insertServerQuery_, server_table_column_names::timezone_offset, server.server.GetTimezoneOffset()); - switch (server.GetPasvMode()) + switch (server.server.GetPasvMode()) { case MODE_PASSIVE: Bind(insertServerQuery_, server_table_column_names::transfer_mode, _T("passive")); @@ -635,9 +672,9 @@ Bind(insertServerQuery_, server_table_column_names::transfer_mode, _T("default")); break; } - Bind(insertServerQuery_, server_table_column_names::max_connections, server.MaximumMultipleConnections()); + Bind(insertServerQuery_, server_table_column_names::max_connections, server.server.MaximumMultipleConnections()); - switch (server.GetEncodingType()) + switch (server.server.GetEncodingType()) { default: case ENCODING_AUTO: @@ -647,32 +684,37 @@ Bind(insertServerQuery_, server_table_column_names::encoding, _T("UTF-8")); break; case ENCODING_CUSTOM: - Bind(insertServerQuery_, server_table_column_names::encoding, server.GetCustomEncoding()); + Bind(insertServerQuery_, server_table_column_names::encoding, server.server.GetCustomEncoding()); break; } - if (CServer::SupportsPostLoginCommands(server.GetProtocol())) { - const std::vector& postLoginCommands = server.GetPostLoginCommands(); + if (CServer::ProtocolHasFeature(server.server.GetProtocol(), ProtocolFeature::PostLoginCommands)) { + std::vector const& postLoginCommands = server.server.GetPostLoginCommands(); if (!postLoginCommands.empty()) { - wxString commands; - for (std::vector::const_iterator iter = postLoginCommands.begin(); iter != postLoginCommands.end(); ++iter) { - if (!commands.empty()) + std::wstring commands; + for (auto const& command : commands) { + if (!commands.empty()) { commands += _T("\n"); - commands += *iter; + } + commands += command; } Bind(insertServerQuery_, server_table_column_names::post_login_commands, commands); } - else + else { BindNull(insertServerQuery_, server_table_column_names::post_login_commands); + } } - else + else { BindNull(insertServerQuery_, server_table_column_names::post_login_commands); + } - Bind(insertServerQuery_, server_table_column_names::bypass_proxy, server.GetBypassProxy() ? 1 : 0); - if (!server.GetName().empty()) - Bind(insertServerQuery_, server_table_column_names::name, server.GetName()); - else + Bind(insertServerQuery_, server_table_column_names::bypass_proxy, server.server.GetBypassProxy() ? 1 : 0); + if (!server.server.GetName().empty()) { + Bind(insertServerQuery_, server_table_column_names::name, server.server.GetName()); + } + else { BindNull(insertServerQuery_, server_table_column_names::name); + } int res; do { @@ -689,52 +731,64 @@ const std::vector& children = item.GetChildren(); for (std::vector::const_iterator it = children.begin() + item.GetRemovedAtFront(); it != children.end(); ++it) { CQueueItem & childItem = **it; - if (childItem.GetType() == QueueItemType::File) + if (childItem.GetType() == QueueItemType::File) { ret &= SaveFile(static_cast(childItem)); - else if (childItem.GetType() == QueueItemType::Folder) + } + else if (childItem.GetType() == QueueItemType::Folder) { ret &= SaveDirectory(static_cast(childItem)); + } } } return ret; } -bool CQueueStorage::Impl::SaveFile(const CFileItem& file) +bool CQueueStorage::Impl::SaveFile(CFileItem const& file) { - if (file.m_edit != CEditHandler::none) + if (file.m_edit != CEditHandler::none) { return true; + } Bind(insertFileQuery_, file_table_column_names::source_file, file.GetSourceFile()); auto const& targetFile = file.GetTargetFile(); - if (targetFile) + if (targetFile) { Bind(insertFileQuery_, file_table_column_names::target_file, *targetFile); - else + } + else { BindNull(insertFileQuery_, file_table_column_names::target_file); + } int64_t localPathId = SaveLocalPath(file.GetLocalPath()); int64_t remotePathId = SaveRemotePath(file.GetRemotePath()); - if (localPathId == -1 || remotePathId == -1) + if (localPathId == -1 || remotePathId == -1) { return false; + } Bind(insertFileQuery_, file_table_column_names::local_path, localPathId); Bind(insertFileQuery_, file_table_column_names::remote_path, remotePathId); Bind(insertFileQuery_, file_table_column_names::download, file.Download() ? 1 : 0); - if (file.GetSize() != -1) + if (file.GetSize() != -1) { Bind(insertFileQuery_, file_table_column_names::size, file.GetSize()); - else + } + else { BindNull(insertFileQuery_, file_table_column_names::size); - if (file.m_errorCount) + } + if (file.m_errorCount) { Bind(insertFileQuery_, file_table_column_names::error_count, file.m_errorCount); - else + } + else { BindNull(insertFileQuery_, file_table_column_names::error_count); + } Bind(insertFileQuery_, file_table_column_names::priority, static_cast(file.GetPriority())); Bind(insertFileQuery_, file_table_column_names::ascii_file, file.Ascii() ? 1 : 0); - if (file.m_defaultFileExistsAction != CFileExistsNotification::unknown) + if (file.m_defaultFileExistsAction != CFileExistsNotification::unknown) { Bind(insertFileQuery_, file_table_column_names::default_exists_action, file.m_defaultFileExistsAction); - else + } + else { BindNull(insertFileQuery_, file_table_column_names::default_exists_action); + } int res; do { @@ -747,28 +801,33 @@ } -bool CQueueStorage::Impl::SaveDirectory(const CFolderItem& directory) +bool CQueueStorage::Impl::SaveDirectory(CFolderItem const& directory) { - if (directory.Download()) + if (directory.Download()) { BindNull(insertFileQuery_, file_table_column_names::source_file); - else + } + else { Bind(insertFileQuery_, file_table_column_names::source_file, directory.GetSourceFile()); + } BindNull(insertFileQuery_, file_table_column_names::target_file); int64_t localPathId = directory.Download() ? SaveLocalPath(directory.GetLocalPath()) : -1; int64_t remotePathId = directory.Download() ? -1 : SaveRemotePath(directory.GetRemotePath()); - if (localPathId == -1 && remotePathId == -1) + if (localPathId == -1 && remotePathId == -1) { return false; + } Bind(insertFileQuery_, file_table_column_names::local_path, localPathId); Bind(insertFileQuery_, file_table_column_names::remote_path, remotePathId); Bind(insertFileQuery_, file_table_column_names::download, directory.Download() ? 1 : 0); BindNull(insertFileQuery_, file_table_column_names::size); - if (directory.m_errorCount) + if (directory.m_errorCount) { Bind(insertFileQuery_, file_table_column_names::error_count, directory.m_errorCount); - else + } + else { BindNull(insertFileQuery_, file_table_column_names::error_count); + } Bind(insertFileQuery_, file_table_column_names::priority, static_cast(directory.GetPriority())); BindNull(insertFileQuery_, file_table_column_names::ascii_file); @@ -785,28 +844,23 @@ } -wxString CQueueStorage::Impl::GetColumnText(sqlite3_stmt* statement, int index, bool shrink) +std::wstring CQueueStorage::Impl::GetColumnText(sqlite3_stmt* statement, int index) { - wxString ret; + std::wstring ret; -#ifdef __WXMSW__ - (void)shrink; - const wxChar* text = static_cast(sqlite3_column_text16(statement, index)); - if (text) - ret = text; +#ifdef FZ_WINDOWS + static_assert(sizeof(wchar_t) == 2, "wchar_t not of size 2"); + wchar_t const* text = static_cast(sqlite3_column_text16(statement, index)); + if (text) { + ret.assign(text, sqlite3_column_bytes16(statement, index) / 2); + } #else - const char* text = static_cast(sqlite3_column_text16(statement, index)); - int len = sqlite3_column_bytes16(statement, index); - if (text) - { - wxStringBuffer buffer(ret, len); - wxChar* out = buffer; - - int outlen = utf16_.ToWChar( out, len, text, len ); - buffer[outlen] = 0; + char const* text = reinterpret_cast(sqlite3_column_text(statement, index)); + int len = sqlite3_column_bytes(statement, index); + if (text) { + std::string utf8(text, len); + ret = fz::to_wstring_from_utf8(utf8); } - if (shrink) - ret.Shrink(); #endif return ret; @@ -814,128 +868,138 @@ int64_t CQueueStorage::Impl::GetColumnInt64(sqlite3_stmt* statement, int index, int64_t def) { - if (sqlite3_column_type(statement, index) == SQLITE_NULL) + if (sqlite3_column_type(statement, index) == SQLITE_NULL) { return def; - else + } + else { return sqlite3_column_int64(statement, index); + } } int CQueueStorage::Impl::GetColumnInt(sqlite3_stmt* statement, int index, int def) { - if (sqlite3_column_type(statement, index) == SQLITE_NULL) + if (sqlite3_column_type(statement, index) == SQLITE_NULL) { return def; - else + } + else { return sqlite3_column_int(statement, index); + } } -int64_t CQueueStorage::Impl::ParseServerFromRow(CServer& server) +int64_t CQueueStorage::Impl::ParseServerFromRow(ServerWithCredentials& server) { - server = CServer(); + server = ServerWithCredentials(); - wxString host = GetColumnText(selectServersQuery_, server_table_column_names::host); - if (host.empty()) + std::wstring host = GetColumnText(selectServersQuery_, server_table_column_names::host); + if (host.empty()) { return INVALID_DATA; + } int port = GetColumnInt(selectServersQuery_, server_table_column_names::port); - if (port < 1 || port > 65535) + if (port < 1 || port > 65535) { return INVALID_DATA; + } - if (!server.SetHost(host, port)) + if (!server.server.SetHost(host, port)) { return INVALID_DATA; + } int const protocol = GetColumnInt(selectServersQuery_, server_table_column_names::protocol); - if (protocol < 0 || protocol > MAX_VALUE) + if (protocol < 0 || protocol > MAX_VALUE) { return INVALID_DATA; - server.SetProtocol(static_cast(protocol)); + } + server.server.SetProtocol(static_cast(protocol)); int type = GetColumnInt(selectServersQuery_, server_table_column_names::type); - if (type < 0 || type >= SERVERTYPE_MAX) + if (type < 0 || type >= SERVERTYPE_MAX) { return INVALID_DATA; + } - server.SetType((enum ServerType)type); + server.server.SetType(static_cast(type)); - int logonType = GetColumnInt(selectServersQuery_, server_table_column_names::logontype); - if (logonType < 0 || logonType >= LOGONTYPE_MAX) + int64_t logonType = GetColumnInt64(selectServersQuery_, server_table_column_names::logontype); + bool const encrypted = logonType & (1ll << 62); + logonType &= ~(1ll << 62); + if (logonType < 0 || logonType >= static_cast(LogonType::count)) { return INVALID_DATA; + } - server.SetLogonType((enum LogonType)logonType); - - if (server.GetLogonType() != ANONYMOUS) - { - wxString user = GetColumnText(selectServersQuery_, server_table_column_names::user); + server.SetLogonType(static_cast(logonType)); - wxString pass; - if ((long)NORMAL == logonType || (long)ACCOUNT == logonType) - pass = GetColumnText(selectServersQuery_, server_table_column_names::password); + if (server.credentials.logonType_ != LogonType::anonymous) { + std::wstring user = GetColumnText(selectServersQuery_, server_table_column_names::user); + std::wstring pass = GetColumnText(selectServersQuery_, server_table_column_names::password); + + server.SetUser(user); + if (encrypted) { + size_t pos = pass.find(' '); + if (pos == std::string::npos) { + return INVALID_DATA; + } + else { + server.credentials.encrypted_ = public_key::from_base64(fz::to_utf8(pass.substr(0, pos))); + pass = pass.substr(pos + 1); + } + } + server.credentials.SetPass(pass); - if (!server.SetUser(user, pass)) + server.credentials.account_ = GetColumnText(selectServersQuery_, server_table_column_names::account); + if (server.credentials.account_.empty() && server.credentials.logonType_ == LogonType::account) { return INVALID_DATA; + } - if ((long)ACCOUNT == logonType) - { - wxString account = GetColumnText(selectServersQuery_, server_table_column_names::account); - if (account.empty()) - return INVALID_DATA; - if (!server.SetAccount(account)) - return INVALID_DATA; + server.credentials.keyFile_ = GetColumnText(selectServersQuery_, server_table_column_names::keyfile); + if (server.credentials.keyFile_.empty() && server.credentials.logonType_ == LogonType::key) { + return INVALID_DATA; } } int timezoneOffset = GetColumnInt(selectServersQuery_, server_table_column_names::timezone_offset); - if (!server.SetTimezoneOffset(timezoneOffset)) + if (!server.server.SetTimezoneOffset(timezoneOffset)) { return INVALID_DATA; + } - wxString pasvMode = GetColumnText(selectServersQuery_, server_table_column_names::transfer_mode); - if (pasvMode == _T("passive")) - server.SetPasvMode(MODE_PASSIVE); - else if (pasvMode == _T("active")) - server.SetPasvMode(MODE_ACTIVE); - else - server.SetPasvMode(MODE_DEFAULT); + std::wstring pasvMode = GetColumnText(selectServersQuery_, server_table_column_names::transfer_mode); + if (pasvMode == _T("passive")) { + server.server.SetPasvMode(MODE_PASSIVE); + } + else if (pasvMode == _T("active")) { + server.server.SetPasvMode(MODE_ACTIVE); + } + else { + server.server.SetPasvMode(MODE_DEFAULT); + } int maximumMultipleConnections = GetColumnInt(selectServersQuery_, server_table_column_names::max_connections); - if (maximumMultipleConnections < 0) + if (maximumMultipleConnections < 0) { return INVALID_DATA; - server.MaximumMultipleConnections(maximumMultipleConnections); + } + server.server.MaximumMultipleConnections(maximumMultipleConnections); - wxString encodingType = GetColumnText(selectServersQuery_, server_table_column_names::encoding); - if (encodingType.empty() || encodingType == _T("Auto")) - server.SetEncodingType(ENCODING_AUTO); - else if (encodingType == _T("UTF-8")) - server.SetEncodingType(ENCODING_UTF8); - else - { - if (!server.SetEncodingType(ENCODING_CUSTOM, encodingType)) + std::wstring encodingType = GetColumnText(selectServersQuery_, server_table_column_names::encoding); + if (encodingType.empty() || encodingType == _T("Auto")) { + server.server.SetEncodingType(ENCODING_AUTO); + } + else if (encodingType == _T("UTF-8")) { + server.server.SetEncodingType(ENCODING_UTF8); + } + else { + if (!server.server.SetEncodingType(ENCODING_CUSTOM, encodingType)) { return INVALID_DATA; + } } - if (CServer::SupportsPostLoginCommands(server.GetProtocol())) { - std::vector postLoginCommands; - - wxString commands = GetColumnText(selectServersQuery_, server_table_column_names::post_login_commands); - while (!commands.empty()) - { - int pos = commands.Find('\n'); - if (!pos) - commands = commands.Mid(1); - else if (pos == -1) - { - postLoginCommands.push_back(commands); - commands.clear(); - } - else - { - postLoginCommands.push_back(commands.Left(pos)); - commands = commands.Mid(pos + 1); - } - } - if (!server.SetPostLoginCommands(postLoginCommands)) + if (CServer::ProtocolHasFeature(server.server.GetProtocol(), ProtocolFeature::PostLoginCommands)) { + std::wstring const commands = GetColumnText(selectServersQuery_, server_table_column_names::post_login_commands); + std::vector postLoginCommands = fz::strtok(commands, '\n'); + if (!server.server.SetPostLoginCommands(postLoginCommands)) { return INVALID_DATA; + } } - server.SetBypassProxy(GetColumnInt(selectServersQuery_, server_table_column_names::bypass_proxy) == 1 ); - server.SetName( GetColumnText(selectServersQuery_, server_table_column_names::name) ); + server.server.SetBypassProxy(GetColumnInt(selectServersQuery_, server_table_column_names::bypass_proxy) == 1 ); + server.server.SetName(GetColumnText(selectServersQuery_, server_table_column_names::name)); return GetColumnInt64(selectServersQuery_, server_table_column_names::id); } @@ -943,19 +1007,18 @@ int64_t CQueueStorage::Impl::ParseFileFromRow(CFileItem** pItem) { - wxString sourceFile = GetColumnText(selectFilesQuery_, file_table_column_names::source_file); - wxString targetFile = GetColumnText(selectFilesQuery_, file_table_column_names::target_file); + std::wstring sourceFile = GetColumnText(selectFilesQuery_, file_table_column_names::source_file); + std::wstring targetFile = GetColumnText(selectFilesQuery_, file_table_column_names::target_file); int64_t localPathId = GetColumnInt64(selectFilesQuery_, file_table_column_names::local_path, false); int64_t remotePathId = GetColumnInt64(selectFilesQuery_, file_table_column_names::remote_path, false); - const CLocalPath& localPath(GetLocalPath(localPathId)); - const CServerPath& remotePath(GetRemotePath(remotePathId)); + CLocalPath const localPath(GetLocalPath(localPathId)); + CServerPath const remotePath(GetRemotePath(remotePathId)); bool download = GetColumnInt(selectFilesQuery_, file_table_column_names::download) != 0; - if (localPathId == -1 || remotePathId == -1) - { + if (localPathId == -1 || remotePathId == -1) { // QueueItemType::Folder if ((download && localPath.empty()) || (!download && remotePath.empty())) @@ -963,13 +1026,14 @@ return INVALID_DATA; } - if (download) + if (download) { *pItem = new CFolderItem(0, true, localPath); - else + } + else { *pItem = new CFolderItem(0, true, remotePath, sourceFile); + } } - else - { + else { int64_t size = GetColumnInt64(selectFilesQuery_, file_table_column_names::size); unsigned char errorCount = static_cast(GetColumnInt(selectFilesQuery_, file_table_column_names::error_count)); int priority = GetColumnInt(selectFilesQuery_, file_table_column_names::priority, static_cast(QueuePriority::normal)); @@ -991,22 +1055,61 @@ fileItem->SetPriorityRaw(QueuePriority(priority)); fileItem->m_errorCount = errorCount; - if (overwrite_action > 0 && overwrite_action < CFileExistsNotification::ACTION_COUNT) + if (overwrite_action > 0 && overwrite_action < CFileExistsNotification::ACTION_COUNT) { fileItem->m_defaultFileExistsAction = (CFileExistsNotification::OverwriteAction)overwrite_action; + } } return GetColumnInt64(selectFilesQuery_, file_table_column_names::id); } +bool CQueueStorage::Impl::BeginTransaction() +{ + return sqlite3_exec(db_, "BEGIN TRANSACTION", 0, 0, 0) == SQLITE_OK; +} + +bool CQueueStorage::Impl::EndTransaction(bool rollback) +{ + if (rollback) { + return sqlite3_exec(db_, "ROLLBACK", 0, 0, 0) == SQLITE_OK; + } + else { + return sqlite3_exec(db_, "END TRANSACTION", 0, 0, 0) == SQLITE_OK; + } +} + + +void CQueueStorage::Impl::Close() +{ + sqlite3_finalize(insertServerQuery_); + sqlite3_finalize(insertFileQuery_); + sqlite3_finalize(insertLocalPathQuery_); + sqlite3_finalize(insertRemotePathQuery_); + sqlite3_finalize(selectServersQuery_); + sqlite3_finalize(selectFilesQuery_); + sqlite3_finalize(selectLocalPathQuery_); + sqlite3_finalize(selectRemotePathQuery_); + insertServerQuery_ = 0; + insertFileQuery_ = 0; + insertLocalPathQuery_ = 0; + insertRemotePathQuery_ = 0; + selectServersQuery_ = 0; + selectFilesQuery_ = 0; + selectLocalPathQuery_ = 0; + selectRemotePathQuery_ = 0; + sqlite3_close(db_); + db_ = 0; +} + CQueueStorage::CQueueStorage() : d_(new Impl) { - int ret = sqlite3_open(GetDatabaseFilename().ToUTF8(), &d_->db_ ); - if (ret != SQLITE_OK) + int ret = sqlite3_open(fz::to_utf8(GetDatabaseFilename()).c_str(), &d_->db_ ); + if (ret != SQLITE_OK) { d_->db_ = 0; + } - if (sqlite3_exec(d_->db_, "PRAGMA encoding=\"UTF-16le\"", 0, 0, 0) == SQLITE_OK) - { + if (sqlite3_exec(d_->db_, "PRAGMA encoding=\"UTF-16le\"", 0, 0, 0) == SQLITE_OK) { d_->MigrateSchema(); d_->CreateTables(); d_->PrepareStatements(); @@ -1015,15 +1118,7 @@ CQueueStorage::~CQueueStorage() { - sqlite3_finalize(d_->insertServerQuery_); - sqlite3_finalize(d_->insertFileQuery_); - sqlite3_finalize(d_->insertLocalPathQuery_); - sqlite3_finalize(d_->insertRemotePathQuery_); - sqlite3_finalize(d_->selectServersQuery_); - sqlite3_finalize(d_->selectFilesQuery_); - sqlite3_finalize(d_->selectLocalPathQuery_); - sqlite3_finalize(d_->selectRemotePathQuery_); - sqlite3_close(d_->db_); + d_->Close(); delete d_; } @@ -1033,56 +1128,52 @@ bool ret = true; if (sqlite3_exec(d_->db_, "BEGIN TRANSACTION", 0, 0, 0) == SQLITE_OK) { - for (std::vector::const_iterator it = queue.begin(); it != queue.end(); ++it) - ret &= d_->SaveServer(**it); + for (auto const& serverItem : queue) { + ret &= d_->SaveServer(*serverItem); + } // Even on previous failure, we want to at least try to commit the data we have so far ret &= sqlite3_exec(d_->db_, "END TRANSACTION", 0, 0, 0) == SQLITE_OK; d_->ClearCaches(); } - else + else { ret = false; + } return ret; } -int64_t CQueueStorage::GetServer(CServer& server, bool fromBeginning) +int64_t CQueueStorage::GetServer(ServerWithCredentials& server, bool fromBeginning) { int64_t ret = -1; - if (d_->selectServersQuery_) - { - if (fromBeginning) - { + if (d_->selectServersQuery_) { + if (fromBeginning) { d_->ReadLocalPaths(); d_->ReadRemotePaths(); sqlite3_reset(d_->selectServersQuery_); } - for (;;) - { + for (;;) { int res; - do - { + do { res = sqlite3_step(d_->selectServersQuery_); } while (res == SQLITE_BUSY); - if (res == SQLITE_ROW) - { + if (res == SQLITE_ROW) { ret = d_->ParseServerFromRow(server); - if (ret > 0) + if (ret > 0) { break; + } } - else if (res == SQLITE_DONE) - { + else if (res == SQLITE_DONE) { ret = 0; sqlite3_reset(d_->selectServersQuery_); break; } - else - { + else { ret = -1; sqlite3_reset(d_->selectServersQuery_); break; @@ -1102,37 +1193,31 @@ int64_t ret = -1; *pItem = 0; - if (d_->selectFilesQuery_) - { - if (server > 0) - { + if (d_->selectFilesQuery_) { + if (server > 0) { sqlite3_reset(d_->selectFilesQuery_); sqlite3_bind_int64(d_->selectFilesQuery_, 1, server); } - for (;;) - { + for (;;) { int res; - do - { + do { res = sqlite3_step(d_->selectFilesQuery_); } while (res == SQLITE_BUSY); - if (res == SQLITE_ROW) - { + if (res == SQLITE_ROW) { ret = d_->ParseFileFromRow(pItem); - if (ret > 0) + if (ret > 0) { break; + } } - else if (res == SQLITE_DONE) - { + else if (res == SQLITE_DONE) { ret = 0; sqlite3_reset(d_->selectFilesQuery_); break; } - else - { + else { ret = -1; sqlite3_reset(d_->selectFilesQuery_); break; @@ -1148,41 +1233,44 @@ bool CQueueStorage::Clear() { - if (!d_->db_) + if (!d_->db_) { return false; + } - if (sqlite3_exec(d_->db_, "DELETE FROM files", 0, 0, 0) != SQLITE_OK) + if (sqlite3_exec(d_->db_, "DELETE FROM files", 0, 0, 0) != SQLITE_OK) { return false; + } - if (sqlite3_exec(d_->db_, "DELETE FROM servers", 0, 0, 0) != SQLITE_OK) + if (sqlite3_exec(d_->db_, "DELETE FROM servers", 0, 0, 0) != SQLITE_OK) { return false; + } - if (sqlite3_exec(d_->db_, "DELETE FROM local_paths", 0, 0, 0) != SQLITE_OK) + if (sqlite3_exec(d_->db_, "DELETE FROM local_paths", 0, 0, 0) != SQLITE_OK) { return false; + } - if (sqlite3_exec(d_->db_, "DELETE FROM remote_paths", 0, 0, 0) != SQLITE_OK) + if (sqlite3_exec(d_->db_, "DELETE FROM remote_paths", 0, 0, 0) != SQLITE_OK) { return false; + } d_->ClearCaches(); return true; } -wxString CQueueStorage::GetDatabaseFilename() +std::wstring CQueueStorage::GetDatabaseFilename() { - wxFileName file(COptions::Get()->GetOption(OPTION_DEFAULT_SETTINGSDIR), _T("queue.sqlite3")); - - return file.GetFullPath(); + return COptions::Get()->GetOption(OPTION_DEFAULT_SETTINGSDIR) + L"queue.sqlite3"; } bool CQueueStorage::BeginTransaction() { - return sqlite3_exec(d_->db_, "BEGIN TRANSACTION", 0, 0, 0) == SQLITE_OK; + return d_->BeginTransaction(); } -bool CQueueStorage::EndTransaction() +bool CQueueStorage::EndTransaction(bool rollback) { - return sqlite3_exec(d_->db_, "END TRANSACTION", 0, 0, 0) == SQLITE_OK; + return d_->EndTransaction(rollback); } bool CQueueStorage::Vacuum() diff -Nru filezilla-3.15.0.2/src/interface/queue_storage.h filezilla-3.33.0/src/interface/queue_storage.h --- filezilla-3.15.0.2/src/interface/queue_storage.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/queue_storage.h 2017-06-02 20:38:13.000000000 +0000 @@ -1,11 +1,11 @@ -#ifndef __QUEUE_STORAGE_H__ -#define __QUEUE_STORAGE_H__ +#ifndef FILEZILLA_INTERFACE_QUEUE_STORAGE_HEADER +#define FILEZILLA_INTERFACE_QUEUE_STORAGE_HEADER #include class CFileItem; class CServerItem; -class CServer; +class ServerWithCredentials; class CQueueStorage { @@ -22,7 +22,7 @@ bool BeginTransaction(); // Call after finishing loading - bool EndTransaction(); + bool EndTransaction(bool rollback = false); bool Clear(); // Also clears caches @@ -33,12 +33,11 @@ // > 0 = server id // 0 = No server // < 0 = failure. - int64_t GetServer(CServer& server, bool fromBeginning); - CServer GetNextServer(); + int64_t GetServer(ServerWithCredentials& server, bool fromBeginning); int64_t GetFile(CFileItem** pItem, int64_t server); - static wxString GetDatabaseFilename(); + static std::wstring GetDatabaseFilename(); private: Impl* d_; diff -Nru filezilla-3.15.0.2/src/interface/QueueView.cpp filezilla-3.33.0/src/interface/QueueView.cpp --- filezilla-3.15.0.2/src/interface/QueueView.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/interface/QueueView.cpp 2018-05-01 03:30:04.000000000 +0000 @@ -7,10 +7,10 @@ #include "xmlfunctions.h" #include "filezillaapp.h" #include "ipcmutex.h" +#include "local_recursive_operation.h" #include "state.h" #include "asyncrequestqueue.h" #include "defaultfileexistsdlg.h" -#include "filter.h" #include #include "dndobjects.h" #include "loginmanager.h" @@ -22,7 +22,7 @@ #include #include #include "statusbar.h" -#include "recursive_operation.h" +#include "remote_recursive_operation.h" #include "auto_ascii_files.h" #include "dragdropmanager.h" #include "drop_target_ex.h" @@ -32,13 +32,11 @@ #include #endif -#include - #ifdef __WXMSW__ #include #endif -class CQueueViewDropTarget : public CScrollableDropTarget +class CQueueViewDropTarget final : public CScrollableDropTarget { public: CQueueViewDropTarget(CQueueView* pQueueView) @@ -68,51 +66,52 @@ if (pDragDropManager) pDragDropManager->pDropTarget = m_pQueueView; - if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) - { + if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) { CState* const pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return wxDragNone; - const CServer* const pServer = pState->GetServer(); - if (!pServer) + } + ServerWithCredentials const& server = pState->GetServer(); + if (!server) { return wxDragNone; + } - const CServerPath& path = pState->GetRemotePath(); - if (path.empty()) + CServerPath const& path = pState->GetRemotePath(); + if (path.empty()) { return wxDragNone; + } pState->UploadDroppedFiles(m_pFileDataObject, path, true); } - else - { - if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) - { + else { + if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) { wxMessageBoxEx(_("Drag&drop between different instances of FileZilla has not been implemented yet.")); return wxDragNone; } CState* const pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return wxDragNone; - const CServer* const pServer = pState->GetServer(); - if (!pServer) + } + ServerWithCredentials const& server = pState->GetServer(); + if (!server) { return wxDragNone; + } - if (!pServer->EqualsNoPass(m_pRemoteDataObject->GetServer())) - { + if (server.server != m_pRemoteDataObject->GetServer().server) { wxMessageBoxEx(_("Drag&drop between different servers has not been implemented yet.")); return wxDragNone; } const CLocalPath& target = pState->GetLocalDir(); - if (!target.IsWriteable()) - { + if (!target.IsWriteable()) { wxBell(); return wxDragNone; } - if (!pState->DownloadDroppedFiles(m_pRemoteDataObject, target, true)) + if (!pState->DownloadDroppedFiles(m_pRemoteDataObject, target, true)) { return wxDragNone; + } } return def; @@ -138,10 +137,12 @@ { // Drag from remote to queue, check if local path is writeable CState* const pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return wxDragNone; - if (!pState->GetLocalDir().IsWriteable()) + } + if (!pState->GetLocalDir().IsWriteable()) { return wxDragNone; + } } def = wxDragCopy; @@ -167,37 +168,24 @@ wxDataObjectComposite* m_pDataObject; }; -DECLARE_EVENT_TYPE(fzEVT_FOLDERTHREAD_COMPLETE, -1) -DEFINE_EVENT_TYPE(fzEVT_FOLDERTHREAD_COMPLETE) - -DECLARE_EVENT_TYPE(fzEVT_FOLDERTHREAD_FILES, -1) -DEFINE_EVENT_TYPE(fzEVT_FOLDERTHREAD_FILES) - -DECLARE_EVENT_TYPE(fzEVT_ASKFORPASSWORD, -1) -DEFINE_EVENT_TYPE(fzEVT_ASKFORPASSWORD) - BEGIN_EVENT_TABLE(CQueueView, CQueueViewBase) -EVT_FZ_NOTIFICATION(wxID_ANY, CQueueView::OnEngineEvent) -EVT_COMMAND(wxID_ANY, fzEVT_FOLDERTHREAD_COMPLETE, CQueueView::OnFolderThreadComplete) -EVT_COMMAND(wxID_ANY, fzEVT_FOLDERTHREAD_FILES, CQueueView::OnFolderThreadFiles) - EVT_CONTEXT_MENU(CQueueView::OnContextMenu) EVT_MENU(XRCID("ID_PROCESSQUEUE"), CQueueView::OnProcessQueue) EVT_MENU(XRCID("ID_REMOVEALL"), CQueueView::OnStopAndClear) EVT_MENU(XRCID("ID_REMOVE"), CQueueView::OnRemoveSelected) EVT_MENU(XRCID("ID_DEFAULT_FILEEXISTSACTION"), CQueueView::OnSetDefaultFileExistsAction) -EVT_MENU(XRCID("ID_ACTIONAFTER_DISABLE"), CQueueView::OnActionAfter) +EVT_MENU(XRCID("ID_ACTIONAFTER_NONE"), CQueueView::OnActionAfter) +EVT_MENU(XRCID("ID_ACTIONAFTER_SHOW_NOTIFICATION_BUBBLE"), CQueueView::OnActionAfter) +EVT_MENU(XRCID("ID_ACTIONAFTER_REQUEST_ATTENTION"), CQueueView::OnActionAfter) EVT_MENU(XRCID("ID_ACTIONAFTER_CLOSE"), CQueueView::OnActionAfter) +EVT_MENU(XRCID("ID_ACTIONAFTER_CLOSE_ONCE"), CQueueView::OnActionAfter) EVT_MENU(XRCID("ID_ACTIONAFTER_DISCONNECT"), CQueueView::OnActionAfter) EVT_MENU(XRCID("ID_ACTIONAFTER_RUNCOMMAND"), CQueueView::OnActionAfter) -EVT_MENU(XRCID("ID_ACTIONAFTER_SHOWMESSAGE"), CQueueView::OnActionAfter) EVT_MENU(XRCID("ID_ACTIONAFTER_PLAYSOUND"), CQueueView::OnActionAfter) EVT_MENU(XRCID("ID_ACTIONAFTER_REBOOT"), CQueueView::OnActionAfter) EVT_MENU(XRCID("ID_ACTIONAFTER_SHUTDOWN"), CQueueView::OnActionAfter) EVT_MENU(XRCID("ID_ACTIONAFTER_SLEEP"), CQueueView::OnActionAfter) -EVT_COMMAND(wxID_ANY, fzEVT_ASKFORPASSWORD, CQueueView::OnAskPassword) - EVT_TIMER(wxID_ANY, CQueueView::OnTimer) EVT_CHAR(CQueueView::OnChar) @@ -210,264 +198,42 @@ EVT_COMMAND(wxID_ANY, fzEVT_GRANTEXCLUSIVEENGINEACCESS, CQueueView::OnExclusiveEngineRequestGranted) EVT_SIZE(CQueueView::OnSize) -END_EVENT_TABLE() - -class CFolderProcessingThread final : public fz::thread -{ - struct t_internalDirPair - { - CLocalPath localPath; - CServerPath remotePath; - }; -public: - CFolderProcessingThread(CQueueView* pOwner, CFolderScanItem* pFolderItem) - { - m_pOwner = pOwner; - m_pFolderItem = pFolderItem; - - t_internalDirPair* pair = new t_internalDirPair; - pair->localPath = pFolderItem->GetLocalPath(); - pair->remotePath = pFolderItem->GetRemotePath(); - m_dirsToCheck.push_back(pair); - } - - virtual ~CFolderProcessingThread() - { - { - fz::scoped_lock locker(m_sync); - m_quit = true; - } - join(); - for (auto iter = m_entryList.begin(); iter != m_entryList.end(); ++iter) - delete *iter; - for (auto iter = m_dirsToCheck.begin(); iter != m_dirsToCheck.end(); ++iter) - delete *iter; - } - - void GetFiles(std::list &entryList) - { - wxASSERT(entryList.empty()); - fz::scoped_lock locker(m_sync); - entryList.swap(m_entryList); - - m_didSendEvent = false; - m_processing_entries = true; - - if (m_throttleWait) { - m_throttleWait = false; - m_condition.signal(locker); - } - } - - class t_dirPair : public CFolderProcessingEntry - { - public: - t_dirPair() : CFolderProcessingEntry(CFolderProcessingEntry::dir) {} - CLocalPath localPath; - CServerPath remotePath; - }; - - void ProcessDirectory(const CLocalPath& localPath, CServerPath const& remotePath, const wxString& name) - { - fz::scoped_lock locker(m_sync); - - t_internalDirPair* pair = new t_internalDirPair; - - { - pair->localPath = localPath; - pair->localPath.AddSegment(name); - - pair->remotePath = remotePath; - pair->remotePath.AddSegment(name); - } - - m_dirsToCheck.push_back(pair); - - if (m_threadWaiting) { - m_threadWaiting = false; - m_condition.signal(locker); - } - } - - void CheckFinished() - { - fz::scoped_lock locker(m_sync); - wxASSERT(m_processing_entries); - - m_processing_entries = false; - - if (m_threadWaiting && (!m_dirsToCheck.empty() || m_entryList.empty())) { - m_threadWaiting = false; - m_condition.signal(locker); - } - } - - CFolderScanItem* GetFolderScanItem() - { - return m_pFolderItem; - } - -protected: - - void AddEntry(CFolderProcessingEntry* entry) - { - fz::scoped_lock l(m_sync); - m_entryList.push_back(entry); - - // Wait if there are more than 100 items to queue, - // don't send notification if there are less than 10. - // This reduces overhead - bool send; - - if (m_didSendEvent) { - send = false; - if (m_entryList.size() >= 100) { - m_throttleWait = true; - m_condition.wait(l); - } - } - else if (m_entryList.size() < 20) - send = false; - else - send = true; - - if (send) - m_didSendEvent = true; - - l.unlock(); - - if (send) { - // We send the notification after leaving the critical section, else we - // could get into a deadlock. wxWidgets event system does internal - // locking. - m_pOwner->QueueEvent(new wxCommandEvent(fzEVT_FOLDERTHREAD_FILES, wxID_ANY)); - } - } - - void entry() - { -#ifdef __WXDEBUG__ - wxMutexGuiEnter(); - wxASSERT(m_pFolderItem->GetTopLevelItem() && m_pFolderItem->GetTopLevelItem()->GetType() == QueueItemType::Server); - wxMutexGuiLeave(); -#endif - - wxASSERT(!m_pFolderItem->Download()); - - fz::local_filesys localFileSystem; - - while (!m_pFolderItem->m_remove) { - fz::scoped_lock l(m_sync); - if (m_quit) { - break; - } - if (m_dirsToCheck.empty()) { - if (!m_didSendEvent && !m_entryList.empty()) { - m_didSendEvent = true; - l.unlock(); - m_pOwner->QueueEvent(new wxCommandEvent(fzEVT_FOLDERTHREAD_FILES, wxID_ANY)); - continue; - } - - if (!m_didSendEvent && !m_processing_entries) { - break; - } - m_threadWaiting = true; - m_condition.wait(l); - if (m_dirsToCheck.empty()) { - break; - } - continue; - } - - const t_internalDirPair *pair = m_dirsToCheck.front(); - m_dirsToCheck.pop_front(); - - l.unlock(); - - if (!localFileSystem.begin_find_files(fz::to_native(pair->localPath.GetPath()), false)) { - delete pair; - continue; - } - - t_dirPair* pair2 = new t_dirPair; - pair2->localPath = pair->localPath; - pair2->remotePath = pair->remotePath; - AddEntry(pair2); - - t_newEntry* entry = new t_newEntry; - - fz::native_string name; - bool is_link; - bool is_dir; - while (localFileSystem.get_next_file(name, is_link, is_dir, &entry->size, &entry->time, &entry->attributes)) { - if (is_link) - continue; - - entry->name = name; - entry->dir = is_dir; - AddEntry(entry); - - entry = new t_newEntry; - } - delete entry; - - delete pair; - } +EVT_LIST_COL_CLICK(wxID_ANY, CQueueView::OnColumnClicked) - m_pOwner->QueueEvent(new wxCommandEvent(fzEVT_FOLDERTHREAD_COMPLETE, wxID_ANY)); - } - - std::list m_dirsToCheck; - - // Access has to be guarded by m_sync - std::list m_entryList; - - CQueueView* m_pOwner; - CFolderScanItem* m_pFolderItem; - - fz::mutex m_sync; - fz::condition m_condition; - bool m_threadWaiting{}; - bool m_throttleWait{}; - bool m_didSendEvent{}; - bool m_processing_entries{}; - bool m_quit{}; -}; +END_EVENT_TABLE() CQueueView::CQueueView(CQueue* parent, int index, CMainFrame* pMainFrame, CAsyncRequestQueue *pAsyncRequestQueue) : CQueueViewBase(parent, index, _("Queued files")), - m_pMainFrame(pMainFrame), - m_pAsyncRequestQueue(pAsyncRequestQueue) + m_pMainFrame(pMainFrame), + m_pAsyncRequestQueue(pAsyncRequestQueue) { - if (m_pAsyncRequestQueue) - m_pAsyncRequestQueue->SetQueue(this); + wxGetApp().AddStartupProfileRecord("CQueueView::CQueueView"); - m_activeCount = 0; - m_activeCountDown = 0; - m_activeCountUp = 0; - m_activeMode = 0; - m_quit = 0; - m_waitStatusLineUpdate = false; - m_lastTopItem = -1; - - m_totalQueueSize = 0; - m_filesWithUnknownSize = 0; + if (m_pAsyncRequestQueue) { + m_pAsyncRequestQueue->SetQueue(this); + } - m_actionAfterState = ActionAfterState_Disabled; + int action = COptions::Get()->GetOptionVal(OPTION_QUEUE_COMPLETION_ACTION); + if (action < 0 || action >= ActionAfterState::Count) { + action = 1; + } + else if (action == ActionAfterState::Reboot || action == ActionAfterState::Shutdown || action == ActionAfterState::Sleep || action == ActionAfterState::CloseOnce) { + action = 1; + } + m_actionAfterState = static_cast(action); - std::list extraCols; - extraCols.push_back(colTransferStatus); + std::vector extraCols({colTransferStatus}); CreateColumns(extraCols); RegisterOption(OPTION_NUMTRANSFERS); RegisterOption(OPTION_CONCURRENTDOWNLOADLIMIT); RegisterOption(OPTION_CONCURRENTUPLOADLIMIT); - SetDropTarget(new CQueueViewDropTarget(this)); + CContextManager::Get()->RegisterHandler(this, STATECHANGE_REWRITE_CREDENTIALS, false); + CContextManager::Get()->RegisterHandler(this, STATECHANGE_QUITNOW, false); - m_folderscan_item_refresh_timer.SetOwner(this); + SetDropTarget(new CQueueViewDropTarget(this)); m_line_height = -1; #ifdef __WXMSW__ @@ -479,18 +245,15 @@ CQueueView::~CQueueView() { - delete m_pFolderProcessingThread; - m_pFolderProcessingThread = 0; - DeleteEngines(); m_resize_timer.Stop(); } bool CQueueView::QueueFile(const bool queueOnly, const bool download, - const wxString& sourceFile, const wxString& targetFile, + std::wstring const& sourceFile, std::wstring const& targetFile, const CLocalPath& localPath, const CServerPath& remotePath, - const CServer& server, int64_t size, enum CEditHandler::fileType edit, + ServerWithCredentials const& server, int64_t size, CEditHandler::fileType edit, QueuePriority priority) { CServerItem* pServerItem = CreateServerItem(server); @@ -502,19 +265,23 @@ p.AddSegment(targetFile); fileItem = new CFolderItem(pServerItem, queueOnly, p); } - else + else { fileItem = new CFolderItem(pServerItem, queueOnly, remotePath, targetFile); + } wxASSERT(edit == CEditHandler::none); } else { fileItem = new CFileItem(pServerItem, queueOnly, download, sourceFile, targetFile, localPath, remotePath, size); - if (download) + if (download) { fileItem->SetAscii(CAutoAsciiFiles::TransferRemoteAsAscii(sourceFile, remotePath.GetType())); - else + } + else { fileItem->SetAscii(CAutoAsciiFiles::TransferLocalAsAscii(sourceFile, remotePath.GetType())); + } fileItem->m_edit = edit; - if (edit != CEditHandler::none) + if (edit != CEditHandler::none) { fileItem->m_onetime_action = CFileExistsNotification::overwrite; + } } fileItem->SetPriorityRaw(priority); @@ -526,18 +293,17 @@ void CQueueView::QueueFile_Finish(const bool start) { bool need_refresh = false; - if (m_insertionStart <= GetTopItem() + GetCountPerPage() + 1) + if (m_insertionStart >= 0 && m_insertionStart <= GetTopItem() + GetCountPerPage() + 1) { need_refresh = true; + } CommitChanges(); - if (!m_activeMode && start) - { + if (!m_activeMode && start) { m_activeMode = 1; CContextManager::Get()->NotifyGlobalHandlers(STATECHANGE_QUEUEPROCESSING); } - if (m_activeMode) - { + if (m_activeMode) { m_waitStatusLineUpdate = true; AdvanceQueue(false); m_waitStatusLineUpdate = false; @@ -545,30 +311,32 @@ UpdateStatusLinePositions(); - if (need_refresh) + if (need_refresh) { RefreshListOnly(false); + } } // Defined in RemoteListView.cpp -extern wxString StripVMSRevision(const wxString& name); +std::wstring StripVMSRevision(std::wstring const& name); bool CQueueView::QueueFiles(const bool queueOnly, const CLocalPath& localPath, const CRemoteDataObject& dataObject) { CServerItem* pServerItem = CreateServerItem(dataObject.GetServer()); - const std::list& files = dataObject.GetFiles(); + std::vector const& files = dataObject.GetFiles(); for (auto const& fileInfo : files) { - if (fileInfo.dir) + if (fileInfo.dir) { continue; + } - CFileItem* fileItem; - wxString localFile = ReplaceInvalidCharacters(fileInfo.name); - if (dataObject.GetServerPath().GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) + std::wstring localFile = ReplaceInvalidCharacters(fileInfo.name); + if (dataObject.GetServerPath().GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) { localFile = StripVMSRevision(localFile); + } - fileItem = new CFileItem(pServerItem, queueOnly, true, - fileInfo.name, (fileInfo.name != localFile) ? localFile : wxString(), + CFileItem* fileItem = new CFileItem(pServerItem, queueOnly, true, + fileInfo.name, (fileInfo.name != localFile) ? localFile : std::wstring(), localPath, dataObject.GetServerPath(), fileInfo.size); fileItem->SetAscii(CAutoAsciiFiles::TransferRemoteAsAscii(fileInfo.name, dataObject.GetServerPath().GetType())); @@ -580,18 +348,51 @@ return true; } -void CQueueView::OnEngineEvent(wxFzEvent &event) +bool CQueueView::QueueFiles(const bool queueOnly, ServerWithCredentials const& server, CLocalRecursiveOperation::listing const& listing) +{ + CServerItem* pServerItem = CreateServerItem(server); + + auto const& files = listing.files; + if (files.empty() && listing.dirs.empty()) { + // Empty directory + CFileItem* fileItem = new CFolderItem(pServerItem, queueOnly, listing.remotePath, std::wstring()); + InsertItem(pServerItem, fileItem); + } + else { + for (auto const& file : files) { + CFileItem* fileItem = new CFileItem(pServerItem, queueOnly, false, + file.name, std::wstring(), + listing.localPath, listing.remotePath, file.size); + fileItem->SetAscii(CAutoAsciiFiles::TransferLocalAsAscii(file.name, listing.remotePath.GetType())); + + InsertItem(pServerItem, fileItem); + } + + // We do not look at dirs here, recursion takes care of it. + } + + return true; +} + +void CQueueView::OnEngineEvent(CFileZillaEngine* engine) { - t_EngineData* const pEngineData = GetEngineData(event.engine_); - if (!pEngineData) + CallAfter(&CQueueView::DoOnEngineEvent, engine); +} + +void CQueueView::DoOnEngineEvent(CFileZillaEngine* engine) +{ + t_EngineData* const pEngineData = GetEngineData(engine); + if (!pEngineData) { return; + } std::unique_ptr pNotification = pEngineData->pEngine->GetNextNotification(); while (pNotification) { ProcessNotification(pEngineData, std::move(pNotification)); - if (m_engineData.empty() || !pEngineData->pEngine) + if (m_engineData.empty() || !pEngineData->pEngine) { break; + } pNotification = pEngineData->pEngine->GetNextNotification(); } @@ -611,49 +412,56 @@ { case nId_logmsg: m_pMainFrame->GetStatusView()->AddToLog(static_cast(*pNotification.get())); - if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) == 2) + if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) == 2) { m_pQueue->Highlight(3); + } break; case nId_operation: ProcessReply(pEngineData, static_cast(*pNotification.get())); break; case nId_asyncrequest: - if (pEngineData->pItem) { + { auto asyncRequestNotification = unique_static_cast(std::move(pNotification)); - switch (asyncRequestNotification->GetRequestID()) { - case reqId_fileexists: - { - CFileExistsNotification& fileExistsNotification = static_cast(*asyncRequestNotification.get()); - fileExistsNotification.overwriteAction = pEngineData->pItem->m_defaultFileExistsAction; + if (pEngineData->pItem) { + switch (asyncRequestNotification->GetRequestID()) { + case reqId_fileexists: + { + CFileExistsNotification& fileExistsNotification = static_cast(*asyncRequestNotification.get()); + fileExistsNotification.overwriteAction = pEngineData->pItem->m_defaultFileExistsAction; - if (pEngineData->pItem->GetType() == QueueItemType::File) { - CFileItem* pFileItem = (CFileItem*)pEngineData->pItem; + if (pEngineData->pItem->GetType() == QueueItemType::File) { + CFileItem* pFileItem = (CFileItem*)pEngineData->pItem; - switch (pFileItem->m_onetime_action) - { - case CFileExistsNotification::resume: - if (fileExistsNotification.canResume && - !pFileItem->Ascii()) - { - fileExistsNotification.overwriteAction = CFileExistsNotification::resume; + switch (pFileItem->m_onetime_action) + { + case CFileExistsNotification::resume: + if (fileExistsNotification.canResume && + !pFileItem->Ascii()) + { + fileExistsNotification.overwriteAction = CFileExistsNotification::resume; + } + break; + case CFileExistsNotification::overwrite: + fileExistsNotification.overwriteAction = CFileExistsNotification::overwrite; + break; + default: + // Others are unused + break; + } + pFileItem->m_onetime_action = CFileExistsNotification::unknown; } - break; - case CFileExistsNotification::overwrite: - fileExistsNotification.overwriteAction = CFileExistsNotification::overwrite; - break; - default: - // Others are unused - break; } - pFileItem->m_onetime_action = CFileExistsNotification::unknown; - } + break; + default: + break; } - break; - default: - break; + m_pAsyncRequestQueue->AddRequest(pEngineData->pEngine, std::move(asyncRequestNotification)); } - - m_pAsyncRequestQueue->AddRequest(pEngineData->pEngine, std::move(asyncRequestNotification)); + else { + if (pEngineData->active && asyncRequestNotification->GetRequestID() != reqId_fileexists) { + m_pAsyncRequestQueue->AddRequest(pEngineData->pEngine, std::move(asyncRequestNotification)); + } + } } break; case nId_active: @@ -663,8 +471,7 @@ } break; case nId_transferstatus: - if (pEngineData->pItem && pEngineData->pStatusLineCtrl) - { + if (pEngineData->pItem && pEngineData->pStatusLineCtrl) { auto const& transferStatusNotification = static_cast(*pNotification.get()); CTransferStatus const& status = transferStatusNotification.GetStatus(); if (pEngineData->active) { @@ -681,9 +488,21 @@ case nId_local_dir_created: { auto const& localDirCreatedNotification = static_cast(*pNotification.get()); - const std::vector *pStates = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) - (*iter)->LocalDirCreated(localDirCreatedNotification.dir); + std::vector const* pStates = CContextManager::Get()->GetAllStates(); + for (auto state : *pStates) { + state->LocalDirCreated(localDirCreatedNotification.dir); + } + } + break; + case nId_listing: + { + auto const& listingNotification = static_cast(*pNotification.get()); + if (!listingNotification.GetPath().empty() && !listingNotification.Failed() && pEngineData->pEngine) { + std::shared_ptr pListing = std::make_shared(); + if (pEngineData->pEngine->CacheLookup(listingNotification.GetPath(), *pListing) == FZ_REPLY_OK) { + CContextManager::Get()->ProcessDirectoryListing(pEngineData->lastServer.server, pListing, 0); + } + } } break; default: @@ -691,55 +510,55 @@ } } -bool CQueueView::CanStartTransfer(const CServerItem& server_item, struct t_EngineData *&pEngineData) +bool CQueueView::CanStartTransfer(CServerItem const & server_item, t_EngineData *&pEngineData) { - const CServer &server = server_item.GetServer(); - const int max_count = server.MaximumMultipleConnections(); - if (!max_count) + ServerWithCredentials const& server = server_item.GetServer(); + const int max_count = server.server.MaximumMultipleConnections(); + if (!max_count) { return true; + } int active_count = server_item.m_activeCount; CState* browsingStateOnSameServer = 0; const std::vector *pStates = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) - { - CState* pState = *iter; - const CServer* pBrowsingServer = pState->GetServer(); - if (!pBrowsingServer) + for (auto pState : *pStates) { + ServerWithCredentials const& browsingServer = pState->GetServer(); + if (!browsingServer) { continue; + } - if (*pBrowsingServer == server) - { - active_count++; + if (browsingServer == server) { + ++active_count; browsingStateOnSameServer = pState; break; } } - if (active_count < max_count) + if (active_count < max_count) { return true; + } // Max count has been reached - pEngineData = GetIdleEngine(&server, true); - if (pEngineData) - { + pEngineData = GetIdleEngine(server, true); + if (pEngineData) { // If we got an idle engine connected to this very server, start the // transfer anyhow. Let's not get this connection go to waste. - if (pEngineData->lastServer == server && pEngineData->pEngine->IsConnected()) + if (pEngineData->lastServer == server && pEngineData->pEngine->IsConnected()) { return true; + } } - if (!browsingStateOnSameServer || active_count > 1) + if (!browsingStateOnSameServer || active_count > 1) { return false; + } // At this point the following holds: // max_count is limited to 1, only connection to server is held by the browsing connection pEngineData = GetEngineData(browsingStateOnSameServer->m_pEngine); - if (pEngineData) - { + if (pEngineData) { wxASSERT(pEngineData->transient); return pEngineData->transient && !pEngineData->active; } @@ -754,28 +573,33 @@ bool CQueueView::TryStartNextTransfer() { - if (m_quit || !m_activeMode) + if (m_quit || !m_activeMode) { return false; + } // Check transfer limit - if (m_activeCount >= COptions::Get()->GetOptionVal(OPTION_NUMTRANSFERS)) + if (m_activeCount >= COptions::Get()->GetOptionVal(OPTION_NUMTRANSFERS)) { return false; + } // Check limits for concurrent up/downloads const int maxDownloads = COptions::Get()->GetOptionVal(OPTION_CONCURRENTDOWNLOADLIMIT); const int maxUploads = COptions::Get()->GetOptionVal(OPTION_CONCURRENTUPLOADLIMIT); TransferDirection wantedDirection; - if (maxDownloads && m_activeCountDown >= maxDownloads) - { - if (maxUploads && m_activeCountUp >= maxUploads) + if (maxDownloads && m_activeCountDown >= maxDownloads) { + if (maxUploads && m_activeCountUp >= maxUploads) { return false; - else + } + else { wantedDirection = TransferDirection::upload; + } } - else if (maxUploads && m_activeCountUp >= maxUploads) + else if (maxUploads && m_activeCountUp >= maxUploads) { wantedDirection = TransferDirection::download; - else + } + else { wantedDirection = TransferDirection::both; + } struct t_bestMatch { @@ -791,18 +615,16 @@ // Find inactive file. Check all servers for // the file with the highest priority - for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) - { + for (auto const& currentServerItem : m_serverList) { t_EngineData* pEngineData = 0; - CServerItem* currentServerItem = *iter; - if (!CanStartTransfer(*currentServerItem, pEngineData)) + if (!CanStartTransfer(*currentServerItem, pEngineData)) { continue; + } CFileItem* newFileItem = currentServerItem->GetIdleChild(m_activeMode == 1, wantedDirection); - while (newFileItem && newFileItem->Download() && newFileItem->GetType() == QueueItemType::Folder) - { + while (newFileItem && newFileItem->Download() && newFileItem->GetType() == QueueItemType::Folder) { CLocalPath localPath(newFileItem->GetLocalPath()); localPath.AddSegment(newFileItem->GetLocalFile()); wxFileName::Mkdir(localPath.GetPath(), 0777, wxPATH_MKDIR_FULL); @@ -812,38 +634,42 @@ } if (RemoveItem(newFileItem, true)) { // Server got deleted. Unfortunately we have to start over now - if (m_serverList.empty()) + if (m_serverList.empty()) { return false; + } return true; } newFileItem = currentServerItem->GetIdleChild(m_activeMode == 1, wantedDirection); } - if (!newFileItem) + if (!newFileItem) { continue; + } - if (!bestMatch.fileItem || newFileItem->GetPriority() > bestMatch.fileItem->GetPriority()) - { + if (!bestMatch.fileItem || newFileItem->GetPriority() > bestMatch.fileItem->GetPriority()) { bestMatch.serverItem = currentServerItem; bestMatch.fileItem = newFileItem; bestMatch.pEngineData = pEngineData; - if (newFileItem->GetPriority() == QueuePriority::highest) + if (newFileItem->GetPriority() == QueuePriority::highest) { break; + } } } - if (!bestMatch.fileItem) + if (!bestMatch.fileItem) { return false; + } // Find idle engine t_EngineData* pEngineData; - if (bestMatch.pEngineData) + if (bestMatch.pEngineData) { pEngineData = bestMatch.pEngineData; - else - { - pEngineData = GetIdleEngine(&bestMatch.serverItem->GetServer()); - if (!pEngineData) + } + else { + pEngineData = GetIdleEngine(bestMatch.serverItem->GetServer()); + if (!pEngineData) { return false; + } } // Now we have both inactive engine and file. @@ -858,31 +684,34 @@ pEngineData->m_idleDisconnectTimer = 0; bestMatch.serverItem->m_activeCount++; m_activeCount++; - if (bestMatch.fileItem->Download()) + if (bestMatch.fileItem->Download()) { m_activeCountDown++; - else + } + else { m_activeCountUp++; + } - const CServer oldServer = pEngineData->lastServer; + ServerWithCredentials const oldServer = pEngineData->lastServer; pEngineData->lastServer = bestMatch.serverItem->GetServer(); if (pEngineData->state != t_EngineData::waitprimary) { if (!pEngineData->pEngine->IsConnected()) { - if (pEngineData->lastServer.GetLogonType() == ASK) { - if (CLoginManager::Get().GetPassword(pEngineData->lastServer, true)) - pEngineData->state = t_EngineData::connect; - else - pEngineData->state = t_EngineData::askpassword; - } - else + if (CLoginManager::Get().GetPassword(pEngineData->lastServer, true)) { pEngineData->state = t_EngineData::connect; + } + else { + pEngineData->state = t_EngineData::askpassword; + } } - else if (oldServer != bestMatch.serverItem->GetServer()) + else if (oldServer != bestMatch.serverItem->GetServer()) { pEngineData->state = t_EngineData::disconnect; - else if (pEngineData->pItem->GetType() == QueueItemType::File) + } + else if (pEngineData->pItem->GetType() == QueueItemType::File) { pEngineData->state = t_EngineData::transfer; - else + } + else { pEngineData->state = t_EngineData::mkdir; + } } if (bestMatch.fileItem->GetType() == QueueItemType::File) { @@ -900,10 +729,10 @@ #endif rect.SetHeight(GetLineHeight()); m_allowBackgroundErase = false; - if (!pEngineData->pStatusLineCtrl) + if (!pEngineData->pStatusLineCtrl) { pEngineData->pStatusLineCtrl = new CStatusLineCtrl(this, pEngineData, rect); - else - { + } + else { pEngineData->pStatusLineCtrl->ClearTransferStatus(); pEngineData->pStatusLineCtrl->SetSize(rect); pEngineData->pStatusLineCtrl->Show(); @@ -934,22 +763,24 @@ int replyCode = notification.nReplyCode; if ((replyCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { - enum ResetReason reason; + ResetReason reason; if (pEngineData->pItem) { - if (pEngineData->pItem->pending_remove()) - reason = remove; + if (pEngineData->pItem->pending_remove()) { + reason = ResetReason::remove; + } else { if (pEngineData->pItem->GetType() == QueueItemType::File && ((CFileItem*)pEngineData->pItem)->made_progress()) { CFileItem* pItem = (CFileItem*)pEngineData->pItem; pItem->set_made_progress(false); pItem->m_onetime_action = CFileExistsNotification::resume; } - reason = reset; + reason = ResetReason::reset; } - pEngineData->pItem->SetStatusMessage(CFileItem::interrupted); + pEngineData->pItem->SetStatusMessage(CFileItem::Status::interrupted); + } + else { + reason = ResetReason::reset; } - else - reason = reset; ResetEngine(*pEngineData, reason); return; } @@ -964,55 +795,67 @@ pEngineData->pStatusLineCtrl->ClearTransferStatus(); } } - else + else { pEngineData->state = t_EngineData::none; + } break; case t_EngineData::connect: if (!pEngineData->pItem) { - ResetEngine(*pEngineData, reset); + ResetEngine(*pEngineData, ResetReason::reset); return; } else if (replyCode == FZ_REPLY_OK) { - if (pEngineData->pItem->GetType() == QueueItemType::File) + if (pEngineData->pItem->GetType() == QueueItemType::File) { pEngineData->state = t_EngineData::transfer; - else + } + else { pEngineData->state = t_EngineData::mkdir; - if (pEngineData->active && pEngineData->pStatusLineCtrl) + } + if (pEngineData->active && pEngineData->pStatusLineCtrl) { pEngineData->pStatusLineCtrl->ClearTransferStatus(); + } } else { - if (replyCode & FZ_REPLY_PASSWORDFAILED) - CLoginManager::Get().CachedPasswordFailed(pEngineData->lastServer); + if (replyCode & FZ_REPLY_PASSWORDFAILED) { + CLoginManager::Get().CachedPasswordFailed(pEngineData->lastServer.server); + } - if ((replyCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) - pEngineData->pItem->SetStatusMessage(CFileItem::none); - else if (replyCode & FZ_REPLY_PASSWORDFAILED) - pEngineData->pItem->SetStatusMessage(CFileItem::incorrect_password); - else if ((replyCode & FZ_REPLY_TIMEOUT) == FZ_REPLY_TIMEOUT) - pEngineData->pItem->SetStatusMessage(CFileItem::timeout); - else if (replyCode & FZ_REPLY_DISCONNECTED) - pEngineData->pItem->SetStatusMessage(CFileItem::disconnected); - else - pEngineData->pItem->SetStatusMessage(CFileItem::connection_failed); + if ((replyCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::none); + } + else if (replyCode & FZ_REPLY_PASSWORDFAILED) { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::incorrect_password); + } + else if ((replyCode & FZ_REPLY_TIMEOUT) == FZ_REPLY_TIMEOUT) { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::timeout); + } + else if (replyCode & FZ_REPLY_DISCONNECTED) { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::disconnected); + } + else { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::connection_failed); + } if (replyCode != (FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED) || !IsOtherEngineConnected(pEngineData)) { - if (!IncreaseErrorCount(*pEngineData)) + if (!IncreaseErrorCount(*pEngineData)) { return; + } } - if (!pEngineData->transient) + if (!pEngineData->transient) { SwitchEngine(&pEngineData); + } } break; case t_EngineData::transfer: if (!pEngineData->pItem) { - ResetEngine(*pEngineData, reset); + ResetEngine(*pEngineData, ResetReason::reset); return; } if (replyCode == FZ_REPLY_OK) { - ResetEngine(*pEngineData, success); + ResetEngine(*pEngineData, ResetReason::success); return; } // Increase error count only if item didn't make any progress. This keeps @@ -1026,85 +869,91 @@ pItem->set_made_progress(false); pItem->m_onetime_action = CFileExistsNotification::resume; } - else - { - if ((replyCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) - pEngineData->pItem->SetStatusMessage(CFileItem::none); - else if ((replyCode & FZ_REPLY_TIMEOUT) == FZ_REPLY_TIMEOUT) - pEngineData->pItem->SetStatusMessage(CFileItem::timeout); - else if (replyCode & FZ_REPLY_DISCONNECTED) - pEngineData->pItem->SetStatusMessage(CFileItem::disconnected); + else { + if ((replyCode & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::none); + } + else if ((replyCode & FZ_REPLY_TIMEOUT) == FZ_REPLY_TIMEOUT) { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::timeout); + } + else if (replyCode & FZ_REPLY_DISCONNECTED) { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::disconnected); + } else if ((replyCode & FZ_REPLY_WRITEFAILED) == FZ_REPLY_WRITEFAILED) { - pEngineData->pItem->SetStatusMessage(CFileItem::local_file_unwriteable); - ResetEngine(*pEngineData, failure); + pEngineData->pItem->SetStatusMessage(CFileItem::Status::local_file_unwriteable); + ResetEngine(*pEngineData, ResetReason::failure); return; } else if ((replyCode & FZ_REPLY_CRITICALERROR) == FZ_REPLY_CRITICALERROR) { - pEngineData->pItem->SetStatusMessage(CFileItem::could_not_start); - ResetEngine(*pEngineData, failure); + pEngineData->pItem->SetStatusMessage(CFileItem::Status::could_not_start); + ResetEngine(*pEngineData, ResetReason::failure); return; } - else - pEngineData->pItem->SetStatusMessage(CFileItem::could_not_start); - if (!IncreaseErrorCount(*pEngineData)) + else { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::could_not_start); + } + if (!IncreaseErrorCount(*pEngineData)) { return; + } if (replyCode & FZ_REPLY_DISCONNECTED && pEngineData->transient) { - ResetEngine(*pEngineData, retry); + ResetEngine(*pEngineData, ResetReason::retry); return; } } if (replyCode & FZ_REPLY_DISCONNECTED) { - if (!SwitchEngine(&pEngineData)) + if (!SwitchEngine(&pEngineData)) { pEngineData->state = t_EngineData::connect; + } } break; case t_EngineData::mkdir: - if (replyCode == FZ_REPLY_OK) - { - ResetEngine(*pEngineData, success); + if (replyCode == FZ_REPLY_OK) { + ResetEngine(*pEngineData, ResetReason::success); return; } - if (replyCode & FZ_REPLY_DISCONNECTED) - { - if (!IncreaseErrorCount(*pEngineData)) + if (replyCode & FZ_REPLY_DISCONNECTED) { + if (!IncreaseErrorCount(*pEngineData)) { return; + } - if (pEngineData->transient) - { - ResetEngine(*pEngineData, retry); + if (pEngineData->transient) { + ResetEngine(*pEngineData, ResetReason::retry); return; } - if (!SwitchEngine(&pEngineData)) + if (!SwitchEngine(&pEngineData)) { pEngineData->state = t_EngineData::connect; + } } - else - { + else { // Cannot retry - ResetEngine(*pEngineData, failure); + ResetEngine(*pEngineData, ResetReason::failure); return; } break; case t_EngineData::list: - ResetEngine(*pEngineData, remove); + ResetEngine(*pEngineData, ResetReason::remove); return; default: return; } - if (pEngineData->state == t_EngineData::connect && pEngineData->lastServer.GetLogonType() == ASK) { - if (!CLoginManager::Get().GetPassword(pEngineData->lastServer, true)) + if (pEngineData->state == t_EngineData::connect) { + if (!CLoginManager::Get().GetPassword(pEngineData->lastServer, true)) { pEngineData->state = t_EngineData::askpassword; + } } if (!m_activeMode) { - enum ResetReason reason; - if (pEngineData->pItem && pEngineData->pItem->pending_remove()) - reason = remove; - else - reason = reset; + ResetReason reason; + if (pEngineData->pItem && pEngineData->pItem->pending_remove()) { + reason = ResetReason::remove; + } + else { + reason = ResetReason::reset; + } ResetEngine(*pEngineData, reason); return; } @@ -1112,10 +961,11 @@ SendNextCommand(*pEngineData); } -void CQueueView::ResetEngine(t_EngineData& data, const enum ResetReason reason) +void CQueueView::ResetEngine(t_EngineData& data, const ResetReason reason) { - if (!data.active) + if (!data.active) { return; + } m_waitStatusLineUpdate = true; @@ -1141,29 +991,32 @@ UpdateSelections_ItemRemoved(GetItemIndex(data.pItem) + 1); - m_itemCount--; + --m_itemCount; SaveSetItemCount(m_itemCount); CFileItem* const pFileItem = (CFileItem*)data.pItem; if (pFileItem->Download()) { const std::vector *pStates = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) - (*iter)->RefreshLocalFile(pFileItem->GetLocalPath().GetPath() + pFileItem->GetLocalFile()); + for (auto *pState : *pStates) { + pState->RefreshLocalFile(pFileItem->GetLocalPath().GetPath() + pFileItem->GetLocalFile()); + } } - if (pFileItem->m_edit != CEditHandler::none && reason != retry && reason != reset) { + if (pFileItem->m_edit != CEditHandler::none && reason != ResetReason::retry && reason != ResetReason::reset) { CEditHandler* pEditHandler = CEditHandler::Get(); wxASSERT(pEditHandler); if (pFileItem->m_edit == CEditHandler::remote) { - pEditHandler->FinishTransfer(reason == success, pFileItem->GetRemoteFile(), pFileItem->GetRemotePath(), pServerItem->GetServer()); + pEditHandler->FinishTransfer(reason == ResetReason::success, pFileItem->GetRemoteFile(), pFileItem->GetRemotePath(), pServerItem->GetServer()); } - else - pEditHandler->FinishTransfer(reason == success, pFileItem->GetLocalPath().GetPath() + pFileItem->GetLocalFile()); - if (reason == success) + else { + pEditHandler->FinishTransfer(reason == ResetReason::success, pFileItem->GetLocalPath().GetPath() + pFileItem->GetLocalFile()); + } + if (reason == ResetReason::success) { pFileItem->m_edit = CEditHandler::none; + } } - if (reason == failure) { + if (reason == ResetReason::failure) { pFileItem->m_onetime_action = CFileExistsNotification::unknown; pFileItem->set_made_progress(false); } @@ -1171,26 +1024,33 @@ wxASSERT(data.pItem->IsActive()); wxASSERT(data.pItem->m_pEngineData == &data); - if (data.pItem->IsActive()) + if (data.pItem->IsActive()) { data.pItem->SetActive(false); + } if (data.pItem->Download()) { wxASSERT(m_activeCountDown > 0); - if (m_activeCountDown > 0) + if (m_activeCountDown > 0) { m_activeCountDown--; + } } else { wxASSERT(m_activeCountUp > 0); - if (m_activeCountUp > 0) + if (m_activeCountUp > 0) { m_activeCountUp--; + } } - if (reason == reset) { - if (!data.pItem->queued()) + if (reason == ResetReason::reset) { + if (!data.pItem->queued()) { static_cast(data.pItem->GetTopLevelItem())->QueueImmediateFile(data.pItem); + } + if (data.pItem->GetType() == QueueItemType::File || data.pItem->GetType() == QueueItemType::Folder) { + static_cast(data.pItem)->SetStatusMessage(CFileItem::Status::none); + } } - else if (reason == failure) { + else if (reason == ResetReason::failure) { if (data.pItem->GetType() == QueueItemType::File || data.pItem->GetType() == QueueItemType::Folder) { - const CServer server = ((CServerItem*)data.pItem->GetTopLevelItem())->GetServer(); + ServerWithCredentials const server = ((CServerItem*)data.pItem->GetTopLevelItem())->GetServer(); RemoveItem(data.pItem, false); @@ -1202,47 +1062,51 @@ pQueueViewFailed->CommitChanges(); } } - else if (reason == success) { + else if (reason == ResetReason::success) { if (data.pItem->GetType() == QueueItemType::File || data.pItem->GetType() == QueueItemType::Folder) { CQueueViewSuccessful* pQueueViewSuccessful = m_pQueue->GetQueueView_Successful(); - if (pQueueViewSuccessful->AutoClear()) + if (pQueueViewSuccessful->AutoClear()) { RemoveItem(data.pItem, true); + } else { - const CServer server = ((CServerItem*)data.pItem->GetTopLevelItem())->GetServer(); + ServerWithCredentials const server = ((CServerItem*)data.pItem->GetTopLevelItem())->GetServer(); RemoveItem(data.pItem, false); CServerItem* pNewServerItem = pQueueViewSuccessful->CreateServerItem(server); data.pItem->UpdateTime(); data.pItem->SetParent(pNewServerItem); - data.pItem->SetStatusMessage(CFileItem::none); + data.pItem->SetStatusMessage(CFileItem::Status::none); pQueueViewSuccessful->InsertItem(pNewServerItem, data.pItem); pQueueViewSuccessful->CommitChanges(); } } - else + else { RemoveItem(data.pItem, true); + } } - else if (reason == retry) { - } - else + else if (reason != ResetReason::retry) { RemoveItem(data.pItem, true); + } data.pItem = 0; } wxASSERT(m_activeCount > 0); - if (m_activeCount > 0) - m_activeCount--; + if (m_activeCount > 0) { + --m_activeCount; + } data.active = false; if (data.state == t_EngineData::waitprimary && data.pEngine) { const std::vector *pStates = CContextManager::Get()->GetAllStates(); for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) { CState* pState = *iter; - if (pState->m_pEngine != data.pEngine) + if (pState->m_pEngine != data.pEngine) { continue; + } CCommandQueue* pCommandQueue = pState->m_pCommandQueue; - if (pCommandQueue) + if (pCommandQueue) { pCommandQueue->RequestExclusiveEngine(false); + } break; } } @@ -1259,21 +1123,22 @@ { // RemoveItem assumes that the item has already been removed from all engines - if (item->GetType() == QueueItemType::File) - { + if (item->GetType() == QueueItemType::File) { // Update size information const CFileItem* const pFileItem = (const CFileItem* const)item; int64_t size = pFileItem->GetSize(); if (size < 0) { - m_filesWithUnknownSize--; + --m_filesWithUnknownSize; wxASSERT(m_filesWithUnknownSize >= 0); - if (!m_filesWithUnknownSize && updateItemCount) + if (!m_filesWithUnknownSize && updateItemCount) { DisplayQueueSize(); + } } else if (size > 0) { m_totalQueueSize -= size; - if (updateItemCount) + if (updateItemCount) { DisplayQueueSize(); + } wxASSERT(m_totalQueueSize >= 0); } } @@ -1289,24 +1154,25 @@ { for (;;) { if (engineData.state == t_EngineData::waitprimary) { - engineData.pItem->SetStatusMessage(CFileItem::wait_browsing); + engineData.pItem->SetStatusMessage(CFileItem::Status::wait_browsing); wxASSERT(engineData.pEngine); if (!engineData.pEngine) { - ResetEngine(engineData, retry); + ResetEngine(engineData, ResetReason::retry); return; } CState* pState = 0; const std::vector *pStates = CContextManager::Get()->GetAllStates(); for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) { - if ((*iter)->m_pEngine != engineData.pEngine) + if ((*iter)->m_pEngine != engineData.pEngine) { continue; + } pState = *iter; break; } if (!pState) { - ResetEngine(engineData, retry); + ResetEngine(engineData, ResetReason::retry); return; } @@ -1316,35 +1182,39 @@ } if (engineData.state == t_EngineData::disconnect) { - engineData.pItem->SetStatusMessage(CFileItem::disconnecting); + engineData.pItem->SetStatusMessage(CFileItem::Status::disconnecting); RefreshItem(engineData.pItem); - if (engineData.pEngine->Execute(CDisconnectCommand()) == FZ_REPLY_WOULDBLOCK) + if (engineData.pEngine->Execute(CDisconnectCommand()) == FZ_REPLY_WOULDBLOCK) { return; + } - if (engineData.lastServer.GetLogonType() == ASK && !CLoginManager::Get().GetPassword(engineData.lastServer, true)) + if (!CLoginManager::Get().GetPassword(engineData.lastServer, true)) { engineData.state = t_EngineData::askpassword; - else + } + else { engineData.state = t_EngineData::connect; + } - if (engineData.active && engineData.pStatusLineCtrl) + if (engineData.active && engineData.pStatusLineCtrl) { engineData.pStatusLineCtrl->ClearTransferStatus(); + } } if (engineData.state == t_EngineData::askpassword) { - engineData.pItem->SetStatusMessage(CFileItem::wait_password); + engineData.pItem->SetStatusMessage(CFileItem::Status::wait_password); RefreshItem(engineData.pItem); if (m_waitingForPassword.empty()) { - QueueEvent(new wxCommandEvent(fzEVT_ASKFORPASSWORD)); + CallAfter(&CQueueView::OnAskPassword); } m_waitingForPassword.push_back(engineData.pEngine); return; } if (engineData.state == t_EngineData::connect) { - engineData.pItem->SetStatusMessage(CFileItem::connecting); + engineData.pItem->SetStatusMessage(CFileItem::Status::connecting); RefreshItem(engineData.pItem); - int res = engineData.pEngine->Execute(CConnectCommand(engineData.lastServer, false)); + int res = engineData.pEngine->Execute(CConnectCommand(engineData.lastServer.server, engineData.lastServer.credentials, false)); wxASSERT((res & FZ_REPLY_BUSY) != FZ_REPLY_BUSY); if (res == FZ_REPLY_WOULDBLOCK) @@ -1358,23 +1228,26 @@ if (res == FZ_REPLY_OK) { if (engineData.pItem->GetType() == QueueItemType::File) { engineData.state = t_EngineData::transfer; - if (engineData.active && engineData.pStatusLineCtrl) + if (engineData.active && engineData.pStatusLineCtrl) { engineData.pStatusLineCtrl->ClearTransferStatus(); + } } - else + else { engineData.state = t_EngineData::mkdir; + } break; } - if (!IncreaseErrorCount(engineData)) + if (!IncreaseErrorCount(engineData)) { return; + } continue; } if (engineData.state == t_EngineData::transfer) { CFileItem* fileItem = engineData.pItem; - fileItem->SetStatusMessage(CFileItem::transferring); + fileItem->SetStatusMessage(CFileItem::Status::transferring); RefreshItem(engineData.pItem); CFileTransferCommand::t_transferSettings transferSettings; @@ -1382,12 +1255,13 @@ int res = engineData.pEngine->Execute(CFileTransferCommand(fileItem->GetLocalPath().GetPath() + fileItem->GetLocalFile(), fileItem->GetRemotePath(), fileItem->GetRemoteFile(), fileItem->Download(), transferSettings)); wxASSERT((res & FZ_REPLY_BUSY) != FZ_REPLY_BUSY); - if (res == FZ_REPLY_WOULDBLOCK) + if (res == FZ_REPLY_WOULDBLOCK) { return; + } if (res == FZ_REPLY_NOTCONNECTED) { if (engineData.transient) { - ResetEngine(engineData, retry); + ResetEngine(engineData, ResetReason::retry); return; } @@ -1396,30 +1270,32 @@ } if (res == FZ_REPLY_OK) { - ResetEngine(engineData, success); + ResetEngine(engineData, ResetReason::success); return; } - if (!IncreaseErrorCount(engineData)) + if (!IncreaseErrorCount(engineData)) { return; + } continue; } if (engineData.state == t_EngineData::mkdir) { CFileItem* fileItem = engineData.pItem; - fileItem->SetStatusMessage(CFileItem::creating_dir); + fileItem->SetStatusMessage(CFileItem::Status::creating_dir); RefreshItem(engineData.pItem); int res = engineData.pEngine->Execute(CMkdirCommand(fileItem->GetRemotePath())); wxASSERT((res & FZ_REPLY_BUSY) != FZ_REPLY_BUSY); - if (res == FZ_REPLY_WOULDBLOCK) + if (res == FZ_REPLY_WOULDBLOCK) { return; + } if (res == FZ_REPLY_NOTCONNECTED) { if (engineData.transient) { - ResetEngine(engineData, retry); + ResetEngine(engineData, ResetReason::retry); return; } @@ -1428,36 +1304,42 @@ } if (res == FZ_REPLY_OK) { - ResetEngine(engineData, success); + ResetEngine(engineData, ResetReason::success); return; } // Pointless to retry - ResetEngine(engineData, failure); + ResetEngine(engineData, ResetReason::failure); return; } } } -bool CQueueView::SetActive(bool active /*=true*/) +bool CQueueView::SetActive(bool active) { if (!active) { m_activeMode = 0; - for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) - (*iter)->QueueImmediateFiles(); + for (auto const& serverItem : m_serverList) { + serverItem->QueueImmediateFiles(); + } const std::vector *pStates = CContextManager::Get()->GetAllStates(); for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) { CState* pState = *iter; - CRecursiveOperation* pRecursiveOperation = pState->GetRecursiveOperationHandler(); - if (!pRecursiveOperation) - continue; + CLocalRecursiveOperation* pLocalRecursiveOperation = pState->GetLocalRecursiveOperation(); + if (pLocalRecursiveOperation) { + pLocalRecursiveOperation->SetImmediate(false); + } + CRemoteRecursiveOperation* pRemoteRecursiveOperation = pState->GetRemoteRecursiveOperation(); + if (pRemoteRecursiveOperation) { + pRemoteRecursiveOperation->SetImmediate(false); + } + } - if (pRecursiveOperation->GetOperationMode() == CRecursiveOperation::recursive_download) - pRecursiveOperation->ChangeOperationMode(CRecursiveOperation::recursive_addtoqueue); - if (pRecursiveOperation->GetOperationMode() == CRecursiveOperation::recursive_download_flatten) - pRecursiveOperation->ChangeOperationMode(CRecursiveOperation::recursive_addtoqueue_flatten); + auto blocker = m_actionAfterBlocker.lock(); + if (blocker) { + blocker->trigger_ = false; } UpdateStatusLinePositions(); @@ -1465,18 +1347,21 @@ // Send active engines the cancel command for (unsigned int engineIndex = 0; engineIndex < m_engineData.size(); ++engineIndex) { t_EngineData* const pEngineData = m_engineData[engineIndex]; - if (!pEngineData->active) + if (!pEngineData->active) { continue; + } if (pEngineData->state == t_EngineData::waitprimary) { - if (pEngineData->pItem) - pEngineData->pItem->SetStatusMessage(CFileItem::interrupted); - ResetEngine(*pEngineData, reset); + if (pEngineData->pItem) { + pEngineData->pItem->SetStatusMessage(CFileItem::Status::interrupted); + } + ResetEngine(*pEngineData, ResetReason::reset); } else { wxASSERT(pEngineData->pEngine); - if (!pEngineData->pEngine) + if (!pEngineData->pEngine) { continue; + } pEngineData->pEngine->Cancel(); } } @@ -1486,12 +1371,14 @@ return m_activeCount == 0; } else { - m_activeMode = 2; + if (!m_serverList.empty()) { + m_activeMode = 2; - m_waitStatusLineUpdate = true; - AdvanceQueue(); - m_waitStatusLineUpdate = false; - UpdateStatusLinePositions(); + m_waitStatusLineUpdate = true; + AdvanceQueue(); + m_waitStatusLineUpdate = false; + UpdateStatusLinePositions(); + } } CContextManager::Get()->NotifyGlobalHandlers(STATECHANGE_QUEUEPROCESSING); @@ -1501,8 +1388,9 @@ bool CQueueView::Quit() { - if (!m_quit) + if (!m_quit) { m_quit = 1; + } #if defined(__WXMSW__) || defined(__WXMAC__) if (m_actionAfterWarnDialog) { @@ -1514,22 +1402,13 @@ #endif bool canQuit = true; - if (!SetActive(false)) + if (!SetActive(false)) { canQuit = false; - - for (unsigned int i = 0; i < 2; ++i) { - if (!m_queuedFolders[i].empty()) { - canQuit = false; - for (auto & dir : m_queuedFolders[i]) { - dir->m_remove = true; - } - } } - if (m_pFolderProcessingThread) - canQuit = false; - if (!canQuit) + if (!canQuit) { return false; + } DeleteEngines(); @@ -1582,47 +1461,56 @@ CContextManager::Get()->NotifyGlobalHandlers(STATECHANGE_QUEUEPROCESSING); - if (!m_quit) - ActionAfter(); + ActionAfter(); } - if (m_quit) + if (m_quit) { m_pMainFrame->Close(); + } } bool CQueueView::IncreaseErrorCount(t_EngineData& engineData) { ++engineData.pItem->m_errorCount; - if (engineData.pItem->m_errorCount <= COptions::Get()->GetOptionVal(OPTION_RECONNECTCOUNT)) + if (engineData.pItem->m_errorCount <= COptions::Get()->GetOptionVal(OPTION_RECONNECTCOUNT)) { return true; + } - ResetEngine(engineData, failure); + ResetEngine(engineData, ResetReason::failure); return false; } void CQueueView::UpdateStatusLinePositions() { - if (m_waitStatusLineUpdate) + if (m_waitStatusLineUpdate) { return; + } m_lastTopItem = GetTopItem(); int bottomItem = m_lastTopItem + GetCountPerPage(); - for (auto iter = m_statusLineList.begin(); iter != m_statusLineList.end(); ++iter) { - CStatusLineCtrl *pCtrl = *iter; - int index = GetItemIndex(pCtrl->GetItem()) + 1; + wxRect lineRect = GetClientRect(); + lineRect.SetHeight(GetLineHeight()); +#ifdef __WXMSW__ + lineRect.y += m_header_height; +#endif + + for (auto pCtrl : m_statusLineList) { + CFileItem const* pItem = pCtrl->GetItem(); + if (!pItem) { + pCtrl->Show(false); + continue; + } + + int index = GetItemIndex(pItem) + 1; if (index < m_lastTopItem || index > bottomItem) { pCtrl->Show(false); continue; } - wxRect rect = GetClientRect(); - rect.y = GetLineHeight() * (index - m_lastTopItem); -#ifdef __WXMSW__ - rect.y += m_header_height; -#endif - rect.SetHeight(GetLineHeight()); + wxRect rect = lineRect; + rect.y += GetLineHeight() * (index - m_lastTopItem); m_allowBackgroundErase = bottomItem + 1 >= m_itemCount; pCtrl->SetSize(rect); @@ -1637,11 +1525,11 @@ // Collect total queue size m_totalQueueSize = 0; m_fileCount = 0; - m_folderScanCount = 0; m_filesWithUnknownSize = 0; - for (std::vector::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) - m_totalQueueSize += (*iter)->GetTotalSize(m_filesWithUnknownSize, m_fileCount, m_folderScanCount); + for (auto const& serverItem : m_serverList) { + m_totalQueueSize += serverItem->GetTotalSize(m_filesWithUnknownSize, m_fileCount); + } DisplayQueueSize(); DisplayNumberQueuedFiles(); @@ -1650,165 +1538,24 @@ void CQueueView::DisplayQueueSize() { CStatusBar* pStatusBar = dynamic_cast(m_pMainFrame->GetStatusBar()); - if (!pStatusBar) - return; - pStatusBar->DisplayQueueSize(m_totalQueueSize, m_filesWithUnknownSize != 0); -} - -bool CQueueView::QueueFolder(bool queueOnly, bool download, const CLocalPath& localPath, const CServerPath& remotePath, const CServer& server) -{ - CServerItem* pServerItem = CreateServerItem(server); - - CFolderScanItem* folderItem = new CFolderScanItem(pServerItem, queueOnly, download, localPath, remotePath); - InsertItem(pServerItem, folderItem); - - folderItem->m_statusMessage = _("Waiting"); - - CommitChanges(); - - m_queuedFolders[download ? 0 : 1].push_back(folderItem); - ProcessFolderItems(); - - RefreshListOnly(false); - - return true; -} - -bool CQueueView::ProcessFolderItems(int type /*=-1*/) -{ - if (type == -1) { - while (ProcessFolderItems(0)); - ProcessUploadFolderItems(); - - return true; - } - - return false; -} - -void CQueueView::ProcessUploadFolderItems() -{ - if (m_queuedFolders[1].empty()) { - if (m_quit) - m_pMainFrame->Close(); - - return; - } - - if (m_pFolderProcessingThread) - return; - - CFolderScanItem* pItem = m_queuedFolders[1].front(); - - if (pItem->queued()) - pItem->m_statusMessage = _("Scanning for files to add to queue"); - else - pItem->m_statusMessage = _("Scanning for files to upload"); - RefreshItem(pItem); - pItem->m_active = true; - m_pFolderProcessingThread = new CFolderProcessingThread(this, pItem); - m_pFolderProcessingThread->run(); - - RefreshListOnly(false); -} - -void CQueueView::OnFolderThreadComplete(wxCommandEvent&) -{ - if (!m_pFolderProcessingThread) + if (!pStatusBar) { return; - - m_folderscan_item_refresh_timer.Stop(); - - wxASSERT(!m_queuedFolders[1].empty()); - CFolderScanItem* pItem = m_queuedFolders[1].front(); - if (pItem->m_dir_is_empty) { - CServerItem* pServerItem = (CServerItem*)pItem->GetTopLevelItem(); - CFileItem* fileItem = new CFolderItem(pServerItem, pItem->queued(), pItem->m_current_remote_path, _T("")); - InsertItem(pServerItem, fileItem); - QueueFile_Finish(!pItem->queued()); } - m_queuedFolders[1].pop_front(); - - RemoveItem(pItem, true); - - delete m_pFolderProcessingThread; - m_pFolderProcessingThread = 0; - - ProcessUploadFolderItems(); -} - -int CQueueView::QueueFiles(const std::list &entryList, bool queueOnly, bool download, CServerItem* pServerItem, const enum CFileExistsNotification::OverwriteAction defaultFileExistsAction) -{ - wxASSERT(pServerItem); - - CFolderScanItem* pFolderScanItem = m_pFolderProcessingThread->GetFolderScanItem(); - - int added = 0; - - CFilterManager filters; - for (std::list::const_iterator iter = entryList.begin(); iter != entryList.end(); ++iter) { - if ((*iter)->m_type == CFolderProcessingEntry::dir) { - if (m_pFolderProcessingThread->GetFolderScanItem()->m_dir_is_empty) { - CFileItem* fileItem = new CFolderItem(pServerItem, queueOnly, pFolderScanItem->m_current_remote_path, _T("")); - InsertItem(pServerItem, fileItem); - added++; - } - - const CFolderProcessingThread::t_dirPair* entry = (const CFolderProcessingThread::t_dirPair*)*iter; - pFolderScanItem->m_current_local_path = entry->localPath; - pFolderScanItem->m_current_remote_path = entry->remotePath; - pFolderScanItem->m_dir_is_empty = true; - delete entry; - } - else { - const t_newEntry* entry = (const t_newEntry*)*iter; - if (filters.FilenameFiltered(entry->name, pFolderScanItem->m_current_local_path.GetPath(), entry->dir, entry->size, true, entry->attributes, entry->time)) { - delete entry; - continue; - } - - pFolderScanItem->m_dir_is_empty = false; - - if (entry->dir) { - m_pFolderProcessingThread->ProcessDirectory(pFolderScanItem->m_current_local_path, pFolderScanItem->m_current_remote_path, entry->name); - delete entry; - continue; - } - - CFileItem* fileItem = new CFileItem(pServerItem, queueOnly, download, entry->name, wxEmptyString, pFolderScanItem->m_current_local_path, pFolderScanItem->m_current_remote_path, entry->size); - - if (download) - fileItem->SetAscii(CAutoAsciiFiles::TransferRemoteAsAscii(entry->name, pFolderScanItem->m_current_remote_path.GetType())); - else - fileItem->SetAscii(CAutoAsciiFiles::TransferLocalAsAscii(entry->name, pFolderScanItem->m_current_remote_path.GetType())); - - fileItem->m_defaultFileExistsAction = defaultFileExistsAction; - - delete entry; - - InsertItem(pServerItem, fileItem); - - added++; - } - } - - QueueFile_Finish(!queueOnly); - - return added; + pStatusBar->DisplayQueueSize(m_totalQueueSize, m_filesWithUnknownSize != 0); } -void CQueueView::SaveQueue() +void CQueueView::SaveQueue(bool silent) { // Kiosk mode 2 doesn't save queue - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { return; + } // While not really needed anymore using sqlite3, we still take the mutex // just as extra precaution. Better 'save' than sorry. CInterProcessMutex mutex(MUTEX_QUEUE); - if (!m_queue_storage.SaveQueue(m_serverList)) - { + if (!m_queue_storage.SaveQueue(m_serverList) && !silent) { wxString msg = wxString::Format(_("An error occurred saving the transfer queue to \"%s\".\nSome queue items might not have been saved."), m_queue_storage.GetDatabaseFilename()); wxMessageBoxEx(msg, _("Error saving queue"), wxICON_ERROR); } @@ -1827,15 +1574,17 @@ } auto queue = document.child("Queue"); - if (!queue) + if (!queue) { return; + } ImportQueue(queue, false); document.remove_child(queue); - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { return; + } if (!xml.Save(false)) { wxString msg = wxString::Format(_("Could not write \"%s\", the queue could not be saved.\n%s"), xml.GetFileName(), xml.GetError()); @@ -1845,6 +1594,7 @@ void CQueueView::LoadQueue() { + wxGetApp().AddStartupProfileRecord("CQueueView::LoadQueue"); // We have to synchronize access to queue.xml so that multiple processed don't write // to the same file or one is reading while the other one writes. CInterProcessMutex mutex(MUTEX_QUEUE); @@ -1853,12 +1603,14 @@ bool error = false; - if (!m_queue_storage.BeginTransaction()) + if (!m_queue_storage.BeginTransaction()) { error = true; + } else { - CServer server; - int64_t id; - for (id = m_queue_storage.GetServer(server, true); id > 0; id = m_queue_storage.GetServer(server, false)) { + ServerWithCredentials server; + int64_t const first_id = m_queue_storage.GetServer(server, true); + auto id = first_id; + for (; id > 0; id = m_queue_storage.GetServer(server, false)) { m_insertionStart = -1; m_insertionCount = 0; CServerItem *pServerItem = CreateServerItem(server); @@ -1870,8 +1622,9 @@ fileItem->SetPriority(fileItem->GetPriority()); InsertItem(pServerItem, fileItem); } - if (fileId < 0) + if (fileId < 0) { error = true; + } if (!pServerItem->GetChild(0)) { m_itemCount--; @@ -1879,24 +1632,36 @@ delete pServerItem; } } - if (id < 0) + if (id < 0) { error = true; + } - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 2) - if (!m_queue_storage.Clear()) - error = true; + if (error || first_id > 0) { + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 2) { + if (!m_queue_storage.Clear()) { + error = true; + } + } - if (!m_queue_storage.EndTransaction()) - error = true; + if (!m_queue_storage.EndTransaction()) { + error = true; + } - if (!m_queue_storage.Vacuum()) - error = true; + if (!m_queue_storage.Vacuum()) { + error = true; + } + } + else { + // Queue was already empty. No need to commit + if (!m_queue_storage.EndTransaction(true)) { + error = true; + } + } } m_insertionStart = -1; m_insertionCount = 0; CommitChanges(); - if (error) { wxString file = CQueueStorage::GetDatabaseFilename(); wxString msg = wxString::Format(_("An error occurred loading the transfer queue from \"%s\".\nSome queue items might not have been restored."), file); @@ -1908,7 +1673,7 @@ { auto xServer = element.child("Server"); while (xServer) { - CServer server; + ServerWithCredentials server; if (GetServer(xServer, server)) { m_insertionStart = -1; m_insertionCount = 0; @@ -1918,17 +1683,18 @@ CServerPath previousRemotePath; for (auto file = xServer.child("File"); file; file = file.next_sibling("File")) { - wxString localFile = GetTextElement(file, "LocalFile"); - wxString remoteFile = GetTextElement(file, "RemoteFile"); - wxString safeRemotePath = GetTextElement(file, "RemotePath"); + std::wstring localFile = GetTextElement(file, "LocalFile"); + std::wstring remoteFile = GetTextElement(file, "RemoteFile"); + std::wstring safeRemotePath = GetTextElement(file, "RemotePath"); bool download = GetTextElementInt(file, "Download") != 0; int64_t size = GetTextElementInt(file, "Size", -1); unsigned char errorCount = static_cast(GetTextElementInt(file, "ErrorCount")); unsigned int priority = GetTextElementInt(file, "Priority", static_cast(QueuePriority::normal)); int dataType = GetTextElementInt(file, "DataType", -1); - if (dataType == -1) + if (dataType == -1) { dataType = GetTextElementInt(file, "TransferMode", 1); + } bool binary = dataType != 0; int overwrite_action = GetTextElementInt(file, "OverwriteAction", CFileExistsNotification::unknown); @@ -1936,30 +1702,34 @@ if (!localFile.empty() && !remoteFile.empty() && remotePath.SetSafePath(safeRemotePath) && size >= -1 && priority < static_cast(QueuePriority::count)) { - wxString localFileName; + std::wstring localFileName; CLocalPath localPath(localFile, &localFileName); - if (localFileName.empty()) + if (localFileName.empty()) { continue; + } // CServerPath and wxString are reference counted. // Save some memory here by re-using the old copy - if (localPath != previousLocalPath) + if (localPath != previousLocalPath) { previousLocalPath = localPath; - if (previousRemotePath != remotePath) + } + if (previousRemotePath != remotePath) { previousRemotePath = remotePath; + } CFileItem* fileItem = new CFileItem(pServerItem, true, download, download ? remoteFile : localFileName, - (remoteFile != localFileName) ? (download ? localFileName : remoteFile) : wxString(), + (remoteFile != localFileName) ? (download ? localFileName : remoteFile) : std::wstring(), previousLocalPath, previousRemotePath, size); fileItem->SetAscii(!binary); fileItem->SetPriorityRaw(QueuePriority(priority)); fileItem->m_errorCount = errorCount; InsertItem(pServerItem, fileItem); - if (overwrite_action > 0 && overwrite_action < CFileExistsNotification::ACTION_COUNT) + if (overwrite_action > 0 && overwrite_action < CFileExistsNotification::ACTION_COUNT) { fileItem->m_defaultFileExistsAction = (CFileExistsNotification::OverwriteAction)overwrite_action; + } } } for (auto folder = xServer.child("Folder"); folder; folder = folder.next_sibling("Folder")) { @@ -1967,21 +1737,23 @@ bool download = GetTextElementInt(folder, "Download") != 0; if (download) { - wxString localFile = GetTextElement(folder, "LocalFile"); - if (localFile.empty()) + std::wstring localFile = GetTextElement(folder, "LocalFile"); + if (localFile.empty()) { continue; + } folderItem = new CFolderItem(pServerItem, true, CLocalPath(localFile)); } - else - { - wxString remoteFile = GetTextElement(folder, "RemoteFile"); - wxString safeRemotePath = GetTextElement(folder, "RemotePath"); - if (safeRemotePath.empty()) + else { + std::wstring remoteFile = GetTextElement(folder, "RemoteFile"); + std::wstring safeRemotePath = GetTextElement(folder, "RemotePath"); + if (safeRemotePath.empty()) { continue; + } CServerPath remotePath; - if (!remotePath.SetSafePath(safeRemotePath)) + if (!remotePath.SetSafePath(safeRemotePath)) { continue; + } folderItem = new CFolderItem(pServerItem, true, remotePath, remoteFile); } @@ -2000,8 +1772,9 @@ m_serverList.pop_back(); delete pServerItem; } - else if (updateSelections) + else if (updateSelections) { CommitChanges(); + } } xServer = xServer.next_sibling("Server"); @@ -2012,35 +1785,39 @@ m_insertionCount = 0; CommitChanges(); } - else + else { RefreshListOnly(); + } } void CQueueView::OnPostScroll() { - if (GetTopItem() != m_lastTopItem) + if (GetTopItem() != m_lastTopItem) { UpdateStatusLinePositions(); + } } void CQueueView::OnContextMenu(wxContextMenuEvent&) { wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_QUEUE")); - if (!pMenu) + if (!pMenu) { return; + } bool has_selection = HasSelection(); pMenu->Check(XRCID("ID_PROCESSQUEUE"), IsActive() ? true : false); - pMenu->Check(XRCID("ID_ACTIONAFTER_DISABLE"), IsActionAfter(ActionAfterState_Disabled)); - pMenu->Check(XRCID("ID_ACTIONAFTER_CLOSE"), IsActionAfter(ActionAfterState_Close)); - pMenu->Check(XRCID("ID_ACTIONAFTER_DISCONNECT"), IsActionAfter(ActionAfterState_Disconnect)); - pMenu->Check(XRCID("ID_ACTIONAFTER_RUNCOMMAND"), IsActionAfter(ActionAfterState_RunCommand)); - pMenu->Check(XRCID("ID_ACTIONAFTER_SHOWMESSAGE"), IsActionAfter(ActionAfterState_ShowMessage)); - pMenu->Check(XRCID("ID_ACTIONAFTER_PLAYSOUND"), IsActionAfter(ActionAfterState_PlaySound)); + pMenu->Check(XRCID("ID_ACTIONAFTER_NONE"), IsActionAfter(ActionAfterState::None)); + pMenu->Check(XRCID("ID_ACTIONAFTER_SHOW_NOTIFICATION_BUBBLE"), IsActionAfter(ActionAfterState::ShowNotification)); + pMenu->Check(XRCID("ID_ACTIONAFTER_REQUEST_ATTENTION"), IsActionAfter(ActionAfterState::RequestAttention)); + pMenu->Check(XRCID("ID_ACTIONAFTER_CLOSE"), IsActionAfter(ActionAfterState::Close)); + pMenu->Check(XRCID("ID_ACTIONAFTER_CLOSE_ONCE"), IsActionAfter(ActionAfterState::CloseOnce)); + pMenu->Check(XRCID("ID_ACTIONAFTER_RUNCOMMAND"), IsActionAfter(ActionAfterState::RunCommand)); + pMenu->Check(XRCID("ID_ACTIONAFTER_PLAYSOUND"), IsActionAfter(ActionAfterState::PlaySound)); #if defined(__WXMSW__) || defined(__WXMAC__) - pMenu->Check(XRCID("ID_ACTIONAFTER_REBOOT"), IsActionAfter(ActionAfterState_Reboot)); - pMenu->Check(XRCID("ID_ACTIONAFTER_SHUTDOWN"), IsActionAfter(ActionAfterState_Shutdown)); - pMenu->Check(XRCID("ID_ACTIONAFTER_SLEEP"), IsActionAfter(ActionAfterState_Sleep)); + pMenu->Check(XRCID("ID_ACTIONAFTER_REBOOT"), IsActionAfter(ActionAfterState::Reboot)); + pMenu->Check(XRCID("ID_ACTIONAFTER_SHUTDOWN"), IsActionAfter(ActionAfterState::Shutdown)); + pMenu->Check(XRCID("ID_ACTIONAFTER_SLEEP"), IsActionAfter(ActionAfterState::Sleep)); #endif pMenu->Enable(XRCID("ID_REMOVE"), has_selection); @@ -2067,66 +1844,63 @@ void CQueueView::OnActionAfter(wxCommandEvent& event) { - if (!event.IsChecked() || event.GetId() == XRCID("ID_ACTIONAFTER_DISABLE")) - { // Goes from checked to non-checked or disable is pressed - m_actionAfterState = ActionAfterState_Disabled; - m_actionAfterRunCommand = _T(""); - -#if defined(__WXMSW__) || defined(__WXMAC__) - if (m_actionAfterWarnDialog) - { - m_actionAfterWarnDialog->Destroy(); - m_actionAfterWarnDialog = 0; - } - delete m_actionAfterTimer; - m_actionAfterTimer = 0; -#endif - } - else if (event.GetId() == XRCID("ID_ACTIONAFTER_DISABLE")) - m_actionAfterState = ActionAfterState_Disabled; - - else if (event.GetId() == XRCID("ID_ACTIONAFTER_CLOSE")) - m_actionAfterState = ActionAfterState_Close; - - else if (event.GetId() == XRCID("ID_ACTIONAFTER_DISCONNECT")) - m_actionAfterState = ActionAfterState_Disconnect; - - else if (event.GetId() == XRCID("ID_ACTIONAFTER_SHOWMESSAGE")) - m_actionAfterState = ActionAfterState_ShowMessage; - - else if (event.GetId() == XRCID("ID_ACTIONAFTER_PLAYSOUND")) - m_actionAfterState = ActionAfterState_PlaySound; - - else if (event.GetId() == XRCID("ID_ACTIONAFTER_RUNCOMMAND")) - { - m_actionAfterState = ActionAfterState_RunCommand; - wxTextEntryDialog dlg(m_pMainFrame, _("Please enter a path and executable to run.\nE.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\nYou can also optionally specify program arguments."), _("Enter command")); + if (event.GetId() == XRCID("ID_ACTIONAFTER_NONE")) { + m_actionAfterState = ActionAfterState::None; - if (dlg.ShowModal() != wxID_OK) - { - m_actionAfterState = ActionAfterState_Disabled; - return; +#if defined(__WXMSW__) || defined(__WXMAC__) + if (m_actionAfterWarnDialog) { + m_actionAfterWarnDialog->Destroy(); + m_actionAfterWarnDialog = 0; } - const wxString &command = dlg.GetValue(); + delete m_actionAfterTimer; + m_actionAfterTimer = 0; +#endif + } + else if (event.GetId() == XRCID("ID_ACTIONAFTER_NONE")) { + m_actionAfterState = ActionAfterState::None; + } + else if (event.GetId() == XRCID("ID_ACTIONAFTER_SHOW_NOTIFICATION_BUBBLE")) { + m_actionAfterState = ActionAfterState::ShowNotification; + } + else if (event.GetId() == XRCID("ID_ACTIONAFTER_REQUEST_ATTENTION")) { + m_actionAfterState = ActionAfterState::RequestAttention; + } + else if (event.GetId() == XRCID("ID_ACTIONAFTER_CLOSE")) { + m_actionAfterState = ActionAfterState::Close; + } + else if (event.GetId() == XRCID("ID_ACTIONAFTER_CLOSE_ONCE")) { + m_actionAfterState = ActionAfterState::CloseOnce; + } + else if (event.GetId() == XRCID("ID_ACTIONAFTER_PLAYSOUND")) { + m_actionAfterState = ActionAfterState::PlaySound; + } + else if (event.GetId() == XRCID("ID_ACTIONAFTER_RUNCOMMAND")) { + wxTextEntryDialog dlg(m_pMainFrame, _("Please enter the complete path of a program and its arguments. This command will be executed when the queue has finished processing.\nE.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\nYou need to properly quote commands and their arguments if they contain spaces."), _("Enter command")); + dlg.SetValue(COptions::Get()->GetOption(OPTION_QUEUE_COMPLETION_COMMAND)); - if (command.empty()) - { - wxMessageBoxEx(_("No command given, aborting."), _("Empty command"), wxICON_ERROR, m_pMainFrame); - m_actionAfterState = ActionAfterState_Disabled; - return; + if (dlg.ShowModal() == wxID_OK) { + const wxString &command = dlg.GetValue(); + if (command.empty()) { + wxMessageBoxEx(_("No command given, aborting."), _("Empty command"), wxICON_ERROR, m_pMainFrame); + } + else { + m_actionAfterState = ActionAfterState::RunCommand; + COptions::Get()->SetOption(OPTION_QUEUE_COMPLETION_COMMAND, command.ToStdWstring()); + } } - m_actionAfterRunCommand = command; } - #if defined(__WXMSW__) || defined(__WXMAC__) else if (event.GetId() == XRCID("ID_ACTIONAFTER_REBOOT")) - m_actionAfterState = ActionAfterState_Reboot; + m_actionAfterState = ActionAfterState::Reboot; else if (event.GetId() == XRCID("ID_ACTIONAFTER_SHUTDOWN")) - m_actionAfterState = ActionAfterState_Shutdown; + m_actionAfterState = ActionAfterState::Shutdown; else if (event.GetId() == XRCID("ID_ACTIONAFTER_SLEEP")) - m_actionAfterState = ActionAfterState_Sleep; + m_actionAfterState = ActionAfterState::Sleep; #endif + if (m_actionAfterState != ActionAfterState::Reboot && m_actionAfterState != ActionAfterState::Shutdown && m_actionAfterState != ActionAfterState::Sleep && m_actionAfterState != ActionAfterState::CloseOnce) { + COptions::Get()->SetOption(OPTION_QUEUE_COMPLETION_ACTION, m_actionAfterState); + } } void CQueueView::RemoveAll() @@ -2141,35 +1915,28 @@ #endif { int item; - while ((item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) + while ((item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { SetItemState(item, 0, wxLIST_STATE_SELECTED); + } } std::vector newServerList; m_itemCount = 0; - for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) - { - if ((*iter)->TryRemoveAll()) + for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) { + if ((*iter)->TryRemoveAll()) { delete *iter; - else - { + } + else { newServerList.push_back(*iter); m_itemCount += 1 + (*iter)->GetChildrenCount(true); } } - // Clear list of queued directories that aren't busy - for (unsigned int i = 0; i < 2; i++) - { - auto begin = m_queuedFolders[i].begin(); - auto end = m_queuedFolders[i].end(); - if (begin != end && (*begin)->m_active) - ++begin; - m_queuedFolders[i].erase(begin, end); - } - SaveSetItemCount(m_itemCount); - m_actionAfterState = ActionAfterState_Disabled; + + if (newServerList.empty() && (m_actionAfterState == ActionAfterState::Reboot || m_actionAfterState == ActionAfterState::Shutdown || m_actionAfterState == ActionAfterState::Sleep)) { + m_actionAfterState = ActionAfterState::None; + } m_serverList = newServerList; UpdateStatusLinePositions(); @@ -2180,27 +1947,13 @@ RefreshListOnly(); } -void CQueueView::RemoveQueuedFolderItem(CFolderScanItem* pFolder) -{ - for (unsigned int i = 0; i < 2; i++) - { - for (auto iter = m_queuedFolders[i].begin(); iter != m_queuedFolders[i].end(); ++iter) - { - if (*iter != pFolder) - continue; - - m_queuedFolders[i].erase(iter); - return; - } - } -} - void CQueueView::OnRemoveSelected(wxCommandEvent&) { #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) - if (!GetSelectedItemCount()) + if (!GetSelectedItemCount()) { return; + } #endif std::list> selectedItems; @@ -2208,8 +1961,9 @@ long skipTo = -1; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item == -1) { break; + } SetItemState(item, 0, wxLIST_STATE_SELECTED); if (item <= skipTo) { @@ -2236,16 +1990,8 @@ CQueueItem* pItem = selectedItem.second; selectedItems.pop_front(); - if (pItem->GetType() == QueueItemType::Status) + if (pItem->GetType() == QueueItemType::Status) { continue; - else if (pItem->GetType() == QueueItemType::FolderScan) { - CFolderScanItem* pFolder = (CFolderScanItem*)pItem; - if (pFolder->m_active) { - pFolder->m_remove = true; - continue; - } - else - RemoveQueuedFolderItem(pFolder); } else if (pItem->GetType() == QueueItemType::Server) { CServerItem* pServer = (CServerItem*)pItem; @@ -2269,8 +2015,9 @@ if (!pTopLevelItem->GetChild(1)) { // Parent will get deleted // If next selected item is parent, remove it from list - if (!selectedItems.empty() && selectedItems.front().second == pTopLevelItem) + if (!selectedItems.empty() && selectedItems.front().second == pTopLevelItem) { selectedItems.pop_front(); + } } int topItemIndex = GetItemIndex(pTopLevelItem); @@ -2292,25 +2039,27 @@ bool CQueueView::StopItem(CFileItem* item) { - if (!item->IsActive()) + if (!item->IsActive()) { return true; + } ((CServerItem*)item->GetTopLevelItem())->QueueImmediateFile(item); - if (item->m_pEngineData->state == t_EngineData::waitprimary) - { - enum ResetReason reason; - if (item->m_pEngineData->pItem && item->m_pEngineData->pItem->pending_remove()) - reason = remove; - else - reason = reset; - if (item->m_pEngineData->pItem) - item->m_pEngineData->pItem->SetStatusMessage(CFileItem::none); + if (item->m_pEngineData->state == t_EngineData::waitprimary) { + ResetReason reason; + if (item->m_pEngineData->pItem && item->m_pEngineData->pItem->pending_remove()) { + reason = ResetReason::remove; + } + else { + reason = ResetReason::reset; + } + if (item->m_pEngineData->pItem) { + item->m_pEngineData->pItem->SetStatusMessage(CFileItem::Status::none); + } ResetEngine(*item->m_pEngineData, reason); return true; } - else - { + else { item->m_pEngineData->pEngine->Cancel(); return false; } @@ -2323,15 +2072,8 @@ for (int i = static_cast(items.size()) - 1; i >= removedAtFront; --i) { CQueueItem* pItem = items[i]; - if (pItem->GetType() == QueueItemType::FolderScan) { - CFolderScanItem* pFolder = (CFolderScanItem*)pItem; - if (pFolder->m_active) { - pFolder->m_remove = true; - continue; - } - } - else if (pItem->GetType() == QueueItemType::File || - pItem->GetType() == QueueItemType::Folder) + if (pItem->GetType() == QueueItemType::File || + pItem->GetType() == QueueItemType::Folder) { CFileItem* pFile = (CFileItem*)pItem; if (pFile->IsActive()) { @@ -2357,26 +2099,7 @@ return false; } -void CQueueView::OnFolderThreadFiles(wxCommandEvent&) -{ - if (!m_pFolderProcessingThread) - return; - - wxASSERT(!m_queuedFolders[1].empty()); - CFolderScanItem* pItem = m_queuedFolders[1].front(); - - std::list entryList; - m_pFolderProcessingThread->GetFiles(entryList); - int added = QueueFiles(entryList, pItem->queued(), false, (CServerItem*)pItem->GetTopLevelItem(), pItem->m_defaultFileExistsAction); - m_pFolderProcessingThread->CheckFinished(); - - pItem->m_count += added; - - if (!m_folderscan_item_refresh_timer.IsRunning()) - m_folderscan_item_refresh_timer.Start(200, true); -} - -void CQueueView::SetDefaultFileExistsAction(enum CFileExistsNotification::OverwriteAction action, const TransferDirection direction) +void CQueueView::SetDefaultFileExistsAction(CFileExistsNotification::OverwriteAction action, const TransferDirection direction) { for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) (*iter)->SetDefaultFileExistsAction(action, direction); @@ -2392,8 +2115,8 @@ return; // Get current default action for the item - enum CFileExistsNotification::OverwriteAction downloadAction = CFileExistsNotification::unknown; - enum CFileExistsNotification::OverwriteAction uploadAction = CFileExistsNotification::unknown; + CFileExistsNotification::OverwriteAction downloadAction = CFileExistsNotification::unknown; + CFileExistsNotification::OverwriteAction uploadAction = CFileExistsNotification::unknown; bool has_upload = false; bool has_download = false; bool download_unknown = false; @@ -2412,13 +2135,6 @@ switch (pItem->GetType()) { - case QueueItemType::FolderScan: - if (uploadAction == CFileExistsNotification::unknown) - uploadAction = ((CFolderScanItem*)pItem)->m_defaultFileExistsAction; - else if (((CFolderScanItem*)pItem)->m_defaultFileExistsAction != uploadAction) - upload_unknown = true; - has_upload = true; - break; case QueueItemType::File: { CFileItem *pFileItem = (CFileItem*)pItem; @@ -2473,11 +2189,6 @@ switch (pItem->GetType()) { - case QueueItemType::FolderScan: - if (!has_upload) - break; - ((CFolderScanItem*)pItem)->m_defaultFileExistsAction = uploadAction; - break; case QueueItemType::File: { CFileItem *pFileItem = (CFileItem*)pItem; @@ -2510,40 +2221,44 @@ } } -t_EngineData* CQueueView::GetIdleEngine(const CServer* pServer, bool allowTransient) +t_EngineData* CQueueView::GetIdleEngine(ServerWithCredentials const& server, bool allowTransient) { - wxASSERT(!allowTransient || pServer); + wxASSERT(!allowTransient || server); t_EngineData* pFirstIdle = 0; int transient = 0; - for( unsigned int i = 0; i < m_engineData.size(); i++) { - if (m_engineData[i]->active) + for (unsigned int i = 0; i < m_engineData.size(); ++i) { + if (m_engineData[i]->active) { continue; + } if (m_engineData[i]->transient) { ++transient; - if( !allowTransient ) + if (!allowTransient) { continue; + } } - if (!pServer) + if (!server) { return m_engineData[i]; + } - if (m_engineData[i]->pEngine->IsConnected() && m_engineData[i]->lastServer == *pServer) + if (m_engineData[i]->pEngine->IsConnected() && m_engineData[i]->lastServer == server) { return m_engineData[i]; + } - if (!pFirstIdle) + if (!pFirstIdle) { pFirstIdle = m_engineData[i]; + } } - if( !pFirstIdle ) { + if (!pFirstIdle) { // Check whether we can create another engine const int newEngineCount = COptions::Get()->GetOptionVal(OPTION_NUMTRANSFERS); if (newEngineCount > static_cast(m_engineData.size()) - transient) { pFirstIdle = new t_EngineData; - pFirstIdle->pEngine = new CFileZillaEngine(m_pMainFrame->GetEngineContext()); - pFirstIdle->pEngine->Init(this); + pFirstIdle->pEngine = new CFileZillaEngine(m_pMainFrame->GetEngineContext(), *this); m_engineData.push_back(pFirstIdle); } @@ -2553,11 +2268,13 @@ } -t_EngineData* CQueueView::GetEngineData(const CFileZillaEngine* pEngine) +t_EngineData* CQueueView::GetEngineData(CFileZillaEngine const* pEngine) { - for (unsigned int i = 0; i < m_engineData.size(); ++i) - if (m_engineData[i]->pEngine == pEngine) + for (unsigned int i = 0; i < m_engineData.size(); ++i) { + if (m_engineData[i]->pEngine == pEngine) { return m_engineData[i]; + } + } return 0; } @@ -2565,60 +2282,67 @@ void CQueueView::TryRefreshListings() { - if (m_quit) + if (m_quit) { return; + } const std::vector *pStates = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) - { + for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) { CState* pState = *iter; - const CServer* const pServer = pState->GetServer(); - if (!pServer) + ServerWithCredentials const& server = pState->GetServer(); + if (!server) { continue; + } const CDirectoryListing* const pListing = pState->GetRemoteDir().get(); - if (!pListing) + if (!pListing) { continue; + } // See if there's an engine that is already listing unsigned int i; - for (i = 0; i < m_engineData.size(); i++) - { - if (!m_engineData[i]->active || m_engineData[i]->state != t_EngineData::list) + for (i = 0; i < m_engineData.size(); ++i) { + if (!m_engineData[i]->active || m_engineData[i]->state != t_EngineData::list) { continue; + } - if (m_engineData[i]->lastServer != *pServer) + if (m_engineData[i]->lastServer != server) { continue; + } // This engine is already listing a directory on the current server break; } - if (i != m_engineData.size()) + if (i != m_engineData.size()) { continue; + } - if (m_last_refresh_server == *pServer && m_last_refresh_path == pListing->path && + if (m_last_refresh_server == server.server && m_last_refresh_path == pListing->path && m_last_refresh_listing_time == pListing->m_firstListTime) { // Do not try to refresh same directory multiple times continue; } - t_EngineData* pEngineData = GetIdleEngine(pServer); - if (!pEngineData) + t_EngineData* pEngineData = GetIdleEngine(server); + if (!pEngineData) { continue; + } - if (!pEngineData->pEngine->IsConnected() || pEngineData->lastServer != *pServer) + if (!pEngineData->pEngine->IsConnected() || pEngineData->lastServer != server) { continue; + } - m_last_refresh_server = *pServer; + m_last_refresh_server = server.server; m_last_refresh_path = pListing->path; m_last_refresh_listing_time = pListing->m_firstListTime; CListCommand command(pListing->path, _T(""), LIST_FLAG_AVOID); int res = pEngineData->pEngine->Execute(command); - if (res != FZ_REPLY_WOULDBLOCK) + if (res != FZ_REPLY_WOULDBLOCK) { continue; + } pEngineData->active = true; pEngineData->state = t_EngineData::list; @@ -2628,7 +2352,7 @@ } } -void CQueueView::OnAskPassword(wxCommandEvent&) +void CQueueView::OnAskPassword() { while (!m_waitingForPassword.empty()) { const CFileZillaEngine* const pEngine = m_waitingForPassword.front(); @@ -2644,12 +2368,14 @@ continue; } - if (CLoginManager::Get().GetPassword(pEngineData->lastServer, false)) { + if (m_activeMode && CLoginManager::Get().GetPassword(pEngineData->lastServer, false)) { pEngineData->state = t_EngineData::connect; SendNextCommand(*pEngineData); } - else - ResetEngine(*pEngineData, remove); + else { + SetActive(false); + ResetEngine(*pEngineData, ResetReason::reset); + } m_waitingForPassword.pop_front(); } @@ -2660,37 +2386,44 @@ wxASSERT(pItem); int64_t const oldSize = pItem->GetSize(); - if (size == oldSize) + if (size == oldSize) { return; + } if (oldSize < 0) { wxASSERT(m_filesWithUnknownSize); - if (m_filesWithUnknownSize) + if (m_filesWithUnknownSize) { --m_filesWithUnknownSize; + } } else { wxASSERT(m_totalQueueSize >= oldSize); - if (m_totalQueueSize > oldSize) + if (m_totalQueueSize > oldSize) { m_totalQueueSize -= oldSize; - else + } + else { m_totalQueueSize = 0; + } } - if (size < 0) + if (size < 0) { ++m_filesWithUnknownSize; - else + } + else { m_totalQueueSize += size; + } pItem->SetSize(size); DisplayQueueSize(); } -void CQueueView::AdvanceQueue(bool refresh /*=true*/) +void CQueueView::AdvanceQueue(bool refresh) { static bool insideAdvanceQueue = false; - if (insideAdvanceQueue) + if (insideAdvanceQueue) { return; + } insideAdvanceQueue = true; while (TryStartNextTransfer()) { @@ -2698,27 +2431,31 @@ // Set timer for connected, idle engines for (unsigned int i = 0; i < m_engineData.size(); ++i) { - if (m_engineData[i]->active || m_engineData[i]->transient) + if (m_engineData[i]->active || m_engineData[i]->transient) { continue; + } if (m_engineData[i]->m_idleDisconnectTimer) { - if (m_engineData[i]->pEngine->IsConnected()) + if (m_engineData[i]->pEngine->IsConnected()) { continue; + } delete m_engineData[i]->m_idleDisconnectTimer; m_engineData[i]->m_idleDisconnectTimer = 0; } else { - if (!m_engineData[i]->pEngine->IsConnected()) + if (!m_engineData[i]->pEngine->IsConnected()) { continue; + } m_engineData[i]->m_idleDisconnectTimer = new wxTimer(this); m_engineData[i]->m_idleDisconnectTimer->Start(60000, true); } } - if (refresh) + if (refresh) { RefreshListOnly(false); + } insideAdvanceQueue = false; @@ -2733,10 +2470,12 @@ CFileItem* pFileItem = (CFileItem*)pItem; int64_t const size = pFileItem->GetSize(); - if (size < 0) - m_filesWithUnknownSize++; - else if (size > 0) + if (size < 0) { + ++m_filesWithUnknownSize; + } + else if (size > 0) { m_totalQueueSize += size; + } } } @@ -2750,8 +2489,9 @@ void CQueueView::OnTimer(wxTimerEvent& event) { const int id = event.GetId(); - if (id == -1) + if (id == -1) { return; + } #if defined(__WXMSW__) || defined(__WXMAC__) if (id == m_actionAfterTimerId) { OnActionAfterTimerTick(); @@ -2764,23 +2504,14 @@ return; } - if (id == m_folderscan_item_refresh_timer.GetId()) { - if (m_queuedFolders[1].empty()) - return; - - CFolderScanItem* pItem = m_queuedFolders[1].front(); - pItem->m_statusMessage = wxString::Format(_("%d files added to queue"), pItem->GetCount()); - RefreshItem(pItem); - return; - } - for (auto & pData : m_engineData) { if (pData->m_idleDisconnectTimer && !pData->m_idleDisconnectTimer->IsRunning()) { delete pData->m_idleDisconnectTimer; pData->m_idleDisconnectTimer = 0; - if (pData->pEngine->IsConnected()) + if (pData->pEngine->IsConnected()) { pData->pEngine->Execute(CDisconnectCommand()); + } } } @@ -2844,205 +2575,204 @@ CState* pState = 0; CCommandQueue* pCommandQueue = 0; const std::vector *pStates = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) - { + for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) { pState = *iter; pCommandQueue = pState->m_pCommandQueue; - if (!pCommandQueue) + if (!pCommandQueue) { continue; + } pEngine = pCommandQueue->GetEngineExclusive(event.GetId()); - if (!pEngine) + if (!pEngine) { continue; + } break; } - if (!pState || !pCommandQueue || !pEngine) + if (!pState || !pCommandQueue || !pEngine) { return; + } t_EngineData* pEngineData = GetEngineData(pEngine); wxASSERT(!pEngineData || pEngineData->transient); - if (!pEngineData || !pEngineData->transient || !pEngineData->active) - { + if (!pEngineData || !pEngineData->transient || !pEngineData->active) { pCommandQueue->ReleaseEngine(); return; } wxASSERT(pEngineData->state == t_EngineData::waitprimary); - if (pEngineData->state != t_EngineData::waitprimary) + if (pEngineData->state != t_EngineData::waitprimary) { return; + } CServerItem* pServerItem = (CServerItem*)pEngineData->pItem->GetParent(); - const CServer* pCurrentServer = pState->GetServer(); + ServerWithCredentials const& currentServer = pState->GetServer(); wxASSERT(pServerItem); - if (!pCurrentServer || *pCurrentServer != pServerItem->GetServer()) - { - if (pState->m_pCommandQueue) + if (!currentServer || currentServer != pServerItem->GetServer()) { + if (pState->m_pCommandQueue) { pState->m_pCommandQueue->ReleaseEngine(); - ResetEngine(*pEngineData, retry); + } + ResetEngine(*pEngineData, ResetReason::retry); return; } - if (pEngineData->pItem->GetType() == QueueItemType::File) + if (pEngineData->pItem->GetType() == QueueItemType::File) { pEngineData->state = t_EngineData::transfer; - else + } + else { pEngineData->state = t_EngineData::mkdir; + } pEngineData->pEngine = pEngine; SendNextCommand(*pEngineData); } -enum ActionAfterState CQueueView::GetActionAfterState() const -{ - return m_actionAfterState; -} - -bool CQueueView::IsActionAfter(enum ActionAfterState state) +bool CQueueView::IsActionAfter(ActionAfterState::type state) { return m_actionAfterState == state; } -void CQueueView::ActionAfter(bool warned /*=false*/) +void CQueueView::ActionAfter(bool warned) { - // Need to check all contexts whether there's a recursive - // download operation still in progress - const std::vector *pStates = CContextManager::Get()->GetAllStates(); - for (unsigned int i = 0; i < pStates->size(); ++i) { - CState *pState = (*pStates)[i]; - CRecursiveOperation *pRecursiveOperationHandler; - if (!pState || !(pRecursiveOperationHandler = pState->GetRecursiveOperationHandler())) - continue; + if (m_quit) { + return; + } - if (pRecursiveOperationHandler->GetOperationMode() == CRecursiveOperation::recursive_download || - pRecursiveOperationHandler->GetOperationMode() == CRecursiveOperation::recursive_download_flatten) - { - return; - } + auto blocker = m_actionAfterBlocker.lock(); + if (blocker) { + blocker->trigger_ = true; + return; } - if (!m_pMainFrame->IsActive() && COptions::Get()->GetOptionVal(OPTION_SHOW_NOTIFICATION_BUBBLE) != 0) { - wxString const title = _("Transfers finished"); - wxString msg; - int const failed_count = m_pQueue->GetQueueView_Failed()->GetFileCount(); - if (failed_count != 0) { - wxString fmt = wxPLURAL("All transfers have finished. %d file could not be transferred.", "All transfers have finished. %d files could not be transferred.", failed_count); - msg = wxString::Format(fmt, failed_count); - } - else - msg = _("All files have been successfully transferred"); + switch (m_actionAfterState) { + case ActionAfterState::ShowNotification: + { + wxString const title = _("Transfers finished"); + wxString msg; + int const failed_count = m_pQueue->GetQueueView_Failed()->GetFileCount(); + if (failed_count != 0) { + wxString fmt = wxPLURAL("All transfers have finished. %d file could not be transferred.", "All transfers have finished. %d files could not be transferred.", failed_count); + msg = wxString::Format(fmt, failed_count); + } + else { + msg = _("All files have been successfully transferred"); + } #if WITH_LIBDBUS - if (!m_desktop_notification) - m_desktop_notification = std::make_unique(); - m_desktop_notification->Notify(title, msg, (failed_count > 0) ? _T("transfer.error") : _T("transfer.complete")); + if (!m_desktop_notification) { + m_desktop_notification = std::make_unique(); + } + m_desktop_notification->Notify(title, msg, (failed_count > 0) ? _T("transfer.error") : _T("transfer.complete")); #elif defined(__WXGTK__) || defined(__WXMSW__) - m_desktop_notification = std::make_unique(); - m_desktop_notification->SetTitle(title); - m_desktop_notification->SetMessage(msg); - m_desktop_notification->Show(5); + m_desktop_notification = std::make_unique(); + m_desktop_notification->SetTitle(title); + m_desktop_notification->SetMessage(msg); + m_desktop_notification->Show(5); #endif - } - - switch (m_actionAfterState) - { - case ActionAfterState_Close: - { - m_pMainFrame->Close(); break; } - case ActionAfterState_Disconnect: + case ActionAfterState::RequestAttention: { - for (auto & state : *pStates) { - if (state->IsRemoteConnected() && state->IsRemoteIdle()) { - state->Disconnect(); - } - } + int const failed_count = m_pQueue->GetQueueView_Failed()->GetFileCount(); + m_pMainFrame->RequestUserAttention(failed_count ? wxUSER_ATTENTION_ERROR : wxUSER_ATTENTION_INFO); break; } - case ActionAfterState_RunCommand: + case ActionAfterState::Close: + case ActionAfterState::CloseOnce: { - wxExecute(m_actionAfterRunCommand); + m_pMainFrame->Close(); break; } - case ActionAfterState_ShowMessage: + case ActionAfterState::RunCommand: { - wxMessageDialog* dialog = new wxMessageDialog(m_pMainFrame, _("No more files in the queue!"), _T("Queue completion"), wxOK | wxICON_INFORMATION); - m_pMainFrame->RequestUserAttention(wxUSER_ATTENTION_ERROR); - dialog->ShowModal(); - dialog->Destroy(); + wxString cmd = COptions::Get()->GetOption(OPTION_QUEUE_COMPLETION_COMMAND); + if (!cmd.empty()) { + wxExecute(cmd); + } break; } - case ActionAfterState_PlaySound: + case ActionAfterState::PlaySound: { wxSound sound(wxGetApp().GetResourceDir().GetPath() + _T("finished.wav")); sound.Play(wxSOUND_ASYNC); break; } #ifdef __WXMSW__ - case ActionAfterState_Reboot: - case ActionAfterState_Shutdown: + case ActionAfterState::Reboot: + case ActionAfterState::Shutdown: if (!warned) { ActionAfterWarnUser(m_actionAfterState); return; } - else - wxShutdown((m_actionAfterState == ActionAfterState_Reboot) ? wxSHUTDOWN_REBOOT : wxSHUTDOWN_POWEROFF); + else { + wxShutdown((m_actionAfterState == ActionAfterState::Reboot) ? wxSHUTDOWN_REBOOT : wxSHUTDOWN_POWEROFF); + m_actionAfterState = ActionAfterState::None; + } break; - case ActionAfterState_Sleep: + case ActionAfterState::Sleep: if (!warned) { ActionAfterWarnUser(m_actionAfterState); return; } - else + else { SetSuspendState(false, false, true); + m_actionAfterState = ActionAfterState::None; + } break; #elif defined(__WXMAC__) - case ActionAfterState_Reboot: - case ActionAfterState_Shutdown: - case ActionAfterState_Sleep: + case ActionAfterState::Reboot: + case ActionAfterState::Shutdown: + case ActionAfterState::Sleep: if (!warned) { ActionAfterWarnUser(m_actionAfterState); return; } else { wxString action; - if( m_actionAfterState == ActionAfterState_Reboot ) + if (m_actionAfterState == ActionAfterState::Reboot) { action = _T("restart"); - else if( m_actionAfterState == ActionAfterState_Shutdown ) + } + else if (m_actionAfterState == ActionAfterState::Shutdown) { action = _T("shut down"); - else + } + else { action = _T("sleep"); + } wxExecute(_T("osascript -e 'tell application \"System Events\" to ") + action + _T("'")); + m_actionAfterState = ActionAfterState::None; } break; #else - (void)warned; + case ActionAfterState::Reboot: + case ActionAfterState::Shutdown: + case ActionAfterState::Sleep: + (void)warned; + break; #endif default: break; } - m_actionAfterState = ActionAfterState_Disabled; // Resetting the state. } #if defined(__WXMSW__) || defined(__WXMAC__) -void CQueueView::ActionAfterWarnUser(ActionAfterState s) +void CQueueView::ActionAfterWarnUser(ActionAfterState::type s) { if (m_actionAfterWarnDialog != NULL) return; wxString message; wxString label; - if(s == ActionAfterState_Shutdown) { + if(s == ActionAfterState::Shutdown) { message = _("The system will soon shut down unless you click Cancel."); label = _("Shutdown now"); } - else if(s == ActionAfterState_Reboot) { + else if(s == ActionAfterState::Reboot) { message = _("The system will soon reboot unless you click Cancel."); label = _("Reboot now"); } @@ -3073,33 +2803,29 @@ void CQueueView::OnActionAfterTimerTick() { - if (!m_actionAfterWarnDialog) - { + if (!m_actionAfterWarnDialog) { delete m_actionAfterTimer; m_actionAfterTimer = 0; return; } bool skipped = false; - if (m_actionAfterTimerCount > 150) - { + if (m_actionAfterTimerCount > 150) { m_actionAfterWarnDialog->Destroy(); m_actionAfterWarnDialog = 0; delete m_actionAfterTimer; m_actionAfterTimer = 0; ActionAfter(true); } - else if (!m_actionAfterWarnDialog->Update(m_actionAfterTimerCount++, _T(""), &skipped)) - { + else if (!m_actionAfterWarnDialog->Update(m_actionAfterTimerCount++, _T(""), &skipped)) { // User has pressed cancel! - m_actionAfterState = ActionAfterState_Disabled; // resetting to disabled + m_actionAfterState = ActionAfterState::None; // resetting to disabled m_actionAfterWarnDialog->Destroy(); m_actionAfterWarnDialog = 0; delete m_actionAfterTimer; m_actionAfterTimer = 0; } - else if (skipped) - { + else if (skipped) { m_actionAfterWarnDialog->Destroy(); m_actionAfterWarnDialog = 0; delete m_actionAfterTimer; @@ -3111,22 +2837,27 @@ bool CQueueView::SwitchEngine(t_EngineData** ppEngineData) { - if (m_engineData.size() < 2) + if (m_engineData.size() < 2) { return false; + } t_EngineData* pEngineData = *ppEngineData; for (auto & pNewEngineData : m_engineData) { - if (pNewEngineData == pEngineData) + if (pNewEngineData == pEngineData) { continue; + } - if (pNewEngineData->active || pNewEngineData->transient) + if (pNewEngineData->active || pNewEngineData->transient) { continue; + } - if (pNewEngineData->lastServer != pEngineData->lastServer) + if (pNewEngineData->lastServer != pEngineData->lastServer) { continue; + } - if (!pNewEngineData->pEngine->IsConnected()) + if (!pNewEngineData->pEngine->IsConnected()) { continue; + } wxASSERT(!pNewEngineData->pItem); pNewEngineData->pItem = pEngineData->pItem; @@ -3151,12 +2882,15 @@ } // Set new state - if (pNewEngineData->pItem->GetType() == QueueItemType::File) + if (pNewEngineData->pItem->GetType() == QueueItemType::File) { pNewEngineData->state = t_EngineData::transfer; - else + } + else { pNewEngineData->state = t_EngineData::mkdir; - if (pNewEngineData->pStatusLineCtrl) + } + if (pNewEngineData->pStatusLineCtrl) { pNewEngineData->pStatusLineCtrl->ClearTransferStatus(); + } pEngineData->state = t_EngineData::none; @@ -3169,21 +2903,22 @@ bool CQueueView::IsOtherEngineConnected(t_EngineData* pEngineData) { - for (auto iter = m_engineData.begin(); iter != m_engineData.end(); ++iter) - { - t_EngineData* current = *iter; - - if (current == pEngineData) + for (auto const* current : m_engineData) { + if (current == pEngineData) { continue; + } - if (!current->pEngine) + if (!current->pEngine) { continue; + } - if (current->lastServer != pEngineData->lastServer) + if (current->lastServer != pEngineData->lastServer) { continue; + } - if (current->pEngine->IsConnected()) + if (current->pEngine->IsConnected()) { return true; + } } return false; @@ -3196,21 +2931,25 @@ wxCommandEvent cmdEvt; OnRemoveSelected(cmdEvt); } - else + else { event.Skip(); + } } int CQueueView::GetLineHeight() { - if (m_line_height != -1) + if (m_line_height != -1) { return m_line_height; + } - if (!GetItemCount()) + if (!GetItemCount()) { return 20; + } wxRect rect; - if (!GetItemRect(0, rect)) + if (!GetItemRect(0, rect)) { return 20; + } m_line_height = rect.GetHeight(); @@ -3251,21 +2990,21 @@ RefreshItem(pFile); } -wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename) +std::wstring CQueueView::ReplaceInvalidCharacters(std::wstring const& filename) { - if (!COptions::Get()->GetOptionVal(OPTION_INVALID_CHAR_REPLACE_ENABLE)) + if (!COptions::Get()->GetOptionVal(OPTION_INVALID_CHAR_REPLACE_ENABLE)) { return filename; + } const wxChar replace = COptions::Get()->GetOption(OPTION_INVALID_CHAR_REPLACE)[0]; wxString result; { - wxStringBuffer start( result, filename.Len() + 1 ); + wxStringBuffer start(result, filename.size() + 1); wxChar* buf = start; const wxChar* p = filename.c_str(); - while (*p) - { + while (*p) { const wxChar c = *p; switch (c) { @@ -3298,7 +3037,7 @@ *buf = 0; } - return result; + return result.ToStdWstring(); } wxFileOffset CQueueView::GetCurrentDownloadSpeed() @@ -3317,17 +3056,15 @@ { wxFileOffset totalSpeed = 0; - for (auto iter = m_statusLineList.begin(); iter != m_statusLineList.end(); ++iter) - { - CStatusLineCtrl *pCtrl = *iter; + for (auto pCtrl : m_statusLineList) { const CFileItem *pItem = pCtrl->GetItem(); bool isDownload = pItem->Download(); - if ((isDownload && countDownload) || (!isDownload && countUpload)) - { - wxFileOffset speed = pCtrl->GetCurrentSpeed(); - if (speed > 0) + if ((isDownload && countDownload) || (!isDownload && countUpload)) { + wxFileOffset speed = pCtrl->GetMomentarySpeed(); + if (speed > 0) { totalSpeed += speed; + } } } @@ -3337,18 +3074,20 @@ void CQueueView::ReleaseExclusiveEngineLock(CFileZillaEngine* pEngine) { wxASSERT(pEngine); - if (!pEngine) + if (!pEngine) { return; + } const std::vector *pStates = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) - { + for (std::vector::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter) { CState* pState = *iter; - if (pState->m_pEngine != pEngine) + if (pState->m_pEngine != pEngine) { continue; + } CCommandQueue *pCommandQueue = pState->m_pCommandQueue; - if (pCommandQueue) + if (pCommandQueue) { pCommandQueue->ReleaseEngine(); + } break; } @@ -3362,20 +3101,20 @@ WXLRESULT CQueueView::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - if (nMsg == WM_DWMCOMPOSITIONCHANGED || nMsg == WM_THEMECHANGED) - { + if (nMsg == WM_DWMCOMPOSITIONCHANGED || nMsg == WM_THEMECHANGED) { m_line_height = -1; - if (!m_resize_timer.IsRunning()) + if (!m_resize_timer.IsRunning()) { m_resize_timer.Start(250, true); + } } - else if (nMsg == WM_LBUTTONDOWN) - { + else if (nMsg == WM_LBUTTONDOWN) { // If clicking a partially selected item, Windows starts an internal timer with the double-click interval (as seen in the // disassembly). After the timer expires, the given item is selected. But there's a huge bug in Windows: We don't get // notified about this change in scroll position in any way (verified using Spy++), so on left button down, start our // own timer with a slightly higher interval. - if (!m_resize_timer.IsRunning()) + if (!m_resize_timer.IsRunning()) { m_resize_timer.Start(GetDoubleClickTime() + 5, true); + } } return CQueueViewBase::MSWWindowProc(nMsg, wParam, lParam); } @@ -3383,6 +3122,78 @@ void CQueueView::OnOptionsChanged(changed_options_t const&) { - if (m_activeMode) + if (m_activeMode) { AdvanceQueue(); + } +} + +std::shared_ptr CQueueView::GetActionAfterBlocker() +{ + auto ret = m_actionAfterBlocker.lock(); + if (!ret) { + ret = std::make_shared(*this); + m_actionAfterBlocker = ret; + } + + return ret; +} + + +CActionAfterBlocker::~CActionAfterBlocker() +{ + if (trigger_ && !queueView_.IsActive()) { + queueView_.ActionAfter(); + } +} + +void CQueueView::OnStateChange(CState*, t_statechange_notifications notification, wxString const&, const void* data2) +{ + if (notification == STATECHANGE_REWRITE_CREDENTIALS) { + auto * loginManager = const_cast(reinterpret_cast(data2)); + if (!loginManager) { + return; + } + + + for (auto it = m_serverList.begin(); it != m_serverList.end(); ) { + ServerWithCredentials server = (*it)->GetServer(); + loginManager->AskDecryptor(server.credentials.encrypted_, true, false); + + // Since the queue may be running and AskDecryptor uses the GUI, re-find matching server item + for (it = m_serverList.begin(); it != m_serverList.end(); ++it) { + if ((*it)->GetServer() == server) { + server = (*it)->GetServer(); // Credentials aren't in == + server.credentials.Unprotect(loginManager->GetDecryptor(server.credentials.encrypted_), true); + (*it)->GetCredentials() = server.credentials; + break; + } + } + if (it == m_serverList.end()) { + // Server has vanished, start over. + it = m_serverList.begin(); + } + else { + ++it; + } + } + } + else if (notification == STATECHANGE_QUITNOW) { + if (m_quit != 2) { + SaveQueue(false); + SaveColumnSettings(OPTION_QUEUE_COLUMN_WIDTHS, -1, -1); + } + } +} + +void CQueueView::OnColumnClicked(wxListEvent &event) +{ + int const col = event.GetColumn(); + bool const reverse = wxGetKeyState(WXK_SHIFT); + + for (auto * serverItem : m_serverList) { + serverItem->Sort(col, reverse); + } + + RefreshListOnly(); + UpdateStatusLinePositions(); } diff -Nru filezilla-3.15.0.2/src/interface/queueview_failed.cpp filezilla-3.33.0/src/interface/queueview_failed.cpp --- filezilla-3.15.0.2/src/interface/queueview_failed.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/queueview_failed.cpp 2018-04-27 11:26:14.000000000 +0000 @@ -15,9 +15,7 @@ CQueueViewFailed::CQueueViewFailed(CQueue* parent, int index) : CQueueViewBase(parent, index, _("Failed transfers")) { - std::list extraCols; - extraCols.push_back(colTime); - extraCols.push_back(colErrorReason); + std::vector extraCols({colTime, colErrorReason}); CreateColumns(extraCols); } @@ -29,8 +27,9 @@ void CQueueViewFailed::OnContextMenu(wxContextMenuEvent&) { wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_QUEUE_FAILED")); - if (!pMenu) + if (!pMenu) { return; + } #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) @@ -71,7 +70,6 @@ m_itemCount = 0; SaveSetItemCount(0); m_fileCount = 0; - m_folderScanCount = 0; DisplayNumberQueuedFiles(); @@ -85,17 +83,18 @@ { #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) - if (!GetSelectedItemCount()) + if (!GetSelectedItemCount()) { return; + } #endif std::list selectedItems; long item = -1; - for (;;) - { + for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item == -1) { break; + } selectedItems.push_front(GetQueueItem(item)); SetItemState(item, 0, wxLIST_STATE_SELECTED); @@ -103,47 +102,44 @@ CEditHandler* pEditHandler = CEditHandler::Get(); - while (!selectedItems.empty()) - { + while (!selectedItems.empty()) { CQueueItem* pItem = selectedItems.front(); selectedItems.pop_front(); CQueueItem* pTopLevelItem = pItem->GetTopLevelItem(); - if (pItem->GetType() == QueueItemType::Server) - { + if (pItem->GetType() == QueueItemType::Server) { CServerItem* pServerItem = (CServerItem*)pItem; - if (pEditHandler && pEditHandler->GetFileCount(CEditHandler::remote, CEditHandler::upload_and_remove_failed, &pServerItem->GetServer())) - pEditHandler->RemoveAll(CEditHandler::upload_and_remove_failed, &pServerItem->GetServer()); + if (pEditHandler && pEditHandler->GetFileCount(CEditHandler::remote, CEditHandler::upload_and_remove_failed, pServerItem->GetServer())) { + pEditHandler->RemoveAll(CEditHandler::upload_and_remove_failed, pServerItem->GetServer()); + } } - else if (pItem->GetType() == QueueItemType::File) - { + else if (pItem->GetType() == QueueItemType::File) { CFileItem* pFileItem = (CFileItem*)pItem; - if (pFileItem->m_edit == CEditHandler::remote && pEditHandler) - { - if (pFileItem->m_edit == CEditHandler::local) - { + if (pFileItem->m_edit == CEditHandler::remote && pEditHandler) { + if (pFileItem->m_edit == CEditHandler::local) { wxString fullPath(pFileItem->GetLocalPath().GetPath() + pFileItem->GetLocalFile()); - enum CEditHandler::fileState state = pEditHandler->GetFileState(fullPath); - if (state == CEditHandler::upload_and_remove_failed) + CEditHandler::fileState state = pEditHandler->GetFileState(fullPath); + if (state == CEditHandler::upload_and_remove_failed) { pEditHandler->Remove(fullPath); + } } - else - { + else { CServerItem* pServerItem = (CServerItem*)pFileItem->GetTopLevelItem(); - enum CEditHandler::fileState state = pEditHandler->GetFileState(pFileItem->GetRemoteFile(), pFileItem->GetRemotePath(), pServerItem->GetServer()); - if (state == CEditHandler::upload_and_remove_failed) + CEditHandler::fileState state = pEditHandler->GetFileState(pFileItem->GetRemoteFile(), pFileItem->GetRemotePath(), pServerItem->GetServer()); + if (state == CEditHandler::upload_and_remove_failed) { pEditHandler->Remove(pFileItem->GetRemoteFile(), pFileItem->GetRemotePath(), pServerItem->GetServer()); + } } } } - if (!pTopLevelItem->GetChild(1)) - { + if (!pTopLevelItem->GetChild(1)) { // Parent will get deleted // If next selected item is parent, remove it from list - if (!selectedItems.empty() && selectedItems.front() == pTopLevelItem) + if (!selectedItems.empty() && selectedItems.front() == pTopLevelItem) { selectedItems.pop_front(); + } } RemoveItem(pItem, true, false, false); } @@ -151,8 +147,9 @@ SaveSetItemCount(m_itemCount); RefreshListOnly(); - if (!m_itemCount && m_pQueue->GetQueueView()->GetItemCount()) + if (!m_itemCount && m_pQueue->GetQueueView()->GetItemCount()) { m_pQueue->SetSelection(0); + } } bool CQueueViewFailed::RequeueFileItem(CFileItem* pFileItem, CServerItem* pServerItem) @@ -160,7 +157,7 @@ CQueueView* pQueueView = m_pQueue->GetQueueView(); pFileItem->m_errorCount = 0; - pFileItem->SetStatusMessage(CFileItem::none); + pFileItem->SetStatusMessage(CFileItem::Status::none); if (!pFileItem->Download() && pFileItem->GetType() != QueueItemType::Folder && !wxFileName::FileExists(pFileItem->GetLocalPath().GetPath() + pFileItem->GetLocalFile())) { delete pFileItem; @@ -173,10 +170,10 @@ delete pFileItem; return false; } - enum CEditHandler::fileState state = pEditHandler->GetFileState(pFileItem->GetRemoteFile(), pFileItem->GetRemotePath(), pServerItem->GetServer()); + CEditHandler::fileState state = pEditHandler->GetFileState(pFileItem->GetRemoteFile(), pFileItem->GetRemotePath(), pServerItem->GetServer()); if (state == CEditHandler::unknown) { wxASSERT(pFileItem->Download()); - wxString file = pFileItem->GetRemoteFile(); + std::wstring file = pFileItem->GetRemoteFile(); if (!pEditHandler->AddFile(CEditHandler::remote, file, pFileItem->GetRemotePath(), pServerItem->GetServer())) { delete pFileItem; return false; diff -Nru filezilla-3.15.0.2/src/interface/queueview_failed.h filezilla-3.33.0/src/interface/queueview_failed.h --- filezilla-3.15.0.2/src/interface/queueview_failed.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/queueview_failed.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __QUEUEVIEW_FAILED_H__ -#define __QUEUEVIEW_FAILED_H__ +#ifndef FILEZILLA_INTERFACE_QUEUEVIEW_FAILED_HEADER +#define FILEZILLA_INTERFACE_QUEUEVIEW_FAILED_HEADER class CQueueViewFailed : public CQueueViewBase { @@ -21,4 +21,4 @@ void OnChar(wxKeyEvent& event); }; -#endif //__QUEUEVIEW_FAILED_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/QueueView.h filezilla-3.33.0/src/interface/QueueView.h --- filezilla-3.15.0.2/src/interface/QueueView.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/QueueView.h 2018-04-26 03:30:07.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __QUEUEVIEW_H__ -#define __QUEUEVIEW_H__ +#ifndef FILEZILLA_INTERFACE_QUEUEVIEW_HEADER +#define FILEZILLA_INTERFACE_QUEUEVIEW_HEADER #include "dndobjects.h" #include "queue.h" @@ -11,55 +11,32 @@ #include #include "queue_storage.h" +#include "local_recursive_operation.h" +#include "notification.h" -class CFolderProcessingEntry -{ -public: - enum t_type - { - dir, - file - }; - const enum t_type m_type; - CFolderProcessingEntry(enum t_type type) : m_type(type) {} - virtual ~CFolderProcessingEntry() {} -}; - -class t_newEntry : public CFolderProcessingEntry -{ -public: - t_newEntry() - : CFolderProcessingEntry(CFolderProcessingEntry::file) - {} - - wxString name; - int64_t size{}; - fz::datetime time; - int attributes{}; - bool dir{}; -}; +namespace ActionAfterState { +enum type { + None, + ShowNotification, + RequestAttention, + Close, + RunCommand, + PlaySound, + + // On Windows and OS X, wx can reboot or shutdown the system as well. + Reboot, + Shutdown, + Sleep, + CloseOnce, -enum ActionAfterState -{ - ActionAfterState_Disabled, - ActionAfterState_Close, - ActionAfterState_Disconnect, - ActionAfterState_RunCommand, - ActionAfterState_ShowMessage, - ActionAfterState_PlaySound -// On Windows and OS X, wx can reboot or shutdown the system as well. -#if defined(__WXMSW__) || defined(__WXMAC__) - , - ActionAfterState_Reboot, - ActionAfterState_Shutdown, - ActionAfterState_Sleep -#endif + Count }; +} class CStatusLineCtrl; class CFileItem; -struct t_EngineData +struct t_EngineData final { t_EngineData() : pEngine() @@ -98,14 +75,13 @@ } state; CFileItem* pItem; - CServer lastServer; + ServerWithCredentials lastServer; CStatusLineCtrl* pStatusLineCtrl; wxTimer* m_idleDisconnectTimer; }; class CMainFrame; class CStatusLineCtrl; -class CFolderProcessingThread; class CAsyncRequestQueue; class CQueue; #if WITH_LIBDBUS @@ -114,25 +90,41 @@ class wxNotificationMessage; #endif -class CQueueView : public CQueueViewBase, public COptionChangeEventHandler +class CActionAfterBlocker final +{ +public: + CActionAfterBlocker(CQueueView& queueView) + : queueView_(queueView) + { + } + + ~CActionAfterBlocker(); + +private: + friend class CQueueView; + CQueueView& queueView_; + bool trigger_{}; +}; + +class CQueueView final : public CQueueViewBase, public COptionChangeEventHandler, public CGlobalStateEventHandler, private EngineNotificationHandler { - friend class CFolderProcessingThread; friend class CQueueViewDropTarget; friend class CQueueViewFailed; + friend class CActionAfterBlocker; + public: CQueueView(CQueue* parent, int index, CMainFrame* pMainFrame, CAsyncRequestQueue* pAsyncRequestQueue); virtual ~CQueueView(); bool QueueFile(const bool queueOnly, const bool download, - const wxString& localFile, const wxString& remoteFile, + std::wstring const& localFile, std::wstring const& remoteFile, const CLocalPath& localPath, const CServerPath& remotePath, - const CServer& server, int64_t size, enum CEditHandler::fileType edit = CEditHandler::none, + ServerWithCredentials const& server, int64_t size, CEditHandler::fileType edit = CEditHandler::none, QueuePriority priority = QueuePriority::normal); void QueueFile_Finish(const bool start); // Need to be called after QueueFile - bool QueueFiles(const bool queueOnly, const CLocalPath& localPath, const CRemoteDataObject& dataObject); - int QueueFiles(const std::list &entryList, bool queueOnly, bool download, CServerItem* pServerItem, const CFileExistsNotification::OverwriteAction defaultFileExistsAction); - bool QueueFolder(bool queueOnly, bool download, const CLocalPath& localPath, const CServerPath& remotePath, const CServer& server); + bool QueueFiles(const bool queueOnly, CLocalPath const& localPath, const CRemoteDataObject& dataObject); + bool QueueFiles(const bool queueOnly, ServerWithCredentials const& server, CLocalRecursiveOperation::listing const& listing); bool empty() const; int IsActive() const { return m_activeMode; } @@ -140,7 +132,6 @@ bool Quit(); // This sets the default file exists action for all files currently in queue. - // This includes queued folders which are yet to be processed void SetDefaultFileExistsAction(CFileExistsNotification::OverwriteAction action, const TransferDirection direction); void UpdateItemSize(CFileItem* pItem, int64_t size); @@ -151,15 +142,15 @@ void LoadQueueFromXML(); void ImportQueue(pugi::xml_node element, bool updateSelections); - virtual void InsertItem(CServerItem* pServerItem, CQueueItem* pItem); + virtual void InsertItem(CServerItem* pServerItem, CQueueItem* pItem) override; - virtual void CommitChanges(); + virtual void CommitChanges() override; void ProcessNotification(CFileZillaEngine* pEngine, std::unique_ptr&& pNotification); void RenameFileInTransfer(CFileZillaEngine *pEngine, const wxString& newName, bool local); - static wxString ReplaceInvalidCharacters(const wxString& filename); + static std::wstring ReplaceInvalidCharacters(std::wstring const& filename); // Get the current download speed as the sum of all active downloads. // Unit is byte/s. @@ -169,28 +160,27 @@ // Unit is byte/s. wxFileOffset GetCurrentUploadSpeed(); + std::shared_ptr GetActionAfterBlocker(); + protected: #ifdef __WXMSW__ WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); #endif - virtual void OnOptionsChanged(changed_options_t const& options); + virtual void OnOptionsChanged(changed_options_t const& options) override; void AdvanceQueue(bool refresh = true); bool TryStartNextTransfer(); // Called from TryStartNextTransfer(), checks // whether it is allowed to start another transfer on that server item - bool CanStartTransfer(const CServerItem& server_item, struct t_EngineData *&pEngineData); - - bool ProcessFolderItems(int type = -1); - void ProcessUploadFolderItems(); + bool CanStartTransfer(const CServerItem& server_item, t_EngineData *&pEngineData); void ProcessReply(t_EngineData* pEngineData, COperationNotification const& notification); void SendNextCommand(t_EngineData& engineData); - enum ResetReason + enum class ResetReason { success, failure, @@ -199,12 +189,10 @@ remove }; - enum ActionAfterState GetActionAfterState() const; - - void ResetEngine(t_EngineData& data, const enum ResetReason reason); + void ResetEngine(t_EngineData& data, const ResetReason reason); void DeleteEngines(); - virtual bool RemoveItem(CQueueItem* item, bool destroy, bool updateItemCount = true, bool updateSelections = true, bool forward = true); + virtual bool RemoveItem(CQueueItem* item, bool destroy, bool updateItemCount = true, bool updateSelections = true, bool forward = true) override; // Stops processing of given item // Returns true on success, false if it would block @@ -216,12 +204,12 @@ void UpdateStatusLinePositions(); void CalculateQueueSize(); void DisplayQueueSize(); - void SaveQueue(); + void SaveQueue(bool silent = false); - bool IsActionAfter(enum ActionAfterState); + bool IsActionAfter(ActionAfterState::type); void ActionAfter(bool warned = false); #if defined(__WXMSW__) || defined(__WXMAC__) - void ActionAfterWarnUser(ActionAfterState s); + void ActionAfterWarnUser(ActionAfterState::type s); #endif void ProcessNotification(t_EngineData* pEngineData, std::unique_ptr && pNotification); @@ -241,41 +229,29 @@ bool IsOtherEngineConnected(t_EngineData* pEngineData); - t_EngineData* GetIdleEngine(const CServer* pServer = 0, bool allowTransient = false); + t_EngineData* GetIdleEngine(ServerWithCredentials const& server = ServerWithCredentials(), bool allowTransient = false); t_EngineData* GetEngineData(const CFileZillaEngine* pEngine); std::vector m_engineData; std::list m_statusLineList; /* - * List of queued folders used to populate the queue. - * Index 0 for downloads, index 1 for uploads. - * For each type, only the first one can be active at any given time. - */ - std::list m_queuedFolders[2]; - - void RemoveQueuedFolderItem(CFolderScanItem* pFolder); - - CFolderProcessingThread *m_pFolderProcessingThread{}; - - /* * Don't update status line positions if m_waitStatusLineUpdate is true. * This assures we are updating the status line positions only once, * and not multiple times (for example inside a loop). */ - bool m_waitStatusLineUpdate; + bool m_waitStatusLineUpdate{}; // Remember last top item in UpdateStatusLinePositions() - int m_lastTopItem; + int m_lastTopItem{-1}; - int m_activeCount; - int m_activeCountDown; - int m_activeCountUp; - int m_activeMode; // 0 inactive, 1 only immediate transfers, 2 all - int m_quit; + int m_activeCount{}; + int m_activeCountDown{}; + int m_activeCountUp{}; + int m_activeMode{}; // 0 inactive, 1 only immediate transfers, 2 all + int m_quit{}; - enum ActionAfterState m_actionAfterState; - wxString m_actionAfterRunCommand; + ActionAfterState::type m_actionAfterState; #if defined(__WXMSW__) || defined(__WXMAC__) wxTimer* m_actionAfterTimer{}; wxProgressDialog* m_actionAfterWarnDialog{}; @@ -283,17 +259,15 @@ int m_actionAfterTimerId{-1}; #endif - int64_t m_totalQueueSize; - int m_filesWithUnknownSize; + int64_t m_totalQueueSize{}; + int m_filesWithUnknownSize{}; CMainFrame* m_pMainFrame; CAsyncRequestQueue* m_pAsyncRequestQueue; std::list m_waitingForPassword; - virtual void OnPostScroll(); - - wxTimer m_folderscan_item_refresh_timer; + virtual void OnPostScroll() override; int GetLineHeight(); int m_line_height; @@ -317,10 +291,16 @@ // Unit is byte/s. wxFileOffset GetCurrentSpeed(bool countDownload, bool countUpload); + virtual void OnEngineEvent(CFileZillaEngine* engine) override; + void DoOnEngineEvent(CFileZillaEngine* engine); + + void OnAskPassword(); + + std::weak_ptr m_actionAfterBlocker; + + virtual void OnStateChange(CState* pState, t_statechange_notifications notification, wxString const& data, const void* data2) override; + DECLARE_EVENT_TABLE() - void OnEngineEvent(wxFzEvent &event); - void OnFolderThreadComplete(wxCommandEvent& event); - void OnFolderThreadFiles(wxCommandEvent& event); void OnChar(wxKeyEvent& event); // Context menu handlers @@ -330,7 +310,6 @@ void OnRemoveSelected(wxCommandEvent& event); void OnSetDefaultFileExistsAction(wxCommandEvent& event); - void OnAskPassword(wxCommandEvent& event); void OnTimer(wxTimerEvent& evnet); void OnSetPriority(wxCommandEvent& event); @@ -341,6 +320,8 @@ void OnActionAfterTimerTick(); void OnSize(wxSizeEvent& event); + + void OnColumnClicked(wxListEvent &event); }; #endif diff -Nru filezilla-3.15.0.2/src/interface/queueview_successful.cpp filezilla-3.33.0/src/interface/queueview_successful.cpp --- filezilla-3.15.0.2/src/interface/queueview_successful.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/queueview_successful.cpp 2018-04-27 11:26:14.000000000 +0000 @@ -11,8 +11,7 @@ CQueueViewSuccessful::CQueueViewSuccessful(CQueue* parent, int index) : CQueueViewFailed(parent, index, _("Successful transfers")) { - std::list extraCols; - extraCols.push_back(colTime); + std::vector extraCols({colTime}); CreateColumns(extraCols); m_autoClear = COptions::Get()->GetOptionVal(OPTION_QUEUE_SUCCESSFUL_AUTOCLEAR) ? true : false; @@ -21,8 +20,9 @@ void CQueueViewSuccessful::OnContextMenu(wxContextMenuEvent&) { wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_QUEUE_SUCCESSFUL")); - if (!pMenu) + if (!pMenu) { return; + } bool has_selection = HasSelection(); diff -Nru filezilla-3.15.0.2/src/interface/queueview_successful.h filezilla-3.33.0/src/interface/queueview_successful.h --- filezilla-3.15.0.2/src/interface/queueview_successful.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/queueview_successful.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,9 +1,9 @@ -#ifndef __QUEUEVIEW_SUCCESSFUL_H__ -#define __QUEUEVIEW_SUCCESSFUL_H__ +#ifndef FILEZILLA_INTERFACE_QUEUEVIEW_SUCCESSFUL_HEADER +#define FILEZILLA_INTERFACE_QUEUEVIEW_SUCCESSFUL_HEADER #include "queueview_failed.h" -class CQueueViewSuccessful : public CQueueViewFailed +class CQueueViewSuccessful final : public CQueueViewFailed { public: CQueueViewSuccessful(CQueue* parent, int index); @@ -12,11 +12,11 @@ protected: - bool m_autoClear; + bool m_autoClear{}; DECLARE_EVENT_TABLE() void OnContextMenu(wxContextMenuEvent& event); void OnMenuAutoClear(wxCommandEvent& event); }; -#endif //__QUEUEVIEW_SUCCESSFUL_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/quickconnectbar.cpp filezilla-3.33.0/src/interface/quickconnectbar.cpp --- filezilla-3.15.0.2/src/interface/quickconnectbar.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/quickconnectbar.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -7,6 +7,10 @@ #include "loginmanager.h" #include "Mainfrm.h" #include "asksavepassworddialog.h" +#include "filezillaapp.h" + +#include +#include BEGIN_EVENT_TABLE(CQuickconnectBar, wxPanel) EVT_BUTTON(XRCID("ID_QUICKCONNECT_OK"), CQuickconnectBar::OnQuickconnect) @@ -24,36 +28,66 @@ { } -CQuickconnectBar::~CQuickconnectBar() -{ -} - bool CQuickconnectBar::Create(CMainFrame* pParent) { m_pMainFrame = pParent; - if (!wxXmlResource::Get()->LoadPanel(this, pParent, _T("ID_QUICKCONNECTBAR"))) - { - wxLogError(_("Cannot load Quickconnect bar from resource file")); + + if (!wxPanel::Create(pParent, XRCID("ID_QUICKCONNECT"))) { return false; } -#ifdef __WXMAC__ - // Under OS X default buttons are toplevel window wide, where under Windows / GTK they stop at the parent panel. - wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(pParent), wxTopLevelWindow); - if (tlw) - tlw->SetDefaultItem(0); + auto sizer = new wxBoxSizer(wxVERTICAL); + SetSizer(sizer); +#ifndef __WXMAC__ + sizer->Add(new wxStaticLine(this, -1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL), wxSizerFlags().Expand()); #endif + auto mainSizer = new wxFlexGridSizer(1, 0, 0, 5); + sizer->Add(mainSizer, wxSizerFlags().Border(wxALL, ConvertDialogToPixels(wxPoint(2, 0)).x)); - m_pHost = XRCCTRL(*this, "ID_QUICKCONNECT_HOST", wxTextCtrl); - m_pUser = XRCCTRL(*this, "ID_QUICKCONNECT_USER", wxTextCtrl); - m_pPass = XRCCTRL(*this, "ID_QUICKCONNECT_PASS", wxTextCtrl); - m_pPort = XRCCTRL(*this, "ID_QUICKCONNECT_PORT", wxTextCtrl); + mainSizer->Add(new wxStaticText(this, -1, _("&Host:")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); + m_pHost = new wxTextCtrl(this, -1, wxString(), wxDefaultPosition, ConvertDialogToPixels(wxSize(63, -1)), wxTE_PROCESS_ENTER); + m_pHost->SetToolTip(_("Enter the address of the server. To specify the server protocol, prepend the host with the protocol identifier. If no protocol is specified, the default protocol (ftp://) will be used. You can also enter complete URLs in the form protocol://user:pass@host:port here, the values in the other fields will be overwritten then.\n\nSupported protocols are:\n- ftp:// for normal FTP with optional encryption\n- sftp:// for SSH file transfer protocol\n- ftps:// for FTP over TLS (implicit)\n- ftpes:// for FTP over TLS (explicit)")); + mainSizer->Add(m_pHost, wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL).Border(wxRIGHT, 5)); + + mainSizer->Add(new wxStaticText(this, -1, _("&Username:")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); + m_pUser = new wxTextCtrl(this, -1, wxString(), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); + mainSizer->Add(m_pUser, wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL).Border(wxRIGHT, 5)); + + mainSizer->Add(new wxStaticText(this, -1, _("Pass&word:")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); + m_pPass = new wxTextCtrl(this, -1, wxString(), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER|wxTE_PASSWORD); + mainSizer->Add(m_pPass, wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL).Border(wxRIGHT, 5)); + + mainSizer->Add(new wxStaticText(this, -1, _("&Port:")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); + m_pPort = new wxTextCtrl(this, -1, wxString(), wxDefaultPosition, ConvertDialogToPixels(wxSize(27, -1)), wxTE_PROCESS_ENTER); + m_pPort->SetToolTip(_("Enter the port on which the server listens. The default for FTP is 21, the default for SFTP is 22.")); + m_pPort->SetMaxLength(5); + mainSizer->Add(m_pPort, wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL).Border(wxRIGHT, 5)); + + auto connectSizer = new wxBoxSizer(wxHORIZONTAL); + mainSizer->Add(connectSizer, wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); + auto connect = new wxButton(this, XRCID("ID_QUICKCONNECT_OK"), _("&Quickconnect")); + connect->SetDefault(); + connectSizer->Add(connect, wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); + + wxBitmap bmp(wxGetApp().GetResourceDir().GetPath() + _T("dropdown.png"), wxBITMAP_TYPE_PNG); + auto flags = wxSizerFlags().Expand(); +#if defined(__WXMSW__) + wxSize dropdownSize = ConvertDialogToPixels(wxSize(12, -1)); +#elif defined(__WXMAC__) + wxSize dropdownSize(20, -1); + flags.Border(wxLEFT, 6); +#else + wxSize dropdownSize(-1, -1); +#endif + connectSizer->Add(new wxBitmapButton(this, XRCID("ID_QUICKCONNECT_DROPDOWN"), bmp, wxDefaultPosition, dropdownSize, wxBU_AUTODRAW | wxBU_EXACTFIT), flags); - if (!m_pHost || !m_pUser || !m_pPass || !m_pPort) - { - wxLogError(_("Cannot load Quickconnect bar from resource file")); - return false; +#ifdef __WXMAC__ + // Under OS X default buttons are toplevel window wide, where under Windows / GTK they stop at the parent panel. + wxTopLevelWindow *tlw = dynamic_cast(wxGetTopLevelParent(pParent)); + if (tlw) { + tlw->SetDefaultItem(0); } +#endif return true; } @@ -61,24 +95,22 @@ void CQuickconnectBar::OnQuickconnect(wxCommandEvent& event) { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState || !pState->m_pEngine) - { + if (!pState || !pState->m_pEngine) { wxMessageBoxEx(_("FTP Engine not initialized, can't connect"), _("FileZilla Error"), wxICON_EXCLAMATION); return; } - wxString host = m_pHost->GetValue(); - wxString user = m_pUser->GetValue(); - wxString pass = m_pPass->GetValue(); - wxString port = m_pPort->GetValue(); + std::wstring host = m_pHost->GetValue().ToStdWstring(); + std::wstring user = m_pUser->GetValue().ToStdWstring(); + std::wstring pass = m_pPass->GetValue().ToStdWstring(); + std::wstring port = m_pPort->GetValue().ToStdWstring(); - CServer server; + ServerWithCredentials server; - wxString error; + std::wstring error; CServerPath path; - if (!server.ParseUrl(host, port, user, pass, error, path)) - { + if (!server.ParseUrl(host, port, user, pass, error, path)) { wxString msg = _("Could not parse server address:"); msg += _T("\n"); msg += error; @@ -86,55 +118,69 @@ return; } - host = server.FormatHost(true); - ServerProtocol protocol = server.GetProtocol(); + host = server.Format(ServerFormat::host_only); + ServerProtocol protocol = server.server.GetProtocol(); switch (protocol) { case FTP: case UNKNOWN: - if (CServer::GetProtocolFromPort(server.GetPort()) != FTP && - CServer::GetProtocolFromPort(server.GetPort()) != UNKNOWN) + if (CServer::GetProtocolFromPort(server.server.GetPort()) != FTP && + CServer::GetProtocolFromPort(server.server.GetPort()) != UNKNOWN) + { host = _T("ftp://") + host; + } break; default: { - const wxString prefix = server.GetPrefixFromProtocol(protocol); - if (!prefix.empty()) + const wxString prefix = server.server.GetPrefixFromProtocol(protocol); + if (!prefix.empty()) { host = prefix + _T("://") + host; + } } break; } m_pHost->SetValue(host); - if (server.GetPort() != server.GetDefaultPort(server.GetProtocol())) - m_pPort->SetValue(wxString::Format(_T("%d"), server.GetPort())); - else - m_pPort->SetValue(_T("")); - - m_pUser->SetValue(server.GetUser()); - if (server.GetLogonType() != ANONYMOUS) - m_pPass->SetValue(server.GetPass()); - else - m_pPass->SetValue(_T("")); + if (server.server.GetPort() != server.server.GetDefaultPort(server.server.GetProtocol())) { + m_pPort->SetValue(wxString::Format(_T("%d"), server.server.GetPort())); + } + else { + m_pPort->ChangeValue(wxString()); + } - if (protocol == HTTP || protocol == HTTPS) { + m_pUser->SetValue(server.server.GetUser()); + if (server.credentials.logonType_ != LogonType::anonymous) { + m_pPass->SetValue(server.credentials.GetPass()); + } + else { + m_pPass->ChangeValue(wxString()); + } + + if (protocol == HTTP || protocol == HTTPS || protocol == S3) { wxString protocolError = _("Invalid protocol specified. Valid protocols are:\nftp:// for normal FTP with optional encryption,\nsftp:// for SSH file transfer protocol,\nftps:// for FTP over TLS (implicit) and\nftpes:// for FTP over TLS (explicit)."); wxMessageBoxEx(protocolError, _("Syntax error"), wxICON_EXCLAMATION); return; } - if (event.GetId() == 1) - server.SetBypassProxy(true); + if (event.GetId() == 1) { + server.server.SetBypassProxy(true); + } - if (server.GetLogonType() != ANONYMOUS && !CAskSavePasswordDialog::Run(this)) + if (server.credentials.logonType_ != LogonType::anonymous && !CAskSavePasswordDialog::Run(this)) { return; + } - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) && server.GetLogonType() == NORMAL) { - server.SetLogonType(ASK); + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) && server.credentials.logonType_ == LogonType::normal) { + server.SetLogonType(LogonType::ask); CLoginManager::Get().RememberPassword(server); } - if (!m_pMainFrame->ConnectToServer(server, path)) + Site site; + site.server_ = server; + Bookmark bm; + bm.m_remoteDir = path; + if (!m_pMainFrame->ConnectToSite(site, bm)) { return; + } CRecentServerList::SetMostRecentServer(server); } @@ -144,28 +190,29 @@ wxMenu* pMenu = new wxMenu; // We have to start with id 1 since menu items with id 0 don't work under OS X - if (COptions::Get()->GetOptionVal(OPTION_FTP_PROXY_TYPE)) + if (COptions::Get()->GetOptionVal(OPTION_FTP_PROXY_TYPE)) { pMenu->Append(1, _("Connect bypassing proxy settings")); + } pMenu->Append(2, _("Clear quickconnect bar")); pMenu->Append(3, _("Clear history")); m_recentServers = CRecentServerList::GetMostRecentServers(); - if (!m_recentServers.empty()) - { + if (!m_recentServers.empty()) { pMenu->AppendSeparator(); unsigned int i = 0; - for (std::list::const_iterator iter = m_recentServers.begin(); + for (auto iter = m_recentServers.cbegin(); iter != m_recentServers.end(); ++iter, ++i) { - wxString name(iter->FormatServer()); + wxString name(iter->Format(ServerFormat::with_user_and_optional_port)); name.Replace(_T("&"), _T("&&")); pMenu->Append(10 + i, name); } } - else + else { pMenu->Enable(3, false); + } XRCCTRL(*this, "ID_QUICKCONNECT_DROPDOWN", wxButton)->PopupMenu(pMenu); delete pMenu; @@ -175,37 +222,31 @@ void CQuickconnectBar::OnMenu(wxCommandEvent& event) { const int id = event.GetId(); - if (id == 1) + if (id == 1) { OnQuickconnect(event); - else if (id == 2) + } + else if (id == 2) { ClearFields(); - else if (id == 3) + } + else if (id == 3) { CRecentServerList::Clear(); + } - if (id < 10) + if (id < 10) { return; + } unsigned int index = id - 10; - if (index >= m_recentServers.size()) + if (index >= m_recentServers.size()) { return; - - std::list::const_iterator iter = m_recentServers.begin(); - std::advance(iter, index); - - CServer server = *iter; - if (server.GetLogonType() == ASK) { - if (!CLoginManager::Get().GetPassword(server, false)) - return; } - CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState || !pState->m_pEngine) - { - wxMessageBoxEx(_("FTP Engine not initialized, can't connect"), _("FileZilla Error"), wxICON_EXCLAMATION); - return; - } + auto iter = m_recentServers.cbegin(); + std::advance(iter, index); - m_pMainFrame->ConnectToServer(server); + Site site; + site.server_ = *iter; + m_pMainFrame->ConnectToSite(site, Bookmark()); } void CQuickconnectBar::ClearFields() diff -Nru filezilla-3.15.0.2/src/interface/quickconnectbar.h filezilla-3.33.0/src/interface/quickconnectbar.h --- filezilla-3.15.0.2/src/interface/quickconnectbar.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/quickconnectbar.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,12 +1,13 @@ -#ifndef __QUICKCONNECTBAR_H__ -#define __QUICKCONNECTBAR_H__ +#ifndef FILEZILLA_INTERFACE_QUICKCONNECTBAR_HEADER +#define FILEZILLA_INTERFACE_QUICKCONNECTBAR_HEADER + +#include "serverdata.h" class CMainFrame; class CQuickconnectBar final : public wxPanel { public: CQuickconnectBar(); - virtual ~CQuickconnectBar(); bool Create(CMainFrame* pParent); @@ -14,7 +15,7 @@ protected: // Only valid while menu is being displayed - std::list m_recentServers; + std::deque m_recentServers; DECLARE_EVENT_TABLE() void OnQuickconnect(wxCommandEvent& event); @@ -30,4 +31,4 @@ }; -#endif //__QUICKCONNECTBAR_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/recentserverlist.cpp filezilla-3.33.0/src/interface/recentserverlist.cpp --- filezilla-3.15.0.2/src/interface/recentserverlist.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/recentserverlist.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -5,23 +5,25 @@ #include "Options.h" #include "xmlfunctions.h" -const std::list CRecentServerList::GetMostRecentServers(bool lockMutex /*=true*/) +const std::deque CRecentServerList::GetMostRecentServers(bool lockMutex) { - std::list mostRecentServers; + std::deque mostRecentServers; CInterProcessMutex mutex(MUTEX_MOSTRECENTSERVERS, false); - if (lockMutex) + if (lockMutex) { mutex.Lock(); + } CXmlFile xmlFile(wxGetApp().GetSettingsFile(_T("recentservers"))); auto element = xmlFile.Load(); - if (!element || !(element = element.child("RecentServers"))) + if (!element || !(element = element.child("RecentServers"))) { return mostRecentServers; + } bool modified = false; auto xServer = element.child("Server"); while (xServer) { - CServer server; + ServerWithCredentials server; if (!GetServer(xServer, server) || mostRecentServers.size() >= 10) { auto xRemove = xServer; xServer = xServer.next_sibling("Server"); @@ -29,13 +31,15 @@ modified = true; } else { - std::list::const_iterator iter; + std::deque::const_iterator iter; for (iter = mostRecentServers.begin(); iter != mostRecentServers.end(); ++iter) { - if (*iter == server) + if (*iter == server) { break; + } } - if (iter == mostRecentServers.end()) + if (iter == mostRecentServers.end()) { mostRecentServers.push_back(server); + } xServer = xServer.next_sibling("Server"); } } @@ -47,7 +51,7 @@ return mostRecentServers; } -void CRecentServerList::SetMostRecentServer(const CServer& server) +void CRecentServerList::SetMostRecentServer(ServerWithCredentials const& server) { CInterProcessMutex mutex(MUTEX_MOSTRECENTSERVERS); @@ -56,7 +60,7 @@ bool relocated = false; for (auto iter = mostRecentServers.begin(); iter != mostRecentServers.end(); ++iter) { - if (iter->EqualsNoPass(server)) { + if (iter->server == server.server) { mostRecentServers.erase(iter); mostRecentServers.push_front(server); relocated = true; @@ -65,26 +69,43 @@ } if (!relocated) { mostRecentServers.push_front(server); - if (mostRecentServers.size() > 10) + if (mostRecentServers.size() > 10) { mostRecentServers.pop_back(); + } + } + + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { + return; + } + + SetMostRecentServers(mostRecentServers, false); +} + +void CRecentServerList::SetMostRecentServers(std::deque const& servers, bool lockMutex) +{ + CInterProcessMutex mutex(MUTEX_MOSTRECENTSERVERS, false); + if (lockMutex) { + mutex.Lock(); } - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { return; + } CXmlFile xmlFile(wxGetApp().GetSettingsFile(_T("recentservers"))); auto element = xmlFile.CreateEmpty(); - if (!element) + if (!element) { return; + } - auto servers = element.child("RecentServers"); - if (!servers) { - servers = element.append_child("RecentServers"); + auto serversNode = element.child("RecentServers"); + if (!serversNode) { + serversNode = element.append_child("RecentServers"); } - for (std::list::const_iterator iter = mostRecentServers.begin(); iter != mostRecentServers.end(); ++iter) { - auto server = servers.append_child("Server"); - SetServer(server, *iter); + for (auto const& server : servers) { + auto node = serversNode.append_child("Server"); + SetServer(node, server); } xmlFile.Save(true); diff -Nru filezilla-3.15.0.2/src/interface/recentserverlist.h filezilla-3.33.0/src/interface/recentserverlist.h --- filezilla-3.15.0.2/src/interface/recentserverlist.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/recentserverlist.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,14 +1,17 @@ -#ifndef __RECENTSERVERLIST_H__ -#define __RECENTSERVERLIST_H__ +#ifndef FILEZILLA_INTERFACE_RECENTSERVERLIST_HEADER +#define FILEZILLA_INTERFACE_RECENTSERVERLIST_HEADER #include "xmlfunctions.h" +#include + class CRecentServerList { public: - static void SetMostRecentServer(const CServer& server); - static const std::list GetMostRecentServers(bool lockMutex = true); + static void SetMostRecentServer(ServerWithCredentials const& server); + static void SetMostRecentServers(std::deque const& servers, bool lockMutex = true); + static const std::deque GetMostRecentServers(bool lockMutex = true); static void Clear(); }; -#endif //__RECENTSERVERLIST_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/recursive_operation.cpp filezilla-3.33.0/src/interface/recursive_operation.cpp --- filezilla-3.15.0.2/src/interface/recursive_operation.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/recursive_operation.cpp 2016-08-23 12:41:55.000000000 +0000 @@ -1,442 +1,17 @@ #include #include "recursive_operation.h" -#include "commandqueue.h" -#include "chmoddialog.h" -#include "filter.h" -#include "Options.h" -#include "queue.h" -recursion_root::recursion_root(CServerPath const& start_dir, bool allow_parent) - : m_startDir(start_dir) - , m_allowParent(allow_parent) -{ - wxASSERT_MSG(!start_dir.empty(), _T("Empty startDir in recursion_root constructor")); -} - -void recursion_root::add_dir_to_visit(CServerPath const& path, wxString const& subdir, CLocalPath const& localDir, bool is_link) -{ - new_dir dirToVisit; - - dirToVisit.localDir = localDir; - dirToVisit.parent = path; - dirToVisit.subdir = subdir; - dirToVisit.link = is_link ? 2 : 0; - m_dirsToVisit.push_back(dirToVisit); -} - -void recursion_root::add_dir_to_visit_restricted(CServerPath const& path, wxString const& restrict, bool recurse) -{ - new_dir dirToVisit; - dirToVisit.parent = path; - dirToVisit.recurse = recurse; - if (!restrict.empty()) { - dirToVisit.restrict = CSparseOptional(restrict); - } - m_dirsToVisit.push_back(dirToVisit); -} - - - -CRecursiveOperation::CRecursiveOperation(CState* pState) - : CStateEventHandler(pState), - m_operationMode(recursive_none) -{ - pState->RegisterHandler(this, STATECHANGE_REMOTE_DIR_OTHER); - pState->RegisterHandler(this, STATECHANGE_REMOTE_LINKNOTDIR); -} - -CRecursiveOperation::~CRecursiveOperation() -{ - if (m_pChmodDlg) - { - m_pChmodDlg->Destroy(); - m_pChmodDlg = 0; - } -} - -void CRecursiveOperation::OnStateChange(CState*, enum t_statechange_notifications notification, const wxString&, const void* data2) -{ - if (notification == STATECHANGE_REMOTE_DIR_OTHER && data2) { - std::shared_ptr const& listing = *reinterpret_cast const*>(data2); - ProcessDirectoryListing(listing.get()); - } - else if (notification == STATECHANGE_REMOTE_LINKNOTDIR) { - wxASSERT(data2); - LinkIsNotDir(); - } -} - -void CRecursiveOperation::AddRecursionRoot(recursion_root && root) -{ - if (!root.empty()) { - recursion_roots_.push_back(std::forward(root)); - } -} - -void CRecursiveOperation::StartRecursiveOperation(OperationMode mode, std::vector const& filters, CServerPath const& finalDir) -{ - wxCHECK_RET(m_operationMode == recursive_none, _T("StartRecursiveOperation called with m_operationMode != recursive_none")); - wxCHECK_RET(m_pState->IsRemoteConnected(), _T("StartRecursiveOperation while disconnected")); - wxCHECK_RET(!finalDir.empty(), _T("Empty final dir in recursive operation")); - - if (mode == recursive_chmod && !m_pChmodDlg) - return; - - if ((mode == recursive_download || mode == recursive_addtoqueue || mode == recursive_download_flatten || mode == recursive_addtoqueue_flatten) && !m_pQueue) - return; - - if (recursion_roots_.empty()) { - // Nothing to do in this case - return; - } - - m_processedFiles = 0; - m_processedDirectories = 0; - - m_operationMode = mode; - m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); - m_pState->NotifyHandlers(STATECHANGE_RECURSION_STATUS); - - m_filters = filters; - - NextOperation(); -} - -bool CRecursiveOperation::NextOperation() -{ - if (m_operationMode == recursive_none) - return false; - - while (!recursion_roots_.empty()) { - auto & root = recursion_roots_.front(); - while (!root.m_dirsToVisit.empty()) { - const recursion_root::new_dir& dirToVisit = root.m_dirsToVisit.front(); - if (m_operationMode == recursive_delete && !dirToVisit.doVisit) { - m_pState->m_pCommandQueue->ProcessCommand(new CRemoveDirCommand(dirToVisit.parent, dirToVisit.subdir), CCommandQueue::recursiveOperation); - root.m_dirsToVisit.pop_front(); - continue; - } - - CListCommand* cmd = new CListCommand(dirToVisit.parent, dirToVisit.subdir, dirToVisit.link ? LIST_FLAG_LINK : 0); - m_pState->m_pCommandQueue->ProcessCommand(cmd, CCommandQueue::recursiveOperation); - return true; - } - - recursion_roots_.pop_front(); - } - - if (m_operationMode == recursive_delete && !m_finalDir.empty()) { - // After a deletion we cannot refresh if inside the deleted directories. Navigate user out if it - auto curPath = m_pState->GetRemotePath(); - if (!curPath.empty() && (curPath == m_finalDir || m_finalDir.IsParentOf(curPath, false))) { - StopRecursiveOperation(); - m_pState->ChangeRemoteDir(m_finalDir, wxString(), LIST_FLAG_REFRESH); - return false; - } - } - - StopRecursiveOperation(); - m_pState->RefreshRemote(); - return false; -} - -bool CRecursiveOperation::BelowRecursionRoot(const CServerPath& path, recursion_root::new_dir &dir) -{ - if (!dir.start_dir.empty()) { - if (path.IsSubdirOf(dir.start_dir, false)) - return true; - else - return false; - } - - auto & root = recursion_roots_.front(); - if (path.IsSubdirOf(root.m_startDir, false)) - return true; - - // In some cases (chmod from tree for example) it is neccessary to list the - // parent first - if (path == root.m_startDir && root.m_allowParent) - return true; - - if (dir.link == 2) { - dir.start_dir = path; - return true; - } - - return false; -} - -// Defined in RemoteListView.cpp -extern wxString StripVMSRevision(const wxString& name); - -void CRecursiveOperation::ProcessDirectoryListing(const CDirectoryListing* pDirectoryListing) -{ - if (!pDirectoryListing) { - StopRecursiveOperation(); - return; - } - - if (m_operationMode == recursive_none || recursion_roots_.empty()) - return; - - if (pDirectoryListing->failed()) { - // Ignore this. - // It will get handled by the failed command in ListingFailed - return; - } - - auto & root = recursion_roots_.front(); - wxASSERT(!root.m_dirsToVisit.empty()); - - if (!m_pState->IsRemoteConnected() || root.m_dirsToVisit.empty()) { - StopRecursiveOperation(); - return; - } - - recursion_root::new_dir dir = root.m_dirsToVisit.front(); - root.m_dirsToVisit.pop_front(); - - if (!BelowRecursionRoot(pDirectoryListing->path, dir)) { - NextOperation(); - return; - } - - if (m_operationMode == recursive_delete && dir.doVisit && !dir.subdir.empty()) { - // After recursing into directory to delete its contents, delete directory itself - // Gets handled in NextOperation - recursion_root::new_dir dir2 = dir; - dir2.doVisit = false; - root.m_dirsToVisit.push_front(dir2); - } - - if (dir.link && !dir.recurse) { - NextOperation(); - return; - } - - // Check if we have already visited the directory - if (!root.m_visitedDirs.insert(pDirectoryListing->path).second) { - NextOperation(); - return; - } - - ++m_processedDirectories; - - const CServer* pServer = m_pState->GetServer(); - wxASSERT(pServer); - - if (!pDirectoryListing->GetCount()) { - if (m_operationMode == recursive_download) { - wxFileName::Mkdir(dir.localDir.GetPath(), 0777, wxPATH_MKDIR_FULL); - m_pState->RefreshLocalFile(dir.localDir.GetPath()); - } - else if (m_operationMode == recursive_addtoqueue) { - m_pQueue->QueueFile(true, true, _T(""), _T(""), dir.localDir, CServerPath(), *pServer, -1); - m_pQueue->QueueFile_Finish(false); - } - } - - CFilterManager filter; - - // Is operation restricted to a single child? - bool const restrict = static_cast(dir.restrict); - - std::deque filesToDelete; - - const wxString path = pDirectoryListing->path.GetPath(); - - bool added = false; - - for (int i = pDirectoryListing->GetCount() - 1; i >= 0; --i) { - const CDirentry& entry = (*pDirectoryListing)[i]; - - if (restrict) { - if (entry.name != *dir.restrict) - continue; - } - else if (filter.FilenameFiltered(m_filters, entry.name, path, entry.is_dir(), entry.size, 0, entry.time)) - continue; - - if (!entry.is_dir()) { - ++m_processedFiles; - } - - if (entry.is_dir() && (!entry.is_link() || m_operationMode != recursive_delete)) { - if (dir.recurse) { - recursion_root::new_dir dirToVisit; - dirToVisit.parent = pDirectoryListing->path; - dirToVisit.subdir = entry.name; - dirToVisit.localDir = dir.localDir; - dirToVisit.start_dir = dir.start_dir; - - if (m_operationMode == recursive_download || m_operationMode == recursive_addtoqueue) - dirToVisit.localDir.AddSegment(CQueueView::ReplaceInvalidCharacters(entry.name)); - if (entry.is_link()) { - dirToVisit.link = 1; - dirToVisit.recurse = false; - } - root.m_dirsToVisit.push_front(dirToVisit); - } - } - else { - switch (m_operationMode) - { - case recursive_download: - case recursive_download_flatten: - { - wxString localFile = CQueueView::ReplaceInvalidCharacters(entry.name); - if (pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) - localFile = StripVMSRevision(localFile); - m_pQueue->QueueFile(m_operationMode == recursive_addtoqueue, true, - entry.name, (entry.name == localFile) ? wxString() : localFile, - dir.localDir, pDirectoryListing->path, *pServer, entry.size); - added = true; - } - break; - case recursive_addtoqueue: - case recursive_addtoqueue_flatten: - { - wxString localFile = CQueueView::ReplaceInvalidCharacters(entry.name); - if (pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) - localFile = StripVMSRevision(localFile); - m_pQueue->QueueFile(true, true, - entry.name, (entry.name == localFile) ? wxString() : localFile, - dir.localDir, pDirectoryListing->path, *pServer, entry.size); - added = true; - } - break; - case recursive_delete: - filesToDelete.push_back(entry.name); - break; - default: - break; - } - } - - if (m_operationMode == recursive_chmod && m_pChmodDlg) { - const int applyType = m_pChmodDlg->GetApplyType(); - if (!applyType || - (!entry.is_dir() && applyType == 1) || - (entry.is_dir() && applyType == 2)) - { - char permissions[9]; - bool res = m_pChmodDlg->ConvertPermissions(*entry.permissions, permissions); - wxString newPerms = m_pChmodDlg->GetPermissions(res ? permissions : 0, entry.is_dir()); - m_pState->m_pCommandQueue->ProcessCommand(new CChmodCommand(pDirectoryListing->path, entry.name, newPerms), CCommandQueue::recursiveOperation); - } - } - } - if (added) - m_pQueue->QueueFile_Finish(m_operationMode != recursive_addtoqueue && m_operationMode != recursive_addtoqueue_flatten); - - if (m_operationMode == recursive_delete && !filesToDelete.empty()) - m_pState->m_pCommandQueue->ProcessCommand(new CDeleteCommand(pDirectoryListing->path, std::move(filesToDelete)), CCommandQueue::recursiveOperation); - - m_pState->NotifyHandlers(STATECHANGE_RECURSION_STATUS); - - NextOperation(); -} - -void CRecursiveOperation::SetChmodDialog(CChmodDialog* pChmodDialog) -{ - wxASSERT(pChmodDialog); - - if (m_pChmodDlg) - m_pChmodDlg->Destroy(); - - m_pChmodDlg = pChmodDialog; -} - -void CRecursiveOperation::StopRecursiveOperation() -{ - if (m_operationMode != recursive_none) { - m_operationMode = recursive_none; - m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); - m_pState->NotifyHandlers(STATECHANGE_RECURSION_STATUS); - } - recursion_roots_.clear(); - - if (m_pChmodDlg) { - m_pChmodDlg->Destroy(); - m_pChmodDlg = 0; - } -} - -void CRecursiveOperation::ListingFailed(int error) -{ - if (m_operationMode == recursive_none || recursion_roots_.empty()) - return; - - if( (error & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { - // User has cancelled operation - StopRecursiveOperation(); - return; - } - - auto & root = recursion_roots_.front(); - wxCHECK_RET(!root.m_dirsToVisit.empty(), _T("Empty dirs to visit")); - - recursion_root::new_dir dir = root.m_dirsToVisit.front(); - root.m_dirsToVisit.pop_front(); - if ((error & FZ_REPLY_CRITICALERROR) != FZ_REPLY_CRITICALERROR && !dir.second_try) { - // Retry, could have been a temporary socket creating failure - // (e.g. hitting a blocked port) or a disconnect (e.g. no-filetransfer-timeout) - dir.second_try = true; - root.m_dirsToVisit.push_front(dir); - } - - NextOperation(); -} - -void CRecursiveOperation::SetQueue(CQueueView* pQueue) +void CRecursiveOperation::SetQueue(CQueueView * pQueue) { m_pQueue = pQueue; } -bool CRecursiveOperation::ChangeOperationMode(enum OperationMode mode) +void CRecursiveOperation::SetImmediate(bool immediate) { - if (mode != recursive_addtoqueue && m_operationMode != recursive_download && mode != recursive_addtoqueue_flatten && m_operationMode != recursive_download_flatten) - return false; - - m_operationMode = mode; - - return true; -} - -void CRecursiveOperation::LinkIsNotDir() -{ - if (m_operationMode == recursive_none || recursion_roots_.empty()) - return; - - auto & root = recursion_roots_.front(); - wxCHECK_RET(!root.m_dirsToVisit.empty(), _T("Empty dirs to visit")); - - recursion_root::new_dir dir = root.m_dirsToVisit.front(); - root.m_dirsToVisit.pop_front(); - - const CServer* pServer = m_pState->GetServer(); - if (!pServer) { - NextOperation(); - return; - } - - if (m_operationMode == recursive_delete) { - if (!dir.subdir.empty()) { - std::deque files; - files.push_back(dir.subdir); - m_pState->m_pCommandQueue->ProcessCommand(new CDeleteCommand(dir.parent, std::move(files)), CCommandQueue::recursiveOperation); + if (m_operationMode == recursive_transfer || m_operationMode == recursive_transfer_flatten) { + m_immediate = immediate; + if (!immediate) { + m_actionAfterBlocker.reset(); } - NextOperation(); - return; } - else if (m_operationMode != recursive_list) { - CLocalPath localPath = dir.localDir; - wxString localFile = dir.subdir; - if (m_operationMode != recursive_addtoqueue_flatten && m_operationMode != recursive_download_flatten) - localPath.MakeParent(); - m_pQueue->QueueFile(m_operationMode == recursive_addtoqueue || m_operationMode == recursive_addtoqueue_flatten, true, dir.subdir, (dir.subdir == localFile) ? wxString() : localFile, localPath, dir.parent, *pServer, -1); - m_pQueue->QueueFile_Finish(m_operationMode != recursive_addtoqueue); - } - - NextOperation(); } diff -Nru filezilla-3.15.0.2/src/interface/recursive_operation.h filezilla-3.33.0/src/interface/recursive_operation.h --- filezilla-3.15.0.2/src/interface/recursive_operation.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/recursive_operation.h 2017-01-09 16:00:55.000000000 +0000 @@ -1,121 +1,56 @@ -#ifndef __RECURSIVE_OPERATION_H__ -#define __RECURSIVE_OPERATION_H__ +#ifndef FILEZILLA_RECURSIVE_OPERATION_HEADER +#define FILEZILLA_RECURSIVE_OPERATION_HEADER -#include "state.h" -#include #include "filter.h" -#include +#include "state.h" -class CChmodDialog; +class CActionAfterBlocker; class CQueueView; - -class recursion_root final +class CRecursiveOperation : public CStateEventHandler { public: - recursion_root() = default; - recursion_root(CServerPath const& start_dir, bool allow_parent); - - void add_dir_to_visit(CServerPath const& path, wxString const& subdir, CLocalPath const& localDir = CLocalPath(), bool is_link = false); - void add_dir_to_visit_restricted(CServerPath const& path, wxString const& restrict, bool recurse); + CRecursiveOperation(CState& state) + : CStateEventHandler(state) + , m_operationMode(recursive_none) + {} - bool empty() const { return m_dirsToVisit.empty(); } + virtual ~CRecursiveOperation() = default; -private: - friend class CRecursiveOperation; - - class new_dir final - { - public: - CServerPath parent; - wxString subdir; - CLocalPath localDir; - CSparseOptional restrict; - - // Symlink target might be outside actual start dir. Yet - // sometimes user wants to download symlink target contents - CServerPath start_dir; - - // 0 = not a link - // 1 = link, added by class during the operation - // 2 = link, added by user of class - int link{}; - - bool doVisit{ true }; - bool recurse{ true }; - bool second_try{}; - }; - - CServerPath m_startDir; - std::set m_visitedDirs; - std::deque m_dirsToVisit; - bool m_allowParent{}; -}; - -class CRecursiveOperation final : public CStateEventHandler -{ -public: - CRecursiveOperation(CState* pState); - ~CRecursiveOperation(); - - enum OperationMode - { + enum OperationMode { recursive_none, - recursive_download, - recursive_addtoqueue, - recursive_download_flatten, - recursive_addtoqueue_flatten, + recursive_transfer, + recursive_transfer_flatten, recursive_delete, recursive_chmod, - recursive_list + recursive_list, + recursive_synchronize_download, + recursive_synchronize_upload }; - void AddRecursionRoot(recursion_root && root); - void StartRecursiveOperation(OperationMode mode, std::vector const& filters, CServerPath const& finalDir); - - void StopRecursiveOperation(); - bool IsActive() const { return GetOperationMode() != recursive_none; } OperationMode GetOperationMode() const { return m_operationMode; } int64_t GetProcessedFiles() const { return m_processedFiles; } int64_t GetProcessedDirectories() const { return m_processedDirectories; } - // Needed for recursive_chmod - void SetChmodDialog(CChmodDialog* pChmodDialog); + uint64_t m_processedFiles{}; + uint64_t m_processedDirectories{}; + + virtual void StopRecursiveOperation() = 0; void SetQueue(CQueueView* pQueue); - bool ChangeOperationMode(OperationMode mode); + void SetImmediate(bool immediate); protected: - void LinkIsNotDir(); - void ListingFailed(int error); - - // Processes the directory listing in case of a recursive operation - void ProcessDirectoryListing(const CDirectoryListing* pDirectoryListing); - - bool NextOperation(); - - virtual void OnStateChange(CState* pState, t_statechange_notifications notification, const wxString&, const void* data2); + bool m_immediate{true}; OperationMode m_operationMode; - bool BelowRecursionRoot(const CServerPath& path, recursion_root::new_dir &dir); - - std::deque recursion_roots_; - - CServerPath m_finalDir; - - // Needed for recursive_chmod - CChmodDialog* m_pChmodDlg{}; - CQueueView* m_pQueue{}; - std::vector m_filters; + ActiveFilters m_filters; - friend class CCommandQueue; - - uint64_t m_processedFiles{}; - uint64_t m_processedDirectories{}; + std::shared_ptr m_actionAfterBlocker; }; -#endif //__RECURSIVE_OPERATION_H__ +#endif \ No newline at end of file diff -Nru filezilla-3.15.0.2/src/interface/recursive_operation_status.cpp filezilla-3.33.0/src/interface/recursive_operation_status.cpp --- filezilla-3.15.0.2/src/interface/recursive_operation_status.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/recursive_operation_status.cpp 2016-11-27 04:30:02.000000000 +0000 @@ -1,7 +1,8 @@ #include #include "recursive_operation_status.h" -#include "recursive_operation.h" +#include "local_recursive_operation.h" +#include "remote_recursive_operation.h" #include "themeprovider.h" #include @@ -13,14 +14,15 @@ EVT_TIMER(wxID_ANY, CRecursiveOperationStatus::OnTimer) END_EVENT_TABLE() -CRecursiveOperationStatus::CRecursiveOperationStatus(wxWindow* parent, CState* pState) +CRecursiveOperationStatus::CRecursiveOperationStatus(wxWindow* parent, CState& state, bool local) : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) - , CStateEventHandler(pState) + , CStateEventHandler(state) + , m_local(local) { Hide(); SetBackgroundStyle(wxBG_STYLE_SYSTEM); - m_pState->RegisterHandler(this, STATECHANGE_RECURSION_STATUS); + m_state.RegisterHandler(this, local ? STATECHANGE_LOCAL_RECURSION_STATUS : STATECHANGE_REMOTE_RECURSION_STATUS); m_pTextCtrl[0] = new wxStaticText(this, wxID_ANY, _T("Recursive operation in progress"), wxPoint(10, 10)); m_pTextCtrl[1] = new wxStaticText(this, wxID_ANY, _T("Recursive operation in progress"), wxPoint(10, 20)); @@ -33,8 +35,9 @@ SetSize(size); // Position stop button - wxBitmap bmp = CThemeProvider::Get()->GetBitmap(_T("ART_CANCEL"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); - wxSize s = bmp.GetSize(); + wxBitmap bmp = CThemeProvider::Get()->CreateBitmap(_T("ART_CANCEL"), wxART_OTHER, CThemeProvider::GetIconSize(iconSize24, false)); + wxSize s = bmp.GetScaledSize(); + s.IncBy(2); s.IncBy(s.GetHeight() / 2); auto button = new wxBitmapButton(this, wxID_ANY, bmp, wxPoint(10, (size.GetHeight() - s.GetHeight()) / 2), s); button->SetToolTip(_("Stop recursive operation")); @@ -57,9 +60,14 @@ return ret; } -void CRecursiveOperationStatus::OnStateChange(CState*, enum t_statechange_notifications, const wxString&, const void*) +void CRecursiveOperationStatus::OnStateChange(t_statechange_notifications, const wxString&, const void*) { - auto const mode = m_pState->GetRecursiveOperationHandler()->GetOperationMode(); + CRecursiveOperation* op = m_local ? static_cast(m_state.GetLocalRecursiveOperation()) : static_cast(m_state.GetRemoteRecursiveOperation()); + auto mode = CRecursiveOperation::recursive_none; + if (op) { + mode = op->GetOperationMode(); + } + bool show = mode != CRecursiveOperation::recursive_none && mode != CRecursiveOperation::recursive_list; if (IsShown() != show) { Show(show); @@ -78,17 +86,17 @@ void CRecursiveOperationStatus::UpdateText() { + CRecursiveOperation* operation = m_local ? static_cast(m_state.GetLocalRecursiveOperation()) : static_cast(m_state.GetRemoteRecursiveOperation()); + m_changed = false; wxString text; - auto const mode = m_pState->GetRecursiveOperationHandler()->GetOperationMode(); + auto const mode = operation->GetOperationMode(); bool show = mode != CRecursiveOperation::recursive_none && mode != CRecursiveOperation::recursive_list; if (show) { switch (mode) { - case CRecursiveOperation::recursive_addtoqueue: - case CRecursiveOperation::recursive_addtoqueue_flatten: - case CRecursiveOperation::recursive_download: - case CRecursiveOperation::recursive_download_flatten: + case CRecursiveOperation::recursive_transfer: + case CRecursiveOperation::recursive_transfer_flatten: text = _("Recursively adding files to queue."); break; case CRecursiveOperation::recursive_delete: @@ -97,15 +105,19 @@ case CRecursiveOperation::recursive_chmod: text = _("Recursively changing permissions."); break; + case CRecursiveOperation::recursive_synchronize_download: + case CRecursiveOperation::recursive_synchronize_upload: + text = _("Synchronizing directories."); + break; default: break; } m_pTextCtrl[0]->SetLabel(text); - unsigned long long const countFiles = static_cast(m_pState->GetRecursiveOperationHandler()->GetProcessedFiles()); - unsigned long long const countDirs = static_cast(m_pState->GetRecursiveOperationHandler()->GetProcessedDirectories()); - const wxString files = wxString::Format(wxPLURAL_LL("%llu file", "%llu files", countFiles), countFiles); - const wxString dirs = wxString::Format(wxPLURAL_LL("%llu directory", "%llu directories", countDirs), countDirs); + unsigned long long const countFiles = static_cast(operation->GetProcessedFiles()); + unsigned long long const countDirs = static_cast(operation->GetProcessedDirectories()); + std::wstring const files = fz::sprintf(fztranslate("%llu file", "%llu files", countFiles), countFiles); + std::wstring const dirs = fz::sprintf(fztranslate("%llu directory", "%llu directories", countDirs), countDirs); // @translator: Example: Processed 5 files in 1 directory m_pTextCtrl[1]->SetLabel(wxString::Format(_("Processed %s in %s."), files, dirs)); } @@ -122,8 +134,13 @@ void CRecursiveOperationStatus::OnCancel(wxCommandEvent&) { - m_pState->GetRecursiveOperationHandler()->StopRecursiveOperation(); - m_pState->RefreshRemote(); + if (m_local) { + m_state.GetLocalRecursiveOperation()->StopRecursiveOperation(); + } + else { + m_state.GetRemoteRecursiveOperation()->StopRecursiveOperation(); + m_state.RefreshRemote(); + } } void CRecursiveOperationStatus::OnTimer(wxTimerEvent&) diff -Nru filezilla-3.15.0.2/src/interface/recursive_operation_status.h filezilla-3.33.0/src/interface/recursive_operation_status.h --- filezilla-3.15.0.2/src/interface/recursive_operation_status.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/recursive_operation_status.h 2016-04-19 15:50:31.000000000 +0000 @@ -5,15 +5,16 @@ #include -class CRecursiveOperationStatus : public wxWindow, public CStateEventHandler +class CRecursiveOperationStatus final : public wxWindow, public CStateEventHandler { public: - CRecursiveOperationStatus(wxWindow* pParent, CState* pState); + CRecursiveOperationStatus(wxWindow* pParent, CState& state, bool local); -protected: + CRecursiveOperationStatus(CRecursiveOperationStatus const&) = delete; +private: virtual bool Show(bool show); - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*); + virtual void OnStateChange(t_statechange_notifications notification, const wxString&, const void*); void UpdateText(); @@ -26,6 +27,8 @@ void OnPaint(wxPaintEvent& ev); void OnCancel(wxCommandEvent& ev); void OnTimer(wxTimerEvent&); + + bool const m_local; }; #endif diff -Nru filezilla-3.15.0.2/src/interface/RemoteListView.cpp filezilla-3.33.0/src/interface/RemoteListView.cpp --- filezilla-3.15.0.2/src/interface/RemoteListView.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/RemoteListView.cpp 2018-05-01 03:30:04.000000000 +0000 @@ -2,31 +2,41 @@ #define FILELISTCTRL_INCLUDE_TEMPLATE_DEFINITION -#include "RemoteListView.h" -#include "commandqueue.h" -#include "queue.h" -#include "filezillaapp.h" -#include "inputdialog.h" +#include "view.h" #include "chmoddialog.h" -#include "filter.h" -#include -#include -#include +#include "commandqueue.h" #include "dndobjects.h" -#include "Options.h" -#include "recursive_operation.h" -#include "edithandler.h" #include "dragdropmanager.h" #include "drop_target_ex.h" -#include +#include "edithandler.h" +#include "filezillaapp.h" +#include "filter.h" +#include "graphics.h" +#include "inputdialog.h" +#include "Options.h" +#include "queue.h" +#include "RemoteListView.h" +#include "remote_recursive_operation.h" #include "sizeformatting.h" #include "timeformatting.h" + +#include +#include + +#include + +#include +#include + #ifdef __WXMSW__ #include "shellapi.h" #include "commctrl.h" #endif -class CRemoteListViewDropTarget : public CScrollableDropTarget +std::map CRemoteListView::chmodHandlers = { +}; + +class CRemoteListViewDropTarget final : public CScrollableDropTarget { public: CRemoteListViewDropTarget(CRemoteListView* pRemoteListView) @@ -62,116 +72,111 @@ if (def == wxDragError || def == wxDragNone || def == wxDragCancel) + { return def; + } - if (!m_pRemoteListView->m_pDirectoryListing) + if (!m_pRemoteListView->m_pDirectoryListing) { return wxDragError; + } - if (!GetData()) + if (!GetData()) { return wxDragError; + } CDragDropManager* pDragDropManager = CDragDropManager::Get(); - if (pDragDropManager) + if (pDragDropManager) { pDragDropManager->pDropTarget = m_pRemoteListView; + } - if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) - { + if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) { wxString subdir; int flags = 0; int hit = m_pRemoteListView->HitTest(wxPoint(x, y), flags, 0); - if (hit != -1 && (flags & wxLIST_HITTEST_ONITEM)) - { + if (hit != -1 && (flags & wxLIST_HITTEST_ONITEM)) { int index = m_pRemoteListView->GetItemIndex(hit); - if (index != -1 && m_pRemoteListView->m_fileData[index].comparison_flags != CComparableListing::fill) - { - if (index == (int)m_pRemoteListView->m_pDirectoryListing->GetCount()) + if (index != -1 && m_pRemoteListView->m_fileData[index].comparison_flags != CComparableListing::fill) { + if (index == (int)m_pRemoteListView->m_pDirectoryListing->GetCount()) { subdir = _T(".."); - else if ((*m_pRemoteListView->m_pDirectoryListing)[index].is_dir()) + } + else if ((*m_pRemoteListView->m_pDirectoryListing)[index].is_dir()) { subdir = (*m_pRemoteListView->m_pDirectoryListing)[index].name; + } } } - m_pRemoteListView->m_pState->UploadDroppedFiles(m_pFileDataObject, subdir, false); + m_pRemoteListView->m_state.UploadDroppedFiles(m_pFileDataObject, subdir, false); return wxDragCopy; } // At this point it's the remote data object. - if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) - { + if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) { wxMessageBoxEx(_("Drag&drop between different instances of FileZilla has not been implemented yet.")); return wxDragNone; } - if (!m_pRemoteDataObject->GetServer().EqualsNoPass(*m_pRemoteListView->m_pState->GetServer())) - { + if (m_pRemoteDataObject->GetServer().server != m_pRemoteListView->m_state.GetServer().server) { wxMessageBoxEx(_("Drag&drop between different servers has not been implemented yet.")); return wxDragNone; } // Find drop directory (if it exists) - wxString subdir; + std::wstring subdir; int flags = 0; int hit = m_pRemoteListView->HitTest(wxPoint(x, y), flags, 0); - if (hit != -1 && (flags & wxLIST_HITTEST_ONITEM)) - { + if (hit != -1 && (flags & wxLIST_HITTEST_ONITEM)) { int index = m_pRemoteListView->GetItemIndex(hit); - if (index != -1 && m_pRemoteListView->m_fileData[index].comparison_flags != CComparableListing::fill) - { - if (index == (int)m_pRemoteListView->m_pDirectoryListing->GetCount()) + if (index != -1 && m_pRemoteListView->m_fileData[index].comparison_flags != CComparableListing::fill) { + if (index == (int)m_pRemoteListView->m_pDirectoryListing->GetCount()) { subdir = _T(".."); - else if ((*m_pRemoteListView->m_pDirectoryListing)[index].is_dir()) + } + else if ((*m_pRemoteListView->m_pDirectoryListing)[index].is_dir()) { subdir = (*m_pRemoteListView->m_pDirectoryListing)[index].name; + } } } // Get target path CServerPath target = m_pRemoteListView->m_pDirectoryListing->path; - if (subdir == _T("..")) - { - if (target.HasParent()) + if (subdir == _T("..")) { + if (target.HasParent()) { target = target.GetParent(); + } } - else if (!subdir.empty()) + else if (!subdir.empty()) { target.AddSegment(subdir); + } // Make sure target path is valid - if (target == m_pRemoteDataObject->GetServerPath()) - { + if (target == m_pRemoteDataObject->GetServerPath()) { wxMessageBoxEx(_("Source and target of the drop operation are identical")); return wxDragNone; } - const std::list& files = m_pRemoteDataObject->GetFiles(); - for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) - { - const CRemoteDataObject::t_fileInfo& info = *iter; - if (info.dir) - { + const std::vector& files = m_pRemoteDataObject->GetFiles(); + for (auto const& info : files) { + if (info.dir) { CServerPath dir = m_pRemoteDataObject->GetServerPath(); dir.AddSegment(info.name); - if (dir == target) + if (dir == target) { return wxDragNone; - else if (dir.IsParentOf(target, false)) - { + } + else if (dir.IsParentOf(target, false)) { wxMessageBoxEx(_("A directory cannot be dragged into one of its subdirectories.")); return wxDragNone; } } } - for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) - { - const CRemoteDataObject::t_fileInfo& info = *iter; - m_pRemoteListView->m_pState->m_pCommandQueue->ProcessCommand( + for (auto const& info : files) { + m_pRemoteListView->m_state.m_pCommandQueue->ProcessCommand( new CRenameCommand(m_pRemoteDataObject->GetServerPath(), info.name, target, info.name) ); } // Refresh remote listing - m_pRemoteListView->m_pState->m_pCommandQueue->ProcessCommand( - new CListCommand() - ); + m_pRemoteListView->m_state.m_pCommandQueue->ProcessCommand(new CListCommand()); return wxDragNone; } @@ -181,8 +186,9 @@ CScrollableDropTarget::OnDrop(x, y); ClearDropHighlight(); - if (!m_pRemoteListView->m_pDirectoryListing) + if (!m_pRemoteListView->m_pDirectoryListing) { return false; + } return true; } @@ -197,34 +203,31 @@ { int flags; int hit = m_pRemoteListView->HitTest(point, flags, 0); - if (!(flags & wxLIST_HITTEST_ONITEM)) + if (!(flags & wxLIST_HITTEST_ONITEM)) { hit = -1; + } - if (hit != -1) - { + if (hit != -1) { int index = m_pRemoteListView->GetItemIndex(hit); - if (index == -1 || m_pRemoteListView->m_fileData[index].comparison_flags == CComparableListing::fill) + if (index == -1 || m_pRemoteListView->m_fileData[index].comparison_flags == CComparableListing::fill) { hit = -1; - else if (index != (int)m_pRemoteListView->m_pDirectoryListing->GetCount()) - { - if (!(*m_pRemoteListView->m_pDirectoryListing)[index].is_dir()) + } + else if (index != (int)m_pRemoteListView->m_pDirectoryListing->GetCount()) { + if (!(*m_pRemoteListView->m_pDirectoryListing)[index].is_dir()) { hit = -1; - else - { + } + else { const CDragDropManager* pDragDropManager = CDragDropManager::Get(); - if (pDragDropManager && pDragDropManager->pDragSource == m_pRemoteListView) - { + if (pDragDropManager && pDragDropManager->pDragSource == m_pRemoteListView) { if (m_pRemoteListView->GetItemState(hit, wxLIST_STATE_SELECTED)) hit = -1; } } } } - if (hit != m_pRemoteListView->m_dropTarget) - { + if (hit != m_pRemoteListView->m_dropTarget) { ClearDropHighlight(); - if (hit != -1) - { + if (hit != -1) { m_pRemoteListView->m_dropTarget = hit; #ifdef __WXMSW__ m_pRemoteListView->SetItemState(hit, wxLIST_STATE_DROPHILITED, wxLIST_STATE_DROPHILITED); @@ -253,16 +256,18 @@ return wxDragNone; } - const CServer* const pServer = m_pRemoteListView->m_pState->GetServer(); - wxASSERT(pServer); + ServerWithCredentials server = m_pRemoteListView->m_state.GetServer(); + wxASSERT(server); int hit = DoDisplayDropHighlight(wxPoint(x, y)); const CDragDropManager* pDragDropManager = CDragDropManager::Get(); if (hit == -1 && pDragDropManager && pDragDropManager->remoteParent == m_pRemoteListView->m_pDirectoryListing->path && - *pServer == pDragDropManager->server) + server == pDragDropManager->server) + { return wxDragNone; + } return wxDragCopy; } @@ -287,31 +292,43 @@ wxDataObjectComposite* m_pDataObject; }; -class CInfoText : public wxWindow +class CInfoText final : public wxWindow { public: - CInfoText(wxWindow* parent, const wxString& text) - : wxWindow(parent, wxID_ANY, wxPoint(0, 60), wxDefaultSize), - m_text(text) + CInfoText(wxWindow* parent) + : m_tinter(*this) { + Hide(); + Create(parent, wxID_ANY, wxPoint(0, 60), wxDefaultSize); + SetForegroundColour(parent->GetForegroundColour()); SetBackgroundColour(parent->GetBackgroundColour()); GetTextExtent(m_text, &m_textSize.x, &m_textSize.y); + +#ifdef __WXMSW__ + if (GetLayoutDirection() != wxLayout_RightToLeft) + SetDoubleBuffered(true); +#endif } - void SetText(const wxString &text) + void SetText(wxString const& text) { - if (text == m_text) + if (text == m_text) { return; + } m_text = text; - GetTextExtent(m_text, &m_textSize.x, &m_textSize.y); } wxSize GetTextSize() const { return m_textSize; } bool AcceptsFocus() const { return false; } + + void SetBackgroundTint(wxColour const& colour) { + m_tinter.SetBackgroundTint(colour); + } + protected: wxString m_text; @@ -327,6 +344,8 @@ wxSize m_textSize; + CWindowTinter m_tinter; + DECLARE_EVENT_TABLE() }; @@ -352,20 +371,24 @@ EVT_MENU(XRCID("ID_EDIT"), CRemoteListView::OnMenuEdit) EVT_MENU(XRCID("ID_ENTER"), CRemoteListView::OnMenuEnter) EVT_MENU(XRCID("ID_GETURL"), CRemoteListView::OnMenuGeturl) + EVT_MENU(XRCID("ID_GETURL_PASSWORD"), CRemoteListView::OnMenuGeturl) EVT_MENU(XRCID("ID_CONTEXT_REFRESH"), CRemoteListView::OnMenuRefresh) END_EVENT_TABLE() -CRemoteListView::CRemoteListView(wxWindow* pParent, CState *pState, CQueueView* pQueue) - : CFileListCtrl(pParent, pState, pQueue), - CStateEventHandler(pState) -{ - pState->RegisterHandler(this, STATECHANGE_REMOTE_DIR); - pState->RegisterHandler(this, STATECHANGE_APPLYFILTER); - pState->RegisterHandler(this, STATECHANGE_REMOTE_LINKNOTDIR); +CRemoteListView::CRemoteListView(CView* pParent, CState& state, CQueueView* pQueue) + : CFileListCtrl(pParent, pQueue), + CStateEventHandler(state), + m_parentView(pParent) +{ + state.RegisterHandler(this, STATECHANGE_REMOTE_DIR); + state.RegisterHandler(this, STATECHANGE_APPLYFILTER); + state.RegisterHandler(this, STATECHANGE_REMOTE_LINKNOTDIR); + state.RegisterHandler(this, STATECHANGE_SERVER); m_dropTarget = -1; - m_pInfoText = 0; + m_pInfoText = new CInfoText(this); + m_pDirectoryListing = 0; const unsigned long widths[6] = { 80, 75, 80, 100, 80, 80 }; @@ -378,24 +401,26 @@ AddColumn(_("Owner/Group"), wxLIST_FORMAT_LEFT, widths[5]); LoadColumnSettings(OPTION_REMOTEFILELIST_COLUMN_WIDTHS, OPTION_REMOTEFILELIST_COLUMN_SHOWN, OPTION_REMOTEFILELIST_COLUMN_ORDER); - InitSort(OPTION_REMOTEFILELIST_SORTORDER); - m_dirIcon = GetIconIndex(iconType::dir); SetImageList(GetSystemImageList(), wxIMAGE_LIST_SMALL); InitHeaderSortImageList(); + InitSort(OPTION_REMOTEFILELIST_SORTORDER); + SetDirectoryListing(0); SetDropTarget(new CRemoteListViewDropTarget(this)); EnablePrefixSearch(true); + + m_windowTinter = std::make_unique(*GetMainWindow()); } CRemoteListView::~CRemoteListView() { wxString str = wxString::Format(_T("%d %d"), m_sortDirection, m_sortColumn); - COptions::Get()->SetOption(OPTION_REMOTEFILELIST_SORTORDER, str); + COptions::Get()->SetOption(OPTION_REMOTEFILELIST_SORTORDER, str.ToStdWstring()); } // See comment to OnGetItemText @@ -446,77 +471,69 @@ m_indexMapping[0] = pDirectoryListing->GetCount(); - std::list added; - - CFilterManager filter; + CFilterManager const& filter = m_state.GetStateFilterManager(); const wxString path = m_pDirectoryListing->path.GetPath(); CGenericFileData last = m_fileData.back(); m_fileData.pop_back(); + bool const has_selections = GetSelectedItemCount() != 0; + + std::vector added_indexes; + if (has_selections) { + added_indexes.reserve(to_add); + } + + std::unique_ptr compare = GetSortComparisonObject(); for (unsigned int i = pDirectoryListing->GetCount() - to_add; i < pDirectoryListing->GetCount(); ++i) { const CDirentry& entry = (*pDirectoryListing)[i]; CGenericFileData data; if (entry.is_dir()) { data.icon = m_dirIcon; #ifndef __WXMSW__ - if (entry.is_link()) + if (entry.is_link()) { data.icon += 3; + } #endif } m_fileData.push_back(data); - if (filter.FilenameFiltered(entry.name, path, entry.is_dir(), entry.size, false, 0, entry.time)) + if (filter.FilenameFiltered(entry.name, path, entry.is_dir(), entry.size, false, 0, entry.time)) { continue; + } if (m_pFilelistStatusBar) { - if (entry.is_dir()) + if (entry.is_dir()) { m_pFilelistStatusBar->AddDirectory(); - else + } + else { m_pFilelistStatusBar->AddFile(entry.size); + } } // Find correct position in index mapping std::vector::iterator start = m_indexMapping.begin(); if (m_hasParent) ++start; - CFileListCtrl::CSortComparisonObject compare = GetSortComparisonObject(); - std::vector::iterator insertPos = std::lower_bound(start, m_indexMapping.end(), i, compare); - compare.Destroy(); + std::vector::iterator insertPos = std::lower_bound(start, m_indexMapping.end(), i, SortPredicate(compare)); - const int item = insertPos - m_indexMapping.begin(); + const int added_index = insertPos - m_indexMapping.begin(); m_indexMapping.insert(insertPos, i); - for (auto iter = added.begin(); iter != added.end(); ++iter) { - unsigned int &pos = *iter; - if (pos >= (unsigned int)item) - ++pos; + // Remember inserted index + if (has_selections) { + auto const added_indexes_insert_pos = std::lower_bound(added_indexes.begin(), added_indexes.end(), added_index); + for (auto index = added_indexes_insert_pos; index != added_indexes.end(); ++index) { + ++(*index); + } + added_indexes.insert(added_indexes_insert_pos, added_index); } - added.push_back(item); } m_fileData.push_back(last); - std::list selected; - unsigned int start; - added.push_back(m_indexMapping.size()); - start = added.front(); - SetItemCount(m_indexMapping.size()); - - for (unsigned int i = start; i < m_indexMapping.size(); ++i) { - if (i == added.front()) { - selected.push_front(false); - added.pop_front(); - } - bool is_selected = GetItemState(i, wxLIST_STATE_SELECTED) != 0; - selected.push_back(is_selected); - - bool should_selected = selected.front(); - selected.pop_front(); - if (is_selected != should_selected) - SetSelection(i, should_selected); - } + UpdateSelections_ItemsAdded(added_indexes); if (m_pFilelistStatusBar) m_pFilelistStatusBar->SetHidden(m_pDirectoryListing->GetCount() + 1 - m_indexMapping.size()); @@ -660,10 +677,8 @@ if (unsure & CDirectoryListing::unsure_invalid) return false; - if (!(unsure & ~(CDirectoryListing::unsure_dir_changed | CDirectoryListing::unsure_file_changed))) - { - if (m_sortColumn && m_sortColumn != 2) - { + if (!(unsure & ~(CDirectoryListing::unsure_dir_changed | CDirectoryListing::unsure_file_changed))) { + if (m_sortColumn != 0 && m_sortColumn != 2) { // If not sorted by file or type, changing file attributes can influence // sort order. return false; @@ -729,12 +744,13 @@ if (reset) { ResetSearchPrefix(); - if (IsComparing() && m_pDirectoryListing) + if (IsComparing() && m_pDirectoryListing) { ExitComparisonMode(); + } ClearSelection(); - prevFocused = m_pState->GetPreviouslyVisitedRemoteSubdir(); + prevFocused = m_state.GetPreviouslyVisitedRemoteSubdir(); ensureVisible = !prevFocused.empty(); } else { @@ -766,7 +782,8 @@ const wxString path = m_pDirectoryListing->path.GetPath(); - CFilterManager filter; + CFilterManager const& filter = m_state.GetStateFilterManager(); + for (unsigned int i = 0; i < m_pDirectoryListing->GetCount(); ++i) { const CDirentry& entry = (*m_pDirectoryListing)[i]; CGenericFileData data; @@ -819,7 +836,9 @@ resetDropTarget = true; if (resetDropTarget) { - SetItemState(m_dropTarget, 0, wxLIST_STATE_DROPHILITED); + if (m_dropTarget < GetItemCount()) { + SetItemState(m_dropTarget, 0, wxLIST_STATE_DROPHILITED); + } m_dropTarget = -1; } } @@ -853,32 +872,33 @@ // foo.bar;1 // foo.bar;2 // foo.bar;3 -wxString StripVMSRevision(const wxString& name) +std::wstring StripVMSRevision(std::wstring const& name) { - int pos = name.Find(';', true); - if (pos < 1) + size_t pos = name.rfind(';'); + if (pos == std::wstring::npos || !pos) { return name; + } - const int len = name.Len(); - if (pos == len - 1) + if (pos == name.size() - 1) { return name; + } - int p = pos; - while (++p < len) - { - const wxChar& c = name[p]; - if (c < '0' || c > '9') + size_t p = pos; + while (++p < name.size()) { + wchar_t const& c = name[p]; + if (c < '0' || c > '9') { return name; + } } - return name.Left(pos); + return name.substr(0, pos); } void CRemoteListView::OnItemActivated(wxListEvent &event) { int const action = COptions::Get()->GetOptionVal(OPTION_DOUBLECLICK_ACTION_DIRECTORY); - if (!m_pState->IsRemoteIdle(action ? false : true)) { + if (!m_state.IsRemoteIdle(action ? false : true)) { wxBell(); return; } @@ -920,16 +940,18 @@ if (item) { int index = GetItemIndex(item); - if (index == -1) + if (index == -1) { return; - if (m_fileData[index].comparison_flags == fill) + } + if (m_fileData[index].comparison_flags == fill) { return; + } - const CDirentry& entry = (*m_pDirectoryListing)[index]; - const wxString& name = entry.name; + CDirentry const& entry = (*m_pDirectoryListing)[index]; + std::wstring const& name = entry.name; - const CServer* pServer = m_pState->GetServer(); - if (!pServer) { + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { wxBell(); return; } @@ -946,10 +968,10 @@ m_pLinkResolveState.reset(new t_linkResolveState); m_pLinkResolveState->remote_path = m_pDirectoryListing->path; m_pLinkResolveState->link = name; - m_pLinkResolveState->local_path = m_pState->GetLocalDir(); - m_pLinkResolveState->server = *pServer; + m_pLinkResolveState->local_path = m_state.GetLocalDir(); + m_pLinkResolveState->server = server; } - m_pState->ChangeRemoteDir(m_pDirectoryListing->path, name, entry.is_link() ? LIST_FLAG_LINK : 0); + m_state.ChangeRemoteDir(m_pDirectoryListing->path, name, entry.is_link() ? LIST_FLAG_LINK : 0); } else { wxCommandEvent evt(0, action == 1 ? XRCID("ID_DOWNLOAD") : XRCID("ID_ADDTOQUEUE")); @@ -973,29 +995,30 @@ const bool queue_only = action == 1; - const CLocalPath local_path = m_pState->GetLocalDir(); + const CLocalPath local_path = m_state.GetLocalDir(); if (!local_path.IsWriteable()) { wxBell(); return; } - wxString localFile = CQueueView::ReplaceInvalidCharacters(name); - if (m_pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) + std::wstring localFile = CQueueView::ReplaceInvalidCharacters(name); + if (m_pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) { localFile = StripVMSRevision(localFile); + } m_pQueue->QueueFile(queue_only, true, name, - (name == localFile) ? wxString() : localFile, - local_path, m_pDirectoryListing->path, *pServer, entry.size); + (name == localFile) ? std::wstring() : localFile, + local_path, m_pDirectoryListing->path, server, entry.size); m_pQueue->QueueFile_Finish(true); } } else { - m_pState->ChangeRemoteDir(m_pDirectoryListing->path, _T("..")); + m_state.ChangeRemoteDir(m_pDirectoryListing->path, _T("..")); } } void CRemoteListView::OnMenuEnter(wxCommandEvent &) { - if (!m_pState->IsRemoteIdle(true)) { + if (!m_state.IsRemoteIdle(true)) { wxBell(); return; } @@ -1018,11 +1041,11 @@ return; } - const CDirentry& entry = (*m_pDirectoryListing)[index]; - const wxString& name = entry.name; + CDirentry const& entry = (*m_pDirectoryListing)[index]; + std::wstring const& name = entry.name; - const CServer* pServer = m_pState->GetServer(); - if (!pServer) { + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { wxBell(); return; } @@ -1036,13 +1059,13 @@ m_pLinkResolveState.reset(new t_linkResolveState); m_pLinkResolveState->remote_path = m_pDirectoryListing->path; m_pLinkResolveState->link = name; - m_pLinkResolveState->local_path = m_pState->GetLocalDir(); - m_pLinkResolveState->server = *pServer; + m_pLinkResolveState->local_path = m_state.GetLocalDir(); + m_pLinkResolveState->server = server; } - m_pState->ChangeRemoteDir(m_pDirectoryListing->path, name, entry.is_link() ? LIST_FLAG_LINK : 0); + m_state.ChangeRemoteDir(m_pDirectoryListing->path, name, entry.is_link() ? LIST_FLAG_LINK : 0); } else { - m_pState->ChangeRemoteDir(m_pDirectoryListing->path, _T("..")); + m_state.ChangeRemoteDir(m_pDirectoryListing->path, L".."); } } @@ -1054,12 +1077,13 @@ } wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_REMOTEFILELIST")); - if (!pMenu) + if (!pMenu) { return; + } - bool const idle = m_pState->IsRemoteIdle(); - bool const userIdle = m_pState->IsRemoteIdle(true); - if (!m_pState->IsRemoteConnected() || !idle) { + bool const idle = m_state.IsRemoteIdle(); + bool const userIdle = m_state.IsRemoteIdle(true); + if (!m_state.IsRemoteConnected() || !idle) { bool canEnter = false; if (userIdle) { int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); @@ -1070,7 +1094,6 @@ canEnter = true; } } - canEnter = true; } } else { @@ -1088,6 +1111,7 @@ pMenu->Enable(XRCID("ID_CHMOD"), false); pMenu->Enable(XRCID("ID_EDIT"), false); pMenu->Enable(XRCID("ID_GETURL"), false); + pMenu->Enable(XRCID("ID_GETURL_PASSWORD"), false); pMenu->Enable(XRCID("ID_CONTEXT_REFRESH"), false); pMenu->Enable(XRCID("ID_NEW_FILE"), false); } @@ -1100,6 +1124,7 @@ pMenu->Enable(XRCID("ID_CHMOD"), false); pMenu->Enable(XRCID("ID_EDIT"), false); pMenu->Enable(XRCID("ID_GETURL"), false); + pMenu->Enable(XRCID("ID_GETURL_PASSWORD"), false); } else { if ((GetItemCount() && GetItemState(0, wxLIST_STATE_SELECTED))) { @@ -1107,6 +1132,7 @@ pMenu->Enable(XRCID("ID_CHMOD"), false); pMenu->Enable(XRCID("ID_EDIT"), false); pMenu->Enable(XRCID("ID_GETURL"), false); + pMenu->Enable(XRCID("ID_GETURL_PASSWORD"), false); } int count = 0; @@ -1121,15 +1147,17 @@ } int index = GetItemIndex(item); - if (index == -1) + if (index == -1) { continue; - count++; + } + ++count; if (m_fileData[index].comparison_flags == fill) { - fillCount++; + ++fillCount; continue; } - if ((*m_pDirectoryListing)[index].is_dir()) + if ((*m_pDirectoryListing)[index].is_dir()) { selectedDir = true; + } } if (!count || fillCount == count) { pMenu->Delete(XRCID("ID_ENTER")); @@ -1140,25 +1168,34 @@ pMenu->Enable(XRCID("ID_CHMOD"), false); pMenu->Enable(XRCID("ID_EDIT"), false); pMenu->Enable(XRCID("ID_GETURL"), false); + pMenu->Enable(XRCID("ID_GETURL_PASSWORD"), false); } else { - if (selectedDir) + if (selectedDir) { pMenu->Enable(XRCID("ID_EDIT"), false); - else + if (!CServer::ProtocolHasFeature(m_state.GetServer().server.GetProtocol(), ProtocolFeature::DirectoryRename)) { + pMenu->Enable(XRCID("ID_RENAME"), false); + } + } + else { pMenu->Delete(XRCID("ID_ENTER")); + } if (count > 1) { - if (selectedDir) + if (selectedDir) { pMenu->Delete(XRCID("ID_ENTER")); + } pMenu->Enable(XRCID("ID_RENAME"), false); } - if (!m_pState->GetLocalDir().IsWriteable()) { + if (!m_state.GetLocalDir().IsWriteable()) { pMenu->Enable(XRCID("ID_DOWNLOAD"), false); pMenu->Enable(XRCID("ID_ADDTOQUEUE"), false); } } } + pMenu->Delete(XRCID(wxGetKeyState(WXK_SHIFT) ? "ID_GETURL" : "ID_GETURL_PASSWORD")); + PopupMenu(pMenu); delete pMenu; } @@ -1166,9 +1203,9 @@ void CRemoteListView::OnMenuDownload(wxCommandEvent& event) { // Make sure selection is valid - bool idle = m_pState->IsRemoteIdle(); + bool idle = m_state.IsRemoteIdle(); - const CLocalPath localDir = m_pState->GetLocalDir(); + const CLocalPath localDir = m_state.GetLocalDir(); if (!localDir.IsWriteable()) { wxBell(); return; @@ -1197,17 +1234,17 @@ TransferSelectedFiles(localDir, event.GetId() == XRCID("ID_ADDTOQUEUE")); } -void CRemoteListView::TransferSelectedFiles(const CLocalPath& local_parent, bool queueOnly) +void CRemoteListView::TransferSelectedFiles(const CLocalPath& local_parent, bool queue_only) { - bool idle = m_pState->IsRemoteIdle(); + bool idle = m_state.IsRemoteIdle(); - CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); + CRemoteRecursiveOperation* pRecursiveOperation = m_state.GetRemoteRecursiveOperation(); wxASSERT(pRecursiveOperation); wxASSERT(local_parent.IsWriteable()); - const CServer* pServer = m_pState->GetServer(); - if (!pServer) { + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { wxBell(); return; } @@ -1218,23 +1255,28 @@ recursion_root root(m_pDirectoryListing->path, false); for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item == -1) { break; - if (!item) + } + if (!item) { continue; + } int index = GetItemIndex(item); - if (index == -1) + if (index == -1) { continue; - if (m_fileData[index].comparison_flags == fill) + } + if (m_fileData[index].comparison_flags == fill) { continue; + } - const CDirentry& entry = (*m_pDirectoryListing)[index]; - const wxString& name = entry.name; + CDirentry const& entry = (*m_pDirectoryListing)[index]; + std::wstring const& name = entry.name; if (entry.is_dir()) { - if (!idle) + if (!idle) { continue; + } CLocalPath local_path(local_parent); local_path.AddSegment(CQueueView::ReplaceInvalidCharacters(name)); CServerPath remotePath = m_pDirectoryListing->path; @@ -1243,25 +1285,24 @@ } } else { - wxString localFile = CQueueView::ReplaceInvalidCharacters(name); - if (m_pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) + std::wstring localFile = CQueueView::ReplaceInvalidCharacters(name); + if (m_pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) { localFile = StripVMSRevision(localFile); - m_pQueue->QueueFile(queueOnly, true, - name, (name == localFile) ? wxString() : localFile, - local_parent, m_pDirectoryListing->path, *pServer, entry.size); + } + m_pQueue->QueueFile(queue_only, true, + name, (name == localFile) ? std::wstring() : localFile, + local_parent, m_pDirectoryListing->path, server, entry.size); added = true; } } - if (added) - m_pQueue->QueueFile_Finish(!queueOnly); + if (added) { + m_pQueue->QueueFile_Finish(!queue_only); + } if (!root.empty()) { pRecursiveOperation->AddRecursionRoot(std::move(root)); - if (IsComparing()) - ExitComparisonMode(); CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(queueOnly ? CRecursiveOperation::recursive_addtoqueue : CRecursiveOperation::recursive_download, - filter.GetActiveFilters(false), m_pDirectoryListing->path); + pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_transfer, filter.GetActiveFilters(), m_pDirectoryListing->path, !queue_only); } } @@ -1276,7 +1317,7 @@ { CServerPath newdir = MenuMkdir(); if (!newdir.empty()) { - m_pState->ChangeRemoteDir(newdir, wxString(), 0, true); + m_state.ChangeRemoteDir(newdir, std::wstring(), 0, true); } } @@ -1284,7 +1325,7 @@ // Returns the name of the new directory CServerPath CRemoteListView::MenuMkdir() { - if (!m_pDirectoryListing || !m_pState->IsRemoteIdle()) { + if (!m_pDirectoryListing || !m_state.IsRemoteIdle()) { wxBell(); return CServerPath(); } @@ -1298,7 +1339,7 @@ // Append a long segment which does (most likely) not exist in the path and // replace it with "New directory" later. This way we get the exact position of // "New directory" and can preselect it in the dialog. - wxString tmpName = _T("25CF809E56B343b5A12D1F0466E3B37A49A9087FDCF8412AA9AF8D1E849D01CF"); + std::wstring tmpName = _T("25CF809E56B343b5A12D1F0466E3B37A49A9087FDCF8412AA9AF8D1E849D01CF"); if (path.AddSegment(tmpName)) { wxString pathName = path.GetPath(); int pos = pathName.Find(tmpName); @@ -1315,19 +1356,19 @@ return CServerPath(); if (!m_pDirectoryListing || oldPath != m_pDirectoryListing->path || - !m_pState->IsRemoteIdle()) + !m_state.IsRemoteIdle()) { wxBell(); return CServerPath(); } path = m_pDirectoryListing->path; - if (!path.ChangePath(dlg.GetValue())) { + if (!path.ChangePath(dlg.GetValue().ToStdWstring())) { wxBell(); return CServerPath(); } - m_pState->m_pCommandQueue->ProcessCommand(new CMkdirCommand(path)); + m_state.m_pCommandQueue->ProcessCommand(new CMkdirCommand(path)); // Return name of the New Directory return path; @@ -1335,7 +1376,7 @@ void CRemoteListView::OnMenuDelete(wxCommandEvent&) { - if (!m_pState->IsRemoteIdle()) { + if (!m_state.IsRemoteIdle()) { wxBell(); return; } @@ -1347,107 +1388,116 @@ long item = -1; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (!item) + if (!item) { continue; - if (item == -1) + } + if (item == -1) { break; + } - if (!IsItemValid(item)) - { + if (!IsItemValid(item)) { wxBell(); return; } int index = GetItemIndex(item); - if (index == -1) + if (index == -1) { continue; - if (m_fileData[index].comparison_flags == fill) + } + if (m_fileData[index].comparison_flags == fill) { continue; + } const CDirentry& entry = (*m_pDirectoryListing)[index]; - if (entry.is_dir()) - { + if (entry.is_dir()) { count_dirs++; - if (entry.is_link()) + if (entry.is_link()) { selected_link = true; + } } - else + else { count_files++; + } } wxString question; - if (!count_dirs) + if (!count_dirs) { question.Printf(wxPLURAL("Really delete %d file from the server?", "Really delete %d files from the server?", count_files), count_files); - else if (!count_files) + } + else if (!count_files) { question.Printf(wxPLURAL("Really delete %d directory with its contents from the server?", "Really delete %d directories with their contents from the server?", count_dirs), count_dirs); - else - { + } + else { wxString files = wxString::Format(wxPLURAL("%d file", "%d files", count_files), count_files); wxString dirs = wxString::Format(wxPLURAL("%d directory with its contents", "%d directories with their contents", count_dirs), count_dirs); question.Printf(_("Really delete %s and %s from the server?"), files, dirs); } - if (wxMessageBoxEx(question, _("Confirmation needed"), wxICON_QUESTION | wxYES_NO, this) != wxYES) + if (wxMessageBoxEx(question, _("Confirmation needed"), wxICON_QUESTION | wxYES_NO, this) != wxYES) { return; + } bool follow_symlink = false; - if (selected_link) - { + if (selected_link) { wxDialogEx dlg; - if (!dlg.Load(this, _T("ID_DELETE_SYMLINK"))) - { + if (!dlg.Load(this, _T("ID_DELETE_SYMLINK"))) { wxBell(); return; } - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } follow_symlink = XRCCTRL(dlg, "ID_RECURSE", wxRadioButton)->GetValue(); } - CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); + CRemoteRecursiveOperation* pRecursiveOperation = m_state.GetRemoteRecursiveOperation(); wxASSERT(pRecursiveOperation); - std::deque filesToDelete; + std::deque filesToDelete; recursion_root root(m_pDirectoryListing->path, false); for (item = -1; ;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (!item) + if (!item) { continue; - if (item == -1) + } + if (item == -1) { break; + } int index = GetItemIndex(item); - if (index == -1) + if (index == -1) { continue; - if (m_fileData[index].comparison_flags == fill) + } + if (m_fileData[index].comparison_flags == fill) { continue; + } const CDirentry& entry = (*m_pDirectoryListing)[index]; - const wxString& name = entry.name; + std::wstring const& name = entry.name; if (entry.is_dir() && (follow_symlink || !entry.is_link())) { CServerPath remotePath = m_pDirectoryListing->path; if (remotePath.AddSegment(name)) { - root.add_dir_to_visit(m_pDirectoryListing->path, name, CLocalPath(), true);; + root.add_dir_to_visit(m_pDirectoryListing->path, name, CLocalPath(), true); } } - else + else { filesToDelete.push_back(name); + } } - if (!filesToDelete.empty()) - m_pState->m_pCommandQueue->ProcessCommand(new CDeleteCommand(m_pDirectoryListing->path, std::move(filesToDelete))); + if (!filesToDelete.empty()) { + m_state.m_pCommandQueue->ProcessCommand(new CDeleteCommand(m_pDirectoryListing->path, std::move(filesToDelete))); + } if (!root.empty()) { - if (IsComparing()) - ExitComparisonMode(); pRecursiveOperation->AddRecursionRoot(std::move(root)); - + CFilterManager filter; pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_delete, - filter.GetActiveFilters(false), m_pDirectoryListing->path); + filter.GetActiveFilters(), m_pDirectoryListing->path); } } @@ -1458,7 +1508,7 @@ return; } - if (!m_pState->IsRemoteIdle()) { + if (!m_state.IsRemoteIdle()) { wxBell(); return; } @@ -1500,7 +1550,6 @@ wxCommandEvent tmp; OnMenuDelete(tmp); - return; } else if (code == WXK_F2) { wxCommandEvent tmp; @@ -1518,104 +1567,108 @@ else if (code == 'N' && event.GetModifiers() == (wxMOD_CONTROL | wxMOD_SHIFT)) { MenuMkdir(); } - else + else if (code == 'F' && event.GetModifiers() == wxMOD_CONTROL) { + if (m_parentView) { + m_parentView->ShowSearchPanel(); + } + } + else { event.Skip(); + } } bool CRemoteListView::OnBeginRename(const wxListEvent& event) { - if (!m_pState->IsRemoteIdle()) - { + if (!m_state.IsRemoteIdle()) { wxBell(); return false; } - if (!m_pDirectoryListing) - { + if (!m_pDirectoryListing) { wxBell(); return false; } int item = event.GetIndex(); - if (!item) + if (!item) { return false; + } int index = GetItemIndex(item); - if (index == -1 || m_fileData[index].comparison_flags == fill) + if (index == -1 || m_fileData[index].comparison_flags == fill) { return false; + } return true; } bool CRemoteListView::OnAcceptRename(const wxListEvent& event) { - if (!m_pState->IsRemoteIdle()) - { + if (!m_state.IsRemoteIdle()) { wxBell(); return false; } - if (!m_pDirectoryListing) - { + if (!m_pDirectoryListing) { wxBell(); return false; } int item = event.GetIndex(); - if (!item) + if (!item) { return false; + } int index = GetItemIndex(item); - if (index == -1 || m_fileData[index].comparison_flags == fill) - { + if (index == -1 || m_fileData[index].comparison_flags == fill) { wxBell(); return false; } const CDirentry& entry = (*m_pDirectoryListing)[index]; - wxString newFile = event.GetLabel(); + std::wstring newFile = event.GetLabel().ToStdWstring(); CServerPath newPath = m_pDirectoryListing->path; - if (!newPath.ChangePath(newFile, true)) - { + if (!newPath.ChangePath(newFile, true)) { wxMessageBoxEx(_("Filename invalid"), _("Cannot rename file"), wxICON_EXCLAMATION); return false; } - if (newPath == m_pDirectoryListing->path) - { - if (entry.name == newFile) + if (newPath == m_pDirectoryListing->path) { + if (entry.name == newFile) { return false; + } // Check if target file already exists - for (unsigned int i = 0; i < m_pDirectoryListing->GetCount(); i++) - { - if (newFile == (*m_pDirectoryListing)[i].name) - { - if (wxMessageBoxEx(_("Target filename already exists, really continue?"), _("File exists"), wxICON_QUESTION | wxYES_NO) != wxYES) + for (unsigned int i = 0; i < m_pDirectoryListing->GetCount(); ++i) { + if (newFile == (*m_pDirectoryListing)[i].name) { + if (wxMessageBoxEx(_("Target filename already exists, really continue?"), _("File exists"), wxICON_QUESTION | wxYES_NO) != wxYES) { return false; - + } break; } } } - m_pState->m_pCommandQueue->ProcessCommand(new CRenameCommand(m_pDirectoryListing->path, entry.name, newPath, newFile)); + m_state.m_pCommandQueue->ProcessCommand(new CRenameCommand(m_pDirectoryListing->path, entry.name, newPath, newFile)); return true; } void CRemoteListView::OnMenuChmod(wxCommandEvent&) { - if (!m_pState->IsRemoteConnected() || !m_pState->IsRemoteIdle()) { + auto const& server = m_state.GetServer(); + auto protocol = server.server.GetProtocol(); + + if (!m_state.IsRemoteConnected() || !m_state.IsRemoteIdle()) { wxBell(); return; } int fileCount = 0; int dirCount = 0; - wxString name; + std::wstring name; char permissions[9] = {}; @@ -1657,12 +1710,32 @@ return; } - for (int i = 0; i < 9; i++) - if (permissions[i] == -1) + for (int i = 0; i < 9; i++) { + if (permissions[i] == -1) { permissions[i] = 0; + } + } + + ChmodUICommand cmd = { + this, + permissions, + fileCount, + dirCount, + name + }; + auto handler = chmodHandlers[protocol]; + if (handler) { + handler(cmd, m_state); + } + else { + HandleGenericChmod(cmd); + } +} +void CRemoteListView::HandleGenericChmod(ChmodUICommand &command) +{ CChmodDialog* pChmodDlg = new CChmodDialog; - if (!pChmodDlg->Create(this, fileCount, dirCount, name, permissions)) { + if (!pChmodDlg->Create(command.parentWindow, command.fileCount, command.dirCount, command.name, command.permissions)) { pChmodDlg->Destroy(); return; } @@ -1673,7 +1746,7 @@ } // State may have changed while chmod dialog was shown - if (!m_pState->IsRemoteConnected() || !m_pState->IsRemoteIdle()) { + if (!m_state.IsRemoteConnected() || !m_state.IsRemoteIdle()) { pChmodDlg->Destroy(); wxBell(); return; @@ -1681,11 +1754,11 @@ const int applyType = pChmodDlg->GetApplyType(); - CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); + CRemoteRecursiveOperation* pRecursiveOperation = m_state.GetRemoteRecursiveOperation(); wxASSERT(pRecursiveOperation); recursion_root root(m_pDirectoryListing->path, false); - item = -1; + long item = -1; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (item == -1) @@ -1714,9 +1787,9 @@ { char newPermissions[9]{}; bool res = pChmodDlg->ConvertPermissions(*entry.permissions, newPermissions); - wxString newPerms = pChmodDlg->GetPermissions(res ? newPermissions : 0, entry.is_dir()); + std::wstring const newPerms = pChmodDlg->GetPermissions(res ? newPermissions : 0, entry.is_dir()).ToStdWstring(); - m_pState->m_pCommandQueue->ProcessCommand(new CChmodCommand(m_pDirectoryListing->path, entry.name, newPerms)); + m_state.m_pCommandQueue->ProcessCommand(new CChmodCommand(m_pDirectoryListing->path, entry.name, newPerms)); } if (pChmodDlg->Recursive() && entry.is_dir()) @@ -1724,33 +1797,31 @@ } if (pChmodDlg->Recursive()) { - if (IsComparing()) - ExitComparisonMode(); - pRecursiveOperation->SetChmodDialog(pChmodDlg); pRecursiveOperation->AddRecursionRoot(std::move(root)); CFilterManager filter; pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_chmod, - filter.GetActiveFilters(false), m_pDirectoryListing->path); + filter.GetActiveFilters(), m_pDirectoryListing->path); // Refresh listing. This gets done implicitely by the recursive operation, so // only it if not recursing. if (pRecursiveOperation->GetOperationMode() != CRecursiveOperation::recursive_chmod) - m_pState->ChangeRemoteDir(m_pDirectoryListing->path); + m_state.ChangeRemoteDir(m_pDirectoryListing->path); } else { pChmodDlg->Destroy(); - m_pState->ChangeRemoteDir(m_pDirectoryListing->path, _T(""), 0, true); + m_state.ChangeRemoteDir(m_pDirectoryListing->path, _T(""), 0, true); } } void CRemoteListView::ApplyCurrentFilter() { - CFilterManager filter; - - if (!filter.HasSameLocalAndRemoteFilters() && IsComparing()) + CFilterManager const& filter = m_state.GetStateFilterManager(); + + if (!filter.HasSameLocalAndRemoteFilters() && IsComparing()) { ExitComparisonMode(); + } if (m_fileData.size() <= 1) return; @@ -1778,7 +1849,7 @@ ++hidden; continue; } - + if (entry.is_dir()) ++totalDirCount; else { @@ -1820,27 +1891,26 @@ #endif { int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - while (item != -1) - { + while (item != -1) { SetSelection(item, false); - if (!item) - { + if (!item) { selectedNames.push_back(_T("..")); item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); continue; } int index = GetItemIndex(item); - if (index == -1 || m_fileData[index].comparison_flags == fill) - { + if (index == -1 || m_fileData[index].comparison_flags == fill) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); continue; } const CDirentry& entry = (*m_pDirectoryListing)[index]; - if (entry.is_dir()) + if (entry.is_dir()) { selectedNames.push_back(_T("d") + entry.name); - else + } + else { selectedNames.push_back(_T("-") + entry.name); + } item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); } @@ -1849,15 +1919,14 @@ int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); if (item != -1) { int index = GetItemIndex(item); - if (index != -1 && m_fileData[index].comparison_flags != fill) - { - if (!item) + if (index != -1 && m_fileData[index].comparison_flags != fill) { + if (!item) { focused = _T(".."); - else + } + else { focused = (*m_pDirectoryListing)[index].name; + } } - - SetItemState(item, 0, wxLIST_STATE_FOCUSED); } return selectedNames; @@ -1865,8 +1934,9 @@ void CRemoteListView::ReselectItems(std::list& selectedNames, wxString focused, bool ensureVisible) { - if (!GetItemCount()) + if (!GetItemCount()) { return; + } if (focused == _T("..")) { focused = _T(""); @@ -1874,18 +1944,21 @@ } if (selectedNames.empty()) { - if (focused.empty()) + if (focused.empty()) { return; + } for (unsigned int i = 1; i < m_indexMapping.size(); ++i) { const int index = m_indexMapping[i]; - if (m_fileData[index].comparison_flags == fill) + if (m_fileData[index].comparison_flags == fill) { continue; + } if ((*m_pDirectoryListing)[index].name == focused) { SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); - if (ensureVisible) + if (ensureVisible) { EnsureVisible(i); + } return; } } @@ -1902,49 +1975,52 @@ // Reselect previous items if neccessary. // Sorting direction did not change. We just have to scan through items once unsigned int i = 0; - for (std::list::const_iterator iter = selectedNames.begin(); iter != selectedNames.end(); ++iter) - { - while (++i < m_indexMapping.size()) - { + for (auto const& selectedName : selectedNames) { + while (++i < m_indexMapping.size()) { int index = GetItemIndex(i); - if (index == -1 || m_fileData[index].comparison_flags == fill) + if (index == -1 || m_fileData[index].comparison_flags == fill) { continue; - const CDirentry& entry = (*m_pDirectoryListing)[index]; - if (entry.name == focused) - { + } + CDirentry const& entry = (*m_pDirectoryListing)[index]; + if (entry.name == focused) { SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); - if (ensureVisible) + if (ensureVisible) { EnsureVisible(i); + } focused = _T(""); } - if (entry.is_dir() && *iter == (_T("d") + entry.name)) - { - if (firstSelected == -1) + if (entry.is_dir() && selectedName == (_T("d") + entry.name)) { + if (firstSelected == -1) { firstSelected = i; - if (m_pFilelistStatusBar) + } + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->SelectDirectory(); + } SetSelection(i, true); break; } - else if (*iter == (_T("-") + entry.name)) - { - if (firstSelected == -1) + else if (selectedName == (_T("-") + entry.name)) { + if (firstSelected == -1) { firstSelected = i; - if (m_pFilelistStatusBar) + } + if (m_pFilelistStatusBar) { m_pFilelistStatusBar->SelectFile(entry.size); + } SetSelection(i, true); break; } } - if (i == m_indexMapping.size()) + if (i == m_indexMapping.size()) { break; + } } - if (!focused.empty()) - { - if (firstSelected != -1) + if (!focused.empty()) { + if (firstSelected != -1) { SetItemState(firstSelected, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); - else + } + else { SetItemState(0, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + } } } @@ -1956,17 +2032,17 @@ void CRemoteListView::RepositionInfoText() { - if (!m_pInfoText) + if (!m_pInfoText) { return; + } wxRect rect = GetClientRect(); - wxSize size = m_pInfoText->GetTextSize(); - if (m_indexMapping.empty()) + if (!GetItemCount()) { rect.y = 60; - else - { + } + else { wxRect itemRect; GetItemRect(0, itemRect); rect.y = wxMax(60, itemRect.GetBottom() + 1); @@ -1977,8 +2053,7 @@ m_pInfoText->SetSize(rect); #ifdef __WXMSW__ - if (GetLayoutDirection() != wxLayout_RightToLeft) - { + if (GetLayoutDirection() != wxLayout_RightToLeft) { m_pInfoText->Refresh(true); m_pInfoText->Update(); } @@ -1988,14 +2063,17 @@ } -void CRemoteListView::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2) +void CRemoteListView::OnStateChange(t_statechange_notifications notification, const wxString& data, const void* data2) { - wxASSERT(pState); if (notification == STATECHANGE_REMOTE_DIR) - SetDirectoryListing(pState->GetRemoteDir()); + SetDirectoryListing(m_state.GetRemoteDir()); else if (notification == STATECHANGE_REMOTE_LINKNOTDIR) { wxASSERT(data2); - LinkIsNotDir(*(CServerPath*)data2, data); + LinkIsNotDir(*(CServerPath*)data2, data.ToStdWstring()); + } + else if (notification == STATECHANGE_SERVER) { + m_windowTinter->SetBackgroundTint(m_state.GetSite().m_colour); + m_pInfoText->SetBackgroundTint(m_state.GetSite().m_colour); } else { wxASSERT(notification == STATECHANGE_APPLYFILTER); @@ -2015,30 +2093,24 @@ text = _("Empty directory listing"); } + if (text.empty()) { - delete m_pInfoText; - m_pInfoText = 0; - return; + m_pInfoText->Hide(); } - - if (!m_pInfoText) { - m_pInfoText = new CInfoText(this, text); -#ifdef __WXMSW__ - if (GetLayoutDirection() != wxLayout_RightToLeft) - m_pInfoText->SetDoubleBuffered(true); -#endif - + else { + m_pInfoText->SetText(text); RepositionInfoText(); - return; + m_pInfoText->Show(); } - - m_pInfoText->SetText(text); - RepositionInfoText(); } void CRemoteListView::OnBeginDrag(wxListEvent&) { - if (!m_pState->IsRemoteIdle()) { + if (COptions::Get()->GetOptionVal(OPTION_DND_DISABLED) != 0) { + return; + } + + if (!m_state.IsRemoteIdle()) { wxBell(); return; } @@ -2048,10 +2120,10 @@ return; } - bool idle = m_pState->m_pCommandQueue->Idle(); + bool idle = m_state.m_pCommandQueue->Idle(); long item = -1; - int count = 0; + size_t count = 0; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (item == -1) @@ -2080,13 +2152,14 @@ wxDataObjectComposite object; - CServer const* pServer = m_pState->GetServer(); - if (!pServer) + ServerWithCredentials server = m_state.GetServer(); // Make copy doe to DoDragDrop running the event loop + if (!server) { return; - CServer const server = *pServer; + } CServerPath const path = m_pDirectoryListing->path; - CRemoteDataObject *pRemoteDataObject = new CRemoteDataObject(*pServer, m_pDirectoryListing->path); + CRemoteDataObject *pRemoteDataObject = new CRemoteDataObject(server, m_pDirectoryListing->path); + pRemoteDataObject->Reserve(count); CDragDropManager* pDragDropManager = CDragDropManager::Init(); pDragDropManager->pDragSource = this; @@ -2097,12 +2170,14 @@ item = -1; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item == -1) { break; + } int index = GetItemIndex(item); - if (index == -1 || m_fileData[index].comparison_flags == fill) + if (index == -1 || m_fileData[index].comparison_flags == fill) { continue; + } const CDirentry& entry = (*m_pDirectoryListing)[index]; pRemoteDataObject->AddFile(entry.name, entry.is_dir(), entry.size, entry.is_link()); @@ -2142,9 +2217,9 @@ #if FZ3_USESHELLEXT if (ext) { if (!pRemoteDataObject->DidSendData()) { - pServer = m_pState->GetServer(); - if (!m_pState->IsRemoteIdle() || - !pServer || *pServer != server || + server = m_state.GetServer(); + if (!m_state.IsRemoteIdle() || + !server || server != pRemoteDataObject->GetServer() || !m_pDirectoryListing || m_pDirectoryListing->path != path) { // Remote listing has changed since drag started @@ -2153,13 +2228,14 @@ } // Same checks as before - idle = m_pState->m_pCommandQueue->Idle(); + idle = m_state.m_pCommandQueue->Idle(); item = -1; for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) + if (item == -1) { break; + } if (!item) { // Can't drag ".." @@ -2168,8 +2244,9 @@ } int index = GetItemIndex(item); - if (index == -1 || m_fileData[index].comparison_flags == fill) + if (index == -1 || m_fileData[index].comparison_flags == fill) { continue; + } if ((*m_pDirectoryListing)[index].is_dir() && !idle) { // Drag could result in recursive operation, don't allow at this point wxBell(); @@ -2177,7 +2254,7 @@ } } - CLocalPath target(ext->GetTarget()); + CLocalPath target(ext->GetTarget().ToStdWstring()); if (target.empty()) { ext.reset(); // Release extension before the modal message box wxMessageBoxEx(_("Could not determine the target of the Drag&Drop operation.\nEither the shell extension is not installed properly or you didn't drop the files into an Explorer window.")); @@ -2192,7 +2269,7 @@ void CRemoteListView::OnMenuEdit(wxCommandEvent&) { - if (!m_pState->IsRemoteConnected() || !m_pDirectoryListing) { + if (!m_state.IsRemoteConnected() || !m_pDirectoryListing) { wxBell(); return; } @@ -2207,8 +2284,9 @@ } int index = GetItemIndex(item); - if (index == -1 || m_fileData[index].comparison_flags == fill) + if (index == -1 || m_fileData[index].comparison_flags == fill) { continue; + } const CDirentry& entry = (*m_pDirectoryListing)[index]; if (entry.is_dir()) { @@ -2225,9 +2303,8 @@ return; } - const CServerPath path = m_pDirectoryListing->path; - const CServer server = *m_pState->GetServer(); - pEditHandler->Edit(CEditHandler::remote, selected_items, path, server, this); + CServerPath const path = m_pDirectoryListing->path; + pEditHandler->Edit(CEditHandler::remote, selected_items, path, m_state.GetServer(), this); } #ifdef __WXDEBUG__ @@ -2269,8 +2346,7 @@ void CRemoteListView::StartComparison() { - if (m_sortDirection || m_sortColumn) - { + if (m_sortDirection || m_sortColumn != 0) { wxASSERT(m_originalIndexMapping.empty()); SortList(0, 0); } @@ -2362,93 +2438,110 @@ wxString CRemoteListView::GetItemText(int item, unsigned int column) { int index = GetItemIndex(item); - if (index == -1) + if (index == -1) { return wxString(); + } - if (!column) - { - if ((unsigned int)index == m_pDirectoryListing->GetCount()) + if (!column) { + if ((unsigned int)index == m_pDirectoryListing->GetCount()) { return _T(".."); - else if ((unsigned int)index < m_pDirectoryListing->GetCount()) + } + else if ((unsigned int)index < m_pDirectoryListing->GetCount()) { return (*m_pDirectoryListing)[index].name; - else + } + else { return wxString(); + } } - if (!item) + if (!item) { return wxString(); //.. has no attributes + } - if ((unsigned int)index >= m_pDirectoryListing->GetCount()) + if ((unsigned int)index >= m_pDirectoryListing->GetCount()) { return wxString(); + } - if (column == 1) - { + if (column == 1) { const CDirentry& entry = (*m_pDirectoryListing)[index]; - if (entry.is_dir() || entry.size < 0) + if (entry.is_dir() || entry.size < 0) { return wxString(); - else + } + else { return CSizeFormat::Format(entry.size); + } } - else if (column == 2) - { + else if (column == 2) { CGenericFileData& data = m_fileData[index]; - if (data.fileType.empty()) - { + if (data.fileType.empty()) { const CDirentry& entry = (*m_pDirectoryListing)[index]; - if (m_pDirectoryListing->path.GetType() == VMS) + if (m_pDirectoryListing->path.GetType() == VMS) { data.fileType = GetType(StripVMSRevision(entry.name), entry.is_dir()); - else + } + else { data.fileType = GetType(entry.name, entry.is_dir()); + } } return data.fileType; } - else if (column == 3) - { + else if (column == 3) { const CDirentry& entry = (*m_pDirectoryListing)[index]; return CTimeFormat::Format(entry.time); } - else if (column == 4) + else if (column == 4) { return *(*m_pDirectoryListing)[index].permissions; - else if (column == 5) + } + else if (column == 5) { return *(*m_pDirectoryListing)[index].ownerGroup; + } return wxString(); } -CFileListCtrl::CSortComparisonObject CRemoteListView::GetSortComparisonObject() +std::unique_ptr CRemoteListView::GetSortComparisonObject() { CFileListCtrlSort::DirSortMode dirSortMode = GetDirSortMode(); CFileListCtrlSort::NameSortMode nameSortMode = GetNameSortMode(); CDirectoryListing const& directoryListing = *m_pDirectoryListing; - if (!m_sortDirection) - { - if (m_sortColumn == 1) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortSize(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 2) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortType(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 3) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortTime(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 4) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortPermissions(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 5) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortOwnerGroup(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortName(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); + if (!m_sortDirection) { + if (m_sortColumn == 1) { + return std::make_unique>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 2) { + return std::make_unique>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 3) { + return std::make_unique>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 4) { + return std::make_unique>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 5) { + return std::make_unique>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else { + return std::make_unique>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } } - else - { - if (m_sortColumn == 1) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CGenericFileData>(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 2) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CGenericFileData>(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 3) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CGenericFileData>(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 4) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CGenericFileData>(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 5) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CGenericFileData>(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); - else - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CGenericFileData>(directoryListing, m_fileData, dirSortMode, nameSortMode, this)); + else { + if (m_sortColumn == 1) { + return std::make_unique, CGenericFileData>>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 2) { + return std::make_unique, CGenericFileData>>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 3) { + return std::make_unique, CGenericFileData>>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 4) { + return std::make_unique, CGenericFileData>>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 5) { + return std::make_unique, CGenericFileData>>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } + else { + return std::make_unique, CGenericFileData>>(directoryListing, m_fileData, dirSortMode, nameSortMode, this); + } } } @@ -2468,14 +2561,15 @@ return (*m_pDirectoryListing)[index].size; } -void CRemoteListView::LinkIsNotDir(const CServerPath& path, const wxString& link) +void CRemoteListView::LinkIsNotDir(CServerPath const& path, std::wstring const& link) { if (m_pLinkResolveState && m_pLinkResolveState->remote_path == path && m_pLinkResolveState->link == link) { - wxString localFile = CQueueView::ReplaceInvalidCharacters(link); - if (m_pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) + std::wstring localFile = CQueueView::ReplaceInvalidCharacters(link); + if (m_pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) { localFile = StripVMSRevision(localFile); + } m_pQueue->QueueFile(false, true, - link, (link != localFile) ? localFile : wxString(), + link, (link != localFile) ? localFile : std::wstring(), m_pLinkResolveState->local_path, m_pLinkResolveState->remote_path, m_pLinkResolveState->server, -1); m_pQueue->QueueFile_Finish(true); } @@ -2483,77 +2577,76 @@ m_pLinkResolveState.reset(); } -void CRemoteListView::OnMenuGeturl(wxCommandEvent&) +void CRemoteListView::OnMenuGeturl(wxCommandEvent& event) { - if (!m_pDirectoryListing) + if (!m_pDirectoryListing) { return; + } - const CServer* pServer = m_pState->GetServer(); - if (!pServer) + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { return; + } long item = -1; std::list selected_item_list; - while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) - { - if (!item) - { + while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { + if (!item) { wxBell(); return; } int index = GetItemIndex(item); - if (index == -1 || m_fileData[index].comparison_flags == fill) + if (index == -1 || m_fileData[index].comparison_flags == fill) { continue; + } - const CDirentry& entry = (*m_pDirectoryListing)[index]; + CDirentry const& entry = (*m_pDirectoryListing)[index]; selected_item_list.push_back(entry); } - if (selected_item_list.empty()) - { + if (selected_item_list.empty()) { wxBell(); return; } - if (!wxTheClipboard->Open()) - { + if (!wxTheClipboard->Open()) { wxMessageBoxEx(_("Could not open clipboard"), _("Could not copy URLs"), wxICON_EXCLAMATION); return; } const CServerPath& path = m_pDirectoryListing->path; - const wxString server = pServer->FormatServer(true); - if (selected_item_list.size() == 1) - { - wxString url = server; - url += path.FormatFilename(selected_item_list.front().name, false); - // Poor mans URLencode - url.Replace(_T(" "), _T("%20")); + wxString const url = server.Format((event.GetId() == XRCID("ID_GETURL_PASSWORD")) ? ServerFormat::url_with_password : ServerFormat::url); + + auto getUrl = [](wxString const& serverPart, CServerPath const& path, std::wstring const& name) { + wxString url = serverPart; - wxTheClipboard->SetData(new wxURLDataObject(url)); + auto const pathPart = fz::percent_encode_w(path.FormatFilename(name, false), true); + if (!pathPart.empty() && pathPart[0] != '/') { + url += '/'; + } + url += pathPart; + + return url; + }; + + wxString urls; + if (selected_item_list.size() == 1) { + urls = getUrl(url, path, selected_item_list.front().name); } - else - { - wxString urls; - for (std::list::const_iterator iter = selected_item_list.begin(); iter != selected_item_list.end(); ++iter) - { - urls += server; - urls += path.FormatFilename(iter->name, false); + else { + for (auto const& entry : selected_item_list) { + urls += getUrl(url, path, entry.name); #ifdef __WXMSW__ urls += _T("\r\n"); #else urls += _T("\n"); #endif } - - // Poor mans URLencode - urls.Replace(_T(" "), _T("%20")); - - wxTheClipboard->SetData(new wxTextDataObject(urls)); } + wxTheClipboard->SetData(new wxURLDataObject(urls)); wxTheClipboard->Flush(); wxTheClipboard->Close(); @@ -2563,13 +2656,16 @@ int CRemoteListView::GetOverlayIndex(int item) { int index = GetItemIndex(item); - if (index == -1) + if (index == -1) { return 0; - if ((unsigned int)index >= m_pDirectoryListing->GetCount()) + } + if ((unsigned int)index >= m_pDirectoryListing->GetCount()) { return 0; + } - if ((*m_pDirectoryListing)[index].is_link()) + if ((*m_pDirectoryListing)[index].is_link()) { return GetLinkOverlayIndex(); + } return 0; } @@ -2577,14 +2673,13 @@ void CRemoteListView::OnMenuRefresh(wxCommandEvent&) { - if (m_pState) - m_pState->RefreshRemote(); + m_state.RefreshRemote(); } void CRemoteListView::OnNavigationEvent(bool forward) { if (!forward) { - if (!m_pState->IsRemoteIdle(true)) { + if (!m_state.IsRemoteIdle(true)) { wxBell(); return; } @@ -2594,30 +2689,32 @@ return; } - m_pState->ChangeRemoteDir(m_pDirectoryListing->path, _T("..")); + m_state.ChangeRemoteDir(m_pDirectoryListing->path, _T("..")); } } void CRemoteListView::OnMenuNewfile(wxCommandEvent&) { - if (!m_pState->IsRemoteIdle() || !m_pDirectoryListing) { + if (!m_state.IsRemoteIdle() || !m_pDirectoryListing) { wxBell(); return; } CInputDialog dlg; - if (!dlg.Create(this, _("Create empty file"), _("Please enter the name of the file which should be created:"))) + if (!dlg.Create(this, _("Create empty file"), _("Please enter the name of the file which should be created:"))) { return; + } - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } if (dlg.GetValue().empty()) { wxBell(); return; } - wxString newFileName = dlg.GetValue(); + std::wstring newFileName = dlg.GetValue().ToStdWstring(); // Check if target file already exists for (unsigned int i = 0; i < m_pDirectoryListing->GetCount(); ++i) { @@ -2629,22 +2726,21 @@ CEditHandler* edithandler = CEditHandler::Get(); // Used to get the temporary folder - wxString emptyfile_name = _T("empty_file_yq744zm"); - wxString emptyfile = edithandler->GetLocalDirectory() + emptyfile_name; + std::wstring const emptyfile_name = L"empty_file_yq744zm"; + std::wstring emptyfile = edithandler->GetLocalDirectory() + emptyfile_name; // Create the empty temporary file { - wxFile file; - wxLogNull log; - file.Create(emptyfile); + fz::file f(fz::to_native(emptyfile), fz::file::writing, fz::file::existing); + (void)f; } - const CServer* pServer = m_pState->GetServer(); - if (!pServer) { + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { wxBell(); return; } CFileTransferCommand *cmd = new CFileTransferCommand(emptyfile, m_pDirectoryListing->path, newFileName, false, CFileTransferCommand::t_transferSettings()); - m_pState->m_pCommandQueue->ProcessCommand(cmd); + m_state.m_pCommandQueue->ProcessCommand(cmd); } diff -Nru filezilla-3.15.0.2/src/interface/RemoteListView.h filezilla-3.33.0/src/interface/RemoteListView.h --- filezilla-3.15.0.2/src/interface/RemoteListView.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/RemoteListView.h 2018-03-29 08:59:00.000000000 +0000 @@ -1,20 +1,22 @@ -#ifndef __REMOTELISTVIEW_H__ -#define __REMOTELISTVIEW_H__ +#ifndef FILEZILLA_INTERFACE_REMOTELISTVIEW_HEADER +#define FILEZILLA_INTERFACE_REMOTELISTVIEW_HEADER #include "state.h" #include "listctrlex.h" #include "filelistctrl.h" -class CQueueView; class CChmodDialog; class CInfoText; +class CQueueView; class CRemoteListViewDropTarget; +class CView; +class CWindowTinter; -class CRemoteListView : public CFileListCtrl, CStateEventHandler +class CRemoteListView final : public CFileListCtrl, CStateEventHandler { friend class CRemoteListViewDropTarget; public: - CRemoteListView(wxWindow* pParent, CState* pState, CQueueView* pQueue); + CRemoteListView(CView* pParent, CState& state, CQueueView* pQueue); virtual ~CRemoteListView(); virtual bool CanStartComparison(); @@ -23,7 +25,21 @@ virtual void FinishComparison(); virtual void OnExitComparisonMode(); - void LinkIsNotDir(const CServerPath& path, const wxString& link); + void LinkIsNotDir(CServerPath const& path, std::wstring const& link); + + struct ChmodUICommand + { + wxWindow *parentWindow; + char *permissions; + int fileCount; + int dirCount; + std::wstring const &name; + }; + + typedef std::function ChmodHandler; + + static std::map chmodHandlers; + protected: virtual wxString GetItemText(int item, unsigned int column); @@ -49,9 +65,9 @@ bool IsItemValid(unsigned int item) const; int GetItemIndex(unsigned int item) const; - virtual CSortComparisonObject GetSortComparisonObject(); + virtual std::unique_ptr GetSortComparisonObject() override; - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2); + virtual void OnStateChange(t_statechange_notifications notification, const wxString& data, const void* data2); void ApplyCurrentFilter(); void SetDirectoryListing(std::shared_ptr const& pDirectoryListing); bool UpdateDirectoryListing(std::shared_ptr const& pDirectoryListing); @@ -67,7 +83,9 @@ std::shared_ptr m_pDirectoryListing; // Caller is responsible to check selection is valid! - void TransferSelectedFiles(const CLocalPath& local_parent, bool queueOnly); + void TransferSelectedFiles(const CLocalPath& local_parent, bool queue_only); + + void HandleGenericChmod(ChmodUICommand &command); // Cache icon for directories, no need to calculate it multiple times int m_dirIcon; @@ -90,7 +108,7 @@ // already. struct t_linkResolveState { - CServer server; + ServerWithCredentials server; CServerPath remote_path; wxString link; CLocalPath local_path; @@ -99,6 +117,10 @@ CServerPath MenuMkdir(); + std::unique_ptr m_windowTinter; + + CView *m_parentView{}; + DECLARE_EVENT_TABLE() void OnItemActivated(wxListEvent &event); void OnContextMenu(wxContextMenuEvent& event); @@ -113,7 +135,7 @@ void OnBeginDrag(wxListEvent&); void OnMenuEdit(wxCommandEvent&); void OnMenuEnter(wxCommandEvent&); - void OnMenuGeturl(wxCommandEvent&); + void OnMenuGeturl(wxCommandEvent& event); void OnMenuRefresh(wxCommandEvent&); void OnMenuNewfile(wxCommandEvent& event); }; diff -Nru filezilla-3.15.0.2/src/interface/remote_recursive_operation.cpp filezilla-3.33.0/src/interface/remote_recursive_operation.cpp --- filezilla-3.15.0.2/src/interface/remote_recursive_operation.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/remote_recursive_operation.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -0,0 +1,492 @@ +#include +#include "remote_recursive_operation.h" +#include "commandqueue.h" +#include "chmoddialog.h" +#include "filter.h" +#include "Options.h" +#include "queue.h" + +#include +#include + +recursion_root::recursion_root(CServerPath const& start_dir, bool allow_parent) + : m_remoteStartDir(start_dir) + , m_allowParent(allow_parent) +{ + wxASSERT_MSG(!start_dir.empty(), _T("Empty startDir in recursion_root constructor")); +} + +void recursion_root::add_dir_to_visit(CServerPath const& path, std::wstring const& subdir, CLocalPath const& localDir, bool is_link) +{ + new_dir dirToVisit; + + dirToVisit.localDir = localDir; + dirToVisit.parent = path; + dirToVisit.subdir = subdir; + dirToVisit.link = is_link ? 2 : 0; + m_dirsToVisit.push_back(dirToVisit); +} + +void recursion_root::add_dir_to_visit_restricted(CServerPath const& path, std::wstring const& restrict, bool recurse) +{ + new_dir dirToVisit; + dirToVisit.parent = path; + dirToVisit.recurse = recurse; + if (!restrict.empty()) { + dirToVisit.restrict = fz::sparse_optional(restrict); + } + m_dirsToVisit.push_back(dirToVisit); +} + +CRemoteRecursiveOperation::CRemoteRecursiveOperation(CState &state) + : CRecursiveOperation(state) +{ + state.RegisterHandler(this, STATECHANGE_REMOTE_DIR_OTHER); + state.RegisterHandler(this, STATECHANGE_REMOTE_LINKNOTDIR); +} + +CRemoteRecursiveOperation::~CRemoteRecursiveOperation() +{ + if (m_pChmodDlg) { + m_pChmodDlg->Destroy(); + m_pChmodDlg = 0; + } +} + +void CRemoteRecursiveOperation::OnStateChange(t_statechange_notifications notification, const wxString&, const void* data2) +{ + if (notification == STATECHANGE_REMOTE_DIR_OTHER && data2) { + std::shared_ptr const& listing = *reinterpret_cast const*>(data2); + ProcessDirectoryListing(listing.get()); + } + else if (notification == STATECHANGE_REMOTE_LINKNOTDIR) { + wxASSERT(data2); + LinkIsNotDir(); + } +} + +void CRemoteRecursiveOperation::AddRecursionRoot(recursion_root && root) +{ + if (!root.empty()) { + recursion_roots_.push_back(std::forward(root)); + } +} + +void CRemoteRecursiveOperation::StartRecursiveOperation(OperationMode mode, ActiveFilters const& filters, CServerPath const& finalDir, bool immediate) +{ + wxCHECK_RET(m_operationMode == recursive_none, _T("StartRecursiveOperation called with m_operationMode != recursive_none")); + wxCHECK_RET(m_state.IsRemoteConnected(), _T("StartRecursiveOperation while disconnected")); + wxCHECK_RET(!finalDir.empty(), _T("Empty final dir in recursive operation")); + + if (mode == recursive_chmod && !m_pChmodDlg) { + return; + } + + if ((mode == recursive_transfer || mode == recursive_transfer_flatten) && !m_pQueue) { + return; + } + + if (recursion_roots_.empty()) { + // Nothing to do in this case + return; + } + + m_processedFiles = 0; + m_processedDirectories = 0; + + m_immediate = immediate; + m_operationMode = mode; + + if ((mode == CRecursiveOperation::recursive_transfer || mode == CRecursiveOperation::recursive_transfer_flatten) && immediate) { + m_actionAfterBlocker = m_pQueue->GetActionAfterBlocker(); + } + + m_state.NotifyHandlers(STATECHANGE_REMOTE_IDLE); + m_state.NotifyHandlers(STATECHANGE_REMOTE_RECURSION_STATUS); + + m_filters = filters; + + NextOperation(); +} + +bool CRemoteRecursiveOperation::NextOperation() +{ + if (m_operationMode == recursive_none) { + return false; + } + + while (!recursion_roots_.empty()) { + auto & root = recursion_roots_.front(); + while (!root.m_dirsToVisit.empty()) { + const recursion_root::new_dir& dirToVisit = root.m_dirsToVisit.front(); + if (m_operationMode == recursive_delete && !dirToVisit.doVisit) { + m_state.m_pCommandQueue->ProcessCommand(new CRemoveDirCommand(dirToVisit.parent, dirToVisit.subdir), CCommandQueue::recursiveOperation); + root.m_dirsToVisit.pop_front(); + continue; + } + + CListCommand* cmd = new CListCommand(dirToVisit.parent, dirToVisit.subdir, dirToVisit.link ? LIST_FLAG_LINK : 0); + m_state.m_pCommandQueue->ProcessCommand(cmd, CCommandQueue::recursiveOperation); + return true; + } + + recursion_roots_.pop_front(); + } + + if (m_operationMode == recursive_delete && !m_finalDir.empty()) { + // After a deletion we cannot refresh if inside the deleted directories. Navigate user out if it + auto curPath = m_state.GetRemotePath(); + if (!curPath.empty() && (curPath == m_finalDir || m_finalDir.IsParentOf(curPath, false))) { + StopRecursiveOperation(); + m_state.ChangeRemoteDir(m_finalDir, std::wstring(), LIST_FLAG_REFRESH); + return false; + } + } + + StopRecursiveOperation(); + m_state.RefreshRemote(); + return false; +} + +bool CRemoteRecursiveOperation::BelowRecursionRoot(const CServerPath& path, recursion_root::new_dir &dir) +{ + if (!dir.start_dir.empty()) { + if (path.IsSubdirOf(dir.start_dir, false)) { + return true; + } + else { + return false; + } + } + + auto & root = recursion_roots_.front(); + if (path.IsSubdirOf(root.m_remoteStartDir, false)) { + return true; + } + + // In some cases (chmod from tree for example) it is neccessary to list the + // parent first + if (path == root.m_remoteStartDir && root.m_allowParent) { + return true; + } + + if (dir.link == 2) { + dir.start_dir = path; + return true; + } + + return false; +} + +// Defined in RemoteListView.cpp +std::wstring StripVMSRevision(std::wstring const& name); + +void CRemoteRecursiveOperation::ProcessDirectoryListing(const CDirectoryListing* pDirectoryListing) +{ + if (!pDirectoryListing) { + StopRecursiveOperation(); + return; + } + + if (m_operationMode == recursive_none || recursion_roots_.empty()) + return; + + if (pDirectoryListing->failed()) { + // Ignore this. + // It will get handled by the failed command in ListingFailed + return; + } + + auto & root = recursion_roots_.front(); + wxASSERT(!root.m_dirsToVisit.empty()); + + if (!m_state.IsRemoteConnected() || root.m_dirsToVisit.empty()) { + StopRecursiveOperation(); + return; + } + + recursion_root::new_dir dir = root.m_dirsToVisit.front(); + root.m_dirsToVisit.pop_front(); + + if (!BelowRecursionRoot(pDirectoryListing->path, dir)) { + NextOperation(); + return; + } + + if (m_operationMode == recursive_delete && dir.doVisit && !dir.subdir.empty()) { + // After recursing into directory to delete its contents, delete directory itself + // Gets handled in NextOperation + recursion_root::new_dir dir2 = dir; + dir2.doVisit = false; + root.m_dirsToVisit.push_front(dir2); + } + + if (dir.link && !dir.recurse) { + NextOperation(); + return; + } + + // Check if we have already visited the directory + if (!root.m_visitedDirs.insert(pDirectoryListing->path).second) { + NextOperation(); + return; + } + + ++m_processedDirectories; + + ServerWithCredentials const& server = m_state.GetServer(); + wxASSERT(server); + + if (!pDirectoryListing->GetCount() && m_operationMode == recursive_transfer) { + if (m_immediate) { + wxFileName::Mkdir(dir.localDir.GetPath(), 0777, wxPATH_MKDIR_FULL); + m_state.RefreshLocalFile(dir.localDir.GetPath()); + } + else { + m_pQueue->QueueFile(true, true, _T(""), _T(""), dir.localDir, CServerPath(), server, -1); + m_pQueue->QueueFile_Finish(false); + } + } + + CFilterManager filter; + + // Is operation restricted to a single child? + bool const restrict = static_cast(dir.restrict); + + std::deque filesToDelete; + + std::wstring const remotePath = pDirectoryListing->path.GetPath(); + + if (m_operationMode == recursive_synchronize_download && !dir.localDir.empty()) { + // Step one in synchronization: Delete local files not on the server + fz::local_filesys fs; + if (fs.begin_find_files(fz::to_native(dir.localDir.GetPath()))) { + std::list paths_to_delete; + + bool isLink{}; + fz::native_string name; + bool isDir{}; + int64_t size{}; + fz::datetime time; + int attributes{}; + while (fs.get_next_file(name, isLink, isDir, &size, &time, &attributes)) { + if (isLink) { + continue; + } + auto const wname = fz::to_wstring(name); + if (filter.FilenameFiltered(m_filters.first, wname, dir.localDir.GetPath(), isDir, size, attributes, time)) { + continue; + } + + // Local item isn't filtered + + int remoteIndex = pDirectoryListing->FindFile_CmpCase(fz::to_wstring(name)); + if (remoteIndex != -1) { + CDirentry const& entry = (*pDirectoryListing)[remoteIndex]; + if (!filter.FilenameFiltered(m_filters.second, entry.name, remotePath, entry.is_dir(), entry.size, 0, entry.time)) { + // Both local and remote items exist + + if (isDir == entry.is_dir() || entry.is_link()) { + // Normal item, nothing we should do + continue; + } + } + } + + // Local item should be deleted if reaching this point + paths_to_delete.push_back(fz::to_native(dir.localDir.GetPath()) + name); + } + + fz::recursive_remove r; + r.remove(paths_to_delete); + } + } + + bool added = false; + + for (int i = pDirectoryListing->GetCount() - 1; i >= 0; --i) { + const CDirentry& entry = (*pDirectoryListing)[i]; + + if (restrict) { + if (entry.name != *dir.restrict) + continue; + } + else if (filter.FilenameFiltered(m_filters.second, entry.name, remotePath, entry.is_dir(), entry.size, 0, entry.time)) + continue; + + if (!entry.is_dir()) { + ++m_processedFiles; + } + + if (entry.is_dir() && (!entry.is_link() || m_operationMode != recursive_delete)) { + if (dir.recurse) { + recursion_root::new_dir dirToVisit; + dirToVisit.parent = pDirectoryListing->path; + dirToVisit.subdir = entry.name; + dirToVisit.localDir = dir.localDir; + dirToVisit.start_dir = dir.start_dir; + + if (m_operationMode == recursive_transfer || m_operationMode == recursive_synchronize_download) { + // Non-flatten case + dirToVisit.localDir.AddSegment(CQueueView::ReplaceInvalidCharacters(entry.name)); + } + if (entry.is_link()) { + dirToVisit.link = 1; + dirToVisit.recurse = false; + } + root.m_dirsToVisit.push_front(dirToVisit); + } + } + else { + switch (m_operationMode) + { + case recursive_transfer: + case recursive_transfer_flatten: + case recursive_synchronize_download: + { + std::wstring localFile = CQueueView::ReplaceInvalidCharacters(entry.name); + if (pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) { + localFile = StripVMSRevision(localFile); + } + m_pQueue->QueueFile(!m_immediate, true, + entry.name, (entry.name == localFile) ? std::wstring() : localFile, + dir.localDir, pDirectoryListing->path, server, entry.size); + added = true; + } + break; + case recursive_delete: + filesToDelete.push_back(entry.name); + break; + default: + break; + } + } + + if (m_operationMode == recursive_chmod && m_pChmodDlg) { + const int applyType = m_pChmodDlg->GetApplyType(); + if (!applyType || + (!entry.is_dir() && applyType == 1) || + (entry.is_dir() && applyType == 2)) + { + char permissions[9]; + bool res = m_pChmodDlg->ConvertPermissions(*entry.permissions, permissions); + std::wstring newPerms = m_pChmodDlg->GetPermissions(res ? permissions : 0, entry.is_dir()).ToStdWstring(); + m_state.m_pCommandQueue->ProcessCommand(new CChmodCommand(pDirectoryListing->path, entry.name, newPerms), CCommandQueue::recursiveOperation); + } + } + } + if (added) { + m_pQueue->QueueFile_Finish(m_immediate); + } + + if (m_operationMode == recursive_delete && !filesToDelete.empty()) { + m_state.m_pCommandQueue->ProcessCommand(new CDeleteCommand(pDirectoryListing->path, std::move(filesToDelete)), CCommandQueue::recursiveOperation); + } + + m_state.NotifyHandlers(STATECHANGE_REMOTE_RECURSION_STATUS); + + NextOperation(); +} + +void CRemoteRecursiveOperation::SetChmodDialog(CChmodDialog* pChmodDialog) +{ + wxASSERT(pChmodDialog); + + if (m_pChmodDlg) + m_pChmodDlg->Destroy(); + + m_pChmodDlg = pChmodDialog; +} + +void CRemoteRecursiveOperation::StopRecursiveOperation() +{ + if (m_operationMode != recursive_none) { + m_operationMode = recursive_none; + m_state.NotifyHandlers(STATECHANGE_REMOTE_IDLE); + m_state.NotifyHandlers(STATECHANGE_REMOTE_RECURSION_STATUS); + } + recursion_roots_.clear(); + + if (m_pChmodDlg) { + m_pChmodDlg->Destroy(); + m_pChmodDlg = 0; + } + + m_actionAfterBlocker.reset(); +} + +void CRemoteRecursiveOperation::ListingFailed(int error) +{ + if (m_operationMode == recursive_none || recursion_roots_.empty()) { + return; + } + + if ((error & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { + // User has cancelled operation + StopRecursiveOperation(); + return; + } + + auto & root = recursion_roots_.front(); + wxCHECK_RET(!root.m_dirsToVisit.empty(), _T("Empty dirs to visit")); + + recursion_root::new_dir dir = root.m_dirsToVisit.front(); + root.m_dirsToVisit.pop_front(); + if ((error & FZ_REPLY_CRITICALERROR) != FZ_REPLY_CRITICALERROR && !dir.second_try) { + // Retry, could have been a temporary socket creating failure + // (e.g. hitting a blocked port) or a disconnect (e.g. no-filetransfer-timeout) + dir.second_try = true; + root.m_dirsToVisit.push_front(dir); + } + else { + if (m_operationMode == recursive_delete && dir.doVisit && !dir.subdir.empty()) { + // After recursing into directory to delete its contents, delete directory itself + // Gets handled in NextOperation + recursion_root::new_dir dir2 = dir; + dir2.doVisit = false; + root.m_dirsToVisit.push_front(dir2); + } + } + + NextOperation(); +} + +void CRemoteRecursiveOperation::LinkIsNotDir() +{ + if (m_operationMode == recursive_none || recursion_roots_.empty()) { + return; + } + + auto & root = recursion_roots_.front(); + wxCHECK_RET(!root.m_dirsToVisit.empty(), _T("Empty dirs to visit")); + + recursion_root::new_dir dir = root.m_dirsToVisit.front(); + root.m_dirsToVisit.pop_front(); + + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { + NextOperation(); + return; + } + + if (m_operationMode == recursive_delete) { + if (!dir.subdir.empty()) { + std::deque files; + files.push_back(dir.subdir); + m_state.m_pCommandQueue->ProcessCommand(new CDeleteCommand(dir.parent, std::move(files)), CCommandQueue::recursiveOperation); + } + NextOperation(); + return; + } + else if (m_operationMode != recursive_list) { + CLocalPath localPath = dir.localDir; + std::wstring localFile = dir.subdir; + if (m_operationMode != recursive_transfer_flatten) { + localPath.MakeParent(); + } + m_pQueue->QueueFile(!m_immediate, true, dir.subdir, (dir.subdir == localFile) ? std::wstring() : localFile, localPath, dir.parent, server, -1); + m_pQueue->QueueFile_Finish(m_immediate); + } + + NextOperation(); +} diff -Nru filezilla-3.15.0.2/src/interface/remote_recursive_operation.h filezilla-3.33.0/src/interface/remote_recursive_operation.h --- filezilla-3.15.0.2/src/interface/remote_recursive_operation.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/remote_recursive_operation.h 2017-09-19 21:36:39.000000000 +0000 @@ -0,0 +1,91 @@ +#ifndef FILEZILLA_REMOTE_RECURSIVE_OPERATION_HEADER +#define FILEZILLA_REMOTE_RECURSIVE_OPERATION_HEADER + +#include +#include "recursive_operation.h" +#include + +class CChmodDialog; + +class recursion_root final +{ +public: + recursion_root() = default; + recursion_root(CServerPath const& start_dir, bool allow_parent); + + void add_dir_to_visit(CServerPath const& path, std::wstring const& subdir, CLocalPath const& localDir = CLocalPath(), bool is_link = false); + + // Queue a directory but restrict processing to the named subdirectory + void add_dir_to_visit_restricted(CServerPath const& path, std::wstring const& restrict, bool recurse); + + bool empty() const { return m_dirsToVisit.empty(); } + +private: + friend class CRemoteRecursiveOperation; + + class new_dir final + { + public: + CServerPath parent; + std::wstring subdir; + CLocalPath localDir; + fz::sparse_optional restrict; + + // Symlink target might be outside actual start dir. Yet + // sometimes user wants to download symlink target contents + CServerPath start_dir; + + // 0 = not a link + // 1 = link, added by class during the operation + // 2 = link, added by user of class + int link{}; + + bool doVisit{true}; + bool recurse{true}; + bool second_try{}; + }; + + CServerPath m_remoteStartDir; + std::set m_visitedDirs; + std::deque m_dirsToVisit; + bool m_allowParent{}; +}; + +class CRemoteRecursiveOperation final : public CRecursiveOperation +{ +public: + CRemoteRecursiveOperation(CState& state); + virtual ~CRemoteRecursiveOperation(); + + void AddRecursionRoot(recursion_root && root); + void StartRecursiveOperation(OperationMode mode, ActiveFilters const& filters, CServerPath const& finalDir, bool immediate = true); + + // Needed for recursive_chmod + void SetChmodDialog(CChmodDialog* pChmodDialog); + + virtual void StopRecursiveOperation(); + +protected: + void LinkIsNotDir(); + void ListingFailed(int error); + + // Processes the directory listing in case of a recursive operation + void ProcessDirectoryListing(const CDirectoryListing* pDirectoryListing); + + bool NextOperation(); + + virtual void OnStateChange(t_statechange_notifications notification, const wxString&, const void* data2); + + bool BelowRecursionRoot(const CServerPath& path, recursion_root::new_dir &dir); + + std::deque recursion_roots_; + + CServerPath m_finalDir; + + // Needed for recursive_chmod + CChmodDialog* m_pChmodDlg{}; + + friend class CCommandQueue; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/interface/RemoteTreeView.cpp filezilla-3.33.0/src/interface/RemoteTreeView.cpp --- filezilla-3.15.0.2/src/interface/RemoteTreeView.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/RemoteTreeView.cpp 2018-05-01 03:30:04.000000000 +0000 @@ -1,21 +1,26 @@ #include -#include "RemoteTreeView.h" + +#include "chmoddialog.h" #include "commandqueue.h" -#include #include "dndobjects.h" -#include "chmoddialog.h" -#include "recursive_operation.h" -#include "inputdialog.h" #include "dragdropmanager.h" #include "drop_target_ex.h" -#include +#include "graphics.h" +#include "inputdialog.h" +#include "Options.h" #include "queue.h" #include "QueueView.h" +#include "RemoteTreeView.h" +#include "remote_recursive_operation.h" #include "themeprovider.h" -#include "Options.h" + +#include + +#include #include + class CItemData : public wxTreeItemData { public: @@ -23,7 +28,7 @@ CServerPath m_path; }; -class CRemoteTreeViewDropTarget : public CScrollableDropTarget +class CRemoteTreeViewDropTarget final : public CScrollableDropTarget { public: CRemoteTreeViewDropTarget(CRemoteTreeView* pRemoteTreeView) @@ -52,8 +57,9 @@ int flags = 0; wxTreeItemId hit = m_pRemoteTreeView->HitTest(point, flags); - if (flags & (wxTREE_HITTEST_ABOVE | wxTREE_HITTEST_BELOW | wxTREE_HITTEST_NOWHERE | wxTREE_HITTEST_TOLEFT | wxTREE_HITTEST_TORIGHT)) + if (flags & (wxTREE_HITTEST_ABOVE | wxTREE_HITTEST_BELOW | wxTREE_HITTEST_NOWHERE | wxTREE_HITTEST_TOLEFT | wxTREE_HITTEST_TORIGHT)) { return wxTreeItemId(); + } return hit; } @@ -66,32 +72,34 @@ return def; wxTreeItemId hit = GetHit(wxPoint(x, y)); - if (!hit) + if (!hit) { return wxDragNone; + } CServerPath path = m_pRemoteTreeView->GetPathFromItem(hit); - if (path.empty()) + if (path.empty()) { return wxDragNone; + } - if (!GetData()) + if (!GetData()) { return wxDragError; + } CDragDropManager* pDragDropManager = CDragDropManager::Get(); - if (pDragDropManager) + if (pDragDropManager) { pDragDropManager->pDropTarget = m_pRemoteTreeView; + } - if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) - m_pRemoteTreeView->m_pState->UploadDroppedFiles(m_pFileDataObject, path, false); - else - { - if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) - { + if (m_pDataObject->GetReceivedFormat() == m_pFileDataObject->GetFormat()) { + m_pRemoteTreeView->m_state.UploadDroppedFiles(m_pFileDataObject, path, false); + } + else { + if (m_pRemoteDataObject->GetProcessId() != (int)wxGetProcessId()) { wxMessageBoxEx(_("Drag&drop between different instances of FileZilla has not been implemented yet.")); return wxDragNone; } - if (!m_pRemoteTreeView->m_pState->GetServer() || !m_pRemoteDataObject->GetServer().EqualsNoPass(*m_pRemoteTreeView->m_pState->GetServer())) - { + if (!m_pRemoteTreeView->m_state.GetServer() || m_pRemoteDataObject->GetServer().server != m_pRemoteTreeView->m_state.GetServer().server) { wxMessageBoxEx(_("Drag&drop between different servers has not been implemented yet.")); return wxDragNone; } @@ -103,28 +111,23 @@ return wxDragNone; } - const std::list& files = m_pRemoteDataObject->GetFiles(); - for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) - { - const CRemoteDataObject::t_fileInfo& info = *iter; - if (info.dir) - { + std::vector const& files = m_pRemoteDataObject->GetFiles(); + for (auto const& info : files) { + if (info.dir) { CServerPath dir = m_pRemoteDataObject->GetServerPath(); dir.AddSegment(info.name); - if (dir == path) + if (dir == path) { return wxDragNone; - else if (dir.IsParentOf(path, false)) - { + } + else if (dir.IsParentOf(path, false)) { wxMessageBoxEx(_("A directory cannot be dragged into one of its subdirectories.")); return wxDragNone; } } } - for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) - { - const CRemoteDataObject::t_fileInfo& info = *iter; - m_pRemoteTreeView->m_pState->m_pCommandQueue->ProcessCommand( + for (auto const& info : files) { + m_pRemoteTreeView->m_state.m_pCommandQueue->ProcessCommand( new CRenameCommand(m_pRemoteDataObject->GetServerPath(), info.name, path, info.name) ); } @@ -219,8 +222,6 @@ wxDataObjectComposite* m_pDataObject; }; -IMPLEMENT_CLASS(CRemoteTreeView, wxTreeCtrlEx) - BEGIN_EVENT_TABLE(CRemoteTreeView, wxTreeCtrlEx) EVT_TREE_ITEM_EXPANDING(wxID_ANY, CRemoteTreeView::OnItemExpanding) EVT_TREE_SEL_CHANGED(wxID_ANY, CRemoteTreeView::OnSelectionChanged) @@ -240,24 +241,24 @@ EVT_MENU(XRCID("ID_GETURL"), CRemoteTreeView::OnMenuGeturl) END_EVENT_TABLE() -CRemoteTreeView::CRemoteTreeView(wxWindow* parent, wxWindowID id, CState* pState, CQueueView* pQueue) +CRemoteTreeView::CRemoteTreeView(wxWindow* parent, wxWindowID id, CState& state, CQueueView* pQueue) : wxTreeCtrlEx(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxTR_EDIT_LABELS | wxTR_LINES_AT_ROOT | wxTR_HAS_BUTTONS | wxNO_BORDER | wxTR_HIDE_ROOT), - CSystemImageList(16), - CStateEventHandler(pState) + CSystemImageList(CThemeProvider::GetIconSize(iconSizeSmall).x), + CStateEventHandler(state) { #ifdef __WXMAC__ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); #endif - pState->RegisterHandler(this, STATECHANGE_REMOTE_DIR); - pState->RegisterHandler(this, STATECHANGE_APPLYFILTER); + state.RegisterHandler(this, STATECHANGE_REMOTE_DIR); + state.RegisterHandler(this, STATECHANGE_APPLYFILTER); + state.RegisterHandler(this, STATECHANGE_SERVER); CreateImageList(); UpdateSortMode(); RegisterOption(OPTION_FILELIST_NAMESORT); - m_busy = false; m_pQueue = pQueue; AddRoot(_T("")); m_ExpandAfterList = wxTreeItemId(); @@ -265,6 +266,8 @@ SetDropTarget(new CRemoteTreeViewDropTarget(this)); Enable(false); + + m_windowTinter = std::make_unique(*this); } CRemoteTreeView::~CRemoteTreeView() @@ -273,12 +276,17 @@ delete m_pImageList; } -void CRemoteTreeView::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void* v) +void CRemoteTreeView::OnStateChange(t_statechange_notifications notification, const wxString&, const void* data2) { - if (notification == STATECHANGE_REMOTE_DIR) - SetDirectoryListing(pState->GetRemoteDir(), v ? *reinterpret_cast(v) : false); - else if (notification == STATECHANGE_APPLYFILTER) + if (notification == STATECHANGE_REMOTE_DIR) { + SetDirectoryListing(m_state.GetRemoteDir(), data2 ? *reinterpret_cast(data2) : false); + } + else if (notification == STATECHANGE_APPLYFILTER) { ApplyFilters(false); + } + else if (notification == STATECHANGE_SERVER) { + m_windowTinter->SetBackgroundTint(m_state.GetSite().m_colour); + } } void CRemoteTreeView::SetDirectoryListing(std::shared_ptr const& pListing, bool modified) @@ -312,12 +320,13 @@ return; } + bool const wasEmpty = GetChildrenCount(GetRootItem()) == 0; + #ifndef __WXMSW__ Freeze(); #endif wxTreeItemId parent = MakeParent(pListing->path, !modified); - if (!parent) - { + if (!parent) { m_busy = false; #ifndef __WXMSW__ Thaw(); @@ -325,19 +334,21 @@ return; } - if (!IsExpanded(parent) && parent != m_ExpandAfterList) - { + if (wasEmpty && GetItemParent(parent) == GetRootItem() && !m_ExpandAfterList) { + m_ExpandAfterList = parent; + } + + if (!IsExpanded(parent) && parent != m_ExpandAfterList) { DeleteChildren(parent); CFilterManager filter; - if (HasSubdirs(*pListing, filter)) + if (HasSubdirs(*pListing, filter)) { AppendItem(parent, _T(""), -1, -1); + } } - else - { + else { RefreshItem(parent, *pListing, !modified); - if (m_ExpandAfterList == parent) - { + if (m_ExpandAfterList == parent) { #ifndef __WXMSW__ // Prevent CalculatePositions from being called wxGenericTreeItem *anchor = m_anchor; @@ -356,11 +367,13 @@ #ifndef __WXMSW__ Thaw(); #endif - if (!modified) + if (!modified) { SafeSelectItem(parent); + } #ifndef __WXMSW__ - else + else { Refresh(); + } #endif m_busy = false; @@ -368,11 +381,11 @@ wxTreeItemId CRemoteTreeView::MakeParent(CServerPath path, bool select) { - std::vector pieces; + std::vector pieces; pieces.reserve(path.SegmentCount() + 1); while (path.HasParent()) { pieces.push_back(path.GetLastSegment()); - path = path.GetParent(); + path.MakeParent(); } wxASSERT(!path.GetPath().empty()); pieces.push_back(path.GetPath()); @@ -380,27 +393,30 @@ const wxTreeItemId root = GetRootItem(); wxTreeItemId parent = root; - for (std::vector::const_reverse_iterator iter = pieces.rbegin(); iter != pieces.rend(); ++iter) { - if (iter != pieces.rbegin()) + for (auto iter = pieces.crbegin(); iter != pieces.crend(); ++iter) { + if (iter != pieces.rbegin()) { path.AddSegment(*iter); + } wxTreeItemIdValue cookie; wxTreeItemId child = GetFirstChild(parent, cookie); if (child && GetItemText(child).empty()) { Delete(child); child = wxTreeItemId(); - if (parent != root) + if (parent != root) { ListExpand(parent); + } } for (child = GetFirstChild(parent, cookie); child; child = GetNextSibling(child)) { const wxString& text = GetItemText(child); - if (text == *iter) + if (text == *iter) { break; + } } if (!child) { CDirectoryListing listing; - if (m_pState->m_pEngine->CacheLookup(path, listing) == FZ_REPLY_OK) { + if (m_state.m_pEngine->CacheLookup(path, listing) == FZ_REPLY_OK) { child = AppendItem(parent, *iter, 0, 2, path.HasParent() ? 0 : new CItemData(path)); SetItemImages(child, false); } @@ -412,8 +428,9 @@ auto nextIter = iter; ++nextIter; - if (nextIter != pieces.rend()) + if (nextIter != pieces.rend()) { DisplayItem(child, listing); + } } if (select && iter != pieces.rbegin()) { #ifndef __WXMSW__ @@ -433,52 +450,46 @@ return parent; } -wxBitmap CRemoteTreeView::CreateIcon(int index, const wxString& overlay /*=_T("")*/) +wxBitmap CRemoteTreeView::CreateIcon(int index, const wxString& overlay) { - // Create memory DC - wxSize s = CThemeProvider::GetIconSize(iconSizeSmall); + auto * imageList = GetSystemImageList(); #ifdef __WXMSW__ - wxBitmap bmp(s.x, s.y, 32); + // Need to use wxImageList::GetIcon, wxImageList::GetBitmap kills the alpha channel on MSW... + wxBitmap bmp = imageList ? imageList->GetIcon(index) : wxBitmap(); #else - wxBitmap bmp(s.x, s.y, 24); + wxBitmap bmp = imageList ? imageList->GetBitmap(index) : wxBitmap(); #endif - wxMemoryDC dc; - dc.SelectObject(bmp); - - // Make sure the background is set correctly - dc.SetBrush(wxBrush(GetBackgroundColour())); - dc.SetPen(wxPen(GetBackgroundColour())); - dc.DrawRectangle(0, 0, s.x, s.y); - - // Draw item from system image list - GetSystemImageList()->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT); - - // Load overlay if (!overlay.empty()) { - wxImage unknownIcon = wxArtProvider::GetBitmap(overlay, wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)).ConvertToImage(); - - // Convert mask into alpha channel - if (unknownIcon.IsOk() && !unknownIcon.HasAlpha()) { - wxASSERT(unknownIcon.HasMask()); - unknownIcon.InitAlpha(); - } + wxBitmap unknown = CThemeProvider::Get()->CreateBitmap(overlay, wxART_OTHER, bmp.GetScaledSize()); + Overlay(bmp, unknown); + } - // Draw overlay - dc.DrawBitmap(unknownIcon, 0, 0, true); + if (!bmp.IsOk()) { + bmp.Create(CThemeProvider::GetIconSize(iconSizeSmall)); } - dc.SelectObject(wxNullBitmap); return bmp; } void CRemoteTreeView::CreateImageList() { - wxSize s = CThemeProvider::GetIconSize(iconSizeSmall); - m_pImageList = new wxImageList(s.x, s.y, true, 4); + if (!GetSystemImageList()) { + return; + } // Normal directory int index = GetIconIndex(iconType::dir, _T("{78013B9C-3532-4fe1-A418-5CD1955127CC}"), false); - m_pImageList->Add(CreateIcon(index)); + wxBitmap dirIcon = CreateIcon(index); + + wxSize s = dirIcon.GetScaledSize(); + + // Must create image list only after we know actual icon size, + // wxSystemSettings cannot return the correct size due to a bug in + // Windows. On Vista and possibly 7, the documentation does not + // match Windows' actual behavior. + m_pImageList = new wxImageList(s.x, s.y, true, 4); + + m_pImageList->Add(dirIcon); m_pImageList->Add(CreateIcon(index, _T("ART_UNKNOWN"))); // Opened directory @@ -491,20 +502,23 @@ bool CRemoteTreeView::HasSubdirs(const CDirectoryListing& listing, const CFilterManager& filter) { - if (!listing.has_dirs()) + if (!listing.has_dirs()) { return false; + } - if (!filter.HasActiveFilters()) + if (!filter.HasActiveFilters()) { return true; + } const wxString path = listing.path.GetPath(); - for (unsigned int i = 0; i < listing.GetCount(); i++) - { - if (!listing[i].is_dir()) + for (unsigned int i = 0; i < listing.GetCount(); ++i) { + if (!listing[i].is_dir()) { continue; + } - if (filter.FilenameFiltered(listing[i].name, path, true, -1, false, 0, listing[i].time)) + if (filter.FilenameFiltered(listing[i].name, path, true, -1, false, 0, listing[i].time)) { continue; + } return true; } @@ -520,24 +534,27 @@ CFilterDialog filter; for (unsigned int i = 0; i < listing.GetCount(); ++i) { - if (!listing[i].is_dir()) + if (!listing[i].is_dir()) { continue; + } - if (filter.FilenameFiltered(listing[i].name, path, true, -1, false, 0, listing[i].time)) + if (filter.FilenameFiltered(listing[i].name, path, true, -1, false, 0, listing[i].time)) { continue; + } - const wxString& name = listing[i].name; + std::wstring const& name = listing[i].name; CServerPath subdir = listing.path; subdir.AddSegment(name); CDirectoryListing subListing; - if (m_pState->m_pEngine->CacheLookup(subdir, subListing) == FZ_REPLY_OK) { + if (m_state.m_pEngine->CacheLookup(subdir, subListing) == FZ_REPLY_OK) { wxTreeItemId child = AppendItem(parent, name, 0, 2, 0); SetItemImages(child, false); - if (HasSubdirs(subListing, filter)) + if (HasSubdirs(subListing, filter)) { AppendItem(child, _T(""), -1, -1); + } } else { wxTreeItemId child = AppendItem(parent, name, 1, 3, 0); @@ -562,13 +579,15 @@ wxString const path = listing.path.GetPath(); - std::vector dirs; + std::vector dirs; for (unsigned int i = 0; i < listing.GetCount(); ++i) { - if (!listing[i].is_dir()) + if (!listing[i].is_dir()) { continue; + } - if (!filter.FilenameFiltered(listing[i].name, path, true, -1, false, 0, listing[i].time)) + if (!filter.FilenameFiltered(listing[i].name, path, true, -1, false, 0, listing[i].time)) { dirs.push_back(listing[i].name); + } } auto const& sortFunc = CFileListCtrlSortBase::GetCmpFunction(m_nameSortMode); @@ -578,20 +597,22 @@ child = GetLastChild(parent); auto iter = dirs.rbegin(); while (child && iter != dirs.rend()) { - int cmp = sortFunc(GetItemText(child), *iter); + int cmp = sortFunc(GetItemText(child).ToStdWstring(), *iter); if (!cmp) { CServerPath childPath = listing.path; childPath.AddSegment(*iter); CDirectoryListing subListing; - if (m_pState->m_pEngine->CacheLookup(childPath, subListing) == FZ_REPLY_OK) { - if (!GetLastChild(child) && HasSubdirs(subListing, filter)) + if (m_state.m_pEngine->CacheLookup(childPath, subListing) == FZ_REPLY_OK) { + if (!GetLastChild(child) && HasSubdirs(subListing, filter)) { AppendItem(child, _T(""), -1, -1); + } SetItemImages(child, false); } - else + else { SetItemImages(child, true); + } child = GetPrevSibling(child); ++iter; @@ -612,7 +633,7 @@ childPath.AddSegment(*iter); CDirectoryListing subListing; - if (m_pState->m_pEngine->CacheLookup(childPath, subListing) == FZ_REPLY_OK) { + if (m_state.m_pEngine->CacheLookup(childPath, subListing) == FZ_REPLY_OK) { wxTreeItemId childItem = AppendItem(parent, *iter, 0, 2, 0); if (childItem) { SetItemImages(childItem, false); @@ -648,7 +669,7 @@ childPath.AddSegment(*iter); CDirectoryListing subListing; - if (m_pState->m_pEngine->CacheLookup(childPath, subListing) == FZ_REPLY_OK) { + if (m_state.m_pEngine->CacheLookup(childPath, subListing) == FZ_REPLY_OK) { wxTreeItemId childItem = AppendItem(parent, *iter, 0, 2, 0); if (childItem) { SetItemImages(childItem, false); @@ -675,15 +696,16 @@ void CRemoteTreeView::OnItemExpanding(wxTreeEvent& event) { - if (m_busy) + if (m_busy) { return; + } wxTreeItemId item = event.GetItem(); - if (!item) + if (!item) { return; + } - if (!ListExpand(item)) - { + if (!ListExpand(item)) { event.Veto(); return; } @@ -716,26 +738,30 @@ void CRemoteTreeView::OnSelectionChanged(wxTreeEvent& event) { - if (event.GetItem() != m_ExpandAfterList) + if (event.GetItem() != m_ExpandAfterList) { m_ExpandAfterList = wxTreeItemId(); - if (m_busy) + } + if (m_busy) { return; + } - if (!m_pState->IsRemoteIdle(true)) { + if (!m_state.IsRemoteIdle(true)) { wxBell(); return; } wxTreeItemId item = event.GetItem(); - if (!item) + if (!item) { return; + } const CServerPath path = GetPathFromItem(item); wxASSERT(!path.empty()); - if (path.empty()) + if (path.empty()) { return; + } - m_pState->ChangeRemoteDir(path); + m_state.ChangeRemoteDir(path); } void CRemoteTreeView::OnItemActivated(wxTreeEvent& event) @@ -749,16 +775,14 @@ std::list segments; wxTreeItemId i = item; - while (i != GetRootItem()) - { + while (i != GetRootItem()) { const CItemData* const pData = (const CItemData*)GetItemData(i); - if (pData) - { + if (pData) { CServerPath path = pData->m_path; - for (std::list::const_iterator iter = segments.begin(); iter != segments.end(); ++iter) - { - if (!path.AddSegment(*iter)) + for (std::list::const_iterator iter = segments.begin(); iter != segments.end(); ++iter) { + if (!path.AddSegment(iter->ToStdWstring())) { return CServerPath(); + } } return path; } @@ -772,34 +796,40 @@ void CRemoteTreeView::OnBeginDrag(wxTreeEvent& event) { + if (COptions::Get()->GetOptionVal(OPTION_DND_DISABLED) != 0) { + return; + } + // Drag could result in recursive operation, don't allow at this point - if (!m_pState->IsRemoteIdle()) { + if (!m_state.IsRemoteIdle()) { wxBell(); return; } const wxTreeItemId& item = event.GetItem(); - if (!item) + if (!item) { return; + } CServerPath path = GetPathFromItem(item); - if (path.empty() || !path.HasParent()) + if (path.empty() || !path.HasParent()) { return; + } const CServerPath& parent = path.GetParent(); const wxString& lastSegment = path.GetLastSegment(); - if (lastSegment.empty()) + if (lastSegment.empty()) { return; + } wxDataObjectComposite object; - CServer const* pServer = m_pState->GetServer(); - if (!pServer) + ServerWithCredentials server = m_state.GetServer(); // Make a copy as DoDragDrop later runs the event loop + if (!server) { return; - CServer const server = *pServer; - + } - CRemoteDataObject *pRemoteDataObject = new CRemoteDataObject(*pServer, parent); + CRemoteDataObject *pRemoteDataObject = new CRemoteDataObject(server, parent); pRemoteDataObject->AddFile(lastSegment, true, -1, false); pRemoteDataObject->Finalize(); @@ -822,7 +852,7 @@ CDragDropManager* pDragDropManager = CDragDropManager::Init(); pDragDropManager->pDragSource = this; - pDragDropManager->server = *pServer; + pDragDropManager->server = server; pDragDropManager->remoteParent = parent; wxDropSource source(this); @@ -839,20 +869,20 @@ #if FZ3_USESHELLEXT if (ext) { if (!pRemoteDataObject->DidSendData()) { - pServer = m_pState->GetServer(); - if (!pServer || !m_pState->IsRemoteIdle() || *pServer != server) { + server = m_state.GetServer(); + if (!server || !m_state.IsRemoteIdle() || server != server) { wxBell(); return; } - CLocalPath target(ext->GetTarget()); + CLocalPath target(ext->GetTarget().ToStdWstring()); if (target.empty()) { ext.reset(); // Release extension before the modal message box wxMessageBoxEx(_("Could not determine the target of the Drag&Drop operation.\nEither the shell extension is not installed properly or you didn't drop the files into an Explorer window.")); return; } - m_pState->DownloadDroppedFiles(pRemoteDataObject, target); + m_state.DownloadDroppedFiles(pRemoteDataObject, target); } } #endif @@ -862,11 +892,12 @@ { m_contextMenuItem = event.GetItem(); wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_REMOTETREE")); - if (!pMenu) + if (!pMenu) { return; + } const CServerPath& path = m_contextMenuItem ? GetPathFromItem(m_contextMenuItem) : CServerPath(); - if (!m_pState->IsRemoteIdle() || path.empty()) { + if (!m_state.IsRemoteIdle() || path.empty()) { pMenu->Enable(XRCID("ID_DOWNLOAD"), false); pMenu->Enable(XRCID("ID_ADDTOQUEUE"), false); pMenu->Enable(XRCID("ID_MKDIR"), false); @@ -879,33 +910,38 @@ else if (!path.HasParent()) pMenu->Enable(XRCID("ID_RENAME"), false); - if (!m_pState->GetLocalDir().IsWriteable()) { + if (!m_state.GetLocalDir().IsWriteable()) { pMenu->Enable(XRCID("ID_DOWNLOAD"), false); pMenu->Enable(XRCID("ID_ADDTOQUEUE"), false); } + pMenu->Delete(XRCID(wxGetKeyState(WXK_SHIFT) ? "ID_GETURL" : "ID_GETURL_PASSWORD")); + PopupMenu(pMenu); delete pMenu; } void CRemoteTreeView::OnMenuChmod(wxCommandEvent&) { - if (!m_pState->IsRemoteIdle()) + if (!m_state.IsRemoteIdle()) { return; + } - if (!m_contextMenuItem) + if (!m_contextMenuItem) { return; + } const CServerPath& path = GetPathFromItem(m_contextMenuItem); - if (path.empty()) + if (path.empty()) { return; + } const bool hasParent = path.HasParent(); CChmodDialog* pChmodDlg = new CChmodDialog; // Get current permissions of directory - const wxString& name = GetItemText(m_contextMenuItem); + std::wstring const name = GetItemText(m_contextMenuItem).ToStdWstring(); char permissions[9] = {0}; bool cached = false; @@ -915,11 +951,12 @@ CDirectoryListing listing; // ... and it needs to be cached - cached = m_pState->m_pEngine->CacheLookup(parentPath, listing) == FZ_REPLY_OK; + cached = m_state.m_pEngine->CacheLookup(parentPath, listing) == FZ_REPLY_OK; if (cached) { for (unsigned int i = 0; i < listing.GetCount(); ++i) { - if (listing[i].name != name) + if (listing[i].name != name) { continue; + } pChmodDlg->ConvertPermissions(*listing[i].permissions, permissions); } @@ -939,7 +976,7 @@ } // State may have changed while chmod dialog was shown - if (!m_contextMenuItem || !m_pState->IsRemoteConnected() || !m_pState->IsRemoteIdle()) { + if (!m_contextMenuItem || !m_state.IsRemoteConnected() || !m_state.IsRemoteIdle()) { pChmodDlg->Destroy(); pChmodDlg = 0; return; @@ -951,24 +988,27 @@ if (cached) { // Implies hasParent // Change directory permissions if (!applyType || applyType == 2) { - wxString newPerms = pChmodDlg->GetPermissions(permissions, true); + std::wstring const newPerms = pChmodDlg->GetPermissions(permissions, true).ToStdWstring(); - m_pState->m_pCommandQueue->ProcessCommand(new CChmodCommand(path.GetParent(), name, newPerms)); + m_state.m_pCommandQueue->ProcessCommand(new CChmodCommand(path.GetParent(), name, newPerms)); } - if (pChmodDlg->Recursive()) + if (pChmodDlg->Recursive()) { // Start recursion - root.add_dir_to_visit(path, _T(""), CLocalPath()); + root.add_dir_to_visit(path, std::wstring(), CLocalPath()); + } } else { - if (hasParent) + if (hasParent) { root.add_dir_to_visit_restricted(path.GetParent(), name, pChmodDlg->Recursive()); - else - root.add_dir_to_visit_restricted(path, _T(""), pChmodDlg->Recursive()); + } + else { + root.add_dir_to_visit_restricted(path, std::wstring(), pChmodDlg->Recursive()); + } } if (!cached || pChmodDlg->Recursive()) { - CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); + CRemoteRecursiveOperation* pRecursiveOperation = m_state.GetRemoteRecursiveOperation(); pRecursiveOperation->AddRecursionRoot(std::move(root)); pRecursiveOperation->SetChmodDialog(pChmodDlg); @@ -977,58 +1017,62 @@ if (selected) currentPath = GetPathFromItem(selected); CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_chmod, filter.GetActiveFilters(false), currentPath); + pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_chmod, filter.GetActiveFilters(), currentPath); } else { pChmodDlg->Destroy(); const wxTreeItemId selected = GetSelection(); if (selected) { CServerPath currentPath = GetPathFromItem(selected); - m_pState->ChangeRemoteDir(currentPath); + m_state.ChangeRemoteDir(currentPath); } } } void CRemoteTreeView::OnMenuDownload(wxCommandEvent& event) { - CLocalPath localDir = m_pState->GetLocalDir(); + CLocalPath localDir = m_state.GetLocalDir(); if (!localDir.IsWriteable()) { wxBell(); return; } - if (!m_pState->IsRemoteIdle()) + if (!m_state.IsRemoteIdle()) { return; + } - if (!m_contextMenuItem) + if (!m_contextMenuItem) { return; + } const CServerPath& path = GetPathFromItem(m_contextMenuItem); - if (path.empty()) + if (path.empty()) { return; + } - const wxString& name = GetItemText(m_contextMenuItem); + std::wstring const name = GetItemText(m_contextMenuItem).ToStdWstring(); localDir.AddSegment(CQueueView::ReplaceInvalidCharacters(name)); recursion_root root(path, true); - root.add_dir_to_visit(path, _T(""), localDir); - CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); + root.add_dir_to_visit(path, std::wstring(), localDir); + CRemoteRecursiveOperation* pRecursiveOperation = m_state.GetRemoteRecursiveOperation(); pRecursiveOperation->AddRecursionRoot(std::move(root)); CServerPath currentPath; const wxTreeItemId selected = GetSelection(); - if (selected) + if (selected) { currentPath = GetPathFromItem(selected); + } const bool addOnly = event.GetId() == XRCID("ID_ADDTOQUEUE"); CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(addOnly ? CRecursiveOperation::recursive_addtoqueue : CRecursiveOperation::recursive_download, filter.GetActiveFilters(false), currentPath); + pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_transfer, filter.GetActiveFilters(), currentPath, !addOnly); } void CRemoteTreeView::OnMenuDelete(wxCommandEvent&) { - if (!m_pState->IsRemoteIdle()) + if (!m_state.IsRemoteIdle()) return; if (!m_contextMenuItem) @@ -1043,12 +1087,12 @@ const bool hasParent = pathToDelete.HasParent(); - CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); + CRemoteRecursiveOperation* pRecursiveOperation = m_state.GetRemoteRecursiveOperation(); recursion_root root; CServerPath startDir; if (hasParent) { - const wxString& name = GetItemText(m_contextMenuItem); + std::wstring const name = GetItemText(m_contextMenuItem).ToStdWstring(); startDir = pathToDelete.GetParent(); root = recursion_root(startDir, !hasParent); root.add_dir_to_visit(startDir, name); @@ -1056,7 +1100,7 @@ else { startDir = pathToDelete; root = recursion_root(startDir, !hasParent); - root.add_dir_to_visit(startDir, _T("")); + root.add_dir_to_visit(startDir, std::wstring()); } pRecursiveOperation->AddRecursionRoot(std::move(root)); @@ -1066,16 +1110,16 @@ currentPath = GetPathFromItem(selected); if (!currentPath.empty() && (pathToDelete == currentPath || pathToDelete.IsParentOf(currentPath, false))) { currentPath = startDir; - m_pState->ChangeRemoteDir(startDir); + m_state.ChangeRemoteDir(startDir); } CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_delete, filter.GetActiveFilters(false), currentPath); + pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_delete, filter.GetActiveFilters(), currentPath); } void CRemoteTreeView::OnMenuRename(wxCommandEvent&) { - if (!m_pState->IsRemoteIdle()) + if (!m_state.IsRemoteIdle()) return; if (!m_contextMenuItem) @@ -1093,7 +1137,7 @@ void CRemoteTreeView::OnBeginLabelEdit(wxTreeEvent& event) { - if (!m_pState->IsRemoteIdle()) { + if (!m_state.IsRemoteIdle()) { event.Veto(); return; } @@ -1117,7 +1161,7 @@ return; } - if (!m_pState->IsRemoteIdle()) { + if (!m_state.IsRemoteIdle()) { event.Veto(); return; } @@ -1131,22 +1175,24 @@ CServerPath old_path = GetPathFromItem(event.GetItem()); CServerPath parent = old_path.GetParent(); - const wxString& oldName = GetItemText(event.GetItem()); - const wxString& newName = event.GetLabel(); + std::wstring const oldName = GetItemText(event.GetItem()).ToStdWstring(); + std::wstring const newName = event.GetLabel().ToStdWstring(); if (oldName == newName) { event.Veto(); return; } - m_pState->m_pCommandQueue->ProcessCommand(new CRenameCommand(parent, oldName, parent, newName)); - m_pState->ChangeRemoteDir(parent); + m_state.m_pCommandQueue->ProcessCommand(new CRenameCommand(parent, oldName, parent, newName)); + m_state.ChangeRemoteDir(parent); CServerPath currentPath; const wxTreeItemId selected = GetSelection(); - if (selected) + if (selected) { currentPath = GetPathFromItem(selected); - if (currentPath.empty()) + } + if (currentPath.empty()) { return; + } if (currentPath == old_path || currentPath.IsSubdirOf(old_path, false)) { // Previously selected path was below renamed one, list the new one @@ -1162,12 +1208,14 @@ } currentPath = parent; currentPath.AddSegment(newName); - for (std::list::const_iterator iter = subdirs.begin(); iter != subdirs.end(); ++iter) - currentPath.AddSegment(*iter); - m_pState->ChangeRemoteDir(currentPath); + for (std::list::const_iterator iter = subdirs.begin(); iter != subdirs.end(); ++iter) { + currentPath.AddSegment(iter->ToStdWstring()); + } + m_state.ChangeRemoteDir(currentPath); + } + else if (currentPath != parent) { + m_state.ChangeRemoteDir(currentPath); } - else if (currentPath != parent) - m_pState->ChangeRemoteDir(currentPath); } @@ -1180,7 +1228,7 @@ if (newpath.HasParent()) { listed = newpath.GetParent(); - m_pState->ChangeRemoteDir(listed); + m_state.ChangeRemoteDir(listed); } CServerPath currentPath; @@ -1188,7 +1236,7 @@ if (selected) currentPath = GetPathFromItem(selected); if (!currentPath.empty() && currentPath != listed) - m_pState->ChangeRemoteDir(currentPath); + m_state.ChangeRemoteDir(currentPath); } @@ -1197,7 +1245,7 @@ { CServerPath newpath = MenuMkdir(); if (!newpath.empty()) { - m_pState->ChangeRemoteDir(newpath); + m_state.ChangeRemoteDir(newpath); } } @@ -1205,7 +1253,7 @@ // Returns the name of the new directory CServerPath CRemoteTreeView::MenuMkdir() { - if (!m_pState->IsRemoteIdle()) + if (!m_state.IsRemoteIdle()) return CServerPath(); if (!m_contextMenuItem) @@ -1224,7 +1272,7 @@ // Append a long segment which does (most likely) not exist in the path and // replace it with "New directory" later. This way we get the exact position of // "New directory" and can preselect it in the dialog. - wxString tmpName = _T("25CF809E56B343b5A12D1F0466E3B37A49A9087FDCF8412AA9AF8D1E849D01CF"); + std::wstring tmpName = _T("25CF809E56B343b5A12D1F0466E3B37A49A9087FDCF8412AA9AF8D1E849D01CF"); if (newPath.AddSegment(tmpName)) { wxString pathName = newPath.GetPath(); int pos = pathName.Find(tmpName); @@ -1239,12 +1287,12 @@ return CServerPath(); newPath = path; - if (!newPath.ChangePath(dlg.GetValue())) { + if (!newPath.ChangePath(dlg.GetValue().ToStdWstring())) { wxBell(); return CServerPath(); } - m_pState->m_pCommandQueue->ProcessCommand(new CMkdirCommand(newPath)); + m_state.m_pCommandQueue->ProcessCommand(new CMkdirCommand(newPath)); return newPath; } @@ -1257,7 +1305,7 @@ return false; CDirectoryListing listing; - if (m_pState->m_pEngine->CacheLookup(path, listing) == FZ_REPLY_OK) + if (m_state.m_pEngine->CacheLookup(path, listing) == FZ_REPLY_OK) RefreshItem(item, listing, false); else { @@ -1292,7 +1340,7 @@ void CRemoteTreeView::ApplyFilters(bool resort) { - std::list parents; + std::list<_parents> parents; const wxTreeItemId root = GetRootItem(); wxTreeItemIdValue cookie; @@ -1301,7 +1349,7 @@ if (path.empty()) continue; - struct _parents dir; + _parents dir; dir.item = child; dir.path = path; parents.push_back(dir); @@ -1309,7 +1357,7 @@ CFilterManager filter; while (!parents.empty()) { - struct _parents parent = parents.back(); + _parents parent = parents.back(); parents.pop_back(); if (resort) { @@ -1317,7 +1365,7 @@ } CDirectoryListing listing; - if (m_pState->m_pEngine->CacheLookup(parent.path, listing) == FZ_REPLY_OK) + if (m_state.m_pEngine->CacheLookup(parent.path, listing) == FZ_REPLY_OK) RefreshItem(parent.item, listing, false); else if (filter.HasActiveFilters()) { for (wxTreeItemId child = GetFirstChild(parent.item, cookie); child; child = GetNextSibling(child)) { @@ -1325,7 +1373,7 @@ if (path.empty()) continue; - if (filter.FilenameFiltered(GetItemText(child), path.GetPath(), true, -1, false, 0, fz::datetime())) { + if (filter.FilenameFiltered(GetItemText(child).ToStdWstring(), path.GetPath(), true, -1, false, 0, fz::datetime())) { wxTreeItemId sel = GetSelection(); while (sel && sel != child) sel = GetItemParent(sel); @@ -1335,7 +1383,7 @@ } } - struct _parents dir; + _parents dir; dir.item = child; dir.path = path; parents.push_back(dir); @@ -1349,7 +1397,7 @@ if (path.empty()) continue; - struct _parents dir; + _parents dir; dir.item = child; dir.path = path; parents.push_back(dir); @@ -1357,36 +1405,36 @@ } } -void CRemoteTreeView::OnMenuGeturl(wxCommandEvent&) +void CRemoteTreeView::OnMenuGeturl(wxCommandEvent& event) { - if (!m_contextMenuItem) + if (!m_contextMenuItem) { return; + } - const CServerPath& path = GetPathFromItem(m_contextMenuItem); - if (path.empty()) - { + CServerPath const& path = GetPathFromItem(m_contextMenuItem); + if (path.empty()) { wxBell(); return; } - const CServer *pServer = m_pState->GetServer(); - if (!pServer) - { + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { wxBell(); return; } - if (!wxTheClipboard->Open()) - { + if (!wxTheClipboard->Open()) { wxMessageBoxEx(_("Could not open clipboard"), _("Could not copy URLs"), wxICON_EXCLAMATION); return; } - wxString url = pServer->FormatServer(true); - url += path.GetPath(); + wxString url = server.Format((event.GetId() == XRCID("ID_GETURL_PASSWORD")) ? ServerFormat::url_with_password : ServerFormat::url); - // Poor mans URLencode - url.Replace(_T(" "), _T("%20")); + std::wstring const pathPart = fz::percent_encode_w(path.GetPath(), true); + if (!pathPart.empty() && pathPart[0] != '/') { + url += '/'; + } + url += pathPart; wxTheClipboard->SetData(new wxURLDataObject(url)); diff -Nru filezilla-3.15.0.2/src/interface/RemoteTreeView.h filezilla-3.33.0/src/interface/RemoteTreeView.h --- filezilla-3.15.0.2/src/interface/RemoteTreeView.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/RemoteTreeView.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __REMOTETREEVIEW_H__ -#define __REMOTETREEVIEW_H__ +#ifndef FILEZILLA_INTERFACE_REMOTETREEVIEW_HEADER +#define FILEZILLA_INTERFACE_REMOTETREEVIEW_HEADER #include #include "systemimagelist.h" @@ -8,20 +8,19 @@ #include "treectrlex.h" class CQueueView; -class CRemoteTreeView : public wxTreeCtrlEx, CSystemImageList, CStateEventHandler, COptionChangeEventHandler +class CWindowTinter; +class CRemoteTreeView final : public wxTreeCtrlEx, CSystemImageList, CStateEventHandler, COptionChangeEventHandler { - DECLARE_CLASS(CRemoteTreeView) - friend class CRemoteTreeViewDropTarget; public: - CRemoteTreeView(wxWindow* parent, wxWindowID id, CState* pState, CQueueView* pQueue); + CRemoteTreeView(wxWindow* parent, wxWindowID id, CState& state, CQueueView* pQueue); virtual ~CRemoteTreeView(); protected: wxTreeItemId MakeParent(CServerPath path, bool select); void SetDirectoryListing(std::shared_ptr const& pListing, bool modified); - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*); + virtual void OnStateChange(t_statechange_notifications notification, const wxString&, const void*); void DisplayItem(wxTreeItemId parent, const CDirectoryListing& listing); void RefreshItem(wxTreeItemId parent, const CDirectoryListing& listing, bool will_select_parent); @@ -40,11 +39,11 @@ void CreateImageList(); wxBitmap CreateIcon(int index, const wxString& overlay = _T("")); - wxImageList* m_pImageList; + wxImageList* m_pImageList{}; // Set to true in SetDirectoryListing. // Used to suspends event processing in OnItemExpanding for example - bool m_busy; + bool m_busy{}; wxTreeItemId m_ExpandAfterList; @@ -56,6 +55,10 @@ virtual void OnOptionsChanged(changed_options_t const& options); + std::unique_ptr m_windowTinter; + + wxTreeItemId m_contextMenuItem; + DECLARE_EVENT_TABLE() void OnItemExpanding(wxTreeEvent& event); void OnSelectionChanged(wxTreeEvent& event); @@ -71,9 +74,7 @@ void OnMkdir(wxCommandEvent&); void OnMenuMkdirChgDir(wxCommandEvent&); void OnChar(wxKeyEvent& event); - void OnMenuGeturl(wxCommandEvent&); - - wxTreeItemId m_contextMenuItem; + void OnMenuGeturl(wxCommandEvent& event); }; #endif Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/auto.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/auto.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/find.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/find.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/localtreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/localtreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/logview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/logview.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/16x16/Makefile.am filezilla-3.33.0/src/interface/resources/16x16/Makefile.am --- filezilla-3.15.0.2/src/interface/resources/16x16/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/16x16/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -resourcesdir = $(pkgdatadir)/resources/16x16 - -dist_resources_DATA = ascii.png \ - auto.png \ - binary.png \ - bookmark.png \ - cancel.png \ - compare.png \ - disconnect.png download.png downloadadd.png \ - file.png \ - filezilla.png \ - filter.png \ - find.png \ - folder.png folderclosed.png localtreeview.png \ - lock.png \ - logview.png processqueue.png queueview.png reconnect.png \ - refresh.png remotetreeview.png server.png sitemanager.png \ - sort_down_dark.png \ - sort_down_light.png \ - sort_up_dark.png \ - sort_up_light.png \ - speedlimits.png \ - symlink.png \ - synchronize.png \ - throbber.gif \ - unknown.png upload.png uploadadd.png - -if MACAPPBUNDLE -mac-copy-resources: $(dist_resources_DATA) - mkdir -p $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/16x16 - for i in $(dist_resources_DATA); \ - do cp -f $(srcdir)/$$i $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/16x16; \ - done -endif diff -Nru filezilla-3.15.0.2/src/interface/resources/16x16/Makefile.in filezilla-3.33.0/src/interface/resources/16x16/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/16x16/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/16x16/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,576 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/interface/resources/16x16 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/check_atomic.m4 \ - $(top_srcdir)/m4/check_libc++.m4 \ - $(top_srcdir)/m4/check_steady_clock.m4 \ - $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ - $(top_srcdir)/m4/d-type.m4 \ - $(top_srcdir)/m4/fz_check_pugixml.m4 \ - $(top_srcdir)/m4/fz_checkversion.m4 \ - $(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/map_emplace.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(resourcesdir)" -DATA = $(dist_resources_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_LIBS = @CPPUNIT_LIBS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FILEZILLA_LINGUAS = @FILEZILLA_LINGUAS@ -FILEZILLA_LINGUAS_MO = @FILEZILLA_LINGUAS_MO@ -FILEZILLA_LINGUAS_PO = @FILEZILLA_LINGUAS_PO@ -FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ -GREP = @GREP@ -HAVE_CXX14 = @HAVE_CXX14@ -IDN_LIB = @IDN_LIB@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBDBUS_CFLAGS = @LIBDBUS_CFLAGS@ -LIBDBUS_LIBS = @LIBDBUS_LIBS@ -LIBFILEZILLA_CFLAGS = @LIBFILEZILLA_CFLAGS@ -LIBFILEZILLA_LIBS = @LIBFILEZILLA_LIBS@ -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ -LIBGTK_CFLAGS = @LIBGTK_CFLAGS@ -LIBGTK_LIBS = @LIBGTK_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ -LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -NSIS_64BIT = @NSIS_64BIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PUGIXML_LIBS = @PUGIXML_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -WINDRESFLAGS = @WINDRESFLAGS@ -WXRC = @WXRC@ -WX_CFLAGS = @WX_CFLAGS@ -WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@ -WX_CONFIG_PATH = @WX_CONFIG_PATH@ -WX_CONFIG_WITH_ARGS = @WX_CONFIG_WITH_ARGS@ -WX_CPPFLAGS = @WX_CPPFLAGS@ -WX_CXXFLAGS = @WX_CXXFLAGS@ -WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@ -WX_LIBS = @WX_LIBS@ -WX_LIBS_STATIC = @WX_LIBS_STATIC@ -WX_RESCOMP = @WX_RESCOMP@ -WX_VERSION = @WX_VERSION@ -WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ -WX_VERSION_MICRO = @WX_VERSION_MICRO@ -WX_VERSION_MINOR = @WX_VERSION_MINOR@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -msgfmt = @msgfmt@ -msgmerge = @msgmerge@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -xdgopen = @xdgopen@ -xgettext = @xgettext@ -resourcesdir = $(pkgdatadir)/resources/16x16 -dist_resources_DATA = ascii.png \ - auto.png \ - binary.png \ - bookmark.png \ - cancel.png \ - compare.png \ - disconnect.png download.png downloadadd.png \ - file.png \ - filezilla.png \ - filter.png \ - find.png \ - folder.png folderclosed.png localtreeview.png \ - lock.png \ - logview.png processqueue.png queueview.png reconnect.png \ - refresh.png remotetreeview.png server.png sitemanager.png \ - sort_down_dark.png \ - sort_down_light.png \ - sort_up_dark.png \ - sort_up_light.png \ - speedlimits.png \ - symlink.png \ - synchronize.png \ - throbber.gif \ - unknown.png upload.png uploadadd.png - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/16x16/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/interface/resources/16x16/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-dist_resourcesDATA: $(dist_resources_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resourcesdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(resourcesdir)" || exit $$?; \ - done - -uninstall-dist_resourcesDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(resourcesdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-dist_resourcesDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-dist_resourcesDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_resourcesDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-dist_resourcesDATA - - -@MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) -@MACAPPBUNDLE_TRUE@ mkdir -p $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/16x16 -@MACAPPBUNDLE_TRUE@ for i in $(dist_resources_DATA); \ -@MACAPPBUNDLE_TRUE@ do cp -f $(srcdir)/$$i $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/16x16; \ -@MACAPPBUNDLE_TRUE@ done - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/processqueue.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/processqueue.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/queueview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/queueview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/reconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/reconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/sitemanager.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/sitemanager.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/sort_down_dark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/sort_down_dark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/sort_down_light.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/sort_down_light.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/sort_up_dark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/sort_up_dark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/sort_up_light.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/sort_up_light.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/symlink.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/symlink.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/16x16/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/16x16/upload.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/32x32/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/32x32/file.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/32x32/Makefile.am filezilla-3.33.0/src/interface/resources/32x32/Makefile.am --- filezilla-3.15.0.2/src/interface/resources/32x32/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/32x32/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -resourcesdir = $(pkgdatadir)/resources/32x32 - -dist_resources_DATA = file.png \ - filezilla.png - -if MACAPPBUNDLE -mac-copy-resources: $(dist_resources_DATA) - mkdir -p $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/32x32 - for i in $(dist_resources_DATA); \ - do cp -f $(srcdir)/$$i $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/32x32; \ - done -endif diff -Nru filezilla-3.15.0.2/src/interface/resources/32x32/Makefile.in filezilla-3.33.0/src/interface/resources/32x32/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/32x32/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/32x32/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,554 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/interface/resources/32x32 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/check_atomic.m4 \ - $(top_srcdir)/m4/check_libc++.m4 \ - $(top_srcdir)/m4/check_steady_clock.m4 \ - $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ - $(top_srcdir)/m4/d-type.m4 \ - $(top_srcdir)/m4/fz_check_pugixml.m4 \ - $(top_srcdir)/m4/fz_checkversion.m4 \ - $(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/map_emplace.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(resourcesdir)" -DATA = $(dist_resources_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_LIBS = @CPPUNIT_LIBS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FILEZILLA_LINGUAS = @FILEZILLA_LINGUAS@ -FILEZILLA_LINGUAS_MO = @FILEZILLA_LINGUAS_MO@ -FILEZILLA_LINGUAS_PO = @FILEZILLA_LINGUAS_PO@ -FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ -GREP = @GREP@ -HAVE_CXX14 = @HAVE_CXX14@ -IDN_LIB = @IDN_LIB@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBDBUS_CFLAGS = @LIBDBUS_CFLAGS@ -LIBDBUS_LIBS = @LIBDBUS_LIBS@ -LIBFILEZILLA_CFLAGS = @LIBFILEZILLA_CFLAGS@ -LIBFILEZILLA_LIBS = @LIBFILEZILLA_LIBS@ -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ -LIBGTK_CFLAGS = @LIBGTK_CFLAGS@ -LIBGTK_LIBS = @LIBGTK_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ -LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -NSIS_64BIT = @NSIS_64BIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PUGIXML_LIBS = @PUGIXML_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -WINDRESFLAGS = @WINDRESFLAGS@ -WXRC = @WXRC@ -WX_CFLAGS = @WX_CFLAGS@ -WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@ -WX_CONFIG_PATH = @WX_CONFIG_PATH@ -WX_CONFIG_WITH_ARGS = @WX_CONFIG_WITH_ARGS@ -WX_CPPFLAGS = @WX_CPPFLAGS@ -WX_CXXFLAGS = @WX_CXXFLAGS@ -WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@ -WX_LIBS = @WX_LIBS@ -WX_LIBS_STATIC = @WX_LIBS_STATIC@ -WX_RESCOMP = @WX_RESCOMP@ -WX_VERSION = @WX_VERSION@ -WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ -WX_VERSION_MICRO = @WX_VERSION_MICRO@ -WX_VERSION_MINOR = @WX_VERSION_MINOR@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -msgfmt = @msgfmt@ -msgmerge = @msgmerge@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -xdgopen = @xdgopen@ -xgettext = @xgettext@ -resourcesdir = $(pkgdatadir)/resources/32x32 -dist_resources_DATA = file.png \ - filezilla.png - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/32x32/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/interface/resources/32x32/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-dist_resourcesDATA: $(dist_resources_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resourcesdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(resourcesdir)" || exit $$?; \ - done - -uninstall-dist_resourcesDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(resourcesdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-dist_resourcesDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-dist_resourcesDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_resourcesDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-dist_resourcesDATA - - -@MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) -@MACAPPBUNDLE_TRUE@ mkdir -p $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/32x32 -@MACAPPBUNDLE_TRUE@ for i in $(dist_resources_DATA); \ -@MACAPPBUNDLE_TRUE@ do cp -f $(srcdir)/$$i $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/32x32; \ -@MACAPPBUNDLE_TRUE@ done - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/480x480/filezilla.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/480x480/filezilla.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/48x48/filezilla.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/48x48/filezilla.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/48x48/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/48x48/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/sitemanager.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/sitemanager.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/16x16/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/16x16/upload.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/bookmarks.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/bookmarks.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/folderback.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/folderback.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/folderup.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/folderup.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/logview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/logview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/32x32/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/32x32/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/48x48/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/48x48/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/48x48/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/48x48/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/48x48/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/48x48/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/48x48/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/48x48/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/48x48/folderback.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/48x48/folderback.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/48x48/folderup.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/48x48/folderup.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/blukis/48x48/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/blukis/48x48/server.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/blukis/Makefile.am filezilla-3.33.0/src/interface/resources/blukis/Makefile.am --- filezilla-3.15.0.2/src/interface/resources/blukis/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/blukis/Makefile.am 2017-06-02 20:38:13.000000000 +0000 @@ -8,6 +8,7 @@ dist_resources16_DATA = 16x16/ascii.png \ 16x16/auto.png \ 16x16/binary.png \ + 16x16/bookmark.png \ 16x16/bookmarks.png \ 16x16/cancel.png \ 16x16/compare.png \ @@ -40,6 +41,7 @@ dist_resources32_DATA = 32x32/ascii.png \ 32x32/auto.png \ 32x32/binary.png \ + 32x32/bookmark.png \ 32x32/bookmarks.png \ 32x32/cancel.png \ 32x32/compare.png \ @@ -61,6 +63,7 @@ 32x32/reconnect.png \ 32x32/refresh.png \ 32x32/remotetreeview.png \ + 32x32/server.png \ 32x32/showhidden.png \ 32x32/sitemanager.png \ 32x32/speedlimits.png \ @@ -71,6 +74,7 @@ dist_resources48_DATA = 48x48/ascii.png \ 48x48/auto.png \ 48x48/binary.png \ + 48x48/bookmark.png \ 48x48/bookmarks.png \ 48x48/cancel.png \ 48x48/compare.png \ @@ -92,6 +96,7 @@ 48x48/reconnect.png \ 48x48/refresh.png \ 48x48/remotetreeview.png \ + 48x48/server.png \ 48x48/showhidden.png \ 48x48/sitemanager.png \ 48x48/speedlimits.png \ diff -Nru filezilla-3.15.0.2/src/interface/resources/blukis/Makefile.in filezilla-3.33.0/src/interface/resources/blukis/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/blukis/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/blukis/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,17 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources/blukis -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) $(dist_resources16_DATA) \ - $(dist_resources32_DATA) $(dist_resources48_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -101,6 +111,9 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(dist_resources16_DATA) $(dist_resources32_DATA) \ + $(dist_resources48_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -157,6 +170,7 @@ DATA = $(dist_resources_DATA) $(dist_resources16_DATA) \ $(dist_resources32_DATA) $(dist_resources48_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -168,11 +182,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -196,6 +210,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -216,16 +232,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -277,6 +301,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -316,6 +341,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -335,6 +361,7 @@ dist_resources16_DATA = 16x16/ascii.png \ 16x16/auto.png \ 16x16/binary.png \ + 16x16/bookmark.png \ 16x16/bookmarks.png \ 16x16/cancel.png \ 16x16/compare.png \ @@ -367,6 +394,7 @@ dist_resources32_DATA = 32x32/ascii.png \ 32x32/auto.png \ 32x32/binary.png \ + 32x32/bookmark.png \ 32x32/bookmarks.png \ 32x32/cancel.png \ 32x32/compare.png \ @@ -388,6 +416,7 @@ 32x32/reconnect.png \ 32x32/refresh.png \ 32x32/remotetreeview.png \ + 32x32/server.png \ 32x32/showhidden.png \ 32x32/sitemanager.png \ 32x32/speedlimits.png \ @@ -398,6 +427,7 @@ dist_resources48_DATA = 48x48/ascii.png \ 48x48/auto.png \ 48x48/binary.png \ + 48x48/bookmark.png \ 48x48/bookmarks.png \ 48x48/cancel.png \ 48x48/compare.png \ @@ -419,6 +449,7 @@ 48x48/reconnect.png \ 48x48/refresh.png \ 48x48/remotetreeview.png \ + 48x48/server.png \ 48x48/showhidden.png \ 48x48/sitemanager.png \ 48x48/speedlimits.png \ @@ -441,7 +472,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/blukis/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/blukis/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -711,6 +741,8 @@ uninstall-dist_resources16DATA uninstall-dist_resources32DATA \ uninstall-dist_resources48DATA uninstall-dist_resourcesDATA +.PRECIOUS: Makefile + @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/blukis/16x16"; diff -Nru filezilla-3.15.0.2/src/interface/resources/blukis/theme.xml filezilla-3.33.0/src/interface/resources/blukis/theme.xml --- filezilla-3.15.0.2/src/interface/resources/blukis/theme.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/blukis/theme.xml 2016-11-22 22:04:28.000000000 +0000 @@ -3,8 +3,8 @@ Blukis Brian Lukis - 16x16 - 32x32 - 48x48 + 16x16 + 32x32 + 48x48 Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/auto.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/auto.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/find.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/find.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/localtreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/localtreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/logview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/logview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/processqueue.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/processqueue.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/queueview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/queueview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/reconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/reconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/sitemanager.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/sitemanager.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/symlink.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/symlink.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/classic/16x16/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/classic/16x16/upload.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/classic/Makefile.am filezilla-3.33.0/src/interface/resources/classic/Makefile.am --- filezilla-3.15.0.2/src/interface/resources/classic/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/classic/Makefile.am 2016-11-22 22:12:41.000000000 +0000 @@ -0,0 +1,46 @@ +resourcesdir = $(pkgdatadir)/resources/classic +resources16dir = $(pkgdatadir)/resources/classic/16x16 + +dist_resources_DATA = theme.xml + +dist_resources16_DATA = \ + 16x16/ascii.png \ + 16x16/auto.png \ + 16x16/binary.png \ + 16x16/bookmark.png \ + 16x16/cancel.png \ + 16x16/compare.png \ + 16x16/disconnect.png \ + 16x16/download.png \ + 16x16/downloadadd.png \ + 16x16/file.png \ + 16x16/filter.png \ + 16x16/find.png \ + 16x16/folder.png \ + 16x16/folderclosed.png \ + 16x16/localtreeview.png \ + 16x16/lock.png \ + 16x16/logview.png \ + 16x16/processqueue.png \ + 16x16/queueview.png \ + 16x16/reconnect.png \ + 16x16/refresh.png \ + 16x16/remotetreeview.png \ + 16x16/server.png \ + 16x16/sitemanager.png \ + 16x16/speedlimits.png \ + 16x16/symlink.png \ + 16x16/synchronize.png \ + 16x16/upload.png \ + 16x16/uploadadd.png + +if MACAPPBUNDLE +mac-copy-resources: $(dist_resources_DATA) + mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/classic/16x16"; + for i in $(dist_resources16_DATA); do \ + cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/classic/16x16"; \ + done + for i in $(dist_resources_DATA); do \ + cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/classic"; \ + done +endif diff -Nru filezilla-3.15.0.2/src/interface/resources/classic/Makefile.in filezilla-3.33.0/src/interface/resources/classic/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/classic/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/classic/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -0,0 +1,639 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/interface/resources/classic +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ + $(top_srcdir)/m4/ax_check_link_flag.m4 \ + $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ + $(top_srcdir)/m4/check_libc++.m4 \ + $(top_srcdir)/m4/check_steady_clock.m4 \ + $(top_srcdir)/m4/check_thread_local.m4 \ + $(top_srcdir)/m4/check_time.m4 \ + $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ + $(top_srcdir)/m4/d-type.m4 \ + $(top_srcdir)/m4/fz_check_pugixml.m4 \ + $(top_srcdir)/m4/fz_checkversion.m4 \ + $(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/map_emplace.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(dist_resources16_DATA) $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/src/include/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(resourcesdir)" \ + "$(DESTDIR)$(resources16dir)" +DATA = $(dist_resources_DATA) $(dist_resources16_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ +CPPUNIT_LIBS = @CPPUNIT_LIBS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FILEZILLA_LINGUAS = @FILEZILLA_LINGUAS@ +FILEZILLA_LINGUAS_MO = @FILEZILLA_LINGUAS_MO@ +FILEZILLA_LINGUAS_PO = @FILEZILLA_LINGUAS_PO@ +FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ +GREP = @GREP@ +HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ +IDN_LIB = @IDN_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBDBUS_CFLAGS = @LIBDBUS_CFLAGS@ +LIBDBUS_LIBS = @LIBDBUS_LIBS@ +LIBFILEZILLA_CFLAGS = @LIBFILEZILLA_CFLAGS@ +LIBFILEZILLA_LIBS = @LIBFILEZILLA_LIBS@ +LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ +LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ +LIBGTK_CFLAGS = @LIBGTK_CFLAGS@ +LIBGTK_LIBS = @LIBGTK_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ +LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PUGIXML_LIBS = @PUGIXML_LIBS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WINDRES = @WINDRES@ +WINDRESFLAGS = @WINDRESFLAGS@ +WXRC = @WXRC@ +WX_CFLAGS = @WX_CFLAGS@ +WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@ +WX_CONFIG_PATH = @WX_CONFIG_PATH@ +WX_CONFIG_WITH_ARGS = @WX_CONFIG_WITH_ARGS@ +WX_CPPFLAGS = @WX_CPPFLAGS@ +WX_CXXFLAGS = @WX_CXXFLAGS@ +WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@ +WX_LIBS = @WX_LIBS@ +WX_LIBS_STATIC = @WX_LIBS_STATIC@ +WX_RESCOMP = @WX_RESCOMP@ +WX_VERSION = @WX_VERSION@ +WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ +WX_VERSION_MICRO = @WX_VERSION_MICRO@ +WX_VERSION_MINOR = @WX_VERSION_MINOR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +msgfmt = @msgfmt@ +msgmerge = @msgmerge@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +subdirs = @subdirs@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +xdgopen = @xdgopen@ +xgettext = @xgettext@ +resourcesdir = $(pkgdatadir)/resources/classic +resources16dir = $(pkgdatadir)/resources/classic/16x16 +dist_resources_DATA = theme.xml +dist_resources16_DATA = \ + 16x16/ascii.png \ + 16x16/auto.png \ + 16x16/binary.png \ + 16x16/bookmark.png \ + 16x16/cancel.png \ + 16x16/compare.png \ + 16x16/disconnect.png \ + 16x16/download.png \ + 16x16/downloadadd.png \ + 16x16/file.png \ + 16x16/filter.png \ + 16x16/find.png \ + 16x16/folder.png \ + 16x16/folderclosed.png \ + 16x16/localtreeview.png \ + 16x16/lock.png \ + 16x16/logview.png \ + 16x16/processqueue.png \ + 16x16/queueview.png \ + 16x16/reconnect.png \ + 16x16/refresh.png \ + 16x16/remotetreeview.png \ + 16x16/server.png \ + 16x16/sitemanager.png \ + 16x16/speedlimits.png \ + 16x16/symlink.png \ + 16x16/synchronize.png \ + 16x16/upload.png \ + 16x16/uploadadd.png + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/classic/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/interface/resources/classic/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_resourcesDATA: $(dist_resources_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resourcesdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(resourcesdir)" || exit $$?; \ + done + +uninstall-dist_resourcesDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir) +install-dist_resources16DATA: $(dist_resources16_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(resources16dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(resources16dir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resources16dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(resources16dir)" || exit $$?; \ + done + +uninstall-dist_resources16DATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(resources16dir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(resources16dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_resources16DATA \ + install-dist_resourcesDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_resources16DATA \ + uninstall-dist_resourcesDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_resources16DATA install-dist_resourcesDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am \ + uninstall-dist_resources16DATA uninstall-dist_resourcesDATA + +.PRECIOUS: Makefile + + +@MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) +@MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/classic/16x16"; +@MACAPPBUNDLE_TRUE@ for i in $(dist_resources16_DATA); do \ +@MACAPPBUNDLE_TRUE@ cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/classic/16x16"; \ +@MACAPPBUNDLE_TRUE@ done +@MACAPPBUNDLE_TRUE@ for i in $(dist_resources_DATA); do \ +@MACAPPBUNDLE_TRUE@ cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/classic"; \ +@MACAPPBUNDLE_TRUE@ done + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru filezilla-3.15.0.2/src/interface/resources/classic/theme.xml filezilla-3.33.0/src/interface/resources/classic/theme.xml --- filezilla-3.15.0.2/src/interface/resources/classic/theme.xml 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/classic/theme.xml 2016-11-23 13:50:16.000000000 +0000 @@ -0,0 +1,9 @@ + + + + Classic + Tim Kosse + tim.kosse@filezilla-project.org + 16x16 + + Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/logview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/logview.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/cyril/16x16/Makefile.am filezilla-3.33.0/src/interface/resources/cyril/16x16/Makefile.am --- filezilla-3.15.0.2/src/interface/resources/cyril/16x16/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/cyril/16x16/Makefile.am 2017-09-19 21:36:39.000000000 +0000 @@ -1,12 +1,35 @@ resourcesdir = $(pkgdatadir)/resources/cyril/16x16 -dist_resources_DATA = ascii.png auto.png binary.png bookmark.png cancel.png \ - compare.png disconnect.png download.png downloadadd.png file.png \ - folder.png folderback.png folderclosed.png folderup.png help.png \ - localtreeview.png logview.png processqueue.png queueview.png \ - reconnect.png refresh.png remotetreeview.png server.png \ - showhidden.png sitemanager.png speedlimits.png synchronize.png \ - upload.png uploadadd.png +dist_resources_DATA = \ + ascii.png \ + auto.png \ + binary.png \ + bookmark.png \ + cancel.png \ + compare.png \ + disconnect.png \ + download.png \ + downloadadd.png \ + file.png \ + folder.png \ + folderback.png \ + folderclosed.png \ + folderup.png \ + help.png \ + localtreeview.png \ + logview.png \ + processqueue.png \ + queueview.png \ + reconnect.png \ + refresh.png \ + remotetreeview.png \ + server.png \ + showhidden.png \ + sitemanager.png \ + speedlimits.png \ + synchronize.png \ + upload.png \ + uploadadd.png if MACAPPBUNDLE mac-copy-resources: $(dist_resources_DATA) diff -Nru filezilla-3.15.0.2/src/interface/resources/cyril/16x16/Makefile.in filezilla-3.33.0/src/interface/resources/cyril/16x16/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/cyril/16x16/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/cyril/16x16/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,16 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources/cyril/16x16 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -100,6 +111,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -153,6 +166,7 @@ am__installdirs = "$(DESTDIR)$(resourcesdir)" DATA = $(dist_resources_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -164,11 +178,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -192,6 +206,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -212,16 +228,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -273,6 +297,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -312,6 +337,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -324,13 +350,36 @@ xdgopen = @xdgopen@ xgettext = @xgettext@ resourcesdir = $(pkgdatadir)/resources/cyril/16x16 -dist_resources_DATA = ascii.png auto.png binary.png bookmark.png cancel.png \ - compare.png disconnect.png download.png downloadadd.png file.png \ - folder.png folderback.png folderclosed.png folderup.png help.png \ - localtreeview.png logview.png processqueue.png queueview.png \ - reconnect.png refresh.png remotetreeview.png server.png \ - showhidden.png sitemanager.png speedlimits.png synchronize.png \ - upload.png uploadadd.png +dist_resources_DATA = \ + ascii.png \ + auto.png \ + binary.png \ + bookmark.png \ + cancel.png \ + compare.png \ + disconnect.png \ + download.png \ + downloadadd.png \ + file.png \ + folder.png \ + folderback.png \ + folderclosed.png \ + folderup.png \ + help.png \ + localtreeview.png \ + logview.png \ + processqueue.png \ + queueview.png \ + reconnect.png \ + refresh.png \ + remotetreeview.png \ + server.png \ + showhidden.png \ + sitemanager.png \ + speedlimits.png \ + synchronize.png \ + upload.png \ + uploadadd.png all: all-am @@ -347,7 +396,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/cyril/16x16/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/cyril/16x16/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -547,6 +595,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-dist_resourcesDATA +.PRECIOUS: Makefile + @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) @MACAPPBUNDLE_TRUE@ mkdir -p $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/cyril/16x16 Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/reconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/reconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/showhidden.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/showhidden.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/cyril/16x16/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/cyril/16x16/upload.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/cyril/Makefile.in filezilla-3.33.0/src/interface/resources/cyril/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/cyril/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/cyril/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,16 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources/cyril -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_noinst_DATA) $(dist_resources_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -100,6 +111,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(dist_resources_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -188,6 +201,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -224,11 +238,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -252,6 +266,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -272,16 +288,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -333,6 +357,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -372,6 +397,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -402,7 +428,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/cyril/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/cyril/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -723,6 +748,8 @@ tags tags-am uninstall uninstall-am \ uninstall-dist_resourcesDATA +.PRECIOUS: Makefile + @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/cyril" diff -Nru filezilla-3.15.0.2/src/interface/resources/cyril/theme.xml filezilla-3.33.0/src/interface/resources/cyril/theme.xml --- filezilla-3.15.0.2/src/interface/resources/cyril/theme.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/cyril/theme.xml 2016-11-22 22:04:27.000000000 +0000 @@ -4,6 +4,6 @@ Cyril Cyril Burnet cyril@techeo.com - 16x16 + 16x16 Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/auto.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/auto.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/bookmarks.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/bookmarks.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/close.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/close.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/find.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/find.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/folderback.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/folderback.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/folderup.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/folderup.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/help.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/help.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/localtreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/localtreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/logview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/logview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/processqueue.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/processqueue.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/queueview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/queueview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/reconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/reconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/showhidden.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/showhidden.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/sitemanager.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/sitemanager.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/symlink.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/symlink.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/synctransfer.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/synctransfer.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/default/480x480/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/default/480x480/upload.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/default/Makefile.am filezilla-3.33.0/src/interface/resources/default/Makefile.am --- filezilla-3.15.0.2/src/interface/resources/default/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/default/Makefile.am 2017-10-25 17:12:23.000000000 +0000 @@ -0,0 +1,54 @@ +resourcesdir = $(pkgdatadir)/resources/default +resources480dir = $(pkgdatadir)/resources/default/480x480 + +dist_resources_DATA = theme.xml + +dist_resources480_DATA = \ + 480x480/ascii.png \ + 480x480/auto.png \ + 480x480/binary.png \ + 480x480/bookmark.png \ + 480x480/bookmarks.png \ + 480x480/cancel.png \ + 480x480/close.png \ + 480x480/compare.png \ + 480x480/disconnect.png \ + 480x480/download.png \ + 480x480/downloadadd.png \ + 480x480/file.png \ + 480x480/filter.png \ + 480x480/find.png \ + 480x480/folder.png \ + 480x480/folderback.png \ + 480x480/folderclosed.png \ + 480x480/folderup.png \ + 480x480/help.png \ + 480x480/localtreeview.png \ + 480x480/lock.png \ + 480x480/logview.png \ + 480x480/processqueue.png \ + 480x480/queueview.png \ + 480x480/reconnect.png \ + 480x480/refresh.png \ + 480x480/remotetreeview.png \ + 480x480/server.png \ + 480x480/showhidden.png \ + 480x480/sitemanager.png \ + 480x480/speedlimits.png \ + 480x480/symlink.png \ + 480x480/synchronize.png \ + 480x480/synctransfer.png \ + 480x480/upload.png \ + 480x480/uploadadd.png + +if MACAPPBUNDLE +mac-copy-resources: $(dist_resources_DATA) + mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/default/480x480"; + for i in $(dist_resources480_DATA); do \ + cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/default/480x480"; \ + done + for i in $(dist_resources_DATA); do \ + cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/default"; \ + done +endif + diff -Nru filezilla-3.15.0.2/src/interface/resources/default/Makefile.in filezilla-3.33.0/src/interface/resources/default/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/default/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/default/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -0,0 +1,646 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/interface/resources/default +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ + $(top_srcdir)/m4/ax_check_link_flag.m4 \ + $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ + $(top_srcdir)/m4/check_libc++.m4 \ + $(top_srcdir)/m4/check_steady_clock.m4 \ + $(top_srcdir)/m4/check_thread_local.m4 \ + $(top_srcdir)/m4/check_time.m4 \ + $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ + $(top_srcdir)/m4/d-type.m4 \ + $(top_srcdir)/m4/fz_check_pugixml.m4 \ + $(top_srcdir)/m4/fz_checkversion.m4 \ + $(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/map_emplace.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(dist_resources480_DATA) $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/src/include/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(resourcesdir)" \ + "$(DESTDIR)$(resources480dir)" +DATA = $(dist_resources_DATA) $(dist_resources480_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ +CPPUNIT_LIBS = @CPPUNIT_LIBS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FILEZILLA_LINGUAS = @FILEZILLA_LINGUAS@ +FILEZILLA_LINGUAS_MO = @FILEZILLA_LINGUAS_MO@ +FILEZILLA_LINGUAS_PO = @FILEZILLA_LINGUAS_PO@ +FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ +GREP = @GREP@ +HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ +IDN_LIB = @IDN_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBDBUS_CFLAGS = @LIBDBUS_CFLAGS@ +LIBDBUS_LIBS = @LIBDBUS_LIBS@ +LIBFILEZILLA_CFLAGS = @LIBFILEZILLA_CFLAGS@ +LIBFILEZILLA_LIBS = @LIBFILEZILLA_LIBS@ +LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ +LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ +LIBGTK_CFLAGS = @LIBGTK_CFLAGS@ +LIBGTK_LIBS = @LIBGTK_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ +LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PUGIXML_LIBS = @PUGIXML_LIBS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WINDRES = @WINDRES@ +WINDRESFLAGS = @WINDRESFLAGS@ +WXRC = @WXRC@ +WX_CFLAGS = @WX_CFLAGS@ +WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@ +WX_CONFIG_PATH = @WX_CONFIG_PATH@ +WX_CONFIG_WITH_ARGS = @WX_CONFIG_WITH_ARGS@ +WX_CPPFLAGS = @WX_CPPFLAGS@ +WX_CXXFLAGS = @WX_CXXFLAGS@ +WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@ +WX_LIBS = @WX_LIBS@ +WX_LIBS_STATIC = @WX_LIBS_STATIC@ +WX_RESCOMP = @WX_RESCOMP@ +WX_VERSION = @WX_VERSION@ +WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ +WX_VERSION_MICRO = @WX_VERSION_MICRO@ +WX_VERSION_MINOR = @WX_VERSION_MINOR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +msgfmt = @msgfmt@ +msgmerge = @msgmerge@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +subdirs = @subdirs@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +xdgopen = @xdgopen@ +xgettext = @xgettext@ +resourcesdir = $(pkgdatadir)/resources/default +resources480dir = $(pkgdatadir)/resources/default/480x480 +dist_resources_DATA = theme.xml +dist_resources480_DATA = \ + 480x480/ascii.png \ + 480x480/auto.png \ + 480x480/binary.png \ + 480x480/bookmark.png \ + 480x480/bookmarks.png \ + 480x480/cancel.png \ + 480x480/close.png \ + 480x480/compare.png \ + 480x480/disconnect.png \ + 480x480/download.png \ + 480x480/downloadadd.png \ + 480x480/file.png \ + 480x480/filter.png \ + 480x480/find.png \ + 480x480/folder.png \ + 480x480/folderback.png \ + 480x480/folderclosed.png \ + 480x480/folderup.png \ + 480x480/help.png \ + 480x480/localtreeview.png \ + 480x480/lock.png \ + 480x480/logview.png \ + 480x480/processqueue.png \ + 480x480/queueview.png \ + 480x480/reconnect.png \ + 480x480/refresh.png \ + 480x480/remotetreeview.png \ + 480x480/server.png \ + 480x480/showhidden.png \ + 480x480/sitemanager.png \ + 480x480/speedlimits.png \ + 480x480/symlink.png \ + 480x480/synchronize.png \ + 480x480/synctransfer.png \ + 480x480/upload.png \ + 480x480/uploadadd.png + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/default/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/interface/resources/default/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_resourcesDATA: $(dist_resources_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resourcesdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(resourcesdir)" || exit $$?; \ + done + +uninstall-dist_resourcesDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir) +install-dist_resources480DATA: $(dist_resources480_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_resources480_DATA)'; test -n "$(resources480dir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(resources480dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(resources480dir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resources480dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(resources480dir)" || exit $$?; \ + done + +uninstall-dist_resources480DATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_resources480_DATA)'; test -n "$(resources480dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(resources480dir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(resources480dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_resources480DATA \ + install-dist_resourcesDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_resources480DATA \ + uninstall-dist_resourcesDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_resources480DATA install-dist_resourcesDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am \ + uninstall-dist_resources480DATA uninstall-dist_resourcesDATA + +.PRECIOUS: Makefile + + +@MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) +@MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/default/480x480"; +@MACAPPBUNDLE_TRUE@ for i in $(dist_resources480_DATA); do \ +@MACAPPBUNDLE_TRUE@ cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/default/480x480"; \ +@MACAPPBUNDLE_TRUE@ done +@MACAPPBUNDLE_TRUE@ for i in $(dist_resources_DATA); do \ +@MACAPPBUNDLE_TRUE@ cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/default"; \ +@MACAPPBUNDLE_TRUE@ done + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru filezilla-3.15.0.2/src/interface/resources/default/theme.xml filezilla-3.33.0/src/interface/resources/default/theme.xml --- filezilla-3.15.0.2/src/interface/resources/default/theme.xml 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/default/theme.xml 2017-01-09 16:00:55.000000000 +0000 @@ -0,0 +1,9 @@ + + + + Default + Martins Svarcs + wtastudio@gmail.com + 480x480 + + diff -Nru filezilla-3.15.0.2/src/interface/resources/defaultfilters.xml filezilla-3.33.0/src/interface/resources/defaultfilters.xml --- filezilla-3.15.0.2/src/interface/resources/defaultfilters.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/defaultfilters.xml 2016-09-28 08:57:50.000000000 +0000 @@ -8,7 +8,7 @@ - CVS and SVN directories + Source control directories 0 1 Any @@ -24,6 +24,21 @@ 1 .svn + + 0 + 1 + .git + + + 0 + 1 + .hg + + + 0 + 1 + .bzr + Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/down.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/down.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/filezilla.entitlements filezilla-3.33.0/src/interface/resources/filezilla.entitlements --- filezilla-3.15.0.2/src/interface/resources/filezilla.entitlements 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/filezilla.entitlements 2017-11-20 09:20:25.000000000 +0000 @@ -0,0 +1,16 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-write + + com.apple.security.network.client + + com.apple.security.network.server + + com.apple.security.files.bookmarks.app-scope + + + diff -Nru filezilla-3.15.0.2/src/interface/resources/filezilla.svg filezilla-3.33.0/src/interface/resources/filezilla.svg --- filezilla-3.15.0.2/src/interface/resources/filezilla.svg 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/filezilla.svg 2017-01-09 16:00:55.000000000 +0000 @@ -1,76 +1,10 @@ - - -image/svg+xml - - - - - - - - - - - + + + + + + + + + Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/auto.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/auto.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/find.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/find.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/help.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/help.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/leds.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/leds.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/localtreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/localtreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/processqueue.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/processqueue.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/queueview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/queueview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/reconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/reconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/sitemanager.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/sitemanager.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/16x16/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/16x16/upload.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/auto.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/auto.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/find.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/find.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/help.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/help.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/leds.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/leds.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/localtreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/localtreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/processqueue.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/processqueue.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/queueview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/queueview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/reconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/reconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/24x24/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/24x24/upload.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/auto.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/auto.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/help.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/help.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/localtreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/localtreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/logview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/logview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/processqueue.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/processqueue.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/queueview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/queueview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/32x32/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/32x32/upload.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/auto.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/auto.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/help.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/help.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/leds.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/leds.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/localtreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/localtreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/processqueue.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/processqueue.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/queueview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/queueview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/flatzilla/48x48/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/flatzilla/48x48/upload.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/flatzilla/Makefile.in filezilla-3.33.0/src/interface/resources/flatzilla/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/flatzilla/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/flatzilla/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,18 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources/flatzilla -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) $(dist_resources16_DATA) \ - $(dist_resources24_DATA) $(dist_resources32_DATA) \ - $(dist_resources48_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -102,6 +111,10 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(dist_resources16_DATA) $(dist_resources24_DATA) \ + $(dist_resources32_DATA) $(dist_resources48_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -159,6 +172,7 @@ $(dist_resources24_DATA) $(dist_resources32_DATA) \ $(dist_resources48_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -170,11 +184,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -198,6 +212,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -218,16 +234,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -279,6 +303,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -318,6 +343,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -474,7 +500,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/flatzilla/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/flatzilla/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -766,6 +791,8 @@ uninstall-dist_resources24DATA uninstall-dist_resources32DATA \ uninstall-dist_resources48DATA uninstall-dist_resourcesDATA +.PRECIOUS: Makefile + @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/flatzilla/16x16"; diff -Nru filezilla-3.15.0.2/src/interface/resources/flatzilla/theme.xml filezilla-3.33.0/src/interface/resources/flatzilla/theme.xml --- filezilla-3.15.0.2/src/interface/resources/flatzilla/theme.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/flatzilla/theme.xml 2016-11-22 22:04:27.000000000 +0000 @@ -4,9 +4,9 @@ FlatZilla Boaz Lederer aniboaz@gmail.com - 16x16 - 24x24 - 32x32 - 48x48 + 16x16 + 24x24 + 32x32 + 48x48 Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/folderup.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/folderup.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/queueview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/queueview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/reconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/reconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/showhidden.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/showhidden.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/uploadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/16x16/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/16x16/upload.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/32x32/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/32x32/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/32x32/folderup.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/32x32/folderup.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/32x32/logview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/32x32/logview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/32x32/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/32x32/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/48x48/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/48x48/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/48x48/folderup.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/48x48/folderup.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/lone/48x48/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/lone/48x48/speedlimits.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/lone/Makefile.in filezilla-3.33.0/src/interface/resources/lone/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/lone/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/lone/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,17 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources/lone -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) $(dist_resources16_DATA) \ - $(dist_resources32_DATA) $(dist_resources48_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -101,6 +111,9 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(dist_resources16_DATA) $(dist_resources32_DATA) \ + $(dist_resources48_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -157,6 +170,7 @@ DATA = $(dist_resources_DATA) $(dist_resources16_DATA) \ $(dist_resources32_DATA) $(dist_resources48_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -168,11 +182,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -196,6 +210,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -216,16 +232,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -277,6 +301,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -316,6 +341,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -441,7 +467,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/lone/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/lone/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -711,6 +736,8 @@ uninstall-dist_resources16DATA uninstall-dist_resources32DATA \ uninstall-dist_resources48DATA uninstall-dist_resourcesDATA +.PRECIOUS: Makefile + @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/lone/16x16"; diff -Nru filezilla-3.15.0.2/src/interface/resources/lone/theme.xml filezilla-3.33.0/src/interface/resources/lone/theme.xml --- filezilla-3.15.0.2/src/interface/resources/lone/theme.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/lone/theme.xml 2016-11-22 22:04:27.000000000 +0000 @@ -4,8 +4,8 @@ LonE Ricardo Cabral ricardolcabral@gmail.com - 16x16 - 32x32 - 48x48 + 16x16 + 32x32 + 48x48 diff -Nru filezilla-3.15.0.2/src/interface/resources/MacInfo.plist.in filezilla-3.33.0/src/interface/resources/MacInfo.plist.in --- filezilla-3.15.0.2/src/interface/resources/MacInfo.plist.in 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/MacInfo.plist.in 2018-01-03 04:30:05.000000000 +0000 @@ -7,11 +7,11 @@ CFBundleExecutable filezilla CFBundleGetInfoString - FileZilla Client @PACKAGE_VERSION@, Copyright (C) 2004-2016 Tim Kosse, Website: https://filezilla-project.org + FileZilla Client @PACKAGE_VERSION@, Copyright (C) 2004-2018 Tim Kosse, Website: https://filezilla-project.org CFBundleIconFile FileZilla.icns CFBundleIdentifier - de.filezilla + org.filezilla-project.filezilla@CFBUNDLEIDSUFFIX@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString @@ -35,6 +35,14 @@ NSHighResolutionCapable NSHumanReadableCopyright - Copyright (C) 2004-2016 Tim Kosse + Copyright (C) 2004-2018 Tim Kosse + CFBundleSupportedPlatforms + + MacOSX + + LSMinimumSystemVersion + 10.9 + LSApplicationCategoryType + public.app-category.utilities diff -Nru filezilla-3.15.0.2/src/interface/resources/Makefile.am filezilla-3.33.0/src/interface/resources/Makefile.am --- filezilla-3.15.0.2/src/interface/resources/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/Makefile.am 2017-10-09 15:46:06.000000000 +0000 @@ -1,16 +1,13 @@ -SUBDIRS = 16x16 32x32 cyril blukis flatzilla lone minimal opencrystal sun tango +SUBDIRS = blukis classic cyril default flatzilla lone minimal opencrystal sun tango CLEANFILES = filezilla.o resourcesdir = $(pkgdatadir)/resources dist_resources_DATA = \ defaultfilters.xml \ - down.png \ dropdown.png \ finished.wav \ - leds.png \ - theme.xml \ - up.png + leds.png xrcdir = $(pkgdatadir)/resources/xrc dist_xrc_DATA = \ @@ -19,21 +16,35 @@ xrc/inputdialog.xrc \ xrc/menus.xrc \ xrc/netconfwizard.xrc \ - xrc/quickconnectbar.xrc \ xrc/settings.xrc \ xrc/sitemanager.xrc \ - xrc/toolbar.xrc \ + xrc/storj.xrc \ xrc/update.xrc +resources16dir = $(pkgdatadir)/resources/16x16 +dist_resources16_DATA = \ + 16x16/filezilla.png \ + 16x16/sort_down_dark.png \ + 16x16/sort_down_light.png \ + 16x16/sort_up_dark.png \ + 16x16/sort_up_light.png \ + 16x16/throbber.gif \ + 16x16/unknown.png + resources20dir = $(pkgdatadir)/resources/20x20 dist_resources20_DATA = 20x20/unknown.png resources24dir = $(pkgdatadir)/resources/24x24 dist_resources24_DATA = 24x24/unknown.png +resources32dir = $(pkgdatadir)/resources/32x32 +dist_resources32_DATA = 32x32/filezilla.png + resources48dir = $(pkgdatadir)/resources/48x48 -dist_resources48_DATA = 48x48/filezilla.png \ - 48x48/speedlimits.png +dist_resources48_DATA = 48x48/filezilla.png + +resources480dir = $(pkgdatadir)/resources/480x480 +dist_resources480_DATA = 480x480/filezilla.png if USE_RESOURCEFILE nodist_noinst_DATA = filezilla.o @@ -45,9 +56,14 @@ mv $@~ $@ endif -dist_noinst_DATA = filezilla.rc FileZilla.ico \ - FileZilla.icns MacInfo.plist.in \ - version.rc.in windows_manifest.xml +dist_noinst_DATA = \ + filezilla.rc \ + FileZilla.ico \ + FileZilla.icns \ + filezilla.entitlements \ + MacInfo.plist.in \ + version.rc.in \ + windows_manifest.xml if MACAPPBUNDLE mac-copy-resources: $(dist_resources_DATA) @@ -61,6 +77,10 @@ for i in $(dist_xrc_DATA); \ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/xrc"; \ done + mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/16x16" + for i in $(dist_resources16_DATA); \ + do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/16x16"; \ + done mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/20x20" for i in $(dist_resources20_DATA); \ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/20x20"; \ @@ -69,15 +89,23 @@ for i in $(dist_resources24_DATA); \ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/24x24"; \ done + mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/32x32" + for i in $(dist_resources32_DATA); \ + do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/32x32"; \ + done mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/48x48" for i in $(dist_resources48_DATA); \ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/48x48"; \ done + mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/480x480" + for i in $(dist_resources480_DATA); \ + do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/480x480"; \ + done - $(MAKE) -C 16x16 mac-copy-resources - $(MAKE) -C 32x32 mac-copy-resources + $(MAKE) -C classic mac-copy-resources $(MAKE) -C cyril mac-copy-resources $(MAKE) -C blukis mac-copy-resources + $(MAKE) -C default mac-copy-resources $(MAKE) -C lone mac-copy-resources $(MAKE) -C opencrystal mac-copy-resources $(MAKE) -C tango mac-copy-resources @@ -92,6 +120,8 @@ hicolorapps32_DATA = 32x32/filezilla.png hicolorapps48dir = $(datadir)/icons/hicolor/48x48/apps hicolorapps48_DATA = 48x48/filezilla.png +hicolorapps480dir = $(datadir)/icons/hicolor/480x480/apps +hicolorapps480_DATA = 480x480/filezilla.png scalabledir = $(datadir)/icons/hicolor/scalable/apps dist_scalable_DATA = filezilla.svg diff -Nru filezilla-3.15.0.2/src/interface/resources/Makefile.in filezilla-3.33.0/src/interface/resources/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,20 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/version.rc.in $(srcdir)/MacInfo.plist.in \ - $(dist_noinst_DATA) $(dist_resources_DATA) \ - $(dist_resources20_DATA) $(dist_resources24_DATA) \ - $(dist_resources48_DATA) $(dist_scalable_DATA) \ - $(dist_xrc_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -104,6 +111,12 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(dist_resources_DATA) $(dist_resources16_DATA) \ + $(dist_resources20_DATA) $(dist_resources24_DATA) \ + $(dist_resources32_DATA) $(dist_resources48_DATA) \ + $(dist_resources480_DATA) $(dist_scalable_DATA) \ + $(dist_xrc_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = version.rc MacInfo.plist @@ -163,16 +176,21 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(resourcesdir)" \ - "$(DESTDIR)$(resources20dir)" "$(DESTDIR)$(resources24dir)" \ - "$(DESTDIR)$(resources48dir)" "$(DESTDIR)$(scalabledir)" \ - "$(DESTDIR)$(xrcdir)" "$(DESTDIR)$(hicolorapps16dir)" \ + "$(DESTDIR)$(resources16dir)" "$(DESTDIR)$(resources20dir)" \ + "$(DESTDIR)$(resources24dir)" "$(DESTDIR)$(resources32dir)" \ + "$(DESTDIR)$(resources48dir)" "$(DESTDIR)$(resources480dir)" \ + "$(DESTDIR)$(scalabledir)" "$(DESTDIR)$(xrcdir)" \ + "$(DESTDIR)$(hicolorapps16dir)" \ "$(DESTDIR)$(hicolorapps32dir)" \ - "$(DESTDIR)$(hicolorapps48dir)" "$(DESTDIR)$(pixmapsdir)" + "$(DESTDIR)$(hicolorapps48dir)" \ + "$(DESTDIR)$(hicolorapps480dir)" "$(DESTDIR)$(pixmapsdir)" DATA = $(dist_noinst_DATA) $(dist_resources_DATA) \ - $(dist_resources20_DATA) $(dist_resources24_DATA) \ - $(dist_resources48_DATA) $(dist_scalable_DATA) \ - $(dist_xrc_DATA) $(hicolorapps16_DATA) $(hicolorapps32_DATA) \ - $(hicolorapps48_DATA) $(nodist_noinst_DATA) $(pixmaps_DATA) + $(dist_resources16_DATA) $(dist_resources20_DATA) \ + $(dist_resources24_DATA) $(dist_resources32_DATA) \ + $(dist_resources48_DATA) $(dist_resources480_DATA) \ + $(dist_scalable_DATA) $(dist_xrc_DATA) $(hicolorapps16_DATA) \ + $(hicolorapps32_DATA) $(hicolorapps48_DATA) \ + $(hicolorapps480_DATA) $(nodist_noinst_DATA) $(pixmaps_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -201,6 +219,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/MacInfo.plist.in $(srcdir)/Makefile.in \ + $(srcdir)/version.rc.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -237,11 +257,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -265,6 +285,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -285,16 +307,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -346,6 +376,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -385,6 +416,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -396,17 +428,14 @@ top_srcdir = @top_srcdir@ xdgopen = @xdgopen@ xgettext = @xgettext@ -SUBDIRS = 16x16 32x32 cyril blukis flatzilla lone minimal opencrystal sun tango +SUBDIRS = blukis classic cyril default flatzilla lone minimal opencrystal sun tango CLEANFILES = filezilla.o resourcesdir = $(pkgdatadir)/resources dist_resources_DATA = \ defaultfilters.xml \ - down.png \ dropdown.png \ finished.wav \ - leds.png \ - theme.xml \ - up.png + leds.png xrcdir = $(pkgdatadir)/resources/xrc dist_xrc_DATA = \ @@ -415,24 +444,40 @@ xrc/inputdialog.xrc \ xrc/menus.xrc \ xrc/netconfwizard.xrc \ - xrc/quickconnectbar.xrc \ xrc/settings.xrc \ xrc/sitemanager.xrc \ - xrc/toolbar.xrc \ + xrc/storj.xrc \ xrc/update.xrc +resources16dir = $(pkgdatadir)/resources/16x16 +dist_resources16_DATA = \ + 16x16/filezilla.png \ + 16x16/sort_down_dark.png \ + 16x16/sort_down_light.png \ + 16x16/sort_up_dark.png \ + 16x16/sort_up_light.png \ + 16x16/throbber.gif \ + 16x16/unknown.png + resources20dir = $(pkgdatadir)/resources/20x20 dist_resources20_DATA = 20x20/unknown.png resources24dir = $(pkgdatadir)/resources/24x24 dist_resources24_DATA = 24x24/unknown.png +resources32dir = $(pkgdatadir)/resources/32x32 +dist_resources32_DATA = 32x32/filezilla.png resources48dir = $(pkgdatadir)/resources/48x48 -dist_resources48_DATA = 48x48/filezilla.png \ - 48x48/speedlimits.png - +dist_resources48_DATA = 48x48/filezilla.png +resources480dir = $(pkgdatadir)/resources/480x480 +dist_resources480_DATA = 480x480/filezilla.png @USE_RESOURCEFILE_TRUE@nodist_noinst_DATA = filezilla.o -dist_noinst_DATA = filezilla.rc FileZilla.ico \ - FileZilla.icns MacInfo.plist.in \ - version.rc.in windows_manifest.xml +dist_noinst_DATA = \ + filezilla.rc \ + FileZilla.ico \ + FileZilla.icns \ + filezilla.entitlements \ + MacInfo.plist.in \ + version.rc.in \ + windows_manifest.xml pixmapsdir = $(datadir)/pixmaps pixmaps_DATA = 48x48/filezilla.png @@ -442,6 +487,8 @@ hicolorapps32_DATA = 32x32/filezilla.png hicolorapps48dir = $(datadir)/icons/hicolor/48x48/apps hicolorapps48_DATA = 48x48/filezilla.png +hicolorapps480dir = $(datadir)/icons/hicolor/480x480/apps +hicolorapps480_DATA = 480x480/filezilla.png scalabledir = $(datadir)/icons/hicolor/scalable/apps dist_scalable_DATA = filezilla.svg all: all-recursive @@ -459,7 +506,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -508,6 +554,27 @@ @list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir) +install-dist_resources16DATA: $(dist_resources16_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(resources16dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(resources16dir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resources16dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(resources16dir)" || exit $$?; \ + done + +uninstall-dist_resources16DATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(resources16dir)'; $(am__uninstall_files_from_dir) install-dist_resources20DATA: $(dist_resources20_DATA) @$(NORMAL_INSTALL) @list='$(dist_resources20_DATA)'; test -n "$(resources20dir)" || list=; \ @@ -550,6 +617,27 @@ @list='$(dist_resources24_DATA)'; test -n "$(resources24dir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(resources24dir)'; $(am__uninstall_files_from_dir) +install-dist_resources32DATA: $(dist_resources32_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(resources32dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(resources32dir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resources32dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(resources32dir)" || exit $$?; \ + done + +uninstall-dist_resources32DATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(resources32dir)'; $(am__uninstall_files_from_dir) install-dist_resources48DATA: $(dist_resources48_DATA) @$(NORMAL_INSTALL) @list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \ @@ -571,6 +659,27 @@ @list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(resources48dir)'; $(am__uninstall_files_from_dir) +install-dist_resources480DATA: $(dist_resources480_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_resources480_DATA)'; test -n "$(resources480dir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(resources480dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(resources480dir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resources480dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(resources480dir)" || exit $$?; \ + done + +uninstall-dist_resources480DATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_resources480_DATA)'; test -n "$(resources480dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(resources480dir)'; $(am__uninstall_files_from_dir) install-dist_scalableDATA: $(dist_scalable_DATA) @$(NORMAL_INSTALL) @list='$(dist_scalable_DATA)'; test -n "$(scalabledir)" || list=; \ @@ -676,6 +785,27 @@ @list='$(hicolorapps48_DATA)'; test -n "$(hicolorapps48dir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(hicolorapps48dir)'; $(am__uninstall_files_from_dir) +install-hicolorapps480DATA: $(hicolorapps480_DATA) + @$(NORMAL_INSTALL) + @list='$(hicolorapps480_DATA)'; test -n "$(hicolorapps480dir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(hicolorapps480dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(hicolorapps480dir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(hicolorapps480dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(hicolorapps480dir)" || exit $$?; \ + done + +uninstall-hicolorapps480DATA: + @$(NORMAL_UNINSTALL) + @list='$(hicolorapps480_DATA)'; test -n "$(hicolorapps480dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(hicolorapps480dir)'; $(am__uninstall_files_from_dir) install-pixmapsDATA: $(pixmaps_DATA) @$(NORMAL_INSTALL) @list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \ @@ -857,7 +987,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(resources20dir)" "$(DESTDIR)$(resources24dir)" "$(DESTDIR)$(resources48dir)" "$(DESTDIR)$(scalabledir)" "$(DESTDIR)$(xrcdir)" "$(DESTDIR)$(hicolorapps16dir)" "$(DESTDIR)$(hicolorapps32dir)" "$(DESTDIR)$(hicolorapps48dir)" "$(DESTDIR)$(pixmapsdir)"; do \ + for dir in "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(resources16dir)" "$(DESTDIR)$(resources20dir)" "$(DESTDIR)$(resources24dir)" "$(DESTDIR)$(resources32dir)" "$(DESTDIR)$(resources48dir)" "$(DESTDIR)$(resources480dir)" "$(DESTDIR)$(scalabledir)" "$(DESTDIR)$(xrcdir)" "$(DESTDIR)$(hicolorapps16dir)" "$(DESTDIR)$(hicolorapps32dir)" "$(DESTDIR)$(hicolorapps48dir)" "$(DESTDIR)$(hicolorapps480dir)" "$(DESTDIR)$(pixmapsdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -911,11 +1041,13 @@ info-am: -install-data-am: install-dist_resources20DATA \ - install-dist_resources24DATA install-dist_resources48DATA \ - install-dist_resourcesDATA install-dist_scalableDATA \ - install-dist_xrcDATA install-hicolorapps16DATA \ - install-hicolorapps32DATA install-hicolorapps48DATA \ +install-data-am: install-dist_resources16DATA \ + install-dist_resources20DATA install-dist_resources24DATA \ + install-dist_resources32DATA install-dist_resources480DATA \ + install-dist_resources48DATA install-dist_resourcesDATA \ + install-dist_scalableDATA install-dist_xrcDATA \ + install-hicolorapps16DATA install-hicolorapps32DATA \ + install-hicolorapps480DATA install-hicolorapps48DATA \ install-pixmapsDATA install-dvi: install-dvi-recursive @@ -960,11 +1092,13 @@ ps-am: -uninstall-am: uninstall-dist_resources20DATA \ - uninstall-dist_resources24DATA uninstall-dist_resources48DATA \ - uninstall-dist_resourcesDATA uninstall-dist_scalableDATA \ - uninstall-dist_xrcDATA uninstall-hicolorapps16DATA \ - uninstall-hicolorapps32DATA uninstall-hicolorapps48DATA \ +uninstall-am: uninstall-dist_resources16DATA \ + uninstall-dist_resources20DATA uninstall-dist_resources24DATA \ + uninstall-dist_resources32DATA uninstall-dist_resources480DATA \ + uninstall-dist_resources48DATA uninstall-dist_resourcesDATA \ + uninstall-dist_scalableDATA uninstall-dist_xrcDATA \ + uninstall-hicolorapps16DATA uninstall-hicolorapps32DATA \ + uninstall-hicolorapps480DATA uninstall-hicolorapps48DATA \ uninstall-pixmapsDATA .MAKE: $(am__recursive_targets) install-am install-strip @@ -974,11 +1108,13 @@ ctags-am distclean distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-dist_resources20DATA install-dist_resources24DATA \ - install-dist_resources48DATA install-dist_resourcesDATA \ - install-dist_scalableDATA install-dist_xrcDATA install-dvi \ - install-dvi-am install-exec install-exec-am \ - install-hicolorapps16DATA install-hicolorapps32DATA \ + install-dist_resources16DATA install-dist_resources20DATA \ + install-dist_resources24DATA install-dist_resources32DATA \ + install-dist_resources480DATA install-dist_resources48DATA \ + install-dist_resourcesDATA install-dist_scalableDATA \ + install-dist_xrcDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-hicolorapps16DATA \ + install-hicolorapps32DATA install-hicolorapps480DATA \ install-hicolorapps48DATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-pixmapsDATA install-ps install-ps-am \ @@ -986,12 +1122,16 @@ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-dist_resources20DATA uninstall-dist_resources24DATA \ - uninstall-dist_resources48DATA uninstall-dist_resourcesDATA \ - uninstall-dist_scalableDATA uninstall-dist_xrcDATA \ - uninstall-hicolorapps16DATA uninstall-hicolorapps32DATA \ + uninstall-dist_resources16DATA uninstall-dist_resources20DATA \ + uninstall-dist_resources24DATA uninstall-dist_resources32DATA \ + uninstall-dist_resources480DATA uninstall-dist_resources48DATA \ + uninstall-dist_resourcesDATA uninstall-dist_scalableDATA \ + uninstall-dist_xrcDATA uninstall-hicolorapps16DATA \ + uninstall-hicolorapps32DATA uninstall-hicolorapps480DATA \ uninstall-hicolorapps48DATA uninstall-pixmapsDATA +.PRECIOUS: Makefile + @USE_RESOURCEFILE_TRUE@filezilla.o: $(srcdir)/filezilla.rc $(srcdir)/windows_manifest.xml version.rc @USE_RESOURCEFILE_TRUE@ @if [ -f $@~ ]; then rm $@~; fi @@ -1010,6 +1150,10 @@ @MACAPPBUNDLE_TRUE@ for i in $(dist_xrc_DATA); \ @MACAPPBUNDLE_TRUE@ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/xrc"; \ @MACAPPBUNDLE_TRUE@ done +@MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/16x16" +@MACAPPBUNDLE_TRUE@ for i in $(dist_resources16_DATA); \ +@MACAPPBUNDLE_TRUE@ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/16x16"; \ +@MACAPPBUNDLE_TRUE@ done @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/20x20" @MACAPPBUNDLE_TRUE@ for i in $(dist_resources20_DATA); \ @MACAPPBUNDLE_TRUE@ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/20x20"; \ @@ -1018,15 +1162,23 @@ @MACAPPBUNDLE_TRUE@ for i in $(dist_resources24_DATA); \ @MACAPPBUNDLE_TRUE@ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/24x24"; \ @MACAPPBUNDLE_TRUE@ done +@MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/32x32" +@MACAPPBUNDLE_TRUE@ for i in $(dist_resources32_DATA); \ +@MACAPPBUNDLE_TRUE@ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/32x32"; \ +@MACAPPBUNDLE_TRUE@ done @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/48x48" @MACAPPBUNDLE_TRUE@ for i in $(dist_resources48_DATA); \ @MACAPPBUNDLE_TRUE@ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/48x48"; \ @MACAPPBUNDLE_TRUE@ done +@MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/480x480" +@MACAPPBUNDLE_TRUE@ for i in $(dist_resources480_DATA); \ +@MACAPPBUNDLE_TRUE@ do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/480x480"; \ +@MACAPPBUNDLE_TRUE@ done -@MACAPPBUNDLE_TRUE@ $(MAKE) -C 16x16 mac-copy-resources -@MACAPPBUNDLE_TRUE@ $(MAKE) -C 32x32 mac-copy-resources +@MACAPPBUNDLE_TRUE@ $(MAKE) -C classic mac-copy-resources @MACAPPBUNDLE_TRUE@ $(MAKE) -C cyril mac-copy-resources @MACAPPBUNDLE_TRUE@ $(MAKE) -C blukis mac-copy-resources +@MACAPPBUNDLE_TRUE@ $(MAKE) -C default mac-copy-resources @MACAPPBUNDLE_TRUE@ $(MAKE) -C lone mac-copy-resources @MACAPPBUNDLE_TRUE@ $(MAKE) -C opencrystal mac-copy-resources @MACAPPBUNDLE_TRUE@ $(MAKE) -C tango mac-copy-resources Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/find.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/find.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/logview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/logview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/16x16/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/16x16/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/minimal/32x32/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/minimal/32x32/file.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/minimal/Makefile.am filezilla-3.33.0/src/interface/resources/minimal/Makefile.am --- filezilla-3.15.0.2/src/interface/resources/minimal/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/minimal/Makefile.am 2016-11-26 16:41:50.000000000 +0000 @@ -7,6 +7,7 @@ dist_resources16_DATA = 16x16/ascii.png \ 16x16/auto.png \ 16x16/binary.png \ + 16x16/bookmark.png \ 16x16/bookmarks.png \ 16x16/cancel.png \ 16x16/compare.png \ diff -Nru filezilla-3.15.0.2/src/interface/resources/minimal/Makefile.in filezilla-3.33.0/src/interface/resources/minimal/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/minimal/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/minimal/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,17 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources/minimal -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) $(dist_resources16_DATA) \ - $(dist_resources32_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -101,6 +111,9 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(dist_resources16_DATA) $(dist_resources32_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -156,6 +169,7 @@ DATA = $(dist_resources_DATA) $(dist_resources16_DATA) \ $(dist_resources32_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -167,11 +181,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -195,6 +209,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -215,16 +231,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -276,6 +300,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -315,6 +340,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -333,6 +359,7 @@ dist_resources16_DATA = 16x16/ascii.png \ 16x16/auto.png \ 16x16/binary.png \ + 16x16/bookmark.png \ 16x16/bookmarks.png \ 16x16/cancel.png \ 16x16/compare.png \ @@ -379,7 +406,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/minimal/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/minimal/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -625,6 +651,8 @@ uninstall-am uninstall-dist_resources16DATA \ uninstall-dist_resources32DATA uninstall-dist_resourcesDATA +.PRECIOUS: Makefile + @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/minimal/16x16"; diff -Nru filezilla-3.15.0.2/src/interface/resources/minimal/theme.xml filezilla-3.33.0/src/interface/resources/minimal/theme.xml --- filezilla-3.15.0.2/src/interface/resources/minimal/theme.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/minimal/theme.xml 2016-11-22 22:04:28.000000000 +0000 @@ -4,6 +4,7 @@ Minimal Frédéric Duarte pgase.filezilla@free.fr - 16x16 + 16x16 + 32x32 Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/auto.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/auto.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/find.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/find.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/folderback.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/folderback.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/folderup.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/folderup.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/help.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/help.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/localtreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/localtreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/reconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/reconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/16x16/speedlimits.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/16x16/speedlimits.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/20x20/server.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/20x20/server.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/32x32/bookmark.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/32x32/bookmark.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/32x32/filter.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/32x32/filter.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/32x32/localtreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/32x32/localtreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/opencrystal/48x48/folderback.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/opencrystal/48x48/folderback.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/opencrystal/Makefile.in filezilla-3.33.0/src/interface/resources/opencrystal/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/opencrystal/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/opencrystal/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,18 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources/opencrystal -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) $(dist_resources16_DATA) \ - $(dist_resources20_DATA) $(dist_resources24_DATA) \ - $(dist_resources32_DATA) $(dist_resources48_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -102,6 +111,10 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(dist_resources16_DATA) $(dist_resources20_DATA) \ + $(dist_resources24_DATA) $(dist_resources32_DATA) \ + $(dist_resources48_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -160,6 +173,7 @@ $(dist_resources20_DATA) $(dist_resources24_DATA) \ $(dist_resources32_DATA) $(dist_resources48_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -171,11 +185,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -199,6 +213,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -219,16 +235,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -280,6 +304,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -319,6 +344,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -451,7 +477,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/opencrystal/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/opencrystal/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -767,6 +792,8 @@ uninstall-dist_resources24DATA uninstall-dist_resources32DATA \ uninstall-dist_resources48DATA uninstall-dist_resourcesDATA +.PRECIOUS: Makefile + @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/opencrystal/16x16"; diff -Nru filezilla-3.15.0.2/src/interface/resources/opencrystal/theme.xml filezilla-3.33.0/src/interface/resources/opencrystal/theme.xml --- filezilla-3.15.0.2/src/interface/resources/opencrystal/theme.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/opencrystal/theme.xml 2016-11-22 22:04:27.000000000 +0000 @@ -4,8 +4,10 @@ OpenCrystal Stamatis H. Stamatellos, Everaldo Coelho ydatografida@gmail.com - 16x16 - 32x32 - 48x48 + 16x16 + 20x20 + 24x24 + 32x32 + 48x48 Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/sun/48x48/auto.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/sun/48x48/auto.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/sun/48x48/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/sun/48x48/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/sun/48x48/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/sun/48x48/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/sun/48x48/download.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/sun/48x48/download.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/sun/48x48/logview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/sun/48x48/logview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/sun/48x48/processqueue.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/sun/48x48/processqueue.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/sun/48x48/refresh.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/sun/48x48/refresh.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/sun/48x48/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/sun/48x48/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/sun/48x48/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/sun/48x48/upload.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/sun/Makefile.in filezilla-3.33.0/src/interface/resources/sun/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/sun/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/sun/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,16 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources/sun -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) $(dist_resources48_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -100,6 +111,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(dist_resources48_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -154,6 +167,7 @@ "$(DESTDIR)$(resources48dir)" DATA = $(dist_resources_DATA) $(dist_resources48_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -165,11 +179,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -193,6 +207,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -213,16 +229,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -274,6 +298,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -313,6 +338,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -374,7 +400,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/sun/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/sun/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -598,6 +623,8 @@ ps ps-am tags-am uninstall uninstall-am \ uninstall-dist_resources48DATA uninstall-dist_resourcesDATA +.PRECIOUS: Makefile + @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/sun/48x48"; diff -Nru filezilla-3.15.0.2/src/interface/resources/sun/theme.xml filezilla-3.33.0/src/interface/resources/sun/theme.xml --- filezilla-3.15.0.2/src/interface/resources/sun/theme.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/sun/theme.xml 2016-11-22 22:04:27.000000000 +0000 @@ -4,6 +4,6 @@ SuN Mr.Silencer silencer.guard@yahoo.com - 48x48 + 48x48 Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/ascii.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/ascii.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/binary.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/binary.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/file.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/file.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/find.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/find.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/folder.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/folder.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/queueview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/queueview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/remotetreeview.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/remotetreeview.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/synchronize.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/synchronize.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/16x16/upload.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/16x16/upload.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/32x32/cancel.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/32x32/cancel.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/32x32/disconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/32x32/disconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/32x32/folderclosed.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/32x32/folderclosed.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/32x32/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/32x32/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/32x32/processqueue.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/32x32/processqueue.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/32x32/reconnect.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/32x32/reconnect.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/48x48/compare.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/48x48/compare.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/48x48/downloadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/48x48/downloadadd.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/48x48/lock.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/48x48/lock.png differ Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/tango/48x48/uploadadd.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/tango/48x48/uploadadd.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/tango/Makefile.in filezilla-3.33.0/src/interface/resources/tango/Makefile.in --- filezilla-3.15.0.2/src/interface/resources/tango/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/tango/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,17 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/interface/resources/tango -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_resources_DATA) $(dist_resources16_DATA) \ - $(dist_resources32_DATA) $(dist_resources48_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -101,6 +111,9 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_resources_DATA) \ + $(dist_resources16_DATA) $(dist_resources32_DATA) \ + $(dist_resources48_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -157,6 +170,7 @@ DATA = $(dist_resources_DATA) $(dist_resources16_DATA) \ $(dist_resources32_DATA) $(dist_resources48_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -168,11 +182,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -196,6 +210,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -216,16 +232,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -277,6 +301,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -316,6 +341,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -434,7 +460,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/tango/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/interface/resources/tango/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -704,6 +729,8 @@ uninstall-dist_resources16DATA uninstall-dist_resources32DATA \ uninstall-dist_resources48DATA uninstall-dist_resourcesDATA +.PRECIOUS: Makefile + @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA) @MACAPPBUNDLE_TRUE@ mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/16x16"; diff -Nru filezilla-3.15.0.2/src/interface/resources/tango/theme.xml filezilla-3.33.0/src/interface/resources/tango/theme.xml --- filezilla-3.15.0.2/src/interface/resources/tango/theme.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/tango/theme.xml 2016-11-22 22:04:27.000000000 +0000 @@ -5,8 +5,8 @@ Tango Desktop Project Christophe Meyer stombi@gmail.com - 16x16 - 32x32 - 48x48 + 16x16 + 32x32 + 48x48 diff -Nru filezilla-3.15.0.2/src/interface/resources/theme.xml filezilla-3.33.0/src/interface/resources/theme.xml --- filezilla-3.15.0.2/src/interface/resources/theme.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/theme.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ - - - - Classic - Tim Kosse - tim.kosse@filezilla-project.org - 16x16 - - Binary files /tmp/tmpi5Y12w/u2myUIX0h_/filezilla-3.15.0.2/src/interface/resources/up.png and /tmp/tmpi5Y12w/vIntxfrTLX/filezilla-3.33.0/src/interface/resources/up.png differ diff -Nru filezilla-3.15.0.2/src/interface/resources/version.rc.in filezilla-3.33.0/src/interface/resources/version.rc.in --- filezilla-3.15.0.2/src/interface/resources/version.rc.in 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/version.rc.in 2018-01-03 04:30:05.000000000 +0000 @@ -16,7 +16,7 @@ VALUE "FileDescription", "FileZilla FTP Client" VALUE "FileVersion", "@PACKAGE_VERSION_MAJOR@, @PACKAGE_VERSION_MINOR@, @PACKAGE_VERSION_MICRO@, @PACKAGE_VERSION_NANO@" VALUE "InternalName", "FileZilla 3" - VALUE "LegalCopyright", "Copyright (C) 2006-2016" + VALUE "LegalCopyright", "Copyright (C) 2006-2018" VALUE "OriginalFilename", "filezilla.exe" VALUE "ProductName", "FileZilla" VALUE "ProductVersion", "@PACKAGE_VERSION_MAJOR@, @PACKAGE_VERSION_MINOR@, @PACKAGE_VERSION_MICRO@, @PACKAGE_VERSION_NANO@" diff -Nru filezilla-3.15.0.2/src/interface/resources/windows_manifest.xml filezilla-3.33.0/src/interface/resources/windows_manifest.xml --- filezilla-3.15.0.2/src/interface/resources/windows_manifest.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/windows_manifest.xml 2018-01-03 04:30:05.000000000 +0000 @@ -3,7 +3,7 @@ FileZilla FTP client @@ -25,11 +25,9 @@ - + - - diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/certificate.xrc filezilla-3.33.0/src/interface/resources/xrc/certificate.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/certificate.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/certificate.xrc 2018-02-05 21:28:24.000000000 +0000 @@ -1,5 +1,5 @@ - + Unknown certificate @@ -50,7 +50,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -98,7 +98,7 @@ - + 1d 3d @@ -242,6 +242,11 @@ + + + + + 1 3d 0 diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/dialogs.xrc filezilla-3.33.0/src/interface/resources/xrc/dialogs.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/dialogs.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/dialogs.xrc 2018-01-09 04:30:03.000000000 +0000 @@ -1,5 +1,5 @@ - + wxWS_EX_BLOCK_EVENTS @@ -35,10 +35,7 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 10 - - - 32,32 - + wxBOTTOM|wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL @@ -79,10 +76,7 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 10 - - - 32,32 - + wxBOTTOM|wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL @@ -283,7 +277,7 @@ - + @@ -291,7 +285,7 @@ - + @@ -299,7 +293,7 @@ - + 5 5 @@ -341,7 +335,6 @@ wxALIGN_CENTRE_VERTICAL - 2 150,-1 @@ -349,6 +342,20 @@ 1 + + + + 1 + + wxALIGN_CENTRE_VERTICAL + + + + 150,-1 + 1 + + + 2 5 5 @@ -386,6 +393,184 @@ + + Enter master password + + wxVERTICAL + + + + + wxTOP|wxLEFT|wxRIGHT + 5 + + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + 5 + 5 + + wxALL + 5 + + + + + + + + wxALIGN_CENTRE_VERTICAL + + + + + + + + + + + wxALIGN_CENTRE_VERTICAL + + 2 + + + 150,-1 + + 1 + + + 5 + 5 + + wxALL + 5 + + + + + 1 + + wxALL + 5 + + + + wxHORIZONTAL + + + + 1 + + wxALL|wxGROW + 5 + + + + + + wxALL| wxGROW + 5 + + + wxALIGN_CENTRE_HORIZONTAL + + + + + Enter master password + + wxVERTICAL + + + + + wxTOP|wxLEFT|wxRIGHT + 5 + + + + + + + + wxALIGN_CENTRE_VERTICAL + + + + + + + + + + + wxALIGN_CENTRE_VERTICAL + + + + 150,-1 + + 1 + + + 2 + 5 + 5 + + wxALL + 5 + + + + + + wxALL + 5 + + + + + + + 1 + + + + + + + + + wxALL|wxGROW + 5 + + + Change file attributes @@ -589,10 +774,7 @@ wxVERTICAL - - - 48,48 - + wxALL 10 @@ -608,7 +790,7 @@ - + wxTOP|wxBOTTOM 5 @@ -654,7 +836,7 @@ - + @@ -662,7 +844,7 @@ - + @@ -670,7 +852,7 @@ - + @@ -678,7 +860,7 @@ - + @@ -686,7 +868,7 @@ - + 3 5 @@ -865,12 +1047,22 @@ - + + + + + + + + + + + - + 2 @@ -976,12 +1168,22 @@ - + + + + + + + + + + + - + 2 @@ -1146,14 +1348,14 @@ wxTOP|wxGROW 5 - + wxTOP|wxBOTTOM 5 - + wxGROW @@ -1292,6 +1494,7 @@ Filter out items matching all of the following Filter out items matching any of the following Filter out items matching none of the following + Filter out items matching not all of the following 0 @@ -1304,8 +1507,10 @@ 5 - + 350,200 + + wxSYS_COLOUR_WINDOW wxGROW @@ -1582,6 +1787,11 @@ + + + + + 5 @@ -1636,6 +1846,12 @@ 1 + + + + 1 + + 5 @@ -1900,7 +2116,7 @@ - + @@ -1942,7 +2158,7 @@ 5 - + wxGROW @@ -2021,14 +2237,40 @@ + 3 + 3 + + wxALL + 4 + + + wxGROW + + + + + wxVERTICAL + + + 2 + + + + + + + + + + - + - + 3 @@ -2139,7 +2381,7 @@ - + wxGROW @@ -2998,6 +3240,37 @@ + + + wxALIGN_CENTRE_VERTICAL + + + + wxHORIZONTAL + + + + + + + + + 1 + + + + + wxALIGN_CENTRE_VERTICAL + + + + + 1 + + wxALIGN_CENTRE_VERTICAL + + + wxALIGN_CENTRE_VERTICAL @@ -3009,9 +3282,8 @@ wxGROW|wxALIGN_CENTRE_VERTICAL - - - 1 + + wxALIGN_CENTRE_VERTICAL @@ -3027,17 +3299,13 @@ Match all of the following Match any of the following Match none of the following + Match not all of the following 0 wxALIGN_CENTRE_VERTICAL - - - - - wxALIGN_CENTRE_VERTICAL - + 3 7 5 @@ -3049,8 +3317,10 @@ - + 350,120 + + wxSYS_COLOUR_WINDOW wxGROW @@ -3103,7 +3373,7 @@ 5 - Remote file search + File search @@ -3207,6 +3477,101 @@ + + Upload search results + + wxVERTICAL + + + + + + + + + + + + + + + + + + wxALIGN_CENTRE_VERTICAL|wxRIGHT + 5 + + wxHORIZONTAL + + wxGROW + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + wxGROW + + + + + + + 1 + + + + + + + + 1 + 5 + + wxALIGN_CENTRE_HORIZONTAL + + 1 + 5 + 5 + + wxALL + 5 + + + Deleting symbolic link @@ -3309,10 +3674,7 @@ - - 48,48 - - + wxALIGN_CENTRE_VERTICAL wxHORIZONTAL @@ -3324,6 +3686,11 @@ wxGROW + wxALIGN_CENTRE_HORIZONTAL + + 1 + + @@ -3358,7 +3725,7 @@ - + bold @@ -3369,20 +3736,14 @@ - - - http:// - - - - - + + http:// - - + + http:// @@ -3401,7 +3762,7 @@ - + bold @@ -3412,14 +3773,20 @@ - - + + http:// - - + + + http:// + + + + + http:// @@ -3442,6 +3809,11 @@ 5 + wxALIGN_CENTRE_HORIZONTAL + + 1 + + wxGROW|wxTOP|wxBOTTOM 2 @@ -3540,10 +3912,7 @@ - - 48,48 - - + 5,-1 @@ -3643,7 +4012,7 @@ 1 - 7 + 3d @@ -3656,15 +4025,61 @@ - - + + + + + + + + + + + + + + + + + 1 + 2 + 3d + 3d + + + + + wxALIGN_CENTER_VERTICAL + + + + + + wxGROW + + + + + + wxALIGN_CENTER_VERTICAL + + + + + + wxGROW + + 10d + wxGROW|wxLEFT - - + + + 10d + wxLEFT @@ -3714,7 +4129,7 @@ - + @@ -3723,7 +4138,7 @@ - + 1 5 @@ -3751,4 +4166,73 @@ + + + wxVERTICAL + + wxALL + 5d + + 1 + 3d + + + + + + + + + + + + 0,5d + + + + + + + + + + wxGROW + -1,100d + + + + 2 + + + + + + + + + + + 3d + + wxALIGN_CENTRE_HORIZONTAL + + + 0,5d + + + + + + + 1 + + + + wxGROW + + + + + Directory access permissions + diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/inputdialog.xrc filezilla-3.33.0/src/interface/resources/xrc/inputdialog.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/inputdialog.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/inputdialog.xrc 2017-06-02 20:38:13.000000000 +0000 @@ -1,5 +1,5 @@ - + wxVERTICAL @@ -51,4 +51,4 @@ - \ No newline at end of file + diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/menus.xrc filezilla-3.33.0/src/interface/resources/xrc/menus.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/menus.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/menus.xrc 2018-04-25 03:30:06.000000000 +0000 @@ -1,240 +1,5 @@ - - - - - - - CTRL+S - Opens the Site Manager - - - - - - - - CTRL+T - Opens a new tab - - - - CTRL+W - Closes current tab - - - - - - - - - - - - CTRL+E - - - - - Close FileZilla - CTRL+Q - - - - - - - - - - - - - - Open the settings dialog of FileZilla - - - - - - - F5 - - - - - CTRL+I - - - - - - 1 - CTRL+O - - - - - 1 - - - - 1 - - - - - 1 - - - - - 1 - CTRL+Y - - - - 1 - - - - - 1 - - - - 1 - - - - 1 - - - - 1 - - - - 1 - - - - 1 - - - - - - - 1 - CTRL+P - - - - - - - - - - 1 - - - - 1 - - - - 1 - - - - - 1 - CTRL+U - - - - - 1 - - - - - - - - - - CTRL+M - - - - - - - CTRL+. - - - - - CTRL+R - - - - CTRL+D - - - - - Search server for files - F3 - - - - Send custom command to the server otherwise not available - - - - 1 - - - - - - - CTRL+B - - - - CTRL+SHIFT+B - - - - - - - - Check for newer versions of FileZilla - - - - - - - - - - - - - - - Display about dialog - - - + @@ -328,6 +93,10 @@ Copy the URLs of the selected items to clipboard. + + + Copy the URLs of the selected items to clipboard, including password. + Change the file permissions. @@ -373,41 +142,44 @@ - - + + 1 - - + + 1 - - + + 1 - - + + + 1 + + + 1 1 + + + 1 + - + 1 - + 1 - - 1 - - - - + 1 @@ -435,11 +207,13 @@ - Shows available TLS ciphers + + + @@ -515,6 +289,10 @@ Copy the URLs of the selected items to clipboard. + + + Copy the URLs of the selected items to clipboard, including password. + Change the file permissions. @@ -599,12 +377,27 @@ + + + + + + + + + + + + + + + diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/netconfwizard.xrc filezilla-3.33.0/src/interface/resources/xrc/netconfwizard.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/netconfwizard.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/netconfwizard.xrc 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ - + wxVERTICAL diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/quickconnectbar.xrc filezilla-3.33.0/src/interface/resources/xrc/quickconnectbar.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/quickconnectbar.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/quickconnectbar.xrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ - - - - - wxVERTICAL - - wxGROW - - -1,-1 - - - - - 3 - 5 - wxALL - - 1 - 0 - 5 - - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT - 2 - - -1,-1 - - - - - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL - - 63,-1d - - Enter the address of the server. -To specify the server protocol, prepend the host with the protocol identifier. If no protocol is specified, the default protocol (ftp://) will be used. -You can also enter complete URLs in the form protocol://user:pass@host:port here, the values in the other fields will be overwritten then.\n\nSupported protocols are:\n- ftp:// for normal FTP with optional encryption\n- sftp:// for SSH file transfer protocol\n- ftps:// for FTP over TLS (implicit)\n- ftpes:// for FTP over TLS (explicit) - - - - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT - 5 - - -1,-1 - - - - - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL - - -1,-1 - - - - - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT - 5 - - -1,-1 - - - - - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL - - - -1,-1 - - - - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT - 5 - - -1,-1 - - - - - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL - - 27,-1d - - Enter the port on which the server listens. -The default for FTP is 21, the default for SFTP is 22. - 5 - - - - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT - 5 - - wxHORIZONTAL - - wxALIGN_CENTER_VERTICAL - - 1 - -1,-1 - - - - - wxLEFT|wxGROW - 6 - - 20,-1 - 12,-1d - -1,-1 - - ../dropdown.png - - - - - - - - 0, 0 - - diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/settings.xrc filezilla-3.33.0/src/interface/resources/xrc/settings.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/settings.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/settings.xrc 2018-01-09 04:30:03.000000000 +0000 @@ -1,4 +1,5 @@ - + + Settings 1 @@ -241,7 +242,7 @@ - + wxALIGN_TOP @@ -619,13 +620,13 @@ 1 - + - + @@ -1267,6 +1268,79 @@ wxVERTICAL + + wxVERTICAL + + + 1 + 5 + wxGROW + + + + + + + + + + + + + + + + + + + 1 + 2 + 3d + 3d + + + + + wxALIGN_CENTER_VERTICAL + + + + + + wxGROW + + + + + + wxALIGN_CENTER_VERTICAL + + + + + + wxGROW + + + 10d + wxGROW|wxLEFT + + + + + + 10d + wxLEFT + + + wxGROW + + + wxGROW|wxTOP + 5 + + + wxVERTICAL @@ -1347,11 +1421,6 @@ - - - - - @@ -1433,7 +1502,7 @@ wxALIGN_CENTRE_VERTICAL - + @@ -1447,7 +1516,7 @@ wxGROW - + @@ -1457,6 +1526,17 @@ wxGROW + + + + + wxALIGN_CENTRE_VERTICAL + + + + + + 5 5 @@ -1468,10 +1548,10 @@ - + wxVERTICAL - + wxALL|wxGROW 5 @@ -1737,25 +1817,25 @@ wxALIGN_CENTRE_VERTICAL - - - - - wxALIGN_CENTRE_VERTICAL + + + - - - 0 - - Case insensitive (default) - Case insensitive - Case sensitive - Case sensitive (default) - Natural sort - - - wxALIGN_CENTRE_VERTICAL + wxALIGN_CENTRE_VERTICAL + + + + 0 + + Case insensitive (default) + Case insensitive + Case sensitive + Case sensitive (default) + Natural sort + + wxALIGN_CENTRE_VERTICAL + 5 5 @@ -2010,7 +2090,7 @@ - + 1 @@ -2185,7 +2265,7 @@ - + wxLEFT 18 @@ -2262,7 +2342,7 @@ - + diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/sitemanager.xrc filezilla-3.33.0/src/interface/resources/xrc/sitemanager.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/sitemanager.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/sitemanager.xrc 2018-03-29 08:59:00.000000000 +0000 @@ -1,5 +1,5 @@ - + 1 @@ -152,6 +152,15 @@ 0 + wxALIGN_CENTRE_VERTICAL + + + + + https://app.storj.io/#/signup + 1 + + wxALIGN_CENTRE_VERTICAL 0,0 @@ -255,11 +264,66 @@ 8,1 + + + + 1 + + wxALIGN_CENTRE_VERTICAL + 9,0 + + + wxGROW + + wxHORIZONTAL + + + 1 + + + wxALIGN_CENTRE_VERTICAL + + + + + 1 + + 5 + wxALIGN_CENTRE_VERTICAL|wxLEFT + + + 9,1 + wxALL|wxGROW 5 + + + wxALL|wxGROW + 5 + + + + wxHORIZONTAL + + + + + wxALL|wxALIGN_CENTRE_VERTICAL + 5 + + + + 0 + + wxALL|wxALIGN_CENTRE_VERTICAL + 5 + + + + @@ -281,20 +345,20 @@ - + wxVERTICAL wxHORIZONTAL - + wxALL|wxALIGN_CENTRE_VERTICAL 5 - + 0 @@ -426,14 +490,14 @@ wxVERTICAL - - + + wxALL 5 - + wxHORIZONTAL @@ -495,7 +559,7 @@ - + wxVERTICAL diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/storj.xrc filezilla-3.33.0/src/interface/resources/xrc/storj.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/storj.xrc 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/storj.xrc 2018-01-09 04:30:03.000000000 +0000 @@ -0,0 +1,53 @@ + + + + + wxVERTICAL + + + + + + + + + + <first\nsecond> + + + wxGROW + + + + + + + + + + + bold + + + + + + + + + 1 + + + + wxGROW + + 1 + 3d + + wxALL + 3d + + + Site Manager - Generated key + + diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/toolbar.xrc filezilla-3.33.0/src/interface/resources/xrc/toolbar.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/toolbar.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/toolbar.xrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ - - - - - 16,16 - - - Open the Site Manager - Open the Site Manager. - Open the Site Manager. Right-click for a list of sites. - - - - - - Toggles the display of the message log - 1 - Toggles the display of the message log - - - - Toggles the display of the local directory tree - 1 - Toggles the display of the local directory tree - - - - Toggles the display of the remote directory tree - 1 - Toggles the display of the remote directory tree - - - - Toggles the display of the transfer queue - 1 - Toggles the display of the transfer queue - - - - - Refresh the file and folder lists - Refresh the file and folder lists - - - - Toggles processing of the transfer queue - Toggles processing of the transfer queue - 1 - - - - Cancel current operation - Cancels the current operation - - - - Disconnect from server - Disconnects from the currently visible server - - - - Reconnects to the last used server - Reconnects to the last used server - - - - - Filter the directory listings - 1 - Opens the directory listing filter dialog. Right-click to toggle filters. - - - - 1 - Toggle directory comparison. Right-click to change comparison mode.\n\nColors:\nYellow: File only exists on one side\nGreen: File is newer than the unmarked file on other side\nRed: File sizes different - Directory comparison - - - - 1 - Toggle synchronized browsing.\nIf enabled, navigating the local directory hierarchy will also change the directory on the server accordingly and vice versa. - Synchronized browsing - - - - Search for files recursively. - File search - - - diff -Nru filezilla-3.15.0.2/src/interface/resources/xrc/update.xrc filezilla-3.33.0/src/interface/resources/xrc/update.xrc --- filezilla-3.15.0.2/src/interface/resources/xrc/update.xrc 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/resources/xrc/update.xrc 2018-01-09 04:30:03.000000000 +0000 @@ -1,5 +1,5 @@ - - + + Check for Updates @@ -44,104 +44,133 @@ - - - - - - - - - - - - - - - - - + + wxVERTICAL - - - wxGROW - 300,200 - - - + - - 1 - 5 - 5 + + + + + + + + + + + + + + + + + + + + + wxGROW + 300,150 + + + - - + + 1 + 5 + 5 + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxBOTTOM + 10 + + + + wxALIGN_CENTRE_VERTICAL + + + + + + wxALIGN_CENTRE_VERTICAL + - wxALIGN_CENTRE_VERTICAL|wxTOP|wxBOTTOM - 10 + wxVERTICAL + + wxALIGN_CENTRE_HORIZONTAL + + + + + + + + + + 1 + + wxTOP|wxBOTTOM|wxALIGN_CENTRE_HORIZONTAL + 10 + + + + + + + + 0 + + + + + wxGROW + -1,0 + + + + wxHORIZONTAL - - wxALIGN_CENTRE_VERTICAL + + + + + + - - + + - wxALIGN_CENTRE_VERTICAL + wxBOTTOM|wxGROW + 10 + + + + + + + 1 + 5 + 5 + 0 + 4 + + + + + + + + https://filezilla-project.org/ + - wxVERTICAL - - wxALIGN_CENTRE_HORIZONTAL - - - - - - - - - - 1 - - wxTOP|wxBOTTOM|wxALIGN_CENTRE_HORIZONTAL - 10 - - - - - - - - - - - wxBOTTOM - 10 - - - - - - - 1 - 5 - 5 - 0 - 4 - - - - - - - - https://filezilla-project.org/ @@ -257,4 +286,4 @@ 0 - \ No newline at end of file + diff -Nru filezilla-3.15.0.2/src/interface/search.cpp filezilla-3.33.0/src/interface/search.cpp --- filezilla-3.15.0.2/src/interface/search.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/search.cpp 2017-12-29 14:30:53.000000000 +0000 @@ -5,23 +5,66 @@ #include "search.h" #include "commandqueue.h" #include "filelistctrl.h" +#include "file_utils.h" #include "ipcmutex.h" #include "Options.h" #include "queue.h" -#include "recursive_operation.h" +#include "remote_recursive_operation.h" #include "sizeformatting.h" #include "timeformatting.h" #include "window_state_manager.h" #include "xrc_helper.h" -class CSearchFileData : public CGenericFileData, public CDirentry +#include + +#include + +class CRemoteSearchFileData final : public CDirentry { public: CServerPath path; }; +class CLocalSearchFileData final : public CLocalRecursiveOperation::listing::entry +{ +public: + bool is_dir() const { return dir; } + bool dir{}; + CLocalPath path; +}; + +template<> +inline int DoCmpName(CRemoteSearchFileData const& data1, CRemoteSearchFileData const& data2, CFileListCtrlSortBase::NameSortMode const nameSortMode) +{ + int res; + switch (nameSortMode) + { + case CFileListCtrlSortBase::namesort_casesensitive: + res = CFileListCtrlSortBase::CmpCase(data1.name, data2.name); + break; + default: + case CFileListCtrlSortBase::namesort_caseinsensitive: + res = CFileListCtrlSortBase::CmpNoCase(data1.name, data2.name); + break; + case CFileListCtrlSortBase::namesort_natural: + res = CFileListCtrlSortBase::CmpNatural(data1.name, data2.name); + break; + } + + if (!res) { + if (data1.path < data2.path) { + res = -1; + } + else if (data2.path < data1.path) { + res = 1; + } + } + + return res; +} + template<> -inline int DoCmpName(CSearchFileData const& data1, CSearchFileData const& data2, CFileListCtrlSortBase::NameSortMode const nameSortMode) +inline int DoCmpName(CLocalSearchFileData const& data1, CLocalSearchFileData const& data2, CFileListCtrlSortBase::NameSortMode const nameSortMode) { int res; switch (nameSortMode) @@ -39,28 +82,33 @@ } if (!res) { - if (data1.path < data2.path) + if (data1.path < data2.path) { res = -1; - else if (data2.path < data1.path) + } + else if (data2.path < data1.path) { res = 1; + } } return res; } -class CSearchDialogFileList : public CFileListCtrl +class CSearchDialogFileList final : public CFileListCtrl { friend class CSearchDialog; friend class CSearchSortType; public: - CSearchDialogFileList(CSearchDialog* pParent, CState* pState, CQueueView* pQueue); + CSearchDialogFileList(CSearchDialog* pParent, CQueueView* pQueue); + + void clear(); + void set_mode(CSearchDialog::search_mode mode); protected: virtual bool ItemIsDir(int index) const; virtual int64_t ItemGetSize(int index) const; - CFileListCtrl::CSortComparisonObject GetSortComparisonObject(); + virtual std::unique_ptr GetSortComparisonObject() override; CSearchDialog *m_searchDialog; @@ -81,16 +129,21 @@ virtual void OnExitComparisonMode() {} int m_dirIcon; + + CSearchDialog::search_mode mode_{}; + + std::vector remoteFileData_; + std::vector localFileData_; }; // Search dialog file list // ----------------------- // Defined in RemoteListView.cpp -extern wxString StripVMSRevision(const wxString& name); +std::wstring StripVMSRevision(std::wstring const& name); -CSearchDialogFileList::CSearchDialogFileList(CSearchDialog* pParent, CState* pState, CQueueView* pQueue) - : CFileListCtrl(pParent, pState, pQueue, true), +CSearchDialogFileList::CSearchDialogFileList(CSearchDialog* pParent, CQueueView* pQueue) + : CFileListCtrl(pParent, pQueue, true), m_searchDialog(pParent) { m_hasParent = false; @@ -99,8 +152,6 @@ m_dirIcon = GetIconIndex(iconType::dir); - InitSort(OPTION_SEARCH_SORTORDER); - InitHeaderSortImageList(); const unsigned long widths[7] = { 130, 130, 75, 80, 120, 80, 80 }; @@ -113,110 +164,240 @@ AddColumn(_("Permissions"), wxLIST_FORMAT_LEFT, widths[5]); AddColumn(_("Owner/Group"), wxLIST_FORMAT_LEFT, widths[6]); LoadColumnSettings(OPTION_SEARCH_COLUMN_WIDTHS, OPTION_SEARCH_COLUMN_SHOWN, OPTION_SEARCH_COLUMN_ORDER); + + InitSort(OPTION_SEARCH_SORTORDER); } bool CSearchDialogFileList::ItemIsDir(int index) const { - return m_fileData[index].is_dir(); + if (mode_ == CSearchDialog::search_mode::local) { + return localFileData_[index].dir; + } + else { + return remoteFileData_[index].is_dir(); + } } int64_t CSearchDialogFileList::ItemGetSize(int index) const { - return m_fileData[index].size; + if (mode_ == CSearchDialog::search_mode::local) { + return localFileData_[index].size; + } + else { + return remoteFileData_[index].size; + } } -CFileListCtrl::CSortComparisonObject CSearchDialogFileList::GetSortComparisonObject() +std::unique_ptr CSearchDialogFileList::GetSortComparisonObject() { CFileListCtrlSortBase::DirSortMode dirSortMode = GetDirSortMode(); CFileListCtrlSortBase::NameSortMode nameSortMode = GetNameSortMode(); - if (!m_sortDirection) { - if (m_sortColumn == 1) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortPath, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 2) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortSize, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 3) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortType, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 4) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortTime, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 5) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortPermissions, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 6) - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortOwnerGroup, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else - return CFileListCtrl::CSortComparisonObject(new CFileListCtrlSortNamePath, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - } - else { - if (m_sortColumn == 1) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CSearchFileData>, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 2) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CSearchFileData>, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 3) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CSearchFileData>, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 4) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CSearchFileData>, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 5) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CSearchFileData>, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else if (m_sortColumn == 6) - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CSearchFileData>, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); - else - return CFileListCtrl::CSortComparisonObject(new CReverseSort, CSearchFileData>, CSearchFileData>(m_fileData, m_fileData, dirSortMode, nameSortMode, this)); + if (mode_ == CSearchDialog::search_mode::local) { + if (!m_sortDirection) { + if (m_sortColumn == 1) { + return std::make_unique, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 2) { + return std::make_unique, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 3) { + return std::make_unique, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 4) { + return std::make_unique, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else { + return std::make_unique, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + } + else { + if (m_sortColumn == 1) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 2) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 3) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 4) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else { + return std::make_unique, CGenericFileData>, CGenericFileData>>(localFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + } + } + else { + if (!m_sortDirection) { + if (m_sortColumn == 1) { + return std::make_unique, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 2) { + return std::make_unique, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 3) { + return std::make_unique, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 4) { + return std::make_unique, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 5) { + return std::make_unique, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 6) { + return std::make_unique, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else { + return std::make_unique, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + } + else { + if (m_sortColumn == 1) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 2) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 3) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 4) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 5) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else if (m_sortColumn == 6) { + return std::make_unique, CGenericFileData>, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + else { + return std::make_unique, CGenericFileData>, CGenericFileData>>(remoteFileData_, m_fileData, dirSortMode, nameSortMode, this); + } + } } } wxString CSearchDialogFileList::GetItemText(int item, unsigned int column) { - if (item < 0 || item >= (int)m_indexMapping.size()) + if (item < 0 || item >= (int)m_indexMapping.size()) { return wxString(); + } int index = m_indexMapping[item]; - const CDirentry& entry = m_fileData[index]; - if (!column) - return entry.name; - else if (column == 1) - return m_fileData[index].path.GetPath(); - else if (column == 2) { - if (entry.is_dir() || entry.size < 0) - return wxString(); - else - return CSizeFormat::Format(entry.size); - } - else if (column == 3) { - CSearchFileData& data = m_fileData[index]; - if (data.fileType.empty()) { - if (data.path.GetType() == VMS) - data.fileType = GetType(StripVMSRevision(entry.name), entry.is_dir()); - else + if (mode_ == CSearchDialog::search_mode::local) { + CLocalSearchFileData const& entry = localFileData_[index]; + if (!column) { + return entry.name; + } + else if (column == 1) { + return entry.path.GetPath(); + } + else if (column == 2) { + if (entry.is_dir() || entry.size < 0) { + return wxString(); + } + else { + return CSizeFormat::Format(entry.size); + } + } + else if (column == 3) { + auto & data = m_fileData[index]; + if (data.fileType.empty()) { data.fileType = GetType(entry.name, entry.is_dir()); + } + + return data.fileType; + } + else if (column == 4) { + return CTimeFormat::Format(entry.time); + } + } + else { + CRemoteSearchFileData const& entry = remoteFileData_[index]; + if (!column) { + return entry.name; + } + else if (column == 1) { + return entry.path.GetPath(); } + else if (column == 2) { + if (entry.is_dir() || entry.size < 0) { + return wxString(); + } + else { + return CSizeFormat::Format(entry.size); + } + } + else if (column == 3) { + auto & data = m_fileData[index]; + if (data.fileType.empty()) { + if (entry.path.GetType() == VMS) { + data.fileType = GetType(StripVMSRevision(entry.name), entry.is_dir()); + } + else { + data.fileType = GetType(entry.name, entry.is_dir()); + } + } - return data.fileType; + return data.fileType; + } + else if (column == 4) { + return CTimeFormat::Format(entry.time); + } + else if (column == 5) { + return *entry.permissions; + } + else if (column == 6) { + return *entry.ownerGroup; + } } - else if (column == 4) - return CTimeFormat::Format(entry.time); - else if (column == 5) - return *entry.permissions; - else if (column == 6) - return *entry.ownerGroup; return wxString(); } int CSearchDialogFileList::OnGetItemImage(long item) const { CSearchDialogFileList *pThis = const_cast(this); - if (item < 0 || item >= (int)m_indexMapping.size()) + if (item < 0 || item >= (int)m_indexMapping.size()) { return -1; + } int index = m_indexMapping[item]; int &icon = pThis->m_fileData[index].icon; - if (icon != -2) + if (icon != -2) { return icon; + } + + if (mode_ == CSearchDialog::search_mode::local) { + auto const& file = localFileData_[index]; + icon = pThis->GetIconIndex(iconType::file, file.path.GetPath() + file.name, true); + } + else { + icon = pThis->GetIconIndex(iconType::file, remoteFileData_[index].name, false); + } - icon = pThis->GetIconIndex(iconType::file, pThis->m_fileData[index].name, false); return icon; } +void CSearchDialogFileList::clear() +{ + ClearSelection(); + m_indexMapping.clear(); + m_fileData.clear(); + localFileData_.clear(); + remoteFileData_.clear(); + SetItemCount(0); + RefreshListOnly(true); + GetFilelistStatusBar()->Clear(); +} + +void CSearchDialogFileList::set_mode(CSearchDialog::search_mode mode) +{ + mode_ = mode; +} + // Search dialog // ------------- @@ -225,13 +406,20 @@ EVT_BUTTON(XRCID("ID_STOP"), CSearchDialog::OnStop) EVT_CONTEXT_MENU(CSearchDialog::OnContextMenu) EVT_MENU(XRCID("ID_MENU_SEARCH_DOWNLOAD"), CSearchDialog::OnDownload) +EVT_MENU(XRCID("ID_MENU_SEARCH_UPLOAD"), CSearchDialog::OnUpload) EVT_MENU(XRCID("ID_MENU_SEARCH_EDIT"), CSearchDialog::OnEdit) EVT_MENU(XRCID("ID_MENU_SEARCH_DELETE"), CSearchDialog::OnDelete) +EVT_MENU(XRCID("ID_MENU_SEARCH_GETURL"), CSearchDialog::OnGetUrl) +EVT_MENU(XRCID("ID_MENU_SEARCH_GETURL_PASSWORD"), CSearchDialog::OnGetUrl) +EVT_MENU(XRCID("ID_MENU_SEARCH_OPEN"), CSearchDialog::OnOpen) +EVT_MENU(XRCID("ID_MENU_SEARCH_FILEMANAGER"), CSearchDialog::OnOpen) EVT_CHAR_HOOK(CSearchDialog::OnCharHook) +EVT_RADIOBUTTON(XRCID("ID_LOCAL_SEARCH"), CSearchDialog::OnChangeSearchMode) +EVT_RADIOBUTTON(XRCID("ID_REMOTE_SEARCH"), CSearchDialog::OnChangeSearchMode) END_EVENT_TABLE() -CSearchDialog::CSearchDialog(wxWindow* parent, CState* pState, CQueueView* pQueue) - : CStateEventHandler(pState) +CSearchDialog::CSearchDialog(wxWindow* parent, CState& state, CQueueView* pQueue) + : CStateEventHandler(state) , m_parent(parent) , m_pQueue(pQueue) { @@ -247,28 +435,26 @@ bool CSearchDialog::Load() { - if (!wxDialogEx::Load(m_parent, _T("ID_SEARCH"))) + if (!wxDialogEx::Load(m_parent, _T("ID_SEARCH"))) { return false; + } - /* XRCed complains if adding a status bar to a dialog, so do it here instead */ + // XRCed complains if adding a status bar to a dialog, so do it here instead CFilelistStatusBar* pStatusBar = new CFilelistStatusBar(this); pStatusBar->SetEmptyString(_("No search results")); pStatusBar->SetConnected(true); GetSizer()->Add(pStatusBar, 0, wxGROW); - if (!CreateListControl(filter_name | filter_size | filter_path | filter_date)) + if (!CreateListControl(filter_name | filter_size | filter_path | filter_date)) { return false; + } - m_results = new CSearchDialogFileList(this, m_pState, 0); + m_results = new CSearchDialogFileList(this, 0); ReplaceControl(XRCCTRL(*this, "ID_RESULTS", wxWindow), m_results); m_results->SetFilelistStatusBar(pStatusBar); - const CServerPath path = m_pState->GetRemotePath(); - if (!path.empty()) - xrc_call(*this, "ID_PATH", &wxTextCtrl::ChangeValue, path.GetPath()); - SetCtrlState(); m_pWindowStateManager = new CWindowStateManager(this); @@ -283,162 +469,345 @@ xrc_call(*this, "ID_FIND_FILES", &wxCheckBox::SetValue, m_search_filter.filterFiles); xrc_call(*this, "ID_FIND_DIRS", &wxCheckBox::SetValue, m_search_filter.filterDirs); + if (m_state.IsRemoteConnected()) { + CServerPath const path = m_state.GetRemotePath(); + if (!path.empty()) + xrc_call(*this, "ID_PATH", &wxTextCtrl::ChangeValue, path.GetPath()); + } + else { + CLocalPath const path = m_state.GetLocalDir(); + xrc_call(*this, "ID_PATH", &wxTextCtrl::ChangeValue, path.GetPath()); + xrc_call(*this, "ID_REMOTE_SEARCH", &wxRadioButton::Disable); + xrc_call(*this, "ID_LOCAL_SEARCH", &wxRadioButton::SetValue, true); + } + return true; } void CSearchDialog::Run() { - m_original_dir = m_pState->GetRemotePath(); - m_local_target = m_pState->GetLocalDir(); + m_original_dir = m_state.GetRemotePath(); - m_pState->RegisterHandler(this, STATECHANGE_REMOTE_DIR_OTHER, m_pState->GetRecursiveOperationHandler()); - m_pState->RegisterHandler(this, STATECHANGE_REMOTE_IDLE, m_pState->GetRecursiveOperationHandler()); + m_state.RegisterHandler(this, STATECHANGE_REMOTE_DIR_OTHER, m_state.GetRemoteRecursiveOperation()); + m_state.RegisterHandler(this, STATECHANGE_REMOTE_IDLE, m_state.GetRemoteRecursiveOperation()); + m_state.RegisterHandler(this, STATECHANGE_LOCAL_RECURSION_LISTING); + m_state.RegisterHandler(this, STATECHANGE_LOCAL_RECURSION_STATUS); ShowModal(); SaveConditions(); - m_pState->UnregisterHandler(this, STATECHANGE_REMOTE_IDLE); - m_pState->UnregisterHandler(this, STATECHANGE_REMOTE_DIR_OTHER); - - if (m_searching) { - if (!m_pState->IsRemoteIdle()) { - m_pState->m_pCommandQueue->Cancel(); - m_pState->GetRecursiveOperationHandler()->StopRecursiveOperation(); + m_state.UnregisterHandler(this, STATECHANGE_LOCAL_RECURSION_STATUS); + m_state.UnregisterHandler(this, STATECHANGE_LOCAL_RECURSION_LISTING); + m_state.UnregisterHandler(this, STATECHANGE_REMOTE_IDLE); + m_state.UnregisterHandler(this, STATECHANGE_REMOTE_DIR_OTHER); + + if (m_searching == search_mode::remote) { + if (!m_state.IsRemoteIdle()) { + m_state.m_pCommandQueue->Cancel(); + m_state.GetRemoteRecursiveOperation()->StopRecursiveOperation(); + } + if (!m_original_dir.empty()) { + m_state.ChangeRemoteDir(m_original_dir); } - if (!m_original_dir.empty()) - m_pState->ChangeRemoteDir(m_original_dir); } else { - if (m_pState->IsRemoteIdle() && !m_original_dir.empty()) - m_pState->ChangeRemoteDir(m_original_dir); + if (m_state.IsRemoteIdle() && !m_original_dir.empty()) { + m_state.ChangeRemoteDir(m_original_dir); + } } } -void CSearchDialog::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void* data2) +void CSearchDialog::OnStateChange(t_statechange_notifications notification, const wxString&, const void* data2) { if (notification == STATECHANGE_REMOTE_DIR_OTHER && data2) { - auto recursiveOperation = m_pState->GetRecursiveOperationHandler(); - if (recursiveOperation && recursiveOperation->GetOperationMode() == CRecursiveOperation::recursive_list) { - std::shared_ptr const& listing = *reinterpret_cast const*>(data2); - ProcessDirectoryListing(listing); + if (m_searching == search_mode::remote) { + auto recursiveOperation = m_state.GetRemoteRecursiveOperation(); + if (recursiveOperation && recursiveOperation->GetOperationMode() == CRecursiveOperation::recursive_list) { + std::shared_ptr const& listing = *reinterpret_cast const*>(data2); + ProcessDirectoryListing(listing); + } } } else if (notification == STATECHANGE_REMOTE_IDLE) { - if (pState->IsRemoteIdle()) - m_searching = false; - SetCtrlState(); + if (m_searching == search_mode::remote) { + if (m_state.IsRemoteIdle()) { + m_searching = search_mode::none; + } + } + if (m_searching != search_mode::local) { + SetCtrlState(); + } + } + else if (notification == STATECHANGE_LOCAL_RECURSION_LISTING) { + if (m_searching == search_mode::local && data2) { + auto listing = reinterpret_cast(data2); + ProcessDirectoryListing(*listing); + } + } + else if (notification == STATECHANGE_LOCAL_RECURSION_STATUS) { + if (m_searching == search_mode::local && m_state.IsLocalIdle()) { + m_searching = search_mode::none; + SetCtrlState(); + } } } void CSearchDialog::ProcessDirectoryListing(std::shared_ptr const& listing) { - if (!listing || listing->failed()) + if (!listing || listing->failed()) { return; + } // Do not process same directory multiple times - if (!m_visited.insert(listing->path).second) + if (!m_visited.insert(listing->path).second) { return; + } int old_count = m_results->m_fileData.size(); - int added = 0; + int added_count = 0; + + wxString const path = listing->path.GetPath(); - m_results->m_fileData.reserve(m_results->m_fileData.size() + listing->GetCount()); - m_results->m_indexMapping.reserve(m_results->m_indexMapping.size() + listing->GetCount()); + bool const has_selections = m_results->GetSelectedItemCount() != 0; + std::vector added_indexes; + if (has_selections) { + added_indexes.reserve(listing->GetCount()); + } + + std::unique_ptr compare = m_results->GetSortComparisonObject(); for (unsigned int i = 0; i < listing->GetCount(); ++i) { const CDirentry& entry = (*listing)[i]; - if (!CFilterManager::FilenameFilteredByFilter(m_search_filter, entry.name, listing->path.GetPath(), entry.is_dir(), entry.size, 0, entry.time)) + if (!CFilterManager::FilenameFilteredByFilter(m_search_filter, entry.name, path, entry.is_dir(), entry.size, 0, entry.time)) { continue; + } - CSearchFileData data; - static_cast(data) = entry; - data.path = listing->path; + CRemoteSearchFileData remoteData; + static_cast(remoteData) = entry; + remoteData.path = listing->path; + m_results->remoteFileData_.push_back(remoteData); + + CGenericFileData data; data.icon = entry.is_dir() ? m_results->m_dirIcon : -2; m_results->m_fileData.push_back(data); - m_results->m_indexMapping.push_back(old_count + added++); - if (entry.is_dir()) + auto insertPos = std::lower_bound(m_results->m_indexMapping.begin(), m_results->m_indexMapping.end(), old_count + added_count, SortPredicate(compare)); + int const added_index = insertPos - m_results->m_indexMapping.begin(); + m_results->m_indexMapping.insert(insertPos, old_count + added_count++); + + // Remember inserted index + if (has_selections) { + auto const added_indexes_insert_pos = std::lower_bound(added_indexes.begin(), added_indexes.end(), added_index); + for (auto index = added_indexes_insert_pos; index != added_indexes.end(); ++index) { + ++(*index); + } + added_indexes.insert(added_indexes_insert_pos, added_index); + } + + if (entry.is_dir()) { m_results->GetFilelistStatusBar()->AddDirectory(); - else + } + else { m_results->GetFilelistStatusBar()->AddFile(entry.size); + } } - if (added) { - m_results->SetItemCount(old_count + added); - m_results->SortList(-1, -1, true); + if (added_count) { + m_results->SetItemCount(old_count + added_count); + m_results->UpdateSelections_ItemsAdded(added_indexes); m_results->RefreshListOnly(false); } } -void CSearchDialog::OnSearch(wxCommandEvent&) +void CSearchDialog::ProcessDirectoryListing(CLocalRecursiveOperation::listing const& listing) { - if (!m_pState->IsRemoteIdle()) { - wxBell(); - return; + int old_count = m_results->m_fileData.size(); + int added_count = 0; + + wxString const path = listing.localPath.GetPath(); + + bool const has_selections = m_results->GetSelectedItemCount() != 0; + + std::vector added_indexes; + if (has_selections) { + added_indexes.reserve(listing.files.size() + listing.dirs.size()); } - CServerPath path; + std::unique_ptr compare = m_results->GetSortComparisonObject(); - const CServer* pServer = m_pState->GetServer(); - if (!pServer) { - wxMessageBoxEx(_("Connection to server lost."), _("Remote file search"), wxICON_EXCLAMATION); - return; + auto const& add_entry = [&](CLocalRecursiveOperation::listing::entry const& entry, bool dir) { + if (!CFilterManager::FilenameFilteredByFilter(m_search_filter, entry.name, path, dir, entry.size, entry.attributes, entry.time)) { + return; + } + + CLocalSearchFileData localData; + static_cast(localData) = entry; + localData.path = listing.localPath; + localData.dir = dir; + m_results->localFileData_.push_back(localData); + + CGenericFileData data; + data.icon = dir ? m_results->m_dirIcon : -2; + m_results->m_fileData.push_back(data); + + auto insertPos = std::lower_bound(m_results->m_indexMapping.begin(), m_results->m_indexMapping.end(), old_count + added_count, SortPredicate(compare)); + int const added_index = insertPos - m_results->m_indexMapping.begin(); + m_results->m_indexMapping.insert(insertPos, old_count + added_count++); + + // Remember inserted index + if (has_selections) { + auto const added_indexes_insert_pos = std::lower_bound(added_indexes.begin(), added_indexes.end(), added_index); + for (auto index = added_indexes_insert_pos; index != added_indexes.end(); ++index) { + ++(*index); + } + added_indexes.insert(added_indexes_insert_pos, added_index); + } + + if (dir) { + m_results->GetFilelistStatusBar()->AddDirectory(); + } + else { + m_results->GetFilelistStatusBar()->AddFile(entry.size); + } + }; + + for (auto const& file : listing.files) { + add_entry(file, false); } - path.SetType(pServer->GetType()); - if (!path.SetPath(XRCCTRL(*this, "ID_PATH", wxTextCtrl)->GetValue()) || path.empty()) { - wxMessageBoxEx(_("Need to enter valid remote path"), _("Remote file search"), wxICON_EXCLAMATION); - return; + for (auto const& dir : listing.dirs) { + add_entry(dir, true); + } + + if (added_count) { + m_results->SetItemCount(old_count + added_count); + m_results->UpdateSelections_ItemsAdded(added_indexes); + m_results->RefreshListOnly(false); + } +} + +void CSearchDialog::OnSearch(wxCommandEvent&) +{ + bool const localSearch = xrc_call(*this, "ID_LOCAL_SEARCH", &wxRadioButton::GetValue); + + if (localSearch) { + if (!m_state.IsLocalIdle()) { + wxBell(); + return; + } + + CLocalPath path; + if (!path.SetPath(xrc_call(*this, "ID_PATH", &wxTextCtrl::GetValue).ToStdWstring()) || path.empty()) { + wxMessageBoxEx(_("Need to enter valid local path"), _("Local file search"), wxICON_EXCLAMATION); + return; + } + + std::wstring error; + if (!path.Exists(&error)) { + wxMessageBoxEx(error, _("Local file search"), wxICON_EXCLAMATION); + return; + } + + m_local_search_root = path; } + else { + if (!m_state.IsRemoteIdle()) { + wxBell(); + return; + } - m_search_root = path; + CServerPath path; + + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { + wxMessageBoxEx(_("Connection to server lost."), _("Remote file search"), wxICON_EXCLAMATION); + return; + } + path.SetType(server.server.GetType()); + if (!path.SetPath(xrc_call(*this, "ID_PATH", &wxTextCtrl::GetValue).ToStdWstring()) || path.empty()) { + wxMessageBoxEx(_("Need to enter valid remote path"), _("Remote file search"), wxICON_EXCLAMATION); + return; + } + + m_remote_search_root = path; + } // Prepare filter wxString error; if (!ValidateFilter(error, true)) { - wxMessageBoxEx(wxString::Format(_("Invalid search conditions: %s"), error), _("Remote file search"), wxICON_EXCLAMATION); + wxMessageBoxEx(wxString::Format(_("Invalid search conditions: %s"), error), _("File search"), wxICON_EXCLAMATION); return; } m_search_filter = GetFilter(); if (!CFilterManager::CompileRegexes(m_search_filter)) { - wxMessageBoxEx(_("Invalid regular expression in search conditions."), _("Remote file search"), wxICON_EXCLAMATION); + wxMessageBoxEx(_("Invalid regular expression in search conditions."), _("File search"), wxICON_EXCLAMATION); return; } m_search_filter.matchCase = xrc_call(*this, "ID_CASE", &wxCheckBox::GetValue); m_search_filter.filterFiles = xrc_call(*this, "ID_FIND_FILES", &wxCheckBox::GetValue); m_search_filter.filterDirs = xrc_call(*this, "ID_FIND_DIRS", &wxCheckBox::GetValue); + m_searching = localSearch ? search_mode::local : search_mode::remote; + // Delete old results - m_results->ClearSelection(); - m_results->m_indexMapping.clear(); - m_results->m_fileData.clear(); - m_results->SetItemCount(0); + m_results->clear(); + m_results->set_mode(m_searching); m_visited.clear(); - m_results->RefreshListOnly(true); - - m_results->GetFilelistStatusBar()->Clear(); // Start - m_searching = true; - recursion_root root(path, true); - root.add_dir_to_visit_restricted(path, _T(""), true); - m_pState->GetRecursiveOperationHandler()->AddRecursionRoot(std::move(root)); - std::vector const filters; // Empty, recurse into everything - m_pState->GetRecursiveOperationHandler()->StartRecursiveOperation(CRecursiveOperation::recursive_list, filters, path); + + if (localSearch) { + local_recursion_root root; + root.add_dir_to_visit(m_local_search_root); + m_state.GetLocalRecursiveOperation()->AddRecursionRoot(std::move(root)); + ActiveFilters const filters; // Empty, recurse into everything + m_state.GetLocalRecursiveOperation()->StartRecursiveOperation(CRecursiveOperation::recursive_list, filters); + } + else { + recursion_root root(m_remote_search_root, true); + root.add_dir_to_visit_restricted(m_remote_search_root, std::wstring(), true); + m_state.GetRemoteRecursiveOperation()->AddRecursionRoot(std::move(root)); + ActiveFilters const filters; // Empty, recurse into everything + m_state.GetRemoteRecursiveOperation()->StartRecursiveOperation(CRecursiveOperation::recursive_list, filters, m_remote_search_root); + } + + SetCtrlState(); } void CSearchDialog::OnStop(wxCommandEvent&) { - if (!m_pState->IsRemoteIdle()) { - m_pState->m_pCommandQueue->Cancel(); - m_pState->GetRecursiveOperationHandler()->StopRecursiveOperation(); + if (m_searching == search_mode::remote) { + if (!m_state.IsRemoteIdle()) { + m_state.m_pCommandQueue->Cancel(); + m_state.GetRemoteRecursiveOperation()->StopRecursiveOperation(); + } + } + else if (m_searching == search_mode::local) { + if (!m_state.IsLocalIdle()) { + m_state.GetLocalRecursiveOperation()->StopRecursiveOperation(); + } } } void CSearchDialog::SetCtrlState() { - bool idle = m_pState->IsRemoteIdle(); + bool const localSearch = xrc_call(*this, "ID_LOCAL_SEARCH", &wxRadioButton::GetValue); + + bool idle = m_searching == search_mode::none; + if (idle) { + if (!localSearch) { + if (!m_state.IsRemoteIdle()) { + idle = false; + } + } + else { + if (!m_state.IsLocalIdle()) { + idle = false; + } + } + } + XRCCTRL(*this, "ID_START", wxButton)->Enable(idle); XRCCTRL(*this, "ID_STOP", wxButton)->Enable(!idle); } @@ -451,34 +820,57 @@ } wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_SEARCH")); - if (!pMenu) + if (!pMenu) { return; + } - if (!m_pState->IsRemoteIdle()) { + if (!m_state.IsRemoteIdle() || !m_state.IsRemoteConnected()) { + pMenu->Enable(XRCID("ID_MENU_SEARCH_UPLOAD"), false); pMenu->Enable(XRCID("ID_MENU_SEARCH_DOWNLOAD"), false); - pMenu->Enable(XRCID("ID_MENU_SEARCH_DELETE"), false); + if (m_results->mode_ == search_mode::remote) { + pMenu->Enable(XRCID("ID_MENU_SEARCH_DELETE"), false); + } pMenu->Enable(XRCID("ID_MENU_SEARCH_EDIT"), false); } + bool const localSearch = m_results->mode_ == search_mode::local; + if (localSearch) { + pMenu->Delete(XRCID("ID_MENU_SEARCH_DOWNLOAD")); + pMenu->Delete(XRCID("ID_MENU_SEARCH_EDIT")); + pMenu->Delete(XRCID("ID_MENU_SEARCH_GETURL")); + pMenu->Delete(XRCID("ID_MENU_SEARCH_GETURL_PASSWORD")); + } + else { + pMenu->Delete(XRCID("ID_MENU_SEARCH_UPLOAD")); + pMenu->Delete(XRCID("ID_MENU_SEARCH_OPEN")); + pMenu->Delete(XRCID("ID_MENU_SEARCH_FILEMANAGER")); + pMenu->Delete(XRCID(wxGetKeyState(WXK_SHIFT) ? "ID_MENU_SEARCH_GETURL" : "ID_MENU_SEARCH_GETURL_PASSWORD")); + } + PopupMenu(pMenu); delete pMenu; } -class CSearchDownloadDialog : public wxDialogEx +class CSearchTransferDialog final : public wxDialogEx { public: - bool Run(wxWindow* parent, const wxString& m_local_dir, int count_files, int count_dirs) + bool Run(wxWindow* parent, bool download, const wxString& path, int count_files, int count_dirs) { - if (!Load(parent, _T("ID_SEARCH_DOWNLOAD"))) + download_ = download; + + if (!Load(parent, download ? _T("ID_SEARCH_DOWNLOAD") : _T("ID_SEARCH_UPLOAD"))) { return false; + } wxString desc; - if (!count_dirs) + if (!count_dirs) { desc.Printf(wxPLURAL("Selected %d file for transfer.", "Selected %d files for transfer.", count_files), count_files); - else if (!count_files) + } + else if (!count_files) { desc.Printf(wxPLURAL("Selected %d directory with its contents for transfer.", "Selected %d directories with their contents for transfer.", count_dirs), count_dirs); + } else { wxString files = wxString::Format(wxPLURAL("%d file", "%d files", count_files), count_files); wxString dirs = wxString::Format(wxPLURAL("%d directory with its contents", "%d directories with their contents", count_dirs), count_dirs); @@ -486,81 +878,116 @@ } XRCCTRL(*this, "ID_DESC", wxStaticText)->SetLabel(desc); - XRCCTRL(*this, "ID_LOCALPATH", wxTextCtrl)->ChangeValue(m_local_dir); + if (download) { + XRCCTRL(*this, "ID_LOCALPATH", wxTextCtrl)->ChangeValue(path); + } + else { + XRCCTRL(*this, "ID_REMOTEPATH", wxTextCtrl)->ChangeValue(path); + } - if (ShowModal() != wxID_OK) + if (ShowModal() != wxID_OK) { return false; + } return true; } protected: + bool download_{}; DECLARE_EVENT_TABLE() void OnBrowse(wxCommandEvent& event); void OnOK(wxCommandEvent& event); }; -BEGIN_EVENT_TABLE(CSearchDownloadDialog, wxDialogEx) -EVT_BUTTON(XRCID("ID_BROWSE"), CSearchDownloadDialog::OnBrowse) -EVT_BUTTON(XRCID("wxID_OK"), CSearchDownloadDialog::OnOK) +BEGIN_EVENT_TABLE(CSearchTransferDialog, wxDialogEx) +EVT_BUTTON(XRCID("ID_BROWSE"), CSearchTransferDialog::OnBrowse) +EVT_BUTTON(XRCID("wxID_OK"), CSearchTransferDialog::OnOK) END_EVENT_TABLE() -void CSearchDownloadDialog::OnBrowse(wxCommandEvent&) +void CSearchTransferDialog::OnBrowse(wxCommandEvent&) { wxTextCtrl *pText = XRCCTRL(*this, "ID_LOCALPATH", wxTextCtrl); + if (!pText) { + return; + } wxDirDialog dlg(this, _("Select target download directory"), pText->GetValue(), wxDD_NEW_DIR_BUTTON); if (dlg.ShowModal() == wxID_OK) pText->ChangeValue(dlg.GetPath()); } -void CSearchDownloadDialog::OnOK(wxCommandEvent&) +void CSearchTransferDialog::OnOK(wxCommandEvent&) { - wxTextCtrl *pText = XRCCTRL(*this, "ID_LOCALPATH", wxTextCtrl); + if (download_) { + wxTextCtrl *pText = XRCCTRL(*this, "ID_LOCALPATH", wxTextCtrl); - CLocalPath path(pText->GetValue()); - if (path.empty()) { - wxMessageBoxEx(_("You have to enter a local directory."), _("Download search results"), wxICON_EXCLAMATION); - return; + CLocalPath path(pText->GetValue().ToStdWstring()); + if (path.empty()) { + wxMessageBoxEx(_("You have to enter a local directory."), _("Download search results"), wxICON_EXCLAMATION); + return; + } + + if (!path.IsWriteable()) { + wxMessageBoxEx(_("You have to enter a writable local directory."), _("Download search results"), wxICON_EXCLAMATION); + return; + } } + else { + wxTextCtrl *pText = XRCCTRL(*this, "ID_REMOTEPATH", wxTextCtrl); - if (!path.IsWriteable()) { - wxMessageBoxEx(_("You have to enter a writable local directory."), _("Download search results"), wxICON_EXCLAMATION); - return; + CServerPath path(pText->GetValue().ToStdWstring()); + if (path.empty()) { + wxMessageBoxEx(_("You have to enter a remote directory."), _("Upload search results"), wxICON_EXCLAMATION); + return; + } } EndDialog(wxID_OK); } -void CSearchDialog::ProcessSelection(std::list &selected_files, std::deque &selected_dirs) +namespace { + +bool isSubdir(CServerPath const& a, CServerPath const&b) { + return a.IsSubdirOf(b, false); +} + +bool isSubdir(CLocalPath const& a, CLocalPath const&b) { + return a.IsSubdirOf(b); +} + +template +void ProcessSelection(std::list &selected_files, std::deque &selected_dirs, std::vector const& fileData, CSearchDialogFileList const* results) { - std::deque dirs; + std::deque dirs; int sel = -1; - while ((sel = m_results->GetNextItem(sel, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { - if (sel > (int)m_results->m_indexMapping.size()) + while ((sel = results->GetNextItem(sel, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { + if (static_cast(sel) >= results->indexMapping().size()) { continue; - int index = m_results->m_indexMapping[sel]; + } + int index = results->indexMapping()[sel]; - if (m_results->m_fileData[index].is_dir()) { - CServerPath path = m_results->m_fileData[index].path; - path.ChangePath(m_results->m_fileData[index].name); - if (path.empty()) + if (fileData[index].is_dir()) { + Path path = fileData[index].path; + path.ChangePath(fileData[index].name); + if (path.empty()) { continue; + } dirs.push_back(path); } - else + else { selected_files.push_back(index); + } } // Make sure that selected_dirs does not contain // any directories that are in a parent-child relationship // Resolve by only keeping topmost parents std::sort(dirs.begin(), dirs.end()); - for (CServerPath const& path : dirs) { - if (!selected_dirs.empty() && (path.IsSubdirOf(selected_dirs.back(), false) || path == selected_dirs.back())) { + for (Path const& path : dirs) { + if (!selected_dirs.empty() && (isSubdir(path, selected_dirs.back()) || path == selected_dirs.back())) { continue; } selected_dirs.push_back(path); @@ -569,14 +996,16 @@ // Now in a second phase filter out all files that are also in a directory std::list selected_files_new; for (auto const& sel_file : selected_files) { - CServerPath const& path = m_results->m_fileData[sel_file].path; - std::deque::iterator path_iter; + Path const& path = fileData[sel_file].path; + typename std::deque::iterator path_iter; for (path_iter = selected_dirs.begin(); path_iter != selected_dirs.end(); ++path_iter) { - if (*path_iter == path || path_iter->IsParentOf(path, false)) + if (*path_iter == path || isSubdir(path, *path_iter)) { break; + } } - if (path_iter == selected_dirs.end()) + if (path_iter == selected_dirs.end()) { selected_files_new.push_back(sel_file); + } } selected_files.swap(selected_files_new); @@ -584,35 +1013,38 @@ // paths and selected_files contains only files not // covered by any of those directories. } +} void CSearchDialog::OnDownload(wxCommandEvent&) { - if (!m_pState->IsRemoteIdle()) + if (!m_state.IsRemoteIdle()) { return; + } // Find all selected files and directories std::deque selected_dirs; std::list selected_files; - ProcessSelection(selected_files, selected_dirs); + ProcessSelection(selected_files, selected_dirs, m_results->remoteFileData_, m_results); - if (selected_files.empty() && selected_dirs.empty()) + if (selected_files.empty() && selected_dirs.empty()) { return; + } - CSearchDownloadDialog dlg; - if (!dlg.Run(this, m_local_target.GetPath(), selected_files.size(), selected_dirs.size())) + CSearchTransferDialog dlg; + if (!dlg.Run(this, true, m_state.GetLocalDir().GetPath(), selected_files.size(), selected_dirs.size())) { return; + } wxTextCtrl *pText = XRCCTRL(dlg, "ID_LOCALPATH", wxTextCtrl); - CLocalPath path(pText->GetValue()); + CLocalPath path(pText->GetValue().ToStdWstring()); if (path.empty() || !path.IsWriteable()) { wxBell(); return; } - m_local_target = path; - CServer const* pServer = m_pState->GetServer(); - if (!pServer) { + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { wxBell(); return; } @@ -621,14 +1053,14 @@ bool flatten = XRCCTRL(dlg, "ID_PATHS_FLATTEN", wxRadioButton)->GetValue(); for (auto const& sel : selected_files) { - const CDirentry& entry = m_results->m_fileData[sel]; + CRemoteSearchFileData const& entry = m_results->remoteFileData_[sel]; CLocalPath target_path = path; if (!flatten) { // Append relative path to search root to local target path - CServerPath remote_path = m_results->m_fileData[sel].path; - std::list segments; - while (m_search_root.IsParentOf(remote_path, false) && remote_path.HasParent()) { + CServerPath remote_path = entry.path; + std::list segments; + while (m_remote_search_root.IsParentOf(remote_path, false) && remote_path.HasParent()) { segments.push_front(remote_path.GetLastSegment()); remote_path = remote_path.GetParent(); } @@ -637,48 +1069,130 @@ } } - CServerPath remote_path = m_results->m_fileData[sel].path; - wxString localName = CQueueView::ReplaceInvalidCharacters(entry.name); + CServerPath remote_path = entry.path; + std::wstring localName = CQueueView::ReplaceInvalidCharacters(entry.name); if (!entry.is_dir() && remote_path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) localName = StripVMSRevision(localName); m_pQueue->QueueFile(!start, true, - entry.name, (localName != entry.name) ? localName : wxString(), - target_path, remote_path, *pServer, entry.size); + entry.name, (localName != entry.name) ? localName : std::wstring(), + target_path, remote_path, server, entry.size); } m_pQueue->QueueFile_Finish(start); - enum CRecursiveOperation::OperationMode mode; - if (flatten) - mode = start ? CRecursiveOperation::recursive_download_flatten : CRecursiveOperation::recursive_addtoqueue_flatten; - else - mode = start ? CRecursiveOperation::recursive_download : CRecursiveOperation::recursive_addtoqueue; + auto const mode = flatten ? CRecursiveOperation::recursive_transfer_flatten : CRecursiveOperation::recursive_transfer; for (auto const& dir : selected_dirs) { CLocalPath target_path = path; - if (!flatten && dir.HasParent()) + if (!flatten && dir.HasParent()) { target_path.AddSegment(dir.GetLastSegment()); + } recursion_root root(dir, true); - root.add_dir_to_visit(dir, _T(""), target_path, false); - m_pState->GetRecursiveOperationHandler()->AddRecursionRoot(std::move(root)); + root.add_dir_to_visit(dir, std::wstring(), target_path, false); + m_state.GetRemoteRecursiveOperation()->AddRecursionRoot(std::move(root)); + } + ActiveFilters const filters; // Empty, recurse into everything + m_state.GetRemoteRecursiveOperation()->StartRecursiveOperation(mode, filters, m_original_dir, start); +} + +void CSearchDialog::OnUpload(wxCommandEvent&) +{ + if (!m_state.IsLocalIdle()) { + return; + } + + // Find all selected files and directories + std::deque selected_dirs; + std::list selected_files; + ProcessSelection(selected_files, selected_dirs, m_results->localFileData_, m_results); + + if (selected_files.empty() && selected_dirs.empty()) { + return; + } + + CSearchTransferDialog dlg; + if (!dlg.Run(this, false, m_state.GetRemotePath().GetPath(), selected_files.size(), selected_dirs.size())) { + return; + } + + wxTextCtrl *pText = XRCCTRL(dlg, "ID_REMOTEPATH", wxTextCtrl); + + CServerPath path(pText->GetValue().ToStdWstring()); + if (path.empty()) { + wxBell(); + return; + } + + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { + wxBell(); + return; + } + + bool start = XRCCTRL(dlg, "ID_QUEUE_START", wxRadioButton)->GetValue(); + bool flatten = XRCCTRL(dlg, "ID_PATHS_FLATTEN", wxRadioButton)->GetValue(); + + for (auto const& sel : selected_files) { + CLocalSearchFileData const& entry = m_results->localFileData_[sel]; + + CServerPath target_path = path; + if (!flatten) { + // Append relative path to search root to local target path + CLocalPath local_path = entry.path; + std::list segments; + while (m_local_search_root.IsParentOf(local_path) && local_path.HasParent()) { + segments.push_front(local_path.GetLastSegment()); + local_path = local_path.GetParent(); + } + for (auto const& segment : segments) { + target_path.AddSegment(segment); + } + } + + CLocalPath local_path = entry.path; + std::wstring localName = CQueueView::ReplaceInvalidCharacters(entry.name); + + m_pQueue->QueueFile(!start, false, + entry.name, (localName != entry.name) ? localName : std::wstring(), + local_path, target_path, server, entry.size); } - std::vector const filters; // Empty, recurse into everything - m_pState->GetRecursiveOperationHandler()->StartRecursiveOperation(mode, filters, m_original_dir); + m_pQueue->QueueFile_Finish(start); + + auto const mode = flatten ? CRecursiveOperation::recursive_transfer_flatten : CRecursiveOperation::recursive_transfer; + + for (auto const& dir : selected_dirs) { + CServerPath target_path = path; + if (!flatten && dir.HasParent()) { + target_path.AddSegment(dir.GetLastSegment()); + } + + local_recursion_root root; + root.add_dir_to_visit(dir, target_path); + m_state.GetLocalRecursiveOperation()->AddRecursionRoot(std::move(root)); + } + ActiveFilters const filters; // Empty, recurse into everything + m_state.GetLocalRecursiveOperation()->StartRecursiveOperation(mode, filters, start); } void CSearchDialog::OnEdit(wxCommandEvent&) { - if (!m_pState->IsRemoteIdle()) + if (!m_state.IsRemoteIdle()) { return; + } + + if (m_results->mode_ != search_mode::remote) { + return; + } // Find all selected files and directories std::deque selected_dirs; std::list selected_files; - ProcessSelection(selected_files, selected_dirs); + ProcessSelection(selected_files, selected_dirs, m_results->remoteFileData_, m_results); - if (selected_files.empty() && selected_dirs.empty()) + if (selected_files.empty() && selected_dirs.empty()) { return; + } if (!selected_dirs.empty()) { wxMessageBoxEx(_("Editing directories is not supported"), _("Editing search results"), wxICON_EXCLAMATION); @@ -697,8 +1211,8 @@ return; } - const CServer* pServer = m_pState->GetServer(); - if (!pServer) { + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { wxBell(); return; } @@ -708,64 +1222,93 @@ dlg.SetTitle(_("Confirmation needed")); dlg.AddText(_("You have selected more than 10 files for editing, do you really want to continue?")); - if (!dlg.Run()) + if (!dlg.Run()) { return; + } } for (auto const& item : selected_files) { - const CDirentry& entry = m_results->m_fileData[item]; - const CServerPath path = m_results->m_fileData[item].path; + const CDirentry& entry = m_results->remoteFileData_[item]; + const CServerPath path = m_results->remoteFileData_[item].path; - pEditHandler->Edit(CEditHandler::remote, entry.name, path, *pServer, entry.size, this); + pEditHandler->Edit(CEditHandler::remote, entry.name, path, server, entry.size, this); } } void CSearchDialog::OnDelete(wxCommandEvent&) { - if (!m_pState->IsRemoteIdle()) - return; + if (m_results->mode_ == search_mode::remote) { + if (!m_state.IsRemoteIdle()) { + return; + } - // Find all selected files and directories - std::deque selected_dirs; - std::list selected_files; - ProcessSelection(selected_files, selected_dirs); + // Find all selected files and directories + std::deque selected_dirs; + std::list selected_files; + ProcessSelection(selected_files, selected_dirs, m_results->remoteFileData_, m_results); - if (selected_files.empty() && selected_dirs.empty()) - return; + if (selected_files.empty() && selected_dirs.empty()) { + return; + } - wxString question; - if (selected_dirs.empty()) - question.Printf(wxPLURAL("Really delete %d file from the server?", "Really delete %d files from the server?", selected_files.size()), selected_files.size()); - else if (selected_files.empty()) - question.Printf(wxPLURAL("Really delete %d directory with its contents from the server?", "Really delete %d directories with their contents from the server?", selected_dirs.size()), selected_dirs.size()); - else { - wxString files = wxString::Format(wxPLURAL("%d file", "%d files", selected_files.size()), selected_files.size()); - wxString dirs = wxString::Format(wxPLURAL("%d directory with its contents", "%d directories with their contents", selected_dirs.size()), selected_dirs.size()); - question.Printf(_("Really delete %s and %s from the server?"), files, dirs); - } + wxString question; + if (selected_dirs.empty()) { + question.Printf(wxPLURAL("Really delete %d file from the server?", "Really delete %d files from the server?", selected_files.size()), selected_files.size()); + } + else if (selected_files.empty()) { + question.Printf(wxPLURAL("Really delete %d directory with its contents from the server?", "Really delete %d directories with their contents from the server?", selected_dirs.size()), selected_dirs.size()); + } + else { + wxString files = wxString::Format(wxPLURAL("%d file", "%d files", selected_files.size()), selected_files.size()); + wxString dirs = wxString::Format(wxPLURAL("%d directory with its contents", "%d directories with their contents", selected_dirs.size()), selected_dirs.size()); + question.Printf(_("Really delete %s and %s from the server?"), files, dirs); + } - if (wxMessageBoxEx(question, _("Confirm deletion"), wxICON_QUESTION | wxYES_NO) != wxYES) - return; + if (wxMessageBoxEx(question, _("Confirm deletion"), wxICON_QUESTION | wxYES_NO) != wxYES) { + return; + } + + for (auto const& file : selected_files) { + CRemoteSearchFileData const& entry = m_results->remoteFileData_[file]; + std::deque files_to_delete; + files_to_delete.push_back(entry.name); + m_state.m_pCommandQueue->ProcessCommand(new CDeleteCommand(entry.path, std::move(files_to_delete))); + } - for (auto const& file : selected_files) { - CDirentry const& entry = m_results->m_fileData[file]; - std::deque files_to_delete; - files_to_delete.push_back(entry.name); - m_pState->m_pCommandQueue->ProcessCommand(new CDeleteCommand(m_results->m_fileData[file].path, std::move(files_to_delete))); + for (auto path : selected_dirs) { + std::wstring segment; + if (path.HasParent()) { + segment = path.GetLastSegment(); + path = path.GetParent(); + } + recursion_root root(path, !path.HasParent()); + root.add_dir_to_visit(path, segment); + m_state.GetRemoteRecursiveOperation()->AddRecursionRoot(std::move(root)); + } + ActiveFilters const filters; // Empty, recurse into everything + m_state.GetRemoteRecursiveOperation()->StartRecursiveOperation(CRecursiveOperation::recursive_delete, filters, m_original_dir); } + else { + std::deque selected_dirs; + std::list selected_files; + ProcessSelection(selected_files, selected_dirs, m_results->localFileData_, m_results); - for (auto path : selected_dirs) { - wxString segment; - if (path.HasParent()) { - segment = path.GetLastSegment(); - path = path.GetParent(); + if (selected_files.empty() && selected_dirs.empty()) { + return; + } + + std::list pathsToDelete; + for (auto const& file : selected_files) { + CLocalSearchFileData const& entry = m_results->localFileData_[file]; + pathsToDelete.push_back(fz::to_native(entry.path.GetPath() + entry.name)); + } + for (auto path : selected_dirs) { + pathsToDelete.push_back(fz::to_native(path.GetPath())); } - recursion_root root(path, !path.HasParent()); - root.add_dir_to_visit(path, segment); - m_pState->GetRecursiveOperationHandler()->AddRecursionRoot(std::move(root)); + + gui_recursive_remove rmd(this); + rmd.remove(pathsToDelete); } - std::vector const filters; // Empty, recurse into everything - m_pState->GetRecursiveOperationHandler()->StartRecursiveOperation(CRecursiveOperation::recursive_delete, filters, m_original_dir); } void CSearchDialog::OnCharHook(wxKeyEvent& event) @@ -781,12 +1324,17 @@ #ifdef __WXMSW__ int CSearchDialogFileList::GetOverlayIndex(int item) { - if (item < 0 || item >= (int)m_indexMapping.size()) - return -1; + if (mode_ == CSearchDialog::search_mode::local) { + return 0; + } + if (item < 0 || item >= (int)m_indexMapping.size()) { + return 0; + } int index = m_indexMapping[item]; - if (m_fileData[index].is_link()) + if (remoteFileData_[index].is_link()) { return GetLinkOverlayIndex(); + } return 0; } @@ -797,7 +1345,7 @@ CInterProcessMutex mutex(MUTEX_SEARCHCONDITIONS); CXmlFile file(wxGetApp().GetSettingsFile(_T("search"))); - auto document = file.Load(); + auto document = file.Load(true); if (!document) { wxMessageBoxEx(file.GetError(), _("Error loading xml file"), wxICON_ERROR); return; @@ -807,8 +1355,9 @@ if (!filter) return; - if (!CFilterManager::LoadFilter(filter, m_search_filter)) + if (!CFilterManager::LoadFilter(filter, m_search_filter)) { m_search_filter = CFilter(); + } } void CSearchDialog::SaveConditions() @@ -816,18 +1365,174 @@ CInterProcessMutex mutex(MUTEX_SEARCHCONDITIONS); CXmlFile file(wxGetApp().GetSettingsFile(_T("search"))); - auto document = file.Load(); + auto document = file.Load(true); if (!document) { wxMessageBoxEx(file.GetError(), _("Error loading xml file"), wxICON_ERROR); return; } pugi::xml_node filter; - while ((filter = document.child("Filter"))) + while ((filter = document.child("Filter"))) { document.remove_child(filter); + } filter = document.append_child("Filter"); - CFilterDialog::SaveFilter(filter, m_search_filter); + CFilterManager::SaveFilter(filter, m_search_filter); file.Save(true); } + +void CSearchDialog::OnChangeSearchMode(wxCommandEvent&) +{ + wxString const strPath = xrc_call(*this, "ID_PATH", &wxTextCtrl::GetValue); + + CLocalPath const localPath = m_state.GetLocalDir(); + CServerPath const remotePath = m_state.GetRemotePath(); + + bool const local = xrc_call(*this, "ID_LOCAL_SEARCH", &wxRadioButton::GetValue); + if (local) { + if (strPath == remotePath.GetPath() && !localPath.empty()) { + xrc_call(*this, "ID_PATH", &wxTextCtrl::ChangeValue, localPath.GetPath()); + } + } + else { + if (strPath == localPath.GetPath() && !remotePath.empty()) { + xrc_call(*this, "ID_PATH", &wxTextCtrl::ChangeValue, remotePath.GetPath()); + } + } + +} + +void CSearchDialog::OnGetUrl(wxCommandEvent& event) +{ + if (m_results->mode_ != search_mode::remote) { + return; + } + + ServerWithCredentials const& server = m_state.GetServer(); + if (!server) { + wxBell(); + return; + } + + if (!wxTheClipboard->Open()) { + wxMessageBoxEx(_("Could not open clipboard"), _("Could not copy URLs"), wxICON_EXCLAMATION); + return; + } + + wxString const url = server.Format((event.GetId() == XRCID("ID_MENU_SEARCH_GETURL_PASSWORD")) ? ServerFormat::url_with_password : ServerFormat::url); + + auto getUrl = [](wxString const& serverPart, CServerPath const& path, std::wstring const& name) { + wxString url = serverPart; + + auto const pathPart = fz::percent_encode_w(path.FormatFilename(name, false), true); + if (!pathPart.empty() && pathPart[0] != '/') { + url += '/'; + } + url += pathPart; + + return url; + }; + + wxString urls; + + int sel = -1; + while ((sel = m_results->GetNextItem(sel, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) >= 0) { + if (static_cast(sel) >= m_results->m_indexMapping.size()) { + continue; + } + int index = m_results->m_indexMapping[sel]; + + auto const& entry = m_results->remoteFileData_[index]; + urls += getUrl(url, entry.path, entry.name); +#ifdef __WXMSW__ + urls += _T("\r\n"); +#else + urls += _T("\n"); +#endif + } + + wxTheClipboard->SetData(new wxURLDataObject(urls)); + + wxTheClipboard->Flush(); + wxTheClipboard->Close(); +} + +void CSearchDialog::OnOpen(wxCommandEvent & event) +{ + std::list selected_item_list; + + int sel = -1; + while ((sel = m_results->GetNextItem(sel, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { + if (static_cast(sel) >= m_results->indexMapping().size()) { + continue; + } + int index = m_results->indexMapping()[sel]; + + selected_item_list.push_back(m_results->localFileData_[index]); + } + + CEditHandler* pEditHandler = CEditHandler::Get(); + if (!pEditHandler) { + wxBell(); + return; + } + + if (selected_item_list.empty()) { + wxBell(); + return; + } + + if (selected_item_list.size() > 10) { + CConditionalDialog dlg(this, CConditionalDialog::many_selected_for_edit, CConditionalDialog::yesno); + dlg.SetTitle(_("Confirmation needed")); + dlg.AddText(_("You have selected more than 10 files or directories to open, do you really want to continue?")); + + if (!dlg.Run()) { + return; + } + } + + bool const open = event.GetId() == XRCID("ID_MENU_SEARCH_OPEN"); + + for (auto const& data : selected_item_list) { + + std::wstring const fn = data.path.GetPath() + data.name; + if (data.dir) { + OpenInFileManager(fn); + continue; + } + + if (!open) { + OpenInFileManager(data.path.GetPath()); + continue; + } + + if (wxLaunchDefaultApplication(fn, 0)) { + continue; + } + bool program_exists = false; + wxString cmd = GetSystemOpenCommand(fn, program_exists); + if (cmd.empty()) { + auto pos = data.name.find('.'); + if (pos == std::wstring::npos || (pos == 0 && data.name.find('.', 1) == std::wstring::npos)) { + cmd = pEditHandler->GetOpenCommand(fn, program_exists); + } + } + if (cmd.empty()) { + wxMessageBoxEx(wxString::Format(_("The file '%s' could not be opened:\nNo program has been associated on your system with this file type."), fn), _("Opening failed"), wxICON_EXCLAMATION); + continue; + } + if (!program_exists) { + wxString msg = wxString::Format(_("The file '%s' cannot be opened:\nThe associated program (%s) could not be found.\nPlease check your filetype associations."), fn, cmd); + wxMessageBoxEx(msg, _("Cannot edit file"), wxICON_EXCLAMATION); + continue; + } + + if (wxExecute(cmd)) { + continue; + } + + wxMessageBoxEx(wxString::Format(_("The file '%s' could not be opened:\nThe associated command failed"), fn), _("Opening failed"), wxICON_EXCLAMATION); + } +} diff -Nru filezilla-3.15.0.2/src/interface/search.h filezilla-3.33.0/src/interface/search.h --- filezilla-3.15.0.2/src/interface/search.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/search.h 2017-12-29 14:30:53.000000000 +0000 @@ -1,7 +1,8 @@ -#ifndef __SEARCH_H__ -#define __SEARCH_H__ +#ifndef FILEZILLA_INTERFACE_SEARCH_HEADER +#define FILEZILLA_INTERFACE_SEARCH_HEADER #include "filter_conditions_dialog.h" +#include "local_recursive_operation.h" #include "state.h" #include @@ -9,11 +10,18 @@ class CSearchDialogFileList; class CQueueView; class CFilelistStatusBar; -class CSearchDialog : protected CFilterConditionsDialog, public CStateEventHandler +class CSearchDialog final : protected CFilterConditionsDialog, public CStateEventHandler { friend class CSearchDialogFileList; public: - CSearchDialog(wxWindow* parent, CState* pState, CQueueView* pQueue); + enum class search_mode + { + none, + local, + remote + }; + + CSearchDialog(wxWindow* parent, CState& state, CQueueView* pQueue); virtual ~CSearchDialog(); bool Load(); @@ -21,6 +29,7 @@ protected: void ProcessDirectoryListing(std::shared_ptr const& listing); + void ProcessDirectoryListing(CLocalRecursiveOperation::listing const& listing); void SetCtrlState(); @@ -31,31 +40,33 @@ CSearchDialogFileList *m_results{}; CQueueView* m_pQueue; - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2); + virtual void OnStateChange(t_statechange_notifications notification, const wxString& data, const void* data2); CWindowStateManager* m_pWindowStateManager{}; CFilter m_search_filter; - bool m_searching{}; + search_mode m_searching{}; CServerPath m_original_dir; - CLocalPath m_local_target; - - void ProcessSelection(std::list &selected_files, std::deque &selected_dirs); DECLARE_EVENT_TABLE() void OnSearch(wxCommandEvent& event); void OnStop(wxCommandEvent& event); void OnContextMenu(wxContextMenuEvent& event); void OnDownload(wxCommandEvent&); + void OnUpload(wxCommandEvent&); void OnEdit(wxCommandEvent&); void OnDelete(wxCommandEvent&); void OnCharHook(wxKeyEvent& event); + void OnChangeSearchMode(wxCommandEvent&); + void OnGetUrl(wxCommandEvent& event); + void OnOpen(wxCommandEvent& event); std::set m_visited; - CServerPath m_search_root; + CLocalPath m_local_search_root; + CServerPath m_remote_search_root; }; -#endif //__SEARCH_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/serverdata.cpp filezilla-3.33.0/src/interface/serverdata.cpp --- filezilla-3.15.0.2/src/interface/serverdata.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/serverdata.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -0,0 +1,302 @@ +#include + +#include "loginmanager.h" +#include "serverdata.h" +#include "Options.h" + +bool ServerWithCredentials::ParseUrl(std::wstring const& host, std::wstring const& port, std::wstring const& user, std::wstring const& pass, std::wstring &error, CServerPath &path, ServerProtocol const hint) +{ + unsigned int nPort = 0; + if (!port.empty()) { + nPort = fz::to_integral(fz::trimmed(port)); + if (port.size() > 5 || !nPort || nPort > 65535) { + error = _("Invalid port given. The port has to be a value from 1 to 65535."); + error += L"\n"; + error += _("You can leave the port field empty to use the default port."); + return false; + } + } + return ParseUrl(host, nPort, user, pass, error, path, hint); +} + +bool ServerWithCredentials::ParseUrl(std::wstring host, unsigned int port, std::wstring user, std::wstring pass, std::wstring &error, CServerPath &path, ServerProtocol const hint) +{ + server.SetType(DEFAULT); + + if (host.empty()) { + error = _("No host given, please enter a host."); + return false; + } + + size_t pos = host.find(L"://"); + if (pos != std::wstring::npos) { + std::wstring protocol = fz::str_tolower_ascii(host.substr(0, pos)); + host = host.substr(pos + 3); + if (protocol.substr(0, 3) == L"fz_") { + protocol = protocol.substr(3); + } + auto p = CServer::GetProtocolFromPrefix(protocol, hint); + if (p == UNKNOWN) { + error = _("Invalid protocol specified. Valid protocols are:\nftp:// for normal FTP with optional encryption,\nsftp:// for SSH file transfer protocol,\nftps:// for FTP over TLS (implicit) and\nftpes:// for FTP over TLS (explicit)."); + return false; + } + server.SetProtocol(p); + } + + pos = host.find('@'); + if (pos != std::wstring::npos) { + // Check if it's something like + // user@name:password@host:port/path + // => If there are multiple at signs, username/port ends at last at before + // the first slash. (Since host and port never contain any at sign) + + size_t slash = host.find('/', pos + 1); + + size_t next_at = host.find('@', pos + 1); + while (next_at != std::wstring::npos) { + if (slash != std::wstring::npos && next_at > slash) { + break; + } + + pos = next_at; + next_at = host.find('@', next_at + 1); + } + + user = host.substr(0, pos); + host = host.substr(pos + 1); + + // Extract password (if any) from username + pos = user.find(':'); + if (pos != std::wstring::npos) { + pass = user.substr(pos + 1); + user = user.substr(0, pos); + } + + // Remove leading and trailing whitespace + fz::trim(user); + + if (user.empty()) { + error = _("Invalid username given."); + return false; + } + } + else { + // Remove leading and trailing whitespace + fz::trim(user); + + if (user.empty() && credentials.logonType_ != LogonType::ask && credentials.logonType_ != LogonType::interactive) { + user = L"anonymous"; + pass = L"anonymous@example.com"; + } + } + + pos = host.find('/'); + if (pos != std::wstring::npos) { + path = CServerPath(host.substr(pos)); + host = host.substr(0, pos); + } + + if (!host.empty() && host[0] == '[') { + // Probably IPv6 address + pos = host.find(']'); + if (pos == std::wstring::npos) { + error = _("Host starts with '[' but no closing bracket found."); + return false; + } + if (pos < host.size() - 1) { + if (host[pos + 1] != ':') { + error = _("Invalid host, after closing bracket only colon and port may follow."); + return false; + } + ++pos; + } + else { + pos = std::wstring::npos; + } + } + else { + pos = host.find(':'); + } + if (pos != std::wstring::npos) { + if (!pos) { + error = _("No host given, please enter a host."); + return false; + } + + port = fz::to_integral(host.substr(pos + 1)); + host = host.substr(0, pos); + } + else { + if (!port) { + port = CServer::GetDefaultPort(server.GetProtocol()); + } + } + + if (port < 1 || port > 65535) { + error = _("Invalid port given. The port has to be a value from 1 to 65535."); + return false; + } + + fz::trim(host); + + if (host.empty()) { + error = _("No host given, please enter a host."); + return false; + } + + if (host[0] == '[') { + host = host.substr(1, host.size() - 2); + } + + server.SetHost(host, port); + + credentials.account_.clear(); + + if (credentials.logonType_ != LogonType::ask && credentials.logonType_ != LogonType::interactive) { + if (user.empty()) { + credentials.logonType_ = LogonType::anonymous; + } + else if (user == L"anonymous") { + if (pass.empty() || pass == L"anonymous@example.com") { + credentials.logonType_ = LogonType::anonymous; + } + else { + credentials.logonType_ = LogonType::normal; + } + } + else { + credentials.logonType_ = LogonType::normal; + } + } + server.SetUser(user); + credentials.SetPass(pass); + + if (server.GetProtocol() == UNKNOWN) { + server.SetProtocol(CServer::GetProtocolFromPort(port)); + } + + return true; +} + +void ServerWithCredentials::SetLogonType(LogonType logonType) +{ + credentials.logonType_ = logonType; + if (logonType == LogonType::anonymous) { + server.SetUser(L"anonymous"); + } + if (server.GetUser().empty() && logonType != LogonType::ask && logonType != LogonType::interactive) { + server.SetUser(L"anonymous"); + } +} + +void ServerWithCredentials::SetUser(std::wstring const& user) +{ + if (credentials.logonType_ == LogonType::anonymous) { + server.SetUser(L"anonymous"); + } + else { + server.SetUser(user); + } +} + +void ProtectedCredentials::Protect() +{ + if (logonType_ != LogonType::normal && logonType_ != LogonType::account) { + password_.clear(); + return; + } + + bool kiosk_mode = COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0; + if (kiosk_mode) { + if (logonType_ == LogonType::normal || logonType_ == LogonType::account) { + logonType_ = LogonType::ask; + password_.clear(); + } + } + else { + auto key = public_key::from_base64(fz::to_utf8(COptions::Get()->GetOption(OPTION_MASTERPASSWORDENCRYPTOR))); + Protect(key); + } +} + +void ProtectedCredentials::Protect(public_key const& key) +{ + if (logonType_ != LogonType::normal && logonType_ != LogonType::account) { + password_.clear(); + return; + } + + if (!key) { + return; + } + + if (encrypted_ == key) { + return; + } + else { + // Different key used. Try decrypting it + auto priv = CLoginManager::Get().GetDecryptor(key); + if (priv) { + if (!Unprotect(priv, true)) { + return; + } + } + } + + auto plain = fz::to_utf8(password_); + if (plain.size() < 16) { + // Primitive length hiding + plain.append(16 - plain.size(), 0); + } + auto encrypted = encrypt(plain, key); + + if (encrypted.empty()) { + // Something went wrong + logonType_ = LogonType::ask; + password_.clear(); + } + else { + password_ = fz::to_wstring_from_utf8(fz::base64_encode(std::string(encrypted.begin(), encrypted.end()))); + encrypted_ = key; + } +} + +bool ProtectedCredentials::Unprotect(private_key const& key, bool on_failure_set_to_ask) +{ + if (!encrypted_) { + return true; + } + + if (!key || key.pubkey() != encrypted_) { + if (on_failure_set_to_ask) { + encrypted_ = public_key(); + password_.clear(); + logonType_ = LogonType::ask; + } + return false; + } + + auto cipher = fz::base64_decode(fz::to_utf8(password_)); + + auto plain = decrypt(cipher, key); + if (plain.size() < 16) { + if (on_failure_set_to_ask) { + encrypted_ = public_key(); + password_.clear(); + logonType_ = LogonType::ask; + } + return false; + } + + // This undoes the length-hiding + auto pw = std::string(plain.begin(), plain.end()); + char const c = 0; + auto pos = pw.find(c); + if (pos != std::string::npos) { + pw = pw.substr(0, pos); + } + password_ = fz::to_wstring_from_utf8(pw); + encrypted_ = public_key(); + + return true; +} diff -Nru filezilla-3.15.0.2/src/interface/serverdata.h filezilla-3.33.0/src/interface/serverdata.h --- filezilla-3.15.0.2/src/interface/serverdata.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/serverdata.h 2018-03-29 08:59:00.000000000 +0000 @@ -0,0 +1,71 @@ +#ifndef FILEZILLA_INTERFACE_SERVER_HEADER +#define FILEZILLA_INTERFACE_SERVER_HEADER + +#include +#include + +#include "password_crypto.h" + +class ProtectedCredentials final : public Credentials +{ +public: + ProtectedCredentials() = default; + ProtectedCredentials(ProtectedCredentials const& c) = default; + ProtectedCredentials& operator=(ProtectedCredentials const& c) = default; + + explicit ProtectedCredentials(Credentials const& c) + : Credentials(c) + { + } + + void Protect(); + void Protect(public_key const& key); + bool Unprotect(private_key const& key, bool on_failure_set_to_ask = false); + + public_key encrypted_; +}; + +class ServerWithCredentials final +{ +public: + ServerWithCredentials() = default; + + explicit ServerWithCredentials(CServer const& s, Credentials const& c) + : server(s) + , credentials(c) + {} + + explicit ServerWithCredentials(CServer const& s, ProtectedCredentials const& c) + : server(s) + , credentials(c) + {} + + // Return true if URL could be parsed correctly, false otherwise. + // If parsing fails, pError is filled with the reason and the CServer instance may be left an undefined state. + bool ParseUrl(std::wstring host, unsigned int port, std::wstring user, std::wstring pass, std::wstring &error, CServerPath &path, ServerProtocol const hint = UNKNOWN); + bool ParseUrl(std::wstring const& host, std::wstring const& port, std::wstring const& user, std::wstring const& pass, std::wstring &error, CServerPath &path, ServerProtocol const hint = UNKNOWN); + + std::wstring Format(ServerFormat formatType) const { + return server.Format(formatType, credentials); + } + + void SetLogonType(LogonType logonType); + + void SetUser(std::wstring const& user); + + explicit operator bool() const { + return static_cast(server); + } + + bool operator==(ServerWithCredentials const& rhs) const { + return server == rhs.server; + } + bool operator!=(ServerWithCredentials const& rhs) const { + return !(*this == rhs); + } + + CServer server; + ProtectedCredentials credentials; +}; + +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_connection_active.h filezilla-3.33.0/src/interface/settings/optionspage_connection_active.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_connection_active.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_connection_active.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_CONNECTION_ACTIVE_H__ -#define __OPTIONSPAGE_CONNECTION_ACTIVE_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_ACTIVE_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_ACTIVE_HEADER -class COptionsPageConnectionActive : public COptionsPage +class COptionsPageConnectionActive final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_CONNECTION_ACTIVE"); } @@ -16,4 +16,4 @@ void OnRadioOrCheckEvent(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_CONNECTION_ACTIVE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_connection_ftp.h filezilla-3.33.0/src/interface/settings/optionspage_connection_ftp.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_connection_ftp.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_connection_ftp.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_CONNECTION_FTP_H__ -#define __OPTIONSPAGE_CONNECTION_FTP_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_FTP_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_FTP_HEADER -class COptionsPageConnectionFTP : public COptionsPage +class COptionsPageConnectionFTP final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_CONNECTION_FTP"); } @@ -9,4 +9,4 @@ virtual bool SavePage(); }; -#endif //__OPTIONSPAGE_CONNECTION_FTP_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_connection.h filezilla-3.33.0/src/interface/settings/optionspage_connection.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_connection.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_connection.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_CONNECTION_H__ -#define __OPTIONSPAGE_CONNECTION_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_HEADER -class COptionsPageConnection : public COptionsPage +class COptionsPageConnection final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_CONNECTION"); } @@ -14,4 +14,4 @@ void OnWizard(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_CONNECTION_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_connection_passive.h filezilla-3.33.0/src/interface/settings/optionspage_connection_passive.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_connection_passive.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_connection_passive.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_CONNECTION_PASSIVE_H__ -#define __OPTIONSPAGE_CONNECTION_PASSIVE_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_PASSIVE_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_PASSIVE_HEADER -class COptionsPageConnectionPassive : public COptionsPage +class COptionsPageConnectionPassive final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_CONNECTION_PASSIVE"); } @@ -10,4 +10,4 @@ virtual bool Validate(); }; -#endif //__OPTIONSPAGE_CONNECTION_PASSIVE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_connection_sftp.cpp filezilla-3.33.0/src/interface/settings/optionspage_connection_sftp.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_connection_sftp.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_connection_sftp.cpp 2017-12-09 04:30:05.000000000 +0000 @@ -4,11 +4,13 @@ #include "optionspage.h" #include "optionspage_connection_sftp.h" #include "../filezillaapp.h" +#include "../fzputtygen_interface.h" #include "../inputdialog.h" -#include +#if USE_MAC_SANDBOX +#include "../osx_sandbox_userdirs.h" +#endif BEGIN_EVENT_TABLE(COptionsPageConnectionSFTP, COptionsPage) -EVT_END_PROCESS(wxID_ANY, COptionsPageConnectionSFTP::OnEndProcess) EVT_BUTTON(XRCID("ID_ADDKEY"), COptionsPageConnectionSFTP::OnAdd) EVT_BUTTON(XRCID("ID_REMOVEKEY"), COptionsPageConnectionSFTP::OnRemove) EVT_LIST_ITEM_SELECTED(wxID_ANY, COptionsPageConnectionSFTP::OnSelChanged) @@ -17,19 +19,19 @@ COptionsPageConnectionSFTP::COptionsPageConnectionSFTP() { - m_pFzpg = new CFZPuttyGenInterface(this); + m_pFzpg = std::make_unique(this); } COptionsPageConnectionSFTP::~COptionsPageConnectionSFTP() { - delete m_pFzpg; } bool COptionsPageConnectionSFTP::LoadPage() { wxListCtrl* pKeys = XRCCTRL(*this, "ID_KEYS", wxListCtrl); - if (!pKeys) + if (!pKeys) { return false; + } pKeys->InsertColumn(0, _("Filename"), wxLIST_FORMAT_LEFT, 150); pKeys->InsertColumn(1, _("Comment"), wxLIST_FORMAT_LEFT, 100); pKeys->InsertColumn(2, _("Data"), wxLIST_FORMAT_LEFT, 350); @@ -39,10 +41,11 @@ size.x = 1; pKeys->SetMinSize(size); - wxString keyFiles = m_pOptions->GetOption(OPTION_SFTP_KEYFILES); - wxStringTokenizer tokens(keyFiles, _T("\n"), wxTOKEN_DEFAULT); - while (tokens.HasMoreTokens()) - AddKey(tokens.GetNextToken(), true); + std::wstring keyFiles = m_pOptions->GetOption(OPTION_SFTP_KEYFILES); + auto tokens = fz::strtok(keyFiles, L"\r\n"); + for (auto const& token : tokens) { + AddKey(token, true); + } bool failure = false; @@ -56,20 +59,18 @@ bool COptionsPageConnectionSFTP::SavePage() { // Don't save keys on process error - if (!m_pFzpg->IsProcessStarted() || m_pFzpg->IsProcessCreated()) { + if (!m_pFzpg->ProcessFailed()) { wxString keyFiles; wxListCtrl* pKeys = XRCCTRL(*this, "ID_KEYS", wxListCtrl); - for (int i = 0; i < pKeys->GetItemCount(); i++) { - if (!keyFiles.empty()) + for (int i = 0; i < pKeys->GetItemCount(); ++i) { + if (!keyFiles.empty()) { keyFiles += _T("\n"); + } keyFiles += pKeys->GetItemText(i); } - m_pOptions->SetOption(OPTION_SFTP_KEYFILES, keyFiles); + m_pOptions->SetOption(OPTION_SFTP_KEYFILES, keyFiles.ToStdWstring()); } - if (m_pFzpg->IsProcessCreated()) - m_pFzpg->EndProcess(); - SetOptionFromCheck(XRCID("ID_SFTP_COMPRESSION"), OPTION_SFTP_COMPRESSION); return true; @@ -78,12 +79,17 @@ void COptionsPageConnectionSFTP::OnAdd(wxCommandEvent&) { wxFileDialog dlg(this, _("Select file containing private key"), wxString(), wxString(), wxFileSelectorDefaultWildcardStr, wxFD_OPEN | wxFD_FILE_MUST_EXIST); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } - const wxString file = dlg.GetPath(); + std::wstring const file = dlg.GetPath().ToStdWstring(); - AddKey(dlg.GetPath(), false); + if (AddKey(dlg.GetPath().ToStdWstring(), false)) { +#if USE_MAC_SANDBOX + OSXSandboxUserdirs::Get().AddFile(file); +#endif + } } void COptionsPageConnectionSFTP::OnRemove(wxCommandEvent&) @@ -91,25 +97,37 @@ wxListCtrl* pKeys = XRCCTRL(*this, "ID_KEYS", wxListCtrl); int index = pKeys->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (index == -1) + if (index == -1) { return; + } pKeys->DeleteItem(index); } -bool COptionsPageConnectionSFTP::AddKey(wxString keyFile, bool silent) +bool COptionsPageConnectionSFTP::AddKey(std::wstring keyFile, bool silent) { - wxString comment, data; - if (!m_pFzpg->LoadKeyFile(keyFile, silent, comment, data)) + wxListCtrl* pKeys = XRCCTRL(*this, "ID_KEYS", wxListCtrl); + if (!pKeys) { + return false; + } + + std::wstring comment, data; + if (!m_pFzpg->LoadKeyFile(keyFile, silent, comment, data)) { + if (silent) { + int index = pKeys->InsertItem(pKeys->GetItemCount(), keyFile); + pKeys->SetItem(index, 1, comment); + pKeys->SetItem(index, 2, data); + } return false; + } if (KeyFileExists(keyFile)) { - if (!silent) + if (!silent) { wxMessageBoxEx(_("Selected file is already loaded"), _("Cannot load key file"), wxICON_INFORMATION); + } return false; } - wxListCtrl* pKeys = XRCCTRL(*this, "ID_KEYS", wxListCtrl); int index = pKeys->InsertItem(pKeys->GetItemCount(), keyFile); pKeys->SetItem(index, 1, comment); pKeys->SetItem(index, 2, data); @@ -117,12 +135,13 @@ return true; } -bool COptionsPageConnectionSFTP::KeyFileExists(const wxString& keyFile) +bool COptionsPageConnectionSFTP::KeyFileExists(std::wstring const& keyFile) { wxListCtrl* pKeys = XRCCTRL(*this, "ID_KEYS", wxListCtrl); for (int i = 0; i < pKeys->GetItemCount(); ++i) { - if (pKeys->GetItemText(i) == keyFile) + if (pKeys->GetItemText(i) == keyFile) { return true; + } } return false; } @@ -140,8 +159,3 @@ { SetCtrlState(); } - -void COptionsPageConnectionSFTP::OnEndProcess(wxProcessEvent&) -{ - m_pFzpg->DeleteProcess(); -} diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_connection_sftp.h filezilla-3.33.0/src/interface/settings/optionspage_connection_sftp.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_connection_sftp.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_connection_sftp.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,10 +1,12 @@ -#ifndef __OPTIONSPAGE_CONNECTION_SFTP_H__ -#define __OPTIONSPAGE_CONNECTION_SFTP_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_SFTP_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_CONNECTION_SFTP_HEADER #include -#include "../fzputtygen_interface.h" -class COptionsPageConnectionSFTP : public COptionsPage +#include + +class CFZPuttyGenInterface; +class COptionsPageConnectionSFTP final : public COptionsPage { public: COptionsPageConnectionSFTP(); @@ -14,18 +16,17 @@ virtual bool SavePage(); protected: - CFZPuttyGenInterface* m_pFzpg; + std::unique_ptr m_pFzpg; - bool AddKey(wxString keyFile, bool silent); - bool KeyFileExists(const wxString& keyFile); + bool AddKey(std::wstring keyFile, bool silent); + bool KeyFileExists(std::wstring const& keyFile); void SetCtrlState(); DECLARE_EVENT_TABLE() - void OnEndProcess(wxProcessEvent& event); void OnAdd(wxCommandEvent& event); void OnRemove(wxCommandEvent& event); void OnSelChanged(wxListEvent& event); }; -#endif //__OPTIONSPAGE_CONNECTION_SFTP_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage.cpp filezilla-3.33.0/src/interface/settings/optionspage.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -8,9 +8,17 @@ m_pOwner = pOwner; m_pOptions = pOptions; - if (!wxXmlResource::Get()->LoadPanel(this, parent, GetResourceName())) + if (!wxXmlResource::Get()->LoadPanel(this, parent, GetResourceName())) { return false; + } + + UpdateMaxPageSize(maxSize); + + return true; +} +void COptionsPage::UpdateMaxPageSize(wxSize& maxSize) +{ wxSize size = GetSize(); #ifdef __WXGTK__ @@ -20,21 +28,18 @@ size.x += 1; #endif - if (size.GetWidth() > maxSize.GetWidth()) + if (size.GetWidth() > maxSize.GetWidth()) { maxSize.SetWidth(size.GetWidth()); - if (size.GetHeight() > maxSize.GetHeight()) + } + if (size.GetHeight() > maxSize.GetHeight()) { maxSize.SetHeight(size.GetHeight()); - - m_was_selected = false; - - return true; + } } void COptionsPage::SetCheck(int id, bool checked, bool& failure) { - wxCheckBox* pCheckBox = wxDynamicCast(FindWindow(id), wxCheckBox); - if (!pCheckBox) - { + auto pCheckBox = dynamic_cast(FindWindow(id)); + if (!pCheckBox) { failure = true; return; } @@ -49,10 +54,10 @@ bool COptionsPage::GetCheck(int id) const { - wxCheckBox* pCheckBox = wxDynamicCast(FindWindow(id), wxCheckBox); + auto pCheckBox = dynamic_cast(FindWindow(id)); wxASSERT(pCheckBox); - return pCheckBox->GetValue(); + return pCheckBox ? pCheckBox->GetValue() : false; } void COptionsPage::SetOptionFromCheck(int control_id, int option_id) @@ -62,15 +67,13 @@ void COptionsPage::SetTextFromOption(int ctrlId, int optionId, bool& failure) { - if (ctrlId == -1) - { + if (ctrlId == -1) { failure = true; return; } - wxTextCtrl* pTextCtrl = wxDynamicCast(FindWindow(ctrlId), wxTextCtrl); - if (!pTextCtrl) - { + auto pTextCtrl = dynamic_cast(FindWindow(ctrlId)); + if (!pTextCtrl) { failure = true; return; } @@ -81,17 +84,16 @@ wxString COptionsPage::GetText(int id) const { - wxTextCtrl* pTextCtrl = wxDynamicCast(FindWindow(id), wxTextCtrl); + auto pTextCtrl = dynamic_cast(FindWindow(id)); wxASSERT(pTextCtrl); - return pTextCtrl->GetValue(); + return pTextCtrl ? pTextCtrl->GetValue() : wxString(); } bool COptionsPage::SetText(int id, const wxString& text, bool& failure) { - wxTextCtrl* pTextCtrl = wxDynamicCast(FindWindow(id), wxTextCtrl); - if (!pTextCtrl) - { + auto pTextCtrl = dynamic_cast(FindWindow(id)); + if (!pTextCtrl) { failure = true; return false; } @@ -103,9 +105,8 @@ void COptionsPage::SetRCheck(int id, bool checked, bool& failure) { - wxRadioButton* pRadioButton = wxDynamicCast(FindWindow(id), wxRadioButton); - if (!pRadioButton) - { + auto pRadioButton = dynamic_cast(FindWindow(id)); + if (!pRadioButton) { failure = true; return; } @@ -115,17 +116,16 @@ bool COptionsPage::GetRCheck(int id) const { - wxRadioButton* pRadioButton = wxDynamicCast(FindWindow(id), wxRadioButton); + auto pRadioButton = dynamic_cast(FindWindow(id)); wxASSERT(pRadioButton); - return pRadioButton->GetValue(); + return pRadioButton ? pRadioButton->GetValue() : false; } void COptionsPage::SetStaticText(int id, const wxString& text, bool& failure) { - wxStaticText* pStaticText = wxDynamicCast(FindWindow(id), wxStaticText); - if (!pStaticText) - { + auto pStaticText = dynamic_cast(FindWindow(id)); + if (!pStaticText) { failure = true; return; } @@ -135,10 +135,10 @@ wxString COptionsPage::GetStaticText(int id) const { - wxStaticText* pStaticText = wxDynamicCast(FindWindow(id), wxStaticText); + auto pStaticText = dynamic_cast(FindWindow(id)); wxASSERT(pStaticText); - return pStaticText->GetLabel(); + return pStaticText ? pStaticText->GetLabel() : wxString(); } void COptionsPage::ReloadSettings() @@ -149,7 +149,7 @@ void COptionsPage::SetOptionFromText(int ctrlId, int optionId) { const wxString& value = GetText(ctrlId); - m_pOptions->SetOption(optionId, value); + m_pOptions->SetOption(optionId, value.ToStdWstring()); } void COptionsPage::SetIntOptionFromText(int ctrlId, int optionId) @@ -164,21 +164,18 @@ void COptionsPage::SetChoice(int id, int selection, bool& failure) { - if (selection < -1) - { + if (selection < -1) { failure = true; return; } - wxChoice* pChoice = wxDynamicCast(FindWindow(id), wxChoice); - if (!pChoice) - { + auto pChoice = dynamic_cast(FindWindow(id)); + if (!pChoice) { failure = true; return; } - if (selection >= (int)pChoice->GetCount()) - { + if (selection >= (int)pChoice->GetCount()) { failure = true; return; } @@ -188,7 +185,7 @@ int COptionsPage::GetChoice(int id) const { - wxChoice* pChoice = wxDynamicCast(FindWindow(id), wxChoice); + auto pChoice = dynamic_cast(FindWindow(id)); wxASSERT(pChoice); if (!pChoice) return 0; diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_dateformatting.cpp filezilla-3.33.0/src/interface/settings/optionspage_dateformatting.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_dateformatting.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_dateformatting.cpp 2016-09-28 08:57:50.000000000 +0000 @@ -50,7 +50,7 @@ dateFormat = _T("1"); else dateFormat = _T("0"); - m_pOptions->SetOption(OPTION_DATE_FORMAT, dateFormat); + m_pOptions->SetOption(OPTION_DATE_FORMAT, dateFormat.ToStdWstring()); wxString timeFormat; if (GetRCheck(XRCID("ID_TIMEFORMAT_CUSTOM"))) @@ -59,7 +59,7 @@ timeFormat = _T("1"); else timeFormat = _T("0"); - m_pOptions->SetOption(OPTION_TIME_FORMAT, timeFormat); + m_pOptions->SetOption(OPTION_TIME_FORMAT, timeFormat.ToStdWstring()); return true; } diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_dateformatting.h filezilla-3.33.0/src/interface/settings/optionspage_dateformatting.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_dateformatting.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_dateformatting.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_DATEFORMATTING_H__ -#define __OPTIONSPAGE_DATEFORMATTING_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_DATEFORMATTING_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_DATEFORMATTING_HEADER -class COptionsPageDateFormatting : public COptionsPage +class COptionsPageDateFormatting final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_DATEFORMATTING"); } @@ -17,4 +17,4 @@ void OnRadioChanged(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_DATEFORMATTING_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_debug.h filezilla-3.33.0/src/interface/settings/optionspage_debug.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_debug.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_debug.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_DEBUG_H__ -#define __OPTIONSPAGE_DEBUG_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_DEBUG_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_DEBUG_HEADER -class COptionsPageDebug : public COptionsPage +class COptionsPageDebug final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_DEBUG"); } @@ -10,4 +10,4 @@ virtual bool Validate(); }; -#endif //__OPTIONSPAGE_DEBUG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_edit_associations.h filezilla-3.33.0/src/interface/settings/optionspage_edit_associations.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_edit_associations.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_edit_associations.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_EDIT_ASSOCIATIONS_H__ -#define __OPTIONSPAGE_EDIT_ASSOCIATIONS_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_EDIT_ASSOCIATIONS_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_EDIT_ASSOCIATIONS_HEADER -class COptionsPageEditAssociations : public COptionsPage +class COptionsPageEditAssociations final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_EDIT_ASSOCIATIONS"); } @@ -10,4 +10,4 @@ virtual bool Validate(); }; -#endif //__OPTIONSPAGE_EDIT_ASSOCIATIONS_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_edit.cpp filezilla-3.33.0/src/interface/settings/optionspage_edit.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_edit.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_edit.cpp 2016-09-28 08:57:50.000000000 +0000 @@ -49,7 +49,7 @@ COptions* pOptions = COptions::Get(); if (GetRCheck(XRCID("ID_DEFAULT_CUSTOM"))) - pOptions->SetOption(OPTION_EDIT_DEFAULTEDITOR, _T("2") + GetText(XRCID("ID_EDITOR"))); + pOptions->SetOption(OPTION_EDIT_DEFAULTEDITOR, _T("2") + GetText(XRCID("ID_EDITOR")).ToStdWstring()); else pOptions->SetOption(OPTION_EDIT_DEFAULTEDITOR, GetRCheck(XRCID("ID_DEFAULT_TEXT")) ? _T("1") : _T("0")); diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_edit.h filezilla-3.33.0/src/interface/settings/optionspage_edit.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_edit.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_edit.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_EDIT_H__ -#define __OPTIONSPAGE_EDIT_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_EDIT_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_EDIT_HEADER -class COptionsPageEdit : public COptionsPage +class COptionsPageEdit final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_EDIT"); } @@ -18,4 +18,4 @@ void OnRadioButton(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_EDIT_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_fileexists.h filezilla-3.33.0/src/interface/settings/optionspage_fileexists.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_fileexists.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_fileexists.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_FILEEXISTS_H__ -#define __OPTIONSPAGE_FILEEXISTS_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_FILEEXISTS_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_FILEEXISTS_HEADER -class COptionsPageFileExists : public COptionsPage +class COptionsPageFileExists final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_FILEEXISTS"); } @@ -10,4 +10,4 @@ virtual bool Validate(); }; -#endif //__OPTIONSPAGE_FILEEXISTS_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_filelists.cpp filezilla-3.33.0/src/interface/settings/optionspage_filelists.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_filelists.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_filelists.cpp 2017-06-02 20:38:13.000000000 +0000 @@ -3,7 +3,6 @@ #include "settingsdialog.h" #include "optionspage.h" #include "optionspage_filelists.h" -#include "../Mainfrm.h" bool COptionsPageFilelists::LoadPage() { diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_filelists.h filezilla-3.33.0/src/interface/settings/optionspage_filelists.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_filelists.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_filelists.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_FILELISTS_H__ -#define __OPTIONSPAGE_FILELISTS_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_FILELISTS_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_FILELISTS_HEADER -class COptionsPageFilelists : public COptionsPage +class COptionsPageFilelists final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_FILELISTS"); } @@ -10,4 +10,4 @@ virtual bool Validate(); }; -#endif //__OPTIONSPAGE_FILELISTS_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_filetype.cpp filezilla-3.33.0/src/interface/settings/optionspage_filetype.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_filetype.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_filetype.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -99,7 +99,7 @@ extensions += _T("|"); extensions += ext; } - m_pOptions->SetOption(OPTION_ASCIIFILES, extensions); + m_pOptions->SetOption(OPTION_ASCIIFILES, extensions.ToStdWstring()); return true; } @@ -126,9 +126,9 @@ int item = -1; item = pListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - while (item != -1) - { + while (item != -1) { pListCtrl->DeleteItem(item); + --item; item = pListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); } SetCtrlState(); diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_filetype.h filezilla-3.33.0/src/interface/settings/optionspage_filetype.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_filetype.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_filetype.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_FILETYPE_H__ -#define __OPTIONSPAGE_FILETYPE_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_FILETYPE_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_FILETYPE_HEADER -class COptionsPageFiletype : public COptionsPage +class COptionsPageFiletype final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_FILETYPE"); } @@ -19,4 +19,4 @@ void OnTextChanged(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_FILETYPE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_ftpproxy.h filezilla-3.33.0/src/interface/settings/optionspage_ftpproxy.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_ftpproxy.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_ftpproxy.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_FTPPROXY_H__ -#define __OPTIONSPAGE_FTPPROXY_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_FTPPROXY_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_FTPPROXY_HEADER -class COptionsPageFtpProxy : public COptionsPage +class COptionsPageFtpProxy final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_CONNECTION_FTP_PROXY"); } @@ -18,4 +18,4 @@ void OnLoginSequenceChanged(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_FTPPROXY_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage.h filezilla-3.33.0/src/interface/settings/optionspage.h --- filezilla-3.15.0.2/src/interface/settings/optionspage.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,17 +1,14 @@ -#ifndef __OPTIONSPAGE_H__ -#define __OPTIONSPAGE_H__ - -#define SAFE_XRCCTRL(id, type) \ - if (!XRCCTRL(*this, id, type)) \ - return false; \ - XRCCTRL(*this, id, type) +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_HEADER class COptions; class CSettingsDialog; class COptionsPage : public wxPanel { public: - bool CreatePage(COptions* pOptions, CSettingsDialog* pOwner, wxWindow* parent, wxSize& maxSize); + virtual bool CreatePage(COptions* pOptions, CSettingsDialog* pOwner, wxWindow* parent, wxSize& maxSize); + + void UpdateMaxPageSize(wxSize& maxSize); virtual wxString GetResourceName() = 0; virtual bool LoadPage() = 0; @@ -49,10 +46,10 @@ virtual bool OnDisplayedFirstTime(); protected: - COptions* m_pOptions; - CSettingsDialog* m_pOwner; + COptions* m_pOptions{}; + CSettingsDialog* m_pOwner{}; - bool m_was_selected; + bool m_was_selected{}; }; -#endif //__OPTIONSPAGE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_interface.cpp filezilla-3.33.0/src/interface/settings/optionspage_interface.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_interface.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_interface.cpp 2017-09-29 03:30:02.000000000 +0000 @@ -3,8 +3,12 @@ #include "settingsdialog.h" #include "optionspage.h" #include "optionspage_interface.h" +#include "../loginmanager.h" #include "../Mainfrm.h" #include "../power_management.h" +#include "../recentserverlist.h" +#include "../xrc_helper.h" +#include BEGIN_EVENT_TABLE(COptionsPageInterface, COptionsPage) EVT_CHECKBOX(XRCID("ID_FILEPANESWAP"), COptionsPageInterface::OnLayoutChange) @@ -29,21 +33,50 @@ SetCheckFromOption(XRCID("ID_SPEED_DISPLAY"), OPTION_SPEED_DISPLAY, failure); - if (!CPowerManagement::IsSupported()) + if (!CPowerManagement::IsSupported()) { XRCCTRL(*this, "ID_PREVENT_IDLESLEEP", wxCheckBox)->Hide(); + } - if (m_pOptions->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE) || m_pOptions->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) - { - XRCCTRL(*this, "ID_DONT_SAVE_PASSWORDS", wxCheckBox)->SetValue(true); - XRCCTRL(*this, "ID_DONT_SAVE_PASSWORDS", wxCheckBox)->Disable(); + auto onChange = [this](wxEvent const&) { + bool checked = xrc_call(*this, "ID_PASSWORDS_USEMASTERPASSWORD", &wxRadioButton::GetValue); + xrc_call(*this, "ID_MASTERPASSWORD", &wxControl::Enable, checked); + xrc_call(*this, "ID_MASTERPASSWORD_REPEAT", &wxControl::Enable, checked); + + }; + XRCCTRL(*this, "ID_PASSWORDS_SAVE", wxEvtHandler)->Bind(wxEVT_RADIOBUTTON, onChange); + XRCCTRL(*this, "ID_PASSWORDS_NOSAVE", wxEvtHandler)->Bind(wxEVT_RADIOBUTTON, onChange); + XRCCTRL(*this, "ID_PASSWORDS_USEMASTERPASSWORD", wxEvtHandler)->Bind(wxEVT_RADIOBUTTON, onChange); + + bool const disabledByDefault = m_pOptions->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE) && m_pOptions->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0; + if (disabledByDefault || m_pOptions->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { + xrc_call(*this, "ID_PASSWORDS_NOSAVE", &wxRadioButton::SetValue, true); + xrc_call(*this, "ID_PASSWORDS_SAVE", &wxControl::Disable); + xrc_call(*this, "ID_PASSWORDS_NOSAVE", &wxControl::Disable); + xrc_call(*this, "ID_PASSWORDS_USEMASTERPASSWORD", &wxControl::Disable); + } + else { + if (m_pOptions->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0) { + xrc_call(*this, "ID_PASSWORDS_NOSAVE", &wxRadioButton::SetValue, true); + } + else { + auto key = public_key::from_base64(fz::to_utf8(m_pOptions->GetOption(OPTION_MASTERPASSWORDENCRYPTOR))); + if (key) { + xrc_call(*this, "ID_PASSWORDS_USEMASTERPASSWORD", &wxRadioButton::SetValue, true); + + // @translator: Keep this string as short as possible + xrc_call(*this, "ID_MASTERPASSWORD", &wxTextCtrl::SetHint, _("Leave empty to keep existing password.")); + } + else { + xrc_call(*this, "ID_PASSWORDS_SAVE", &wxRadioButton::SetValue, true); + } + } } - else - SetCheckFromOption(XRCID("ID_DONT_SAVE_PASSWORDS"), OPTION_DEFAULT_KIOSKMODE, failure); + onChange(wxCommandEvent()); SetCheckFromOption(XRCID("ID_INTERFACE_SITEMANAGER_ON_STARTUP"), OPTION_INTERFACE_SITEMANAGER_ON_STARTUP, failure); int action = m_pOptions->GetOptionVal(OPTION_ALREADYCONNECTED_CHOICE); - if( action & 2 ) { + if (action & 2) { action = 1 + (action & 1); } else { @@ -58,6 +91,79 @@ return !failure; } +void COptionsPageInterface::SavePasswordOption() +{ + bool const disabledByDefault = m_pOptions->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE) && m_pOptions->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0; + if (disabledByDefault || m_pOptions->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { + return; + } + + auto oldPub = public_key::from_base64(fz::to_utf8(m_pOptions->GetOption(OPTION_MASTERPASSWORDENCRYPTOR))); + wxString const newPw = xrc_call(*this, "ID_MASTERPASSWORD", &wxTextCtrl::GetValue); + + bool useMaster = xrc_call(*this, "ID_PASSWORDS_USEMASTERPASSWORD", &wxRadioButton::GetValue); + if (useMaster && newPw.empty()) { + // Keeping existing master password + return; + } + + CLoginManager loginManager; + if (oldPub) { + if (!loginManager.AskDecryptor(oldPub, true, true)) { + return; + } + } + + if (useMaster) { + auto priv = private_key::from_password(fz::to_utf8(newPw), fz::random_bytes(private_key::salt_size)); + auto pub = priv.pubkey(); + if (!pub) { + wxMessageBox(_("Could not generate key"), _("Error")); + } + else { + m_pOptions->SetOption(OPTION_DEFAULT_KIOSKMODE, 0); + m_pOptions->SetOption(OPTION_MASTERPASSWORDENCRYPTOR, fz::to_wstring_from_utf8(pub.to_base64())); + } + } + else { + bool save = xrc_call(*this, "ID_PASSWORDS_SAVE", &wxRadioButton::GetValue); + m_pOptions->SetOption(OPTION_DEFAULT_KIOSKMODE, save ? 0 : 1); + m_pOptions->SetOption(OPTION_MASTERPASSWORDENCRYPTOR, std::wstring()); + } + + // Now actually change stored passwords + + { + ServerWithCredentials last; + if (m_pOptions->GetLastServer(last)) { + loginManager.AskDecryptor(last.credentials.encrypted_, true, false); + last.credentials.Unprotect(loginManager.GetDecryptor(last.credentials.encrypted_), true); + m_pOptions->SetLastServer(last); + } + } + + { + auto recentServers = CRecentServerList::GetMostRecentServers(); + for (auto & server : recentServers) { + loginManager.AskDecryptor(server.credentials.encrypted_, true, false); + server.credentials.Unprotect(loginManager.GetDecryptor(server.credentials.encrypted_), true); + } + CRecentServerList::SetMostRecentServers(recentServers); + } + + for (auto state : *CContextManager::Get()->GetAllStates()) { + auto site = state->GetLastSite(); + auto path = state->GetLastServerPath(); + loginManager.AskDecryptor(site.server_.credentials.encrypted_, true, false); + site.server_.credentials.Unprotect(loginManager.GetDecryptor(site.server_.credentials.encrypted_), true); + state->SetLastSite(site, path); + } + + CSiteManager::Rewrite(loginManager, true); + + CContextManager::Get()->NotifyGlobalHandlers(STATECHANGE_REWRITE_CREDENTIALS, wxString(), &loginManager); +} + bool COptionsPageInterface::SavePage() { SetOptionFromCheck(XRCID("ID_FILEPANESWAP"), OPTION_FILEPANE_SWAP); @@ -73,13 +179,12 @@ SetOptionFromCheck(XRCID("ID_SPEED_DISPLAY"), OPTION_SPEED_DISPLAY); - if (!m_pOptions->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE) && m_pOptions->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 2) - SetOptionFromCheck(XRCID("ID_DONT_SAVE_PASSWORDS"), OPTION_DEFAULT_KIOSKMODE); + SavePasswordOption(); SetOptionFromCheck(XRCID("ID_INTERFACE_SITEMANAGER_ON_STARTUP"), OPTION_INTERFACE_SITEMANAGER_ON_STARTUP); int action = GetChoice(XRCID("ID_NEWCONN_ACTION")); - if( !action ) { + if (!action) { action = m_pOptions->GetOptionVal(OPTION_ALREADYCONNECTED_CHOICE) & 1; } else { @@ -92,6 +197,23 @@ bool COptionsPageInterface::Validate() { + bool useMaster = xrc_call(*this, "ID_PASSWORDS_USEMASTERPASSWORD", &wxRadioButton::GetValue); + if (useMaster) { + wxString pw = xrc_call(*this, "ID_MASTERPASSWORD", &wxTextCtrl::GetValue); + wxString repeat = xrc_call(*this, "ID_MASTERPASSWORD_REPEAT", &wxTextCtrl::GetValue); + if (pw != repeat) { + return DisplayError(_T("ID_MASTERPASSWORD"), _("The entered passwords are not the same.")); + } + + auto key = public_key::from_base64(fz::to_utf8(m_pOptions->GetOption(OPTION_MASTERPASSWORDENCRYPTOR))); + if (!key && pw.empty()) { + return DisplayError(_T("ID_MASTERPASSWORD"), _("You need to enter a master password.")); + } + + if (!pw.empty() && pw.size() < 8) { + return DisplayError(_T("ID_MASTERPASSWORD"), _("The master password needs to be at least 8 characters long.")); + } + } return true; } diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_interface.h filezilla-3.33.0/src/interface/settings/optionspage_interface.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_interface.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_interface.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_INTERFACE_H__ -#define __OPTIONSPAGE_INTERFACE_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_INTERFACE_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_INTERFACE_HEADER -class COptionsPageInterface : public COptionsPage +class COptionsPageInterface final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_INTERFACE"); } @@ -9,8 +9,11 @@ virtual bool SavePage(); virtual bool Validate(); +private: + void SavePasswordOption(); + DECLARE_EVENT_TABLE() void OnLayoutChange(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_INTERFACE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_language.cpp filezilla-3.33.0/src/interface/settings/optionspage_language.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_language.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_language.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -26,30 +26,12 @@ const int selection = pListBox->GetSelection(); wxString code; - if (selection > 0) + if (selection > 0) { code = m_locale[selection - 1].code; - -#ifdef __WXGTK__ - m_pOptions->SetOption(OPTION_LANGUAGE, code); -#else - bool successful = false; - if (code.empty()) { - wxGetApp().SetLocale(wxLANGUAGE_DEFAULT); - - // Default language cannot fail, has to silently fall back to English - successful = true; - } - else { - const wxLanguageInfo* pInfo = wxLocale::FindLanguageInfo(code); - if (pInfo) - successful = wxGetApp().SetLocale(pInfo->Language); } - if (successful) - m_pOptions->SetOption(OPTION_LANGUAGE, code); - else - wxMessageBoxEx(wxString::Format(_("Failed to set language to %s, using default system language"), pListBox->GetStringSelection()), _("Failed to change language"), wxICON_EXCLAMATION, this); -#endif + m_pOptions->SetOption(OPTION_LANGUAGE, code.ToStdWstring()); + return true; } diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_language.h filezilla-3.33.0/src/interface/settings/optionspage_language.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_language.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_language.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_LANGUAGE_H__ -#define __OPTIONSPAGE_LANGUAGE_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_LANGUAGE_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_LANGUAGE_HEADER -class COptionsPageLanguage : public COptionsPage +class COptionsPageLanguage final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_LANGUAGE"); } @@ -21,4 +21,4 @@ std::vector<_locale_info> m_locale; }; -#endif //__OPTIONSPAGE_LANGUAGE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_logging.cpp filezilla-3.33.0/src/interface/settings/optionspage_logging.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_logging.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_logging.cpp 2016-09-28 08:57:50.000000000 +0000 @@ -45,7 +45,7 @@ wxString filename; if (GetCheck(XRCID("ID_LOGFILE"))) filename = GetText(XRCID("ID_FILENAME")); - m_pOptions->SetOption(OPTION_LOGGING_FILE, filename); + m_pOptions->SetOption(OPTION_LOGGING_FILE, filename.ToStdWstring()); if (GetCheck(XRCID("ID_DOLIMIT"))) SetOptionFromText(XRCID("ID_LIMIT"), OPTION_LOGGING_FILE_SIZELIMIT); diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_logging.h filezilla-3.33.0/src/interface/settings/optionspage_logging.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_logging.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_logging.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_LOGGING_H__ -#define __OPTIONSPAGE_LOGGING_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_LOGGING_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_LOGGING_HEADER -class COptionsPageLogging : public COptionsPage +class COptionsPageLogging final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_LOGGING"); } @@ -17,4 +17,4 @@ void OnCheck(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_LOGGING_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_proxy.h filezilla-3.33.0/src/interface/settings/optionspage_proxy.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_proxy.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_proxy.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_PROXY_H__ -#define __OPTIONSPAGE_PROXY_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_PROXY_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_PROXY_HEADER -class COptionsPageProxy : public COptionsPage +class COptionsPageProxy final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_CONNECTION_PROXY"); } @@ -17,4 +17,4 @@ void OnProxyTypeChanged(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_PROXY_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_sizeformatting.cpp filezilla-3.33.0/src/interface/settings/optionspage_sizeformatting.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_sizeformatting.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_sizeformatting.cpp 2017-01-09 16:00:55.000000000 +0000 @@ -111,4 +111,7 @@ XRCCTRL(*this, "ID_EXAMPLE6", wxStaticText)->SetLabel(FormatSize(0x39E94F995A72ll)); GetSizer()->Layout(); + + // Otherwise label background isn't cleared properly + Refresh(); } diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_sizeformatting.h filezilla-3.33.0/src/interface/settings/optionspage_sizeformatting.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_sizeformatting.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_sizeformatting.h 2017-04-23 11:04:55.000000000 +0000 @@ -1,9 +1,9 @@ -#ifndef __OPTIONSPAGE_SIZEFORMATTING_H__ -#define __OPTIONSPAGE_SIZEFORMATTING_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_SIZEFORMATTING_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_SIZEFORMATTING_HEADER #include "../sizeformatting.h" -class COptionsPageSizeFormatting : public COptionsPage +class COptionsPageSizeFormatting final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_SIZEFORMATTING"); } @@ -24,4 +24,4 @@ wxString FormatSize(int64_t size); }; -#endif //__OPTIONSPAGE_SIZEFORMATTING_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_themes.cpp filezilla-3.33.0/src/interface/settings/optionspage_themes.cpp --- filezilla-3.15.0.2/src/interface/settings/optionspage_themes.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_themes.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -9,32 +9,39 @@ #include #include +#include "xrc_helper.h" + BEGIN_EVENT_TABLE(COptionsPageThemes, COptionsPage) EVT_CHOICE(XRCID("ID_THEME"), COptionsPageThemes::OnThemeChange) END_EVENT_TABLE() const int BORDER = 5; -class CIconPreview : public wxScrolledWindow +class CIconPreview final : public wxScrolledWindow { public: + CIconPreview() = default; + CIconPreview(wxWindow* pParent) : wxScrolledWindow(pParent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER | wxVSCROLL) { - m_sizeInitialized = false; - m_extra_padding = 0; } - void LoadIcons(const wxString& theme, const wxSize& iconSize) + void LoadIcons(std::wstring const& theme, wxSize const& size) { - m_iconSize = iconSize; - m_icons = CThemeProvider::GetAllImages(theme, m_iconSize); + m_iconSize = size; + + m_icons = CThemeProvider::Get()->GetAllImages(theme, size); + + m_sizeInitialized = false; + Refresh(); } void CalcSize() { - if (m_sizeInitialized) + if (m_sizeInitialized) { return; + } m_sizeInitialized = true; wxSize size = GetClientSize(); @@ -94,8 +101,8 @@ int x = BORDER; int y = BORDER; - for( auto const& bmp : m_icons ) { - dc.DrawBitmap(*bmp, x, y, true); + for (auto const& bmp : m_icons) { + dc.DrawBitmap(bmp, x, y, true); x += m_iconSize.GetWidth() + BORDER + m_extra_padding; if ((x + m_iconSize.GetWidth() + BORDER) > size.GetWidth()) { x = BORDER; @@ -104,18 +111,48 @@ } } - std::vector> m_icons; + std::vector m_icons; wxSize m_iconSize; - bool m_sizeInitialized; - int m_extra_padding; + bool m_sizeInitialized{}; + int m_extra_padding{}; + + DECLARE_DYNAMIC_CLASS(CIconPreview) }; +IMPLEMENT_DYNAMIC_CLASS(CIconPreview, wxScrolledWindow) + BEGIN_EVENT_TABLE(CIconPreview, wxScrolledWindow) EVT_PAINT(CIconPreview::OnPaint) END_EVENT_TABLE() -COptionsPageThemes::~COptionsPageThemes() +bool COptionsPageThemes::CreatePage(COptions* pOptions, CSettingsDialog* pOwner, wxWindow* parent, wxSize& maxSize) { + bool success = COptionsPage::CreatePage(pOptions, pOwner, parent, maxSize); + if (success) { + auto dummy = XRCCTRL(*this, "ID_SCALE", wxWindow); + auto sizer = dummy ? dummy->GetContainingSizer() : 0; + if (!sizer) { + return false; + } + + wxWindow* sizerParent = dummy->GetParent(); + sizer->Detach(dummy); + delete dummy; + + auto scale = new wxSpinCtrlDouble(sizerParent, XRCID("ID_SCALE")); + scale->SetRange(0.5, 4); + scale->SetIncrement(0.25); + scale->SetValue(1.25); + scale->SetDigits(2); + sizer->Add(scale, wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); + sizer->Layout(); + GetSizer()->Layout(); + GetSizer()->Fit(this); + + scale->Connect(wxEVT_SPINCTRLDOUBLE, wxCommandEventHandler(COptionsPageThemes::OnThemeChange), 0, this); + } + + return success; } bool COptionsPageThemes::LoadPage() @@ -125,19 +162,18 @@ bool COptionsPageThemes::SavePage() { - if (!m_was_selected) + if (!m_was_selected) { return true; + } wxChoice* pTheme = XRCCTRL(*this, "ID_THEME", wxChoice); const int sel = pTheme->GetSelection(); const wxString theme = ((wxStringClientData*)pTheme->GetClientObject(sel))->GetData(); - m_pOptions->SetOption(OPTION_THEME, theme); + m_pOptions->SetOption(OPTION_ICONS_THEME, theme.ToStdWstring()); - wxNotebook *pPreview = XRCCTRL(*this, "ID_PREVIEW", wxNotebook); - wxString size = pPreview->GetPageText(pPreview->GetSelection()); - m_pOptions->SetOption(OPTION_THEME_ICONSIZE, size); + m_pOptions->SetOption(OPTION_ICONS_SCALE, static_cast(100 * xrc_call(*this, "ID_SCALE", &wxSpinCtrlDouble::GetValue))); return true; } @@ -147,10 +183,10 @@ return true; } -bool COptionsPageThemes::DisplayTheme(const wxString& theme) +bool COptionsPageThemes::DisplayTheme(std::wstring const& theme) { - wxString name, author, mail; - if (!CThemeProvider::GetThemeData(theme, name, author, mail)) { + std::wstring name, author, mail; + if (!CThemeProvider::Get()->GetThemeData(theme, name, author, mail)) { return false; } if (name.empty()) { @@ -158,60 +194,21 @@ } if (author.empty()) { - author = _("N/a"); + author = _("N/a").ToStdWstring(); } if (mail.empty()) { - mail = _("N/a"); + mail = _("N/a").ToStdWstring(); } bool failure = false; SetStaticText(XRCID("ID_AUTHOR"), author, failure); SetStaticText(XRCID("ID_EMAIL"), mail, failure); - wxNotebook *pPreview = XRCCTRL(*this, "ID_PREVIEW", wxNotebook); + auto scale_factor = xrc_call(*this, "ID_SCALE", &wxSpinCtrlDouble::GetValue); + wxSize size = CThemeProvider::Get()->GetIconSize(iconSizeSmall); + size.Scale(scale_factor, scale_factor); - wxString selected_size; - int selected_page = pPreview->GetSelection(); - if (selected_page != -1) - selected_size = pPreview->GetPageText(selected_page); - else - selected_size = COptions::Get()->GetOption(OPTION_THEME_ICONSIZE); - - pPreview->DeleteAllPages(); - - for( auto const& size : CThemeProvider::GetThemeSizes(theme) ) { - int pos = size.Find('x'); - if (pos <= 0 || pos >= (int)size.Len() - 1) - continue; - - long width = 0; - long height = 0; - if (!size.Left(pos).ToLong(&width) || - !size.Mid(pos + 1).ToLong(&height) || - width <= 0 || height <= 0) - { - continue; - } - - wxSize iconSize(width, height); - - wxPanel* pPanel = new wxPanel(); -#ifdef __WXMSW__ - // Drawing glitch on MSW - pPanel->Hide(); -#endif - pPanel->Create(pPreview); - wxSizer* pSizer = new wxBoxSizer(wxVERTICAL); - pPanel->SetSizer(pSizer); - pSizer->Add(new wxStaticText(pPanel, wxID_ANY, _("Preview:")), 0, wxLEFT|wxRIGHT|wxTOP, 5); - - CIconPreview *pIconPreview = new CIconPreview(pPanel); - pIconPreview->LoadIcons(theme, iconSize); - - pSizer->Add(pIconPreview, 1, wxGROW | wxALL, 5); - - pPreview->AddPage(pPanel, size, selected_size == size); - } + xrc_call(*this, "ID_PREVIEW", &CIconPreview::LoadIcons, theme, size); return !failure; } @@ -221,8 +218,7 @@ wxChoice* pTheme = XRCCTRL(*this, "ID_THEME", wxChoice); const int sel = pTheme->GetSelection(); - const wxString theme = ((wxStringClientData*)pTheme->GetClientObject(sel))->GetData(); - + std::wstring const theme = ((wxStringClientData*)pTheme->GetClientObject(sel))->GetData().ToStdWstring(); DisplayTheme(theme); } @@ -231,36 +227,47 @@ bool failure = false; wxChoice* pTheme = XRCCTRL(*this, "ID_THEME", wxChoice); - if (!pTheme) + if (!pTheme) { return false; + } - if (!pTheme || !XRCCTRL(*this, "ID_PREVIEW", wxNotebook) || + if (!pTheme || !XRCCTRL(*this, "ID_PREVIEW", CIconPreview) || !XRCCTRL(*this, "ID_AUTHOR", wxStaticText) || !XRCCTRL(*this, "ID_EMAIL", wxStaticText)) + { return false; + } auto const themes = CThemeProvider::GetThemes(); - if (themes.empty()) + if (themes.empty()) { return false; + } - wxString activeTheme = m_pOptions->GetOption(OPTION_THEME); - wxString firstName; + xrc_call(*this, "ID_SCALE", &wxSpinCtrlDouble::SetValue, static_cast(m_pOptions->GetOptionVal(OPTION_ICONS_SCALE)) / 100.f); + + std::wstring activeTheme = m_pOptions->GetOption(OPTION_ICONS_THEME); + std::wstring firstName; for (auto const& theme : themes) { - wxString name, author, mail; - if (!CThemeProvider::GetThemeData(theme, name, author, mail)) + std::wstring name, author, mail; + if (!CThemeProvider::Get()->GetThemeData(theme, name, author, mail)) { continue; - if (firstName.empty()) + } + if (firstName.empty()) { firstName = name; + } int n = pTheme->Append(name, new wxStringClientData(theme)); - if (theme == activeTheme) + if (theme == activeTheme) { pTheme->SetSelection(n); + } } - if (pTheme->GetSelection() == wxNOT_FOUND) + if (pTheme->GetSelection() == wxNOT_FOUND) { pTheme->SetSelection(pTheme->FindString(firstName)); + } activeTheme = ((wxStringClientData*)pTheme->GetClientObject(pTheme->GetSelection()))->GetData(); - if (!DisplayTheme(activeTheme)) + if (!DisplayTheme(activeTheme)) { failure = true; + } pTheme->GetContainingSizer()->Layout(); diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_themes.h filezilla-3.33.0/src/interface/settings/optionspage_themes.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_themes.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_themes.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,17 +1,18 @@ -#ifndef __OPTIONSPAGE_THEMES_H__ -#define __OPTIONSPAGE_THEMES_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_THEMES_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_THEMES_HEADER -class COptionsPageThemes : public COptionsPage +class COptionsPageThemes final : public COptionsPage { public: - virtual ~COptionsPageThemes(); virtual wxString GetResourceName() { return _T("ID_SETTINGS_THEMES"); } virtual bool LoadPage(); virtual bool SavePage(); virtual bool Validate(); + virtual bool CreatePage(COptions* pOptions, CSettingsDialog* pOwner, wxWindow* parent, wxSize& maxSize); + protected: - bool DisplayTheme(const wxString& theme); + bool DisplayTheme(std::wstring const& theme); virtual bool OnDisplayedFirstTime(); @@ -19,4 +20,4 @@ void OnThemeChange(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_THEMES_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_transfer.h filezilla-3.33.0/src/interface/settings/optionspage_transfer.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_transfer.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_transfer.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __OPTIONSPAGE_TRANSFER_H__ -#define __OPTIONSPAGE_TRANSFER_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_TRANSFER_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_TRANSFER_HEADER -class COptionsPageTransfer : public COptionsPage +class COptionsPageTransfer final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_TRANSFER"); } @@ -14,4 +14,4 @@ void OnToggleSpeedLimitEnable(wxCommandEvent& event); }; -#endif //__OPTIONSPAGE_TRANSFER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/optionspage_updatecheck.h filezilla-3.33.0/src/interface/settings/optionspage_updatecheck.h --- filezilla-3.15.0.2/src/interface/settings/optionspage_updatecheck.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/optionspage_updatecheck.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,9 +1,9 @@ -#ifndef __OPTIONSPAGE_UPDATECHECK_H__ -#define __OPTIONSPAGE_UPDATECHECK_H__ +#ifndef FILEZILLA_INTERFACE_OPTIONSPAGE_UPDATECHECK_HEADER +#define FILEZILLA_INTERFACE_OPTIONSPAGE_UPDATECHECK_HEADER #if FZ_MANUALUPDATECHECK && FZ_AUTOUPDATECHECK -class COptionsPageUpdateCheck : public COptionsPage +class COptionsPageUpdateCheck final : public COptionsPage { public: virtual wxString GetResourceName() { return _T("ID_SETTINGS_UPDATECHECK"); } @@ -17,6 +17,6 @@ DECLARE_EVENT_TABLE() }; -#endif //FZ_MANUALUPDATECHECK && FZ_AUTOUPDATECHECK +#endif -#endif //__OPTIONSPAGE_UPDATECHECK_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/settings/settingsdialog.cpp filezilla-3.33.0/src/interface/settings/settingsdialog.cpp --- filezilla-3.15.0.2/src/interface/settings/settingsdialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/settingsdialog.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -97,7 +97,7 @@ AddPage(_("SFTP"), new COptionsPageConnectionSFTP, 1); AddPage(_("Generic proxy"), new COptionsPageProxy, 1); AddPage(_("Transfers"), new COptionsPageTransfer, 0); - AddPage(_("File Types"), new COptionsPageFiletype, 1); + AddPage(_("FTP: File Types"), new COptionsPageFiletype, 1); AddPage(_("File exists action"), new COptionsPageFileExists, 1); AddPage(_("Interface"), new COptionsPageInterface, 0); AddPage(_("Themes"), new COptionsPageThemes, 1); diff -Nru filezilla-3.15.0.2/src/interface/settings/settingsdialog.h filezilla-3.33.0/src/interface/settings/settingsdialog.h --- filezilla-3.15.0.2/src/interface/settings/settingsdialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/settings/settingsdialog.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,12 +1,12 @@ -#ifndef __SETTINGSDIALOG_H__ -#define __SETTINGSDIALOG_H__ +#ifndef FILEZILLA_INTERFACE_SETTINGS_SETTINGSDIALOG_HEADER +#define FILEZILLA_INTERFACE_SETTINGS_SETTINGSDIALOG_HEADER #include "../dialogex.h" class COptions; class COptionsPage; class CMainFrame; -class CSettingsDialog : public wxDialogEx +class CSettingsDialog final : public wxDialogEx { public: CSettingsDialog(CFileZillaEngineContext & engine_context); @@ -37,7 +37,7 @@ }; std::vector m_pages; - std::map m_oldValues; + std::map m_oldValues; DECLARE_EVENT_TABLE() void OnPageChanging(wxTreeEvent& event); @@ -48,4 +48,4 @@ CFileZillaEngineContext& m_engine_context; }; -#endif //__SETTINGSDIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/sftp_crypt_info_dlg.cpp filezilla-3.33.0/src/interface/sftp_crypt_info_dlg.cpp --- filezilla-3.15.0.2/src/interface/sftp_crypt_info_dlg.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/sftp_crypt_info_dlg.cpp 2017-01-09 16:00:55.000000000 +0000 @@ -20,7 +20,12 @@ xrc_call(dlg, "ID_KEXCURVE_LABEL", &wxWindow::Show, false); xrc_call(dlg, "ID_KEXCURVE", &wxWindow::Show, false); } - SetLabel(dlg, XRCID("ID_FINGERPRINT"), pNotification->hostKey); + + if (!pNotification->hostKeyAlgorithm.empty()) { + SetLabel(dlg, XRCID("ID_HOSTKEYALGO"), pNotification->hostKeyAlgorithm); + } + std::wstring fingerprints = fz::sprintf(L"SHA256: %s\nMD5: %s", pNotification->hostKeyFingerprintSHA256, pNotification->hostKeyFingerprintMD5); + SetLabel(dlg, XRCID("ID_FINGERPRINT"), fingerprints); SetLabel(dlg, XRCID("ID_C2S_CIPHER"), pNotification->cipherClientToServer); SetLabel(dlg, XRCID("ID_C2S_MAC"), pNotification->macClientToServer); SetLabel(dlg, XRCID("ID_S2C_CIPHER"), pNotification->cipherServerToClient); diff -Nru filezilla-3.15.0.2/src/interface/sftp_crypt_info_dlg.h filezilla-3.33.0/src/interface/sftp_crypt_info_dlg.h --- filezilla-3.15.0.2/src/interface/sftp_crypt_info_dlg.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/sftp_crypt_info_dlg.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __SFTP_CRYPT_INFO_DLG_H__ -#define __SFTP_CRYPT_INFO_DLG_H__ +#ifndef FILEZILLA_INTERFACE_SFTP_CRYPT_INFO_DLG_HEADER +#define FILEZILLA_INTERFACE_SFTP_CRYPT_INFO_DLG_HEADER class wxDialogEx; class CSftpEncryptioInfoDialog @@ -11,4 +11,4 @@ void SetLabel(wxDialogEx& dlg, int id, const wxString& text); }; -#endif //__SFTP_CRYPT_INFO_DLG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/sitemanager.cpp filezilla-3.33.0/src/interface/sitemanager.cpp --- filezilla-3.15.0.2/src/interface/sitemanager.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/sitemanager.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,12 +1,87 @@ - #include +#include #include "sitemanager.h" #include "filezillaapp.h" #include "ipcmutex.h" +#include "loginmanager.h" #include "Options.h" #include "xmlfunctions.h" -std::map> CSiteManager::m_idMap; +namespace { +struct background_color { + wxColour const color; + char const*const name; +}; + +background_color const background_colors[] = { + { wxColour(), fztranslate_mark("None") }, + { wxColour(255, 0, 0, 32), fztranslate_mark("Red") }, + { wxColour(0, 255, 0, 32), fztranslate_mark("Green") }, + { wxColour(0, 0, 255, 32), fztranslate_mark("Blue") }, + { wxColour(255, 255, 0, 32), fztranslate_mark("Yellow") }, + { wxColour(0, 255, 255, 32), fztranslate_mark("Cyan") }, + { wxColour(255, 0, 255, 32), fztranslate_mark("Magenta") }, + { wxColour(255, 128, 0, 32), fztranslate_mark("Orange") }, + { wxColour(), 0 } +}; +} + +bool Bookmark::operator==(Bookmark const& b) const +{ + if (m_localDir != b.m_localDir) { + return false; + } + + if (m_remoteDir != b.m_remoteDir) { + return false; + } + + if (m_sync != b.m_sync) { + return false; + } + + if (m_comparison != b.m_comparison) { + return false; + } + + if (m_name != b.m_name) { + return false; + } + + return true; +} + +bool Site::operator==(Site const& s) const +{ + if (server_ != s.server_) { + return false; + } + + if (m_comments != s.m_comments) { + return false; + } + + if (m_default_bookmark != s.m_default_bookmark) { + return false; + } + + if (m_bookmarks != s.m_bookmarks) { + return false; + } + + if (m_path != s.m_path) { + return false; + } + + if (m_colour != s.m_colour) { + return false; + } + + return true; +} + + +std::map> CSiteManager::m_idMap; bool CSiteManager::Load(CSiteManagerXmlHandler& handler) { @@ -31,71 +106,81 @@ for (auto child = element.first_child(); child; child = child.next_sibling()) { if (!strcmp(child.name(), "Folder")) { - wxString name = GetTextElement_Trimmed(child); - if (name.empty()) + std::wstring name = GetTextElement_Trimmed(child); + if (name.empty()) { continue; + } const bool expand = GetTextAttribute(child, "expanded") != _T("0"); - if (!handler.AddFolder(name, expand)) + if (!handler.AddFolder(name, expand)) { return false; + } Load(child, handler); - if (!handler.LevelUp()) + if (!handler.LevelUp()) { return false; + } } else if (!strcmp(child.name(), "Server")) { - std::unique_ptr data = ReadServerElement(child); + std::unique_ptr data = ReadServerElement(child); if (data) { handler.AddSite(std::move(data)); + } + } + } - // Bookmarks - for (auto bookmark = child.child("Bookmark"); bookmark; bookmark = bookmark.next_sibling("Bookmark")) { - wxString name = GetTextElement_Trimmed(bookmark, "Name"); - if (name.empty()) - continue; - - auto bookmarkData = std::make_unique(CSiteManagerItemData::BOOKMARK); - - bookmarkData->m_localDir = GetTextElement(bookmark, "LocalDir"); - bookmarkData->m_remoteDir.SetSafePath(GetTextElement(bookmark, "RemoteDir")); - if (bookmarkData->m_localDir.empty() && bookmarkData->m_remoteDir.empty()) { - continue; - } - - if (!bookmarkData->m_localDir.empty() && !bookmarkData->m_remoteDir.empty()) - bookmarkData->m_sync = GetTextElementBool(bookmark, "SyncBrowsing", false); + return true; +} - bookmarkData->m_comparison = GetTextElementBool(bookmark, "DirectoryComparison", false); +bool CSiteManager::ReadBookmarkElement(Bookmark & bookmark, pugi::xml_node element) +{ + bookmark.m_localDir = GetTextElement(element, "LocalDir"); + bookmark.m_remoteDir.SetSafePath(GetTextElement(element, "RemoteDir")); - handler.AddBookmark(name, std::move(bookmarkData)); - } + if (bookmark.m_localDir.empty() && bookmark.m_remoteDir.empty()) { + return false; + } - if (!handler.LevelUp()) - return false; - } - } + if (!bookmark.m_localDir.empty() && !bookmark.m_remoteDir.empty()) { + bookmark.m_sync = GetTextElementBool(element, "SyncBrowsing", false); } + bookmark.m_comparison = GetTextElementBool(element, "DirectoryComparison", false); + return true; } -std::unique_ptr CSiteManager::ReadServerElement(pugi::xml_node element) +std::unique_ptr CSiteManager::ReadServerElement(pugi::xml_node element) { - CServer server; - if (!::GetServer(element, server)) + ServerWithCredentials server; + if (!::GetServer(element, server)) { return 0; - if (server.GetName().empty()) + } + if (server.server.GetName().empty()) { return 0; + } + + auto data = std::make_unique(); + data->server_ = server; - auto data = std::make_unique(server); data->m_comments = GetTextElement(element, "Comments"); - data->m_localDir = GetTextElement(element, "LocalDir"); - data->m_remoteDir.SetSafePath(GetTextElement(element, "RemoteDir")); + data->m_colour = GetColourFromIndex(GetTextElementInt(element, "Colour")); + + ReadBookmarkElement(data->m_default_bookmark, element); - if (!data->m_localDir.empty() && !data->m_remoteDir.empty()) - data->m_sync = GetTextElementBool(element, "SyncBrowsing", false); + // Bookmarks + for (auto bookmark = element.child("Bookmark"); bookmark; bookmark = bookmark.next_sibling("Bookmark")) { + wxString name = GetTextElement_Trimmed(bookmark, "Name"); + if (name.empty()) { + continue; + } - data->m_comparison = GetTextElementBool(element, "DirectoryComparison", false); + Bookmark bookmarkData; + if (ReadBookmarkElement(bookmarkData, bookmark)) { + bookmarkData.m_name = name; + data->m_bookmarks.push_back(bookmarkData); + } + } return data; } @@ -103,40 +188,42 @@ class CSiteManagerXmlHandler_Menu : public CSiteManagerXmlHandler { public: - CSiteManagerXmlHandler_Menu(wxMenu* pMenu, std::map> *idMap, bool predefined) + CSiteManagerXmlHandler_Menu(wxMenu* pMenu, std::map> *idMap, bool predefined) : m_pMenu(pMenu), m_idMap(idMap) { - m_added_site = false; - - if (predefined) + if (predefined) { path = _T("1"); - else + } + else { path = _T("0"); + } } unsigned int GetInsertIndex(wxMenu* pMenu, const wxString& name) { unsigned int i; - for (i = 0; i < pMenu->GetMenuItemCount(); ++i) - { + for (i = 0; i < pMenu->GetMenuItemCount(); ++i) { const wxMenuItem* const pItem = pMenu->FindItemByPosition(i); - if (!pItem) + if (!pItem) { continue; + } // Use same sorting as site tree in site manager #ifdef __WXMSW__ - if (pItem->GetItemLabelText().CmpNoCase(name) > 0) + if (pItem->GetItemLabelText().CmpNoCase(name) > 0) { break; + } #else - if (pItem->GetItemLabelText() > name) + if (pItem->GetItemLabelText() > name) { break; + } #endif } return i; } - virtual bool AddFolder(const wxString& name, bool) + virtual bool AddFolder(std::wstring const& name, bool) { m_parents.push_back(m_pMenu); m_childNames.push_back(name); @@ -148,43 +235,30 @@ return true; } - virtual bool AddSite(std::unique_ptr data) + virtual bool AddSite(std::unique_ptr data) { - wxString newName(data->m_server.GetName()); + wxString newName(data->server_.server.GetName()); int i = GetInsertIndex(m_pMenu, newName); newName.Replace(_T("&"), _T("&&")); wxMenuItem* pItem = m_pMenu->Insert(i, wxID_ANY, newName); - data->m_path = path + _T("/") + CSiteManager::EscapeSegment(data->m_server.GetName()); + data->m_path = path + _T("/") + CSiteManager::EscapeSegment(data->server_.server.GetName()); (*m_idMap)[pItem->GetId()] = std::move(data); - m_added_site = true; - - return true; - } - - virtual bool AddBookmark(const wxString&, std::unique_ptr) - { return true; } // Go up a level virtual bool LevelUp() { - if (m_added_site) - { - m_added_site = false; - return true; - } - - if (m_parents.empty() || m_childNames.empty()) + if (m_parents.empty() || m_childNames.empty()) { return false; + } wxMenu* pChild = m_pMenu; m_pMenu = m_parents.back(); - if (pChild->GetMenuItemCount()) - { + if (pChild->GetMenuItemCount()) { wxString name = m_childNames.back(); int i = GetInsertIndex(m_pMenu, name); name.Replace(_T("&"), _T("&&")); @@ -192,8 +266,9 @@ wxMenuItem* pItem = new wxMenuItem(m_pMenu, wxID_ANY, name, _T(""), wxITEM_NORMAL, pChild); m_pMenu->Insert(i, pItem); } - else + else { delete pChild; + } m_childNames.pop_back(); m_parents.pop_back(); @@ -206,36 +281,31 @@ protected: wxMenu* m_pMenu; - std::map> *m_idMap; + std::map> *m_idMap; - std::list m_parents; - std::list m_childNames; + std::deque m_parents; + std::deque m_childNames; - bool m_added_site; - - wxString path; - std::list m_paths; + std::wstring path; + std::deque m_paths; }; class CSiteManagerXmlHandler_Stats : public CSiteManagerXmlHandler { public: - virtual bool AddFolder(const wxString&, bool) + virtual bool AddFolder(std::wstring const&, bool) { ++directories_; return true; } - virtual bool AddSite(std::unique_ptr) + virtual bool AddSite(std::unique_ptr site) { - ++sites_; - return true; - } - - virtual bool AddBookmark(const wxString&, std::unique_ptr) - { - ++bookmarks_; + if (site) { + ++sites_; + bookmarks_ += site->m_bookmarks.size(); + } return true; } @@ -263,8 +333,9 @@ } if (pMenu) { - if (!predefinedSites) + if (!predefinedSites) { return pMenu; + } auto pRootMenu = std::make_unique(); pRootMenu->AppendSubMenu(predefinedSites.release(), _("Predefined Sites")); @@ -273,8 +344,9 @@ return pRootMenu; } - if (predefinedSites) + if (predefinedSites) { return predefinedSites; + } pMenu = std::make_unique(); wxMenuItem* pItem = pMenu->Append(wxID_ANY, _("No sites available")); @@ -290,19 +362,22 @@ bool CSiteManager::LoadPredefined(CSiteManagerXmlHandler& handler) { CLocalPath const defaultsDir = wxGetApp().GetDefaultsDir(); - if (defaultsDir.empty()) + if (defaultsDir.empty()) { return false; + } - wxString const name(defaultsDir.GetPath() + _T("fzdefaults.xml")); + std::wstring const name(defaultsDir.GetPath() + _T("fzdefaults.xml")); CXmlFile file(name); auto document = file.Load(); - if (!document) + if (!document) { return false; + } auto element = document.child("Servers"); - if (!element) + if (!element) { return false; + } if (!Load(element, handler)) { return false; @@ -311,7 +386,7 @@ return true; } -std::unique_ptr CSiteManager::GetSitesMenu_Predefined(std::map> &idMap) +std::unique_ptr CSiteManager::GetSitesMenu_Predefined(std::map> &idMap) { auto pMenu = std::make_unique(); CSiteManagerXmlHandler_Menu handler(pMenu.get(), &idMap, true); @@ -327,11 +402,11 @@ return pMenu; } -std::unique_ptr CSiteManager::GetSiteById(int id) +std::unique_ptr CSiteManager::GetSiteById(int id) { auto iter = m_idMap.find(id); - std::unique_ptr pData; + std::unique_ptr pData; if (iter != m_idMap.end()) { pData = std::move(iter->second); } @@ -340,79 +415,93 @@ return pData; } -bool CSiteManager::UnescapeSitePath(wxString path, std::list& result) +bool CSiteManager::UnescapeSitePath(std::wstring path, std::vector& result) { result.clear(); - wxString name; - wxChar const* p = path.c_str(); + std::wstring name; + wchar_t const* p = path.c_str(); // Undo escapement bool lastBackslash = false; - while (*p) - { + while (*p) { const wxChar& c = *p; - if (c == '\\') - { - if (lastBackslash) - { + if (c == '\\') { + if (lastBackslash) { name += _T("\\"); lastBackslash = false; } - else + else { lastBackslash = true; + } } - else if (c == '/') - { - if (lastBackslash) - { + else if (c == '/') { + if (lastBackslash) { name += _T("/"); lastBackslash = 0; } - else - { - if (!name.empty()) + else { + if (!name.empty()) { result.push_back(name); + } name.clear(); } } - else + else { name += *p; + } ++p; } - if (lastBackslash) + if (lastBackslash) { return false; - if (!name.empty()) + } + if (!name.empty()) { result.push_back(name); + } return !result.empty(); } -wxString CSiteManager::EscapeSegment(wxString segment) +std::wstring CSiteManager::EscapeSegment(std::wstring segment) { - segment.Replace(_T("\\"), _T("\\\\")); - segment.Replace(_T("/"), _T("\\/")); + fz::replace_substrings(segment, _T("\\"), _T("\\\\")); + fz::replace_substrings(segment, _T("/"), _T("\\/")); return segment; } -wxString CSiteManager::BuildPath(wxChar root, std::list const& segments) +std::wstring CSiteManager::BuildPath(wxChar root, std::vector const& segments) { - wxString ret = root; - for (std::list::const_iterator it = segments.begin(); it != segments.end(); ++it) - ret += _T("/") + EscapeSegment(*it); + std::wstring ret; + ret += root; + for (auto const& segment : segments) { + ret += _T("/") + EscapeSegment(segment); + } return ret; } -std::unique_ptr CSiteManager::GetSiteByPath(wxString sitePath) +std::pair, Bookmark> CSiteManager::GetSiteByPath(std::wstring const& sitePath, bool printErrors) { + wxString error; + + auto ret = DoGetSiteByPath(sitePath, error); + if (!ret.first && printErrors) { + wxMessageBoxEx(_("Site does not exist."), error); + } + + return ret; +} + +std::pair, Bookmark> CSiteManager::DoGetSiteByPath(std::wstring sitePath, wxString& error) +{ + std::pair, Bookmark> ret; wxChar c = sitePath.empty() ? 0 : sitePath[0]; if (c != '0' && c != '1') { - wxMessageBoxEx(_("Site path has to begin with 0 or 1."), _("Invalid site path")); - return 0; + error = _("Site path has to begin with 0 or 1."); + return ret; } - sitePath = sitePath.Mid(1); + sitePath = sitePath.substr(1); // We have to synchronize access to sitemanager.xml so that multiple processed don't write // to the same file or one is reading while the other one writes. @@ -425,8 +514,8 @@ else { CLocalPath const defaultsDir = wxGetApp().GetDefaultsDir(); if (defaultsDir.empty()) { - wxMessageBoxEx(_("Site does not exist."), _("Invalid site path")); - return 0; + error = _("Site does not exist."); + return ret; } file.SetFileName(defaultsDir.GetPath() + _T("fzdefaults.xml")); } @@ -434,25 +523,25 @@ auto document = file.Load(); if (!document) { wxMessageBoxEx(file.GetError(), _("Error loading xml file"), wxICON_ERROR); - return 0; + return ret; } auto element = document.child("Servers"); if (!element) { - wxMessageBoxEx(_("Site does not exist."), _("Invalid site path")); - return 0; + error = _("Site does not exist."); + return ret; } - std::list segments; + std::vector segments; if (!UnescapeSitePath(sitePath, segments) || segments.empty()) { - wxMessageBoxEx(_("Site path is malformed."), _("Invalid site path")); - return 0; + error = _("Site path is malformed."); + return ret; } auto child = GetElementByPath(element, segments); if (!child) { - wxMessageBoxEx(_("Site does not exist."), _("Invalid site path")); - return 0; + error = _("Site does not exist."); + return ret; } pugi::xml_node bookmark; @@ -462,99 +551,28 @@ segments.pop_back(); } - std::unique_ptr data = ReadServerElement(child); - - if (!data) { - wxMessageBoxEx(_("Could not read server item."), _("Invalid site path")); - return 0; - } - - if (bookmark) { - data->m_localDir = GetTextElement(bookmark, "LocalDir"); - data->m_remoteDir.SetSafePath(GetTextElement(bookmark, "RemoteDir")); - if (!data->m_localDir.empty() && !data->m_remoteDir.empty()) { - data->m_sync = GetTextElementBool(bookmark, "SyncBrowsing", false); - } - else - data->m_sync = false; - data->m_comparison = GetTextElementBool(bookmark, "DirectoryComparison", false); - } - - data->m_path = BuildPath( c, segments ); - - return data; -} - -bool CSiteManager::GetBookmarks(wxString sitePath, std::list &bookmarks) -{ - if (sitePath.empty()) - return false; - wxChar c = sitePath[0]; - if (c != '0' && c != '1') - return false; - - sitePath = sitePath.Mid(1); - - // We have to synchronize access to sitemanager.xml so that multiple processed don't write - // to the same file or one is reading while the other one writes. - CInterProcessMutex mutex(MUTEX_SITEMANAGER); - - CXmlFile file; - if (c == '0') { - file.SetFileName(wxGetApp().GetSettingsFile(_T("sitemanager"))); + ret.first = ReadServerElement(child); + if (!ret.first) { + error = _("Could not read server item."); } else { - CLocalPath const defaultsDir = wxGetApp().GetDefaultsDir(); - if (defaultsDir.empty()) { - wxMessageBoxEx(_("Site does not exist."), _("Invalid site path")); - return 0; + if (bookmark) { + Bookmark bm; + if (ReadBookmarkElement(bm, bookmark)) { + ret.second = bm; + } + } + else { + ret.second = ret.first->m_default_bookmark; } - file.SetFileName(defaultsDir.GetPath() + _T("fzdefaults.xml")); - } - - auto document = file.Load(); - if (!document) { - wxMessageBoxEx(file.GetError(), _("Error loading xml file"), wxICON_ERROR); - return false; - } - - auto element = document.child("Servers"); - if (!element) - return false; - - std::list segments; - if (!UnescapeSitePath(sitePath, segments)) { - wxMessageBoxEx(_("Site path is malformed."), _("Invalid site path")); - return 0; - } - - auto child = GetElementByPath(element, segments); - - if (child && !strcmp(child.name(), "Bookmark")) - child = child.parent(); - - if (!child || strcmp(child.name(), "Server")) - return 0; - - // Bookmarks - for (auto bookmark = child.child("Bookmark"); bookmark; bookmark = bookmark.next_sibling("Bookmark")) { - wxString name = GetTextElement_Trimmed(bookmark, "Name"); - if (name.empty()) - continue; - - wxString localPath = GetTextElement(bookmark, "LocalDir"); - CServerPath remotePath; - remotePath.SetSafePath(GetTextElement(bookmark, "RemoteDir")); - if (localPath.empty() && remotePath.empty()) - continue; - bookmarks.push_back(name); + ret.first->m_path = BuildPath(c, segments); } - return true; + return ret; } -wxString CSiteManager::AddServer(CServer server) +wxString CSiteManager::AddServer(ServerWithCredentials server) { // We have to synchronize access to sitemanager.xml so that multiple processed don't write // to the same file or one is reading while the other one writes. @@ -570,42 +588,47 @@ } auto element = document.child("Servers"); - if (!element) - return wxString(); + if (!element) { + element = document.append_child("Servers"); + } std::list names; for (auto child = element.child("Server"); child; child = child.next_sibling("Server")) { wxString name = GetTextElement(child, "Name"); - if (name.empty()) + if (name.empty()) { continue; + } names.push_back(name); } - wxString name = _("New site"); + std::wstring name = _("New site").ToStdWstring(); int i = 1; for (;;) { std::list::const_iterator iter; for (iter = names.begin(); iter != names.end(); ++iter) { - if (*iter == name) + if (*iter == name) { break; + } } - if (iter == names.end()) + if (iter == names.end()) { break; + } name = _("New site") + wxString::Format(_T(" %d"), ++i); } - server.SetName(name); + server.server.SetName(name); auto xServer = element.append_child("Server"); SetServer(xServer, server); AddTextElement(xServer, name); if (!file.Save(false)) { - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { return wxString(); + } wxString msg = wxString::Format(_("Could not write \"%s\", any changes to the Site Manager could not be saved: %s"), file.GetFileName(), file.GetError()); wxMessageBoxEx(msg, _("Error writing xml file"), wxICON_ERROR); @@ -615,27 +638,30 @@ return _T("0/") + EscapeSegment(name); } -pugi::xml_node CSiteManager::GetElementByPath(pugi::xml_node node, std::list const& segments) +pugi::xml_node CSiteManager::GetElementByPath(pugi::xml_node node, std::vector const& segments) { - for (std::list::const_iterator it = segments.begin(); it != segments.end(); ++it) { - const wxString & segment = *it; - + for (auto const& segment : segments) { pugi::xml_node child; for (child = node.first_child(); child; child = child.next_sibling()) { - if (strcmp(child.name(), "Server") && strcmp(child.name(), "Folder") && strcmp(child.name(), "Bookmark")) + if (strcmp(child.name(), "Server") && strcmp(child.name(), "Folder") && strcmp(child.name(), "Bookmark")) { continue; + } wxString name = GetTextElement_Trimmed(child, "Name"); - if (name.empty()) + if (name.empty()) { name = GetTextElement_Trimmed(child); - if (name.empty()) + } + if (name.empty()) { continue; + } - if (name == segment) + if (name == segment) { break; + } } - if (!child) + if (!child) { return pugi::xml_node(); + } node = child; continue; @@ -644,16 +670,18 @@ return node; } -bool CSiteManager::AddBookmark(wxString sitePath, const wxString& name, const wxString &local_dir, const CServerPath &remote_dir, bool sync, bool comparison) +bool CSiteManager::AddBookmark(std::wstring sitePath, const wxString& name, const wxString &local_dir, const CServerPath &remote_dir, bool sync, bool comparison) { - if (local_dir.empty() && remote_dir.empty()) + if (local_dir.empty() && remote_dir.empty()) { return false; + } - wxChar c = sitePath.empty() ? 0 : sitePath[0]; - if (c != '0') + auto const c = sitePath[0]; + if (c != '0') { return false; + } - sitePath = sitePath.Mid(1); + sitePath = sitePath.substr(1); // We have to synchronize access to sitemanager.xml so that multiple processed don't write // to the same file or one is reading while the other one writes. @@ -669,10 +697,11 @@ } auto element = document.child("Servers"); - if (!element) + if (!element) { return false; + } - std::list segments; + std::vector segments; if (!UnescapeSitePath(sitePath, segments)) { wxMessageBoxEx(_("Site path is malformed."), _("Invalid site path")); return 0; @@ -687,35 +716,44 @@ // Bookmarks pugi::xml_node insertBefore, bookmark; for (bookmark = child.child("Bookmark"); bookmark; bookmark = bookmark.next_sibling("Bookmark")) { - wxString old_name = GetTextElement_Trimmed(bookmark, "Name"); - if (old_name.empty()) + std::wstring old_name = GetTextElement_Trimmed(bookmark, "Name"); + if (old_name.empty()) { continue; + } if (name == old_name) { wxMessageBoxEx(_("Name of bookmark already exists."), _("New bookmark"), wxICON_EXCLAMATION); return false; } - if (name < old_name && !insertBefore) + if (name < old_name && !insertBefore) { insertBefore = bookmark; + } } - if (insertBefore) + if (insertBefore) { bookmark = child.insert_child_before("Bookmark", insertBefore); - else + } + else { bookmark = child.append_child("Bookmark"); - AddTextElement(bookmark, "Name", name); - if (!local_dir.empty()) - AddTextElement(bookmark, "LocalDir", local_dir); - if (!remote_dir.empty()) + } + AddTextElement(bookmark, "Name", name.ToStdWstring()); + if (!local_dir.empty()) { + AddTextElement(bookmark, "LocalDir", local_dir.ToStdWstring()); + } + if (!remote_dir.empty()) { AddTextElement(bookmark, "RemoteDir", remote_dir.GetSafePath()); - if (sync) - AddTextElementRaw(bookmark, "SyncBrowsing", "1"); - if (comparison) - AddTextElementRaw(bookmark, "DirectoryComparison", "1"); + } + if (sync) { + AddTextElementUtf8(bookmark, "SyncBrowsing", "1"); + } + if (comparison) { + AddTextElementUtf8(bookmark, "DirectoryComparison", "1"); + } if (!file.Save(false)) { - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { return true; + } wxString msg = wxString::Format(_("Could not write \"%s\", the selected sites could not be exported: %s"), file.GetFileName(), file.GetError()); wxMessageBoxEx(msg, _("Error writing xml file"), wxICON_ERROR); @@ -724,13 +762,14 @@ return true; } -bool CSiteManager::ClearBookmarks(wxString sitePath) +bool CSiteManager::ClearBookmarks(std::wstring sitePath) { wxChar const c = sitePath.empty() ? 0 : sitePath[0]; - if (c != '0') + if (c != '0') { return false; + } - sitePath = sitePath.Mid(1); + sitePath = sitePath.substr(1); // We have to synchronize access to sitemanager.xml so that multiple processed don't write // to the same file or one is reading while the other one writes. @@ -746,10 +785,11 @@ } auto element = document.child("Servers"); - if (!element) + if (!element) { return false; + } - std::list segments; + std::vector segments; if (!UnescapeSitePath(sitePath, segments)) { wxMessageBoxEx(_("Site path is malformed."), _("Invalid site path")); return 0; @@ -768,8 +808,9 @@ } if (!file.Save(false)) { - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { return true; + } wxString msg = wxString::Format(_("Could not write \"%s\", the selected sites could not be exported: %s"), file.GetFileName(), file.GetError()); wxMessageBoxEx(msg, _("Error writing xml file"), wxICON_ERROR); @@ -785,3 +826,106 @@ return handler.sites_ > 0; } + +wxColour CSiteManager::GetColourFromIndex(int i) +{ + if (i < 0 || static_cast(i) + 1 >= (sizeof(background_colors) / sizeof(background_color) + 1)) { + return wxColour(); + } + return background_colors[i].color; +} + +int CSiteManager::GetColourIndex(wxColour const& c) +{ + for (int i = 0; background_colors[i].name; ++i) { + if (c == background_colors[i].color) { + return i; + } + } + + return 0; +} + +wxString CSiteManager::GetColourName(int i) +{ + if (i < 0 || static_cast(i) + 1 >= (sizeof(background_colors) / sizeof(background_color))) { + return wxString(); + } + return wxGetTranslation(background_colors[i].name); +} + +void CSiteManager::Rewrite(CLoginManager & loginManager, pugi::xml_node element, bool on_failure_set_to_ask) +{ + for (auto child = element.first_child(); child; child = child.next_sibling()) { + if (!strcmp(child.name(), "Folder")) { + Rewrite(loginManager, child, on_failure_set_to_ask); + } + else if (!strcmp(child.name(), "Server")) { + auto site = ReadServerElement(child); + if (site) { + loginManager.AskDecryptor(site->server_.credentials.encrypted_, true, false); + site->server_.credentials.Unprotect(loginManager.GetDecryptor(site->server_.credentials.encrypted_), on_failure_set_to_ask); + Save(child, *site); + } + } + } +} + +void CSiteManager::Rewrite(CLoginManager & loginManager, bool on_failure_set_to_ask) +{ + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { + return; + } + CInterProcessMutex mutex(MUTEX_SITEMANAGER); + + CXmlFile file(wxGetApp().GetSettingsFile(_T("sitemanager"))); + auto document = file.Load(); + if (!document) { + wxMessageBoxEx(file.GetError(), _("Error loading xml file"), wxICON_ERROR); + return; + } + + auto element = document.child("Servers"); + if (!element) { + return; + } + + Rewrite(loginManager, element, on_failure_set_to_ask); + + file.Save(true); +} + +void CSiteManager::Save(pugi::xml_node element, Site const& site) +{ + SetServer(element, site.server_); + + // Save comments + AddTextElement(element, "Comments", site.m_comments.ToStdWstring()); + + // Save colour + AddTextElement(element, "Colour", CSiteManager::GetColourIndex(site.m_colour)); + + // Save local dir + AddTextElement(element, "LocalDir", site.m_default_bookmark.m_localDir.ToStdWstring()); + + // Save remote dir + AddTextElement(element, "RemoteDir", site.m_default_bookmark.m_remoteDir.GetSafePath()); + + AddTextElementUtf8(element, "SyncBrowsing", site.m_default_bookmark.m_sync ? "1" : "0"); + AddTextElementUtf8(element, "DirectoryComparison", site.m_default_bookmark.m_comparison ? "1" : "0"); + + for (auto const& bookmark : site.m_bookmarks) { + auto node = element.append_child("Bookmark"); + + AddTextElement(node, "Name", bookmark.m_name.ToStdWstring()); + + // Save local dir + AddTextElement(node, "LocalDir", bookmark.m_localDir.ToStdWstring()); + + // Save remote dir + AddTextElement(node, "RemoteDir", bookmark.m_remoteDir.GetSafePath()); + + AddTextElementUtf8(node, "SyncBrowsing", bookmark.m_sync ? "1" : "0"); + AddTextElementUtf8(node, "DirectoryComparison", bookmark.m_comparison ? "1" : "0"); + } +} diff -Nru filezilla-3.15.0.2/src/interface/sitemanager_dialog.cpp filezilla-3.33.0/src/interface/sitemanager_dialog.cpp --- filezilla-3.15.0.2/src/interface/sitemanager_dialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/sitemanager_dialog.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -1,6 +1,7 @@ #include #include "sitemanager_dialog.h" +#include "asksavepassworddialog.h" #include "buildinfo.h" #include "conditionaldialog.h" #include "drop_target_ex.h" @@ -13,7 +14,13 @@ #include "wrapengine.h" #include "xmlfunctions.h" #include "fzputtygen_interface.h" +#if ENABLE_STORJ +#include "storj_key_interface.h" +#endif #include "xrc_helper.h" +#if USE_MAC_SANDBOX +#include "osx_sandbox_userdirs.h" +#endif #include #include @@ -21,6 +28,7 @@ #include #include +#include #ifdef __WXMSW__ #include "commctrl.h" @@ -54,8 +62,32 @@ EVT_MENU(XRCID("ID_EXPORT"), CSiteManagerDialog::OnExportSelected) EVT_BUTTON(XRCID("ID_NEWBOOKMARK"), CSiteManagerDialog::OnNewBookmark) EVT_BUTTON(XRCID("ID_BOOKMARK_BROWSE"), CSiteManagerDialog::OnBookmarkBrowse) +EVT_BUTTON(XRCID("ID_ENCRYPTIONKEY_GENERATE"), CSiteManagerDialog::OnGenerateEncryptionKey) END_EVENT_TABLE() +std::array const ftpSubOptions{ FTP, FTPES, FTPS, INSECURE_FTP }; + +class CSiteManagerItemData : public wxTreeItemData +{ +public: + CSiteManagerItemData() = default; + + CSiteManagerItemData(std::unique_ptr && site) + : m_site(std::move(site)) + {} + + // While inside tree, the contents of the path and bookmarks members are inconsistent + std::unique_ptr m_site; + + // While inside tree, the nam member is inconsistent + std::unique_ptr m_bookmark; + + // Needed to keep track of currently connected sites so that + // bookmarks and bookmark path can be updated in response to + // changes done here + int connected_item{-1}; +}; + class CSiteManagerDialogDataObject : public wxDataObjectSimple { public: @@ -72,7 +104,7 @@ virtual bool SetData(size_t, const void *) { return true; } }; -class CSiteManagerDropTarget : public CScrollableDropTarget +class CSiteManagerDropTarget final : public CScrollableDropTarget { public: CSiteManagerDropTarget(CSiteManagerDialog* pSiteManager) @@ -82,55 +114,79 @@ m_pSiteManager = pSiteManager; } - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) + bool IsValidDropLocation(wxTreeItemId const& hit, wxDragResult const& def) { - ClearDropHighlight(); - if (def == wxDragError || - def == wxDragNone || - def == wxDragCancel) - { - return def; + if (!hit) { + return false; + } + if (hit == m_pSiteManager->m_dropSource) { + return false; } - - wxTreeItemId hit = GetHit(wxPoint(x, y)); - if (!hit) - return wxDragNone; - if (hit == m_pSiteManager->m_dropSource) - return wxDragNone; const bool predefined = m_pSiteManager->IsPredefinedItem(hit); - if (predefined) - return wxDragNone; + if (predefined) { + return false; + } wxTreeCtrl *pTree = XRCCTRL(*m_pSiteManager, "ID_SITETREE", wxTreeCtrl); + if (!pTree) { + return false; + } + CSiteManagerItemData *pData = (CSiteManagerItemData *)pTree->GetItemData(hit); CSiteManagerItemData *pSourceData = (CSiteManagerItemData *)pTree->GetItemData(m_pSiteManager->m_dropSource); - if (pData) - { - if (pData->m_type == CSiteManagerItemData::BOOKMARK) - return wxDragNone; - if (!pSourceData || pSourceData->m_type != CSiteManagerItemData::BOOKMARK) - return wxDragNone; + if (pData) { + // Cannot drop on bookmark + if (!pData->m_site) { + return false; + } + + // If dropping on a site, source needs to be a bookmark + if (!pSourceData || pSourceData->m_site) { + return false; + } + } + // Target is a directory, so source must not be a bookmark + else if (pSourceData && !pSourceData->m_site) { + return false; } - else if (pSourceData && pSourceData->m_type == CSiteManagerItemData::BOOKMARK) - return wxDragNone; + // Disallow dragging into own child wxTreeItemId item = hit; - while (item != pTree->GetRootItem()) - { - if (item == m_pSiteManager->m_dropSource) - { + while (item != pTree->GetRootItem()) { + if (item == m_pSiteManager->m_dropSource) { ClearDropHighlight(); return wxDragNone; } item = pTree->GetItemParent(item); } - if (def == wxDragMove && pTree->GetItemParent(m_pSiteManager->m_dropSource) == hit) + // If moving, disallow moving to direct parent + if (def == wxDragMove && pTree->GetItemParent(m_pSiteManager->m_dropSource) == hit) { + return false; + } + + return true; + } + + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) + { + ClearDropHighlight(); + if (def == wxDragError || + def == wxDragNone || + def == wxDragCancel) + { + return def; + } + + wxTreeItemId hit = GetHit(wxPoint(x, y)); + if (!IsValidDropLocation(hit, def)) { return wxDragNone; + } - if (!m_pSiteManager->MoveItems(m_pSiteManager->m_dropSource, hit, def == wxDragCopy)) + if (!m_pSiteManager->MoveItems(m_pSiteManager->m_dropSource, hit, def == wxDragCopy)) { return wxDragNone; + } return def; } @@ -141,37 +197,8 @@ ClearDropHighlight(); wxTreeItemId hit = GetHit(wxPoint(x, y)); - if (!hit) - return false; - if (hit == m_pSiteManager->m_dropSource) - return false; - - const bool predefined = m_pSiteManager->IsPredefinedItem(hit); - if (predefined) - return false; - - wxTreeCtrl *pTree = XRCCTRL(*m_pSiteManager, "ID_SITETREE", wxTreeCtrl); - CSiteManagerItemData *pData = (CSiteManagerItemData *)pTree->GetItemData(hit); - CSiteManagerItemData *pSourceData = (CSiteManagerItemData *)pTree->GetItemData(m_pSiteManager->m_dropSource); - if (pData) - { - if (pData->m_type == CSiteManagerItemData::BOOKMARK) - return false; - if (!pSourceData || pSourceData->m_type != CSiteManagerItemData::BOOKMARK) - return false; - } - else if (pSourceData && pSourceData->m_type == CSiteManagerItemData::BOOKMARK) - return false; - - wxTreeItemId item = hit; - while (item != pTree->GetRootItem()) - { - if (item == m_pSiteManager->m_dropSource) - { - ClearDropHighlight(); - return false; - } - item = pTree->GetItemParent(item); + if (!IsValidDropLocation(hit, wxDragCopy)) { + return wxDragNone; } return true; @@ -196,8 +223,9 @@ wxTreeCtrl *pTree = XRCCTRL(*m_pSiteManager, "ID_SITETREE", wxTreeCtrl); wxTreeItemId hit = pTree->HitTest(point, flags); - if (flags & (wxTREE_HITTEST_ABOVE | wxTREE_HITTEST_BELOW | wxTREE_HITTEST_NOWHERE | wxTREE_HITTEST_TOLEFT | wxTREE_HITTEST_TORIGHT)) + if (flags & (wxTREE_HITTEST_ABOVE | wxTREE_HITTEST_BELOW | wxTREE_HITTEST_NOWHERE | wxTREE_HITTEST_TOLEFT | wxTREE_HITTEST_TORIGHT)) { return wxTreeItemId(); + } return hit; } @@ -215,61 +243,8 @@ } wxTreeItemId hit = GetHit(wxPoint(x, y)); - if (!hit) - { - ClearDropHighlight(); - return wxDragNone; - } - if (hit == m_pSiteManager->m_dropSource) - { - ClearDropHighlight(); - return wxDragNone; - } - - const bool predefined = m_pSiteManager->IsPredefinedItem(hit); - if (predefined) - { - ClearDropHighlight(); - return wxDragNone; - } - - wxTreeCtrl *pTree = XRCCTRL(*m_pSiteManager, "ID_SITETREE", wxTreeCtrl); - CSiteManagerItemData *pData = static_cast(pTree->GetItemData(hit)); - CSiteManagerItemData *pSourceData = (CSiteManagerItemData *)pTree->GetItemData(m_pSiteManager->m_dropSource); - if (pData) - { - if (pData->m_type == CSiteManagerItemData::BOOKMARK) - { - ClearDropHighlight(); - return wxDragNone; - } - if (!pSourceData || pSourceData->m_type != CSiteManagerItemData::BOOKMARK) - { - ClearDropHighlight(); - return wxDragNone; - } - } - else if (pSourceData && pSourceData->m_type == CSiteManagerItemData::BOOKMARK) - { - ClearDropHighlight(); - return wxDragNone; - } - - wxTreeItemId item = hit; - while (item != pTree->GetRootItem()) - { - if (item == m_pSiteManager->m_dropSource) - { - ClearDropHighlight(); - return wxDragNone; - } - item = pTree->GetItemParent(item); - } - - if (def == wxDragMove && pTree->GetItemParent(m_pSiteManager->m_dropSource) == hit) - { + if (!IsValidDropLocation(hit, def)) { ClearDropHighlight(); - return wxDragNone; } DisplayDropHighlight(wxPoint(x, y)); @@ -314,21 +289,21 @@ { delete m_pSiteManagerMutex; - if (m_pWindowStateManager) - { + if (m_pWindowStateManager) { m_pWindowStateManager->Remember(OPTION_SITEMANAGER_POSITION); delete m_pWindowStateManager; } } -bool CSiteManagerDialog::Create(wxWindow* parent, std::vector<_connected_site> *connected_sites, const CServer* pServer /*=0*/) +bool CSiteManagerDialog::Create(wxWindow* parent, std::vector<_connected_site> *connected_sites, ServerWithCredentials const* pServer) { m_pSiteManagerMutex = new CInterProcessMutex(MUTEX_SITEMANAGERGLOBAL, false); if (m_pSiteManagerMutex->TryLock() == 0) { int answer = wxMessageBoxEx(_("The Site Manager is opened in another instance of FileZilla 3.\nDo you want to continue? Any changes made in the Site Manager won't be saved then."), _("Site Manager already open"), wxYES_NO | wxICON_QUESTION); - if (answer != wxYES) + if (answer != wxYES) { return false; + } delete m_pSiteManagerMutex; m_pSiteManagerMutex = 0; @@ -337,20 +312,27 @@ // Now create the imagelist for the site tree wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); - if (!pTree) + if (!pTree) { return false; + } wxSize s = CThemeProvider::GetIconSize(iconSizeSmall); wxImageList* pImageList = new wxImageList(s.x, s.y); - pImageList->Add(wxArtProvider::GetBitmap(_T("ART_FOLDERCLOSED"), wxART_OTHER, s)); - pImageList->Add(wxArtProvider::GetBitmap(_T("ART_FOLDER"), wxART_OTHER, s)); - pImageList->Add(wxArtProvider::GetBitmap(_T("ART_SERVER"), wxART_OTHER, s)); - pImageList->Add(wxArtProvider::GetBitmap(_T("ART_BOOKMARK"), wxART_OTHER, s)); + pImageList->Add(CThemeProvider::Get()->CreateBitmap(_T("ART_FOLDERCLOSED"), wxART_OTHER, s)); + pImageList->Add(CThemeProvider::Get()->CreateBitmap(_T("ART_FOLDER"), wxART_OTHER, s)); + pImageList->Add(CThemeProvider::Get()->CreateBitmap(_T("ART_SERVER"), wxART_OTHER, s)); + pImageList->Add(CThemeProvider::Get()->CreateBitmap(_T("ART_BOOKMARK"), wxART_OTHER, s)); pTree->AssignImageList(pImageList); m_pNotebook_Site = XRCCTRL(*this, "ID_NOTEBOOK", wxNotebook); + m_totalPages = m_pNotebook_Site->GetPageCount(); + m_pCharsetPage = XRCCTRL(*this, "ID_CHARSET_PANEL", wxPanel); + if (m_pCharsetPage) { + m_charsetPageIndex = m_pNotebook_Site->FindPage(m_pCharsetPage); + m_charsetPageText = m_pNotebook_Site->GetPageText(m_charsetPageIndex); + } #ifdef __WXMSW__ // Make pages at least wide enough to fit all tabs @@ -369,8 +351,7 @@ // Make pages at least wide enough to fit all tabs int width = 10; // Guessed wxClientDC dc(m_pNotebook_Site); - for (unsigned int i = 0; i < m_pNotebook_Site->GetPageCount(); ++i) - { + for (unsigned int i = 0; i < m_pNotebook_Site->GetPageCount(); ++i) { wxCoord w, h; dc.GetTextExtent(m_pNotebook_Site->GetPageText(i), &w, &h); @@ -383,8 +364,7 @@ } wxSize page_min_size = m_pNotebook_Site->GetPage(0)->GetSizer()->GetMinSize(); - if (page_min_size.x < width) - { + if (page_min_size.x < width) { page_min_size.x = width; m_pNotebook_Site->GetPage(0)->GetSizer()->SetMinSize(page_min_size); } @@ -408,7 +388,8 @@ // Set min height of encryption row wxSize descSize = XRCCTRL(*this, "ID_ENCRYPTION_DESC", wxWindow)->GetSize(); wxSize encSize = XRCCTRL(*this, "ID_ENCRYPTION", wxWindow)->GetSize(); - xrc_call(*this, "ID_ENCRYPTION", &wxWindow::GetContainingSizer)->GetItem(1)->SetMinSize(0, std::max(descSize.GetHeight(), encSize.GetHeight())); + auto encSizer = xrc_call(*this, "ID_ENCRYPTION", &wxWindow::GetContainingSizer); + encSizer->GetItem(encSizer->GetItemCount() - 1)->SetMinSize(0, std::max(descSize.GetHeight(), encSize.GetHeight())); // Load bookmark notebook m_pNotebook_Bookmark = new wxNotebook(m_pNotebook_Site->GetParent(), -1); @@ -420,6 +401,14 @@ pSizer->Add(m_pNotebook_Bookmark, 1, wxGROW); pSizer->SetItemMinSize(1, pSizer->GetItem((size_t)0)->GetMinSize().GetWidth(), -1); + // Set min size of tree to actual size of tree. + // Otherwise some platforms automatically calculate a min size fitting all items, + // resulting in a huge dialog if there are many sites. + wxSize const treeSize = pTree->GetSize(); + if (treeSize.IsFullySpecified()) { + pTree->SetMinSize(treeSize); + } + if (!Load()) { return false; } @@ -429,8 +418,9 @@ XRCCTRL(*this, "ID_TRANSFERMODE_PASSIVE", wxRadioButton)->Update(); wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { pTree->SafeSelectItem(m_ownSites); + } SetCtrlState(); m_pWindowStateManager = new CWindowStateManager(this); @@ -441,114 +431,149 @@ #ifdef __WXGTK__ { CSiteManagerItemData* data = 0; - wxTreeItemId item = pTree->GetSelection(); - if (item.IsOk()) - data = static_cast(pTree->GetItemData(item)); - if (!data) + wxTreeItemId selected = pTree->GetSelection(); + if (selected.IsOk()) { + data = static_cast(pTree->GetItemData(selected)); + } + if (!data) { XRCCTRL(*this, "wxID_OK", wxButton)->SetFocus(); + } } #endif m_connected_sites = connected_sites; MarkConnectedSites(); - if (pServer) + if (pServer && *pServer) { CopyAddServer(*pServer); + } return true; } void CSiteManagerDialog::MarkConnectedSites() { - for (int i = 0; i < (int)m_connected_sites->size(); ++i) + for (int i = 0; i < (int)m_connected_sites->size(); ++i) { MarkConnectedSite(i); + } } void CSiteManagerDialog::MarkConnectedSite(int connected_site) { - wxString connected_site_path = (*m_connected_sites)[connected_site].old_path; + std::wstring const& connected_site_path = (*m_connected_sites)[connected_site].old_path; + if (connected_site_path.empty()) { + return; + } wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } - if (connected_site_path.Left(1) == _T("1")) - { + if (connected_site_path[0] == '1') { // Default sites never change (*m_connected_sites)[connected_site].new_path = (*m_connected_sites)[connected_site].old_path; return; } - if (connected_site_path.Left(1) != _T("0")) + if (connected_site_path[0] != '0') { return; + } - std::list segments; - if (!CSiteManager::UnescapeSitePath(connected_site_path.Mid(1), segments)) + std::vector segments; + if (!CSiteManager::UnescapeSitePath(connected_site_path.substr(1), segments)) { return; + } wxTreeItemId current = m_ownSites; - while (!segments.empty()) - { + for (auto const& segment : segments) { wxTreeItemIdValue c; wxTreeItemId child = pTree->GetFirstChild(current, c); - while (child) - { - if (pTree->GetItemText(child) == segments.front()) + while (child) { + if (pTree->GetItemText(child) == segment) { break; + } child = pTree->GetNextChild(current, c); } - if (!child) + if (!child) { return; + } - segments.pop_front(); current = child; } CSiteManagerItemData* data = static_cast(pTree->GetItemData(current)); - if (!data || data->m_type != CSiteManagerItemData::SITE) + if (!data || !data->m_site) { return; + } - CSiteManagerItemData_Site *site_data = static_cast(data); - wxASSERT(site_data->connected_item == -1); - site_data->connected_item = connected_site; + wxASSERT(data->connected_item == -1); + data->connected_item = connected_site; } void CSiteManagerDialog::CreateControls(wxWindow* parent) { - if( !wxDialogEx::Load(parent, _T("ID_SITEMANAGER"))) { + if (!wxDialogEx::Load(parent, _T("ID_SITEMANAGER"))) { return; } wxChoice *pProtocol = XRCCTRL(*this, "ID_PROTOCOL", wxChoice); - pProtocol->Append(_("FTP - File Transfer Protocol")); - pProtocol->Append(CServer::GetProtocolName(SFTP)); + mainProtocolListIndex_[FTP] = pProtocol->Append(_("FTP - File Transfer Protocol")); + for (auto const& proto : CServer::GetDefaultProtocols()) { + if (std::find(ftpSubOptions.cbegin(), ftpSubOptions.cend(), proto) == ftpSubOptions.cend()) { + mainProtocolListIndex_[proto] = pProtocol->Append(CServer::GetProtocolName(proto)); + } + else { + mainProtocolListIndex_[proto] = mainProtocolListIndex_[FTP]; + } + } wxChoice *pChoice = XRCCTRL(*this, "ID_SERVERTYPE", wxChoice); wxASSERT(pChoice); - for (int i = 0; i < SERVERTYPE_MAX; ++i) - pChoice->Append(CServer::GetNameFromServerType((enum ServerType)i)); + for (int i = 0; i < SERVERTYPE_MAX; ++i) { + pChoice->Append(CServer::GetNameFromServerType(static_cast(i))); + } pChoice = XRCCTRL(*this, "ID_LOGONTYPE", wxChoice); wxASSERT(pChoice); - for (int i = 0; i < LOGONTYPE_MAX; ++i) - pChoice->Append(CServer::GetNameFromLogonType((enum LogonType)i)); + for (int i = 0; i < static_cast(LogonType::count); ++i) { + pChoice->Append(GetNameFromLogonType(static_cast(i))); + } wxChoice* pEncryption = XRCCTRL(*this, "ID_ENCRYPTION", wxChoice); + + // Order must match ftpSubOptions pEncryption->Append(_("Use explicit FTP over TLS if available")); pEncryption->Append(_("Require explicit FTP over TLS")); pEncryption->Append(_("Require implicit FTP over TLS")); pEncryption->Append(_("Only use plain FTP (insecure)")); pEncryption->SetSelection(0); + + wxChoice* pColors = XRCCTRL(*this, "ID_COLOR", wxChoice); + if (pColors) { + for (int i = 0; ; ++i) { + wxString name = CSiteManager::GetColourName(i); + if (name.empty()) { + break; + } + pColors->AppendString(wxGetTranslation(name)); + } + } } void CSiteManagerDialog::OnOK(wxCommandEvent&) { - if (!Verify()) + if (!Verify()) { return; + } UpdateItem(); + if (!CAskSavePasswordDialog::Run(this)) { + return; + } + Save(); RememberLastSelected(); @@ -564,28 +589,32 @@ void CSiteManagerDialog::OnConnect(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return; + } CSiteManagerItemData* data = static_cast(pTree->GetItemData(item)); - if (!data) - { + if (!data) { wxBell(); return; } - if (!Verify()) - { + if (!Verify()) { wxBell(); return; } UpdateItem(); + if (!CAskSavePasswordDialog::Run(this)) { + return; + } + Save(); RememberLastSelected(); @@ -596,11 +625,14 @@ class CSiteManagerXmlHandler_Tree : public CSiteManagerXmlHandler { public: - CSiteManagerXmlHandler_Tree(wxTreeCtrlEx* pTree, wxTreeItemId root, const wxString& lastSelection, bool predefined) + CSiteManagerXmlHandler_Tree(wxTreeCtrlEx* pTree, wxTreeItemId root, std::wstring const& lastSelection, bool predefined) : m_pTree(pTree), m_item(root), m_predefined(predefined) { - if (!CSiteManager::UnescapeSitePath(lastSelection, m_lastSelection)) + if (!CSiteManager::UnescapeSitePath(lastSelection, m_lastSelection)) { m_lastSelection.clear(); + } + m_lastSelectionIt = m_lastSelection.cbegin(); + m_wrong_sel_depth = 0; m_kiosk = COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE); } @@ -611,7 +643,7 @@ m_pTree->Expand(m_item); } - virtual bool AddFolder(const wxString& name, bool expanded) + virtual bool AddFolder(std::wstring const& name, bool expanded) { wxTreeItemId newItem = m_pTree->AppendItem(m_item, name, 0, 0); m_pTree->SetItemImage(newItem, 1, wxTreeItemIcon_Expanded); @@ -620,66 +652,72 @@ m_item = newItem; m_expand.push_back(expanded); - if (!m_wrong_sel_depth && !m_lastSelection.empty()) - { - const wxString& first = m_lastSelection.front(); - if (first == name) - { - m_lastSelection.pop_front(); - if (m_lastSelection.empty()) + if (!m_wrong_sel_depth && m_lastSelectionIt != m_lastSelection.cend()) { + if (*m_lastSelectionIt == name) { + ++m_lastSelectionIt; + if (m_lastSelectionIt == m_lastSelection.cend()) { m_pTree->SafeSelectItem(newItem); + } } - else + else { ++m_wrong_sel_depth; + } } - else + else { ++m_wrong_sel_depth; + } return true; } - virtual bool AddSite(std::unique_ptr data) + virtual bool AddSite(std::unique_ptr data) { if (m_kiosk && !m_predefined && - data->m_server.GetLogonType() == NORMAL) + data->server_.credentials.logonType_ == LogonType::normal) { // Clear saved password - data->m_server.SetLogonType(ASK); - data->m_server.SetUser(data->m_server.GetUser()); + data->server_.SetLogonType(LogonType::ask); + data->server_.credentials.SetPass(std::wstring()); } - const wxString name(data->m_server.GetName()); - - wxTreeItemId newItem = m_pTree->AppendItem(m_item, name, 2, 2, data.release()); + const wxString name(data->server_.server.GetName()); - m_item = newItem; - m_expand.push_back(true); + CSiteManagerItemData* pData = new CSiteManagerItemData(std::move(data)); + wxTreeItemId newItem = m_pTree->AppendItem(m_item, name, 2, 2, pData); - if (!m_wrong_sel_depth && !m_lastSelection.empty()) { - const wxString& first = m_lastSelection.front(); - if (first == name) { - m_lastSelection.pop_front(); - if (m_lastSelection.empty()) + bool can_select = false; + if (!m_wrong_sel_depth && m_lastSelectionIt != m_lastSelection.cend()) { + if (*m_lastSelectionIt == name) { + ++m_lastSelectionIt; + can_select = true; + if (m_lastSelectionIt == m_lastSelection.cend()) { m_pTree->SafeSelectItem(newItem); + } } - else - ++m_wrong_sel_depth; } - else - ++m_wrong_sel_depth; + + for (auto const& bookmark : pData->m_site->m_bookmarks) { + AddBookmark(newItem, bookmark, can_select); + } + + m_pTree->SortChildren(newItem); + m_pTree->Expand(newItem); return true; } - virtual bool AddBookmark(const wxString& name, std::unique_ptr data) + bool AddBookmark(wxTreeItemId const& parent, Bookmark const& bookmark, bool can_select) { - wxTreeItemId newItem = m_pTree->AppendItem(m_item, name, 3, 3, data.release()); - - if (!m_wrong_sel_depth && !m_lastSelection.empty()) { - const wxString& first = m_lastSelection.front(); - if (first == name) { - m_lastSelection.clear(); - m_pTree->SafeSelectItem(newItem); + CSiteManagerItemData* pData = new CSiteManagerItemData; + pData->m_bookmark = std::make_unique(bookmark); + wxTreeItemId newItem = m_pTree->AppendItem(parent, bookmark.m_name, 3, 3, pData); + + if (can_select && m_lastSelectionIt != m_lastSelection.cend()) { + if (*m_lastSelectionIt == bookmark.m_name) { + ++m_lastSelectionIt; + if (m_lastSelectionIt == m_lastSelection.cend()) { + m_pTree->SafeSelectItem(newItem); + } } } @@ -688,11 +726,11 @@ virtual bool LevelUp() { - if (m_wrong_sel_depth) + if (m_wrong_sel_depth) { m_wrong_sel_depth--; + } - if (!m_expand.empty()) - { + if (!m_expand.empty()) { const bool expand = m_expand.back(); m_expand.pop_back(); if (expand) @@ -712,10 +750,11 @@ wxTreeCtrlEx* m_pTree; wxTreeItemId m_item; - std::list m_lastSelection; + std::vector m_lastSelection; + std::vector::const_iterator m_lastSelectionIt; int m_wrong_sel_depth; - std::list m_expand; + std::vector m_expand; bool m_predefined; int m_kiosk; @@ -735,10 +774,12 @@ // Load default sites bool hasDefaultSites = LoadDefaultSites(); - if (hasDefaultSites) + if (hasDefaultSites) { m_ownSites = pTree->AppendItem(pTree->GetRootItem(), _("My Sites"), 0, 0); - else + } + else { m_ownSites = pTree->AddRoot(_("My Sites"), 0, 0); + } wxTreeItemId treeId = m_ownSites; pTree->SetItemImage(treeId, 1, wxTreeItemIcon_Expanded); @@ -761,33 +802,38 @@ } auto element = document.child("Servers"); - if (!element) + if (!element) { return true; + } - wxString lastSelection = COptions::Get()->GetOption(OPTION_SITEMANAGER_LASTSELECTED); + std::wstring lastSelection = COptions::Get()->GetOption(OPTION_SITEMANAGER_LASTSELECTED); if (!lastSelection.empty() && lastSelection[0] == '0') { - if (lastSelection == _T("0")) + if (lastSelection == _T("0")) { pTree->SafeSelectItem(treeId); - else - lastSelection = lastSelection.Mid(1); + } + else { + lastSelection = lastSelection.substr(1); + } } - else + else { lastSelection.clear(); + } CSiteManagerXmlHandler_Tree handler(pTree, treeId, lastSelection, false); bool res = CSiteManager::Load(element, handler); pTree->SortChildren(treeId); pTree->Expand(treeId); - if (!pTree->GetSelection()) + if (!pTree->GetSelection()) { pTree->SafeSelectItem(treeId); + } pTree->EnsureVisible(pTree->GetSelection()); return res; } -bool CSiteManagerDialog::Save(pugi::xml_node element /*=0*/, wxTreeItemId treeId /*=wxTreeItemId()*/) +bool CSiteManagerDialog::Save(pugi::xml_node element, wxTreeItemId treeId) { if (!m_pSiteManagerMutex) return false; @@ -848,10 +894,11 @@ bool CSiteManagerDialog::SaveChild(pugi::xml_node element, wxTreeItemId child) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return false; + } - wxString const name = pTree->GetItemText(child); + std::wstring const name = pTree->GetItemText(child).ToStdWstring(); CSiteManagerItemData* data = static_cast(pTree->GetItemData(child)); if (!data) { @@ -861,47 +908,31 @@ AddTextElement(node, name); Save(node, child); } - else if (data->m_type == CSiteManagerItemData::SITE) { - CSiteManagerItemData_Site *site_data = static_cast(data); + else if (data->m_site) { auto node = element.append_child("Server"); - SetServer(node, site_data->m_server); - - // Save comments - AddTextElement(node, "Comments", site_data->m_comments); - // Save local dir - AddTextElement(node, "LocalDir", data->m_localDir); + // Update bookmarks + data->m_site->m_bookmarks.clear(); - // Save remote dir - AddTextElement(node, "RemoteDir", data->m_remoteDir.GetSafePath()); - - AddTextElementRaw(node, "SyncBrowsing", data->m_sync ? "1" : "0"); - AddTextElementRaw(node, "DirectoryComparison", data->m_comparison ? "1" : "0"); - AddTextElement(node, name); - - Save(node, child); + wxTreeItemIdValue cookie; + wxTreeItemId bookmarkChild = pTree->GetFirstChild(child, cookie); + while (bookmarkChild.IsOk()) { + CSiteManagerItemData* bookmarkData = static_cast(pTree->GetItemData(bookmarkChild)); + wxASSERT(bookmarkData->m_bookmark); + bookmarkData->m_bookmark->m_name = pTree->GetItemText(bookmarkChild).ToStdWstring(); + data->m_site->m_bookmarks.push_back(*bookmarkData->m_bookmark); + bookmarkChild = pTree->GetNextChild(child, cookie); + } - if (site_data->connected_item != -1) { - if ((*m_connected_sites)[site_data->connected_item].server == site_data->m_server) { - (*m_connected_sites)[site_data->connected_item].new_path = GetSitePath(child); - (*m_connected_sites)[site_data->connected_item].server = site_data->m_server; + CSiteManager::Save(node, *data->m_site); + + if (data->connected_item != -1) { + if ((*m_connected_sites)[data->connected_item].server.server == data->m_site->server_.server) { + (*m_connected_sites)[data->connected_item].new_path = GetSitePath(child); + (*m_connected_sites)[data->connected_item].server = data->m_site->server_; } } } - else { - auto node = element.append_child("Bookmark"); - - AddTextElement(node, "Name", name); - - // Save local dir - AddTextElement(node, "LocalDir", data->m_localDir); - - // Save remote dir - AddTextElement(node, "RemoteDir", data->m_remoteDir.GetSafePath()); - - AddTextElementRaw(node, "SyncBrowsing", data->m_sync ? "1" : "0"); - AddTextElementRaw(node, "DirectoryComparison", data->m_comparison ? "1" : "0"); - } return true; } @@ -909,18 +940,21 @@ void CSiteManagerDialog::OnNewFolder(wxCommandEvent&) { wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return; + } while (pTree->GetItemData(item)) item = pTree->GetItemParent(item); - if (!Verify()) + if (!Verify()) { return; + } wxString name = FindFirstFreeName(item, _("New folder")); @@ -936,19 +970,22 @@ bool CSiteManagerDialog::Verify() { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return true; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return true; + } CSiteManagerItemData* data = (CSiteManagerItemData *)pTree->GetItemData(item); - if (!data) + if (!data) { return true; + } - if (data->m_type == CSiteManagerItemData::SITE) { - const wxString& host = XRCCTRL(*this, "ID_HOST", wxTextCtrl)->GetValue(); + if (data->m_site) { + std::wstring const host = xrc_call(*this, "ID_HOST", &wxTextCtrl::GetValue).ToStdWstring(); if (host.empty()) { XRCCTRL(*this, "ID_HOST", wxTextCtrl)->SetFocus(); wxMessageBoxEx(_("You have to enter a hostname."), _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this); @@ -961,7 +998,7 @@ wxASSERT(protocol != UNKNOWN); if (protocol == SFTP && - logon_type == ACCOUNT) + logon_type == LogonType::account) { XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetFocus(); wxMessageBoxEx(_("'Account' logontype not supported by selected protocol"), _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this); @@ -970,45 +1007,47 @@ if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0 && !IsPredefinedItem(item) && - (logon_type == ACCOUNT || logon_type == NORMAL)) + (logon_type == LogonType::account || logon_type == LogonType::normal)) { XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetFocus(); wxString msg; - if (COptions::Get()->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE)) + if (COptions::Get()->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE) && COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0) { msg = _("Saving of password has been disabled by your system administrator."); - else + } + else { msg = _("Saving of passwords has been disabled by you."); + } msg += _T("\n"); msg += _("'Normal' and 'Account' logontypes are not available. Your entry has been changed to 'Ask for password'."); - XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(CServer::GetNameFromLogonType(ASK)); + XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(GetNameFromLogonType(LogonType::ask)); XRCCTRL(*this, "ID_PASS", wxTextCtrl)->ChangeValue(wxString()); - logon_type = ASK; + logon_type = LogonType::ask; wxMessageBoxEx(msg, _("Site Manager - Cannot remember password"), wxICON_INFORMATION, this); } // Set selected type - CServer server; + ServerWithCredentials server; server.SetLogonType(logon_type); - server.SetProtocol(protocol); + server.server.SetProtocol(protocol); - wxString port = XRCCTRL(*this, "ID_PORT", wxTextCtrl)->GetValue(); + std::wstring port = xrc_call(*this, "ID_PORT", &wxTextCtrl::GetValue).ToStdWstring(); CServerPath path; - wxString error; - if (!server.ParseUrl(host, port, wxString(), wxString(), error, path)) { + std::wstring error; + if (!server.ParseUrl(host, port, std::wstring(), std::wstring(), error, path, protocol)) { XRCCTRL(*this, "ID_HOST", wxTextCtrl)->SetFocus(); wxMessageBoxEx(error, _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this); return false; } - XRCCTRL(*this, "ID_HOST", wxTextCtrl)->ChangeValue(server.FormatHost(true)); - if (server.GetPort() != CServer::GetDefaultPort(server.GetProtocol())) { - XRCCTRL(*this, "ID_PORT", wxTextCtrl)->ChangeValue(wxString::Format(_T("%d"), server.GetPort())); + XRCCTRL(*this, "ID_HOST", wxTextCtrl)->ChangeValue(server.Format(ServerFormat::host_only)); + if (server.server.GetPort() != CServer::GetDefaultPort(server.server.GetProtocol())) { + XRCCTRL(*this, "ID_PORT", wxTextCtrl)->ChangeValue(wxString::Format(_T("%d"), server.server.GetPort())); } else { XRCCTRL(*this, "ID_PORT", wxTextCtrl)->ChangeValue(wxString()); } - SetProtocol(server.GetProtocol()); + SetProtocol(server.server.GetProtocol()); if (XRCCTRL(*this, "ID_CHARSET_CUSTOM", wxRadioButton)->GetValue()) { if (XRCCTRL(*this, "ID_ENCODING", wxTextCtrl)->GetValue().empty()) { @@ -1020,9 +1059,9 @@ // Require username for non-anonymous, non-ask logon type const wxString user = XRCCTRL(*this, "ID_USER", wxTextCtrl)->GetValue(); - if (logon_type != ANONYMOUS && - logon_type != ASK && - logon_type != INTERACTIVE && + if (logon_type != LogonType::anonymous && + logon_type != LogonType::ask && + logon_type != LogonType::interactive && user.empty()) { XRCCTRL(*this, "ID_USER", wxTextCtrl)->SetFocus(); @@ -1047,7 +1086,7 @@ } // Require account for account logon type - if (logon_type == ACCOUNT && + if (logon_type == LogonType::account && XRCCTRL(*this, "ID_ACCOUNT", wxTextCtrl)->GetValue().empty()) { XRCCTRL(*this, "ID_ACCOUNT", wxTextCtrl)->SetFocus(); @@ -1056,9 +1095,8 @@ } // In key file logon type, check that the provided key file exists - wxString keyFile, keyFileComment, keyFileData; - if (logon_type == KEY) { - keyFile = xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::GetValue); + if (logon_type == LogonType::key) { + std::wstring keyFile = xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::GetValue).ToStdWstring(); if (keyFile.empty()) { wxMessageBox(_("You have to enter a key file path"), _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this); xrc_call(*this, "ID_KEYFILE", &wxWindow::SetFocus); @@ -1067,29 +1105,55 @@ // Check (again) that the key file is in the correct format since it might have been introduced manually CFZPuttyGenInterface cfzg(this); - if (cfzg.LoadKeyFile(keyFile, false, keyFileComment, keyFileData)) + + std::wstring keyFileComment, keyFileData; + if (cfzg.LoadKeyFile(keyFile, false, keyFileComment, keyFileData)) { xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::ChangeValue, keyFile); + } else { xrc_call(*this, "ID_KEYFILE", &wxWindow::SetFocus); return false; } } - const wxString remotePathRaw = XRCCTRL(*this, "ID_REMOTEDIR", wxTextCtrl)->GetValue(); + if (protocol == STORJ && logon_type == LogonType::normal) { + std::wstring pw = xrc_call(*this, "ID_PASS", &wxTextCtrl::GetValue).ToStdWstring(); + std::wstring encryptionKey = xrc_call(*this, "ID_ENCRYPTIONKEY", &wxTextCtrl::GetValue).ToStdWstring(); + + bool encrypted = !xrc_call(*this, "ID_PASS", &wxTextCtrl::GetHint).empty(); + if (encrypted) { + if (pw.empty() != encryptionKey.empty()) { + wxMessageBox(_("You cannot change password and encryption key individually if using a master password."), _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this); + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxWindow::SetFocus); + return false; + } + } +#if ENABLE_STORJ + if (!encryptionKey.empty() || !encrypted) { + CStorjKeyInterface validator(this); + if (!validator.ValidateKey(encryptionKey, false)) { + wxMessageBox(_("You have to enter a valid encryption key"), _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this); + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxWindow::SetFocus); + return false; + } + } +#endif + } + + std::wstring const remotePathRaw = XRCCTRL(*this, "ID_REMOTEDIR", wxTextCtrl)->GetValue().ToStdWstring(); if (!remotePathRaw.empty()) { - const wxString serverType = XRCCTRL(*this, "ID_SERVERTYPE", wxChoice)->GetStringSelection(); + std::wstring serverType = XRCCTRL(*this, "ID_SERVERTYPE", wxChoice)->GetStringSelection().ToStdWstring(); CServerPath remotePath; remotePath.SetType(CServer::GetServerTypeFromName(serverType)); - if (!remotePath.SetPath(remotePathRaw)) - { + if (!remotePath.SetPath(remotePathRaw)) { XRCCTRL(*this, "ID_REMOTEDIR", wxTextCtrl)->SetFocus(); wxMessageBoxEx(_("Default remote path cannot be parsed. Make sure it is a valid absolute path for the selected server type."), _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this); return false; } } - const wxString localPath = XRCCTRL(*this, "ID_LOCALDIR", wxTextCtrl)->GetValue(); + std::wstring const localPath = XRCCTRL(*this, "ID_LOCALDIR", wxTextCtrl)->GetValue().ToStdWstring(); if (XRCCTRL(*this, "ID_SYNC", wxCheckBox)->GetValue()) { if (remotePathRaw.empty() || localPath.empty()) { XRCCTRL(*this, "ID_SYNC", wxCheckBox)->SetFocus(); @@ -1100,21 +1164,27 @@ } else { wxTreeItemId parent = pTree->GetItemParent(item); - CSiteManagerItemData_Site* pServer = static_cast(pTree->GetItemData(parent)); - if (!pServer) + if (!parent) { return false; - + } + CSiteManagerItemData* pServer = static_cast(pTree->GetItemData(parent)); + if (!pServer || !pServer->m_site) { + return false; + } + const wxString remotePathRaw = XRCCTRL(*this, "ID_BOOKMARK_REMOTEDIR", wxTextCtrl)->GetValue(); if (!remotePathRaw.empty()) { CServerPath remotePath; - remotePath.SetType(pServer->m_server.GetType()); - if (!remotePath.SetPath(remotePathRaw)) { + remotePath.SetType(pServer->m_site->server_.server.GetType()); + if (!remotePath.SetPath(remotePathRaw.ToStdWstring())) { XRCCTRL(*this, "ID_BOOKMARK_REMOTEDIR", wxTextCtrl)->SetFocus(); wxString msg; - if (pServer->m_server.GetType() != DEFAULT) - msg = wxString::Format(_("Remote path cannot be parsed. Make sure it is a valid absolute path and is supported by the servertype (%s) selected on the parent site."), CServer::GetNameFromServerType(pServer->m_server.GetType())); - else + if (pServer->m_site->server_.server.GetType() != DEFAULT) { + msg = wxString::Format(_("Remote path cannot be parsed. Make sure it is a valid absolute path and is supported by the servertype (%s) selected on the parent site."), CServer::GetNameFromServerType(pServer->m_site->server_.server.GetType())); + } + else { msg = _("Remote path cannot be parsed. Make sure it is a valid absolute path."); + } wxMessageBoxEx(msg, _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this); return false; } @@ -1164,8 +1234,9 @@ void CSiteManagerDialog::OnEndLabelEdit(wxTreeEvent& event) { - if (event.IsEditCancelled()) + if (event.IsEditCancelled()) { return; + } wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); if (!pTree) { @@ -1192,8 +1263,9 @@ wxTreeItemIdValue cookie; for (wxTreeItemId child = pTree->GetFirstChild(parent, cookie); child.IsOk(); child = pTree->GetNextChild(parent, cookie)) { - if (child == item) + if (child == item) { continue; + } if (!name.CmpNoCase(pTree->GetItemText(child))) { wxMessageBoxEx(_("Name already exists"), _("Cannot rename entry"), wxICON_EXCLAMATION, this); event.Veto(); @@ -1220,24 +1292,28 @@ void CSiteManagerDialog::OnDelete(wxCommandEvent&) { wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk() || item == pTree->GetRootItem() || item == m_ownSites || IsPredefinedItem(item)) + if (!item.IsOk() || item == pTree->GetRootItem() || item == m_ownSites || IsPredefinedItem(item)) { return; + } CConditionalDialog dlg(this, CConditionalDialog::sitemanager_confirmdelete, CConditionalDialog::yesno); dlg.SetTitle(_("Delete Site Manager entry")); dlg.AddText(_("Do you really want to delete selected entry?")); - if (!dlg.Run()) + if (!dlg.Run()) { return; + } wxTreeItemId parent = pTree->GetItemParent(item); - if (pTree->GetChildrenCount(parent) == 1) + if (pTree->GetChildrenCount(parent) == 1) { pTree->Collapse(parent); + } m_is_deleting = true; @@ -1251,15 +1327,18 @@ void CSiteManagerDialog::OnSelChanging(wxTreeEvent& event) { - if (m_is_deleting) + if (m_is_deleting) { return; + } wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } - if (!Verify()) + if (!Verify()) { event.Veto(); + } UpdateItem(); } @@ -1272,193 +1351,254 @@ void CSiteManagerDialog::OnNewSite(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk() || IsPredefinedItem(item)) + if (!item.IsOk() || IsPredefinedItem(item)) { return; + } - while (pTree->GetItemData(item)) + while (pTree->GetItemData(item)) { item = pTree->GetItemParent(item); + } - if (!Verify()) + if (!Verify()) { return; + } - CServer server; + ServerWithCredentials server; + server.server.SetProtocol(ServerProtocol::FTP); AddNewSite(item, server); } -void CSiteManagerDialog::OnLogontypeSelChanged(wxCommandEvent& event) +void CSiteManagerDialog::OnLogontypeSelChanged(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return; + } CSiteManagerItemData* data = static_cast(pTree->GetItemData(item)); - if (!data) + if (!data) { return; + } - SetControlVisibility(GetProtocol(), GetLogonType()); + LogonType const t = GetLogonType(); + SetControlVisibility(GetProtocol(), t); - xrc_call(*this, "ID_USER", &wxTextCtrl::Enable, event.GetString() != _("Anonymous")); - xrc_call(*this, "ID_PASS", &wxTextCtrl::Enable, event.GetString() == _("Normal") || event.GetString() == _("Account")); - xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::Enable, event.GetString() == _("Account")); - xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::Enable, event.GetString() == _("Key file")); - xrc_call(*this, "ID_KEYFILE_BROWSE", &wxButton::Enable, event.GetString() == _("Key file")); + SetLogonTypeCtrlState(); +} + +void CSiteManagerDialog::SetLogonTypeCtrlState() +{ + LogonType const t = GetLogonType(); + xrc_call(*this, "ID_USER", &wxTextCtrl::Enable, t != LogonType::anonymous); + xrc_call(*this, "ID_PASS", &wxTextCtrl::Enable, t == LogonType::normal || t == LogonType::account); + xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::Enable, t == LogonType::account); + xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::Enable, t == LogonType::key); + xrc_call(*this, "ID_KEYFILE_BROWSE", &wxButton::Enable, t == LogonType::key); + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxTextCtrl::Enable, t == LogonType::normal); + xrc_call(*this, "ID_ENCRYPTIONKEY_GENERATE", &wxButton::Enable, t == LogonType::normal); } bool CSiteManagerDialog::UpdateItem() { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return false; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return false; + } - if (IsPredefinedItem(item)) + if (IsPredefinedItem(item)) { return true; + } CSiteManagerItemData* data = static_cast(pTree->GetItemData(item)); - if (!data) + if (!data) { return false; + } - if (data->m_type == CSiteManagerItemData::SITE) - return UpdateServer(*(CSiteManagerItemData_Site *)data, pTree->GetItemText(item)); - else - { + if (data->m_site) { + return UpdateServer(*data->m_site, pTree->GetItemText(item)); + } + else { + wxASSERT(data->m_bookmark); wxTreeItemId parent = pTree->GetItemParent(item); - CSiteManagerItemData_Site* pServer = static_cast(pTree->GetItemData(parent)); - if (!pServer) + CSiteManagerItemData const* pServer = static_cast(pTree->GetItemData(parent)); + if (!pServer || !pServer->m_site) { return false; - return UpdateBookmark(*data, pServer->m_server); + } + data->m_bookmark->m_name = pTree->GetItemText(item); + return UpdateBookmark(*data->m_bookmark, pServer->m_site->server_); } } -bool CSiteManagerDialog::UpdateBookmark(CSiteManagerItemData &bookmark, const CServer& server) +bool CSiteManagerDialog::UpdateBookmark(Bookmark &bookmark, ServerWithCredentials const& server) { bookmark.m_localDir = xrc_call(*this, "ID_BOOKMARK_LOCALDIR", &wxTextCtrl::GetValue); bookmark.m_remoteDir = CServerPath(); - bookmark.m_remoteDir.SetType(server.GetType()); - bookmark.m_remoteDir.SetPath(xrc_call(*this, "ID_BOOKMARK_REMOTEDIR", &wxTextCtrl::GetValue)); + bookmark.m_remoteDir.SetType(server.server.GetType()); + bookmark.m_remoteDir.SetPath(xrc_call(*this, "ID_BOOKMARK_REMOTEDIR", &wxTextCtrl::GetValue).ToStdWstring()); bookmark.m_sync = xrc_call(*this, "ID_BOOKMARK_SYNC", &wxCheckBox::GetValue); bookmark.m_comparison = xrc_call(*this, "ID_BOOKMARK_COMPARISON", &wxCheckBox::GetValue); return true; } -bool CSiteManagerDialog::UpdateServer(CSiteManagerItemData_Site &server, const wxString &name) +bool CSiteManagerDialog::UpdateServer(Site &server, const wxString &name) { ServerProtocol const protocol = GetProtocol(); wxASSERT(protocol != UNKNOWN); - server.m_server.SetProtocol(protocol); + server.server_.server.SetProtocol(protocol); unsigned long port; if (!xrc_call(*this, "ID_PORT", &wxTextCtrl::GetValue).ToULong(&port) || !port || port > 65535) { port = CServer::GetDefaultPort(protocol); } - wxString host = xrc_call(*this, "ID_HOST", &wxTextCtrl::GetValue); + std::wstring host = xrc_call(*this, "ID_HOST", &wxTextCtrl::GetValue).ToStdWstring(); // SetHost does not accept URL syntax if (!host.empty() && host[0] == '[') { - host.RemoveLast(); - host = host.Mid(1); + host = host.substr(1, host.size() - 2); } - server.m_server.SetHost(host, port); + server.server_.server.SetHost(host, port); auto logon_type = GetLogonType(); - server.m_server.SetLogonType(logon_type); + server.server_.SetLogonType(logon_type); + + server.server_.SetUser(xrc_call(*this, "ID_USER", &wxTextCtrl::GetValue).ToStdWstring()); + auto pw = xrc_call(*this, "ID_PASS", &wxTextCtrl::GetValue).ToStdWstring(); + + if (protocol == STORJ && logon_type == LogonType::normal && (!pw.empty() || !server.server_.credentials.encrypted_)) { + pw += '|'; + pw += xrc_call(*this, "ID_ENCRYPTIONKEY", &wxTextCtrl::GetValue).ToStdWstring(); + } - server.m_server.SetUser(xrc_call(*this, "ID_USER", &wxTextCtrl::GetValue), - xrc_call(*this, "ID_PASS", &wxTextCtrl::GetValue)); - server.m_server.SetAccount(xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::GetValue)); + if (server.server_.credentials.encrypted_) { + if (!pw.empty()) { + server.server_.credentials.encrypted_ = public_key(); + server.server_.credentials.SetPass(pw); + } + } + else { + server.server_.credentials.SetPass(pw); + } + server.server_.credentials.account_ = xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::GetValue).ToStdWstring(); - server.m_server.SetKeyFile(xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::GetValue)); + server.server_.credentials.keyFile_ = xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::GetValue).ToStdWstring(); server.m_comments = xrc_call(*this, "ID_COMMENTS", &wxTextCtrl::GetValue); + server.m_colour = CSiteManager::GetColourFromIndex(xrc_call(*this, "ID_COLOR", &wxChoice::GetSelection)); - const wxString serverType = xrc_call(*this, "ID_SERVERTYPE", &wxChoice::GetStringSelection); - server.m_server.SetType(CServer::GetServerTypeFromName(serverType)); + std::wstring const serverType = xrc_call(*this, "ID_SERVERTYPE", &wxChoice::GetStringSelection).ToStdWstring(); + server.server_.server.SetType(CServer::GetServerTypeFromName(serverType)); - server.m_localDir = xrc_call(*this, "ID_LOCALDIR", &wxTextCtrl::GetValue); - server.m_remoteDir = CServerPath(); - server.m_remoteDir.SetType(server.m_server.GetType()); - server.m_remoteDir.SetPath(xrc_call(*this, "ID_REMOTEDIR", &wxTextCtrl::GetValue)); - server.m_sync = xrc_call(*this, "ID_SYNC", &wxCheckBox::GetValue); - server.m_comparison = xrc_call(*this, "ID_COMPARISON", &wxCheckBox::GetValue); + server.m_default_bookmark.m_localDir = xrc_call(*this, "ID_LOCALDIR", &wxTextCtrl::GetValue); + server.m_default_bookmark.m_remoteDir = CServerPath(); + server.m_default_bookmark.m_remoteDir.SetType(server.server_.server.GetType()); + server.m_default_bookmark.m_remoteDir.SetPath(xrc_call(*this, "ID_REMOTEDIR", &wxTextCtrl::GetValue).ToStdWstring()); + server.m_default_bookmark.m_sync = xrc_call(*this, "ID_SYNC", &wxCheckBox::GetValue); + server.m_default_bookmark.m_comparison = xrc_call(*this, "ID_COMPARISON", &wxCheckBox::GetValue); int hours = xrc_call(*this, "ID_TIMEZONE_HOURS", &wxSpinCtrl::GetValue); int minutes = xrc_call(*this, "ID_TIMEZONE_MINUTES", &wxSpinCtrl::GetValue); - server.m_server.SetTimezoneOffset(hours * 60 + minutes); + server.server_.server.SetTimezoneOffset(hours * 60 + minutes); - if (xrc_call(*this, "ID_TRANSFERMODE_ACTIVE", &wxRadioButton::GetValue)) - server.m_server.SetPasvMode(MODE_ACTIVE); - else if (xrc_call(*this, "ID_TRANSFERMODE_PASSIVE", &wxRadioButton::GetValue)) - server.m_server.SetPasvMode(MODE_PASSIVE); - else - server.m_server.SetPasvMode(MODE_DEFAULT); + if (xrc_call(*this, "ID_TRANSFERMODE_ACTIVE", &wxRadioButton::GetValue)) { + server.server_.server.SetPasvMode(MODE_ACTIVE); + } + else if (xrc_call(*this, "ID_TRANSFERMODE_PASSIVE", &wxRadioButton::GetValue)) { + server.server_.server.SetPasvMode(MODE_PASSIVE); + } + else { + server.server_.server.SetPasvMode(MODE_DEFAULT); + } if (xrc_call(*this, "ID_LIMITMULTIPLE", &wxCheckBox::GetValue)) { - server.m_server.MaximumMultipleConnections(xrc_call(*this, "ID_MAXMULTIPLE", &wxSpinCtrl::GetValue)); + server.server_.server.MaximumMultipleConnections(xrc_call(*this, "ID_MAXMULTIPLE", &wxSpinCtrl::GetValue)); + } + else { + server.server_.server.MaximumMultipleConnections(0); } - else - server.m_server.MaximumMultipleConnections(0); if (xrc_call(*this, "ID_CHARSET_UTF8", &wxRadioButton::GetValue)) - server.m_server.SetEncodingType(ENCODING_UTF8); + server.server_.server.SetEncodingType(ENCODING_UTF8); else if (xrc_call(*this, "ID_CHARSET_CUSTOM", &wxRadioButton::GetValue)) { - wxString encoding = xrc_call(*this, "ID_ENCODING", &wxTextCtrl::GetValue); - server.m_server.SetEncodingType(ENCODING_CUSTOM, encoding); + std::wstring encoding = xrc_call(*this, "ID_ENCODING", &wxTextCtrl::GetValue).ToStdWstring(); + server.server_.server.SetEncodingType(ENCODING_CUSTOM, encoding); + } + else { + server.server_.server.SetEncodingType(ENCODING_AUTO); } - else - server.m_server.SetEncodingType(ENCODING_AUTO); - if (xrc_call(*this, "ID_BYPASSPROXY", &wxCheckBox::GetValue)) - server.m_server.SetBypassProxy(true); - else - server.m_server.SetBypassProxy(false); + if (xrc_call(*this, "ID_BYPASSPROXY", &wxCheckBox::GetValue)) { + server.server_.server.SetBypassProxy(true); + } + else { + server.server_.server.SetBypassProxy(false); + } - server.m_server.SetName(name); + server.server_.server.SetName(name.ToStdWstring()); return true; } -bool CSiteManagerDialog::GetServer(CSiteManagerItemData_Site& data) +bool CSiteManagerDialog::GetServer(Site& data, Bookmark& bookmark) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return false; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return false; + } CSiteManagerItemData* pData = static_cast(pTree->GetItemData(item)); - if (!pData) + if (!pData) { return false; + } - if (pData->m_type == CSiteManagerItemData::BOOKMARK) { + if (pData->m_bookmark) { item = pTree->GetItemParent(item); - CSiteManagerItemData_Site* pSiteData = static_cast(pTree->GetItemData(item)); + CSiteManagerItemData* pSiteData = static_cast(pTree->GetItemData(item)); + + data = *pSiteData->m_site; + bookmark = data.m_default_bookmark; - data = *pSiteData; - if (!pData->m_localDir.empty()) - data.m_localDir = pData->m_localDir; - if (!pData->m_remoteDir.empty()) - data.m_remoteDir = pData->m_remoteDir; - if (data.m_localDir.empty() || data.m_remoteDir.empty()) - data.m_sync = false; - else - data.m_sync = pData->m_sync; + if (!pData->m_bookmark->m_localDir.empty()) { + bookmark.m_localDir = pData->m_bookmark->m_localDir; + } + + if (!pData->m_bookmark->m_remoteDir.empty()) { + bookmark.m_remoteDir = pData->m_bookmark->m_remoteDir; + } + + if (bookmark.m_localDir.empty() || bookmark.m_remoteDir.empty()) { + bookmark.m_sync = false; + bookmark.m_comparison = false; + } + else { + bookmark.m_sync = pData->m_bookmark->m_sync; + bookmark.m_comparison = pData->m_bookmark->m_comparison; + } + } + else { + data = *pData->m_site; + bookmark = data.m_default_bookmark; } - else - data = *(CSiteManagerItemData_Site *)pData; data.m_path = GetSitePath(item); @@ -1483,14 +1623,18 @@ wxFileDialog dlg(this, _("Choose a key file"), wxString(), wxString(), wildcards, wxFD_OPEN|wxFD_FILE_MUST_EXIST); if (dlg.ShowModal() == wxID_OK) { - wxString keyFilePath = dlg.GetPath(); + std::wstring keyFilePath = dlg.GetPath().ToStdWstring(); // If the selected file was a PEM file, LoadKeyFile() will automatically convert it to PPK // and tell us the new location. CFZPuttyGenInterface fzpg(this); - wxString keyFileComment, keyFileData; + std::wstring keyFileComment, keyFileData; if (fzpg.LoadKeyFile(keyFilePath, false, keyFileComment, keyFileData)) { XRCCTRL(*this, "ID_KEYFILE", wxTextCtrl)->ChangeValue(keyFilePath); +#if USE_MAC_SANDBOX + OSXSandboxUserdirs::Get().AddFile(keyFilePath); +#endif + } else { xrc_call(*this, "ID_KEYFILE", &wxWindow::SetFocus); @@ -1500,16 +1644,19 @@ void CSiteManagerDialog::OnRemoteDirBrowse(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return; + } CSiteManagerItemData* data = static_cast(pTree->GetItemData(item)); - if (!data) + if (!data) { return; + } wxDirDialog dlg(this, _("Choose the default local directory"), XRCCTRL(*this, "ID_LOCALDIR", wxTextCtrl)->GetValue(), wxDD_NEW_DIR_BUTTON); if (dlg.ShowModal() == wxID_OK) { @@ -1520,16 +1667,22 @@ void CSiteManagerDialog::OnItemActivated(wxTreeEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return; + } CSiteManagerItemData* data = static_cast(pTree->GetItemData(item)); - if (!data) + if (!data) { + if (item != pTree->GetRootItem() || !pTree->IsExpanded(item)) { + pTree->Toggle(item); + } return; + } wxCommandEvent cmdEvent; OnConnect(cmdEvent); @@ -1543,8 +1696,9 @@ void CSiteManagerDialog::SetCtrlState() { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); @@ -1555,8 +1709,9 @@ #endif CSiteManagerItemData* data = 0; - if (item.IsOk()) - data = static_cast(pTree->GetItemData(item)); + if (item.IsOk()) { + data = static_cast(pTree->GetItemData(item)); + } if (!data) { m_pNotebook_Site->Show(); m_pNotebook_Bookmark->Hide(); @@ -1582,11 +1737,14 @@ xrc_call(*this, "ID_LOGONTYPE", &wxChoice::SetStringSelection, _("Anonymous")); xrc_call(*this, "ID_USER", &wxTextCtrl::ChangeValue, wxString()); xrc_call(*this, "ID_PASS", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_PASS", &wxTextCtrl::SetHint, wxString()); xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::ChangeValue, wxString()); xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxTextCtrl::ChangeValue, wxString()); xrc_call(*this, "ID_COMMENTS", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_COLOR", &wxChoice::Select, 0); - SetControlVisibility(FTP, ANONYMOUS); + SetControlVisibility(FTP, LogonType::anonymous); xrc_call(*this, "ID_SERVERTYPE", &wxChoice::SetSelection, 0); xrc_call(*this, "ID_LOCALDIR", &wxTextCtrl::ChangeValue, wxString()); @@ -1605,13 +1763,11 @@ xrc_call(*this, "wxID_OK", &wxButton::SetDefault); #endif } - else if (data->m_type == CSiteManagerItemData::SITE) { + else if (data->m_site) { m_pNotebook_Site->Show(); m_pNotebook_Bookmark->Hide(); m_pNotebook_Site->GetContainingSizer()->Layout(); - CSiteManagerItemData_Site* site_data = (CSiteManagerItemData_Site *)data; - // Set the control states according if it's possible to use the control xrc_call(*this, "ID_RENAME", &wxWindow::Enable, !predefined); xrc_call(*this, "ID_DELETE", &wxWindow::Enable, !predefined); @@ -1623,65 +1779,100 @@ xrc_call(*this, "ID_CONNECT", &wxButton::Enable, true); xrc_call(*this, "ID_HOST", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_HOST", &wxTextCtrl::ChangeValue, site_data->m_server.FormatHost(true)); - unsigned int port = site_data->m_server.GetPort(); + xrc_call(*this, "ID_HOST", &wxTextCtrl::ChangeValue, data->m_site->server_.Format(ServerFormat::host_only)); + unsigned int port = data->m_site->server_.server.GetPort(); - if (port != CServer::GetDefaultPort(site_data->m_server.GetProtocol())) + if (port != CServer::GetDefaultPort(data->m_site->server_.server.GetProtocol())) { xrc_call(*this, "ID_PORT", &wxTextCtrl::ChangeValue, wxString::Format(_T("%d"), port)); - else + } + else { xrc_call(*this, "ID_PORT", &wxTextCtrl::ChangeValue, wxString()); + } xrc_call(*this, "ID_PORT", &wxWindow::Enable, !predefined); - SetProtocol(site_data->m_server.GetProtocol()); + ServerProtocol protocol = data->m_site->server_.server.GetProtocol(); + SetProtocol(protocol); xrc_call(*this, "ID_PROTOCOL", &wxWindow::Enable, !predefined); xrc_call(*this, "ID_ENCRYPTION", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_BYPASSPROXY", &wxCheckBox::SetValue, site_data->m_server.GetBypassProxy()); + xrc_call(*this, "ID_BYPASSPROXY", &wxCheckBox::SetValue, data->m_site->server_.server.GetBypassProxy()); - xrc_call(*this, "ID_USER", &wxTextCtrl::Enable, !predefined && site_data->m_server.GetLogonType() != ANONYMOUS); - xrc_call(*this, "ID_PASS", &wxTextCtrl::Enable, !predefined && (site_data->m_server.GetLogonType() == NORMAL || site_data->m_server.GetLogonType() == ACCOUNT)); - xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::Enable, !predefined && site_data->m_server.GetLogonType() == ACCOUNT); - xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::Enable, !predefined && site_data->m_server.GetLogonType() == KEY); - xrc_call(*this, "ID_KEYFILE_BROWSE", &wxButton::Enable, !predefined && site_data->m_server.GetLogonType() == KEY); + LogonType logonType = data->m_site->server_.credentials.logonType_; + xrc_call(*this, "ID_USER", &wxTextCtrl::Enable, !predefined && logonType != LogonType::anonymous); + xrc_call(*this, "ID_PASS", &wxTextCtrl::Enable, !predefined && (logonType == LogonType::normal || logonType == LogonType::account)); + xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::Enable, !predefined && logonType == LogonType::account); + xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::Enable, !predefined && logonType == LogonType::key); + xrc_call(*this, "ID_KEYFILE_BROWSE", &wxButton::Enable, !predefined && logonType == LogonType::key); + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxTextCtrl::Enable, !predefined && logonType == LogonType::normal); + xrc_call(*this, "ID_ENCRYPTIONKEY_GENERATE", &wxButton::Enable, !predefined && logonType == LogonType::normal); - SetControlVisibility(site_data->m_server.GetProtocol(), site_data->m_server.GetLogonType()); + SetControlVisibility(protocol, logonType); - xrc_call(*this, "ID_LOGONTYPE", &wxChoice::SetStringSelection, CServer::GetNameFromLogonType(site_data->m_server.GetLogonType())); + xrc_call(*this, "ID_LOGONTYPE", &wxChoice::SetStringSelection, GetNameFromLogonType(logonType)); xrc_call(*this, "ID_LOGONTYPE", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_USER", &wxTextCtrl::ChangeValue, site_data->m_server.GetUser()); - xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::ChangeValue, site_data->m_server.GetAccount()); - xrc_call(*this, "ID_PASS", &wxTextCtrl::ChangeValue, site_data->m_server.GetPass()); - xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::ChangeValue, site_data->m_server.GetKeyFile()); - xrc_call(*this, "ID_COMMENTS", &wxTextCtrl::ChangeValue, site_data->m_comments); + xrc_call(*this, "ID_USER", &wxTextCtrl::ChangeValue, data->m_site->server_.server.GetUser()); + xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::ChangeValue, data->m_site->server_.credentials.account_); + + std::wstring pass = data->m_site->server_.credentials.GetPass(); + std::wstring encryptionKey; + if (protocol == STORJ) { + size_t pos = pass.rfind('|'); + if (pos != std::wstring::npos) { + encryptionKey = pass.substr(pos + 1); + pass = pass.substr(0, pos); + } + } + + if (data->m_site->server_.credentials.encrypted_) { + xrc_call(*this, "ID_PASS", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxTextCtrl::ChangeValue, wxString()); + + // @translator: Keep this string as short as possible + xrc_call(*this, "ID_PASS", &wxTextCtrl::SetHint, _("Leave empty to keep existing password.")); + } + else { + xrc_call(*this, "ID_PASS", &wxTextCtrl::ChangeValue, pass); + xrc_call(*this, "ID_PASS", &wxTextCtrl::SetHint, wxString()); + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxTextCtrl::ChangeValue, encryptionKey); + } + xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::ChangeValue, data->m_site->server_.credentials.keyFile_); + xrc_call(*this, "ID_COMMENTS", &wxTextCtrl::ChangeValue, data->m_site->m_comments); xrc_call(*this, "ID_COMMENTS", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_COLOR", &wxChoice::Select, CSiteManager::GetColourIndex(data->m_site->m_colour)); + xrc_call(*this, "ID_COLOR", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_SERVERTYPE", &wxChoice::SetSelection, site_data->m_server.GetType()); + xrc_call(*this, "ID_SERVERTYPE", &wxChoice::SetSelection, data->m_site->server_.server.GetType()); xrc_call(*this, "ID_SERVERTYPE", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_LOCALDIR", &wxTextCtrl::ChangeValue, site_data->m_localDir); + xrc_call(*this, "ID_LOCALDIR", &wxTextCtrl::ChangeValue, data->m_site->m_default_bookmark.m_localDir); xrc_call(*this, "ID_LOCALDIR", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_REMOTEDIR", &wxTextCtrl::ChangeValue, site_data->m_remoteDir.GetPath()); + xrc_call(*this, "ID_REMOTEDIR", &wxTextCtrl::ChangeValue, data->m_site->m_default_bookmark.m_remoteDir.GetPath()); xrc_call(*this, "ID_REMOTEDIR", &wxWindow::Enable, !predefined); xrc_call(*this, "ID_SYNC", &wxCheckBox::Enable, !predefined); - xrc_call(*this, "ID_SYNC", &wxCheckBox::SetValue, site_data->m_sync); + xrc_call(*this, "ID_SYNC", &wxCheckBox::SetValue, data->m_site->m_default_bookmark.m_sync); xrc_call(*this, "ID_COMPARISON", &wxCheckBox::Enable, !predefined); - xrc_call(*this, "ID_COMPARISON", &wxCheckBox::SetValue, site_data->m_comparison); - xrc_call(*this, "ID_TIMEZONE_HOURS", &wxSpinCtrl::SetValue, site_data->m_server.GetTimezoneOffset() / 60); + xrc_call(*this, "ID_COMPARISON", &wxCheckBox::SetValue, data->m_site->m_default_bookmark.m_comparison); + xrc_call(*this, "ID_TIMEZONE_HOURS", &wxSpinCtrl::SetValue, data->m_site->server_.server.GetTimezoneOffset() / 60); xrc_call(*this, "ID_TIMEZONE_HOURS", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_TIMEZONE_MINUTES", &wxSpinCtrl::SetValue, site_data->m_server.GetTimezoneOffset() % 60); + xrc_call(*this, "ID_TIMEZONE_MINUTES", &wxSpinCtrl::SetValue, data->m_site->server_.server.GetTimezoneOffset() % 60); xrc_call(*this, "ID_TIMEZONE_MINUTES", &wxWindow::Enable, !predefined); - enum PasvMode pasvMode = site_data->m_server.GetPasvMode(); - if (pasvMode == MODE_ACTIVE) - xrc_call(*this, "ID_TRANSFERMODE_ACTIVE", &wxRadioButton::SetValue, true); - else if (pasvMode == MODE_PASSIVE) - xrc_call(*this, "ID_TRANSFERMODE_PASSIVE", &wxRadioButton::SetValue, true); - else - xrc_call(*this, "ID_TRANSFERMODE_DEFAULT", &wxRadioButton::SetValue, true); - xrc_call(*this, "ID_TRANSFERMODE_ACTIVE", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_TRANSFERMODE_PASSIVE", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_TRANSFERMODE_DEFAULT", &wxWindow::Enable, !predefined); + if (CServer::ProtocolHasFeature(data->m_site->server_.server.GetProtocol(), ProtocolFeature::TransferMode)) { + PasvMode pasvMode = data->m_site->server_.server.GetPasvMode(); + if (pasvMode == MODE_ACTIVE) { + xrc_call(*this, "ID_TRANSFERMODE_ACTIVE", &wxRadioButton::SetValue, true); + } + else if (pasvMode == MODE_PASSIVE) { + xrc_call(*this, "ID_TRANSFERMODE_PASSIVE", &wxRadioButton::SetValue, true); + } + else { + xrc_call(*this, "ID_TRANSFERMODE_DEFAULT", &wxRadioButton::SetValue, true); + } + xrc_call(*this, "ID_TRANSFERMODE_ACTIVE", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_TRANSFERMODE_PASSIVE", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_TRANSFERMODE_DEFAULT", &wxWindow::Enable, !predefined); + } - int maxMultiple = site_data->m_server.MaximumMultipleConnections(); + int maxMultiple = data->m_site->server_.server.MaximumMultipleConnections(); xrc_call(*this, "ID_LIMITMULTIPLE", &wxCheckBox::SetValue, maxMultiple != 0); xrc_call(*this, "ID_LIMITMULTIPLE", &wxWindow::Enable, !predefined); if (maxMultiple != 0) { @@ -1693,7 +1884,7 @@ xrc_call(*this, "ID_MAXMULTIPLE", &wxSpinCtrl::SetValue, 1); } - switch (site_data->m_server.GetEncodingType()) { + switch (data->m_site->server_.server.GetEncodingType()) { default: case ENCODING_AUTO: xrc_call(*this, "ID_CHARSET_AUTO", &wxRadioButton::SetValue, true); @@ -1708,8 +1899,8 @@ xrc_call(*this, "ID_CHARSET_AUTO", &wxWindow::Enable, !predefined); xrc_call(*this, "ID_CHARSET_UTF8", &wxWindow::Enable, !predefined); xrc_call(*this, "ID_CHARSET_CUSTOM", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_ENCODING", &wxTextCtrl::Enable, !predefined && site_data->m_server.GetEncodingType() == ENCODING_CUSTOM); - xrc_call(*this, "ID_ENCODING", &wxTextCtrl::ChangeValue, site_data->m_server.GetCustomEncoding()); + xrc_call(*this, "ID_ENCODING", &wxTextCtrl::Enable, !predefined && data->m_site->server_.server.GetEncodingType() == ENCODING_CUSTOM); + xrc_call(*this, "ID_ENCODING", &wxTextCtrl::ChangeValue, data->m_site->server_.server.GetCustomEncoding()); #ifdef __WXGTK__ xrc_call(*this, "ID_CONNECT", &wxButton::SetDefault); #endif @@ -1728,15 +1919,15 @@ xrc_call(*this, "ID_NEWBOOKMARK", &wxWindow::Enable, !predefined); xrc_call(*this, "ID_CONNECT", &wxButton::Enable, true); - xrc_call(*this, "ID_BOOKMARK_LOCALDIR", &wxTextCtrl::ChangeValue, data->m_localDir); + xrc_call(*this, "ID_BOOKMARK_LOCALDIR", &wxTextCtrl::ChangeValue, data->m_bookmark->m_localDir); xrc_call(*this, "ID_BOOKMARK_LOCALDIR", &wxWindow::Enable, !predefined); - xrc_call(*this, "ID_BOOKMARK_REMOTEDIR", &wxTextCtrl::ChangeValue, data->m_remoteDir.GetPath()); + xrc_call(*this, "ID_BOOKMARK_REMOTEDIR", &wxTextCtrl::ChangeValue, data->m_bookmark->m_remoteDir.GetPath()); xrc_call(*this, "ID_BOOKMARK_REMOTEDIR", &wxWindow::Enable, !predefined); xrc_call(*this, "ID_BOOKMARK_SYNC", &wxCheckBox::Enable, !predefined); - xrc_call(*this, "ID_BOOKMARK_SYNC", &wxCheckBox::SetValue, data->m_sync); + xrc_call(*this, "ID_BOOKMARK_SYNC", &wxCheckBox::SetValue, data->m_bookmark->m_sync); xrc_call(*this, "ID_BOOKMARK_COMPARISON", &wxCheckBox::Enable, !predefined); - xrc_call(*this, "ID_BOOKMARK_COMPARISON", &wxCheckBox::SetValue, data->m_comparison); + xrc_call(*this, "ID_BOOKMARK_COMPARISON", &wxCheckBox::SetValue, data->m_bookmark->m_comparison); } #ifdef __WXGTK__ if (pFocus && !pFocus->IsEnabled()) { @@ -1758,75 +1949,167 @@ void CSiteManagerDialog::OnProtocolSelChanged(wxCommandEvent&) { - SetControlVisibility(GetProtocol(), GetLogonType()); + auto protocol = GetProtocol(); + auto logonType = GetLogonType(); + SetControlVisibility(protocol, logonType); +} + +namespace { +void ShowItem(wxChoice & choice, LogonType logonType, bool show) +{ + auto const name = GetNameFromLogonType(logonType); + int item = choice.FindString(name); + if (item == -1 && show) { + if (show) { + choice.Append(name); + } + } + else if (item != -1 && !show) { + choice.Delete(item); + } +} } void CSiteManagerDialog::SetControlVisibility(ServerProtocol protocol, LogonType type) { - xrc_call(*this, "ID_ENCRYPTION_DESC", &wxStaticText::Show, protocol != SFTP); - xrc_call(*this, "ID_ENCRYPTION", &wxChoice::Show, protocol != SFTP); + bool const isFtp = std::find(ftpSubOptions.cbegin(), ftpSubOptions.cend(), protocol) != ftpSubOptions.cend(); + + xrc_call(*this, "ID_ENCRYPTION_DESC", &wxStaticText::Show, isFtp); + xrc_call(*this, "ID_ENCRYPTION", &wxChoice::Show, isFtp); + + xrc_call(*this, "ID_SIGNUP", &wxControl::Show, protocol == STORJ); auto choice = XRCCTRL(*this, "ID_LOGONTYPE", wxChoice); // Disallow invalid combinations - if (protocol == SFTP && type == ACCOUNT) { - type = NORMAL; - choice->Select(choice->FindString(CServer::GetNameFromLogonType(type))); - } - else if (protocol != SFTP && type == KEY) { - type = NORMAL; - choice->Select(choice->FindString(CServer::GetNameFromLogonType(type))); - } - - int toDelete = choice->FindString(CServer::GetNameFromLogonType(protocol == SFTP ? ACCOUNT : KEY)); - int toAdd = choice->FindString(CServer::GetNameFromLogonType(protocol != SFTP ? ACCOUNT : KEY)); - if (toDelete != -1) { - choice->Delete(toDelete); - } - if (toAdd == -1) { - choice->Append(CServer::GetNameFromLogonType(protocol != SFTP ? ACCOUNT : KEY)); - } - - xrc_call(*this, "ID_ACCOUNT_DESC", &wxStaticText::Show, protocol != SFTP && type == ACCOUNT); - xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::Show, protocol != SFTP && type == ACCOUNT); - xrc_call(*this, "ID_PASS_DESC", &wxStaticText::Show, protocol != SFTP || type != KEY); - xrc_call(*this, "ID_PASS", &wxTextCtrl::Show, protocol != SFTP || type != KEY); - xrc_call(*this, "ID_KEYFILE_DESC", &wxStaticText::Show, protocol == SFTP && type == KEY); - xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::Show, protocol == SFTP && type == KEY); - xrc_call(*this, "ID_KEYFILE_BROWSE", &wxButton::Show, protocol == SFTP && type == KEY); + if (protocol == SFTP && type == LogonType::account) { + type = LogonType::normal; + choice->Select(choice->FindString(GetNameFromLogonType(type))); + SetLogonTypeCtrlState(); + } + else if (protocol != SFTP && type == LogonType::key) { + type = LogonType::normal; + choice->Select(choice->FindString(GetNameFromLogonType(type))); + SetLogonTypeCtrlState(); + } + else if (protocol == STORJ && type != LogonType::normal && type != LogonType::ask) { + type = LogonType::normal; + choice->Select(choice->FindString(GetNameFromLogonType(type))); + SetLogonTypeCtrlState(); + } + ShowItem(*choice, LogonType::anonymous, protocol != STORJ); + ShowItem(*choice, LogonType::interactive, protocol != STORJ); + ShowItem(*choice, LogonType::key, protocol == SFTP); + ShowItem(*choice, LogonType::account, isFtp); + + xrc_call(*this, "ID_ACCOUNT_DESC", &wxStaticText::Show, isFtp && type == LogonType::account); + xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::Show, isFtp && type == LogonType::account); + xrc_call(*this, "ID_PASS_DESC", &wxStaticText::Show, protocol != SFTP || type != LogonType::key); + xrc_call(*this, "ID_PASS", &wxTextCtrl::Show, protocol != SFTP || type != LogonType::key); + xrc_call(*this, "ID_KEYFILE_DESC", &wxStaticText::Show, protocol == SFTP && type == LogonType::key); + xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::Show, protocol == SFTP && type == LogonType::key); + xrc_call(*this, "ID_KEYFILE_BROWSE", &wxButton::Show, protocol == SFTP && type == LogonType::key); + + xrc_call(*this, "ID_ENCRYPTIONKEY_DESC", &wxStaticText::Show, protocol == STORJ); + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxTextCtrl::Show, protocol == STORJ); + xrc_call(*this, "ID_ENCRYPTIONKEY_GENERATE", &wxButton::Show, protocol == STORJ); auto keyfileSizer = xrc_call(*this, "ID_KEYFILE_DESC", &wxStaticText::GetContainingSizer); if (keyfileSizer) { keyfileSizer->CalcMin(); keyfileSizer->Layout(); } + + auto encryptionkeySizer = xrc_call(*this, "ID_ENCRYPTIONKEY_DESC", &wxStaticText::GetContainingSizer); + if (encryptionkeySizer) { + encryptionkeySizer->CalcMin(); + encryptionkeySizer->Layout(); + } + + auto serverTypeSizer = XRCCTRL(*this, "ID_SERVERTYPE", wxChoice)->GetContainingSizer(); + if (serverTypeSizer) { + auto labelSizerItem = serverTypeSizer->GetItemById(XRCID("ID_SERVERTYPE_LABEL_SIZERITEM")); + auto choiceSizerItem = serverTypeSizer->GetItemById(XRCID("ID_SERVERTYPE_CHOICE_SIZERITEM")); + if (labelSizerItem && choiceSizerItem) { + if (CServer::ProtocolHasFeature(protocol, ProtocolFeature::ServerType)) { + labelSizerItem->Show(true); + choiceSizerItem->Show(true); + } + else { + labelSizerItem->Show(false); + choiceSizerItem->Show(false); + } + serverTypeSizer->CalcMin(); + serverTypeSizer->Layout(); + xrc_call(*this, "ID_ADVANCED_PANEL", &wxPanel::Layout); + } + } + + auto transferModeSizer = XRCCTRL(*this, "ID_TRANSFERMODE_LABEL", wxStaticText)->GetContainingSizer(); + if (transferModeSizer) { + auto labelSizerItem = transferModeSizer->GetItemById(XRCID("ID_TRANSFERMODE_LABEL_SIZERITEM")); + auto groupSizerItem = transferModeSizer->GetItemById(XRCID("ID_TRANSFERMODE_GROUP_SIZERITEM")); + if (labelSizerItem && groupSizerItem) { + if (CServer::ProtocolHasFeature(protocol, ProtocolFeature::TransferMode)) { + labelSizerItem->Show(true); + groupSizerItem->Show(true); + } + else { + labelSizerItem->Show(false); + groupSizerItem->Show(false); + } + transferModeSizer->CalcMin(); + transferModeSizer->Layout(); + } + } + + if (CServer::ProtocolHasFeature(protocol, ProtocolFeature::Charset)) { + if (m_pNotebook_Site->GetPageCount() != m_totalPages) { + m_pNotebook_Site->AddPage(m_pCharsetPage, m_charsetPageText); + m_pNotebook_Site->Layout(); + Layout(); + } + } + else { + if (m_pNotebook_Site->GetPageCount() == m_totalPages) { + m_pNotebook_Site->RemovePage(m_charsetPageIndex); + m_pNotebook_Site->Layout(); + } + } } void CSiteManagerDialog::OnCopySite(wxCommandEvent&) { wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return; + } CSiteManagerItemData* data = static_cast(pTree->GetItemData(item)); - if (!data) + if (!data) { return; + } - if (!Verify()) + if (!Verify()) { return; + } - if (!UpdateItem()) + if (!UpdateItem()) { return; + } wxTreeItemId parent; - if (IsPredefinedItem(item)) + if (IsPredefinedItem(item)) { parent = m_ownSites; - else + } + else { parent = pTree->GetItemParent(item); + } wxString const name = pTree->GetItemText(item); wxString newName = wxString::Format(_("Copy of %s"), name); @@ -1846,29 +2129,32 @@ child = pTree->GetNextChild(parent, cookie); } - if (!found) + if (!found) { break; + } newName = wxString::Format(_("Copy (%d) of %s"), ++index, name); } wxTreeItemId newItem; - if (data->m_type == CSiteManagerItemData::SITE) { - CSiteManagerItemData_Site* newData = new CSiteManagerItemData_Site(*(CSiteManagerItemData_Site *)data); - newData->connected_item = -1; + if (data->m_site) { + CSiteManagerItemData* newData = new CSiteManagerItemData; + newData->m_site = std::make_unique(*data->m_site); newItem = pTree->AppendItem(parent, newName, 2, 2, newData); wxTreeItemIdValue cookie; - for (wxTreeItemId child = pTree->GetFirstChild(item, cookie); child.IsOk(); child = pTree->GetNextChild(item, cookie)) - { - CSiteManagerItemData* pData = new CSiteManagerItemData(*(CSiteManagerItemData *)pTree->GetItemData(child)); + for (wxTreeItemId child = pTree->GetFirstChild(item, cookie); child.IsOk(); child = pTree->GetNextChild(item, cookie)) { + CSiteManagerItemData* pData = new CSiteManagerItemData; + pData->m_bookmark = std::make_unique(*static_cast(pTree->GetItemData(child))->m_bookmark); pTree->AppendItem(newItem, pTree->GetItemText(child), 3, 3, pData); } - if (pTree->IsExpanded(item)) + if (pTree->IsExpanded(item)) { pTree->Expand(newItem); + } } else { - CSiteManagerItemData* newData = new CSiteManagerItemData(*data); + CSiteManagerItemData* newData = new CSiteManagerItemData; + newData->m_bookmark = std::make_unique(*data->m_bookmark); newItem = pTree->AppendItem(parent, newName, 3, 3, newData); } pTree->SortChildren(parent); @@ -1880,22 +2166,26 @@ bool CSiteManagerDialog::LoadDefaultSites() { CLocalPath const defaultsDir = wxGetApp().GetDefaultsDir(); - if (defaultsDir.empty()) + if (defaultsDir.empty()) { return false; + } CXmlFile file(defaultsDir.GetPath() + _T("fzdefaults.xml")); auto document = file.Load(); - if (!document) + if (!document) { return false; + } auto element = document.child("Servers"); - if (!element) + if (!element) { return false; + } wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); - if (!pTree) + if (!pTree) { return false; + } int style = pTree->GetWindowStyle(); pTree->SetWindowStyle(style | wxTR_HIDE_ROOT); @@ -1905,15 +2195,18 @@ pTree->SetItemImage(m_predefinedSites, 1, wxTreeItemIcon_Expanded); pTree->SetItemImage(m_predefinedSites, 1, wxTreeItemIcon_SelectedExpanded); - wxString lastSelection = COptions::Get()->GetOption(OPTION_SITEMANAGER_LASTSELECTED); + std::wstring lastSelection = COptions::Get()->GetOption(OPTION_SITEMANAGER_LASTSELECTED); if (!lastSelection.empty() && lastSelection[0] == '1') { - if (lastSelection == _T("1")) + if (lastSelection == _T("1")) { pTree->SafeSelectItem(m_predefinedSites); - else - lastSelection = lastSelection.Mid(1); + } + else { + lastSelection = lastSelection.substr(1); + } } - else + else { lastSelection.clear(); + } CSiteManagerXmlHandler_Tree handler(pTree, m_predefinedSites, lastSelection, true); CSiteManager::Load(element, handler); @@ -1925,13 +2218,14 @@ { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); wxASSERT(pTree); - if (!pTree) + if (!pTree) { return false; + } - while (item) - { - if (item == m_predefinedSites) + while (item) { + if (item == m_predefinedSites) { return true; + } item = pTree->GetItemParent(item); } @@ -1940,31 +2234,31 @@ void CSiteManagerDialog::OnBeginDrag(wxTreeEvent& event) { - if (!Verify()) - { + if (COptions::Get()->GetOptionVal(OPTION_DND_DISABLED) != 0) { + return; + } + + if (!Verify()) { event.Veto(); return; } UpdateItem(); wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) - { + if (!pTree) { event.Veto(); return; } wxTreeItemId item = event.GetItem(); - if (!item.IsOk()) - { + if (!item.IsOk()) { event.Veto(); return; } const bool predefined = IsPredefinedItem(item); const bool root = item == pTree->GetRootItem() || item == m_ownSites; - if (root) - { + if (root) { event.Veto(); return; } @@ -1991,41 +2285,49 @@ bool CSiteManagerDialog::MoveItems(wxTreeItemId source, wxTreeItemId target, bool copy) { - if (source == target) + if (source == target) { return false; + } - if (IsPredefinedItem(target)) + if (IsPredefinedItem(target)) { return false; + } - if (IsPredefinedItem(source) && !copy) + if (IsPredefinedItem(source) && !copy) { return false; + } wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); CSiteManagerItemData *pTargetData = (CSiteManagerItemData *)pTree->GetItemData(target); CSiteManagerItemData *pSourceData = (CSiteManagerItemData *)pTree->GetItemData(source); if (pTargetData) { - if (pTargetData->m_type == CSiteManagerItemData::BOOKMARK) + if (pTargetData->m_bookmark) { return false; - if (!pSourceData || pSourceData->m_type != CSiteManagerItemData::BOOKMARK) + } + if (!pSourceData || pSourceData->m_site) { return false; + } } - else if (pSourceData && pSourceData->m_type == CSiteManagerItemData::BOOKMARK) + else if (pSourceData && !pSourceData->m_site) { return false; + } wxTreeItemId item = target; while (item != pTree->GetRootItem()) { - if (item == source) + if (item == source) { return false; + } item = pTree->GetItemParent(item); } - if (!copy && pTree->GetItemParent(source) == target) + if (!copy && pTree->GetItemParent(source) == target) { return false; + } wxString sourceName = pTree->GetItemText(source); - + wxTreeItemIdValue cookie; for (auto child = pTree->GetFirstChild(target, cookie); child.IsOk(); child = pTree->GetNextChild(target, cookie)) { wxString const childName = pTree->GetItemText(child); @@ -2059,16 +2361,18 @@ if (pTree->IsExpanded(pair.source)) expand.push_back(newItem); } - else if (data->m_type == CSiteManagerItemData::SITE) { - CSiteManagerItemData_Site* newData = new CSiteManagerItemData_Site(*(CSiteManagerItemData_Site *)data); - newData->connected_item = -1; + else if (data->m_site) { + CSiteManagerItemData* newData = new CSiteManagerItemData; + newData->m_site = std::make_unique(*data->m_site); + newData->connected_item = copy ? -1 : data->connected_item; pTree->SetItemData(newItem, newData); } else { pTree->SetItemImage(newItem, 3, wxTreeItemIcon_Normal); pTree->SetItemImage(newItem, 3, wxTreeItemIcon_Selected); - CSiteManagerItemData* newData = new CSiteManagerItemData(*data); + CSiteManagerItemData* newData = new CSiteManagerItemData; + newData->m_bookmark = std::make_unique(*data->m_bookmark); pTree->SetItemData(newItem, newData); } @@ -2085,14 +2389,16 @@ if (!copy) { wxTreeItemId parent = pTree->GetItemParent(source); - if (pTree->GetChildrenCount(parent) == 1) + if (pTree->GetChildrenCount(parent) == 1) { pTree->Collapse(parent); + } pTree->Delete(source); } - for (auto iter = expand.begin(); iter != expand.end(); ++iter) + for (auto iter = expand.begin(); iter != expand.end(); ++iter) { pTree->Expand(*iter); + } pTree->Expand(target); @@ -2101,8 +2407,7 @@ void CSiteManagerDialog::OnChar(wxKeyEvent& event) { - if (event.GetKeyCode() != WXK_F2) - { + if (event.GetKeyCode() != WXK_F2) { event.Skip(); return; } @@ -2111,10 +2416,11 @@ OnRename(cmdEvent); } -void CSiteManagerDialog::CopyAddServer(const CServer& server) +void CSiteManagerDialog::CopyAddServer(ServerWithCredentials const& server) { - if (!Verify()) + if (!Verify()) { return; + } AddNewSite(m_ownSites, server, true); } @@ -2150,17 +2456,21 @@ return newName; } -void CSiteManagerDialog::AddNewSite(wxTreeItemId parent, const CServer& server, bool connected /*=false*/) +void CSiteManagerDialog::AddNewSite(wxTreeItemId parent, ServerWithCredentials const& server, bool connected) { wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); - if (!pTree) + if (!pTree) { return; + } wxString name = FindFirstFreeName(parent, _("New site")); - CSiteManagerItemData_Site* pData = new CSiteManagerItemData_Site(server); - if (connected) + CSiteManagerItemData* pData = new CSiteManagerItemData; + pData->m_site = std::make_unique(); + pData->m_site->server_ = server; + if (connected) { pData->connected_item = 0; + } wxTreeItemId newItem = pTree->AppendItem(parent, name, 2, 2, pData); pTree->SortChildren(parent); @@ -2182,7 +2492,9 @@ wxString name = FindFirstFreeName(parent, _("New bookmark")); - wxTreeItemId newItem = pTree->AppendItem(parent, name, 3, 3, new CSiteManagerItemData(CSiteManagerItemData::BOOKMARK)); + CSiteManagerItemData* pData = new CSiteManagerItemData; + pData->m_bookmark = std::make_unique(); + wxTreeItemId newItem = pTree->AppendItem(parent, name, 3, 3, pData); pTree->SortChildren(parent); pTree->EnsureVisible(newItem); pTree->SafeSelectItem(newItem); @@ -2191,14 +2503,24 @@ void CSiteManagerDialog::RememberLastSelected() { - COptions::Get()->SetOption(OPTION_SITEMANAGER_LASTSELECTED, GetSitePath(false)); + wxString path; + + wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); + if (pTree) { + wxTreeItemId sel = pTree->GetSelection(); + if (sel) { + path = GetSitePath(sel); + } + } + COptions::Get()->SetOption(OPTION_SITEMANAGER_LASTSELECTED, path.ToStdWstring()); } void CSiteManagerDialog::OnContextMenu(wxTreeEvent& event) { wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_SITEMANAGER")); - if (!pMenu) + if (!pMenu) { return; + } m_contextMenuItem = event.GetItem(); @@ -2208,14 +2530,20 @@ void CSiteManagerDialog::OnExportSelected(wxCommandEvent&) { + if (!Verify()) { + return; + } + UpdateItem(); + wxFileDialog dlg(this, _("Select file for exported sites"), wxString(), _T("sites.xml"), _T("XML files (*.xml)|*.xml"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } - CXmlFile xml(dlg.GetPath()); + CXmlFile xml(dlg.GetPath().ToStdWstring()); auto exportRoot = xml.CreateEmpty(); @@ -2231,20 +2559,24 @@ void CSiteManagerDialog::OnBookmarkBrowse(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) + if (!item.IsOk()) { return; + } CSiteManagerItemData* data = static_cast(pTree->GetItemData(item)); - if (!data || data->m_type != CSiteManagerItemData::BOOKMARK) + if (!data || !data->m_bookmark) { return; + } wxDirDialog dlg(this, _("Choose the local directory"), XRCCTRL(*this, "ID_BOOKMARK_LOCALDIR", wxTextCtrl)->GetValue(), wxDD_NEW_DIR_BUTTON); - if (dlg.ShowModal() != wxID_OK) + if (dlg.ShowModal() != wxID_OK) { return; + } XRCCTRL(*this, "ID_BOOKMARK_LOCALDIR", wxTextCtrl)->ChangeValue(dlg.GetPath()); } @@ -2252,46 +2584,57 @@ void CSiteManagerDialog::OnNewBookmark(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) + if (!pTree) { return; + } wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk() || IsPredefinedItem(item)) + if (!item.IsOk() || IsPredefinedItem(item)) { return; + } CSiteManagerItemData *pData = (CSiteManagerItemData *)pTree->GetItemData(item); - if (!pData) + if (!pData) { return; - if (pData->m_type == CSiteManagerItemData::BOOKMARK) + } + if (pData->m_bookmark) { item = pTree->GetItemParent(item); + } - if (!Verify()) + if (!Verify()) { return; + } AddNewBookmark(item); } -wxString CSiteManagerDialog::GetSitePath(wxTreeItemId item, bool stripBookmark) +std::wstring CSiteManagerDialog::GetSitePath(wxTreeItemId item, bool stripBookmark) { + wxASSERT(item); + wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) - return wxString(); + if (!pTree) { + return std::wstring(); + } CSiteManagerItemData* pData = static_cast(pTree->GetItemData(item)); - if (!pData) - return wxString(); + if (!pData) { + return std::wstring(); + } - if (stripBookmark && pData->m_type == CSiteManagerItemData::BOOKMARK) + if (stripBookmark && pData->m_bookmark) { item = pTree->GetItemParent(item); + } - wxString path; - while (item) - { - if (item == m_predefinedSites) + std::wstring path; + while (item) { + if (item == m_predefinedSites) { return _T("1") + path; - else if (item == m_ownSites) + } + else if (item == m_ownSites) { return _T("0") + path; - path = _T("/") + CSiteManager::EscapeSegment(pTree->GetItemText(item)) + path; + } + path = _T("/") + CSiteManager::EscapeSegment(pTree->GetItemText(item).ToStdWstring()) + path; item = pTree->GetItemParent(item); } @@ -2299,76 +2642,81 @@ return _T("0") + path; } -wxString CSiteManagerDialog::GetSitePath(bool stripBookmark) -{ - wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); - if (!pTree) - return wxString(); - - wxTreeItemId item = pTree->GetSelection(); - if (!item.IsOk()) - return wxString(); - - return GetSitePath(item, stripBookmark); -} - void CSiteManagerDialog::SetProtocol(ServerProtocol protocol) { wxChoice* pProtocol = XRCCTRL(*this, "ID_PROTOCOL", wxChoice); wxChoice* pEncryption = XRCCTRL(*this, "ID_ENCRYPTION", wxChoice); wxStaticText* pEncryptionDesc = XRCCTRL(*this, "ID_ENCRYPTION_DESC", wxStaticText); - if (protocol == SFTP) { + auto const it = std::find(ftpSubOptions.cbegin(), ftpSubOptions.cend(), protocol); + + if (it != ftpSubOptions.cend()) { + pEncryption->SetSelection(it - ftpSubOptions.cbegin()); + pEncryption->Show(); + pEncryptionDesc->Show(); + } + else { pEncryption->Hide(); pEncryptionDesc->Hide(); - pProtocol->SetSelection(1); + } + auto const protoIt = mainProtocolListIndex_.find(protocol); + if (protoIt != mainProtocolListIndex_.cend()) { + pProtocol->SetSelection(protoIt->second); + } + else if (protocol != ServerProtocol::UNKNOWN) { + mainProtocolListIndex_[protocol] = pProtocol->Append(CServer::GetProtocolName(protocol)); + pProtocol->SetSelection(mainProtocolListIndex_[protocol]); } else { - switch (protocol) { - default: - case FTP: - pEncryption->SetSelection(0); - break; - case FTPES: - pEncryption->SetSelection(1); - break; - case FTPS: - pEncryption->SetSelection(2); - break; - case INSECURE_FTP: - pEncryption->SetSelection(3); - break; - } - pEncryption->Show(); - pEncryptionDesc->Show(); - pProtocol->SetSelection(0); + pProtocol->SetSelection(mainProtocolListIndex_[FTP]); } } ServerProtocol CSiteManagerDialog::GetProtocol() const { - wxChoice* pProtocol = XRCCTRL(*this, "ID_PROTOCOL", wxChoice); - wxChoice* pEncryption = XRCCTRL(*this, "ID_ENCRYPTION", wxChoice); - - if (pProtocol->GetSelection() == 1) - return SFTP; + int const sel = xrc_call(*this, "ID_PROTOCOL", &wxChoice::GetSelection); + if (sel == mainProtocolListIndex_.at(FTP)) { + int encSel = xrc_call(*this, "ID_ENCRYPTION", &wxChoice::GetSelection); + if (encSel >= 0 && encSel < static_cast(ftpSubOptions.size())) { + return ftpSubOptions[encSel]; + } - switch (pEncryption->GetSelection()) - { - default: - case 0: return FTP; - case 1: - return FTPES; - case 2: - return FTPS; - case 3: - return INSECURE_FTP; } + else { + for (auto const it : mainProtocolListIndex_) { + if (it.second == sel) { + return it.first; + } + } + } + + return UNKNOWN; } LogonType CSiteManagerDialog::GetLogonType() const { - return CServer::GetLogonTypeFromName(xrc_call(*this, "ID_LOGONTYPE", &wxChoice::GetStringSelection)); + return GetLogonTypeFromName(xrc_call(*this, "ID_LOGONTYPE", &wxChoice::GetStringSelection).ToStdWstring()); +} + +void CSiteManagerDialog::OnGenerateEncryptionKey(wxCommandEvent&) +{ +#if ENABLE_STORJ + CStorjKeyInterface generator(this); + std::wstring key = generator.GenerateKey(); + if (!key.empty()) { + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxTextCtrl::ChangeValue, wxString(key)); + xrc_call(*this, "ID_ENCRYPTIONKEY", &wxWindow::SetFocus); + + wxDialogEx dlg; + if (dlg.Load(this, "ID_STORJ_GENERATED_KEY")) { + dlg.WrapRecursive(&dlg, 2.5); + dlg.GetSizer()->Fit(&dlg); + dlg.GetSizer()->SetSizeHints(&dlg); + xrc_call(dlg, "ID_KEY", &wxTextCtrl::ChangeValue, wxString(key)); + dlg.ShowModal(); + } + } +#endif } diff -Nru filezilla-3.15.0.2/src/interface/sitemanager_dialog.h filezilla-3.33.0/src/interface/sitemanager_dialog.h --- filezilla-3.15.0.2/src/interface/sitemanager_dialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/sitemanager_dialog.h 2018-03-29 08:59:00.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __SITEMANAGER_DIALOG_H__ -#define __SITEMANAGER_DIALOG_H__ +#ifndef FILEZILLA_INTERFACE_SITEMANAGER_DIALOG_HEADER +#define FILEZILLA_INTERFACE_SITEMANAGER_DIALOG_HEADER #include "dialogex.h" #include "sitemanager.h" @@ -16,9 +16,9 @@ public: struct _connected_site { - CServer server; - wxString old_path; - wxString new_path; + ServerWithCredentials server; + std::wstring old_path; + std::wstring new_path; }; /// Constructors @@ -26,10 +26,9 @@ virtual ~CSiteManagerDialog(); // Creation. If pServer is set, it will cause a new item to be created. - bool Create(wxWindow* parent, std::vector<_connected_site> *connected_sites, const CServer* pServer = 0); + bool Create(wxWindow* parent, std::vector<_connected_site> *connected_sites, ServerWithCredentials const* pServer = 0); - bool GetServer(CSiteManagerItemData_Site& data); - wxString GetSitePath(bool stripBookmark = true); + bool GetServer(Site& data, Bookmark& bookmark); protected: // Creates the controls and sizers @@ -37,12 +36,13 @@ bool Verify(); bool UpdateItem(); - bool UpdateServer(CSiteManagerItemData_Site &server, const wxString& name); - bool UpdateBookmark(CSiteManagerItemData &bookmark, const CServer& server); + bool UpdateServer(Site &server, wxString const& name); + bool UpdateBookmark(Bookmark &bookmark, ServerWithCredentials const& server); bool Load(); bool Save(pugi::xml_node element = pugi::xml_node(), wxTreeItemId treeId = wxTreeItemId()); bool SaveChild(pugi::xml_node element, wxTreeItemId child); void SetCtrlState(); + void SetLogonTypeCtrlState(); bool LoadDefaultSites(); void SetProtocol(ServerProtocol protocol); @@ -53,14 +53,14 @@ wxString FindFirstFreeName(const wxTreeItemId &parent, const wxString& name); - void AddNewSite(wxTreeItemId parent, const CServer& server, bool connected = false); - void CopyAddServer(const CServer& server); + void AddNewSite(wxTreeItemId parent, ServerWithCredentials const& server, bool connected = false); + void CopyAddServer(ServerWithCredentials const& server); void AddNewBookmark(wxTreeItemId parent); void RememberLastSelected(); - wxString GetSitePath(wxTreeItemId item, bool stripBookmark = true); + std::wstring GetSitePath(wxTreeItemId item, bool stripBookmark = true); void MarkConnectedSites(); void MarkConnectedSite(int connected_site); @@ -90,6 +90,7 @@ void OnNewBookmark(wxCommandEvent&); void OnBookmarkBrowse(wxCommandEvent&); void OnKeyFileBrowse(wxCommandEvent&); + void OnGenerateEncryptionKey(wxCommandEvent&); void SetControlVisibility(ServerProtocol protocol, LogonType type); @@ -110,9 +111,16 @@ wxNotebook *m_pNotebook_Site{}; wxNotebook *m_pNotebook_Bookmark{}; + wxNotebookPage *m_pCharsetPage{}; + wxString m_charsetPageText; + size_t m_charsetPageIndex = -1; + size_t m_totalPages = -1; + std::vector<_connected_site> *m_connected_sites{}; bool m_is_deleting{}; + + std::map mainProtocolListIndex_; }; -#endif //__SITEMANAGER_DIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/sitemanager.h filezilla-3.33.0/src/interface/sitemanager.h --- filezilla-3.15.0.2/src/interface/sitemanager.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/sitemanager.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,55 +1,42 @@ -#ifndef __SITEMANAGER_H__ -#define __SITEMANAGER_H__ +#ifndef FILEZILLA_INTERFACE_SITEMANAGER_HEADER +#define FILEZILLA_INTERFACE_SITEMANAGER_HEADER #include #include "xmlfunctions.h" -class CSiteManagerItemData : public wxTreeItemData +class Bookmark final { public: - enum type - { - SITE, - BOOKMARK - }; - - CSiteManagerItemData(enum type item_type) - : m_type(item_type) - { - } - - virtual ~CSiteManagerItemData() - { - } + bool operator==(Bookmark const& b) const; + bool operator!=(Bookmark const& b) const { return !(*this == b); } wxString m_localDir; CServerPath m_remoteDir; - enum type m_type; - bool m_sync{}; bool m_comparison{}; - wxString m_path; + wxString m_name; }; -class CSiteManagerItemData_Site : public CSiteManagerItemData +class Site final { public: - CSiteManagerItemData_Site(const CServer& server = CServer()) - : CSiteManagerItemData(SITE), m_server(server) - { - connected_item = -1; - } + bool empty() const { return !server_; } + bool operator==(Site const& s) const; + bool operator!=(Site const& s) const { return !(*this == s); } - CServer m_server; + ServerWithCredentials server_; wxString m_comments; - // Needed to keep track of currently connected sites so that - // bookmarks and bookmark path can be updated in response to - // changes done here - int connected_item; + Bookmark m_default_bookmark; + + std::vector m_bookmarks; + + std::wstring m_path; + + wxColour m_colour; }; class CSiteManagerXmlHandler @@ -58,14 +45,14 @@ virtual ~CSiteManagerXmlHandler() {}; // Adds a folder and descents - virtual bool AddFolder(const wxString& name, bool expanded) = 0; - virtual bool AddSite(std::unique_ptr data) = 0; - virtual bool AddBookmark(const wxString& name, std::unique_ptr data) = 0; + virtual bool AddFolder(std::wstring const& name, bool expanded) = 0; + virtual bool AddSite(std::unique_ptr data) = 0; // Go up a level virtual bool LevelUp() { return true; } // *Ding* }; +class CLoginManager; class CSiteManagerXmlHandler; class CSiteManagerDialog; class CSiteManager @@ -73,37 +60,48 @@ friend class CSiteManagerDialog; public: // This function also clears the Id map - static std::unique_ptr GetSiteById(int id); - static std::unique_ptr GetSiteByPath(wxString sitePath); + static std::unique_ptr GetSitesMenu(); + static void ClearIdMap(); + static std::unique_ptr GetSiteById(int id); - static bool GetBookmarks(wxString sitePath, std::list &bookmarks); + static std::pair, Bookmark> GetSiteByPath(std::wstring const& sitePath, bool printErrors = true); - static wxString AddServer(CServer server); - static bool AddBookmark(wxString sitePath, const wxString& name, const wxString &local_dir, const CServerPath &remote_dir, bool sync, bool comparison); - static bool ClearBookmarks(wxString sitePath); + static wxString AddServer(ServerWithCredentials server); + static bool AddBookmark(std::wstring sitePath, const wxString& name, const wxString &local_dir, const CServerPath &remote_dir, bool sync, bool comparison); + static bool ClearBookmarks(std::wstring sitePath); - static std::unique_ptr GetSitesMenu(); - static void ClearIdMap(); + static void Rewrite(CLoginManager & loginManager, bool on_failure_set_to_ask); - static bool UnescapeSitePath(wxString path, std::list& result); - static wxString EscapeSegment( wxString segment ); + static bool UnescapeSitePath(std::wstring path, std::vector& result); + static std::wstring EscapeSegment(std::wstring segment); static bool HasSites(); + static bool ReadBookmarkElement(Bookmark & bookmark, pugi::xml_node element); + + static wxColour GetColourFromIndex(int i); + static int GetColourIndex(wxColour const& c); + static wxString GetColourName(int i); + protected: + static void Rewrite(CLoginManager & loginManager, pugi::xml_node element, bool on_failure_set_to_ask); + static void Save(pugi::xml_node element, Site const& site); + + static std::pair, Bookmark> DoGetSiteByPath(std::wstring sitePath, wxString& error); + static bool Load(CSiteManagerXmlHandler& pHandler); static bool Load(pugi::xml_node element, CSiteManagerXmlHandler& pHandler); - static std::unique_ptr ReadServerElement(pugi::xml_node element); + static std::unique_ptr ReadServerElement(pugi::xml_node element); - static pugi::xml_node GetElementByPath(pugi::xml_node node, std::list const& segments); - static wxString BuildPath(wxChar root, std::list const& segments); + static pugi::xml_node GetElementByPath(pugi::xml_node node, std::vector const& segments); + static std::wstring BuildPath(wxChar root, std::vector const& segments); - static std::map> m_idMap; + static std::map> m_idMap; // The map maps event id's to sites - static std::unique_ptr GetSitesMenu_Predefined(std::map> &idMap); + static std::unique_ptr GetSitesMenu_Predefined(std::map> &idMap); static bool LoadPredefined(CSiteManagerXmlHandler& handler); }; -#endif //__SITEMANAGER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/sizeformatting.cpp filezilla-3.33.0/src/interface/sizeformatting.cpp --- filezilla-3.15.0.2/src/interface/sizeformatting.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/sizeformatting.cpp 2016-10-14 20:16:51.000000000 +0000 @@ -2,32 +2,32 @@ #include "sizeformatting.h" #include "Options.h" -wxString CSizeFormat::Format(int64_t size, bool add_bytes_suffix, enum CSizeFormat::_format format, bool thousands_separator, int num_decimal_places) +std::wstring CSizeFormat::Format(int64_t size, bool add_bytes_suffix, CSizeFormat::_format format, bool thousands_separator, int num_decimal_places) { return CSizeFormatBase::Format(COptions::Get(), size, add_bytes_suffix, format, thousands_separator, num_decimal_places); } -wxString CSizeFormat::Format(int64_t size, bool add_bytes_suffix /*=false*/) +std::wstring CSizeFormat::Format(int64_t size, bool add_bytes_suffix) { return CSizeFormatBase::Format(COptions::Get(), size, add_bytes_suffix); } -wxString CSizeFormat::FormatUnit(int64_t size, CSizeFormat::_unit unit, int base /*=1024*/) +std::wstring CSizeFormat::FormatUnit(int64_t size, CSizeFormat::_unit unit, int base) { return CSizeFormatBase::FormatUnit(COptions::Get(), size, unit, base); } -wxString CSizeFormat::GetUnitWithBase(_unit unit, int base) +std::wstring CSizeFormat::GetUnitWithBase(_unit unit, int base) { return CSizeFormatBase::GetUnitWithBase(COptions::Get(), unit, base); } -wxString CSizeFormat::GetUnit(_unit unit, CSizeFormat::_format format /*=formats_count*/) +std::wstring CSizeFormat::GetUnit(_unit unit, CSizeFormat::_format format) { return CSizeFormatBase::GetUnit(COptions::Get(), unit, format); } -wxString CSizeFormat::FormatNumber(int64_t size, bool* thousands_separator /*=0*/) +std::wstring CSizeFormat::FormatNumber(int64_t size, bool* thousands_separator) { return CSizeFormatBase::FormatNumber(COptions::Get(), size, thousands_separator); } diff -Nru filezilla-3.15.0.2/src/interface/sizeformatting.h filezilla-3.33.0/src/interface/sizeformatting.h --- filezilla-3.15.0.2/src/interface/sizeformatting.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/sizeformatting.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,19 +1,19 @@ -#ifndef __SIZEFORMATTING_H__ -#define __SIZEFORMATTING_H__ +#ifndef FILEZILLA_INTERFACE_SIZEFORMATTING_HEADER +#define FILEZILLA_INTERFACE_SIZEFORMATTING_HEADER #include -class CSizeFormat : public CSizeFormatBase +class CSizeFormat final : public CSizeFormatBase { public: - static wxString FormatNumber(int64_t size, bool* thousands_separator = 0); + static std::wstring FormatNumber(int64_t size, bool* thousands_separator = 0); - static wxString GetUnitWithBase(_unit unit, int base); - static wxString GetUnit(_unit unit, enum _format = formats_count); - static wxString FormatUnit(int64_t size, _unit unit, int base = 1024); + static std::wstring GetUnitWithBase(_unit unit, int base); + static std::wstring GetUnit(_unit unit, _format = formats_count); + static std::wstring FormatUnit(int64_t size, _unit unit, int base = 1024); - static wxString Format(int64_t size, bool add_bytes_suffix, enum _format format, bool thousands_separator, int num_decimal_places); - static wxString Format(int64_t size, bool add_bytes_suffix = false); + static std::wstring Format(int64_t size, bool add_bytes_suffix, _format format, bool thousands_separator, int num_decimal_places); + static std::wstring Format(int64_t size, bool add_bytes_suffix = false); }; -#endif //__SIZEFORMATTING_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/speedlimits_dialog.cpp filezilla-3.33.0/src/interface/speedlimits_dialog.cpp --- filezilla-3.15.0.2/src/interface/speedlimits_dialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/speedlimits_dialog.cpp 2017-01-09 16:00:55.000000000 +0000 @@ -2,6 +2,8 @@ #include "sizeformatting.h" #include "speedlimits_dialog.h" #include "Options.h" +#include "themeprovider.h" +#include "xrc_helper.h" BEGIN_EVENT_TABLE(CSpeedLimitsDialog, wxDialogEx) EVT_BUTTON(wxID_OK, CSpeedLimitsDialog::OnOK) @@ -10,8 +12,12 @@ void CSpeedLimitsDialog::Run(wxWindow* parent) { - if (!Load(parent, _T("ID_SPEEDLIMITS"))) + if (!Load(parent, _T("ID_SPEEDLIMITS"))) { return; + } + + wxBitmap bmp = CThemeProvider::Get()->CreateBitmap("ART_SPEEDLIMITS", wxString(), CThemeProvider::GetIconSize(iconSizeLarge)); + xrc_call(*this, "ID_SPEEDLIMITS_ICON", &wxStaticBitmap::SetBitmap, bmp); int downloadlimit = COptions::Get()->GetOptionVal(OPTION_SPEEDLIMIT_INBOUND); int uploadlimit = COptions::Get()->GetOptionVal(OPTION_SPEEDLIMIT_OUTBOUND); @@ -34,12 +40,16 @@ const wxString unit = CSizeFormat::GetUnitWithBase(CSizeFormat::kilo, 1024); wxStaticText* pUnit = XRCCTRL(*this, "ID_DOWNLOADLIMIT_UNIT", wxStaticText); - if (pUnit) + if (pUnit) { pUnit->SetLabel(wxString::Format(pUnit->GetLabel(), unit)); + } pUnit = XRCCTRL(*this, "ID_UPLOADLIMIT_UNIT", wxStaticText); - if (pUnit) + if (pUnit) { pUnit->SetLabel(wxString::Format(pUnit->GetLabel(), unit)); + } + + GetSizer()->Fit(this); ShowModal(); } diff -Nru filezilla-3.15.0.2/src/interface/speedlimits_dialog.h filezilla-3.33.0/src/interface/speedlimits_dialog.h --- filezilla-3.15.0.2/src/interface/speedlimits_dialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/speedlimits_dialog.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,9 +1,9 @@ -#ifndef __SPEEDLIMITS_DIALOG_H__ -#define __SPEEDLIMITS_DIALOG_H__ +#ifndef FILEZILLA_INTERFACE_SPEEDLIMITS_DIALOG_HEADER +#define FILEZILLA_INTERFACE_SPEEDLIMITS_DIALOG_HEADER #include "dialogex.h" -class CSpeedLimitsDialog : public wxDialogEx +class CSpeedLimitsDialog final : public wxDialogEx { public: CSpeedLimitsDialog() {} @@ -17,4 +17,4 @@ void OnOK(wxCommandEvent& event); }; -#endif //__SPEEDLIMITS_DIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/splitter.cpp filezilla-3.33.0/src/interface/splitter.cpp --- filezilla-3.15.0.2/src/interface/splitter.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/splitter.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,8 +1,6 @@ #include #include "splitter.h" -IMPLEMENT_CLASS(CSplitterWindowEx, wxSplitterWindow) - BEGIN_EVENT_TABLE(CSplitterWindowEx, wxSplitterWindow) EVT_SIZE(CSplitterWindowEx::OnSize) END_EVENT_TABLE() @@ -45,20 +43,17 @@ wxWindow *parent = wxGetTopLevelParent(this); bool iconized; - wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow); - if ( winTop ) - { + auto winTop = dynamic_cast(parent); + if ( winTop ) { iconized = winTop->IsIconized(); } - else - { + else { wxFAIL_MSG(wxT("should have a top level parent!")); iconized = false; } - if ( iconized ) - { + if (iconized) { m_lastSize = wxSize(0,0); event.Skip(); @@ -66,8 +61,7 @@ return; } - if ( m_windowTwo ) - { + if (m_windowTwo) { int w, h; GetClientSize(&w, &h); diff -Nru filezilla-3.15.0.2/src/interface/splitter.h filezilla-3.33.0/src/interface/splitter.h --- filezilla-3.15.0.2/src/interface/splitter.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/splitter.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -#ifndef __SPLITTER_H__ -#define __SPLITTER_H__ +#ifndef FILEZILLA_INTERFACE_SPLITTER_HEADER +#define FILEZILLA_INTERFACE_SPLITTER_HEADER -class CSplitterWindowEx : public wxSplitterWindow +class CSplitterWindowEx final : public wxSplitterWindow { public: CSplitterWindowEx(); @@ -33,8 +33,6 @@ int CalcSoftLimit(int newSashPosition); - DECLARE_CLASS(CSplitterWindowEx) - DECLARE_EVENT_TABLE() void OnSize(wxSizeEvent& event); @@ -45,4 +43,4 @@ int m_lastSashPosition; }; -#endif //__SPLITTER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/state.cpp filezilla-3.33.0/src/interface/state.cpp --- filezilla-3.15.0.2/src/interface/state.cpp 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/interface/state.cpp 2018-05-01 03:30:04.000000000 +0000 @@ -6,12 +6,31 @@ #include "Mainfrm.h" #include "queue.h" #include "filezillaapp.h" -#include "recursive_operation.h" +#include "local_recursive_operation.h" +#include "remote_recursive_operation.h" #include "listingcomparison.h" #include "xrc_helper.h" #include +#include + +bool CStateFilterManager::FilenameFiltered(std::wstring const& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, fz::datetime const& date) const +{ + if (local) { + if (m_localFilter && FilenameFilteredByFilter(m_localFilter, name, path, dir, size, attributes, date)) { + return true; + } + } + else { + if (m_remoteFilter && FilenameFilteredByFilter(m_remoteFilter, name, path, dir, size, attributes, date)) { + return true; + } + } + + return CFilterManager::FilenameFiltered(name, path, dir, size, local, attributes, date); +} + CContextManager CContextManager::m_the_context_manager; CContextManager::CContextManager() @@ -44,8 +63,7 @@ m_contexts.erase(m_contexts.begin() + i); if ((int)i < m_current_context) m_current_context--; - else if ((int)i == m_current_context) - { + else if ((int)i == m_current_context) { if (i >= m_contexts.size()) m_current_context--; NotifyHandlers(GetCurrentContext(), STATECHANGE_CHANGEDCONTEXT, _T(""), 0); @@ -63,8 +81,7 @@ if (GetCurrentContext() == pState) return; - for (unsigned int i = 0; i < m_contexts.size(); i++) - { + for (unsigned int i = 0; i < m_contexts.size(); ++i) { if (m_contexts[i] != pState) continue; @@ -78,8 +95,7 @@ m_current_context = -1; NotifyHandlers(GetCurrentContext(), STATECHANGE_CHANGEDCONTEXT, _T(""), 0); - while (!m_contexts.empty()) - { + while (!m_contexts.empty()) { CState* pState = m_contexts.back(); m_contexts.pop_back(); @@ -88,7 +104,7 @@ } } -void CContextManager::RegisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification, bool current_only) +void CContextManager::RegisterHandler(CGlobalStateEventHandler* pHandler, t_statechange_notifications notification, bool current_only) { wxASSERT(pHandler); wxASSERT(notification != STATECHANGE_MAX && notification != STATECHANGE_NONE); @@ -106,7 +122,7 @@ handlers.push_back(handler); } -void CContextManager::UnregisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification) +void CContextManager::UnregisterHandler(CGlobalStateEventHandler* pHandler, t_statechange_notifications notification) { wxASSERT(pHandler); wxASSERT(notification != STATECHANGE_MAX); @@ -139,14 +155,15 @@ return m_handlers[notification].size(); } -void CContextManager::NotifyHandlers(CState* pState, t_statechange_notifications notification, const wxString& data, const void* data2) +void CContextManager::NotifyHandlers(CState* pState, t_statechange_notifications notification, wxString const& data, void const* data2) { wxASSERT(notification != STATECHANGE_NONE && notification != STATECHANGE_MAX); auto const& handlers = m_handlers[notification]; for (auto const& handler : handlers) { - if (handler.current_only && pState != GetCurrentContext()) + if (handler.current_only && pState != GetCurrentContext()) { continue; + } handler.pHandler->OnStateChange(pState, notification, data, data2); } @@ -154,19 +171,21 @@ CState* CContextManager::GetCurrentContext() { - if (m_current_context == -1) + if (m_current_context == -1) { return 0; + } return m_contexts[m_current_context]; } -void CContextManager::NotifyAllHandlers(enum t_statechange_notifications notification, const wxString& data /*=_T("")*/, const void* data2 /*=0*/) +void CContextManager::NotifyAllHandlers(t_statechange_notifications notification, wxString const& data, void const* data2) { - for (unsigned int i = 0; i < m_contexts.size(); i++) - m_contexts[i]->NotifyHandlers(notification, data, data2); + for (auto const& context : m_contexts) { + context->NotifyHandlers(notification, data, data2); + } } -void CContextManager::NotifyGlobalHandlers(enum t_statechange_notifications notification, const wxString& data /*=_T("")*/, const void* data2 /*=0*/) +void CContextManager::NotifyGlobalHandlers(t_statechange_notifications notification, wxString const& data, void const* data2) { auto const& handlers = m_handlers[notification]; for (auto const& handler : handlers) { @@ -174,39 +193,43 @@ } } +void CContextManager::ProcessDirectoryListing(CServer const& server, std::shared_ptr const& listing, CState const* exempt) +{ + for (auto state : m_contexts) { + if (state == exempt) { + continue; + } + if (state->GetServer() && state->GetServer().server == server) { + state->SetRemoteDir(listing, true); + } + } +} + CState::CState(CMainFrame &mainFrame) : m_mainFrame(mainFrame) { m_title = _("Not connected"); - m_pComparisonManager = new CComparisonManager(this); - - m_pRecursiveOperation = new CRecursiveOperation(this); + m_pComparisonManager = new CComparisonManager(*this); - m_sync_browse.is_changing = false; - m_sync_browse.compare = false; + m_pLocalRecursiveOperation = new CLocalRecursiveOperation(*this); + m_pRemoteRecursiveOperation = new CRemoteRecursiveOperation(*this); - m_localDir.SetPath(CLocalPath::path_separator); + m_localDir.SetPath(std::wstring(1, CLocalPath::path_separator)); } CState::~CState() { - delete m_pServer; - delete m_pComparisonManager; delete m_pCommandQueue; delete m_pEngine; + delete m_pLocalRecursiveOperation; + delete m_pRemoteRecursiveOperation; // Unregister all handlers - for (int i = 0; i < STATECHANGE_MAX; i++) - { - for (auto iter = m_handlers[i].begin(); iter != m_handlers[i].end(); ++iter) - { - iter->pHandler->m_pState = 0; - } + for (int i = 0; i < STATECHANGE_MAX; ++i) { + wxASSERT(m_handlers[i].handlers.empty()); } - - delete m_pRecursiveOperation; } CLocalPath CState::GetLocalDir() const @@ -215,49 +238,53 @@ } -bool CState::SetLocalDir(const wxString& dir, wxString *error, bool rememberPreviousSubdir) +bool CState::SetLocalDir(std::wstring const& dir, std::wstring *error, bool rememberPreviousSubdir) { CLocalPath p(m_localDir); #ifdef __WXMSW__ - if (dir == _T("..") && !p.HasParent() && p.HasLogicalParent()) - { + if (dir == _T("..") && !p.HasParent() && p.HasLogicalParent()) { // Parent of C:\ is drive list - if (!p.MakeParent()) + if (!p.MakeParent()) { return false; + } } else #endif - if (!p.ChangePath(dir)) + if (!p.ChangePath(dir)) { return false; + } return SetLocalDir(p, error, rememberPreviousSubdir); } -bool CState::SetLocalDir(CLocalPath const& dir, wxString *error, bool rememberPreviousSubdir) +bool CState::SetLocalDir(CLocalPath const& dir, std::wstring *error, bool rememberPreviousSubdir) { - if (m_sync_browse.is_changing) { - wxMessageBoxEx(_T("Cannot change directory, there already is a synchronized browsing operation in progress."), _("Synchronized browsing")); + if (m_changeDirFlags.syncbrowse) { + wxMessageBoxEx(_("Cannot change directory, there already is a synchronized browsing operation in progress."), _("Synchronized browsing")); return false; } - if (!dir.Exists(error)) + if (!dir.Exists(error)) { return false; + } if (!m_sync_browse.local_root.empty()) { - wxASSERT(m_pServer); + wxASSERT(m_site.server_); if (dir != m_sync_browse.local_root && !dir.IsSubdirOf(m_sync_browse.local_root)) { wxString msg = wxString::Format(_("The local directory '%s' is not below the synchronization root (%s).\nDisable synchronized browsing and continue changing the local directory?"), dir.GetPath(), m_sync_browse.local_root.GetPath()); - if (wxMessageBoxEx(msg, _("Synchronized browsing"), wxICON_QUESTION | wxYES_NO) != wxYES) + if (wxMessageBoxEx(msg, _("Synchronized browsing"), wxICON_QUESTION | wxYES_NO) != wxYES) { return false; + } SetSyncBrowse(false); } else if (!IsRemoteIdle(true)) { wxString msg(_("A remote operation is in progress and synchronized browsing is enabled.\nDisable synchronized browsing and continue changing the local directory?")); - if (wxMessageBoxEx(msg, _("Synchronized browsing"), wxICON_QUESTION | wxYES_NO) != wxYES) + if (wxMessageBoxEx(msg, _("Synchronized browsing"), wxICON_QUESTION | wxYES_NO) != wxYES) { return false; + } SetSyncBrowse(false); } else { @@ -270,8 +297,8 @@ return false; } - m_sync_browse.is_changing = true; - m_sync_browse.compare = m_pComparisonManager->IsComparing(); + m_changeDirFlags.syncbrowse = true; + m_changeDirFlags.compare = m_pComparisonManager->IsComparing(); m_sync_browse.target_path = remote_path; CListCommand *pCommand = new CListCommand(remote_path); m_pCommandQueue->ProcessCommand(pCommand); @@ -290,8 +317,9 @@ #endif m_previouslyVisitedLocalSubdir = m_localDir.GetLastSegment(); } - else + else { m_previouslyVisitedLocalSubdir = _T(""); + } m_localDir = dir; @@ -306,9 +334,11 @@ bool CState::SetRemoteDir(std::shared_ptr const& pDirectoryListing, bool modified) { if (!pDirectoryListing) { + m_changeDirFlags.compare = false; SetSyncBrowse(false); - if (modified) + if (modified) { return false; + } if (m_pDirectoryListing) { m_pDirectoryListing = 0; @@ -322,9 +352,12 @@ if (pDirectoryListing && m_pDirectoryListing && pDirectoryListing->path == m_pDirectoryListing->path.GetParent()) + { m_previouslyVisitedRemoteSubdir = m_pDirectoryListing->path.GetLastSegment(); - else + } + else { m_previouslyVisitedRemoteSubdir = _T(""); + } if (modified) { if (!m_pDirectoryListing || m_pDirectoryListing->path != pDirectoryListing->path) { @@ -332,8 +365,9 @@ return true; } } - else + else { m_last_path = pDirectoryListing->path; + } if (m_pDirectoryListing && m_pDirectoryListing->path == pDirectoryListing->path && pDirectoryListing->failed()) @@ -346,8 +380,13 @@ NotifyHandlers(STATECHANGE_REMOTE_DIR, wxString(), &modified); - if (m_sync_browse.is_changing && !modified) { - m_sync_browse.is_changing = false; + bool compare = m_changeDirFlags.compare; + if (!modified) { + m_changeDirFlags.compare = false; + } + + if (m_changeDirFlags.syncbrowse && !modified) { + m_changeDirFlags.syncbrowse = false; if (m_pDirectoryListing->path != m_sync_browse.remote_root && !m_pDirectoryListing->path.IsSubdirOf(m_sync_browse.remote_root, false)) { SetSyncBrowse(false); wxString msg = wxString::Format(_("Current remote directory (%s) is not below the synchronization root (%s).\nSynchronized browsing has been disabled."), @@ -362,27 +401,31 @@ wxString msg = wxString::Format(_("Could not obtain corresponding local directory for the remote directory '%s'.\nSynchronized browsing has been disabled."), m_pDirectoryListing->path.GetPath()); wxMessageBoxEx(msg, _("Synchronized browsing")); - return true; + compare = false; } + else { + std::wstring error; + if (!local_path.Exists(&error)) { + SetSyncBrowse(false); + wxString msg = error + _T("\n") + _("Synchronized browsing has been disabled."); + wxMessageBoxEx(msg, _("Synchronized browsing")); + compare = false; + } + else { + m_localDir = local_path; - wxString error; - if (!local_path.Exists(&error)) { - SetSyncBrowse(false); - wxString msg = error + _T("\n") + _("Synchronized browsing has been disabled."); - wxMessageBoxEx(msg, _("Synchronized browsing")); - return true; - } - - m_localDir = local_path; - - COptions::Get()->SetOption(OPTION_LASTLOCALDIR, m_localDir.GetPath()); - - NotifyHandlers(STATECHANGE_LOCAL_DIR); + COptions::Get()->SetOption(OPTION_LASTLOCALDIR, m_localDir.GetPath()); - if (m_sync_browse.compare) - m_pComparisonManager->CompareListings(); + NotifyHandlers(STATECHANGE_LOCAL_DIR); + } + } } } + + if (compare && !m_pComparisonManager->IsComparing()) { + m_pComparisonManager->CompareListings(); + } + return true; } @@ -404,36 +447,38 @@ NotifyHandlers(STATECHANGE_LOCAL_DIR); } -void CState::RefreshLocalFile(wxString file) +void CState::RefreshLocalFile(std::wstring const& file) { - wxString file_name; + std::wstring file_name; CLocalPath path(file, &file_name); - if (path.empty()) + if (path.empty()) { return; + } - if (file_name.empty()) - { - if (!path.HasParent()) + if (file_name.empty()) { + if (!path.HasParent()) { return; + } path.MakeParent(&file_name); wxASSERT(!file_name.empty()); } - if (path != m_localDir) + if (path != m_localDir) { return; + } NotifyHandlers(STATECHANGE_LOCAL_REFRESH_FILE, file_name); } void CState::LocalDirCreated(const CLocalPath& path) { - if (!path.IsSubdirOf(m_localDir)) + if (!path.IsSubdirOf(m_localDir)) { return; + } - wxString next_segment = path.GetPath().Mid(m_localDir.GetPath().Len()); + wxString next_segment = path.GetPath().substr(m_localDir.GetPath().size()); int pos = next_segment.Find(CLocalPath::path_separator); - if (pos <= 0) - { + if (pos <= 0) { // Shouldn't ever come true return; } @@ -445,52 +490,48 @@ NotifyHandlers(STATECHANGE_LOCAL_REFRESH_FILE, next_segment); } -void CState::SetServer(const CServer* server, CServerPath const& path) +void CState::SetSite(Site const& site, CServerPath const& path) { - if (m_pServer) { - if (server && *server == *m_pServer && - server->GetName() == m_pServer->GetName() && - server->MaximumMultipleConnections() == m_pServer->MaximumMultipleConnections()) + if (m_site.server_) { + if (site.server_ && site.server_ == m_site.server_ && + site.server_.server.GetName() == m_site.server_.server.GetName() && + site.server_.server.MaximumMultipleConnections() == m_site.server_.server.MaximumMultipleConnections()) { // Nothing changes return; } SetRemoteDir(0); - delete m_pServer; m_pCertificate.reset(); m_pSftpEncryptionInfo.reset(); } - if (server) { + if (site.server_) { if (!path.empty()) { m_last_path = path; } - else if (m_last_server != *server) { + else if (m_last_site.server_ != site.server_) { m_last_path.clear(); } - m_last_server = *server; + m_last_site = site; + } - m_pServer = new CServer(*server); + m_site = site; - const wxString& name = server->GetName(); - if (!name.empty()) - m_title = name + _T(" - ") + server->FormatServer(); - else - m_title = server->FormatServer(); - } - else { - m_pServer = 0; - m_title = _("Not connected"); - } + UpdateTitle(); m_successful_connect = false; NotifyHandlers(STATECHANGE_SERVER); } -const CServer* CState::GetServer() const +Site const& CState::GetSite() const { - return m_pServer; + return m_site; +} + +ServerWithCredentials const& CState::GetServer() const +{ + return m_site.server_; } wxString CState::GetTitle() const @@ -498,35 +539,45 @@ return m_title; } -bool CState::Connect(const CServer& server, const CServerPath& path /*=CServerPath()*/) +bool CState::Connect(Site const& site, CServerPath const& path, bool compare) { - if (!m_pEngine) + if (!site.server_) { return false; - if (m_pEngine->IsConnected() || m_pEngine->IsBusy() || !m_pCommandQueue->Idle()) + } + if (!m_pEngine) { + return false; + } + if (m_pEngine->IsConnected() || m_pEngine->IsBusy() || !m_pCommandQueue->Idle()) { m_pCommandQueue->Cancel(); - m_pRecursiveOperation->StopRecursiveOperation(); + } + m_pRemoteRecursiveOperation->StopRecursiveOperation(); SetSyncBrowse(false); - m_pCommandQueue->ProcessCommand(new CConnectCommand(server)); + m_pCommandQueue->ProcessCommand(new CConnectCommand(site.server_.server, site.server_.credentials)); m_pCommandQueue->ProcessCommand(new CListCommand(path, _T(""), LIST_FLAG_FALLBACK_CURRENT)); - SetServer(&server, path); + SetSite(site, path); + + m_changeDirFlags.compare = compare; return true; } bool CState::Disconnect() { - if (!m_pEngine) + if (!m_pEngine) { return false; + } - if (!IsRemoteConnected()) + if (!IsRemoteConnected()) { return true; + } - if (!IsRemoteIdle()) + if (!IsRemoteIdle()) { return false; + } - SetServer(0); + SetSite(Site()); m_pCommandQueue->ProcessCommand(new CDisconnectCommand()); return true; @@ -535,13 +586,13 @@ bool CState::CreateEngine() { wxASSERT(!m_pEngine); - if (m_pEngine) + if (m_pEngine) { return true; + } - m_pEngine = new CFileZillaEngine(m_mainFrame.GetEngineContext()); - m_pEngine->Init(&m_mainFrame); + m_pEngine = new CFileZillaEngine(m_mainFrame.GetEngineContext(), m_mainFrame); - m_pCommandQueue = new CCommandQueue(m_pEngine, &m_mainFrame, this); + m_pCommandQueue = new CCommandQueue(m_pEngine, &m_mainFrame, *this); return true; } @@ -554,35 +605,37 @@ m_pEngine = 0; } -void CState::RegisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification, CStateEventHandler* insertBefore) +void CState::RegisterHandler(CStateEventHandler* pHandler, t_statechange_notifications notification, CStateEventHandler* insertBefore) { wxASSERT(pHandler); - wxASSERT(pHandler->m_pState == this); - if (pHandler->m_pState != this) + wxASSERT(&pHandler->m_state == this); + if (!pHandler || &pHandler->m_state != this) { return; + } wxASSERT(notification != STATECHANGE_MAX && notification != STATECHANGE_NONE); wxASSERT(pHandler != insertBefore); - + auto &handlers = m_handlers[notification]; - auto insertionPoint = handlers.end(); - for (auto it = handlers.begin(); it != handlers.end(); ++it) { - if (it->pHandler == insertBefore) { + wxASSERT(!insertBefore || !handlers.inNotify_); + + auto insertionPoint = handlers.handlers.end(); + + for (auto it = handlers.handlers.begin(); it != handlers.handlers.end(); ++it) { + if (*it == insertBefore) { insertionPoint = it; } - if (it->pHandler == pHandler) { - wxASSERT(insertionPoint == handlers.end()); + if (*it == pHandler) { + wxASSERT(insertionPoint == handlers.handlers.end()); return; } } - t_handler handler; - handler.pHandler = pHandler; - handlers.insert(insertionPoint, handler); + handlers.handlers.insert(insertionPoint, pHandler); } -void CState::UnregisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification) +void CState::UnregisterHandler(CStateEventHandler* pHandler, t_statechange_notifications notification) { wxASSERT(pHandler); wxASSERT(notification != STATECHANGE_MAX); @@ -590,9 +643,15 @@ if (notification == STATECHANGE_NONE) { for (int i = 0; i < STATECHANGE_MAX; ++i) { auto &handlers = m_handlers[i]; - for (auto iter = handlers.begin(); iter != handlers.end(); ++iter) { - if (iter->pHandler == pHandler) { - handlers.erase(iter); + for (auto iter = handlers.handlers.begin(); iter != handlers.handlers.end(); ++iter) { + if (*iter == pHandler) { + if (handlers.inNotify_) { + handlers.compact_ = true; + *iter = 0; + } + else { + handlers.handlers.erase(iter); + } break; } } @@ -600,89 +659,133 @@ } else { auto &handlers = m_handlers[notification]; - for (auto iter = handlers.begin(); iter != handlers.end(); ++iter) { - if (iter->pHandler == pHandler) { - handlers.erase(iter); + for (auto iter = handlers.handlers.begin(); iter != handlers.handlers.end(); ++iter) { + if (*iter == pHandler) { + if (handlers.inNotify_) { + handlers.compact_ = true; + *iter = 0; + } + else { + handlers.handlers.erase(iter); + } return; } } } } -void CState::NotifyHandlers(enum t_statechange_notifications notification, const wxString& data, const void* data2) +void CState::NotifyHandlers(t_statechange_notifications notification, const wxString& data, const void* data2) { wxASSERT(notification != STATECHANGE_NONE && notification != STATECHANGE_MAX); - auto const& handlers = m_handlers[notification]; - for (auto const& handler : handlers) { - handler.pHandler->OnStateChange(this, notification, data, data2); + auto & handlers = m_handlers[notification]; + + wxASSERT(!handlers.inNotify_); + + handlers.inNotify_ = true; + // Can't use iterators as inserting a handler might invalidate them + for (size_t i = 0; i < handlers.handlers.size(); ++i) { + if (handlers.handlers[i]) { + handlers.handlers[i]->OnStateChange(notification, data, data2); + } + } + + if (handlers.compact_) { + handlers.handlers.erase(std::remove(handlers.handlers.begin(), handlers.handlers.end(), nullptr), handlers.handlers.end()); + handlers.compact_ = false; } + handlers.inNotify_ = false; + CContextManager::Get()->NotifyHandlers(this, notification, data, data2); } -CStateEventHandler::CStateEventHandler(CState* pState) - : m_pState(pState) +CStateEventHandler::CStateEventHandler(CState &state) + : m_state(state) { } CStateEventHandler::~CStateEventHandler() { - CContextManager::Get()->UnregisterHandler(this, STATECHANGE_NONE); + m_state.UnregisterHandler(this, STATECHANGE_NONE); +} - const std::vector *states = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = states->begin(); iter != states->end(); ++iter) - (*iter)->UnregisterHandler(this, STATECHANGE_NONE); +CGlobalStateEventHandler::~CGlobalStateEventHandler() +{ + CContextManager::Get()->UnregisterHandler(this, STATECHANGE_NONE); } void CState::UploadDroppedFiles(const wxFileDataObject* pFileDataObject, const wxString& subdir, bool queueOnly) { - if (!m_pServer || !m_pDirectoryListing) + if (!m_site.server_ || !m_pDirectoryListing) { return; + } CServerPath path = m_pDirectoryListing->path; - if (subdir == _T("..") && path.HasParent()) + if (subdir == _T("..") && path.HasParent()) { path = path.GetParent(); - else if (!subdir.empty()) - path.AddSegment(subdir); + } + else if (!subdir.empty()) { + path.AddSegment(subdir.ToStdWstring()); + } UploadDroppedFiles(pFileDataObject, path, queueOnly); } void CState::UploadDroppedFiles(const wxFileDataObject* pFileDataObject, const CServerPath& path, bool queueOnly) { - if (!m_pServer) + if (!m_site.server_) { return; + } - const wxArrayString& files = pFileDataObject->GetFilenames(); + if (path.empty()) { + return; + } + + auto recursiveOperation = GetLocalRecursiveOperation(); + if (!recursiveOperation || recursiveOperation->IsActive()) { + wxBell(); + return; + } + + wxArrayString const& files = pFileDataObject->GetFilenames(); for (unsigned int i = 0; i < files.Count(); ++i) { int64_t size; bool is_link; fz::local_filesys::type type = fz::local_filesys::get_file_info(fz::to_native(files[i]), is_link, &size, 0, 0); if (type == fz::local_filesys::file) { - wxString localFile; - const CLocalPath localPath(files[i], &localFile); - m_mainFrame.GetQueue()->QueueFile(queueOnly, false, localFile, wxEmptyString, localPath, path, *m_pServer, size); + std::wstring localFile; + const CLocalPath localPath(files[i].ToStdWstring(), &localFile); + m_mainFrame.GetQueue()->QueueFile(queueOnly, false, localFile, wxEmptyString, localPath, path, m_site.server_, size); m_mainFrame.GetQueue()->QueueFile_Finish(!queueOnly); } else if (type == fz::local_filesys::dir) { - CLocalPath localPath(files[i]); - if (localPath.HasParent()) - { - CServerPath target = path; - target.AddSegment(localPath.GetLastSegment()); - m_mainFrame.GetQueue()->QueueFolder(queueOnly, false, localPath, target, *m_pServer); + CLocalPath localPath(files[i].ToStdWstring()); + if (localPath.HasParent()) { + + CServerPath remotePath = path; + if (!remotePath.ChangePath(localPath.GetLastSegment())) { + continue; + } + + local_recursion_root root; + root.add_dir_to_visit(localPath, remotePath); + recursiveOperation->AddRecursionRoot(std::move(root)); } } } + + CFilterManager filter; + recursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_transfer, filter.GetActiveFilters(), !queueOnly); } void CState::HandleDroppedFiles(const wxFileDataObject* pFileDataObject, const CLocalPath& path, bool copy) { const wxArrayString &files = pFileDataObject->GetFilenames(); - if (!files.Count()) + if (!files.Count()) { return; + } #ifdef __WXMSW__ int len = 1; @@ -701,9 +804,9 @@ } *p = 0; // End of list - wxChar* to = new wxChar[path.GetPath().Len() + 2]; + wxChar* to = new wxChar[path.GetPath().size() + 2]; wxStrcpy(to, path.GetPath()); - to[path.GetPath().Len() + 1] = 0; // End of list + to[path.GetPath().size() + 1] = 0; // End of list SHFILEOPSTRUCT op = {0}; op.pFrom = from; @@ -717,45 +820,53 @@ #else wxString error; for (unsigned int i = 0; i < files.Count(); ++i) { - wxString const& file(files[i]); + std::wstring const file(files[i].ToStdWstring()); int64_t size; bool is_link; fz::local_filesys::type type = fz::local_filesys::get_file_info(fz::to_native(file), is_link, &size, 0, 0); if (type == fz::local_filesys::file) { - wxString name; + std::wstring name; CLocalPath sourcePath(file, &name); - if (name.empty()) + if (name.empty()) { continue; + } wxString target = path.GetPath() + name; - if (file == target) + if (file == target) { continue; + } - if (copy) + if (copy) { wxCopyFile(file, target); - else + } + else { wxRenameFile(file, target); + } } else if (type == fz::local_filesys::dir) { CLocalPath sourcePath(file); - if (sourcePath == path || sourcePath.GetParent() == path) + if (sourcePath == path || sourcePath.GetParent() == path) { continue; + } if (sourcePath.IsParentOf(path)) { error = _("A directory cannot be dragged into one of its subdirectories."); continue; } - if (copy) + if (copy) { RecursiveCopy(sourcePath, path); + } else { - if (!sourcePath.HasParent()) + if (!sourcePath.HasParent()) { continue; + } wxRenameFile(file, path.GetPath() + sourcePath.GetLastSegment()); } } } - if (!error.empty()) + if (!error.empty()) { wxMessageBoxEx(error, _("Could not complete operation")); + } #endif RefreshLocal(); @@ -763,34 +874,42 @@ bool CState::RecursiveCopy(CLocalPath source, const CLocalPath& target) { - if (source.empty() || target.empty()) + if (source.empty() || target.empty()) { return false; + } - if (source == target) + if (source == target) { return false; + } - if (source.IsParentOf(target)) + if (source.IsParentOf(target)) { return false; + } - if (!source.HasParent()) + if (!source.HasParent()) { return false; + } - wxString last_segment; - if (!source.MakeParent(&last_segment)) + std::wstring last_segment; + if (!source.MakeParent(&last_segment)) { return false; + } - std::list dirsToVisit; + std::list dirsToVisit; dirsToVisit.push_back(last_segment + CLocalPath::path_separator); + fz::native_string const nsource = fz::to_native(source.GetPath()); + // Process any subdirs which still have to be visited while (!dirsToVisit.empty()) { - wxString dirname = dirsToVisit.front(); + std::wstring dirname = dirsToVisit.front(); dirsToVisit.pop_front(); wxMkdir(target.GetPath() + dirname); fz::local_filesys fs; - if (!fs.begin_find_files(fz::to_native(source.GetPath() + dirname), false)) + if (!fs.begin_find_files(nsource + fz::to_native(dirname), false)) { continue; + } bool is_dir, is_link; fz::native_string file; @@ -801,14 +920,16 @@ } if (is_dir) { - if (is_link) + if (is_link) { continue; + } - const wxString subDir = dirname + file + CLocalPath::path_separator; + std::wstring const subDir = dirname + fz::to_wstring(file) + CLocalPath::path_separator; dirsToVisit.push_back(subDir); } - else + else { wxCopyFile(source.GetPath() + dirname + file, target.GetPath() + dirname + file); + } } } @@ -819,44 +940,46 @@ { bool hasDirs = false; bool hasFiles = false; - const std::list& files = pRemoteDataObject->GetFiles(); - for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) { - if (iter->dir) + std::vector const& files = pRemoteDataObject->GetFiles(); + for (auto const& fileInfo : files) { + if (fileInfo.dir) { hasDirs = true; - else + } + else { hasFiles = true; + } } if (hasDirs) { - if (!IsRemoteConnected() || !IsRemoteIdle()) + if (!IsRemoteConnected() || !IsRemoteIdle()) { return false; + } } - if (hasFiles) + if (hasFiles) { m_mainFrame.GetQueue()->QueueFiles(queueOnly, path, *pRemoteDataObject); + } - if (!hasDirs) + if (!hasDirs) { return true; + } recursion_root root(pRemoteDataObject->GetServerPath(), false); - for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) { - if (!iter->dir) + for (auto const& fileInfo : files) { + if (!fileInfo.dir) { continue; + } CLocalPath newPath(path); - newPath.AddSegment(CQueueView::ReplaceInvalidCharacters(iter->name)); - root.add_dir_to_visit(pRemoteDataObject->GetServerPath(), iter->name, newPath, iter->link); + newPath.AddSegment(CQueueView::ReplaceInvalidCharacters(fileInfo.name)); + root.add_dir_to_visit(pRemoteDataObject->GetServerPath(), fileInfo.name, newPath, fileInfo.link); } if (!root.empty()) { - if (m_pComparisonManager->IsComparing()) - m_pComparisonManager->ExitComparisonMode(); - - m_pRecursiveOperation->AddRecursionRoot(std::move(root)); + m_pRemoteRecursiveOperation->AddRecursionRoot(std::move(root)); CFilterManager filter; - m_pRecursiveOperation->StartRecursiveOperation(queueOnly ? CRecursiveOperation::recursive_addtoqueue : CRecursiveOperation::recursive_download, - filter.GetActiveFilters(false), pRemoteDataObject->GetServerPath()); + m_pRemoteRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_transfer, filter.GetActiveFilters(), pRemoteDataObject->GetServerPath(), !queueOnly); } return true; @@ -864,15 +987,16 @@ bool CState::IsRemoteConnected() const { - if (!m_pEngine) + if (!m_pEngine) { return false; + } - return m_pServer != 0; + return static_cast(m_site.server_); } bool CState::IsRemoteIdle(bool ignore_recursive) const { - if (!ignore_recursive && m_pRecursiveOperation->GetOperationMode() != CRecursiveOperation::recursive_none) + if (!ignore_recursive && m_pRemoteRecursiveOperation && m_pRemoteRecursiveOperation->GetOperationMode() != CRecursiveOperation::recursive_none) return false; if (!m_pCommandQueue) @@ -881,9 +1005,20 @@ return m_pCommandQueue->Idle(ignore_recursive ? CCommandQueue::normal : CCommandQueue::any); } +bool CState::IsLocalIdle(bool ignore_recursive) const +{ + if (!ignore_recursive && m_pLocalRecursiveOperation && m_pLocalRecursiveOperation->GetOperationMode() != CRecursiveOperation::recursive_none) + return false; + + return true; +} + void CState::ListingFailed(int) { - if (m_sync_browse.is_changing && !m_sync_browse.target_path.empty()) { + bool const compare = m_changeDirFlags.compare; + m_changeDirFlags.compare = false; + + if (m_changeDirFlags.syncbrowse && !m_sync_browse.target_path.empty()) { wxDialogEx dlg; if (!dlg.Load(0, _T("ID_SYNCBROWSE_NONEXISTING"))) { SetSyncBrowse(false); @@ -895,11 +1030,11 @@ xrc_call(dlg, "ID_SYNCBROWSE_DISABLE", &wxRadioButton::SetLabel, _("&Disable synchronized browsing and continue changing the local directory")); dlg.GetSizer()->Fit(&dlg); if (dlg.ShowModal() == wxID_OK) { - if (xrc_call(dlg, "ID_SYNCBROWSE_CREATE", &wxRadioButton::GetValue)) { m_pCommandQueue->ProcessCommand(new CMkdirCommand(m_sync_browse.target_path)); m_pCommandQueue->ProcessCommand(new CListCommand(m_sync_browse.target_path)); m_sync_browse.target_path.clear(); + m_changeDirFlags.compare = compare; return; } else { @@ -908,22 +1043,25 @@ SetLocalDir(local); } } + else { + m_changeDirFlags.syncbrowse = false; + } } - - m_sync_browse.is_changing = false; } void CState::LinkIsNotDir(const CServerPath& path, const wxString& subdir) { - m_sync_browse.is_changing = false; + m_changeDirFlags.compare = false; + m_changeDirFlags.syncbrowse = false; NotifyHandlers(STATECHANGE_REMOTE_LINKNOTDIR, subdir, &path); } -bool CState::ChangeRemoteDir(const CServerPath& path, const wxString& subdir /*=_T("")*/, int flags /*=0*/, bool ignore_busy /*=false*/) +bool CState::ChangeRemoteDir(CServerPath const& path, std::wstring const& subdir, int flags, bool ignore_busy, bool compare) { - if (!m_pServer || !m_pCommandQueue) + if (!m_site.server_ || !m_pCommandQueue) { return false; + } if (!m_sync_browse.local_root.empty()) { CServerPath p(path); @@ -937,8 +1075,9 @@ wxString msg = wxString::Format(_("The remote directory '%s' is not below the synchronization root (%s).\nDisable synchronized browsing and continue changing the remote directory?"), p.GetPath(), m_sync_browse.remote_root.GetPath()); - if (wxMessageBoxEx(msg, _("Synchronized browsing"), wxICON_QUESTION | wxYES_NO) != wxYES) + if (wxMessageBoxEx(msg, _("Synchronized browsing"), wxICON_QUESTION | wxYES_NO) != wxYES) { return false; + } SetSyncBrowse(false); } else if (!IsRemoteIdle(true) && !ignore_busy) { @@ -947,13 +1086,14 @@ return false; } else { - wxString error; + std::wstring error; CLocalPath local_path = GetSynchronizedDirectory(p); if (local_path.empty()) { wxString msg = wxString::Format(_("Could not obtain corresponding local directory for the remote directory '%s'.\nDisable synchronized browsing and continue changing the remote directory?"), p.GetPath()); - if (wxMessageBoxEx(msg, _("Synchronized browsing"), wxICON_QUESTION | wxYES_NO) != wxYES) + if (wxMessageBoxEx(msg, _("Synchronized browsing"), wxICON_QUESTION | wxYES_NO) != wxYES) { return false; + } SetSyncBrowse(false); } else if (!local_path.Exists(&error)) { @@ -981,8 +1121,8 @@ wxMessageBox(wxString::Format(_("The local directory '%s' could not be created."), local_path.GetPath()), _("Synchronized browsing"), wxICON_EXCLAMATION); return false; } - m_sync_browse.is_changing = true; - m_sync_browse.compare = m_pComparisonManager->IsComparing(); + m_changeDirFlags.syncbrowse = true; + m_changeDirFlags.compare = m_pComparisonManager->IsComparing(); m_sync_browse.target_path.clear(); } else { @@ -990,8 +1130,8 @@ } } else { - m_sync_browse.is_changing = true; - m_sync_browse.compare = m_pComparisonManager->IsComparing(); + m_changeDirFlags.syncbrowse = true; + m_changeDirFlags.compare = m_pComparisonManager->IsComparing(); m_sync_browse.target_path.clear(); } } @@ -1000,19 +1140,24 @@ CListCommand *pCommand = new CListCommand(path, subdir, flags); m_pCommandQueue->ProcessCommand(pCommand); + if (compare) { + m_changeDirFlags.compare = true; + } + return true; } -bool CState::SetSyncBrowse(bool enable, const CServerPath& assumed_remote_root /*=CServerPath()*/) +bool CState::SetSyncBrowse(bool enable, CServerPath const& assumed_remote_root) { - if (enable != m_sync_browse.local_root.empty()) + if (enable != m_sync_browse.local_root.empty()) { return enable; + } if (!enable) { wxASSERT(assumed_remote_root.empty()); m_sync_browse.local_root.clear(); m_sync_browse.remote_root.clear(); - m_sync_browse.is_changing = false; + m_changeDirFlags.syncbrowse = false; NotifyHandlers(STATECHANGE_SYNC_BROWSE); return false; @@ -1023,15 +1168,15 @@ return false; } - m_sync_browse.is_changing = false; + m_changeDirFlags.syncbrowse = false; m_sync_browse.local_root = m_localDir; - if (assumed_remote_root.empty()) + if (assumed_remote_root.empty()) { m_sync_browse.remote_root = m_pDirectoryListing->path; + } else { m_sync_browse.remote_root = assumed_remote_root; - m_sync_browse.is_changing = true; - m_sync_browse.compare = false; + m_changeDirFlags.syncbrowse = true; } while (m_sync_browse.local_root.HasParent() && m_sync_browse.remote_root.HasParent() && @@ -1047,17 +1192,19 @@ CLocalPath CState::GetSynchronizedDirectory(CServerPath remote_path) { - std::list segments; + std::list segments; while (remote_path.HasParent() && remote_path != m_sync_browse.remote_root) { segments.push_front(remote_path.GetLastSegment()); remote_path = remote_path.GetParent(); } - if (remote_path != m_sync_browse.remote_root) + if (remote_path != m_sync_browse.remote_root) { return CLocalPath(); + } CLocalPath local_path = m_sync_browse.local_root; - for (std::list::const_iterator iter = segments.begin(); iter != segments.end(); ++iter) - local_path.AddSegment(*iter); + for (auto const& segment : segments) { + local_path.AddSegment(segment); + } return local_path; } @@ -1065,29 +1212,33 @@ CServerPath CState::GetSynchronizedDirectory(CLocalPath local_path) { - std::list segments; + std::list segments; while (local_path.HasParent() && local_path != m_sync_browse.local_root) { - wxString last; + std::wstring last; local_path.MakeParent(&last); segments.push_front(last); } - if (local_path != m_sync_browse.local_root) + if (local_path != m_sync_browse.local_root) { return CServerPath(); + } CServerPath remote_path = m_sync_browse.remote_root; - for (std::list::const_iterator iter = segments.begin(); iter != segments.end(); ++iter) - remote_path.AddSegment(*iter); + for (auto const& segment : segments) { + remote_path.AddSegment(segment); + } return remote_path; } bool CState::RefreshRemote() { - if (!m_pCommandQueue) + if (!m_pCommandQueue) { return false; + } - if (!IsRemoteConnected() || !IsRemoteIdle(true)) + if (!IsRemoteConnected() || !IsRemoteIdle(true)) { return false; + } return ChangeRemoteDir(GetRemotePath(), _T(""), LIST_FLAG_REFRESH); } @@ -1117,3 +1268,46 @@ m_pSftpEncryptionInfo = std::make_unique(info); NotifyHandlers(STATECHANGE_ENCRYPTION); } + +void CState::UpdateSite(wxString const& oldPath, Site const& newSite) +{ + if (newSite.m_path.empty() || !newSite.server_) { + return; + } + + bool changed = false; + if (m_site.server_ && m_site != newSite) { + if (m_site.m_path == oldPath && m_site.server_ == newSite.server_) { + m_site = newSite; + changed = true; + } + } + if (m_last_site.server_ && m_last_site != newSite) { + if (m_last_site.m_path == oldPath && m_last_site.server_ == newSite.server_) { + m_last_site = newSite; + if (!m_site.server_) { + // Active site has precedence over historic data + changed = true; + } + } + } + if (changed) { + UpdateTitle(); + NotifyHandlers(STATECHANGE_SERVER); + } +} + +void CState::UpdateTitle() +{ + if (m_site.server_) { + wxString const& name = m_site.server_.server.GetName(); + m_title.clear(); + if (!name.empty()) { + m_title = name + _T(" - "); + } + m_title += m_site.server_.Format(ServerFormat::with_user_and_optional_port); + } + else { + m_title = _("Not connected"); + } +} diff -Nru filezilla-3.15.0.2/src/interface/state.h filezilla-3.33.0/src/interface/state.h --- filezilla-3.15.0.2/src/interface/state.h 2016-02-10 19:27:09.000000000 +0000 +++ filezilla-3.33.0/src/interface/state.h 2017-10-25 17:12:23.000000000 +0000 @@ -1,7 +1,9 @@ -#ifndef __STATE_H__ -#define __STATE_H__ +#ifndef FILEZILLA_INTERFACE_STATE_HEADER +#define FILEZILLA_INTERFACE_STATE_HEADER #include "local_path.h" +#include "sitemanager.h" +#include "filter.h" #include @@ -28,13 +30,20 @@ STATECHANGE_SYNC_BROWSE, STATECHANGE_COMPARISON, - STATECHANGE_RECURSION_STATUS, + STATECHANGE_REMOTE_RECURSION_STATUS, + STATECHANGE_LOCAL_RECURSION_STATUS, + + STATECHANGE_LOCAL_RECURSION_LISTING, /* Global notifications */ STATECHANGE_QUEUEPROCESSING, STATECHANGE_NEWCONTEXT, /* New context created */ STATECHANGE_CHANGEDCONTEXT, /* Currently active context changed */ STATECHANGE_REMOVECONTEXT, /* Right before deleting a context */ + STATECHANGE_GLOBALBOOKMARKS, + STATECHANGE_REWRITE_CREDENTIALS, + + STATECHANGE_QUITNOW, STATECHANGE_MAX }; @@ -42,12 +51,30 @@ class CDirectoryListing; class CFileZillaEngine; class CCommandQueue; +class CLocalRecursiveOperation; class CMainFrame; +class CGlobalStateEventHandler; class CStateEventHandler; class CRemoteDataObject; -class CRecursiveOperation; +class CRemoteRecursiveOperation; class CComparisonManager; +class CStateFilterManager final : public CFilterManager +{ +public: + virtual bool FilenameFiltered(std::wstring const& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, fz::datetime const& date) const override; + + CFilter const& GetLocalFilter() const { return m_localFilter; } + void SetLocalFilter(CFilter const& filter) { m_localFilter = filter; } + + CFilter const& GetRemoteFilter() const { return m_remoteFilter; } + void SetRemoteFilter(CFilter const& filter) { m_remoteFilter = filter; } + +private: + CFilter m_localFilter; + CFilter m_remoteFilter; +}; + class CState; class CContextManager final { @@ -55,10 +82,10 @@ public: // If current_only is set, only notifications from the current (at the time // of notification emission) context is dispatched to the handler. - void RegisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification, bool current_only); - void UnregisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification); + void RegisterHandler(CGlobalStateEventHandler* pHandler, t_statechange_notifications notification, bool current_only); + void UnregisterHandler(CGlobalStateEventHandler* pHandler, t_statechange_notifications notification); - size_t HandlerCount(enum t_statechange_notifications notification) const; + size_t HandlerCount(t_statechange_notifications notification) const; CState* CreateState(CMainFrame &mainFrame); void DestroyState(CState* pState); @@ -69,11 +96,13 @@ static CContextManager* Get(); - void NotifyAllHandlers(enum t_statechange_notifications notification, const wxString& data = _T(""), const void* data2 = 0); - void NotifyGlobalHandlers(enum t_statechange_notifications notification, const wxString& data = _T(""), const void* data2 = 0); + void NotifyAllHandlers(t_statechange_notifications notification, wxString const& data = wxString(), void const* data2 = 0); + void NotifyGlobalHandlers(t_statechange_notifications notification, wxString const& data = wxString(), void const* data2 = 0); void SetCurrentContext(CState* pState); + void ProcessDirectoryListing(CServer const& server, std::shared_ptr const& listing, CState const* exempt); + protected: CContextManager(); @@ -82,12 +111,12 @@ struct t_handler { - CStateEventHandler* pHandler; + CGlobalStateEventHandler* pHandler; bool current_only; }; std::vector m_handlers[STATECHANGE_MAX]; - void NotifyHandlers(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2); + void NotifyHandlers(CState* pState, t_statechange_notifications notification, wxString const& data, void const* data2); static CContextManager m_the_context_manager; }; @@ -106,28 +135,29 @@ void DestroyEngine(); CLocalPath GetLocalDir() const; - bool SetLocalDir(CLocalPath const& dir, wxString *error = 0, bool rememberPreviousSubdir = true); - bool SetLocalDir(const wxString& dir, wxString *error = 0, bool rememberPreviousSubdir = true); + bool SetLocalDir(CLocalPath const& dir, std::wstring *error = 0, bool rememberPreviousSubdir = true); + bool SetLocalDir(std::wstring const& dir, std::wstring *error = 0, bool rememberPreviousSubdir = true); - bool Connect(const CServer& server, const CServerPath& path = CServerPath()); + bool Connect(Site const& site, const CServerPath& path = CServerPath(), bool compare = false); bool Disconnect(); - bool ChangeRemoteDir(const CServerPath& path, const wxString& subdir = _T(""), int flags = 0, bool ignore_busy = false); + bool ChangeRemoteDir(CServerPath const& path, std::wstring const& subdir = std::wstring(), int flags = 0, bool ignore_busy = false, bool compare = false); bool SetRemoteDir(std::shared_ptr const& pDirectoryListing, bool modified = false); std::shared_ptr GetRemoteDir() const; const CServerPath GetRemotePath() const; - const CServer* GetServer() const; + Site const& GetSite() const; + ServerWithCredentials const& GetServer() const; wxString GetTitle() const; void RefreshLocal(); - void RefreshLocalFile(wxString file); + void RefreshLocalFile(std::wstring const& file); void LocalDirCreated(const CLocalPath& path); bool RefreshRemote(); - void RegisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification, CStateEventHandler* insertBefore = 0); - void UnregisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification); + void RegisterHandler(CStateEventHandler* pHandler, t_statechange_notifications notification, CStateEventHandler* insertBefore = 0); + void UnregisterHandler(CStateEventHandler* pHandler, t_statechange_notifications notification); CFileZillaEngine* m_pEngine{}; CCommandQueue* m_pCommandQueue{}; @@ -142,10 +172,12 @@ bool IsRemoteConnected() const; bool IsRemoteIdle(bool ignore_recursive = false) const; + bool IsLocalIdle(bool ignore_recursive = false) const; - CRecursiveOperation* GetRecursiveOperationHandler() { return m_pRecursiveOperation; } + CLocalRecursiveOperation* GetLocalRecursiveOperation() { return m_pLocalRecursiveOperation; } + CRemoteRecursiveOperation* GetRemoteRecursiveOperation() { return m_pRemoteRecursiveOperation; } - void NotifyHandlers(enum t_statechange_notifications notification, wxString const& data = wxString(), const void* data2 = 0); + void NotifyHandlers(t_statechange_notifications notification, wxString const& data = wxString(), const void* data2 = 0); bool SuccessfulConnect() const { return m_successful_connect; } void SetSuccessfulConnect() { m_successful_connect = true; } @@ -156,10 +188,10 @@ bool SetSyncBrowse(bool enable, const CServerPath& assumed_remote_root = CServerPath()); bool GetSyncBrowse() const { return !m_sync_browse.local_root.empty(); } - CServer GetLastServer() const { return m_last_server; } + Site GetLastSite() const { return m_last_site; } CServerPath GetLastServerPath() const { return m_last_path; } - void SetLastServer(const CServer& server, const CServerPath& path) - { m_last_server = server; m_last_path = path; } + void SetLastSite(Site const& server, CServerPath const& path) + { m_last_site = server; m_last_path = path; } bool GetSecurityInfo(CCertificateNotification *& pInfo); bool GetSecurityInfo(CSftpEncryptionNotification *& pInfo); @@ -173,30 +205,43 @@ void ClearPreviouslyVisitedLocalSubdir() { m_previouslyVisitedLocalSubdir = _T(""); } void ClearPreviouslyVisitedRemoteSubdir() { m_previouslyVisitedRemoteSubdir = _T(""); } + void UpdateSite(wxString const& oldPath, Site const& newSite); + + CStateFilterManager& GetStateFilterManager() { return m_stateFilterManager; } + protected: - void SetServer(const CServer* server, CServerPath const& path = CServerPath()); + void SetSite(Site const& site, CServerPath const& path = CServerPath()); + + void UpdateTitle(); CLocalPath m_localDir; std::shared_ptr m_pDirectoryListing; - CServer* m_pServer{}; + Site m_site; + wxString m_title; bool m_successful_connect{}; - CServer m_last_server; + Site m_last_site; CServerPath m_last_path; CMainFrame& m_mainFrame; - CRecursiveOperation* m_pRecursiveOperation; + CLocalRecursiveOperation* m_pLocalRecursiveOperation; + CRemoteRecursiveOperation* m_pRemoteRecursiveOperation; CComparisonManager* m_pComparisonManager; - - struct t_handler + + CStateFilterManager m_stateFilterManager; + + struct t_handlersForNotification { - CStateEventHandler* pHandler; + std::vector handlers; + bool compact_{}; + bool inNotify_{}; }; - std::vector m_handlers[STATECHANGE_MAX]; + + t_handlersForNotification m_handlers[STATECHANGE_MAX]; CLocalPath GetSynchronizedDirectory(CServerPath remote_path); CServerPath GetSynchronizedDirectory(CLocalPath local_path); @@ -205,13 +250,17 @@ { CLocalPath local_root; CServerPath remote_root; - bool is_changing; - bool compare; // The target path when changing remote directory CServerPath target_path; } m_sync_browse; + struct _post_setdir + { + bool compare{}; + bool syncbrowse{}; + } m_changeDirFlags; + std::unique_ptr m_pCertificate; std::unique_ptr m_pSftpEncryptionInfo; @@ -219,15 +268,24 @@ wxString m_previouslyVisitedRemoteSubdir; }; +class CGlobalStateEventHandler +{ +public: + CGlobalStateEventHandler() = default; + virtual ~CGlobalStateEventHandler(); + + virtual void OnStateChange(CState* pState, t_statechange_notifications notification, const wxString& data, const void* data2) = 0; +}; + class CStateEventHandler { public: - CStateEventHandler(CState* pState); + CStateEventHandler(CState& state); virtual ~CStateEventHandler(); - CState* m_pState; + CState& m_state; - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2) = 0; + virtual void OnStateChange(t_statechange_notifications notification, const wxString& data, const void* data2) = 0; }; #endif diff -Nru filezilla-3.15.0.2/src/interface/statusbar.cpp filezilla-3.33.0/src/interface/statusbar.cpp --- filezilla-3.15.0.2/src/interface/statusbar.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/statusbar.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -9,6 +9,8 @@ #include +#include + static const int statbarWidths[3] = { -3, 0, 25 }; @@ -29,8 +31,9 @@ #ifdef __WXMSW__ m_parentWasMaximized = false; - if (GetLayoutDirection() != wxLayout_RightToLeft) + if (GetLayoutDirection() != wxLayout_RightToLeft) { SetDoubleBuffered(true); + } #endif } @@ -39,7 +42,7 @@ delete [] m_columnWidths; } -void wxStatusBarEx::SetFieldsCount(int number /*=1*/, const int* widths /*=NULL*/) +void wxStatusBarEx::SetFieldsCount(int number, const int* widths) { wxASSERT(number > 0); @@ -47,28 +50,28 @@ int* oldWidths = m_columnWidths; m_columnWidths = new int[number]; - if (!widths) - { - if (oldWidths) - { - const int min = wxMin(oldCount, number); - for (int i = 0; i < min; i++) + if (!widths) { + if (oldWidths) { + const int min = std::min(oldCount, number); + for (int i = 0; i < min; ++i) { m_columnWidths[i] = oldWidths[i]; - for (int i = min; i < number; i++) + } + for (int i = min; i < number; ++i) { m_columnWidths[i] = -1; + } delete [] oldWidths; } - else - { - for (int i = 0; i < number; i++) + else { + for (int i = 0; i < number; ++i) { m_columnWidths[i] = -1; + } } } - else - { + else { delete [] oldWidths; - for (int i = 0; i < number; i++) + for (int i = 0; i < number; ++i) { m_columnWidths[i] = widths[i]; + } FixupFieldWidth(number - 1); } @@ -80,8 +83,9 @@ { wxASSERT(n == GetFieldsCount()); wxASSERT(widths); - for (int i = 0; i < n; i++) + for (int i = 0; i < n; ++i) { m_columnWidths[i] = widths[i]; + } FixupFieldWidth(n - 1); @@ -90,20 +94,22 @@ void wxStatusBarEx::FixupFieldWidth(int field) { - if (field != GetFieldsCount() - 1) + if (field != GetFieldsCount() - 1) { return; + } #if __WXGTK20__ // Gripper overlaps last all the time - if (m_columnWidths[field] > 0) + if (m_columnWidths[field] > 0) { m_columnWidths[field] += 15; + } #endif } void wxStatusBarEx::SetFieldWidth(int field, int width) { field = GetFieldIndex(field); - if( field < 0 ) { + if (field < 0) { return; } @@ -129,18 +135,18 @@ { #ifdef __WXMSW__ const int count = GetFieldsCount(); - if (count && m_columnWidths && m_columnWidths[count - 1] > 0) - { + if (count && m_columnWidths && m_columnWidths[count - 1] > 0) { // No sizegrip on maximized windows bool isMaximized = m_pParent->IsMaximized(); - if (isMaximized != m_parentWasMaximized) - { + if (isMaximized != m_parentWasMaximized) { m_parentWasMaximized = isMaximized; - if (isMaximized) + if (isMaximized) { m_columnWidths[count - 1] -= 16; - else + } + else { m_columnWidths[count - 1] += 16; + } wxStatusBar::SetStatusWidths(count, m_columnWidths); Refresh(); @@ -189,19 +195,21 @@ { wxStatusBarEx::OnSize(event); - for (int i = 0; i < GetFieldsCount(); i++) + for (int i = 0; i < GetFieldsCount(); ++i) { PositionChildren(i); + } #ifdef __WXMSW__ - if (GetLayoutDirection() != wxLayout_RightToLeft) + if (GetLayoutDirection() != wxLayout_RightToLeft) { Update(); + } #endif } bool CWidgetsStatusBar::AddField(int field, int idx, wxWindow* pChild) { field = GetFieldIndex(field); - if( field < 0 ) { + if (field < 0) { return false; } @@ -234,17 +242,16 @@ int offset = 2; #ifndef __WXMSW__ - if (field + 1 == GetFieldsCount()) - { + if (field + 1 == GetFieldsCount()) { rect.SetWidth(m_columnWidths[field]); offset += 5 + GetGripperWidth(); } #endif - for (auto iter = m_children.begin(); iter != m_children.end(); ++iter) - { - if (iter->second.field != field) + for (auto iter = m_children.begin(); iter != m_children.end(); ++iter) { + if (iter->second.field != field) { continue; + } const wxSize size = iter->second.pChild->GetSize(); int position = rect.GetRight() - size.x - offset; @@ -258,8 +265,9 @@ void CWidgetsStatusBar::SetFieldWidth(int field, int width) { wxStatusBarEx::SetFieldWidth(field, width); - for (int i = 0; i < GetFieldsCount(); i++) + for (int i = 0; i < GetFieldsCount(); ++i) { PositionChildren(i); + } } class CIndicator : public wxStaticBitmap @@ -297,7 +305,7 @@ END_EVENT_TABLE() CStatusBar::CStatusBar(wxTopLevelWindow* pParent) - : CWidgetsStatusBar(pParent), CStateEventHandler(0) + : CWidgetsStatusBar(pParent) { // Speedlimits RegisterOption(OPTION_SPEEDLIMIT_ENABLE); @@ -312,7 +320,7 @@ RegisterOption(OPTION_ASCIIBINARY); // Reload icons - RegisterOption(OPTION_THEME); + RegisterOption(OPTION_ICONS_THEME); CContextManager::Get()->RegisterHandler(this, STATECHANGE_SERVER, true); CContextManager::Get()->RegisterHandler(this, STATECHANGE_CHANGEDCONTEXT, false); @@ -371,12 +379,13 @@ void CStatusBar::DisplayDataType() { - const CServer* pServer = 0; - const CState* pState = CContextManager::Get()->GetCurrentContext(); - if (pState) - pServer = pState->GetServer(); + ServerWithCredentials server; + CState const* pState = CContextManager::Get()->GetCurrentContext(); + if (pState) { + server = pState->GetServer(); + } - if (!pServer || !CServer::ProtocolHasDataTypeConcept(pServer->GetProtocol())) { + if (!server || !CServer::ProtocolHasFeature(server.server.GetProtocol(), ProtocolFeature::DataTypeConcept)) { if (m_pDataTypeIndicator) { RemoveField(widget_datatype); m_pDataTypeIndicator->Destroy(); @@ -401,13 +410,14 @@ desc = _("Current transfer type is set to automatic detection."); } - wxBitmap bmp = wxArtProvider::GetBitmap(name, wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); + wxBitmap bmp = CThemeProvider::Get()->CreateBitmap(name, wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); if (!m_pDataTypeIndicator) { m_pDataTypeIndicator = new CIndicator(this, bmp); AddField(0, widget_datatype, m_pDataTypeIndicator); } - else + else { m_pDataTypeIndicator->SetBitmap(bmp); + } m_pDataTypeIndicator->SetToolTip(desc); } } @@ -420,11 +430,11 @@ wxSize s = dc.GetTextExtent(_("Queue: empty")); wxString tmp = _T(">8888"); - if (m_sizeFormatDecimalPlaces) - { + if (m_sizeFormatDecimalPlaces) { tmp += _T("."); - for (int i = 0; i < m_sizeFormatDecimalPlaces; i++) + for (int i = 0; i < m_sizeFormatDecimalPlaces; ++i) { tmp += _T("8"); + } } s.IncTo(dc.GetTextExtent(wxString::Format(_("Queue: %s MiB"), tmp))); @@ -433,18 +443,20 @@ void CStatusBar::DisplayEncrypted() { - const CServer* pServer = 0; - CState* pState = CContextManager::Get()->GetCurrentContext(); - if (pState) - pServer = pState->GetServer(); + ServerWithCredentials server; + CState *const pState = CContextManager::Get()->GetCurrentContext(); + if (pState) { + server = pState->GetServer(); + } bool encrypted = false; - if (pServer) { + if (server) { CCertificateNotification* info; - if (pServer->GetProtocol() == FTPS || pServer->GetProtocol() == FTPES || pServer->GetProtocol() == SFTP) { + auto const protocol = server.server.GetProtocol(); + if (protocol == FTPS || protocol == FTPES || protocol == SFTP || protocol == S3 || protocol == WEBDAV || protocol == AZURE_BLOB || protocol == AZURE_FILE) { encrypted = true; } - else if (pServer->GetProtocol() == FTP && pState->GetSecurityInfo(info)) { + else if (protocol == FTP && pState->GetSecurityInfo(info)) { encrypted = true; } } @@ -457,14 +469,15 @@ } } else { - wxBitmap bmp = wxArtProvider::GetBitmap(_T("ART_LOCK"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); + wxBitmap bmp = CThemeProvider::Get()->CreateBitmap(_T("ART_LOCK"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); if (!m_pEncryptionIndicator) { m_pEncryptionIndicator = new CIndicator(this, bmp); AddField(0, widget_encryption, m_pEncryptionIndicator); m_pEncryptionIndicator->SetToolTip(_("The connection is encrypted. Click icon for details.")); } - else + else { m_pEncryptionIndicator->SetBitmap(bmp); + } } } @@ -491,7 +504,8 @@ CCertificateNotification *pCertificateNotification = 0; CSftpEncryptionNotification *pSftpEncryptionNotification = 0; if (pState->GetSecurityInfo(pCertificateNotification)) { - CVerifyCertDialog dlg; + CertStore certStore; + CVerifyCertDialog dlg(certStore); dlg.ShowVerificationDialog(*pCertificateNotification, true); } else if (pState->GetSecurityInfo(pSftpEncryptionNotification)) { @@ -560,7 +574,7 @@ { bool enable = COptions::Get()->GetOptionVal(OPTION_SPEEDLIMIT_ENABLE) != 0; - wxBitmap bmp = wxArtProvider::GetBitmap(_T("ART_SPEEDLIMITS"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); + wxBitmap bmp = CThemeProvider::Get()->CreateBitmap(_T("ART_SPEEDLIMITS"), wxART_OTHER, CThemeProvider::GetIconSize(iconSizeSmall)); if (!bmp.Ok()) { return; } @@ -571,29 +585,38 @@ if (!enable || (!downloadLimit && !uploadLimit)) { wxImage img = bmp.ConvertToImage(); img = img.ConvertToGreyscale(); +#ifdef __WXMAC__ + bmp = wxBitmap(img, -1, bmp.GetScaleFactor()); +#else bmp = wxBitmap(img); +#endif tooltip = _("Speed limits are disabled, click to change."); } else { tooltip = _("Speed limits are enabled, click to change."); tooltip += _T("\n"); - if (downloadLimit) + if (downloadLimit) { tooltip += wxString::Format(_("Download limit: %s/s"), CSizeFormat::FormatUnit(downloadLimit, CSizeFormat::kilo)); - else + } + else { tooltip += _("Download limit: none"); + } tooltip += _T("\n"); - if (uploadLimit) + if (uploadLimit) { tooltip += wxString::Format(_("Upload limit: %s/s"), CSizeFormat::FormatUnit(uploadLimit, CSizeFormat::kilo)); - else + } + else { tooltip += _("Upload limit: none"); + } } if (!m_pSpeedLimitsIndicator) { m_pSpeedLimitsIndicator = new CIndicator(this, bmp); AddField(0, widget_speedlimit, m_pSpeedLimitsIndicator); } - else + else { m_pSpeedLimitsIndicator->SetBitmap(bmp); + } m_pSpeedLimitsIndicator->SetToolTip(tooltip); } @@ -608,14 +631,14 @@ if (options.test(OPTION_ASCIIBINARY)) { DisplayDataType(); } - if (options.test(OPTION_THEME)) { + if (options.test(OPTION_ICONS_THEME)) { DisplayDataType(); UpdateSpeedLimitsIcon(); DisplayEncrypted(); } } -void CStatusBar::OnStateChange(CState*, enum t_statechange_notifications notification, const wxString&, const void*) +void CStatusBar::OnStateChange(CState*, t_statechange_notifications notification, const wxString&, const void*) { if (notification == STATECHANGE_SERVER || notification == STATECHANGE_CHANGEDCONTEXT) { DisplayDataType(); @@ -631,18 +654,18 @@ int downloadlimit = COptions::Get()->GetOptionVal(OPTION_SPEEDLIMIT_INBOUND); int uploadlimit = COptions::Get()->GetOptionVal(OPTION_SPEEDLIMIT_OUTBOUND); bool enable = COptions::Get()->GetOptionVal(OPTION_SPEEDLIMIT_ENABLE) == 0; - if (enable) - { - if (!downloadlimit && !uploadlimit) - { + if (enable) { + if (!downloadlimit && !uploadlimit) { CSpeedLimitsDialog dlg; dlg.Run(m_pParent); } - else + else { COptions::Get()->SetOption(OPTION_SPEEDLIMIT_ENABLE, 1); + } } - else + else { COptions::Get()->SetOption(OPTION_SPEEDLIMIT_ENABLE, 0); + } } void CStatusBar::OnSpeedLimitsConfigure(wxCommandEvent&) diff -Nru filezilla-3.15.0.2/src/interface/statusbar.h filezilla-3.33.0/src/interface/statusbar.h --- filezilla-3.15.0.2/src/interface/statusbar.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/statusbar.h 2017-06-02 20:38:13.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __STATUSBAR_H__ -#define __STATUSBAR_H__ +#ifndef FILEZILLA_INTERFACE_STATUSBAR_HEADER +#define FILEZILLA_INTERFACE_STATUSBAR_HEADER #include #include "sizeformatting.h" @@ -79,7 +79,7 @@ wxWindow* pChild; }; - std::map m_children; + std::map m_children; void PositionChildren(int field); @@ -87,7 +87,7 @@ void OnSize(wxSizeEvent& event); }; -class CStatusBar : public CWidgetsStatusBar, protected COptionChangeEventHandler, protected CStateEventHandler +class CStatusBar final : public CWidgetsStatusBar, protected COptionChangeEventHandler, protected CGlobalStateEventHandler { public: CStatusBar(wxTopLevelWindow* parent); @@ -109,7 +109,7 @@ void ShowDataTypeMenu(); virtual void OnOptionsChanged(changed_options_t const& options); - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2); + virtual void OnStateChange(CState* pState, t_statechange_notifications notification, const wxString& data, const void* data2); void DoDisplayQueueSize(); @@ -132,4 +132,4 @@ void OnTimer(wxTimerEvent& ev); }; -#endif //__STATUSBAR_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/statuslinectrl.cpp filezilla-3.33.0/src/interface/statuslinectrl.cpp --- filezilla-3.15.0.2/src/interface/statuslinectrl.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/statuslinectrl.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -4,6 +4,7 @@ #include #include "Options.h" #include "sizeformatting.h" +#include "themeprovider.h" #include @@ -16,13 +17,11 @@ int CStatusLineCtrl::m_fieldOffsets[4]; wxCoord CStatusLineCtrl::m_textHeight; bool CStatusLineCtrl::m_initialized = false; - -#define PROGRESSBAR_WIDTH 102 +int CStatusLineCtrl::m_barWidth = 102; CStatusLineCtrl::CStatusLineCtrl(CQueueView* pParent, const t_EngineData* const pEngineData, const wxRect& initialPosition) : m_pParent(pParent) , m_pEngineData(pEngineData) - , m_gcLastTimeStamp(wxDateTime::Now()) { wxASSERT(pEngineData); @@ -42,36 +41,42 @@ void CStatusLineCtrl::InitFieldOffsets() { - if (m_initialized) + if (m_initialized) { return; + } m_initialized = true; // Calculate field widths so that the contents fit under every language. wxClientDC dc(this); dc.SetFont(GetFont()); + double scale = CThemeProvider::GetUIScaleFactor(); + m_barWidth *= scale; + wxCoord w, h; wxTimeSpan elapsed(100, 0, 0); // @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting dc.GetTextExtent(elapsed.Format(_("%H:%M:%S elapsed")), &w, &h); m_textHeight = h; - m_fieldOffsets[0] = 50 + w; + m_fieldOffsets[0] = scale * 50 + w; // @translator: This is a date/time formatting specifier. See https://wiki.filezilla-project.org/Date_and_Time_formatting dc.GetTextExtent(elapsed.Format(_("%H:%M:%S left")), &w, &h); - m_fieldOffsets[1] = m_fieldOffsets[0] + 20 + w; + m_fieldOffsets[1] = m_fieldOffsets[0] + scale * 20 + w; - m_fieldOffsets[2] = m_fieldOffsets[1] + 20; - m_fieldOffsets[3] = m_fieldOffsets[2] + PROGRESSBAR_WIDTH + 20; + m_fieldOffsets[2] = m_fieldOffsets[1] + scale * 20; + m_fieldOffsets[3] = m_fieldOffsets[2] + scale * 20 + m_barWidth; } CStatusLineCtrl::~CStatusLineCtrl() { - if (!status_.empty() && status_.totalSize >= 0) + if (!status_.empty() && status_.totalSize >= 0) { m_pEngineData->pItem->SetSize(status_.totalSize); + } - if (m_transferStatusTimer.IsRunning()) + if (m_transferStatusTimer.IsRunning()) { m_transferStatusTimer.Stop(); + } } void CStatusLineCtrl::OnPaint(wxPaintEvent&) @@ -83,11 +88,15 @@ int refresh = 0; if (!m_data.IsOk() || rect.GetWidth() != m_data.GetWidth() || rect.GetHeight() != m_data.GetHeight()) { m_mdc.reset(); - m_data = wxBitmap(rect.GetWidth(), rect.GetHeight()); + + double sf = dc.GetContentScaleFactor(); + m_data.CreateScaled(rect.width, rect.height, -1, sf); + m_mdc = std::make_unique(m_data); // Use same layout direction as the DC which bitmap is drawn on. // This avoids problem with mirrored characters on RTL locales. m_mdc->SetLayoutDirection(dc.GetLayoutDirection()); + refresh = 31; } @@ -119,7 +128,7 @@ } int elapsed_milli_seconds = 0; - if (status_.started.empty()) { + if (!status_.started.empty()) { elapsed = fz::datetime::now() - status_.started; elapsed_milli_seconds = static_cast(elapsed.get_milliseconds()); // Assume it doesn't overflow } @@ -130,9 +139,9 @@ } if (COptions::Get()->GetOptionVal(OPTION_SPEED_DISPLAY)) - rate = GetCurrentSpeed(); + rate = GetMomentarySpeed(); else - rate = GetSpeed(elapsed_milli_seconds); + rate = GetAverageSpeed(elapsed_milli_seconds); if (status_.totalSize > 0 && elapsed_milli_seconds >= 1000 && rate > 0) { wxFileOffset r = status_.totalSize - status_.currentOffset; @@ -169,14 +178,17 @@ } if (status_.totalSize > 0) { - bar_split = static_cast(status_.currentOffset * (PROGRESSBAR_WIDTH - 2) / status_.totalSize); - if (bar_split > (PROGRESSBAR_WIDTH - 2)) - bar_split = PROGRESSBAR_WIDTH - 2; + bar_split = static_cast(status_.currentOffset * (m_barWidth - 2) / status_.totalSize); + if (bar_split > (m_barWidth - 2)) { + bar_split = m_barWidth - 2; + } - if (status_.currentOffset > status_.totalSize) + if (status_.currentOffset > status_.totalSize) { permill = 1001; - else + } + else { permill = static_cast(status_.currentOffset * 1000 / status_.totalSize); + } } if (m_last_bar_split != bar_split || m_last_permill != permill) { @@ -196,27 +208,28 @@ wxCoord h = (rect.GetHeight() - m_textHeight) / 2; if (refresh & 1) { - m_mdc->DrawRectangle(0, 0, m_fieldOffsets[0], rect.GetHeight()); + m_mdc->DrawRectangle(0, 0, m_fieldOffsets[0], rect.GetHeight() + 1); DrawRightAlignedText(*m_mdc, wxTimeSpan::Milliseconds(elapsed.get_milliseconds()).Format(_("%H:%M:%S elapsed")), m_fieldOffsets[0], h); } if (refresh & 2) { - m_mdc->DrawRectangle(m_fieldOffsets[0], 0, m_fieldOffsets[1] - m_fieldOffsets[0], rect.GetHeight()); + m_mdc->DrawRectangle(m_fieldOffsets[0], 0, m_fieldOffsets[1] - m_fieldOffsets[0], rect.GetHeight() + 1); if (left != -1) { wxTimeSpan timeLeft(0, 0, left); DrawRightAlignedText(*m_mdc, timeLeft.Format(_("%H:%M:%S left")), m_fieldOffsets[1], h); } - else + else { DrawRightAlignedText(*m_mdc, _("--:--:-- left"), m_fieldOffsets[1], h); + } } if (refresh & 8) { - m_mdc->DrawRectangle(m_fieldOffsets[3], 0, rect.GetWidth() - m_fieldOffsets[3], rect.GetHeight()); + m_mdc->DrawRectangle(m_fieldOffsets[3], 0, rect.GetWidth() - m_fieldOffsets[3], rect.GetHeight() + 1); m_mdc->DrawText(bytes_and_rate, m_fieldOffsets[3], h); } if (refresh & 16) { - m_mdc->DrawRectangle(m_fieldOffsets[1], 0, m_fieldOffsets[2] - m_fieldOffsets[1], rect.GetHeight()); + m_mdc->DrawRectangle(m_fieldOffsets[1], 0, m_fieldOffsets[2] - m_fieldOffsets[1], rect.GetHeight() + 1); } if (refresh & 4) { - m_mdc->DrawRectangle(m_fieldOffsets[2], 0, m_fieldOffsets[3] - m_fieldOffsets[2], rect.GetHeight()); + m_mdc->DrawRectangle(m_fieldOffsets[2], 0, m_fieldOffsets[3] - m_fieldOffsets[2], rect.GetHeight() + 1); if (bar_split != -1) DrawProgressBar(*m_mdc, m_fieldOffsets[2], 1, rect.GetHeight() - 2, bar_split, permill); } @@ -240,7 +253,7 @@ m_statusText = _("Waiting for transfer to be cancelled"); break; case t_EngineData::connect: - m_statusText = wxString::Format(_("Connecting to %s"), m_pEngineData->lastServer.FormatServer()); + m_statusText = wxString::Format(_("Connecting to %s"), m_pEngineData->lastServer.Format(ServerFormat::with_user_and_optional_port)); break; default: m_statusText = _("Transferring"); @@ -251,8 +264,8 @@ m_transferStatusTimer.Stop(); m_past_data_count = 0; - m_gcLastOffset = -1; - m_gcLastSpeed = -1; + + m_monentary_speed_data = monentary_speed_data(); Refresh(false); } @@ -297,7 +310,7 @@ m_transferStatusTimer.Stop(); } -void CStatusLineCtrl::DrawRightAlignedText(wxDC& dc, wxString text, int x, int y) +void CStatusLineCtrl::DrawRightAlignedText(wxDC& dc, wxString const& text, int x, int y) { wxCoord w, h; dc.GetTextExtent(text, &w, &h); @@ -319,13 +332,13 @@ // Draw right part dc.SetPen(*wxTRANSPARENT_PEN); dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); - dc.DrawRectangle(x + 1 + bar_split, y + 1, PROGRESSBAR_WIDTH - bar_split - 1, height - 2); + dc.DrawRectangle(x + 1 + bar_split, y + 1, m_barWidth - bar_split - 1, height - 2); if (bar_split && height > 2) { // Draw pretty gradient - int greenmin = 128; - int greenmax = 255; + int greenmin = 160; + int greenmax = 223; int colourCount = ((height + 1) / 2); for (int i = 0; i < colourCount; ++i) { @@ -336,9 +349,9 @@ } } - dc.SetPen(*wxBLACK_PEN); + dc.SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW)); dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(x, y, PROGRESSBAR_WIDTH, height); + dc.DrawRectangle(x, y, m_barWidth, height); // Draw percentage-done text wxString text; @@ -351,13 +364,14 @@ wxCoord w, h; dc.GetTextExtent(text, &w, &h); - dc.DrawText(text, x + PROGRESSBAR_WIDTH / 2 - w / 2, y + height / 2 - h / 2); + dc.DrawText(text, x + m_barWidth / 2 - w / 2, y + height / 2 - h / 2); } -wxFileOffset CStatusLineCtrl::GetSpeed(int elapsed_milli_seconds) +wxFileOffset CStatusLineCtrl::GetAverageSpeed(int elapsed_milli_seconds) { - if (status_.empty()) + if (status_.empty()) { return -1; + } if (elapsed_milli_seconds <= 0) { return -1; @@ -384,38 +398,48 @@ return ((status_.currentOffset - status_.startOffset - forget.offset) * 1000) / (elapsed_milli_seconds - forget.elapsed); } -wxFileOffset CStatusLineCtrl::GetCurrentSpeed() +wxFileOffset CStatusLineCtrl::GetMomentarySpeed() { - if (status_.empty()) + if (status_.empty()) { return -1; + } - const wxTimeSpan timeDiff( wxDateTime::UNow().Subtract(m_gcLastTimeStamp) ); + if (!m_monentary_speed_data.last_update) { + m_monentary_speed_data.last_update = fz::monotonic_clock::now(); + m_monentary_speed_data.last_offset = status_.startOffset; + return -1; + } - if (timeDiff.GetMilliseconds().GetLo() <= 2000) - return m_gcLastSpeed; + fz::duration const time_diff = fz::monotonic_clock::now() - m_monentary_speed_data.last_update; + if (time_diff.get_seconds() < 2) { + return m_monentary_speed_data.last_speed; + } - m_gcLastTimeStamp = wxDateTime::UNow(); + m_monentary_speed_data.last_update = fz::monotonic_clock::now(); - if (m_gcLastOffset < 0) - m_gcLastOffset = status_.startOffset; + if (m_monentary_speed_data.last_offset < 0) { + m_monentary_speed_data.last_offset = status_.startOffset; + } - const wxFileOffset fileOffsetDiff = status_.currentOffset - m_gcLastOffset; - m_gcLastOffset = status_.currentOffset; - if( fileOffsetDiff >= 0 ) { - m_gcLastSpeed = fileOffsetDiff * 1000 / timeDiff.GetMilliseconds().GetLo(); + wxFileOffset const fileOffsetDiff = status_.currentOffset - m_monentary_speed_data.last_offset; + m_monentary_speed_data.last_offset = status_.currentOffset; + if (fileOffsetDiff >= 0) { + m_monentary_speed_data.last_speed = fileOffsetDiff * 1000 / time_diff.get_milliseconds(); } - return m_gcLastSpeed; + return m_monentary_speed_data.last_speed; } -bool CStatusLineCtrl::Show(bool show /*=true*/) +bool CStatusLineCtrl::Show(bool show) { if (show) { - if (!m_transferStatusTimer.IsRunning()) + if (!m_transferStatusTimer.IsRunning()) { m_transferStatusTimer.Start(100); + } } - else + else { m_transferStatusTimer.Stop(); + } return wxWindow::Show(show); } diff -Nru filezilla-3.15.0.2/src/interface/statuslinectrl.h filezilla-3.33.0/src/interface/statuslinectrl.h --- filezilla-3.15.0.2/src/interface/statuslinectrl.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/statuslinectrl.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __STATUSLINECTRL_H__ -#define __STATUSLINECTRL_H__ +#ifndef FILEZILLA_INTERFACE_STATUSLINECTRL_HEADER +#define FILEZILLA_INTERFACE_STATUSLINECTRL_HEADER class CQueueView; class CStatusLineCtrl final : public wxWindow @@ -17,15 +17,15 @@ int64_t GetLastOffset() const { return status_.empty() ? m_lastOffset : status_.currentOffset; } int64_t GetTotalSize() const { return status_.empty() ? -1 : status_.totalSize; } - wxFileOffset GetSpeed(int elapsed_milli_seconds); - wxFileOffset GetCurrentSpeed(); + wxFileOffset GetAverageSpeed(int elapsed_milli_seconds); + wxFileOffset GetMomentarySpeed(); virtual bool Show(bool show = true); protected: void InitFieldOffsets(); - void DrawRightAlignedText(wxDC& dc, wxString text, int x, int y); + void DrawRightAlignedText(wxDC& dc, wxString const& text, int x, int y); void DrawProgressBar(wxDC& dc, int x, int y, int height, int bar_split, int permill); CQueueView* m_pParent; @@ -36,6 +36,7 @@ wxTimer m_transferStatusTimer; static int m_fieldOffsets[4]; + static int m_barWidth; static wxCoord m_textHeight; static bool m_initialized; @@ -52,10 +53,12 @@ } m_past_data[10]; int m_past_data_count{}; - //Used by getCurrentSpeed - wxDateTime m_gcLastTimeStamp; - wxFileOffset m_gcLastOffset{-1}; - wxFileOffset m_gcLastSpeed{-1}; + //Used by GetMomentarySpeed + struct monentary_speed_data { + fz::monotonic_clock last_update; + wxFileOffset last_offset{-1}; + wxFileOffset last_speed{-1}; + } m_monentary_speed_data; //Used to avoid excessive redraws wxBitmap m_data; @@ -73,4 +76,4 @@ void OnEraseBackground(wxEraseEvent& event); }; -#endif // __STATUSLINECTRL_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/StatusView.cpp filezilla-3.33.0/src/interface/StatusView.cpp --- filezilla-3.15.0.2/src/interface/StatusView.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/StatusView.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -1,6 +1,7 @@ #include #include "StatusView.h" #include "Options.h" +#include "state.h" #include @@ -35,7 +36,7 @@ ::SendMessage((HWND)GetHandle(), EM_REPLACESEL, 0, (LPARAM)_T("")); } - void AppendText(const wxString& text, int lineCount, const CHARFORMAT2& cf) + void AppendText(std::wstring const& text, int lineCount, const CHARFORMAT2& cf) { HWND hwnd = (HWND)GetHWND(); @@ -45,7 +46,7 @@ ::SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&range); ::SendMessage(hwnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); m_updatesCount = -2; // suppress any update event - ::SendMessage(hwnd, EM_REPLACESEL, 0, reinterpret_cast(static_cast(text.c_str()))); + ::SendMessage(hwnd, EM_REPLACESEL, 0, reinterpret_cast(text.c_str())); ::SendMessage(hwnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)lineCount); } #endif @@ -109,7 +110,6 @@ SetBackgroundStyle(wxBG_STYLE_SYSTEM); - RegisterOption(OPTION_LANGUAGE); RegisterOption(OPTION_MESSAGELOG_TIMESTAMP); } @@ -130,7 +130,7 @@ AddToLog(notification.msgType, notification.msg, fz::datetime::now()); } -void CStatusView::AddToLog(MessageType messagetype, const wxString& message, fz::datetime const& time) +void CStatusView::AddToLog(MessageType messagetype, std::wstring const& message, fz::datetime const& time) { if (!m_shown) { if (m_hiddenLines.size() >= MAX_LINECOUNT) { @@ -150,16 +150,16 @@ return; } - const int messageLength = message.Length(); + size_t const messageLength = message.size(); - wxString prefix; - prefix.Alloc(25 + messageLength); + // This does not clear storage + m_formattedMessage.clear(); if (m_nLineCount) #ifdef __WXMSW__ - prefix = _T("\r\n"); + m_formattedMessage = _T("\r\n"); #else - prefix = _T("\n"); + m_formattedMessage = _T("\n"); #endif if (m_nLineCount >= MAX_LINECOUNT) { @@ -180,7 +180,7 @@ } #endif - int lineLength = m_attributeCache[static_cast(messagetype)].len + messageLength; + size_t lineLength = m_attributeCache[static_cast(messagetype)].len + messageLength; if (m_showTimestamps) { if (time != m_lastTime) { @@ -192,8 +192,8 @@ m_lastTimeString = time.format(_T("%H:%M:%S "), fz::datetime::local); #endif } - prefix += m_lastTimeString; - lineLength += m_lastTimeString.Len(); + m_formattedMessage += m_lastTimeString; + lineLength += m_lastTimeString.size(); } #ifdef __WXMAC__ @@ -202,7 +202,7 @@ m_pTextCtrl->SetDefaultColor(m_attributeCache[static_cast(messagetype)].attr.GetTextColour()); #endif - prefix += m_attributeCache[static_cast(messagetype)].prefix; + m_formattedMessage += m_attributeCache[static_cast(messagetype)].prefix; if (m_rtl) { // Unicode control characters that control reading direction @@ -217,24 +217,28 @@ if (messagetype == MessageType::Command || messagetype == MessageType::Response || messagetype >= MessageType::Debug_Warning) { // Commands, responses and debug message contain English text, // set LTR reading order for them. - prefix += LTR_MARK; - prefix += LTR_EMBED; + m_formattedMessage += LTR_MARK; + m_formattedMessage += LTR_EMBED; lineLength += 2; } } - prefix += message; + m_formattedMessage += message; #if defined(__WXGTK__) // AppendText always calls SetInsertionPointEnd, which is very expensive. // This check however is negligible. if (m_pTextCtrl->GetInsertionPoint() != m_pTextCtrl->GetLastPosition()) - m_pTextCtrl->AppendText(prefix); + m_pTextCtrl->AppendText(m_formattedMessage); else - m_pTextCtrl->WriteText(prefix); + m_pTextCtrl->WriteText(m_formattedMessage); + #ifdef __WXGTK3__ + // Some smooth scrolling oddities prevent auto-scrolling. Manuall tell it to scroll. + m_pTextCtrl->ShowPosition(m_pTextCtrl->GetInsertionPoint()); + #endif #elif defined(__WXMAC__) - m_pTextCtrl->WriteText(prefix); + m_pTextCtrl->WriteText(m_formattedMessage); #else - m_pTextCtrl->AppendText(prefix, m_nLineCount, m_attributeCache[static_cast(messagetype)].cf); + m_pTextCtrl->AppendText(m_formattedMessage, m_nLineCount, m_attributeCache[static_cast(messagetype)].cf); #endif if (m_nLineCount >= MAX_LINECOUNT) { @@ -325,6 +329,14 @@ const wxColour background = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX); const bool is_dark = background.Red() + background.Green() + background.Blue() < 384; +#ifdef __WXMSW__ + // Select something for EM_GETCHARFORMAT to work + long oldSelectionFrom{-1}; + long oldSelectionTo{-1}; + m_pTextCtrl->GetSelection(&oldSelectionFrom, &oldSelectionTo); + m_pTextCtrl->SetSelection(m_pTextCtrl->GetInsertionPoint(), m_pTextCtrl->GetInsertionPoint()); +#endif + for (int i = 0; i < static_cast(MessageType::count); i++) { t_attributeCache& entry = m_attributeCache[i]; #ifndef __WXMAC__ @@ -332,18 +344,18 @@ #endif switch (static_cast(i)) { case MessageType::Error: - entry.prefix = _("Error:"); + entry.prefix = _("Error:").ToStdWstring(); entry.attr.SetTextColour(wxColour(255, 0, 0)); break; case MessageType::Command: - entry.prefix = _("Command:"); + entry.prefix = _("Command:").ToStdWstring(); if (is_dark) entry.attr.SetTextColour(wxColour(128, 128, 255)); else entry.attr.SetTextColour(wxColour(0, 0, 128)); break; case MessageType::Response: - entry.prefix = _("Response:"); + entry.prefix = _("Response:").ToStdWstring(); if (is_dark) entry.attr.SetTextColour(wxColour(128, 255, 128)); else @@ -353,22 +365,22 @@ case MessageType::Debug_Info: case MessageType::Debug_Verbose: case MessageType::Debug_Debug: - entry.prefix = _("Trace:"); + entry.prefix = _("Trace:").ToStdWstring(); if (is_dark) entry.attr.SetTextColour(wxColour(255, 128, 255)); else entry.attr.SetTextColour(wxColour(128, 0, 128)); break; case MessageType::RawList: - entry.prefix = _("Listing:"); + entry.prefix = _("Listing:").ToStdWstring(); if (is_dark) entry.attr.SetTextColour(wxColour(128, 255, 255)); else entry.attr.SetTextColour(wxColour(0, 128, 128)); break; default: - entry.prefix = _("Status:"); - entry.attr.SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + entry.prefix = _("Status:").ToStdWstring(); + entry.attr.SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT)); break; } @@ -377,29 +389,49 @@ dc.GetTextExtent(entry.prefix, &width, &height); wxASSERT(width <= maxPrefixWidth); wxCoord spaces = (maxPrefixWidth - width) / spaceWidth; - entry.prefix += wxString(spaces, ' '); + entry.prefix += std::wstring(spaces, ' '); #endif entry.prefix += _T("\t"); - entry.len = entry.prefix.Length(); + entry.len = entry.prefix.size(); #ifdef __WXMSW__ - m_pTextCtrl->SetStyle(0, 0, entry.attr); + m_pTextCtrl->SetStyle(m_pTextCtrl->GetInsertionPoint(), m_pTextCtrl->GetInsertionPoint(), entry.attr); entry.cf.cbSize = sizeof(CHARFORMAT2); ::SendMessage((HWND)m_pTextCtrl->GetHWND(), EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&entry.cf); #endif } m_rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft; + +#ifdef __WXMSW__ + if (oldSelectionFrom != -1 && oldSelectionTo != -1) { + m_pTextCtrl->SetSelection(oldSelectionFrom, oldSelectionTo); + } +#endif } void CStatusView::OnContextMenu(wxContextMenuEvent&) { wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_LOG")); - if (!pMenu) + if (!pMenu) { return; + } pMenu->Check(XRCID("ID_SHOW_DETAILED_LOG"), COptions::Get()->GetOptionVal(OPTION_LOGGING_SHOW_DETAILED_LOGS) != 0); + ServerWithCredentials server; + CState* pState = CContextManager::Get()->GetCurrentContext(); + if (pState) { + auto pItem = pMenu->FindItem(XRCID("ID_MENU_SERVER_CMD")); + server = pState->GetServer(); + if (!server || CServer::ProtocolHasFeature(server.server.GetProtocol(), ProtocolFeature::EnterCommand)) { + pItem->Enable(true); + } + else { + pItem->Enable(false); + } + } + PopupMenu(pMenu); COptions::Get()->SetOption(OPTION_LOGGING_SHOW_DETAILED_LOGS, pMenu->IsChecked(XRCID("ID_SHOW_DETAILED_LOG")) ? 1 : 0); @@ -408,8 +440,9 @@ void CStatusView::OnClear(wxCommandEvent&) { - if (m_pTextCtrl) + if (m_pTextCtrl) { m_pTextCtrl->Clear(); + } m_nLineCount = 0; m_lineLengths.clear(); } diff -Nru filezilla-3.15.0.2/src/interface/StatusView.h filezilla-3.33.0/src/interface/StatusView.h --- filezilla-3.15.0.2/src/interface/StatusView.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/StatusView.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __STATUSVIEW_H__ -#define __STATUSVIEW_H__ +#ifndef FILEZILLA_INTERFACE_STATUSVIEW_HEADER +#define FILEZILLA_INTERFACE_STATUSVIEW_HEADER #ifdef __WXMSW__ #include "richedit.h" @@ -17,7 +17,7 @@ virtual ~CStatusView(); void AddToLog(CLogmsgNotification const& pNotification); - void AddToLog(MessageType messagetype, const wxString& message, fz::datetime const& time); + void AddToLog(MessageType messagetype, std::wstring const& message, fz::datetime const& time); void InitDefAttr(); @@ -28,7 +28,6 @@ private: int m_nLineCount{}; - wxString m_Content; CFastTextCtrl *m_pTextCtrl{}; void OnOptionsChanged(changed_options_t const& options); @@ -45,8 +44,8 @@ struct t_attributeCache { - wxString prefix; - int len; + std::wstring prefix; + size_t len; wxTextAttr attr; #ifdef __WXMSW__ CHARFORMAT2 cf; @@ -62,15 +61,17 @@ struct t_line { MessageType messagetype; - wxString message; + std::wstring message; fz::datetime time; }; std::list m_hiddenLines; bool m_showTimestamps{}; fz::datetime m_lastTime; - wxString m_lastTimeString; + std::wstring m_lastTimeString; + + // Re-using the same string to format the message in avoids uneeded allocations + std::wstring m_formattedMessage; }; #endif - diff -Nru filezilla-3.15.0.2/src/interface/storj_key_interface.cpp filezilla-3.33.0/src/interface/storj_key_interface.cpp --- filezilla-3.15.0.2/src/interface/storj_key_interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/storj_key_interface.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,150 @@ +#include +#include "storj_key_interface.h" +#include "Options.h" +#include "filezillaapp.h" +#include "inputdialog.h" + +#include + +CStorjKeyInterface::CStorjKeyInterface(wxWindow* parent) + : m_parent(parent) +{ +} + +CStorjKeyInterface::~CStorjKeyInterface() +{ +} + +std::wstring CStorjKeyInterface::GenerateKey() +{ + LoadProcess(false); + + if (!Send(L"genkey")) { + return std::wstring(); + } + + std::wstring reply; + ReplyCode code = GetReply(reply); + if (code != success) { + return std::wstring(); + } + + return reply; +} + +bool CStorjKeyInterface::ValidateKey(std::wstring const& key, bool silent) +{ + if (key.empty()) { + return false; + } + LoadProcess(silent); + + if (!Send(L"validatekey " + key)) { + return false; + } + + std::wstring reply; + ReplyCode code = GetReply(reply); + return code == success; +} + +bool CStorjKeyInterface::LoadProcess(bool silent) +{ + if (m_initialized) { + return m_process != 0; + } + m_initialized = true; + + std::wstring executable = COptions::Get()->GetOption(OPTION_FZSTORJ_EXECUTABLE); + size_t pos = executable.rfind(wxFileName::GetPathSeparator()); + if (pos == std::wstring::npos) { + if (!silent) { + wxMessageBoxEx(_("fzstorj could not be started.\nPlease make sure this executable exists in the same directory as the main FileZilla executable."), _("Error starting program"), wxICON_EXCLAMATION); + } + return false; + } + + executable = executable.substr(0, pos + 1) + L"fzstorj"; +#ifdef FZ_WINDOWS + executable += L".exe"; +#endif + + m_process = std::make_unique(); + if (!m_process->spawn(fz::to_native(executable))) { + m_process.reset(); + + if (!silent) { + wxMessageBoxEx(_("fzstorj could not be started.\nPlease make sure this executable exists in the same directory as the main FileZilla executable."), _("Error starting program"), wxICON_EXCLAMATION); + } + return false; + } + + return true; +} + +bool CStorjKeyInterface::Send(std::wstring const& cmd) +{ + if (!m_process) { + return false; + } + + std::string utf8 = fz::to_utf8(cmd) + "\n"; + if (!m_process->write(utf8)) { + m_process.reset(); + + wxMessageBoxEx(_("Could not send command to fzstorj."), _("Command failed"), wxICON_EXCLAMATION); + return false; + } + + return true; +} + +CStorjKeyInterface::ReplyCode CStorjKeyInterface::GetReply(std::wstring & reply) +{ + if (!m_process) { + return error; + } + + char buffer[100]; + + std::string input; + + for (;;) { + size_t pos = input.find_first_of("\r\n"); + if (pos == std::string::npos) { + int read = m_process->read(buffer, 100); + if (read <= 0) { + wxMessageBoxEx(_("Could not get reply from fzputtygen."), _("Command failed"), wxICON_EXCLAMATION); + m_process.reset(); + return error; + } + + input.append(buffer, read); + continue; + } + + // Strip everything behind first linebreak. + if (!pos) { + input = input.substr(1); + continue; + } + + char c = input[0]; + + reply = fz::to_wstring_from_utf8(input.substr(1, pos - 1)); + input = input.substr(pos + 1); + + if (c == '1') { + return success; + } + else if (c == '2') { + return error; + } + // Ignore others + } +} + +bool CStorjKeyInterface::ProcessFailed() const +{ + return m_initialized && !m_process; +} diff -Nru filezilla-3.15.0.2/src/interface/storj_key_interface.h filezilla-3.33.0/src/interface/storj_key_interface.h --- filezilla-3.15.0.2/src/interface/storj_key_interface.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/storj_key_interface.h 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,34 @@ +#ifndef FILEZILLA_STORJ_KEY_INTERFACE_HEADER +#define FILEZILLA_STORJ_KEY_INTERFACE_HEADER + +namespace fz { +class process; +} + +class CStorjKeyInterface final +{ +public: + CStorjKeyInterface(wxWindow* parent); + virtual ~CStorjKeyInterface(); + + std::wstring GenerateKey(); + bool ValidateKey(std::wstring const& key, bool silent); + + bool ProcessFailed() const; +protected: + + std::unique_ptr m_process; + bool m_initialized{}; + wxWindow* m_parent; + + enum ReplyCode { + success = 1, + error, + }; + + bool LoadProcess(bool silent); + bool Send(std::wstring const& cmd); + ReplyCode GetReply(std::wstring& reply); +}; + +#endif diff -Nru filezilla-3.15.0.2/src/interface/systemimagelist.cpp filezilla-3.33.0/src/interface/systemimagelist.cpp --- filezilla-3.15.0.2/src/interface/systemimagelist.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/systemimagelist.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,21 +1,11 @@ #include #include "systemimagelist.h" -#ifdef __WXMSW__ -#include "shlobj.h" - // Once again lots of the shell stuff is missing in MinGW's headers - #ifndef IDO_SHGIOI_LINK - #define IDO_SHGIOI_LINK 0x0FFFFFFE - #endif - #ifndef SHGetIconOverlayIndex - extern "C" int WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, int iIconIndex); - extern "C" int WINAPI SHGetIconOverlayIndexA(LPCSTR pszIconPath, int iIconIndex); - #define SHGetIconOverlayIndex SHGetIconOverlayIndexW - #endif -#endif -#ifndef __WXMSW__ #include "themeprovider.h" -#include +#ifdef __WXMSW__ +#include "shlobj.h" +#else +#include "graphics.h" #endif wxImageListEx::wxImageListEx() @@ -23,7 +13,7 @@ { } -wxImageListEx::wxImageListEx(int width, int height, const bool mask /*=true*/, int initialCount /*=1*/) +wxImageListEx::wxImageListEx(int width, int height, const bool mask, int initialCount) : wxImageList(width, height, mask, initialCount) { } @@ -38,90 +28,60 @@ #endif #ifndef __WXMSW__ -static inline void AlphaComposite_Over_Inplace(wxAlphaPixelData::Iterator &a, wxAlphaPixelData::Iterator &b) -{ - // Alpha compositing of a single pixel, b gets composited over a - // (well-known over operator), result stored in a. - // All RGB and A values have range from 0 to 255, RGB values aren't - // premultiplied by A. - // Safe for multiple compositions. - - if (!b.Alpha()) - { - // Nothing to do - return; - } - - int new_alpha = a.Alpha() + b.Alpha() - a.Alpha() * b.Alpha() / 255; // Could only get 0 if both alphas were 0, caught that already. - a.Red() = ((int)a.Red() * (255 - b.Alpha()) * a.Alpha() / 255 + (int)b.Red() * b.Alpha()) / new_alpha; - a.Green() = ((int)a.Green() * (255 - b.Alpha()) * a.Alpha() / 255 + (int)b.Green() * b.Alpha()) / new_alpha; - a.Blue() = ((int)a.Blue() * (255 - b.Alpha()) * a.Alpha() / 255 + (int)b.Blue() * b.Alpha()) / new_alpha; - a.Alpha() = new_alpha; -} - static void OverlaySymlink(wxBitmap& bmp) { - // This is ugly, but apparently needed so that the data is _really_ in the right internal format - bmp = bmp.ConvertToImage(); - wxBitmap symlink = wxArtProvider::GetBitmap(_T("ART_SYMLINK"), wxART_OTHER, wxSize(bmp.GetWidth(), bmp.GetHeight())).ConvertToImage(); - - wxAlphaPixelData target(bmp); - wxAlphaPixelData source(symlink); - - int sx = bmp.GetWidth(); - if (symlink.GetWidth() < sx) - sx = symlink.GetWidth(); - int sy = bmp.GetHeight(); - if (symlink.GetHeight() < sy) - sy = symlink.GetHeight(); - - // Do some rudimentary alpha copying - wxAlphaPixelData::Iterator t(target); - wxAlphaPixelData::Iterator s(source); - for (int y = 0; y < sy; y++) - { - s.MoveTo(source, 0, y); - t.MoveTo(target, 0, y); - for (int x = 0; x < sx; x++, s++, t++) - AlphaComposite_Over_Inplace(t, s); - } + wxBitmap overlay = CThemeProvider::Get()->CreateBitmap(_T("ART_SYMLINK"), wxART_OTHER, wxSize(bmp.GetScaledWidth(), bmp.GetScaledHeight())); + Overlay(bmp, overlay); } #endif -CSystemImageList::CSystemImageList(int size /*=-1*/) - : m_pImageList() +CSystemImageList::CSystemImageList(int size) { - if (size != -1) + if (size != -1) { CreateSystemImageList(size); + } } bool CSystemImageList::CreateSystemImageList(int size) { - if (m_pImageList) + if (m_pImageList) { return true; + } #ifdef __WXMSW__ - SHFILEINFO shFinfo{}; - wxChar buffer[MAX_PATH + 10]; - if (!GetWindowsDirectory(buffer, MAX_PATH)) -#ifdef _tcscpy - _tcscpy(buffer, _T("C:\\")); -#else - strcpy(buffer, _T("C:\\")); -#endif + auto const getImageList = [&size](wchar_t const* buffer) { + SHFILEINFO shFinfo{}; + return reinterpret_cast(SHGetFileInfo(buffer, + 0, + &shFinfo, + sizeof(shFinfo), + SHGFI_SYSICONINDEX | + ((size != CThemeProvider::GetIconSize(iconSizeSmall).x) ? SHGFI_ICON : SHGFI_SMALLICON))); + }; - m_pImageList = new wxImageListEx((WXHIMAGELIST)SHGetFileInfo(buffer, - 0, - &shFinfo, - sizeof( shFinfo ), - SHGFI_SYSICONINDEX | - ((size != 16) ? SHGFI_ICON : SHGFI_SMALLICON) )); + HIMAGELIST imageList{}; + wchar_t buffer[MAX_PATH + 10]; + if (SHGetFolderPath(0, CSIDL_WINDOWS, 0, SHGFP_TYPE_CURRENT, buffer) == S_OK) { + imageList = getImageList(buffer); + } + if (!imageList && SHGetFolderPath(0, CSIDL_PROFILE, 0, SHGFP_TYPE_CURRENT, buffer) == S_OK) { + imageList = getImageList(buffer); + } + if (!imageList) { + imageList = getImageList(L"C:\\"); + } + + if (!imageList) { + return false; + } + + m_pImageList = new wxImageListEx(reinterpret_cast(imageList)); #else m_pImageList = new wxImageListEx(size, size); - wxBitmap file = wxArtProvider::GetBitmap(_T("ART_FILE"), wxART_OTHER, wxSize(size, size)); - wxBitmap folderclosed = wxArtProvider::GetBitmap(_T("ART_FOLDERCLOSED"), wxART_OTHER, wxSize(size, size)); - wxBitmap folder = wxArtProvider::GetBitmap(_T("ART_FOLDER"), wxART_OTHER, wxSize(size, size)); + wxBitmap file = CThemeProvider::Get()->CreateBitmap(_T("ART_FILE"), wxART_OTHER, wxSize(size, size)); + wxBitmap folderclosed = CThemeProvider::Get()->CreateBitmap(_T("ART_FOLDERCLOSED"), wxART_OTHER, wxSize(size, size)); + wxBitmap folder = CThemeProvider::Get()->CreateBitmap(_T("ART_FOLDER"), wxART_OTHER, wxSize(size, size)); m_pImageList->Add(file); m_pImageList->Add(folderclosed); m_pImageList->Add(folder); @@ -138,8 +98,9 @@ CSystemImageList::~CSystemImageList() { - if (!m_pImageList) + if (!m_pImageList) { return; + } #ifdef __WXMSW__ m_pImageList->Detach(); @@ -154,8 +115,9 @@ // This function converts to the right size with the given background colour wxBitmap PrepareIcon(wxIcon icon, wxSize size) { - if (icon.GetWidth() == size.GetWidth() && icon.GetHeight() == size.GetHeight()) + if (icon.GetWidth() == size.GetWidth() && icon.GetHeight() == size.GetHeight()) { return icon; + } wxBitmap bmp; bmp.CopyFromIcon(icon); return bmp.ConvertToImage().Rescale(size.GetWidth(), size.GetHeight()); @@ -164,12 +126,14 @@ int CSystemImageList::GetIconIndex(iconType type, const wxString& fileName /*=_T("")*/, bool physical /*=true*/, bool symlink /*=false*/) { - if (!m_pImageList) + if (!m_pImageList) { return -1; + } #ifdef __WXMSW__ - if (fileName.empty()) + if (fileName.empty()) { physical = false; + } SHFILEINFO shFinfo; memset(&shFinfo, 0, sizeof(SHFILEINFO)); @@ -202,51 +166,53 @@ wxFileName fn(fileName); wxString ext = fn.GetExt(); - if (ext.empty()) + if (ext.empty()) { return icon; + } - if (symlink) - { + if (symlink) { auto cacheIter = m_iconCache.find(ext); - if (cacheIter != m_iconCache.end()) + if (cacheIter != m_iconCache.end()) { return cacheIter->second; + } } - else - { + else { auto cacheIter = m_iconSymlinkCache.find(ext); - if (cacheIter != m_iconSymlinkCache.end()) + if (cacheIter != m_iconSymlinkCache.end()) { return cacheIter->second; + } } wxFileType *pType = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); - if (!pType) - { + if (!pType) { m_iconCache[ext] = icon; return icon; } wxIconLocation loc; - if (pType->GetIcon(&loc) && loc.IsOk()) - { + if (pType->GetIcon(&loc) && loc.IsOk()) { wxLogNull nul; wxIcon newIcon(loc); - if (newIcon.Ok()) - { + if (newIcon.Ok()) { wxBitmap bmp = PrepareIcon(newIcon, CThemeProvider::GetIconSize(iconSizeSmall)); - if (symlink) + if (symlink) { OverlaySymlink(bmp); + } int index = m_pImageList->Add(bmp); - if (index > 0) + if (index > 0) { icon = index; + } } } delete pType; - if (symlink) + if (symlink) { m_iconCache[ext] = icon; - else + } + else { m_iconSymlinkCache[ext] = icon; + } return icon; #endif return -1; @@ -256,11 +222,11 @@ int CSystemImageList::GetLinkOverlayIndex() { static int overlay = -1; - if (overlay == -1) - { + if (overlay == -1) { overlay = SHGetIconOverlayIndex(0, IDO_SHGIOI_LINK); - if (overlay < 0) + if (overlay < 0) { overlay = 0; + } } return overlay; diff -Nru filezilla-3.15.0.2/src/interface/systemimagelist.h filezilla-3.33.0/src/interface/systemimagelist.h --- filezilla-3.15.0.2/src/interface/systemimagelist.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/systemimagelist.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __SYSTEMIMAGELIST_H__ -#define __SYSTEMIMAGELIST_H__ +#ifndef FILEZILLA_INTERFACE_SYSTEMIMAGELIST_HEADER +#define FILEZILLA_INTERFACE_SYSTEMIMAGELIST_HEADER #ifdef __WXMSW__ #include @@ -14,16 +14,15 @@ }; // Required wxImageList extension -class wxImageListEx : public wxImageList +class wxImageListEx final : public wxImageList { public: wxImageListEx(); wxImageListEx(int width, int height, const bool mask = true, int initialCount = 1); - virtual ~wxImageListEx() {} #ifdef __WXMSW__ wxImageListEx(WXHIMAGELIST hList) { m_hImageList = hList; } - HIMAGELIST GetHandle() const { return (HIMAGELIST)m_hImageList; } + HIMAGELIST GetHandle() const { return reinterpret_cast(m_hImageList); } HIMAGELIST Detach(); #endif }; @@ -32,23 +31,23 @@ { public: CSystemImageList(int size = -1); + virtual ~CSystemImageList(); CSystemImageList(CSystemImageList const&) = delete; CSystemImageList& operator=(CSystemImageList const&) = delete; bool CreateSystemImageList(int size); - virtual ~CSystemImageList(); wxImageList* GetSystemImageList() { return m_pImageList; } - int GetIconIndex(iconType type, const wxString& fileName = _T(""), bool physical = true, bool symlink = false); + int GetIconIndex(iconType type, wxString const& fileName = wxString(), bool physical = true, bool symlink = false); #ifdef __WXMSW__ int GetLinkOverlayIndex(); #endif private: - wxImageListEx *m_pImageList; + wxImageListEx *m_pImageList{}; #ifndef __WXMSW__ std::map m_iconCache; @@ -56,4 +55,4 @@ #endif }; -#endif //__SYSTEMIMAGELIST_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/textctrlex.h filezilla-3.33.0/src/interface/textctrlex.h --- filezilla-3.15.0.2/src/interface/textctrlex.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/textctrlex.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __TEXTCTRLEX_H__ -#define __TEXTCTRLEX_H__ +#ifndef FILEZILLA_INTERFACE_TEXTCTRLEX_HEADER +#define FILEZILLA_INTERFACE_TEXTCTRLEX_HEADER #include @@ -19,4 +19,4 @@ #endif -#endif //__TEXTCTRLEX_H__ \ No newline at end of file +#endif diff -Nru filezilla-3.15.0.2/src/interface/themeprovider.cpp filezilla-3.33.0/src/interface/themeprovider.cpp --- filezilla-3.15.0.2/src/interface/themeprovider.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/themeprovider.cpp 2017-10-25 17:12:23.000000000 +0000 @@ -6,237 +6,432 @@ #include +#include +#include + #include +#ifdef __WXGTK__ +#include +#endif + static CThemeProvider* instance = 0; -CThemeProvider::CThemeProvider() +wxSize CTheme::StringToSize(std::wstring const& str) { - wxArtProvider::Push(this); + wxSize ret; - m_themePath = GetThemePath(); + size_t start = str.find_last_of(L"/\\"); + if (start == std::wstring::npos) { + start = 0; + } + else { + ++start; + } - RegisterOption(OPTION_THEME); + size_t pos = str.find('x', start); + if (pos != std::wstring::npos && pos != str.size() - 1) { + ret.SetWidth(fz::to_integral(str.substr(start, pos - start), -1)); + ret.SetHeight(fz::to_integral(str.substr(pos + 1), -1)); + } - if( !instance ) - instance = this; + return ret; } -CThemeProvider::~CThemeProvider() +bool CTheme::Load(std::wstring const& theme) { - if( instance == this ) { - instance = 0; + theme_ = theme; + path_ = wxGetApp().GetResourceDir().GetPath() + theme; + if (!theme.empty()) { + path_ += L"/"; } + + CXmlFile xml(path_ + L"theme.xml"); + auto xtheme = xml.Load().child("Theme"); + if (!xtheme) { + return false; + } + + name_ = GetTextElement(xtheme, "Name"); + author_ = GetTextElement(xtheme, "Author"); + mail_ = GetTextElement(xtheme, "Mail"); + + for (auto xSize = xtheme.child("size"); xSize; xSize = xSize.next_sibling("size")) { + wxSize size = StringToSize(GetTextElement(xSize)); + if (size.x > 0 && size.y > 0) { + bool primary = std::string(xSize.attribute("primary").value()) == "1"; + sizes_[size] = primary; + } + } + + timestamp_ = fz::local_filesys::get_modification_time(fz::to_native(path_) + fzT("theme.xml")); + + return !sizes_.empty(); } -CThemeProvider* CThemeProvider::Get() +bool CTheme::Load(std::wstring const& theme, std::vector sizes) { - return instance; + path_ = wxGetApp().GetResourceDir().GetPath() + theme; + if (!theme.empty()) { + path_ += L"/"; + } + + for (auto const& size : sizes) { + sizes_[size] = false; + } + return !sizes_.empty(); +} + +wxBitmap const& CTheme::LoadBitmap(std::wstring const& name, wxSize const& size) +{ + // First, check for name in cache + auto it = cache_.find(name); + if (it == cache_.end()) { + it = cache_.insert(std::make_pair(name, cacheEntry())).first; + } + else { + if (it->second.bitmaps_.empty()) { + // The name is known but the icon does not exist + static wxBitmap empty; + return empty; + } + } + + // Look for correct size + auto & sizeCache = it->second.bitmaps_; + auto sit = sizeCache.find(size); + if (sit != sizeCache.end()) { + return sit->second; + } + + return DoLoadBitmap(name, size, it->second); +} + +wxBitmap const& CTheme::DoLoadBitmap(std::wstring const& name, wxSize const& size, cacheEntry & cache) +{ + // Go through all the theme sizes and look for the file we need + + wxSize pivotSize = size; +#ifdef __WXMAC__ + if (wxGetApp().GetTopWindow()) { + double scale = wxGetApp().GetTopWindow()->GetContentScaleFactor(); + pivotSize.Scale(scale, scale); + } +#endif + // First look equal or larger icon + auto const pivot = sizes_.lower_bound(pivotSize); + for (auto pit = pivot; pit != sizes_.end(); ++pit) { + wxBitmap const& bmp = LoadBitmapWithSpecificSizeAndScale(name, pit->first, size, cache); + if (bmp.IsOk()) { + return bmp; + } + } + + // Now look smaller icons + for (auto pit = decltype(sizes_)::reverse_iterator(pivot); pit != sizes_.rend(); ++pit) { + wxBitmap const& bmp = LoadBitmapWithSpecificSizeAndScale(name, pit->first, size, cache); + if (bmp.IsOk()) { + return bmp; + } + } + + // Out of luck. + static wxBitmap empty; + return empty; +} + +wxBitmap const& CTheme::LoadBitmapWithSpecificSizeAndScale(std::wstring const& name, wxSize const& size, wxSize const& scale, cacheEntry & cache) +{ + std::wstring const file = path_ + fz::sprintf(L"%dx%d/%s.png", size.x, size.y, name); + std::wstring cacheFile; + CLocalPath cacheDir; +#ifndef __WXMAC__ + if (size != scale && !timestamp_.empty()) { + // Scaling is expensive. Look into resource cache. + cacheDir = COptions::Get()->GetCacheDirectory(); + if (!cacheDir.empty()) { + cacheFile = cacheDir.GetPath() + fz::sprintf(L"%s_%s%dx%d.png", theme_, name, scale.x, scale.y); + auto cacheTime = fz::local_filesys::get_modification_time(fz::to_native(cacheFile)); + if (!cacheTime.empty() && timestamp_ <= cacheTime) { + wxBitmap bmp(cacheFile, wxBITMAP_TYPE_PNG); + if (bmp.IsOk() && bmp.GetScaledSize() == scale) { + auto inserted = cache.bitmaps_.insert(std::make_pair(scale, bmp)); + return inserted.first->second; + } + } + } + } +#endif + wxImage image = LoadImageWithSpecificSize(file, size, cache); + if (!image.IsOk()) { + static wxBitmap empty; + return empty; + } + + // need to scale +#ifdef __WXMAC__ + double factor = static_cast(image.GetSize().x) / scale.x; + auto inserted = cache.bitmaps_.insert(std::make_pair(scale, wxBitmap(image, -1, factor))); +#else + if (image.GetSize() != scale) { + image.Rescale(scale.x, scale.y, wxIMAGE_QUALITY_HIGH); + + // Save in cache + if (!cacheFile.empty()) { + if (cacheDir.Create()) { + image.SaveFile(cacheFile, wxBITMAP_TYPE_PNG); + } + } + } + + auto inserted = cache.bitmaps_.insert(std::make_pair(scale, wxBitmap(image))); +#endif + return inserted.first->second; } -static wxString SubdirFromSize(const int size) +wxImage const& CTheme::LoadImageWithSpecificSize(std::wstring const& file, wxSize const& size, cacheEntry & cache) { - return wxString::Format(_T("%dx%d/"), size, size); + auto it = cache.images_.find(size); + if (it != cache.images_.end()) { + return it->second; + } + + wxImage img(file, wxBITMAP_TYPE_PNG); + + if (img.Ok()) { + if (img.HasMask() && !img.HasAlpha()) { + img.InitAlpha(); + } + if (img.GetSize() != size) { + img.Rescale(size.x, size.y, wxIMAGE_QUALITY_HIGH); + } + } + auto inserted = cache.images_.insert(std::make_pair(size, img)); + return inserted.first->second; } -std::list CThemeProvider::GetSearchDirs(const wxSize& bestSize) +std::vector CTheme::GetAllImages(wxSize const& size) { - // Sort order: - // - Current theme before general resource dir - // - Try current size first - // - Then try scale down next larger icon - // - Then try scaling up next smaller icon + wxLogNull null; + std::vector ret; + + for (auto const& psize : sizes_) { + if (psize.second) { + fz::local_filesys fs; + if (fs.begin_find_files(fz::to_native(path_) + fz::sprintf(fzT("%dx%d/"), psize.first.x, psize.first.y))) { + fz::native_string name; + while (fs.get_next_file(name)) { + size_t pos = name.find(fzT(".png")); + if (pos != fz::native_string::npos && pos != 0) { + wxBitmap const& bmp = LoadBitmap(fz::to_wstring(name.substr(0, pos)), size); + if (bmp.IsOk()) { + ret.emplace_back(bmp); + } + } + } + } + } + if (!ret.empty()) { + break; + } + } - int sizes[] = { 48,32,24,20,16 }; + return ret; +} - std::list sizeStrings; +wxAnimation CTheme::LoadAnimation(std::wstring const& name, wxSize const& size) +{ + std::wstring path = path_ + fz::sprintf(L"%dx%d/%s.gif", size.x, size.y, name); - for (auto const& size : sizes) { - if (size < bestSize.GetWidth()) - sizeStrings.push_back(SubdirFromSize(size)); - else if (size > bestSize.GetWidth()) - sizeStrings.push_front(SubdirFromSize(size)); + return wxAnimation(path); +} + +CThemeProvider::CThemeProvider() +{ + wxArtProvider::Push(this); + + CTheme unthemed; + if (unthemed.Load(std::wstring(), { wxSize(16,16), wxSize(20,20), wxSize(22,22), wxSize(24,24), wxSize(32,32), wxSize(48,48), wxSize(480,480) })) { + themes_[L""] = unthemed; + } + + CTheme defaultTheme; + if (defaultTheme.Load(L"default")) { + themes_[L"default"] = defaultTheme; } - sizeStrings.push_front(SubdirFromSize(bestSize.GetWidth())); - std::list dirs; - for (auto const& size : sizeStrings) { - dirs.push_back(m_themePath + size); + std::wstring name = COptions::Get()->GetOption(OPTION_ICONS_THEME); + if (name != L"default") { + CTheme theme; + if (theme.Load(name)) { + themes_[name] = theme; + } } - CLocalPath const resourceDir(wxGetApp().GetResourceDir()); - for (auto const& size : sizeStrings) { - dirs.push_back(resourceDir.GetPath() + size); + RegisterOption(OPTION_ICONS_THEME); + RegisterOption(OPTION_ICONS_SCALE); + + if (!instance) { + instance = this; } +} - return dirs; +CThemeProvider::~CThemeProvider() +{ + if (instance == this) { + instance = 0; + } } -wxBitmap CThemeProvider::CreateBitmap(const wxArtID& id, const wxArtClient& /*client*/, const wxSize& size) +CThemeProvider* CThemeProvider::Get() { - if (id.Left(4) != _T("ART_")) + return instance; +} + +wxBitmap CThemeProvider::CreateBitmap(wxArtID const& id, wxArtClient const& client, wxSize const& size) +{ + if (id.Left(4) != _T("ART_")) { return wxNullBitmap; + } wxASSERT(size.GetWidth() == size.GetHeight()); - std::list dirs = GetSearchDirs(size); + wxSize newSize; + if (size.x <= 0 || size.y <= 0) { + newSize = GetNativeSizeHint(client); + if (newSize.x <= 0 || newSize.y <= 0) { + newSize = GetIconSize(iconSizeSmall); + } + } + else { + newSize = size; + } // The ART_* IDs are always given in uppercase ASCII, // all filenames used by FileZilla for the resources // are lowercase ASCII. Locale-independent transformation // needed e.g. if using Turkish locale. - wxString name = fz::str_tolower_ascii(id.Mid(4)); - - wxLogNull logNull; + std::wstring name = fz::str_tolower_ascii(id.substr(4).ToStdWstring()); - for (auto const& dir : dirs) { - wxString fileName = dir + name + _T(".png"); + wxBitmap const* bmp{&wxNullBitmap}; + auto tryTheme = [&](std::wstring const& theme) { + if (!bmp->IsOk()) { + auto it = themes_.find(theme); + if (it != themes_.end()) { + bmp = &it->second.LoadBitmap(name, newSize); + } + } + }; - // MSW toolbar only greys out disabled buttons in a visually - // pleasing way if the bitmap has an alpha channel. - wxImage img(fileName, wxBITMAP_TYPE_PNG); - if (!img.Ok()) - continue; + wxLogNull logNull; - if (img.HasMask() && !img.HasAlpha()) - img.InitAlpha(); - if (size.IsFullySpecified()) - img.Rescale(size.x, size.y, wxIMAGE_QUALITY_HIGH); - return wxBitmap(img); + std::wstring const theme = COptions::Get()->GetOption(OPTION_ICONS_THEME); + if (!theme.empty() && theme != L"default") { + tryTheme(theme); } + tryTheme(L"default"); + tryTheme(L""); - return wxNullBitmap; + return *bmp; } -wxAnimation CThemeProvider::CreateAnimation(const wxArtID& id, const wxSize& size) +wxAnimation CThemeProvider::CreateAnimation(wxArtID const& id, wxSize const& size) { - if (id.Left(4) != _T("ART_")) + if (id.Left(4) != _T("ART_")) { return wxAnimation(); + } wxASSERT(size.GetWidth() == size.GetHeight()); - std::list dirs = GetSearchDirs(size); - // The ART_* IDs are always given in uppercase ASCII, // all filenames used by FileZilla for the resources // are lowercase ASCII. Locale-independent transformation // needed e.g. if using Turkish locale. - wxString name = fz::str_tolower_ascii(id.Mid(4)); + std::wstring name = fz::str_tolower_ascii(id.Mid(4).ToStdWstring()); - wxLogNull logNull; + wxAnimation anim; + auto tryTheme = [&](std::wstring const& theme) { + if (!anim.IsOk()) { + auto it = themes_.find(theme); + if (it != themes_.end()) { + anim = it->second.LoadAnimation(name, size); + } + } + }; - for (auto const& dir : dirs) { - wxString fileName = dir + name + _T(".gif"); + wxLogNull logNull; - wxAnimation a(fileName); - if( a.IsOk() ) { - return a; - } + std::wstring const theme = COptions::Get()->GetOption(OPTION_ICONS_THEME); + if (!theme.empty() && theme != L"default") { + tryTheme(theme); } + tryTheme(L"default"); + tryTheme(L""); - return wxAnimation(); + return anim; } -std::vector CThemeProvider::GetThemes() +std::vector CThemeProvider::GetThemes() { - std::vector themes; + std::vector themes; CLocalPath const resourceDir = wxGetApp().GetResourceDir(); - if (wxFileName::FileExists(resourceDir.GetPath() + _T("theme.xml"))) - themes.push_back(wxString()); - wxDir dir(resourceDir.GetPath()); - bool found; - wxString subdir; - for (found = dir.GetFirst(&subdir, _T("*"), wxDIR_DIRS); found; found = dir.GetNext(&subdir)) { - if (wxFileName::FileExists(resourceDir.GetPath() + subdir + _T("/") + _T("theme.xml"))) - themes.push_back(subdir + _T("/")); + fz::local_filesys fs; + + fz::native_string path = fz::to_native(resourceDir.GetPath()); + if (fs.begin_find_files(path, true)) { + fz::native_string name; + while (fs.get_next_file(name)) { + if (fz::local_filesys::get_file_type(path + name + fzT("/theme.xml")) == fz::local_filesys::file) { + themes.push_back(fz::to_wstring(name)); + } + } } return themes; } -std::vector> CThemeProvider::GetAllImages(const wxString& theme, const wxSize& size) +std::vector CThemeProvider::GetAllImages(std::wstring const& theme, wxSize const& size) { - wxString path = wxGetApp().GetResourceDir().GetPath() + theme + _T("/"); - - wxLogNull log; - - wxString strSize = wxString::Format(_T("%dx%d/"), size.GetWidth(), size.GetHeight()); - if (wxDir::Exists(path + strSize)) { - path += strSize; - } - else { - if (size.GetWidth() > 32) - path += _T("48x48/"); - else if (size.GetWidth() > 16) - path += _T("32x32/"); - else - path += _T("16x16/"); - } - - std::vector> bitmaps; - - if (!wxDir::Exists(path)) - return bitmaps; - - wxDir dir(path); - if (!dir.IsOpened()) - return bitmaps; - - wxString file; - for (bool found = dir.GetFirst(&file, _T("*.png")); found; found = dir.GetNext(&file)) { - if (file.Right(13) == _T("_disabled.png")) - continue; - - wxFileName fn(path, file); - std::unique_ptr bmp(new wxBitmap); - if (bmp->LoadFile(fn.GetFullPath(), wxBITMAP_TYPE_PNG)) { - bitmaps.push_back(std::move(bmp)); + auto it = themes_.find(theme); + if (it == themes_.end()) { + CTheme t; + if (!t.Load(theme)) { + return std::vector(); } - } - return bitmaps; -} -bool CThemeProvider::GetThemeData(const wxString& themePath, wxString& name, wxString& author, wxString& email) -{ - wxString const file(wxGetApp().GetResourceDir().GetPath() + themePath + _T("theme.xml")); - CXmlFile xml(file); - auto theme = xml.Load().child("Theme"); - if (!theme) - return false; + it = themes_.insert(std::make_pair(theme, t)).first; + } - name = GetTextElement(theme, "Name"); - author = GetTextElement(theme, "Author"); - email = GetTextElement(theme, "Mail"); - return true; + return it->second.GetAllImages(size); } -std::vector CThemeProvider::GetThemeSizes(const wxString& themePath) +bool CThemeProvider::GetThemeData(std::wstring const& theme, std::wstring & name, std::wstring & author, std::wstring & email) { - std::vector sizes; + auto it = themes_.find(theme); + if (it == themes_.end()) { + CTheme t; + if (!t.Load(theme)) { + return false; + } - wxString const file(wxGetApp().GetResourceDir().GetPath() + themePath + _T("theme.xml")); - CXmlFile xml(file); - auto theme = xml.Load().child("Theme"); - if (!theme) - return sizes; - - for (auto xSize = theme.child("size"); xSize; xSize = xSize.next_sibling("size")) { - wxString size = GetTextElement(xSize); - if (size.empty()) - continue; - sizes.push_back(size); + it = themes_.insert(std::make_pair(theme, t)).first; } - return sizes; + name = it->second.get_name(); + author = it->second.get_author(); + email = it->second.get_mail(); + + return true; } wxIconBundle CThemeProvider::GetIconBundle(const wxArtID& id, const wxArtClient&) { wxIconBundle iconBundle; - if (id.Left(4) != _T("ART_")) + if (id.Left(4) != _T("ART_")) { return iconBundle; + } wxString name = fz::str_tolower_ascii(id.Mid(4)); @@ -244,10 +439,11 @@ CLocalPath const resourcePath = wxGetApp().GetResourceDir(); - for (auto const& dir : dirs ) { + for (auto const& dir : dirs) { wxString file = resourcePath.GetPath() + dir + name + _T(".png"); - if (!wxFileName::FileExists(file)) + if (!wxFileName::FileExists(file)) { continue; + } iconBundle.AddIcon(wxIcon(file, wxBITMAP_TYPE_PNG)); } @@ -255,55 +451,34 @@ return iconBundle; } -bool CThemeProvider::ThemeHasSize(const wxString& themePath, const wxString& size) +void CThemeProvider::OnOptionsChanged(changed_options_t const&) { - wxString const file(wxGetApp().GetResourceDir().GetPath() + themePath + _T("theme.xml")); - CXmlFile xml(file); - auto theme = xml.Load().child("Theme"); - if (!theme) { - return false; - } - - for (auto xSize = theme.child("size"); xSize; xSize = xSize.next_sibling("size")) { - wxString s = GetTextElement(xSize); - if (size == s) { - return true; + std::wstring name = COptions::Get()->GetOption(OPTION_ICONS_THEME); + if (themes_.find(name) == themes_.end()) { + CTheme theme; + if (theme.Load(name)) { + themes_[name] = theme; } } - return false; -} - -wxString CThemeProvider::GetThemePath() -{ - CLocalPath const resourceDir = wxGetApp().GetResourceDir(); - wxString themePath = resourceDir.GetPath() + COptions::Get()->GetOption(OPTION_THEME); - if (wxFile::Exists(themePath + _T("theme.xml"))) - return themePath; - - themePath = resourceDir.GetPath() + _T("opencrystal/"); - if (wxFile::Exists(themePath + _T("theme.xml"))) - return themePath; - - wxASSERT(wxFile::Exists(resourceDir.GetPath() + _T("theme.xml"))); - return resourceDir.GetPath(); -} - -void CThemeProvider::OnOptionsChanged(changed_options_t const&) -{ - m_themePath = GetThemePath(); - wxArtProvider::Remove(this); wxArtProvider::Push(this); } -wxSize CThemeProvider::GetIconSize(enum iconSize size) +wxSize CThemeProvider::GetIconSize(iconSize size, bool userScaled) { int s; - if (size == iconSizeSmall) { + if (size == iconSizeTiny) { + s = wxSystemSettings::GetMetric(wxSYS_SMALLICON_X) * 3 / 4; + if (s <= 0) { + s = 12; + } + } + else if (size == iconSizeSmall) { s = wxSystemSettings::GetMetric(wxSYS_SMALLICON_X); - if (s <= 0) + if (s <= 0) { s = 16; + } } else if (size == iconSize24) { s = wxSystemSettings::GetMetric(wxSYS_SMALLICON_X); @@ -311,36 +486,52 @@ s = 24; } else { - s += s/2; + s += s / 2; } } else if (size == iconSizeLarge) { s = wxSystemSettings::GetMetric(wxSYS_ICON_X); - if (s <= 0) + if (s <= 0) { s = 48; - else - s += s/2; + } + else { + s += s / 2; + } } else { s = wxSystemSettings::GetMetric(wxSYS_ICON_X); - if (s <= 0) + if (s <= 0) { s = 32; + } } - return wxSize(s, s); + wxSize ret(s, s); + +#ifdef __WXGTK__ + GdkScreen * screen = gdk_screen_get_default(); + if (screen) { + static gdouble const scale = gdk_screen_get_resolution(screen); + if (scale >= 48) { + ret = ret.Scale(scale / 96.f, scale / 96.f); + } + } +#endif + + if (userScaled) { + float scale = static_cast(COptions::Get()->GetOptionVal(OPTION_ICONS_SCALE)); + ret = ret.Scale(scale / 100.f, scale / 100.f); + } + + return ret; } -wxSize CThemeProvider::GetIconSize(wxString const& str) +double CThemeProvider::GetUIScaleFactor() { - wxSize iconSize; - if (str == _T("24x24")) - return CThemeProvider::GetIconSize(iconSize24); - else if (str == _T("32x32")) - iconSize = CThemeProvider::GetIconSize(iconSizeNormal); - else if (str == _T("48x48")) - iconSize = CThemeProvider::GetIconSize(iconSizeLarge); - else - iconSize = CThemeProvider::GetIconSize(iconSizeSmall); - - return iconSize; + int x = GetIconSize(iconSizeSmall).x; + if (!x) { + return 1.; + } + else { + return x / 16.; + } } diff -Nru filezilla-3.15.0.2/src/interface/themeprovider.h filezilla-3.33.0/src/interface/themeprovider.h --- filezilla-3.15.0.2/src/interface/themeprovider.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/themeprovider.h 2017-10-25 17:12:23.000000000 +0000 @@ -1,46 +1,99 @@ -#ifndef __THEMEPROVIDER_H__ -#define __THEMEPROVIDER_H__ +#ifndef FILEZILLA_INTERFACE_THEMEPROVIDER_HEADER +#define FILEZILLA_INTERFACE_THEMEPROVIDER_HEADER #include #include +#include + enum iconSize { + iconSizeTiny, iconSizeSmall, iconSize24, iconSizeNormal, iconSizeLarge }; -class CThemeProvider : public wxArtProvider, protected COptionChangeEventHandler +class CTheme final +{ +public: + bool Load(std::wstring const& theme); + bool Load(std::wstring const& theme, std::vector sizes); + + wxBitmap const& LoadBitmap(std::wstring const& name, wxSize const& size); + wxAnimation LoadAnimation(std::wstring const& name, wxSize const& size); + + static wxSize StringToSize(std::wstring const&); + + std::wstring get_theme() const { return theme_; } + std::wstring get_name() const { return name_; } + std::wstring get_author() const { return author_; } + std::wstring get_mail() const { return mail_; } + + std::vector GetAllImages(wxSize const& size); +private: + struct size_cmp final + { + bool operator()(wxSize const& a, wxSize const&b) const { + return a.x < b.x || (a.x == b.x && a.y < b.y); + } + }; + + struct cacheEntry + { + // Converting from wxImage to wxBitmap to wxImage is quite slow, so cache the images as well. + std::map bitmaps_; + std::map images_; + }; + + wxBitmap const& DoLoadBitmap(std::wstring const& name, wxSize const& size, cacheEntry & cache); + + wxBitmap const& LoadBitmapWithSpecificSizeAndScale(std::wstring const& name, wxSize const& size, wxSize const& scale, cacheEntry & cache); + + wxImage const& LoadImageWithSpecificSize(std::wstring const& file, wxSize const& size, cacheEntry & cache); + + std::wstring theme_; + std::wstring path_; + + std::wstring name_; + std::wstring author_; + std::wstring mail_; + + fz::datetime timestamp_; + + std::map sizes_; + + std::map cache_; +}; + +class CThemeProvider final : public wxArtProvider, protected COptionChangeEventHandler { public: CThemeProvider(); virtual ~CThemeProvider(); - static std::vector GetThemes(); - static std::vector> GetAllImages(const wxString& theme, const wxSize& size); - static bool GetThemeData(const wxString& themePath, wxString& name, wxString& author, wxString& email); - static std::vector GetThemeSizes(const wxString& themePath); + static std::vector GetThemes(); + std::vector GetAllImages(std::wstring const& theme, wxSize const& size); + bool GetThemeData(std::wstring const& theme, std::wstring& name, std::wstring& author, std::wstring& email); static wxIconBundle GetIconBundle(const wxArtID& id, const wxArtClient& client = wxART_OTHER); - static bool ThemeHasSize(const wxString& themePath, const wxString& size); - static wxSize GetIconSize(wxString const& str); - static wxSize GetIconSize(enum iconSize size); + static wxSize GetIconSize(iconSize size, bool userScaled = false); + + // Note: Always 1 on OS X + static double GetUIScaleFactor(); static CThemeProvider* Get(); - wxAnimation CreateAnimation(const wxArtID& id, const wxSize& size); -protected: - static wxString GetThemePath(); + wxAnimation CreateAnimation(wxArtID const& id, wxSize const& size); - wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& /*client*/, const wxSize& size); + virtual wxBitmap CreateBitmap(wxArtID const& id, wxArtClient const& client, wxSize const& size); - std::list GetSearchDirs(const wxSize& size); +protected: virtual void OnOptionsChanged(changed_options_t const& options); - wxString m_themePath; + std::map themes_; }; -#endif //__THEMEPROVIDER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/timeformatting.cpp filezilla-3.33.0/src/interface/timeformatting.cpp --- filezilla-3.15.0.2/src/interface/timeformatting.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/timeformatting.cpp 2016-04-13 09:54:50.000000000 +0000 @@ -72,7 +72,7 @@ wxString CTimeFormat::Format(fz::datetime const& time) { wxString ret; - if (time.empty()) { + if (!time.empty()) { if (time.get_accuracy() > fz::datetime::days) { ret = FormatDateTime(time); } @@ -95,4 +95,4 @@ Impl& impl = GetImpl(); return time.format(impl.m_dateFormat.ToStdWstring(), fz::datetime::local); -} \ No newline at end of file +} diff -Nru filezilla-3.15.0.2/src/interface/timeformatting.h filezilla-3.33.0/src/interface/timeformatting.h --- filezilla-3.15.0.2/src/interface/timeformatting.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/timeformatting.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __TIMEFORMATTING_H__ -#define __TIMEFORMATTING_H__ +#ifndef FILEZILLA_INTERFACE_TIMEFORMATTING_HEADER +#define FILEZILLA_INTERFACE_TIMEFORMATTING_HEADER namespace fz { class datetime; @@ -13,4 +13,4 @@ static wxString FormatDate(fz::datetime const& time); }; -#endif //__TIMEFORMATTING_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/toolbar.cpp filezilla-3.33.0/src/interface/toolbar.cpp --- filezilla-3.15.0.2/src/interface/toolbar.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/toolbar.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -6,35 +6,79 @@ #include "QueueView.h" #include "themeprovider.h" #include "toolbar.h" -#include "xh_toolb_ex.h" -IMPLEMENT_DYNAMIC_CLASS(CToolBar, wxToolBar) +CToolBar::~CToolBar() +{ + for (auto iter = m_hidden_tools.begin(); iter != m_hidden_tools.end(); ++iter) { + delete iter->second; + } +} -CToolBar::CToolBar() - : CStateEventHandler(0) - , m_pMainFrame() +void CToolBar::MakeTool(char const* id, std::wstring const& art, wxString const& tooltip, wxString const& help, wxItemKind type) { + if (help.empty() && !tooltip.empty()) { + MakeTool(id, art, tooltip, tooltip, type); + return; + } + + wxBitmap bmp = CThemeProvider::Get()->CreateBitmap(art, wxART_TOOLBAR, iconSize_); + wxToolBar::AddTool(XRCID(id), wxString(), bmp, wxBitmap(), type, tooltip, help); } -CToolBar::~CToolBar() +void CToolBar::MakeTools() { - for (auto iter = m_hidden_tools.begin(); iter != m_hidden_tools.end(); ++iter) - delete iter->second; +#ifdef __WXMSW__ + MakeTool("ID_TOOLBAR_SITEMANAGER", L"ART_SITEMANAGER", _("Open the Site Manager."), _("Open the Site Manager"), wxITEM_DROPDOWN); +#else + MakeTool("ID_TOOLBAR_SITEMANAGER", L"ART_SITEMANAGER", _("Open the Site Manager. Right-click for a list of sites."), _("Open the Site Manager"), wxITEM_DROPDOWN); +#endif + AddSeparator(); + + MakeTool("ID_TOOLBAR_LOGVIEW", L"ART_LOGVIEW", _("Toggles the display of the message log"), wxString(), wxITEM_CHECK); + MakeTool("ID_TOOLBAR_LOCALTREEVIEW", L"ART_LOCALTREEVIEW", _("Toggles the display of the local directory tree"), wxString(), wxITEM_CHECK); + MakeTool("ID_TOOLBAR_REMOTETREEVIEW", L"ART_REMOTETREEVIEW", _("Toggles the display of the remote directory tree"), wxString(), wxITEM_CHECK); + MakeTool("ID_TOOLBAR_QUEUEVIEW", L"ART_QUEUEVIEW", _("Toggles the display of the transfer queue"), wxString(), wxITEM_CHECK); + AddSeparator(); + + MakeTool("ID_TOOLBAR_REFRESH", L"ART_REFRESH", _("Refresh the file and folder lists")); + MakeTool("ID_TOOLBAR_PROCESSQUEUE", L"ART_PROCESSQUEUE", _("Toggles processing of the transfer queue"), wxString(), wxITEM_CHECK); + MakeTool("ID_TOOLBAR_CANCEL", L"ART_CANCEL", _("Cancels the current operation"), _("Cancel current operation")); + MakeTool("ID_TOOLBAR_DISCONNECT", L"ART_DISCONNECT", _("Disconnects from the currently visible server"), _("Disconnect from server")); + MakeTool("ID_TOOLBAR_RECONNECT", L"ART_RECONNECT", _("Reconnects to the last used server")); + AddSeparator(); + + MakeTool("ID_TOOLBAR_FILTER", L"ART_FILTER", _("Opens the directory listing filter dialog. Right-click to toggle filters.") + L"\n" + _("Files matching a filter rule are removed from directory listings."), _("Filter the directory listings"), wxITEM_CHECK); + MakeTool("ID_TOOLBAR_COMPARISON", L"ART_COMPARE", _("Toggle directory comparison. Right-click to change comparison mode.\n\nColors:\nYellow: File only exists on one side\nGreen: File is newer than the unmarked file on other side\nRed: File sizes different"), _("Directory comparison"), wxITEM_CHECK); + MakeTool("ID_TOOLBAR_SYNCHRONIZED_BROWSING", L"ART_SYNCHRONIZE", _("Toggle synchronized browsing.\nIf enabled, navigating the local directory hierarchy will also change the directory on the server accordingly and vice versa."), _("Synchronized browsing"), wxITEM_CHECK); + MakeTool("ID_TOOLBAR_FIND", L"ART_FIND", _("Search for files recursively."), _("File search")); } CToolBar* CToolBar::Load(CMainFrame* pMainFrame) { - { - wxString str = COptions::Get()->GetOption(OPTION_THEME_ICONSIZE); - wxSize iconSize = CThemeProvider::GetIconSize(str); - wxToolBarXmlHandlerEx::SetIconSize(iconSize); + CToolBar* toolbar = new CToolBar(); + toolbar->m_pMainFrame = pMainFrame; + + toolbar->iconSize_ = CThemeProvider::GetIconSize(iconSizeSmall, true); +#ifdef __WXMAC__ + // OS X only knows two hardcoded toolbar sizes. + if (toolbar->iconSize_.x >= 32) { + toolbar->iconSize_ = wxSize(32, 32); + } + else { + toolbar->iconSize_ = wxSize(24, 24); } +#endif - CToolBar* toolbar = wxDynamicCast(wxXmlResource::Get()->LoadToolBar(pMainFrame, _T("ID_TOOLBAR")), CToolBar); - if (!toolbar) + int style = wxTB_FLAT | wxTB_HORIZONTAL | wxTB_NODIVIDER; +#ifdef __WXMSW__ + style |= wxTB_NOICONS; +#endif + if (!toolbar->Create(pMainFrame, XRCID("ID_TOOLBAR"), wxDefaultPosition, wxDefaultSize, style)) { + delete toolbar; return 0; - - toolbar->m_pMainFrame = pMainFrame; + } + toolbar->SetToolBitmapSize(toolbar->iconSize_); + toolbar->MakeTools(); CContextManager::Get()->RegisterHandler(toolbar, STATECHANGE_REMOTE_IDLE, true); CContextManager::Get()->RegisterHandler(toolbar, STATECHANGE_SERVER, true); @@ -51,32 +95,87 @@ toolbar->RegisterOption(OPTION_SHOW_TREE_REMOTE); toolbar->RegisterOption(OPTION_MESSAGELOG_POSITION); -#ifdef __WXMSW__ - int majorVersion, minorVersion; - wxGetOsVersion(& majorVersion, & minorVersion); - if (majorVersion < 6) - toolbar->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); -#endif - toolbar->ToggleTool(XRCID("ID_TOOLBAR_FILTER"), CFilterManager::HasActiveFilters()); toolbar->ToggleTool(XRCID("ID_TOOLBAR_LOGVIEW"), COptions::Get()->GetOptionVal(OPTION_SHOW_MESSAGELOG) != 0); toolbar->ToggleTool(XRCID("ID_TOOLBAR_QUEUEVIEW"), COptions::Get()->GetOptionVal(OPTION_SHOW_QUEUE) != 0); toolbar->ToggleTool(XRCID("ID_TOOLBAR_LOCALTREEVIEW"), COptions::Get()->GetOptionVal(OPTION_SHOW_TREE_LOCAL) != 0); toolbar->ToggleTool(XRCID("ID_TOOLBAR_REMOTETREEVIEW"), COptions::Get()->GetOptionVal(OPTION_SHOW_TREE_REMOTE) != 0); - if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) == 2) + pMainFrame->SetToolBar(toolbar); + toolbar->Realize(); + + if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) == 2) { toolbar->HideTool(XRCID("ID_TOOLBAR_LOGVIEW")); + } -#ifdef __WXMAC__ - // Hide then re-show fixes some odd sizing - toolbar->Hide(); - if (COptions::Get()->GetOptionVal(OPTION_TOOLBAR_HIDDEN) == 0) - toolbar->Show(); -#endif return toolbar; } -void CToolBar::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*) +#ifdef __WXMSW__ +bool CToolBar::Realize() +{ + wxASSERT(HasFlag(wxTB_NOICONS)); + + bool ret = wxToolBar::Realize(); + if (!ret) { + return false; + } + + wxASSERT(iconSize_.x > 0 && iconSize_.y > 0); + auto toolImages = std::make_unique(iconSize_.x, iconSize_.y, false, 0); + auto disabledToolImages = std::make_unique(iconSize_.x, iconSize_.y, false, 0); + + HWND hwnd = GetHandle(); + + auto hImgList = reinterpret_cast(toolImages->GetHIMAGELIST()); + auto hDisabledImgList = reinterpret_cast(disabledToolImages->GetHIMAGELIST()); + ::SendMessage(hwnd, TB_SETIMAGELIST, 0, reinterpret_cast(hImgList)); + ::SendMessage(hwnd, TB_SETDISABLEDIMAGELIST, 0, reinterpret_cast(hDisabledImgList)); + + toolImages_ = std::move(toolImages); + disabledToolImages_ = std::move(disabledToolImages); + + for (size_t i = 0; i < GetToolsCount(); ++i) { + auto tool = GetToolByPos(static_cast(i)); + if (!tool || tool->GetStyle() != wxTOOL_STYLE_BUTTON) { + continue; + } + + auto bmp = tool->GetBitmap(); + if (!bmp.IsOk()) { + continue; + } + + int image = toolImages_->Add(bmp); + auto disabled = tool->GetDisabledBitmap(); + if (!disabled.IsOk()) { + disabled = wxBitmap(bmp.ConvertToImage().ConvertToGreyscale()); + } + disabledToolImages_->Add(disabled); + + TBBUTTONINFO btn{}; + btn.cbSize = sizeof(TBBUTTONINFO); + btn.dwMask = TBIF_BYINDEX; + int index = ::SendMessage(hwnd, TB_GETBUTTONINFO, i, reinterpret_cast(&btn)); + if (index != static_cast(i)) { + return false; + } + + btn.dwMask = TBIF_BYINDEX | TBIF_IMAGE; + btn.iImage = image; + if (::SendMessage(hwnd, TB_SETBUTTONINFO, i, reinterpret_cast(&btn)) == 0) { + return false; + } + } + + ::SendMessage(hwnd, TB_SETINDENT, ConvertDialogToPixels(wxPoint(1, 0)).x, 0); + + return true; +} + +#endif + +void CToolBar::OnStateChange(CState* pState, t_statechange_notifications notification, const wxString&, const void*) { switch (notification) { @@ -114,26 +213,26 @@ void CToolBar::UpdateToolbarState() { CState* pState = CContextManager::Get()->GetCurrentContext(); - if (!pState) + if (!pState) { return; + } - const CServer* pServer = pState->GetServer(); - const bool idle = pState->IsRemoteIdle(); + bool const hasServer = static_cast(pState->GetServer()); + bool const idle = pState->IsRemoteIdle(); - EnableTool(XRCID("ID_TOOLBAR_DISCONNECT"), pServer && idle); - EnableTool(XRCID("ID_TOOLBAR_CANCEL"), pServer && !idle); - EnableTool(XRCID("ID_TOOLBAR_SYNCHRONIZED_BROWSING"), pServer != 0); - EnableTool(XRCID("ID_TOOLBAR_FIND"), pServer && idle); + EnableTool(XRCID("ID_TOOLBAR_DISCONNECT"), hasServer && idle); + EnableTool(XRCID("ID_TOOLBAR_CANCEL"), hasServer && !idle); + EnableTool(XRCID("ID_TOOLBAR_SYNCHRONIZED_BROWSING"), hasServer); ToggleTool(XRCID("ID_TOOLBAR_COMPARISON"), pState->GetComparisonManager()->IsComparing()); ToggleTool(XRCID("ID_TOOLBAR_SYNCHRONIZED_BROWSING"), pState->GetSyncBrowse()); bool canReconnect; - if (pServer || !idle) + if (hasServer || !idle) { canReconnect = false; + } else { - CServer tmp; - canReconnect = !pState->GetLastServer().GetHost().empty(); + canReconnect = static_cast(pState->GetLastSite().server_); } EnableTool(XRCID("ID_TOOLBAR_RECONNECT"), canReconnect); } @@ -153,8 +252,9 @@ ToggleTool(XRCID("ID_TOOLBAR_REMOTETREEVIEW"), COptions::Get()->GetOptionVal(OPTION_SHOW_TREE_REMOTE) != 0); } if (options.test(OPTION_MESSAGELOG_POSITION)) { - if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) == 2) + if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) == 2) { HideTool(XRCID("ID_TOOLBAR_LOGVIEW")); + } else { ShowTool(XRCID("ID_TOOLBAR_LOGVIEW")); ToggleTool(XRCID("ID_TOOLBAR_LOGVIEW"), COptions::Get()->GetOptionVal(OPTION_SHOW_MESSAGELOG) != 0); @@ -185,16 +285,19 @@ bool CToolBar::HideTool(int id) { int pos = GetToolPos(id); - if (pos == -1) + if (pos == -1) { return false; + } wxToolBarToolBase* tool = RemoveTool(id); - if (!tool) + if (!tool) { return false; + } for (auto const& iter : m_hidden_tools) { - if (iter.first > pos) + if (iter.first > pos) { break; + } ++pos; } diff -Nru filezilla-3.15.0.2/src/interface/toolbar.h filezilla-3.33.0/src/interface/toolbar.h --- filezilla-3.15.0.2/src/interface/toolbar.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/toolbar.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,15 +1,15 @@ -#ifndef __TOOLBAR_H__ -#define __TOOLBAR_H__ +#ifndef FILEZILLA_INTERFACE_TOOLBAR_HEADER +#define FILEZILLA_INTERFACE_TOOLBAR_HEADER #include #include "state.h" class CMainFrame; -class CToolBar : public wxToolBar, public CStateEventHandler, public COptionChangeEventHandler +class CToolBar final : public wxToolBar, public CGlobalStateEventHandler, public COptionChangeEventHandler { public: - CToolBar(); + CToolBar() = default; virtual ~CToolBar(); void UpdateToolbarState(); @@ -19,15 +19,27 @@ bool ShowTool(int id); bool HideTool(int id); +#ifdef __WXMSW__ + virtual bool Realize(); +#endif + protected: - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2); + void MakeTool(char const* id, std::wstring const& art, wxString const& tooltip, wxString const& help = wxString(), wxItemKind type = wxITEM_NORMAL); + void MakeTools(); + + virtual void OnStateChange(CState* pState, t_statechange_notifications notification, const wxString& data, const void* data2); virtual void OnOptionsChanged(changed_options_t const& options); - CMainFrame* m_pMainFrame; + CMainFrame* m_pMainFrame{}; std::map m_hidden_tools; - DECLARE_DYNAMIC_CLASS(CToolBar) +#ifdef __WXMSW__ + std::unique_ptr toolImages_; + std::unique_ptr disabledToolImages_; +#endif + + wxSize iconSize_; }; -#endif //__TOOLBAR_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/treectrlex.cpp filezilla-3.33.0/src/interface/treectrlex.cpp --- filezilla-3.15.0.2/src/interface/treectrlex.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/treectrlex.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -39,16 +39,16 @@ void wxTreeCtrlEx::SafeSelectItem(const wxTreeItemId& item) { if( !item ) { - m_setSelection = true; + ++m_setSelection; UnselectAll(); - m_setSelection = false; + --m_setSelection; } else { const wxTreeItemId old_selection = GetSelection(); - m_setSelection = true; + ++m_setSelection; SelectItem(item); - m_setSelection = false; + --m_setSelection; if (item != old_selection) EnsureVisible(item); } diff -Nru filezilla-3.15.0.2/src/interface/treectrlex.h filezilla-3.33.0/src/interface/treectrlex.h --- filezilla-3.15.0.2/src/interface/treectrlex.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/treectrlex.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __TREECTRLEX_H__ -#define __TREECTRLEX_H__ +#ifndef FILEZILLA_INTERFACE_TREECTRLEX_HEADER +#define FILEZILLA_INTERFACE_TREECTRLEX_HEADER #include #include "filelistctrl.h" @@ -39,7 +39,7 @@ protected: - bool m_setSelection{}; + int m_setSelection{}; #ifdef __WXMAC__ DECLARE_EVENT_TABLE() @@ -51,4 +51,4 @@ CFileListCtrlSortBase::NameSortMode m_nameSortMode; }; -#endif //__TREECTRLEX_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/update_dialog.cpp filezilla-3.33.0/src/interface/update_dialog.cpp --- filezilla-3.15.0.2/src/interface/update_dialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/update_dialog.cpp 2017-02-21 22:01:27.000000000 +0000 @@ -7,6 +7,8 @@ #include "file_utils.h" #include "update_dialog.h" #include "themeprovider.h" +#include "xrc_helper.h" +#include "Options.h" #include #include @@ -15,6 +17,7 @@ EVT_BUTTON(XRCID("ID_INSTALL"), CUpdateDialog::OnInstall) EVT_TIMER(wxID_ANY, CUpdateDialog::OnTimer) EVT_HYPERLINK(XRCID("ID_SHOW_DETAILS"), CUpdateDialog::ShowDetails) +EVT_HYPERLINK(XRCID("ID_SHOW_DETAILS_DL"), CUpdateDialog::ShowDetailsDl) EVT_HYPERLINK(XRCID("ID_RETRY"), CUpdateDialog::Retry) EVT_HYPERLINK(XRCID("ID_DOWNLOAD_RETRY"), CUpdateDialog::Retry) EVT_BUTTON(XRCID("ID_DEBUGLOG"), CUpdateDialog::OnDebugLog) @@ -52,20 +55,20 @@ int CUpdateDialog::ShowModal() { wxString version(PACKAGE_VERSION, wxConvLocal); - if (version.empty() || version[0] < '0' || version[0] > '9') - { + if (version.empty() || version[0] < '0' || version[0] > '9') { wxMessageBoxEx(_("Executable contains no version info, cannot check for updates."), _("Check for updates failed"), wxICON_ERROR, parent_); return wxID_CANCEL; } - if (!Load(parent_, _T("ID_UPDATE_DIALOG"))) + if (!Load(parent_, _T("ID_UPDATE_DIALOG"))) { return wxID_CANCEL; + } LoadPanel(_T("ID_CHECKING_PANEL")); LoadPanel(_T("ID_FAILURE_PANEL")); LoadPanel(_T("ID_NEWVERSION_PANEL")); LoadPanel(_T("ID_LATEST_PANEL")); - if( panels_.size() != 4 ) { + if (panels_.size() != 4) { return wxID_CANCEL; } @@ -77,9 +80,12 @@ XRCCTRL(*this, "ID_WAIT_DOWNLOAD", wxAnimationCtrl)->SetAnimation(a); XRCCTRL(*this, "ID_WAIT_DOWNLOAD", wxAnimationCtrl)->Play(); + InitFooter(); + Wrap(); - XRCCTRL(*this, "ID_DETAILS", wxTextCtrl)->Hide(); + xrc_call(*this, "ID_DETAILS", &wxTextCtrl::Hide); + xrc_call(*this, "ID_DETAILS_DL", &wxTextCtrl::Hide); UpdaterState s = updater_.GetState(); UpdaterStateChanged( s, updater_.AvailableBuild() ); @@ -94,6 +100,55 @@ return ret; } +void MakeLinksFromTooltips(wxWindow& parent) +{ + // Iterates over all children. + // If tooltip is a URL, make the child have the hand cursor + // and launch URL in browser upon click. + wxWindowList children = parent.GetChildren(); + for (auto child : children) { + wxString const tooltip = child->GetToolTipText(); + if (tooltip.find(_T("http://")) == 0 || tooltip.find(_T("https://")) == 0) { + child->SetCursor(wxCURSOR_HAND); + child->Bind(wxEVT_LEFT_UP, [tooltip](wxEvent const&) { wxLaunchDefaultBrowser(tooltip); }); + } + MakeLinksFromTooltips(*child); + } +} + +void CUpdateDialog::InitFooter() +{ +#if FZ_WINDOWS + if (CBuildInfo::GetBuildType() == _T("official") && !COptions::Get()->GetOptionVal(OPTION_DISABLE_UPDATE_FOOTER)) { + wxString const resources = updater_.GetResources(); + if (!resources.empty()) { + wxLogNull null; + + wxXmlResource res(wxXRC_NO_RELOADING); + InitHandlers(res); + if (res.Load(_T("blob:") + resources)) { + auto sizer = xrc_call(*this, "ID_NEWVERSION_PANEL", &wxPanel::GetSizer); + if (sizer) { + wxPanel* p{}; + bool top{}; + if ((p = res.LoadPanel(sizer->GetContainingWindow(), _T("ID_UPDATE_FOOTER")))) { + top = false; + } + else if ((p = res.LoadPanel(sizer->GetContainingWindow(), _T("ID_UPDATE_HEADER")))) { + top = true; + } + + if (p) { + MakeLinksFromTooltips(*p); + sizer->Insert(top ? 0 : 1, p, wxSizerFlags().Align(wxALIGN_CENTER_HORIZONTAL).Border(top ? wxBOTTOM : wxTOP, 5)); + } + } + } + } + } +#endif +} + void CUpdateDialog::Wrap() { wxPanel* parentPanel = XRCCTRL(*this, "ID_CONTENT", wxPanel); @@ -205,6 +260,9 @@ bool dlfail = s == UpdaterState::newversion && !v.url_.empty(); XRCCTRL(*this, "ID_DOWNLOAD_FAIL", wxStaticText)->Show(dlfail); XRCCTRL(*this, "ID_DOWNLOAD_RETRY", wxHyperlinkCtrl)->Show(dlfail); + XRCCTRL(*this, "ID_SHOW_DETAILS_DL", wxHyperlinkCtrl)->Show(dlfail); + + XRCCTRL(*this, "ID_DETAILS_DL", wxTextCtrl)->ChangeValue(updater_.GetLog()); XRCCTRL(*this, "ID_NEWVERSION_WEBSITE_TEXT", wxStaticText)->Show(manual && !dlfail); XRCCTRL(*this, "ID_NEWVERSION_WEBSITE_TEXT_DLFAIL", wxStaticText)->Show(manual && dlfail); @@ -221,8 +279,9 @@ if( f.empty() ) { return; } + COptions::Get()->SetOption(OPTION_GREETINGRESOURCES, updater_.GetResources().ToStdWstring()); #ifdef __WXMSW__ - wxExecute(_T("\"") + f + _T("\" /update")); + wxExecute(_T("\"") + f + _T("\" /update /NCRC")); wxWindow* p = parent_; while( p->GetParent() ) { p = p->GetParent(); @@ -262,6 +321,15 @@ panels_[pagenames::failed]->Layout(); } +void CUpdateDialog::ShowDetailsDl(wxHyperlinkEvent&) +{ + XRCCTRL(*this, "ID_SHOW_DETAILS_DL", wxHyperlinkCtrl)->Hide(); + XRCCTRL(*this, "ID_DETAILS_DL", wxTextCtrl)->Show(); + XRCCTRL(*this, "ID_DETAILS_DL", wxTextCtrl)->SetMinSize(wxSize(-1, 200)); + + panels_[pagenames::newversion]->Layout(); +} + void CUpdateDialog::Retry(wxHyperlinkEvent&) { updater_.RunIfNeeded(); diff -Nru filezilla-3.15.0.2/src/interface/update_dialog.h filezilla-3.33.0/src/interface/update_dialog.h --- filezilla-3.15.0.2/src/interface/update_dialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/update_dialog.h 2017-01-09 16:00:56.000000000 +0000 @@ -10,7 +10,7 @@ class wxHyperlinkEvent; -class CUpdateDialog : public wxDialogEx, protected CUpdateHandler +class CUpdateDialog final : public wxDialogEx, protected CUpdateHandler { public: CUpdateDialog(wxWindow* parent, CUpdater& updater); @@ -26,6 +26,8 @@ void LoadPanel(wxString const& name); void Wrap(); + void InitFooter(); + wxWindow* parent_; CUpdater& updater_; @@ -37,6 +39,7 @@ void OnInstall(wxCommandEvent& ev); void OnTimer(wxTimerEvent& ev); void ShowDetails(wxHyperlinkEvent& ev); + void ShowDetailsDl(wxHyperlinkEvent& ev); void Retry(wxHyperlinkEvent& ev); void OnDebugLog(wxCommandEvent&); }; diff -Nru filezilla-3.15.0.2/src/interface/updater.cpp filezilla-3.33.0/src/interface/updater.cpp --- filezilla-3.15.0.2/src/interface/updater.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/updater.cpp 2018-01-08 04:30:03.000000000 +0000 @@ -6,24 +6,21 @@ #include "updater.h" #include "Options.h" #include "file_utils.h" -#include #include #include +#ifdef __WXMSW__ +#include +#endif + +#include #include #include -// This is ugly but does the job -#define SHA512_STANDALONE -typedef unsigned int uint32; -namespace { -#include "../putty/int64.h" -#include "../putty/sshsh512.c" -} +#include BEGIN_EVENT_TABLE(CUpdater, wxEvtHandler) -EVT_FZ_NOTIFICATION(wxID_ANY, CUpdater::OnEngineEvent) EVT_TIMER(wxID_ANY, CUpdater::OnTimer) END_EVENT_TABLE() @@ -64,13 +61,13 @@ void version_information::update_available() { - if( !nightly_.url_.empty() && COptions::Get()->GetOptionVal(OPTION_UPDATECHECK_CHECKBETA) == 2 ) { + if (!nightly_.url_.empty() && COptions::Get()->GetOptionVal(OPTION_UPDATECHECK_CHECKBETA) == 2) { available_ = nightly_; } - else if( !beta_.version_.empty() && COptions::Get()->GetOptionVal(OPTION_UPDATECHECK_CHECKBETA) != 0 ) { + else if (!beta_.version_.empty() && COptions::Get()->GetOptionVal(OPTION_UPDATECHECK_CHECKBETA) != 0) { available_ = beta_; } - else if( !stable_.version_.empty() ) { + else if (!stable_.version_.empty()) { available_ = stable_; } else { @@ -80,21 +77,21 @@ static CUpdater* instance = 0; -CUpdater::CUpdater(CUpdateHandler& parent, CFileZillaEngineContext& engine_context) +CUpdater::CUpdater(CUpdateHandler& parent, CFileZillaEngineContext& engine_context, std::function const& activityNotificationHandler) : state_(UpdaterState::idle) - , engine_(new CFileZillaEngine(engine_context)) + , engine_(new CFileZillaEngine(engine_context, *this)) + , activityNotificationHandler_(activityNotificationHandler) { AddHandler(parent); - engine_->Init(this); } void CUpdater::Init() { - if( state_ == UpdaterState::checking || state_ == UpdaterState::newversion_downloading ) { + if (state_ == UpdaterState::checking || state_ == UpdaterState::newversion_downloading) { return; } - raw_version_information_ = COptions::Get()->GetOption( OPTION_UPDATECHECK_NEWVERSION ); + raw_version_information_ = COptions::Get()->GetOption(OPTION_UPDATECHECK_NEWVERSION); UpdaterState s = ProcessFinishedData(FZ_AUTOUPDATECHECK); @@ -105,16 +102,18 @@ update_timer_.SetOwner(this); update_timer_.Start(1000 * 3600); - if( !instance ) { + if (!instance) { instance = this; } } CUpdater::~CUpdater() { - if( instance == this ) { - instance =0; + if (instance == this) { + instance = 0; + } + delete engine_; } @@ -126,8 +125,8 @@ void CUpdater::AutoRunIfNeeded() { #if FZ_AUTOUPDATECHECK - if( state_ == UpdaterState::failed || state_ == UpdaterState::idle ) { - if( !COptions::Get()->GetOptionVal(OPTION_DEFAULT_DISABLEUPDATECHECK) && COptions::Get()->GetOptionVal(OPTION_UPDATECHECK) != 0 && LongTimeSinceLastCheck() ) { + if (state_ == UpdaterState::failed || state_ == UpdaterState::idle) { + if (!COptions::Get()->GetOptionVal(OPTION_DEFAULT_DISABLEUPDATECHECK) && COptions::Get()->GetOptionVal(OPTION_UPDATECHECK) != 0 && LongTimeSinceLastCheck()) { Run(); } } @@ -137,9 +136,9 @@ void CUpdater::RunIfNeeded() { build const b = AvailableBuild(); - if( state_ == UpdaterState::idle || state_ == UpdaterState::failed || + if (state_ == UpdaterState::idle || state_ == UpdaterState::failed || LongTimeSinceLastCheck() || (state_ == UpdaterState::newversion && !b.url_.empty()) || - (state_ == UpdaterState::newversion_ready && !VerifyChecksum( DownloadedFile(), b.size_, b.hash_ ) ) ) + (state_ == UpdaterState::newversion_ready && !VerifyChecksum(DownloadedFile(), b.size_, b.hash_))) { Run(); } @@ -147,52 +146,93 @@ bool CUpdater::LongTimeSinceLastCheck() const { - wxString const lastCheckStr = COptions::Get()->GetOption(OPTION_UPDATECHECK_LASTDATE); - if (lastCheckStr.empty()) + std::wstring const lastCheckStr = COptions::Get()->GetOption(OPTION_UPDATECHECK_LASTDATE); + if (lastCheckStr.empty()) { return true; + } - fz::datetime lastCheck(lastCheckStr.ToStdWstring(), fz::datetime::utc); - if (!lastCheck.empty()) + fz::datetime lastCheck(lastCheckStr, fz::datetime::utc); + if (lastCheck.empty()) { return true; + } auto const span = fz::datetime::now() - lastCheck; - if (span.get_seconds() < 0) + if (span.get_seconds() < 0) { // Last check in future return true; + } int days = 1; - if (!CBuildInfo::IsUnstable()) + if (!CBuildInfo::IsUnstable()) { days = COptions::Get()->GetOptionVal(OPTION_UPDATECHECK_INTERVAL); + } return span.get_days() >= days; } -wxString CUpdater::GetUrl() +std::wstring CUpdater::GetUrl() { - wxString host = CBuildInfo::GetHostname(); - if (host.empty()) - host = _T("unknown"); + std::wstring host = CBuildInfo::GetHostname(); + if (host.empty()) { + host = L"unknown"; + } - wxString version(PACKAGE_VERSION, wxConvLocal); - version.Replace(_T(" "), _T("%20")); + std::wstring version = CBuildInfo::GetVersion(); + fz::replace_substrings(version, L" ", L"%20"); - wxString url = wxString::Format(_T("https://update.filezilla-project.org/update.php?platform=%s&version=%s"), host, version); + std::wstring url = fz::sprintf(L"https://update.filezilla-project.org/update.php?platform=%s&version=%s", host, version); #if defined(__WXMSW__) || defined(__WXMAC__) // Makes not much sense to submit OS version on Linux, *BSD and the likes, too many flavours. - wxString osVersion = wxString::Format(_T("&osversion=%d.%d"), wxPlatformInfo::Get().GetOSMajorVersion(), wxPlatformInfo::Get().GetOSMinorVersion()); - url += osVersion; + url += fz::sprintf(L"&osversion=%d.%d", wxPlatformInfo::Get().GetOSMajorVersion(), wxPlatformInfo::Get().GetOSMinorVersion()); #endif #ifdef __WXMSW__ - if (wxIsPlatform64Bit()) - url += _T("&osarch=64"); - else - url += _T("&osarch=32"); + if (wxIsPlatform64Bit()) { + url += L"&osarch=64"; + } + else { + url += L"&osarch=32"; + } + + // Add information about package + { + wxLogNull log; + + // Installer always writes to 32bit section + auto key = std::make_unique(_T("HKEY_CURRENT_USER\\Software\\FileZilla Client"), wxRegKey::WOW64ViewMode_32); + if (!key->Exists()) { + // wxRegKey is sad, it doesn't even have a copy constructor. + key = std::make_unique(_T("HKEY_LOCAL_MACHINE\\Software\\FileZilla Client"), wxRegKey::WOW64ViewMode_32); + } + + long updated{}; + if (key->GetValueType(_T("Updated")) == wxRegKey::Type_Dword && key->QueryValue(_T("Updated"), &updated)) { + url += fz::sprintf(L"&updated=%d", updated); + } + + long package{}; + if (key->GetValueType(_T("Package")) == wxRegKey::Type_Dword && key->QueryValue(_T("Package"), &package)) { + url += fz::sprintf(L"&package=%d", package); + } + + wxString channel; + if (key->GetValueType(_T("Channel")) == wxRegKey::Type_String && key->QueryValue(_T("Channel"), channel)) { + url += fz::sprintf(L"&channel=%s", channel.ToStdWstring()); + } + } #endif - wxString const cpuCaps = CBuildInfo::GetCPUCaps(','); + std::wstring const cpuCaps = CBuildInfo::GetCPUCaps(','); if (!cpuCaps.empty()) { - url += _T("&cpuid=") + cpuCaps; + url += L"&cpuid=" + cpuCaps; + } + + std::wstring const lastVersion = COptions::Get()->GetOption(OPTION_UPDATECHECK_LASTVERSION); + if (lastVersion != CBuildInfo::GetVersion()) { + url += L"&initial=1"; + } + else { + url += L"&initial=0"; } return url; @@ -200,8 +240,8 @@ bool CUpdater::Run() { - if( state_ != UpdaterState::idle && state_ != UpdaterState::failed && - state_ != UpdaterState::newversion && state_ != UpdaterState::newversion_ready ) + if (state_ != UpdaterState::idle && state_ != UpdaterState::failed && + state_ != UpdaterState::newversion && state_ != UpdaterState::newversion_ready) { return false; } @@ -213,7 +253,7 @@ log_ = wxString::Format(_("Started update check on %s\n"), t.format(_T("%Y-%m-%d %H:%M:%S"), fz::datetime::local)); wxString build = CBuildInfo::GetBuildType(); - if( build.empty() ) { + if (build.empty()) { build = _("custom"); } log_ += wxString::Format(_("Own build type: %s\n"), build); @@ -221,7 +261,7 @@ SetState(UpdaterState::checking); m_use_internal_rootcert = true; - int res = Download(GetUrl(), wxString()); + int res = Download(GetUrl(), std::wstring()); if (res != FZ_REPLY_WOULDBLOCK) { SetState(UpdaterState::failed); @@ -231,7 +271,7 @@ return state_ == UpdaterState::checking; } -int CUpdater::Download(wxString const& url, wxString const& local_file) +int CUpdater::Download(std::wstring const& url, std::wstring const& local_file) { wxASSERT(pending_commands_.empty()); pending_commands_.clear(); @@ -258,49 +298,62 @@ return res; } -bool CUpdater::CreateConnectCommand(wxString const& url) +bool CUpdater::CreateConnectCommand(std::wstring const& url) { - CServer s; + ServerWithCredentials s; CServerPath path; - wxString error; - if( !s.ParseUrl( url, 0, wxString(), wxString(), error, path ) || (s.GetProtocol() != HTTP && s.GetProtocol() != HTTPS) ) { + std::wstring error; + if (!s.ParseUrl(url, 0, std::wstring(), std::wstring(), error, path) || (s.server.GetProtocol() != HTTP && s.server.GetProtocol() != HTTPS)) { return false; } - pending_commands_.emplace_back(new CConnectCommand(s)); + pending_commands_.emplace_back(new CConnectCommand(s.server, s.credentials)); return true; } -bool CUpdater::CreateTransferCommand(wxString const& url, wxString const& local_file) +bool CUpdater::CreateTransferCommand(std::wstring const& url, std::wstring const& local_file) { CFileTransferCommand::t_transferSettings transferSettings; - CServer s; + ServerWithCredentials s; CServerPath path; - wxString error; - if( !s.ParseUrl( url, 0, wxString(), wxString(), error, path ) || (s.GetProtocol() != HTTP && s.GetProtocol() != HTTPS) ) { + std::wstring error; + if (!s.ParseUrl(url, 0, std::wstring(), std::wstring(), error, path) || (s.server.GetProtocol() != HTTP && s.server.GetProtocol() != HTTPS)) { return false; } - wxString file = path.GetLastSegment(); + std::wstring file = path.GetLastSegment(); path = path.GetParent(); pending_commands_.emplace_back(new CFileTransferCommand(local_file, path, file, true, transferSettings)); return true; } -void CUpdater::OnEngineEvent(wxFzEvent& event) +void CUpdater::OnEngineEvent(CFileZillaEngine* engine) +{ + CallAfter(&CUpdater::DoOnEngineEvent, engine); +} + +void CUpdater::DoOnEngineEvent(CFileZillaEngine* engine) { - if (!engine_ || engine_ != event.engine_) + if (!engine_ || engine_ != engine) { return; + } std::unique_ptr notification; - while( (notification = engine_->GetNextNotification()) ) { + while ((notification = engine_->GetNextNotification())) { ProcessNotification(std::move(notification)); } } void CUpdater::ProcessNotification(std::unique_ptr && notification) { + if (notification->GetID() == nId_active) { + if (activityNotificationHandler_) { + auto const& activityNotification = static_cast(*notification.get()); + activityNotificationHandler_(activityNotification); + } + return; + } if (state_ != UpdaterState::checking && state_ != UpdaterState::newversion_downloading) { return; } @@ -317,14 +370,12 @@ auto & certNotification = static_cast(*pData.get()); if (m_use_internal_rootcert) { auto certs = certNotification.GetCertificates(); - if( certs.size() > 1 ) { - auto ca = certs.back(); + if (certs.size() > 1) { + auto const& ca = certs.back(); + std::vector ca_data = ca.GetRawData(); - unsigned int ca_data_length{}; - unsigned char const* ca_data = ca.GetRawData(ca_data_length); - - wxMemoryBuffer updater_root = wxBase64Decode(s_update_cert, wxNO_LEN, wxBase64DecodeMode_SkipWS); - if( ca_data_length == updater_root.GetDataLen() && !memcmp(ca_data, updater_root.GetData(), ca_data_length) ) { + std::string updater_root = fz::base64_decode(s_update_cert); + if (ca_data.size() == updater_root.size() && !memcmp(&ca_data[0], updater_root.c_str(), ca_data.size())) { certNotification.m_trusted = true; } } @@ -364,7 +415,7 @@ } else if (!version_information_.available_.url_.empty()) { - wxString const temp = GetTempFile(); + std::wstring const temp = GetTempFile(); wxString const local_file = GetLocalFile(version_information_.available_, true); if (!local_file.empty() && fz::local_filesys::get_file_type(fz::to_native(local_file)) != fz::local_filesys::unknown) { local_file_ = local_file; @@ -384,7 +435,7 @@ if (size >= 0 && size >= version_information_.available_.size_) { s = ProcessFinishedDownload(); } - else if( !can_download || Download( version_information_.available_.url_, GetTempFile() ) != FZ_REPLY_WOULDBLOCK ) { + else if (!can_download || Download(version_information_.available_.url_, temp) != FZ_REPLY_WOULDBLOCK) { s = UpdaterState::newversion; } } @@ -399,7 +450,7 @@ void CUpdater::ProcessOperation(COperationNotification const& operation) { - if( state_ != UpdaterState::checking && state_ != UpdaterState::newversion_downloading ) { + if (state_ != UpdaterState::checking && state_ != UpdaterState::newversion_downloading) { return; } @@ -425,7 +476,8 @@ s = UpdaterState::newversion; } } - else if( state_ == UpdaterState::checking ) { + else if (state_ == UpdaterState::checking) { + COptions::Get()->SetOption(OPTION_UPDATECHECK_LASTVERSION, CBuildInfo::GetVersion()); s = ProcessFinishedData(true); } else { @@ -438,11 +490,11 @@ { UpdaterState s = UpdaterState::newversion; - wxString const temp = GetTempFile(); - if( temp.empty() ) { + std::wstring const temp = GetTempFile(); + if (temp.empty()) { s = UpdaterState::newversion; } - else if( !VerifyChecksum( temp, version_information_.available_.size_, version_information_.available_.hash_ ) ) { + else if (!VerifyChecksum(temp, version_information_.available_.size_, version_information_.available_.hash_)) { wxLogNull log; wxRemoveFile(temp); s = UpdaterState::newversion; @@ -450,12 +502,12 @@ else { s = UpdaterState::newversion_ready; - wxString local_file = GetLocalFile( version_information_.available_, false ); + wxString local_file = GetLocalFile(version_information_.available_, false); wxLogNull log; - if (local_file.empty() || !wxRenameFile( temp, local_file, false ) ) { + if (local_file.empty() || !wxRenameFile(temp, local_file, false)) { s = UpdaterState::newversion; - wxRemoveFile( temp ); + wxRemoveFile(temp); log_ += wxString::Format(_("Could not create local file %s\n"), local_file); } else { @@ -468,7 +520,7 @@ wxString CUpdater::GetLocalFile(build const& b, bool allow_existing) { - wxString const fn = GetFilename( b.url_ ); + wxString const fn = GetFilename(b.url_); wxString const dl = GetDownloadDir().GetPath(); int i = 1; @@ -500,26 +552,26 @@ void CUpdater::ProcessData(CDataNotification& dataNotification) { - if( state_ != UpdaterState::checking ) { + if (state_ != UpdaterState::checking) { return; } int len; char* data = dataNotification.Detach(len); - if( COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4 ) { + if (COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4) { log_ += wxString::Format(_T("ProcessData %d\n"), len); } - if( raw_version_information_.size() + len > 131072 ) { - log_ += _("Received version information is too large"); + if (raw_version_information_.size() + len > 0x40000) { + log_ += _("Received version information is too large") + L"\n"; engine_->Cancel(); SetState(UpdaterState::failed); } else { for (int i = 0; i < len; ++i) { if (data[i] < 10 || (unsigned char)data[i] > 127) { - log_ += _("Received invalid character in version information"); + log_ += _("Received invalid character in version information") + L"\n"; SetState(UpdaterState::failed); engine_->Cancel(); break; @@ -527,7 +579,7 @@ } } - if( state_ == UpdaterState::checking ) { + if (state_ == UpdaterState::checking) { raw_version_information_ += wxString(data, wxConvUTF8, len); } delete [] data; @@ -542,7 +594,7 @@ log_ += wxString::Format(_("Parsing %d bytes of version information.\n"), static_cast(raw_version_information.size())); - while( !raw_version_information.empty() ) { + while (!raw_version_information.empty()) { wxString line; int pos = raw_version_information.Find('\n'); if (pos != -1) { @@ -554,32 +606,41 @@ raw_version_information.clear(); } - wxStringTokenizer tokens(line, _T(" \t\n"), wxTOKEN_STRTOK); - if( !tokens.CountTokens() ) { + wxStringTokenizer tokens(line, _T(" \t\n"), wxTOKEN_STRTOK); + if (!tokens.CountTokens()) { // After empty line, changelog follows - version_information_.changelog = raw_version_information; - version_information_.changelog.Trim(true); - version_information_.changelog.Trim(false); + version_information_.changelog_ = raw_version_information; + version_information_.changelog_.Trim(true); + version_information_.changelog_.Trim(false); - if( COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4 ) { - log_ += wxString::Format(_T("Changelog: %s\n"), version_information_.changelog); + if (COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4) { + log_ += wxString::Format(_T("Changelog: %s\n"), version_information_.changelog_); } break; } - if( tokens.CountTokens() != 2 && tokens.CountTokens() != 6 ) { - if( COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4 ) { - log_ += wxString::Format(_T("Skipping line with %d tokens\n"), static_cast(tokens.CountTokens())); + wxString const type = tokens.GetNextToken(); + if (type == _T("resources")) { + if (tokens.HasMoreTokens()) { + if (UpdatableBuild()) { + version_information_.resources_ = tokens.GetNextToken(); + } + } + continue; + } + + if (tokens.CountTokens() != 1 && tokens.CountTokens() != 5) { + if (COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4) { + log_ += wxString::Format(_T("Skipping line with %d tokens\n"), static_cast(tokens.CountTokens() + 1)); } continue; } - wxString type = tokens.GetNextToken(); wxString versionOrDate = tokens.GetNextToken(); if (type == _T("nightly")) { fz::datetime nightlyDate(versionOrDate.ToStdWstring(), fz::datetime::utc); - if (!nightlyDate.empty()) { + if (nightlyDate.empty()) { if (COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4) { log_ += _T("Could not parse nightly date\n"); } @@ -587,8 +648,8 @@ } fz::datetime buildDate = CBuildInfo::GetBuildDate(); - if (!buildDate.empty() || !nightlyDate.empty() || nightlyDate <= buildDate) { - if( COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4 ) { + if (buildDate.empty() || nightlyDate.empty() || nightlyDate <= buildDate) { + if (COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4) { log_ += _T("Nightly isn't newer\n"); } continue; @@ -596,62 +657,72 @@ } else { int64_t v = CBuildInfo::ConvertToVersionNumber(versionOrDate.c_str()); - if (v <= ownVersionNumber) + if (v <= ownVersionNumber) { continue; + } } - build* b = 0; - if( type == _T("nightly") && UpdatableBuild() ) { - b = &version_information_.nightly_; - } - else if( type == _T("release") ) { - b = &version_information_.stable_; - } - else if( type == _T("beta") ) { - b = &version_information_.beta_; - } - - if( b ) { - b->version_ = versionOrDate; + build b; + b.version_ = versionOrDate; - if( UpdatableBuild() && tokens.CountTokens() == 4 ) { - wxString const url = tokens.GetNextToken(); - wxString const sizestr = tokens.GetNextToken(); - wxString const hash_algo = tokens.GetNextToken(); - wxString const hash = tokens.GetNextToken(); + if (UpdatableBuild() && tokens.CountTokens() == 4) { + wxString const url = tokens.GetNextToken(); + wxString const sizestr = tokens.GetNextToken(); + wxString const hash_algo = tokens.GetNextToken(); + wxString const hash = tokens.GetNextToken(); - if( GetFilename(url).empty() ) { - if( COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4 ) { - log_ += wxString::Format(_T("Could not extract filename from URL: %s\n"), url); - } - continue; + if (GetFilename(url).empty()) { + if (COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4) { + log_ += wxString::Format(_T("Could not extract filename from URL: %s\n"), url); } + continue; + } + + if (hash_algo.CmpNoCase(_T("sha512"))) { + continue; + } - if( hash_algo.CmpNoCase(_T("sha512")) ) { - continue; + unsigned long long l = 0; + if (!sizestr.ToULongLong(&l)) { + if (COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4) { + log_ += wxString::Format(_T("Could not parse size: %s"), sizestr) + L"\n"; } + continue; + } - unsigned long long l = 0; - if( !sizestr.ToULongLong(&l) ) { - if( COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4 ) { - log_ += wxString::Format(_T("Could not parse size: %s"), sizestr); - } - continue; + b.url_ = url; + b.size_ = l; + b.hash_ = fz::str_tolower_ascii(hash.ToStdWstring()); + bool valid_hash = true; + for (auto const& c : b.hash_) { + if ((c < 'a' || c > 'f') && (c < '0' || c > '9')) { + valid_hash = false; + break; } + } + if (!valid_hash) { + log_ += wxString::Format(_("Invalid hash: %s\n"), hash); + continue; + } - b->url_ = url; - b->size_ = l; - b->hash_ = hash; + // @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n + log_ += wxString::Format(_("Found new %s %s\n"), type, b.version_); + } - // @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n - log_ += wxString::Format(_("Found new %s %s\n"), type, b->version_); - } + if (type == _T("nightly") && UpdatableBuild()) { + version_information_.nightly_ = b; + } + else if (type == _T("release")) { + version_information_.stable_ = b; + } + else if (type == _T("beta")) { + version_information_.beta_ = b; } } version_information_.update_available(); - COptions::Get()->SetOption( OPTION_UPDATECHECK_NEWVERSION, raw_version_information_ ); + COptions::Get()->SetOption(OPTION_UPDATECHECK_NEWVERSION, raw_version_information_.ToStdWstring()); } void CUpdater::OnTimer(wxTimerEvent&) @@ -659,56 +730,49 @@ AutoRunIfNeeded(); } -bool CUpdater::VerifyChecksum(wxString const& file, int64_t size, wxString const& checksum) +bool CUpdater::VerifyChecksum(wxString const& file, int64_t size, std::wstring const& checksum) { if (file.empty() || checksum.empty()) { return false; } auto filesize = fz::local_filesys::get_size(fz::to_native(file)); - if (filesize < 0 || filesize != size) { + if (filesize < 0) { + log_ += wxString::Format(_("Could not obtain size of '%s'"), file) + L"\n"; + return false; + } + else if (filesize != size) { + log_ += fz::sprintf(_("Local size of '%s' does not match expected size: %d != %d"), file, filesize, size) + L"\n"; return false; } - SHA512_State state; - SHA512_Init(&state); + sha512_ctx state; + sha512_init(&state); { - wxLogNull null; - wxFile f; - if (!f.Open(file)) { + fz::file f(fz::to_native(file), fz::file::reading); + if (!f.opened()) { + log_ += wxString::Format(_("Could not open '%s'"), file) + L"\n"; return false; } - char buffer[65536]; - ssize_t read; - while ((read = f.Read(buffer, sizeof(buffer))) > 0) { - SHA512_Bytes(&state, buffer, read); + unsigned char buffer[65536]; + int64_t read; + while ((read = f.read(buffer, sizeof(buffer))) > 0) { + sha512_update(&state, static_cast(read), buffer); } if (read < 0) { + log_ += wxString::Format(_("Could not read from '%s'"), file) + L"\n"; return false; } } - unsigned char raw_digest[64]; - SHA512_Final(&state, raw_digest); + std::string raw_digest; + raw_digest.resize(64); + sha512_digest(&state, 64, reinterpret_cast(&raw_digest[0])); - wxString digest; - for (unsigned int i = 0; i < sizeof(raw_digest); ++i) { - unsigned char l = raw_digest[i] >> 4; - unsigned char r = raw_digest[i] & 0x0F; - - if (l > 9) - digest += 'a' + l - 10; - else - digest += '0' + l; - - if (r > 9) - digest += 'a' + r - 10; - else - digest += '0' + r; - } + auto const digest = fz::hex_encode(raw_digest); - if (checksum.CmpNoCase(digest)) { + if (digest != checksum) { log_ += wxString::Format(_("Checksum mismatch on file %s\n"), file); return false; } @@ -717,22 +781,22 @@ return true; } -wxString CUpdater::GetTempFile() const +std::wstring CUpdater::GetTempFile() const { - wxASSERT( !version_information_.available_.hash_.empty() ); - wxString ret = wxFileName::GetTempDir(); + wxASSERT(!version_information_.available_.hash_.empty()); + std::wstring ret = wxFileName::GetTempDir().ToStdWstring(); if (!ret.empty()) { - if (ret.Last() != wxFileName::GetPathSeparator()) { + if (ret.back() != wxFileName::GetPathSeparator()) { ret += wxFileName::GetPathSeparator(); } - ret += _T("fzupdate_") + version_information_.available_.hash_.Left(16) + _T(".tmp"); + ret += L"fzupdate_" + version_information_.available_.hash_.substr(0, 16) + L".tmp"; } return ret; } -wxString CUpdater::GetFilename( wxString const& url) const +wxString CUpdater::GetFilename(wxString const& url) const { wxString ret; int pos = url.Find('/', true); @@ -740,7 +804,7 @@ ret = url.Mid(pos + 1); } size_t p = ret.find_first_of(_T("?#")); - if( p != std::string::npos ) { + if (p != std::string::npos) { ret = ret.substr(0, p); } #ifdef __WXMSW__ @@ -750,18 +814,18 @@ return ret; } -void CUpdater::SetState( UpdaterState s ) +void CUpdater::SetState(UpdaterState s) { - if( s != state_ ) { + if (s != state_) { state_ = s; if (s != UpdaterState::checking && s != UpdaterState::newversion_downloading) { pending_commands_.clear(); } build b = version_information_.available_; - for (auto const& handler : handlers_ ) { - if( handler ) { - handler->UpdaterStateChanged( s, b ); + for (auto const& handler : handlers_) { + if (handler) { + handler->UpdaterStateChanged(s, b); } } } @@ -770,21 +834,21 @@ wxString CUpdater::DownloadedFile() const { wxString ret; - if( state_ == UpdaterState::newversion_ready ) { + if (state_ == UpdaterState::newversion_ready) { ret = local_file_; } return ret; } -void CUpdater::AddHandler( CUpdateHandler& handler ) +void CUpdater::AddHandler(CUpdateHandler& handler) { - for( auto const& h : handlers_ ) { + for (auto const& h : handlers_) { if (h == &handler) { return; } } - for( auto& h : handlers_ ) { - if( !h ) { + for (auto& h : handlers_) { + if (!h) { h = &handler; return; } @@ -792,7 +856,7 @@ handlers_.push_back(&handler); } -void CUpdater::RemoveHandler( CUpdateHandler& handler ) +void CUpdater::RemoveHandler(CUpdateHandler& handler) { for (auto& h : handlers_) { if (h == &handler) { @@ -811,9 +875,9 @@ ret = fz::local_filesys::get_size(fz::to_native(local_file_)); } } - else if( state_ == UpdaterState::newversion_downloading ) { - wxString const temp = GetTempFile(); - if( !temp.empty() ) { + else if (state_ == UpdaterState::newversion_downloading) { + std::wstring const temp = GetTempFile(); + if (!temp.empty()) { ret = fz::local_filesys::get_size(fz::to_native(temp)); } } diff -Nru filezilla-3.15.0.2/src/interface/updater.h filezilla-3.33.0/src/interface/updater.h --- filezilla-3.15.0.2/src/interface/updater.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/updater.h 2018-01-04 04:30:04.000000000 +0000 @@ -3,13 +3,17 @@ #if FZ_MANUALUPDATECHECK +#include "notification.h" + #include +#include + struct build { - wxString url_; - wxString version_; - wxString hash_; + std::wstring url_; + std::wstring version_; + std::wstring hash_; int64_t size_{-1}; }; @@ -27,7 +31,9 @@ build available_; - wxString changelog; + wxString changelog_; + + wxString resources_; }; enum class UpdaterState @@ -43,25 +49,26 @@ class CUpdateHandler { public: - virtual void UpdaterStateChanged( UpdaterState s, build const& v ) = 0; + virtual void UpdaterStateChanged(UpdaterState s, build const& v) = 0; }; class CFileZillaEngineContext; -class CUpdater : public wxEvtHandler +class CUpdater final : public wxEvtHandler, private EngineNotificationHandler { public: - CUpdater(CUpdateHandler& parent, CFileZillaEngineContext& engine_context); + CUpdater(CUpdateHandler& parent, CFileZillaEngineContext& engine_context, std::function const& activityNotificationHandler); virtual ~CUpdater(); // 2-Stage initialization void Init(); - void AddHandler( CUpdateHandler& handler ); - void RemoveHandler( CUpdateHandler& handler ); + void AddHandler(CUpdateHandler& handler); + void RemoveHandler(CUpdateHandler& handler); UpdaterState GetState() const { return state_; } build AvailableBuild() const { return version_information_.available_; } - wxString GetChangelog() const { return version_information_.changelog; } + wxString GetChangelog() const { return version_information_.changelog_; } + wxString GetResources() const { return version_information_.resources_; } wxString DownloadedFile() const; @@ -78,16 +85,16 @@ void RunIfNeeded(); protected: - int Download(wxString const& url, wxString const& local_file = _T("")); + int Download(std::wstring const& url, std::wstring const& local_file = std::wstring()); int ContinueDownload(); void AutoRunIfNeeded(); bool Run(); - bool CreateConnectCommand(wxString const& url); - bool CreateTransferCommand(wxString const& url, wxString const& local_file); + bool CreateConnectCommand(std::wstring const& url); + bool CreateTransferCommand(std::wstring const& url, std::wstring const& local_file); - wxString GetUrl(); + std::wstring GetUrl(); void ProcessNotification(std::unique_ptr && notification); void ProcessOperation(COperationNotification const& operation); void ProcessData(CDataNotification& dataNotification); @@ -95,16 +102,18 @@ UpdaterState ProcessFinishedDownload(); UpdaterState ProcessFinishedData(bool can_download); - bool VerifyChecksum(wxString const& file, int64_t size, wxString const& checksum); + bool VerifyChecksum(wxString const& file, int64_t size, std::wstring const& checksum); - wxString GetTempFile() const; + std::wstring GetTempFile() const; wxString GetFilename(wxString const& url) const; wxString GetLocalFile(build const& b, bool allow_existing); - void SetState( UpdaterState s ); + void SetState(UpdaterState s); + + virtual void OnEngineEvent(CFileZillaEngine* engine); + void DoOnEngineEvent(CFileZillaEngine* engine); DECLARE_EVENT_TABLE() - void OnEngineEvent(wxFzEvent& event); void OnTimer(wxTimerEvent& ev); UpdaterState state_; @@ -123,6 +132,8 @@ wxTimer update_timer_; std::deque> pending_commands_; + + std::function activityNotificationHandler_; }; #endif //FZ_MANUALUPDATECHECK diff -Nru filezilla-3.15.0.2/src/interface/verifycertdialog.cpp filezilla-3.33.0/src/interface/verifycertdialog.cpp --- filezilla-3.15.0.2/src/interface/verifycertdialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/verifycertdialog.cpp 2018-03-29 08:59:00.000000000 +0000 @@ -7,58 +7,244 @@ #include "timeformatting.h" #include "xrc_helper.h" +#include + #include #include #include -CVerifyCertDialog::CVerifyCertDialog() +CertStore::CertStore() : m_xmlFile(wxGetApp().GetSettingsFile(_T("trustedcerts"))) { } -CVerifyCertDialog::~CVerifyCertDialog() +bool CertStore::IsTrusted(CCertificateNotification const& notification) +{ + if (notification.GetAlgorithmWarnings() != 0) { + // These certs are never trusted. + return false; + } + + LoadTrustedCerts(); + + CCertificate cert = notification.GetCertificates()[0]; + + return IsTrusted(notification.GetHost(), notification.GetPort(), cert.GetRawData(), false, !notification.MismatchedHostname()); +} + +bool CertStore::DoIsTrusted(std::wstring const& host, unsigned int port, std::vector const& data, std::list const& trustedCerts, bool allowSans) +{ + if (!data.size()) { + return false; + } + + bool const dnsname = fz::get_address_type(host) == fz::address_type::unknown; + + for (auto const& cert : trustedCerts) { + if (port != cert.port) { + continue; + } + + if (cert.data != data) { + continue; + } + + if (host != cert.host) { + if (!dnsname || !allowSans || !cert.trustSans) { + continue; + } + } + + return true; + } + + return false; +} + +bool CertStore::IsTrusted(std::wstring const& host, unsigned int port, std::vector const& data, bool permanentOnly, bool allowSans) +{ + bool trusted = DoIsTrusted(host, port, data, trustedCerts_, allowSans); + if (!trusted && !permanentOnly) { + trusted = DoIsTrusted(host, port, data, sessionTrustedCerts_, allowSans); + } + + return trusted; +} + +void CertStore::LoadTrustedCerts() +{ + CReentrantInterProcessMutexLocker mutex(MUTEX_TRUSTEDCERTS); + if (!m_xmlFile.Modified()) { + return; + } + + auto element = m_xmlFile.Load(); + if (!element) { + return; + } + + trustedCerts_.clear(); + + if (!(element = element.child("TrustedCerts"))) { + return; + } + + bool modified = false; + + auto const processEntry = [&](pugi::xml_node const& cert) + { + std::wstring value = GetTextElement(cert, "Data"); + + pugi::xml_node remove; + + t_certData data; + data.data = fz::hex_decode(value); + if (data.data.empty()) { + return false; + } + + data.host = GetTextElement(cert, "Host"); + data.port = GetTextElementInt(cert, "Port"); + if (data.host.empty() || data.port < 1 || data.port > 65535) { + return false; + } + + fz::datetime const now = fz::datetime::now(); + int64_t activationTime = GetTextElementInt(cert, "ActivationTime", 0); + if (activationTime == 0 || activationTime > now.get_time_t()) { + return false; + } + + int64_t expirationTime = GetTextElementInt(cert, "ExpirationTime", 0); + if (expirationTime == 0 || expirationTime < now.get_time_t()) { + return false; + } + + data.trustSans = GetTextElementBool(cert, "TrustSANs"); + + // Weed out duplicates + if (IsTrusted(data.host, data.port, data.data, true, false)) { + return false; + } + + trustedCerts_.emplace_back(std::move(data)); + + return true; + }; + + auto cert = element.child("Certificate"); + while (cert) { + + auto nextCert = cert.next_sibling("Certificate"); + if (!processEntry(cert)) { + modified = true; + element.remove_child(cert); + } + cert = nextCert; + } + + if (modified) { + m_xmlFile.Save(false); + } +} + +void CertStore::SetTrusted(CCertificateNotification const& notification, bool permanent, bool trustAllHostnames) +{ + const CCertificate certificate = notification.GetCertificates()[0]; + + t_certData cert; + cert.host = notification.GetHost(); + cert.port = notification.GetPort(); + cert.data = certificate.GetRawData(); + + if (trustAllHostnames) { + cert.trustSans = true; + } + + if (!permanent) { + t_certData cert; + sessionTrustedCerts_.emplace_back(std::move(cert)); + + return; + } + + CReentrantInterProcessMutexLocker mutex(MUTEX_TRUSTEDCERTS); + LoadTrustedCerts(); + + if (IsTrusted(cert.host, cert.port, cert.data, true, false)) { + return; + } + + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 2) { + auto element = m_xmlFile.GetElement(); + if (element) { + auto certs = element.child("TrustedCerts"); + if (!certs) { + certs = element.append_child("TrustedCerts"); + } + + auto xCert = certs.append_child("Certificate"); + AddTextElementUtf8(xCert, "Data", fz::hex_encode(cert.data)); + AddTextElement(xCert, "ActivationTime", static_cast(certificate.GetActivationTime().get_time_t())); + AddTextElement(xCert, "ExpirationTime", static_cast(certificate.GetExpirationTime().get_time_t())); + AddTextElement(xCert, "Host", cert.host); + AddTextElement(xCert, "Port", cert.port); + AddTextElement(xCert, "TrustSANs", cert.trustSans ? L"1" : L"0"); + + m_xmlFile.Save(true); + } + } + trustedCerts_.emplace_back(std::move(cert)); +} + + + + +CVerifyCertDialog::CVerifyCertDialog(CertStore & certStore) + : certStore_(certStore) { - for (auto iter = m_trustedCerts.begin(); iter != m_trustedCerts.end(); ++iter) - delete [] iter->data; - for (auto iter = m_sessionTrustedCerts.begin(); iter != m_sessionTrustedCerts.end(); ++iter) - delete [] iter->data; } + bool CVerifyCertDialog::DisplayCert(wxDialogEx* pDlg, const CCertificate& cert) { bool warning = false; - if (cert.GetActivationTime().empty()) { + if (!cert.GetActivationTime().empty()) { if (cert.GetActivationTime() > fz::datetime::now()) { pDlg->SetChildLabel(XRCID("ID_ACTIVATION_TIME"), wxString::Format(_("%s - Not yet valid!"), CTimeFormat::Format(cert.GetActivationTime()))); xrc_call(*pDlg, "ID_ACTIVATION_TIME", &wxWindow::SetForegroundColour, wxColour(255, 0, 0)); warning = true; } - else + else { pDlg->SetChildLabel(XRCID("ID_ACTIVATION_TIME"), CTimeFormat::Format(cert.GetActivationTime())); + } } else { warning = true; pDlg->SetChildLabel(XRCID("ID_ACTIVATION_TIME"), _("Invalid date")); } - if (cert.GetExpirationTime().empty()) { + if (!cert.GetExpirationTime().empty()) { if (cert.GetExpirationTime() < fz::datetime::now()) { pDlg->SetChildLabel(XRCID("ID_EXPIRATION_TIME"), wxString::Format(_("%s - Certificate expired!"), CTimeFormat::Format(cert.GetExpirationTime()))); xrc_call(*pDlg, "ID_EXPIRATION_TIME", &wxWindow::SetForegroundColour, wxColour(255, 0, 0)); warning = true; } - else + else { pDlg->SetChildLabel(XRCID("ID_EXPIRATION_TIME"), CTimeFormat::Format(cert.GetExpirationTime())); + } } else { warning = true; pDlg->SetChildLabel(XRCID("ID_EXPIRATION_TIME"), _("Invalid date")); } - if (!cert.GetSerial().empty()) + if (!cert.GetSerial().empty()) { pDlg->SetChildLabel(XRCID("ID_SERIAL"), cert.GetSerial()); - else + } + else { pDlg->SetChildLabel(XRCID("ID_SERIAL"), _("None")); + } pDlg->SetChildLabel(XRCID("ID_PKALGO"), wxString::Format(_("%s with %d bits"), cert.GetPkAlgoName(), cert.GetPkAlgoBits())); pDlg->SetChildLabel(XRCID("ID_SIGNALGO"), cert.GetSignatureAlgorithm()); @@ -78,7 +264,7 @@ if (!altNames.empty()) { wxString str; for (auto const& altName : altNames) { - str += altName + _T("\n"); + str += altName.name + _T("\n"); } str.RemoveLast(); m_pSubjectSizer->Add(new wxStaticText(subjectPanel, wxID_ANY, wxPLURAL("Alternative name:", "Alternative names:", altNames.size()))); @@ -121,10 +307,8 @@ return insecure; } -void CVerifyCertDialog::ShowVerificationDialog(CCertificateNotification& notification, bool displayOnly /*=false*/) +void CVerifyCertDialog::ShowVerificationDialog(CCertificateNotification& notification, bool displayOnly) { - LoadTrustedCerts(); - m_pDlg = new wxDialogEx; if (!m_pDlg->Load(0, _T("ID_VERIFYCERT"))) { wxBell(); @@ -137,14 +321,16 @@ xrc_call(*m_pDlg, "ID_DESC", &wxWindow::Hide); xrc_call(*m_pDlg, "ID_ALWAYS_DESC", &wxWindow::Hide); xrc_call(*m_pDlg, "ID_ALWAYS", &wxWindow::Hide); + xrc_call(*m_pDlg, "ID_TRUST_SANS", &wxWindow::Hide); xrc_call(*m_pDlg, "wxID_CANCEL", &wxWindow::Hide); m_pDlg->SetTitle(_T("Certificate details")); } else { - m_pDlg->WrapText(m_pDlg, XRCID("ID_DESC"), 400); + m_pDlg->WrapText(m_pDlg, XRCID("ID_DESC"), 420); - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) + if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { XRCCTRL(*m_pDlg, "ID_ALWAYS", wxCheckBox)->Hide(); + } } m_certificates = notification.GetCertificates(); @@ -162,7 +348,13 @@ pChoice->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(CVerifyCertDialog::OnCertificateChoice), 0, this); } - m_pDlg->SetChildLabel(XRCID("ID_HOST"), wxString::Format(_T("%s:%d"), notification.GetHost(), notification.GetPort())); + if (notification.MismatchedHostname()) { + xrc_call(*m_pDlg, "ID_HOST", &wxWindow::SetForegroundColour, wxColour(255, 0, 0)); + m_pDlg->SetChildLabel(XRCID("ID_HOST"), wxString::Format(_("%s:%d - Hostname does not match certificate"), notification.GetHost(), notification.GetPort())); + } + else { + m_pDlg->SetChildLabel(XRCID("ID_HOST"), wxString::Format(_T("%s:%d"), notification.GetHost(), notification.GetPort())); + } line_height_ = XRCCTRL(*m_pDlg, "ID_SUBJECT_DUMMY", wxStaticText)->GetSize().y; @@ -197,6 +389,10 @@ XRCCTRL(*m_pDlg, "ID_ALWAYS", wxCheckBox)->Enable(false); } + bool const dnsname = fz::get_address_type(notification.GetHost()) == fz::address_type::unknown; + bool const sanTrustAllowed = !warning && dnsname && !notification.MismatchedHostname(); + XRCCTRL(*m_pDlg, "ID_TRUST_SANS", wxCheckBox)->Enable(sanTrustAllowed); + m_pDlg->GetSizer()->Fit(m_pDlg); m_pDlg->GetSizer()->SetSizeHints(m_pDlg); @@ -204,26 +400,17 @@ if (!displayOnly) { if (res == wxID_OK) { - wxASSERT(!IsTrusted(notification)); - notification.m_trusted = true; if (!notification.GetAlgorithmWarnings()) { - if (!warning && XRCCTRL(*m_pDlg, "ID_ALWAYS", wxCheckBox)->GetValue()) - SetPermanentlyTrusted(notification); - else { - t_certData cert; - cert.host = notification.GetHost(); - cert.port = notification.GetPort(); - const unsigned char* data = m_certificates[0].GetRawData(cert.len); - cert.data = new unsigned char[cert.len]; - memcpy(cert.data, data, cert.len); - m_sessionTrustedCerts.push_back(cert); - } + bool trustSANs = sanTrustAllowed && xrc_call(*m_pDlg, "ID_TRUST_SANS", &wxCheckBox::GetValue); + bool permanent = !warning && xrc_call(*m_pDlg, "ID_ALWAYS", &wxCheckBox::GetValue); + certStore_.SetTrusted(notification, permanent, trustSANs); } } - else + else { notification.m_trusted = false; + } } delete m_pDlg; @@ -237,8 +424,9 @@ wxStringTokenizer tokens(dn, _T(",")); std::list tokenlist; - while (tokens.HasMoreTokens()) + while (tokens.HasMoreTokens()) { tokenlist.push_back(tokens.GetNextToken()); + } ParseDN_by_prefix(parent, tokenlist, _T("CN"), _("Common name:"), pSizer); ParseDN_by_prefix(parent, tokenlist, _T("O"), _("Organization:"), pSizer); @@ -257,11 +445,11 @@ ParseDN_by_prefix(parent, tokenlist, _T("1.3.6.1.4.1.311.60.2.1.2"), _("Jurisdiction state or province:"), pSizer, true); ParseDN_by_prefix(parent, tokenlist, _T("1.3.6.1.4.1.311.60.2.1.1"), _("Jurisdiction locality:"), pSizer, true); - if (!tokenlist.empty()) - { + if (!tokenlist.empty()) { wxString value = tokenlist.front(); - for (std::list::const_iterator iter = ++tokenlist.begin(); iter != tokenlist.end(); ++iter) + for (auto iter = ++tokenlist.cbegin(); iter != tokenlist.cend(); ++iter) { value += _T(",") + *iter; + } pSizer->Add(new wxStaticText(parent, wxID_ANY, _("Other:"))); pSizer->Add(new wxStaticText(parent, wxID_ANY, value)); @@ -278,29 +466,25 @@ bool append = false; auto iter = tokens.begin(); - while (iter != tokens.end()) - { - if (!append) - { - if (iter->Left(len) != prefix) - { + while (iter != tokens.end()) { + if (!append) { + if (iter->Left(len) != prefix) { ++iter; continue; } - if (!value.empty()) + if (!value.empty()) { value += _T("\n"); + } } - else - { + else { append = false; value += _T(","); } value += iter->Mid(len); - if (iter->Last() == '\\') - { + if (iter->Last() == '\\') { value.RemoveLast(); append = true; len = 0; @@ -310,275 +494,62 @@ tokens.erase(remove); } - if (decode) + if (decode) { value = DecodeValue(value); + } - if (!value.empty()) - { + if (!value.empty()) { pSizer->Add(new wxStaticText(parent, wxID_ANY, name)); pSizer->Add(new wxStaticText(parent, wxID_ANY, value)); } } -bool CVerifyCertDialog::IsTrusted(CCertificateNotification const& notification) -{ - if (notification.GetAlgorithmWarnings() != 0) { - // These certs are never trusted. - return false; - } - - LoadTrustedCerts(); - - unsigned int len; - CCertificate cert = notification.GetCertificates()[0]; - const unsigned char* data = cert.GetRawData(len); - - return IsTrusted(notification.GetHost(), notification.GetPort(), data, len, false); -} - -bool CVerifyCertDialog::DoIsTrusted(const wxString& host, int port, const unsigned char* data, unsigned int len, std::list const& trustedCerts) -{ - if( !data || !len ) { - return false; - } - - for ( auto const& cert : trustedCerts ) { - if (host != cert.host) - continue; - - if (port != cert.port) - continue; - - if (cert.len != len) - continue; - - if (!memcmp(cert.data, data, len)) - return true; - } - - return false; -} - -bool CVerifyCertDialog::IsTrusted(const wxString& host, int port, const unsigned char* data, unsigned int len, bool permanentOnly) -{ - bool trusted = DoIsTrusted(host, port, data, len, m_trustedCerts); - if( !trusted && !permanentOnly ) { - trusted = DoIsTrusted(host, port, data, len, m_sessionTrustedCerts); - } - - return trusted; -} - -wxString CVerifyCertDialog::ConvertHexToString(const unsigned char* data, unsigned int len) -{ - wxString str; - for (unsigned int i = 0; i < len; i++) - { - const unsigned char& c = data[i]; - - const unsigned char low = c & 0x0F; - const unsigned char high = (c & 0xF0) >> 4; - - if (high < 10) - str += '0' + high; - else - str += 'A' + high - 10; - - if (low < 10) - str += '0' + low; - else - str += 'A' + low - 10; - } - - return str; -} - -unsigned char* CVerifyCertDialog::ConvertStringToHex(const wxString& str, unsigned int &len) -{ - if (str.size() % 2) { - return 0; - } - - len = str.size() / 2; - unsigned char* data = new unsigned char[len]; - - unsigned int j = 0; - for (unsigned int i = 0; i < str.size(); ++i, ++j) - { - wxChar high = str[i++]; - wxChar low = str[i]; - - if (high >= '0' && high <= '9') - high -= '0'; - else if (high >= 'A' && high <= 'F') - high -= 'A' - 10; - else - { - delete [] data; - return 0; - } - - if (low >= '0' && low <= '9') - low -= '0'; - else if (low >= 'A' && low <= 'F') - low -= 'A' - 10; - else - { - delete [] data; - return 0; - } - - data[j] = ((unsigned char)high << 4) + (unsigned char)low; - } - - return data; -} - -void CVerifyCertDialog::LoadTrustedCerts() -{ - CReentrantInterProcessMutexLocker mutex(MUTEX_TRUSTEDCERTS); - if (!m_xmlFile.Modified()) { - return; - } - - auto element = m_xmlFile.Load(); - if (!element) { - return; - } - - m_trustedCerts.clear(); - - if (!(element = element.child("TrustedCerts"))) - return; - - bool modified = false; - - auto cert = element.child("Certificate"); - while (cert) { - wxString value = GetTextElement(cert, "Data"); - - pugi::xml_node remove; - - t_certData data; - if (value.empty() || !(data.data = ConvertStringToHex(value, data.len))) - remove = cert; - - data.host = GetTextElement(cert, "Host"); - data.port = GetTextElementInt(cert, "Port"); - if (data.host.empty() || data.port < 1 || data.port > 65535) - remove = cert; - - int64_t activationTime = GetTextElementInt(cert, "ActivationTime", 0); - if (activationTime == 0 || activationTime > wxDateTime::GetTimeNow()) - remove = cert; - - int64_t expirationTime = GetTextElementInt(cert, "ExpirationTime", 0); - if (expirationTime == 0 || expirationTime < wxDateTime::GetTimeNow()) - remove = cert; - - if (IsTrusted(data.host, data.port, data.data, data.len, true)) // Weed out duplicates - remove = cert; - - if (!remove) - m_trustedCerts.push_back(data); - else - delete [] data.data; - - cert = cert.next_sibling("Certificate"); - - if (remove) { - modified = true; - element.remove_child(remove); - } - } - - if (modified) - m_xmlFile.Save(false); -} - -void CVerifyCertDialog::SetPermanentlyTrusted(CCertificateNotification const& notification) -{ - const CCertificate certificate = notification.GetCertificates()[0]; - unsigned int len; - const unsigned char* const data = certificate.GetRawData(len); - - CReentrantInterProcessMutexLocker mutex(MUTEX_TRUSTEDCERTS); - LoadTrustedCerts(); - - if (IsTrusted(notification.GetHost(), notification.GetPort(), data, len, true)) { - return; - } - - t_certData cert; - cert.host = notification.GetHost(); - cert.port = notification.GetPort(); - cert.len = len; - cert.data = new unsigned char[len]; - memcpy(cert.data, data, len); - m_trustedCerts.push_back(cert); - - if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { - return; - } - - auto element = m_xmlFile.GetElement(); - if (!element) { - return; - } - - auto certs = element.child("TrustedCerts"); - if (!certs) - certs = element.append_child("TrustedCerts"); - - auto xCert = certs.append_child("Certificate"); - AddTextElement(xCert, "Data", ConvertHexToString(data, len)); - AddTextElement(xCert, "ActivationTime", static_cast(certificate.GetActivationTime().get_time_t())); - AddTextElement(xCert, "ExpirationTime", static_cast(certificate.GetExpirationTime().get_time_t())); - AddTextElement(xCert, "Host", notification.GetHost()); - AddTextElement(xCert, "Port", notification.GetPort()); - - m_xmlFile.Save(true); -} - wxString CVerifyCertDialog::DecodeValue(const wxString& value) { // Decodes string in hex notation // #xxxx466F6F626172 -> Foobar // First two encoded bytes are ignored, some weird type information I don't care about // Only accepts ASCII for now. - if (value.empty() || value[0] != '#') + if (value.empty() || value[0] != '#') { return value; + } unsigned int len = value.Len(); wxString out; - for (unsigned int i = 5; i + 1 < len; i += 2) - { + for (unsigned int i = 5; i + 1 < len; i += 2) { wxChar c = value[i]; wxChar d = value[i + 1]; - if (c >= '0' && c <= '9') + if (c >= '0' && c <= '9') { c -= '0'; - else if (c >= 'a' && c <= 'z') + } + else if (c >= 'a' && c <= 'z') { c -= 'a' - 10; - else if (c >= 'A' && c <= 'Z') + } + else if (c >= 'A' && c <= 'Z') { c -= 'A' - 10; - else + } + else { continue; - //return value; - if (d >= '0' && d <= '9') + } + if (d >= '0' && d <= '9') { d -= '0'; - else if (d >= 'a' && d <= 'z') + } + else if (d >= 'a' && d <= 'z') { d -= 'a' - 10; - else if (d >= 'A' && d <= 'Z') + } + else if (d >= 'A' && d <= 'Z') { d -= 'A' - 10; - else + } + else { continue; - //return value; + } c = c * 16 + d; - if (c > 127 || c < 32) + if (c > 127 || c < 32) { continue; + } out += c; } @@ -588,8 +559,9 @@ void CVerifyCertDialog::OnCertificateChoice(wxCommandEvent& event) { int sel = event.GetSelection(); - if (sel < 0 || sel > (int)m_certificates.size()) + if (sel < 0 || static_cast(sel) > m_certificates.size()) { return; + } DisplayCert(m_pDlg, m_certificates[sel]); m_pDlg->Layout(); diff -Nru filezilla-3.15.0.2/src/interface/verifycertdialog.h filezilla-3.33.0/src/interface/verifycertdialog.h --- filezilla-3.15.0.2/src/interface/verifycertdialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/verifycertdialog.h 2018-02-05 21:28:24.000000000 +0000 @@ -1,49 +1,53 @@ -#ifndef __VERIFYCERTDIALOG_H__ -#define __VERIFYCERTDIALOG_H__ +#ifndef FILEZILLA_INTERFACE_VERIFYCERTDIALOG_HEADER +#define FILEZILLA_INTERFACE_VERIFYCERTDIALOG_HEADER #include "xmlfunctions.h" -class wxDialogEx; -class CVerifyCertDialog final : protected wxEvtHandler +class CertStore final { public: - CVerifyCertDialog(); - virtual ~CVerifyCertDialog(); + CertStore(); bool IsTrusted(CCertificateNotification const& notification); - void ShowVerificationDialog(CCertificateNotification& notification, bool displayOnly = false); + void SetTrusted(CCertificateNotification const& notification, bool permanent, bool trustAllHostnames); private: struct t_certData { - wxString host; - int port{}; - unsigned char* data{}; - unsigned int len{}; + std::wstring host; + bool trustSans{}; + unsigned int port{}; + std::vector data; }; - bool IsTrusted(const wxString& host, int port, const unsigned char* data, unsigned int len, bool permanentOnly); - bool DoIsTrusted(const wxString& host, int port, const unsigned char* data, unsigned int len, std::list const& trustedCerts); + bool IsTrusted(std::wstring const& host, unsigned int port, std::vector const& data, bool permanentOnly, bool allowSans); + bool DoIsTrusted(std::wstring const& host, unsigned int port, std::vector const& data, std::list const& trustedCerts, bool allowSans); - bool DisplayAlgorithm(int controlId, wxString name, bool insecure); + void LoadTrustedCerts(); - bool DisplayCert(wxDialogEx* pDlg, const CCertificate& cert); + std::list trustedCerts_; + std::list sessionTrustedCerts_; - void ParseDN(wxWindow* parent, const wxString& dn, wxSizer* pSizer); - void ParseDN_by_prefix(wxWindow* parent, std::list& tokens, wxString prefix, const wxString& name, wxSizer* pSizer, bool decode = false); + CXmlFile m_xmlFile; +}; - wxString DecodeValue(const wxString& value); +class wxDialogEx; +class CVerifyCertDialog final : protected wxEvtHandler +{ +public: + CVerifyCertDialog(CertStore & certStore); - wxString ConvertHexToString(const unsigned char* data, unsigned int len); - unsigned char* ConvertStringToHex(const wxString& str, unsigned int &len); + void ShowVerificationDialog(CCertificateNotification& notification, bool displayOnly = false); - void SetPermanentlyTrusted(CCertificateNotification const& notification); +private: - void LoadTrustedCerts(); + bool DisplayAlgorithm(int controlId, wxString name, bool insecure); - std::list m_trustedCerts; - std::list m_sessionTrustedCerts; + bool DisplayCert(wxDialogEx* pDlg, const CCertificate& cert); - CXmlFile m_xmlFile; + void ParseDN(wxWindow* parent, const wxString& dn, wxSizer* pSizer); + void ParseDN_by_prefix(wxWindow* parent, std::list& tokens, wxString prefix, const wxString& name, wxSizer* pSizer, bool decode = false); + + wxString DecodeValue(const wxString& value); std::vector m_certificates; wxDialogEx* m_pDlg{}; @@ -52,6 +56,8 @@ int line_height_{}; void OnCertificateChoice(wxCommandEvent& event); + + CertStore & certStore_; }; -#endif //__VERIFYCERTDIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/verifyhostkeydialog.cpp filezilla-3.33.0/src/interface/verifyhostkeydialog.cpp --- filezilla-3.15.0.2/src/interface/verifyhostkeydialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/verifyhostkeydialog.cpp 2018-05-01 03:30:04.000000000 +0000 @@ -1,19 +1,22 @@ #include #include "verifyhostkeydialog.h" -#include #include "dialogex.h" #include "ipcmutex.h" -std::list CVerifyHostkeyDialog::m_sessionTrustedKeys; +#include + +std::vector CVerifyHostkeyDialog::m_sessionTrustedKeys; void CVerifyHostkeyDialog::ShowVerificationDialog(wxWindow* parent, CHostKeyNotification& notification) { wxDialogEx dlg; bool loaded; - if (notification.GetRequestID() == reqId_hostkey) + if (notification.GetRequestID() == reqId_hostkey) { loaded = dlg.Load(parent, _T("ID_HOSTKEY")); - else + } + else { loaded = dlg.Load(parent, _T("ID_HOSTKEYCHANGED")); + } if (!loaded) { notification.m_trust = false; notification.m_alwaysTrust = false; @@ -23,9 +26,14 @@ dlg.WrapText(&dlg, XRCID("ID_DESC"), 400); - const wxString host = wxString::Format(_T("%s:%d"), notification.GetHost(), notification.GetPort()); + std::wstring const host = fz::sprintf(L"%s:%d", notification.GetHost(), notification.GetPort()); dlg.SetChildLabel(XRCID("ID_HOST"), host); - dlg.SetChildLabel(XRCID("ID_FINGERPRINT"), notification.GetFingerprint()); + + if (!notification.hostKeyAlgorithm.empty()) { + dlg.SetChildLabel(XRCID("ID_HOSTKEYALGO"), notification.hostKeyAlgorithm); + } + std::wstring const fingerprints = fz::sprintf(L"SHA256: %s\nMD5: %s", notification.hostKeyFingerprintSHA256, notification.hostKeyFingerprintMD5); + dlg.SetChildLabel(XRCID("ID_FINGERPRINT"), fingerprints); dlg.GetSizer()->Fit(&dlg); dlg.GetSizer()->SetSizeHints(&dlg); @@ -36,9 +44,9 @@ notification.m_trust = true; notification.m_alwaysTrust = XRCCTRL(dlg, "ID_ALWAYS", wxCheckBox)->GetValue(); - struct t_keyData data; + t_keyData data; data.host = host; - data.fingerprint = notification.GetFingerprint(); + data.fingerprint = notification.hostKeyFingerprintSHA256; m_sessionTrustedKeys.push_back(data); return; } @@ -49,11 +57,12 @@ bool CVerifyHostkeyDialog::IsTrusted(CHostKeyNotification const& notification) { - const wxString host = wxString::Format(_T("%s:%d"), notification.GetHost(), notification.GetPort()); + std::wstring const host = fz::sprintf(L"%s:%d", notification.GetHost(), notification.GetPort()); - for(auto const& trusted : m_sessionTrustedKeys ) { - if (trusted.host == host && trusted.fingerprint == notification.GetFingerprint()) + for (auto const& trusted : m_sessionTrustedKeys) { + if (trusted.host == host && trusted.fingerprint == notification.hostKeyFingerprintSHA256) { return true; + } } return false; diff -Nru filezilla-3.15.0.2/src/interface/verifyhostkeydialog.h filezilla-3.33.0/src/interface/verifyhostkeydialog.h --- filezilla-3.15.0.2/src/interface/verifyhostkeydialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/verifyhostkeydialog.h 2018-05-01 03:30:04.000000000 +0000 @@ -1,10 +1,10 @@ -#ifndef __VERIFYHOSTKEYDIALOG_H__ -#define __VERIFYHOSTKEYDIALOG_H__ +#ifndef FILEZILLAINTERFACE_VERIFYHOSTKEYDIALOG_HEADER +#define FILEZILLAINTERFACE_VERIFYHOSTKEYDIALOG_HEADER /* Full handling is done inside fzsftp, this class is just to display the * dialog and for temporary session trust, lost on restart of FileZilla. */ -class CVerifyHostkeyDialog +class CVerifyHostkeyDialog final { public: static bool IsTrusted(CHostKeyNotification const& pNotification); @@ -13,10 +13,10 @@ protected: struct t_keyData { - wxString host; - wxString fingerprint; + std::wstring host; + std::wstring fingerprint; }; - static std::list m_sessionTrustedKeys; + static std::vector m_sessionTrustedKeys; }; -#endif //__VERIFYHOSTKEYDIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/view.cpp filezilla-3.33.0/src/interface/view.cpp --- filezilla-3.15.0.2/src/interface/view.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/view.cpp 2017-10-25 17:12:23.000000000 +0000 @@ -2,6 +2,12 @@ #include "view.h" #include "viewheader.h" +#include "state.h" +#include "listingcomparison.h" +#include "conditionaldialog.h" + +#include + BEGIN_EVENT_TABLE(CView, wxNavigationEnabled) EVT_SIZE(CView::OnSize) END_EVENT_TABLE() @@ -21,6 +27,11 @@ m_pFooter = footer; } +void CView::SetSearchPanel(wxWindow* panel) +{ + m_pSearchPanel = panel; +} + void CView::Arrange(wxWindow* child, wxRect& clientRect, bool top) { if (child && child->IsShown()) { @@ -35,7 +46,7 @@ else { clientRect.SetTop(childHeight); } - clientRect.SetHeight(clientRect.GetHeight() - childHeight); + clientRect.SetHeight(std::max(0, (clientRect.GetHeight() - childHeight))); child->SetSize(childRect); #ifdef __WXMSW__ @@ -52,6 +63,7 @@ Arrange(m_pHeader, rect, true); Arrange(m_pFooter, rect, false); Arrange(m_pStatusBar, rect, false); + Arrange(m_pSearchPanel, rect, false); if (m_pWnd) { m_pWnd->SetSize(rect); @@ -85,3 +97,24 @@ m_pHeader = 0; return pHeader; } + +void CView::ShowSearchPanel() +{ + if (m_pSearchPanel) { + CState* pState = CContextManager::Get()->GetCurrentContext(); + if (pState) { + CComparisonManager* pComparisonManager = pState->GetComparisonManager(); + if (pComparisonManager && pComparisonManager->IsComparing()) { + CConditionalDialog dlg(this, CConditionalDialog::quick_search, CConditionalDialog::yesno); + dlg.SetTitle(_("Directory comparison")); + dlg.AddText(_("Quick search cannot be opened if comparing directories.")); + dlg.AddText(_("End comparison and open quick search?")); + if (!dlg.Run()) + return; + pComparisonManager->ExitComparisonMode(); + } + } + + m_pSearchPanel->Show(); + } +} diff -Nru filezilla-3.15.0.2/src/interface/view.h filezilla-3.33.0/src/interface/view.h --- filezilla-3.15.0.2/src/interface/view.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/view.h 2017-10-25 17:12:23.000000000 +0000 @@ -1,8 +1,8 @@ -#ifndef __VIEW_H__ -#define __VIEW_H__ +#ifndef FILEZILLA_INTERFACE_VIEW_HEADER +#define FILEZILLA_INTERFACE_VIEW_HEADER class CViewHeader; -class CView : public wxNavigationEnabled +class CView final : public wxNavigationEnabled { public: CView(wxWindow* pParent); @@ -15,6 +15,9 @@ wxStatusBar* GetStatusBar() { return m_pStatusBar; } void SetFooter(wxWindow* footer); + void SetSearchPanel(wxWindow* panel); + + void ShowSearchPanel(); protected: void Arrange(wxWindow* child, wxRect& clientRect, bool top); @@ -26,9 +29,10 @@ wxStatusBar* m_pStatusBar{}; wxWindow* m_pFooter{}; + wxWindow* m_pSearchPanel{}; DECLARE_EVENT_TABLE() void OnSize(wxSizeEvent&); }; -#endif //__VIEW_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/viewheader.cpp filezilla-3.33.0/src/interface/viewheader.cpp --- filezilla-3.15.0.2/src/interface/viewheader.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/viewheader.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,6 +1,7 @@ #include #include "viewheader.h" #include "commandqueue.h" +#include "graphics.h" #ifdef __WXMSW__ #include @@ -12,6 +13,8 @@ #include #include +#include + #ifdef __WXMSW__ const int border_offset = 0; #elif defined(__WXMAC__) @@ -83,6 +86,8 @@ SetBackgroundStyle(wxBG_STYLE_SYSTEM); m_pComboBox->SetBackgroundStyle(wxBG_STYLE_SYSTEM); m_pLabel->SetBackgroundStyle(wxBG_STYLE_SYSTEM); + + m_windowTinter = std::make_unique(*m_pComboBox); } void CViewHeader::OnSize(wxSizeEvent&) @@ -93,7 +98,7 @@ rect.SetWidth(rect.GetWidth() - m_cbOffset + 2); rect.SetX(m_cbOffset); rect.Deflate(0, border_offset / 2); - rect.SetWidth(rect.GetWidth() - border_offset / 2); + rect.SetWidth(std::max(0, rect.GetWidth() - border_offset / 2)); if (m_pComboBox) { m_pComboBox->SetSize(rect); } @@ -114,8 +119,7 @@ void CViewHeader::OnComboPaint(wxPaintEvent& event) { // We do a small trick to let the control handle the event before we can paint - if (m_alreadyInPaint) - { + if (m_alreadyInPaint) { event.Skip(); return; } @@ -132,8 +136,7 @@ int thumbWidth = ::GetSystemMetrics(SM_CXHTHUMB); - if (m_bLeftMousePressed) - { + if (m_bLeftMousePressed) { if (!SendMessage((HWND)box->GetHandle(), CB_GETDROPPEDSTATE, 0, 0)) m_bLeftMousePressed = false; } @@ -330,10 +333,11 @@ #endif END_EVENT_TABLE() -CLocalViewHeader::CLocalViewHeader(wxWindow* pParent, CState* pState) - : CViewHeader(pParent, _("Local site:")), CStateEventHandler(pState) +CLocalViewHeader::CLocalViewHeader(wxWindow* pParent, CState& state) + : CViewHeader(pParent, _("Local site:")), CStateEventHandler(state) { - pState->RegisterHandler(this, STATECHANGE_LOCAL_DIR); + state.RegisterHandler(this, STATECHANGE_LOCAL_DIR); + state.RegisterHandler(this, STATECHANGE_SERVER); } void CLocalViewHeader::OnTextChanged(wxCommandEvent&) @@ -345,14 +349,12 @@ #endif wxString str = m_pComboBox->GetValue(); - if (str.empty() || str.Right(1) == _T("/")) - { + if (str.empty() || str.Right(1) == _T("/")) { m_oldValue = str; return; } #ifdef __WXMSW__ - if (str.Right(1) == _T("\\")) - { + if (str.Right(1) == _T("\\")) { m_oldValue = str; return; } @@ -361,25 +363,21 @@ if (str == m_oldValue) return; - if (str.Left(m_oldValue.Length()) != m_oldValue) - { + if (str.Left(m_oldValue.Length()) != m_oldValue) { m_oldValue = str; return; } #ifdef __WXMSW__ - if (str.Left(2) == _T("\\\\")) - { + if (str.Left(2) == _T("\\\\")) { int pos = str.Mid(2).Find('\\'); - if (pos == -1) - { + if (pos == -1) { // Partial UNC path, no full server yet, skip further processing return; } pos = str.Mid(pos + 3).Find('\\'); - if (pos == -1) - { + if (pos == -1) { // Partial UNC path, no full share yet, skip further processing return; } @@ -387,8 +385,7 @@ #endif wxFileName fn(str); - if (!fn.IsOk()) - { + if (!fn.IsOk()) { m_oldValue = str; return; } @@ -403,8 +400,7 @@ } else { wxLogNull log; - if (!dir.Open(path) || !dir.IsOpened()) - { + if (!dir.Open(path) || !dir.IsOpened()) { m_oldValue = str; return; } @@ -420,8 +416,7 @@ } wxString tmp; - if (dir.GetNext(&tmp)) - { + if (dir.GetNext(&tmp)) { m_oldValue = str; return; } @@ -471,22 +466,23 @@ m_autoCompletionText = _T(""); #endif - wxString dir = event.GetString(); - if (dir.empty()) + std::wstring dir = event.GetString().ToStdWstring(); + if (dir.empty()) { return; + } - if (!wxDir::Exists(dir)) - { - const wxString& current = m_pState->GetLocalDir().GetPath(); + if (!wxDir::Exists(dir)) { + const wxString& current = m_state.GetLocalDir().GetPath(); int item = m_pComboBox->FindString(current, true); - if (item != wxNOT_FOUND) + if (item != wxNOT_FOUND) { m_pComboBox->SetSelection(item); + } wxBell(); return; } - m_pState->SetLocalDir(dir); + m_state.SetLocalDir(dir); } void CLocalViewHeader::OnTextEnter(wxCommandEvent&) @@ -495,30 +491,33 @@ m_autoCompletionText = _T(""); #endif - wxString dir = m_pComboBox->GetValue(); + std::wstring dir = m_pComboBox->GetValue().ToStdWstring(); - wxString error; - if (!m_pState->SetLocalDir(dir, &error)) - { - if (!error.empty()) + std::wstring error; + if (!m_state.SetLocalDir(dir, &error)) { + if (!error.empty()) { wxMessageBoxEx(error, _("Failed to change directory"), wxICON_INFORMATION); - else + } + else { wxBell(); - m_pComboBox->SetValue(m_pState->GetLocalDir().GetPath()); + } + m_pComboBox->SetValue(m_state.GetLocalDir().GetPath()); } } -void CLocalViewHeader::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*) +void CLocalViewHeader::OnStateChange(t_statechange_notifications notification, const wxString&, const void*) { - wxASSERT(notification == STATECHANGE_LOCAL_DIR); - (void)notification; - + if (notification == STATECHANGE_SERVER) { + m_windowTinter->SetBackgroundTint(m_state.GetSite().m_colour); + } + else if (notification == STATECHANGE_LOCAL_DIR) { #ifdef __WXGTK__ - m_autoCompletionText = _T(""); + m_autoCompletionText = _T(""); #endif - wxString dir = pState->GetLocalDir().GetPath(); - AddRecentDirectory(dir); + wxString dir = m_state.GetLocalDir().GetPath(); + AddRecentDirectory(dir); + } } BEGIN_EVENT_TABLE(CRemoteViewHeader, CViewHeader) @@ -526,36 +525,39 @@ EVT_COMBOBOX(wxID_ANY, CRemoteViewHeader::OnSelectionChanged) END_EVENT_TABLE() -CRemoteViewHeader::CRemoteViewHeader(wxWindow* pParent, CState* pState) - : CViewHeader(pParent, _("Remote site:")), CStateEventHandler(pState) +CRemoteViewHeader::CRemoteViewHeader(wxWindow* pParent, CState& state) + : CViewHeader(pParent, _("Remote site:")), CStateEventHandler(state) { - pState->RegisterHandler(this, STATECHANGE_REMOTE_DIR); + state.RegisterHandler(this, STATECHANGE_REMOTE_DIR); + state.RegisterHandler(this, STATECHANGE_SERVER); Disable(); } -void CRemoteViewHeader::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*) +void CRemoteViewHeader::OnStateChange(t_statechange_notifications notification, const wxString&, const void*) { - wxASSERT(notification == STATECHANGE_REMOTE_DIR); - (void)notification; - - m_path = pState->GetRemotePath(); - if (m_path.empty()) { - m_pComboBox->SetValue(_T("")); - Disable(); + if (notification == STATECHANGE_SERVER) { + m_windowTinter->SetBackgroundTint(m_state.GetSite().m_colour); } - else { - const CServer* const pServer = pState->GetServer(); - if (pServer && *pServer != m_lastServer) { - m_pComboBox->Clear(); - m_recentDirectories.clear(); - m_sortedRecentDirectories.clear(); - m_lastServer = *pServer; - } - Enable(); + else if (notification == STATECHANGE_REMOTE_DIR) { + m_path = m_state.GetRemotePath(); + if (m_path.empty()) { + m_pComboBox->SetValue(_T("")); + Disable(); + } + else { + ServerWithCredentials const& server = m_state.GetServer(); + if (server && server.server != m_lastServer) { + m_pComboBox->Clear(); + m_recentDirectories.clear(); + m_sortedRecentDirectories.clear(); + m_lastServer = server.server; + } + Enable(); #ifdef __WXGTK__ - GetParent()->m_dirtyTabOrder = true; + GetParent()->m_dirtyTabOrder = true; #endif - AddRecentDirectory(m_path.GetPath()); + AddRecentDirectory(m_path.GetPath()); + } } } @@ -563,17 +565,17 @@ { CServerPath path = m_path; wxString value = m_pComboBox->GetValue(); - if (value.empty() || !path.ChangePath(value)) { + if (value.empty() || !path.ChangePath(value.ToStdWstring())) { wxBell(); return; } - if (!m_pState->IsRemoteIdle(true)) { + if (!m_state.IsRemoteIdle(true)) { wxBell(); return; } - m_pState->ChangeRemoteDir(path); + m_state.ChangeRemoteDir(path); } void CRemoteViewHeader::OnSelectionChanged(wxCommandEvent& event) @@ -583,15 +585,15 @@ return; CServerPath path = m_path; - if (!path.SetPath(dir)) { + if (!path.SetPath(dir.ToStdWstring())) { wxBell(); return; } - if (!m_pState->IsRemoteIdle(true)) { + if (!m_state.IsRemoteIdle(true)) { wxBell(); return; } - m_pState->ChangeRemoteDir(path); + m_state.ChangeRemoteDir(path); } diff -Nru filezilla-3.15.0.2/src/interface/viewheader.h filezilla-3.33.0/src/interface/viewheader.h --- filezilla-3.15.0.2/src/interface/viewheader.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/viewheader.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,9 +1,10 @@ -#ifndef __VIEWHEADER_H__ -#define __VIEWHEADER_H__ +#ifndef FILEZILLA_INTERFACE_VIEWHEADER_HEADER +#define FILEZILLA_INTERFACE_VIEWHEADER_HEADER #include "state.h" class CComboBoxEx; +class CWindowTinter; class CViewHeader : public wxNavigationEnabled { friend class CComboBoxEx; @@ -42,15 +43,17 @@ int m_cbOffset{}; int m_labelHeight{}; + + std::unique_ptr m_windowTinter; }; -class CLocalViewHeader : public CViewHeader, CStateEventHandler +class CLocalViewHeader final : public CViewHeader, CStateEventHandler { public: - CLocalViewHeader(wxWindow* pParent, CState* pState); + CLocalViewHeader(wxWindow* pParent, CState& state); protected: - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2); + virtual void OnStateChange(t_statechange_notifications notification, const wxString& data, const void* data2); wxString m_oldValue; @@ -65,13 +68,13 @@ #endif }; -class CRemoteViewHeader : public CViewHeader, CStateEventHandler +class CRemoteViewHeader final : public CViewHeader, CStateEventHandler { public: - CRemoteViewHeader(wxWindow* pParent, CState* pState); + CRemoteViewHeader(wxWindow* pParent, CState& state); protected: - virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2); + virtual void OnStateChange(t_statechange_notifications notification, const wxString& data, const void* data2); CServer m_lastServer; CServerPath m_path; @@ -82,4 +85,4 @@ void OnSelectionChanged(wxCommandEvent& event); }; -#endif //__VIEWHEADER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/volume_enumerator.cpp filezilla-3.33.0/src/interface/volume_enumerator.cpp --- filezilla-3.15.0.2/src/interface/volume_enumerator.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/volume_enumerator.cpp 2017-01-09 16:00:56.000000000 +0000 @@ -1,7 +1,7 @@ #include #include "volume_enumerator.h" -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS #include @@ -11,12 +11,7 @@ CVolumeDescriptionEnumeratorThread::CVolumeDescriptionEnumeratorThread(wxEvtHandler* pEvtHandler) : m_pEvtHandler(pEvtHandler) { - m_failure = false; - m_stop = false; - m_running = true; - if (!run()) { - m_running = false; m_failure = true; } } @@ -25,95 +20,132 @@ { m_stop = true; join(); - - for (auto iter = m_volumeInfo.cbegin(); iter != m_volumeInfo.cend(); ++iter) { - delete [] iter->pVolume; - delete [] iter->pVolumeName; - } m_volumeInfo.clear(); } void CVolumeDescriptionEnumeratorThread::entry() { - if (!GetDriveLabels()) - m_failure = true; + if (!m_pEvtHandler) { + return; + } - m_running = false; + if (!GetDriveLabels()) { + m_failure = true; + } m_pEvtHandler->QueueEvent(new wxCommandEvent(fzEVT_VOLUMESENUMERATED)); } -void CVolumeDescriptionEnumeratorThread::ProcessDrive(wxString const& drive) +void CVolumeDescriptionEnumeratorThread::ProcessDrive(std::wstring const& drive) { - if ( GetDriveLabel(drive)) { + if (GetDriveLabel(drive)) { + m_pEvtHandler->QueueEvent(new wxCommandEvent(fzEVT_VOLUMEENUMERATED)); + } + + if (GetDriveIcon(drive)) { m_pEvtHandler->QueueEvent(new wxCommandEvent(fzEVT_VOLUMEENUMERATED)); } } -bool CVolumeDescriptionEnumeratorThread::GetDriveLabel(wxString const& drive) +bool CVolumeDescriptionEnumeratorThread::GetDriveLabel(std::wstring const& drive) { - int len = drive.size(); - wxChar* pVolume = new wxChar[drive.size() + 1]; - wxStrcpy(pVolume, drive); - if (pVolume[drive.size() - 1] == '\\') { - pVolume[drive.size() - 1] = 0; - --len; - } - if (!*pVolume) { - delete [] pVolume; + if (drive.empty()) { return false; } + std::wstring volume; + if (drive[drive.size() - 1] == '\\') { + if (drive.size() == 1) { + return false; + } + volume = drive.substr(0, drive.size() - 1); + } + else { + volume = drive; + } + // Check if it is a network share - wxChar *share_name = new wxChar[512]; + wchar_t share_name[512]; DWORD dwSize = 511; - if (!WNetGetConnection(pVolume, share_name, &dwSize)) { + if (!WNetGetConnection(volume.c_str(), share_name, &dwSize) && share_name[0]) { + t_VolumeInfo volumeInfo; + volumeInfo.volume = volume; + volumeInfo.volumeName = share_name; fz::scoped_lock l(sync_); - t_VolumeInfoInternal volumeInfo; - volumeInfo.pVolume = pVolume; - volumeInfo.pVolumeName = share_name; m_volumeInfo.push_back(volumeInfo); return true; } - else - delete [] share_name; // Get the label of the drive - wxChar* pVolumeName = new wxChar[501]; + wchar_t volume_name[501]; int oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS); - BOOL res = GetVolumeInformation(drive.wc_str(), pVolumeName, 500, 0, 0, 0, 0, 0); + BOOL res = GetVolumeInformation(drive.c_str(), volume_name, 500, 0, 0, 0, 0, 0); SetErrorMode(oldErrorMode); - if (res && pVolumeName[0]) { + if (res && volume_name[0]) { + t_VolumeInfo volumeInfo; + volumeInfo.volume = volume; + volumeInfo.volumeName = volume_name; fz::scoped_lock l(sync_); - t_VolumeInfoInternal volumeInfo; - volumeInfo.pVolume = pVolume; - volumeInfo.pVolumeName = pVolumeName; m_volumeInfo.push_back(volumeInfo); return true; } - delete [] pVolumeName; - delete [] pVolume; + return false; +} + +bool CVolumeDescriptionEnumeratorThread::GetDriveIcon(std::wstring const& drive) +{ + if (drive.empty()) { + return false; + } + + std::wstring volume; + if (drive[drive.size() - 1] == '\\') { + if (drive.size() == 1) { + return false; + } + volume = drive.substr(0, drive.size() - 1); + } + else { + volume = drive; + } + + SHFILEINFO shFinfo; + memset(&shFinfo, 0, sizeof(SHFILEINFO)); + if (SHGetFileInfo(volume.c_str(), FILE_ATTRIBUTE_DIRECTORY, + &shFinfo, sizeof(SHFILEINFO), + SHGFI_ICON)) + { + // we only need the index from the system image list + DestroyIcon(shFinfo.hIcon); + + t_VolumeInfo volumeInfo; + volumeInfo.volume = volume; + volumeInfo.icon = shFinfo.iIcon; + fz::scoped_lock l(sync_); + m_volumeInfo.push_back(volumeInfo); + return true; + } return false; } bool CVolumeDescriptionEnumeratorThread::GetDriveLabels() { - std::list drives = GetDrives(); + std::list drives = GetDrives(); - if( drives.empty() ) { + if (drives.empty()) { return true; } - std::list::const_iterator drive_a = drives.end(); - for( std::list::const_iterator it = drives.begin(); it != drives.end() && !m_stop; ++it ) { + std::list::const_iterator drive_a = drives.end(); + for (std::list::const_iterator it = drives.begin(); it != drives.end() && !m_stop; ++it) { if (m_stop) { return false; } - wxString const& drive = *it; - if( (drive[0] == 'a' || drive[0] == 'A') && drive_a == drives.end() ) { + std::wstring const& drive = *it; + if ((drive[0] == 'a' || drive[0] == 'A') && drive_a == drives.end()) { // Defer processing of A:, most commonly the slowest of all drives. drive_a = it; } @@ -122,7 +154,7 @@ } } - if( drive_a != drives.end() && !m_stop ) { + if (drive_a != drives.end() && !m_stop) { ProcessDrive(*drive_a); } @@ -136,17 +168,18 @@ wxRegKey key(_T("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer")); if (key.Exists()) { wxLogNull null; // QueryValue can fail if item has wrong type - if (!key.HasValue(_T("NoDrives")) || !key.QueryValue(_T("NoDrives"), &drivesToHide)) + if (!key.HasValue(_T("NoDrives")) || !key.QueryValue(_T("NoDrives"), &drivesToHide)) { drivesToHide = 0; + } } return drivesToHide; } -bool CVolumeDescriptionEnumeratorThread::IsHidden(wxChar const* drive, long noDrives) +bool CVolumeDescriptionEnumeratorThread::IsHidden(wchar_t const* drive, long noDrives) { int bit = 0; if (drive && drive[0] != 0 && drive[1] == ':') { - wxChar letter = drive[0]; + wchar_t letter = drive[0]; if (letter >= 'A' && letter <= 'Z') bit = 1 << (letter - 'A'); else if (letter >= 'a' && letter <= 'z') @@ -156,14 +189,14 @@ return (noDrives & bit) != 0; } -std::list CVolumeDescriptionEnumeratorThread::GetDrives() +std::list CVolumeDescriptionEnumeratorThread::GetDrives() { - std::list ret; + std::list ret; long drivesToHide = GetDrivesToHide(); DWORD bufferLen{}; - wxChar* drives{}; + wchar_t* drives{}; DWORD neededLen = 1000; @@ -171,13 +204,13 @@ delete[] drives; bufferLen = neededLen * 2; - drives = new wxChar[bufferLen + 1]; + drives = new wchar_t[bufferLen + 1]; neededLen = GetLogicalDriveStrings(bufferLen, drives); } while (neededLen >= bufferLen); drives[neededLen] = 0; - const wxChar* pDrive = drives; + wchar_t const* pDrive = drives; while (*pDrive) { const int drivelen = fz::strlen(pDrive); @@ -187,7 +220,7 @@ pDrive += drivelen + 1; } - + delete [] drives; return ret; @@ -198,19 +231,12 @@ { std::list volumeInfo; - fz::scoped_lock l(sync_); - - for (auto const& internal_info : m_volumeInfo) { - t_VolumeInfo info; - info.volume = internal_info.pVolume; - delete[] internal_info.pVolume; - info.volumeName = internal_info.pVolumeName; - delete[] internal_info.pVolumeName; - volumeInfo.push_back(info); + { + fz::scoped_lock l(sync_); + m_volumeInfo.swap(volumeInfo); } - m_volumeInfo.clear(); return volumeInfo; } -#endif //__WXMSW__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/volume_enumerator.h filezilla-3.33.0/src/interface/volume_enumerator.h --- filezilla-3.15.0.2/src/interface/volume_enumerator.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/volume_enumerator.h 2017-01-09 16:00:55.000000000 +0000 @@ -1,5 +1,7 @@ -#ifndef __VOLUME_ENUMERATOR_H__ -#define __VOLUME_ENUMERATOR_H__ +#ifndef FILEZILLA_VOLUME_ENUMERATOR_HEADER +#define FILEZILLA_VOLUME_ENUMERATOR_HEADER + +#include #include @@ -18,7 +20,7 @@ // Since the local directory tree including the drives is populated at // startup, use a background thread to obtain the labels. -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS DECLARE_EVENT_TYPE(fzEVT_VOLUMEENUMERATED, -1) DECLARE_EVENT_TYPE(fzEVT_VOLUMESENUMERATED, -1) @@ -33,40 +35,35 @@ struct t_VolumeInfo { - wxString volume; - wxString volumeName; + std::wstring volume; + std::wstring volumeName; + int icon{-1}; }; std::list GetVolumes(); - static std::list GetDrives(); + static std::list GetDrives(); static long GetDrivesToHide(); - static bool IsHidden(wxChar const* drive, long noDrives); + static bool IsHidden(wchar_t const* drive, long noDrives); protected: bool GetDriveLabels(); - void ProcessDrive(wxString const& drive); - bool GetDriveLabel(wxString const& drive); + void ProcessDrive(std::wstring const& drive); + bool GetDriveLabel(std::wstring const& drive); + bool GetDriveIcon(std::wstring const& drive); virtual void entry(); wxEvtHandler* m_pEvtHandler; - bool m_failure; - bool m_stop; - bool m_running; - - struct t_VolumeInfoInternal - { - wxChar* pVolume; - wxChar* pVolumeName; - }; + bool m_failure{}; + bool m_stop{}; - std::list m_volumeInfo; + std::list m_volumeInfo; - fz::mutex sync_; + fz::mutex sync_{false}; }; -#endif //__WXMSW__ +#endif -#endif //__VOLUME_ENUMERATOR_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/welcome_dialog.cpp filezilla-3.33.0/src/interface/welcome_dialog.cpp --- filezilla-3.15.0.2/src/interface/welcome_dialog.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/welcome_dialog.cpp 2017-08-14 03:30:02.000000000 +0000 @@ -1,23 +1,36 @@ #include #include "welcome_dialog.h" #include "buildinfo.h" -#include #include "Options.h" +#include "themeprovider.h" #include "xrc_helper.h" +#if USE_MAC_SANDBOX +#include "osx_sandbox_userdirs.h" +#endif +#include BEGIN_EVENT_TABLE(CWelcomeDialog, wxDialogEx) EVT_TIMER(wxID_ANY, CWelcomeDialog::OnTimer) END_EVENT_TABLE() -bool CWelcomeDialog::Run(wxWindow* parent, bool force /*=false*/, bool delay /*=false*/) +void CWelcomeDialog::RunDelayed(wxWindow* parent) +{ + CWelcomeDialog * dlg = new CWelcomeDialog; + dlg->parent_ = parent; + dlg->m_delayedShowTimer.SetOwner(dlg); + dlg->m_delayedShowTimer.Start(10, true); +} + +bool CWelcomeDialog::Run(wxWindow* parent, bool force) { const wxString ownVersion = CBuildInfo::GetVersion(); wxString greetingVersion = COptions::Get()->GetOption(OPTION_GREETINGVERSION); + wxString const resources = COptions::Get()->GetOption(OPTION_GREETINGRESOURCES); + COptions::Get()->SetOption(OPTION_GREETINGRESOURCES, _T("")); + if (!force) { if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2) { - if (delay) - delete this; return true; } @@ -25,23 +38,24 @@ CBuildInfo::ConvertToVersionNumber(ownVersion.c_str()) <= CBuildInfo::ConvertToVersionNumber(greetingVersion.c_str())) { // Been there done that - if (delay) - delete this; return true; } - COptions::Get()->SetOption(OPTION_GREETINGVERSION, ownVersion); + COptions::Get()->SetOption(OPTION_GREETINGVERSION, ownVersion.ToStdWstring()); - if (greetingVersion.empty() && !COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE)) + if (greetingVersion.empty() && !COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE)) { COptions::Get()->SetOption(OPTION_PROMPTPASSWORDSAVE, 1); + } } if (!Load(parent, _T("ID_WELCOME"))) { - if (delay) { - delete this; - } return false; } + wxBitmap bmp = CThemeProvider::Get()->CreateBitmap("ART_FILEZILLA", wxString(), CThemeProvider::GetIconSize(iconSizeLarge)); + xrc_call(*this, "ID_FILEZILLA_LOGO", &wxStaticBitmap::SetBitmap, bmp); + + InitFooter(force ? wxString() : resources); + xrc_call(*this, "ID_FZVERSION", &wxStaticText::SetLabel, _T("FileZilla ") + CBuildInfo::GetVersion()); wxString const url = _T("https://welcome.filezilla-project.org/welcome?type=client&category=%s&version=") + ownVersion; @@ -60,22 +74,67 @@ xrc_call(*this, "ID_DOCUMENTATION_MORE", &wxHyperlinkCtrl::SetURL, wxString::Format(url, _T("documentation_more"))); xrc_call(*this, "ID_SUPPORT_FORUM", &wxHyperlinkCtrl::SetURL, wxString::Format(url, _T("support_forum"))); xrc_call(*this, "ID_SUPPORT_MORE", &wxHyperlinkCtrl::SetURL, wxString::Format(url, _T("support_more"))); + Layout(); GetSizer()->Fit(this); - if (delay) { - m_delayedShowTimer.SetOwner(this); - m_delayedShowTimer.Start(10, true); - } - else - ShowModal(); + ShowModal(); return true; } void CWelcomeDialog::OnTimer(wxTimerEvent&) { - ShowModal(); + Run(parent_, false); +#if USE_MAC_SANDBOX + if (OSXSandboxUserdirs::Get().GetDirs().empty()) { + OSXSandboxUserdirsDialog dlg; + dlg.Run(parent_); + } +#endif + Destroy(); } + +#if FZ_WINDOWS && FZ_MANUALUPDATECHECK +void MakeLinksFromTooltips(wxWindow& parent); + +namespace { +void CreateMessagePanel(wxWindow& dlg, char const* ctrl, wxXmlResource& resource, wxString const& resourceName) +{ + wxWindow* parent = XRCCTRL(dlg, ctrl, wxPanel); + if (parent) { + wxPanel* p = new wxPanel(); + if (resource.LoadPanel(p, parent, resourceName)) { + wxSize minSize = p->GetSizer()->GetMinSize(); + parent->SetInitialSize(minSize); + MakeLinksFromTooltips(*p); + } + else { + delete p; + } + } +} +} +#endif + +void CWelcomeDialog::InitFooter(wxString const& resources) +{ +#if FZ_WINDOWS && FZ_MANUALUPDATECHECK + if (CBuildInfo::GetBuildType() == _T("official") && !COptions::Get()->GetOptionVal(OPTION_DISABLE_UPDATE_FOOTER)) { + if (!resources.empty()) { + wxLogNull null; + + wxXmlResource res(wxXRC_NO_RELOADING); + InitHandlers(res); + if (res.Load(_T("blob:") + resources)) { + CreateMessagePanel(*this, "ID_HEADERMESSAGE_PANEL", res, _T("ID_WELCOME_HEADER")); + CreateMessagePanel(*this, "ID_FOOTERMESSAGE_PANEL", res, _T("ID_WELCOME_FOOTER")); + } + } + } +#else + (void)resources; +#endif +} diff -Nru filezilla-3.15.0.2/src/interface/welcome_dialog.h filezilla-3.33.0/src/interface/welcome_dialog.h --- filezilla-3.15.0.2/src/interface/welcome_dialog.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/welcome_dialog.h 2017-08-14 03:30:02.000000000 +0000 @@ -1,23 +1,29 @@ -#ifndef __WELCOME_DIALOG_H__ -#define __WELCOME_DIALOG_H__ +#ifndef FILEZILLA_INTERFACE_WELCOME_DIALOG_HEADER +#define FILEZILLA_INTERFACE_WELCOME_DIALOG_HEADER #include "dialogex.h" #include -class CWelcomeDialog : public wxDialogEx +class CWelcomeDialog final : public wxDialogEx { public: - CWelcomeDialog() {} - virtual ~CWelcomeDialog() {} + CWelcomeDialog() = default; - bool Run(wxWindow* parent, bool force = false, bool delay = false); + bool Run(wxWindow* parent, bool force = false); + + static void RunDelayed(wxWindow* parent); protected: + + void InitFooter(wxString const& resources); + wxTimer m_delayedShowTimer; + wxWindow* parent_{}; + DECLARE_EVENT_TABLE() void OnTimer(wxTimerEvent& event); }; -#endif //__WELCOME_DIALOG_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/window_state_manager.cpp filezilla-3.33.0/src/interface/window_state_manager.cpp --- filezilla-3.15.0.2/src/interface/window_state_manager.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/window_state_manager.cpp 2017-07-16 10:29:48.000000000 +0000 @@ -28,8 +28,9 @@ void CWindowStateManager::Remember(unsigned int optionId) { - if (!m_lastWindowSize.IsFullySpecified()) + if (!m_lastWindowSize.IsFullySpecified()) { return; + } wxString posString; @@ -42,13 +43,14 @@ // pos_width pos_height posString += wxString::Format(_T("%d %d "), m_lastWindowSize.x, m_lastWindowSize.y); - COptions::Get()->SetOption(optionId, posString); + COptions::Get()->SetOption(optionId, posString.ToStdWstring()); } bool CWindowStateManager::ReadDefaults(const unsigned int optionId, bool& maximized, wxPoint& position, wxSize& size) { - if (wxGetKeyState(WXK_SHIFT) && wxGetKeyState(WXK_ALT) && wxGetKeyState(WXK_CONTROL)) + if (wxGetKeyState(WXK_SHIFT) && wxGetKeyState(WXK_ALT) && wxGetKeyState(WXK_CONTROL)) { return false; + } // Fields: // - maximized (1 or 0) @@ -59,18 +61,20 @@ const wxString layout = COptions::Get()->GetOption(optionId); wxStringTokenizer tokens(layout, _T(" ")); int count = tokens.CountTokens(); - if (count != 5) + if (count != 5) { return false; + } long values[5]; - for (int i = 0; i < count; i++) - { + for (int i = 0; i < count; ++i) { wxString token = tokens.GetNextToken(); - if (!token.ToLong(values + i)) + if (!token.ToLong(values + i)) { return false; + } } - if (values[3] <= 0 || values[4] <= 0) + if (values[3] <= 0 || values[4] <= 0) { return false; + } const wxRect screen_size = GetScreenDimensions(); @@ -82,13 +86,15 @@ // Deal with the horizontal position.x = wxMin(screen_size.GetRight() - 30, values[1]); - if (position.x + size.x - 30 < screen_size.GetLeft()) + if (position.x + size.x - 30 < screen_size.GetLeft()) { position.x = screen_size.GetLeft() + 30 - size.x; + } // Deal with the vertical position.y = wxMin(screen_size.GetBottom() - 30, values[2]); - if (position.y < screen_size.GetTop()) + if (position.y < screen_size.GetTop()) { position.y = screen_size.GetTop(); + } maximized = values[0] != 0; @@ -103,8 +109,7 @@ bool read = ReadDefaults(optionId, maximized, position, size); - if (maximized) - { + if (maximized) { // We need to move so it appears on the proper display on multi-monitor systems m_pWindow->Move(position.x, position.y); @@ -128,13 +133,12 @@ m_maximize_requested = 4; #endif //__WXGTK__ } - else - { - if (read) + else { + if (read) { m_pWindow->Move(position.x, position.y); + } - if (size.IsFullySpecified()) - { + if (size.IsFullySpecified()) { // The slight off-size is needed to ensure the client sizes gets changed at least once. // Otherwise all the splitters would have default size still. m_pWindow->SetClientSize(size.x + 1, size.x); @@ -144,8 +148,9 @@ m_pWindow->SetClientSize(size.x, size.y); } - if (!read) + if (!read) { m_pWindow->CentreOnScreen(); + } } return true; @@ -154,14 +159,13 @@ void CWindowStateManager::OnSize(wxSizeEvent& event) { #ifdef __WXGTK__ - if (m_maximize_requested) + if (m_maximize_requested) { m_maximize_requested--; + } #endif - if (!m_pWindow->IsIconized()) - { + if (!m_pWindow->IsIconized()) { m_lastMaximized = m_pWindow->IsMaximized(); - if (!m_lastMaximized) - { + if (!m_lastMaximized) { m_lastWindowPosition = m_pWindow->GetPosition(); m_lastWindowSize = m_pWindow->GetClientSize(); } @@ -171,8 +175,7 @@ void CWindowStateManager::OnMove(wxMoveEvent& event) { - if (!m_pWindow->IsIconized() && !m_pWindow->IsMaximized()) - { + if (!m_pWindow->IsIconized() && !m_pWindow->IsMaximized()) { m_lastWindowPosition = m_pWindow->GetPosition(); m_lastWindowSize = m_pWindow->GetClientSize(); } @@ -185,14 +188,14 @@ wxRect screen_size(0, 0, 0, 0); // Get bounding rectangle of virtual screen - for (unsigned int i = 0; i < wxDisplay::GetCount(); i++) - { + for (unsigned int i = 0; i < wxDisplay::GetCount(); ++i) { wxDisplay display(i); wxRect rect = display.GetGeometry(); screen_size.Union(rect); } - if (screen_size.GetWidth() <= 0 || screen_size.GetHeight() <= 0) + if (screen_size.GetWidth() <= 0 || screen_size.GetHeight() <= 0) { screen_size = wxRect(0, 0, 1000000000, 1000000000); + } #else wxRect screen_size(0, 0, 1000000000, 1000000000); #endif diff -Nru filezilla-3.15.0.2/src/interface/window_state_manager.h filezilla-3.33.0/src/interface/window_state_manager.h --- filezilla-3.15.0.2/src/interface/window_state_manager.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/window_state_manager.h 2017-07-16 10:29:48.000000000 +0000 @@ -1,10 +1,10 @@ -#ifndef __WINDOW_STATE_MANAGER_H__ -#define __WINDOW_STATE_MANAGER_H__ +#ifndef FILEZILLA_INTERFACE_WINDOW_STATE_MANAGER_HEADER +#define FILEZILLA_INTERFACE_WINDOW_STATE_MANAGER_HEADER // This class get used to remember toplevel window size and position across // sessions. -class CWindowStateManager : public wxEvtHandler +class CWindowStateManager final : public wxEvtHandler { public: CWindowStateManager(wxTopLevelWindow* pWindow); @@ -35,4 +35,4 @@ void OnMove(wxMoveEvent& event); }; -#endif //__WINDOW_STATE_MANAGER_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/wrapengine.cpp filezilla-3.33.0/src/interface/wrapengine.cpp --- filezilla-3.15.0.2/src/interface/wrapengine.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/wrapengine.cpp 2017-10-30 04:30:02.000000000 +0000 @@ -338,7 +338,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, int id, unsigned long maxLength) { - wxStaticText* pText = wxDynamicCast(parent->FindWindow(id), wxStaticText); + wxStaticText* pText = dynamic_cast(parent->FindWindow(id)); if (!pText) return false; @@ -399,7 +399,7 @@ wxWindow* window; wxSizer* subSizer = 0; if ((window = item->GetWindow())) { - wxStaticText* text = wxDynamicCast(window, wxStaticText); + wxStaticText* text = dynamic_cast(window); if (text) { #ifdef __WXMAC__ const int offset = 3; @@ -429,7 +429,7 @@ continue; } - wxNotebook* book = wxDynamicCast(window, wxNotebook); + wxNotebook* book = dynamic_cast(window); if (book) { int maxPageWidth = 0; for (unsigned int j = 0; j < book->GetPageCount(); ++j) { @@ -453,8 +453,7 @@ continue; } - if (wxDynamicCast(window, wxCheckBox) || wxDynamicCast(window, wxRadioButton) || wxDynamicCast(window, wxChoice)) - { + if (dynamic_cast(window) || dynamic_cast(window) || dynamic_cast(window)) { #if WRAPDEBUG >= 3 plvl printf("Leave: WrapRecursive on unshrinkable control failed: %s\n", static_cast(wxString(window->GetClassInfo()->GetClassName()))); @@ -472,8 +471,7 @@ // Add border of static box sizer wxStaticBoxSizer* sboxSizer; - if ((sboxSizer = wxDynamicCast(subSizer, wxStaticBoxSizer))) - { + if ((sboxSizer = dynamic_cast(subSizer))) { int top, other; sboxSizer->GetStaticBox()->GetBordersForSizer(&top, &other); subBorder += other * 2; @@ -497,8 +495,8 @@ } } - wxStaticBoxSizer* sboxSizer = wxDynamicCast(sizer, wxStaticBoxSizer); - if( sboxSizer ) { + wxStaticBoxSizer* sboxSizer = dynamic_cast(sizer); + if (sboxSizer) { #ifdef __WXGTK3__ gtk_widget_set_size_request(sboxSizer->GetStaticBox()->GetHandle(), -1, -1); GtkRequisition req; @@ -783,22 +781,18 @@ wxWindow* window; wxSizer* subSizer; - if ((window = item->GetWindow())) - { - wxStaticText* text = wxDynamicCast(window, wxStaticText); - if (text) - { + if ((window = item->GetWindow())) { + wxStaticText* text = dynamic_cast(window); + if (text) { wxString unwrapped = UnwrapText(text->GetLabel()); text->SetLabel(unwrapped); continue; } - wxNotebook* book = wxDynamicCast(window, wxNotebook); - if (book) - { - for (unsigned int j = 0; j < book->GetPageCount(); ++j) - { + wxNotebook* book = dynamic_cast(window); + if (book) { + for (unsigned int j = 0; j < book->GetPageCount(); ++j) { wxNotebookPage* page = book->GetPage(j); UnwrapRecursive(wnd, page->GetSizer()); } @@ -827,7 +821,7 @@ CInterProcessMutex mutex(MUTEX_LAYOUT); CXmlFile xml(wxGetApp().GetSettingsFile(_T("layout"))); - auto root = xml.Load(); + auto root = xml.Load(true); auto element = root.child("Layout"); if (!element) { return 0; @@ -854,18 +848,20 @@ void CWrapEngine::SetWidthToCache(const char* name, int width) { - if (!m_use_cache) + if (!m_use_cache) { return; + } - if (!name || !*name) + if (!name || !*name) { return; + } // We have to synchronize access to layout.xml so that multiple processes don't write // to the same file or one is reading while the other one writes. CInterProcessMutex mutex(MUTEX_LAYOUT); CXmlFile xml(wxGetApp().GetSettingsFile(_T("layout"))); - auto root = xml.Load(); + auto root = xml.Load(true); auto element = root.child("Layout"); if (!element) { return; @@ -932,7 +928,7 @@ CInterProcessMutex mutex(MUTEX_LAYOUT); CXmlFile xml(wxGetApp().GetSettingsFile(_T("layout"))); - auto document = xml.Load(); + auto document = xml.Load(true); if (!document) { m_use_cache = false; @@ -944,16 +940,17 @@ bool cacheValid = true; auto layoutElement = document.child("Layout"); - if (!layoutElement) + if (!layoutElement) { layoutElement = document.append_child("Layout"); + } - const wxString buildDate = CBuildInfo::GetBuildDateString(); + std::wstring const buildDate = CBuildInfo::GetBuildDateString(); if (GetTextAttribute(layoutElement, "Builddate") != buildDate) { cacheValid = false; SetTextAttribute(layoutElement, "Builddate", buildDate); } - const wxString buildTime = CBuildInfo::GetBuildTimeString(); + std::wstring const buildTime = CBuildInfo::GetBuildTimeString(); if (GetTextAttribute(layoutElement, "Buildtime") != buildTime) { cacheValid = false; SetTextAttribute(layoutElement, "Buildtime", buildTime); @@ -963,8 +960,9 @@ // ----------------------------- auto resources = layoutElement.child("Resources"); - if (!resources) + if (!resources) { resources = layoutElement.append_child("Resources"); + } CLocalPath resourceDir = wxGetApp().GetResourceDir(); resourceDir.AddSegment(_T("xrc")); @@ -974,21 +972,22 @@ wxString xrc; for (bool found = dir.GetFirst(&xrc, _T("*.xrc")); found; found = dir.GetNext(&xrc)) { - if (!wxFileName::FileExists(resourceDir.GetPath() + xrc)) + if (!wxFileName::FileExists(resourceDir.GetPath() + xrc)) { continue; + } fz::datetime const date = fz::local_filesys::get_modification_time(fz::to_native(resourceDir.GetPath() + xrc)); - wxString const ticks = std::to_wstring(date.get_time_t()); + std::wstring const ticks = std::to_wstring(date.get_time_t()); auto resourceElement = FindElementWithAttribute(resources, "xrc", "file", xrc.mb_str()); if (!resourceElement) { resourceElement = resources.append_child("xrc"); - SetTextAttribute(resourceElement, "file", xrc); + SetTextAttribute(resourceElement, "file", xrc.ToStdWstring()); SetTextAttribute(resourceElement, "date", ticks); cacheValid = false; } else { - wxString xrcNodeDate = GetTextAttribute(resourceElement, "date"); + std::wstring xrcNodeDate = GetTextAttribute(resourceElement, "date"); if (xrcNodeDate.empty() || xrcNodeDate != ticks) { cacheValid = false; SetTextAttribute(resourceElement, "date", ticks); @@ -1006,14 +1005,15 @@ } // Get current language - wxString language = wxGetApp().GetCurrentLanguageCode(); - if (language.empty()) - language = _T("default"); + std::wstring language = wxGetApp().GetCurrentLanguageCode().ToStdWstring(); + if (language.empty()) { + language = L"default"; + } - auto languageElement = FindElementWithAttribute(layoutElement, "Language", "id", language.mb_str()); + auto languageElement = FindElementWithAttribute(layoutElement, "Language", "id", fz::to_utf8(language).c_str()); if (!languageElement) { languageElement = layoutElement.append_child("Language"); - SetTextAttribute(languageElement, "id", language.mb_str()); + SetTextAttribute(languageElement, "id", language); } // Get static text font and measure sample text @@ -1022,7 +1022,7 @@ wxStaticText* pText = new wxStaticText(pFrame, -1, _T("foo")); wxFont font = pText->GetFont(); - wxString fontDesc = font.GetNativeFontInfoDesc(); + std::wstring fontDesc = font.GetNativeFontInfoDesc().ToStdWstring(); auto fontElement = languageElement.child("Font"); if (!fontElement) @@ -1052,9 +1052,9 @@ if (!name.empty()) { fz::datetime const date = fz::local_filesys::get_modification_time(fz::to_native(localesDir.GetPath() + name + _T("/filezilla.mo"))); - wxString const ticks = std::to_wstring(date.get_time_t()); + std::wstring const ticks = std::to_wstring(date.get_time_t()); - wxString languageNodeDate = GetTextAttribute(languageElement, "date"); + std::wstring languageNodeDate = GetTextAttribute(languageElement, "date"); if (languageNodeDate.empty() || languageNodeDate != ticks) { SetTextAttribute(languageElement, "date", ticks); cacheValid = false; @@ -1073,7 +1073,7 @@ return true; } - if (!xml.Save(true)) { + if (!xml.Save(false)) { m_use_cache = false; } return true; diff -Nru filezilla-3.15.0.2/src/interface/wrapengine.h filezilla-3.33.0/src/interface/wrapengine.h --- filezilla-3.15.0.2/src/interface/wrapengine.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/wrapengine.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __WRAPENGINE_H__ -#define __WRAPENGINE_H__ +#ifndef FILEZILLA_INTERFACE_WRAPENGINE_HEADER +#define FILEZILLA_INTERFACE_WRAPENGINE_HEADER class CWrapEngine { @@ -53,4 +53,4 @@ static bool m_use_cache; }; -#endif //__WRAPENGINE_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/wxfilesystem_blob_handler.cpp filezilla-3.33.0/src/interface/wxfilesystem_blob_handler.cpp --- filezilla-3.15.0.2/src/interface/wxfilesystem_blob_handler.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/wxfilesystem_blob_handler.cpp 2017-07-16 10:29:48.000000000 +0000 @@ -0,0 +1,69 @@ +#include +#include "wxfilesystem_blob_handler.h" + +#include + +bool wxFileSystemBlobHandler::CanOpen(wxString const& location) +{ + auto const proto = GetProtocol(location); + return proto == _T("blob") || proto == _T("blob64"); +} + +wxString wxFileSystemBlobHandler::FindFirst(wxString const& wildcard, int flags) +{ + if ((flags & wxFILE) != wxFILE) { + return wxString(); + } + + return wildcard; +} + +wxFSFile* wxFileSystemBlobHandler::OpenFile(wxFileSystem&, const wxString& location) +{ + unsigned char* buf{}; + size_t buf_len{}; + + auto pos = location.Find(':'); + if (pos == 4) { + // hex + wxString data = location.Mid(pos + 1); + if (data.size() % 2) { + return 0; + } + + wxChar const* str = data.c_str(); + + buf = static_cast(malloc(data.size() / 2)); + if (buf) { + for (size_t i = 0; i < data.size() / 2; ++i) { + buf[i] = static_cast(fz::hex_char_to_int(str[i * 2]) * 16 + fz::hex_char_to_int(str[i * 2 + 1])); + } + } + + buf_len = data.size() / 2; + } + else if (pos == 6) { + // base64 + std::string data = fz::base64_decode(fz::to_utf8(location.Mid(pos + 1))); + if (!data.empty()) { + buf = static_cast(malloc(data.size())); + if (buf) { + memcpy(buf, data.c_str(), data.size()); + buf_len = data.size(); + } + } + } + + if (buf) { + // Whoever came up with the API for the wx streams obviously didn't ever use it. + // Why else wouldn't it have an ownership-taking constructor? + auto stream = new wxMemoryInputStream(0, buf_len); + + // Or why does it expect a buffer allocated with malloc? + stream->GetInputStreamBuffer()->SetBufferIO(buf, buf_len, true); + + return new wxFSFile(stream, location, _T(""), _T(""), wxDateTime()); + } + + return 0; +} diff -Nru filezilla-3.15.0.2/src/interface/wxfilesystem_blob_handler.h filezilla-3.33.0/src/interface/wxfilesystem_blob_handler.h --- filezilla-3.15.0.2/src/interface/wxfilesystem_blob_handler.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/wxfilesystem_blob_handler.h 2016-04-20 17:21:15.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef FILEZILLA_INTERFACE_WXFILESYSTEM_BLOB_HANDLER_HEADER +#define FILEZILLA_INTERFACE_WXFILESYSTEM_BLOB_HANDLER_HEADER + +#include + +// A handler for wxFileSystem where the filename is the hex-encoded file content. +class wxFileSystemBlobHandler : public wxFileSystemHandler +{ +public: + wxFileSystemBlobHandler() = default; + + virtual bool CanOpen(wxString const& location); + + virtual wxFSFile* OpenFile(wxFileSystem& fs, wxString const& location); + + virtual wxString FindFirst(wxString const& wildcard, int flags); +}; + +#endif \ No newline at end of file diff -Nru filezilla-3.15.0.2/src/interface/xh_text_ex.cpp filezilla-3.33.0/src/interface/xh_text_ex.cpp --- filezilla-3.15.0.2/src/interface/xh_text_ex.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/xh_text_ex.cpp 2017-04-18 12:42:56.000000000 +0000 @@ -24,6 +24,9 @@ if (HasParam(wxT("maxlength"))) text->SetMaxLength(GetLong(wxT("maxlength"))); + if (HasParam(wxT("hint"))) + text->SetHint(GetText(wxS("hint"))); + return text; } diff -Nru filezilla-3.15.0.2/src/interface/xh_text_ex.h filezilla-3.33.0/src/interface/xh_text_ex.h --- filezilla-3.15.0.2/src/interface/xh_text_ex.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/xh_text_ex.h 2017-07-16 10:29:48.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __XH_TEXT_EX_H__ -#define __XH_TEXT_EX_H__ +#ifndef FILEZILLA_INTERFACE_XH_TEXT_EX_HEADER +#define FILEZILLA_INTERFACE_XH_TEXT_EX_HEADER #include @@ -7,7 +7,7 @@ #define wxTextCtrlXmlHandlerEx wxTextCtrlXmlHandler #else -class wxTextCtrlXmlHandlerEx : public wxTextCtrlXmlHandler +class wxTextCtrlXmlHandlerEx final : public wxTextCtrlXmlHandler { DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandlerEx) @@ -17,4 +17,4 @@ #endif -#endif //__XH_TEXT_EX_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/xh_toolb_ex.cpp filezilla-3.33.0/src/interface/xh_toolb_ex.cpp --- filezilla-3.15.0.2/src/interface/xh_toolb_ex.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/xh_toolb_ex.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,256 +0,0 @@ -// Based upon src/xrc/xh_toolb.cpp from wxWidgets - -#include -#include "xh_toolb_ex.h" - -wxSize wxToolBarXmlHandlerEx::m_iconSize(-1, -1); - -wxToolBarXmlHandlerEx::wxToolBarXmlHandlerEx() -: wxXmlResourceHandler(), m_isInside(false), m_toolbar(NULL) -{ - XRC_ADD_STYLE(wxTB_FLAT); - XRC_ADD_STYLE(wxTB_DOCKABLE); - XRC_ADD_STYLE(wxTB_VERTICAL); - XRC_ADD_STYLE(wxTB_HORIZONTAL); - XRC_ADD_STYLE(wxTB_3DBUTTONS); - XRC_ADD_STYLE(wxTB_TEXT); - XRC_ADD_STYLE(wxTB_NOICONS); - XRC_ADD_STYLE(wxTB_NODIVIDER); - XRC_ADD_STYLE(wxTB_NOALIGN); - XRC_ADD_STYLE(wxTB_HORZ_LAYOUT); - XRC_ADD_STYLE(wxTB_HORZ_TEXT); - - XRC_ADD_STYLE(wxTB_TOP); - XRC_ADD_STYLE(wxTB_LEFT); - XRC_ADD_STYLE(wxTB_RIGHT); - XRC_ADD_STYLE(wxTB_BOTTOM); - - AddWindowStyles(); -} - -wxObject *wxToolBarXmlHandlerEx::DoCreateResource() -{ - if (m_class == wxT("tool")) - { - if (!m_toolbar) - { - ReportError("tool only allowed inside a wxToolBar"); - return NULL; - } - - wxItemKind kind = wxITEM_NORMAL; - if (GetBool(wxT("radio"))) - kind = wxITEM_RADIO; - - if (GetBool(wxT("toggle"))) - { - if (kind != wxITEM_NORMAL) - { - ReportParamError - ( - "toggle", - "tool can't have both and properties" - ); - } - - kind = wxITEM_CHECK; - } - -#if wxUSE_MENUS - // check whether we have dropdown tag inside - wxMenu *menu = NULL; // menu for drop down items - wxXmlNode * const nodeDropdown = GetParamNode("dropdown"); - if (nodeDropdown) - { - if (kind != wxITEM_NORMAL) - { - ReportParamError - ( - "dropdown", - "drop-down tool can't have neither nor properties" - ); - } - - kind = wxITEM_DROPDOWN; - - // also check for the menu specified inside dropdown (it is - // optional and may be absent for e.g. dynamically-created - // menus) - wxXmlNode * const nodeMenu = nodeDropdown->GetChildren(); - if (nodeMenu) - { - wxObject *res = CreateResFromNode(nodeMenu, NULL); - menu = wxDynamicCast(res, wxMenu); - if (!menu) - { - ReportError - ( - nodeMenu, - "drop-down tool contents can only be a wxMenu" - ); - } - - if (nodeMenu->GetNext()) - { - ReportError - ( - nodeMenu->GetNext(), - "unexpected extra contents under drop-down tool" - ); - } - } - } -#endif - wxBitmap bitmap = GetBitmap(wxT("bitmap"), wxART_TOOLBAR, m_iconSize); - wxBitmap bitmap2 = GetBitmap(wxT("bitmap2"), wxART_TOOLBAR, m_iconSize); -#ifdef __WXMAC__ - if( bitmap.IsOk() ) { - if( bitmap.GetSize().x < 24 ) { - bitmap = wxBitmap(bitmap.ConvertToImage().Size(wxSize(24, 24), wxPoint(4, 4))); - } - } - - if( bitmap2.IsOk() ) { - if( bitmap2.GetSize().x < 24 ) { - bitmap2 = wxBitmap(bitmap2.ConvertToImage().Size(wxSize(24, 24), wxPoint(4, 4))); - } - } -#endif -#ifdef __WXGTK3__ - // We need to provide a disabled bitmap. - if( !bitmap2.IsOk() && bitmap.IsOk() ) { - bitmap2 = wxBitmap(bitmap.ConvertToImage().ConvertToGreyscale()); - } -#endif - wxToolBarToolBase * const tool = - m_toolbar->AddTool - ( - GetID(), - GetText(wxT("label")), - bitmap, - bitmap2, - kind, - GetText(wxT("tooltip")), - GetText(wxT("longhelp")) - ); - - if (GetBool(wxT("disabled"))) - m_toolbar->EnableTool(tool->GetId(), false); - - if (GetBool(wxS("checked"))) - { - if (kind == wxITEM_NORMAL) - { - ReportParamError - ( - "checked", - "only nor tools can be checked" - ); - } - else - { - m_toolbar->ToggleTool(tool->GetId(), true); - } - } - -#if wxUSE_MENUS - if (menu) - tool->SetDropdownMenu(menu); -#endif - - return m_toolbar; // must return non-NULL - } - - else if (m_class == wxT("separator") || m_class == wxT("space")) - { - if (!m_toolbar) - { - ReportError("separators only allowed inside wxToolBar"); - return NULL; - } - - if (m_class == wxT("separator")) - m_toolbar->AddSeparator(); - else - m_toolbar->AddStretchableSpace(); - - return m_toolbar; // must return non-NULL - } - - else /**/ - { - int style = GetStyle(wxT("style"), wxNO_BORDER | wxTB_HORIZONTAL); -#ifdef __WXMSW__ - if (!(style & wxNO_BORDER)) style |= wxNO_BORDER; -#endif - - XRC_MAKE_INSTANCE(toolbar, wxToolBar) - - toolbar->Create(m_parentAsWindow, - GetID(), - GetPosition(), - GetSize(), - style, - GetName()); - SetupWindow(toolbar); - - toolbar->SetToolBitmapSize(m_iconSize); - wxSize margins = GetSize(wxT("margins")); - if (!(margins == wxDefaultSize)) - toolbar->SetMargins(margins.x, margins.y); - long packing = GetLong(wxT("packing"), -1); - if (packing != -1) - toolbar->SetToolPacking(packing); - long separation = GetLong(wxT("separation"), -1); - if (separation != -1) - toolbar->SetToolSeparation(separation); - - wxXmlNode *children_node = GetParamNode(wxT("object")); - if (!children_node) - children_node = GetParamNode(wxT("object_ref")); - - if (children_node == NULL) return toolbar; - - m_isInside = true; - m_toolbar = toolbar; - - wxXmlNode *n = children_node; - - while (n) - { - if ((n->GetType() == wxXML_ELEMENT_NODE) && - (n->GetName() == wxT("object") || n->GetName() == wxT("object_ref"))) - { - wxObject *created = CreateResFromNode(n, toolbar, NULL); - wxControl *control = wxDynamicCast(created, wxControl); - if (!IsOfClass(n, wxT("tool")) && - !IsOfClass(n, wxT("separator")) && - !IsOfClass(n, wxT("space")) && - control != NULL) - toolbar->AddControl(control); - } - n = n->GetNext(); - } - - m_isInside = false; - m_toolbar = NULL; - - if (m_parentAsWindow && !GetBool(wxT("dontattachtoframe"))) - { - wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame); - if (parentFrame) - parentFrame->SetToolBar(toolbar); - } - - toolbar->Realize(); - - return toolbar; - } -} - -bool wxToolBarXmlHandlerEx::CanHandle(wxXmlNode *node) -{ - return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) || - (m_isInside && IsOfClass(node, wxT("tool"))) || - (m_isInside && IsOfClass(node, wxT("separator")))); -} diff -Nru filezilla-3.15.0.2/src/interface/xh_toolb_ex.h filezilla-3.33.0/src/interface/xh_toolb_ex.h --- filezilla-3.15.0.2/src/interface/xh_toolb_ex.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/xh_toolb_ex.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -// Based upon include/wx/xrc/xh_toolb.h from wxWidgets - -#ifndef _WX_XH_TOOLB_EX_H_ -#define _WX_XH_TOOLB_EX_H_ - -#include - -class wxToolBar; - -class wxToolBarXmlHandlerEx : public wxXmlResourceHandler -{ -public: - wxToolBarXmlHandlerEx(); - virtual wxObject *DoCreateResource(); - virtual bool CanHandle(wxXmlNode *node); - - static void SetIconSize(const wxSize& size) { m_iconSize = size; } - -private: - bool m_isInside; - wxToolBar *m_toolbar; - - static wxSize m_iconSize; -}; - -#endif //_WX_XH_TOOLB_EX_H_ diff -Nru filezilla-3.15.0.2/src/interface/xmlfunctions.cpp filezilla-3.33.0/src/interface/xmlfunctions.cpp --- filezilla-3.15.0.2/src/interface/xmlfunctions.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/xmlfunctions.cpp 2018-04-25 03:30:06.000000000 +0000 @@ -1,14 +1,15 @@ #include #include "buildinfo.h" #include "xmlfunctions.h" +#include "xmlutils.h" #include "Options.h" #include #include -#include +#include #include -CXmlFile::CXmlFile(wxString const& fileName, wxString const& root) +CXmlFile::CXmlFile(std::wstring const& fileName, std::string const& root) { if (!root.empty()) { m_rootName = root; @@ -16,26 +17,21 @@ SetFileName(fileName); } -void CXmlFile::SetFileName(const wxString& name) +void CXmlFile::SetFileName(std::wstring const& name) { - wxASSERT(!name.empty()); + assert(!name.empty()); m_fileName = name; m_modificationTime = fz::datetime(); } -CXmlFile::~CXmlFile() -{ - Close(); -} - -pugi::xml_node CXmlFile::Load() +pugi::xml_node CXmlFile::Load(bool overwriteInvalid) { Close(); m_error.clear(); wxCHECK(!m_fileName.empty(), m_element); - wxString redirectedName = GetRedirectedName(); + std::wstring redirectedName = GetRedirectedName(); GetXmlFile(redirectedName); if (!m_element) { @@ -50,8 +46,17 @@ // Try the backup file GetXmlFile(redirectedName + _T("~")); if (!m_element) { - // Loading backup failed. If both original and backup file are empty, create new file. + // Loading backup failed. + + // Create new one if we are allowed to create empty file + bool createEmpty = overwriteInvalid; + + // Also, if both original and backup file are empty, create new file. if (fz::local_filesys::get_size(fz::to_native(redirectedName)) <= 0 && fz::local_filesys::get_size(fz::to_native(redirectedName + _T("~"))) <= 0) { + createEmpty = true; + } + + if (createEmpty) { m_error.clear(); CreateEmpty(); m_modificationTime = fz::local_filesys::get_modification_time(fz::to_native(redirectedName)); @@ -74,8 +79,8 @@ if (!res) { // Could not restore backup, give up. Close(); - m_error = err; - m_error += _T("\n") + wxString::Format(_("The valid backup file %s could not be restored"), redirectedName + _T("~")); + m_error = err.ToStdWstring(); + m_error += _T("\n") + wxString::Format(_("The valid backup file %s could not be restored"), redirectedName + _T("~")).ToStdWstring(); m_modificationTime.clear(); return m_element; } @@ -93,11 +98,11 @@ { wxCHECK(!m_fileName.empty(), false); - if (!m_modificationTime.empty()) + if (m_modificationTime.empty()) return true; fz::datetime const modificationTime = fz::local_filesys::get_modification_time(fz::to_native(m_fileName)); - if (modificationTime.empty() && modificationTime == m_modificationTime) + if (!modificationTime.empty() && modificationTime == m_modificationTime) return false; return true; @@ -117,15 +122,15 @@ SetTextAttribute(m_element, "version", CBuildInfo::GetVersion()); - wxString const platform = -#ifdef __WXMSW__ - _T("windows"); -#elif defined(__WXMAX__) - _T("mac"); + std::string const platform = +#ifdef FZ_WINDOWS + "windows"; +#elif defined(FZ_MAC) + "mac"; #else - _T("*nix"); + "*nix"; #endif - SetTextAttribute(m_element, "platform", platform); + SetTextAttributeUtf8(m_element, "platform", platform); } bool CXmlFile::Save(bool printError) @@ -141,7 +146,7 @@ m_modificationTime = fz::local_filesys::get_modification_time(fz::to_native(m_fileName)); if (!res && printError) { - wxASSERT(!m_error.empty()); + assert(!m_error.empty()); wxString msg = wxString::Format(_("Could not write \"%s\":"), m_fileName); wxMessageBoxEx(msg + _T("\n") + m_error, _("Error writing xml file"), wxICON_ERROR); @@ -157,131 +162,13 @@ decl.append_attribute("version") = "1.0"; decl.append_attribute("encoding") = "UTF-8"; - m_element = m_document.append_child(m_rootName.utf8_str()); + m_element = m_document.append_child(m_rootName.c_str()); return m_element; } -wxString ConvLocal(const char *value) -{ - return wxString(wxConvUTF8.cMB2WC(value), *wxConvCurrent); -} - -pugi::xml_node AddTextElement(pugi::xml_node node, const char* name, const wxString& value, bool overwrite) -{ - pugi::xml_node ret; - - wxASSERT(node); - - wxScopedCharBuffer utf8 = value.utf8_str(); - if (utf8) { - ret = AddTextElementRaw(node, name, utf8, overwrite); - } - - return ret; -} - -void AddTextElement(pugi::xml_node node, const char* name, int64_t value, bool overwrite) -{ - if (overwrite) { - node.remove_child(name); - } - auto child = node.append_child(name); - child.text().set(static_cast(value)); -} - -pugi::xml_node AddTextElementRaw(pugi::xml_node node, const char* name, const char* value, bool overwrite) -{ - wxASSERT(node); - wxASSERT(value); - - if (overwrite) { - node.remove_child(name); - } - - auto element = node.append_child(name); - if (*value) - element.text().set(value); - - return element; -} - -void AddTextElement(pugi::xml_node node, const wxString& value) -{ - wxASSERT(node); - wxASSERT(value); - - wxScopedCharBuffer utf8 = value.utf8_str(); - if (!utf8) - return; - - AddTextElementRaw(node, utf8); -} - -void AddTextElement(pugi::xml_node node, int64_t value) -{ - wxASSERT(node); - node.text().set(static_cast(value)); -} - -void AddTextElementRaw(pugi::xml_node node, const char* value) -{ - wxASSERT(node); - wxASSERT(value); - - if (*value) - node.text().set(value); - else { - node.text().set(""); - } -} - -wxString GetTextElement_Trimmed(pugi::xml_node node, const char* name) -{ - wxString t = GetTextElement(node, name); - t.Trim(true); - t.Trim(false); - - return t; -} - -wxString GetTextElement(pugi::xml_node node, const char* name) -{ - wxASSERT(node); - - return ConvLocal(node.child_value(name)); -} - -wxString GetTextElement_Trimmed(pugi::xml_node node) -{ - wxString t = GetTextElement(node); - t.Trim(true); - t.Trim(false); - - return t; -} - -wxString GetTextElement(pugi::xml_node node) -{ - wxASSERT(node); - - return ConvLocal(node.child_value()); -} - -int64_t GetTextElementInt(pugi::xml_node node, const char* name, int defValue /*=0*/) -{ - wxASSERT(node); - return static_cast(node.child(name).text().as_llong(defValue)); -} - -bool GetTextElementBool(pugi::xml_node node, const char* name, bool defValue /*=false*/) -{ - wxASSERT(node); - return node.child(name).text().as_bool(defValue); -} - // Opens the specified XML file if it exists or creates a new one otherwise. -// Returns 0 on error. -bool CXmlFile::GetXmlFile(wxString const& file) +// Returns false on error. +bool CXmlFile::GetXmlFile(std::wstring const& file) { Close(); @@ -292,34 +179,34 @@ // File exists, open it auto result = m_document.load_file(static_cast(file.c_str())); if (!result) { - m_error += wxString::Format(_T("%s at offset %lld."), wxString(result.description()), static_cast(result.offset)); + m_error += fz::sprintf(_T("%s at offset %d."), result.description(), result.offset); return false; } - m_element = m_document.child(m_rootName.utf8_str()); + m_element = m_document.child(m_rootName.c_str()); if (!m_element) { if (m_document.first_child()) { // Beware: parse_declaration and parse_doctype can break this // Not created by FileZilla3 Close(); - m_error = _("Unknown root element, the file does not appear to be generated by FileZilla."); + m_error = _("Unknown root element, the file does not appear to be generated by FileZilla.").ToStdWstring(); return false; } - m_element = m_document.append_child(m_rootName.utf8_str()); + m_element = m_document.append_child(m_rootName.c_str()); } return true; } -wxString CXmlFile::GetRedirectedName() const +std::wstring CXmlFile::GetRedirectedName() const { - wxString redirectedName = m_fileName; + std::wstring redirectedName = m_fileName; bool isLink = false; if (fz::local_filesys::get_file_info(fz::to_native(redirectedName), isLink, 0, 0, 0) == fz::local_filesys::file) { if (isLink) { - CLocalPath target(fz::local_filesys::get_link_target(fz::to_native(redirectedName))); + CLocalPath target(fz::to_wstring(fz::local_filesys::get_link_target(fz::to_native(redirectedName)))); if (!target.empty()) { redirectedName = target.GetPath(); - redirectedName.RemoveLast(); + redirectedName.pop_back(); } } } @@ -336,8 +223,9 @@ wxString redirectedName = GetRedirectedName(); if (fz::local_filesys::get_file_info(fz::to_native(redirectedName), isLink, 0, 0, &flags) == fz::local_filesys::file) { #ifdef __WXMSW__ - if (flags & FILE_ATTRIBUTE_HIDDEN) + if (flags & FILE_ATTRIBUTE_HIDDEN) { SetFileAttributes(redirectedName.c_str(), flags & ~FILE_ATTRIBUTE_HIDDEN); + } #endif exists = true; @@ -347,302 +235,303 @@ res = wxCopyFile(redirectedName, redirectedName + _T("~")); } if (!res) { - m_error = _("Failed to create backup copy of xml file"); + m_error = _("Failed to create backup copy of xml file").ToStdWstring(); return false; } } - bool success = m_document.save_file(static_cast(redirectedName.c_str())); + struct flushing_xml_writer final : public pugi::xml_writer + { + public: + static bool save(pugi::xml_document const& document, std::wstring const& filename) + { + flushing_xml_writer writer(filename); + if (!writer.file_.opened()) { + return false; + } + document.save(writer); + + return writer.file_.opened() && writer.file_.fsync(); + } + + private: + flushing_xml_writer(std::wstring const& filename) + : file_(fz::to_native(filename), fz::file::writing, fz::file::empty) + { + } + + virtual void write(const void* data, size_t size) override { + if (file_.opened()) { + if (file_.write(data, static_cast(size)) != static_cast(size)) { + file_.close(); + } + } + } + + fz::file file_; + }; + bool success = flushing_xml_writer::save(m_document, redirectedName.ToStdWstring()); if (!success) { wxRemoveFile(redirectedName); if (exists) { wxLogNull null; wxRenameFile(redirectedName + _T("~"), redirectedName); } - m_error = _("Failed to write xml file"); + m_error = _("Failed to write xml file").ToStdWstring(); return false; } - if (exists) + if (exists) { wxRemoveFile(redirectedName + _T("~")); + } return true; } -bool GetServer(pugi::xml_node node, CServer& server) +bool GetServer(pugi::xml_node node, ServerWithCredentials & server) { wxASSERT(node); - wxString host = GetTextElement(node, "Host"); - if (host.empty()) + std::wstring host = GetTextElement(node, "Host"); + if (host.empty()) { return false; + } int port = GetTextElementInt(node, "Port"); - if (port < 1 || port > 65535) + if (port < 1 || port > 65535) { return false; + } - if (!server.SetHost(host, port)) + if (!server.server.SetHost(host, port)) { return false; + } int const protocol = GetTextElementInt(node, "Protocol"); if (protocol < 0 || protocol > ServerProtocol::MAX_VALUE) { return false; } - server.SetProtocol(static_cast(protocol)); + server.server.SetProtocol(static_cast(protocol)); int type = GetTextElementInt(node, "Type"); - if (type < 0 || type >= SERVERTYPE_MAX) + if (type < 0 || type >= SERVERTYPE_MAX) { return false; + } - server.SetType((enum ServerType)type); + server.server.SetType(static_cast(type)); int logonType = GetTextElementInt(node, "Logontype"); - if (logonType < 0) + if (logonType < 0 || logonType >= static_cast(LogonType::count)) { return false; + } - server.SetLogonType((enum LogonType)logonType); - - if (server.GetLogonType() != ANONYMOUS) { - wxString user = GetTextElement(node, "User"); + server.SetLogonType(static_cast(logonType)); + + if (server.credentials.logonType_ != LogonType::anonymous) { + std::wstring user = GetTextElement(node, "User"); + if (user.empty() && server.credentials.logonType_ != LogonType::interactive && server.credentials.logonType_ != LogonType::ask) { + return false; + } - wxString pass, key; - if ((long)NORMAL == logonType || (long)ACCOUNT == logonType) { - auto passElement = node.child("Pass"); + std::wstring pass, key; + if (server.credentials.logonType_ == LogonType::normal || server.credentials.logonType_ == LogonType::account) { + auto passElement = node.child("Pass"); if (passElement) { - pass = GetTextElement(passElement); - - wxString encoding = GetTextAttribute(passElement, "encoding"); + std::wstring encoding = GetTextAttribute(passElement, "encoding"); if (encoding == _T("base64")) { - wxMemoryBuffer buf = wxBase64Decode(pass); - if (!buf.IsEmpty()) { - pass = wxString::FromUTF8(static_cast(buf.GetData()), buf.GetDataLen()); - } - else { + std::string decoded = fz::base64_decode(passElement.child_value()); + pass = fz::to_wstring_from_utf8(decoded); + } + else if (encoding == _T("crypt")) { + pass = fz::to_wstring_from_utf8(passElement.child_value()); + server.credentials.encrypted_ = public_key::from_base64(passElement.attribute("pubkey").value()); + if (!server.credentials.encrypted_) { pass.clear(); + server.SetLogonType(LogonType::ask); } } else if (!encoding.empty()) { - pass.clear(); - server.SetLogonType(ASK); + server.SetLogonType(LogonType::ask); + } + else { + pass = GetTextElement(passElement); } } - } else if ((long)KEY == logonType) { + } + else if (server.credentials.logonType_ == LogonType::key) { key = GetTextElement(node, "Keyfile"); // password should be empty if we're using a key file - pass = wxString(); + pass.clear(); - server.SetKeyFile(key); + server.credentials.keyFile_ = key; } - if (!server.SetUser(user, pass)) - return false; + server.SetUser(user); + server.credentials.SetPass(pass); - if ((long)ACCOUNT == logonType) { - wxString account = GetTextElement(node, "Account"); - if (account.empty()) - return false; - if (!server.SetAccount(account)) - return false; - } + server.credentials.account_ = GetTextElement(node, "Account"); } int timezoneOffset = GetTextElementInt(node, "TimezoneOffset"); - if (!server.SetTimezoneOffset(timezoneOffset)) + if (!server.server.SetTimezoneOffset(timezoneOffset)) { return false; + } wxString pasvMode = GetTextElement(node, "PasvMode"); - if (pasvMode == _T("MODE_PASSIVE")) - server.SetPasvMode(MODE_PASSIVE); - else if (pasvMode == _T("MODE_ACTIVE")) - server.SetPasvMode(MODE_ACTIVE); - else - server.SetPasvMode(MODE_DEFAULT); + if (pasvMode == _T("MODE_PASSIVE")) { + server.server.SetPasvMode(MODE_PASSIVE); + } + else if (pasvMode == _T("MODE_ACTIVE")) { + server.server.SetPasvMode(MODE_ACTIVE); + } + else { + server.server.SetPasvMode(MODE_DEFAULT); + } int maximumMultipleConnections = GetTextElementInt(node, "MaximumMultipleConnections"); - server.MaximumMultipleConnections(maximumMultipleConnections); + server.server.MaximumMultipleConnections(maximumMultipleConnections); wxString encodingType = GetTextElement(node, "EncodingType"); - if (encodingType == _T("Auto")) - server.SetEncodingType(ENCODING_AUTO); - else if (encodingType == _T("UTF-8")) - server.SetEncodingType(ENCODING_UTF8); + if (encodingType == _T("Auto")) { + server.server.SetEncodingType(ENCODING_AUTO); + } + else if (encodingType == _T("UTF-8")) { + server.server.SetEncodingType(ENCODING_UTF8); + } else if (encodingType == _T("Custom")) { - wxString customEncoding = GetTextElement(node, "CustomEncoding"); - if (customEncoding.empty()) + std::wstring customEncoding = GetTextElement(node, "CustomEncoding"); + if (customEncoding.empty()) { return false; - if (!server.SetEncodingType(ENCODING_CUSTOM, customEncoding)) + } + if (!server.server.SetEncodingType(ENCODING_CUSTOM, customEncoding)) { return false; + } + } + else { + server.server.SetEncodingType(ENCODING_AUTO); } - else - server.SetEncodingType(ENCODING_AUTO); - if (CServer::SupportsPostLoginCommands(server.GetProtocol())) { - std::vector postLoginCommands; + if (CServer::ProtocolHasFeature(server.server.GetProtocol(), ProtocolFeature::PostLoginCommands)) { + std::vector postLoginCommands; auto element = node.child("PostLoginCommands"); if (element) { for (auto commandElement = element.child("Command"); commandElement; commandElement = commandElement.next_sibling("Command")) { - wxString command = ConvLocal(commandElement.child_value()); + std::wstring command = fz::to_wstring_from_utf8(commandElement.child_value()); if (!command.empty()) { - postLoginCommands.push_back(command); + postLoginCommands.emplace_back(std::move(command)); } } } - if (!server.SetPostLoginCommands(postLoginCommands)) + if (!server.server.SetPostLoginCommands(postLoginCommands)) { return false; + } } - server.SetBypassProxy(GetTextElementInt(node, "BypassProxy", false) == 1); - server.SetName(GetTextElement_Trimmed(node, "Name")); + server.server.SetBypassProxy(GetTextElementInt(node, "BypassProxy", false) == 1); + server.server.SetName(GetTextElement_Trimmed(node, "Name")); - if (server.GetName().empty()) - server.SetName(GetTextElement_Trimmed(node)); + if (server.server.GetName().empty()) { + server.server.SetName(GetTextElement_Trimmed(node)); + } return true; } -void SetServer(pugi::xml_node node, const CServer& server) +void SetServer(pugi::xml_node node, ServerWithCredentials const& server) { - if (!node) + if (!node) { return; - - bool kiosk_mode = COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0; + } for (auto child = node.first_child(); child; child = node.first_child()) { node.remove_child(child); } - AddTextElement(node, "Host", server.GetHost()); - AddTextElement(node, "Port", server.GetPort()); - AddTextElement(node, "Protocol", server.GetProtocol()); - AddTextElement(node, "Type", server.GetType()); - - enum LogonType logonType = server.GetLogonType(); - - if (server.GetLogonType() != ANONYMOUS) { - AddTextElement(node, "User", server.GetUser()); - - if (server.GetLogonType() == NORMAL || server.GetLogonType() == ACCOUNT) { - if (kiosk_mode) - logonType = ASK; - else { - wxString pass = server.GetPass(); - auto const& buf = pass.utf8_str(); // wxWidgets has such an ugly string API.... - std::string utf8(buf.data(), buf.length()); + AddTextElement(node, "Host", server.server.GetHost()); + AddTextElement(node, "Port", server.server.GetPort()); + AddTextElement(node, "Protocol", server.server.GetProtocol()); + AddTextElement(node, "Type", server.server.GetType()); + + ProtectedCredentials credentials = server.credentials; + + if (credentials.logonType_ != LogonType::anonymous) { + AddTextElement(node, "User", server.server.GetUser()); - wxString base64 = wxBase64Encode(utf8.c_str(), utf8.size()); - pugi::xml_node passElement = AddTextElement(node, "Pass", base64); + credentials.Protect(); + + if (credentials.logonType_ == LogonType::normal || credentials.logonType_ == LogonType::account) { + std::string pass = fz::to_utf8(credentials.GetPass()); + + if (credentials.encrypted_) { + pugi::xml_node passElement = AddTextElementUtf8(node, "Pass", pass); + if (passElement) { + SetTextAttribute(passElement, "encoding", _T("crypt")); + SetTextAttributeUtf8(passElement, "pubkey", credentials.encrypted_.to_base64()); + } + } + else { + pugi::xml_node passElement = AddTextElementUtf8(node, "Pass", fz::base64_encode(pass)); if (passElement) { SetTextAttribute(passElement, "encoding", _T("base64")); } + } - if (server.GetLogonType() == ACCOUNT) - AddTextElement(node, "Account", server.GetAccount()); + if (credentials.logonType_ == LogonType::account) { + AddTextElement(node, "Account", credentials.account_); } } - else if (server.GetLogonType() == KEY) - { - AddTextElement(node, "Keyfile", server.GetKeyFile()); + else if (!credentials.keyFile_.empty()) { + AddTextElement(node, "Keyfile", credentials.keyFile_); } } - AddTextElement(node, "Logontype", logonType); + AddTextElement(node, "Logontype", static_cast(credentials.logonType_)); - AddTextElement(node, "TimezoneOffset", server.GetTimezoneOffset()); - switch (server.GetPasvMode()) + AddTextElement(node, "TimezoneOffset", server.server.GetTimezoneOffset()); + switch (server.server.GetPasvMode()) { case MODE_PASSIVE: - AddTextElementRaw(node, "PasvMode", "MODE_PASSIVE"); + AddTextElementUtf8(node, "PasvMode", "MODE_PASSIVE"); break; case MODE_ACTIVE: - AddTextElementRaw(node, "PasvMode", "MODE_ACTIVE"); + AddTextElementUtf8(node, "PasvMode", "MODE_ACTIVE"); break; default: - AddTextElementRaw(node, "PasvMode", "MODE_DEFAULT"); + AddTextElementUtf8(node, "PasvMode", "MODE_DEFAULT"); break; } - AddTextElement(node, "MaximumMultipleConnections", server.MaximumMultipleConnections()); + AddTextElement(node, "MaximumMultipleConnections", server.server.MaximumMultipleConnections()); - switch (server.GetEncodingType()) + switch (server.server.GetEncodingType()) { case ENCODING_AUTO: - AddTextElementRaw(node, "EncodingType", "Auto"); + AddTextElementUtf8(node, "EncodingType", "Auto"); break; case ENCODING_UTF8: - AddTextElementRaw(node, "EncodingType", "UTF-8"); + AddTextElementUtf8(node, "EncodingType", "UTF-8"); break; case ENCODING_CUSTOM: - AddTextElementRaw(node, "EncodingType", "Custom"); - AddTextElement(node, "CustomEncoding", server.GetCustomEncoding()); + AddTextElementUtf8(node, "EncodingType", "Custom"); + AddTextElement(node, "CustomEncoding", server.server.GetCustomEncoding()); break; } - if (CServer::SupportsPostLoginCommands(server.GetProtocol())) { - std::vector const& postLoginCommands = server.GetPostLoginCommands(); + if (CServer::ProtocolHasFeature(server.server.GetProtocol(), ProtocolFeature::PostLoginCommands)) { + std::vector const& postLoginCommands = server.server.GetPostLoginCommands(); if (!postLoginCommands.empty()) { auto element = node.append_child("PostLoginCommands"); - for (std::vector::const_iterator iter = postLoginCommands.begin(); iter != postLoginCommands.end(); ++iter) { - AddTextElement(element, "Command", *iter); - } + for (auto const& command : postLoginCommands) { + AddTextElement(element, "Command", command); + } } } - AddTextElementRaw(node, "BypassProxy", server.GetBypassProxy() ? "1" : "0"); - const wxString& name = server.GetName(); - if (!name.empty()) + AddTextElementUtf8(node, "BypassProxy", server.server.GetBypassProxy() ? "1" : "0"); + std::wstring const& name = server.server.GetName(); + if (!name.empty()) { AddTextElement(node, "Name", name); -} - -void SetTextAttribute(pugi::xml_node node, const char* name, const wxString& value) -{ - wxASSERT(node); - - wxScopedCharBuffer utf8 = value.utf8_str(); - if (!utf8) - return; - - auto attribute = node.attribute(name); - if (!attribute) { - attribute = node.append_attribute(name); - } - attribute.set_value(utf8); -} - -wxString GetTextAttribute(pugi::xml_node node, const char* name) -{ - wxASSERT(node); - - const char* value = node.attribute(name).value(); - return ConvLocal(value); -} - -pugi::xml_node FindElementWithAttribute(pugi::xml_node node, const char* element, const char* attribute, const char* value) -{ - pugi::xml_node child = element ? node.child(element) : node.first_child(); - while (child) { - const char* nodeVal = child.attribute(attribute).value(); - if (nodeVal && !strcmp(value, nodeVal)) - return child; - - child = element ? child.next_sibling(element) : child.next_sibling(); - } - - return child; -} - -int GetAttributeInt(pugi::xml_node node, const char* name) -{ - return node.attribute(name).as_int(); -} - -void SetAttributeInt(pugi::xml_node node, const char* name, int value) -{ - auto attribute = node.attribute(name); - if (!attribute) { - attribute = node.append_attribute(name); } - attribute.set_value(value); } namespace { @@ -666,8 +555,9 @@ size_t CXmlFile::GetRawDataLength() { - if (!m_document) + if (!m_document) { return 0; + } xml_memory_writer writer; m_document.save(writer); @@ -689,7 +579,7 @@ { Close(); m_document.load_string(data); - m_element = m_document.child(m_rootName.mb_str()); + m_element = m_document.child(m_rootName.c_str()); if (!m_element) { Close(); } @@ -701,6 +591,6 @@ if (!m_element) { return false; } - wxString const version = GetTextAttribute(m_element, "version"); + std::wstring const version = GetTextAttribute(m_element, "version"); return CBuildInfo::ConvertToVersionNumber(CBuildInfo::GetVersion().c_str()) < CBuildInfo::ConvertToVersionNumber(version.c_str()); } diff -Nru filezilla-3.15.0.2/src/interface/xmlfunctions.h filezilla-3.33.0/src/interface/xmlfunctions.h --- filezilla-3.15.0.2/src/interface/xmlfunctions.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/xmlfunctions.h 2018-01-05 15:02:30.000000000 +0000 @@ -3,8 +3,8 @@ * improve usability together with wxWidgets. */ -#ifndef __XMLFUNCTIONS_H__ -#define __XMLFUNCTIONS_H__ +#ifndef FILEZILLA_INTERFACE_XMLFUNCTIONS_HEADER +#define FILEZILLA_INTERFACE_XMLFUNCTIONS_HEADER #ifdef HAVE_LIBPUGIXML #include @@ -12,28 +12,29 @@ #include "../pugixml/pugixml.hpp" #endif +#include "xmlutils.h" +#include "serverdata.h" + class CXmlFile final { public: CXmlFile() = default; - explicit CXmlFile(const wxString& fileName, wxString const& root = wxString()); - - ~CXmlFile(); + explicit CXmlFile(std::wstring const& fileName, std::string const& root = std::string()); CXmlFile(CXmlFile const&) = delete; CXmlFile& operator=(CXmlFile const&) = delete; pugi::xml_node CreateEmpty(); - wxString GetFileName() const { return m_fileName; } - void SetFileName(const wxString& name); + std::wstring GetFileName() const { return m_fileName; } + void SetFileName(std::wstring const& name); bool HasFileName() const { return !m_fileName.empty(); } // Sets error description on failure - pugi::xml_node Load(); + pugi::xml_node Load(bool overwriteInvalid = false); - wxString GetError() const { return m_error; } + std::wstring GetError() const { return m_error; } size_t GetRawDataLength(); void GetRawDataHere(char* p, size_t size); // p has to big enough to hold at least GetRawDataLength() bytes @@ -50,11 +51,11 @@ bool IsFromFutureVersion() const; protected: - wxString GetRedirectedName() const; + std::wstring GetRedirectedName() const; // Opens the specified XML file if it exists or creates a new one otherwise. // Returns 0 on error. - bool GetXmlFile(wxString const& file); + bool GetXmlFile(std::wstring const& file); // Sets version and platform in root element void UpdateMetadata(); @@ -63,51 +64,18 @@ bool SaveXmlFile(); fz::datetime m_modificationTime; - wxString m_fileName; + std::wstring m_fileName; pugi::xml_document m_document; pugi::xml_node m_element; - wxString m_error; + std::wstring m_error; - wxString m_rootName{_T("FileZilla3")}; + std::string m_rootName{"FileZilla3"}; }; -// Convert the given utf-8 string into wxString -wxString ConvLocal(const char *value); - -void SetTextAttribute(pugi::xml_node node, const char* name, const wxString& value); -wxString GetTextAttribute(pugi::xml_node node, const char* name); - -int GetAttributeInt(pugi::xml_node node, const char* name); -void SetAttributeInt(pugi::xml_node node, const char* name, int value); - -pugi::xml_node FindElementWithAttribute(pugi::xml_node node, const char* element, const char* attribute, const char* value); - -// Add a new child element with the specified name and value to the xml document -pugi::xml_node AddTextElement(pugi::xml_node node, const char* name, const wxString& value, bool overwrite = false); -void AddTextElement(pugi::xml_node node, const char* name, int64_t value, bool overwrite = false); -pugi::xml_node AddTextElementRaw(pugi::xml_node node, const char* name, const char* value, bool overwrite = false); - -// Set the current element's text value -void AddTextElement(pugi::xml_node node, const wxString& value); -void AddTextElement(pugi::xml_node node, int64_t value); -void AddTextElementRaw(pugi::xml_node node, const char* value); - -// Get string from named child element -wxString GetTextElement(pugi::xml_node node, const char* name); -wxString GetTextElement_Trimmed(pugi::xml_node node, const char* name); - -// Get string from current element -wxString GetTextElement(pugi::xml_node node); -wxString GetTextElement_Trimmed(pugi::xml_node node); - -// Get (64-bit) integer from named element -int64_t GetTextElementInt(pugi::xml_node node, const char* name, int defValue = 0); - -bool GetTextElementBool(pugi::xml_node node, const char* name, bool defValue = false); - // Functions to save and retrieve CServer objects to the XML file -void SetServer(pugi::xml_node node, const CServer& server); -bool GetServer(pugi::xml_node node, CServer& server); +void SetServer(pugi::xml_node node, ServerWithCredentials const& server); + +bool GetServer(pugi::xml_node node, ServerWithCredentials& server); -#endif //__XMLFUNCTIONS_H__ +#endif diff -Nru filezilla-3.15.0.2/src/interface/xrc_helper.cpp filezilla-3.33.0/src/interface/xrc_helper.cpp --- filezilla-3.15.0.2/src/interface/xrc_helper.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/interface/xrc_helper.cpp 2016-11-30 22:33:40.000000000 +0000 @@ -0,0 +1,58 @@ +#include "filezilla.h" + +#include "xrc_helper.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "xh_text_ex.h" +#include +#include + +void InitHandlers(wxXmlResource& res) +{ + res.AddHandler(new wxMenuXmlHandler); + res.AddHandler(new wxMenuBarXmlHandler); + res.AddHandler(new wxDialogXmlHandler); + res.AddHandler(new wxPanelXmlHandler); + res.AddHandler(new wxSizerXmlHandler); + res.AddHandler(new wxButtonXmlHandler); + res.AddHandler(new wxBitmapButtonXmlHandler); + res.AddHandler(new wxStaticTextXmlHandler); + res.AddHandler(new wxStaticBoxXmlHandler); + res.AddHandler(new wxStaticBitmapXmlHandler); + res.AddHandler(new wxTreeCtrlXmlHandler); + res.AddHandler(new wxListCtrlXmlHandler); + res.AddHandler(new wxCheckListBoxXmlHandler); + res.AddHandler(new wxChoiceXmlHandler); + res.AddHandler(new wxGaugeXmlHandler); + res.AddHandler(new wxCheckBoxXmlHandler); + res.AddHandler(new wxSpinCtrlXmlHandler); + res.AddHandler(new wxRadioButtonXmlHandler); + res.AddHandler(new wxNotebookXmlHandler); + res.AddHandler(new wxTextCtrlXmlHandlerEx); + res.AddHandler(new wxListBoxXmlHandler); + res.AddHandler(new wxStaticLineXmlHandler); + res.AddHandler(new wxScrolledWindowXmlHandler); + res.AddHandler(new wxHyperlinkCtrlXmlHandler); + res.AddHandler(new wxAnimationCtrlXmlHandler); + res.AddHandler(new wxStdDialogButtonSizerXmlHandler); +} diff -Nru filezilla-3.15.0.2/src/interface/xrc_helper.h filezilla-3.33.0/src/interface/xrc_helper.h --- filezilla-3.15.0.2/src/interface/xrc_helper.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/interface/xrc_helper.h 2016-04-20 17:21:15.000000000 +0000 @@ -61,4 +61,6 @@ } } +void InitHandlers(wxXmlResource& res); + #endif \ No newline at end of file diff -Nru filezilla-3.15.0.2/src/Makefile.am filezilla-3.33.0/src/Makefile.am --- filezilla-3.15.0.2/src/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/Makefile.am 2017-09-19 21:36:39.000000000 +0000 @@ -11,8 +11,12 @@ MAYBE_DBUS = dbus endif -SUBDIRS = include engine $(MAYBE_PUGIXML) $(MAYBE_DBUS) interface putty $(MAYBE_FZSHELLEXT) . -DIST_SUBDIRS = include engine pugixml dbus interface putty fzshellext/64 . +if ENABLE_STORJ + MAYBE_STORJ = storj +endif + +SUBDIRS = include engine $(MAYBE_PUGIXML) $(MAYBE_DBUS) interface putty $(MAYBE_STORJ) $(MAYBE_FZSHELLEXT) . +DIST_SUBDIRS = include engine pugixml dbus interface putty storj fzshellext/64 . dist_noinst_DATA = FileZilla.sln Dependencies.props.example diff -Nru filezilla-3.15.0.2/src/Makefile.in filezilla-3.33.0/src/Makefile.in --- filezilla-3.15.0.2/src/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/Makefile.in 2018-05-07 08:45:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,16 +89,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_noinst_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -100,6 +111,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -159,6 +172,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -195,11 +209,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -223,6 +237,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -243,16 +259,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -304,6 +328,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -343,6 +368,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -357,8 +383,9 @@ @MINGW_TRUE@MAYBE_FZSHELLEXT = fzshellext/32 fzshellext/64 @HAVE_LIBPUGIXML_FALSE@MAYBE_PUGIXML = pugixml @HAVE_DBUS_TRUE@MAYBE_DBUS = dbus -SUBDIRS = include engine $(MAYBE_PUGIXML) $(MAYBE_DBUS) interface putty $(MAYBE_FZSHELLEXT) . -DIST_SUBDIRS = include engine pugixml dbus interface putty fzshellext/64 . +@ENABLE_STORJ_TRUE@MAYBE_STORJ = storj +SUBDIRS = include engine $(MAYBE_PUGIXML) $(MAYBE_DBUS) interface putty $(MAYBE_STORJ) $(MAYBE_FZSHELLEXT) . +DIST_SUBDIRS = include engine pugixml dbus interface putty storj fzshellext/64 . dist_noinst_DATA = FileZilla.sln Dependencies.props.example all: all-recursive @@ -375,7 +402,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -674,6 +700,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + dist-hook: mkdir -p $(distdir)/fzshellext/32 diff -Nru filezilla-3.15.0.2/src/pugixml/Makefile.in filezilla-3.33.0/src/pugixml/Makefile.in --- filezilla-3.15.0.2/src/pugixml/Makefile.in 2016-02-10 19:38:51.000000000 +0000 +++ filezilla-3.33.0/src/pugixml/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,17 +91,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/pugixml -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(dist_noinst_DATA) \ - $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -103,6 +113,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(noinst_HEADERS) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -183,6 +195,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -194,11 +207,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -222,6 +235,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -242,16 +257,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -303,6 +326,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -342,6 +366,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -373,7 +398,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pugixml/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/pugixml/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -638,6 +662,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru filezilla-3.15.0.2/src/pugixml/pugiconfig.hpp filezilla-3.33.0/src/pugixml/pugiconfig.hpp --- filezilla-3.15.0.2/src/pugixml/pugiconfig.hpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/pugixml/pugiconfig.hpp 2017-02-19 04:30:03.000000000 +0000 @@ -1,7 +1,7 @@ /** - * pugixml parser - version 1.7 + * pugixml parser - version 1.8 * -------------------------------------------------------- - * Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) + * Copyright (C) 2006-2016, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at http://pugixml.org/ * * This library is distributed under the MIT License. See notice at the end @@ -49,7 +49,7 @@ #endif /** - * Copyright (c) 2006-2015 Arseny Kapoulkine + * Copyright (c) 2006-2016 Arseny Kapoulkine * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -62,7 +62,7 @@ * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND diff -Nru filezilla-3.15.0.2/src/pugixml/pugixml.cpp filezilla-3.33.0/src/pugixml/pugixml.cpp --- filezilla-3.15.0.2/src/pugixml/pugixml.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/pugixml/pugixml.cpp 2017-02-19 04:30:03.000000000 +0000 @@ -1,7 +1,7 @@ /** - * pugixml parser - version 1.7 + * pugixml parser - version 1.8 * -------------------------------------------------------- - * Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) + * Copyright (C) 2006-2016, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at http://pugixml.org/ * * This library is distributed under the MIT License. See notice at the end @@ -54,7 +54,7 @@ #endif #ifdef __INTEL_COMPILER -# pragma warning(disable: 177) // function was declared but never referenced +# pragma warning(disable: 177) // function was declared but never referenced # pragma warning(disable: 279) // controlling expression is constant # pragma warning(disable: 1478 1786) // function was declared "deprecated" # pragma warning(disable: 1684) // conversion from pointer to same-sized integral type @@ -82,7 +82,7 @@ #elif defined(__GNUC__) # define PUGI__NO_INLINE __attribute__((noinline)) #else -# define PUGI__NO_INLINE +# define PUGI__NO_INLINE #endif // Branch weight controls @@ -109,6 +109,13 @@ using std::memset; #endif +// Some MinGW versions have headers that erroneously omit LLONG_MIN/LLONG_MAX/ULLONG_MAX definitions in strict ANSI mode +#if defined(PUGIXML_HAS_LONG_LONG) && defined(__MINGW32__) && defined(__STRICT_ANSI__) && !defined(LLONG_MAX) && !defined(LLONG_MIN) && !defined(ULLONG_MAX) +# define LLONG_MAX 9223372036854775807LL +# define LLONG_MIN (-LLONG_MAX-1) +# define ULLONG_MAX (2ULL*LLONG_MAX+1) +#endif + // In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features #if defined(_MSC_VER) && !defined(__S3E__) # define PUGI__MSVC_CRT_VERSION _MSC_VER @@ -132,9 +139,7 @@ #endif // uintptr_t -#if !defined(_MSC_VER) || _MSC_VER >= 1600 -# include -#else +#if (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(__BORLANDC__) && __BORLANDC__ < 0x561) namespace pugi { # ifndef _UINTPTR_T_DEFINED @@ -145,6 +150,8 @@ typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; } +#else +# include #endif // Memory allocation @@ -206,7 +213,7 @@ for (size_t i = 0; i < count; ++i) if (lhs[i] != rhs[i]) return false; - + return lhs[count] == 0; } @@ -227,8 +234,10 @@ // auto_ptr-like object for exception recovery PUGI__NS_BEGIN - template struct auto_deleter + template struct auto_deleter { + typedef void (*D)(T*); + T* data; D deleter; @@ -293,7 +302,7 @@ bucket = (bucket + probe + 1) & hashmod; } - assert(!"Hash table is full"); + assert(false && "Hash table is full"); return 0; } @@ -323,7 +332,7 @@ bucket = (bucket + probe + 1) & hashmod; } - assert(!"Hash table is full"); + assert(false && "Hash table is full"); return 0; } @@ -394,43 +403,33 @@ #endif PUGI__NS_BEGIN - static const size_t xml_memory_page_size = - #ifdef PUGIXML_MEMORY_PAGE_SIZE - PUGIXML_MEMORY_PAGE_SIZE - #else - 32768 - #endif - ; - #ifdef PUGIXML_COMPACT static const uintptr_t xml_memory_block_alignment = 4; - - static const uintptr_t xml_memory_page_alignment = sizeof(void*); #else static const uintptr_t xml_memory_block_alignment = sizeof(void*); - - static const uintptr_t xml_memory_page_alignment = 64; - static const uintptr_t xml_memory_page_pointer_mask = ~(xml_memory_page_alignment - 1); #endif // extra metadata bits - static const uintptr_t xml_memory_page_contents_shared_mask = 32; - static const uintptr_t xml_memory_page_name_allocated_mask = 16; - static const uintptr_t xml_memory_page_value_allocated_mask = 8; - static const uintptr_t xml_memory_page_type_mask = 7; + static const uintptr_t xml_memory_page_contents_shared_mask = 64; + static const uintptr_t xml_memory_page_name_allocated_mask = 32; + static const uintptr_t xml_memory_page_value_allocated_mask = 16; + static const uintptr_t xml_memory_page_type_mask = 15; // combined masks for string uniqueness static const uintptr_t xml_memory_page_name_allocated_or_shared_mask = xml_memory_page_name_allocated_mask | xml_memory_page_contents_shared_mask; static const uintptr_t xml_memory_page_value_allocated_or_shared_mask = xml_memory_page_value_allocated_mask | xml_memory_page_contents_shared_mask; #ifdef PUGIXML_COMPACT + #define PUGI__GETHEADER_IMPL(object, page, flags) // unused #define PUGI__GETPAGE_IMPL(header) (header).get_page() #else - #define PUGI__GETPAGE_IMPL(header) reinterpret_cast((header) & impl::xml_memory_page_pointer_mask) + #define PUGI__GETHEADER_IMPL(object, page, flags) (((reinterpret_cast(object) - reinterpret_cast(page)) << 8) | (flags)) + // this macro casts pointers through void* to avoid 'cast increases required alignment of target type' warnings + #define PUGI__GETPAGE_IMPL(header) static_cast(const_cast(static_cast(reinterpret_cast(&header) - (header >> 8)))) #endif #define PUGI__GETPAGE(n) PUGI__GETPAGE_IMPL((n)->header) - #define PUGI__NODETYPE(n) static_cast(((n)->header & impl::xml_memory_page_type_mask) + 1) + #define PUGI__NODETYPE(n) static_cast((n)->header & impl::xml_memory_page_type_mask) struct xml_allocator; @@ -470,6 +469,14 @@ #endif }; + static const size_t xml_memory_page_size = + #ifdef PUGIXML_MEMORY_PAGE_SIZE + (PUGIXML_MEMORY_PAGE_SIZE) + #else + 32768 + #endif + - sizeof(xml_memory_page); + struct xml_memory_string_header { uint16_t page_offset; // offset from page->data @@ -490,30 +497,21 @@ size_t size = sizeof(xml_memory_page) + data_size; // allocate block with some alignment, leaving memory for worst-case padding - void* memory = xml_memory::allocate(size + xml_memory_page_alignment); + void* memory = xml_memory::allocate(size); if (!memory) return 0; - // align to next page boundary (note: this guarantees at least 1 usable byte before the page) - char* page_memory = reinterpret_cast((reinterpret_cast(memory) + xml_memory_page_alignment) & ~(xml_memory_page_alignment - 1)); - // prepare page structure - xml_memory_page* page = xml_memory_page::construct(page_memory); + xml_memory_page* page = xml_memory_page::construct(memory); assert(page); page->allocator = _root->allocator; - // record the offset for freeing the memory block - assert(page_memory > memory && page_memory - static_cast(memory) <= 127); - page_memory[-1] = static_cast(page_memory - static_cast(memory)); - return page; } static void deallocate_page(xml_memory_page* page) { - char* page_memory = reinterpret_cast(page); - - xml_memory::deallocate(page_memory - page_memory[-1]); + xml_memory::deallocate(page); } void* allocate_memory_oob(size_t size, xml_memory_page*& out_page); @@ -622,7 +620,7 @@ // allocate memory for string and header block size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t); - + // round size up to block alignment boundary size_t full_size = (size + (xml_memory_block_alignment - 1)) & ~(xml_memory_block_alignment - 1); @@ -1046,7 +1044,7 @@ struct xml_node_struct { - xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type - 1), namevalue_base(0) + xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type), namevalue_base(0) { PUGI__STATIC_ASSERT(sizeof(xml_node_struct) == 12); } @@ -1073,8 +1071,9 @@ { struct xml_attribute_struct { - xml_attribute_struct(impl::xml_memory_page* page): header(reinterpret_cast(page)), name(0), value(0), prev_attribute_c(0), next_attribute(0) + xml_attribute_struct(impl::xml_memory_page* page): name(0), value(0), prev_attribute_c(0), next_attribute(0) { + header = PUGI__GETHEADER_IMPL(this, page, 0); } uintptr_t header; @@ -1088,8 +1087,9 @@ struct xml_node_struct { - xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(reinterpret_cast(page) | (type - 1)), name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0) + xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0) { + header = PUGI__GETHEADER_IMPL(this, page, type); } uintptr_t header; @@ -1120,9 +1120,6 @@ { xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(0), extra_buffers(0) { - #ifdef PUGIXML_COMPACT - _hash = &hash; - #endif } const char_t* buffer; @@ -1847,7 +1844,7 @@ ctx_digit = 8, // 0-9 ctx_symbol = 16 // Any symbol > 127, a-z, A-Z, 0-9, _, -, . }; - + static const unsigned char chartypex_table[256] = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 2, 3, 3, 2, 3, 3, // 0-15 @@ -1869,7 +1866,7 @@ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20 }; - + #ifdef PUGIXML_WCHAR_MODE #define PUGI__IS_CHARTYPE_IMPL(c, ct, table) ((static_cast(c) < 128 ? table[static_cast(c)] : table[128]) & (ct)) #else @@ -1892,12 +1889,71 @@ if (sizeof(wchar_t) == 2) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be; - else + else return is_little_endian() ? encoding_utf32_le : encoding_utf32_be; } - PUGI__FN xml_encoding guess_buffer_encoding(uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3) + PUGI__FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length) { + #define PUGI__SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; } + #define PUGI__SCANCHARTYPE(ct) { while (offset < size && PUGI__IS_CHARTYPE(data[offset], ct)) offset++; } + + // check if we have a non-empty XML declaration + if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI__IS_CHARTYPE(data[5], ct_space))) + return false; + + // scan XML declaration until the encoding field + for (size_t i = 6; i + 1 < size; ++i) + { + // declaration can not contain ? in quoted values + if (data[i] == '?') + return false; + + if (data[i] == 'e' && data[i + 1] == 'n') + { + size_t offset = i; + + // encoding follows the version field which can't contain 'en' so this has to be the encoding if XML is well formed + PUGI__SCANCHAR('e'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('c'); PUGI__SCANCHAR('o'); + PUGI__SCANCHAR('d'); PUGI__SCANCHAR('i'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('g'); + + // S? = S? + PUGI__SCANCHARTYPE(ct_space); + PUGI__SCANCHAR('='); + PUGI__SCANCHARTYPE(ct_space); + + // the only two valid delimiters are ' and " + uint8_t delimiter = (offset < size && data[offset] == '"') ? '"' : '\''; + + PUGI__SCANCHAR(delimiter); + + size_t start = offset; + + out_encoding = data + offset; + + PUGI__SCANCHARTYPE(ct_symbol); + + out_length = offset - start; + + PUGI__SCANCHAR(delimiter); + + return true; + } + } + + return false; + + #undef PUGI__SCANCHAR + #undef PUGI__SCANCHARTYPE + } + + PUGI__FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size) + { + // skip encoding autodetection if input buffer is too small + if (size < 4) return encoding_utf8; + + uint8_t d0 = data[0], d1 = data[1], d2 = data[2], d3 = data[3]; + // look for BOM in first few bytes if (d0 == 0 && d1 == 0 && d2 == 0xfe && d3 == 0xff) return encoding_utf32_be; if (d0 == 0xff && d1 == 0xfe && d2 == 0 && d3 == 0) return encoding_utf32_le; @@ -1910,13 +1966,32 @@ if (d0 == 0x3c && d1 == 0 && d2 == 0 && d3 == 0) return encoding_utf32_le; if (d0 == 0 && d1 == 0x3c && d2 == 0 && d3 == 0x3f) return encoding_utf16_be; if (d0 == 0x3c && d1 == 0 && d2 == 0x3f && d3 == 0) return encoding_utf16_le; - if (d0 == 0x3c && d1 == 0x3f && d2 == 0x78 && d3 == 0x6d) return encoding_utf8; // look for utf16 < followed by node name (this may fail, but is better than utf8 since it's zero terminated so early) if (d0 == 0 && d1 == 0x3c) return encoding_utf16_be; if (d0 == 0x3c && d1 == 0) return encoding_utf16_le; - // no known BOM detected, assume utf8 + // no known BOM detected; parse declaration + const uint8_t* enc = 0; + size_t enc_length = 0; + + if (d0 == 0x3c && d1 == 0x3f && d2 == 0x78 && d3 == 0x6d && parse_declaration_encoding(data, size, enc, enc_length)) + { + // iso-8859-1 (case-insensitive) + if (enc_length == 10 + && (enc[0] | ' ') == 'i' && (enc[1] | ' ') == 's' && (enc[2] | ' ') == 'o' + && enc[3] == '-' && enc[4] == '8' && enc[5] == '8' && enc[6] == '5' && enc[7] == '9' + && enc[8] == '-' && enc[9] == '1') + return encoding_latin1; + + // latin1 (case-insensitive) + if (enc_length == 6 + && (enc[0] | ' ') == 'l' && (enc[1] | ' ') == 'a' && (enc[2] | ' ') == 't' + && (enc[3] | ' ') == 'i' && (enc[4] | ' ') == 'n' + && enc[5] == '1') + return encoding_latin1; + } + return encoding_utf8; } @@ -1934,15 +2009,10 @@ // only do autodetection if no explicit encoding is requested if (encoding != encoding_auto) return encoding; - // skip encoding autodetection if input buffer is too small - if (size < 4) return encoding_utf8; - // try to guess encoding (based on XML specification, Appendix F.1) const uint8_t* data = static_cast(contents); - PUGI__DMC_VOLATILE uint8_t d0 = data[0], d1 = data[1], d2 = data[2], d3 = data[3]; - - return guess_buffer_encoding(d0, d1, d2, d3); + return guess_buffer_encoding(data, size); } PUGI__FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable) @@ -2075,7 +2145,7 @@ if (encoding == encoding_latin1) return convert_buffer_generic(out_buffer, out_length, contents, size, latin1_decoder()); - assert(!"Invalid encoding"); + assert(false && "Invalid encoding"); return false; } #else @@ -2180,7 +2250,7 @@ if (encoding == encoding_latin1) return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable); - assert(!"Invalid encoding"); + assert(false && "Invalid encoding"); return false; } #endif @@ -2196,12 +2266,12 @@ // convert to utf8 uint8_t* begin = reinterpret_cast(buffer); uint8_t* end = wchar_decoder::process(str, length, begin, utf8_writer()); - + assert(begin + size == end); (void)!end; (void)!size; } - + #ifndef PUGIXML_NO_STL PUGI__FN std::string as_utf8_impl(const wchar_t* str, size_t length) { @@ -2269,7 +2339,7 @@ xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator; if (header & header_mask) alloc->deallocate_string(dest); - + // mark the string as not allocated dest = 0; header &= ~header_mask; @@ -2281,7 +2351,7 @@ // we can reuse old buffer, so just copy the new data (including zero terminator) memcpy(dest, source, source_length * sizeof(char_t)); dest[source_length] = 0; - + return true; } else @@ -2300,7 +2370,7 @@ // deallocate old buffer (*after* the above to protect against overlapping memory and/or allocation failures) if (header & header_mask) alloc->deallocate_string(dest); - + // the string is now allocated, so set the flag dest = buf; header |= header_mask; @@ -2313,11 +2383,11 @@ { char_t* end; size_t size; - + gap(): end(0), size(0) { } - + // Push new gap, move s count bytes further (skipping the gap). // Collapse previous gap. void push(char_t*& s, size_t count) @@ -2328,14 +2398,14 @@ assert(s >= end); memmove(end - size, end, reinterpret_cast(s) - reinterpret_cast(end)); } - + s += count; // end of current gap - + // "merge" two gaps end = s; size += count; } - + // Collapse all gaps, return past-the-end pointer char_t* flush(char_t* s) { @@ -2350,7 +2420,7 @@ else return s; } }; - + PUGI__FN char_t* strconv_escape(char_t* s, gap& g) { char_t* stre = s + 1; @@ -2382,7 +2452,7 @@ ch = *++stre; } - + ++stre; } else // &#... (dec code) @@ -2402,7 +2472,7 @@ ch = *++stre; } - + ++stre; } @@ -2411,7 +2481,7 @@ #else s = reinterpret_cast(utf8_writer::any(reinterpret_cast(s), ucsc)); #endif - + g.push(s, stre - s); return stre; } @@ -2426,7 +2496,7 @@ { *s++ = '&'; ++stre; - + g.push(s, stre - s); return stre; } @@ -2451,7 +2521,7 @@ { *s++ = '>'; ++stre; - + g.push(s, stre - s); return stre; } @@ -2464,7 +2534,7 @@ { *s++ = '<'; ++stre; - + g.push(s, stre - s); return stre; } @@ -2477,7 +2547,7 @@ { *s++ = '"'; ++stre; - + g.push(s, stre - s); return stre; } @@ -2487,7 +2557,7 @@ default: break; } - + return stre; } @@ -2495,7 +2565,7 @@ #define PUGI__ENDSWITH(c, e) ((c) == (e) || ((c) == 0 && endch == (e))) #define PUGI__SKIPWS() { while (PUGI__IS_CHARTYPE(*s, ct_space)) ++s; } #define PUGI__OPTSET(OPT) ( optmsk & (OPT) ) - #define PUGI__PUSHNODE(TYPE) { cursor = append_new_node(cursor, alloc, TYPE); if (!cursor) PUGI__THROW_ERROR(status_out_of_memory, s); } + #define PUGI__PUSHNODE(TYPE) { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI__THROW_ERROR(status_out_of_memory, s); } #define PUGI__POPNODE() { cursor = cursor->parent; } #define PUGI__SCANFOR(X) { while (*s != 0 && !(X)) ++s; } #define PUGI__SCANWHILE(X) { while (X) ++s; } @@ -2507,21 +2577,21 @@ PUGI__FN char_t* strconv_comment(char_t* s, char_t endch) { gap g; - + while (true) { PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_comment)); - + if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair { *s++ = '\n'; // replace first one with 0x0a - + if (*s == '\n') g.push(s, 1); } else if (s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>')) // comment ends here { *g.flush(s) = 0; - + return s + (s[2] == '>' ? 3 : 2); } else if (*s == 0) @@ -2535,21 +2605,21 @@ PUGI__FN char_t* strconv_cdata(char_t* s, char_t endch) { gap g; - + while (true) { PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_cdata)); - + if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair { *s++ = '\n'; // replace first one with 0x0a - + if (*s == '\n') g.push(s, 1); } else if (s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>')) // CDATA ends here { *g.flush(s) = 0; - + return s + 1; } else if (*s == 0) @@ -2559,9 +2629,9 @@ else ++s; } } - + typedef char_t* (*strconv_pcdata_t)(char_t*); - + template struct strconv_pcdata_impl { static char_t* parse(char_t* s) @@ -2583,13 +2653,13 @@ --end; *end = 0; - + return s + 1; } else if (opt_eol::value && *s == '\r') // Either a single 0x0d or 0x0d 0x0a pair { *s++ = '\n'; // replace first one with 0x0a - + if (*s == '\n') g.push(s, 1); } else if (opt_escape::value && *s == '&') @@ -2612,7 +2682,7 @@ } } }; - + PUGI__FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask) { PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800); @@ -2632,7 +2702,7 @@ } typedef char_t* (*strconv_attribute_t)(char_t*, char_t); - + template struct strconv_attribute_impl { static char_t* parse_wnorm(char_t* s, char_t end_quote) @@ -2643,35 +2713,35 @@ if (PUGI__IS_CHARTYPE(*s, ct_space)) { char_t* str = s; - + do ++str; while (PUGI__IS_CHARTYPE(*str, ct_space)); - + g.push(s, str - s); } while (true) { PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space)); - + if (*s == end_quote) { char_t* str = g.flush(s); - + do *str-- = 0; while (PUGI__IS_CHARTYPE(*str, ct_space)); - + return s + 1; } else if (PUGI__IS_CHARTYPE(*s, ct_space)) { *s++ = ' '; - + if (PUGI__IS_CHARTYPE(*s, ct_space)) { char_t* str = s + 1; while (PUGI__IS_CHARTYPE(*str, ct_space)) ++str; - + g.push(s, str - s); } } @@ -2694,11 +2764,11 @@ while (true) { PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws)); - + if (*s == end_quote) { *g.flush(s) = 0; - + return s + 1; } else if (PUGI__IS_CHARTYPE(*s, ct_space)) @@ -2706,7 +2776,7 @@ if (*s == '\r') { *s++ = ' '; - + if (*s == '\n') g.push(s, 1); } else *s++ = ' '; @@ -2730,17 +2800,17 @@ while (true) { PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr)); - + if (*s == end_quote) { *g.flush(s) = 0; - + return s + 1; } else if (*s == '\r') { *s++ = '\n'; - + if (*s == '\n') g.push(s, 1); } else if (opt_escape::value && *s == '&') @@ -2762,11 +2832,11 @@ while (true) { PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr)); - + if (*s == end_quote) { *g.flush(s) = 0; - + return s + 1; } else if (opt_escape::value && *s == '&') @@ -2785,7 +2855,7 @@ PUGI__FN strconv_attribute_t get_strconv_attribute(unsigned int optmask) { PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80); - + switch ((optmask >> 4) & 15) // get bitmask for flags (wconv wnorm eol escapes) { case 0: return strconv_attribute_impl::parse_simple; @@ -2819,18 +2889,12 @@ struct xml_parser { - xml_allocator alloc; - xml_allocator* alloc_state; + xml_allocator* alloc; char_t* error_offset; xml_parse_status error_status; - - xml_parser(xml_allocator* alloc_): alloc(*alloc_), alloc_state(alloc_), error_offset(0), error_status(status_ok) - { - } - ~xml_parser() + xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(0), error_status(status_ok) { - *alloc_state = alloc; } // DOCTYPE consists of nested sections of the following possible types: @@ -3157,7 +3221,7 @@ { strconv_attribute_t strconv_attribute = get_strconv_attribute(optmsk); strconv_pcdata_t strconv_pcdata = get_strconv_pcdata(optmsk); - + char_t ch = 0; xml_node_struct* cursor = root; char_t* mark = s; @@ -3188,10 +3252,10 @@ while (true) { PUGI__SKIPWS(); // Eat any whitespace. - + if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // <... #... { - xml_attribute_struct* a = append_new_attribute(cursor, alloc); // Make space for this attribute. + xml_attribute_struct* a = append_new_attribute(cursor, *alloc); // Make space for this attribute. if (!a) PUGI__THROW_ERROR(status_out_of_memory, s); a->name = s; // Save the offset. @@ -3206,7 +3270,7 @@ ch = *s; ++s; } - + if (ch == '=') // '<... #=...' { PUGI__SKIPWS(); // Eat any whitespace. @@ -3218,7 +3282,7 @@ a->value = s; // Save the offset. s = strconv_attribute(s, ch); - + if (!s) PUGI__THROW_ERROR(status_bad_attribute, a->value); // After this line the loop continues from the start; @@ -3233,7 +3297,7 @@ else if (*s == '/') { ++s; - + if (*s == '>') { PUGI__POPNODE(); @@ -3274,7 +3338,7 @@ { // we stepped over null terminator, backtrack & handle closing tag --s; - + if (endch != '>') PUGI__THROW_ERROR(status_bad_start_element, s); } else PUGI__THROW_ERROR(status_bad_start_element, s); @@ -3283,20 +3347,22 @@ { ++s; + mark = s; + char_t* name = cursor->name; - if (!name) PUGI__THROW_ERROR(status_end_element_mismatch, s); - + if (!name) PUGI__THROW_ERROR(status_end_element_mismatch, mark); + while (PUGI__IS_CHARTYPE(*s, ct_symbol)) { - if (*s++ != *name++) PUGI__THROW_ERROR(status_end_element_mismatch, s); + if (*s++ != *name++) PUGI__THROW_ERROR(status_end_element_mismatch, mark); } if (*name) { if (*s == 0 && name[0] == endch && name[1] == 0) PUGI__THROW_ERROR(status_bad_end_element, s); - else PUGI__THROW_ERROR(status_end_element_mismatch, s); + else PUGI__THROW_ERROR(status_end_element_mismatch, mark); } - + PUGI__POPNODE(); // Pop. PUGI__SKIPWS(); @@ -3350,23 +3416,31 @@ if (!PUGI__OPTSET(parse_trim_pcdata)) s = mark; - + if (cursor->parent || PUGI__OPTSET(parse_fragment)) { - PUGI__PUSHNODE(node_pcdata); // Append a new node on the tree. - cursor->value = s; // Save the offset. + if (PUGI__OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value) + { + cursor->value = s; // Save the offset. + } + else + { + PUGI__PUSHNODE(node_pcdata); // Append a new node on the tree. + + cursor->value = s; // Save the offset. + + PUGI__POPNODE(); // Pop since this is a standalone. + } s = strconv_pcdata(s); - - PUGI__POPNODE(); // Pop since this is a standalone. - + if (!*s) break; } else { PUGI__SCANFOR(*s == '<'); // '...<' if (!*s) break; - + ++s; } @@ -3414,14 +3488,14 @@ // get last child of the root before parsing xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0; - + // create parser on stack xml_parser parser(static_cast(xmldoc)); // save last character and make buffer zero-terminated (speeds up parsing) char_t endch = buffer[length - 1]; buffer[length - 1] = 0; - + // skip BOM to make sure it does not end up as part of parse output char_t* buffer_data = parse_skip_bom(buffer); @@ -3511,7 +3585,7 @@ { if (length < 1) return 0; - // discard last character if it's the lead of a surrogate pair + // discard last character if it's the lead of a surrogate pair return (sizeof(wchar_t) == 2 && static_cast(static_cast(data[length - 1]) - 0xD800) < 0x400) ? length - 1 : length; } @@ -3524,7 +3598,7 @@ return length * sizeof(char_t); } - + // convert to utf8 if (encoding == encoding_utf8) return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), utf8_writer()); @@ -3549,7 +3623,7 @@ if (encoding == encoding_latin1) return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), latin1_writer()); - assert(!"Invalid encoding"); + assert(false && "Invalid encoding"); return 0; } #else @@ -3588,7 +3662,7 @@ if (encoding == encoding_latin1) return convert_buffer_output_generic(r_u8, data, length, utf8_decoder(), latin1_writer()); - assert(!"Invalid encoding"); + assert(false && "Invalid encoding"); return 0; } #endif @@ -3812,10 +3886,10 @@ while (*s) { const char_t* prev = s; - + // While *s is a usual symbol PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPEX(ss, type)); - + writer.write_buffer(prev, static_cast(s - prev)); switch (*s) @@ -4002,17 +4076,54 @@ if (node->first_attribute) node_output_attributes(writer, node, indent, indent_length, flags, depth); - if (!node->first_child) + // element nodes can have value if parse_embed_pcdata was used + if (!node->value) { - writer.write(' ', '/', '>'); + if (!node->first_child) + { + if (flags & format_no_empty_element_tags) + { + writer.write('>', '<', '/'); + writer.write_string(name); + writer.write('>'); - return false; + return false; + } + else + { + if ((flags & format_raw) == 0) + writer.write(' '); + + writer.write('/', '>'); + + return false; + } + } + else + { + writer.write('>'); + + return true; + } } else { writer.write('>'); - return true; + text_output(writer, node->value, ctx_special_pcdata, flags); + + if (!node->first_child) + { + writer.write('<', '/'); + writer.write_string(name); + writer.write('>'); + + return false; + } + else + { + return true; + } } } @@ -4078,7 +4189,7 @@ break; default: - assert(!"Invalid node type"); + assert(false && "Invalid node type"); } } @@ -4120,6 +4231,10 @@ if (node_output_start(writer, node, indent, indent_length, flags, depth)) { + // element nodes can have value if parse_embed_pcdata was used + if (node->value) + indent_flags = 0; + node = node->first_child; depth++; continue; @@ -4460,8 +4575,7 @@ } #endif - template - PUGI__FN char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative) + template PUGI__FN char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative) { char_t* result = end - 1; U rest = negative ? 0 - value : value; @@ -4498,22 +4612,12 @@ #endif } - template - PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, int value) - { - char_t buf[64]; - char_t* end = buf + sizeof(buf) / sizeof(buf[0]); - char_t* begin = integer_to_string(buf, end, value, value < 0); - - return strcpy_insitu(dest, header, header_mask, begin, end - begin); - } - - template - PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, unsigned int value) + template + PUGI__FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative) { char_t buf[64]; char_t* end = buf + sizeof(buf) / sizeof(buf[0]); - char_t* begin = integer_to_string(buf, end, value, false); + char_t* begin = integer_to_string(buf, end, value, negative); return strcpy_insitu(dest, header, header_mask, begin, end - begin); } @@ -4535,34 +4639,12 @@ return set_value_ascii(dest, header, header_mask, buf); } - - template - PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, bool value) - { - return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5); - } - -#ifdef PUGIXML_HAS_LONG_LONG - template - PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, long long value) - { - char_t buf[64]; - char_t* end = buf + sizeof(buf) / sizeof(buf[0]); - char_t* begin = integer_to_string(buf, end, value, value < 0); - - return strcpy_insitu(dest, header, header_mask, begin, end - begin); - } template - PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, unsigned long long value) + PUGI__FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value) { - char_t buf[64]; - char_t* end = buf + sizeof(buf) / sizeof(buf[0]); - char_t* begin = integer_to_string(buf, end, value, false); - - return strcpy_insitu(dest, header, header_mask, begin, end - begin); + return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5); } -#endif PUGI__FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer) { @@ -4624,7 +4706,7 @@ // check for I/O errors if (length < 0) return status_io_error; - + // check for overflow size_t result = static_cast(length); @@ -4637,7 +4719,7 @@ } // This function assumes that buffer has extra sizeof(char_t) writable bytes after size - PUGI__FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding) + PUGI__FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding) { // We only need to zero-terminate if encoding conversion does not do it for us #ifdef PUGIXML_WCHAR_MODE @@ -4669,7 +4751,7 @@ size_t size = 0; xml_parse_status size_status = get_file_size(file, size); if (size_status != status_ok) return make_parse_result(size_status); - + size_t max_suffix_size = sizeof(char_t); // allocate buffer for the whole file @@ -4690,6 +4772,11 @@ return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer); } + PUGI__FN void close_file(FILE* file) + { + fclose(file); + } + #ifndef PUGIXML_NO_STL template struct xml_stream_chunk { @@ -4697,7 +4784,7 @@ { void* memory = xml_memory::allocate(sizeof(xml_stream_chunk)); if (!memory) return 0; - + return new (memory) xml_stream_chunk(); } @@ -4807,7 +4894,7 @@ // return buffer size_t actual_length = static_cast(stream.gcount()); assert(actual_length <= read_length); - + *out_buffer = buffer.release(); *out_size = actual_length * sizeof(T); @@ -4835,7 +4922,7 @@ if (status != status_ok) return make_parse_result(status); xml_encoding real_encoding = get_buffer_encoding(encoding, buffer, size); - + return load_buffer_impl(doc, doc, buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding, true, true, out_buffer); } #endif @@ -4955,7 +5042,7 @@ PUGI__FN xml_tree_walker::xml_tree_walker(): _depth(0) { } - + PUGI__FN xml_tree_walker::~xml_tree_walker() { } @@ -5001,7 +5088,7 @@ { return (_attr == r._attr); } - + PUGI__FN bool xml_attribute::operator!=(const xml_attribute& r) const { return (_attr != r._attr); @@ -5011,17 +5098,17 @@ { return (_attr < r._attr); } - + PUGI__FN bool xml_attribute::operator>(const xml_attribute& r) const { return (_attr > r._attr); } - + PUGI__FN bool xml_attribute::operator<=(const xml_attribute& r) const { return (_attr <= r._attr); } - + PUGI__FN bool xml_attribute::operator>=(const xml_attribute& r) const { return (_attr >= r._attr); @@ -5109,7 +5196,7 @@ set_value(rhs); return *this; } - + PUGI__FN xml_attribute& xml_attribute::operator=(int rhs) { set_value(rhs); @@ -5122,12 +5209,24 @@ return *this; } + PUGI__FN xml_attribute& xml_attribute::operator=(long rhs) + { + set_value(rhs); + return *this; + } + + PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long rhs) + { + set_value(rhs); + return *this; + } + PUGI__FN xml_attribute& xml_attribute::operator=(double rhs) { set_value(rhs); return *this; } - + PUGI__FN xml_attribute& xml_attribute::operator=(float rhs) { set_value(rhs); @@ -5157,10 +5256,10 @@ PUGI__FN bool xml_attribute::set_name(const char_t* rhs) { if (!_attr) return false; - + return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs)); } - + PUGI__FN bool xml_attribute::set_value(const char_t* rhs) { if (!_attr) return false; @@ -5172,14 +5271,28 @@ { if (!_attr) return false; - return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); + return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0); } PUGI__FN bool xml_attribute::set_value(unsigned int rhs) { if (!_attr) return false; - return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); + return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false); + } + + PUGI__FN bool xml_attribute::set_value(long rhs) + { + if (!_attr) return false; + + return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0); + } + + PUGI__FN bool xml_attribute::set_value(unsigned long rhs) + { + if (!_attr) return false; + + return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false); } PUGI__FN bool xml_attribute::set_value(double rhs) @@ -5188,7 +5301,7 @@ return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); } - + PUGI__FN bool xml_attribute::set_value(float rhs) { if (!_attr) return false; @@ -5200,7 +5313,7 @@ { if (!_attr) return false; - return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); + return impl::set_value_bool(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); } #ifdef PUGIXML_HAS_LONG_LONG @@ -5208,14 +5321,14 @@ { if (!_attr) return false; - return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); + return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0); } PUGI__FN bool xml_attribute::set_value(unsigned long long rhs) { if (!_attr) return false; - return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); + return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false); } #endif @@ -5238,7 +5351,7 @@ PUGI__FN xml_node::xml_node(xml_node_struct* p): _root(p) { } - + PUGI__FN static void unspecified_bool_xml_node(xml_node***) { } @@ -5262,7 +5375,7 @@ { return iterator(0, _root); } - + PUGI__FN xml_node::attribute_iterator xml_node::attributes_begin() const { return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root); @@ -5272,7 +5385,7 @@ { return attribute_iterator(0, _root); } - + PUGI__FN xml_object_range xml_node::children() const { return xml_object_range(begin(), end()); @@ -5302,17 +5415,17 @@ { return (_root < r._root); } - + PUGI__FN bool xml_node::operator>(const xml_node& r) const { return (_root > r._root); } - + PUGI__FN bool xml_node::operator<=(const xml_node& r) const { return (_root <= r._root); } - + PUGI__FN bool xml_node::operator>=(const xml_node& r) const { return (_root >= r._root); @@ -5322,7 +5435,7 @@ { return !_root; } - + PUGI__FN const char_t* xml_node::name() const { return (_root && _root->name) ? _root->name + 0 : PUGIXML_TEXT(""); @@ -5332,12 +5445,12 @@ { return _root ? PUGI__NODETYPE(_root) : node_null; } - + PUGI__FN const char_t* xml_node::value() const { return (_root && _root->value) ? _root->value + 0 : PUGIXML_TEXT(""); } - + PUGI__FN xml_node xml_node::child(const char_t* name_) const { if (!_root) return xml_node(); @@ -5355,14 +5468,14 @@ for (xml_attribute_struct* i = _root->first_attribute; i; i = i->next_attribute) if (i->name && impl::strequal(name_, i->name)) return xml_attribute(i); - + return xml_attribute(); } - + PUGI__FN xml_node xml_node::next_sibling(const char_t* name_) const { if (!_root) return xml_node(); - + for (xml_node_struct* i = _root->next_sibling; i; i = i->next_sibling) if (i->name && impl::strequal(name_, i->name)) return xml_node(i); @@ -5377,7 +5490,7 @@ PUGI__FN xml_node xml_node::previous_sibling(const char_t* name_) const { if (!_root) return xml_node(); - + for (xml_node_struct* i = _root->prev_sibling_c; i->next_sibling; i = i->prev_sibling_c) if (i->name && impl::strequal(name_, i->name)) return xml_node(i); @@ -5420,7 +5533,7 @@ PUGI__FN xml_node xml_node::previous_sibling() const { if (!_root) return xml_node(); - + if (_root->prev_sibling_c->next_sibling) return xml_node(_root->prev_sibling_c); else return xml_node(); } @@ -5443,7 +5556,11 @@ PUGI__FN const char_t* xml_node::child_value() const { if (!_root) return PUGIXML_TEXT(""); - + + // element nodes can have value if parse_embed_pcdata was used + if (PUGI__NODETYPE(_root) == node_element && _root->value) + return _root->value; + for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling) if (impl::is_text_node(i) && i->value) return i->value; @@ -5485,7 +5602,7 @@ return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs)); } - + PUGI__FN bool xml_node::set_value(const char_t* rhs) { xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null; @@ -5499,7 +5616,7 @@ PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_) { if (!impl::allow_insert_attribute(type())) return xml_attribute(); - + impl::xml_allocator& alloc = impl::get_allocator(_root); if (!alloc.reserve()) return xml_attribute(); @@ -5509,14 +5626,14 @@ impl::append_attribute(a._attr, _root); a.set_name(name_); - + return a; } PUGI__FN xml_attribute xml_node::prepend_attribute(const char_t* name_) { if (!impl::allow_insert_attribute(type())) return xml_attribute(); - + impl::xml_allocator& alloc = impl::get_allocator(_root); if (!alloc.reserve()) return xml_attribute(); @@ -5534,7 +5651,7 @@ { if (!impl::allow_insert_attribute(type())) return xml_attribute(); if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - + impl::xml_allocator& alloc = impl::get_allocator(_root); if (!alloc.reserve()) return xml_attribute(); @@ -5552,7 +5669,7 @@ { if (!impl::allow_insert_attribute(type())) return xml_attribute(); if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - + impl::xml_allocator& alloc = impl::get_allocator(_root); if (!alloc.reserve()) return xml_attribute(); @@ -5639,7 +5756,7 @@ PUGI__FN xml_node xml_node::append_child(xml_node_type type_) { if (!impl::allow_insert_child(type(), type_)) return xml_node(); - + impl::xml_allocator& alloc = impl::get_allocator(_root); if (!alloc.reserve()) return xml_node(); @@ -5659,12 +5776,12 @@ impl::xml_allocator& alloc = impl::get_allocator(_root); if (!alloc.reserve()) return xml_node(); - + xml_node n(impl::allocate_node(alloc, type_)); if (!n) return xml_node(); impl::prepend_node(n._root, _root); - + if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml")); return n; @@ -5677,7 +5794,7 @@ impl::xml_allocator& alloc = impl::get_allocator(_root); if (!alloc.reserve()) return xml_node(); - + xml_node n(impl::allocate_node(alloc, type_)); if (!n) return xml_node(); @@ -5695,7 +5812,7 @@ impl::xml_allocator& alloc = impl::get_allocator(_root); if (!alloc.reserve()) return xml_node(); - + xml_node n(impl::allocate_node(alloc, type_)); if (!n) return xml_node(); @@ -5927,7 +6044,7 @@ // disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense doc->header |= impl::xml_memory_page_contents_shared_mask; - + // get extra buffer element (we'll store the document fragment buffer there so that we can deallocate it later) impl::xml_memory_page* page = 0; impl::xml_extra_buffer* extra = static_cast(doc->allocate_memory(sizeof(impl::xml_extra_buffer), page)); @@ -5949,7 +6066,7 @@ PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const { if (!_root) return xml_node(); - + for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling) if (i->name && impl::strequal(name_, i->name)) { @@ -5964,7 +6081,7 @@ PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const { if (!_root) return xml_node(); - + for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling) for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute) if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT(""))) @@ -6059,22 +6176,22 @@ PUGI__FN bool xml_node::traverse(xml_tree_walker& walker) { walker._depth = -1; - + xml_node arg_begin = *this; if (!walker.begin(arg_begin)) return false; xml_node cur = first_child(); - + if (cur) { ++walker._depth; - do + do { xml_node arg_for_each = cur; if (!walker.for_each(arg_for_each)) return false; - + if (cur.first_child()) { ++walker._depth; @@ -6090,7 +6207,7 @@ --walker._depth; cur = cur.parent(); } - + if (cur != *this) cur = cur.next_sibling(); } @@ -6191,6 +6308,10 @@ { if (!_root || impl::is_text_node(_root)) return _root; + // element nodes can have value if parse_embed_pcdata was used + if (PUGI__NODETYPE(_root) == node_element && _root->value) + return _root; + for (xml_node_struct* node = _root->first_child; node; node = node->next_sibling) if (impl::is_text_node(node)) return node; @@ -6305,14 +6426,28 @@ { xml_node_struct* dn = _data_new(); - return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; + return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false; } PUGI__FN bool xml_text::set(unsigned int rhs) { xml_node_struct* dn = _data_new(); - return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; + return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false; + } + + PUGI__FN bool xml_text::set(long rhs) + { + xml_node_struct* dn = _data_new(); + + return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false; + } + + PUGI__FN bool xml_text::set(unsigned long rhs) + { + xml_node_struct* dn = _data_new(); + + return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false; } PUGI__FN bool xml_text::set(float rhs) @@ -6333,7 +6468,7 @@ { xml_node_struct* dn = _data_new(); - return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; + return dn ? impl::set_value_bool(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; } #ifdef PUGIXML_HAS_LONG_LONG @@ -6341,14 +6476,14 @@ { xml_node_struct* dn = _data_new(); - return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; + return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false; } PUGI__FN bool xml_text::set(unsigned long long rhs) { xml_node_struct* dn = _data_new(); - return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; + return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false; } #endif @@ -6370,6 +6505,18 @@ return *this; } + PUGI__FN xml_text& xml_text::operator=(long rhs) + { + set(rhs); + return *this; + } + + PUGI__FN xml_text& xml_text::operator=(unsigned long rhs) + { + set(rhs); + return *this; + } + PUGI__FN xml_text& xml_text::operator=(double rhs) { set(rhs); @@ -6435,7 +6582,7 @@ { return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root; } - + PUGI__FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const { return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root; @@ -6450,7 +6597,7 @@ PUGI__FN xml_node* xml_node_iterator::operator->() const { assert(_wrap._root); - return const_cast(&_wrap); // BCC32 workaround + return const_cast(&_wrap); // BCC5 workaround } PUGI__FN const xml_node_iterator& xml_node_iterator::operator++() @@ -6496,7 +6643,7 @@ { return _wrap._attr == rhs._wrap._attr && _parent._root == rhs._parent._root; } - + PUGI__FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const { return _wrap._attr != rhs._wrap._attr || _parent._root != rhs._parent._root; @@ -6511,7 +6658,7 @@ PUGI__FN xml_attribute* xml_attribute_iterator::operator->() const { assert(_wrap._attr); - return const_cast(&_wrap); // BCC32 workaround + return const_cast(&_wrap); // BCC5 workaround } PUGI__FN const xml_attribute_iterator& xml_attribute_iterator::operator++() @@ -6572,7 +6719,7 @@ PUGI__FN xml_node* xml_named_node_iterator::operator->() const { assert(_wrap._root); - return const_cast(&_wrap); // BCC32 workaround + return const_cast(&_wrap); // BCC5 workaround } PUGI__FN const xml_named_node_iterator& xml_named_node_iterator::operator++() @@ -6653,18 +6800,18 @@ PUGI__FN xml_document::xml_document(): _buffer(0) { - create(); + _create(); } PUGI__FN xml_document::~xml_document() { - destroy(); + _destroy(); } PUGI__FN void xml_document::reset() { - destroy(); - create(); + _destroy(); + _create(); } PUGI__FN void xml_document::reset(const xml_document& proto) @@ -6675,7 +6822,7 @@ append_copy(cur); } - PUGI__FN void xml_document::create() + PUGI__FN void xml_document::_create() { assert(!_root); @@ -6686,13 +6833,10 @@ #endif // initialize sentinel page - PUGI__STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + impl::xml_memory_page_alignment - sizeof(void*) + page_offset <= sizeof(_memory)); - - // align upwards to page boundary - void* page_memory = reinterpret_cast((reinterpret_cast(_memory) + (impl::xml_memory_page_alignment - 1)) & ~(impl::xml_memory_page_alignment - 1)); + PUGI__STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory)); // prepare page structure - impl::xml_memory_page* page = impl::xml_memory_page::construct(page_memory); + impl::xml_memory_page* page = impl::xml_memory_page::construct(_memory); assert(page); page->busy_size = impl::xml_memory_page_size; @@ -6711,11 +6855,16 @@ // setup sentinel page page->allocator = static_cast(_root); + // setup hash table pointer in allocator + #ifdef PUGIXML_COMPACT + page->allocator->_hash = &static_cast(_root)->hash; + #endif + // verify the document allocation assert(reinterpret_cast(_root) + sizeof(impl::xml_document_struct) <= _memory + sizeof(_memory)); } - PUGI__FN void xml_document::destroy() + PUGI__FN void xml_document::_destroy() { assert(_root); @@ -6792,7 +6941,7 @@ reset(); using impl::auto_deleter; // MSVC7 workaround - auto_deleter file(fopen(path_, "rb"), fclose); + auto_deleter file(fopen(path_, "rb"), impl::close_file); return impl::load_file_impl(static_cast(_root), file.data, options, encoding, &_buffer); } @@ -6802,7 +6951,7 @@ reset(); using impl::auto_deleter; // MSVC7 workaround - auto_deleter file(impl::open_file_wide(path_, L"rb"), fclose); + auto_deleter file(impl::open_file_wide(path_, L"rb"), impl::close_file); return impl::load_file_impl(static_cast(_root), file.data, options, encoding, &_buffer); } @@ -6875,7 +7024,7 @@ PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const { using impl::auto_deleter; // MSVC7 workaround - auto_deleter file(fopen(path_, (flags & format_save_file_text) ? "w" : "wb"), fclose); + auto_deleter file(fopen(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::close_file); return impl::save_file_impl(*this, file.data, indent, flags, encoding); } @@ -6883,7 +7032,7 @@ PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const { using impl::auto_deleter; // MSVC7 workaround - auto_deleter file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), fclose); + auto_deleter file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::close_file); return impl::save_file_impl(*this, file.data, indent, flags, encoding); } @@ -6911,14 +7060,14 @@ { return impl::as_utf8_impl(str.c_str(), str.size()); } - + PUGI__FN std::basic_string PUGIXML_FUNCTION as_wide(const char* str) { assert(str); return impl::as_wide_impl(str, strlen(str)); } - + PUGI__FN std::basic_string PUGIXML_FUNCTION as_wide(const std::string& str) { return impl::as_wide_impl(str.c_str(), str.size()); @@ -7050,7 +7199,7 @@ if (begin == end) return begin; // last written element - I write = begin++; + I write = begin++; // merge unique elements while (begin != end) @@ -7225,7 +7374,7 @@ static const uintptr_t xpath_memory_block_alignment = sizeof(double) > sizeof(void*) ? sizeof(double) : sizeof(void*); struct xpath_memory_block - { + { xpath_memory_block* next; size_t capacity; @@ -7235,7 +7384,7 @@ double alignment; }; }; - + class xpath_allocator { xpath_memory_block* _root; @@ -7252,7 +7401,7 @@ error_handler = 0; #endif } - + void* allocate_nothrow(size_t size) { // round size up to block alignment boundary @@ -7275,13 +7424,13 @@ xpath_memory_block* block = static_cast(xml_memory::allocate(block_size)); if (!block) return 0; - + block->next = _root; block->capacity = block_capacity; - + _root = block; _root_size = size; - + return block->data; } } @@ -7529,7 +7678,7 @@ { return _uses_heap ? _length_heap : strlength(_buffer); } - + char_t* data(xpath_allocator* alloc) { // make private heap copy @@ -7619,14 +7768,18 @@ case node_comment: case node_pi: return xpath_string::from_const(n.value()); - + case node_document: case node_element: { xpath_string result; + // element nodes can have value if parse_embed_pcdata was used + if (n.value()[0]) + result.append(xpath_string::from_const(n.value()), alloc); + xml_node cur = n.first_child(); - + while (cur && cur != n) { if (cur.type() == node_pcdata || cur.type() == node_cdata) @@ -7644,16 +7797,16 @@ if (cur != n) cur = cur.next_sibling(); } } - + return result; } - + default: return xpath_string(); } } } - + PUGI__FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn) { assert(ln->parent == rn->parent); @@ -7677,7 +7830,7 @@ // if rn sibling chain ended ln must be before rn return !rs; } - + PUGI__FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn) { // find common ancestor at the same depth, if any @@ -7758,7 +7911,7 @@ return 0; } - + struct document_order_comparator { bool operator()(const xpath_node& lhs, const xpath_node& rhs) const @@ -7782,10 +7935,10 @@ for (xml_attribute a = lhs.attribute(); a; a = a.next_attribute()) if (a == rhs.attribute()) return true; - + return false; } - + // compare attribute parents ln = lhs.parent(); rn = rhs.parent(); @@ -7794,21 +7947,21 @@ { // attributes go after the parent element if (lhs.parent() == rhs.node()) return false; - + ln = lhs.parent(); } else if (rhs.attribute()) { // attributes go after the parent element if (rhs.parent() == lhs.node()) return true; - + rn = rhs.parent(); } if (ln == rn) return false; if (!ln || !rn) return ln < rn; - + return node_is_before(ln.internal_object(), rn.internal_object()); } }; @@ -7821,20 +7974,22 @@ else return rhs.attribute() ? false : lhs.node() < rhs.node(); } }; - + PUGI__FN double gen_nan() { #if defined(__STDC_IEC_559__) || ((FLT_RADIX - 0 == 2) && (FLT_MAX_EXP - 0 == 128) && (FLT_MANT_DIG - 0 == 24)) - union { float f; uint32_t i; } u[sizeof(float) == sizeof(uint32_t) ? 1 : -1]; - u[0].i = 0x7fc00000; - return u[0].f; + PUGI__STATIC_ASSERT(sizeof(float) == sizeof(uint32_t)); + typedef uint32_t UI; // BCC5 workaround + union { float f; UI i; } u; + u.i = 0x7fc00000; + return u.f; #else // fallback const volatile double zero = 0.0; return zero / zero; #endif } - + PUGI__FN bool is_nan(double value) { #if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) @@ -7847,7 +8002,7 @@ return v != v; #endif } - + PUGI__FN const char_t* convert_number_to_string_special(double value) { #if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) @@ -7879,12 +8034,12 @@ return 0; #endif } - + PUGI__FN bool convert_number_to_boolean(double value) { return (value != 0 && !is_nan(value)); } - + PUGI__FN void truncate_zeros(char* begin, char* end) { while (begin != end && end[-1] == '0') end--; @@ -8005,7 +8160,7 @@ return xpath_string::from_heap_preallocated(result, s); } - + PUGI__FN bool check_string_to_number_format(const char_t* string) { // parse leading whitespace @@ -8072,7 +8227,7 @@ return true; } - + PUGI__FN double round_nearest(double value) { return floor(value + 0.5); @@ -8084,17 +8239,17 @@ // ceil is used to differentiate between +0 and -0 (we return -0 for [-0.5, -0] and +0 for +0) return (value >= -0.5 && value <= 0) ? ceil(value) : floor(value + 0.5); } - + PUGI__FN const char_t* qualified_name(const xpath_node& node) { return node.attribute() ? node.attribute().name() : node.node().name(); } - + PUGI__FN const char_t* local_name(const xpath_node& node) { const char_t* name = qualified_name(node); const char_t* p = find_char(name, ':'); - + return p ? p + 1 : name; } @@ -8124,39 +8279,39 @@ PUGI__FN const char_t* namespace_uri(xml_node node) { namespace_uri_predicate pred = node.name(); - + xml_node p = node; - + while (p) { xml_attribute a = p.find_attribute(pred); - + if (a) return a.value(); - + p = p.parent(); } - + return PUGIXML_TEXT(""); } PUGI__FN const char_t* namespace_uri(xml_attribute attr, xml_node parent) { namespace_uri_predicate pred = attr.name(); - + // Default namespace does not apply to attributes if (!pred.prefix) return PUGIXML_TEXT(""); - + xml_node p = parent; - + while (p) { xml_attribute a = p.find_attribute(pred); - + if (a) return a.value(); - + p = p.parent(); } - + return PUGIXML_TEXT(""); } @@ -8342,11 +8497,11 @@ result += result << 10; result ^= result >> 6; } - + result += result << 3; result ^= result >> 11; result += result << 15; - + return result; } @@ -8414,7 +8569,7 @@ break; default: - assert(!"Invalid variable type"); + assert(false && "Invalid variable type"); } } @@ -8435,7 +8590,7 @@ return lhs->set(static_cast(rhs)->value); default: - assert(!"Invalid variable type"); + assert(false && "Invalid variable type"); return false; } } @@ -8500,9 +8655,9 @@ else type = sorted; } - + if (type != order) reverse(begin, end); - + return order; } @@ -8522,7 +8677,7 @@ return *min_element(begin, end, document_order_comparator()); default: - assert(!"Invalid node set type"); + assert(false && "Invalid node set type"); return xpath_node(); } } @@ -8615,7 +8770,7 @@ { if (_type == xpath_node_set::type_unsorted) sort(_begin, _end, duplicate_comparator()); - + _end = unique(_begin, _end); } @@ -8723,12 +8878,12 @@ { next(); } - + const char_t* state() const { return _cur; } - + void next() { const char_t* cur = _cur; @@ -8743,7 +8898,7 @@ case 0: _cur_lexeme = lex_eof; break; - + case '>': if (*(cur+1) == '=') { @@ -8787,7 +8942,7 @@ _cur_lexeme = lex_equal; break; - + case '+': cur += 1; _cur_lexeme = lex_plus; @@ -8811,7 +8966,7 @@ _cur_lexeme = lex_union; break; - + case '$': cur += 1; @@ -8829,7 +8984,7 @@ } _cur_lexeme_contents.end = cur; - + _cur_lexeme = lex_var_ref; } else @@ -8850,7 +9005,7 @@ _cur_lexeme = lex_close_brace; break; - + case '[': cur += 1; _cur_lexeme = lex_open_square_brace; @@ -8881,7 +9036,7 @@ _cur_lexeme = lex_slash; } break; - + case '.': if (*(cur+1) == '.') { @@ -8897,7 +9052,7 @@ while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++; _cur_lexeme_contents.end = cur; - + _cur_lexeme = lex_number; } else @@ -8923,7 +9078,7 @@ _cur_lexeme_contents.begin = cur; while (*cur && *cur != terminator) cur++; _cur_lexeme_contents.end = cur; - + if (!*cur) _cur_lexeme = lex_none; else @@ -8953,7 +9108,7 @@ _cur_lexeme_contents.begin = cur; while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++; - + if (*cur == '.') { cur++; @@ -8986,7 +9141,7 @@ } _cur_lexeme_contents.end = cur; - + _cur_lexeme = lex_string; } else @@ -9097,7 +9252,7 @@ axis_preceding_sibling, axis_self }; - + enum nodetest_t { nodetest_none, @@ -9132,7 +9287,7 @@ }; template const axis_t axis_to_type::axis = N; - + class xpath_ast_node { private: @@ -9252,7 +9407,7 @@ } } - assert(!"Wrong types"); + assert(false && "Wrong types"); return false; } @@ -9327,7 +9482,7 @@ } else { - assert(!"Wrong types"); + assert(false && "Wrong types"); return false; } } @@ -9451,7 +9606,7 @@ return true; } break; - + case nodetest_type_node: case nodetest_all: if (is_xpath_attribute(name)) @@ -9460,7 +9615,7 @@ return true; } break; - + case nodetest_all_in_namespace: if (starts_with(name, _data.nodetest) && is_xpath_attribute(name)) { @@ -9468,14 +9623,14 @@ return true; } break; - + default: ; } return false; } - + bool step_push(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc) { assert(n); @@ -9491,11 +9646,11 @@ return true; } break; - + case nodetest_type_node: ns.push_back(xml_node(n), alloc); return true; - + case nodetest_type_comment: if (type == node_comment) { @@ -9503,7 +9658,7 @@ return true; } break; - + case nodetest_type_text: if (type == node_pcdata || type == node_cdata) { @@ -9511,7 +9666,7 @@ return true; } break; - + case nodetest_type_pi: if (type == node_pi) { @@ -9519,7 +9674,7 @@ return true; } break; - + case nodetest_pi: if (type == node_pi && n->name && strequal(n->name, _data.nodetest)) { @@ -9527,7 +9682,7 @@ return true; } break; - + case nodetest_all: if (type == node_element) { @@ -9535,7 +9690,7 @@ return true; } break; - + case nodetest_all_in_namespace: if (type == node_element && n->name && starts_with(n->name, _data.nodetest)) { @@ -9545,7 +9700,7 @@ break; default: - assert(!"Unknown axis"); + assert(false && "Unknown axis"); } return false; @@ -9562,33 +9717,33 @@ for (xml_attribute_struct* a = n->first_attribute; a; a = a->next_attribute) if (step_push(ns, a, n, alloc) & once) return; - + break; } - + case axis_child: { for (xml_node_struct* c = n->first_child; c; c = c->next_sibling) if (step_push(ns, c, alloc) & once) return; - + break; } - + case axis_descendant: case axis_descendant_or_self: { if (axis == axis_descendant_or_self) if (step_push(ns, n, alloc) & once) return; - + xml_node_struct* cur = n->first_child; - + while (cur) { if (step_push(ns, cur, alloc) & once) return; - + if (cur->first_child) cur = cur->first_child; else @@ -9599,32 +9754,32 @@ if (cur == n) return; } - + cur = cur->next_sibling; } } - + break; } - + case axis_following_sibling: { for (xml_node_struct* c = n->next_sibling; c; c = c->next_sibling) if (step_push(ns, c, alloc) & once) return; - + break; } - + case axis_preceding_sibling: { for (xml_node_struct* c = n->prev_sibling_c; c->next_sibling; c = c->prev_sibling_c) if (step_push(ns, c, alloc) & once) return; - + break; } - + case axis_following: { xml_node_struct* cur = n; @@ -9703,7 +9858,7 @@ break; } - + case axis_ancestor: case axis_ancestor_or_self: { @@ -9712,15 +9867,15 @@ return; xml_node_struct* cur = n->parent; - + while (cur) { if (step_push(ns, cur, alloc) & once) return; - + cur = cur->parent; } - + break; } @@ -9738,12 +9893,12 @@ break; } - + default: - assert(!"Unimplemented axis"); + assert(false && "Unimplemented axis"); } } - + template void step_fill(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* p, xpath_allocator* alloc, bool once, T v) { const axis_t axis = T::axis; @@ -9758,15 +9913,15 @@ return; xml_node_struct* cur = p; - + while (cur) { if (step_push(ns, cur, alloc) & once) return; - + cur = cur->parent; } - + break; } @@ -9782,7 +9937,7 @@ case axis_following: { xml_node_struct* cur = p; - + while (cur) { if (cur->first_child) @@ -9819,9 +9974,9 @@ step_fill(ns, p, alloc, once, v); break; } - + default: - assert(!"Unimplemented axis"); + assert(false && "Unimplemented axis"); } } @@ -9863,7 +10018,7 @@ // in general, all axes generate elements in a particular order, but there is no order guarantee if axis is applied to two nodes if (axis != axis_self && size != 0) ns.set_type(xpath_node_set::type_unsorted); - + step_fill(ns, *it, stack.result, once, v); if (_right) apply_predicates(ns, size, stack, eval); } @@ -9881,7 +10036,7 @@ return ns; } - + public: xpath_ast_node(ast_type_t type, xpath_value_type rettype_, const char_t* value): _type(static_cast(type)), _rettype(static_cast(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0) @@ -9896,14 +10051,14 @@ assert(type == ast_number_constant); _data.number = value; } - + xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_variable* value): _type(static_cast(type)), _rettype(static_cast(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0) { assert(type == ast_variable); _data.variable = value; } - + xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = 0, xpath_ast_node* right = 0): _type(static_cast(type)), _rettype(static_cast(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(0) { @@ -9938,25 +10093,25 @@ { case ast_op_or: return _left->eval_boolean(c, stack) || _right->eval_boolean(c, stack); - + case ast_op_and: return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack); - + case ast_op_equal: return compare_eq(_left, _right, c, stack, equal_to()); case ast_op_not_equal: return compare_eq(_left, _right, c, stack, not_equal_to()); - + case ast_op_less: return compare_rel(_left, _right, c, stack, less()); - + case ast_op_greater: return compare_rel(_right, _left, c, stack, less()); case ast_op_less_or_equal: return compare_rel(_left, _right, c, stack, less_equal()); - + case ast_op_greater_or_equal: return compare_rel(_right, _left, c, stack, less_equal()); @@ -9982,43 +10137,43 @@ case ast_func_boolean: return _left->eval_boolean(c, stack); - + case ast_func_not: return !_left->eval_boolean(c, stack); - + case ast_func_true: return true; - + case ast_func_false: return false; case ast_func_lang: { if (c.n.attribute()) return false; - + xpath_allocator_capture cr(stack.result); xpath_string lang = _left->eval_string(c, stack); - + for (xml_node n = c.n.node(); n; n = n.parent()) { xml_attribute a = n.attribute(PUGIXML_TEXT("xml:lang")); - + if (a) { const char_t* value = a.value(); - + // strnicmp / strncasecmp is not portable for (const char_t* lit = lang.c_str(); *lit; ++lit) { if (tolower_ascii(*lit) != tolower_ascii(*value)) return false; ++value; } - + return *value == 0 || *value == '-'; } } - + return false; } @@ -10047,15 +10202,15 @@ { case xpath_type_number: return convert_number_to_boolean(eval_number(c, stack)); - + case xpath_type_string: { xpath_allocator_capture cr(stack.result); return !eval_string(c, stack).empty(); } - - case xpath_type_node_set: + + case xpath_type_node_set: { xpath_allocator_capture cr(stack.result); @@ -10063,7 +10218,7 @@ } default: - assert(!"Wrong expression for return type boolean"); + assert(false && "Wrong expression for return type boolean"); return false; } } @@ -10076,7 +10231,7 @@ { case ast_op_add: return _left->eval_number(c, stack) + _right->eval_number(c, stack); - + case ast_op_subtract: return _left->eval_number(c, stack) - _right->eval_number(c, stack); @@ -10097,7 +10252,7 @@ case ast_func_last: return static_cast(c.size); - + case ast_func_position: return static_cast(c.position); @@ -10107,28 +10262,28 @@ return static_cast(_left->eval_node_set(c, stack, nodeset_eval_all).size()); } - + case ast_func_string_length_0: { xpath_allocator_capture cr(stack.result); return static_cast(string_value(c.n, stack.result).length()); } - + case ast_func_string_length_1: { xpath_allocator_capture cr(stack.result); return static_cast(_left->eval_string(c, stack).length()); } - + case ast_func_number_0: { xpath_allocator_capture cr(stack.result); return convert_string_to_number(string_value(c.n, stack.result).c_str()); } - + case ast_func_number_1: return _left->eval_number(c, stack); @@ -10137,36 +10292,36 @@ xpath_allocator_capture cr(stack.result); double r = 0; - + xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_all); - + for (const xpath_node* it = ns.begin(); it != ns.end(); ++it) { xpath_allocator_capture cri(stack.result); r += convert_string_to_number(string_value(*it, stack.result).c_str()); } - + return r; } case ast_func_floor: { double r = _left->eval_number(c, stack); - + return r == r ? floor(r) : r; } case ast_func_ceiling: { double r = _left->eval_number(c, stack); - + return r == r ? ceil(r) : r; } case ast_func_round: return round_nearest_nzero(_left->eval_number(c, stack)); - + case ast_variable: { assert(_rettype == _data.variable->type()); @@ -10183,30 +10338,30 @@ { case xpath_type_boolean: return eval_boolean(c, stack) ? 1 : 0; - + case xpath_type_string: { xpath_allocator_capture cr(stack.result); return convert_string_to_number(eval_string(c, stack).c_str()); } - + case xpath_type_node_set: { xpath_allocator_capture cr(stack.result); return convert_string_to_number(eval_string(c, stack).c_str()); } - + default: - assert(!"Wrong expression for return type number"); + assert(false && "Wrong expression for return type number"); return 0; } - + } } } - + xpath_string eval_string_concat(const xpath_context& c, const xpath_stack& stack) { assert(_type == ast_func_concat); @@ -10262,11 +10417,11 @@ { case ast_string_constant: return xpath_string::from_const(_data.string); - + case ast_func_local_name_0: { xpath_node na = c.n; - + return xpath_string::from_const(local_name(na)); } @@ -10276,14 +10431,14 @@ xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first); xpath_node na = ns.first(); - + return xpath_string::from_const(local_name(na)); } case ast_func_name_0: { xpath_node na = c.n; - + return xpath_string::from_const(qualified_name(na)); } @@ -10293,14 +10448,14 @@ xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first); xpath_node na = ns.first(); - + return xpath_string::from_const(qualified_name(na)); } case ast_func_namespace_uri_0: { xpath_node na = c.n; - + return xpath_string::from_const(namespace_uri(na)); } @@ -10310,7 +10465,7 @@ xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first); xpath_node na = ns.first(); - + return xpath_string::from_const(namespace_uri(na)); } @@ -10333,10 +10488,10 @@ xpath_string p = _right->eval_string(c, swapped_stack); const char_t* pos = find_substring(s.c_str(), p.c_str()); - + return pos ? xpath_string::from_heap(s.c_str(), pos, stack.result) : xpath_string(); } - + case ast_func_substring_after: { xpath_allocator_capture cr(stack.temp); @@ -10345,7 +10500,7 @@ xpath_string s = _left->eval_string(c, swapped_stack); xpath_string p = _right->eval_string(c, swapped_stack); - + const char_t* pos = find_substring(s.c_str(), p.c_str()); if (!pos) return xpath_string(); @@ -10365,19 +10520,19 @@ size_t s_length = s.length(); double first = round_nearest(_right->eval_number(c, stack)); - + if (is_nan(first)) return xpath_string(); // NaN else if (first >= s_length + 1) return xpath_string(); - + size_t pos = first < 1 ? 1 : static_cast(first); assert(1 <= pos && pos <= s_length + 1); const char_t* rbegin = s.c_str() + (pos - 1); const char_t* rend = s.c_str() + s.length(); - + return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin); } - + case ast_func_substring_3: { xpath_allocator_capture cr(stack.temp); @@ -10389,12 +10544,12 @@ double first = round_nearest(_right->eval_number(c, stack)); double last = first + round_nearest(_right->_next->eval_number(c, stack)); - + if (is_nan(first) || is_nan(last)) return xpath_string(); else if (first >= s_length + 1) return xpath_string(); else if (first >= last) return xpath_string(); else if (last < 1) return xpath_string(); - + size_t pos = first < 1 ? 1 : static_cast(first); size_t end = last >= s_length + 1 ? s_length + 1 : static_cast(last); @@ -10421,7 +10576,7 @@ char_t* begin = s.data(stack.result); char_t* end = normalize_space(begin); - + return xpath_string::from_heap_preallocated(begin, end); } @@ -10467,10 +10622,10 @@ { case xpath_type_boolean: return xpath_string::from_const(eval_boolean(c, stack) ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false")); - + case xpath_type_number: return convert_number_to_string(eval_number(c, stack), stack.result); - + case xpath_type_node_set: { xpath_allocator_capture cr(stack.temp); @@ -10480,9 +10635,9 @@ xpath_node_set_raw ns = eval_node_set(c, swapped_stack, nodeset_eval_first); return ns.empty() ? xpath_string() : string_value(ns.first(), stack.result); } - + default: - assert(!"Wrong expression for return type string"); + assert(false && "Wrong expression for return type string"); return xpath_string(); } } @@ -10521,20 +10676,20 @@ bool once = eval_once(set.type(), eval); apply_predicate(set, 0, stack, once); - + return set; } - + case ast_func_id: return xpath_node_set_raw(); - + case ast_step: { switch (_axis) { case axis_ancestor: return step_do(c, stack, eval, axis_to_type()); - + case axis_ancestor_or_self: return step_do(c, stack, eval, axis_to_type()); @@ -10543,7 +10698,7 @@ case axis_child: return step_do(c, stack, eval, axis_to_type()); - + case axis_descendant: return step_do(c, stack, eval, axis_to_type()); @@ -10552,28 +10707,28 @@ case axis_following: return step_do(c, stack, eval, axis_to_type()); - + case axis_following_sibling: return step_do(c, stack, eval, axis_to_type()); - + case axis_namespace: // namespaced axis is not supported return xpath_node_set_raw(); - + case axis_parent: return step_do(c, stack, eval, axis_to_type()); - + case axis_preceding: return step_do(c, stack, eval, axis_to_type()); case axis_preceding_sibling: return step_do(c, stack, eval, axis_to_type()); - + case axis_self: return step_do(c, stack, eval, axis_to_type()); default: - assert(!"Unknown axis"); + assert(false && "Unknown axis"); return xpath_node_set_raw(); } } @@ -10612,16 +10767,21 @@ } default: - assert(!"Wrong expression for return type node set"); + assert(false && "Wrong expression for return type node set"); return xpath_node_set_raw(); } } void optimize(xpath_allocator* alloc) { - if (_left) _left->optimize(alloc); - if (_right) _right->optimize(alloc); - if (_next) _next->optimize(alloc); + if (_left) + _left->optimize(alloc); + + if (_right) + _right->optimize(alloc); + + if (_next) + _next->optimize(alloc); optimize_self(alloc); } @@ -10685,7 +10845,7 @@ _type = ast_opt_compare_attribute; } } - + bool is_posinv_expr() const { switch (_type) @@ -10709,10 +10869,10 @@ default: if (_left && !_left->is_posinv_expr()) return false; - + for (xpath_ast_node* n = _right; n; n = n->_next) if (!n->is_posinv_expr()) return false; - + return true; } } @@ -10806,7 +10966,8 @@ { assert(argc <= 1); - if (argc == 1 && args[0]->rettype() != xpath_type_node_set) throw_error("Function has to be applied to node set"); + if (argc == 1 && args[0]->rettype() != xpath_type_node_set) + throw_error("Function has to be applied to node set"); return new (alloc_node()) xpath_ast_node(argc == 0 ? type0 : type1, xpath_type_string, args[0]); } @@ -10818,13 +10979,15 @@ case 'b': if (name == PUGIXML_TEXT("boolean") && argc == 1) return new (alloc_node()) xpath_ast_node(ast_func_boolean, xpath_type_boolean, args[0]); - + break; - + case 'c': if (name == PUGIXML_TEXT("count") && argc == 1) { - if (args[0]->rettype() != xpath_type_node_set) throw_error("Function has to be applied to node set"); + if (args[0]->rettype() != xpath_type_node_set) + throw_error("Function has to be applied to node set"); + return new (alloc_node()) xpath_ast_node(ast_func_count, xpath_type_number, args[0]); } else if (name == PUGIXML_TEXT("contains") && argc == 2) @@ -10833,23 +10996,23 @@ return new (alloc_node()) xpath_ast_node(ast_func_concat, xpath_type_string, args[0], args[1]); else if (name == PUGIXML_TEXT("ceiling") && argc == 1) return new (alloc_node()) xpath_ast_node(ast_func_ceiling, xpath_type_number, args[0]); - + break; - + case 'f': if (name == PUGIXML_TEXT("false") && argc == 0) return new (alloc_node()) xpath_ast_node(ast_func_false, xpath_type_boolean); else if (name == PUGIXML_TEXT("floor") && argc == 1) return new (alloc_node()) xpath_ast_node(ast_func_floor, xpath_type_number, args[0]); - + break; - + case 'i': if (name == PUGIXML_TEXT("id") && argc == 1) return new (alloc_node()) xpath_ast_node(ast_func_id, xpath_type_node_set, args[0]); - + break; - + case 'l': if (name == PUGIXML_TEXT("last") && argc == 0) return new (alloc_node()) xpath_ast_node(ast_func_last, xpath_type_number); @@ -10857,9 +11020,9 @@ return new (alloc_node()) xpath_ast_node(ast_func_lang, xpath_type_boolean, args[0]); else if (name == PUGIXML_TEXT("local-name") && argc <= 1) return parse_function_helper(ast_func_local_name_0, ast_func_local_name_1, argc, args); - + break; - + case 'n': if (name == PUGIXML_TEXT("name") && argc <= 1) return parse_function_helper(ast_func_name_0, ast_func_name_1, argc, args); @@ -10871,21 +11034,21 @@ return new (alloc_node()) xpath_ast_node(ast_func_not, xpath_type_boolean, args[0]); else if (name == PUGIXML_TEXT("number") && argc <= 1) return new (alloc_node()) xpath_ast_node(argc == 0 ? ast_func_number_0 : ast_func_number_1, xpath_type_number, args[0]); - + break; - + case 'p': if (name == PUGIXML_TEXT("position") && argc == 0) return new (alloc_node()) xpath_ast_node(ast_func_position, xpath_type_number); - + break; - + case 'r': if (name == PUGIXML_TEXT("round") && argc == 1) return new (alloc_node()) xpath_ast_node(ast_func_round, xpath_type_number, args[0]); break; - + case 's': if (name == PUGIXML_TEXT("string") && argc <= 1) return new (alloc_node()) xpath_ast_node(argc == 0 ? ast_func_string_0 : ast_func_string_1, xpath_type_string, args[0]); @@ -10906,13 +11069,13 @@ } break; - + case 't': if (name == PUGIXML_TEXT("translate") && argc == 3) return new (alloc_node()) xpath_ast_node(ast_func_translate, xpath_type_string, args[0], args[1]); else if (name == PUGIXML_TEXT("true") && argc == 0) return new (alloc_node()) xpath_ast_node(ast_func_true, xpath_type_boolean); - + break; default: @@ -10937,37 +11100,37 @@ return axis_ancestor_or_self; else if (name == PUGIXML_TEXT("attribute")) return axis_attribute; - + break; - + case 'c': if (name == PUGIXML_TEXT("child")) return axis_child; - + break; - + case 'd': if (name == PUGIXML_TEXT("descendant")) return axis_descendant; else if (name == PUGIXML_TEXT("descendant-or-self")) return axis_descendant_or_self; - + break; - + case 'f': if (name == PUGIXML_TEXT("following")) return axis_following; else if (name == PUGIXML_TEXT("following-sibling")) return axis_following_sibling; - + break; - + case 'n': if (name == PUGIXML_TEXT("namespace")) return axis_namespace; - + break; - + case 'p': if (name == PUGIXML_TEXT("parent")) return axis_parent; @@ -10975,13 +11138,13 @@ return axis_preceding; else if (name == PUGIXML_TEXT("preceding-sibling")) return axis_preceding_sibling; - + break; - + case 's': if (name == PUGIXML_TEXT("self")) return axis_self; - + break; default: @@ -11019,7 +11182,7 @@ return nodetest_type_text; break; - + default: break; } @@ -11092,12 +11255,12 @@ { xpath_ast_node* args[2] = {0}; size_t argc = 0; - + xpath_lexer_string function = _lexer.contents(); _lexer.next(); - + xpath_ast_node* last_arg = 0; - + if (_lexer.current() != lex_open_brace) throw_error("Unrecognized function call"); _lexer.next(); @@ -11110,16 +11273,16 @@ if (_lexer.current() != lex_comma) throw_error("No comma between function arguments"); _lexer.next(); - + xpath_ast_node* n = parse_expression(); - + if (argc < 2) args[argc] = n; else last_arg->set_next(n); argc++; last_arg = n; } - + _lexer.next(); return parse_function(function, argc, args); @@ -11131,7 +11294,7 @@ return 0; } } - + // FilterExpr ::= PrimaryExpr | FilterExpr Predicate // Predicate ::= '[' PredicateExpr ']' // PredicateExpr ::= Expr @@ -11145,19 +11308,20 @@ xpath_ast_node* expr = parse_expression(); - if (n->rettype() != xpath_type_node_set) throw_error("Predicate has to be applied to node set"); + if (n->rettype() != xpath_type_node_set) + throw_error("Predicate has to be applied to node set"); n = new (alloc_node()) xpath_ast_node(ast_filter, n, expr, predicate_default); if (_lexer.current() != lex_close_square_brace) throw_error("Unmatched square brace"); - + _lexer.next(); } - + return n; } - + // Step ::= AxisSpecifier NodeTest Predicate* | AbbreviatedStep // AxisSpecifier ::= AxisName '::' | '@'? // NodeTest ::= NameTest | NodeType '(' ')' | 'processing-instruction' '(' Literal ')' @@ -11175,25 +11339,25 @@ { axis = axis_attribute; axis_specified = true; - + _lexer.next(); } else if (_lexer.current() == lex_dot) { _lexer.next(); - + return new (alloc_node()) xpath_ast_node(ast_step, set, axis_self, nodetest_type_node, 0); } else if (_lexer.current() == lex_double_dot) { _lexer.next(); - + return new (alloc_node()) xpath_ast_node(ast_step, set, axis_parent, nodetest_type_node, 0); } - + nodetest_t nt_type = nodetest_none; xpath_lexer_string nt_name; - + if (_lexer.current() == lex_string) { // node name test @@ -11204,11 +11368,13 @@ if (_lexer.current() == lex_double_colon) { // parse axis name - if (axis_specified) throw_error("Two axis specifiers in one step"); + if (axis_specified) + throw_error("Two axis specifiers in one step"); axis = parse_axis_name(nt_name, axis_specified); - if (!axis_specified) throw_error("Unknown axis"); + if (!axis_specified) + throw_error("Unknown axis"); // read actual node test _lexer.next(); @@ -11226,40 +11392,42 @@ } else throw_error("Unrecognized node test"); } - + if (nt_type == nodetest_none) { // node type test or processing-instruction if (_lexer.current() == lex_open_brace) { _lexer.next(); - + if (_lexer.current() == lex_close_brace) { _lexer.next(); nt_type = parse_node_test_type(nt_name); - if (nt_type == nodetest_none) throw_error("Unrecognized node type"); - + if (nt_type == nodetest_none) + throw_error("Unrecognized node type"); + nt_name = xpath_lexer_string(); } else if (nt_name == PUGIXML_TEXT("processing-instruction")) { if (_lexer.current() != lex_quoted_string) throw_error("Only literals are allowed as arguments to processing-instruction()"); - + nt_type = nodetest_pi; nt_name = _lexer.contents(); _lexer.next(); - + if (_lexer.current() != lex_close_brace) throw_error("Unmatched brace near processing-instruction()"); _lexer.next(); } else + { throw_error("Unmatched brace near node type test"); - + } } // QName or NCName:* else @@ -11267,10 +11435,13 @@ if (nt_name.end - nt_name.begin > 2 && nt_name.end[-2] == ':' && nt_name.end[-1] == '*') // NCName:* { nt_name.end--; // erase * - + nt_type = nodetest_all_in_namespace; } - else nt_type = nodetest_name; + else + { + nt_type = nodetest_name; + } } } } @@ -11279,38 +11450,42 @@ nt_type = nodetest_all; _lexer.next(); } - else throw_error("Unrecognized node test"); - - xpath_ast_node* n = new (alloc_node()) xpath_ast_node(ast_step, set, axis, nt_type, alloc_string(nt_name)); - + else + { + throw_error("Unrecognized node test"); + } + + const char_t* nt_name_copy = alloc_string(nt_name); + xpath_ast_node* n = new (alloc_node()) xpath_ast_node(ast_step, set, axis, nt_type, nt_name_copy); + xpath_ast_node* last = 0; - + while (_lexer.current() == lex_open_square_brace) { _lexer.next(); - + xpath_ast_node* expr = parse_expression(); xpath_ast_node* pred = new (alloc_node()) xpath_ast_node(ast_predicate, 0, expr, predicate_default); - + if (_lexer.current() != lex_close_square_brace) throw_error("Unmatched square brace"); _lexer.next(); - + if (last) last->set_next(pred); else n->set_right(pred); - + last = pred; } return n; } - + // RelativeLocationPath ::= Step | RelativeLocationPath '/' Step | RelativeLocationPath '//' Step xpath_ast_node* parse_relative_location_path(xpath_ast_node* set) { xpath_ast_node* n = parse_step(set); - + while (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash) { lexeme_t l = _lexer.current(); @@ -11318,13 +11493,13 @@ if (l == lex_double_slash) n = new (alloc_node()) xpath_ast_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0); - + n = parse_step(n); } - + return n; } - + // LocationPath ::= RelativeLocationPath | AbsoluteLocationPath // AbsoluteLocationPath ::= '/' RelativeLocationPath? | '//' RelativeLocationPath xpath_ast_node* parse_location_path() @@ -11332,7 +11507,7 @@ if (_lexer.current() == lex_slash) { _lexer.next(); - + xpath_ast_node* n = new (alloc_node()) xpath_ast_node(ast_step_root, xpath_type_node_set); // relative location path can start from axis_attribute, dot, double_dot, multiply and string lexemes; any other lexeme means standalone root path @@ -11346,17 +11521,17 @@ else if (_lexer.current() == lex_double_slash) { _lexer.next(); - + xpath_ast_node* n = new (alloc_node()) xpath_ast_node(ast_step_root, xpath_type_node_set); n = new (alloc_node()) xpath_ast_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0); - + return parse_relative_location_path(n); } // else clause moved outside of if because of bogus warning 'control may reach end of non-void function being inlined' in gcc 4.0.1 return parse_relative_location_path(0); } - + // PathExpr ::= LocationPath // | FilterExpr // | FilterExpr '/' RelativeLocationPath @@ -11372,7 +11547,7 @@ // '(' in case of it being an expression, string literal, number constant or // function call. - if (_lexer.current() == lex_var_ref || _lexer.current() == lex_open_brace || + if (_lexer.current() == lex_var_ref || _lexer.current() == lex_open_brace || _lexer.current() == lex_quoted_string || _lexer.current() == lex_number || _lexer.current() == lex_string) { @@ -11380,29 +11555,31 @@ { // This is either a function call, or not - if not, we shall proceed with location path const char_t* state = _lexer.state(); - + while (PUGI__IS_CHARTYPE(*state, ct_space)) ++state; - + if (*state != '(') return parse_location_path(); // This looks like a function call; however this still can be a node-test. Check it. - if (parse_node_test_type(_lexer.contents()) != nodetest_none) return parse_location_path(); + if (parse_node_test_type(_lexer.contents()) != nodetest_none) + return parse_location_path(); } - + xpath_ast_node* n = parse_filter_expression(); if (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash) { lexeme_t l = _lexer.current(); _lexer.next(); - + if (l == lex_double_slash) { - if (n->rettype() != xpath_type_node_set) throw_error("Step has to be applied to node set"); + if (n->rettype() != xpath_type_node_set) + throw_error("Step has to be applied to node set"); n = new (alloc_node()) xpath_ast_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0); } - + // select from location path return parse_relative_location_path(n); } @@ -11419,7 +11596,9 @@ return new (alloc_node()) xpath_ast_node(ast_op_negate, xpath_type_number, expr); } else + { return parse_location_path(); + } } struct binary_op_t @@ -11548,13 +11727,11 @@ xpath_ast_node* parse() { xpath_ast_node* result = parse_expression(); - + + // check if there are unparsed tokens left if (_lexer.current() != lex_eof) - { - // there are still unparsed tokens left, error throw_error("Incorrect query"); - } - + return result; } @@ -11642,7 +11819,7 @@ { assert(_result.error); } - + PUGI__FN const char* xpath_exception::what() const throw() { return _result.error; @@ -11653,15 +11830,15 @@ return _result; } #endif - + PUGI__FN xpath_node::xpath_node() { } - + PUGI__FN xpath_node::xpath_node(const xml_node& node_): _node(node_) { } - + PUGI__FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_) { } @@ -11670,12 +11847,12 @@ { return _attribute ? xml_node() : _node; } - + PUGI__FN xml_attribute xpath_node::attribute() const { return _attribute; } - + PUGI__FN xml_node xpath_node::parent() const { return _attribute ? _node : _node.parent(); @@ -11689,7 +11866,7 @@ { return (_node || _attribute) ? unspecified_bool_xpath_node : 0; } - + PUGI__FN bool xpath_node::operator!() const { return !(_node || _attribute); @@ -11699,7 +11876,7 @@ { return _node == n._node && _attribute == n._attribute; } - + PUGI__FN bool xpath_node::operator!=(const xpath_node& n) const { return _node != n._node || _attribute != n._attribute; @@ -11750,7 +11927,7 @@ } memcpy(storage, begin_, size_ * sizeof(xpath_node)); - + // deallocate old buffer if (_begin != &_storage) impl::xml_memory::deallocate(_begin); @@ -11761,7 +11938,7 @@ } } -#if __cplusplus >= 201103 +#ifdef PUGIXML_HAS_MOVE PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) { _type = rhs._type; @@ -11789,12 +11966,12 @@ if (_begin != &_storage) impl::xml_memory::deallocate(_begin); } - + PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(&_storage), _end(&_storage) { _assign(ns._begin, ns._end, ns._type); } - + PUGI__FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns) { if (this == &ns) return *this; @@ -11804,7 +11981,7 @@ return *this; } -#if __cplusplus >= 201103 +#ifdef PUGIXML_HAS_MOVE PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs): _type(type_unsorted), _begin(&_storage), _end(&_storage) { _move(rhs); @@ -11827,17 +12004,17 @@ { return _type; } - + PUGI__FN size_t xpath_node_set::size() const { return _end - _begin; } - + PUGI__FN bool xpath_node_set::empty() const { return _begin == _end; } - + PUGI__FN const xpath_node& xpath_node_set::operator[](size_t index) const { assert(index < size()); @@ -11848,12 +12025,12 @@ { return _begin; } - + PUGI__FN xpath_node_set::const_iterator xpath_node_set::end() const { return _end; } - + PUGI__FN void xpath_node_set::sort(bool reverse) { _type = impl::xpath_sort(_begin, _end, _type, reverse); @@ -11899,7 +12076,7 @@ return static_cast(this)->name; default: - assert(!"Invalid variable type"); + assert(false && "Invalid variable type"); return 0; } } @@ -12004,7 +12181,7 @@ return *this; } -#if __cplusplus >= 201103 +#ifdef PUGIXML_HAS_MOVE PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) { for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) @@ -12198,7 +12375,7 @@ impl::xpath_query_impl::destroy(static_cast(_impl)); } -#if __cplusplus >= 201103 +#ifdef PUGIXML_HAS_MOVE PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) { _impl = rhs._impl; @@ -12233,21 +12410,21 @@ PUGI__FN bool xpath_query::evaluate_boolean(const xpath_node& n) const { if (!_impl) return false; - + impl::xpath_context c(n, 1, 1); impl::xpath_stack_data sd; #ifdef PUGIXML_NO_EXCEPTIONS if (setjmp(sd.error_handler)) return false; #endif - + return static_cast(_impl)->root->eval_boolean(c, sd.stack); } - + PUGI__FN double xpath_query::evaluate_number(const xpath_node& n) const { if (!_impl) return impl::gen_nan(); - + impl::xpath_context c(n, 1, 1); impl::xpath_stack_data sd; @@ -12276,7 +12453,7 @@ impl::xpath_string r = impl::evaluate_string_impl(static_cast(_impl), n, sd); size_t full_size = r.length() + 1; - + if (capacity > 0) { size_t size = (full_size < capacity) ? full_size : capacity; @@ -12285,7 +12462,7 @@ memcpy(buffer, r.c_str(), (size - 1) * sizeof(char_t)); buffer[size - 1] = 0; } - + return full_size; } @@ -12398,6 +12575,7 @@ #undef PUGI__NS_END #undef PUGI__FN #undef PUGI__FN_NO_INLINE +#undef PUGI__GETHEADER_IMPL #undef PUGI__GETPAGE_IMPL #undef PUGI__GETPAGE #undef PUGI__NODETYPE @@ -12419,7 +12597,7 @@ #endif /** - * Copyright (c) 2006-2015 Arseny Kapoulkine + * Copyright (c) 2006-2016 Arseny Kapoulkine * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -12432,7 +12610,7 @@ * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND diff -Nru filezilla-3.15.0.2/src/pugixml/pugixml.hpp filezilla-3.33.0/src/pugixml/pugixml.hpp --- filezilla-3.15.0.2/src/pugixml/pugixml.hpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/pugixml/pugixml.hpp 2017-02-19 04:30:03.000000000 +0000 @@ -1,7 +1,7 @@ /** - * pugixml parser - version 1.7 + * pugixml parser - version 1.8 * -------------------------------------------------------- - * Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) + * Copyright (C) 2006-2016, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at http://pugixml.org/ * * This library is distributed under the MIT License. See notice at the end @@ -13,7 +13,7 @@ #ifndef PUGIXML_VERSION // Define version macro; evaluates to major * 100 + minor so that it's safe to use in less-than comparisons -# define PUGIXML_VERSION 170 +# define PUGIXML_VERSION 180 #endif // Include user configuration file (this can define various configuration macros) @@ -72,6 +72,24 @@ # endif #endif +// If the platform is known to have move semantics support, compile move ctor/operator implementation +#ifndef PUGIXML_HAS_MOVE +# if __cplusplus >= 201103 +# define PUGIXML_HAS_MOVE +# elif defined(_MSC_VER) && _MSC_VER >= 1600 +# define PUGIXML_HAS_MOVE +# endif +#endif + +// If C++ is 2011 or higher, add 'override' qualifiers +#ifndef PUGIXML_OVERRIDE +# if __cplusplus >= 201103 +# define PUGIXML_OVERRIDE override +# else +# define PUGIXML_OVERRIDE +# endif +#endif + // Character interface macros #ifdef PUGIXML_WCHAR_MODE # define PUGIXML_TEXT(t) L ## t @@ -133,13 +151,13 @@ // This flag determines if EOL characters are normalized (converted to #xA) during parsing. This flag is on by default. const unsigned int parse_eol = 0x0020; - + // This flag determines if attribute values are normalized using CDATA normalization rules during parsing. This flag is on by default. const unsigned int parse_wconv_attribute = 0x0040; // This flag determines if attribute values are normalized using NMTOKENS normalization rules during parsing. This flag is off by default. const unsigned int parse_wnorm_attribute = 0x0080; - + // This flag determines if document declaration (node_declaration) is added to the DOM tree. This flag is off by default. const unsigned int parse_declaration = 0x0100; @@ -158,6 +176,11 @@ // is a valid document. This flag is off by default. const unsigned int parse_fragment = 0x1000; + // This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of + // the document; this flag is only recommended for parsing documents with many PCDATA nodes in memory-constrained environments. + // This flag is off by default. + const unsigned int parse_embed_pcdata = 0x2000; + // The default parsing mode. // Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded, // End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules. @@ -184,16 +207,16 @@ }; // Formatting flags - + // Indent the nodes that are written to output stream with as many indentation strings as deep the node is in DOM tree. This flag is on by default. const unsigned int format_indent = 0x01; - + // Write encoding-specific BOM to the output stream. This flag is off by default. const unsigned int format_write_bom = 0x02; // Use raw output mode (no indentation and no line breaks are written). This flag is off by default. const unsigned int format_raw = 0x04; - + // Omit default XML declaration even if there is no declaration in the document. This flag is off by default. const unsigned int format_no_declaration = 0x08; @@ -206,6 +229,9 @@ // Write every attribute on a new line with appropriate indentation. This flag is off by default. const unsigned int format_indent_attributes = 0x40; + // Don't output empty element tags, instead writing an explicit start and end tag even if there are no children. This flag is off by default. + const unsigned int format_no_empty_element_tags = 0x80; + // The default set of formatting flags. // Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none. const unsigned int format_default = format_indent; @@ -225,7 +251,7 @@ class xml_node; class xml_text; - + #ifndef PUGIXML_NO_XPATH class xpath_node; class xpath_node_set; @@ -268,7 +294,7 @@ // Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio xml_writer_file(void* file); - virtual void write(const void* data, size_t size); + virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE; private: void* file; @@ -283,7 +309,7 @@ xml_writer_stream(std::basic_ostream >& stream); xml_writer_stream(std::basic_ostream >& stream); - virtual void write(const void* data, size_t size); + virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE; private: std::basic_ostream >* narrow_stream; @@ -299,13 +325,13 @@ private: xml_attribute_struct* _attr; - + typedef void (*unspecified_bool_type)(xml_attribute***); public: // Default constructor. Constructs an empty attribute. xml_attribute(); - + // Constructs attribute from internal pointer explicit xml_attribute(xml_attribute_struct* attr); @@ -354,6 +380,8 @@ // Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false") bool set_value(int rhs); bool set_value(unsigned int rhs); + bool set_value(long rhs); + bool set_value(unsigned long rhs); bool set_value(double rhs); bool set_value(float rhs); bool set_value(bool rhs); @@ -367,6 +395,8 @@ xml_attribute& operator=(const char_t* rhs); xml_attribute& operator=(int rhs); xml_attribute& operator=(unsigned int rhs); + xml_attribute& operator=(long rhs); + xml_attribute& operator=(unsigned long rhs); xml_attribute& operator=(double rhs); xml_attribute& operator=(float rhs); xml_attribute& operator=(bool rhs); @@ -417,7 +447,7 @@ // Borland C++ workaround bool operator!() const; - + // Comparison operators (compares wrapped node pointers) bool operator==(const xml_node& r) const; bool operator!=(const xml_node& r) const; @@ -438,7 +468,7 @@ // Get node value, or "" if node is empty or it has no value // Note: For text node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes. const char_t* value() const; - + // Get attribute list xml_attribute first_attribute() const; xml_attribute last_attribute() const; @@ -450,7 +480,7 @@ // Get next/previous sibling in the children list of the parent node xml_node next_sibling() const; xml_node previous_sibling() const; - + // Get parent node xml_node parent() const; @@ -478,7 +508,7 @@ // Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value) bool set_name(const char_t* rhs); bool set_value(const char_t* rhs); - + // Add attribute with specified name. Returns added attribute, or empty attribute on errors. xml_attribute append_attribute(const char_t* name); xml_attribute prepend_attribute(const char_t* name); @@ -532,11 +562,11 @@ template xml_attribute find_attribute(Predicate pred) const { if (!_root) return xml_attribute(); - + for (xml_attribute attrib = first_attribute(); attrib; attrib = attrib.next_attribute()) if (pred(attrib)) return attrib; - + return xml_attribute(); } @@ -544,11 +574,11 @@ template xml_node find_child(Predicate pred) const { if (!_root) return xml_node(); - + for (xml_node node = first_child(); node; node = node.next_sibling()) if (pred(node)) return node; - + return xml_node(); } @@ -558,7 +588,7 @@ if (!_root) return xml_node(); xml_node cur = first_child(); - + while (cur._root && cur._root != _root) { if (pred(cur)) return cur; @@ -590,7 +620,7 @@ // Recursively traverse subtree with xml_tree_walker bool traverse(xml_tree_walker& walker); - + #ifndef PUGIXML_NO_XPATH // Select single node by evaluating XPath query. Returns first node from the resulting node set. xpath_node select_node(const char_t* query, xpath_variable_set* variables = 0) const; @@ -605,7 +635,7 @@ xpath_node select_single_node(const xpath_query& query) const; #endif - + // Print subtree using a writer object void print(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const; @@ -701,6 +731,8 @@ // Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false") bool set(int rhs); bool set(unsigned int rhs); + bool set(long rhs); + bool set(unsigned long rhs); bool set(double rhs); bool set(float rhs); bool set(bool rhs); @@ -714,6 +746,8 @@ xml_text& operator=(const char_t* rhs); xml_text& operator=(int rhs); xml_text& operator=(unsigned int rhs); + xml_text& operator=(long rhs); + xml_text& operator=(unsigned long rhs); xml_text& operator=(double rhs); xml_text& operator=(float rhs); xml_text& operator=(bool rhs); @@ -867,11 +901,11 @@ private: int _depth; - + protected: // Get current traversal depth int depth() const; - + public: xml_tree_walker(); virtual ~xml_tree_walker(); @@ -942,13 +976,13 @@ char_t* _buffer; char _memory[192]; - + // Non-copyable semantics xml_document(const xml_document&); xml_document& operator=(const xml_document&); - void create(); - void destroy(); + void _create(); + void _destroy(); public: // Default constructor, makes empty document @@ -1051,7 +1085,7 @@ // Non-copyable semantics xpath_variable(const xpath_variable&); xpath_variable& operator=(const xpath_variable&); - + public: // Get variable name const char_t* name() const; @@ -1095,7 +1129,7 @@ xpath_variable_set(const xpath_variable_set& rhs); xpath_variable_set& operator=(const xpath_variable_set& rhs); - #if __cplusplus >= 201103 + #ifdef PUGIXML_HAS_MOVE // Move semantics support xpath_variable_set(xpath_variable_set&& rhs); xpath_variable_set& operator=(xpath_variable_set&& rhs); @@ -1139,7 +1173,7 @@ // Destructor ~xpath_query(); - #if __cplusplus >= 201103 + #ifdef PUGIXML_HAS_MOVE // Move semantics support xpath_query(xpath_query&& rhs); xpath_query& operator=(xpath_query&& rhs); @@ -1147,21 +1181,21 @@ // Get query expression return type xpath_value_type return_type() const; - + // Evaluate expression as boolean value in the specified context; performs type conversion if necessary. // If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors. bool evaluate_boolean(const xpath_node& n) const; - + // Evaluate expression as double value in the specified context; performs type conversion if necessary. // If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors. double evaluate_number(const xpath_node& n) const; - + #ifndef PUGIXML_NO_STL // Evaluate expression as string value in the specified context; performs type conversion if necessary. // If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors. string_t evaluate_string(const xpath_node& n) const; #endif - + // Evaluate expression as string value in the specified context; performs type conversion if necessary. // At most capacity characters are written to the destination buffer, full result size is returned (includes terminating zero). // If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors. @@ -1188,7 +1222,7 @@ // Borland C++ workaround bool operator!() const; }; - + #ifndef PUGIXML_NO_EXCEPTIONS // XPath exception class class PUGIXML_CLASS xpath_exception: public std::exception @@ -1201,26 +1235,26 @@ explicit xpath_exception(const xpath_parse_result& result); // Get error message - virtual const char* what() const throw(); + virtual const char* what() const throw() PUGIXML_OVERRIDE; // Get parse result const xpath_parse_result& result() const; }; #endif - + // XPath node class (either xml_node or xml_attribute) class PUGIXML_CLASS xpath_node { private: xml_node _node; xml_attribute _attribute; - + typedef void (*unspecified_bool_type)(xpath_node***); public: // Default constructor; constructs empty XPath node xpath_node(); - + // Construct XPath node from XML node/attribute xpath_node(const xml_node& node); xpath_node(const xml_attribute& attribute, const xml_node& parent); @@ -1228,13 +1262,13 @@ // Get node/attribute, if any xml_node node() const; xml_attribute attribute() const; - + // Get parent of contained node/attribute xml_node parent() const; // Safe bool conversion operator operator unspecified_bool_type() const; - + // Borland C++ workaround bool operator!() const; @@ -1260,13 +1294,13 @@ type_sorted, // Sorted by document order (ascending) type_sorted_reverse // Sorted by document order (descending) }; - + // Constant iterator type typedef const xpath_node* const_iterator; // We define non-constant iterator to be the same as constant iterator so that various generic algorithms (i.e. boost foreach) work typedef const xpath_node* iterator; - + // Default constructor. Constructs empty set. xpath_node_set(); @@ -1275,12 +1309,12 @@ // Destructor ~xpath_node_set(); - + // Copy constructor/assignment operator xpath_node_set(const xpath_node_set& ns); xpath_node_set& operator=(const xpath_node_set& ns); - #if __cplusplus >= 201103 + #ifdef PUGIXML_HAS_MOVE // Move semantics support xpath_node_set(xpath_node_set&& rhs); xpath_node_set& operator=(xpath_node_set&& rhs); @@ -1288,31 +1322,31 @@ // Get collection type type_t type() const; - + // Get collection size size_t size() const; // Indexing operator const xpath_node& operator[](size_t index) const; - + // Collection iterators const_iterator begin() const; const_iterator end() const; // Sort the collection in ascending/descending order by document order void sort(bool reverse = false); - + // Get first node in the collection by document order xpath_node first() const; - + // Check if collection is empty bool empty() const; - + private: type_t _type; - + xpath_node _storage; - + xpath_node* _begin; xpath_node* _end; @@ -1325,7 +1359,7 @@ // Convert wide string to UTF8 std::basic_string, std::allocator > PUGIXML_FUNCTION as_utf8(const wchar_t* str); std::basic_string, std::allocator > PUGIXML_FUNCTION as_utf8(const std::basic_string, std::allocator >& str); - + // Convert UTF8 to wide string std::basic_string, std::allocator > PUGIXML_FUNCTION as_wide(const char* str); std::basic_string, std::allocator > PUGIXML_FUNCTION as_wide(const std::basic_string, std::allocator >& str); @@ -1333,13 +1367,13 @@ // Memory allocation function interface; returns pointer to allocated memory or NULL on failure typedef void* (*allocation_function)(size_t size); - + // Memory deallocation function interface typedef void (*deallocation_function)(void* ptr); // Override default memory management functions. All subsequent allocations/deallocations will be performed via supplied functions. void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate); - + // Get current memory management functions allocation_function PUGIXML_FUNCTION get_memory_allocation_function(); deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function(); @@ -1375,7 +1409,7 @@ #endif /** - * Copyright (c) 2006-2015 Arseny Kapoulkine + * Copyright (c) 2006-2016 Arseny Kapoulkine * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -1388,7 +1422,7 @@ * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND diff -Nru filezilla-3.15.0.2/src/pugixml/pugixml.vcxproj filezilla-3.33.0/src/pugixml/pugixml.vcxproj --- filezilla-3.15.0.2/src/pugixml/pugixml.vcxproj 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/pugixml/pugixml.vcxproj 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@  - + Debug @@ -13,18 +13,19 @@ {593A4FB1-1787-4192-BF73-9C43BF8FC142} FileZilla + 10.0.15063.0 StaticLibrary - v140 + v141 false Unicode true StaticLibrary - v140 + v141 false Unicode false diff -Nru filezilla-3.15.0.2/src/putty/cmdgen.c filezilla-3.33.0/src/putty/cmdgen.c --- filezilla-3.15.0.2/src/putty/cmdgen.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/cmdgen.c 2018-01-03 04:30:05.000000000 +0000 @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include "putty.h" #include "ssh.h" @@ -54,6 +56,9 @@ { } +/* For Unix in particular, but harmless if this main() is reused elsewhere */ +const int buildinfo_gtk_relevant = FALSE; + int main(int argc, char **argv) { Filename *infilename = NULL; @@ -66,9 +71,9 @@ char* fingerprint = 0; printf("fzputtygen\n"); - printf("Copyright (C) 2008-2016 Tim Kosse\n"); + printf("Copyright (C) 2008-2018 Tim Kosse\n"); printf("Based on PuTTY's puttygen\n"); - printf("Copyright (C) 1997-2015 Simon Tatham and the PuTTY team\n"); + printf("Copyright (C) 1997-2018 Simon Tatham and the PuTTY team\n"); printf("Converts private SSH keys into PuTTY's format.\n"); printf("This program is used by FileZilla and not intended to be used directly.\n"); printf("Use the puttygen tool from PuTTY for a human-usable tool.\n"); @@ -220,8 +225,6 @@ } else if (!strcmp(cmd, "fingerprint")) { const char* error = 0; - void* blob = NULL; - int bloblen = 0; if (!fingerprint) { if (ssh2key) { diff -Nru filezilla-3.15.0.2/src/putty/cmdline.c filezilla-3.33.0/src/putty/cmdline.c --- filezilla-3.15.0.2/src/putty/cmdline.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/cmdline.c 2017-09-19 21:36:39.000000000 +0000 @@ -403,7 +403,18 @@ SAVEABLE(0); conf_set_int(conf, CONF_tryagent, FALSE); } - + if (!strcmp(p, "-share")) { + RETURN(1); + UNAVAILABLE_IN(TOOLTYPE_NONNETWORK); + SAVEABLE(0); + conf_set_int(conf, CONF_ssh_connection_sharing, TRUE); + } + if (!strcmp(p, "-noshare")) { + RETURN(1); + UNAVAILABLE_IN(TOOLTYPE_NONNETWORK); + SAVEABLE(0); + conf_set_int(conf, CONF_ssh_connection_sharing, FALSE); + } if (!strcmp(p, "-A")) { RETURN(1); UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK); @@ -601,6 +612,26 @@ filename_free(fn); } + if (!strcmp(p, "-proxycmd")) { + RETURN(2); + UNAVAILABLE_IN(TOOLTYPE_NONNETWORK); + SAVEABLE(0); + conf_set_int(conf, CONF_proxy_type, PROXY_CMD); + conf_set_str(conf, CONF_proxy_telnet_command, value); + } + +#ifdef _WINDOWS + /* + * Cross-tool options only available on Windows. + */ + if (!strcmp(p, "-restrict-acl") || !strcmp(p, "-restrict_acl") || + !strcmp(p, "-restrictacl")) { + RETURN(1); + restrict_process_acl(); + restricted_acl = TRUE; + } +#endif + return ret; /* unrecognised */ } diff -Nru filezilla-3.15.0.2/src/putty/cproxy.c filezilla-3.33.0/src/putty/cproxy.c --- filezilla-3.15.0.2/src/putty/cproxy.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/cproxy.c 2017-09-19 21:36:39.000000000 +0000 @@ -173,7 +173,8 @@ chapbuf[5] = '\x02'; /* Second attribute - username */ ulen = strlen(username); - if (ulen > 255) ulen = 255; if (ulen < 1) ulen = 1; + if (ulen > 255) ulen = 255; + if (ulen < 1) ulen = 1; chapbuf[6] = ulen; memcpy(chapbuf+7, username, ulen); diff -Nru filezilla-3.15.0.2/src/putty/fzprintf.c filezilla-3.33.0/src/putty/fzprintf.c --- filezilla-3.15.0.2/src/putty/fzprintf.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/fzprintf.c 2016-07-21 18:14:43.000000000 +0000 @@ -14,8 +14,7 @@ char* str, *p, *s; va_start(ap, fmt); str = dupvprintf(fmt, ap); - if (!*str) - { + if (!*str) { sfree(str); va_end(ap); @@ -26,23 +25,19 @@ } p = str; s = str; - while (1) - { - if (*p == '\r' || *p == '\n') - { - if (p != s) - { + while (1) { + if (*p == '\r' || *p == '\n') { + if (p != s) { *p = 0; fprintf(stdout, "%c%s\n", (int)type + '0', s); s = p + 1; } - else + else { s++; + } } - else if (!*p) - { - if (p != s) - { + else if (!*p) { + if (p != s) { *p = 0; fprintf(stdout, "%c%s\n", (int)type + '0', s); s = p + 1; @@ -51,12 +46,12 @@ } p++; } + fflush(stdout); + sfree(str); va_end(ap); - fflush(stdout); - return 0; } @@ -68,31 +63,33 @@ str = dupvprintf(fmt, ap); p = str; s = str; - while (*p) - { - if (*p == '\r') + while (*p) { + if (*p == '\r') { p++; - else if (*p == '\n') - { - if (s != str) + } + else if (*p == '\n') { + if (s != str) { *s++ = ' '; + } p++; } - else if (*p) + else if (*p) { *s++ = *p++; + } } - while (s != str && *(s - 1) == ' ') - s--; *s = 0; - if (*str) - fprintf(stdout, "%c%s\n", (int)type + '0', str); + + if (type != sftpUnknown) { + fputc((int)type + '0', stdout); + } + fputs(str, stdout); + fputc('\n', stdout); + fflush(stdout); sfree(str); va_end(ap); - fflush(stdout); - return 0; } @@ -105,13 +102,12 @@ fputc((char)type + '0', stdout); fputs(str, stdout); + fflush(stdout); sfree(str); va_end(ap); - fflush(stdout); - return 0; } diff -Nru filezilla-3.15.0.2/src/putty/fzprintf.h filezilla-3.33.0/src/putty/fzprintf.h --- filezilla-3.15.0.2/src/putty/fzprintf.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/fzprintf.h 2017-01-09 16:00:55.000000000 +0000 @@ -1,4 +1,4 @@ -#define FZSFTP_PROTOCOL_VERSION 4 +#define FZSFTP_PROTOCOL_VERSION 8 typedef enum { @@ -7,12 +7,15 @@ sftpDone, sftpError, sftpVerbose, + sftpInfo, sftpStatus, sftpRecv, /* socket */ sftpSend, /* socket */ - sftpClose, - sftpRequest, sftpListentry, + sftpAskHostkey, + sftpAskHostkeyChanged, + sftpAskHostkeyBetteralg, + sftpAskPassword, sftpTransfer, /* payload: when written to local file (download) or acknowledged by server (upload) */ sftpRequestPreamble, sftpRequestInstruction, @@ -20,7 +23,7 @@ sftpUsedQuotaSend, sftpKexAlgorithm, sftpKexHash, - sftpKexCurve, + sftpKexCurve, sftpCipherClientToServer, sftpCipherServerToClient, sftpMacClientToServer, @@ -28,16 +31,14 @@ sftpHostkey } sftpEventTypes; -enum sftpRequestTypes -{ - sftpReqPassword, - sftpReqHostkey, - sftpReqHostkeyChanged, - sftpReqUnknown -}; - int fznotify(sftpEventTypes type); + +// Format the string. Each line of the string is prepended by type int fzprintf(sftpEventTypes type, const char* p, ...); + +// Format the string, then print the type and the string as-is. Caller is responsible to add trailing linebreak int fzprintf_raw(sftpEventTypes type, const char* p, ...); + +// Format the string, then print the type (if not sftpUnknown) and the string with linebreaks replaced by spaces. int fzprintf_raw_untrusted(sftpEventTypes type, const char* p, ...); int fznotify1(sftpEventTypes type, int data); diff -Nru filezilla-3.15.0.2/src/putty/fzsftp.c filezilla-3.33.0/src/putty/fzsftp.c --- filezilla-3.15.0.2/src/putty/fzsftp.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/fzsftp.c 2017-09-19 21:36:39.000000000 +0000 @@ -46,8 +46,12 @@ { if (input_pushback != 0) fatalbox("input_pushback not null!"); - else - input_pushback = strdup(buffer); + else { + int pos = strcspn(buffer, "\n") + 1; + input_pushback = snewn(pos + 1, char); + strncpy(input_pushback, buffer, pos); + input_pushback[pos] = 0; + } } else ProcessQuotaCmd(buffer); @@ -71,7 +75,7 @@ if (input_pushback != 0) fatalbox("input_pushback not null!"); else - input_pushback = strdup(line); + input_pushback = strndup(line, strcspn(line, "\n") + 1); } else ProcessQuotaCmd(line); diff -Nru filezilla-3.15.0.2/src/putty/fzsftp.h filezilla-3.33.0/src/putty/fzsftp.h --- filezilla-3.15.0.2/src/putty/fzsftp.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/fzsftp.h 2017-09-19 21:36:39.000000000 +0000 @@ -1,5 +1,5 @@ -#ifndef __FZSFTP_H__ -#define __FZSFTP_H__ +#ifndef FILEZILLA_PUTTY_FZSFTP_HEADER +#define FILEZILLA_PUTTY_FZSFTP_HEADER int ProcessQuotaCmd(const char* line); int RequestQuota(int i, int bytes); diff -Nru filezilla-3.15.0.2/src/putty/import.c filezilla-3.33.0/src/putty/import.c --- filezilla-3.15.0.2/src/putty/import.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/import.c 2018-04-25 03:30:06.000000000 +0000 @@ -445,7 +445,7 @@ if (!strcmp(p, "ENCRYPTED")) ret->encrypted = TRUE; } else if (!strcmp(line, "DEK-Info")) { - int i, j, ivlen; + int i, ivlen; if (!strncmp(p, "DES-EDE3-CBC,", 13)) { ret->encryption = OP_E_3DES; @@ -459,6 +459,7 @@ } p = strchr(p, ',') + 1;/* always non-NULL, by above checks */ for (i = 0; i < ivlen; i++) { + unsigned j; if (1 != sscanf(p, "%2x", &j)) { errmsg = "expected more iv data in DEK-Info"; goto error; @@ -1269,7 +1270,7 @@ */ typedef enum { - ON_E_NONE, ON_E_AES256CBC + ON_E_NONE, ON_E_AES256CBC, ON_E_AES256CTR } openssh_new_cipher; typedef enum { ON_K_NONE, ON_K_BCRYPT @@ -1408,6 +1409,8 @@ ret->cipher = ON_E_NONE; } else if (match_ssh_id(stringlen, string, "aes256-cbc")) { ret->cipher = ON_E_AES256CBC; + } else if (match_ssh_id(stringlen, string, "aes256-ctr")) { + ret->cipher = ON_E_AES256CTR; } else { errmsg = "unrecognised cipher name\n"; goto error; @@ -1543,18 +1546,14 @@ const char **errmsg_p) { struct openssh_new_key *key = load_openssh_new_key(filename, errmsg_p); - struct ssh2_userkey *retkey; + struct ssh2_userkey *retkey = NULL; int i; struct ssh2_userkey *retval = NULL; const char *errmsg; - unsigned char *blob; - int blobsize = 0; unsigned checkint0, checkint1; const void *priv, *string; int privlen, stringlen, key_index; - const struct ssh_signkey *alg; - - blob = NULL; + const struct ssh_signkey *alg = NULL; if (!key) return NULL; @@ -1571,6 +1570,7 @@ keysize = 0; break; case ON_E_AES256CBC: + case ON_E_AES256CTR: keysize = 48; /* 32 byte key + 16 byte IV */ break; default: @@ -1595,6 +1595,7 @@ case ON_E_NONE: break; case ON_E_AES256CBC: + case ON_E_AES256CTR: if (key->privatelen % 16 != 0) { errmsg = "private key container length is not a" " multiple of AES block size\n"; @@ -1604,8 +1605,14 @@ void *ctx = aes_make_context(); aes256_key(ctx, keybuf); aes_iv(ctx, keybuf + 32); - aes_ssh2_decrypt_blk(ctx, key->privatestr, - key->privatelen); + if (key->cipher == ON_E_AES256CBC) { + aes_ssh2_decrypt_blk(ctx, key->privatestr, + key->privatelen); + } + else { + aes_ssh2_sdctr(ctx, key->privatestr, + key->privatelen); + } aes_free_context(ctx); } break; @@ -1678,10 +1685,10 @@ (const unsigned char *)thiskey); if (key_index == key->key_wanted) { retkey = snew(struct ssh2_userkey); + retkey->comment = NULL; retkey->alg = alg; retkey->data = alg->openssh_createkey(alg, &thiskey, &thiskeylen); if (!retkey->data) { - sfree(retkey); errmsg = "unable to create key data structure"; goto error; } @@ -1718,11 +1725,16 @@ errmsg = NULL; /* no error */ retval = retkey; + retkey = NULL; /* prevent the free */ error: - if (blob) { - smemclr(blob, blobsize); - sfree(blob); + if (retkey) { + sfree(retkey->comment); + if (retkey->data) { + assert(alg); + alg->freekey(retkey->data); + } + sfree(retkey); } smemclr(key->keyblob, key->keyblob_size); sfree(key->keyblob); diff -Nru filezilla-3.15.0.2/src/putty/int64.h filezilla-3.33.0/src/putty/int64.h --- filezilla-3.15.0.2/src/putty/int64.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/int64.h 2017-09-19 21:36:39.000000000 +0000 @@ -9,7 +9,6 @@ unsigned long hi, lo; } uint64; -#ifndef SHA512_STANDALONE uint64 uint64_div10(uint64 x, int *remainder); void uint64_decimal(uint64 x, char *buffer); uint64 uint64_make(unsigned long hi, unsigned long lo); @@ -21,6 +20,5 @@ uint64 uint64_shift_right(uint64 x, int shift); uint64 uint64_shift_left(uint64 x, int shift); uint64 uint64_from_decimal(char *str); -#endif #endif diff -Nru filezilla-3.15.0.2/src/putty/Makefile.am filezilla-3.33.0/src/putty/Makefile.am --- filezilla-3.15.0.2/src/putty/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/Makefile.am 2017-09-19 21:36:39.000000000 +0000 @@ -57,11 +57,15 @@ settings.c fzputtygen_SOURCES = cmdgen.c \ - notiming.c + notiming.c \ + version.c + noinst_HEADERS = fzprintf.h \ fzsftp.h \ - int64.h misc.h network.h proxy.h psftp.h putty.h \ + int64.h misc.h network.h \ + pageant.h \ + proxy.h psftp.h putty.h \ puttymem.h puttyps.h sftp.h ssh.h \ sshblowf.h \ sshbn.h \ @@ -75,6 +79,8 @@ AM_CPPFLAGS = -I$(srcdir)/$(FRONTEND) -I../../config.h fzsftp_LDADD = libfzputtycommon.a +fzsftp_LDADD += $(NETTLE_LIBS) + if SFTP_UNIX libfzputtycommon_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 @@ -85,10 +91,8 @@ fzputtygen_SOURCES += tree234.c fzputtygen_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI - fzputtygen_LDADD = unix/libfzputtycommon_ux.a libfzputtycommon.a -endif - -if SFTP_MINGW + fzputtygen_LDADD = unix/libfzputtycommon_ux.a libfzputtycommon.a $(NETTLE_LIBS) +else libfzputtycommon_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_WINDOWS fzsftp_SOURCES += pproxy.c @@ -97,14 +101,18 @@ fzsftp_LDADD += -lws2_32 -lole32 fzputtygen_CPPFLAGS = $(AM_CPPFLAGS) -D_WINDOWS -DNO_GSSAPI - fzputtygen_LDADD = windows/libfzputtycommon_win.a libfzputtycommon.a $(RESOURCEFILE) + fzputtygen_LDADD = windows/libfzputtycommon_win.a libfzputtycommon.a $(RESOURCEFILE) $(NETTLE_LIBS) fzputtygen_LDADD += -lole32 endif +libfzputtycommon_a_CPPFLAGS += $(NETTLE_CFLAGS) +fzsftp_CPPFLAGS += $(NETTLE_CFLAGS) +fzputtygen_CPPFLAGS += $(NETTLE_CFLAGS) + if MACAPPBUNDLE noinst_DATA = $(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp$(EXEEXT) endif - + $(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp$(EXEEXT): fzsftp fzputtygen mkdir -p $(top_builddir)/FileZilla.app/Contents/MacOS cp -f fzsftp $(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp diff -Nru filezilla-3.15.0.2/src/putty/Makefile.in filezilla-3.33.0/src/putty/Makefile.in --- filezilla-3.15.0.2/src/putty/Makefile.in 2016-02-10 19:38:52.000000000 +0000 +++ filezilla-3.33.0/src/putty/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -85,21 +95,22 @@ @SFTP_UNIX_TRUE@am__append_1 = time.c @SFTP_UNIX_TRUE@am__append_2 = unix/libfzsftp_ux.a unix/libfzputtycommon_ux.a @SFTP_UNIX_TRUE@am__append_3 = tree234.c -@SFTP_MINGW_TRUE@am__append_4 = pproxy.c -@SFTP_MINGW_TRUE@am__append_5 = windows/libfzsftp_win.a \ -@SFTP_MINGW_TRUE@ windows/libfzputtycommon_win.a \ -@SFTP_MINGW_TRUE@ $(RESOURCEFILE) -lws2_32 -lole32 +@SFTP_UNIX_FALSE@am__append_4 = pproxy.c +@SFTP_UNIX_FALSE@am__append_5 = windows/libfzsftp_win.a \ +@SFTP_UNIX_FALSE@ windows/libfzputtycommon_win.a \ +@SFTP_UNIX_FALSE@ $(RESOURCEFILE) -lws2_32 -lole32 subdir = src/putty -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(noinst_HEADERS) COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -111,6 +122,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -145,17 +158,19 @@ libfzputtycommon_a_OBJECTS = $(am_libfzputtycommon_a_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am__fzputtygen_SOURCES_DIST = cmdgen.c notiming.c tree234.c +am__fzputtygen_SOURCES_DIST = cmdgen.c notiming.c version.c tree234.c @SFTP_UNIX_TRUE@am__objects_1 = fzputtygen-tree234.$(OBJEXT) am_fzputtygen_OBJECTS = fzputtygen-cmdgen.$(OBJEXT) \ - fzputtygen-notiming.$(OBJEXT) $(am__objects_1) + fzputtygen-notiming.$(OBJEXT) fzputtygen-version.$(OBJEXT) \ + $(am__objects_1) fzputtygen_OBJECTS = $(am_fzputtygen_OBJECTS) -@SFTP_MINGW_FALSE@@SFTP_UNIX_TRUE@fzputtygen_DEPENDENCIES = \ -@SFTP_MINGW_FALSE@@SFTP_UNIX_TRUE@ unix/libfzputtycommon_ux.a \ -@SFTP_MINGW_FALSE@@SFTP_UNIX_TRUE@ libfzputtycommon.a -@SFTP_MINGW_TRUE@fzputtygen_DEPENDENCIES = \ -@SFTP_MINGW_TRUE@ windows/libfzputtycommon_win.a \ -@SFTP_MINGW_TRUE@ libfzputtycommon.a $(RESOURCEFILE) +am__DEPENDENCIES_1 = +@SFTP_UNIX_FALSE@fzputtygen_DEPENDENCIES = \ +@SFTP_UNIX_FALSE@ windows/libfzputtycommon_win.a \ +@SFTP_UNIX_FALSE@ libfzputtycommon.a $(RESOURCEFILE) \ +@SFTP_UNIX_FALSE@ $(am__DEPENDENCIES_1) +@SFTP_UNIX_TRUE@fzputtygen_DEPENDENCIES = unix/libfzputtycommon_ux.a \ +@SFTP_UNIX_TRUE@ libfzputtycommon.a $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -167,7 +182,7 @@ logging.c psftp.c cmdline.c timing.c version.c settings.c \ time.c pproxy.c @SFTP_UNIX_TRUE@am__objects_2 = fzsftp-time.$(OBJEXT) -@SFTP_MINGW_TRUE@am__objects_3 = fzsftp-pproxy.$(OBJEXT) +@SFTP_UNIX_FALSE@am__objects_3 = fzsftp-pproxy.$(OBJEXT) am_fzsftp_OBJECTS = fzsftp-be_misc.$(OBJEXT) fzsftp-be_none.$(OBJEXT) \ fzsftp-callback.$(OBJEXT) fzsftp-cproxy.$(OBJEXT) \ fzsftp-errsock.$(OBJEXT) fzsftp-fzsftp.$(OBJEXT) \ @@ -184,11 +199,11 @@ fzsftp-timing.$(OBJEXT) fzsftp-version.$(OBJEXT) \ fzsftp-settings.$(OBJEXT) $(am__objects_2) $(am__objects_3) fzsftp_OBJECTS = $(am_fzsftp_OBJECTS) -@SFTP_MINGW_TRUE@am__DEPENDENCIES_1 = windows/libfzsftp_win.a \ -@SFTP_MINGW_TRUE@ windows/libfzputtycommon_win.a \ -@SFTP_MINGW_TRUE@ $(RESOURCEFILE) -fzsftp_DEPENDENCIES = libfzputtycommon.a $(am__append_2) \ - $(am__DEPENDENCIES_1) +@SFTP_UNIX_FALSE@am__DEPENDENCIES_2 = windows/libfzsftp_win.a \ +@SFTP_UNIX_FALSE@ windows/libfzputtycommon_win.a \ +@SFTP_UNIX_FALSE@ $(RESOURCEFILE) +fzsftp_DEPENDENCIES = libfzputtycommon.a $(am__DEPENDENCIES_1) \ + $(am__append_2) $(am__DEPENDENCIES_2) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -270,6 +285,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = windows unix . +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \ + COPYING DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -306,11 +323,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -334,6 +351,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -354,16 +373,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -415,6 +442,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -454,6 +482,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -496,10 +525,12 @@ wildcard.c pinger.c ssharcf.c sftp.c int64.c logging.c psftp.c \ cmdline.c timing.c version.c settings.c $(am__append_1) \ $(am__append_4) -fzputtygen_SOURCES = cmdgen.c notiming.c $(am__append_3) +fzputtygen_SOURCES = cmdgen.c notiming.c version.c $(am__append_3) noinst_HEADERS = fzprintf.h \ fzsftp.h \ - int64.h misc.h network.h proxy.h psftp.h putty.h \ + int64.h misc.h network.h \ + pageant.h \ + proxy.h psftp.h putty.h \ puttymem.h puttyps.h sftp.h ssh.h \ sshblowf.h \ sshbn.h \ @@ -508,16 +539,26 @@ @USE_RESOURCEFILE_TRUE@RESOURCEFILE = windows/psftp.o AM_CPPFLAGS = -I$(srcdir)/$(FRONTEND) -I../../config.h -fzsftp_LDADD = libfzputtycommon.a $(am__append_2) $(am__append_5) -@SFTP_MINGW_TRUE@libfzputtycommon_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_WINDOWS -@SFTP_UNIX_TRUE@libfzputtycommon_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 -@SFTP_MINGW_TRUE@fzsftp_CPPFLAGS = $(AM_CPPFLAGS) -D_WINDOWS -DNO_GSSAPI -@SFTP_UNIX_TRUE@fzsftp_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64 -DNO_GSSAPI -@SFTP_MINGW_TRUE@fzputtygen_CPPFLAGS = $(AM_CPPFLAGS) -D_WINDOWS -DNO_GSSAPI -@SFTP_UNIX_TRUE@fzputtygen_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -@SFTP_MINGW_TRUE@fzputtygen_LDADD = windows/libfzputtycommon_win.a \ -@SFTP_MINGW_TRUE@ libfzputtycommon.a $(RESOURCEFILE) -lole32 -@SFTP_UNIX_TRUE@fzputtygen_LDADD = unix/libfzputtycommon_ux.a libfzputtycommon.a +fzsftp_LDADD = libfzputtycommon.a $(NETTLE_LIBS) $(am__append_2) \ + $(am__append_5) +@SFTP_UNIX_FALSE@libfzputtycommon_a_CPPFLAGS = $(AM_CPPFLAGS) \ +@SFTP_UNIX_FALSE@ -DNO_GSSAPI -D_WINDOWS $(NETTLE_CFLAGS) +@SFTP_UNIX_TRUE@libfzputtycommon_a_CPPFLAGS = $(AM_CPPFLAGS) \ +@SFTP_UNIX_TRUE@ -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 \ +@SFTP_UNIX_TRUE@ $(NETTLE_CFLAGS) +@SFTP_UNIX_FALSE@fzsftp_CPPFLAGS = $(AM_CPPFLAGS) -D_WINDOWS \ +@SFTP_UNIX_FALSE@ -DNO_GSSAPI $(NETTLE_CFLAGS) +@SFTP_UNIX_TRUE@fzsftp_CPPFLAGS = $(AM_CPPFLAGS) \ +@SFTP_UNIX_TRUE@ -D_FILE_OFFSET_BITS=64 -DNO_GSSAPI \ +@SFTP_UNIX_TRUE@ $(NETTLE_CFLAGS) +@SFTP_UNIX_FALSE@fzputtygen_CPPFLAGS = $(AM_CPPFLAGS) -D_WINDOWS \ +@SFTP_UNIX_FALSE@ -DNO_GSSAPI $(NETTLE_CFLAGS) +@SFTP_UNIX_TRUE@fzputtygen_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI \ +@SFTP_UNIX_TRUE@ $(NETTLE_CFLAGS) +@SFTP_UNIX_FALSE@fzputtygen_LDADD = windows/libfzputtycommon_win.a \ +@SFTP_UNIX_FALSE@ libfzputtycommon.a $(RESOURCEFILE) \ +@SFTP_UNIX_FALSE@ $(NETTLE_LIBS) -lole32 +@SFTP_UNIX_TRUE@fzputtygen_LDADD = unix/libfzputtycommon_ux.a libfzputtycommon.a $(NETTLE_LIBS) @MACAPPBUNDLE_TRUE@noinst_DATA = $(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp$(EXEEXT) all: all-recursive @@ -535,7 +576,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/putty/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/putty/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -628,6 +668,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fzputtygen-cmdgen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fzputtygen-notiming.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fzputtygen-tree234.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fzputtygen-version.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fzsftp-be_misc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fzsftp-be_none.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fzsftp-callback.Po@am__quote@ @@ -994,6 +1035,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzputtygen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fzputtygen-notiming.obj `if test -f 'notiming.c'; then $(CYGPATH_W) 'notiming.c'; else $(CYGPATH_W) '$(srcdir)/notiming.c'; fi` +fzputtygen-version.o: version.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzputtygen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fzputtygen-version.o -MD -MP -MF $(DEPDIR)/fzputtygen-version.Tpo -c -o fzputtygen-version.o `test -f 'version.c' || echo '$(srcdir)/'`version.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fzputtygen-version.Tpo $(DEPDIR)/fzputtygen-version.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='version.c' object='fzputtygen-version.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzputtygen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fzputtygen-version.o `test -f 'version.c' || echo '$(srcdir)/'`version.c + +fzputtygen-version.obj: version.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzputtygen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fzputtygen-version.obj -MD -MP -MF $(DEPDIR)/fzputtygen-version.Tpo -c -o fzputtygen-version.obj `if test -f 'version.c'; then $(CYGPATH_W) 'version.c'; else $(CYGPATH_W) '$(srcdir)/version.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fzputtygen-version.Tpo $(DEPDIR)/fzputtygen-version.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='version.c' object='fzputtygen-version.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzputtygen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fzputtygen-version.obj `if test -f 'version.c'; then $(CYGPATH_W) 'version.c'; else $(CYGPATH_W) '$(srcdir)/version.c'; fi` + fzputtygen-tree234.o: tree234.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzputtygen_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fzputtygen-tree234.o -MD -MP -MF $(DEPDIR)/fzputtygen-tree234.Tpo -c -o fzputtygen-tree234.o `test -f 'tree234.c' || echo '$(srcdir)/'`tree234.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fzputtygen-tree234.Tpo $(DEPDIR)/fzputtygen-tree234.Po @@ -1728,6 +1783,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS +.PRECIOUS: Makefile + $(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp$(EXEEXT): fzsftp fzputtygen mkdir -p $(top_builddir)/FileZilla.app/Contents/MacOS diff -Nru filezilla-3.15.0.2/src/putty/misc.c filezilla-3.33.0/src/putty/misc.c --- filezilla-3.15.0.2/src/putty/misc.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/misc.c 2017-09-19 21:36:39.000000000 +0000 @@ -157,7 +157,8 @@ passes++; \ } else { \ printf("fail: %s(%s,%s)%s = %u, expected %u\n", \ - #func, #string, #arg2, #suffix, ret, result); \ + #func, #string, #arg2, #suffix, ret, \ + (unsigned)result); \ fails++; \ } \ } while (0) @@ -394,25 +395,23 @@ * directive we don't know about, we should panic and die rather * than run any risk. */ -char *dupprintf(const char *fmt, ...) -{ - char *ret; - va_list ap; - va_start(ap, fmt); - ret = dupvprintf(fmt, ap); - va_end(ap); - return ret; -} -char *dupvprintf(const char *fmt, va_list ap) +static char *dupvprintf_inner(char *buf, int oldlen, int *oldsize, + const char *fmt, va_list ap) { - char *buf; - int len, size; + int len, size, newsize; - buf = snewn(512, char); - size = 512; + assert(*oldsize >= oldlen); + size = *oldsize - oldlen; + if (size == 0) { + size = 512; + newsize = oldlen + size; + buf = sresize(buf, newsize, char); + } else { + newsize = *oldsize; + } while (1) { -#if defined _WINDOWS && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ +#if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf #endif #ifdef va_copy @@ -420,7 +419,7 @@ * XXX some environments may have this as __va_copy() */ va_list aq; va_copy(aq, ap); - len = vsnprintf(buf, size, fmt, aq); + len = vsnprintf(buf + oldlen, size, fmt, aq); va_end(aq); #else /* Ugh. No va_copy macro, so do something nasty. @@ -431,11 +430,12 @@ * (indeed, it has been observed to). * XXX the autoconf manual suggests that using memcpy() will give * "maximum portability". */ - len = vsnprintf(buf, size, fmt, ap); + len = vsnprintf(buf + oldlen, size, fmt, ap); #endif if (len >= 0 && len < size) { /* This is the C99-specified criterion for snprintf to have * been completely successful. */ + *oldsize = newsize; return buf; } else if (len > 0) { /* This is the C99 error condition: the returned length is @@ -446,10 +446,67 @@ * buffer wasn't big enough, so we enlarge it a bit and hope. */ size += 512; } - buf = sresize(buf, size, char); + newsize = oldlen + size; + buf = sresize(buf, newsize, char); } } +char *dupvprintf(const char *fmt, va_list ap) +{ + int size = 0; + return dupvprintf_inner(NULL, 0, &size, fmt, ap); +} +char *dupprintf(const char *fmt, ...) +{ + char *ret; + va_list ap; + va_start(ap, fmt); + ret = dupvprintf(fmt, ap); + va_end(ap); + return ret; +} + +struct strbuf { + char *s; + int len, size; +}; +strbuf *strbuf_new(void) +{ + strbuf *buf = snew(strbuf); + buf->len = 0; + buf->size = 512; + buf->s = snewn(buf->size, char); + *buf->s = '\0'; + return buf; +} +void strbuf_free(strbuf *buf) +{ + sfree(buf->s); + sfree(buf); +} +char *strbuf_str(strbuf *buf) +{ + return buf->s; +} +char *strbuf_to_str(strbuf *buf) +{ + char *ret = buf->s; + sfree(buf); + return ret; +} +void strbuf_catfv(strbuf *buf, const char *fmt, va_list ap) +{ + buf->s = dupvprintf_inner(buf->s, buf->len, &buf->size, fmt, ap); + buf->len += strlen(buf->s + buf->len); +} +void strbuf_catf(strbuf *buf, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + strbuf_catfv(buf, fmt, ap); + va_end(ap); +} + /* * Read an entire line of text from a file. Return a buffer * malloced to be as big as necessary (caller must free). @@ -1072,7 +1129,7 @@ if (*datalen < 4) return NULL; len = GET_32BIT_MSB_FIRST((const unsigned char *)*data); - if (*datalen < len+4) + if (*datalen - 4 < len) return NULL; ret = (void *)((const char *)*data + 4); *datalen -= len + 4; @@ -1101,3 +1158,94 @@ size_t slen = strlen(s), tlen = strlen(t); return slen >= tlen && !strcmp(s + (slen - tlen), t); } + +char *buildinfo(const char *newline) +{ + strbuf *buf = strbuf_new(); + extern const char commitid[]; /* in commitid.c */ + + strbuf_catf(buf, "Build platform: %d-bit %s", + (int)(CHAR_BIT * sizeof(void *)), + BUILDINFO_PLATFORM); + +#ifdef __clang_version__ +#define FOUND_COMPILER + strbuf_catf(buf, "%sCompiler: clang %s", newline, __clang_version__); +#elif defined __GNUC__ && defined __VERSION__ +#define FOUND_COMPILER + strbuf_catf(buf, "%sCompiler: gcc %s", newline, __VERSION__); +#endif + +#if defined _MSC_VER +#ifndef FOUND_COMPILER +#define FOUND_COMPILER + strbuf_catf(buf, "%sCompiler: ", newline); +#else + strbuf_catf(buf, ", emulating "); +#endif + strbuf_catf(buf, "Visual Studio", newline); +#if _MSC_VER == 1900 + strbuf_catf(buf, " 2015 / MSVC++ 14.0"); +#elif _MSC_VER == 1800 + strbuf_catf(buf, " 2013 / MSVC++ 12.0"); +#elif _MSC_VER == 1700 + strbuf_catf(buf, " 2012 / MSVC++ 11.0"); +#elif _MSC_VER == 1600 + strbuf_catf(buf, " 2010 / MSVC++ 10.0"); +#elif _MSC_VER == 1500 + strbuf_catf(buf, " 2008 / MSVC++ 9.0"); +#elif _MSC_VER == 1400 + strbuf_catf(buf, " 2005 / MSVC++ 8.0"); +#elif _MSC_VER == 1310 + strbuf_catf(buf, " 2003 / MSVC++ 7.1"); +#elif _MSC_VER == 1300 + strbuf_catf(buf, " 2003 / MSVC++ 7.0"); +#else + strbuf_catf(buf, ", unrecognised version"); +#endif + strbuf_catf(buf, " (_MSC_VER=%d)", (int)_MSC_VER); +#endif + +/*#ifdef BUILDINFO_GTK + { + char *gtk_buildinfo = buildinfo_gtk_version(); + if (gtk_buildinfo) { + strbuf_catf(buf, "%sCompiled against GTK version %s", + newline, gtk_buildinfo); + sfree(gtk_buildinfo); + } + } +#endif*/ + +#if defined _WINDOWS && defined MINEFIELD + strbuf_catf(buf, "%sBuild option: MINEFIELD", newline); +#endif +#ifdef NO_SECURITY + strbuf_catf(buf, "%sBuild option: NO_SECURITY", newline); +#endif +#ifdef NO_SECUREZEROMEMORY + strbuf_catf(buf, "%sBuild option: NO_SECUREZEROMEMORY", newline); +#endif +#ifdef NO_IPV6 + strbuf_catf(buf, "%sBuild option: NO_IPV6", newline); +#endif +#ifdef NO_GSSAPI + strbuf_catf(buf, "%sBuild option: NO_GSSAPI", newline); +#endif +#ifdef STATIC_GSSAPI + strbuf_catf(buf, "%sBuild option: STATIC_GSSAPI", newline); +#endif +#ifdef UNPROTECT + strbuf_catf(buf, "%sBuild option: UNPROTECT", newline); +#endif +#ifdef FUZZING + strbuf_catf(buf, "%sBuild option: FUZZING", newline); +#endif +#ifdef DEBUG + strbuf_catf(buf, "%sBuild option: DEBUG", newline); +#endif + + strbuf_catf(buf, "%sSource commit: %s", newline, commitid); + + return strbuf_to_str(buf); +} diff -Nru filezilla-3.15.0.2/src/putty/misc.h filezilla-3.33.0/src/putty/misc.h --- filezilla-3.15.0.2/src/putty/misc.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/misc.h 2017-09-19 21:36:39.000000000 +0000 @@ -38,6 +38,13 @@ ; char *dupvprintf(const char *fmt, va_list ap); void burnstr(char *string); +typedef struct strbuf strbuf; +strbuf *strbuf_new(void); +void strbuf_free(strbuf *buf); +char *strbuf_str(strbuf *buf); /* does not free buf */ +char *strbuf_to_str(strbuf *buf); /* does free buf, but you must free result */ +void strbuf_catf(strbuf *buf, const char *fmt, ...); +void strbuf_catfv(strbuf *buf, const char *fmt, va_list ap); /* String-to-Unicode converters that auto-allocate the destination and * work around the rather deficient interface of mb_to_wc. @@ -59,10 +66,14 @@ int base64_decode_atom(const char *atom, unsigned char *out); struct bufchain_granule; -typedef struct bufchain_tag { +struct bufchain_tag { struct bufchain_granule *head, *tail; int buffersize; /* current amount of buffered data */ -} bufchain; +}; +#ifndef BUFCHAIN_TYPEDEF +typedef struct bufchain_tag bufchain; /* rest of declaration in misc.c */ +#define BUFCHAIN_TYPEDEF +#endif void bufchain_init(bufchain *ch); void bufchain_clear(bufchain *ch); @@ -107,6 +118,8 @@ * form, check if it equals an ordinary C zero-terminated string. */ int match_ssh_id(int stringlen, const void *string, const char *id); +char *buildinfo(const char *newline); + /* * Debugging functions. * @@ -187,4 +200,9 @@ (cp)[0] = (unsigned char)((value) >> 8), \ (cp)[1] = (unsigned char)(value) ) +/* Replace NULL with the empty string, permitting an idiom in which we + * get a string (pointer,length) pair that might be NULL,0 and can + * then safely say things like printf("%.*s", length, NULLTOEMPTY(ptr)) */ +#define NULLTOEMPTY(s) ((s)?(s):"") + #endif diff -Nru filezilla-3.15.0.2/src/putty/network.h filezilla-3.33.0/src/putty/network.h --- filezilla-3.15.0.2/src/putty/network.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/network.h 2017-09-19 21:36:39.000000000 +0000 @@ -64,12 +64,12 @@ * proxy command, so the receiver should probably prefix it to * indicate this. */ - int (*closing) + void (*closing) (Plug p, const char *error_msg, int error_code, int calling_back); /* error_msg is NULL iff it is not an error (ie it closed normally) */ /* calling_back != 0 iff there is a Plug function */ /* currently running (would cure the fixme in try_send()) */ - int (*receive) (Plug p, int urgent, char *data, int len); + void (*receive) (Plug p, int urgent, char *data, int len); /* * - urgent==0. `data' points to `len' bytes of perfectly * ordinary data. @@ -229,7 +229,10 @@ void backend_socket_log(void *frontend, int type, SockAddr addr, int port, const char *error_msg, int error_code, Conf *conf, int session_started); +#ifndef BUFCHAIN_TYPEDEF typedef struct bufchain_tag bufchain; /* rest of declaration in misc.c */ +#define BUFCHAIN_TYPEDEF +#endif void log_proxy_stderr(Plug plug, bufchain *buf, const void *vdata, int len); #endif diff -Nru filezilla-3.15.0.2/src/putty/pageant.h filezilla-3.33.0/src/putty/pageant.h --- filezilla-3.15.0.2/src/putty/pageant.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/putty/pageant.h 2017-02-20 17:02:26.000000000 +0000 @@ -0,0 +1,143 @@ +/* + * pageant.h: header for pageant.c. + */ + +#include + +/* + * FIXME: it would be nice not to have this arbitrary limit. It's + * currently needed because the Windows Pageant IPC system needs an + * upper bound known to the client, but it's also reused as a basic + * sanity check on incoming messages' length fields. + */ +#define AGENT_MAX_MSGLEN 8192 + +typedef void (*pageant_logfn_t)(void *logctx, const char *fmt, va_list ap); + +/* + * Initial setup. + */ +void pageant_init(void); + +/* + * The main agent function that answers messages. + * + * Expects a message/length pair as input, minus its initial length + * field but still with its type code on the front. + * + * Returns a fully formatted message as output, *with* its initial + * length field, and sets *outlen to the full size of that message. + */ +void *pageant_handle_msg(const void *msg, int msglen, int *outlen, + void *logctx, pageant_logfn_t logfn); + +/* + * Construct a failure response. Useful for agent front ends which + * suffer a problem before they even get to pageant_handle_msg. + */ +void *pageant_failure_msg(int *outlen); + +/* + * Construct a list of public keys, just as the two LIST_IDENTITIES + * requests would have returned them. + */ +void *pageant_make_keylist1(int *length); +void *pageant_make_keylist2(int *length); + +/* + * Accessor functions for Pageant's internal key lists. Fetch the nth + * key; count the keys; attempt to add a key (returning true on + * success, in which case the ownership of the key structure has been + * taken over by pageant.c); attempt to delete a key (returning true + * on success, in which case the ownership of the key structure is + * passed back to the client). + */ +struct RSAKey *pageant_nth_ssh1_key(int i); +struct ssh2_userkey *pageant_nth_ssh2_key(int i); +int pageant_count_ssh1_keys(void); +int pageant_count_ssh2_keys(void); +int pageant_add_ssh1_key(struct RSAKey *rkey); +int pageant_add_ssh2_key(struct ssh2_userkey *skey); +int pageant_delete_ssh1_key(struct RSAKey *rkey); +int pageant_delete_ssh2_key(struct ssh2_userkey *skey); + +/* + * This callback must be provided by the Pageant front end code. + * pageant_handle_msg calls it to indicate that the message it's just + * handled has changed the list of keys held by the agent. Front ends + * which expose that key list through dedicated UI may need to refresh + * that UI's state in this function; other front ends can leave it + * empty. + */ +void keylist_update(void); + +/* + * Functions to establish a listening socket speaking the SSH agent + * protocol. Call pageant_listener_new() to set up a state; then + * create a socket using the returned pointer as a Plug; then call + * pageant_listener_got_socket() to give the listening state its own + * socket pointer. Also, provide a logging function later if you want + * to. + */ +struct pageant_listen_state; +struct pageant_listen_state *pageant_listener_new(void); +void pageant_listener_got_socket(struct pageant_listen_state *pl, Socket sock); +void pageant_listener_set_logfn(struct pageant_listen_state *pl, + void *logctx, pageant_logfn_t logfn); +void pageant_listener_free(struct pageant_listen_state *pl); + +/* + * Functions to perform specific key actions, either as a client of an + * ssh-agent running elsewhere, or directly on the agent state in this + * process. (On at least one platform we want to do this in an + * agnostic way between the two situations.) + * + * pageant_get_keylist{1,2} work just like pageant_make_keylist{1,2} + * above, except that they can also cope if they have to contact an + * external agent. + * + * pageant_add_keyfile() is used to load a private key from a file and + * add it to the agent. Initially, you should call it with passphrase + * NULL, and it will check if the key is already in the agent, and + * whether a passphrase is required. Return values are given in the + * enum below. On return, *retstr will either be NULL, or a + * dynamically allocated string containing a key comment or an error + * message. + * + * pageant_add_keyfile() also remembers passphrases with which it's + * successfully decrypted keys (because if you try to add multiple + * keys in one go, you might very well have used the same passphrase + * for keys that have the same trust properties). Call + * pageant_forget_passphrases() to get rid of them all. + */ +void *pageant_get_keylist1(int *length); +void *pageant_get_keylist2(int *length); +enum { + PAGEANT_ACTION_OK, /* success; no further action needed */ + PAGEANT_ACTION_FAILURE, /* failure; *retstr is error message */ + PAGEANT_ACTION_NEED_PP /* need passphrase: *retstr is key comment */ +}; +int pageant_add_keyfile(Filename *filename, const char *passphrase, + char **retstr); +void pageant_forget_passphrases(void); + +struct pageant_pubkey { + /* Everything needed to identify a public key found by + * pageant_enum_keys and pass it back to the agent or other code + * later */ + void *blob; + int bloblen; + char *comment; + int ssh_version; +}; +struct pageant_pubkey *pageant_pubkey_copy(struct pageant_pubkey *key); +void pageant_pubkey_free(struct pageant_pubkey *key); + +typedef void (*pageant_key_enum_fn_t)(void *ctx, + const char *fingerprint, + const char *comment, + struct pageant_pubkey *key); +int pageant_enum_keys(pageant_key_enum_fn_t callback, void *callback_ctx, + char **retstr); +int pageant_delete_key(struct pageant_pubkey *key, char **retstr); +int pageant_delete_all_keys(char **retstr); diff -Nru filezilla-3.15.0.2/src/putty/pinger.c filezilla-3.33.0/src/putty/pinger.c --- filezilla-3.15.0.2/src/putty/pinger.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/pinger.c 2017-09-19 21:36:39.000000000 +0000 @@ -8,7 +8,7 @@ struct pinger_tag { int interval; int pending; - unsigned long next; + unsigned long when_set, next; Backend *back; void *backhandle; }; @@ -28,7 +28,7 @@ static void pinger_schedule(Pinger pinger) { - int next; + unsigned long next; if (!pinger->interval) { pinger->pending = FALSE; /* cancel any pending ping */ @@ -37,8 +37,10 @@ next = schedule_timer(pinger->interval * TICKSPERSEC, pinger_timer, pinger); - if (!pinger->pending || next < pinger->next) { + if (!pinger->pending || + (next - pinger->when_set) < (pinger->next - pinger->when_set)) { pinger->next = next; + pinger->when_set = timing_last_clock(); pinger->pending = TRUE; } } diff -Nru filezilla-3.15.0.2/src/putty/portfwd.c filezilla-3.33.0/src/putty/portfwd.c --- filezilla-3.15.0.2/src/putty/portfwd.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/portfwd.c 2017-09-19 21:36:39.000000000 +0000 @@ -117,8 +117,8 @@ /* we have to dump these since we have no interface to logging.c */ } -static int pfd_closing(Plug plug, const char *error_msg, int error_code, - int calling_back) +static void pfd_closing(Plug plug, const char *error_msg, int error_code, + int calling_back) { struct PortForwarding *pf = (struct PortForwarding *) plug; @@ -145,16 +145,13 @@ if (pf->c) sshfwd_write_eof(pf->c); } - - return 1; } -static int pfl_closing(Plug plug, const char *error_msg, int error_code, - int calling_back) +static void pfl_closing(Plug plug, const char *error_msg, int error_code, + int calling_back) { struct PortListener *pl = (struct PortListener *) plug; pfl_terminate(pl); - return 1; } static void wrap_send_port_open(void *channel, const char *hostname, int port, @@ -172,7 +169,7 @@ sfree(description); } -static int pfd_receive(Plug plug, int urgent, char *data, int len) +static void pfd_receive(Plug plug, int urgent, char *data, int len) { struct PortForwarding *pf = (struct PortForwarding *) plug; if (pf->dynamic) { @@ -204,7 +201,7 @@ data[1] = 91; /* generic `request rejected' */ sk_write(pf->s, data, 8); pfd_close(pf); - return 1; + return; } if (pf->sockslen <= 8) continue; /* haven't started user/hostname */ @@ -320,7 +317,7 @@ reply[1] = 1; /* generic failure */ sk_write(pf->s, (char *) reply, lenof(reply)); pfd_close(pf); - return 1; + return; } /* * Now we have a viable connect request. Switch @@ -350,7 +347,7 @@ reply[1] = 8; /* atype not supported */ sk_write(pf->s, (char *) reply, lenof(reply)); pfd_close(pf); - return 1; + return; } } } @@ -362,9 +359,9 @@ * close the connection rudely. */ pfd_close(pf); - return 1; + break; } - return 1; + return; /* * We come here when we're ready to make an actual @@ -383,7 +380,7 @@ pf->c = new_sock_channel(pf->backhandle, pf); if (pf->c == NULL) { pfd_close(pf); - return 1; + return; } else { /* asks to forward to the specified host/port for this */ wrap_send_port_open(pf->c, pf->hostname, pf->port, pf->s); @@ -406,7 +403,6 @@ sk_set_frozen(pf->s, 1); } } - return 1; } static void pfd_sent(Plug plug, int bufsize) diff -Nru filezilla-3.15.0.2/src/putty/proxy.c filezilla-3.33.0/src/putty/proxy.c --- filezilla-3.15.0.2/src/putty/proxy.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/proxy.c 2017-09-19 21:36:39.000000000 +0000 @@ -201,8 +201,8 @@ plug_log(ps->plug, type, addr, port, error_msg, error_code); } -static int plug_proxy_closing (Plug p, const char *error_msg, - int error_code, int calling_back) +static void plug_proxy_closing (Plug p, const char *error_msg, + int error_code, int calling_back) { Proxy_Plug pp = (Proxy_Plug) p; Proxy_Socket ps = pp->proxy_socket; @@ -211,13 +211,13 @@ ps->closing_error_msg = error_msg; ps->closing_error_code = error_code; ps->closing_calling_back = calling_back; - return ps->negotiate(ps, PROXY_CHANGE_CLOSING); + ps->negotiate(ps, PROXY_CHANGE_CLOSING); + } else { + plug_closing(ps->plug, error_msg, error_code, calling_back); } - return plug_closing(ps->plug, error_msg, - error_code, calling_back); } -static int plug_proxy_receive (Plug p, int urgent, char *data, int len) +static void plug_proxy_receive (Plug p, int urgent, char *data, int len) { Proxy_Plug pp = (Proxy_Plug) p; Proxy_Socket ps = pp->proxy_socket; @@ -231,9 +231,10 @@ ps->receive_urgent = urgent; ps->receive_data = data; ps->receive_len = len; - return ps->negotiate(ps, PROXY_CHANGE_RECEIVE); + ps->negotiate(ps, PROXY_CHANGE_RECEIVE); + } else { + plug_receive(ps->plug, urgent, data, len); } - return plug_receive(ps->plug, urgent, data, len); } static void plug_proxy_sent (Plug p, int bufsize) @@ -518,7 +519,7 @@ { char addrbuf[256], *logmsg; - sk_getaddr(addr, addrbuf, lenof(addrbuf)); + sk_getaddr(proxy_addr, addrbuf, lenof(addrbuf)); logmsg = dupprintf("Connecting to %s proxy at %s port %d", proxy_type, addrbuf, conf_get_int(conf, CONF_proxy_port)); @@ -644,9 +645,9 @@ * a socket close, then some error must have occurred. we'll * just pass those errors up to the backend. */ - return plug_closing(p->plug, p->closing_error_msg, - p->closing_error_code, - p->closing_calling_back); + plug_closing(p->plug, p->closing_error_msg, p->closing_error_code, + p->closing_calling_back); + return 0; /* ignored */ } if (change == PROXY_CHANGE_SENT) { @@ -847,9 +848,9 @@ * a socket close, then some error must have occurred. we'll * just pass those errors up to the backend. */ - return plug_closing(p->plug, p->closing_error_msg, - p->closing_error_code, - p->closing_calling_back); + plug_closing(p->plug, p->closing_error_msg, p->closing_error_code, + p->closing_calling_back); + return 0; /* ignored */ } if (change == PROXY_CHANGE_SENT) { @@ -987,9 +988,9 @@ * a socket close, then some error must have occurred. we'll * just pass those errors up to the backend. */ - return plug_closing(p->plug, p->closing_error_msg, - p->closing_error_code, - p->closing_calling_back); + plug_closing(p->plug, p->closing_error_msg, p->closing_error_code, + p->closing_calling_back); + return 0; /* ignored */ } if (change == PROXY_CHANGE_SENT) { @@ -1246,9 +1247,11 @@ char userpwbuf[255 + 255 + 3]; int ulen, plen; ulen = strlen(username); - if (ulen > 255) ulen = 255; if (ulen < 1) ulen = 1; + if (ulen > 255) ulen = 255; + if (ulen < 1) ulen = 1; plen = strlen(password); - if (plen > 255) plen = 255; if (plen < 1) plen = 1; + if (plen > 255) plen = 255; + if (plen < 1) plen = 1; userpwbuf[0] = 1; /* version number of subnegotiation */ userpwbuf[1] = ulen; memcpy(userpwbuf+2, username, ulen); @@ -1559,9 +1562,9 @@ * a socket close, then some error must have occurred. we'll * just pass those errors up to the backend. */ - return plug_closing(p->plug, p->closing_error_msg, - p->closing_error_code, - p->closing_calling_back); + plug_closing(p->plug, p->closing_error_msg, p->closing_error_code, + p->closing_calling_back); + return 0; /* ignored */ } if (change == PROXY_CHANGE_SENT) { diff -Nru filezilla-3.15.0.2/src/putty/psftp.c filezilla-3.33.0/src/putty/psftp.c --- filezilla-3.15.0.2/src/putty/psftp.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/psftp.c 2018-03-29 08:58:59.000000000 +0000 @@ -475,12 +475,12 @@ offset = get_file_posn(file); uint64_decimal(offset, decbuf); - fzprintf(sftpStatus, "reget: restarting at file position %s", decbuf); + fzprintf(sftpInfo, "reget: restarting at file position %s", decbuf); } else { offset = uint64_make(0, 0); } - fzprintf(sftpStatus, "remote:%s => local:%s", fname, outfname); + fzprintf(sftpInfo, "remote:%s => local:%s", fname, outfname); fz_timer_init(&timer); winterval = 0; @@ -493,7 +493,7 @@ xfer = xfer_download_init(fh, offset); while (!xfer_done(xfer)) { void *vbuf; - int ret, len; + int len; int wpos, wlen; xfer_download_queue(xfer); @@ -516,8 +516,10 @@ while (file && wpos < len) { wlen = write_to_file(file, buf + wpos, len - wpos); if (wlen <= 0) { - fzprintf(shown_err ? sftpStatus : sftpError, "error while writing local file"); - shown_err = TRUE; + if (!shown_err) { + fzprintf(sftpError, "error while writing local file"); + shown_err = TRUE; + } ret = 0; xfer_set_error(xfer); break; @@ -559,7 +561,7 @@ struct sftp_request *req; uint64 offset; RFile *file; - int ret, err, eof; + int err = 0, eof; struct fxp_attrs attrs; long permissions; @@ -712,6 +714,7 @@ if (restart) { char decbuf[30]; struct fxp_attrs attrs; + int ret; req = fxp_fstat_send(fh); pktin = sftp_wait_for_reply(req); @@ -719,33 +722,33 @@ if (!ret) { fzprintf(sftpError, "read size of %s: %s", outfname, fxp_error()); - goto cleanup; + err = 1; + goto cleanup; } if (!(attrs.flags & SSH_FILEXFER_ATTR_SIZE)) { fzprintf(sftpError, "read size of %s: size was not given", outfname); - ret = 0; - goto cleanup; + err = 1; + goto cleanup; } offset = attrs.size; uint64_decimal(offset, decbuf); - fzprintf(sftpStatus, "reput: restarting at file position %s", decbuf); + fzprintf(sftpInfo, "reput: restarting at file position %s", decbuf); if (seek_file((WFile *)file, offset, FROM_START) != 0) seek_file((WFile *)file, uint64_make(0,0), FROM_END); /* *shrug* */ } else { offset = uint64_make(0, 0); } - fzprintf(sftpStatus, "local:%s => remote:%s\n", fname, outfname); + fzprintf(sftpInfo, "local:%s => remote:%s\n", fname, outfname); /* * FIXME: we can use FXP_FSTAT here to get the file size, and * thus put up a progress bar. */ - ret = 1; xfer = xfer_upload_init(fh, offset); - err = eof = 0; + eof = 0; while ((!err && !eof) || !xfer_done(xfer)) { - char buffer[4096*4]; + char buffer[4096*4]; int len, ret; while (xfer_upload_ready(xfer) && !err && !eof) { @@ -769,24 +772,28 @@ if (ret == INT_MIN) /* pktin not even freed */ sfree(pktin); if (!err) { - fzprintf(sftpError, "error while writing: %s", fxp_error()); - err = 1; - } - ret = 0; + fzprintf(sftpError, "error while writing: %s", fxp_error()); + err = 1; + } } } } xfer_cleanup(xfer); -cleanup: + cleanup: req = fxp_close_send(fh); pktin = sftp_wait_for_reply(req); - fxp_close_recv(pktin, req); + if (!fxp_close_recv(pktin, req)) { + if (!err) { + fzprintf(sftpError, "error while writing: %s", fxp_error()); + err = 1; + } + } close_rfile(file); - return ret; + return (err == 0) ? 1 : 0; } /* ---------------------------------------------------------------------- @@ -1126,12 +1133,11 @@ { struct fxp_handle *dirh; struct fxp_names *names; - struct fxp_name **ournames; - int nnames, namesize; const char *dir; char *cdir, *unwcdir, *wildcard; struct sftp_packet *pktin; struct sftp_request *req; + struct sftp_request *reqs[4]; int i; int ret; @@ -1188,14 +1194,16 @@ fzprintf(sftpError, "Unable to open %s: %s", dir, fxp_error()); ret = 1; } else { - nnames = namesize = 0; - ournames = NULL; - + reqs[0] = fxp_readdir_send(dirh); + reqs[1] = fxp_readdir_send(dirh); + reqs[2] = fxp_readdir_send(dirh); + reqs[3] = fxp_readdir_send(dirh); + int ri = 0; while (1) { - req = fxp_readdir_send(dirh); - pktin = sftp_wait_for_reply(req); - names = fxp_readdir_recv(pktin, req); + pktin = sftp_wait_for_reply(reqs[ri]); + names = fxp_readdir_recv(pktin, reqs[ri]); + reqs[ri] = NULL; if (names == NULL) { if (fxp_error_type() == SSH_FX_EOF) @@ -1208,40 +1216,35 @@ break; } - if (nnames + names->nnames >= namesize) { - namesize += names->nnames + 128; - ournames = sresize(ournames, namesize, struct fxp_name *); + for (i = 0; i < names->nnames; i++) { + if (!wildcard || wc_match(wildcard, names->names[i].filename)) { + unsigned long mtime = 0; + if (names->names[i].attrs.flags & SSH_FILEXFER_ATTR_ACMODTIME) { + mtime = names->names[i].attrs.mtime; + } + fzprintf_raw_untrusted(sftpListentry, "%s", names->names[i].longname); + fzprintf_raw_untrusted(sftpUnknown, "%lu", mtime); + fzprintf_raw_untrusted(sftpUnknown, "%s", names->names[i].filename); + } } - for (i = 0; i < names->nnames; i++) - if (!wildcard || wc_match(wildcard, names->names[i].filename)) - ournames[nnames++] = fxp_dup_name(&names->names[i]); - fxp_free_names(names); + reqs[ri++] = fxp_readdir_send(dirh); + ri %= 4; + } + for (i = 0; i < 4; ++i) { + if (reqs[ri]) { + pktin = sftp_wait_for_reply(reqs[ri]); + sfree(reqs[ri]); + sfree(pktin); + } + ++ri; + ri %= 4; } req = fxp_close_send(dirh); pktin = sftp_wait_for_reply(req); fxp_close_recv(pktin, req); - /* - * Now we have our filenames. Sort them by actual file - * name, and then output the longname parts. - */ - /*if (nnames > 0) - qsort(ournames, nnames, sizeof(*ournames), sftp_name_compare);*/ - - /* - * And print them. - */ - for (i = 0; i < nnames; ++i) { - unsigned long mtime = 0; - if (ournames[i]->attrs.flags & SSH_FILEXFER_ATTR_ACMODTIME) { - mtime = ournames[i]->attrs.mtime; - } - fzprintf(sftpListentry, "%lu %s", mtime, ournames[i]->longname); - fxp_free_name(ournames[i]); - } - sfree(ournames); ret = 0; } @@ -1572,7 +1575,7 @@ for (i = 1; i < cmd->nwords; i++) { dir = canonify(cmd->words[i], 0); if (!dir) { - fzprintf(sftpError, "%s: canonify: %s", dir, fxp_error()); + fzprintf(sftpError, "%s: canonify: %s", cmd->words[i], fxp_error()); return 0; } @@ -1776,7 +1779,8 @@ * argument which is a wildcard, we _require_ that the * destination is a directory. */ - ctx->dest_is_dir = check_is_dir(ctx->dstfname); + /*FZ: Force dest_is_dir to FALSE. See #11047 */ + ctx->dest_is_dir = FALSE; /*check_is_dir(ctx->dstfname);*/ if ((cmd->nwords > 3 || is_wildcard(cmd->words[1])) && !ctx->dest_is_dir) { fzprintf(sftpError, "mv: multiple or wildcard arguments require the destination" " to be a directory"); @@ -2970,6 +2974,10 @@ back->send(backhandle, buf, len); return 1; } +int sftp_sendbuffer(void) +{ + return back->sendbuffer(backhandle); +} /* * Short description of parameters. @@ -2999,6 +3007,8 @@ printf(" -hostkey aa:bb:cc:...\n"); printf(" manually specify a host key (may be repeated)\n"); printf(" -batch disable all interactive prompts\n"); + printf(" -proxycmd command\n"); + printf(" use 'command' as local proxy\n"); printf(" -sshlog file\n"); printf(" -sshrawlog file\n"); printf(" log protocol details to a file\n"); @@ -3007,8 +3017,10 @@ static void version(void) { - printf("psftp: %s\n", ver); - cleanup_exit(1); + char *buildinfo_text = buildinfo("\n"); + printf("psftp: %s\n%s\n", ver, buildinfo_text); + sfree(buildinfo_text); + exit(0); } /* @@ -3189,6 +3201,11 @@ back = &ssh_backend; + logctx = log_init(NULL, conf); + console_provide_logctx(logctx); + + platform_psftp_pre_conn_setup(); + err = back->init(NULL, &backhandle, conf, conf_get_str(conf, CONF_host), conf_get_int(conf, CONF_port), @@ -3198,9 +3215,7 @@ fzprintf(sftpError, "ssh_init: %s", err); return 1; } - logctx = log_init(NULL, conf); back->provide_logctx(backhandle, logctx); - console_provide_logctx(logctx); while (!back->sendok(backhandle)) { if (back->exitcode(backhandle) >= 0) return 1; diff -Nru filezilla-3.15.0.2/src/putty/psftp.h filezilla-3.33.0/src/putty/psftp.h --- filezilla-3.15.0.2/src/putty/psftp.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/psftp.h 2017-09-19 21:36:39.000000000 +0000 @@ -48,6 +48,12 @@ char *ssh_sftp_get_cmdline(const char *prompt, int backend_required); /* + * Platform-specific function called when we're about to make a + * network connection. + */ +void platform_psftp_pre_conn_setup(void); + +/* * The main program in psftp.c. Called from main() in the platform- * specific code, after doing any platform-specific initialisation. */ diff -Nru filezilla-3.15.0.2/src/putty/putty.h filezilla-3.33.0/src/putty/putty.h --- filezilla-3.15.0.2/src/putty/putty.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/putty.h 2017-09-19 21:36:39.000000000 +0000 @@ -182,7 +182,14 @@ /* Pseudo-specials used for constructing the specials menu. */ TS_SEP, /* Separator */ TS_SUBMENU, /* Start a new submenu with specified name */ - TS_EXITMENU /* Exit current submenu or end of specials */ + TS_EXITMENU, /* Exit current submenu or end of specials */ + /* Starting point for protocols to invent special-action codes + * that can't live in this enum at all, e.g. because they change + * with every session. + * + * Of course, this must remain the last value in this + * enumeration. */ + TS_LOCALSTART } Telnet_Special; struct telnet_special { @@ -261,6 +268,18 @@ enum { /* + * SSH-2 host key algorithms + */ + HK_WARN, + HK_RSA, + HK_DSA, + HK_ECDSA, + HK_ED25519, + HK_MAX +}; + +enum { + /* * SSH ciphers (both SSH-1 and SSH-2) */ CIPHER_WARN, /* pseudo 'cipher' */ @@ -652,6 +671,7 @@ BUSY_CPU /* Locally busy (e.g. crypto); user interaction suspended */ }; void set_busy_status(void *frontend, int status); +int frontend_is_utf8(void *frontend); void cleanup_exit(int); @@ -688,6 +708,7 @@ X(INT, NONE, nopty) \ X(INT, NONE, compression) \ X(INT, INT, ssh_kexlist) \ + X(INT, INT, ssh_hklist) \ X(INT, NONE, ssh_rekey_time) /* in minutes */ \ X(STR, NONE, ssh_rekey_data) /* string encoding e.g. "100K", "2M", "1G" */ \ X(INT, NONE, tryagent) \ @@ -696,7 +717,20 @@ X(INT, INT, ssh_cipherlist) \ X(FILENAME, NONE, keyfile) \ X(STR, STR, fz_keyfiles) \ - X(INT, NONE, sshprot) /* use v1 or v2 when both available */ \ + /* \ + * Which SSH protocol to use. \ + * For historical reasons, the current legal values for CONF_sshprot \ + * are: \ + * 0 = SSH-1 only \ + * 3 = SSH-2 only \ + * We used to also support \ + * 1 = SSH-1 with fallback to SSH-2 \ + * 2 = SSH-2 with fallback to SSH-1 \ + * and we continue to use 0/3 in storage formats rather than the more \ + * obvious 1/2 to avoid surprises if someone saves a session and later \ + * downgrades PuTTY. So it's easier to use these numbers internally too. \ + */ \ + X(INT, NONE, sshprot) \ X(INT, NONE, ssh2_des_cbc) /* "des-cbc" unrecommended SSH-2 cipher */ \ X(INT, NONE, ssh_no_userauth) /* bypass "ssh-userauth" (SSH-2 only) */ \ X(INT, NONE, ssh_show_banner) /* show USERAUTH_BANNERs (SSH-2 only) */ \ @@ -738,6 +772,7 @@ X(INT, NONE, no_remote_resize) /* disable remote resizing */ \ X(INT, NONE, no_alt_screen) /* disable alternate screen */ \ X(INT, NONE, no_remote_wintitle) /* disable remote retitling */ \ + X(INT, NONE, no_remote_clearscroll) /* disable ESC[3J */ \ X(INT, NONE, no_dbackspace) /* disable destructive backspace */ \ X(INT, NONE, no_remote_charset) /* disable remote charset config */ \ X(INT, NONE, remote_qtitle_action) /* remote win title query action */ \ @@ -1126,7 +1161,7 @@ /* * Exports from version.c. */ -extern char ver[]; +extern const char ver[]; /* * Exports from unicode.c. @@ -1167,17 +1202,32 @@ /* * Exports from pageantc.c. * - * agent_query returns 1 for here's-a-response, and 0 for query-in- - * progress. In the latter case there will be a call to `callback' - * at some future point, passing callback_ctx as the first + * agent_query returns NULL for here's-a-response, and non-NULL for + * query-in- progress. In the latter case there will be a call to + * `callback' at some future point, passing callback_ctx as the first * parameter and the actual reply data as the second and third. * * The response may be a NULL pointer (in either of the synchronous * or asynchronous cases), which indicates failure to receive a * response. - */ -int agent_query(void *in, int inlen, void **out, int *outlen, - void (*callback)(void *, void *, int), void *callback_ctx); + * + * When the return from agent_query is not NULL, it identifies the + * in-progress query in case it needs to be cancelled. If + * agent_cancel_query is called, then the pending query is destroyed + * and the callback will not be called. (E.g. if you're going to throw + * away the thing you were using as callback_ctx.) + * + * Passing a null pointer as callback forces agent_query to behave + * synchronously, i.e. it will block if necessary, and guarantee to + * return NULL. The wrapper function agent_query_synchronous() makes + * this easier. + */ +typedef struct agent_pending_query agent_pending_query; +agent_pending_query *agent_query( + void *in, int inlen, void **out, int *outlen, + void (*callback)(void *, void *, int), void *callback_ctx); +void agent_cancel_query(agent_pending_query *); +void agent_query_synchronous(void *in, int inlen, void **out, int *outlen); int agent_exists(void); /* @@ -1209,14 +1259,21 @@ void (*callback)(void *ctx, int result), void *ctx); /* * have_ssh_host_key() just returns true if a key of that type is - * already chached and false otherwise. + * already cached and false otherwise. */ int have_ssh_host_key(const char *host, int port, const char *keytype); /* - * askalg has the same set of return values as verify_ssh_host_key. + * askalg and askhk have the same set of return values as + * verify_ssh_host_key. + * + * (askhk is used in the case where we're using a host key below the + * warning threshold because that's all we have cached, but at least + * one acceptable algorithm is available that we don't have cached.) */ int askalg(void *frontend, const char *algtype, const char *algname, void (*callback)(void *ctx, int result), void *ctx); +int askhk(void *frontend, const char *algname, const char *betteralgs, + void (*callback)(void *ctx, int result), void *ctx); /* * askappend can return four values: * @@ -1326,7 +1383,7 @@ int filename_serialise(const Filename *f, void *data); Filename *filename_deserialise(void *data, int maxsize, int *used); char *get_username(void); /* return value needs freeing */ -char *get_random_data(int bytes); /* used in cmdgen.c */ +char *get_random_data(int bytes, const char *device); /* used in cmdgen.c */ char filename_char_sanitise(char c); /* rewrite special pathname chars */ /* @@ -1424,6 +1481,7 @@ void expire_timer_context(void *ctx); int run_timers(unsigned long now, unsigned long *next); void timer_change_notify(unsigned long next); +unsigned long timing_last_clock(void); /* * Exports from callback.c. diff -Nru filezilla-3.15.0.2/src/putty/puttyps.h filezilla-3.33.0/src/putty/puttyps.h --- filezilla-3.15.0.2/src/putty/puttyps.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/puttyps.h 2017-09-19 21:36:39.000000000 +0000 @@ -9,10 +9,6 @@ #include "winstuff.h" -#elif defined(MACOSX) - -#include "osx.h" - #else #include "unix.h" diff -Nru filezilla-3.15.0.2/src/putty/settings.c filezilla-3.33.0/src/putty/settings.c --- filezilla-3.15.0.2/src/putty/settings.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/settings.c 2017-09-19 21:36:39.000000000 +0000 @@ -10,8 +10,8 @@ /* The cipher order given here is the default order. */ static const struct keyvalwhere ciphernames[] = { - { "chacha20", CIPHER_CHACHA20, -1, -1 }, { "aes", CIPHER_AES, -1, -1 }, + { "chacha20", CIPHER_CHACHA20, CIPHER_AES, +1 }, { "blowfish", CIPHER_BLOWFISH, -1, -1 }, { "3des", CIPHER_3DES, -1, -1 }, { "WARN", CIPHER_WARN, -1, -1 }, @@ -19,21 +19,36 @@ { "des", CIPHER_DES, -1, -1 } }; +/* The default order here is sometimes overridden by the backward- + * compatibility warts in load_open_settings(), and should be kept + * in sync with those. */ static const struct keyvalwhere kexnames[] = { { "ecdh", KEX_ECDH, -1, +1 }, + /* This name is misleading: it covers both SHA-256 and SHA-1 variants */ { "dh-gex-sha1", KEX_DHGEX, -1, -1 }, { "dh-group14-sha1", KEX_DHGROUP14, -1, -1 }, - { "dh-group1-sha1", KEX_DHGROUP1, -1, -1 }, + { "dh-group1-sha1", KEX_DHGROUP1, KEX_WARN, +1 }, { "rsa", KEX_RSA, KEX_WARN, -1 }, { "WARN", KEX_WARN, -1, -1 } }; +static const struct keyvalwhere hknames[] = { + { "ed25519", HK_ED25519, -1, +1 }, + { "ecdsa", HK_ECDSA, -1, -1 }, + { "dsa", HK_DSA, -1, -1 }, + { "rsa", HK_RSA, -1, -1 }, + { "WARN", HK_WARN, -1, -1 }, +}; + /* * All the terminal modes that we know about for the "TerminalModes" * setting. (Also used by config.c for the drop-down list.) * This is currently precisely the same as the set in ssh.c, but could * in principle differ if other backends started to support tty modes * (e.g., the pty backend). + * The set of modes in in this array is currently significant for + * settings migration from old versions; if they change, review the + * gppmap() invocation for "TerminalModes". */ const char *const ttymodes[] = { "INTR", "QUIT", "ERASE", "KILL", "EOF", @@ -42,11 +57,11 @@ "SWTCH", "STATUS", "DISCARD", "IGNPAR", "PARMRK", "INPCK", "ISTRIP", "INLCR", "IGNCR", "ICRNL", "IUCLC", "IXON", "IXANY", "IXOFF", "IMAXBEL", - "ISIG", "ICANON", "XCASE", "ECHO", "ECHOE", - "ECHOK", "ECHONL", "NOFLSH", "TOSTOP", "IEXTEN", - "ECHOCTL", "ECHOKE", "PENDIN", "OPOST", "OLCUC", - "ONLCR", "OCRNL", "ONOCR", "ONLRET", "CS7", - "CS8", "PARENB", "PARODD", NULL + "IUTF8", "ISIG", "ICANON", "XCASE", "ECHO", + "ECHOE", "ECHOK", "ECHONL", "NOFLSH", "TOSTOP", + "IEXTEN", "ECHOCTL", "ECHOKE", "PENDIN", "OPOST", + "OLCUC", "ONLCR", "OCRNL", "ONOCR", "ONLRET", + "CS7", "CS8", "PARENB", "PARODD", NULL }; /* @@ -301,21 +316,16 @@ * to the end and duplicates are weeded. * XXX: assumes vals in 'mapping' are small +ve integers */ -static void gprefs(void *sesskey, const char *name, const char *def, - const struct keyvalwhere *mapping, int nvals, - Conf *conf, int primary) +static void gprefs_from_str(const char *str, + const struct keyvalwhere *mapping, int nvals, + Conf *conf, int primary) { - char *commalist; + char *commalist = dupstr(str); char *p, *q; int i, j, n, v, pos; unsigned long seen = 0; /* bitmap for weeding dups etc */ /* - * Fetch the string which we'll parse as a comma-separated list. - */ - commalist = gpps_raw(sesskey, name, def); - - /* * Go through that list and convert it into values. */ n = 0; @@ -378,12 +388,28 @@ conf_set_int_int(conf, primary, j+1, conf_get_int_int(conf, primary, j)); conf_set_int_int(conf, primary, pos, mapping[i].v); + seen |= (1 << mapping[i].v); n++; } } } } +/* + * Read a preference list. + */ +static void gprefs(void *sesskey, const char *name, const char *def, + const struct keyvalwhere *mapping, int nvals, + Conf *conf, int primary) +{ + /* + * Fetch the string which we'll parse as a comma-separated list. + */ + char *value = gpps_raw(sesskey, name, def); + gprefs_from_str(value, mapping, nvals, conf, primary); + sfree(value); +} + /* * Write out a preference list. */ @@ -495,6 +521,7 @@ write_setting_i(sesskey, "ChangeUsername", conf_get_int(conf, CONF_change_username)); wprefs(sesskey, "Cipher", ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist); wprefs(sesskey, "KEX", kexnames, KEX_MAX, conf, CONF_ssh_kexlist); + wprefs(sesskey, "HostKey", hknames, HK_MAX, conf, CONF_ssh_hklist); write_setting_i(sesskey, "RekeyTime", conf_get_int(conf, CONF_ssh_rekey_time)); write_setting_s(sesskey, "RekeyBytes", conf_get_str(conf, CONF_ssh_rekey_data)); write_setting_i(sesskey, "SshNoAuth", conf_get_int(conf, CONF_ssh_no_userauth)); @@ -523,6 +550,7 @@ write_setting_i(sesskey, "NoRemoteResize", conf_get_int(conf, CONF_no_remote_resize)); write_setting_i(sesskey, "NoAltScreen", conf_get_int(conf, CONF_no_alt_screen)); write_setting_i(sesskey, "NoRemoteWinTitle", conf_get_int(conf, CONF_no_remote_wintitle)); + write_setting_i(sesskey, "NoRemoteClearScroll", conf_get_int(conf, CONF_no_remote_clearscroll)); write_setting_i(sesskey, "RemoteQTitleAction", conf_get_int(conf, CONF_remote_qtitle_action)); write_setting_i(sesskey, "NoDBackspace", conf_get_int(conf, CONF_no_dbackspace)); write_setting_i(sesskey, "NoRemoteCharset", conf_get_int(conf, CONF_no_remote_charset)); @@ -725,7 +753,51 @@ gppi(sesskey, "TCPKeepalives", 0, conf, CONF_tcp_keepalives); gpps(sesskey, "TerminalType", "xterm", conf, CONF_termtype); gpps(sesskey, "TerminalSpeed", "38400,38400", conf, CONF_termspeed); - if (!gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) { + if (gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) { + /* + * Backwards compatibility with old saved settings. + * + * From the invention of this setting through 0.67, the set of + * terminal modes was fixed, and absence of a mode from this + * setting meant the user had explicitly removed it from the + * UI and we shouldn't send it. + * + * In 0.68, the IUTF8 mode was added, and in handling old + * settings we inadvertently removed the ability to not send + * a mode. Any mode not mentioned was treated as if it was + * set to 'auto' (A). + * + * After 0.68, we added explicit notation to the setting format + * when the user removes a known terminal mode from the list. + * + * So: if any of the modes from the original set is missing, we + * assume this was an intentional removal by the user and add + * an explicit removal ('N'); but if IUTF8 (or any other mode + * added after 0.67) is missing, we assume that its absence is + * due to the setting being old rather than intentional, and + * add it with its default setting. + * + * (This does mean that if a 0.68 user explicitly removed IUTF8, + * we add it back; but removing IUTF8 had no effect in 0.68, so + * we're preserving behaviour, which is the best we can do.) + */ + for (i = 0; ttymodes[i]; i++) { + if (!conf_get_str_str_opt(conf, CONF_ttymodes, ttymodes[i])) { + /* Mode not mentioned in setting. */ + const char *def; + if (!strcmp(ttymodes[i], "IUTF8")) { + /* Any new modes we add in future should be treated + * this way too. */ + def = "A"; /* same as new-setting default below */ + } else { + /* One of the original modes. Absence is probably + * deliberate. */ + def = "N"; /* don't send */ + } + conf_set_str_str(conf, CONF_ttymodes, ttymodes[i], def); + } + } + } else { /* This hardcodes a big set of defaults in any new saved * sessions. Let's hope we don't change our mind. */ for (i = 0; ttymodes[i]; i++) @@ -778,25 +850,58 @@ gprefs(sesskey, "Cipher", "\0", ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist); { - /* Backward-compatibility: we used to have an option to + /* Backward-compatibility: before 0.58 (when the "KEX" + * preference was first added), we had an option to * disable gex under the "bugs" panel after one report of * a server which offered it then choked, but we never got * a server version string or any other reports. */ - const char *default_kexes; + const char *default_kexes, + *normal_default = "ecdh,dh-gex-sha1,dh-group14-sha1,rsa," + "WARN,dh-group1-sha1", + *bugdhgex2_default = "ecdh,dh-group14-sha1,rsa," + "WARN,dh-group1-sha1,dh-gex-sha1"; + char *raw; i = 2 - gppi_raw(sesskey, "BugDHGEx2", 0); if (i == FORCE_ON) - default_kexes = "ecdh,dh-group14-sha1,dh-group1-sha1,rsa," - "WARN,dh-gex-sha1"; + default_kexes = bugdhgex2_default; else - default_kexes = "ecdh,dh-gex-sha1,dh-group14-sha1," - "dh-group1-sha1,rsa,WARN"; - gprefs(sesskey, "KEX", default_kexes, - kexnames, KEX_MAX, conf, CONF_ssh_kexlist); + default_kexes = normal_default; + /* Migration: after 0.67 we decided we didn't like + * dh-group1-sha1. If it looks like the user never changed + * the defaults, quietly upgrade their settings to demote it. + * (If they did, they're on their own.) */ + raw = gpps_raw(sesskey, "KEX", default_kexes); + assert(raw != NULL); + /* Lack of 'ecdh' tells us this was saved by 0.58-0.67 + * inclusive. If it was saved by a later version, we need + * to leave it alone. */ + if (strcmp(raw, "dh-group14-sha1,dh-group1-sha1,rsa," + "WARN,dh-gex-sha1") == 0) { + /* Previously migrated from BugDHGEx2. */ + sfree(raw); + raw = dupstr(bugdhgex2_default); + } else if (strcmp(raw, "dh-gex-sha1,dh-group14-sha1," + "dh-group1-sha1,rsa,WARN") == 0) { + /* Untouched old default setting. */ + sfree(raw); + raw = dupstr(normal_default); + } + gprefs_from_str(raw, kexnames, KEX_MAX, conf, CONF_ssh_kexlist); + sfree(raw); } + gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN", + hknames, HK_MAX, conf, CONF_ssh_hklist); gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time); gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data); - /* SSH-2 only by default */ - gppi(sesskey, "SshProt", 3, conf, CONF_sshprot); + { + /* SSH-2 only by default */ + int sshprot = gppi_raw(sesskey, "SshProt", 3); + /* Old sessions may contain the values corresponding to the fallbacks + * we used to allow; migrate them */ + if (sshprot == 1) sshprot = 0; /* => "SSH-1 only" */ + else if (sshprot == 2) sshprot = 3; /* => "SSH-2 only" */ + conf_set_int(conf, CONF_sshprot, sshprot); + } gpps(sesskey, "LogHost", "", conf, CONF_loghost); gppi(sesskey, "SSH2DES", 0, conf, CONF_ssh2_des_cbc); gppi(sesskey, "SshNoAuth", 0, conf, CONF_ssh_no_userauth); @@ -823,6 +928,7 @@ gppi(sesskey, "NoRemoteResize", 0, conf, CONF_no_remote_resize); gppi(sesskey, "NoAltScreen", 0, conf, CONF_no_alt_screen); gppi(sesskey, "NoRemoteWinTitle", 0, conf, CONF_no_remote_wintitle); + gppi(sesskey, "NoRemoteClearScroll", 0, conf, CONF_no_remote_clearscroll); { /* Backward compatibility */ int no_remote_qtitle = gppi_raw(sesskey, "NoRemoteQTitle", 1); diff -Nru filezilla-3.15.0.2/src/putty/sftp.c filezilla-3.33.0/src/putty/sftp.c --- filezilla-3.15.0.2/src/putty/sftp.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sftp.c 2017-09-19 21:36:39.000000000 +0000 @@ -360,6 +360,7 @@ struct sftp_request *sftp_find_request(struct sftp_packet *pktin) { unsigned long id; + unsigned fid; struct sftp_request *req; if (!pktin) { @@ -371,7 +372,8 @@ fxp_internal_error("did not receive a valid SFTP packet"); return NULL; } - req = find234(sftp_requests, &id, sftp_reqfind); + fid = (unsigned)id; + req = find234(sftp_requests, &fid, sftp_reqfind); if (!req || !req->registered) { fxp_internal_error("request ID mismatch"); @@ -689,11 +691,12 @@ return req; } -void fxp_close_recv(struct sftp_packet *pktin, struct sftp_request *req) +int fxp_close_recv(struct sftp_packet *pktin, struct sftp_request *req) { sfree(req); fxp_got_status(pktin); sftp_pkt_free(pktin); + return fxp_errtype == SSH_FX_OK; } struct sftp_request *fxp_mkdir_send(const char *path) @@ -1260,6 +1263,7 @@ if ((rr->retlen < 0 && fxp_error_type()==SSH_FX_EOF) || rr->retlen == 0) { xfer->eof = TRUE; + rr->retlen = 0; rr->complete = -1; #ifdef DEBUG_DOWNLOAD printf("setting eof\n"); @@ -1387,7 +1391,7 @@ int xfer_upload_ready(struct fxp_xfer *xfer) { - if (xfer->req_totalsize < xfer->req_maxsize) + if (sftp_sendbuffer() == 0) return 1; else return 0; @@ -1490,6 +1494,7 @@ sfree(xfer); } +int recv_peek(Socket sk, char* buf, int len); int pending_receive() { char tmp[5]; diff -Nru filezilla-3.15.0.2/src/putty/sftp.h filezilla-3.33.0/src/putty/sftp.h --- filezilla-3.15.0.2/src/putty/sftp.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sftp.h 2017-09-19 21:36:39.000000000 +0000 @@ -63,8 +63,12 @@ * until len is available, or it returns failure. * * Both functions return 1 on success, 0 on failure. + * + * sftp_sendbuffer returns the size of the backlog of data in the + * transmit queue. */ int sftp_senddata(char *data, int len); +int sftp_sendbuffer(void); int sftp_recvdata(char *data, int len); /* @@ -145,10 +149,10 @@ struct sftp_request *req); /* - * Close a file/dir. + * Close a file/dir. Returns 1 on success, 0 on error. */ struct sftp_request *fxp_close_send(struct fxp_handle *handle); -void fxp_close_recv(struct sftp_packet *pktin, struct sftp_request *req); +int fxp_close_recv(struct sftp_packet *pktin, struct sftp_request *req); /* * Make a directory. diff -Nru filezilla-3.15.0.2/src/putty/sshaes.c filezilla-3.33.0/src/putty/sshaes.c --- filezilla-3.15.0.2/src/putty/sshaes.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshaes.c 2017-09-19 21:36:39.000000000 +0000 @@ -1,30 +1,5 @@ /* - * aes.c - implementation of AES / Rijndael - * - * AES is a flexible algorithm as regards endianness: it has no - * inherent preference as to which way round you should form words - * from the input byte stream. It talks endlessly of four-byte - * _vectors_, but never of 32-bit _words_ - there's no 32-bit - * addition at all, which would force an endianness by means of - * which way the carries went. So it would be possible to write a - * working AES that read words big-endian, and another working one - * that read them little-endian, just by computing a different set - * of tables - with no speed drop. - * - * It's therefore tempting to do just that, and remove the overhead - * of GET_32BIT_MSB_FIRST() et al, allowing every system to use its - * own endianness-native code; but I decided not to, partly for - * ease of testing, and mostly because I like the flexibility that - * allows you to encrypt a non-word-aligned block of memory (which - * many systems would stop being able to do if I went the - * endianness-dependent route). - * - * This implementation reads and stores words big-endian, but - * that's a minor implementation detail. By flipping the endianness - * of everything in the E0..E3, D0..D3 tables, and substituting - * GET_32BIT_LSB_FIRST for GET_32BIT_MSB_FIRST, I could create an - * implementation that worked internally little-endian and gave the - * same answers at the same speed. + * Modified to use the AES implementation from Nettle. */ #include @@ -32,1074 +7,78 @@ #include "ssh.h" -#define MAX_NR 14 /* max no of rounds */ -#define MAX_NK 8 /* max no of words in input key */ -#define MAX_NB 8 /* max no of words in cipher blk */ - -#define mulby2(x) ( ((x&0x7F) << 1) ^ (x & 0x80 ? 0x1B : 0) ) +#include +#include +#include typedef struct AESContext AESContext; struct AESContext { - word32 keysched[(MAX_NR + 1) * MAX_NB]; - word32 invkeysched[(MAX_NR + 1) * MAX_NB]; - void (*encrypt) (AESContext * ctx, word32 * block); - void (*decrypt) (AESContext * ctx, word32 * block); - word32 iv[MAX_NB]; - int Nb, Nr; -}; - -static const unsigned char Sbox[256] = { - 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, - 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, - 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, - 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, - 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, - 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, - 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, - 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, - 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, - 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, - 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, - 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, - 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, - 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, - 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, - 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, - 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, - 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, - 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, - 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, - 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, - 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, - 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, - 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, - 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, - 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, - 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, - 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, - 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, - 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, - 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, - 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 -}; - -static const unsigned char Sboxinv[256] = { - 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, - 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb, - 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, - 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, - 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, - 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e, - 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, - 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25, - 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, - 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, - 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, - 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84, - 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, - 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06, - 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, - 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, - 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, - 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73, - 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, - 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e, - 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, - 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, - 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, - 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4, - 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, - 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f, - 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, - 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, - 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, - 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61, - 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, - 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d -}; - -static const word32 E0[256] = { - 0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d, - 0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554, - 0x60303050, 0x02010103, 0xce6767a9, 0x562b2b7d, - 0xe7fefe19, 0xb5d7d762, 0x4dababe6, 0xec76769a, - 0x8fcaca45, 0x1f82829d, 0x89c9c940, 0xfa7d7d87, - 0xeffafa15, 0xb25959eb, 0x8e4747c9, 0xfbf0f00b, - 0x41adadec, 0xb3d4d467, 0x5fa2a2fd, 0x45afafea, - 0x239c9cbf, 0x53a4a4f7, 0xe4727296, 0x9bc0c05b, - 0x75b7b7c2, 0xe1fdfd1c, 0x3d9393ae, 0x4c26266a, - 0x6c36365a, 0x7e3f3f41, 0xf5f7f702, 0x83cccc4f, - 0x6834345c, 0x51a5a5f4, 0xd1e5e534, 0xf9f1f108, - 0xe2717193, 0xabd8d873, 0x62313153, 0x2a15153f, - 0x0804040c, 0x95c7c752, 0x46232365, 0x9dc3c35e, - 0x30181828, 0x379696a1, 0x0a05050f, 0x2f9a9ab5, - 0x0e070709, 0x24121236, 0x1b80809b, 0xdfe2e23d, - 0xcdebeb26, 0x4e272769, 0x7fb2b2cd, 0xea75759f, - 0x1209091b, 0x1d83839e, 0x582c2c74, 0x341a1a2e, - 0x361b1b2d, 0xdc6e6eb2, 0xb45a5aee, 0x5ba0a0fb, - 0xa45252f6, 0x763b3b4d, 0xb7d6d661, 0x7db3b3ce, - 0x5229297b, 0xdde3e33e, 0x5e2f2f71, 0x13848497, - 0xa65353f5, 0xb9d1d168, 0x00000000, 0xc1eded2c, - 0x40202060, 0xe3fcfc1f, 0x79b1b1c8, 0xb65b5bed, - 0xd46a6abe, 0x8dcbcb46, 0x67bebed9, 0x7239394b, - 0x944a4ade, 0x984c4cd4, 0xb05858e8, 0x85cfcf4a, - 0xbbd0d06b, 0xc5efef2a, 0x4faaaae5, 0xedfbfb16, - 0x864343c5, 0x9a4d4dd7, 0x66333355, 0x11858594, - 0x8a4545cf, 0xe9f9f910, 0x04020206, 0xfe7f7f81, - 0xa05050f0, 0x783c3c44, 0x259f9fba, 0x4ba8a8e3, - 0xa25151f3, 0x5da3a3fe, 0x804040c0, 0x058f8f8a, - 0x3f9292ad, 0x219d9dbc, 0x70383848, 0xf1f5f504, - 0x63bcbcdf, 0x77b6b6c1, 0xafdada75, 0x42212163, - 0x20101030, 0xe5ffff1a, 0xfdf3f30e, 0xbfd2d26d, - 0x81cdcd4c, 0x180c0c14, 0x26131335, 0xc3ecec2f, - 0xbe5f5fe1, 0x359797a2, 0x884444cc, 0x2e171739, - 0x93c4c457, 0x55a7a7f2, 0xfc7e7e82, 0x7a3d3d47, - 0xc86464ac, 0xba5d5de7, 0x3219192b, 0xe6737395, - 0xc06060a0, 0x19818198, 0x9e4f4fd1, 0xa3dcdc7f, - 0x44222266, 0x542a2a7e, 0x3b9090ab, 0x0b888883, - 0x8c4646ca, 0xc7eeee29, 0x6bb8b8d3, 0x2814143c, - 0xa7dede79, 0xbc5e5ee2, 0x160b0b1d, 0xaddbdb76, - 0xdbe0e03b, 0x64323256, 0x743a3a4e, 0x140a0a1e, - 0x924949db, 0x0c06060a, 0x4824246c, 0xb85c5ce4, - 0x9fc2c25d, 0xbdd3d36e, 0x43acacef, 0xc46262a6, - 0x399191a8, 0x319595a4, 0xd3e4e437, 0xf279798b, - 0xd5e7e732, 0x8bc8c843, 0x6e373759, 0xda6d6db7, - 0x018d8d8c, 0xb1d5d564, 0x9c4e4ed2, 0x49a9a9e0, - 0xd86c6cb4, 0xac5656fa, 0xf3f4f407, 0xcfeaea25, - 0xca6565af, 0xf47a7a8e, 0x47aeaee9, 0x10080818, - 0x6fbabad5, 0xf0787888, 0x4a25256f, 0x5c2e2e72, - 0x381c1c24, 0x57a6a6f1, 0x73b4b4c7, 0x97c6c651, - 0xcbe8e823, 0xa1dddd7c, 0xe874749c, 0x3e1f1f21, - 0x964b4bdd, 0x61bdbddc, 0x0d8b8b86, 0x0f8a8a85, - 0xe0707090, 0x7c3e3e42, 0x71b5b5c4, 0xcc6666aa, - 0x904848d8, 0x06030305, 0xf7f6f601, 0x1c0e0e12, - 0xc26161a3, 0x6a35355f, 0xae5757f9, 0x69b9b9d0, - 0x17868691, 0x99c1c158, 0x3a1d1d27, 0x279e9eb9, - 0xd9e1e138, 0xebf8f813, 0x2b9898b3, 0x22111133, - 0xd26969bb, 0xa9d9d970, 0x078e8e89, 0x339494a7, - 0x2d9b9bb6, 0x3c1e1e22, 0x15878792, 0xc9e9e920, - 0x87cece49, 0xaa5555ff, 0x50282878, 0xa5dfdf7a, - 0x038c8c8f, 0x59a1a1f8, 0x09898980, 0x1a0d0d17, - 0x65bfbfda, 0xd7e6e631, 0x844242c6, 0xd06868b8, - 0x824141c3, 0x299999b0, 0x5a2d2d77, 0x1e0f0f11, - 0x7bb0b0cb, 0xa85454fc, 0x6dbbbbd6, 0x2c16163a, -}; -static const word32 E1[256] = { - 0xa5c66363, 0x84f87c7c, 0x99ee7777, 0x8df67b7b, - 0x0dfff2f2, 0xbdd66b6b, 0xb1de6f6f, 0x5491c5c5, - 0x50603030, 0x03020101, 0xa9ce6767, 0x7d562b2b, - 0x19e7fefe, 0x62b5d7d7, 0xe64dabab, 0x9aec7676, - 0x458fcaca, 0x9d1f8282, 0x4089c9c9, 0x87fa7d7d, - 0x15effafa, 0xebb25959, 0xc98e4747, 0x0bfbf0f0, - 0xec41adad, 0x67b3d4d4, 0xfd5fa2a2, 0xea45afaf, - 0xbf239c9c, 0xf753a4a4, 0x96e47272, 0x5b9bc0c0, - 0xc275b7b7, 0x1ce1fdfd, 0xae3d9393, 0x6a4c2626, - 0x5a6c3636, 0x417e3f3f, 0x02f5f7f7, 0x4f83cccc, - 0x5c683434, 0xf451a5a5, 0x34d1e5e5, 0x08f9f1f1, - 0x93e27171, 0x73abd8d8, 0x53623131, 0x3f2a1515, - 0x0c080404, 0x5295c7c7, 0x65462323, 0x5e9dc3c3, - 0x28301818, 0xa1379696, 0x0f0a0505, 0xb52f9a9a, - 0x090e0707, 0x36241212, 0x9b1b8080, 0x3ddfe2e2, - 0x26cdebeb, 0x694e2727, 0xcd7fb2b2, 0x9fea7575, - 0x1b120909, 0x9e1d8383, 0x74582c2c, 0x2e341a1a, - 0x2d361b1b, 0xb2dc6e6e, 0xeeb45a5a, 0xfb5ba0a0, - 0xf6a45252, 0x4d763b3b, 0x61b7d6d6, 0xce7db3b3, - 0x7b522929, 0x3edde3e3, 0x715e2f2f, 0x97138484, - 0xf5a65353, 0x68b9d1d1, 0x00000000, 0x2cc1eded, - 0x60402020, 0x1fe3fcfc, 0xc879b1b1, 0xedb65b5b, - 0xbed46a6a, 0x468dcbcb, 0xd967bebe, 0x4b723939, - 0xde944a4a, 0xd4984c4c, 0xe8b05858, 0x4a85cfcf, - 0x6bbbd0d0, 0x2ac5efef, 0xe54faaaa, 0x16edfbfb, - 0xc5864343, 0xd79a4d4d, 0x55663333, 0x94118585, - 0xcf8a4545, 0x10e9f9f9, 0x06040202, 0x81fe7f7f, - 0xf0a05050, 0x44783c3c, 0xba259f9f, 0xe34ba8a8, - 0xf3a25151, 0xfe5da3a3, 0xc0804040, 0x8a058f8f, - 0xad3f9292, 0xbc219d9d, 0x48703838, 0x04f1f5f5, - 0xdf63bcbc, 0xc177b6b6, 0x75afdada, 0x63422121, - 0x30201010, 0x1ae5ffff, 0x0efdf3f3, 0x6dbfd2d2, - 0x4c81cdcd, 0x14180c0c, 0x35261313, 0x2fc3ecec, - 0xe1be5f5f, 0xa2359797, 0xcc884444, 0x392e1717, - 0x5793c4c4, 0xf255a7a7, 0x82fc7e7e, 0x477a3d3d, - 0xacc86464, 0xe7ba5d5d, 0x2b321919, 0x95e67373, - 0xa0c06060, 0x98198181, 0xd19e4f4f, 0x7fa3dcdc, - 0x66442222, 0x7e542a2a, 0xab3b9090, 0x830b8888, - 0xca8c4646, 0x29c7eeee, 0xd36bb8b8, 0x3c281414, - 0x79a7dede, 0xe2bc5e5e, 0x1d160b0b, 0x76addbdb, - 0x3bdbe0e0, 0x56643232, 0x4e743a3a, 0x1e140a0a, - 0xdb924949, 0x0a0c0606, 0x6c482424, 0xe4b85c5c, - 0x5d9fc2c2, 0x6ebdd3d3, 0xef43acac, 0xa6c46262, - 0xa8399191, 0xa4319595, 0x37d3e4e4, 0x8bf27979, - 0x32d5e7e7, 0x438bc8c8, 0x596e3737, 0xb7da6d6d, - 0x8c018d8d, 0x64b1d5d5, 0xd29c4e4e, 0xe049a9a9, - 0xb4d86c6c, 0xfaac5656, 0x07f3f4f4, 0x25cfeaea, - 0xafca6565, 0x8ef47a7a, 0xe947aeae, 0x18100808, - 0xd56fbaba, 0x88f07878, 0x6f4a2525, 0x725c2e2e, - 0x24381c1c, 0xf157a6a6, 0xc773b4b4, 0x5197c6c6, - 0x23cbe8e8, 0x7ca1dddd, 0x9ce87474, 0x213e1f1f, - 0xdd964b4b, 0xdc61bdbd, 0x860d8b8b, 0x850f8a8a, - 0x90e07070, 0x427c3e3e, 0xc471b5b5, 0xaacc6666, - 0xd8904848, 0x05060303, 0x01f7f6f6, 0x121c0e0e, - 0xa3c26161, 0x5f6a3535, 0xf9ae5757, 0xd069b9b9, - 0x91178686, 0x5899c1c1, 0x273a1d1d, 0xb9279e9e, - 0x38d9e1e1, 0x13ebf8f8, 0xb32b9898, 0x33221111, - 0xbbd26969, 0x70a9d9d9, 0x89078e8e, 0xa7339494, - 0xb62d9b9b, 0x223c1e1e, 0x92158787, 0x20c9e9e9, - 0x4987cece, 0xffaa5555, 0x78502828, 0x7aa5dfdf, - 0x8f038c8c, 0xf859a1a1, 0x80098989, 0x171a0d0d, - 0xda65bfbf, 0x31d7e6e6, 0xc6844242, 0xb8d06868, - 0xc3824141, 0xb0299999, 0x775a2d2d, 0x111e0f0f, - 0xcb7bb0b0, 0xfca85454, 0xd66dbbbb, 0x3a2c1616, -}; -static const word32 E2[256] = { - 0x63a5c663, 0x7c84f87c, 0x7799ee77, 0x7b8df67b, - 0xf20dfff2, 0x6bbdd66b, 0x6fb1de6f, 0xc55491c5, - 0x30506030, 0x01030201, 0x67a9ce67, 0x2b7d562b, - 0xfe19e7fe, 0xd762b5d7, 0xabe64dab, 0x769aec76, - 0xca458fca, 0x829d1f82, 0xc94089c9, 0x7d87fa7d, - 0xfa15effa, 0x59ebb259, 0x47c98e47, 0xf00bfbf0, - 0xadec41ad, 0xd467b3d4, 0xa2fd5fa2, 0xafea45af, - 0x9cbf239c, 0xa4f753a4, 0x7296e472, 0xc05b9bc0, - 0xb7c275b7, 0xfd1ce1fd, 0x93ae3d93, 0x266a4c26, - 0x365a6c36, 0x3f417e3f, 0xf702f5f7, 0xcc4f83cc, - 0x345c6834, 0xa5f451a5, 0xe534d1e5, 0xf108f9f1, - 0x7193e271, 0xd873abd8, 0x31536231, 0x153f2a15, - 0x040c0804, 0xc75295c7, 0x23654623, 0xc35e9dc3, - 0x18283018, 0x96a13796, 0x050f0a05, 0x9ab52f9a, - 0x07090e07, 0x12362412, 0x809b1b80, 0xe23ddfe2, - 0xeb26cdeb, 0x27694e27, 0xb2cd7fb2, 0x759fea75, - 0x091b1209, 0x839e1d83, 0x2c74582c, 0x1a2e341a, - 0x1b2d361b, 0x6eb2dc6e, 0x5aeeb45a, 0xa0fb5ba0, - 0x52f6a452, 0x3b4d763b, 0xd661b7d6, 0xb3ce7db3, - 0x297b5229, 0xe33edde3, 0x2f715e2f, 0x84971384, - 0x53f5a653, 0xd168b9d1, 0x00000000, 0xed2cc1ed, - 0x20604020, 0xfc1fe3fc, 0xb1c879b1, 0x5bedb65b, - 0x6abed46a, 0xcb468dcb, 0xbed967be, 0x394b7239, - 0x4ade944a, 0x4cd4984c, 0x58e8b058, 0xcf4a85cf, - 0xd06bbbd0, 0xef2ac5ef, 0xaae54faa, 0xfb16edfb, - 0x43c58643, 0x4dd79a4d, 0x33556633, 0x85941185, - 0x45cf8a45, 0xf910e9f9, 0x02060402, 0x7f81fe7f, - 0x50f0a050, 0x3c44783c, 0x9fba259f, 0xa8e34ba8, - 0x51f3a251, 0xa3fe5da3, 0x40c08040, 0x8f8a058f, - 0x92ad3f92, 0x9dbc219d, 0x38487038, 0xf504f1f5, - 0xbcdf63bc, 0xb6c177b6, 0xda75afda, 0x21634221, - 0x10302010, 0xff1ae5ff, 0xf30efdf3, 0xd26dbfd2, - 0xcd4c81cd, 0x0c14180c, 0x13352613, 0xec2fc3ec, - 0x5fe1be5f, 0x97a23597, 0x44cc8844, 0x17392e17, - 0xc45793c4, 0xa7f255a7, 0x7e82fc7e, 0x3d477a3d, - 0x64acc864, 0x5de7ba5d, 0x192b3219, 0x7395e673, - 0x60a0c060, 0x81981981, 0x4fd19e4f, 0xdc7fa3dc, - 0x22664422, 0x2a7e542a, 0x90ab3b90, 0x88830b88, - 0x46ca8c46, 0xee29c7ee, 0xb8d36bb8, 0x143c2814, - 0xde79a7de, 0x5ee2bc5e, 0x0b1d160b, 0xdb76addb, - 0xe03bdbe0, 0x32566432, 0x3a4e743a, 0x0a1e140a, - 0x49db9249, 0x060a0c06, 0x246c4824, 0x5ce4b85c, - 0xc25d9fc2, 0xd36ebdd3, 0xacef43ac, 0x62a6c462, - 0x91a83991, 0x95a43195, 0xe437d3e4, 0x798bf279, - 0xe732d5e7, 0xc8438bc8, 0x37596e37, 0x6db7da6d, - 0x8d8c018d, 0xd564b1d5, 0x4ed29c4e, 0xa9e049a9, - 0x6cb4d86c, 0x56faac56, 0xf407f3f4, 0xea25cfea, - 0x65afca65, 0x7a8ef47a, 0xaee947ae, 0x08181008, - 0xbad56fba, 0x7888f078, 0x256f4a25, 0x2e725c2e, - 0x1c24381c, 0xa6f157a6, 0xb4c773b4, 0xc65197c6, - 0xe823cbe8, 0xdd7ca1dd, 0x749ce874, 0x1f213e1f, - 0x4bdd964b, 0xbddc61bd, 0x8b860d8b, 0x8a850f8a, - 0x7090e070, 0x3e427c3e, 0xb5c471b5, 0x66aacc66, - 0x48d89048, 0x03050603, 0xf601f7f6, 0x0e121c0e, - 0x61a3c261, 0x355f6a35, 0x57f9ae57, 0xb9d069b9, - 0x86911786, 0xc15899c1, 0x1d273a1d, 0x9eb9279e, - 0xe138d9e1, 0xf813ebf8, 0x98b32b98, 0x11332211, - 0x69bbd269, 0xd970a9d9, 0x8e89078e, 0x94a73394, - 0x9bb62d9b, 0x1e223c1e, 0x87921587, 0xe920c9e9, - 0xce4987ce, 0x55ffaa55, 0x28785028, 0xdf7aa5df, - 0x8c8f038c, 0xa1f859a1, 0x89800989, 0x0d171a0d, - 0xbfda65bf, 0xe631d7e6, 0x42c68442, 0x68b8d068, - 0x41c38241, 0x99b02999, 0x2d775a2d, 0x0f111e0f, - 0xb0cb7bb0, 0x54fca854, 0xbbd66dbb, 0x163a2c16, -}; -static const word32 E3[256] = { - 0x6363a5c6, 0x7c7c84f8, 0x777799ee, 0x7b7b8df6, - 0xf2f20dff, 0x6b6bbdd6, 0x6f6fb1de, 0xc5c55491, - 0x30305060, 0x01010302, 0x6767a9ce, 0x2b2b7d56, - 0xfefe19e7, 0xd7d762b5, 0xababe64d, 0x76769aec, - 0xcaca458f, 0x82829d1f, 0xc9c94089, 0x7d7d87fa, - 0xfafa15ef, 0x5959ebb2, 0x4747c98e, 0xf0f00bfb, - 0xadadec41, 0xd4d467b3, 0xa2a2fd5f, 0xafafea45, - 0x9c9cbf23, 0xa4a4f753, 0x727296e4, 0xc0c05b9b, - 0xb7b7c275, 0xfdfd1ce1, 0x9393ae3d, 0x26266a4c, - 0x36365a6c, 0x3f3f417e, 0xf7f702f5, 0xcccc4f83, - 0x34345c68, 0xa5a5f451, 0xe5e534d1, 0xf1f108f9, - 0x717193e2, 0xd8d873ab, 0x31315362, 0x15153f2a, - 0x04040c08, 0xc7c75295, 0x23236546, 0xc3c35e9d, - 0x18182830, 0x9696a137, 0x05050f0a, 0x9a9ab52f, - 0x0707090e, 0x12123624, 0x80809b1b, 0xe2e23ddf, - 0xebeb26cd, 0x2727694e, 0xb2b2cd7f, 0x75759fea, - 0x09091b12, 0x83839e1d, 0x2c2c7458, 0x1a1a2e34, - 0x1b1b2d36, 0x6e6eb2dc, 0x5a5aeeb4, 0xa0a0fb5b, - 0x5252f6a4, 0x3b3b4d76, 0xd6d661b7, 0xb3b3ce7d, - 0x29297b52, 0xe3e33edd, 0x2f2f715e, 0x84849713, - 0x5353f5a6, 0xd1d168b9, 0x00000000, 0xeded2cc1, - 0x20206040, 0xfcfc1fe3, 0xb1b1c879, 0x5b5bedb6, - 0x6a6abed4, 0xcbcb468d, 0xbebed967, 0x39394b72, - 0x4a4ade94, 0x4c4cd498, 0x5858e8b0, 0xcfcf4a85, - 0xd0d06bbb, 0xefef2ac5, 0xaaaae54f, 0xfbfb16ed, - 0x4343c586, 0x4d4dd79a, 0x33335566, 0x85859411, - 0x4545cf8a, 0xf9f910e9, 0x02020604, 0x7f7f81fe, - 0x5050f0a0, 0x3c3c4478, 0x9f9fba25, 0xa8a8e34b, - 0x5151f3a2, 0xa3a3fe5d, 0x4040c080, 0x8f8f8a05, - 0x9292ad3f, 0x9d9dbc21, 0x38384870, 0xf5f504f1, - 0xbcbcdf63, 0xb6b6c177, 0xdada75af, 0x21216342, - 0x10103020, 0xffff1ae5, 0xf3f30efd, 0xd2d26dbf, - 0xcdcd4c81, 0x0c0c1418, 0x13133526, 0xecec2fc3, - 0x5f5fe1be, 0x9797a235, 0x4444cc88, 0x1717392e, - 0xc4c45793, 0xa7a7f255, 0x7e7e82fc, 0x3d3d477a, - 0x6464acc8, 0x5d5de7ba, 0x19192b32, 0x737395e6, - 0x6060a0c0, 0x81819819, 0x4f4fd19e, 0xdcdc7fa3, - 0x22226644, 0x2a2a7e54, 0x9090ab3b, 0x8888830b, - 0x4646ca8c, 0xeeee29c7, 0xb8b8d36b, 0x14143c28, - 0xdede79a7, 0x5e5ee2bc, 0x0b0b1d16, 0xdbdb76ad, - 0xe0e03bdb, 0x32325664, 0x3a3a4e74, 0x0a0a1e14, - 0x4949db92, 0x06060a0c, 0x24246c48, 0x5c5ce4b8, - 0xc2c25d9f, 0xd3d36ebd, 0xacacef43, 0x6262a6c4, - 0x9191a839, 0x9595a431, 0xe4e437d3, 0x79798bf2, - 0xe7e732d5, 0xc8c8438b, 0x3737596e, 0x6d6db7da, - 0x8d8d8c01, 0xd5d564b1, 0x4e4ed29c, 0xa9a9e049, - 0x6c6cb4d8, 0x5656faac, 0xf4f407f3, 0xeaea25cf, - 0x6565afca, 0x7a7a8ef4, 0xaeaee947, 0x08081810, - 0xbabad56f, 0x787888f0, 0x25256f4a, 0x2e2e725c, - 0x1c1c2438, 0xa6a6f157, 0xb4b4c773, 0xc6c65197, - 0xe8e823cb, 0xdddd7ca1, 0x74749ce8, 0x1f1f213e, - 0x4b4bdd96, 0xbdbddc61, 0x8b8b860d, 0x8a8a850f, - 0x707090e0, 0x3e3e427c, 0xb5b5c471, 0x6666aacc, - 0x4848d890, 0x03030506, 0xf6f601f7, 0x0e0e121c, - 0x6161a3c2, 0x35355f6a, 0x5757f9ae, 0xb9b9d069, - 0x86869117, 0xc1c15899, 0x1d1d273a, 0x9e9eb927, - 0xe1e138d9, 0xf8f813eb, 0x9898b32b, 0x11113322, - 0x6969bbd2, 0xd9d970a9, 0x8e8e8907, 0x9494a733, - 0x9b9bb62d, 0x1e1e223c, 0x87879215, 0xe9e920c9, - 0xcece4987, 0x5555ffaa, 0x28287850, 0xdfdf7aa5, - 0x8c8c8f03, 0xa1a1f859, 0x89898009, 0x0d0d171a, - 0xbfbfda65, 0xe6e631d7, 0x4242c684, 0x6868b8d0, - 0x4141c382, 0x9999b029, 0x2d2d775a, 0x0f0f111e, - 0xb0b0cb7b, 0x5454fca8, 0xbbbbd66d, 0x16163a2c, -}; -static const word32 D0[256] = { - 0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96, - 0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393, - 0x2030fa55, 0xad766df6, 0x88cc7691, 0xf5024c25, - 0x4fe5d7fc, 0xc52acbd7, 0x26354480, 0xb562a38f, - 0xdeb15a49, 0x25ba1b67, 0x45ea0e98, 0x5dfec0e1, - 0xc32f7502, 0x814cf012, 0x8d4697a3, 0x6bd3f9c6, - 0x038f5fe7, 0x15929c95, 0xbf6d7aeb, 0x955259da, - 0xd4be832d, 0x587421d3, 0x49e06929, 0x8ec9c844, - 0x75c2896a, 0xf48e7978, 0x99583e6b, 0x27b971dd, - 0xbee14fb6, 0xf088ad17, 0xc920ac66, 0x7dce3ab4, - 0x63df4a18, 0xe51a3182, 0x97513360, 0x62537f45, - 0xb16477e0, 0xbb6bae84, 0xfe81a01c, 0xf9082b94, - 0x70486858, 0x8f45fd19, 0x94de6c87, 0x527bf8b7, - 0xab73d323, 0x724b02e2, 0xe31f8f57, 0x6655ab2a, - 0xb2eb2807, 0x2fb5c203, 0x86c57b9a, 0xd33708a5, - 0x302887f2, 0x23bfa5b2, 0x02036aba, 0xed16825c, - 0x8acf1c2b, 0xa779b492, 0xf307f2f0, 0x4e69e2a1, - 0x65daf4cd, 0x0605bed5, 0xd134621f, 0xc4a6fe8a, - 0x342e539d, 0xa2f355a0, 0x058ae132, 0xa4f6eb75, - 0x0b83ec39, 0x4060efaa, 0x5e719f06, 0xbd6e1051, - 0x3e218af9, 0x96dd063d, 0xdd3e05ae, 0x4de6bd46, - 0x91548db5, 0x71c45d05, 0x0406d46f, 0x605015ff, - 0x1998fb24, 0xd6bde997, 0x894043cc, 0x67d99e77, - 0xb0e842bd, 0x07898b88, 0xe7195b38, 0x79c8eedb, - 0xa17c0a47, 0x7c420fe9, 0xf8841ec9, 0x00000000, - 0x09808683, 0x322bed48, 0x1e1170ac, 0x6c5a724e, - 0xfd0efffb, 0x0f853856, 0x3daed51e, 0x362d3927, - 0x0a0fd964, 0x685ca621, 0x9b5b54d1, 0x24362e3a, - 0x0c0a67b1, 0x9357e70f, 0xb4ee96d2, 0x1b9b919e, - 0x80c0c54f, 0x61dc20a2, 0x5a774b69, 0x1c121a16, - 0xe293ba0a, 0xc0a02ae5, 0x3c22e043, 0x121b171d, - 0x0e090d0b, 0xf28bc7ad, 0x2db6a8b9, 0x141ea9c8, - 0x57f11985, 0xaf75074c, 0xee99ddbb, 0xa37f60fd, - 0xf701269f, 0x5c72f5bc, 0x44663bc5, 0x5bfb7e34, - 0x8b432976, 0xcb23c6dc, 0xb6edfc68, 0xb8e4f163, - 0xd731dcca, 0x42638510, 0x13972240, 0x84c61120, - 0x854a247d, 0xd2bb3df8, 0xaef93211, 0xc729a16d, - 0x1d9e2f4b, 0xdcb230f3, 0x0d8652ec, 0x77c1e3d0, - 0x2bb3166c, 0xa970b999, 0x119448fa, 0x47e96422, - 0xa8fc8cc4, 0xa0f03f1a, 0x567d2cd8, 0x223390ef, - 0x87494ec7, 0xd938d1c1, 0x8ccaa2fe, 0x98d40b36, - 0xa6f581cf, 0xa57ade28, 0xdab78e26, 0x3fadbfa4, - 0x2c3a9de4, 0x5078920d, 0x6a5fcc9b, 0x547e4662, - 0xf68d13c2, 0x90d8b8e8, 0x2e39f75e, 0x82c3aff5, - 0x9f5d80be, 0x69d0937c, 0x6fd52da9, 0xcf2512b3, - 0xc8ac993b, 0x10187da7, 0xe89c636e, 0xdb3bbb7b, - 0xcd267809, 0x6e5918f4, 0xec9ab701, 0x834f9aa8, - 0xe6956e65, 0xaaffe67e, 0x21bccf08, 0xef15e8e6, - 0xbae79bd9, 0x4a6f36ce, 0xea9f09d4, 0x29b07cd6, - 0x31a4b2af, 0x2a3f2331, 0xc6a59430, 0x35a266c0, - 0x744ebc37, 0xfc82caa6, 0xe090d0b0, 0x33a7d815, - 0xf104984a, 0x41ecdaf7, 0x7fcd500e, 0x1791f62f, - 0x764dd68d, 0x43efb04d, 0xccaa4d54, 0xe49604df, - 0x9ed1b5e3, 0x4c6a881b, 0xc12c1fb8, 0x4665517f, - 0x9d5eea04, 0x018c355d, 0xfa877473, 0xfb0b412e, - 0xb3671d5a, 0x92dbd252, 0xe9105633, 0x6dd64713, - 0x9ad7618c, 0x37a10c7a, 0x59f8148e, 0xeb133c89, - 0xcea927ee, 0xb761c935, 0xe11ce5ed, 0x7a47b13c, - 0x9cd2df59, 0x55f2733f, 0x1814ce79, 0x73c737bf, - 0x53f7cdea, 0x5ffdaa5b, 0xdf3d6f14, 0x7844db86, - 0xcaaff381, 0xb968c43e, 0x3824342c, 0xc2a3405f, - 0x161dc372, 0xbce2250c, 0x283c498b, 0xff0d9541, - 0x39a80171, 0x080cb3de, 0xd8b4e49c, 0x6456c190, - 0x7bcb8461, 0xd532b670, 0x486c5c74, 0xd0b85742, -}; -static const word32 D1[256] = { - 0x5051f4a7, 0x537e4165, 0xc31a17a4, 0x963a275e, - 0xcb3bab6b, 0xf11f9d45, 0xabacfa58, 0x934be303, - 0x552030fa, 0xf6ad766d, 0x9188cc76, 0x25f5024c, - 0xfc4fe5d7, 0xd7c52acb, 0x80263544, 0x8fb562a3, - 0x49deb15a, 0x6725ba1b, 0x9845ea0e, 0xe15dfec0, - 0x02c32f75, 0x12814cf0, 0xa38d4697, 0xc66bd3f9, - 0xe7038f5f, 0x9515929c, 0xebbf6d7a, 0xda955259, - 0x2dd4be83, 0xd3587421, 0x2949e069, 0x448ec9c8, - 0x6a75c289, 0x78f48e79, 0x6b99583e, 0xdd27b971, - 0xb6bee14f, 0x17f088ad, 0x66c920ac, 0xb47dce3a, - 0x1863df4a, 0x82e51a31, 0x60975133, 0x4562537f, - 0xe0b16477, 0x84bb6bae, 0x1cfe81a0, 0x94f9082b, - 0x58704868, 0x198f45fd, 0x8794de6c, 0xb7527bf8, - 0x23ab73d3, 0xe2724b02, 0x57e31f8f, 0x2a6655ab, - 0x07b2eb28, 0x032fb5c2, 0x9a86c57b, 0xa5d33708, - 0xf2302887, 0xb223bfa5, 0xba02036a, 0x5ced1682, - 0x2b8acf1c, 0x92a779b4, 0xf0f307f2, 0xa14e69e2, - 0xcd65daf4, 0xd50605be, 0x1fd13462, 0x8ac4a6fe, - 0x9d342e53, 0xa0a2f355, 0x32058ae1, 0x75a4f6eb, - 0x390b83ec, 0xaa4060ef, 0x065e719f, 0x51bd6e10, - 0xf93e218a, 0x3d96dd06, 0xaedd3e05, 0x464de6bd, - 0xb591548d, 0x0571c45d, 0x6f0406d4, 0xff605015, - 0x241998fb, 0x97d6bde9, 0xcc894043, 0x7767d99e, - 0xbdb0e842, 0x8807898b, 0x38e7195b, 0xdb79c8ee, - 0x47a17c0a, 0xe97c420f, 0xc9f8841e, 0x00000000, - 0x83098086, 0x48322bed, 0xac1e1170, 0x4e6c5a72, - 0xfbfd0eff, 0x560f8538, 0x1e3daed5, 0x27362d39, - 0x640a0fd9, 0x21685ca6, 0xd19b5b54, 0x3a24362e, - 0xb10c0a67, 0x0f9357e7, 0xd2b4ee96, 0x9e1b9b91, - 0x4f80c0c5, 0xa261dc20, 0x695a774b, 0x161c121a, - 0x0ae293ba, 0xe5c0a02a, 0x433c22e0, 0x1d121b17, - 0x0b0e090d, 0xadf28bc7, 0xb92db6a8, 0xc8141ea9, - 0x8557f119, 0x4caf7507, 0xbbee99dd, 0xfda37f60, - 0x9ff70126, 0xbc5c72f5, 0xc544663b, 0x345bfb7e, - 0x768b4329, 0xdccb23c6, 0x68b6edfc, 0x63b8e4f1, - 0xcad731dc, 0x10426385, 0x40139722, 0x2084c611, - 0x7d854a24, 0xf8d2bb3d, 0x11aef932, 0x6dc729a1, - 0x4b1d9e2f, 0xf3dcb230, 0xec0d8652, 0xd077c1e3, - 0x6c2bb316, 0x99a970b9, 0xfa119448, 0x2247e964, - 0xc4a8fc8c, 0x1aa0f03f, 0xd8567d2c, 0xef223390, - 0xc787494e, 0xc1d938d1, 0xfe8ccaa2, 0x3698d40b, - 0xcfa6f581, 0x28a57ade, 0x26dab78e, 0xa43fadbf, - 0xe42c3a9d, 0x0d507892, 0x9b6a5fcc, 0x62547e46, - 0xc2f68d13, 0xe890d8b8, 0x5e2e39f7, 0xf582c3af, - 0xbe9f5d80, 0x7c69d093, 0xa96fd52d, 0xb3cf2512, - 0x3bc8ac99, 0xa710187d, 0x6ee89c63, 0x7bdb3bbb, - 0x09cd2678, 0xf46e5918, 0x01ec9ab7, 0xa8834f9a, - 0x65e6956e, 0x7eaaffe6, 0x0821bccf, 0xe6ef15e8, - 0xd9bae79b, 0xce4a6f36, 0xd4ea9f09, 0xd629b07c, - 0xaf31a4b2, 0x312a3f23, 0x30c6a594, 0xc035a266, - 0x37744ebc, 0xa6fc82ca, 0xb0e090d0, 0x1533a7d8, - 0x4af10498, 0xf741ecda, 0x0e7fcd50, 0x2f1791f6, - 0x8d764dd6, 0x4d43efb0, 0x54ccaa4d, 0xdfe49604, - 0xe39ed1b5, 0x1b4c6a88, 0xb8c12c1f, 0x7f466551, - 0x049d5eea, 0x5d018c35, 0x73fa8774, 0x2efb0b41, - 0x5ab3671d, 0x5292dbd2, 0x33e91056, 0x136dd647, - 0x8c9ad761, 0x7a37a10c, 0x8e59f814, 0x89eb133c, - 0xeecea927, 0x35b761c9, 0xede11ce5, 0x3c7a47b1, - 0x599cd2df, 0x3f55f273, 0x791814ce, 0xbf73c737, - 0xea53f7cd, 0x5b5ffdaa, 0x14df3d6f, 0x867844db, - 0x81caaff3, 0x3eb968c4, 0x2c382434, 0x5fc2a340, - 0x72161dc3, 0x0cbce225, 0x8b283c49, 0x41ff0d95, - 0x7139a801, 0xde080cb3, 0x9cd8b4e4, 0x906456c1, - 0x617bcb84, 0x70d532b6, 0x74486c5c, 0x42d0b857, + struct aes_ctx enc_ctx; + struct aes_ctx dec_ctx; + uint8_t iv[16]; }; -static const word32 D2[256] = { - 0xa75051f4, 0x65537e41, 0xa4c31a17, 0x5e963a27, - 0x6bcb3bab, 0x45f11f9d, 0x58abacfa, 0x03934be3, - 0xfa552030, 0x6df6ad76, 0x769188cc, 0x4c25f502, - 0xd7fc4fe5, 0xcbd7c52a, 0x44802635, 0xa38fb562, - 0x5a49deb1, 0x1b6725ba, 0x0e9845ea, 0xc0e15dfe, - 0x7502c32f, 0xf012814c, 0x97a38d46, 0xf9c66bd3, - 0x5fe7038f, 0x9c951592, 0x7aebbf6d, 0x59da9552, - 0x832dd4be, 0x21d35874, 0x692949e0, 0xc8448ec9, - 0x896a75c2, 0x7978f48e, 0x3e6b9958, 0x71dd27b9, - 0x4fb6bee1, 0xad17f088, 0xac66c920, 0x3ab47dce, - 0x4a1863df, 0x3182e51a, 0x33609751, 0x7f456253, - 0x77e0b164, 0xae84bb6b, 0xa01cfe81, 0x2b94f908, - 0x68587048, 0xfd198f45, 0x6c8794de, 0xf8b7527b, - 0xd323ab73, 0x02e2724b, 0x8f57e31f, 0xab2a6655, - 0x2807b2eb, 0xc2032fb5, 0x7b9a86c5, 0x08a5d337, - 0x87f23028, 0xa5b223bf, 0x6aba0203, 0x825ced16, - 0x1c2b8acf, 0xb492a779, 0xf2f0f307, 0xe2a14e69, - 0xf4cd65da, 0xbed50605, 0x621fd134, 0xfe8ac4a6, - 0x539d342e, 0x55a0a2f3, 0xe132058a, 0xeb75a4f6, - 0xec390b83, 0xefaa4060, 0x9f065e71, 0x1051bd6e, - 0x8af93e21, 0x063d96dd, 0x05aedd3e, 0xbd464de6, - 0x8db59154, 0x5d0571c4, 0xd46f0406, 0x15ff6050, - 0xfb241998, 0xe997d6bd, 0x43cc8940, 0x9e7767d9, - 0x42bdb0e8, 0x8b880789, 0x5b38e719, 0xeedb79c8, - 0x0a47a17c, 0x0fe97c42, 0x1ec9f884, 0x00000000, - 0x86830980, 0xed48322b, 0x70ac1e11, 0x724e6c5a, - 0xfffbfd0e, 0x38560f85, 0xd51e3dae, 0x3927362d, - 0xd9640a0f, 0xa621685c, 0x54d19b5b, 0x2e3a2436, - 0x67b10c0a, 0xe70f9357, 0x96d2b4ee, 0x919e1b9b, - 0xc54f80c0, 0x20a261dc, 0x4b695a77, 0x1a161c12, - 0xba0ae293, 0x2ae5c0a0, 0xe0433c22, 0x171d121b, - 0x0d0b0e09, 0xc7adf28b, 0xa8b92db6, 0xa9c8141e, - 0x198557f1, 0x074caf75, 0xddbbee99, 0x60fda37f, - 0x269ff701, 0xf5bc5c72, 0x3bc54466, 0x7e345bfb, - 0x29768b43, 0xc6dccb23, 0xfc68b6ed, 0xf163b8e4, - 0xdccad731, 0x85104263, 0x22401397, 0x112084c6, - 0x247d854a, 0x3df8d2bb, 0x3211aef9, 0xa16dc729, - 0x2f4b1d9e, 0x30f3dcb2, 0x52ec0d86, 0xe3d077c1, - 0x166c2bb3, 0xb999a970, 0x48fa1194, 0x642247e9, - 0x8cc4a8fc, 0x3f1aa0f0, 0x2cd8567d, 0x90ef2233, - 0x4ec78749, 0xd1c1d938, 0xa2fe8cca, 0x0b3698d4, - 0x81cfa6f5, 0xde28a57a, 0x8e26dab7, 0xbfa43fad, - 0x9de42c3a, 0x920d5078, 0xcc9b6a5f, 0x4662547e, - 0x13c2f68d, 0xb8e890d8, 0xf75e2e39, 0xaff582c3, - 0x80be9f5d, 0x937c69d0, 0x2da96fd5, 0x12b3cf25, - 0x993bc8ac, 0x7da71018, 0x636ee89c, 0xbb7bdb3b, - 0x7809cd26, 0x18f46e59, 0xb701ec9a, 0x9aa8834f, - 0x6e65e695, 0xe67eaaff, 0xcf0821bc, 0xe8e6ef15, - 0x9bd9bae7, 0x36ce4a6f, 0x09d4ea9f, 0x7cd629b0, - 0xb2af31a4, 0x23312a3f, 0x9430c6a5, 0x66c035a2, - 0xbc37744e, 0xcaa6fc82, 0xd0b0e090, 0xd81533a7, - 0x984af104, 0xdaf741ec, 0x500e7fcd, 0xf62f1791, - 0xd68d764d, 0xb04d43ef, 0x4d54ccaa, 0x04dfe496, - 0xb5e39ed1, 0x881b4c6a, 0x1fb8c12c, 0x517f4665, - 0xea049d5e, 0x355d018c, 0x7473fa87, 0x412efb0b, - 0x1d5ab367, 0xd25292db, 0x5633e910, 0x47136dd6, - 0x618c9ad7, 0x0c7a37a1, 0x148e59f8, 0x3c89eb13, - 0x27eecea9, 0xc935b761, 0xe5ede11c, 0xb13c7a47, - 0xdf599cd2, 0x733f55f2, 0xce791814, 0x37bf73c7, - 0xcdea53f7, 0xaa5b5ffd, 0x6f14df3d, 0xdb867844, - 0xf381caaf, 0xc43eb968, 0x342c3824, 0x405fc2a3, - 0xc372161d, 0x250cbce2, 0x498b283c, 0x9541ff0d, - 0x017139a8, 0xb3de080c, 0xe49cd8b4, 0xc1906456, - 0x84617bcb, 0xb670d532, 0x5c74486c, 0x5742d0b8, -}; -static const word32 D3[256] = { - 0xf4a75051, 0x4165537e, 0x17a4c31a, 0x275e963a, - 0xab6bcb3b, 0x9d45f11f, 0xfa58abac, 0xe303934b, - 0x30fa5520, 0x766df6ad, 0xcc769188, 0x024c25f5, - 0xe5d7fc4f, 0x2acbd7c5, 0x35448026, 0x62a38fb5, - 0xb15a49de, 0xba1b6725, 0xea0e9845, 0xfec0e15d, - 0x2f7502c3, 0x4cf01281, 0x4697a38d, 0xd3f9c66b, - 0x8f5fe703, 0x929c9515, 0x6d7aebbf, 0x5259da95, - 0xbe832dd4, 0x7421d358, 0xe0692949, 0xc9c8448e, - 0xc2896a75, 0x8e7978f4, 0x583e6b99, 0xb971dd27, - 0xe14fb6be, 0x88ad17f0, 0x20ac66c9, 0xce3ab47d, - 0xdf4a1863, 0x1a3182e5, 0x51336097, 0x537f4562, - 0x6477e0b1, 0x6bae84bb, 0x81a01cfe, 0x082b94f9, - 0x48685870, 0x45fd198f, 0xde6c8794, 0x7bf8b752, - 0x73d323ab, 0x4b02e272, 0x1f8f57e3, 0x55ab2a66, - 0xeb2807b2, 0xb5c2032f, 0xc57b9a86, 0x3708a5d3, - 0x2887f230, 0xbfa5b223, 0x036aba02, 0x16825ced, - 0xcf1c2b8a, 0x79b492a7, 0x07f2f0f3, 0x69e2a14e, - 0xdaf4cd65, 0x05bed506, 0x34621fd1, 0xa6fe8ac4, - 0x2e539d34, 0xf355a0a2, 0x8ae13205, 0xf6eb75a4, - 0x83ec390b, 0x60efaa40, 0x719f065e, 0x6e1051bd, - 0x218af93e, 0xdd063d96, 0x3e05aedd, 0xe6bd464d, - 0x548db591, 0xc45d0571, 0x06d46f04, 0x5015ff60, - 0x98fb2419, 0xbde997d6, 0x4043cc89, 0xd99e7767, - 0xe842bdb0, 0x898b8807, 0x195b38e7, 0xc8eedb79, - 0x7c0a47a1, 0x420fe97c, 0x841ec9f8, 0x00000000, - 0x80868309, 0x2bed4832, 0x1170ac1e, 0x5a724e6c, - 0x0efffbfd, 0x8538560f, 0xaed51e3d, 0x2d392736, - 0x0fd9640a, 0x5ca62168, 0x5b54d19b, 0x362e3a24, - 0x0a67b10c, 0x57e70f93, 0xee96d2b4, 0x9b919e1b, - 0xc0c54f80, 0xdc20a261, 0x774b695a, 0x121a161c, - 0x93ba0ae2, 0xa02ae5c0, 0x22e0433c, 0x1b171d12, - 0x090d0b0e, 0x8bc7adf2, 0xb6a8b92d, 0x1ea9c814, - 0xf1198557, 0x75074caf, 0x99ddbbee, 0x7f60fda3, - 0x01269ff7, 0x72f5bc5c, 0x663bc544, 0xfb7e345b, - 0x4329768b, 0x23c6dccb, 0xedfc68b6, 0xe4f163b8, - 0x31dccad7, 0x63851042, 0x97224013, 0xc6112084, - 0x4a247d85, 0xbb3df8d2, 0xf93211ae, 0x29a16dc7, - 0x9e2f4b1d, 0xb230f3dc, 0x8652ec0d, 0xc1e3d077, - 0xb3166c2b, 0x70b999a9, 0x9448fa11, 0xe9642247, - 0xfc8cc4a8, 0xf03f1aa0, 0x7d2cd856, 0x3390ef22, - 0x494ec787, 0x38d1c1d9, 0xcaa2fe8c, 0xd40b3698, - 0xf581cfa6, 0x7ade28a5, 0xb78e26da, 0xadbfa43f, - 0x3a9de42c, 0x78920d50, 0x5fcc9b6a, 0x7e466254, - 0x8d13c2f6, 0xd8b8e890, 0x39f75e2e, 0xc3aff582, - 0x5d80be9f, 0xd0937c69, 0xd52da96f, 0x2512b3cf, - 0xac993bc8, 0x187da710, 0x9c636ee8, 0x3bbb7bdb, - 0x267809cd, 0x5918f46e, 0x9ab701ec, 0x4f9aa883, - 0x956e65e6, 0xffe67eaa, 0xbccf0821, 0x15e8e6ef, - 0xe79bd9ba, 0x6f36ce4a, 0x9f09d4ea, 0xb07cd629, - 0xa4b2af31, 0x3f23312a, 0xa59430c6, 0xa266c035, - 0x4ebc3774, 0x82caa6fc, 0x90d0b0e0, 0xa7d81533, - 0x04984af1, 0xecdaf741, 0xcd500e7f, 0x91f62f17, - 0x4dd68d76, 0xefb04d43, 0xaa4d54cc, 0x9604dfe4, - 0xd1b5e39e, 0x6a881b4c, 0x2c1fb8c1, 0x65517f46, - 0x5eea049d, 0x8c355d01, 0x877473fa, 0x0b412efb, - 0x671d5ab3, 0xdbd25292, 0x105633e9, 0xd647136d, - 0xd7618c9a, 0xa10c7a37, 0xf8148e59, 0x133c89eb, - 0xa927eece, 0x61c935b7, 0x1ce5ede1, 0x47b13c7a, - 0xd2df599c, 0xf2733f55, 0x14ce7918, 0xc737bf73, - 0xf7cdea53, 0xfdaa5b5f, 0x3d6f14df, 0x44db8678, - 0xaff381ca, 0x68c43eb9, 0x24342c38, 0xa3405fc2, - 0x1dc37216, 0xe2250cbc, 0x3c498b28, 0x0d9541ff, - 0xa8017139, 0x0cb3de08, 0xb4e49cd8, 0x56c19064, - 0xcb84617b, 0x32b670d5, 0x6c5c7448, 0xb85742d0, -}; - -/* - * Common macros in both the encryption and decryption routines. - */ -#define ADD_ROUND_KEY_4 (block[0]^=*keysched++, block[1]^=*keysched++, \ - block[2]^=*keysched++, block[3]^=*keysched++) -#define ADD_ROUND_KEY_6 (block[0]^=*keysched++, block[1]^=*keysched++, \ - block[2]^=*keysched++, block[3]^=*keysched++, \ - block[4]^=*keysched++, block[5]^=*keysched++) -#define ADD_ROUND_KEY_8 (block[0]^=*keysched++, block[1]^=*keysched++, \ - block[2]^=*keysched++, block[3]^=*keysched++, \ - block[4]^=*keysched++, block[5]^=*keysched++, \ - block[6]^=*keysched++, block[7]^=*keysched++) -#define MOVEWORD(i) ( block[i] = newstate[i] ) - -/* - * Macros for the encryption routine. There are three encryption - * cores, for Nb=4,6,8. - */ -#define MAKEWORD(i) ( newstate[i] = (E0[(block[i] >> 24) & 0xFF] ^ \ - E1[(block[(i+C1)%Nb] >> 16) & 0xFF] ^ \ - E2[(block[(i+C2)%Nb] >> 8) & 0xFF] ^ \ - E3[block[(i+C3)%Nb] & 0xFF]) ) -#define LASTWORD(i) ( newstate[i] = (Sbox[(block[i] >> 24) & 0xFF] << 24) | \ - (Sbox[(block[(i+C1)%Nb] >> 16) & 0xFF] << 16) | \ - (Sbox[(block[(i+C2)%Nb] >> 8) & 0xFF] << 8) | \ - (Sbox[(block[(i+C3)%Nb] ) & 0xFF] ) ) - -/* - * Core encrypt routines, expecting word32 inputs read big-endian - * from the byte-oriented input stream. - */ -static void aes_encrypt_nb_4(AESContext * ctx, word32 * block) -{ - int i; - static const int C1 = 1, C2 = 2, C3 = 3, Nb = 4; - word32 *keysched = ctx->keysched; - word32 newstate[4]; - for (i = 0; i < ctx->Nr - 1; i++) { - ADD_ROUND_KEY_4; - MAKEWORD(0); - MAKEWORD(1); - MAKEWORD(2); - MAKEWORD(3); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - } - ADD_ROUND_KEY_4; - LASTWORD(0); - LASTWORD(1); - LASTWORD(2); - LASTWORD(3); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - ADD_ROUND_KEY_4; -} -static void aes_encrypt_nb_6(AESContext * ctx, word32 * block) -{ - int i; - static const int C1 = 1, C2 = 2, C3 = 3, Nb = 6; - word32 *keysched = ctx->keysched; - word32 newstate[6]; - for (i = 0; i < ctx->Nr - 1; i++) { - ADD_ROUND_KEY_6; - MAKEWORD(0); - MAKEWORD(1); - MAKEWORD(2); - MAKEWORD(3); - MAKEWORD(4); - MAKEWORD(5); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - MOVEWORD(4); - MOVEWORD(5); - } - ADD_ROUND_KEY_6; - LASTWORD(0); - LASTWORD(1); - LASTWORD(2); - LASTWORD(3); - LASTWORD(4); - LASTWORD(5); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - MOVEWORD(4); - MOVEWORD(5); - ADD_ROUND_KEY_6; -} -static void aes_encrypt_nb_8(AESContext * ctx, word32 * block) -{ - int i; - static const int C1 = 1, C2 = 3, C3 = 4, Nb = 8; - word32 *keysched = ctx->keysched; - word32 newstate[8]; - for (i = 0; i < ctx->Nr - 1; i++) { - ADD_ROUND_KEY_8; - MAKEWORD(0); - MAKEWORD(1); - MAKEWORD(2); - MAKEWORD(3); - MAKEWORD(4); - MAKEWORD(5); - MAKEWORD(6); - MAKEWORD(7); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - MOVEWORD(4); - MOVEWORD(5); - MOVEWORD(6); - MOVEWORD(7); - } - ADD_ROUND_KEY_8; - LASTWORD(0); - LASTWORD(1); - LASTWORD(2); - LASTWORD(3); - LASTWORD(4); - LASTWORD(5); - LASTWORD(6); - LASTWORD(7); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - MOVEWORD(4); - MOVEWORD(5); - MOVEWORD(6); - MOVEWORD(7); - ADD_ROUND_KEY_8; -} - -#undef MAKEWORD -#undef LASTWORD - -/* - * Macros for the decryption routine. There are three decryption - * cores, for Nb=4,6,8. - */ -#define MAKEWORD(i) ( newstate[i] = (D0[(block[i] >> 24) & 0xFF] ^ \ - D1[(block[(i+C1)%Nb] >> 16) & 0xFF] ^ \ - D2[(block[(i+C2)%Nb] >> 8) & 0xFF] ^ \ - D3[block[(i+C3)%Nb] & 0xFF]) ) -#define LASTWORD(i) (newstate[i] = (Sboxinv[(block[i] >> 24) & 0xFF] << 24) | \ - (Sboxinv[(block[(i+C1)%Nb] >> 16) & 0xFF] << 16) | \ - (Sboxinv[(block[(i+C2)%Nb] >> 8) & 0xFF] << 8) | \ - (Sboxinv[(block[(i+C3)%Nb] ) & 0xFF] ) ) - -/* - * Core decrypt routines, expecting word32 inputs read big-endian - * from the byte-oriented input stream. - */ -static void aes_decrypt_nb_4(AESContext * ctx, word32 * block) -{ - int i; - static const int C1 = 4 - 1, C2 = 4 - 2, C3 = 4 - 3, Nb = 4; - word32 *keysched = ctx->invkeysched; - word32 newstate[4]; - for (i = 0; i < ctx->Nr - 1; i++) { - ADD_ROUND_KEY_4; - MAKEWORD(0); - MAKEWORD(1); - MAKEWORD(2); - MAKEWORD(3); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - } - ADD_ROUND_KEY_4; - LASTWORD(0); - LASTWORD(1); - LASTWORD(2); - LASTWORD(3); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - ADD_ROUND_KEY_4; -} -static void aes_decrypt_nb_6(AESContext * ctx, word32 * block) -{ - int i; - static const int C1 = 6 - 1, C2 = 6 - 2, C3 = 6 - 3, Nb = 6; - word32 *keysched = ctx->invkeysched; - word32 newstate[6]; - for (i = 0; i < ctx->Nr - 1; i++) { - ADD_ROUND_KEY_6; - MAKEWORD(0); - MAKEWORD(1); - MAKEWORD(2); - MAKEWORD(3); - MAKEWORD(4); - MAKEWORD(5); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - MOVEWORD(4); - MOVEWORD(5); - } - ADD_ROUND_KEY_6; - LASTWORD(0); - LASTWORD(1); - LASTWORD(2); - LASTWORD(3); - LASTWORD(4); - LASTWORD(5); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - MOVEWORD(4); - MOVEWORD(5); - ADD_ROUND_KEY_6; -} -static void aes_decrypt_nb_8(AESContext * ctx, word32 * block) -{ - int i; - static const int C1 = 8 - 1, C2 = 8 - 3, C3 = 8 - 4, Nb = 8; - word32 *keysched = ctx->invkeysched; - word32 newstate[8]; - for (i = 0; i < ctx->Nr - 1; i++) { - ADD_ROUND_KEY_8; - MAKEWORD(0); - MAKEWORD(1); - MAKEWORD(2); - MAKEWORD(3); - MAKEWORD(4); - MAKEWORD(5); - MAKEWORD(6); - MAKEWORD(7); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - MOVEWORD(4); - MOVEWORD(5); - MOVEWORD(6); - MOVEWORD(7); - } - ADD_ROUND_KEY_8; - LASTWORD(0); - LASTWORD(1); - LASTWORD(2); - LASTWORD(3); - LASTWORD(4); - LASTWORD(5); - LASTWORD(6); - LASTWORD(7); - MOVEWORD(0); - MOVEWORD(1); - MOVEWORD(2); - MOVEWORD(3); - MOVEWORD(4); - MOVEWORD(5); - MOVEWORD(6); - MOVEWORD(7); - ADD_ROUND_KEY_8; -} - -#undef MAKEWORD -#undef LASTWORD - - -/* - * Set up an AESContext. `keylen' and `blocklen' are measured in - * bytes; each can be either 16 (128-bit), 24 (192-bit), or 32 - * (256-bit). - */ -static void aes_setup(AESContext * ctx, int blocklen, - unsigned char *key, int keylen) -{ - int i, j, Nk, rconst; - - assert(blocklen == 16 || blocklen == 24 || blocklen == 32); - assert(keylen == 16 || keylen == 24 || keylen == 32); - - /* - * Basic parameters. Words per block, words in key, rounds. - */ - Nk = keylen / 4; - ctx->Nb = blocklen / 4; - ctx->Nr = 6 + (ctx->Nb > Nk ? ctx->Nb : Nk); - - /* - * Assign core-function pointers. - */ - if (ctx->Nb == 8) - ctx->encrypt = aes_encrypt_nb_8, ctx->decrypt = aes_decrypt_nb_8; - else if (ctx->Nb == 6) - ctx->encrypt = aes_encrypt_nb_6, ctx->decrypt = aes_decrypt_nb_6; - else if (ctx->Nb == 4) - ctx->encrypt = aes_encrypt_nb_4, ctx->decrypt = aes_decrypt_nb_4; - - /* - * Now do the key setup itself. - */ - rconst = 1; - for (i = 0; i < (ctx->Nr + 1) * ctx->Nb; i++) { - if (i < Nk) - ctx->keysched[i] = GET_32BIT_MSB_FIRST(key + 4 * i); - else { - word32 temp = ctx->keysched[i - 1]; - if (i % Nk == 0) { - int a, b, c, d; - a = (temp >> 16) & 0xFF; - b = (temp >> 8) & 0xFF; - c = (temp >> 0) & 0xFF; - d = (temp >> 24) & 0xFF; - temp = Sbox[a] ^ rconst; - temp = (temp << 8) | Sbox[b]; - temp = (temp << 8) | Sbox[c]; - temp = (temp << 8) | Sbox[d]; - rconst = mulby2(rconst); - } else if (i % Nk == 4 && Nk > 6) { - int a, b, c, d; - a = (temp >> 24) & 0xFF; - b = (temp >> 16) & 0xFF; - c = (temp >> 8) & 0xFF; - d = (temp >> 0) & 0xFF; - temp = Sbox[a]; - temp = (temp << 8) | Sbox[b]; - temp = (temp << 8) | Sbox[c]; - temp = (temp << 8) | Sbox[d]; - } - ctx->keysched[i] = ctx->keysched[i - Nk] ^ temp; - } - } - - /* - * Now prepare the modified keys for the inverse cipher. - */ - for (i = 0; i <= ctx->Nr; i++) { - for (j = 0; j < ctx->Nb; j++) { - word32 temp; - temp = ctx->keysched[(ctx->Nr - i) * ctx->Nb + j]; - if (i != 0 && i != ctx->Nr) { - /* - * Perform the InvMixColumn operation on i. The D - * tables give the result of InvMixColumn applied - * to Sboxinv on individual bytes, so we should - * compose Sbox with the D tables for this. - */ - int a, b, c, d; - a = (temp >> 24) & 0xFF; - b = (temp >> 16) & 0xFF; - c = (temp >> 8) & 0xFF; - d = (temp >> 0) & 0xFF; - temp = D0[Sbox[a]]; - temp ^= D1[Sbox[b]]; - temp ^= D2[Sbox[c]]; - temp ^= D3[Sbox[d]]; - } - ctx->invkeysched[i * ctx->Nb + j] = temp; - } - } -} - -static void aes_encrypt(AESContext * ctx, word32 * block) -{ - ctx->encrypt(ctx, block); -} - -static void aes_decrypt(AESContext * ctx, word32 * block) -{ - ctx->decrypt(ctx, block); -} static void aes_encrypt_cbc(unsigned char *blk, int len, AESContext * ctx) { - word32 iv[4]; - int i; - assert((len & 15) == 0); - memcpy(iv, ctx->iv, sizeof(iv)); - while (len > 0) { - for (i = 0; i < 4; i++) - iv[i] ^= GET_32BIT_MSB_FIRST(blk + 4 * i); - aes_encrypt(ctx, iv); - for (i = 0; i < 4; i++) - PUT_32BIT_MSB_FIRST(blk + 4 * i, iv[i]); + memxor(blk, ctx->iv, 16); + aes_encrypt(&ctx->enc_ctx, 16, ctx->iv, blk); + memcpy(blk, ctx->iv, 16); blk += 16; len -= 16; } - - memcpy(ctx->iv, iv, sizeof(iv)); } static void aes_decrypt_cbc(unsigned char *blk, int len, AESContext * ctx) { - word32 iv[4], x[4], ct[4]; - int i; + uint8_t x[16]; assert((len & 15) == 0); - memcpy(iv, ctx->iv, sizeof(iv)); - while (len > 0) { - for (i = 0; i < 4; i++) - x[i] = ct[i] = GET_32BIT_MSB_FIRST(blk + 4 * i); - aes_decrypt(ctx, x); - for (i = 0; i < 4; i++) { - PUT_32BIT_MSB_FIRST(blk + 4 * i, iv[i] ^ x[i]); - iv[i] = ct[i]; - } + aes_decrypt(&ctx->dec_ctx, 16, x, blk); + memxor(x, ctx->iv, 16); + memcpy(ctx->iv, blk, 16); + memcpy(blk, x, 16); blk += 16; len -= 16; } +} - memcpy(ctx->iv, iv, sizeof(iv)); +static void increment_iv_step32(uint8_t *iv, int i) +{ + word32 tmp; + for (--i; i >= 0; i--) { + tmp = GET_32BIT_MSB_FIRST(iv + 4 * i); + tmp = (tmp + 1) & 0xffffffff; + PUT_32BIT_MSB_FIRST(iv + 4 * i, tmp); + if (tmp != 0) + break; + } } static void aes_sdctr(unsigned char *blk, int len, AESContext *ctx) { - word32 iv[4], b[4], tmp; - int i; + uint8_t b[16]; assert((len & 15) == 0); - memcpy(iv, ctx->iv, sizeof(iv)); - while (len > 0) { - memcpy(b, iv, sizeof(b)); - aes_encrypt(ctx, b); - for (i = 0; i < 4; i++) { - tmp = GET_32BIT_MSB_FIRST(blk + 4 * i); - PUT_32BIT_MSB_FIRST(blk + 4 * i, tmp ^ b[i]); - } - for (i = 3; i >= 0; i--) - if ((iv[i] = (iv[i] + 1) & 0xffffffff) != 0) - break; + aes_encrypt(&ctx->enc_ctx, 16, b, ctx->iv); + memxor(blk, b, 16); + increment_iv_step32(ctx->iv, 4); blk += 16; len -= 16; } - - memcpy(ctx->iv, iv, sizeof(iv)); } void *aes_make_context(void) { - return snew(AESContext); + AESContext* ctx = snew(AESContext); + return ctx; } void aes_free_context(void *handle) @@ -1110,51 +89,52 @@ void aes128_key(void *handle, unsigned char *key) { AESContext *ctx = (AESContext *)handle; - aes_setup(ctx, 16, key, 16); + aes_set_encrypt_key(&ctx->enc_ctx, 16, key); + aes_invert_key(&ctx->dec_ctx, &ctx->enc_ctx); } void aes192_key(void *handle, unsigned char *key) { AESContext *ctx = (AESContext *)handle; - aes_setup(ctx, 16, key, 24); + aes_set_encrypt_key(&ctx->enc_ctx, 24, key); + aes_invert_key(&ctx->dec_ctx, &ctx->enc_ctx); } void aes256_key(void *handle, unsigned char *key) { AESContext *ctx = (AESContext *)handle; - aes_setup(ctx, 16, key, 32); + aes_set_encrypt_key(&ctx->enc_ctx, 32, key); + aes_invert_key(&ctx->dec_ctx, &ctx->enc_ctx); } void aes_iv(void *handle, unsigned char *iv) { AESContext *ctx = (AESContext *)handle; - int i; - for (i = 0; i < 4; i++) - ctx->iv[i] = GET_32BIT_MSB_FIRST(iv + 4 * i); + memcpy(ctx->iv, iv, 16); } -void aes_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len) +void aes_ssh2_sdctr(void *handle, unsigned char *blk, int len) { AESContext *ctx = (AESContext *)handle; - aes_encrypt_cbc(blk, len, ctx); + aes_sdctr(blk, len, ctx); } -void aes_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len) +void aes_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len) { AESContext *ctx = (AESContext *)handle; - aes_decrypt_cbc(blk, len, ctx); + aes_encrypt_cbc(blk, len, ctx); } -static void aes_ssh2_sdctr(void *handle, unsigned char *blk, int len) +void aes_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len) { AESContext *ctx = (AESContext *)handle; - aes_sdctr(blk, len, ctx); + aes_decrypt_cbc(blk, len, ctx); } void aes256_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len) { AESContext ctx; - aes_setup(&ctx, 16, key, 32); + aes256_key(&ctx, key); memset(ctx.iv, 0, sizeof(ctx.iv)); aes_encrypt_cbc(blk, len, &ctx); smemclr(&ctx, sizeof(ctx)); @@ -1163,7 +143,7 @@ void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len) { AESContext ctx; - aes_setup(&ctx, 16, key, 32); + aes256_key(&ctx, key); memset(ctx.iv, 0, sizeof(ctx.iv)); aes_decrypt_cbc(blk, len, &ctx); smemclr(&ctx, sizeof(ctx)); @@ -1225,12 +205,243 @@ NULL }; + + +/* GCM 256 */ + +typedef struct AES256GCMContext AES256GCMContext; +struct AES256GCMContext { + struct gcm_aes256_ctx ctx; + uint8_t iv[12]; +}; + + +void *aes256_gcm_make_context(void) +{ + AES256GCMContext* ctx = snew(AES256GCMContext); + return ctx; +} + + +void aes256_gcm_free_context(void *handle) +{ + sfree(handle); +} + + +void aes256_gcm_key(void *handle, unsigned char *key) +{ + AES256GCMContext *ctx = (AES256GCMContext *)handle; + nettle_gcm_aes256_set_key(&ctx->ctx, key); +} + + +void aes256_gcm_iv(void *handle, unsigned char *iv) +{ + AES256GCMContext *ctx = (AES256GCMContext *)handle; + memcpy(ctx->iv, iv, 12); +} + + +void aes256_gcm_encrypt_blk(void *handle, unsigned char *blk, int len) +{ + AES256GCMContext *ctx = (AES256GCMContext *)handle; + unsigned char adata[4]; + PUT_32BIT(adata, (unsigned int)len); + nettle_gcm_aes256_set_iv(&ctx->ctx, 12, ctx->iv); + nettle_gcm_aes256_update(&ctx->ctx, 4, adata); + nettle_gcm_aes256_encrypt(&ctx->ctx, len, blk, blk); +} + +void aes256_gcm_decrypt_blk(void *handle, unsigned char *blk, int len) +{ + AES256GCMContext *ctx = (AES256GCMContext *)handle; + + // Decryption was already done at MAC verification. Just increment the IV here. + increment_iv_step32(ctx->iv + 4, 2); +} + + +static void *aesgcm_mac_make_context(void *ctx) +{ + return ctx; +} + +static void aesgcm_mac_free_context(void *ctx) +{ + /* Not allocated, just forwarded, no need to free */ +} + +static void aesgcm_mac_setkey(void *ctx, unsigned char *key) +{ + /* Uses the same context as the cipher, so ignore */ +} + +static void aes256_gcm_mac_generate(void *handle, unsigned char *blk, int len, unsigned long seq) +{ + AES256GCMContext *ctx = (AES256GCMContext *)handle; + nettle_gcm_aes256_digest(&ctx->ctx, 16, blk+len); + increment_iv_step32(ctx->iv + 4, 2); +} + +static int aes256_gcm_mac_verify(void *handle, unsigned char *blk, int len, unsigned long seq) +{ + int res; + + AES256GCMContext *ctx = (AES256GCMContext *)handle; + + unsigned char mac[16]; + + nettle_gcm_aes256_set_iv(&ctx->ctx, 12, ctx->iv); + unsigned char adata[4]; + PUT_32BIT(adata, (unsigned int)(len - 4)); + nettle_gcm_aes256_update(&ctx->ctx, 4, adata); + nettle_gcm_aes256_decrypt(&ctx->ctx, len - 4, blk + 4, blk + 4); + nettle_gcm_aes256_digest(&ctx->ctx, 16, mac); + + res = smemeq(blk+len, mac, 16); + + return res; +} + +static const struct ssh_mac ssh2_aes256_gcm_mac = { + aesgcm_mac_make_context, aesgcm_mac_free_context, + aesgcm_mac_setkey, + + /* whole-packet operations */ + aes256_gcm_mac_generate,aes256_gcm_mac_verify, + + /* partial-packet operations, not supported */ + 0,0,0,0, + + "", "", /* Not selectable individually, just part of aes256-gcm@openssh.com */ + 16, 0, "AES256 GCM" +}; + +static const struct ssh2_cipher ssh_aes256_gcm = { + aes256_gcm_make_context, aes256_gcm_free_context, aes256_gcm_iv, aes256_gcm_key, + aes256_gcm_encrypt_blk, aes256_gcm_decrypt_blk, NULL, NULL, + "aes256-gcm@openssh.com", + 16, 256, 32, 0, "AES-256 GCM", + &ssh2_aes256_gcm_mac +}; + + +/* GCM 128 */ + +typedef struct AES128GCMContext AES128GCMContext; +struct AES128GCMContext { + struct gcm_aes128_ctx ctx; + uint8_t iv[12]; +}; + + +void *aes128_gcm_make_context(void) +{ + AES128GCMContext* ctx = snew(AES128GCMContext); + return ctx; +} + + +void aes128_gcm_free_context(void *handle) +{ + sfree(handle); +} + + +void aes128_gcm_key(void *handle, unsigned char *key) +{ + AES128GCMContext *ctx = (AES128GCMContext *)handle; + nettle_gcm_aes128_set_key(&ctx->ctx, key); +} + + +void aes128_gcm_iv(void *handle, unsigned char *iv) +{ + AES128GCMContext *ctx = (AES128GCMContext *)handle; + memcpy(ctx->iv, iv, 12); +} + + +void aes128_gcm_encrypt_blk(void *handle, unsigned char *blk, int len) +{ + AES128GCMContext *ctx = (AES128GCMContext *)handle; + unsigned char adata[4]; + PUT_32BIT(adata, (unsigned int)len); + nettle_gcm_aes128_set_iv(&ctx->ctx, 12, ctx->iv); + nettle_gcm_aes128_update(&ctx->ctx, 4, adata); + nettle_gcm_aes128_encrypt(&ctx->ctx, len, blk, blk); +} + +void aes128_gcm_decrypt_blk(void *handle, unsigned char *blk, int len) +{ + AES128GCMContext *ctx = (AES128GCMContext *)handle; + + // Decryption was already done at MAC verification. Just increment the IV here. + increment_iv_step32(ctx->iv + 4, 2); +} + + + +static void aes128_gcm_mac_generate(void *handle, unsigned char *blk, int len, unsigned long seq) +{ + AES128GCMContext *ctx = (AES128GCMContext *)handle; + nettle_gcm_aes128_digest(&ctx->ctx, 16, blk + len); + increment_iv_step32(ctx->iv + 4, 2); +} + +static int aes128_gcm_mac_verify(void *handle, unsigned char *blk, int len, unsigned long seq) +{ + int res; + + AES128GCMContext *ctx = (AES128GCMContext *)handle; + + unsigned char mac[16]; + + nettle_gcm_aes128_set_iv(&ctx->ctx, 12, ctx->iv); + unsigned char adata[4]; + PUT_32BIT(adata, (unsigned int)(len - 4)); + nettle_gcm_aes128_update(&ctx->ctx, 4, adata); + nettle_gcm_aes128_decrypt(&ctx->ctx, len - 4, blk + 4, blk + 4); + nettle_gcm_aes128_digest(&ctx->ctx, 16, mac); + + res = smemeq(blk + len, mac, 16); + + return res; +} + +static const struct ssh_mac ssh2_aes128_gcm_mac = { + aesgcm_mac_make_context, aesgcm_mac_free_context, + aesgcm_mac_setkey, + + /* whole-packet operations */ + aes128_gcm_mac_generate, aes128_gcm_mac_verify, + + /* partial-packet operations, not supported */ + 0,0,0,0, + + "", "", /* Not selectable individually, just part of aes256-gcm@openssh.com */ + 16, 0, "AES128 GCM" +}; + + +static const struct ssh2_cipher ssh_aes128_gcm = { + aes128_gcm_make_context, aes128_gcm_free_context, aes128_gcm_iv, aes128_gcm_key, + aes128_gcm_encrypt_blk, aes128_gcm_decrypt_blk, NULL, NULL, + "aes128-gcm@openssh.com", + 16, 128, 16, 0, "AES-128 GCM", + &ssh2_aes128_gcm_mac +}; + + static const struct ssh2_cipher *const aes_list[] = { + &ssh_aes256_gcm, &ssh_aes256_ctr, &ssh_aes256, &ssh_rijndael_lysator, &ssh_aes192_ctr, &ssh_aes192, + &ssh_aes128_gcm, &ssh_aes128_ctr, &ssh_aes128, }; diff -Nru filezilla-3.15.0.2/src/putty/sshbn.c filezilla-3.33.0/src/putty/sshbn.c --- filezilla-3.15.0.2/src/putty/sshbn.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshbn.c 2017-09-19 21:36:39.000000000 +0000 @@ -1461,6 +1461,7 @@ tmp = bigmul(result, Ten); tmp2 = bignum_from_long(*decimal - '0'); + freebn(result); result = bigadd(tmp, tmp2); freebn(tmp); freebn(tmp2); diff -Nru filezilla-3.15.0.2/src/putty/ssh.c filezilla-3.33.0/src/putty/ssh.c --- filezilla-3.15.0.2/src/putty/ssh.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/ssh.c 2017-09-19 21:36:39.000000000 +0000 @@ -10,7 +10,9 @@ #include #include "putty.h" +#include "pageant.h" /* for AGENT_MAX_MSGLEN */ #include "tree234.h" +#include "storage.h" #include "ssh.h" #ifndef NO_GSSAPI #include "sshgssc.h" @@ -90,7 +92,7 @@ * This list is derived from RFC 4254 and * SSH-1 RFC-1.2.31. */ -static const struct { +static const struct ssh_ttymode { const char* const mode; int opcode; enum { TTY_OP_CHAR, TTY_OP_BOOL } type; @@ -126,6 +128,7 @@ { "IXANY", 39, TTY_OP_BOOL }, { "IXOFF", 40, TTY_OP_BOOL }, { "IMAXBEL", 41, TTY_OP_BOOL }, + { "IUTF8", 42, TTY_OP_BOOL }, { "ISIG", 50, TTY_OP_BOOL }, { "ICANON", 51, TTY_OP_BOOL }, { "XCASE", 52, TTY_OP_BOOL }, @@ -302,7 +305,7 @@ * macros look impenetrable to you, you might find it helpful to * read * - * http://www.chiark.greenend.org.uk/~sgtatham/coroutines.html + * https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html * * which explains the theory behind these macros. * @@ -364,8 +367,13 @@ struct Packet *pktin); static void do_ssh2_authconn(Ssh ssh, const unsigned char *in, int inlen, struct Packet *pktin); +static void ssh_channel_init(struct ssh_channel *c); +static struct ssh_channel *ssh_channel_msg(Ssh ssh, struct Packet *pktin); +static void ssh_channel_got_eof(struct ssh_channel *c); static void ssh2_channel_check_close(struct ssh_channel *c); +static void ssh_channel_close_local(struct ssh_channel *c, char const *reason); static void ssh_channel_destroy(struct ssh_channel *c); +static void ssh_channel_unthrottle(struct ssh_channel *c, int bufsize); static void ssh2_msg_something_unimplemented(Ssh ssh, struct Packet *pktin); /* @@ -385,7 +393,7 @@ * ensure that the server never has any need to throttle its end * of the connection), so we set this high as well. * - * - OUR_V2_WINSIZE is the maximum window size we present on SSH-2 + * - OUR_V2_WINSIZE is the default window size we present on SSH-2 * channels. * * - OUR_V2_BIGWIN is the window size we advertise for the only @@ -409,16 +417,23 @@ #define OUR_V2_MAXPKT 0x4000UL #define OUR_V2_PACKETLIMIT 0x9000UL -const static struct ssh_signkey *hostkey_algs[] = { - &ssh_ecdsa_ed25519, - &ssh_ecdsa_nistp256, &ssh_ecdsa_nistp384, &ssh_ecdsa_nistp521, - &ssh_rsa, &ssh_dss +struct ssh_signkey_with_user_pref_id { + const struct ssh_signkey *alg; + int id; +}; +const static struct ssh_signkey_with_user_pref_id hostkey_algs[] = { + { &ssh_ecdsa_ed25519, HK_ED25519 }, + { &ssh_ecdsa_nistp256, HK_ECDSA }, + { &ssh_ecdsa_nistp384, HK_ECDSA }, + { &ssh_ecdsa_nistp521, HK_ECDSA }, + { &ssh_dss, HK_DSA }, + { &ssh_rsa, HK_RSA }, }; -const static struct ssh_mac *macs[] = { +const static struct ssh_mac *const macs[] = { &ssh_hmac_sha256, &ssh_hmac_sha1, &ssh_hmac_sha1_96, &ssh_hmac_md5 }; -const static struct ssh_mac *buggymacs[] = { +const static struct ssh_mac *const buggymacs[] = { &ssh_hmac_sha1_buggy, &ssh_hmac_sha1_96_buggy, &ssh_hmac_md5 }; @@ -445,7 +460,7 @@ ssh_comp_none_disable, NULL }; extern const struct ssh_compress ssh_zlib; -const static struct ssh_compress *compressions[] = { +const static struct ssh_compress *const compressions[] = { &ssh_zlib, &ssh_comp_none }; @@ -454,7 +469,6 @@ CHAN_X11, CHAN_AGENT, CHAN_SOCKDATA, - CHAN_SOCKDATA_DORMANT, /* one the remote hasn't confirmed */ /* * CHAN_SHARING indicates a channel which is tracked here on * behalf of a connection-sharing downstream. We do almost nothing @@ -562,10 +576,8 @@ } v; union { struct ssh_agent_channel { - unsigned char *message; - unsigned char msglen[4]; - unsigned lensofar, totallen; - int outstanding_requests; + bufchain inbuffer; + agent_pending_query *pending; } a; struct ssh_x11_channel { struct X11Connection *xconn; @@ -702,8 +714,8 @@ static void ssh_size(void *handle, int width, int height); static void ssh_special(void *handle, Telnet_Special); static int ssh2_try_send(struct ssh_channel *c); -static void ssh2_add_channel_data(struct ssh_channel *c, - const char *buf, int len); +static int ssh_send_channel_data(struct ssh_channel *c, + const char *buf, int len); static void ssh_throttle_all(Ssh ssh, int enable, int bufsize); static void ssh2_set_window(struct ssh_channel *c, int newwin); static int ssh_sendbuffer(void *handle); @@ -956,8 +968,41 @@ */ struct ssh_gss_liblist *gsslibs; #endif + + /* + * The last list returned from get_specials. + */ + struct telnet_special *specials; + + /* + * List of host key algorithms for which we _don't_ have a stored + * host key. These are indices into the main hostkey_algs[] array + */ + int uncert_hostkeys[lenof(hostkey_algs)]; + int n_uncert_hostkeys; + + /* + * Flag indicating that the current rekey is intended to finish + * with a newly cross-certified host key. + */ + int cross_certifying; + + /* + * Any asynchronous query to our SSH agent that we might have in + * flight from the main authentication loop. (Queries from + * agent-forwarding channels live in their channel structure.) + */ + agent_pending_query *auth_agent_query; }; +static const char *ssh_pkt_type(Ssh ssh, int type) +{ + if (ssh->version == 1) + return ssh1_pkt_type(type); + else + return ssh2_pkt_type(ssh->pkt_kctx, ssh->pkt_actx, type); +} + #define logevent(s) logevent(ssh->frontend, s) /* logevent, only printf-formatted. */ @@ -1164,27 +1209,38 @@ /* Helper function for common bits of parsing ttymodes. */ static void parse_ttymodes(Ssh ssh, - void (*do_mode)(void *data, char *mode, char *val), + void (*do_mode)(void *data, + const struct ssh_ttymode *mode, + char *val), void *data) { - char *key, *val; + int i; + const struct ssh_ttymode *mode; + char *val; - for (val = conf_get_str_strs(ssh->conf, CONF_ttymodes, NULL, &key); - val != NULL; - val = conf_get_str_strs(ssh->conf, CONF_ttymodes, key, &key)) { - /* - * val[0] is either 'V', indicating that an explicit value - * follows it, or 'A' indicating that we should pass the - * value through from the local environment via get_ttymode. + for (i = 0; i < lenof(ssh_ttymodes); i++) { + mode = ssh_ttymodes + i; + /* Every mode known to the current version of the code should be + * mentioned; this was ensured when settings were loaded. */ + val = conf_get_str_str(ssh->conf, CONF_ttymodes, mode->mode); + + /* + * val[0] can be + * - 'V', indicating that an explicit value follows it; + * - 'A', indicating that we should pass the value through from + * the local environment via get_ttymode; or + * - 'N', indicating that we should explicitly not send this + * mode. */ if (val[0] == 'A') { - val = get_ttymode(ssh->frontend, key); + val = get_ttymode(ssh->frontend, mode->mode); if (val) { - do_mode(data, key, val); + do_mode(data, mode, val); sfree(val); } - } else - do_mode(data, key, val + 1); /* skip the 'V' */ + } else if (val[0] == 'V') { + do_mode(data, mode, val + 1); /* skip the 'V' */ + } /* else 'N', or something from the future we don't understand */ } } @@ -2676,13 +2732,15 @@ if (backlog > SSH_MAX_BACKLOG) ssh_throttle_all(ssh, 1, backlog); - ssh->outgoing_data_size += ssh->deferred_data_size; - if (!ssh->kex_in_progress && - !ssh->bare_connection && - ssh->max_data_size != 0 && - ssh->outgoing_data_size > ssh->max_data_size) - do_ssh2_transport(ssh, "too much data sent", -1, NULL); - ssh->deferred_data_size = 0; + if (ssh->version == 2) { + ssh->outgoing_data_size += ssh->deferred_data_size; + ssh->deferred_data_size = 0; + if (!ssh->kex_in_progress && + !ssh->bare_connection && + ssh->max_data_size != 0 && + ssh->outgoing_data_size > ssh->max_data_size) + do_ssh2_transport(ssh, "too much data sent", -1, NULL); + } } /* @@ -3293,15 +3351,21 @@ /* Anything greater or equal to "1.99" means protocol 2 is supported. */ s->proto2 = ssh_versioncmp(s->version, "1.99") >= 0; - if (conf_get_int(ssh->conf, CONF_sshprot) == 0 && !s->proto1) { - bombout(("SSH protocol version 1 required by configuration but " - "not provided by server")); - crStop(0); - } - if (conf_get_int(ssh->conf, CONF_sshprot) == 3 && !s->proto2) { - bombout(("SSH protocol version 2 required by configuration but " - "not provided by server")); - crStop(0); + if (conf_get_int(ssh->conf, CONF_sshprot) == 0) { + if (!s->proto1) { + bombout(("SSH protocol version 1 required by our configuration " + "but not provided by server")); + crStop(0); + } + } else if (conf_get_int(ssh->conf, CONF_sshprot) == 3) { + if (!s->proto2) { + bombout(("SSH protocol version 2 required by our configuration " + "but server only provides (old, insecure) SSH-1")); + crStop(0); + } + } else { + /* No longer support values 1 or 2 for CONF_sshprot */ + assert(!"Unexpected value for CONF_sshprot"); } if (s->proto2 && (conf_get_int(ssh->conf, CONF_sshprot) >= 2 || !s->proto1)) @@ -3589,15 +3653,7 @@ */ if (ssh->channels) { while (NULL != (c = index234(ssh->channels, 0))) { - switch (c->type) { - case CHAN_X11: - x11_close(c->u.x11.xconn); - break; - case CHAN_SOCKDATA: - case CHAN_SOCKDATA_DORMANT: - pfd_close(c->u.pfd.pf); - break; - } + ssh_channel_close_local(c, NULL); del234(ssh->channels, c); /* moving next one to index 0 */ if (ssh->version == 2) bufchain_clear(&c->v.v2.outbuffer); @@ -3685,8 +3741,8 @@ } } -static int ssh_closing(Plug plug, const char *error_msg, int error_code, - int calling_back) +static void ssh_closing(Plug plug, const char *error_msg, int error_code, + int calling_back) { Ssh ssh = (Ssh) plug; int need_notify = ssh_do_close(ssh, FALSE); @@ -3708,18 +3764,15 @@ logevent(error_msg); if (!ssh->close_expected || !ssh->clean_exit) connection_fatal(ssh->frontend, "%s", error_msg); - return 0; } -static int ssh_receive(Plug plug, int urgent, char *data, int len) +static void ssh_receive(Plug plug, int urgent, char *data, int len) { Ssh ssh = (Ssh) plug; ssh_gotdata(ssh, (unsigned char *)data, len); if (ssh->state == SSH_STATE_CLOSED) { ssh_do_close(ssh, TRUE); - return 0; } - return 1; } static void ssh_sent(Plug plug, int bufsize) @@ -3863,13 +3916,17 @@ } /* - * If the SSH version number's fixed, set it now, and if it's SSH-2, - * send the version string too. + * The SSH version number is always fixed (since we no longer support + * fallback between versions), so set it now, and if it's SSH-2, + * send the version string now too. */ sshprot = conf_get_int(ssh->conf, CONF_sshprot); + assert(sshprot == 0 || sshprot == 3); if (sshprot == 0) + /* SSH-1 only */ ssh->version = 1; if (sshprot == 3 && !ssh->bare_connection) { + /* SSH-2 only */ ssh->version = 2; ssh_send_verstring(ssh, "SSH-", NULL); } @@ -3900,6 +3957,8 @@ } } +static void ssh_agentf_try_forward(struct ssh_channel *c); + /* * Throttle or unthrottle _all_ local data streams (for when sends * on the SSH connection itself back up). @@ -3926,7 +3985,12 @@ x11_override_throttle(c->u.x11.xconn, enable); break; case CHAN_AGENT: - /* Agent channels require no buffer management. */ + /* Agent forwarding channels are buffer-managed by + * checking ssh->throttled_all in ssh_agentf_try_forward. + * So at the moment we _un_throttle again, we must make an + * attempt to do something. */ + if (!enable) + ssh_agentf_try_forward(c); break; case CHAN_SOCKDATA: pfd_override_throttle(c->u.pfd.pf, enable); @@ -3939,6 +4003,8 @@ { Ssh ssh = (Ssh) sshv; + ssh->auth_agent_query = NULL; + ssh->agent_response = reply; ssh->agent_response_len = replylen; @@ -3966,38 +4032,140 @@ ssh_process_queued_incoming_data(ssh); } -static void ssh_agentf_callback(void *cv, void *reply, int replylen) +static void ssh_agentf_got_response(struct ssh_channel *c, + void *reply, int replylen) { - struct ssh_channel *c = (struct ssh_channel *)cv; - Ssh ssh = c->ssh; - const void *sentreply = reply; + c->u.a.pending = NULL; - c->u.a.outstanding_requests--; - if (!sentreply) { - /* Fake SSH_AGENT_FAILURE. */ - sentreply = "\0\0\0\1\5"; + assert(!(c->closes & CLOSES_SENT_EOF)); + + if (!reply) { + /* The real agent didn't send any kind of reply at all for + * some reason, so fake an SSH_AGENT_FAILURE. */ + reply = "\0\0\0\1\5"; replylen = 5; } - if (ssh->version == 2) { - ssh2_add_channel_data(c, sentreply, replylen); - ssh2_try_send(c); - } else { - send_packet(ssh, SSH1_MSG_CHANNEL_DATA, - PKT_INT, c->remoteid, - PKT_INT, replylen, - PKT_DATA, sentreply, replylen, - PKT_END); + + ssh_send_channel_data(c, reply, replylen); +} + +static void ssh_agentf_callback(void *cv, void *reply, int replylen); + +static void ssh_agentf_try_forward(struct ssh_channel *c) +{ + unsigned datalen, lengthfield, messagelen; + unsigned char *message; + unsigned char msglen[4]; + void *reply; + int replylen; + + /* + * Don't try to parallelise agent requests. Wait for each one to + * return before attempting the next. + */ + if (c->u.a.pending) + return; + + /* + * If the outgoing side of the channel connection is currently + * throttled (for any reason, either that channel's window size or + * the entire SSH connection being throttled), don't submit any + * new forwarded requests to the real agent. This causes the input + * side of the agent forwarding not to be emptied, exerting the + * required back-pressure on the remote client, and encouraging it + * to read our responses before sending too many more requests. + */ + if (c->ssh->throttled_all || + (c->ssh->version == 2 && c->v.v2.remwindow == 0)) + return; + + if (c->closes & CLOSES_SENT_EOF) { + /* + * If we've already sent outgoing EOF, there's nothing we can + * do with incoming data except consume it and throw it away. + */ + bufchain_clear(&c->u.a.inbuffer); + return; } - if (reply) - sfree(reply); + + while (1) { + /* + * Try to extract a complete message from the input buffer. + */ + datalen = bufchain_size(&c->u.a.inbuffer); + if (datalen < 4) + break; /* not even a length field available yet */ + + bufchain_fetch(&c->u.a.inbuffer, msglen, 4); + lengthfield = GET_32BIT(msglen); + + if (lengthfield > AGENT_MAX_MSGLEN) { + /* + * If the remote has sent a message that's just _too_ + * long, we should reject it in advance of seeing the rest + * of the incoming message, and also close the connection + * for good measure (which avoids us having to faff about + * with carefully ignoring just the right number of bytes + * from the overlong message). + */ + ssh_agentf_got_response(c, NULL, 0); + sshfwd_write_eof(c); + return; + } + + if (lengthfield > datalen - 4) + break; /* a whole message is not yet available */ + + messagelen = lengthfield + 4; + + message = snewn(messagelen, unsigned char); + bufchain_fetch(&c->u.a.inbuffer, message, messagelen); + bufchain_consume(&c->u.a.inbuffer, messagelen); + c->u.a.pending = agent_query( + message, messagelen, &reply, &replylen, ssh_agentf_callback, c); + sfree(message); + + if (c->u.a.pending) + return; /* agent_query promised to reply in due course */ + + /* + * If the agent gave us an answer immediately, pass it + * straight on and go round this loop again. + */ + ssh_agentf_got_response(c, reply, replylen); + sfree(reply); + } + /* - * If we've already seen an incoming EOF but haven't sent an - * outgoing one, this may be the moment to send it. + * If we get here (i.e. we left the above while loop via 'break' + * rather than 'return'), that means we've determined that the + * input buffer for the agent forwarding connection doesn't + * contain a complete request. + * + * So if there's potentially more data to come, we can return now, + * and wait for the remote client to send it. But if the remote + * has sent EOF, it would be a mistake to do that, because we'd be + * waiting a long time. So this is the moment to check for EOF, + * and respond appropriately. */ - if (c->u.a.outstanding_requests == 0 && (c->closes & CLOSES_RCVD_EOF)) + if (c->closes & CLOSES_RCVD_EOF) sshfwd_write_eof(c); } +static void ssh_agentf_callback(void *cv, void *reply, int replylen) +{ + struct ssh_channel *c = (struct ssh_channel *)cv; + + ssh_agentf_got_response(c, reply, replylen); + sfree(reply); + + /* + * Now try to extract and send further messages from the channel's + * input-side buffer. + */ + ssh_agentf_try_forward(c); +} + /* * Client-initiated disconnection. Send a DISCONNECT if `wire_reason' * non-NULL, otherwise just close the connection. `client_reason' == NULL @@ -4500,8 +4668,9 @@ /* Request the keys held by the agent. */ PUT_32BIT(s->request, 1); s->request[4] = SSH1_AGENTC_REQUEST_RSA_IDENTITIES; - if (!agent_query(s->request, 5, &r, &s->responselen, - ssh_agent_callback, ssh)) { + ssh->auth_agent_query = agent_query( + s->request, 5, &r, &s->responselen, ssh_agent_callback, ssh); + if (ssh->auth_agent_query) { do { crReturn(0); if (pktin) { @@ -4606,8 +4775,10 @@ memcpy(q, s->session_id, 16); q += 16; PUT_32BIT(q, 1); /* response format */ - if (!agent_query(agentreq, len + 4, &vret, &retlen, - ssh_agent_callback, ssh)) { + ssh->auth_agent_query = agent_query( + agentreq, len + 4, &vret, &retlen, + ssh_agent_callback, ssh); + if (ssh->auth_agent_query) { sfree(agentreq); do { crReturn(0); @@ -5134,23 +5305,14 @@ void sshfwd_unclean_close(struct ssh_channel *c, const char *err) { Ssh ssh = c->ssh; + char *reason; if (ssh->state == SSH_STATE_CLOSED) return; - switch (c->type) { - case CHAN_X11: - x11_close(c->u.x11.xconn); - logeventf(ssh, "Forwarded X11 connection terminated due to local " - "error: %s", err); - break; - case CHAN_SOCKDATA: - case CHAN_SOCKDATA_DORMANT: - pfd_close(c->u.pfd.pf); - logeventf(ssh, "Forwarded port closed due to local error: %s", err); - break; - } - c->type = CHAN_ZOMBIE; + reason = dupprintf("due to local error: %s", err); + ssh_channel_close_local(c, reason); + sfree(reason); c->pending_eof = FALSE; /* this will confuse a zombie channel */ ssh2_channel_check_close(c); @@ -5163,43 +5325,17 @@ if (ssh->state == SSH_STATE_CLOSED) return 0; - if (ssh->version == 1) { - send_packet(ssh, SSH1_MSG_CHANNEL_DATA, - PKT_INT, c->remoteid, - PKT_INT, len, PKT_DATA, buf, len, - PKT_END); - /* - * In SSH-1 we can return 0 here - implying that forwarded - * connections are never individually throttled - because - * the only circumstance that can cause throttling will be - * the whole SSH connection backing up, in which case - * _everything_ will be throttled as a whole. - */ - return 0; - } else { - ssh2_add_channel_data(c, buf, len); - return ssh2_try_send(c); - } + return ssh_send_channel_data(c, buf, len); } void sshfwd_unthrottle(struct ssh_channel *c, int bufsize) { Ssh ssh = c->ssh; - int buflimit; if (ssh->state == SSH_STATE_CLOSED) return; - if (ssh->version == 1) { - buflimit = SSH1_BUFFER_LIMIT; - } else { - buflimit = c->v.v2.locmaxwin; - ssh2_set_window(c, bufsize < buflimit ? buflimit - bufsize : 0); - } - if (c->throttling_conn && bufsize <= buflimit) { - c->throttling_conn = 0; - ssh_throttle_conn(ssh, -1); - } + ssh_channel_unthrottle(c, bufsize); } static void ssh_queueing_handler(Ssh ssh, struct Packet *pktin) @@ -5682,15 +5818,11 @@ c = snew(struct ssh_channel); c->ssh = ssh; + ssh_channel_init(c); c->u.x11.xconn = x11_init(ssh->x11authtree, c, NULL, -1); c->remoteid = remoteid; c->halfopen = FALSE; - c->localid = alloc_channel_id(ssh); - c->closes = 0; - c->pending_eof = FALSE; - c->throttling_conn = 0; c->type = CHAN_X11; /* identify channel type */ - add234(ssh->channels, c); send_packet(ssh, SSH1_MSG_CHANNEL_OPEN_CONFIRMATION, PKT_INT, c->remoteid, PKT_INT, c->localid, PKT_END); @@ -5712,17 +5844,12 @@ } else { c = snew(struct ssh_channel); c->ssh = ssh; + ssh_channel_init(c); c->remoteid = remoteid; c->halfopen = FALSE; - c->localid = alloc_channel_id(ssh); - c->closes = 0; - c->pending_eof = FALSE; - c->throttling_conn = 0; c->type = CHAN_AGENT; /* identify channel type */ - c->u.a.lensofar = 0; - c->u.a.message = NULL; - c->u.a.outstanding_requests = 0; - add234(ssh->channels, c); + c->u.a.pending = NULL; + bufchain_init(&c->u.a.inbuffer); send_packet(ssh, SSH1_MSG_CHANNEL_OPEN_CONFIRMATION, PKT_INT, c->remoteid, PKT_INT, c->localid, PKT_END); @@ -5743,7 +5870,7 @@ ssh_pkt_getstring(pktin, &host, &hostsize); port = ssh_pkt_getuint32(pktin); - pf.dhost = dupprintf("%.*s", hostsize, host); + pf.dhost = dupprintf("%.*s", hostsize, NULLTOEMPTY(host)); pf.dport = port; pfp = find234(ssh->rportfwds, &pf, NULL); @@ -5767,14 +5894,10 @@ send_packet(ssh, SSH1_MSG_CHANNEL_OPEN_FAILURE, PKT_INT, remoteid, PKT_END); } else { + ssh_channel_init(c); c->remoteid = remoteid; c->halfopen = FALSE; - c->localid = alloc_channel_id(ssh); - c->closes = 0; - c->pending_eof = FALSE; - c->throttling_conn = 0; c->type = CHAN_SOCKDATA; /* identify channel type */ - add234(ssh->channels, c); send_packet(ssh, SSH1_MSG_CHANNEL_OPEN_CONFIRMATION, PKT_INT, c->remoteid, PKT_INT, c->localid, PKT_END); @@ -5787,15 +5910,12 @@ static void ssh1_msg_channel_open_confirmation(Ssh ssh, struct Packet *pktin) { - unsigned int remoteid = ssh_pkt_getuint32(pktin); - unsigned int localid = ssh_pkt_getuint32(pktin); struct ssh_channel *c; - c = find234(ssh->channels, &remoteid, ssh_channelfind); - if (c && c->type == CHAN_SOCKDATA_DORMANT) { - c->remoteid = localid; + c = ssh_channel_msg(ssh, pktin); + if (c && c->type == CHAN_SOCKDATA) { + c->remoteid = ssh_pkt_getuint32(pktin); c->halfopen = FALSE; - c->type = CHAN_SOCKDATA; c->throttling_conn = 0; pfd_confirm(c->u.pfd.pf); } @@ -5813,11 +5933,10 @@ static void ssh1_msg_channel_open_failure(Ssh ssh, struct Packet *pktin) { - unsigned int remoteid = ssh_pkt_getuint32(pktin); struct ssh_channel *c; - c = find234(ssh->channels, &remoteid, ssh_channelfind); - if (c && c->type == CHAN_SOCKDATA_DORMANT) { + c = ssh_channel_msg(ssh, pktin); + if (c && c->type == CHAN_SOCKDATA) { logevent("Forwarded connection refused by server"); pfd_close(c->u.pfd.pf); del234(ssh->channels, c); @@ -5828,52 +5947,26 @@ static void ssh1_msg_channel_close(Ssh ssh, struct Packet *pktin) { /* Remote side closes a channel. */ - unsigned i = ssh_pkt_getuint32(pktin); struct ssh_channel *c; - c = find234(ssh->channels, &i, ssh_channelfind); - if (c && !c->halfopen) { - if (pktin->type == SSH1_MSG_CHANNEL_CLOSE && - !(c->closes & CLOSES_RCVD_EOF)) { + c = ssh_channel_msg(ssh, pktin); + if (c) { + + if (pktin->type == SSH1_MSG_CHANNEL_CLOSE) { /* * Received CHANNEL_CLOSE, which we translate into * outgoing EOF. */ - int send_close = FALSE; - - c->closes |= CLOSES_RCVD_EOF; - - switch (c->type) { - case CHAN_X11: - if (c->u.x11.xconn) - x11_send_eof(c->u.x11.xconn); - else - send_close = TRUE; - break; - case CHAN_SOCKDATA: - if (c->u.pfd.pf) - pfd_send_eof(c->u.pfd.pf); - else - send_close = TRUE; - break; - case CHAN_AGENT: - send_close = TRUE; - break; - } - - if (send_close && !(c->closes & CLOSES_SENT_EOF)) { - send_packet(ssh, SSH1_MSG_CHANNEL_CLOSE, PKT_INT, c->remoteid, - PKT_END); - c->closes |= CLOSES_SENT_EOF; - } + ssh_channel_got_eof(c); } if (pktin->type == SSH1_MSG_CHANNEL_CLOSE_CONFIRMATION && !(c->closes & CLOSES_RCVD_CLOSE)) { if (!(c->closes & CLOSES_SENT_EOF)) { - bombout(("Received CHANNEL_CLOSE_CONFIRMATION for channel %d" - " for which we never sent CHANNEL_CLOSE\n", i)); + bombout(("Received CHANNEL_CLOSE_CONFIRMATION for channel %u" + " for which we never sent CHANNEL_CLOSE\n", + c->localid)); } c->closes |= CLOSES_RCVD_CLOSE; @@ -5888,78 +5981,57 @@ if (!((CLOSES_SENT_CLOSE | CLOSES_RCVD_CLOSE) & ~c->closes)) ssh_channel_destroy(c); - } else { - bombout(("Received CHANNEL_CLOSE%s for %s channel %d\n", - pktin->type == SSH1_MSG_CHANNEL_CLOSE ? "" : - "_CONFIRMATION", c ? "half-open" : "nonexistent", - i)); } } +/* + * Handle incoming data on an SSH-1 or SSH-2 agent-forwarding channel. + */ +static int ssh_agent_channel_data(struct ssh_channel *c, char *data, + int length) +{ + bufchain_add(&c->u.a.inbuffer, data, length); + ssh_agentf_try_forward(c); + + /* + * We exert back-pressure on an agent forwarding client if and + * only if we're waiting for the response to an asynchronous agent + * request. This prevents the client running out of window while + * receiving the _first_ message, but means that if any message + * takes time to process, the client will be discouraged from + * sending an endless stream of further ones after it. + */ + return (c->u.a.pending ? bufchain_size(&c->u.a.inbuffer) : 0); +} + +static int ssh_channel_data(struct ssh_channel *c, int is_stderr, + char *data, int length) +{ + switch (c->type) { + case CHAN_MAINSESSION: + return from_backend(c->ssh->frontend, is_stderr, data, length); + case CHAN_X11: + return x11_send(c->u.x11.xconn, data, length); + case CHAN_SOCKDATA: + return pfd_send(c->u.pfd.pf, data, length); + case CHAN_AGENT: + return ssh_agent_channel_data(c, data, length); + } + return 0; +} + static void ssh1_msg_channel_data(Ssh ssh, struct Packet *pktin) { /* Data sent down one of our channels. */ - int i = ssh_pkt_getuint32(pktin); char *p; int len; struct ssh_channel *c; + c = ssh_channel_msg(ssh, pktin); ssh_pkt_getstring(pktin, &p, &len); - c = find234(ssh->channels, &i, ssh_channelfind); if (c) { - int bufsize = 0; - switch (c->type) { - case CHAN_X11: - bufsize = x11_send(c->u.x11.xconn, p, len); - break; - case CHAN_SOCKDATA: - bufsize = pfd_send(c->u.pfd.pf, p, len); - break; - case CHAN_AGENT: - /* Data for an agent message. Buffer it. */ - while (len > 0) { - if (c->u.a.lensofar < 4) { - unsigned int l = min(4 - c->u.a.lensofar, (unsigned)len); - memcpy(c->u.a.msglen + c->u.a.lensofar, p, - l); - p += l; - len -= l; - c->u.a.lensofar += l; - } - if (c->u.a.lensofar == 4) { - c->u.a.totallen = - 4 + GET_32BIT(c->u.a.msglen); - c->u.a.message = snewn(c->u.a.totallen, - unsigned char); - memcpy(c->u.a.message, c->u.a.msglen, 4); - } - if (c->u.a.lensofar >= 4 && len > 0) { - unsigned int l = - min(c->u.a.totallen - c->u.a.lensofar, - (unsigned)len); - memcpy(c->u.a.message + c->u.a.lensofar, p, - l); - p += l; - len -= l; - c->u.a.lensofar += l; - } - if (c->u.a.lensofar == c->u.a.totallen) { - void *reply; - int replylen; - c->u.a.outstanding_requests++; - if (agent_query(c->u.a.message, - c->u.a.totallen, - &reply, &replylen, - ssh_agentf_callback, c)) - ssh_agentf_callback(c, reply, replylen); - sfree(c->u.a.message); - c->u.a.lensofar = 0; - } - } - bufsize = 0; /* agent channels never back up */ - break; - } + int bufsize = ssh_channel_data(c, FALSE, p, len); if (!c->throttling_conn && bufsize > SSH1_BUFFER_LIMIT) { c->throttling_conn = 1; ssh_throttle_conn(ssh, +1); @@ -5983,14 +6055,13 @@ } /* Helper function to deal with sending tty modes for REQUEST_PTY */ -static void ssh1_send_ttymode(void *data, char *mode, char *val) +static void ssh1_send_ttymode(void *data, + const struct ssh_ttymode *mode, char *val) { struct Packet *pktout = (struct Packet *)data; - int i = 0; unsigned int arg = 0; - while (strcmp(mode, ssh_ttymodes[i].mode) != 0) i++; - if (i == lenof(ssh_ttymodes)) return; - switch (ssh_ttymodes[i].type) { + + switch (mode->type) { case TTY_OP_CHAR: arg = ssh_tty_parse_specchar(val); break; @@ -5998,7 +6069,7 @@ arg = ssh_tty_parse_boolean(val); break; } - ssh2_pkt_addbyte(pktout, ssh_ttymodes[i].opcode); + ssh2_pkt_addbyte(pktout, mode->opcode); ssh2_pkt_addbyte(pktout, arg); } @@ -6226,7 +6297,7 @@ int msglen; ssh_pkt_getstring(pktin, &msg, &msglen); - logeventf(ssh, "Remote debug message: %.*s", msglen, msg); + logeventf(ssh, "Remote debug message: %.*s", msglen, NULLTOEMPTY(msg)); } static void ssh1_msg_disconnect(Ssh ssh, struct Packet *pktin) @@ -6236,7 +6307,8 @@ int msglen; ssh_pkt_getstring(pktin, &msg, &msglen); - bombout(("Server sent disconnect message:\n\"%.*s\"", msglen, msg)); + bombout(("Server sent disconnect message:\n\"%.*s\"", + msglen, NULLTOEMPTY(msg))); } static void ssh_msg_ignore(Ssh ssh, struct Packet *pktin) @@ -6403,7 +6475,10 @@ const struct ssh_kex *kex; int warn; } kex; - const struct ssh_signkey *hostkey; + struct { + const struct ssh_signkey *hostkey; + int warn; + } hk; struct { const struct ssh2_cipher *cipher; int warn; @@ -6458,12 +6533,12 @@ "server-to-client compression method" }; struct do_ssh2_transport_state { int crLine; - int nbits, pbits, warn_kex, warn_cscipher, warn_sccipher; + int nbits, pbits, warn_kex, warn_hk, warn_cscipher, warn_sccipher; Bignum p, g, e, f, K; void *our_kexinit; int our_kexinitlen; int kex_init_value, kex_reply_value; - const struct ssh_mac **maclist; + const struct ssh_mac *const *maclist; int nmacs; const struct ssh2_cipher *cscipher_tobe; const struct ssh2_cipher *sccipher_tobe; @@ -6480,6 +6555,8 @@ unsigned char exchange_hash[SSH2_KEX_MAX_HASH_LEN]; int n_preferred_kex; const struct ssh_kexes *preferred_kex[KEX_MAX]; + int n_preferred_hk; + int preferred_hk[HK_MAX]; int n_preferred_ciphers; const struct ssh2_ciphers *preferred_ciphers[CIPHER_MAX]; const struct ssh_compress *preferred_comp; @@ -6495,6 +6572,7 @@ crState(do_ssh2_transport_state); assert(!ssh->bare_connection); + assert(ssh->version == 2); crBeginState; @@ -6557,6 +6635,20 @@ } /* + * Set up the preferred host key types. These are just the ids + * in the enum in putty.h, so 'warn below here' is indicated + * by HK_WARN. + */ + s->n_preferred_hk = 0; + for (i = 0; i < HK_MAX; i++) { + int id = conf_get_int_int(ssh->conf, CONF_ssh_hklist, i); + /* As above, don't bother with HK_WARN if it's last in the + * list */ + if (id != HK_WARN || i < HK_MAX - 1) + s->preferred_hk[s->n_preferred_hk++] = id; + } + + /* * Set up the preferred ciphers. (NULL => warn below here) */ s->n_preferred_ciphers = 0; @@ -6632,20 +6724,46 @@ * In the first key exchange, we list all the algorithms * we're prepared to cope with, but prefer those algorithms * for which we have a host key for this host. + * + * If the host key algorithm is below the warning + * threshold, we warn even if we did already have a key + * for it, on the basis that if the user has just + * reconfigured that host key type to be warned about, + * they surely _do_ want to be alerted that a server + * they're actually connecting to is using it. */ - for (i = 0; i < lenof(hostkey_algs); i++) { - if (have_ssh_host_key(ssh->savedhost, ssh->savedport, - hostkey_algs[i]->keytype)) { - alg = ssh2_kexinit_addalg(s->kexlists[KEXLIST_HOSTKEY], - hostkey_algs[i]->name); - alg->u.hostkey = hostkey_algs[i]; - } - } - for (i = 0; i < lenof(hostkey_algs); i++) { - alg = ssh2_kexinit_addalg(s->kexlists[KEXLIST_HOSTKEY], - hostkey_algs[i]->name); - alg->u.hostkey = hostkey_algs[i]; + warn = FALSE; + for (i = 0; i < s->n_preferred_hk; i++) { + if (s->preferred_hk[i] == HK_WARN) + /* + * FZ: instead of warning, ignore insecure known hostkeys. Rationale: the askhk function doesn't get fingerprints that allow the user to verify what is getting cross-signed. + */ + break; + for (j = 0; j < lenof(hostkey_algs); j++) { + if (hostkey_algs[j].id != s->preferred_hk[i]) + continue; + if (have_ssh_host_key(ssh->savedhost, ssh->savedport, + hostkey_algs[j].alg->keytype)) { + alg = ssh2_kexinit_addalg(s->kexlists[KEXLIST_HOSTKEY], + hostkey_algs[j].alg->name); + alg->u.hk.hostkey = hostkey_algs[j].alg; + alg->u.hk.warn = warn; + } + } } + warn = FALSE; + for (i = 0; i < s->n_preferred_hk; i++) { + if (s->preferred_hk[i] == HK_WARN) + warn = TRUE; + for (j = 0; j < lenof(hostkey_algs); j++) { + if (hostkey_algs[j].id != s->preferred_hk[i]) + continue; + alg = ssh2_kexinit_addalg(s->kexlists[KEXLIST_HOSTKEY], + hostkey_algs[j].alg->name); + alg->u.hk.hostkey = hostkey_algs[j].alg; + alg->u.hk.warn = warn; + } + } } else { /* * In subsequent key exchanges, we list only the kex @@ -6657,7 +6775,8 @@ assert(ssh->kex); alg = ssh2_kexinit_addalg(s->kexlists[KEXLIST_HOSTKEY], ssh->hostkey->name); - alg->u.hostkey = ssh->hostkey; + alg->u.hk.hostkey = ssh->hostkey; + alg->u.hk.warn = FALSE; } /* List encryption algorithms (client->server then server->client). */ for (k = KEXLIST_CSCIPHER; k <= KEXLIST_SCCIPHER; k++) { @@ -6778,7 +6897,8 @@ s->scmac_tobe = NULL; s->cscomp_tobe = NULL; s->sccomp_tobe = NULL; - s->warn_kex = s->warn_cscipher = s->warn_sccipher = FALSE; + s->warn_kex = s->warn_hk = FALSE; + s->warn_cscipher = s->warn_sccipher = FALSE; pktin->savedpos += 16; /* skip garbage cookie */ @@ -6822,7 +6942,8 @@ ssh->kex = alg->u.kex.kex; s->warn_kex = alg->u.kex.warn; } else if (i == KEXLIST_HOSTKEY) { - ssh->hostkey = alg->u.hostkey; + ssh->hostkey = alg->u.hk.hostkey; + s->warn_hk = alg->u.hk.warn; } else if (i == KEXLIST_CSCIPHER) { s->cscipher_tobe = alg->u.cipher.cipher; s->warn_cscipher = alg->u.cipher.warn; @@ -6846,10 +6967,37 @@ in_commasep_string(alg->u.comp->delayed_name, str, len)) s->pending_compression = TRUE; /* try this later */ } - bombout(("Couldn't agree a %s ((available: %.*s)", + bombout(("Couldn't agree a %s (available: %.*s)", kexlist_descr[i], len, str)); crStopV; matched:; + + if (i == KEXLIST_HOSTKEY) { + int j; + + /* + * In addition to deciding which host key we're + * actually going to use, we should make a list of the + * host keys offered by the server which we _don't_ + * have cached. These will be offered as cross- + * certification options by ssh_get_specials. + * + * We also count the key we're currently using for KEX + * as one we've already got, because by the time this + * menu becomes visible, it will be. + */ + ssh->n_uncert_hostkeys = 0; + + for (j = 0; j < lenof(hostkey_algs); j++) { + if (hostkey_algs[j].alg != ssh->hostkey && + in_commasep_string(hostkey_algs[j].alg->name, + str, len) && + !have_ssh_host_key(ssh->savedhost, ssh->savedport, + hostkey_algs[j].alg->keytype)) { + ssh->uncert_hostkeys[ssh->n_uncert_hostkeys++] = j; + } + } + } } if (s->pending_compression) { @@ -6894,6 +7042,73 @@ } } + if (s->warn_hk) { + int j, k; + char *betteralgs; + + ssh_set_frozen(ssh, 1); + + /* + * Change warning box wording depending on why we chose a + * warning-level host key algorithm. If it's because + * that's all we have *cached*, use the askhk mechanism, + * and list the host keys we could usefully cross-certify. + * Otherwise, use askalg for the standard wording. + */ + betteralgs = NULL; + for (j = 0; j < ssh->n_uncert_hostkeys; j++) { + const struct ssh_signkey_with_user_pref_id *hktype = + &hostkey_algs[ssh->uncert_hostkeys[j]]; + int better = FALSE; + for (k = 0; k < HK_MAX; k++) { + int id = conf_get_int_int(ssh->conf, CONF_ssh_hklist, k); + if (id == HK_WARN) { + break; + } else if (id == hktype->id) { + better = TRUE; + break; + } + } + if (better) { + if (betteralgs) { + char *old_ba = betteralgs; + betteralgs = dupcat(betteralgs, ",", + hktype->alg->name, + (const char *)NULL); + sfree(old_ba); + } else { + betteralgs = dupstr(hktype->alg->name); + } + } + } + if (betteralgs) { + s->dlgret = askhk(ssh->frontend, ssh->hostkey->name, + betteralgs, ssh_dialog_callback, ssh); + sfree(betteralgs); + } else { + s->dlgret = askalg(ssh->frontend, "host key type", + ssh->hostkey->name, + ssh_dialog_callback, ssh); + } + if (s->dlgret < 0) { + do { + crReturnV; + if (pktin) { + bombout(("Unexpected data from server while" + " waiting for user response")); + crStopV; + } + } while (pktin || inlen > 0); + s->dlgret = ssh->user_response; + } + ssh_set_frozen(ssh, 0); + if (s->dlgret == 0) { + ssh_disconnect(ssh, "User aborted at host key warning", NULL, + 0, TRUE); + crStopV; + } + } + if (s->warn_cscipher) { ssh_set_frozen(ssh, 1); s->dlgret = askalg(ssh->frontend, @@ -7317,6 +7532,42 @@ s->keystr = ssh->hostkey->fmtkey(s->hkey); if (!s->got_session_id) { + /* + * Make a note of any other host key formats that are available. + */ + { + int i, j, nkeys = 0; + char *list = NULL; + for (i = 0; i < lenof(hostkey_algs); i++) { + if (hostkey_algs[i].alg == ssh->hostkey) + continue; + + for (j = 0; j < ssh->n_uncert_hostkeys; j++) + if (ssh->uncert_hostkeys[j] == i) + break; + + if (j < ssh->n_uncert_hostkeys) { + char *newlist; + if (list) + newlist = dupprintf("%s/%s", list, + hostkey_algs[i].alg->name); + else + newlist = dupprintf("%s", hostkey_algs[i].alg->name); + sfree(list); + list = newlist; + nkeys++; + } + } + if (list) { + logeventf(ssh, + "Server also has %s host key%s, but we " + "don't know %s", list, + nkeys > 1 ? "s" : "", + nkeys > 1 ? "any of them" : "it"); + sfree(list); + } + } + /* * Authenticate remote host: verify host key. (We've already * checked the signature of the exchange hash.) @@ -7365,6 +7616,19 @@ * subsequent rekeys. */ ssh->hostkey_str = s->keystr; + } else if (ssh->cross_certifying) { + s->fingerprint = ssh2_fingerprint(ssh->hostkey, s->hkey); + logevent("Storing additional host key for this host:"); + logevent(s->fingerprint); + sfree(s->fingerprint); + store_host_key(ssh->savedhost, ssh->savedport, + ssh->hostkey->keytype, s->keystr); + ssh->cross_certifying = FALSE; + /* + * Don't forget to store the new key as the one we'll be + * re-checking in future normal rekeys. + */ + ssh->hostkey_str = s->keystr; } else { /* * In a rekey, we never present an interactive host key @@ -7560,6 +7824,12 @@ freebn(s->K); /* + * Update the specials menu to list the remaining uncertified host + * keys. + */ + update_specials_menu(ssh->frontend); + + /* * Key exchange is over. Loop straight back round if we have a * deferred rekey reason. */ @@ -7667,12 +7937,30 @@ } /* - * Add data to an SSH-2 channel output buffer. + * Send data on an SSH channel. In SSH-2, this involves buffering it + * first. */ -static void ssh2_add_channel_data(struct ssh_channel *c, const char *buf, - int len) +static int ssh_send_channel_data(struct ssh_channel *c, const char *buf, + int len) { - bufchain_add(&c->v.v2.outbuffer, buf, len); + if (c->ssh->version == 2) { + bufchain_add(&c->v.v2.outbuffer, buf, len); + return ssh2_try_send(c); + } else { + send_packet(c->ssh, SSH1_MSG_CHANNEL_DATA, + PKT_INT, c->remoteid, + PKT_INT, len, + PKT_DATA, buf, len, + PKT_END); + /* + * In SSH-1 we can return 0 here - implying that channels are + * never individually throttled - because the only + * circumstance that can cause throttling will be the whole + * SSH connection backing up, in which case _everything_ will + * be throttled as a whole. + */ + return 0; + } } /* @@ -7733,8 +8021,9 @@ x11_unthrottle(c->u.x11.xconn); break; case CHAN_AGENT: - /* agent sockets are request/response and need no - * buffer management */ + /* Now that we've successfully sent all the outgoing + * replies we had, try to process more incoming data. */ + ssh_agentf_try_forward(c); break; case CHAN_SOCKDATA: pfd_unthrottle(c->u.pfd.pf); @@ -7757,20 +8046,23 @@ } /* - * Set up most of a new ssh_channel for SSH-2. + * Set up most of a new ssh_channel. */ -static void ssh2_channel_init(struct ssh_channel *c) +static void ssh_channel_init(struct ssh_channel *c) { Ssh ssh = c->ssh; c->localid = alloc_channel_id(ssh); c->closes = 0; c->pending_eof = FALSE; c->throttling_conn = FALSE; - c->v.v2.locwindow = c->v.v2.locmaxwin = c->v.v2.remlocwin = - ssh_is_simple(ssh) ? OUR_V2_BIGWIN : OUR_V2_WINSIZE; - c->v.v2.chanreq_head = NULL; - c->v.v2.throttle_state = UNTHROTTLED; - bufchain_init(&c->v.v2.outbuffer); + if (ssh->version == 2) { + c->v.v2.locwindow = c->v.v2.locmaxwin = c->v.v2.remlocwin = + ssh_is_simple(ssh) ? OUR_V2_BIGWIN : OUR_V2_WINSIZE; + c->v.v2.chanreq_head = NULL; + c->v.v2.throttle_state = UNTHROTTLED; + bufchain_init(&c->v.v2.outbuffer); + } + add234(ssh->channels, c); } /* @@ -7840,6 +8132,27 @@ return pktout; } +static void ssh_channel_unthrottle(struct ssh_channel *c, int bufsize) +{ + Ssh ssh = c->ssh; + int buflimit; + + if (ssh->version == 1) { + buflimit = SSH1_BUFFER_LIMIT; + } else { + if (ssh_is_simple(ssh)) + buflimit = 0; + else + buflimit = c->v.v2.locmaxwin; + if (bufsize < buflimit) + ssh2_set_window(c, buflimit - bufsize); + } + if (c->throttling_conn && bufsize <= buflimit) { + c->throttling_conn = 0; + ssh_throttle_conn(ssh, -1); + } +} + /* * Potentially enlarge the window on an SSH-2 channel. */ @@ -7921,25 +8234,38 @@ /* * Find the channel associated with a message. If there's no channel, * or it's not properly open, make a noise about it and return NULL. + * If the channel is shared, pass the message on to downstream and + * also return NULL (meaning the caller should ignore this message). */ -static struct ssh_channel *ssh2_channel_msg(Ssh ssh, struct Packet *pktin) +static struct ssh_channel *ssh_channel_msg(Ssh ssh, struct Packet *pktin) { unsigned localid = ssh_pkt_getuint32(pktin); struct ssh_channel *c; + int halfopen_ok; + /* Is this message OK on a half-open connection? */ + if (ssh->version == 1) + halfopen_ok = (pktin->type == SSH1_MSG_CHANNEL_OPEN_CONFIRMATION || + pktin->type == SSH1_MSG_CHANNEL_OPEN_FAILURE); + else + halfopen_ok = (pktin->type == SSH2_MSG_CHANNEL_OPEN_CONFIRMATION || + pktin->type == SSH2_MSG_CHANNEL_OPEN_FAILURE); c = find234(ssh->channels, &localid, ssh_channelfind); - if (!c || - (c->type != CHAN_SHARING && c->halfopen && - pktin->type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION && - pktin->type != SSH2_MSG_CHANNEL_OPEN_FAILURE)) { + if (!c || (c->type != CHAN_SHARING && (c->halfopen != halfopen_ok))) { char *buf = dupprintf("Received %s for %s channel %u", - ssh2_pkt_type(ssh->pkt_kctx, ssh->pkt_actx, - pktin->type), - c ? "half-open" : "nonexistent", localid); + ssh_pkt_type(ssh, pktin->type), + !c ? "nonexistent" : + c->halfopen ? "half-open" : "open", + localid); ssh_disconnect(ssh, NULL, buf, SSH2_DISCONNECT_PROTOCOL_ERROR, FALSE); sfree(buf); return NULL; } + if (c->type == CHAN_SHARING) { + share_got_pkt_from_server(c->u.sharing.ctx, pktin->type, + pktin->body, pktin->length); + return NULL; + } return c; } @@ -7969,21 +8295,18 @@ static void ssh2_msg_channel_response(Ssh ssh, struct Packet *pktin) { - struct ssh_channel *c = ssh2_channel_msg(ssh, pktin); + struct ssh_channel *c = ssh_channel_msg(ssh, pktin); struct outstanding_channel_request *ocr; if (!c) return; - if (c->type == CHAN_SHARING) { - share_got_pkt_from_server(c->u.sharing.ctx, pktin->type, - pktin->body, pktin->length); - return; - } ocr = c->v.v2.chanreq_head; if (!ocr) { ssh2_msg_unexpected(ssh, pktin); return; } ocr->handler(c, pktin, ocr->ctx); + if (ssh->state == SSH_STATE_CLOSED) + return; /* in case the handler called bomb_out(), which some can */ c->v.v2.chanreq_head = ocr->next; sfree(ocr); /* @@ -7997,14 +8320,9 @@ static void ssh2_msg_channel_window_adjust(Ssh ssh, struct Packet *pktin) { struct ssh_channel *c; - c = ssh2_channel_msg(ssh, pktin); + c = ssh_channel_msg(ssh, pktin); if (!c) return; - if (c->type == CHAN_SHARING) { - share_got_pkt_from_server(c->u.sharing.ctx, pktin->type, - pktin->body, pktin->length); - return; - } if (!(c->closes & CLOSES_SENT_EOF)) { c->v.v2.remwindow += ssh_pkt_getuint32(pktin); ssh2_try_send_and_unthrottle(ssh, c); @@ -8015,81 +8333,22 @@ { char *data; int length; + unsigned ext_type = 0; /* 0 means not extended */ struct ssh_channel *c; - c = ssh2_channel_msg(ssh, pktin); + c = ssh_channel_msg(ssh, pktin); if (!c) return; - if (c->type == CHAN_SHARING) { - share_got_pkt_from_server(c->u.sharing.ctx, pktin->type, - pktin->body, pktin->length); - return; - } - if (pktin->type == SSH2_MSG_CHANNEL_EXTENDED_DATA && - ssh_pkt_getuint32(pktin) != SSH2_EXTENDED_DATA_STDERR) - return; /* extended but not stderr */ + if (pktin->type == SSH2_MSG_CHANNEL_EXTENDED_DATA) + ext_type = ssh_pkt_getuint32(pktin); ssh_pkt_getstring(pktin, &data, &length); if (data) { - int bufsize = 0; + int bufsize; c->v.v2.locwindow -= length; c->v.v2.remlocwin -= length; - switch (c->type) { - case CHAN_MAINSESSION: - bufsize = - from_backend(ssh->frontend, pktin->type == - SSH2_MSG_CHANNEL_EXTENDED_DATA, - data, length); - break; - case CHAN_X11: - bufsize = x11_send(c->u.x11.xconn, data, length); - break; - case CHAN_SOCKDATA: - bufsize = pfd_send(c->u.pfd.pf, data, length); - break; - case CHAN_AGENT: - while (length > 0) { - if (c->u.a.lensofar < 4) { - unsigned int l = min(4 - c->u.a.lensofar, - (unsigned)length); - memcpy(c->u.a.msglen + c->u.a.lensofar, - data, l); - data += l; - length -= l; - c->u.a.lensofar += l; - } - if (c->u.a.lensofar == 4) { - c->u.a.totallen = - 4 + GET_32BIT(c->u.a.msglen); - c->u.a.message = snewn(c->u.a.totallen, - unsigned char); - memcpy(c->u.a.message, c->u.a.msglen, 4); - } - if (c->u.a.lensofar >= 4 && length > 0) { - unsigned int l = - min(c->u.a.totallen - c->u.a.lensofar, - (unsigned)length); - memcpy(c->u.a.message + c->u.a.lensofar, - data, l); - data += l; - length -= l; - c->u.a.lensofar += l; - } - if (c->u.a.lensofar == c->u.a.totallen) { - void *reply; - int replylen; - c->u.a.outstanding_requests++; - if (agent_query(c->u.a.message, - c->u.a.totallen, - &reply, &replylen, - ssh_agentf_callback, c)) - ssh_agentf_callback(c, reply, replylen); - sfree(c->u.a.message); - c->u.a.message = NULL; - c->u.a.lensofar = 0; - } - } - bufsize = 0; - break; - } + if (ext_type != 0 && ext_type != SSH2_EXTENDED_DATA_STDERR) + length = 0; /* Don't do anything with unknown extended data. */ + bufsize = ssh_channel_data(c, ext_type == SSH2_EXTENDED_DATA_STDERR, + data, length); /* * If it looks like the remote end hit the end of its window, * and we didn't want it to do that, think about using a @@ -8105,8 +8364,8 @@ * need to adjust the window if the server's * sent excess data. */ - ssh2_set_window(c, bufsize < c->v.v2.locmaxwin ? - c->v.v2.locmaxwin - bufsize : 0); + if (bufsize < c->v.v2.locmaxwin) + ssh2_set_window(c, c->v.v2.locmaxwin - bufsize); /* * If we're either buffering way too much data, or if we're * buffering anything at all and we're in "simple" mode, @@ -8170,9 +8429,14 @@ sfree(buf); } -static void ssh_channel_destroy(struct ssh_channel *c) +/* + * Close any local socket and free any local resources associated with + * a channel. This converts the channel into a CHAN_ZOMBIE. + */ +static void ssh_channel_close_local(struct ssh_channel *c, char const *reason) { Ssh ssh = c->ssh; + char const *msg = NULL; switch (c->type) { case CHAN_MAINSESSION: @@ -8180,19 +8444,36 @@ update_specials_menu(ssh->frontend); break; case CHAN_X11: - if (c->u.x11.xconn != NULL) - x11_close(c->u.x11.xconn); - logevent("Forwarded X11 connection terminated"); + assert(c->u.x11.xconn != NULL); + x11_close(c->u.x11.xconn); + msg = "Forwarded X11 connection terminated"; break; case CHAN_AGENT: - sfree(c->u.a.message); + if (c->u.a.pending) + agent_cancel_query(c->u.a.pending); + bufchain_clear(&c->u.a.inbuffer); + msg = "Agent-forwarding connection closed"; break; case CHAN_SOCKDATA: - if (c->u.pfd.pf != NULL) - pfd_close(c->u.pfd.pf); - logevent("Forwarded port closed"); + assert(c->u.pfd.pf != NULL); + pfd_close(c->u.pfd.pf); + msg = "Forwarded port closed"; break; } + c->type = CHAN_ZOMBIE; + if (msg != NULL) { + if (reason != NULL) + logeventf(ssh, "%s %s", msg, reason); + else + logevent(msg); + } +} + +static void ssh_channel_destroy(struct ssh_channel *c) +{ + Ssh ssh = c->ssh; + + ssh_channel_close_local(c, NULL); del234(ssh->channels, c); if (ssh->version == 2) { @@ -8213,6 +8494,7 @@ Ssh ssh = c->ssh; struct Packet *pktout; + assert(ssh->version == 2); if (c->halfopen) { /* * If we've sent out our own CHANNEL_OPEN but not yet seen @@ -8248,20 +8530,22 @@ } } -static void ssh2_channel_got_eof(struct ssh_channel *c) +static void ssh_channel_got_eof(struct ssh_channel *c) { if (c->closes & CLOSES_RCVD_EOF) return; /* already seen EOF */ c->closes |= CLOSES_RCVD_EOF; if (c->type == CHAN_X11) { + assert(c->u.x11.xconn != NULL); x11_send_eof(c->u.x11.xconn); } else if (c->type == CHAN_AGENT) { - if (c->u.a.outstanding_requests == 0) { - /* Manufacture an outgoing EOF in response to the incoming one. */ - sshfwd_write_eof(c); - } + /* Just call try_forward, which will respond to the EOF now if + * appropriate, or wait until the queue of outstanding + * requests is dealt with if not */ + ssh_agentf_try_forward(c); } else if (c->type == CHAN_SOCKDATA) { + assert(c->u.pfd.pf != NULL); pfd_send_eof(c->u.pfd.pf); } else if (c->type == CHAN_MAINSESSION) { Ssh ssh = c->ssh; @@ -8280,43 +8564,32 @@ } ssh->sent_console_eof = TRUE; } - - ssh2_channel_check_close(c); } static void ssh2_msg_channel_eof(Ssh ssh, struct Packet *pktin) { struct ssh_channel *c; - c = ssh2_channel_msg(ssh, pktin); + c = ssh_channel_msg(ssh, pktin); if (!c) return; - if (c->type == CHAN_SHARING) { - share_got_pkt_from_server(c->u.sharing.ctx, pktin->type, - pktin->body, pktin->length); - return; - } - ssh2_channel_got_eof(c); + ssh_channel_got_eof(c); + ssh2_channel_check_close(c); } static void ssh2_msg_channel_close(Ssh ssh, struct Packet *pktin) { struct ssh_channel *c; - c = ssh2_channel_msg(ssh, pktin); + c = ssh_channel_msg(ssh, pktin); if (!c) return; - if (c->type == CHAN_SHARING) { - share_got_pkt_from_server(c->u.sharing.ctx, pktin->type, - pktin->body, pktin->length); - return; - } /* * When we receive CLOSE on a channel, we assume it comes with an * implied EOF if we haven't seen EOF yet. */ - ssh2_channel_got_eof(c); + ssh_channel_got_eof(c); if (!(ssh->remote_bugs & BUG_SENDS_LATE_REQUEST_REPLY)) { /* @@ -8385,24 +8658,18 @@ { struct ssh_channel *c; - c = ssh2_channel_msg(ssh, pktin); + c = ssh_channel_msg(ssh, pktin); if (!c) return; - if (c->type == CHAN_SHARING) { - share_got_pkt_from_server(c->u.sharing.ctx, pktin->type, - pktin->body, pktin->length); - return; - } - assert(c->halfopen); /* ssh2_channel_msg will have enforced this */ + assert(c->halfopen); /* ssh_channel_msg will have enforced this */ c->remoteid = ssh_pkt_getuint32(pktin); c->halfopen = FALSE; c->v.v2.remwindow = ssh_pkt_getuint32(pktin); c->v.v2.remmaxpkt = ssh_pkt_getuint32(pktin); - if (c->type == CHAN_SOCKDATA_DORMANT) { - c->type = CHAN_SOCKDATA; - if (c->u.pfd.pf) - pfd_confirm(c->u.pfd.pf); + if (c->type == CHAN_SOCKDATA) { + assert(c->u.pfd.pf != NULL); + pfd_confirm(c->u.pfd.pf); } else if (c->type == CHAN_ZOMBIE) { /* * This case can occur if a local socket error occurred @@ -8431,38 +8698,48 @@ ssh_channel_try_eof(c); /* in case we had a pending EOF */ } -static void ssh2_msg_channel_open_failure(Ssh ssh, struct Packet *pktin) +static char *ssh2_channel_open_failure_error_text(struct Packet *pktin) { static const char *const reasons[] = { - "", - "Administratively prohibited", - "Connect failed", - "Unknown channel type", - "Resource shortage", + NULL, + "Administratively prohibited", + "Connect failed", + "Unknown channel type", + "Resource shortage", }; unsigned reason_code; + const char *reason_code_string; + char reason_code_buf[256]; char *reason_string; int reason_length; + + reason_code = ssh_pkt_getuint32(pktin); + if (reason_code < lenof(reasons) && reasons[reason_code]) { + reason_code_string = reasons[reason_code]; + } else { + reason_code_string = reason_code_buf; + sprintf(reason_code_buf, "unknown reason code %#x", reason_code); + } + + ssh_pkt_getstring(pktin, &reason_string, &reason_length); + + return dupprintf("%s [%.*s]", reason_code_string, + reason_length, NULLTOEMPTY(reason_string)); +} + +static void ssh2_msg_channel_open_failure(Ssh ssh, struct Packet *pktin) +{ struct ssh_channel *c; - c = ssh2_channel_msg(ssh, pktin); + c = ssh_channel_msg(ssh, pktin); if (!c) return; - if (c->type == CHAN_SHARING) { - share_got_pkt_from_server(c->u.sharing.ctx, pktin->type, - pktin->body, pktin->length); - return; - } - assert(c->halfopen); /* ssh2_channel_msg will have enforced this */ - - if (c->type == CHAN_SOCKDATA_DORMANT) { - reason_code = ssh_pkt_getuint32(pktin); - if (reason_code >= lenof(reasons)) - reason_code = 0; /* ensure reasons[reason_code] in range */ - ssh_pkt_getstring(pktin, &reason_string, &reason_length); - logeventf(ssh, "Forwarded connection refused by server: %s [%.*s]", - reasons[reason_code], reason_length, reason_string); + assert(c->halfopen); /* ssh_channel_msg will have enforced this */ + if (c->type == CHAN_SOCKDATA) { + char *errtext = ssh2_channel_open_failure_error_text(pktin); + logeventf(ssh, "Forwarded connection refused by server: %s", errtext); + sfree(errtext); pfd_close(c->u.pfd.pf); } else if (c->type == CHAN_ZOMBIE) { /* @@ -8497,14 +8774,9 @@ struct ssh_channel *c; struct Packet *pktout; - c = ssh2_channel_msg(ssh, pktin); + c = ssh_channel_msg(ssh, pktin); if (!c) return; - if (c->type == CHAN_SHARING) { - share_got_pkt_from_server(c->u.sharing.ctx, pktin->type, - pktin->body, pktin->length); - return; - } ssh_pkt_getstring(pktin, &type, &typelen); want_reply = ssh2_pkt_getbool(pktin); @@ -8757,9 +9029,7 @@ char *addrstr; ssh_pkt_getstring(pktin, &peeraddr, &peeraddrlen); - addrstr = snewn(peeraddrlen+1, char); - memcpy(addrstr, peeraddr, peeraddrlen); - addrstr[peeraddrlen] = '\0'; + addrstr = dupprintf("%.*s", peeraddrlen, NULLTOEMPTY(peeraddr)); peerport = ssh_pkt_getuint32(pktin); logeventf(ssh, "Received X11 connect request from %s:%d", @@ -8794,13 +9064,14 @@ char *shost; int shostlen; ssh_pkt_getstring(pktin, &shost, &shostlen);/* skip address */ - pf.shost = dupprintf("%.*s", shostlen, shost); + pf.shost = dupprintf("%.*s", shostlen, NULLTOEMPTY(shost)); pf.sport = ssh_pkt_getuint32(pktin); ssh_pkt_getstring(pktin, &peeraddr, &peeraddrlen); peerport = ssh_pkt_getuint32(pktin); realpf = find234(ssh->rportfwds, &pf, NULL); logeventf(ssh, "Received remote port %s:%d open request " - "from %s:%d", pf.shost, pf.sport, peeraddr, peerport); + "from %.*s:%d", pf.shost, pf.sport, + peeraddrlen, NULLTOEMPTY(peeraddr), peerport); sfree(pf.shost); if (realpf == NULL) { @@ -8840,9 +9111,8 @@ error = "Agent forwarding is not enabled"; else { c->type = CHAN_AGENT; /* identify channel type */ - c->u.a.lensofar = 0; - c->u.a.message = NULL; - c->u.a.outstanding_requests = 0; + bufchain_init(&c->u.a.inbuffer); + c->u.a.pending = NULL; } } else { error = "Unsupported channel type requested"; @@ -8860,14 +9130,13 @@ logeventf(ssh, "Rejected channel open: %s", error); sfree(c); } else { - ssh2_channel_init(c); + ssh_channel_init(c); c->v.v2.remwindow = winsize; c->v.v2.remmaxpkt = pktsize; if (our_winsize_override) { c->v.v2.locwindow = c->v.v2.locmaxwin = c->v.v2.remlocwin = our_winsize_override; } - add234(ssh->channels, c); pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_OPEN_CONFIRMATION); ssh2_pkt_adduint32(pktout, c->remoteid); ssh2_pkt_adduint32(pktout, c->localid); @@ -8932,14 +9201,13 @@ } /* Helper function to deal with sending tty modes for "pty-req" */ -static void ssh2_send_ttymode(void *data, char *mode, char *val) +static void ssh2_send_ttymode(void *data, + const struct ssh_ttymode *mode, char *val) { struct Packet *pktout = (struct Packet *)data; - int i = 0; unsigned int arg = 0; - while (strcmp(mode, ssh_ttymodes[i].mode) != 0) i++; - if (i == lenof(ssh_ttymodes)) return; - switch (ssh_ttymodes[i].type) { + + switch (mode->type) { case TTY_OP_CHAR: arg = ssh_tty_parse_specchar(val); break; @@ -8947,7 +9215,7 @@ arg = ssh_tty_parse_boolean(val); break; } - ssh2_pkt_addbyte(pktout, ssh_ttymodes[i].opcode); + ssh2_pkt_addbyte(pktout, mode->opcode); ssh2_pkt_adduint32(pktout, arg); } @@ -9194,7 +9462,6 @@ int pklen, alglen, commentlen; int siglen, retlen, len; char *q, *agentreq, *ret; - int try_send; struct Packet *pktout; Filename *keyfile; #ifndef NO_GSSAPI @@ -9349,8 +9616,10 @@ /* Request the keys held by the agent. */ PUT_32BIT(s->agent_request, 1); s->agent_request[4] = SSH2_AGENTC_REQUEST_IDENTITIES; - if (!agent_query(s->agent_request, 5, &r, &s->agent_responselen, - ssh_agent_callback, ssh)) { + ssh->auth_agent_query = agent_query( + s->agent_request, 5, &r, &s->agent_responselen, + ssh_agent_callback, ssh); + if (ssh->auth_agent_query) { do { crReturnV; if (pktin) { @@ -9391,21 +9660,25 @@ goto done_agent_query; } bloblen = toint(GET_32BIT(q)); + lenleft -= 4; + q += 4; if (bloblen < 0 || bloblen > lenleft) { logeventf(ssh, "Pageant response was truncated"); s->nkeys = 0; goto done_agent_query; } - lenleft -= 4 + bloblen; - q += 4 + bloblen; + lenleft -= bloblen; + q += bloblen; commentlen = toint(GET_32BIT(q)); + lenleft -= 4; + q += 4; if (commentlen < 0 || commentlen > lenleft) { logeventf(ssh, "Pageant response was truncated"); s->nkeys = 0; goto done_agent_query; } - lenleft -= 4 + commentlen; - q += 4 + commentlen; + lenleft -= commentlen; + q += commentlen; } } @@ -9711,7 +9984,7 @@ s->agentp += s->commentlen; /* s->agentp now points at next key, if any */ - remove_duplicate_keys(ssh, &s->loaded_keyfile_list, s->pkblob, s->pklen); + remove_duplicate_keys(ssh, &s->loaded_keyfile_list, (unsigned char*)s->pkblob, s->pklen); /* See if server will accept it */ s->pktout = ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST); @@ -9793,9 +10066,10 @@ s->q += s->pktout->length - 5; /* And finally the (zero) flags word. */ PUT_32BIT(s->q, 0); - if (!agent_query(s->agentreq, s->len + 4, - &vret, &s->retlen, - ssh_agent_callback, ssh)) { + ssh->auth_agent_query = agent_query( + s->agentreq, s->len + 4, &vret, &s->retlen, + ssh_agent_callback, ssh); + if (ssh->auth_agent_query) { do { crReturnV; if (pktin) { @@ -10649,7 +10923,7 @@ s->cur_prompt->to_server = TRUE; s->cur_prompt->name = dupstr("New SSH password"); s->cur_prompt->instruction = - dupprintf("%.*s", prompt_len, prompt); + dupprintf("%.*s", prompt_len, NULLTOEMPTY(prompt)); s->cur_prompt->instr_reqd = TRUE; /* * There's no explicit requirement in the protocol @@ -10838,7 +11112,8 @@ } else { ssh->mainchan = snew(struct ssh_channel); ssh->mainchan->ssh = ssh; - ssh2_channel_init(ssh->mainchan); + ssh->mainchan->type = CHAN_MAINSESSION; + ssh_channel_init(ssh->mainchan); if (*conf_get_str(ssh->conf, CONF_ssh_nc_host)) { /* @@ -10857,21 +11132,28 @@ ssh->ncmode = FALSE; } crWaitUntilV(pktin); - if (pktin->type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION) { - bombout(("Server refused to open channel")); + if (pktin->type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION && + pktin->type != SSH2_MSG_CHANNEL_OPEN_FAILURE) { + bombout(("Server sent strange packet %d in response to main " + "channel open request", pktin->type)); crStopV; - /* FIXME: error data comes back in FAILURE packet */ - } + } if (ssh_pkt_getuint32(pktin) != ssh->mainchan->localid) { - bombout(("Server's channel confirmation cited wrong channel")); + bombout(("Server's response to main channel open cited wrong" + " channel number")); + crStopV; + } + if (pktin->type == SSH2_MSG_CHANNEL_OPEN_FAILURE) { + char *errtext = ssh2_channel_open_failure_error_text(pktin); + bombout(("Server refused to open main channel: %s", errtext)); + sfree(errtext); crStopV; } + ssh->mainchan->remoteid = ssh_pkt_getuint32(pktin); ssh->mainchan->halfopen = FALSE; - ssh->mainchan->type = CHAN_MAINSESSION; ssh->mainchan->v.v2.remwindow = ssh_pkt_getuint32(pktin); ssh->mainchan->v.v2.remmaxpkt = ssh_pkt_getuint32(pktin); - add234(ssh->channels, ssh->mainchan); update_specials_menu(ssh->frontend); logevent("Opened main channel"); } @@ -11035,7 +11317,6 @@ ssh->send_ok = 1; while (1) { crReturnV; - s->try_send = FALSE; if (pktin) { /* @@ -11050,18 +11331,7 @@ /* * We have spare data. Add it to the channel buffer. */ - ssh2_add_channel_data(ssh->mainchan, (char *)in, inlen); - s->try_send = TRUE; - } - if (s->try_send) { - int i; - struct ssh_channel *c; - /* - * Try to send data on all channels if we can. - */ - for (i = 0; NULL != (c = index234(ssh->channels, i)); i++) - if (c->type != CHAN_SHARING) - ssh2_try_send_and_unthrottle(ssh, c); + ssh_send_channel_data(ssh->mainchan, (char *)in, inlen); } } @@ -11090,13 +11360,13 @@ logevent(buf); sfree(buf); buf = dupprintf("Disconnection message text: %.*s", - msglen, msg); + msglen, NULLTOEMPTY(msg)); logevent(buf); bombout(("Server sent disconnect message\ntype %d (%s):\n\"%.*s\"", reason, (reason > 0 && reason < lenof(ssh2_disconnect_reasons)) ? ssh2_disconnect_reasons[reason] : "unknown", - msglen, msg)); + msglen, NULLTOEMPTY(msg))); sfree(buf); } @@ -11110,7 +11380,7 @@ ssh2_pkt_getbool(pktin); ssh_pkt_getstring(pktin, &msg, &msglen); - logeventf(ssh, "Remote debug message: %.*s", msglen, msg); + logeventf(ssh, "Remote debug message: %.*s", msglen, NULLTOEMPTY(msg)); } static void ssh2_msg_transport(Ssh ssh, struct Packet *pktin) @@ -11388,6 +11658,9 @@ ssh->connshare = NULL; ssh->attempting_connshare = FALSE; ssh->session_started = FALSE; + ssh->specials = NULL; + ssh->n_uncert_hostkeys = 0; + ssh->cross_certifying = FALSE; *backend_handle = ssh; @@ -11423,6 +11696,8 @@ CONF_ssh_rekey_data)); ssh->kex_in_progress = FALSE; + ssh->auth_agent_query = NULL; + #ifndef NO_GSSAPI ssh->gsslibs = NULL; #endif @@ -11485,17 +11760,7 @@ if (ssh->channels) { while ((c = delpos234(ssh->channels, 0)) != NULL) { - switch (c->type) { - case CHAN_X11: - if (c->u.x11.xconn != NULL) - x11_close(c->u.x11.xconn); - break; - case CHAN_SOCKDATA: - case CHAN_SOCKDATA_DORMANT: - if (c->u.pfd.pf != NULL) - pfd_close(c->u.pfd.pf); - break; - } + ssh_channel_close_local(c, NULL); if (ssh->version == 2) { struct outstanding_channel_request *ocr, *nocr; ocr = c->v.v2.chanreq_head; @@ -11536,6 +11801,7 @@ sfree(ssh->v_s); sfree(ssh->fullhostname); sfree(ssh->hostkey_str); + sfree(ssh->specials); if (ssh->crcda_ctx) { crcda_free_context(ssh->crcda_ctx); ssh->crcda_ctx = NULL; @@ -11548,6 +11814,10 @@ bufchain_clear(&ssh->queued_incoming_data); sfree(ssh->username); conf_free(ssh->conf); + + if (ssh->auth_agent_query) + agent_cancel_query(ssh->auth_agent_query); + #ifndef NO_GSSAPI if (ssh->gsslibs) ssh_gss_cleanup(ssh->gsslibs); @@ -11749,19 +12019,24 @@ static const struct telnet_special specials_end[] = { {NULL, TS_EXITMENU} }; - /* XXX review this length for any changes: */ - static struct telnet_special ssh_specials[lenof(ssh2_ignore_special) + - lenof(ssh2_rekey_special) + - lenof(ssh2_session_specials) + - lenof(specials_end)]; + + struct telnet_special *specials = NULL; + int nspecials = 0, specialsize = 0; + Ssh ssh = (Ssh) handle; - int i = 0; -#define ADD_SPECIALS(name) \ - do { \ - assert((i + lenof(name)) <= lenof(ssh_specials)); \ - memcpy(&ssh_specials[i], name, sizeof name); \ - i += lenof(name); \ - } while(0) + + sfree(ssh->specials); + +#define ADD_SPECIALS(name) do \ + { \ + int len = lenof(name); \ + if (nspecials + len > specialsize) { \ + specialsize = (nspecials + len) * 5 / 4 + 32; \ + specials = sresize(specials, specialsize, struct telnet_special); \ + } \ + memcpy(specials+nspecials, name, len*sizeof(struct telnet_special)); \ + nspecials += len; \ + } while (0) if (ssh->version == 1) { /* Don't bother offering IGNORE if we've decided the remote @@ -11776,11 +12051,37 @@ ADD_SPECIALS(ssh2_rekey_special); if (ssh->mainchan) ADD_SPECIALS(ssh2_session_specials); + + if (ssh->n_uncert_hostkeys) { + static const struct telnet_special uncert_start[] = { + {NULL, TS_SEP}, + {"Cache new host key type", TS_SUBMENU}, + }; + static const struct telnet_special uncert_end[] = { + {NULL, TS_EXITMENU}, + }; + int i; + + ADD_SPECIALS(uncert_start); + for (i = 0; i < ssh->n_uncert_hostkeys; i++) { + struct telnet_special uncert[1]; + const struct ssh_signkey *alg = + hostkey_algs[ssh->uncert_hostkeys[i]].alg; + uncert[0].name = alg->name; + uncert[0].code = TS_LOCALSTART + ssh->uncert_hostkeys[i]; + ADD_SPECIALS(uncert); + } + ADD_SPECIALS(uncert_end); + } } /* else we're not ready yet */ - if (i) { + if (nspecials) ADD_SPECIALS(specials_end); - return ssh_specials; + + ssh->specials = specials; + + if (nspecials) { + return specials; } else { return NULL; } @@ -11832,6 +12133,13 @@ ssh->version == 2) { do_ssh2_transport(ssh, "at user request", -1, NULL); } + } else if (code >= TS_LOCALSTART) { + ssh->hostkey = hostkey_algs[code - TS_LOCALSTART].alg; + ssh->cross_certifying = TRUE; + if (!ssh->kex_in_progress && !ssh->bare_connection && + ssh->version == 2) { + do_ssh2_transport(ssh, "cross-certifying new host key", -1, NULL); + } } else if (code == TS_BRK) { if (ssh->state == SSH_STATE_CLOSED || ssh->state == SSH_STATE_PREPACKET) return; @@ -11881,11 +12189,10 @@ c = snew(struct ssh_channel); c->ssh = ssh; - ssh2_channel_init(c); + ssh_channel_init(c); c->halfopen = TRUE; - c->type = CHAN_SOCKDATA_DORMANT;/* identify channel type */ + c->type = CHAN_SOCKDATA;/* identify channel type */ c->u.pfd.pf = pf; - add234(ssh->channels, c); return c; } @@ -11895,10 +12202,9 @@ c = snew(struct ssh_channel); c->ssh = ssh; - ssh2_channel_init(c); + ssh_channel_init(c); c->type = CHAN_SHARING; c->u.sharing.ctx = sharing_ctx; - add234(ssh->channels, c); return c->localid; } @@ -11931,7 +12237,6 @@ static void ssh_unthrottle(void *handle, int bufsize) { Ssh ssh = (Ssh) handle; - int buflimit; if (ssh->version == 1) { if (ssh->v1_stdout_throttling && bufsize < SSH1_BUFFER_LIMIT) { @@ -11939,19 +12244,8 @@ ssh_throttle_conn(ssh, -1); } } else { - if (ssh->mainchan) { - ssh2_set_window(ssh->mainchan, - bufsize < ssh->mainchan->v.v2.locmaxwin ? - ssh->mainchan->v.v2.locmaxwin - bufsize : 0); - if (ssh_is_simple(ssh)) - buflimit = 0; - else - buflimit = ssh->mainchan->v.v2.locmaxwin; - if (ssh->mainchan->throttling_conn && bufsize <= buflimit) { - ssh->mainchan->throttling_conn = 0; - ssh_throttle_conn(ssh, -1); - } - } + if (ssh->mainchan) + ssh_channel_unthrottle(ssh->mainchan, bufsize); } /* diff -Nru filezilla-3.15.0.2/src/putty/sshccp.c filezilla-3.33.0/src/putty/sshccp.c --- filezilla-3.15.0.2/src/putty/sshccp.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshccp.c 2017-04-30 09:40:53.000000000 +0000 @@ -440,9 +440,10 @@ static void bigval_final_reduce(bigval *n) { - BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v12, v13, v14, v15; - BignumInt v16, v17, v18, v19, v20, v21, v22, v24, v25, v26, v27, v28, v29; - BignumInt v30, v31, v32, v33; + BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v13, v14, v15; + BignumInt v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28; + BignumInt v29, v30, v31, v32, v34, v35, v36, v37, v38, v39, v40, v41, v42; + BignumInt v43; BignumCarry carry; v0 = n->w[0]; @@ -455,45 +456,55 @@ v7 = n->w[7]; v8 = n->w[8]; v9 = (v8) >> 2; - v10 = 5 * v9; - BignumADC(v12, carry, v0, v10, 0); - (void)v12; - BignumADC(v13, carry, v1, 0, carry); - (void)v13; - BignumADC(v14, carry, v2, 0, carry); - (void)v14; - BignumADC(v15, carry, v3, 0, carry); - (void)v15; - BignumADC(v16, carry, v4, 0, carry); - (void)v16; - BignumADC(v17, carry, v5, 0, carry); - (void)v17; - BignumADC(v18, carry, v6, 0, carry); - (void)v18; - BignumADC(v19, carry, v7, 0, carry); - (void)v19; - v20 = v8 + 0 + carry; - v21 = (v20) >> 2; - v22 = 5 * v21; - BignumADC(v24, carry, v0, v22, 0); - BignumADC(v25, carry, v1, 0, carry); - BignumADC(v26, carry, v2, 0, carry); - BignumADC(v27, carry, v3, 0, carry); - BignumADC(v28, carry, v4, 0, carry); - BignumADC(v29, carry, v5, 0, carry); - BignumADC(v30, carry, v6, 0, carry); - BignumADC(v31, carry, v7, 0, carry); - v32 = v8 + 0 + carry; - v33 = (v32) & ((((BignumInt)1) << 2)-1); - n->w[0] = v24; - n->w[1] = v25; - n->w[2] = v26; - n->w[3] = v27; - n->w[4] = v28; - n->w[5] = v29; - n->w[6] = v30; - n->w[7] = v31; - n->w[8] = v33; + v10 = (v8) & ((((BignumInt)1) << 2)-1); + v11 = 5 * v9; + BignumADC(v13, carry, v0, v11, 0); + BignumADC(v14, carry, v1, 0, carry); + BignumADC(v15, carry, v2, 0, carry); + BignumADC(v16, carry, v3, 0, carry); + BignumADC(v17, carry, v4, 0, carry); + BignumADC(v18, carry, v5, 0, carry); + BignumADC(v19, carry, v6, 0, carry); + BignumADC(v20, carry, v7, 0, carry); + v21 = v10 + 0 + carry; + BignumADC(v22, carry, v13, 5, 0); + (void)v22; + BignumADC(v23, carry, v14, 0, carry); + (void)v23; + BignumADC(v24, carry, v15, 0, carry); + (void)v24; + BignumADC(v25, carry, v16, 0, carry); + (void)v25; + BignumADC(v26, carry, v17, 0, carry); + (void)v26; + BignumADC(v27, carry, v18, 0, carry); + (void)v27; + BignumADC(v28, carry, v19, 0, carry); + (void)v28; + BignumADC(v29, carry, v20, 0, carry); + (void)v29; + v30 = v21 + 0 + carry; + v31 = (v30) >> 2; + v32 = 5 * v31; + BignumADC(v34, carry, v13, v32, 0); + BignumADC(v35, carry, v14, 0, carry); + BignumADC(v36, carry, v15, 0, carry); + BignumADC(v37, carry, v16, 0, carry); + BignumADC(v38, carry, v17, 0, carry); + BignumADC(v39, carry, v18, 0, carry); + BignumADC(v40, carry, v19, 0, carry); + BignumADC(v41, carry, v20, 0, carry); + v42 = v21 + 0 + carry; + v43 = (v42) & ((((BignumInt)1) << 2)-1); + n->w[0] = v34; + n->w[1] = v35; + n->w[2] = v36; + n->w[3] = v37; + n->w[4] = v38; + n->w[5] = v39; + n->w[6] = v40; + n->w[7] = v41; + n->w[8] = v43; } #elif BIGNUM_INT_BITS == 32 @@ -604,8 +615,8 @@ static void bigval_final_reduce(bigval *n) { - BignumInt v0, v1, v2, v3, v4, v5, v6, v8, v9, v10, v11, v12, v13, v14; - BignumInt v16, v17, v18, v19, v20, v21; + BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v9, v10, v11, v12, v13, v14; + BignumInt v15, v16, v17, v18, v19, v20, v22, v23, v24, v25, v26, v27; BignumCarry carry; v0 = n->w[0]; @@ -614,29 +625,35 @@ v3 = n->w[3]; v4 = n->w[4]; v5 = (v4) >> 2; - v6 = 5 * v5; - BignumADC(v8, carry, v0, v6, 0); - (void)v8; - BignumADC(v9, carry, v1, 0, carry); - (void)v9; - BignumADC(v10, carry, v2, 0, carry); - (void)v10; - BignumADC(v11, carry, v3, 0, carry); - (void)v11; - v12 = v4 + 0 + carry; - v13 = (v12) >> 2; - v14 = 5 * v13; - BignumADC(v16, carry, v0, v14, 0); - BignumADC(v17, carry, v1, 0, carry); - BignumADC(v18, carry, v2, 0, carry); - BignumADC(v19, carry, v3, 0, carry); - v20 = v4 + 0 + carry; - v21 = (v20) & ((((BignumInt)1) << 2)-1); - n->w[0] = v16; - n->w[1] = v17; - n->w[2] = v18; - n->w[3] = v19; - n->w[4] = v21; + v6 = (v4) & ((((BignumInt)1) << 2)-1); + v7 = 5 * v5; + BignumADC(v9, carry, v0, v7, 0); + BignumADC(v10, carry, v1, 0, carry); + BignumADC(v11, carry, v2, 0, carry); + BignumADC(v12, carry, v3, 0, carry); + v13 = v6 + 0 + carry; + BignumADC(v14, carry, v9, 5, 0); + (void)v14; + BignumADC(v15, carry, v10, 0, carry); + (void)v15; + BignumADC(v16, carry, v11, 0, carry); + (void)v16; + BignumADC(v17, carry, v12, 0, carry); + (void)v17; + v18 = v13 + 0 + carry; + v19 = (v18) >> 2; + v20 = 5 * v19; + BignumADC(v22, carry, v9, v20, 0); + BignumADC(v23, carry, v10, 0, carry); + BignumADC(v24, carry, v11, 0, carry); + BignumADC(v25, carry, v12, 0, carry); + v26 = v13 + 0 + carry; + v27 = (v26) & ((((BignumInt)1) << 2)-1); + n->w[0] = v22; + n->w[1] = v23; + n->w[2] = v24; + n->w[3] = v25; + n->w[4] = v27; } #elif BIGNUM_INT_BITS == 64 @@ -705,28 +722,33 @@ static void bigval_final_reduce(bigval *n) { - BignumInt v0, v1, v2, v3, v4, v6, v7, v8, v9, v10, v12, v13, v14, v15; + BignumInt v0, v1, v2, v3, v4, v5, v7, v8, v9, v10, v11, v12, v13, v14; + BignumInt v16, v17, v18, v19; BignumCarry carry; v0 = n->w[0]; v1 = n->w[1]; v2 = n->w[2]; v3 = (v2) >> 2; - v4 = 5 * v3; - BignumADC(v6, carry, v0, v4, 0); - (void)v6; - BignumADC(v7, carry, v1, 0, carry); - (void)v7; - v8 = v2 + 0 + carry; - v9 = (v8) >> 2; - v10 = 5 * v9; - BignumADC(v12, carry, v0, v10, 0); - BignumADC(v13, carry, v1, 0, carry); - v14 = v2 + 0 + carry; - v15 = (v14) & ((((BignumInt)1) << 2)-1); - n->w[0] = v12; - n->w[1] = v13; - n->w[2] = v15; + v4 = (v2) & ((((BignumInt)1) << 2)-1); + v5 = 5 * v3; + BignumADC(v7, carry, v0, v5, 0); + BignumADC(v8, carry, v1, 0, carry); + v9 = v4 + 0 + carry; + BignumADC(v10, carry, v7, 5, 0); + (void)v10; + BignumADC(v11, carry, v8, 0, carry); + (void)v11; + v12 = v9 + 0 + carry; + v13 = (v12) >> 2; + v14 = 5 * v13; + BignumADC(v16, carry, v7, v14, 0); + BignumADC(v17, carry, v8, 0, carry); + v18 = v9 + 0 + carry; + v19 = (v18) & ((((BignumInt)1) << 2)-1); + n->w[0] = v16; + n->w[1] = v17; + n->w[2] = v19; } #else diff -Nru filezilla-3.15.0.2/src/putty/sshcrc.c filezilla-3.33.0/src/putty/sshcrc.c --- filezilla-3.15.0.2/src/putty/sshcrc.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshcrc.c 2017-09-19 21:36:39.000000000 +0000 @@ -198,12 +198,11 @@ #ifdef GENPROGRAM int main(void) { - unsigned long crcword; int i; crc32_init(); for (i = 0; i < 256; i++) { - printf("%s0x%08XL%s", + printf("%s0x%08lXL%s", (i % 4 == 0 ? " " : " "), crc32_table[i], (i % 4 == 3 ? (i == 255 ? "\n" : ",\n") : ",")); diff -Nru filezilla-3.15.0.2/src/putty/sshecc.c filezilla-3.33.0/src/putty/sshecc.c --- filezilla-3.15.0.2/src/putty/sshecc.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshecc.c 2017-02-20 17:02:26.000000000 +0000 @@ -2029,10 +2029,10 @@ } getstring((const char**)blob, len, &q, &qlen); - if (!q) - return NULL; - if (qlen != 64) + if (!q || qlen != 64) { + ecdsa_freekey(ec); return NULL; + } ec->privateKey = bignum_from_bytes_le((const unsigned char *)q, 32); @@ -2760,11 +2760,8 @@ bytes[0] &= 248; bytes[31] &= 127; bytes[31] |= 64; - key->privateKey = bignum_from_bytes(bytes, sizeof(bytes)); - for (i = 0; i < sizeof(bytes); ++i) - { - ((volatile char*)bytes)[i] = 0; - } + key->privateKey = bignum_from_bytes_le(bytes, sizeof(bytes)); + smemclr(bytes, sizeof(bytes)); if (!key->privateKey) { sfree(key); return NULL; @@ -2940,9 +2937,12 @@ return extra->oid; } -const int ec_nist_alg_and_curve_by_bits(int bits, - const struct ec_curve **curve, - const struct ssh_signkey **alg) +const int ec_nist_curve_lengths[] = { 256, 384, 521 }; +const int n_ec_nist_curve_lengths = lenof(ec_nist_curve_lengths); + +int ec_nist_alg_and_curve_by_bits(int bits, + const struct ec_curve **curve, + const struct ssh_signkey **alg) { switch (bits) { case 256: *alg = &ssh_ecdsa_nistp256; break; @@ -2954,9 +2954,9 @@ return TRUE; } -const int ec_ed_alg_and_curve_by_bits(int bits, - const struct ec_curve **curve, - const struct ssh_signkey **alg) +int ec_ed_alg_and_curve_by_bits(int bits, + const struct ec_curve **curve, + const struct ssh_signkey **alg) { switch (bits) { case 256: *alg = &ssh_ecdsa_ed25519; break; diff -Nru filezilla-3.15.0.2/src/putty/ssh.h filezilla-3.33.0/src/putty/ssh.h --- filezilla-3.15.0.2/src/putty/ssh.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/ssh.h 2018-04-25 03:30:06.000000000 +0000 @@ -7,6 +7,9 @@ #include "int64.h" #include "misc.h" +#include +#include + struct ssh_channel; typedef struct ssh_tag *Ssh; @@ -155,12 +158,13 @@ const struct ssh_signkey *ec_alg_by_oid(int len, const void *oid, const struct ec_curve **curve); const unsigned char *ec_alg_oid(const struct ssh_signkey *alg, int *oidlen); -const int ec_nist_alg_and_curve_by_bits(int bits, - const struct ec_curve **curve, - const struct ssh_signkey **alg); -const int ec_ed_alg_and_curve_by_bits(int bits, - const struct ec_curve **curve, - const struct ssh_signkey **alg); +extern const int ec_nist_curve_lengths[], n_ec_nist_curve_lengths; +int ec_nist_alg_and_curve_by_bits(int bits, + const struct ec_curve **curve, + const struct ssh_signkey **alg); +int ec_ed_alg_and_curve_by_bits(int bits, + const struct ec_curve **curve, + const struct ssh_signkey **alg); struct ssh_signkey; @@ -257,12 +261,7 @@ void hmacmd5_do_hmac(void *handle, unsigned char const *blk, int len, unsigned char *hmac); -typedef struct { - uint32 h[5]; - unsigned char block[64]; - int blkused; - uint32 lenhi, lenlo; -} SHA_State; +typedef struct sha1_ctx SHA_State; void SHA_Init(SHA_State * s); void SHA_Bytes(SHA_State * s, const void *p, int len); void SHA_Final(SHA_State * s, unsigned char *output); @@ -270,23 +269,13 @@ void hmac_sha1_simple(void *key, int keylen, void *data, int datalen, unsigned char *output); -typedef struct { - uint32 h[8]; - unsigned char block[64]; - int blkused; - uint32 lenhi, lenlo; -} SHA256_State; +typedef struct sha256_ctx SHA256_State; void SHA256_Init(SHA256_State * s); void SHA256_Bytes(SHA256_State * s, const void *p, int len); void SHA256_Final(SHA256_State * s, unsigned char *output); void SHA256_Simple(const void *p, int len, unsigned char *output); -typedef struct { - uint64 h[8]; - unsigned char block[128]; - int blkused; - uint32 len[4]; -} SHA512_State; +typedef struct sha512_ctx SHA512_State; #define SHA384_State SHA512_State void SHA512_Init(SHA512_State * s); void SHA512_Bytes(SHA512_State * s, const void *p, int len); @@ -484,11 +473,12 @@ void aes_iv(void *handle, unsigned char *iv); void aes_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len); void aes_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len); +void aes_ssh2_sdctr(void *handle, unsigned char *blk, int len); /* * PuTTY version number formatted as an SSH version string. */ -extern char sshver[]; +extern const char sshver[]; /* * Gross hack: pscp will try to start SFTP but fall back to scp1 if @@ -1020,4 +1010,4 @@ void old_keyfile_warning(void); /* FZ: Very hackish, but we need access to the underlaying socket to peek at it */ -extern Socket ssh_socket; \ No newline at end of file +extern Socket ssh_socket; diff -Nru filezilla-3.15.0.2/src/putty/sshpubk.c filezilla-3.33.0/src/putty/sshpubk.c --- filezilla-3.15.0.2/src/putty/sshpubk.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshpubk.c 2017-09-19 21:36:39.000000000 +0000 @@ -309,6 +309,8 @@ *commentptr = commentp ? dupstr(commentp) : NULL; *blob = rsa_public_blob(&key, bloblen); freersakey(&key); + sfree(line); + fclose(fp); return 1; not_public_either: @@ -947,6 +949,7 @@ } *q = '\0'; + sfree(comment); /* *just* in case of multiple Comment headers */ comment = dupstr(line); } else if (!strcmp(line, "Subject") || !strncmp(line, "x-", 2)) { @@ -1092,6 +1095,7 @@ *commentptr = comment; else sfree(comment); + sfree(line); return pubblob; error: @@ -1302,6 +1306,20 @@ fputc('\n', fp); } +void base64_encode_buf(const unsigned char *data, int datalen, unsigned char *out) +{ + int n; + + while (datalen > 0) { + n = (datalen < 3 ? datalen : 3); + base64_encode_atom(data, n, out); + data += n; + out += 4; + datalen -= n; + } + *out = 0; +} + int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key, char *passphrase) { @@ -1576,8 +1594,9 @@ */ char *ssh2_fingerprint_blob(const void *blob, int bloblen) { - unsigned char digest[16]; - char fingerprint_str[16*3]; + unsigned char digest[32]; + char fingerprint_str_md5[16*3]; + char fingerprint_str_sha256[45]; /* ceil(32/3)*4+1 */ const char *algstr; int alglen; const struct ssh_signkey *alg; @@ -1588,7 +1607,10 @@ */ MD5Simple(blob, bloblen, digest); for (i = 0; i < 16; i++) - sprintf(fingerprint_str + i*3, "%02x%s", digest[i], i==15 ? "" : ":"); + sprintf(fingerprint_str_md5 + i*3, "%02x%s", digest[i], i==15 ? "" : ":"); + + SHA256_Simple(blob, bloblen, digest); + base64_encode_buf(digest, 32, fingerprint_str_sha256); /* * Identify the key algorithm, if possible. @@ -1604,17 +1626,17 @@ alg = find_pubkey_alg_len(alglen, algstr); if (alg) { int bits = alg->pubkey_bits(alg, blob, bloblen); - return dupprintf("%.*s %d %s", alglen, algstr, - bits, fingerprint_str); + return dupprintf("%.*s %d %s %s", alglen, algstr, + bits, fingerprint_str_md5, fingerprint_str_sha256); } else { - return dupprintf("%.*s %s", alglen, algstr, fingerprint_str); + return dupprintf("%.*s %s %s", alglen, algstr, fingerprint_str_md5, fingerprint_str_sha256); } } else { /* * No algorithm available (which means a seriously confused * key blob, but there we go). Return only the hash. */ - return dupstr(fingerprint_str); + return dupprintf("%s %s", fingerprint_str_md5, fingerprint_str_sha256); } } diff -Nru filezilla-3.15.0.2/src/putty/sshrand.c filezilla-3.33.0/src/putty/sshrand.c --- filezilla-3.15.0.2/src/putty/sshrand.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshrand.c 2017-09-19 21:36:39.000000000 +0000 @@ -240,7 +240,7 @@ length -= HASHINPUT - pool.incomingpos; SHATransform((word32 *) pool.incoming, (word32 *) pool.incomingb); for (i = 0; i < HASHSIZE; i++) { - pool.pool[pool.poolpos++] ^= pool.incomingb[i]; + pool.pool[pool.poolpos++] ^= pool.incoming[i]; if (pool.poolpos >= POOLSIZE) pool.poolpos = 0; } diff -Nru filezilla-3.15.0.2/src/putty/sshsh256.c filezilla-3.33.0/src/putty/sshsh256.c --- filezilla-3.15.0.2/src/putty/sshsh256.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshsh256.c 2017-09-19 21:36:39.000000000 +0000 @@ -5,85 +5,7 @@ */ #include "ssh.h" - -/* ---------------------------------------------------------------------- - * Core SHA256 algorithm: processes 16-word blocks into a message digest. - */ - -#define ror(x,y) ( ((x) << (32-y)) | (((uint32)(x)) >> (y)) ) -#define shr(x,y) ( (((uint32)(x)) >> (y)) ) -#define Ch(x,y,z) ( ((x) & (y)) ^ (~(x) & (z)) ) -#define Maj(x,y,z) ( ((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)) ) -#define bigsigma0(x) ( ror((x),2) ^ ror((x),13) ^ ror((x),22) ) -#define bigsigma1(x) ( ror((x),6) ^ ror((x),11) ^ ror((x),25) ) -#define smallsigma0(x) ( ror((x),7) ^ ror((x),18) ^ shr((x),3) ) -#define smallsigma1(x) ( ror((x),17) ^ ror((x),19) ^ shr((x),10) ) - -void SHA256_Core_Init(SHA256_State *s) { - s->h[0] = 0x6a09e667; - s->h[1] = 0xbb67ae85; - s->h[2] = 0x3c6ef372; - s->h[3] = 0xa54ff53a; - s->h[4] = 0x510e527f; - s->h[5] = 0x9b05688c; - s->h[6] = 0x1f83d9ab; - s->h[7] = 0x5be0cd19; -} - -void SHA256_Block(SHA256_State *s, uint32 *block) { - uint32 w[80]; - uint32 a,b,c,d,e,f,g,h; - static const int k[] = { - 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, - 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, - 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, - 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, - 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, - 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, - 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, - 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, - 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, - 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, - 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, - 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, - 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, - 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, - 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, - 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2, - }; - - int t; - - for (t = 0; t < 16; t++) - w[t] = block[t]; - - for (t = 16; t < 64; t++) - w[t] = smallsigma1(w[t-2]) + w[t-7] + smallsigma0(w[t-15]) + w[t-16]; - - a = s->h[0]; b = s->h[1]; c = s->h[2]; d = s->h[3]; - e = s->h[4]; f = s->h[5]; g = s->h[6]; h = s->h[7]; - - for (t = 0; t < 64; t+=8) { - uint32 t1, t2; - -#define ROUND(j,a,b,c,d,e,f,g,h) \ - t1 = h + bigsigma1(e) + Ch(e,f,g) + k[j] + w[j]; \ - t2 = bigsigma0(a) + Maj(a,b,c); \ - d = d + t1; h = t1 + t2; - - ROUND(t+0, a,b,c,d,e,f,g,h); - ROUND(t+1, h,a,b,c,d,e,f,g); - ROUND(t+2, g,h,a,b,c,d,e,f); - ROUND(t+3, f,g,h,a,b,c,d,e); - ROUND(t+4, e,f,g,h,a,b,c,d); - ROUND(t+5, d,e,f,g,h,a,b,c); - ROUND(t+6, c,d,e,f,g,h,a,b); - ROUND(t+7, b,c,d,e,f,g,h,a); - } - - s->h[0] += a; s->h[1] += b; s->h[2] += c; s->h[3] += d; - s->h[4] += e; s->h[5] += f; s->h[6] += g; s->h[7] += h; -} +#include /* ---------------------------------------------------------------------- * Outer SHA256 algorithm: take an arbitrary length byte string, @@ -91,91 +13,16 @@ * the end, and pass those blocks to the core SHA256 algorithm. */ -#define BLKSIZE 64 - void SHA256_Init(SHA256_State *s) { - SHA256_Core_Init(s); - s->blkused = 0; - s->lenhi = s->lenlo = 0; + sha256_init(s); } void SHA256_Bytes(SHA256_State *s, const void *p, int len) { - unsigned char *q = (unsigned char *)p; - uint32 wordblock[16]; - uint32 lenw = len; - int i; - - /* - * Update the length field. - */ - s->lenlo += lenw; - s->lenhi += (s->lenlo < lenw); - - if (s->blkused && s->blkused+len < BLKSIZE) { - /* - * Trivial case: just add to the block. - */ - memcpy(s->block + s->blkused, q, len); - s->blkused += len; - } else { - /* - * We must complete and process at least one block. - */ - while (s->blkused + len >= BLKSIZE) { - memcpy(s->block + s->blkused, q, BLKSIZE - s->blkused); - q += BLKSIZE - s->blkused; - len -= BLKSIZE - s->blkused; - /* Now process the block. Gather bytes big-endian into words */ - for (i = 0; i < 16; i++) { - wordblock[i] = - ( ((uint32)s->block[i*4+0]) << 24 ) | - ( ((uint32)s->block[i*4+1]) << 16 ) | - ( ((uint32)s->block[i*4+2]) << 8 ) | - ( ((uint32)s->block[i*4+3]) << 0 ); - } - SHA256_Block(s, wordblock); - s->blkused = 0; - } - memcpy(s->block, q, len); - s->blkused = len; - } + sha256_update(s, len, p); } void SHA256_Final(SHA256_State *s, unsigned char *digest) { - int i; - int pad; - unsigned char c[64]; - uint32 lenhi, lenlo; - - if (s->blkused >= 56) - pad = 56 + 64 - s->blkused; - else - pad = 56 - s->blkused; - - lenhi = (s->lenhi << 3) | (s->lenlo >> (32-3)); - lenlo = (s->lenlo << 3); - - memset(c, 0, pad); - c[0] = 0x80; - SHA256_Bytes(s, &c, pad); - - c[0] = (lenhi >> 24) & 0xFF; - c[1] = (lenhi >> 16) & 0xFF; - c[2] = (lenhi >> 8) & 0xFF; - c[3] = (lenhi >> 0) & 0xFF; - c[4] = (lenlo >> 24) & 0xFF; - c[5] = (lenlo >> 16) & 0xFF; - c[6] = (lenlo >> 8) & 0xFF; - c[7] = (lenlo >> 0) & 0xFF; - - SHA256_Bytes(s, &c, 8); - - for (i = 0; i < 8; i++) { - digest[i*4+0] = (s->h[i] >> 24) & 0xFF; - digest[i*4+1] = (s->h[i] >> 16) & 0xFF; - digest[i*4+2] = (s->h[i] >> 8) & 0xFF; - digest[i*4+3] = (s->h[i] >> 0) & 0xFF; - } + sha256_digest(s, SHA256_DIGEST_SIZE, digest); } void SHA256_Simple(const void *p, int len, unsigned char *output) { @@ -191,7 +38,7 @@ * Thin abstraction for things where hashes are pluggable. */ -static void *sha256_init(void) +static void *putty_sha256_init(void) { SHA256_State *s; @@ -234,7 +81,7 @@ } const struct ssh_hash ssh_sha256 = { - sha256_init, sha256_copy, sha256_bytes, sha256_final, sha256_free, + putty_sha256_init, sha256_copy, sha256_bytes, sha256_final, sha256_free, 32, "SHA-256" }; diff -Nru filezilla-3.15.0.2/src/putty/sshsh512.c filezilla-3.33.0/src/putty/sshsh512.c --- filezilla-3.15.0.2/src/putty/sshsh512.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshsh512.c 2017-09-19 21:36:39.000000000 +0000 @@ -6,189 +6,8 @@ * Modifications made for SHA-384 also */ -#ifdef SHA512_STANDALONE -typedef struct { - uint64 h[8]; - unsigned char block[128]; - int blkused; - uint32 len[4]; -} SHA512_State; -#else #include "ssh.h" -#endif - -#define BLKSIZE 128 - -/* - * Arithmetic implementations. Note that AND, XOR and NOT can - * overlap destination with one source, but the others can't. - */ -#define add(r,x,y) ( r.lo = y.lo + x.lo, \ - r.hi = y.hi + x.hi + ((uint32)r.lo < (uint32)y.lo) ) -#define rorB(r,x,y) ( r.lo = ((uint32)x.hi >> ((y)-32)) | ((uint32)x.lo << (64-(y))), \ - r.hi = ((uint32)x.lo >> ((y)-32)) | ((uint32)x.hi << (64-(y))) ) -#define rorL(r,x,y) ( r.lo = ((uint32)x.lo >> (y)) | ((uint32)x.hi << (32-(y))), \ - r.hi = ((uint32)x.hi >> (y)) | ((uint32)x.lo << (32-(y))) ) -#define shrB(r,x,y) ( r.lo = (uint32)x.hi >> ((y)-32), r.hi = 0 ) -#define shrL(r,x,y) ( r.lo = ((uint32)x.lo >> (y)) | ((uint32)x.hi << (32-(y))), \ - r.hi = (uint32)x.hi >> (y) ) -#define putty_and(r,x,y) ( r.lo = x.lo & y.lo, r.hi = x.hi & y.hi ) -#define putty_xor(r,x,y) ( r.lo = x.lo ^ y.lo, r.hi = x.hi ^ y.hi ) -#define putty_not(r,x) ( r.lo = ~x.lo, r.hi = ~x.hi ) -#define INIT(h,l) { h, l } -#define BUILD(r,h,l) ( r.hi = h, r.lo = l ) -#define EXTRACT(h,l,r) ( h = r.hi, l = r.lo ) - -/* ---------------------------------------------------------------------- - * Core SHA512 algorithm: processes 16-doubleword blocks into a - * message digest. - */ - -#define Ch(r,t,x,y,z) ( putty_not(t,x), putty_and(r,t,z), putty_and(t,x,y), putty_xor(r,r,t) ) -#define Maj(r,t,x,y,z) ( putty_and(r,x,y), putty_and(t,x,z), putty_xor(r,r,t), \ - putty_and(t,y,z), putty_xor(r,r,t) ) -#define bigsigma0(r,t,x) ( rorL(r,x,28), rorB(t,x,34), putty_xor(r,r,t), \ - rorB(t,x,39), putty_xor(r,r,t) ) -#define bigsigma1(r,t,x) ( rorL(r,x,14), rorL(t,x,18), putty_xor(r,r,t), \ - rorB(t,x,41), putty_xor(r,r,t) ) -#define smallsigma0(r,t,x) ( rorL(r,x,1), rorL(t,x,8), putty_xor(r,r,t), \ - shrL(t,x,7), putty_xor(r,r,t) ) -#define smallsigma1(r,t,x) ( rorL(r,x,19), rorB(t,x,61), putty_xor(r,r,t), \ - shrL(t,x,6), putty_xor(r,r,t) ) - -static void SHA512_Core_Init(SHA512_State *s) { - static const uint64 iv[] = { - INIT(0x6a09e667, 0xf3bcc908), - INIT(0xbb67ae85, 0x84caa73b), - INIT(0x3c6ef372, 0xfe94f82b), - INIT(0xa54ff53a, 0x5f1d36f1), - INIT(0x510e527f, 0xade682d1), - INIT(0x9b05688c, 0x2b3e6c1f), - INIT(0x1f83d9ab, 0xfb41bd6b), - INIT(0x5be0cd19, 0x137e2179), - }; - int i; - for (i = 0; i < 8; i++) - s->h[i] = iv[i]; -} - -#ifndef SHA512_STANDALONE -static void SHA384_Core_Init(SHA512_State *s) { - static const uint64 iv[] = { - INIT(0xcbbb9d5d, 0xc1059ed8), - INIT(0x629a292a, 0x367cd507), - INIT(0x9159015a, 0x3070dd17), - INIT(0x152fecd8, 0xf70e5939), - INIT(0x67332667, 0xffc00b31), - INIT(0x8eb44a87, 0x68581511), - INIT(0xdb0c2e0d, 0x64f98fa7), - INIT(0x47b5481d, 0xbefa4fa4), - }; - int i; - for (i = 0; i < 8; i++) - s->h[i] = iv[i]; -} -#endif - -static void SHA512_Block(SHA512_State *s, uint64 *block) { - uint64 w[80]; - uint64 a,b,c,d,e,f,g,h; - static const uint64 k[] = { - INIT(0x428a2f98, 0xd728ae22), INIT(0x71374491, 0x23ef65cd), - INIT(0xb5c0fbcf, 0xec4d3b2f), INIT(0xe9b5dba5, 0x8189dbbc), - INIT(0x3956c25b, 0xf348b538), INIT(0x59f111f1, 0xb605d019), - INIT(0x923f82a4, 0xaf194f9b), INIT(0xab1c5ed5, 0xda6d8118), - INIT(0xd807aa98, 0xa3030242), INIT(0x12835b01, 0x45706fbe), - INIT(0x243185be, 0x4ee4b28c), INIT(0x550c7dc3, 0xd5ffb4e2), - INIT(0x72be5d74, 0xf27b896f), INIT(0x80deb1fe, 0x3b1696b1), - INIT(0x9bdc06a7, 0x25c71235), INIT(0xc19bf174, 0xcf692694), - INIT(0xe49b69c1, 0x9ef14ad2), INIT(0xefbe4786, 0x384f25e3), - INIT(0x0fc19dc6, 0x8b8cd5b5), INIT(0x240ca1cc, 0x77ac9c65), - INIT(0x2de92c6f, 0x592b0275), INIT(0x4a7484aa, 0x6ea6e483), - INIT(0x5cb0a9dc, 0xbd41fbd4), INIT(0x76f988da, 0x831153b5), - INIT(0x983e5152, 0xee66dfab), INIT(0xa831c66d, 0x2db43210), - INIT(0xb00327c8, 0x98fb213f), INIT(0xbf597fc7, 0xbeef0ee4), - INIT(0xc6e00bf3, 0x3da88fc2), INIT(0xd5a79147, 0x930aa725), - INIT(0x06ca6351, 0xe003826f), INIT(0x14292967, 0x0a0e6e70), - INIT(0x27b70a85, 0x46d22ffc), INIT(0x2e1b2138, 0x5c26c926), - INIT(0x4d2c6dfc, 0x5ac42aed), INIT(0x53380d13, 0x9d95b3df), - INIT(0x650a7354, 0x8baf63de), INIT(0x766a0abb, 0x3c77b2a8), - INIT(0x81c2c92e, 0x47edaee6), INIT(0x92722c85, 0x1482353b), - INIT(0xa2bfe8a1, 0x4cf10364), INIT(0xa81a664b, 0xbc423001), - INIT(0xc24b8b70, 0xd0f89791), INIT(0xc76c51a3, 0x0654be30), - INIT(0xd192e819, 0xd6ef5218), INIT(0xd6990624, 0x5565a910), - INIT(0xf40e3585, 0x5771202a), INIT(0x106aa070, 0x32bbd1b8), - INIT(0x19a4c116, 0xb8d2d0c8), INIT(0x1e376c08, 0x5141ab53), - INIT(0x2748774c, 0xdf8eeb99), INIT(0x34b0bcb5, 0xe19b48a8), - INIT(0x391c0cb3, 0xc5c95a63), INIT(0x4ed8aa4a, 0xe3418acb), - INIT(0x5b9cca4f, 0x7763e373), INIT(0x682e6ff3, 0xd6b2b8a3), - INIT(0x748f82ee, 0x5defb2fc), INIT(0x78a5636f, 0x43172f60), - INIT(0x84c87814, 0xa1f0ab72), INIT(0x8cc70208, 0x1a6439ec), - INIT(0x90befffa, 0x23631e28), INIT(0xa4506ceb, 0xde82bde9), - INIT(0xbef9a3f7, 0xb2c67915), INIT(0xc67178f2, 0xe372532b), - INIT(0xca273ece, 0xea26619c), INIT(0xd186b8c7, 0x21c0c207), - INIT(0xeada7dd6, 0xcde0eb1e), INIT(0xf57d4f7f, 0xee6ed178), - INIT(0x06f067aa, 0x72176fba), INIT(0x0a637dc5, 0xa2c898a6), - INIT(0x113f9804, 0xbef90dae), INIT(0x1b710b35, 0x131c471b), - INIT(0x28db77f5, 0x23047d84), INIT(0x32caab7b, 0x40c72493), - INIT(0x3c9ebe0a, 0x15c9bebc), INIT(0x431d67c4, 0x9c100d4c), - INIT(0x4cc5d4be, 0xcb3e42b6), INIT(0x597f299c, 0xfc657e2a), - INIT(0x5fcb6fab, 0x3ad6faec), INIT(0x6c44198c, 0x4a475817), - }; - - int t; - - for (t = 0; t < 16; t++) - w[t] = block[t]; - - for (t = 16; t < 80; t++) { - uint64 p, q, r, tmp; - smallsigma1(p, tmp, w[t-2]); - smallsigma0(q, tmp, w[t-15]); - add(r, p, q); - add(p, r, w[t-7]); - add(w[t], p, w[t-16]); - } - - a = s->h[0]; b = s->h[1]; c = s->h[2]; d = s->h[3]; - e = s->h[4]; f = s->h[5]; g = s->h[6]; h = s->h[7]; - - for (t = 0; t < 80; t+=8) { - uint64 tmp, p, q, r; - -#define ROUND(j,a,b,c,d,e,f,g,h) \ - bigsigma1(p, tmp, e); \ - Ch(q, tmp, e, f, g); \ - add(r, p, q); \ - add(p, r, k[j]) ; \ - add(q, p, w[j]); \ - add(r, q, h); \ - bigsigma0(p, tmp, a); \ - Maj(tmp, q, a, b, c); \ - add(q, tmp, p); \ - add(p, r, d); \ - d = p; \ - add(h, q, r); - - ROUND(t+0, a,b,c,d,e,f,g,h); - ROUND(t+1, h,a,b,c,d,e,f,g); - ROUND(t+2, g,h,a,b,c,d,e,f); - ROUND(t+3, f,g,h,a,b,c,d,e); - ROUND(t+4, e,f,g,h,a,b,c,d); - ROUND(t+5, d,e,f,g,h,a,b,c); - ROUND(t+6, c,d,e,f,g,h,a,b); - ROUND(t+7, b,c,d,e,f,g,h,a); - } - - { - uint64 tmp; -#define UPDATE(state, local) ( tmp = state, add(state, tmp, local) ) - UPDATE(s->h[0], a); UPDATE(s->h[1], b); - UPDATE(s->h[2], c); UPDATE(s->h[3], d); - UPDATE(s->h[4], e); UPDATE(s->h[5], f); - UPDATE(s->h[6], g); UPDATE(s->h[7], h); - } -} +#include /* ---------------------------------------------------------------------- * Outer SHA512 algorithm: take an arbitrary length byte string, @@ -197,121 +16,23 @@ */ void SHA512_Init(SHA512_State *s) { - int i; - SHA512_Core_Init(s); - s->blkused = 0; - for (i = 0; i < 4; i++) - s->len[i] = 0; + sha512_init(s); } -#ifndef SHA512_STANDALONE void SHA384_Init(SHA512_State *s) { - int i; - SHA384_Core_Init(s); - s->blkused = 0; - for (i = 0; i < 4; i++) - s->len[i] = 0; + sha384_init(s); } -#endif void SHA512_Bytes(SHA512_State *s, const void *p, int len) { - unsigned char *q = (unsigned char *)p; - uint64 wordblock[16]; - uint32 lenw = len; - int i; - - /* - * Update the length field. - */ - for (i = 0; i < 4; i++) { - s->len[i] += lenw; - lenw = (s->len[i] < lenw); - } - - if (s->blkused && s->blkused+len < BLKSIZE) { - /* - * Trivial case: just add to the block. - */ - memcpy(s->block + s->blkused, q, len); - s->blkused += len; - } else { - /* - * We must complete and process at least one block. - */ - while (s->blkused + len >= BLKSIZE) { - memcpy(s->block + s->blkused, q, BLKSIZE - s->blkused); - q += BLKSIZE - s->blkused; - len -= BLKSIZE - s->blkused; - /* Now process the block. Gather bytes big-endian into words */ - for (i = 0; i < 16; i++) { - uint32 h, l; - h = ( ((uint32)s->block[i*8+0]) << 24 ) | - ( ((uint32)s->block[i*8+1]) << 16 ) | - ( ((uint32)s->block[i*8+2]) << 8 ) | - ( ((uint32)s->block[i*8+3]) << 0 ); - l = ( ((uint32)s->block[i*8+4]) << 24 ) | - ( ((uint32)s->block[i*8+5]) << 16 ) | - ( ((uint32)s->block[i*8+6]) << 8 ) | - ( ((uint32)s->block[i*8+7]) << 0 ); - BUILD(wordblock[i], h, l); - } - SHA512_Block(s, wordblock); - s->blkused = 0; - } - memcpy(s->block, q, len); - s->blkused = len; - } + sha512_update(s, len, p); } void SHA512_Final(SHA512_State *s, unsigned char *digest) { - int i; - int pad; - unsigned char c[BLKSIZE]; - uint32 len[4]; - - if (s->blkused >= BLKSIZE-16) - pad = (BLKSIZE-16) + BLKSIZE - s->blkused; - else - pad = (BLKSIZE-16) - s->blkused; - - for (i = 4; i-- ;) { - uint32 lenhi = s->len[i]; - uint32 lenlo = i > 0 ? s->len[i-1] : 0; - len[i] = (lenhi << 3) | (lenlo >> (32-3)); - } - - memset(c, 0, pad); - c[0] = 0x80; - SHA512_Bytes(s, &c, pad); - - for (i = 0; i < 4; i++) { - c[i*4+0] = (len[3-i] >> 24) & 0xFF; - c[i*4+1] = (len[3-i] >> 16) & 0xFF; - c[i*4+2] = (len[3-i] >> 8) & 0xFF; - c[i*4+3] = (len[3-i] >> 0) & 0xFF; - } - - SHA512_Bytes(s, &c, 16); - - for (i = 0; i < 8; i++) { - uint32 h, l; - EXTRACT(h, l, s->h[i]); - digest[i*8+0] = (h >> 24) & 0xFF; - digest[i*8+1] = (h >> 16) & 0xFF; - digest[i*8+2] = (h >> 8) & 0xFF; - digest[i*8+3] = (h >> 0) & 0xFF; - digest[i*8+4] = (l >> 24) & 0xFF; - digest[i*8+5] = (l >> 16) & 0xFF; - digest[i*8+6] = (l >> 8) & 0xFF; - digest[i*8+7] = (l >> 0) & 0xFF; - } + sha512_digest(s, SHA512_DIGEST_SIZE, digest); } -#ifndef SHA512_STANDALONE void SHA384_Final(SHA512_State *s, unsigned char *digest) { - unsigned char biggerDigest[512 / 8]; - SHA512_Final(s, biggerDigest); - memcpy(digest, biggerDigest, 384 / 8); + sha384_digest(s, SHA384_DIGEST_SIZE, digest); } void SHA512_Simple(const void *p, int len, unsigned char *output) { @@ -336,7 +57,7 @@ * Thin abstraction for things where hashes are pluggable. */ -static void *sha512_init(void) +static void *putty_sha512_init(void) { SHA512_State *s; @@ -379,11 +100,11 @@ } const struct ssh_hash ssh_sha512 = { - sha512_init, sha512_copy, sha512_bytes, sha512_final, sha512_free, + putty_sha512_init, sha512_copy, sha512_bytes, sha512_final, sha512_free, 64, "SHA-512" }; -static void *sha384_init(void) +static void *putty_sha384_init(void) { SHA512_State *s; @@ -402,10 +123,9 @@ } const struct ssh_hash ssh_sha384 = { - sha384_init, sha512_copy, sha512_bytes, sha384_final, sha512_free, + putty_sha384_init, sha512_copy, sha512_bytes, sha384_final, sha512_free, 48, "SHA-384" }; -#endif #ifdef TEST diff -Nru filezilla-3.15.0.2/src/putty/sshsha.c filezilla-3.33.0/src/putty/sshsha.c --- filezilla-3.15.0.2/src/putty/sshsha.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshsha.c 2017-09-19 21:36:39.000000000 +0000 @@ -6,209 +6,39 @@ */ #include "ssh.h" +#include /* ---------------------------------------------------------------------- * Core SHA algorithm: processes 16-word blocks into a message digest. */ -#define rol(x,y) ( ((x) << (y)) | (((uint32)x) >> (32-y)) ) - -static void SHA_Core_Init(uint32 h[5]) -{ - h[0] = 0x67452301; - h[1] = 0xefcdab89; - h[2] = 0x98badcfe; - h[3] = 0x10325476; - h[4] = 0xc3d2e1f0; -} - void SHATransform(word32 * digest, word32 * block) { - word32 w[80]; - word32 a, b, c, d, e; - int t; - -#ifdef RANDOM_DIAGNOSTICS - { - extern int random_diagnostics; - if (random_diagnostics) { - int i; - printf("SHATransform:"); - for (i = 0; i < 5; i++) - printf(" %08x", digest[i]); - printf(" +"); - for (i = 0; i < 16; i++) - printf(" %08x", block[i]); - } - } -#endif - - for (t = 0; t < 16; t++) - w[t] = block[t]; - - for (t = 16; t < 80; t++) { - word32 tmp = w[t - 3] ^ w[t - 8] ^ w[t - 14] ^ w[t - 16]; - w[t] = rol(tmp, 1); - } - - a = digest[0]; - b = digest[1]; - c = digest[2]; - d = digest[3]; - e = digest[4]; - - for (t = 0; t < 20; t++) { - word32 tmp = - rol(a, 5) + ((b & c) | (d & ~b)) + e + w[t] + 0x5a827999; - e = d; - d = c; - c = rol(b, 30); - b = a; - a = tmp; - } - for (t = 20; t < 40; t++) { - word32 tmp = rol(a, 5) + (b ^ c ^ d) + e + w[t] + 0x6ed9eba1; - e = d; - d = c; - c = rol(b, 30); - b = a; - a = tmp; - } - for (t = 40; t < 60; t++) { - word32 tmp = rol(a, - 5) + ((b & c) | (b & d) | (c & d)) + e + w[t] + - 0x8f1bbcdc; - e = d; - d = c; - c = rol(b, 30); - b = a; - a = tmp; - } - for (t = 60; t < 80; t++) { - word32 tmp = rol(a, 5) + (b ^ c ^ d) + e + w[t] + 0xca62c1d6; - e = d; - d = c; - c = rol(b, 30); - b = a; - a = tmp; - } - - digest[0] += a; - digest[1] += b; - digest[2] += c; - digest[3] += d; - digest[4] += e; - -#ifdef RANDOM_DIAGNOSTICS - { - extern int random_diagnostics; - if (random_diagnostics) { - int i; - printf(" ="); - for (i = 0; i < 5; i++) - printf(" %08x", digest[i]); - printf("\n"); - } - } -#endif + // This has different endianess than the PuTTY code, but this is fine for use in the RNG + _nettle_sha1_compress(digest, (uint8_t *)block); } + /* ---------------------------------------------------------------------- * Outer SHA algorithm: take an arbitrary length byte string, * convert it into 16-word blocks with the prescribed padding at * the end, and pass those blocks to the core SHA algorithm. */ -void SHA_Init(SHA_State * s) +void SHA_Init(SHA_State *s) { - SHA_Core_Init(s->h); - s->blkused = 0; - s->lenhi = s->lenlo = 0; + sha1_init(s); } -void SHA_Bytes(SHA_State * s, const void *p, int len) -{ - const unsigned char *q = (const unsigned char *) p; - uint32 wordblock[16]; - uint32 lenw = len; - int i; - - /* - * Update the length field. - */ - s->lenlo += lenw; - s->lenhi += (s->lenlo < lenw); - - if (s->blkused && s->blkused + len < 64) { - /* - * Trivial case: just add to the block. - */ - memcpy(s->block + s->blkused, q, len); - s->blkused += len; - } else { - /* - * We must complete and process at least one block. - */ - while (s->blkused + len >= 64) { - memcpy(s->block + s->blkused, q, 64 - s->blkused); - q += 64 - s->blkused; - len -= 64 - s->blkused; - /* Now process the block. Gather bytes big-endian into words */ - for (i = 0; i < 16; i++) { - wordblock[i] = - (((uint32) s->block[i * 4 + 0]) << 24) | - (((uint32) s->block[i * 4 + 1]) << 16) | - (((uint32) s->block[i * 4 + 2]) << 8) | - (((uint32) s->block[i * 4 + 3]) << 0); - } - SHATransform(s->h, wordblock); - s->blkused = 0; - } - memcpy(s->block, q, len); - s->blkused = len; - } +void SHA_Bytes(SHA_State *s, const void *p, int len) { + sha1_update(s, len, p); } -void SHA_Final(SHA_State * s, unsigned char *output) -{ - int i; - int pad; - unsigned char c[64]; - uint32 lenhi, lenlo; - - if (s->blkused >= 56) - pad = 56 + 64 - s->blkused; - else - pad = 56 - s->blkused; - - lenhi = (s->lenhi << 3) | (s->lenlo >> (32 - 3)); - lenlo = (s->lenlo << 3); - - memset(c, 0, pad); - c[0] = 0x80; - SHA_Bytes(s, &c, pad); - - c[0] = (lenhi >> 24) & 0xFF; - c[1] = (lenhi >> 16) & 0xFF; - c[2] = (lenhi >> 8) & 0xFF; - c[3] = (lenhi >> 0) & 0xFF; - c[4] = (lenlo >> 24) & 0xFF; - c[5] = (lenlo >> 16) & 0xFF; - c[6] = (lenlo >> 8) & 0xFF; - c[7] = (lenlo >> 0) & 0xFF; - - SHA_Bytes(s, &c, 8); - - for (i = 0; i < 5; i++) { - output[i * 4] = (s->h[i] >> 24) & 0xFF; - output[i * 4 + 1] = (s->h[i] >> 16) & 0xFF; - output[i * 4 + 2] = (s->h[i] >> 8) & 0xFF; - output[i * 4 + 3] = (s->h[i]) & 0xFF; - } +void SHA_Final(SHA_State *s, unsigned char *digest) { + sha1_digest(s, SHA1_DIGEST_SIZE, digest); } -void SHA_Simple(const void *p, int len, unsigned char *output) -{ +void SHA_Simple(const void *p, int len, unsigned char *output) { SHA_State s; SHA_Init(&s); @@ -221,7 +51,7 @@ * Thin abstraction for things where hashes are pluggable. */ -static void *sha1_init(void) +static void *putty_sha1_init(void) { SHA_State *s; @@ -264,7 +94,7 @@ } const struct ssh_hash ssh_sha1 = { - sha1_init, sha1_copy, sha1_bytes, sha1_final, sha1_free, 20, "SHA-1" + putty_sha1_init, sha1_copy, sha1_bytes, sha1_final, sha1_free, 20, "SHA-1" }; /* ---------------------------------------------------------------------- diff -Nru filezilla-3.15.0.2/src/putty/sshshare.c filezilla-3.33.0/src/putty/sshshare.c --- filezilla-3.15.0.2/src/putty/sshshare.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshshare.c 2017-07-16 10:29:48.000000000 +0000 @@ -911,8 +911,8 @@ share_begin_cleanup(cs); } -static int share_closing(Plug plug, const char *error_msg, int error_code, - int calling_back) +static void share_closing(Plug plug, const char *error_msg, int error_code, + int calling_back) { struct ssh_sharing_connstate *cs = (struct ssh_sharing_connstate *)plug; @@ -935,7 +935,6 @@ "Socket error: %s", error_msg); } share_begin_cleanup(cs); - return 1; } static int getstring_inner(const void *vdata, int datalen, @@ -1775,17 +1774,17 @@ * Coroutine macros similar to, but simplified from, those in ssh.c. */ #define crBegin(v) { int *crLine = &v; switch(v) { case 0:; -#define crFinish(z) } *crLine = 0; return (z); } +#define crFinishV } *crLine = 0; return; } #define crGetChar(c) do \ { \ while (len == 0) { \ - *crLine =__LINE__; return 1; case __LINE__:; \ + *crLine =__LINE__; return; case __LINE__:; \ } \ len--; \ (c) = (unsigned char)*data++; \ } while (0) -static int share_receive(Plug plug, int urgent, char *data, int len) +static void share_receive(Plug plug, int urgent, char *data, int len) { struct ssh_sharing_connstate *cs = (struct ssh_sharing_connstate *)plug; static const char expected_verstring_prefix[] = @@ -1858,7 +1857,7 @@ } dead:; - crFinish(1); + crFinishV; } static void share_sent(Plug plug, int bufsize) @@ -1875,8 +1874,8 @@ */ } -static int share_listen_closing(Plug plug, const char *error_msg, - int error_code, int calling_back) +static void share_listen_closing(Plug plug, const char *error_msg, + int error_code, int calling_back) { struct ssh_sharing_state *sharestate = (struct ssh_sharing_state *)plug; if (error_msg) @@ -1884,7 +1883,6 @@ "listening socket: %s", error_msg); sk_close(sharestate->listensock); sharestate->listensock = NULL; - return 1; } static void share_send_verstring(struct ssh_sharing_connstate *cs) @@ -2047,10 +2045,9 @@ static void nullplug_socket_log(Plug plug, int type, SockAddr addr, int port, const char *error_msg, int error_code) {} -static int nullplug_closing(Plug plug, const char *error_msg, int error_code, - int calling_back) { return 0; } -static int nullplug_receive(Plug plug, int urgent, char *data, - int len) { return 0; } +static void nullplug_closing(Plug plug, const char *error_msg, int error_code, + int calling_back) {} +static void nullplug_receive(Plug plug, int urgent, char *data, int len) {} static void nullplug_sent(Plug plug, int bufsize) {} int ssh_share_test_for_upstream(const char *host, int port, Conf *conf) diff -Nru filezilla-3.15.0.2/src/putty/sshzlib.c filezilla-3.33.0/src/putty/sshzlib.c --- filezilla-3.15.0.2/src/putty/sshzlib.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/sshzlib.c 2017-09-19 21:36:39.000000000 +0000 @@ -201,7 +201,7 @@ unsigned char *data, int len, int compress) { struct LZ77InternalContext *st = ctx->ictx; - int i, hash, distance, off, nmatch, matchlen, advance; + int i, distance, off, nmatch, matchlen, advance; struct Match defermatch, matches[MAXMATCH]; int deferchr; @@ -242,7 +242,7 @@ /* * Hash the next few characters. */ - hash = lz77_hash(data); + int hash = lz77_hash(data); /* * Look the hash up in the corresponding hash chain and see @@ -267,7 +267,6 @@ } } else { nmatch = 0; - hash = INVALID; } if (nmatch > 0) { diff -Nru filezilla-3.15.0.2/src/putty/timing.c filezilla-3.33.0/src/putty/timing.c --- filezilla-3.15.0.2/src/putty/timing.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/timing.c 2017-09-19 21:36:39.000000000 +0000 @@ -148,6 +148,17 @@ return when; } +unsigned long timing_last_clock(void) +{ + /* + * Return the last value we stored in 'now'. In particular, + * calling this just after schedule_timer returns the value of + * 'now' that was used to decide when the timer you just set would + * go off. + */ + return now; +} + /* * Call to run any timers whose time has reached the present. * Returns the time (in ticks) expected until the next timer after diff -Nru filezilla-3.15.0.2/src/putty/tree234.c filezilla-3.33.0/src/putty/tree234.c --- filezilla-3.15.0.2/src/putty/tree234.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/tree234.c 2017-09-19 21:36:39.000000000 +0000 @@ -681,7 +681,7 @@ LOG((" moving to subtree %d\n", ki)); sub = n->kids[ki]; if (!sub->elems[1]) { - LOG((" subtree has only one element!\n", ki)); + LOG((" subtree has only one element!\n")); if (ki > 0 && n->kids[ki - 1]->elems[1]) { /* * Case 3a, left-handed variant. Child ki has diff -Nru filezilla-3.15.0.2/src/putty/unix/Makefile.am filezilla-3.33.0/src/putty/unix/Makefile.am --- filezilla-3.15.0.2/src/putty/unix/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/Makefile.am 2017-09-19 21:36:39.000000000 +0000 @@ -7,7 +7,7 @@ uxnoise.c \ uxstore.c -libfzputtycommon_ux_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 +libfzputtycommon_ux_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 $(NETTLE_CFLAGS) libfzsftp_ux_a_SOURCES = \ uxsftp.c \ @@ -19,6 +19,6 @@ uxproxy.c \ uxshare.c -libfzsftp_ux_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 +libfzsftp_ux_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 $(NETTLE_CFLAGS) noinst_HEADERS = unix.h diff -Nru filezilla-3.15.0.2/src/putty/unix/Makefile.in filezilla-3.33.0/src/putty/unix/Makefile.in --- filezilla-3.15.0.2/src/putty/unix/Makefile.in 2016-02-10 19:38:52.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,16 +90,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/putty/unix -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -101,6 +112,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -195,6 +208,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -206,11 +220,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -234,6 +248,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -254,16 +270,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -315,6 +339,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -354,6 +379,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -372,7 +398,7 @@ uxnoise.c \ uxstore.c -libfzputtycommon_ux_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 +libfzputtycommon_ux_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 $(NETTLE_CFLAGS) libfzsftp_ux_a_SOURCES = \ uxsftp.c \ uxnoise.c \ @@ -383,7 +409,7 @@ uxproxy.c \ uxshare.c -libfzsftp_ux_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 +libfzsftp_ux_a_CPPFLAGS = $(AM_CPPFLAGS) -DNO_GSSAPI -D_FILE_OFFSET_BITS=64 $(NETTLE_CFLAGS) noinst_HEADERS = unix.h all: all-am @@ -401,7 +427,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/putty/unix/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/putty/unix/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -850,6 +875,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru filezilla-3.15.0.2/src/putty/unix/unix.h filezilla-3.33.0/src/putty/unix/unix.h --- filezilla-3.15.0.2/src/putty/unix/unix.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/unix.h 2017-09-19 21:36:39.000000000 +0000 @@ -29,6 +29,7 @@ #ifndef NO_LIBDL #include /* Dynamic library loading */ #endif /* NO_LIBDL */ +#include /* for mode_t */ #ifdef OSX_GTK /* @@ -47,8 +48,32 @@ #define META_MANUAL_MASK (GDK_MOD1_MASK) #define JUST_USE_GTK_CLIPBOARD_UTF8 /* low-level gdk_selection_* fails */ #define DEFAULT_CLIPBOARD GDK_SELECTION_CLIPBOARD /* OS X has no PRIMARY */ + +#define BUILDINFO_PLATFORM_GTK "OS X (GTK)" +#define BUILDINFO_GTK + +#elif defined NOT_X_WINDOWS + +#define BUILDINFO_PLATFORM_GTK "Unix (pure GTK)" +#define BUILDINFO_GTK + +#else + +#define BUILDINFO_PLATFORM_GTK "Unix (GTK + X11)" +#define BUILDINFO_GTK + #endif +/* BUILDINFO_PLATFORM varies its expansion between the GTK and + * pure-CLI utilities, so that Unix Plink, PSFTP etc don't announce + * themselves incongruously as having something to do with GTK. */ +#define BUILDINFO_PLATFORM_CLI "Unix" +extern const int buildinfo_gtk_relevant; +#define BUILDINFO_PLATFORM (buildinfo_gtk_relevant ? \ + BUILDINFO_PLATFORM_GTK : BUILDINFO_PLATFORM_CLI) + +char *buildinfo_gtk_version(void); + struct Filename { char *path; }; @@ -92,7 +117,7 @@ #define SEL_NL { 10 } /* Simple wraparound timer function */ -unsigned long getticks(void); /* based on gettimeofday(2) */ +unsigned long getticks(void); #define GETTICKCOUNT getticks #define TICKSPERSEC 1000 /* we choose to use milliseconds */ #define CURSORBLINK 450 /* no standard way to set this */ @@ -112,11 +137,25 @@ */ #define FLAG_STDERR_TTY 0x1000 +/* The per-session frontend structure managed by gtkwin.c */ +struct gui_data; +struct gui_data *new_session_window(Conf *conf, const char *geometry_string); + +/* Defined in gtkmain.c */ +void launch_duplicate_session(Conf *conf); +void launch_new_session(void); +void launch_saved_session(const char *str); +#ifdef MAY_REFER_TO_GTK_IN_HEADERS +GtkWidget *make_gtk_toplevel_window(void *frontend); +#endif + +/* Defined in gtkcomm.c */ +void gtkcomm_setup(void); + /* Things pty.c needs from pterm.c */ const char *get_x_display(void *frontend); int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */ long get_windowid(void *frontend); -int frontend_is_utf8(void *frontend); /* Things gtkdlg.c needs from pterm.c */ void *get_window(void *frontend); /* void * to avoid depending on gtk.h */ @@ -159,10 +198,10 @@ /* The interface used by uxsel.c */ typedef struct uxsel_id uxsel_id; void uxsel_init(void); -typedef int (*uxsel_callback_fn)(int fd, int event); +typedef void (*uxsel_callback_fn)(int fd, int event); void uxsel_set(int fd, int rwx, uxsel_callback_fn callback); void uxsel_del(int fd); -int select_result(int fd, int event); +void select_result(int fd, int event); int first_fd(int *state, int *rwx); int next_fd(int *state, int *rwx); /* The following are expected to be provided _to_ uxsel.c by the frontend */ @@ -200,6 +239,7 @@ int nonblock(int); int no_nonblock(int); char *make_dir_and_check_ours(const char *dirname); +char *make_dir_path(const char *path, mode_t mode); /* * Exports from unicode.c. diff -Nru filezilla-3.15.0.2/src/putty/unix/uxagentc.c filezilla-3.33.0/src/putty/unix/uxagentc.c --- filezilla-3.15.0.2/src/putty/unix/uxagentc.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/uxagentc.c 2017-09-19 21:36:39.000000000 +0000 @@ -23,8 +23,8 @@ return FALSE; } -static tree234 *agent_connections; -struct agent_connection { +static tree234 *agent_pending_queries; +struct agent_pending_query { int fd; char *retbuf; char sizebuf[4]; @@ -34,8 +34,8 @@ }; static int agent_conncmp(void *av, void *bv) { - struct agent_connection *a = (struct agent_connection *) av; - struct agent_connection *b = (struct agent_connection *) bv; + agent_pending_query *a = (agent_pending_query *) av; + agent_pending_query *b = (agent_pending_query *) bv; if (a->fd < b->fd) return -1; if (a->fd > b->fd) @@ -45,7 +45,7 @@ static int agent_connfind(void *av, void *bv) { int afd = *(int *) av; - struct agent_connection *b = (struct agent_connection *) bv; + agent_pending_query *b = (agent_pending_query *) bv; if (afd < b->fd) return -1; if (afd > b->fd) @@ -59,7 +59,7 @@ * (conn->retbuf non-NULL and filled with something useful) or has * failed totally (conn->retbuf is NULL). */ -static int agent_try_read(struct agent_connection *conn) +static int agent_try_read(agent_pending_query *conn) { int ret; @@ -90,20 +90,28 @@ return 1; } -static int agent_select_result(int fd, int event) +void agent_cancel_query(agent_pending_query *conn) { - struct agent_connection *conn; + uxsel_del(conn->fd); + close(conn->fd); + del234(agent_pending_queries, conn); + sfree(conn); +} + +static void agent_select_result(int fd, int event) +{ + agent_pending_query *conn; assert(event == 1); /* not selecting for anything but R */ - conn = find234(agent_connections, &fd, agent_connfind); + conn = find234(agent_pending_queries, &fd, agent_connfind); if (!conn) { uxsel_del(fd); - return 1; + return; } if (!agent_try_read(conn)) - return 0; /* more data to come */ + return; /* more data to come */ /* * We have now completed the agent query. Do the callback, and @@ -111,24 +119,21 @@ * of that passes to the callback.) */ conn->callback(conn->callback_ctx, conn->retbuf, conn->retlen); - uxsel_del(fd); - close(fd); - del234(agent_connections, conn); - sfree(conn); - return 0; + agent_cancel_query(conn); } -int agent_query(void *in, int inlen, void **out, int *outlen, - void (*callback)(void *, void *, int), void *callback_ctx) +agent_pending_query *agent_query( + void *in, int inlen, void **out, int *outlen, + void (*callback)(void *, void *, int), void *callback_ctx) { char *name; int sock; struct sockaddr_un addr; int done; - struct agent_connection *conn; + agent_pending_query *conn; name = getenv("SSH_AUTH_SOCK"); - if (!name) + if (!name || strlen(name) >= sizeof(addr.sun_path)) goto failure; sock = socket(PF_UNIX, SOCK_STREAM, 0); @@ -140,7 +145,7 @@ cloexec(sock); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, name, sizeof(addr.sun_path)); + strcpy(addr.sun_path, name); if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { close(sock); goto failure; @@ -155,7 +160,7 @@ done += ret; } - conn = snew(struct agent_connection); + conn = snew(agent_pending_query); conn->fd = sock; conn->retbuf = conn->sizebuf; conn->retsize = 4; @@ -179,7 +184,7 @@ *out = conn->retbuf; *outlen = conn->retlen; sfree(conn); - return 1; + return NULL; } /* @@ -188,15 +193,15 @@ * response hasn't been received yet, and call the callback when * select_result comes back to us. */ - if (!agent_connections) - agent_connections = newtree234(agent_conncmp); - add234(agent_connections, conn); + if (!agent_pending_queries) + agent_pending_queries = newtree234(agent_conncmp); + add234(agent_pending_queries, conn); uxsel_set(sock, 1, agent_select_result); - return 0; + return conn; failure: *out = NULL; *outlen = 0; - return 1; + return NULL; } diff -Nru filezilla-3.15.0.2/src/putty/unix/uxcons.c filezilla-3.33.0/src/putty/unix/uxcons.c --- filezilla-3.15.0.2/src/putty/unix/uxcons.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/uxcons.c 2017-09-19 21:36:39.000000000 +0000 @@ -12,6 +12,10 @@ #include #include #include +#include +#ifndef HAVE_NO_SYS_SELECT_H +#include +#endif #include "putty.h" #include "storage.h" @@ -97,7 +101,9 @@ fd_set rfds; FD_ZERO(&rfds); FD_SET(fd, &rfds); - ret = select(fd+1, &rfds, NULL, NULL, NULL); + do { + ret = select(fd+1, &rfds, NULL, NULL, NULL); + } while (ret < 0 && errno == EINTR); assert(ret != 0); if (ret < 0) return ret; @@ -113,13 +119,13 @@ { int ret; - static const char absentmsg_batch[] = +/* static const char absentmsg_batch[] = "The server's host key is not cached. You have no guarantee\n" "that the server is the computer you think it is.\n" "The server's %s key fingerprint is:\n" "%s\n" "Connection abandoned.\n"; -/* static const char absentmsg[] = + static const char absentmsg[] = "The server's host key is not cached. You have no guarantee\n" "that the server is the computer you think it is.\n" "The server's %s key fingerprint is:\n" @@ -131,7 +137,6 @@ "If you do not trust this host, press Return to abandon the\n" "connection.\n" "Store key in cache? (y/n) "; -*/ static const char wrongmsg_batch[] = "WARNING - POTENTIAL SECURITY BREACH!\n" "The server's host key does not match the one PuTTY has\n" @@ -141,7 +146,7 @@ "The new %s key fingerprint is:\n" "%s\n" "Connection abandoned.\n"; -/* static const char wrongmsg[] = + static const char wrongmsg[] = "WARNING - POTENTIAL SECURITY BREACH!\n" "The server's host key does not match the one PuTTY has\n" "cached. This means that either the server administrator\n" @@ -172,20 +177,7 @@ return 1; //FZ premsg(&cf); - if (ret == 2) { /* key was different */ - if (console_batch_mode) { - fprintf(stderr, wrongmsg_batch, keytype, fingerprint); - return 0; - } - fzprintf_raw(sftpRequest, "%d%s\n%d\n%s\n", (int)sftpReqHostkeyChanged, host, port, fingerprint); - } - if (ret == 1) { /* key was absent */ - if (console_batch_mode) { - fprintf(stderr, absentmsg_batch, keytype, fingerprint); - return 0; - } - fzprintf_raw(sftpRequest, "%d%s\n%d\n%s\n", (int)sftpReqHostkey, host, port, fingerprint); - } + fzprintf_raw((ret == 1) ? sftpAskHostkey : sftpAskHostkeyChanged, "%s\n%d\n", host, port); { struct termios oldmode, newmode; @@ -209,7 +201,7 @@ //FZ postmsg(&cf); return 1; } else { - fprintf(stderr, abandoned); + fzprintf(sftpError, abandoned); //FZ postmsg(&cf); return 0; } @@ -226,6 +218,61 @@ return 0; } +int askhk(void *frontend, const char *algname, const char *betteralgs, + void (*callback)(void *ctx, int result), void *ctx) +{ + /*static const char msg[] = + "The first host key type we have stored for this server\n" + "is %s, which is below the configured warning threshold.\n" + "The server also provides the following types of host key\n" + "above the threshold, which we do not have stored:\n" + "%s\n" + "Continue with connection? (y/n) ";*/ + static const char msg_batch[] = + "The first host key type we have stored for this server\n" + "is %s, which is below the configured warning threshold.\n" + "The server also provides the following types of host key\n" + "above the threshold, which we do not have stored:\n" + "%s\n" + "Connection abandoned.\n"; + static const char abandoned[] = "Connection abandoned."; + + char line[32]; +//FZ struct termios cf; + +//FZ premsg(&cf); + if (console_batch_mode) { + fprintf(stderr, msg_batch, algname, betteralgs); + return 0; + } + + fzprintf_raw(sftpAskHostkeyBetteralg, "%d%s\n%s\n", algname, betteralgs); + + { + struct termios oldmode, newmode; + tcgetattr(0, &oldmode); + newmode = oldmode; + newmode.c_lflag |= ISIG | ICANON; + tcsetattr(0, TCSANOW, &newmode); + line[0] = '\0'; + int ret; + do + { + ret = read(0, line, sizeof(line) - 1); + } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); + + tcsetattr(0, TCSANOW, &oldmode); + } + + if (line[0] == 'y' || line[0] == 'Y') { +//FZ postmsg(&cf); + return 1; + } else { + fzprintf(sftpError, abandoned); +//FZ postmsg(&cf); + return 0; + } +} /* * Ask whether to wipe a session log file before writing to it. * Returns 2 for wipe, 1 for append, 0 for cancel (don't log). @@ -384,13 +431,13 @@ */ /* We only print the `name' caption if we have to... */ if (p->name) - fzprintf_raw_untrusted(sftpRequestPreamble, p->name); + fzprintf_raw_untrusted(sftpRequestPreamble, "%s", p->name); else fzprintf_raw_untrusted(sftpRequestPreamble, ""); /* ...but we always print any `instruction'. */ if (p->instruction) - fzprintf_raw_untrusted(sftpRequestInstruction, p->instruction); + fzprintf_raw_untrusted(sftpRequestInstruction, "%s", p->instruction); else fzprintf_raw_untrusted(sftpRequestInstruction, ""); @@ -409,7 +456,7 @@ // newmode.c_lflag |= ECHO; tcsetattr(infd, TCSANOW, &newmode); - fzprintf_raw_untrusted(sftpRequest, "%d%s\n", (int)sftpReqPassword, pr->prompt); + fzprintf_raw_untrusted(sftpAskPassword, "%s", pr->prompt); len = 0; while (1) { diff -Nru filezilla-3.15.0.2/src/putty/unix/uxmisc.c filezilla-3.33.0/src/putty/unix/uxmisc.c --- filezilla-3.15.0.2/src/putty/unix/uxmisc.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/uxmisc.c 2017-09-19 21:36:39.000000000 +0000 @@ -322,3 +322,30 @@ return NULL; } + +char *make_dir_path(const char *path, mode_t mode) +{ + int pos = 0; + char *prefix; + + while (1) { + pos += strcspn(path + pos, "/"); + + if (pos > 0) { + prefix = dupprintf("%.*s", pos, path); + + if (mkdir(prefix, mode) < 0 && errno != EEXIST) { + char *ret = dupprintf("%s: mkdir: %s", + prefix, strerror(errno)); + sfree(prefix); + return ret; + } + + sfree(prefix); + } + + if (!path[pos]) + return NULL; + pos += strspn(path + pos, "/"); + } +} diff -Nru filezilla-3.15.0.2/src/putty/unix/uxnet.c filezilla-3.33.0/src/putty/unix/uxnet.c --- filezilla-3.15.0.2/src/putty/unix/uxnet.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/uxnet.c 2017-09-19 21:36:39.000000000 +0000 @@ -37,14 +37,12 @@ * Access to sockaddr types without breaking C strict aliasing rules. */ union sockaddr_union { -#ifdef NO_IPV6 - struct sockaddr_in storage; -#else struct sockaddr_storage storage; - struct sockaddr_in6 sin6; -#endif struct sockaddr sa; struct sockaddr_in sin; +#ifndef NO_IPV6 + struct sockaddr_in6 sin6; +#endif struct sockaddr_un su; }; @@ -348,6 +346,34 @@ } } +/* + * This constructs a SockAddr that points at one specific sub-address + * of a parent SockAddr. The returned SockAddr does not own all its + * own memory: it points into the old one's data structures, so it + * MUST NOT be used after the old one is freed, and it MUST NOT be + * passed to sk_addr_free. (The latter is why it's returned by value + * rather than dynamically allocated - that should clue in anyone + * writing a call to it that something is weird about it.) + */ +static struct SockAddr_tag sk_extractaddr_tmp( + SockAddr addr, const SockAddrStep *step) +{ + struct SockAddr_tag toret; + toret = *addr; /* structure copy */ + toret.refcount = 1; + + if (addr->superfamily == IP) { +#ifndef NO_IPV6 + toret.ais = step->ai; +#else + assert(SOCKADDR_FAMILY(addr, *step) == AF_INET); + toret.addresses += step->curraddr; +#endif + } + + return toret; +} + int sk_addr_needs_port(SockAddr addr) { if (addr->superfamily == UNRESOLVED || addr->superfamily == UNIX) { @@ -567,7 +593,11 @@ if (sock->s >= 0) close(sock->s); - plug_log(sock->plug, 0, sock->addr, sock->port, NULL, 0); + { + struct SockAddr_tag thisaddr = sk_extractaddr_tmp( + sock->addr, &sock->step); + plug_log(sock->plug, 0, &thisaddr, sock->port, NULL, 0); + } /* * Open socket. @@ -745,8 +775,11 @@ */ add234(sktree, sock); - if (err) - plug_log(sock->plug, 1, sock->addr, sock->port, strerror(err), err); + if (err) { + struct SockAddr_tag thisaddr = sk_extractaddr_tmp( + sock->addr, &sock->step); + plug_log(sock->plug, 1, &thisaddr, sock->port, strerror(err), err); + } return err; } @@ -1257,7 +1290,7 @@ uxsel_tell(s); } -static int net_select_result(int fd, int event) +static void net_select_result(int fd, int event) { int ret; char buf[20480]; /* nice big buffer for plenty of speed */ @@ -1268,7 +1301,7 @@ /* Find the Socket structure */ s = find234(sktree, &fd, cmpforsearch); if (!s) - return 1; /* boggle */ + return; /* boggle */ noise_ultralight(event); @@ -1285,9 +1318,9 @@ ret = recv(s->s, buf, toRecv, MSG_OOB); noise_ultralight(ret); if (ret <= 0) { - return plug_closing(s->plug, - ret == 0 ? "Internal networking trouble" : - strerror(errno), errno, 0); + plug_closing(s->plug, + ret == 0 ? "Internal networking trouble" : + strerror(errno), errno, 0); } else { UpdateQuota(0, ret); if (fz_timer_check(&s->recv_timer)) @@ -1301,7 +1334,7 @@ sk_addr_free(s->addr); s->addr = NULL; } - return plug_receive(s->plug, 2, buf, ret); + plug_receive(s->plug, 2, buf, ret); } break; } @@ -1374,25 +1407,11 @@ } } if (ret < 0) { - /* - * An error at this point _might_ be an error reported - * by a non-blocking connect(). So before we return a - * panic status to the user, let's just see whether - * that's the case. - */ - int err = errno; - if (s->addr) { - plug_log(s->plug, 1, s->addr, s->port, strerror(err), err); - while (s->addr && sk_nextaddr(s->addr, &s->step)) { - err = try_connect(s); - } - } - if (err != 0) - return plug_closing(s->plug, strerror(err), err, 0); + plug_closing(s->plug, strerror(errno), errno, 0); } else if (0 == ret) { s->incomingeof = TRUE; /* stop trying to read now */ uxsel_tell(s); - return plug_closing(s->plug, NULL, 0, 0); + plug_closing(s->plug, NULL, 0, 0); } else { UpdateQuota(0, ret); if (fz_timer_check(&s->recv_timer)) @@ -1406,18 +1425,59 @@ sk_addr_free(s->addr); s->addr = NULL; } - return plug_receive(s->plug, atmark ? 0 : 1, buf, ret); + plug_receive(s->plug, atmark ? 0 : 1, buf, ret); } break; case 2: /* writable */ if (!s->connected) { /* * select() reports a socket as _writable_ when an - * asynchronous connection is completed. + * asynchronous connect() attempt either completes or + * fails. So first we must find out which. */ + { + int err; + socklen_t errlen = sizeof(err); + char *errmsg = NULL; + if (getsockopt(s->s, SOL_SOCKET, SO_ERROR, &err, &errlen)<0) { + errmsg = dupprintf("getsockopt(SO_ERROR): %s", + strerror(errno)); + err = errno; /* got to put something in here */ + } else if (err != 0) { + errmsg = dupstr(strerror(err)); + } + if (errmsg) { + /* + * The asynchronous connection attempt failed. + * Report the problem via plug_log, and try again + * with the next candidate address, if we have + * more than one. + */ + struct SockAddr_tag thisaddr; + assert(s->addr); + + thisaddr = sk_extractaddr_tmp(s->addr, &s->step); + plug_log(s->plug, 1, &thisaddr, s->port, errmsg, err); + + while (err && s->addr && sk_nextaddr(s->addr, &s->step)) { + err = try_connect(s); + } + if (err) + plug_closing(s->plug, strerror(err), err, 0); + if (!s->connected) + return; /* another async attempt in progress */ + } + } + + /* + * If we get here, we've managed to make a connection. + */ + if (s->addr) { + sk_addr_free(s->addr); + s->addr = NULL; + } s->connected = s->writable = 1; uxsel_tell(s); - break; } else { int bufsize_before, bufsize_after; s->writable = 1; @@ -1429,8 +1489,6 @@ } break; } - - return 1; } /* @@ -1460,26 +1518,27 @@ static char *sk_tcp_peer_info(Socket sock) { Actual_Socket s = (Actual_Socket) sock; - struct sockaddr_storage addr; + union sockaddr_union addr; socklen_t addrlen = sizeof(addr); +#ifndef NO_IPV6 char buf[INET6_ADDRSTRLEN]; +#endif - if (getpeername(s->s, (struct sockaddr *)&addr, &addrlen) < 0) + if (getpeername(s->s, &addr.sa, &addrlen) < 0) return NULL; - if (addr.ss_family == AF_INET) { + if (addr.storage.ss_family == AF_INET) { return dupprintf ("%s:%d", - inet_ntoa(((struct sockaddr_in *)&addr)->sin_addr), - (int)ntohs(((struct sockaddr_in *)&addr)->sin_port)); + inet_ntoa(addr.sin.sin_addr), + (int)ntohs(addr.sin.sin_port)); #ifndef NO_IPV6 - } else if (addr.ss_family == AF_INET6) { + } else if (addr.storage.ss_family == AF_INET6) { return dupprintf ("[%s]:%d", - inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&addr)->sin6_addr, - buf, sizeof(buf)), - (int)ntohs(((struct sockaddr_in6 *)&addr)->sin6_port)); + inet_ntop(AF_INET6, &addr.sin6.sin6_addr, buf, sizeof(buf)), + (int)ntohs(addr.sin6.sin6_port)); #endif - } else if (addr.ss_family == AF_UNIX) { + } else if (addr.storage.ss_family == AF_UNIX) { /* * For Unix sockets, the source address is unlikely to be * helpful. Instead, we try SO_PEERCRED and try to get the @@ -1592,7 +1651,8 @@ if (n < 0) ret->error = "snprintf failed"; - else if (n >= sizeof ret->hostname) + else if (n >= sizeof ret->hostname || + n >= sizeof(((struct sockaddr_un *)0)->sun_path)) ret->error = "socket pathname too long"; #ifndef NO_IPV6 diff -Nru filezilla-3.15.0.2/src/putty/unix/uxproxy.c filezilla-3.33.0/src/putty/unix/uxproxy.c --- filezilla-3.15.0.2/src/putty/unix/uxproxy.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/uxproxy.c 2017-09-19 21:36:39.000000000 +0000 @@ -33,7 +33,7 @@ enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof; }; -static int localproxy_select_result(int fd, int event); +static void localproxy_select_result(int fd, int event); /* * Trees to look up the pipe fds in. @@ -149,10 +149,8 @@ bufchain_prefix(&ps->pending_output_data, &data, &len); ret = write(ps->to_cmd, data, len); if (ret < 0 && errno != EWOULDBLOCK) { - /* We're inside the Unix frontend here, so we know - * that the frontend handle is unnecessary. */ - logevent(NULL, strerror(errno)); - fatalbox("%s", strerror(errno)); + plug_closing(ps->plug, strerror(errno), errno, 0); + return 0; } else if (ret <= 0) { break; } else { @@ -231,7 +229,7 @@ return ps->error; } -static int localproxy_select_result(int fd, int event) +static void localproxy_select_result(int fd, int event) { Local_Proxy_Socket s; char buf[20480]; @@ -240,7 +238,7 @@ if (!(s = find234(localproxy_by_fromfd, &fd, localproxy_fromfd_find)) && !(s = find234(localproxy_by_fromfd, &fd, localproxy_errfd_find)) && !(s = find234(localproxy_by_tofd, &fd, localproxy_tofd_find)) ) - return 1; /* boggle */ + return; /* boggle */ if (event == 1) { if (fd == s->cmd_err) { @@ -251,21 +249,18 @@ assert(fd == s->from_cmd); ret = read(fd, buf, sizeof(buf)); if (ret < 0) { - return plug_closing(s->plug, strerror(errno), errno, 0); + plug_closing(s->plug, strerror(errno), errno, 0); } else if (ret == 0) { - return plug_closing(s->plug, NULL, 0, 0); + plug_closing(s->plug, NULL, 0, 0); } else { - return plug_receive(s->plug, 0, buf, ret); + plug_receive(s->plug, 0, buf, ret); } } } else if (event == 2) { assert(fd == s->to_cmd); if (localproxy_try_send(s)) plug_sent(s->plug, bufchain_size(&s->pending_output_data)); - return 1; } - - return 1; } Socket platform_new_connection(SockAddr addr, const char *hostname, diff -Nru filezilla-3.15.0.2/src/putty/unix/uxsel.c filezilla-3.33.0/src/putty/unix/uxsel.c --- filezilla-3.15.0.2/src/putty/unix/uxsel.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/uxsel.c 2017-09-19 21:36:39.000000000 +0000 @@ -111,7 +111,7 @@ return next_fd(state, rwx); } -int select_result(int fd, int event) +void select_result(int fd, int event) { struct fd *fdstruct = find234(fds, &fd, uxsel_fd_findcmp); /* @@ -120,7 +120,5 @@ * fd I've stopped being interested in. Sigh. */ if (fdstruct) - return fdstruct->callback(fd, event); - else - return 1; + fdstruct->callback(fd, event); } diff -Nru filezilla-3.15.0.2/src/putty/unix/uxsftp.c filezilla-3.33.0/src/putty/unix/uxsftp.c --- filezilla-3.15.0.2/src/putty/unix/uxsftp.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/uxsftp.c 2017-09-19 21:36:39.000000000 +0000 @@ -537,7 +537,9 @@ now = GETTICKCOUNT(); } while (ret < 0 && errno == EINTR); } else { - ret = select(maxfd, &rset, &wset, &xset, NULL); + do { + ret = select(maxfd, &rset, &wset, &xset, NULL); + } while (ret < 0 && errno == EINTR); } } while (ret == 0); @@ -617,6 +619,10 @@ void frontend_net_error_pending(void) {} +void platform_psftp_pre_conn_setup(void) {} + +const int buildinfo_gtk_relevant = FALSE; + /* * Main program: do platform-specific initialisation and then call * psftp_main(). diff -Nru filezilla-3.15.0.2/src/putty/unix/uxstore.c filezilla-3.33.0/src/putty/unix/uxstore.c --- filezilla-3.15.0.2/src/putty/unix/uxstore.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/unix/uxstore.c 2017-09-19 21:36:39.000000000 +0000 @@ -98,17 +98,78 @@ */ if (index == INDEX_DIR) { struct passwd *pwd; + char *xdg_dir, *old_dir, *old_dir2, *old_dir3, *home, *pwd_home; env = getenv("PUTTYDIR"); if (env) return dupstr(env); - env = getenv("HOME"); - if (env) - return dupprintf("%s/.putty", env); + + home = getenv("HOME"); pwd = getpwuid(getuid()); - if (pwd && pwd->pw_dir) - return dupprintf("%s/.putty", pwd->pw_dir); - return dupstr("/.putty"); + if (pwd && pwd->pw_dir) { + pwd_home = pwd->pw_dir; + } else { + pwd_home = NULL; + } + + xdg_dir = NULL; + env = getenv("XDG_CONFIG_HOME"); + if (env && *env) { + xdg_dir = dupprintf("%s/putty", env); + } + if (!xdg_dir) { + if (home) { + tmp = home; + } else if (pwd_home) { + tmp = pwd_home; + } else { + tmp = ""; + } + xdg_dir = dupprintf("%s/.config/putty", tmp); + } + if (xdg_dir && access(xdg_dir, F_OK) == 0) { + return xdg_dir; + } + + old_dir = old_dir2 = old_dir3 = NULL; + if (home) { + old_dir = dupprintf("%s/.putty", home); + } + if (pwd_home) { + old_dir2 = dupprintf("%s/.putty", pwd_home); + } + old_dir3 = dupstr("/.putty"); + + if (old_dir && access(old_dir, F_OK) == 0) { + ret = old_dir; + goto out; + } + if (old_dir2 && access(old_dir2, F_OK) == 0) { + ret = old_dir2; + goto out; + } + if (access(old_dir3, F_OK) == 0) { + ret = old_dir3; + goto out; + } +#ifdef XDG_DEFAULT + if (xdg_dir) { + ret = xdg_dir; + goto out; + } +#endif + ret = old_dir ? old_dir : (old_dir2 ? old_dir2 : old_dir3); + + out: + if (ret != old_dir) + sfree(old_dir); + if (ret != old_dir2) + sfree(old_dir2); + if (ret != old_dir3) + sfree(old_dir3); + if (ret != xdg_dir) + sfree(xdg_dir); + return ret; } if (index == INDEX_SESSIONDIR) { env = getenv("PUTTYSESSIONS"); @@ -159,7 +220,7 @@ void *open_settings_w(const char *sessionname, char **errmsg) { - char *filename; + char *filename, *err; FILE *fp; *errmsg = NULL; @@ -169,18 +230,18 @@ * subdir actually exist. */ filename = make_filename(INDEX_DIR, NULL); - if (mkdir(filename, 0700) < 0 && errno != EEXIST) { - *errmsg = dupprintf("Unable to save session: mkdir(\"%s\") " - "returned '%s'", filename, strerror(errno)); + if ((err = make_dir_path(filename, 0700)) != NULL) { + *errmsg = dupprintf("Unable to save session: %s", err); + sfree(err); sfree(filename); return NULL; } sfree(filename); filename = make_filename(INDEX_SESSIONDIR, NULL); - if (mkdir(filename, 0700) < 0 && errno != EEXIST) { - *errmsg = dupprintf("Unable to save session: mkdir(\"%s\") " - "returned '%s'", filename, strerror(errno)); + if ((err = make_dir_path(filename, 0700)) != NULL) { + *errmsg = dupprintf("Unable to save session: %s", err); + sfree(err); sfree(filename); return NULL; } @@ -613,12 +674,12 @@ tmpfilename = make_filename(INDEX_HOSTKEYS_TMP, NULL); wfp = fopen(tmpfilename, "w"); if (!wfp && errno == ENOENT) { - char *dir; + char *dir, *errmsg; dir = make_filename(INDEX_DIR, NULL); - if (mkdir(dir, 0700) < 0) { - nonfatal("Unable to store host key: mkdir(\"%s\") " - "returned '%s'", dir, strerror(errno)); + if ((errmsg = make_dir_path(dir, 0700)) != NULL) { + nonfatal("Unable to store host key: %s", errmsg); + sfree(errmsg); sfree(dir); sfree(tmpfilename); return; @@ -706,12 +767,12 @@ sfree(fname); return; } - char *dir; + char *dir, *errmsg; dir = make_filename(INDEX_DIR, NULL); - if (mkdir(dir, 0700) < 0) { - nonfatal("Unable to write random seed: mkdir(\"%s\") " - "returned '%s'", dir, strerror(errno)); + if ((errmsg = make_dir_path(dir, 0700)) != NULL) { + nonfatal("Unable to write random seed: %s", errmsg); + sfree(errmsg); sfree(fname); sfree(dir); return; diff -Nru filezilla-3.15.0.2/src/putty/version.c filezilla-3.33.0/src/putty/version.c --- filezilla-3.15.0.2/src/putty/version.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/version.c 2017-09-19 21:36:39.000000000 +0000 @@ -2,38 +2,17 @@ * PuTTY version numbering */ -#define STR1(x) #x -#define STR(x) STR1(x) - -#if defined SNAPSHOT - -#if defined SVN_REV -#define SNAPSHOT_TEXT STR(SNAPSHOT) ":r" STR(SVN_REV) +#ifdef HAVE_CONFIG_H +#include "config.h" +const char ver[] = "FileZilla" PACKAGE_VERSION; +const char sshver[] = "FileZilla-" PACKAGE_VERSION; #else -#define SNAPSHOT_TEXT STR(SNAPSHOT) +const char ver[] = "FileZilla"; +const char sshver[] = "FileZilla-custom"; #endif -char ver[] = "Development snapshot " SNAPSHOT_TEXT; -char sshver[] = "PuTTY-Snapshot-" SNAPSHOT_TEXT; - -#undef SNAPSHOT_TEXT - -#elif defined RELEASE - -char ver[] = "Release " STR(RELEASE); -char sshver[] = "PuTTY-Release-" STR(RELEASE); - -#elif defined SVN_REV -char ver[] = "Custom build r" STR(SVN_REV) ", " __DATE__ " " __TIME__; -char sshver[] = "PuTTY-Custom-r" STR(SVN_REV); - -#else - -char ver[] = "Unidentified build, " __DATE__ " " __TIME__; -char sshver[] = "PuTTY-Local: " __DATE__ " " __TIME__; - -#endif +const char commitid[] = "unavailable"; /* * SSH local version string MUST be under 40 characters. Here's a diff -Nru filezilla-3.15.0.2/src/putty/windows/Makefile.am filezilla-3.33.0/src/putty/windows/Makefile.am --- filezilla-3.15.0.2/src/putty/windows/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/Makefile.am 2018-01-03 04:30:05.000000000 +0000 @@ -3,8 +3,8 @@ AM_CPPFLAGS = -I$(srcdir)/.. COMMON_CFLAGS = $(AM_CFLAGS) -D_WINDOWS -DSECURITY_WIN32 \ - -D_WIN32_IE=0x0700 \ - -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 + -D_WIN32_IE=0x0900 \ + -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 $(NETTLE_CFLAGS) libfzputtycommon_win_a_CFLAGS = $(COMMON_CFLAGS) diff -Nru filezilla-3.15.0.2/src/putty/windows/Makefile.in filezilla-3.33.0/src/putty/windows/Makefile.in --- filezilla-3.15.0.2/src/putty/windows/Makefile.in 2016-02-10 19:38:52.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,17 +91,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/putty/windows -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(dist_noinst_DATA) \ - $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -103,6 +113,8 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(noinst_HEADERS) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -203,6 +215,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -214,11 +227,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -242,6 +255,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -262,16 +277,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -323,6 +346,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -362,6 +386,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -376,8 +401,8 @@ noinst_LIBRARIES = libfzsftp_win.a libfzputtycommon_win.a AM_CPPFLAGS = -I$(srcdir)/.. COMMON_CFLAGS = $(AM_CFLAGS) -D_WINDOWS -DSECURITY_WIN32 \ - -D_WIN32_IE=0x0700 \ - -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 + -D_WIN32_IE=0x0900 \ + -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 $(NETTLE_CFLAGS) libfzputtycommon_win_a_CFLAGS = $(COMMON_CFLAGS) libfzputtycommon_win_a_SOURCES = wincons.c \ @@ -420,7 +445,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/putty/windows/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/putty/windows/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -930,6 +954,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + @USE_RESOURCEFILE_TRUE@psftp.o: $(srcdir)/psftp.rc $(srcdir)/windows_manifest.xml @USE_RESOURCEFILE_TRUE@ @if [ -f $@~ ]; then rm $@~; fi diff -Nru filezilla-3.15.0.2/src/putty/windows/version.rc2 filezilla-3.33.0/src/putty/windows/version.rc2 --- filezilla-3.15.0.2/src/putty/windows/version.rc2 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/version.rc2 2018-01-03 04:30:05.000000000 +0000 @@ -102,7 +102,7 @@ VALUE "OriginalFilename", APPNAME VALUE "FileVersion", VERSION_TEXT VALUE "ProductVersion", VERSION_TEXT - VALUE "LegalCopyright", "Copyright \251 2004-2016 Tim Kosse, 1997-2016 Simon Tatham." + VALUE "LegalCopyright", "Copyright \251 2004-2018 Tim Kosse, 1997-2018 Simon Tatham." #if (!defined SNAPSHOT) && (!defined RELEASE) /* Only if VS_FF_PRIVATEBUILD. */ VALUE "PrivateBuild", VERSION_TEXT /* NBI */ diff -Nru filezilla-3.15.0.2/src/putty/windows/wincapi.c filezilla-3.33.0/src/putty/windows/wincapi.c --- filezilla-3.15.0.2/src/putty/windows/wincapi.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/wincapi.c 2017-07-16 10:29:48.000000000 +0000 @@ -19,7 +19,14 @@ attempted = TRUE; crypt = load_system32_dll("crypt32.dll"); successful = crypt && - GET_WINDOWS_FUNCTION(crypt, CryptProtectMemory); +#ifdef COVERITY + /* The build toolchain I use with Coverity doesn't know + * about this function, so can't type-check it */ + GET_WINDOWS_FUNCTION_NO_TYPECHECK(crypt, CryptProtectMemory) +#else + GET_WINDOWS_FUNCTION(crypt, CryptProtectMemory) +#endif + ; } return successful; } diff -Nru filezilla-3.15.0.2/src/putty/windows/wincons.c filezilla-3.33.0/src/putty/windows/wincons.c --- filezilla-3.15.0.2/src/putty/windows/wincons.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/wincons.c 2017-09-19 21:36:39.000000000 +0000 @@ -72,8 +72,7 @@ "adding the key to the cache, enter \"n\".\n" "If you do not trust this host, press Return to abandon the\n" "connection.\n" - "Store key in cache? (y/n) ";*/ - + "Store key in cache? (y/n) "; static const char wrongmsg_batch[] = "WARNING - POTENTIAL SECURITY BREACH!\n" "The server's host key does not match the one PuTTY has\n" @@ -84,7 +83,7 @@ "The new %s key fingerprint is:\n" "%s\n" "Connection abandoned.\n"; - /*static const char wrongmsg[] = + static const char wrongmsg[] = "WARNING - POTENTIAL SECURITY BREACH!\n" "The server's host key does not match the one PuTTY has\n" "cached in the registry. This means that either the\n" @@ -114,16 +113,8 @@ if (ret == 0) /* success - key matched OK */ return 1; - if (ret == 2) { /* key was different */ - if (console_batch_mode) { - fprintf(stderr, wrongmsg_batch, keytype, fingerprint); - return 0; - } - fzprintf_raw(sftpRequest, "%d%s\n%d\n%s\n", (int)sftpReqHostkeyChanged, host, port, fingerprint); - } - if (ret == 1) { /* key was absent */ - fzprintf_raw(sftpRequest, "%d%s\n%d\n%s\n", (int)sftpReqHostkey, host, port, fingerprint); - } + fzprintf_raw((ret == 1) ? sftpAskHostkey : sftpAskHostkeyChanged, "%s\n%d\n", host, port); + line[0] = '\0'; /* fail safe if ReadFile returns no data */ hin = GetStdHandle(STD_INPUT_HANDLE); GetConsoleMode(hin, &savemode); @@ -157,6 +148,52 @@ return 0; } +int askhk(void *frontend, const char *algname, const char *betteralgs, + void (*callback)(void *ctx, int result), void *ctx) +{ + HANDLE hin; + DWORD savemode, i; + + /*static const char msg[] = + "The first host key type we have stored for this server\n" + "is %s, which is below the configured warning threshold.\n" + "The server also provides the following types of host key\n" + "above the threshold, which we do not have stored:\n" + "%s\n" + "Continue with connection? (y/n) ";*/ + static const char msg_batch[] = + "The first host key type we have stored for this server\n" + "is %s, which is below the configured warning threshold.\n" + "The server also provides the following types of host key\n" + "above the threshold, which we do not have stored:\n" + "%s\n" + "Connection abandoned.\n"; + static const char abandoned[] = "Connection abandoned."; + + char line[32]; + + if (console_batch_mode) { + fprintf(stderr, msg_batch, algname, betteralgs); + return 0; + } + + fzprintf_raw(sftpAskHostkeyBetteralg, "%s\n%s\n", algname, betteralgs); + + hin = GetStdHandle(STD_INPUT_HANDLE); + GetConsoleMode(hin, &savemode); + SetConsoleMode(hin, (savemode | + ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT)); + ReadFile(hin, line, sizeof(line) - 1, &i, NULL); + SetConsoleMode(hin, savemode); + + if (line[0] == 'y' || line[0] == 'Y') { + return 1; + } else { + fzprintf(sftpError, abandoned); + return 0; + } +} + /* * Ask whether to wipe a session log file before writing to it. * Returns 2 for wipe, 1 for append, 0 for cancel (don't log). @@ -313,13 +350,13 @@ */ /* We only print the `name' caption if we have to... */ if (p->name) - fzprintf_raw_untrusted(sftpRequestPreamble, p->name); + fzprintf_raw_untrusted(sftpRequestPreamble, "%s", p->name); else fzprintf_raw_untrusted(sftpRequestPreamble, ""); /* ...but we always print any `instruction'. */ if (p->instruction) - fzprintf_raw_untrusted(sftpRequestInstruction, p->instruction); + fzprintf_raw_untrusted(sftpRequestInstruction, "%s", p->instruction); else fzprintf_raw_untrusted(sftpRequestInstruction, ""); @@ -337,7 +374,7 @@ // newmode |= ENABLE_ECHO_INPUT; SetConsoleMode(hin, newmode); - fzprintf_raw_untrusted(sftpRequest, "%d%s\n", (int)sftpReqPassword, pr->prompt); + fzprintf_raw_untrusted(sftpAskPassword, "%s", pr->prompt); len = 0; while (1) { diff -Nru filezilla-3.15.0.2/src/putty/windows/windows_manifest.xml filezilla-3.33.0/src/putty/windows/windows_manifest.xml --- filezilla-3.15.0.2/src/putty/windows/windows_manifest.xml 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/windows_manifest.xml 2018-01-03 04:30:05.000000000 +0000 @@ -1,38 +1,33 @@ FileZilla FTP client - - - - - - - + + + + + + + - - diff -Nru filezilla-3.15.0.2/src/putty/windows/winhandl.c filezilla-3.33.0/src/putty/windows/winhandl.c --- filezilla-3.15.0.2/src/putty/windows/winhandl.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winhandl.c 2017-09-19 21:36:39.000000000 +0000 @@ -533,7 +533,7 @@ * direction! */ assert(h->type == HT_OUTPUT); - if (!h->u.o.outgoingeof == EOF_NO) { + if (h->u.o.outgoingeof == EOF_NO) { h->u.o.outgoingeof = EOF_PENDING; handle_try_output(&h->u.o); } diff -Nru filezilla-3.15.0.2/src/putty/windows/winhsock.c filezilla-3.33.0/src/putty/windows/winhsock.c --- filezilla-3.15.0.2/src/putty/windows/winhsock.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winhsock.c 2017-07-16 10:29:48.000000000 +0000 @@ -42,6 +42,8 @@ /* Data received from stderr_H, if we have one. */ bufchain stderrdata; + int defer_close, deferred_close; /* in case of re-entrance */ + char *error; Plug plug; @@ -52,12 +54,13 @@ Handle_Socket ps = (Handle_Socket) handle_get_privdata(h); if (len < 0) { - return plug_closing(ps->plug, "Read error from handle", - 0, 0); + plug_closing(ps->plug, "Read error from handle", 0, 0); + return 0; } else if (len == 0) { - return plug_closing(ps->plug, NULL, 0, 0); + plug_closing(ps->plug, NULL, 0, 0); + return 0; } else { - assert(ps->frozen != FREEZING && ps->frozen != THAWING); + assert(ps->frozen != FROZEN && ps->frozen != THAWING); if (ps->frozen == FREEZING) { /* * If we've received data while this socket is supposed to @@ -66,6 +69,7 @@ * the data for when we unfreeze. */ bufchain_add(&ps->inputdata, data, len); + ps->frozen = FROZEN; /* * And return a very large backlog, to prevent further @@ -73,7 +77,8 @@ */ return INT_MAX; } else { - return plug_receive(ps->plug, 0, data, len); + plug_receive(ps->plug, 0, data, len); + return 0; } } } @@ -91,7 +96,15 @@ static void handle_sentdata(struct handle *h, int new_backlog) { Handle_Socket ps = (Handle_Socket) handle_get_privdata(h); - + + if (new_backlog < 0) { + /* Special case: this is actually reporting an error writing + * to the underlying handle, and our input value is the error + * code itself, negated. */ + plug_closing(ps->plug, win_strerror(-new_backlog), -new_backlog, 0); + return; + } + plug_sent(ps->plug, new_backlog); } @@ -108,6 +121,11 @@ { Handle_Socket ps = (Handle_Socket) s; + if (ps->defer_close) { + ps->deferred_close = TRUE; + return; + } + handle_free(ps->send_h); handle_free(ps->recv_h); CloseHandle(ps->send_H); @@ -152,7 +170,7 @@ { Handle_Socket ps = (Handle_Socket) psv; void *data; - int len, new_backlog; + int len; /* * If we've been put into a state other than THAWING since the @@ -168,9 +186,17 @@ assert(len > 0); /* - * Hand it off to the plug. + * Hand it off to the plug. Be careful of re-entrance - that might + * have the effect of trying to close this socket. */ - new_backlog = plug_receive(ps->plug, 0, data, len); + ps->defer_close = TRUE; + plug_receive(ps->plug, 0, data, len); + bufchain_consume(&ps->inputdata, len); + ps->defer_close = FALSE; + if (ps->deferred_close) { + sk_handle_close(ps); + return; + } if (bufchain_size(&ps->inputdata) > 0) { /* @@ -183,7 +209,7 @@ * Otherwise, we've successfully thawed! */ ps->frozen = UNFROZEN; - handle_unthrottle(ps->recv_h, new_backlog); + handle_unthrottle(ps->recv_h, 0); } } @@ -258,7 +284,17 @@ if (!kernel32_module) { kernel32_module = load_system32_dll("kernel32.dll"); - GET_WINDOWS_FUNCTION(kernel32_module, GetNamedPipeClientProcessId); +#if (defined _MSC_VER && _MSC_VER < 1900) || defined __MINGW32__ || defined COVERITY + /* For older Visual Studio, and MinGW too (at least as of + * Ubuntu 16.04), this function isn't available in the header + * files to type-check. Ditto the toolchain I use for + * Coveritying the Windows code. */ + GET_WINDOWS_FUNCTION_NO_TYPECHECK( + kernel32_module, GetNamedPipeClientProcessId); +#else + GET_WINDOWS_FUNCTION( + kernel32_module, GetNamedPipeClientProcessId); +#endif } /* @@ -308,5 +344,7 @@ ret->stderr_h = handle_input_new(ret->stderr_H, handle_stderr, ret, flags); + ret->defer_close = ret->deferred_close = FALSE; + return (Socket) ret; } diff -Nru filezilla-3.15.0.2/src/putty/windows/winmisc.c filezilla-3.33.0/src/putty/windows/winmisc.c --- filezilla-3.15.0.2/src/putty/windows/winmisc.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winmisc.c 2017-09-19 21:36:39.000000000 +0000 @@ -102,6 +102,11 @@ if (!tried_usernameex) { /* Not available on Win9x, so load dynamically */ HMODULE secur32 = load_system32_dll("secur32.dll"); + /* If MIT Kerberos is installed, the following call to + GET_WINDOWS_FUNCTION makes Windows implicitly load + sspicli.dll WITHOUT proper path sanitizing, so better + load it properly before */ + HMODULE sspicli = load_system32_dll("sspicli.dll"); GET_WINDOWS_FUNCTION(secur32, GetUserNameExA); tried_usernameex = TRUE; } @@ -150,6 +155,49 @@ return got_username ? user : NULL; } +void dll_hijacking_protection(void) +{ + /* + * If the OS provides it, call SetDefaultDllDirectories() to + * prevent DLLs from being loaded from the directory containing + * our own binary, and instead only load from system32. + * + * This is a protection against hijacking attacks, if someone runs + * PuTTY directly from their web browser's download directory + * having previously been enticed into clicking on an unwise link + * that downloaded a malicious DLL to the same directory under one + * of various magic names that seem to be things that standard + * Windows DLLs delegate to. + * + * It shouldn't break deliberate loading of user-provided DLLs + * such as GSSAPI providers, because those are specified by their + * full pathname by the user-provided configuration. + */ + static HMODULE kernel32_module; + DECL_WINDOWS_FUNCTION(static, BOOL, SetDefaultDllDirectories, (DWORD)); + + if (!kernel32_module) { + kernel32_module = load_system32_dll("kernel32.dll"); +#if (defined _MSC_VER && _MSC_VER < 1900) || defined COVERITY + /* For older Visual Studio, and also for the system I + * currently use for Coveritying the Windows code, this + * function isn't available in the header files to + * type-check */ + GET_WINDOWS_FUNCTION_NO_TYPECHECK( + kernel32_module, SetDefaultDllDirectories); +#else + GET_WINDOWS_FUNCTION(kernel32_module, SetDefaultDllDirectories); +#endif + } + + if (p_SetDefaultDllDirectories) { + /* LOAD_LIBRARY_SEARCH_SYSTEM32 and explicitly specified + * directories only */ + p_SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_USER_DIRS); + } +} + BOOL init_winver(void) { ZeroMemory(&osVersion, sizeof(osVersion)); diff -Nru filezilla-3.15.0.2/src/putty/windows/winnet.c filezilla-3.33.0/src/putty/windows/winnet.c --- filezilla-3.15.0.2/src/putty/windows/winnet.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winnet.c 2017-09-19 21:36:39.000000000 +0000 @@ -5,11 +5,15 @@ * unfix.org. */ +#include /* need to put this first, for winelib builds */ + #include #include #include #define DEFINE_PLUG_METHOD_MACROS +#define NEED_DECLARATION_OF_SELECT /* in order to initialise it */ + #include "putty.h" #include "network.h" #include "tree234.h" @@ -17,8 +21,15 @@ #include #ifndef NO_IPV6 +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wmissing-braces" +#endif const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; +#ifdef __clang__ +#pragma clang diagnostic pop +#endif #endif #define ipv4_is_loopback(addr) \ @@ -232,6 +243,13 @@ return TRUE; } +/* Actually define this function pointer, which won't have been + * defined alongside all the others by PUTTY_DO_GLOBALS because of the + * annoying winelib header-ordering issue. (See comment in winstuff.h.) */ +DECL_WINDOWS_FUNCTION(/* empty */, int, select, + (int, fd_set FAR *, fd_set FAR *, + fd_set FAR *, const struct timeval FAR *)); + void sk_init(void) { #ifndef NO_IPV6 @@ -253,7 +271,10 @@ GET_WINDOWS_FUNCTION(winsock_module, getaddrinfo); GET_WINDOWS_FUNCTION(winsock_module, freeaddrinfo); GET_WINDOWS_FUNCTION(winsock_module, getnameinfo); - GET_WINDOWS_FUNCTION(winsock_module, gai_strerror); + /* This function would fail its type-check if we did one, + * because the VS header file provides an inline definition + * which is __cdecl instead of WINAPI. */ + GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, gai_strerror); } else { /* Fall back to wship6.dll for Windows 2000 */ wship6_module = load_system32_dll("wship6.dll"); @@ -264,7 +285,8 @@ GET_WINDOWS_FUNCTION(wship6_module, getaddrinfo); GET_WINDOWS_FUNCTION(wship6_module, freeaddrinfo); GET_WINDOWS_FUNCTION(wship6_module, getnameinfo); - GET_WINDOWS_FUNCTION(wship6_module, gai_strerror); + /* See comment above about type check */ + GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, gai_strerror); } else { #ifdef NET_SETUP_DIAGNOSTICS logevent(NULL, "No IPv6 support detected"); @@ -286,16 +308,32 @@ GET_WINDOWS_FUNCTION(winsock_module, WSAStartup); GET_WINDOWS_FUNCTION(winsock_module, WSACleanup); GET_WINDOWS_FUNCTION(winsock_module, closesocket); +#ifndef COVERITY GET_WINDOWS_FUNCTION(winsock_module, ntohl); GET_WINDOWS_FUNCTION(winsock_module, htonl); GET_WINDOWS_FUNCTION(winsock_module, htons); GET_WINDOWS_FUNCTION(winsock_module, ntohs); GET_WINDOWS_FUNCTION(winsock_module, gethostname); +#else + /* The toolchain I use for Windows Coverity builds doesn't know + * the type signatures of these */ + GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, ntohl); + GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, htonl); + GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, htons); + GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, ntohs); + GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, gethostname); +#endif GET_WINDOWS_FUNCTION(winsock_module, gethostbyname); GET_WINDOWS_FUNCTION(winsock_module, getservbyname); GET_WINDOWS_FUNCTION(winsock_module, inet_addr); GET_WINDOWS_FUNCTION(winsock_module, inet_ntoa); +#if (defined _MSC_VER && _MSC_VER < 1900) || defined __MINGW32__ + /* Older Visual Studio, and MinGW as of Ubuntu 16.04, don't know + * about this function at all, so can't type-check it */ + GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, inet_ntop); +#else GET_WINDOWS_FUNCTION(winsock_module, inet_ntop); +#endif GET_WINDOWS_FUNCTION(winsock_module, connect); GET_WINDOWS_FUNCTION(winsock_module, bind); GET_WINDOWS_FUNCTION(winsock_module, setsockopt); @@ -523,7 +561,7 @@ if ((a = p_inet_addr(host)) == (unsigned long) INADDR_NONE) { struct hostent *h = NULL; - int err; + int err = 0; #ifndef NO_IPV6 /* * Use getaddrinfo when it's available @@ -707,6 +745,35 @@ } } +/* + * This constructs a SockAddr that points at one specific sub-address + * of a parent SockAddr. The returned SockAddr does not own all its + * own memory: it points into the old one's data structures, so it + * MUST NOT be used after the old one is freed, and it MUST NOT be + * passed to sk_addr_free. (The latter is why it's returned by value + * rather than dynamically allocated - that should clue in anyone + * writing a call to it that something is weird about it.) + */ +static struct SockAddr_tag sk_extractaddr_tmp( + SockAddr addr, const SockAddrStep *step) +{ + struct SockAddr_tag toret; + toret = *addr; /* structure copy */ + toret.refcount = 1; + +#ifndef NO_IPV6 + toret.ais = step->ai; +#endif + if (SOCKADDR_FAMILY(addr, *step) == AF_INET +#ifndef NO_IPV6 + && !toret.ais +#endif + ) + toret.addresses += step->curraddr; + + return toret; +} + int sk_addr_needs_port(SockAddr addr) { return addr->namedpipe ? FALSE : TRUE; @@ -730,6 +797,8 @@ SOCKET s = p_socket(AF_INET, SOCK_DGRAM, 0); DWORD retbytes; + SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0); + if (p_WSAIoctl && p_WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, local_interfaces, sizeof(local_interfaces), @@ -952,7 +1021,11 @@ p_closesocket(sock->s); } - plug_log(sock->plug, 0, sock->addr, sock->port, NULL, 0); + { + struct SockAddr_tag thisaddr = sk_extractaddr_tmp( + sock->addr, &sock->step); + plug_log(sock->plug, 0, &thisaddr, sock->port, NULL, 0); + } /* * Open socket. @@ -976,6 +1049,8 @@ goto ret; } + SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0); + if (sock->oobinline) { BOOL b = TRUE; p_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (void *) &b, sizeof(b)); @@ -998,11 +1073,6 @@ p_setsockopt(s, SOL_SOCKET, SO_RCVBUF, (const char*)&size_read, sizeof(size_read)); } - { - int size_write = 262144; - p_setsockopt(s, SOL_SOCKET, SO_SNDBUF, (const char*)&size_write, sizeof(size_write)); - } - /* * Bind to local address. */ @@ -1131,8 +1201,11 @@ */ add234(sktree, sock); - if (err) - plug_log(sock->plug, 1, sock->addr, sock->port, sock->error, err); + if (err) { + struct SockAddr_tag thisaddr = sk_extractaddr_tmp( + sock->addr, &sock->step); + plug_log(sock->plug, 1, &thisaddr, sock->port, sock->error, err); + } return err; } @@ -1270,6 +1343,8 @@ return (Socket) ret; } + SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0); + ret->oobinline = 0; p_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on)); @@ -1434,6 +1509,20 @@ s->pending_error, 0); } +static void update_tcp_send_buffer_size(SOCKET s) +{ + ULONG v = 0; + DWORD outlen = 0; + +#ifndef SIO_IDEAL_SEND_BACKLOG_QUERY +#define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b +#endif + + if (!p_WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, 0, 0, &v, sizeof(v), &outlen, 0, 0)) { + p_setsockopt(s, SOL_SOCKET, SO_SNDBUF, (const char*)&v, sizeof(v)); + } +} + /* * The function which tries to send on a socket once it's deemed * writable. @@ -1495,8 +1584,10 @@ } } else { UpdateQuota(1, nsent); - if (fz_timer_check(&s->send_timer)) + if (fz_timer_check(&s->send_timer)) { + update_tcp_send_buffer_size(s->s); fznotify(sftpSend); + } if (s->sending_oob) { if (nsent < len) { memmove(s->oobdata, s->oobdata+nsent, len-nsent); @@ -1581,9 +1672,9 @@ try_send(s); } -int select_result(WPARAM wParam, LPARAM lParam) +void select_result(WPARAM wParam, LPARAM lParam) { - int ret, open, toRecv; + int ret, toRecv; DWORD err; char buf[20480]; /* nice big buffer for plenty of speed */ Actual_Socket s; @@ -1592,11 +1683,11 @@ /* wParam is the socket itself */ if (wParam == 0) - return 1; /* boggle */ + return; /* boggle */ s = find234(sktree, (void *) wParam, cmpforsearch); if (!s) - return 1; /* boggle */ + return; /* boggle */ if ((err = WSAGETSELECTERROR(lParam)) != 0) { /* @@ -1604,16 +1695,17 @@ * plug. */ if (s->addr) { - plug_log(s->plug, 1, s->addr, s->port, + struct SockAddr_tag thisaddr = sk_extractaddr_tmp( + s->addr, &s->step); + plug_log(s->plug, 1, &thisaddr, s->port, winsock_error_string(err), err); - while (s->addr && sk_nextaddr(s->addr, &s->step)) { + while (err && s->addr && sk_nextaddr(s->addr, &s->step)) { err = try_connect(s); } } if (err != 0) - return plug_closing(s->plug, winsock_error_string(err), err, 0); - else - return 1; + plug_closing(s->plug, winsock_error_string(err), err, 0); + return; } noise_ultralight(lParam); @@ -1667,15 +1759,14 @@ } } if (ret < 0) { - return plug_closing(s->plug, winsock_error_string(err), err, - 0); + plug_closing(s->plug, winsock_error_string(err), err, 0); } else if (0 == ret) { - return plug_closing(s->plug, NULL, 0, 0); + plug_closing(s->plug, NULL, 0, 0); } else { UpdateQuota(0, ret); if (fz_timer_check(&s->recv_timer)) fznotify(sftpRecv); - return plug_receive(s->plug, atmark ? 0 : 1, buf, ret); + plug_receive(s->plug, atmark ? 0 : 1, buf, ret); } break; case FD_OOB: @@ -1699,7 +1790,7 @@ UpdateQuota(0, ret); if (fz_timer_check(&s->recv_timer)) fznotify(sftpRecv); - return plug_receive(s->plug, 2, buf, ret); + plug_receive(s->plug, 2, buf, ret); } break; case FD_WRITE: @@ -1715,25 +1806,23 @@ break; case FD_CLOSE: /* Signal a close on the socket. First read any outstanding data. */ - open = 1; do { ret = p_recv(s->s, buf, sizeof(buf), 0); if (ret < 0) { err = p_WSAGetLastError(); if (err == WSAEWOULDBLOCK) break; - return plug_closing(s->plug, winsock_error_string(err), - err, 0); + plug_closing(s->plug, winsock_error_string(err), err, 0); } else { if (ret) { fznotify(sftpRecv); - open &= plug_receive(s->plug, 0, buf, ret); + plug_receive(s->plug, 0, buf, ret); } else - open &= plug_closing(s->plug, NULL, 0, 0); + plug_closing(s->plug, NULL, 0, 0); } } while (ret > 0); - return open; + return; case FD_ACCEPT: { #ifdef NO_IPV6 @@ -1771,8 +1860,6 @@ } } } - - return 1; } /* @@ -1797,9 +1884,9 @@ struct sockaddr_in addr; #else struct sockaddr_storage addr; + char buf[INET6_ADDRSTRLEN]; #endif int addrlen = sizeof(addr); - char buf[INET6_ADDRSTRLEN]; if (p_getpeername(s->s, (struct sockaddr *)&addr, &addrlen) < 0) return NULL; diff -Nru filezilla-3.15.0.2/src/putty/windows/winnpc.c filezilla-3.33.0/src/putty/windows/winnpc.c --- filezilla-3.15.0.2/src/putty/windows/winnpc.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winnpc.c 2016-03-16 08:42:27.000000000 +0000 @@ -79,7 +79,6 @@ ret = new_error_socket(err, plug); sfree(err); CloseHandle(pipehandle); - sfree(usersid); return ret; } @@ -89,12 +88,10 @@ sfree(err); CloseHandle(pipehandle); LocalFree(psd); - sfree(usersid); return ret; } LocalFree(psd); - sfree(usersid); return make_handle_socket(pipehandle, pipehandle, NULL, plug, TRUE); } diff -Nru filezilla-3.15.0.2/src/putty/windows/winpgntc.c filezilla-3.33.0/src/putty/windows/winpgntc.c --- filezilla-3.15.0.2/src/putty/windows/winpgntc.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winpgntc.c 2017-09-19 21:36:39.000000000 +0000 @@ -4,15 +4,16 @@ #include #include +#include #include "putty.h" +#include "pageant.h" /* for AGENT_MAX_MSGLEN */ #ifndef NO_SECURITY #include "winsecur.h" #endif #define AGENT_COPYDATA_ID 0x804e50ba /* random goop */ -#define AGENT_MAX_MSGLEN 8192 int agent_exists(void) { @@ -24,54 +25,14 @@ return TRUE; } -/* - * Unfortunately, this asynchronous agent request mechanism doesn't - * appear to work terribly well. I'm going to comment it out for - * the moment, and see if I can come up with a better one :-/ - */ -#ifdef WINDOWS_ASYNC_AGENT - -struct agent_query_data { - COPYDATASTRUCT cds; - unsigned char *mapping; - HANDLE handle; - char *mapname; - HWND hwnd; - void (*callback)(void *, void *, int); - void *callback_ctx; -}; - -DWORD WINAPI agent_query_thread(LPVOID param) +void agent_cancel_query(agent_pending_query *q) { - struct agent_query_data *data = (struct agent_query_data *)param; - unsigned char *ret; - int id, retlen; - - id = SendMessage(data->hwnd, WM_COPYDATA, (WPARAM) NULL, - (LPARAM) &data->cds); - ret = NULL; - if (id > 0) { - retlen = 4 + GET_32BIT(data->mapping); - ret = snewn(retlen, unsigned char); - if (ret) { - memcpy(ret, data->mapping, retlen); - } - } - if (!ret) - retlen = 0; - UnmapViewOfFile(data->mapping); - CloseHandle(data->handle); - sfree(data->mapname); - - agent_schedule_callback(data->callback, data->callback_ctx, ret, retlen); - - return 0; + assert(0 && "Windows agent queries are never asynchronous!"); } -#endif - -int agent_query(void *in, int inlen, void **out, int *outlen, - void (*callback)(void *, void *, int), void *callback_ctx) +agent_pending_query *agent_query( + void *in, int inlen, void **out, int *outlen, + void (*callback)(void *, void *, int), void *callback_ctx) { HWND hwnd; char *mapname; @@ -88,7 +49,7 @@ hwnd = FindWindow("Pageant", "Pageant"); if (!hwnd) - return 1; /* *out == NULL, so failure */ + return NULL; /* *out == NULL, so failure */ mapname = dupprintf("PageantRequest%08x", (unsigned)GetCurrentThreadId()); psa = NULL; @@ -129,38 +90,13 @@ 0, AGENT_MAX_MSGLEN, mapname); if (filemap == NULL || filemap == INVALID_HANDLE_VALUE) { sfree(mapname); - return 1; /* *out == NULL, so failure */ + return NULL; /* *out == NULL, so failure */ } p = MapViewOfFile(filemap, FILE_MAP_WRITE, 0, 0, 0); memcpy(p, in, inlen); cds.dwData = AGENT_COPYDATA_ID; cds.cbData = 1 + strlen(mapname); cds.lpData = mapname; -#ifdef WINDOWS_ASYNC_AGENT - if (callback != NULL && !(flags & FLAG_SYNCAGENT)) { - /* - * We need an asynchronous Pageant request. Since I know of - * no way to stop SendMessage from blocking the thread it's - * called in, I see no option but to start a fresh thread. - * When we're done we'll PostMessage the result back to our - * main window, so that the callback is done in the primary - * thread to avoid concurrency. - */ - struct agent_query_data *data = snew(struct agent_query_data); - DWORD threadid; - data->mapping = p; - data->handle = filemap; - data->mapname = mapname; - data->callback = callback; - data->callback_ctx = callback_ctx; - data->cds = cds; /* structure copy */ - data->hwnd = hwnd; - if (CreateThread(NULL, 0, agent_query_thread, data, 0, &threadid)) - return 0; - sfree(mapname); - sfree(data); - } -#endif /* * The user either passed a null callback (indicating that the @@ -182,6 +118,5 @@ sfree(mapname); if (psd) LocalFree(psd); - sfree(usersid); - return 1; + return NULL; } diff -Nru filezilla-3.15.0.2/src/putty/windows/winsecur.c filezilla-3.33.0/src/putty/windows/winsecur.c --- filezilla-3.15.0.2/src/putty/windows/winsecur.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winsecur.c 2017-02-20 17:02:26.000000000 +0000 @@ -44,6 +44,9 @@ DWORD toklen, sidlen; PSID sid = NULL, ret = NULL; + if (usersid) + return usersid; + if (!got_advapi()) goto cleanup; @@ -73,7 +76,7 @@ /* Success. Move sid into the return value slot, and null it out * to stop the cleanup code freeing it. */ - ret = sid; + ret = usersid = sid; sid = NULL; cleanup: @@ -89,17 +92,25 @@ return ret; } -int getsids(char *error) +int getsids(char **error) { +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wmissing-braces" +#endif SID_IDENTIFIER_AUTHORITY world_auth = SECURITY_WORLD_SID_AUTHORITY; SID_IDENTIFIER_AUTHORITY nt_auth = SECURITY_NT_AUTHORITY; - int ret; +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + + int ret = FALSE; - error=NULL; + *error = NULL; if (!usersid) { if ((usersid = get_user_sid()) == NULL) { - error = dupprintf("unable to construct SID for current user: %s", + *error = dupprintf("unable to construct SID for current user: %s", win_strerror(GetLastError())); goto cleanup; } @@ -108,7 +119,7 @@ if (!worldsid) { if (!AllocateAndInitializeSid(&world_auth, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &worldsid)) { - error = dupprintf("unable to construct SID for world: %s", + *error = dupprintf("unable to construct SID for world: %s", win_strerror(GetLastError())); goto cleanup; } @@ -117,20 +128,16 @@ if (!networksid) { if (!AllocateAndInitializeSid(&nt_auth, 1, SECURITY_NETWORK_RID, 0, 0, 0, 0, 0, 0, 0, &networksid)) { - error = dupprintf("unable to construct SID for " + *error = dupprintf("unable to construct SID for " "local same-user access only: %s", win_strerror(GetLastError())); goto cleanup; } } - ret=TRUE; + ret = TRUE; cleanup: - if (ret) { - sfree(error); - error = NULL; - } return ret; } @@ -140,8 +147,6 @@ PACL *acl, char **error) { - SID_IDENTIFIER_AUTHORITY world_auth = SECURITY_WORLD_SID_AUTHORITY; - SID_IDENTIFIER_AUTHORITY nt_auth = SECURITY_NT_AUTHORITY; EXPLICIT_ACCESS ea[3]; int acl_err; int ret = FALSE; @@ -151,7 +156,7 @@ *acl = NULL; *error = NULL; - if (!getsids(*error)) + if (!getsids(error)) goto cleanup; memset(ea, 0, sizeof(ea)); @@ -223,18 +228,16 @@ return ret; } -int setprocessacl(char *error) +static int really_restrict_process_acl(char **error) { - SID_IDENTIFIER_AUTHORITY world_auth = SECURITY_WORLD_SID_AUTHORITY; - SID_IDENTIFIER_AUTHORITY nt_auth = SECURITY_NT_AUTHORITY; EXPLICIT_ACCESS ea[2]; int acl_err; int ret=FALSE; PACL acl = NULL; - static const nastyace=WRITE_DAC | WRITE_OWNER | + static const DWORD nastyace=WRITE_DAC | WRITE_OWNER | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | - PROCESS_DUP_HANDLE | PROCESS_QUERY_INFORMATION | + PROCESS_DUP_HANDLE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_SUSPEND_RESUME; @@ -261,8 +264,8 @@ acl_err = p_SetEntriesInAclA(2, ea, NULL, &acl); if (acl_err != ERROR_SUCCESS || acl == NULL) { - error = dupprintf("unable to construct ACL: %s", - win_strerror(acl_err)); + *error = dupprintf("unable to construct ACL: %s", + win_strerror(acl_err)); goto cleanup; } @@ -270,8 +273,8 @@ (GetCurrentProcess(), SE_KERNEL_OBJECT, OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, usersid, NULL, acl, NULL)) { - error=dupprintf("Unable to set process ACL: %s", - win_strerror(GetLastError())); + *error = dupprintf("Unable to set process ACL: %s", + win_strerror(GetLastError())); goto cleanup; } @@ -286,5 +289,37 @@ } } return ret; -} +} #endif /* !defined NO_SECURITY */ + +/* + * Lock down our process's ACL, to present an obstacle to malware + * trying to write into its memory. This can't be a full defence, + * because well timed malware could attack us before this code runs - + * even if it was unconditionally run at the very start of main(), + * which we wouldn't want to do anyway because it turns out in practie + * that interfering with other processes in this way has significant + * non-infringing uses on Windows (e.g. screen reader software). + * + * If we've been requested to do this and are unsuccessful, bomb out + * via modalfatalbox rather than continue in a less protected mode. + * + * This function is intentionally outside the #ifndef NO_SECURITY that + * covers the rest of this file, because when PuTTY is compiled + * without the ability to restrict its ACL, we don't want it to + * silently pretend to honour the instruction to do so. + */ +void restrict_process_acl(void) +{ + char *error = NULL; + int ret; + +#if !defined NO_SECURITY + ret = really_restrict_process_acl(&error); +#else + ret = FALSE; + error = dupstr("ACL restrictions not compiled into this binary"); +#endif + if (!ret) + modalfatalbox("Could not restrict process ACL: %s", error); +} diff -Nru filezilla-3.15.0.2/src/putty/windows/winsecur.h filezilla-3.33.0/src/putty/windows/winsecur.h --- filezilla-3.15.0.2/src/putty/windows/winsecur.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winsecur.h 2017-02-20 17:02:26.000000000 +0000 @@ -56,6 +56,4 @@ PACL *acl, char **error); -int setprocessacl(char *error); - #endif diff -Nru filezilla-3.15.0.2/src/putty/windows/winsftp.c filezilla-3.33.0/src/putty/windows/winsftp.c --- filezilla-3.15.0.2/src/putty/windows/winsftp.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winsftp.c 2017-09-19 21:36:39.000000000 +0000 @@ -2,12 +2,16 @@ * winsftp.c: the Windows-specific parts of PSFTP and PSCP. */ +#include /* need to put this first, for winelib builds */ #include +#define NEED_DECLARATION_OF_SELECT + #include "putty.h" #include "psftp.h" #include "ssh.h" #include "int64.h" +#include "winsecur.h" char *get_ttymode(void *frontend, const char *mode) { return NULL; } @@ -117,8 +121,12 @@ ret = snew(RFile); ret->h = h; - if (size) - size->lo=GetFileSize(h, &(size->hi)); + if (size) { + DWORD lo, hi; + lo = GetFileSize(h, &hi); + size->lo = lo; + size->hi = hi; + } if (mtime || atime) { FILETIME actime, wrtime; @@ -195,8 +203,12 @@ ret = snew(WFile); ret->h = h; - if (size) - size->lo=GetFileSize(h, &(size->hi)); + if (size) { + DWORD lo, hi; + lo = GetFileSize(h, &hi); + size->lo = lo; + size->hi = hi; + } return ret; } @@ -246,7 +258,10 @@ return -1; } - SetFilePointer(f->h, offset.lo, &(offset.hi), movemethod); + { + LONG lo = offset.lo, hi = offset.hi; + SetFilePointer(f->h, lo, &hi, movemethod); + } if (GetLastError() != NO_ERROR) return -1; @@ -257,9 +272,11 @@ uint64 get_file_posn(WFile *f) { uint64 ret; + LONG lo, hi = 0; - ret.hi = 0L; - ret.lo = SetFilePointer(f->h, 0L, &(ret.hi), FILE_CURRENT); + lo = SetFilePointer(f->h, 0L, &hi, FILE_CURRENT); + ret.lo = lo; + ret.hi = hi; return ret; } @@ -540,7 +557,6 @@ } return NULL; } -extern int select_result(WPARAM, LPARAM); int do_eventsel_loop(HANDLE other_event) { @@ -589,7 +605,6 @@ WSANETWORKEVENTS things; SOCKET socket; extern SOCKET first_socket(int *), next_socket(int *); - extern int select_result(WPARAM, LPARAM); int i, socketstate; /* @@ -794,6 +809,13 @@ return ctx->line; } +void platform_psftp_pre_conn_setup(void) +{ + if (restricted_acl) { + logevent(NULL, "Running with restricted process ACL"); + } +} + /* ---------------------------------------------------------------------- * Main program. Parse arguments etc. */ @@ -801,6 +823,8 @@ { int ret; + dll_hijacking_protection(); + ret = psftp_main(argc, argv); return ret; diff -Nru filezilla-3.15.0.2/src/putty/windows/winshare.c filezilla-3.33.0/src/putty/windows/winshare.c --- filezilla-3.15.0.2/src/putty/windows/winshare.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winshare.c 2016-04-11 20:20:01.000000000 +0000 @@ -20,7 +20,7 @@ #ifdef COVERITY /* * The hack I use to build for Coverity scanning, using winegcc and - * Makefile.cyg, didn't provide some defines in wincrypt.h last time I + * Makefile.mgw, didn't provide some defines in wincrypt.h last time I * looked. Therefore, define them myself here, but enclosed in #ifdef * COVERITY to ensure I don't make up random nonsense values for any * real build. diff -Nru filezilla-3.15.0.2/src/putty/windows/winstore.c filezilla-3.33.0/src/putty/windows/winstore.c --- filezilla-3.15.0.2/src/putty/windows/winstore.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winstore.c 2017-09-19 21:36:39.000000000 +0000 @@ -110,7 +110,7 @@ void write_setting_s(void *handle, const char *key, const char *value) { if (handle) - RegSetValueEx((HKEY) handle, key, 0, REG_SZ, value, + RegSetValueEx((HKEY) handle, key, 0, REG_SZ, (CONST BYTE *)value, 1 + strlen(value)); } @@ -168,7 +168,7 @@ allocsize = size+1; /* allow for an extra NUL if needed */ ret = snewn(allocsize, char); if (RegQueryValueEx((HKEY) handle, key, 0, - &type, ret, &size) != ERROR_SUCCESS || + &type, (BYTE *)ret, &size) != ERROR_SUCCESS || type != REG_SZ) { sfree(ret); return NULL; @@ -372,7 +372,8 @@ readlen = len; otherstr = snewn(len, char); - ret = RegQueryValueEx(rkey, regname, NULL, &type, otherstr, &readlen); + ret = RegQueryValueEx(rkey, regname, NULL, + &type, (BYTE *)otherstr, &readlen); if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA && !strcmp(keytype, "rsa")) { @@ -385,7 +386,7 @@ char *oldstyle = snewn(len + 10, char); /* safety margin */ readlen = len; ret = RegQueryValueEx(rkey, justhost, NULL, &type, - oldstyle, &readlen); + (BYTE *)oldstyle, &readlen); if (ret == ERROR_SUCCESS && type == REG_SZ) { /* @@ -431,7 +432,7 @@ * wrong, and hyper-cautiously do nothing. */ if (!strcmp(otherstr, key)) - RegSetValueEx(rkey, regname, 0, REG_SZ, otherstr, + RegSetValueEx(rkey, regname, 0, REG_SZ, (BYTE *)otherstr, strlen(otherstr) + 1); } @@ -476,7 +477,7 @@ if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys", &rkey) == ERROR_SUCCESS) { - RegSetValueEx(rkey, regname, 0, REG_SZ, key, strlen(key) + 1); + RegSetValueEx(rkey, regname, 0, REG_SZ, (BYTE *)key, strlen(key) + 1); RegCloseKey(rkey); } /* else key does not exist in registry */ @@ -536,7 +537,7 @@ if (RegOpenKey(HKEY_CURRENT_USER, PUTTY_REG_POS, &rkey) == ERROR_SUCCESS) { int ret = RegQueryValueEx(rkey, "RandSeedFile", - 0, &type, seedpath, &size); + 0, &type, (BYTE *)seedpath, &size); if (ret != ERROR_SUCCESS || type != REG_SZ) seedpath[0] = '\0'; RegCloseKey(rkey); @@ -672,7 +673,7 @@ value_length = 200; old_value = snewn(value_length, char); ret = RegQueryValueEx(pjumplist_key, reg_jumplist_value, NULL, &type, - old_value, &value_length); + (BYTE *)old_value, &value_length); /* When the passed buffer is too small, ERROR_MORE_DATA is * returned and the required size is returned in the length * argument. */ @@ -680,7 +681,7 @@ sfree(old_value); old_value = snewn(value_length, char); ret = RegQueryValueEx(pjumplist_key, reg_jumplist_value, NULL, &type, - old_value, &value_length); + (BYTE *)old_value, &value_length); } if (ret == ERROR_FILE_NOT_FOUND) { @@ -754,7 +755,7 @@ /* Save the new list to the registry. */ ret = RegSetValueEx(pjumplist_key, reg_jumplist_value, 0, REG_MULTI_SZ, - new_value, piterator_new - new_value); + (BYTE *)new_value, piterator_new - new_value); sfree(old_value); old_value = new_value; diff -Nru filezilla-3.15.0.2/src/putty/windows/winstuff.h filezilla-3.33.0/src/putty/windows/winstuff.h --- filezilla-3.15.0.2/src/putty/windows/winstuff.h 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/winstuff.h 2017-09-19 21:36:39.000000000 +0000 @@ -19,13 +19,15 @@ * stddef.h. So here we try to make sure _some_ standard header is * included which defines uintptr_t. */ #include -#if !defined _MSC_VER || _MSC_VER >= 1600 +#if !defined _MSC_VER || _MSC_VER >= 1600 || defined __clang__ #include #endif #include "tree234.h" -//#include "winhelp.h" +/*#include "winhelp.h"*/ + +#define BUILDINFO_PLATFORM "Windows" struct Filename { char *path; @@ -90,10 +92,26 @@ #define BOXRESULT (DLGWINDOWEXTRA + sizeof(LONG_PTR)) #define DF_END 0x0001 +#ifdef __WINE__ +#define NO_SECUREZEROMEMORY /* winelib doesn't have this */ +#endif + #ifndef NO_SECUREZEROMEMORY #define PLATFORM_HAS_SMEMCLR /* inhibit cross-platform one in misc.c */ #endif +#ifndef __WINE__ +/* Up-to-date Windows headers warn that the unprefixed versions of + * these names are deprecated. */ +#define stricmp _stricmp +#define strnicmp _strnicmp +#else +/* Compiling with winegcc, _neither_ version of these functions + * exists. Use the POSIX names. */ +#define stricmp strcasecmp +#define strnicmp strncasecmp +#endif + #define BROKEN_PIPE_ERROR_CODE ERROR_BROKEN_PIPE /* used in sshshare.c */ /* @@ -113,15 +131,24 @@ * * (DECL_WINDOWS_FUNCTION works with both these variants.) */ -#define DECL_WINDOWS_FUNCTION(linkage, rettype, name, params) \ - typedef rettype (WINAPI *t_##name) params; \ +#define TYPECHECK(to_check, to_return) \ + (sizeof(to_check) ? to_return : to_return) +#define DECL_WINDOWS_FUNCTION(linkage, rettype, name, params) \ + typedef rettype (WINAPI *t_##name) params; \ linkage t_##name p_##name #define STR1(x) #x #define STR(x) STR1(x) -#define GET_WINDOWS_FUNCTION_PP(module, name) \ - (p_##name = module ? (t_##name) GetProcAddress(module, STR(name)) : NULL) -#define GET_WINDOWS_FUNCTION(module, name) \ - (p_##name = module ? (t_##name) GetProcAddress(module, #name) : NULL) +#define GET_WINDOWS_FUNCTION_PP(module, name) \ + TYPECHECK((t_##name)NULL == name, \ + (p_##name = module ? \ + (t_##name) GetProcAddress(module, STR(name)) : NULL)) +#define GET_WINDOWS_FUNCTION(module, name) \ + TYPECHECK((t_##name)NULL == name, \ + (p_##name = module ? \ + (t_##name) GetProcAddress(module, #name) : NULL)) +#define GET_WINDOWS_FUNCTION_NO_TYPECHECK(module, name) \ + (p_##name = module ? \ + (t_##name) GetProcAddress(module, #name) : NULL) /* * Global variables. Most modules declare these `extern', but @@ -260,7 +287,7 @@ /* * Exports from winnet.c. */ -extern int select_result(WPARAM, LPARAM); +extern void select_result(WPARAM, LPARAM); /* * winnet.c dynamically loads WinSock 2 or WinSock 1 depending on @@ -272,12 +299,21 @@ (SOCKET, HWND, u_int, long)); DECL_WINDOWS_FUNCTION(GLOBAL, int, WSAEventSelect, (SOCKET, WSAEVENT, long)); -DECL_WINDOWS_FUNCTION(GLOBAL, int, select, - (int, fd_set FAR *, fd_set FAR *, - fd_set FAR *, const struct timeval FAR *)); DECL_WINDOWS_FUNCTION(GLOBAL, int, WSAGetLastError, (void)); DECL_WINDOWS_FUNCTION(GLOBAL, int, WSAEnumNetworkEvents, (SOCKET, WSAEVENT, LPWSANETWORKEVENTS)); +#ifdef NEED_DECLARATION_OF_SELECT +/* This declaration is protected by an ifdef for the sake of building + * against winelib, in which you have to include winsock2.h before + * stdlib.h so that the right fd_set type gets defined. It would be a + * pain to do that throughout this codebase, so instead I arrange that + * only a modules actually needing to use (or define, or initialise) + * this function pointer will see its declaration, and _those_ modules + * - which will be Windows-specific anyway - can take more care. */ +DECL_WINDOWS_FUNCTION(GLOBAL, int, select, + (int, fd_set FAR *, fd_set FAR *, + fd_set FAR *, const struct timeval FAR *)); +#endif extern int socket_writable(SOCKET skt); @@ -296,6 +332,7 @@ int boxystart, boxid; char *boxtext; }; +void init_common_controls(void); /* also does some DLL-loading */ /* * Exports from winutils.c. @@ -481,9 +518,28 @@ * Exports from winmisc.c. */ extern OSVERSIONINFO osVersion; +void dll_hijacking_protection(void); BOOL init_winver(void); HMODULE load_system32_dll(const char *libname); const char *win_strerror(int error); +void restrict_process_acl(void); +GLOBAL int restricted_acl; + +/* A few pieces of up-to-date Windows API definition needed for older + * compilers. */ +#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32 +#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 +#endif +#ifndef LOAD_LIBRARY_SEARCH_USER_DIRS +#define LOAD_LIBRARY_SEARCH_USER_DIRS 0x00000400 +#endif +#ifndef LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR +#define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 0x00000100 +#endif +#ifndef DLL_DIRECTORY_COOKIE +typedef PVOID DLL_DIRECTORY_COOKIE; +DECLSPEC_IMPORT DLL_DIRECTORY_COOKIE WINAPI AddDllDirectory (PCWSTR NewDirectory); +#endif /* * Exports from sizetip.c. @@ -547,6 +603,7 @@ void add_session_to_jumplist(const char * const sessionname); void remove_session_from_jumplist(const char * const sessionname); void clear_jumplist(void); +BOOL set_explicit_app_user_model_id(); /* * Extra functions in winstore.c over and above the interface in diff -Nru filezilla-3.15.0.2/src/putty/windows/wintime.c filezilla-3.33.0/src/putty/windows/wintime.c --- filezilla-3.15.0.2/src/putty/windows/wintime.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/windows/wintime.c 2017-09-19 21:36:39.000000000 +0000 @@ -10,6 +10,8 @@ SYSTEMTIME st; struct tm tm; + memset(&tm, 0, sizeof(tm)); /* in case there are any other fields */ + GetLocalTime(&st); tm.tm_sec=st.wSecond; tm.tm_min=st.wMinute; diff -Nru filezilla-3.15.0.2/src/putty/x11fwd.c filezilla-3.33.0/src/putty/x11fwd.c --- filezilla-3.15.0.2/src/putty/x11fwd.c 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/src/putty/x11fwd.c 2017-09-19 21:36:39.000000000 +0000 @@ -934,7 +934,7 @@ * Write a new connection header containing our replacement * auth data. */ - + socketdatalen = 0; /* placate compiler warning */ socketdata = sk_getxdmdata(xconn->s, &socketdatalen); if (socketdata && socketdatalen==6) { sprintf(new_peer_addr, "%d.%d.%d.%d", socketdata[0], diff -Nru filezilla-3.15.0.2/src/storj/events.hpp filezilla-3.33.0/src/storj/events.hpp --- filezilla-3.15.0.2/src/storj/events.hpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/storj/events.hpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,26 @@ +#ifndef FILEZILLA_STORJ_EVENTS_HEADER +#define FILEZILLA_STORJ_EVENTS_HEADER + +enum class storjEvent { + Unknown = -1, + Reply = 0, + Done, + Error, + ErrorMsg, + Verbose, + Info, + Status, + Recv, + Send, + Listentry, + Transfer, + UsedQuotaRecv, + UsedQuotaSend, + + count +}; + +#define FZSTORJ_PROTOCOL_VERSION 1 + +#endif + diff -Nru filezilla-3.15.0.2/src/storj/fzstorj.cpp filezilla-3.33.0/src/storj/fzstorj.cpp --- filezilla-3.15.0.2/src/storj/fzstorj.cpp 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/storj/fzstorj.cpp 2017-07-13 19:12:18.000000000 +0000 @@ -0,0 +1,730 @@ +#include + +#include "events.hpp" + +#include +#include + +#include "storj.h" + +#include + +fz::mutex output_mutex; + +void fzprintf(storjEvent event) +{ + fz::scoped_lock l(output_mutex); + + fputc('0' + static_cast(event), stdout); + + fflush(stdout); +} + +template +void fzprintf(storjEvent event, Args &&... args) +{ + fz::scoped_lock l(output_mutex); + + fputc('0' + static_cast(event), stdout); + + std::string s = fz::sprintf(std::forward(args)...); + fwrite(s.c_str(), s.size(), 1, stdout); + + fputc('\n', stdout); + fflush(stdout); +} + +bool getLine(std::string & line) +{ + line.clear(); + while (true) { + int c = fgetc(stdin); + if (c == -1) { + return false; + } + else if (!c) { + return line.empty(); + } + else if (c == '\n') { + return !line.empty(); + } + else if (c == '\r') { + continue; + } + else { + line += static_cast(c); + } + } +} + +std::string next_argument(std::string & line) +{ + std::string ret; + + fz::trim(line); + + if (line[0] == '"') { + size_t pos = 1; + size_t pos2; + while ((pos2 = line.find('"', pos)) != std::string::npos && line[pos2 + 1] == '"') { + ret += line.substr(pos, pos2 - pos + 1); + pos = pos2 + 2; + } + if (pos2 == std::string::npos || (line[pos2 + 1] != ' ' && line[pos2 + 1] != '\0')) { + line.clear(); + ret.clear(); + } + ret += line.substr(pos, pos2 - pos); + line = line.substr(pos2 + 1); + } + else { + size_t pos = line.find(' '); + if (pos == std::string::npos) { + ret = line; + line.clear(); + } + else { + ret = line.substr(0, pos); + line = line.substr(pos + 1); + } + } + + fz::trim(line); + + return ret; +} + +namespace { +extern "C" void get_buckets_callback(uv_work_t *work_req, int status) +{ + if (status != 0) { + fzprintf(storjEvent::Error, "Request failed with outer status code %d", status); + } + else { + get_buckets_request_t *req = static_cast(work_req->data); + + if (req->status_code != 200) { + fzprintf(storjEvent::Error, "Request failed with status code %d", req->status_code); + } + else { + bool encrypted = false; + + for (unsigned int i = 0; i < req->total_buckets; ++i) { + storj_bucket_meta_t &bucket = req->buckets[i]; + + + if (!bucket.decrypted) { + encrypted = true; + } + + std::string id = bucket.id; + std::string name = bucket.name; + std::string created; + if (bucket.created) { + created = bucket.created; + } + fz::replace_substrings(name, "\r", ""); + fz::replace_substrings(id, "\r", ""); + fz::replace_substrings(created, "\r", ""); + fz::replace_substrings(name, "\n", ""); + fz::replace_substrings(id, "\n", ""); + fz::replace_substrings(created, "\n", ""); + + auto perms = "id:" + id; + if (encrypted) { + fz::replace_substrings(name, "/", "_"); + perms += " nokey"; + } + + fzprintf(storjEvent::Listentry, "%s\n-1\n%s\n%s", name, perms, created); + } + + if (encrypted) { + fzprintf(storjEvent::Status, "Warning: Wrong encryption key for at least one bucket"); + } + fzprintf(storjEvent::Done); + } + + json_object_put(req->response); + free(req); + } + + free(work_req); +} + +extern "C" void list_files_callback(uv_work_t *work_req, int status) +{ + if (status != 0) { + fzprintf(storjEvent::Error, "Request failed with outer status code %d", status); + } + else { + list_files_request_t *req = static_cast(work_req->data); + + std::string const& prefix = *static_cast(req->handle); + + if (req->status_code != 200) { + fzprintf(storjEvent::Error, "Request failed with status code %d", req->status_code); + } + else { + std::map> dirs; + + bool prefixIsValid = prefix.empty(); + bool encrypted = false; + for (unsigned int i = 0; i < req->total_files; ++i) { + storj_file_meta_t &file = req->files[i]; + + if (!file.decrypted) { + encrypted = true; + break; + } + + std::string name = file.filename; + std::string id = file.id; + uint64_t size = file.size; + std::string created; + if (file.created) { + created = file.created; + } + fz::replace_substrings(name, "\r", ""); + fz::replace_substrings(id, "\r", ""); + fz::replace_substrings(created, "\r", ""); + fz::replace_substrings(name, "\n", ""); + fz::replace_substrings(id, "\n", ""); + fz::replace_substrings(created, "\n", ""); + + if (name.empty() || name == "." || name == "..") { + continue; + } + + if (!prefix.empty()) { + if (name.substr(0, prefix.size()) != prefix) { + continue; + } + name = name.substr(prefix.size()); + if (name.empty()) { + prefixIsValid = true; + fzprintf(storjEvent::Listentry, ".\n-1\n%s\n", id); + continue; + } + } + + auto perms = "id:" + id; + + auto pos = name.find('/'); + if (pos != std::string::npos) { + bool actualDirEntry = pos + 1 == name.size(); + name = name.substr(0, pos); + if (name.empty()) { + continue; + } + + if (actualDirEntry) { + dirs[name] = std::make_pair(perms, created); + } + else { + dirs.insert(std::make_pair(name, std::make_pair(std::string(), std::string()))); + } + continue; + } + + prefixIsValid = true; + fzprintf(storjEvent::Listentry, "%s\n%d\n%s\n%s", name, size, perms, created); + } + + if (encrypted) { + fzprintf(storjEvent::Error, "Wrong encryption key for this bucket"); + } + else { + if (!dirs.empty()) { + prefixIsValid = true; + } + + if (!prefixIsValid) { + fzprintf(storjEvent::Error, "Directory does not exist"); + } + else { + for (auto const& dir : dirs) { + fzprintf(storjEvent::Listentry, "%s/\n-1\n%s\n%s", dir.first, dir.second.first, dir.second.second); + } + fzprintf(storjEvent::Done); + } + } + } + + json_object_put(req->response); + free(req->path); + free(req); + } + free(work_req); +} + + +extern "C" void download_file_progress(double progress, + uint64_t downloaded_bytes, + uint64_t total_bytes, + void *handle) +{ + uint64_t & lastProgress = *static_cast(handle); + if (downloaded_bytes > lastProgress) { + fzprintf(storjEvent::Transfer, "%u", downloaded_bytes - lastProgress); + lastProgress = downloaded_bytes; + } +} + +extern "C" void download_file_complete(int status, FILE *fd, void *) +{ + if (status) { + fzprintf(storjEvent::Error, "Download failed with error %s (%d)", storj_strerror(status), status); + } + else { + fzprintf(storjEvent::Done); + } +} + +extern "C" void upload_file_complete(int status, char* file_id, void *) +{ + if (status) { + fzprintf(storjEvent::Error, "Upload failed with error %s (%d)", storj_strerror(status), status); + } + else { + fzprintf(storjEvent::Done); + } + free(file_id); +} + +extern "C" void log(char const* msg, int level, void*) +{ + std::string s(msg); + fz::replace_substrings(s, "\n", " "); + fz::trim(s); + fzprintf(storjEvent::Verbose, "%s", s); +} + +extern "C" void generic_done(uv_work_t *work_req, int status) +{ + if (status) { + fzprintf(storjEvent::Error, "Command failed with error %s (%d)", storj_strerror(status), status); + } + else { + json_request_t *req = static_cast(work_req->data); + + if (req->status_code < 200 || req->status_code > 299) { + fzprintf(storjEvent::Error, "Request failed with status code %d", req->status_code); + } + else { + fzprintf(storjEvent::Done); + } + } +} + +extern "C" void create_bucket_callback(uv_work_t *work_req, int status) +{ + create_bucket_request_t *req = static_cast(work_req->data); + if (status) { + fzprintf(storjEvent::Error, "Command failed with error %s (%d)", storj_strerror(status), status); + } + else { + + if (req->status_code == 404) { + fzprintf(storjEvent::Error, "Cannot create bucket \"%s\": Name already exists", req->bucket->name); + } + else if (req->status_code != 201) { + fzprintf(storjEvent::Error, "Request failed with status code %d", req->status_code); + } + else { + fzprintf(storjEvent::Done); + } + + } + + if (req) { + json_object_put(req->response); + free(req); + } + free(work_req); +} + +extern "C" void delete_bucket_callback(uv_work_t *work_req, int status) +{ + json_request_t *req = static_cast(work_req->data); + + if (status) { + fzprintf(storjEvent::Error, "Command failed with error %s (%d)", storj_strerror(status), status); + } + else { + if (req->status_code != 200 && req->status_code != 204) { + fzprintf(storjEvent::Error, "Request failed with status code %d", req->status_code); + } + else { + fzprintf(storjEvent::Done); + } + + } + + if (req) { + json_object_put(req->response); + free(req->path); + free(req); + } + free(work_req); +} +} + +int main() +{ + fzprintf(storjEvent::Reply, "fzStorj started, protocol_version=%d", FZSTORJ_PROTOCOL_VERSION); + + std::string host; + unsigned short port = 443; + std::string user; + std::string pass; + std::string mnemonic; + std::string proxy; + + storj_env_t *env{}; + + uint64_t timeout = STORJ_HTTP_TIMEOUT; + + auto init_env = [&](){ + if (env) { + return; + } + storj_bridge_options_t options{}; + options.host = host.c_str(); + options.proto = "https"; + options.port = port; + options.user = user.c_str(); + options.pass = pass.c_str(); + + storj_encrypt_options_t encrypt_options{}; + encrypt_options.mnemonic = mnemonic.c_str(); + + storj_http_options_t http_options{}; + http_options.user_agent = "FileZilla"; + http_options.low_speed_limit = STORJ_LOW_SPEED_LIMIT; + http_options.low_speed_time = STORJ_LOW_SPEED_TIME; + http_options.timeout = timeout; + if (!proxy.empty()) { + http_options.proxy_url = proxy.c_str(); + } + + static storj_log_options_t log_options{}; + log_options.logger = log; + log_options.level = 4; + env = storj_init_env(&options, &encrypt_options, &http_options, &log_options); + if (!env) { + fzprintf(storjEvent::Error, "storj_init_env failed"); + exit(1); + } + }; + + int ret = 0; + while (true) { + std::string command; + if (!getLine(command)) { + ret = 1; + break; + } + + if (command.empty()) { + break; + } + + std::size_t pos = command.find(' '); + std::string arg; + if (pos != std::string::npos) { + arg = command.substr(pos + 1); + command = command.substr(0, pos); + } + + if (command == "host") { + host = arg; + std::size_t sep = host.find(':'); + if (sep != std::string::npos) { + port = fz::to_integral(host.substr(pos + 1)); + host = host.substr(0, pos); + } + fzprintf(storjEvent::Done); + } + else if (command == "user") { + user = arg; + fzprintf(storjEvent::Done); + } + else if (command == "pass") { + pass = arg; + fzprintf(storjEvent::Done); + } + else if (command == "genkey") { + + char* buf = 0; + storj_mnemonic_generate(128, &buf); + if (buf) { + fzprintf(storjEvent::Done, "%s", buf); + free(buf); + } + else { + fzprintf(storjEvent::Error); + } + } + else if (command == "key" || command == "validatekey") { + mnemonic = arg; + if (storj_mnemonic_check(mnemonic.c_str())) { + if (command == "key") { + fzprintf(storjEvent::Done); + } + else { + fzprintf(storjEvent::Done, ""); + } + } + else { + fzprintf(storjEvent::Error, "Invalid encryption key"); + } + } + else if (command == "timeout") { + timeout = fz::to_integral(arg); + fzprintf(storjEvent::Done); + } + else if (command == "proxy") { + proxy = arg; + fzprintf(storjEvent::Done); + } + else if (command == "list-buckets") { + init_env(); + storj_bridge_get_buckets(env, 0, get_buckets_callback); + if (uv_run(env->loop, UV_RUN_DEFAULT)) { + fzprintf(storjEvent::Error, "uv_run failed."); + } + } + else if (command == "list") { + init_env(); + + if (arg.empty()) { + fzprintf(storjEvent::Error, "Bad arguments"); + continue; + } + + std::string bucket, prefix; + + size_t pos = arg.find(' '); + if (pos == std::string::npos) { + bucket = arg; + } + else { + bucket = arg.substr(0, pos); + + prefix = arg.substr(pos + 1); + + if (prefix.size() >= 2 && prefix.front() == '"' && prefix.back() == '"') { + prefix = fz::replaced_substrings(prefix.substr(1, prefix.size() - 2), "\"\"", "\""); + } + + if (!prefix.empty() && prefix.back() != '/') { + fzprintf(storjEvent::Error, "Bad arguments"); + continue; + } + } + + storj_bridge_list_files(env, bucket.c_str(), &prefix, list_files_callback); + if (uv_run(env->loop, UV_RUN_DEFAULT)) { + fzprintf(storjEvent::Error, "uv_run failed."); + } + } + else if (command == "get") { + size_t pos = arg.find(' '); + if (pos == std::string::npos) { + fzprintf(storjEvent::Error, "Bad arguments"); + continue; + } + std::string bucket = arg.substr(0, pos); + size_t pos2 = arg.find(' ', pos + 1); + if (pos == std::string::npos) { + fzprintf(storjEvent::Error, "Bad arguments"); + continue; + } + auto id = arg.substr(pos + 1, pos2 - pos - 1); + auto file = arg.substr(pos2 + 1); + + if (file.size() >= 3 && file.front() == '"' && file.back() == '"') { + file = fz::replaced_substrings(file.substr(1, file.size() - 2), "\"\"", "\""); + } + + init_env(); + + FILE *fd = fopen(file.c_str(), "w+"); + + if (fd == NULL) { + int err = errno; + fzprintf(storjEvent::Error, "Could not open local file %s for writing: %d", file, err); + continue; + } + + storj_download_state_t *state = static_cast(malloc(sizeof(storj_download_state_t))); + + /*uv_signal_t sig; + uv_signal_init(env->loop, &sig); + uv_signal_start(&sig, signal_handler, SIGINT); + sig.data = state;*/ + + uint64_t lastProgress{}; + int status = storj_bridge_resolve_file(env, state, bucket.c_str(), + id.c_str(), fd, &lastProgress, + download_file_progress, + download_file_complete); + if (status) { + fclose(fd); + fzprintf(storjEvent::Error, "Could not download file, storj_bridge_resolve_file failed: %d", status); + continue; + } + if (uv_run(env->loop, UV_RUN_DEFAULT)) { + fclose(fd); + fzprintf(storjEvent::Error, "uv_run failed."); + } + fclose(fd); + } + else if (command == "put") { + std::string bucket = next_argument(arg); + std::string file = next_argument(arg); + std::string remote_name = next_argument(arg); + + if (bucket.empty() || file.empty() || remote_name.empty() || !arg.empty()) { + fzprintf(storjEvent::Error, "Bad arguments"); + } + + init_env(); + + FILE *fd{}; + if (file == "null") { +#ifdef FZ_WINDOWS + char buf[MAX_PATH + 2]; + int ret = GetTempPathA(MAX_PATH + 1, buf); + if (ret && ret <= MAX_PATH + 1) { + char buf2[MAX_PATH + 1]; + ret = GetTempFileNameA(buf, "fzstorj", 0, buf2); + if (ret) { + fd = fopen(buf2, "r+D"); + if (fd) { + fwrite(buf2, 1, 1, fd); + rewind(fd); + } + } + } +#else + std::string tmpname = P_tmpdir; + tmpname += "/fzstorjXXXXXX"; + char* buf = &tmpname[0]; + int f = mkstemp(buf); + if (f != -1) { + unlink(buf); + write(f, buf, 1); + lseek(f, 0, SEEK_SET); + fd = fdopen(f, "r"); + } +#endif + } + else { + fd = fopen(file.c_str(), "r"); + } + + if (fd == NULL) { + int err = errno; + fzprintf(storjEvent::Error, "Could not open local file %s for reading: %d", file, err); + continue; + } + + + storj_upload_opts_t upload_opts; + upload_opts.prepare_frame_limit = 1; + upload_opts.push_frame_limit = 64; + upload_opts.push_shard_limit = 64; + upload_opts.bucket_id = bucket.c_str(); + upload_opts.file_name = remote_name.c_str(); + upload_opts.index = NULL; + upload_opts.rs = true; + upload_opts.fd = fd; + + storj_upload_state_t *state = static_cast(malloc(sizeof(storj_upload_state_t))); + + uint64_t lastProgress{}; + int status = storj_bridge_store_file(env, + state, + &upload_opts, + &lastProgress, + download_file_progress, + upload_file_complete); + + if (status) { + fzprintf(storjEvent::Error, "Could not upload file, storj_bridge_store_file failed: %d", status); + continue; + } + if (uv_run(env->loop, UV_RUN_DEFAULT)) { + fzprintf(storjEvent::Error, "uv_run failed."); + } + } + else if (command == "rm") { + auto args = fz::strtok(arg, ' '); + if (args.size() != 2) { + fzprintf(storjEvent::Error, "Bad arguments"); + continue; + } + init_env(); + + int status = storj_bridge_delete_file(env, args[0].c_str(), args[1].c_str(), nullptr, generic_done); + + if (status) { + fzprintf(storjEvent::Error, "Could not delete file, storj_bridge_delete_file failed: %d", status); + continue; + } + if (uv_run(env->loop, UV_RUN_DEFAULT)) { + fzprintf(storjEvent::Error, "uv_run failed."); + } + } + else if (command == "mkbucket") { + std::string bucket = next_argument(arg); + if (bucket.empty() || !arg.empty()) { + fzprintf(storjEvent::Error, "Bad arguments"); + continue; + } + init_env(); + + int status = storj_bridge_create_bucket(env, bucket.c_str(), + NULL, create_bucket_callback); + + if (status) { + fzprintf(storjEvent::Error, "Could not create bucket, storj_bridge_create_bucket failed: %d", status); + continue; + } + if (uv_run(env->loop, UV_RUN_DEFAULT)) { + fzprintf(storjEvent::Error, "uv_run failed."); + } + } + else if (command == "rmbucket") { + auto args = fz::strtok(arg, ' '); + if (args.size() != 1) { + fzprintf(storjEvent::Error, "Bad arguments"); + continue; + } + init_env(); + + int status = storj_bridge_delete_bucket(env, args.front().c_str(), + NULL, delete_bucket_callback); + + if (status) { + fzprintf(storjEvent::Error, "Could not remove bucket, storj_bridge_delete_bucket failed: %d", status); + continue; + } + if (uv_run(env->loop, UV_RUN_DEFAULT)) { + fzprintf(storjEvent::Error, "uv_run failed."); + } + } + else { + fzprintf(storjEvent::Error, "No such command: %s", command); + } + + } + + if (env) { + storj_destroy_env(env); + } + + return ret; +} diff -Nru filezilla-3.15.0.2/src/storj/Makefile.am filezilla-3.33.0/src/storj/Makefile.am --- filezilla-3.15.0.2/src/storj/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/storj/Makefile.am 2017-07-22 03:30:02.000000000 +0000 @@ -0,0 +1,18 @@ +bin_PROGRAMS = fzstorj + +fzstorj_SOURCES = \ + fzstorj.cpp + +fzstorj_LDADD = $(LIBFILEZILLA_LIBS) $(LIBSTORJ_LIBS) + +fzstorj_CPPFLAGS = $(LIBFILEZILLA_CFLAGS) $(LIBSTORJ_CFLAGS) + +noinst_HEADERS = events.hpp + +if MACAPPBUNDLE +noinst_DATA = $(top_builddir)/FileZilla.app/Contents/MacOS/fzstorj$(EXEEXT) +endif + +$(top_builddir)/FileZilla.app/Contents/MacOS/fzstorj$(EXEEXT): fzstorj + mkdir -p $(top_builddir)/FileZilla.app/Contents/MacOS + cp -f fzstorj $(top_builddir)/FileZilla.app/Contents/MacOS/fzstorj diff -Nru filezilla-3.15.0.2/src/storj/Makefile.in filezilla-3.33.0/src/storj/Makefile.in --- filezilla-3.15.0.2/src/storj/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.33.0/src/storj/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -0,0 +1,735 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +bin_PROGRAMS = fzstorj$(EXEEXT) +subdir = src/storj +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ + $(top_srcdir)/m4/ax_check_link_flag.m4 \ + $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ + $(top_srcdir)/m4/check_libc++.m4 \ + $(top_srcdir)/m4/check_steady_clock.m4 \ + $(top_srcdir)/m4/check_thread_local.m4 \ + $(top_srcdir)/m4/check_time.m4 \ + $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ + $(top_srcdir)/m4/d-type.m4 \ + $(top_srcdir)/m4/fz_check_pugixml.m4 \ + $(top_srcdir)/m4/fz_checkversion.m4 \ + $(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/map_emplace.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/src/include/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +PROGRAMS = $(bin_PROGRAMS) +am_fzstorj_OBJECTS = fzstorj-fzstorj.$(OBJEXT) +fzstorj_OBJECTS = $(am_fzstorj_OBJECTS) +am__DEPENDENCIES_1 = +fzstorj_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include +depcomp = $(SHELL) $(top_srcdir)/config/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +SOURCES = $(fzstorj_SOURCES) +DIST_SOURCES = $(fzstorj_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +DATA = $(noinst_DATA) +HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ +CPPUNIT_LIBS = @CPPUNIT_LIBS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FILEZILLA_LINGUAS = @FILEZILLA_LINGUAS@ +FILEZILLA_LINGUAS_MO = @FILEZILLA_LINGUAS_MO@ +FILEZILLA_LINGUAS_PO = @FILEZILLA_LINGUAS_PO@ +FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ +GREP = @GREP@ +HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ +IDN_LIB = @IDN_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBDBUS_CFLAGS = @LIBDBUS_CFLAGS@ +LIBDBUS_LIBS = @LIBDBUS_LIBS@ +LIBFILEZILLA_CFLAGS = @LIBFILEZILLA_CFLAGS@ +LIBFILEZILLA_LIBS = @LIBFILEZILLA_LIBS@ +LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ +LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ +LIBGTK_CFLAGS = @LIBGTK_CFLAGS@ +LIBGTK_LIBS = @LIBGTK_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ +LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PUGIXML_LIBS = @PUGIXML_LIBS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WINDRES = @WINDRES@ +WINDRESFLAGS = @WINDRESFLAGS@ +WXRC = @WXRC@ +WX_CFLAGS = @WX_CFLAGS@ +WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@ +WX_CONFIG_PATH = @WX_CONFIG_PATH@ +WX_CONFIG_WITH_ARGS = @WX_CONFIG_WITH_ARGS@ +WX_CPPFLAGS = @WX_CPPFLAGS@ +WX_CXXFLAGS = @WX_CXXFLAGS@ +WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@ +WX_LIBS = @WX_LIBS@ +WX_LIBS_STATIC = @WX_LIBS_STATIC@ +WX_RESCOMP = @WX_RESCOMP@ +WX_VERSION = @WX_VERSION@ +WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ +WX_VERSION_MICRO = @WX_VERSION_MICRO@ +WX_VERSION_MINOR = @WX_VERSION_MINOR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +msgfmt = @msgfmt@ +msgmerge = @msgmerge@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +subdirs = @subdirs@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +xdgopen = @xdgopen@ +xgettext = @xgettext@ +fzstorj_SOURCES = \ + fzstorj.cpp + +fzstorj_LDADD = $(LIBFILEZILLA_LIBS) $(LIBSTORJ_LIBS) +fzstorj_CPPFLAGS = $(LIBFILEZILLA_CFLAGS) $(LIBSTORJ_CFLAGS) +noinst_HEADERS = events.hpp +@MACAPPBUNDLE_TRUE@noinst_DATA = $(top_builddir)/FileZilla.app/Contents/MacOS/fzstorj$(EXEEXT) +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/storj/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/storj/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +fzstorj$(EXEEXT): $(fzstorj_OBJECTS) $(fzstorj_DEPENDENCIES) $(EXTRA_fzstorj_DEPENDENCIES) + @rm -f fzstorj$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(fzstorj_OBJECTS) $(fzstorj_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fzstorj-fzstorj.Po@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +fzstorj-fzstorj.o: fzstorj.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzstorj_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fzstorj-fzstorj.o -MD -MP -MF $(DEPDIR)/fzstorj-fzstorj.Tpo -c -o fzstorj-fzstorj.o `test -f 'fzstorj.cpp' || echo '$(srcdir)/'`fzstorj.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fzstorj-fzstorj.Tpo $(DEPDIR)/fzstorj-fzstorj.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fzstorj.cpp' object='fzstorj-fzstorj.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzstorj_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fzstorj-fzstorj.o `test -f 'fzstorj.cpp' || echo '$(srcdir)/'`fzstorj.cpp + +fzstorj-fzstorj.obj: fzstorj.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzstorj_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fzstorj-fzstorj.obj -MD -MP -MF $(DEPDIR)/fzstorj-fzstorj.Tpo -c -o fzstorj-fzstorj.obj `if test -f 'fzstorj.cpp'; then $(CYGPATH_W) 'fzstorj.cpp'; else $(CYGPATH_W) '$(srcdir)/fzstorj.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fzstorj-fzstorj.Tpo $(DEPDIR)/fzstorj-fzstorj.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fzstorj.cpp' object='fzstorj-fzstorj.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzstorj_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fzstorj-fzstorj.obj `if test -f 'fzstorj.cpp'; then $(CYGPATH_W) 'fzstorj.cpp'; else $(CYGPATH_W) '$(srcdir)/fzstorj.cpp'; fi` + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-binPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS + +.PRECIOUS: Makefile + + +$(top_builddir)/FileZilla.app/Contents/MacOS/fzstorj$(EXEEXT): fzstorj + mkdir -p $(top_builddir)/FileZilla.app/Contents/MacOS + cp -f fzstorj $(top_builddir)/FileZilla.app/Contents/MacOS/fzstorj + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru filezilla-3.15.0.2/tests/cmpnatural.cpp filezilla-3.33.0/tests/cmpnatural.cpp --- filezilla-3.15.0.2/tests/cmpnatural.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/tests/cmpnatural.cpp 2017-01-09 16:00:56.000000000 +0000 @@ -12,7 +12,7 @@ * functions handling natural sort */ -class CNaturalSortTest : public CppUnit::TestFixture +class CNaturalSortTest final : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(CNaturalSortTest); CPPUNIT_TEST(testEmpty); diff -Nru filezilla-3.15.0.2/tests/dirparsertest.cpp filezilla-3.33.0/tests/dirparsertest.cpp --- filezilla-3.15.0.2/tests/dirparsertest.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/tests/dirparsertest.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -1,9 +1,12 @@ #include #include +#include + #include #include +#include /* * This testsuite asserts the correctness of the directory listing parser. * It's main purpose is to ensure that all known formats are recognized and @@ -11,19 +14,20 @@ * also ambiguity, the parser is very fragile. */ -typedef struct +struct t_entry { std::string data; CDirentry reference; - enum ServerType serverType; -} t_entry; + ServerType serverType; +}; -class CDirectoryListingParserTest : public CppUnit::TestFixture +class CDirectoryListingParserTest final : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(CDirectoryListingParserTest); InitEntries(); - for (unsigned int i = 0; i < m_entries.size(); i++) + for (unsigned int i = 0; i < m_entries.size(); ++i) { CPPUNIT_TEST(testIndividual); + } CPPUNIT_TEST(testAll); CPPUNIT_TEST_SUITE_END(); @@ -37,7 +41,7 @@ static std::vector m_entries; - static wxCriticalSection m_sync; + static fz::mutex m_sync; protected: static void InitEntries(); @@ -45,27 +49,31 @@ t_entry m_entry; }; -wxCriticalSection CDirectoryListingParserTest::m_sync; +fz::mutex CDirectoryListingParserTest::m_sync; std::vector CDirectoryListingParserTest::m_entries; CPPUNIT_TEST_SUITE_REGISTRATION(CDirectoryListingParserTest); -typedef CRefcountObject R; -typedef CSparseOptional O; +typedef fz::shared_value R; +typedef fz::sparse_optional O; static int calcYear(int month, int day) { - const int cur_year = wxDateTime::GetCurrentYear(); - const int cur_month = wxDateTime::GetCurrentMonth() + 1; - const int cur_day = wxDateTime::Now().GetDay(); + auto const now = fz::datetime::now(); + auto const tm = now.get_tm(fz::datetime::local); + int const cur_year = tm.tm_year + 1900; + int const cur_month = tm.tm_mon + 1; + int const cur_day = tm.tm_mday; // Not exact but good enough for our purpose - const int day_of_year = month * 31 + day; - const int cur_day_of_year = cur_month * 31 + cur_day; - if (day_of_year > (cur_day_of_year + 1)) + int const day_of_year = month * 31 + day; + int const cur_day_of_year = cur_month * 31 + cur_day; + if (day_of_year > (cur_day_of_year + 1)) { return cur_year - 1; - else + } + else { return cur_year; + } } void CDirectoryListingParserTest::InitEntries() @@ -74,156 +82,156 @@ // ------------------- // We start with a perfect example of a unix style directory listing without anomalies. - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "dr-xr-xr-x 2 root other 512 Apr 8 1994 01-unix-std dir", { - _T("01-unix-std dir"), + L"01-unix-std dir", 512, - R(_T("dr-xr-xr-x")), - R(_T("root other")), + R(L"dr-xr-xr-x"), + R(L"root other"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, 1994, 4, 8) }, DEFAULT - }); + })); // This one is a recent file with a time instead of the year. - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-rw-r--r-- 1 root other 531 3 29 03:26 02-unix-std file", { - _T("02-unix-std file"), + L"02-unix-std file", 531, - R(_T("-rw-r--r--")), - R(_T("root other")), + R(L"-rw-r--r--"), + R(L"root other"), 0, O(), fz::datetime(fz::datetime::utc, calcYear(3, 29), 3, 29, 3, 26) }, DEFAULT - }); + })); // Group omitted - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "dr-xr-xr-x 2 root 512 Apr 8 1994 03-unix-nogroup dir", { - _T("03-unix-nogroup dir"), + L"03-unix-nogroup dir", 512, - R(_T("dr-xr-xr-x")), - R(_T("root")), + R(L"dr-xr-xr-x"), + R(L"root"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, 1994, 4, 8) }, DEFAULT - }); + })); // Symbolic link - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "lrwxrwxrwx 1 root other 7 Jan 25 00:17 04-unix-std link -> usr/bin", { - _T("04-unix-std link"), + L"04-unix-std link", 7, - R(_T("lrwxrwxrwx")), - R(_T("root other")), + R(L"lrwxrwxrwx"), + R(L"root other"), CDirentry::flag_dir | CDirentry::flag_link, - O(_T("usr/bin")), + O(L"usr/bin"), fz::datetime(fz::datetime::utc, calcYear(1, 25), 1, 25, 0, 17) }, DEFAULT - }); + })); // Some listings with uncommon date/time format // -------------------------------------------- - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-rw-r--r-- 1 root other 531 09-26 2000 05-unix-date file", { - _T("05-unix-date file"), + L"05-unix-date file", 531, - R(_T("-rw-r--r--")), - R(_T("root other")), + R(L"-rw-r--r--"), + R(L"root other"), 0, O(), fz::datetime(fz::datetime::utc, 2000, 9, 26) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-rw-r--r-- 1 root other 531 09-26 13:45 06-unix-date file", { - _T("06-unix-date file"), + L"06-unix-date file", 531, - R(_T("-rw-r--r--")), - R(_T("root other")), + R(L"-rw-r--r--"), + R(L"root other"), 0, O(), fz::datetime(fz::datetime::utc, calcYear(9, 26), 9, 26, 13, 45) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-rw-r--r-- 1 root other 531 2005-06-07 21:22 07-unix-date file", { - _T("07-unix-date file"), + L"07-unix-date file", 531, - R(_T("-rw-r--r--")), - R(_T("root other")), + R(L"-rw-r--r--"), + R(L"root other"), 0, O(), fz::datetime(fz::datetime::utc, 2005, 6, 7, 21, 22) }, DEFAULT - }); + })); // Unix style with size information in kilobytes - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-rw-r--r-- 1 root other 33.5k Oct 5 21:22 08-unix-namedsize file", { - _T("08-unix-namedsize file"), + L"08-unix-namedsize file", 335 * 1024 / 10, - R(_T("-rw-r--r--")), - R(_T("root other")), + R(L"-rw-r--r--"), + R(L"root other"), 0, O(), fz::datetime(fz::datetime::utc, calcYear(10, 5), 10, 5, 21, 22) }, DEFAULT - }); + })); // NetWare style listings // ---------------------- - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "d [R----F--] supervisor 512 Jan 16 18:53 09-netware dir", { - _T("09-netware dir"), + L"09-netware dir", 512, - R(_T("d [R----F--]")), - R(_T("supervisor")), + R(L"d [R----F--]"), + R(L"supervisor"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, calcYear(1, 16), 1, 16, 18, 53) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "- [R----F--] rhesus 214059 Oct 20 15:27 10-netware file", { - _T("10-netware file"), + L"10-netware file", 214059, - R(_T("- [R----F--]")), - R(_T("rhesus")), + R(L"- [R----F--]"), + R(L"rhesus"), 0, O(), fz::datetime(fz::datetime::utc, calcYear(10, 20), 10, 20, 15, 27) }, DEFAULT - }); + })); // NetPresenz for the Mac // ---------------------- @@ -232,72 +240,72 @@ // The numerical username is mistaken as size. However, // this is ambiguous to the normal unix style listing. // It's not possible to recognize both formats the right way. - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-------r-- 326 1391972 1392298 Nov 22 1995 11-netpresenz file", { - _T("11-netpresenz file"), + L"11-netpresenz file", 1392298, - R(_T("-------r--")), - R(_T("1391972")), + R(L"-------r--"), + R(L"1391972"), 0, O(), fz::datetime(fz::datetime::utc, 1995, 11, 22) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "drwxrwxr-x folder 2 May 10 1996 12-netpresenz dir", { - _T("12-netpresenz dir"), + L"12-netpresenz dir", 2, - R(_T("drwxrwxr-x")), - R(_T("folder")), + R(L"drwxrwxr-x"), + R(L"folder"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, 1996, 5, 10) }, DEFAULT - }); + })); // A format with domain field some windows servers send - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-rw-r--r-- 1 group domain user 531 Jan 29 03:26 13-unix-domain file", { - _T("13-unix-domain file"), + L"13-unix-domain file", 531, - R(_T("-rw-r--r--")), - R(_T("group domain user")), + R(L"-rw-r--r--"), + R(L"group domain user"), 0, O(), fz::datetime(fz::datetime::utc, calcYear(1, 29), 1, 29, 3, 26) }, DEFAULT - }); + })); // EPLF directory listings // ----------------------- // See http://cr.yp.to/ftp/list/eplf.html (mirrored at https://filezilla-project.org/specs/eplf.html) - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "+i8388621.48594,m825718503,r,s280,up755\t14-eplf file", { - _T("14-eplf file"), + L"14-eplf file", 280, - R(_T("755")), + R(L"755"), R(), 0, O(), fz::datetime(fz::datetime::utc, 1996, 3, 1, 22, 15, 3) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "+i8388621.50690,m824255907,/,\t15-eplf dir", { - _T("15-eplf dir"), + L"15-eplf dir", -1, R(), R(), @@ -306,15 +314,15 @@ fz::datetime(fz::datetime::utc, 1996, 2, 13, 23, 58, 27) }, DEFAULT - }); + })); // MSDOS type listing used by old IIS // ---------------------------------- - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "04-27-00 12:09PM 16-dos-dateambiguous dir", { - _T("16-dos-dateambiguous dir"), + L"16-dos-dateambiguous dir", -1, R(), R(), @@ -323,13 +331,13 @@ fz::datetime(fz::datetime::utc, 2000, 4, 27, 12, 9) }, DEFAULT - }); + })); // Ambiguous date and AM/PM crap. Some evil manager must have forced the poor devs to implement this - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "04-06-00 03:47PM 589 17-dos-dateambiguous file", { - _T("17-dos-dateambiguous file"), + L"17-dos-dateambiguous file", 589, R(), R(), @@ -338,12 +346,12 @@ fz::datetime(fz::datetime::utc, 2000, 4, 6, 15, 47) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "2002-09-02 18:48 18-dos-longyear dir", { - _T("18-dos-longyear dir"), + L"18-dos-longyear dir", -1, R(), R(), @@ -352,12 +360,12 @@ fz::datetime(fz::datetime::utc, 2002, 9, 2, 18, 48) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "2002-09-02 19:06 9,730 19-dos-longyear file", { - _T("19-dos-longyear file"), + L"19-dos-longyear file", 9730, R(), R(), @@ -366,30 +374,30 @@ fz::datetime(fz::datetime::utc, 2002, 9, 2, 19, 6) }, DEFAULT - }); + })); // Numerical unix style listing - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "0100644 500 101 12345 123456789 20-unix-numerical file", { - _T("20-unix-numerical file"), + L"20-unix-numerical file", 12345, - R(_T("0100644")), - R(_T("500 101")), + R(L"0100644"), + R(L"500 101"), 0, O(), fz::datetime(fz::datetime::utc, 1973, 11, 29, 21, 33, 9) }, DEFAULT - }); + })); // VShell servers // -------------- - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "206876 Apr 04, 2000 21:06 21-vshell-old file", { - _T("21-vshell-old file"), + L"21-vshell-old file", 206876, R(), R(), @@ -398,12 +406,12 @@ fz::datetime(fz::datetime::utc, 2000, 4, 4, 21, 6) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "0 Dec 12, 2002 02:13 22-vshell-old dir/", { - _T("22-vshell-old dir"), + L"22-vshell-old dir", 0, R(), R(), @@ -412,32 +420,32 @@ fz::datetime(fz::datetime::utc, 2002, 12, 12, 2, 13) }, DEFAULT - }); + })); /* This type of directory listings is sent by some newer versions of VShell * both year and time in one line is uncommon. */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-rwxr-xr-x 1 user group 9 Oct 08, 2002 09:47 23-vshell-new file", { - _T("23-vshell-new file"), + L"23-vshell-new file", 9, - R(_T("-rwxr-xr-x")), - R(_T("user group")), + R(L"-rwxr-xr-x"), + R(L"user group"), 0, O(), fz::datetime(fz::datetime::utc, 2002, 10, 8, 9, 47) }, DEFAULT - }); + })); // OS/2 server format // ------------------ // This server obviously isn't Y2K aware - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "36611 A 04-23-103 10:57 24-os2 file", { - _T("24-os2 file"), + L"24-os2 file", 36611, R(), R(), @@ -446,12 +454,12 @@ fz::datetime(fz::datetime::utc, 2003, 4, 23, 10, 57) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ " 1123 A 07-14-99 12:37 25-os2 file", { - _T("25-os2 file"), + L"25-os2 file", 1123, R(), R(), @@ -460,13 +468,13 @@ fz::datetime(fz::datetime::utc, 1999, 7, 14, 12, 37) }, DEFAULT - }); + })); // Another server not aware of Y2K - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ " 0 DIR 02-11-103 16:15 26-os2 dir", { - _T("26-os2 dir"), + L"26-os2 dir", 0, R(), R(), @@ -475,13 +483,13 @@ fz::datetime(fz::datetime::utc, 2003, 2, 11, 16, 15) }, DEFAULT - }); + })); // Again Y2K - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ " 1123 DIR A 10-05-100 23:38 27-os2 dir", { - _T("27-os2 dir"), + L"27-os2 dir", 1123, R(), R(), @@ -490,164 +498,164 @@ fz::datetime(fz::datetime::utc, 2000, 10, 5, 23, 38) }, DEFAULT - }); + })); // Localized date formats // ---------------------- - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "dr-xr-xr-x 2 root other 2235 26. Juli, 20:10 28-datetest-ger dir", { - _T("28-datetest-ger dir"), + L"28-datetest-ger dir", 2235, - R(_T("dr-xr-xr-x")), - R(_T("root other")), + R(L"dr-xr-xr-x"), + R(L"root other"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, calcYear(7, 26), 7, 26, 20, 10) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "dr-xr-xr-x 2 root other 2235 szept 26 20:10 28b-datetest-hungarian dir", { - _T("28b-datetest-hungarian dir"), + L"28b-datetest-hungarian dir", 2235, - R(_T("dr-xr-xr-x")), - R(_T("root other")), + R(L"dr-xr-xr-x"), + R(L"root other"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, calcYear(9, 26), 9, 26, 20, 10) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-r-xr-xr-x 2 root other 2235 2. Okt. 2003 29-datetest-ger file", { - _T("29-datetest-ger file"), + L"29-datetest-ger file", 2235, - R(_T("-r-xr-xr-x")), - R(_T("root other")), + R(L"-r-xr-xr-x"), + R(L"root other"), 0, O(), fz::datetime(fz::datetime::utc, 2003, 10, 2) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-r-xr-xr-x 2 root other 2235 1999/10/12 17:12 30-datetest file", { - _T("30-datetest file"), + L"30-datetest file", 2235, - R(_T("-r-xr-xr-x")), - R(_T("root other")), + R(L"-r-xr-xr-x"), + R(L"root other"), 0, O(), fz::datetime(fz::datetime::utc, 1999, 10, 12, 17, 12) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-r-xr-xr-x 2 root other 2235 24-04-2003 17:12 31-datetest file", { - _T("31-datetest file"), + L"31-datetest file", 2235, - R(_T("-r-xr-xr-x")), - R(_T("root other")), + R(L"-r-xr-xr-x"), + R(L"root other"), 0, O(), fz::datetime(fz::datetime::utc, 2003, 4, 24, 17, 12) }, DEFAULT - }); + })); // Japanese listing // Remark: I'v no idea in which encoding the foreign characters are, but // it's not valid UTF-8. Parser has to be able to cope with it somehow. - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-rw-r--r-- 1 root sys 8473 4\x8c\x8e 18\x93\xfa 2003\x94\x4e 32-datatest-japanese file", { - _T("32-datatest-japanese file"), + L"32-datatest-japanese file", 8473, - R(_T("-rw-r--r--")), - R(_T("root sys")), + R(L"-rw-r--r--"), + R(L"root sys"), 0, O(), fz::datetime(fz::datetime::utc, 2003, 4, 18) }, DEFAULT - }); + })); // Some other asian listing format. Those >127 chars are just examples - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-rwxrwxrwx 1 root staff 0 2003 3\xed\xef 20 33-asian date file", { - _T("33-asian date file"), + L"33-asian date file", 0, - R(_T("-rwxrwxrwx")), - R(_T("root staff")), + R(L"-rwxrwxrwx"), + R(L"root staff"), 0, O(), fz::datetime(fz::datetime::utc, 2003, 3, 20) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-r--r--r-- 1 root root 2096 8\xed 17 08:52 34-asian date file", { - _T("34-asian date file"), + L"34-asian date file", 2096, - R(_T("-r--r--r--")), - R(_T("root root")), + R(L"-r--r--r--"), + R(L"root root"), 0, O(), fz::datetime(fz::datetime::utc, calcYear(8, 17), 8, 17, 8, 52) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-r-xr-xr-x 2 root root 96 2004.07.15 35-dotted-date file", { - _T("35-dotted-date file"), + L"35-dotted-date file", 96, - R(_T("-r-xr-xr-x")), - R(_T("root root")), + R(L"-r-xr-xr-x"), + R(L"root root"), 0, O(), fz::datetime(fz::datetime::utc, 2004, 7, 15) }, DEFAULT - }); + })); // VMS listings // ------------ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "36-vms-dir.DIR;1 1 19-NOV-2001 21:41 [root,root] (RWE,RWE,RE,RE)", { - _T("36-vms-dir"), + L"36-vms-dir", 512, - R(_T("RWE,RWE,RE,RE")), - R(_T("root,root")), + R(L"RWE,RWE,RE,RE"), + R(L"root,root"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, 2001, 11, 19, 21, 41) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "37-vms-file;1 155 2-JUL-2003 10:30:13.64", { - _T("37-vms-file;1"), + L"37-vms-file;1", 79360, R(), R(), @@ -656,162 +664,162 @@ fz::datetime(fz::datetime::utc, 2003, 7, 2, 10, 30, 13) }, DEFAULT - }); + })); /* VMS style listing without time */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "38-vms-notime-file;1 2/8 7-JAN-2000 [IV2_XXX] (RWED,RWED,RE,)", { - _T("38-vms-notime-file;1"), + L"38-vms-notime-file;1", 1024, - R(_T("RWED,RWED,RE,")), - R(_T("IV2_XXX")), + R(L"RWED,RWED,RE,"), + R(L"IV2_XXX"), 0, O(), fz::datetime(fz::datetime::utc, 2000, 1, 7) }, DEFAULT - }); + })); /* Localized month */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "39-vms-notime-file;1 6/8 15-JUI-2002 PRONAS (RWED,RWED,RE,)", { - _T("39-vms-notime-file;1"), + L"39-vms-notime-file;1", 3072, - R(_T("RWED,RWED,RE,")), - R(_T("PRONAS")), + R(L"RWED,RWED,RE,"), + R(L"PRONAS"), 0, O(), fz::datetime(fz::datetime::utc, 2002, 7, 15) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "40-vms-multiline-file;1\r\n170774/170775 24-APR-2003 08:16:15 [FTP_CLIENT,SCOT] (RWED,RWED,RE,)", { - _T("40-vms-multiline-file;1"), + L"40-vms-multiline-file;1", 87436288, - R(_T("RWED,RWED,RE,")), - R(_T("FTP_CLIENT,SCOT")), + R(L"RWED,RWED,RE,"), + R(L"FTP_CLIENT,SCOT"), 0, O(), fz::datetime(fz::datetime::utc, 2003, 4, 24, 8, 16, 15) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "41-vms-multiline-file;1\r\n10 2-JUL-2003 10:30:08.59 [FTP_CLIENT,SCOT] (RWED,RWED,RE,)", { - _T("41-vms-multiline-file;1"), + L"41-vms-multiline-file;1", 5120, - R(_T("RWED,RWED,RE,")), - R(_T("FTP_CLIENT,SCOT")), + R(L"RWED,RWED,RE,"), + R(L"FTP_CLIENT,SCOT"), 0, O(), fz::datetime(fz::datetime::utc, 2003, 7, 2, 10, 30, 8) }, DEFAULT - }); + })); // VMS style listings with a different field order - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "42-vms-alternate-field-order-file;1 [SUMMARY] 1/3 2-AUG-2006 13:05 (RWE,RWE,RE,)", { - _T("42-vms-alternate-field-order-file;1"), + L"42-vms-alternate-field-order-file;1", 512, - R(_T("RWE,RWE,RE,")), - R(_T("SUMMARY")), + R(L"RWE,RWE,RE,"), + R(L"SUMMARY"), 0, O(), fz::datetime(fz::datetime::utc, 2006, 8, 2, 13, 5) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "43-vms-alternate-field-order-file;1 17-JUN-1994 17:25:37 6308/13 (RWED,RWED,R,)", { - _T("43-vms-alternate-field-order-file;1"), + L"43-vms-alternate-field-order-file;1", 3229696, - R(_T("RWED,RWED,R,")), + R(L"RWED,RWED,R,"), R(), 0, O(), fz::datetime(fz::datetime::utc, 1994, 6, 17, 17, 25, 37) }, DEFAULT - }); + })); // Miscellaneous listings // ---------------------- /* IBM AS/400 style listing */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "QSYS 77824 02/23/00 15:09:55 *DIR 44-ibm-as400 dir/", { - _T("44-ibm-as400 dir"), + L"44-ibm-as400 dir", 77824, R(), - R(_T("QSYS")), + R(L"QSYS"), CDirentry::flag_dir | 0, O(), fz::datetime(fz::datetime::utc, 2000, 2, 23, 15, 9, 55) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "QSYS 77824 23/02/00 15:09:55 *FILE 45-ibm-as400-date file", { - _T("45-ibm-as400-date file"), + L"45-ibm-as400-date file", 77824, R(), - R(_T("QSYS")), + R(L"QSYS"), 0, O(), fz::datetime(fz::datetime::utc, 2000, 2, 23, 15, 9, 55) }, DEFAULT - }); + })); /* aligned directory listing with too long size */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-r-xr-xr-x longowner longgroup123456 Feb 12 17:20 46-unix-concatsize file", { - _T("46-unix-concatsize file"), + L"46-unix-concatsize file", 123456, - R(_T("-r-xr-xr-x")), - R(_T("longowner longgroup")), + R(L"-r-xr-xr-x"), + R(L"longowner longgroup"), 0, O(), fz::datetime(fz::datetime::utc, calcYear(2, 12), 2, 12, 17, 20) }, DEFAULT - }); + })); /* short directory listing with month name */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-r-xr-xr-x 2 owner group 4512 01-jun-99 47_unix_shortdatemonth file", { - _T("47_unix_shortdatemonth file"), + L"47_unix_shortdatemonth file", 4512, - R(_T("-r-xr-xr-x")), - R(_T("owner group")), + R(L"-r-xr-xr-x"), + R(L"owner group"), 0, O(), fz::datetime(fz::datetime::utc, 1999, 6, 1) }, DEFAULT - }); + })); /* Nortel wfFtp router */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "48-nortel-wfftp-file 1014196 06/03/04 Thur. 10:20:03", { - _T("48-nortel-wfftp-file"), + L"48-nortel-wfftp-file", 1014196, R(), R(), @@ -820,13 +828,13 @@ fz::datetime(fz::datetime::utc, 2004, 6, 3, 10, 20, 3) }, DEFAULT - }); + })); /* VxWorks based server used in Nortel routers */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "2048 Feb-28-1998 05:23:30 49-nortel-vxworks dir ", { - _T("49-nortel-vxworks dir"), + L"49-nortel-vxworks dir", 2048, R(), R(), @@ -835,103 +843,103 @@ fz::datetime(fz::datetime::utc, 1998, 2, 28, 5, 23, 30) }, DEFAULT - }); + })); /* the following format is sent by the Connect:Enterprise server by Sterling Commerce */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-C--E-----FTP B BCC3I1 7670 1294495 Jan 13 07:42 50-conent file", { - _T("50-conent file"), + L"50-conent file", 1294495, - R(_T("-C--E-----FTP")), - R(_T("B BCC3I1 7670")), + R(L"-C--E-----FTP"), + R(L"B BCC3I1 7670"), 0, O(), fz::datetime(fz::datetime::utc, calcYear(1, 13), 1, 13, 7, 42) }, DEFAULT - }); + })); /* Microware OS-9 * Notice the yy/mm/dd date format */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "20.20 07/03/29 1026 d-ewrewr 2650 85920 51-OS-9 dir", { - _T("51-OS-9 dir"), + L"51-OS-9 dir", 85920, - R(_T("d-ewrewr")), - R(_T("20.20")), + R(L"d-ewrewr"), + R(L"20.20"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, 2007, 3, 29) }, DEFAULT - }); + })); /* Localised Unix style listing. Month and day fields are swapped */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "drwxr-xr-x 3 user group 512 01 oct 2004 52-swapped-daymonth dir", { - _T("52-swapped-daymonth dir"), + L"52-swapped-daymonth dir", 512, - R(_T("drwxr-xr-x")), - R(_T("user group")), + R(L"drwxr-xr-x"), + R(L"user group"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, 2004, 10, 1) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "-r--r--r-- 0125039 12 Nov 11 2005 53-noownergroup file", { - _T("53-noownergroup file"), + L"53-noownergroup file", 12, - R(_T("-r--r--r--")), + R(L"-r--r--r--"), R(), 0, O(), fz::datetime(fz::datetime::utc, 2005, 11, 11) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ // Valid UTF-8 encoding "drwxr-xr-x 5 root sys 512 2005\xEB\x85\x84 1\xEC\x9B\x94 6\xEC\x9D\xBC 54-asian date year first dir", { - _T("54-asian date year first dir"), + L"54-asian date year first dir", 512, - R(_T("drwxr-xr-x")), - R(_T("root sys")), + R(L"drwxr-xr-x"), + R(L"root sys"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, 2005, 1, 6) }, DEFAULT - }); + })); /* IBM AS/400 style listing with localized date*/ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "QPGMR 36864 18.09.06 14:21:26 *FILE 55-AS400.FILE", { - _T("55-AS400.FILE"), + L"55-AS400.FILE", 36864, R(), - R(_T("QPGMR")), + R(L"QPGMR"), 0, O(), fz::datetime(fz::datetime::utc, 2006, 9, 18, 14, 21, 26) }, DEFAULT - }); + })); /* VMS style listing with complex size */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "56-VMS-complex-size;1 2KB 23-SEP-2005 14:57:07.27", { - _T("56-VMS-complex-size;1"), + L"56-VMS-complex-size;1", 2048, R(), R(), @@ -940,52 +948,52 @@ fz::datetime(fz::datetime::utc, 2005, 9, 23, 14, 57, 7) }, DEFAULT - }); + })); /* HP NonStop */ - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "57-HP_NonStop 101 528 6-Apr-07 14:21:18 255, 0 \"oooo\"", { - _T("57-HP_NonStop"), + L"57-HP_NonStop", 528, - R(_T("\"oooo\"")), - R(_T("255, 0")), + R(L"\"oooo\""), + R(L"255, 0"), 0, O(), fz::datetime(fz::datetime::utc, 2007, 4, 6, 14, 21, 18) }, HPNONSTOP - }); + })); // Only difference is in the owner/group field, no delimiting space. - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "58-HP_NonStop 101 528 6-Apr-07 14:21:18 255,255 \"oooo\"", { - _T("58-HP_NonStop"), + L"58-HP_NonStop", 528, - R(_T("\"oooo\"")), - R(_T("255,255")), + R(L"\"oooo\""), + R(L"255,255"), 0, O(), fz::datetime(fz::datetime::utc, 2007, 4, 6, 14, 21, 18) }, HPNONSTOP - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "drwxr-xr-x 6 user sys 1024 30. Jan., 12:40 59-localized-date-dir", { - _T("59-localized-date-dir"), + L"59-localized-date-dir", 1024, - R(_T("drwxr-xr-x")), - R(_T("user sys")), + R(L"drwxr-xr-x"), + R(L"user sys"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, calcYear(1, 30), 1, 30, 12, 40) }, DEFAULT - }); + })); // MVS variants // @@ -996,10 +1004,10 @@ // The following 5 are loosely based on this format: // Volume Unit Referred Ext Used Recfm Lrecl BlkSz Dsorg Dsname - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "WYOSPT 3420 2003/05/21 1 200 FB 80 8053 PS 60-MVS.FILE", { - _T("60-MVS.FILE"), + L"60-MVS.FILE", 100, R(), R(), @@ -1008,12 +1016,12 @@ fz::datetime(fz::datetime::utc, 2003, 5, 21) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "WPTA01 3290 2004/03/04 1 3 FB 80 3125 PO 61-MVS.DATASET", { - _T("61-MVS.DATASET"), + L"61-MVS.DATASET", -1, R(), R(), @@ -1022,12 +1030,12 @@ fz::datetime(fz::datetime::utc, 2004, 3, 04) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "NRP004 3390 **NONE** 1 15 NONE 0 0 PO 62-MVS-NONEDATE.DATASET", { - _T("62-MVS-NONEDATE.DATASET"), + L"62-MVS-NONEDATE.DATASET", -1, R(), R(), @@ -1036,12 +1044,12 @@ fz::datetime() }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "TSO005 3390 2005/06/06 213000 U 0 27998 PO 63-MVS.DATASET", { - _T("63-MVS.DATASET"), + L"63-MVS.DATASET", -1, R(), R(), @@ -1050,12 +1058,12 @@ fz::datetime(fz::datetime::utc, 2005, 6, 6) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "TSO004 3390 VSAM 64-mvs-file", { - _T("64-mvs-file"), + L"64-mvs-file", -1, R(), R(), @@ -1064,7 +1072,7 @@ fz::datetime() }, DEFAULT - }); + })); // MVS Dataset members // @@ -1073,10 +1081,10 @@ // Speciality: Some members have no attributes at all. // Requires servertype to be MVS or it won't be parsed, as // it would conflict with lots of other servers. - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "65-MVS-PDS-MEMBER", { - _T("65-MVS-PDS-MEMBER"), + L"65-MVS-PDS-MEMBER", -1, R(), R(), @@ -1085,13 +1093,13 @@ fz::datetime() }, MVS - }); + })); // Name VV.MM Created Changed Size Init Mod Id - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "66-MVSPDSMEMBER 01.01 2004/06/22 2004/06/22 16:32 128 128 0 BOBY12", { - _T("66-MVSPDSMEMBER"), + L"66-MVSPDSMEMBER", 128, R(), R(), @@ -1100,13 +1108,13 @@ fz::datetime(fz::datetime::utc, 2004, 6, 22, 16, 32) }, MVS - }); + })); // Hexadecimal size - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "67-MVSPDSMEMBER2 00B308 000411 00 FO 31 ANY", { - _T("67-MVSPDSMEMBER2"), + L"67-MVSPDSMEMBER2", 45832, R(), R(), @@ -1115,12 +1123,12 @@ fz::datetime() }, MVS - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "68-MVSPDSMEMBER3 00B308 000411 00 FO RU ANY 24", { - _T("68-MVSPDSMEMBER3"), + L"68-MVSPDSMEMBER3", 45832, R(), R(), @@ -1129,13 +1137,13 @@ fz::datetime() }, MVS - }); + })); // Migrated MVS file - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "Migrated 69-SOME.FILE", { - _T("69-SOME.FILE"), + L"69-SOME.FILE", -1, R(), R(), @@ -1144,7 +1152,7 @@ fz::datetime() }, MVS - }); + })); // z/VM, another IBM abomination. Description by Alexandre Charbey // Requires type set to ZVM or it cannot be parsed. @@ -1164,38 +1172,38 @@ // there is the date/time // 060191 // I think it is some internal stuff saying who the file belongs to. 191 is the "handle" of the user's disk. I don't know what 060 is. This 060191 is what FZ shows in its file list. - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "70-ZVMFILE TRACE V 65 107 2 2005-10-04 15:28:42 060191", { - _T("70-ZVMFILE.TRACE"), + L"70-ZVMFILE.TRACE", 6955, R(), - R(_T("060191")), + R(L"060191"), 0, O(), fz::datetime(fz::datetime::utc, 2005, 10, 4, 15, 28, 42) }, ZVM - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "drwxr-xr-x 3 slopri devlab 512 71-unix-dateless", { - _T("71-unix-dateless"), + L"71-unix-dateless", 512, - R(_T("drwxr-xr-x")), - R(_T("slopri devlab")), + R(L"drwxr-xr-x"), + R(L"slopri devlab"), CDirentry::flag_dir, O(), fz::datetime() }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "Type=file;mOdIfY=20081105165215;size=1234; 72-MLSD-file", { - _T("72-MLSD-file"), + L"72-MLSD-file", 1234, R(), R(), @@ -1204,16 +1212,16 @@ fz::datetime(fz::datetime::utc, 2008, 11, 5, 16, 52, 15) }, DEFAULT - }); + })); // Yet another MVS format. // Follows the below structure but with all but the first two and the last field empty. // Furthermore, Unit is "Tape" // Volume Unit Referred Ext Used Recfm Lrecl BlkSz Dsorg Dsname - m_entries.push_back((t_entry) { + m_entries.emplace_back(t_entry({ "V43525 Tape 73-MSV-TAPE.FILE", { - _T("73-MSV-TAPE.FILE"), + L"73-MSV-TAPE.FILE", -1, R(), R(), @@ -1222,12 +1230,12 @@ fz::datetime() }, MVS - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "Type=file; 74-MLSD-whitespace trailing\t ", { - _T("74-MLSD-whitespace trailing\t "), + L"74-MLSD-whitespace trailing\t ", -1, R(), R(), @@ -1236,12 +1244,12 @@ fz::datetime() }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "Type=file; \t 75-MLSD-whitespace leading", { - _T("\t 75-MLSD-whitespace leading"), + L"\t 75-MLSD-whitespace leading", -1, R(), R(), @@ -1250,40 +1258,40 @@ fz::datetime() }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "modify=20080426135501;perm=;size=65718921;type=file;unique=802U1066013B;UNIX.group=1179;UNIX.mode=00;UNIX.owner=1179; 75 MLSD file with empty permissions", { - _T("75 MLSD file with empty permissions"), + L"75 MLSD file with empty permissions", 65718921, - R(_T("00")), - R(_T("1179 1179")), + R(L"00"), + R(L"1179 1179"), 0, O(), fz::datetime(fz::datetime::utc, 2008, 4, 26, 13, 55, 1) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "type=OS.unix=slink:/foo; 76 MLSD symlink", { - _T("76 MLSD symlink"), + L"76 MLSD symlink", -1, R(), R(), CDirentry::flag_dir | CDirentry::flag_link, - O(_T("/foo")), + O(L"/foo"), fz::datetime() }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "type=OS.UNIX=symlink; 76b MLSD symlink", { - _T("76b MLSD symlink"), + L"76b MLSD symlink", -1, R(), R(), @@ -1292,13 +1300,13 @@ fz::datetime() }, DEFAULT - }); + })); // Old ietf draft for MLST earlier than mlst-07 has no trailing semicolon after facts - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "type=file 77 MLSD file no trailing semicolon after facts < mlst-07", { - _T("77 MLSD file no trailing semicolon after facts < mlst-07"), + L"77 MLSD file no trailing semicolon after facts < mlst-07", -1, R(), R(), @@ -1307,12 +1315,12 @@ fz::datetime() }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "type=OS.unix=slink; 77 MLSD symlink notarget", { - _T("77 MLSD symlink notarget"), + L"77 MLSD symlink notarget", -1, R(), R(), @@ -1321,12 +1329,12 @@ fz::datetime() }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "size=1365694195;type=file;modify=20090722092510;\tadsl TV 2009-07-22 08-25-10 78 mlsd file that can get parsed as unix.file", { - _T("adsl TV 2009-07-22 08-25-10 78 mlsd file that can get parsed as unix.file"), + L"adsl TV 2009-07-22 08-25-10 78 mlsd file that can get parsed as unix.file", 1365694195, R(), R(), @@ -1335,14 +1343,14 @@ fz::datetime(fz::datetime::utc, 2009, 7, 22, 9, 25, 10) }, DEFAULT - }); + })); // MVS entry with a large number of used blocks: // Volume Unit Referred Ext Used Recfm Lrecl BlkSz Dsorg Dsname - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "WYOSPT 3420 2003/05/21 1 ???? FB 80 8053 PS 79-MVS.FILE", { - _T("79-MVS.FILE"), + L"79-MVS.FILE", 100, R(), R(), @@ -1351,15 +1359,15 @@ fz::datetime(fz::datetime::utc, 2003, 5, 21) }, DEFAULT - }); + })); // MVS entry with a large number of used blocks: // https://forum.filezilla-project.org/viewtopic.php?t=21667 // Volume Unit Referred Ext Used Recfm Lrecl BlkSz Dsorg Dsname - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "GISBWI 3390 2011/08/25 2 ++++ FB 904 18080 PS 80-MVS.FILE", { - _T("80-MVS.FILE"), + L"80-MVS.FILE", 100, R(), R(), @@ -1368,15 +1376,15 @@ fz::datetime(fz::datetime::utc, 2011, 8, 25) }, DEFAULT - }); + })); // MVS entry with PO-E Dsorg indicating direrctory. See // https://forum.filezilla-project.org/viewtopic.php?t=19374 for reference. // Volume Unit Referred Ext Used Recfm Lrecl BlkSz Dsorg Dsname - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "WYOSPT 3420 2003/05/21 1 3 U 6447 6447 PO-E 81-MVS.DIR", { - _T("81-MVS.DIR"), + L"81-MVS.DIR", -1, R(), R(), @@ -1385,27 +1393,27 @@ fz::datetime(fz::datetime::utc, 2003, 5, 21) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.push_back(t_entry({ "drwxrwxrwx 1 0 0 0 29 Jul 02:27 2014 Invoices", { - _T("2014 Invoices"), + L"2014 Invoices", 0, - R(_T("drwxrwxrwx")), - R(_T("0 0")), + R(L"drwxrwxrwx"), + R(L"0 0"), CDirentry::flag_dir, O(), fz::datetime(fz::datetime::utc, calcYear(7, 29), 7, 29, 2, 27) }, DEFAULT - }); + })); - m_entries.push_back((t_entry){ + m_entries.emplace_back(t_entry({ "Type=file;mOdIfY=19681105165215;size=1234; MLSD pre-epoch", { - _T("MLSD pre-epoch"), + L"MLSD pre-epoch", 1234, R(), R(), @@ -1414,7 +1422,21 @@ fz::datetime(fz::datetime::utc, 1968, 11, 5, 16, 52, 15) }, DEFAULT - }); + })); + + m_entries.emplace_back(t_entry({ + "-rw------- 1 99999999 0 3 Apr 4 24:00 alternate_midnight", + { + L"alternate_midnight", + 3, + R(L"-rw-------"), + R(L"99999999 0"), + 0, + O(), + fz::datetime(fz::datetime::utc, calcYear(4, 4), 4, 5, 0, 0) + }, + DEFAULT + })); /* std::wstring name; @@ -1428,55 +1450,52 @@ */ // Fix line endings - for (auto iter = m_entries.begin(); iter != m_entries.end(); iter++) - iter->data += "\r\n"; + for (auto & entry : m_entries) { + entry.data += "\r\n"; + } } void CDirectoryListingParserTest::testIndividual() { - m_sync.Enter(); + m_sync.lock(); static int index = 0; - const t_entry &entry = m_entries[index++]; + t_entry const& entry = m_entries[index++]; - m_sync.Leave(); + m_sync.unlock(); CServer server; server.SetType(entry.serverType); CDirectoryListingParser parser(0, server); - const char* str = entry.data.c_str(); - const int len = strlen(str); + size_t const len = entry.data.size(); char* data = new char[len]; - memcpy(data, str, len); + memcpy(data, entry.data.c_str(), len); parser.AddData(data, len); CDirectoryListing listing = parser.Parse(CServerPath()); - wxString msg = wxString::Format(_T("Data: %s, count: %d"), wxString(entry.data.c_str(), wxConvUTF8).c_str(), listing.GetCount()); - msg.Replace(_T("\r"), _T("")); - msg.Replace(_T("\n"), _T("")); - wxWX2MBbuf mb_buf = msg.mb_str(wxConvUTF8); - CPPUNIT_ASSERT_MESSAGE((const char*)mb_buf, listing.GetCount() == 1); - - msg = wxString::Format(_T("Data: %s Expected:\n%s\n Got:\n%s"), wxString(entry.data.c_str(), wxConvUTF8).c_str(), entry.reference.dump().c_str(), listing[0].dump().c_str()); - mb_buf = msg.mb_str(wxConvUTF8); - CPPUNIT_ASSERT_MESSAGE((const char*)mb_buf, listing[0] == entry.reference); + std::string msg = fz::sprintf("Data: %s, count: %d", entry.data, listing.GetCount()); + fz::replace_substrings(msg, "\r", std::string()); + fz::replace_substrings(msg, "\n", std::string()); + + CPPUNIT_ASSERT_MESSAGE(msg, listing.GetCount() == 1); + + msg = fz::sprintf("Data: %s Expected:\n%s\n Got:\n%s", entry.data, entry.reference.dump(), listing[0].dump()); + CPPUNIT_ASSERT_MESSAGE(msg, listing[0] == entry.reference); } void CDirectoryListingParserTest::testAll() { CServer server; CDirectoryListingParser parser(0, server); - for (std::vector::const_iterator iter = m_entries.begin(); iter != m_entries.end(); iter++) - { - server.SetType(iter->serverType); + for (auto const& entry : m_entries) { + server.SetType(entry.serverType); parser.SetServer(server); - const char* str = iter->data.c_str(); - const int len = strlen(str); + size_t const len = entry.data.size(); char* data = new char[len]; - memcpy(data, str, len); + memcpy(data, entry.data.c_str(), len); parser.AddData(data, len); } CDirectoryListing listing = parser.Parse(CServerPath()); @@ -1484,11 +1503,10 @@ CPPUNIT_ASSERT(listing.GetCount() == m_entries.size()); unsigned int i = 0; - for (std::vector::const_iterator iter = m_entries.begin(); iter != m_entries.end(); iter++, i++) - { - wxString msg = wxString::Format(_T("Data: %s Expected:\n%s\n Got:\n%s"), wxString(iter->data.c_str(), wxConvUTF8).c_str(), iter->reference.dump().c_str(), listing[i].dump().c_str()); + for (auto iter = m_entries.begin(); iter != m_entries.end(); iter++, i++) { + std::string msg = fz::sprintf("Data: %s Expected:\n%s\n Got:\n%s", iter->data, iter->reference.dump(), listing[i].dump()); - CPPUNIT_ASSERT_MESSAGE((const char*)msg.mb_str(wxConvUTF8), listing[i] == iter->reference); + CPPUNIT_ASSERT_MESSAGE(msg, listing[i] == iter->reference); } } diff -Nru filezilla-3.15.0.2/tests/localpathtest.cpp filezilla-3.33.0/tests/localpathtest.cpp --- filezilla-3.15.0.2/tests/localpathtest.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/tests/localpathtest.cpp 2017-01-09 16:00:56.000000000 +0000 @@ -6,7 +6,7 @@ * This testsuite asserts the correctness of the CLocalPathTest class. */ -class CLocalPathTest : public CppUnit::TestFixture +class CLocalPathTest final : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(CLocalPathTest); CPPUNIT_TEST(testSetPath); @@ -38,61 +38,61 @@ void CLocalPathTest::testSetPath() { #ifdef __WXMSW__ - CPPUNIT_ASSERT(CLocalPath(_T("\\")).GetPath() == _T("\\")); + CPPUNIT_ASSERT(CLocalPath(L"\\").GetPath() == L"\\"); - CPPUNIT_ASSERT(CLocalPath(_T("C:")).GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\")).GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\.")).GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\.\\")).GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\.")).GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\..")).GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\..\\")).GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\foo")).GetPath() == _T("C:\\foo\\")); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\..\\foo\\")).GetPath() == _T("C:\\foo\\")); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\foo\\..\\bar")).GetPath() == _T("C:\\bar\\")); - - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo")).GetPath() == _T("\\\\foo\\")); - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo\\")).GetPath() == _T("\\\\foo\\")); - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo/")).GetPath() == _T("\\\\foo\\")); - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo/..")).GetPath() == _T("\\\\foo\\")); - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo\\.")).GetPath() == _T("\\\\foo\\")); - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo\\.\\")).GetPath() == _T("\\\\foo\\")); - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo\\bar\\")).GetPath() == _T("\\\\foo\\bar\\")); - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo\\bar\\.\\..")).GetPath() == _T("\\\\foo\\")); + CPPUNIT_ASSERT(CLocalPath(L"C:").GetPath() == L"C:\\"); + CPPUNIT_ASSERT(CLocalPath(L"C:\\").GetPath() == L"C:\\"); + CPPUNIT_ASSERT(CLocalPath(L"C:\\.").GetPath() == L"C:\\"); + CPPUNIT_ASSERT(CLocalPath(L"C:\\.\\").GetPath() == L"C:\\"); + CPPUNIT_ASSERT(CLocalPath(L"C:\\.").GetPath() == L"C:\\"); + CPPUNIT_ASSERT(CLocalPath(L"C:\\..").GetPath() == L"C:\\"); + CPPUNIT_ASSERT(CLocalPath(L"C:\\..\\").GetPath() == L"C:\\"); + CPPUNIT_ASSERT(CLocalPath(L"C:\\foo").GetPath() == L"C:\\foo\\"); + CPPUNIT_ASSERT(CLocalPath(L"C:\\..\\foo\\").GetPath() == L"C:\\foo\\"); + CPPUNIT_ASSERT(CLocalPath(L"C:\\foo\\..\\bar").GetPath() == L"C:\\bar\\"); + + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo").GetPath() == L"\\\\foo\\"); + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo\\").GetPath() == L"\\\\foo\\"); + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo/").GetPath() == L"\\\\foo\\"); + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo/..").GetPath() == L"\\\\foo\\"); + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo\\.").GetPath() == L"\\\\foo\\"); + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo\\.\\").GetPath() == L"\\\\foo\\"); + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo\\bar\\").GetPath() == L"\\\\foo\\bar\\"); + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo\\bar\\.\\..").GetPath() == L"\\\\foo\\"); #else - CPPUNIT_ASSERT(CLocalPath(_T("/")).GetPath() == _T("/")); - CPPUNIT_ASSERT(CLocalPath(_T("/foo")).GetPath() == _T("/foo/")); - CPPUNIT_ASSERT(CLocalPath(_T("//foo//")).GetPath() == _T("/foo/")); - CPPUNIT_ASSERT(CLocalPath(_T("/foo/../foo")).GetPath() == _T("/foo/")); - CPPUNIT_ASSERT(CLocalPath(_T("/foo/..")).GetPath() == _T("/")); - CPPUNIT_ASSERT(CLocalPath(_T("/..")).GetPath() == _T("/")); - CPPUNIT_ASSERT(CLocalPath(_T("/foo/.")).GetPath() == _T("/foo/")); - CPPUNIT_ASSERT(CLocalPath(_T("/foo/./")).GetPath() == _T("/foo/")); - CPPUNIT_ASSERT(CLocalPath(_T("/foo/bar/")).GetPath() == _T("/foo/bar/")); - CPPUNIT_ASSERT(CLocalPath(_T("/foo/bar/./..")).GetPath() == _T("/foo/")); + CPPUNIT_ASSERT(CLocalPath(L"/").GetPath() == L"/"); + CPPUNIT_ASSERT(CLocalPath(L"/foo").GetPath() == L"/foo/"); + CPPUNIT_ASSERT(CLocalPath(L"//foo//").GetPath() == L"/foo/"); + CPPUNIT_ASSERT(CLocalPath(L"/foo/../foo").GetPath() == L"/foo/"); + CPPUNIT_ASSERT(CLocalPath(L"/foo/..").GetPath() == L"/"); + CPPUNIT_ASSERT(CLocalPath(L"/..").GetPath() == L"/"); + CPPUNIT_ASSERT(CLocalPath(L"/foo/.").GetPath() == L"/foo/"); + CPPUNIT_ASSERT(CLocalPath(L"/foo/./").GetPath() == L"/foo/"); + CPPUNIT_ASSERT(CLocalPath(L"/foo/bar/").GetPath() == L"/foo/bar/"); + CPPUNIT_ASSERT(CLocalPath(L"/foo/bar/./..").GetPath() == L"/foo/"); #endif } void CLocalPathTest::testChangePath() { #ifdef __WXMSW__ - CLocalPath p1(_T("C:\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T("\\")) && p1.GetPath() == _T("\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T("C:")) && p1.GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T("C:\\.")) && p1.GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T("C:\\..")) && p1.GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T("foo")) && p1.GetPath() == _T("C:\\foo\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T("..")) && p1.GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T("..")) && p1.GetPath() == _T("C:\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T("C:\\foo")) && p1.GetPath() == _T("C:\\foo\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T(".")) && p1.GetPath() == _T("C:\\foo\\")); - CPPUNIT_ASSERT(p1.ChangePath(_T("..\\bar")) && p1.GetPath() == _T("C:\\bar\\")); + CLocalPath p1(L"C:\\"); + CPPUNIT_ASSERT(p1.ChangePath(L"\\") && p1.GetPath() == L"\\"); + CPPUNIT_ASSERT(p1.ChangePath(L"C:") && p1.GetPath() == L"C:\\"); + CPPUNIT_ASSERT(p1.ChangePath(L"C:\\.") && p1.GetPath() == L"C:\\"); + CPPUNIT_ASSERT(p1.ChangePath(L"C:\\..") && p1.GetPath() == L"C:\\"); + CPPUNIT_ASSERT(p1.ChangePath(L"foo") && p1.GetPath() == L"C:\\foo\\"); + CPPUNIT_ASSERT(p1.ChangePath(L"..") && p1.GetPath() == L"C:\\"); + CPPUNIT_ASSERT(p1.ChangePath(L"..") && p1.GetPath() == L"C:\\"); + CPPUNIT_ASSERT(p1.ChangePath(L"C:\\foo") && p1.GetPath() == L"C:\\foo\\"); + CPPUNIT_ASSERT(p1.ChangePath(L".") && p1.GetPath() == L"C:\\foo\\"); + CPPUNIT_ASSERT(p1.ChangePath(L"..\\bar") && p1.GetPath() == L"C:\\bar\\"); CLocalPath p2; - CPPUNIT_ASSERT(p2.ChangePath(_T("\\\\foo")) && p2.GetPath() == _T("\\\\foo\\")); - CPPUNIT_ASSERT(p2.ChangePath(_T(".")) && p2.GetPath() == _T("\\\\foo\\")); - CPPUNIT_ASSERT(p2.ChangePath(_T("..")) && p2.GetPath() == _T("\\\\foo\\")); - CPPUNIT_ASSERT(p2.ChangePath(_T("..\\bar\\.\\baz\\..")) && p2.GetPath() == _T("\\\\foo\\bar\\")); + CPPUNIT_ASSERT(p2.ChangePath(L"\\\\foo") && p2.GetPath() == L"\\\\foo\\"); + CPPUNIT_ASSERT(p2.ChangePath(L".") && p2.GetPath() == L"\\\\foo\\"); + CPPUNIT_ASSERT(p2.ChangePath(L"..") && p2.GetPath() == L"\\\\foo\\"); + CPPUNIT_ASSERT(p2.ChangePath(L"..\\bar\\.\\baz\\..") && p2.GetPath() == L"\\\\foo\\bar\\"); #else #endif } @@ -100,45 +100,45 @@ void CLocalPathTest::testHasParent() { #ifdef __WXMSW__ - CPPUNIT_ASSERT(!CLocalPath(_T("\\")).HasParent()); + CPPUNIT_ASSERT(!CLocalPath(L"\\").HasParent()); - CPPUNIT_ASSERT(!CLocalPath(_T("C:\\")).HasParent()); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\foo")).HasParent()); - CPPUNIT_ASSERT(CLocalPath(_T("c:\\foo\\bar\\")).HasParent()); + CPPUNIT_ASSERT(!CLocalPath(L"C:\\").HasParent()); + CPPUNIT_ASSERT(CLocalPath(L"C:\\foo").HasParent()); + CPPUNIT_ASSERT(CLocalPath(L"c:\\foo\\bar\\").HasParent()); - CPPUNIT_ASSERT(!CLocalPath(_T("\\\\foo")).HasParent()); - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo\\bar")).HasParent()); + CPPUNIT_ASSERT(!CLocalPath(L"\\\\foo").HasParent()); + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo\\bar").HasParent()); #else - CPPUNIT_ASSERT(!CLocalPath(_T("/")).HasParent()); - CPPUNIT_ASSERT(CLocalPath(_T("/foo")).HasParent()); - CPPUNIT_ASSERT(CLocalPath(_T("/foo/bar")).HasParent()); + CPPUNIT_ASSERT(!CLocalPath(L"/").HasParent()); + CPPUNIT_ASSERT(CLocalPath(L"/foo").HasParent()); + CPPUNIT_ASSERT(CLocalPath(L"/foo/bar").HasParent()); #endif } #ifdef __WXMSW__ void CLocalPathTest::testHasLogicalParent() { - CPPUNIT_ASSERT(!CLocalPath(_T("\\")).HasLogicalParent()); + CPPUNIT_ASSERT(!CLocalPath(L"\\").HasLogicalParent()); - CPPUNIT_ASSERT(CLocalPath(_T("C:\\")).HasLogicalParent()); // This one's only difference - CPPUNIT_ASSERT(CLocalPath(_T("C:\\foo")).HasLogicalParent()); - CPPUNIT_ASSERT(CLocalPath(_T("c:\\foo\\bar\\")).HasLogicalParent()); + CPPUNIT_ASSERT(CLocalPath(L"C:\\").HasLogicalParent()); // This one's only difference + CPPUNIT_ASSERT(CLocalPath(L"C:\\foo").HasLogicalParent()); + CPPUNIT_ASSERT(CLocalPath(L"c:\\foo\\bar\\").HasLogicalParent()); - CPPUNIT_ASSERT(!CLocalPath(_T("\\\\foo")).HasLogicalParent()); - CPPUNIT_ASSERT(CLocalPath(_T("\\\\foo\\bar")).HasLogicalParent()); + CPPUNIT_ASSERT(!CLocalPath(L"\\\\foo").HasLogicalParent()); + CPPUNIT_ASSERT(CLocalPath(L"\\\\foo\\bar").HasLogicalParent()); } #endif void CLocalPathTest::testAddSegment() { #ifdef __WXMSW__ - CLocalPath a(_T("c:\\foo")); + CLocalPath a(L"c:\\foo"); #else - CLocalPath a(_T("/foo")); + CLocalPath a(L"/foo"); #endif CLocalPath b(a); - a.AddSegment(_T("")); + a.AddSegment(L""); CPPUNIT_ASSERT(a == b); CPPUNIT_ASSERT(a.GetPath() == b.GetPath()); } diff -Nru filezilla-3.15.0.2/tests/Makefile.am filezilla-3.33.0/tests/Makefile.am --- filezilla-3.15.0.2/tests/Makefile.am 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/tests/Makefile.am 2017-09-19 21:36:39.000000000 +0000 @@ -15,12 +15,12 @@ test_CPPFLAGS += $(WX_CPPFLAGS) test_CXXFLAGS = $(WX_CXXFLAGS_ONLY) $(CPPUNIT_CFLAGS) -test_LDFLAGS = $(CPPUNIT_LIBS) -test_LDFLAGS += ../src/engine/libengine.a +test_LDFLAGS = ../src/engine/libengine.a test_LDFLAGS += $(LIBFILEZILLA_LIBS) test_LDFLAGS += $(LIBGNUTLS_LIBS) test_LDFLAGS += $(WX_LIBS) test_LDFLAGS += $(IDN_LIB) test_LDFLAGS += $(LIBSQLITE3_LIBS) +test_LDFLAGS += $(CPPUNIT_LIBS) test_DEPENDENCIES = ../src/engine/libengine.a diff -Nru filezilla-3.15.0.2/tests/Makefile.in filezilla-3.33.0/tests/Makefile.in --- filezilla-3.15.0.2/tests/Makefile.in 2016-02-10 19:38:52.000000000 +0000 +++ filezilla-3.33.0/tests/Makefile.in 2018-05-07 08:45:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ # Rules for the test code (use `make check` to execute) VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,16 +92,17 @@ TESTS = test$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_define.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/check_atomic.m4 \ + $(top_srcdir)/m4/check_clock_gettime.m4 \ $(top_srcdir)/m4/check_libc++.m4 \ $(top_srcdir)/m4/check_steady_clock.m4 \ $(top_srcdir)/m4/check_thread_local.m4 \ - $(top_srcdir)/m4/check_time.m4 $(top_srcdir)/m4/cppunit.m4 \ + $(top_srcdir)/m4/check_time.m4 \ $(top_srcdir)/m4/cxx_compile_stdcxx_14.m4 \ $(top_srcdir)/m4/d-type.m4 \ $(top_srcdir)/m4/fz_check_pugixml.m4 \ @@ -103,6 +114,7 @@ $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/config.h CONFIG_CLEAN_FILES = @@ -384,6 +396,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \ + $(top_srcdir)/config/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -395,11 +409,11 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CFBUNDLEIDSUFFIX = @CFBUNDLEIDSUFFIX@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -423,6 +437,8 @@ FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@ GREP = @GREP@ HAVE_CXX14 = @HAVE_CXX14@ +HOGWEED_CFLAGS = @HOGWEED_CFLAGS@ +HOGWEED_LIBS = @HOGWEED_LIBS@ IDN_LIB = @IDN_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -443,16 +459,24 @@ LIBS = @LIBS@ LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@ LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@ +LIBSTORJ_CFLAGS = @LIBSTORJ_CFLAGS@ +LIBSTORJ_LIBS = @LIBSTORJ_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +NETTLE_CFLAGS = @NETTLE_CFLAGS@ +NETTLE_LIBS = @NETTLE_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NSIS_64BIT = @NSIS_64BIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -504,6 +528,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -543,6 +568,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -563,9 +589,9 @@ test_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/engine \ $(LIBFILEZILLA_CFLAGS) $(WX_CPPFLAGS) test_CXXFLAGS = $(WX_CXXFLAGS_ONLY) $(CPPUNIT_CFLAGS) -test_LDFLAGS = $(CPPUNIT_LIBS) ../src/engine/libengine.a \ - $(LIBFILEZILLA_LIBS) $(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB) \ - $(LIBSQLITE3_LIBS) +test_LDFLAGS = ../src/engine/libengine.a $(LIBFILEZILLA_LIBS) \ + $(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB) $(LIBSQLITE3_LIBS) \ + $(CPPUNIT_LIBS) test_DEPENDENCIES = ../src/engine/libengine.a all: all-am @@ -583,7 +609,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -806,7 +831,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1095,6 +1120,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru filezilla-3.15.0.2/tests/serverpathtest.cpp filezilla-3.33.0/tests/serverpathtest.cpp --- filezilla-3.15.0.2/tests/serverpathtest.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/tests/serverpathtest.cpp 2017-01-09 16:00:56.000000000 +0000 @@ -7,7 +7,7 @@ * This testsuite asserts the correctness of the CServerPath class. */ -class CServerPathTest : public CppUnit::TestFixture +class CServerPathTest final : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(CServerPathTest); CPPUNIT_TEST(testGetPath); @@ -38,268 +38,297 @@ void CServerPathTest::testGetPath() { - const CServerPath unix1(_T("/")); - CPPUNIT_ASSERT(unix1.GetPath() == _T("/")); + const CServerPath unix1(L"/"); + CPPUNIT_ASSERT(unix1.GetPath() == L"/"); - const CServerPath unix2(_T("/foo")); - CPPUNIT_ASSERT(unix2.GetPath() == _T("/foo")); + const CServerPath unix2(L"/foo"); + CPPUNIT_ASSERT(unix2.GetPath() == L"/foo"); - const CServerPath unix3(_T("/foo/bar")); - CPPUNIT_ASSERT(unix3.GetPath() == _T("/foo/bar")); + const CServerPath unix3(L"/foo/bar"); + CPPUNIT_ASSERT(unix3.GetPath() == L"/foo/bar"); - const CServerPath vms1(_T("FOO:[BAR]")); - CPPUNIT_ASSERT(vms1.GetPath() == _T("FOO:[BAR]")); + const CServerPath vms1(L"FOO:[BAR]"); + CPPUNIT_ASSERT(vms1.GetPath() == L"FOO:[BAR]"); - const CServerPath vms2(_T("FOO:[BAR.TEST]")); - CPPUNIT_ASSERT(vms2.GetPath() == _T("FOO:[BAR.TEST]")); + const CServerPath vms2(L"FOO:[BAR.TEST]"); + CPPUNIT_ASSERT(vms2.GetPath() == L"FOO:[BAR.TEST]"); - const CServerPath vms3(_T("FOO:[BAR^.TEST]")); - CPPUNIT_ASSERT(vms3.GetPath() == _T("FOO:[BAR^.TEST]")); + const CServerPath vms3(L"FOO:[BAR^.TEST]"); + CPPUNIT_ASSERT(vms3.GetPath() == L"FOO:[BAR^.TEST]"); - const CServerPath vms4(_T("FOO:[BAR^.TEST.SOMETHING]")); - CPPUNIT_ASSERT(vms4.GetPath() == _T("FOO:[BAR^.TEST.SOMETHING]")); + const CServerPath vms4(L"FOO:[BAR^.TEST.SOMETHING]"); + CPPUNIT_ASSERT(vms4.GetPath() == L"FOO:[BAR^.TEST.SOMETHING]"); - const CServerPath dos1(_T("C:\\")); - CPPUNIT_ASSERT(dos1.GetPath() == _T("C:\\")); + const CServerPath dos1(L"C:\\"); + CPPUNIT_ASSERT(dos1.GetPath() == L"C:\\"); - const CServerPath dos2(_T("C:\\FOO")); - CPPUNIT_ASSERT(dos2.GetPath() == _T("C:\\FOO")); + const CServerPath dos2(L"C:\\FOO"); + CPPUNIT_ASSERT(dos2.GetPath() == L"C:\\FOO"); - const CServerPath dos3(_T("md:\\"), DOS); - CPPUNIT_ASSERT(dos3.GetPath() == _T("md:\\")); + const CServerPath dos3(L"md:\\", DOS); + CPPUNIT_ASSERT(dos3.GetPath() == L"md:\\"); - const CServerPath dos4(_T("C:"), DOS); - CPPUNIT_ASSERT(dos4.GetPath() == _T("C:\\")); + const CServerPath dos4(L"C:", DOS); + CPPUNIT_ASSERT(dos4.GetPath() == L"C:\\"); - const CServerPath dos5(_T("C:\\FOO\\")); - CPPUNIT_ASSERT(dos5.GetPath() == _T("C:\\FOO")); + const CServerPath dos5(L"C:\\FOO\\"); + CPPUNIT_ASSERT(dos5.GetPath() == L"C:\\FOO"); - const CServerPath mvs1(_T("'FOO'"), MVS); - CPPUNIT_ASSERT(mvs1.GetPath() == _T("'FOO'")); + const CServerPath mvs1(L"'FOO'", MVS); + CPPUNIT_ASSERT(mvs1.GetPath() == L"'FOO'"); - const CServerPath mvs2(_T("'FOO.'"), MVS); - CPPUNIT_ASSERT(mvs2.GetPath() == _T("'FOO.'")); + const CServerPath mvs2(L"'FOO.'", MVS); + CPPUNIT_ASSERT(mvs2.GetPath() == L"'FOO.'"); - const CServerPath mvs3(_T("'FOO.BAR'"), MVS); - CPPUNIT_ASSERT(mvs3.GetPath() == _T("'FOO.BAR'")); + const CServerPath mvs3(L"'FOO.BAR'", MVS); + CPPUNIT_ASSERT(mvs3.GetPath() == L"'FOO.BAR'"); - const CServerPath mvs4(_T("'FOO.BAR.'"), MVS); - CPPUNIT_ASSERT(mvs4.GetPath() == _T("'FOO.BAR.'")); + const CServerPath mvs4(L"'FOO.BAR.'", MVS); + CPPUNIT_ASSERT(mvs4.GetPath() == L"'FOO.BAR.'"); - const CServerPath vxworks1(_T(":foo:")); - CPPUNIT_ASSERT(vxworks1.GetPath() == _T(":foo:")); + const CServerPath vxworks1(L":foo:"); + CPPUNIT_ASSERT(vxworks1.GetPath() == L":foo:"); - const CServerPath vxworks2(_T(":foo:bar")); - CPPUNIT_ASSERT(vxworks2.GetPath() == _T(":foo:bar")); + const CServerPath vxworks2(L":foo:bar"); + CPPUNIT_ASSERT(vxworks2.GetPath() == L":foo:bar"); - const CServerPath vxworks3(_T(":foo:bar/test")); - CPPUNIT_ASSERT(vxworks3.GetPath() == _T(":foo:bar/test")); + const CServerPath vxworks3(L":foo:bar/test"); + CPPUNIT_ASSERT(vxworks3.GetPath() == L":foo:bar/test"); // ZVM is same as Unix, only makes difference in directory // listing parser. - const CServerPath zvm1(_T("/"), ZVM); - CPPUNIT_ASSERT(zvm1.GetPath() == _T("/")); + const CServerPath zvm1(L"/", ZVM); + CPPUNIT_ASSERT(zvm1.GetPath() == L"/"); - const CServerPath zvm2(_T("/foo"), ZVM); - CPPUNIT_ASSERT(zvm2.GetPath() == _T("/foo")); + const CServerPath zvm2(L"/foo", ZVM); + CPPUNIT_ASSERT(zvm2.GetPath() == L"/foo"); - const CServerPath zvm3(_T("/foo/bar"), ZVM); - CPPUNIT_ASSERT(zvm3.GetPath() == _T("/foo/bar")); + const CServerPath zvm3(L"/foo/bar", ZVM); + CPPUNIT_ASSERT(zvm3.GetPath() == L"/foo/bar"); - const CServerPath hpnonstop1(_T("\\mysys"), HPNONSTOP); - CPPUNIT_ASSERT(hpnonstop1.GetPath() == _T("\\mysys")); + const CServerPath hpnonstop1(L"\\mysys", HPNONSTOP); + CPPUNIT_ASSERT(hpnonstop1.GetPath() == L"\\mysys"); - const CServerPath hpnonstop2(_T("\\mysys.$myvol"), HPNONSTOP); - CPPUNIT_ASSERT(hpnonstop2.GetPath() == _T("\\mysys.$myvol")); + const CServerPath hpnonstop2(L"\\mysys.$myvol", HPNONSTOP); + CPPUNIT_ASSERT(hpnonstop2.GetPath() == L"\\mysys.$myvol"); - const CServerPath hpnonstop3(_T("\\mysys.$myvol.mysubvol"), HPNONSTOP); - CPPUNIT_ASSERT(hpnonstop3.GetPath() == _T("\\mysys.$myvol.mysubvol")); + const CServerPath hpnonstop3(L"\\mysys.$myvol.mysubvol", HPNONSTOP); + CPPUNIT_ASSERT(hpnonstop3.GetPath() == L"\\mysys.$myvol.mysubvol"); - const CServerPath dos_virtual1(_T("\\")); - CPPUNIT_ASSERT(dos_virtual1.GetPath() == _T("\\")); + const CServerPath dos_virtual1(L"\\"); + CPPUNIT_ASSERT(dos_virtual1.GetPath() == L"\\"); - const CServerPath dos_virtual2(_T("\\foo")); - CPPUNIT_ASSERT(dos_virtual2.GetPath() == _T("\\foo")); + const CServerPath dos_virtual2(L"\\foo"); + CPPUNIT_ASSERT(dos_virtual2.GetPath() == L"\\foo"); - const CServerPath dos_virtual3(_T("\\foo\\bar")); - CPPUNIT_ASSERT(dos_virtual3.GetPath() == _T("\\foo\\bar")); + const CServerPath dos_virtual3(L"\\foo\\bar"); + CPPUNIT_ASSERT(dos_virtual3.GetPath() == L"\\foo\\bar"); - const CServerPath cygwin1(_T("/"), CYGWIN); - CPPUNIT_ASSERT(cygwin1.GetPath() == _T("/")); + const CServerPath cygwin1(L"/", CYGWIN); + CPPUNIT_ASSERT(cygwin1.GetPath() == L"/"); - const CServerPath cygwin2(_T("/foo"), CYGWIN); - CPPUNIT_ASSERT(cygwin2.GetPath() == _T("/foo")); + const CServerPath cygwin2(L"/foo", CYGWIN); + CPPUNIT_ASSERT(cygwin2.GetPath() == L"/foo"); - const CServerPath cygwin3(_T("//"), CYGWIN); - CPPUNIT_ASSERT(cygwin3.GetPath() == _T("//")); + const CServerPath cygwin3(L"//", CYGWIN); + CPPUNIT_ASSERT(cygwin3.GetPath() == L"//"); - const CServerPath cygwin4(_T("//foo"), CYGWIN); - CPPUNIT_ASSERT(cygwin4.GetPath() == _T("//foo")); + const CServerPath cygwin4(L"//foo", CYGWIN); + CPPUNIT_ASSERT(cygwin4.GetPath() == L"//foo"); + + + const CServerPath dos_slashes1(L"C:\\", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes1.GetPath() == L"C:/"); + + const CServerPath dos_slashes2(L"C:\\FOO", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes2.GetPath() == L"C:/FOO"); + + const CServerPath dos_slashes3(L"md:\\", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes3.GetPath() == L"md:/"); + + const CServerPath dos_slashes4(L"C:", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes4.GetPath() == L"C:/"); + + const CServerPath dos_slashes5(L"C:\\FOO\\", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes5.GetPath() == L"C:/FOO"); } void CServerPathTest::testHasParent() { - const CServerPath unix1(_T("/")); + const CServerPath unix1(L"/"); CPPUNIT_ASSERT(!unix1.HasParent()); - const CServerPath unix2(_T("/foo")); + const CServerPath unix2(L"/foo"); CPPUNIT_ASSERT(unix2.HasParent()); - const CServerPath unix3(_T("/foo/bar")); + const CServerPath unix3(L"/foo/bar"); CPPUNIT_ASSERT(unix3.HasParent()); - const CServerPath vms1(_T("FOO:[BAR]")); + const CServerPath vms1(L"FOO:[BAR]"); CPPUNIT_ASSERT(!vms1.HasParent()); - const CServerPath vms2(_T("FOO:[BAR.TEST]")); + const CServerPath vms2(L"FOO:[BAR.TEST]"); CPPUNIT_ASSERT(vms2.HasParent()); - const CServerPath vms3(_T("FOO:[BAR^.TEST]")); + const CServerPath vms3(L"FOO:[BAR^.TEST]"); CPPUNIT_ASSERT(!vms3.HasParent()); - const CServerPath vms4(_T("FOO:[BAR^.TEST.SOMETHING]")); + const CServerPath vms4(L"FOO:[BAR^.TEST.SOMETHING]"); CPPUNIT_ASSERT(vms4.HasParent()); - const CServerPath dos1(_T("C:\\")); + const CServerPath dos1(L"C:\\"); CPPUNIT_ASSERT(!dos1.HasParent()); - const CServerPath dos2(_T("C:\\FOO")); + const CServerPath dos2(L"C:\\FOO"); CPPUNIT_ASSERT(dos2.HasParent()); - const CServerPath mvs1(_T("'FOO'"), MVS); + const CServerPath mvs1(L"'FOO'", MVS); CPPUNIT_ASSERT(!mvs1.HasParent()); - const CServerPath mvs2(_T("'FOO.'"), MVS); + const CServerPath mvs2(L"'FOO.'", MVS); CPPUNIT_ASSERT(!mvs2.HasParent()); - const CServerPath mvs3(_T("'FOO.BAR'"), MVS); + const CServerPath mvs3(L"'FOO.BAR'", MVS); CPPUNIT_ASSERT(mvs3.HasParent()); - const CServerPath mvs4(_T("'FOO.BAR.'"), MVS); + const CServerPath mvs4(L"'FOO.BAR.'", MVS); CPPUNIT_ASSERT(mvs4.HasParent()); - const CServerPath vxworks1(_T(":foo:")); + const CServerPath vxworks1(L":foo:"); CPPUNIT_ASSERT(!vxworks1.HasParent()); - const CServerPath vxworks2(_T(":foo:bar")); + const CServerPath vxworks2(L":foo:bar"); CPPUNIT_ASSERT(vxworks2.HasParent()); - const CServerPath vxworks3(_T(":foo:bar/test")); + const CServerPath vxworks3(L":foo:bar/test"); CPPUNIT_ASSERT(vxworks3.HasParent()); // ZVM is same as Unix, only makes difference in directory // listing parser. - const CServerPath zvm1(_T("/"), ZVM); + const CServerPath zvm1(L"/", ZVM); CPPUNIT_ASSERT(!zvm1.HasParent()); - const CServerPath zvm2(_T("/foo"), ZVM); + const CServerPath zvm2(L"/foo", ZVM); CPPUNIT_ASSERT(zvm2.HasParent()); - const CServerPath zvm3(_T("/foo/bar"), ZVM); + const CServerPath zvm3(L"/foo/bar", ZVM); CPPUNIT_ASSERT(zvm3.HasParent()); - const CServerPath hpnonstop1(_T("\\mysys"), HPNONSTOP); + const CServerPath hpnonstop1(L"\\mysys", HPNONSTOP); CPPUNIT_ASSERT(!hpnonstop1.HasParent()); - const CServerPath hpnonstop2(_T("\\mysys.$myvol"), HPNONSTOP); + const CServerPath hpnonstop2(L"\\mysys.$myvol", HPNONSTOP); CPPUNIT_ASSERT(hpnonstop2.HasParent()); - const CServerPath hpnonstop3(_T("\\mysys.$myvol.mysubvol"), HPNONSTOP); + const CServerPath hpnonstop3(L"\\mysys.$myvol.mysubvol", HPNONSTOP); CPPUNIT_ASSERT(hpnonstop3.HasParent()); - const CServerPath dos_virtual1(_T("\\")); + const CServerPath dos_virtual1(L"\\"); CPPUNIT_ASSERT(!dos_virtual1.HasParent()); - const CServerPath dos_virtual2(_T("\\foo")); + const CServerPath dos_virtual2(L"\\foo"); CPPUNIT_ASSERT(dos_virtual2.HasParent()); - const CServerPath dos_virtual3(_T("\\foo\\bar")); + const CServerPath dos_virtual3(L"\\foo\\bar"); CPPUNIT_ASSERT(dos_virtual3.HasParent()); - const CServerPath cygwin1(_T("/"), CYGWIN); + const CServerPath cygwin1(L"/", CYGWIN); CPPUNIT_ASSERT(!cygwin1.HasParent()); - const CServerPath cygwin2(_T("/foo"), CYGWIN); + const CServerPath cygwin2(L"/foo", CYGWIN); CPPUNIT_ASSERT(cygwin2.HasParent()); - const CServerPath cygwin3(_T("/foo/bar"), CYGWIN); + const CServerPath cygwin3(L"/foo/bar", CYGWIN); CPPUNIT_ASSERT(cygwin3.HasParent()); - const CServerPath cygwin4(_T("//"), CYGWIN); + const CServerPath cygwin4(L"//", CYGWIN); CPPUNIT_ASSERT(!cygwin4.HasParent()); - const CServerPath cygwin5(_T("//foo"), CYGWIN); + const CServerPath cygwin5(L"//foo", CYGWIN); CPPUNIT_ASSERT(cygwin5.HasParent()); - const CServerPath cygwin6(_T("//foo/bar"), CYGWIN); + const CServerPath cygwin6(L"//foo/bar", CYGWIN); CPPUNIT_ASSERT(cygwin6.HasParent()); + + + const CServerPath dos_slashes1(L"C:\\", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(!dos_slashes1.HasParent()); + + const CServerPath dos_slashes2(L"C:\\FOO", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes2.HasParent()); + } void CServerPathTest::testGetParent() { - const CServerPath unix1(_T("/")); - const CServerPath unix2(_T("/foo")); - const CServerPath unix3(_T("/foo/bar")); + const CServerPath unix1(L"/"); + const CServerPath unix2(L"/foo"); + const CServerPath unix3(L"/foo/bar"); CPPUNIT_ASSERT(unix2.GetParent() == unix1); CPPUNIT_ASSERT(unix3.GetParent() == unix2); - const CServerPath vms1(_T("FOO:[BAR]")); - const CServerPath vms2(_T("FOO:[BAR.TEST]")); - const CServerPath vms3(_T("FOO:[BAR^.TEST]")); - const CServerPath vms4(_T("FOO:[BAR^.TEST.SOMETHING]")); + const CServerPath vms1(L"FOO:[BAR]"); + const CServerPath vms2(L"FOO:[BAR.TEST]"); + const CServerPath vms3(L"FOO:[BAR^.TEST]"); + const CServerPath vms4(L"FOO:[BAR^.TEST.SOMETHING]"); CPPUNIT_ASSERT(vms2.GetParent() == vms1); CPPUNIT_ASSERT(vms4.GetParent() == vms3); - const CServerPath dos1(_T("C:\\")); - const CServerPath dos2(_T("C:\\FOO")); + const CServerPath dos1(L"C:\\"); + const CServerPath dos2(L"C:\\FOO"); CPPUNIT_ASSERT(dos2.GetParent() == dos1); - const CServerPath mvs1(_T("'FOO'"), MVS); - const CServerPath mvs2(_T("'FOO.'"), MVS); - const CServerPath mvs3(_T("'FOO.BAR'"), MVS); - const CServerPath mvs4(_T("'FOO.BAR.'"), MVS); + const CServerPath mvs1(L"'FOO'", MVS); + const CServerPath mvs2(L"'FOO.'", MVS); + const CServerPath mvs3(L"'FOO.BAR'", MVS); + const CServerPath mvs4(L"'FOO.BAR.'", MVS); CPPUNIT_ASSERT(mvs3.GetParent() == mvs2); CPPUNIT_ASSERT(mvs4.GetParent() == mvs2); - const CServerPath vxworks1(_T(":foo:")); - const CServerPath vxworks2(_T(":foo:bar")); - const CServerPath vxworks3(_T(":foo:bar/test")); + const CServerPath vxworks1(L":foo:"); + const CServerPath vxworks2(L":foo:bar"); + const CServerPath vxworks3(L":foo:bar/test"); CPPUNIT_ASSERT(vxworks2.GetParent() == vxworks1); CPPUNIT_ASSERT(vxworks3.GetParent() == vxworks2); // ZVM is same as Unix, only makes difference in directory // listing parser. - const CServerPath zvm1(_T("/"), ZVM); - const CServerPath zvm2(_T("/foo"), ZVM); - const CServerPath zvm3(_T("/foo/bar"), ZVM); + const CServerPath zvm1(L"/", ZVM); + const CServerPath zvm2(L"/foo", ZVM); + const CServerPath zvm3(L"/foo/bar", ZVM); CPPUNIT_ASSERT(zvm2.GetParent() == zvm1); CPPUNIT_ASSERT(zvm3.GetParent() == zvm2); - const CServerPath hpnonstop1(_T("\\mysys"), HPNONSTOP); - const CServerPath hpnonstop2(_T("\\mysys.$myvol"), HPNONSTOP); - const CServerPath hpnonstop3(_T("\\mysys.$myvol.mysubvol"), HPNONSTOP); + const CServerPath hpnonstop1(L"\\mysys", HPNONSTOP); + const CServerPath hpnonstop2(L"\\mysys.$myvol", HPNONSTOP); + const CServerPath hpnonstop3(L"\\mysys.$myvol.mysubvol", HPNONSTOP); CPPUNIT_ASSERT(hpnonstop2.GetParent() == hpnonstop1); CPPUNIT_ASSERT(hpnonstop3.GetParent() == hpnonstop2); - const CServerPath dos_virtual1(_T("\\")); - const CServerPath dos_virtual2(_T("\\foo")); - const CServerPath dos_virtual3(_T("\\foo\\bar")); + const CServerPath dos_virtual1(L"\\"); + const CServerPath dos_virtual2(L"\\foo"); + const CServerPath dos_virtual3(L"\\foo\\bar"); CPPUNIT_ASSERT(dos_virtual2.GetParent() == dos_virtual1); CPPUNIT_ASSERT(dos_virtual3.GetParent() == dos_virtual2); - const CServerPath cygwin1(_T("/"), CYGWIN); - const CServerPath cygwin2(_T("/foo"), CYGWIN); - const CServerPath cygwin3(_T("/foo/bar"), CYGWIN); - const CServerPath cygwin4(_T("//"), CYGWIN); - const CServerPath cygwin5(_T("//foo"), CYGWIN); - const CServerPath cygwin6(_T("//foo/bar"), CYGWIN); + const CServerPath cygwin1(L"/", CYGWIN); + const CServerPath cygwin2(L"/foo", CYGWIN); + const CServerPath cygwin3(L"/foo/bar", CYGWIN); + const CServerPath cygwin4(L"//", CYGWIN); + const CServerPath cygwin5(L"//foo", CYGWIN); + const CServerPath cygwin6(L"//foo/bar", CYGWIN); CPPUNIT_ASSERT(cygwin2.GetParent() == cygwin1); CPPUNIT_ASSERT(cygwin3.GetParent() == cygwin2); CPPUNIT_ASSERT(cygwin5.GetParent() == cygwin4); CPPUNIT_ASSERT(cygwin6.GetParent() == cygwin5); + + const CServerPath dos_slashes1(L"C:\\", DOS_FWD_SLASHES); + const CServerPath dos_slashes2(L"C:/FOO", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes2.GetParent() == dos_slashes1); + } void CServerPathTest::testFormatSubdir() @@ -307,37 +336,39 @@ CServerPath path; path.SetType(VMS); - CPPUNIT_ASSERT(path.FormatSubdir(_T("FOO.BAR")) == _T("FOO^.BAR")); + CPPUNIT_ASSERT(path.FormatSubdir(L"FOO.BAR") == L"FOO^.BAR"); } void CServerPathTest::testGetCommonParent() { - const CServerPath unix1(_T("/foo")); - const CServerPath unix2(_T("/foo/baz")); - const CServerPath unix3(_T("/foo/bar")); + const CServerPath unix1(L"/foo"); + const CServerPath unix2(L"/foo/baz"); + const CServerPath unix3(L"/foo/bar"); CPPUNIT_ASSERT(unix2.GetCommonParent(unix3) == unix1); CPPUNIT_ASSERT(unix1.GetCommonParent(unix1) == unix1); CPPUNIT_ASSERT(unix1.GetCommonParent(unix3) == unix1); - const CServerPath vms1(_T("FOO:[BAR]")); - const CServerPath vms2(_T("FOO:[BAR.TEST]")); - const CServerPath vms3(_T("GOO:[BAR")); - const CServerPath vms4(_T("GOO:[BAR^.TEST.SOMETHING]")); + const CServerPath vms1(L"FOO:[BAR]"); + const CServerPath vms2(L"FOO:[BAR.TEST]"); + const CServerPath vms3(L"GOO:[BAR"); + const CServerPath vms4(L"GOO:[BAR^.TEST.SOMETHING]"); CPPUNIT_ASSERT(vms2.GetCommonParent(vms1) == vms1); CPPUNIT_ASSERT(vms3.GetCommonParent(vms1) == CServerPath()); - const CServerPath dos1(_T("C:\\")); - const CServerPath dos2(_T("C:\\FOO")); - const CServerPath dos3(_T("D:\\FOO")); - CPPUNIT_ASSERT(dos1.GetCommonParent(dos2) == dos1); - CPPUNIT_ASSERT(dos2.GetCommonParent(dos3) == CServerPath()); - - const CServerPath mvs1(_T("'FOO'"), MVS); - const CServerPath mvs2(_T("'FOO.'"), MVS); - const CServerPath mvs3(_T("'FOO.BAR'"), MVS); - const CServerPath mvs4(_T("'FOO.BAR.'"), MVS); - const CServerPath mvs5(_T("'BAR.'"), MVS); - const CServerPath mvs6(_T("'FOO.BAR.BAZ'"), MVS); + { + const CServerPath dos1(L"C:\\"); + const CServerPath dos2(L"C:\\FOO"); + const CServerPath dos3(L"D:\\FOO"); + CPPUNIT_ASSERT(dos1.GetCommonParent(dos2) == dos1); + CPPUNIT_ASSERT(dos2.GetCommonParent(dos3) == CServerPath()); + } + + const CServerPath mvs1(L"'FOO'", MVS); + const CServerPath mvs2(L"'FOO.'", MVS); + const CServerPath mvs3(L"'FOO.BAR'", MVS); + const CServerPath mvs4(L"'FOO.BAR.'", MVS); + const CServerPath mvs5(L"'BAR.'", MVS); + const CServerPath mvs6(L"'FOO.BAR.BAZ'", MVS); CPPUNIT_ASSERT(mvs1.GetCommonParent(mvs2) == CServerPath()); CPPUNIT_ASSERT(mvs3.GetCommonParent(mvs1) == CServerPath()); CPPUNIT_ASSERT(mvs4.GetCommonParent(mvs3) == mvs2); @@ -348,42 +379,42 @@ CPPUNIT_ASSERT(mvs6.GetCommonParent(mvs4) == mvs4); CPPUNIT_ASSERT(mvs6.GetCommonParent(mvs3) == mvs2); - const CServerPath vxworks1(_T(":foo:")); - const CServerPath vxworks2(_T(":foo:bar")); - const CServerPath vxworks3(_T(":foo:baz")); - const CServerPath vxworks4(_T(":baz:bar")); + const CServerPath vxworks1(L":foo:"); + const CServerPath vxworks2(L":foo:bar"); + const CServerPath vxworks3(L":foo:baz"); + const CServerPath vxworks4(L":baz:bar"); CPPUNIT_ASSERT(vxworks1.GetCommonParent(vxworks2) == vxworks1); CPPUNIT_ASSERT(vxworks2.GetCommonParent(vxworks3) == vxworks1); CPPUNIT_ASSERT(vxworks4.GetCommonParent(vxworks2) == CServerPath()); // ZVM is same as Unix, only makes difference in directory // listing parser. - const CServerPath zvm1(_T("/foo"), ZVM); - const CServerPath zvm2(_T("/foo/baz"), ZVM); - const CServerPath zvm3(_T("/foo/bar"), ZVM); + const CServerPath zvm1(L"/foo", ZVM); + const CServerPath zvm2(L"/foo/baz", ZVM); + const CServerPath zvm3(L"/foo/bar", ZVM); CPPUNIT_ASSERT(zvm2.GetCommonParent(zvm3) == zvm1); CPPUNIT_ASSERT(zvm1.GetCommonParent(zvm1) == zvm1); - CServerPath hpnonstop1(_T("\\mysys"), HPNONSTOP); - CServerPath hpnonstop2(_T("\\mysys.$myvol"), HPNONSTOP); - CServerPath hpnonstop3(_T("\\mysys.$theirvol"), HPNONSTOP); - CServerPath hpnonstop4(_T("\\theirsys.$myvol"), HPNONSTOP); + CServerPath hpnonstop1(L"\\mysys", HPNONSTOP); + CServerPath hpnonstop2(L"\\mysys.$myvol", HPNONSTOP); + CServerPath hpnonstop3(L"\\mysys.$theirvol", HPNONSTOP); + CServerPath hpnonstop4(L"\\theirsys.$myvol", HPNONSTOP); CPPUNIT_ASSERT(hpnonstop2.GetCommonParent(hpnonstop3) == hpnonstop1); CPPUNIT_ASSERT(hpnonstop1.GetCommonParent(hpnonstop1) == hpnonstop1); CPPUNIT_ASSERT(hpnonstop2.GetCommonParent(hpnonstop4) == CServerPath()); - const CServerPath dos_virtual1(_T("\\foo")); - const CServerPath dos_virtual2(_T("\\foo\\baz")); - const CServerPath dos_virtual3(_T("\\foo\\bar")); + const CServerPath dos_virtual1(L"\\foo"); + const CServerPath dos_virtual2(L"\\foo\\baz"); + const CServerPath dos_virtual3(L"\\foo\\bar"); CPPUNIT_ASSERT(dos_virtual2.GetCommonParent(dos_virtual3) == dos_virtual1); CPPUNIT_ASSERT(dos_virtual1.GetCommonParent(dos_virtual1) == dos_virtual1); - const CServerPath cygwin1(_T("/foo"), CYGWIN); - const CServerPath cygwin2(_T("/foo/baz"), CYGWIN); - const CServerPath cygwin3(_T("/foo/bar"), CYGWIN); - const CServerPath cygwin4(_T("//foo"), CYGWIN); - const CServerPath cygwin5(_T("//foo/baz"), CYGWIN); - const CServerPath cygwin6(_T("//foo/bar"), CYGWIN); + const CServerPath cygwin1(L"/foo", CYGWIN); + const CServerPath cygwin2(L"/foo/baz", CYGWIN); + const CServerPath cygwin3(L"/foo/bar", CYGWIN); + const CServerPath cygwin4(L"//foo", CYGWIN); + const CServerPath cygwin5(L"//foo/baz", CYGWIN); + const CServerPath cygwin6(L"//foo/bar", CYGWIN); CPPUNIT_ASSERT(cygwin2.GetCommonParent(cygwin3) == cygwin1); CPPUNIT_ASSERT(cygwin1.GetCommonParent(cygwin1) == cygwin1); CPPUNIT_ASSERT(cygwin1.GetCommonParent(cygwin3) == cygwin1); @@ -391,223 +422,268 @@ CPPUNIT_ASSERT(cygwin4.GetCommonParent(cygwin4) == cygwin4); CPPUNIT_ASSERT(cygwin4.GetCommonParent(cygwin6) == cygwin4); CPPUNIT_ASSERT(cygwin4.GetCommonParent(cygwin1) == CServerPath()); + + { + const CServerPath dos_slashes1(L"C:\\", DOS_FWD_SLASHES); + const CServerPath dos_slashes2(L"C:\\FOO", DOS_FWD_SLASHES); + const CServerPath dos_slashes3(L"D:\\FOO", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes1.GetCommonParent(dos_slashes2) == dos_slashes1); + CPPUNIT_ASSERT(dos_slashes2.GetCommonParent(dos_slashes3) == CServerPath()); + } + } void CServerPathTest::testFormatFilename() { - const CServerPath unix1(_T("/")); - const CServerPath unix2(_T("/foo")); - CPPUNIT_ASSERT(unix1.FormatFilename(_T("bar"), false) == _T("/bar")); - CPPUNIT_ASSERT(unix2.FormatFilename(_T("bar"), false) == _T("/foo/bar")); - - const CServerPath vms1(_T("FOO:[BAR]")); - CPPUNIT_ASSERT(vms1.FormatFilename(_T("BAZ"), false) == _T("FOO:[BAR]BAZ")); - - const CServerPath dos1(_T("C:\\")); - const CServerPath dos2(_T("C:\\foo")); - CPPUNIT_ASSERT(dos1.FormatFilename(_T("bar"), false) == _T("C:\\bar")); - CPPUNIT_ASSERT(dos2.FormatFilename(_T("bar"), false) == _T("C:\\foo\\bar")); - - const CServerPath mvs1(_T("'FOO.BAR'"), MVS); - const CServerPath mvs2(_T("'FOO.BAR.'"), MVS); - CPPUNIT_ASSERT(mvs1.FormatFilename(_T("BAZ"), false) == _T("'FOO.BAR(BAZ)'")); - CPPUNIT_ASSERT(mvs2.FormatFilename(_T("BAZ"), false) == _T("'FOO.BAR.BAZ'")); - - const CServerPath vxworks1(_T(":foo:")); - const CServerPath vxworks2(_T(":foo:bar")); - const CServerPath vxworks3(_T(":foo:bar/test")); - CPPUNIT_ASSERT(vxworks1.FormatFilename(_T("baz"), false) == _T(":foo:baz")); - CPPUNIT_ASSERT(vxworks2.FormatFilename(_T("baz"), false) == _T(":foo:bar/baz")); - CPPUNIT_ASSERT(vxworks3.FormatFilename(_T("baz"), false) == _T(":foo:bar/test/baz")); + const CServerPath unix1(L"/"); + const CServerPath unix2(L"/foo"); + CPPUNIT_ASSERT(unix1.FormatFilename(L"bar", false) == L"/bar"); + CPPUNIT_ASSERT(unix2.FormatFilename(L"bar", false) == L"/foo/bar"); + + const CServerPath vms1(L"FOO:[BAR]"); + CPPUNIT_ASSERT(vms1.FormatFilename(L"BAZ", false) == L"FOO:[BAR]BAZ"); + + { + const CServerPath dos1(L"C:\\"); + const CServerPath dos2(L"C:\\foo"); + CPPUNIT_ASSERT(dos1.FormatFilename(L"bar", false) == L"C:\\bar"); + CPPUNIT_ASSERT(dos2.FormatFilename(L"bar", false) == L"C:\\foo\\bar"); + } + + const CServerPath mvs1(L"'FOO.BAR'", MVS); + const CServerPath mvs2(L"'FOO.BAR.'", MVS); + CPPUNIT_ASSERT(mvs1.FormatFilename(L"BAZ", false) == L"'FOO.BAR(BAZ)'"); + CPPUNIT_ASSERT(mvs2.FormatFilename(L"BAZ", false) == L"'FOO.BAR.BAZ'"); + + const CServerPath vxworks1(L":foo:"); + const CServerPath vxworks2(L":foo:bar"); + const CServerPath vxworks3(L":foo:bar/test"); + CPPUNIT_ASSERT(vxworks1.FormatFilename(L"baz", false) == L":foo:baz"); + CPPUNIT_ASSERT(vxworks2.FormatFilename(L"baz", false) == L":foo:bar/baz"); + CPPUNIT_ASSERT(vxworks3.FormatFilename(L"baz", false) == L":foo:bar/test/baz"); // ZVM is same as Unix, only makes difference in directory // listing parser. - const CServerPath zvm1(_T("/"), ZVM); - const CServerPath zvm2(_T("/foo"), ZVM); - CPPUNIT_ASSERT(zvm1.FormatFilename(_T("bar"), false) == _T("/bar")); - CPPUNIT_ASSERT(zvm2.FormatFilename(_T("bar"), false) == _T("/foo/bar")); - - const CServerPath hpnonstop1(_T("\\mysys"), HPNONSTOP); - const CServerPath hpnonstop2(_T("\\mysys.$myvol"), HPNONSTOP); - const CServerPath hpnonstop3(_T("\\mysys.$myvol.mysubvol"), HPNONSTOP); - CPPUNIT_ASSERT(hpnonstop1.FormatFilename(_T("foo"), false) == _T("\\mysys.foo")); - CPPUNIT_ASSERT(hpnonstop2.FormatFilename(_T("foo"), false) == _T("\\mysys.$myvol.foo")); - CPPUNIT_ASSERT(hpnonstop3.FormatFilename(_T("foo"), false) == _T("\\mysys.$myvol.mysubvol.foo")); - - const CServerPath dos_virtual1(_T("/")); - const CServerPath dos_virtual2(_T("/foo")); - CPPUNIT_ASSERT(dos_virtual1.FormatFilename(_T("bar"), false) == _T("/bar")); - CPPUNIT_ASSERT(dos_virtual2.FormatFilename(_T("bar"), false) == _T("/foo/bar")); - - const CServerPath cygwin1(_T("/"), CYGWIN); - const CServerPath cygwin2(_T("/foo"), CYGWIN); - const CServerPath cygwin3(_T("//"), CYGWIN); - const CServerPath cygwin4(_T("//foo"), CYGWIN); - CPPUNIT_ASSERT(cygwin1.FormatFilename(_T("bar"), false) == _T("/bar")); - CPPUNIT_ASSERT(cygwin2.FormatFilename(_T("bar"), false) == _T("/foo/bar")); - CPPUNIT_ASSERT(cygwin3.FormatFilename(_T("bar"), false) == _T("//bar")); - CPPUNIT_ASSERT(cygwin4.FormatFilename(_T("bar"), false) == _T("//foo/bar")); + const CServerPath zvm1(L"/", ZVM); + const CServerPath zvm2(L"/foo", ZVM); + CPPUNIT_ASSERT(zvm1.FormatFilename(L"bar", false) == L"/bar"); + CPPUNIT_ASSERT(zvm2.FormatFilename(L"bar", false) == L"/foo/bar"); + + const CServerPath hpnonstop1(L"\\mysys", HPNONSTOP); + const CServerPath hpnonstop2(L"\\mysys.$myvol", HPNONSTOP); + const CServerPath hpnonstop3(L"\\mysys.$myvol.mysubvol", HPNONSTOP); + CPPUNIT_ASSERT(hpnonstop1.FormatFilename(L"foo", false) == L"\\mysys.foo"); + CPPUNIT_ASSERT(hpnonstop2.FormatFilename(L"foo", false) == L"\\mysys.$myvol.foo"); + CPPUNIT_ASSERT(hpnonstop3.FormatFilename(L"foo", false) == L"\\mysys.$myvol.mysubvol.foo"); + + const CServerPath dos_virtual1(L"/"); + const CServerPath dos_virtual2(L"/foo"); + CPPUNIT_ASSERT(dos_virtual1.FormatFilename(L"bar", false) == L"/bar"); + CPPUNIT_ASSERT(dos_virtual2.FormatFilename(L"bar", false) == L"/foo/bar"); + + const CServerPath cygwin1(L"/", CYGWIN); + const CServerPath cygwin2(L"/foo", CYGWIN); + const CServerPath cygwin3(L"//", CYGWIN); + const CServerPath cygwin4(L"//foo", CYGWIN); + CPPUNIT_ASSERT(cygwin1.FormatFilename(L"bar", false) == L"/bar"); + CPPUNIT_ASSERT(cygwin2.FormatFilename(L"bar", false) == L"/foo/bar"); + CPPUNIT_ASSERT(cygwin3.FormatFilename(L"bar", false) == L"//bar"); + CPPUNIT_ASSERT(cygwin4.FormatFilename(L"bar", false) == L"//foo/bar"); + + { + const CServerPath dos_slashes1(L"C:\\", DOS_FWD_SLASHES); + const CServerPath dos_slashes2(L"C:\\foo", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes1.FormatFilename(L"bar", false) == L"C:/bar"); + CPPUNIT_ASSERT(dos_slashes2.FormatFilename(L"bar", false) == L"C:/foo/bar"); + } + } void CServerPathTest::testChangePath() { - CServerPath unix1(_T("/foo/bar")); - CServerPath unix2(_T("/foo/bar/baz")); - CServerPath unix3(_T("/foo/baz")); - CServerPath unix4(_T("/foo/bar/baz")); - CServerPath unix5(_T("/foo")); - CPPUNIT_ASSERT(unix1.ChangePath(_T("baz")) && unix1 == unix2); - CPPUNIT_ASSERT(unix2.ChangePath(_T("../../baz")) && unix2 == unix3); - CPPUNIT_ASSERT(unix3.ChangePath(_T("/foo/bar/baz")) && unix3 == unix4); - CPPUNIT_ASSERT(unix3.ChangePath(_T(".")) && unix3 == unix4); - wxString sub = _T("../../bar"); - CPPUNIT_ASSERT(unix4.ChangePath(sub, true) && unix4 == unix5 && sub == _T("bar")); - sub = _T("bar/"); + CServerPath unix1(L"/foo/bar"); + CServerPath unix2(L"/foo/bar/baz"); + CServerPath unix3(L"/foo/baz"); + CServerPath unix4(L"/foo/bar/baz"); + CServerPath unix5(L"/foo"); + CPPUNIT_ASSERT(unix1.ChangePath(L"baz") && unix1 == unix2); + CPPUNIT_ASSERT(unix2.ChangePath(L"../../baz") && unix2 == unix3); + CPPUNIT_ASSERT(unix3.ChangePath(L"/foo/bar/baz") && unix3 == unix4); + CPPUNIT_ASSERT(unix3.ChangePath(L".") && unix3 == unix4); + std::wstring sub = L"../../bar"; + CPPUNIT_ASSERT(unix4.ChangePath(sub, true) && unix4 == unix5 && sub == L"bar"); + sub = L"bar/"; CPPUNIT_ASSERT(!unix4.ChangePath(sub, true)); - const CServerPath vms1(_T("FOO:[BAR]")); - CServerPath vms2(_T("FOO:[BAR]")); - CServerPath vms3(_T("FOO:[BAR.BAZ]")); - CServerPath vms4(_T("FOO:[BAR]")); - CServerPath vms5(_T("FOO:[BAR.BAZ.BAR]")); - CServerPath vms6(_T("FOO:[BAR]")); - CServerPath vms7(_T("FOO:[BAR]")); - CServerPath vms8(_T("FOO:[BAR]")); - CServerPath vms9(_T("FOO:[BAZ.BAR]")); - CServerPath vms10(_T("DOO:[BAZ.BAR]")); - CPPUNIT_ASSERT(vms2.ChangePath(_T("BAZ")) && vms2 == vms3); - CPPUNIT_ASSERT(vms4.ChangePath(_T("BAZ.BAR")) && vms4 == vms5); - sub = _T("BAZ.BAR"); - CPPUNIT_ASSERT(vms6.ChangePath(sub, true) && vms6 == vms1 && sub == _T("BAZ.BAR")); - sub = _T("[BAZ.BAR]FOO"); + const CServerPath vms1(L"FOO:[BAR]"); + CServerPath vms2(L"FOO:[BAR]"); + CServerPath vms3(L"FOO:[BAR.BAZ]"); + CServerPath vms4(L"FOO:[BAR]"); + CServerPath vms5(L"FOO:[BAR.BAZ.BAR]"); + CServerPath vms6(L"FOO:[BAR]"); + CServerPath vms7(L"FOO:[BAR]"); + CServerPath vms8(L"FOO:[BAR]"); + CServerPath vms9(L"FOO:[BAZ.BAR]"); + CServerPath vms10(L"DOO:[BAZ.BAR]"); + CPPUNIT_ASSERT(vms2.ChangePath(L"BAZ") && vms2 == vms3); + CPPUNIT_ASSERT(vms4.ChangePath(L"BAZ.BAR") && vms4 == vms5); + sub = L"BAZ.BAR"; + CPPUNIT_ASSERT(vms6.ChangePath(sub, true) && vms6 == vms1 && sub == L"BAZ.BAR"); + sub = L"[BAZ.BAR]FOO"; CPPUNIT_ASSERT(!vms7.ChangePath(sub, false)); - CPPUNIT_ASSERT(vms8.ChangePath(sub, true) && vms8 == vms9 && sub == _T("FOO")); - CPPUNIT_ASSERT(vms10.ChangePath(_T("FOO:[BAR]")) && vms10 == vms1); + CPPUNIT_ASSERT(vms8.ChangePath(sub, true) && vms8 == vms9 && sub == L"FOO"); + CPPUNIT_ASSERT(vms10.ChangePath(L"FOO:[BAR]") && vms10 == vms1); - const CServerPath dos1(_T("c:\\bar")); - CServerPath dos2(_T("c:\\bar")); - CServerPath dos3(_T("c:\\bar\\baz")); - CServerPath dos4(_T("c:\\bar")); - CServerPath dos5(_T("c:\\bar\\baz\\bar")); - CServerPath dos6(_T("c:\\bar\\baz\\")); - CServerPath dos7(_T("d:\\bar")); - CServerPath dos8(_T("c:\\bar\\baz")); - CServerPath dos9(_T("c:\\bar\\")); - CServerPath dos10(_T("md:\\bar\\"), DOS); - CPPUNIT_ASSERT(dos2.ChangePath(_T("baz")) && dos2 == dos3); - CPPUNIT_ASSERT(dos4.ChangePath(_T("baz\\bar")) && dos4 == dos5); - CPPUNIT_ASSERT(dos5.ChangePath(_T("\\bar\\")) && dos5 == dos1); - CPPUNIT_ASSERT(dos6.ChangePath(_T("..\\..\\.\\foo\\..\\bar")) && dos6 == dos1); - CPPUNIT_ASSERT(dos7.ChangePath(_T("c:\\bar")) && dos7 == dos1); - sub = _T("\\bar\\foo"); - CPPUNIT_ASSERT(dos8.ChangePath(sub, true) && dos8 == dos1 && sub == _T("foo")); - sub = _T("baz\\foo"); - CPPUNIT_ASSERT(dos9.ChangePath(sub, true) && dos9 == dos3 && sub == _T("foo")); - CPPUNIT_ASSERT(dos9.ChangePath(_T("md:\\bar\\")) && dos9 == dos10); - - const CServerPath mvs1(_T("'BAR.'"), MVS); - CServerPath mvs2(_T("'BAR.'"), MVS); - CServerPath mvs3(_T("'BAR.BAZ.'"), MVS); - CServerPath mvs4(_T("'BAR.'"), MVS); - CServerPath mvs5(_T("'BAR.BAZ.BAR'"), MVS); - CServerPath mvs6(_T("'BAR.'"), MVS); - CServerPath mvs7(_T("'BAR.'"), MVS); - CServerPath mvs8(_T("'BAR.'"), MVS); - CServerPath mvs9(_T("'BAR.BAZ'"), MVS); - CServerPath mvs10(_T("'BAR.BAZ.'"), MVS); - CServerPath mvs11(_T("'BAR.BAZ'"), MVS); - CServerPath mvs12(_T("'BAR.BAZ'"), MVS); - CPPUNIT_ASSERT(mvs2.ChangePath(_T("BAZ.")) && mvs2 == mvs3); - CPPUNIT_ASSERT(mvs4.ChangePath(_T("BAZ.BAR")) && mvs4 == mvs5); - sub = _T("BAZ.BAR"); - CPPUNIT_ASSERT(mvs6.ChangePath(sub, true) && mvs6 == mvs3 && sub == _T("BAR")); - sub = _T("BAZ.BAR."); + { + const CServerPath dos1(L"c:\\bar"); + CServerPath dos2(L"c:\\bar"); + CServerPath dos3(L"c:\\bar\\baz"); + CServerPath dos4(L"c:\\bar"); + CServerPath dos5(L"c:\\bar\\baz\\bar"); + CServerPath dos6(L"c:\\bar\\baz\\"); + CServerPath dos7(L"d:\\bar"); + CServerPath dos8(L"c:\\bar\\baz"); + CServerPath dos9(L"c:\\bar\\"); + CServerPath dos10(L"md:\\bar\\", DOS); + CPPUNIT_ASSERT(dos2.ChangePath(L"baz") && dos2 == dos3); + CPPUNIT_ASSERT(dos4.ChangePath(L"baz\\bar") && dos4 == dos5); + CPPUNIT_ASSERT(dos5.ChangePath(L"\\bar\\") && dos5 == dos1); + CPPUNIT_ASSERT(dos6.ChangePath(L"..\\..\\.\\foo\\..\\bar") && dos6 == dos1); + CPPUNIT_ASSERT(dos7.ChangePath(L"c:\\bar") && dos7 == dos1); + sub = L"\\bar\\foo"; + CPPUNIT_ASSERT(dos8.ChangePath(sub, true) && dos8 == dos1 && sub == L"foo"); + sub = L"baz\\foo"; + CPPUNIT_ASSERT(dos9.ChangePath(sub, true) && dos9 == dos3 && sub == L"foo"); + CPPUNIT_ASSERT(dos9.ChangePath(L"md:\\bar\\") && dos9 == dos10); + } + + const CServerPath mvs1(L"'BAR.'", MVS); + CServerPath mvs2(L"'BAR.'", MVS); + CServerPath mvs3(L"'BAR.BAZ.'", MVS); + CServerPath mvs4(L"'BAR.'", MVS); + CServerPath mvs5(L"'BAR.BAZ.BAR'", MVS); + CServerPath mvs6(L"'BAR.'", MVS); + CServerPath mvs7(L"'BAR.'", MVS); + CServerPath mvs8(L"'BAR.'", MVS); + CServerPath mvs9(L"'BAR.BAZ'", MVS); + CServerPath mvs10(L"'BAR.BAZ.'", MVS); + CServerPath mvs11(L"'BAR.BAZ'", MVS); + CServerPath mvs12(L"'BAR.BAZ'", MVS); + CPPUNIT_ASSERT(mvs2.ChangePath(L"BAZ.") && mvs2 == mvs3); + CPPUNIT_ASSERT(mvs4.ChangePath(L"BAZ.BAR") && mvs4 == mvs5); + sub = L"BAZ.BAR"; + CPPUNIT_ASSERT(mvs6.ChangePath(sub, true) && mvs6 == mvs3 && sub == L"BAR"); + sub = L"BAZ.BAR."; CPPUNIT_ASSERT(!mvs7.ChangePath(sub, true)); - sub = _T("BAZ(BAR)"); - CPPUNIT_ASSERT(mvs8.ChangePath(sub, true) && mvs8 == mvs9 && sub == _T("BAR")); - CPPUNIT_ASSERT(!mvs5.ChangePath(_T("(FOO)"))); - CPPUNIT_ASSERT(!mvs9.ChangePath(_T("FOO"))); - sub = _T("(FOO)"); + sub = L"BAZ(BAR)"; + CPPUNIT_ASSERT(mvs8.ChangePath(sub, true) && mvs8 == mvs9 && sub == L"BAR"); + CPPUNIT_ASSERT(!mvs5.ChangePath(L"(FOO)")); + CPPUNIT_ASSERT(!mvs9.ChangePath(L"FOO")); + sub = L"(FOO)"; CPPUNIT_ASSERT(!mvs10.ChangePath(sub)); - sub = _T("(FOO)"); - CPPUNIT_ASSERT(mvs11.ChangePath(sub, true) && mvs11 == mvs12 && sub == _T("FOO")); + sub = L"(FOO)"; + CPPUNIT_ASSERT(mvs11.ChangePath(sub, true) && mvs11 == mvs12 && sub == L"FOO"); - const CServerPath vxworks1(_T(":foo:bar")); - CServerPath vxworks2(_T(":foo:bar")); - CServerPath vxworks3(_T(":foo:bar/baz")); - CServerPath vxworks4(_T(":foo:bar")); - CServerPath vxworks5(_T(":foo:bar/baz/bar")); - CServerPath vxworks6(_T(":foo:bar/baz/")); - CServerPath vxworks7(_T(":bar:bar")); - CServerPath vxworks8(_T(":foo:bar/baz")); - CServerPath vxworks9(_T(":foo:bar/baz/bar")); - CPPUNIT_ASSERT(vxworks2.ChangePath(_T("baz")) && vxworks2 == vxworks3); - CPPUNIT_ASSERT(vxworks4.ChangePath(_T("baz/bar")) && vxworks4 == vxworks5); - CPPUNIT_ASSERT(vxworks6.ChangePath(_T("../.././foo/../bar")) && vxworks6 == vxworks1); - CPPUNIT_ASSERT(vxworks7.ChangePath(_T(":foo:bar")) && vxworks7 == vxworks1); - sub = _T("bar/foo"); - CPPUNIT_ASSERT(vxworks8.ChangePath(sub, true) && vxworks8 == vxworks9 && sub == _T("foo")); + const CServerPath vxworks1(L":foo:bar"); + CServerPath vxworks2(L":foo:bar"); + CServerPath vxworks3(L":foo:bar/baz"); + CServerPath vxworks4(L":foo:bar"); + CServerPath vxworks5(L":foo:bar/baz/bar"); + CServerPath vxworks6(L":foo:bar/baz/"); + CServerPath vxworks7(L":bar:bar"); + CServerPath vxworks8(L":foo:bar/baz"); + CServerPath vxworks9(L":foo:bar/baz/bar"); + CPPUNIT_ASSERT(vxworks2.ChangePath(L"baz") && vxworks2 == vxworks3); + CPPUNIT_ASSERT(vxworks4.ChangePath(L"baz/bar") && vxworks4 == vxworks5); + CPPUNIT_ASSERT(vxworks6.ChangePath(L"../.././foo/../bar") && vxworks6 == vxworks1); + CPPUNIT_ASSERT(vxworks7.ChangePath(L":foo:bar") && vxworks7 == vxworks1); + sub = L"bar/foo"; + CPPUNIT_ASSERT(vxworks8.ChangePath(sub, true) && vxworks8 == vxworks9 && sub == L"foo"); // ZVM is same as Unix, only makes difference in directory // listing parser. - CServerPath zvm1(_T("/foo/bar"), ZVM); - CServerPath zvm2(_T("/foo/bar/baz"), ZVM); - CServerPath zvm3(_T("/foo/baz"), ZVM); - CServerPath zvm4(_T("/foo/bar/baz"), ZVM); - CServerPath zvm5(_T("/foo"), ZVM); - CPPUNIT_ASSERT(zvm1.ChangePath(_T("baz")) && zvm1 == zvm2); - CPPUNIT_ASSERT(zvm2.ChangePath(_T("../../baz")) && zvm2 == zvm3); - CPPUNIT_ASSERT(zvm3.ChangePath(_T("/foo/bar/baz")) && zvm3 == zvm4); - CPPUNIT_ASSERT(zvm3.ChangePath(_T(".")) && zvm3 == zvm4); - sub = _T("../../bar"); - CPPUNIT_ASSERT(zvm4.ChangePath(sub, true) && zvm4 == zvm5 && sub == _T("bar")); - sub = _T("bar/"); + CServerPath zvm1(L"/foo/bar", ZVM); + CServerPath zvm2(L"/foo/bar/baz", ZVM); + CServerPath zvm3(L"/foo/baz", ZVM); + CServerPath zvm4(L"/foo/bar/baz", ZVM); + CServerPath zvm5(L"/foo", ZVM); + CPPUNIT_ASSERT(zvm1.ChangePath(L"baz") && zvm1 == zvm2); + CPPUNIT_ASSERT(zvm2.ChangePath(L"../../baz") && zvm2 == zvm3); + CPPUNIT_ASSERT(zvm3.ChangePath(L"/foo/bar/baz") && zvm3 == zvm4); + CPPUNIT_ASSERT(zvm3.ChangePath(L".") && zvm3 == zvm4); + sub = L"../../bar"; + CPPUNIT_ASSERT(zvm4.ChangePath(sub, true) && zvm4 == zvm5 && sub == L"bar"); + sub = L"bar/"; CPPUNIT_ASSERT(!zvm4.ChangePath(sub, true)); - CServerPath hpnonstop1(_T("\\mysys.$myvol"), HPNONSTOP); - CServerPath hpnonstop2(_T("\\mysys.$myvol.mysubvol"), HPNONSTOP); - CServerPath hpnonstop3(_T("\\mysys.$myvol2"), HPNONSTOP); - CServerPath hpnonstop4(_T("\\mysys.$myvol.mysubvol"), HPNONSTOP); - CServerPath hpnonstop5(_T("\\mysys"), HPNONSTOP); - CPPUNIT_ASSERT(hpnonstop1.ChangePath(_T("mysubvol")) && hpnonstop1 == hpnonstop2); - CPPUNIT_ASSERT(hpnonstop3.ChangePath(_T("\\mysys.$myvol.mysubvol")) && hpnonstop3 == hpnonstop4); - sub = _T("bar"); - CPPUNIT_ASSERT(hpnonstop2.ChangePath(sub, true) && hpnonstop2 == hpnonstop4 && sub == _T("bar")); - sub = _T("$myvol.mysubvol.bar"); - CPPUNIT_ASSERT(hpnonstop5.ChangePath(sub, true) && hpnonstop5 == hpnonstop4 && sub == _T("bar")); - sub = _T("bar."); + CServerPath hpnonstop1(L"\\mysys.$myvol", HPNONSTOP); + CServerPath hpnonstop2(L"\\mysys.$myvol.mysubvol", HPNONSTOP); + CServerPath hpnonstop3(L"\\mysys.$myvol2", HPNONSTOP); + CServerPath hpnonstop4(L"\\mysys.$myvol.mysubvol", HPNONSTOP); + CServerPath hpnonstop5(L"\\mysys", HPNONSTOP); + CPPUNIT_ASSERT(hpnonstop1.ChangePath(L"mysubvol") && hpnonstop1 == hpnonstop2); + CPPUNIT_ASSERT(hpnonstop3.ChangePath(L"\\mysys.$myvol.mysubvol") && hpnonstop3 == hpnonstop4); + sub = L"bar"; + CPPUNIT_ASSERT(hpnonstop2.ChangePath(sub, true) && hpnonstop2 == hpnonstop4 && sub == L"bar"); + sub = L"$myvol.mysubvol.bar"; + CPPUNIT_ASSERT(hpnonstop5.ChangePath(sub, true) && hpnonstop5 == hpnonstop4 && sub == L"bar"); + sub = L"bar."; CPPUNIT_ASSERT(!hpnonstop4.ChangePath(sub, true)); - CServerPath dos_virtual1(_T("\\foo\\bar")); - CServerPath dos_virtual2(_T("\\foo\\bar\\baz")); - CServerPath dos_virtual3(_T("\\foo\\baz")); - CServerPath dos_virtual4(_T("\\foo\\bar\\baz")); - CServerPath dos_virtual5(_T("\\foo")); - CPPUNIT_ASSERT(dos_virtual1.ChangePath(_T("baz")) && dos_virtual1 == dos_virtual2); - CPPUNIT_ASSERT(dos_virtual2.ChangePath(_T("..\\..\\baz")) && dos_virtual2 == dos_virtual3); - CPPUNIT_ASSERT(dos_virtual3.ChangePath(_T("\\foo\\bar\\baz")) && dos_virtual3 == dos_virtual4); - CPPUNIT_ASSERT(dos_virtual3.ChangePath(_T(".")) && dos_virtual3 == dos_virtual4); - sub = _T("..\\..\\bar"); - CPPUNIT_ASSERT(dos_virtual4.ChangePath(sub, true) && dos_virtual4 == dos_virtual5 && sub == _T("bar")); - sub = _T("bar\\"); + CServerPath dos_virtual1(L"\\foo\\bar"); + CServerPath dos_virtual2(L"\\foo\\bar\\baz"); + CServerPath dos_virtual3(L"\\foo\\baz"); + CServerPath dos_virtual4(L"\\foo\\bar\\baz"); + CServerPath dos_virtual5(L"\\foo"); + CPPUNIT_ASSERT(dos_virtual1.ChangePath(L"baz") && dos_virtual1 == dos_virtual2); + CPPUNIT_ASSERT(dos_virtual2.ChangePath(L"..\\..\\baz") && dos_virtual2 == dos_virtual3); + CPPUNIT_ASSERT(dos_virtual3.ChangePath(L"\\foo\\bar\\baz") && dos_virtual3 == dos_virtual4); + CPPUNIT_ASSERT(dos_virtual3.ChangePath(L".") && dos_virtual3 == dos_virtual4); + sub = L"..\\..\\bar"; + CPPUNIT_ASSERT(dos_virtual4.ChangePath(sub, true) && dos_virtual4 == dos_virtual5 && sub == L"bar"); + sub = L"bar\\"; CPPUNIT_ASSERT(!dos_virtual4.ChangePath(sub, true)); - CServerPath cygwin1(_T("/foo/bar"), CYGWIN); - CServerPath cygwin2(_T("/foo/bar/baz"), CYGWIN); - CServerPath cygwin3(_T("/foo/baz"), CYGWIN); - CServerPath cygwin4(_T("/foo/bar/baz"), CYGWIN); - CServerPath cygwin5(_T("/foo"), CYGWIN); - CServerPath cygwin6(_T("//foo"), CYGWIN); - CServerPath cygwin7(_T("//"), CYGWIN); - CPPUNIT_ASSERT(cygwin1.ChangePath(_T("baz")) && cygwin1 == cygwin2); - CPPUNIT_ASSERT(cygwin2.ChangePath(_T("../../baz")) && cygwin2 == cygwin3); - CPPUNIT_ASSERT(cygwin3.ChangePath(_T("/foo/bar/baz")) && cygwin3 == cygwin4); - CPPUNIT_ASSERT(cygwin3.ChangePath(_T(".")) && cygwin3 == cygwin4); - sub = _T("../../bar"); - CPPUNIT_ASSERT(cygwin4.ChangePath(sub, true) && cygwin4 == cygwin5 && sub == _T("bar")); - sub = _T("bar/"); + CServerPath cygwin1(L"/foo/bar", CYGWIN); + CServerPath cygwin2(L"/foo/bar/baz", CYGWIN); + CServerPath cygwin3(L"/foo/baz", CYGWIN); + CServerPath cygwin4(L"/foo/bar/baz", CYGWIN); + CServerPath cygwin5(L"/foo", CYGWIN); + CServerPath cygwin6(L"//foo", CYGWIN); + CServerPath cygwin7(L"//", CYGWIN); + CPPUNIT_ASSERT(cygwin1.ChangePath(L"baz") && cygwin1 == cygwin2); + CPPUNIT_ASSERT(cygwin2.ChangePath(L"../../baz") && cygwin2 == cygwin3); + CPPUNIT_ASSERT(cygwin3.ChangePath(L"/foo/bar/baz") && cygwin3 == cygwin4); + CPPUNIT_ASSERT(cygwin3.ChangePath(L".") && cygwin3 == cygwin4); + sub = L"../../bar"; + CPPUNIT_ASSERT(cygwin4.ChangePath(sub, true) && cygwin4 == cygwin5 && sub == L"bar"); + sub = L"bar/"; CPPUNIT_ASSERT(!cygwin4.ChangePath(sub, true)); - CPPUNIT_ASSERT(cygwin5.ChangePath(_T("//foo")) && cygwin5 == cygwin6); - sub = _T("//foo"); - CPPUNIT_ASSERT(cygwin1.ChangePath(sub, true) && cygwin1 == cygwin7 && sub == _T("foo")); + CPPUNIT_ASSERT(cygwin5.ChangePath(L"//foo") && cygwin5 == cygwin6); + sub = L"//foo"; + CPPUNIT_ASSERT(cygwin1.ChangePath(sub, true) && cygwin1 == cygwin7 && sub == L"foo"); + + { + const CServerPath dos_slashes1(L"c:\\bar", DOS_FWD_SLASHES); + CServerPath dos_slashes2(L"c:\\bar", DOS_FWD_SLASHES); + CServerPath dos_slashes3(L"c:\\bar/baz", DOS_FWD_SLASHES); + CServerPath dos_slashes4(L"c:\\bar", DOS_FWD_SLASHES); + CServerPath dos_slashes5(L"c:\\bar\\baz\\bar", DOS_FWD_SLASHES); + CServerPath dos_slashes6(L"c:\\bar\\baz\\", DOS_FWD_SLASHES); + CServerPath dos_slashes7(L"d:/bar", DOS_FWD_SLASHES); + CServerPath dos_slashes8(L"c:\\bar\\baz", DOS_FWD_SLASHES); + CServerPath dos_slashes9(L"c:\\bar\\", DOS_FWD_SLASHES); + CServerPath dos_slashes10(L"md:\\bar\\", DOS_FWD_SLASHES); + CPPUNIT_ASSERT(dos_slashes2.ChangePath(L"baz") && dos_slashes2 == dos_slashes3); + CPPUNIT_ASSERT(dos_slashes4.ChangePath(L"baz\\bar") && dos_slashes4 == dos_slashes5); + CPPUNIT_ASSERT(dos_slashes5.ChangePath(L"\\bar\\") && dos_slashes5 == dos_slashes1); + CPPUNIT_ASSERT(dos_slashes6.ChangePath(L"..\\..\\.\\foo\\..\\bar") && dos_slashes6 == dos_slashes1); + CPPUNIT_ASSERT(dos_slashes7.ChangePath(L"c:\\bar") && dos_slashes7 == dos_slashes1); + sub = L"\\bar\\foo"; + CPPUNIT_ASSERT(dos_slashes8.ChangePath(sub, true) && dos_slashes8 == dos_slashes1 && sub == L"foo"); + sub = L"baz\\foo"; + CPPUNIT_ASSERT(dos_slashes9.ChangePath(sub, true) && dos_slashes9 == dos_slashes3 && sub == L"foo"); + CPPUNIT_ASSERT(dos_slashes9.ChangePath(L"md:\\bar\\") && dos_slashes9 == dos_slashes10); + } + } diff -Nru filezilla-3.15.0.2/tests/test.cpp filezilla-3.33.0/tests/test.cpp --- filezilla-3.15.0.2/tests/test.cpp 2016-02-05 08:54:46.000000000 +0000 +++ filezilla-3.33.0/tests/test.cpp 2017-09-19 21:36:39.000000000 +0000 @@ -6,7 +6,7 @@ #include #include -int main(int argc, char* argv[]) +int main(int, char*[]) { setlocale(LC_ALL, "");